1679 files changed, 358653 insertions, 145168 deletions

diff --git a/.gitignore b/.gitignore
index 409be555fb..592ac6668b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -179,6 +179,7 @@ make/win32/
 
 # common_test
 
+/lib/common_test/doc/src/ct_slave.xml
 /lib/common_test/priv/install.sh
 
 # compiler
@@ -365,5 +366,6 @@ make/win32/
 /lib/xmerl/src/xmerl_sax_parser_*.erl
 /lib/xmerl/src/xmerl_b64Bin.erl
 /lib/xmerl/src/xmerl_xpath_parse.erl
+/lib/xmerl/test/xmerl_test.erl
 /lib/erl_interface/config.h.in
 /lib/configure.in
diff --git a/Makefile.in b/Makefile.in
index ca92bf604d..5acd390333 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1998-2010. All Rights Reserved.
+# Copyright Ericsson AB 1998-2011. 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
@@ -396,20 +396,25 @@ endif
 release_docs docs: mod2app
 ifeq ($(OTP_SMALL_BUILD),true)
 	cd $(ERL_TOP)/lib && \
-	  ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT=$(RELEASE_ROOT) $@
+	  PATH=$(ERL_TOP)/bin:$${PATH} ERL_TOP=$(ERL_TOP) \
+	  $(MAKE) TESTROOT=$(RELEASE_ROOT) $@
 else
 	cd $(ERL_TOP)/lib && \
-	  ERL_TOP=$(ERL_TOP) $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@
+	  PATH=$(ERL_TOP)/bin:$${PATH} ERL_TOP=$(ERL_TOP) \
+	  $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@
 	cd $(ERL_TOP)/lib/dialyzer && \
-	  ERL_TOP=$(ERL_TOP) $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@
+	  PATH=$(ERL_TOP)/bin:$${PATH} ERL_TOP=$(ERL_TOP) \
+	  $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@
 endif
 	cd $(ERL_TOP)/erts && \
-	  ERL_TOP=$(ERL_TOP) $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@
+	  PATH=$(ERL_TOP)/bin:$${PATH} ERL_TOP=$(ERL_TOP) \
+	  $(MAKE) BUILD_ALL=1 TESTROOT=$(RELEASE_ROOT) $@
 	cd $(ERL_TOP)/system/doc && \
+	  PATH=$(ERL_TOP)/bin:$${PATH} \
 	  ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT=$(RELEASE_ROOT) $@
 
-mod2app:
-	$(ERL_TOP)/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml
+mod2app: 
+	PATH=$(ERL_TOP)/bin:$${PATH} escript $(ERL_TOP)/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml
 
 # ----------------------------------------------------------------------
 ERLANG_EARS=$(BOOTSTRAP_ROOT)/bootstrap/erts
@@ -497,6 +502,7 @@ ifeq ($(TARGET),win32)
 bootstrap_setup: check_recreate_primary_bootstrap bootstrap_setup_target
 	@rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erl.exe \
 		$(BOOTSTRAP_ROOT)/bootstrap/bin/erlc.exe \
+		$(BOOTSTRAP_ROOT)/bootstrap/bin/escript.exe \
 		$(BOOTSTRAP_ROOT)/bootstrap/bin/erl.ini \
 		$(BOOTSTRAP_ROOT)/bootstrap/bin/beam.dll
 	make_bootstrap_ini.sh $(BOOTSTRAP_ROOT)/bootstrap \
@@ -505,8 +511,10 @@ bootstrap_setup: check_recreate_primary_bootstrap bootstrap_setup_target
 		$(BOOTSTRAP_ROOT)/bootstrap/bin/erlc.exe
 	@cp $(ERL_TOP)/bin/$(TARGET)/erl.exe \
 		$(BOOTSTRAP_ROOT)/bootstrap/bin/erl.exe
+	@cp $(ERL_TOP)/bin/$(TARGET)/escript.exe \
+		$(BOOTSTRAP_ROOT)/bootstrap/bin/escript.exe
 else
-bootstrap_setup: check_recreate_primary_bootstrap bootstrap_setup_target $(BOOTSTRAP_ROOT)/bootstrap/bin/erl $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
+bootstrap_setup: check_recreate_primary_bootstrap bootstrap_setup_target $(BOOTSTRAP_ROOT)/bootstrap/bin/erl $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc $(BOOTSTRAP_ROOT)/bootstrap/bin/escript
 
 $(BOOTSTRAP_ROOT)/bootstrap/bin/erl: $(ERL_TOP)/erts/etc/unix/erl.src.src $(BOOTSTRAP_ROOT)/bootstrap/target
 	@rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erl 
@@ -521,6 +529,11 @@ $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc: $(ERL_TOP)/bin/$(TARGET)/erlc $(BOOTSTRAP_
 	@rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
 	@cp $(ERL_TOP)/bin/$(TARGET)/erlc $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
 	@chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
+
+$(BOOTSTRAP_ROOT)/bootstrap/bin/escript: $(ERL_TOP)/bin/$(TARGET)/escript $(BOOTSTRAP_ROOT)/bootstrap/target
+	@rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/escript
+	@cp $(ERL_TOP)/bin/$(TARGET)/escript $(BOOTSTRAP_ROOT)/bootstrap/bin/escript
+	@chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/escript
 endif
 
 bootstrap_setup_target:
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index a1211bbf0c..f7e5c31910 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -1153,7 +1153,7 @@ case "$THR_LIB_NAME" in
 			AO_nop_full();
 			AO_store(&x, (AO_t) 0);
 			z = AO_load(&x);
-			z = AO_compare_and_swap(&x, (AO_t) 0, (AO_t) 1);
+			z = AO_compare_and_swap_full(&x, (AO_t) 0, (AO_t) 1);
 		    ],
 		    [ethr_have_native_atomics=yes
 		     ethr_have_libatomic_ops=yes])
diff --git a/erts/configure.in b/erts/configure.in
index 31d1d55b8a..fac07f8b6a 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -769,6 +769,7 @@ if test "$enable_halfword_emulator" = "yes"; then
 	if test "$ARCH" = "amd64"; then
 		AC_DEFINE(HALFWORD_HEAP_EMULATOR, [1],
 			  [Define if building a halfword-heap 64bit emulator])
+		ENABLE_ALLOC_TYPE_VARS="$ENABLE_ALLOC_TYPE_VARS halfword"
 		AC_MSG_RESULT([yes])
 	else
 		AC_MSG_ERROR(no; halfword emulator not supported on this architecture)
@@ -3523,6 +3524,8 @@ dnl use "PATH/include" and "PATH/lib".
 AC_SUBST(SSL_INCLUDE)
 AC_SUBST(SSL_ROOT)
 AC_SUBST(SSL_LIBDIR)
+AC_SUBST(SSL_CRYPTO_LIBNAME)
+AC_SUBST(SSL_SSL_LIBNAME)
 AC_SUBST(SSL_CC_RUNTIME_LIBRARY_PATH)
 AC_SUBST(SSL_LD_RUNTIME_LIBRARY_PATH)
 AC_SUBST(SSL_DED_LD_RUNTIME_LIBRARY_PATH)
@@ -3686,19 +3689,41 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
     CRYPTO_APP=crypto
     SSH_APP=ssh
 
-    AC_MSG_CHECKING(for OpenSSL >= 0.9.7 in standard locations) 
+    SSL_CRYPTO_LIBNAME=crypto
+    SSL_SSL_LIBNAME=ssl
+
+    AC_MSG_CHECKING(for OpenSSL >= 0.9.7 in standard locations)
     for rdir in $extra_dir /cygdrive/c/OpenSSL $std_ssl_locations; do
 	dir="$erl_xcomp_sysroot$rdir"
 	if test -f "$erl_xcomp_isysroot$rdir/include/openssl/opensslv.h"; then
 		is_real_ssl=yes
 		SSL_ROOT="$dir"
 		if test "x$MIXED_CYGWIN" = "xyes" ; then
-			if test -f "$dir/lib/VC/ssleay32.lib" || \
-			   test -f "$dir/lib/VC/openssl.lib"; then 
+			if test -f "$dir/lib/VC/libeay32.lib"; then
+				SSL_RUNTIME_LIBDIR="$rdir/lib/VC"
+				SSL_LIBDIR="$dir/lib/VC"
+				SSL_CRYPTO_LIBNAME=libeay32
+				SSL_SSL_LIBNAME=ssleay32
+			elif test -f "$dir/lib/VC/openssl.lib"; then 
 				SSL_RUNTIME_LIBDIR="$rdir/lib/VC"
 				SSL_LIBDIR="$dir/lib/VC"
-			elif test -f "$dir/lib/ssleay32.lib" || \
-			     test -f "$dir/lib/openssl.lib"; then
+			elif test -f $dir/lib/VC/libeay32MD.lib; then
+		            SSL_CRYPTO_LIBNAME=libeay32MD
+		            SSL_SSL_LIBNAME=ssleay32MD
+			    if test "x$enable_dynamic_ssl" = "xno" && \
+	                       test -f  $dir/lib/VC/static/libeay32MD.lib; then
+				  SSL_RUNTIME_LIBDIR="$rdir/lib/VC/static"
+				  SSL_LIBDIR="$dir/lib/VC/static"
+		            else
+			          SSL_RUNTIME_LIBDIR="$rdir/lib/VC"
+				  SSL_LIBDIR="$dir/lib/VC"
+                            fi 
+			elif test -f "$dir/lib/libeay32.lib"; then
+				SSL_RUNTIME_LIBDIR="$rdir/lib"
+				SSL_LIBDIR="$dir/lib"
+				SSL_CRYPTO_LIBNAME=libeay32
+				SSL_CRYPTO_LIBNAME=ssleay32
+			elif test -f "$dir/lib/openssl.lib"; then
 				SSL_RUNTIME_LIBDIR="$rdir/lib"
 				SSL_LIBDIR="$dir/lib"
 			else
@@ -3858,8 +3883,32 @@ dnl		so it is - be adoptable
        AC_MSG_ERROR(Invalid path to option --with-ssl=PATH)
     fi
     SSL_ROOT="$with_ssl"
+    SSL_CRYPTO_LIBNAME=crypto
+    SSL_SSL_LIBNAME=ssl
     if test "x$MIXED_CYGWIN" = "xyes" && test -d "$with_ssl/lib/VC"; then
-	SSL_LIBDIR="$with_ssl/lib/VC"
+	if test -f "$with_ssl/lib/VC/libeay32.lib"; then
+	    SSL_LIBDIR="$with_ssl/lib/VC"
+	    SSL_CRYPTO_LIBNAME=libeay32
+	    SSL_SSL_LIBNAME=ssleay32
+	elif test -f "$with_ssl/lib/VC/openssl.lib"; then 
+	    SSL_LIBDIR="$with_ssl/lib/VC"
+	elif test -f $with_ssl/lib/VC/libeay32MD.lib; then
+	    SSL_CRYPTO_LIBNAME=libeay32MD
+            SSL_SSL_LIBNAME=ssleay32MD
+	    if test "x$enable_dynamic_ssl" = "xno" && \
+	       test -f  $with_ssl/lib/VC/static/libeay32MD.lib; then
+		SSL_LIBDIR="$with_ssl/lib/VC/static"
+	    else
+		SSL_LIBDIR="$with_ssl/lib/VC"
+            fi 
+	elif test -f "$with_ssl/lib/libeay32.lib"; then
+	    SSL_LIBDIR="$with_ssl/lib"
+	    SSL_CRYPTO_LIBNAME=libeay32
+	    SSL_CRYPTO_LIBNAME=ssleay32
+	else
+	    # This probably wont work, but that's what the user said, so...
+	    SSL_LIBDIR="$with_ssl/lib"
+	fi
     elif test "x$ac_cv_sizeof_void_p" = "x8"; then
 	if test -f "$with_ssl/lib64/libcrypto.a"; then
 		SSL_LIBDIR="$with_ssl/lib64"
diff --git a/erts/doc/src/driver_entry.xml b/erts/doc/src/driver_entry.xml
index 7860d83d83..8bdd154cb9 100644
--- a/erts/doc/src/driver_entry.xml
+++ b/erts/doc/src/driver_entry.xml
@@ -133,7 +133,7 @@ typedef struct erl_drv_entry {
     int (*control)(ErlDrvData drv_data, unsigned int command, char *buf, 
                    int len, char **rbuf, int rlen); 
                                 /* "ioctl" for drivers - invoked by 
-                                   port_control/3) */
+                                   port_control/3 */
     void (*timeout)(ErlDrvData drv_data);        /* Handling of timeout in driver */
     void (*outputv)(ErlDrvData drv_data, ErlIOVec *ev);
                                 /* called when we have output from erlang
@@ -146,7 +146,7 @@ typedef struct erl_drv_entry {
                                    before 'stop' can be called */
     int (*call)(ErlDrvData drv_data, unsigned int command, char *buf, 
                    int len, char **rbuf, int rlen, unsigned int *flags); 
-                                /* Works mostly like 'control', a syncronous
+                                /* Works mostly like 'control', a synchronous
                                    call into the driver. */
     void (*event)(ErlDrvData drv_data, ErlDrvEvent event,
                   ErlDrvEventData event_data);
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index 4bbd4e2a54..cdce4ec0b8 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -688,6 +688,10 @@ typedef enum {
       <fsummary>Determine if a term is an empty list</fsummary>
       <desc><p>Return true if <c>term</c> is an empty list.</p></desc>
     </func>
+    <marker id="enif_is_exception"/><func><name><ret>int</ret><nametext>enif_is_exception(ErlNifEnv* env, ERL_NIF_TERM term)</nametext></name>
+      <fsummary>Determine if a term is an exception</fsummary>
+      <desc><p>Return true if <c>term</c> is an exception.</p></desc>
+    </func>
     <func><name><ret>int</ret><nametext>enif_is_fun(ErlNifEnv* env, ERL_NIF_TERM term)</nametext></name>
       <fsummary>Determine if a term is a fun</fsummary>
       <desc><p>Return true if <c>term</c> is a fun.</p></desc>
@@ -738,7 +742,14 @@ typedef enum {
     </func>
     <func><name><ret>ERL_NIF_TERM</ret><nametext>enif_make_badarg(ErlNifEnv* env)</nametext></name>
       <fsummary>Make a badarg exception.</fsummary>
-      <desc><p>Make a badarg exception to be returned from a NIF.</p></desc>
+      <desc><p>Make a badarg exception to be returned from a NIF, and set
+      an associated exception reason in <c>env</c>. If
+      <c>enif_make_badarg</c> is called, the term it returns <em>must</em>
+      be returned from the function that called it. No other return value
+      is allowed. Also, the term returned from <c>enif_make_badarg</c> may
+      be passed only to
+      <seealso marker="#enif_is_exception">enif_is_exception</seealso> and
+      not to any other NIF API function.</p></desc>
     </func>
     <func><name><ret>ERL_NIF_TERM</ret><nametext>enif_make_binary(ErlNifEnv* env, ErlNifBinary* bin)</nametext></name>
       <fsummary>Make a binary term.</fsummary>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 19f501391f..f98e15cb52 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -2356,6 +2356,14 @@ os_prompt%</pre>
               <seealso marker="tools:instrument">instrument(3)</seealso>
               and/or <seealso marker="erts:erl">erl(1)</seealso>.</p>
           </item>
+          <tag><c>low</c></tag>
+          <item>
+            <p>Only on 64-bit halfword emulator.</p>
+            <p>The total amount of memory allocated in low memory areas
+	      that are restricted to less than 4 Gb even though
+	      the system may have more physical memory.</p>
+	    <p>May be removed in future releases of halfword emulator.</p>
+          </item>
         </taglist>
         <note>
           <p>The <c>system</c> value is not complete. Some allocated
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index e91839572b..7383ea381d 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,22 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 5.8.3.2</title>
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    Fix halfword emulator bug in <c>ets:select_delete</c> for
+	    <c>ordered_set</c> that caused emulator to crash.</p>
+          <p>
+	    Own Id: OTP-9258 Aux Id: seq11836 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 5.8.3.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/doc/src/run_erl.xml b/erts/doc/src/run_erl.xml
index 7bf7f559c5..da08859c7b 100644
--- a/erts/doc/src/run_erl.xml
+++ b/erts/doc/src/run_erl.xml
@@ -144,6 +144,14 @@
       <item>The size (in bytes) of a log file before switching to a
        new log file. Default is 100000, minimum is 1000 and maximum is
        approximately 2^30.</item>
+      <tag>RUN_ERL_DISABLE_FLOWCNTRL</tag>
+      <item>If defined, disables input and output flow control for the pty opend by run_erl.
+       Useful if you want to remove any risk of accidentally blocking the flow control
+       by hit Ctrl-S (instead of Ctrl-D to detach).
+       Which may result in blocking of the entire beam process
+       and in the case of running heart as supervisor
+       even the heart process will be blocked when writing log message to terminal.
+       Leaving the heart process unable to do its work.</item>
     </taglist>
   </section>
 
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index 327620772f..de76cb9680 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -76,6 +76,7 @@ atom allocator_sizes
 atom alloc_util_allocators
 atom allow_passive_connect
 atom already_loaded
+atom amd64
 atom anchored
 atom and
 atom andalso
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c
index 1ca405961f..d76a7d8e9f 100644
--- a/erts/emulator/beam/beam_bif_load.c
+++ b/erts/emulator/beam/beam_bif_load.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1999-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1999-2011. 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
@@ -142,7 +142,7 @@ BIF_RETTYPE code_is_module_native_1(BIF_ALIST_1)
     if ((modp = erts_get_module(BIF_ARG_1)) == NULL) {
 	return am_undefined;
     }
-    return (is_native(modp->code) ||
+    return ((modp->code && is_native(modp->code)) ||
 	    (modp->old_code != 0 && is_native(modp->old_code))) ?
 		am_true : am_false;
 }
@@ -175,8 +175,12 @@ check_process_code_2(BIF_ALIST_2)
 	Eterm res;
 	if (internal_pid_index(BIF_ARG_1) >= erts_max_processes)
 	    goto error;
-	rp = erts_pid2proc_not_running(BIF_P, ERTS_PROC_LOCK_MAIN,
-				       BIF_ARG_1, ERTS_PROC_LOCK_MAIN);
+#ifdef ERTS_SMP
+	rp = erts_pid2proc_suspend(BIF_P, ERTS_PROC_LOCK_MAIN,
+				   BIF_ARG_1, ERTS_PROC_LOCK_MAIN);
+#else
+	rp = erts_pid2proc(BIF_P, 0, BIF_ARG_1, 0);
+#endif
 	if (!rp) {
 	    BIF_RET(am_false);
 	}
@@ -187,8 +191,10 @@ check_process_code_2(BIF_ALIST_2)
 	modp = erts_get_module(BIF_ARG_2);
 	res = check_process_code(rp, modp);
 #ifdef ERTS_SMP
-	if (BIF_P != rp)
+	if (BIF_P != rp) {
+	    erts_resume(rp, ERTS_PROC_LOCK_MAIN);
 	    erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_MAIN);
+	}
 #endif
 	BIF_RET(res);
     }
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c
index 8a48049921..fffb172c68 100644
--- a/erts/emulator/beam/beam_debug.c
+++ b/erts/emulator/beam/beam_debug.c
@@ -291,7 +291,7 @@ dbg_bt(Process* p, Eterm* sp)
 	    if (addr)
 		erts_fprintf(stderr,
 			     HEXF ": %T:%T/%bpu\n",
-			     addr, (Eterm) addr[0], (Eterm) addr[1], (Uint) addr[2]);
+			     addr, (Eterm) addr[0], (Eterm) addr[1], addr[2]);
 	}
 	sp++;
     }
@@ -484,7 +484,7 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 		if (f+3 != (BeamInstr *) *ap) {
 		    erts_print(to, to_arg, "f(" HEXF ")", *ap);
 		} else {
-		    erts_print(to, to_arg, "%T:%T/%bpu", (Eterm) f[0], (Eterm) f[1], (Eterm) f[2]);
+		    erts_print(to, to_arg, "%T:%T/%bpu", (Eterm) f[0], (Eterm) f[1], f[2]);
 		}
 		ap++;
 	    }
@@ -495,7 +495,7 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 		if (f+3 != (BeamInstr *) *ap) {
 		    erts_print(to, to_arg, "p(" HEXF ")", *ap);
 		} else {
-		    erts_print(to, to_arg, "%T:%T/%bpu", (Eterm) f[0], (Eterm) f[1], (Eterm) f[2]);
+		    erts_print(to, to_arg, "%T:%T/%bpu", (Eterm) f[0], (Eterm) f[1], f[2]);
 		}
 		ap++;
 	    }
@@ -508,7 +508,7 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    {
 		Export* ex = (Export *) *ap;
 		erts_print(to, to_arg,
-			   "%T:%T/%bpu", (Eterm) ex->code[0], (Eterm) ex->code[1], (Uint) ex->code[2]);
+			   "%T:%T/%bpu", (Eterm) ex->code[0], (Eterm) ex->code[1], ex->code[2]);
 		ap++;
 	    }
 	    break;
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 32ea8588d2..fb90a7d4f7 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -1911,13 +1911,15 @@ void process_main(void)
 	      * Note that for the halfword emulator, the two first elements
 	      * of the array are used.
 	      */
-	     *((BeamInstr **) (UWord) c_p->def_arg_reg) = I+3;
+	     BeamInstr** pi = (BeamInstr**) c_p->def_arg_reg;
+	     *pi = I+3;
 	     set_timer(c_p, unsigned_val(timeout_value));
 	 } else if (timeout_value == am_infinity) {
 	     c_p->flags |= F_TIMO;
 #if !defined(ARCH_64) || HALFWORD_HEAP
 	 } else if (term_to_Uint(timeout_value, &time_val)) {
-	     *((BeamInstr **) (UWord) c_p->def_arg_reg) = I+3;
+	     BeamInstr** pi = (BeamInstr**) c_p->def_arg_reg;
+	     *pi = I+3;
 	     set_timer(c_p, time_val);
 #endif
 	 } else {		/* Wrong time */
@@ -1974,7 +1976,8 @@ void process_main(void)
       * we must test the F_INSLPQUEUE flag as well as the F_TIMO flag.
       */
      if ((c_p->flags & (F_INSLPQUEUE | F_TIMO)) == 0) {
-	 *((BeamInstr **) (UWord) c_p->def_arg_reg) = I+3;
+	 BeamInstr** p = (BeamInstr **) c_p->def_arg_reg;
+	 *p = I+3;
 	 set_timer(c_p, Arg(1));
      }
      goto wait2;
@@ -5322,7 +5325,7 @@ void process_main(void)
 	 ep->code[3] = (BeamInstr) OpCode(apply_bif);
 	 ep->code[4] = (BeamInstr) bif_table[i].f;
 	 /* XXX: set func info for bifs */
-	 ((BeamInstr*)ep->code + 3)[-5] = (BeamInstr) BeamOp(op_i_func_info_IaaI);
+	 ep->fake_op_func_info_for_hipe[0] = (BeamInstr) BeamOp(op_i_func_info_IaaI);
      }
 
      return;
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 6b1ce823cb..68b3350d7f 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -2168,20 +2168,146 @@ BIF_RETTYPE tl_1(BIF_ALIST_1)
 /**********************************************************************/
 /* return the size of an I/O list */
 
-BIF_RETTYPE iolist_size_1(BIF_ALIST_1)
+static Eterm
+accumulate(Eterm acc, Uint size)
 {
-    Sint size = io_list_len(BIF_ARG_1);
+    if (is_non_value(acc)) {
+	/*
+	 * There is no pre-existing accumulator. Allocate a
+	 * bignum buffer with one extra word to be used if
+	 * the bignum grows in the future.
+	 */
+	Eterm* hp = (Eterm *) erts_alloc(ERTS_ALC_T_TEMP_TERM,
+					 (BIG_UINT_HEAP_SIZE+1) *
+					 sizeof(Eterm));
+	return uint_to_big(size, hp);
+    } else {
+	Eterm* big;
+	int need_heap;
 
-    if (size == -1) {
-	BIF_ERROR(BIF_P, BADARG);
-    } else if (IS_USMALL(0, (Uint) size)) {
-	BIF_RET(make_small(size));
+	/*
+	 * Add 'size' to 'acc' in place. There is always one
+	 * extra word allocated in case the bignum grows by one word.
+	 */
+	big = big_val(acc);
+	need_heap = BIG_NEED_SIZE(BIG_SIZE(big));
+	acc = big_plus_small(acc, size, big);
+	if (BIG_NEED_SIZE(big_size(acc)) > need_heap) {
+	    /*
+	     * The extra word has been consumed. Grow the
+	     * allocation by one word.
+	     */
+	    big = (Eterm *) erts_realloc(ERTS_ALC_T_TEMP_TERM,
+					 big_val(acc),
+					 (need_heap+1) * sizeof(Eterm));
+	    acc = make_big(big);
+	}
+	return acc;
+    }
+}
+
+static Eterm
+consolidate(Process* p, Eterm acc, Uint size)
+{
+    Eterm* hp;
+
+    if (is_non_value(acc)) {
+	return erts_make_integer(size, p);
     } else {
-	Eterm* hp = HAlloc(BIF_P, BIG_UINT_HEAP_SIZE);
-	BIF_RET(uint_to_big(size, hp));
+	Eterm* big;
+	Uint sz;
+	Eterm res;
+	
+	acc = accumulate(acc, size);
+	big = big_val(acc);
+	sz = BIG_NEED_SIZE(BIG_SIZE(big));
+	hp = HAlloc(p, sz);
+	res = make_big(hp);
+	while (sz--) {
+	    *hp++ = *big++;
+	}
+	erts_free(ERTS_ALC_T_TEMP_TERM, (void *) big_val(acc));
+	return res;
     }
 }
 
+BIF_RETTYPE iolist_size_1(BIF_ALIST_1)
+{
+    Eterm obj, hd;
+    Eterm* objp;
+    Uint size = 0;
+    Uint cur_size;
+    Uint new_size;
+    Eterm acc = THE_NON_VALUE;
+    DECLARE_ESTACK(s);
+
+    obj = BIF_ARG_1;
+    goto L_again;
+
+    while (!ESTACK_ISEMPTY(s)) {
+	obj = ESTACK_POP(s);
+    L_again:
+	if (is_list(obj)) {
+	L_iter_list:
+	    objp = list_val(obj);
+	    hd = CAR(objp);
+	    obj = CDR(objp);
+	    /* Head */
+	    if (is_byte(hd)) {
+		size++;
+		if (size == 0) {
+		    acc = accumulate(acc, (Uint) -1);
+		    size = 1;
+		}
+	    } else if (is_binary(hd) && binary_bitsize(hd) == 0) {
+		cur_size = binary_size(hd);
+		if ((new_size = size + cur_size) >= size) {
+		    size = new_size;
+		} else {
+		    acc = accumulate(acc, size);
+		    size = cur_size;
+		}
+	    } else if (is_list(hd)) {
+		ESTACK_PUSH(s, obj);
+		obj = hd;
+		goto L_iter_list;
+	    } else if (is_not_nil(hd)) {
+		goto L_type_error;
+	    }
+	    /* Tail */
+	    if (is_list(obj)) {
+		goto L_iter_list;
+	    } else if (is_binary(obj) && binary_bitsize(obj) == 0) {
+		cur_size = binary_size(obj);
+		if ((new_size = size + cur_size) >= size) {
+		    size = new_size;
+		} else {
+		    acc = accumulate(acc, size);
+		    size = cur_size;
+		}
+	    } else if (is_not_nil(obj)) {
+		goto L_type_error;
+	    }
+	} else if (is_binary(obj) && binary_bitsize(obj) == 0) {
+	    cur_size = binary_size(obj);
+	    if ((new_size = size + cur_size) >= size) {
+		size = new_size;
+	    } else {
+		acc = accumulate(acc, size);
+		size = cur_size;
+	    }
+	} else if (is_not_nil(obj)) {
+	    goto L_type_error;
+	}
+    }
+
+    DESTROY_ESTACK(s);
+    BIF_RET(consolidate(BIF_P, acc, size));
+
+ L_type_error:
+    DESTROY_ESTACK(s);
+    BIF_ERROR(BIF_P, BADARG);
+}
 
 /**********************************************************************/
 
@@ -3215,20 +3341,32 @@ BIF_RETTYPE garbage_collect_1(BIF_ALIST_1)
 	BIF_ERROR(BIF_P, BADARG);
     }
 
-    rp = erts_pid2proc_not_running(BIF_P, ERTS_PROC_LOCK_MAIN,
+    if (BIF_P->id == BIF_ARG_1)
+	rp = BIF_P;
+    else {
+#ifdef ERTS_SMP
+	rp = erts_pid2proc_suspend(BIF_P, ERTS_PROC_LOCK_MAIN,
 				   BIF_ARG_1, ERTS_PROC_LOCK_MAIN);
-    if (!rp)
-	BIF_RET(am_false);
-    if (rp == ERTS_PROC_LOCK_BUSY)
-	ERTS_BIF_YIELD1(bif_export[BIF_garbage_collect_1], BIF_P, BIF_ARG_1);
+	if (rp == ERTS_PROC_LOCK_BUSY)
+	    ERTS_BIF_YIELD1(bif_export[BIF_garbage_collect_1], BIF_P, BIF_ARG_1);
+#else
+	rp = erts_pid2proc(BIF_P, 0, BIF_ARG_1, 0);
+#endif
+	if (!rp)
+	    BIF_RET(am_false);
+    }
 
     /* The GC cost is taken for the process executing this BIF. */
 
     FLAGS(rp) |= F_NEED_FULLSWEEP;
     reds = erts_garbage_collect(rp, 0, rp->arg_reg, rp->arity);
 
-    if (BIF_P != rp)
+#ifdef ERTS_SMP
+    if (BIF_P != rp) {
+	erts_resume(rp, ERTS_PROC_LOCK_MAIN);
 	erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_MAIN);
+    }
+#endif
 
     BIF_RET2(am_true, reds);
 }
@@ -3270,6 +3408,7 @@ BIF_RETTYPE ports_0(BIF_ALIST_0)
     Eterm* dead_ports;
     int alive, dead;
     Uint32 next_ss;
+    int i;
 
     /* To get a consistent snapshot... 
      * We add alive ports from start of the buffer
@@ -3281,21 +3420,18 @@ BIF_RETTYPE ports_0(BIF_ALIST_0)
     erts_smp_atomic_set(&erts_dead_ports_ptr,
 			(erts_aint_t) (port_buf + erts_max_ports));
 
-    next_ss = erts_smp_atomic_inctest(&erts_ports_snapshot);
+    next_ss = erts_smp_atomic32_inctest(&erts_ports_snapshot);
 
-    if (erts_smp_atomic_read(&erts_ports_alive) > 0) {
-	erts_aint_t i;
-	for (i = erts_max_ports-1; i >= 0; i--) {
-	    Port* prt = &erts_port[i];
-	    erts_smp_port_state_lock(prt);
-	    if (!(prt->status & ERTS_PORT_SFLGS_DEAD)
-		&& prt->snapshot != next_ss) {
-		ASSERT(prt->snapshot == next_ss - 1);
-		*pp++ = prt->id;		
-		prt->snapshot = next_ss; /* Consumed by this snapshot */
-	    }
-	    erts_smp_port_state_unlock(prt);
+    for (i = erts_max_ports-1; i >= 0; i--) {
+	Port* prt = &erts_port[i];
+	erts_smp_port_state_lock(prt);
+	if (!(prt->status & ERTS_PORT_SFLGS_DEAD)
+	    && prt->snapshot != next_ss) {
+	    ASSERT(prt->snapshot == next_ss - 1);
+	    *pp++ = prt->id;		
+	    prt->snapshot = next_ss; /* Consumed by this snapshot */
 	}
+	erts_smp_port_state_unlock(prt);
     }
 
     dead_ports = (Eterm*)erts_smp_atomic_xchg(&erts_dead_ports_ptr,
@@ -3360,7 +3496,7 @@ BIF_RETTYPE erts_debug_display_1(BIF_ALIST_1)
     erts_dsprintf_buf_t *dsbufp = erts_create_tmp_dsbuf(64);       
     pres = erts_dsprintf(dsbufp, "%.*T\n", INT_MAX, BIF_ARG_1);
     if (pres < 0)
-	erl_exit(1, "Failed to convert term to string: %d (s)\n",
+	erl_exit(1, "Failed to convert term to string: %d (%s)\n",
 		 -pres, erl_errno_id(-pres));
     hp = HAlloc(BIF_P, 2*dsbufp->str_len); /* we need length * 2 heap words */
     res = buf_to_intlist(&hp, dsbufp->str, dsbufp->str_len, NIL);
@@ -3478,7 +3614,7 @@ term2list_dsprintf(Process *p, Eterm term)
     erts_dsprintf_buf_t *dsbufp = erts_create_tmp_dsbuf(64);       
     pres = erts_dsprintf(dsbufp, "%T", term);
     if (pres < 0)
-	erl_exit(1, "Failed to convert term to list: %d (s)\n",
+	erl_exit(1, "Failed to convert term to list: %d (%s)\n",
 		 -pres, erl_errno_id(-pres));
     hp = HAlloc(p, 2*dsbufp->str_len); /* we need length * 2 heap words */
     res = buf_to_intlist(&hp, dsbufp->str, dsbufp->str_len, NIL);
diff --git a/erts/emulator/beam/big.c b/erts/emulator/beam/big.c
index f47f5a9c0c..d18de9ae5d 100644
--- a/erts/emulator/beam/big.c
+++ b/erts/emulator/beam/big.c
@@ -1588,7 +1588,7 @@ big_to_double(Wterm x, double* resp)
 /*
  ** Estimate the number of decimal digits (include sign)
  */
-int big_decimal_estimate(Eterm x)
+int big_decimal_estimate(Wterm x)
 {
     Eterm* xp = big_val(x);
     int lg = I_lg(BIG_V(xp), BIG_SIZE(xp));
@@ -1602,7 +1602,7 @@ int big_decimal_estimate(Eterm x)
 ** Convert a bignum into a string of decimal numbers
 */
 
-static void write_big(Eterm x, void (*write_func)(void *, char), void *arg)
+static void write_big(Wterm x, void (*write_func)(void *, char), void *arg)
 {
     Eterm* xp = big_val(x);
     ErtsDigit* dx = BIG_V(xp);
@@ -1681,7 +1681,7 @@ write_string(void *arg, char c)
     *(--(*((char **) arg))) = c;
 }
 
-char *erts_big_to_string(Eterm x, char *buf, Uint buf_sz)
+char *erts_big_to_string(Wterm x, char *buf, Uint buf_sz)
 {
     char *big_str = buf + buf_sz - 1;
     *big_str = '\0';
diff --git a/erts/emulator/beam/big.h b/erts/emulator/beam/big.h
index f28a390aea..2afc37004f 100644
--- a/erts/emulator/beam/big.h
+++ b/erts/emulator/beam/big.h
@@ -114,9 +114,9 @@ typedef Uint  dsize_t;	 /* Vector size type */
 
 #endif
 
-int big_decimal_estimate(Eterm);
+int big_decimal_estimate(Wterm);
 Eterm erts_big_to_list(Eterm, Eterm**);
-char *erts_big_to_string(Eterm x, char *buf, Uint buf_sz);
+char *erts_big_to_string(Wterm x, char *buf, Uint buf_sz);
 
 Eterm small_times(Sint, Sint, Eterm*);
 
diff --git a/erts/emulator/beam/binary.c b/erts/emulator/beam/binary.c
index 9486602633..1fb39c6c67 100644
--- a/erts/emulator/beam/binary.c
+++ b/erts/emulator/beam/binary.c
@@ -32,11 +32,11 @@
 #include "erl_bits.h"
 
 #ifdef DEBUG
-static int list_to_bitstr_buf(Eterm obj, char* buf, int len);
+static int list_to_bitstr_buf(Eterm obj, char* buf, Uint len);
 #else
 static int list_to_bitstr_buf(Eterm obj, char* buf);
 #endif
-static Sint bitstr_list_len(Eterm obj);
+static int bitstr_list_len(Eterm obj, Uint* num_bytes);
 
 void
 erts_init_binary(void)
@@ -355,21 +355,24 @@ BIF_RETTYPE bitstring_to_list_1(BIF_ALIST_1)
 BIF_RETTYPE erts_list_to_binary_bif(Process *p, Eterm arg)
 {
     Eterm bin;
-    int i;
+    Uint size;
     int offset;
     byte* bytes;
+
     if (is_nil(arg)) {
 	BIF_RET(new_binary(p,(byte*)"",0));
     }
     if (is_not_list(arg)) {
 	goto error;
     }
-    if ((i = io_list_len(arg)) < 0) {
-	goto error;
+    switch (erts_iolist_size(arg, &size)) {
+    case ERTS_IOLIST_OVERFLOW: BIF_ERROR(p, SYSTEM_LIMIT);
+    case ERTS_IOLIST_TYPE: goto error;
+    default: ;
     }
-    bin = new_binary(p, (byte *)NULL, i);
+    bin = new_binary(p, (byte *)NULL, size);
     bytes = binary_bytes(bin);
-    offset = io_list_to_buf(arg, (char*) bytes, i);
+    offset = io_list_to_buf(arg, (char*) bytes, size);
     ASSERT(offset == 0);
     BIF_RET(bin);
     
@@ -396,7 +399,8 @@ BIF_RETTYPE iolist_to_binary_1(BIF_ALIST_1)
 BIF_RETTYPE list_to_bitstring_1(BIF_ALIST_1)
 {
     Eterm bin;
-    int i,offset;
+    Uint sz;
+    int offset;
     byte* bytes;
     ErlSubBin* sb1; 
     Eterm* hp;
@@ -405,15 +409,19 @@ BIF_RETTYPE list_to_bitstring_1(BIF_ALIST_1)
 	BIF_RET(new_binary(BIF_P,(byte*)"",0));
     }
     if (is_not_list(BIF_ARG_1)) {
-	goto error;
+    error:
+	BIF_ERROR(BIF_P, BADARG);
     }
-    if ((i = bitstr_list_len(BIF_ARG_1)) < 0) {
+    switch (bitstr_list_len(BIF_ARG_1, &sz)) {
+    case ERTS_IOLIST_TYPE:
 	goto error;
+    case ERTS_IOLIST_OVERFLOW:
+	BIF_ERROR(BIF_P, SYSTEM_LIMIT);
     }
-    bin = new_binary(BIF_P, (byte *)NULL, i);
+    bin = new_binary(BIF_P, (byte *)NULL, sz);
     bytes = binary_bytes(bin);
 #ifdef DEBUG
-    offset = list_to_bitstr_buf(BIF_ARG_1, (char*) bytes, i);
+    offset = list_to_bitstr_buf(BIF_ARG_1, (char*) bytes, sz);
 #else
     offset = list_to_bitstr_buf(BIF_ARG_1, (char*) bytes);
 #endif
@@ -422,20 +430,16 @@ BIF_RETTYPE list_to_bitstring_1(BIF_ALIST_1)
 	hp = HAlloc(BIF_P, ERL_SUB_BIN_SIZE);
 	sb1 = (ErlSubBin *) hp;
 	sb1->thing_word = HEADER_SUB_BIN;
-	sb1->size = i-1;
+	sb1->size = sz-1;
 	sb1->offs = 0;
 	sb1->orig = bin;
 	sb1->bitoffs = 0;
 	sb1->bitsize = offset;
 	sb1->is_writable = 0;
-	hp += ERL_SUB_BIN_SIZE;
 	bin = make_binary(sb1);
     }
     
     BIF_RET(bin);
-    
-    error:
-	BIF_ERROR(BIF_P, BADARG);
 }
 
 BIF_RETTYPE split_binary_2(BIF_ALIST_2)
@@ -499,7 +503,7 @@ BIF_RETTYPE split_binary_2(BIF_ALIST_2)
  */
 static int
 #ifdef DEBUG
-list_to_bitstr_buf(Eterm obj, char* buf, int len)
+list_to_bitstr_buf(Eterm obj, char* buf, Uint len)
 #else
 list_to_bitstr_buf(Eterm obj, char* buf)
 #endif
@@ -602,8 +606,8 @@ list_to_bitstr_buf(Eterm obj, char* buf)
     return offset;
 }
 
-static Sint
-bitstr_list_len(Eterm obj)
+static int
+bitstr_list_len(Eterm obj, Uint* num_bytes)
 {
     Eterm* objp;
     Uint len = 0;
@@ -611,6 +615,26 @@ bitstr_list_len(Eterm obj)
     DECLARE_ESTACK(s);
     goto L_again;
 
+#define SAFE_ADD(Var, Val)			\
+    do {					\
+        Uint valvar = (Val);			\
+	Var += valvar;				\
+	if (Var < valvar) {			\
+	    goto L_overflow_error;		\
+	}					\
+    } while (0)
+
+#define SAFE_ADD_BITSIZE(Var, Bin)					\
+    do {								\
+	if (*binary_val(Bin) == HEADER_SUB_BIN) {			\
+            Uint valvar = ((ErlSubBin *) binary_val(Bin))->bitsize;	\
+	    Var += valvar;						\
+	    if (Var < valvar) {						\
+	         goto L_overflow_error;					\
+	    }								\
+        }								\
+    } while (0)
+
     while (!ESTACK_ISEMPTY(s)) {
 	obj = ESTACK_POP(s);
     L_again:
@@ -621,9 +645,12 @@ bitstr_list_len(Eterm obj)
 	    obj = CAR(objp);
 	    if (is_byte(obj)) {
 		len++;
+		if (len == 0) {
+		    goto L_overflow_error;
+		}
 	    } else if (is_binary(obj)) {
-		len += binary_size(obj);
-		offs += binary_bitsize(obj);
+		SAFE_ADD(len, binary_size(obj));
+		SAFE_ADD_BITSIZE(offs, obj);
 	    } else if (is_list(obj)) {
 		ESTACK_PUSH(s, CDR(objp));
 		goto L_iter_list; /* on head */
@@ -635,24 +662,44 @@ bitstr_list_len(Eterm obj)
 	    if (is_list(obj))
 		goto L_iter_list; /* on tail */
 	    else if (is_binary(obj)) {
-		len += binary_size(obj);
-		offs += binary_bitsize(obj);
+		SAFE_ADD(len, binary_size(obj));
+		SAFE_ADD_BITSIZE(offs, obj);
 	    } else if (is_not_nil(obj)) {
 		goto L_type_error;
 	    }
 	} else if (is_binary(obj)) {
-	    len += binary_size(obj);
-	    offs += binary_bitsize(obj);
+	    SAFE_ADD(len, binary_size(obj));
+	    SAFE_ADD_BITSIZE(offs, obj);
 	} else if (is_not_nil(obj)) {
 	    goto L_type_error;
 	}
     }
+#undef SAFE_ADD
+#undef SAFE_ADD_BITSIZE
 
     DESTROY_ESTACK(s);
-    return (Sint) (len + (offs/8) + ((offs % 8) != 0));
+
+    /*
+     * Make sure that the number of bits in the bitstring will fit
+     * in an Uint to ensure that the binary can be matched using
+     * the binary syntax.
+     */
+    if (len << 3 < len) {
+	goto L_overflow_error;
+    }
+    len += (offs >> 3) + ((offs & 7) != 0);
+    if (len << 3 < len) {
+	goto L_overflow_error;
+    }
+    *num_bytes = len;
+    return ERTS_IOLIST_OK;
 
  L_type_error:
     DESTROY_ESTACK(s);
-    return (Sint) -1;
+    return ERTS_IOLIST_TYPE;
+
+ L_overflow_error:
+    DESTROY_ESTACK(s);
+    return ERTS_IOLIST_OVERFLOW;
 }
 
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index d255cf3558..b8889e6206 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -266,7 +266,7 @@ print_process_info(int to, void *to_arg, Process *p)
        }
        erts_print(to, to_arg, "Number of heap fragments: %d\n", frags);
     }
-    erts_print(to, to_arg, "Heap fragment data: %bpu\n", MBUF_SIZE(p));
+    erts_print(to, to_arg, "Heap fragment data: %beu\n", MBUF_SIZE(p));
 
     scb = ERTS_PROC_GET_SAVED_CALLS_BUF(p);
     if (scb) {
@@ -313,12 +313,11 @@ print_process_info(int to, void *to_arg, Process *p)
     }
     
     /* print the number of reductions etc */
-    erts_print(to, to_arg, "Reductions: %bpu\n", p->reds);
+    erts_print(to, to_arg, "Reductions: %beu\n", p->reds);
 
-    erts_print(to, to_arg, "Stack+heap: %bpu\n", p->heap_sz);
+    erts_print(to, to_arg, "Stack+heap: %beu\n", p->heap_sz);
     erts_print(to, to_arg, "OldHeap: %bpu\n",
-               (OLD_HEAP(p) == NULL) ? 0 :
-               (unsigned)(OLD_HEND(p) - OLD_HEAP(p)) );
+               (OLD_HEAP(p) == NULL) ? 0 : (OLD_HEND(p) - OLD_HEAP(p)) );
     erts_print(to, to_arg, "Heap unused: %bpu\n", (p->hend - p->htop));
     erts_print(to, to_arg, "OldHeap unused: %bpu\n",
 	       (OLD_HEAP(p) == NULL) ? 0 : (OLD_HEND(p) - OLD_HTOP(p)) );
diff --git a/erts/emulator/beam/copy.c b/erts/emulator/beam/copy.c
index 243e8973cf..90201f3a90 100644
--- a/erts/emulator/beam/copy.c
+++ b/erts/emulator/beam/copy.c
@@ -477,7 +477,7 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
     if (htop != hbot)
 	erl_exit(ERTS_ABORT_EXIT,
 		 "Internal error in copy_struct() when copying %T:"
-		 " htop=%p != hbot=%p (sz=%bpu)\n",
+		 " htop=%p != hbot=%p (sz=%beu)\n",
 		 org_obj, htop, hbot, org_sz); 
 #else
     if (htop > hbot) {
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 05eddf4ae0..b1cdd0660a 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -1687,7 +1687,7 @@ dist_port_command(Port *prt, ErtsDistOutputBuf *obuf)
     if (size > (Uint) INT_MAX)
 	erl_exit(ERTS_ABORT_EXIT,
 		 "Absurdly large distribution output data buffer "
-		 "(%bpu bytes) passed.\n",
+		 "(%beu bytes) passed.\n",
 		 size);
 
     prt->caller = NIL;
@@ -1714,7 +1714,7 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf)
     if (size > (Uint) INT_MAX)
 	erl_exit(ERTS_ABORT_EXIT,
 		 "Absurdly large distribution output data buffer "
-		 "(%bpu bytes) passed.\n",
+		 "(%beu bytes) passed.\n",
 		 size);
 
     iov[0].iov_base = NULL;
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 775f4435a9..cda404af5e 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -90,6 +90,10 @@ typedef union {
 static ErtsAllocatorState_t sl_alloc_state;
 static ErtsAllocatorState_t std_alloc_state;
 static ErtsAllocatorState_t ll_alloc_state;
+#if HALFWORD_HEAP
+static ErtsAllocatorState_t std_alloc_low_state;
+static ErtsAllocatorState_t ll_alloc_low_state;
+#endif
 static ErtsAllocatorState_t temp_alloc_state;
 static ErtsAllocatorState_t eheap_alloc_state;
 static ErtsAllocatorState_t binary_alloc_state;
@@ -166,6 +170,10 @@ typedef struct {
     struct au_init binary_alloc;
     struct au_init ets_alloc;
     struct au_init driver_alloc;
+#if HALFWORD_HEAP
+    struct au_init std_alloc_low;
+    struct au_init ll_alloc_low;
+#endif
 } erts_alc_hndl_args_init_t;
 
 #define ERTS_AU_INIT__ {0, 0, GOODFIT, DEFAULT_ALLCTR_INIT, {1,1,1,1}}
@@ -193,6 +201,10 @@ set_default_sl_alloc_opts(struct au_init *ip)
 #endif
     ip->init.util.ts 		= ERTS_ALC_MTA_SHORT_LIVED;
     ip->init.util.rsbcst	= 80;
+#if HALFWORD_HEAP
+    ip->init.util.low_mem       = 1;
+#endif
+
 }
 
 static void
@@ -256,6 +268,9 @@ set_default_temp_alloc_opts(struct au_init *ip)
     ip->init.util.ts 		= ERTS_ALC_MTA_TEMPORARY;
     ip->init.util.rsbcst	= 90;
     ip->init.util.rmbcmt	= 100;
+#if HALFWORD_HEAP
+    ip->init.util.low_mem       = 1;
+#endif
 }
 
 static void
@@ -275,6 +290,9 @@ set_default_eheap_alloc_opts(struct au_init *ip)
 #endif
     ip->init.util.ts 		= ERTS_ALC_MTA_EHEAP;
     ip->init.util.rsbcst	= 50;
+#if HALFWORD_HEAP
+    ip->init.util.low_mem       = 1;
+#endif
 }
 
 static void
@@ -531,6 +549,20 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     erts_allctrs[ERTS_ALC_A_SYSTEM].free		= erts_sys_free;
     erts_allctrs_info[ERTS_ALC_A_SYSTEM].enabled	= 1;
 
+#if HALFWORD_HEAP
+    /* Init low memory variants by cloning */
+    init.std_alloc_low = init.std_alloc;
+    init.std_alloc_low.init.util.alloc_no = ERTS_ALC_A_STANDARD_LOW;
+    init.std_alloc_low.init.util.low_mem  = 1;
+
+    init.ll_alloc_low = init.ll_alloc;
+    init.ll_alloc_low.init.util.alloc_no = ERTS_ALC_A_LONG_LIVED_LOW;
+    init.ll_alloc_low.init.util.low_mem = 1;
+
+    set_au_allocator(ERTS_ALC_A_STANDARD_LOW, &init.std_alloc_low);
+    set_au_allocator(ERTS_ALC_A_LONG_LIVED_LOW, &init.ll_alloc_low);
+#endif /* HALFWORD */
+
     set_au_allocator(ERTS_ALC_A_TEMPORARY, &init.temp_alloc);
     set_au_allocator(ERTS_ALC_A_SHORT_LIVED, &init.sl_alloc);
     set_au_allocator(ERTS_ALC_A_STANDARD, &init.std_alloc);
@@ -576,7 +608,14 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     start_au_allocator(ERTS_ALC_A_LONG_LIVED,
 		       &init.ll_alloc,
 		       &ll_alloc_state);
-
+#if HALFWORD_HEAP
+    start_au_allocator(ERTS_ALC_A_LONG_LIVED_LOW,
+		       &init.ll_alloc_low,
+		       &ll_alloc_low_state);
+    start_au_allocator(ERTS_ALC_A_STANDARD_LOW,
+		       &init.std_alloc_low,
+		       &std_alloc_low_state);
+#endif
     start_au_allocator(ERTS_ALC_A_EHEAP,
 		       &init.eheap_alloc,
 		       &eheap_alloc_state);
@@ -612,11 +651,9 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     erts_set_fix_size(ERTS_ALC_T_PROC,		sizeof(Process));
     erts_set_fix_size(ERTS_ALC_T_DB_TABLE,	sizeof(DbTable));
     erts_set_fix_size(ERTS_ALC_T_ATOM,		sizeof(Atom));
-    erts_set_fix_size(ERTS_ALC_T_EXPORT,	sizeof(Export));
+
     erts_set_fix_size(ERTS_ALC_T_MODULE,	sizeof(Module));
     erts_set_fix_size(ERTS_ALC_T_REG_PROC,	sizeof(RegProc));
-    erts_set_fix_size(ERTS_ALC_T_MONITOR_SH,	ERTS_MONITOR_SH_SIZE*sizeof(Uint));
-    erts_set_fix_size(ERTS_ALC_T_NLINK_SH,	ERTS_LINK_SH_SIZE*sizeof(Uint));
     erts_set_fix_size(ERTS_ALC_T_FUN_ENTRY,	sizeof(ErlFunEntry));
 #ifdef ERTS_ALC_T_DRV_EV_D_STATE
     erts_set_fix_size(ERTS_ALC_T_DRV_EV_D_STATE,
@@ -626,6 +663,11 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     erts_set_fix_size(ERTS_ALC_T_DRV_SEL_D_STATE,
 		      sizeof(ErtsDrvSelectDataState));
 #endif
+#if !HALFWORD_HEAP
+    erts_set_fix_size(ERTS_ALC_T_EXPORT,	sizeof(Export));
+    erts_set_fix_size(ERTS_ALC_T_MONITOR_SH,	ERTS_MONITOR_SH_SIZE*sizeof(Uint));
+    erts_set_fix_size(ERTS_ALC_T_NLINK_SH,	ERTS_LINK_SH_SIZE*sizeof(Uint));
+#endif
 #endif
 #endif
 
@@ -638,6 +680,15 @@ set_au_allocator(ErtsAlcType_t alctr_n, struct au_init *init)
     ErtsAllocatorInfo_t *ai = &erts_allctrs_info[alctr_n];
     ErtsAllocatorThrSpec_t *tspec = &erts_allctr_thr_spec[alctr_n];
 
+#if HALFWORD_HEAP
+    /* If halfword heap, silently ignore any disabling of internal
+     * allocators for low memory
+     */
+    if (init->init.util.low_mem) {
+	init->enable = 1;
+    }
+#endif
+
     if (!init->enable) {
 	af->alloc = erts_sys_alloc;
 	af->realloc = erts_sys_realloc;
@@ -1348,14 +1399,6 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 	    argv[j++] = argv[i];
     }
     *argc = j;
-#if HALFWORD_HEAP
-    /* If halfword heap, silently ignore any disabling of internal 
-       allocators */
-    for (i = 0; i < aui_sz; ++i)
-	aui[i]->enable = 1;
-#endif
-
-    
 }
 
 static char *type_no_str(ErtsAlcType_t n)
@@ -1528,10 +1571,10 @@ erts_realloc_n_enomem(ErtsAlcType_t n, void *ptr, Uint size)
     erts_alc_fatal_error(ERTS_ALC_E_NOMEM, ERTS_ALC_O_REALLOC, n, size);
 }
 
-static ERTS_INLINE Uint
+static ERTS_INLINE UWord
 alcu_size(ErtsAlcType_t ai)
 {
-    Uint res = 0;
+    UWord res = 0;
 
     ASSERT(erts_allctrs_info[ai].enabled);
     ASSERT(erts_allctrs_info[ai].alloc_util);
@@ -1563,6 +1606,49 @@ alcu_size(ErtsAlcType_t ai)
     return res;
 }
 
+#if HALFWORD_HEAP
+static ERTS_INLINE int
+alcu_is_low(ErtsAlcType_t ai)
+{
+    int is_low = 0;
+    ASSERT(erts_allctrs_info[ai].enabled);
+    ASSERT(erts_allctrs_info[ai].alloc_util);
+
+    if (!erts_allctrs_info[ai].thr_spec) {
+	Allctr_t *allctr = erts_allctrs_info[ai].extra;
+	is_low = allctr->mseg_opt.low_mem;
+    }
+    else {
+	ErtsAllocatorThrSpec_t *tspec = &erts_allctr_thr_spec[ai];
+	int i;
+# ifdef DEBUG
+	int found_one = 0;
+# endif
+
+	ASSERT(tspec->all_thr_safe);
+	ASSERT(tspec->enabled);
+
+	for (i = tspec->size - 1; i >= 0; i--) {
+	    Allctr_t *allctr = tspec->allctr[i];
+	    if (allctr) {
+# ifdef DEBUG
+		if (!found_one) {
+		    is_low = allctr->mseg_opt.low_mem;
+		    found_one = 1;
+		}
+		else ASSERT(is_low == allctr->mseg_opt.low_mem);
+# else
+		is_low = allctr->mseg_opt.low_mem;
+		break;
+# endif
+	    }
+	}
+	ASSERT(found_one);
+    }
+    return is_low;
+}
+#endif /* HALFWORD */
+
 Eterm
 erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 {
@@ -1579,22 +1665,28 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 	int code;
 	int ets;
 	int maximum;
+#if HALFWORD_HEAP
+	int low;
+#endif
     } want = {0};
     struct {
-	Uint total;
-	Uint processes;
-	Uint processes_used;
-	Uint system;
-	Uint atom;
-	Uint atom_used;
-	Uint binary;
-	Uint code;
-	Uint ets;
-	Uint maximum;
+	UWord total;
+	UWord processes;
+	UWord processes_used;
+	UWord system;
+	UWord atom;
+	UWord atom_used;
+	UWord binary;
+	UWord code;
+	UWord ets;
+	UWord maximum;
+#if HALFWORD_HEAP
+	UWord low;
+#endif
     } size = {0};
-    Eterm atoms[sizeof(size)/sizeof(Uint)];
-    Uint *uintps[sizeof(size)/sizeof(Uint)];
-    Eterm euints[sizeof(size)/sizeof(Uint)];
+    Eterm atoms[sizeof(size)/sizeof(UWord)];
+    UWord *uintps[sizeof(size)/sizeof(UWord)];
+    Eterm euints[sizeof(size)/sizeof(UWord)];
     int want_tot_or_sys;
     int length;
     Eterm res = THE_NON_VALUE;
@@ -1646,7 +1738,11 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 	    atoms[length] = am_maximum;
 	    uintps[length++] = &size.maximum;
 	}
-
+#if HALFWORD_HEAP
+	want.low = 1;
+	atoms[length] = am_low;
+	uintps[length++] = &size.low;
+#endif
     }
     else {
 	DeclareTmpHeapNoproc(tmp_heap,2);
@@ -1740,6 +1836,15 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 		    return am_badarg;
 		}
 		break;
+#if HALFWORD_HEAP
+	    case am_low:
+		if (!want.low) {
+		    want.low = 1;
+		    atoms[length] = am_low;
+		    uintps[length++] = &size.low;
+		}
+		break;
+#endif
 	    default:
 		UnUseTmpHeapNoproc(2);
 		return am_badarg;
@@ -1769,7 +1874,7 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 
     ASSERT(length <= sizeof(atoms)/sizeof(Eterm));
     ASSERT(length <= sizeof(euints)/sizeof(Eterm));
-    ASSERT(length <= sizeof(uintps)/sizeof(Uint));
+    ASSERT(length <= sizeof(uintps)/sizeof(UWord));
 
 
     if (proc) {
@@ -1788,8 +1893,8 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 
 	for (ai = ERTS_ALC_A_MIN; ai <= ERTS_ALC_A_MAX; ai++) {
 	    if (erts_allctrs_info[ai].alloc_util) {
-		Uint *save;
-		Uint asz;
+		UWord *save;
+		UWord asz;
 		switch (ai) {
 		case ERTS_ALC_A_TEMPORARY:
 		     /*
@@ -1814,6 +1919,11 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 		if (save)
 		    *save = asz;
 		size.total += asz;
+#if HALFWORD_HEAP
+		if (alcu_is_low(ai)) {
+		    size.low += asz;
+		}
+#endif
 	    }
 	}
     }
@@ -1821,7 +1931,7 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 
 
     if (want_tot_or_sys || want.processes || want.processes_used) {
-	Uint tmp;
+	UWord tmp;
 
 	if (ERTS_MEM_NEED_ALL_ALCU)
 	    tmp = size.processes;
@@ -1836,6 +1946,9 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 
 	size.processes = size.processes_used = tmp;
 
+#if HALFWORD_HEAP
+	/* BUG: We ignore link and monitor memory */
+#else
 	erts_fix_info(ERTS_ALC_T_NLINK_SH, &efi);
 	size.processes += efi.total;
 	size.processes_used += efi.used;
@@ -1843,6 +1956,7 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 	erts_fix_info(ERTS_ALC_T_MONITOR_SH, &efi);
 	size.processes += efi.total;
 	size.processes_used += efi.used;
+#endif
 
 	erts_fix_info(ERTS_ALC_T_PROC, &efi);
 	size.processes += efi.total;
@@ -1879,8 +1993,12 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 	erts_fix_info(ERTS_ALC_T_MODULE, &efi);
 	size.code += efi.used;
 	size.code += export_table_sz();
+#if HALFWORD_HEAP
+	size.code += export_list_size() * sizeof(Export);
+#else
 	erts_fix_info(ERTS_ALC_T_EXPORT, &efi);
 	size.code += efi.used;
+#endif
 	size.code += erts_fun_table_sz();
 	erts_fix_info(ERTS_ALC_T_FUN_ENTRY, &efi);
 	size.code += efi.used;
@@ -1926,9 +2044,9 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 	if (only_one_value) {
 	    ASSERT(length == 1);
 	    hsz = 0;
-	    erts_bld_uint(NULL, &hsz, *uintps[0]);
+	    erts_bld_uword(NULL, &hsz, *uintps[0]);
 	    hp = hsz ? HAlloc((Process *) proc, hsz) : NULL;
-	    res = erts_bld_uint(&hp, NULL, *uintps[0]);
+	    res = erts_bld_uword(&hp, NULL, *uintps[0]);
 	}
 	else {
 	    Uint **hpp = NULL;
@@ -1938,7 +2056,7 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 	    while (1) {
 		int i;
 		for (i = 0; i < length; i++)
-		    euints[i] = erts_bld_uint(hpp, hszp, *uintps[i]);
+		    euints[i] = erts_bld_uword(hpp, hszp, *uintps[i]);
 		res = erts_bld_2tup_list(hpp, hszp, length, atoms, euints);
 		if (hpp)
 		    break;
@@ -2107,11 +2225,11 @@ erts_allocated_areas(int *print_to_p, void *print_to_arg, void *proc)
 	for (i = 0; i < length; i++) {
 	    switch (values[i].arity) {
 	    case 2:
-		erts_print(to, arg, "%s: %bpu\n",
+		erts_print(to, arg, "%s: %beu\n",
 			   values[i].name, values[i].ui[0]);
 		break;
 	    case 3:
-		erts_print(to, arg, "%s: %bpu %bpu\n",
+		erts_print(to, arg, "%s: %beu %beu\n",
 			   values[i].name, values[i].ui[0], values[i].ui[1]);
 		break;
 	    default:
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index ca71798917..c6cc0e1fac 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -75,6 +75,11 @@ allocator	EHEAP		true		eheap_alloc
 allocator	ETS		true		ets_alloc
 allocator	FIXED_SIZE	true		fix_alloc
 
++if halfword
+allocator	LONG_LIVED_LOW	true		ll_alloc_low
+allocator	STANDARD_LOW	true		std_alloc_low
++endif
+
 +else # Non smp build
 
 allocator	TEMPORARY	false		temp_alloc
@@ -85,12 +90,18 @@ allocator	EHEAP		false		eheap_alloc
 allocator	ETS		false		ets_alloc
 allocator	FIXED_SIZE	false		fix_alloc
 
++if halfword
+allocator	LONG_LIVED_LOW	false		ll_alloc_low
+allocator	STANDARD_LOW	false		std_alloc_low
++endif
+
 +endif
 
 allocator	BINARY		true		binary_alloc
 allocator	DRIVER		true		driver_alloc
 
 
+
 # --- Class declarations -----------------------------------------------------
 #
 # Syntax: class <CLASS> <DESCRIPTION>
@@ -125,14 +136,9 @@ class	SYSTEM		system_data
 
 type	PROC		FIXED_SIZE	PROCESSES	proc
 type	ATOM		FIXED_SIZE	ATOM		atom_entry
-type	EXPORT		FIXED_SIZE	CODE		export_entry
 type	MODULE		FIXED_SIZE	CODE		module_entry
 type	REG_PROC	FIXED_SIZE	PROCESSES	reg_proc
 type	LINK_LH		STANDARD	PROCESSES	link_lh
-type	MONITOR_SH	FIXED_SIZE	PROCESSES	monitor_sh
-type	MONITOR_LH	STANDARD	PROCESSES	monitor_lh
-type	NLINK_SH	FIXED_SIZE	PROCESSES	nlink_sh
-type	NLINK_LH	STANDARD	PROCESSES	nlink_lh
 type	SUSPEND_MON	STANDARD	PROCESSES	suspend_monitor
 type	PEND_SUSPEND	SHORT_LIVED	PROCESSES	pending_suspend
 type	PROC_LIST	SHORT_LIVED	PROCESSES	proc_list
@@ -175,7 +181,6 @@ type	DRIVER		STANDARD	SYSTEM		driver
 type	NIF		DRIVER		SYSTEM		nif_internal
 type	BINARY		BINARY		BINARIES	binary
 type	NBIF_TABLE	SYSTEM		SYSTEM		nbif_tab
-type	CODE		LONG_LIVED	CODE		code
 type	ARG_REG		STANDARD	PROCESSES	arg_reg
 type	PROC_DICT	STANDARD	PROCESSES	proc_dict
 type	CALLS_BUF	STANDARD	PROCESSES	calls_buf
@@ -193,10 +198,8 @@ type	DB_FIXATION	SHORT_LIVED	ETS		db_fixation
 type	DB_FIX_DEL	SHORT_LIVED	ETS		fixed_del
 type	DB_TABLES	LONG_LIVED	ETS		db_tabs
 type    DB_NTAB_ENT	STANDARD	ETS		db_named_table_entry
-type	DB_HEIR_DATA	STANDARD	ETS		db_heir_data
 type	DB_TMP		TEMPORARY	ETS		db_tmp
 type	DB_MC_STK	TEMPORARY	ETS		db_mc_stack
-type	DB_MS_PSDO_PROC	LONG_LIVED	ETS		db_match_pseudo_proc
 type	DB_MS_RUN_HEAP	SHORT_LIVED	ETS		db_match_spec_run_heap
 type	DB_MS_CMPL_HEAP	TEMPORARY	ETS		db_match_spec_cmpl_heap
 type	DB_SEG		ETS		ETS		db_segment
@@ -213,10 +216,8 @@ type	LOGGER_DSBUF	TEMPORARY	SYSTEM		logger_dsbuf
 type	TMP_DSBUF	TEMPORARY	SYSTEM		tmp_dsbuf
 type	INFO_DSBUF	SYSTEM		SYSTEM		info_dsbuf
 # INFO_DSBUF have to use the SYSTEM allocator; otherwise, a deadlock might occur
-type	SCHDLR_DATA	LONG_LIVED	SYSTEM		scheduler_data
 type	SCHDLR_SLP_INFO	LONG_LIVED	SYSTEM		scheduler_sleep_info
 type	RUNQS		LONG_LIVED	SYSTEM		run_queues
-type	DDLL_PROCESS	STANDARD	SYSTEM		ddll_processes
 type	DDLL_HANDLE	STANDARD	SYSTEM		ddll_handle
 type	DDLL_ERRCODES	LONG_LIVED	SYSTEM		ddll_errcodes
 type	DDLL_TMP_BUF	TEMPORARY	SYSTEM		ddll_tmp_buf
@@ -327,13 +328,45 @@ type	SSB		SHORT_LIVED	PROCESSES	ssb
 +endif
 
 
++if halfword
+
+type	DDLL_PROCESS	STANDARD_LOW	SYSTEM		ddll_processes
+type	MONITOR_LH	STANDARD_LOW	PROCESSES	monitor_lh
+type	NLINK_LH	STANDARD_LOW	PROCESSES	nlink_lh
+type	CODE		LONG_LIVED_LOW	CODE		code
+type	DB_HEIR_DATA	STANDARD_LOW	ETS		db_heir_data
+type	DB_MS_PSDO_PROC	LONG_LIVED_LOW	ETS		db_match_pseudo_proc
+type	SCHDLR_DATA	LONG_LIVED_LOW	SYSTEM		scheduler_data
+type  	LL_TEMP_TERM 	LONG_LIVED_LOW	SYSTEM		ll_temp_term
+
+# no FIXED_SIZE for low memory
+type	EXPORT		STANDARD_LOW	CODE		export_entry
+type	MONITOR_SH	STANDARD_LOW	PROCESSES	monitor_sh
+type	NLINK_SH	STANDARD_LOW	PROCESSES	nlink_sh
+
++else # "fullword"
+
+type	DDLL_PROCESS	STANDARD	SYSTEM		ddll_processes
+type	MONITOR_LH	STANDARD	PROCESSES	monitor_lh
+type	NLINK_LH	STANDARD	PROCESSES	nlink_lh
+type	CODE		LONG_LIVED	CODE		code
+type	DB_HEIR_DATA	STANDARD	ETS		db_heir_data
+type	DB_MS_PSDO_PROC	LONG_LIVED	ETS		db_match_pseudo_proc
+type	SCHDLR_DATA	LONG_LIVED	SYSTEM		scheduler_data
+type  	LL_TEMP_TERM 	LONG_LIVED	SYSTEM		ll_temp_term
+
+type	EXPORT		FIXED_SIZE	CODE		export_entry
+type	MONITOR_SH	FIXED_SIZE	PROCESSES	monitor_sh
+type	NLINK_SH	FIXED_SIZE	PROCESSES	nlink_sh
+
++endif
+
+
 #
 # Types used by system specific code
 #
 
 type  	TEMP_TERM 	TEMPORARY	SYSTEM		temp_term
-type  	LL_TEMP_TERM 	LONG_LIVED	SYSTEM		ll_temp_term
-
 type	DRV_TAB		LONG_LIVED	SYSTEM		drv_tab
 type	DRV_EV_STATE	LONG_LIVED	SYSTEM		driver_event_state
 type	DRV_EV_D_STATE	FIXED_SIZE	SYSTEM		driver_event_data_state
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index 1394b7e829..cc04ef65bf 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -1639,6 +1639,9 @@ static struct {
     Eterm e;
     Eterm t;
     Eterm ramv;
+#if HALFWORD_HEAP
+    Eterm low;
+#endif
     Eterm sbct;
 #if HAVE_ERTS_MSEG
     Eterm asbcst;
@@ -1724,6 +1727,9 @@ init_atoms(Allctr_t *allctr)
 	AM_INIT(e);
 	AM_INIT(t);
 	AM_INIT(ramv);
+#if HALFWORD_HEAP
+	AM_INIT(low);
+#endif
 	AM_INIT(sbct);
 #if HAVE_ERTS_MSEG
 	AM_INIT(asbcst);
@@ -1877,7 +1883,7 @@ sz_info_carriers(Allctr_t *allctr,
 		   cs->blocks.max_ever.size);
 	erts_print(to,
 		   arg,
-		   "%scarriers size: %bpu %bpu %bpu\n",
+		   "%scarriers size: %beu %bpu %bpu\n",
 		   prefix,
 		   curr_size,
 		   cs->max.size,
@@ -1933,7 +1939,7 @@ info_carriers(Allctr_t *allctr,
 		   cs->blocks.max_ever.size);
 	erts_print(to,
 		   arg,
-		   "%scarriers: %bpu %bpu %bpu\n",
+		   "%scarriers: %beu %bpu %bpu\n",
 		   prefix,
 		   curr_no,
 		   cs->max.no,
@@ -1952,7 +1958,7 @@ info_carriers(Allctr_t *allctr,
 		   cs->curr_sys_alloc.no);
 	erts_print(to,
 		   arg,
-		   "%scarriers size: %bpu %bpu %bpu\n",
+		   "%scarriers size: %beu %bpu %bpu\n",
 		   prefix,
 		   curr_size,
 		   cs->max.size,
@@ -2053,15 +2059,15 @@ info_calls(Allctr_t *allctr,
 
 #define PRINT_CC_4(TO, TOA, NAME, CC)					\
     if ((CC).giga_no == 0)						\
-	erts_print(TO, TOA, "%s calls: %bpu\n", NAME, CC.no);		\
+	erts_print(TO, TOA, "%s calls: %b32u\n", NAME, CC.no);		\
     else								\
-	erts_print(TO, TOA, "%s calls: %bpu%09lu\n", NAME, CC.giga_no, CC.no)
+	erts_print(TO, TOA, "%s calls: %b32u%09lu\n", NAME, CC.giga_no, CC.no)
 
 #define PRINT_CC_5(TO, TOA, PRFX, NAME, CC)				\
     if ((CC).giga_no == 0)						\
-	erts_print(TO, TOA, "%s%s calls: %bpu\n",PRFX,NAME,CC.no);	\
+	erts_print(TO, TOA, "%s%s calls: %b32u\n",PRFX,NAME,CC.no);	\
     else								\
-	erts_print(TO, TOA, "%s%s calls: %bpu%09lu\n",PRFX,NAME,CC.giga_no,CC.no)
+	erts_print(TO, TOA, "%s%s calls: %b32u%09lu\n",PRFX,NAME,CC.giga_no,CC.no)
 
 	char *prefix = allctr->name_prefix;
 	int to = *print_to_p;
@@ -2168,23 +2174,29 @@ info_options(Allctr_t *allctr,
 		   "option e: true\n"
 		   "option t: %s\n"
 		   "option ramv: %s\n"
-		   "option sbct: %bpu\n"
+#if HALFWORD_HEAP
+		   "option low: %s\n"
+#endif
+		   "option sbct: %beu\n"
 #if HAVE_ERTS_MSEG
 		   "option asbcst: %bpu\n"
 		   "option rsbcst: %bpu\n"
 #endif
-		   "option rsbcmt: %bpu\n"
-		   "option rmbcmt: %bpu\n"
-		   "option mmbcs: %bpu\n"
+		   "option rsbcmt: %beu\n"
+		   "option rmbcmt: %beu\n"
+		   "option mmbcs: %beu\n"
 #if HAVE_ERTS_MSEG
-		   "option mmsbc: %bpu\n"
-		   "option mmmbc: %bpu\n"
+		   "option mmsbc: %beu\n"
+		   "option mmmbc: %beu\n"
 #endif
-		   "option lmbcs: %bpu\n"
-		   "option smbcs: %bpu\n"
-		   "option mbcgs: %bpu\n",
+		   "option lmbcs: %beu\n"
+		   "option smbcs: %beu\n"
+		   "option mbcgs: %beu\n",
 		   topt,
 		   allctr->ramv ? "true" : "false",
+#if HALFWORD_HEAP
+		   allctr->mseg_opt.low_mem ? "true" : "false",
+#endif
 		   allctr->sbc_threshold,
 #if HAVE_ERTS_MSEG
 		   allctr->mseg_opt.abs_shrink_th,
@@ -2243,6 +2255,9 @@ info_options(Allctr_t *allctr,
 	add_2tup(hpp, szp, &res,
 		 am.sbct,
 		 bld_uint(hpp, szp, allctr->sbc_threshold));
+#if HALFWORD_HEAP
+	add_2tup(hpp, szp, &res, am.low, allctr->mseg_opt.low_mem ? am_true : am_false);
+#endif
 	add_2tup(hpp, szp, &res, am.ramv, allctr->ramv ? am_true : am_false);
 	add_2tup(hpp, szp, &res, am.t, (allctr->t
 					? bld_uint(hpp, szp, (Uint) allctr->t)
@@ -2292,9 +2307,9 @@ erts_alcu_au_info_options(int *print_to_p, void *print_to_arg,
 	erts_print(*print_to_p,
 		   print_to_arg,
 #if HAVE_ERTS_MSEG
-		   "option mmc: %bpu\n"
+		   "option mmc: %beu\n"
 #endif
-		   "option ycs: %bpu\n",
+		   "option ycs: %beu\n",
 #if HAVE_ERTS_MSEG
 		   max_mseg_carriers,
 #endif
@@ -3105,13 +3120,12 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 	goto error;
 
 #if HAVE_ERTS_MSEG
-    {
-	ErtsMsegOpt_t mseg_opt = ERTS_MSEG_DEFAULT_OPT_INITIALIZER;
-    
-	sys_memcpy((void *) &allctr->mseg_opt,
-		   (void *) &mseg_opt,
-		   sizeof(ErtsMsegOpt_t));
-    }
+    sys_memcpy((void *) &allctr->mseg_opt,
+	       (void *) &erts_mseg_default_opt,
+	       sizeof(ErtsMsegOpt_t));
+# if HALFWORD_HEAP
+    allctr->mseg_opt.low_mem = init->low_mem;
+# endif
 #endif
 
     allctr->name_prefix			= init->name_prefix;
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index d296081714..ddf84c086c 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -38,6 +38,7 @@ typedef struct {
     int tspec;
     int tpref;
     int ramv;
+    int low_mem;   /* HALFWORD only */
     UWord sbct;
     UWord asbcst;
     UWord rsbcst;
@@ -70,6 +71,7 @@ typedef struct {
     0,			/* (bool)   tspec:  thread specific              */\
     0,			/* (bool)   tpref:  thread preferred             */\
     0,			/* (bool)   ramv:   realloc always moves         */\
+    0,			/* (bool)   low_mem: HALFWORD only               */\
     512*1024,		/* (bytes)  sbct:   sbc threshold                */\
     2*1024*2024,	/* (amount) asbcst: abs sbc shrink threshold     */\
     20,			/* (%)      rsbcst: rel sbc shrink threshold     */\
@@ -97,6 +99,7 @@ typedef struct {
     0,			/* (bool)   tspec:  thread specific              */\
     0,			/* (bool)   tpref:  thread preferred             */\
     0,			/* (bool)   ramv:   realloc always moves         */\
+    0,			/* (bool)   low_mem: HALFWORD only               */\
     64*1024,		/* (bytes)  sbct:   sbc threshold                */\
     2*1024*2024,	/* (amount) asbcst: abs sbc shrink threshold     */\
     20,			/* (%)      rsbcst: rel sbc shrink threshold     */\
diff --git a/erts/emulator/beam/erl_bif_ddll.c b/erts/emulator/beam/erl_bif_ddll.c
index c9cdcb87a6..9631fb50db 100644
--- a/erts/emulator/beam/erl_bif_ddll.c
+++ b/erts/emulator/beam/erl_bif_ddll.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2006-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2006-2011. 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
@@ -146,7 +146,7 @@ BIF_RETTYPE erl_ddll_try_load_3(Process *p, Eterm path_term,
 				Eterm name_term, Eterm options)
 {
     char *path = NULL;
-    int path_len;
+    Uint path_len;
     char *name = NULL;
     DE_Handle *dh;
     erts_driver_t *drv;
@@ -221,9 +221,7 @@ BIF_RETTYPE erl_ddll_try_load_3(Process *p, Eterm path_term,
 	goto error;
     }
 
-    path_len = io_list_len(path_term);
-
-    if (path_len <= 0) {
+    if (erts_iolist_size(path_term, &path_len)) {
 	goto error;
     }
     path = erts_alloc(ERTS_ALC_T_DDLL_TMP_BUF, path_len + 1 /* might need path separator */ + sys_strlen(name) + 1);
@@ -1878,7 +1876,7 @@ static Eterm mkatom(char *str)
 static char *pick_list_or_atom(Eterm name_term)
 { 
     char *name = NULL;
-    int name_len;
+    Uint name_len;
     if (is_atom(name_term)) {
 	Atom *ap = atom_tab(atom_val(name_term));
 	if (ap->len == 0) {
@@ -1890,8 +1888,7 @@ static char *pick_list_or_atom(Eterm name_term)
 	memcpy(name,ap->name,ap->len);
 	name[ap->len] = '\0';
     } else {
-	name_len = io_list_len(name_term);
-	if (name_len <= 0) {
+	if (erts_iolist_size(name_term, &name_len)) {
 	    goto error;
 	}
 	name = erts_alloc(ERTS_ALC_T_DDLL_TMP_BUF, name_len + 1);
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 71206c48b2..f264bf44df 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -71,9 +71,9 @@ static char erts_system_version[] = ("Erlang " ERLANG_OTP_RELEASE
 #endif
 #endif
 #ifdef ERTS_SMP
-				     " [smp:%bpu:%bpu]"
+				     " [smp:%beu:%beu]"
 #endif
-				     " [rq:%bpu]"
+				     " [rq:%beu]"
 #ifdef USE_THREADS
 				     " [async-threads:%d]"
 #endif
@@ -1732,14 +1732,14 @@ info_1_tuple(Process* BIF_P,	/* Pointer to current process. */
 #    define ERTS_ERROR_CHECKER_PRINTF_XML VALGRIND_PRINTF_XML
 #  endif
 #endif
-	    int buf_size = 8*1024; /* Try with 8KB first */
+	    Uint buf_size = 8*1024; /* Try with 8KB first */
 	    char *buf = erts_alloc(ERTS_ALC_T_TMP, buf_size);
 	    int r = io_list_to_buf(*tp, (char*) buf, buf_size - 1);
 	    if (r < 0) {
 		erts_free(ERTS_ALC_T_TMP, (void *) buf);
-		buf_size = io_list_len(*tp);
-		if (buf_size < 0)
+		if (erts_iolist_size(*tp, &buf_size)) {
 		    goto badarg;
+		}
 		buf_size++;
 		buf = erts_alloc(ERTS_ALC_T_TMP, buf_size);
 		r = io_list_to_buf(*tp, (char*) buf, buf_size - 1);
diff --git a/erts/emulator/beam/erl_bif_port.c b/erts/emulator/beam/erl_bif_port.c
index fbc92b9730..3fd35dd963 100644
--- a/erts/emulator/beam/erl_bif_port.c
+++ b/erts/emulator/beam/erl_bif_port.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2001-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2011. 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
@@ -996,6 +996,7 @@ static byte* convert_environment(Process* p, Eterm env)
     Eterm* hp;
     Uint heap_size;
     int n;
+    Uint size;
     byte* bytes;
 
     if ((n = list_length(env)) < 0) {
@@ -1039,15 +1040,15 @@ static byte* convert_environment(Process* p, Eterm env)
     if (is_not_nil(env)) {
 	goto done;
     }
-    if ((n = io_list_len(all)) < 0) {
+    if (erts_iolist_size(all, &size)) {
 	goto done;
     }
 
     /*
      * Put the result in a binary (no risk for a memory leak that way).
      */
-    (void) erts_new_heap_binary(p, NULL, n, &bytes);
-    io_list_to_buf(all, (char*)bytes, n);
+    (void) erts_new_heap_binary(p, NULL, size, &bytes);
+    io_list_to_buf(all, (char*)bytes, size);
 
  done:
     erts_free(ERTS_ALC_T_TMP, temp_heap);
diff --git a/erts/emulator/beam/erl_bif_re.c b/erts/emulator/beam/erl_bif_re.c
index d4a8a3aaa7..26891c4348 100644
--- a/erts/emulator/beam/erl_bif_re.c
+++ b/erts/emulator/beam/erl_bif_re.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. 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
@@ -417,7 +417,7 @@ build_compile_result(Process *p, Eterm error_tag, pcre *result, int errcode, con
 BIF_RETTYPE
 re_compile_2(BIF_ALIST_2)
 {
-    int slen;
+    Uint slen;
     char *expr;
     pcre *result;
     int errcode = 0;
@@ -444,7 +444,7 @@ re_compile_2(BIF_ALIST_2)
 	BIF_TRAP2(ucompile_trap_exportp, BIF_P, BIF_ARG_1, BIF_ARG_2);
     }
 
-    if ((slen = io_list_len(BIF_ARG_1)) < 0) {
+    if (erts_iolist_size(BIF_ARG_1, &slen)) {
         BIF_ERROR(BIF_P,BADARG);
     }
     expr = erts_alloc(ERTS_ALC_T_RE_TMP_BUF, slen + 1);
@@ -795,8 +795,8 @@ build_capture(Eterm capture_spec[CAPSPEC_SIZE], const pcre *code)
 			memcpy(tmpb,ap->name,ap->len);
 			tmpb[ap->len] = '\0';
 		    } else {
-			int slen = io_list_len(val);
-			if (slen < 0) {
+			Uint slen;
+			if (erts_iolist_size(val, &slen)) {
 			    goto error;
 			}
 			if ((slen + 1) > tmpbsiz) {
@@ -851,7 +851,7 @@ re_run_3(BIF_ALIST_3)
     const pcre *code_tmp;
     RestartContext restart;
     byte *temp_alloc = NULL;
-    int slength;
+    Uint slength;
     int startoffset = 0;
     int options = 0, comp_options = 0;
     int ovsize;
@@ -875,7 +875,7 @@ re_run_3(BIF_ALIST_3)
     if (is_not_tuple(BIF_ARG_2) || (arityval(*tuple_val(BIF_ARG_2)) != 4)) {
 	if (is_binary(BIF_ARG_2) || is_list(BIF_ARG_2) || is_nil(BIF_ARG_2)) { 
 	    /* Compile from textual RE */
-	    int slen;
+	    Uint slen;
 	    char *expr;
 	    pcre *result;
 	    int errcode = 0;
@@ -889,7 +889,7 @@ re_run_3(BIF_ALIST_3)
 		BIF_TRAP3(urun_trap_exportp, BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3);
 	    }
 	    
-	    if ((slen = io_list_len(BIF_ARG_2)) < 0) {
+	    if (erts_iolist_size(BIF_ARG_2, &slen)) {
 		BIF_ERROR(BIF_P,BADARG);
 	    }
 	    
@@ -1027,7 +1027,7 @@ re_run_3(BIF_ALIST_3)
 	restart.flags |= RESTART_FLAG_SUBJECT_IN_BINARY;
     } else {
 handle_iolist:
-	if ((slength = io_list_len(BIF_ARG_1)) < 0) {
+	if (erts_iolist_size(BIF_ARG_1, &slength)) {
 	    erts_free(ERTS_ALC_T_RE_SUBJECT, restart.ovector);
 	    erts_free(ERTS_ALC_T_RE_SUBJECT, restart.code);
 	    if (restart.ret_info != NULL) {
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index 61e8a595be..e0a6aa05c6 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -3737,7 +3737,7 @@ static void print_table(int to, void *to_arg, int show,  DbTable* tb)
 
     erts_print(to, to_arg, "Objects: %d\n", (int)erts_smp_atomic_read(&tb->common.nitems));
     erts_print(to, to_arg, "Words: %bpu\n",
-	       (Uint) ((erts_smp_atomic_read(&tb->common.memory_size)
+	       (UWord) ((erts_smp_atomic_read(&tb->common.memory_size)
 			+ sizeof(Uint)
 			- 1)
 		       / sizeof(Uint)));
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c
index 9ef990cc4f..fdc82c8b88 100644
--- a/erts/emulator/beam/erl_db_hash.c
+++ b/erts/emulator/beam/erl_db_hash.c
@@ -105,7 +105,7 @@
 #define NSEG_2   256 /* Size of second segment table */
 #define NSEG_INC 128 /* Number of segments to grow after that */
 
-#define SEGTAB(tb) ((struct segment**)erts_smp_atomic_read(&(tb)->segtab))
+#define SEGTAB(tb) ((struct segment**)erts_smp_atomic_read_acqb(&(tb)->segtab))
 #define NACTIVE(tb) ((int)erts_smp_atomic_read(&(tb)->nactive))
 #define NITEMS(tb) ((int)erts_smp_atomic_read(&(tb)->common.nitems))
 
@@ -122,8 +122,8 @@
 */
 static ERTS_INLINE Uint hash_to_ix(DbTableHash* tb, HashValue hval)
 {
-    Uint mask = erts_smp_atomic_read(&tb->szm);
-    Uint ix = hval & mask; 
+    Uint mask = erts_smp_atomic_read_acqb(&tb->szm);
+    Uint ix = hval & mask;
     if (ix >= erts_smp_atomic_read(&tb->nactive)) {
 	ix &= mask>>1;
 	ASSERT(ix < erts_smp_atomic_read(&tb->nactive));
@@ -668,6 +668,7 @@ int db_create_hash(Process *p, DbTable *tbl)
     else { /* coarse locking */
 	tb->locks = NULL;
     }
+    ERTS_THR_MEMORY_BARRIER;
 #endif /* ERST_SMP */
     return DB_ERROR_NONE;
 }
@@ -2085,7 +2086,14 @@ static void db_print_hash(int to, void *to_arg, int show, DbTable *tbl)
 	    while(list != 0) {
 		if (list->hvalue == INVALID_HASH)
 		    erts_print(to, to_arg, "*");
-		erts_print(to, to_arg, "%T", make_tuple(list->dbterm.tpl));
+		if (tb->common.compress) {
+		    Eterm key = GETKEY(tb, list->dbterm.tpl);
+		    erts_print(to, to_arg, "key=%R", key, list->dbterm.tpl);
+		}
+		else {
+		    Eterm obj = make_tuple_rel(list->dbterm.tpl,list->dbterm.tpl);
+		    erts_print(to, to_arg, "%R", obj, list->dbterm.tpl);
+		}
 		if (list->next != 0)
 		    erts_print(to, to_arg, ",");
 		list = list->next;
@@ -2342,7 +2350,7 @@ static int alloc_seg(DbTableHash *tb)
 	    struct ext_segment* eseg;
 	    eseg = (struct ext_segment*) SEGTAB(tb)[seg_ix-1];
 	    MY_ASSERT(eseg!=NULL && eseg->s.is_ext_segment);
-	    erts_smp_atomic_set(&tb->segtab, (erts_aint_t) eseg->segtab);
+	    erts_smp_atomic_set_relb(&tb->segtab, (erts_aint_t) eseg->segtab);
 	    tb->nsegs = eseg->nsegs;
 	}
 	ASSERT(seg_ix < tb->nsegs);
@@ -2414,7 +2422,7 @@ static int free_seg(DbTableHash *tb, int free_records)
 	    MY_ASSERT(newtop->s.is_ext_segment);
 	    if (newtop->prev_segtab != NULL) {
 		/* Time to use a smaller segtab */
-		erts_smp_atomic_set(&tb->segtab, (erts_aint_t)newtop->prev_segtab);
+		erts_smp_atomic_set_relb(&tb->segtab, (erts_aint_t)newtop->prev_segtab);
 		tb->nsegs = seg_ix;
 		ASSERT(tb->nsegs == EXTSEG(SEGTAB(tb))->nsegs);
 	    }
@@ -2431,7 +2439,7 @@ static int free_seg(DbTableHash *tb, int free_records)
     if (seg_ix > 0) {
 	if (seg_ix < tb->nsegs) SEGTAB(tb)[seg_ix] = NULL;
     } else {
-	erts_smp_atomic_set(&tb->segtab, (erts_aint_t)NULL);
+	erts_smp_atomic_set_relb(&tb->segtab, (erts_aint_t)NULL);
     }
 #endif
     tb->nslots -= SEGSZ;
@@ -2526,9 +2534,9 @@ static void grow(DbTableHash* tb, int nactive)
     }
     erts_smp_atomic_inc(&tb->nactive);
     if (from_ix == 0) {
-	erts_smp_atomic_set(&tb->szm, szm);
+	erts_smp_atomic_set_relb(&tb->szm, szm);
     }
-    erts_smp_atomic_set(&tb->is_resizing, 0);
+    erts_smp_atomic_set_relb(&tb->is_resizing, 0);
 
     /* Finally, let's split the bucket. We try to do it in a smart way
        to keep link order and avoid unnecessary updates of next-pointers */
@@ -2560,7 +2568,7 @@ static void grow(DbTableHash* tb, int nactive)
     return;
    
 abort:
-    erts_smp_atomic_set(&tb->is_resizing, 0);
+    erts_smp_atomic_set_relb(&tb->is_resizing, 0);
 }
 
 
@@ -2604,7 +2612,7 @@ static void shrink(DbTableHash* tb, int nactive)
 	    
 	    erts_smp_atomic_set(&tb->nactive, src_ix);
 	    if (dst_ix == 0) {
-		erts_smp_atomic_set(&tb->szm, low_szm);
+		erts_smp_atomic_set_relb(&tb->szm, low_szm);
 	    }
 	    WUNLOCK_HASH(lck);
 	    
@@ -2618,7 +2626,7 @@ static void shrink(DbTableHash* tb, int nactive)
 
     }
     /*else already done */
-    erts_smp_atomic_set(&tb->is_resizing, 0);
+    erts_smp_atomic_set_relb(&tb->is_resizing, 0);
 }
 
 
diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c
index a59c0c258d..9a0ba3a418 100644
--- a/erts/emulator/beam/erl_db_tree.c
+++ b/erts/emulator/beam/erl_db_tree.c
@@ -111,7 +111,7 @@ static void release_stack(DbTableTree* tb, DbTreeStack* stack)
 {
     if (stack == &tb->static_stack) {
 	ASSERT(erts_smp_atomic_read(&tb->is_stack_busy) == 1);
-	erts_smp_atomic_set(&tb->is_stack_busy, 0);
+	erts_smp_atomic_set_relb(&tb->is_stack_busy, 0);
     }
     else {
 	erts_db_free(ERTS_ALC_T_DB_STK, (DbTable *) tb,
@@ -179,7 +179,7 @@ static ERTS_INLINE TreeDbTerm* replace_dbterm(DbTableTree *tb, TreeDbTerm* old,
 static TreeDbTerm *traverse_until(TreeDbTerm *t, int *current, int to);
 static void check_slot_pos(DbTableTree *tb);
 static void check_saved_stack(DbTableTree *tb);
-static int check_table_tree(TreeDbTerm *t);
+static int check_table_tree(DbTableTree* tb, TreeDbTerm *t);
 
 #define TREE_DEBUG
 #endif
@@ -194,8 +194,8 @@ static int check_table_tree(TreeDbTerm *t);
 ** Debugging dump
 */
 
-static void do_dump_tree2(int to, void *to_arg, int show, TreeDbTerm *t,
-			  int offset);
+static void do_dump_tree2(DbTableTree*, int to, void *to_arg, int show,
+			  TreeDbTerm *t, int offset);
 
 #else
 
@@ -1730,6 +1730,7 @@ static int db_select_delete_tree(Process *p, DbTable *tbl,
 ** Other interface routines (not directly coupled to one bif)
 */
 
+
 /* Display tree contents (for dump) */
 static void db_print_tree(int to, void *to_arg, 
 			  int show,
@@ -1740,7 +1741,7 @@ static void db_print_tree(int to, void *to_arg,
     if (show)
 	erts_print(to, to_arg, "\nTree data dump:\n"
 		   "------------------------------------------------\n");
-    do_dump_tree2(to, to_arg, show, tb->root, 0);
+    do_dump_tree2(&tbl->tree, to, to_arg, show, tb->root, 0);
     if (show)
 	erts_print(to, to_arg, "\n"
 		   "------------------------------------------------\n");
@@ -2694,7 +2695,7 @@ static Sint do_cmp_partly_bound(Eterm a, Eterm b, Eterm* b_base, int *done)
 	while (1) {
 	    if ((j = do_cmp_partly_bound(*aa++, *bb++, b_base, done)) != 0 || *done)
 		return j;
-	    if (*aa==*bb)
+	    if (is_same(*aa, NULL, *bb, b_base))
 		return 0;
 	    if (is_not_list(*aa) || is_not_list(*bb))
 		return do_cmp_partly_bound(*aa, *bb, b_base, done);
@@ -2742,7 +2743,7 @@ static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key, Eterm* bk_
 	erts_fprintf(stderr," > ");
     else
 	erts_fprintf(stderr," == ");
-    erts_fprintf(stderr,"%T\n",bound_key);  // HALFWORD BUG: printing rterm
+    erts_fprintf(stderr,"%R\n", bound_key, bk_base);
 #endif
     return ret;
 }
@@ -3084,19 +3085,28 @@ static int doit_select_delete(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 }
 
 #ifdef TREE_DEBUG
-static void do_dump_tree2(int to, void *to_arg, int show, TreeDbTerm *t,
-			  int offset)
+static void do_dump_tree2(DbTableTree* tb, int to, void *to_arg, int show,
+			  TreeDbTerm *t, int offset)
 {
     if (t == NULL)
-	return 0;
-    do_dump_tree2(to, to_arg, show, t->right, offset + 4);
+	return;
+    do_dump_tree2(tb, to, to_arg, show, t->right, offset + 4);
     if (show) {
-	erts_print(to, to_arg, "%*s%T (addr = %p, bal = %d)\n"
-		   offset, "", make_tuple(t->dbterm.tpl),
+	const char* prefix;
+	Eterm term;
+	if (tb->common.compress) {
+	    prefix = "key=";
+	    term = GETKEY(tb, t->dbterm.tpl);
+	}
+	else {
+	    prefix = "";
+	    term = make_tuple_rel(t->dbterm.tpl,t->dbterm.tpl);
+	}
+	erts_print(to, to_arg, "%*s%s%R (addr = %p, bal = %d)\n",
+		   offset, "", prefix, term, t->dbterm.tpl,
 		   t, t->balance);
     }
-    do_dump_tree2(to, to_arg, show, t->left, offset + 4); 
-    return sum;
+    do_dump_tree2(tb, to, to_arg, show, t->left, offset + 4); 
 }
 
 #endif
@@ -3106,7 +3116,7 @@ static void do_dump_tree2(int to, void *to_arg, int show, TreeDbTerm *t,
 void db_check_table_tree(DbTable *tbl)
 {
     DbTableTree *tb = &tbl->tree;
-    check_table_tree(tb->root);
+    check_table_tree(tb, tb->root);
     check_saved_stack(tb);
     check_slot_pos(tb);
 }
@@ -3137,7 +3147,7 @@ static void check_slot_pos(DbTableTree *tb)
 		   "element position %d is really 0x%08X, when stack says "
 		   "it's 0x%08X\n", tb->stack.slot, t, 
 		   tb->stack.array[tb->stack.pos - 1]);
-	do_dump_tree2(ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
+	do_dump_tree2(tb, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
     }
 }
 	
@@ -3152,14 +3162,14 @@ static void check_saved_stack(DbTableTree *tb)
      if (t != stack->array[0]) {
 	 erts_fprintf(stderr,"tb->stack[0] is 0x%08X, should be 0x%08X\n",
 		      stack->array[0], t);
-	 do_dump_tree2(ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
+	 do_dump_tree2(tb, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
 	 return;
      }
      while (n < stack->pos) {
 	 if (t == NULL) {
 	     erts_fprintf(stderr, "NULL pointer in tree when stack not empty,"
 			" stack depth is %d\n", n);
-	     do_dump_tree2(ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
+	     do_dump_tree2(tb, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
 	     return;
 	 }
 	 n++;
@@ -3173,28 +3183,26 @@ static void check_saved_stack(DbTableTree *tb)
 			    "represent child pointer in tree!"
 			    "(left == 0x%08X, right == 0x%08X\n", 
 			    n, tb->stack[n], t->left, t->right);
-		 do_dump_tree2(ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
+		 do_dump_tree2(tb, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
 		 return;
 	     }
 	 }
      }
 }
 
-static int check_table_tree(TreeDbTerm *t)
+static int check_table_tree(DbTableTree* tb, TreeDbTerm *t)
 {
     int lh, rh;
     if (t == NULL)
 	return 0;
-    lh = check_table_tree(t->left);
-    rh = check_table_tree(t->right);
+    lh = check_table_tree(tb, t->left);
+    rh = check_table_tree(tb, t->right);
     if ((rh - lh) != t->balance) {
 	erts_fprintf(stderr, "Invalid tree balance for this node:\n");
-	erts_fprintf(stderr,"balance = %d, left = 0x%08X, right = 0x%08X\n"
-		     "data = %T",
-		     t->balance, t->left, t->right,
-		     make_tuple(t->dbterm.tpl));
+	erts_fprintf(stderr,"balance = %d, left = 0x%08X, right = 0x%08X\n",
+		     t->balance, t->left, t->right);
 	erts_fprintf(stderr,"\nDump:\n---------------------------------\n");
-	do_dump_tree2(ERTS_PRINT_STDERR, NULL, 1, t, 0);
+	do_dump_tree2(tb, ERTS_PRINT_STDERR, NULL, 1, t, 0);
 	erts_fprintf(stderr,"\n---------------------------------\n");
     }
     return ((rh > lh) ? rh : lh) + 1;
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index 0b63ab9ba0..c3b074f782 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -5046,31 +5046,31 @@ void db_match_dis(Binary *bp)
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("TryMeElse\t%bpu\n", n);
+	    erts_printf("TryMeElse\t%beu\n", n);
 	    break;
 	case matchArray:
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("Array\t%bpu\n", n);
+	    erts_printf("Array\t%beu\n", n);
 	    break;
 	case matchArrayBind:
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("ArrayBind\t%bpu\n", n);
+	    erts_printf("ArrayBind\t%beu\n", n);
 	    break;
 	case matchTuple:
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("Tuple\t%bpu\n", n);
+	    erts_printf("Tuple\t%beu\n", n);
 	    break;
 	case matchPushT:
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("PushT\t%bpu\n", n);
+	    erts_printf("PushT\t%beu\n", n);
 	    break;
 	case matchPushL:
 	    ++t;
@@ -5084,13 +5084,13 @@ void db_match_dis(Binary *bp)
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("Bind\t%bpu\n", n);
+	    erts_printf("Bind\t%beu\n", n);
 	    break;
 	case matchCmp:
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("Cmp\t%bpu\n", n);
+	    erts_printf("Cmp\t%beu\n", n);
 	    break;
 	case matchEqBin:
 	    ++t;
@@ -5112,9 +5112,9 @@ void db_match_dis(Binary *bp)
 		    else
 			erts_printf(", ");
 #if defined(ARCH_64) && !HALFWORD_HEAP
-		    erts_printf("0x%016bpx", rt->data.ui[ri]);
+		    erts_printf("0x%016bex", rt->data.ui[ri]);
 #else
-		    erts_printf("0x%08bpx", rt->data.ui[ri]);
+		    erts_printf("0x%08bex", rt->data.ui[ri]);
 #endif
 		}
 	    }
@@ -5136,9 +5136,9 @@ void db_match_dis(Binary *bp)
 		    else
 			erts_printf(", ");
 #if defined(ARCH_64) && !HALFWORD_HEAP
-		    erts_printf("0x%016bpx", *et);
+		    erts_printf("0x%016bex", *et);
 #else
-		    erts_printf("0x%08bpx", *et);
+		    erts_printf("0x%08bex", *et);
 #endif
 		++et;
 		}
@@ -5190,31 +5190,31 @@ void db_match_dis(Binary *bp)
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("MkTuple\t%bpu\n", n);
+	    erts_printf("MkTuple\t%beu\n", n);
 	    break;
 	case matchOr:
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("Or\t%bpu\n", n);
+	    erts_printf("Or\t%beu\n", n);
 	    break;
 	case matchAnd:
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("And\t%bpu\n", n);
+	    erts_printf("And\t%beu\n", n);
 	    break;
 	case matchOrElse:
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("OrElse\t%bpu\n", n);
+	    erts_printf("OrElse\t%beu\n", n);
 	    break;
 	case matchAndAlso:
 	    ++t;
 	    n = *t;
 	    ++t;
-	    erts_printf("AndAlso\t%bpu\n", n);
+	    erts_printf("AndAlso\t%beu\n", n);
 	    break;
 	case matchCall0:
 	    ++t;
@@ -5244,19 +5244,19 @@ void db_match_dis(Binary *bp)
 	    ++t;
 	    n = (Uint) *t;
 	    ++t;
-	    erts_printf("PushV\t%bpu\n", n);
+	    erts_printf("PushV\t%beu\n", n);
 	    break;
     #if HALFWORD_HEAP
 	case matchPushVGuard:
 	    n = (Uint) *++t;
 	    ++t;
-	    erts_printf("PushVGuard\t%bpu\n", n);
+	    erts_printf("PushVGuard\t%beu\n", n);
 	    break;
     #endif
 	case matchPushVResult:
 	    n = (Uint) *++t;
 	    ++t;
-	    erts_printf("PushVResult\t%bpu\n", n);
+	    erts_printf("PushVResult\t%beu\n", n);
 	    break;
 	case matchTrue:
 	    ++t;
@@ -5367,8 +5367,8 @@ void db_match_dis(Binary *bp)
     }
     erts_printf("}\n");
     erts_printf("num_bindings: %d\n", prog->num_bindings);
-    erts_printf("heap_size: %bpu\n", prog->heap_size);
-    erts_printf("stack_offset: %bpu\n", prog->stack_offset);
+    erts_printf("heap_size: %beu\n", prog->heap_size);
+    erts_printf("stack_offset: %beu\n", prog->stack_offset);
     erts_printf("text: 0x%08x\n", (unsigned long) prog->text);
     erts_printf("stack_size: %d (words)\n", prog->heap_size-prog->stack_offset);
     
diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index 3c0eade0d8..069b71ab0d 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -294,7 +294,7 @@ typedef struct erl_drv_entry {
     int (*control)(ErlDrvData drv_data, unsigned int command, char *buf, 
 		   int len, char **rbuf, int rlen); 
 				/* "ioctl" for drivers - invoked by 
-				   port_control/3) */
+				   port_control/3 */
     void (*timeout)(ErlDrvData drv_data);	/* Handling of timeout in driver */
     void (*outputv)(ErlDrvData drv_data, ErlIOVec *ev);
 				/* called when we have output from erlang
@@ -307,7 +307,7 @@ typedef struct erl_drv_entry {
 				   before 'stop' can be called */
     int (*call)(ErlDrvData drv_data, unsigned int command, char *buf, 
 		   int len, char **rbuf, int rlen, unsigned int *flags); 
-                                /* Works mostly like 'control', a syncronous
+                                /* Works mostly like 'control', a synchronous
 				   call into the driver. */
     void (*event)(ErlDrvData drv_data, ErlDrvEvent event,
 		  ErlDrvEventData event_data);
diff --git a/erts/emulator/beam/erl_drv_thread.c b/erts/emulator/beam/erl_drv_thread.c
index 39bbe9633b..dc578f6d2a 100644
--- a/erts/emulator/beam/erl_drv_thread.c
+++ b/erts/emulator/beam/erl_drv_thread.c
@@ -700,6 +700,13 @@ erl_drv_thread_join(ErlDrvTid tid, void **respp)
 extern int erts_darwin_main_thread_pipe[2];
 extern int erts_darwin_main_thread_result_pipe[2];
 
+int erl_drv_stolen_main_thread_join(ErlDrvTid tid, void **respp);
+int erl_drv_steal_main_thread(char *name,
+			      ErlDrvTid *dtid,
+			      void* (*func)(void*),
+			      void* arg,
+			      ErlDrvThreadOpts *opts);
+
 
 int
 erl_drv_stolen_main_thread_join(ErlDrvTid tid, void **respp)
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index c30d67ac88..5edcd667e7 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -215,7 +215,7 @@ erts_next_heap_size(Uint size, Uint offset)
 		low = mid + 1;
 	    }
 	}
-	erl_exit(1, "no next heap size found: %d, offset %d\n", size, offset);
+	erl_exit(1, "no next heap size found: %lu, offset %lu\n", (unsigned long)size, (unsigned long)offset);
     }
     return 0;
 }
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c
index 9e18997890..9180508a49 100644
--- a/erts/emulator/beam/erl_lock_check.c
+++ b/erts/emulator/beam/erl_lock_check.c
@@ -240,7 +240,7 @@ typedef struct erts_lc_locked_lock_t_ erts_lc_locked_lock_t;
 struct erts_lc_locked_lock_t_ {
     erts_lc_locked_lock_t *next;
     erts_lc_locked_lock_t *prev;
-    Eterm extra;
+    UWord extra;
     Sint16 id;
     Uint16 flags;
 };
@@ -441,12 +441,12 @@ new_locked_lock(erts_lc_lock_t *lck, Uint16 op_flags)
 }
 
 static void
-print_lock2(char *prefix, Sint16 id, Eterm extra, Uint16 flags, char *suffix)
+print_lock2(char *prefix, Sint16 id, Wterm extra, Uint16 flags, char *suffix)
 {
     char *lname = (0 <= id && id < ERTS_LOCK_ORDER_SIZE
 		   ? erts_lock_order[id].name
 		   : "unknown");
-    if (is_boxed(extra))
+    if (is_not_immed(extra))
 	erts_fprintf(stderr,
 		     "%s'%s:%p%s'%s%s",
 		     prefix,
@@ -1260,7 +1260,8 @@ erts_lc_init_lock(erts_lc_lock_t *lck, char *name, Uint16 flags)
 {
     lck->id = erts_lc_get_lock_order_id(name);
 
-    lck->extra = make_boxed(&lck->extra);
+    lck->extra = &lck->extra;
+    ASSERT(is_not_immed(lck->extra));
     lck->flags = flags;
     lck->inited = ERTS_LC_INITITALIZED;
 }
@@ -1270,6 +1271,7 @@ erts_lc_init_lock_x(erts_lc_lock_t *lck, char *name, Uint16 flags, Eterm extra)
 {
     lck->id = erts_lc_get_lock_order_id(name);
     lck->extra = extra;
+    ASSERT(is_immed(lck->extra));
     lck->flags = flags;
     lck->inited = ERTS_LC_INITITALIZED;
 }
diff --git a/erts/emulator/beam/erl_lock_check.h b/erts/emulator/beam/erl_lock_check.h
index cdb06d4458..b67f36fa06 100644
--- a/erts/emulator/beam/erl_lock_check.h
+++ b/erts/emulator/beam/erl_lock_check.h
@@ -39,7 +39,7 @@ typedef struct {
     int inited;
     Sint16 id;
     Uint16 flags;
-    Eterm extra;
+    UWord extra;
 } erts_lc_lock_t;
 
 #define ERTS_LC_INITITALIZED 0x7f7f7f7f
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 135c6b0ccc..68421b4387 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -430,6 +430,11 @@ int enif_is_list(ErlNifEnv* env, ERL_NIF_TERM term)
     return is_list(term) || is_nil(term);
 }
 
+int enif_is_exception(ErlNifEnv* env, ERL_NIF_TERM term)
+{
+    return term == THE_NON_VALUE;
+}
+
 static void aligned_binary_dtor(struct enif_tmp_obj_t* obj)
 {
     erts_free_aligned_binary_bytes_extra((byte*)obj,ERTS_ALC_T_TMP);
@@ -467,7 +472,7 @@ static void tmp_alloc_dtor(struct enif_tmp_obj_t* obj)
 int enif_inspect_iolist_as_binary(ErlNifEnv* env, Eterm term, ErlNifBinary* bin)
 {
     struct enif_tmp_obj_t* tobj;
-    int sz;
+    Uint sz;
     if (is_binary(term)) {
 	return enif_inspect_binary(env,term,bin);
     }
@@ -478,7 +483,7 @@ int enif_inspect_iolist_as_binary(ErlNifEnv* env, Eterm term, ErlNifBinary* bin)
 	bin->ref_bin = NULL;
 	return 1;
     }
-    if ((sz = io_list_len(term)) < 0) {
+    if (erts_iolist_size(term, &sz)) {
 	return 0;
     }
     
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h
index 8050b3640a..d028567faf 100644
--- a/erts/emulator/beam/erl_nif.h
+++ b/erts/emulator/beam/erl_nif.h
@@ -31,9 +31,10 @@
 ** 1.0: R13B04
 ** 2.0: R14A
 ** 2.1: R14B02 "vm_variant"
+** 2.2: R14B03 enif_is_exception
 */
 #define ERL_NIF_MAJOR_VERSION 2
-#define ERL_NIF_MINOR_VERSION 1
+#define ERL_NIF_MINOR_VERSION 2
 
 #include <stdlib.h>
 
diff --git a/erts/emulator/beam/erl_nif_api_funcs.h b/erts/emulator/beam/erl_nif_api_funcs.h
index eca506593d..c991b61abe 100644
--- a/erts/emulator/beam/erl_nif_api_funcs.h
+++ b/erts/emulator/beam/erl_nif_api_funcs.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2009-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2009-2011. 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
@@ -21,6 +21,13 @@
 #  error This file should not be included directly
 #endif
 
+/*
+** WARNING: add new ERL_NIF_API_FUNC_DECL entries at the bottom of the list
+** to keep compatibility on Windows!!!
+**
+** And don't forget to increase ERL_NIF_MINOR_VERSION in erl_nif.h
+** when adding functions to the API.
+*/
 #ifdef ERL_NIF_API_FUNC_DECL
 ERL_NIF_API_FUNC_DECL(void*,enif_priv_data,(ErlNifEnv*));
 ERL_NIF_API_FUNC_DECL(void*,enif_alloc,(size_t size));
@@ -128,12 +135,17 @@ ERL_NIF_API_FUNC_DECL(int,enif_get_uint64,(ErlNifEnv*, ERL_NIF_TERM term, ErlNif
 ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_int64,(ErlNifEnv*, ErlNifSInt64));
 ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_uint64,(ErlNifEnv*, ErlNifUInt64));
 #endif
+ERL_NIF_API_FUNC_DECL(int,enif_is_exception,(ErlNifEnv*, ERL_NIF_TERM term));
 
 /*
-** Add last to keep compatibility on Windows!!!
+** Add new entries here to keep compatibility on Windows!!!
 */
 #endif
 
+/*
+** Please keep the ERL_NIF_API_FUNC_MACRO list below in the same order
+** as the ERL_NIF_API_FUNC_DECL list above
+*/
 #ifdef ERL_NIF_API_FUNC_MACRO
 #  define enif_priv_data ERL_NIF_API_FUNC_MACRO(enif_priv_data)
 #  define enif_alloc ERL_NIF_API_FUNC_MACRO(enif_alloc)
@@ -243,6 +255,11 @@ ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_uint64,(ErlNifEnv*, ErlNifUInt64));
 #  define enif_make_uint64 ERL_NIF_API_FUNC_MACRO(enif_make_uint64)
 #endif
 
+#  define enif_is_exception ERL_NIF_API_FUNC_MACRO(enif_is_exception)
+
+/*
+** Add new entries here
+*/
 #endif
 
 #ifndef enif_make_list1
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 1b07024ca1..326021643f 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -658,8 +658,6 @@ erts_port_task_free_port(Port *pp)
 	   when scheduled out... */
 	ErtsPortTask *ptp = port_task_alloc();
 	erts_smp_port_state_lock(pp);
-	ASSERT(erts_smp_atomic_read(&erts_ports_alive) > 0);
-	erts_smp_atomic_dec(&erts_ports_alive);
 	pp->status &= ~ERTS_PORT_SFLG_CLOSING;
 	pp->status |= ERTS_PORT_SFLG_FREE_SCHEDULED;
 	erts_may_save_closed_port(pp);
@@ -681,7 +679,6 @@ erts_port_task_free_port(Port *pp)
 	    port_is_dequeued = 1;
 	}
 	erts_smp_port_state_lock(pp);
-	erts_smp_atomic_dec(&erts_ports_alive);
 	pp->status &= ~ERTS_PORT_SFLG_CLOSING;
 	pp->status |= ERTS_PORT_SFLG_FREE_SCHEDULED;
 	erts_may_save_closed_port(pp);
diff --git a/erts/emulator/beam/erl_printf_term.c b/erts/emulator/beam/erl_printf_term.c
index b71404fd27..34da9cab84 100644
--- a/erts/emulator/beam/erl_printf_term.c
+++ b/erts/emulator/beam/erl_printf_term.c
@@ -114,13 +114,13 @@ do {									\
 /* return 0 if list is not a non-empty flat list of printable characters */
 
 static int
-is_printable_string(Eterm list)
+is_printable_string(Eterm list, Eterm* base)
 {
     int len = 0;
     int c;
 
     while(is_list(list)) {
-	Eterm* consp = list_val(list);
+	Eterm* consp = list_val_rel(list, base);
 	Eterm hd = CAR(consp);
 
 	if (!is_byte(hd))
@@ -226,17 +226,20 @@ static int print_atom_name(fmtfn_t fn, void* arg, Eterm atom, long *dcount)
 #define PRT_LAST_ARRAY_ELEMENT ((Eterm) 7) /* Note! Must be last... */
 
 static int
-print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
+print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
+	   Eterm* obj_base) /* ignored if !HALFWORD_HEAP */
 {
     DECLARE_WSTACK(s);
     int res;
     int i;
     Eterm val;
     Uint32 *ref_num;
+    union {
+	UWord word;
+	Eterm* ptr;
+    }popped;
     Eterm* nobj;
-#if HALFWORD_HEAP
-    UWord wobj;
-#endif
+    Wterm wobj;
 
     res = 0;
 
@@ -258,18 +261,17 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 	    PRINT_CHAR(res, fn, arg, '}');
 	    goto L_outer_loop;
 	default:
-#if HALFWORD_HEAP
-	    obj = (Eterm) (wobj = WSTACK_POP(s));
-#else
-	    obj = WSTACK_POP(s);
-#endif
+	    popped.word = WSTACK_POP(s);
+
 	    switch (val) {
 	    case PRT_TERM:
+		obj = (Eterm) popped.word;
 		break;
 	    case PRT_ONE_CONS:
+		obj = (Eterm) popped.word;
 	    L_print_one_cons:
 		{
-		    Eterm* cons = list_val(obj);
+		    Eterm* cons = list_val_rel(obj, obj_base);
 		    Eterm tl;
 		    
 		    obj = CAR(cons);
@@ -288,27 +290,13 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 		}
 		break;
 	    case PRT_LAST_ARRAY_ELEMENT:
-		{
-#if HALFWORD_HEAP
-		    Eterm* ptr = (Eterm *) wobj;
-#else
-		    Eterm* ptr = (Eterm *) obj;
-#endif
-		    obj = *ptr;
-		}
+		obj = *popped.ptr;
 		break;
 	    default:		/* PRT_LAST_ARRAY_ELEMENT+1 and upwards */
-		{
-#if HALFWORD_HEAP
-		    Eterm* ptr = (Eterm *) wobj;
-#else
-		    Eterm* ptr = (Eterm *) obj;
-#endif
-		    obj = *ptr++;
-		    WSTACK_PUSH(s, (UWord) ptr);
-		    WSTACK_PUSH(s, val-1);
-		    WSTACK_PUSH(s, PRT_COMMA);
-		}
+		obj = *popped.ptr;
+	        WSTACK_PUSH(s, (UWord) (popped.ptr + 1));
+		WSTACK_PUSH(s, val-1);
+		WSTACK_PUSH(s, PRT_COMMA);
 		break;
 	    }
 	    break;
@@ -325,8 +313,12 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 	    PRINT_CHAR(res, fn, arg, '>');
 	    goto L_done;
 	}
-
-	switch (tag_val_def(obj)) {
+#if HALFWORD_HEAP
+	wobj = is_immed(obj) ? (Wterm)obj : rterm2wterm(obj, obj_base);
+#else
+	wobj = (Wterm)obj;
+#endif
+	switch (tag_val_def(wobj)) {
 	case NIL_DEF:
 	    PRINT_STRING(res, fn, arg, "[]");
 	    break;
@@ -348,13 +340,13 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 	    int print_res;
 	    char def_buf[64];
 	    char *buf, *big_str;
-	    Uint sz = (Uint) big_decimal_estimate(obj);
+	    Uint sz = (Uint) big_decimal_estimate(wobj);
 	    sz++;
 	    if (sz <= 64)
 		buf = &def_buf[0];
 	    else
 		buf = erts_alloc(ERTS_ALC_T_TMP, sz);
-	    big_str = erts_big_to_string(obj, buf, sz);
+	    big_str = erts_big_to_string(wobj, buf, sz);
 	    print_res = erts_printf_string(fn, arg, big_str);
 	    if (buf != &def_buf[0])
 		erts_free(ERTS_ALC_T_TMP, (void *) buf);
@@ -369,9 +361,9 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 	case EXTERNAL_REF_DEF:
 	    PRINT_STRING(res, fn, arg, "#Ref<");
 	    PRINT_ULONG(res, fn, arg, 'u', 0, 1,
-			(unsigned long) ref_channel_no(obj));
-	    ref_num = ref_numbers(obj);
-	    for (i = ref_no_of_numbers(obj)-1; i >= 0; i--) {
+			(unsigned long) ref_channel_no(wobj));
+	    ref_num = ref_numbers(wobj);
+	    for (i = ref_no_of_numbers(wobj)-1; i >= 0; i--) {
 		PRINT_CHAR(res, fn, arg, '.');
 		PRINT_ULONG(res, fn, arg, 'u', 0, 1, (unsigned long) ref_num[i]);
 	    }
@@ -381,30 +373,30 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 	case EXTERNAL_PID_DEF:
 	    PRINT_CHAR(res, fn, arg, '<');
 	    PRINT_ULONG(res, fn, arg, 'u', 0, 1,
-			(unsigned long) pid_channel_no(obj));
+			(unsigned long) pid_channel_no(wobj));
 	    PRINT_CHAR(res, fn, arg, '.');
 	    PRINT_ULONG(res, fn, arg, 'u', 0, 1,
-			(unsigned long) pid_number(obj));
+			(unsigned long) pid_number(wobj));
 	    PRINT_CHAR(res, fn, arg, '.');
 	    PRINT_ULONG(res, fn, arg, 'u', 0, 1,
-			(unsigned long) pid_serial(obj));
+			(unsigned long) pid_serial(wobj));
 	    PRINT_CHAR(res, fn, arg, '>');
 	    break;
 	case PORT_DEF:
 	case EXTERNAL_PORT_DEF:
 	    PRINT_STRING(res, fn, arg, "#Port<");
 	    PRINT_ULONG(res, fn, arg, 'u', 0, 1,
-			(unsigned long) port_channel_no(obj));
+			(unsigned long) port_channel_no(wobj));
 	    PRINT_CHAR(res, fn, arg, '.');
 	    PRINT_ULONG(res, fn, arg, 'u', 0, 1,
-			(unsigned long) port_number(obj));
+			(unsigned long) port_number(wobj));
 	    PRINT_CHAR(res, fn, arg, '>');
 	    break;
 	case LIST_DEF:
-	    if (is_printable_string(obj)) {
+	    if (is_printable_string(obj, obj_base)) {
 		int c;
 		PRINT_CHAR(res, fn, arg, '"');
-		nobj = list_val(obj);
+		nobj = list_val_rel(obj, obj_base);
 		while (1) {
 		    if ((*dcount)-- <= 0)
 			goto L_done;
@@ -418,7 +410,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 		    }
 		    if (is_not_list(*nobj))
 			break;
-		    nobj = list_val(*nobj);
+		    nobj = list_val_rel(*nobj, obj_base);
 		}
 		PRINT_CHAR(res, fn, arg, '"');
 	    } else {
@@ -428,7 +420,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 	    }
 	    break;
 	case TUPLE_DEF:
-	    nobj = tuple_val(obj);	/* pointer to arity */
+	    nobj = tuple_val(wobj);	/* pointer to arity */
 	    i = arityval(*nobj);	/* arity */
 	    PRINT_CHAR(res, fn, arg, '{');
 	    WSTACK_PUSH(s,PRT_CLOSE_TUPLE);
@@ -440,13 +432,13 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 	    break;
 	case FLOAT_DEF: {
 	    FloatDef ff;
-	    GET_DOUBLE(obj, ff);
+	    GET_DOUBLE(wobj, ff);
 	    PRINT_DOUBLE(res, fn, arg, 'e', 6, 0, ff.fd);
 	}
 	    break;
 	case BINARY_DEF:
 	    {
-		ProcBin* pb = (ProcBin *) binary_val(obj);
+		ProcBin* pb = (ProcBin *) binary_val(wobj);
 		if (pb->size == 1)
 		    PRINT_STRING(res, fn, arg, "<<1 byte>>");
 		else {
@@ -458,7 +450,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 	    break;
 	case EXPORT_DEF:
 	    {
-		Export* ep = *((Export **) (export_val(obj) + 1));
+		Export* ep = *((Export **) (export_val(wobj) + 1));
 		Atom* module = atom_tab(atom_val(ep->code[0]));
 		Atom* name = atom_tab(atom_val(ep->code[1]));
 
@@ -474,7 +466,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 	    break;
 	case FUN_DEF:
 	    {
-		ErlFunThing *funp = (ErlFunThing *) fun_val(obj);
+		ErlFunThing *funp = (ErlFunThing *) fun_val(wobj);
 		Atom *ap = atom_tab(atom_val(funp->fe->module));
 
 		PRINT_STRING(res, fn, arg, "#Fun<");
@@ -490,7 +482,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 	    break;
 	default:
 	    PRINT_STRING(res, fn, arg, "<unknown:");
-	    PRINT_POINTER(res, fn, arg, (UWord) obj);
+	    PRINT_POINTER(res, fn, arg, wobj);
 	    PRINT_CHAR(res, fn, arg, '>');
 	    break;
 	}
@@ -503,9 +495,10 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount)
 }
 
 int
-erts_printf_term(fmtfn_t fn, void* arg, unsigned long term, long precision)
+erts_printf_term(fmtfn_t fn, void* arg, unsigned long term, long precision,
+		 unsigned long* term_base)
 {
-    int res = print_term(fn, arg, (Uint) term, &precision);
+    int res = print_term(fn, arg, (Eterm)term, &precision, (Eterm*)term_base);
     if (res < 0)
 	return res;
     if (precision <= 0)
diff --git a/erts/emulator/beam/erl_printf_term.h b/erts/emulator/beam/erl_printf_term.h
index 4f76028396..4ba22f12de 100644
--- a/erts/emulator/beam/erl_printf_term.h
+++ b/erts/emulator/beam/erl_printf_term.h
@@ -21,6 +21,6 @@
 #define ERL_PRINTF_TERM_H__
 
 #include "erl_printf_format.h"
-int erts_printf_term(fmtfn_t fn, void* arg, unsigned long term, long precision);
-
+int erts_printf_term(fmtfn_t fn, void* arg, unsigned long term, long precision,
+		     unsigned long* term_base);
 #endif
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 2efff4bf10..2704359a8f 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -166,9 +166,8 @@ static struct {
 
 static struct {
     erts_smp_mtx_t update_mtx;
-    erts_smp_atomic32_t active_runqs;
+    erts_smp_atomic32_t no_runqs;
     int last_active_runqs;
-    erts_smp_atomic32_t used_runqs;
     int forced_check_balance;
     erts_smp_atomic32_t checking_balance;
     int halftime;
@@ -965,7 +964,7 @@ sched_spin_wait(ErtsSchedulerSleepInfo *ssi, int spincount)
     erts_aint32_t flgs;
 
     do {
-	flgs = erts_smp_atomic32_read(&ssi->flags);
+	flgs = erts_smp_atomic32_read_acqb(&ssi->flags);
 	if ((flgs & (ERTS_SSI_FLG_SLEEPING|ERTS_SSI_FLG_WAITING))
 	    != (ERTS_SSI_FLG_SLEEPING|ERTS_SSI_FLG_WAITING)) {
 	    break;
@@ -1114,7 +1113,7 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
     else {
 	erts_aint_t dt;
 
-	erts_smp_atomic32_set(&function_calls, 0);
+	erts_smp_atomic32_set_relb(&function_calls, 0);
 	*fcalls = 0;
 
 	sched_waiting_sys(esdp->no, rq);
@@ -1147,7 +1146,7 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 	    nonblockable_aux_work(esdp, ssi, aux_work);
 #endif
 
-	    flgs = erts_smp_atomic32_read(&ssi->flags);
+	    flgs = erts_smp_atomic32_read_acqb(&ssi->flags);
 	    if (!(flgs & ERTS_SSI_FLG_WAITING)) {
 		ASSERT(!(flgs & ERTS_SSI_FLG_SLEEPING));
 		goto sys_woken;
@@ -1333,6 +1332,76 @@ wake_all_schedulers(void)
     }
 }
 
+#define ERTS_NO_USED_RUNQS_SHIFT 16
+#define ERTS_NO_RUNQS_MASK 0xffff
+
+#if ERTS_MAX_NO_OF_SCHEDULERS > ERTS_NO_RUNQS_MASK
+#  error "Too large amount of schedulers allowed"
+#endif
+
+static ERTS_INLINE void
+init_no_runqs(int active, int used)
+{
+    erts_aint32_t no_runqs = (erts_aint32_t) (active & ERTS_NO_RUNQS_MASK);
+    no_runqs |= (erts_aint32_t) ((used & ERTS_NO_RUNQS_MASK) << ERTS_NO_USED_RUNQS_SHIFT);
+    erts_smp_atomic32_init(&balance_info.no_runqs, no_runqs);
+}
+
+static ERTS_INLINE void
+get_no_runqs(int *active, int *used)
+{
+    erts_aint32_t no_runqs = erts_smp_atomic32_read(&balance_info.no_runqs);
+    if (active)
+	*active = (int) (no_runqs & ERTS_NO_RUNQS_MASK);
+    if (used)
+	*used = (int) ((no_runqs >> ERTS_NO_USED_RUNQS_SHIFT) & ERTS_NO_RUNQS_MASK);
+}
+
+static ERTS_INLINE void
+set_no_used_runqs(int used)
+{
+    erts_aint32_t exp = erts_smp_atomic32_read(&balance_info.no_runqs);
+    while (1) {
+	erts_aint32_t act, new;
+	new = (used << ERTS_NO_USED_RUNQS_SHIFT) | (exp & ERTS_NO_RUNQS_MASK);
+	act = erts_smp_atomic32_cmpxchg(&balance_info.no_runqs, new, exp);
+	if (act == exp)
+	    break;
+	exp = act;
+    }
+}
+
+static ERTS_INLINE void
+set_no_active_runqs(int active)
+{
+    erts_aint32_t exp = erts_smp_atomic32_read(&balance_info.no_runqs);
+    while (1) {
+	erts_aint32_t act, new;
+	new = (exp & (ERTS_NO_RUNQS_MASK << ERTS_NO_USED_RUNQS_SHIFT)) | active;
+	act = erts_smp_atomic32_cmpxchg(&balance_info.no_runqs, new, exp);
+	if (act == exp)
+	    break;
+	exp = act;
+    }
+}
+
+static ERTS_INLINE int
+try_inc_no_active_runqs(int active)
+{
+    erts_aint32_t exp = erts_smp_atomic32_read(&balance_info.no_runqs);
+    if (((exp >> ERTS_NO_USED_RUNQS_SHIFT) & ERTS_NO_RUNQS_MASK) < active)
+	return 0;
+    if ((exp & ERTS_NO_RUNQS_MASK) + 1 == active) {
+	erts_aint32_t new, act;
+	new = (exp & ~ERTS_NO_RUNQS_MASK) | active;
+	act = erts_smp_atomic32_cmpxchg(&balance_info.no_runqs, new, exp);
+	if (act == exp)
+	    return 1;
+    }
+    return 0;
+}
+
+
 static ERTS_INLINE int
 chk_wake_sched(ErtsRunQueue *crq, int ix, int activate)
 {
@@ -1344,9 +1413,7 @@ chk_wake_sched(ErtsRunQueue *crq, int ix, int activate)
     iflgs = erts_smp_atomic32_read(&wrq->info_flags);
     if (!(iflgs & (ERTS_RUNQ_IFLG_SUSPENDED|ERTS_RUNQ_IFLG_NONEMPTY))) {
 	if (activate) {
-	    if (ix == erts_smp_atomic32_cmpxchg(&balance_info.active_runqs,
-						ix+1,
-						ix)) {
+	    if (try_inc_no_active_runqs(ix+1)) {
 		erts_smp_xrunq_lock(crq, wrq);
 		wrq->flags &= ~ERTS_RUNQ_FLG_INACTIVE;
 		erts_smp_xrunq_unlock(crq, wrq);
@@ -1363,8 +1430,9 @@ wake_scheduler_on_empty_runq(ErtsRunQueue *crq)
 {
     int ix = crq->ix;
     int stop_ix = ix;
-    int active_ix = erts_smp_atomic32_read(&balance_info.active_runqs);
-    int balance_ix = erts_smp_atomic32_read(&balance_info.used_runqs);
+    int active_ix, balance_ix;
+
+    get_no_runqs(&active_ix, &balance_ix);
 
     if (active_ix > balance_ix)
 	active_ix = balance_ix;
@@ -1416,7 +1484,7 @@ erts_sched_notify_check_cpu_bind(void)
     int ix;
     if (erts_common_run_queue) {
 	for (ix = 0; ix < erts_no_schedulers; ix++)
-	    erts_smp_atomic32_set(&ERTS_SCHEDULER_IX(ix)->chk_cpu_bind, 1);
+	    erts_smp_atomic32_set_relb(&ERTS_SCHEDULER_IX(ix)->chk_cpu_bind, 1);
 	wake_all_schedulers();
     }
     else {
@@ -1871,8 +1939,7 @@ try_steal_task(ErtsRunQueue *rq)
 
     ERTS_SMP_LC_CHK_RUNQ_LOCK(rq, rq_locked);
 
-    active_rqs = erts_smp_atomic32_read(&balance_info.active_runqs);
-    blnc_rqs = erts_smp_atomic32_read(&balance_info.used_runqs);
+    get_no_runqs(&active_rqs, &blnc_rqs);
 
     if (active_rqs > blnc_rqs)
 	active_rqs = blnc_rqs;
@@ -1883,7 +1950,7 @@ try_steal_task(ErtsRunQueue *rq)
 	if (active_rqs < blnc_rqs) {
 	    int no = blnc_rqs - active_rqs;
 	    int stop_ix = vix = active_rqs + rq->ix % no;
-	    while (erts_smp_atomic32_read(&no_empty_run_queues) < blnc_rqs) {
+	    while (erts_smp_atomic32_read_acqb(&no_empty_run_queues) < blnc_rqs) {
 		res = check_possible_steal_victim(rq, &rq_locked, vix);
 		if (res)
 		    goto done;
@@ -1898,7 +1965,7 @@ try_steal_task(ErtsRunQueue *rq)
 	vix = rq->ix;
 
 	/* ... then try to steal a job from another active queue... */
-	while (erts_smp_atomic32_read(&no_empty_run_queues) < blnc_rqs) {
+	while (erts_smp_atomic32_read_acqb(&no_empty_run_queues) < blnc_rqs) {
 	    vix++;
 	    if (vix >= active_rqs)
 		vix = 0;
@@ -1999,7 +2066,7 @@ check_balance(ErtsRunQueue *c_rq)
 	return;
     }
 
-    blnc_no_rqs = (int) erts_smp_atomic32_read(&balance_info.used_runqs);
+    get_no_runqs(NULL, &blnc_no_rqs);
     if (blnc_no_rqs == 1) {
 	c_rq->check_balance_reds = INT_MAX;
 	erts_smp_atomic32_set(&balance_info.checking_balance, 0);
@@ -2038,7 +2105,8 @@ check_balance(ErtsRunQueue *c_rq)
     forced = balance_info.forced_check_balance;
     balance_info.forced_check_balance = 0;
 
-    blnc_no_rqs = (int) erts_smp_atomic32_read(&balance_info.used_runqs);
+    get_no_runqs(&current_active, &blnc_no_rqs);
+
     if (blnc_no_rqs == 1) {
 	erts_smp_mtx_unlock(&balance_info.update_mtx);
 	erts_smp_runq_lock(c_rq);
@@ -2052,8 +2120,6 @@ check_balance(ErtsRunQueue *c_rq)
     if (balance_info.full_reds_history_index >= ERTS_FULL_REDS_HISTORY_SIZE)
 	balance_info.full_reds_history_index = 0;
 
-    current_active = erts_smp_atomic32_read(&balance_info.active_runqs);
-
     /* Read balance information for all run queues */
     for (qix = 0; qix < blnc_no_rqs; qix++) {
 	ErtsRunQueue *rq = ERTS_RUNQ_IX(qix);
@@ -2387,7 +2453,7 @@ erts_fprintf(stderr, "--------------------------------\n");
     }
 
     balance_info.last_active_runqs = active;
-    erts_smp_atomic32_set(&balance_info.active_runqs, active);
+    set_no_active_runqs(active);
 
     balance_info.halftime = 1;
     erts_smp_atomic32_set(&balance_info.checking_balance, 0);
@@ -2695,9 +2761,8 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
     erts_smp_atomic32_init(&schdlr_sspnd.msb.ongoing, 0);
     erts_smp_atomic32_init(&schdlr_sspnd.active, no_schedulers);
     schdlr_sspnd.msb.procs = NULL;
-    erts_smp_atomic32_set(&balance_info.used_runqs,
-			  erts_common_run_queue ? 1 : no_schedulers_online);
-    erts_smp_atomic32_init(&balance_info.active_runqs, no_schedulers);
+    init_no_runqs(no_schedulers,
+		  erts_common_run_queue ? 1 : no_schedulers_online);
     balance_info.last_active_runqs = no_schedulers;
     erts_smp_mtx_init(&balance_info.update_mtx, "migration_info_update");
     balance_info.forced_check_balance = 0;
@@ -2939,7 +3004,7 @@ sched_spin_suspended(ErtsSchedulerSleepInfo *ssi, int spincount)
     erts_aint32_t flgs;
 
     do {
-	flgs = erts_smp_atomic32_read(&ssi->flags);
+	flgs = erts_smp_atomic32_read_acqb(&ssi->flags);
 	if ((flgs & (ERTS_SSI_FLG_SLEEPING
 		     | ERTS_SSI_FLG_WAITING
 		     | ERTS_SSI_FLG_SUSPENDED))
@@ -3068,7 +3133,7 @@ suspend_scheduler(ErtsSchedulerData *esdp)
 		wake = 0;
 	    }
 
-	    flgs = erts_smp_atomic32_read(&ssi->flags);
+	    flgs = erts_smp_atomic32_read_acqb(&ssi->flags);
 	    if (!(flgs & ERTS_SSI_FLG_SUSPENDED))
 		break;
 	    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
@@ -3292,7 +3357,7 @@ erts_set_schedulers_online(Process *p,
 			ErtsRunQueue *to_rq = ERTS_RUNQ_IX(ix % no);
 			evacuate_run_queue(from_rq, to_rq);
 		    }
-		    erts_smp_atomic32_set(&balance_info.used_runqs, no);
+		    set_no_used_runqs(no);
 		    erts_smp_mtx_unlock(&balance_info.update_mtx);
 		    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
 		}
@@ -3346,7 +3411,7 @@ erts_set_schedulers_online(Process *p,
 		    for (ix = erts_no_run_queues-1; ix >= no; ix--)
 			evacuate_run_queue(ERTS_RUNQ_IX(ix),
 					   ERTS_RUNQ_IX(ix % no));
-		    erts_smp_atomic32_set(&balance_info.used_runqs, no);
+		    set_no_used_runqs(no);
 		    erts_smp_mtx_unlock(&balance_info.update_mtx);
 		    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
 		    for (ix = no; ix < online; ix++) {
@@ -3443,7 +3508,7 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 		else {
 		    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
 		    erts_smp_mtx_lock(&balance_info.update_mtx);
-		    erts_smp_atomic32_set(&balance_info.used_runqs, 1);
+		    set_no_used_runqs(1);
 		    for (ix = 0; ix < online; ix++) {
 			ErtsRunQueue *rq = ERTS_RUNQ_IX(ix);
 			erts_smp_runq_lock(rq);
@@ -3580,7 +3645,7 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 		    evacuate_run_queue(ERTS_RUNQ_IX(ix),
 				       ERTS_RUNQ_IX(ix % online));
 
-		erts_smp_atomic32_set(&balance_info.used_runqs, online);
+		set_no_used_runqs(online);
 		/* Make sure that we balance soon... */
 		balance_info.forced_check_balance = 1;
 		erts_smp_runq_lock(ERTS_RUNQ_IX(0));
@@ -3665,7 +3730,7 @@ sched_thread_func(void *vesdp)
 #ifdef ERTS_ENABLE_LOCK_CHECK
     {
 	char buf[31];
-	erts_snprintf(&buf[0], 31, "scheduler %bpu", no);
+	erts_snprintf(&buf[0], 31, "scheduler %beu", no);
 	erts_lc_set_thread_name(&buf[0]);
     }
 #endif
@@ -3723,7 +3788,7 @@ sched_thread_func(void *vesdp)
 
     process_main();
     /* No schedulers should *ever* terminate */
-    erl_exit(ERTS_ABORT_EXIT, "Scheduler thread number %bpu terminated\n",
+    erl_exit(ERTS_ABORT_EXIT, "Scheduler thread number %beu terminated\n",
 	     ((ErtsSchedulerData *) vesdp)->no);
     return NULL;
 }
@@ -3772,8 +3837,8 @@ erts_start_schedulers(void)
 	erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
 	ASSERT(actual != wanted_no_schedulers);
 	erts_dsprintf(dsbufp,
-		      "Failed to create %bpu scheduler-threads (%s:%d); "
-		      "only %bpu scheduler-thread%s created.\n",
+		      "Failed to create %beu scheduler-threads (%s:%d); "
+		      "only %beu scheduler-thread%s created.\n",
 		      wanted_no_schedulers, erl_errno_id(res), res,
 		      actual, actual == 1 ? " was" : "s were");
 	erts_send_error_to_logger_nogl(dsbufp);
@@ -3887,21 +3952,9 @@ handle_pend_sync_suspend(Process *suspendee,
     }
 }
 
-/*
- * Like erts_pid2proc() but:
- *
- * * At least ERTS_PROC_LOCK_MAIN have to be held on c_p.
- * * At least ERTS_PROC_LOCK_MAIN have to be taken on pid.
- * * It also waits for proc to be in a state != running and garbing.
- * * If ERTS_PROC_LOCK_BUSY is returned, the calling process has to
- *   yield (ERTS_BIF_YIELD[0-3]()). c_p might in this case have been
- *   suspended.
- */
-
-
-Process *
-erts_pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks,
-			  Eterm pid, ErtsProcLocks pid_locks)
+static Process *
+pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks,
+		     Eterm pid, ErtsProcLocks pid_locks, int suspend)
 {
     Process *rp;
     int unlock_c_p_status;
@@ -3928,7 +3981,7 @@ erts_pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks,
 	c_p->suspendee = NIL;
 	ASSERT(c_p->flags & F_P2PNR_RESCHED);
 	c_p->flags &= ~F_P2PNR_RESCHED;
-	if (rp)
+	if (!suspend && rp)
 	    resume_process(rp);
     }
     else {
@@ -3992,6 +4045,8 @@ erts_pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks,
 	    }
 
 	    /* rp is not running and we got the locks we want... */
+	    if (suspend)
+		suspend_process(rp_rq, rp);
 	}
 	erts_smp_runqs_unlock(cp_rq, rp_rq);
     }
@@ -4004,6 +4059,35 @@ erts_pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks,
     return rp;
 }
 
+
+/*
+ * Like erts_pid2proc() but:
+ *
+ * * At least ERTS_PROC_LOCK_MAIN have to be held on c_p.
+ * * At least ERTS_PROC_LOCK_MAIN have to be taken on pid.
+ * * It also waits for proc to be in a state != running and garbing.
+ * * If ERTS_PROC_LOCK_BUSY is returned, the calling process has to
+ *   yield (ERTS_BIF_YIELD[0-3]()). c_p might in this case have been
+ *   suspended.
+ */
+Process *
+erts_pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks,
+			  Eterm pid, ErtsProcLocks pid_locks)
+{
+    return pid2proc_not_running(c_p, c_p_locks, pid, pid_locks, 0);
+}
+
+/*
+ * Like erts_pid2proc_not_running(), but hands over the process
+ * in a suspended state unless (c_p is looked up).
+ */
+Process *
+erts_pid2proc_suspend(Process *c_p, ErtsProcLocks c_p_locks,
+		      Eterm pid, ErtsProcLocks pid_locks)
+{
+    return pid2proc_not_running(c_p, c_p_locks, pid, pid_locks, 1);
+}
+
 /*
  * erts_pid2proc_nropt() is normally the same as
  * erts_pid2proc_not_running(). However it is only
@@ -4117,6 +4201,21 @@ handle_pend_bif_async_suspend(Process *suspendee,
     }
 }
 
+#else
+
+/*
+ * Non-smp version of erts_pid2proc_suspend().
+ */
+Process *
+erts_pid2proc_suspend(Process *c_p, ErtsProcLocks c_p_locks,
+		      Eterm pid, ErtsProcLocks pid_locks)
+{
+    Process *rp = erts_pid2proc(c_p, c_p_locks, pid, pid_locks);
+    if (rp)
+	erts_suspend(rp, pid_locks, NULL);
+    return rp;
+}
+
 #endif /* ERTS_SMP */
 
 /*
@@ -4650,7 +4749,7 @@ internal_add_to_runq(ErtsRunQueue *runq, Process *p)
     if (p->status_flags & ERTS_PROC_SFLG_INRUNQ)
 	return NULL;
     else if (p->runq_flags & ERTS_PROC_RUNQ_FLG_RUNNING) {
-	ASSERT(p->rcount == 0);
+	ASSERT(ERTS_PROC_IS_EXITING(p) || p->rcount == 0);
 	ERTS_DBG_CHK_PROCS_RUNQ_NOPROC(runq, p);
 	p->status_flags |= ERTS_PROC_SFLG_PENDADD2SCHEDQ;
 	return NULL;
@@ -4661,7 +4760,7 @@ internal_add_to_runq(ErtsRunQueue *runq, Process *p)
     ERTS_DBG_CHK_PROCS_RUNQ_NOPROC(runq, p);
 #ifndef ERTS_SMP
     /* Never schedule a suspended process (ok in smp case) */
-    ASSERT(p->rcount == 0);
+    ASSERT(ERTS_PROC_IS_EXITING(p) || p->rcount == 0);
     add_runq = runq;
 #else
     ASSERT(!p->bound_runq || p->bound_runq == p->run_queue);
@@ -5097,7 +5196,7 @@ Process *schedule(Process *p, int calls)
 	esdp = erts_get_scheduler_data();
 	rq = erts_get_runq_current(esdp);
 	ASSERT(esdp);
-	fcalls = (int) erts_smp_atomic32_read(&function_calls);
+	fcalls = (int) erts_smp_atomic32_read_acqb(&function_calls);
 	actual_reds = reds = 0;
 	erts_smp_runq_lock(rq);
     } else {
@@ -5248,14 +5347,14 @@ Process *schedule(Process *p, int calls)
 			 | ERTS_RUNQ_FLG_CHK_CPU_BIND
 			 | ERTS_RUNQ_FLG_SUSPENDED)) {
 	    if ((rq->flags & ERTS_RUNQ_FLG_SUSPENDED)
-		|| (erts_smp_atomic32_read(&esdp->ssi->flags)
+		|| (erts_smp_atomic32_read_acqb(&esdp->ssi->flags)
 		    & ERTS_SSI_FLG_SUSPENDED)) {
 		ASSERT(erts_smp_atomic32_read(&esdp->ssi->flags)
 		       & ERTS_SSI_FLG_SUSPENDED);
 		suspend_scheduler(esdp);
 	    }
 	    if ((rq->flags & ERTS_RUNQ_FLG_CHK_CPU_BIND)
-		|| erts_smp_atomic32_read(&esdp->chk_cpu_bind)) {
+		|| erts_smp_atomic32_read_acqb(&esdp->chk_cpu_bind)) {
 		erts_sched_check_cpu_bind(esdp);
 	    }
 	}
@@ -5306,7 +5405,7 @@ Process *schedule(Process *p, int calls)
 	    if (rq->flags & (ERTS_RUNQ_FLG_SHARED_RUNQ
 			     | ERTS_RUNQ_FLG_SUSPENDED)) {
 		if ((rq->flags & ERTS_RUNQ_FLG_SUSPENDED)
-		    || (erts_smp_atomic32_read(&esdp->ssi->flags)
+		    || (erts_smp_atomic32_read_acqb(&esdp->ssi->flags)
 			& ERTS_SSI_FLG_SUSPENDED)) {
 		    ASSERT(erts_smp_atomic32_read(&esdp->ssi->flags)
 			   & ERTS_SSI_FLG_SUSPENDED);
@@ -5350,7 +5449,7 @@ Process *schedule(Process *p, int calls)
 	     * Schedule system-level activities.
 	     */
 
-	    erts_smp_atomic32_set(&function_calls, 0);
+	    erts_smp_atomic32_set_relb(&function_calls, 0);
 	    fcalls = 0;
 
 	    ASSERT(!erts_port_task_have_outstanding_io_tasks());
@@ -5392,7 +5491,7 @@ Process *schedule(Process *p, int calls)
 			if (erts_common_run_queue->waiting)
 			    wake_scheduler(erts_common_run_queue, 0, 1);
 		    }
-		    else if (erts_smp_atomic32_read(&no_empty_run_queues) != 0) {
+		    else if (erts_smp_atomic32_read_acqb(&no_empty_run_queues) != 0) {
 			wake_scheduler_on_empty_runq(rq);
 			rq->wakeup_other = 0;
 		    }
@@ -7603,7 +7702,8 @@ continue_exit_process(Process *p
 static void
 timeout_proc(Process* p)
 {
-    p->i = *((BeamInstr **) (UWord) p->def_arg_reg);
+    BeamInstr** pi = (BeamInstr **) p->def_arg_reg;
+    p->i = *pi;
     p->flags |= F_TIMO;
     p->flags &= ~F_INSLPQUEUE;
 
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index 334ae5573f..296acc7367 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -1535,6 +1535,10 @@ erts_get_atom_cache_map(Process *c_p)
 }
 #endif
 
+Process *erts_pid2proc_suspend(Process *,
+			       ErtsProcLocks,
+			       Eterm,
+			       ErtsProcLocks);
 #ifdef ERTS_SMP
 
 Process *erts_pid2proc_not_running(Process *,
diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c
index 68fda01597..5410bcd495 100644
--- a/erts/emulator/beam/erl_process_dump.c
+++ b/erts/emulator/beam/erl_process_dump.c
@@ -194,7 +194,7 @@ dump_element(int to, void *to_arg, Eterm x)
 	} else if (is_pid(x)) {
 	    erts_print(to, to_arg, "P%T", x);
 	} else if (is_port(x)) {
-	    erts_print(to, to_arg, "p<%bpu.%bpu>",
+	    erts_print(to, to_arg, "p<%beu.%beu>",
 		       port_channel_no(x), port_number(x));
 	} else if (is_nil(x)) {
 	    erts_putc(to, to_arg, 'N');
@@ -376,7 +376,7 @@ heap_dump(int to, void *to_arg, Eterm x)
 		    erts_print(to, to_arg, "P%T\n", x);
 		    *ptr = OUR_NIL;
 		} else if (is_external_port_header(hdr)) {
-		    erts_print(to, to_arg, "p<%bpu.%bpu>\n",
+		    erts_print(to, to_arg, "p<%beu.%beu>\n",
 			       port_channel_no(x), port_number(x));
 		    *ptr = OUR_NIL;
 		} else {
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index c0397ca6c3..8833137112 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -1538,8 +1538,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
     Eterm tracee;
 #endif
     Eterm transformed_args[MAX_ARG];
-    DeclareTmpHeap(sub_bin_heap_et,ERL_SUB_BIN_SIZE,p);
-    ErlSubBin *sub_bin_heap = (ErlSubBin *) sub_bin_heap_et;
+    DeclareTypedTmpHeap(ErlSubBin,sub_bin_heap,p);
 
     ASSERT(tracer_pid);
     if (*tracer_pid == am_true) {
@@ -1600,21 +1599,20 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	if (is_boxed(arg) && header_is_bin_matchstate(*boxed_val(arg))) {
 	    ErlBinMatchState* ms = (ErlBinMatchState *) boxed_val(arg);
 	    ErlBinMatchBuffer* mb = &ms->mb;
-	    ErlSubBin* sb = sub_bin_heap;
 	    Uint bit_size;
 
 	    ASSERT(sub_bin_heap->thing_word == 0); /* At most one of match context */
 
 	    bit_size = mb->size - mb->offset;
-	    sb->thing_word = HEADER_SUB_BIN;
-	    sb->size = BYTE_OFFSET(bit_size);
-	    sb->bitsize = BIT_OFFSET(bit_size);
-	    sb->offs = BYTE_OFFSET(mb->offset);
-	    sb->bitoffs = BIT_OFFSET(mb->offset);
-	    sb->is_writable = 0;
-	    sb->orig = mb->orig;
-
-	    arg = make_binary(sb);
+	    sub_bin_heap->thing_word = HEADER_SUB_BIN;
+	    sub_bin_heap->size = BYTE_OFFSET(bit_size);
+	    sub_bin_heap->bitsize = BIT_OFFSET(bit_size);
+	    sub_bin_heap->offs = BYTE_OFFSET(mb->offset);
+	    sub_bin_heap->bitoffs = BIT_OFFSET(mb->offset);
+	    sub_bin_heap->is_writable = 0;
+	    sub_bin_heap->orig = mb->orig;
+
+	    arg = make_binary(sub_bin_heap);
 	}
 	transformed_args[i] = arg;
     }
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 432bdd705b..499bdd77ba 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -183,7 +183,7 @@ struct port {
 				    process to get (line oriented I/O)*/
     Uint32 status;		 /* Status and type flags */
     int control_flags;		 /* Flags for port_control()  */
-    Uint32 snapshot;             /* Next snapshot that port should be part of */
+    erts_aint32_t snapshot;      /* Next snapshot that port should be part of */
     struct reg_proc *reg;
     ErlDrvPDL port_data_lock;
 
@@ -527,11 +527,10 @@ union erl_off_heap_ptr {
 
 /* arrays that get malloced at startup */
 extern Port* erts_port;
-extern erts_smp_atomic_t erts_ports_alive;
 
 extern Uint erts_max_ports;
 extern Uint erts_port_tab_index_mask;
-extern erts_smp_atomic_t erts_ports_snapshot;
+extern erts_smp_atomic32_t erts_ports_snapshot;
 extern erts_smp_atomic_t erts_dead_ports_ptr;
 
 ERTS_GLB_INLINE void erts_may_save_closed_port(Port *prt);
@@ -541,12 +540,12 @@ ERTS_GLB_INLINE void erts_may_save_closed_port(Port *prt);
 ERTS_GLB_INLINE void erts_may_save_closed_port(Port *prt)
 {
     ERTS_SMP_LC_ASSERT(erts_smp_lc_spinlock_is_locked(&prt->state_lck));
-    if (prt->snapshot != erts_smp_atomic_read(&erts_ports_snapshot)) {
+    if (prt->snapshot != erts_smp_atomic32_read_acqb(&erts_ports_snapshot)) {
 	/* Dead ports are added from the end of the snapshot buffer */
 	Eterm* tombstone = (Eterm*) erts_smp_atomic_addtest(&erts_dead_ports_ptr,
 							    -(erts_aint_t)sizeof(Eterm));
 	ASSERT(tombstone+1 != NULL);
-	ASSERT(prt->snapshot == (Uint32) erts_smp_atomic_read(&erts_ports_snapshot) - 1);
+	ASSERT(prt->snapshot == erts_smp_atomic32_read(&erts_ports_snapshot) - 1);
 	*tombstone = prt->id;
     }
     /*else no ongoing snapshot or port was already included or created after snapshot */
@@ -1653,10 +1652,14 @@ struct Sint_buf {
 };	
 char* Sint_to_buf(Sint, struct Sint_buf*);
 
+#define ERTS_IOLIST_OK 0
+#define ERTS_IOLIST_OVERFLOW 1
+#define ERTS_IOLIST_TYPE 2
+
 Eterm buf_to_intlist(Eterm**, char*, int, Eterm); /* most callers pass plain char*'s */
 int io_list_to_buf(Eterm, char*, int);
 int io_list_to_buf2(Eterm, char*, int);
-int io_list_len(Eterm);
+int erts_iolist_size(Eterm, Uint *);
 int is_string(Eterm);
 void erl_at_exit(void (*) (void*), void*);
 Eterm collect_memory(Process *);
@@ -1828,7 +1831,7 @@ erts_alloc_message_heap(Uint size,
 #endif
 
     if (size > (Uint) INT_MAX)
-	erl_exit(ERTS_ABORT_EXIT, "HUGE size (%bpu)\n", size);
+	erl_exit(ERTS_ABORT_EXIT, "HUGE size (%beu)\n", size);
 
     if (
 #if defined(ERTS_SMP)
@@ -1890,6 +1893,8 @@ erts_alloc_message_heap(Uint size,
 #  if defined(DEBUG)
 #    define DeclareTmpHeap(VariableName,Size,Process) \
        Eterm *VariableName = erts_debug_allocate_tmp_heap(Size,Process)
+#    define DeclareTypedTmpHeap(Type,VariableName,Process)		\
+      Type *VariableName = (Type *) erts_debug_allocate_tmp_heap(sizeof(Type)/sizeof(Eterm),Process)
 #    define DeclareTmpHeapNoproc(VariableName,Size) \
        Eterm *VariableName = erts_debug_allocate_tmp_heap(Size,NULL)
 #    define UseTmpHeap(Size,Proc) \
@@ -1911,6 +1916,8 @@ erts_alloc_message_heap(Uint size,
 #  else
 #    define DeclareTmpHeap(VariableName,Size,Process) \
        Eterm *VariableName = (ERTS_PROC_GET_SCHDATA(Process)->tmp_heap)+(ERTS_PROC_GET_SCHDATA(Process)->num_tmp_heap_used)
+#    define DeclareTypedTmpHeap(Type,VariableName,Process)		\
+      Type *VariableName = (Type *) (ERTS_PROC_GET_SCHDATA(Process)->tmp_heap)+(ERTS_PROC_GET_SCHDATA(Process)->num_tmp_heap_used)
 #    define DeclareTmpHeapNoproc(VariableName,Size) \
        Eterm *VariableName = (erts_get_scheduler_data()->tmp_heap)+(erts_get_scheduler_data()->num_tmp_heap_used)
 #    define UseTmpHeap(Size,Proc) \
@@ -1936,6 +1943,8 @@ erts_alloc_message_heap(Uint size,
 #else
 #  define DeclareTmpHeap(VariableName,Size,Process) \
      Eterm VariableName[Size]
+#  define DeclareTypedTmpHeap(Type,VariableName,Process)	\
+     Type VariableName[1]
 #  define DeclareTmpHeapNoproc(VariableName,Size) \
      Eterm VariableName[Size]
 #  define UseTmpHeap(Size,Proc) /* Nothing */
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 2e884a350e..df5f8b22a3 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -56,7 +56,6 @@ static erts_smp_tsd_key_t driver_list_last_error_key;  /* Save last DDLL error o
 							  per thread basis (for BC interfaces) */
 
 Port*      erts_port; /* The port table */
-erts_smp_atomic_t erts_ports_alive;
 erts_smp_atomic_t erts_bytes_out;	/* No bytes sent out of the system */
 erts_smp_atomic_t erts_bytes_in;	/* No bytes gotten into the system */
 
@@ -82,6 +81,9 @@ static void driver_monitor_unlock_pdl(Port *p);
 #define DRV_MONITOR_UNLOCK_PDL(Port) /* nothing */
 #endif
 
+#define ERL_SMALL_IO_BIN_LIMIT (4*ERL_ONHEAP_BIN_LIMIT)
+#define SMALL_WRITE_VEC  16
+
 static ERTS_INLINE ErlIOQueue*
 drvport2ioq(ErlDrvPort drvport)
 {
@@ -190,7 +192,7 @@ typedef struct line_buf_context {
 static erts_smp_spinlock_t get_free_port_lck;
 static Uint last_port_num;
 static Uint port_num_mask;
-erts_smp_atomic_t erts_ports_snapshot; /* Identifies the _next_ snapshot (not the ongoing) */
+erts_smp_atomic32_t erts_ports_snapshot; /* Identifies the _next_ snapshot (not the ongoing) */
 
 
 static ERTS_INLINE void
@@ -421,10 +423,9 @@ setup_port(Port* prt, Eterm pid, erts_driver_t *driver,
     new_name = (char*) erts_alloc(ERTS_ALC_T_PORT_NAME, sys_strlen(name)+1);
     sys_strcpy(new_name, name);
     erts_smp_runq_lock(runq);
-    erts_smp_atomic_inc(&erts_ports_alive);
     erts_smp_port_state_lock(prt);    
     prt->status = ERTS_PORT_SFLG_CONNECTED | xstatus;
-    prt->snapshot = (Uint32) erts_smp_atomic_read(&erts_ports_snapshot);    
+    prt->snapshot = erts_smp_atomic32_read(&erts_ports_snapshot);    
     old_name = prt->name;
     prt->name = new_name;
 #ifdef ERTS_SMP
@@ -954,13 +955,14 @@ do {									\
     int _bitoffs;							\
     int _bitsize;							\
     ERTS_GET_REAL_BIN(obj, _real, _offset, _bitoffs, _bitsize);		\
-    ASSERT(_bitsize == 0);						\
+    if (_bitsize != 0) goto L_type_error;				\
     if (thing_subtag(*binary_val(_real)) == REFC_BINARY_SUBTAG &&	\
 	_bitoffs == 0) {						\
 	b_size += _size;						\
+        if (b_size < _size) goto L_overflow_error;			\
 	in_clist = 0;							\
 	v_size++;							\
-        if (_size >= bin_limit) {					\
+        if (_size >= ERL_SMALL_IO_BIN_LIMIT) {				\
             p_in_clist = 0;						\
             p_v_size++;							\
         } else {							\
@@ -972,6 +974,7 @@ do {									\
         }								\
     } else {								\
 	c_size += _size;						\
+        if (c_size < _size) goto L_overflow_error;			\
 	if (!in_clist) {						\
 	    in_clist = 1;						\
 	    v_size++;							\
@@ -986,29 +989,30 @@ do {									\
 
 
 /* 
-** Size of a io list in bytes
-** return -1 if error
-** returns:            - Total size of io list
-**           vsize     - SysIOVec size needed for a writev
-**           csize     - Number of bytes not in binary (in the common binary)
-**           pvsize    - SysIOVec size needed if packing small binaries
-**           pcsize    - Number of bytes in the common binary if packing
-*/
+ * Returns 0 if successful and a non-zero value otherwise.
+ *
+ * Return values through pointers:
+ *    *vsize      - SysIOVec size needed for a writev
+ *    *csize      - Number of bytes not in binary (in the common binary)
+ *    *pvsize     - SysIOVec size needed if packing small binaries
+ *    *pcsize     - Number of bytes in the common binary if packing
+ *    *total_size - Total size of iolist in bytes
+ */
 
 static int 
-io_list_vec_len(Eterm obj, int* vsize, int* csize, 
-		int bin_limit, /* small binaries limit */
-		int * pvsize, int * pcsize)
+io_list_vec_len(Eterm obj, Uint* vsize, Uint* csize,
+		Uint* pvsize, Uint* pcsize, Uint* total_size)
 {
     DECLARE_ESTACK(s);
     Eterm* objp;
-    int v_size = 0;
-    int c_size = 0;
-    int b_size = 0;
-    int in_clist = 0;
-    int p_v_size = 0;
-    int p_c_size = 0;
-    int p_in_clist = 0;
+    Uint v_size = 0;
+    Uint c_size = 0;
+    Uint b_size = 0;
+    Uint in_clist = 0;
+    Uint p_v_size = 0;
+    Uint p_c_size = 0;
+    Uint p_in_clist = 0;
+    Uint total;
 
     goto L_jump_start;  /* avoid a push */
 
@@ -1022,6 +1026,9 @@ io_list_vec_len(Eterm obj, int* vsize, int* csize,
 
 	    if (is_byte(obj)) {
 		c_size++;
+		if (c_size == 0) {
+		    goto L_overflow_error;
+		}
 		if (!in_clist) {
 		    in_clist = 1;
 		    v_size++;
@@ -1061,32 +1068,31 @@ io_list_vec_len(Eterm obj, int* vsize, int* csize,
 	}
     }
 
+    total = c_size + b_size;
+    if (total < c_size) {
+	goto L_overflow_error;
+    }
+    *total_size = total;
+
     DESTROY_ESTACK(s);
-    if (vsize != NULL)
-	*vsize = v_size;
-    if (csize != NULL)
-	*csize = c_size;
-    if (pvsize != NULL)
-	*pvsize = p_v_size;
-    if (pcsize != NULL)
-	*pcsize = p_c_size;
-    return c_size + b_size;
+    *vsize = v_size;
+    *csize = c_size;
+    *pvsize = p_v_size;
+    *pcsize = p_c_size;
+    return 0;
 
  L_type_error:
+ L_overflow_error:
     DESTROY_ESTACK(s);
-    return -1;
+    return 1;
 }
 
-#define ERL_SMALL_IO_BIN_LIMIT (4*ERL_ONHEAP_BIN_LIMIT)
-#define SMALL_WRITE_VEC  16
-
-
 /* write data to a port */
 int erts_write_to_port(Eterm caller_id, Port *p, Eterm list)
 {
     char *buf;
     erts_driver_t *drv = p->drv_ptr;
-    int size;
+    Uint size;
     int fpe_was_unmasked;
     
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(p));
@@ -1094,10 +1100,10 @@ int erts_write_to_port(Eterm caller_id, Port *p, Eterm list)
 
     p->caller = caller_id;
     if (drv->outputv != NULL) {
-	int vsize;
-	int csize;
-	int pvsize;
-	int pcsize;
+	Uint vsize;
+	Uint csize;
+	Uint pvsize;
+	Uint pcsize;
 	int blimit;
 	SysIOVec iv[SMALL_WRITE_VEC];
 	ErlDrvBinary* bv[SMALL_WRITE_VEC];
@@ -1106,9 +1112,8 @@ int erts_write_to_port(Eterm caller_id, Port *p, Eterm list)
 	ErlDrvBinary* cbin;
 	ErlIOVec ev;
 
-	if ((size = io_list_vec_len(list, &vsize, &csize, 
-				    ERL_SMALL_IO_BIN_LIMIT,
-				    &pvsize, &pcsize)) < 0) {
+	if (io_list_vec_len(list, &vsize, &csize,
+			    &pvsize, &pcsize, &size)) {
 	    goto bad_value;
 	}
 	/* To pack or not to pack (small binaries) ...? */
@@ -1183,7 +1188,7 @@ int erts_write_to_port(Eterm caller_id, Port *p, Eterm list)
 	else {
 	    ASSERT(r == -1); /* Overflow */
 	    erts_free(ERTS_ALC_T_TMP, buf);
-	    if ((size = io_list_len(list)) < 0) {
+	    if (erts_iolist_size(list, &size)) {
 		goto bad_value;
 	    }
 
@@ -1274,7 +1279,6 @@ void init_io(void)
 
     erts_smp_atomic_init(&erts_bytes_out, 0);
     erts_smp_atomic_init(&erts_bytes_in, 0);
-    erts_smp_atomic_init(&erts_ports_alive, 0);
 
     for (i = 0; i < erts_max_ports; i++) {
 	erts_port_task_init_sched(&erts_port[i].sched);
@@ -1296,7 +1300,7 @@ void init_io(void)
 	erts_port[i].port_data_lock = NULL;
     }
 
-    erts_smp_atomic_init(&erts_ports_snapshot, (erts_aint_t) 0);
+    erts_smp_atomic32_init(&erts_ports_snapshot, (erts_aint32_t) 0);
     last_port_num = 0;
     erts_smp_spinlock_init(&get_free_port_lck, "get_free_port");
 
@@ -2147,7 +2151,7 @@ erts_port_control(Process* p, Port* prt, Uint command, Eterm iolist)
     byte* to_port = NULL;	/* Buffer to write to port. */
 				/* Initialization is for shutting up
 				   warning about use before set. */
-    int to_len = 0;		/* Length of buffer. */
+    Uint to_len = 0;		/* Length of buffer. */
     int must_free = 0;		/* True if the buffer should be freed. */
     char port_result[ERL_ONHEAP_BIN_LIMIT];  /* Default buffer for result from port. */
     char* port_resp;		/* Pointer to result buffer. */
@@ -2192,7 +2196,7 @@ erts_port_control(Process* p, Port* prt, Uint command, Eterm iolist)
 	} else {
 	    ASSERT(r == -1);	/* Overflow */
 	    erts_free(ERTS_ALC_T_TMP, (void *) to_port);
-	    if ((to_len = io_list_len(iolist)) < 0) { /* Type error */
+	    if (erts_iolist_size(iolist, &to_len)) { /* Type error */
 		return THE_NON_VALUE;
 	    }
 	    must_free = 1;
@@ -2417,7 +2421,7 @@ void erts_raw_port_command(Port* p, byte* buf, Uint len)
 
     if (len > (Uint) INT_MAX)
 	erl_exit(ERTS_ABORT_EXIT,
-		 "Absurdly large data buffer (%bpu bytes) passed to"
+		 "Absurdly large data buffer (%beu bytes) passed to"
 		 "output callback of %s driver.\n",
 		 len,
 		 p->drv_ptr->name ? p->drv_ptr->name : "unknown");
@@ -3667,7 +3671,7 @@ driver_pdl_inc_refc(ErlDrvPDL pdl)
 {
     ErlDrvSInt refc = pdl_inctest_refc(pdl);
 #ifdef HARDDEBUG
-    erts_fprintf(stderr, "driver_pdl_inc_refc(%p) -> %bpd\r\n",
+    erts_fprintf(stderr, "driver_pdl_inc_refc(%p) -> %bed\r\n",
 		 pdl, refc);
 #endif
     return refc;
diff --git a/erts/emulator/beam/safe_hash.c b/erts/emulator/beam/safe_hash.c
index 21d6ce9304..3e9243c77d 100644
--- a/erts/emulator/beam/safe_hash.c
+++ b/erts/emulator/beam/safe_hash.c
@@ -99,7 +99,7 @@ static void rehash(SafeHash* h, int grow_limit)
 	erts_free(h->type, (void *) old_tab);
     }
     /*else already done */
-    erts_smp_atomic_set(&h->is_rehashing, 0);
+    erts_smp_atomic_set_relb(&h->is_rehashing, 0);
 }
 
 
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index f531d1430b..a17de717bc 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -2705,7 +2705,7 @@ term_array: /* arrays in 'aa' and 'bb', length in 'i' */
     while (--i) {
 	a = *aa++;
 	b = *bb++;
-	if (a != b) {
+	if (!is_same(a,a_base, b,b_base)) {
 	    if (is_atom(a) && is_atom(b)) {
 		if ((j = cmp_atoms(a, b)) != 0) {
 		    goto not_equal;
@@ -3021,13 +3021,25 @@ int io_list_to_buf(Eterm obj, char* buf, int len)
     return -1;
 }
 
-int io_list_len(Eterm obj)
+/*
+ * Return 0 if successful, and non-zero if unsuccessful.
+ */
+int erts_iolist_size(Eterm obj, Uint* sizep)
 {
     Eterm* objp;
-    Sint len = 0;
+    Uint size = 0;
     DECLARE_ESTACK(s);
     goto L_again;
 
+#define SAFE_ADD(Var, Val)			\
+    do {					\
+        Uint valvar = (Val);			\
+	Var += valvar;				\
+	if (Var < valvar) {			\
+	    goto L_overflow_error;		\
+	}					\
+    } while (0)
+
     while (!ESTACK_ISEMPTY(s)) {
 	obj = ESTACK_POP(s);
     L_again:
@@ -3037,9 +3049,12 @@ int io_list_len(Eterm obj)
 	    /* Head */
 	    obj = CAR(objp);
 	    if (is_byte(obj)) {
-		len++;
+		size++;
+		if (size == 0) {
+		    goto L_overflow_error;
+		}
 	    } else if (is_binary(obj) && binary_bitsize(obj) == 0) {
-		len += binary_size(obj);
+		SAFE_ADD(size, binary_size(obj));
 	    } else if (is_list(obj)) {
 		ESTACK_PUSH(s, CDR(objp));
 		goto L_iter_list; /* on head */
@@ -3051,23 +3066,29 @@ int io_list_len(Eterm obj)
 	    if (is_list(obj))
 		goto L_iter_list; /* on tail */
 	    else if (is_binary(obj) && binary_bitsize(obj) == 0) {
-		len += binary_size(obj);
+		SAFE_ADD(size, binary_size(obj));
 	    } else if (is_not_nil(obj)) {
 		goto L_type_error;
 	    }
 	} else if (is_binary(obj) && binary_bitsize(obj) == 0) { /* Tail was binary */
-	    len += binary_size(obj);
+	    SAFE_ADD(size, binary_size(obj));
 	} else if (is_not_nil(obj)) {
 	    goto L_type_error;
 	}
     }
+#undef SAFE_ADD
 
     DESTROY_ESTACK(s);
-    return len;
+    *sizep = size;
+    return ERTS_IOLIST_OK;
+
+ L_overflow_error:
+    DESTROY_ESTACK(s);
+    return ERTS_IOLIST_OVERFLOW;
 
  L_type_error:
     DESTROY_ESTACK(s);
-    return -1;
+    return ERTS_IOLIST_TYPE;
 }
 
 /* return 0 if item is not a non-empty flat list of bytes */
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
index 4e9b5005c1..f0ff3f54c5 100644
--- a/erts/emulator/drivers/common/efile_drv.c
+++ b/erts/emulator/drivers/common/efile_drv.c
@@ -410,7 +410,7 @@ struct t_data
 static void *ef_safe_alloc(Uint s)
 {
     void *p = EF_ALLOC(s);
-    if (!p) erl_exit(1, "efile drv: Can't allocate %d bytes of memory\n", s);
+    if (!p) erl_exit(1, "efile drv: Can't allocate %lu bytes of memory\n", (unsigned long)s);
     return p;
 }
 
diff --git a/erts/emulator/drivers/common/gzio.c b/erts/emulator/drivers/common/gzio.c
index 5531a275ea..741cb6ae20 100644
--- a/erts/emulator/drivers/common/gzio.c
+++ b/erts/emulator/drivers/common/gzio.c
@@ -632,6 +632,7 @@ erts_gzseek(gzFile file, int offset, int whence)
     while (s->position < pos) {
 	char buf[512];
 	int n;
+	int save_pos = s->position;
 
 	n = pos - s->position;
 	if (n > sizeof(buf))
@@ -643,6 +644,7 @@ erts_gzseek(gzFile file, int offset, int whence)
 	    memset(buf, '\0', n);
 	    erts_gzwrite(file, buf, n);
 	}
+	if (save_pos == s->position) break;
     }
 
     return s->position;
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 59f4cfb9b4..40c4a0df08 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -490,7 +490,6 @@ static int my_strncasecmp(const char *s1, const char *s2, size_t n)
 #define TCP_REQ_RECV           42
 #define TCP_REQ_UNRECV         43
 #define TCP_REQ_SHUTDOWN       44
-#define TCP_REQ_MULTI_OP       45
 /* UDP and SCTP requests */
 #define PACKET_REQ_RECV        60 /* Common for UDP and SCTP         */
 #define SCTP_REQ_LISTEN	       61 /* Different from TCP; not for UDP */
@@ -1763,7 +1762,6 @@ send_async_error(ErlDrvPort port, ErlDrvTermData Port, int Ref,
 			LOAD_INT_CNT + 2*LOAD_TUPLE_CNT];
     int i = 0;
     
-    i = 0;
     i = LOAD_ATOM(spec, i, am_inet_async);
     i = LOAD_PORT(spec, i, Port);
     i = LOAD_INT(spec, i, Ref);
@@ -1950,7 +1948,7 @@ static int http_response_inetdrv(void *arg, int major, int minor,
     tcp_descriptor* desc = (tcp_descriptor*) arg;
     int i = 0;
     ErlDrvTermData spec[27];
-    ErlDrvTermData caller;
+    ErlDrvTermData caller = ERL_DRV_NIL;
     
     if (desc->inet.active == INET_PASSIVE) {
         /* {inet_async,S,Ref,{ok,{http_response,Version,Status,Phrase}}} */
@@ -2043,7 +2041,7 @@ http_request_inetdrv(void* arg, const http_atom_t* meth, const char* meth_ptr,
     tcp_descriptor* desc = (tcp_descriptor*) arg;
     int i = 0;
     ErlDrvTermData spec[43];
-    ErlDrvTermData caller;
+    ErlDrvTermData caller = ERL_DRV_NIL;
     
     if (desc->inet.active == INET_PASSIVE) {
         /* {inet_async, S, Ref, {ok,{http_request,Meth,Uri,Version}}} */
@@ -2094,7 +2092,7 @@ http_header_inetdrv(void* arg, const http_atom_t* name, const char* name_ptr,
     tcp_descriptor* desc = (tcp_descriptor*) arg;
     int i = 0;
     ErlDrvTermData spec[26];
-    ErlDrvTermData caller;
+    ErlDrvTermData caller = ERL_DRV_NIL;
     
     if (desc->inet.active == INET_PASSIVE) {
         /* {inet_async,S,Ref,{ok,{http_header,Bit,Name,IValue,Value}} */
@@ -2223,7 +2221,7 @@ int ssl_tls_inetdrv(void* arg, unsigned type, unsigned major, unsigned minor,
     tcp_descriptor* desc = (tcp_descriptor*) arg;
     int i = 0;
     ErlDrvTermData spec[28];
-    ErlDrvTermData caller;
+    ErlDrvTermData caller = ERL_DRV_NIL;
     ErlDrvBinary* bin;
     int ret;
 
@@ -7982,11 +7980,11 @@ static int tcp_inet_ctl(ErlDrvData e, unsigned int cmd, char* buf, int len,
 	timeout = get_int32(buf);
 
 	if (desc->inet.state == TCP_STATE_ACCEPTING) {
-	    unsigned long time_left;
-	    int oid;
-	    ErlDrvTermData ocaller;
-	    int oreq;
-	    unsigned otimeout;
+	    unsigned long time_left = 0;
+	    int oid = 0;
+	    ErlDrvTermData ocaller = ERL_DRV_NIL;
+	    int oreq = 0;
+	    unsigned otimeout = 0;
 	    ErlDrvTermData caller = driver_caller(desc->inet.port);
 	    MultiTimerData *mtd = NULL,*omtd = NULL;
 	    ErlDrvMonitor monitor, omonitor;
diff --git a/erts/emulator/hipe/hipe_bif2.c b/erts/emulator/hipe/hipe_bif2.c
index 19cd32c68f..2660f74a82 100644
--- a/erts/emulator/hipe/hipe_bif2.c
+++ b/erts/emulator/hipe/hipe_bif2.c
@@ -1,9 +1,8 @@
 /*
  * %CopyrightBegin%
-
- *
+ * 
  * Copyright Ericsson AB 2001-2011. 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
@@ -37,14 +36,25 @@
 #include "hipe_arch.h"
 #include "hipe_stack.h"
 
-BIF_RETTYPE hipe_bifs_show_estack_1(BIF_ALIST_1)
+static void proc_unlock(Process* c_p, Process* rp)
 {
+    ErtsProcLocks locks = ERTS_PROC_LOCKS_ALL;
+    if (rp == c_p) {
+	locks &= ~ERTS_PROC_LOCK_MAIN;
+    }
+    if (rp && locks) {
+	erts_smp_proc_unlock(rp, locks);
+    }
+}
+
+BIF_RETTYPE hipe_bifs_show_estack_1(BIF_ALIST_1)
+{    
     Process *rp = erts_pid2proc(BIF_P, ERTS_PROC_LOCK_MAIN,
 				BIF_ARG_1, ERTS_PROC_LOCKS_ALL);
     if (!rp)
 	BIF_ERROR(BIF_P, BADARG);
     hipe_print_estack(rp);
-    erts_smp_proc_unlock(rp, ERTS_PROC_LOCKS_ALL);
+    proc_unlock(BIF_P, rp);
     BIF_RET(am_true);
 }
 
@@ -55,7 +65,7 @@ BIF_RETTYPE hipe_bifs_show_heap_1(BIF_ALIST_1)
     if (!rp)
 	BIF_ERROR(BIF_P, BADARG);
     hipe_print_heap(rp);
-    erts_smp_proc_unlock(rp, ERTS_PROC_LOCKS_ALL);
+    proc_unlock(BIF_P, rp);
     BIF_RET(am_true);
 }
 
@@ -66,7 +76,7 @@ BIF_RETTYPE hipe_bifs_show_nstack_1(BIF_ALIST_1)
     if (!rp)
 	BIF_ERROR(BIF_P, BADARG);
     hipe_print_nstack(rp);
-    erts_smp_proc_unlock(rp, ERTS_PROC_LOCKS_ALL);
+    proc_unlock(BIF_P, rp);
     BIF_RET(am_true);
 }
 
@@ -82,7 +92,7 @@ BIF_RETTYPE hipe_bifs_show_pcb_1(BIF_ALIST_1)
     if (!rp)
 	BIF_ERROR(BIF_P, BADARG);
     hipe_print_pcb(rp);
-    erts_smp_proc_unlock(rp, ERTS_PROC_LOCKS_ALL);
+    proc_unlock(BIF_P, rp);
     BIF_RET(am_true);
 }
 
diff --git a/erts/emulator/hipe/hipe_debug.c b/erts/emulator/hipe/hipe_debug.c
index c7b608aafe..7ca11f8c6c 100644
--- a/erts/emulator/hipe/hipe_debug.c
+++ b/erts/emulator/hipe/hipe_debug.c
@@ -51,7 +51,7 @@ static const char stars[2*sizeof(long)+5] = {
 
 extern Uint beam_apply[];
 
-static void print_beam_pc(Uint *pc)
+static void print_beam_pc(BeamInstr *pc)
 {
     if (pc == hipe_beam_pc_return) {
 	printf("return-to-native");
@@ -60,7 +60,7 @@ static void print_beam_pc(Uint *pc)
     } else if (pc == &beam_apply[1]) {
 	printf("normal-process-exit");
     } else {
-	Eterm *mfa = find_function_from_pc(pc);
+	BeamInstr *mfa = find_function_from_pc(pc);
 	if (mfa)
 	    erts_printf("%T:%T/%bpu + 0x%bpx",
 			mfa[0], mfa[1], mfa[2], pc - &mfa[3]);
@@ -71,7 +71,7 @@ static void print_beam_pc(Uint *pc)
 
 static void catch_slot(Eterm *pos, Eterm val)
 {
-    Uint *pc = catch_pc(val);
+    BeamInstr *pc = catch_pc(val);
     printf(" | 0x%0*lx | 0x%0*lx | CATCH 0x%0*lx (BEAM ",
 	   2*(int)sizeof(long), (unsigned long)pos,
 	   2*(int)sizeof(long), (unsigned long)val,
diff --git a/erts/emulator/hipe/hipe_mkliterals.c b/erts/emulator/hipe/hipe_mkliterals.c
index 650861b54b..bced90785d 100644
--- a/erts/emulator/hipe/hipe_mkliterals.c
+++ b/erts/emulator/hipe/hipe_mkliterals.c
@@ -587,9 +587,9 @@ static void print_params(FILE *fp, void (*print_param)(FILE*,const struct rts_pa
 	(*print_param)(fp, &rts_params[i]);
 }
 
-static int do_c(FILE *fp)
+static int do_c(FILE *fp, const char* this_exe)
 {
-    fprintf(fp, "/* File: hipe_literals.h, generated by hipe_mkliterals */\n");
+    fprintf(fp, "/* File: hipe_literals.h, generated by %s */\n", this_exe);
     fprintf(fp, "#ifndef __HIPE_LITERALS_H__\n");
     fprintf(fp, "#define __HIPE_LITERALS_H__\n\n");
     print_literals(fp, c_define_literal);
@@ -603,9 +603,9 @@ static int do_c(FILE *fp)
     return 0;
 }
 
-static int do_e(FILE *fp)
+static int do_e(FILE *fp, const char* this_exe)
 {
-    fprintf(fp, "%%%% File: hipe_literals.hrl, generated by hipe_mkliterals");
+    fprintf(fp, "%%%% File: hipe_literals.hrl, generated by %s", this_exe);
     fprintf(fp, "\n\n");
     print_literals(fp, e_define_literal);
     fprintf(fp, "\n");
@@ -622,9 +622,9 @@ int main(int argc, const char **argv)
     compute_crc();
     if (argc == 2) {
 	if (strcmp(argv[1], "-c") == 0)
-	    return do_c(stdout);
+	    return do_c(stdout, argv[0]);
 	if (strcmp(argv[1], "-e") == 0)
-	    return do_e(stdout);
+	    return do_e(stdout, argv[0]);
     }
     fprintf(stderr, "usage: %s [-c | -e] > output-file\n", argv[0]);
     return 1;
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index 218bd79584..71b374527e 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -1137,6 +1137,11 @@ ERTS_CIO_EXPORT(erts_check_io)(int do_wait)
 
  restart:
 
+#ifdef ERTS_BREAK_REQUESTED
+    if (ERTS_BREAK_REQUESTED)
+	erts_do_break_handling();
+#endif
+
     /* Figure out timeout value */
     if (do_wait) {
 	erts_time_remaining(&wait_time);
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c
index ceb290b644..eaef6680dd 100644
--- a/erts/emulator/sys/common/erl_mseg.c
+++ b/erts/emulator/sys/common/erl_mseg.c
@@ -134,7 +134,16 @@ static int mmap_fd;
 #define CAN_PARTLY_DESTROY 0
 #endif
 
-static const ErtsMsegOpt_t default_opt = ERTS_MSEG_DEFAULT_OPT_INITIALIZER;
+const ErtsMsegOpt_t erts_mseg_default_opt = {
+    1,			/* Use cache		     */
+    1,			/* Preserv data		     */
+    0,			/* Absolute shrink threshold */
+    0			/* Relative shrink threshold */
+#if HALFWORD_HEAP
+    ,0                  /* need low memory */
+#endif
+};
+
 
 typedef struct cache_desc_t_ {
     void *seg;
@@ -605,18 +614,10 @@ mseg_clear_cache(MemKind* mk)
     INC_CC(clear_cache);
 }
 
-static ERTS_INLINE MemKind* type2mk(ErtsAlcType_t atype)
+static ERTS_INLINE MemKind* memkind(const ErtsMsegOpt_t *opt)
 {
 #if HALFWORD_HEAP
-    switch (atype) {
-    case ERTS_ALC_A_ETS:
-    case ERTS_ALC_A_BINARY:
-    case ERTS_ALC_A_FIXED_SIZE:
-    case ERTS_ALC_A_DRIVER:
-	return &hi_mem;
-    default:
-	return &low_mem;
-    }
+    return opt->low_mem ? &low_mem : &hi_mem;
 #else
     return &the_mem;
 #endif
@@ -628,7 +629,7 @@ mseg_alloc(ErtsAlcType_t atype, Uint *size_p, const ErtsMsegOpt_t *opt)
     Uint max, min, diff_size, size;
     cache_desc_t *cd, *cand_cd;
     void *seg;
-    MemKind* mk = type2mk(atype);
+    MemKind* mk = memkind(opt);
 
     INC_CC(alloc);
 
@@ -742,7 +743,7 @@ static void
 mseg_dealloc(ErtsAlcType_t atype, void *seg, Uint size,
 	     const ErtsMsegOpt_t *opt)
 {
-    MemKind* mk = type2mk(atype);
+    MemKind* mk = memkind(opt);
     cache_desc_t *cd;
 
     ERTS_MSEG_DEALLOC_STAT(mk,size);
@@ -800,7 +801,7 @@ static void *
 mseg_realloc(ErtsAlcType_t atype, void *seg, Uint old_size, Uint *new_size_p,
 	     const ErtsMsegOpt_t *opt)
 {
-    MemKind* mk = type2mk(atype);
+    MemKind* mk = memkind(opt);
     void *new_seg;
     Uint new_size;
 
@@ -1092,10 +1093,10 @@ info_options(char *prefix,
     if (print_to_p) {
 	int to = *print_to_p;
 	void *arg = print_to_arg;
-	erts_print(to, arg, "%samcbf: %bpu\n", prefix, abs_max_cache_bad_fit);
-	erts_print(to, arg, "%srmcbf: %bpu\n", prefix, rel_max_cache_bad_fit);
-	erts_print(to, arg, "%smcs: %bpu\n", prefix, max_cache_size);
-	erts_print(to, arg, "%scci: %bpu\n", prefix, cache_check_interval);
+	erts_print(to, arg, "%samcbf: %beu\n", prefix, abs_max_cache_bad_fit);
+	erts_print(to, arg, "%srmcbf: %beu\n", prefix, rel_max_cache_bad_fit);
+	erts_print(to, arg, "%smcs: %beu\n", prefix, max_cache_size);
+	erts_print(to, arg, "%scci: %beu\n", prefix, cache_check_interval);
     }
 
     if (hpp || szp) {
@@ -1131,9 +1132,9 @@ info_calls(int *print_to_p, void *print_to_arg, Uint **hpp, Uint *szp)
 
 #define PRINT_CC(TO, TOA, CC)						\
     if (calls.CC.giga_no == 0)						\
-	erts_print(TO, TOA, "mseg_%s calls: %bpu\n", #CC, calls.CC.no);	\
+	erts_print(TO, TOA, "mseg_%s calls: %b32u\n", #CC, calls.CC.no);	\
     else								\
-	erts_print(TO, TOA, "mseg_%s calls: %bpu%09bpu\n", #CC,		\
+	erts_print(TO, TOA, "mseg_%s calls: %b32u%09b32u\n", #CC,		\
 		   calls.CC.giga_no, calls.CC.no)
 
 	int to = *print_to_p;
@@ -1215,13 +1216,13 @@ info_status(MemKind* mk, int *print_to_p, void *print_to_arg,
 	int to = *print_to_p;
 	void *arg = print_to_arg;
 
-	erts_print(to, arg, "cached_segments: %bpu\n", mk->cache_size);
-	erts_print(to, arg, "cache_hits: %bpu\n", mk->cache_hits);
-	erts_print(to, arg, "segments: %bpu %bpu %bpu\n",
+	erts_print(to, arg, "cached_segments: %beu\n", mk->cache_size);
+	erts_print(to, arg, "cache_hits: %beu\n", mk->cache_hits);
+	erts_print(to, arg, "segments: %beu %beu %beu\n",
 		   mk->segments.current.no, mk->segments.max.no, mk->segments.max_ever.no);
-	erts_print(to, arg, "segments_size: %bpu %bpu %bpu\n",
+	erts_print(to, arg, "segments_size: %beu %beu %beu\n",
 		   mk->segments.current.sz, mk->segments.max.sz, mk->segments.max_ever.sz);
-	erts_print(to, arg, "segments_watermark: %bpu\n",
+	erts_print(to, arg, "segments_watermark: %beu\n",
 		   mk->segments.current.watermark);
     }
 
@@ -1372,7 +1373,7 @@ erts_mseg_alloc_opt(ErtsAlcType_t atype, Uint *size_p, const ErtsMsegOpt_t *opt)
 void *
 erts_mseg_alloc(ErtsAlcType_t atype, Uint *size_p)
 {
-    return erts_mseg_alloc_opt(atype, size_p, &default_opt);
+    return erts_mseg_alloc_opt(atype, size_p, &erts_mseg_default_opt);
 }
 
 void
@@ -1387,7 +1388,7 @@ erts_mseg_dealloc_opt(ErtsAlcType_t atype, void *seg, Uint size,
 void
 erts_mseg_dealloc(ErtsAlcType_t atype, void *seg, Uint size)
 {
-    erts_mseg_dealloc_opt(atype, seg, size, &default_opt);
+    erts_mseg_dealloc_opt(atype, seg, size, &erts_mseg_default_opt);
 }
 
 void *
@@ -1405,7 +1406,7 @@ void *
 erts_mseg_realloc(ErtsAlcType_t atype, void *seg, Uint old_size,
 		  Uint *new_size_p)
 {
-    return erts_mseg_realloc_opt(atype, seg, old_size, new_size_p, &default_opt);
+    return erts_mseg_realloc_opt(atype, seg, old_size, new_size_p, &erts_mseg_default_opt);
 }
 
 void
@@ -1507,7 +1508,7 @@ erts_mseg_init(ErtsMsegInit_t *init)
     while ((page_size >> page_shift) != 1) {
 	if ((page_size & (1 << (page_shift - 1))) != 0)
 	    erl_exit(ERTS_ABORT_EXIT,
-		     "erts_mseg: Unexpected page_size %bpu\n", page_size);
+		     "erts_mseg: Unexpected page_size %beu\n", page_size);
 	page_shift++;
     }
 
diff --git a/erts/emulator/sys/common/erl_mseg.h b/erts/emulator/sys/common/erl_mseg.h
index d8053eb0d9..fbb66ee33b 100644
--- a/erts/emulator/sys/common/erl_mseg.h
+++ b/erts/emulator/sys/common/erl_mseg.h
@@ -60,15 +60,12 @@ typedef struct {
     int  preserv;
     UWord abs_shrink_th;
     UWord rel_shrink_th;
+#if HALFWORD_HEAP
+    int low_mem;
+#endif
 } ErtsMsegOpt_t;
 
-#define ERTS_MSEG_DEFAULT_OPT_INITIALIZER				\
-{									\
-    1,			/* Use cache				*/	\
-    1,			/* Preserv data				*/	\
-    0,			/* Absolute shrink threshold		*/	\
-    0			/* Relative shrink threshold		*/	\
-}
+extern const ErtsMsegOpt_t erts_mseg_default_opt;
 
 void *erts_mseg_alloc(ErtsAlcType_t, Uint *);
 void *erts_mseg_alloc_opt(ErtsAlcType_t, Uint *, const ErtsMsegOpt_t *);
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 3ae5b8d747..f5c785d683 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -766,7 +766,7 @@ write_batch_buf(ErtsPollSet ps, ErtsPollBatchBuf *bbp)
 		short filter;
 		int fd = (int) ebuf[i].ident;
 
-		switch ((int) ebuf[i].udata) {
+		switch ((int) (long) ebuf[i].udata) {
 
 		    /*
 		     * Since we use a lazy update approach EV_DELETE will
@@ -805,7 +805,7 @@ write_batch_buf(ErtsPollSet ps, ErtsPollBatchBuf *bbp)
 			if (fd == (int) ebuf[j].ident) {
 			    ebuf[j].udata = (void *) ERTS_POLL_KQ_OP_HANDLED;
 			    if (!(ebuf[j].flags & EV_ERROR)) {
-				switch ((int) ebuf[j].udata) {
+				switch ((int) (long) ebuf[j].udata) {
 				case ERTS_POLL_KQ_OP_ADD2_W:
 				    filter = EVFILT_WRITE;
 				    goto rm_add_fb;
@@ -823,7 +823,8 @@ write_batch_buf(ErtsPollSet ps, ErtsPollBatchBuf *bbp)
 			}
 		    }
 		    /* The other add succeded... */
-		    filter = (((int) ebuf[i].udata == ERTS_POLL_KQ_OP_ADD2_W)
+		    filter = ((((int) (long) ebuf[i].udata)
+			       == ERTS_POLL_KQ_OP_ADD2_W)
 			      ? EVFILT_READ
 			      : EVFILT_WRITE);
 		rm_add_fb:
diff --git a/erts/emulator/sys/win32/erl_poll.c b/erts/emulator/sys/win32/erl_poll.c
index 7662f190ef..074e2e247f 100644
--- a/erts/emulator/sys/win32/erl_poll.c
+++ b/erts/emulator/sys/win32/erl_poll.c
@@ -693,6 +693,7 @@ static void *break_waiter(void *param)
 	    ResetEvent(harr[0]);
 	    erts_mtx_lock(&break_waiter_lock);
 	    erts_atomic32_set(&break_waiter_state,BREAK_WAITER_GOT_BREAK);
+	    ERTS_THR_MEMORY_BARRIER;
 	    SetEvent(break_happened_event);
 	    erts_mtx_unlock(&break_waiter_lock);
 	    break;
@@ -700,6 +701,7 @@ static void *break_waiter(void *param)
 	    ResetEvent(harr[1]);
 	    erts_mtx_lock(&break_waiter_lock);
 	    erts_atomic32_set(&break_waiter_state,BREAK_WAITER_GOT_HALT);
+	    ERTS_THR_MEMORY_BARRIER;
 	    SetEvent(break_happened_event);
 	    erts_mtx_unlock(&break_waiter_lock);
 	    break;
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 7e409f053e..4e82381fba 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -23,12 +23,12 @@
 %% Tests binaries and the BIFs:
 %%	list_to_binary/1
 %%      iolist_to_binary/1
-%%      bitstr_to_list/1
+%%      list_to_bitstring/1
 %%	binary_to_list/1
 %%	binary_to_list/3
 %%	binary_to_term/1
 %%  	binary_to_term/2
-%%      bitstr_to_list/1
+%%      bitstring_to_list/1
 %%	term_to_binary/1
 %%      erlang:external_size/1
 %%	size(Binary)
@@ -275,12 +275,33 @@ bad_list_to_binary(Config) when is_list(Config) ->
     ?line test_bad_bin(fun(X, Y) -> X*Y end),
     ?line test_bad_bin([1,fun(X) -> X + 1 end,2|fun() -> 0 end]),
     ?line test_bad_bin([fun(X) -> X + 1 end]),
+
+    %% Test iolists that do not fit in the address space.
+    %% Unfortunately, it would be too slow to test in a 64-bit emulator.
+    case erlang:system_info(wordsize) of
+	4 -> huge_iolists();
+	_ -> ok
+    end.
+
+huge_iolists() ->
+    FourGigs = 1 bsl 32,
+    ?line Sizes = [FourGigs+N || N <- lists:seq(0, 64)] ++
+	[1 bsl N || N <- lists:seq(33, 37)],
+    ?line Base = <<0:(1 bsl 20)/unit:8>>,
+    [begin
+	 L = build_iolist(Sz, Base),
+	 ?line {'EXIT',{system_limit,_}} = (catch list_to_binary([L])),
+	 ?line {'EXIT',{system_limit,_}} = (catch list_to_bitstring([L])),
+	 ?line {'EXIT',{system_limit,_}} = (catch binary:list_to_bin([L])),
+	 ?line {'EXIT',{system_limit,_}} = (catch iolist_to_binary(L))
+	 end || Sz <- Sizes],
     ok.
 
 test_bad_bin(List) ->
     {'EXIT',{badarg,_}} = (catch list_to_binary(List)),
     {'EXIT',{badarg,_}} = (catch iolist_to_binary(List)),
-    {'EXIT',{badarg,_}} = (catch list_to_bitstring(List)).
+    {'EXIT',{badarg,_}} = (catch list_to_bitstring(List)),
+    {'EXIT',{badarg,_}} = (catch iolist_size(List)).
 
 bad_binary_to_list(doc) -> "Tries binary_to_list/1,3 with bad arguments.";
 bad_binary_to_list(Config) when is_list(Config) ->
@@ -516,18 +537,65 @@ external_size_1(Term, Size0, Limit) when Size0 < Limit ->
 external_size_1(_, _, _) -> ok.
 
 t_iolist_size(Config) when is_list(Config) ->
-    %% Build a term whose external size only fits in a big num (on 32-bit CPU).
-    Bin = iolist_to_binary(lists:seq(0, 254)),
-    ?line ok = t_iolist_size_1(Bin, 0, 16#7FFFFFFF),
-    ?line ok = t_iolist_size_1(make_unaligned_sub_binary(Bin), 0, 16#7FFFFFFF).
+    ?line Seed = now(),
+    ?line io:format("Seed: ~p", [Seed]),
+    ?line random:seed(Seed),
+    ?line Base = <<0:(1 bsl 20)/unit:8>>,
+    ?line Powers = [1 bsl N || N <- lists:seq(2, 37)],
+    ?line Sizes0 = [[N - random:uniform(N div 2),
+		     lists:seq(N-2, N+2),
+		     N+N div 2,
+		     N + random:uniform(N div 2)] ||
+		       N <- Powers],
+    %% Test sizes around 1^32 more thoroughly.
+    FourGigs = 1 bsl 32,
+    ?line Sizes1 = [FourGigs+N || N <- lists:seq(-8, 40)] ++ Sizes0,
+    ?line Sizes2 = lists:flatten(Sizes1),
+    ?line Sizes = lists:usort(Sizes2),
+    io:format("~p sizes:", [length(Sizes)]),
+    io:format("~p\n", [Sizes]),
+    ?line [Sz = iolist_size(build_iolist(Sz, Base)) || Sz <- Sizes],
+    ok.
 
-t_iolist_size_1(IOList, Size0, Limit) when Size0 < Limit ->
-    case iolist_size(IOList) of
-	Size when is_integer(Size), Size0 < Size ->
-	    io:format("~p", [Size]),
-	    t_iolist_size_1([IOList|IOList], Size, Limit)
+build_iolist(N, Base) when N < 16 ->
+    case random:uniform(3) of
+	1 ->
+	    <<Bin:N/binary,_/binary>> = Base,
+	    Bin;
+	_ ->
+	    lists:seq(1, N)
+    end;
+build_iolist(N, Base) when N =< byte_size(Base) ->
+    case random:uniform(3) of
+	1 ->
+	    <<Bin:N/binary,_/binary>> = Base,
+	    Bin;
+	2 ->
+	    <<Bin:N/binary,_/binary>> = Base,
+	    [Bin];
+	3 ->
+	    case N rem 2 of
+		0 ->
+		    L = build_iolist(N div 2, Base),
+		    [L,L];
+		1 ->
+		    L = build_iolist(N div 2, Base),
+		    [L,L,45]
+	    end
     end;
-t_iolist_size_1(_, _, _) -> ok.
+build_iolist(N0, Base) ->
+    Small = random:uniform(15),
+    Seq = lists:seq(1, Small),
+    N = N0 - Small,
+    case N rem 2 of
+	0 ->
+	    L = build_iolist(N div 2, Base),
+	    [L,L|Seq];
+	1 ->
+	    L = build_iolist(N div 2, Base),
+	    [47,L,L|Seq]
+    end.
+
 
 bad_binary_to_term_2(doc) -> "OTP-4053.";
 bad_binary_to_term_2(suite) -> [];
@@ -1183,34 +1251,7 @@ deep(Config) when is_list(Config) ->
 
 deep_roundtrip(T) ->
     B = term_to_binary(T),
-    true = deep_eq(T, binary_to_term(B)).
-
-%%
-%% FIXME: =:= runs out of stack.
-%%
-deep_eq([H1|T1], [H2|T2]) ->
-    deep_eq(H1, H2) andalso deep_eq(T1, T2);
-deep_eq(T1, T2) when tuple_size(T1) =:= tuple_size(T2) ->
-    deep_eq_tup(T1, T2, tuple_size(T1));
-deep_eq(T1, T2) when is_function(T1), is_function(T2) ->
-    {uniq,U1} = erlang:fun_info(T1, uniq),
-    {index,I1} = erlang:fun_info(T1, index),
-    {arity,A1} = erlang:fun_info(T1, arity),
-    {env,E1} = erlang:fun_info(T1, env),
-    {uniq,U2} = erlang:fun_info(T2, uniq),
-    {index,I2} = erlang:fun_info(T2, index),
-    {arity,A2} = erlang:fun_info(T2, arity),
-    {env,E2} = erlang:fun_info(T2, env),
-    U1 =:= U2 andalso I1 =:= I2 andalso A1 =:= A2 andalso
-	deep_eq(E1, E2);
-deep_eq(T1, T2) ->
-    T1 =:= T2.
-
-deep_eq_tup(_T1, _T2, 0) ->
-    true;
-deep_eq_tup(T1, T2, N) ->
-    deep_eq(element(N, T1), element(N, T2)) andalso
-	deep_eq_tup(T1, T2, N-1).
+    T = binary_to_term(B).
 
 obsolete_funs(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
diff --git a/erts/emulator/test/code_SUITE.erl b/erts/emulator/test/code_SUITE.erl
index 703a00a598..a062cea117 100644
--- a/erts/emulator/test/code_SUITE.erl
+++ b/erts/emulator/test/code_SUITE.erl
@@ -483,7 +483,7 @@ do_false_dependency(Init, Code) ->
     %% Spawn process. Make sure it has the appropriate init function
     %% and returned. CP should not contain garbage after the return.
     Parent = self(),
-    ?line Pid = spawn_link(fun() -> false_dependency_loop(Parent, Init) end),
+    ?line Pid = spawn_link(fun() -> false_dependency_loop(Parent, Init, true) end),
     ?line receive initialized -> ok end,
 
     %% Reload the module. Make sure the process is still alive.
@@ -498,14 +498,23 @@ do_false_dependency(Init, Code) ->
     ?line unlink(Pid), exit(Pid, kill),
     ?line true = erlang:purge_module(cpbugx),
     ?line true = erlang:delete_module(cpbugx),
+    ?line code:is_module_native(cpbugx),  % test is_module_native on deleted code
     ?line true = erlang:purge_module(cpbugx),
+    ?line code:is_module_native(cpbugx),  % test is_module_native on purged code
     ok.
     
-false_dependency_loop(Parent, Init) ->
+false_dependency_loop(Parent, Init, SendInitAck) ->
     Init(),
-    Parent ! initialized,
+    case SendInitAck of
+	true -> Parent ! initialized;
+	false -> void
+		 %% Just send one init-ack. I guess the point of this test
+		 %% wasn't to fill parents msg-queue (?). Seen to cause
+		 %% out-of-mem (on halfword-vm for some reason) by
+		 %% 91 million msg in queue. /sverker
+    end,
     receive
-	_ -> false_dependency_loop(Parent, Init)
+	_ -> false_dependency_loop(Parent, Init, false)
     end.
 
 coverage(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 7600a44988..520e3e8c76 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -38,7 +38,7 @@
 	 timer_change/1,
 	 timer_delay/1,
 	 queue_echo/1,
-	 fun_to_port/1,
+	 outputv_errors/1,
 	 driver_unloaded/1,
 	 io_ready_exit/1,
 	 use_fallback_pollset/1,
@@ -129,7 +129,7 @@ end_per_testcase(Case, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [fun_to_port, outputv_echo, queue_echo, {group, timer},
+    [outputv_errors, outputv_echo, queue_echo, {group, timer},
      driver_unloaded, io_ready_exit, use_fallback_pollset,
      bad_fd_in_pollset, driver_event, fd_change,
      steal_control, otp_6602, 'driver_system_info_ver1.0',
@@ -165,37 +165,89 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-
-fun_to_port(doc) -> "Test sending a fun to port with an outputv-capable driver.";
-fun_to_port(Config) when is_list(Config) ->
+outputv_errors(doc) -> "Test sending bad types to port with an outputv-capable driver.";
+outputv_errors(Config) when is_list(Config) ->
     ?line Path = ?config(data_dir, Config),
     ?line erl_ddll:start(),
     ?line ok = load_driver(Path, outputv_drv),
 
-    ?line fun_to_port_1(fun() -> 33 end),
-    ?line fun_to_port_1([fun() -> 42 end]),
-    ?line fun_to_port_1([1|fun() -> 42 end]),
-    L = build_io_list(65536),
-    ?line fun_to_port_1([L,fun() -> 42 end]),
-    ?line fun_to_port_1([L|fun() -> 42 end]),
+    outputv_bad_types(fun(T) ->
+			      ?line outputv_errors_1(T),
+			      ?line outputv_errors_1([1|T]),
+			      ?line L = [1,2,3],
+			      ?line outputv_errors_1([L,T]),
+			      ?line outputv_errors_1([L|T])
+		      end),
+    outputv_errors_1(42),
+
+    %% Test iolists that do not fit in the address space.
+    %% Unfortunately, it would be too slow to test in a 64-bit emulator.
+    case erlang:system_info(wordsize) of
+	4 -> outputv_huge_iolists();
+	_ -> ok
+    end.
+
+outputv_bad_types(Test) ->
+    Types = [-1,256,atom,42.0,{a,b,c},make_ref(),fun() -> 42 end,
+	     [1|2],<<1:1>>,<<1:9>>,<<1:15>>],
+    _ = [Test(Type) || Type <- Types],
     ok.
 
-fun_to_port_1(Term) ->
-    Port = open_port({spawn,outputv_drv}, []),
+outputv_huge_iolists() ->
+    FourGigs = 1 bsl 32,
+    ?line Sizes = [FourGigs+N || N <- lists:seq(0, 64)] ++
+	[1 bsl N || N <- lists:seq(33, 37)],
+    ?line Base = <<0:(1 bsl 20)/unit:8>>,
+    [begin
+	 ?line L = build_iolist(Sz, Base),
+	 ?line outputv_errors_1(L)
+     end || Sz <- Sizes],
+    ok.
+
+outputv_errors_1(Term) ->
+    Port = open_port({spawn_driver,outputv_drv}, []),
     {'EXIT',{badarg,_}} = (catch port_command(Port, Term)),
     port_close(Port).
 
-build_io_list(0) -> [];
-build_io_list(1) -> [7];
-build_io_list(N) ->
-    L = build_io_list(N div 2),
+build_iolist(N, Base) when N < 16 ->
+    case random:uniform(3) of
+	1 ->
+	    <<Bin:N/binary,_/binary>> = Base,
+	    Bin;
+	_ ->
+	    lists:seq(1, N)
+    end;
+build_iolist(N, Base) when N =< byte_size(Base) ->
+    case random:uniform(3) of
+	1 ->
+	    <<Bin:N/binary,_/binary>> = Base,
+	    Bin;
+	2 ->
+	    <<Bin:N/binary,_/binary>> = Base,
+	    [Bin];
+	3 ->
+	    case N rem 2 of
+		0 ->
+		    L = build_iolist(N div 2, Base),
+		    [L,L];
+		1 ->
+		    L = build_iolist(N div 2, Base),
+		    [L,L,45]
+	    end
+    end;
+build_iolist(N0, Base) ->
+    Small = random:uniform(15),
+    Seq = lists:seq(1, Small),
+    N = N0 - Small,
     case N rem 2 of
-	0 -> [L|L];
-	1 -> [7,L|L]
+	0 ->
+	    L = build_iolist(N div 2, Base),
+	    [L,L|Seq];
+	1 ->
+	    L = build_iolist(N div 2, Base),
+	    [47,L,L|Seq]
     end.
 
-
-
 outputv_echo(doc) -> ["Test echoing data with a driver that supports outputv."];
 outputv_echo(Config) when is_list(Config) ->
     ?line Dog = test_server:timetrap(test_server:minutes(10)),
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index b79c30d8d9..91d695d979 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -1121,7 +1121,14 @@ is_checks(Config) when is_list(Config) ->
     ?line ensure_lib_loaded(Config, 1),
     ?line ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
 			self(), hd(erlang:ports()), [], [1,9,9,8],
-			{hejsan, "hejsan", [$h,"ejs",<<"an">>]}).
+			{hejsan, "hejsan", [$h,"ejs",<<"an">>]}),
+    try
+        ?line error = check_is_exception(),
+        ?line throw(expected_badarg)
+    catch
+        error:badarg ->
+            ?line ok
+    end.
 
 get_length(doc) -> ["Test all enif_get_length functions"];
 get_length(Config) when is_list(Config) ->
@@ -1245,6 +1252,7 @@ release_resource(_) -> ?nif_stub.
 last_resource_dtor_call() -> ?nif_stub.
 make_new_resource(_,_) -> ?nif_stub.
 check_is(_,_,_,_,_,_,_,_,_,_) -> ?nif_stub.
+check_is_exception() -> ?nif_stub.
 length_test(_,_,_,_,_) -> ?nif_stub.
 make_atoms() -> ?nif_stub.
 make_strings() -> ?nif_stub.
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index 8489124966..dc047394b5 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -802,6 +802,23 @@ static ERL_NIF_TERM check_is(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]
 }
 
 /*
+ * no arguments
+ *
+ * This function is separate from check_is because it calls enif_make_badarg
+ * and so it must return the badarg exception as its return value. Thus, the
+ * badarg exception indicates success. Failure is indicated by returning an
+ * error atom.
+ */
+static ERL_NIF_TERM check_is_exception(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ERL_NIF_TERM error_atom = enif_make_atom(env, "error");
+    ERL_NIF_TERM badarg = enif_make_badarg(env);
+    if (enif_is_exception(env, error_atom)) return error_atom;
+    if (!enif_is_exception(env, badarg)) return error_atom;
+    return badarg;
+}
+
+/*
  * argv[0] atom with length of 6
  * argv[1] list with length of 6
  * argv[2] empty list
@@ -1383,6 +1400,7 @@ static ErlNifFunc nif_funcs[] =
     {"last_resource_dtor_call", 0, last_resource_dtor_call},
     {"make_new_resource", 2, make_new_resource},
     {"check_is", 10, check_is},
+    {"check_is_exception", 0, check_is_exception},
     {"length_test", 5, length_test},
     {"make_atoms", 0, make_atoms},
     {"make_strings", 0, make_strings},
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index 36bae908aa..f68e712268 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -50,7 +50,8 @@
 	 processes_last_call_trap/1, processes_gc_trap/1,
 	 processes_term_proc_list/1,
 	 otp_7738_waiting/1, otp_7738_suspended/1,
-	 otp_7738_resume/1]).
+	 otp_7738_resume/1,
+	 garb_other_running/1]).
 -export([prio_server/2, prio_client/2]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -72,7 +73,7 @@ all() ->
      bad_register, garbage_collect, process_info_messages,
      process_flag_badarg, process_flag_heap_size,
      spawn_opt_heap_size, otp_6237, {group, processes_bif},
-     {group, otp_7738}].
+     {group, otp_7738}, garb_other_running].
 
 groups() -> 
     [{t_exit_2, [],
@@ -2116,6 +2117,41 @@ otp_7738_test(Type) ->
 	  end,
     ?line ok.
 
+gor(Reds, Stop) ->
+    receive
+	{From, reds} ->
+	    From ! {reds, Reds, self()},
+	    gor(Reds+1, Stop);
+	{From, Stop} ->
+	    From ! {stopped, Stop, Reds, self()}
+    after 0 ->
+	    gor(Reds+1, Stop)
+    end.
+
+garb_other_running(Config) when is_list(Config) ->
+    ?line Stop = make_ref(),
+    ?line {Pid, Mon} = spawn_monitor(fun () -> gor(0, Stop) end),
+    ?line Reds = lists:foldl(fun (_, OldReds) ->
+				     ?line erlang:garbage_collect(Pid),
+				     ?line receive after 1 -> ok end,
+				     ?line Pid ! {self(), reds},
+				     ?line receive
+					       {reds, NewReds, Pid} ->
+						   ?line true = (NewReds > OldReds),
+						   ?line NewReds
+					   end
+			     end,
+			     0,
+			     lists:seq(1, 10000)),
+    ?line receive after 1 -> ok end,
+    ?line Pid ! {self(), Stop},
+    ?line receive
+	      {stopped, Stop, StopReds, Pid} ->
+		  ?line true = (StopReds > Reds)
+	  end,
+    ?line receive {'DOWN', Mon, process, Pid, normal} -> ok end,
+    ?line ok.
+
 %% Internal functions
 
 wait_until(Fun) ->
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 60b3af7db7..90d3be9448 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -394,6 +394,7 @@ int main(int argc, char **argv)
     int print_args_exit = 0;
     int print_qouted_cmd_exit = 0;
     erts_cpu_info_t *cpuinfo = NULL;
+    char* emu_name;
 
 #ifdef __WIN32__
     this_module_handle = module;
@@ -566,6 +567,7 @@ int main(int argc, char **argv)
 	    usage("+MYm");
     }
     emu = add_extra_suffixes(emu, emu_type);
+    emu_name = strsave(emu);
     erts_snprintf(tmpStr, sizeof(tmpStr), "%s" DIRSEP "%s" BINARY_EXT, bindir, emu);
     emu = strsave(tmpStr);
 
@@ -682,6 +684,9 @@ int main(int argc, char **argv)
 			verbose = 1;
 		    } else if (strcmp(argv[i], "-emu_args_exit") == 0) {
 			print_args_exit = 1;
+		    } else if (strcmp(argv[i], "-emu_name_exit") == 0) {
+			printf("%s\n", emu_name);
+			exit(0);
 		    } else if (strcmp(argv[i], "-emu_qouted_cmd_exit") == 0) {
 			print_qouted_cmd_exit = 1;
 		    } else if (strcmp(argv[i], "-env") == 0) { /* -env VARNAME VARVALUE */
@@ -1970,6 +1975,11 @@ initial_argv_massage(int *argc, char ***argv)
      */
 
     vix = 0;
+
+    av = build_args_from_env("ERL_" OTP_SYSTEM_VERSION "_FLAGS");
+    if (av)
+	avv[vix++].argv = av;
+
     av = build_args_from_env("ERL_AFLAGS");
     if (av)
 	avv[vix++].argv = av;
@@ -1984,10 +1994,6 @@ initial_argv_massage(int *argc, char ***argv)
     if (av)
 	avv[vix++].argv = av;
 
-    av = build_args_from_env("ERL_" OTP_SYSTEM_VERSION "_FLAGS");
-    if (av)
-	avv[vix++].argv = av;
-
     av = build_args_from_env("ERL_ZFLAGS");
     if (av)
 	avv[vix++].argv = av;
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src
index 0355f2629f..0b2d6512ea 100644
--- a/erts/etc/unix/cerl.src
+++ b/erts/etc/unix/cerl.src
@@ -62,13 +62,21 @@ cxargs_add() {
     done
 }
 
+eeargs=
+eeargs_add() {
+    while [ $# -gt 0 ]; do
+	cargs="$cargs $1"
+	eeargs="$eeargs $1"
+	shift
+    done
+}
+
 core=
 
 GDB=
 GDBBP=
 GDBARGS=
 TYPE=
-EMU_TYPE=
 debug=
 run_valgrind=no
 
@@ -127,34 +135,37 @@ while [ $# -gt 0 ]; do
 	    ;;
 	"-smp")
 	    shift
-	    cargs="$cargs -smp"
-	    EMU_TYPE=.smp
+	    if [ $# -le 0 ]; then
+		eeargs_add -smp
+	    else
+		case $1 in
+		    disable)
+			shift
+			eeargs_add -smpdisable
+			;;
+		    enable)
+			shift
+			eeargs_add -smp
+			;;
+		    *)
+			eeargs_add -smp
+		esac
+	    fi
+	    ;;
+	"-smpdisable")
+	    shift
+	    eeargs_add -smpdisable
 	    ;;
 	"-lcnt")
 	    shift
 	    cargs="$cargs -lcnt"
 	    TYPE=.lcnt
 	    ;;
-	"-frag")
-	    shift
-	    cargs="$cargs -frag"
-	    EMU_TYPE=.frag
-	    ;;
-	"-smp_frag")
-	    shift
-	    cargs="$cargs -smp_frag"
-	    EMU_TYPE=.smp_frag
-	    ;;
 	"-gprof")
 	    shift
 	    cargs="$cargs -gprof"
 	    TYPE=.gprof
 	    ;;
-	"-hybrid")
-	    shift
-	    cargs="$cargs -hybrid"
-	    EMU_TYPE=.hybrid
-	    ;;
 	"-debug")
 	    shift
 	    cargs="$cargs -debug"
@@ -180,11 +191,6 @@ while [ $# -gt 0 ]; do
 #	    shift
 #	    GDB=xxgdb
 #	    ;;
-	"-shared")
-	    shift
-	    cargs="$cargs -shared"
-	    TYPE=.shared
-	    ;;
 	"-purify")
 	    shift
 	    cargs="$cargs -purify"
@@ -222,7 +228,9 @@ PATH=$BINDIR:$ROOTDIR/bin:$PATH
 EXEC=$BINDIR/erlexec
 
 PROGNAME="$PROGNAME $cargs"
-EMU=$EMU$TYPE$EMU_TYPE
+EMU="$EMU$TYPE"
+EMU_NAME=`$EXEC -emu_name_exit $eeargs`
+
 if [ $run_valgrind != yes ]; then
     xargs="$xargs -pz $PRELOADED --"
 fi
@@ -248,9 +256,9 @@ if [ "x$GDB" = "x" ]; then
 	    valgrind_log=
 	else
 	    if [ $valmajor -gt 2 -a $valminor -gt 4 ]; then
-		valgrind_log="$log_file_prefix$VALGRIND_LOG_DIR/$VALGRIND_LOGFILE_PREFIX$VALGRIND_LOGFILE_INFIX$EMU.log.$$"
+		valgrind_log="$log_file_prefix$VALGRIND_LOG_DIR/$VALGRIND_LOGFILE_PREFIX$VALGRIND_LOGFILE_INFIX$EMU_NAME.log.$$"
 	    else
-		valgrind_log="$log_file_prefix$VALGRIND_LOG_DIR/$VALGRIND_LOGFILE_PREFIX$VALGRIND_LOGFILE_INFIX$EMU.log"
+		valgrind_log="$log_file_prefix$VALGRIND_LOG_DIR/$VALGRIND_LOGFILE_PREFIX$VALGRIND_LOGFILE_INFIX$EMU_NAME.log"
 	    fi
 	fi
 	if [ "x$VALGRIND_MISC_FLAGS" = "x" ]; then
@@ -263,9 +271,9 @@ if [ "x$GDB" = "x" ]; then
 	early_beam_args=`echo $beam_args | sed "s|^\(.*-progname\).*$|\1|g"`
 	late_beam_args=`echo $beam_args | sed "s|^$pre_beam_args.*\(-- -home.*\)$|\1|g"`
 	
-	exec valgrind $valgrind_xml $valgrind_log $valgrind_misc_flags $BINDIR/$EMU $emu_xargs $early_beam_args "$PROGNAME" $late_beam_args -pz $PRELOADED
+	exec valgrind $valgrind_xml $valgrind_log $valgrind_misc_flags $BINDIR/$EMU_NAME $emu_xargs $early_beam_args "$PROGNAME" $late_beam_args -pz $PRELOADED
     else
-	exec $EXEC $xargs ${1+"$@"}
+	exec $EXEC $eeargs $xargs ${1+"$@"}
     fi
 else
     if [ "x$EMACS" = "x" ]; then
@@ -300,5 +308,5 @@ else
             (insert-string \"source $ROOTDIR/erts/etc/unix/etp-commands\") \
             (comint-send-input)"
     # Fire up gdb in emacs...
-    exec $EMACS --eval "(progn (gdb \"gdb $GDBARGS$EMU\") $gdbcmd)"
+    exec $EMACS --eval "(progn (gdb \"gdb $GDBARGS$EMU_NAME\") $gdbcmd)"
 fi
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index e97cc14fab..8db8e09bee 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -991,9 +991,7 @@ static int open_pty_master(char **ptyslave)
 static int open_pty_slave(char *name)
 {
   int sfd;
-#ifdef DEBUG
   struct termios tty_rmode;
-#endif
 
   if ((sfd = open(name, O_RDWR, 0)) < 0) {
     return -1;
@@ -1019,6 +1017,25 @@ static int open_pty_slave(char *name)
   }
 #endif
 
+  if (getenv("RUN_ERL_DISABLE_FLOWCNTRL")) {
+    if (tcgetattr(sfd, &tty_rmode) < 0) {
+      fprintf(stderr, "Cannot get terminal's current mode\n");
+      exit(-1);
+    }
+
+    tty_rmode.c_iflag &= ~IXOFF;
+    if (tcsetattr(sfd, TCSANOW, &tty_rmode) < 0) {
+      fprintf(stderr, "Cannot disable terminal's flow control on input\n");
+      exit(-1);
+    }
+
+    tty_rmode.c_iflag &= ~IXON;
+    if (tcsetattr(sfd, TCSANOW, &tty_rmode) < 0) {
+      fprintf(stderr, "Cannot disable terminal's flow control on output\n");
+      exit(-1);
+    }
+  }
+
 #ifdef DEBUG
   if (tcgetattr(sfd, &tty_rmode) < 0) {
     fprintf(stderr, "Cannot get terminals current mode\n");
diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh
index 328811a0d7..bc4260ecba 100755
--- a/erts/etc/win32/nsis/find_redist.sh
+++ b/erts/etc/win32/nsis/find_redist.sh
@@ -139,8 +139,7 @@ fi
 
 #echo $BPATH_LIST
 for BP in $BPATH_LIST; do
-    #echo "BP=$BP"
-    for verdir in "sdk v2.0" "sdk v3.5" "v6.0A" "v7.0A" "v7.1"; do
+    for verdir in "sdk v2.0" "sdk v3.5" "v6.0A" "v7.0"  "v7.0A" "v7.1"; do
 	BPATH=$BP
 	fail=false
 	allow_fail=false
@@ -171,6 +170,18 @@ for BP in $BPATH_LIST; do
     fi
 done
 
+# shortcut for locating vcredist_x86.exe is to put it into $ERL_TOP
+if [ -f $ERL_TOP/vcredist_x86.exe ]; then
+    echo $ERL_TOP/vcredist_x86.exe
+    exit 0
+fi
+
+# or $ERL_TOP/.. to share across multiple builds
+if [ -f $ERL_TOP/../vcredist_x86.exe ]; then
+    echo $ERL_TOP/../vcredist_x86.exe
+    exit 0
+fi
+
 echo "Failed to locate vcredist_x86.exe because directory structure was unexpected" >&2
 exit 3
 
diff --git a/erts/include/internal/erl_printf_format.h b/erts/include/internal/erl_printf_format.h
index 45818079ea..400cc7dafd 100644
--- a/erts/include/internal/erl_printf_format.h
+++ b/erts/include/internal/erl_printf_format.h
@@ -40,7 +40,7 @@ extern int erts_printf_ulong(fmtfn_t, void*, char, int, int, unsigned long);
 extern int erts_printf_slong(fmtfn_t, void*, char, int, int, signed long);
 extern int erts_printf_double(fmtfn_t, void *, char, int, int, double);
 
-extern int (*erts_printf_eterm_func)(fmtfn_t, void*, unsigned long, long);
+extern int (*erts_printf_eterm_func)(fmtfn_t, void*, unsigned long, long, unsigned long*);
 
 #endif
 
diff --git a/erts/include/internal/libatomic_ops/ethr_atomic.h b/erts/include/internal/libatomic_ops/ethr_atomic.h
index d56693dbf8..2fc82c99a8 100644
--- a/erts/include/internal/libatomic_ops/ethr_atomic.h
+++ b/erts/include/internal/libatomic_ops/ethr_atomic.h
@@ -146,13 +146,13 @@ ETHR_NATMC_FUNC__(read)(ETHR_ATMC_T__ *var)
 static ETHR_INLINE ETHR_AINT_T__
 ETHR_NATMC_FUNC__(add_return)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
 {
-#ifdef AO_HAVE_fetch_and_add
-    return ((ETHR_AINT_T__) AO_fetch_and_add(&var->counter, (AO_t) incr)) + incr;
+#ifdef AO_HAVE_fetch_and_add_full
+    return ((ETHR_AINT_T__) AO_fetch_and_add_full(&var->counter, (AO_t) incr)) + incr;
 #else
     while (1) {
 	AO_t exp = AO_load(&var->counter);
 	AO_t new = exp + (AO_t) incr;
-	if (AO_compare_and_swap(&var->counter, exp, new))
+	if (AO_compare_and_swap_full(&var->counter, exp, new))
 	    return (ETHR_AINT_T__) new;
     }
 #endif
@@ -167,8 +167,8 @@ ETHR_NATMC_FUNC__(add)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
 static ETHR_INLINE ETHR_AINT_T__
 ETHR_NATMC_FUNC__(inc_return)(ETHR_ATMC_T__ *var)
 {
-#ifdef AO_HAVE_fetch_and_add1
-    return ((ETHR_AINT_T__) AO_fetch_and_add1(&var->counter)) + 1;
+#ifdef AO_HAVE_fetch_and_add1_full
+    return ((ETHR_AINT_T__) AO_fetch_and_add1_full(&var->counter)) + 1;
 #else
     return ETHR_NATMC_FUNC__(add_return)(var, 1);
 #endif
@@ -183,8 +183,8 @@ ETHR_NATMC_FUNC__(inc)(ETHR_ATMC_T__ *var)
 static ETHR_INLINE ETHR_AINT_T__
 ETHR_NATMC_FUNC__(dec_return)(ETHR_ATMC_T__ *var)
 {
-#ifdef AO_HAVE_fetch_and_sub1
-    return ((ETHR_AINT_T__) AO_fetch_and_sub1(&var->counter)) - 1;
+#ifdef AO_HAVE_fetch_and_sub1_full
+    return ((ETHR_AINT_T__) AO_fetch_and_sub1_full(&var->counter)) - 1;
 #else
     return ETHR_NATMC_FUNC__(add_return)(var, -1);
 #endif
@@ -202,7 +202,7 @@ ETHR_NATMC_FUNC__(and_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
     while (1) {
 	AO_t exp = AO_load(&var->counter);
 	AO_t new = exp & ((AO_t) mask);
-	if (AO_compare_and_swap(&var->counter, exp, new))
+	if (AO_compare_and_swap_full(&var->counter, exp, new))
 	    return (ETHR_AINT_T__) exp;
     }
 }
@@ -213,7 +213,7 @@ ETHR_NATMC_FUNC__(or_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
     while (1) {
 	AO_t exp = AO_load(&var->counter);
 	AO_t new = exp | ((AO_t) mask);
-	if (AO_compare_and_swap(&var->counter, exp, new))
+	if (AO_compare_and_swap_full(&var->counter, exp, new))
 	    return (ETHR_AINT_T__) exp;
     }
 }
@@ -225,7 +225,7 @@ ETHR_NATMC_FUNC__(cmpxchg)(ETHR_ATMC_T__ *var,
 {
     ETHR_AINT_T__ act;
     do {
-	if (AO_compare_and_swap(&var->counter, (AO_t) exp, (AO_t) new))
+	if (AO_compare_and_swap_full(&var->counter, (AO_t) exp, (AO_t) new))
 	    return exp;
 	act = (ETHR_AINT_T__) AO_load(&var->counter);
     } while (act == exp);
@@ -237,7 +237,7 @@ ETHR_NATMC_FUNC__(xchg)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ new)
 {
     while (1) {
 	AO_t exp = AO_load(&var->counter);
-	if (AO_compare_and_swap(&var->counter, exp, (AO_t) new))
+	if (AO_compare_and_swap_full(&var->counter, exp, (AO_t) new))
 	    return (ETHR_AINT_T__) exp;
     }
 }
@@ -265,7 +265,6 @@ ETHR_NATMC_FUNC__(inc_return_acqb)(ETHR_ATMC_T__ *var)
     return ((ETHR_AINT_T__) AO_fetch_and_add1_acquire(&var->counter)) + 1;
 #else
     ETHR_AINT_T__ res = ETHR_NATMC_FUNC__(add_return)(var, 1);
-    ETHR_MEMORY_BARRIER;
     return res;
 #endif
 }
@@ -287,7 +286,6 @@ ETHR_NATMC_FUNC__(dec_return_relb)(ETHR_ATMC_T__ *var)
 #ifdef AO_HAVE_fetch_and_sub1_release
     return ((ETHR_AINT_T__) AO_fetch_and_sub1_release(&var->counter)) - 1;
 #else
-    ETHR_MEMORY_BARRIER;
     return ETHR_NATMC_FUNC__(dec_return)(var);
 #endif
 }
@@ -314,7 +312,6 @@ ETHR_NATMC_FUNC__(cmpxchg_acqb)(ETHR_ATMC_T__ *var,
     return act;
 #else
     ETHR_AINT_T__ act = ETHR_NATMC_FUNC__(cmpxchg)(var, new, exp);
-    ETHR_MEMORY_BARRIER;
     return act;
 #endif
 }
@@ -333,7 +330,6 @@ ETHR_NATMC_FUNC__(cmpxchg_relb)(ETHR_ATMC_T__ *var,
     } while (act == exp);
     return act;
 #else
-    ETHR_MEMORY_BARRIER;
     return ETHR_NATMC_FUNC__(cmpxchg)(var, new, exp);
 #endif
 }
diff --git a/erts/include/internal/sparc32/atomic.h b/erts/include/internal/sparc32/atomic.h
index 00380dbf07..16182f8b01 100644
--- a/erts/include/internal/sparc32/atomic.h
+++ b/erts/include/internal/sparc32/atomic.h
@@ -95,7 +95,7 @@ ETHR_NATMC_FUNC__(add_return)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
 {
     ETHR_AINT_T__ old, tmp;
 
-    __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n");
+    __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n" : : : "memory");
     do {
 	old = var->counter;
 	tmp = old+incr;
@@ -105,7 +105,7 @@ ETHR_NATMC_FUNC__(add_return)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
 	    : "r"(old), "r"(&var->counter), "0"(tmp)
 	    : "memory");
     } while (__builtin_expect(old != tmp, 0));
-    __asm__ __volatile__("membar #StoreLoad|#StoreStore");
+    __asm__ __volatile__("membar #StoreLoad|#StoreStore" : : : "memory");
     return old+incr;
 }
 
@@ -144,7 +144,7 @@ ETHR_NATMC_FUNC__(and_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
 {
     ETHR_AINT_T__ old, tmp;
 
-    __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n");
+    __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n" : : : "memory");
     do {
 	old = var->counter;
 	tmp = old & mask;
@@ -154,7 +154,7 @@ ETHR_NATMC_FUNC__(and_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
 	    : "r"(old), "r"(&var->counter), "0"(tmp)
 	    : "memory");
     } while (__builtin_expect(old != tmp, 0));
-    __asm__ __volatile__("membar #StoreLoad|#StoreStore");
+    __asm__ __volatile__("membar #StoreLoad|#StoreStore" : : : "memory");
     return old;
 }
 
@@ -163,7 +163,7 @@ ETHR_NATMC_FUNC__(or_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
 {
     ETHR_AINT_T__ old, tmp;
 
-    __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n");
+    __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n" : : : "memory");
     do {
 	old = var->counter;
 	tmp = old | mask;
@@ -173,7 +173,7 @@ ETHR_NATMC_FUNC__(or_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
 	    : "r"(old), "r"(&var->counter), "0"(tmp)
 	    : "memory");
     } while (__builtin_expect(old != tmp, 0));
-    __asm__ __volatile__("membar #StoreLoad|#StoreStore");
+    __asm__ __volatile__("membar #StoreLoad|#StoreStore" : : : "memory");
     return old;
 }
 
@@ -182,7 +182,7 @@ ETHR_NATMC_FUNC__(xchg)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ val)
 {
     ETHR_AINT_T__ old, new;
 
-    __asm__ __volatile__("membar #LoadLoad|#StoreLoad");
+    __asm__ __volatile__("membar #LoadLoad|#StoreLoad" : : : "memory");
     do {
 	old = var->counter;
 	new = val;
@@ -192,20 +192,20 @@ ETHR_NATMC_FUNC__(xchg)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ val)
 	    : "r"(old), "r"(&var->counter), "0"(new)
 	    : "memory");
     } while (__builtin_expect(old != new, 0));
-    __asm__ __volatile__("membar #StoreLoad|#StoreStore");
+    __asm__ __volatile__("membar #StoreLoad|#StoreStore" : : : "memory");
     return old;
 }
 
 static ETHR_INLINE ETHR_AINT_T__
 ETHR_NATMC_FUNC__(cmpxchg)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ new, ETHR_AINT_T__ old)
 {
-    __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n");
+    __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n" : : : "memory");
     __asm__ __volatile__(
       ETHR_CAS__ " [%2], %1, %0"
       : "=&r"(new)
       : "r"(old), "r"(&var->counter), "0"(new)
       : "memory");
-    __asm__ __volatile__("membar #StoreLoad|#StoreStore");
+    __asm__ __volatile__("membar #StoreLoad|#StoreStore" : : : "memory");
     return new;
 }
 
@@ -213,13 +213,11 @@ ETHR_NATMC_FUNC__(cmpxchg)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ new, ETHR_AINT_T__
  * Atomic ops with at least specified barriers.
  */
 
-/* TODO: relax acquire barriers */
-
 static ETHR_INLINE ETHR_AINT_T__
 ETHR_NATMC_FUNC__(read_acqb)(ETHR_ATMC_T__ *var)
 {
     ETHR_AINT_T__ res = ETHR_NATMC_FUNC__(read)(var);
-    __asm__ __volatile__("membar #LoadLoad|#LoadStore|#StoreLoad|#StoreStore" : : : "memory");
+    __asm__ __volatile__("membar #LoadLoad|#LoadStore" : : : "memory");
     return res;
 }
 
@@ -234,21 +232,18 @@ static ETHR_INLINE ETHR_AINT_T__
 ETHR_NATMC_FUNC__(inc_return_acqb)(ETHR_ATMC_T__ *var)
 {
     ETHR_AINT_T__ res = ETHR_NATMC_FUNC__(inc_return)(var);
-    __asm__ __volatile__("membar #LoadLoad|#LoadStore" : : : "memory");
     return res;
 }
 
 static ETHR_INLINE void
 ETHR_NATMC_FUNC__(dec_relb)(ETHR_ATMC_T__ *var)
 {
-    __asm__ __volatile__("membar #LoadStore|#StoreStore" : : : "memory");
     ETHR_NATMC_FUNC__(dec)(var);
 }
 
 static ETHR_INLINE ETHR_AINT_T__
 ETHR_NATMC_FUNC__(dec_return_relb)(ETHR_ATMC_T__ *var)
 {
-    __asm__ __volatile__("membar #LoadStore|#StoreStore" : : : "memory");
     return ETHR_NATMC_FUNC__(dec_return)(var);
 }
 
@@ -256,14 +251,12 @@ static ETHR_INLINE ETHR_AINT_T__
 ETHR_NATMC_FUNC__(cmpxchg_acqb)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ new, ETHR_AINT_T__ old)
 {
     ETHR_AINT_T__ res = ETHR_NATMC_FUNC__(cmpxchg)(var, new, old);
-    __asm__ __volatile__("membar #LoadLoad|#LoadStore" : : : "memory");
     return res;
 }
 
 static ETHR_INLINE ETHR_AINT_T__
 ETHR_NATMC_FUNC__(cmpxchg_relb)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ new, ETHR_AINT_T__ old)
 {
-    __asm__ __volatile__("membar #LoadStore|#StoreStore" : : : "memory");
     return ETHR_NATMC_FUNC__(cmpxchg)(var, new, old);
 }
 
diff --git a/erts/include/internal/tile/atomic.h b/erts/include/internal/tile/atomic.h
index 48e4c0c6c8..0c7b597a6b 100644
--- a/erts/include/internal/tile/atomic.h
+++ b/erts/include/internal/tile/atomic.h
@@ -65,25 +65,35 @@ ethr_native_atomic32_read(ethr_native_atomic32_t *var)
 static ETHR_INLINE void
 ethr_native_atomic32_add(ethr_native_atomic32_t *var, ethr_sint32_t incr)
 {
+    ETHR_MEMORY_BARRIER;
     atomic_add(&var->counter, incr);
+    ETHR_MEMORY_BARRIER;
 }      
        
 static ETHR_INLINE void
 ethr_native_atomic32_inc(ethr_native_atomic32_t *var)
 {
+    ETHR_MEMORY_BARRIER;
     atomic_increment(&var->counter);
+    ETHR_MEMORY_BARRIER;
 }
 
 static ETHR_INLINE void
 ethr_native_atomic32_dec(ethr_native_atomic32_t *var)
 {
+    ETHR_MEMORY_BARRIER;
     atomic_decrement(&var->counter);
+    ETHR_MEMORY_BARRIER;
 }
 
 static ETHR_INLINE ethr_sint32_t
 ethr_native_atomic32_add_return(ethr_native_atomic32_t *var, ethr_sint32_t incr)
 {
-    return atomic_exchange_and_add(&var->counter, incr) + incr;
+    ethr_sint32_t res;
+    ETHR_MEMORY_BARRIER;
+    res = atomic_exchange_and_add(&var->counter, incr) + incr;
+    ETHR_MEMORY_BARRIER;
+    return res;
 }
 
 static ETHR_INLINE ethr_sint32_t
@@ -101,18 +111,27 @@ ethr_native_atomic32_dec_return(ethr_native_atomic32_t *var)
 static ETHR_INLINE ethr_sint32_t
 ethr_native_atomic32_and_retold(ethr_native_atomic32_t *var, ethr_sint32_t mask)
 {
-    return atomic_and_val(&var->counter, mask);
+    ethr_sint32_t res;
+    ETHR_MEMORY_BARRIER;
+    res = atomic_and_val(&var->counter, mask);
+    ETHR_MEMORY_BARRIER;
+    return res;
 }
 
 static ETHR_INLINE ethr_sint32_t
 ethr_native_atomic32_or_retold(ethr_native_atomic32_t *var, ethr_sint32_t mask)
 {
-    return atomic_or_val(&var->counter, mask);
+    ethr_sint32_t res;
+    ETHR_MEMORY_BARRIER;
+    res = atomic_or_val(&var->counter, mask);
+    ETHR_MEMORY_BARRIER;
+    return res;
 }
 
 static ETHR_INLINE ethr_sint32_t
 ethr_native_atomic32_xchg(ethr_native_atomic32_t *var, ethr_sint32_t val)
 {   
+    ETHR_MEMORY_BARRIER;
     return atomic_exchange_acq(&var->counter, val);
 } 
 
@@ -121,6 +140,7 @@ ethr_native_atomic32_cmpxchg(ethr_native_atomic32_t *var,
 			     ethr_sint32_t new,
 			     ethr_sint32_t expected)
 {
+    ETHR_MEMORY_BARRIER;
     return atomic_compare_and_exchange_val_acq(&var->counter, new, expected);
 }
 
@@ -139,9 +159,7 @@ ethr_native_atomic32_read_acqb(ethr_native_atomic32_t *var)
 static ETHR_INLINE ethr_sint32_t
 ethr_native_atomic32_inc_return_acqb(ethr_native_atomic32_t *var)
 {
-    ethr_sint32_t res = ethr_native_atomic32_inc_return(var);
-    ETHR_MEMORY_BARRIER;
-    return res;
+    return ethr_native_atomic32_inc_return(var);
 }
 
 static ETHR_INLINE void
@@ -154,14 +172,12 @@ ethr_native_atomic32_set_relb(ethr_native_atomic32_t *var, ethr_sint32_t val)
 static ETHR_INLINE void
 ethr_native_atomic32_dec_relb(ethr_native_atomic32_t *var)
 {
-    ETHR_MEMORY_BARRIER;
     ethr_native_atomic32_dec(var);
 }
 
 static ETHR_INLINE ethr_sint32_t
 ethr_native_atomic32_dec_return_relb(ethr_native_atomic32_t *var)
 {
-    ETHR_MEMORY_BARRIER;
     return ethr_native_atomic32_dec_return(var);
 }
 
@@ -178,7 +194,6 @@ ethr_native_atomic32_cmpxchg_relb(ethr_native_atomic32_t *var,
 				  ethr_sint32_t new,
 				  ethr_sint32_t exp)
 {
-    ETHR_MEMORY_BARRIER;
     return ethr_native_atomic32_cmpxchg(var, new, exp);
 }
 
diff --git a/erts/lib_src/common/erl_printf_format.c b/erts/lib_src/common/erl_printf_format.c
index bd3d38e649..fba3fd723c 100644
--- a/erts/lib_src/common/erl_printf_format.c
+++ b/erts/lib_src/common/erl_printf_format.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2005-2011. 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
@@ -25,9 +25,9 @@
  *  width:      [0-9]+ | '*' 
  *  precision:  [0-9]+ | '*' 
  *  length: hh | h | l | ll | L | j | t | b<sz>
- *  conversion: d,i | o,u,x,X | e,E | f,F | g,G | a,A | c | s | T |
+ *  conversion: d,i | o,u,x,X | e,E | f,F | g,G | a,A | c | s | T | R |
  *              p | n | %
- *  sz: 8 | 16 | 32 | 64 | p
+ *  sz: 8 | 16 | 32 | 64 | p | e
  */
 
 /* Without this, variable argument lists break on VxWorks */
@@ -76,6 +76,18 @@
 #endif
 #endif
 
+#ifndef ERTS_SIZEOF_ETERM
+#  ifdef HALFWORD_HEAP_EMULATOR
+#    if SIZEOF_VOID_P == 8
+#      define ERTS_SIZEOF_ETERM 4
+#    else
+#      error "HALFWORD_HEAP_EMULATOR only allowed on 64-bit architecture"
+#    endif
+#  else
+#    define ERTS_SIZEOF_ETERM SIZEOF_VOID_P
+#  endif
+#endif
+
 #if defined(__GNUC__)
 #  undef inline
 #  define inline __inline__
@@ -89,7 +101,7 @@
 #endif
 
 #define FMTC_d    0x0000
-#define FMTC_i    0x0001
+#define FMTC_R    0x0001
 #define FMTC_o    0x0002
 #define FMTC_u    0x0003
 #define FMTC_x    0x0004
@@ -153,7 +165,7 @@ static char heX[] = "0123456789ABCDEF";
 #define SIGN(X) ((X) > 0 ? 1 : ((X) < 0 ? -1 : 0)) 
 #define USIGN(X) ((X) == 0 ? 0 : 1)
 
-int (*erts_printf_eterm_func)(fmtfn_t, void*, unsigned long, long) = NULL;
+int (*erts_printf_eterm_func)(fmtfn_t, void*, unsigned long, long, unsigned long*) = NULL;
 
 static int
 noop_fn(void *vfp, char* buf, size_t len)
@@ -171,8 +183,8 @@ static int fmt_fld(fmtfn_t fn,void* arg,
     int len;
 
     /* format the prefix */
-    if ((sign || (fmt & (FMTF_sgn|FMTF_blk))) &&
-	(((fmt & FMTC_MASK) == FMTC_d) || ((fmt & FMTC_MASK) == FMTC_i))) {
+    if ((sign || (fmt & (FMTF_sgn|FMTF_blk)))
+	&& (fmt & FMTC_MASK) == FMTC_d) {
 	if (sign < 0)
 	    *pp++ = '-';
 	else if ((fmt & FMTF_sgn))
@@ -233,7 +245,6 @@ static int fmt_long(fmtfn_t fn,void* arg,int sign,unsigned long uval,
 
     switch(fmt & FMTC_MASK) {
     case FMTC_d:
-    case FMTC_i:
     case FMTC_u:
 	break;
     case FMTC_o: 
@@ -286,7 +297,6 @@ static int fmt_long_long(fmtfn_t fn,void* arg,int sign,
 
     switch(fmt & FMTC_MASK) {
     case FMTC_d:
-    case FMTC_i:
     case FMTC_u:
 	break;
     case FMTC_o: 
@@ -520,6 +530,17 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 #error No integer datatype with the same size as 'void *' found
 #endif
 		}
+		else if (*ptr == 'e') {
+		    ptr++;
+#if SIZEOF_INT == ERTS_SIZEOF_ETERM
+#elif SIZEOF_LONG == ERTS_SIZEOF_ETERM
+		    fmt |= FMTL_l;
+#elif SIZEOF_LONG_LONG == ERTS_SIZEOF_ETERM
+		    fmt |= FMTL_ll;
+#else
+#error No integer datatype with the same size as Eterm found
+#endif
+		}
 		else {
 		    int bits = 0;
 		    while(isdigit((int) *ptr))
@@ -599,7 +620,7 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 	    /* specifier */
 	    switch(*ptr) {
 	    case 'd': ptr++; fmt |= FMTC_d; break;
-	    case 'i': ptr++; fmt |= FMTC_i; break;
+	    case 'i': ptr++; fmt |= FMTC_d; break;
 	    case 'o': ptr++; fmt |= FMTC_o; break;
 	    case 'u': ptr++; fmt |= FMTC_u; break;
 	    case 'x': ptr++; fmt |= FMTC_x; break;
@@ -614,6 +635,7 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 	    case 'p': ptr++; fmt |= FMTC_p; break;
 	    case 'n': ptr++; fmt |= FMTC_n; break;
 	    case 'T': ptr++; fmt |= FMTC_T; break;
+	    case 'R': ptr++; fmt |= FMTC_R; break;
 	    case '%':
 		FMT(fn,arg,ptr,1,count);
 		ptr++;
@@ -627,7 +649,6 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 
 	    switch(fmt & FMTC_MASK) {
 	    case FMTC_d:
-	    case FMTC_i:
 		switch(fmt & FMTL_MASK) {
 		case FMTL_hh: {
 		    signed char tval = (signed char) va_arg(ap,int);
@@ -791,9 +812,12 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 		default: *va_arg(ap,int*) = count; break;
 		}
 		break;
-	    case FMTC_T: {
+	    case FMTC_T:    /* Eterm */
+	    case FMTC_R: {  /* Eterm, Eterm* base  (base ignored if !HALFWORD_HEAP) */
 		long prec;
 		unsigned long eterm;
+		unsigned long* eterm_base;
+		
 		if (!erts_printf_eterm_func)
 		    return -EINVAL;
 		if (precision < 0)
@@ -803,14 +827,16 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 		else
 		    prec = (long) precision;
 		eterm = va_arg(ap, unsigned long);
+		eterm_base = ((fmt & FMTC_MASK) == FMTC_R) ?
+		    va_arg(ap, unsigned long*) : NULL;
 		if (width > 0 && !(fmt & FMTF_adj)) {
-		    res = (*erts_printf_eterm_func)(noop_fn, NULL, eterm, prec);
+		    res = (*erts_printf_eterm_func)(noop_fn, NULL, eterm, prec, eterm_base);
 		    if (res < 0)
 			return res;
 		    if (width > res)
 			BLANKS(fn, arg, width - res, count);
 		}
-		res = (*erts_printf_eterm_func)(fn, arg, eterm, prec);
+		res = (*erts_printf_eterm_func)(fn, arg, eterm, prec, eterm_base);
 		if (res < 0)
 		    return res;
 		count += res;
@@ -901,7 +927,7 @@ erts_printf_slong(fmtfn_t fn, void *arg, char conv, int pad, int width,
     unsigned long ul_val;
     switch (conv) {
     case 'd': fmt |= FMTC_d; break;
-    case 'i': fmt |= FMTC_i; break;
+    case 'i': fmt |= FMTC_d; break;
     case 'o': fmt |= FMTC_o; break;
     case 'x': fmt |= FMTC_x; break;
     case 'X': fmt |= FMTC_X; break;
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index 4a75e43e73..bfb1e48365 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 10be852e92..13e8e8fb5b 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -64,7 +64,7 @@
 -include("file.hrl").
 
 -define(DRV,    efile).
--define(FD_DRV, efile).
+-define(FD_DRV, "efile").
 
 -define(LARGEFILESIZE, (1 bsl 63)).
 
@@ -506,7 +506,7 @@ read_file(_) ->
 
 %% Takes a Port opened with open/1.
 read_file(Port, File) when is_port(Port),
-			   (is_list(File) orelse is_binary(File))->
+			   (is_list(File) orelse is_binary(File)) ->
     Cmd = [?FILE_READ_FILE | pathname(File)],
     case drv_command(Port, Cmd) of
 	{error, enomem} ->
@@ -832,7 +832,7 @@ drv_open(Driver, Portopts) ->
 	    {ok, Port}
     catch
 	error:Reason ->
-	    {error,Reason}
+	    {error, Reason}
     end.
 
 
@@ -864,9 +864,9 @@ drv_command(Port, Command) ->
 drv_command(Port, Command, R) when is_binary(Command) ->
     drv_command(Port, Command, true, R);
 drv_command(Port, Command, R) ->
-    try erlang:iolist_to_binary(Command) of
-	Bin ->
-	    drv_command(Port, Bin, true, R)
+    try erlang:iolist_size(Command) of
+	_ ->
+	    drv_command(Port, Command, true, R)
     catch
 	error:Reason ->
 	    {error, Reason}
@@ -1041,8 +1041,8 @@ translate_response(?FILE_RESP_NUMBER, List) ->
     {N, []} = get_uint64(List),
     {ok, N};
 translate_response(?FILE_RESP_DATA, List) ->
-    {N, Data} = get_uint64(List),
-    {ok, {N, Data}};
+    {_N, _Data} = ND = get_uint64(List),
+    {ok, ND};
 translate_response(?FILE_RESP_INFO, List) when is_list(List) ->
     {ok, transform_info_ints(get_uint32s(List))};
 translate_response(?FILE_RESP_NUMERR, L0) ->
@@ -1087,10 +1087,8 @@ translate_response(?FILE_RESP_FNAME, Data) when is_binary(Data) ->
     {ok, prim_file:internal_native2name(Data)};
 translate_response(?FILE_RESP_FNAME, Data) ->
     {ok, Data};
-
 translate_response(?FILE_RESP_ALL_DATA, Data) ->
     {ok, Data};
-
 translate_response(X, Data) ->
     {error, {bad_response_from_port, [X | Data]}}.
 
@@ -1137,14 +1135,14 @@ date_to_bytes(undefined) ->
 date_to_bytes({{Y, Mon, D}, {H, Min, S}}) ->
     <<Y:32, Mon:32, D:32, H:32, Min:32, S:32>>.
 
-% uint64([[X1, X2, X3, X4] = Y1 | [X5, X6, X7, X8] = Y2]) ->
-%     (uint32(Y1) bsl 32) bor uint32(Y2).
+%% uint64([[X1, X2, X3, X4] = Y1 | [X5, X6, X7, X8] = Y2]) ->
+%%     (uint32(Y1) bsl 32) bor uint32(Y2).
 
-% uint64(X1, X2, X3, X4, X5, X6, X7, X8) ->
-%     (uint32(X1, X2, X3, X4) bsl 32) bor uint32(X5, X6, X7, X8).
+%% uint64(X1, X2, X3, X4, X5, X6, X7, X8) ->
+%%     (uint32(X1, X2, X3, X4) bsl 32) bor uint32(X5, X6, X7, X8).
 
-% uint32([X1,X2,X3,X4]) ->
-%     (X1 bsl 24) bor (X2 bsl 16) bor (X3 bsl 8) bor X4.
+%% uint32([X1,X2,X3,X4]) ->
+%%     (X1 bsl 24) bor (X2 bsl 16) bor (X3 bsl 8) bor X4.
 
 uint32(X1,X2,X3,X4) ->
     (X1 bsl 24) bor (X2 bsl 16) bor (X3 bsl 8) bor X4.
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 77769afcd4..ccff9892c6 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/asn1/test/test_inline.erl b/lib/asn1/test/test_inline.erl
index dfa3c134ae..b7ec0d8921 100644
--- a/lib/asn1/test/test_inline.erl
+++ b/lib/asn1/test/test_inline.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -173,8 +173,8 @@ mi_encdec(N,Val) ->
 m_encdec(0,_) ->
     ok;
 m_encdec(N,Val) ->
-    {ok,B}='Mod1':encode('L',Val),
-    {ok,_R}='Mod1':decode('L',B),
+    {ok,B}='Mod':encode('L',Val),
+    {ok,_R}='Mod':decode('L',B),
     m_encdec(N-1,Val).
 
 
diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index 1ee73b890b..c92566de37 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -296,7 +296,7 @@
     </func>
 
       <func>
-	<name>Module:init_per_testcase(TestCase, Config) -> NewConfig | {skip,Reason}</name>
+	<name>Module:init_per_testcase(TestCase, Config) -> NewConfig | {fail,Reason} | {skip,Reason}</name>
 	<fsummary>Test case initialization.</fsummary>
 	<type>
 	  <v> TestCase = atom()</v>
@@ -311,10 +311,12 @@
 	  
 	  <p>This function is called before each test case. The
 	  <c>TestCase</c> argument is the name of the test case, and
-	  <c>Config</c> is the configuration which can be modified
-	  here. Whatever is returned from this function is given as
-	  <c>Config</c> to the test case. If <c>{skip,Reason}</c> is returned, 
-	  the test case will be skipped and <c>Reason</c> printed
+	  <c>Config</c> (list of key-value tuples) is the configuration
+	  data that can be modified here. The <c>NewConfig</c> list returned
+	  from this function is given as <c>Config</c> to the test case.
+	  If <c>{fail,Reason}</c> is returned, the test case is
+	  marked as failed without being executed. If <c>{skip,Reason}</c> is
+	  returned, the test case will be skipped and <c>Reason</c> printed
 	  in the overview log for the suite.</p>
     </desc>
     </func>
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index fef1222fcb..15c7e2a9f2 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 723492d8f3..3f9fdb7121 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -167,12 +167,16 @@
       returning <c>{fail,Reason}</c>, nor will it be able to save data with
       <c>{save_config,Data}</c>.</p>
 
-    <p>If <c>init_per_testcase</c> crashes, the test case itself is skipped 
+    <p>If <c>init_per_testcase</c> crashes, the test case itself gets skipped 
     automatically (so called <em>auto skipped</em>). If <c>init_per_testcase</c>
-    returns a <c>skip</c> tuple, also then will the test case be skipped (so
-    called <em>user skipped</em>). In either event, the <c>end_per_testcase</c> is 
-    never called.
+    returns a tuple <c>{skip,Reason}</c>, also then the test case gets skipped
+    (so called <em>user skipped</em>). It is also possible, by returning a tuple
+    <c>{fail,Reason}</c> from <c>init_per_testcase</c>, to mark the test case
+    as failed without actually executing it.
     </p>
+    <note><p>If <c>init_per_testcase</c> crashes, or returns <c>{skip,Reason}</c>
+    or <c>{fail,Reason}</c>, the <c>end_per_testcase</c> function is not called.
+    </p></note>
 
     <p>If it is determined during execution of <c>end_per_testcase</c> that
     the status of a successful test case should be changed to failed, 
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index dfec2b7a67..66da3ef742 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -861,6 +861,7 @@ remove_config(Callback, Config) ->
 %%%
 %%% @doc <p>Use this function to set a new timetrap for the running test case.</p>
 timetrap(Time) ->
+    test_server:timetrap_cancel(),
     test_server:timetrap(Time).
 
 %%%-----------------------------------------------------------------
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 38a2aa53ac..809616d8e3 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -24,7 +24,7 @@
 
 -module(ct_framework).
 
--export([init_tc/3, end_tc/4, get_suite/2, report/2, warn/1]).
+-export([init_tc/3, end_tc/3, end_tc/4, get_suite/2, report/2, warn/1]).
 -export([error_notification/4]).
 
 -export([overview_html_header/1]).
@@ -434,6 +434,9 @@ try_set_default(Name,Key,Info,Where) ->
 %%%
 %%% @doc Test server framework callback, called by the test_server
 %%% when a test case is finished.
+end_tc(Mod, Fun, Args) ->
+    %% Have to keep end_tc/3 for backwards compatabilty issues
+    end_tc(Mod, Fun, Args, '$end_tc_dummy').
 end_tc(?MODULE,error_in_suite,_, _) ->		% bad start!
     ok;
 end_tc(Mod,Func,{TCPid,Result,[Args]}, Return) when is_pid(TCPid) ->
@@ -490,9 +493,9 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
 		case ct_hooks:end_tc(
 			    Mod, FuncSpec, Args, Result, Return) of
 		    '$ct_no_change' ->
-			{FinalResult = ok,Result};
-		    FinalResult ->
-			{FinalResult,FinalResult}
+			{ok,Result};
+		    FinalResult1 ->
+			{FinalResult1,FinalResult1}
 		end,
 	    % send sync notification so that event handlers may print
 	    % in the log file before it gets closed
@@ -633,7 +636,7 @@ error_notification(Mod,Func,_Args,{Error,Loc}) ->
 	[{?MODULE,error_in_suite}] ->
 	    io:format(user, "Error in suite detected: ~s", [ErrStr]);
 
-	unknown ->
+	R when R == unknown;  R == undefined ->
 	    io:format(user, "Error detected: ~s", [ErrStr]);
 
 	%% if a function specified by all/0 does not exist, we
@@ -734,7 +737,7 @@ get_suite(Mod, Group={conf,Props,_Init,TCs,_End}) ->
 		    %% (and only) test case so we can report Error properly
 		    [{?MODULE,error_in_suite,[[Error]]}];
 		[] ->
-		    {error,{invalid_group_spec,Name}};
+		    [];
 		ConfTests ->
 		    case lists:member(skipped, Props) of
 			true ->
@@ -764,23 +767,7 @@ get_suite(Mod, Name) ->
 
 find_groups(Mod, Name, TCs, GroupDefs) ->
     Found = find(Mod, Name, TCs, GroupDefs, [], GroupDefs, false),
-    Trimmed = trim(Found),
-    %% I cannot find a reason to why this function is called,
-    %% It deletes any group which is referenced in any other
-    %% group. i.e.
-    %% groups() ->
-    %%   [{test, [], [testcase1]},
-    %%    {testcases, [], [{group, test}]}].
-    %% Would be changed to
-    %% groups() ->
-    %%   [{testcases, [], [testcase1]}].
-    %% instead of what I believe is correct:
-    %% groups() ->
-    %%   [{test, [], [testcase1]},
-    %%    {testcases, [], [testcase1]}].
-    %% Have to double check with peppe
-    delete_subs(Trimmed, Trimmed),
-    Trimmed.
+    trim(Found).
 
 find(Mod, all, _TCs, [{Name,Props,Tests} | Gs], Known, Defs, _) 
   when is_atom(Name), is_list(Props), is_list(Tests) ->
@@ -1170,12 +1157,14 @@ error_in_suite(Config) ->
 %% if the group config functions are missing in the suite,
 %% use these instead
 ct_init_per_group(GroupName, Config) ->
-    ct_logs:log("WARNING", "init_per_group/2 for ~w missing in suite, using default.", 
+    ct_logs:log("WARNING", "init_per_group/2 for ~w missing "
+		"in suite, using default.",
 		[GroupName]),
     Config.
 
 ct_end_per_group(GroupName, _) ->
-    ct_logs:log("WARNING", "end_per_group/2 for ~w missing in suite, using default.", 
+    ct_logs:log("WARNING", "end_per_group/2 for ~w missing "
+		"in suite, using default.",
 		[GroupName]),
     ok.
 
@@ -1184,6 +1173,13 @@ ct_end_per_group(GroupName, _) ->
 %%% @spec report(What,Data) -> ok
 report(What,Data) ->
     case What of
+	loginfo ->
+	    %% logfiles and direcories have been created for a test and the
+	    %% top level test index page needs to be refreshed
+	    TestName = filename:basename(proplists:get_value(topdir, Data), ".logs"),
+	    RunDir = proplists:get_value(rundir, Data),
+	    ct_logs:make_all_suites_index({TestName,RunDir}),
+	    ok;
 	tests_start ->
 	    case ct_util:get_testdata(cover) of
 		undefined -> 
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
index 5eddefffce..984e04b90f 100644
--- a/lib/common_test/src/ct_hooks.erl
+++ b/lib/common_test/src/ct_hooks.erl
@@ -122,11 +122,11 @@ end_tc(_Mod, TC, Config, Result, _Return) ->
     call(fun call_generic/3, Result, [post_end_per_testcase, TC, Config],
 	'$ct_no_change').
 
-on_tc_skip(How, {_Suite, Case, Reason}) ->
-    call(fun call_cleanup/3, {How, Reason}, [on_tc_skip, Case]).
+on_tc_skip(How, {Suite, Case, Reason}) ->
+    call(fun call_cleanup/3, {How, Reason}, [on_tc_skip, Suite, Case]).
 
-on_tc_fail(_How, {_Suite, Case, Reason}) ->
-    call(fun call_cleanup/3, Reason, [on_tc_fail, Case]).
+on_tc_fail(_How, {Suite, Case, Reason}) ->
+    call(fun call_cleanup/3, Reason, [on_tc_fail, Suite, Case]).
 
 %% -------------------------------------------------------------------------
 %% Internal Functions
@@ -145,7 +145,7 @@ call_terminate({Mod, State}, _, _) ->
     catch_apply(Mod,terminate,[State], ok),
     {[],{Mod,State}}.
 
-call_cleanup({Mod, State}, Reason, [Function | Args]) ->
+call_cleanup({Mod, State}, Reason, [Function, _Suite | Args]) ->
     NewState = catch_apply(Mod,Function, Args ++ [Reason, State],
 			   State),
     {Reason, {Mod, NewState}}.
@@ -229,6 +229,11 @@ scope([post_init_per_suite, SuiteName|_]) ->
 scope(init) ->
     none.
 
+terminate_if_scope_ends(HookId, [on_tc_skip,_Suite,{end_per_group,Name}], 
+			Hooks) ->
+    terminate_if_scope_ends(HookId, [post_end_per_group, Name], Hooks);
+terminate_if_scope_ends(HookId, [on_tc_skip,Suite,end_per_suite], Hooks) ->
+    terminate_if_scope_ends(HookId, [post_end_per_suite, Suite], Hooks);
 terminate_if_scope_ends(HookId, [Function,Tag|T], Hooks) when T =/= [] ->
     terminate_if_scope_ends(HookId,[Function,Tag],Hooks);
 terminate_if_scope_ends(HookId, Function, Hooks) ->
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index f8ace73cbf..ba4adb8683 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -97,11 +97,11 @@ logdir_node_prefix() ->
     logdir_prefix()++"."++atom_to_list(node()).
 
 %%%-----------------------------------------------------------------
-%%% @spec close(How) -> ok
+%%% @spec close(Info) -> ok
 %%%
 %%% @doc Create index pages with test results and close the CT Log
 %%% (tool-internal use only).
-close(How) ->
+close(Info) ->
     make_last_run_index(),
 
     ct_event:notify(#event{name=stop_logging,node=node(),data=[]}),
@@ -118,7 +118,7 @@ close(How) ->
 	    ok
     end,
 
-    if How == clean ->
+    if Info == clean ->
 	    case cleanup() of
 		ok ->
 		    ok;
@@ -427,8 +427,8 @@ logger(Parent,Mode) ->
     file:make_dir(Dir),
     ct_event:notify(#event{name=start_logging,node=node(),
 			   data=?abs(Dir)}),
-    make_all_suites_index(start),
     make_all_runs_index(start),
+    make_all_suites_index(start),
     case Mode of
 	interactive -> interactive_link();
 	_ -> ok
@@ -796,24 +796,29 @@ make_one_index_entry(SuiteName, LogDir, Label, All, Missing) ->
 	{Succ,Fail,UserSkip,AutoSkip} ->
 	    NotBuilt = not_built(SuiteName, LogDir, All, Missing),
 	    NewResult = make_one_index_entry1(SuiteName, LogDir, Label, Succ, Fail,
-					      UserSkip, AutoSkip, NotBuilt, All),
+					      UserSkip, AutoSkip, NotBuilt, All,
+					      normal),
 	    {NewResult,Succ,Fail,UserSkip,AutoSkip,NotBuilt};
 	error ->
 	    error
     end.
 
 make_one_index_entry1(SuiteName, Link, Label, Success, Fail, UserSkip, AutoSkip,
-		      NotBuilt, All) ->
+		      NotBuilt, All, Mode) ->
     LogFile = filename:join(Link, ?suitelog_name ++ ".html"),
-    CrashDumpName = SuiteName ++ "_erl_crash.dump",
-    CrashDumpLink = 
-	case filelib:is_file(CrashDumpName) of
-	    true -> 
-		["&nbsp;<A HREF=\"", CrashDumpName, 
-		 "\">(CrashDump)</A>"];
-	    false ->
-		""
-	end,
+    CrashDumpLink = case Mode of
+			cached ->
+			    "";
+			normal ->
+			    CrashDumpName = SuiteName ++ "_erl_crash.dump",
+			    case filelib:is_file(CrashDumpName) of
+				true ->
+				    ["&nbsp;<A HREF=\"", CrashDumpName,
+				     "\">(CrashDump)</A>"];
+				false ->
+				    ""
+			    end
+		    end,
     {Lbl,Timestamp,Node,AllInfo} =
 	case All of
 	    {true,OldRuns} -> 
@@ -975,9 +980,13 @@ index_header(Label, StartTime) ->
       "<th>Missing<br>Suites</th>\n"
       "\n"]].
 
+
 all_suites_index_header() ->
     {ok,Cwd} = file:get_cwd(),
-    LogDir = filename:basename(Cwd),
+    all_suites_index_header(Cwd).
+
+all_suites_index_header(IndexDir) ->
+    LogDir = filename:basename(IndexDir),
     AllRuns = "All test runs in \"" ++ LogDir ++ "\"",
     [header("Test Results") | 
      ["<CENTER>\n",
@@ -1414,15 +1423,72 @@ timestamp(Dir) ->
     [S,Min,H,D,M,Y] = [list_to_integer(N) || N <- lists:sublist(TsR,6)],
     format_time({{Y,M,D},{H,Min,S}}).
 
-make_all_suites_index(When) ->
+%% ----------------------------- NOTE --------------------------------------
+%% The top level index file is generated based on the file contents under
+%% logdir. This takes place initially when the test run starts (When = start)
+%% and an update takes place at the end of the test run, or when the user
+%% requests an explicit refresh (When = refresh).
+%% The index file needs to be updated also at the start of each individual
+%% test (in order for the user to be able to track test progress by refreshing
+%% the browser). Since it would be too expensive to generate a new file from
+%% scratch every time (by reading the data from disk), a copy of the dir tree
+%% is cached as a result of the first index file creation. This copy is then
+%% used for all top level index page updates that occur during the test run.
+%% This means that any changes to the dir tree under logdir during the test
+%% run will not show until after the final refresh.
+%% -------------------------------------------------------------------------
+
+%% Creates the top level index file. When == start | refresh.
+%% A copy of the dir tree under logdir is cached as a result.
+make_all_suites_index(When) when is_atom(When) ->
     AbsIndexName = ?abs(?index_name),
     notify_and_lock_file(AbsIndexName),
     LogDirs = filelib:wildcard(logdir_prefix()++".*/*"++?logdir_ext),
-    Sorted = sort_logdirs(LogDirs,[]),
-    Result = make_all_suites_index1(When,Sorted),
+    Sorted = sort_logdirs(LogDirs, []),
+    Result = make_all_suites_index1(When, AbsIndexName, Sorted),
     notify_and_unlock_file(AbsIndexName),
-    Result.    
-    
+    Result;
+
+%% This updates the top level index file using cached data from
+%% the initial index file creation.
+make_all_suites_index(NewTestData = {_TestName,DirName}) ->
+    %% AllLogDirs = [{TestName,Label,Missing,{LastLogDir,Summary},OldDirs}|...]
+    {AbsIndexName,LogDirData} = ct_util:get_testdata(test_index),
+
+    CtRunDirPos = length(filename:split(AbsIndexName)),
+    CtRunDir = filename:join(lists:sublist(filename:split(DirName),
+					   CtRunDirPos)),
+
+    Label = case read_totals_file(filename:join(CtRunDir, ?totals_name)) of
+		{_,"-",_,_} -> "...";
+		{_,Lbl,_,_} -> Lbl;
+		_           -> "..."
+	    end,
+    notify_and_lock_file(AbsIndexName),
+    Result =
+	case catch make_all_suites_ix_cached(AbsIndexName,
+					     NewTestData,
+					     Label,
+					     LogDirData) of
+	    {'EXIT',Reason} ->
+		io:put_chars("CRASHED while updating " ++ AbsIndexName ++ "!\n"),
+		io:format("~p~n", [Reason]),
+		{error,Reason};
+	    {error,Reason} ->
+		io:put_chars("FAILED while updating " ++ AbsIndexName ++ "\n"),
+		io:format("~p~n", [Reason]),
+		{error,Reason};
+	    ok ->
+		ok;
+	    Err ->
+		io:format("Unknown internal error while updating ~s. "
+			  "Please report.\n(Err: ~p, ID: 1)",
+			  [AbsIndexName,Err]),
+		{error, Err}
+	end,
+    notify_and_unlock_file(AbsIndexName),
+    Result.
+
 sort_logdirs([Dir|Dirs],Groups) ->
     TestName = filename:rootname(filename:basename(Dir)),
     case filelib:wildcard(filename:join(Dir,"run.*")) of
@@ -1448,13 +1514,12 @@ sort_each_group([{Test,IxDirs}|Groups]) ->
 sort_each_group([]) ->
     [].
 
-make_all_suites_index1(When,AllSuitesLogDirs) ->
+make_all_suites_index1(When, AbsIndexName, AllLogDirs) ->
     IndexName = ?index_name,
-    AbsIndexName = ?abs(IndexName),
     if When == start -> ok;
        true -> io:put_chars("Updating " ++ AbsIndexName ++ "... ")
     end,
-    case catch make_all_suites_index2(IndexName,AllSuitesLogDirs) of
+    case catch make_all_suites_index2(IndexName, AllLogDirs) of
 	{'EXIT', Reason} ->
 	    io:put_chars("CRASHED while updating " ++ AbsIndexName ++ "!\n"),
 	    io:format("~p~n", [Reason]),
@@ -1463,11 +1528,16 @@ make_all_suites_index1(When,AllSuitesLogDirs) ->
 	    io:put_chars("FAILED while updating " ++ AbsIndexName ++ "\n"),
 	    io:format("~p~n", [Reason]),
 	    {error, Reason};
-	ok ->
-	    if When == start -> ok;
-	       true -> io:put_chars("done\n")
-	    end,	    
-	    ok;
+	{ok,CacheData} ->
+	    case When of
+		start ->
+		    ct_util:set_testdata_async({test_index,{AbsIndexName,
+							    CacheData}}),
+		    ok;
+		_ ->
+		    io:put_chars("done\n"),
+		    ok
+	    end;
 	Err ->
 	    io:format("Unknown internal error while updating ~s. "
 		      "Please report.\n(Err: ~p, ID: 1)",
@@ -1475,56 +1545,124 @@ make_all_suites_index1(When,AllSuitesLogDirs) ->
 	    {error, Err}
     end.
 
-make_all_suites_index2(IndexName,AllSuitesLogDirs) ->
-    {ok,Index0,_Totals} = make_all_suites_index3(AllSuitesLogDirs,
-						 all_suites_index_header(),
-						 0, 0, 0, 0, 0, []),
+make_all_suites_index2(IndexName, AllTestLogDirs) ->
+    {ok,Index0,_Totals,CacheData} =
+	make_all_suites_index3(AllTestLogDirs,
+			       all_suites_index_header(),
+			       0, 0, 0, 0, 0, [], []),
     Index = [Index0|index_footer()],
     case force_write_file(IndexName, Index) of
 	ok ->
-	    ok;
+	    {ok,CacheData};
 	{error, Reason} ->
 	    {error,{index_write_error, Reason}}
     end.
 
-make_all_suites_index3([{SuiteName,[LastLogDir|OldDirs]}|Rest],
+make_all_suites_index3([{TestName,[LastLogDir|OldDirs]}|Rest],
 		       Result, TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt,
-		       Labels) ->
+		       Labels, CacheData) ->
     [EntryDir|_] = filename:split(LastLogDir),
     Missing = 
-	case file:read_file(filename:join(EntryDir,?missing_suites_info)) of
+	case file:read_file(filename:join(EntryDir, ?missing_suites_info)) of
 	    {ok,Bin} -> binary_to_term(Bin);
 	    _ -> []
 	end,
     {Label,Labels1} =
 	case proplists:get_value(EntryDir, Labels) of
 	    undefined ->
-		case read_totals_file(filename:join(EntryDir,?totals_name)) of
+		case read_totals_file(filename:join(EntryDir, ?totals_name)) of
 		    {_,Lbl,_,_} -> {Lbl,[{EntryDir,Lbl}|Labels]};
 		    _           -> {"-",[{EntryDir,"-"}|Labels]}
 		end;
 	    Lbl ->
 		{Lbl,Labels}
 	end,
-    case make_one_index_entry(SuiteName, LastLogDir, Label, {true,OldDirs}, Missing) of
+    case make_one_index_entry(TestName, LastLogDir, Label, {true,OldDirs}, Missing) of
 	{Result1,Succ,Fail,USkip,ASkip,NotBuilt} ->
 	    %% for backwards compatibility
 	    AutoSkip1 = case catch AutoSkip+ASkip of
 			    {'EXIT',_} -> undefined;
 			    Res -> Res
 			end,
+	    IxEntry = {TestName,Label,Missing,
+		       {LastLogDir,{Succ,Fail,USkip,ASkip}},OldDirs},
 	    make_all_suites_index3(Rest, [Result|Result1], TotSucc+Succ, 
 				   TotFail+Fail, UserSkip+USkip, AutoSkip1,
-				   TotNotBuilt+NotBuilt,Labels1);
+				   TotNotBuilt+NotBuilt, Labels1,
+				   [IxEntry|CacheData]);
 	error ->
+	    IxEntry = {TestName,Label,Missing,{LastLogDir,error},OldDirs},
 	    make_all_suites_index3(Rest, Result, TotSucc, TotFail, 
-				   UserSkip, AutoSkip, TotNotBuilt,Labels1)
+				   UserSkip, AutoSkip, TotNotBuilt, Labels1,
+				   [IxEntry|CacheData])
     end;
 make_all_suites_index3([], Result, TotSucc, TotFail, UserSkip, AutoSkip, 
-		       TotNotBuilt,_) ->
+		       TotNotBuilt, _, CacheData) ->
     {ok, [Result|total_row(TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt,true)], 
-     {TotSucc,TotFail,UserSkip,AutoSkip,TotNotBuilt}}.
+     {TotSucc,TotFail,UserSkip,AutoSkip,TotNotBuilt}, lists:reverse(CacheData)}.
+
+
+make_all_suites_ix_cached(AbsIndexName, NewTestData, Label, AllTestLogDirs) ->
+    AllTestLogDirs1 = insert_new_test_data(NewTestData, Label, AllTestLogDirs),
+    IndexDir = filename:dirname(AbsIndexName),
+    Index0 = make_all_suites_ix_cached1(AllTestLogDirs1,
+					all_suites_index_header(IndexDir),
+					0, 0, 0, 0, 0),
+    Index = [Index0|index_footer()],
+    case force_write_file(AbsIndexName, Index) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    {error,{index_write_error, Reason}}
+    end.
+
+insert_new_test_data({NewTestName,NewTestDir}, NewLabel, AllTestLogDirs) ->
+    AllTestLogDirs1 =
+	case lists:keysearch(NewTestName, 1, AllTestLogDirs) of
+	    {value,{_,_,_,{LastLogDir,_},OldDirs}} ->
+		[{NewTestName,NewLabel,[],{NewTestDir,{0,0,0,0}},
+		  [LastLogDir|OldDirs]} |
+		 lists:keydelete(NewTestName, 1, AllTestLogDirs)];
+	    false ->
+		[{NewTestName,NewLabel,[],{NewTestDir,{0,0,0,0}},[]} |
+		 AllTestLogDirs]
+	end,
+    lists:keysort(1, AllTestLogDirs1).
+
+make_all_suites_ix_cached1([{TestName,Label,Missing,LastLogDirData,OldDirs}|Rest],
+			   Result, TotSucc, TotFail, UserSkip, AutoSkip,
+			   TotNotBuilt) ->
 
+    case make_one_ix_entry_cached(TestName, LastLogDirData,
+				  Label, {true,OldDirs}, Missing) of
+	{Result1,Succ,Fail,USkip,ASkip,NotBuilt} ->
+	    %% for backwards compatibility
+	    AutoSkip1 = case catch AutoSkip+ASkip of
+			    {'EXIT',_} -> undefined;
+			    Res -> Res
+			end,
+	    make_all_suites_ix_cached1(Rest, [Result|Result1], TotSucc+Succ,
+				       TotFail+Fail, UserSkip+USkip, AutoSkip1,
+				       TotNotBuilt+NotBuilt);
+	error ->
+	    make_all_suites_ix_cached1(Rest, Result, TotSucc, TotFail,
+				       UserSkip, AutoSkip, TotNotBuilt)
+    end;
+make_all_suites_ix_cached1([], Result, TotSucc, TotFail, UserSkip, AutoSkip,
+			   TotNotBuilt) ->
+    [Result|total_row(TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt, true)].
+
+make_one_ix_entry_cached(TestName, {LogDir,Summary}, Label, All, Missing) ->
+    case Summary of
+	{Succ,Fail,UserSkip,AutoSkip} ->
+	    NotBuilt = not_built(TestName, LogDir, All, Missing),
+	    NewResult = make_one_index_entry1(TestName, LogDir, Label,
+					      Succ, Fail, UserSkip, AutoSkip,
+					      NotBuilt, All, cached),
+	    {NewResult,Succ,Fail,UserSkip,AutoSkip,NotBuilt};
+	error ->
+	    error
+    end.
 
 %%-----------------------------------------------------------------
 %% Remove log files.
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 7bd7dc7d66..c01e97b358 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -262,15 +262,15 @@ run_or_refresh(StartOpts = #opts{logdir = LogDir}, Args) ->
 	    %% give the shell time to print version etc
 	    timer:sleep(500),
 	    io:nl(),
-	    case catch ct_logs:make_all_suites_index(refresh) of
-		{'EXIT',ASReason} ->
+	    case catch ct_logs:make_all_runs_index(refresh) of
+		{'EXIT',ARReason} ->
 		    file:set_cwd(Cwd),
-		    {error,{all_suites_index,ASReason}};
+		    {error,{all_runs_index,ARReason}};
 		_ ->
-		    case catch ct_logs:make_all_runs_index(refresh) of
-			{'EXIT',ARReason} ->
+		    case catch ct_logs:make_all_suites_index(refresh) of
+			{'EXIT',ASReason} ->
 			    file:set_cwd(Cwd),
-			    {error,{all_runs_index,ARReason}};
+			    {error,{all_suites_index,ASReason}};
 			_ ->
 			    file:set_cwd(Cwd),
 			    io:format("Logs in ~s refreshed!~n~n", [LogDir1]),
@@ -1111,6 +1111,8 @@ run(TestDirs) ->
     install([]),
     reformat_result(catch do_run(tests(TestDirs), [])).
 
+reformat_result({'EXIT',{user_error,Reason}}) ->
+    {error,Reason};
 reformat_result({user_error,Reason}) ->
     {error,Reason};
 reformat_result(Result) ->
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 115207beed..b3e345b4e5 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -37,7 +37,7 @@
 	 read_suite_data/1, 
 	 delete_suite_data/0, delete_suite_data/1, match_delete_suite_data/1,
 	 delete_testdata/0, delete_testdata/1, set_testdata/1, get_testdata/1,
-	 update_testdata/2]).
+	 set_testdata_async/1, update_testdata/2]).
 
 -export([override_silence_all_connections/0, override_silence_connections/1, 
 	 get_overridden_silenced_connections/0, 
@@ -96,7 +96,8 @@ start(Mode,LogDir) ->
 	    Pid = spawn_link(fun() -> do_start(S,Mode,LogDir) end),
 	    receive 
 		{Pid,started} -> Pid;
-		{Pid,Error} -> exit(Error)
+		{Pid,Error} -> exit(Error);
+		{_Ref,{Pid,Error}} -> exit(Error)
 	    end;
 	Pid ->
 	    case get_mode() of
@@ -162,21 +163,19 @@ do_start(Parent,Mode,LogDir) ->
     end,
     {StartTime,TestLogDir} = ct_logs:init(Mode),
 
-    %% Initiate ct_hooks
+    ct_event:notify(#event{name=test_start,
+			   node=node(),
+			   data={StartTime,
+				 lists:flatten(TestLogDir)}}),
+    %% Initialize ct_hooks
     case catch ct_hooks:init(Opts) of
 	ok ->
-	    ok;
+	    Parent ! {self(),started};
 	{_,CTHReason} ->
 	    ct_logs:tc_print('Suite Callback',CTHReason,[]),
-	    Parent ! {self(), CTHReason},
-	    self() ! {{stop,normal},{self(),make_ref()}}
+	    self() ! {{stop,{self(),{user_error,CTHReason}}},
+		      {Parent,make_ref()}}
     end,
-
-    ct_event:notify(#event{name=test_start,
-			   node=node(),
-			   data={StartTime,
-				 lists:flatten(TestLogDir)}}),
-    Parent ! {self(),started},
     loop(Mode,[],StartDir).
 
 create_table(TableName,KeyPos) ->
@@ -232,6 +231,9 @@ update_testdata(Key, Fun) ->
 set_testdata(TestData) ->
     call({set_testdata, TestData}).
 
+set_testdata_async(TestData) ->
+    cast({set_testdata, TestData}).
+
 get_testdata(Key) ->
     call({get_testdata, Key}).
 
@@ -317,7 +319,7 @@ loop(Mode,TestData,StartDir) ->
 	{reset_cwd,From} ->
 	    return(From,file:set_cwd(StartDir)),
 	    loop(From,TestData,StartDir);
-	{{stop,How},From} ->
+	{{stop,Info},From} ->
 	    Time = calendar:local_time(),
 	    ct_event:sync_notify(#event{name=test_done,
 					node=node(),
@@ -330,11 +332,11 @@ loop(Mode,TestData,StartDir) ->
 	    ets:delete(?conn_table),
 	    ets:delete(?board_table),
 	    ets:delete(?suite_table),
-	    ct_logs:close(How),
+	    ct_logs:close(Info),
 	    ct_event:stop(),
 	    ct_config:stop(),
 	    file:set_cwd(StartDir),
-	    return(From,ok);
+	    return(From, Info);
 	{Ref, _Msg} when is_reference(Ref) ->
 	    %% This clause is used when doing cast operations.
 	    loop(Mode,TestData,StartDir);
@@ -537,16 +539,16 @@ reset_silent_connections() ->
     
 
 %%%-----------------------------------------------------------------
-%%% @spec stop(How) -> ok
+%%% @spec stop(Info) -> ok
 %%%
 %%% @doc Stop the ct_util_server and close all existing connections
 %%% (tool-internal use only).
 %%%
 %%% @see ct
-stop(How) ->
+stop(Info) ->
     case whereis(ct_util_server) of
 	undefined -> ok;
-	_ -> call({stop,How})
+	_ -> call({stop,Info})
     end.
 
 %%%-----------------------------------------------------------------
diff --git a/lib/common_test/src/vts.erl b/lib/common_test/src/vts.erl
index 2ee982d726..081f98e889 100644
--- a/lib/common_test/src/vts.erl
+++ b/lib/common_test/src/vts.erl
@@ -281,9 +281,7 @@ run_test1(State=#state{tests=Tests,current_log_dir=LogDir}) ->
 		      end,
 		      unlink(Self)
 	      end,
-
     Pid = spawn_link(RunTest),
-
     Total =
 	receive 
 	    {{test_info,start_info,{_,_,Cases}},From} ->
@@ -480,7 +478,7 @@ create_testdir_entries([],_N) ->
     [].
 
 testdir_entry(Dir,Suite,Case,N) ->
-    NStr = integer_to_list(N),
+    NStr = vts_integer_to_list(N),
     tr([td(delete_button(NStr)),
 	td(Dir),
 	td(suite_select(Dir,Suite,NStr)),
@@ -691,11 +689,11 @@ result_summary_frame1(State) ->
 result_summary_body(State) ->
     N = State#state.ok + State#state.fail + State#state.skip,
     [h2("Result Summary"),
-     p([b(integer_to_list(N))," cases executed (of ",
-	b(integer_to_list(State#state.total)),")"]),
-     p([green([b(integer_to_list(State#state.ok))," successful"]),br(),
-	red([b(integer_to_list(State#state.fail))," failed"]),br(),
-	orange([b(integer_to_list(State#state.skip))," skipped"])]),
+     p([b(vts_integer_to_list(N))," cases executed (of ",
+	b(vts_integer_to_list(State#state.total)),")"]),
+     p([green([b(vts_integer_to_list(State#state.ok))," successful"]),br(),
+	red([b(vts_integer_to_list(State#state.fail))," failed"]),br(),
+	orange([b(vts_integer_to_list(State#state.skip))," skipped"])]),
     executed_test_list(State)].
 
 executed_test_list(#state{testruns=[]}) ->
@@ -735,6 +733,14 @@ report1(tc_done,{_Suite,init_per_suite,_},State) ->
     State;
 report1(tc_done,{_Suite,end_per_suite,_},State) ->
     State;
+report1(tc_done,{_Suite,init_per_group,_},State) ->
+    State;
+report1(tc_done,{_Suite,end_per_group,_},State) ->
+    State;
+report1(tc_done,{_Suite,ct_init_per_group,_},State) ->
+    State;
+report1(tc_done,{_Suite,ct_end_per_group,_},State) ->
+    State;
 report1(tc_done,{_Suite,_Case,ok},State) ->
     State#state{ok=State#state.ok+1};
 report1(tc_done,{_Suite,_Case,{failed,_Reason}},State) ->
@@ -742,7 +748,9 @@ report1(tc_done,{_Suite,_Case,{failed,_Reason}},State) ->
 report1(tc_done,{_Suite,_Case,{skipped,_Reason}},State) ->
     State#state{skip=State#state.skip+1};
 report1(tc_user_skip,{_Suite,_Case,_Reason},State) ->
-    State#state{skip=State#state.skip+1}.
+    State#state{skip=State#state.skip+1};
+report1(loginfo,_,State) ->
+    State.
 
 get_test_log(TestName,LogDir) ->
     [Log] = 
@@ -882,3 +890,7 @@ get_input_data(Input,Key)->
 parse(Input) ->
     httpd:parse_query(Input).
 
+vts_integer_to_list(X) when is_atom(X) ->
+    atom_to_list(X);
+vts_integer_to_list(X) when is_integer(X) ->
+    integer_to_list(X).
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index b6b50f33e0..8ce75f582a 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -174,7 +174,8 @@ run_test(Name, Config, CTConfig, SuiteNames)->
     TestEvents = ct_test_support:get_events(ERPid, Config),
     ct_test_support:log_events(Name,
 			       reformat_events(TestEvents, ?eh),
-			       ?config(config_dir, Config)),
+			       ?config(config_dir, Config),
+			       Opts),
     ExpEvents = events_to_check(Name),
     ok = ct_test_support:verify_events(ExpEvents, TestEvents, Config).
 
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index ad6cf1ba8f..6867e59b60 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -102,8 +102,9 @@ cfg_error(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(cfg_error, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(cfg_error),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -120,8 +121,9 @@ lib_error(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(lib_error, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(lib_error),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -138,8 +140,9 @@ no_compile(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(no_compile, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(no_compile),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -156,7 +159,8 @@ timetrap_end_conf(Config) when is_list(Config) ->
 
     ct_test_support:log_events(timetrap_end_conf,
 			       reformat(Events, ?eh),
-			       ?config(priv_dir, Config)),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(timetrap_end_conf),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -176,7 +180,8 @@ timetrap_normal(Config) when is_list(Config) ->
 
     ct_test_support:log_events(timetrap_normal,
 			       reformat(Events, ?eh),
-			       ?config(priv_dir, Config)),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(timetrap_normal),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -198,12 +203,31 @@ timetrap_extended(Config) when is_list(Config) ->
 
     ct_test_support:log_events(timetrap_extended,
 			       reformat(Events, ?eh),
-			       ?config(priv_dir, Config)),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(timetrap_extended),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
+%%%
+timetrap_parallel(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Join = fun(D, S) -> filename:join(D, "error/test/"++S) end,
+    Suite = Join(DataDir, "timetrap_3_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite}], Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(timetrap_parallel,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(timetrap_parallel),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+%%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
 
@@ -236,7 +260,7 @@ test_events(cfg_error) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{14,14,42}},
+     {?eh,start_info,{14,14,43}},
 
      {?eh,tc_start,{cfg_error_1_SUITE,init_per_suite}},
      {?eh,tc_done,
@@ -405,7 +429,6 @@ test_events(cfg_error) ->
        {cfg_error_8_SUITE,{init_per_group,g3,[]},
 	{failed,{error,{{badmatch,42},
 			[{cfg_error_8_SUITE,init_per_group,2},
-			 {cfg_error_8_SUITE,init_per_group,2},
 			 {test_server,my_apply,3},
 			 {test_server,ts_tc,3},
 			 {test_server,run_test_case_eval1,6},
@@ -415,7 +438,6 @@ test_events(cfg_error) ->
 	{failed,{cfg_error_8_SUITE,init_per_group,
 		 {'EXIT',{{badmatch,42},
 			  [{cfg_error_8_SUITE,init_per_group,2},
-			   {cfg_error_8_SUITE,init_per_group,2},
 			   {test_server,my_apply,3},
 			   {test_server,ts_tc,3},
 			   {test_server,run_test_case_eval1,6},
@@ -426,7 +448,6 @@ test_events(cfg_error) ->
 	{failed,{cfg_error_8_SUITE,init_per_group,
 		 {'EXIT',{{badmatch,42},
 			  [{cfg_error_8_SUITE,init_per_group,2},
-			   {cfg_error_8_SUITE,init_per_group,2},
 			   {test_server,my_apply,3},
 			   {test_server,ts_tc,3},
 			   {test_server,run_test_case_eval1,6},
@@ -520,16 +541,19 @@ test_events(cfg_error) ->
      %%! end_tc failes the testcase
      {?eh,tc_done,{cfg_error_9_SUITE,tc6,ok}},
      {?eh,test_stats,{9,2,{0,18}}},
+     {?eh,tc_start,{cfg_error_9_SUITE,tc7}},
+     {?eh,tc_done,{cfg_error_9_SUITE,tc7,{failed,{error,tc7_should_be_failed}}}},
+     {ct_test_support_eh,test_stats,{9,3,{0,18}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc11}},
      {?eh,tc_done,{cfg_error_9_SUITE,tc11,
 		   {failed,{cfg_error_9_SUITE,end_per_testcase,
 			    {'EXIT',warning_should_be_printed}}}}},
-     {?eh,test_stats,{10,2,{0,18}}},
+     {?eh,test_stats,{10,3,{0,18}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc12}},
      {?eh,tc_done,{cfg_error_9_SUITE,tc12,
 		   {failed,{cfg_error_9_SUITE,end_per_testcase,
 			    {timetrap_timeout,2000}}}}},
-     {?eh,test_stats,{11,2,{0,18}}},
+     {?eh,test_stats,{11,3,{0,18}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc13}},
      {?eh,tc_done,{cfg_error_9_SUITE,tc13,
 		   {failed,{cfg_error_9_SUITE,end_per_testcase,
@@ -539,11 +563,11 @@ test_events(cfg_error) ->
 				      {test_server,do_end_per_testcase,4},
 				      {test_server,run_test_case_eval1,6},
 				      {test_server,run_test_case_eval,8}]}}}}}},
-     {?eh,test_stats,{12,2,{0,18}}},
+     {?eh,test_stats,{12,3,{0,18}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc14}},
      {?eh,tc_done,
       {cfg_error_9_SUITE,tc14,{failed,{error,tc14_should_be_failed}}}},
-     {?eh,test_stats,{12,3,{0,18}}},
+     {?eh,test_stats,{12,4,{0,18}}},
 
      {?eh,tc_start,{cfg_error_9_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_9_SUITE,end_per_suite,ok}},
@@ -554,7 +578,7 @@ test_events(cfg_error) ->
      {?eh,tc_auto_skip,{cfg_error_10_SUITE,tc1,
 			{failed,{cfg_error_10_SUITE,init_per_suite,
 				 {failed,fail_init_per_suite}}}}},
-     {?eh,test_stats,{12,3,{0,19}}},
+     {?eh,test_stats,{12,4,{0,19}}},
      {?eh,tc_auto_skip,{cfg_error_10_SUITE,end_per_suite,
 			{failed,{cfg_error_10_SUITE,init_per_suite,
 				 {failed,fail_init_per_suite}}}}},
@@ -563,40 +587,40 @@ test_events(cfg_error) ->
      {?eh,tc_start,{cfg_error_11_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_11_SUITE,tc1,
 		   {skipped,{config_name_already_in_use,[dummy0]}}}},
-     {?eh,test_stats,{12,3,{1,19}}},
+     {?eh,test_stats,{12,4,{1,19}}},
      {?eh,tc_start,{cfg_error_11_SUITE,tc2}},
      {?eh,tc_done,{cfg_error_11_SUITE,tc2,ok}},
-     {?eh,test_stats,{13,3,{1,19}}},
+     {?eh,test_stats,{13,4,{1,19}}},
      {?eh,tc_start,{cfg_error_11_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_11_SUITE,end_per_suite,ok}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc1,{failed,{timetrap_timeout,500}}}},
-     {?eh,test_stats,{13,4,{1,19}}},
+     {?eh,test_stats,{13,5,{1,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc2}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc2,{failed,
 					   {cfg_error_12_SUITE,end_per_testcase,
 					    {timetrap_timeout,500}}}}},
-     {?eh,test_stats,{14,4,{1,19}}},
+     {?eh,test_stats,{14,5,{1,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc3}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc3,ok}},
-     {?eh,test_stats,{15,4,{1,19}}},
+     {?eh,test_stats,{15,5,{1,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc4}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc4,{failed,
 					   {cfg_error_12_SUITE,end_per_testcase,
 					    {timetrap_timeout,500}}}}},
-     {?eh,test_stats,{16,4,{1,19}}},
+     {?eh,test_stats,{16,5,{1,19}}},
      {?eh,tc_start,{cfg_error_13_SUITE,init_per_suite}},
      {?eh,tc_done,{cfg_error_13_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_13_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_13_SUITE,tc1,ok}},
-     {?eh,test_stats,{17,4,{1,19}}},
+     {?eh,test_stats,{17,5,{1,19}}},
      {?eh,tc_start,{cfg_error_13_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_13_SUITE,end_per_suite,ok}},
      {?eh,tc_start,{cfg_error_14_SUITE,init_per_suite}},
      {?eh,tc_done,{cfg_error_14_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_14_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_14_SUITE,tc1,ok}},
-     {?eh,test_stats,{18,4,{1,19}}},
+     {?eh,test_stats,{18,5,{1,19}}},
      {?eh,tc_start,{cfg_error_14_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_14_SUITE,end_per_suite,
 		   {comment,
@@ -729,7 +753,7 @@ test_events(timetrap_normal) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{1,1,3}},
+     {?eh,start_info,{1,1,4}},
      {?eh,tc_start,{timetrap_2_SUITE,init_per_suite}},
      {?eh,tc_done,{timetrap_2_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{timetrap_2_SUITE,tc0}},
@@ -744,6 +768,9 @@ test_events(timetrap_normal) ->
      {?eh,tc_done,
       {timetrap_2_SUITE,tc2,{failed,{timetrap_timeout,500}}}},
      {?eh,test_stats,{0,3,{0,0}}},
+     {?eh,tc_start,{timetrap_2_SUITE,tc3}},
+     {?eh,tc_done,{timetrap_2_SUITE,tc3,ok}},
+     {?eh,test_stats,{1,3,{0,0}}},
      {?eh,tc_start,{timetrap_2_SUITE,end_per_suite}},
      {?eh,tc_done,{timetrap_2_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
@@ -754,7 +781,7 @@ test_events(timetrap_extended) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{1,1,3}},
+     {?eh,start_info,{1,1,4}},
      {?eh,tc_start,{timetrap_2_SUITE,init_per_suite}},
      {?eh,tc_done,{timetrap_2_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{timetrap_2_SUITE,tc0}},
@@ -769,8 +796,52 @@ test_events(timetrap_extended) ->
      {?eh,tc_done,
       {timetrap_2_SUITE,tc2,{failed,{timetrap_timeout,1000}}}},
      {?eh,test_stats,{0,3,{0,0}}},
+     {?eh,tc_start,{timetrap_2_SUITE,tc3}},
+     {?eh,tc_done,{timetrap_2_SUITE,tc3,ok}},
+     {?eh,test_stats,{1,3,{0,0}}},
      {?eh,tc_start,{timetrap_2_SUITE,end_per_suite}},
      {?eh,tc_done,{timetrap_2_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
-    ].
+    ];
+
+test_events(timetrap_parallel) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,7}},
+     {?eh,tc_done,{timetrap_3_SUITE,init_per_suite,ok}},
+     {parallel,
+      [{?eh,tc_start,
+	{timetrap_3_SUITE,{init_per_group,g1,[parallel]}}},
+       {?eh,tc_done,
+	{timetrap_3_SUITE,{init_per_group,g1,[parallel]},ok}},
+       {?eh,tc_start,{timetrap_3_SUITE,tc0}},
+       {?eh,tc_start,{timetrap_3_SUITE,tc1}},
+       {?eh,tc_start,{timetrap_3_SUITE,tc2}},
+       {?eh,tc_start,{timetrap_3_SUITE,tc3}},
+       {?eh,tc_start,{timetrap_3_SUITE,tc4}},
+       {?eh,tc_start,{timetrap_3_SUITE,tc6}},
+       {?eh,tc_start,{timetrap_3_SUITE,tc7}},
+       {?eh,tc_done,
+        {timetrap_3_SUITE,tc1,{failed,{timetrap_timeout,500}}}},
+       {?eh,tc_done,
+        {timetrap_3_SUITE,tc2,{failed,{timetrap_timeout,1000}}}},
+       {?eh,tc_done,
+        {timetrap_3_SUITE,tc6,{failed,{timetrap_timeout,1000}}}},
+       {?eh,tc_done,
+        {timetrap_3_SUITE,tc7,{failed,{timetrap_timeout,1500}}}},
+       {?eh,tc_done,
+        {timetrap_3_SUITE,tc0,{failed,{timetrap_timeout,2000}}}},
+       {?eh,tc_done,
+        {timetrap_3_SUITE,tc4,{failed,{timetrap_timeout,2000}}}},
+       {?eh,tc_done,
+        {timetrap_3_SUITE,tc3,{failed,{timetrap_timeout,3000}}}},
+       {?eh,test_stats,{0,7,{0,0}}},
+       {?eh,tc_start,
+	{timetrap_3_SUITE,{end_per_group,g1,[parallel]}}},
+       {?eh,tc_done,
+	{timetrap_3_SUITE,{end_per_group,g1,[parallel]},ok}}]},
+     {?eh,tc_done,{timetrap_3_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}].
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl
index d73287ad62..40b7d2da47 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl
@@ -83,6 +83,8 @@ init_per_testcase(tc3, Config) ->
     Config;
 init_per_testcase(tc4, _) ->
     ok;
+init_per_testcase(tc7, _) ->
+    {fail,tc7_should_be_failed};
 init_per_testcase(_, Config) ->
     Config.
 
@@ -136,7 +138,7 @@ groups() ->
 %% Reason = term()
 %%--------------------------------------------------------------------
 all() -> 
-    [tc1,tc2,tc3,tc4,tc5,tc6,
+    [tc1,tc2,tc3,tc4,tc5,tc6,tc7,
      tc11,tc12,tc13,tc14].
 
 tc1(_) ->
@@ -171,6 +173,11 @@ tc6(_) ->
     ct:comment("This one should succeed but then get failed by end_tc!"),
     fini.
 
+tc7(_) ->
+    ct:comment("This one should get failed by iptc!"),
+    fini.
+
+
 tc11(_) ->
     fini.
 tc12(_) ->
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl
index 99bb400137..7fcb631d06 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl
@@ -77,8 +77,8 @@ init_per_testcase(tc1, Config) ->
     ct:timetrap({seconds,1}),
     Config;
 
-init_per_testcase(tc3, Config) ->
-    ct:timetrap({seconds,1}),
+init_per_testcase(tc2, Config) ->
+    ct:timetrap(250),
     Config;
 
 init_per_testcase(_TestCase, Config) ->
@@ -90,7 +90,7 @@ init_per_testcase(_TestCase, Config) ->
 %% TestCase = atom()
 %% Config0 = Config1 = [tuple()]
 %%--------------------------------------------------------------------
-end_per_testcase(_, Config) ->
+end_per_testcase(_, _Config) ->
     ok.
 
 %%--------------------------------------------------------------------
@@ -116,7 +116,7 @@ groups() ->
 %% Reason = term()
 %%--------------------------------------------------------------------
 all() ->
-    [tc0,tc1,tc2].
+    [tc0,tc1,tc2,tc3].
 
 tc0(_) ->
     N = list_to_integer(ct:get_config(multiply)),
@@ -131,8 +131,24 @@ tc1(_) ->
     ok.
 
 tc2(_) ->
+    ct:timetrap(500),
     N = list_to_integer(ct:get_config(multiply)),
     ct:comment(io_lib:format("TO after ~w sec", [0.5*N])),
-    ct:timetrap(500),
     ct:sleep(2000),
     ok.
+
+tc3() ->
+    [{timetrap,{seconds,2}}].
+
+tc3(_) ->
+    T0 = now(),
+    ct:timetrap(infinity),
+    N = list_to_integer(ct:get_config(multiply)),
+    ct:comment(io_lib:format("Sleeping for ~w sec...", [4*N])),
+    ct:sleep(4000),
+    Diff = timer:now_diff(now(), T0),
+    if ((Diff < (N*4000000)) or (Diff > (N*4500000))) ->
+	    exit(not_expected);
+       true ->
+	    ok
+    end.
diff --git a/lib/common_test/test/ct_event_handler_SUITE.erl b/lib/common_test/test/ct_event_handler_SUITE.erl
index 5ef04c0e75..b534a7141d 100644
--- a/lib/common_test/test/ct_event_handler_SUITE.erl
+++ b/lib/common_test/test/ct_event_handler_SUITE.erl
@@ -102,8 +102,9 @@ start_stop(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),    
 
     ct_test_support:log_events(start_stop, 
-			       ct_test_support:reformat(Events, eh_A), 
-			       ?config(priv_dir, Config)),
+			       ct_test_support:reformat(Events, eh_A),
+			       ?config(priv_dir, Config),
+			       Opts),
     
     TestEvents =
 	[{eh_A,start_logging,{'DEF','RUNDIR'}},
@@ -148,8 +149,9 @@ results(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
     
     ct_test_support:log_events(results, 
-			       ct_test_support:reformat(Events, eh_A), 
-			       ?config(priv_dir, Config)),
+			       ct_test_support:reformat(Events, eh_A),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents =
 	[{eh_A,start_logging,{'DEF','RUNDIR'}},
diff --git a/lib/common_test/test/ct_groups_test_1_SUITE.erl b/lib/common_test/test/ct_groups_test_1_SUITE.erl
index 7775d8a55d..e520a72227 100644
--- a/lib/common_test/test/ct_groups_test_1_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_1_SUITE.erl
@@ -89,8 +89,9 @@ groups_suite_1(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(groups_suite_1, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(groups_suite_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -109,8 +110,9 @@ groups_suite_2(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(groups_suite_2, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(groups_suite_2),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).  
@@ -130,8 +132,9 @@ groups_suites_1(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(groups_suites_1, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(groups_suites_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).  
@@ -150,8 +153,9 @@ groups_dir_1(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(groups_dir_1, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(groups_dir_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).  
@@ -170,8 +174,9 @@ groups_dirs_1(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(groups_dirs_1, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(groups_dirs_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).  
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE.erl
index 2ae63f4f99..f33be8a9d4 100644
--- a/lib/common_test/test/ct_groups_test_2_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_2_SUITE.erl
@@ -59,7 +59,7 @@ end_per_testcase(TestCase, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [missing_conf, repeat_1].
+    [missing_conf, repeat_1, empty_group].
 
 groups() -> 
     [].
@@ -83,13 +83,14 @@ missing_conf(Config) when is_list(Config) ->
 
     Suite = filename:join(DataDir, "groups_1/missing_conf_SUITE"),
 
-    {Opts,ERPid} = setup({suite,Suite}, Config),
+    {Opts,ERPid} = setup([{suite,Suite}], Config),
     ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(missing_conf_SUITE, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(missing_conf),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -102,18 +103,41 @@ repeat_1(Config) when is_list(Config) ->
 
     Suite = filename:join(DataDir, "groups_1/repeat_1_SUITE"),
 
-    {Opts,ERPid} = setup({suite,Suite}, Config),
+    {Opts,ERPid} = setup([{suite,Suite}], Config),
     ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(repeat_1,
 			       reformat(Events, ?eh),
-			       ?config(priv_dir, Config)),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(repeat_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
+%%%
+
+empty_group(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    Suite = filename:join(DataDir, "groups_2/groups_22_SUITE"),
+
+    {Opts,ERPid} = setup([{suite,Suite},
+			  {group,[test_group_8,test_group_9,test_group_10]}],
+			 Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(empty_group,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(empty_group),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+%%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
 
@@ -121,7 +145,7 @@ setup(Test, Config) ->
     Opts0 = ct_test_support:get_opts(Config),
     Level = ?config(trace_level, Config),
     EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
-    Opts = Opts0 ++ [Test,{event_handler,{?eh,EvHArgs}}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}} | Test],
     ERPid = ct_test_support:start_event_receiver(Config),
     {Opts,ERPid}.
 
@@ -256,4 +280,27 @@ test_events(repeat_1) ->
      {?eh,tc_done,{repeat_1_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
+    ];
+
+test_events(empty_group) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,tc_start,{groups_22_SUITE,init_per_suite}},
+     {?eh,tc_done,{groups_22_SUITE,init_per_suite,ok}},
+     [{?eh,tc_start,
+       {groups_22_SUITE,{init_per_group,test_group_8,[]}}},
+      {?eh,tc_done,
+       {groups_22_SUITE,{init_per_group,test_group_8,[]},ok}},
+      {?eh,tc_start,{groups_22_SUITE,testcase_8}},
+      {?eh,tc_done,{groups_22_SUITE,testcase_8,ok}},
+      {?eh,test_stats,{1,0,{0,0}}},
+      {?eh,tc_start,
+       {groups_22_SUITE,{end_per_group,test_group_8,[]}}},
+      {?eh,tc_done,
+       {groups_22_SUITE,{end_per_group,test_group_8,[]},ok}}],
+     {?eh,tc_start,{groups_22_SUITE,end_per_suite}},
+     {?eh,tc_done,{groups_22_SUITE,end_per_suite,init}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
     ].
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl
index cd517876df..14eb8769ad 100644
--- a/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl
@@ -31,27 +31,33 @@ suite() ->
 
 groups() ->
     [
-      {test_group_1a, [shuffle], [testcase_1a,testcase_1b,testcase_1c]},
+     {test_group_1a, [shuffle], [testcase_1a,testcase_1b,testcase_1c]},
 
-      {test_group_1b, [parallel], [testcase_1a,testcase_1b]},
+     {test_group_1b, [parallel], [testcase_1a,testcase_1b]},
 
-      {test_group_2, [parallel], [testcase_2a,
+     {test_group_2, [parallel], [testcase_2a,
 
-				  {test_group_3, [{repeat,1}],
-				   [testcase_3a, testcase_3b]},
+				 {test_group_3, [{repeat,1}],
+				  [testcase_3a, testcase_3b]},
 
-				  testcase_2b]},
+				 testcase_2b]},
 
-      {test_group_4, [{test_group_5, [parallel], [testcase_5a,
+     {test_group_4, [{test_group_5, [parallel], [testcase_5a,
 
-						  {group, test_group_6},
+						 {group, test_group_6},
 
-						  testcase_5b]}]},
+						 testcase_5b]}]},
 
-      {test_group_6, [parallel], [{group, test_group_7}]},
+     {test_group_6, [parallel], [{group, test_group_7}]},
 
-      {test_group_7, [sequence], [testcase_7a,testcase_7b]}
-     ].
+     {test_group_7, [sequence], [testcase_7a,testcase_7b]},
+
+     {test_group_8, [], [{group, test_group_9}, testcase_8]},
+
+     {test_group_9, [], []},
+
+     {test_group_10, [], [{group, test_group_9}]}
+    ].
 
 all() ->
     [{group, test_group_1a},
@@ -60,7 +66,10 @@ all() ->
      testcase_2,
      {group, test_group_2},
      testcase_3,
-     {group, test_group_4}].
+     {group, test_group_4},
+     {group, test_group_8},
+     {group, test_group_9},
+     {group, test_group_10}].
 
 %% this func only for internal test purposes
 grs_and_tcs() ->
@@ -68,7 +77,9 @@ grs_and_tcs() ->
       test_group_1a, test_group_1b,
       test_group_2, test_group_3,
       test_group_4, test_group_5,
-      test_group_6, test_group_7
+      test_group_6, test_group_7,
+      test_group_8, test_group_9,
+      test_group_10
      ],
      [
       testcase_1a, testcase_1b, testcase_1c,
@@ -78,7 +89,8 @@ grs_and_tcs() ->
       testcase_3a, testcase_3b,
       testcase_3,
       testcase_5a, testcase_5b,
-      testcase_7a, testcase_7b
+      testcase_7a, testcase_7b,
+      testcase_8
      ]}.
 
 %%--------------------------------------------------------------------
@@ -107,7 +119,10 @@ init_per_group(Group, Config) ->
 	    {test_group_4,[{name,test_group_4}]} -> ok;
 	    {test_group_5,[{name,test_group_5},parallel]} -> "parallel";
 	    {test_group_6,[{name,test_group_6},parallel]} -> "parallel";
-	    {test_group_7,[{name,test_group_7},sequence]} -> "sequence"
+	    {test_group_7,[{name,test_group_7},sequence]} -> "sequence";
+	    {test_group_8,[{name,test_group_8}]} -> ok;
+	    {test_group_9,[{name,test_group_9}]} -> ok;
+	    {test_group_10,[{name,test_group_10}]} -> ok
 	end,
     {Grs,_} = grs_and_tcs(),
     case lists:member(Group, Grs) of
@@ -312,3 +327,7 @@ testcase_7b(Config) ->
     undefined = ?config(testcase_7a,Config),
     testcase_7b = ?config(testcase_7b,Config),
     ok.
+testcase_8() ->
+    [].
+testcase_8(_Config) ->
+    ok.
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index 64f4e277ff..8574d7aabc 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -79,7 +79,8 @@ all(suite) ->
        scope_per_suite_cth, scope_per_group_cth, scope_suite_cth,
        scope_per_suite_state_cth, scope_per_group_state_cth, 
        scope_suite_state_cth,
-       fail_pre_suite_cth, fail_post_suite_cth, skip_pre_suite_cth,
+       fail_pre_suite_cth, double_fail_pre_suite_cth,
+       fail_post_suite_cth, skip_pre_suite_cth,
        skip_post_suite_cth, recover_post_suite_cth, update_config_cth,
        state_update_cth, options_cth, same_id_cth, 
        fail_n_skip_with_minimal_cth
@@ -167,6 +168,11 @@ fail_pre_suite_cth(Config) when is_list(Config) ->
     do_test(fail_pre_suite_cth, "ct_cth_empty_SUITE.erl",
 	    [fail_pre_suite_cth],Config).
 
+double_fail_pre_suite_cth(Config) when is_list(Config) ->
+    do_test(double_fail_pre_suite_cth, "{ct_scope_suite_crash_in_cth_SUITE.erl,"
+	    "ct_scope_suite_cth_SUITE.erl}",
+	    [],Config).
+
 fail_post_suite_cth(Config) when is_list(Config) ->
     do_test(fail_post_suite_cth, "ct_cth_empty_SUITE.erl",
 	    [fail_post_suite_cth],Config).
@@ -225,8 +231,9 @@ do_test(Tag, SuiteWildCard, CTHs, Config, Res, EC) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(Tag, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(Tag, EC),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -259,9 +266,9 @@ events_to_check(Test, N) ->
 test_events(one_empty_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,cth,{empty_cth,id,[[]]}},
      {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
-     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{empty_cth,pre_init_per_suite,
 	       [ct_cth_empty_SUITE,'$proplist',[]]}},
@@ -287,11 +294,11 @@ test_events(one_empty_cth) ->
 test_events(two_empty_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,cth,{'_',id,[[]]}},
      {?eh,cth,{'_',init,['_',[]]}},
      {?eh,cth,{'_',id,[[]]}},
      {?eh,cth,{'_',init,['_',[]]}},
-     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
@@ -329,8 +336,8 @@ test_events(faulty_cth_no_init) ->
 test_events(faulty_cth_id_no_init) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,cth,{'_',id,[[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',id,[[]]}},
      {negative,{?eh,tc_start,'_'},
       {?eh,test_done,{'DEF','STOP_TIME'}}},
      {?eh,stop_logging,[]}
@@ -339,9 +346,9 @@ test_events(faulty_cth_id_no_init) ->
 test_events(minimal_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {negative,{?eh,cth,{'_',id,['_',[]]}},
       {?eh,cth,{'_',init,['_',[]]}}},
-     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,tc_done,{ct_cth_empty_SUITE,init_per_suite,ok}},
 
@@ -357,11 +364,11 @@ test_events(minimal_cth) ->
 test_events(minimal_and_maximal_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {negative,{?eh,cth,{'_',id,['_',[]]}},
       {?eh,cth,{'_',init,['_',[]]}}},
      {?eh,cth,{'_',id,[[]]}},
      {?eh,cth,{'_',init,['_',[]]}},
-     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
      {?eh,cth,{'_',post_init_per_suite,[ct_cth_empty_SUITE,'$proplist','$proplist',[]]}},
@@ -387,8 +394,8 @@ test_events(faulty_cth_undef) ->
 		  {failed,FailReasonStr}},
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,tc_done,{ct_cth_empty_SUITE,init_per_suite,
 		  {failed, {error,FailReasonStr}}}},
@@ -433,15 +440,15 @@ test_events(faulty_cth_exit_in_init_scope_suite) ->
 
 test_events(faulty_cth_exit_in_init) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,cth,{empty_cth,init,['_',[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,init,['_',[]]}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}];
 
 test_events(faulty_cth_exit_in_id) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,cth,{empty_cth,id,[[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
      {negative, {?eh,tc_start,'_'},
       {?eh,test_done,{'DEF','STOP_TIME'}}},
      {?eh,stop_logging,[]}];
@@ -609,9 +616,8 @@ test_events(scope_per_group_state_cth) ->
 test_events(fail_pre_suite_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-
+     {?eh,cth,{'_',init,['_',[]]}},
      
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
@@ -646,11 +652,28 @@ test_events(fail_pre_suite_cth) ->
      {?eh,stop_logging,[]}
     ];
 
-test_events(fail_post_suite_cth) ->
+test_events(double_fail_pre_suite_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',init_per_suite}},
      {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,cth,{'_',pre_init_per_suite,['_','$proplist',[]]}},
+     {?eh,cth,{'_',post_init_per_suite,['_','$proplist',
+					{fail,"Test failure"},[]]}},
+     {?eh,cth, {empty_cth,terminate,[[]]}},
+
+     {?eh,tc_start,{'_',init_per_suite}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,cth, {empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(fail_post_suite_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
      {?eh,cth,{'_',post_init_per_suite,[ct_cth_empty_SUITE,'$proplist','$proplist',[]]}},
@@ -676,8 +699,8 @@ test_events(fail_post_suite_cth) ->
 test_events(skip_pre_suite_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
      {?eh,cth,{'_',post_init_per_suite,[ct_cth_empty_SUITE,'$proplist',{skip,"Test skip"},[]]}},
@@ -699,8 +722,8 @@ test_events(skip_pre_suite_cth) ->
 test_events(skip_post_suite_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',init,['_',[]]}},
      
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
@@ -724,8 +747,8 @@ test_events(recover_post_suite_cth) ->
     Suite = ct_cth_fail_per_suite_SUITE,
     [
      {?eh,start_logging,'_'},
-     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,tc_start,{Suite,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,[Suite,'$proplist','$proplist']}},
      {?eh,cth,{'_',post_init_per_suite,[Suite,contains([tc_status]),
@@ -753,8 +776,8 @@ test_events(recover_post_suite_cth) ->
 test_events(update_config_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',init,['_',[]]}},
      
      {?eh,tc_start,{ct_update_config_SUITE,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,
@@ -864,9 +887,9 @@ test_events(update_config_cth) ->
 test_events(state_update_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,cth,{'_',init,['_',[]]}},
      {?eh,cth,{'_',init,['_',[]]}},
-     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{'_',init_per_suite}},
      
      {?eh,tc_done,{'_',end_per_suite,ok}},
@@ -902,8 +925,8 @@ test_events(state_update_cth) ->
 test_events(options_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,cth,{empty_cth,init,['_',[test]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,init,['_',[test]]}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{empty_cth,pre_init_per_suite,
 	       [ct_cth_empty_SUITE,'$proplist',[test]]}},
@@ -929,10 +952,10 @@ test_events(options_cth) ->
 test_events(same_id_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,cth,{'_',id,[[]]}},
      {?eh,cth,{'_',init,[same_id_cth,[]]}},
      {?eh,cth,{'_',id,[[]]}},
-     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
      {negative,
@@ -969,8 +992,8 @@ test_events(same_id_cth) ->
 
 test_events(fail_n_skip_with_minimal_cth) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
-     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,tc_start,{'_',init_per_suite}},
      
      {?eh,tc_done,{'_',end_per_suite,ok}},
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_crash_in_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_crash_in_cth_SUITE.erl
new file mode 100644
index 0000000000..5aa6b0132d
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_crash_in_cth_SUITE.erl
@@ -0,0 +1,50 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010-2011. 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(ct_scope_suite_crash_in_cth_SUITE).

+

+-suite_defaults([{timetrap, {minutes, 10}}]).

+

+%% Note: This directive should only be used in test suites.

+-compile(export_all).

+

+-include("ct.hrl").

+

+%% Test server callback functions

+suite() ->

+    [{ct_hooks,[fail_pre_suite_cth]}].

+

+init_per_suite(Config) ->

+    Config.

+

+end_per_suite(_Config) ->

+    ok.

+

+init_per_testcase(_TestCase, Config) ->

+    Config.

+

+end_per_testcase(_TestCase, _Config) ->

+    ok.

+

+all() ->

+    [test_case].

+

+%% Test cases starts here.

+test_case(Config) when is_list(Config) ->

+    ok.

diff --git a/lib/common_test/test/ct_master_SUITE.erl b/lib/common_test/test/ct_master_SUITE.erl
index e89b6f7de6..1471cc1e0c 100644
--- a/lib/common_test/test/ct_master_SUITE.erl
+++ b/lib/common_test/test/ct_master_SUITE.erl
@@ -119,8 +119,9 @@ ct_master_test(Config) when is_list(Config)->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(groups_suite_1, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       PrivDir, []),
+
     find_events(NodeNames, [{tc_start,{master_SUITE,init_per_suite}},
 			    {tc_start,{master_SUITE,first_testcase}},
 			    {tc_start,{master_SUITE,second_testcase}},
@@ -174,7 +175,7 @@ make_spec(DataDir, FileName, NodeNames, Suites, Config)->
 
     ct_test_support:write_testspec(N++Include++EH++C++S++LD++NS, FileName).
 
-get_log_dir({win32,_},PrivDir, NodeName)->
+get_log_dir({win32,_}, _PrivDir, NodeName)->
     case filelib:is_dir(?TEMP_DIR) of
 	false ->
 	    file:make_dir(?TEMP_DIR);
diff --git a/lib/common_test/test/ct_misc_1_SUITE.erl b/lib/common_test/test/ct_misc_1_SUITE.erl
index a8bd2c2189..cb17af9ab5 100644
--- a/lib/common_test/test/ct_misc_1_SUITE.erl
+++ b/lib/common_test/test/ct_misc_1_SUITE.erl
@@ -111,7 +111,8 @@ beam_me_up(Config) when is_list(Config) ->
 
     ct_test_support:log_events(beam_me_up,
 			       reformat(Events, ?eh),
-			       ?config(priv_dir, Config)),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(beam_me_up, 1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
diff --git a/lib/common_test/test/ct_repeat_1_SUITE.erl b/lib/common_test/test/ct_repeat_1_SUITE.erl
index e674315526..4e842bd6d6 100644
--- a/lib/common_test/test/ct_repeat_1_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_1_SUITE.erl
@@ -159,7 +159,8 @@ execute(TestCase, SuiteName, Group, Config) ->
 
     ct_test_support:log_events(TestCase,
 			       reformat(Events, ?eh),
-			       ?config(priv_dir, Config)),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(TestCase),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -561,7 +562,6 @@ test_events(repeat_cs_until_any_fail) ->
 	  {error,
 	   {{badmatch,2},
 	    [{repeat_1_SUITE,tc_fail_1,1},
-	     {repeat_1_SUITE,tc_fail_1,1},
 	     {test_server,my_apply,3},
 	     {test_server,ts_tc,3},
 	     {test_server,run_test_case_eval1,6},
diff --git a/lib/common_test/test/ct_sequence_1_SUITE.erl b/lib/common_test/test/ct_sequence_1_SUITE.erl
index c7650b169c..5facf90656 100644
--- a/lib/common_test/test/ct_sequence_1_SUITE.erl
+++ b/lib/common_test/test/ct_sequence_1_SUITE.erl
@@ -132,7 +132,8 @@ execute(TestCase, SuiteName, Group, Config) ->
 
     ct_test_support:log_events(TestCase,
 			       reformat(Events, ?eh),
-			       ?config(priv_dir, Config)),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(TestCase),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
diff --git a/lib/common_test/test/ct_skip_SUITE.erl b/lib/common_test/test/ct_skip_SUITE.erl
index 62c5f10b7c..4ba4479208 100644
--- a/lib/common_test/test/ct_skip_SUITE.erl
+++ b/lib/common_test/test/ct_skip_SUITE.erl
@@ -99,8 +99,9 @@ auto_skip(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(auto_skip, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(auto_skip),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -122,8 +123,9 @@ user_skip(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(user_skip, 
-			       reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(user_skip),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
diff --git a/lib/common_test/test/ct_smoke_test_SUITE.erl b/lib/common_test/test/ct_smoke_test_SUITE.erl
index c3d49a5afa..49b38361e2 100644
--- a/lib/common_test/test/ct_smoke_test_SUITE.erl
+++ b/lib/common_test/test/ct_smoke_test_SUITE.erl
@@ -175,8 +175,9 @@ dir1(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(dir1, 
-			       ct_test_support:reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       ct_test_support:reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(dir1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -204,8 +205,9 @@ dir2(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
     
     ct_test_support:log_events(dir2, 
-			       ct_test_support:reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       ct_test_support:reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(dir2),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -234,8 +236,9 @@ dir1_2(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
     
     ct_test_support:log_events(dir1_2, 
-			       ct_test_support:reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       ct_test_support:reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(dir1_2),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -264,8 +267,8 @@ suite11(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
     
     ct_test_support:log_events(suite11, 
-			       ct_test_support:reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       ct_test_support:reformat(Events, ?eh),
+			       ?config(priv_dir, Config), Opts),
 
     TestEvents = events_to_check(suite11),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -293,8 +296,8 @@ suite21(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
     
     ct_test_support:log_events(suite21, 
-			       ct_test_support:reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       ct_test_support:reformat(Events, ?eh),
+			       ?config(priv_dir, Config), Opts),
 
     TestEvents = events_to_check(suite21),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -324,8 +327,8 @@ suite11_21(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
     
     ct_test_support:log_events(suite11_21, 
-			       ct_test_support:reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       ct_test_support:reformat(Events, ?eh),
+			       ?config(priv_dir, Config), Opts),
 
     TestEvents = events_to_check(suite11_21),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -355,8 +358,8 @@ tc111(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
     
     ct_test_support:log_events(tc111, 
-			       ct_test_support:reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       ct_test_support:reformat(Events, ?eh),
+			       ?config(priv_dir, Config), Opts),
 
     TestEvents = events_to_check(tc111),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -385,8 +388,8 @@ tc211(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
     
     ct_test_support:log_events(tc211, 
-			       ct_test_support:reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       ct_test_support:reformat(Events, ?eh),
+			       ?config(priv_dir, Config), Opts),
 
     TestEvents = events_to_check(tc211),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -416,8 +419,8 @@ tc111_112(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
     
     ct_test_support:log_events(tc111_112, 
-			       ct_test_support:reformat(Events, ?eh), 
-			       ?config(priv_dir, Config)),
+			       ct_test_support:reformat(Events, ?eh),
+			       ?config(priv_dir, Config), Opts),
 
     TestEvents = events_to_check(tc111_112),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
index 9d3e6a9e59..4471915e69 100644
--- a/lib/common_test/test/ct_test_server_if_1_SUITE.erl
+++ b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
@@ -98,8 +98,9 @@ ts_if_1(Config) when is_list(Config) ->
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(ts_if_1, 
-			       reformat(Events, ?eh), 
-			       PrivDir),
+			       reformat(Events, ?eh),
+			       PrivDir,
+			       Opts),
 
     TestEvents = events_to_check(ts_if_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index b4f1a0e71f..601d5315ce 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -32,7 +32,8 @@
 	 run/2, run/4, get_opts/1, wait_for_ct_stop/1]).
 
 -export([handle_event/2, start_event_receiver/1, get_events/2,
-	 verify_events/3, reformat/2, log_events/3]).
+	 verify_events/3, reformat/2, log_events/4,
+	 join_abs_dirs/2]).
 
 -include_lib("kernel/include/file.hrl").
 
@@ -63,7 +64,6 @@ init_per_suite(Config, Level) ->
 
 start_slave(Config,Level) ->
     [_,Host] = string:tokens(atom_to_list(node()), "@"),
-    
     test_server:format(0, "Trying to start ~s~n", ["ct@"++Host]),
     case slave:start(Host, ct, []) of
 	{error,Reason} ->
@@ -72,18 +72,19 @@ start_slave(Config,Level) ->
 	    test_server:format(0, "Node ~p started~n", [CTNode]),
 	    IsCover = test_server:is_cover(),
 	    if IsCover ->
-		cover:start(CTNode);
-	    true->
-		ok
+		    cover:start(CTNode);
+	       true->
+		    ok
 	    end,
-	    DataDir = ?config(data_dir, Config),
-	    PrivDir = ?config(priv_dir, Config),
+
+	    DataDir = proplists:get_value(data_dir, Config),
+	    PrivDir = proplists:get_value(priv_dir, Config),
 
 	    %% PrivDir as well as directory of Test Server suites
 	    %% have to be in code path on Common Test node.
 	    [_ | Parts] = lists:reverse(filename:split(DataDir)),
 	    TSDir = filename:join(lists:reverse(Parts)),
-	    AddPathDirs = case ?config(path_dirs, Config) of
+	    AddPathDirs = case proplists:get_value(path_dirs, Config) of
 			      undefined -> [];
 			      Ds -> Ds
 			  end,
@@ -110,8 +111,8 @@ start_slave(Config,Level) ->
 %%% end_per_suite/1
 
 end_per_suite(Config) ->
-    CTNode = ?config(ct_node, Config),
-    PrivDir = ?config(priv_dir, Config),
+    CTNode = proplists:get_value(ct_node, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     true = rpc:call(CTNode, code, del_path, [filename:join(PrivDir,"")]),
     cover:stop(CTNode),
     slave:stop(CTNode),
@@ -121,7 +122,9 @@ end_per_suite(Config) ->
 %%% init_per_testcase/2
 
 init_per_testcase(_TestCase, Config) ->
-    {_,{_,LogDir}} = lists:keysearch(logdir, 1, get_opts(Config)),
+    Opts = get_opts(Config),
+    NetDir = proplists:get_value(net_dir, Opts),
+    LogDir = join_abs_dirs(NetDir, proplists:get_value(logdir, Opts)),
     case lists:keysearch(master, 1, Config) of
 	false->
 	    test_server:format("See Common Test logs here:\n\n"
@@ -139,7 +142,7 @@ init_per_testcase(_TestCase, Config) ->
 %%% end_per_testcase/2
 
 end_per_testcase(_TestCase, Config) ->
-    CTNode = ?config(ct_node, Config),
+    CTNode = proplists:get_value(ct_node, Config),
     case wait_for_ct_stop(CTNode) of
 	%% Common test was not stopped to we restart node.
 	false ->
@@ -169,7 +172,7 @@ write_testspec(TestSpec, TSFile) ->
 %%% 
 
 get_opts(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     TempDir = case os:getenv("TMP") of
 		  false -> 
 		      case os:getenv("TEMP") of
@@ -195,20 +198,48 @@ get_opts(Config) ->
 	    _ ->
 		TempDir
 	end,
-    InitOpts = ?config(ct_opts, Config),
-    [{logdir,LogDir} | InitOpts].
+
+    %% Copy test variables to app environment on new node
+    CtTestVars =
+	case init:get_argument(ct_test_vars) of
+	    {ok,[Vars]} ->
+		[begin {ok,Ts,_} = erl_scan:string(Str++"."),
+		       {ok,Expr} = erl_parse:parse_term(Ts),
+		       Expr
+		 end || Str <- Vars];
+	    _ ->
+		[]
+	end,
+    %% test_server:format("Test variables added to Config: ~p\n\n",
+    %%                    [CtTestVars]),
+    InitOpts =
+	case proplists:get_value(ct_opts, Config) of
+	    undefined -> [];
+	    CtOpts -> CtOpts
+	end,
+    [{logdir,LogDir} | InitOpts ++ CtTestVars].
 
 
 %%%-----------------------------------------------------------------
 %%% 
 run(Opts, Config) ->
-    CTNode = ?config(ct_node, Config),
-    Level = ?config(trace_level, Config),
+    CTNode = proplists:get_value(ct_node, Config),
+    Level = proplists:get_value(trace_level, Config),
     %% use ct interface
     test_server:format(Level, "~n[RUN #1] Calling ct:run_test(~p) on ~p~n",
 		       [Opts, CTNode]),
     Result1 = rpc:call(CTNode, ct, run_test, [Opts]),
 
+    case rpc:call(CTNode, erlang, whereis, [ct_util_server]) of
+	undefined ->
+	    ok;
+	_ ->
+	    test_server:format(Level,
+			       "ct_util_server not stopped on ~p yet, waiting 5 s...~n",
+			       [CTNode]),
+	    timer:sleep(5000),
+	    undefined = rpc:call(CTNode, erlang, whereis, [ct_util_server])
+    end,
     %% use run_test interface (simulated)
     test_server:format(Level, "Saving start opts on ~p: ~p~n", [CTNode,Opts]),
     rpc:call(CTNode, application, set_env, [common_test, run_test_start_opts, Opts]),
@@ -224,8 +255,8 @@ run(Opts, Config) ->
     end.
 
 run(M, F, A, Config) ->
-    CTNode = ?config(ct_node, Config),
-    Level = ?config(trace_level, Config),
+    CTNode = proplists:get_value(ct_node, Config),
+    Level = proplists:get_value(trace_level, Config),
     test_server:format(Level, "~nCalling ~w:~w(~p) on ~p~n",
 		       [M, F, A, CTNode]),
     rpc:call(CTNode, M, F, A).
@@ -261,11 +292,11 @@ handle_event(EH, Event) ->
     ok.
     
 start_event_receiver(Config) ->
-    CTNode = ?config(ct_node, Config),
+    CTNode = proplists:get_value(ct_node, Config),
     spawn_link(CTNode, fun() -> er() end).
 
 get_events(_, Config) ->
-    CTNode = ?config(ct_node, Config),
+    CTNode = proplists:get_value(ct_node, Config),
     {event_receiver,CTNode} ! {self(),get_events},
     Events = receive {event_receiver,Evs} -> Evs end,
     {event_receiver,CTNode} ! stop,
@@ -288,7 +319,7 @@ er_loop(Evs) ->
     end.
 
 verify_events(TEvs, Evs, Config) ->
-    Node = ?config(ct_node, Config),    
+    Node = proplists:get_value(ct_node, Config),
     case catch verify_events1(TEvs, Evs, Node, Config) of
 	{'EXIT',Reason} ->
 	    Reason;
@@ -349,10 +380,15 @@ locate(TEvs, Node, Evs, Config) when is_list(TEvs) ->
 			     data={M,{init_per_group,GroupName,Props}}}},
 		 {TEH,#event{name=tc_done, 
 			     node=Node, 
-			     data={M,{init_per_group,GroupName,Props},R}}} | Evs1] ->
-		    test_server:format("Found ~p!", [InitStart]),
-		    test_server:format("Found ~p!", [InitDone]),
-		    verify_events1(TEvs1, Evs1, Node, Config);
+			     data={M,{init_per_group,GroupName,Props},Res}}} | Evs1] ->
+		    case result_match(R, Res) of
+			false ->
+			    nomatch;
+			true ->
+			    test_server:format("Found ~p!", [InitStart]),
+			    test_server:format("Found ~p!", [InitDone]),
+			    verify_events1(TEvs1, Evs1, Node, Config)
+		    end;
 		_ ->
 		    nomatch
 	    end;
@@ -384,9 +420,11 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 							   EvProps},EvR}}})
 				   when TEH == EH, EvNode == Node, EvM == M,
 					EvGroupName == GroupName,
-					EvProps == Props,
-					EvR == R ->
-					false;
+					EvProps == Props ->
+					case result_match(R, EvR) of
+					    true -> false;
+					    false -> true
+					end;
 				   ({EH,#event{name=stop_logging,
 						node=EvNode,data=_}})
 				   when EH == TEH, EvNode == Node ->
@@ -466,7 +504,7 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 						  node=EvNode,
 						  data={Mod,Func,Result}}} <- Done, 
 				     EH == TEH, EvNode == Node, Mod == M, 
-				     Func == F, Result == R] of
+				     Func == F, result_match(R, Result)] of
 			      [TcDone|_] ->
 				  test_server:format("Found ~p!", [TEv]),
 				  {lists:delete(TcDone, Done),RemEvs,RemSize};
@@ -509,8 +547,13 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 					       data={Mod,{end_per_group,
 							  EvGName,EvProps},Res}}}) when 
 					  EH == TEH, EvNode == Node, Mod == M,
-					  EvGName == GroupName, EvProps == Props, Res == R ->
-					false;
+					  EvGName == GroupName, EvProps == Props ->
+					case result_match(R, Res) of
+					    true ->
+						false;
+					    false ->
+						true
+					end;
 				   ({EH,#event{name=stop_logging,
 					       node=EvNode,data=_}}) when
 					  EH == TEH, EvNode == Node ->
@@ -603,23 +646,29 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 				 data={M,{init_per_group,GroupName,EvProps}}}},
 		     {TEH,#event{name=tc_done, 
 				 node=Node, 
-				 data={M,{init_per_group,GroupName,EvProps},R}}} | Es] ->
-			case proplists:get_value(shuffle, Props) of
-			    '_' ->
-				case proplists:get_value(shuffle, EvProps) of
-				    false ->
-					exit({no_shuffle_prop_found,{M,init_per_group,
-								     GroupName,EvProps}});
+				 data={M,{init_per_group,GroupName,EvProps},Res}}} | Es] ->
+			case result_match(R, Res) of
+			    true ->
+				case proplists:get_value(shuffle, Props) of
+				    '_' ->
+					case proplists:get_value(shuffle, EvProps) of
+					    false ->
+						exit({no_shuffle_prop_found,
+						      {M,init_per_group,
+						       GroupName,EvProps}});
+					    _ ->
+						PropsCmp = proplists:delete(shuffle, EvProps),
+						PropsCmp = proplists:delete(shuffle, Props)
+					end;
 				    _ ->
-					PropsCmp = proplists:delete(shuffle, EvProps),
-					PropsCmp = proplists:delete(shuffle, Props)
-				end;
-			    _ ->
-				Props = EvProps
-			end,
-			test_server:format("Found ~p!", [InitStart]),
-			test_server:format("Found ~p!", [InitDone]),
-			{TEs,Es};
+					Props = EvProps
+				end,
+				test_server:format("Found ~p!", [InitStart]),
+				test_server:format("Found ~p!", [InitDone]),
+				{TEs,Es};
+			    false ->
+				nomatch
+			end;
 		    _ ->
 			nomatch
 		end;
@@ -670,7 +719,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 						  node=EvNode,
 						  data={Mod,Func,Result}}} <- Done, 
 				     EH == TEH, EvNode == Node, Mod == M, 
-				     Func == F, Result == R] of
+				     Func == F, result_match(R, Result)] of
 			      [TcDone|_] ->
 				  test_server:format("Found ~p!", [TEv]),
 				  {lists:delete(TcDone, Done),RemEvs,RemSize};
@@ -726,8 +775,13 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 					       data={Mod,{end_per_group,
 							  EvGName,_},Res}}}) when 
 					  EH == TEH, EvNode == Node, Mod == M,
-					  EvGName == GroupName, Res == R ->
-					false;
+					  EvGName == GroupName ->
+					case result_match(R, Res) of
+					    true ->
+						false;
+					    false ->
+						true
+					end;
 				   ({EH,#event{name=stop_logging,
 					       node=EvNode,data=_}}) when
 					  EH == TEH, EvNode == Node ->
@@ -864,25 +918,34 @@ locate({TEH,Name,{'DEF','STOP_TIME'}}, Node, [Ev|Evs], Config) ->
 	    nomatch
     end;
 
-%% to match variable data as a result of a failed test case
-locate({TEH,tc_done,{Mod,Func,{failed,{error,{Slogan,'_'}}}}}, Node, [Ev|Evs], Config) ->
+%% to match variable data as a result of an aborted test case
+locate({TEH,tc_done,{undefined,undefined,{testcase_aborted,
+					  {abort_current_testcase,Func},'_'}}},
+       Node, [Ev|Evs], Config) ->
     case Ev of
-	{TEH,#event{name=tc_done, node=Node, 
-		    data={Mod,Func,{failed,{error,{Slogan,_}}}}}} ->
+	{TEH,#event{name=tc_done, node=Node,
+		    data={undefined,undefined,
+			  {testcase_aborted,{abort_current_testcase,Func},_}}}} ->
 	    {Config,Evs};
 	_ ->
 	    nomatch
     end;
 
-%% to match variable data as a result of an aborted test case
-locate({TEH,tc_done,{undefined,undefined,{testcase_aborted,
-					  {abort_current_testcase,Func},'_'}}}, 
-       Node, [Ev|Evs], Config) ->
+%% to match variable data as a result of a failed test case
+locate({TEH,tc_done,{Mod,Func,R={SkipOrFail,{_ErrInd,ErrInfo}}}},
+       Node, [Ev|Evs], Config) when ((SkipOrFail == skipped) or
+				     (SkipOrFail == failed)) and
+				    ((size(ErrInfo) == 2) or
+				     (size(ErrInfo) == 3)) ->
     case Ev of
 	{TEH,#event{name=tc_done, node=Node, 
-		    data={undefined,undefined,
-			  {testcase_aborted,{abort_current_testcase,Func},_}}}} -> 
-	    {Config,Evs};
+		    data={Mod,Func,Result}}} ->
+	    case result_match(R, Result) of
+		true ->
+		    {Config,Evs};
+		false ->
+		    nomatch
+	    end;
 	_ ->
 	    nomatch
     end;
@@ -931,14 +994,27 @@ match_data(Tuple1,Tuple2) when is_tuple(Tuple1),is_tuple(Tuple2) ->
 match_data([],[]) ->
     match.
 
-log_events(TC, Events, PrivDir) ->
-    LogFile = filename:join(PrivDir, atom_to_list(TC)++".events"),
+result_match({SkipOrFail,{ErrorInd,{Why,'_'}}},
+	    {SkipOrFail,{ErrorInd,{Why,_Stack}}}) ->
+    true;
+result_match({SkipOrFail,{ErrorInd,{EMod,EFunc,{Why,'_'}}}},
+	    {SkipOrFail,{ErrorInd,{EMod,EFunc,{Why,_Stack}}}}) ->
+    true;
+result_match(Result, Result) ->
+    true;
+result_match(_, _) ->
+    false.
+
+log_events(TC, Events, EvLogDir, Opts) ->
+    LogFile = filename:join(EvLogDir, atom_to_list(TC)++".events"),
     {ok,Dev} = file:open(LogFile, [write]),
     io:format(Dev, "[~n", []),
     log_events1(Events, Dev, " "),
     file:close(Dev),
+    FullLogFile = join_abs_dirs(proplists:get_value(net_dir, Opts),
+				LogFile),
     io:format("Events written to logfile: <a href=\"file://~s\">~s</a>~n",
-	      [LogFile,LogFile]),
+	      [FullLogFile,FullLogFile]),
     io:format(user, "Events written to logfile: ~p~n", [LogFile]).
 
 log_events1(Evs, Dev, "") ->
@@ -1024,13 +1100,25 @@ reformat([], _EH) ->
 %%%-----------------------------------------------------------------
 %%% MISC HELP FUNCTIONS
 
+join_abs_dirs(undefined, Dir2) ->
+    Dir2;
+join_abs_dirs(Dir1, Dir2) ->
+    case filename:pathtype(Dir2) of
+	relative ->
+	    filename:join(Dir1, Dir2);
+	_ ->
+	    [_Abs|Parts] = filename:split(Dir2),
+	    filename:join(Dir1, filename:join(Parts))
+    end.
+
 create_tmp_logdir(Tmp) ->
     LogDir = filename:join(Tmp,"ct"),
     file:make_dir(LogDir),
     LogDir.
 
 delete_old_logs({win32,_}, Config) ->
-    case {?config(priv_dir, Config),?config(logdir, get_opts(Config))} of
+    case {proplists:get_value(priv_dir, Config),
+	  proplists:get_value(logdir, get_opts(Config))} of
 	{LogDir,LogDir} ->
 	    ignore;
 	{_,LogDir} ->				% using tmp for logs
@@ -1042,7 +1130,8 @@ delete_old_logs(_, Config) ->
 	false ->
 	    ignore;
 	_ ->
-	    catch delete_dirs(?config(logdir, get_opts(Config)))
+	    catch delete_dirs(proplists:get_value(logdir,
+						  get_opts(Config)))
     end.
 
 delete_dirs(LogDir) ->
diff --git a/lib/common_test/test/ct_testspec_1_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE.erl
index 616c2db869..b6dcf63fdf 100644
--- a/lib/common_test/test/ct_testspec_1_SUITE.erl
+++ b/lib/common_test/test/ct_testspec_1_SUITE.erl
@@ -612,6 +612,12 @@ setup_and_execute(TCName, TestSpec, Config) ->
 	    false -> [{spec,SpecFile},{label,TCName}]
 	end,
     {Opts,ERPid} = setup(TestTerms, Config),
+
+    FullSpecFile = ct_test_support:join_abs_dirs(?config(net_dir, Opts),
+						 SpecFile),
+    io:format("~nTest spec created here~n~n<a href=\"file://~s\">~s</a>~n",
+	      [FullSpecFile,FullSpecFile]),
+
     ok = ct_test_support:run(Opts, Config),
     TestSpec1 = [{logdir,proplists:get_value(logdir,Opts)},
 		 {label,proplists:get_value(label,TestTerms)} | TestSpec],
@@ -620,7 +626,8 @@ setup_and_execute(TCName, TestSpec, Config) ->
 
     ct_test_support:log_events(TCName,
 			       reformat(Events, ?eh),
-			       ?config(priv_dir, Config)),
+			       ?config(priv_dir, Config),
+			       Opts),
 
     TestEvents = events_to_check(TCName),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
@@ -631,8 +638,6 @@ create_spec_file(SpecDir, TCName, TestSpec) ->
     {ok,Dev} = file:open(FileName, [write]),
     [io:format(Dev, "~p.~n", [Term]) || Term <- TestSpec],
     file:close(Dev),
-    io:format("~nTest spec created here~n~n<a href=\"file://~s\">~s</a>~n",
-	      [FileName,FileName]),
     FileName.
 
 setup(Test, Config) when is_tuple(Test) ->
@@ -791,7 +796,9 @@ test_events(skip_group) ->
      {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1a,[]},'_'}},
      
      {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_1b},"SKIPPED!"}},
-     {?eh,test_stats,{2,0,{1,0}}},
+     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_2},"SKIPPED!"}},
+     %%! But not test_group_7 since it's a sub-group!
+     {?eh,test_stats,{2,0,{2,0}}},
      {negative,{?eh,tc_user_skip,'_'},{?eh,stop_logging,'_'}}
     ];
 
@@ -1188,10 +1195,9 @@ test_events(sub_skipped_by_top) ->
      {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
 
      {?eh,tc_user_skip,{groups_12_SUITE,{group,test_group_4},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{group,test_group_4},"SKIPPED!"}},
 
-     {negative,
-      {?eh,tc_user_skip,{groups_12_SUITE,{group,test_group_4},"SKIPPED!"}},
-      {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}}},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
 
      {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
     ];
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index f2af932aef..830c89ae84 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -68,7 +68,7 @@
 	  to be an error if the module name in the source code is
 	  not the same as the basename of the output file.</p>
 
-        <p>Here follows first all elements of <c>Options</c> that in
+        <p><marker id="type-option"/>Here follows first all elements of <c>Options</c> that in
 	  some way control the behavior of the compiler.</p>
         <taglist>
           <tag><c>basic_validation</c></tag>
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 25a6db4ce0..5757d0c1cb 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 040adcfd09..3ace10403e 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -40,7 +40,7 @@ CFLAGS = $(DED_CFLAGS)
 # From erts/configure
 SSL_LIBDIR = @SSL_LIBDIR@
 SSL_INCLUDE = @SSL_INCLUDE@
-
+SSL_CRYPTO_LIBNAME = @SSL_CRYPTO_LIBNAME@
 
 
 INCLUDES = $(SSL_INCLUDE) $(DED_INCLUDES)
@@ -84,10 +84,10 @@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
 
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
 SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
-CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -lcrypto
+CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
 else
 SSL_DED_LD_RUNTIME_LIBRARY_PATH=
-CRYPTO_LINK_LIB=$(SSL_LIBDIR)/libcrypto.a 
+CRYPTO_LINK_LIB=$(SSL_LIBDIR)/lib$(SSL_CRYPTO_LIBNAME).a 
 endif
 
 # ----------------------------------------------------
@@ -112,7 +112,7 @@ $(LIBDIR)/crypto$(TYPEMARKER).so: $(OBJS)
 
 $(LIBDIR)/crypto$(TYPEMARKER).dll: $(OBJS)
 	$(INSTALL_DIR) $(LIBDIR)
-	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -llibeay32
+	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -l$(SSL_CRYPTO_LIBNAME)
 
 clean:
 ifeq ($(findstring win32,$(TARGET)), win32)
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index b8786f6f94..3ebf62d87c 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -134,7 +134,9 @@ static ERL_NIF_TERM des_ede3_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_T
 static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_ctr_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rand_bytes_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rand_bytes_3(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM strong_rand_mpint_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM dss_verify(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -204,7 +206,9 @@ static ErlNifFunc nif_funcs[] = {
     {"aes_ctr_encrypt", 3, aes_ctr_encrypt},
     {"aes_ctr_decrypt", 3, aes_ctr_encrypt},
     {"rand_bytes", 1, rand_bytes_1},
+    {"strong_rand_bytes_nif", 1, strong_rand_bytes_nif},
     {"rand_bytes", 3, rand_bytes_3},
+    {"strong_rand_mpint_nif", 3, strong_rand_mpint_nif},
     {"rand_uniform_nif", 2, rand_uniform_nif},
     {"mod_exp_nif", 3, mod_exp_nif},
     {"dss_verify", 4, dss_verify},
@@ -704,6 +708,22 @@ static ERL_NIF_TERM rand_bytes_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
     ERL_VALGRIND_MAKE_MEM_DEFINED(data, bytes);
     return ret;
 }
+static ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Bytes) */     
+    unsigned bytes;
+    unsigned char* data;
+    ERL_NIF_TERM ret;
+    if (!enif_get_uint(env, argv[0], &bytes)) {
+	return enif_make_badarg(env);
+    }
+    data = enif_make_new_binary(env, bytes, &ret);
+    if ( RAND_bytes(data, bytes) != 1) {
+        return atom_false;
+    }
+    ERL_VALGRIND_MAKE_MEM_DEFINED(data, bytes);
+    return ret;
+}
+
 static ERL_NIF_TERM rand_bytes_3(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Bytes, TopMask, BottomMask) */    
     unsigned bytes;
@@ -724,6 +744,47 @@ static ERL_NIF_TERM rand_bytes_3(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
     }
     return ret;
 }
+static ERL_NIF_TERM strong_rand_mpint_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Bytes, TopMask, BottomMask) */    
+    unsigned bits;
+    BIGNUM *bn_rand;
+    int top, bottom;
+    unsigned char* data;
+    unsigned dlen;
+    ERL_NIF_TERM ret;
+    if (!enif_get_uint(env, argv[0], &bits)
+	|| !enif_get_int(env, argv[1], &top)
+	|| !enif_get_int(env, argv[2], &bottom)) {
+	return enif_make_badarg(env);
+    }
+    if (! (top == -1 || top == 0 || top == 1) ) {
+        return enif_make_badarg(env);
+    }
+    if (! (bottom == 0 || bottom == 1) ) {
+        return enif_make_badarg(env);
+    }
+
+    bn_rand = BN_new();
+    if (! bn_rand ) {
+        return enif_make_badarg(env);
+    }
+
+    /* Get a (bits) bit random number */
+    if (!BN_rand(bn_rand, bits, top, bottom)) {
+        ret = atom_false;
+    }
+    else {
+	/* Copy the bignum into an erlang mpint binary. */
+	dlen = BN_num_bytes(bn_rand);
+	data = enif_make_new_binary(env, dlen+4, &ret);
+	put_int32(data, dlen);
+	BN_bn2bin(bn_rand, data+4);
+	ERL_VALGRIND_MAKE_MEM_DEFINED(data+4, dlen);
+    }
+    BN_free(bn_rand);
+
+    return ret;
+}
 
 static int get_bn_from_mpint(ErlNifEnv* env, ERL_NIF_TERM term, BIGNUM** bnp)
 {
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index dfafe67348..1ccea6df79 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2010</year>
+      <year>1999</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -619,6 +619,21 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       </desc>
     </func>
     <func>
+      <name>strong_rand_bytes(N) -> binary()</name>
+      <fsummary>Generate a binary of random bytes</fsummary>
+      <type>
+        <v>N = integer()</v>
+      </type>
+      <desc>
+        <p>Generates N bytes randomly uniform 0..255, and returns the
+        result in a binary. Uses a cryptographically secure prng seeded and
+        periodically mixed with operating system provided entropy. By default
+        this is the <c>RAND_bytes</c> method from OpenSSL.</p>
+	<p>May throw exception <c>low_entropy</c> in case the random generator
+	failed due to lack of secure "randomness".</p>
+      </desc>
+    </func>
+    <func>
       <name>rand_uniform(Lo, Hi) -> N</name>
       <fsummary>Generate a random number</fsummary>
       <type>
@@ -633,6 +648,31 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       </desc>
     </func>
     <func>
+      <name>strong_rand_mpint(N, Top, Bottom) -> Mpint</name>
+      <fsummary>Generate an N bit random number</fsummary>
+      <type>
+        <v>N = non_neg_integer()</v>
+        <v>Top = -1 | 0 | 1</v>
+        <v>Bottom = 0 | 1</v>
+        <v>Mpint = binary()</v>
+      </type>
+      <desc>
+        <p>Generate an N bit random number using OpenSSL's
+        cryptographically strong pseudo random number generator
+        <c>BN_rand</c>.</p>
+        <p>The parameter <c>Top</c> places constraints on the most
+        significant bits of the generated number. If <c>Top</c> is 1, then the
+        two most significant bits will be set to 1, if <c>Top</c> is 0, the
+        most significant bit will be 1, and if <c>Top</c> is -1 then no
+        constraints are applied and thus the generated number may be less than
+        N bits long.</p>
+        <p>If <c>Bottom</c> is 1, then the generated number is
+        constrained to be odd.</p>
+	<p>May throw exception <c>low_entropy</c> in case the random generator
+	failed due to lack of secure "randomness".</p>
+      </desc>
+    </func>
+    <func>
       <name>mod_exp(N, P, M) -> Result</name>
       <fsummary>Perform N ^ P mod M</fsummary>
       <type>
diff --git a/lib/crypto/doc/src/licenses.xml b/lib/crypto/doc/src/licenses.xml
index bae87a373e..e851655aa5 100644
--- a/lib/crypto/doc/src/licenses.xml
+++ b/lib/crypto/doc/src/licenses.xml
@@ -37,7 +37,7 @@ This chapter contains in extenso versions
     <title>OpenSSL License</title>
     <code type="none">
 /* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 5e9bda3920..ab1ffa9e5c 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2010</year>
+      <year>1999</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,21 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 2.0.2.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Strengthened random number generation. (Thanks to Geoff Cant)</p>
+          <p>
+	    Own Id: OTP-9225</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 2.0.2.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index d6e2e033c0..cc7b3acc9c 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -46,6 +46,7 @@
 -export([rsa_private_encrypt/3, rsa_public_decrypt/3]).
 -export([dh_generate_key/1, dh_generate_key/2, dh_compute_key/3]).
 -export([rand_bytes/1, rand_bytes/3, rand_uniform/2]).
+-export([strong_rand_bytes/1, strong_rand_mpint/3]).
 -export([mod_exp/3, mpint/1, erlint/1]).
 %% -export([idea_cbc_encrypt/3, idea_cbc_decrypt/3]).
 -export([aes_cbc_128_encrypt/3, aes_cbc_128_decrypt/3]).
@@ -68,6 +69,8 @@
 		    des_ede3_cbc_encrypt, des_ede3_cbc_decrypt,
 		    aes_cfb_128_encrypt, aes_cfb_128_decrypt,
 		    rand_bytes,
+		    strong_rand_bytes,
+		    strong_rand_mpint,
 		    rand_uniform,
 		    mod_exp,
 		    dss_verify,dss_sign,
@@ -361,12 +364,32 @@ aes_cfb_128_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 %% RAND - pseudo random numbers using RN_ functions in crypto lib
 %%
 -spec rand_bytes(non_neg_integer()) -> binary().
+-spec strong_rand_bytes(non_neg_integer()) -> binary().
 -spec rand_uniform(crypto_integer(), crypto_integer()) ->
 			  crypto_integer().
+-spec strong_rand_mpint(Bits::non_neg_integer(),
+			Top::-1..1,
+			Bottom::0..1) -> binary().
 
 rand_bytes(_Bytes) -> ?nif_stub.
+
+strong_rand_bytes(Bytes) ->
+    case strong_rand_bytes_nif(Bytes) of
+        false -> erlang:error(low_entropy);
+        Bin -> Bin
+    end.
+strong_rand_bytes_nif(_Bytes) -> ?nif_stub.
+
 rand_bytes(_Bytes, _Topmask, _Bottommask) -> ?nif_stub.
 
+strong_rand_mpint(Bits, Top, Bottom) -> 
+    case strong_rand_mpint_nif(Bits,Top,Bottom) of
+        false -> erlang:error(low_entropy);
+        Bin -> Bin
+    end.
+strong_rand_mpint_nif(_Bits, _Top, _Bottom) -> ?nif_stub.
+
+
 rand_uniform(From,To) when is_binary(From), is_binary(To) ->
     case rand_uniform_nif(From,To) of
 	<<Len:32/integer, MSB, Rest/binary>> when MSB > 127 ->
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index fe8f8e69a0..854a8b4485 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -46,6 +46,7 @@
 	 aes_ctr/1,
 	 mod_exp_test/1,
 	 rand_uniform_test/1,
+	 strong_rand_test/1,
 	 rsa_verify_test/1,
 	 dsa_verify_test/1,
 	 rsa_sign_test/1,
@@ -68,7 +69,8 @@ all() ->
      md5_mac_io, sha, sha_update, 
      %% sha256, sha256_update, sha512,sha512_update,
      des_cbc, aes_cfb, aes_cbc,
-     aes_cbc_iter, aes_ctr, des_cbc_iter, des_ecb, rand_uniform_test,
+     aes_cbc_iter, aes_ctr, des_cbc_iter, des_ecb,
+     rand_uniform_test, strong_rand_test,
      rsa_verify_test, dsa_verify_test, rsa_sign_test,
      dsa_sign_test, rsa_encrypt_decrypt, dh, exor_test,
      rc4_test, rc4_stream_test, mod_exp_test, blowfish_cfb64,
@@ -710,6 +712,33 @@ rand_uniform_aux_test(N) ->
 
 %%
 %%
+strong_rand_test(doc) ->
+    "strong_rand_mpint and strong_random_bytes testing";
+strong_rand_test(suite) ->
+    [];
+strong_rand_test(Config) when is_list(Config) ->
+    strong_rand_aux_test(180),
+    ?line 10 = byte_size(crypto:strong_rand_bytes(10)).
+
+strong_rand_aux_test(0) ->
+    ?line t(crypto:strong_rand_mpint(0,0,0) =:= <<0,0,0,0>>),
+    ok;
+strong_rand_aux_test(1) ->
+    ?line t(crypto:erlint(crypto:strong_rand_mpint(1,0,1)) =:= 1),
+    ?line strong_rand_aux_test(0);
+strong_rand_aux_test(N) ->
+    ?line t(sru_length(crypto:strong_rand_mpint(N,-1,0)) =< N),
+    ?line t(sru_length(crypto:strong_rand_mpint(N,0,0)) =:= N),
+    ?line t(crypto:erlint(crypto:strong_rand_mpint(N,0,1)) band 1 =:= 1),
+    ?line t(crypto:erlint(crypto:strong_rand_mpint(N,1,0)) bsr (N - 2) =:= 2#11),
+    ?line strong_rand_aux_test(N-1).
+
+sru_length(Mpint) ->
+    I = crypto:erlint(Mpint),
+    length(erlang:integer_to_list(I, 2)).
+
+%%
+%%
 %%
 %%
 rsa_verify_test(doc) ->
@@ -1097,7 +1126,7 @@ worker_loop(0, _) ->
     ok;
 worker_loop(N, Config) ->
     Funcs = { md5, md5_update, md5_mac, md5_mac_io, sha, sha_update, des_cbc,
-	      aes_cfb, aes_cbc, des_cbc_iter, rand_uniform_test, 
+	      aes_cfb, aes_cbc, des_cbc_iter, rand_uniform_test, strong_rand_test,
 	      rsa_verify_test, exor_test, rc4_test, rc4_stream_test, mod_exp_test },
 
     F = element(random:uniform(size(Funcs)),Funcs),
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index e2d6fd0b37..740c68d8fa 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 2.0.2.1
+CRYPTO_VSN = 2.0.2.2
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 3aa169a135..93e447848a 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index f132a50e0d..0dadf647c3 100755
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2010</year>
+      <year>2006</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/dialyzer/test/Makefile b/lib/dialyzer/test/Makefile
index a8549278a5..69a8fd742e 100644
--- a/lib/dialyzer/test/Makefile
+++ b/lib/dialyzer/test/Makefile
@@ -2,74 +2,33 @@ include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 # ----------------------------------------------------
-# Target Specs
+# Files
 # ----------------------------------------------------
 
-MODULES= \
-	callgraph_tests_SUITE \
-	opaque_tests_SUITE \
-	options1_tests_SUITE \
-	options2_tests_SUITE \
-	plt_tests_SUITE \
-	r9c_tests_SUITE \
-	race_tests_SUITE \
-	small_tests_SUITE \
-	user_tests_SUITE \
-	dialyzer_common\
-	file_utils
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-INSTALL_PROGS= $(TARGET_FILES)
+AUXILIARY_FILES=\
+	dialyzer.spec\
+	dialyzer_test_constants.hrl\
+	dialyzer_common.erl\
+	file_utils.erl\
+	plt_SUITE.erl
 
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/dialyzer_test
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
-
-EBIN = .
-
-EMAKEFILE=Emakefile
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-make_emakefile:
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
-	> $(EMAKEFILE)
-
-tests debug opt: make_emakefile
-	erl $(ERL_MAKE_FLAGS) -make
 
-clean:
-	rm -f $(EMAKEFILE)
-	rm -f $(TARGET_FILES) $(GEN_FILES)
-	rm -f core
-
-docs:
+RELSYSDIR = $(RELEASE_PATH)/dialyzer_test
 
 # ----------------------------------------------------
 # Release Target
 # ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_spec: opt
+include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_tests_spec: make_emakefile
+release_tests_spec:
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) dialyzer.spec dialyzer_test_constants.hrl $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
+	$(INSTALL_DATA) $(AUXILIARY_FILES) $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-
-release_docs_spec:
+	cd $(RELSYSDIR);\
+	erl -make;\
+	erl -noshell -run dialyzer_common create_all_suites -s erlang halt
diff --git a/lib/dialyzer/test/README b/lib/dialyzer/test/README
index 07340c7266..41f282a131 100644
--- a/lib/dialyzer/test/README
+++ b/lib/dialyzer/test/README
@@ -2,22 +2,18 @@
 To add test cases in any suite:
 -------------------------------
 
-  1) If the test requires dialyzer to analyze a single file place it in the
-     suite's 'src' directory. If analysis of more files is needed place them
-     all in a new directory in suite's 'src' directory.
+  1) If the test requires Dialyzer to analyze a single file (TEST.erl) place it
+     in the suite's 'src' directory. If analysis of more files is needed place
+     them all in a new directory (TEST) in suite's 'src' directory.
 
-  2) Create a file with the same name as the test (if single file, omit the
-     extension else directory name) containing the expected result in suite's
-     'result' directory.
-
-  3) Run './remake <suite>', where <suite> is the suite's name omitting 
-     "_tests_SUITE".
+  2) Create a file named TEST containing the expected result in suite's 'result'
+     directory.
 
 ----------------------
 To create a new suite:
 ----------------------
 
-  1) Create a directory with the suffix 'tests_SUITE_data'. The name should 
+  1) Create a directory with the suffix '_SUITE_data'. The name should
      describe the suite.
 
   2) In the suite's directory create subdirectories 'src' and 'results' as
@@ -28,17 +24,15 @@ To create a new suite:
 
         where:
 
-        List  = a list of dialyzer options. Common case will be something
+        List  = a list of Dialyzer options. Common case will be something
                 like [{warnings, Warnings}], where Warnings is a list of valid
                 '-W' prefixed dialyzer options without the 'W' prefix (e.g.
                 '-Wfoo' would be declared as [{warnings, [foo]}].
-        Limit = the amount of time each test case is allowed to run. Must be
-                bigger than the time it takes the most time-consuming test to
-                finish.
+        Limit = the amount of time (in minutes) each test case is allowed to
+                run. Must be greater than the time required to complete the most
+                time-consuming test in the suite.
      
      Any of these lines may be missing. Default options list is empty and
      default time limit is 1 minute.
 
   3) Add tests as described in previous section.
-
-  4) Add the resulting suite's name in the Makefile's MODULES variable.
diff --git a/lib/dialyzer/test/callgraph_tests_SUITE_data/dialyzer_options b/lib/dialyzer/test/callgraph_SUITE_data/dialyzer_options
index 50991c9bc5..50991c9bc5 100644
--- a/lib/dialyzer/test/callgraph_tests_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/callgraph_SUITE_data/dialyzer_options
diff --git a/lib/dialyzer/test/callgraph_tests_SUITE_data/results/test_missing_functions b/lib/dialyzer/test/callgraph_SUITE_data/results/test_missing_functions
index 4150bdb7c0..4150bdb7c0 100644
--- a/lib/dialyzer/test/callgraph_tests_SUITE_data/results/test_missing_functions
+++ b/lib/dialyzer/test/callgraph_SUITE_data/results/test_missing_functions
diff --git a/lib/dialyzer/test/callgraph_SUITE_data/src/test_missing_functions/t1.erl b/lib/dialyzer/test/callgraph_SUITE_data/src/test_missing_functions/t1.erl
new file mode 100644
index 0000000000..05ba9b0f93
--- /dev/null
+++ b/lib/dialyzer/test/callgraph_SUITE_data/src/test_missing_functions/t1.erl
@@ -0,0 +1,16 @@
+%%%-------------------------------------------------------------------
+%%% File    : t1.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created : 26 Jul 2006 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(t1).
+
+-export([t1/1, t2/1]).
+
+t1(X) ->
+  t2:t1(X).
+
+t2(X) ->
+  t2:t2(X).
diff --git a/lib/dialyzer/test/callgraph_SUITE_data/src/test_missing_functions/t2.erl b/lib/dialyzer/test/callgraph_SUITE_data/src/test_missing_functions/t2.erl
new file mode 100644
index 0000000000..bf940fd181
--- /dev/null
+++ b/lib/dialyzer/test/callgraph_SUITE_data/src/test_missing_functions/t2.erl
@@ -0,0 +1,16 @@
+%%%-------------------------------------------------------------------
+%%% File    : t2.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created : 26 Jul 2006 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(t2).
+
+-export([t1/1]).
+
+t1(X) ->
+  t1:t3(X) + t2(X).
+
+t2(X) ->
+  X + 1.
diff --git a/lib/dialyzer/test/callgraph_tests_SUITE.erl b/lib/dialyzer/test/callgraph_tests_SUITE.erl
deleted file mode 100644
index 6148adf971..0000000000
--- a/lib/dialyzer/test/callgraph_tests_SUITE.erl
+++ /dev/null
@@ -1,52 +0,0 @@
-%% ATTENTION!
-%% This is an automatically generated file. Do not edit.
-%% Use './remake' script to refresh it if needed.
-%% All Dialyzer options should be defined in dialyzer_options
-%% file.
-
--module(callgraph_tests_SUITE).
-
--include("ct.hrl").
--include("dialyzer_test_constants.hrl").
-
--export([suite/0, init_per_suite/0, init_per_suite/1,
-         end_per_suite/1, all/0]).
--export([callgraph_tests_SUITE_consistency/1, test_missing_functions/1]).
-
-suite() ->
-  [{timetrap, {minutes, 1}}].
-
-init_per_suite() ->
-  [{timetrap, ?plt_timeout}].
-init_per_suite(Config) ->
-  OutDir = ?config(priv_dir, Config),
-  case dialyzer_common:check_plt(OutDir) of
-    fail -> {skip, "Plt creation/check failed."};
-    ok -> [{dialyzer_options, []}|Config]
-  end.
-
-end_per_suite(_Config) ->
-  ok.
-
-all() ->
-  [callgraph_tests_SUITE_consistency,test_missing_functions].
-
-dialyze(Config, TestCase) ->
-  Opts = ?config(dialyzer_options, Config),
-  Dir = ?config(data_dir, Config),
-  OutDir = ?config(priv_dir, Config),
-  dialyzer_common:check(TestCase, Opts, Dir, OutDir).
-
-callgraph_tests_SUITE_consistency(Config) ->
-  Dir = ?config(data_dir, Config),
-  case dialyzer_common:new_tests(Dir, all()) of
-    []  -> ok;
-    New -> ct:fail({missing_tests,New})
-  end.
-
-test_missing_functions(Config) ->
-  case dialyze(Config, test_missing_functions) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
diff --git a/lib/dialyzer/test/callgraph_tests_SUITE_data/src/test_missing_functions/t1.erl b/lib/dialyzer/test/callgraph_tests_SUITE_data/src/test_missing_functions/t1.erl
deleted file mode 100644
index 3b320e1ed4..0000000000
--- a/lib/dialyzer/test/callgraph_tests_SUITE_data/src/test_missing_functions/t1.erl
+++ /dev/null
@@ -1,16 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : t1.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 26 Jul 2006 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(t1).
-
--export([t1/1, t2/1]).
-
-t1(X) ->
-  t2:t1(X).
-
-t2(X) ->
-  t2:t2(X).
diff --git a/lib/dialyzer/test/callgraph_tests_SUITE_data/src/test_missing_functions/t2.erl b/lib/dialyzer/test/callgraph_tests_SUITE_data/src/test_missing_functions/t2.erl
deleted file mode 100644
index 5ac8aa328c..0000000000
--- a/lib/dialyzer/test/callgraph_tests_SUITE_data/src/test_missing_functions/t2.erl
+++ /dev/null
@@ -1,16 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : t2.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 26 Jul 2006 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(t2).
-
--export([t1/1]).
-
-t1(X) ->
-  t1:t3(X) + t2(X).
-
-t2(X) ->
-  X + 1.
diff --git a/lib/dialyzer/test/dialyzer.spec b/lib/dialyzer/test/dialyzer.spec
index 7499dbad1e..497a502bb8 100644
--- a/lib/dialyzer/test/dialyzer.spec
+++ b/lib/dialyzer/test/dialyzer.spec
@@ -2,4 +2,4 @@
 
 {suites, tests, all}.
 
-{skip_cases, tests, small_tests_SUITE, cerl_hipeify, "Needs compiler in plt"}.
\ No newline at end of file
+{skip_cases, tests, small_SUITE, cerl_hipeify, "Needs compiler in plt"}.
diff --git a/lib/dialyzer/test/dialyzer_common.erl b/lib/dialyzer/test/dialyzer_common.erl
index 5577405483..51766a4604 100644
--- a/lib/dialyzer/test/dialyzer_common.erl
+++ b/lib/dialyzer/test/dialyzer_common.erl
@@ -7,13 +7,13 @@
 
 -module(dialyzer_common).
 
--export([check_plt/1, check/4, create_suite/1,
-	 create_all_suites/0, new_tests/2]).
+-export([check_plt/1, check/4, create_all_suites/0, new_tests/2]).
 
 -include_lib("kernel/include/file.hrl").
 
--define(suite_suffix, "_tests_SUITE").
+-define(suite_suffix, "_SUITE").
 -define(data_folder, "_data").
+-define(suite_data, ?suite_suffix ++ ?data_folder).
 -define(erlang_extension, ".erl").
 -define(output_file_mode, write).
 -define(dialyzer_option_file, "dialyzer_options").
@@ -209,7 +209,7 @@ get_suites(Dir) ->
 	{error, _} -> [];
 	{ok, Filenames} ->
 	    FullFilenames = [filename:join(Dir, F) || F <-Filenames ],
-	    Dirs = [suffix(filename:basename(F), "_tests_SUITE_data") ||
+	    Dirs = [suffix(filename:basename(F), ?suite_data) ||
 		       F <- FullFilenames,
 		       file_utils:file_type(F) =:= {ok, 'directory'}],
 	    [S || {yes, S} <- Dirs]
@@ -232,7 +232,7 @@ create_suite(SuiteName) ->
     generate_suite(SuiteName, OutputFile, OptionsFileN, InputDirN).
 
 generate_suite_dir_from_name(Cwd, SuiteName) ->
-    filename:join(Cwd, SuiteName ++ ?suite_suffix ++ ?data_folder).
+    filename:join(Cwd, SuiteName ++ ?suite_data).
 
 generate_suite_file(Cwd, SuiteName) ->
     OutputFilename =
@@ -305,7 +305,7 @@ write_header(#suite{suitename = SuiteName, outputfile = OutputFile,
 	      "%% All Dialyzer options should be defined in dialyzer_options\n"
 	      "%% file.\n\n"
 	      "-module(~s).\n\n"
-	      "-include(\"ct.hrl\").\n"
+	      "-include_lib(\"common_test/include/ct.hrl\").\n"
 	      "-include(\"dialyzer_test_constants.hrl\").\n\n"
 	      "-export([suite/0, init_per_suite/0, init_per_suite/1,\n"
 	      "         end_per_suite/1, all/0]).\n"
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/dialyzer_options b/lib/dialyzer/test/opaque_SUITE_data/dialyzer_options
index 3ff26b87db..3ff26b87db 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/opaque_SUITE_data/dialyzer_options
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/array b/lib/dialyzer/test/opaque_SUITE_data/results/array
index b05d088a03..b05d088a03 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/array
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/array
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/crash b/lib/dialyzer/test/opaque_SUITE_data/results/crash
index 6bdd934169..6bdd934169 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/crash
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/crash
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/dict b/lib/dialyzer/test/opaque_SUITE_data/results/dict
index 5c6bf6a927..5c6bf6a927 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/dict
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/dict
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/ets b/lib/dialyzer/test/opaque_SUITE_data/results/ets
index 5498ba1538..5498ba1538 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/ets
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/ets
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/ewgi b/lib/dialyzer/test/opaque_SUITE_data/results/ewgi
new file mode 100644
index 0000000000..3c8cfb59f8
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/ewgi
@@ -0,0 +1,4 @@
+
+ewgi_api.erl:55: The call gb_trees:to_list({non_neg_integer(),'nil' | {_,_,_,_}}) does not have an opaque term of type gb_tree() as 1st argument
+ewgi_testapp.erl:35: The call ewgi_testapp:htmlise_data("request_data",{non_neg_integer(),'nil' | {_,_,_,_}}) will never return since it differs in the 2nd argument from the success typing arguments: ([95 | 97 | 100 | 101 | 104 | 112 | 113 | 114 | 115 | 116 | 117,...],[{_,_}])
+ewgi_testapp.erl:43: The call gb_trees:to_list(T::{non_neg_integer(),'nil' | {_,_,_,_}}) does not have an opaque term of type gb_tree() as 1st argument
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/gb_sets b/lib/dialyzer/test/opaque_SUITE_data/results/gb_sets
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/gb_sets
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/gb_sets
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/inf_loop1 b/lib/dialyzer/test/opaque_SUITE_data/results/inf_loop1
index eb8f304905..eb8f304905 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/inf_loop1
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/inf_loop1
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/int b/lib/dialyzer/test/opaque_SUITE_data/results/int
index 3ee4def34b..3ee4def34b 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/int
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/int
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/mixed_opaque b/lib/dialyzer/test/opaque_SUITE_data/results/mixed_opaque
index ab850b613e..ab850b613e 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/mixed_opaque
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/mixed_opaque
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/my_digraph b/lib/dialyzer/test/opaque_SUITE_data/results/my_digraph
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/my_digraph
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/my_digraph
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/my_queue b/lib/dialyzer/test/opaque_SUITE_data/results/my_queue
index 2860b91084..2860b91084 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/my_queue
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/my_queue
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/opaque b/lib/dialyzer/test/opaque_SUITE_data/results/opaque
index ca76f57b54..ca76f57b54 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/opaque
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/opaque
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/queue b/lib/dialyzer/test/opaque_SUITE_data/results/queue
index 59ce33f098..59ce33f098 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/queue
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/queue
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/rec b/lib/dialyzer/test/opaque_SUITE_data/results/rec
index 72736b3b3c..72736b3b3c 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/rec
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/rec
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/timer b/lib/dialyzer/test/opaque_SUITE_data/results/timer
index e917b76b08..e917b76b08 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/timer
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/timer
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/union b/lib/dialyzer/test/opaque_SUITE_data/results/union
index 98829b424a..98829b424a 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/union
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/union
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/results/wings b/lib/dialyzer/test/opaque_SUITE_data/results/wings
index a9571441f8..a9571441f8 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/results/wings
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/wings
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/array/array_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/array/array_use.erl
index 1702dc8f03..1702dc8f03 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/array/array_use.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/array/array_use.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/crash/crash_1.erl b/lib/dialyzer/test/opaque_SUITE_data/src/crash/crash_1.erl
index eebeed15af..eebeed15af 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/crash/crash_1.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/crash/crash_1.erl
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/dict/dict_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/dict/dict_use.erl
new file mode 100644
index 0000000000..8a2cd86f43
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/dict/dict_use.erl
@@ -0,0 +1,82 @@
+-module(dict_use).
+
+-export([ok1/0, ok2/0, ok3/0, ok4/0, ok5/0, ok6/0]).
+-export([middle/0]).
+-export([w1/0, w2/0, w3/0, w4/1, w5/0, w6/0, w7/0, w8/1, w9/0]).
+
+-define(DICT, dict).
+
+%%---------------------------------------------------------------------
+%% Cases that are OK
+%%---------------------------------------------------------------------
+
+ok1() ->
+  dict:new().
+
+ok2() ->
+  case dict:new() of X -> X end.
+
+ok3() ->
+  Dict1 = dict:new(),
+  Dict2 = dict:new(),
+  Dict1 =:= Dict2.
+
+ok4() ->
+  dict:fetch(foo, dict:new()).
+
+ok5() ->  % this is OK since some_mod:new/0 might be returning a dict()
+  dict:fetch(foo, some_mod:new()).
+
+ok6() ->
+  dict:store(42, elli, dict:new()).
+
+middle() ->
+  {w1(), w2()}.
+
+%%---------------------------------------------------------------------
+%% Cases that are problematic w.r.t. opaqueness of types
+%%---------------------------------------------------------------------
+
+w1() ->
+  gazonk = dict:new().
+
+w2() ->
+  case dict:new() of
+    [] -> nil;
+    42 -> weird
+  end.
+
+w3() ->
+  try dict:new() of
+    [] -> nil;
+    42 -> weird
+  catch
+    _:_ -> exception
+  end.
+
+w4(Dict) when is_list(Dict) ->
+  Dict =:= dict:new();
+w4(Dict) when is_atom(Dict) ->
+  Dict =/= dict:new().
+
+w5() ->
+  case dict:new() of
+    D when length(D) =/= 42 -> weird;
+    D when is_atom(D) -> weirder;
+    D when is_list(D) -> gazonk
+  end.
+
+w6() ->
+  is_list(dict:new()).
+
+w7() ->
+  dict:fetch(foo, [1,2,3]).
+
+w8(Fun) ->
+  dict:merge(Fun, 42, [1,2]).
+
+w9() ->
+  dict:store(42, elli,
+	     {dict,0,16,16,8,80,48,
+	           {[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]},
+	           {{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}}}).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ets/ets_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/ets/ets_use.erl
new file mode 100644
index 0000000000..d65af0af4e
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ets/ets_use.erl
@@ -0,0 +1,16 @@
+-module(ets_use).
+-export([t1/0, t2/0]).
+
+t1() ->
+    case n() of
+	T when is_atom(T) -> atm;
+	T when is_integer(T) -> int
+    end.
+
+t2() ->
+    case n() of
+	T when is_integer(T) -> int;
+	T when is_atom(T) -> atm
+    end.
+
+n() -> ets:new(n, [named_table]).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi.hrl b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi.hrl
new file mode 100644
index 0000000000..0b98f550f1
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi.hrl
@@ -0,0 +1,240 @@
+-ifndef(_EWGI_HRL).
+-define(_EWGI_HRL, 1).
+
+% ``The contents of this file are subject to the Mozilla Public License
+% Version 1.1 (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.mozilla.org/MPL/
+%
+% 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.
+%
+% The Original Code is the EWGI reference implementation.
+%
+% The Initial Developer of the Original Code is S.G. Consulting
+% srl. Portions created by S.G. Consulting s.r.l. are Copyright (C)
+% 2007 S.G. Consulting srl. All Rights Reserved.
+%
+% Contributor(s): Filippo Pacini <[email protected]>
+%                 Hunter Morris <[email protected]>
+
+-define(DEFAULT_CHUNKSIZE, 4096).
+
+-type ewgi_propval() :: atom() | integer() | string() | binary().
+-type ewgi_prop() :: {ewgi_propval(), ewgi_propval()}.
+-type ewgi_proplist() :: [ewgi_prop()].
+
+%% @type bag() = gb_tree()
+-ifdef(HAS_GB_TREE_SPEC).
+-type bag() :: gb_tree().
+-else.
+-type bag() :: {non_neg_integer(), {any(), any(), any(), any()} | 'nil'}.
+-endif.
+
+%%% Note: Dialyzer currently doesn't support recursive types. When it does, this should change:
+%%%-type ewgi_ri_callback() :: fun(('eof' | {data, binary()}) -> iolist() | ewgi_ri_callback()).
+%% @type ewgi_ri_callback() = function()
+-type ewgi_ri_callback() :: fun(('eof' | {data, binary()}) -> iolist() | function()) | iolist().
+
+%% @type ewgi_read_input() = function()
+-type ewgi_read_input() :: fun((ewgi_ri_callback(), integer()) -> ewgi_ri_callback()).
+
+%% @type ewgi_write_error() = function()
+-type ewgi_write_error() :: fun((any()) -> 'ok').
+
+%% @type ewgi_version() = {integer(), integer()}
+-type ewgi_version() :: {integer(), integer()}.
+
+%% @type ewgi_spec() = {'ewgi_spec', function(), function(), string(),
+%%                      ewgi_version(), bag()}
+
+-type ewgi_spec() :: {'ewgi_spec', ewgi_read_input(),
+                      ewgi_write_error(), string(), ewgi_version(),
+                      bag()}.
+
+-define(IS_EWGI_SPEC(R), ((element(1, R) =:= 'ewgi_spec')
+                          and (size(R) =:= 6))).
+-define(GET_EWGI_READ_INPUT(R), element(2, R)).
+-define(SET_EWGI_READ_INPUT(A, R), setelement(2, R, A)).
+-define(GET_EWGI_WRITE_ERROR(R), element(3, R)).
+-define(SET_EWGI_WRITE_ERROR(A, R), setelement(3, R, A)).
+-define(GET_EWGI_URL_SCHEME(R), element(4, R)).
+-define(SET_EWGI_URL_SCHEME(A, R), setelement(4, R, A)).
+-define(GET_EWGI_VERSION(R), element(5, R)).
+-define(SET_EWGI_VERSION(A, R), setelement(5, R, A)).
+-define(GET_EWGI_DATA(R), element(6, R)).
+-define(SET_EWGI_DATA(A, R), setelement(6, R, A)).
+
+%% @type ewgi_header_val() = string() | 'undefined'
+-type ewgi_header_val() :: string() | 'undefined'.
+
+%% @type ewgi_header_key() = string()
+-type ewgi_header_key() :: string().
+
+%% @type ewgi_http_headers() = {'ewgi_http_headers',
+%%                              ewgi_header_val(),
+%%                              ewgi_header_val(),
+%%                              ewgi_header_val(),
+%%                              ewgi_header_val(),
+%%                              ewgi_header_val(),
+%%                              ewgi_header_val(),
+%%                              bag()}
+
+-type ewgi_http_headers() :: {'ewgi_http_headers', ewgi_header_val(),
+                              ewgi_header_val(), ewgi_header_val(),
+                              ewgi_header_val(), ewgi_header_val(),
+                              ewgi_header_val(), bag()}.
+
+-define(IS_HTTP_HEADERS(R), ((element(1, R) =:= 'ewgi_http_headers')
+                             and (size(R) =:= 8))).
+-define(GET_HTTP_ACCEPT(R), element(2, R)).
+-define(SET_HTTP_ACCEPT(A, R), setelement(2, R, A)).
+-define(GET_HTTP_COOKIE(R), element(3, R)).
+-define(SET_HTTP_COOKIE(A, R), setelement(3, R, A)).
+-define(GET_HTTP_HOST(R), element(4, R)).
+-define(SET_HTTP_HOST(A, R), setelement(4, R, A)).
+-define(GET_HTTP_IF_MODIFIED_SINCE(R), element(5, R)).
+-define(SET_HTTP_IF_MODIFIED_SINCE(A, R), setelement(5, R, A)).
+-define(GET_HTTP_USER_AGENT(R), element(6, R)).
+-define(SET_HTTP_USER_AGENT(A, R), setelement(6, R, A)).
+-define(GET_HTTP_X_HTTP_METHOD_OVERRIDE(R), element(7, R)).
+-define(SET_HTTP_X_HTTP_METHOD_OVERRIDE(A, R), setelement(7, R, A)).
+-define(GET_HTTP_OTHER(R), element(8, R)).
+-define(SET_HTTP_OTHER(A, R), setelement(8, R, A)).
+
+%% @type ewgi_request_method() = 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' |
+%%       'DELETE' | 'TRACE' | 'CONNECT' | string()
+-type ewgi_request_method() :: 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' |
+                               'DELETE' | 'TRACE' | 'CONNECT' | string().
+
+%% @type ewgi_val() = string() | 'undefined'
+-type ewgi_val() :: string() | 'undefined'.
+
+%% @type ewgi_request() :: {'ewgi_request', ewgi_val(), integer(), ewgi_val(),
+%%                          ewgi_spec(), ewgi_val(), ewgi_http_headers(),
+%%                          ewgi_val(), ewgi_val(), ewgi_val(), ewgi_val(),
+%%                          ewgi_val(), ewgi_val(), ewgi_val(), ewgi_val(),
+%%                          ewgi_request_method(), ewgi_val(), ewgi_val(),
+%%                          ewgi_val(), ewgi_val(), ewgi_val()}
+
+-type ewgi_request() :: {'ewgi_request', ewgi_val(),
+                         non_neg_integer(), ewgi_val(), ewgi_spec(),
+                         ewgi_val(), ewgi_http_headers(), ewgi_val(),
+                         ewgi_val(), ewgi_val(), ewgi_val(),
+                         ewgi_val(), ewgi_val(), ewgi_val(),
+                         ewgi_val(), ewgi_request_method(),
+                         ewgi_val(), ewgi_val(), ewgi_val(),
+                         ewgi_val(), ewgi_val()}.
+
+-define(IS_EWGI_REQUEST(R), ((element(1, R) =:= 'ewgi_request')
+                             and (size(R) =:= 21))).
+-define(GET_AUTH_TYPE(R), element(2, R)).
+-define(SET_AUTH_TYPE(A, R), setelement(2, R, A)).
+-define(GET_CONTENT_LENGTH(R), element(3, R)).
+-define(SET_CONTENT_LENGTH(A, R), setelement(3, R, A)).
+-define(GET_CONTENT_TYPE(R), element(4, R)).
+-define(SET_CONTENT_TYPE(A, R), setelement(4, R, A)).
+-define(GET_EWGI(R), element(5, R)).
+-define(SET_EWGI(A, R), setelement(5, R, A)).
+-define(GET_GATEWAY_INTERFACE(R), element(6, R)).
+-define(SET_GATEWAY_INTERFACE(A, R), setelement(6, R, A)).
+-define(GET_HTTP_HEADERS(R), element(7, R)).
+-define(SET_HTTP_HEADERS(A, R), setelement(7, R, A)).
+-define(GET_PATH_INFO(R), element(8, R)).
+-define(SET_PATH_INFO(A, R), setelement(8, R, A)).
+-define(GET_PATH_TRANSLATED(R), element(9, R)).
+-define(SET_PATH_TRANSLATED(A, R), setelement(9, R, A)).
+-define(GET_QUERY_STRING(R), element(10, R)).
+-define(SET_QUERY_STRING(A, R), setelement(10, R, A)).
+-define(GET_REMOTE_ADDR(R), element(11, R)).
+-define(SET_REMOTE_ADDR(A, R), setelement(11, R, A)).
+-define(GET_REMOTE_HOST(R), element(12, R)).
+-define(SET_REMOTE_HOST(A, R), setelement(12, R, A)).
+-define(GET_REMOTE_IDENT(R), element(13, R)).
+-define(SET_REMOTE_IDENT(A, R), setelement(13, R, A)).
+-define(GET_REMOTE_USER(R), element(14, R)).
+-define(SET_REMOTE_USER(A, R), setelement(14, R, A)).
+-define(GET_REMOTE_USER_DATA(R), element(15, R)).
+-define(SET_REMOTE_USER_DATA(A, R), setelement(15, R, A)).
+-define(GET_REQUEST_METHOD(R), element(16, R)).
+-define(SET_REQUEST_METHOD(A, R), setelement(16, R, A)).
+-define(GET_SCRIPT_NAME(R), element(17, R)).
+-define(SET_SCRIPT_NAME(A, R), setelement(17, R, A)).
+-define(GET_SERVER_NAME(R), element(18, R)).
+-define(SET_SERVER_NAME(A, R), setelement(18, R, A)).
+-define(GET_SERVER_PORT(R), element(19, R)).
+-define(SET_SERVER_PORT(A, R), setelement(19, R, A)).
+-define(GET_SERVER_PROTOCOL(R), element(20, R)).
+-define(SET_SERVER_PROTOCOL(A, R), setelement(20, R, A)).
+-define(GET_SERVER_SOFTWARE(R), element(21, R)).
+-define(SET_SERVER_SOFTWARE(A, R), setelement(21, R, A)).
+
+%%% Note: Dialyzer currently doesn't support recursive types. When it does, this should change:
+%%%-type stream() :: fun(() -> {} | {any(), stream()}).
+%% @type stream() = function()
+-type stream() :: fun(() -> {} | {any(), function()}).
+
+%% @type ewgi_status() = {integer(), string()}
+-type ewgi_status() :: {integer(), string()}.
+
+%% @type ewgi_message_body() = binary() | iolist() | stream()
+-type ewgi_message_body() :: binary() | iolist() | stream().
+
+%% @type ewgi_header_list() = [{ewgi_header_key(), ewgi_header_val()}]
+-type ewgi_header_list() :: [{ewgi_header_key(), ewgi_header_val()}].
+
+%% @type ewgi_response() = {'ewgi_response', ewgi_status(),
+%%                          [{ewgi_header_key(), ewgi_header_val()}],
+%%                           ewgi_message_body(), any()}
+
+-type ewgi_response() :: {'ewgi_response', ewgi_status(), ewgi_header_list(), ewgi_message_body(), any()}.
+
+-define(IS_EWGI_RESPONSE(R), ((element(1, R) =:= 'ewgi_response')
+                              and (size(R) =:= 5))).
+-define(GET_RESPONSE_STATUS(R), element(2, R)).
+-define(SET_RESPONSE_STATUS(A, R), setelement(2, R, A)).
+-define(GET_RESPONSE_HEADERS(R), element(3, R)).
+-define(SET_RESPONSE_HEADERS(A, R), setelement(3, R, A)).
+-define(GET_RESPONSE_MESSAGE_BODY(R), element(4, R)).
+-define(SET_RESPONSE_MESSAGE_BODY(A, R), setelement(4, R, A)).
+-define(GET_RESPONSE_ERROR(R), element(5, R)).
+-define(SET_RESPONSE_ERROR(A, R), setelement(5, R, A)).
+
+%% @type ewgi_context() = {'ewgi_context', ewgi_request(), ewgi_response()}
+
+-type ewgi_context() :: {'ewgi_context', ewgi_request(), ewgi_response()}.
+
+-define(IS_EWGI_CONTEXT(R), ((element(1, R) =:= 'ewgi_context')
+                             and ?IS_EWGI_REQUEST(element(2, R))
+                             and ?IS_EWGI_RESPONSE(element(3, R))
+                             and (size(R) =:= 3))).
+-define(GET_EWGI_REQUEST(R), element(2, R)).
+-define(SET_EWGI_REQUEST(A, R), setelement(2, R, A)).
+-define(GET_EWGI_RESPONSE(R), element(3, R)).
+-define(SET_EWGI_RESPONSE(A, R), setelement(3, R, A)).
+
+%% @type ewgi_app() = function()
+-type ewgi_app() :: fun((ewgi_context()) -> ewgi_context()).
+
+-ifndef(debug).
+-define(INSPECT_EWGI_RESPONSE(Ctx), Ctx).
+-else.
+-define(INSPECT_EWGI_RESPONSE(Ctx),
+	begin
+	    error_logger:info_msg("Inpecting the final ewgi_response()...~n"
+				  "Requested Url: ~p~n"
+				  "Status: ~p~n"
+				  "Headers: ~p~n"
+				  "Body: ~p~n",
+				  [ewgi_api:path_info(Ctx),
+				   ewgi_api:response_status(Ctx),
+				   ewgi_api:response_headers(Ctx),
+				   ewgi_api:response_message_body(Ctx)]),
+	    Ctx
+	end
+       ).
+-endif.
+
+-endif.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi_api.erl b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi_api.erl
new file mode 100644
index 0000000000..60da757d3b
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi_api.erl
@@ -0,0 +1,65 @@
+%%%-------------------------------------------------------------------
+%%% File    : ewgi_api.erl
+%%% Authors : Filippo Pacini <[email protected]>
+%%%           Hunter Morris <[email protected]>
+%%% License :
+%%% The contents of this file are subject to the Mozilla Public
+%%% License Version 1.1 (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.mozilla.org/MPL/
+%%%
+%%% 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.
+%%% The Initial Developer of the Original Code is S.G. Consulting
+%%% srl. Portions created by S.G. Consulting s.r.l. are Copyright (C)
+%%% 2007 S.G. Consulting srl. All Rights Reserved.
+%%%
+%%% @doc
+%%% <p>ewgi API. Defines a low level CGI like API.</p>
+%%%
+%%% @end
+%%%
+%%% Created : 10 Oct 2007 by Filippo Pacini <[email protected]>
+%%%-------------------------------------------------------------------
+-module(ewgi_api).
+
+-include_lib("ewgi.hrl").
+
+-export([get_all_headers/1, get_all_data/1]).
+
+-spec request(ewgi_context()) -> ewgi_request().
+request(Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    ?GET_EWGI_REQUEST(Ctx).
+
+-spec headers(ewgi_context()) -> ewgi_http_headers().
+headers(Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    ?GET_HTTP_HEADERS(request(Ctx)).
+
+get_header_value(Hdr0, Ctx) when is_list(Hdr0), ?IS_EWGI_CONTEXT(Ctx) ->
+    Hdr = string:to_lower(Hdr0),
+    get_header1(Hdr, Ctx).
+
+get_header1("accept", Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    ?GET_HTTP_ACCEPT(headers(Ctx)).
+
+unzip_header_value([{_,_}|_]=V) ->
+	{_, V1} = lists:unzip(V),
+	string:join(V1, ", ");
+unzip_header_value(V) ->
+	V.
+
+get_all_headers(Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    H = headers(Ctx),
+    Other = gb_trees:to_list(?GET_HTTP_OTHER(H)),
+    Acc = [{K, unzip_header_value(V)} || {K, V} <- Other],
+    L = [{"accept", get_header_value("accept", Ctx)}|Acc],
+    lists:filter(fun({_, undefined}) -> false; (_) -> true end, L).
+
+-spec ewgi_spec(ewgi_context()) -> ewgi_spec().
+ewgi_spec(Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    ?GET_EWGI(request(Ctx)).
+
+get_all_data(Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    ?GET_EWGI_DATA(ewgi_spec(Ctx)).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi_testapp.erl b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi_testapp.erl
new file mode 100644
index 0000000000..59c1ae9206
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi_testapp.erl
@@ -0,0 +1,46 @@
+%%%-------------------------------------------------------------------
+%%% File    : ewgi_testapp.erl
+%%% Authors : Hunter Morris <[email protected]>
+%%% License :
+%%% The contents of this file are subject to the Mozilla Public
+%%% License Version 1.1 (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.mozilla.org/MPL/
+%%%
+%%% 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.
+%%% The Initial Developer of the Original Code is S.G. Consulting
+%%% srl. Portions created by S.G. Consulting s.r.l. are Copyright (C)
+%%% 2007 S.G. Consulting srl. All Rights Reserved.
+%%%
+%%% @doc
+%%% <p>ewgi test applications</p>
+%%%
+%%% @end
+%%%
+%%% Created : 05 July 2009 by Hunter Morris <[email protected]>
+%%%-------------------------------------------------------------------
+-module(ewgi_testapp).
+
+-export([htmlise/1]).
+
+-include_lib("ewgi.hrl").
+
+htmlise(C) ->
+    iolist_to_binary(
+      ["<dl class=\"request\">",
+       io_lib:format("<dt>other http headers</dt><dd>~s</dd>", [htmlise_data("http_headers", ewgi_api:get_all_headers(C))]),
+       io_lib:format("<dt>ewgi extra data</dt><dd>~s</dd>", [htmlise_data("request_data", ewgi_api:get_all_data(C))]),
+       "</dl>"]).
+
+htmlise_data(Name, L) when is_list(L) ->
+    ["<dl class=\"", Name, "\">",
+     [io_lib:format("<dt>~s</dt><dd><pre>~p</pre><dd>", [K, V]) || {K, V} <- L],
+     "</dl>"];
+htmlise_data(Name, T) ->
+    case gb_trees:to_list(T) of
+        [] -> [];
+        L -> htmlise_data(Name, L)
+    end.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi.hrl b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi.hrl
new file mode 100644
index 0000000000..5da8ff0ecf
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi.hrl
@@ -0,0 +1,241 @@
+-ifndef(_EWGI_HRL).
+-define(_EWGI_HRL, 1).
+
+% ``The contents of this file are subject to the Mozilla Public License
+% Version 1.1 (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.mozilla.org/MPL/
+%
+% 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.
+%
+% The Original Code is the EWGI reference implementation.
+%
+% The Initial Developer of the Original Code is S.G. Consulting
+% srl. Portions created by S.G. Consulting s.r.l. are Copyright (C)
+% 2007 S.G. Consulting srl. All Rights Reserved.
+%
+% Contributor(s): Filippo Pacini <[email protected]>
+%                 Hunter Morris <[email protected]>
+
+-define(DEFAULT_CHUNKSIZE, 4096).
+-define(HAS_GB_TREE_SPEC, true).
+
+-type ewgi_propval() :: atom() | integer() | string() | binary().
+-type ewgi_prop() :: {ewgi_propval(), ewgi_propval()}.
+-type ewgi_proplist() :: [ewgi_prop()].
+
+%% @type bag() = gb_tree()
+-ifdef(HAS_GB_TREE_SPEC).
+-type bag() :: gb_tree().
+-else.
+-type bag() :: {non_neg_integer(), {any(), any(), any(), any()} | 'nil'}.
+-endif.
+
+%%% Note: Dialyzer currently doesn't support recursive types. When it does, this should change:
+%%%-type ewgi_ri_callback() :: fun(('eof' | {data, binary()}) -> iolist() | ewgi_ri_callback()).
+%% @type ewgi_ri_callback() = function()
+-type ewgi_ri_callback() :: fun(('eof' | {data, binary()}) -> iolist() | function()) | iolist().
+
+%% @type ewgi_read_input() = function()
+-type ewgi_read_input() :: fun((ewgi_ri_callback(), integer()) -> ewgi_ri_callback()).
+
+%% @type ewgi_write_error() = function()
+-type ewgi_write_error() :: fun((any()) -> 'ok').
+
+%% @type ewgi_version() = {integer(), integer()}
+-type ewgi_version() :: {integer(), integer()}.
+
+%% @type ewgi_spec() = {'ewgi_spec', function(), function(), string(),
+%%                      ewgi_version(), bag()}
+
+-type ewgi_spec() :: {'ewgi_spec', ewgi_read_input(),
+                      ewgi_write_error(), string(), ewgi_version(),
+                      bag()}.
+
+-define(IS_EWGI_SPEC(R), ((element(1, R) =:= 'ewgi_spec')
+                          and (size(R) =:= 6))).
+-define(GET_EWGI_READ_INPUT(R), element(2, R)).
+-define(SET_EWGI_READ_INPUT(A, R), setelement(2, R, A)).
+-define(GET_EWGI_WRITE_ERROR(R), element(3, R)).
+-define(SET_EWGI_WRITE_ERROR(A, R), setelement(3, R, A)).
+-define(GET_EWGI_URL_SCHEME(R), element(4, R)).
+-define(SET_EWGI_URL_SCHEME(A, R), setelement(4, R, A)).
+-define(GET_EWGI_VERSION(R), element(5, R)).
+-define(SET_EWGI_VERSION(A, R), setelement(5, R, A)).
+-define(GET_EWGI_DATA(R), element(6, R)).
+-define(SET_EWGI_DATA(A, R), setelement(6, R, A)).
+
+%% @type ewgi_header_val() = string() | 'undefined'
+-type ewgi_header_val() :: string() | 'undefined'.
+
+%% @type ewgi_header_key() = string()
+-type ewgi_header_key() :: string().
+
+%% @type ewgi_http_headers() = {'ewgi_http_headers',
+%%                              ewgi_header_val(),
+%%                              ewgi_header_val(),
+%%                              ewgi_header_val(),
+%%                              ewgi_header_val(),
+%%                              ewgi_header_val(),
+%%                              ewgi_header_val(),
+%%                              bag()}
+
+-type ewgi_http_headers() :: {'ewgi_http_headers', ewgi_header_val(),
+                              ewgi_header_val(), ewgi_header_val(),
+                              ewgi_header_val(), ewgi_header_val(),
+                              ewgi_header_val(), bag()}.
+
+-define(IS_HTTP_HEADERS(R), ((element(1, R) =:= 'ewgi_http_headers')
+                             and (size(R) =:= 8))).
+-define(GET_HTTP_ACCEPT(R), element(2, R)).
+-define(SET_HTTP_ACCEPT(A, R), setelement(2, R, A)).
+-define(GET_HTTP_COOKIE(R), element(3, R)).
+-define(SET_HTTP_COOKIE(A, R), setelement(3, R, A)).
+-define(GET_HTTP_HOST(R), element(4, R)).
+-define(SET_HTTP_HOST(A, R), setelement(4, R, A)).
+-define(GET_HTTP_IF_MODIFIED_SINCE(R), element(5, R)).
+-define(SET_HTTP_IF_MODIFIED_SINCE(A, R), setelement(5, R, A)).
+-define(GET_HTTP_USER_AGENT(R), element(6, R)).
+-define(SET_HTTP_USER_AGENT(A, R), setelement(6, R, A)).
+-define(GET_HTTP_X_HTTP_METHOD_OVERRIDE(R), element(7, R)).
+-define(SET_HTTP_X_HTTP_METHOD_OVERRIDE(A, R), setelement(7, R, A)).
+-define(GET_HTTP_OTHER(R), element(8, R)).
+-define(SET_HTTP_OTHER(A, R), setelement(8, R, A)).
+
+%% @type ewgi_request_method() = 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' |
+%%       'DELETE' | 'TRACE' | 'CONNECT' | string()
+-type ewgi_request_method() :: 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' |
+                               'DELETE' | 'TRACE' | 'CONNECT' | string().
+
+%% @type ewgi_val() = string() | 'undefined'
+-type ewgi_val() :: string() | 'undefined'.
+
+%% @type ewgi_request() :: {'ewgi_request', ewgi_val(), integer(), ewgi_val(),
+%%                          ewgi_spec(), ewgi_val(), ewgi_http_headers(),
+%%                          ewgi_val(), ewgi_val(), ewgi_val(), ewgi_val(),
+%%                          ewgi_val(), ewgi_val(), ewgi_val(), ewgi_val(),
+%%                          ewgi_request_method(), ewgi_val(), ewgi_val(),
+%%                          ewgi_val(), ewgi_val(), ewgi_val()}
+
+-type ewgi_request() :: {'ewgi_request', ewgi_val(),
+                         non_neg_integer(), ewgi_val(), ewgi_spec(),
+                         ewgi_val(), ewgi_http_headers(), ewgi_val(),
+                         ewgi_val(), ewgi_val(), ewgi_val(),
+                         ewgi_val(), ewgi_val(), ewgi_val(),
+                         ewgi_val(), ewgi_request_method(),
+                         ewgi_val(), ewgi_val(), ewgi_val(),
+                         ewgi_val(), ewgi_val()}.
+
+-define(IS_EWGI_REQUEST(R), ((element(1, R) =:= 'ewgi_request')
+                             and (size(R) =:= 21))).
+-define(GET_AUTH_TYPE(R), element(2, R)).
+-define(SET_AUTH_TYPE(A, R), setelement(2, R, A)).
+-define(GET_CONTENT_LENGTH(R), element(3, R)).
+-define(SET_CONTENT_LENGTH(A, R), setelement(3, R, A)).
+-define(GET_CONTENT_TYPE(R), element(4, R)).
+-define(SET_CONTENT_TYPE(A, R), setelement(4, R, A)).
+-define(GET_EWGI(R), element(5, R)).
+-define(SET_EWGI(A, R), setelement(5, R, A)).
+-define(GET_GATEWAY_INTERFACE(R), element(6, R)).
+-define(SET_GATEWAY_INTERFACE(A, R), setelement(6, R, A)).
+-define(GET_HTTP_HEADERS(R), element(7, R)).
+-define(SET_HTTP_HEADERS(A, R), setelement(7, R, A)).
+-define(GET_PATH_INFO(R), element(8, R)).
+-define(SET_PATH_INFO(A, R), setelement(8, R, A)).
+-define(GET_PATH_TRANSLATED(R), element(9, R)).
+-define(SET_PATH_TRANSLATED(A, R), setelement(9, R, A)).
+-define(GET_QUERY_STRING(R), element(10, R)).
+-define(SET_QUERY_STRING(A, R), setelement(10, R, A)).
+-define(GET_REMOTE_ADDR(R), element(11, R)).
+-define(SET_REMOTE_ADDR(A, R), setelement(11, R, A)).
+-define(GET_REMOTE_HOST(R), element(12, R)).
+-define(SET_REMOTE_HOST(A, R), setelement(12, R, A)).
+-define(GET_REMOTE_IDENT(R), element(13, R)).
+-define(SET_REMOTE_IDENT(A, R), setelement(13, R, A)).
+-define(GET_REMOTE_USER(R), element(14, R)).
+-define(SET_REMOTE_USER(A, R), setelement(14, R, A)).
+-define(GET_REMOTE_USER_DATA(R), element(15, R)).
+-define(SET_REMOTE_USER_DATA(A, R), setelement(15, R, A)).
+-define(GET_REQUEST_METHOD(R), element(16, R)).
+-define(SET_REQUEST_METHOD(A, R), setelement(16, R, A)).
+-define(GET_SCRIPT_NAME(R), element(17, R)).
+-define(SET_SCRIPT_NAME(A, R), setelement(17, R, A)).
+-define(GET_SERVER_NAME(R), element(18, R)).
+-define(SET_SERVER_NAME(A, R), setelement(18, R, A)).
+-define(GET_SERVER_PORT(R), element(19, R)).
+-define(SET_SERVER_PORT(A, R), setelement(19, R, A)).
+-define(GET_SERVER_PROTOCOL(R), element(20, R)).
+-define(SET_SERVER_PROTOCOL(A, R), setelement(20, R, A)).
+-define(GET_SERVER_SOFTWARE(R), element(21, R)).
+-define(SET_SERVER_SOFTWARE(A, R), setelement(21, R, A)).
+
+%%% Note: Dialyzer currently doesn't support recursive types. When it does, this should change:
+%%%-type stream() :: fun(() -> {} | {any(), stream()}).
+%% @type stream() = function()
+-type stream() :: fun(() -> {} | {any(), function()}).
+
+%% @type ewgi_status() = {integer(), string()}
+-type ewgi_status() :: {integer(), string()}.
+
+%% @type ewgi_message_body() = binary() | iolist() | stream()
+-type ewgi_message_body() :: binary() | iolist() | stream().
+
+%% @type ewgi_header_list() = [{ewgi_header_key(), ewgi_header_val()}]
+-type ewgi_header_list() :: [{ewgi_header_key(), ewgi_header_val()}].
+
+%% @type ewgi_response() = {'ewgi_response', ewgi_status(),
+%%                          [{ewgi_header_key(), ewgi_header_val()}],
+%%                           ewgi_message_body(), any()}
+
+-type ewgi_response() :: {'ewgi_response', ewgi_status(), ewgi_header_list(), ewgi_message_body(), any()}.
+
+-define(IS_EWGI_RESPONSE(R), ((element(1, R) =:= 'ewgi_response')
+                              and (size(R) =:= 5))).
+-define(GET_RESPONSE_STATUS(R), element(2, R)).
+-define(SET_RESPONSE_STATUS(A, R), setelement(2, R, A)).
+-define(GET_RESPONSE_HEADERS(R), element(3, R)).
+-define(SET_RESPONSE_HEADERS(A, R), setelement(3, R, A)).
+-define(GET_RESPONSE_MESSAGE_BODY(R), element(4, R)).
+-define(SET_RESPONSE_MESSAGE_BODY(A, R), setelement(4, R, A)).
+-define(GET_RESPONSE_ERROR(R), element(5, R)).
+-define(SET_RESPONSE_ERROR(A, R), setelement(5, R, A)).
+
+%% @type ewgi_context() = {'ewgi_context', ewgi_request(), ewgi_response()}
+
+-type ewgi_context() :: {'ewgi_context', ewgi_request(), ewgi_response()}.
+
+-define(IS_EWGI_CONTEXT(R), ((element(1, R) =:= 'ewgi_context')
+                             and ?IS_EWGI_REQUEST(element(2, R))
+                             and ?IS_EWGI_RESPONSE(element(3, R))
+                             and (size(R) =:= 3))).
+-define(GET_EWGI_REQUEST(R), element(2, R)).
+-define(SET_EWGI_REQUEST(A, R), setelement(2, R, A)).
+-define(GET_EWGI_RESPONSE(R), element(3, R)).
+-define(SET_EWGI_RESPONSE(A, R), setelement(3, R, A)).
+
+%% @type ewgi_app() = function()
+-type ewgi_app() :: fun((ewgi_context()) -> ewgi_context()).
+
+-ifndef(debug).
+-define(INSPECT_EWGI_RESPONSE(Ctx), Ctx).
+-else.
+-define(INSPECT_EWGI_RESPONSE(Ctx),
+	begin
+	    error_logger:info_msg("Inpecting the final ewgi_response()...~n"
+				  "Requested Url: ~p~n"
+				  "Status: ~p~n"
+				  "Headers: ~p~n"
+				  "Body: ~p~n",
+				  [ewgi_api:path_info(Ctx),
+				   ewgi_api:response_status(Ctx),
+				   ewgi_api:response_headers(Ctx),
+				   ewgi_api:response_message_body(Ctx)]),
+	    Ctx
+	end
+       ).
+-endif.
+
+-endif.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi_api.erl b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi_api.erl
new file mode 100644
index 0000000000..60da757d3b
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi_api.erl
@@ -0,0 +1,65 @@
+%%%-------------------------------------------------------------------
+%%% File    : ewgi_api.erl
+%%% Authors : Filippo Pacini <[email protected]>
+%%%           Hunter Morris <[email protected]>
+%%% License :
+%%% The contents of this file are subject to the Mozilla Public
+%%% License Version 1.1 (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.mozilla.org/MPL/
+%%%
+%%% 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.
+%%% The Initial Developer of the Original Code is S.G. Consulting
+%%% srl. Portions created by S.G. Consulting s.r.l. are Copyright (C)
+%%% 2007 S.G. Consulting srl. All Rights Reserved.
+%%%
+%%% @doc
+%%% <p>ewgi API. Defines a low level CGI like API.</p>
+%%%
+%%% @end
+%%%
+%%% Created : 10 Oct 2007 by Filippo Pacini <[email protected]>
+%%%-------------------------------------------------------------------
+-module(ewgi_api).
+
+-include_lib("ewgi.hrl").
+
+-export([get_all_headers/1, get_all_data/1]).
+
+-spec request(ewgi_context()) -> ewgi_request().
+request(Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    ?GET_EWGI_REQUEST(Ctx).
+
+-spec headers(ewgi_context()) -> ewgi_http_headers().
+headers(Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    ?GET_HTTP_HEADERS(request(Ctx)).
+
+get_header_value(Hdr0, Ctx) when is_list(Hdr0), ?IS_EWGI_CONTEXT(Ctx) ->
+    Hdr = string:to_lower(Hdr0),
+    get_header1(Hdr, Ctx).
+
+get_header1("accept", Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    ?GET_HTTP_ACCEPT(headers(Ctx)).
+
+unzip_header_value([{_,_}|_]=V) ->
+	{_, V1} = lists:unzip(V),
+	string:join(V1, ", ");
+unzip_header_value(V) ->
+	V.
+
+get_all_headers(Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    H = headers(Ctx),
+    Other = gb_trees:to_list(?GET_HTTP_OTHER(H)),
+    Acc = [{K, unzip_header_value(V)} || {K, V} <- Other],
+    L = [{"accept", get_header_value("accept", Ctx)}|Acc],
+    lists:filter(fun({_, undefined}) -> false; (_) -> true end, L).
+
+-spec ewgi_spec(ewgi_context()) -> ewgi_spec().
+ewgi_spec(Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    ?GET_EWGI(request(Ctx)).
+
+get_all_data(Ctx) when ?IS_EWGI_CONTEXT(Ctx) ->
+    ?GET_EWGI_DATA(ewgi_spec(Ctx)).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi_testapp.erl b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi_testapp.erl
new file mode 100644
index 0000000000..59c1ae9206
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi_testapp.erl
@@ -0,0 +1,46 @@
+%%%-------------------------------------------------------------------
+%%% File    : ewgi_testapp.erl
+%%% Authors : Hunter Morris <[email protected]>
+%%% License :
+%%% The contents of this file are subject to the Mozilla Public
+%%% License Version 1.1 (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.mozilla.org/MPL/
+%%%
+%%% 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.
+%%% The Initial Developer of the Original Code is S.G. Consulting
+%%% srl. Portions created by S.G. Consulting s.r.l. are Copyright (C)
+%%% 2007 S.G. Consulting srl. All Rights Reserved.
+%%%
+%%% @doc
+%%% <p>ewgi test applications</p>
+%%%
+%%% @end
+%%%
+%%% Created : 05 July 2009 by Hunter Morris <[email protected]>
+%%%-------------------------------------------------------------------
+-module(ewgi_testapp).
+
+-export([htmlise/1]).
+
+-include_lib("ewgi.hrl").
+
+htmlise(C) ->
+    iolist_to_binary(
+      ["<dl class=\"request\">",
+       io_lib:format("<dt>other http headers</dt><dd>~s</dd>", [htmlise_data("http_headers", ewgi_api:get_all_headers(C))]),
+       io_lib:format("<dt>ewgi extra data</dt><dd>~s</dd>", [htmlise_data("request_data", ewgi_api:get_all_data(C))]),
+       "</dl>"]).
+
+htmlise_data(Name, L) when is_list(L) ->
+    ["<dl class=\"", Name, "\">",
+     [io_lib:format("<dt>~s</dt><dd><pre>~p</pre><dd>", [K, V]) || {K, V} <- L],
+     "</dl>"];
+htmlise_data(Name, T) ->
+    case gb_trees:to_list(T) of
+        [] -> [];
+        L -> htmlise_data(Name, L)
+    end.
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/gb_sets/gb_sets_rec.erl b/lib/dialyzer/test/opaque_SUITE_data/src/gb_sets/gb_sets_rec.erl
index 008b0a486a..008b0a486a 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/gb_sets/gb_sets_rec.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/gb_sets/gb_sets_rec.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/inf_loop1.erl b/lib/dialyzer/test/opaque_SUITE_data/src/inf_loop1.erl
index 0dff16cf14..0dff16cf14 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/inf_loop1.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/inf_loop1.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/int/int_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/int/int_adt.erl
index 99f8cbdc4a..99f8cbdc4a 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/int/int_adt.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/int/int_adt.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/int/int_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/int/int_use.erl
index b4471e1cee..b4471e1cee 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/int/int_use.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/int/int_use.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/mixed_opaque/mixed_opaque_queue_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/mixed_opaque/mixed_opaque_queue_adt.erl
index ac59f19cd3..ac59f19cd3 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/mixed_opaque/mixed_opaque_queue_adt.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/mixed_opaque/mixed_opaque_queue_adt.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/mixed_opaque/mixed_opaque_rec_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/mixed_opaque/mixed_opaque_rec_adt.erl
index 61bae5110d..61bae5110d 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/mixed_opaque/mixed_opaque_rec_adt.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/mixed_opaque/mixed_opaque_rec_adt.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/mixed_opaque/mixed_opaque_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/mixed_opaque/mixed_opaque_use.erl
index e82dcd5f38..e82dcd5f38 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/mixed_opaque/mixed_opaque_use.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/mixed_opaque/mixed_opaque_use.erl
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/my_digraph/my_digraph_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/my_digraph/my_digraph_adt.erl
new file mode 100644
index 0000000000..82159d6a8d
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/my_digraph/my_digraph_adt.erl
@@ -0,0 +1,51 @@
+-module(my_digraph_adt).
+
+-export([new/0, new/1]).
+
+-record(my_digraph, {vtab = notable,
+		     etab = notable,
+		     ntab = notable,
+		     cyclic = true   :: boolean()}).
+
+-opaque my_digraph() :: #my_digraph{}.
+
+-type d_protection() :: 'private' | 'protected'.
+-type d_cyclicity()  :: 'acyclic' | 'cyclic'.
+-type d_type()       :: d_cyclicity() | d_protection().
+
+-spec new() -> my_digraph().
+new() -> new([]).
+
+-spec new([atom()]) -> my_digraph().
+new(Type) ->
+    try check_type(Type, protected, []) of
+	{Access, Ts} ->
+	    V = ets:new(vertices, [set, Access]),
+	    E = ets:new(edges, [set, Access]),
+	    N = ets:new(neighbours, [bag, Access]),
+	    ets:insert(N, [{'$vid', 0}, {'$eid', 0}]),
+	    set_type(Ts, #my_digraph{vtab=V, etab=E, ntab=N})
+    catch
+	throw:Error -> throw(Error)
+    end.
+
+-spec check_type([atom()], d_protection(), [{'cyclic', boolean()}]) ->
+	{d_protection(), [{'cyclic', boolean()}]}.
+
+check_type([acyclic|Ts], A, L) ->
+    check_type(Ts, A,[{cyclic,false} | L]);
+check_type([cyclic | Ts], A, L) ->
+    check_type(Ts, A, [{cyclic,true} | L]);
+check_type([protected | Ts], _, L) ->
+    check_type(Ts, protected, L);
+check_type([private | Ts], _, L) ->
+    check_type(Ts, private, L);
+check_type([T | _], _, _) ->
+    throw({error, {unknown_type, T}});
+check_type([], A, L) -> {A, L}.
+
+-spec set_type([{'cyclic', boolean()}], my_digraph()) -> my_digraph().
+
+set_type([{cyclic,V} | Ks], G) ->
+    set_type(Ks, G#my_digraph{cyclic = V});
+set_type([], G) -> G.
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/my_queue/my_queue_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/my_queue/my_queue_adt.erl
index 52688062ce..52688062ce 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/my_queue/my_queue_adt.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/my_queue/my_queue_adt.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/my_queue/my_queue_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/my_queue/my_queue_use.erl
index 98f9972c1e..98f9972c1e 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/my_queue/my_queue_use.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/my_queue/my_queue_use.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque/opaque_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_adt.erl
index 3456f0e9c6..3456f0e9c6 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque/opaque_adt.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_adt.erl
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug1.erl b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug1.erl
new file mode 100644
index 0000000000..5a03989853
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug1.erl
@@ -0,0 +1,16 @@
+%%---------------------------------------------------------------------
+%% A test for which the analysis went into an infinite loop due to
+%% specialization using structured type instead of the opaque one.
+%%---------------------------------------------------------------------
+
+-module(opaque_bug1).
+
+-export([test/1]).
+
+-record(c, {a::atom()}).
+
+-opaque erl_type() :: 'any' | #c{}.
+
+test(#c{a=foo} = T) -> local(T).
+
+local(#c{a=foo}) -> any.
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque/opaque_bug2.erl b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug2.erl
index f193a58f59..f193a58f59 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque/opaque_bug2.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug2.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque/opaque_bug3.erl b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug3.erl
index 71da82a1f6..71da82a1f6 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque/opaque_bug3.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug3.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque/opaque_bug4.erl b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug4.erl
index a7ddc80fe8..a7ddc80fe8 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque/opaque_bug4.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_bug4.erl
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/queue/queue_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/queue/queue_use.erl
new file mode 100644
index 0000000000..8d46bdb989
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/queue/queue_use.erl
@@ -0,0 +1,65 @@
+-module(queue_use).
+
+-export([ok1/0, ok2/0]).
+-export([wrong1/0, wrong2/0, wrong3/0, wrong4/0, wrong5/0, wrong6/0, wrong7/0, wrong8/0]).
+
+ok1() ->
+    queue:is_empty(queue:new()).
+
+ok2() ->
+    Q0 = queue:new(),
+    Q1 = queue:in(42, Q0),
+    {{value, 42}, Q2} = queue:out(Q1),
+    queue:is_empty(Q2).
+
+%%--------------------------------------------------
+
+wrong1() ->
+    queue:is_empty({[],[]}).
+
+wrong2() ->
+    Q0 = {[],[]},
+    queue:in(42, Q0).
+
+wrong3() ->
+    Q0 = queue:new(),
+    Q1 = queue:in(42, Q0),
+    {[42],Q2} = Q1,
+    Q2.
+
+wrong4() ->
+    Q0 = queue:new(),
+    Q1 = queue:in(42, Q0),
+    Q1 =:= {[42],[]}.
+
+wrong5() ->
+    {F, _R} = queue:new(),
+    F.
+
+wrong6() ->
+    {{value, 42}, Q2} = queue:out({[42],[]}),
+    Q2.
+
+%%--------------------------------------------------
+
+-record(db, {p, q}).
+
+wrong7() ->
+    add_unique(42, #db{p = [], q = queue:new()}).
+
+add_unique(E, DB) ->
+    case is_in_queue(E, DB) of
+	true -> DB;
+	false -> DB#db{q = queue:in(E, DB#db.q)}
+    end.
+
+is_in_queue(P, #db{q = {L1,L2}}) ->
+    lists:member(P, L1) orelse lists:member(P, L2).
+
+%%--------------------------------------------------
+
+wrong8() ->
+    tuple_queue({42, gazonk}).
+
+tuple_queue({F, Q}) ->
+    queue:in(F, Q).
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/rec/rec_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/rec/rec_adt.erl
index f01cc5e519..f01cc5e519 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/rec/rec_adt.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/rec/rec_adt.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/rec/rec_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/rec/rec_use.erl
index 358e9f918c..358e9f918c 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/rec/rec_use.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/rec/rec_use.erl
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/schuett_bug.erl b/lib/dialyzer/test/opaque_SUITE_data/src/schuett_bug.erl
new file mode 100644
index 0000000000..00c1aa57bf
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/schuett_bug.erl
@@ -0,0 +1,28 @@
+%%---------------------------------------------------------------------------
+%% From: Thorsten Schuett <[email protected]>
+%% Date: 7 July 2010
+%%
+%% When I run dialyzer of R14A on the attached code, it complains about
+%% the new_neighborhood/1 function:
+%% nodelist.erl:12: Invalid type specification for function
+%% nodelist:new_neighborhood/1. The success typing is (_) -> {[any(),...]}
+%%
+%% However, when I change the type nodelist() from opaque to non-opaque
+%% (see comment), dialyzer accepts the code. The types seem to be correct.
+%% The problem seems to be with nested opaque types.
+%%---------------------------------------------------------------------------
+
+-module(schuett_bug).
+
+-export([new_neighborhood/1]).
+
+-export_type([nodelist/0, neighborhood/0]).
+
+-type node_type() :: 'node_type'.
+
+-opaque nodelist() :: [node_type(),...]. % change to -type
+-opaque neighborhood() :: {nodelist()}.
+
+-spec new_neighborhood(Node::node_type()) -> neighborhood().
+new_neighborhood(Node) ->
+    {[Node]}.
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/timer/timer_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/timer/timer_use.erl
index 9c8ea0af1c..9c8ea0af1c 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/timer/timer_use.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/timer/timer_use.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/union/union_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/union/union_adt.erl
index 5ca3202bba..5ca3202bba 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/union/union_adt.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/union/union_adt.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/union/union_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/union/union_use.erl
index 6a103279cd..6a103279cd 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/union/union_use.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/union/union_use.erl
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings.hrl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings.hrl
new file mode 100644
index 0000000000..b815be5e1d
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings.hrl
@@ -0,0 +1,204 @@
+%%
+%%  wings.hrl --
+%%
+%%     Global record definition and defines.
+%%
+%%  Copyright (c) 2001-2005 Bjorn Gustavsson
+%%
+%%  See the file "license.terms" for information on usage and redistribution
+%%  of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+%%
+%%     $Id: wings.hrl,v 1.1 2009/01/25 18:55:33 kostis Exp $
+%%
+
+-include("wings_intl.hrl").
+
+-ifdef(NEED_ESDL).
+-include_lib("esdl/include/sdl.hrl").
+-include_lib("esdl/include/sdl_events.hrl").
+-include_lib("esdl/include/sdl_video.hrl").
+-include_lib("esdl/include/sdl_keyboard.hrl").
+-include_lib("esdl/include/sdl_mouse.hrl").
+-include_lib("esdl/src/sdl_util.hrl").
+-define(CTRL_BITS, ?KMOD_CTRL).
+-define(ALT_BITS, ?KMOD_ALT).
+-define(SHIFT_BITS, ?KMOD_SHIFT).
+-define(META_BITS, ?KMOD_META).
+-endif.
+
+-define(WINGS_VERSION, ?wings_version).
+
+-define(CHAR_HEIGHT, wings_text:height()).
+-define(CHAR_WIDTH, wings_text:width()).
+
+-define(LINE_HEIGHT, (?CHAR_HEIGHT+2)).
+-define(GROUND_GRID_SIZE, 1).
+-define(CAMERA_DIST, (8.0*?GROUND_GRID_SIZE)).
+-define(NORMAL_LINEWIDTH, 1.0).
+-define(DEGREE, 176).				%Degree character.
+
+-define(HIT_BUF_SIZE, (1024*1024)).
+
+-define(PANE_COLOR, {0.52,0.52,0.52}).
+-define(BEVEL_HIGHLIGHT, {0.9,0.9,0.9}).
+-define(BEVEL_LOWLIGHT, {0.3,0.3,0.3}).
+-define(BEVEL_HIGHLIGHT_MIX, 0.5).
+-define(BEVEL_LOWLIGHT_MIX, 0.5).
+
+-define(SLOW(Cmd), begin wings_io:hourglass(), Cmd end).
+-define(TC(Cmd), wings_util:tc(fun() -> Cmd end, ?MODULE, ?LINE)).
+
+-ifdef(DEBUG).
+-define(ASSERT(E), case E of
+		       true -> ok;
+		       _ ->
+			   erlang:error({assertion_failed,?MODULE,?LINE})
+		   end).
+-define(CHECK_ERROR(), wings_gl:check_error(?MODULE, ?LINE)).
+-else.
+-define(ASSERT(E),ok).
+-define(CHECK_ERROR(), ok).
+-endif.
+
+%% Display lists per object.
+%%  Important: Plain integers and integers in lists will be assumed to
+%%  be display lists. Arbitrary integers must be stored inside a tuple
+%%  or record to not be interpreted as a display list.
+-record(dlo,
+	{work=none,				%Workmode faces.
+	 smooth=none,				%Smooth-shaded faces.
+	 edges=none,				%Edges and wire-frame.
+	 vs=none,				%Unselected vertices.
+	 hard=none,				%Hard edges.
+	 sel=none,				%Selected items.
+	 orig_sel=none,				%Original selection.
+	 normals=none,				%Normals.
+	 pick=none,				%For picking.
+	 proxy_faces=none,			%Smooth proxy faces.
+	 proxy_edges=none,			%Smooth proxy edges.
+
+	 %% Miscellanous.
+	 hilite=none,				%Hilite display list.
+	 mirror=none,				%Virtual mirror data.
+	 ns=none,				%Normals/positions per face.
+
+	 %% Source for display lists.
+	 src_we=none,				%Source object.
+	 src_sel=none,				%Source selection.
+	 orig_mode=none,			%Original selection mode.
+	 split=none,				%Split data.
+	 drag=none,				%For dragging.
+	 transparent=false,			%Object includes transparancy.
+	 proxy_data=none,			%Data for smooth proxy.
+	 open=false,				%Open (has hole).
+
+	 %% List of display lists known to be needed only based
+	 %% on display modes, not whether the lists themselves exist.
+	 %% Example: [work,edges]
+	 needed=[]
+	}).
+
+%% Main state record containing all objects and other important state.
+-record(st,
+	{shapes,				%All visible shapes
+	 selmode,				%Selection mode:
+						% vertex, edge, face, body
+	 sh=false,				%Smart highlight active: true|false
+	 sel=[],				%Current sel: [{Id,GbSet}]
+	 ssels=[],				%Saved selections:
+						%  [{Name,Mode,GbSet}]
+	 temp_sel=none,			        %Selection only temporary?
+
+	 mat,					%Defined materials (GbTree).
+	 pal=[],                                %Palette
+	 file,					%Current filename.
+	 saved,					%True if model has been saved.
+	 onext,					%Next object id to use.
+	 bb=none,				%Saved bounding box.
+	 edge_loop=none,			%Previous edge loop.
+	 views={0,{}},				%{Current,TupleOfViews}
+	 pst=gb_trees:empty(),                  %Plugin State Info
+						%   gb_tree where key is plugin	module
+
+	 %% Previous commands.
+	 repeatable,			        %Last repeatable command.
+	 ask_args,				%Ask arguments.
+	 drag_args,			        %Drag arguments for command.
+	 def,					%Default operations.
+
+	 %% Undo information.
+	 top,					%Top of stack.
+	 bottom,				%Bottom of stack.
+	 next_is_undo,				%State of undo/redo toggle.
+	 undone				        %States that were undone.
+	}).
+
+%% The Winged-Edge data structure.
+%% See http://www.cs.mtu.edu/~shene/COURSES/cs3621/NOTES/model/winged-e.html
+-record(we,
+	{id,					%Shape id.
+	 perm=0,				%Permissions:
+						% 0 - Everything allowed.
+						% 1 - Visible, can't select.
+						% [] or {Mode,GbSet} -
+						%  Invisible, can't select.
+						%  The GbSet contains the
+						%  object's selection.
+	 name,					%Name.
+	 es,					%gb_tree containing edges
+	 fs,					%gb_tree containing faces
+	 he,					%gb_sets containing hard edges
+	 vc,					%Connection info (=incident edge)
+						% for vertices.
+	 vp,					%Vertex positions.
+	 pst=gb_trees:empty(),                  %Plugin State Info,
+						%   gb_tree where key is plugin module
+	 mat=default,				%Materials.
+	 next_id,				%Next free ID for vertices,
+						% edges, and faces.
+						% (Needed because we never re-use
+						%  IDs.)
+	 mode,					%'vertex'/'material'/'uv'
+	 mirror=none,				%Mirror: none|Face
+	 light=none,				%Light data: none|Light
+	 has_shape=true				%true|false
+	}).
+
+-define(IS_VISIBLE(Perm), (Perm =< 1)).
+-define(IS_NOT_VISIBLE(Perm), (Perm > 1)).
+-define(IS_SELECTABLE(Perm), (Perm == 0)).
+-define(IS_NOT_SELECTABLE(Perm), (Perm =/= 0)).
+
+-define(IS_LIGHT(We), ((We#we.light =/= none) and (not We#we.has_shape))).
+-define(IS_ANY_LIGHT(We), (We#we.light =/= none)).
+-define(HAS_SHAPE(We), (We#we.has_shape)).
+%-define(IS_LIGHT(We), (We#we.light =/= none)).
+%-define(IS_NOT_LIGHT(We), (We#we.light =:= none)).
+
+%% Edge in a winged-edge shape.
+-record(edge,
+	{vs,					%Start vertex for edge
+	 ve,					%End vertex for edge
+	 a=none,			        %Color or UV coordinate.
+	 b=none,			        %Color or UV coordinate.
+	 lf,					%Left face
+	 rf,					%Right face
+	 ltpr,					%Left traversal predecessor
+	 ltsu,					%Left traversal successor
+	 rtpr,					%Right traversal predecessor
+	 rtsu					%Right traversal successor
+	}).
+
+%% The current view/camera.
+-record(view,
+	{origin,
+	 distance,				% From origo.
+	 azimuth,
+	 elevation,
+	 pan_x,					%Panning in X direction.
+	 pan_y,					%Panning in Y direction.
+	 along_axis=none,			%Which axis viewed along.
+	 fov,					%Field of view.
+	 hither,				%Near clipping plane.
+	 yon					%Far clipping plane.
+	}).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_dissolve.erl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_dissolve.erl
new file mode 100644
index 0000000000..c469f0a45d
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_dissolve.erl
@@ -0,0 +1,375 @@
+%%
+%%  wings_dissolve.erl --
+%%
+%%     This module implements dissolve of faces.
+%%
+
+-module(wings_dissolve).
+
+-export([faces/2, complement/2]).
+
+-include("wings.hrl").
+
+%% faces([Face], We) -> We'
+%%  Dissolve the given faces.
+faces([], We) -> We;
+faces(Faces, #we{fs=Ftab0}=We) ->
+    case gb_sets:is_empty(Faces) of
+	true -> We;
+	false when is_list(Faces) ->
+	    Complement = ordsets:subtract(gb_trees:keys(Ftab0),
+					  ordsets:from_list(Faces)),
+	    dissolve_1(Faces, Complement, We);
+	false ->
+	    Complement = ordsets:subtract(gb_trees:keys(Ftab0),
+					  gb_sets:to_list(Faces)),
+	    dissolve_1(Faces, Complement, We)
+    end.
+
+faces([], _, We) -> We;
+faces(Faces,Complement,We) ->
+    case gb_sets:is_empty(Faces) of
+        true -> We;
+        false -> dissolve_1(Faces, Complement,We)
+    end.
+
+dissolve_1(Faces, Complement, We0) ->
+    We1 = optimistic_dissolve(Faces,Complement,We0#we{vc=undefined}),
+    NewFaces = wings_we:new_items_as_ordset(face, We0, We1),
+    We2 = wings_face:delete_bad_faces(NewFaces, We1),
+    We = wings_we:rebuild(We2),
+    case wings_we:is_consistent(We) of
+	true ->
+	    We;
+	false ->
+	    io:format("Dissolving would cause an inconsistent object structure.")
+    end.
+
+%% complement([Face], We) -> We'
+%%  Dissolve all faces BUT the given faces. Also invalidate the
+%%  mirror face if it existed and was dissolved.
+complement(Fs0, #we{fs=Ftab0}=We0) when is_list(Fs0) ->
+    Fs = ordsets:subtract(gb_trees:keys(Ftab0), ordsets:from_list(Fs0)),
+    case faces(Fs, Fs0, We0) of
+        #we{mirror=none}=We -> We;
+        #we{mirror=Face,fs=Ftab}=We ->
+            case gb_trees:is_defined(Face, Ftab) of
+                false -> We;
+                true -> We#we{mirror=none}
+            end
+    end;
+complement(Fs, We) -> complement(gb_sets:to_list(Fs), We).
+
+optimistic_dissolve(Faces0, Compl, We0) ->
+    %% Optimistically assume that we have a simple region without
+    %% any holes.
+    case outer_edge_loop(Faces0, We0) of
+	error ->
+	    %% Assumption was wrong. We need to partition the selection
+	    %% and dissolve each partition in turn.
+	    Parts = wings_sel:face_regions(Faces0, We0),
+	    complex_dissolve(Parts, We0);
+	[_|_]=Loop ->
+	    %% Assumption was correct.
+	    simple_dissolve(Faces0, Compl, Loop, We0)
+    end.
+
+%% simple_dissolve(Faces, Loop, We0) -> We
+%%  Dissolve a region of faces with no holes and no
+%%  repeated vertices in the outer edge loop.
+
+simple_dissolve(Faces0, Compl, Loop, We0) ->
+    Faces = to_gb_set(Faces0),
+    OldFace = gb_sets:smallest(Faces),
+    Mat = wings_facemat:face(OldFace, We0),
+    We1 = fix_materials(Faces, Compl, We0),
+    #we{es=Etab0,fs=Ftab0,he=Htab0} = We1,
+    {Ftab1,Etab1,Htab} = simple_del(Faces, Ftab0, Etab0, Htab0, We1),
+    {NewFace,We2} = wings_we:new_id(We1),
+    Ftab = gb_trees:insert(NewFace, hd(Loop), Ftab1),
+    Last = lists:last(Loop),
+    Etab = update_outer([Last|Loop], Loop, NewFace, Ftab, Etab1),
+    We = We2#we{es=Etab,fs=Ftab,he=Htab},
+    wings_facemat:assign(Mat, [NewFace], We).
+
+fix_materials(Del,Keep,We) ->
+    case gb_sets:size(Del) < length(Keep) of
+	true ->
+	    wings_facemat:delete_faces(Del,We);
+	false ->
+	    wings_facemat:keep_faces(Keep,We)
+    end.
+
+to_gb_set(List) when is_list(List) ->
+    gb_sets:from_list(List);
+to_gb_set(S) -> S.
+
+%% Delete faces and inner edges for a simple region.
+simple_del(Faces, Ftab0, Etab0, Htab0, We) ->
+    case {gb_trees:size(Ftab0),gb_sets:size(Faces)} of
+	{AllSz,FaceSz} when AllSz < 2*FaceSz ->
+	    %% At least half of the faces are selected.
+	    %% It is faster to find the edges for the
+	    %% unselected faces.
+	    UnselFaces = ordsets:subtract(gb_trees:keys(Ftab0),
+					  gb_sets:to_list(Faces)),
+
+	    UnselSet = sofs:from_external(UnselFaces, [face]),
+	    Ftab1 = sofs:from_external(gb_trees:to_list(Ftab0),
+				       [{face,edge}]),
+	    Ftab2 = sofs:restriction(Ftab1, UnselSet),
+	    Ftab = gb_trees:from_orddict(sofs:to_external(Ftab2)),
+
+	    Keep0 = wings_face:to_edges(UnselFaces, We),
+	    Keep = sofs:set(Keep0, [edge]),
+	    Etab1 = sofs:from_external(gb_trees:to_list(Etab0),
+				       [{edge,info}]),
+	    Etab2 = sofs:restriction(Etab1, Keep),
+	    Etab = gb_trees:from_orddict(sofs:to_external(Etab2)),
+
+	    Htab = simple_del_hard(Htab0, sofs:to_external(Keep), undefined),
+	    {Ftab,Etab,Htab};
+	{_,_} ->
+	    Ftab = lists:foldl(fun(Face, Ft) ->
+				       gb_trees:delete(Face, Ft)
+			       end, Ftab0, gb_sets:to_list(Faces)),
+	    Inner = wings_face:inner_edges(Faces, We),
+	    Etab = lists:foldl(fun(Edge, Et) ->
+				       gb_trees:delete(Edge, Et)
+			       end, Etab0, Inner),
+	    Htab = simple_del_hard(Htab0, undefined, Inner),
+	    {Ftab,Etab,Htab}
+    end.
+
+simple_del_hard(Htab, Keep, Remove) ->
+    case gb_sets:is_empty(Htab) of
+	true -> Htab;
+	false -> simple_del_hard_1(Htab, Keep, Remove)
+    end.
+
+simple_del_hard_1(Htab, Keep, undefined) ->
+    gb_sets:intersection(Htab, gb_sets:from_ordset(Keep));
+simple_del_hard_1(Htab, undefined, Remove) ->
+    gb_sets:difference(Htab, gb_sets:from_ordset(Remove)).
+
+%% complex([Partition], We0) -> We0
+%%  The general dissolve.
+
+complex_dissolve([Faces|T], We0) ->
+    Face = gb_sets:smallest(Faces),
+    Mat = wings_facemat:face(Face, We0),
+    We1 = wings_facemat:delete_faces(Faces, We0),
+    Parts = outer_edge_partition(Faces, We1),
+    We = do_dissolve(Faces, Parts, Mat, We0, We1),
+    complex_dissolve(T, We);
+complex_dissolve([], We) -> We.
+
+do_dissolve(Faces, Ess, Mat, WeOrig, We0) ->
+    We1 = do_dissolve_faces(Faces, We0),
+    Inner = wings_face:inner_edges(Faces, WeOrig),
+    We2 = delete_inner(Inner, We1),
+    #we{he=Htab0} = We = do_dissolve_1(Ess, Mat, We2),
+    Htab = gb_sets:difference(Htab0, gb_sets:from_list(Inner)),
+    We#we{he=Htab}.
+
+do_dissolve_1([EdgeList|Ess], Mat, #we{es=Etab0,fs=Ftab0}=We0) ->
+    {Face,We1} = wings_we:new_id(We0),
+    Ftab = gb_trees:insert(Face, hd(EdgeList), Ftab0),
+    Last = lists:last(EdgeList),
+    Etab = update_outer([Last|EdgeList], EdgeList, Face, Ftab, Etab0),
+    We2 = We1#we{es=Etab,fs=Ftab},
+    We = wings_facemat:assign(Mat, [Face], We2),
+    do_dissolve_1(Ess, Mat, We);
+do_dissolve_1([], _Mat, We) -> We.
+
+do_dissolve_faces(Faces, #we{fs=Ftab0}=We) ->
+    Ftab = lists:foldl(fun(Face, Ft) ->
+			       gb_trees:delete(Face, Ft)
+		       end, Ftab0, gb_sets:to_list(Faces)),
+    We#we{fs=Ftab}.
+
+delete_inner(Inner, #we{es=Etab0}=We) ->
+    Etab = lists:foldl(fun(Edge, Et) ->
+			       gb_trees:delete(Edge, Et)
+		       end, Etab0, Inner),
+    We#we{es=Etab}.
+
+update_outer([Pred|[Edge|Succ]=T], More, Face, Ftab, Etab0) ->
+    #edge{rf=Rf} = R0 = gb_trees:get(Edge, Etab0),
+    Rec = case gb_trees:is_defined(Rf, Ftab) of
+	      true ->
+		  ?ASSERT(false == gb_trees:is_defined(R0#edge.lf, Ftab)),
+		  LS = succ(Succ, More),
+		  R0#edge{lf=Face,ltpr=Pred,ltsu=LS};
+	      false ->
+		  ?ASSERT(true == gb_trees:is_defined(R0#edge.lf, Ftab)),
+		  RS = succ(Succ, More),
+		  R0#edge{rf=Face,rtpr=Pred,rtsu=RS}
+	  end,
+    Etab = gb_trees:update(Edge, Rec, Etab0),
+    update_outer(T, More, Face, Ftab, Etab);
+update_outer([_], _More, _Face, _Ftab, Etab) -> Etab.
+
+succ([Succ|_], _More) -> Succ;
+succ([], [Succ|_]) -> Succ.
+
+%% outer_edge_loop(FaceSet,WingedEdge) -> [Edge] | error.
+%%  Partition the outer edges of the FaceSet into a single closed loop.
+%%  Return 'error' if the faces in FaceSet does not form a
+%%  simple region without holes.
+%%
+%%  Equvivalent to
+%%      case outer_edge_partition(FaceSet,WingedEdge) of
+%%         [Loop] -> Loop;
+%%         [_|_] -> error
+%%      end.
+%%  but faster.
+
+outer_edge_loop(Faces, We) ->
+    case lists:sort(collect_outer_edges(Faces, We)) of
+	[] -> error;
+	[{Key,Val}|Es0] ->
+	    case any_duplicates(Es0, Key) of
+		false ->
+		    Es = gb_trees:from_orddict(Es0),
+		    N = gb_trees:size(Es),
+		    outer_edge_loop_1(Val, Es, Key, N, []);
+		true -> error
+	    end
+    end.
+
+outer_edge_loop_1({Edge,V}, _, V, 0, Acc) ->
+    %% This edge completes the loop, and we have used all possible edges.
+    [Edge|Acc];
+outer_edge_loop_1({_,V}, _, V, _N, _) ->
+    %% Loop is complete, but we haven't used all edges.
+    error;
+outer_edge_loop_1({_,_}, _, _, 0, _) ->
+    %% We have used all possible edges, but somehow the loop
+    %% is not complete. I can't see how this is possible.
+    erlang:error(internal_error);
+outer_edge_loop_1({Edge,Vb}, Es, EndV, N, Acc0) ->
+    Acc = [Edge|Acc0],
+    outer_edge_loop_1(gb_trees:get(Vb, Es), Es, EndV, N-1, Acc).
+
+any_duplicates([{V,_}|_], V) -> true;
+any_duplicates([_], _) -> false;
+any_duplicates([{V,_}|Es], _) -> any_duplicates(Es, V).
+
+%% outer_edge_partition(FaceSet, WingedEdge) -> [[Edge]].
+%%  Partition the outer edges of the FaceSet. Each partion
+%%  of edges form a closed loop with no repeated vertices.
+%%    Outer edges are edges that have one face in FaceSet
+%%  and one outside.
+%%    It is assumed that FaceSet consists of one region returned by
+%%  wings_sel:face_regions/2.
+
+outer_edge_partition(Faces, We) ->
+    F0 = collect_outer_edges(Faces, We),
+    F = gb_trees:from_orddict(wings_util:rel2fam(F0)),
+    partition_edges(F, []).
+
+collect_outer_edges(Faces, We) when is_list(Faces) ->
+    collect_outer_edges_1(Faces, gb_sets:from_list(Faces), We);
+collect_outer_edges(Faces, We) ->
+    collect_outer_edges_1(gb_sets:to_list(Faces), Faces, We).
+
+collect_outer_edges_1(Fs0, Faces0, #we{fs=Ftab}=We) ->
+    case {gb_trees:size(Ftab),gb_sets:size(Faces0)} of
+	{AllSz,FaceSz} when AllSz < 2*FaceSz ->
+	    Fs = ordsets:subtract(gb_trees:keys(Ftab), Fs0),
+	    Faces = gb_sets:from_ordset(Fs),
+	    Coll = collect_outer_edges_a(Faces),
+	    wings_face:fold_faces(Coll, [], Fs, We);
+	{_,_} ->
+	    Coll = collect_outer_edges_b(Faces0),
+	    wings_face:fold_faces(Coll, [], Fs0, We)
+    end.
+
+collect_outer_edges_a(Faces) ->
+    fun(Face, _, Edge, #edge{ve=V,vs=OtherV,lf=Face,rf=Other}, Acc) ->
+	    case gb_sets:is_member(Other, Faces) of
+		false -> [{V,{Edge,OtherV}}|Acc];
+		true -> Acc
+	    end;
+       (Face, _, Edge, #edge{ve=OtherV,vs=V,rf=Face,lf=Other}, Acc) ->
+	    case gb_sets:is_member(Other, Faces) of
+		false -> [{V,{Edge,OtherV}}|Acc];
+		true -> Acc
+	    end
+    end.
+
+collect_outer_edges_b(Faces) ->
+    fun(Face, _, Edge, #edge{vs=V,ve=OtherV,lf=Face,rf=Other}, Acc) ->
+	    case gb_sets:is_member(Other, Faces) of
+		false -> [{V,{Edge,OtherV}}|Acc];
+		true -> Acc
+	    end;
+       (Face, _, Edge, #edge{vs=OtherV,ve=V,rf=Face,lf=Other}, Acc) ->
+	    case gb_sets:is_member(Other, Faces) of
+		false -> [{V,{Edge,OtherV}}|Acc];
+		true -> Acc
+	    end
+    end.
+
+partition_edges(Es0, Acc) ->
+    case gb_trees:is_empty(Es0) of
+	true -> Acc;
+	false ->
+	    {Key,Val,Es1} = gb_trees:take_smallest(Es0),
+	    {Cycle,Es} = part_collect_cycle(Key, Val, Es1, []),
+	    partition_edges(Es, [Cycle|Acc])
+    end.
+
+%% part_collect_cycle(Vertex, VertexInfo, EdgeInfo, Acc0) ->
+%%    none | {[Edge],EdgeInfo}
+%%  Collect the cycle starting with Vertex.
+%%
+%%  Note: This function can only return 'none' when called
+%%  recursively.
+
+part_collect_cycle(_, repeated, _, _) ->
+    %% Repeated vertex - we are not allowed to go this way.
+    %% Can only happen if we were called recursively because
+    %% a fork was encountered.
+    none;
+part_collect_cycle(_Va, [{Edge,Vb}], Es0, Acc0) ->
+    %% Basic case. Only one way to go.
+    Acc = [Edge|Acc0],
+    case gb_trees:lookup(Vb, Es0) of
+	none ->
+	    {Acc,Es0};
+	{value,Val} ->
+	    Es = gb_trees:delete(Vb, Es0),
+	    part_collect_cycle(Vb, Val, Es, Acc)
+    end;
+part_collect_cycle(Va, [Val|More], Es0, []) ->
+    %% No cycle started yet and we have multiple choice of
+    %% edges out from this vertex. It doesn't matter which
+    %% edge we follow, so we'll follow the first one.
+    {Cycle,Es} = part_collect_cycle(Va, [Val], Es0, []),
+    {Cycle,gb_trees:insert(Va, More, Es)};
+part_collect_cycle(Va, Edges, Es0, Acc) ->
+    %% We have a partially collected cycle and we have a
+    %% fork (multiple choice of edges). Here we must choose
+    %% an edge that closes the cycle without passing Va
+    %% again (because repeated vertices are not allowed).
+    Es = gb_trees:insert(Va, repeated, Es0),
+    part_fork(Va, Edges, Es, Acc, []).
+
+part_fork(Va, [Val|More], Es0, Acc, Tried) ->
+    %% Try to complete the cycle by following this edge.
+    case part_collect_cycle(Va, [Val], Es0, Acc) of
+	none ->
+	    %% Failure - try the next edge.
+	    part_fork(Va, More, Es0, Acc, [Val|Tried]);
+	{Cycle,Es} ->
+	    %% Found a cycle. Update the vertex information
+	    %% with all edges remaining.
+	    {Cycle,gb_trees:update(Va, lists:reverse(Tried, More), Es)}
+    end;
+part_fork(_, [], _, _, _) ->
+    %% None of edges were possible. Can only happen if this function
+    %% was called recursively (i.e. if we hit another fork while
+    %% processing a fork).
+    none.
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_edge.erl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_edge.erl
index 3483acb711..3483acb711 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_edge.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_edge.erl
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_edge_cmd.erl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_edge_cmd.erl
new file mode 100644
index 0000000000..91fa5b2a39
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_edge_cmd.erl
@@ -0,0 +1,90 @@
+%%
+%%  wings_edge.erl --
+%%
+%%     This module contains most edge command and edge utility functions.
+%%
+
+-module(wings_edge_cmd).
+
+-export([loop_cut/1]).
+
+-include("wings.hrl").
+
+%%%
+%%% The Loop Cut command.
+%%%
+
+loop_cut(St0) ->
+    {Sel,St} = wings_sel:fold(fun loop_cut/3, {[],St0}, St0),
+    wings_sel:set(body, Sel, St).
+
+loop_cut(Edges, #we{name=Name,id=Id,fs=Ftab}=We0, {Sel,St0}) ->
+    AdjFaces = wings_face:from_edges(Edges, We0),
+    case loop_cut_partition(AdjFaces, Edges, We0, []) of
+	[_] ->
+	    io:format("Edge loop doesn't divide ~p into two parts.", [Name]);
+	Parts0 ->
+	    %% We arbitrarily decide that the largest part of the object
+	    %% will be left unselected and will keep the name of the object.
+
+	    Parts1 = [{gb_trees:size(P),P} || P <- Parts0],
+	    Parts2 = lists:reverse(lists:sort(Parts1)),
+	    [_|Parts] = [gb_sets:to_list(P) || {_,P} <- Parts2],
+
+	    %% Also, this first part will also contain any sub-object
+	    %% that was not reachable from any of the edges. Therefore,
+	    %% we calculate the first part as the complement of the union
+	    %% of all other parts.
+
+	    FirstComplement = ordsets:union(Parts),
+	    First = ordsets:subtract(gb_trees:keys(Ftab), FirstComplement),
+
+	    We = wings_dissolve:complement(First, We0),
+	    Shs = St0#st.shapes,
+	    St = St0#st{shapes=gb_trees:update(Id, We, Shs)},
+	    loop_cut_make_copies(Parts, We0, Sel, St)
+    end.
+
+loop_cut_make_copies([P|Parts], We0, Sel0, #st{onext=Id}=St0) ->
+    Sel = [{Id,gb_sets:singleton(0)}|Sel0],
+    We = wings_dissolve:complement(P, We0),
+    St = wings_shape:insert(We, cut, St0),
+    loop_cut_make_copies(Parts, We0, Sel, St);
+loop_cut_make_copies([], _, Sel, St) -> {Sel,St}.
+
+loop_cut_partition(Faces0, Edges, We, Acc) ->
+    case gb_sets:is_empty(Faces0) of
+	true -> Acc;
+	false ->
+	    {AFace,Faces1} = gb_sets:take_smallest(Faces0),
+	    Reachable = collect_faces(AFace, Edges, We),
+	    Faces = gb_sets:difference(Faces1, Reachable),
+	    loop_cut_partition(Faces, Edges, We, [Reachable|Acc])
+    end.
+
+collect_faces(Face, Edges, We) ->
+    collect_faces(gb_sets:singleton(Face), We, Edges, gb_sets:empty()).
+
+collect_faces(Work0, We, Edges, Acc0) ->
+    case gb_sets:is_empty(Work0) of
+	true -> Acc0;
+	false ->
+	    {Face,Work1} = gb_sets:take_smallest(Work0),
+	    Acc = gb_sets:insert(Face, Acc0),
+	    Work = collect_maybe_add(Work1, Face, Edges, We, Acc),
+	    collect_faces(Work, We, Edges, Acc)
+    end.
+
+collect_maybe_add(Work, Face, Edges, We, Res) ->
+    wings_face:fold(
+      fun(_, Edge, Rec, A) ->
+	      case gb_sets:is_member(Edge, Edges) of
+		  true -> A;
+		  false ->
+		      Of = wings_face:other(Face, Rec),
+		      case gb_sets:is_member(Of, Res) of
+			  true -> A;
+			  false -> gb_sets:add(Of, A)
+		      end
+	      end
+      end, Work, Face, We).
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_face.erl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_face.erl
index 487c05aa58..487c05aa58 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_face.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_face.erl
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_facemat.erl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_facemat.erl
new file mode 100644
index 0000000000..a3fa5e3508
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_facemat.erl
@@ -0,0 +1,299 @@
+%%
+%%  wings_facemat.erl --
+%%
+%%     This module keeps tracks of the mapping from a face number
+%%     to its material name.
+%%
+%%  Copyright (c) 2001-2005 Bjorn Gustavsson
+%%
+%%  See the file "license.terms" for information on usage and redistribution
+%%  of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+%%
+%%     $Id: wings_facemat.erl,v 1.1 2009/01/25 18:55:33 kostis Exp $
+%%
+%%
+%%
+
+-module(wings_facemat).
+-export([all/1,face/2,used_materials/1,mat_faces/2,
+	 assign/2,assign/3,
+	 delete_face/2,delete_faces/2,keep_faces/2,
+	 hide_faces/1,show_faces/1,
+	 renumber/2,gc/1,merge/1]).
+
+-include("wings.hrl").
+-import(lists, [keysearch/3,reverse/1,reverse/2,sort/1]).
+
+%%%
+%%% API functions for retrieving information.
+%%%
+
+%% all(We) -> [{Face,MaterialName}]
+%%  Return materials for all faces as an ordered list.
+all(#we{mat=M}=We) when is_atom(M) ->
+    Vis = visible_faces(We),
+    make_tab(Vis, M);
+all(#we{mat=L}) when is_list(L) ->
+    remove_invisible(L).
+
+%% face(Face, We) -> MaterialName
+%%  Return the material for the face Face.
+face(_, #we{mat=M}) when is_atom(M) -> M;
+face(Face, #we{mat=Tab}) ->
+    {value,{_,Mat}} = keysearch(Face, 1, Tab),
+    Mat.
+
+%% used_materials(We) -> [MaterialName]
+%%  Return an ordered list of all materials used in the We.
+used_materials(#we{mat=M}) when is_atom(M) -> [M];
+used_materials(#we{mat=L}) when is_list(L) ->
+    used_materials_1(L, []).
+
+%% mat_faces([{Face,Info}], We) -> [{Mat,[{Face,Info}]}]
+%%  Group face tab into groups based on material.
+%%  Used for displaying objects.
+mat_faces(Ftab, #we{mat=AtomMat}) when is_atom(AtomMat) ->
+    [{AtomMat,Ftab}];
+mat_faces(Ftab, #we{mat=MatTab}) ->
+    mat_faces_1(Ftab, remove_invisible(MatTab), []).
+
+%%%
+%%% API functions for updating material name mapping.
+%%%
+
+%% assign([{Face,MaterialName}], We) -> We'
+%%  Assign materials.
+assign([], We)  -> We;
+assign([{F,M}|_]=FaceMs, We) when is_atom(M), is_integer(F) ->
+    Tab = ordsets:from_list(FaceMs),
+    assign_face_ms(Tab, We).
+
+%% assign(MaterialName, Faces, We) -> We'
+%%  Assign MaterialName to all faces Faces.
+assign(Mat, _, #we{mat=Mat}=We) when is_atom(Mat) -> We;
+assign(Mat, Fs, We) when is_atom(Mat), is_list(Fs) ->
+    assign_1(Mat, Fs, We);
+assign(Mat, Fs, We) when is_atom(Mat) ->
+    assign_1(Mat, gb_sets:to_list(Fs), We).
+
+%% delete_face(Face, We) -> We'
+%%  Delete the material name mapping for the face Face.
+delete_face(_, #we{mat=AtomMat}=We) when is_atom(AtomMat) -> We;
+delete_face(Face, #we{mat=MatTab0}=We) ->
+    MatTab = orddict:erase(Face, MatTab0),
+    We#we{mat=MatTab}.
+
+%% delete_face(Faces, We) -> We'
+%%  Delete the material name mapping for all faces Faces.
+delete_faces(_, #we{mat=AtomMat}=We) when is_atom(AtomMat) -> We;
+delete_faces(Faces0, #we{mat=MatTab0}=We) when is_list(Faces0) ->
+    Faces = sofs:from_external(Faces0, [face]),
+    MatTab1 = sofs:from_external(MatTab0, [{face,mat}]),
+    MatTab2 = sofs:drestriction(MatTab1, Faces),
+    MatTab = sofs:to_external(MatTab2),
+    We#we{mat=MatTab};
+delete_faces(Faces, We) ->
+    delete_faces(gb_sets:to_list(Faces), We).
+
+%% keep_faces(Faces, We) -> We'
+%%  Delete all the other material names mapping for all faces other Faces.
+keep_faces(_, #we{mat=AtomMat}=We) when is_atom(AtomMat) -> We;
+keep_faces([Face], We) ->
+    Mat = face(Face,We),
+    We#we{mat=[{Face,Mat}]};
+keep_faces(Faces0, #we{mat=MatTab0}=We) when is_list(Faces0) ->
+    Faces = sofs:from_external(Faces0, [face]),
+    MatTab1 = sofs:from_external(MatTab0, [{face,mat}]),
+    MatTab2 = sofs:restriction(MatTab1, Faces),
+    MatTab = sofs:to_external(MatTab2),
+    We#we{mat=MatTab};
+keep_faces(Faces, We) ->
+    keep_faces(gb_sets:to_list(Faces), We).
+
+%% hide_faces(We) -> We'
+%%  Update the material name mapping in the We to reflect
+%%  the newly hidden faces in the face tab.
+hide_faces(#we{mat=M}=We) when is_atom(M) -> We;
+hide_faces(#we{mat=L0,fs=Ftab}=We) ->
+    L = hide_faces_1(L0, Ftab, []),
+    We#we{mat=L}.
+
+%% show_faces(We) -> We'
+%%  Update the material name mapping in the We to reflect
+%%  that all faces are again visible.
+show_faces(#we{mat=M}=We) when is_atom(M) -> We;
+show_faces(#we{mat=L0}=We) ->
+    L = show_faces_1(L0, []),
+    We#we{mat=L}.
+
+%% renumber(MaterialMapping, FaceOldToNew) -> MaterialMapping.
+%%  Renumber face number in material name mapping.
+renumber(Mat, _) when is_atom(Mat) -> Mat;
+renumber(L, Fmap) when is_list(L) -> renumber_1(L, Fmap, []).
+
+%% gc(We) -> We'
+%%  Garbage collect the material mapping information, removing
+%%  the mapping for any face no longer present in the face table.
+gc(#we{mat=Mat}=We) when is_atom(Mat) -> We;
+gc(#we{mat=Tab0,fs=Ftab}=We) ->
+    Fs = sofs:from_external(gb_trees:keys(Ftab), [face]),
+    Tab1 = sofs:from_external(Tab0, [{face,material}]),
+    Tab2 = sofs:restriction(Tab1, Fs),
+    Tab = sofs:to_external(Tab2),
+    We#we{mat=compress(Tab)}.
+
+%% merge([We]) -> [{Face,MaterialName}] | MaterialName.
+%%  Merge materials for several objects.
+merge([#we{mat=M}|Wes]=L) when is_atom(M) ->
+    case merge_all_same(Wes, M) of
+	true -> M;
+	false -> merge_1(L, [])
+    end;
+merge(L) -> merge_1(L, []).
+
+merge_1([#we{mat=M,es=Etab}|T], Acc) when is_atom(M) ->
+    FsM = merge_2(gb_trees:values(Etab), M, []),
+    merge_1(T, [FsM|Acc]);
+merge_1([#we{mat=FsMs}|T], Acc) ->
+    merge_1(T, [FsMs|Acc]);
+merge_1([], Acc) -> lists:merge(Acc).
+
+merge_2([#edge{lf=Lf,rf=Rf}|T], M, Acc) ->
+    merge_2(T, M, [{Lf,M},{Rf,M}|Acc]);
+merge_2([], _, Acc) -> ordsets:from_list(Acc).
+
+merge_all_same([#we{mat=M}|Wes], M) -> merge_all_same(Wes, M);
+merge_all_same([_|_], _) -> false;
+merge_all_same([], _) -> true.
+
+%%%
+%%% Local functions.
+%%%
+
+assign_1(Mat, Fs, #we{fs=Ftab}=We) ->
+    case length(Fs) =:= gb_trees:size(Ftab) of
+	true -> We#we{mat=Mat};
+	false -> assign_2(Mat, Fs, We)
+    end.
+
+assign_2(Mat, Fs0, #we{fs=Ftab,mat=Mat0}=We) when is_atom(Mat0) ->
+    Fs = ordsets:from_list(Fs0),
+    OtherFaces = ordsets:subtract(gb_trees:keys(Ftab), Fs),
+    Tab0 = make_tab(OtherFaces, Mat0),
+    Tab1 = make_tab(Fs, Mat),
+    Tab = lists:merge(Tab0, Tab1),
+    We#we{mat=Tab};
+assign_2(Mat, Fs0, #we{mat=Tab0}=We) when is_list(Tab0) ->
+    Fs = ordsets:from_list(Fs0),
+    Tab1 = make_tab(Fs, Mat),
+    Tab = mat_merge(Tab1, Tab0, []),
+    We#we{mat=Tab}.
+
+assign_face_ms(Tab, #we{fs=Ftab}=We) ->
+    case length(Tab) =:= gb_trees:size(Ftab) of
+	true -> We#we{mat=compress(Tab)};
+	false -> assign_face_ms_1(Tab, We)
+    end.
+
+assign_face_ms_1(Tab1, #we{fs=Ftab,mat=Mat0}=We) when is_atom(Mat0) ->
+    Tab0 = make_tab(gb_trees:keys(Ftab), Mat0),
+    Tab = mat_merge(Tab1, Tab0, []),
+    We#we{mat=Tab};
+assign_face_ms_1(Tab1, #we{mat=Tab0}=We) when is_list(Tab0) ->
+    Tab = mat_merge(Tab1, Tab0, []),
+    We#we{mat=Tab}.
+
+mat_merge([{Fn,_}|_]=Fns, [{Fo,_}=Fold|Fos], Acc) when Fo < Fn ->
+    mat_merge(Fns, Fos, [Fold|Acc]);
+mat_merge([{Fn,_}=Fnew|Fns], [{Fo,_}|_]=Fos, Acc) when Fo > Fn ->
+    mat_merge(Fns, Fos, [Fnew|Acc]);
+mat_merge([Fnew|Fns], [_|Fos], Acc) -> % Equality
+    mat_merge(Fns, Fos, [Fnew|Acc]);
+mat_merge([], Fos, Acc) ->
+    rev_compress(Acc, Fos);
+mat_merge(Fns, [], Acc) ->
+    rev_compress(Acc, Fns).
+
+make_tab(Fs, M) ->
+    make_tab_1(Fs, M, []).
+
+make_tab_1([F|Fs], M, Acc) ->
+    make_tab_1(Fs, M, [{F,M}|Acc]);
+make_tab_1([], _, Acc) -> reverse(Acc).
+
+
+visible_faces(#we{fs=Ftab}) ->
+    visible_faces_1(gb_trees:keys(Ftab)).
+
+visible_faces_1([F|Fs]) when F < 0 ->
+    visible_faces_1(Fs);
+visible_faces_1(Fs) -> Fs.
+
+remove_invisible([{F,_}|Fs]) when F < 0 ->
+    remove_invisible(Fs);
+remove_invisible(Fs) -> Fs.
+
+hide_faces_1([{F,_}=P|Fms], Ftab, Acc) when F < 0 ->
+    hide_faces_1(Fms, Ftab, [P|Acc]);
+hide_faces_1([{F,M}=P|Fms], Ftab, Acc) ->
+    case gb_trees:is_defined(F, Ftab) of
+	false -> hide_faces_1(Fms, Ftab, [{-F-1,M}|Acc]);
+	true -> hide_faces_1(Fms, Ftab, [P|Acc])
+    end;
+hide_faces_1([], _, Acc) -> sort(Acc).
+
+show_faces_1([{F,M}|Fms], Acc) when F < 0 ->
+    show_faces_1(Fms, [{-F-1,M}|Acc]);
+show_faces_1(Fs, Acc) -> sort(Acc++Fs).
+
+renumber_1([{F,M}|T], Fmap, Acc) ->
+    renumber_1(T, Fmap, [{gb_trees:get(F, Fmap),M}|Acc]);
+renumber_1([], _, Acc) -> sort(Acc).
+
+%% rev_compress([{Face,Mat}], [{Face,Mat}]) -> [{Face,Mat}] | Mat.
+%%  Reverse just like lists:reverse/2, but if all materials
+%%  turns out to be just the same, return that material.
+rev_compress(L, Acc) ->
+    case same_mat(Acc) of
+	[] -> reverse(L, Acc);
+	M -> rev_compress_1(L, M, Acc)
+    end.
+
+rev_compress_1([{_,M}=E|T], M, Acc) ->
+    %% Same material.
+    rev_compress_1(T, M, [E|Acc]);
+rev_compress_1([_|_]=L, _, Acc) ->
+    %% Another material. Finish by using reverse/2.
+    reverse(L, Acc);
+rev_compress_1([], M, _) ->
+    %% All materials turned out to be the same.
+    M.
+
+%% compress(MaterialTab) -> [{Face,Mat}] | Mat.
+%%  Compress a face mapping if possible.
+compress(M) when is_atom(M) -> M;
+compress(L) when is_list(L) ->
+    case same_mat(L) of
+	[] -> L;
+	M -> M
+    end.
+
+same_mat([]) -> [];
+same_mat([{_,M}|T]) -> same_mat_1(T, M).
+
+same_mat_1([{_,M}|T], M) -> same_mat_1(T, M);
+same_mat_1([], M) -> M;
+same_mat_1(_, _) -> [].
+
+used_materials_1([{_,M}|T], [M|_]=Acc) ->
+    used_materials_1(T, Acc);
+used_materials_1([{_,M}|T], Acc) ->
+    used_materials_1(T, [M|Acc]);
+used_materials_1([], Acc) ->
+    ordsets:from_list(Acc).
+
+mat_faces_1([{F1,_}|_]=Fs, [{F2,_}|Ms], Acc) when F2 < F1 ->
+    mat_faces_1(Fs, Ms, Acc);
+mat_faces_1([{F,Info}|Fs], [{F,Mat}|Ms], Acc) ->
+    mat_faces_1(Fs, Ms, [{Mat,{F,Info}}|Acc]);
+mat_faces_1([], _, Acc) -> wings_util:rel2fam(Acc).
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_intl.hrl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_intl.hrl
index ebcb560f27..ebcb560f27 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_intl.hrl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_intl.hrl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_io.erl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_io.erl
index 39002c675d..39002c675d 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_io.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_io.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_sel.erl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_sel.erl
index eef797027e..eef797027e 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_sel.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_sel.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_shape.erl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_shape.erl
index 0df8ca68eb..0df8ca68eb 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_shape.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_shape.erl
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_util.erl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_util.erl
new file mode 100644
index 0000000000..8f0da1f5dc
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_util.erl
@@ -0,0 +1,38 @@
+%%
+%%  wings_util.erl --
+%%
+%%     Various utility functions that not obviously fit somewhere else.
+%%
+
+-module(wings_util).
+
+-export([gb_trees_smallest_key/1, gb_trees_largest_key/1,
+	 gb_trees_map/2, rel2fam/1]).
+
+-include("wings.hrl").
+
+rel2fam(Rel) ->
+    sofs:to_external(sofs:relation_to_family(sofs:relation(Rel))).
+
+%% a definition that does not violate the opaqueness of gb_tree()
+gb_trees_smallest_key(Tree) ->
+    {Key, _V} = gb_trees:smallest(Tree),
+    Key.
+
+%% a definition that violates the opaqueness of gb_tree()
+gb_trees_largest_key({_, Tree}) ->
+    largest_key1(Tree).
+
+largest_key1({Key, _Value, _Smaller, nil}) ->
+    Key;
+largest_key1({_Key, _Value, _Smaller, Larger}) ->
+    largest_key1(Larger).
+
+gb_trees_map(F, {Size,Tree}) ->
+    {Size,gb_trees_map_1(F, Tree)}.
+
+gb_trees_map_1(_, nil) -> nil;
+gb_trees_map_1(F, {K,V,Smaller,Larger}) ->
+    {K,F(K, V),
+     gb_trees_map_1(F, Smaller),
+     gb_trees_map_1(F, Larger)}.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_we.erl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_we.erl
new file mode 100644
index 0000000000..6a93363445
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_we.erl
@@ -0,0 +1,250 @@
+%%
+%%  wings_we.erl --
+%%
+%%     This module contains functions to build and manipulate
+%%     we records (winged-edged records, the central data structure
+%%     in Wings 3D).
+
+-module(wings_we).
+
+-export([rebuild/1, is_consistent/1, is_face_consistent/2, new_id/1,
+	 new_items_as_ordset/3, validate_mirror/1, visible/1, visible_edges/1]).
+
+-include("wings.hrl").
+
+%%%
+%%% API.
+%%%
+
+validate_mirror(#we{mirror=none}=We) -> We;
+validate_mirror(#we{fs=Ftab,mirror=Face}=We) ->
+    case gb_trees:is_defined(Face, Ftab) of
+        false -> We#we{mirror=none};
+        true -> We
+    end.
+
+%% rebuild(We) -> We'
+%%  Rebuild any missing 'vc' and 'fs' tables. If there are
+%%  fewer elements in the 'vc' table than in the 'vp' table,
+%%  remove redundant entries in the 'vp' table. Updated id
+%%  bounds.
+rebuild(#we{vc=undefined,fs=undefined,es=Etab0}=We0) ->
+    Etab = gb_trees:to_list(Etab0),
+    Ftab = rebuild_ftab(Etab),
+    VctList = rebuild_vct(Etab),
+    We = We0#we{vc=gb_trees:from_orddict(VctList),fs=Ftab},
+    rebuild_1(VctList, We);
+rebuild(#we{vc=undefined,es=Etab}=We) ->
+    VctList = rebuild_vct(gb_trees:to_list(Etab), []),
+    rebuild_1(VctList, We#we{vc=gb_trees:from_orddict(VctList)});
+rebuild(#we{fs=undefined,es=Etab}=We) ->
+    Ftab = rebuild_ftab(gb_trees:to_list(Etab)),
+    rebuild(We#we{fs=Ftab});
+rebuild(We) -> update_id_bounds(We).
+
+%%% Utilities for allocating IDs.
+
+new_id(#we{next_id=Id}=We) ->
+    {Id,We#we{next_id=Id+1}}.
+
+%%% Returns sets of newly created items.
+
+new_items_as_ordset(vertex, #we{next_id=Wid}, #we{next_id=NewWid,vp=Tab}) ->
+    new_items_as_ordset_1(Tab, Wid, NewWid);
+new_items_as_ordset(edge, #we{next_id=Wid}, #we{next_id=NewWid,es=Tab}) ->
+    new_items_as_ordset_1(Tab, Wid, NewWid);
+new_items_as_ordset(face, #we{next_id=Wid}, #we{next_id=NewWid,fs=Tab}) ->
+    new_items_as_ordset_1(Tab, Wid, NewWid).
+
+any_hidden(#we{fs=Ftab}) ->
+    not gb_trees:is_empty(Ftab) andalso
+	wings_util:gb_trees_smallest_key(Ftab) < 0.
+
+%%%
+%%% Local functions.
+%%%
+
+rebuild_1(VctList, #we{vc=Vct,vp=Vtab0}=We) ->
+    case {gb_trees:size(Vct),gb_trees:size(Vtab0)} of
+	{Same,Same} -> rebuild(We);
+	{Sz1,Sz2} when Sz1 < Sz2 ->
+	    Vtab = vertex_gc_1(VctList, gb_trees:to_list(Vtab0), []),
+	    rebuild(We#we{vp=Vtab})
+    end.
+
+rebuild_vct(Es) ->
+    rebuild_vct(Es, []).
+
+rebuild_vct([{Edge,#edge{vs=Va,ve=Vb}}|Es], Acc0) ->
+    Acc = rebuild_maybe_add(Va, Vb, Edge, Acc0),
+    rebuild_vct(Es, Acc);
+rebuild_vct([], VtoE) ->
+    build_incident_tab(VtoE).
+
+rebuild_ftab(Es) ->
+    rebuild_ftab_1(Es, []).
+
+rebuild_ftab_1([{Edge,#edge{lf=Lf,rf=Rf}}|Es], Acc0) ->
+    Acc = rebuild_maybe_add(Lf, Rf, Edge, Acc0),
+    rebuild_ftab_1(Es, Acc);
+rebuild_ftab_1([], FtoE) ->
+    gb_trees:from_orddict(build_incident_tab(FtoE)).
+
+rebuild_maybe_add(Ka, Kb, E, [_,{Ka,_}|_]=Acc) ->
+    [{Kb,E}|Acc];
+rebuild_maybe_add(Ka, Kb, E, [_,{Kb,_}|_]=Acc) ->
+    [{Ka,E}|Acc];
+rebuild_maybe_add(Ka, Kb, E, [{Ka,_}|_]=Acc) ->
+    [{Kb,E}|Acc];
+rebuild_maybe_add(Ka, Kb, E, [{Kb,_}|_]=Acc) ->
+    [{Ka,E}|Acc];
+rebuild_maybe_add(Ka, Kb, E, Acc) ->
+    [{Ka,E},{Kb,E}|Acc].
+
+vertex_gc_1([{V,_}|Vct], [{V,_}=Vtx|Vpos], Acc) ->
+    vertex_gc_1(Vct, Vpos, [Vtx|Acc]);
+vertex_gc_1([_|_]=Vct, [_|Vpos], Acc) ->
+    vertex_gc_1(Vct, Vpos, Acc);
+vertex_gc_1([], _, Acc) ->
+    gb_trees:from_orddict(lists:reverse(Acc)).
+
+%%%
+%%% Handling of hidden faces.
+%%%
+
+visible(#we{mirror=none,fs=Ftab}) ->
+    visible_2(gb_trees:keys(Ftab));
+visible(#we{mirror=Face,fs=Ftab}) ->
+    visible_2(gb_trees:keys(gb_trees:delete(Face, Ftab))).
+
+visible_2([F|Fs]) when F < 0 -> visible_2(Fs);
+visible_2(Fs) -> Fs.
+
+visible_edges(#we{es=Etab,mirror=Face}=We) ->
+    case any_hidden(We) of
+	false -> gb_trees:keys(Etab);
+	true -> visible_es_1(gb_trees:to_list(Etab), Face, [])
+    end.
+
+visible_es_1([{E,#edge{lf=Lf,rf=Rf}}|Es], Face, Acc) ->
+    if
+	Lf < 0 ->
+	    %% Left face hidden.
+	    if
+		Rf < 0; Rf =:= Face ->
+		    %% Both faces invisible (in some way).
+		    visible_es_1(Es, Face, Acc);
+		true ->
+		    %% Right face is visible.
+		    visible_es_1(Es, Face, [E|Acc])
+	    end;
+	Lf =:= Face, Rf < 0 ->
+	    %% Left face mirror, right face hidden.
+	    visible_es_1(Es, Face, Acc);
+	true ->
+	    %% At least one face visible.
+	    visible_es_1(Es, Face, [E|Acc])
+    end;
+visible_es_1([], _, Acc) -> ordsets:from_list(Acc).
+
+update_id_bounds(#we{vp=Vtab,es=Etab,fs=Ftab}=We) ->
+    case gb_trees:is_empty(Etab) of
+	true -> We#we{next_id=0};
+	false ->
+	    LastId = lists:max([wings_util:gb_trees_largest_key(Vtab),
+				wings_util:gb_trees_largest_key(Etab),
+				wings_util:gb_trees_largest_key(Ftab)]),
+	    We#we{next_id=LastId+1}
+    end.
+
+%% build_incident_tab([{Elem,Edge}]) -> [{Elem,Edge}]
+%%      Elem = Face or Vertex
+%%  Build the table of incident edges for either faces or vertices.
+%%  Returns an ordered list where each Elem is unique.
+
+build_incident_tab(ElemToEdgeRel) ->
+    T = ets:new(?MODULE, [ordered_set]),
+    ets:insert(T, ElemToEdgeRel),
+    R = ets:tab2list(T),
+    ets:delete(T),
+    R.
+
+%%%
+%%% Calculate normals.
+%%%
+
+new_items_as_ordset_1(Tab, Wid, NewWid) when NewWid-Wid < 32 ->
+    new_items_as_ordset_2(Wid, NewWid, Tab, []);
+new_items_as_ordset_1(Tab, Wid, _NewWid) ->
+    [Item || Item <- gb_trees:keys(Tab), Item >= Wid].
+
+new_items_as_ordset_2(Wid, NewWid, Tab, Acc) when Wid < NewWid ->
+    case gb_trees:is_defined(Wid, Tab) of
+	true -> new_items_as_ordset_2(Wid+1, NewWid, Tab, [Wid|Acc]);
+	false -> new_items_as_ordset_2(Wid+1, NewWid, Tab, Acc)
+    end;
+new_items_as_ordset_2(_Wid, _NewWid, _Tab, Acc) -> lists:reverse(Acc).
+
+%%%
+%%% Test the consistency of a #we{}.
+%%%
+
+is_consistent(#we{}=We) ->
+    try
+	validate_vertex_tab(We),
+	validate_faces(We)
+    catch error:_ -> false
+    end.
+
+is_face_consistent(Face, #we{fs=Ftab,es=Etab}) ->
+    Edge = gb_trees:get(Face, Ftab),
+    try validate_face(Face, Edge, Etab)
+    catch error:_ -> false
+    end.
+
+validate_faces(#we{fs=Ftab,es=Etab}) ->
+    validate_faces_1(gb_trees:to_list(Ftab), Etab).
+
+validate_faces_1([{Face,Edge}|Fs], Etab) ->
+    validate_face(Face, Edge, Etab),
+    validate_faces_1(Fs, Etab);
+validate_faces_1([], _) -> true.
+
+validate_face(Face, Edge, Etab) ->
+    Ccw = walk_face_ccw(Edge, Etab, Face, Edge, []),
+    Edge = walk_face_cw(Edge, Etab, Face, Ccw),
+    [V|Vs] = lists:sort(Ccw),
+    validate_face_vertices(Vs, V).
+
+validate_face_vertices([V|_], V) ->
+    erlang:error(repeated_vertex);
+validate_face_vertices([_], _) ->
+    true;
+validate_face_vertices([V|Vs], _) ->
+    validate_face_vertices(Vs, V).
+
+walk_face_ccw(LastEdge, _, _, LastEdge, [_|_]=Acc) -> Acc;
+walk_face_ccw(Edge, Etab, Face, LastEdge, Acc) ->
+    case gb_trees:get(Edge, Etab) of
+	#edge{ve=V,lf=Face,ltpr=Next} ->
+	    walk_face_ccw(Next, Etab, Face, LastEdge, [V|Acc]);
+	#edge{vs=V,rf=Face,rtpr=Next} ->
+	    walk_face_ccw(Next, Etab, Face, LastEdge, [V|Acc])
+    end.
+
+walk_face_cw(Edge, _, _, []) -> Edge;
+walk_face_cw(Edge, Etab, Face, [V|Vs]) ->
+    case gb_trees:get(Edge, Etab) of
+	#edge{vs=V,lf=Face,ltsu=Next} ->
+	    walk_face_cw(Next, Etab, Face, Vs);
+	#edge{ve=V,rf=Face,rtsu=Next} ->
+	    walk_face_cw(Next, Etab, Face, Vs)
+    end.
+
+validate_vertex_tab(#we{es=Etab,vc=Vct}) ->
+    lists:foreach(fun({V,Edge}) ->
+			  case gb_trees:get(Edge, Etab) of
+			      #edge{vs=V} -> ok;
+			      #edge{ve=V} -> ok
+			  end
+		  end, gb_trees:to_list(Vct)).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis1.erl b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis1.erl
new file mode 100644
index 0000000000..e09ccb80df
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis1.erl
@@ -0,0 +1,14 @@
+-module(zoltan_kis1).
+
+-export([f/0, gen/0]).
+
+-opaque id() :: string().
+
+-spec f() -> integer().
+
+%% BIF and Unification(t_unify) issue
+f() -> erlang:length(gen()).
+
+-spec gen() -> id().
+
+gen() -> "Dummy".
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis2.erl b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis2.erl
new file mode 100644
index 0000000000..38c6051c58
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis2.erl
@@ -0,0 +1,14 @@
+-module(zoltan_kis2).
+
+-export([get/2]).
+
+-opaque data() :: gb_tree().
+
+-spec get(term(), data()) -> term().
+
+get(Key, Data) ->
+  %% Should unopaque data for remote calls
+  case gb_trees:lookup(Key, Data) of
+    'none' -> 'undefined';
+    {'value', Val} -> Val
+  end.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis3.erl b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis3.erl
new file mode 100644
index 0000000000..b62b9de576
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis3.erl
@@ -0,0 +1,14 @@
+-module(zoltan_kis3).
+
+-export([f/0, gen/0]).
+
+-opaque id() :: string().
+
+-spec f() -> char().
+
+%% List pattern matching issue
+f() -> [H|_T] = gen(), H.
+
+-spec gen() -> id().
+
+gen() -> "Dummy".
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis4.erl b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis4.erl
new file mode 100644
index 0000000000..026d6f0c77
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis4.erl
@@ -0,0 +1,13 @@
+-module(zoltan_kis4).
+
+-export([f/0, gen/0]).
+
+-export_type([id/0]).
+
+-opaque id() :: string().
+
+-spec f() -> id().
+f() -> "Dummy" = gen().  %% Matching issue
+
+-spec gen() -> id().
+gen() -> "Dummy".
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis5.erl b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis5.erl
new file mode 100644
index 0000000000..ecf14c91c1
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis5.erl
@@ -0,0 +1,14 @@
+-module(zoltan_kis5).
+
+-export([f/0, gen/0]).
+
+-opaque id() :: string().
+
+-spec f() -> boolean().
+
+%% Equality test issue
+f() -> "Dummy" == gen().
+
+-spec gen() -> id().
+
+gen() -> "Dummy".
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis6.erl b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis6.erl
index 6f0779d7d1..6f0779d7d1 100644
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis6.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis6.erl
diff --git a/lib/dialyzer/test/opaque_tests_SUITE.erl b/lib/dialyzer/test/opaque_tests_SUITE.erl
deleted file mode 100644
index 6b90e7a646..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE.erl
+++ /dev/null
@@ -1,184 +0,0 @@
-%% ATTENTION!
-%% This is an automatically generated file. Do not edit.
-%% Use './remake' script to refresh it if needed.
-%% All Dialyzer options should be defined in dialyzer_options
-%% file.
-
--module(opaque_tests_SUITE).
-
--include("ct.hrl").
--include("dialyzer_test_constants.hrl").
-
--export([suite/0, init_per_suite/0, init_per_suite/1,
-         end_per_suite/1, all/0]).
--export([opaque_tests_SUITE_consistency/1, array/1, crash/1, dict/1, 
-         ets/1, gb_sets/1, inf_loop1/1, int/1, mixed_opaque/1, 
-         my_digraph/1, my_queue/1, opaque/1, queue/1, rec/1, timer/1, 
-         union/1, wings/1, zoltan_kis1/1, zoltan_kis2/1, zoltan_kis3/1, 
-         zoltan_kis4/1, zoltan_kis5/1, zoltan_kis6/1]).
-
-suite() ->
-  [{timetrap, {minutes, 1}}].
-
-init_per_suite() ->
-  [{timetrap, ?plt_timeout}].
-init_per_suite(Config) ->
-  OutDir = ?config(priv_dir, Config),
-  case dialyzer_common:check_plt(OutDir) of
-    fail -> {skip, "Plt creation/check failed."};
-    ok -> [{dialyzer_options, [{warnings,[no_unused,no_return]}]}|Config]
-  end.
-
-end_per_suite(_Config) ->
-  ok.
-
-all() ->
-  [opaque_tests_SUITE_consistency,array,crash,dict,ets,gb_sets,inf_loop1,int,
-   mixed_opaque,my_digraph,my_queue,opaque,queue,rec,timer,union,wings,
-   zoltan_kis1,zoltan_kis2,zoltan_kis3,zoltan_kis4,zoltan_kis5,zoltan_kis6].
-
-dialyze(Config, TestCase) ->
-  Opts = ?config(dialyzer_options, Config),
-  Dir = ?config(data_dir, Config),
-  OutDir = ?config(priv_dir, Config),
-  dialyzer_common:check(TestCase, Opts, Dir, OutDir).
-
-opaque_tests_SUITE_consistency(Config) ->
-  Dir = ?config(data_dir, Config),
-  case dialyzer_common:new_tests(Dir, all()) of
-    []  -> ok;
-    New -> ct:fail({missing_tests,New})
-  end.
-
-array(Config) ->
-  case dialyze(Config, array) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-crash(Config) ->
-  case dialyze(Config, crash) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-dict(Config) ->
-  case dialyze(Config, dict) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets(Config) ->
-  case dialyze(Config, ets) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-gb_sets(Config) ->
-  case dialyze(Config, gb_sets) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-inf_loop1(Config) ->
-  case dialyze(Config, inf_loop1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-int(Config) ->
-  case dialyze(Config, int) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mixed_opaque(Config) ->
-  case dialyze(Config, mixed_opaque) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-my_digraph(Config) ->
-  case dialyze(Config, my_digraph) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-my_queue(Config) ->
-  case dialyze(Config, my_queue) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-opaque(Config) ->
-  case dialyze(Config, opaque) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-queue(Config) ->
-  case dialyze(Config, queue) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-rec(Config) ->
-  case dialyze(Config, rec) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-timer(Config) ->
-  case dialyze(Config, timer) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-union(Config) ->
-  case dialyze(Config, union) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-wings(Config) ->
-  case dialyze(Config, wings) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-zoltan_kis1(Config) ->
-  case dialyze(Config, zoltan_kis1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-zoltan_kis2(Config) ->
-  case dialyze(Config, zoltan_kis2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-zoltan_kis3(Config) ->
-  case dialyze(Config, zoltan_kis3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-zoltan_kis4(Config) ->
-  case dialyze(Config, zoltan_kis4) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-zoltan_kis5(Config) ->
-  case dialyze(Config, zoltan_kis5) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-zoltan_kis6(Config) ->
-  case dialyze(Config, zoltan_kis6) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/dict/dict_use.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/dict/dict_use.erl
deleted file mode 100644
index 2a632a910d..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/dict/dict_use.erl
+++ /dev/null
@@ -1,83 +0,0 @@
--module(dict_use).
-
--export([ok1/0, ok2/0, ok3/0, ok4/0, ok5/0, ok6/0]).
--export([middle/0]).
--export([w1/0, w2/0, w3/0, w4/1, w5/0, w6/0, w7/0, w8/1, w9/0]).
-
--define(DICT, dict).
-
-%%---------------------------------------------------------------------
-%% Cases that are OK
-%%---------------------------------------------------------------------
-
-ok1() ->
-  dict:new().
-
-ok2() ->
-  case dict:new() of X -> X end.
-
-ok3() ->
-  Dict1 = dict:new(),
-  Dict2 = dict:new(),
-  Dict1 =:= Dict2.
-
-ok4() ->
-  dict:fetch(foo, dict:new()).
-
-ok5() ->  % this is OK since some_mod:new/0 might be returning a dict()
-  dict:fetch(foo, some_mod:new()).
-
-ok6() ->
-  dict:store(42, elli, dict:new()).
-
-middle() ->
-  {w1(), w2()}.
-
-%%---------------------------------------------------------------------
-%% Cases that are problematic w.r.t. opaqueness of types
-%%---------------------------------------------------------------------
-
-w1() ->
-  gazonk = dict:new().
-
-w2() ->
-  case dict:new() of
-    [] -> nil;
-    42 -> weird
-  end.
-
-w3() ->
-  try dict:new() of
-    [] -> nil;
-    42 -> weird
-  catch
-    _:_ -> exception
-  end.
-
-w4(Dict) when is_list(Dict) ->
-  Dict =:= dict:new();
-w4(Dict) when is_atom(Dict) ->
-  Dict =/= dict:new().
-
-w5() ->
-  case dict:new() of
-    D when length(D) =/= 42 -> weird;
-    D when is_atom(D) -> weirder;
-    D when is_list(D) -> gazonk
-  end.
-
-w6() ->
-  is_list(dict:new()).
-
-w7() ->
-  dict:fetch(foo, [1,2,3]).
-
-w8(Fun) ->
-  dict:merge(Fun, 42, [1,2]).
-
-w9() ->
-  dict:store(42, elli,
-	     {dict,0,16,16,8,80,48,
-	           {[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]},
-	           {{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}}}).
-
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/ets/ets_use.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/ets/ets_use.erl
deleted file mode 100644
index 20be9803eb..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/ets/ets_use.erl
+++ /dev/null
@@ -1,17 +0,0 @@
--module(ets_use).
--export([t1/0, t2/0]).
-
-t1() ->
-    case n() of
-	T when is_atom(T) -> atm;
-	T when is_integer(T) -> int
-    end.
-
-t2() ->
-    case n() of
-	T when is_integer(T) -> int;
-	T when is_atom(T) -> atm
-    end.
-
-n() -> ets:new(n, [named_table]).
-
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/my_digraph/my_digraph_adt.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/my_digraph/my_digraph_adt.erl
deleted file mode 100644
index 20c72aa6eb..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/my_digraph/my_digraph_adt.erl
+++ /dev/null
@@ -1,51 +0,0 @@
--module(my_digraph_adt).
-
--export([new/0, new/1]).
-
--record(my_digraph, {vtab = notable,
-		     etab = notable,
-		     ntab = notable,
-		     cyclic = true   :: boolean()}).
-
--opaque my_digraph() :: #my_digraph{}.
-
--type d_protection() :: 'private' | 'protected'.
--type d_cyclicity()  :: 'acyclic' | 'cyclic'.
--type d_type()       :: d_cyclicity() | d_protection().
-
--spec new() -> my_digraph().
-new() -> new([]).
-
--spec new([atom()]) -> my_digraph().
-new(Type) ->
-    try check_type(Type, protected, []) of
-	{Access, Ts} ->
-	    V = ets:new(vertices, [set, Access]),
-	    E = ets:new(edges, [set, Access]),
-	    N = ets:new(neighbours, [bag, Access]),
-	    ets:insert(N, [{'$vid', 0}, {'$eid', 0}]),
-	    set_type(Ts, #my_digraph{vtab=V, etab=E, ntab=N})
-    catch
-	throw:Error -> throw(Error)
-    end.
-
--spec check_type([atom()], d_protection(), [{'cyclic', boolean()}]) ->
-       	{d_protection(), [{'cyclic', boolean()}]}.
-
-check_type([acyclic|Ts], A, L) ->
-    check_type(Ts, A,[{cyclic,false} | L]);
-check_type([cyclic | Ts], A, L) ->
-    check_type(Ts, A, [{cyclic,true} | L]);
-check_type([protected | Ts], _, L) ->
-    check_type(Ts, protected, L);
-check_type([private | Ts], _, L) ->
-    check_type(Ts, private, L);
-check_type([T | _], _, _) -> 
-    throw({error, {unknown_type, T}});
-check_type([], A, L) -> {A, L}.
-
--spec set_type([{'cyclic', boolean()}], my_digraph()) -> my_digraph().
-
-set_type([{cyclic,V} | Ks], G) ->
-    set_type(Ks, G#my_digraph{cyclic = V});
-set_type([], G) -> G.
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque/opaque_bug1.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque/opaque_bug1.erl
deleted file mode 100644
index ff0b1d05ab..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/opaque/opaque_bug1.erl
+++ /dev/null
@@ -1,17 +0,0 @@
-%%---------------------------------------------------------------------
-%% A test for which the analysis went into an infinite loop due to
-%% specialization using structured type instead of the opaque one.
-%%---------------------------------------------------------------------
-
--module(opaque_bug1).
-
--export([test/1]).
-
--record(c, {a::atom()}).
-
--opaque erl_type() :: 'any' | #c{}.
-
-test(#c{a=foo} = T) -> local(T).
-
-local(#c{a=foo}) -> any.
-
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/queue/queue_use.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/queue/queue_use.erl
deleted file mode 100644
index 5682f2281e..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/queue/queue_use.erl
+++ /dev/null
@@ -1,66 +0,0 @@
--module(queue_use).
-
--export([ok1/0, ok2/0]).
--export([wrong1/0, wrong2/0, wrong3/0, wrong4/0, wrong5/0, wrong6/0, wrong7/0, wrong8/0]).
-
-ok1() ->
-    queue:is_empty(queue:new()).
-
-ok2() ->
-    Q0 = queue:new(),
-    Q1 = queue:in(42, Q0),
-    {{value, 42}, Q2} = queue:out(Q1),
-    queue:is_empty(Q2).
-
-%%--------------------------------------------------
-
-wrong1() ->
-    queue:is_empty({[],[]}).
-
-wrong2() ->
-    Q0 = {[],[]},
-    queue:in(42, Q0).
-
-wrong3() ->
-    Q0 = queue:new(),
-    Q1 = queue:in(42, Q0),
-    {[42],Q2} = Q1,
-    Q2.
-
-wrong4() ->
-    Q0 = queue:new(),
-    Q1 = queue:in(42, Q0),
-    Q1 =:= {[42],[]}.
-
-wrong5() ->
-    {F, _R} = queue:new(),
-    F.
-
-wrong6() ->
-    {{value, 42}, Q2} = queue:out({[42],[]}),
-    Q2.
-
-%%--------------------------------------------------
-
--record(db, {p, q}).
-
-wrong7() ->
-    add_unique(42, #db{p = [], q = queue:new()}).
-
-add_unique(E, DB) ->
-    case is_in_queue(E, DB) of
-	true -> DB;
-	false -> DB#db{q = queue:in(E, DB#db.q)}
-    end.
-
-is_in_queue(P, #db{q = {L1,L2}}) ->
-    lists:member(P, L1) orelse lists:member(P, L2).
-
-%%--------------------------------------------------
-
-wrong8() ->
-    tuple_queue({42, gazonk}).
-
-tuple_queue({F, Q}) ->
-    queue:in(F, Q).
-
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings.hrl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings.hrl
deleted file mode 100644
index b9339a8eb1..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings.hrl
+++ /dev/null
@@ -1,205 +0,0 @@
-%%
-%%  wings.hrl --
-%%
-%%     Global record definition and defines.
-%%
-%%  Copyright (c) 2001-2005 Bjorn Gustavsson
-%%
-%%  See the file "license.terms" for information on usage and redistribution
-%%  of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-%%
-%%     $Id: wings.hrl,v 1.1 2009/01/25 18:55:33 kostis Exp $
-%%
-
--include("wings_intl.hrl").
-
--ifdef(NEED_ESDL).
--include_lib("esdl/include/sdl.hrl").
--include_lib("esdl/include/sdl_events.hrl").
--include_lib("esdl/include/sdl_video.hrl").
--include_lib("esdl/include/sdl_keyboard.hrl").
--include_lib("esdl/include/sdl_mouse.hrl").
--include_lib("esdl/src/sdl_util.hrl").
--define(CTRL_BITS, ?KMOD_CTRL).
--define(ALT_BITS, ?KMOD_ALT).
--define(SHIFT_BITS, ?KMOD_SHIFT).
--define(META_BITS, ?KMOD_META).
--endif.
-
--define(WINGS_VERSION, ?wings_version).
-
--define(CHAR_HEIGHT, wings_text:height()).
--define(CHAR_WIDTH, wings_text:width()).
-
--define(LINE_HEIGHT, (?CHAR_HEIGHT+2)).
--define(GROUND_GRID_SIZE, 1).
--define(CAMERA_DIST, (8.0*?GROUND_GRID_SIZE)).
--define(NORMAL_LINEWIDTH, 1.0).
--define(DEGREE, 176).				%Degree character.
-
--define(HIT_BUF_SIZE, (1024*1024)).
-
--define(PANE_COLOR, {0.52,0.52,0.52}).
--define(BEVEL_HIGHLIGHT, {0.9,0.9,0.9}).
--define(BEVEL_LOWLIGHT, {0.3,0.3,0.3}).
--define(BEVEL_HIGHLIGHT_MIX, 0.5).
--define(BEVEL_LOWLIGHT_MIX, 0.5).
-
--define(SLOW(Cmd), begin wings_io:hourglass(), Cmd end).
--define(TC(Cmd), wings_util:tc(fun() -> Cmd end, ?MODULE, ?LINE)).
-
--ifdef(DEBUG).
--define(ASSERT(E), case E of
-		       true -> ok;
-		       _ ->
-			   erlang:error({assertion_failed,?MODULE,?LINE})
-		   end).
--define(CHECK_ERROR(), wings_gl:check_error(?MODULE, ?LINE)).
--else.
--define(ASSERT(E),ok).
--define(CHECK_ERROR(), ok).
--endif.
-
-%% Display lists per object.
-%%  Important: Plain integers and integers in lists will be assumed to
-%%  be display lists. Arbitrary integers must be stored inside a tuple
-%%  or record to not be interpreted as a display list.
--record(dlo,
-	{work=none,				%Workmode faces.
-	 smooth=none,				%Smooth-shaded faces.
-	 edges=none,				%Edges and wire-frame.
-	 vs=none,				%Unselected vertices.
-	 hard=none,				%Hard edges.
-	 sel=none,				%Selected items.
-	 orig_sel=none,				%Original selection.
-	 normals=none,				%Normals.
-	 pick=none,				%For picking.
-	 proxy_faces=none,			%Smooth proxy faces.
-	 proxy_edges=none,			%Smooth proxy edges.
-
-	 %% Miscellanous.
-	 hilite=none,				%Hilite display list.
-	 mirror=none,				%Virtual mirror data.
-	 ns=none,				%Normals/positions per face.
-
-	 %% Source for display lists.
-	 src_we=none,				%Source object.
-	 src_sel=none,				%Source selection.
-	 orig_mode=none,			%Original selection mode.
-	 split=none,				%Split data.
-	 drag=none,				%For dragging.
-	 transparent=false,			%Object includes transparancy.
-	 proxy_data=none,			%Data for smooth proxy.
-	 open=false,				%Open (has hole).
-
-	 %% List of display lists known to be needed only based
-	 %% on display modes, not whether the lists themselves exist.
-	 %% Example: [work,edges]
-	 needed=[]
-	}).
-
-%% Main state record containing all objects and other important state.
--record(st,
-	{shapes,				%All visible shapes
-	 selmode,				%Selection mode:
-						% vertex, edge, face, body
-	 sh=false,				%Smart highlight active: true|false
-	 sel=[],				%Current sel: [{Id,GbSet}]
-	 ssels=[],				%Saved selections:
-	 					%  [{Name,Mode,GbSet}]
-	 temp_sel=none,			        %Selection only temporary?
-
-	 mat,					%Defined materials (GbTree).
-	 pal=[],                                %Palette
-	 file,					%Current filename.
-	 saved,					%True if model has been saved.
-	 onext,					%Next object id to use.
-	 bb=none,				%Saved bounding box.
-	 edge_loop=none,			%Previous edge loop.
-	 views={0,{}},				%{Current,TupleOfViews}
-	 pst=gb_trees:empty(),                  %Plugin State Info
-						%   gb_tree where key is plugin	module 
-
-	 %% Previous commands.
-	 repeatable,			        %Last repeatable command.
-	 ask_args,				%Ask arguments.
-	 drag_args,			        %Drag arguments for command.
-	 def,					%Default operations.
-
-	 %% Undo information.
-	 top,					%Top of stack.
-	 bottom,				%Bottom of stack.
-	 next_is_undo,				%State of undo/redo toggle.
-	 undone				        %States that were undone.
-	}).
-
-%% The Winged-Edge data structure.
-%% See http://www.cs.mtu.edu/~shene/COURSES/cs3621/NOTES/model/winged-e.html
--record(we,
-	{id,					%Shape id.
-	 perm=0,				%Permissions:
-						% 0 - Everything allowed.
-						% 1 - Visible, can't select.
-						% [] or {Mode,GbSet} -
-						%  Invisible, can't select.
-						%  The GbSet contains the
-						%  object's selection.
-	 name,					%Name.
-	 es,					%gb_tree containing edges
-	 fs,					%gb_tree containing faces
-	 he,					%gb_sets containing hard edges
-	 vc,					%Connection info (=incident edge)
-						% for vertices.
-	 vp,					%Vertex positions.
-	 pst=gb_trees:empty(),                  %Plugin State Info, 
-						%   gb_tree where key is plugin module
-	 mat=default,				%Materials.
-	 next_id,				%Next free ID for vertices,
-						% edges, and faces.
-						% (Needed because we never re-use
-						%  IDs.)
-	 mode,					%'vertex'/'material'/'uv'
-	 mirror=none,				%Mirror: none|Face
-	 light=none,				%Light data: none|Light
-	 has_shape=true				%true|false
-	}).
-
--define(IS_VISIBLE(Perm), (Perm =< 1)).
--define(IS_NOT_VISIBLE(Perm), (Perm > 1)).
--define(IS_SELECTABLE(Perm), (Perm == 0)).
--define(IS_NOT_SELECTABLE(Perm), (Perm =/= 0)).
-
--define(IS_LIGHT(We), ((We#we.light =/= none) and (not We#we.has_shape))).
--define(IS_ANY_LIGHT(We), (We#we.light =/= none)).
--define(HAS_SHAPE(We), (We#we.has_shape)).
-%-define(IS_LIGHT(We), (We#we.light =/= none)).
-%-define(IS_NOT_LIGHT(We), (We#we.light =:= none)).
-
-%% Edge in a winged-edge shape.
--record(edge,
-	{vs,					%Start vertex for edge
-	 ve,					%End vertex for edge
-	 a=none,			        %Color or UV coordinate.
-	 b=none,			        %Color or UV coordinate.
-	 lf,					%Left face
-	 rf,					%Right face
-	 ltpr,					%Left traversal predecessor
-	 ltsu,					%Left traversal successor
-	 rtpr,					%Right traversal predecessor
-	 rtsu					%Right traversal successor
-	}).
-
-%% The current view/camera.
--record(view,
-	{origin,
-	 distance,				% From origo.
-	 azimuth,
-	 elevation,
-	 pan_x,					%Panning in X direction.
-	 pan_y,					%Panning in Y direction.
-	 along_axis=none,			%Which axis viewed along.
-	 fov,					%Field of view.
-	 hither,				%Near clipping plane.
-	 yon					%Far clipping plane.
-	}).
-
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_dissolve.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_dissolve.erl
deleted file mode 100644
index d7af9bb1d3..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_dissolve.erl
+++ /dev/null
@@ -1,375 +0,0 @@
-%%
-%%  wings_dissolve.erl --
-%%
-%%     This module implements dissolve of faces.
-%%
-
--module(wings_dissolve).
-
--export([faces/2, complement/2]).
-
--include("wings.hrl").
-
-%% faces([Face], We) -> We'
-%%  Dissolve the given faces.
-faces([], We) -> We;
-faces(Faces, #we{fs=Ftab0}=We) ->
-    case gb_sets:is_empty(Faces) of
-	true -> We;
-	false when is_list(Faces) -> 
-	    Complement = ordsets:subtract(gb_trees:keys(Ftab0), 
-					  ordsets:from_list(Faces)),
-	    dissolve_1(Faces, Complement, We);
-	false ->
-	    Complement = ordsets:subtract(gb_trees:keys(Ftab0), 
-					  gb_sets:to_list(Faces)),
-	    dissolve_1(Faces, Complement, We)
-    end.
-
-faces([], _, We) -> We;
-faces(Faces,Complement,We) ->
-    case gb_sets:is_empty(Faces) of
-        true -> We;
-        false -> dissolve_1(Faces, Complement,We)
-    end.
-
-dissolve_1(Faces, Complement, We0) ->
-    We1 = optimistic_dissolve(Faces,Complement,We0#we{vc=undefined}),
-    NewFaces = wings_we:new_items_as_ordset(face, We0, We1),
-    We2 = wings_face:delete_bad_faces(NewFaces, We1),
-    We = wings_we:rebuild(We2),
-    case wings_we:is_consistent(We) of
-	true ->
-	    We;
-	false ->
-	    io:format("Dissolving would cause an inconsistent object structure.")
-    end.
-
-%% complement([Face], We) -> We'
-%%  Dissolve all faces BUT the given faces. Also invalidate the
-%%  mirror face if it existed and was dissolved.
-complement(Fs0, #we{fs=Ftab0}=We0) when is_list(Fs0) ->
-    Fs = ordsets:subtract(gb_trees:keys(Ftab0), ordsets:from_list(Fs0)),
-    case faces(Fs, Fs0, We0) of
-        #we{mirror=none}=We -> We;
-        #we{mirror=Face,fs=Ftab}=We ->
-            case gb_trees:is_defined(Face, Ftab) of
-                false -> We;
-                true -> We#we{mirror=none}
-            end
-    end;
-complement(Fs, We) -> complement(gb_sets:to_list(Fs), We).
-
-optimistic_dissolve(Faces0, Compl, We0) ->
-    %% Optimistically assume that we have a simple region without
-    %% any holes.
-    case outer_edge_loop(Faces0, We0) of
-	error ->
-	    %% Assumption was wrong. We need to partition the selection
-	    %% and dissolve each partition in turn.
-	    Parts = wings_sel:face_regions(Faces0, We0),
-	    complex_dissolve(Parts, We0);
-	[_|_]=Loop ->
-	    %% Assumption was correct.
-	    simple_dissolve(Faces0, Compl, Loop, We0)
-    end.
-
-%% simple_dissolve(Faces, Loop, We0) -> We
-%%  Dissolve a region of faces with no holes and no
-%%  repeated vertices in the outer edge loop.
-
-simple_dissolve(Faces0, Compl, Loop, We0) ->
-    Faces = to_gb_set(Faces0),
-    OldFace = gb_sets:smallest(Faces),
-    Mat = wings_facemat:face(OldFace, We0),
-    We1 = fix_materials(Faces, Compl, We0),
-    #we{es=Etab0,fs=Ftab0,he=Htab0} = We1,
-    {Ftab1,Etab1,Htab} = simple_del(Faces, Ftab0, Etab0, Htab0, We1),
-    {NewFace,We2} = wings_we:new_id(We1),
-    Ftab = gb_trees:insert(NewFace, hd(Loop), Ftab1),
-    Last = lists:last(Loop),
-    Etab = update_outer([Last|Loop], Loop, NewFace, Ftab, Etab1),
-    We = We2#we{es=Etab,fs=Ftab,he=Htab},
-    wings_facemat:assign(Mat, [NewFace], We).
-
-fix_materials(Del,Keep,We) ->
-    case gb_sets:size(Del) < length(Keep) of
-	true ->
-	    wings_facemat:delete_faces(Del,We);
-	false ->
-	    wings_facemat:keep_faces(Keep,We)
-    end.
-
-to_gb_set(List) when is_list(List) ->
-    gb_sets:from_list(List);
-to_gb_set(S) -> S.
-
-%% Delete faces and inner edges for a simple region.
-simple_del(Faces, Ftab0, Etab0, Htab0, We) ->
-    case {gb_trees:size(Ftab0),gb_sets:size(Faces)} of
-	{AllSz,FaceSz} when AllSz < 2*FaceSz ->
-	    %% At least half of the faces are selected.
-	    %% It is faster to find the edges for the
-	    %% unselected faces.
-	    UnselFaces = ordsets:subtract(gb_trees:keys(Ftab0),
-					  gb_sets:to_list(Faces)),
-
-	    UnselSet = sofs:from_external(UnselFaces, [face]),
-	    Ftab1 = sofs:from_external(gb_trees:to_list(Ftab0),
-				       [{face,edge}]),
-	    Ftab2 = sofs:restriction(Ftab1, UnselSet),
-	    Ftab = gb_trees:from_orddict(sofs:to_external(Ftab2)),
-
-	    Keep0 = wings_face:to_edges(UnselFaces, We),
-	    Keep = sofs:set(Keep0, [edge]),
-	    Etab1 = sofs:from_external(gb_trees:to_list(Etab0),
-				       [{edge,info}]),
-	    Etab2 = sofs:restriction(Etab1, Keep),
-	    Etab = gb_trees:from_orddict(sofs:to_external(Etab2)),
-	    
-	    Htab = simple_del_hard(Htab0, sofs:to_external(Keep), undefined),
-	    {Ftab,Etab,Htab};
-	{_,_} ->
-	    Ftab = lists:foldl(fun(Face, Ft) ->
-				       gb_trees:delete(Face, Ft)
-			       end, Ftab0, gb_sets:to_list(Faces)),
-	    Inner = wings_face:inner_edges(Faces, We),
-	    Etab = lists:foldl(fun(Edge, Et) ->
-				       gb_trees:delete(Edge, Et)
-			       end, Etab0, Inner),
-	    Htab = simple_del_hard(Htab0, undefined, Inner),
-	    {Ftab,Etab,Htab}
-    end.
-
-simple_del_hard(Htab, Keep, Remove) ->
-    case gb_sets:is_empty(Htab) of
-	true -> Htab;
-	false -> simple_del_hard_1(Htab, Keep, Remove)
-    end.
-
-simple_del_hard_1(Htab, Keep, undefined) ->
-    gb_sets:intersection(Htab, gb_sets:from_ordset(Keep));
-simple_del_hard_1(Htab, undefined, Remove) ->
-    gb_sets:difference(Htab, gb_sets:from_ordset(Remove)).
-
-%% complex([Partition], We0) -> We0
-%%  The general dissolve.
-
-complex_dissolve([Faces|T], We0) ->
-    Face = gb_sets:smallest(Faces),
-    Mat = wings_facemat:face(Face, We0),
-    We1 = wings_facemat:delete_faces(Faces, We0),
-    Parts = outer_edge_partition(Faces, We1),
-    We = do_dissolve(Faces, Parts, Mat, We0, We1),
-    complex_dissolve(T, We);
-complex_dissolve([], We) -> We.
-
-do_dissolve(Faces, Ess, Mat, WeOrig, We0) ->
-    We1 = do_dissolve_faces(Faces, We0),
-    Inner = wings_face:inner_edges(Faces, WeOrig),
-    We2 = delete_inner(Inner, We1),
-    #we{he=Htab0} = We = do_dissolve_1(Ess, Mat, We2),
-    Htab = gb_sets:difference(Htab0, gb_sets:from_list(Inner)),
-    We#we{he=Htab}.
-
-do_dissolve_1([EdgeList|Ess], Mat, #we{es=Etab0,fs=Ftab0}=We0) ->
-    {Face,We1} = wings_we:new_id(We0),
-    Ftab = gb_trees:insert(Face, hd(EdgeList), Ftab0),
-    Last = lists:last(EdgeList),
-    Etab = update_outer([Last|EdgeList], EdgeList, Face, Ftab, Etab0),
-    We2 = We1#we{es=Etab,fs=Ftab},
-    We = wings_facemat:assign(Mat, [Face], We2),
-    do_dissolve_1(Ess, Mat, We);
-do_dissolve_1([], _Mat, We) -> We.
-
-do_dissolve_faces(Faces, #we{fs=Ftab0}=We) ->
-    Ftab = lists:foldl(fun(Face, Ft) ->
-			       gb_trees:delete(Face, Ft)
-		       end, Ftab0, gb_sets:to_list(Faces)),
-    We#we{fs=Ftab}.
-
-delete_inner(Inner, #we{es=Etab0}=We) ->
-    Etab = lists:foldl(fun(Edge, Et) ->
-			       gb_trees:delete(Edge, Et)
-		       end, Etab0, Inner),
-    We#we{es=Etab}.
-
-update_outer([Pred|[Edge|Succ]=T], More, Face, Ftab, Etab0) ->
-    #edge{rf=Rf} = R0 = gb_trees:get(Edge, Etab0),
-    Rec = case gb_trees:is_defined(Rf, Ftab) of
-	      true ->
-		  ?ASSERT(false == gb_trees:is_defined(R0#edge.lf, Ftab)),
-		  LS = succ(Succ, More),
-		  R0#edge{lf=Face,ltpr=Pred,ltsu=LS};
-	      false ->
-		  ?ASSERT(true == gb_trees:is_defined(R0#edge.lf, Ftab)),
-		  RS = succ(Succ, More),
-		  R0#edge{rf=Face,rtpr=Pred,rtsu=RS}
-	  end,
-    Etab = gb_trees:update(Edge, Rec, Etab0),
-    update_outer(T, More, Face, Ftab, Etab);
-update_outer([_], _More, _Face, _Ftab, Etab) -> Etab.
-
-succ([Succ|_], _More) -> Succ;
-succ([], [Succ|_]) -> Succ.
-
-%% outer_edge_loop(FaceSet,WingedEdge) -> [Edge] | error.
-%%  Partition the outer edges of the FaceSet into a single closed loop.
-%%  Return 'error' if the faces in FaceSet does not form a
-%%  simple region without holes.
-%%
-%%  Equvivalent to
-%%      case outer_edge_partition(FaceSet,WingedEdge) of
-%%         [Loop] -> Loop;
-%%         [_|_] -> error
-%%      end.
-%%  but faster.
-
-outer_edge_loop(Faces, We) ->
-    case lists:sort(collect_outer_edges(Faces, We)) of
-	[] -> error;
-	[{Key,Val}|Es0] ->
-	    case any_duplicates(Es0, Key) of
-		false ->
-		    Es = gb_trees:from_orddict(Es0),
-		    N = gb_trees:size(Es),
-		    outer_edge_loop_1(Val, Es, Key, N, []);
-		true -> error
-	    end
-    end.
-
-outer_edge_loop_1({Edge,V}, _, V, 0, Acc) ->
-    %% This edge completes the loop, and we have used all possible edges.
-    [Edge|Acc];
-outer_edge_loop_1({_,V}, _, V, _N, _) ->
-    %% Loop is complete, but we haven't used all edges.
-    error;
-outer_edge_loop_1({_,_}, _, _, 0, _) ->
-    %% We have used all possible edges, but somehow the loop
-    %% is not complete. I can't see how this is possible.
-    erlang:error(internal_error);
-outer_edge_loop_1({Edge,Vb}, Es, EndV, N, Acc0) ->
-    Acc = [Edge|Acc0],
-    outer_edge_loop_1(gb_trees:get(Vb, Es), Es, EndV, N-1, Acc).
-
-any_duplicates([{V,_}|_], V) -> true;
-any_duplicates([_], _) -> false;
-any_duplicates([{V,_}|Es], _) -> any_duplicates(Es, V).
-
-%% outer_edge_partition(FaceSet, WingedEdge) -> [[Edge]].
-%%  Partition the outer edges of the FaceSet. Each partion
-%%  of edges form a closed loop with no repeated vertices.
-%%    Outer edges are edges that have one face in FaceSet
-%%  and one outside.
-%%    It is assumed that FaceSet consists of one region returned by
-%%  wings_sel:face_regions/2.
-
-outer_edge_partition(Faces, We) ->
-    F0 = collect_outer_edges(Faces, We),
-    F = gb_trees:from_orddict(wings_util:rel2fam(F0)),
-    partition_edges(F, []).
-
-collect_outer_edges(Faces, We) when is_list(Faces) ->
-    collect_outer_edges_1(Faces, gb_sets:from_list(Faces), We);
-collect_outer_edges(Faces, We) ->
-    collect_outer_edges_1(gb_sets:to_list(Faces), Faces, We).
-
-collect_outer_edges_1(Fs0, Faces0, #we{fs=Ftab}=We) ->
-    case {gb_trees:size(Ftab),gb_sets:size(Faces0)} of
-	{AllSz,FaceSz} when AllSz < 2*FaceSz ->
-	    Fs = ordsets:subtract(gb_trees:keys(Ftab), Fs0),
-	    Faces = gb_sets:from_ordset(Fs),
-	    Coll = collect_outer_edges_a(Faces),
-	    wings_face:fold_faces(Coll, [], Fs, We);
-	{_,_} ->
-	    Coll = collect_outer_edges_b(Faces0),
-	    wings_face:fold_faces(Coll, [], Fs0, We)
-    end.
-
-collect_outer_edges_a(Faces) ->
-    fun(Face, _, Edge, #edge{ve=V,vs=OtherV,lf=Face,rf=Other}, Acc) ->
-	    case gb_sets:is_member(Other, Faces) of
-		false -> [{V,{Edge,OtherV}}|Acc];
-		true -> Acc
-	    end;
-       (Face, _, Edge, #edge{ve=OtherV,vs=V,rf=Face,lf=Other}, Acc) ->
-	    case gb_sets:is_member(Other, Faces) of
-		false -> [{V,{Edge,OtherV}}|Acc];
-		true -> Acc
-	    end
-    end.
-
-collect_outer_edges_b(Faces) ->
-    fun(Face, _, Edge, #edge{vs=V,ve=OtherV,lf=Face,rf=Other}, Acc) ->
-	    case gb_sets:is_member(Other, Faces) of
-		false -> [{V,{Edge,OtherV}}|Acc];
-		true -> Acc
-	    end;
-       (Face, _, Edge, #edge{vs=OtherV,ve=V,rf=Face,lf=Other}, Acc) ->
-	    case gb_sets:is_member(Other, Faces) of
-		false -> [{V,{Edge,OtherV}}|Acc];
-		true -> Acc
-	    end
-    end.
-
-partition_edges(Es0, Acc) ->
-    case gb_trees:is_empty(Es0) of
-	true -> Acc;
-	false ->
- 	    {Key,Val,Es1} = gb_trees:take_smallest(Es0),
-	    {Cycle,Es} = part_collect_cycle(Key, Val, Es1, []),
-	    partition_edges(Es, [Cycle|Acc])
-    end.
-
-%% part_collect_cycle(Vertex, VertexInfo, EdgeInfo, Acc0) ->
-%%    none | {[Edge],EdgeInfo}
-%%  Collect the cycle starting with Vertex.
-%%
-%%  Note: This function can only return 'none' when called
-%%  recursively.
-
-part_collect_cycle(_, repeated, _, _) ->
-    %% Repeated vertex - we are not allowed to go this way.
-    %% Can only happen if we were called recursively because
-    %% a fork was encountered.
-    none;
-part_collect_cycle(_Va, [{Edge,Vb}], Es0, Acc0) ->
-    %% Basic case. Only one way to go.
-    Acc = [Edge|Acc0],
-    case gb_trees:lookup(Vb, Es0) of
-	none ->
-	    {Acc,Es0};
-	{value,Val} ->
-	    Es = gb_trees:delete(Vb, Es0),
-	    part_collect_cycle(Vb, Val, Es, Acc)
-    end;
-part_collect_cycle(Va, [Val|More], Es0, []) ->
-    %% No cycle started yet and we have multiple choice of
-    %% edges out from this vertex. It doesn't matter which
-    %% edge we follow, so we'll follow the first one.
-    {Cycle,Es} = part_collect_cycle(Va, [Val], Es0, []),
-    {Cycle,gb_trees:insert(Va, More, Es)};
-part_collect_cycle(Va, Edges, Es0, Acc) ->
-    %% We have a partially collected cycle and we have a
-    %% fork (multiple choice of edges). Here we must choose
-    %% an edge that closes the cycle without passing Va
-    %% again (because repeated vertices are not allowed).
-    Es = gb_trees:insert(Va, repeated, Es0),
-    part_fork(Va, Edges, Es, Acc, []).
-    
-part_fork(Va, [Val|More], Es0, Acc, Tried) ->
-    %% Try to complete the cycle by following this edge.
-    case part_collect_cycle(Va, [Val], Es0, Acc) of
-	none ->
-	    %% Failure - try the next edge.
-	    part_fork(Va, More, Es0, Acc, [Val|Tried]);
-	{Cycle,Es} ->
-	    %% Found a cycle. Update the vertex information
-	    %% with all edges remaining.
-	    {Cycle,gb_trees:update(Va, lists:reverse(Tried, More), Es)}
-    end;
-part_fork(_, [], _, _, _) ->
-    %% None of edges were possible. Can only happen if this function
-    %% was called recursively (i.e. if we hit another fork while
-    %% processing a fork).
-    none.
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_edge_cmd.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_edge_cmd.erl
deleted file mode 100644
index e478ec245b..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_edge_cmd.erl
+++ /dev/null
@@ -1,91 +0,0 @@
-%%
-%%  wings_edge.erl --
-%%
-%%     This module contains most edge command and edge utility functions.
-%%
-
--module(wings_edge_cmd).
-
--export([loop_cut/1]).
-
--include("wings.hrl").
-
-%%%
-%%% The Loop Cut command.
-%%%
-
-loop_cut(St0) ->
-    {Sel,St} = wings_sel:fold(fun loop_cut/3, {[],St0}, St0),
-    wings_sel:set(body, Sel, St).
-
-loop_cut(Edges, #we{name=Name,id=Id,fs=Ftab}=We0, {Sel,St0}) ->
-    AdjFaces = wings_face:from_edges(Edges, We0),
-    case loop_cut_partition(AdjFaces, Edges, We0, []) of
-	[_] ->
-	    io:format("Edge loop doesn't divide ~p into two parts.", [Name]);
-	Parts0 ->
-	    %% We arbitrarily decide that the largest part of the object
-	    %% will be left unselected and will keep the name of the object.
-
-	    Parts1 = [{gb_trees:size(P),P} || P <- Parts0],
-	    Parts2 = lists:reverse(lists:sort(Parts1)),
-	    [_|Parts] = [gb_sets:to_list(P) || {_,P} <- Parts2],
-
-	    %% Also, this first part will also contain any sub-object
-	    %% that was not reachable from any of the edges. Therefore,
-	    %% we calculate the first part as the complement of the union
-	    %% of all other parts.
-
-	    FirstComplement = ordsets:union(Parts),
-	    First = ordsets:subtract(gb_trees:keys(Ftab), FirstComplement),
-
-	    We = wings_dissolve:complement(First, We0),
-	    Shs = St0#st.shapes,
-	    St = St0#st{shapes=gb_trees:update(Id, We, Shs)},
-	    loop_cut_make_copies(Parts, We0, Sel, St)
-    end.
-
-loop_cut_make_copies([P|Parts], We0, Sel0, #st{onext=Id}=St0) ->
-    Sel = [{Id,gb_sets:singleton(0)}|Sel0],
-    We = wings_dissolve:complement(P, We0),
-    St = wings_shape:insert(We, cut, St0),
-    loop_cut_make_copies(Parts, We0, Sel, St);
-loop_cut_make_copies([], _, Sel, St) -> {Sel,St}.
-
-loop_cut_partition(Faces0, Edges, We, Acc) ->
-    case gb_sets:is_empty(Faces0) of
-	true -> Acc;
-	false ->
-	    {AFace,Faces1} = gb_sets:take_smallest(Faces0),
-	    Reachable = collect_faces(AFace, Edges, We),
-	    Faces = gb_sets:difference(Faces1, Reachable),
-	    loop_cut_partition(Faces, Edges, We, [Reachable|Acc])
-    end.
-
-collect_faces(Face, Edges, We) ->
-    collect_faces(gb_sets:singleton(Face), We, Edges, gb_sets:empty()).
-
-collect_faces(Work0, We, Edges, Acc0) ->
-    case gb_sets:is_empty(Work0) of
-	true -> Acc0;
-	false ->
-	    {Face,Work1} = gb_sets:take_smallest(Work0),
-	    Acc = gb_sets:insert(Face, Acc0),
-	    Work = collect_maybe_add(Work1, Face, Edges, We, Acc),
-	    collect_faces(Work, We, Edges, Acc)
-    end.
-
-collect_maybe_add(Work, Face, Edges, We, Res) ->
-    wings_face:fold(
-      fun(_, Edge, Rec, A) ->
-	      case gb_sets:is_member(Edge, Edges) of
-		  true -> A;
-		  false ->
-		      Of = wings_face:other(Face, Rec),
-		      case gb_sets:is_member(Of, Res) of
-			  true -> A;
-			  false -> gb_sets:add(Of, A)
-		      end
-	      end
-      end, Work, Face, We).
-
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_facemat.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_facemat.erl
deleted file mode 100644
index 6e018e49b5..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_facemat.erl
+++ /dev/null
@@ -1,299 +0,0 @@
-%%
-%%  wings_facemat.erl --
-%%
-%%     This module keeps tracks of the mapping from a face number
-%%     to its material name.
-%%
-%%  Copyright (c) 2001-2005 Bjorn Gustavsson
-%%
-%%  See the file "license.terms" for information on usage and redistribution
-%%  of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-%%
-%%     $Id: wings_facemat.erl,v 1.1 2009/01/25 18:55:33 kostis Exp $
-%%
-%%
-%%
-
--module(wings_facemat).
--export([all/1,face/2,used_materials/1,mat_faces/2,
-	 assign/2,assign/3,
-	 delete_face/2,delete_faces/2,keep_faces/2,
-	 hide_faces/1,show_faces/1,
-	 renumber/2,gc/1,merge/1]).
-
--include("wings.hrl").
--import(lists, [keysearch/3,reverse/1,reverse/2,sort/1]).
-
-%%%
-%%% API functions for retrieving information.
-%%%
-
-%% all(We) -> [{Face,MaterialName}]
-%%  Return materials for all faces as an ordered list.
-all(#we{mat=M}=We) when is_atom(M) ->
-    Vis = visible_faces(We),
-    make_tab(Vis, M);
-all(#we{mat=L}) when is_list(L) ->
-    remove_invisible(L).
-
-%% face(Face, We) -> MaterialName
-%%  Return the material for the face Face.
-face(_, #we{mat=M}) when is_atom(M) -> M;
-face(Face, #we{mat=Tab}) ->
-    {value,{_,Mat}} = keysearch(Face, 1, Tab),
-    Mat.
-
-%% used_materials(We) -> [MaterialName]
-%%  Return an ordered list of all materials used in the We.
-used_materials(#we{mat=M}) when is_atom(M) -> [M];
-used_materials(#we{mat=L}) when is_list(L) ->
-    used_materials_1(L, []).
-
-%% mat_faces([{Face,Info}], We) -> [{Mat,[{Face,Info}]}]
-%%  Group face tab into groups based on material.
-%%  Used for displaying objects.
-mat_faces(Ftab, #we{mat=AtomMat}) when is_atom(AtomMat) ->
-    [{AtomMat,Ftab}];
-mat_faces(Ftab, #we{mat=MatTab}) ->
-    mat_faces_1(Ftab, remove_invisible(MatTab), []).
-
-%%%
-%%% API functions for updating material name mapping.
-%%%
-
-%% assign([{Face,MaterialName}], We) -> We'
-%%  Assign materials.
-assign([], We)  -> We;
-assign([{F,M}|_]=FaceMs, We) when is_atom(M), is_integer(F) ->
-    Tab = ordsets:from_list(FaceMs),
-    assign_face_ms(Tab, We).
-
-%% assign(MaterialName, Faces, We) -> We'
-%%  Assign MaterialName to all faces Faces.
-assign(Mat, _, #we{mat=Mat}=We) when is_atom(Mat) -> We;
-assign(Mat, Fs, We) when is_atom(Mat), is_list(Fs) ->
-    assign_1(Mat, Fs, We);
-assign(Mat, Fs, We) when is_atom(Mat) ->
-    assign_1(Mat, gb_sets:to_list(Fs), We).
-
-%% delete_face(Face, We) -> We'
-%%  Delete the material name mapping for the face Face.
-delete_face(_, #we{mat=AtomMat}=We) when is_atom(AtomMat) -> We;
-delete_face(Face, #we{mat=MatTab0}=We) ->
-    MatTab = orddict:erase(Face, MatTab0),
-    We#we{mat=MatTab}.
-
-%% delete_face(Faces, We) -> We'
-%%  Delete the material name mapping for all faces Faces.
-delete_faces(_, #we{mat=AtomMat}=We) when is_atom(AtomMat) -> We;
-delete_faces(Faces0, #we{mat=MatTab0}=We) when is_list(Faces0) ->
-    Faces = sofs:from_external(Faces0, [face]),
-    MatTab1 = sofs:from_external(MatTab0, [{face,mat}]),
-    MatTab2 = sofs:drestriction(MatTab1, Faces),
-    MatTab = sofs:to_external(MatTab2),
-    We#we{mat=MatTab};
-delete_faces(Faces, We) ->
-    delete_faces(gb_sets:to_list(Faces), We).
-
-%% keep_faces(Faces, We) -> We'
-%%  Delete all the other material names mapping for all faces other Faces.
-keep_faces(_, #we{mat=AtomMat}=We) when is_atom(AtomMat) -> We;
-keep_faces([Face], We) ->
-    Mat = face(Face,We),
-    We#we{mat=[{Face,Mat}]};
-keep_faces(Faces0, #we{mat=MatTab0}=We) when is_list(Faces0) ->
-    Faces = sofs:from_external(Faces0, [face]),
-    MatTab1 = sofs:from_external(MatTab0, [{face,mat}]),
-    MatTab2 = sofs:restriction(MatTab1, Faces),
-    MatTab = sofs:to_external(MatTab2),
-    We#we{mat=MatTab};
-keep_faces(Faces, We) ->
-    keep_faces(gb_sets:to_list(Faces), We).
-
-%% hide_faces(We) -> We'
-%%  Update the material name mapping in the We to reflect
-%%  the newly hidden faces in the face tab.
-hide_faces(#we{mat=M}=We) when is_atom(M) -> We;
-hide_faces(#we{mat=L0,fs=Ftab}=We) ->
-    L = hide_faces_1(L0, Ftab, []),
-    We#we{mat=L}.
-
-%% show_faces(We) -> We'
-%%  Update the material name mapping in the We to reflect
-%%  that all faces are again visible.
-show_faces(#we{mat=M}=We) when is_atom(M) -> We;
-show_faces(#we{mat=L0}=We) ->
-    L = show_faces_1(L0, []),
-    We#we{mat=L}.
-
-%% renumber(MaterialMapping, FaceOldToNew) -> MaterialMapping.
-%%  Renumber face number in material name mapping.
-renumber(Mat, _) when is_atom(Mat) -> Mat;
-renumber(L, Fmap) when is_list(L) -> renumber_1(L, Fmap, []).
-
-%% gc(We) -> We'
-%%  Garbage collect the material mapping information, removing
-%%  the mapping for any face no longer present in the face table.
-gc(#we{mat=Mat}=We) when is_atom(Mat) -> We;
-gc(#we{mat=Tab0,fs=Ftab}=We) ->
-    Fs = sofs:from_external(gb_trees:keys(Ftab), [face]),
-    Tab1 = sofs:from_external(Tab0, [{face,material}]),
-    Tab2 = sofs:restriction(Tab1, Fs),
-    Tab = sofs:to_external(Tab2),
-    We#we{mat=compress(Tab)}.
-
-%% merge([We]) -> [{Face,MaterialName}] | MaterialName.
-%%  Merge materials for several objects.
-merge([#we{mat=M}|Wes]=L) when is_atom(M) ->
-    case merge_all_same(Wes, M) of
-	true -> M;
-	false -> merge_1(L, [])
-    end;
-merge(L) -> merge_1(L, []).
-
-merge_1([#we{mat=M,es=Etab}|T], Acc) when is_atom(M) ->
-    FsM = merge_2(gb_trees:values(Etab), M, []),
-    merge_1(T, [FsM|Acc]);
-merge_1([#we{mat=FsMs}|T], Acc) ->
-    merge_1(T, [FsMs|Acc]);
-merge_1([], Acc) -> lists:merge(Acc).
-
-merge_2([#edge{lf=Lf,rf=Rf}|T], M, Acc) ->
-    merge_2(T, M, [{Lf,M},{Rf,M}|Acc]);
-merge_2([], _, Acc) -> ordsets:from_list(Acc).
-
-merge_all_same([#we{mat=M}|Wes], M) -> merge_all_same(Wes, M);
-merge_all_same([_|_], _) -> false;
-merge_all_same([], _) -> true.
-
-%%%
-%%% Local functions.
-%%%
-
-assign_1(Mat, Fs, #we{fs=Ftab}=We) ->
-    case length(Fs) =:= gb_trees:size(Ftab) of
-	true -> We#we{mat=Mat};
-	false -> assign_2(Mat, Fs, We)
-    end.
-
-assign_2(Mat, Fs0, #we{fs=Ftab,mat=Mat0}=We) when is_atom(Mat0) ->
-    Fs = ordsets:from_list(Fs0),
-    OtherFaces = ordsets:subtract(gb_trees:keys(Ftab), Fs),
-    Tab0 = make_tab(OtherFaces, Mat0),
-    Tab1 = make_tab(Fs, Mat),
-    Tab = lists:merge(Tab0, Tab1),
-    We#we{mat=Tab};
-assign_2(Mat, Fs0, #we{mat=Tab0}=We) when is_list(Tab0) ->
-    Fs = ordsets:from_list(Fs0),
-    Tab1 = make_tab(Fs, Mat),
-    Tab = mat_merge(Tab1, Tab0, []),
-    We#we{mat=Tab}.
-
-assign_face_ms(Tab, #we{fs=Ftab}=We) ->
-    case length(Tab) =:= gb_trees:size(Ftab) of
-	true -> We#we{mat=compress(Tab)};
-	false -> assign_face_ms_1(Tab, We)
-    end.
-
-assign_face_ms_1(Tab1, #we{fs=Ftab,mat=Mat0}=We) when is_atom(Mat0) ->
-    Tab0 = make_tab(gb_trees:keys(Ftab), Mat0),
-    Tab = mat_merge(Tab1, Tab0, []),
-    We#we{mat=Tab};
-assign_face_ms_1(Tab1, #we{mat=Tab0}=We) when is_list(Tab0) ->
-    Tab = mat_merge(Tab1, Tab0, []),
-    We#we{mat=Tab}.
-
-mat_merge([{Fn,_}|_]=Fns, [{Fo,_}=Fold|Fos], Acc) when Fo < Fn ->
-    mat_merge(Fns, Fos, [Fold|Acc]);
-mat_merge([{Fn,_}=Fnew|Fns], [{Fo,_}|_]=Fos, Acc) when Fo > Fn ->
-    mat_merge(Fns, Fos, [Fnew|Acc]);
-mat_merge([Fnew|Fns], [_|Fos], Acc) -> % Equality
-    mat_merge(Fns, Fos, [Fnew|Acc]);
-mat_merge([], Fos, Acc) ->
-    rev_compress(Acc, Fos);
-mat_merge(Fns, [], Acc) ->
-    rev_compress(Acc, Fns).
-    
-make_tab(Fs, M) ->
-    make_tab_1(Fs, M, []).
-
-make_tab_1([F|Fs], M, Acc) ->
-    make_tab_1(Fs, M, [{F,M}|Acc]);
-make_tab_1([], _, Acc) -> reverse(Acc).
-
-
-visible_faces(#we{fs=Ftab}) ->
-    visible_faces_1(gb_trees:keys(Ftab)).
-
-visible_faces_1([F|Fs]) when F < 0 ->
-    visible_faces_1(Fs);
-visible_faces_1(Fs) -> Fs.
-    
-remove_invisible([{F,_}|Fs]) when F < 0 ->
-    remove_invisible(Fs);
-remove_invisible(Fs) -> Fs.
-
-hide_faces_1([{F,_}=P|Fms], Ftab, Acc) when F < 0 ->
-    hide_faces_1(Fms, Ftab, [P|Acc]);
-hide_faces_1([{F,M}=P|Fms], Ftab, Acc) ->
-    case gb_trees:is_defined(F, Ftab) of
-	false -> hide_faces_1(Fms, Ftab, [{-F-1,M}|Acc]);
-	true -> hide_faces_1(Fms, Ftab, [P|Acc])
-    end;
-hide_faces_1([], _, Acc) -> sort(Acc).
-
-show_faces_1([{F,M}|Fms], Acc) when F < 0 ->
-    show_faces_1(Fms, [{-F-1,M}|Acc]);
-show_faces_1(Fs, Acc) -> sort(Acc++Fs).
-
-renumber_1([{F,M}|T], Fmap, Acc) ->
-    renumber_1(T, Fmap, [{gb_trees:get(F, Fmap),M}|Acc]);
-renumber_1([], _, Acc) -> sort(Acc).
-
-%% rev_compress([{Face,Mat}], [{Face,Mat}]) -> [{Face,Mat}] | Mat.
-%%  Reverse just like lists:reverse/2, but if all materials
-%%  turns out to be just the same, return that material.
-rev_compress(L, Acc) ->
-    case same_mat(Acc) of
-	[] -> reverse(L, Acc);
-	M -> rev_compress_1(L, M, Acc)
-    end.
-
-rev_compress_1([{_,M}=E|T], M, Acc) ->
-    %% Same material.
-    rev_compress_1(T, M, [E|Acc]);
-rev_compress_1([_|_]=L, _, Acc) ->
-    %% Another material. Finish by using reverse/2.
-    reverse(L, Acc);
-rev_compress_1([], M, _) ->
-    %% All materials turned out to be the same.
-    M.
-
-%% compress(MaterialTab) -> [{Face,Mat}] | Mat.
-%%  Compress a face mapping if possible.
-compress(M) when is_atom(M) -> M;
-compress(L) when is_list(L) ->
-    case same_mat(L) of
-	[] -> L;
-	M -> M
-    end.
-    
-same_mat([]) -> [];
-same_mat([{_,M}|T]) -> same_mat_1(T, M).
-
-same_mat_1([{_,M}|T], M) -> same_mat_1(T, M);
-same_mat_1([], M) -> M;
-same_mat_1(_, _) -> [].
-
-used_materials_1([{_,M}|T], [M|_]=Acc) ->
-    used_materials_1(T, Acc);
-used_materials_1([{_,M}|T], Acc) ->
-    used_materials_1(T, [M|Acc]);
-used_materials_1([], Acc) ->
-    ordsets:from_list(Acc).
-
-mat_faces_1([{F1,_}|_]=Fs, [{F2,_}|Ms], Acc) when F2 < F1 ->
-    mat_faces_1(Fs, Ms, Acc);
-mat_faces_1([{F,Info}|Fs], [{F,Mat}|Ms], Acc) ->
-    mat_faces_1(Fs, Ms, [{Mat,{F,Info}}|Acc]);
-mat_faces_1([], _, Acc) -> wings_util:rel2fam(Acc).
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_util.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_util.erl
deleted file mode 100644
index 9572e19955..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_util.erl
+++ /dev/null
@@ -1,39 +0,0 @@
-%%
-%%  wings_util.erl --
-%%
-%%     Various utility functions that not obviously fit somewhere else.
-%%
-
--module(wings_util).
-
--export([gb_trees_smallest_key/1, gb_trees_largest_key/1,
-	 gb_trees_map/2, rel2fam/1]).
-
--include("wings.hrl").
-
-rel2fam(Rel) ->
-    sofs:to_external(sofs:relation_to_family(sofs:relation(Rel))).
-
-%% a definition that does not violate the opaqueness of gb_tree()
-gb_trees_smallest_key(Tree) ->
-    {Key, _V} = gb_trees:smallest(Tree),
-    Key.
-
-%% a definition that violates the opaqueness of gb_tree()
-gb_trees_largest_key({_, Tree}) ->
-    largest_key1(Tree).
-
-largest_key1({Key, _Value, _Smaller, nil}) ->
-    Key;
-largest_key1({_Key, _Value, _Smaller, Larger}) ->
-    largest_key1(Larger).
-
-gb_trees_map(F, {Size,Tree}) ->
-    {Size,gb_trees_map_1(F, Tree)}.
-
-gb_trees_map_1(_, nil) -> nil;
-gb_trees_map_1(F, {K,V,Smaller,Larger}) ->
-    {K,F(K, V),
-     gb_trees_map_1(F, Smaller),
-     gb_trees_map_1(F, Larger)}.
-
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_we.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_we.erl
deleted file mode 100644
index d782144def..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/wings/wings_we.erl
+++ /dev/null
@@ -1,250 +0,0 @@
-%%
-%%  wings_we.erl --
-%%
-%%     This module contains functions to build and manipulate
-%%     we records (winged-edged records, the central data structure
-%%     in Wings 3D).
-
--module(wings_we).
-
--export([rebuild/1, is_consistent/1, is_face_consistent/2, new_id/1,
-	 new_items_as_ordset/3, validate_mirror/1, visible/1, visible_edges/1]).
- 
--include("wings.hrl").
-
-%%%
-%%% API.
-%%%
-
-validate_mirror(#we{mirror=none}=We) -> We;
-validate_mirror(#we{fs=Ftab,mirror=Face}=We) ->
-    case gb_trees:is_defined(Face, Ftab) of
-        false -> We#we{mirror=none};
-        true -> We
-    end.
-
-%% rebuild(We) -> We'
-%%  Rebuild any missing 'vc' and 'fs' tables. If there are
-%%  fewer elements in the 'vc' table than in the 'vp' table,
-%%  remove redundant entries in the 'vp' table. Updated id
-%%  bounds.
-rebuild(#we{vc=undefined,fs=undefined,es=Etab0}=We0) ->
-    Etab = gb_trees:to_list(Etab0),
-    Ftab = rebuild_ftab(Etab),
-    VctList = rebuild_vct(Etab),
-    We = We0#we{vc=gb_trees:from_orddict(VctList),fs=Ftab},
-    rebuild_1(VctList, We);
-rebuild(#we{vc=undefined,es=Etab}=We) ->
-    VctList = rebuild_vct(gb_trees:to_list(Etab), []),
-    rebuild_1(VctList, We#we{vc=gb_trees:from_orddict(VctList)});
-rebuild(#we{fs=undefined,es=Etab}=We) ->
-    Ftab = rebuild_ftab(gb_trees:to_list(Etab)),
-    rebuild(We#we{fs=Ftab});
-rebuild(We) -> update_id_bounds(We).
-
-%%% Utilities for allocating IDs.
-
-new_id(#we{next_id=Id}=We) ->
-    {Id,We#we{next_id=Id+1}}.
-
-%%% Returns sets of newly created items.
-
-new_items_as_ordset(vertex, #we{next_id=Wid}, #we{next_id=NewWid,vp=Tab}) ->
-    new_items_as_ordset_1(Tab, Wid, NewWid);
-new_items_as_ordset(edge, #we{next_id=Wid}, #we{next_id=NewWid,es=Tab}) ->
-    new_items_as_ordset_1(Tab, Wid, NewWid);
-new_items_as_ordset(face, #we{next_id=Wid}, #we{next_id=NewWid,fs=Tab}) ->
-    new_items_as_ordset_1(Tab, Wid, NewWid).
-
-any_hidden(#we{fs=Ftab}) ->
-    not gb_trees:is_empty(Ftab) andalso
-	wings_util:gb_trees_smallest_key(Ftab) < 0.
-
-%%%
-%%% Local functions.
-%%%
-
-rebuild_1(VctList, #we{vc=Vct,vp=Vtab0}=We) ->
-    case {gb_trees:size(Vct),gb_trees:size(Vtab0)} of
-	{Same,Same} -> rebuild(We);
-	{Sz1,Sz2} when Sz1 < Sz2 ->
-	    Vtab = vertex_gc_1(VctList, gb_trees:to_list(Vtab0), []),
-	    rebuild(We#we{vp=Vtab})
-    end.
-
-rebuild_vct(Es) ->
-    rebuild_vct(Es, []).
-
-rebuild_vct([{Edge,#edge{vs=Va,ve=Vb}}|Es], Acc0) ->
-    Acc = rebuild_maybe_add(Va, Vb, Edge, Acc0),
-    rebuild_vct(Es, Acc);
-rebuild_vct([], VtoE) ->
-    build_incident_tab(VtoE).
-
-rebuild_ftab(Es) ->
-    rebuild_ftab_1(Es, []).
-
-rebuild_ftab_1([{Edge,#edge{lf=Lf,rf=Rf}}|Es], Acc0) ->
-    Acc = rebuild_maybe_add(Lf, Rf, Edge, Acc0),
-    rebuild_ftab_1(Es, Acc);
-rebuild_ftab_1([], FtoE) ->
-    gb_trees:from_orddict(build_incident_tab(FtoE)).
-
-rebuild_maybe_add(Ka, Kb, E, [_,{Ka,_}|_]=Acc) ->
-    [{Kb,E}|Acc];
-rebuild_maybe_add(Ka, Kb, E, [_,{Kb,_}|_]=Acc) ->
-    [{Ka,E}|Acc];
-rebuild_maybe_add(Ka, Kb, E, [{Ka,_}|_]=Acc) ->
-    [{Kb,E}|Acc];
-rebuild_maybe_add(Ka, Kb, E, [{Kb,_}|_]=Acc) ->
-    [{Ka,E}|Acc];
-rebuild_maybe_add(Ka, Kb, E, Acc) ->
-    [{Ka,E},{Kb,E}|Acc].
-
-vertex_gc_1([{V,_}|Vct], [{V,_}=Vtx|Vpos], Acc) ->
-    vertex_gc_1(Vct, Vpos, [Vtx|Acc]);
-vertex_gc_1([_|_]=Vct, [_|Vpos], Acc) ->
-    vertex_gc_1(Vct, Vpos, Acc);
-vertex_gc_1([], _, Acc) ->
-    gb_trees:from_orddict(lists:reverse(Acc)).
-
-%%%
-%%% Handling of hidden faces.
-%%%
-
-visible(#we{mirror=none,fs=Ftab}) ->
-    visible_2(gb_trees:keys(Ftab));
-visible(#we{mirror=Face,fs=Ftab}) ->
-    visible_2(gb_trees:keys(gb_trees:delete(Face, Ftab))).
-
-visible_2([F|Fs]) when F < 0 -> visible_2(Fs);
-visible_2(Fs) -> Fs.
-
-visible_edges(#we{es=Etab,mirror=Face}=We) ->
-    case any_hidden(We) of
-	false -> gb_trees:keys(Etab);
-	true -> visible_es_1(gb_trees:to_list(Etab), Face, [])
-    end.
-
-visible_es_1([{E,#edge{lf=Lf,rf=Rf}}|Es], Face, Acc) ->
-    if
-	Lf < 0 ->
-	    %% Left face hidden.
-	    if
-		Rf < 0; Rf =:= Face ->
-		    %% Both faces invisible (in some way).
-		    visible_es_1(Es, Face, Acc);
-		true ->
-		    %% Right face is visible.
-		    visible_es_1(Es, Face, [E|Acc])
-	    end;
-	Lf =:= Face, Rf < 0 ->
-	    %% Left face mirror, right face hidden.
-	    visible_es_1(Es, Face, Acc);
-	true ->
-	    %% At least one face visible.
-	    visible_es_1(Es, Face, [E|Acc])
-    end;
-visible_es_1([], _, Acc) -> ordsets:from_list(Acc).
-
-update_id_bounds(#we{vp=Vtab,es=Etab,fs=Ftab}=We) ->
-    case gb_trees:is_empty(Etab) of
-	true -> We#we{next_id=0};
-	false ->
-	    LastId = lists:max([wings_util:gb_trees_largest_key(Vtab),
-				wings_util:gb_trees_largest_key(Etab),
-				wings_util:gb_trees_largest_key(Ftab)]),
-	    We#we{next_id=LastId+1}
-    end.
-
-%% build_incident_tab([{Elem,Edge}]) -> [{Elem,Edge}]
-%%      Elem = Face or Vertex
-%%  Build the table of incident edges for either faces or vertices.
-%%  Returns an ordered list where each Elem is unique.
-
-build_incident_tab(ElemToEdgeRel) ->
-    T = ets:new(?MODULE, [ordered_set]),
-    ets:insert(T, ElemToEdgeRel),
-    R = ets:tab2list(T),
-    ets:delete(T),
-    R.
-
-%%%
-%%% Calculate normals.
-%%%
-
-new_items_as_ordset_1(Tab, Wid, NewWid) when NewWid-Wid < 32 ->
-    new_items_as_ordset_2(Wid, NewWid, Tab, []);
-new_items_as_ordset_1(Tab, Wid, _NewWid) ->
-    [Item || Item <- gb_trees:keys(Tab), Item >= Wid].
-
-new_items_as_ordset_2(Wid, NewWid, Tab, Acc) when Wid < NewWid ->
-    case gb_trees:is_defined(Wid, Tab) of
-	true -> new_items_as_ordset_2(Wid+1, NewWid, Tab, [Wid|Acc]);
-	false -> new_items_as_ordset_2(Wid+1, NewWid, Tab, Acc)
-    end;
-new_items_as_ordset_2(_Wid, _NewWid, _Tab, Acc) -> lists:reverse(Acc).
-
-%%%
-%%% Test the consistency of a #we{}.
-%%%
-
-is_consistent(#we{}=We) ->
-    try
-	validate_vertex_tab(We),
-	validate_faces(We)
-    catch error:_ -> false
-    end.
-
-is_face_consistent(Face, #we{fs=Ftab,es=Etab}) ->
-    Edge = gb_trees:get(Face, Ftab),
-    try validate_face(Face, Edge, Etab)
-    catch error:_ -> false
-    end.
-
-validate_faces(#we{fs=Ftab,es=Etab}) ->
-    validate_faces_1(gb_trees:to_list(Ftab), Etab).
-
-validate_faces_1([{Face,Edge}|Fs], Etab) ->
-    validate_face(Face, Edge, Etab),
-    validate_faces_1(Fs, Etab);
-validate_faces_1([], _) -> true.
-
-validate_face(Face, Edge, Etab) ->
-    Ccw = walk_face_ccw(Edge, Etab, Face, Edge, []),
-    Edge = walk_face_cw(Edge, Etab, Face, Ccw),
-    [V|Vs] = lists:sort(Ccw),
-    validate_face_vertices(Vs, V).
-
-validate_face_vertices([V|_], V) ->
-    erlang:error(repeated_vertex);
-validate_face_vertices([_], _) ->
-    true;
-validate_face_vertices([V|Vs], _) ->
-    validate_face_vertices(Vs, V).
-
-walk_face_ccw(LastEdge, _, _, LastEdge, [_|_]=Acc) -> Acc;
-walk_face_ccw(Edge, Etab, Face, LastEdge, Acc) ->
-    case gb_trees:get(Edge, Etab) of
-	#edge{ve=V,lf=Face,ltpr=Next} ->
-	    walk_face_ccw(Next, Etab, Face, LastEdge, [V|Acc]);
-	#edge{vs=V,rf=Face,rtpr=Next} ->
-	    walk_face_ccw(Next, Etab, Face, LastEdge, [V|Acc])
-    end.
-
-walk_face_cw(Edge, _, _, []) -> Edge;
-walk_face_cw(Edge, Etab, Face, [V|Vs]) ->
-    case gb_trees:get(Edge, Etab) of
-	#edge{vs=V,lf=Face,ltsu=Next} ->
-	    walk_face_cw(Next, Etab, Face, Vs);
-	#edge{ve=V,rf=Face,rtsu=Next} ->
-	    walk_face_cw(Next, Etab, Face, Vs)
-    end.
-
-validate_vertex_tab(#we{es=Etab,vc=Vct}) ->
-    lists:foreach(fun({V,Edge}) ->
-			  case gb_trees:get(Edge, Etab) of
-			      #edge{vs=V} -> ok;
-			      #edge{ve=V} -> ok
-			  end
-		  end, gb_trees:to_list(Vct)).
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis1.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis1.erl
deleted file mode 100644
index 82bcf2edcf..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis1.erl
+++ /dev/null
@@ -1,14 +0,0 @@
--module(zoltan_kis1).
-
--export([f/0, gen/0]).
-
--opaque id() :: string().
-
--spec f() -> integer().
-
-%BIF and Unification(t_unify) issue
-f() -> erlang:length(gen()).
-
--spec gen() -> id().
-
-gen() -> "Dummy".
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis2.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis2.erl
deleted file mode 100644
index 3a269622fd..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis2.erl
+++ /dev/null
@@ -1,14 +0,0 @@
--module(zoltan_kis2).
-
--export([get/2]).
-
--opaque data() :: gb_tree().
-
--spec get(term(), data()) -> term().
-
-get(Key, Data) ->
-  %%Should unopaque data for remote calls
-  case gb_trees:lookup(Key, Data) of
-    'none' -> 'undefined';
-    {'value', Val} -> Val
-  end. 
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis3.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis3.erl
deleted file mode 100644
index d92c6766ff..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis3.erl
+++ /dev/null
@@ -1,14 +0,0 @@
--module(zoltan_kis3).
-
--export([f/0, gen/0]).
-
--opaque id() :: string().
-
--spec f() -> char().
-
-%%List pattern matching issue  
-f() -> [H|_T] = gen(), H.
-
--spec gen() -> id().
-
-gen() -> "Dummy".
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis4.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis4.erl
deleted file mode 100644
index aa1a4abcb7..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis4.erl
+++ /dev/null
@@ -1,14 +0,0 @@
--module(zoltan_kis4).
-
--export([f/0, gen/0]).
-
--opaque id() :: string().
-
--spec f() -> boolean().
-
-%%Equality test issue  
-f() -> "Dummy" == gen().
-
--spec gen() -> id().
-
-gen() -> "Dummy".
diff --git a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis5.erl b/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis5.erl
deleted file mode 100644
index 30cebf806a..0000000000
--- a/lib/dialyzer/test/opaque_tests_SUITE_data/src/zoltan_kis5.erl
+++ /dev/null
@@ -1,14 +0,0 @@
--module(zoltan_kis5).
-
--export([f/0, gen/0]).
-
--opaque id() :: string().
-
--spec f() -> boolean().
-
-%% Equality test issue  
-f() -> "Dummy" == gen().
-
--spec gen() -> id().
-
-gen() -> "Dummy".
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/dialyzer_options b/lib/dialyzer/test/options1_SUITE_data/dialyzer_options
index c612e77d3e..c612e77d3e 100644
--- a/lib/dialyzer/test/options1_tests_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/options1_SUITE_data/dialyzer_options
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/my_include/CVS/Entries b/lib/dialyzer/test/options1_SUITE_data/my_include/CVS/Entries
index 513d4a315a..513d4a315a 100644
--- a/lib/dialyzer/test/options1_tests_SUITE_data/my_include/CVS/Entries
+++ b/lib/dialyzer/test/options1_SUITE_data/my_include/CVS/Entries
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/my_include/CVS/Repository b/lib/dialyzer/test/options1_SUITE_data/my_include/CVS/Repository
index 1c6511fec3..1c6511fec3 100644
--- a/lib/dialyzer/test/options1_tests_SUITE_data/my_include/CVS/Repository
+++ b/lib/dialyzer/test/options1_SUITE_data/my_include/CVS/Repository
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/my_include/CVS/Root b/lib/dialyzer/test/options1_SUITE_data/my_include/CVS/Root
index f6cdd6158b..f6cdd6158b 100644
--- a/lib/dialyzer/test/options1_tests_SUITE_data/my_include/CVS/Root
+++ b/lib/dialyzer/test/options1_SUITE_data/my_include/CVS/Root
diff --git a/lib/dialyzer/test/options1_SUITE_data/my_include/erl_bits.hrl b/lib/dialyzer/test/options1_SUITE_data/my_include/erl_bits.hrl
new file mode 100644
index 0000000000..45045ebb33
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/my_include/erl_bits.hrl
@@ -0,0 +1,43 @@
+%% ``The contents of this file are subject to the Erlang Public License,
+%% Version 1.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.erlang.org/EPL1_0.txt
+%%
+%% 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.
+%%
+%% The Original Code is Erlang-4.7.3, December, 1998.
+%%
+%% The Initial Developer of the Original Code is Ericsson Telecom
+%% AB. Portions created by Ericsson are Copyright (C), 1998, Ericsson
+%% Telecom AB. All Rights Reserved.
+%%
+%% Contributor(s): ______________________________________.''
+%%
+%% This is an -*- erlang -*- file.
+%% Generic compiler options, passed from the erl_compile module.
+
+-record(bittype, {
+          type,       %% integer/float/binary
+	  unit,       %% element unit
+          sign,       %% signed/unsigned
+          endian      %% big/little
+         }).
+
+-record(bitdefault, {
+	  integer,    %% default type for integer
+	  float,      %% default type for float
+	  binary      %% default type for binary
+	 }).
+
+%%% (From config.hrl in the bitsyntax branch.)
+-define(SYS_ENDIAN, big).
+-define(SIZEOF_CHAR, 1).
+-define(SIZEOF_DOUBLE, 8).
+-define(SIZEOF_FLOAT, 4).
+-define(SIZEOF_INT, 4).
+-define(SIZEOF_LONG, 4).
+-define(SIZEOF_LONG_LONG, 8).
+-define(SIZEOF_SHORT, 2).
diff --git a/lib/dialyzer/test/options1_SUITE_data/my_include/erl_compile.hrl b/lib/dialyzer/test/options1_SUITE_data/my_include/erl_compile.hrl
new file mode 100644
index 0000000000..c10ffa235c
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/my_include/erl_compile.hrl
@@ -0,0 +1,41 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: erl_compile.hrl,v 1.1 2008/12/17 09:53:40 mikpe Exp $
+%%
+
+%% Generic compiler options, passed from the erl_compile module.
+
+-record(options,
+	 {includes=[],				% Include paths (list of absolute
+						% directory names).
+	  outdir=".",				% Directory for result (absolute
+						% path).
+	  output_type=undefined,		% Type of output file (atom).
+	  defines=[],				% Preprocessor defines.  Each
+						% element is an atom (the name to
+						% define), or a {Name, Value}
+						% tuple.
+	  warning=1,				% Warning level (0 - no
+						% warnings, 1 - standard level,
+						% 2, 3, ... - more warnings).
+	  verbose=false,			% Verbose (true/false).
+	  optimize=999,				% Optimize options.
+	  specific=[],				% Compiler specific options.
+	  outfile="",				% Name of output file (internal
+						% use in erl_compile.erl).
+	  cwd					% Current working directory
+						% for erlc.
+	 }).
diff --git a/lib/dialyzer/test/options1_SUITE_data/results/compiler b/lib/dialyzer/test/options1_SUITE_data/results/compiler
new file mode 100644
index 0000000000..e82087ae86
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/results/compiler
@@ -0,0 +1,35 @@
+
+beam_asm.erl:32: The pattern {'error', Error} can never match the type <<_:64,_:_*8>>
+beam_bool.erl:193: The pattern {[], _} can never match the type {[{_,_,_,_},...],[any()]}
+beam_bool.erl:510: The pattern [{'set', [Dst], _, _}, {'%live', _}] can never match the type [{_,_,_,_}]
+beam_disasm.erl:537: The variable X can never match since previous clauses completely covered the type 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7
+beam_type.erl:284: The pattern <'pi', 0> can never match the type <_,1 | 2>
+beam_validator.erl:396: The pattern <{'jump', {'f', _}}, Vst = {'vst', 'none', _}> can never match the type <_,#vst{current::#st{ct::[]}}>
+beam_validator.erl:690: The pattern <'term', OldT> can never match the type <{'tuple',[any(),...]},_>
+beam_validator.erl:693: Guard test 'or'('false','false') can never succeed
+beam_validator.erl:700: Guard test 'or'('false','false') can never succeed
+beam_validator.erl:702: The pattern <'number', OldT = {Type, _}> can never match the type <{'tuple',[any(),...]},_>
+beam_validator.erl:705: The pattern <'bool', {'atom', A}> can never match the type <{'tuple',[any(),...]},_>
+beam_validator.erl:707: The pattern <{'atom', A}, 'bool'> can never match the type <{'tuple',[any(),...]},_>
+beam_validator.erl:713: Guard test is_integer(Sz::[any(),...]) can never succeed
+beam_validator.erl:727: Function upgrade_bool/1 will never be called
+cerl_inline.erl:190: The pattern 'true' can never match the type 'false'
+cerl_inline.erl:219: The pattern 'true' can never match the type 'false'
+cerl_inline.erl:230: The pattern 'true' can never match the type 'false'
+cerl_inline.erl:2333: The pattern 'true' can never match the type 'false'
+cerl_inline.erl:2355: The pattern 'true' can never match the type 'false'
+cerl_inline.erl:238: The pattern 'true' can never match the type 'false'
+cerl_inline.erl:2436: Function filename/1 will never be called
+cerl_inline.erl:2700: The pattern 'true' can never match the type 'false'
+cerl_inline.erl:2730: The pattern <{F, L, D}, Vs> can never match the type <[1..255,...],[any()]>
+cerl_inline.erl:2738: The pattern <{F, L, D}, Vs> can never match the type <[1..255,...],[any()]>
+cerl_inline.erl:2750: The pattern <{[], L, D}, Vs> can never match the type <[1..255,...],[any()]>
+cerl_inline.erl:2752: The pattern <{[], _L, D}, Vs> can never match the type <[1..255,...],[any()]>
+cerl_inline.erl:2754: The pattern <{F, L, D}, Vs> can never match the type <[1..255,...],[any()]>
+cerl_inline.erl:2756: The pattern <{F, _L, D}, Vs> can never match the type <[1..255,...],[any()]>
+compile.erl:788: The pattern {'error', Es} can never match the type {'ok',<<_:64,_:_*8>>}
+core_lint.erl:473: The pattern <{'c_atom', _, 'all'}, 'binary', _Def, St> can never match the type <_,#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::{_,_} | {_,_,_} | {_,_,_,_},tl::{_,_} | {_,_,_} | {_,_,_,_}},tl::#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::{_,_} | {_,_,_} | {_,_,_,_},tl::{_,_} | {_,_,_} | {_,_,_,_}}},[any()],_>
+core_lint.erl:505: The pattern <_Req, 'unknown', St> can never match the type <non_neg_integer(),non_neg_integer(),_>
+v3_codegen.erl:1569: The call v3_codegen:load_reg_1(V::any(),I::0,Rs::any(),pos_integer()) will never return since it differs in the 4th argument from the success typing arguments: (any(),0,maybe_improper_list(),0)
+v3_codegen.erl:1571: The call v3_codegen:load_reg_1(V::any(),I::0,[],pos_integer()) will never return since it differs in the 4th argument from the success typing arguments: (any(),0,maybe_improper_list(),0)
+v3_core.erl:646: The pattern <Prim = {'iprimop', _, _, _}, St> can never match the type <#c_nil{anno::[any(),...]} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple' | 'c_var' | 'ibinary' | 'icatch' | 'ireceive1',[any(),...] | {_,_,_,_},_} | #c_cons{anno::[any(),...]} | #c_fname{anno::[any(),...]} | #iletrec{anno::{_,_,_,_},defs::[any(),...],body::[any(),...]} | #icase{anno::{_,_,_,_},args::[any()],clauses::[any()],fc::{_,_,_,_,_,_}} | #ireceive2{anno::{_,_,_,_},clauses::[any()],action::[any()]} | #ifun{anno::{_,_,_,_},id::[any(),...],vars::[any()],clauses::[any(),...],fc::{_,_,_,_,_,_}} | #imatch{anno::{_,_,_,_},guard::[],fc::{_,_,_,_,_,_}} | #itry{anno::{_,_,_,_},args::[any()],vars::[any(),...],body::[any(),...],evars::[any(),...],handler::[any(),...]},_>
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_asm.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_asm.erl
new file mode 100644
index 0000000000..e3746f3fb6
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_asm.erl
@@ -0,0 +1,358 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: beam_asm.erl,v 1.1 2008/12/17 09:53:40 mikpe Exp $
+%%
+%% Purpose : Assembler for threaded Beam.
+
+-module(beam_asm).
+
+-export([module/4,format_error/1]).
+-export([encode/2]).
+
+-import(lists, [map/2,member/2,keymember/3,duplicate/2]).
+-include("beam_opcodes.hrl").
+
+-define(bs_aligned, 1).
+
+module(Code, Abst, SourceFile, Opts) ->
+    case assemble(Code, Abst, SourceFile, Opts) of
+	{error, Error} ->
+	    {error, [{none, ?MODULE, Error}]};
+	Bin when binary(Bin) ->
+	    {ok, Bin}
+    end.
+
+format_error({crashed, Why}) ->
+    io_lib:format("beam_asm_int: EXIT: ~p", [Why]).
+
+assemble({Mod,Exp,Attr,Asm,NumLabels}, Abst, SourceFile, Opts) ->
+    {1,Dict0} = beam_dict:atom(Mod, beam_dict:new()),
+    NumFuncs = length(Asm),
+    {Code,Dict1} = assemble_1(Asm, Exp, Dict0, []),
+    build_file(Code, Attr, Dict1, NumLabels, NumFuncs, Abst, SourceFile, Opts).
+
+assemble_1([{function,Name,Arity,Entry,Asm}|T], Exp, Dict0, Acc) ->
+    Dict1 = case member({Name,Arity}, Exp) of
+		true ->
+		    beam_dict:export(Name, Arity, Entry, Dict0);
+		false ->
+		    beam_dict:local(Name, Arity, Entry, Dict0)
+	    end,
+    {Code, Dict2} = assemble_function(Asm, Acc, Dict1),
+    assemble_1(T, Exp, Dict2, Code);
+assemble_1([], _Exp, Dict0, Acc) ->
+    {IntCodeEnd,Dict1} = make_op(int_code_end, Dict0),
+    {list_to_binary(lists:reverse(Acc, [IntCodeEnd])),Dict1}.
+
+assemble_function([H|T], Acc, Dict0) ->
+    {Code, Dict} = make_op(H, Dict0),
+    assemble_function(T, [Code| Acc], Dict);
+assemble_function([], Code, Dict) ->
+    {Code, Dict}.
+
+build_file(Code, Attr, Dict, NumLabels, NumFuncs, Abst, SourceFile, Opts) ->
+    %% Create the code chunk.
+
+    CodeChunk = chunk(<<"Code">>,
+		      <<16:32,
+		       (beam_opcodes:format_number()):32,
+		       (beam_dict:highest_opcode(Dict)):32,
+		       NumLabels:32,
+		       NumFuncs:32>>,
+		      Code),
+
+    %% Create the atom table chunk.
+
+    {NumAtoms, AtomTab} = beam_dict:atom_table(Dict),
+    AtomChunk = chunk(<<"Atom">>, <<NumAtoms:32>>, AtomTab),
+
+    %% Create the import table chunk.
+
+    {NumImps, ImpTab0} = beam_dict:import_table(Dict),
+    Imp = flatten_imports(ImpTab0),
+    ImportChunk = chunk(<<"ImpT">>, <<NumImps:32>>, Imp),
+
+    %% Create the export table chunk.
+
+    {NumExps, ExpTab0} = beam_dict:export_table(Dict),
+    Exp = flatten_exports(ExpTab0),
+    ExpChunk = chunk(<<"ExpT">>, <<NumExps:32>>, Exp),
+
+    %% Create the local function table chunk.
+
+    {NumLocals, Locals} = beam_dict:local_table(Dict),
+    Loc = flatten_exports(Locals),
+    LocChunk = chunk(<<"LocT">>, <<NumLocals:32>>, Loc),
+
+    %% Create the string table chunk.
+
+    {_,StringTab} = beam_dict:string_table(Dict),
+    StringChunk = chunk(<<"StrT">>, StringTab),
+
+    %% Create the fun table chunk. It is important not to build an empty chunk,
+    %% as that would change the MD5.
+
+    LambdaChunk = case beam_dict:lambda_table(Dict) of
+		      {0,[]} -> [];
+		      {NumLambdas,LambdaTab} ->
+			  chunk(<<"FunT">>, <<NumLambdas:32>>, LambdaTab)
+		  end,
+
+    %% Create the attributes and compile info chunks.
+
+    Essentials = [AtomChunk,CodeChunk,StringChunk,ImportChunk,ExpChunk,LambdaChunk],
+    {Attributes,Compile} = build_attributes(Opts, SourceFile, Attr, Essentials),
+    AttrChunk = chunk(<<"Attr">>, Attributes),
+    CompileChunk = chunk(<<"CInf">>, Compile),
+
+    %% Create the abstract code chunk.
+
+    AbstChunk = chunk(<<"Abst">>, Abst),
+
+    %% Create IFF chunk.
+
+    Chunks = case member(slim, Opts) of
+		 true -> [Essentials,AttrChunk,CompileChunk,AbstChunk];
+		 false -> [Essentials,LocChunk,AttrChunk,CompileChunk,AbstChunk]
+	     end,
+    build_form(<<"BEAM">>, Chunks).
+
+%% Build an IFF form.
+
+build_form(Id, Chunks0) when size(Id) == 4, list(Chunks0) ->
+    Chunks = list_to_binary(Chunks0),
+    Size = size(Chunks),
+    0 = Size rem 4,				% Assertion: correct padding?
+    <<"FOR1",(Size+4):32,Id/binary,Chunks/binary>>.
+
+%% Build a correctly padded chunk (with no sub-header).
+
+chunk(Id, Contents) when size(Id) == 4, binary(Contents) ->
+    Size = size(Contents),
+    [<<Id/binary,Size:32>>,Contents|pad(Size)];
+chunk(Id, Contents) when list(Contents) ->
+    chunk(Id, list_to_binary(Contents)).
+
+%% Build a correctly padded chunk (with a sub-header).
+
+chunk(Id, Head, Contents) when size(Id) == 4, is_binary(Head), is_binary(Contents) ->
+    Size = size(Head)+size(Contents),
+    [<<Id/binary,Size:32,Head/binary>>,Contents|pad(Size)];
+chunk(Id, Head, Contents) when list(Contents) ->
+    chunk(Id, Head, list_to_binary(Contents)).
+
+pad(Size) ->
+    case Size rem 4 of
+	0 -> [];
+	Rem -> duplicate(4 - Rem, 0)
+    end.
+
+flatten_exports(Exps) ->
+    list_to_binary(map(fun({F,A,L}) -> <<F:32,A:32,L:32>> end, Exps)).
+
+flatten_imports(Imps) ->
+    list_to_binary(map(fun({M,F,A}) -> <<M:32,F:32,A:32>> end, Imps)).
+
+build_attributes(Opts, SourceFile, Attr, Essentials) ->
+    Misc = case member(slim, Opts) of
+	       false ->
+		   {{Y,Mo,D},{H,Mi,S}} = erlang:universaltime(),
+		   [{time,{Y,Mo,D,H,Mi,S}},{source,SourceFile}];
+	       true -> []
+	   end,
+    Compile = [{options,Opts},{version,?COMPILER_VSN}|Misc],
+    {term_to_binary(calc_vsn(Attr, Essentials)),term_to_binary(Compile)}.
+
+%%
+%% If the attributes contains no 'vsn' attribute, we'll insert one
+%% with an MD5 "checksum" calculated on the code as its value.
+%% We'll not change an existing 'vsn' attribute.
+%%
+
+calc_vsn(Attr, Essentials) ->
+    case keymember(vsn, 1, Attr) of
+	true -> Attr;
+	false ->
+	    <<Number:128>> = erlang:md5(Essentials),
+	    [{vsn,[Number]}|Attr]
+    end.
+
+bif_type('-', 1)    -> negate;
+bif_type('+', 2)    -> {op, m_plus};
+bif_type('-', 2)    -> {op, m_minus};
+bif_type('*', 2)    -> {op, m_times};
+bif_type('/', 2)    -> {op, m_div};
+bif_type('div', 2)  -> {op, int_div};
+bif_type('rem', 2)  -> {op, int_rem};
+bif_type('band', 2) -> {op, int_band};
+bif_type('bor', 2)  -> {op, int_bor};
+bif_type('bxor', 2) -> {op, int_bxor};
+bif_type('bsl', 2)  -> {op, int_bsl};
+bif_type('bsr', 2)  -> {op, int_bsr};
+bif_type('bnot', 1) -> {op, int_bnot};
+bif_type(fnegate, 1)   -> {op, fnegate};
+bif_type(fadd, 2)   -> {op, fadd};
+bif_type(fsub, 2)   -> {op, fsub};
+bif_type(fmul, 2)   -> {op, fmul};
+bif_type(fdiv, 2)   -> {op, fdiv};
+bif_type(_, _)      -> bif.
+
+make_op(Comment, Dict) when element(1, Comment) == '%' ->
+    {[],Dict};
+make_op({'%live',_R}, Dict) ->
+    {[],Dict};
+make_op({bif, Bif, nofail, [], Dest}, Dict) ->
+    encode_op(bif0, [{extfunc, erlang, Bif, 0}, Dest], Dict);
+make_op({bif, raise, _Fail, [A1,A2], _Dest}, Dict) ->
+    encode_op(raise, [A1,A2], Dict);
+make_op({bif, Bif, Fail, Args, Dest}, Dict) ->
+    Arity = length(Args),
+    case bif_type(Bif, Arity) of
+	{op, Op} ->
+	    make_op(list_to_tuple([Op, Fail|Args++[Dest]]), Dict);
+	negate ->
+	    %% Fake negation operator.
+	    make_op({m_minus, Fail, {integer,0}, hd(Args), Dest}, Dict);
+	bif ->
+	    BifOp = list_to_atom(lists:concat([bif, Arity])),
+	    encode_op(BifOp, [Fail, {extfunc, erlang, Bif, Arity}|Args++[Dest]],
+		      Dict)
+    end;
+make_op({bs_add=Op,Fail,[Src1,Src2,Unit],Dest}, Dict) ->
+    encode_op(Op, [Fail,Src1,Src2,Unit,Dest], Dict);
+make_op({test,Cond,Fail,Ops}, Dict) when list(Ops) ->
+    encode_op(Cond, [Fail|Ops], Dict);
+make_op({make_fun2,{f,Lbl},Index,OldUniq,NumFree}, Dict0) ->
+    {Fun,Dict} = beam_dict:lambda(Lbl, Index, OldUniq, NumFree, Dict0),
+    make_op({make_fun2,Fun}, Dict);
+make_op(Op, Dict) when atom(Op) ->
+    encode_op(Op, [], Dict);
+make_op({kill,Y}, Dict) ->
+    make_op({init,Y}, Dict);
+make_op({Name,Arg1}, Dict) ->
+    encode_op(Name, [Arg1], Dict);
+make_op({Name,Arg1,Arg2}, Dict) ->
+    encode_op(Name, [Arg1,Arg2], Dict);
+make_op({Name,Arg1,Arg2,Arg3}, Dict) ->
+    encode_op(Name, [Arg1,Arg2,Arg3], Dict);
+make_op({Name,Arg1,Arg2,Arg3,Arg4}, Dict) ->
+    encode_op(Name, [Arg1,Arg2,Arg3,Arg4], Dict);
+make_op({Name,Arg1,Arg2,Arg3,Arg4,Arg5}, Dict) ->
+    encode_op(Name, [Arg1,Arg2,Arg3,Arg4,Arg5], Dict);
+make_op({Name,Arg1,Arg2,Arg3,Arg4,Arg5,Arg6}, Dict) ->
+    encode_op(Name, [Arg1,Arg2,Arg3,Arg4,Arg5,Arg6], Dict).
+
+encode_op(Name, Args, Dict0) when atom(Name) ->
+    {EncArgs,Dict1} = encode_args(Args, Dict0),
+    Op = beam_opcodes:opcode(Name, length(Args)),
+    Dict2 = beam_dict:opcode(Op, Dict1),
+    {list_to_binary([Op|EncArgs]),Dict2}.
+
+encode_args([Arg| T], Dict0) ->
+    {EncArg, Dict1} = encode_arg(Arg, Dict0),
+    {EncTail, Dict2} = encode_args(T, Dict1),
+    {[EncArg| EncTail], Dict2};
+encode_args([], Dict) ->
+    {[], Dict}.
+
+encode_arg({x, X}, Dict) when X >= 0 ->
+    {encode(?tag_x, X), Dict};
+encode_arg({y, Y}, Dict) when Y >= 0 ->
+    {encode(?tag_y, Y), Dict};
+encode_arg({atom, Atom}, Dict0) when atom(Atom) ->
+    {Index, Dict} = beam_dict:atom(Atom, Dict0),
+    {encode(?tag_a, Index), Dict};
+encode_arg({integer, N}, Dict) ->
+    {encode(?tag_i, N), Dict};
+encode_arg(nil, Dict) ->
+    {encode(?tag_a, 0), Dict};
+encode_arg({f, W}, Dict) ->
+    {encode(?tag_f, W), Dict};
+encode_arg({'char', C}, Dict) ->
+    {encode(?tag_h, C), Dict};
+encode_arg({string, String}, Dict0) ->
+    {Offset, Dict} = beam_dict:string(String, Dict0),
+    {encode(?tag_u, Offset), Dict};
+encode_arg({extfunc, M, F, A}, Dict0) ->
+    {Index, Dict} = beam_dict:import(M, F, A, Dict0),
+    {encode(?tag_u, Index), Dict};
+encode_arg({list, List}, Dict0) ->
+    {L, Dict} = encode_list(List, Dict0, []),
+    {[encode(?tag_z, 1), encode(?tag_u, length(List))|L], Dict};
+encode_arg({float, Float}, Dict) when float(Float) ->
+    {[encode(?tag_z, 0)|<<Float:64/float>>], Dict};
+encode_arg({fr,Fr}, Dict) ->
+    {[encode(?tag_z, 2),encode(?tag_u,Fr)], Dict};
+encode_arg({field_flags,Flags0}, Dict) ->
+    Flags = lists:foldl(fun (F, S) -> S bor flag_to_bit(F) end, 0, Flags0),
+    {encode(?tag_u, Flags), Dict};
+encode_arg({alloc,List}, Dict) ->
+    {encode_alloc_list(List),Dict};
+encode_arg(Int, Dict) when is_integer(Int) ->
+    {encode(?tag_u, Int),Dict}.
+
+flag_to_bit(aligned) -> 16#01;
+flag_to_bit(little)  -> 16#02;
+flag_to_bit(big)     -> 16#00;
+flag_to_bit(signed)  -> 16#04;
+flag_to_bit(unsigned)-> 16#00;
+flag_to_bit(exact)   -> 16#08;
+flag_to_bit(native) ->  16#10.
+
+encode_list([H|T], _Dict, _Acc) when is_list(H) ->
+    exit({illegal_nested_list,encode_arg,[H|T]});
+encode_list([H|T], Dict0, Acc) ->
+    {Enc,Dict} = encode_arg(H, Dict0),
+    encode_list(T, Dict, [Enc|Acc]);
+encode_list([], Dict, Acc) ->
+    {lists:reverse(Acc), Dict}.
+
+encode_alloc_list(L0) ->
+    L = encode_alloc_list_1(L0),
+    [encode(?tag_z, 3),encode(?tag_u, length(L0))|L].
+
+encode_alloc_list_1([{words,Words}|T]) ->
+    [encode(?tag_u, 0),encode(?tag_u, Words)|encode_alloc_list_1(T)];
+encode_alloc_list_1([{floats,Floats}|T]) ->
+    [encode(?tag_u, 1),encode(?tag_u, Floats)|encode_alloc_list_1(T)];
+encode_alloc_list_1([]) -> [].
+
+encode(Tag, N) when N < 0 ->
+    encode1(Tag, negative_to_bytes(N, []));
+encode(Tag, N) when N < 16 ->
+    (N bsl 4) bor Tag;
+encode(Tag, N) when N < 16#800  ->
+    [((N bsr 3) band 2#11100000) bor Tag bor 2#00001000, N band 16#ff];
+encode(Tag, N) ->
+    encode1(Tag, to_bytes(N, [])).
+
+encode1(Tag, Bytes) ->
+    case length(Bytes) of
+	Num when 2 =< Num, Num =< 8 ->
+	    [((Num-2) bsl 5) bor 2#00011000 bor Tag| Bytes];
+	Num when 8 < Num ->
+	    [2#11111000 bor Tag, encode(?tag_u, Num-9)| Bytes]
+    end.
+
+to_bytes(0, [B|Acc]) when B < 128 ->
+    [B|Acc];
+to_bytes(N, Acc) ->
+    to_bytes(N bsr 8, [N band 16#ff| Acc]).
+
+negative_to_bytes(-1, [B1, B2|T]) when B1 > 127 ->
+    [B1, B2|T];
+negative_to_bytes(N, Acc) ->
+    negative_to_bytes(N bsr 8, [N band 16#ff|Acc]).
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_block.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_block.erl
new file mode 100644
index 0000000000..0e3589cdf5
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_block.erl
@@ -0,0 +1,601 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: beam_block.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
+%%
+%% Purpose : Partitions assembly instructions into basic blocks and
+%% optimizes them.
+
+-module(beam_block).
+
+-export([module/2]).
+-export([live_at_entry/1]).			%Used by beam_type, beam_bool.
+-export([is_killed/2]).				%Used by beam_dead, beam_type, beam_bool.
+-export([is_not_used/2]).			%Used by beam_bool.
+-export([merge_blocks/2]).			%Used by beam_jump.
+-import(lists, [map/2,mapfoldr/3,reverse/1,reverse/2,foldl/3,
+		member/2,sort/1,all/2]).
+-define(MAXREG, 1024).
+
+module({Mod,Exp,Attr,Fs,Lc}, _Opt) ->
+    {ok,{Mod,Exp,Attr,map(fun function/1, Fs),Lc}}.
+
+function({function,Name,Arity,CLabel,Is0}) ->
+    %% Collect basic blocks and optimize them.
+    Is = blockify(Is0),
+
+    %% Done.
+    {function,Name,Arity,CLabel,Is}.
+
+%% blockify(Instructions0) -> Instructions
+%%  Collect sequences of instructions to basic blocks and
+%%  optimize the contents of the blocks. Also do some simple
+%%  optimations on instructions outside the blocks.
+
+blockify(Is) ->
+    blockify(Is, []).
+
+blockify([{loop_rec,{f,Fail},{x,0}},{loop_rec_end,_Lbl},{label,Fail}|Is], Acc) ->
+    %% Useless instruction sequence.
+    blockify(Is, Acc);
+blockify([{test,bs_test_tail,F,[Bits]}|Is],
+	 [{test,bs_skip_bits,F,[{integer,I},Unit,_Flags]}|Acc]) ->
+    blockify(Is, [{test,bs_test_tail,F,[Bits+I*Unit]}|Acc]);
+blockify([{test,bs_skip_bits,F,[{integer,I1},Unit1,_]}|Is],
+	 [{test,bs_skip_bits,F,[{integer,I2},Unit2,Flags]}|Acc]) ->
+    blockify(Is, [{test,bs_skip_bits,F,
+		   [{integer,I1*Unit1+I2*Unit2},1,Flags]}|Acc]);
+blockify([{test,is_atom,{f,Fail},[Reg]}=I|
+	  [{select_val,Reg,{f,Fail},
+	    {list,[{atom,false},{f,_}=BrFalse,
+		   {atom,true}=AtomTrue,{f,_}=BrTrue]}}|Is]=Is0],
+	 [{block,Bl}|_]=Acc) ->
+    case is_last_bool(Bl, Reg) of
+	false ->
+	    blockify(Is0, [I|Acc]);
+	true ->
+	    blockify(Is, [{jump,BrTrue},
+			  {test,is_eq_exact,BrFalse,[Reg,AtomTrue]}|Acc])
+    end;
+blockify([{test,is_atom,{f,Fail},[Reg]}=I|
+	  [{select_val,Reg,{f,Fail},
+	    {list,[{atom,true}=AtomTrue,{f,_}=BrTrue,
+		   {atom,false},{f,_}=BrFalse]}}|Is]=Is0],
+	 [{block,Bl}|_]=Acc) ->
+    case is_last_bool(Bl, Reg) of
+	false ->
+	    blockify(Is0, [I|Acc]);
+	true ->
+	    blockify(Is, [{jump,BrTrue},
+			  {test,is_eq_exact,BrFalse,[Reg,AtomTrue]}|Acc])
+    end;
+blockify([I|Is0]=IsAll, Acc) ->
+    case is_bs_put(I) of
+	true ->
+	    {BsPuts0,Is} = collect_bs_puts(IsAll),
+	    BsPuts = opt_bs_puts(BsPuts0),
+	    blockify(Is, reverse(BsPuts, Acc));
+	false ->
+	    case collect(I) of
+		error -> blockify(Is0, [I|Acc]);
+		Instr when is_tuple(Instr) ->
+		    {Block0,Is} = collect_block(IsAll),
+		    Block = opt_block(Block0),
+		    blockify(Is, [{block,Block}|Acc])
+	    end
+    end;
+blockify([], Acc) -> reverse(Acc).
+
+is_last_bool([I,{'%live',_}], Reg) ->
+    is_last_bool([I], Reg);
+is_last_bool([{set,[Reg],As,{bif,N,_}}], Reg) ->
+    Ar = length(As),
+    erl_internal:new_type_test(N, Ar) orelse erl_internal:comp_op(N, Ar)
+	orelse erl_internal:bool_op(N, Ar);
+is_last_bool([_|Is], Reg) -> is_last_bool(Is, Reg);
+is_last_bool([], _) -> false.
+
+collect_block(Is) ->
+    collect_block(Is, []).
+
+collect_block([{allocate_zero,Ns,R},{test_heap,Nh,R}|Is], Acc) ->
+    collect_block(Is, [{allocate,R,{no_opt,Ns,Nh,[]}}|Acc]);
+collect_block([I|Is]=Is0, Acc) ->
+    case collect(I) of
+	error -> {reverse(Acc),Is0};
+	Instr -> collect_block(Is, [Instr|Acc])
+    end;
+collect_block([], Acc) -> {reverse(Acc),[]}.
+
+collect({allocate_zero,N,R}) -> {allocate,R,{zero,N,0,[]}};
+collect({test_heap,N,R})     -> {allocate,R,{nozero,nostack,N,[]}};
+collect({bif,N,nofail,As,D}) -> {set,[D],As,{bif,N}};
+collect({bif,N,F,As,D})      -> {set,[D],As,{bif,N,F}};
+collect({move,S,D})          -> {set,[D],[S],move};
+collect({put_list,S1,S2,D})  -> {set,[D],[S1,S2],put_list};
+collect({put_tuple,A,D})     -> {set,[D],[],{put_tuple,A}};
+collect({put,S})             -> {set,[],[S],put};
+collect({put_string,L,S,D})  -> {set,[D],[],{put_string,L,S}};
+collect({get_tuple_element,S,I,D}) -> {set,[D],[S],{get_tuple_element,I}};
+collect({set_tuple_element,S,D,I}) -> {set,[],[S,D],{set_tuple_element,I}};
+collect({get_list,S,D1,D2})  -> {set,[D1,D2],[S],get_list};
+collect(remove_message)      -> {set,[],[],remove_message};
+collect({'catch',R,L})       -> {set,[R],[],{'catch',L}};
+collect({'%live',_}=Live)    -> Live;
+collect(_)                   -> error.
+
+opt_block(Is0) ->
+    %% We explicitly move any allocate instruction upwards before optimising
+    %% moves, to avoid any potential problems with the calculation of live
+    %% registers.
+    Is1 = find_fixpoint(fun move_allocates/1, Is0),
+    Is2 = find_fixpoint(fun opt/1, Is1),
+    Is = opt_alloc(Is2),
+    share_floats(Is).
+
+find_fixpoint(OptFun, Is0) ->
+    case OptFun(Is0) of
+	Is0 -> Is0;
+	Is1 -> find_fixpoint(OptFun, Is1)
+    end.
+
+move_allocates([{set,_Ds,_Ss,{set_tuple_element,_}}|_]=Is) -> Is;
+move_allocates([{set,Ds,Ss,_Op}=Set,{allocate,R,Alloc}|Is]) when is_integer(R) ->
+    [{allocate,live_regs(Ds, Ss, R),Alloc},Set|Is];
+move_allocates([{allocate,R1,Alloc1},{allocate,R2,Alloc2}|Is]) ->
+    R1 = R2,					% Assertion.
+    move_allocates([{allocate,R1,combine_alloc(Alloc1, Alloc2)}|Is]);
+move_allocates([I|Is]) ->
+    [I|move_allocates(Is)];
+move_allocates([]) -> [].
+
+combine_alloc({_,Ns,Nh1,Init}, {_,nostack,Nh2,[]}) ->
+    {zero,Ns,Nh1+Nh2,Init}.
+
+merge_blocks([{allocate,R,{Attr,Ns,Nh1,Init}}|B1],
+	     [{allocate,_,{_,nostack,Nh2,[]}}|B2]) ->
+    Alloc = {allocate,R,{Attr,Ns,Nh1+Nh2,Init}},
+    [Alloc|merge_blocks(B1, B2)];
+merge_blocks(B1, B2) -> merge_blocks_1(B1++[{set,[],[],stop_here}|B2]).
+
+merge_blocks_1([{set,[],_,stop_here}|Is]) -> Is;
+merge_blocks_1([{set,[D],_,move}=I|Is]) ->
+    case is_killed(D, Is) of
+	true -> merge_blocks_1(Is);
+	false -> [I|merge_blocks_1(Is)]
+    end;
+merge_blocks_1([I|Is]) -> [I|merge_blocks_1(Is)].
+
+opt([{set,[Dst],As,{bif,Bif,Fail}}=I1,
+     {set,[Dst],[Dst],{bif,'not',Fail}}=I2|Is]) ->
+    %% Get rid of the 'not' if the operation can be inverted.
+    case inverse_comp_op(Bif) of
+	none -> [I1,I2|opt(Is)];
+	RevBif -> [{set,[Dst],As,{bif,RevBif,Fail}}|opt(Is)]
+    end;
+opt([{set,[X],[X],move}|Is]) -> opt(Is);
+opt([{set,[D1],[{integer,Idx1},Reg],{bif,element,{f,0}}}=I1,
+     {set,[D2],[{integer,Idx2},Reg],{bif,element,{f,0}}}=I2|Is])
+  when Idx1 < Idx2, D1 =/= D2, D1 =/= Reg, D2 =/= Reg ->
+    opt([I2,I1|Is]);
+opt([{set,Ds0,Ss,Op}|Is0]) ->
+    {Ds,Is} =  opt_moves(Ds0, Is0),
+    [{set,Ds,Ss,Op}|opt(Is)];
+opt([I|Is]) -> [I|opt(Is)];
+opt([]) -> [].
+
+opt_moves([], Is0) -> {[],Is0};
+opt_moves([D0], Is0) ->
+    {D1,Is1} = opt_move(D0, Is0),
+    {[D1],Is1};
+opt_moves([X0,Y0]=Ds, Is0) ->
+    {X1,Is1} = opt_move(X0, Is0),
+    case opt_move(Y0, Is1) of
+	{Y1,Is2} when X1 =/= Y1 -> {[X1,Y1],Is2};
+	_Other when X1 =/= Y0 -> {[X1,Y0],Is1};
+	_Other -> {Ds,Is0}
+    end.
+
+opt_move(R, [{set,[D],[R],move}|Is]=Is0) ->
+    case is_killed(R, Is) of
+	true -> {D,Is};
+	false -> {R,Is0}
+    end;
+opt_move(R, [I|Is0]) ->
+    case is_transparent(R, I) of
+	true ->
+	    {D,Is1} = opt_move(R, Is0),
+	    case is_transparent(D, I) of
+		true ->  {D,[I|Is1]};
+		false -> {R,[I|Is0]}
+	    end;
+	false -> {R,[I|Is0]}
+    end;
+opt_move(R, []) -> {R,[]}.
+
+is_transparent(R, {set,Ds,Ss,_Op}) ->
+    case member(R, Ds) of
+	true -> false;
+	false -> not member(R, Ss)
+    end;
+is_transparent(_, _) -> false.
+
+%% is_killed(Register, [Instruction]) -> true|false
+%%  Determine whether a register is killed by the instruction sequence.
+%%  If true is returned, it means that the register will not be
+%%  referenced in ANY way (not even indirectly by an allocate instruction);
+%%  i.e. it is OK to enter the instruction sequence with Register
+%%  containing garbage.
+
+is_killed({x,N}=R, [{block,Blk}|Is]) ->
+    case is_killed(R, Blk) of
+	true -> true;
+	false ->
+	    %% Before looking beyond the block, we must be
+	    %% sure that the register is not referenced by
+	    %% any allocate instruction in the block.
+	    case all(fun({allocate,Live,_}) when N < Live -> false;
+			(_) -> true
+		     end, Blk) of
+		true -> is_killed(R, Is);
+		false -> false
+	    end
+    end;
+is_killed(R, [{block,Blk}|Is]) ->
+    case is_killed(R, Blk) of
+	true -> true;
+	false -> is_killed(R, Is)
+    end;
+is_killed(R, [{set,Ds,Ss,_Op}|Is]) ->
+    case member(R, Ss) of
+	true -> false;
+	false ->
+	    case member(R, Ds) of
+		true -> true;
+		false -> is_killed(R, Is)
+	    end
+    end;
+is_killed(R, [{case_end,Used}|_]) -> R =/= Used;
+is_killed(R, [{badmatch,Used}|_]) -> R =/= Used;
+is_killed(_, [if_end|_]) -> true;
+is_killed(R, [{func_info,_,_,Ar}|_]) ->
+    case R of
+	{x,X} when X < Ar -> false;
+	_ -> true
+    end;
+is_killed(R, [{kill,R}|_]) -> true;
+is_killed(R, [{kill,_}|Is]) -> is_killed(R, Is);
+is_killed(R, [{bs_init2,_,_,_,_,_,Dst}|Is]) ->
+    if
+	R =:= Dst -> true;
+	true -> is_killed(R, Is)
+    end;
+is_killed(R, [{bs_put_string,_,_}|Is]) -> is_killed(R, Is);
+is_killed({x,R}, [{'%live',Live}|_]) when R >= Live -> true;
+is_killed({x,R}, [{'%live',_}|Is]) -> is_killed(R, Is);
+is_killed({x,R}, [{allocate,Live,_}|_]) ->
+    %% Note: To be safe here, we must return either true or false,
+    %% not looking further at the instructions beyond the allocate
+    %% instruction.
+    R >= Live;
+is_killed({x,R}, [{call,Live,_}|_]) when R >= Live -> true;
+is_killed({x,R}, [{call_last,Live,_,_}|_]) when R >= Live -> true;
+is_killed({x,R}, [{call_only,Live,_}|_]) when R >= Live -> true;
+is_killed({x,R}, [{call_ext,Live,_}|_]) when R >= Live -> true;
+is_killed({x,R}, [{call_ext_last,Live,_,_}|_]) when R >= Live -> true;
+is_killed({x,R}, [{call_ext_only,Live,_}|_]) when R >= Live -> true;
+is_killed({x,R}, [return|_]) when R > 0 -> true;
+is_killed(_, _) -> false.
+
+%% is_not_used(Register, [Instruction]) -> true|false
+%%  Determine whether a register is used by the instruction sequence.
+%%  If true is returned, it means that the register will not be
+%%  referenced directly, but it may be referenced by an allocate
+%%  instruction (meaning that it is NOT allowed to contain garbage).
+
+is_not_used(R, [{block,Blk}|Is]) ->
+    case is_not_used(R, Blk) of
+	true -> true;
+	false -> is_not_used(R, Is)
+    end;
+is_not_used({x,R}=Reg, [{allocate,Live,_}|Is]) ->
+    if
+	R >= Live -> true;
+	true -> is_not_used(Reg, Is)
+    end;
+is_not_used(R, [{set,Ds,Ss,_Op}|Is]) ->
+    case member(R, Ss) of
+	true -> false;
+	false ->
+	    case member(R, Ds) of
+		true -> true;
+		false -> is_not_used(R, Is)
+	    end
+    end;
+is_not_used(R, Is) -> is_killed(R, Is).
+
+%% opt_alloc(Instructions) -> Instructions'
+%%  Optimises all allocate instructions.
+
+opt_alloc([{allocate,R,{_,Ns,Nh,[]}}|Is]) ->
+    [opt_alloc(Is, Ns, Nh, R)|opt(Is)];
+opt_alloc([I|Is]) -> [I|opt_alloc(Is)];
+opt_alloc([]) -> [].
+
+%% opt_alloc(Instructions, FrameSize, HeapNeed, LivingRegs) -> [Instr]
+%%  Generates the optimal sequence of instructions for
+%%  allocating and initalizing the stack frame and needed heap.
+
+opt_alloc(_Is, nostack, Nh, LivingRegs) ->
+    {allocate,LivingRegs,{nozero,nostack,Nh,[]}};
+opt_alloc(Is, Ns, Nh, LivingRegs) ->
+    InitRegs = init_yreg(Is, 0),
+    case count_ones(InitRegs) of
+	N when N*2 > Ns ->
+	    {allocate,LivingRegs,{nozero,Ns,Nh,gen_init(Ns, InitRegs)}};
+	_ ->
+	    {allocate,LivingRegs,{zero,Ns,Nh,[]}}
+    end.
+
+gen_init(Fs, Regs) -> gen_init(Fs, Regs, 0, []).
+
+gen_init(SameFs, _Regs, SameFs, Acc) -> reverse(Acc);
+gen_init(Fs, Regs, Y, Acc) when Regs band 1 == 0 ->
+    gen_init(Fs, Regs bsr 1, Y+1, [{init, {y,Y}}|Acc]);
+gen_init(Fs, Regs, Y, Acc) ->
+    gen_init(Fs, Regs bsr 1, Y+1, Acc).
+
+%% init_yreg(Instructions, RegSet) -> RegSetInitialized
+%%  Calculate the set of initialized y registers.
+
+init_yreg([{set,_,_,{bif,_,_}}|_], Reg) -> Reg;
+init_yreg([{set,Ds,_,_}|Is], Reg) -> init_yreg(Is, add_yregs(Ds, Reg));
+init_yreg(_Is, Reg) -> Reg.
+
+add_yregs(Ys, Reg) -> foldl(fun(Y, R0) -> add_yreg(Y, R0) end, Reg, Ys).
+
+add_yreg({y,Y}, Reg) -> Reg bor (1 bsl Y);
+add_yreg(_, Reg)     -> Reg.
+
+count_ones(Bits) -> count_ones(Bits, 0).
+count_ones(0, Acc) -> Acc;
+count_ones(Bits, Acc) ->
+    count_ones(Bits bsr 1, Acc + (Bits band 1)).
+
+%% live_at_entry(Is) -> NumberOfRegisters
+%%  Calculate the number of register live at the entry to the code
+%%  sequence.
+
+live_at_entry([{block,[{allocate,R,_}|_]}|_]) ->
+    R;
+live_at_entry([{label,_}|Is]) ->
+    live_at_entry(Is);
+live_at_entry([{block,Bl}|_]) ->
+    live_at_entry(Bl);
+live_at_entry([{func_info,_,_,Ar}|_]) ->
+    Ar;
+live_at_entry(Is0) ->
+    case reverse(Is0) of
+	[{'%live',Regs}|Is] -> live_at_entry_1(Is, (1 bsl Regs)-1);
+	_ -> unknown
+    end.
+
+live_at_entry_1([{set,Ds,Ss,_}|Is], Rset0) ->
+    Rset = x_live(Ss, x_dead(Ds, Rset0)),
+    live_at_entry_1(Is, Rset);
+live_at_entry_1([{allocate,_,_}|Is], Rset) ->
+    live_at_entry_1(Is, Rset);
+live_at_entry_1([], Rset) -> live_regs_1(0, Rset).
+
+%% Calculate the new number of live registers when we move an allocate
+%% instruction upwards, passing a 'set' instruction.
+
+live_regs(Ds, Ss, Regs0) ->
+    Rset = x_live(Ss, x_dead(Ds, (1 bsl Regs0)-1)),
+    live_regs_1(0, Rset).
+
+live_regs_1(N, 0) -> N;
+live_regs_1(N, Regs) -> live_regs_1(N+1, Regs bsr 1).
+
+x_dead([{x,N}|Rs], Regs) -> x_dead(Rs, Regs band (bnot (1 bsl N)));
+x_dead([_|Rs], Regs) -> x_dead(Rs, Regs);
+x_dead([], Regs) -> Regs.
+
+x_live([{x,N}|Rs], Regs) -> x_live(Rs, Regs bor (1 bsl N));
+x_live([_|Rs], Regs) -> x_live(Rs, Regs);
+x_live([], Regs) -> Regs.
+
+%%
+%% If a floating point literal occurs more than once, move it into
+%% a free register and re-use it.
+%%
+
+share_floats([{allocate,_,_}=Alloc|Is]) ->
+    [Alloc|share_floats(Is)];
+share_floats(Is0) ->
+    All = get_floats(Is0, []),
+    MoreThanOnce0 =  more_than_once(sort(All), gb_sets:empty()),
+    case gb_sets:is_empty(MoreThanOnce0) of
+	true -> Is0;
+	false ->
+	    MoreThanOnce = gb_sets:to_list(MoreThanOnce0),
+	    FreeX = highest_used(Is0, -1) + 1,
+	    Regs0 = make_reg_map(MoreThanOnce, FreeX, []),
+	    Regs = gb_trees:from_orddict(Regs0),
+	    Is = map(fun({set,Ds,[{float,F}],Op}=I) ->
+			     case gb_trees:lookup(F, Regs) of
+				 none -> I;
+				 {value,R} -> {set,Ds,[R],Op}
+			     end;
+			(I) -> I
+		     end, Is0),
+	    [{set,[R],[{float,F}],move} || {F,R} <- Regs0] ++ Is
+    end.
+
+get_floats([{set,_,[{float,F}],_}|Is], Acc) ->
+    get_floats(Is, [F|Acc]);
+get_floats([_|Is], Acc) ->
+    get_floats(Is, Acc);
+get_floats([], Acc) -> Acc.
+
+more_than_once([F,F|Fs], Set) ->
+    more_than_once(Fs, gb_sets:add(F, Set));
+more_than_once([_|Fs], Set) ->
+    more_than_once(Fs, Set);
+more_than_once([], Set) -> Set.
+
+highest_used([{set,Ds,Ss,_}|Is], High) ->
+    highest_used(Is, highest(Ds, highest(Ss, High)));
+highest_used([{'%live',Live}|Is], High) when Live > High ->
+    highest_used(Is, Live);
+highest_used([_|Is], High) ->
+    highest_used(Is, High);
+highest_used([], High) -> High.
+
+highest([{x,R}|Rs], High) when R > High ->
+    highest(Rs, R);
+highest([_|Rs], High) ->
+    highest(Rs, High);
+highest([], High) -> High.
+
+make_reg_map([F|Fs], R, Acc) when R < ?MAXREG ->
+    make_reg_map(Fs, R+1, [{F,{x,R}}|Acc]);
+make_reg_map(_, _, Acc) -> sort(Acc).
+
+%% inverse_comp_op(Op) -> none|RevOp
+
+inverse_comp_op('=:=') -> '=/=';
+inverse_comp_op('=/=') -> '=:=';
+inverse_comp_op('==') -> '/=';
+inverse_comp_op('/=') -> '==';
+inverse_comp_op('>') -> '=<';
+inverse_comp_op('<') -> '>=';
+inverse_comp_op('>=') -> '<';
+inverse_comp_op('=<') -> '>';
+inverse_comp_op(_) -> none.
+
+%%%
+%%% Evaluation of constant bit fields.
+%%%
+
+is_bs_put({bs_put_integer,_,_,_,_,_}) -> true;
+is_bs_put({bs_put_float,_,_,_,_,_}) -> true;
+is_bs_put(_) -> false.
+
+collect_bs_puts(Is) ->
+    collect_bs_puts_1(Is, []).
+
+collect_bs_puts_1([I|Is]=Is0, Acc) ->
+    case is_bs_put(I) of
+	false -> {reverse(Acc),Is0};
+	true -> collect_bs_puts_1(Is, [I|Acc])
+    end;
+collect_bs_puts_1([], Acc) -> {reverse(Acc),[]}.
+
+opt_bs_puts(Is) ->
+    opt_bs_1(Is, []).
+
+opt_bs_1([{bs_put_float,Fail,{integer,Sz},1,Flags0,Src}=I0|Is], Acc) ->
+    case catch eval_put_float(Src, Sz, Flags0) of
+	{'EXIT',_} ->
+	    opt_bs_1(Is, [I0|Acc]);
+	<<Int:Sz>> ->
+	    Flags = force_big(Flags0),
+	    I = {bs_put_integer,Fail,{integer,Sz},1,Flags,{integer,Int}},
+	    opt_bs_1([I|Is], Acc)
+    end;
+opt_bs_1([{bs_put_integer,_,{integer,8},1,_,{integer,_}}|_]=IsAll, Acc0) ->
+    {Is,Acc} = bs_collect_string(IsAll, Acc0),
+    opt_bs_1(Is, Acc);
+opt_bs_1([{bs_put_integer,Fail,{integer,Sz},1,F,{integer,N}}=I|Is0], Acc) when Sz > 8 ->
+    case field_endian(F) of
+	big ->
+	    case bs_split_int(N, Sz, Fail, Is0) of
+		no_split -> opt_bs_1(Is0, [I|Acc]);
+		Is -> opt_bs_1(Is, Acc)
+	    end;
+	little ->
+	    case catch <<N:Sz/little>> of
+		{'EXIT',_} ->
+		    opt_bs_1(Is0, [I|Acc]);
+		<<Int:Sz>> ->
+		    Flags = force_big(F),
+		    Is = [{bs_put_integer,Fail,{integer,Sz},1,
+			   Flags,{integer,Int}}|Is0],
+		    opt_bs_1(Is, Acc)
+	    end;
+	native -> opt_bs_1(Is0, [I|Acc])
+    end;
+opt_bs_1([{Op,Fail,{integer,Sz},U,F,Src}|Is], Acc) when U > 1 ->
+    opt_bs_1([{Op,Fail,{integer,U*Sz},1,F,Src}|Is], Acc);
+opt_bs_1([I|Is], Acc) ->
+    opt_bs_1(Is, [I|Acc]);
+opt_bs_1([], Acc) -> reverse(Acc).
+
+eval_put_float(Src, Sz, Flags) ->
+    Val = value(Src),
+    case field_endian(Flags) of
+	little -> <<Val:Sz/little-float-unit:1>>;
+	big -> <<Val:Sz/big-float-unit:1>>
+        %% native intentionally not handled here - we can't optimize it.
+    end.
+
+value({integer,I}) -> I;
+value({float,F}) -> F;
+value({atom,A}) -> A.
+
+bs_collect_string(Is, [{bs_put_string,Len,{string,Str}}|Acc]) ->
+    bs_coll_str_1(Is, Len, reverse(Str), Acc);
+bs_collect_string(Is, Acc) ->
+    bs_coll_str_1(Is, 0, [], Acc).
+
+bs_coll_str_1([{bs_put_integer,_,{integer,Sz},U,_,{integer,V}}|Is],
+	      Len, StrAcc, IsAcc) when U*Sz =:= 8 ->
+    Byte = V band 16#FF,
+    bs_coll_str_1(Is, Len+1, [Byte|StrAcc], IsAcc);
+bs_coll_str_1(Is, Len, StrAcc, IsAcc) ->
+    {Is,[{bs_put_string,Len,{string,reverse(StrAcc)}}|IsAcc]}.
+
+field_endian({field_flags,F}) -> field_endian_1(F).
+
+field_endian_1([big=E|_]) -> E;
+field_endian_1([little=E|_]) -> E;
+field_endian_1([native=E|_]) -> E;
+field_endian_1([_|Fs]) -> field_endian_1(Fs).
+
+force_big({field_flags,F}) ->
+    {field_flags,force_big_1(F)}.
+
+force_big_1([big|_]=Fs) -> Fs;
+force_big_1([little|Fs]) -> [big|Fs];
+force_big_1([F|Fs]) -> [F|force_big_1(Fs)].
+
+bs_split_int(0, Sz, _, _) when Sz > 64 ->
+    %% We don't want to split in this case because the
+    %% string will consist of only zeroes.
+    no_split;
+bs_split_int(N, Sz, Fail, Acc) ->
+    FirstByteSz = case Sz rem 8 of
+		      0 -> 8;
+		      Rem -> Rem
+		  end,
+    bs_split_int_1(N, FirstByteSz, Sz, Fail, Acc).
+
+bs_split_int_1(N, ByteSz, Sz, Fail, Acc) when Sz > 0 ->
+    Mask = (1 bsl ByteSz) - 1,
+    I = {bs_put_integer,Fail,{integer,ByteSz},1,
+	 {field_flags,[big]},{integer,N band Mask}},
+    bs_split_int_1(N bsr ByteSz, 8, Sz-ByteSz, Fail, [I|Acc]);
+bs_split_int_1(_, _, _, _, Acc) -> Acc.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_bool.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_bool.erl
new file mode 100644
index 0000000000..b7b28a41a5
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_bool.erl
@@ -0,0 +1,617 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: beam_bool.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
+%%
+%% Purpose: Optimizes booleans in guards.
+
+-module(beam_bool).
+
+-export([module/2]).
+
+-import(lists, [reverse/1,foldl/3,mapfoldl/3,sort/1,member/2]).
+-define(MAXREG, 1024).
+
+-record(st,
+	{next,					%Next label number.
+	 ll					%Live regs at labels.
+	}).
+
+module({Mod,Exp,Attr,Fs0,Lc}, _Opts) ->
+    %%io:format("~p:\n", [Mod]),
+    {Fs,_} = mapfoldl(fun(Fn, Lbl) -> function(Fn, Lbl) end, 100000000, Fs0),
+    {ok,{Mod,Exp,Attr,Fs,Lc}}.
+
+function({function,Name,Arity,CLabel,Is0}, Lbl0) ->
+    %%io:format("~p/~p:\n", [Name,Arity]),
+    {Is,#st{next=Lbl}} = bool_opt(Is0, Lbl0),
+    {{function,Name,Arity,CLabel,Is},Lbl}.
+
+%%
+%% Optimize boolean expressions that use guard bifs. Rewrite to
+%% use test instructions if possible.
+%%
+
+bool_opt(Asm, Lbl) ->
+    LiveInfo = index_instructions(Asm),
+    bopt(Asm, [], #st{next=Lbl,ll=LiveInfo}).
+
+bopt([{block,Bl0}=Block|
+      [{jump,{f,Succ}},
+       {label,Fail},
+       {block,[{set,[Dst],[{atom,false}],move},{'%live',Live}]},
+       {label,Succ}|Is]=Is0], Acc0, St) ->
+    case split_block(Bl0, Dst, Fail) of
+	failed ->
+	    bopt(Is0, [Block|Acc0], St);
+	{Bl,PreBlock} ->
+	    Acc1 = case PreBlock of
+		       [] -> Acc0;
+		       _ -> [{block,PreBlock}|Acc0]
+		   end,
+	    Acc = [{protected,[Dst],Bl,{Fail,Succ,Live}}|Acc1],
+	    bopt(Is, Acc, St)
+    end;
+bopt([{test,is_eq_exact,{f,Fail},[Reg,{atom,true}]}=I|Is], [{block,_}|_]=Acc0, St0) ->
+    case bopt_block(Reg, Fail, Is, Acc0, St0) of
+	failed -> bopt(Is, [I|Acc0], St0);
+	{Acc,St} -> bopt(Is, Acc, St)
+    end;
+bopt([I|Is], Acc, St) ->
+    bopt(Is, [I|Acc], St);
+bopt([], Acc, St) ->
+    {bopt_reverse(Acc, []),St}.
+
+bopt_reverse([{protected,[Dst],Block,{Fail,Succ,Live}}|Is], Acc0) ->
+    Acc = [{block,Block},{jump,{f,Succ}},
+	   {label,Fail},
+	   {block,[{set,[Dst],[{atom,false}],move},{'%live',Live}]},
+	   {label,Succ}|Acc0],
+    bopt_reverse(Is, Acc);
+bopt_reverse([I|Is], Acc) ->
+    bopt_reverse(Is, [I|Acc]);
+bopt_reverse([], Acc) -> Acc.
+
+%% bopt_block(Reg, Fail, OldIs, Accumulator, St) -> failed | {NewAcc,St}
+%%  Attempt to optimized a block of guard BIFs followed by a test
+%%  instruction.
+bopt_block(Reg, Fail, OldIs, [{block,Bl0}|Acc0], St0) ->
+    case split_block(Bl0, Reg, Fail) of
+	failed ->
+	    %% Reason for failure: The block either contained no
+	    %% guard BIFs with the failure label Fail, or the final
+	    %% instruction in the block did not assign the Reg register.
+
+	    %%io:format("split ~p: ~P\n", [Reg,Bl0,20]),
+	    failed;
+	{Bl1,BlPre} ->
+	    %% The block has been splitted. Bl1 is a non-empty list
+	    %% of guard BIF instructions having the failure label Fail.
+	    %% BlPre is a (possibly empty list) of instructions preceeding
+	    %% Bl1.
+	    Acc1 = make_block(BlPre, Acc0),
+	    {Bl,Acc} = extend_block(Bl1, Fail, Acc1),
+	    case catch bopt_block_1(Bl, Fail, St0) of
+		{'EXIT',_Reason} ->
+		    %% Optimization failed for one of the following reasons:
+		    %%
+		    %% 1. Not possible to rewrite because a boolean value is
+		    %%    passed to another guard bif, e.g. 'abs(A > B)'
+		    %%    (in this case, obviously nonsense code). Rare in
+		    %%    practice.
+		    %%
+		    %% 2. Not possible to rewrite because we have not seen
+		    %%    the complete boolan expression (it is spread out
+		    %%    over several blocks with jumps and labels).
+		    %%    The 'or' and 'and' instructions need to that fully
+		    %%    known operands in order to be eliminated.
+		    %%
+		    %% 3. Other bug or limitation.
+
+		    %%io:format("~P\n", [_Reason,20]),
+		    failed;
+		{NewCode,St} ->
+		    case is_opt_safe(Bl, NewCode, OldIs, St) of
+			false ->
+			    %% The optimization is not safe. (A register
+			    %% used by the instructions following the
+			    %% optimized code is either not assigned a
+			    %% value at all or assigned a different value.)
+
+			    %%io:format("\nNot safe:\n"),
+			    %%io:format("~p\n", [Bl]),
+			    %%io:format("~p\n", [reverse(NewCode)]),
+			    failed;
+			true -> {NewCode++Acc,St}
+		    end
+	    end
+    end.
+
+bopt_block_1(Block, Fail, St) ->
+    {Pre0,[{_,Tree}]} = bopt_tree(Block),
+    Pre = update_fail_label(Pre0, Fail, []),
+    bopt_cg(Tree, Fail, make_block(Pre, []), St).
+
+%% is_opt_safe(OriginalCode, OptCode, FollowingCode, State) -> true|false
+%%  Comparing the original code to the optimized code, determine
+%%  whether the optimized code is guaranteed to work in the same
+%%  way as the original code.
+
+is_opt_safe(Bl, NewCode, OldIs, St) ->
+    %% Here are the conditions that must be true for the
+    %% optimization to be safe.
+    %%
+    %% 1. Any register that was assigned a value in the original
+    %%    code, but is not in the optimized code, must be guaranteed
+    %%    to be KILLED in the following code. (NotSet below.)
+    %%
+    %% 2. Any register that is assigned a value in the optimized
+    %%    code must be UNUSED in the following code. (NewDst, Set.)
+    %%    (Possible future improvement: Registers that are known
+    %%    to be assigned the SAME value in the original and optimized
+    %%    code don't need to be unused in the following code.)
+
+    PrevDst = dst_regs(Bl),
+    NewDst = dst_regs(NewCode),
+    NotSet = ordsets:subtract(PrevDst, NewDst),
+
+    %% Note: The following line is an optimization. We don't need
+    %% to test whether variables in NotSet for being unused, because
+    %% they will all be tested for being killed (a stronger condition
+    %% than being unused).
+
+    Set = ordsets:subtract(NewDst, NotSet),
+
+    all_killed(NotSet, OldIs, St) andalso
+	none_used(Set, OldIs, St).
+
+% update_fail_label([{set,_,_,{bif,_,{f,0}}}=I|Is], Fail, Acc) ->
+%     update_fail_label(Is, Fail, [I|Acc]);
+update_fail_label([{set,Ds,As,{bif,N,{f,_}}}|Is], Fail, Acc) ->
+    update_fail_label(Is, Fail, [{set,Ds,As,{bif,N,{f,Fail}}}|Acc]);
+update_fail_label([], _, Acc) -> Acc.
+
+make_block([], Acc) -> Acc;
+make_block(Bl, Acc) -> [{block,Bl}|Acc].
+
+extend_block(BlAcc, Fail, [{protected,_,_,_}=Prot|OldAcc]) ->
+    extend_block([Prot|BlAcc], Fail, OldAcc);
+extend_block(BlAcc0, Fail, [{block,Is0}|OldAcc]=OldAcc0) ->
+    case extend_block_1(reverse(Is0), Fail, BlAcc0) of
+	{[],_} -> {BlAcc0,OldAcc0};
+	{BlAcc,[]} -> extend_block(BlAcc, Fail, OldAcc);
+	{BlAcc,Is} -> {BlAcc,[{block,Is}|OldAcc]}
+    end;
+extend_block(BlAcc, _, OldAcc) -> {BlAcc,OldAcc}.
+
+extend_block_1([{set,[_],_,{bif,_,{f,Fail}}}=I|Is], Fail, Acc) ->
+    extend_block_1(Is, Fail, [I|Acc]);
+extend_block_1([{set,[_],As,{bif,Bif,_}}=I|Is]=Is0, Fail, Acc) ->
+    case safe_bool_op(Bif, length(As)) of
+	false -> {Acc,reverse(Is0)};
+	true -> extend_block_1(Is, Fail, [I|Acc])
+    end;
+extend_block_1([_|_]=Is, _, Acc) -> {Acc,reverse(Is)};
+extend_block_1([], _, Acc) -> {Acc,[]}.
+
+split_block(Is0, Dst, Fail) ->
+    case reverse(Is0) of
+	[{'%live',_}|[{set,[Dst],_,_}|_]=Is] ->
+	    split_block_1(Is, Fail);
+	[{set,[Dst],_,_}|_]=Is ->
+	    split_block_1(Is, Fail);
+	_ -> failed
+    end.
+
+split_block_1(Is, Fail) ->
+    case split_block_2(Is, Fail, []) of
+	{[],_} -> failed;
+	{_,_}=Res -> Res
+    end.
+
+% split_block_2([{set,[_],_,{bif,_,{f,0}}}=I|Is], Fail, Acc) ->
+%     split_block_2(Is, Fail, [I|Acc]);
+split_block_2([{set,[_],_,{bif,_,{f,Fail}}}=I|Is], Fail, Acc) ->
+    split_block_2(Is, Fail, [I|Acc]);
+split_block_2([{'%live',_}|Is], Fail, Acc) ->
+    split_block_2(Is, Fail, Acc);
+split_block_2(Is, _, Acc) -> {Acc,reverse(Is)}.
+
+dst_regs(Is) ->
+    dst_regs(Is, []).
+
+dst_regs([{block,Bl}|Is], Acc) ->
+    dst_regs(Bl, dst_regs(Is, Acc));
+dst_regs([{set,[D],_,{bif,_,{f,_}}}|Is], Acc) ->
+    dst_regs(Is, [D|Acc]);
+dst_regs([_|Is], Acc) ->
+    dst_regs(Is, Acc);
+dst_regs([], Acc) -> ordsets:from_list(Acc).
+
+all_killed([R|Rs], OldIs, St) ->
+    case is_killed(R, OldIs, St) of
+	false -> false;
+	true -> all_killed(Rs, OldIs, St)
+    end;
+all_killed([], _, _) -> true.
+
+none_used([R|Rs], OldIs, St) ->
+    case is_not_used(R, OldIs, St) of
+	false -> false;
+	true -> none_used(Rs, OldIs, St)
+    end;
+none_used([], _, _) -> true.
+
+bopt_tree(Block0) ->
+    Block = ssa_block(Block0),
+    Reg = free_variables(Block),
+    %%io:format("~p\n", [Block]),
+    %%io:format("~p\n", [Reg]),
+    Res = bopt_tree_1(Block, Reg, []),
+    %%io:format("~p\n", [Res]),
+    Res.
+
+bopt_tree_1([{set,[Dst],As0,{bif,'not',_}}|Is], Forest0, Pre) ->
+    {[Arg],Forest1} = bopt_bool_args(As0, Forest0),
+    Forest = gb_trees:enter(Dst, {'not',Arg}, Forest1),
+    bopt_tree_1(Is, Forest, Pre);
+bopt_tree_1([{set,[Dst],As0,{bif,'and',_}}|Is], Forest0, Pre) ->
+    {As,Forest1} = bopt_bool_args(As0, Forest0),
+    AndList = make_and_list(As),
+    Forest = gb_trees:enter(Dst, {'and',AndList}, Forest1),
+    bopt_tree_1(Is, Forest, Pre);
+bopt_tree_1([{set,[Dst],[L0,R0],{bif,'or',_}}|Is], Forest0, Pre) ->
+    L = gb_trees:get(L0, Forest0),
+    R = gb_trees:get(R0, Forest0),
+    Forest1 = gb_trees:delete(L0, gb_trees:delete(R0, Forest0)),
+    OrList = make_or_list([L,R]),
+    Forest = gb_trees:enter(Dst, {'or',OrList}, Forest1),
+    bopt_tree_1(Is, Forest, Pre);
+bopt_tree_1([{protected,[Dst],_,_}=Prot|Is], Forest0, Pre) ->
+    Forest = gb_trees:enter(Dst, Prot, Forest0),
+    bopt_tree_1(Is, Forest, Pre);
+bopt_tree_1([{set,[Dst],As,{bif,N,_}}=Bif|Is], Forest0, Pre) ->
+    Ar = length(As),
+    case safe_bool_op(N, Ar) of
+	false ->
+	    bopt_good_args(As, Forest0),
+	    Forest = gb_trees:enter(Dst, any, Forest0),
+	    bopt_tree_1(Is, Forest, [Bif|Pre]);
+	true ->
+	    bopt_good_args(As, Forest0),
+	    Test = bif_to_test(Dst, N, As),
+	    Forest = gb_trees:enter(Dst, Test, Forest0),
+	    bopt_tree_1(Is, Forest, Pre)
+    end;
+bopt_tree_1([], Forest, Pre) ->
+    {Pre,[R || {_,V}=R <- gb_trees:to_list(Forest), V =/= any]}.
+
+safe_bool_op(internal_is_record, 3) -> true;
+safe_bool_op(N, Ar) ->
+    erl_internal:new_type_test(N, Ar) orelse erl_internal:comp_op(N, Ar).
+
+bopt_bool_args(As, Forest) ->
+    mapfoldl(fun bopt_bool_arg/2, Forest, As).
+
+bopt_bool_arg({T,_}=R, Forest) when T == x; T == y ->
+    {gb_trees:get(R, Forest),gb_trees:delete(R, Forest)};
+bopt_bool_arg(Term, Forest) ->
+    {Term,Forest}.
+
+bopt_good_args([A|As], Regs) ->
+    bopt_good_arg(A, Regs),
+    bopt_good_args(As, Regs);
+bopt_good_args([], _) -> ok.
+
+bopt_good_arg({x,_}=X, Regs) ->
+    case gb_trees:get(X, Regs) of
+	any -> ok;
+	_Other ->
+	    %%io:format("not any: ~p: ~p\n", [X,_Other]),
+	    exit(bad_contents)
+    end;
+bopt_good_arg(_, _) -> ok.
+
+bif_to_test(_, N, As) ->
+    bif_to_test(N, As).
+
+bif_to_test(internal_is_record, [_,_,_]=As) ->
+    {test,internal_is_record,fail,As};
+bif_to_test('=:=', As) -> {test,is_eq_exact,fail,As};
+bif_to_test('=/=', As) -> {test,is_ne_exact,fail,As};
+bif_to_test('==', As) -> {test,is_eq,fail,As};
+bif_to_test('/=', As) -> {test,is_ne,fail,As};
+bif_to_test('=<', [L,R]) -> {test,is_ge,fail,[R,L]};
+bif_to_test('>=', As) -> {test,is_ge,fail,As};
+bif_to_test('>', [L,R]) -> {test,is_lt,fail,[R,L]};
+bif_to_test('<', As) -> {test,is_lt,fail,As};
+bif_to_test(Name, [_]=As) ->
+    case erl_internal:new_type_test(Name, 1) of
+	false -> exit({bif_to_test,Name,As,failed});
+	true -> {test,Name,fail,As}
+    end.
+
+make_and_list([{'and',As}|Is]) ->
+    make_and_list(As++Is);
+make_and_list([I|Is]) ->
+    [I|make_and_list(Is)];
+make_and_list([]) -> [].
+
+make_or_list([{'or',As}|Is]) ->
+    make_or_list(As++Is);
+make_or_list([I|Is]) ->
+    [I|make_or_list(Is)];
+make_or_list([]) -> [].
+
+%% Code generation for a boolean tree.
+
+bopt_cg({'not',Arg}, Fail, Acc, St) ->
+    I = bopt_cg_not(Arg),
+    bopt_cg(I, Fail, Acc, St);
+bopt_cg({'and',As}, Fail, Acc, St) ->
+    bopt_cg_and(As, Fail, Acc, St);
+bopt_cg({'or',As}, Fail, Acc, St0) ->
+    {Succ,St} = new_label(St0),
+    bopt_cg_or(As, Succ, Fail, Acc, St);
+bopt_cg({test,is_tuple_element,fail,[Tmp,Tuple,RecordTag]}, Fail, Acc, St) ->
+    {[{test,is_eq_exact,{f,Fail},[Tmp,RecordTag]},
+      {get_tuple_element,Tuple,0,Tmp}|Acc],St};
+bopt_cg({inverted_test,is_tuple_element,fail,[Tmp,Tuple,RecordTag]}, Fail, Acc, St) ->
+    {[{test,is_ne_exact,{f,Fail},[Tmp,RecordTag]},
+      {get_tuple_element,Tuple,0,Tmp}|Acc],St};
+bopt_cg({test,N,fail,As}, Fail, Acc, St) ->
+    Test = {test,N,{f,Fail},As},
+    {[Test|Acc],St};
+bopt_cg({inverted_test,N,fail,As}, Fail, Acc, St0) ->
+    {Lbl,St} = new_label(St0),
+    {[{label,Lbl},{jump,{f,Fail}},{test,N,{f,Lbl},As}|Acc],St};
+bopt_cg({protected,_,Bl0,{_,_,_}}, Fail, Acc, St0) ->
+    {Bl,St} = bopt_block_1(Bl0, Fail, St0),
+    {Bl++Acc,St};
+bopt_cg([_|_]=And, Fail, Acc, St) ->
+    bopt_cg_and(And, Fail, Acc, St).
+
+bopt_cg_not({'and',As0}) ->
+    As = [bopt_cg_not(A) || A <- As0],
+    {'or',As};
+bopt_cg_not({'or',As0}) ->
+    As = [bopt_cg_not(A) || A <- As0],
+    {'and',As};
+bopt_cg_not({test,Test,Fail,As}) ->
+    {inverted_test,Test,Fail,As}.
+
+bopt_cg_and([{atom,false}|_], Fail, _, St) ->
+    {[{jump,{f,Fail}}],St};
+bopt_cg_and([{atom,true}|Is], Fail, Acc, St) ->
+    bopt_cg_and(Is, Fail, Acc, St);
+bopt_cg_and([I|Is], Fail, Acc0, St0) ->
+    {Acc,St} = bopt_cg(I, Fail, Acc0, St0),
+    bopt_cg_and(Is, Fail, Acc, St);
+bopt_cg_and([], _, Acc, St) -> {Acc,St}.
+
+bopt_cg_or([I], Succ, Fail, Acc0, St0) ->
+    {Acc,St} = bopt_cg(I, Fail, Acc0, St0),
+    {[{label,Succ}|Acc],St};
+bopt_cg_or([I|Is], Succ, Fail, Acc0, St0) ->
+    {Lbl,St1} = new_label(St0),
+    {Acc,St} = bopt_cg(I, Lbl, Acc0, St1),
+    bopt_cg_or(Is, Succ, Fail, [{label,Lbl},{jump,{f,Succ}}|Acc], St).
+
+new_label(#st{next=LabelNum}=St) when is_integer(LabelNum) ->
+    {LabelNum,St#st{next=LabelNum+1}}.
+
+free_variables(Is) ->
+    E = gb_sets:empty(),
+    free_vars_1(Is, E, E).
+
+free_vars_1([{set,[Dst],As,{bif,_,_}}|Is], F0, N0) ->
+    F = gb_sets:union(F0, gb_sets:difference(var_list(As), N0)),
+    N = gb_sets:union(N0, var_list([Dst])),
+    free_vars_1(Is, F, N);
+free_vars_1([{protected,_,Pa,_}|Is], F, N) ->
+    free_vars_1(Pa++Is, F, N);
+free_vars_1([], F, _) ->
+    gb_trees:from_orddict([{K,any} || K <- gb_sets:to_list(F)]).
+
+var_list(Is) ->
+    var_list_1(Is, gb_sets:empty()).
+
+var_list_1([{x,_}=X|Is], D) ->
+    var_list_1(Is, gb_sets:add(X, D));
+var_list_1([_|Is], D) ->
+    var_list_1(Is, D);
+var_list_1([], D) -> D.
+
+%%%
+%%% Convert a block to Static Single Assignment (SSA) form.
+%%%
+
+-record(ssa,
+	{live,
+	 sub}).
+
+ssa_block(Is0) ->
+    Next = ssa_first_free(Is0, 0),
+    {Is,_} = ssa_block_1(Is0, #ssa{live=Next,sub=gb_trees:empty()}, []),
+    Is.
+
+ssa_block_1([{protected,[_],Pa0,Pb}|Is], Sub0, Acc) ->
+    {Pa,Sub} = ssa_block_1(Pa0, Sub0, []),
+    Dst = ssa_last_target(Pa),
+    ssa_block_1(Is, Sub, [{protected,[Dst],Pa,Pb}|Acc]);
+ssa_block_1([{set,[Dst],As,Bif}|Is], Sub0, Acc0) ->
+    Sub1 = ssa_in_use_list(As, Sub0),
+    Sub = ssa_assign(Dst, Sub1),
+    Acc = [{set,[ssa_sub(Dst, Sub)],ssa_sub_list(As, Sub0),Bif}|Acc0],
+    ssa_block_1(Is, Sub, Acc);
+ssa_block_1([], Sub, Acc) -> {reverse(Acc),Sub}.
+
+ssa_in_use_list(As, Sub) ->
+    foldl(fun ssa_in_use/2, Sub, As).
+
+ssa_in_use({x,_}=R, #ssa{sub=Sub0}=Ssa) ->
+    case gb_trees:is_defined(R, Sub0) of
+	true -> Ssa;
+	false ->
+	    Sub = gb_trees:insert(R, R, Sub0),
+	    Ssa#ssa{sub=Sub}
+    end;
+ssa_in_use(_, Ssa) -> Ssa.
+
+ssa_assign({x,_}=R, #ssa{sub=Sub0}=Ssa0) ->
+    case gb_trees:is_defined(R, Sub0) of
+	false ->
+	    Sub = gb_trees:insert(R, R, Sub0),
+	    Ssa0#ssa{sub=Sub};
+	true ->
+	    {NewReg,Ssa} = ssa_new_reg(Ssa0),
+	    Sub1 = gb_trees:update(R, NewReg, Sub0),
+	    Sub = gb_trees:insert(NewReg, NewReg, Sub1),
+	    Ssa#ssa{sub=Sub}
+    end;
+ssa_assign(_, Ssa) -> Ssa.
+
+ssa_sub_list(List, Sub) ->
+    [ssa_sub(E, Sub) || E <- List].
+
+ssa_sub(R0, #ssa{sub=Sub}) ->
+    case gb_trees:lookup(R0, Sub) of
+	none -> R0;
+	{value,R} -> R
+    end.
+
+ssa_new_reg(#ssa{live=Reg}=Ssa) ->
+    {{x,Reg},Ssa#ssa{live=Reg+1}}.
+
+ssa_first_free([{protected,Ds,_,_}|Is], Next0) ->
+    Next = ssa_first_free_list(Ds, Next0),
+    ssa_first_free(Is, Next);
+ssa_first_free([{set,[Dst],As,_}|Is], Next0) ->
+    Next = ssa_first_free_list([Dst|As], Next0),
+    ssa_first_free(Is, Next);
+ssa_first_free([], Next) -> Next.
+
+ssa_first_free_list(Regs, Next) ->
+    foldl(fun({x,R}, N) when R >= N -> R+1;
+	     (_, N) -> N end, Next, Regs).
+
+ssa_last_target([{set,[Dst],_,_},{'%live',_}]) -> Dst;
+ssa_last_target([{set,[Dst],_,_}]) -> Dst;
+ssa_last_target([_|Is]) -> ssa_last_target(Is).
+
+%% index_instructions(FunctionIs) -> GbTree([{Label,Is}])
+%%  Index the instruction sequence so that we can quickly
+%%  look up the instruction following a specific label.
+
+index_instructions(Is) ->
+    ii_1(Is, []).
+
+ii_1([{label,Lbl}|Is0], Acc) ->
+    Is = lists:dropwhile(fun({label,_}) -> true;
+			    (_) -> false end, Is0),
+    ii_1(Is0, [{Lbl,Is}|Acc]);
+ii_1([_|Is], Acc) ->
+    ii_1(Is, Acc);
+ii_1([], Acc) -> gb_trees:from_orddict(sort(Acc)).
+
+%% is_killed(Register, [Instruction], State) -> true|false
+%%  Determine whether a register is killed in the instruction sequence.
+%%  The state is used to allow us to determine the kill state
+%%  across branches.
+
+is_killed(R, Is, St) ->
+    case is_killed_1(R, Is, St) of
+	false ->
+	    %%io:format("nk ~p: ~P\n", [R,Is,15]),
+	    false;
+	true -> true
+    end.
+
+is_killed_1(R, [{block,Blk}|Is], St) ->
+    case is_killed_1(R, Blk, St) of
+	true -> true;
+	false -> is_killed_1(R, Is, St)
+    end;
+is_killed_1(R, [{test,_,{f,Fail},As}|Is], St) ->
+    case not member(R, As) andalso is_reg_killed_at(R, Fail, St) of
+	false -> false;
+	true -> is_killed_1(R, Is, St)
+    end;
+is_killed_1(R, [{select_val,R,_,_}|_], _) -> false;
+is_killed_1(R, [{select_val,_,Fail,{list,Branches}}|_], St) ->
+    is_killed_at_all(R, [Fail|Branches], St);
+is_killed_1(R, [{jump,{f,F}}|_], St) ->
+    is_reg_killed_at(R, F, St);
+is_killed_1(Reg, Is, _) ->
+    beam_block:is_killed(Reg, Is).
+
+is_reg_killed_at(R, Lbl, #st{ll=Ll}=St) ->
+    Is = gb_trees:get(Lbl, Ll),
+    is_killed_1(R, Is, St).
+
+is_killed_at_all(R, [{f,Lbl}|T], St) ->
+    case is_reg_killed_at(R, Lbl, St) of
+	false -> false;
+	true -> is_killed_at_all(R, T, St)
+    end;
+is_killed_at_all(R, [_|T], St) ->
+    is_killed_at_all(R, T, St);
+is_killed_at_all(_, [], _) -> true.
+
+%% is_not_used(Register, [Instruction], State) -> true|false
+%%  Determine whether a register is never used in the instruction sequence
+%%  (it could still referenced by an allocate instruction, meaning that
+%%  it MUST be initialized).
+%%    The state is used to allow us to determine the usage state
+%%  across branches.
+
+is_not_used(R, Is, St) ->
+    case is_not_used_1(R, Is, St) of
+	false ->
+	    %%io:format("used ~p: ~P\n", [R,Is,15]),
+	    false;
+	true -> true
+    end.
+
+is_not_used_1(R, [{block,Blk}|Is], St) ->
+    case is_not_used_1(R, Blk, St) of
+	true -> true;
+	false -> is_not_used_1(R, Is, St)
+    end;
+is_not_used_1(R, [{test,_,{f,Fail},As}|Is], St) ->
+    case not member(R, As) andalso is_reg_not_used_at(R, Fail, St) of
+	false -> false;
+	true -> is_not_used_1(R, Is, St)
+    end;
+is_not_used_1(R, [{select_val,R,_,_}|_], _) -> false;
+is_not_used_1(R, [{select_val,_,Fail,{list,Branches}}|_], St) ->
+    is_used_at_none(R, [Fail|Branches], St);
+is_not_used_1(R, [{jump,{f,F}}|_], St) ->
+    is_reg_not_used_at(R, F, St);
+is_not_used_1(Reg, Is, _) ->
+    beam_block:is_not_used(Reg, Is).
+
+is_reg_not_used_at(R, Lbl, #st{ll=Ll}=St) ->
+    Is = gb_trees:get(Lbl, Ll),
+    is_not_used_1(R, Is, St).
+
+is_used_at_none(R, [{f,Lbl}|T], St) ->
+    case is_reg_not_used_at(R, Lbl, St) of
+	false -> false;
+	true -> is_used_at_none(R, T, St)
+    end;
+is_used_at_none(R, [_|T], St) ->
+    is_used_at_none(R, T, St);
+is_used_at_none(_, [], _) -> true.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_clean.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_clean.erl
new file mode 100644
index 0000000000..04225e9bd0
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_clean.erl
@@ -0,0 +1,232 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: beam_clean.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
+%%
+%% Purpose : Clean up, such as removing unused labels and unused functions.
+
+-module(beam_clean).
+
+-export([module/2]).
+-import(lists, [member/2,map/2,foldl/3,mapfoldl/3,reverse/1]).
+
+module({Mod,Exp,Attr,Fs0,_}, _Opt) ->
+    Order = [Lbl || {function,_,_,Lbl,_} <- Fs0],
+    All = foldl(fun({function,_,_,Lbl,_}=Func,D) -> dict:store(Lbl, Func, D) end,
+		dict:new(), Fs0),
+    {WorkList,Used0} = exp_to_labels(Fs0, Exp),
+    Used = find_all_used(WorkList, All, Used0),
+    Fs1 = remove_unused(Order, Used, All),
+    {Fs,Lc} = clean_labels(Fs1),
+    {ok,{Mod,Exp,Attr,Fs,Lc}}.
+
+%% Convert the export list ({Name,Arity} pairs) to a list of entry labels.
+
+exp_to_labels(Fs, Exp) -> exp_to_labels(Fs, Exp, [], sets:new()).
+
+exp_to_labels([{function,Name,Arity,Lbl,_}|Fs], Exp, Acc, Used) ->
+    case member({Name,Arity}, Exp) of
+	true -> exp_to_labels(Fs, Exp, [Lbl|Acc], sets:add_element(Lbl, Used));
+	false -> exp_to_labels(Fs, Exp, Acc, Used)
+    end;
+exp_to_labels([], _, Acc, Used) -> {Acc,Used}.
+
+%% Remove the unused functions.
+
+remove_unused([F|Fs], Used, All) ->
+    case sets:is_element(F, Used) of
+	false -> remove_unused(Fs, Used, All);
+	true -> [dict:fetch(F, All)|remove_unused(Fs, Used, All)]
+    end;
+remove_unused([], _, _) -> [].
+
+%% Find all used functions.
+
+find_all_used([F|Fs0], All, Used0) ->
+    {function,_,_,_,Code} = dict:fetch(F, All),
+    {Fs,Used} = update_work_list(Code, {Fs0,Used0}),
+    find_all_used(Fs, All, Used);
+find_all_used([], _All, Used) -> Used.
+
+update_work_list([{call,_,{f,L}}|Is], Sets) ->
+    update_work_list(Is, add_to_work_list(L, Sets));
+update_work_list([{call_last,_,{f,L},_}|Is], Sets) ->
+    update_work_list(Is, add_to_work_list(L, Sets));
+update_work_list([{call_only,_,{f,L}}|Is], Sets) ->
+    update_work_list(Is, add_to_work_list(L, Sets));
+update_work_list([{make_fun,{f,L},_,_}|Is], Sets) ->
+    update_work_list(Is, add_to_work_list(L, Sets));
+update_work_list([{make_fun2,{f,L},_,_,_}|Is], Sets) ->
+    update_work_list(Is, add_to_work_list(L, Sets));
+update_work_list([_|Is], Sets) ->
+    update_work_list(Is, Sets);
+update_work_list([], Sets) -> Sets.
+
+add_to_work_list(F, {Fs,Used}=Sets) ->
+    case sets:is_element(F, Used) of
+	true -> Sets;
+	false -> {[F|Fs],sets:add_element(F, Used)}
+    end.
+
+
+%%%
+%%% Coalesce adjacent labels. Renumber all labels to eliminate gaps.
+%%% This cleanup will slightly reduce file size and slightly speed up loading.
+%%%
+%%% We also expand internal_is_record/3 to a sequence of instructions. It is done
+%%% here merely because this module will always be called even if optimization
+%%% is turned off. We don't want to do the expansion in beam_asm because we
+%%% want to see the expanded code in a .S file.
+%%%
+
+-record(st, {lmap,				%Translation tables for labels.
+	     entry,				%Number of entry label.
+	     lc					%Label counter
+	     }).
+
+clean_labels(Fs0) ->
+    St0 = #st{lmap=dict:new(),lc=1},
+    {Fs1,#st{lmap=Lmap,lc=Lc}} = mapfoldl(fun function_renumber/2, St0, Fs0),
+    {map(fun(F) -> function_replace(F, Lmap) end, Fs1),Lc}.
+
+function_renumber({function,Name,Arity,_Entry,Asm0}, St0) ->
+    {Asm,St} = renumber_labels(Asm0, [], St0),
+    {{function,Name,Arity,St#st.entry,Asm},St}.
+
+renumber_labels([{bif,internal_is_record,{f,_},
+		  [Term,Tag,{integer,Arity}],Dst}|Is], Acc, St) ->
+    ContLabel = 900000000+2*St#st.lc,
+    FailLabel = ContLabel+1,
+    Fail = {f,FailLabel},
+    Tmp = Dst,
+    renumber_labels([{test,is_tuple,Fail,[Term]},
+		     {test,test_arity,Fail,[Term,Arity]},
+		     {get_tuple_element,Term,0,Tmp},
+		     {test,is_eq_exact,Fail,[Tmp,Tag]},
+		     {move,{atom,true},Dst},
+		     {jump,{f,ContLabel}},
+		     {label,FailLabel},
+		     {move,{atom,false},Dst},
+		     {label,ContLabel}|Is], Acc, St);
+renumber_labels([{test,internal_is_record,{f,_}=Fail,
+		  [Term,Tag,{integer,Arity}]}|Is], Acc, St) ->
+    Tmp = {x,1023},
+    case Term of
+	{Reg,_} when Reg == x; Reg == y ->
+	    renumber_labels([{test,is_tuple,Fail,[Term]},
+			     {test,test_arity,Fail,[Term,Arity]},
+			     {get_tuple_element,Term,0,Tmp},
+			     {test,is_eq_exact,Fail,[Tmp,Tag]}|Is], Acc, St);
+	_ ->
+	    renumber_labels([{jump,Fail}|Is], Acc, St)
+    end;
+renumber_labels([{label,Old}|Is], [{label,New}|_]=Acc, #st{lmap=D0}=St) ->
+    D = dict:store(Old, New, D0),
+    renumber_labels(Is, Acc, St#st{lmap=D});
+renumber_labels([{label,Old}|Is], Acc, St0) ->
+    New = St0#st.lc,
+    D = dict:store(Old, New, St0#st.lmap),
+    renumber_labels(Is, [{label,New}|Acc], St0#st{lmap=D,lc=New+1});
+renumber_labels([{func_info,_,_,_}=Fi|Is], Acc, St0) ->
+    renumber_labels(Is, [Fi|Acc], St0#st{entry=St0#st.lc});
+renumber_labels([I|Is], Acc, St0) ->
+    renumber_labels(Is, [I|Acc], St0);
+renumber_labels([], Acc, St0) -> {Acc,St0}.
+
+function_replace({function,Name,Arity,Entry,Asm0}, Dict) ->
+    Asm = case catch replace(Asm0, [], Dict) of
+	      {'EXIT',_}=Reason ->
+		  exit(Reason);
+	      {error,{undefined_label,Lbl}=Reason} ->
+		  io:format("Function ~s/~w refers to undefined label ~w\n",
+			    [Name,Arity,Lbl]),
+		  exit(Reason);
+	      Asm1 when list(Asm1) -> Asm1
+	  end,
+    {function,Name,Arity,Entry,Asm}.
+
+replace([{test,Test,{f,Lbl},Ops}|Is], Acc, D) ->
+    replace(Is, [{test,Test,{f,label(Lbl, D)},Ops}|Acc], D);
+replace([{select_val,R,{f,Fail0},{list,Vls0}}|Is], Acc, D) ->
+    Vls1 = map(fun ({f,L}) -> {f,label(L, D)};
+		   (Other) -> Other end, Vls0),
+    Fail = label(Fail0, D),
+    case redundant_values(Vls1, Fail, []) of
+	[] ->
+	    %% Oops, no choices left. The loader will not accept that.
+	    %% Convert to a plain jump.
+	    replace(Is, [{jump,{f,Fail}}|Acc], D);
+	Vls ->
+	    replace(Is, [{select_val,R,{f,Fail},{list,Vls}}|Acc], D)
+    end;
+replace([{select_tuple_arity,R,{f,Fail},{list,Vls0}}|Is], Acc, D) ->
+    Vls = map(fun ({f,L}) -> {f,label(L, D)};
+		  (Other) -> Other end, Vls0),
+    replace(Is, [{select_tuple_arity,R,{f,label(Fail, D)},{list,Vls}}|Acc], D);
+replace([{'try',R,{f,Lbl}}|Is], Acc, D) ->
+    replace(Is, [{'try',R,{f,label(Lbl, D)}}|Acc], D);
+replace([{'catch',R,{f,Lbl}}|Is], Acc, D) ->
+    replace(Is, [{'catch',R,{f,label(Lbl, D)}}|Acc], D);
+replace([{jump,{f,Lbl}}|Is], Acc, D) ->
+    replace(Is, [{jump,{f,label(Lbl, D)}}|Acc], D);
+replace([{loop_rec,{f,Lbl},R}|Is], Acc, D) ->
+    replace(Is, [{loop_rec,{f,label(Lbl, D)},R}|Acc], D);
+replace([{loop_rec_end,{f,Lbl}}|Is], Acc, D) ->
+    replace(Is, [{loop_rec_end,{f,label(Lbl, D)}}|Acc], D);
+replace([{wait,{f,Lbl}}|Is], Acc, D) ->
+    replace(Is, [{wait,{f,label(Lbl, D)}}|Acc], D);
+replace([{wait_timeout,{f,Lbl},To}|Is], Acc, D) ->
+    replace(Is, [{wait_timeout,{f,label(Lbl, D)},To}|Acc], D);
+replace([{bif,Name,{f,Lbl},As,R}|Is], Acc, D) when Lbl =/= 0 ->
+    replace(Is, [{bif,Name,{f,label(Lbl, D)},As,R}|Acc], D);
+replace([{call,Ar,{f,Lbl}}|Is], Acc, D) ->
+    replace(Is, [{call,Ar,{f,label(Lbl,D)}}|Acc], D);
+replace([{call_last,Ar,{f,Lbl},N}|Is], Acc, D) ->
+    replace(Is, [{call_last,Ar,{f,label(Lbl,D)},N}|Acc], D);
+replace([{call_only,Ar,{f,Lbl}}|Is], Acc, D) ->
+    replace(Is, [{call_only,Ar,{f,label(Lbl, D)}}|Acc], D);
+replace([{make_fun,{f,Lbl},U1,U2}|Is], Acc, D) ->
+    replace(Is, [{make_fun,{f,label(Lbl, D)},U1,U2}|Acc], D);
+replace([{make_fun2,{f,Lbl},U1,U2,U3}|Is], Acc, D) ->
+    replace(Is, [{make_fun2,{f,label(Lbl, D)},U1,U2,U3}|Acc], D);
+replace([{bs_init2,{f,Lbl},Sz,Words,R,F,Dst}|Is], Acc, D) when Lbl =/= 0 ->
+    replace(Is, [{bs_init2,{f,label(Lbl, D)},Sz,Words,R,F,Dst}|Acc], D);
+replace([{bs_put_integer,{f,Lbl},Bits,Unit,Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
+    replace(Is, [{bs_put_integer,{f,label(Lbl, D)},Bits,Unit,Fl,Val}|Acc], D);
+replace([{bs_put_binary,{f,Lbl},Bits,Unit,Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
+    replace(Is, [{bs_put_binary,{f,label(Lbl, D)},Bits,Unit,Fl,Val}|Acc], D);
+replace([{bs_put_float,{f,Lbl},Bits,Unit,Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
+    replace(Is, [{bs_put_float,{f,label(Lbl, D)},Bits,Unit,Fl,Val}|Acc], D);
+replace([{bs_final,{f,Lbl},R}|Is], Acc, D) when Lbl =/= 0 ->
+    replace(Is, [{bs_final,{f,label(Lbl, D)},R}|Acc], D);
+replace([{bs_add,{f,Lbl},Src,Dst}|Is], Acc, D) when Lbl =/= 0 ->
+    replace(Is, [{bs_add,{f,label(Lbl, D)},Src,Dst}|Acc], D);
+replace([{bs_bits_to_bytes,{f,Lbl},Bits,Dst}|Is], Acc, D) when Lbl =/= 0 ->
+    replace(Is, [{bs_bits_to_bytes,{f,label(Lbl, D)},Bits,Dst}|Acc], D);
+replace([I|Is], Acc, D) ->
+    replace(Is, [I|Acc], D);
+replace([], Acc, _) -> Acc.
+
+label(Old, D) ->
+    case dict:find(Old, D) of
+	{ok,Val} -> Val;
+	error -> throw({error,{undefined_label,Old}})
+    end.
+
+redundant_values([_,{f,Fail}|Vls], Fail, Acc) ->
+    redundant_values(Vls, Fail, Acc);
+redundant_values([Val,Lbl|Vls], Fail, Acc) ->
+    redundant_values(Vls, Fail, [Lbl,Val|Acc]);
+redundant_values([], _, Acc) -> reverse(Acc).
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_dict.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_dict.erl
new file mode 100644
index 0000000000..08eca2fc00
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_dict.erl
@@ -0,0 +1,196 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: beam_dict.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
+%%
+%% Purpose : Maintain atom, import, and export tables for assembler.
+
+-module(beam_dict).
+
+-export([new/0, opcode/2, highest_opcode/1,
+	 atom/2, local/4, export/4, import/4, string/2, lambda/5,
+	 atom_table/1, local_table/1, export_table/1, import_table/1,
+	 string_table/1,lambda_table/1]).
+
+-record(asm_dict,
+	{atoms = [],				% [{Index, Atom}]
+	 exports = [],				% [{F, A, Label}]
+	 locals = [],				% [{F, A, Label}]
+	 imports = [],				% [{Index, {M, F, A}]
+	 strings = [],				% Deep list of characters
+	 lambdas = [],				% [{...}]
+	 next_atom = 1,
+	 next_import = 0,
+	 string_offset = 0,
+	 highest_opcode = 0
+	}).
+
+new() ->
+    #asm_dict{}.
+
+%% Remembers highest opcode.
+
+opcode(Op, Dict) when Dict#asm_dict.highest_opcode > Op -> Dict;
+opcode(Op, Dict) -> Dict#asm_dict{highest_opcode=Op}.
+
+%% Returns the highest opcode encountered.
+
+highest_opcode(#asm_dict{highest_opcode=Op}) -> Op.
+
+%% Returns the index for an atom (adding it to the atom table if necessary).
+%%    atom(Atom, Dict) -> {Index, Dict'}
+
+atom(Atom, Dict) when atom(Atom) ->
+    NextIndex = Dict#asm_dict.next_atom,
+    case lookup_store(Atom, Dict#asm_dict.atoms, NextIndex) of
+	{Index, _, NextIndex} ->
+	    {Index, Dict};
+	{Index, Atoms, NewIndex} ->
+	    {Index, Dict#asm_dict{atoms=Atoms, next_atom=NewIndex}}
+    end.
+
+%% Remembers an exported function.
+%%    export(Func, Arity, Label, Dict) -> Dict'
+
+export(Func, Arity, Label, Dict0) when atom(Func), integer(Arity), integer(Label) ->
+    {Index, Dict1} = atom(Func, Dict0),
+    Dict1#asm_dict{exports = [{Index, Arity, Label}| Dict1#asm_dict.exports]}.
+
+%% Remembers a local function.
+%%    local(Func, Arity, Label, Dict) -> Dict'
+
+local(Func, Arity, Label, Dict0) when atom(Func), integer(Arity), integer(Label) ->
+    {Index,Dict1} = atom(Func, Dict0),
+    Dict1#asm_dict{locals = [{Index,Arity,Label}| Dict1#asm_dict.locals]}.
+
+%% Returns the index for an import entry (adding it to the import table if necessary).
+%%    import(Mod, Func, Arity, Dict) -> {Index, Dict'}
+
+import(Mod, Func, Arity, Dict) when atom(Mod), atom(Func), integer(Arity) ->
+    NextIndex = Dict#asm_dict.next_import,
+    case lookup_store({Mod, Func, Arity}, Dict#asm_dict.imports, NextIndex) of
+	{Index, _, NextIndex} ->
+	    {Index, Dict};
+	{Index, Imports, NewIndex} ->
+	    {_, D1} = atom(Mod, Dict#asm_dict{imports=Imports, next_import=NewIndex}),
+	    {_, D2} = atom(Func, D1),
+	    {Index, D2}
+    end.
+
+%% Returns the index for a string in the string table (adding the string to the
+%% table if necessary).
+%%    string(String, Dict) -> {Offset, Dict'}
+
+string(Str, Dict) when list(Str) ->
+    #asm_dict{strings = Strings, string_offset = NextOffset} = Dict,
+    case old_string(Str, Strings) of
+	{true, Offset} ->
+	    {Offset, Dict};
+	false ->
+	    NewDict = Dict#asm_dict{strings = Strings++Str,
+				    string_offset = NextOffset+length(Str)},
+	    {NextOffset, NewDict}
+    end.
+
+%% Returns the index for a funentry (adding it to the table if necessary).
+%%    lambda(Dict, Lbl, Index, Uniq, NumFree) -> {Index,Dict'}
+
+lambda(Lbl, Index, OldUniq, NumFree, #asm_dict{lambdas=Lambdas0}=Dict) ->
+    OldIndex = length(Lambdas0),
+    Lambdas = [{Lbl,{OldIndex,Lbl,Index,NumFree,OldUniq}}|Lambdas0],
+    {OldIndex,Dict#asm_dict{lambdas=Lambdas}}.
+
+%% Returns the atom table.
+%%    atom_table(Dict) -> [Length,AtomString...]
+
+atom_table(#asm_dict{atoms=Atoms, next_atom=NumAtoms}) ->
+    Sorted = lists:sort(Atoms),
+    Fun = fun({_, A}) ->
+		  L = atom_to_list(A),
+		  [length(L)|L]
+	  end,
+    {NumAtoms-1, lists:map(Fun, Sorted)}.
+
+%% Returns the table of local functions.
+%%    local_table(Dict) -> {NumLocals, [{Function, Arity, Label}...]}
+
+local_table(#asm_dict{locals = Locals}) ->
+    {length(Locals),Locals}.
+
+%% Returns the export table.
+%%    export_table(Dict) -> {NumExports, [{Function, Arity, Label}...]}
+
+export_table(#asm_dict{exports = Exports}) ->
+    {length(Exports), Exports}.
+
+%% Returns the import table.
+%%    import_table(Dict) -> {NumImports, [{Module, Function, Arity}...]}
+
+import_table(Dict) ->
+    #asm_dict{imports = Imports, next_import = NumImports} = Dict,
+    Sorted = lists:sort(Imports),
+    Fun = fun({_, {Mod, Func, Arity}}) ->
+		  {Atom0, _} = atom(Mod, Dict),
+		  {Atom1, _} = atom(Func, Dict),
+		  {Atom0, Atom1, Arity}
+	  end,
+    {NumImports, lists:map(Fun, Sorted)}.
+
+string_table(#asm_dict{strings = Strings, string_offset = Size}) ->
+    {Size, Strings}.
+
+lambda_table(#asm_dict{locals=Loc0,lambdas=Lambdas0}) ->
+    Lambdas1 = sofs:relation(Lambdas0),
+    Loc = sofs:relation([{Lbl,{F,A}} || {F,A,Lbl} <- Loc0]),
+    Lambdas2 = sofs:relative_product1(Lambdas1, Loc),
+    Lambdas = [<<F:32,A:32,Lbl:32,Index:32,NumFree:32,OldUniq:32>> ||
+		  {{_,Lbl,Index,NumFree,OldUniq},{F,A}} <- sofs:to_external(Lambdas2)],
+    {length(Lambdas),Lambdas}.
+
+%%% Local helper functions.
+
+lookup_store(Key, Dict, NextIndex) ->
+    case catch lookup_store1(Key, Dict, NextIndex) of
+	Index when integer(Index) ->
+	    {Index, Dict, NextIndex};
+	{Index, NewDict} ->
+	    {Index, NewDict, NextIndex+1}
+    end.
+
+lookup_store1(Key, [Pair|Dict], NextIndex) when Key > element(2, Pair) ->
+    {Index, NewDict} = lookup_store1(Key, Dict, NextIndex),
+    {Index, [Pair|NewDict]};
+lookup_store1(Key, [{Index, Key}|_Dict], _NextIndex) ->
+    throw(Index);
+lookup_store1(Key, Dict, NextIndex) ->
+    {NextIndex, [{NextIndex, Key}|Dict]}.
+
+%% Search for string Str in the string pool Pool.
+%%   old_string(Str, Pool) -> false | {true, Offset}
+
+old_string(Str, Pool) ->
+    old_string(Str, Pool, 0).
+
+old_string([C|Str], [C|Pool], Index) ->
+    case lists:prefix(Str, Pool) of
+	true ->
+	    {true, Index};
+	false ->
+	    old_string([C|Str], Pool, Index+1)
+    end;
+old_string(Str, [_|Pool], Index) ->
+    old_string(Str, Pool, Index+1);
+old_string(_Str, [], _Index) ->
+    false.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_disasm.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_disasm.erl
new file mode 100644
index 0000000000..0108f91b7f
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_disasm.erl
@@ -0,0 +1,964 @@
+%% -*- erlang-indent-level: 4 -*-
+%%=======================================================================
+%% File        : beam_disasm.erl
+%% Author      : Kostis Sagonas
+%% Description : Disassembles an R5-R10 .beam file into symbolic BEAM code
+%%=======================================================================
+%% $Id: beam_disasm.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
+%%=======================================================================
+%% Notes:
+%%   1. It does NOT work for .beam files of previous BEAM versions.
+%%   2. If handling of new BEAM instructions is needed, this should be
+%%      inserted at the end of function resolve_inst().
+%%=======================================================================
+
+-module(beam_disasm).
+
+-export([file/1, format_error/1]).
+
+-author("Kostis Sagonas").
+
+-include("beam_opcodes.hrl").
+
+%%-----------------------------------------------------------------------
+
+-define(NO_DEBUG(Str,Xs),ok).
+-define(DEBUG(Str,Xs),io:format(Str,Xs)).
+-define(exit(Reason),exit({?MODULE,?LINE,Reason})).
+
+%%-----------------------------------------------------------------------
+%% Error information
+
+format_error({error, Module, Error}) ->
+    Module:format_error(Error);
+format_error({internal, Error}) ->
+    io_lib:format("~p: disassembly failed with reason ~P.",
+		  [?MODULE, Error, 25]).
+
+%%-----------------------------------------------------------------------
+%% The main exported function
+%%   File is either a file name or a binary containing the code.
+%%   Returns `{beam_file, [...]}' or `{error, Module, Reason}'.
+%%   Call `format_error({error, Module, Reason})' for an error string.
+%%-----------------------------------------------------------------------
+
+file(File) ->
+    case beam_lib:info(File) of
+	Info when list(Info) ->
+	    {value,{chunks,Chunks}} = lists:keysearch(chunks,1,Info),
+	    case catch process_chunks(File, Chunks) of
+		{'EXIT', Error} ->
+		    {error, ?MODULE, {internal, Error}};
+		Result ->
+		    Result
+	    end;
+	Error ->
+	    Error
+    end.
+
+%%-----------------------------------------------------------------------
+%% Interface might need to be revised -- do not depend on it.
+%%-----------------------------------------------------------------------
+
+process_chunks(F,ChunkInfoList) ->
+    {ok,{_,Chunks}} = beam_lib:chunks(F, ["Atom","Code","StrT","ImpT","ExpT"]),
+    [{"Atom",AtomBin},{"Code",CodeBin},{"StrT",StrBin},
+     {"ImpT",ImpBin},{"ExpT",ExpBin}] = Chunks,
+    LambdaBin = optional_chunk(F, "FunT", ChunkInfoList),
+    LocBin = optional_chunk(F, "LocT", ChunkInfoList),
+    AttrBin = optional_chunk(F, "Attr", ChunkInfoList),
+    CompBin = optional_chunk(F, "CInf", ChunkInfoList),
+    Atoms = beam_disasm_atoms(AtomBin),
+    Exports = beam_disasm_exports(ExpBin, Atoms),
+    Imports = beam_disasm_imports(ImpBin, Atoms),
+    LocFuns = beam_disasm_exports(LocBin, Atoms),
+    Lambdas = beam_disasm_lambdas(LambdaBin, Atoms),
+    Str = beam_disasm_strings(StrBin),
+    Str1 = binary_to_list(Str),  %% for debugging -- use Str as far as poss.
+    Sym_Code = beam_disasm_code(CodeBin,Atoms,Imports,Str,Lambdas),
+    Attributes = beam_disasm_attributes(AttrBin),
+    CompInfo = beam_disasm_compilation_info(CompBin),
+    All = [{exports,Exports},
+	   {imports,Imports},
+	   {code,Sym_Code},
+	   {atoms,Atoms},
+	   {local_funs,LocFuns},
+	   {strings,Str1},
+	   {attributes,Attributes},
+	   {comp_info,CompInfo}],
+    {beam_file,[Item || {_Key,Data}=Item <- All, Data =/= none]}.
+
+%%-----------------------------------------------------------------------
+%% Retrieve an optional chunk or none if the chunk doesn't exist.
+%%-----------------------------------------------------------------------
+
+optional_chunk(F, ChunkTag, ChunkInfo) ->
+    case lists:keymember(ChunkTag, 1, ChunkInfo) of
+	true ->
+	    {ok,{_,[{ChunkTag,Chunk}]}} = beam_lib:chunks(F, [ChunkTag]),
+	    Chunk;
+	false -> none
+    end.
+
+%%-----------------------------------------------------------------------
+%% UTILITIES -- these actually exist in file "beam_lib"
+%%           -- they should be moved into a common utils file.
+%%-----------------------------------------------------------------------
+
+i32([X1,X2,X3,X4]) ->
+    (X1 bsl 24) bor (X2 bsl 16) bor (X3 bsl 8) bor X4.
+
+get_int(B) ->
+    {I, B1} = split_binary(B, 4),
+    {i32(binary_to_list(I)), B1}.
+
+%%-----------------------------------------------------------------------
+%% Disassembles the atom table of a BEAM file.
+%% - atoms are stored in order 1 ... N (N = Num_atoms, in fact),
+%% - each atom name consists of a length byte, followed by that many
+%%   bytes of name
+%% (nb: atom names max 255 chars?!)
+%%-----------------------------------------------------------------------
+
+beam_disasm_atoms(AtomTabBin) ->
+    {_NumAtoms,B} = get_int(AtomTabBin),
+    disasm_atoms(B).
+
+disasm_atoms(AtomBin) ->
+    disasm_atoms(binary_to_list(AtomBin),1).
+
+disasm_atoms([Len|Xs],N) ->
+    {AtomName,Rest} = get_atom_name(Len,Xs),
+    [{N,list_to_atom(AtomName)}|disasm_atoms(Rest,N+1)];
+disasm_atoms([],_) ->
+    [].
+
+get_atom_name(Len,Xs) ->
+    get_atom_name(Len,Xs,[]).
+
+get_atom_name(N,[X|Xs],RevName) when N > 0 ->
+    get_atom_name(N-1,Xs,[X|RevName]);
+get_atom_name(0,Xs,RevName) ->
+    { lists:reverse(RevName), Xs }.
+
+%%-----------------------------------------------------------------------
+%% Disassembles the export table of a BEAM file.
+%%-----------------------------------------------------------------------
+
+beam_disasm_exports(none, _) -> none;
+beam_disasm_exports(ExpTabBin, Atoms) ->
+    {_NumAtoms,B} = get_int(ExpTabBin),
+    disasm_exports(B,Atoms).
+
+disasm_exports(Bin,Atoms) ->
+    resolve_exports(collect_exports(binary_to_list(Bin)),Atoms).
+
+collect_exports([F3,F2,F1,F0,A3,A2,A1,A0,L3,L2,L1,L0|Exps]) ->
+    [{i32([F3,F2,F1,F0]),  % F = function (atom ID)
+      i32([A3,A2,A1,A0]),  % A = arity (int)
+      i32([L3,L2,L1,L0])}  % L = label (int)
+     |collect_exports(Exps)];
+collect_exports([]) ->
+    [].
+
+resolve_exports(Exps,Atoms) ->
+    [ {lookup_key(F,Atoms), A, L} || {F,A,L} <- Exps ].
+
+%%-----------------------------------------------------------------------
+%% Disassembles the import table of a BEAM file.
+%%-----------------------------------------------------------------------
+
+beam_disasm_imports(ExpTabBin,Atoms) ->
+    {_NumAtoms,B} = get_int(ExpTabBin),
+    disasm_imports(B,Atoms).
+
+disasm_imports(Bin,Atoms) ->
+    resolve_imports(collect_imports(binary_to_list(Bin)),Atoms).
+
+collect_imports([M3,M2,M1,M0,F3,F2,F1,F0,A3,A2,A1,A0|Exps]) ->
+    [{i32([M3,M2,M1,M0]),  % M = module (atom ID)
+      i32([F3,F2,F1,F0]),  % F = function (atom ID)
+      i32([A3,A2,A1,A0])}  % A = arity (int)
+     |collect_imports(Exps)];
+collect_imports([]) ->
+    [].
+
+resolve_imports(Exps,Atoms) ->
+    [{extfunc,lookup_key(M,Atoms),lookup_key(F,Atoms),A} || {M,F,A} <- Exps ].
+
+%%-----------------------------------------------------------------------
+%% Disassembles the lambda (fun) table of a BEAM file.
+%%-----------------------------------------------------------------------
+
+beam_disasm_lambdas(none, _) -> none;
+beam_disasm_lambdas(<<_:32,Tab/binary>>, Atoms) ->
+    disasm_lambdas(Tab, Atoms, 0).
+
+disasm_lambdas(<<F:32,A:32,Lbl:32,Index:32,NumFree:32,OldUniq:32,More/binary>>,
+	       Atoms, OldIndex) ->
+    Info = {lookup_key(F, Atoms),A,Lbl,Index,NumFree,OldUniq},
+    [{OldIndex,Info}|disasm_lambdas(More, Atoms, OldIndex+1)];
+disasm_lambdas(<<>>, _, _) -> [].
+
+%%-----------------------------------------------------------------------
+%% Disassembles the code chunk of a BEAM file:
+%%   - The code is first disassembled into a long list of instructions.
+%%   - This list is then split into functions and all names are resolved.
+%%-----------------------------------------------------------------------
+
+beam_disasm_code(CodeBin,Atoms,Imports,Str,Lambdas) ->
+    [_SS3,_SS2,_SS1,_SS0,  % Sub-Size (length of information before code)
+     _IS3,_IS2,_IS1,_IS0,  % Instruction Set Identifier (always 0)
+     _OM3,_OM2,_OM1,_OM0,  % Opcode Max
+     _L3,_L2,_L1,_L0,_F3,_F2,_F1,_F0|Code] = binary_to_list(CodeBin),
+    case catch disasm_code(Code, Atoms) of
+	{'EXIT',Rsn} ->
+	    ?NO_DEBUG('code disasm failed: ~p~n',[Rsn]),
+	    ?exit(Rsn);
+	DisasmCode ->
+	    Functions = get_function_chunks(DisasmCode),
+	    LocLabels = local_labels(Functions),
+	    [resolve_names(F,Imports,Str,LocLabels,Lambdas) || F <- Functions]
+    end.
+
+%%-----------------------------------------------------------------------
+
+disasm_code([B|Bs], Atoms) ->
+    {Instr,RestBs} = disasm_instr(B, Bs, Atoms),
+    [Instr|disasm_code(RestBs, Atoms)];
+disasm_code([], _) -> [].
+
+%%-----------------------------------------------------------------------
+%% Splits the code stream into chunks representing the code of functions.
+%%
+%% NOTE: code actually looks like
+%%   label L1: ... label Ln:
+%%     func_info ...
+%%   label entry:
+%%     ...
+%%     <on failure, use label Li to show where things died>
+%%     ...
+%% So the labels before each func_info should be included as well.
+%% Ideally, only one such label is needed, but the BEAM compiler
+%% before R8 didn't care to remove the redundant ones.
+%%-----------------------------------------------------------------------
+
+get_function_chunks([I|Code]) ->
+    {LastI,RestCode,Labs} = split_head_labels(I,Code,[]),
+    get_funs(LastI,RestCode,Labs,[]);
+get_function_chunks([]) ->
+    ?exit(empty_code_segment).
+
+get_funs(PrevI,[I|Is],RevF,RevFs) ->
+    case I of
+	{func_info,_Info} ->
+	    [H|T] = RevF,
+	    {Last,Fun,TrailingLabels} = split_head_labels(H,T,[]),
+	    get_funs(I, Is, [PrevI|TrailingLabels], add_funs([Last|Fun],RevFs));
+	_ ->
+	    get_funs(I, Is, [PrevI|RevF], RevFs)
+    end;
+get_funs(PrevI,[],RevF,RevFs) ->
+    case PrevI of
+	{int_code_end,[]} ->
+	    emit_funs(add_fun(RevF,RevFs));
+	_ ->
+	    ?DEBUG('warning: code segment did not end with int_code_end~n',[]),
+            emit_funs(add_funs([PrevI|RevF],RevFs))
+    end.
+
+split_head_labels({label,L},[I|Code],Labs) ->
+    split_head_labels(I,Code,[{label,L}|Labs]);
+split_head_labels(I,Code,Labs) ->
+    {I,Code,Labs}.
+
+add_fun([],Fs) ->
+    Fs;
+add_fun(F,Fs) ->
+    add_funs(F,Fs).
+
+add_funs(F,Fs) ->
+    [ lists:reverse(F) | Fs ].
+
+emit_funs(Fs) ->
+    lists:reverse(Fs).
+
+%%-----------------------------------------------------------------------
+%% Collects local labels -- I am not sure this is 100% what is needed.
+%%-----------------------------------------------------------------------
+
+local_labels(Funs) ->
+    [local_label(Fun) || Fun <- Funs].
+
+%% The first clause below attempts to provide some (limited form of)
+%% backwards compatibility; it is not needed for .beam files generated
+%% by the R8 compiler.  The clause should one fine day be taken out.
+local_label([{label,_},{label,L}|Code]) ->
+    local_label([{label,L}|Code]);
+local_label([{label,_},
+	     {func_info,[M0,F0,{u,A}]},
+	     {label,[{u,L1}]}|_]) ->
+    {atom,M} = resolve_arg(M0),
+    {atom,F} = resolve_arg(F0),
+    {L1, {M, F, A}};
+local_label(Code) ->
+    io:format('beam_disasm: no label in ~p~n', [Code]),
+    {-666,{none,none,0}}.
+
+%%-----------------------------------------------------------------------
+%% Disassembles a single BEAM instruction; most instructions are handled
+%% in a generic way; indexing instructions are handled separately.
+%%-----------------------------------------------------------------------
+
+disasm_instr(B, Bs, Atoms) ->
+    {SymOp,Arity} = beam_opcodes:opname(B),
+    case SymOp of
+	select_val ->
+	    disasm_select_inst(select_val, Bs, Atoms);
+	select_tuple_arity ->
+	    disasm_select_inst(select_tuple_arity, Bs, Atoms);
+	_ ->
+	    case catch decode_n_args(Arity, Bs, Atoms) of
+		{'EXIT',Rsn} ->
+		    ?NO_DEBUG("decode_n_args(~p,~p) failed~n",[Arity,Bs]),
+		    {{'EXIT',{SymOp,Arity,Rsn}},[]};
+		{Args,RestBs} ->
+		    ?NO_DEBUG("instr ~p~n",[{SymOp,Args}]),
+		    {{SymOp,Args}, RestBs}
+	    end
+    end.
+
+%%-----------------------------------------------------------------------
+%% Disassembles a BEAM select_* instruction used for indexing.
+%%   Currently handles {select_val,3} and {select_tuple_arity,3} insts.
+%%
+%%   The arruments of a "select"-type instruction look as follows:
+%%       <reg>, {f,FailLabel}, {list, <num cases>, [<case1> ... <caseN>]}
+%%   where each case is of the form [symbol,{f,Label}].
+%%-----------------------------------------------------------------------
+
+disasm_select_inst(Inst, Bs, Atoms) ->
+    {X, Bs1} = decode_arg(Bs, Atoms),
+    {F, Bs2} = decode_arg(Bs1, Atoms),
+    {Z, Bs3} = decode_arg(Bs2, Atoms),
+    {U, Bs4} = decode_arg(Bs3, Atoms),
+    {u,Len} = U,
+    {List, RestBs} = decode_n_args(Len, Bs4, Atoms),
+    {{Inst,[X,F,{Z,U,List}]},RestBs}.
+
+%%-----------------------------------------------------------------------
+%% decode_arg([Byte]) -> { Arg, [Byte] }
+%%
+%% - an arg can have variable length, so we must return arg + remaining bytes
+%% - decodes an argument into its 'raw' form: { Tag, Value }
+%%   several types map to a single tag, so the byte code instr must then
+%%   assign a type to it
+%%-----------------------------------------------------------------------
+
+decode_arg([B|Bs]) ->
+    Tag = decode_tag(B band 2#111),
+    ?NO_DEBUG('Tag = ~p, B = ~p, Bs = ~p~n',[Tag,B,Bs]),
+    case Tag of
+	z ->
+	    decode_z_tagged(Tag, B, Bs);
+	_ ->
+	    %% all other cases are handled as if they were integers
+	    decode_int(Tag, B, Bs)
+    end.
+
+decode_arg([B|Bs0], Atoms) ->
+    Tag = decode_tag(B band 2#111),
+    ?NO_DEBUG('Tag = ~p, B = ~p, Bs = ~p~n',[Tag,B,Bs]),
+    case Tag of
+	z ->
+	    decode_z_tagged(Tag, B, Bs0);
+	a ->
+	    %% atom or nil
+	    case decode_int(Tag, B, Bs0) of
+		{{a,0},Bs} -> {nil,Bs};
+		{{a,I},Bs} -> {{atom,lookup_key(I, Atoms)},Bs}
+	    end;
+	_ ->
+	    %% all other cases are handled as if they were integers
+	    decode_int(Tag, B, Bs0)
+    end.
+
+%%-----------------------------------------------------------------------
+%% Decodes an integer value.  Handles positives, negatives, and bignums.
+%%
+%% Tries to do the opposite of:
+%%   beam_asm:encode(1, 5) =            [81]
+%%   beam_asm:encode(1, 1000) =         [105,232]
+%%   beam_asm:encode(1, 2047) =         [233,255]
+%%   beam_asm:encode(1, 2048) =         [25,8,0]
+%%   beam_asm:encode(1,-1) =            [25,255,255]
+%%   beam_asm:encode(1,-4294967295) =   [121,255,0,0,0,1]
+%%   beam_asm:encode(1, 4294967295) =   [121,0,255,255,255,255]
+%%   beam_asm:encode(1, 429496729501) = [121,99,255,255,255,157]
+%%-----------------------------------------------------------------------
+
+decode_int(Tag,B,Bs) when (B band 16#08) == 0 ->
+    %% N < 16 = 4 bits, NNNN:0:TTT
+    N = B bsr 4,
+    {{Tag,N},Bs};
+decode_int(Tag,B,Bs) when (B band 16#10) == 0 ->
+    %% N < 2048 = 11 bits = 3:8 bits, NNN:01:TTT, NNNNNNNN
+    [B1|Bs1] = Bs,
+    Val0 = B band 2#11100000,
+    N = (Val0 bsl 3) bor B1,
+    ?NO_DEBUG('NNN:01:TTT, NNNNNNNN = ~n~p:01:~p, ~p = ~p~n', [Val0,Tag,B,N]),
+    {{Tag,N},Bs1};
+decode_int(Tag,B,Bs) ->
+    {Len,Bs1} = decode_int_length(B,Bs),
+    {IntBs,RemBs} = take_bytes(Len,Bs1),
+    N = build_arg(IntBs),
+    [F|_] = IntBs,
+    Num = if F > 127, Tag == i -> decode_negative(N,Len);
+	     true -> N
+	  end,
+    ?NO_DEBUG('Len = ~p, IntBs = ~p, Num = ~p~n', [Len,IntBs,Num]),
+    {{Tag,Num},RemBs}.
+
+decode_int_length(B,Bs) ->
+    %% The following imitates get_erlang_integer() in beam_load.c
+    %% Len is the size of the integer value in bytes
+    case B bsr 5 of
+	7 ->
+	    {Arg,ArgBs} = decode_arg(Bs),
+	    case Arg of
+		{u,L} ->
+		    {L+9,ArgBs};  % 9 stands for 7+2
+		_ ->
+		    ?exit({decode_int,weird_bignum_sublength,Arg})
+	    end;
+	L ->
+	    {L+2,Bs}
+    end.
+
+decode_negative(N,Len) ->
+    N - (1 bsl (Len*8)). % 8 is number of bits in a byte
+
+%%-----------------------------------------------------------------------
+%% Decodes lists and floating point numbers.
+%%-----------------------------------------------------------------------
+
+decode_z_tagged(Tag,B,Bs) when (B band 16#08) == 0 ->
+    N = B bsr 4,
+    case N of
+	0 -> % float
+	    decode_float(Bs);
+	1 -> % list
+	    {{Tag,N},Bs};
+	2 -> % fr
+	    decode_fr(Bs);
+	3 -> % allocation list
+	    decode_alloc_list(Bs);
+	_ ->
+	    ?exit({decode_z_tagged,{invalid_extended_tag,N}})
+    end;
+decode_z_tagged(_,B,_) ->
+    ?exit({decode_z_tagged,{weird_value,B}}).
+
+decode_float(Bs) ->
+    {FL,RestBs} = take_bytes(8,Bs),
+    <<Float:64/float>> = list_to_binary(FL),
+    {{float,Float},RestBs}.
+
+decode_fr(Bs) ->
+    {{u,Fr},RestBs} = decode_arg(Bs),
+    {{fr,Fr},RestBs}.
+
+decode_alloc_list(Bs) ->
+    {{u,N},RestBs} = decode_arg(Bs),
+    decode_alloc_list_1(N, RestBs, []).
+
+decode_alloc_list_1(0, RestBs, Acc) ->
+    {{u,{alloc,lists:reverse(Acc)}},RestBs};
+decode_alloc_list_1(N, Bs0, Acc) ->
+    {{u,Type},Bs1} = decode_arg(Bs0),
+    {{u,Val},Bs} = decode_arg(Bs1),
+    case Type of
+	0 ->
+	    decode_alloc_list_1(N-1, Bs, [{words,Val}|Acc]);
+	1 ->
+	    decode_alloc_list_1(N-1, Bs, [{floats,Val}|Acc])
+    end.
+
+%%-----------------------------------------------------------------------
+%% take N bytes from a stream, return { Taken_bytes, Remaining_bytes }
+%%-----------------------------------------------------------------------
+
+take_bytes(N,Bs) ->
+    take_bytes(N,Bs,[]).
+
+take_bytes(N,[B|Bs],Acc) when N > 0 ->
+    take_bytes(N-1,Bs,[B|Acc]);
+take_bytes(0,Bs,Acc) ->
+    { lists:reverse(Acc), Bs }.
+
+%%-----------------------------------------------------------------------
+%% from a list of bytes Bn,Bn-1,...,B1,B0
+%% build  (Bn << 8*n) bor ... bor B1 << 8 bor B0 << 0
+%%-----------------------------------------------------------------------
+
+build_arg(Bs) ->
+    build_arg(Bs,0).
+
+build_arg([B|Bs],N) ->
+    build_arg(Bs, (N bsl 8) bor B);
+build_arg([],N) ->
+    N.
+
+%%-----------------------------------------------------------------------
+%% Decodes a bunch of arguments and returns them in a list
+%%-----------------------------------------------------------------------
+
+decode_n_args(N, Bs, Atoms) when N >= 0 ->
+    decode_n_args(N, [], Bs, Atoms).
+
+decode_n_args(N, Acc, Bs0, Atoms) when N > 0 ->
+    {A1,Bs} = decode_arg(Bs0, Atoms),
+    decode_n_args(N-1, [A1|Acc], Bs, Atoms);
+decode_n_args(0, Acc, Bs, _) ->
+    {lists:reverse(Acc),Bs}.
+
+%%-----------------------------------------------------------------------
+%% Convert a numeric tag value into a symbolic one
+%%-----------------------------------------------------------------------
+
+decode_tag(?tag_u) -> u;
+decode_tag(?tag_i) -> i;
+decode_tag(?tag_a) -> a;
+decode_tag(?tag_x) -> x;
+decode_tag(?tag_y) -> y;
+decode_tag(?tag_f) -> f;
+decode_tag(?tag_h) -> h;
+decode_tag(?tag_z) -> z;
+decode_tag(X) -> ?exit({unknown_tag,X}).
+
+%%-----------------------------------------------------------------------
+%% - replace all references {a,I} with the atom with index I (or {atom,A})
+%% - replace all references to {i,K} in an external call position with
+%%    the proper MFA (position in list, first elt = 0, yields MFA to use)
+%% - resolve strings, represented as <offset, length>, into their
+%%   actual values by using string table
+%%    (note: string table should be passed as a BINARY so that we can
+%%    use binary_to_list/3!)
+%% - convert instruction to its readable form ...
+%%
+%% Currently, only the first three are done (systematically, at least).
+%%
+%% Note: It MAY be premature to remove the lists of args, since that
+%%  representation means it is simpler to iterate over all args, etc.
+%%-----------------------------------------------------------------------
+
+resolve_names(Fun, Imports, Str, Lbls, Lambdas) ->
+    [resolve_inst(Instr, Imports, Str, Lbls, Lambdas) || Instr <- Fun].
+
+%%
+%% New make_fun2/4 instruction added in August 2001 (R8).
+%% We handle it specially here to avoid adding an argument to
+%% the clause for every instruction.
+%%
+
+resolve_inst({make_fun2,Args},_,_,Lbls,Lambdas) ->
+    [OldIndex] = resolve_args(Args),
+    {value,{OldIndex,{F,A,_Lbl,_Index,NumFree,OldUniq}}} =
+	lists:keysearch(OldIndex, 1, Lambdas),
+    [{_,{M,_,_}}|_] = Lbls,			% Slighly kludgy.
+    {make_fun2,{M,F,A},OldIndex,OldUniq,NumFree};
+resolve_inst(Instr, Imports, Str, Lbls, _Lambdas) ->
+    resolve_inst(Instr, Imports, Str, Lbls).
+
+resolve_inst({label,[{u,L}]},_,_,_) ->
+    {label,L};
+resolve_inst({func_info,RawMFA},_,_,_) ->
+    {func_info,resolve_args(RawMFA)};
+% resolve_inst(int_code_end,_,_,_,_) ->  % instruction already handled
+%    int_code_end;                       % should not really be handled here
+resolve_inst({call,[{u,N},{f,L}]},_,_,Lbls) ->
+    {call,N,catch lookup_key(L,Lbls)};
+resolve_inst({call_last,[{u,N},{f,L},{u,U}]},_,_,Lbls) ->
+    {call_last,N,catch lookup_key(L,Lbls),U};
+resolve_inst({call_only,[{u,N},{f,L}]},_,_,Lbls) ->
+    {call_only,N,catch lookup_key(L,Lbls)};
+resolve_inst({call_ext,[{u,N},{u,MFAix}]},Imports,_,_) ->
+    {call_ext,N,catch lists:nth(MFAix+1,Imports)};
+resolve_inst({call_ext_last,[{u,N},{u,MFAix},{u,X}]},Imports,_,_) ->
+    {call_ext_last,N,catch lists:nth(MFAix+1,Imports),X};
+resolve_inst({bif0,Args},Imports,_,_) ->
+    [Bif,Reg] = resolve_args(Args),
+    {extfunc,_Mod,BifName,_Arity} = lists:nth(Bif+1,Imports),
+    %?NO_DEBUG('bif0(~p, ~p)~n',[BifName,Reg]),
+    {bif,BifName,nofail,[],Reg};
+resolve_inst({bif1,Args},Imports,_,_) ->
+    [F,Bif,A1,Reg] = resolve_args(Args),
+    {extfunc,_Mod,BifName,_Arity} = lists:nth(Bif+1,Imports),
+    %?NO_DEBUG('bif1(~p, ~p, ~p, ~p, ~p)~n',[Bif,BifName,F,[A1],Reg]),
+    {bif,BifName,F,[A1],Reg};
+resolve_inst({bif2,Args},Imports,_,_) ->
+    [F,Bif,A1,A2,Reg] = resolve_args(Args),
+    {extfunc,_Mod,BifName,_Arity} = lists:nth(Bif+1,Imports),
+    %?NO_DEBUG('bif2(~p, ~p, ~p, ~p, ~p)~n',[Bif,BifName,F,[A1,A2],Reg]),
+    {bif,BifName,F,[A1,A2],Reg};
+resolve_inst({allocate,[{u,X0},{u,X1}]},_,_,_) ->
+    {allocate,X0,X1};
+resolve_inst({allocate_heap,[{u,X0},{u,X1},{u,X2}]},_,_,_) ->
+    {allocate_heap,X0,X1,X2};
+resolve_inst({allocate_zero,[{u,X0},{u,X1}]},_,_,_) ->
+    {allocate_zero,X0,X1};
+resolve_inst({allocate_heap_zero,[{u,X0},{u,X1},{u,X2}]},_,_,_) ->
+    {allocate_heap_zero,X0,X1,X2};
+resolve_inst({test_heap,[{u,X0},{u,X1}]},_,_,_) ->
+    {test_heap,X0,X1};
+resolve_inst({init,[Dst]},_,_,_) ->
+    {init,Dst};
+resolve_inst({deallocate,[{u,L}]},_,_,_) ->
+    {deallocate,L};
+resolve_inst({return,[]},_,_,_) ->
+    return;
+resolve_inst({send,[]},_,_,_) ->
+    send;
+resolve_inst({remove_message,[]},_,_,_) ->
+    remove_message;
+resolve_inst({timeout,[]},_,_,_) ->
+    timeout;
+resolve_inst({loop_rec,[Lbl,Dst]},_,_,_) ->
+    {loop_rec,Lbl,Dst};
+resolve_inst({loop_rec_end,[Lbl]},_,_,_) ->
+    {loop_rec_end,Lbl};
+resolve_inst({wait,[Lbl]},_,_,_) ->
+    {wait,Lbl};
+resolve_inst({wait_timeout,[Lbl,Int]},_,_,_) ->
+    {wait_timeout,Lbl,resolve_arg(Int)};
+resolve_inst({m_plus,Args},_,_,_) ->
+    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
+    {arithbif,'+',W,[SrcR1,SrcR2],DstR};
+resolve_inst({m_minus,Args},_,_,_) ->
+    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
+    {arithbif,'-',W,[SrcR1,SrcR2],DstR};
+resolve_inst({m_times,Args},_,_,_) ->
+    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
+    {arithbif,'*',W,[SrcR1,SrcR2],DstR};
+resolve_inst({m_div,Args},_,_,_) ->
+    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
+    {arithbif,'/',W,[SrcR1,SrcR2],DstR};
+resolve_inst({int_div,Args},_,_,_) ->
+    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
+    {arithbif,'div',W,[SrcR1,SrcR2],DstR};
+resolve_inst({int_rem,Args},_,_,_) ->
+    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
+    {arithbif,'rem',W,[SrcR1,SrcR2],DstR};
+resolve_inst({int_band,Args},_,_,_) ->
+    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
+    {arithbif,'band',W,[SrcR1,SrcR2],DstR};
+resolve_inst({int_bor,Args},_,_,_) ->
+    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
+    {arithbif,'bor',W,[SrcR1,SrcR2],DstR};
+resolve_inst({int_bxor,Args},_,_,_) ->
+    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
+    {arithbif,'bxor',W,[SrcR1,SrcR2],DstR};
+resolve_inst({int_bsl,Args},_,_,_) ->
+    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
+    {arithbif,'bsl',W,[SrcR1,SrcR2],DstR};
+resolve_inst({int_bsr,Args},_,_,_) ->
+    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
+    {arithbif,'bsr',W,[SrcR1,SrcR2],DstR};
+resolve_inst({int_bnot,Args},_,_,_) ->
+    [W,SrcR,DstR] = resolve_args(Args),
+    {arithbif,'bnot',W,[SrcR],DstR};
+resolve_inst({is_lt=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_ge=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_eq=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_ne=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_eq_exact=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_ne_exact=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_integer=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_float=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_number=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_atom=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_pid=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_reference=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_port=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_nil=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_binary=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_constant=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_list=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_nonempty_list=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({is_tuple=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({test_arity=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({select_val,Args},_,_,_) ->
+    [Reg,FLbl,{{z,1},{u,_Len},List0}] = Args,
+    List = resolve_args(List0),
+    {select_val,Reg,FLbl,{list,List}};
+resolve_inst({select_tuple_arity,Args},_,_,_) ->
+    [Reg,FLbl,{{z,1},{u,_Len},List0}] = Args,
+    List = resolve_args(List0),
+    {select_tuple_arity,Reg,FLbl,{list,List}};
+resolve_inst({jump,[Lbl]},_,_,_) ->
+    {jump,Lbl};
+resolve_inst({'catch',[Dst,Lbl]},_,_,_) ->
+    {'catch',Dst,Lbl};
+resolve_inst({catch_end,[Dst]},_,_,_) ->
+    {catch_end,Dst};
+resolve_inst({move,[Src,Dst]},_,_,_) ->
+    {move,resolve_arg(Src),Dst};
+resolve_inst({get_list,[Src,Dst1,Dst2]},_,_,_) ->
+    {get_list,Src,Dst1,Dst2};
+resolve_inst({get_tuple_element,[Src,{u,Off},Dst]},_,_,_) ->
+    {get_tuple_element,resolve_arg(Src),Off,resolve_arg(Dst)};
+resolve_inst({set_tuple_element,[Src,Dst,{u,Off}]},_,_,_) ->
+    {set_tuple_element,resolve_arg(Src),resolve_arg(Dst),Off};
+resolve_inst({put_string,[{u,Len},{u,Off},Dst]},_,Strings,_) ->
+    String = if Len > 0 -> binary_to_list(Strings, Off+1, Off+Len);
+		true -> ""
+	     end,
+?NO_DEBUG('put_string(~p, {string,~p}, ~p)~n',[Len,String,Dst]),
+    {put_string,Len,{string,String},Dst};
+resolve_inst({put_list,[Src1,Src2,Dst]},_,_,_) ->
+    {put_list,resolve_arg(Src1),resolve_arg(Src2),Dst};
+resolve_inst({put_tuple,[{u,Arity},Dst]},_,_,_) ->
+    {put_tuple,Arity,Dst};
+resolve_inst({put,[Src]},_,_,_) ->
+    {put,resolve_arg(Src)};
+resolve_inst({badmatch,[X]},_,_,_) ->
+    {badmatch,resolve_arg(X)};
+resolve_inst({if_end,[]},_,_,_) ->
+    if_end;
+resolve_inst({case_end,[X]},_,_,_) ->
+    {case_end,resolve_arg(X)};
+resolve_inst({call_fun,[{u,N}]},_,_,_) ->
+    {call_fun,N};
+resolve_inst({make_fun,Args},_,_,Lbls) ->
+    [{f,L},Magic,FreeVars] = resolve_args(Args),
+    {make_fun,catch lookup_key(L,Lbls),Magic,FreeVars};
+resolve_inst({is_function=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+resolve_inst({call_ext_only,[{u,N},{u,MFAix}]},Imports,_,_) ->
+    {call_ext_only,N,catch lists:nth(MFAix+1,Imports)};
+%%
+%% Instructions for handling binaries added in R7A & R7B
+%%
+resolve_inst({bs_start_match,[F,Reg]},_,_,_) ->
+    {bs_start_match,F,Reg};
+resolve_inst({bs_get_integer=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
+    [A2,A5] = resolve_args([Arg2,Arg5]),
+    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
+resolve_inst({bs_get_float=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
+    [A2,A5] = resolve_args([Arg2,Arg5]),
+    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
+resolve_inst({bs_get_binary=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
+    [A2,A5] = resolve_args([Arg2,Arg5]),
+    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
+resolve_inst({bs_skip_bits,[Lbl,Arg2,{u,N},{u,U}]},_,_,_) ->
+    [A2] = resolve_args([Arg2]),
+    {test,bs_skip_bits,Lbl,[A2,N,decode_field_flags(U)]};
+resolve_inst({bs_test_tail,[F,{u,N}]},_,_,_) ->
+    {test,bs_test_tail,F,[N]};
+resolve_inst({bs_save,[{u,N}]},_,_,_) ->
+    {bs_save,N};
+resolve_inst({bs_restore,[{u,N}]},_,_,_) ->
+    {bs_restore,N};
+resolve_inst({bs_init,[{u,N},{u,U}]},_,_,_) ->
+    {bs_init,N,decode_field_flags(U)};
+resolve_inst({bs_final,[F,X]},_,_,_) ->
+    {bs_final,F,X};
+resolve_inst({bs_put_integer,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
+    [A2,A5] = resolve_args([Arg2,Arg5]),
+    {bs_put_integer,Lbl,A2,N,decode_field_flags(U),A5};
+resolve_inst({bs_put_binary,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
+    [A2,A5] = resolve_args([Arg2,Arg5]),
+    ?NO_DEBUG('bs_put_binary(~p,~p,~p,~p,~p})~n',[Lbl,A2,N,U,A5]),
+    {bs_put_binary,Lbl,A2,N,decode_field_flags(U),A5};
+resolve_inst({bs_put_float,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
+    [A2,A5] = resolve_args([Arg2,Arg5]),
+    ?NO_DEBUG('bs_put_float(~p,~p,~p,~p,~p})~n',[Lbl,A2,N,U,A5]),
+    {bs_put_float,Lbl,A2,N,decode_field_flags(U),A5};
+resolve_inst({bs_put_string,[{u,Len},{u,Off}]},_,Strings,_) ->
+    String = if Len > 0 -> binary_to_list(Strings, Off+1, Off+Len);
+		true -> ""
+	     end,
+    ?NO_DEBUG('bs_put_string(~p, {string,~p})~n',[Len,String]),
+    {bs_put_string,Len,{string,String}};
+resolve_inst({bs_need_buf,[{u,N}]},_,_,_) ->
+    {bs_need_buf,N};
+
+%%
+%% Instructions for handling floating point numbers added in June 2001 (R8).
+%%
+resolve_inst({fclearerror,[]},_,_,_) ->
+    fclearerror;
+resolve_inst({fcheckerror,Args},_,_,_) ->
+    [Fail] = resolve_args(Args),
+    {fcheckerror,Fail};
+resolve_inst({fmove,Args},_,_,_) ->
+    [FR,Reg] = resolve_args(Args),
+    {fmove,FR,Reg};
+resolve_inst({fconv,Args},_,_,_) ->
+    [Reg,FR] = resolve_args(Args),
+    {fconv,Reg,FR};
+resolve_inst({fadd=I,Args},_,_,_) ->
+    [F,A1,A2,Reg] = resolve_args(Args),
+    {arithfbif,I,F,[A1,A2],Reg};
+resolve_inst({fsub=I,Args},_,_,_) ->
+    [F,A1,A2,Reg] = resolve_args(Args),
+    {arithfbif,I,F,[A1,A2],Reg};
+resolve_inst({fmul=I,Args},_,_,_) ->
+    [F,A1,A2,Reg] = resolve_args(Args),
+    {arithfbif,I,F,[A1,A2],Reg};
+resolve_inst({fdiv=I,Args},_,_,_) ->
+    [F,A1,A2,Reg] = resolve_args(Args),
+    {arithfbif,I,F,[A1,A2],Reg};
+resolve_inst({fnegate,Args},_,_,_) ->
+    [F,Arg,Reg] = resolve_args(Args),
+    {arithfbif,fnegate,F,[Arg],Reg};
+
+%%
+%% Instructions for try expressions added in January 2003 (R10).
+%%
+
+resolve_inst({'try',[Reg,Lbl]},_,_,_) -> % analogous to 'catch'
+    {'try',Reg,Lbl};
+resolve_inst({try_end,[Reg]},_,_,_) ->   % analogous to 'catch_end'
+    {try_end,Reg};
+resolve_inst({try_case,[Reg]},_,_,_) ->   % analogous to 'catch_end'
+    {try_case,Reg};
+resolve_inst({try_case_end,[Reg]},_,_,_) ->
+    {try_case_end,Reg};
+resolve_inst({raise,[Reg1,Reg2]},_,_,_) ->
+    {bif,raise,{f,0},[Reg1,Reg2],{x,0}};
+
+%%
+%% New bit syntax instructions added in February 2004 (R10B).
+%%
+
+resolve_inst({bs_init2,[Lbl,Arg2,{u,W},{u,R},{u,F},Arg6]},_,_,_) ->
+    [A2,A6] = resolve_args([Arg2,Arg6]),
+    {bs_init2,Lbl,A2,W,R,decode_field_flags(F),A6};
+resolve_inst({bs_bits_to_bytes,[Lbl,Arg2,Arg3]},_,_,_) ->
+    [A2,A3] = resolve_args([Arg2,Arg3]),
+    {bs_bits_to_bytes,Lbl,A2,A3};
+resolve_inst({bs_add=I,[Lbl,Arg2,Arg3,Arg4,Arg5]},_,_,_) ->
+    [A2,A3,A4,A5] = resolve_args([Arg2,Arg3,Arg4,Arg5]),
+    {I,Lbl,[A2,A3,A4],A5};
+
+%%
+%% New apply instructions added in April 2004 (R10B).
+%%
+resolve_inst({apply,[{u,Arity}]},_,_,_) ->
+    {apply,Arity};
+resolve_inst({apply_last,[{u,Arity},{u,D}]},_,_,_) ->
+    {apply_last,Arity,D};
+
+%%
+%% New test instruction added in April 2004 (R10B).
+%%
+resolve_inst({is_boolean=I,Args0},_,_,_) ->
+    [L|Args] = resolve_args(Args0),
+    {test,I,L,Args};
+
+%%
+%% Catches instructions that are not yet handled.
+%%
+
+resolve_inst(X,_,_,_) -> ?exit({resolve_inst,X}).
+
+%%-----------------------------------------------------------------------
+%% Resolves arguments in a generic way.
+%%-----------------------------------------------------------------------
+
+resolve_args(Args) -> [resolve_arg(A) || A <- Args].
+
+resolve_arg({u,N}) -> N;
+resolve_arg({i,N}) -> {integer,N};
+resolve_arg({atom,Atom}=A) when is_atom(Atom) -> A;
+resolve_arg(nil) -> nil;
+resolve_arg(Arg) -> Arg.
+
+%%-----------------------------------------------------------------------
+%% The purpose of the following is just to add a hook for future changes.
+%% Currently, field flags are numbers 1-2-4-8 and only two of these
+%% numbers (BSF_LITTLE 2 -- BSF_SIGNED 4) have a semantic significance;
+%% others are just hints for speeding up the execution; see "erl_bits.h".
+%%-----------------------------------------------------------------------
+
+decode_field_flags(FF) ->
+    {field_flags,FF}.
+
+%%-----------------------------------------------------------------------
+%% Each string is denoted in the assembled code by its offset into this
+%% binary.  This binary contains all strings concatenated together.
+%%-----------------------------------------------------------------------
+
+beam_disasm_strings(Bin) ->
+    Bin.
+
+%%-----------------------------------------------------------------------
+%% Disassembles the attributes of a BEAM file.
+%%-----------------------------------------------------------------------
+
+beam_disasm_attributes(none) -> none;
+beam_disasm_attributes(AttrBin) -> binary_to_term(AttrBin).
+
+%%-----------------------------------------------------------------------
+%% Disassembles the compilation information of a BEAM file.
+%%-----------------------------------------------------------------------
+
+beam_disasm_compilation_info(none) -> none;
+beam_disasm_compilation_info(Bin) ->  binary_to_term(Bin).
+
+%%-----------------------------------------------------------------------
+%% Private Utilities
+%%-----------------------------------------------------------------------
+
+%%-----------------------------------------------------------------------
+
+lookup_key(Key,[{Key,Val}|_]) ->
+    Val;
+lookup_key(Key,[_|KVs]) ->
+    lookup_key(Key,KVs);
+lookup_key(Key,[]) ->
+    ?exit({lookup_key,{key_not_found,Key}}).
+
+%%-----------------------------------------------------------------------
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_flatten.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_flatten.erl
new file mode 100644
index 0000000000..5c08c6a797
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_flatten.erl
@@ -0,0 +1,137 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: beam_flatten.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
+%%
+%% Purpose : Converts intermediate assembly code to final format.
+
+-module(beam_flatten).
+
+-export([module/2]).
+-import(lists, [reverse/1,reverse/2,map/2]).
+
+module({Mod,Exp,Attr,Fs,Lc}, _Opt) ->
+    {ok,{Mod,Exp,Attr,map(fun function/1, Fs),Lc}}.
+
+function({function,Name,Arity,CLabel,Is0}) ->
+    Is1 = block(Is0),
+    Is = opt(Is1),
+    {function,Name,Arity,CLabel,Is}.
+
+block(Is) ->
+    block(Is, []).
+
+block([{block,Is0}|Is1], Acc) -> block(Is1, norm_block(Is0, Acc));
+block([I|Is], Acc) -> block(Is, [I|Acc]);
+block([], Acc) -> reverse(Acc).
+
+norm_block([{allocate,R,Alloc}|Is], Acc0) ->
+    case insert_alloc_in_bs_init(Acc0, Alloc) of
+	not_possible ->
+	    norm_block(Is, reverse(norm_allocate(Alloc, R), Acc0));
+	Acc ->
+	    norm_block(Is, Acc)
+    end;
+norm_block([I|Is], Acc) -> norm_block(Is, [norm(I)|Acc]);
+norm_block([], Acc) -> Acc.
+
+norm({set,[D],As,{bif,N}})        -> {bif,N,nofail,As,D};
+norm({set,[D],As,{bif,N,F}})      -> {bif,N,F,As,D};
+norm({set,[D],[S],move})          -> {move,S,D};
+norm({set,[D],[S],fmove})         -> {fmove,S,D};
+norm({set,[D],[S],fconv})         -> {fconv,S,D};
+norm({set,[D],[S1,S2],put_list})  -> {put_list,S1,S2,D};
+norm({set,[D],[],{put_tuple,A}})  -> {put_tuple,A,D};
+norm({set,[],[S],put})            -> {put,S};
+norm({set,[D],[],{put_string,L,S}})       -> {put_string,L,S,D};
+norm({set,[D],[S],{get_tuple_element,I}}) -> {get_tuple_element,S,I,D};
+norm({set,[],[S,D],{set_tuple_element,I}}) -> {set_tuple_element,S,D,I};
+norm({set,[D1,D2],[S],get_list})          -> {get_list,S,D1,D2};
+norm({set,[],[],remove_message})   -> remove_message;
+norm({set,[],[],fclearerror}) -> fclearerror;
+norm({set,[],[],fcheckerror}) -> {fcheckerror,{f,0}};
+norm({'%',_}=Comment)   -> Comment;
+norm({'%live',R})                  -> {'%live',R}.
+
+norm_allocate({_Zero,nostack,Nh,[]}, Regs) ->
+    [{test_heap,Nh,Regs}];
+norm_allocate({_Zero,nostack,Nh,Nf,[]}, Regs) ->
+    [{test_heap,alloc_list(Nh, Nf),Regs}];
+norm_allocate({zero,0,Nh,[]}, Regs) ->
+    norm_allocate({nozero,0,Nh,[]}, Regs);
+norm_allocate({zero,0,Nh,Nf,[]}, Regs) ->
+    norm_allocate({nozero,0,Nh,Nf,[]}, Regs);
+norm_allocate({zero,Ns,0,[]}, Regs) ->
+    [{allocate_zero,Ns,Regs}];
+norm_allocate({zero,Ns,Nh,[]}, Regs) ->
+    [{allocate_heap_zero,Ns,Nh,Regs}];
+norm_allocate({nozero,Ns,0,Inits}, Regs) ->
+    [{allocate,Ns,Regs}|Inits];
+norm_allocate({nozero,Ns,Nh,Inits}, Regs) ->
+    [{allocate_heap,Ns,Nh,Regs}|Inits];
+norm_allocate({nozero,Ns,Nh,Floats,Inits}, Regs) ->
+    [{allocate_heap,Ns,alloc_list(Nh, Floats),Regs}|Inits];
+norm_allocate({zero,Ns,Nh,Floats,Inits}, Regs) ->
+    [{allocate_heap_zero,Ns,alloc_list(Nh, Floats),Regs}|Inits].
+
+insert_alloc_in_bs_init([I|_]=Is, Alloc) ->
+    case is_bs_put(I) of
+	false ->
+	    not_possible;
+	true ->
+	    insert_alloc_1(Is, Alloc, [])
+    end.
+
+insert_alloc_1([{bs_init2,Fail,Bs,Ws,Regs,F,Dst}|Is], {_,nostack,Nh,Nf,[]}, Acc) ->
+    Al = alloc_list(Ws+Nh, Nf),
+    I = {bs_init2,Fail,Bs,Al,Regs,F,Dst},
+    reverse(Acc, [I|Is]);
+insert_alloc_1([I|Is], Alloc, Acc) ->
+    insert_alloc_1(Is, Alloc, [I|Acc]).
+
+is_bs_put({bs_put_integer,_,_,_,_,_}) -> true;
+is_bs_put({bs_put_float,_,_,_,_,_}) -> true;
+is_bs_put({bs_put_binary,_,_,_,_,_}) -> true;
+is_bs_put({bs_put_string,_,_}) -> true;
+is_bs_put(_) -> false.
+
+alloc_list(Words, Floats) ->
+    {alloc,[{words,Words},{floats,Floats}]}.
+
+
+%% opt(Is0) -> Is
+%%  Simple peep-hole optimization to move a {move,Any,{x,0}} past
+%%  any kill up to the next call instruction.
+
+opt(Is) ->
+    opt_1(Is, []).
+
+opt_1([{move,_,{x,0}}=I|Is0], Acc0) ->
+    case move_past_kill(Is0, I, Acc0) of
+	impossible -> opt_1(Is0, [I|Acc0]);
+	{Is,Acc} -> opt_1(Is, Acc)
+    end;
+opt_1([I|Is], Acc) ->
+    opt_1(Is, [I|Acc]);
+opt_1([], Acc) -> reverse(Acc).
+
+move_past_kill([{'%live',_}|Is], Move, Acc) ->
+    move_past_kill(Is, Move, Acc);
+move_past_kill([{kill,Src}|_], {move,Src,_}, _) ->
+    impossible;
+move_past_kill([{kill,_}=I|Is], Move, Acc) ->
+    move_past_kill(Is, Move, [I|Acc]);
+move_past_kill(Is, Move, Acc) ->
+    {Is,[Move|Acc]}.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_jump.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_jump.erl
new file mode 100644
index 0000000000..b3c234c7bb
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_jump.erl
@@ -0,0 +1,477 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: beam_jump.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
+%%
+%%% Purpose : Optimise jumps and remove unreachable code.
+
+-module(beam_jump).
+
+-export([module/2,module_labels/1,
+	 is_unreachable_after/1,remove_unused_labels/1]).
+
+%%% The following optimisations are done:
+%%%
+%%% (1) This code with two identical instruction sequences
+%%%
+%%%     L1: <Instruction sequence>
+%%%     L2:
+%%%          . . .
+%%%     L3: <Instruction sequence>
+%%%     L4:
+%%%
+%%%     can be replaced with
+%%%
+%%%     L1: jump L3
+%%%     L2:
+%%%          . . .
+%%%     L3: <Instruction sequence>
+%%%     L4
+%%%
+%%%     Note: The instruction sequence must end with an instruction
+%%%     such as a jump that never transfers control to the instruction
+%%%     following it.
+%%%
+%%% (2) case_end, if_end, and badmatch, and function calls that cause an
+%%%     exit (such as calls to exit/1) are moved to the end of the function.
+%%%     The purpose is to allow further optimizations at the place from
+%%%     which the code was moved.
+%%%
+%%% (3) Any unreachable code is removed.  Unreachable code is code after
+%%%     jump, call_last and other instructions which never transfer control
+%%%     to the following instruction.  Code is unreachable up to the next
+%%%     *referenced* label.  Note that the optimisations below might
+%%%     generate more possibilities for removing unreachable code.
+%%%
+%%% (4) This code:
+%%%	L1:	jump L2
+%%%          . . .
+%%%     L2: ...
+%%%
+%%%    will be changed to
+%%%
+%%%    jump L2
+%%%          . . .
+%%%    L1:
+%%%    L2: ...
+%%%
+%%%    If the jump is unreachable, it will be removed according to (1).
+%%%
+%%% (5) In
+%%%
+%%%	 jump L1
+%%%      L1:
+%%%
+%%%	 the jump will be removed.
+%%%
+%%% (6) If test instructions are used to skip a single jump instruction,
+%%%      the test is inverted and the jump is eliminated (provided that
+%%%      the test can be inverted).  Example:
+%%%
+%%%      is_eq L1 {x,1} {x,2}
+%%%      jump L2
+%%%      L1:
+%%%
+%%%      will be changed to
+%%%
+%%%      is_ne L2 {x,1} {x,2}
+%%%
+%%%      (The label L1 will be retained if there were previous references to it.)
+%%%
+%%% (7) Some redundant uses of is_boolean/1 is optimized away.
+%%%
+%%% Terminology note: The optimisation done here is called unreachable-code
+%%% elimination, NOT dead-code elimination.  Dead code elimination
+%%% means the removal of instructions that are executed, but have no visible
+%%% effect on the program state.
+%%%
+
+-import(lists, [reverse/1,reverse/2,map/2,mapfoldl/3,foldl/3,
+		last/1,foreach/2,member/2]).
+
+module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
+    Fs = map(fun function/1, Fs0),
+    {ok,{Mod,Exp,Attr,Fs,Lc}}.
+
+module_labels({Mod,Exp,Attr,Fs,Lc}) ->
+    {Mod,Exp,Attr,map(fun function_labels/1, Fs),Lc}.
+
+function_labels({function,Name,Arity,CLabel,Asm0}) ->
+    Asm = remove_unused_labels(Asm0),
+    {function,Name,Arity,CLabel,Asm}.
+
+function({function,Name,Arity,CLabel,Asm0}) ->
+    Asm1 = share(Asm0),
+    Asm2 = bopt(Asm1),
+    Asm3 = move(Asm2),
+    Asm4 = opt(Asm3, CLabel),
+    Asm = remove_unused_labels(Asm4),
+    {function,Name,Arity,CLabel,Asm}.
+
+%%%
+%%% (1) We try to share the code for identical code segments by replacing all
+%%% occurrences except the last with jumps to the last occurrence.
+%%%
+
+share(Is) ->
+    share_1(reverse(Is), gb_trees:empty(), [], []).
+
+share_1([{label,_}=Lbl|Is], Dict, [], Acc) ->
+    share_1(Is, Dict, [], [Lbl|Acc]);
+share_1([{label,L}=Lbl|Is], Dict0, Seq, Acc) ->
+    case is_unreachable_after(last(Seq)) of
+	false ->
+	    share_1(Is, Dict0, [], [Lbl|Seq ++ Acc]);
+	true ->
+	    case gb_trees:lookup(Seq, Dict0) of
+		none ->
+		    Dict = gb_trees:insert(Seq, L, Dict0),
+		    share_1(Is, Dict, [], [Lbl|Seq ++ Acc]);
+		{value,Label} ->
+		    share_1(Is, Dict0, [], [Lbl,{jump,{f,Label}}|Acc])
+	    end
+    end;
+share_1([{func_info,_,_,_}=I|Is], _, [], Acc) ->
+    Is++[I|Acc];
+share_1([I|Is], Dict, Seq, Acc) ->
+    case is_unreachable_after(I) of
+	false ->
+	    share_1(Is, Dict, [I|Seq], Acc);
+	true ->
+	    share_1(Is, Dict, [I], Acc)
+    end.
+
+%%%
+%%% (2) Move short code sequences ending in an instruction that causes an exit
+%%% to the end of the function.
+%%%
+
+move(Is) ->
+    move_1(Is, [], []).
+
+move_1([I|Is], End, Acc) ->
+    case is_exit_instruction(I) of
+	false -> move_1(Is, End, [I|Acc]);
+	true -> move_2(I, Is, End, Acc)
+    end;
+move_1([], End, Acc) ->
+    reverse(Acc, reverse(End)).
+
+move_2(Exit, Is, End, [{block,_},{label,_},{func_info,_,_,_}|_]=Acc) ->
+    move_1(Is, End, [Exit|Acc]);
+move_2(Exit, Is, End, [{kill,_Y}|Acc]) ->
+    move_2(Exit, Is, End, Acc);
+move_2(Exit, Is, End, [{block,_}=Blk,{label,_}=Lbl,Dead|More]=Acc) ->
+    case is_unreachable_after(Dead) of
+	false ->
+	    move_1(Is, End, [Exit|Acc]);
+	true ->
+	    move_1([Dead|Is], [Exit,Blk,Lbl|End], More)
+    end;
+move_2(Exit, Is, End, [{label,_}=Lbl,Dead|More]=Acc) ->
+    case is_unreachable_after(Dead) of
+	false ->
+	    move_1(Is, End, [Exit|Acc]);
+	true ->
+	    move_1([Dead|Is], [Exit,Lbl|End], More)
+    end;
+move_2(Exit, Is, End, Acc) ->
+    move_1(Is, End, [Exit|Acc]).
+
+%%%
+%%% (7) Remove redundant is_boolean tests.
+%%%
+
+bopt(Is) ->
+    bopt_1(Is, []).
+
+bopt_1([{test,is_boolean,_,_}=I|Is], Acc0) ->
+    case opt_is_bool(I, Acc0) of
+	no -> bopt_1(Is, [I|Acc0]);
+	yes -> bopt_1(Is, Acc0);
+	{yes,Acc} -> bopt_1(Is, Acc)
+    end;
+bopt_1([I|Is], Acc) -> bopt_1(Is, [I|Acc]);
+bopt_1([], Acc) -> reverse(Acc).
+
+opt_is_bool({test,is_boolean,{f,Lbl},[Reg]}, Acc) ->
+    opt_is_bool_1(Acc, Reg, Lbl).
+
+opt_is_bool_1([{test,is_eq_exact,{f,Lbl},[Reg,{atom,true}]}|_], Reg, Lbl) ->
+    %% Instruction not needed in this context.
+    yes;
+opt_is_bool_1([{test,is_ne_exact,{f,Lbl},[Reg,{atom,true}]}|Acc], Reg, Lbl) ->
+    %% Rewrite to shorter test.
+    {yes,[{test,is_eq_exact,{f,Lbl},[Reg,{atom,false}]}|Acc]};
+opt_is_bool_1([{test,_,{f,Lbl},_}=Test|Acc0], Reg, Lbl) ->
+    case opt_is_bool_1(Acc0, Reg, Lbl) of
+	{yes,Acc} -> {yes,[Test|Acc]};
+	Other -> Other
+    end;
+opt_is_bool_1(_, _, _) -> no.
+
+%%%
+%%% (3) (4) (5) (6) Jump and unreachable code optimizations.
+%%%
+
+-record(st, {fc,				%Label for function class errors.
+	     entry,				%Entry label (must not be moved).
+	     mlbl,				%Moved labels.
+	     labels				%Set of referenced labels.
+	    }).
+
+opt([{label,Fc}|_]=Is, CLabel) ->
+    Lbls = initial_labels(Is),
+    St = #st{fc=Fc,entry=CLabel,mlbl=dict:new(),labels=Lbls},
+    opt(Is, [], St).
+
+opt([{test,Test0,{f,Lnum}=Lbl,Ops}=I|Is0], Acc, St) ->
+    case Is0 of
+	[{jump,To}|[{label,Lnum}|Is2]=Is1] ->
+	    case invert_test(Test0) of
+		not_possible ->
+		    opt(Is0, [I|Acc], label_used(Lbl, St));
+		Test ->
+		    Is = case is_label_used(Lnum, St) of
+			     true -> Is1;
+			     false -> Is2
+			 end,
+		    opt([{test,Test,To,Ops}|Is], Acc, label_used(To, St))
+	    end;
+	_Other ->
+	    opt(Is0, [I|Acc], label_used(Lbl, St))
+    end;
+opt([{select_val,_R,Fail,{list,Vls}}=I|Is], Acc, St) ->
+    skip_unreachable(Is, [I|Acc], label_used([Fail|Vls], St));
+opt([{select_tuple_arity,_R,Fail,{list,Vls}}=I|Is], Acc, St) ->
+    skip_unreachable(Is, [I|Acc], label_used([Fail|Vls], St));
+opt([{'try',_R,Lbl}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
+opt([{'catch',_R,Lbl}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
+opt([{label,L}=I|Is], Acc, #st{entry=L}=St) ->
+    %% NEVER move the entry label.
+    opt(Is, [I|Acc], St);
+opt([{label,L1},{jump,{f,L2}}=I|Is], [Prev|Acc], St0) ->
+    St = St0#st{mlbl=dict:append(L2, L1, St0#st.mlbl)},
+    opt([Prev,I|Is], Acc, label_used({f,L2}, St));
+opt([{label,Lbl}=I|Is], Acc, #st{mlbl=Mlbl}=St0) ->
+    case dict:find(Lbl, Mlbl) of
+	{ok,Lbls} ->
+	    %% Essential to remove the list of labels from the dictionary,
+	    %% since we will rescan the inserted labels.  We MUST rescan.
+	    St = St0#st{mlbl=dict:erase(Lbl, Mlbl)},
+	    insert_labels([Lbl|Lbls], Is, Acc, St);
+	error -> opt(Is, [I|Acc], St0)
+    end;
+opt([{jump,{f,Lbl}},{label,Lbl}=I|Is], Acc, St) ->
+    opt([I|Is], Acc, St);
+opt([{jump,Lbl}=I|Is], Acc, St) ->
+    skip_unreachable(Is, [I|Acc], label_used(Lbl, St));
+opt([{loop_rec,Lbl,_R}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
+opt([{bif,_Name,Lbl,_As,_R}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
+opt([{bs_put_integer,Lbl,_Bits,_Unit,_Fl,_Val}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
+opt([{bs_put_binary,Lbl,_Bits,_Unit,_Fl,_Val}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
+opt([{bs_put_float,Lbl,_Bits,_Unit,_Fl,_Val}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
+opt([{bs_final,Lbl,_R}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
+opt([{bs_init2,Lbl,_,_,_,_,_}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
+opt([{bs_add,Lbl,_,_}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
+opt([{bs_bits_to_bytes,Lbl,_,_}=I|Is], Acc, St) ->
+    opt(Is, [I|Acc], label_used(Lbl, St));
+opt([I|Is], Acc, St) ->
+    case is_unreachable_after(I) of
+	true  -> skip_unreachable(Is, [I|Acc], St);
+	false -> opt(Is, [I|Acc], St)
+    end;
+opt([], Acc, #st{fc=Fc,mlbl=Mlbl}) ->
+    Code = reverse(Acc),
+    case dict:find(Fc, Mlbl) of
+	{ok,Lbls} -> insert_fc_labels(Lbls, Mlbl, Code);
+	error -> Code
+    end.
+
+insert_fc_labels([L|Ls], Mlbl, Acc0) ->
+    Acc = [{label,L}|Acc0],
+    case dict:find(L, Mlbl) of
+	error ->
+	    insert_fc_labels(Ls, Mlbl, Acc);
+	{ok,Lbls} ->
+	    insert_fc_labels(Lbls++Ls, Mlbl, Acc)
+    end;
+insert_fc_labels([], _, Acc) -> Acc.
+
+%% invert_test(Test0) -> not_possible | Test
+
+invert_test(is_ge) ->       is_lt;
+invert_test(is_lt) ->       is_ge;
+invert_test(is_eq) ->       is_ne;
+invert_test(is_ne) ->       is_eq;
+invert_test(is_eq_exact) -> is_ne_exact;
+invert_test(is_ne_exact) -> is_eq_exact;
+invert_test(_) ->           not_possible.
+
+insert_labels([L|Ls], Is, [{jump,{f,L}}|Acc], St) ->
+    insert_labels(Ls, [{label,L}|Is], Acc, St);
+insert_labels([L|Ls], Is, Acc, St) ->
+    insert_labels(Ls, [{label,L}|Is], Acc, St);
+insert_labels([], Is, Acc, St) ->
+    opt(Is, Acc, St).
+
+%% Skip unreachable code up to the next referenced label.
+
+skip_unreachable([{label,L}|Is], [{jump,{f,L}}|Acc], St) ->
+    opt([{label,L}|Is], Acc, St);
+skip_unreachable([{label,L}|Is], Acc, St) ->
+    case is_label_used(L, St) of
+	true  -> opt([{label,L}|Is], Acc, St);
+	false -> skip_unreachable(Is, Acc, St)
+    end;
+skip_unreachable([_|Is], Acc, St) ->
+    skip_unreachable(Is, Acc, St);
+skip_unreachable([], Acc, St) ->
+    opt([], Acc, St).
+
+%% Add one or more label to the set of used labels.
+
+label_used({f,0}, St) -> St;
+label_used({f,L}, St) -> St#st{labels=gb_sets:add(L, St#st.labels)};
+label_used([H|T], St0) -> label_used(T, label_used(H, St0));
+label_used([], St) -> St;
+label_used(_Other, St) -> St.
+
+%% Test if label is used.
+
+is_label_used(L, St) ->
+    gb_sets:is_member(L, St#st.labels).
+
+%% is_unreachable_after(Instruction) -> true|false
+%%  Test whether the code after Instruction is unreachable.
+
+is_unreachable_after({func_info,_M,_F,_A}) -> true;
+is_unreachable_after(return) -> true;
+is_unreachable_after({call_ext_last,_Ar,_ExtFunc,_D}) -> true;
+is_unreachable_after({call_ext_only,_Ar,_ExtFunc}) -> true;
+is_unreachable_after({call_last,_Ar,_Lbl,_D}) -> true;
+is_unreachable_after({call_only,_Ar,_Lbl}) -> true;
+is_unreachable_after({apply_last,_Ar,_N}) -> true;
+is_unreachable_after({jump,_Lbl}) -> true;
+is_unreachable_after({select_val,_R,_Lbl,_Cases}) -> true;
+is_unreachable_after({select_tuple_arity,_R,_Lbl,_Cases}) -> true;
+is_unreachable_after({loop_rec_end,_}) -> true;
+is_unreachable_after({wait,_}) -> true;
+is_unreachable_after(I) -> is_exit_instruction(I).
+
+%% is_exit_instruction(Instruction) -> true|false
+%%  Test whether the instruction Instruction always
+%%  causes an exit/failure.
+
+is_exit_instruction({call_ext,_,{extfunc,M,F,A}}) ->
+    is_exit_instruction_1(M, F, A);
+is_exit_instruction({call_ext_last,_,{extfunc,M,F,A},_}) ->
+    is_exit_instruction_1(M, F, A);
+is_exit_instruction({call_ext_only,_,{extfunc,M,F,A}}) ->
+    is_exit_instruction_1(M, F, A);
+is_exit_instruction(if_end) -> true;
+is_exit_instruction({case_end,_}) -> true;
+is_exit_instruction({try_case_end,_}) -> true;
+is_exit_instruction({badmatch,_}) -> true;
+is_exit_instruction(_) -> false.
+
+is_exit_instruction_1(erlang, exit, 1) -> true;
+is_exit_instruction_1(erlang, throw, 1) -> true;
+is_exit_instruction_1(erlang, error, 1) -> true;
+is_exit_instruction_1(erlang, error, 2) -> true;
+is_exit_instruction_1(erlang, fault, 1) -> true;
+is_exit_instruction_1(erlang, fault, 2) -> true;
+is_exit_instruction_1(_, _, _) -> false.
+
+%% remove_unused_labels(Instructions0) -> Instructions
+%%  Remove all unused labels.
+
+remove_unused_labels(Is) ->
+    Used0 = initial_labels(Is),
+    Used = foldl(fun ulbl/2, Used0, Is),
+    rem_unused(Is, Used, []).
+
+rem_unused([{label,Lbl}=I|Is], Used, Acc) ->
+    case gb_sets:is_member(Lbl, Used) of
+	false -> rem_unused(Is, Used, Acc);
+	true -> rem_unused(Is, Used, [I|Acc])
+    end;
+rem_unused([I|Is], Used, Acc) ->
+    rem_unused(Is, Used, [I|Acc]);
+rem_unused([], _, Acc) -> reverse(Acc).
+
+initial_labels(Is) ->
+    initial_labels(Is, []).
+
+initial_labels([{label,Lbl}|Is], Acc) ->
+    initial_labels(Is, [Lbl|Acc]);
+initial_labels([{func_info,_,_,_},{label,Lbl}|_], Acc) ->
+    gb_sets:from_list([Lbl|Acc]).
+
+ulbl({test,_,Fail,_}, Used) ->
+    mark_used(Fail, Used);
+ulbl({select_val,_,Fail,{list,Vls}}, Used) ->
+    mark_used_list(Vls, mark_used(Fail, Used));
+ulbl({select_tuple_arity,_,Fail,{list,Vls}}, Used) ->
+    mark_used_list(Vls, mark_used(Fail, Used));
+ulbl({'try',_,Lbl}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({'catch',_,Lbl}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({jump,Lbl}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({loop_rec,Lbl,_}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({loop_rec_end,Lbl}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({wait,Lbl}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({wait_timeout,Lbl,_To}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({bif,_Name,Lbl,_As,_R}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({bs_init2,Lbl,_,_,_,_,_}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({bs_put_integer,Lbl,_Bits,_Unit,_Fl,_Val}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({bs_put_float,Lbl,_Bits,_Unit,_Fl,_Val}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({bs_put_binary,Lbl,_Bits,_Unit,_Fl,_Val}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({bs_final,Lbl,_}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({bs_add,Lbl,_,_}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({bs_bits_to_bytes,Lbl,_,_}, Used) ->
+    mark_used(Lbl, Used);
+ulbl(_, Used) -> Used.
+
+mark_used({f,0}, Used) -> Used;
+mark_used({f,L}, Used) -> gb_sets:add(L, Used);
+mark_used(_, Used) -> Used.
+
+mark_used_list([H|T], Used) ->
+    mark_used_list(T, mark_used(H, Used));
+mark_used_list([], Used) -> Used.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_listing.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_listing.erl
new file mode 100644
index 0000000000..5def6816b2
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_listing.erl
@@ -0,0 +1,117 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: beam_listing.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
+%%
+-module(beam_listing).
+
+-export([module/2]).
+
+-include("v3_life.hrl").
+
+-import(lists, [foreach/2]).
+
+module(File, Core) when element(1, Core) == c_module ->
+    %% This is a core module.
+    io:put_chars(File, core_pp:format(Core));
+module(File, Kern) when element(1, Kern) == k_mdef ->
+    %% This is a kernel module.
+    io:put_chars(File, v3_kernel_pp:format(Kern));
+    %%io:put_chars(File, io_lib:format("~p~n", [Kern]));
+module(File, {Mod,Exp,Attr,Kern}) ->
+    %% This is output from beam_life (v3).
+    io:fwrite(File, "~w.~n~p.~n~p.~n", [Mod,Exp,Attr]),
+    foreach(fun (F) -> function(File, F) end, Kern);
+module(Stream, {Mod,Exp,Attr,Code,NumLabels}) ->
+    %% This is output from beam_codegen.
+    io:format(Stream, "{module, ~s}.  %% version = ~w\n",
+	      [Mod, beam_opcodes:format_number()]),
+    io:format(Stream, "\n{exports, ~p}.\n", [Exp]),
+    io:format(Stream, "\n{attributes, ~p}.\n", [Attr]),
+    io:format(Stream, "\n{labels, ~p}.\n", [NumLabels]),
+    foreach(
+      fun ({function,Name,Arity,Entry,Asm}) ->
+	      io:format(Stream, "\n\n{function, ~w, ~w, ~w}.\n",
+			[Name, Arity, Entry]),
+	      foreach(fun(Op) -> print_op(Stream, Op) end, Asm) end,
+      Code);
+module(Stream, {Mod,Exp,Inter}) ->
+    %% Other kinds of intermediate formats.
+    io:fwrite(Stream, "~w.~n~p.~n", [Mod,Exp]),
+    foreach(fun (F) -> io:format(Stream, "~p.\n", [F]) end, Inter);
+module(Stream, [_|_]=Fs) ->
+    %% Form-based abstract format.
+    foreach(fun (F) -> io:format(Stream, "~p.\n", [F]) end, Fs).
+
+print_op(Stream, Label) when element(1, Label) == label ->
+    io:format(Stream, "  ~p.\n", [Label]);
+print_op(Stream, Op) ->
+    io:format(Stream, "    ~p.\n", [Op]).
+
+function(File, {function,Name,Arity,Args,Body,Vdb}) ->
+    io:nl(File),
+    io:format(File, "function ~p/~p.\n", [Name,Arity]),
+    io:format(File, " ~p.\n", [Args]),
+    print_vdb(File, Vdb),
+    put(beam_listing_nl, true),
+    foreach(fun(F) -> format(File, F, []) end, Body),
+    nl(File),
+    erase(beam_listing_nl).
+
+format(File, #l{ke=Ke,i=I,vdb=Vdb}, Ind) ->
+    nl(File),
+    ind_format(File, Ind, "~p ", [I]),
+    print_vdb(File, Vdb),
+    nl(File),
+    format(File, Ke, Ind);
+format(File, Tuple, Ind) when is_tuple(Tuple) ->
+    ind_format(File, Ind, "{", []),
+    format_list(File, tuple_to_list(Tuple), [$\s|Ind]),
+    ind_format(File, Ind, "}", []);
+format(File, List, Ind) when is_list(List) ->
+    ind_format(File, Ind, "[", []),
+    format_list(File, List, [$\s|Ind]),
+    ind_format(File, Ind, "]", []);
+format(File, F, Ind) ->
+    ind_format(File, Ind, "~p", [F]).
+
+format_list(File, [F], Ind) ->
+    format(File, F, Ind);
+format_list(File, [F|Fs], Ind) ->
+    format(File, F, Ind),
+    ind_format(File, Ind, ",", []),
+    format_list(File, Fs, Ind);
+format_list(_, [], _) -> ok.
+
+
+print_vdb(File, [{Var,F,E}|Vs]) ->
+    io:format(File, "~p:~p..~p ", [Var,F,E]),
+    print_vdb(File, Vs);
+print_vdb(_, []) -> ok.
+
+ind_format(File, Ind, Format, Args) ->
+    case get(beam_listing_nl) of
+	true ->
+	    put(beam_listing_nl, false),
+	    io:put_chars(File, Ind);
+	false -> ok
+    end,
+    io:format(File, Format, Args).
+
+nl(File) ->
+    case put(beam_listing_nl, true) of
+	true -> ok;
+	false -> io:nl(File)
+    end.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_opcodes.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_opcodes.erl
index a4f5fd34d2..a4f5fd34d2 100644
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_opcodes.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_opcodes.erl
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_opcodes.hrl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_opcodes.hrl
new file mode 100644
index 0000000000..a330a68f37
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_opcodes.hrl
@@ -0,0 +1,11 @@
+%%  Warning: Do not edit this file.  It was automatically
+%%  generated by 'beam_makeops' on Wed Nov 24 17:52:43 2004.
+
+-define(tag_u, 0).
+-define(tag_i, 1).
+-define(tag_a, 2).
+-define(tag_x, 3).
+-define(tag_y, 4).
+-define(tag_f, 5).
+-define(tag_h, 6).
+-define(tag_z, 7).
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_type.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_type.erl
new file mode 100644
index 0000000000..d2ac3fcd99
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_type.erl
@@ -0,0 +1,551 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: beam_type.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
+%%
+%% Purpose : Type-based optimisations.
+
+-module(beam_type).
+
+-export([module/2]).
+
+-import(lists, [map/2,foldl/3,reverse/1,reverse/2,filter/2,member/2]).
+
+module({Mod,Exp,Attr,Fs0,Lc}, Opt) ->
+    AllowFloatOpts = not member(no_float_opt, Opt),
+    Fs = map(fun(F) -> function(F, AllowFloatOpts) end, Fs0),
+    {ok,{Mod,Exp,Attr,Fs,Lc}}.
+
+function({function,Name,Arity,CLabel,Asm0}, AllowFloatOpts) ->
+    Asm = opt(Asm0, AllowFloatOpts, [], tdb_new()),
+    {function,Name,Arity,CLabel,Asm}.
+
+%% opt([Instruction], AllowFloatOpts, Accumulator, TypeDb) -> {[Instruction'],TypeDb'}
+%%  Keep track of type information; try to simplify.
+
+opt([{block,Body1}|Is], AllowFloatOpts, [{block,Body0}|Acc], Ts0) ->
+    {Body2,Ts} = simplify(Body1, Ts0, AllowFloatOpts),
+    Body = beam_block:merge_blocks(Body0, Body2),
+    opt(Is, AllowFloatOpts, [{block,Body}|Acc], Ts);
+opt([{block,Body0}|Is], AllowFloatOpts, Acc, Ts0) ->
+    {Body,Ts} = simplify(Body0, Ts0, AllowFloatOpts),
+    opt(Is, AllowFloatOpts, [{block,Body}|Acc], Ts);
+opt([I0|Is], AllowFloatOpts, Acc, Ts0) ->
+    case simplify([I0], Ts0, AllowFloatOpts) of
+	{[],Ts} -> opt(Is, AllowFloatOpts, Acc, Ts);
+	{[I],Ts} -> opt(Is, AllowFloatOpts, [I|Acc], Ts)
+    end;
+opt([], _, Acc, _) -> reverse(Acc).
+
+%% simplify(Instruction, TypeDb, AllowFloatOpts) -> NewInstruction
+%%  Simplify an instruction using type information (this is
+%%  technically a "strength reduction").
+
+simplify(Is, TypeDb, false) ->
+    simplify(Is, TypeDb, no_float_opt, []);
+simplify(Is, TypeDb, true) ->
+    case are_live_regs_determinable(Is) of
+	false -> simplify(Is, TypeDb, no_float_opt, []);
+	true -> simplify(Is, TypeDb, [], [])
+    end.
+
+simplify([{set,[D],[{integer,Index},Reg],{bif,element,_}}=I0|Is]=Is0, Ts0, Rs0, Acc0) ->
+    I = case max_tuple_size(Reg, Ts0) of
+	    Sz when 0 < Index, Index =< Sz ->
+		{set,[D],[Reg],{get_tuple_element,Index-1}};
+	    _Other -> I0
+    end,
+    Ts = update(I, Ts0),
+    {Rs,Acc} = flush(Rs0, Is0, Acc0),
+    simplify(Is, Ts, Rs, [I|checkerror(Acc)]);
+simplify([{set,[D0],[A],{bif,'-',{f,0}}}=I|Is]=Is0, Ts0, Rs0, Acc0)
+  when Rs0 =/= no_float_opt ->
+    case tdb_find(A, Ts0) of
+	float ->
+	    {Rs1,Acc1} = load_reg(A, Ts0, Rs0, Acc0),
+	    {D,Rs} = find_dest(D0, Rs1),
+	    Areg = fetch_reg(A, Rs),
+	    Acc = [{set,[D],[Areg],{bif,fnegate,{f,0}}}|clearerror(Acc1)],
+	    Ts = tdb_update([{D0,float}], Ts0),
+	    simplify(Is, Ts, Rs, Acc);
+	_Other ->
+	    Ts = update(I, Ts0),
+	    {Rs,Acc} = flush(Rs0, Is0, Acc0),
+	    simplify(Is, Ts, Rs, [I|checkerror(Acc)])
+    end;
+simplify([{set,[_],[_],{bif,_,{f,0}}}=I|Is]=Is0, Ts0, Rs0, Acc0) ->
+    Ts = update(I, Ts0),
+    {Rs,Acc} = flush(Rs0, Is0, Acc0),
+    simplify(Is, Ts, Rs, [I|checkerror(Acc)]);
+simplify([{set,[D0],[A,B],{bif,Op0,{f,0}}}=I|Is]=Is0, Ts0, Rs0, Acc0)
+  when Rs0 =/= no_float_opt ->
+    case float_op(Op0, A, B, Ts0) of
+	no ->
+	    Ts = update(I, Ts0),
+	    {Rs,Acc} = flush(Rs0, Is0, Acc0),
+	    simplify(Is, Ts, Rs, [I|checkerror(Acc)]);
+	{yes,Op} ->
+	    {Rs1,Acc1} = load_reg(A, Ts0, Rs0, Acc0),
+	    {Rs2,Acc2} = load_reg(B, Ts0, Rs1, Acc1),
+	    {D,Rs} = find_dest(D0, Rs2),
+	    Areg = fetch_reg(A, Rs),
+	    Breg = fetch_reg(B, Rs),
+	    Acc = [{set,[D],[Areg,Breg],{bif,Op,{f,0}}}|clearerror(Acc2)],
+	    Ts = tdb_update([{D0,float}], Ts0),
+	    simplify(Is, Ts, Rs, Acc)
+    end;
+simplify([{set,[D],[TupleReg],{get_tuple_element,0}}=I|Is0], Ts0, Rs0, Acc0) ->
+    case tdb_find(TupleReg, Ts0) of
+	{tuple,_,[Contents]} ->
+	    Ts = tdb_update([{D,Contents}], Ts0),
+	    {Rs,Acc} = flush(Rs0, Is0, Acc0),
+	    simplify(Is0, Ts, Rs, [{set,[D],[Contents],move}|Acc]);
+	_ ->
+	    Ts = update(I, Ts0),
+	    {Rs,Acc} = flush(Rs0, Is0, Acc0),
+	    simplify(Is0, Ts, Rs, [I|checkerror(Acc)])
+    end;
+simplify([{set,_,_,{'catch',_}}=I|Is]=Is0, _Ts, Rs0, Acc0) ->
+    Acc = flush_all(Rs0, Is0, Acc0),
+    simplify(Is, tdb_new(), Rs0, [I|Acc]);
+simplify([{test,is_tuple,_,[R]}=I|Is], Ts, Rs, Acc) ->
+    case tdb_find(R, Ts) of
+	{tuple,_,_} -> simplify(Is, Ts, Rs, Acc);
+	_ ->
+	    simplify(Is, Ts, Rs, [I|Acc])
+    end;
+simplify([{test,test_arity,_,[R,Arity]}=I|Is], Ts0, Rs, Acc) ->
+    case tdb_find(R, Ts0) of
+	{tuple,Arity,_} ->
+	    simplify(Is, Ts0, Rs, Acc);
+	_Other ->
+	    Ts = update(I, Ts0),
+	    simplify(Is, Ts, Rs, [I|Acc])
+    end;
+simplify([{test,is_eq_exact,Fail,[R,{atom,_}=Atom]}=I|Is0], Ts0, Rs0, Acc0) ->
+    Acc1 = case tdb_find(R, Ts0) of
+	       {atom,_}=Atom -> Acc0;
+	       {atom,_} -> [{jump,Fail}|Acc0];
+	       _ -> [I|Acc0]
+	   end,
+    Ts = update(I, Ts0),
+    {Rs,Acc} = flush(Rs0, Is0, Acc1),
+    simplify(Is0, Ts, Rs, Acc);
+simplify([I|Is]=Is0, Ts0, Rs0, Acc0) ->
+    Ts = update(I, Ts0),
+    {Rs,Acc} = flush(Rs0, Is0, Acc0),
+    simplify(Is, Ts, Rs, [I|Acc]);
+simplify([], Ts, Rs, Acc) ->
+    Is0 = reverse(flush_all(Rs, [], Acc)),
+    Is1 = opt_fmoves(Is0, []),
+    Is = add_ftest_heap(Is1),
+    {Is,Ts}.
+
+opt_fmoves([{set,[{x,_}=R],[{fr,_}]=Src,fmove}=I1,
+	    {set,[{y,_}]=Dst,[{x,_}=R],move}=I2|Is], Acc) ->
+    case beam_block:is_killed(R, Is) of
+	false -> opt_fmoves(Is, [I2,I1|Acc]);
+	true -> opt_fmoves(Is, [{set,Dst,Src,fmove}|Acc])
+    end;
+opt_fmoves([I|Is], Acc) ->
+    opt_fmoves(Is, [I|Acc]);
+opt_fmoves([], Acc) -> reverse(Acc).
+
+clearerror(Is) ->
+    clearerror(Is, Is).
+
+clearerror([{set,[],[],fclearerror}|_], OrigIs) -> OrigIs;
+clearerror([{set,[],[],fcheckerror}|_], OrigIs) -> [{set,[],[],fclearerror}|OrigIs];
+clearerror([_|Is], OrigIs) -> clearerror(Is, OrigIs);
+clearerror([], OrigIs) -> [{set,[],[],fclearerror}|OrigIs].
+
+%% update(Instruction, TypeDb) -> NewTypeDb
+%%  Update the type database to account for executing an instruction.
+%%
+%%  First the cases for instructions inside basic blocks.
+update({set,[D],[S],move}, Ts0) ->
+    Ops = case tdb_find(S, Ts0) of
+	      error -> [{D,kill}];
+	      Info -> [{D,Info}]
+	  end,
+    tdb_update(Ops, Ts0);
+update({set,[D],[{integer,I},Reg],{bif,element,_}}, Ts0) ->
+    tdb_update([{Reg,{tuple,I,[]}},{D,kill}], Ts0);
+update({set,[D],[_Index,Reg],{bif,element,_}}, Ts0) ->
+    tdb_update([{Reg,{tuple,0,[]}},{D,kill}], Ts0);
+update({set,[D],[S],{get_tuple_element,0}}, Ts) ->
+    tdb_update([{D,{tuple_element,S,0}}], Ts);
+update({set,[D],[S],{bif,float,{f,0}}}, Ts0) ->
+    %% Make sure we reject non-numeric literal argument.
+    case possibly_numeric(S) of
+	true ->  tdb_update([{D,float}], Ts0);
+	false -> Ts0
+    end;
+update({set,[D],[S1,S2],{bif,'/',{f,0}}}, Ts0) ->
+    %% Make sure we reject non-numeric literals.
+    case possibly_numeric(S1) andalso possibly_numeric(S2) of
+	true ->  tdb_update([{D,float}], Ts0);
+	false -> Ts0
+    end;
+update({set,[D],[S1,S2],{bif,Op,{f,0}}}, Ts0) ->
+    case arith_op(Op) of
+	no ->
+	    tdb_update([{D,kill}], Ts0);
+	{yes,_} ->
+	    case {tdb_find(S1, Ts0),tdb_find(S2, Ts0)} of
+		{float,_} -> tdb_update([{D,float}], Ts0);
+		{_,float} -> tdb_update([{D,float}], Ts0);
+		{_,_} -> tdb_update([{D,kill}], Ts0)
+	    end
+    end;
+update({set,[],_Src,_Op}, Ts0) -> Ts0;
+update({set,[D],_Src,_Op}, Ts0) ->
+    tdb_update([{D,kill}], Ts0);
+update({set,[D1,D2],_Src,_Op}, Ts0) ->
+    tdb_update([{D1,kill},{D2,kill}], Ts0);
+update({allocate,_,_}, Ts) -> Ts;
+update({init,D}, Ts) ->
+    tdb_update([{D,kill}], Ts);
+update({kill,D}, Ts) ->
+    tdb_update([{D,kill}], Ts);
+update({'%live',_}, Ts) -> Ts;
+
+%% Instructions outside of blocks.
+update({test,is_float,_Fail,[Src]}, Ts0) ->
+    tdb_update([{Src,float}], Ts0);
+update({test,test_arity,_Fail,[Src,Arity]}, Ts0) ->
+    tdb_update([{Src,{tuple,Arity,[]}}], Ts0);
+update({test,is_eq_exact,_,[Reg,{atom,_}=Atom]}, Ts) ->
+    case tdb_find(Reg, Ts) of
+	error ->
+	    Ts;
+	{tuple_element,TupleReg,0} ->
+	    tdb_update([{TupleReg,{tuple,1,[Atom]}}], Ts);
+	_ ->
+	    Ts
+    end;
+update({test,_Test,_Fail,_Other}, Ts) -> Ts;
+update({call_ext,1,{extfunc,math,Math,1}}, Ts) ->
+    case is_math_bif(Math, 1) of
+	true -> tdb_update([{{x,0},float}], Ts);
+	false -> tdb_kill_xregs(Ts)
+    end;
+update({call_ext,2,{extfunc,math,Math,2}}, Ts) ->
+    case is_math_bif(Math, 2) of
+	true -> tdb_update([{{x,0},float}], Ts);
+	false -> tdb_kill_xregs(Ts)
+    end;
+update({call_ext,3,{extfunc,erlang,setelement,3}}, Ts0) ->
+    Op = case tdb_find({x,1}, Ts0) of
+	     error -> kill;
+	     Info -> Info
+	 end,
+    Ts1 = tdb_kill_xregs(Ts0),
+    tdb_update([{{x,0},Op}], Ts1);
+update({call,_Arity,_Func}, Ts) -> tdb_kill_xregs(Ts);
+update({call_ext,_Arity,_Func}, Ts) -> tdb_kill_xregs(Ts);
+update({make_fun2,_,_,_,_}, Ts) -> tdb_kill_xregs(Ts);
+
+%% The instruction is unknown.  Kill all information.
+update(_I, _Ts) -> tdb_new().
+
+is_math_bif(cos, 1) -> true;
+is_math_bif(cosh, 1) -> true;
+is_math_bif(sin, 1) -> true;
+is_math_bif(sinh, 1) -> true;
+is_math_bif(tan, 1) -> true;
+is_math_bif(tanh, 1) -> true;
+is_math_bif(acos, 1) -> true;
+is_math_bif(acosh, 1) -> true;
+is_math_bif(asin, 1) -> true;
+is_math_bif(asinh, 1) -> true;
+is_math_bif(atan, 1) -> true;
+is_math_bif(atanh, 1) -> true;
+is_math_bif(erf, 1) -> true;
+is_math_bif(erfc, 1) -> true;
+is_math_bif(exp, 1) -> true;
+is_math_bif(log, 1) -> true;
+is_math_bif(log10, 1) -> true;
+is_math_bif(sqrt, 1) -> true;
+is_math_bif(atan2, 2) -> true;
+is_math_bif(pow, 2) -> true;
+is_math_bif(pi, 0) -> true;
+is_math_bif(_, _) -> false.
+
+%% Reject non-numeric literals.
+possibly_numeric({x,_}) -> true;
+possibly_numeric({y,_}) -> true;
+possibly_numeric({integer,_}) -> true;
+possibly_numeric({float,_}) -> true;
+possibly_numeric(_) -> false.
+
+max_tuple_size(Reg, Ts) ->
+    case tdb_find(Reg, Ts) of
+	{tuple,Sz,_} -> Sz;
+	_Other -> 0
+    end.
+
+float_op('/', A, B, _) ->
+    case possibly_numeric(A) andalso possibly_numeric(B) of
+	true -> {yes,fdiv};
+	false -> no
+    end;
+float_op(Op, {float,_}, B, _) ->
+    case possibly_numeric(B) of
+	true -> arith_op(Op);
+	false -> no
+    end;
+float_op(Op, A, {float,_}, _) ->
+    case possibly_numeric(A) of
+	true -> arith_op(Op);
+	false -> no
+    end;
+float_op(Op, A, B, Ts) ->
+    case {tdb_find(A, Ts),tdb_find(B, Ts)} of
+	{float,_} -> arith_op(Op);
+	{_,float} -> arith_op(Op);
+	{_,_} -> no
+    end.
+
+find_dest(V, Rs0) ->
+    case find_reg(V, Rs0) of
+	{ok,FR} ->
+	    {FR,mark(V, Rs0, dirty)};
+	error ->
+	    Rs = put_reg(V, Rs0, dirty),
+	    {ok,FR} = find_reg(V, Rs),
+	    {FR,Rs}
+    end.
+
+load_reg({float,_}=F, _, Rs0, Is0) ->
+    Rs = put_reg(F, Rs0, clean),
+    {ok,FR} = find_reg(F, Rs),
+    Is = [{set,[FR],[F],fmove}|Is0],
+    {Rs,Is};
+load_reg(V, Ts, Rs0, Is0) ->
+    case find_reg(V, Rs0) of
+	{ok,_FR} -> {Rs0,Is0};
+	error ->
+	    Rs = put_reg(V, Rs0, clean),
+	    {ok,FR} = find_reg(V, Rs),
+	    Op = case tdb_find(V, Ts) of
+		     float -> fmove;
+		     _ -> fconv
+		 end,
+	    Is = [{set,[FR],[V],Op}|Is0],
+	    {Rs,Is}
+    end.
+
+arith_op('+') -> {yes,fadd};
+arith_op('-') -> {yes,fsub};
+arith_op('*') -> {yes,fmul};
+arith_op('/') -> {yes,fdiv};
+arith_op(_) -> no.
+
+flush(no_float_opt, _, Acc) -> {no_float_opt,Acc};
+flush(Rs, [{set,[_],[],{put_tuple,_}}|_]=Is0, Acc0) ->
+    Acc = flush_all(Rs, Is0, Acc0),
+    {[],Acc};
+flush(Rs0, [{set,Ds,Ss,_Op}|_], Acc0) ->
+    Save = gb_sets:from_list(Ss),
+    Acc = save_regs(Rs0, Save, Acc0),
+    Rs1 = foldl(fun(S, A) -> mark(S, A, clean) end, Rs0, Ss),
+    Kill = gb_sets:from_list(Ds),
+    Rs = kill_regs(Rs1, Kill),
+    {Rs,Acc};
+flush(Rs0, Is, Acc0) ->
+    Acc = flush_all(Rs0, Is, Acc0),
+    {[],Acc}.
+
+flush_all(no_float_opt, _, Acc) -> Acc;
+flush_all([{_,{float,_},_}|Rs], Is, Acc) ->
+    flush_all(Rs, Is, Acc);
+flush_all([{I,V,dirty}|Rs], Is, Acc0) ->
+    Acc = checkerror(Acc0),
+    case beam_block:is_killed(V, Is) of
+	true  -> flush_all(Rs, Is, Acc);
+	false -> flush_all(Rs, Is, [{set,[V],[{fr,I}],fmove}|Acc])
+    end;
+flush_all([{_,_,clean}|Rs], Is, Acc) -> flush_all(Rs, Is, Acc);
+flush_all([free|Rs], Is, Acc) -> flush_all(Rs, Is, Acc);
+flush_all([], _, Acc) -> Acc.
+
+save_regs(Rs, Save, Acc) ->
+    foldl(fun(R, A) -> save_reg(R, Save, A) end, Acc, Rs).
+
+save_reg({I,V,dirty}, Save, Acc) ->
+    case gb_sets:is_member(V, Save) of
+	true -> [{set,[V],[{fr,I}],fmove}|checkerror(Acc)];
+	false -> Acc
+    end;
+save_reg(_, _, Acc) -> Acc.
+
+kill_regs(Rs, Kill) ->
+    map(fun(R) -> kill_reg(R, Kill) end, Rs).
+
+kill_reg({_,V,_}=R, Kill) ->
+    case gb_sets:is_member(V, Kill) of
+	true -> free;
+	false -> R
+    end;
+kill_reg(R, _) -> R.
+
+mark(V, [{I,V,_}|Rs], Mark) -> [{I,V,Mark}|Rs];
+mark(V, [R|Rs], Mark) -> [R|mark(V, Rs, Mark)];
+mark(_, [], _) -> [].
+
+fetch_reg(V, [{I,V,_}|_]) -> {fr,I};
+fetch_reg(V, [_|SRs]) -> fetch_reg(V, SRs).
+
+find_reg(V, [{I,V,_}|_]) -> {ok,{fr,I}};
+find_reg(V, [_|SRs]) -> find_reg(V, SRs);
+find_reg(_, []) -> error.
+
+put_reg(V, Rs, Dirty) -> put_reg_1(V, Rs, Dirty, 0).
+
+put_reg_1(V, [free|Rs], Dirty, I) -> [{I,V,Dirty}|Rs];
+put_reg_1(V, [R|Rs], Dirty, I) -> [R|put_reg_1(V, Rs, Dirty, I+1)];
+put_reg_1(V, [], Dirty, I) -> [{I,V,Dirty}].
+
+checkerror(Is) ->
+    checkerror_1(Is, Is).
+
+checkerror_1([{set,[],[],fcheckerror}|_], OrigIs) -> OrigIs;
+checkerror_1([{set,[],[],fclearerror}|_], OrigIs) -> OrigIs;
+checkerror_1([{set,_,_,{bif,fadd,_}}|_], OrigIs) -> checkerror_2(OrigIs);
+checkerror_1([{set,_,_,{bif,fsub,_}}|_], OrigIs) -> checkerror_2(OrigIs);
+checkerror_1([{set,_,_,{bif,fmul,_}}|_], OrigIs) -> checkerror_2(OrigIs);
+checkerror_1([{set,_,_,{bif,fdiv,_}}|_], OrigIs) -> checkerror_2(OrigIs);
+checkerror_1([{set,_,_,{bif,fnegate,_}}|_], OrigIs) -> checkerror_2(OrigIs);
+checkerror_1([_|Is], OrigIs) -> checkerror_1(Is, OrigIs);
+checkerror_1([], OrigIs) -> OrigIs.
+
+checkerror_2(OrigIs) -> [{set,[],[],fcheckerror}|OrigIs].
+
+add_ftest_heap(Is) ->
+    add_ftest_heap_1(reverse(Is), 0, []).
+
+add_ftest_heap_1([{set,_,[{fr,_}],fmove}=I|Is], Floats, Acc) ->
+    add_ftest_heap_1(Is, Floats+1, [I|Acc]);
+add_ftest_heap_1([{allocate,_,_}=I|Is], 0, Acc) ->
+    reverse(Is, [I|Acc]);
+add_ftest_heap_1([{allocate,Regs,{Z,Stk,Heap,Inits}}|Is], Floats, Acc) ->
+    reverse(Is, [{allocate,Regs,{Z,Stk,Heap,Floats,Inits}}|Acc]);
+add_ftest_heap_1([I|Is], Floats, Acc) ->
+    add_ftest_heap_1(Is, Floats, [I|Acc]);
+add_ftest_heap_1([], 0, Acc) ->
+    Acc;
+add_ftest_heap_1([], Floats, Is) ->
+    Regs = beam_block:live_at_entry(Is),
+    [{allocate,Regs,{nozero,nostack,0,Floats,[]}}|Is].
+
+are_live_regs_determinable([{allocate,_,_}|_]) -> true;
+are_live_regs_determinable([{'%live',_}|_]) -> true;
+are_live_regs_determinable([_|Is]) -> are_live_regs_determinable(Is);
+are_live_regs_determinable([]) -> false.
+
+
+%%% Routines for maintaining a type database.  The type database
+%%% associates type information with registers.
+%%%
+%%% {tuple,Size,First} means that the corresponding register contains a
+%%% tuple with *at least* Size elements.  An tuple with unknown
+%%% size is represented as {tuple,0}. First is either [] (meaning that
+%%% the tuple's first element is unknown) or [FirstElement] (the contents
+%%% of the first element).
+%%%
+%%% 'float' means that the register contains a float.
+
+%% tdb_new() -> EmptyDataBase
+%%  Creates a new, empty type database.
+
+tdb_new() -> [].
+
+%% tdb_find(Register, Db) -> Information|error
+%%  Returns type information or the atom error if there are no type
+%%  information available for Register.
+
+tdb_find(Key, [{K,_}|_]) when Key < K -> error;
+tdb_find(Key, [{Key,Info}|_]) -> Info;
+tdb_find(Key, [_|Db]) -> tdb_find(Key, Db);
+tdb_find(_, []) -> error.
+
+%% tdb_update([UpdateOp], Db) -> NewDb
+%%        UpdateOp = {Register,kill}|{Register,NewInfo}
+%%  Updates a type database.  If a 'kill' operation is given, the type
+%%  information for that register will be removed from the database.
+%%  A kill operation takes precende over other operations for the same
+%%  register (i.e. [{{x,0},kill},{{x,0},{tuple,5}}] means that the
+%%  the existing type information, if any, will be discarded, and the
+%%  the '{tuple,5}' information ignored.
+%%
+%%  If NewInfo information is given and there exists information about
+%%  the register, the old and new type information will be merged.
+%%  For instance, {tuple,5} and {tuple,10} will be merged to produce
+%%  {tuple,10}.
+
+tdb_update(Uis0, Ts0) ->
+    Uis1 = filter(fun ({{x,_},_Op}) -> true;
+		      ({{y,_},_Op}) -> true;
+		      (_) -> false
+		  end, Uis0),
+    tdb_update1(lists:sort(Uis1), Ts0).
+
+tdb_update1([{Key,kill}|Ops], [{K,_Old}|_]=Db) when Key < K ->
+    tdb_update1(remove_key(Key, Ops), Db);
+tdb_update1([{Key,_New}=New|Ops], [{K,_Old}|_]=Db) when Key < K ->
+    [New|tdb_update1(Ops, Db)];
+tdb_update1([{Key,kill}|Ops], [{Key,_}|Db]) ->
+    tdb_update1(remove_key(Key, Ops), Db);
+tdb_update1([{Key,NewInfo}|Ops], [{Key,OldInfo}|Db]) ->
+    [{Key,merge_type_info(NewInfo, OldInfo)}|tdb_update1(Ops, Db)];
+tdb_update1([{_,_}|_]=Ops, [Old|Db]) ->
+    [Old|tdb_update1(Ops, Db)];
+tdb_update1([{Key,kill}|Ops], []) ->
+    tdb_update1(remove_key(Key, Ops), []);
+tdb_update1([{_,_}=New|Ops], []) ->
+    [New|tdb_update1(Ops, [])];
+tdb_update1([], Db) -> Db.
+
+%% tdb_kill_xregs(Db) -> NewDb
+%%  Kill all information about x registers. Also kill all tuple_element
+%%  dependencies from y registers to x registers.
+
+tdb_kill_xregs([{{x,_},_Type}|Db]) -> tdb_kill_xregs(Db);
+tdb_kill_xregs([{{y,_},{tuple_element,{x,_},_}}|Db]) -> tdb_kill_xregs(Db);
+tdb_kill_xregs([Any|Db]) -> [Any|tdb_kill_xregs(Db)];
+tdb_kill_xregs([]) -> [].
+
+remove_key(Key, [{Key,_Op}|Ops]) -> remove_key(Key, Ops);
+remove_key(_, Ops) -> Ops.
+
+merge_type_info(I, I) -> I;
+merge_type_info({tuple,Sz1,Same}, {tuple,Sz2,Same}=Max) when Sz1 < Sz2 ->
+    Max;
+merge_type_info({tuple,Sz1,Same}=Max, {tuple,Sz2,Same}) when Sz1 > Sz2 ->
+    Max;
+merge_type_info({tuple,Sz1,[]}, {tuple,Sz2,First}) ->
+    merge_type_info({tuple,Sz1,First}, {tuple,Sz2,First});
+merge_type_info({tuple,Sz1,First}, {tuple,Sz2,_}) ->
+    merge_type_info({tuple,Sz1,First}, {tuple,Sz2,First});
+merge_type_info(NewType, _) ->
+    verify_type(NewType),
+    NewType.
+
+verify_type({tuple,Sz,[]}) when is_integer(Sz) -> ok;
+verify_type({tuple,Sz,[_]}) when is_integer(Sz) -> ok;
+verify_type({tuple_element,_,_}) -> ok;
+verify_type(float) -> ok;
+verify_type({atom,_}) -> ok.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_validator.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_validator.erl
new file mode 100644
index 0000000000..87c1c54d0f
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_validator.erl
@@ -0,0 +1,1022 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: beam_validator.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
+
+-module(beam_validator).
+
+-export([file/1,files/1]).
+
+%% Interface for compiler.
+-export([module/2,format_error/1]).
+
+-import(lists, [reverse/1,foldl/3]).
+
+-define(MAXREG, 1024).
+
+-define(DEBUG, 1).
+-undef(DEBUG).
+-ifdef(DEBUG).
+-define(DBG_FORMAT(F, D), (io:format((F), (D)))).
+-else.
+-define(DBG_FORMAT(F, D), ok).
+-endif.
+
+%%%
+%%% API functions.
+%%%
+
+files([F|Fs]) ->
+    ?DBG_FORMAT("# Verifying: ~p~n", [F]),
+    case file(F) of
+	ok -> ok;
+	{error,Es} ->
+	    io:format("~p:~n~s~n", [F,format_error(Es)])
+    end,
+    files(Fs);
+files([]) -> ok.
+
+file(Name) when is_list(Name) ->
+    case case filename:extension(Name) of
+	     ".S" -> s_file(Name);
+	     ".beam" -> beam_file(Name)
+	 end of
+	[] -> ok;
+	Es -> {error,Es}
+    end.
+
+%% To be called by the compiler.
+module({Mod,Exp,Attr,Fs,Lc}=Code, _Opts)
+  when is_atom(Mod), is_list(Exp), is_list(Attr), is_integer(Lc) ->
+    case validate(Fs) of
+	[] -> {ok,Code};
+	Es0 ->
+	    Es = [{?MODULE,E} || E <- Es0],
+	    {error,[{atom_to_list(Mod),Es}]}
+    end.
+
+format_error([]) -> [];
+format_error([{{M,F,A},{I,Off,Desc}}|Es]) ->
+    [io_lib:format("  ~p:~p/~p+~p:~n    ~p - ~p~n",
+		   [M,F,A,Off,I,Desc])|format_error(Es)];
+format_error({{_M,F,A},{I,Off,Desc}}) ->
+    io_lib:format(
+      "function ~p/~p+~p:~n"
+      "  Internal consistency check failed - please report this bug.~n"
+      "  Instruction: ~p~n"
+      "  Error:       ~p:~n", [F,A,Off,I,Desc]).
+
+%%%
+%%% Local functions follow.
+%%%
+
+s_file(Name) ->
+    {ok,Is} = file:consult(Name),
+    Fs = find_functions(Is),
+    validate(Fs).
+
+find_functions(Fs) ->
+    find_functions_1(Fs, none, [], []).
+
+find_functions_1([{function,Name,Arity,Entry}|Is], Func, FuncAcc, Acc0) ->
+    Acc = add_func(Func, FuncAcc, Acc0),
+    find_functions_1(Is, {Name,Arity,Entry}, [], Acc);
+find_functions_1([I|Is], Func, FuncAcc, Acc) ->
+    find_functions_1(Is, Func, [I|FuncAcc], Acc);
+find_functions_1([], Func, FuncAcc, Acc) ->
+    reverse(add_func(Func, FuncAcc, Acc)).
+
+add_func(none, _, Acc) -> Acc;
+add_func({Name,Arity,Entry}, Is, Acc) ->
+    [{function,Name,Arity,Entry,reverse(Is)}|Acc].
+
+beam_file(Name) ->
+    try beam_disasm:file(Name) of
+	{error,beam_lib,Reason} -> [{beam_lib,Reason}];
+	{beam_file,L} ->
+	    {value,{code,Code0}} = lists:keysearch(code, 1, L),
+	    Code = beam_file_1(Code0, []),
+	    validate(Code)
+    catch _:_ -> [disassembly_failed]
+    end.
+
+beam_file_1([F0|Fs], Acc) ->
+    F = conv_func(F0),
+    beam_file_1(Fs, [F|Acc]);
+beam_file_1([], Acc) -> reverse(Acc).
+
+%% Convert from the disassembly format to the internal format
+%% used by the compiler (as passed to the assembler).
+
+conv_func(Is) ->
+    conv_func_1(labels(Is)).
+
+conv_func_1({Ls,[{func_info,[{atom,M},{atom,F},Ar]},
+		 {label,Entry}=Le|Is]}) ->
+    %% The entry label gets maybe not correct here
+    {function,F,Ar,Entry,
+     [{label,L}||L<-Ls]++[{func_info,{atom,M},{atom,F},Ar},Le|Is]}.
+
+%%%
+%%% The validator follows.
+%%%
+%%% The purpose of the validator is find errors in the generated code
+%%% that may cause the emulator to crash or behave strangely.
+%%% We don't care about type errors in the user's code that will
+%%% cause a proper exception at run-time.
+%%%
+
+%%% Things currently not checked. XXX
+%%%
+%%% - That floating point registers are initialized before used.
+%%% - That fclearerror and fcheckerror are used properly.
+%%% - Heap allocation for floating point numbers.
+%%% - Heap allocation for binaries.
+%%% - That a catchtag or trytag is not overwritten by the wrong
+%%%   type of instruction (such as move/2).
+%%% - Make sure that all catchtags and trytags have been removed
+%%%   from the stack at return/tail call.
+%%% - Verify get_list instructions.
+%%%
+
+%% validate([Function]) -> [] | [Error]
+%%  A list of functions with their code. The code is in the same
+%%  format as used in the compiler and in .S files.
+validate([]) -> [];
+validate([{function,Name,Ar,Entry,Code}|Fs]) ->
+    try validate_1(Code, Name, Ar, Entry) of
+	_ -> validate(Fs)
+    catch
+	Error ->
+	    [Error|validate(Fs)];
+	  error:Error ->
+	    [validate_error(Error, Name, Ar)|validate(Fs)]
+    end.
+
+-ifdef(DEBUG).
+validate_error(Error, Name, Ar) ->
+    exit(validate_error_1(Error, Name, Ar)).
+-else.
+validate_error(Error, Name, Ar) ->
+    validate_error_1(Error, Name, Ar).
+-endif.
+validate_error_1(Error, Name, Ar) ->
+    {{'_',Name,Ar},
+     {internal_error,'_',{Error,erlang:get_stacktrace()}}}.
+
+-record(st,				%Emulation state
+	{x=init_regs(0, term),		%x register info.
+	 y=init_regs(0, initialized),	%y register info.
+	 numy=none,			%Number of y registers.
+	 h=0,				%Available heap size.
+	 ct=[]				%List of hot catch/try labels
+	}).
+
+-record(vst,				%Validator state
+	{current=none,			%Current state
+	 branched=gb_trees:empty()	%States at jumps
+	}).
+
+-ifdef(DEBUG).
+print_st(#st{x=Xs,y=Ys,numy=NumY,h=H,ct=Ct}) ->
+    io:format("  #st{x=~p~n"
+	      "      y=~p~n"
+	      "      numy=~p,h=~p,ct=~w~n",
+	      [gb_trees:to_list(Xs),gb_trees:to_list(Ys),NumY,H,Ct]).
+-endif.
+
+validate_1(Is, Name, Arity, Entry) ->
+    validate_2(labels(Is), Name, Arity, Entry).
+
+validate_2({Ls1,[{func_info,{atom,Mod},{atom,Name},Arity}=_F|Is]},
+	   Name, Arity, Entry) ->
+    lists:foreach(fun (_L) -> ?DBG_FORMAT("  ~p.~n", [_L]) end, Ls1),
+    ?DBG_FORMAT("  ~p.~n", [_F]),
+    validate_3(labels(Is), Name, Arity, Entry, Mod, Ls1);
+validate_2({Ls1,Is}, Name, Arity, _Entry) ->
+    error({{'_',Name,Arity},{first(Is),length(Ls1),illegal_instruction}}).
+
+validate_3({Ls2,Is}, Name, Arity, Entry, Mod, Ls1) ->
+    lists:foreach(fun (_L) -> ?DBG_FORMAT("  ~p.~n", [_L]) end, Ls2),
+    Offset = 1 + length(Ls2),
+    case lists:member(Entry, Ls2) of
+	true ->
+	    St = init_state(Arity),
+	    Vst = #vst{current=St,
+		       branched=gb_trees_from_list([{L,St} || L <- Ls1])},
+	    valfun(Is, {Mod,Name,Arity}, Offset, Vst);
+	false ->
+	    error({{Mod,Name,Arity},{first(Is),Offset,no_entry_label}})
+    end.
+
+first([X|_]) -> X;
+first([]) -> [].
+
+labels(Is) ->
+    labels_1(Is, []).
+
+labels_1([{label,L}|Is], R) ->
+    labels_1(Is, [L|R]);
+labels_1(Is, R) ->
+    {lists:reverse(R),Is}.
+
+init_state(Arity) ->
+    Xs = init_regs(Arity, term),
+    Ys = init_regs(0, initialized),
+    #st{x=Xs,y=Ys,numy=none,h=0,ct=[]}.
+
+init_regs(0, _) ->
+    gb_trees:empty();
+init_regs(N, Type) ->
+    gb_trees_from_list([{R,Type} || R <- lists:seq(0, N-1)]).
+
+valfun([], _MFA, _Offset, Vst) -> Vst;
+valfun([I|Is], MFA, Offset, Vst) ->
+    ?DBG_FORMAT("    ~p.\n", [I]),
+    valfun(Is, MFA, Offset+1,
+	   try valfun_1(I, Vst)
+	   catch Error ->
+		   error({MFA,{I,Offset,Error}})
+	   end).
+
+%% Instructions that are allowed in dead code or when failing,
+%% that is while the state is undecided in some way.
+valfun_1({label,Lbl}, #vst{current=St0,branched=B}=Vst) ->
+    St = merge_states(Lbl, St0, B),
+    Vst#vst{current=St,branched=gb_trees:enter(Lbl, St, B)};
+valfun_1(_I, #vst{current=none}=Vst) ->
+    %% Ignore instructions after erlang:error/1,2, which
+    %% the original R10B compiler thought would return.
+    ?DBG_FORMAT("Ignoring ~p\n", [_I]),
+    Vst;
+valfun_1({badmatch,Src}, Vst) ->
+    assert_term(Src, Vst),
+    kill_state(Vst);
+valfun_1({case_end,Src}, Vst) ->
+    assert_term(Src, Vst),
+    kill_state(Vst);
+valfun_1(if_end, Vst) ->
+    kill_state(Vst);
+valfun_1({try_case_end,Src}, Vst) ->
+    assert_term(Src, Vst),
+    kill_state(Vst);
+%% Instructions that can not cause exceptions
+valfun_1({move,Src,Dst}, Vst) ->
+    Type = get_term_type(Src, Vst),
+    set_type_reg(Type, Dst, Vst);
+valfun_1({fmove,Src,{fr,_}}, Vst) ->
+    assert_type(float, Src, Vst);
+valfun_1({fmove,{fr,_},Dst}, Vst) ->
+    set_type_reg({float,[]}, Dst, Vst);
+valfun_1({kill,{y,_}=Reg}, Vst) ->
+    set_type_y(initialized, Reg, Vst);
+valfun_1({test_heap,Heap,Live}, Vst) ->
+    test_heap(Heap, Live, Vst);
+valfun_1({bif,_Op,nofail,Src,Dst}, Vst) ->
+    validate_src(Src, Vst),
+    set_type_reg(term, Dst, Vst);
+%% Put instructions.
+valfun_1({put_list,A,B,Dst}, Vst0) ->
+    assert_term(A, Vst0),
+    assert_term(B, Vst0),
+    Vst = eat_heap(2, Vst0),
+    set_type_reg(cons, Dst, Vst);
+valfun_1({put_tuple,Sz,Dst}, Vst0) when is_integer(Sz) ->
+    Vst = eat_heap(1, Vst0),
+    set_type_reg({tuple,Sz}, Dst, Vst);
+valfun_1({put,Src}, Vst) ->
+    assert_term(Src, Vst),
+    eat_heap(1, Vst);
+valfun_1({put_string,Sz,_,Dst}, Vst0) when is_integer(Sz) ->
+    Vst = eat_heap(2*Sz, Vst0),
+    set_type_reg(cons, Dst, Vst);
+%% Allocate and deallocate, et.al
+valfun_1({allocate,Stk,Live}, Vst) ->
+    allocate(false, Stk, 0, Live, Vst);
+valfun_1({allocate_heap,Stk,Heap,Live}, Vst) ->
+    allocate(false, Stk, Heap, Live, Vst);
+valfun_1({allocate_zero,Stk,Live}, Vst) ->
+    allocate(true, Stk, 0, Live, Vst);
+valfun_1({allocate_heap_zero,Stk,Heap,Live}, Vst) ->
+    allocate(true, Stk, Heap, Live, Vst);
+valfun_1({init,{y,_}=Reg}, Vst) ->
+    set_type_y(initialized, Reg, Vst);
+valfun_1({deallocate,StkSize}, #vst{current=#st{numy=StkSize,ct=[]}}=Vst) ->
+    deallocate(Vst);
+valfun_1({deallocate,_}, #vst{current=#st{numy=NumY,ct=[]}}) ->
+    error({allocated,NumY});
+valfun_1({deallocate,_}, #vst{current=#st{ct=Fails}}) ->
+    error({catch_try_stack,Fails});
+%% Catch & try.
+valfun_1({'catch',Dst,{f,Fail}}, Vst0) when Fail /= none ->
+    Vst = #vst{current=#st{ct=Fails}=St} =
+	set_type_y({catchtag,Fail}, Dst, Vst0),
+    Vst#vst{current=St#st{ct=[Fail|Fails]}};
+valfun_1({'try',Dst,{f,Fail}}, Vst0) ->
+    Vst = #vst{current=#st{ct=Fails}=St} =
+	set_type_y({trytag,Fail}, Dst, Vst0),
+    Vst#vst{current=St#st{ct=[Fail|Fails]}};
+%% Do a postponed state branch if necessary and try next set of instructions
+valfun_1(I, #vst{current=#st{ct=[]}}=Vst) ->
+    valfun_2(I, Vst);
+valfun_1(I, #vst{current=#st{ct=Fails}}=Vst0) ->
+    %% Perform a postponed state branch
+    Vst = #vst{current=St} = lists:foldl(fun branch_state/2, Vst0, Fails),
+    valfun_2(I, Vst#vst{current=St#st{ct=[]}}).
+
+%% Instructions that can cause exceptions.
+valfun_2({apply,Live}, Vst) ->
+    call(Live+2, Vst);
+valfun_2({apply_last,Live,_}, Vst) ->
+    tail_call(Live+2, Vst);
+valfun_2({call_fun,Live}, Vst) ->
+    call(Live, Vst);
+valfun_2({call,Live,_}, Vst) ->
+    call(Live, Vst);
+valfun_2({call_ext,Live,Func}, Vst) ->
+    call(Func, Live, Vst);
+valfun_2({call_only,Live,_}, Vst) ->
+    tail_call(Live, Vst);
+valfun_2({call_ext_only,Live,_}, Vst) ->
+    tail_call(Live, Vst);
+valfun_2({call_last,Live,_,_}, Vst) ->
+    tail_call(Live, Vst);
+valfun_2({call_ext_last,Live,_,_}, Vst) ->
+    tail_call(Live, Vst);
+valfun_2({make_fun,_,_,Live}, Vst) ->
+    call(Live, Vst);
+valfun_2({make_fun2,_,_,_,Live}, Vst) ->
+    call(Live, Vst);
+%% Floating point.
+valfun_2({fconv,Src,{fr,_}}, Vst) ->
+    assert_term(Src, Vst);
+valfun_2({bif,fadd,_,[{fr,_},{fr,_}],{fr,_}}, Vst) ->
+    Vst;
+valfun_2({bif,fdiv,_,[{fr,_},{fr,_}],{fr,_}}, Vst) ->
+    Vst;
+valfun_2({bif,fmul,_,[{fr,_},{fr,_}],{fr,_}}, Vst) ->
+    Vst;
+valfun_2({bif,fnegate,_,[{fr,_}],{fr,_}}, Vst) ->
+    Vst;
+valfun_2({bif,fsub,_,[{fr,_},{fr,_}],{fr,_}}, Vst) ->
+    Vst;
+valfun_2(fclearerror, Vst) ->
+    Vst;
+valfun_2({fcheckerror,_}, Vst) ->
+    Vst;
+%% Other BIFs
+valfun_2({bif,element,{f,Fail},[Pos,Tuple],Dst}, Vst0) ->
+    TupleType0 = get_term_type(Tuple, Vst0),
+    PosType = get_term_type(Pos, Vst0),
+    Vst1 = branch_state(Fail, Vst0),
+    TupleType = upgrade_type({tuple,[get_tuple_size(PosType)]}, TupleType0),
+    Vst = set_type(TupleType, Tuple, Vst1),
+    set_type_reg(term, Dst, Vst);
+valfun_2({bif,Op,{f,Fail},Src,Dst}, Vst0) ->
+    validate_src(Src, Vst0),
+    Vst = branch_state(Fail, Vst0),
+    Type = bif_type(Op, Src, Vst),
+    set_type_reg(Type, Dst, Vst);
+valfun_2(return, #vst{current=#st{numy=none}}=Vst) ->
+    kill_state(Vst);
+valfun_2(return, #vst{current=#st{numy=NumY}}) ->
+    error({stack_frame,NumY});
+valfun_2({jump,{f,_}}, #vst{current=none}=Vst) ->
+    %% Must be an unreachable jump which was not optimized away.
+    %% Do nothing.
+    Vst;
+valfun_2({jump,{f,Lbl}}, Vst) ->
+    kill_state(branch_state(Lbl, Vst));
+valfun_2({loop_rec,{f,Fail},Dst}, Vst0) ->
+    Vst = branch_state(Fail, Vst0),
+    set_type_reg(term, Dst, Vst);
+valfun_2(remove_message, Vst) ->
+    Vst;
+valfun_2({wait,_}, Vst) ->
+    kill_state(Vst);
+valfun_2({wait_timeout,_,Src}, Vst) ->
+    assert_term(Src, Vst);
+valfun_2({loop_rec_end,_}, Vst) ->
+    kill_state(Vst);
+valfun_2(timeout, #vst{current=St}=Vst) ->
+    Vst#vst{current=St#st{x=init_regs(0, term)}};
+valfun_2(send, Vst) ->
+    call(2, Vst);
+%% Catch & try.
+valfun_2({catch_end,Reg}, Vst0) ->
+    case get_type(Reg, Vst0) of
+	{catchtag,_} ->
+	    Vst = #vst{current=St} = set_type_reg(initialized, Reg, Vst0),
+	    Xs = gb_trees_from_list([{0,term}]),
+	    Vst#vst{current=St#st{x=Xs}};
+	Type ->
+	    error({bad_type,Type})
+    end;
+valfun_2({try_end,Reg}, Vst) ->
+    case get_type(Reg, Vst) of
+	{trytag,_} ->
+	    set_type_reg(initialized, Reg, Vst);
+	Type ->
+	    error({bad_type,Type})
+    end;
+valfun_2({try_case,Reg}, Vst0) ->
+    case get_type(Reg, Vst0) of
+	{trytag,_} ->
+	    Vst = #vst{current=St} = set_type_reg(initialized, Reg, Vst0),
+	    Xs = gb_trees_from_list([{0,{atom,[]}},{1,term},{2,term}]),
+	    Vst#vst{current=St#st{x=Xs}};
+	Type ->
+	    error({bad_type,Type})
+    end;
+valfun_2({set_tuple_element,Src,Tuple,I}, Vst) ->
+    assert_term(Src, Vst),
+    assert_type({tuple_element,I+1}, Tuple, Vst);
+%% Match instructions.
+valfun_2({select_val,Src,{f,Fail},{list,Choices}}, Vst) ->
+    assert_term(Src, Vst),
+    Lbls = [L || {f,L} <- Choices]++[Fail],
+    kill_state(foldl(fun(L, S) -> branch_state(L, S) end, Vst, Lbls));
+valfun_2({select_tuple_arity,Tuple,{f,Fail},{list,Choices}}, Vst) ->
+    assert_type(tuple, Tuple, Vst),
+    kill_state(branch_arities(Choices, Tuple, branch_state(Fail, Vst)));
+valfun_2({get_list,Src,D1,D2}, Vst0) ->
+    assert_term(Src, Vst0),
+    Vst = set_type_reg(term, D1, Vst0),
+    set_type_reg(term, D2, Vst);
+valfun_2({get_tuple_element,Src,I,Dst}, Vst) ->
+    assert_type({tuple_element,I+1}, Src, Vst),
+    set_type_reg(term, Dst, Vst);
+valfun_2({bs_restore,_}, Vst) ->
+    Vst;
+valfun_2({bs_save,_}, Vst) ->
+    Vst;
+valfun_2({bs_start_match,{f,Fail},Src}, Vst) ->
+    assert_term(Src, Vst),
+    branch_state(Fail, Vst);
+valfun_2({test,bs_skip_bits,{f,Fail},[Src,_,_]}, Vst) ->
+    assert_term(Src, Vst),
+    branch_state(Fail, Vst);
+valfun_2({test,_,{f,Fail},[_,_,_,Dst]}, Vst0) ->
+    Vst = branch_state(Fail, Vst0),
+    set_type_reg({integer,[]}, Dst, Vst);
+valfun_2({test,bs_test_tail,{f,Fail},_}, Vst) ->
+    branch_state(Fail, Vst);
+%% Other test instructions.
+valfun_2({test,is_float,{f,Lbl},[Float]}, Vst0) ->
+    assert_term(Float, Vst0),
+    Vst = branch_state(Lbl, Vst0),
+    set_type({float,[]}, Float, Vst);
+valfun_2({test,is_tuple,{f,Lbl},[Tuple]}, Vst0) ->
+    assert_term(Tuple, Vst0),
+    Vst = branch_state(Lbl, Vst0),
+    set_type({tuple,[0]}, Tuple, Vst);
+valfun_2({test,test_arity,{f,Lbl},[Tuple,Sz]}, Vst0) when is_integer(Sz) ->
+    assert_type(tuple, Tuple, Vst0),
+    Vst = branch_state(Lbl, Vst0),
+    set_type_reg({tuple,Sz}, Tuple, Vst);
+valfun_2({test,_Op,{f,Lbl},Src}, Vst) ->
+    validate_src(Src, Vst),
+    branch_state(Lbl, Vst);
+valfun_2({bs_add,{f,Fail},[A,B,_],Dst}, Vst0) ->
+    assert_term(A, Vst0),
+    assert_term(B, Vst0),
+    Vst = branch_state(Fail, Vst0),
+    set_type_reg({integer,[]}, Dst, Vst);
+valfun_2({bs_bits_to_bytes,{f,Fail},Src,Dst}, Vst0) ->
+    assert_term(Src, Vst0),
+    Vst = branch_state(Fail, Vst0),
+    set_type_reg({integer,[]}, Dst, Vst);
+valfun_2({bs_init2,{f,Fail},_,Heap,_,_,Dst}, Vst0) ->
+    Vst1 = heap_alloc(Heap, Vst0),
+    Vst = branch_state(Fail, Vst1),
+    set_type_reg(binary, Dst, Vst);
+valfun_2({bs_put_string,Sz,_}, Vst) when is_integer(Sz) ->
+    Vst;
+valfun_2({bs_put_binary,{f,Fail},_,_,_,Src}, Vst0) ->
+    assert_term(Src, Vst0),
+    branch_state(Fail, Vst0);
+valfun_2({bs_put_float,{f,Fail},_,_,_,Src}, Vst0) ->
+    assert_term(Src, Vst0),
+    branch_state(Fail, Vst0);
+valfun_2({bs_put_integer,{f,Fail},_,_,_,Src}, Vst0) ->
+    assert_term(Src, Vst0),
+    branch_state(Fail, Vst0);
+%% Old bit syntax construction (before R10B).
+valfun_2({bs_init,_,_}, Vst) -> Vst;
+valfun_2({bs_need_buf,_}, Vst) -> Vst;
+valfun_2({bs_final,{f,Fail},Dst}, Vst0) ->
+    Vst = branch_state(Fail, Vst0),
+    set_type_reg(binary, Dst, Vst);
+%% Misc.
+valfun_2({'%live',Live}, Vst) ->
+    verify_live(Live, Vst),
+    Vst;
+valfun_2(_, _) ->
+    error(unknown_instruction).
+
+kill_state(#vst{current=#st{ct=[]}}=Vst) ->
+    Vst#vst{current=none};
+kill_state(#vst{current=#st{ct=Fails}}=Vst0) ->
+    Vst = lists:foldl(fun branch_state/2, Vst0, Fails),
+    Vst#vst{current=none}.
+
+%% A "plain" call.
+%%  The stackframe must have a known size and be initialized.
+%%  The instruction will return to the instruction following the call.
+call(Live, #vst{current=St}=Vst) ->
+    verify_live(Live, Vst),
+    verify_y_init(Vst),
+    Xs = gb_trees_from_list([{0,term}]),
+    Vst#vst{current=St#st{x=Xs}}.
+
+%% A "plain" call.
+%%  The stackframe must have a known size and be initialized.
+%%  The instruction will return to the instruction following the call.
+call(Name, Live, #vst{current=St}=Vst) ->
+    verify_live(Live, Vst),
+    case return_type(Name, Vst) of
+	exception ->
+	    kill_state(Vst);
+	Type ->
+	    verify_y_init(Vst),
+	    Xs = gb_trees_from_list([{0,Type}]),
+	    Vst#vst{current=St#st{x=Xs}}
+    end.
+
+%% Tail call.
+%%  The stackframe must have a known size and be initialized.
+%%  Does not return to the instruction following the call.
+tail_call(Live, Vst) ->
+    kill_state(call(Live, Vst)).
+
+allocate(Zero, Stk, Heap, Live, #vst{current=#st{numy=none}=St}=Vst) ->
+    verify_live(Live, Vst),
+    Ys = init_regs(case Zero of
+		       true -> Stk;
+		       false -> 0
+		   end, initialized),
+    Vst#vst{current=St#st{y=Ys,numy=Stk,h=heap_alloc_1(Heap)}};
+allocate(_, _, _, _, #vst{current=#st{numy=Numy}}) ->
+    error({existing_stack_frame,{size,Numy}}).
+
+deallocate(#vst{current=St}=Vst) ->
+    Vst#vst{current=St#st{y=init_regs(0, initialized),numy=none}}.
+
+test_heap(Heap, Live, Vst) ->
+    verify_live(Live, Vst),
+    heap_alloc(Heap, Vst).
+
+heap_alloc(Heap, #vst{current=St}=Vst) ->
+    Vst#vst{current=St#st{h=heap_alloc_1(Heap)}}.
+
+heap_alloc_1({alloc,Alloc}) ->
+    {value,{_,Heap}} = lists:keysearch(words, 1, Alloc),
+    Heap;
+heap_alloc_1(Heap) when is_integer(Heap) -> Heap.
+
+
+set_type(Type, {x,_}=Reg, Vst) -> set_type_reg(Type, Reg, Vst);
+set_type(Type, {y,_}=Reg, Vst) -> set_type_y(Type, Reg, Vst);
+set_type(_, _, #vst{}=Vst) -> Vst.
+
+set_type_reg(Type, {x,X}, #vst{current=#st{x=Xs}=St}=Vst)
+  when 0 =< X, X < ?MAXREG ->
+    Vst#vst{current=St#st{x=gb_trees:enter(X, Type, Xs)}};
+set_type_reg(Type, Reg, Vst) ->
+    set_type_y(Type, Reg, Vst).
+
+set_type_y(Type, {y,Y}=Reg, #vst{current=#st{y=Ys,numy=NumY}=St}=Vst)
+  when is_integer(Y), 0 =< Y, Y < ?MAXREG ->
+    case {Y,NumY} of
+	{_,none} ->
+	    error({no_stack_frame,Reg});
+	{_,_} when Y > NumY ->
+	    error({y_reg_out_of_range,Reg,NumY});
+	{_,_} ->
+	    Vst#vst{current=St#st{y=gb_trees:enter(Y, Type, Ys)}}
+    end;
+set_type_y(Type, Reg, #vst{}) -> error({invalid_store,Reg,Type}).
+
+assert_term(Src, Vst) ->
+    get_term_type(Src, Vst),
+    Vst.
+
+%% The possible types.
+%%
+%% First non-term types:
+%%
+%% initialized		Only for Y registers. Means that the Y register
+%%			has been initialized with some valid term so that
+%%			it is safe to pass to the garbage collector.
+%%			NOT safe to use in any other way (will not crash the
+%%			emulator, but clearly points to a bug in the compiler).
+%%
+%% {catchtag,Lbl}	A special term used within a catch. Must only be used
+%%			by the catch instructions; NOT safe to use in other
+%%			instructions.
+%%
+%% {trytag,Lbl}		A special term used within a try block. Must only be
+%%			used by the catch instructions; NOT safe to use in other
+%%			instructions.
+%%
+%% exception		Can only be used as a type returned by return_type/2
+%%			(which gives the type of the value returned by a BIF).
+%%			Thus 'exception' is never stored as type descriptor
+%%			for a register.
+%%
+%% Normal terms:
+%%
+%% term			Any valid Erlang (but not of the special types above).
+%%
+%% bool			The atom 'true' or the atom 'false'.
+%%
+%% cons         	Cons cell: [_|_]
+%%
+%% nil			Empty list: []
+%%
+%% {tuple,[Sz]}		Tuple. An element has been accessed using
+%%              	element/2 or setelement/3 so that it is known that
+%%              	the type is a tuple of size at least Sz.
+%%
+%% {tuple,Sz}		Tuple. A test_arity instruction has been seen
+%%           		so that it is known that the size is exactly Sz.
+%%
+%% {atom,[]}		Atom.
+%% {atom,Atom}
+%%
+%% {integer,[]}		Integer.
+%% {integer,Integer}
+%%
+%% {float,[]}		Float.
+%% {float,Float}
+%%
+%% number		Integer or Float of unknown value
+%%
+
+assert_type(WantedType, Term, Vst) ->
+    assert_type(WantedType, get_type(Term, Vst)),
+    Vst.
+
+assert_type(float, {float,_}) -> ok;
+assert_type(tuple, {tuple,_}) -> ok;
+assert_type({tuple_element,I}, {tuple,[Sz]})
+  when 1 =< I, I =< Sz ->
+    ok;
+assert_type({tuple_element,I}, {tuple,Sz})
+  when is_integer(Sz), 1 =< I, I =< Sz ->
+    ok;
+assert_type(Needed, Actual) ->
+    error({bad_type,{needed,Needed},{actual,Actual}}).
+
+%% upgrade_type/2 is used when linear code finds out more and
+%% more information about a type, so the type gets "narrower"
+%% or perhaps inconsistent. In the case of inconsistency
+%% we mostly widen the type to 'term' to make subsequent
+%% code fail if it assumes anything about the type.
+
+upgrade_type(Same, Same) -> Same;
+upgrade_type(term, OldT) -> OldT;
+upgrade_type(NewT, term) -> NewT;
+upgrade_type({Type,New}=NewT, {Type,Old}=OldT)
+  when Type == atom; Type == integer; Type == float ->
+    if New =:= Old -> OldT;
+       New =:= [] -> OldT;
+       Old =:= [] -> NewT;
+       true -> term
+    end;
+upgrade_type({Type,_}=NewT, number)
+  when Type == integer; Type == float ->
+    NewT;
+upgrade_type(number, {Type,_}=OldT)
+  when Type == integer; Type == float ->
+    OldT;
+upgrade_type(bool, {atom,A}) ->
+    upgrade_bool(A);
+upgrade_type({atom,A}, bool) ->
+    upgrade_bool(A);
+upgrade_type({tuple,[Sz]}, {tuple,[OldSz]})
+  when is_integer(Sz) ->
+    {tuple,[max(Sz, OldSz)]};
+upgrade_type({tuple,Sz}=T, {tuple,[_]})
+  when is_integer(Sz) ->
+    %% This also takes care of the user error when a tuple element
+    %% is accesed outside the known exact tuple size; there is
+    %% no more type information, just a runtime error which is not
+    %% our problem.
+    T;
+upgrade_type({tuple,[Sz]}, {tuple,_}=T)
+  when is_integer(Sz) ->
+    %% Same as the previous clause but mirrored.
+    T;
+upgrade_type(_A, _B) ->
+    %%io:format("upgrade_type: ~p ~p\n", [_A,_B]),
+    term.
+
+upgrade_bool([]) -> bool;
+upgrade_bool(true) -> {atom,true};
+upgrade_bool(false) -> {atom,false};
+upgrade_bool(_) -> term.
+
+get_tuple_size({integer,[]}) -> 0;
+get_tuple_size({integer,Sz}) -> Sz;
+get_tuple_size(_) -> 0.
+
+validate_src(Ss, Vst) when is_list(Ss) ->
+    foldl(fun(S, _) -> get_type(S, Vst) end, ok, Ss).
+
+get_term_type(Src, Vst) ->
+    case get_type(Src, Vst) of
+	initialized -> error({not_assigned,Src});
+	exception -> error({exception,Src});
+	{catchtag,_} -> error({catchtag,Src});
+	{trytag,_} -> error({trytag,Src});
+	Type -> Type
+    end.
+
+get_type(nil=T, _) -> T;
+get_type({atom,A}=T, _) when is_atom(A) -> T;
+get_type({float,F}=T, _) when is_float(F) -> T;
+get_type({integer,I}=T, _) when is_integer(I) -> T;
+get_type({x,X}=Reg, #vst{current=#st{x=Xs}}) when is_integer(X) ->
+    case gb_trees:lookup(X, Xs) of
+	{value,Type} -> Type;
+	none -> error({uninitialized_reg,Reg})
+    end;
+get_type({y,Y}=Reg, #vst{current=#st{y=Ys}}) when is_integer(Y) ->
+    case gb_trees:lookup(Y, Ys) of
+	{value,initialized} -> error({unassigned_reg,Reg});
+	{value,Type} -> Type;
+	none -> error({uninitialized_reg,Reg})
+    end;
+get_type(Src, _) -> error({bad_source,Src}).
+
+branch_arities([], _, #vst{}=Vst) -> Vst;
+branch_arities([Sz,{f,L}|T], Tuple, #vst{current=St}=Vst0)
+  when is_integer(Sz) ->
+    Vst1 = set_type_reg({tuple,Sz}, Tuple, Vst0),
+    Vst = branch_state(L, Vst1),
+    branch_arities(T, Tuple, Vst#vst{current=St}).
+
+branch_state(0, #vst{}=Vst) -> Vst;
+branch_state(L, #vst{current=St,branched=B}=Vst) ->
+    Vst#vst{
+      branched=case gb_trees:is_defined(L, B) of
+		   false ->
+		       gb_trees:insert(L, St#st{ct=[]}, B);
+		   true ->
+		       MergedSt = merge_states(L, St, B),
+		       gb_trees:update(L, MergedSt#st{ct=[]}, B)
+	       end}.
+
+%% merge_states/3 is used when there are more than one way to arrive
+%% at this point, and the type states for the different paths has
+%% to be merged. The type states are downgraded to the least common
+%% subset for the subsequent code.
+
+merge_states(0, St, _Branched) -> St;
+merge_states(L, St, Branched) ->
+    case gb_trees:lookup(L, Branched) of
+	none -> St;
+	{value,OtherSt} when St == none -> OtherSt;
+	{value,OtherSt} ->
+	    merge_states_1(St, OtherSt)
+    end.
+
+merge_states_1(#st{x=Xs0,y=Ys0,numy=NumY0,h=H0}=St,
+	       #st{x=Xs1,y=Ys1,numy=NumY1,h=H1}) ->
+    NumY = merge_stk(NumY0, NumY1),
+    Xs = merge_regs(Xs0, Xs1),
+    Ys = merge_regs(Ys0, Ys1),
+    St#st{x=Xs,y=Ys,numy=NumY,h=min(H0, H1)}.
+
+merge_stk(S, S) -> S;
+merge_stk(_, _) -> undecided.
+
+merge_regs(Rs0, Rs1) ->
+    Rs = merge_regs_1(gb_trees:to_list(Rs0), gb_trees:to_list(Rs1)),
+    gb_trees_from_list(Rs).
+
+merge_regs_1([Same|Rs1], [Same|Rs2]) ->
+    [Same|merge_regs_1(Rs1, Rs2)];
+merge_regs_1([{R1,_}|Rs1], [{R2,_}|_]=Rs2) when R1 < R2 ->
+    merge_regs_1(Rs1, Rs2);
+merge_regs_1([{R1,_}|_]=Rs1, [{R2,_}|Rs2]) when R1 > R2 ->
+    merge_regs_1(Rs1, Rs2);
+merge_regs_1([{R,Type1}|Rs1], [{R,Type2}|Rs2]) ->
+    [{R,merge_types(Type1, Type2)}|merge_regs_1(Rs1, Rs2)];
+merge_regs_1([], []) -> [];
+merge_regs_1([], [_|_]) -> [];
+merge_regs_1([_|_], []) -> [].
+
+merge_types(T, T) -> T;
+merge_types(initialized=I, _) -> I;
+merge_types(_, initialized=I) -> I;
+merge_types({tuple,Same}=T, {tuple,Same}) -> T;
+merge_types({tuple,A}, {tuple,B}) ->
+    {tuple,[min(tuple_sz(A), tuple_sz(B))]};
+merge_types({Type,A}, {Type,B})
+  when Type == atom; Type == integer; Type == float ->
+    if A =:= B -> {Type,A};
+       true -> {Type,[]}
+    end;
+merge_types({Type,_}, number)
+  when Type == integer; Type == float ->
+    number;
+merge_types(number, {Type,_})
+  when Type == integer; Type == float ->
+    number;
+merge_types(bool, {atom,A}) ->
+    merge_bool(A);
+merge_types({atom,A}, bool) ->
+    merge_bool(A);
+merge_types(_, _) -> term.
+
+tuple_sz([Sz]) -> Sz;
+tuple_sz(Sz) -> Sz.
+
+merge_bool([]) -> {atom,[]};
+merge_bool(true) -> bool;
+merge_bool(false) -> bool;
+merge_bool(_) -> {atom,[]}.
+
+verify_y_init(#vst{current=#st{numy=none}}) -> ok;
+verify_y_init(#vst{current=#st{numy=undecided}}) ->
+    error(unknown_size_of_stackframe);
+verify_y_init(#vst{current=#st{y=Ys,numy=NumY}}) ->
+    verify_y_init_1(NumY, Ys).
+
+verify_y_init_1(0, _) -> ok;
+verify_y_init_1(N, Ys) ->
+    Y = N-1,
+    case gb_trees:is_defined(Y, Ys) of
+	false -> error({{y,Y},not_initialized});
+	true -> verify_y_init_1(Y, Ys)
+    end.
+
+verify_live(0, #vst{}) -> ok;
+verify_live(N, #vst{current=#st{x=Xs}}) ->
+    verify_live_1(N, Xs).
+
+verify_live_1(0, _) -> ok;
+verify_live_1(N, Xs) ->
+    X = N-1,
+    case gb_trees:is_defined(X, Xs) of
+	false -> error({{x,X},not_live});
+	true -> verify_live_1(X, Xs)
+    end.
+
+eat_heap(N, #vst{current=#st{h=Heap0}=St}=Vst) ->
+    case Heap0-N of
+	Neg when Neg < 0 ->
+	    error({heap_overflow,{left,Heap0},{wanted,N}});
+	Heap ->
+	    Vst#vst{current=St#st{h=Heap}}
+    end.
+
+bif_type('-', Src, Vst) ->
+    arith_type(Src, Vst);
+bif_type('+', Src, Vst) ->
+    arith_type(Src, Vst);
+bif_type('*', Src, Vst) ->
+    arith_type(Src, Vst);
+bif_type(abs, [Num], Vst) ->
+    case get_type(Num, Vst) of
+	{float,_}=T -> T;
+	{integer,_}=T -> T;
+	_ -> number
+    end;
+bif_type(float, _, _) -> {float,[]};
+bif_type('/', _, _) -> {float,[]};
+%% Integer operations.
+bif_type('div', [_,_], _) -> {integer,[]};
+bif_type('rem', [_,_], _) -> {integer,[]};
+bif_type(length, [_], _) -> {integer,[]};
+bif_type(size, [_], _) -> {integer,[]};
+bif_type(trunc, [_], _) -> {integer,[]};
+bif_type(round, [_], _) -> {integer,[]};
+bif_type('band', [_,_], _) -> {integer,[]};
+bif_type('bor', [_,_], _) -> {integer,[]};
+bif_type('bxor', [_,_], _) -> {integer,[]};
+bif_type('bnot', [_], _) -> {integer,[]};
+bif_type('bsl', [_,_], _) -> {integer,[]};
+bif_type('bsr', [_,_], _) -> {integer,[]};
+%% Booleans.
+bif_type('==', [_,_], _) -> bool;
+bif_type('/=', [_,_], _) -> bool;
+bif_type('=<', [_,_], _) -> bool;
+bif_type('<', [_,_], _) -> bool;
+bif_type('>=', [_,_], _) -> bool;
+bif_type('>', [_,_], _) -> bool;
+bif_type('=:=', [_,_], _) -> bool;
+bif_type('=/=', [_,_], _) -> bool;
+bif_type('not', [_], _) -> bool;
+bif_type('and', [_,_], _) -> bool;
+bif_type('or', [_,_], _) -> bool;
+bif_type('xor', [_,_], _) -> bool;
+bif_type(is_atom, [_], _) -> bool;
+bif_type(is_boolean, [_], _) -> bool;
+bif_type(is_binary, [_], _) -> bool;
+bif_type(is_constant, [_], _) -> bool;
+bif_type(is_float, [_], _) -> bool;
+bif_type(is_function, [_], _) -> bool;
+bif_type(is_integer, [_], _) -> bool;
+bif_type(is_list, [_], _) -> bool;
+bif_type(is_number, [_], _) -> bool;
+bif_type(is_pid, [_], _) -> bool;
+bif_type(is_port, [_], _) -> bool;
+bif_type(is_reference, [_], _) -> bool;
+bif_type(is_tuple, [_], _) -> bool;
+%% Misc.
+bif_type(node, [], _) -> {atom,[]};
+bif_type(node, [_], _) -> {atom,[]};
+bif_type(hd, [_], _) -> term;
+bif_type(tl, [_], _) -> term;
+bif_type(get, [_], _) -> term;
+bif_type(raise, [_,_], _) -> exception;
+bif_type(_, _, _) -> term.
+
+arith_type([A,B], Vst) ->
+    case {get_type(A, Vst),get_type(B, Vst)} of
+	{{float,_},_} -> {float,[]};
+	{_,{float,_}} -> {float,[]};
+	{_,_} -> number
+    end;
+arith_type(_, _) -> number.
+
+return_type({extfunc,M,F,A}, Vst) ->
+    return_type_1(M, F, A, Vst).
+
+return_type_1(erlang, setelement, 3, Vst) ->
+    Tuple = {x,1},
+    TupleType =
+	case get_type(Tuple, Vst) of
+	    {tuple,_}=TT -> TT;
+	    _ -> {tuple,[0]}
+	end,
+    case get_type({x,0}, Vst) of
+	{integer,[]} -> TupleType;
+	{integer,I} -> upgrade_type({tuple,[I]}, TupleType);
+	_ -> TupleType
+    end;
+return_type_1(erlang, F, A, _) ->
+    return_type_erl(F, A);
+return_type_1(math, F, A, _) ->
+    return_type_math(F, A);
+return_type_1(_, _, _, _) -> term.
+
+return_type_erl(exit, 1) -> exception;
+return_type_erl(throw, 1) -> exception;
+return_type_erl(fault, 1) -> exception;
+return_type_erl(fault, 2) -> exception;
+return_type_erl(error, 1) -> exception;
+return_type_erl(error, 2) -> exception;
+return_type_erl(_, _) -> term.
+
+return_type_math(cos, 1) -> {float,[]};
+return_type_math(cosh, 1) -> {float,[]};
+return_type_math(sin, 1) -> {float,[]};
+return_type_math(sinh, 1) -> {float,[]};
+return_type_math(tan, 1) -> {float,[]};
+return_type_math(tanh, 1) -> {float,[]};
+return_type_math(acos, 1) -> {float,[]};
+return_type_math(acosh, 1) -> {float,[]};
+return_type_math(asin, 1) -> {float,[]};
+return_type_math(asinh, 1) -> {float,[]};
+return_type_math(atan, 1) -> {float,[]};
+return_type_math(atanh, 1) -> {float,[]};
+return_type_math(erf, 1) -> {float,[]};
+return_type_math(erfc, 1) -> {float,[]};
+return_type_math(exp, 1) -> {float,[]};
+return_type_math(log, 1) -> {float,[]};
+return_type_math(log10, 1) -> {float,[]};
+return_type_math(sqrt, 1) -> {float,[]};
+return_type_math(atan2, 2) -> {float,[]};
+return_type_math(pow, 2) -> {float,[]};
+return_type_math(pi, 0) -> {float,[]};
+return_type_math(_, _) -> term.
+
+min(A, B) when is_integer(A), is_integer(B), A < B -> A;
+min(A, B) when is_integer(A), is_integer(B) -> B.
+
+max(A, B) when is_integer(A), is_integer(B), A > B -> A;
+max(A, B) when is_integer(A), is_integer(B) -> B.
+
+gb_trees_from_list(L) -> gb_trees:from_orddict(orddict:from_list(L)).
+
+-ifdef(DEBUG).
+error(Error) -> exit(Error).
+-else.
+error(Error) -> throw(Error).
+-endif.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl.erl
new file mode 100644
index 0000000000..e4bdfc7dbe
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl.erl
@@ -0,0 +1,4169 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Richard Carlsson.
+%% Copyright (C) 1999-2002 Richard Carlsson.
+%% Portions created by Ericsson are Copyright 2001, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: cerl.erl,v 1.3 2010/03/04 13:54:20 maria Exp $
+
+%% =====================================================================
+%% @doc Core Erlang abstract syntax trees.
+%%
+%% <p> This module defines an abstract data type for representing Core
+%% Erlang source code as syntax trees.</p>
+%%
+%% <p>A recommended starting point for the first-time user is the
+%% documentation of the function <a
+%% href="#type-1"><code>type/1</code></a>.</p>
+%%
+%% <h3><b>NOTES:</b></h3>
+%%
+%% <p>This module deals with the composition and decomposition of
+%% <em>syntactic</em> entities (as opposed to semantic ones); its
+%% purpose is to hide all direct references to the data structures
+%% used to represent these entities. With few exceptions, the
+%% functions in this module perform no semantic interpretation of
+%% their inputs, and in general, the user is assumed to pass
+%% type-correct arguments - if this is not done, the effects are not
+%% defined.</p>
+%%
+%% <p>The internal representations of abstract syntax trees are
+%% subject to change without notice, and should not be documented
+%% outside this module. Furthermore, we do not give any guarantees on
+%% how an abstract syntax tree may or may not be represented, <em>with
+%% the following exceptions</em>: no syntax tree is represented by a
+%% single atom, such as <code>none</code>, by a list constructor
+%% <code>[X | Y]</code>, or by the empty list <code>[]</code>. This
+%% can be relied on when writing functions that operate on syntax
+%% trees.</p>
+%%
+%% @type cerl(). An abstract Core Erlang syntax tree.
+%%
+%% <p>Every abstract syntax tree has a <em>type</em>, given by the
+%% function <a href="#type-1"><code>type/1</code></a>.  In addition,
+%% each syntax tree has a list of <em>user annotations</em> (cf.  <a
+%% href="#get_ann-1"><code>get_ann/1</code></a>), which are included
+%% in the Core Erlang syntax.</p>
+
+-module(cerl).
+
+-export([abstract/1, add_ann/2, alias_pat/1, alias_var/1,
+	 ann_abstract/2, ann_c_alias/3, ann_c_apply/3, ann_c_atom/2,
+	 ann_c_call/4, ann_c_case/3, ann_c_catch/2, ann_c_char/2,
+	 ann_c_clause/3, ann_c_clause/4, ann_c_cons/3, ann_c_float/2,
+	 ann_c_fname/3, ann_c_fun/3, ann_c_int/2, ann_c_let/4,
+	 ann_c_letrec/3, ann_c_module/4, ann_c_module/5, ann_c_nil/1,
+	 ann_c_cons_skel/3, ann_c_tuple_skel/2, ann_c_primop/3,
+	 ann_c_receive/2, ann_c_receive/4, ann_c_seq/3, ann_c_string/2,
+	 ann_c_try/6, ann_c_tuple/2, ann_c_values/2, ann_c_var/2,
+	 ann_make_data/3, ann_make_list/2, ann_make_list/3,
+	 ann_make_data_skel/3, ann_make_tree/3, apply_args/1,
+	 apply_arity/1, apply_op/1, atom_lit/1, atom_name/1, atom_val/1,
+	 c_alias/2, c_apply/2, c_atom/1, c_call/3, c_case/2, c_catch/1,
+	 c_char/1, c_clause/2, c_clause/3, c_cons/2, c_float/1,
+	 c_fname/2, c_fun/2, c_int/1, c_let/3, c_letrec/2, c_module/3,
+	 c_module/4, c_nil/0, c_cons_skel/2, c_tuple_skel/1, c_primop/2,
+	 c_receive/1, c_receive/3, c_seq/2, c_string/1, c_try/5,
+	 c_tuple/1, c_values/1, c_var/1, call_args/1, call_arity/1,
+	 call_module/1, call_name/1, case_arg/1, case_arity/1,
+	 case_clauses/1, catch_body/1, char_lit/1, char_val/1,
+	 clause_arity/1, clause_body/1, clause_guard/1, clause_pats/1,
+	 clause_vars/1, concrete/1, cons_hd/1, cons_tl/1, copy_ann/2,
+	 data_arity/1, data_es/1, data_type/1, float_lit/1, float_val/1,
+	 fname_arity/1, fname_id/1, fold_literal/1, from_records/1,
+	 fun_arity/1, fun_body/1, fun_vars/1, get_ann/1, int_lit/1,
+	 int_val/1, is_c_alias/1, is_c_apply/1, is_c_atom/1,
+	 is_c_call/1, is_c_case/1, is_c_catch/1, is_c_char/1,
+	 is_c_clause/1, is_c_cons/1, is_c_float/1, is_c_fname/1,
+	 is_c_fun/1, is_c_int/1, is_c_let/1, is_c_letrec/1, is_c_list/1,
+	 is_c_module/1, is_c_nil/1, is_c_primop/1, is_c_receive/1,
+	 is_c_seq/1, is_c_string/1, is_c_try/1, is_c_tuple/1,
+	 is_c_values/1, is_c_var/1, is_data/1, is_leaf/1, is_literal/1,
+	 is_literal_term/1, is_print_char/1, is_print_string/1,
+	 let_arg/1, let_arity/1, let_body/1, let_vars/1, letrec_body/1,
+	 letrec_defs/1, letrec_vars/1, list_elements/1, list_length/1,
+	 make_data/2, make_list/1, make_list/2, make_data_skel/2,
+	 make_tree/2, meta/1, module_attrs/1, module_defs/1,
+	 module_exports/1, module_name/1, module_vars/1,
+	 pat_list_vars/1, pat_vars/1, primop_args/1, primop_arity/1,
+	 primop_name/1, receive_action/1, receive_clauses/1,
+	 receive_timeout/1, seq_arg/1, seq_body/1, set_ann/2,
+	 string_lit/1, string_val/1, subtrees/1, to_records/1,
+	 try_arg/1, try_body/1, try_vars/1, try_evars/1, try_handler/1,
+	 tuple_arity/1, tuple_es/1, type/1, unfold_literal/1,
+	 update_c_alias/3, update_c_apply/3, update_c_call/4,
+	 update_c_case/3, update_c_catch/2, update_c_clause/4,
+	 update_c_cons/3, update_c_cons_skel/3, update_c_fname/2,
+	 update_c_fname/3, update_c_fun/3, update_c_let/4,
+	 update_c_letrec/3, update_c_module/5, update_c_primop/3,
+	 update_c_receive/4, update_c_seq/3, update_c_try/6,
+	 update_c_tuple/2, update_c_tuple_skel/2, update_c_values/2,
+	 update_c_var/2, update_data/3, update_list/2, update_list/3,
+	 update_data_skel/3, update_tree/2, update_tree/3,
+	 values_arity/1, values_es/1, var_name/1, c_binary/1,
+	 update_c_binary/2, ann_c_binary/2, is_c_binary/1,
+	 binary_segments/1, c_bitstr/3, c_bitstr/4, c_bitstr/5,
+	 update_c_bitstr/5, update_c_bitstr/6, ann_c_bitstr/5,
+	 ann_c_bitstr/6, is_c_bitstr/1, bitstr_val/1, bitstr_size/1,
+	 bitstr_bitsize/1, bitstr_unit/1, bitstr_type/1,
+	 bitstr_flags/1]).
+
+-include("core_parse.hrl").
+
+
+%% =====================================================================
+%% Representation (general)
+%%
+%% All nodes are represented by tuples of arity 2 or (generally)
+%% greater, whose first element is an atom which uniquely identifies the
+%% type of the node, and whose second element is a (proper) list of
+%% annotation terms associated with the node - this is by default empty.
+%%
+%% For most node constructor functions, there are analogous functions
+%% named 'ann_...', taking one extra argument 'As' (always the first
+%% argument), specifying an annotation list at node creation time.
+%% Similarly, there are also functions named 'update_...', taking one
+%% extra argument 'Old', specifying a node from which all fields not
+%% explicitly given as arguments should be copied (generally, this is
+%% the annotation field only).
+%% =====================================================================
+
+%% This defines the general representation of constant literals:
+
+-record(literal, {ann = [], val}).
+
+
+%% @spec type(Node::cerl()) -> atom()
+%%
+%% @doc Returns the type tag of <code>Node</code>. Current node types
+%% are:
+%%
+%% <p><center><table border="1">
+%%  <tr>
+%%    <td>alias</td>
+%%    <td>apply</td>
+%%    <td>binary</td>
+%%    <td>bitstr</td>
+%%    <td>call</td>
+%%    <td>case</td>
+%%    <td>catch</td>
+%%  </tr><tr>
+%%    <td>clause</td>
+%%    <td>cons</td>
+%%    <td>fun</td>
+%%    <td>let</td>
+%%    <td>letrec</td>
+%%    <td>literal</td>
+%%    <td>module</td>
+%%  </tr><tr>
+%%    <td>primop</td>
+%%    <td>receive</td>
+%%    <td>seq</td>
+%%    <td>try</td>
+%%    <td>tuple</td>
+%%    <td>values</td>
+%%    <td>var</td>
+%%  </tr>
+%% </table></center></p>
+%%
+%% <p>Note: The name of the primary constructor function for a node
+%% type is always the name of the type itself, prefixed by
+%% "<code>c_</code>"; recognizer predicates are correspondingly
+%% prefixed by "<code>is_c_</code>". Furthermore, to simplify
+%% preservation of annotations (cf. <code>get_ann/1</code>), there are
+%% analogous constructor functions prefixed by "<code>ann_c_</code>"
+%% and "<code>update_c_</code>", for setting the annotation list of
+%% the new node to either a specific value or to the annotations of an
+%% existing node, respectively.</p>
+%%
+%% @see abstract/1
+%% @see c_alias/2
+%% @see c_apply/2
+%% @see c_binary/1
+%% @see c_bitstr/5
+%% @see c_call/3
+%% @see c_case/2
+%% @see c_catch/1
+%% @see c_clause/3
+%% @see c_cons/2
+%% @see c_fun/2
+%% @see c_let/3
+%% @see c_letrec/2
+%% @see c_module/3
+%% @see c_primop/2
+%% @see c_receive/1
+%% @see c_seq/2
+%% @see c_try/3
+%% @see c_tuple/1
+%% @see c_values/1
+%% @see c_var/1
+%% @see get_ann/1
+%% @see to_records/1
+%% @see from_records/1
+%% @see data_type/1
+%% @see subtrees/1
+%% @see meta/1
+
+type(Node) ->
+    element(1, Node).
+
+
+%% @spec is_leaf(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is a leaf node,
+%% otherwise <code>false</code>. The current leaf node types are
+%% <code>literal</code> and <code>var</code>.
+%%
+%% <p>Note: all literals (cf. <code>is_literal/1</code>) are leaf
+%% nodes, even if they represent structured (constant) values such as
+%% <code>{foo, [bar, baz]}</code>. Also note that variables are leaf
+%% nodes but not literals.</p>
+%%
+%% @see type/1
+%% @see is_literal/1
+
+is_leaf(Node) ->
+    case type(Node) of
+	literal -> true;
+	var -> true;
+	_ -> false
+    end.
+
+
+%% @spec get_ann(cerl()) -> [term()]
+%%
+%% @doc Returns the list of user annotations associated with a syntax
+%% tree node. For a newly created node, this is the empty list. The
+%% annotations may be any terms.
+%%
+%% @see set_ann/2
+
+get_ann(Node) ->
+    element(2, Node).
+
+
+%% @spec set_ann(Node::cerl(), Annotations::[term()]) -> cerl()
+%%
+%% @doc Sets the list of user annotations of <code>Node</code> to
+%% <code>Annotations</code>.
+%%
+%% @see get_ann/1
+%% @see add_ann/2
+%% @see copy_ann/2
+
+set_ann(Node, List) ->
+    setelement(2, Node, List).
+
+
+%% @spec add_ann(Annotations::[term()], Node::cerl()) -> cerl()
+%%
+%% @doc Appends <code>Annotations</code> to the list of user
+%% annotations of <code>Node</code>.
+%%
+%% <p>Note: this is equivalent to <code>set_ann(Node, Annotations ++
+%% get_ann(Node))</code>, but potentially more efficient.</p>
+%%
+%% @see get_ann/1
+%% @see set_ann/2
+
+add_ann(Terms, Node) ->
+    set_ann(Node, Terms ++ get_ann(Node)).
+
+
+%% @spec copy_ann(Source::cerl(), Target::cerl()) -> cerl()
+%%
+%% @doc Copies the list of user annotations from <code>Source</code>
+%% to <code>Target</code>.
+%%
+%% <p>Note: this is equivalent to <code>set_ann(Target,
+%% get_ann(Source))</code>, but potentially more efficient.</p>
+%%
+%% @see get_ann/1
+%% @see set_ann/2
+
+copy_ann(Source, Target) ->
+    set_ann(Target, get_ann(Source)).
+
+
+%% @spec abstract(Term::term()) -> cerl()
+%%
+%% @doc Creates a syntax tree corresponding to an Erlang term.
+%% <code>Term</code> must be a literal term, i.e., one that can be
+%% represented as a source code literal. Thus, it may not contain a
+%% process identifier, port, reference, binary or function value as a
+%% subterm.
+%%
+%% <p>Note: This is a constant time operation.</p>
+%%
+%% @see ann_abstract/2
+%% @see concrete/1
+%% @see is_literal/1
+%% @see is_literal_term/1
+
+abstract(T) ->
+    #literal{val = T}.
+
+
+%% @spec ann_abstract(Annotations::[term()], Term::term()) -> cerl()
+%% @see abstract/1
+
+ann_abstract(As, T) ->
+    #literal{val = T, ann = As}.
+
+
+%% @spec is_literal_term(Term::term()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Term</code> can be
+%% represented as a literal, otherwise <code>false</code>. This
+%% function takes time proportional to the size of <code>Term</code>.
+%%
+%% @see abstract/1
+
+is_literal_term(T) when integer(T) -> true;
+is_literal_term(T) when float(T) -> true;
+is_literal_term(T) when atom(T) -> true;
+is_literal_term([]) -> true;
+is_literal_term([H | T]) ->
+    case is_literal_term(H) of
+	true ->
+	    is_literal_term(T);
+	false ->
+	    false
+    end;
+is_literal_term(T) when tuple(T) ->
+    is_literal_term_list(tuple_to_list(T));
+is_literal_term(_) ->
+    false.
+
+is_literal_term_list([T | Ts]) ->
+    case is_literal_term(T) of
+	true ->
+	    is_literal_term_list(Ts);
+	false ->
+	    false
+    end;
+is_literal_term_list([]) ->
+    true.
+
+
+%% @spec concrete(Node::cerl()) -> term()
+%%
+%% @doc Returns the Erlang term represented by a syntax tree.  An
+%% exception is thrown if <code>Node</code> does not represent a
+%% literal term.
+%%
+%% <p>Note: This is a constant time operation.</p>
+%%
+%% @see abstract/1
+%% @see is_literal/1
+
+%% Because the normal tuple and list constructor operations always
+%% return a literal if the arguments are literals, 'concrete' and
+%% 'is_literal' never need to traverse the structure.
+
+concrete(#literal{val = V}) ->
+    V.
+
+
+%% @spec is_literal(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> represents a
+%% literal term, otherwise <code>false</code>. This function returns
+%% <code>true</code> if and only if the value of
+%% <code>concrete(Node)</code> is defined.
+%%
+%% <p>Note: This is a constant time operation.</p>
+%%
+%% @see abstract/1
+%% @see concrete/1
+%% @see fold_literal/1
+
+is_literal(#literal{}) ->
+    true;
+is_literal(_) ->
+    false.
+
+
+%% @spec fold_literal(Node::cerl()) -> cerl()
+%%
+%% @doc Assures that literals have a compact representation. This is
+%% occasionally useful if <code>c_cons_skel/2</code>,
+%% <code>c_tuple_skel/1</code> or <code>unfold_literal/1</code> were
+%% used in the construction of <code>Node</code>, and you want to revert
+%% to the normal "folded" representation of literals. If
+%% <code>Node</code> represents a tuple or list constructor, its
+%% elements are rewritten recursively, and the node is reconstructed
+%% using <code>c_cons/2</code> or <code>c_tuple/1</code>, respectively;
+%% otherwise, <code>Node</code> is not changed.
+%%
+%% @see is_literal/1
+%% @see c_cons_skel/2
+%% @see c_tuple_skel/1
+%% @see c_cons/2
+%% @see c_tuple/1
+%% @see unfold_literal/1
+
+fold_literal(Node) ->
+    case type(Node) of
+	tuple ->
+	    update_c_tuple(Node, fold_literal_list(tuple_es(Node)));
+	cons ->
+	    update_c_cons(Node, fold_literal(cons_hd(Node)),
+			  fold_literal(cons_tl(Node)));
+	_ ->
+	    Node
+    end.
+
+fold_literal_list([E | Es]) ->
+    [fold_literal(E) | fold_literal_list(Es)];
+fold_literal_list([]) ->
+    [].
+
+
+%% @spec unfold_literal(Node::cerl()) -> cerl()
+%%
+%% @doc Assures that literals have a fully expanded representation. If
+%% <code>Node</code> represents a literal tuple or list constructor, its
+%% elements are rewritten recursively, and the node is reconstructed
+%% using <code>c_cons_skel/2</code> or <code>c_tuple_skel/1</code>,
+%% respectively; otherwise, <code>Node</code> is not changed. The {@link
+%% fold_literal/1} can be used to revert to the normal compact
+%% representation.
+%%
+%% @see is_literal/1
+%% @see c_cons_skel/2
+%% @see c_tuple_skel/1
+%% @see c_cons/2
+%% @see c_tuple/1
+%% @see fold_literal/1
+
+unfold_literal(Node) ->
+    case type(Node) of
+	literal ->
+	    copy_ann(Node, unfold_concrete(concrete(Node)));
+	_ ->
+	    Node
+    end.
+
+unfold_concrete(Val) ->
+    case Val of
+	_ when tuple(Val) ->
+	    c_tuple_skel(unfold_concrete_list(tuple_to_list(Val)));
+	[H|T] ->
+	    c_cons_skel(unfold_concrete(H), unfold_concrete(T));
+	_ ->
+	    abstract(Val)
+    end.
+
+unfold_concrete_list([E | Es]) ->
+    [unfold_concrete(E) | unfold_concrete_list(Es)];
+unfold_concrete_list([]) ->
+    [].
+
+
+%% ---------------------------------------------------------------------
+
+-record(module, {ann = [], name, exports, attrs, defs}).
+
+
+%% @spec c_module(Name::cerl(), Exports, Definitions) -> cerl()
+%%
+%%     Exports = [cerl()]
+%%     Definitions = [{cerl(), cerl()}]
+%%
+%% @equiv c_module(Name, Exports, [], Definitions)
+
+c_module(Name, Exports, Es) ->
+    #module{name = Name, exports = Exports, attrs = [], defs = Es}.
+
+
+%% @spec c_module(Name::cerl(), Exports, Attributes, Definitions) ->
+%%           cerl()
+%%
+%%     Exports = [cerl()]
+%%     Attributes = [{cerl(), cerl()}]
+%%     Definitions = [{cerl(), cerl()}]
+%%
+%% @doc Creates an abstract module definition. The result represents
+%% <pre>
+%%   module <em>Name</em> [<em>E1</em>, ..., <em>Ek</em>]
+%%     attributes [<em>K1</em> = <em>T1</em>, ...,
+%%                 <em>Km</em> = <em>Tm</em>]
+%%     <em>V1</em> = <em>F1</em>
+%%     ...
+%%     <em>Vn</em> = <em>Fn</em>
+%%   end</pre>
+%%
+%% if <code>Exports</code> = <code>[E1, ..., Ek]</code>,
+%% <code>Attributes</code> = <code>[{K1, T1}, ..., {Km, Tm}]</code>,
+%% and <code>Definitions</code> = <code>[{V1, F1}, ..., {Vn,
+%% Fn}]</code>.
+%%
+%% <p><code>Name</code> and all the <code>Ki</code> must be atom
+%% literals, and all the <code>Ti</code> must be constant literals. All
+%% the <code>Vi</code> and <code>Ei</code> must have type
+%% <code>var</code> and represent function names. All the
+%% <code>Fi</code> must have type <code>'fun'</code>.</p>
+%%
+%% @see c_module/3
+%% @see module_name/1
+%% @see module_exports/1
+%% @see module_attrs/1
+%% @see module_defs/1
+%% @see module_vars/1
+%% @see ann_c_module/4
+%% @see ann_c_module/5
+%% @see update_c_module/5
+%% @see c_atom/1
+%% @see c_var/1
+%% @see c_fun/2
+%% @see is_literal/1
+
+c_module(Name, Exports, Attrs, Es) ->
+    #module{name = Name, exports = Exports, attrs = Attrs, defs = Es}.
+
+
+%% @spec ann_c_module(As::[term()], Name::cerl(), Exports,
+%%                    Definitions) -> cerl()
+%%
+%%     Exports = [cerl()]
+%%     Definitions = [{cerl(), cerl()}]
+%%
+%% @see c_module/3
+%% @see ann_c_module/5
+
+ann_c_module(As, Name, Exports, Es) ->
+    #module{name = Name, exports = Exports, attrs = [], defs = Es,
+	    ann = As}.
+
+
+%% @spec ann_c_module(As::[term()], Name::cerl(), Exports,
+%%                    Attributes, Definitions) -> cerl()
+%%
+%%     Exports = [cerl()]
+%%     Attributes = [{cerl(), cerl()}]
+%%     Definitions = [{cerl(), cerl()}]
+%%
+%% @see c_module/4
+%% @see ann_c_module/4
+
+ann_c_module(As, Name, Exports, Attrs, Es) ->
+    #module{name = Name, exports = Exports, attrs = Attrs, defs = Es,
+	    ann = As}.
+
+
+%% @spec update_c_module(Old::cerl(), Name::cerl(), Exports,
+%%                       Attributes, Definitions) -> cerl()
+%%
+%%     Exports = [cerl()]
+%%     Attributes = [{cerl(), cerl()}]
+%%     Definitions = [{cerl(), cerl()}]
+%%
+%% @see c_module/4
+
+update_c_module(Node, Name, Exports, Attrs, Es) ->
+    #module{name = Name, exports = Exports, attrs = Attrs, defs = Es,
+	    ann = get_ann(Node)}.
+
+
+%% @spec is_c_module(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% module definition, otherwise <code>false</code>.
+%%
+%% @see type/1
+
+is_c_module(#module{}) ->
+    true;
+is_c_module(_) ->
+    false.
+
+
+%% @spec module_name(Node::cerl()) -> cerl()
+%%
+%% @doc Returns the name subtree of an abstract module definition.
+%%
+%% @see c_module/4
+
+module_name(Node) ->
+    Node#module.name.
+
+
+%% @spec module_exports(Node::cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of exports subtrees of an abstract module
+%% definition.
+%%
+%% @see c_module/4
+
+module_exports(Node) ->
+    Node#module.exports.
+
+
+%% @spec module_attrs(Node::cerl()) -> [{cerl(), cerl()}]
+%%
+%% @doc Returns the list of pairs of attribute key/value subtrees of
+%% an abstract module definition.
+%%
+%% @see c_module/4
+
+module_attrs(Node) ->
+    Node#module.attrs.
+
+
+%% @spec module_defs(Node::cerl()) -> [{cerl(), cerl()}]
+%%
+%% @doc Returns the list of function definitions of an abstract module
+%% definition.
+%%
+%% @see c_module/4
+
+module_defs(Node) ->
+    Node#module.defs.
+
+
+%% @spec module_vars(Node::cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of left-hand side function variable subtrees
+%% of an abstract module definition.
+%%
+%% @see c_module/4
+
+module_vars(Node) ->
+    [F || {F, _} <- module_defs(Node)].
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_int(Value::integer()) -> cerl()
+%%
+%%
+%% @doc Creates an abstract integer literal. The lexical
+%% representation is the canonical decimal numeral of
+%% <code>Value</code>.
+%%
+%% @see ann_c_int/2
+%% @see is_c_int/1
+%% @see int_val/1
+%% @see int_lit/1
+%% @see c_char/1
+
+c_int(Value) ->
+    #literal{val = Value}.
+
+
+%% @spec ann_c_int(As::[term()], Value::integer()) -> cerl()
+%% @see c_int/1
+
+ann_c_int(As, Value) ->
+    #literal{val = Value, ann = As}.
+
+
+%% @spec is_c_int(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> represents an
+%% integer literal, otherwise <code>false</code>.
+%% @see c_int/1
+
+is_c_int(#literal{val = V}) when integer(V) ->
+    true;
+is_c_int(_) ->
+    false.
+
+
+%% @spec int_val(cerl()) -> integer()
+%%
+%% @doc Returns the value represented by an integer literal node.
+%% @see c_int/1
+
+int_val(Node) ->
+    Node#literal.val.
+
+
+%% @spec int_lit(cerl()) -> string()
+%%
+%% @doc Returns the numeral string represented by an integer literal
+%% node.
+%% @see c_int/1
+
+int_lit(Node) ->
+    integer_to_list(int_val(Node)).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_float(Value::float()) -> cerl()
+%%
+%% @doc Creates an abstract floating-point literal.  The lexical
+%% representation is the decimal floating-point numeral of
+%% <code>Value</code>.
+%%
+%% @see ann_c_float/2
+%% @see is_c_float/1
+%% @see float_val/1
+%% @see float_lit/1
+
+%% Note that not all floating-point numerals can be represented with
+%% full precision.
+
+c_float(Value) ->
+    #literal{val = Value}.
+
+
+%% @spec ann_c_float(As::[term()], Value::float()) -> cerl()
+%% @see c_float/1
+
+ann_c_float(As, Value) ->
+    #literal{val = Value, ann = As}.
+
+
+%% @spec is_c_float(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> represents a
+%% floating-point literal, otherwise <code>false</code>.
+%% @see c_float/1
+
+is_c_float(#literal{val = V}) when float(V) ->
+    true;
+is_c_float(_) ->
+    false.
+
+
+%% @spec float_val(cerl()) -> float()
+%%
+%% @doc Returns the value represented by a floating-point literal
+%% node.
+%% @see c_float/1
+
+float_val(Node) ->
+    Node#literal.val.
+
+
+%% @spec float_lit(cerl()) -> string()
+%%
+%% @doc Returns the numeral string represented by a floating-point
+%% literal node.
+%% @see c_float/1
+
+float_lit(Node) ->
+    float_to_list(float_val(Node)).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_atom(Name) -> cerl()
+%%	    Name = atom() | string()
+%%
+%% @doc Creates an abstract atom literal.  The print name of the atom
+%% is the character sequence represented by <code>Name</code>.
+%%
+%% <p>Note: passing a string as argument to this function causes a
+%% corresponding atom to be created for the internal representation.</p>
+%%
+%% @see ann_c_atom/2
+%% @see is_c_atom/1
+%% @see atom_val/1
+%% @see atom_name/1
+%% @see atom_lit/1
+
+c_atom(Name) when atom(Name) ->
+    #literal{val = Name};
+c_atom(Name) ->
+    #literal{val = list_to_atom(Name)}.
+
+
+%% @spec ann_c_atom(As::[term()], Name) -> cerl()
+%%	    Name = atom() | string()
+%% @see c_atom/1
+
+ann_c_atom(As, Name) when atom(Name) ->
+    #literal{val = Name, ann = As};
+ann_c_atom(As, Name) ->
+    #literal{val = list_to_atom(Name), ann = As}.
+
+
+%% @spec is_c_atom(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> represents an
+%% atom literal, otherwise <code>false</code>.
+%%
+%% @see c_atom/1
+
+is_c_atom(#literal{val = V}) when atom(V) ->
+    true;
+is_c_atom(_) ->
+    false.
+
+%% @spec atom_val(cerl())-> atom()
+%%
+%% @doc Returns the value represented by an abstract atom.
+%%
+%% @see c_atom/1
+
+atom_val(Node) ->
+    Node#literal.val.
+
+
+%% @spec atom_name(cerl()) -> string()
+%%
+%% @doc Returns the printname of an abstract atom.
+%%
+%% @see c_atom/1
+
+atom_name(Node) ->
+    atom_to_list(atom_val(Node)).
+
+
+%% @spec atom_lit(cerl()) -> string()
+%%
+%% @doc Returns the literal string represented by an abstract
+%% atom. This always includes surrounding single-quote characters.
+%%
+%% <p>Note that an abstract atom may have several literal
+%% representations, and that the representation yielded by this
+%% function is not fixed; e.g.,
+%% <code>atom_lit(c_atom("a\012b"))</code> could yield the string
+%% <code>"\'a\\nb\'"</code>.</p>
+%%
+%% @see c_atom/1
+
+%% TODO: replace the use of the unofficial 'write_string/2'.
+
+atom_lit(Node) ->
+    io_lib:write_string(atom_name(Node), $'). %' stupid Emacs.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_char(Value) -> cerl()
+%%
+%%    Value = char() | integer()
+%%
+%% @doc Creates an abstract character literal. If the local
+%% implementation of Erlang defines <code>char()</code> as a subset of
+%% <code>integer()</code>, this function is equivalent to
+%% <code>c_int/1</code>. Otherwise, if the given value is an integer,
+%% it will be converted to the character with the corresponding
+%% code. The lexical representation of a character is
+%% "<code>$<em>Char</em></code>", where <code>Char</code> is a single
+%% printing character or an escape sequence.
+%%
+%% @see c_int/1
+%% @see c_string/1
+%% @see ann_c_char/2
+%% @see is_c_char/1
+%% @see char_val/1
+%% @see char_lit/1
+%% @see is_print_char/1
+
+c_char(Value)  when integer(Value), Value >= 0 ->
+    #literal{val = Value}.
+
+
+%% @spec ann_c_char(As::[term()], Value::char()) -> cerl()
+%% @see c_char/1
+
+ann_c_char(As, Value) ->
+    #literal{val = Value, ann = As}.
+
+
+%% @spec is_c_char(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> may represent a
+%% character literal, otherwise <code>false</code>.
+%%
+%% <p>If the local implementation of Erlang defines
+%% <code>char()</code> as a subset of <code>integer()</code>, then
+%% <code>is_c_int(<em>Node</em>)</code> will also yield
+%% <code>true</code>.</p>
+%%
+%% @see c_char/1
+%% @see is_print_char/1
+
+is_c_char(#literal{val = V}) when integer(V), V >= 0 ->
+    is_char_value(V);
+is_c_char(_) ->
+    false.
+
+
+%% @spec is_print_char(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> may represent a
+%% "printing" character, otherwise <code>false</code>. (Cf.
+%% <code>is_c_char/1</code>.)  A "printing" character has either a
+%% given graphical representation, or a "named" escape sequence such
+%% as "<code>\n</code>". Currently, only ISO 8859-1 (Latin-1)
+%% character values are recognized.
+%%
+%% @see c_char/1
+%% @see is_c_char/1
+
+is_print_char(#literal{val = V}) when integer(V), V >= 0 ->
+    is_print_char_value(V);
+is_print_char(_) ->
+    false.
+
+
+%% @spec char_val(cerl()) -> char()
+%%
+%% @doc Returns the value represented by an abstract character literal.
+%%
+%% @see c_char/1
+
+char_val(Node) ->
+    Node#literal.val.
+
+
+%% @spec char_lit(cerl()) -> string()
+%%
+%% @doc Returns the literal string represented by an abstract
+%% character. This includes a leading <code>$</code>
+%% character. Currently, all characters that are not in the set of ISO
+%% 8859-1 (Latin-1) "printing" characters will be escaped.
+%%
+%% @see c_char/1
+
+char_lit(Node) ->
+    io_lib:write_char(char_val(Node)).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_string(Value::string()) -> cerl()
+%%
+%% @doc Creates an abstract string literal. Equivalent to creating an
+%% abstract list of the corresponding character literals
+%% (cf. <code>is_c_string/1</code>), but is typically more
+%% efficient. The lexical representation of a string is
+%% "<code>"<em>Chars</em>"</code>", where <code>Chars</code> is a
+%% sequence of printing characters or spaces.
+%%
+%% @see c_char/1
+%% @see ann_c_string/2
+%% @see is_c_string/1
+%% @see string_val/1
+%% @see string_lit/1
+%% @see is_print_string/1
+
+c_string(Value) ->
+    #literal{val = Value}.
+
+
+%% @spec ann_c_string(As::[term()], Value::string()) -> cerl()
+%% @see c_string/1
+
+ann_c_string(As, Value) ->
+    #literal{val = Value, ann = As}.
+
+
+%% @spec is_c_string(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> may represent a
+%% string literal, otherwise <code>false</code>. Strings are defined
+%% as lists of characters; see <code>is_c_char/1</code> for details.
+%%
+%% @see c_string/1
+%% @see is_c_char/1
+%% @see is_print_string/1
+
+is_c_string(#literal{val = V}) ->
+    is_char_list(V);
+is_c_string(_) ->
+    false.
+
+
+%% @spec is_print_string(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> may represent a
+%% string literal containing only "printing" characters, otherwise
+%% <code>false</code>. See <code>is_c_string/1</code> and
+%% <code>is_print_char/1</code> for details. Currently, only ISO
+%% 8859-1 (Latin-1) character values are recognized.
+%%
+%% @see c_string/1
+%% @see is_c_string/1
+%% @see is_print_char/1
+
+is_print_string(#literal{val = V}) ->
+    is_print_char_list(V);
+is_print_string(_) ->
+    false.
+
+
+%% @spec string_val(cerl()) -> string()
+%%
+%% @doc Returns the value represented by an abstract string literal.
+%%
+%% @see c_string/1
+
+string_val(Node) ->
+    Node#literal.val.
+
+
+%% @spec string_lit(cerl()) -> string()
+%%
+%% @doc Returns the literal string represented by an abstract string.
+%% This includes surrounding double-quote characters
+%% <code>"..."</code>. Currently, characters that are not in the set
+%% of ISO 8859-1 (Latin-1) "printing" characters will be escaped,
+%% except for spaces.
+%%
+%% @see c_string/1
+
+string_lit(Node) ->
+    io_lib:write_string(string_val(Node)).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_nil() -> cerl()
+%%
+%% @doc Creates an abstract empty list. The result represents
+%% "<code>[]</code>". The empty list is traditionally called "nil".
+%%
+%% @see ann_c_nil/1
+%% @see is_c_list/1
+%% @see c_cons/2
+
+c_nil() ->
+    #literal{val = []}.
+
+
+%% @spec ann_c_nil(As::[term()]) -> cerl()
+%% @see c_nil/0
+
+ann_c_nil(As) ->
+    #literal{val = [], ann = As}.
+
+
+%% @spec is_c_nil(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% empty list, otherwise <code>false</code>.
+
+is_c_nil(#literal{val = []}) ->
+    true;
+is_c_nil(_) ->
+    false.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_cons(Head::cerl(), Tail::cerl()) -> cerl()
+%%
+%% @doc Creates an abstract list constructor. The result represents
+%% "<code>[<em>Head</em> | <em>Tail</em>]</code>". Note that if both
+%% <code>Head</code> and <code>Tail</code> have type
+%% <code>literal</code>, then the result will also have type
+%% <code>literal</code>, and annotations on <code>Head</code> and
+%% <code>Tail</code> are lost.
+%%
+%% <p>Recall that in Erlang, the tail element of a list constructor is
+%% not necessarily a list.</p>
+%%
+%% @see ann_c_cons/3
+%% @see update_c_cons/3
+%% @see c_cons_skel/2
+%% @see is_c_cons/1
+%% @see cons_hd/1
+%% @see cons_tl/1
+%% @see is_c_list/1
+%% @see c_nil/0
+%% @see list_elements/1
+%% @see list_length/1
+%% @see make_list/2
+
+-record(cons, {ann = [], hd, tl}).
+
+%% *Always* collapse literals.
+
+c_cons(#literal{val = Head}, #literal{val = Tail}) ->
+    #literal{val = [Head | Tail]};
+c_cons(Head, Tail) ->
+    #cons{hd = Head, tl = Tail}.
+
+
+%% @spec ann_c_cons(As::[term()], Head::cerl(), Tail::cerl()) -> cerl()
+%% @see c_cons/2
+
+ann_c_cons(As, #literal{val = Head}, #literal{val = Tail}) ->
+    #literal{val = [Head | Tail], ann = As};
+ann_c_cons(As, Head, Tail) ->
+    #cons{hd = Head, tl = Tail, ann = As}.
+
+
+%% @spec update_c_cons(Old::cerl(), Head::cerl(), Tail::cerl()) ->
+%%           cerl()
+%% @see c_cons/2
+
+update_c_cons(Node, #literal{val = Head}, #literal{val = Tail}) ->
+    #literal{val = [Head | Tail], ann = get_ann(Node)};
+update_c_cons(Node, Head, Tail) ->
+    #cons{hd = Head, tl = Tail, ann = get_ann(Node)}.
+
+
+%% @spec c_cons_skel(Head::cerl(), Tail::cerl()) -> cerl()
+%%
+%% @doc Creates an abstract list constructor skeleton. Does not fold
+%% constant literals, i.e., the result always has type
+%% <code>cons</code>, representing "<code>[<em>Head</em> |
+%% <em>Tail</em>]</code>".
+%%
+%% <p>This function is occasionally useful when it is necessary to have
+%% annotations on the subnodes of a list constructor node, even when the
+%% subnodes are constant literals. Note however that
+%% <code>is_literal/1</code> will yield <code>false</code> and
+%% <code>concrete/1</code> will fail if passed the result from this
+%% function.</p>
+%%
+%% <p><code>fold_literal/1</code> can be used to revert a node to the
+%% normal-form representation.</p>
+%%
+%% @see ann_c_cons_skel/3
+%% @see update_c_cons_skel/3
+%% @see c_cons/2
+%% @see is_c_cons/1
+%% @see is_c_list/1
+%% @see c_nil/0
+%% @see is_literal/1
+%% @see fold_literal/1
+%% @see concrete/1
+
+%% *Never* collapse literals.
+
+c_cons_skel(Head, Tail) ->
+    #cons{hd = Head, tl = Tail}.
+
+
+%% @spec ann_c_cons_skel(As::[term()], Head::cerl(), Tail::cerl()) ->
+%%           cerl()
+%% @see c_cons_skel/2
+
+ann_c_cons_skel(As, Head, Tail) ->
+    #cons{hd = Head, tl = Tail, ann = As}.
+
+
+%% @spec update_c_cons_skel(Old::cerl(), Head::cerl(), Tail::cerl()) ->
+%%           cerl()
+%% @see c_cons_skel/2
+
+update_c_cons_skel(Node, Head, Tail) ->
+    #cons{hd = Head, tl = Tail, ann = get_ann(Node)}.
+
+
+%% @spec is_c_cons(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% list constructor, otherwise <code>false</code>.
+
+is_c_cons(#cons{}) ->
+    true;
+is_c_cons(#literal{val = [_ | _]}) ->
+    true;
+is_c_cons(_) ->
+    false.
+
+
+%% @spec cons_hd(cerl()) -> cerl()
+%%
+%% @doc Returns the head subtree of an abstract list constructor.
+%%
+%% @see c_cons/2
+
+cons_hd(#cons{hd = Head}) ->
+    Head;
+cons_hd(#literal{val = [Head | _]}) ->
+    #literal{val = Head}.
+
+
+%% @spec cons_tl(cerl()) -> cerl()
+%%
+%% @doc Returns the tail subtree of an abstract list constructor.
+%%
+%% <p>Recall that the tail does not necessarily represent a proper
+%% list.</p>
+%%
+%% @see c_cons/2
+
+cons_tl(#cons{tl = Tail}) ->
+    Tail;
+cons_tl(#literal{val = [_ | Tail]}) ->
+    #literal{val = Tail}.
+
+
+%% @spec is_c_list(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> represents a
+%% proper list, otherwise <code>false</code>. A proper list is either
+%% the empty list <code>[]</code>, or a cons cell <code>[<em>Head</em> |
+%% <em>Tail</em>]</code>, where recursively <code>Tail</code> is a
+%% proper list.
+%%
+%% <p>Note: Because <code>Node</code> is a syntax tree, the actual
+%% run-time values corresponding to its subtrees may often be partially
+%% or completely unknown. Thus, if <code>Node</code> represents e.g.
+%% "<code>[... | Ns]</code>" (where <code>Ns</code> is a variable), then
+%% the function will return <code>false</code>, because it is not known
+%% whether <code>Ns</code> will be bound to a list at run-time. If
+%% <code>Node</code> instead represents e.g. "<code>[1, 2, 3]</code>" or
+%% "<code>[A | []]</code>", then the function will return
+%% <code>true</code>.</p>
+%%
+%% @see c_cons/2
+%% @see c_nil/0
+%% @see list_elements/1
+%% @see list_length/1
+
+is_c_list(#cons{tl = Tail}) ->
+    is_c_list(Tail);
+is_c_list(#literal{val = V}) ->
+    is_proper_list(V);
+is_c_list(_) ->
+    false.
+
+is_proper_list([_ | Tail]) ->
+    is_proper_list(Tail);
+is_proper_list([]) ->
+    true;
+is_proper_list(_) ->
+    false.
+
+%% @spec list_elements(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of element subtrees of an abstract list.
+%% <code>Node</code> must represent a proper list. E.g., if
+%% <code>Node</code> represents "<code>[<em>X1</em>, <em>X2</em> |
+%% [<em>X3</em>, <em>X4</em> | []]</code>", then
+%% <code>list_elements(Node)</code> yields the list <code>[X1, X2, X3,
+%% X4]</code>.
+%%
+%% @see c_cons/2
+%% @see c_nil/1
+%% @see is_c_list/1
+%% @see list_length/1
+%% @see make_list/2
+
+list_elements(#cons{hd = Head, tl = Tail}) ->
+    [Head | list_elements(Tail)];
+list_elements(#literal{val = V}) ->
+    abstract_list(V).
+
+abstract_list([X | Xs]) ->
+    [abstract(X) | abstract_list(Xs)];
+abstract_list([]) ->
+    [].
+
+
+%% @spec list_length(Node::cerl()) -> integer()
+%%
+%% @doc Returns the number of element subtrees of an abstract list.
+%% <code>Node</code> must represent a proper list. E.g., if
+%% <code>Node</code> represents "<code>[X1 | [X2, X3 | [X4, X5,
+%% X6]]]</code>", then <code>list_length(Node)</code> returns the
+%% integer 6.
+%%
+%% <p>Note: this is equivalent to
+%% <code>length(list_elements(Node))</code>, but potentially more
+%% efficient.</p>
+%%
+%% @see c_cons/2
+%% @see c_nil/1
+%% @see is_c_list/1
+%% @see list_elements/1
+
+list_length(L) ->
+    list_length(L, 0).
+
+list_length(#cons{tl = Tail}, A) ->
+    list_length(Tail, A + 1);
+list_length(#literal{val = V}, A) ->
+    A + length(V).
+
+
+%% @spec make_list(List) -> Node
+%% @equiv make_list(List, none)
+
+make_list(List) ->
+    ann_make_list([], List).
+
+
+%% @spec make_list(List::[cerl()], Tail) -> cerl()
+%%
+%%	    Tail = cerl() | none
+%%
+%% @doc Creates an abstract list from the elements in <code>List</code>
+%% and the optional <code>Tail</code>. If <code>Tail</code> is
+%% <code>none</code>, the result will represent a nil-terminated list,
+%% otherwise it represents "<code>[... | <em>Tail</em>]</code>".
+%%
+%% @see c_cons/2
+%% @see c_nil/0
+%% @see ann_make_list/3
+%% @see update_list/3
+%% @see list_elements/1
+
+make_list(List, Tail) ->
+    ann_make_list([], List, Tail).
+
+
+%% @spec update_list(Old::cerl(), List::[cerl()]) -> cerl()
+%% @equiv update_list(Old, List, none)
+
+update_list(Node, List) ->
+    ann_make_list(get_ann(Node), List).
+
+
+%% @spec update_list(Old::cerl(), List::[cerl()], Tail) -> cerl()
+%%
+%%	    Tail = cerl() | none
+%%
+%% @see make_list/2
+%% @see update_list/2
+
+update_list(Node, List, Tail) ->
+    ann_make_list(get_ann(Node), List, Tail).
+
+
+%% @spec ann_make_list(As::[term()], List::[cerl()]) -> cerl()
+%% @equiv ann_make_list(As, List, none)
+
+ann_make_list(As, List) ->
+    ann_make_list(As, List, none).
+
+
+%% @spec ann_make_list(As::[term()], List::[cerl()], Tail) -> cerl()
+%%
+%%	    Tail = cerl() | none
+%%
+%% @see make_list/2
+%% @see ann_make_list/2
+
+ann_make_list(As, [H | T], Tail) ->
+    ann_c_cons(As, H, make_list(T, Tail));    % `c_cons' folds literals
+ann_make_list(As, [], none) ->
+    ann_c_nil(As);
+ann_make_list(_, [], Node) ->
+    Node.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_tuple(Elements::[cerl()]) -> cerl()
+%%
+%% @doc Creates an abstract tuple. If <code>Elements</code> is
+%% <code>[E1, ..., En]</code>, the result represents
+%% "<code>{<em>E1</em>, ..., <em>En</em>}</code>".  Note that if all
+%% nodes in <code>Elements</code> have type <code>literal</code>, or if
+%% <code>Elements</code> is empty, then the result will also have type
+%% <code>literal</code> and annotations on nodes in
+%% <code>Elements</code> are lost.
+%%
+%% <p>Recall that Erlang has distinct 1-tuples, i.e., <code>{X}</code>
+%% is always distinct from <code>X</code> itself.</p>
+%%
+%% @see ann_c_tuple/2
+%% @see update_c_tuple/2
+%% @see is_c_tuple/1
+%% @see tuple_es/1
+%% @see tuple_arity/1
+%% @see c_tuple_skel/1
+
+-record(tuple, {ann = [], es}).
+
+%% *Always* collapse literals.
+
+c_tuple(Es) ->
+    case is_lit_list(Es) of
+	false ->
+	    #tuple{es = Es};
+	true ->
+	    #literal{val = list_to_tuple(lit_list_vals(Es))}
+    end.
+
+
+%% @spec ann_c_tuple(As::[term()], Elements::[cerl()]) -> cerl()
+%% @see c_tuple/1
+
+ann_c_tuple(As, Es) ->
+    case is_lit_list(Es) of
+	false ->
+	    #tuple{es = Es, ann = As};
+	true ->
+	    #literal{val = list_to_tuple(lit_list_vals(Es)), ann = As}
+    end.
+
+
+%% @spec update_c_tuple(Old::cerl(),  Elements::[cerl()]) -> cerl()
+%% @see c_tuple/1
+
+update_c_tuple(Node, Es) ->
+    case is_lit_list(Es) of
+	false ->
+	    #tuple{es = Es, ann = get_ann(Node)};
+	true ->
+	    #literal{val = list_to_tuple(lit_list_vals(Es)),
+		     ann = get_ann(Node)}
+    end.
+
+
+%% @spec c_tuple_skel(Elements::[cerl()]) -> cerl()
+%%
+%% @doc Creates an abstract tuple skeleton. Does not fold constant
+%% literals, i.e., the result always has type <code>tuple</code>,
+%% representing "<code>{<em>E1</em>, ..., <em>En</em>}</code>", if
+%% <code>Elements</code> is <code>[E1, ..., En]</code>.
+%%
+%% <p>This function is occasionally useful when it is necessary to have
+%% annotations on the subnodes of a tuple node, even when all the
+%% subnodes are constant literals. Note however that
+%% <code>is_literal/1</code> will yield <code>false</code> and
+%% <code>concrete/1</code> will fail if passed the result from this
+%% function.</p>
+%%
+%% <p><code>fold_literal/1</code> can be used to revert a node to the
+%% normal-form representation.</p>
+%%
+%% @see ann_c_tuple_skel/2
+%% @see update_c_tuple_skel/2
+%% @see c_tuple/1
+%% @see tuple_es/1
+%% @see is_c_tuple/1
+%% @see is_literal/1
+%% @see fold_literal/1
+%% @see concrete/1
+
+%% *Never* collapse literals.
+
+c_tuple_skel(Es) ->
+    #tuple{es = Es}.
+
+
+%% @spec ann_c_tuple_skel(As::[term()], Elements::[cerl()]) -> cerl()
+%% @see c_tuple_skel/1
+
+ann_c_tuple_skel(As, Es) ->
+    #tuple{es = Es, ann = As}.
+
+
+%% @spec update_c_tuple_skel(Old::cerl(), Elements::[cerl()]) -> cerl()
+%% @see c_tuple_skel/1
+
+update_c_tuple_skel(Old, Es) ->
+    #tuple{es = Es, ann = get_ann(Old)}.
+
+
+%% @spec is_c_tuple(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% tuple, otherwise <code>false</code>.
+%%
+%% @see c_tuple/1
+
+is_c_tuple(#tuple{}) ->
+    true;
+is_c_tuple(#literal{val = V}) when tuple(V) ->
+    true;
+is_c_tuple(_) ->
+    false.
+
+
+%% @spec tuple_es(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of element subtrees of an abstract tuple.
+%%
+%% @see c_tuple/1
+
+tuple_es(#tuple{es = Es}) ->
+    Es;
+tuple_es(#literal{val = V}) ->
+    make_lit_list(tuple_to_list(V)).
+
+
+%% @spec tuple_arity(Node::cerl()) -> integer()
+%%
+%% @doc Returns the number of element subtrees of an abstract tuple.
+%%
+%% <p>Note: this is equivalent to <code>length(tuple_es(Node))</code>,
+%% but potentially more efficient.</p>
+%%
+%% @see tuple_es/1
+%% @see c_tuple/1
+
+tuple_arity(#tuple{es = Es}) ->
+    length(Es);
+tuple_arity(#literal{val = V}) when tuple(V) ->
+    size(V).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_var(Name::var_name()) -> cerl()
+%%
+%%     var_name() = integer() | atom() | {atom(), integer()}
+%%
+%% @doc Creates an abstract variable. A variable is identified by its
+%% name, given by the <code>Name</code> parameter.
+%%
+%% <p>If a name is given by a single atom, it should either be a
+%% "simple" atom which does not need to be single-quoted in Erlang, or
+%% otherwise its print name should correspond to a proper Erlang
+%% variable, i.e., begin with an uppercase character or an
+%% underscore. Names on the form <code>{A, N}</code> represent
+%% function name variables "<code><em>A</em>/<em>N</em></code>"; these
+%% are special variables which may be bound only in the function
+%% definitions of a module or a <code>letrec</code>.  They may not be
+%% bound in <code>let</code> expressions and cannot occur in clause
+%% patterns. The atom <code>A</code> in a function name may be any
+%% atom; the integer <code>N</code> must be nonnegative. The functions
+%% <code>c_fname/2</code> etc. are utilities for handling function
+%% name variables.</p>
+%%
+%% <p>When printing variable names, they must have the form of proper
+%% Core Erlang variables and function names. E.g., a name represented
+%% by an integer such as <code>42</code> could be formatted as
+%% "<code>_42</code>", an atom <code>'Xxx'</code> simply as
+%% "<code>Xxx</code>", and an atom <code>foo</code> as
+%% "<code>_foo</code>". However, one must assure that any two valid
+%% distinct names are never mapped to the same strings.  Tuples such
+%% as <code>{foo, 2}</code> representing function names can simply by
+%% formatted as "<code>'foo'/2</code>", with no risk of conflicts.</p>
+%%
+%% @see ann_c_var/2
+%% @see update_c_var/2
+%% @see is_c_var/1
+%% @see var_name/1
+%% @see c_fname/2
+%% @see c_module/4
+%% @see c_letrec/2
+
+-record(var, {ann = [], name}).
+
+c_var(Name) ->
+    #var{name = Name}.
+
+
+%% @spec ann_c_var(As::[term()], Name::var_name()) -> cerl()
+%%
+%% @see c_var/1
+
+ann_c_var(As, Name) ->
+    #var{name = Name, ann = As}.
+
+%% @spec update_c_var(Old::cerl(), Name::var_name()) -> cerl()
+%%
+%% @see c_var/1
+
+update_c_var(Node, Name) ->
+    #var{name = Name, ann = get_ann(Node)}.
+
+
+%% @spec is_c_var(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% variable, otherwise <code>false</code>.
+%%
+%% @see c_var/1
+
+is_c_var(#var{}) ->
+    true;
+is_c_var(_) ->
+    false.
+
+
+%% @spec c_fname(Name::atom(), Arity::integer()) -> cerl()
+%% @equiv c_var({Name, Arity})
+%% @see fname_id/1
+%% @see fname_arity/1
+%% @see is_c_fname/1
+%% @see ann_c_fname/3
+%% @see update_c_fname/3
+
+c_fname(Atom, Arity) ->
+    c_var({Atom, Arity}).
+
+
+%% @spec ann_c_fname(As::[term()], Name::atom(), Arity::integer()) ->
+%%           cerl()
+%% @equiv ann_c_var(As, {Atom, Arity})
+%% @see c_fname/2
+
+ann_c_fname(As, Atom, Arity) ->
+    ann_c_var(As, {Atom, Arity}).
+
+
+%% @spec update_c_fname(Old::cerl(), Name::atom()) -> cerl()
+%% @doc Like <code>update_c_fname/3</code>, but takes the arity from
+%% <code>Node</code>.
+%% @see update_c_fname/3
+%% @see c_fname/2
+
+update_c_fname(#var{name = {_, Arity}, ann = As}, Atom) ->
+    #var{name = {Atom, Arity}, ann = As}.
+
+
+%% @spec update_c_fname(Old::cerl(), Name::atom(), Arity::integer()) ->
+%%           cerl()
+%% @equiv update_c_var(Old, {Atom, Arity})
+%% @see update_c_fname/2
+%% @see c_fname/2
+
+update_c_fname(Node, Atom, Arity) ->
+    update_c_var(Node, {Atom, Arity}).
+
+
+%% @spec is_c_fname(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% function name variable, otherwise <code>false</code>.
+%%
+%% @see c_fname/2
+%% @see c_var/1
+%% @see c_var_name/1
+
+is_c_fname(#var{name = {A, N}}) when atom(A), integer(N), N >= 0 ->
+    true;
+is_c_fname(_) ->
+    false.
+
+
+%% @spec var_name(cerl()) -> var_name()
+%%
+%% @doc Returns the name of an abstract variable.
+%%
+%% @see c_var/1
+
+var_name(Node) ->
+    Node#var.name.
+
+
+%% @spec fname_id(cerl()) -> atom()
+%%
+%% @doc Returns the identifier part of an abstract function name
+%% variable.
+%%
+%% @see fname_arity/1
+%% @see c_fname/2
+
+fname_id(#var{name={A,_}}) ->
+    A.
+
+
+%% @spec fname_arity(cerl()) -> integer()
+%%
+%% @doc Returns the arity part of an abstract function name variable.
+%%
+%% @see fname_id/1
+%% @see c_fname/2
+
+fname_arity(#var{name={_,N}}) ->
+    N.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_values(Elements::[cerl()]) -> cerl()
+%%
+%% @doc Creates an abstract value list. If <code>Elements</code> is
+%% <code>[E1, ..., En]</code>, the result represents
+%% "<code>&lt;<em>E1</em>, ..., <em>En</em>&gt;</code>".
+%%
+%% @see ann_c_values/2
+%% @see update_c_values/2
+%% @see is_c_values/1
+%% @see values_es/1
+%% @see values_arity/1
+
+-record(values, {ann = [], es}).
+
+c_values(Es) ->
+    #values{es = Es}.
+
+
+%% @spec ann_c_values(As::[term()], Elements::[cerl()]) -> cerl()
+%% @see c_values/1
+
+ann_c_values(As, Es) ->
+    #values{es = Es, ann = As}.
+
+
+%% @spec update_c_values(Old::cerl(), Elements::[cerl()]) -> cerl()
+%% @see c_values/1
+
+update_c_values(Node, Es) ->
+    #values{es = Es, ann = get_ann(Node)}.
+
+
+%% @spec is_c_values(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% value list; otherwise <code>false</code>.
+%%
+%% @see c_values/1
+
+is_c_values(#values{}) ->
+    true;
+is_c_values(_) ->
+    false.
+
+
+%% @spec values_es(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of element subtrees of an abstract value
+%% list.
+%%
+%% @see c_values/1
+%% @see values_arity/1
+
+values_es(Node) ->
+    Node#values.es.
+
+
+%% @spec values_arity(Node::cerl()) -> integer()
+%%
+%% @doc Returns the number of element subtrees of an abstract value
+%% list.
+%%
+%% <p>Note: This is equivalent to
+%% <code>length(values_es(Node))</code>, but potentially more
+%% efficient.</p>
+%%
+%% @see c_values/1
+%% @see values_es/1
+
+values_arity(Node) ->
+    length(values_es(Node)).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_binary(Segments::[cerl()]) -> cerl()
+%%
+%% @doc Creates an abstract binary-template. A binary object is a
+%% sequence of 8-bit bytes. It is specified by zero or more bit-string
+%% template <em>segments</em> of arbitrary lengths (in number of bits),
+%% such that the sum of the lengths is evenly divisible by 8. If
+%% <code>Segments</code> is <code>[S1, ..., Sn]</code>, the result
+%% represents "<code>#{<em>S1</em>, ..., <em>Sn</em>}#</code>". All the
+%% <code>Si</code> must have type <code>bitstr</code>.
+%%
+%% @see ann_c_binary/2
+%% @see update_c_binary/2
+%% @see is_c_binary/1
+%% @see binary_segments/1
+%% @see c_bitstr/5
+
+-record(binary, {ann = [], segments}).
+
+c_binary(Segments) ->
+    #binary{segments = Segments}.
+
+
+%% @spec ann_c_binary(As::[term()], Segments::[cerl()]) -> cerl()
+%% @see c_binary/1
+
+ann_c_binary(As, Segments) ->
+    #binary{segments = Segments, ann = As}.
+
+
+%% @spec update_c_binary(Old::cerl(), Segments::[cerl()]) -> cerl()
+%% @see c_binary/1
+
+update_c_binary(Node, Segments) ->
+    #binary{segments = Segments, ann = get_ann(Node)}.
+
+
+%% @spec is_c_binary(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% binary-template; otherwise <code>false</code>.
+%%
+%% @see c_binary/1
+
+is_c_binary(#binary{}) ->
+    true;
+is_c_binary(_) ->
+    false.
+
+
+%% @spec binary_segments(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of segment subtrees of an abstract
+%% binary-template.
+%%
+%% @see c_binary/1
+%% @see c_bitstr/5
+
+binary_segments(Node) ->
+    Node#binary.segments.
+
+
+%% @spec c_bitstr(Value::cerl(), Size::cerl(), Unit::cerl(),
+%%                Type::cerl(), Flags::cerl()) -> cerl()
+%%
+%% @doc Creates an abstract bit-string template. These can only occur as
+%% components of an abstract binary-template (see {@link c_binary/1}).
+%% The result represents "<code>#&lt;<em>Value</em>&gt;(<em>Size</em>,
+%% <em>Unit</em>, <em>Type</em>, <em>Flags</em>)</code>", where
+%% <code>Unit</code> must represent a positive integer constant,
+%% <code>Type</code> must represent a constant atom (one of
+%% <code>'integer'</code>, <code>'float'</code>, or
+%% <code>'binary'</code>), and <code>Flags</code> must represent a
+%% constant list <code>"[<em>F1</em>, ..., <em>Fn</em>]"</code> where
+%% all the <code>Fi</code> are atoms.
+%%
+%% @see c_binary/1
+%% @see ann_c_bitstr/6
+%% @see update_c_bitstr/6
+%% @see is_c_bitstr/1
+%% @see bitstr_val/1
+%% @see bitstr_size/1
+%% @see bitstr_unit/1
+%% @see bitstr_type/1
+%% @see bitstr_flags/1
+
+-record(bitstr, {ann = [], val, size, unit, type, flags}).
+
+c_bitstr(Val, Size, Unit, Type, Flags) ->
+    #bitstr{val = Val, size = Size, unit = Unit, type = Type,
+	    flags = Flags}.
+
+
+%% @spec c_bitstr(Value::cerl(), Size::cerl(), Type::cerl(),
+%%                Flags::cerl()) -> cerl()
+%% @equiv c_bitstr(Value, Size, abstract(1), Type, Flags)
+
+c_bitstr(Val, Size, Type, Flags) ->
+    c_bitstr(Val, Size, abstract(1), Type, Flags).
+
+
+%% @spec c_bitstr(Value::cerl(), Type::cerl(),
+%%                Flags::cerl()) -> cerl()
+%% @equiv c_bitstr(Value, abstract(all), abstract(1), Type, Flags)
+
+c_bitstr(Val, Type, Flags) ->
+    c_bitstr(Val, abstract(all), abstract(1), Type, Flags).
+
+
+%% @spec ann_c_bitstr(As::[term()], Value::cerl(), Size::cerl(),
+%%           Unit::cerl(), Type::cerl(), Flags::cerl()) -> cerl()
+%% @see c_bitstr/5
+%% @see ann_c_bitstr/5
+
+ann_c_bitstr(As, Val, Size, Unit, Type, Flags) ->
+    #bitstr{val = Val, size = Size, unit = Unit, type = Type,
+	     flags = Flags, ann = As}.
+
+%% @spec ann_c_bitstr(As::[term()], Value::cerl(), Size::cerl(),
+%%                    Type::cerl(), Flags::cerl()) -> cerl()
+%% @equiv ann_c_bitstr(As, Value, Size, abstract(1), Type, Flags)
+
+ann_c_bitstr(As, Value, Size, Type, Flags) ->
+    ann_c_bitstr(As, Value, Size, abstract(1), Type, Flags).
+
+
+%% @spec update_c_bitstr(Old::cerl(), Value::cerl(), Size::cerl(),
+%%           Unit::cerl(), Type::cerl(), Flags::cerl()) -> cerl()
+%% @see c_bitstr/5
+%% @see update_c_bitstr/5
+
+update_c_bitstr(Node, Val, Size, Unit, Type, Flags) ->
+    #bitstr{val = Val, size = Size, unit = Unit, type = Type,
+	     flags = Flags, ann = get_ann(Node)}.
+
+
+%% @spec update_c_bitstr(Old::cerl(), Value::cerl(), Size::cerl(),
+%%                       Type::cerl(), Flags::cerl()) -> cerl()
+%% @equiv update_c_bitstr(Node, Value, Size, abstract(1), Type, Flags)
+
+update_c_bitstr(Node, Value, Size, Type, Flags) ->
+    update_c_bitstr(Node, Value, Size, abstract(1), Type, Flags).
+
+%% @spec is_c_bitstr(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% bit-string template; otherwise <code>false</code>.
+%%
+%% @see c_bitstr/5
+
+is_c_bitstr(#bitstr{}) ->
+    true;
+is_c_bitstr(_) ->
+    false.
+
+
+%% @spec bitstr_val(cerl()) -> cerl()
+%%
+%% @doc Returns the value subtree of an abstract bit-string template.
+%%
+%% @see c_bitstr/5
+
+bitstr_val(Node) ->
+    Node#bitstr.val.
+
+
+%% @spec bitstr_size(cerl()) -> cerl()
+%%
+%% @doc Returns the size subtree of an abstract bit-string template.
+%%
+%% @see c_bitstr/5
+
+bitstr_size(Node) ->
+    Node#bitstr.size.
+
+
+%% @spec bitstr_bitsize(cerl()) -> integer() | any | all
+%%
+%% @doc Returns the total size in bits of an abstract bit-string
+%% template. If the size field is an integer literal, the result is the
+%% product of the size and unit values; if the size field is the atom
+%% literal <code>all</code>, the atom <code>all</code> is returned; in
+%% all other cases, the atom <code>any</code> is returned.
+%%
+%% @see c_bitstr/5
+
+bitstr_bitsize(Node) ->
+    Size = Node#bitstr.size,
+    case is_literal(Size) of
+	true ->
+	    case concrete(Size) of
+		all ->
+		    all;
+		S when integer(S) ->
+		    S*concrete(Node#bitstr.unit);
+		true ->
+		    any
+	    end;
+	false ->
+	    any
+    end.
+
+
+%% @spec bitstr_unit(cerl()) -> cerl()
+%%
+%% @doc Returns the unit subtree of an abstract bit-string template.
+%%
+%% @see c_bitstr/5
+
+bitstr_unit(Node) ->
+    Node#bitstr.unit.
+
+
+%% @spec bitstr_type(cerl()) -> cerl()
+%%
+%% @doc Returns the type subtree of an abstract bit-string template.
+%%
+%% @see c_bitstr/5
+
+bitstr_type(Node) ->
+    Node#bitstr.type.
+
+
+%% @spec bitstr_flags(cerl()) -> cerl()
+%%
+%% @doc Returns the flags subtree of an abstract bit-string template.
+%%
+%% @see c_bitstr/5
+
+bitstr_flags(Node) ->
+    Node#bitstr.flags.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_fun(Variables::[cerl()], Body::cerl()) -> cerl()
+%%
+%% @doc Creates an abstract fun-expression. If <code>Variables</code>
+%% is <code>[V1, ..., Vn]</code>, the result represents "<code>fun
+%% (<em>V1</em>, ..., <em>Vn</em>) -> <em>Body</em></code>". All the
+%% <code>Vi</code> must have type <code>var</code>.
+%%
+%% @see ann_c_fun/3
+%% @see update_c_fun/3
+%% @see is_c_fun/1
+%% @see fun_vars/1
+%% @see fun_body/1
+%% @see fun_arity/1
+
+-record('fun', {ann = [], vars, body}).
+
+c_fun(Variables, Body) ->
+    #'fun'{vars = Variables, body = Body}.
+
+
+%% @spec ann_c_fun(As::[term()], Variables::[cerl()], Body::cerl()) ->
+%%           cerl()
+%% @see c_fun/2
+
+ann_c_fun(As, Variables, Body) ->
+    #'fun'{vars = Variables, body = Body, ann = As}.
+
+
+%% @spec update_c_fun(Old::cerl(), Variables::[cerl()],
+%%                    Body::cerl()) -> cerl()
+%% @see c_fun/2
+
+update_c_fun(Node, Variables, Body) ->
+    #'fun'{vars = Variables, body = Body, ann = get_ann(Node)}.
+
+
+%% @spec is_c_fun(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% fun-expression, otherwise <code>false</code>.
+%%
+%% @see c_fun/2
+
+is_c_fun(#'fun'{}) ->
+    true;		% Now this is fun!
+is_c_fun(_) ->
+    false.
+
+
+%% @spec fun_vars(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of parameter subtrees of an abstract
+%% fun-expression.
+%%
+%% @see c_fun/2
+%% @see fun_arity/1
+
+fun_vars(Node) ->
+    Node#'fun'.vars.
+
+
+%% @spec fun_body(cerl()) -> cerl()
+%%
+%% @doc Returns the body subtree of an abstract fun-expression.
+%%
+%% @see c_fun/2
+
+fun_body(Node) ->
+    Node#'fun'.body.
+
+
+%% @spec fun_arity(Node::cerl()) -> integer()
+%%
+%% @doc Returns the number of parameter subtrees of an abstract
+%% fun-expression.
+%%
+%% <p>Note: this is equivalent to <code>length(fun_vars(Node))</code>,
+%% but potentially more efficient.</p>
+%%
+%% @see c_fun/2
+%% @see fun_vars/1
+
+fun_arity(Node) ->
+    length(fun_vars(Node)).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_seq(Argument::cerl(), Body::cerl()) -> cerl()
+%%
+%% @doc Creates an abstract sequencing expression. The result
+%% represents "<code>do <em>Argument</em> <em>Body</em></code>".
+%%
+%% @see ann_c_seq/3
+%% @see update_c_seq/3
+%% @see is_c_seq/1
+%% @see seq_arg/1
+%% @see seq_body/1
+
+-record(seq, {ann = [], arg, body}).
+
+c_seq(Argument, Body) ->
+    #seq{arg = Argument, body = Body}.
+
+
+%% @spec ann_c_seq(As::[term()], Argument::cerl(), Body::cerl()) ->
+%%           cerl()
+%% @see c_seq/2
+
+ann_c_seq(As, Argument, Body) ->
+    #seq{arg = Argument, body = Body, ann = As}.
+
+
+%% @spec update_c_seq(Old::cerl(), Argument::cerl(), Body::cerl()) ->
+%%           cerl()
+%% @see c_seq/2
+
+update_c_seq(Node, Argument, Body) ->
+    #seq{arg = Argument, body = Body, ann = get_ann(Node)}.
+
+
+%% @spec is_c_seq(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% sequencing expression, otherwise <code>false</code>.
+%%
+%% @see c_seq/2
+
+is_c_seq(#seq{}) ->
+    true;
+is_c_seq(_) ->
+    false.
+
+
+%% @spec seq_arg(cerl()) -> cerl()
+%%
+%% @doc Returns the argument subtree of an abstract sequencing
+%% expression.
+%%
+%% @see c_seq/2
+
+seq_arg(Node) ->
+    Node#seq.arg.
+
+
+%% @spec seq_body(cerl()) -> cerl()
+%%
+%% @doc Returns the body subtree of an abstract sequencing expression.
+%%
+%% @see c_seq/2
+
+seq_body(Node) ->
+    Node#seq.body.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_let(Variables::[cerl()], Argument::cerl(), Body::cerl()) ->
+%%           cerl()
+%%
+%% @doc Creates an abstract let-expression. If <code>Variables</code>
+%% is <code>[V1, ..., Vn]</code>, the result represents "<code>let
+%% &lt;<em>V1</em>, ..., <em>Vn</em>&gt; = <em>Argument</em> in
+%% <em>Body</em></code>".  All the <code>Vi</code> must have type
+%% <code>var</code>.
+%%
+%% @see ann_c_let/4
+%% @see update_c_let/4
+%% @see is_c_let/1
+%% @see let_vars/1
+%% @see let_arg/1
+%% @see let_body/1
+%% @see let_arity/1
+
+-record('let', {ann = [], vars, arg, body}).
+
+c_let(Variables, Argument, Body) ->
+    #'let'{vars = Variables, arg = Argument, body = Body}.
+
+
+%% ann_c_let(As, Variables, Argument, Body) -> Node
+%% @see c_let/3
+
+ann_c_let(As, Variables, Argument, Body) ->
+    #'let'{vars = Variables, arg = Argument, body = Body, ann = As}.
+
+
+%% update_c_let(Old, Variables, Argument, Body) -> Node
+%% @see c_let/3
+
+update_c_let(Node, Variables, Argument, Body) ->
+    #'let'{vars = Variables, arg = Argument, body = Body,
+	   ann = get_ann(Node)}.
+
+
+%% @spec is_c_let(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% let-expression, otherwise <code>false</code>.
+%%
+%% @see c_let/3
+
+is_c_let(#'let'{}) ->
+    true;
+is_c_let(_) ->
+    false.
+
+
+%% @spec let_vars(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of left-hand side variables of an abstract
+%% let-expression.
+%%
+%% @see c_let/3
+%% @see let_arity/1
+
+let_vars(Node) ->
+    Node#'let'.vars.
+
+
+%% @spec let_arg(cerl()) -> cerl()
+%%
+%% @doc Returns the argument subtree of an abstract let-expression.
+%%
+%% @see c_let/3
+
+let_arg(Node) ->
+    Node#'let'.arg.
+
+
+%% @spec let_body(cerl()) -> cerl()
+%%
+%% @doc Returns the body subtree of an abstract let-expression.
+%%
+%% @see c_let/3
+
+let_body(Node) ->
+    Node#'let'.body.
+
+
+%% @spec let_arity(Node::cerl()) -> integer()
+%%
+%% @doc Returns the number of left-hand side variables of an abstract
+%% let-expression.
+%%
+%% <p>Note: this is equivalent to <code>length(let_vars(Node))</code>,
+%% but potentially more efficient.</p>
+%%
+%% @see c_let/3
+%% @see let_vars/1
+
+let_arity(Node) ->
+    length(let_vars(Node)).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_letrec(Definitions::[{cerl(), cerl()}], Body::cerl()) ->
+%%           cerl()
+%%
+%% @doc Creates an abstract letrec-expression. If
+%% <code>Definitions</code> is <code>[{V1, F1}, ..., {Vn, Fn}]</code>,
+%% the result represents "<code>letrec <em>V1</em> = <em>F1</em>
+%% ... <em>Vn</em> = <em>Fn</em> in <em>Body</em></code>.  All the
+%% <code>Vi</code> must have type <code>var</code> and represent
+%% function names.  All the <code>Fi</code> must have type
+%% <code>'fun'</code>.
+%%
+%% @see ann_c_letrec/3
+%% @see update_c_letrec/3
+%% @see is_c_letrec/1
+%% @see letrec_defs/1
+%% @see letrec_body/1
+%% @see letrec_vars/1
+
+-record(letrec, {ann = [], defs, body}).
+
+c_letrec(Defs, Body) ->
+    #letrec{defs = Defs, body = Body}.
+
+
+%% @spec ann_c_letrec(As::[term()], Definitions::[{cerl(), cerl()}],
+%%                    Body::cerl()) -> cerl()
+%% @see c_letrec/2
+
+ann_c_letrec(As, Defs, Body) ->
+    #letrec{defs = Defs, body = Body, ann = As}.
+
+
+%% @spec update_c_letrec(Old::cerl(),
+%%                       Definitions::[{cerl(), cerl()}],
+%%                       Body::cerl()) -> cerl()
+%% @see c_letrec/2
+
+update_c_letrec(Node, Defs, Body) ->
+    #letrec{defs = Defs, body = Body, ann = get_ann(Node)}.
+
+
+%% @spec is_c_letrec(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% letrec-expression, otherwise <code>false</code>.
+%%
+%% @see c_letrec/2
+
+is_c_letrec(#letrec{}) ->
+    true;
+is_c_letrec(_) ->
+    false.
+
+
+%% @spec letrec_defs(Node::cerl()) -> [{cerl(), cerl()}]
+%%
+%% @doc Returns the list of definitions of an abstract
+%% letrec-expression. If <code>Node</code> represents "<code>letrec
+%% <em>V1</em> = <em>F1</em> ... <em>Vn</em> = <em>Fn</em> in
+%% <em>Body</em></code>", the returned value is <code>[{V1, F1}, ...,
+%% {Vn, Fn}]</code>.
+%%
+%% @see c_letrec/2
+
+letrec_defs(Node) ->
+    Node#letrec.defs.
+
+
+%% @spec letrec_body(cerl()) -> cerl()
+%%
+%% @doc Returns the body subtree of an abstract letrec-expression.
+%%
+%% @see c_letrec/2
+
+letrec_body(Node) ->
+    Node#letrec.body.
+
+
+%% @spec letrec_vars(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of left-hand side function variable subtrees
+%% of a letrec-expression. If <code>Node</code> represents
+%% "<code>letrec <em>V1</em> = <em>F1</em> ... <em>Vn</em> =
+%% <em>Fn</em> in <em>Body</em></code>", the returned value is
+%% <code>[V1, ..., Vn]</code>.
+%%
+%% @see c_letrec/2
+
+letrec_vars(Node) ->
+    [F || {F, _} <- letrec_defs(Node)].
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_case(Argument::cerl(), Clauses::[cerl()]) -> cerl()
+%%
+%% @doc Creates an abstract case-expression. If <code>Clauses</code>
+%% is <code>[C1, ..., Cn]</code>, the result represents "<code>case
+%% <em>Argument</em> of <em>C1</em> ... <em>Cn</em>
+%% end</code>". <code>Clauses</code> must not be empty.
+%%
+%% @see ann_c_case/3
+%% @see update_c_case/3
+%% @see is_c_case/1
+%% @see c_clause/3
+%% @see case_arg/1
+%% @see case_clauses/1
+%% @see case_arity/1
+
+-record('case', {ann = [], arg, clauses}).
+
+c_case(Expr, Clauses) ->
+    #'case'{arg = Expr, clauses = Clauses}.
+
+
+%% @spec ann_c_case(As::[term()], Argument::cerl(),
+%%                  Clauses::[cerl()]) -> cerl()
+%% @see c_case/2
+
+ann_c_case(As, Expr, Clauses) ->
+    #'case'{arg = Expr, clauses = Clauses, ann = As}.
+
+
+%% @spec update_c_case(Old::cerl(), Argument::cerl(),
+%%                     Clauses::[cerl()]) -> cerl()
+%% @see c_case/2
+
+update_c_case(Node, Expr, Clauses) ->
+    #'case'{arg = Expr, clauses = Clauses, ann = get_ann(Node)}.
+
+
+%% is_c_case(Node) -> boolean()
+%%
+%%	    Node = cerl()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% case-expression; otherwise <code>false</code>.
+%%
+%% @see c_case/2
+
+is_c_case(#'case'{}) ->
+    true;
+is_c_case(_) ->
+    false.
+
+
+%% @spec case_arg(cerl()) -> cerl()
+%%
+%% @doc Returns the argument subtree of an abstract case-expression.
+%%
+%% @see c_case/2
+
+case_arg(Node) ->
+    Node#'case'.arg.
+
+
+%% @spec case_clauses(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of clause subtrees of an abstract
+%% case-expression.
+%%
+%% @see c_case/2
+%% @see case_arity/1
+
+case_clauses(Node) ->
+    Node#'case'.clauses.
+
+
+%% @spec case_arity(Node::cerl()) -> integer()
+%%
+%% @doc Equivalent to
+%% <code>clause_arity(hd(case_clauses(Node)))</code>, but potentially
+%% more efficient.
+%%
+%% @see c_case/2
+%% @see case_clauses/1
+%% @see clause_arity/1
+
+case_arity(Node) ->
+    clause_arity(hd(case_clauses(Node))).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_clause(Patterns::[cerl()], Body::cerl()) -> cerl()
+%% @equiv c_clause(Patterns, c_atom(true), Body)
+%% @see c_atom/1
+
+c_clause(Patterns, Body) ->
+    c_clause(Patterns, c_atom(true), Body).
+
+
+%% @spec c_clause(Patterns::[cerl()], Guard::cerl(), Body::cerl()) ->
+%%           cerl()
+%%
+%% @doc Creates an an abstract clause. If <code>Patterns</code> is
+%% <code>[P1, ..., Pn]</code>, the result represents
+%% "<code>&lt;<em>P1</em>, ..., <em>Pn</em>&gt; when <em>Guard</em> ->
+%% <em>Body</em></code>".
+%%
+%% @see c_clause/2
+%% @see ann_c_clause/4
+%% @see update_c_clause/4
+%% @see is_c_clause/1
+%% @see c_case/2
+%% @see c_receive/3
+%% @see clause_pats/1
+%% @see clause_guard/1
+%% @see clause_body/1
+%% @see clause_arity/1
+%% @see clause_vars/1
+
+-record(clause, {ann = [], pats, guard, body}).
+
+c_clause(Patterns, Guard, Body) ->
+    #clause{pats = Patterns, guard = Guard, body = Body}.
+
+
+%% @spec ann_c_clause(As::[term()], Patterns::[cerl()],
+%%                    Body::cerl()) -> cerl()
+%% @equiv ann_c_clause(As, Patterns, c_atom(true), Body)
+%% @see c_clause/3
+ann_c_clause(As, Patterns, Body) ->
+    ann_c_clause(As, Patterns, c_atom(true), Body).
+
+
+%% @spec ann_c_clause(As::[term()], Patterns::[cerl()], Guard::cerl(),
+%%                    Body::cerl()) -> cerl()
+%% @see ann_c_clause/3
+%% @see c_clause/3
+
+ann_c_clause(As, Patterns, Guard, Body) ->
+    #clause{pats = Patterns, guard = Guard, body = Body, ann = As}.
+
+
+%% @spec update_c_clause(Old::cerl(), Patterns::[cerl()],
+%%                       Guard::cerl(), Body::cerl()) -> cerl()
+%% @see c_clause/3
+
+update_c_clause(Node, Patterns, Guard, Body) ->
+    #clause{pats = Patterns, guard = Guard, body = Body,
+	    ann = get_ann(Node)}.
+
+
+%% @spec is_c_clause(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% clause, otherwise <code>false</code>.
+%%
+%% @see c_clause/3
+
+is_c_clause(#clause{}) ->
+    true;
+is_c_clause(_) ->
+    false.
+
+
+%% @spec clause_pats(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of pattern subtrees of an abstract clause.
+%%
+%% @see c_clause/3
+%% @see clause_arity/1
+
+clause_pats(Node) ->
+    Node#clause.pats.
+
+
+%% @spec clause_guard(cerl()) -> cerl()
+%%
+%% @doc Returns the guard subtree of an abstract clause.
+%%
+%% @see c_clause/3
+
+clause_guard(Node) ->
+    Node#clause.guard.
+
+
+%% @spec clause_body(cerl()) -> cerl()
+%%
+%% @doc Returns the body subtree of an abstract clause.
+%%
+%% @see c_clause/3
+
+clause_body(Node) ->
+    Node#clause.body.
+
+
+%% @spec clause_arity(Node::cerl()) -> integer()
+%%
+%% @doc Returns the number of pattern subtrees of an abstract clause.
+%%
+%% <p>Note: this is equivalent to
+%% <code>length(clause_pats(Node))</code>, but potentially more
+%% efficient.</p>
+%%
+%% @see c_clause/3
+%% @see clause_pats/1
+
+clause_arity(Node) ->
+    length(clause_pats(Node)).
+
+
+%% @spec clause_vars(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of all abstract variables in the patterns of
+%% an abstract clause. The order of listing is not defined.
+%%
+%% @see c_clause/3
+%% @see pat_list_vars/1
+
+clause_vars(Clause) ->
+    pat_list_vars(clause_pats(Clause)).
+
+
+%% @spec pat_vars(Pattern::cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of all abstract variables in a pattern. An
+%% exception is thrown if <code>Node</code> does not represent a
+%% well-formed Core Erlang clause pattern. The order of listing is not
+%% defined.
+%%
+%% @see pat_list_vars/1
+%% @see clause_vars/1
+
+pat_vars(Node) ->
+    pat_vars(Node, []).
+
+pat_vars(Node, Vs) ->
+    case type(Node) of
+	var ->
+	    [Node | Vs];
+	literal ->
+	    Vs;
+	cons ->
+	    pat_vars(cons_hd(Node), pat_vars(cons_tl(Node), Vs));
+	tuple ->
+	    pat_list_vars(tuple_es(Node), Vs);
+	binary ->
+	    pat_list_vars(binary_segments(Node), Vs);
+	bitstr ->
+	    pat_vars(bitstr_val(Node), Vs);
+	alias ->
+	    pat_vars(alias_pat(Node), [alias_var(Node) | Vs])
+    end.
+
+
+%% @spec pat_list_vars(Patterns::[cerl()]) -> [cerl()]
+%%
+%% @doc Returns the list of all abstract variables in the given
+%% patterns. An exception is thrown if some element in
+%% <code>Patterns</code> does not represent a well-formed Core Erlang
+%% clause pattern. The order of listing is not defined.
+%%
+%% @see pat_vars/1
+%% @see clause_vars/1
+
+pat_list_vars(Ps) ->
+    pat_list_vars(Ps, []).
+
+pat_list_vars([P | Ps], Vs) ->
+    pat_list_vars(Ps, pat_vars(P, Vs));
+pat_list_vars([], Vs) ->
+    Vs.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_alias(Variable::cerl(), Pattern::cerl()) -> cerl()
+%%
+%% @doc Creates an abstract pattern alias. The result represents
+%% "<code><em>Variable</em> = <em>Pattern</em></code>".
+%%
+%% @see ann_c_alias/3
+%% @see update_c_alias/3
+%% @see is_c_alias/1
+%% @see alias_var/1
+%% @see alias_pat/1
+%% @see c_clause/3
+
+-record(alias, {ann = [], var, pat}).
+
+c_alias(Var, Pattern) ->
+    #alias{var = Var, pat = Pattern}.
+
+
+%% @spec ann_c_alias(As::[term()], Variable::cerl(),
+%%                   Pattern::cerl()) -> cerl()
+%% @see c_alias/2
+
+ann_c_alias(As, Var, Pattern) ->
+    #alias{var = Var, pat = Pattern, ann = As}.
+
+
+%% @spec update_c_alias(Old::cerl(), Variable::cerl(),
+%%                      Pattern::cerl()) -> cerl()
+%% @see c_alias/2
+
+update_c_alias(Node, Var, Pattern) ->
+    #alias{var = Var, pat = Pattern, ann = get_ann(Node)}.
+
+
+%% @spec is_c_alias(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% pattern alias, otherwise <code>false</code>.
+%%
+%% @see c_alias/2
+
+is_c_alias(#alias{}) ->
+    true;
+is_c_alias(_) ->
+    false.
+
+
+%% @spec alias_var(cerl()) -> cerl()
+%%
+%% @doc Returns the variable subtree of an abstract pattern alias.
+%%
+%% @see c_alias/2
+
+alias_var(Node) ->
+    Node#alias.var.
+
+
+%% @spec alias_pat(cerl()) -> cerl()
+%%
+%% @doc Returns the pattern subtree of an abstract pattern alias.
+%%
+%% @see c_alias/2
+
+alias_pat(Node) ->
+    Node#alias.pat.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_receive(Clauses::[cerl()]) -> cerl()
+%% @equiv c_receive(Clauses, c_atom(infinity), c_atom(true))
+%% @see c_atom/1
+
+c_receive(Clauses) ->
+    c_receive(Clauses, c_atom(infinity), c_atom(true)).
+
+
+%% @spec c_receive(Clauses::[cerl()], Timeout::cerl(),
+%%                 Action::cerl()) -> cerl()
+%%
+%% @doc Creates an abstract receive-expression. If
+%% <code>Clauses</code> is <code>[C1, ..., Cn]</code>, the result
+%% represents "<code>receive <em>C1</em> ... <em>Cn</em> after
+%% <em>Timeout</em> -> <em>Action</em> end</code>".
+%%
+%% @see c_receive/1
+%% @see ann_c_receive/4
+%% @see update_c_receive/4
+%% @see is_c_receive/1
+%% @see receive_clauses/1
+%% @see receive_timeout/1
+%% @see receive_action/1
+
+-record('receive', {ann = [], clauses, timeout, action}).
+
+c_receive(Clauses, Timeout, Action) ->
+    #'receive'{clauses = Clauses, timeout = Timeout, action = Action}.
+
+
+%% @spec ann_c_receive(As::[term()], Clauses::[cerl()]) -> cerl()
+%% @equiv ann_c_receive(As, Clauses, c_atom(infinity), c_atom(true))
+%% @see c_receive/3
+%% @see c_atom/1
+
+ann_c_receive(As, Clauses) ->
+    ann_c_receive(As, Clauses, c_atom(infinity), c_atom(true)).
+
+
+%% @spec ann_c_receive(As::[term()], Clauses::[cerl()],
+%%                     Timeout::cerl(), Action::cerl()) -> cerl()
+%% @see ann_c_receive/2
+%% @see c_receive/3
+
+ann_c_receive(As, Clauses, Timeout, Action) ->
+    #'receive'{clauses = Clauses, timeout = Timeout, action = Action,
+	       ann = As}.
+
+
+%% @spec update_c_receive(Old::cerl(), Clauses::[cerl()],
+%%                        Timeout::cerl(), Action::cerl()) -> cerl()
+%% @see c_receive/3
+
+update_c_receive(Node, Clauses, Timeout, Action) ->
+    #'receive'{clauses = Clauses, timeout = Timeout, action = Action,
+	       ann = get_ann(Node)}.
+
+
+%% @spec is_c_receive(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% receive-expression, otherwise <code>false</code>.
+%%
+%% @see c_receive/3
+
+is_c_receive(#'receive'{}) ->
+    true;
+is_c_receive(_) ->
+    false.
+
+
+%% @spec receive_clauses(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of clause subtrees of an abstract
+%% receive-expression.
+%%
+%% @see c_receive/3
+
+receive_clauses(Node) ->
+    Node#'receive'.clauses.
+
+
+%% @spec receive_timeout(cerl()) -> cerl()
+%%
+%% @doc Returns the timeout subtree of an abstract receive-expression.
+%%
+%% @see c_receive/3
+
+receive_timeout(Node) ->
+    Node#'receive'.timeout.
+
+
+%% @spec receive_action(cerl()) -> cerl()
+%%
+%% @doc Returns the action subtree of an abstract receive-expression.
+%%
+%% @see c_receive/3
+
+receive_action(Node) ->
+    Node#'receive'.action.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_apply(Operator::cerl(), Arguments::[cerl()]) -> cerl()
+%%
+%% @doc Creates an abstract function application. If
+%% <code>Arguments</code> is <code>[A1, ..., An]</code>, the result
+%% represents "<code>apply <em>Operator</em>(<em>A1</em>, ...,
+%% <em>An</em>)</code>".
+%%
+%% @see ann_c_apply/3
+%% @see update_c_apply/3
+%% @see is_c_apply/1
+%% @see apply_op/1
+%% @see apply_args/1
+%% @see apply_arity/1
+%% @see c_call/3
+%% @see c_primop/2
+
+-record(apply, {ann = [], op, args}).
+
+c_apply(Operator, Arguments) ->
+    #apply{op = Operator, args = Arguments}.
+
+
+%% @spec ann_c_apply(As::[term()], Operator::cerl(),
+%%                   Arguments::[cerl()]) -> cerl()
+%% @see c_apply/2
+
+ann_c_apply(As, Operator, Arguments) ->
+    #apply{op = Operator, args = Arguments, ann = As}.
+
+
+%% @spec update_c_apply(Old::cerl(), Operator::cerl(),
+%%                      Arguments::[cerl()]) -> cerl()
+%% @see c_apply/2
+
+update_c_apply(Node, Operator, Arguments) ->
+    #apply{op = Operator, args = Arguments, ann = get_ann(Node)}.
+
+
+%% @spec is_c_apply(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% function application, otherwise <code>false</code>.
+%%
+%% @see c_apply/2
+
+is_c_apply(#apply{}) ->
+    true;
+is_c_apply(_) ->
+    false.
+
+
+%% @spec apply_op(cerl()) -> cerl()
+%%
+%% @doc Returns the operator subtree of an abstract function
+%% application.
+%%
+%% @see c_apply/2
+
+apply_op(Node) ->
+    Node#apply.op.
+
+
+%% @spec apply_args(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of argument subtrees of an abstract function
+%% application.
+%%
+%% @see c_apply/2
+%% @see apply_arity/1
+
+apply_args(Node) ->
+    Node#apply.args.
+
+
+%% @spec apply_arity(Node::cerl()) -> integer()
+%%
+%% @doc Returns the number of argument subtrees of an abstract
+%% function application.
+%%
+%% <p>Note: this is equivalent to
+%% <code>length(apply_args(Node))</code>, but potentially more
+%% efficient.</p>
+%%
+%% @see c_apply/2
+%% @see apply_args/1
+
+apply_arity(Node) ->
+    length(apply_args(Node)).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_call(Module::cerl(), Name::cerl(), Arguments::[cerl()]) ->
+%%           cerl()
+%%
+%% @doc Creates an abstract inter-module call. If
+%% <code>Arguments</code> is <code>[A1, ..., An]</code>, the result
+%% represents "<code>call <em>Module</em>:<em>Name</em>(<em>A1</em>,
+%% ..., <em>An</em>)</code>".
+%%
+%% @see ann_c_call/4
+%% @see update_c_call/4
+%% @see is_c_call/1
+%% @see call_module/1
+%% @see call_name/1
+%% @see call_args/1
+%% @see call_arity/1
+%% @see c_apply/2
+%% @see c_primop/2
+
+-record(call, {ann = [], module, name, args}).
+
+c_call(Module, Name, Arguments) ->
+    #call{module = Module, name = Name, args = Arguments}.
+
+
+%% @spec ann_c_call(As::[term()], Module::cerl(), Name::cerl(),
+%%                  Arguments::[cerl()]) -> cerl()
+%% @see c_call/3
+
+ann_c_call(As, Module, Name, Arguments) ->
+    #call{module = Module, name = Name, args = Arguments, ann = As}.
+
+
+%% @spec update_c_call(Old::cerl(), Module::cerl(), Name::cerl(),
+%%                  Arguments::[cerl()]) -> cerl()
+%% @see c_call/3
+
+update_c_call(Node, Module, Name, Arguments) ->
+    #call{module = Module, name = Name, args = Arguments,
+	  ann = get_ann(Node)}.
+
+
+%% @spec is_c_call(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% inter-module call expression; otherwise <code>false</code>.
+%%
+%% @see c_call/3
+
+is_c_call(#call{}) ->
+    true;
+is_c_call(_) ->
+    false.
+
+
+%% @spec call_module(cerl()) -> cerl()
+%%
+%% @doc Returns the module subtree of an abstract inter-module call.
+%%
+%% @see c_call/3
+
+call_module(Node) ->
+    Node#call.module.
+
+
+%% @spec call_name(cerl()) -> cerl()
+%%
+%% @doc Returns the name subtree of an abstract inter-module call.
+%%
+%% @see c_call/3
+
+call_name(Node) ->
+    Node#call.name.
+
+
+%% @spec call_args(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of argument subtrees of an abstract
+%% inter-module call.
+%%
+%% @see c_call/3
+%% @see call_arity/1
+
+call_args(Node) ->
+    Node#call.args.
+
+
+%% @spec call_arity(Node::cerl()) -> integer()
+%%
+%% @doc Returns the number of argument subtrees of an abstract
+%% inter-module call.
+%%
+%% <p>Note: this is equivalent to
+%% <code>length(call_args(Node))</code>, but potentially more
+%% efficient.</p>
+%%
+%% @see c_call/3
+%% @see call_args/1
+
+call_arity(Node) ->
+    length(call_args(Node)).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_primop(Name::cerl(), Arguments::[cerl()]) -> cerl()
+%%
+%% @doc Creates an abstract primitive operation call. If
+%% <code>Arguments</code> is <code>[A1, ..., An]</code>, the result
+%% represents "<code>primop <em>Name</em>(<em>A1</em>, ...,
+%% <em>An</em>)</code>". <code>Name</code> must be an atom literal.
+%%
+%% @see ann_c_primop/3
+%% @see update_c_primop/3
+%% @see is_c_primop/1
+%% @see primop_name/1
+%% @see primop_args/1
+%% @see primop_arity/1
+%% @see c_apply/2
+%% @see c_call/3
+
+-record(primop, {ann = [], name, args}).
+
+c_primop(Name, Arguments) ->
+    #primop{name = Name, args = Arguments}.
+
+
+%% @spec ann_c_primop(As::[term()], Name::cerl(),
+%%                    Arguments::[cerl()]) -> cerl()
+%% @see c_primop/2
+
+ann_c_primop(As, Name, Arguments) ->
+    #primop{name = Name, args = Arguments, ann = As}.
+
+
+%% @spec update_c_primop(Old::cerl(), Name::cerl(),
+%%                       Arguments::[cerl()]) -> cerl()
+%% @see c_primop/2
+
+update_c_primop(Node, Name, Arguments) ->
+    #primop{name = Name, args = Arguments, ann = get_ann(Node)}.
+
+
+%% @spec is_c_primop(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% primitive operation call, otherwise <code>false</code>.
+%%
+%% @see c_primop/2
+
+is_c_primop(#primop{}) ->
+    true;
+is_c_primop(_) ->
+    false.
+
+
+%% @spec primop_name(cerl()) -> cerl()
+%%
+%% @doc Returns the name subtree of an abstract primitive operation
+%% call.
+%%
+%% @see c_primop/2
+
+primop_name(Node) ->
+    Node#primop.name.
+
+
+%% @spec primop_args(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of argument subtrees of an abstract primitive
+%% operation call.
+%%
+%% @see c_primop/2
+%% @see primop_arity/1
+
+primop_args(Node) ->
+    Node#primop.args.
+
+
+%% @spec primop_arity(Node::cerl()) -> integer()
+%%
+%% @doc Returns the number of argument subtrees of an abstract
+%% primitive operation call.
+%%
+%% <p>Note: this is equivalent to
+%% <code>length(primop_args(Node))</code>, but potentially more
+%% efficient.</p>
+%%
+%% @see c_primop/2
+%% @see primop_args/1
+
+primop_arity(Node) ->
+    length(primop_args(Node)).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_try(Argument::cerl(), Variables::[cerl()], Body::cerl(),
+%%             ExceptionVars::[cerl()], Handler::cerl()) -> cerl()
+%%
+%% @doc Creates an abstract try-expression. If <code>Variables</code> is
+%% <code>[V1, ..., Vn]</code> and <code>ExceptionVars</code> is
+%% <code>[X1, ..., Xm]</code>, the result represents "<code>try
+%% <em>Argument</em> of &lt;<em>V1</em>, ..., <em>Vn</em>&gt; ->
+%% <em>Body</em> catch &lt;<em>X1</em>, ..., <em>Xm</em>&gt; ->
+%% <em>Handler</em></code>". All the <code>Vi</code> and <code>Xi</code>
+%% must have type <code>var</code>.
+%%
+%% @see ann_c_try/6
+%% @see update_c_try/6
+%% @see is_c_try/1
+%% @see try_arg/1
+%% @see try_vars/1
+%% @see try_body/1
+%% @see c_catch/1
+
+-record('try', {ann = [], arg, vars, body, evars, handler}).
+
+c_try(Expr, Vs, Body, Evs, Handler) ->
+    #'try'{arg = Expr, vars = Vs, body = Body,
+	   evars = Evs, handler = Handler}.
+
+
+%% @spec ann_c_try(As::[term()], Expression::cerl(),
+%%                 Variables::[cerl()], Body::cerl(),
+%%                 EVars::[cerl()], EBody::[cerl()]) -> cerl()
+%% @see c_try/3
+
+ann_c_try(As, Expr, Vs, Body, Evs, Handler) ->
+    #'try'{arg = Expr, vars = Vs, body = Body,
+	   evars = Evs, handler = Handler, ann = As}.
+
+
+%% @spec update_c_try(Old::cerl(), Expression::cerl(),
+%%                    Variables::[cerl()], Body::cerl(),
+%%                    EVars::[cerl()], EBody::[cerl()]) -> cerl()
+%% @see c_try/3
+
+update_c_try(Node, Expr, Vs, Body, Evs, Handler) ->
+    #'try'{arg = Expr, vars = Vs, body = Body,
+	   evars = Evs, handler = Handler, ann = get_ann(Node)}.
+
+
+%% @spec is_c_try(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% try-expression, otherwise <code>false</code>.
+%%
+%% @see c_try/3
+
+is_c_try(#'try'{}) ->
+    true;
+is_c_try(_) ->
+    false.
+
+
+%% @spec try_arg(cerl()) -> cerl()
+%%
+%% @doc Returns the expression subtree of an abstract try-expression.
+%%
+%% @see c_try/3
+
+try_arg(Node) ->
+    Node#'try'.arg.
+
+
+%% @spec try_vars(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of success variable subtrees of an abstract
+%% try-expression.
+%%
+%% @see c_try/3
+
+try_vars(Node) ->
+    Node#'try'.vars.
+
+
+%% @spec try_body(cerl()) -> cerl()
+%%
+%% @doc Returns the success body subtree of an abstract try-expression.
+%%
+%% @see c_try/3
+
+try_body(Node) ->
+    Node#'try'.body.
+
+
+%% @spec try_evars(cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of exception variable subtrees of an abstract
+%% try-expression.
+%%
+%% @see c_try/3
+
+try_evars(Node) ->
+    Node#'try'.evars.
+
+
+%% @spec try_handler(cerl()) -> cerl()
+%%
+%% @doc Returns the exception body subtree of an abstract
+%% try-expression.
+%%
+%% @see c_try/3
+
+try_handler(Node) ->
+    Node#'try'.handler.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec c_catch(Body::cerl()) -> cerl()
+%%
+%% @doc Creates an abstract catch-expression. The result represents
+%% "<code>catch <em>Body</em></code>".
+%%
+%% <p>Note: catch-expressions can be rewritten as try-expressions, and
+%% will eventually be removed from Core Erlang.</p>
+%%
+%% @see ann_c_catch/2
+%% @see update_c_catch/2
+%% @see is_c_catch/1
+%% @see catch_body/1
+%% @see c_try/3
+
+-record('catch', {ann = [], body}).
+
+c_catch(Body) ->
+    #'catch'{body = Body}.
+
+
+%% @spec ann_c_catch(As::[term()], Body::cerl()) -> cerl()
+%% @see c_catch/1
+
+ann_c_catch(As, Body) ->
+    #'catch'{body = Body, ann = As}.
+
+
+%% @spec update_c_catch(Old::cerl(), Body::cerl()) -> cerl()
+%% @see c_catch/1
+
+update_c_catch(Node, Body) ->
+    #'catch'{body = Body, ann = get_ann(Node)}.
+
+
+%% @spec is_c_catch(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
+%% catch-expression, otherwise <code>false</code>.
+%%
+%% @see c_catch/1
+
+is_c_catch(#'catch'{}) ->
+    true;
+is_c_catch(_) ->
+    false.
+
+
+%% @spec catch_body(Node::cerl()) -> cerl()
+%%
+%% @doc Returns the body subtree of an abstract catch-expression.
+%%
+%% @see c_catch/1
+
+catch_body(Node) ->
+    Node#'catch'.body.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec to_records(Tree::cerl()) -> record(record_types())
+%%
+%% @doc Translates an abstract syntax tree to a corresponding explicit
+%% record representation. The records are defined in the file
+%% "<code>cerl.hrl</code>".
+%%
+%% <p>Note: Compound constant literals are always unfolded in the
+%% record representation.</p>
+%%
+%% @see type/1
+%% @see from_records/1
+
+to_records(Node) ->
+    A = get_ann(Node),
+    case type(Node) of
+	literal ->
+	    lit_to_records(concrete(Node), A);
+	binary ->
+	    #c_binary{anno = A,
+		      segments =
+		      list_to_records(binary_segments(Node))};
+	bitstr ->
+	    #c_bitstr{anno = A,
+		      val = to_records(bitstr_val(Node)),
+		      size = to_records(bitstr_size(Node)),
+		      unit = to_records(bitstr_unit(Node)),
+		      type = to_records(bitstr_type(Node)),
+		      flags = to_records(bitstr_flags(Node))};
+	cons ->
+	    #c_cons{anno = A,
+		    hd = to_records(cons_hd(Node)),
+		    tl = to_records(cons_tl(Node))};
+	tuple ->
+	    #c_tuple{anno = A,
+		     es = list_to_records(tuple_es(Node))};
+	var ->
+	    case is_c_fname(Node) of
+		true ->
+		    #c_fname{anno = A,
+			     id = fname_id(Node),
+			     arity = fname_arity(Node)};
+		false ->
+		    #c_var{anno = A, name = var_name(Node)}
+	    end;
+	values ->
+	    #c_values{anno = A,
+		      es = list_to_records(values_es(Node))};
+	'fun' ->
+	    #c_fun{anno = A,
+		   vars = list_to_records(fun_vars(Node)),
+		   body = to_records(fun_body(Node))};
+	seq ->
+	    #c_seq{anno = A,
+		   arg = to_records(seq_arg(Node)),
+		   body = to_records(seq_body(Node))};
+	'let' ->
+	    #c_let{anno = A,
+		   vars = list_to_records(let_vars(Node)),
+		   arg = to_records(let_arg(Node)),
+		   body = to_records(let_body(Node))};
+	letrec ->
+	    #c_letrec{anno = A,
+		      defs = [#c_def{name = to_records(N),
+				     val = to_records(F)}
+			      || {N, F} <- letrec_defs(Node)],
+		      body = to_records(letrec_body(Node))};
+	'case' ->
+	    #c_case{anno = A,
+		    arg = to_records(case_arg(Node)),
+		    clauses =
+		    list_to_records(case_clauses(Node))};
+	clause ->
+	    #c_clause{anno = A,
+		      pats = list_to_records(clause_pats(Node)),
+		      guard = to_records(clause_guard(Node)),
+		      body = to_records(clause_body(Node))};
+	alias ->
+	    #c_alias{anno = A,
+		     var = to_records(alias_var(Node)),
+		     pat = to_records(alias_pat(Node))};
+	'receive' ->
+	    #c_receive{anno = A,
+		       clauses =
+		       list_to_records(receive_clauses(Node)),
+		       timeout =
+		       to_records(receive_timeout(Node)),
+		       action =
+		       to_records(receive_action(Node))};
+	apply ->
+	    #c_apply{anno = A,
+		     op = to_records(apply_op(Node)),
+		     args = list_to_records(apply_args(Node))};
+	call ->
+	    #c_call{anno = A,
+		    module = to_records(call_module(Node)),
+		    name = to_records(call_name(Node)),
+		    args = list_to_records(call_args(Node))};
+	primop ->
+	    #c_primop{anno = A,
+		      name = to_records(primop_name(Node)),
+		      args = list_to_records(primop_args(Node))};
+	'try' ->
+	    #c_try{anno = A,
+		   arg = to_records(try_arg(Node)),
+		   vars = list_to_records(try_vars(Node)),
+		   body = to_records(try_body(Node)),
+		   evars = list_to_records(try_evars(Node)),
+		   handler = to_records(try_handler(Node))};
+	'catch' ->
+	    #c_catch{anno = A,
+		     body = to_records(catch_body(Node))};
+	module ->
+	    #c_module{anno = A,
+		      name = to_records(module_name(Node)),
+		      exports = list_to_records(
+				  module_exports(Node)),
+		      attrs = [#c_def{name = to_records(K),
+				      val = to_records(V)}
+			       || {K, V} <- module_attrs(Node)],
+		      defs = [#c_def{name = to_records(N),
+				     val = to_records(F)}
+			      || {N, F} <- module_defs(Node)]}
+    end.
+
+list_to_records([T | Ts]) ->
+    [to_records(T) | list_to_records(Ts)];
+list_to_records([]) ->
+    [].
+
+lit_to_records(V, A) when integer(V) ->
+    #c_int{anno = A, val = V};
+lit_to_records(V, A) when float(V) ->
+    #c_float{anno = A, val = V};
+lit_to_records(V, A) when atom(V) ->
+    #c_atom{anno = A, val = V};
+lit_to_records([H | T] = V, A) ->
+    case is_print_char_list(V) of
+	true ->
+	    #c_string{anno = A, val = V};
+	false ->
+	    #c_cons{anno = A,
+		    hd = lit_to_records(H, []),
+		    tl = lit_to_records(T, [])}
+    end;
+lit_to_records([], A) ->
+    #c_nil{anno = A};
+lit_to_records(V, A) when tuple(V) ->
+    #c_tuple{anno = A, es = lit_list_to_records(tuple_to_list(V))}.
+
+lit_list_to_records([T | Ts]) ->
+    [lit_to_records(T, []) | lit_list_to_records(Ts)];
+lit_list_to_records([]) ->
+    [].
+
+
+%% @spec from_records(Tree::record(record_types())) -> cerl()
+%%
+%%     record_types() = c_alias | c_apply | c_call | c_case | c_catch |
+%%                      c_clause | c_cons | c_def| c_fun | c_let |
+%%                      c_letrec |c_lit | c_module | c_primop |
+%%                      c_receive | c_seq | c_try | c_tuple |
+%%                      c_values | c_var
+%%
+%% @doc Translates an explicit record representation to a
+%% corresponding abstract syntax tree.  The records are defined in the
+%% file "<code>cerl.hrl</code>".
+%%
+%% <p>Note: Compound constant literals are folded, discarding
+%% annotations on subtrees. There are no <code>c_def</code> nodes in
+%% the abstract representation; annotations on <code>c_def</code>
+%% records are discarded.</p>
+%%
+%% @see type/1
+%% @see to_records/1
+
+from_records(#c_int{val = V, anno = As}) ->
+    ann_c_int(As, V);
+from_records(#c_float{val = V, anno = As}) ->
+    ann_c_float(As, V);
+from_records(#c_atom{val = V, anno = As}) ->
+    ann_c_atom(As, V);
+from_records(#c_char{val = V, anno = As}) ->
+    ann_c_char(As, V);
+from_records(#c_string{val = V, anno = As}) ->
+    ann_c_string(As, V);
+from_records(#c_nil{anno = As}) ->
+    ann_c_nil(As);
+from_records(#c_binary{segments = Ss, anno = As}) ->
+    ann_c_binary(As, from_records_list(Ss));
+from_records(#c_bitstr{val = V, size = S, unit = U, type = T,
+		       flags = Fs, anno = As}) ->
+    ann_c_bitstr(As, from_records(V), from_records(S), from_records(U),
+		 from_records(T), from_records(Fs));
+from_records(#c_cons{hd = H, tl = T, anno = As}) ->
+    ann_c_cons(As, from_records(H), from_records(T));
+from_records(#c_tuple{es = Es, anno = As}) ->
+    ann_c_tuple(As, from_records_list(Es));
+from_records(#c_var{name = Name, anno = As}) ->
+    ann_c_var(As, Name);
+from_records(#c_fname{id = Id, arity = Arity, anno = As}) ->
+    ann_c_fname(As, Id, Arity);
+from_records(#c_values{es = Es, anno = As}) ->
+    ann_c_values(As, from_records_list(Es));
+from_records(#c_fun{vars = Vs, body = B, anno = As}) ->
+    ann_c_fun(As, from_records_list(Vs), from_records(B));
+from_records(#c_seq{arg = A, body = B, anno = As}) ->
+    ann_c_seq(As, from_records(A), from_records(B));
+from_records(#c_let{vars = Vs, arg = A, body = B, anno = As}) ->
+    ann_c_let(As, from_records_list(Vs), from_records(A),
+	      from_records(B));
+from_records(#c_letrec{defs = Fs, body = B, anno = As}) ->
+    ann_c_letrec(As, [{from_records(N), from_records(F)}
+		      || #c_def{name = N, val = F} <- Fs],
+		 from_records(B));
+from_records(#c_case{arg = A, clauses = Cs, anno = As}) ->
+    ann_c_case(As, from_records(A), from_records_list(Cs));
+from_records(#c_clause{pats = Ps, guard = G, body = B, anno = As}) ->
+    ann_c_clause(As, from_records_list(Ps), from_records(G),
+		 from_records(B));
+from_records(#c_alias{var = V, pat = P, anno = As}) ->
+    ann_c_alias(As, from_records(V), from_records(P));
+from_records(#c_receive{clauses = Cs, timeout = T, action = A,
+			anno = As}) ->
+    ann_c_receive(As, from_records_list(Cs), from_records(T),
+		  from_records(A));
+from_records(#c_apply{op = Op, args = Es, anno = As}) ->
+    ann_c_apply(As, from_records(Op), from_records_list(Es));
+from_records(#c_call{module = M, name = N, args = Es, anno = As}) ->
+    ann_c_call(As, from_records(M), from_records(N),
+	       from_records_list(Es));
+from_records(#c_primop{name = N, args = Es, anno = As}) ->
+    ann_c_primop(As, from_records(N), from_records_list(Es));
+from_records(#c_try{arg = E, vars = Vs, body = B,
+		    evars = Evs, handler = H, anno = As}) ->
+    ann_c_try(As, from_records(E), from_records_list(Vs),
+	      from_records(B), from_records_list(Evs), from_records(H));
+from_records(#c_catch{body = B, anno = As}) ->
+    ann_c_catch(As, from_records(B));
+from_records(#c_module{name = N, exports = Es, attrs = Ds, defs = Fs,
+		       anno = As}) ->
+    ann_c_module(As, from_records(N),
+		 from_records_list(Es),
+		 [{from_records(K), from_records(V)}
+		  || #c_def{name = K, val = V} <- Ds],
+		 [{from_records(V), from_records(F)}
+		  || #c_def{name = V, val = F} <- Fs]).
+
+from_records_list([T | Ts]) ->
+    [from_records(T) | from_records_list(Ts)];
+from_records_list([]) ->
+    [].
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec is_data(Node::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if <code>Node</code> represents a
+%% data constructor, otherwise <code>false</code>. Data constructors
+%% are cons cells, tuples, and atomic literals.
+%%
+%% @see data_type/1
+%% @see data_es/1
+%% @see data_arity/1
+
+is_data(#literal{}) ->
+    true;
+is_data(#cons{}) ->
+    true;
+is_data(#tuple{}) ->
+    true;
+is_data(_) ->
+    false.
+
+
+%% @spec data_type(Node::cerl()) -> dtype()
+%%
+%%     dtype() = cons | tuple | {'atomic', Value}
+%%     Value = integer() | float() | atom() | []
+%%
+%% @doc Returns a type descriptor for a data constructor
+%% node. (Cf. <code>is_data/1</code>.) This is mainly useful for
+%% comparing types and for constructing new nodes of the same type
+%% (cf. <code>make_data/2</code>). If <code>Node</code> represents an
+%% integer, floating-point number, atom or empty list, the result is
+%% <code>{'atomic', Value}</code>, where <code>Value</code> is the value
+%% of <code>concrete(Node)</code>, otherwise the result is either
+%% <code>cons</code> or <code>tuple</code>.
+%%
+%% <p>Type descriptors can be compared for equality or order (in the
+%% Erlang term order), but remember that floating-point values should
+%% in general never be tested for equality.</p>
+%%
+%% @see is_data/1
+%% @see make_data/2
+%% @see type/1
+%% @see concrete/1
+
+data_type(#literal{val = V}) ->
+    case V of
+	[_ | _] ->
+	    cons;
+	_ when tuple(V) ->
+	    tuple;
+	_ ->
+	    {'atomic', V}
+    end;
+data_type(#cons{}) ->
+    cons;
+data_type(#tuple{}) ->
+    tuple.
+
+
+%% @spec data_es(Node::cerl()) -> [cerl()]
+%%
+%% @doc Returns the list of subtrees of a data constructor node. If
+%% the arity of the constructor is zero, the result is the empty list.
+%%
+%% <p>Note: if <code>data_type(Node)</code> is <code>cons</code>, the
+%% number of subtrees is exactly two. If <code>data_type(Node)</code>
+%% is <code>{'atomic', Value}</code>, the number of subtrees is
+%% zero.</p>
+%%
+%% @see is_data/1
+%% @see data_type/1
+%% @see data_arity/1
+%% @see make_data/2
+
+data_es(#literal{val = V}) ->
+    case V of
+	[Head | Tail] ->
+	    [#literal{val = Head}, #literal{val = Tail}];
+	_ when tuple(V) ->
+	    make_lit_list(tuple_to_list(V));
+	_ ->
+	    []
+    end;
+data_es(#cons{hd = H, tl = T}) ->
+    [H, T];
+data_es(#tuple{es = Es}) ->
+    Es.
+
+
+%% @spec data_arity(Node::cerl()) -> integer()
+%%
+%% @doc Returns the number of subtrees of a data constructor
+%% node. This is equivalent to <code>length(data_es(Node))</code>, but
+%% potentially more efficient.
+%%
+%% @see is_data/1
+%% @see data_es/1
+
+data_arity(#literal{val = V}) ->
+    case V of
+	[_ | _] ->
+	    2;
+	_ when tuple(V) ->
+	    size(V);
+	_ ->
+	    0
+    end;
+data_arity(#cons{}) ->
+    2;
+data_arity(#tuple{es = Es}) ->
+    length(Es).
+
+
+%% @spec make_data(Type::dtype(), Elements::[cerl()]) -> cerl()
+%%
+%% @doc Creates a data constructor node with the specified type and
+%% subtrees. (Cf. <code>data_type/1</code>.)  An exception is thrown
+%% if the length of <code>Elements</code> is invalid for the given
+%% <code>Type</code>; see <code>data_es/1</code> for arity constraints
+%% on constructor types.
+%%
+%% @see data_type/1
+%% @see data_es/1
+%% @see ann_make_data/3
+%% @see update_data/3
+%% @see make_data_skel/2
+
+make_data(CType, Es) ->
+    ann_make_data([], CType, Es).
+
+
+%% @spec ann_make_data(As::[term()], Type::dtype(),
+%%                     Elements::[cerl()]) -> cerl()
+%% @see make_data/2
+
+ann_make_data(As, {'atomic', V}, []) -> #literal{val = V, ann = As};
+ann_make_data(As, cons, [H, T]) -> ann_c_cons(As, H, T);
+ann_make_data(As, tuple, Es) -> ann_c_tuple(As, Es).
+
+
+%% @spec update_data(Old::cerl(), Type::dtype(),
+%%                   Elements::[cerl()]) -> cerl()
+%% @see make_data/2
+
+update_data(Node, CType, Es) ->
+    ann_make_data(get_ann(Node), CType, Es).
+
+
+%% @spec make_data_skel(Type::dtype(), Elements::[cerl()]) -> cerl()
+%%
+%% @doc Like <code>make_data/2</code>, but analogous to
+%% <code>c_tuple_skel/1</code> and <code>c_cons_skel/2</code>.
+%%
+%% @see ann_make_data_skel/3
+%% @see update_data_skel/3
+%% @see make_data/2
+%% @see c_tuple_skel/1
+%% @see c_cons_skel/2
+
+make_data_skel(CType, Es) ->
+    ann_make_data_skel([], CType, Es).
+
+
+%% @spec ann_make_data_skel(As::[term()], Type::dtype(),
+%%                          Elements::[cerl()]) -> cerl()
+%% @see make_data_skel/2
+
+ann_make_data_skel(As, {'atomic', V}, []) -> #literal{val = V, ann = As};
+ann_make_data_skel(As, cons, [H, T]) -> ann_c_cons_skel(As, H, T);
+ann_make_data_skel(As, tuple, Es) -> ann_c_tuple_skel(As, Es).
+
+
+%% @spec update_data_skel(Old::cerl(), Type::dtype(),
+%%                        Elements::[cerl()]) -> cerl()
+%% @see make_data_skel/2
+
+update_data_skel(Node, CType, Es) ->
+    ann_make_data_skel(get_ann(Node), CType, Es).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec subtrees(Node::cerl()) -> [[cerl()]]
+%%
+%% @doc Returns the grouped list of all subtrees of a node. If
+%% <code>Node</code> is a leaf node (cf. <code>is_leaf/1</code>), this
+%% is the empty list, otherwise the result is always a nonempty list,
+%% containing the lists of subtrees of <code>Node</code>, in
+%% left-to-right order as they occur in the printed program text, and
+%% grouped by category. Often, each group contains only a single
+%% subtree.
+%%
+%% <p>Depending on the type of <code>Node</code>, the size of some
+%% groups may be variable (e.g., the group consisting of all the
+%% elements of a tuple), while others always contain the same number
+%% of elements - usually exactly one (e.g., the group containing the
+%% argument expression of a case-expression). Note, however, that the
+%% exact structure of the returned list (for a given node type) should
+%% in general not be depended upon, since it might be subject to
+%% change without notice.</p>
+%%
+%% <p>The function <code>subtrees/1</code> and the constructor functions
+%% <code>make_tree/2</code> and <code>update_tree/2</code> can be a
+%% great help if one wants to traverse a syntax tree, visiting all its
+%% subtrees, but treat nodes of the tree in a uniform way in most or all
+%% cases. Using these functions makes this simple, and also assures that
+%% your code is not overly sensitive to extensions of the syntax tree
+%% data type, because any node types not explicitly handled by your code
+%% can be left to a default case.</p>
+%%
+%% <p>For example:
+%% <pre>
+%%   postorder(F, Tree) ->
+%%       F(case subtrees(Tree) of
+%%           [] -> Tree;
+%%           List -> update_tree(Tree,
+%%                               [[postorder(F, Subtree)
+%%                                 || Subtree &lt;- Group]
+%%                                || Group &lt;- List])
+%%         end).
+%% </pre>
+%% maps the function <code>F</code> on <code>Tree</code> and all its
+%% subtrees, doing a post-order traversal of the syntax tree. (Note
+%% the use of <code>update_tree/2</code> to preserve annotations.) For
+%% a simple function like:
+%% <pre>
+%%   f(Node) ->
+%%       case type(Node) of
+%%           atom -> atom("a_" ++ atom_name(Node));
+%%           _ -> Node
+%%       end.
+%% </pre>
+%% the call <code>postorder(fun f/1, Tree)</code> will yield a new
+%% representation of <code>Tree</code> in which all atom names have
+%% been extended with the prefix "a_", but nothing else (including
+%% annotations) has been changed.</p>
+%%
+%% @see is_leaf/1
+%% @see make_tree/2
+%% @see update_tree/2
+
+subtrees(T) ->
+    case is_leaf(T) of
+	true ->
+	    [];
+	false ->
+	    case type(T) of
+		values ->
+		    [values_es(T)];
+		binary ->
+		    [binary_segments(T)];
+		bitstr ->
+		    [[bitstr_val(T)], [bitstr_size(T)],
+		     [bitstr_unit(T)], [bitstr_type(T)],
+		     [bitstr_flags(T)]];
+		cons ->
+		    [[cons_hd(T)], [cons_tl(T)]];
+		tuple ->
+		    [tuple_es(T)];
+		'let' ->
+		    [let_vars(T), [let_arg(T)], [let_body(T)]];
+		seq ->
+		    [[seq_arg(T)], [seq_body(T)]];
+		apply ->
+		    [[apply_op(T)], apply_args(T)];
+		call ->
+		    [[call_module(T)], [call_name(T)],
+		     call_args(T)];
+		primop ->
+		    [[primop_name(T)], primop_args(T)];
+		'case' ->
+		    [[case_arg(T)], case_clauses(T)];
+		clause ->
+		    [clause_pats(T), [clause_guard(T)],
+		     [clause_body(T)]];
+		alias ->
+		    [[alias_var(T)], [alias_pat(T)]];
+		'fun' ->
+		    [fun_vars(T), [fun_body(T)]];
+		'receive' ->
+		    [receive_clauses(T), [receive_timeout(T)],
+		     [receive_action(T)]];
+		'try' ->
+		    [[try_arg(T)], try_vars(T), [try_body(T)],
+		     try_evars(T), [try_handler(T)]];
+		'catch' ->
+		    [[catch_body(T)]];
+		letrec ->
+		    Es = unfold_tuples(letrec_defs(T)),
+		    [Es, [letrec_body(T)]];
+		module ->
+		    As = unfold_tuples(module_attrs(T)),
+		    Es = unfold_tuples(module_defs(T)),
+		    [[module_name(T)], module_exports(T), As, Es]
+	    end
+    end.
+
+
+%% @spec update_tree(Old::cerl(), Groups::[[cerl()]]) -> cerl()
+%%
+%% @doc Creates a syntax tree with the given subtrees, and the same
+%% type and annotations as the <code>Old</code> node. This is
+%% equivalent to <code>ann_make_tree(get_ann(Node), type(Node),
+%% Groups)</code>, but potentially more efficient.
+%%
+%% @see update_tree/3
+%% @see ann_make_tree/3
+%% @see get_ann/1
+%% @see type/1
+
+update_tree(Node, Gs) ->
+    ann_make_tree(get_ann(Node), type(Node), Gs).
+
+
+%% @spec update_tree(Old::cerl(), Type::atom(), Groups::[[cerl()]]) ->
+%%           cerl()
+%%
+%% @doc Creates a syntax tree with the given type and subtrees, and
+%% the same annotations as the <code>Old</code> node. This is
+%% equivalent to <code>ann_make_tree(get_ann(Node), Type,
+%% Groups)</code>, but potentially more efficient.
+%%
+%% @see update_tree/2
+%% @see ann_make_tree/3
+%% @see get_ann/1
+
+update_tree(Node, Type, Gs) ->
+    ann_make_tree(get_ann(Node), Type, Gs).
+
+
+%% @spec make_tree(Type::atom(), Groups::[[cerl()]]) -> cerl()
+%%
+%% @doc Creates a syntax tree with the given type and subtrees.
+%% <code>Type</code> must be a node type name
+%% (cf. <code>type/1</code>) that does not denote a leaf node type
+%% (cf. <code>is_leaf/1</code>).  <code>Groups</code> must be a
+%% <em>nonempty</em> list of groups of syntax trees, representing the
+%% subtrees of a node of the given type, in left-to-right order as
+%% they would occur in the printed program text, grouped by category
+%% as done by <code>subtrees/1</code>.
+%%
+%% <p>The result of <code>ann_make_tree(get_ann(Node), type(Node),
+%% subtrees(Node))</code> (cf. <code>update_tree/2</code>) represents
+%% the same source code text as the original <code>Node</code>,
+%% assuming that <code>subtrees(Node)</code> yields a nonempty
+%% list. However, it does not necessarily have the exact same data
+%% representation as <code>Node</code>.</p>
+%%
+%% @see ann_make_tree/3
+%% @see type/1
+%% @see is_leaf/1
+%% @see subtrees/1
+%% @see update_tree/2
+
+make_tree(Type, Gs) ->
+    ann_make_tree([], Type, Gs).
+
+
+%% @spec ann_make_tree(As::[term()], Type::atom(),
+%%                     Groups::[[cerl()]]) -> cerl()
+%%
+%% @doc Creates a syntax tree with the given annotations, type and
+%% subtrees. See <code>make_tree/2</code> for details.
+%%
+%% @see make_tree/2
+
+ann_make_tree(As, values, [Es]) -> ann_c_values(As, Es);
+ann_make_tree(As, binary, [Ss]) -> ann_c_binary(As, Ss);
+ann_make_tree(As, bitstr, [[V],[S],[U],[T],[Fs]]) ->
+    ann_c_bitstr(As, V, S, U, T, Fs);
+ann_make_tree(As, cons, [[H], [T]]) -> ann_c_cons(As, H, T);
+ann_make_tree(As, tuple, [Es]) -> ann_c_tuple(As, Es);
+ann_make_tree(As, 'let', [Vs, [A], [B]]) -> ann_c_let(As, Vs, A, B);
+ann_make_tree(As, seq, [[A], [B]]) -> ann_c_seq(As, A, B);
+ann_make_tree(As, apply, [[Op], Es]) -> ann_c_apply(As, Op, Es);
+ann_make_tree(As, call, [[M], [N], Es]) -> ann_c_call(As, M, N, Es);
+ann_make_tree(As, primop, [[N], Es]) -> ann_c_primop(As, N, Es);
+ann_make_tree(As, 'case', [[A], Cs]) -> ann_c_case(As, A, Cs);
+ann_make_tree(As, clause, [Ps, [G], [B]]) -> ann_c_clause(As, Ps, G, B);
+ann_make_tree(As, alias, [[V], [P]]) -> ann_c_alias(As, V, P);
+ann_make_tree(As, 'fun', [Vs, [B]]) -> ann_c_fun(As, Vs, B);
+ann_make_tree(As, 'receive', [Cs, [T], [A]]) ->
+    ann_c_receive(As, Cs, T, A);
+ann_make_tree(As, 'try', [[E], Vs, [B], Evs, [H]]) ->
+    ann_c_try(As, E, Vs, B, Evs, H);
+ann_make_tree(As, 'catch', [[B]]) -> ann_c_catch(As, B);
+ann_make_tree(As, letrec, [Es, [B]]) ->
+    ann_c_letrec(As, fold_tuples(Es), B);
+ann_make_tree(As, module, [[N], Xs, Es, Ds]) ->
+    ann_c_module(As, N, Xs, fold_tuples(Es), fold_tuples(Ds)).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec meta(Tree::cerl()) -> cerl()
+%%
+%% @doc Creates a meta-representation of a syntax tree. The result
+%% represents an Erlang expression "<code><em>MetaTree</em></code>"
+%% which, if evaluated, will yield a new syntax tree representing the
+%% same source code text as <code>Tree</code> (although the actual
+%% data representation may be different). The expression represented
+%% by <code>MetaTree</code> is <em>implementation independent</em>
+%% with regard to the data structures used by the abstract syntax tree
+%% implementation.
+%%
+%% <p>Any node in <code>Tree</code> whose node type is
+%% <code>var</code> (cf. <code>type/1</code>), and whose list of
+%% annotations (cf. <code>get_ann/1</code>) contains the atom
+%% <code>meta_var</code>, will remain unchanged in the resulting tree,
+%% except that exactly one occurrence of <code>meta_var</code> is
+%% removed from its annotation list.</p>
+%%
+%% <p>The main use of the function <code>meta/1</code> is to transform
+%% a data structure <code>Tree</code>, which represents a piece of
+%% program code, into a form that is <em>representation independent
+%% when printed</em>. E.g., suppose <code>Tree</code> represents a
+%% variable named "V". Then (assuming a function <code>print/1</code>
+%% for printing syntax trees), evaluating
+%% <code>print(abstract(Tree))</code> - simply using
+%% <code>abstract/1</code> to map the actual data structure onto a
+%% syntax tree representation - would output a string that might look
+%% something like "<code>{var, ..., 'V'}</code>", which is obviously
+%% dependent on the implementation of the abstract syntax trees. This
+%% could e.g. be useful for caching a syntax tree in a file. However,
+%% in some situations like in a program generator generator (with two
+%% "generator"), it may be unacceptable.  Using
+%% <code>print(meta(Tree))</code> instead would output a
+%% <em>representation independent</em> syntax tree generating
+%% expression; in the above case, something like
+%% "<code>cerl:c_var('V')</code>".</p>
+%%
+%% <p>The implementation tries to generate compact code with respect
+%% to literals and lists.</p>
+%%
+%% @see abstract/1
+%% @see type/1
+%% @see get_ann/1
+
+meta(Node) ->
+    %% First of all we check for metavariables:
+    case type(Node) of
+	var ->
+	    case lists:member(meta_var, get_ann(Node)) of
+		false ->
+		    meta_0(var, Node);
+		true ->
+		    %% A meta-variable: remove the first found
+		    %% 'meta_var' annotation, but otherwise leave
+		    %% the node unchanged.
+		    set_ann(Node, lists:delete(meta_var, get_ann(Node)))
+	    end;
+	Type ->
+	    meta_0(Type, Node)
+    end.
+
+meta_0(Type, Node) ->
+    case get_ann(Node) of
+	[] ->
+	    meta_1(Type, Node);
+	As ->
+	    meta_call(set_ann, [meta_1(Type, Node), abstract(As)])
+    end.
+
+meta_1(literal, Node) ->
+    %% We handle atomic literals separately, to get a bit
+    %% more compact code. For the rest, we use 'abstract'.
+    case concrete(Node) of
+	V when atom(V) ->
+	    meta_call(c_atom, [Node]);
+	V when integer(V) ->
+	    meta_call(c_int, [Node]);
+	V when float(V) ->
+	    meta_call(c_float, [Node]);
+	[] ->
+	    meta_call(c_nil, []);
+	_ ->
+	    meta_call(abstract, [Node])
+    end;
+meta_1(var, Node) ->
+    %% A normal variable or function name.
+    meta_call(c_var, [abstract(var_name(Node))]);
+meta_1(values, Node) ->
+    meta_call(c_values,
+	      [make_list(meta_list(values_es(Node)))]);
+meta_1(binary, Node) ->
+    meta_call(c_binary,
+	      [make_list(meta_list(binary_segments(Node)))]);
+meta_1(bitstr, Node) ->
+    meta_call(c_bitstr,
+	      [meta(bitstr_val(Node)),
+	       meta(bitstr_size(Node)),
+	       meta(bitstr_unit(Node)),
+	       meta(bitstr_type(Node)),
+	       meta(bitstr_flags(Node))]);
+meta_1(cons, Node) ->
+    %% The list is split up if some sublist has annotatations. If
+    %% we get exactly one element, we generate a 'c_cons' call
+    %% instead of 'make_list' to reconstruct the node.
+    case split_list(Node) of
+	{[H], none} ->
+	    meta_call(c_cons, [meta(H), meta(c_nil())]);
+	{[H], Node1} ->
+	    meta_call(c_cons, [meta(H), meta(Node1)]);
+	{L, none} ->
+	    meta_call(make_list, [make_list(meta_list(L))]);
+	{L, Node1} ->
+	    meta_call(make_list,
+		      [make_list(meta_list(L)), meta(Node1)])
+    end;
+meta_1(tuple, Node) ->
+    meta_call(c_tuple,
+	      [make_list(meta_list(tuple_es(Node)))]);
+meta_1('let', Node) ->
+    meta_call(c_let,
+	      [make_list(meta_list(let_vars(Node))),
+	       meta(let_arg(Node)), meta(let_body(Node))]);
+meta_1(seq, Node) ->
+    meta_call(c_seq,
+	      [meta(seq_arg(Node)), meta(seq_body(Node))]);
+meta_1(apply, Node) ->
+    meta_call(c_apply,
+	      [meta(apply_op(Node)),
+	       make_list(meta_list(apply_args(Node)))]);
+meta_1(call, Node) ->
+    meta_call(c_call,
+	      [meta(call_module(Node)), meta(call_name(Node)),
+	       make_list(meta_list(call_args(Node)))]);
+meta_1(primop, Node) ->
+    meta_call(c_primop,
+	      [meta(primop_name(Node)),
+	       make_list(meta_list(primop_args(Node)))]);
+meta_1('case', Node) ->
+    meta_call(c_case,
+	      [meta(case_arg(Node)),
+	       make_list(meta_list(case_clauses(Node)))]);
+meta_1(clause, Node) ->
+    meta_call(c_clause,
+	      [make_list(meta_list(clause_pats(Node))),
+	       meta(clause_guard(Node)),
+	       meta(clause_body(Node))]);
+meta_1(alias, Node) ->
+    meta_call(c_alias,
+	      [meta(alias_var(Node)), meta(alias_pat(Node))]);
+meta_1('fun', Node) ->
+    meta_call(c_fun,
+	      [make_list(meta_list(fun_vars(Node))),
+	       meta(fun_body(Node))]);
+meta_1('receive', Node) ->
+    meta_call(c_receive,
+	      [make_list(meta_list(receive_clauses(Node))),
+	       meta(receive_timeout(Node)),
+	       meta(receive_action(Node))]);
+meta_1('try', Node) ->
+    meta_call(c_try,
+	      [meta(try_arg(Node)),
+	       make_list(meta_list(try_vars(Node))),
+	       meta(try_body(Node)),
+	       make_list(meta_list(try_evars(Node))),
+	       meta(try_handler(Node))]);
+meta_1('catch', Node) ->
+    meta_call(c_catch, [meta(catch_body(Node))]);
+meta_1(letrec, Node) ->
+    meta_call(c_letrec,
+	      [make_list([c_tuple([meta(N), meta(F)])
+			  || {N, F} <- letrec_defs(Node)]),
+	       meta(letrec_body(Node))]);
+meta_1(module, Node) ->
+    meta_call(c_module,
+	      [meta(module_name(Node)),
+	       make_list(meta_list(module_exports(Node))),
+	       make_list([c_tuple([meta(A), meta(V)])
+			  || {A, V} <- module_attrs(Node)]),
+	       make_list([c_tuple([meta(N), meta(F)])
+			  || {N, F} <- module_defs(Node)])]).
+
+meta_call(F, As) ->
+    c_call(c_atom(?MODULE), c_atom(F), As).
+
+meta_list([T | Ts]) ->
+    [meta(T) | meta_list(Ts)];
+meta_list([]) ->
+    [].
+
+split_list(Node) ->
+    split_list(set_ann(Node, []), []).
+
+split_list(Node, L) ->
+    A = get_ann(Node),
+    case type(Node) of
+	cons when A == [] ->
+	    split_list(cons_tl(Node), [cons_hd(Node) | L]);
+	nil when A == [] ->
+	    {lists:reverse(L), none};
+	_ ->
+	    {lists:reverse(L), Node}
+    end.
+
+
+%% ---------------------------------------------------------------------
+
+%% General utilities
+
+is_lit_list([#literal{} | Es]) ->
+    is_lit_list(Es);
+is_lit_list([_ | _]) ->
+    false;
+is_lit_list([]) ->
+    true.
+
+lit_list_vals([#literal{val = V} | Es]) ->
+    [V | lit_list_vals(Es)];
+lit_list_vals([]) ->
+    [].
+
+make_lit_list([V | Vs]) ->
+    [#literal{val = V} | make_lit_list(Vs)];
+make_lit_list([]) ->
+    [].
+
+%% The following tests are the same as done by 'io_lib:char_list' and
+%% 'io_lib:printable_list', respectively, but for a single character.
+
+is_char_value(V) when V >= $\000, V =< $\377 -> true;
+is_char_value(_) -> false.
+
+is_print_char_value(V) when V >= $\040, V =< $\176 -> true;
+is_print_char_value(V) when V >= $\240, V =< $\377 -> true;
+is_print_char_value(V) when V =:= $\b -> true;
+is_print_char_value(V) when V =:= $\d -> true;
+is_print_char_value(V) when V =:= $\e -> true;
+is_print_char_value(V) when V =:= $\f -> true;
+is_print_char_value(V) when V =:= $\n -> true;
+is_print_char_value(V) when V =:= $\r -> true;
+is_print_char_value(V) when V =:= $\s -> true;
+is_print_char_value(V) when V =:= $\t -> true;
+is_print_char_value(V) when V =:= $\v -> true;
+is_print_char_value(V) when V =:= $\" -> true;
+is_print_char_value(V) when V =:= $\' -> true;
+is_print_char_value(V) when V =:= $\\ -> true;
+is_print_char_value(_) -> false.
+
+is_char_list([V | Vs]) when integer(V) ->
+    case is_char_value(V) of
+	true ->
+	    is_char_list(Vs);
+	false ->
+	    false
+    end;
+is_char_list([]) ->
+    true;
+is_char_list(_) ->
+    false.
+
+is_print_char_list([V | Vs]) when integer(V) ->
+    case is_print_char_value(V) of
+	true ->
+	    is_print_char_list(Vs);
+	false ->
+	    false
+    end;
+is_print_char_list([]) ->
+    true;
+is_print_char_list(_) ->
+    false.
+
+unfold_tuples([{X, Y} | Ps]) ->
+    [X, Y | unfold_tuples(Ps)];
+unfold_tuples([]) ->
+    [].
+
+fold_tuples([X, Y | Es]) ->
+    [{X, Y} | fold_tuples(Es)];
+fold_tuples([]) ->
+    [].
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_clauses.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_clauses.erl
new file mode 100644
index 0000000000..16e4b37a10
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_clauses.erl
@@ -0,0 +1,409 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Richard Carlsson.
+%% Copyright (C) 1999-2002 Richard Carlsson.
+%% Portions created by Ericsson are Copyright 2001, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: cerl_clauses.erl,v 1.2 2009/09/17 09:46:19 kostis Exp $
+
+%% @doc Utility functions for Core Erlang case/receive clauses.
+%%
+%% <p>Syntax trees are defined in the module <a
+%% href=""><code>cerl</code></a>.</p>
+%%
+%% @type cerl() = cerl:cerl()
+
+-module(cerl_clauses).
+
+-export([any_catchall/1, eval_guard/1, is_catchall/1, match/2,
+	 match_list/2, reduce/1, reduce/2]).
+
+-import(cerl, [alias_pat/1, alias_var/1, data_arity/1, data_es/1,
+	       data_type/1, clause_guard/1, clause_pats/1, concrete/1,
+	       is_data/1, is_c_var/1, let_body/1, letrec_body/1,
+	       seq_body/1, try_arg/1, type/1, values_es/1]).
+
+-import(lists, [reverse/1]).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec is_catchall(Clause::cerl()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if an abstract clause is a
+%% catch-all, otherwise <code>false</code>. A clause is a catch-all if
+%% all its patterns are variables, and its guard expression always
+%% evaluates to <code>true</code>; cf. <code>eval_guard/1</code>.
+%%
+%% <p>Note: <code>Clause</code> must have type
+%% <code>clause</code>.</p>
+%%
+%% @see eval_guard/1
+%% @see any_catchall/1
+
+is_catchall(C) ->
+    case all_vars(clause_pats(C)) of
+	true ->
+	    case eval_guard(clause_guard(C)) of
+		{value, true} ->
+		    true;
+		_ ->
+		    false
+	    end;
+	false ->
+	    false
+    end.
+
+all_vars([C | Cs]) ->
+    case is_c_var(C) of
+	true ->
+	    all_vars(Cs);
+	false ->
+	    false
+    end;
+all_vars([]) ->
+    true.
+
+
+%% @spec any_catchall(Clauses::[cerl()]) -> boolean()
+%%
+%% @doc Returns <code>true</code> if any of the abstract clauses in
+%% the list is a catch-all, otherwise <code>false</code>.  See
+%% <code>is_catchall/1</code> for details.
+%%
+%% <p>Note: each node in <code>Clauses</code> must have type
+%% <code>clause</code>.</p>
+%%
+%% @see is_catchall/1
+
+any_catchall([C | Cs]) ->
+    case is_catchall(C) of
+	true ->
+	    true;
+	false ->
+	    any_catchall(Cs)
+    end;
+any_catchall([]) ->
+    false.
+
+
+%% @spec eval_guard(Expr::cerl()) -> none | {value, term()}
+%%
+%% @doc Tries to reduce a guard expression to a single constant value,
+%% if possible. The returned value is <code>{value, Term}</code> if the
+%% guard expression <code>Expr</code> always yields the constant value
+%% <code>Term</code>, and is otherwise <code>none</code>.
+%%
+%% <p>Note that although guard expressions should only yield boolean
+%% values, this function does not guarantee that <code>Term</code> is
+%% either <code>true</code> or <code>false</code>. Also note that only
+%% simple constructs like let-expressions are examined recursively;
+%% general constant folding is not performed.</p>
+%%
+%% @see is_catchall/1
+
+%% This function could possibly be improved further, but constant
+%% folding should in general be performed elsewhere.
+
+eval_guard(E) ->
+    case type(E) of
+	literal ->
+	    {value, concrete(E)};
+	values ->
+	    case values_es(E) of
+		[E1] ->
+		    eval_guard(E1);
+		_ ->
+		    none
+	    end;
+	'try' ->
+	    eval_guard(try_arg(E));
+	seq ->
+	    eval_guard(seq_body(E));
+	'let' ->
+	    eval_guard(let_body(E));
+	'letrec' ->
+	    eval_guard(letrec_body(E));
+	_ ->
+	    none
+    end.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec reduce(Clauses) -> {true, {Clauses, Bindings}}
+%%                        | {false, Clauses}
+%%
+%% @equiv reduce(Cs, [])
+
+reduce(Cs) ->
+    reduce(Cs, []).
+
+%% @spec reduce(Clauses::[Clause], Exprs::[Expr]) ->
+%%           {true, {Clause, Bindings}}
+%%         | {false, [Clause]}
+%%
+%%    Clause = cerl()
+%%    Expr = any | cerl()
+%%    Bindings = [{cerl(), cerl()}]
+%%
+%% @doc Selects a single clause, if possible, or otherwise reduces the
+%% list of selectable clauses. The input is a list <code>Clauses</code>
+%% of abstract clauses (i.e., syntax trees of type <code>clause</code>),
+%% and a list of switch expressions <code>Exprs</code>. The function
+%% tries to uniquely select a single clause or discard unselectable
+%% clauses, with respect to the switch expressions. All abstract clauses
+%% in the list must have the same number of patterns. If
+%% <code>Exprs</code> is not the empty list, it must have the same
+%% length as the number of patterns in each clause; see
+%% <code>match_list/2</code> for details.
+%%
+%% <p>A clause can only be selected if its guard expression always
+%% yields the atom <code>true</code>, and a clause whose guard
+%% expression always yields the atom <code>false</code> can never be
+%% selected. Other guard expressions are considered to have unknown
+%% value; cf. <code>eval_guard/1</code>.</p>
+%%
+%% <p>If a particular clause can be selected, the function returns
+%% <code>{true, {Clause, Bindings}}</code>, where <code>Clause</code> is
+%% the selected clause and <code>Bindings</code> is a list of pairs
+%% <code>{Var, SubExpr}</code> associating the variables occurring in
+%% the patterns of <code>Clause</code> with the corresponding
+%% subexpressions in <code>Exprs</code>. The list of bindings is given
+%% in innermost-first order; see the <code>match/2</code> function for
+%% details.</p>
+%%
+%% <p>If no clause could be definitely selected, the function returns
+%% <code>{false, NewClauses}</code>, where <code>NewClauses</code> is
+%% the list of entries in <code>Clauses</code> that remain after
+%% eliminating unselectable clauses, preserving the relative order.</p>
+%%
+%% @see eval_guard/1
+%% @see match/2
+%% @see match_list/2
+
+reduce(Cs, Es) ->
+    reduce(Cs, Es, []).
+
+reduce([C | Cs], Es, Cs1) ->
+    Ps = clause_pats(C),
+    case match_list(Ps, Es) of
+	none ->
+	    %% Here, we know that the current clause cannot possibly be
+	    %% selected, so we drop it and visit the rest.
+	    reduce(Cs, Es, Cs1);
+	{false, _} ->
+	    %% We are not sure if this clause might be selected, so we
+	    %% save it and visit the rest.
+	    reduce(Cs, Es, [C | Cs1]);
+	{true, Bs} ->
+	    case eval_guard(clause_guard(C)) of
+		{value, true} when Cs1 == [] ->
+		    %% We have a definite match - we return the residual
+		    %% expression and signal that a selection has been
+		    %% made. All other clauses are dropped.
+		    {true, {C, Bs}};
+		{value, true} ->
+		    %% Unless one of the previous clauses is selected,
+		    %% this clause will definitely be, so we can drop
+		    %% the rest.
+		    {false, reverse([C | Cs1])};
+		{value, false} ->
+		    %% This clause can never be selected, since its
+		    %% guard is never 'true', so we drop it.
+		    reduce(Cs, Es, Cs1);
+		_ ->
+		    %% We are not sure if this clause might be selected
+		    %% (or might even cause a crash), so we save it and
+		    %% visit the rest.
+		    reduce(Cs, Es, [C | Cs1])
+	    end
+    end;
+reduce([], _, Cs) ->
+    %% All clauses visited, without a complete match. Signal "not
+    %% reduced" and return the saved clauses, in the correct order.
+    {false, reverse(Cs)}.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec match(Pattern::cerl(), Expr) ->
+%%           none | {true, Bindings} | {false, Bindings}
+%%
+%%     Expr = any | cerl()
+%%     Bindings = [{cerl(), Expr}]
+%%
+%% @doc Matches a pattern against an expression. The returned value is
+%% <code>none</code> if a match is impossible, <code>{true,
+%% Bindings}</code> if <code>Pattern</code> definitely matches
+%% <code>Expr</code>, and <code>{false, Bindings}</code> if a match is
+%% not definite, but cannot be excluded. <code>Bindings</code> is then
+%% a list of pairs <code>{Var, SubExpr}</code>, associating each
+%% variable in the pattern with either the corresponding subexpression
+%% of <code>Expr</code>, or with the atom <code>any</code> if no
+%% matching subexpression exists. (Recall that variables may not be
+%% repeated in a Core Erlang pattern.) The list of bindings is given
+%% in innermost-first order; this should only be of interest if
+%% <code>Pattern</code> contains one or more alias patterns. If the
+%% returned value is <code>{true, []}</code>, it implies that the
+%% pattern and the expression are syntactically identical.
+%%
+%% <p>Instead of a syntax tree, the atom <code>any</code> can be
+%% passed for <code>Expr</code> (or, more generally, be used for any
+%% subtree of <code>Expr</code>, in as much the abstract syntax tree
+%% implementation allows it); this means that it cannot be decided
+%% whether the pattern will match or not, and the corresponding
+%% variable bindings will all map to <code>any</code>. The typical use
+%% is for producing bindings for <code>receive</code> clauses.</p>
+%%
+%% <p>Note: Binary-syntax patterns are never structurally matched
+%% against binary-syntax expressions by this function.</p>
+%%
+%% <p>Examples:
+%% <ul>
+%%   <li>Matching a pattern "<code>{X, Y}</code>" against the
+%%   expression "<code>{foo, f(Z)}</code>" yields <code>{true,
+%%   Bindings}</code> where <code>Bindings</code> associates
+%%   "<code>X</code>" with the subtree "<code>foo</code>" and
+%%   "<code>Y</code>" with the subtree "<code>f(Z)</code>".</li>
+%%
+%%   <li>Matching pattern "<code>{X, {bar, Y}}</code>" against
+%%   expression "<code>{foo, f(Z)}</code>" yields <code>{false,
+%%   Bindings}</code> where <code>Bindings</code> associates
+%%   "<code>X</code>" with the subtree "<code>foo</code>" and
+%%   "<code>Y</code>" with <code>any</code> (because it is not known
+%%   if "<code>{foo, Y}</code>" might match the run-time value of
+%%   "<code>f(Z)</code>" or not).</li>
+%%
+%%   <li>Matching pattern "<code>{foo, bar}</code>" against expression
+%%   "<code>{foo, f()}</code>" yields <code>{false, []}</code>,
+%%   telling us that there might be a match, but we cannot deduce any
+%%   bindings.</li>
+%%
+%%   <li>Matching <code>{foo, X = {bar, Y}}</code> against expression
+%%   "<code>{foo, {bar, baz}}</code>" yields <code>{true,
+%%   Bindings}</code> where <code>Bindings</code> associates
+%%   "<code>Y</code>" with "<code>baz</code>", and "<code>X</code>"
+%%   with "<code>{bar, baz}</code>".</li>
+%%
+%%   <li>Matching a pattern "<code>{X, Y}</code>" against
+%%   <code>any</code> yields <code>{false, Bindings}</code> where
+%%   <code>Bindings</code> associates both "<code>X</code>" and
+%%   "<code>Y</code>" with <code>any</code>.</li>
+%% </ul></p>
+
+match(P, E) ->
+    match(P, E, []).
+
+match(P, E, Bs) ->
+    case type(P) of
+	var ->
+	    %% Variables always match, since they cannot have repeated
+	    %% occurrences in a pattern.
+	    {true, [{P, E} | Bs]};
+	alias ->
+	    %% All variables in P1 will be listed before the alias
+	    %% variable in the result.
+	    match(alias_pat(P), E, [{alias_var(P), E} | Bs]);
+	binary ->
+	    %% The most we can do is to say "definitely no match" if a
+	    %% binary pattern is matched against non-binary data.
+	    if E == any ->
+		    {false, Bs};
+	       true ->
+		    case is_data(E) of
+			true ->
+			    none;
+			false ->
+			    {false, Bs}
+		    end
+	    end;
+	_ ->
+	    match_1(P, E, Bs)
+    end.
+
+match_1(P, E, Bs) ->
+    case is_data(P) of
+	true when E == any ->
+	    %% If we don't know the structure of the value of E at this
+	    %% point, we just match the subpatterns against 'any', and
+	    %% make sure the result is a "maybe".
+	    Ps = data_es(P),
+	    Es = lists:duplicate(length(Ps), any),
+	    case match_list(Ps, Es, Bs) of
+		{_, Bs1} ->
+		    {false, Bs1};
+		none ->
+		    none
+	    end;
+	true ->
+	    %% Test if the expression represents a constructor
+	    case is_data(E) of
+		true ->
+		    T1 = {data_type(E), data_arity(E)},
+		    T2 = {data_type(P), data_arity(P)},
+		    %% Note that we must test for exact equality.
+		    if T1 =:= T2 ->
+			    match_list(data_es(P), data_es(E), Bs);
+		       true ->
+			    none
+		    end;
+		false ->
+		    %% We don't know the run-time structure of E, and P
+		    %% is not a variable or an alias pattern, so we
+		    %% match against 'any' instead.
+		    match_1(P, any, Bs)
+	    end;
+	false ->
+	    %% Strange pattern - give up, but don't say "no match".
+	    {false, Bs}
+    end.
+
+
+%% @spec match_list(Patterns::[cerl()], Exprs::[Expr]) ->
+%%           none | {true, Bindings} | {false, Bindings}
+%%
+%%     Expr = any | cerl()
+%%     Bindings = [{cerl(), cerl()}]
+%%
+%% @doc Like <code>match/2</code>, but matching a sequence of patterns
+%% against a sequence of expressions. Passing an empty list for
+%% <code>Exprs</code> is equivalent to passing a list of
+%% <code>any</code> atoms of the same length as <code>Patterns</code>.
+%%
+%% @see match/2
+
+match_list([], []) ->
+    {true, []};    % no patterns always match
+match_list(Ps, []) ->
+    match_list(Ps, lists:duplicate(length(Ps), any), []);
+match_list(Ps, Es) ->
+    match_list(Ps, Es, []).
+
+match_list([P | Ps], [E | Es], Bs) ->
+    case match(P, E, Bs) of
+	{true, Bs1} ->
+	    match_list(Ps, Es, Bs1);
+	{false, Bs1} ->
+	    %% Make sure "maybe" is preserved
+	    case match_list(Ps, Es, Bs1) of
+		{_, Bs2} ->
+		    {false, Bs2};
+		none ->
+		    none
+	    end;
+	none ->
+	    none
+    end;
+match_list([], [], Bs) ->
+    {true, Bs}.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_inline.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_inline.erl
new file mode 100644
index 0000000000..cd332279d1
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_inline.erl
@@ -0,0 +1,2762 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Richard Carlsson.
+%% Copyright (C) 1999-2002 Richard Carlsson.
+%% Portions created by Ericsson are Copyright 2001, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: cerl_inline.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
+%%
+%% Core Erlang inliner.
+
+%% =====================================================================
+%%
+%% This is an implementation of the algorithm by Waddell and Dybvig
+%% ("Fast and Effective Procedure Inlining", International Static
+%% Analysis Symposium 1997), adapted to the Core Erlang language.
+%%
+%% Instead of always renaming variables and function variables, this
+%% implementation uses the "no-shadowing strategy" of Peyton Jones and
+%% Marlow ("Secrets of the Glasgow Haskell Compiler Inliner", 1999).
+%%
+%% =====================================================================
+
+%% TODO: inline single-source-reference operands without size limit.
+
+-module(cerl_inline).
+
+-export([core_transform/2, transform/1, transform/2]).
+
+-import(cerl, [abstract/1, alias_pat/1, alias_var/1, apply_args/1,
+	       apply_op/1, atom_name/1, atom_val/1, bitstr_val/1,
+	       bitstr_size/1, bitstr_unit/1, bitstr_type/1,
+	       bitstr_flags/1, binary_segments/1, update_c_alias/3,
+	       update_c_apply/3, update_c_binary/2, update_c_bitstr/6,
+	       update_c_call/4, update_c_case/3, update_c_catch/2,
+	       update_c_clause/4, c_fun/2, c_int/1, c_let/3,
+	       update_c_let/4, update_c_letrec/3, update_c_module/5,
+	       update_c_primop/3, update_c_receive/4, update_c_seq/3,
+	       c_seq/2, update_c_try/6, c_tuple/1, update_c_values/2,
+	       c_values/1, c_var/1, call_args/1, call_module/1,
+	       call_name/1, case_arity/1, case_arg/1, case_clauses/1,
+	       catch_body/1, clause_body/1, clause_guard/1,
+	       clause_pats/1, clause_vars/1, concrete/1, cons_hd/1,
+	       cons_tl/1, data_arity/1, data_es/1, data_type/1,
+	       fun_body/1, fun_vars/1, get_ann/1, int_val/1,
+	       is_c_atom/1, is_c_cons/1, is_c_fun/1, is_c_int/1,
+	       is_c_list/1, is_c_seq/1, is_c_tuple/1, is_c_var/1,
+	       is_data/1, is_literal/1, is_literal_term/1, let_arg/1,
+	       let_body/1, let_vars/1, letrec_body/1, letrec_defs/1,
+	       list_length/1, list_elements/1, update_data/3,
+	       make_list/1, make_data_skel/2, module_attrs/1,
+	       module_defs/1, module_exports/1, module_name/1,
+	       primop_args/1, primop_name/1, receive_action/1,
+	       receive_clauses/1, receive_timeout/1, seq_arg/1,
+	       seq_body/1, set_ann/2, try_arg/1, try_body/1, try_vars/1,
+	       try_evars/1, try_handler/1, tuple_es/1, tuple_arity/1,
+	       type/1, values_es/1, var_name/1]).
+
+-import(lists, [foldl/3, foldr/3, mapfoldl/3, reverse/1]).
+
+%%
+%% Constants
+%%
+
+debug_runtime() -> false.
+debug_counters() -> false.
+
+%% Normal execution times for inlining are between 0.1 and 0.3 seconds
+%% (on the author's current equipment). The default effort limit of 150
+%% is high enough that most normal programs never hit the limit even
+%% once, and for difficult programs, it generally keeps the execution
+%% times below 2-5 seconds. Using an effort counter of 1000 will thus
+%% have no further effect on most programs, but some programs may take
+%% as much as 10 seconds or more. Effort counts larger than 2500 have
+%% never been observed even on very ill-conditioned programs.
+%%
+%% Size limits between 6 and 18 tend to actually shrink the code,
+%% because of the simplifications made possible by inlining. A limit of
+%% 16 seems to be optimal for this purpose, often shrinking the
+%% executable code by up to 10%. Size limits between 18 and 30 generally
+%% give the same code size as if no inlining was done (i.e., code
+%% duplication balances out the simplifications at these levels). A size
+%% limit between 1 and 5 tends to inline small functions and propagate
+%% constants, but does not cause much simplifications do be done, so the
+%% net effect will be a slight increase in code size. For size limits
+%% above 30, the executable code size tends to increase with about 10%
+%% per 100 units, with some variations depending on the sizes of
+%% functions in the source code.
+%%
+%% Typically, about 90% of the maximum speedup achievable is already
+%% reached using a size limit of 30, and 98% is reached at limits around
+%% 100-150; there is rarely any point in letting the code size increase
+%% by more than 10-15%. If too large functions are inlined, cache
+%% effects will slow the program down.
+
+default_effort() -> 150.
+default_size() -> 24.
+
+%% Base costs/weights for different kinds of expressions. If these are
+%% modified, the size limits above may have to be adjusted.
+
+weight(var) -> 0;	% We count no cost for variable accesses.
+weight(values) -> 0;	% Value aggregates have no cost in themselves.
+weight(literal) -> 1;	% We assume efficient handling of constants.
+weight(data) -> 1;	% Base cost; add 1 per element.
+weight(element) -> 1;   % Cost of storing/fetching an element.
+weight(argument) -> 1;  % Cost of passing a function argument.
+weight('fun') -> 6;	% Base cost + average number of free vars.
+weight('let') -> 0;	% Count no cost for let-bindings.
+weight(letrec) -> 0;    % Like a let-binding.
+weight('case') -> 0;	% Case switches have no base cost.
+weight(clause) -> 1;    % Count one jump at the end of each clause body.
+weight('receive') -> 9;	% Initialization/cleanup cost.
+weight('try') -> 1;	% Assume efficient implementation.
+weight('catch') -> 1;	% See `try'.
+weight(apply) -> 3;     % Average base cost: call/return.
+weight(call) -> 3;      % Assume remote-calls as efficient as `apply'.
+weight(primop) -> 2;    % Assume more efficient than `apply'.
+weight(binary) -> 4;    % Initialisation base cost.
+weight(bitstr) -> 3;   % Coding/decoding a value; like a primop.
+weight(module) -> 1.    % Like a letrec with a constant body
+
+%% These "reference" structures are used for variables and function
+%% variables. They keep track of the variable name, any bound operand,
+%% and the associated store location.
+
+-record(ref, {name, opnd, loc}).
+
+%% Operand structures contain the operand expression, the renaming and
+%% environment, the state location, and the effort counter at the call
+%% site (cf. `visit').
+
+-record(opnd, {expr, ren, env, loc, effort}).
+
+%% Since expressions are only visited in `effect' context when they are
+%% not bound to a referenced variable, only expressions visited in
+%% 'value' context are cached.
+
+-record(cache, {expr, size}).
+
+%% The context flags for an application structure are kept separate from
+%% the structure itself. Note that the original algorithm had exactly
+%% one operand in each application context structure, while we can have
+%% several, or none.
+
+-record(app, {opnds, ctxt, loc}).
+
+
+%%
+%% Interface functions
+%%
+
+%% Use compile option `{core_transform, inline}' to insert this as a
+%% compilation pass.
+
+core_transform(Code, Opts) ->
+    cerl:to_records(transform(cerl:from_records(Code), Opts)).
+
+transform(Tree) ->
+    transform(Tree, []).
+
+transform(Tree, Opts) ->
+    main(Tree, value, Opts).
+
+main(Tree, Ctxt, Opts) ->
+    %% We spawn a new process to do the work, so we don't have to worry
+    %% about cluttering the process dictionary with debugging info, or
+    %% proper deallocation of ets-tables.
+    Opts1 = Opts ++ [{inline_size, default_size()},
+		     {inline_effort, default_effort()}],
+    Reply = self(),
+    Pid = spawn_link(fun () -> start(Reply, Tree, Ctxt, Opts1) end),
+    receive
+        {Pid1, Tree1} when Pid1 == Pid ->
+            Tree1
+    end.
+
+start(Reply, Tree, Ctxt, Opts) ->
+    init_debug(),
+    case debug_runtime() of
+        true ->
+            put(inline_start_time,
+                element(1, erlang:statistics(runtime)));
+        _ ->
+            ok
+    end,
+    Size = max(1, proplists:get_value(inline_size, Opts)),
+    Effort = max(1, proplists:get_value(inline_effort, Opts)),
+    case proplists:get_bool(verbose, Opts) of
+	true ->
+	    io:fwrite("Inlining: inline_size=~w inline_effort=~w\n",
+		      [Size, Effort]);
+	false ->
+	    ok
+    end,
+
+    %% Note that the counters of the new state are passive.
+    S = st__new(Effort, Size),
+
+%%% Initialization is not needed at present. Note that the code in
+%%% `inline_init' is not up-to-date with this module.
+%%%     {Tree1, S1} = inline_init:init(Tree, S),
+%%%     {Tree2, _S2} = i(Tree1, Ctxt, S1),
+    {Tree2, _S2} = i(Tree, Ctxt, S),
+    report_debug(),
+    Reply ! {self(), Tree2}.
+
+init_debug() ->
+    case debug_counters() of
+        true ->
+            put(counter_effort_triggers, 0),
+            put(counter_effort_max, 0),
+            put(counter_size_triggers, 0),
+            put(counter_size_max, 0);
+        _ ->
+            ok
+    end.
+
+report_debug() ->
+    case debug_runtime() of
+        true ->
+            {Time, _} = erlang:statistics(runtime),
+            report("Total run time for inlining: ~.2.0f s.\n",
+		   [(Time - get(inline_start_time))/1000]);
+        _ ->
+            ok
+    end,
+    case debug_counters() of
+        true ->
+            counter_stats();
+        _ ->
+            ok
+    end.
+
+counter_stats() ->
+    T1 = get(counter_effort_triggers),
+    T2 = get(counter_size_triggers),
+    E = get(counter_effort_max),
+    S = get(counter_size_max),
+    M1 = io_lib:fwrite("\tNumber of triggered "
+                       "effort counters: ~p.\n", [T1]),
+    M2 = io_lib:fwrite("\tNumber of triggered "
+                       "size counters: ~p.\n", [T2]),
+    M3 = io_lib:fwrite("\tLargest active effort counter: ~p.\n",
+                       [E]),
+    M4 = io_lib:fwrite("\tLargest active size counter: ~p.\n",
+                       [S]),
+    report("Counter statistics:\n~s", [[M1, M2, M3, M4]]).
+
+
+%% =====================================================================
+%% The main inlining function
+%%
+%% i(E :: coreErlang(),
+%%   Ctxt :: value | effect | #app{}
+%%   Ren :: renaming(),
+%%   Env :: environment(),
+%%   S :: state())
+%%   -> {E', S'}
+%%
+%% Note: It is expected that the input source code ('E') does not
+%% contain free variables. If it does, there is a risk of accidental
+%% name capture, in case a generated "new" variable name happens to be
+%% the same as the name of a variable that is free further below in the
+%% tree; the algorithm only consults the current environment to check if
+%% a name already exists.
+%%
+%% The renaming maps names of source-code variable and function
+%% variables to new names as necessary to avoid clashes, according to
+%% the "no-shadowing" strategy. The environment maps *residual-code*
+%% variables and function variables to operands and global information.
+%% Separating the renaming from the environment, and using the
+%% residual-code variables instead of the source-code variables as its
+%% domain, improves the behaviour of the algorithm when code needs to be
+%% traversed more than once.
+%%
+%% Note that there is no such thing as a `test' context for expressions
+%% in (Core) Erlang (see `i_case' below for details).
+
+i(E, Ctxt, S) ->
+    i(E, Ctxt, ren__identity(), env__empty(), S).
+
+i(E, Ctxt, Ren, Env, S0) ->
+    %% Count one unit of effort on each pass.
+    S = count_effort(1, S0),
+    case is_data(E) of
+        true ->
+            i_data(E, Ctxt, Ren, Env, S);
+        false ->
+            case type(E) of
+                var ->
+                    i_var(E, Ctxt, Ren, Env, S);
+                values ->
+                    i_values(E, Ctxt, Ren, Env, S);
+                'fun' ->
+                    i_fun(E, Ctxt, Ren, Env, S);
+                seq ->
+                    i_seq(E, Ctxt, Ren, Env, S);
+                'let' ->
+                    i_let(E, Ctxt, Ren, Env, S);
+                letrec ->
+                    i_letrec(E, Ctxt, Ren, Env, S);
+                'case' ->
+                    i_case(E, Ctxt, Ren, Env, S);
+                'receive' ->
+                    i_receive(E, Ctxt, Ren, Env, S);
+                apply ->
+                    i_apply(E, Ctxt, Ren, Env, S);
+                call ->
+                    i_call(E, Ctxt, Ren, Env, S);
+                primop ->
+                    i_primop(E, Ren, Env, S);
+                'try' ->
+                    i_try(E, Ctxt, Ren, Env, S);
+                'catch' ->
+                    i_catch(E, Ctxt, Ren, Env, S);
+		binary ->
+		    i_binary(E, Ren, Env, S);
+                module ->
+                    i_module(E, Ctxt, Ren, Env, S)
+            end
+    end.
+
+i_data(E, Ctxt, Ren, Env, S) ->
+    case is_literal(E) of
+        true ->
+            %% This is the `(const c)' case of the original algorithm:
+            %% literal terms which (regardless of size) do not need to
+            %% be constructed dynamically at runtime - boldly assuming
+            %% that the compiler/runtime system can handle this.
+            case Ctxt of
+                effect ->
+                    %% Reduce useless constants to a simple value.
+                    {void(), count_size(weight(literal), S)};
+                _ ->
+                    %% (In Erlang, we cannot set all non-`false'
+                    %% constants to `true' in a `test' context, like we
+                    %% could do in Lisp or C, so the above is the only
+                    %% special case to be handled here.)
+                    {E, count_size(weight(literal), S)}
+            end;
+        false ->
+            %% Data constructors are like to calls to safe built-in
+            %% functions, for which we can "decide to inline"
+            %% immediately; there is no need to create operand
+            %% structures. In `effect' context, we can simply make a
+            %% sequence of the argument expressions, also visited in
+            %% `effect' context. In all other cases, the arguments are
+            %% visited for value.
+            case Ctxt of
+                effect ->
+                    %% Note that this will count the sizes of the
+                    %% subexpressions, even though some or all of them
+                    %% might be discarded by the sequencing afterwards.
+                    {Es1, S1} = mapfoldl(fun (E, S) ->
+						 i(E, effect, Ren, Env,
+						   S)
+					 end,
+					 S, data_es(E)),
+                    E1 = foldl(fun (E1, E2) -> make_seq(E1, E2) end,
+			       void(), Es1),
+                    {E1, S1};
+                _ ->
+                    {Es1, S1} = mapfoldl(fun (E, S) ->
+						 i(E, value, Ren, Env,
+						   S)
+					 end,
+					 S, data_es(E)),
+                    %% The total size/cost is the base cost for a data
+                    %% constructor plus the cost for storing each
+                    %% element.
+                    N = weight(data) + length(Es1) * weight(element),
+                    S2 = count_size(N, S1),
+                    {update_data(E, data_type(E), Es1), S2}
+            end
+    end.
+
+%% This is the `(ref x)' (variable use) case of the original algorithm.
+%% Note that binding occurrences are always handled in the respective
+%% cases of the binding constructs.
+
+i_var(E, Ctxt, Ren, Env, S) ->
+    case Ctxt of
+        effect ->
+            %% Reduce useless variable references to a simple constant.
+	    %% This also avoids useless visiting of bound operands.
+            {void(), count_size(weight(literal), S)};
+        _ ->
+	    Name = var_name(E),
+            case env__lookup(ren__map(Name, Ren), Env) of
+                {ok, R} ->
+                    case R#ref.opnd of
+                        undefined ->
+                            %% The variable is not associated with an
+                            %% argument expression; just residualize it.
+                            residualize_var(R, S);
+                        Opnd ->
+			    i_var_1(R, Opnd, Ctxt, Env, S)
+                    end;
+                error ->
+                    %% The variable is unbound. (It has not been
+                    %% accidentally captured, however, or it would have
+                    %% been in the environment.) We leave it as it is,
+                    %% without any warning.
+		    {E, count_size(weight(var), S)}
+            end
+    end.
+
+%% This first visits the bound operand and then does copy propagation.
+%% Note that we must first set the "inner-pending" flag, and clear the
+%% flag afterwards.
+
+i_var_1(R, Opnd, Ctxt, Env, S) ->
+    %% If the operand is already "inner-pending", it is residualised.
+    %% (In Lisp/C, if the variable might be assigned to, it should also
+    %% be residualised.)
+    L = Opnd#opnd.loc,
+    case st__test_inner_pending(L, S) of
+	true ->
+	    residualize_var(R, S);
+	false ->
+	    S1 = st__mark_inner_pending(L, S),
+	    case catch {ok, visit(Opnd, S1)} of
+		{ok, {E, S2}} ->
+		    %% Note that we pass the current environment and
+		    %% context to `copy', but not the current renaming.
+		    S3 = st__clear_inner_pending(L, S2),
+		    copy(R, Opnd, E, Ctxt, Env, S3);
+		{'EXIT', X} ->
+		    exit(X);
+		X ->
+		    %% If we use destructive update for the
+		    %% `inner-pending' flag, we must make sure to clear
+		    %% it also if we make a nonlocal return.
+		    st__clear_inner_pending(Opnd#opnd.loc, S1),
+		    throw(X)
+	    end
+    end.
+
+%% A multiple-value aggregate `<e1, ..., en>'. This is very much like a
+%% tuple data constructor `{e1, ..., en}'; cf. `i_data' for details.
+
+i_values(E, Ctxt, Ren, Env, S) ->
+    case values_es(E) of
+	[E1] ->
+	    %% Single-value aggregates can be dropped; they are simply
+	    %% notation.
+	    i(E1, Ctxt, Ren, Env, S);
+	Es ->
+	    %% In `effect' context, we can simply make a sequence of the
+	    %% argument expressions, also visited in `effect' context.
+	    %% In all other cases, the arguments are visited for value.
+	    case Ctxt of
+		effect ->
+		    {Es1, S1} =
+			mapfoldl(fun (E, S) ->
+					 i(E, effect, Ren, Env, S)
+				 end,
+				 S, Es),
+		    E1 = foldl(fun (E1, E2) ->
+				       make_seq(E1, E2)
+			       end,
+			       void(), Es1),
+		    {E1, S1};    % drop annotations on E
+		_ ->
+		    {Es1, S1} = mapfoldl(fun (E, S) ->
+						 i(E, value, Ren, Env,
+						   S)
+					 end,
+					 S, Es),
+		    %% Aggregating values does not write them to memory,
+		    %% so we count no extra cost per element.
+		    S2 = count_size(weight(values), S1),
+		    {update_c_values(E, Es1), S2}
+	    end
+    end.
+
+%% A let-expression `let <v1,...,vn> = e0 in e1' is semantically
+%% equivalent to a case-expression `case e0 of <v1,...,vn> when 'true'
+%% -> e1 end'. As a special case, `let <v> = e0 in e1' is also
+%% equivalent to `apply fun (v) -> e0 (e1)'. However, for efficiency,
+%% and in order to allow the handling of `case' clauses to introduce new
+%% let-expressions without entering an infinite rewrite loop, we handle
+%% these directly.
+
+%%% %% Rewriting a `let' to an equivalent expression.
+%%% i_let(E, Ctxt, Ren, Env, S) ->
+%%%     case let_vars(E) of
+%%% 	[V] ->
+%%%  	    E1 = update_c_apply(E, c_fun([V], let_body(E)), [let_arg(E)]),
+%%%  	    i(E1, Ctxt, Ren, Env, S);
+%%% 	Vs ->
+%%%  	    C = c_clause(Vs, abstract(true), let_body(E)),
+%%%  	    E1 = update_c_case(E, let_arg(E), [C]),
+%%%  	    i(E1, Ctxt, Ren, Env, S)
+%%%     end.
+
+i_let(E, Ctxt, Ren, Env, S) ->
+    case let_vars(E) of
+	[V] ->
+	    i_let_1(V, E, Ctxt, Ren, Env, S);
+	Vs ->
+	    %% Visit the argument expression in `value' context, to
+	    %% simplify it as far as possible.
+	    {A, S1} = i(let_arg(E), value, Ren, Env, S),
+	    case get_components(length(Vs), result(A)) of
+		{true, As} ->
+		    %% Note that only the components of the result of
+		    %% `A' are passed on; any effects are hoisted.
+		    {E1, S2} = i_let_2(Vs, As, E, Ctxt, Ren, Env, S1),
+		    {hoist_effects(A, E1), S2};
+		false ->
+		    %% We cannot do anything with this `let', since the
+		    %% variables cannot be matched against the argument
+		    %% components. Just visit the variables for renaming
+		    %% and visit the body for value (cf. `i_fun').
+		    {_, Ren1, Env1, S2} = bind_locals(Vs, Ren, Env, S1),
+		    Vs1 = i_params(Vs, Ren1, Env1),
+		    %% The body is always visited for value here.
+		    {B, S3} = i(let_body(E), value, Ren1, Env1, S2),
+		    S4 = count_size(weight('let'), S3),
+		    {update_c_let(E, Vs1, A, B), S4}
+	    end
+    end.
+
+%% Single-variable `let' binding.
+
+i_let_1(V, E, Ctxt, Ren, Env, S) ->
+    %% Make an operand structure for the argument expression, create a
+    %% local binding from the parameter to the operand structure, and
+    %% visit the body. Finally create necessary bindings and/or set
+    %% flags.
+    {Opnd, S1} = make_opnd(let_arg(E), Ren, Env, S),
+    {[R], Ren1, Env1, S2} = bind_locals([V], [Opnd], Ren, Env, S1),
+    {E1, S3} = i(let_body(E), Ctxt, Ren1, Env1, S2),
+    i_let_3([R], [Opnd], E1, S3).
+
+%% Multi-variable `let' binding.
+
+i_let_2(Vs, As, E, Ctxt, Ren, Env, S) ->
+    %% Make operand structures for the argument components. Note that
+    %% since the argument has already been visited at this point, we use
+    %% the identity renaming for the operands.
+    {Opnds, S1} = mapfoldl(fun (E, S) ->
+                                   make_opnd(E, ren__identity(), Env, S)
+                           end,
+                           S, As),
+    %% Create local bindings from the parameters to their respective
+    %% operand structures, and visit the body.
+    {Rs, Ren1, Env1, S2} = bind_locals(Vs, Opnds, Ren, Env, S1),
+    {E1, S3} = i(let_body(E), Ctxt, Ren1, Env1, S2),
+    i_let_3(Rs, Opnds, E1, S3).
+
+i_let_3(Rs, Opnds, E, S) ->
+    %% Create necessary bindings and/or set flags.
+    {E1, S1} = make_let_bindings(Rs, E, S),
+
+    %% We must also create evaluation for effect, for any unused
+    %% operands, as after an application expression.
+    residualize_operands(Opnds, E1, S1).
+
+%% A sequence `do e1 e2', written `(seq e1 e2)' in the original
+%% algorithm, where `e1' is evaluated for effect only (since its value
+%% is not used), and `e2' yields the final value. Note that we use
+%% `make_seq' to recompose the sequence after visiting the parts.
+
+i_seq(E, Ctxt, Ren, Env, S) ->
+    {E1, S1} = i(seq_arg(E), effect, Ren, Env, S),
+    {E2, S2} = i(seq_body(E), Ctxt, Ren, Env, S1),
+    %% A sequence has no cost in itself.
+    {make_seq(E1, E2), S2}.
+
+
+%% The `case' switch of Core Erlang is rather different from the boolean
+%% `(if e1 e2 e3)' case of the original algorithm, but the central idea
+%% is the same: if, given the simplified switch expression (which is
+%% visited in `value' context - a boolean `test' context would not be
+%% generally useful), there is a clause which could definitely be
+%% selected, such that no clause before it can possibly be selected,
+%% then we can eliminate all other clauses. (And even if this is not the
+%% case, some clauses can often be eliminated.) Furthermore, if a clause
+%% can be selected, we can replace the case-expression (including the
+%% switch expression) with the body of the clause and a set of zero or
+%% more let-bindings of subexpressions of the switch expression. (In the
+%% simplest case, the switch expression is evaluated only for effect.)
+
+i_case(E, Ctxt, Ren, Env, S) ->
+    %% First visit the switch expression in `value' context, to simplify
+    %% it as far as possible. Note that only the result part is passed
+    %% on to the clause matching below; any effects are hoisted.
+    {A, S1} = i(case_arg(E), value, Ren, Env, S),
+    A1 = result(A),
+
+    %% Propagating an application context into the branches could cause
+    %% the arguments of the application to be evaluated *after* the
+    %% switch expression, but *before* the body of the selected clause.
+    %% Such interleaving is not allowed in general, and it does not seem
+    %% worthwile to make a more powerful transformation here. Therefore,
+    %% the clause bodies are conservatively visited for value if the
+    %% context is `application'.
+    Ctxt1 = safe_context(Ctxt),
+    {E1, S2} = case get_components(case_arity(E), A1) of
+		   {true, As} ->
+		       i_case_1(As, E, Ctxt1, Ren, Env, S1);
+		   false ->
+		       i_case_1([], E, Ctxt1, Ren, Env, S1)
+	       end,
+    {hoist_effects(A, E1), S2}.
+
+i_case_1(As, E, Ctxt, Ren, Env, S) ->
+    case i_clauses(As, case_clauses(E), Ctxt, Ren, Env, S) of
+        {false, {As1, Vs, Env1, Cs}, S1} ->
+            %% We still have a list of clauses. Sanity check:
+            if Cs == [] ->
+                    report_warning("empty list of clauses "
+				   "in residual program!.\n");
+               true ->
+                    ok
+            end,
+	    {A, S2} = i(c_values(As1), value, ren__identity(), Env1,
+			S1),
+	    {E1, S3} = i_case_2(Cs, A, E, S2),
+	    i_case_3(Vs, Env1, E1, S3);
+        {true, {_, Vs, Env1, [C]}, S1} ->
+            %% A single clause was selected; we just take the body.
+	    i_case_3(Vs, Env1, clause_body(C), S1)
+    end.
+
+%% Check if all clause bodies are actually equivalent expressions that
+%% do not depent on pattern variables (this sometimes occurs as a
+%% consequence of inlining, e.g., all branches might yield 'true'), and
+%% if so, replace the `case' with a sequence, first evaluating the
+%% clause selection for effect, then evaluating one of the clause bodies
+%% for its value. (Unless the switch contains a catch-all clause, the
+%% clause selection must be evaluated for effect, since there is no
+%% guarantee that any of the clauses will actually match. Assuming that
+%% some clause always matches could make an undefined program produce a
+%% value.) This makes the final size less than what was accounted for
+%% when visiting the clauses, but currently we don't try to adjust for
+%% this.
+
+i_case_2(Cs, A, E, S) ->
+    case equivalent_clauses(Cs) of
+	false ->
+	    %% Count the base sizes for the remaining clauses; pattern
+	    %% and guard sizes are already counted.
+	    N = weight('case') + weight(clause) * length(Cs),
+	    S1 = count_size(N, S),
+	    {update_c_case(E, A, Cs), S1};
+	true ->
+	    case cerl_clauses:any_catchall(Cs) of
+		true ->
+		    %% We know that some clause must be selected, so we
+		    %% can drop all the testing as well.
+		    E1 = make_seq(A, clause_body(hd(Cs))),
+		    {E1, S};
+		false ->
+		    %% The clause selection must be performed for
+		    %% effect.
+		    E1 = update_c_case(E, A,
+				       set_clause_bodies(Cs, void())),
+		    {make_seq(E1, clause_body(hd(Cs))), S}
+	    end
+    end.
+
+i_case_3(Vs, Env, E, S) ->
+    %% For the variables bound to the switch expression subexpressions,
+    %% make let bindings or create evaluation for effect.
+    Rs = [env__get(var_name(V), Env) || V <- Vs],
+    {E1, S1} = make_let_bindings(Rs, E, S),
+    Opnds = [R#ref.opnd || R <- Rs],
+    residualize_operands(Opnds, E1, S1).
+
+%% This function takes a sequence of switch expressions `Es' (which can
+%% be the empty list if these are unknown) and a list `Cs' of clauses,
+%% and returns `{Match, {As, Vs, Env1, Cs1}, S1}' where `As' is a list
+%% of residual switch expressions, `Vs' the list of variables used in
+%% the templates, `Env1' the environment for the templates, and `Cs1'
+%% the list of residual clauses. `Match' is `true' if some clause could
+%% be shown to definitely match (in this case, `Cs1' contains exactly
+%% one element), and `false' otherwise. `S1' is the new state. The given
+%% `Ctxt' is the context to be used for visiting the body of clauses.
+%%
+%% Visiting a clause basically amounts to extending the environment for
+%% all variables in the pattern, as for a `fun' (cf. `i_fun'),
+%% propagating match information if possible, and visiting the guard and
+%% body in the new environment.
+%%
+%% To make it cheaper to do handle a set of clauses, and to avoid
+%% unnecessarily exceeding the size limit, we avoid visiting the bodies
+%% of clauses which are subsequently removed, by dividing the visiting
+%% of a clause into two stages: first construct the environment(s) and
+%% visit the pattern (for renaming) and the guard (for value), then
+%% reduce the switch as much as possible, and lastly visit the body.
+
+i_clauses(Cs, Ctxt, Ren, Env, S) ->
+    i_clauses([], Cs, Ctxt, Ren, Env, S).
+
+i_clauses(Es, Cs, Ctxt, Ren, Env, S) ->
+    %% Create templates for the switch expressions.
+    {Ts, {Vs, Env0}} = mapfoldl(fun (E, {Vs, Env}) ->
+					{T, Vs1, Env1} =
+					    make_template(E, Env),
+					{T, {Vs1 ++ Vs, Env1}}
+				end,
+				{[], Env}, Es),
+
+    %% Make operand structures for the switch subexpression templates
+    %% (found in `Env0') and add proper ref-structure bindings to the
+    %% environment. Since the subexpressions in general can be
+    %% interdependent (Vs is in reverse-dependency order), the
+    %% environment (and renaming) must be created incrementally. Note
+    %% that since the switch expressions have been visited already, the
+    %% identity renaming is used for the operands.
+    Vs1 = lists:reverse(Vs),
+    {Ren1, Env1, S1} =
+	foldl(fun (V, {Ren, Env, S}) ->
+		      E = env__get(var_name(V), Env0),
+		      {Opnd, S_1} = make_opnd(E, ren__identity(), Env,
+					      S),
+		      {_, Ren1, Env1, S_2} = bind_locals([V], [Opnd],
+							 Ren, Env, S_1),
+		      {Ren1, Env1, S_2}
+	      end,
+	      {Ren, Env, S}, Vs1),
+
+    %% First we visit the head of each individual clause, renaming
+    %% pattern variables, inserting let-bindings in the guard and body,
+    %% and visiting the guard. The information used for visiting the
+    %% clause body will be prefixed to the clause annotations.
+    {Cs1, S2} = mapfoldl(fun (C, S) ->
+				 i_clause_head(C, Ts, Ren1, Env1, S)
+			 end,
+			 S1, Cs),
+
+    %% Now that the clause guards have been reduced as far as possible,
+    %% we can attempt to reduce the clauses.
+    As = [hd(get_ann(T)) || T <- Ts],
+    case cerl_clauses:reduce(Cs1, Ts) of
+        {false, Cs2} ->
+            %% We still have one or more clauses (with associated
+            %% extended environments). Their bodies have not yet been
+            %% visited, so we do that (in the respective safe
+            %% environments, adding the sizes of the visited heads to
+            %% the current size counter) and return the final list of
+            %% clauses.
+            {Cs3, S3} = mapfoldl(
+                          fun (C, S) ->
+                                  i_clause_body(C, Ctxt, S)
+                          end,
+                          S2, Cs2),
+            {false, {As, Vs1, Env1, Cs3}, S3};
+        {true, {C, _}} ->
+            %% A clause C could be selected (the bindings have already
+            %% been added to the guard/body). Note that since the clause
+            %% head will probably be discarded, its size is not counted.
+	    {C1, Ren2, Env2, _} = get_clause_extras(C),
+	    {B, S3} = i(clause_body(C), Ctxt, Ren2, Env2, S2),
+	    C2 = update_c_clause(C1, clause_pats(C1), clause_guard(C1), B),
+	    {true, {As, Vs1, Env1, [C2]}, S3}
+    end.
+
+%% This visits the head of a clause, renames pattern variables, inserts
+%% let-bindings in the guard and body, and does inlining on the guard
+%% expression. Returns a list of pairs `{NewClause, Data}', where `Data'
+%% is `{Renaming, Environment, Size}' used for visiting the body of the
+%% new clause.
+
+i_clause_head(C, Ts, Ren, Env, S) ->
+    %% Match the templates against the (non-renamed) patterns to get the
+    %% available information about matching subexpressions. We don't
+    %% care at this point whether an exact match/nomatch is detected.
+    Ps = clause_pats(C),
+    Bs = case cerl_clauses:match_list(Ps, Ts) of
+	     {_, Bs1} -> Bs1;
+	     none -> []
+	 end,
+
+    %% The patterns must be visited for renaming; cf. `i_pattern'. We
+    %% use a passive size counter for visiting the patterns and the
+    %% guard (cf. `visit'), because we do not know at this stage whether
+    %% the clause will be kept or not; the final value of the counter is
+    %% included in the returned value below.
+    {_, Ren1, Env1, S1} = bind_locals(clause_vars(C), Ren, Env, S),
+    S2 = new_passive_size(get_size_limit(S1), S1),
+    {Ps1, S3} = mapfoldl(fun (P, S) ->
+				 i_pattern(P, Ren1, Env1, Ren, Env, S)
+			 end,
+			 S2, Ps),
+
+    %% Rewrite guard and body and visit the guard for value. Discard the
+    %% latter size count if the guard turns out to be a constant.
+    G = add_match_bindings(Bs, clause_guard(C)),
+    B = add_match_bindings(Bs, clause_body(C)),
+    {G1, S4} = i(G, value, Ren1, Env1, S3),
+    S5 = case is_literal(G1) of
+	     true ->
+		 revert_size(S3, S4);
+	     false ->
+		 S4
+	 end,
+
+    %% Revert to the size counter we had on entry to this function. The
+    %% environment and renaming, together with the size of the clause
+    %% head, are prefixed to the annotations for later use.
+    Size = get_size_value(S5),
+    C1 = update_c_clause(C, Ps1, G1, B),
+    {set_clause_extras(C1, Ren1, Env1, Size), revert_size(S, S5)}.
+
+add_match_bindings(Bs, E) ->
+    %% Don't waste time if the variables definitely cannot be used.
+    %% (Most guards are simply `true'.)
+    case is_literal(E) of
+	true ->
+	    E;
+	false ->
+	    Vs = [V || {V, E} <- Bs, E /= any],
+	    Es = [hd(get_ann(E)) || {_V, E} <- Bs, E /= any],
+	    c_let(Vs, c_values(Es), E)
+    end.
+
+i_clause_body(C0, Ctxt, S) ->
+    {C, Ren, Env, Size} = get_clause_extras(C0),
+    S1 = count_size(Size, S),
+    {B, S2} = i(clause_body(C), Ctxt, Ren, Env, S1),
+    C1 = update_c_clause(C, clause_pats(C), clause_guard(C), B),
+    {C1, S2}.
+
+get_clause_extras(C) ->
+    [{Ren, Env, Size} | As] = get_ann(C),
+    {set_ann(C, As), Ren, Env, Size}.
+
+set_clause_extras(C, Ren, Env, Size) ->
+    As = [{Ren, Env, Size} | get_ann(C)],
+    set_ann(C, As).
+
+%% This is the `(lambda x e)' case of the original algorithm. A
+%% `fun' is like a lambda expression, but with a varying number of
+%% parameters; possibly zero.
+
+i_fun(E, Ctxt, Ren, Env, S) ->
+    case Ctxt of
+        effect ->
+            %% Reduce useless `fun' expressions to a simple constant;
+	    %% visiting the body would be a waste of time, and could
+	    %% needlessly mark variables as referenced.
+            {void(), count_size(weight(literal), S)};
+        value ->
+            %% Note that the variables are visited as patterns.
+            Vs = fun_vars(E),
+            {_, Ren1, Env1, S1} = bind_locals(Vs, Ren, Env, S),
+            Vs1 = i_params(Vs, Ren1, Env1),
+
+            %% The body is always visited for value.
+            {B, S2} = i(fun_body(E), value, Ren1, Env1, S1),
+
+	    %% We don't bother to include the exact number of free
+	    %% variables in the cost for creating a fun-value.
+            S3 = count_size(weight('fun'), S2),
+
+	    %% Inlining might have duplicated code, so we must remove
+	    %% any 'id'-annotations from the original fun-expression.
+	    %% (This forces a later stage to invent new id:s.) This is
+	    %% necessary as long as fun:s may still need to be
+	    %% identified the old way. Function variables that are not
+	    %% in application context also have such annotations, but
+	    %% the inlining will currently lose all annotations on
+	    %% variable references (I think), so that's not a problem.
+            {set_ann(c_fun(Vs1, B), kill_id_anns(get_ann(E))), S3};
+        #app{} ->
+            %% An application of a fun-expression (in the source code)
+            %% is handled by going directly to `inline'; this is never
+            %% residualised, and we don't set up new counters here. Note
+            %% that inlining of copy-propagated fun-expressions is done
+            %% in `copy'; not here.
+            inline(E, Ctxt, Ren, Env, S)
+    end.
+
+%% A `letrec' requires a circular environment, but is otherwise like a
+%% `let', i.e. like a direct lambda application. Note that only
+%% fun-expressions (lambda abstractions) may occur in the right-hand
+%% side of each definition.
+
+i_letrec(E, Ctxt, Ren, Env, S) ->
+    %% Note that we pass an empty list for the auto-referenced
+    %% (exported) functions here.
+    {Es, B, _, S1} = i_letrec(letrec_defs(E), letrec_body(E), [], Ctxt,
+			      Ren, Env, S),
+
+    %% If no bindings remain, only the body is returned.
+    case Es of
+        [] ->
+            {B, S1};    % drop annotations on E
+        _ ->
+            S2 = count_size(weight(letrec), S1),
+            {update_c_letrec(E, Es, B), S2}
+    end.
+
+%% The major part of this is shared by letrec-expressions and module
+%% definitions alike.
+
+i_letrec(Es, B, Xs, Ctxt, Ren, Env, S) ->
+    %% First, we create operands with dummy renamings and environments,
+    %% and with fresh store locations for cached expressions and operand
+    %% info.
+    {Opnds, S1} = mapfoldl(fun ({_, E}, S) ->
+                                   make_opnd(E, undefined, undefined, S)
+                           end,
+                           S, Es),
+
+    %% Then we make recursive bindings for the definitions.
+    {Rs, Ren1, Env1, S2} = bind_recursive([F || {F, _} <- Es],
+                                          Opnds, Ren, Env, S1),
+
+    %% For the function variables listed in Xs (none for a
+    %% letrec-expression), we must make sure that the corresponding
+    %% operand expressions are visited and that the definitions are
+    %% marked as referenced; we also need to return the possibly renamed
+    %% function variables.
+    {Xs1, S3} =
+        mapfoldl(
+          fun (X, S) ->
+                  Name = ren__map(var_name(X), Ren1),
+                  case env__lookup(Name, Env1) of
+                      {ok, R} ->
+                          S_1 = i_letrec_export(R, S),
+                          {ref_to_var(R), S_1};
+                      error ->
+                          %% We just skip any exports that are not
+                          %% actually defined here, and generate a
+                          %% warning message.
+                          {N, A} = var_name(X),
+                          report_warning("export `~w'/~w "
+					 "not defined.\n", [N, A]),
+                          {X, S}
+                  end
+          end,
+          S2, Xs),
+
+    %% At last, we can then visit the body.
+    {B1, S4} = i(B, Ctxt, Ren1, Env1, S3),
+
+    %% Finally, we create new letrec-bindings for any and all
+    %% residualised definitions. All referenced functions should have
+    %% been visited; the call to `visit' below is expected to retreive a
+    %% cached expression.
+    Rs1 = keep_referenced(Rs, S4),
+    {Es1, S5} = mapfoldl(fun (R, S) ->
+				 {E_1, S_1} = visit(R#ref.opnd, S),
+				 {{ref_to_var(R), E_1}, S_1}
+			 end,
+			 S4, Rs1),
+    {Es1, B1, Xs1, S5}.
+
+%% This visits the operand for a function definition exported by a
+%% `letrec' (which is really a `module' module definition, since normal
+%% letrecs have no export declarations). Only the updated state is
+%% returned. We must handle the "inner-pending" flag when doing this;
+%% cf. `i_var'.
+
+i_letrec_export(R, S) ->
+    Opnd = R#ref.opnd,
+    S1 = st__mark_inner_pending(Opnd#opnd.loc, S),
+    {_, S2} = visit(Opnd, S1),
+    {_, S3} = residualize_var(R, st__clear_inner_pending(Opnd#opnd.loc,
+							 S2)),
+    S3.
+
+%% This is the `(call e1 e2)' case of the original algorithm. The only
+%% difference is that we must handle multiple (or no) operand
+%% expressions.
+
+i_apply(E, Ctxt, Ren, Env, S) ->
+    {Opnds, S1} = mapfoldl(fun (E, S) ->
+                                   make_opnd(E, Ren, Env, S)
+                           end,
+                           S, apply_args(E)),
+
+    %% Allocate a new app-context location and set up an application
+    %% context structure containing the surrounding context.
+    {L, S2} = st__new_app_loc(S1),
+    Ctxt1 = #app{opnds = Opnds, ctxt = Ctxt, loc = L},
+
+    %% Visit the operator expression in the new call context.
+    {E1, S3} = i(apply_op(E), Ctxt1, Ren, Env, S2),
+
+    %% Check the "inlined" flag to find out what to do next. (The store
+    %% location could be recycled after the flag has been tested, but
+    %% there is no real advantage to that, because in practice, only
+    %% 4-5% of all created store locations will ever be reused, while
+    %% there will be a noticable overhead for managing the free list.)
+    case st__get_app_inlined(L, S3) of
+        true ->
+            %% The application was inlined, so we have the final
+            %% expression in `E1'. We just have to handle any operands
+            %% that need to be residualized for effect only (i.e., those
+            %% the values of which are not used).
+            residualize_operands(Opnds, E1, S3);
+        false ->
+            %% Otherwise, `E1' is the residual operator expression. We
+            %% make sure all operands are visited, and rebuild the
+            %% application.
+            {Es, S4} = mapfoldl(fun (Opnd, S) ->
+					visit_and_count_size(Opnd, S)
+				end,
+				S3, Opnds),
+	    N = apply_size(length(Es)),
+            {update_c_apply(E, E1, Es), count_size(N, S4)}
+    end.
+
+apply_size(A) ->
+    weight(apply) + weight(argument) * A.
+
+%% Since it is not the task of this transformation to handle
+%% cross-module inlining, all inter-module calls are handled by visiting
+%% the components (the module and function name, and the arguments of
+%% the call) for value. In `effect' context, if the function itself is
+%% known to be completely effect free, the call can be discarded and the
+%% arguments evaluated for effect. Otherwise, if all the visited
+%% arguments are to constants, and the function is known to be safe to
+%% execute at compile time, then we try to evaluate the call. If
+%% evaluation completes normally, the call is replaced by the result;
+%% otherwise the call is residualised.
+
+i_call(E, Ctxt, Ren, Env, S) ->
+    {M, S1} = i(call_module(E), value, Ren, Env, S),
+    {F, S2} = i(call_name(E), value, Ren, Env, S1),
+    As = call_args(E),
+    Arity = length(As),
+
+    %% Check if the name of the called function is static. If so,
+    %% discard the size counts performed above, since the values will
+    %% not cause any runtime cost.
+    Static =  is_c_atom(M) and is_c_atom(F),
+    S3 = case Static of
+	     true ->
+		 revert_size(S, S2);
+	     false ->
+		 S2
+	 end,
+    case Ctxt of
+        effect when Static == true ->
+            case is_safe_call(atom_val(M), atom_val(F), Arity) of
+                true ->
+                    %% The result will not be used, and the call is
+                    %% effect free, so we create a multiple-value
+                    %% aggregate containing the (not yet visited)
+                    %% arguments and process that instead.
+                    i(c_values(As), effect, Ren, Env, S3);
+                false ->
+                    %% We are not allowed to simply discard the call,
+                    %% but we can try to evaluate it.
+                    i_call_1(Static, M, F, Arity, As, E, Ctxt, Ren, Env,
+                             S3)
+            end;
+        _ ->
+	    i_call_1(Static, M, F, Arity, As, E, Ctxt, Ren, Env, S3)
+    end.
+
+i_call_1(Static, M, F, Arity, As, E, Ctxt, Ren, Env, S) ->
+    %% Visit the arguments for value.
+    {As1, S1} = mapfoldl(fun (X, A) -> i(X, value, Ren, Env, A) end,
+			 S, As),
+    case Static of
+	true ->
+	    case erl_bifs:is_pure(atom_val(M), atom_val(F), Arity) of
+		true ->
+		    %% It is allowed to evaluate this at compile time.
+		    case all_static(As1) of
+			true ->
+			    i_call_3(M, F, As1, E, Ctxt, Env, S1);
+			false ->
+			    %% See if the call can be rewritten instead.
+			    i_call_4(M, F, As1, E, Ctxt, Env, S1)
+		    end;
+		false ->
+		    i_call_2(M, F, As1, E, S1)
+	    end;
+	false ->
+	    i_call_2(M, F, As1, E, S1)
+    end.
+
+%% Residualise the call.
+
+i_call_2(M, F, As, E, S) ->
+    N = weight(call) + weight(argument) * length(As),
+    {update_c_call(E, M, F, As), count_size(N, S)}.
+
+%% Attempt to evaluate the call to yield a literal; if that fails, try
+%% to rewrite the expression.
+
+i_call_3(M, F, As, E, Ctxt, Env, S) ->
+    %% Note that we extract the results of argument expessions here; the
+    %% expressions could still be sequences with side effects.
+    Vs = [concrete(result(A)) || A <- As],
+    case catch {ok, apply(atom_val(M), atom_val(F), Vs)} of
+	{ok, V} ->
+	    %% Evaluation completed normally - try to turn the result
+	    %% back into a syntax tree (representing a literal).
+	    case is_literal_term(V) of
+		true ->
+		    %% Make a sequence of the arguments (as a
+		    %% multiple-value aggregate) and the final value.
+		    S1 = count_size(weight(values), S),
+		    S2 = count_size(weight(literal), S1),
+		    {make_seq(c_values(As), abstract(V)), S2};
+		false ->
+		    %% The result could not be represented as a literal.
+		    i_call_4(M, F, As, E, Ctxt, Env, S)
+	    end;
+	_ ->
+	    %% The evaluation attempt did not complete normally.
+	    i_call_4(M, F, As, E, Ctxt, Env, S)
+    end.
+
+%% Rewrite the expression, if possible, otherwise residualise it.
+
+i_call_4(M, F, As, E, Ctxt, Env, S) ->
+    case reduce_bif_call(atom_val(M), atom_val(F), As, Env) of
+        false ->
+            %% Nothing more to be done - residualise the call.
+            i_call_2(M, F, As, E, S);
+        {true, E1} ->
+            %% We revisit the result, because the rewriting might have
+            %% opened possibilities for further inlining. Since the
+            %% parts have already been visited once, we use the identity
+            %% renaming here.
+            i(E1, Ctxt, ren__identity(), Env, S)
+    end.
+
+%% For now, we assume that primops cannot be evaluated at compile time,
+%% probably being too special. Also, we have no knowledge about their
+%% side effects.
+
+i_primop(E, Ren, Env, S) ->
+    %% Visit the arguments for value.
+    {As, S1} = mapfoldl(fun (E, S) ->
+				i(E, value, Ren, Env, S)
+			end,
+			S, primop_args(E)),
+    N = weight(primop) + weight(argument) * length(As),
+    {update_c_primop(E, primop_name(E), As), count_size(N, S1)}.
+
+%% This is like having an expression with an extra fun-expression
+%% attached for "exceptional cases"; actually, there are exactly two
+%% parameter variables for the body, but they are easiest handled as if
+%% their number might vary, just as for a `fun'.
+
+i_try(E, Ctxt, Ren, Env, S) ->
+    %% The argument expression is evaluated in `value' context, and the
+    %% surrounding context is propagated into both branches. We do not
+    %% try to recognize cases when the protected expression will
+    %% actually raise an exception. Note that the variables are visited
+    %% as patterns.
+    {A, S1} = i(try_arg(E), value, Ren, Env, S),
+    Vs = try_vars(E),
+    {_, Ren1, Env1, S2} = bind_locals(Vs, Ren, Env, S1),
+    Vs1 = i_params(Vs, Ren1, Env1),
+    {B, S3} = i(try_body(E), Ctxt, Ren1, Env1, S2),
+    case is_safe(A) of
+	true ->
+	    %% The `try' wrapper can be dropped in this case. Since the
+	    %% expressions have been visited already, the identity
+	    %% renaming is used when we revisit the new let-expression.
+	    i(c_let(Vs1, A, B), Ctxt, ren__identity(), Env, S3);
+	false ->
+	    Evs = try_evars(E),
+	    {_, Ren2, Env2, S4} = bind_locals(Evs, Ren, Env, S3),
+	    Evs1 = i_params(Evs, Ren2, Env2),
+	    {H, S5} = i(try_handler(E), Ctxt, Ren2, Env2, S4),
+	    S6 = count_size(weight('try'), S5),
+	    {update_c_try(E, A, Vs1, B, Evs1, H), S6}
+    end.
+
+%% A special case of try-expressions:
+
+i_catch(E, Ctxt, Ren, Env, S) ->
+    %% We cannot propagate application contexts into the catch.
+    {E1, S1} = i(catch_body(E), safe_context(Ctxt), Ren, Env, S),
+    case is_safe(E1) of
+	true ->
+	    %% The `catch' wrapper can be dropped in this case.
+	    {E1, S1};
+	false ->
+	    S2 = count_size(weight('catch'), S1),
+	    {update_c_catch(E, E1), S2}
+    end.
+
+%% A receive-expression is very much like a case-expression, with the
+%% difference that we do not have access to a switch expression, since
+%% the value being switched on is taken from the mailbox. The fact that
+%% the receive-expression may iterate over an arbitrary number of
+%% messages is not of interest to us. All we can do here is to visit its
+%% subexpressions, and possibly eliminate definitely unselectable
+%% clauses.
+
+i_receive(E, Ctxt, Ren, Env, S) ->
+    %% We first visit the expiry expression (for value) and the expiry
+    %% body (in the surrounding context).
+    {T, S1} = i(receive_timeout(E), value, Ren, Env, S),
+    {B, S2} = i(receive_action(E), Ctxt, Ren, Env, S1),
+
+    %% Then we visit the clauses. Note that application contexts may not
+    %% in general be propagated into the branches (and the expiry body),
+    %% because the execution of the `receive' may remove a message from
+    %% the mailbox as a side effect; the situation is thus analogous to
+    %% that in a `case' expression.
+    Ctxt1 = safe_context(Ctxt),
+    case i_clauses(receive_clauses(E), Ctxt1, Ren, Env, S2) of
+        {false, {[], _, _, Cs}, S3} ->
+            %% We still have a list of clauses. If the list is empty,
+            %% and the expiry expression is the integer zero, the
+            %% expression reduces to the expiry body.
+	    if Cs == [] ->
+		    case is_c_int(T) andalso (int_val(T) == 0) of
+			true ->
+			    {B, S3};
+			false ->
+			    i_receive_1(E, Cs, T, B, S3)
+		    end;
+	       true ->
+		    i_receive_1(E, Cs, T, B, S3)
+	    end;
+        {true, {_, _, _, Cs}, S3} ->
+	    %% Cs is a single clause that will always be matched (if a
+	    %% message exists), but we must keep the `receive' statement
+	    %% in order to fetch the message from the mailbox.
+	    i_receive_1(E, Cs, T, B, S3)
+    end.
+
+i_receive_1(E, Cs, T, B, S) ->
+    %% Here, we just add the base sizes for the receive-expression
+    %% itself and for each remaining clause; cf. `case'.
+    N = weight('receive') + weight(clause) * length(Cs),
+    {update_c_receive(E, Cs, T, B), count_size(N, S)}.
+
+%% A module definition is like a `letrec', with some add-ons (export and
+%% attribute declarations) but without an explicit body. Actually, the
+%% exporting of function names has the same effect as if there was a
+%% body consisting of the list of references to the exported functions.
+%% Thus, the exported functions are exactly those which can be
+%% referenced from outside the module.
+
+i_module(E, Ctxt, Ren, Env, S) ->
+    %% Cf. `i_letrec'. Note that we pass a dummy constant value for the
+    %% "body" parameter.
+    {Es, _, Xs1, S1} = i_letrec(module_defs(E), void(),
+                                module_exports(E), Ctxt, Ren, Env, S),
+    %% Sanity check:
+    case Es of
+        [] ->
+            report_warning("no function definitions remaining "
+			   "in module `~s'.\n",
+			   [atom_name(module_name(E))]);
+        _ ->
+            ok
+    end,
+    E1 = update_c_module(E, module_name(E), Xs1, module_attrs(E), Es),
+    {E1, count_size(weight(module), S1)}.
+
+%% Binary-syntax expressions are too complicated to do anything
+%% interesting with here - that is beyond the scope of this program;
+%% also, their construction could have side effects, so even in effect
+%% context we can't remove them. (We don't bother to identify cases of
+%% "safe" unused binaries which could be removed.)
+
+i_binary(E, Ren, Env, S) ->
+    %% Visit the segments for value.
+    {Es, S1} = mapfoldl(fun (E, S) ->
+				i_bitstr(E, Ren, Env, S)
+			end,
+			S, binary_segments(E)),
+    S2 = count_size(weight(binary), S1),
+    {update_c_binary(E, Es), S2}.
+
+i_bitstr(E, Ren, Env, S) ->
+    %% It is not necessary to visit the Unit, Type and Flags fields,
+    %% since these are always literals.
+    {Val, S1} = i(bitstr_val(E), value, Ren, Env, S),
+    {Size, S2} = i(bitstr_size(E), value, Ren, Env, S1),
+    Unit = bitstr_unit(E),
+    Type = bitstr_type(E),
+    Flags = bitstr_flags(E),
+    S3 = count_size(weight(bitstr), S2),
+    {update_c_bitstr(E, Val, Size, Unit, Type, Flags), S3}.
+
+%% This is a simplified version of `i_pattern', for lists of parameter
+%% variables only. It does not modify the state.
+
+i_params([V | Vs], Ren, Env) ->
+    Name = ren__map(var_name(V), Ren),
+    case env__lookup(Name, Env) of
+	{ok, R} ->
+	    [ref_to_var(R) | i_params(Vs, Ren, Env)];
+	error ->
+	    report_internal_error("variable `~w' not bound "
+				  "in pattern.\n", [Name]),
+	    exit(error)
+    end;
+i_params([], _, _) ->
+    [].
+
+%% For ordinary patterns, we just visit to rename variables and count
+%% the size/cost. All occurring binding instances of variables should
+%% already have been added to the renaming and environment; however, to
+%% handle the size expressions of binary-syntax patterns, we must pass
+%% the renaming and environment of the containing expression
+
+i_pattern(E, Ren, Env, Ren0, Env0, S) ->
+    case type(E) of
+	var ->
+	    %% Count no size.
+            Name = ren__map(var_name(E), Ren),
+            case env__lookup(Name, Env) of
+                {ok, R} ->
+                    {ref_to_var(R), S};
+                error ->
+                    report_internal_error("variable `~w' not bound "
+					  "in pattern.\n", [Name]),
+		    exit(error)
+            end;
+	alias ->
+	    %% Count no size.
+	    V = alias_var(E),
+	    Name = ren__map(var_name(V), Ren),
+	    case env__lookup(Name, Env) of
+		{ok, R} ->
+		    %% Visit the subpattern and recompose.
+		    V1 = ref_to_var(R),
+		    {P, S1} = i_pattern(alias_pat(E), Ren, Env, Ren0,
+					Env0, S),
+		    {update_c_alias(E, V1, P), S1};
+		error ->
+		    report_internal_error("variable `~w' not bound "
+					  "in pattern.\n", [Name]),
+		    exit(error)
+	    end;
+	binary ->
+	    {Es, S1} = mapfoldl(fun (E, S) ->
+					i_bitstr_pattern(E, Ren, Env,
+							  Ren0, Env0, S)
+				end,
+				S, binary_segments(E)),
+	    S2 = count_size(weight(binary), S1),
+	    {update_c_binary(E, Es), S2};
+	_ ->
+	    case is_literal(E) of
+		true ->
+                    {E, count_size(weight(literal), S)};
+		false ->
+		    {Es1, S1} = mapfoldl(fun (E, S) ->
+						 i_pattern(E, Ren, Env,
+							   Ren0, Env0,
+							   S)
+					 end,
+					 S, data_es(E)),
+		    %% We assume that in general, the elements of the
+		    %% constructor will all be fetched.
+		    N = weight(data) + length(Es1) * weight(element),
+		    S2 = count_size(N, S1),
+		    {update_data(E, data_type(E), Es1), S2}
+	    end
+    end.
+
+i_bitstr_pattern(E, Ren, Env, Ren0, Env0, S) ->
+    %% It is not necessary to visit the Unit, Type and Flags fields,
+    %% since these are always literals. The Value field is a limited
+    %% pattern - either a literal or an unbound variable. The Size field
+    %% is a limited expression - either a literal or a variable bound in
+    %% the environment of the containing expression.
+    {Val, S1} = i_pattern(bitstr_val(E), Ren, Env, Ren0, Env0, S),
+    {Size, S2} = i(bitstr_size(E), value, Ren0, Env0, S1),
+    Unit = bitstr_unit(E),
+    Type = bitstr_type(E),
+    Flags = bitstr_flags(E),
+    S3 = count_size(weight(bitstr), S2),
+    {update_c_bitstr(E, Val, Size, Unit, Type, Flags), S3}.
+
+
+%% ---------------------------------------------------------------------
+%% Other central inlining functions
+
+%% It is assumed here that `E' is a fun-expression and the context is an
+%% app-structure. If the inlining might be aborted for some reason, a
+%% corresponding catch should have been set up before entering `inline'.
+%%
+%% Note: if the inlined body is a lambda abstraction, and the
+%% surrounding context of the app-context is also an app-context, the
+%% `inlined' flag of the outermost context will be set before that of
+%% the inner context is set. E.g.: `let F = fun (X) -> fun (Y) -> E in
+%% apply apply F(A)(B)' will propagate the body of F, which is a lambda
+%% abstraction, into the outer application context, which will be
+%% inlined to produce expression `E', and the flag of the outer context
+%% will be set. Upon return, the flag of the inner context will also be
+%% set. However, the flags are then tested in innermost-first order.
+%% Thus, if some inlining attempt is aborted, the `inlined' flags of any
+%% nested app-contexts must be cleared.
+%%
+%% This implementation does nothing to handle inlining of calls to
+%% recursive functions in a smart way. This means that as long as the
+%% size and effort counters do not prevent it, the function body will be
+%% inlined (i.e., the first iteration will be unrolled), and the
+%% recursive calls will be residualized.
+
+inline(E, #app{opnds = Opnds, ctxt = Ctxt, loc = L}, Ren, Env, S) ->
+    %% Check that the arities match:
+    Vs = fun_vars(E),
+    if length(Opnds) /= length(Vs) ->
+            report_error("function called with wrong number "
+			 "of arguments!\n"),
+	    %% TODO: should really just residualise the call...
+	    exit(error);
+       true ->
+            ok
+    end,
+    %% Create local bindings for the parameters to their respective
+    %% operand structures from the app-structure, and visit the body in
+    %% the context saved in the structure.
+    {Rs, Ren1, Env1, S1} = bind_locals(Vs, Opnds, Ren, Env, S),
+    {E1, S2} = i(fun_body(E), Ctxt, Ren1, Env1, S1),
+
+    %% Create necessary bindings and/or set flags.
+    {E2, S3} = make_let_bindings(Rs, E1, S2),
+
+    %% Lastly, flag the application as inlined, since the inlining
+    %% attempt was not aborted before we reached this point.
+    {E2, st__set_app_inlined(L, S3)}.
+
+%% For the (possibly renamed) argument variables to an inlined call,
+%% either create `let' bindings for them, if they are still referenced
+%% in the residual expression (in C/Lisp, also if they are assigned to),
+%% or otherwise (if they are not referenced or assigned) mark them for
+%% evaluation for side effects.
+
+make_let_bindings([R | Rs], E, S) ->
+    {E1, S1} = make_let_bindings(Rs, E, S),
+    make_let_binding(R, E1, S1);
+make_let_bindings([], E, S) ->
+    {E, S}.
+
+make_let_binding(R, E, S) ->
+    %% The `referenced' flag is conservatively computed. We therefore
+    %% first check some simple cases where parameter R is definitely not
+    %% referenced in the resulting body E.
+    case is_literal(E) of
+        true ->
+            %% A constant contains no variable references.
+            make_let_binding_1(R, E, S);
+        false ->
+            case is_c_var(E) of
+                true ->
+                    case var_name(E) =:= R#ref.name of
+                        true ->
+                            %% The body is simply the parameter variable
+                            %% itself. Visit the operand for value and
+                            %% substitute the result for the body.
+                            visit_and_count_size(R#ref.opnd, S);
+                        false ->
+                            %% Not the same variable, so the parameter
+                            %% is not referenced at all.
+                            make_let_binding_1(R, E, S)
+                    end;
+                false ->
+		    %% Proceed to check the `referenced' flag.
+		    case st__get_var_referenced(R#ref.loc, S) of
+			true ->
+			    %% The parameter is probably referenced in
+			    %% the residual code (although it might not
+			    %% be). Visit the operand for value and
+			    %% create a let-binding.
+			    {E1, S1} = visit_and_count_size(R#ref.opnd,
+							    S),
+			    S2 = count_size(weight('let'), S1),
+			    {c_let([ref_to_var(R)], E1, E), S2};
+			false ->
+			    %% The parameter is definitely not
+			    %% referenced.
+			    make_let_binding_1(R, E, S)
+		    end
+	    end
+    end.
+
+%% This marks the operand for evaluation for effect.
+
+make_let_binding_1(R, E, S) ->
+    Opnd = R#ref.opnd,
+    {E, st__set_opnd_effect(Opnd#opnd.loc, S)}.
+
+%% Here, `R' is the ref-structure which is the target of the copy
+%% propagation, and `Opnd' is a visited operand structure, to be
+%% propagated through `R' if possible - if not, `R' is residualised.
+%% `Opnd' is normally the operand that `R' is bound to, and `E' is the
+%% result of visiting `Opnd' for value; we pass this as an argument so
+%% we don't have to fetch it multiple times (because we don't have
+%% constant time access).
+%%
+%% We also pass the environment of the site of the variable reference,
+%% for use when inlining a propagated fun-expression. In the original
+%% algorithm by Waddell, the environment used for inlining such cases is
+%% the identity mapping, because the fun-expression body has already
+%% been visited for value, and their algorithm combines renaming of
+%% source-code variables with the looking up of information about
+%% residual-code variables. We, however, need to check the environment
+%% of the call site when creating new non-shadowed variables, but we
+%% must avoid repeated renaming. We therefore separate the renaming and
+%% the environment (as in the renaming algorithm of Peyton-Jones and
+%% Marlow). This also makes our implementation more general, compared to
+%% the original algorithm, because we do not give up on propagating
+%% variables that were free in the fun-body.
+%%
+%%  Example:
+%%
+%%	let F = fun (X) -> {'foo', X} in
+%%	let G = fun (H) -> apply H(F)        % F is free in the fun G
+%%	in apply G(fun (F) -> apply F(42))
+%%	  =>
+%%	let F = fun (X) -> {'foo', X} in
+%%	apply (fun (H) -> apply H(F))(fun (F) -> apply F(42))
+%%	  =>
+%%	let F = fun (X) -> {'foo', X} in
+%%	apply (fun (F) -> apply F(42))(F)
+%%	  =>
+%%	let F = fun (X) -> {'foo', X} in
+%%	apply F(42)
+%%	  =>
+%%	apply (fun (X) -> {'foo', X})(2)
+%%	  =>
+%%	{'foo', 42}
+%%
+%%  The original algorithm would give up at stage 4, because F was free
+%%  in the propagated fun-expression. Our version inlines this example
+%%  completely.
+
+copy(R, Opnd, E, Ctxt, Env, S) ->
+    case is_c_var(E) of
+        true ->
+	    %% The operand reduces to another variable - get its
+	    %% ref-structure and attempt to propagate further.
+            copy_var(env__get(var_name(E), Opnd#opnd.env), Ctxt, Env,
+                     S);
+        false ->
+            %% Apart from variables and functional values (the latter
+            %% are handled by `copy_1' below), only constant literals
+            %% are copyable in general; other things, including e.g.
+            %% tuples `{foo, X}', could cause duplication of work, and
+            %% are not copy propagated.
+            case is_literal(E) of
+                true ->
+                    {E, count_size(weight(literal), S)};
+                false ->
+                    copy_1(R, Opnd, E, Ctxt, Env, S)
+            end
+    end.
+
+copy_var(R, Ctxt, Env, S) ->
+    %% (In Lisp or C, if this other variable might be assigned to, we
+    %% should residualize the "parent" instead, so we don't bypass any
+    %% destructive updates.)
+    case R#ref.opnd of
+        undefined ->
+            %% This variable is not bound to an expression, so just
+            %% residualize it.
+            residualize_var(R, S);
+        Opnd ->
+	    %% Note that because operands are always visited before
+	    %% copied, all copyable operand expressions will be
+	    %% propagated through any number of bindings. If `R' was
+	    %% bound to a constant literal, we would never have reached
+	    %% this point.
+            case st__lookup_opnd_cache(Opnd#opnd.loc, S) of
+                error ->
+                    %% The result for this operand is not yet ready
+                    %% (which should mean that it is a recursive
+                    %% reference). Thus, we must residualise the
+                    %% variable.
+                    residualize_var(R, S);
+                {ok, #cache{expr = E1}} ->
+                    %% The result for the operand is ready, so we can
+                    %% proceed to propagate it.
+                    copy_1(R, Opnd, E1, Ctxt, Env, S)
+            end
+    end.
+
+copy_1(R, Opnd, E, Ctxt, Env, S) ->
+    %% Fun-expression (lambdas) are a bit special; they are copyable,
+    %% but should preferably not be duplicated, so they should not be
+    %% copy propagated except into application contexts, where they can
+    %% be inlined.
+    case is_c_fun(E) of
+        true ->
+            case Ctxt of
+                #app{} ->
+                    %% First test if the operand is "outer-pending"; if
+                    %% so, don't inline.
+                    case st__test_outer_pending(Opnd#opnd.loc, S) of
+                        false ->
+                            copy_inline(R, Opnd, E, Ctxt, Env, S);
+                        true ->
+                            %% Cyclic reference forced inlining to stop
+                            %% (avoiding infinite unfolding).
+                            residualize_var(R, S)
+                    end;
+                _ ->
+                    residualize_var(R, S)
+            end;
+        false ->
+            %% We have no other cases to handle here
+            residualize_var(R, S)
+    end.
+
+%% This inlines a function value that was propagated to an application
+%% context. The inlining is done with an identity renaming (since the
+%% expression is already visited) but in the environment of the call
+%% site (which is OK because of the no-shadowing strategy for renaming,
+%% and because the domain of our environments are the residual-program
+%% variables instead of the source-program variables). Note that we must
+%% first set the "outer-pending" flag, and clear it afterwards.
+
+copy_inline(R, Opnd, E, Ctxt, Env, S) ->
+    S1 = st__mark_outer_pending(Opnd#opnd.loc, S),
+    case catch {ok, copy_inline_1(R, E, Ctxt, Env, S1)} of
+        {ok, {E1, S2}} ->
+            {E1, st__clear_outer_pending(Opnd#opnd.loc, S2)};
+        {'EXIT', X} ->
+            exit(X);
+        X ->
+	    %% If we use destructive update for the `outer-pending'
+	    %% flag, we must make sure to clear it upon a nonlocal
+	    %% return.
+	    st__clear_outer_pending(Opnd#opnd.loc, S1),
+            throw(X)
+    end.
+
+%% If the current effort counter was passive, we use a new active effort
+%% counter with the inherited limit for this particular inlining.
+
+copy_inline_1(R, E, Ctxt, Env, S) ->
+    case effort_is_active(S) of
+        true ->
+            copy_inline_2(R, E, Ctxt, Env, S);
+        false ->
+            S1 = new_active_effort(get_effort_limit(S), S),
+            case catch {ok, copy_inline_2(R, E, Ctxt, Env, S1)} of
+                {ok, {E1, S2}} ->
+                    %% Revert to the old effort counter.
+                    {E1, revert_effort(S, S2)};
+                {counter_exceeded, effort, _} ->
+                    %% Aborted this inlining attempt because too much
+                    %% effort was spent. Residualize the variable and
+                    %% revert to the previous state.
+                    residualize_var(R, S);
+                {'EXIT', X} ->
+                    exit(X);
+                X ->
+                    throw(X)
+            end
+    end.
+
+%% Regardless of whether the current size counter is active or not, we
+%% use a new active size counter for each inlining. If the current
+%% counter was passive, the new counter gets the inherited size limit;
+%% if it was active, the size limit of the new counter will be equal to
+%% the remaining budget of the current counter (which itself is not
+%% affected by the inlining). This distributes the size budget more
+%% evenly over "inlinings within inlinings", so that the whole size
+%% budget is not spent on the first few call sites (in an inlined
+%% function body) forcing the remaining call sites to be residualised.
+
+copy_inline_2(R, E, Ctxt, Env, S) ->
+    Limit = case size_is_active(S) of
+                true ->
+                    get_size_limit(S) - get_size_value(S);
+                false ->
+                    get_size_limit(S)
+            end,
+    %% Add the cost of the application to the new size limit, so we
+    %% always inline functions that are small enough, even if `Limit' is
+    %% close to zero at this point. (This is an extension to the
+    %% original algorithm.)
+    S1 = new_active_size(Limit + apply_size(length(Ctxt#app.opnds)), S),
+    case catch {ok, inline(E, Ctxt, ren__identity(), Env, S1)} of
+        {ok, {E1, S2}} ->
+            %% Revert to the old size counter.
+            {E1, revert_size(S, S2)};
+        {counter_exceeded, size, S2} ->
+            %% Aborted this inlining attempt because it got too big.
+            %% Residualize the variable and revert to the old size
+            %% counter. (It is important that we do not also revert the
+            %% effort counter here. Because the effort and size counters
+            %% are always set up together, we know that the effort
+            %% counter returned in S2 is the same that was passed to
+            %% `inline'.)
+	    S3 = revert_size(S, S2),
+	    %% If we use destructive update for the `inlined' flag, we
+	    %% must make sure to clear the flags of any nested
+	    %% app-contexts upon aborting; see `inline' for details.
+	    reset_nested_apps(Ctxt, S3),    % for effect
+            residualize_var(R, S3);
+        {'EXIT', X} ->
+            exit(X);
+        X ->
+            throw(X)
+    end.
+
+reset_nested_apps(#app{ctxt = Ctxt, loc = L}, S) ->
+    reset_nested_apps(Ctxt, st__clear_app_inlined(L, S));
+reset_nested_apps(_, S) ->
+    S.
+
+
+%% ---------------------------------------------------------------------
+%%	Support functions
+
+new_var(Env) ->
+    Name = env__new_vname(Env),
+    c_var(Name).
+
+residualize_var(R, S) ->
+    S1 = count_size(weight(var), S),
+    {ref_to_var(R), st__set_var_referenced(R#ref.loc, S1)}.
+
+%% This function returns the value-producing subexpression of any
+%% expression. (Except for sequencing expressions, this is the
+%% expression itself.)
+
+result(E) ->
+    case is_c_seq(E) of
+        true ->
+            %% Also see `make_seq', which is used in all places to build
+            %% sequences so that they are always nested in the first
+            %% position.
+            seq_body(E);
+        false ->
+            E
+    end.
+
+%% This function rewrites E to `do A1 E' if A is `do A1 A2', and
+%% otherwise returns E unchanged.
+
+hoist_effects(A, E) ->
+    case type(A) of
+	seq -> make_seq(seq_arg(A), E);
+	_ -> E
+    end.
+
+%% This "build sequencing expression" operation assures that sequences
+%% are always nested in the first position, which makes it easy to find
+%% the actual value-producing expression of a sequence (cf. `result').
+
+make_seq(E1, E2) ->
+    case is_safe(E1) of
+        true ->
+            %% The first expression can safely be dropped.
+            E2;
+        false ->
+            %% If `E1' is a sequence whose final expression has no side
+            %% effects, then we can lose *that* expression when we
+            %% compose the new sequence, since its value will not be
+            %% used.
+            E3 = case is_c_seq(E1) of
+                     true ->
+                         case is_safe(seq_body(E1)) of
+                             true ->
+                                 %% Drop the final expression.
+                                 seq_arg(E1);
+                             false ->
+                                 E1
+                         end;
+                     false ->
+                         E1
+                 end,
+            case is_c_seq(E2) of
+                true ->
+                    %% `E2' is a sequence (E2' E2''), so we must
+                    %% rearrange the nesting to ((E1, E2') E2''), to
+                    %% preserve the invariant. Annotations on `E2' are
+                    %% lost.
+                    c_seq(c_seq(E3, seq_arg(E2)), seq_body(E2));
+                false ->
+                    c_seq(E3, E2)
+            end
+    end.
+
+%% Currently, safe expressions include variables, lambda expressions,
+%% constructors with safe subexpressions (this includes atoms, integers,
+%% empty lists, etc.), seq-, let- and letrec-expressions with safe
+%% subexpressions, try- and catch-expressions with safe subexpressions
+%% and calls to safe functions with safe argument subexpressions.
+%% Binaries seem too tricky to be considered.
+
+is_safe(E) ->
+    case is_data(E) of
+        true ->
+	    is_safe_list(data_es(E));
+        false ->
+            case type(E) of
+                var ->
+                    true;
+                'fun' ->
+                    true;
+		values ->
+		    is_safe_list(values_es(E));
+                'seq' ->
+                    case is_safe(seq_arg(E)) of
+                        true ->
+                            is_safe(seq_body(E));
+                        false ->
+                            false
+                    end;
+                'let' ->
+                    case is_safe(let_arg(E)) of
+                        true ->
+                            is_safe(let_body(E));
+                        false ->
+                            false
+                    end;
+                letrec ->
+                    is_safe(letrec_body(E));
+		'try' ->
+		    %% If the argument expression is not safe, it could
+		    %% be modifying the state; thus, even if the body is
+		    %% safe, the try-expression as a whole would not be.
+		    %% If the argument is safe, the handler is not used.
+                    case is_safe(try_arg(E)) of
+                        true ->
+                            is_safe(try_body(E));
+                        false ->
+                            false
+                    end;
+		'catch' ->
+                    is_safe(catch_body(E));
+		call ->
+		    M = call_module(E),
+		    F = call_name(E),
+		    case is_c_atom(M) and is_c_atom(F) of
+			true ->
+			    As = call_args(E),
+			    case is_safe_list(As) of
+				true ->
+				    is_safe_call(atom_val(M),
+						 atom_val(F),
+						 length(As));
+				false ->
+				    false
+			    end;
+			false ->
+			    false
+		    end;
+                _ ->
+                    false
+            end
+    end.
+
+is_safe_list([E | Es]) ->
+    case is_safe(E) of
+	true ->
+	    is_safe_list(Es);
+	false ->
+	    false
+    end;
+is_safe_list([]) ->
+    true.
+
+is_safe_call(M, F, A) ->
+    erl_bifs:is_safe(M, F, A).
+
+%% When setting up local variables, we only create new names if we have
+%% to, according to the "no-shadowing" strategy.
+
+make_locals(Vs, Ren, Env) ->
+    make_locals(Vs, [], Ren, Env).
+
+make_locals([V | Vs], As, Ren, Env) ->
+    Name = var_name(V),
+    case env__is_defined(Name, Env) of
+        false ->
+            %% The variable need not be renamed. Just make sure that the
+            %% renaming will map it to itself.
+            Name1 = Name,
+            Ren1 = ren__add_identity(Name, Ren);
+        true ->
+            %% The variable must be renamed to maintain the no-shadowing
+            %% invariant. Do the right thing for function variables.
+            Name1 = case Name of
+			{A, N} ->
+			    env__new_fname(A, N, Env);
+			_ ->
+			    env__new_vname(Env)
+		    end,
+            Ren1 = ren__add(Name, Name1, Ren)
+    end,
+    %% This temporary binding is added for correct new-key generation.
+    Env1 = env__bind(Name1, dummy, Env),
+    make_locals(Vs, [Name1 | As], Ren1, Env1);
+make_locals([], As, Ren, Env) ->
+    {reverse(As), Ren, Env}.
+
+%% This adds let-bindings for the source code variables in `Es' to the
+%% environment `Env'.
+%%
+%% Note that we always assign a new state location for the
+%% residual-program variable, since we cannot know when a location for a
+%% particular variable in the source code can be reused.
+
+bind_locals(Vs, Ren, Env, S) ->
+    Opnds = lists:duplicate(length(Vs), undefined),
+    bind_locals(Vs, Opnds, Ren, Env, S).
+
+bind_locals(Vs, Opnds, Ren, Env, S) ->
+    {Ns, Ren1, Env1} = make_locals(Vs, Ren, Env),
+    {Rs, Env2, S1} = bind_locals_1(Ns, Opnds, [], Env1, S),
+    {Rs, Ren1, Env2, S1}.
+
+%% Note that the `Vs' are currently not used for anything except the
+%% number of variables. If we were maintaining "source-referenced"
+%% flags, then the flag in the new variable should be initialized to the
+%% current value of the (residual-) referenced-flag of the "parent".
+
+bind_locals_1([N | Ns], [Opnd | Opnds], Rs, Env, S) ->
+    {R, S1} = new_ref(N, Opnd, S),
+    Env1 = env__bind(N, R, Env),
+    bind_locals_1(Ns, Opnds, [R | Rs], Env1, S1);
+bind_locals_1([], [], Rs, Env, S) ->
+    {lists:reverse(Rs), Env, S}.
+
+new_refs(Ns, Opnds, S) ->
+    new_refs(Ns, Opnds, [], S).
+
+new_refs([N | Ns], [Opnd | Opnds], Rs, S) ->
+    {R, S1} = new_ref(N, Opnd, S),
+    new_refs(Ns, Opnds, [R | Rs], S1);
+new_refs([], [], Rs, S) ->
+    {lists:reverse(Rs), S}.
+
+new_ref(N, Opnd, S) ->
+    {L, S1} = st__new_ref_loc(S),
+    {#ref{name = N, opnd = Opnd, loc = L}, S1}.
+
+%% This adds recursive bindings for the source code variables in `Es' to
+%% the environment `Env'. Note that recursive binding of a set of
+%% variables is an atomic operation on the environment - they cannot be
+%% added one at a time.
+
+bind_recursive(Vs, Opnds, Ren, Env, S) ->
+    {Ns, Ren1, Env1} = make_locals(Vs, Ren, Env),
+    {Rs, S1} = new_refs(Ns, Opnds, S),
+
+    %% When this fun-expression is evaluated, it updates the operand
+    %% structure in the ref-structure to contain the recursively defined
+    %% environment and the correct renaming.
+    Fun = fun (R, Env) ->
+		  Opnd = R#ref.opnd,
+		  R#ref{opnd = Opnd#opnd{ren = Ren1, env = Env}}
+	  end,
+    {Rs, Ren1, env__bind_recursive(Ns, Rs, Fun, Env1), S1}.
+
+safe_context(Ctxt) ->
+    case Ctxt of
+        #app{} ->
+            value;
+        _ ->
+            Ctxt
+    end.
+
+%% Note that the name of a variable encodes its type: a "plain" variable
+%% or a function variable. The latter kind also contains an arity number
+%% which should be preserved upon renaming.
+
+ref_to_var(#ref{name = Name}) ->
+    %% If we were maintaining "source-referenced" flags, the annotation
+    %% `add_ann([#source_ref{loc = L}], E)' should also be done here, to
+    %% make the algorithm reapplicable. This is however not necessary
+    %% since there are no destructive variable assignments in Erlang.
+    c_var(Name).
+
+%% Including the effort counter of the call site assures that the cost
+%% of processing an operand via `visit' is charged to the correct
+%% counter. In particular, if the effort counter of the call site was
+%% passive, the operands will also be processed with a passive counter.
+
+make_opnd(E, Ren, Env, S) ->
+    {L, S1} = st__new_opnd_loc(S),
+    C = st__get_effort(S1),
+    Opnd = #opnd{expr = E, ren = Ren, env = Env, loc = L, effort = C},
+    {Opnd, S1}.
+
+keep_referenced(Rs, S) ->
+    [R || R <- Rs, st__get_var_referenced(R#ref.loc, S)].
+
+residualize_operands(Opnds, E, S) ->
+    foldr(fun (Opnd, {E, S}) -> residualize_operand(Opnd, E, S) end,
+          {E, S}, Opnds).
+
+%% This is the only case where an operand expression can be visited in
+%% `effect' context instead of `value' context.
+
+residualize_operand(Opnd, E, S) ->
+    case st__get_opnd_effect(Opnd#opnd.loc, S) of
+        true ->
+            %% The operand has not been visited, so we do that now, but
+            %% in `effect' context. (Waddell's algoritm does some stuff
+            %% here to account specially for the operand size, which
+            %% appears unnecessary.)
+            {E1, S1} = i(Opnd#opnd.expr, effect, Opnd#opnd.ren,
+                         Opnd#opnd.env, S),
+            {make_seq(E1, E), S1};
+        false ->
+            {E, S}
+    end.
+
+%% The `visit' function always visits the operand expression in `value'
+%% context (`residualize_operand' visits an unreferenced operand
+%% expression in `effect' context when necessary). A new passive size
+%% counter is used for visiting the operand, the final value of which is
+%% then cached along with the resulting expression.
+%%
+%% Note that the effort counter of the call site, included in the
+%% operand structure, is not a shared object. Thus, the effort budget is
+%% actually reused over all occurrences of the operands of a single
+%% application. This does not appear to be a problem; just a
+%% modification of the algorithm.
+
+visit(Opnd, S) ->
+    {C, S1} = visit_1(Opnd, S),
+    {C#cache.expr, S1}.
+
+visit_and_count_size(Opnd, S) ->
+    {C, S1} = visit_1(Opnd, S),
+    {C#cache.expr, count_size(C#cache.size, S1)}.
+
+visit_1(Opnd, S) ->
+    case st__lookup_opnd_cache(Opnd#opnd.loc, S) of
+        error ->
+            %% Use a new, passive, size counter for visiting operands,
+            %% and use the effort counter of the context of the operand.
+            %% It turns out that if the latter is active, it must be the
+            %% same object as the one currently used, and if it is
+            %% passive, it does not matter if it is the same object as
+            %% any other counter.
+	    Effort = Opnd#opnd.effort,
+	    Active = counter__is_active(Effort),
+	    S1 = case Active of
+		     true ->
+			 S;    % don't change effort counter
+		     false ->
+			 st__set_effort(Effort, S)
+		 end,
+	    S2 = new_passive_size(get_size_limit(S1), S1),
+
+            %% Visit the expression and cache the result, along with the
+            %% final value of the size counter.
+            {E, S3} = i(Opnd#opnd.expr, value, Opnd#opnd.ren,
+                        Opnd#opnd.env, S2),
+            Size = get_size_value(S3),
+            C = #cache{expr = E, size = Size},
+            S4 = revert_size(S, st__set_opnd_cache(Opnd#opnd.loc, C,
+						   S3)),
+	    case Active of
+		true ->
+		    {C, S4};  % keep using the same effort counter
+		false ->
+		    {C, revert_effort(S, S4)}
+	    end;
+	{ok, C} ->
+            {C, S}
+    end.
+
+%% Create a pattern matching template for an expression. A template
+%% contains only data constructors (including atomic ones) and
+%% variables, and compound literals are not folded into a single node.
+%% Each node in the template is annotated with the variable which holds
+%% the corresponding subexpression; these are new, unique variables not
+%% existing in the given `Env'. Returns `{Template, Variables, NewEnv}',
+%% where `Variables' is the list of all variables corresponding to nodes
+%% in the template *listed in reverse dependency order*, and `NewEnv' is
+%% `Env' augmented with mappings from the variable names to
+%% subexpressions of `E' (not #ref{} structures!) rewritten so that no
+%% computations are duplicated. `Variables' is guaranteed to be nonempty
+%% - at least the root node will always be bound to a new variable.
+
+make_template(E, Env) ->
+    make_template(E, [], Env).
+
+make_template(E, Vs0, Env0) ->
+    case is_data(E) of
+	true ->
+	    {Ts, {Vs1, Env1}} = mapfoldl(
+				  fun (E, {Vs0, Env0}) ->
+					  {T, Vs1, Env1} =
+					      make_template(E, Vs0,
+							    Env0),
+					  {T, {Vs1, Env1}}
+				  end,
+				  {Vs0, Env0}, data_es(E)),
+	    T = make_data_skel(data_type(E), Ts),
+	    E1 = update_data(E, data_type(E),
+			     [hd(get_ann(T)) || T <- Ts]),
+	    V = new_var(Env1),
+	    Env2 = env__bind(var_name(V), E1, Env1),
+	    {set_ann(T, [V]), [V | Vs1], Env2};
+	false ->
+	    case type(E) of
+		seq ->
+		    %% For a sequencing, we can rebind the variable used
+		    %% for the body, and pass on the template as it is.
+		    {T, Vs1, Env1} = make_template(seq_body(E), Vs0,
+						   Env0),
+		    V = var_name(hd(get_ann(T))),
+		    E1 = update_c_seq(E, seq_arg(E), env__get(V, Env1)),
+		    Env2 = env__bind(V, E1, Env1),
+		    {T, Vs1, Env2};
+		_ ->
+		    V = new_var(Env0),
+		    Env1 = env__bind(var_name(V), E, Env0),
+		    {set_ann(V, [V]), [V | Vs0], Env1}
+	    end
+    end.
+
+%% Two clauses are equivalent if their bodies are equivalent expressions
+%% given that the respective pattern variables are local.
+
+equivalent_clauses([]) ->
+    true;
+equivalent_clauses([C | Cs]) ->
+    Env = cerl_trees:variables(c_values(clause_pats(C))),
+    equivalent_clauses_1(clause_body(C), Cs, Env).
+
+equivalent_clauses_1(E, [C | Cs], Env) ->
+    Env1 = cerl_trees:variables(c_values(clause_pats(C))),
+    case equivalent(E, clause_body(C), ordsets:union(Env, Env1)) of
+	true ->
+	    equivalent_clauses_1(E, Cs, Env);
+	false ->
+	    false
+    end;
+equivalent_clauses_1(_, [], _Env) ->
+    true.
+
+%% Two expressions are equivalent if and only if they yield the same
+%% value and has the same side effects in the same order. Currently, we
+%% only accept equality between constructors (constants) and nonlocal
+%% variables, since this should cover most cases of interest. If a
+%% variable is locally bound in one expression, it cannot be equivalent
+%% to one with the same name in the other expression, so we need not
+%% keep track of two environments.
+
+equivalent(E1, E2, Env) ->
+    case is_data(E1) of
+        true ->
+            case is_data(E2) of
+                true ->
+                    T1 = {data_type(E1), data_arity(E1)},
+                    T2 = {data_type(E2), data_arity(E2)},
+                    %% Note that we must test for exact equality.
+                    if T1 =:= T2 ->
+                            equivalent_lists(data_es(E1), data_es(E2),
+					     Env);
+                       true ->
+                            false
+                    end;
+                false ->
+                    false
+            end;
+        false ->
+	    case type(E1) of
+		var ->
+		    case is_c_var(E2) of
+			true ->
+			    N1 = var_name(E1),
+			    N2 = var_name(E2),
+			    if N1 =:= N2 ->
+				    not ordsets:is_element(N1, Env);
+			       true ->
+				    false
+			    end;
+			false ->
+			    false
+		    end;
+		_ ->
+		    %% Other constructs are not being considered.
+		    false
+	    end
+    end.
+
+equivalent_lists([E1 | Es1], [E2 | Es2], Env) ->
+    equivalent(E1, E2, Env) and equivalent_lists(Es1, Es2, Env);
+equivalent_lists([], [], _) ->
+    true;
+equivalent_lists(_, _, _) ->
+    false.
+
+%% Return `false' or `{true, EffectExpr, ValueExpr}'. The environment is
+%% passed for new-variable generation.
+
+reduce_bif_call(M, F, As, Env) ->
+    reduce_bif_call_1(M, F, length(As), As, Env).
+
+reduce_bif_call_1(erlang, element, 2, [X, Y], _Env) ->
+    case is_c_int(X) and is_c_tuple(Y) of
+	true ->
+	    %% We are free to change the relative evaluation order of
+	    %% the elements, so lifting out a particular element is OK.
+	    T = list_to_tuple(tuple_es(Y)),
+	    N = int_val(X),
+	    if integer(N), N > 0, N =< size(T) ->
+		    E = element(N, T),
+		    Es = tuple_to_list(setelement(N, T, void())),
+		    {true, make_seq(c_tuple(Es), E)};
+	       true ->
+		    false
+	    end;
+	false ->
+	    false
+    end;
+reduce_bif_call_1(erlang, hd, 1, [X], _Env) ->
+    case is_c_cons(X) of
+	true ->
+	    %% Cf. `element/2' above.
+	    {true, make_seq(cons_tl(X), cons_hd(X))};
+	false ->
+	    false
+    end;
+reduce_bif_call_1(erlang, length, 1, [X], _Env) ->
+    case is_c_list(X) of
+	true ->
+	    %% Cf. `erlang:size/1' below.
+	    {true, make_seq(X, c_int(list_length(X)))};
+	false ->
+	    false
+    end;
+reduce_bif_call_1(erlang, list_to_tuple, 1, [X], _Env) ->
+    case is_c_list(X) of
+	true ->
+	    %% This does not actually preserve all the evaluation order
+	    %% constraints of the list, but I don't imagine that it will
+	    %% be a problem.
+	    {true, c_tuple(list_elements(X))};
+	false ->
+	    false
+    end;
+reduce_bif_call_1(erlang, setelement, 3, [X, Y, Z], Env) ->
+    case is_c_int(X) and is_c_tuple(Y) of
+	true ->
+	    %% Here, unless `Z' is a simple expression, we must bind it
+	    %% to a new variable, because in that case, `Z' must be
+	    %% evaluated before any part of `Y'.
+	    T = list_to_tuple(tuple_es(Y)),
+	    N = int_val(X),
+	    if integer(N), N > 0, N =< size(T) ->
+		    E = element(N, T),
+		    case is_simple(Z) of
+			true ->
+			    Es = tuple_to_list(setelement(N, T, Z)),
+			    {true, make_seq(E, c_tuple(Es))};
+			false ->
+			    V = new_var(Env),
+			    Es = tuple_to_list(setelement(N, T, V)),
+			    E1 = make_seq(E, c_tuple(Es)),
+			    {true, c_let([V], Z, E1)}
+		    end;
+	       true ->
+		    false
+	    end;
+	false ->
+	    false
+    end;
+reduce_bif_call_1(erlang, size, 1, [X], _Env) ->
+    case is_c_tuple(X) of
+	true ->
+	    %% Just evaluate the tuple for effect and use the size (the
+	    %% arity) as the result.
+	    {true, make_seq(X, c_int(tuple_arity(X)))};
+	false ->
+	    false
+    end;
+reduce_bif_call_1(erlang, tl, 1, [X], _Env) ->
+    case is_c_cons(X) of
+	true ->
+	    %% Cf. `element/2' above.
+	    {true, make_seq(cons_hd(X), cons_tl(X))};
+	false ->
+	    false
+    end;
+reduce_bif_call_1(erlang, tuple_to_list, 1, [X], _Env) ->
+    case is_c_tuple(X) of
+	true ->
+	    %% This actually introduces slightly stronger constraints on
+	    %% the evaluation order of the subexpressions.
+	    {true, make_list(tuple_es(X))};
+	false ->
+	    false
+    end;
+reduce_bif_call_1(_M, _F, _A, _As, _Env) ->
+    false.
+
+effort_is_active(S) ->
+    counter__is_active(st__get_effort(S)).
+
+size_is_active(S) ->
+    counter__is_active(st__get_size(S)).
+
+get_effort_limit(S) ->
+    counter__limit(st__get_effort(S)).
+
+new_active_effort(Limit, S) ->
+    st__set_effort(counter__new_active(Limit), S).
+
+revert_effort(S1, S2) ->
+    st__set_effort(st__get_effort(S1), S2).
+
+new_active_size(Limit, S) ->
+    st__set_size(counter__new_active(Limit), S).
+
+new_passive_size(Limit, S) ->
+    st__set_size(counter__new_passive(Limit), S).
+
+revert_size(S1, S2) ->
+    st__set_size(st__get_size(S1), S2).
+
+count_effort(N, S) ->
+    C = st__get_effort(S),
+    C1 = counter__add(N, C, effort, S),
+    case debug_counters() of
+        true ->
+            case counter__is_active(C1) of
+                true ->
+                    V = counter__value(C1),
+                    case V > get(counter_effort_max) of
+                        true ->
+                            put(counter_effort_max, V);
+                        false ->
+                            ok
+                    end;
+                false ->
+                    ok
+            end;
+        _ ->
+            ok
+    end,
+    st__set_effort(C1, S).
+
+count_size(N, S) ->
+    C = st__get_size(S),
+    C1 = counter__add(N, C, size, S),
+    case debug_counters() of
+        true ->
+            case counter__is_active(C1) of
+                true ->
+                    V = counter__value(C1),
+                    case V > get(counter_size_max) of
+                        true ->
+                            put(counter_size_max, V);
+                        false ->
+                            ok
+                    end;
+                false ->
+                    ok
+            end;
+        _ ->
+            ok
+    end,
+    st__set_size(C1, S).
+
+get_size_value(S) ->
+    counter__value(st__get_size(S)).
+
+get_size_limit(S) ->
+    counter__limit(st__get_size(S)).
+
+kill_id_anns([{'id',_} | As]) ->
+    kill_id_anns(As);
+kill_id_anns([A | As]) ->
+    [A | kill_id_anns(As)];
+kill_id_anns([]) ->
+    [].
+
+
+%% =====================================================================
+%% General utilities
+
+max(X, Y) when X > Y -> X;
+max(_, Y) -> Y.
+
+%% The atom `ok', is widely used in Erlang for "void" values.
+
+void() -> abstract(ok).
+
+is_simple(E) ->
+    case type(E) of
+	literal -> true;
+	var -> true;
+	'fun' -> true;
+	_ -> false
+    end.
+
+get_components(N, E) ->
+    case type(E) of
+	values ->
+	    Es = values_es(E),
+	    if length(Es) == N ->
+		    {true, Es};
+	       true ->
+		    false
+	    end;
+	_ when N == 1 ->
+	    {true, [E]};
+	_ ->
+	    false
+    end.
+
+all_static([E | Es]) ->
+    case is_literal(result(E)) of
+	true ->
+	    all_static(Es);
+	false ->
+	    false
+    end;
+all_static([]) ->
+    true.
+
+set_clause_bodies([C | Cs], B) ->
+    [update_c_clause(C, clause_pats(C), clause_guard(C), B)
+     | set_clause_bodies(Cs, B)];
+set_clause_bodies([], _) ->
+    [].
+
+filename([C | T]) when integer(C), C > 0, C =< 255 ->
+    [C | filename(T)];
+filename([H|T]) ->
+    filename(H) ++ filename(T);
+filename([]) ->
+    [];
+filename(N) when atom(N) ->
+    atom_to_list(N);
+filename(N) ->
+    report_error("bad filename: `~P'.", [N, 25]),
+    exit(error).
+
+
+%% =====================================================================
+%% Abstract datatype: renaming()
+
+ren__identity() ->
+    dict:new().
+
+ren__add(X, Y, Ren) ->
+    dict:store(X, Y, Ren).
+
+ren__map(X, Ren) ->
+    case dict:find(X, Ren) of
+	{ok, Y} ->
+	    Y;
+	error ->
+	    X
+    end.
+
+ren__add_identity(X, Ren) ->
+    dict:erase(X, Ren).
+
+
+%% =====================================================================
+%% Abstract datatype: environment()
+
+env__empty() ->
+    rec_env:empty().
+
+env__bind(Key, Val, Env) ->
+    rec_env:bind(Key, Val, Env).
+
+%% `Es' should have type `[{Key, Val}]', and `Fun' should have type
+%% `(Val, Env) -> T', mapping a value together with the recursive
+%% environment itself to some term `T' to be returned when the entry is
+%% looked up.
+
+env__bind_recursive(Ks, Vs, F, Env) ->
+    rec_env:bind_recursive(Ks, Vs, F, Env).
+
+env__lookup(Key, Env) ->
+    rec_env:lookup(Key, Env).
+
+env__get(Key, Env) ->
+    rec_env:get(Key, Env).
+
+env__is_defined(Key, Env) ->
+    rec_env:is_defined(Key, Env).
+
+env__new_vname(Env) ->
+    rec_env:new_key(Env).
+
+env__new_fname(A, N, Env) ->
+    rec_env:new_key(fun (X) ->
+			S = integer_to_list(X),
+			{list_to_atom(atom_to_list(A) ++ "_" ++ S),
+			 N}
+		    end, Env).
+
+
+%% =====================================================================
+%% Abstract datatype: state()
+
+-record(state, {free,		% next free location
+		size,		% size counter
+		effort,		% effort counter
+		cache,		% operand expression cache
+		var_flags,	% flags for variables (#ref-structures)
+		opnd_flags,	% flags for operands
+		app_flags}).	% flags for #app-structures
+
+%% Note that we do not have a `var_assigned' flag, since there is no
+%% destructive assignment in Erlang. In the original algorithm, the
+%% "residual-referenced"-flags of the previous inlining pass (or
+%% initialization pass) are used as the "source-referenced"-flags for
+%% the subsequent pass. The latter may then be used as a safe
+%% approximation whenever we need to base a decision on whether or not a
+%% particular variable or function variable could be referenced in the
+%% program being generated, and computation of the new
+%% "residual-referenced" flag for that variable is not yet finished. In
+%% the present algorithm, this can only happen in the presence of
+%% variable assignments, which do not exist in Erlang. Therefore, we do
+%% not keep "source-referenced" flags for residual-code references in
+%% our implementation.
+%%
+%% The "inner-pending" flag tells us whether we are already in the
+%% process of visiting a particular operand, and the "outer-pending"
+%% flag whether we are in the process of inlining a propagated
+%% functional value. The "pending flags" are really counters limiting
+%% the number of times an operand may be inlined recursively, causing
+%% loop unrolling; however, unrolling more than one iteration does not
+%% work offhand in the present implementation. (TODO: find out why.)
+%% Note that the initial value must be greater than zero in order for
+%% any inlining at all to be done.
+
+%% Flags are stored in ETS-tables, one table for each class. The second
+%% element in each stored tuple is the key (the "label").
+
+-record(var_flags, {lab, referenced = false}).
+-record(opnd_flags, {lab, inner_pending = 1, outer_pending = 1,
+		     effect = false}).
+-record(app_flags, {lab, inlined = false}).
+
+st__new(Effort, Size) ->
+    #state{free = 0,
+	   size = counter__new_passive(Size),
+           effort = counter__new_passive(Effort),
+	   cache = dict:new(),
+	   var_flags = ets:new(var, [set, private, {keypos, 2}]),
+	   opnd_flags = ets:new(opnd, [set, private, {keypos, 2}]),
+	   app_flags = ets:new(app, [set, private, {keypos, 2}])}.
+
+st__new_loc(S) ->
+    N = S#state.free,
+    {N, S#state{free = N + 1}}.
+
+st__get_effort(S) ->
+    S#state.effort.
+
+st__set_effort(C, S) ->
+    S#state{effort = C}.
+
+st__get_size(S) ->
+    S#state.size.
+
+st__set_size(C, S) ->
+    S#state{size = C}.
+
+st__set_var_referenced(L, S) ->
+    T = S#state.var_flags,
+    [F] = ets:lookup(T, L),
+    ets:insert(T, F#var_flags{referenced = true}),
+    S.
+
+st__get_var_referenced(L, S) ->
+    ets:lookup_element(S#state.var_flags, L, #var_flags.referenced).
+
+st__lookup_opnd_cache(L, S) ->
+    dict:find(L, S#state.cache).
+
+%% Note that setting the cache should only be done once.
+
+st__set_opnd_cache(L, C, S) ->
+    S#state{cache = dict:store(L, C, S#state.cache)}.
+
+st__set_opnd_effect(L, S) ->
+    T = S#state.opnd_flags,
+    [F] = ets:lookup(T, L),
+    ets:insert(T, F#opnd_flags{effect = true}),
+    S.
+
+st__get_opnd_effect(L, S) ->
+    ets:lookup_element(S#state.opnd_flags, L, #opnd_flags.effect).
+
+st__set_app_inlined(L, S) ->
+    T = S#state.app_flags,
+    [F] = ets:lookup(T, L),
+    ets:insert(T, F#app_flags{inlined = true}),
+    S.
+
+st__clear_app_inlined(L, S) ->
+    T = S#state.app_flags,
+    [F] = ets:lookup(T, L),
+    ets:insert(T, F#app_flags{inlined = false}),
+    S.
+
+st__get_app_inlined(L, S) ->
+    ets:lookup_element(S#state.app_flags, L, #app_flags.inlined).
+
+%% The pending-flags are initialized by `st__new_opnd_loc' below.
+
+st__test_inner_pending(L, S) ->
+    T = S#state.opnd_flags,
+    P = ets:lookup_element(T, L, #opnd_flags.inner_pending),
+    P =< 0.
+
+st__mark_inner_pending(L, S) ->
+    ets:update_counter(S#state.opnd_flags, L,
+		       {#opnd_flags.inner_pending, -1}),
+    S.
+
+st__clear_inner_pending(L, S) ->
+    ets:update_counter(S#state.opnd_flags, L,
+		       {#opnd_flags.inner_pending, 1}),
+    S.
+
+st__test_outer_pending(L, S) ->
+    T = S#state.opnd_flags,
+    P = ets:lookup_element(T, L, #opnd_flags.outer_pending),
+    P =< 0.
+
+st__mark_outer_pending(L, S) ->
+    ets:update_counter(S#state.opnd_flags, L,
+		       {#opnd_flags.outer_pending, -1}),
+    S.
+
+st__clear_outer_pending(L, S) ->
+    ets:update_counter(S#state.opnd_flags, L,
+		       {#opnd_flags.outer_pending, 1}),
+    S.
+
+st__new_app_loc(S) ->
+    V = {L, _S1} = st__new_loc(S),
+    ets:insert(S#state.app_flags, #app_flags{lab = L}),
+    V.
+
+st__new_ref_loc(S) ->
+    V = {L, _S1} = st__new_loc(S),
+    ets:insert(S#state.var_flags, #var_flags{lab = L}),
+    V.
+
+st__new_opnd_loc(S) ->
+    V = {L, _S1} = st__new_loc(S),
+    ets:insert(S#state.opnd_flags, #opnd_flags{lab = L}),
+    V.
+
+
+%% =====================================================================
+%% Abstract datatype: counter()
+%%
+%% `counter__add' throws `{counter_exceeded, Type, Data}' if the
+%% resulting counter value would exceed the limit for the counter in
+%% question (`Type' and `Data' are given by the user).
+
+-record(counter, {active, value, limit}).
+
+counter__new_passive(Limit) when Limit > 0 ->
+    {0, Limit}.
+
+counter__new_active(Limit) when Limit > 0 ->
+    {Limit, Limit}.
+
+%% Active counters have values > 0 internally; passive counters start at
+%% zero. The 'limit' field is only accessed by the 'counter__limit'
+%% function.
+
+counter__is_active({C, _}) ->
+    C > 0.
+
+counter__limit({_, L}) ->
+    L.
+
+counter__value({N, L}) ->
+    if N > 0 ->
+	    L - N;
+       true ->
+            -N
+    end.
+
+counter__add(N, {V, L}, Type, Data) ->
+    N1 = V - N,
+    if V > 0, N1 =< 0 ->
+	    case debug_counters() of
+		true ->
+		    case Type of
+			effort ->
+			    put(counter_effort_triggers,
+				get(counter_effort_triggers) + 1);
+			size ->
+			    put(counter_size_triggers,
+				get(counter_size_triggers) + 1)
+		    end;
+		_ ->
+		    ok
+	    end,
+	    throw({counter_exceeded, Type, Data});
+       true ->
+	    {N1, L}
+    end.
+
+
+%% =====================================================================
+%% Reporting
+
+% report_internal_error(S) ->
+%     report_internal_error(S, []).
+
+report_internal_error(S, Vs) ->
+    report_error("internal error: " ++ S, Vs).
+
+report_error(D) ->
+    report_error(D, []).
+
+report_error({F, L, D}, Vs) ->
+    report({F, L, {error, D}}, Vs);
+report_error(D, Vs) ->
+    report({error, D}, Vs).
+
+report_warning(D) ->
+    report_warning(D, []).
+
+report_warning({F, L, D}, Vs) ->
+    report({F, L, {warning, D}}, Vs);
+report_warning(D, Vs) ->
+    report({warning, D}, Vs).
+
+report(D, Vs) ->
+    io:put_chars(format(D, Vs)).
+
+format({error, D}, Vs) ->
+    ["error: ", format(D, Vs)];
+format({warning, D}, Vs) ->
+    ["warning: ", format(D, Vs)];
+format({"", L, D}, Vs) when integer(L), L > 0 ->
+    [io_lib:fwrite("~w: ", [L]), format(D, Vs)];
+format({"", _L, D}, Vs) ->
+    format(D, Vs);
+format({F, L, D}, Vs) when integer(L), L > 0 ->
+    [io_lib:fwrite("~s:~w: ", [filename(F), L]), format(D, Vs)];
+format({F, _L, D}, Vs) ->
+    [io_lib:fwrite("~s: ", [filename(F)]), format(D, Vs)];
+format(S, Vs) when list(S) ->
+    [io_lib:fwrite(S, Vs), $\n].
+
+
+%% =====================================================================
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_trees.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_trees.erl
new file mode 100644
index 0000000000..afe7c8708b
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_trees.erl
@@ -0,0 +1,801 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Richard Carlsson.
+%% Copyright (C) 1999-2002 Richard Carlsson.
+%% Portions created by Ericsson are Copyright 2001, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: cerl_trees.erl,v 1.2 2010/06/07 06:32:39 kostis Exp $
+
+%% @doc Basic functions on Core Erlang abstract syntax trees.
+%%
+%% <p>Syntax trees are defined in the module <a
+%% href=""><code>cerl</code></a>.</p>
+%%
+%% @type cerl() = cerl:cerl()
+
+-module(cerl_trees).
+
+-export([depth/1, fold/3, free_variables/1, label/1, label/2, map/2,
+	 mapfold/3, size/1, variables/1]).
+
+-import(cerl, [alias_pat/1, alias_var/1, ann_c_alias/3, ann_c_apply/3,
+	       ann_c_binary/2, ann_c_bitstr/6, ann_c_call/4,
+	       ann_c_case/3, ann_c_catch/2, ann_c_clause/4,
+	       ann_c_cons_skel/3, ann_c_fun/3, ann_c_let/4,
+	       ann_c_letrec/3, ann_c_module/5, ann_c_primop/3,
+	       ann_c_receive/4, ann_c_seq/3, ann_c_try/6,
+	       ann_c_tuple_skel/2, ann_c_values/2, apply_args/1,
+	       apply_op/1, binary_segments/1, bitstr_val/1,
+	       bitstr_size/1, bitstr_unit/1, bitstr_type/1,
+	       bitstr_flags/1, call_args/1, call_module/1, call_name/1,
+	       case_arg/1, case_clauses/1, catch_body/1, clause_body/1,
+	       clause_guard/1, clause_pats/1, clause_vars/1, concrete/1,
+	       cons_hd/1, cons_tl/1, fun_body/1, fun_vars/1, get_ann/1,
+	       let_arg/1, let_body/1, let_vars/1, letrec_body/1,
+	       letrec_defs/1, letrec_vars/1, module_attrs/1,
+	       module_defs/1, module_exports/1, module_name/1,
+	       module_vars/1, primop_args/1, primop_name/1,
+	       receive_action/1, receive_clauses/1, receive_timeout/1,
+	       seq_arg/1, seq_body/1, set_ann/2, subtrees/1, try_arg/1,
+	       try_body/1, try_vars/1, try_evars/1, try_handler/1,
+	       tuple_es/1, type/1, update_c_alias/3, update_c_apply/3,
+	       update_c_binary/2, update_c_bitstr/6, update_c_call/4,
+	       update_c_case/3, update_c_catch/2, update_c_clause/4,
+	       update_c_cons/3, update_c_cons_skel/3, update_c_fun/3,
+	       update_c_let/4, update_c_letrec/3, update_c_module/5,
+	       update_c_primop/3, update_c_receive/4, update_c_seq/3,
+	       update_c_try/6, update_c_tuple/2, update_c_tuple_skel/2,
+	       update_c_values/2, values_es/1, var_name/1]).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec depth(Tree::cerl) -> integer()
+%%
+%% @doc Returns the length of the longest path in the tree.  A leaf
+%% node has depth zero, the tree representing "<code>{foo,
+%% bar}</code>" has depth one, etc.
+
+depth(T) ->
+    case subtrees(T) of
+	[] ->
+	    0;
+	Gs ->
+	    1 + lists:foldl(fun (G, A) -> erlang:max(depth_1(G), A) end, 0, Gs)
+    end.
+
+depth_1(Ts) ->
+    lists:foldl(fun (T, A) -> erlang:max(depth(T), A) end, 0, Ts).
+
+%% max(X, Y) when X > Y -> X;
+%% max(_, Y) -> Y.
+
+
+%% @spec size(Tree::cerl()) -> integer()
+%%
+%% @doc Returns the number of nodes in <code>Tree</code>.
+
+size(T) ->
+    fold(fun (_, S) -> S + 1 end, 0, T).
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec map(Function, Tree::cerl()) -> cerl()
+%%
+%%	   Function = (cerl()) -> cerl()
+%%
+%% @doc Maps a function onto the nodes of a tree. This replaces each
+%% node in the tree by the result of applying the given function on
+%% the original node, bottom-up.
+%%
+%% @see mapfold/3
+
+map(F, T) ->
+    F(map_1(F, T)).
+
+map_1(F, T) ->
+    case type(T) of
+	literal ->
+	    case concrete(T) of
+		[_ | _] ->
+		    update_c_cons(T, map(F, cons_hd(T)),
+				  map(F, cons_tl(T)));
+		V when tuple_size(V) > 0 ->
+		    update_c_tuple(T, map_list(F, tuple_es(T)));
+		_ ->
+		    T
+	    end;
+	var ->
+	    T;
+	values ->
+	    update_c_values(T, map_list(F, values_es(T)));
+	cons ->
+	    update_c_cons_skel(T, map(F, cons_hd(T)),
+			       map(F, cons_tl(T)));
+	tuple ->
+	    update_c_tuple_skel(T, map_list(F, tuple_es(T)));
+	'let' ->
+	    update_c_let(T, map_list(F, let_vars(T)),
+			 map(F, let_arg(T)),
+			 map(F, let_body(T)));
+	seq ->
+	    update_c_seq(T, map(F, seq_arg(T)),
+			 map(F, seq_body(T)));
+	apply ->
+	    update_c_apply(T, map(F, apply_op(T)),
+			   map_list(F, apply_args(T)));
+	call ->
+	    update_c_call(T, map(F, call_module(T)),
+			  map(F, call_name(T)),
+			  map_list(F, call_args(T)));
+	primop ->
+	    update_c_primop(T, map(F, primop_name(T)),
+			    map_list(F, primop_args(T)));
+	'case' ->
+	    update_c_case(T, map(F, case_arg(T)),
+			  map_list(F, case_clauses(T)));
+	clause ->
+	    update_c_clause(T, map_list(F, clause_pats(T)),
+			    map(F, clause_guard(T)),
+			    map(F, clause_body(T)));
+	alias ->
+	    update_c_alias(T, map(F, alias_var(T)),
+			   map(F, alias_pat(T)));
+	'fun' ->
+	    update_c_fun(T, map_list(F, fun_vars(T)),
+			 map(F, fun_body(T)));
+	'receive' ->
+	    update_c_receive(T, map_list(F, receive_clauses(T)),
+			     map(F, receive_timeout(T)),
+			     map(F, receive_action(T)));
+	'try' ->
+	    update_c_try(T, map(F, try_arg(T)),
+			 map_list(F, try_vars(T)),
+			 map(F, try_body(T)),
+			 map_list(F, try_evars(T)),
+			 map(F, try_handler(T)));
+	'catch' ->
+	    update_c_catch(T, map(F, catch_body(T)));
+	binary ->
+	    update_c_binary(T, map_list(F, binary_segments(T)));
+	bitstr ->
+	    update_c_bitstr(T, map(F, bitstr_val(T)),
+			    map(F, bitstr_size(T)),
+			    map(F, bitstr_unit(T)),
+			    map(F, bitstr_type(T)),
+			    map(F, bitstr_flags(T)));
+	letrec ->
+	    update_c_letrec(T, map_pairs(F, letrec_defs(T)),
+			    map(F, letrec_body(T)));
+	module ->
+	    update_c_module(T, map(F, module_name(T)),
+			    map_list(F, module_exports(T)),
+			    map_pairs(F, module_attrs(T)),
+			    map_pairs(F, module_defs(T)))
+    end.
+
+map_list(F, [T | Ts]) ->
+    [map(F, T) | map_list(F, Ts)];
+map_list(_, []) ->
+    [].
+
+map_pairs(F, [{T1, T2} | Ps]) ->
+    [{map(F, T1), map(F, T2)} | map_pairs(F, Ps)];
+map_pairs(_, []) ->
+    [].
+
+
+%% @spec fold(Function, Unit::term(), Tree::cerl()) -> term()
+%%
+%%    Function = (cerl(), term()) -> term()
+%%
+%% @doc Does a fold operation over the nodes of the tree. The result
+%% is the value of <code>Function(X1, Function(X2, ... Function(Xn,
+%% Unit) ... ))</code>, where <code>X1, ..., Xn</code> are the nodes
+%% of <code>Tree</code> in a post-order traversal.
+%%
+%% @see mapfold/3
+
+fold(F, S, T) ->
+    F(T, fold_1(F, S, T)).
+
+fold_1(F, S, T) ->
+    case type(T) of
+	literal ->
+	    case concrete(T) of
+		[_ | _] ->
+		    fold(F, fold(F, S, cons_hd(T)), cons_tl(T));
+		V when tuple_size(V) > 0 ->
+		    fold_list(F, S, tuple_es(T));
+		_ ->
+		    S
+	    end;
+	var ->
+	    S;
+	values ->
+	    fold_list(F, S, values_es(T));
+	cons ->
+	    fold(F, fold(F, S, cons_hd(T)), cons_tl(T));
+	tuple ->
+	    fold_list(F, S, tuple_es(T));
+	'let' ->
+	    fold(F, fold(F, fold_list(F, S, let_vars(T)),
+			 let_arg(T)),
+		 let_body(T));
+	seq ->
+	    fold(F, fold(F, S, seq_arg(T)), seq_body(T));
+	apply ->
+	    fold_list(F, fold(F, S, apply_op(T)), apply_args(T));
+	call ->
+	    fold_list(F, fold(F, fold(F, S, call_module(T)),
+			      call_name(T)),
+		      call_args(T));
+	primop ->
+	    fold_list(F, fold(F, S, primop_name(T)), primop_args(T));
+	'case' ->
+	    fold_list(F, fold(F, S, case_arg(T)), case_clauses(T));
+	clause ->
+	    fold(F, fold(F, fold_list(F, S, clause_pats(T)),
+			 clause_guard(T)),
+		 clause_body(T));
+	alias ->
+	    fold(F, fold(F, S, alias_var(T)), alias_pat(T));
+	'fun' ->
+	    fold(F, fold_list(F, S, fun_vars(T)), fun_body(T));
+	'receive' ->
+	    fold(F, fold(F, fold_list(F, S, receive_clauses(T)),
+			 receive_timeout(T)),
+		 receive_action(T));
+	'try' ->
+	    fold(F, fold_list(F, fold(F, fold_list(F, fold(F, S, try_arg(T)),
+						   try_vars(T)),
+				      try_body(T)),
+			      try_evars(T)),
+		 try_handler(T));
+	'catch' ->
+	    fold(F, S, catch_body(T));
+	binary ->
+	    fold_list(F, S, binary_segments(T));
+	bitstr ->
+	    fold(F,
+		 fold(F,
+		      fold(F,
+			   fold(F,
+				fold(F, S, bitstr_val(T)),
+				bitstr_size(T)),
+			   bitstr_unit(T)),
+		      bitstr_type(T)),
+		 bitstr_flags(T));
+	letrec ->
+	    fold(F, fold_pairs(F, S, letrec_defs(T)), letrec_body(T));
+	module ->
+	    fold_pairs(F,
+		       fold_pairs(F,
+				  fold_list(F,
+					    fold(F, S, module_name(T)),
+					    module_exports(T)),
+				  module_attrs(T)),
+		       module_defs(T))
+    end.
+
+fold_list(F, S, [T | Ts]) ->
+    fold_list(F, fold(F, S, T), Ts);
+fold_list(_, S, []) ->
+    S.
+
+fold_pairs(F, S, [{T1, T2} | Ps]) ->
+    fold_pairs(F, fold(F, fold(F, S, T1), T2), Ps);
+fold_pairs(_, S, []) ->
+    S.
+
+
+%% @spec mapfold(Function, Initial::term(), Tree::cerl()) ->
+%%           {cerl(), term()}
+%%
+%%    Function = (cerl(), term()) -> {cerl(), term()}
+%%
+%% @doc Does a combined map/fold operation on the nodes of the
+%% tree. This is similar to <code>map/2</code>, but also propagates a
+%% value from each application of <code>Function</code> to the next,
+%% starting with the given value <code>Initial</code>, while doing a
+%% post-order traversal of the tree, much like <code>fold/3</code>.
+%%
+%% @see map/2
+%% @see fold/3
+
+mapfold(F, S0, T) ->
+    case type(T) of
+	literal ->
+	    case concrete(T) of
+		[_ | _] ->
+		    {T1, S1} = mapfold(F, S0, cons_hd(T)),
+		    {T2, S2} = mapfold(F, S1, cons_tl(T)),
+		    F(update_c_cons(T, T1, T2), S2);
+		V when tuple_size(V) > 0 ->
+		    {Ts, S1} = mapfold_list(F, S0, tuple_es(T)),
+		    F(update_c_tuple(T, Ts), S1);
+		_ ->
+		    F(T, S0)
+	    end;
+	var ->
+	    F(T, S0);
+	values ->
+	    {Ts, S1} = mapfold_list(F, S0, values_es(T)),
+	    F(update_c_values(T, Ts), S1);
+	cons ->
+	    {T1, S1} = mapfold(F, S0, cons_hd(T)),
+	    {T2, S2} = mapfold(F, S1, cons_tl(T)),
+	    F(update_c_cons_skel(T, T1, T2), S2);
+	tuple ->
+	    {Ts, S1} = mapfold_list(F, S0, tuple_es(T)),
+	    F(update_c_tuple_skel(T, Ts), S1);
+	'let' ->
+	    {Vs, S1} = mapfold_list(F, S0, let_vars(T)),
+	    {A, S2} = mapfold(F, S1, let_arg(T)),
+	    {B, S3} = mapfold(F, S2, let_body(T)),
+	    F(update_c_let(T, Vs, A, B), S3);
+	seq ->
+	    {A, S1} = mapfold(F, S0, seq_arg(T)),
+	    {B, S2} = mapfold(F, S1, seq_body(T)),
+	    F(update_c_seq(T, A, B), S2);
+	apply ->
+	    {E, S1} = mapfold(F, S0, apply_op(T)),
+	    {As, S2} = mapfold_list(F, S1, apply_args(T)),
+	    F(update_c_apply(T, E, As), S2);
+	call ->
+	    {M, S1} = mapfold(F, S0, call_module(T)),
+	    {N, S2} = mapfold(F, S1, call_name(T)),
+	    {As, S3} = mapfold_list(F, S2, call_args(T)),
+	    F(update_c_call(T, M, N, As), S3);
+	primop ->
+	    {N, S1} = mapfold(F, S0, primop_name(T)),
+	    {As, S2} = mapfold_list(F, S1, primop_args(T)),
+	    F(update_c_primop(T, N, As), S2);
+	'case' ->
+	    {A, S1} = mapfold(F, S0, case_arg(T)),
+	    {Cs, S2} = mapfold_list(F, S1, case_clauses(T)),
+	    F(update_c_case(T, A, Cs), S2);
+	clause ->
+	    {Ps, S1} = mapfold_list(F, S0, clause_pats(T)),
+	    {G, S2} = mapfold(F, S1, clause_guard(T)),
+	    {B, S3} = mapfold(F, S2, clause_body(T)),
+	    F(update_c_clause(T, Ps, G, B), S3);
+	alias ->
+	    {V, S1} = mapfold(F, S0, alias_var(T)),
+	    {P, S2} = mapfold(F, S1, alias_pat(T)),
+	    F(update_c_alias(T, V, P), S2);
+	'fun' ->
+	    {Vs, S1} = mapfold_list(F, S0, fun_vars(T)),
+	    {B, S2} = mapfold(F, S1, fun_body(T)),
+	    F(update_c_fun(T, Vs, B), S2);
+	'receive' ->
+	    {Cs, S1} = mapfold_list(F, S0, receive_clauses(T)),
+	    {E, S2} = mapfold(F, S1, receive_timeout(T)),
+	    {A, S3} = mapfold(F, S2, receive_action(T)),
+	    F(update_c_receive(T, Cs, E, A), S3);
+	'try' ->
+	    {E, S1} = mapfold(F, S0, try_arg(T)),
+	    {Vs, S2} = mapfold_list(F, S1, try_vars(T)),
+	    {B, S3} = mapfold(F, S2, try_body(T)),
+	    {Evs, S4} = mapfold_list(F, S3, try_evars(T)),
+	    {H, S5} = mapfold(F, S4, try_handler(T)),
+	    F(update_c_try(T, E, Vs, B, Evs, H), S5);
+	'catch' ->
+	    {B, S1} = mapfold(F, S0, catch_body(T)),
+	    F(update_c_catch(T, B), S1);
+	binary ->
+	    {Ds, S1} = mapfold_list(F, S0, binary_segments(T)),
+	    F(update_c_binary(T, Ds), S1);
+	bitstr ->
+	    {Val, S1} = mapfold(F, S0, bitstr_val(T)),
+	    {Size, S2} = mapfold(F, S1, bitstr_size(T)),
+	    {Unit, S3} = mapfold(F, S2, bitstr_unit(T)),
+	    {Type, S4} = mapfold(F, S3, bitstr_type(T)),
+	    {Flags, S5} = mapfold(F, S4, bitstr_flags(T)),
+	    F(update_c_bitstr(T, Val, Size, Unit, Type, Flags), S5);
+	letrec ->
+	    {Ds, S1} = mapfold_pairs(F, S0, letrec_defs(T)),
+	    {B, S2} = mapfold(F, S1, letrec_body(T)),
+	    F(update_c_letrec(T, Ds, B), S2);
+	module ->
+	    {N, S1} = mapfold(F, S0, module_name(T)),
+	    {Es, S2} = mapfold_list(F, S1, module_exports(T)),
+	    {As, S3} = mapfold_pairs(F, S2, module_attrs(T)),
+	    {Ds, S4} = mapfold_pairs(F, S3, module_defs(T)),
+	    F(update_c_module(T, N, Es, As, Ds), S4)
+    end.
+
+mapfold_list(F, S0, [T | Ts]) ->
+    {T1, S1} = mapfold(F, S0, T),
+    {Ts1, S2} = mapfold_list(F, S1, Ts),
+    {[T1 | Ts1], S2};
+mapfold_list(_, S, []) ->
+    {[], S}.
+
+mapfold_pairs(F, S0, [{T1, T2} | Ps]) ->
+    {T3, S1} = mapfold(F, S0, T1),
+    {T4, S2} = mapfold(F, S1, T2),
+    {Ps1, S3} = mapfold_pairs(F, S2, Ps),
+    {[{T3, T4} | Ps1], S3};
+mapfold_pairs(_, S, []) ->
+    {[], S}.
+
+
+%% ---------------------------------------------------------------------
+
+%% @spec variables(Tree::cerl()) -> [var_name()]
+%%
+%%	    var_name() = integer() | atom() | {atom(), integer()}
+%%
+%% @doc Returns an ordered-set list of the names of all variables in
+%% the syntax tree. (This includes function name variables.) An
+%% exception is thrown if <code>Tree</code> does not represent a
+%% well-formed Core Erlang syntax tree.
+%%
+%% @see free_variables/1
+
+variables(T) ->
+    variables(T, false).
+
+
+%% @spec free_variables(Tree::cerl()) -> [var_name()]
+%%
+%% @doc Like <code>variables/1</code>, but only includes variables
+%% that are free in the tree.
+%%
+%% @see variables/1
+
+free_variables(T) ->
+    variables(T, true).
+
+
+%% This is not exported
+
+variables(T, S) ->
+    case type(T) of
+	literal ->
+	    [];
+	var ->
+	    [var_name(T)];
+	values ->
+	    vars_in_list(values_es(T), S);
+	cons ->
+	    ordsets:union(variables(cons_hd(T), S),
+			  variables(cons_tl(T), S));
+	tuple ->
+	    vars_in_list(tuple_es(T), S);
+	'let' ->
+	    Vs = variables(let_body(T), S),
+	    Vs1 = var_list_names(let_vars(T)),
+	    Vs2 = case S of
+		      true ->
+			  ordsets:subtract(Vs, Vs1);
+		      false ->
+			  ordsets:union(Vs, Vs1)
+		  end,
+	    ordsets:union(variables(let_arg(T), S), Vs2);
+	seq ->
+	    ordsets:union(variables(seq_arg(T), S),
+			  variables(seq_body(T), S));
+	apply ->
+	    ordsets:union(
+	      variables(apply_op(T), S),
+	      vars_in_list(apply_args(T), S));
+	call ->
+	    ordsets:union(variables(call_module(T), S),
+			  ordsets:union(
+			    variables(call_name(T), S),
+			    vars_in_list(call_args(T), S)));
+	primop ->
+	    vars_in_list(primop_args(T), S);
+	'case' ->
+	    ordsets:union(variables(case_arg(T), S),
+			  vars_in_list(case_clauses(T), S));
+	clause ->
+	    Vs = ordsets:union(variables(clause_guard(T), S),
+			       variables(clause_body(T), S)),
+	    Vs1 = vars_in_list(clause_pats(T), S),
+	    case S of
+		true ->
+		    ordsets:subtract(Vs, Vs1);
+		false ->
+		    ordsets:union(Vs, Vs1)
+	    end;
+	alias ->
+	    ordsets:add_element(var_name(alias_var(T)),
+				variables(alias_pat(T)));
+	'fun' ->
+	    Vs = variables(fun_body(T), S),
+	    Vs1 = var_list_names(fun_vars(T)),
+	    case S of
+		true ->
+		    ordsets:subtract(Vs, Vs1);
+		false ->
+		    ordsets:union(Vs, Vs1)
+	    end;
+	'receive' ->
+	    ordsets:union(
+	      vars_in_list(receive_clauses(T), S),
+	      ordsets:union(variables(receive_timeout(T), S),
+			    variables(receive_action(T), S)));
+	'try' ->
+	    Vs = variables(try_body(T), S),
+	    Vs1 = var_list_names(try_vars(T)),
+	    Vs2 = case S of
+		      true ->
+			  ordsets:subtract(Vs, Vs1);
+		      false ->
+			  ordsets:union(Vs, Vs1)
+		  end,
+	    Vs3 = variables(try_handler(T), S),
+	    Vs4 = var_list_names(try_evars(T)),
+	    Vs5 = case S of
+		      true ->
+			  ordsets:subtract(Vs3, Vs4);
+		      false ->
+			  ordsets:union(Vs3, Vs4)
+		  end,
+	    ordsets:union(variables(try_arg(T), S),
+			  ordsets:union(Vs2, Vs5));
+	'catch' ->
+	    variables(catch_body(T), S);
+	binary ->
+	    vars_in_list(binary_segments(T), S);
+	bitstr ->
+	    ordsets:union(variables(bitstr_val(T), S),
+			  variables(bitstr_size(T), S));
+	letrec ->
+	    Vs = vars_in_defs(letrec_defs(T), S),
+	    Vs1 = ordsets:union(variables(letrec_body(T), S), Vs),
+	    Vs2 = var_list_names(letrec_vars(T)),
+	    case S of
+		true ->
+		    ordsets:subtract(Vs1, Vs2);
+		false ->
+		    ordsets:union(Vs1, Vs2)
+	    end;
+	module ->
+	    Vs = vars_in_defs(module_defs(T), S),
+	    Vs1 = ordsets:union(vars_in_list(module_exports(T), S), Vs),
+	    Vs2 = var_list_names(module_vars(T)),
+	    case S of
+		true ->
+		    ordsets:subtract(Vs1, Vs2);
+		false ->
+		    ordsets:union(Vs1, Vs2)
+	    end
+    end.
+
+vars_in_list(Ts, S) ->
+    vars_in_list(Ts, S, []).
+
+vars_in_list([T | Ts], S, A) ->
+    vars_in_list(Ts, S, ordsets:union(variables(T, S), A));
+vars_in_list([], _, A) ->
+    A.
+
+%% Note that this function only visits the right-hand side of function
+%% definitions.
+
+vars_in_defs(Ds, S) ->
+    vars_in_defs(Ds, S, []).
+
+vars_in_defs([{_, F} | Ds], S, A) ->
+    vars_in_defs(Ds, S, ordsets:union(variables(F, S), A));
+vars_in_defs([], _, A) ->
+    A.
+
+%% This amounts to insertion sort. Since the lists are generally short,
+%% it is hardly worthwhile to use an asymptotically better sort.
+
+var_list_names(Vs) ->
+    var_list_names(Vs, []).
+
+var_list_names([V | Vs], A) ->
+    var_list_names(Vs, ordsets:add_element(var_name(V), A));
+var_list_names([], A) ->
+    A.
+
+
+%% ---------------------------------------------------------------------
+
+%% label(Tree::cerl()) -> {cerl(), integer()}
+%%
+%% @equiv label(Tree, 0)
+
+label(T) ->
+    label(T, 0).
+
+%% @spec label(Tree::cerl(), N::integer()) -> {cerl(), integer()}
+%%
+%% @doc Labels each expression in the tree. A term <code>{label,
+%% L}</code> is prefixed to the annotation list of each expression node,
+%% where L is a unique number for every node, except for variables (and
+%% function name variables) which get the same label if they represent
+%% the same variable. Constant literal nodes are not labeled.
+%%
+%% <p>The returned value is a tuple <code>{NewTree, Max}</code>, where
+%% <code>NewTree</code> is the labeled tree and <code>Max</code> is 1
+%% plus the largest label value used. All previous annotation terms on
+%% the form <code>{label, X}</code> are deleted.</p>
+%%
+%% <p>The values of L used in the tree is a dense range from
+%% <code>N</code> to <code>Max - 1</code>, where <code>N =&lt; Max
+%% =&lt; N + size(Tree)</code>. Note that it is possible that no
+%% labels are used at all, i.e., <code>N = Max</code>.</p>
+%%
+%% <p>Note: All instances of free variables will be given distinct
+%% labels.</p>
+%%
+%% @see label/1
+%% @see size/1
+
+label(T, N) ->
+    label(T, N, dict:new()).
+
+label(T, N, Env) ->
+    case type(T) of
+	literal ->
+	    %% Constant literals are not labeled.
+	    {T, N};
+	var ->
+	    case dict:find(var_name(T), Env) of
+		{ok, L} ->
+		    {As, _} = label_ann(T, L),
+		    N1 = N;
+		error ->
+		    {As, N1} = label_ann(T, N)
+	    end,
+	    {set_ann(T, As), N1};
+	values ->
+	    {Ts, N1} = label_list(values_es(T), N, Env),
+	    {As, N2} = label_ann(T, N1),
+	    {ann_c_values(As, Ts), N2};
+	cons ->
+	    {T1, N1} = label(cons_hd(T), N, Env),
+	    {T2, N2} = label(cons_tl(T), N1, Env),
+	    {As, N3} = label_ann(T, N2),
+	    {ann_c_cons_skel(As, T1, T2), N3};
+	tuple ->
+	    {Ts, N1} = label_list(tuple_es(T), N, Env),
+	    {As, N2} = label_ann(T, N1),
+	    {ann_c_tuple_skel(As, Ts), N2};
+	'let' ->
+	    {A, N1} = label(let_arg(T), N, Env),
+	    {Vs, N2, Env1} = label_vars(let_vars(T), N1, Env),
+	    {B, N3} = label(let_body(T), N2, Env1),
+	    {As, N4} = label_ann(T, N3),
+	    {ann_c_let(As, Vs, A, B), N4};
+	seq ->
+	    {A, N1} = label(seq_arg(T), N, Env),
+	    {B, N2} = label(seq_body(T), N1, Env),
+	    {As, N3} = label_ann(T, N2),
+	    {ann_c_seq(As, A, B), N3};
+	apply ->
+	    {E, N1} = label(apply_op(T), N, Env),
+	    {Es, N2} = label_list(apply_args(T), N1, Env),
+	    {As, N3} = label_ann(T, N2),
+	    {ann_c_apply(As, E, Es), N3};
+	call ->
+	    {M, N1} = label(call_module(T), N, Env),
+	    {F, N2} = label(call_name(T), N1, Env),
+	    {Es, N3} = label_list(call_args(T), N2, Env),
+	    {As, N4} = label_ann(T, N3),
+	    {ann_c_call(As, M, F, Es), N4};
+	primop ->
+	    {F, N1} = label(primop_name(T), N, Env),
+	    {Es, N2} = label_list(primop_args(T), N1, Env),
+	    {As, N3} = label_ann(T, N2),
+	    {ann_c_primop(As, F, Es), N3};
+	'case' ->
+	    {A, N1} = label(case_arg(T), N, Env),
+	    {Cs, N2} = label_list(case_clauses(T), N1, Env),
+	    {As, N3} = label_ann(T, N2),
+	    {ann_c_case(As, A, Cs), N3};
+	clause ->
+	    {_, N1, Env1} = label_vars(clause_vars(T), N, Env),
+	    {Ps, N2} = label_list(clause_pats(T), N1, Env1),
+	    {G, N3} = label(clause_guard(T), N2, Env1),
+	    {B, N4} = label(clause_body(T), N3, Env1),
+	    {As, N5} = label_ann(T, N4),
+	    {ann_c_clause(As, Ps, G, B), N5};
+	alias ->
+	    {V, N1} = label(alias_var(T), N, Env),
+	    {P, N2} = label(alias_pat(T), N1, Env),
+	    {As, N3} = label_ann(T, N2),
+	    {ann_c_alias(As, V, P), N3};
+	'fun' ->
+	    {Vs, N1, Env1} = label_vars(fun_vars(T), N, Env),
+	    {B, N2} = label(fun_body(T), N1, Env1),
+	    {As, N3} = label_ann(T, N2),
+	    {ann_c_fun(As, Vs, B), N3};
+	'receive' ->
+	    {Cs, N1} = label_list(receive_clauses(T), N, Env),
+	    {E, N2} = label(receive_timeout(T), N1, Env),
+	    {A, N3} = label(receive_action(T), N2, Env),
+	    {As, N4} = label_ann(T, N3),
+	    {ann_c_receive(As, Cs, E, A), N4};
+	'try' ->
+	    {E, N1} = label(try_arg(T), N, Env),
+	    {Vs, N2, Env1} = label_vars(try_vars(T), N1, Env),
+	    {B, N3} = label(try_body(T), N2, Env1),
+	    {Evs, N4, Env2} = label_vars(try_evars(T), N3, Env),
+	    {H, N5} = label(try_handler(T), N4, Env2),
+	    {As, N6} = label_ann(T, N5),
+	    {ann_c_try(As, E, Vs, B, Evs, H), N6};
+	'catch' ->
+	    {B, N1} = label(catch_body(T), N, Env),
+	    {As, N2} = label_ann(T, N1),
+	    {ann_c_catch(As, B), N2};
+	binary ->
+	    {Ds, N1} = label_list(binary_segments(T), N, Env),
+	    {As, N2} = label_ann(T, N1),
+	    {ann_c_binary(As, Ds), N2};
+	bitstr ->
+	    {Val, N1} = label(bitstr_val(T), N, Env),
+	    {Size, N2} = label(bitstr_size(T), N1, Env),
+	    {Unit, N3} = label(bitstr_unit(T), N2, Env),
+	    {Type, N4} = label(bitstr_type(T), N3, Env),
+	    {Flags, N5} = label(bitstr_flags(T), N4, Env),
+	    {As, N6} = label_ann(T, N5),
+	    {ann_c_bitstr(As, Val, Size, Unit, Type, Flags), N6};
+	letrec ->
+	    {_, N1, Env1} = label_vars(letrec_vars(T), N, Env),
+	    {Ds, N2} = label_defs(letrec_defs(T), N1, Env1),
+	    {B, N3} = label(letrec_body(T), N2, Env1),
+	    {As, N4} = label_ann(T, N3),
+	    {ann_c_letrec(As, Ds, B), N4};
+	module ->
+	    %% The module name is not labeled.
+	    {_, N1, Env1} = label_vars(module_vars(T), N, Env),
+	    {Ts, N2} = label_defs(module_attrs(T), N1, Env1),
+	    {Ds, N3} = label_defs(module_defs(T), N2, Env1),
+	    {Es, N4} = label_list(module_exports(T), N3, Env1),
+	    {As, N5} = label_ann(T, N4),
+	    {ann_c_module(As, module_name(T), Es, Ts, Ds), N5}
+    end.
+
+label_list([T | Ts], N, Env) ->
+    {T1, N1} = label(T, N, Env),
+    {Ts1, N2} = label_list(Ts, N1, Env),
+    {[T1 | Ts1], N2};
+label_list([], N, _Env) ->
+    {[], N}.
+
+label_vars([T | Ts], N, Env) ->
+    Env1 = dict:store(var_name(T), N, Env),
+    {As, N1} = label_ann(T, N),
+    T1 = set_ann(T, As),
+    {Ts1, N2, Env2} = label_vars(Ts, N1, Env1),
+    {[T1 | Ts1], N2, Env2};
+label_vars([], N, Env) ->
+    {[], N, Env}.
+
+label_defs([{F, T} | Ds], N, Env) ->
+    {F1, N1} = label(F, N, Env),
+    {T1, N2} = label(T, N1, Env),
+    {Ds1, N3} = label_defs(Ds, N2, Env),
+    {[{F1, T1} | Ds1], N3};
+label_defs([], N, _Env) ->
+    {[], N}.
+
+label_ann(T, N) ->
+    {[{label, N} | filter_labels(get_ann(T))], N + 1}.
+
+filter_labels([{label, _} | As]) ->
+    filter_labels(As);
+filter_labels([A | As]) ->
+    [A | filter_labels(As)];
+filter_labels([]) ->
+    [].
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
new file mode 100644
index 0000000000..2b6d14e300
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
@@ -0,0 +1,1109 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: compile.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+%% Purpose: Run the Erlang compiler.
+
+-module(compile).
+-include("erl_compile.hrl").
+-include("core_parse.hrl").
+
+%% High-level interface.
+-export([file/1,file/2,format_error/1,iofile/1]).
+-export([forms/1,forms/2]).
+-export([output_generated/1]).
+-export([options/0]).
+
+%% Erlc interface.
+-export([compile/3,compile_beam/3,compile_asm/3,compile_core/3]).
+
+
+-import(lists, [member/2,reverse/1,keysearch/3,last/1,
+		map/2,flatmap/2,foreach/2,foldr/3,any/2,filter/2]).
+
+%% file(FileName)
+%% file(FileName, Options)
+%%  Compile the module in file FileName.
+
+-define(DEFAULT_OPTIONS, [verbose,report_errors,report_warnings]).
+
+-define(pass(P), {P,fun P/1}).
+
+file(File) -> file(File, ?DEFAULT_OPTIONS).
+
+file(File, Opts) when list(Opts) ->
+    do_compile({file,File}, Opts++env_default_opts());
+file(File, Opt) ->
+    file(File, [Opt|?DEFAULT_OPTIONS]).
+
+forms(File) -> forms(File, ?DEFAULT_OPTIONS).
+
+forms(Forms, Opts) when list(Opts) ->
+    do_compile({forms,Forms}, [binary|Opts++env_default_opts()]);
+forms(Forms, Opts) when atom(Opts) ->
+    forms(Forms, [Opts|?DEFAULT_OPTIONS]).
+
+env_default_opts() ->
+    Key = "ERL_COMPILER_OPTIONS",
+    case os:getenv(Key) of
+	false -> [];
+	Str when list(Str) ->
+	    case erl_scan:string(Str) of
+		{ok,Tokens,_} ->
+		    case erl_parse:parse_term(Tokens ++ [{dot, 1}]) of
+			{ok,List} when list(List) -> List;
+			{ok,Term} -> [Term];
+			{error,_Reason} ->
+			    io:format("Ignoring bad term in ~s\n", [Key]),
+			    []
+		    end;
+		{error, {_,_,_Reason}, _} ->
+		    io:format("Ignoring bad term in ~s\n", [Key]),
+		    []
+	    end
+    end.
+
+do_compile(Input, Opts0) ->
+    Opts = expand_opts(Opts0),
+    Self = self(),
+    Serv = spawn_link(fun() -> internal(Self, Input, Opts) end),
+    receive
+	{Serv,Rep} -> Rep
+    end.
+
+%% Given a list of compilation options, returns true if compile:file/2
+%% would have generated a Beam file, false otherwise (if only a binary or a
+%% listing file would have been generated).
+
+output_generated(Opts) ->
+    any(fun ({save_binary,_F}) -> true;
+	    (_Other) -> false
+	end, passes(file, expand_opts(Opts))).
+
+expand_opts(Opts) ->
+    foldr(fun expand_opt/2, [], Opts).
+
+expand_opt(basic_validation, Os) ->
+    [no_code_generation,to_pp,binary|Os];
+expand_opt(strong_validation, Os) ->
+    [no_code_generation,to_kernel,binary|Os];
+expand_opt(report, Os) ->
+    [report_errors,report_warnings|Os];
+expand_opt(return, Os) ->
+    [return_errors,return_warnings|Os];
+expand_opt(r7, Os) ->
+    [no_float_opt,no_new_funs,no_new_binaries,no_new_apply|Os];
+expand_opt(O, Os) -> [O|Os].
+
+filter_opts(Opts0) ->
+    %% Native code generation is not supported if no_new_funs is given.
+    case member(no_new_funs, Opts0) of
+	false -> Opts0;
+	true -> Opts0 -- [native]
+    end.
+
+%% format_error(ErrorDescriptor) -> string()
+
+format_error(no_native_support) ->
+    "this system is not configured for native-code compilation.";
+format_error({native, E}) ->
+    io_lib:fwrite("native-code compilation failed with reason: ~P.",
+		  [E, 25]);
+format_error({native_crash, E}) ->
+    io_lib:fwrite("native-code compilation crashed with reason: ~P.",
+		  [E, 25]);
+format_error({open,E}) ->
+    io_lib:format("open error '~s'", [file:format_error(E)]);
+format_error({epp,E}) ->
+    epp:format_error(E);
+format_error(write_error) ->
+    "error writing file";
+format_error({rename,S}) ->
+    io_lib:format("error renaming ~s", [S]);
+format_error({parse_transform,M,R}) ->
+    io_lib:format("error in parse transform '~s': ~p", [M, R]);
+format_error({core_transform,M,R}) ->
+    io_lib:format("error in core transform '~s': ~p", [M, R]);
+format_error({crash,Pass,Reason}) ->
+    io_lib:format("internal error in ~p;\ncrash reason: ~p", [Pass,Reason]);
+format_error({bad_return,Pass,Reason}) ->
+    io_lib:format("internal error in ~p;\nbad return value: ~p", [Pass,Reason]).
+
+%% The compile state record.
+-record(compile, {filename="",
+		  dir="",
+		  base="",
+		  ifile="",
+		  ofile="",
+		  module=[],
+		  code=[],
+		  core_code=[],
+		  abstract_code=[],		%Abstract code for debugger.
+		  options=[],
+		  errors=[],
+		  warnings=[]}).
+
+internal(Master, Input, Opts) ->
+    Master ! {self(),
+	      case catch internal(Input, Opts) of
+		  {'EXIT', Reason} ->
+		      {error, Reason};
+		  Other ->
+		      Other
+	      end}.
+
+internal({forms,Forms}, Opts) ->
+    Ps = passes(forms, Opts),
+    internal_comp(Ps, "", "", #compile{code=Forms,options=Opts});
+internal({file,File}, Opts) ->
+    Ps = passes(file, Opts),
+    Compile = #compile{options=Opts},
+    case member(from_core, Opts) of
+	true -> internal_comp(Ps, File, ".core", Compile);
+	false ->
+	    case member(from_beam, Opts) of
+		true ->
+		    internal_comp(Ps, File, ".beam", Compile);
+		false ->
+		    case member(from_asm, Opts) orelse member(asm, Opts) of
+			true ->
+			    internal_comp(Ps, File, ".S", Compile);
+			false ->
+			    internal_comp(Ps, File, ".erl", Compile)
+		    end
+	    end
+    end.
+
+internal_comp(Passes, File, Suffix, St0) ->
+    Dir = filename:dirname(File),
+    Base = filename:basename(File, Suffix),
+    St1 = St0#compile{filename=File, dir=Dir, base=Base,
+		      ifile=erlfile(Dir, Base, Suffix),
+		      ofile=objfile(Base, St0)},
+    Run = case member(time, St1#compile.options) of
+	      true  ->
+		  io:format("Compiling ~p\n", [File]),
+		  fun run_tc/2;
+	      false -> fun({_Name,Fun}, St) -> catch Fun(St) end
+	  end,
+    case fold_comp(Passes, Run, St1) of
+	{ok,St2} -> comp_ret_ok(St2);
+	{error,St2} -> comp_ret_err(St2)
+    end.
+
+fold_comp([{Name,Test,Pass}|Ps], Run, St) ->
+    case Test(St) of
+	false ->				%Pass is not needed.
+	    fold_comp(Ps, Run, St);
+	true ->					%Run pass in the usual way.
+	    fold_comp([{Name,Pass}|Ps], Run, St)
+    end;
+fold_comp([{Name,Pass}|Ps], Run, St0) ->
+    case Run({Name,Pass}, St0) of
+	{ok,St1} -> fold_comp(Ps, Run, St1);
+	{error,St1} -> {error,St1};
+	{'EXIT',Reason} ->
+	    Es = [{St0#compile.ifile,[{none,?MODULE,{crash,Name,Reason}}]}],
+	    {error,St0#compile{errors=St0#compile.errors ++ Es}};
+	Other ->
+	    Es = [{St0#compile.ifile,[{none,?MODULE,{bad_return,Name,Other}}]}],
+	    {error,St0#compile{errors=St0#compile.errors ++ Es}}
+    end;
+fold_comp([], _Run, St) -> {ok,St}.
+
+os_process_size() ->
+    case os:type() of
+	{unix, sunos} ->
+	    Size = os:cmd("ps -o vsz -p " ++ os:getpid() ++ " | tail -1"),
+	    list_to_integer(lib:nonl(Size));
+	_ ->
+	    0
+    end.
+
+run_tc({Name,Fun}, St) ->
+    Before0 = statistics(runtime),
+    Val = (catch Fun(St)),
+    After0 = statistics(runtime),
+    {Before_c, _} = Before0,
+    {After_c, _} = After0,
+    io:format(" ~-30s: ~10.3f s (~w k)\n",
+	      [Name, (After_c-Before_c) / 1000, os_process_size()]),
+    Val.
+
+comp_ret_ok(#compile{code=Code,warnings=Warn,module=Mod,options=Opts}=St) ->
+    report_warnings(St),
+    Ret1 = case member(binary, Opts) andalso not member(no_code_generation, Opts) of
+	       true -> [Code];
+	       false -> []
+	   end,
+    Ret2 = case member(return_warnings, Opts) of
+	       true -> Ret1 ++ [Warn];
+	       false -> Ret1
+	   end,
+    list_to_tuple([ok,Mod|Ret2]).
+
+comp_ret_err(St) ->
+    report_errors(St),
+    report_warnings(St),
+    case member(return_errors, St#compile.options) of
+	true -> {error,St#compile.errors,St#compile.warnings};
+	false -> error
+    end.
+
+%% passes(form|file, [Option]) -> [{Name,PassFun}]
+%%  Figure out which passes that need to be run.
+
+passes(forms, Opts) ->
+    select_passes(standard_passes(), Opts);
+passes(file, Opts) ->
+    case member(from_beam, Opts) of
+	true ->
+	    Ps = [?pass(read_beam_file)|binary_passes()],
+	    select_passes(Ps, Opts);
+	false ->
+	    Ps = case member(from_asm, Opts) orelse member(asm, Opts) of
+		     true ->
+			 [?pass(beam_consult_asm)|asm_passes()];
+		     false ->
+			 case member(from_core, Opts) of
+			     true ->
+				 [?pass(parse_core)|core_passes()];
+			     false ->
+				 [?pass(parse_module)|standard_passes()]
+			 end
+		 end,
+	    Fs = select_passes(Ps, Opts),
+
+	    %% If the last pass saves the resulting binary to a file,
+	    %% insert a first pass to remove the file.
+	    case last(Fs)  of
+		{save_binary,_Fun} -> [?pass(remove_file)|Fs];
+		_Other -> Fs
+	    end
+    end.
+
+%% select_passes([Command], Opts) ->  [{Name,Function}]
+%%  Interpret the lists of commands to return a pure list of passes.
+%%
+%%  Command can be one of:
+%%
+%%    {pass,Mod}	Will be expanded to a call to the external
+%%			function Mod:module(Code, Options).  This
+%%			function must transform the code and return
+%%			{ok,NewCode} or {error,Term}.
+%%			Example: {pass,beam_codegen}
+%%
+%%    {Name,Fun}	Name is an atom giving the name of the pass.
+%%    			Fun is an 'fun' taking one argument: a compile record.
+%%			The fun should return {ok,NewCompileRecord} or
+%%			{error,NewCompileRecord}.
+%%			Note: ?pass(Name) is equvivalent to {Name,fun Name/1}.
+%%			Example: ?pass(parse_module)
+%%
+%%    {Name,Test,Fun}	Like {Name,Fun} above, but the pass will be run
+%%			(and listed by the `time' option) only if Test(St)
+%%			returns true.
+%%
+%%    {src_listing,Ext}	Produces an Erlang source listing with the
+%%			the file extension Ext.  (Ext should not contain
+%%			a period.)  No more passes will be run.
+%%
+%%    {listing,Ext}	Produce an listing of the terms in the internal
+%%			representation.  The extension of the listing
+%%			file will be Ext.  (Ext should not contain
+%%			a period.)   No more passes will be run.
+%%
+%%    {done,Ext}        End compilation at this point. Produce a listing
+%%                      as with {listing,Ext}, unless 'binary' is
+%%                      specified, in which case the current
+%%                      representation of the code is returned without
+%%                      creating an output file.
+%%
+%%    {iff,Flag,Cmd}	If the given Flag is given in the option list,
+%%			Cmd will be interpreted as a command.
+%%			Otherwise, Cmd will be ignored.
+%%			Example: {iff,dcg,{listing,"codegen}}
+%%
+%%    {unless,Flag,Cmd}	If the given Flag is NOT given in the option list,
+%%			Cmd will be interpreted as a command.
+%%			Otherwise, Cmd will be ignored.
+%%			Example: {unless,no_kernopt,{pass,sys_kernopt}}
+%%
+
+select_passes([{pass,Mod}|Ps], Opts) ->
+    F = fun(St) ->
+		case catch Mod:module(St#compile.code, St#compile.options) of
+		    {ok,Code} ->
+			{ok,St#compile{code=Code}};
+		    {error,Es} ->
+			{error,St#compile{errors=St#compile.errors ++ Es}}
+		end
+	end,
+    [{Mod,F}|select_passes(Ps, Opts)];
+select_passes([{src_listing,Ext}|_], _Opts) ->
+    [{listing,fun (St) -> src_listing(Ext, St) end}];
+select_passes([{listing,Ext}|_], _Opts) ->
+    [{listing,fun (St) -> listing(Ext, St) end}];
+select_passes([{done,Ext}|_], Opts) ->
+    select_passes([{unless,binary,{listing,Ext}}], Opts);
+select_passes([{iff,Flag,Pass}|Ps], Opts) ->
+    select_cond(Flag, true, Pass, Ps, Opts);
+select_passes([{unless,Flag,Pass}|Ps], Opts) ->
+    select_cond(Flag, false, Pass, Ps, Opts);
+select_passes([{_,Fun}=P|Ps], Opts) when is_function(Fun) ->
+    [P|select_passes(Ps, Opts)];
+select_passes([{_,Test,Fun}=P|Ps], Opts) when is_function(Test),
+					      is_function(Fun) ->
+    [P|select_passes(Ps, Opts)];
+select_passes([], _Opts) ->
+    [];
+select_passes([List|Ps], Opts) when is_list(List) ->
+    case select_passes(List, Opts) of
+	[] -> select_passes(Ps, Opts);
+	Nested ->
+	    case last(Nested) of
+		{listing,_Fun} -> Nested;
+		_Other         -> Nested ++ select_passes(Ps, Opts)
+	    end
+    end.
+
+select_cond(Flag, ShouldBe, Pass, Ps, Opts) ->
+    ShouldNotBe = not ShouldBe,
+    case member(Flag, Opts) of
+	ShouldBe    -> select_passes([Pass|Ps], Opts);
+	ShouldNotBe -> select_passes(Ps, Opts)
+    end.
+
+%% The standard passes (almost) always run.
+
+standard_passes() ->
+    [?pass(transform_module),
+     {iff,'dpp',{listing,"pp"}},
+     ?pass(lint_module),
+     {iff,'P',{src_listing,"P"}},
+     {iff,'to_pp',{done,"P"}},
+
+     {iff,'dabstr',{listing,"abstr"}},
+     {iff,debug_info,?pass(save_abstract_code)},
+
+     ?pass(expand_module),
+     {iff,'dexp',{listing,"expand"}},
+     {iff,'E',{src_listing,"E"}},
+     {iff,'to_exp',{done,"E"}},
+
+     %% Conversion to Core Erlang.
+     ?pass(core_module),
+     {iff,'dcore',{listing,"core"}},
+     {iff,'to_core0',{done,"core"}}
+     | core_passes()].
+
+core_passes() ->
+    %% Optimization and transforms of Core Erlang code.
+    [{unless,no_copt,
+      [{core_old_inliner,fun test_old_inliner/1,fun core_old_inliner/1},
+       ?pass(core_fold_module),
+       {core_inline_module,fun test_core_inliner/1,fun core_inline_module/1},
+       {core_fold_after_inline,fun test_core_inliner/1,fun core_fold_module/1},
+       ?pass(core_transforms)]},
+     {iff,dcopt,{listing,"copt"}},
+     {iff,'to_core',{done,"core"}}
+     | kernel_passes()].
+
+kernel_passes() ->
+    %% Destructive setelement/3 optimization and core lint.
+    [?pass(core_dsetel_module),
+     {iff,clint,?pass(core_lint_module)},
+     {iff,core,?pass(save_core_code)},
+
+     %% Kernel Erlang and code generation.
+     ?pass(kernel_module),
+     {iff,dkern,{listing,"kernel"}},
+     {iff,'to_kernel',{done,"kernel"}},
+     {pass,v3_life},
+     {iff,dlife,{listing,"life"}},
+     {pass,v3_codegen},
+     {iff,dcg,{listing,"codegen"}}
+     | asm_passes()].
+
+asm_passes() ->
+    %% Assembly level optimisations.
+    [{unless,no_postopt,
+      [{pass,beam_block},
+       {iff,dblk,{listing,"block"}},
+       {unless,no_bopt,{pass,beam_bool}},
+       {iff,dbool,{listing,"bool"}},
+       {unless,no_topt,{pass,beam_type}},
+       {iff,dtype,{listing,"type"}},
+       {pass,beam_dead},	      %Must always run since it splits blocks.
+       {iff,ddead,{listing,"dead"}},
+       {unless,no_jopt,{pass,beam_jump}},
+       {iff,djmp,{listing,"jump"}},
+       {pass,beam_clean},
+       {iff,dclean,{listing,"clean"}},
+       {pass,beam_flatten}]},
+
+     %% If post optimizations are turned off, we still coalesce
+     %% adjacent labels and remove unused labels to keep the
+     %% HiPE compiler happy.
+     {iff,no_postopt,
+      [?pass(beam_unused_labels),
+       {pass,beam_clean}]},
+
+     {iff,dopt,{listing,"optimize"}},
+     {iff,'S',{listing,"S"}},
+     {iff,'to_asm',{done,"S"}},
+
+     {pass,beam_validator},
+     ?pass(beam_asm)
+     | binary_passes()].
+
+binary_passes() ->
+    [{native_compile,fun test_native/1,fun native_compile/1},
+     {unless,binary,?pass(save_binary)}].
+
+%%%
+%%% Compiler passes.
+%%%
+
+%% Remove the target file so we don't have an old one if the compilation fail.
+remove_file(St) ->
+    file:delete(St#compile.ofile),
+    {ok,St}.
+
+-record(asm_module, {module,
+		     exports,
+		     labels,
+		     functions=[],
+		     cfun,
+		     code,
+		     attributes=[]}).
+
+preprocess_asm_forms(Forms) ->
+    R = #asm_module{},
+    R1 = collect_asm(Forms, R),
+    {R1#asm_module.module,
+     {R1#asm_module.module,
+      R1#asm_module.exports,
+      R1#asm_module.attributes,
+      R1#asm_module.functions,
+      R1#asm_module.labels}}.
+
+collect_asm([], R) ->
+    case R#asm_module.cfun of
+	undefined ->
+	    R;
+	{A,B,C} ->
+	    R#asm_module{functions=R#asm_module.functions++
+			 [{function,A,B,C,R#asm_module.code}]}
+    end;
+collect_asm([{module,M} | Rest], R) ->
+    collect_asm(Rest, R#asm_module{module=M});
+collect_asm([{exports,M} | Rest], R) ->
+    collect_asm(Rest, R#asm_module{exports=M});
+collect_asm([{labels,M} | Rest], R) ->
+    collect_asm(Rest, R#asm_module{labels=M});
+collect_asm([{function,A,B,C} | Rest], R) ->
+    R1 = case R#asm_module.cfun of
+	     undefined ->
+		 R;
+	     {A0,B0,C0} ->
+		 R#asm_module{functions=R#asm_module.functions++
+			      [{function,A0,B0,C0,R#asm_module.code}]}
+	 end,
+    collect_asm(Rest, R1#asm_module{cfun={A,B,C}, code=[]});
+collect_asm([{attributes, Attr} | Rest], R) ->
+    collect_asm(Rest, R#asm_module{attributes=Attr});
+collect_asm([X | Rest], R) ->
+    collect_asm(Rest, R#asm_module{code=R#asm_module.code++[X]}).
+
+beam_consult_asm(St) ->
+    case file:consult(St#compile.ifile) of
+	{ok, Forms0} ->
+	    {Module, Forms} = preprocess_asm_forms(Forms0),
+	    {ok,St#compile{module=Module, code=Forms}};
+	{error,E} ->
+	    Es = [{St#compile.ifile,[{none,?MODULE,{open,E}}]}],
+	    {error,St#compile{errors=St#compile.errors ++ Es}}
+    end.
+
+read_beam_file(St) ->
+    case file:read_file(St#compile.ifile) of
+	{ok,Beam} ->
+	    Infile = St#compile.ifile,
+	    case is_too_old(Infile) of
+		true ->
+		    {ok,St#compile{module=none,code=none}};
+		false ->
+		    Mod0 = filename:rootname(filename:basename(Infile)),
+		    Mod = list_to_atom(Mod0),
+		    {ok,St#compile{module=Mod,code=Beam,ofile=Infile}}
+	    end;
+	{error,E} ->
+	    Es = [{St#compile.ifile,[{none,?MODULE,{open,E}}]}],
+	    {error,St#compile{errors=St#compile.errors ++ Es}}
+    end.
+
+is_too_old(BeamFile) ->
+    case beam_lib:chunks(BeamFile, ["CInf"]) of
+	{ok,{_,[{"CInf",Term0}]}} ->
+	    Term = binary_to_term(Term0),
+	    Opts = proplists:get_value(options, Term, []),
+	    lists:member(no_new_funs, Opts);
+	_ -> false
+    end.
+
+parse_module(St) ->
+    Opts = St#compile.options,
+    Cwd = ".",
+    IncludePath = [Cwd, St#compile.dir|inc_paths(Opts)],
+    Tab = ets:new(compiler__tab, [protected,named_table]),
+    ets:insert(Tab, {compiler_options,Opts}),
+    R =  epp:parse_file(St#compile.ifile, IncludePath, pre_defs(Opts)),
+    ets:delete(Tab),
+    case R of
+	{ok,Forms} ->
+	    {ok,St#compile{code=Forms}};
+	{error,E} ->
+	    Es = [{St#compile.ifile,[{none,?MODULE,{epp,E}}]}],
+	    {error,St#compile{errors=St#compile.errors ++ Es}}
+    end.
+
+parse_core(St) ->
+    case file:read_file(St#compile.ifile) of
+	{ok,Bin} ->
+	    case core_scan:string(binary_to_list(Bin)) of
+		{ok,Toks,_} ->
+		    case core_parse:parse(Toks) of
+			{ok,Mod} ->
+			    Name = (Mod#c_module.name)#c_atom.val,
+			    {ok,St#compile{module=Name,code=Mod}};
+			{error,E} ->
+			    Es = [{St#compile.ifile,[E]}],
+			    {error,St#compile{errors=St#compile.errors ++ Es}}
+		    end;
+		{error,E,_} ->
+		    Es = [{St#compile.ifile,[E]}],
+		    {error,St#compile{errors=St#compile.errors ++ Es}}
+	    end;
+	{error,E} ->
+	    Es = [{St#compile.ifile,[{none,compile,{open,E}}]}],
+	    {error,St#compile{errors=St#compile.errors ++ Es}}
+    end.
+
+compile_options([{attribute,_L,compile,C}|Fs]) when is_list(C) ->
+    C ++ compile_options(Fs);
+compile_options([{attribute,_L,compile,C}|Fs]) ->
+    [C|compile_options(Fs)];
+compile_options([_F|Fs]) -> compile_options(Fs);
+compile_options([]) -> [].
+
+transforms(Os) -> [ M || {parse_transform,M} <- Os ].
+
+transform_module(St) ->
+    %% Extract compile options from code into options field.
+    Ts = transforms(St#compile.options ++ compile_options(St#compile.code)),
+    foldl_transform(St, Ts).
+
+foldl_transform(St, [T|Ts]) ->
+    Name = "transform " ++ atom_to_list(T),
+    Fun = fun(S) -> T:parse_transform(S#compile.code, S#compile.options) end,
+    Run = case member(time, St#compile.options) of
+	      true  -> fun run_tc/2;
+	      false -> fun({_Name,F}, S) -> catch F(S) end
+	  end,
+    case Run({Name, Fun}, St) of
+	{error,Es,Ws} ->
+	    {error,St#compile{warnings=St#compile.warnings ++ Ws,
+			      errors=St#compile.errors ++ Es}};
+	{'EXIT',R} ->
+	    Es = [{St#compile.ifile,[{none,compile,{parse_transform,T,R}}]}],
+	    {error,St#compile{errors=St#compile.errors ++ Es}};
+	Forms ->
+	    foldl_transform(St#compile{code=Forms}, Ts)
+    end;
+foldl_transform(St, []) -> {ok,St}.
+
+get_core_transforms(Opts) -> [M || {core_transform,M} <- Opts].
+
+core_transforms(St) ->
+    %% The options field holds the complete list of options at this
+
+    Ts = get_core_transforms(St#compile.options),
+    foldl_core_transforms(St, Ts).
+
+foldl_core_transforms(St, [T|Ts]) ->
+    Name = "core transform " ++ atom_to_list(T),
+    Fun = fun(S) -> T:core_transform(S#compile.code, S#compile.options) end,
+    Run = case member(time, St#compile.options) of
+	      true  -> fun run_tc/2;
+	      false -> fun({_Name,F}, S) -> catch F(S) end
+	  end,
+    case Run({Name, Fun}, St) of
+	{'EXIT',R} ->
+	    Es = [{St#compile.ifile,[{none,compile,{core_transform,T,R}}]}],
+	    {error,St#compile{errors=St#compile.errors ++ Es}};
+	Forms ->
+	    foldl_core_transforms(St#compile{code=Forms}, Ts)
+    end;
+foldl_core_transforms(St, []) -> {ok,St}.
+
+%%% Fetches the module name from a list of forms. The module attribute must
+%%% be present.
+get_module([{attribute,_,module,{M,_As}} | _]) -> M;
+get_module([{attribute,_,module,M} | _]) -> M;
+get_module([_ | Rest]) ->
+    get_module(Rest).
+
+%%% A #compile state is returned, where St.base has been filled in
+%%% with the module name from Forms, as a string, in case it wasn't
+%%% set in St (i.e., it was "").
+add_default_base(St, Forms) ->
+    F = St#compile.filename,
+    case F of
+	"" ->
+	    M = get_module(Forms),
+	    St#compile{base = atom_to_list(M)};
+	_ ->
+	    St
+    end.
+
+lint_module(St) ->
+    case erl_lint:module(St#compile.code,
+			 St#compile.ifile, St#compile.options) of
+	{ok,Ws} ->
+	    %% Insert name of module as base name, if needed. This is
+	    %% for compile:forms to work with listing files.
+	    St1 = add_default_base(St, St#compile.code),
+	    {ok,St1#compile{warnings=St1#compile.warnings ++ Ws}};
+	{error,Es,Ws} ->
+	    {error,St#compile{warnings=St#compile.warnings ++ Ws,
+			      errors=St#compile.errors ++ Es}}
+    end.
+
+core_lint_module(St) ->
+    case core_lint:module(St#compile.code, St#compile.options) of
+	{ok,Ws} ->
+	    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
+	{error,Es,Ws} ->
+	    {error,St#compile{warnings=St#compile.warnings ++ Ws,
+			      errors=St#compile.errors ++ Es}}
+    end.
+
+%% expand_module(State) -> State'
+%%  Do the common preprocessing of the input forms.
+
+expand_module(#compile{code=Code,options=Opts0}=St0) ->
+    {Mod,Exp,Forms,Opts1} = sys_pre_expand:module(Code, Opts0),
+    Opts2 = expand_opts(Opts1),
+    Opts = filter_opts(Opts2),
+    {ok,St0#compile{module=Mod,options=Opts,code={Mod,Exp,Forms}}}.
+
+core_module(#compile{code=Code0,options=Opts,ifile=File}=St) ->
+    {ok,Code,Ws} = v3_core:module(Code0, Opts),
+    {ok,St#compile{code=Code,warnings=St#compile.warnings ++ [{File,Ws}]}}.
+
+core_fold_module(#compile{code=Code0,options=Opts,ifile=File}=St) ->
+    {ok,Code,Ws} = sys_core_fold:module(Code0, Opts),
+    {ok,St#compile{code=Code,warnings=St#compile.warnings ++ [{File,Ws}]}}.
+
+test_old_inliner(#compile{options=Opts}) ->
+    %% The point of this test is to avoid loading the old inliner
+    %% if we know that it will not be used.
+    case any(fun(no_inline) -> true;
+		(_) -> false
+	     end, Opts) of
+      true -> false;
+      false ->
+	any(fun({inline,_}) -> true;
+	       (_) -> false
+	    end, Opts)
+    end.
+
+test_core_inliner(#compile{options=Opts}) ->
+    case any(fun(no_inline) -> true;
+		(_) -> false
+	     end, Opts) of
+	true -> false;
+	false ->
+	    any(fun(inline) -> true;
+		   (_) -> false
+		end, Opts)
+    end.
+
+core_old_inliner(#compile{code=Code0,options=Opts}=St) ->
+    case catch sys_core_inline:module(Code0, Opts) of
+	{ok,Code} ->
+	    {ok,St#compile{code=Code}};
+	{error,Es} ->
+	    {error,St#compile{errors=St#compile.errors ++ Es}}
+    end.
+
+core_inline_module(#compile{code=Code0,options=Opts}=St) ->
+    Code = cerl_inline:core_transform(Code0, Opts),
+    {ok,St#compile{code=Code}}.
+
+core_dsetel_module(#compile{code=Code0,options=Opts}=St) ->
+    {ok,Code} = sys_core_dsetel:module(Code0, Opts),
+    {ok,St#compile{code=Code}}.
+
+kernel_module(#compile{code=Code0,options=Opts,ifile=File}=St) ->
+    {ok,Code,Ws} = v3_kernel:module(Code0, Opts),
+    {ok,St#compile{code=Code,warnings=St#compile.warnings ++ [{File,Ws}]}}.
+
+save_abstract_code(St) ->
+    {ok,St#compile{abstract_code=abstract_code(St)}}.
+
+abstract_code(#compile{code=Code}) ->
+    Abstr = {raw_abstract_v1,Code},
+    case catch erlang:term_to_binary(Abstr, [compressed]) of
+	{'EXIT',_} -> term_to_binary(Abstr);
+	Other -> Other
+    end.
+
+save_core_code(St) ->
+    {ok,St#compile{core_code=cerl:from_records(St#compile.code)}}.
+
+beam_unused_labels(#compile{code=Code0}=St) ->
+    Code = beam_jump:module_labels(Code0),
+    {ok,St#compile{code=Code}}.
+
+beam_asm(#compile{ifile=File,code=Code0,abstract_code=Abst,options=Opts0}=St) ->
+    Source = filename:absname(File),
+    Opts = filter(fun is_informative_option/1, Opts0),
+    case beam_asm:module(Code0, Abst, Source, Opts) of
+	{ok,Code} -> {ok,St#compile{code=Code,abstract_code=[]}};
+	{error,Es} -> {error,St#compile{errors=St#compile.errors ++ Es}}
+    end.
+
+test_native(#compile{options=Opts}) ->
+    %% This test must be made late, because the r7 or no_new_funs options
+    %% will turn off the native option.
+    member(native, Opts).
+
+native_compile(#compile{code=none}=St) -> {ok,St};
+native_compile(St) ->
+    case erlang:system_info(hipe_architecture) of
+	undefined ->
+	    Ws = [{St#compile.ifile,[{none,compile,no_native_support}]}],
+	    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
+	_ ->
+	    native_compile_1(St)
+    end.
+
+native_compile_1(St) ->
+    Opts0 = [no_new_binaries|St#compile.options],
+    IgnoreErrors = member(ignore_native_errors, Opts0),
+    Opts = case keysearch(hipe, 1, Opts0) of
+	       {value,{hipe,L}} when list(L) -> L;
+	       {value,{hipe,X}} -> [X];
+	       _ -> []
+	   end,
+    case catch hipe:compile(St#compile.module,
+			    St#compile.core_code,
+			    St#compile.code,
+			    Opts) of
+	{ok, {Type,Bin}} when binary(Bin) ->
+	    {ok, embed_native_code(St, {Type,Bin})};
+	{error, R} ->
+	    case IgnoreErrors of
+		true ->
+		    Ws = [{St#compile.ifile,[{none,?MODULE,{native,R}}]}],
+		    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
+		false ->
+		    Es = [{St#compile.ifile,[{none,?MODULE,{native,R}}]}],
+		    {error,St#compile{errors=St#compile.errors ++ Es}}
+	    end;
+	{'EXIT',R} ->
+	    case IgnoreErrors of
+		true ->
+		    Ws = [{St#compile.ifile,[{none,?MODULE,{native_crash,R}}]}],
+		    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
+		false ->
+		    exit(R)
+	    end
+    end.
+
+embed_native_code(St, {Architecture,NativeCode}) ->
+    {ok, _, Chunks0} = beam_lib:all_chunks(St#compile.code),
+    ChunkName = hipe_unified_loader:chunk_name(Architecture),
+    Chunks1 = lists:keydelete(ChunkName, 1, Chunks0),
+    Chunks = Chunks1 ++ [{ChunkName,NativeCode}],
+    {ok, BeamPlusNative} = beam_lib:build_module(Chunks),
+    St#compile{code=BeamPlusNative}.
+
+%% Returns true if the option is informative and therefore should be included
+%% in the option list of the compiled module.
+
+is_informative_option(beam) -> false;
+is_informative_option(report_warnings) -> false;
+is_informative_option(report_errors) -> false;
+is_informative_option(binary) -> false;
+is_informative_option(verbose) -> false;
+is_informative_option(_) -> true.
+
+save_binary(#compile{code=none}=St) -> {ok,St};
+save_binary(St) ->
+    Tfile = tmpfile(St#compile.ofile),		%Temp working file
+    case write_binary(Tfile, St#compile.code, St) of
+	ok ->
+	    case file:rename(Tfile, St#compile.ofile) of
+		ok ->
+		    {ok,St};
+		{error,_Error} ->
+		    file:delete(Tfile),
+		    Es = [{St#compile.ofile,[{none,?MODULE,{rename,Tfile}}]}],
+		    {error,St#compile{errors=St#compile.errors ++ Es}}
+	    end;
+	{error,_Error} ->
+	    Es = [{Tfile,[{compile,write_error}]}],
+	    {error,St#compile{errors=St#compile.errors ++ Es}}
+    end.
+
+write_binary(Name, Bin, St) ->
+    Opts = case member(compressed, St#compile.options) of
+	       true -> [compressed];
+	       false -> []
+	   end,
+    case file:write_file(Name, Bin, Opts) of
+	ok -> ok;
+	{error,_}=Error -> Error
+    end.
+
+%% report_errors(State) -> ok
+%% report_warnings(State) -> ok
+
+report_errors(St) ->
+    case member(report_errors, St#compile.options) of
+	true ->
+	    foreach(fun ({{F,_L},Eds}) -> list_errors(F, Eds);
+			({F,Eds}) -> list_errors(F, Eds) end,
+		    St#compile.errors);
+	false -> ok
+    end.
+
+report_warnings(#compile{options=Opts,warnings=Ws0}) ->
+    case member(report_warnings, Opts) of
+	true ->
+	    Ws1 = flatmap(fun({{F,_L},Eds}) -> format_message(F, Eds);
+			     ({F,Eds}) -> format_message(F, Eds) end,
+		     Ws0),
+	    Ws = ordsets:from_list(Ws1),
+	    foreach(fun({_,Str}) -> io:put_chars(Str) end, Ws);
+	false -> ok
+    end.
+
+format_message(F, [{Line,Mod,E}|Es]) ->
+    M = {Line,io_lib:format("~s:~w: Warning: ~s\n", [F,Line,Mod:format_error(E)])},
+    [M|format_message(F, Es)];
+format_message(F, [{Mod,E}|Es]) ->
+    M = {none,io_lib:format("~s: Warning: ~s\n", [F,Mod:format_error(E)])},
+    [M|format_message(F, Es)];
+format_message(_, []) -> [].
+
+%% list_errors(File, ErrorDescriptors) -> ok
+
+list_errors(F, [{Line,Mod,E}|Es]) ->
+    io:fwrite("~s:~w: ~s\n", [F,Line,Mod:format_error(E)]),
+    list_errors(F, Es);
+list_errors(F, [{Mod,E}|Es]) ->
+    io:fwrite("~s: ~s\n", [F,Mod:format_error(E)]),
+    list_errors(F, Es);
+list_errors(_F, []) -> ok.
+
+%% erlfile(Dir, Base) -> ErlFile
+%% outfile(Base, Extension, Options) -> OutputFile
+%% objfile(Base, Target, Options) -> ObjFile
+%% tmpfile(ObjFile) -> TmpFile
+%%  Work out the correct input and output file names.
+
+iofile(File) when atom(File) ->
+    iofile(atom_to_list(File));
+iofile(File) ->
+    {filename:dirname(File), filename:basename(File, ".erl")}.
+
+erlfile(Dir, Base, Suffix) ->
+    filename:join(Dir, Base++Suffix).
+
+outfile(Base, Ext, Opts) when atom(Ext) ->
+    outfile(Base, atom_to_list(Ext), Opts);
+outfile(Base, Ext, Opts) ->
+    Obase = case keysearch(outdir, 1, Opts) of
+		{value, {outdir, Odir}} -> filename:join(Odir, Base);
+		_Other -> Base			% Not found or bad format
+	    end,
+    Obase++"."++Ext.
+
+objfile(Base, St) ->
+    outfile(Base, "beam", St#compile.options).
+
+tmpfile(Ofile) ->
+    reverse([$#|tl(reverse(Ofile))]).
+
+%% pre_defs(Options)
+%% inc_paths(Options)
+%%  Extract the predefined macros and include paths from the option list.
+
+pre_defs([{d,M,V}|Opts]) ->
+    [{M,V}|pre_defs(Opts)];
+pre_defs([{d,M}|Opts]) ->
+    [M|pre_defs(Opts)];
+pre_defs([_|Opts]) ->
+    pre_defs(Opts);
+pre_defs([]) -> [].
+
+inc_paths(Opts) ->
+    [ P || {i,P} <- Opts, list(P) ].
+
+src_listing(Ext, St) ->
+    listing(fun (Lf, {_Mod,_Exp,Fs}) -> do_src_listing(Lf, Fs);
+		(Lf, Fs) -> do_src_listing(Lf, Fs) end,
+	    Ext, St).
+
+do_src_listing(Lf, Fs) ->
+    foreach(fun (F) -> io:put_chars(Lf, [erl_pp:form(F),"\n"]) end,
+	    Fs).
+
+listing(Ext, St) ->
+    listing(fun(Lf, Fs) -> beam_listing:module(Lf, Fs) end, Ext, St).
+
+listing(LFun, Ext, St) ->
+    Lfile = outfile(St#compile.base, Ext, St#compile.options),
+    case file:open(Lfile, [write,delayed_write]) of
+	{ok,Lf} ->
+	    LFun(Lf, St#compile.code),
+	    ok = file:close(Lf),
+	    {ok,St};
+	{error,_Error} ->
+	    Es = [{Lfile,[{none,compile,write_error}]}],
+	    {error,St#compile{errors=St#compile.errors ++ Es}}
+    end.
+
+options() ->
+    help(standard_passes()).
+
+help([{iff,Flag,{src_listing,Ext}}|T]) ->
+    io:fwrite("~p - Generate .~s source listing file\n", [Flag,Ext]),
+    help(T);
+help([{iff,Flag,{listing,Ext}}|T]) ->
+    io:fwrite("~p - Generate .~s file\n", [Flag,Ext]),
+    help(T);
+help([{iff,Flag,{Name,Fun}}|T]) when function(Fun) ->
+    io:fwrite("~p - Run ~s\n", [Flag,Name]),
+    help(T);
+help([{iff,_Flag,Action}|T]) ->
+    help(Action),
+    help(T);
+help([{unless,Flag,{pass,Pass}}|T]) ->
+    io:fwrite("~p - Skip the ~s pass\n", [Flag,Pass]),
+    help(T);
+help([{unless,no_postopt=Flag,List}|T]) when list(List) ->
+    %% Hard-coded knowledgde here.
+    io:fwrite("~p - Skip all post optimisation\n", [Flag]),
+    help(List),
+    help(T);
+help([{unless,_Flag,Action}|T]) ->
+    help(Action),
+    help(T);
+help([_|T]) ->
+    help(T);
+help(_) ->
+    ok.
+
+
+%% compile(AbsFileName, Outfilename, Options)
+%%   Compile entry point for erl_compile.
+
+compile(File0, _OutFile, Options) ->
+    File = shorten_filename(File0),
+    case file(File, make_erl_options(Options)) of
+	{ok,_Mod} -> ok;
+	Other -> Other
+    end.
+
+compile_beam(File0, _OutFile, Opts) ->
+    File = shorten_filename(File0),
+    case file(File, [from_beam|make_erl_options(Opts)]) of
+	{ok,_Mod} -> ok;
+	Other -> Other
+    end.
+
+compile_asm(File0, _OutFile, Opts) ->
+    File = shorten_filename(File0),
+    case file(File, [asm|make_erl_options(Opts)]) of
+	{ok,_Mod} -> ok;
+	Other -> Other
+    end.
+
+compile_core(File0, _OutFile, Opts) ->
+    File = shorten_filename(File0),
+    case file(File, [from_core|make_erl_options(Opts)]) of
+	{ok,_Mod} -> ok;
+	Other -> Other
+    end.
+
+shorten_filename(Name0) ->
+    {ok,Cwd} = file:get_cwd(),
+    case lists:prefix(Cwd, Name0) of
+	false -> Name0;
+	true ->
+	    Name = case lists:nthtail(length(Cwd), Name0) of
+		       "/"++N -> N;
+		       N -> N
+		   end,
+	    Name
+    end.
+
+%% Converts generic compiler options to specific options.
+
+make_erl_options(Opts) ->
+
+    %% This way of extracting will work even if the record passed
+    %% has more fields than known during compilation.
+
+    Includes = Opts#options.includes,
+    Defines = Opts#options.defines,
+    Outdir = Opts#options.outdir,
+    Warning = Opts#options.warning,
+    Verbose = Opts#options.verbose,
+    Specific = Opts#options.specific,
+    OutputType = Opts#options.output_type,
+    Cwd = Opts#options.cwd,
+
+    Options =
+	case Verbose of
+	    true ->  [verbose];
+	    false -> []
+	end ++
+	case Warning of
+	    0 -> [];
+	    _ -> [report_warnings]
+	end ++
+	map(
+	  fun ({Name, Value}) ->
+		  {d, Name, Value};
+	      (Name) ->
+		  {d, Name}
+	  end,
+	  Defines) ++
+	case OutputType of
+	    undefined -> [];
+	    jam -> [jam];
+	    beam -> [beam];
+	    native -> [native]
+	end,
+
+    Options++[report_errors, {cwd, Cwd}, {outdir, Outdir}|
+	      map(fun(Dir) -> {i, Dir} end, Includes)]++Specific.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_lib.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_lib.erl
new file mode 100644
index 0000000000..1fe45d5308
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_lib.erl
@@ -0,0 +1,509 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: core_lib.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+%% Purpose: Core Erlang abstract syntax functions.
+
+-module(core_lib).
+
+-export([get_anno/1,set_anno/2]).
+-export([is_atomic/1,is_literal/1,is_literal_list/1,
+	 is_simple/1,is_simple_list/1,is_simple_top/1]).
+-export([literal_value/1,make_literal/1]).
+-export([make_values/1]).
+-export([map/2, fold/3, mapfold/3]).
+-export([is_var_used/2]).
+
+%% -compile([export_all]).
+
+-include("core_parse.hrl").
+
+%% get_anno(Core) -> Anno.
+%% set_anno(Core, Anno) -> Core.
+%%  Generic get/set annotation.
+
+get_anno(C) -> element(2, C).
+set_anno(C, A) -> setelement(2, C, A).
+
+%% is_atomic(Expr) -> true | false.
+
+is_atomic(#c_char{}) -> true;
+is_atomic(#c_int{}) -> true;
+is_atomic(#c_float{}) -> true;
+is_atomic(#c_atom{}) -> true;
+is_atomic(#c_string{}) -> true;
+is_atomic(#c_nil{}) -> true;
+is_atomic(#c_fname{}) -> true;
+is_atomic(_) -> false.
+
+%% is_literal(Expr) -> true | false.
+
+is_literal(#c_cons{hd=H,tl=T}) ->
+    case is_literal(H) of
+	true -> is_literal(T);
+	false -> false
+    end;
+is_literal(#c_tuple{es=Es}) -> is_literal_list(Es);
+is_literal(#c_binary{segments=Es}) -> is_lit_bin(Es);
+is_literal(E) -> is_atomic(E).
+
+is_literal_list(Es) -> lists:all(fun is_literal/1, Es).
+
+is_lit_bin(Es) ->
+    lists:all(fun (#c_bitstr{val=E,size=S}) ->
+		      is_literal(E) and is_literal(S)
+	      end, Es).
+
+%% is_simple(Expr) -> true | false.
+
+is_simple(#c_var{}) -> true;
+is_simple(#c_cons{hd=H,tl=T}) ->
+    case is_simple(H) of
+	true -> is_simple(T);
+	false -> false
+    end;
+is_simple(#c_tuple{es=Es}) -> is_simple_list(Es);
+is_simple(#c_binary{segments=Es}) -> is_simp_bin(Es);
+is_simple(E) -> is_atomic(E).
+
+is_simple_list(Es) -> lists:all(fun is_simple/1, Es).
+
+is_simp_bin(Es) ->
+    lists:all(fun (#c_bitstr{val=E,size=S}) ->
+		      is_simple(E) and is_simple(S)
+	      end, Es).
+
+%% is_simple_top(Expr) -> true | false.
+%%  Only check if the top-level is a simple.
+
+is_simple_top(#c_var{}) -> true;
+is_simple_top(#c_cons{}) -> true;
+is_simple_top(#c_tuple{}) -> true;
+is_simple_top(#c_binary{}) -> true;
+is_simple_top(E) -> is_atomic(E).
+
+%% literal_value(LitExpr) -> Value.
+%%  Return the value of LitExpr.
+
+literal_value(#c_char{val=C}) -> C;
+literal_value(#c_int{val=I}) -> I;
+literal_value(#c_float{val=F}) -> F;
+literal_value(#c_atom{val=A}) -> A;
+literal_value(#c_string{val=S}) -> S;
+literal_value(#c_nil{}) -> [];
+literal_value(#c_cons{hd=H,tl=T}) ->
+    [literal_value(H)|literal_value(T)];
+literal_value(#c_tuple{es=Es}) ->
+    list_to_tuple(literal_value_list(Es)).
+
+literal_value_list(Vals) -> lists:map(fun literal_value/1, Vals).
+
+%% make_literal(Value) -> LitExpr.
+%%  Make a literal expression from an Erlang value.
+
+make_literal(I) when integer(I) -> #c_int{val=I};
+make_literal(F) when float(F) -> #c_float{val=F};
+make_literal(A) when atom(A) -> #c_atom{val=A};
+make_literal([]) -> #c_nil{};
+make_literal([H|T]) ->
+    #c_cons{hd=make_literal(H),tl=make_literal(T)};
+make_literal(T) when tuple(T) ->
+    #c_tuple{es=make_literal_list(tuple_to_list(T))}.
+
+make_literal_list(Vals) -> lists:map(fun make_literal/1, Vals).
+
+%% make_values([CoreExpr] | CoreExpr) -> #c_values{} | CoreExpr.
+%%  Make a suitable values structure, expr or values, depending on
+%%  Expr.
+
+make_values([E]) -> E;
+make_values([H|_]=Es) -> #c_values{anno=get_anno(H),es=Es};
+make_values([]) -> #c_values{es=[]};
+make_values(E) -> E.
+
+%% map(MapFun, CoreExpr) -> CoreExpr.
+%%  This function traverses the core parse format, at each level
+%%  applying the submited argument function, assumed to do the real
+%%  work.
+%%
+%%  The "eager" style, where each component of a construct are
+%%  descended to before the construct itself, admits that some
+%%  companion functions (the F:s) may be made simpler, since it may be
+%%  safely assumed that no lower illegal instanced will be
+%%  created/uncovered by actions on the current level.
+
+map(F, #c_tuple{es=Es}=R) ->
+    F(R#c_tuple{es=map_list(F, Es)});
+map(F, #c_cons{hd=Hd, tl=Tl}=R) ->
+    F(R#c_cons{hd=map(F, Hd),
+	       tl=map(F, Tl)});
+map(F, #c_values{es=Es}=R) ->
+    F(R#c_values{es=map_list(F, Es)});
+
+map(F, #c_alias{var=Var, pat=Pat}=R) ->
+    F(R#c_alias{var=map(F, Var),
+		pat=map(F, Pat)});
+
+map(F, #c_module{defs=Defs}=R) ->
+    F(R#c_module{defs=map_list(F, Defs)});
+map(F, #c_def{val=Val}=R) ->
+    F(R#c_def{val=map(F, Val)});
+
+map(F, #c_fun{vars=Vars, body=Body}=R) ->
+    F(R#c_fun{vars=map_list(F, Vars),
+	      body=map(F, Body)});
+map(F, #c_let{vars=Vs, arg=Arg, body=Body}=R) ->
+    F(R#c_let{vars=map_list(F, Vs),
+	      arg=map(F, Arg),
+	      body=map(F, Body)});
+map(F, #c_letrec{defs=Fs,body=Body}=R) ->
+    F(R#c_letrec{defs=map_list(F, Fs),
+		 body=map(F, Body)});
+map(F, #c_seq{arg=Arg, body=Body}=R) ->
+    F(R#c_seq{arg=map(F, Arg),
+	      body=map(F, Body)});
+map(F, #c_case{arg=Arg, clauses=Clauses}=R) ->
+    F(R#c_case{arg=map(F, Arg),
+	       clauses=map_list(F, Clauses)});
+map(F, #c_clause{pats=Ps, guard=Guard, body=Body}=R) ->
+    F(R#c_clause{pats=map_list(F, Ps),
+		 guard=map(F, Guard),
+		 body=map(F, Body)});
+map(F, #c_receive{clauses=Cls, timeout=Tout, action=Act}=R) ->
+    F(R#c_receive{clauses=map_list(F, Cls),
+		  timeout=map(F, Tout),
+		  action=map(F, Act)});
+map(F, #c_apply{op=Op,args=Args}=R) ->
+    F(R#c_apply{op=map(F, Op),
+		args=map_list(F, Args)});
+map(F, #c_call{module=M,name=N,args=Args}=R) ->
+    F(R#c_call{module=map(F, M),
+	       name=map(F, N),
+	       args=map_list(F, Args)});
+map(F, #c_primop{name=N,args=Args}=R) ->
+    F(R#c_primop{name=map(F, N),
+		 args=map_list(F, Args)});
+map(F, #c_try{arg=Expr,vars=Vars,body=Body,evars=Evars,handler=Handler}=R) ->
+    F(R#c_try{arg=map(F, Expr),
+	      vars=map(F, Vars),
+	      body=map(F, Body),
+	      evars=map(F, Evars),
+	      handler=map(F, Handler)});
+map(F, #c_catch{body=Body}=R) ->
+    F(R#c_catch{body=map(F, Body)});
+map(F, T) -> F(T).				%Atomic nodes.
+
+map_list(F, L) -> lists:map(fun (E) -> map(F, E) end, L).
+
+%% fold(FoldFun, Accumulator, CoreExpr) -> Accumulator.
+%%  This function traverses the core parse format, at each level
+%%  applying the submited argument function, assumed to do the real
+%%  work, and keeping the accumulated result in the A (accumulator)
+%%  argument.
+
+fold(F, Acc, #c_tuple{es=Es}=R) ->
+    F(R, fold_list(F, Acc, Es));
+fold(F, Acc, #c_cons{hd=Hd, tl=Tl}=R) ->
+    F(R, fold(F, fold(F, Acc, Hd), Tl));
+fold(F, Acc, #c_values{es=Es}=R) ->
+    F(R, fold_list(F, Acc, Es));
+
+fold(F, Acc, #c_alias{pat=P,var=V}=R) ->
+    F(R, fold(F, fold(F, Acc, P), V));
+
+fold(F, Acc, #c_module{defs=Defs}=R) ->
+    F(R, fold_list(F, Acc, Defs));
+fold(F, Acc, #c_def{val=Val}=R) ->
+    F(R, fold(F, Acc, Val));
+
+fold(F, Acc, #c_fun{vars=Vars, body=Body}=R) ->
+    F(R, fold(F, fold_list(F, Acc, Vars), Body));
+fold(F, Acc, #c_let{vars=Vs, arg=Arg, body=Body}=R) ->
+    F(R, fold(F, fold(F, fold_list(F, Acc, Vs), Arg), Body));
+fold(F, Acc, #c_letrec{defs=Fs,body=Body}=R) ->
+    F(R, fold(F, fold_list(F, Acc, Fs), Body));
+fold(F, Acc, #c_seq{arg=Arg, body=Body}=R) ->
+    F(R, fold(F, fold(F, Acc, Arg), Body));
+fold(F, Acc, #c_case{arg=Arg, clauses=Clauses}=R) ->
+    F(R, fold_list(F, fold(F, Acc, Arg), Clauses));
+fold(F, Acc, #c_clause{pats=Ps,guard=G,body=B}=R) ->
+    F(R, fold(F, fold(F, fold_list(F, Acc, Ps), G), B));
+fold(F, Acc, #c_receive{clauses=Cl, timeout=Ti, action=Ac}=R) ->
+    F(R, fold_list(F, fold(F, fold(F, Acc, Ac), Ti), Cl));
+fold(F, Acc, #c_apply{op=Op, args=Args}=R) ->
+    F(R, fold_list(F, fold(F, Acc, Op), Args));
+fold(F, Acc, #c_call{module=Mod,name=Name,args=Args}=R) ->
+    F(R, fold_list(F, fold(F, fold(F, Acc, Mod), Name), Args));
+fold(F, Acc, #c_primop{name=Name,args=Args}=R) ->
+    F(R, fold_list(F, fold(F, Acc, Name), Args));
+fold(F, Acc, #c_try{arg=E,vars=Vs,body=Body,evars=Evs,handler=H}=R) ->
+    NewB = fold(F, fold_list(F, fold(F, Acc, E), Vs), Body),
+    F(R, fold(F, fold_list(F, NewB, Evs), H));
+fold(F, Acc, #c_catch{body=Body}=R) ->
+    F(R, fold(F, Acc, Body));
+fold(F, Acc, T) ->				%Atomic nodes
+    F(T, Acc).
+
+fold_list(F, Acc, L) ->
+    lists:foldl(fun (E, A) -> fold(F, A, E) end, Acc, L).
+
+%% mapfold(MapfoldFun, Accumulator, CoreExpr) -> {CoreExpr,Accumulator}.
+%%  This function traverses the core parse format, at each level
+%%  applying the submited argument function, assumed to do the real
+%%  work, and keeping the accumulated result in the A (accumulator)
+%%  argument.
+
+mapfold(F, Acc0, #c_tuple{es=Es0}=R) ->
+    {Es1,Acc1} = mapfold_list(F, Acc0, Es0),
+    F(R#c_tuple{es=Es1}, Acc1);
+mapfold(F, Acc0, #c_cons{hd=H0,tl=T0}=R) ->
+    {H1,Acc1} = mapfold(F, Acc0, H0),
+    {T1,Acc2} = mapfold(F, Acc1, T0),
+    F(R#c_cons{hd=H1,tl=T1}, Acc2);
+mapfold(F, Acc0, #c_values{es=Es0}=R) ->
+    {Es1,Acc1} = mapfold_list(F, Acc0, Es0),
+    F(R#c_values{es=Es1}, Acc1);
+
+mapfold(F, Acc0, #c_alias{pat=P0,var=V0}=R) ->
+    {P1,Acc1} = mapfold(F, Acc0, P0),
+    {V1,Acc2} = mapfold(F, Acc1, V0),
+    F(R#c_alias{pat=P1,var=V1}, Acc2);
+
+mapfold(F, Acc0, #c_module{defs=D0}=R) ->
+    {D1,Acc1} = mapfold_list(F, Acc0, D0),
+    F(R#c_module{defs=D1}, Acc1);
+mapfold(F, Acc0, #c_def{val=V0}=R) ->
+    {V1,Acc1} = mapfold(F, Acc0, V0),
+    F(R#c_def{val=V1}, Acc1);
+
+mapfold(F, Acc0, #c_fun{vars=Vs0, body=B0}=R) ->
+    {Vs1,Acc1} = mapfold_list(F, Acc0, Vs0),
+    {B1,Acc2} = mapfold(F, Acc1, B0),
+    F(R#c_fun{vars=Vs1,body=B1}, Acc2);
+mapfold(F, Acc0, #c_let{vars=Vs0, arg=A0, body=B0}=R) ->
+    {Vs1,Acc1} = mapfold_list(F, Acc0, Vs0),
+    {A1,Acc2} = mapfold(F, Acc1, A0),
+    {B1,Acc3} = mapfold(F, Acc2, B0),
+    F(R#c_let{vars=Vs1,arg=A1,body=B1}, Acc3);
+mapfold(F, Acc0, #c_letrec{defs=Fs0,body=B0}=R) ->
+    {Fs1,Acc1} = mapfold_list(F, Acc0, Fs0),
+    {B1,Acc2} = mapfold(F, Acc1, B0),
+    F(R#c_letrec{defs=Fs1,body=B1}, Acc2);
+mapfold(F, Acc0, #c_seq{arg=A0, body=B0}=R) ->
+    {A1,Acc1} = mapfold(F, Acc0, A0),
+    {B1,Acc2} = mapfold(F, Acc1, B0),
+    F(R#c_seq{arg=A1,body=B1}, Acc2);
+mapfold(F, Acc0, #c_case{arg=A0,clauses=Cs0}=R) ->
+    {A1,Acc1} = mapfold(F, Acc0, A0),
+    {Cs1,Acc2} = mapfold_list(F, Acc1, Cs0),
+    F(R#c_case{arg=A1,clauses=Cs1}, Acc2);
+mapfold(F, Acc0, #c_clause{pats=Ps0,guard=G0,body=B0}=R) ->
+    {Ps1,Acc1} = mapfold_list(F, Acc0, Ps0),
+    {G1,Acc2} = mapfold(F, Acc1, G0),
+    {B1,Acc3} = mapfold(F, Acc2, B0),
+    F(R#c_clause{pats=Ps1,guard=G1,body=B1}, Acc3);
+mapfold(F, Acc0, #c_receive{clauses=Cs0,timeout=T0,action=A0}=R) ->
+    {T1,Acc1} = mapfold(F, Acc0, T0),
+    {Cs1,Acc2} = mapfold_list(F, Acc1, Cs0),
+    {A1,Acc3} = mapfold(F, Acc2, A0),
+    F(R#c_receive{clauses=Cs1,timeout=T1,action=A1}, Acc3);
+mapfold(F, Acc0, #c_apply{op=Op0, args=As0}=R) ->
+    {Op1,Acc1} = mapfold(F, Acc0, Op0),
+    {As1,Acc2} = mapfold_list(F, Acc1, As0),
+    F(R#c_apply{op=Op1,args=As1}, Acc2);
+mapfold(F, Acc0, #c_call{module=M0,name=N0,args=As0}=R) ->
+    {M1,Acc1} = mapfold(F, Acc0, M0),
+    {N1,Acc2} = mapfold(F, Acc1, N0),
+    {As1,Acc3} = mapfold_list(F, Acc2, As0),
+    F(R#c_call{module=M1,name=N1,args=As1}, Acc3);
+mapfold(F, Acc0, #c_primop{name=N0, args=As0}=R) ->
+    {N1,Acc1} = mapfold(F, Acc0, N0),
+    {As1,Acc2} = mapfold_list(F, Acc1, As0),
+    F(R#c_primop{name=N1,args=As1}, Acc2);
+mapfold(F, Acc0, #c_try{arg=E0,vars=Vs0,body=B0,evars=Evs0,handler=H0}=R) ->
+    {E1,Acc1} = mapfold(F, Acc0, E0),
+    {Vs1,Acc2} = mapfold_list(F, Acc1, Vs0),
+    {B1,Acc3} = mapfold(F, Acc2, B0),
+    {Evs1,Acc4} = mapfold_list(F, Acc3, Evs0),
+    {H1,Acc5} = mapfold(F, Acc4, H0),
+    F(R#c_try{arg=E1,vars=Vs1,body=B1,evars=Evs1,handler=H1}, Acc5);
+mapfold(F, Acc0, #c_catch{body=B0}=R) ->
+    {B1,Acc1} = mapfold(F, Acc0, B0),
+    F(R#c_catch{body=B1}, Acc1);
+mapfold(F, Acc, T) ->				%Atomic nodes
+	F(T, Acc).
+
+mapfold_list(F, Acc, L) ->
+    lists:mapfoldl(fun (E, A) -> mapfold(F, A, E) end, Acc, L).
+
+%% is_var_used(VarName, Expr) -> true | false.
+%%  Test if the variable VarName is used in Expr.
+
+is_var_used(V, B) -> vu_body(V, B).
+
+vu_body(V, #c_values{es=Es}) ->
+    vu_expr_list(V, Es);
+vu_body(V, Body) ->
+    vu_expr(V, Body).
+
+vu_expr(V, #c_var{name=V2}) -> V =:= V2;
+vu_expr(V, #c_cons{hd=H,tl=T}) ->
+    case vu_expr(V, H) of
+	true -> true;
+	false -> vu_expr(V, T)
+    end;
+vu_expr(V, #c_tuple{es=Es}) ->
+    vu_expr_list(V, Es);
+vu_expr(V, #c_binary{segments=Ss}) ->
+    vu_seg_list(V, Ss);
+vu_expr(V, #c_fun{vars=Vs,body=B}) ->
+    %% Variables in fun shadow previous variables
+    case vu_var_list(V, Vs) of
+	true -> false;
+	false -> vu_body(V, B)
+    end;
+vu_expr(V, #c_let{vars=Vs,arg=Arg,body=B}) ->
+    case vu_body(V, Arg) of
+	true -> true;
+	false ->
+	    %% Variables in let shadow previous variables.
+	    case vu_var_list(V, Vs) of
+		true -> false;
+		false -> vu_body(V, B)
+	    end
+    end;
+vu_expr(V, #c_letrec{defs=Fs,body=B}) ->
+    case lists:any(fun (#c_def{val=Fb}) -> vu_body(V, Fb) end, Fs) of
+	true -> true;
+	false -> vu_body(V, B)
+    end;
+vu_expr(V, #c_seq{arg=Arg,body=B}) ->
+    case vu_expr(V, Arg) of
+	true -> true;
+	false -> vu_body(V, B)
+    end;
+vu_expr(V, #c_case{arg=Arg,clauses=Cs}) ->
+    case vu_expr(V, Arg) of
+	true -> true;
+	false -> vu_clauses(V, Cs)
+    end;
+vu_expr(V, #c_receive{clauses=Cs,timeout=T,action=A}) ->
+    case vu_clauses(V, Cs) of
+	true -> true;
+	false ->
+	    case vu_expr(V, T) of
+		true -> true;
+		false -> vu_body(V, A)
+	    end
+    end;
+vu_expr(V, #c_apply{op=Op,args=As}) ->
+    vu_expr_list(V, [Op|As]);
+vu_expr(V, #c_call{module=M,name=N,args=As}) ->
+    vu_expr_list(V, [M,N|As]);
+vu_expr(V, #c_primop{args=As}) ->		%Name is an atom
+    vu_expr_list(V, As);
+vu_expr(V, #c_catch{body=B}) ->
+    vu_body(V, B);
+vu_expr(V, #c_try{arg=E,vars=Vs,body=B,evars=Evs,handler=H}) ->
+    case vu_body(V, E) of
+	true -> true;
+	false ->
+	    %% Variables shadow previous ones.
+	    case case vu_var_list(V, Vs) of
+		     true -> false;
+		     false -> vu_body(V, B)
+		 end of
+		true -> true;
+		false ->
+		    case vu_var_list(V, Evs) of
+			true -> false;
+			false -> vu_body(V, H)
+		    end
+	    end
+    end;
+vu_expr(_, _) -> false.				%Everything else
+
+vu_expr_list(V, Es) ->
+    lists:any(fun(E) -> vu_expr(V, E) end, Es).
+
+vu_seg_list(V, Ss) ->
+    lists:any(fun (#c_bitstr{val=Val,size=Size}) ->
+		      case vu_expr(V, Val) of
+			  true -> true;
+			  false -> vu_expr(V, Size)
+		      end
+	      end, Ss).
+
+%% vu_clause(VarName, Clause) -> true | false.
+%% vu_clauses(VarName, [Clause]) -> true | false.
+%%  Have to get the pattern results right.
+
+vu_clause(V, #c_clause{pats=Ps,guard=G,body=B}) ->
+    case vu_pattern_list(V, Ps) of
+	{true,_Shad} -> true;			%It is used
+	{false,true} -> false;			%Shadowed
+	{false,false} ->			%Not affected
+	    case vu_expr(V, G) of
+		true -> true;
+		false ->vu_body(V, B)
+	    end
+    end.
+
+vu_clauses(V, Cs) ->
+    lists:any(fun(C) -> vu_clause(V, C) end, Cs).
+
+%% vu_pattern(VarName, Pattern) -> {Used,Shadow}.
+%% vu_pattern_list(VarName, [Pattern]) -> {Used,Shadow}.
+%%  Binaries complicate patterns as a variable can both be properly
+%%  used, in a bit segment size, and shadow.  They can also do both.
+
+%%vu_pattern(V, Pat) -> vu_pattern(V, Pat, {false,false}).
+
+vu_pattern(V, #c_var{name=V2}, St) ->
+    setelement(2, St, V =:= V2);
+vu_pattern(V, #c_cons{hd=H,tl=T}, St0) ->
+    case vu_pattern(V, H, St0) of
+	{true,true}=St1 -> St1;			%Nothing more to know
+	St1 -> vu_pattern(V, T, St1)
+    end;
+vu_pattern(V, #c_tuple{es=Es}, St) ->
+    vu_pattern_list(V, Es, St);
+vu_pattern(V, #c_binary{segments=Ss}, St) ->
+    vu_pat_seg_list(V, Ss, St);
+vu_pattern(V, #c_alias{var=Var,pat=P}, St0) ->
+    case vu_pattern(V, Var, St0) of
+	{true,true}=St1 -> St1;
+	St1 -> vu_pattern(V, P, St1)
+    end;
+vu_pattern(_, _, St) -> St.
+
+vu_pattern_list(V, Ps) -> vu_pattern_list(V, Ps, {false,false}).
+
+vu_pattern_list(V, Ps, St0) ->
+    lists:foldl(fun(P, St) -> vu_pattern(V, P, St) end, St0, Ps).
+
+vu_pat_seg_list(V, Ss, St) ->
+    lists:foldl(fun (#c_bitstr{val=Val,size=Size}, St0) ->
+			case vu_pattern(V, Val, St0) of
+			    {true,true}=St1 -> St1;
+			    {_Used,Shad} -> {vu_expr(V, Size),Shad}
+			end
+		end, St, Ss).
+
+%% vu_var_list(VarName, [Var]) -> true | false.
+
+vu_var_list(V, Vs) ->
+    lists:any(fun (#c_var{name=V2}) -> V =:= V2 end, Vs).
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_lint.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_lint.erl
new file mode 100644
index 0000000000..773d1e53c8
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_lint.erl
@@ -0,0 +1,515 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: core_lint.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+%% Purpose : Do necessary checking of Core Erlang code.
+
+%% Check Core module for errors.  Seeing this module is used in the
+%% compiler after optimisations wedone more checking than would be
+%% necessary after just parsing.  Don't check all constructs.
+%%
+%% We check the following:
+%%
+%% All referred functions, called and exported, are defined.
+%% Format of export list.
+%% Format of attributes
+%% Used variables are defined.
+%% Variables in let and funs.
+%% Patterns case clauses.
+%% Values only as multiple values/variables/patterns.
+%% Return same number of values as requested
+%% Correct number of arguments
+%%
+%% Checks to add:
+%%
+%% Consistency of values/variables
+%% Consistency of function return values/calls.
+%%
+%% We keep the names defined variables and functions in a ordered list
+%% of variable names and function name/arity pairs.
+
+-module(core_lint).
+
+
+-export([module/1,module/2,format_error/1]).
+
+-import(lists, [reverse/1,all/2,foldl/3]).
+-import(ordsets, [add_element/2,is_element/2,union/2]).
+%-import(ordsets, [subtract/2]).
+
+-include("core_parse.hrl").
+
+%% Define the lint state record.
+
+-record(lint, {module=[],			%Current module
+	       func=[],				%Current function
+	       errors=[],			%Errors
+	       warnings=[]}).			%Warnings
+
+%% Keep track of defined
+-record(def, {vars=[],
+	      funs=[]}).
+
+%%-deftype retcount() -> any | unknown | int().
+
+%% format_error(Error)
+%%  Return a string describing the error.
+
+format_error(invalid_exports) -> "invalid exports";
+format_error(invalid_attributes) -> "invalid attributes";
+format_error({undefined_function,{F,A}}) ->
+    io_lib:format("function ~w/~w undefined", [F,A]);
+format_error({undefined_function,{F1,A1},{F2,A2}}) ->
+    io_lib:format("undefined function ~w/~w in ~w/~w", [F1,A1,F2,A2]);
+format_error({illegal_expr,{F,A}}) ->
+    io_lib:format("illegal expression in ~w/~w", [F,A]);
+format_error({illegal_guard,{F,A}}) ->
+    io_lib:format("illegal guard expression in ~w/~w", [F,A]);
+format_error({illegal_pattern,{F,A}}) ->
+    io_lib:format("illegal pattern in ~w/~w", [F,A]);
+format_error({illegal_try,{F,A}}) ->
+    io_lib:format("illegal try expression in ~w/~w", [F,A]);
+format_error({pattern_mismatch,{F,A}}) ->
+    io_lib:format("pattern count mismatch in ~w/~w", [F,A]);
+format_error({return_mismatch,{F,A}}) ->
+    io_lib:format("return count mismatch in ~w/~w", [F,A]);
+format_error({arg_mismatch,{F,A}}) ->
+    io_lib:format("argument count mismatch in ~w/~w", [F,A]);
+format_error({unbound_var,N,{F,A}}) ->
+    io_lib:format("unbound variable ~s in ~w/~w", [N,F,A]);
+format_error({duplicate_var,N,{F,A}}) ->
+    io_lib:format("duplicate variable ~s in ~w/~w", [N,F,A]);
+format_error({not_var,{F,A}}) ->
+    io_lib:format("expecting variable in ~w/~w", [F,A]);
+format_error({not_pattern,{F,A}}) ->
+    io_lib:format("expecting pattern in ~w/~w", [F,A]);
+format_error({not_bs_pattern,{F,A}}) ->
+    io_lib:format("expecting bit syntax pattern in ~w/~w", [F,A]).
+
+%% module(CoreMod) ->
+%% module(CoreMod, [CompileOption]) ->
+%%	{ok,[Warning]} | {error,[Error],[Warning]}
+
+module(M) -> module(M, []).
+
+module(#c_module{name=M,exports=Es,attrs=As,defs=Ds}, _Opts) ->
+    Defined = defined_funcs(Ds),
+    St0 = #lint{module=M#c_atom.val},
+    St1 = check_exports(Es, St0),
+    St2 = check_attrs(As, St1),
+    St3 = module_defs(Ds, Defined, St2),
+    St4 = check_state(Es, Defined, St3),
+    return_status(St4).
+
+%% defined_funcs([FuncDef]) -> [Fname].
+
+defined_funcs(Fs) ->
+    foldl(fun (#c_def{name=#c_fname{id=I,arity=A}}, Def) ->
+		  add_element({I,A}, Def)
+	  end, [], Fs).
+
+%% return_status(State) ->
+%%	{ok,[Warning]} | {error,[Error],[Warning]}
+%%  Pack errors and warnings properly and return ok | error.
+
+return_status(St) ->
+    Ws = reverse(St#lint.warnings),
+    case reverse(St#lint.errors) of
+	[] -> {ok,[{St#lint.module,Ws}]};
+	Es -> {error,[{St#lint.module,Es}],[{St#lint.module,Ws}]}
+    end.
+
+%% add_error(ErrorDescriptor, State) -> State'
+%% add_warning(ErrorDescriptor, State) -> State'
+%%  Note that we don't use line numbers here.
+
+add_error(E, St) -> St#lint{errors=[{none,core_lint,E}|St#lint.errors]}.
+
+%%add_warning(W, St) -> St#lint{warnings=[{none,core_lint,W}|St#lint.warnings]}.
+
+check_exports(Es, St) ->
+    case all(fun (#c_fname{id=Name,arity=Arity}) when
+		       atom(Name), integer(Arity) -> true;
+		 (_) -> false
+	     end, Es) of
+	true -> St;
+	false -> add_error(invalid_exports, St)
+    end.
+
+check_attrs(As, St) ->
+    case all(fun (#c_def{name=#c_atom{},val=V}) -> core_lib:is_literal(V);
+		 (_) -> false
+	     end, As) of
+	true -> St;
+	false -> add_error(invalid_attributes, St)
+    end.
+
+check_state(Es, Defined, St) ->
+    foldl(fun (#c_fname{id=N,arity=A}, St1) ->
+		  F = {N,A},
+		  case is_element(F, Defined) of
+		      true -> St1;
+		      false -> add_error({undefined_function,F}, St)
+		  end
+	  end, St, Es).
+%     Undef = subtract(Es, Defined),
+%     St1 = foldl(fun (F, St) -> add_error({undefined_function,F}, St) end,
+% 		St0, Undef),
+%     St1.
+
+%% module_defs(CoreBody, Defined, State) -> State.
+
+module_defs(B, Def, St) ->
+    %% Set top level function name.
+    foldl(fun (Func, St0) ->
+		  #c_fname{id=F,arity=A} = Func#c_def.name,
+		  St1 = St0#lint{func={F,A}},
+		  function(Func, Def, St1)
+	  end, St, B).
+
+%% functions([Fdef], Defined, State) -> State.
+
+functions(Fs, Def, St0) ->
+    foldl(fun (F, St) -> function(F, Def, St) end, St0, Fs).
+
+%% function(CoreFunc, Defined, State) -> State.
+
+function(#c_def{name=#c_fname{},val=B}, Def, St) ->
+    %% Body must be a fun!
+    case B of
+	#c_fun{} -> expr(B, Def, any, St);
+	_ -> add_error({illegal_expr,St#lint.func}, St)
+    end.
+
+%% body(Expr, Defined, RetCount, State) -> State.
+
+body(#c_values{es=Es}, Def, Rt, St) ->
+    return_match(Rt, length(Es), expr_list(Es, Def, St));
+body(E, Def, Rt, St0) ->
+    St1 = expr(E, Def, Rt, St0),
+    case core_lib:is_simple_top(E) of
+	true -> return_match(Rt, 1, St1);
+	false -> St1
+    end.
+
+%% guard(Expr, Defined, State) -> State.
+%%  Guards are boolean expressions with test wrapped in a protected.
+
+guard(Expr, Def, St) -> gexpr(Expr, Def, 1, St).
+
+%% guard_list([Expr], Defined, State) -> State.
+
+%% guard_list(Es, Def, St0) ->
+%%     foldl(fun (E, St) -> guard(E, Def, St) end, St0, Es).
+
+%% gbody(Expr, Defined, RetCount, State) -> State.
+
+gbody(#c_values{es=Es}, Def, Rt, St) ->
+    return_match(Rt, length(Es), gexpr_list(Es, Def, St));
+gbody(E, Def, Rt, St0) ->
+    St1 = gexpr(E, Def, Rt, St0),
+    case core_lib:is_simple_top(E) of
+	true -> return_match(Rt, 1, St1);
+	false -> St1
+    end.
+
+gexpr(#c_var{name=N}, Def, _Rt, St) -> expr_var(N, Def, St);
+gexpr(#c_int{}, _Def, _Rt, St) -> St;
+gexpr(#c_float{}, _Def, _Rt, St) -> St;
+gexpr(#c_atom{}, _Def, _Rt, St) -> St;
+gexpr(#c_char{}, _Def, _Rt, St) -> St;
+gexpr(#c_string{}, _Def, _Rt, St) -> St;
+gexpr(#c_nil{}, _Def, _Rt, St) -> St;
+gexpr(#c_cons{hd=H,tl=T}, Def, _Rt, St) ->
+    gexpr_list([H,T], Def, St);
+gexpr(#c_tuple{es=Es}, Def, _Rt, St) ->
+    gexpr_list(Es, Def, St);
+gexpr(#c_binary{segments=Ss}, Def, _Rt, St) ->
+    gbitstr_list(Ss, Def, St);
+gexpr(#c_seq{arg=Arg,body=B}, Def, Rt, St0) ->
+    St1 = gexpr(Arg, Def, any, St0),		%Ignore values
+    gbody(B, Def, Rt, St1);
+gexpr(#c_let{vars=Vs,arg=Arg,body=B}, Def, Rt, St0) ->
+    St1 = gbody(Arg, Def, let_varcount(Vs), St0), %This is a guard body
+    {Lvs,St2} = variable_list(Vs, St1),
+    gbody(B, union(Lvs, Def), Rt, St2);
+gexpr(#c_call{module=#c_atom{val=erlang},
+	      name=#c_atom{},
+	      args=As}, Def, 1, St) ->
+    gexpr_list(As, Def, St);
+gexpr(#c_primop{name=N,args=As}, Def, _Rt, St0) when record(N, c_atom) ->
+    gexpr_list(As, Def, St0);
+gexpr(#c_try{arg=E,vars=[#c_var{name=X}],body=#c_var{name=X},
+	     evars=[#c_var{},#c_var{},#c_var{}],handler=#c_atom{val=false}},
+      Def, Rt, St) ->
+    gbody(E, Def, Rt, St);
+gexpr(_, _, _, St) ->
+    add_error({illegal_guard,St#lint.func}, St).
+
+%% gexpr_list([Expr], Defined, State) -> State.
+
+gexpr_list(Es, Def, St0) ->
+    foldl(fun (E, St) -> gexpr(E, Def, 1, St) end, St0, Es).
+
+%% gbitstr_list([Elem], Defined, State) -> State.
+
+gbitstr_list(Es, Def, St0) ->
+    foldl(fun (E, St) -> gbitstr(E, Def, St) end, St0, Es).
+
+gbitstr(#c_bitstr{val=V,size=S,unit=U,type=T,flags=Fs}, Def, St0) ->
+    St1 = bit_type(U, T, Fs, St0),
+    gexpr_list([V,S], Def, St1).
+
+%% expr(Expr, Defined, RetCount, State) -> State.
+
+expr(#c_var{name=N}, Def, _Rt, St) -> expr_var(N, Def, St);
+expr(#c_int{}, _Def, _Rt, St) -> St;
+expr(#c_float{}, _Def, _Rt, St) -> St;
+expr(#c_atom{}, _Def, _Rt, St) -> St;
+expr(#c_char{}, _Def, _Rt, St) -> St;
+expr(#c_string{}, _Def, _Rt, St) -> St;
+expr(#c_nil{}, _Def, _Rt, St) -> St;
+expr(#c_cons{hd=H,tl=T}, Def, _Rt, St) ->
+    expr_list([H,T], Def, St);
+expr(#c_tuple{es=Es}, Def, _Rt, St) ->
+    expr_list(Es, Def, St);
+expr(#c_binary{segments=Ss}, Def, _Rt, St) ->
+    bitstr_list(Ss, Def, St);
+expr(#c_fname{id=I,arity=A}, Def, _Rt, St) ->
+    expr_fname({I,A}, Def, St);
+expr(#c_fun{vars=Vs,body=B}, Def, Rt, St0) ->
+    {Vvs,St1} = variable_list(Vs, St0),
+    return_match(Rt, 1, body(B, union(Vvs, Def), any, St1));
+expr(#c_seq{arg=Arg,body=B}, Def, Rt, St0) ->
+    St1 = expr(Arg, Def, any, St0),		%Ignore values
+    body(B, Def, Rt, St1);
+expr(#c_let{vars=Vs,arg=Arg,body=B}, Def, Rt, St0) ->
+    St1 = body(Arg, Def, let_varcount(Vs), St0), %This is a body
+    {Lvs,St2} = variable_list(Vs, St1),
+    body(B, union(Lvs, Def), Rt, St2);
+expr(#c_letrec{defs=Fs,body=B}, Def0, Rt, St0) ->
+    Def1 = union(defined_funcs(Fs), Def0),	%All defined stuff
+    St1 = functions(Fs, Def1, St0),
+    body(B, Def1, Rt, St1#lint{func=St0#lint.func});
+expr(#c_case{arg=Arg,clauses=Cs}, Def, Rt, St0) ->
+    Pc = case_patcount(Cs),
+    St1 = body(Arg, Def, Pc, St0),
+    clauses(Cs, Def, Pc, Rt, St1);
+expr(#c_receive{clauses=Cs,timeout=T,action=A}, Def, Rt, St0) ->
+    St1 = expr(T, Def, 1, St0),
+    St2 = body(A, Def, Rt, St1),
+    clauses(Cs, Def, 1, Rt, St2);
+expr(#c_apply{op=Op,args=As}, Def, _Rt, St0) ->
+    St1 = apply_op(Op, Def, length(As), St0),
+    expr_list(As, Def, St1);
+expr(#c_call{module=M,name=N,args=As}, Def, _Rt, St0) ->
+    St1 = expr(M, Def, 1, St0),
+    St2 = expr(N, Def, 1, St1),
+    expr_list(As, Def, St2);
+expr(#c_primop{name=N,args=As}, Def, _Rt, St0) when record(N, c_atom) ->
+    expr_list(As, Def, St0);
+expr(#c_catch{body=B}, Def, Rt, St) ->
+    return_match(Rt, 1, body(B, Def, 1, St));
+expr(#c_try{arg=A,vars=Vs,body=B,evars=Evs,handler=H}, Def, Rt, St0) ->
+    St1 = case length(Evs) of
+	      2 -> St0;
+	      _ -> add_error({illegal_try,St0#lint.func}, St0)
+	  end,
+    St2 = body(A, Def, let_varcount(Vs), St1),
+    {Ns,St3} = variable_list(Vs, St2),
+    St4 = body(B, union(Ns, Def), Rt, St3),
+    {Ens,St5} = variable_list(Evs, St4),
+    body(H, union(Ens, Def), Rt, St5);
+expr(_, _, _, St) ->
+    %%io:fwrite("clint: ~p~n", [Other]),
+    add_error({illegal_expr,St#lint.func}, St).
+
+%% expr_list([Expr], Defined, State) -> State.
+
+expr_list(Es, Def, St0) ->
+    foldl(fun (E, St) -> expr(E, Def, 1, St) end, St0, Es).
+
+%% bitstr_list([Elem], Defined, State) -> State.
+
+bitstr_list(Es, Def, St0) ->
+    foldl(fun (E, St) -> bitstr(E, Def, St) end, St0, Es).
+
+bitstr(#c_bitstr{val=V,size=S,unit=U,type=T,flags=Fs}, Def, St0) ->
+    St1 = bit_type(U, T, Fs, St0),
+    expr_list([V,S], Def, St1).
+
+%% apply_op(Op, Defined, ArgCount, State) -> State.
+%%  A apply op is either an fname or an expression.
+
+apply_op(#c_fname{id=I,arity=A}, Def, Ac, St0) ->
+    St1 = expr_fname({I,A}, Def, St0),
+    arg_match(Ac, A, St1);
+apply_op(E, Def, _, St) -> expr(E, Def, 1, St).	%Hard to check
+
+%% expr_var(VarName, Defined, State) -> State.
+
+expr_var(N, Def, St) ->
+    case is_element(N, Def) of
+	true -> St;
+	false -> add_error({unbound_var,N,St#lint.func}, St)
+    end.
+
+%% expr_fname(Fname, Defined, State) -> State.
+
+expr_fname(Fname, Def, St) ->
+    case is_element(Fname, Def) of
+	true -> St;
+	false -> add_error({undefined_function,Fname,St#lint.func}, St)
+    end.
+
+%% let_varcount([Var]) -> int().
+
+let_varcount([]) -> any;			%Ignore values
+let_varcount(Es) -> length(Es).
+
+%% case_patcount([Clause]) -> int().
+
+case_patcount([#c_clause{pats=Ps}|_]) -> length(Ps).
+
+%% clauses([Clause], Defined, PatCount, RetCount, State) -> State.
+
+clauses(Cs, Def, Pc, Rt, St0) ->
+    foldl(fun (C, St) -> clause(C, Def, Pc, Rt, St) end, St0, Cs).
+
+%% clause(Clause, Defined, PatCount, RetCount, State) -> State.
+
+clause(#c_clause{pats=Ps,guard=G,body=B}, Def0, Pc, Rt, St0) ->
+    St1 = pattern_match(Pc, length(Ps), St0),
+    {Pvs,St2} = pattern_list(Ps, Def0, St1),
+    Def1 = union(Pvs, Def0),
+    St3 = guard(G, Def1, St2),
+    body(B, Def1, Rt, St3).
+
+%% variable(Var, [PatVar], State) -> {[VarName],State}.
+
+variable(#c_var{name=N}, Ps, St) ->
+    case is_element(N, Ps) of
+	true -> {[],add_error({duplicate_var,N,St#lint.func}, St)};
+	false -> {[N],St}
+    end;
+variable(_, Def, St) -> {Def,add_error({not_var,St#lint.func}, St)}.
+
+%% variable_list([Var], State) -> {[Var],State}.
+%% variable_list([Var], [PatVar], State) -> {[Var],State}.
+
+variable_list(Vs, St) -> variable_list(Vs, [], St).
+
+variable_list(Vs, Ps, St) ->
+    foldl(fun (V, {Ps0,St0}) ->
+		  {Vvs,St1} = variable(V, Ps0, St0),
+		  {union(Vvs, Ps0),St1}
+	  end, {Ps,St}, Vs).
+
+%% pattern(Pattern, Defined, State) -> {[PatVar],State}.
+%% pattern(Pattern, Defined, [PatVar], State) -> {[PatVar],State}.
+%%  Patterns are complicated by sizes in binaries.  These are pure
+%%  input variables which create no bindings.  We, therefor, need to
+%%  carry around the original defined variables to get the correct
+%%  handling.
+
+%% pattern(P, Def, St) -> pattern(P, Def, [], St).
+
+pattern(#c_var{name=N}, Def, Ps, St) ->
+    pat_var(N, Def, Ps, St);
+pattern(#c_int{}, _Def, Ps, St) -> {Ps,St};
+pattern(#c_float{}, _Def, Ps, St) -> {Ps,St};
+pattern(#c_atom{}, _Def, Ps, St) -> {Ps,St};
+pattern(#c_char{}, _Def, Ps, St) -> {Ps,St};
+pattern(#c_string{}, _Def, Ps, St) -> {Ps,St};
+pattern(#c_nil{}, _Def, Ps, St) -> {Ps,St};
+pattern(#c_cons{hd=H,tl=T}, Def, Ps, St) ->
+    pattern_list([H,T], Def, Ps, St);
+pattern(#c_tuple{es=Es}, Def, Ps, St) ->
+    pattern_list(Es, Def, Ps, St);
+pattern(#c_binary{segments=Ss}, Def, Ps, St) ->
+    pat_bin(Ss, Def, Ps, St);
+pattern(#c_alias{var=V,pat=P}, Def, Ps, St0) ->
+    {Vvs,St1} = variable(V, Ps, St0),
+    pattern(P, Def, union(Vvs, Ps), St1);
+pattern(_, _, Ps, St) -> {Ps,add_error({not_pattern,St#lint.func}, St)}.
+
+pat_var(N, _Def, Ps, St) ->
+    case is_element(N, Ps) of
+	true -> {Ps,add_error({duplicate_var,N,St#lint.func}, St)};
+	false -> {add_element(N, Ps),St}
+    end.
+
+%% pat_bin_list([Elem], Defined, [PatVar], State) -> {[PatVar],State}.
+
+pat_bin(Es, Def, Ps0, St0) ->
+    foldl(fun (E, {Ps,St}) -> pat_segment(E, Def, Ps, St) end, {Ps0,St0}, Es).
+
+pat_segment(#c_bitstr{val=V,size=S,unit=U,type=T,flags=Fs}, Def, Ps, St0) ->
+    St1 = bit_type(U, T, Fs, St0),
+    St2 = pat_bit_expr(S, T, Def, St1),
+    pattern(V, Def, Ps, St2);
+pat_segment(_, _, Ps, St) ->
+    {Ps,add_error({not_bs_pattern,St#lint.func}, St)}.
+
+%% pat_bit_expr(SizePat, Type, Defined, State) -> State.
+%%  Check the Size pattern, this is an input!  Be a bit tough here.
+
+pat_bit_expr(#c_int{val=I}, _, _, St) when I >= 0 -> St;
+pat_bit_expr(#c_var{name=N}, _, Def, St) ->
+    expr_var(N, Def, St);
+pat_bit_expr(#c_atom{val=all}, binary, _Def, St) -> St;
+pat_bit_expr(_, _, _, St) ->
+    add_error({illegal_expr,St#lint.func}, St).
+
+bit_type(Unit, Type, Flags, St) ->
+    U = core_lib:literal_value(Unit),
+    T = core_lib:literal_value(Type),
+    Fs = core_lib:literal_value(Flags),
+    case erl_bits:set_bit_type(default, [T,{unit,U}|Fs]) of
+	{ok,_,_} -> St;
+	{error,E} -> add_error({E,St#lint.func}, St)
+    end.
+
+%% pattern_list([Var], Defined, State) -> {[PatVar],State}.
+%% pattern_list([Var], Defined, [PatVar], State) -> {[PatVar],State}.
+
+pattern_list(Pats, Def, St) -> pattern_list(Pats, Def, [], St).
+
+pattern_list(Pats, Def, Ps0, St0) ->
+    foldl(fun (P, {Ps,St}) -> pattern(P, Def, Ps, St) end, {Ps0,St0}, Pats).
+
+%% pattern_match(Required, Supplied, State) -> State.
+%%  Check that the required number of patterns match the supplied.
+
+pattern_match(N, N, St) -> St;
+pattern_match(_Req, _Sup, St) ->
+    add_error({pattern_mismatch,St#lint.func}, St).
+
+%% return_match(Required, Supplied, State) -> State.
+%%  Check that the required number of return values match the supplied.
+
+return_match(any, _Sup, St) -> St;
+return_match(_Req, unknown, St) -> St;
+return_match(N, N, St) -> St;
+return_match(_Req, _Sup, St) ->
+    add_error({return_mismatch,St#lint.func}, St).
+
+%% arg_match(Required, Supplied, State) -> State.
+
+arg_match(_Req, unknown, St) -> St;
+arg_match(N, N, St) -> St;
+arg_match(_Req, _Sup, St) ->
+    add_error({arg_mismatch,St#lint.func}, St).
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_parse.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_parse.erl
new file mode 100644
index 0000000000..77c33c561b
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_parse.erl
@@ -0,0 +1,4909 @@
+-module(core_parse).
+-define(THIS_MODULE, core_parse).
+-export([parse/1, parse_and_scan/1, format_error/1]).
+
+-export([abstract/1,abstract/2,normalise/1]).
+
+%% The following directive is needed for (significantly) faster compilation
+%% of the generated .erl file by the HiPE compiler.  Please do not remove.
+-compile([{hipe,[{regalloc,linear_scan}]}]).
+
+-include("core_parse.hrl").
+
+tok_val(T) -> element(3, T).
+tok_line(T) -> element(2, T).
+
+abstract(T, _N) -> abstract(T).
+
+abstract(Term) -> core_lib:make_literal(Term).
+
+normalise(Core) -> core_lib:literal_value(Core).
+
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: core_parse.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% The parser generator will insert appropriate declarations before this line.%
+
+parse(Tokens) ->
+    case catch yeccpars1(Tokens, false, 0, [], []) of
+	error ->
+	    Errorline =
+		if Tokens == [] -> 0; true -> element(2, hd(Tokens)) end,
+	    {error,
+	     {Errorline, ?THIS_MODULE, "syntax error at or after this line."}};
+	Other ->
+	    Other
+    end.
+
+parse_and_scan({Mod, Fun, Args}) ->
+    case apply(Mod, Fun, Args) of
+	{eof, _} ->
+	    {ok, eof};
+	{error, Descriptor, _} ->
+	    {error, Descriptor};
+	{ok, Tokens, _} ->
+	    yeccpars1(Tokens, {Mod, Fun, Args}, 0, [], [])
+    end.
+
+format_error(Message) ->
+    case io_lib:deep_char_list(Message) of
+	true ->
+	    Message;
+	_ ->
+	    io_lib:write(Message)
+    end.
+
+% To be used in grammar files to throw an error message to the parser toplevel.
+% Doesn't have to be exported!
+return_error(Line, Message) ->
+    throw({error, {Line, ?THIS_MODULE, Message}}).
+
+
+% Don't change yeccpars1/6 too much, it is called recursively by yeccpars2/8!
+yeccpars1([Token | Tokens], Tokenizer, State, States, Vstack) ->
+    yeccpars2(State, element(1, Token), States, Vstack, Token, Tokens,
+	      Tokenizer);
+yeccpars1([], {M, F, A}, State, States, Vstack) ->
+    case catch apply(M, F, A) of
+        {eof, Endline} ->
+            {error, {Endline, ?THIS_MODULE, "end_of_file"}};
+        {error, Descriptor, _Endline} ->
+            {error, Descriptor};
+        {'EXIT', Reason} ->
+            {error, {0, ?THIS_MODULE, Reason}};
+        {ok, Tokens, _Endline} ->
+	    case catch yeccpars1(Tokens, {M, F, A}, State, States, Vstack) of
+		error ->
+		    Errorline = element(2, hd(Tokens)),
+		    {error, {Errorline, ?THIS_MODULE,
+			     "syntax error at or after this line."}};
+		Other ->
+		    Other
+	    end
+    end;
+yeccpars1([], false, State, States, Vstack) ->
+    yeccpars2(State, '$end', States, Vstack, {'$end', 999999}, [], false).
+
+% For internal use only.
+yeccerror(Token) ->
+    {error,
+     {element(2, Token), ?THIS_MODULE,
+      ["syntax error before: ", yecctoken2string(Token)]}}.
+
+yecctoken2string({atom, _, A}) -> io_lib:write(A);
+yecctoken2string({integer,_,N}) -> io_lib:write(N);
+yecctoken2string({float,_,F}) -> io_lib:write(F);
+yecctoken2string({char,_,C}) -> io_lib:write_char(C);
+yecctoken2string({var,_,V}) -> io_lib:format('~s', [V]);
+yecctoken2string({string,_,S}) -> io_lib:write_string(S);
+yecctoken2string({reserved_symbol, _, A}) -> io_lib:format('~w', [A]);
+yecctoken2string({_Cat, _, Val}) -> io_lib:format('~w', [Val]);
+
+yecctoken2string({'dot', _}) -> io_lib:format('~w', ['.']);
+yecctoken2string({'$end', _}) ->
+    [];
+yecctoken2string({Other, _}) when atom(Other) ->
+    io_lib:format('~w', [Other]);
+yecctoken2string(Other) ->
+    io_lib:write(Other).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+yeccpars2(0, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 1, [0 | __Ss], [__T | __Stack]);
+yeccpars2(0, 'module', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 2, [0 | __Ss], [__T | __Stack]);
+yeccpars2(0, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(1, 'module', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 313, [1 | __Ss], [__T | __Stack]);
+yeccpars2(1, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(2, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 4, [2 | __Ss], [__T | __Stack]);
+yeccpars2(2, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(3, '$end', _, __Stack, _, _, _) ->
+ {ok, hd(__Stack)};
+yeccpars2(3, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(4, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 5, [4 | __Ss], [__T | __Stack]);
+yeccpars2(4, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(5, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 11, [5 | __Ss], [__T | __Stack]);
+yeccpars2(5, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 306, [5 | __Ss], [__T | __Stack]);
+yeccpars2(5, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(6, 'attributes', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 7, [6 | __Ss], [__T | __Stack]);
+yeccpars2(6, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(7, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 276, [7 | __Ss], [__T | __Stack]);
+yeccpars2(7, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(8, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 9, [8 | __Ss], [__T | __Stack]);
+yeccpars2(8, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 11, [8 | __Ss], [__T | __Stack]);
+yeccpars2(8, __Cat, __Ss,  __Stack, __T, __Ts, __Tzr) ->
+ __Val =  [],
+ yeccpars2(13, __Cat, [8 | __Ss], [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(9, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 11, [9 | __Ss], [__T | __Stack]);
+yeccpars2(9, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(10, '=', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 20, [10 | __Ss], [__T | __Stack]);
+yeccpars2(10, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(11, '/', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 18, [11 | __Ss], [__T | __Stack]);
+yeccpars2(11, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(12, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 9, [12 | __Ss], [__T | __Stack]);
+yeccpars2(12, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 11, [12 | __Ss], [__T | __Stack]);
+yeccpars2(12, __Cat, __Ss,  __Stack, __T, __Ts, __Tzr) ->
+ __Val =  [],
+ yeccpars2(17, __Cat, [12 | __Ss], [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(13, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(module_defs, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(14, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(anno_function_name, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(15, 'end', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 16, [15 | __Ss], [__T | __Stack]);
+yeccpars2(15, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(16, __Cat, __Ss,  [__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_module{name = #c_atom{val = tok_val(__2)}, exports = __3, attrs = __4, defs = __5},
+ __Nss = lists:nthtail(5, __Ss),
+ yeccpars2(yeccgoto(module_definition, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(17, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1|__2],
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(function_definitions, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(18, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 19, [18 | __Ss], [__T | __Stack]);
+yeccpars2(18, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(19, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_fname{id = tok_val(__1), arity = tok_val(__3)},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(function_name, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(20, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [20 | __Ss], [__T | __Stack]);
+yeccpars2(20, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 21, [20 | __Ss], [__T | __Stack]);
+yeccpars2(20, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(21, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [21 | __Ss], [__T | __Stack]);
+yeccpars2(21, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(22, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_def{name = __1, val = __3},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(function_definition, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(23, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 25, [23 | __Ss], [__T | __Stack]);
+yeccpars2(23, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(24, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(anno_fun, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(25, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 27, [25 | __Ss], [__T | __Stack]);
+yeccpars2(25, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 26, [25 | __Ss], [__T | __Stack]);
+yeccpars2(25, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [25 | __Ss], [__T | __Stack]);
+yeccpars2(25, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(26, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [26 | __Ss], [__T | __Stack]);
+yeccpars2(26, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(27, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 265, [27 | __Ss], [__T | __Stack]);
+yeccpars2(27, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(28, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 263, [28 | __Ss], [__T | __Stack]);
+yeccpars2(28, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(anno_variables, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(29, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 32, [29 | __Ss], [__T | __Stack]);
+yeccpars2(29, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(30, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_var{name = tok_val(__1)},
+ yeccpars2(yeccgoto(variable, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(31, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(anno_variable, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(32, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 33, [32 | __Ss], [__T | __Stack]);
+yeccpars2(32, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(33, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [33 | __Ss], [__T | __Stack]);
+yeccpars2(33, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(34, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 247, [34 | __Ss], [__T | __Stack]);
+yeccpars2(34, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(35, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [35 | __Ss], [__T | __Stack]);
+yeccpars2(35, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(36, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 240, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [36 | __Ss], [__T | __Stack]);
+yeccpars2(36, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(37, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 149, [37 | __Ss], [__T | __Stack]);
+yeccpars2(37, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(38, __Cat, __Ss,  [__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_fun{vars = __3, body = __6},
+ __Nss = lists:nthtail(5, __Ss),
+ yeccpars2(yeccgoto(fun_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(39, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(40, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [40 | __Ss], [__T | __Stack]);
+yeccpars2(40, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(41, '/', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 18, [41 | __Ss], [__T | __Stack]);
+yeccpars2(41, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_atom{val = tok_val(__1)},
+ yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(42, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(43, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(44, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [44 | __Ss], [__T | __Stack]);
+yeccpars2(44, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(45, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(46, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [46 | __Ss], [__T | __Stack]);
+yeccpars2(46, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(47, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(48, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [48 | __Ss], [__T | __Stack]);
+yeccpars2(48, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(49, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(50, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_char{val = tok_val(__1)},
+ yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(51, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(52, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [52 | __Ss], [__T | __Stack]);
+yeccpars2(52, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(53, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(anno_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(54, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_float{val = tok_val(__1)},
+ yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(55, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(56, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(57, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_int{val = tok_val(__1)},
+ yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(58, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 83, [58 | __Ss], [__T | __Stack]);
+yeccpars2(58, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 26, [58 | __Ss], [__T | __Stack]);
+yeccpars2(58, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [58 | __Ss], [__T | __Stack]);
+yeccpars2(58, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(59, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(60, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 9, [60 | __Ss], [__T | __Stack]);
+yeccpars2(60, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 11, [60 | __Ss], [__T | __Stack]);
+yeccpars2(60, __Cat, __Ss,  __Stack, __T, __Ts, __Tzr) ->
+ __Val =  [],
+ yeccpars2(210, __Cat, [60 | __Ss], [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(61, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(62, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_nil{},
+ yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(63, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 208, [63 | __Ss], [__T | __Stack]);
+yeccpars2(63, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(64, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(65, 'after', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 99, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 97, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 96, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [65 | __Ss], [__T | __Stack]);
+yeccpars2(65, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(66, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(67, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(68, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(69, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_string{val = tok_val(__1)},
+ yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(70, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [70 | __Ss], [__T | __Stack]);
+yeccpars2(70, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(71, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(72, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(73, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(74, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 77, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [74 | __Ss], [__T | __Stack]);
+yeccpars2(74, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(75, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 79, [75 | __Ss], [__T | __Stack]);
+yeccpars2(75, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(anno_expressions, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(76, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 78, [76 | __Ss], [__T | __Stack]);
+yeccpars2(76, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(77, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_tuple{es = []},
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(tuple, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(78, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_tuple{es = __2},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tuple, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(79, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [79 | __Ss], [__T | __Stack]);
+yeccpars2(79, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(80, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1|__3],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(anno_expressions, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(81, 'of', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 82, [81 | __Ss], [__T | __Stack]);
+yeccpars2(81, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(82, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 83, [82 | __Ss], [__T | __Stack]);
+yeccpars2(82, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 26, [82 | __Ss], [__T | __Stack]);
+yeccpars2(82, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [82 | __Ss], [__T | __Stack]);
+yeccpars2(82, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(83, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 92, [83 | __Ss], [__T | __Stack]);
+yeccpars2(83, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 26, [83 | __Ss], [__T | __Stack]);
+yeccpars2(83, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [83 | __Ss], [__T | __Stack]);
+yeccpars2(83, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(84, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(let_vars, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(85, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 86, [85 | __Ss], [__T | __Stack]);
+yeccpars2(85, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(86, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [86 | __Ss], [__T | __Stack]);
+yeccpars2(86, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(87, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 88, [87 | __Ss], [__T | __Stack]);
+yeccpars2(87, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(88, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 83, [88 | __Ss], [__T | __Stack]);
+yeccpars2(88, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 26, [88 | __Ss], [__T | __Stack]);
+yeccpars2(88, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [88 | __Ss], [__T | __Stack]);
+yeccpars2(88, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(89, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 90, [89 | __Ss], [__T | __Stack]);
+yeccpars2(89, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(90, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [90 | __Ss], [__T | __Stack]);
+yeccpars2(90, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(91, __Cat, __Ss,  [__10,__9,__8,__7,__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  if length(__8) == 2 -> #c_try{arg = __2, vars = __4, body = __6, evars = __8, handler = __10}; true -> return_error(tok_line(__7),"expected 2 exception variables in 'try'") end,
+ __Nss = lists:nthtail(9, __Ss),
+ yeccpars2(yeccgoto(try_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(92, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [],
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(let_vars, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(93, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 94, [93 | __Ss], [__T | __Stack]);
+yeccpars2(93, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(94, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __2,
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(let_vars, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(95, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 190, [95 | __Ss], [__T | __Stack]);
+yeccpars2(95, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(96, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 97, [96 | __Ss], [__T | __Stack]);
+yeccpars2(96, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [96 | __Ss], [__T | __Stack]);
+yeccpars2(96, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [96 | __Ss], [__T | __Stack]);
+yeccpars2(96, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [96 | __Ss], [__T | __Stack]);
+yeccpars2(96, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [96 | __Ss], [__T | __Stack]);
+yeccpars2(96, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [96 | __Ss], [__T | __Stack]);
+yeccpars2(96, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 115, [96 | __Ss], [__T | __Stack]);
+yeccpars2(96, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [96 | __Ss], [__T | __Stack]);
+yeccpars2(96, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [96 | __Ss], [__T | __Stack]);
+yeccpars2(96, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [96 | __Ss], [__T | __Stack]);
+yeccpars2(96, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [96 | __Ss], [__T | __Stack]);
+yeccpars2(96, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(97, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 182, [97 | __Ss], [__T | __Stack]);
+yeccpars2(97, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [97 | __Ss], [__T | __Stack]);
+yeccpars2(97, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [97 | __Ss], [__T | __Stack]);
+yeccpars2(97, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [97 | __Ss], [__T | __Stack]);
+yeccpars2(97, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [97 | __Ss], [__T | __Stack]);
+yeccpars2(97, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [97 | __Ss], [__T | __Stack]);
+yeccpars2(97, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 115, [97 | __Ss], [__T | __Stack]);
+yeccpars2(97, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [97 | __Ss], [__T | __Stack]);
+yeccpars2(97, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [97 | __Ss], [__T | __Stack]);
+yeccpars2(97, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [97 | __Ss], [__T | __Stack]);
+yeccpars2(97, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [97 | __Ss], [__T | __Stack]);
+yeccpars2(97, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(98, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [98 | __Ss], [__T | __Stack]);
+yeccpars2(98, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [98 | __Ss], [__T | __Stack]);
+yeccpars2(98, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [98 | __Ss], [__T | __Stack]);
+yeccpars2(98, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [98 | __Ss], [__T | __Stack]);
+yeccpars2(98, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [98 | __Ss], [__T | __Stack]);
+yeccpars2(98, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 115, [98 | __Ss], [__T | __Stack]);
+yeccpars2(98, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [98 | __Ss], [__T | __Stack]);
+yeccpars2(98, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [98 | __Ss], [__T | __Stack]);
+yeccpars2(98, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [98 | __Ss], [__T | __Stack]);
+yeccpars2(98, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [98 | __Ss], [__T | __Stack]);
+yeccpars2(98, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 149, [98 | __Ss], [__T | __Stack]);
+yeccpars2(98, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(99, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [99 | __Ss], [__T | __Stack]);
+yeccpars2(99, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(100, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 97, [100 | __Ss], [__T | __Stack]);
+yeccpars2(100, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 96, [100 | __Ss], [__T | __Stack]);
+yeccpars2(100, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [100 | __Ss], [__T | __Stack]);
+yeccpars2(100, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [100 | __Ss], [__T | __Stack]);
+yeccpars2(100, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [100 | __Ss], [__T | __Stack]);
+yeccpars2(100, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [100 | __Ss], [__T | __Stack]);
+yeccpars2(100, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [100 | __Ss], [__T | __Stack]);
+yeccpars2(100, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [100 | __Ss], [__T | __Stack]);
+yeccpars2(100, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [100 | __Ss], [__T | __Stack]);
+yeccpars2(100, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [100 | __Ss], [__T | __Stack]);
+yeccpars2(100, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [100 | __Ss], [__T | __Stack]);
+yeccpars2(100, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(anno_clauses, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(101, 'after', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 99, [101 | __Ss], [__T | __Stack]);
+yeccpars2(101, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(102, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(clause_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(103, '=', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 162, [103 | __Ss], [__T | __Stack]);
+yeccpars2(103, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(anno_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(104, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_atom{val = tok_val(__1)},
+ yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(105, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(atomic_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(106, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(other_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(107, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(other_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(108, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(anno_clause, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(109, 'when', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 164, [109 | __Ss], [__T | __Stack]);
+yeccpars2(109, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(110, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(other_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(111, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(anno_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(112, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val = begin
+   {T,A} = __2, #c_receive{clauses = [], timeout = T, action = A}
+  end,
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(receive_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(113, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(other_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(114, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [114 | __Ss], [__T | __Stack]);
+yeccpars2(114, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [114 | __Ss], [__T | __Stack]);
+yeccpars2(114, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [114 | __Ss], [__T | __Stack]);
+yeccpars2(114, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [114 | __Ss], [__T | __Stack]);
+yeccpars2(114, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [114 | __Ss], [__T | __Stack]);
+yeccpars2(114, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 115, [114 | __Ss], [__T | __Stack]);
+yeccpars2(114, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [114 | __Ss], [__T | __Stack]);
+yeccpars2(114, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [114 | __Ss], [__T | __Stack]);
+yeccpars2(114, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [114 | __Ss], [__T | __Stack]);
+yeccpars2(114, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [114 | __Ss], [__T | __Stack]);
+yeccpars2(114, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 118, [114 | __Ss], [__T | __Stack]);
+yeccpars2(114, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(115, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [115 | __Ss], [__T | __Stack]);
+yeccpars2(115, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [115 | __Ss], [__T | __Stack]);
+yeccpars2(115, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [115 | __Ss], [__T | __Stack]);
+yeccpars2(115, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [115 | __Ss], [__T | __Stack]);
+yeccpars2(115, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [115 | __Ss], [__T | __Stack]);
+yeccpars2(115, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 26, [115 | __Ss], [__T | __Stack]);
+yeccpars2(115, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [115 | __Ss], [__T | __Stack]);
+yeccpars2(115, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [115 | __Ss], [__T | __Stack]);
+yeccpars2(115, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [115 | __Ss], [__T | __Stack]);
+yeccpars2(115, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [115 | __Ss], [__T | __Stack]);
+yeccpars2(115, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(116, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 120, [116 | __Ss], [__T | __Stack]);
+yeccpars2(116, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(anno_patterns, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(117, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 119, [117 | __Ss], [__T | __Stack]);
+yeccpars2(117, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(118, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_tuple{es = []},
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(tuple_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(119, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_tuple{es = __2},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tuple_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(120, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [120 | __Ss], [__T | __Stack]);
+yeccpars2(120, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [120 | __Ss], [__T | __Stack]);
+yeccpars2(120, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [120 | __Ss], [__T | __Stack]);
+yeccpars2(120, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [120 | __Ss], [__T | __Stack]);
+yeccpars2(120, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [120 | __Ss], [__T | __Stack]);
+yeccpars2(120, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 115, [120 | __Ss], [__T | __Stack]);
+yeccpars2(120, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [120 | __Ss], [__T | __Stack]);
+yeccpars2(120, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [120 | __Ss], [__T | __Stack]);
+yeccpars2(120, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [120 | __Ss], [__T | __Stack]);
+yeccpars2(120, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [120 | __Ss], [__T | __Stack]);
+yeccpars2(120, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(121, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1|__3],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(anno_patterns, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(122, '=', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 162, [122 | __Ss], [__T | __Stack]);
+yeccpars2(122, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(123, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 159, [123 | __Ss], [__T | __Stack]);
+yeccpars2(123, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(124, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 125, [124 | __Ss], [__T | __Stack]);
+yeccpars2(124, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(anno_variable, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(125, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 126, [125 | __Ss], [__T | __Stack]);
+yeccpars2(125, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(126, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 129, [126 | __Ss], [__T | __Stack]);
+yeccpars2(126, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 142, [126 | __Ss], [__T | __Stack]);
+yeccpars2(126, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 140, [126 | __Ss], [__T | __Stack]);
+yeccpars2(126, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 131, [126 | __Ss], [__T | __Stack]);
+yeccpars2(126, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 137, [126 | __Ss], [__T | __Stack]);
+yeccpars2(126, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 138, [126 | __Ss], [__T | __Stack]);
+yeccpars2(126, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 133, [126 | __Ss], [__T | __Stack]);
+yeccpars2(126, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 130, [126 | __Ss], [__T | __Stack]);
+yeccpars2(126, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(127, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 128, [127 | __Ss], [__T | __Stack]);
+yeccpars2(127, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(128, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  core_lib:set_anno(__2,__4),
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(anno_variable, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(129, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 129, [129 | __Ss], [__T | __Stack]);
+yeccpars2(129, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 142, [129 | __Ss], [__T | __Stack]);
+yeccpars2(129, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 140, [129 | __Ss], [__T | __Stack]);
+yeccpars2(129, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 131, [129 | __Ss], [__T | __Stack]);
+yeccpars2(129, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 137, [129 | __Ss], [__T | __Stack]);
+yeccpars2(129, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 138, [129 | __Ss], [__T | __Stack]);
+yeccpars2(129, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 133, [129 | __Ss], [__T | __Stack]);
+yeccpars2(129, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 149, [129 | __Ss], [__T | __Stack]);
+yeccpars2(129, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(130, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [],
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(annotation, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(131, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  tok_val(__1),
+ yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(132, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(133, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  tok_val(__1),
+ yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(134, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(135, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 147, [135 | __Ss], [__T | __Stack]);
+yeccpars2(135, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(constants, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(136, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 146, [136 | __Ss], [__T | __Stack]);
+yeccpars2(136, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(137, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  tok_val(__1),
+ yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(138, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  tok_val(__1),
+ yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(139, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [],
+ yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(140, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  tok_val(__1),
+ yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(141, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(142, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 129, [142 | __Ss], [__T | __Stack]);
+yeccpars2(142, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 142, [142 | __Ss], [__T | __Stack]);
+yeccpars2(142, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 144, [142 | __Ss], [__T | __Stack]);
+yeccpars2(142, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 140, [142 | __Ss], [__T | __Stack]);
+yeccpars2(142, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 131, [142 | __Ss], [__T | __Stack]);
+yeccpars2(142, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 137, [142 | __Ss], [__T | __Stack]);
+yeccpars2(142, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 138, [142 | __Ss], [__T | __Stack]);
+yeccpars2(142, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 133, [142 | __Ss], [__T | __Stack]);
+yeccpars2(142, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(143, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 145, [143 | __Ss], [__T | __Stack]);
+yeccpars2(143, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(144, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  {},
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(tuple_constant, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(145, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  list_to_tuple(__2),
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tuple_constant, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(146, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __2,
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(annotation, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(147, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 129, [147 | __Ss], [__T | __Stack]);
+yeccpars2(147, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 142, [147 | __Ss], [__T | __Stack]);
+yeccpars2(147, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 140, [147 | __Ss], [__T | __Stack]);
+yeccpars2(147, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 131, [147 | __Ss], [__T | __Stack]);
+yeccpars2(147, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 137, [147 | __Ss], [__T | __Stack]);
+yeccpars2(147, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 138, [147 | __Ss], [__T | __Stack]);
+yeccpars2(147, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 133, [147 | __Ss], [__T | __Stack]);
+yeccpars2(147, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(148, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1|__3],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(constants, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(149, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  {nil,tok_line(__1)},
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(nil, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(150, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 151, [150 | __Ss], [__T | __Stack]);
+yeccpars2(150, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 154, [150 | __Ss], [__T | __Stack]);
+yeccpars2(150, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 152, [150 | __Ss], [__T | __Stack]);
+yeccpars2(150, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(151, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 129, [151 | __Ss], [__T | __Stack]);
+yeccpars2(151, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 142, [151 | __Ss], [__T | __Stack]);
+yeccpars2(151, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 140, [151 | __Ss], [__T | __Stack]);
+yeccpars2(151, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 131, [151 | __Ss], [__T | __Stack]);
+yeccpars2(151, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 137, [151 | __Ss], [__T | __Stack]);
+yeccpars2(151, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 138, [151 | __Ss], [__T | __Stack]);
+yeccpars2(151, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 133, [151 | __Ss], [__T | __Stack]);
+yeccpars2(151, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(152, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [],
+ yeccpars2(yeccgoto(tail_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(153, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__2|__3],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(cons_constant, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(154, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 129, [154 | __Ss], [__T | __Stack]);
+yeccpars2(154, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 142, [154 | __Ss], [__T | __Stack]);
+yeccpars2(154, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 140, [154 | __Ss], [__T | __Stack]);
+yeccpars2(154, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 131, [154 | __Ss], [__T | __Stack]);
+yeccpars2(154, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 137, [154 | __Ss], [__T | __Stack]);
+yeccpars2(154, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 138, [154 | __Ss], [__T | __Stack]);
+yeccpars2(154, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 133, [154 | __Ss], [__T | __Stack]);
+yeccpars2(154, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(155, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 156, [155 | __Ss], [__T | __Stack]);
+yeccpars2(155, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(156, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __2,
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tail_constant, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(157, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 151, [157 | __Ss], [__T | __Stack]);
+yeccpars2(157, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 154, [157 | __Ss], [__T | __Stack]);
+yeccpars2(157, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 152, [157 | __Ss], [__T | __Stack]);
+yeccpars2(157, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(158, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__2|__3],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tail_constant, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(159, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 126, [159 | __Ss], [__T | __Stack]);
+yeccpars2(159, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(160, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 161, [160 | __Ss], [__T | __Stack]);
+yeccpars2(160, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(161, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  core_lib:set_anno(__2,__4),
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(anno_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(162, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [162 | __Ss], [__T | __Stack]);
+yeccpars2(162, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [162 | __Ss], [__T | __Stack]);
+yeccpars2(162, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [162 | __Ss], [__T | __Stack]);
+yeccpars2(162, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [162 | __Ss], [__T | __Stack]);
+yeccpars2(162, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [162 | __Ss], [__T | __Stack]);
+yeccpars2(162, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 115, [162 | __Ss], [__T | __Stack]);
+yeccpars2(162, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [162 | __Ss], [__T | __Stack]);
+yeccpars2(162, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [162 | __Ss], [__T | __Stack]);
+yeccpars2(162, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [162 | __Ss], [__T | __Stack]);
+yeccpars2(162, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [162 | __Ss], [__T | __Stack]);
+yeccpars2(162, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(163, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_alias{var = __1, pat = __3},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(other_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(164, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [164 | __Ss], [__T | __Stack]);
+yeccpars2(164, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(165, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 166, [165 | __Ss], [__T | __Stack]);
+yeccpars2(165, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(166, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [166 | __Ss], [__T | __Stack]);
+yeccpars2(166, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(167, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_clause{pats = __1, guard = __3, body = __5},
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(clause, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(168, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val = begin
+   {T,A} = __3, #c_receive{clauses = __2, timeout = T, action = A}
+  end,
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(receive_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(169, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1|__2],
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(anno_clauses, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(170, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 171, [170 | __Ss], [__T | __Stack]);
+yeccpars2(170, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(171, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [171 | __Ss], [__T | __Stack]);
+yeccpars2(171, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(172, __Cat, __Ss,  [__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  {__2,__4},
+ __Nss = lists:nthtail(3, __Ss),
+ yeccpars2(yeccgoto(timeout, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(173, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 174, [173 | __Ss], [__T | __Stack]);
+yeccpars2(173, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 177, [173 | __Ss], [__T | __Stack]);
+yeccpars2(173, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 175, [173 | __Ss], [__T | __Stack]);
+yeccpars2(173, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(174, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [174 | __Ss], [__T | __Stack]);
+yeccpars2(174, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [174 | __Ss], [__T | __Stack]);
+yeccpars2(174, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [174 | __Ss], [__T | __Stack]);
+yeccpars2(174, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [174 | __Ss], [__T | __Stack]);
+yeccpars2(174, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [174 | __Ss], [__T | __Stack]);
+yeccpars2(174, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 115, [174 | __Ss], [__T | __Stack]);
+yeccpars2(174, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [174 | __Ss], [__T | __Stack]);
+yeccpars2(174, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [174 | __Ss], [__T | __Stack]);
+yeccpars2(174, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [174 | __Ss], [__T | __Stack]);
+yeccpars2(174, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [174 | __Ss], [__T | __Stack]);
+yeccpars2(174, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(175, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_nil{},
+ yeccpars2(yeccgoto(tail_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(176, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_cons{hd = __2, tl = __3},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(cons_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(177, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [177 | __Ss], [__T | __Stack]);
+yeccpars2(177, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [177 | __Ss], [__T | __Stack]);
+yeccpars2(177, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [177 | __Ss], [__T | __Stack]);
+yeccpars2(177, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [177 | __Ss], [__T | __Stack]);
+yeccpars2(177, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [177 | __Ss], [__T | __Stack]);
+yeccpars2(177, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 115, [177 | __Ss], [__T | __Stack]);
+yeccpars2(177, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [177 | __Ss], [__T | __Stack]);
+yeccpars2(177, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [177 | __Ss], [__T | __Stack]);
+yeccpars2(177, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [177 | __Ss], [__T | __Stack]);
+yeccpars2(177, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [177 | __Ss], [__T | __Stack]);
+yeccpars2(177, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(178, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 179, [178 | __Ss], [__T | __Stack]);
+yeccpars2(178, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(179, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __2,
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tail_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(180, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 174, [180 | __Ss], [__T | __Stack]);
+yeccpars2(180, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 177, [180 | __Ss], [__T | __Stack]);
+yeccpars2(180, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 175, [180 | __Ss], [__T | __Stack]);
+yeccpars2(180, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(181, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_cons{hd = __2, tl = __3},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tail_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(182, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [],
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(clause_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(183, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 184, [183 | __Ss], [__T | __Stack]);
+yeccpars2(183, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(184, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __2,
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(clause_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(185, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 187, [185 | __Ss], [__T | __Stack]);
+yeccpars2(185, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(186, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 159, [186 | __Ss], [__T | __Stack]);
+yeccpars2(186, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(anno_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(187, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 126, [187 | __Ss], [__T | __Stack]);
+yeccpars2(187, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(188, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 189, [188 | __Ss], [__T | __Stack]);
+yeccpars2(188, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(189, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  core_lib:set_anno(__2,__4),
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(anno_clause, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(190, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 191, [190 | __Ss], [__T | __Stack]);
+yeccpars2(190, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 194, [190 | __Ss], [__T | __Stack]);
+yeccpars2(190, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(191, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 200, [191 | __Ss], [__T | __Stack]);
+yeccpars2(191, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(192, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 198, [192 | __Ss], [__T | __Stack]);
+yeccpars2(192, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(segment_patterns, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(193, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 196, [193 | __Ss], [__T | __Stack]);
+yeccpars2(193, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(194, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 195, [194 | __Ss], [__T | __Stack]);
+yeccpars2(194, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(195, __Cat, __Ss,  [__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_binary{segments = []},
+ __Nss = lists:nthtail(3, __Ss),
+ yeccpars2(yeccgoto(binary_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(196, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 197, [196 | __Ss], [__T | __Stack]);
+yeccpars2(196, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(197, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_binary{segments = __3},
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(binary_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(198, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 191, [198 | __Ss], [__T | __Stack]);
+yeccpars2(198, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(199, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1|__3],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(segment_patterns, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(200, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [200 | __Ss], [__T | __Stack]);
+yeccpars2(200, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [200 | __Ss], [__T | __Stack]);
+yeccpars2(200, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [200 | __Ss], [__T | __Stack]);
+yeccpars2(200, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [200 | __Ss], [__T | __Stack]);
+yeccpars2(200, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [200 | __Ss], [__T | __Stack]);
+yeccpars2(200, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 115, [200 | __Ss], [__T | __Stack]);
+yeccpars2(200, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [200 | __Ss], [__T | __Stack]);
+yeccpars2(200, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [200 | __Ss], [__T | __Stack]);
+yeccpars2(200, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [200 | __Ss], [__T | __Stack]);
+yeccpars2(200, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [200 | __Ss], [__T | __Stack]);
+yeccpars2(200, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(201, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 202, [201 | __Ss], [__T | __Stack]);
+yeccpars2(201, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(202, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 203, [202 | __Ss], [__T | __Stack]);
+yeccpars2(202, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(203, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 205, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [203 | __Ss], [__T | __Stack]);
+yeccpars2(203, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(204, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  case __5 of [S,U,T,Fs] -> #c_bitstr{val = __3, size = S, unit = U, type = T, flags = Fs}; true -> return_error(tok_line(__1),"expected 4 arguments in binary segment") end,
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(segment_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(205, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [],
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(arg_list, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(206, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 207, [206 | __Ss], [__T | __Stack]);
+yeccpars2(206, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(207, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __2,
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(arg_list, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(208, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 203, [208 | __Ss], [__T | __Stack]);
+yeccpars2(208, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(209, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val = begin
+   Name = #c_atom{val = tok_val(__2)}, #c_primop{name = Name, args = __3}
+  end,
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(primop_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(210, 'in', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 211, [210 | __Ss], [__T | __Stack]);
+yeccpars2(210, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(211, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [211 | __Ss], [__T | __Stack]);
+yeccpars2(211, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(212, __Cat, __Ss,  [__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_letrec{defs = __2, body = __4},
+ __Nss = lists:nthtail(3, __Ss),
+ yeccpars2(yeccgoto(letrec_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(213, '=', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 214, [213 | __Ss], [__T | __Stack]);
+yeccpars2(213, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(214, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [214 | __Ss], [__T | __Stack]);
+yeccpars2(214, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(215, 'in', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 216, [215 | __Ss], [__T | __Stack]);
+yeccpars2(215, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(216, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [216 | __Ss], [__T | __Stack]);
+yeccpars2(216, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(217, __Cat, __Ss,  [__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_let{vars = __2, arg = __4, body = __6},
+ __Nss = lists:nthtail(5, __Ss),
+ yeccpars2(yeccgoto(let_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(218, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [218 | __Ss], [__T | __Stack]);
+yeccpars2(218, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(219, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_seq{arg = __2, body = __3},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(sequence, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(220, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_catch{body = __2},
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(catch_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(221, 'of', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 222, [221 | __Ss], [__T | __Stack]);
+yeccpars2(221, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(222, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 97, [222 | __Ss], [__T | __Stack]);
+yeccpars2(222, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 96, [222 | __Ss], [__T | __Stack]);
+yeccpars2(222, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [222 | __Ss], [__T | __Stack]);
+yeccpars2(222, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [222 | __Ss], [__T | __Stack]);
+yeccpars2(222, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [222 | __Ss], [__T | __Stack]);
+yeccpars2(222, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [222 | __Ss], [__T | __Stack]);
+yeccpars2(222, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [222 | __Ss], [__T | __Stack]);
+yeccpars2(222, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [222 | __Ss], [__T | __Stack]);
+yeccpars2(222, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 95, [222 | __Ss], [__T | __Stack]);
+yeccpars2(222, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 98, [222 | __Ss], [__T | __Stack]);
+yeccpars2(222, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 114, [222 | __Ss], [__T | __Stack]);
+yeccpars2(222, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(223, 'end', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 224, [223 | __Ss], [__T | __Stack]);
+yeccpars2(223, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(224, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_case{arg = __2, clauses = __4},
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(case_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(225, ':', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 226, [225 | __Ss], [__T | __Stack]);
+yeccpars2(225, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(226, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [226 | __Ss], [__T | __Stack]);
+yeccpars2(226, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(227, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 203, [227 | __Ss], [__T | __Stack]);
+yeccpars2(227, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(228, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_call{module = __2, name = __4, args = __5},
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(call_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(229, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 203, [229 | __Ss], [__T | __Stack]);
+yeccpars2(229, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(230, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_apply{op = __2, args = __3},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(application_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(231, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 232, [231 | __Ss], [__T | __Stack]);
+yeccpars2(231, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 235, [231 | __Ss], [__T | __Stack]);
+yeccpars2(231, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 233, [231 | __Ss], [__T | __Stack]);
+yeccpars2(231, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(232, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [232 | __Ss], [__T | __Stack]);
+yeccpars2(232, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(233, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_nil{},
+ yeccpars2(yeccgoto(tail, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(234, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_cons{hd = __2, tl = __3},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(cons, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(235, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [235 | __Ss], [__T | __Stack]);
+yeccpars2(235, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(236, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 237, [236 | __Ss], [__T | __Stack]);
+yeccpars2(236, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(237, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __2,
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tail, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(238, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 232, [238 | __Ss], [__T | __Stack]);
+yeccpars2(238, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 235, [238 | __Ss], [__T | __Stack]);
+yeccpars2(238, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 233, [238 | __Ss], [__T | __Stack]);
+yeccpars2(238, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(239, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_cons{hd = __2, tl = __3},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tail, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(240, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_values{es = []},
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(expression, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(241, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 242, [241 | __Ss], [__T | __Stack]);
+yeccpars2(241, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(242, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_values{es = __2},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(expression, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(243, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 244, [243 | __Ss], [__T | __Stack]);
+yeccpars2(243, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(244, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 126, [244 | __Ss], [__T | __Stack]);
+yeccpars2(244, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(245, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 246, [245 | __Ss], [__T | __Stack]);
+yeccpars2(245, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(246, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  core_lib:set_anno(__2,__4),
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(anno_expression, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(247, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 248, [247 | __Ss], [__T | __Stack]);
+yeccpars2(247, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 251, [247 | __Ss], [__T | __Stack]);
+yeccpars2(247, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(248, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 257, [248 | __Ss], [__T | __Stack]);
+yeccpars2(248, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(249, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 255, [249 | __Ss], [__T | __Stack]);
+yeccpars2(249, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(segments, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(250, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 253, [250 | __Ss], [__T | __Stack]);
+yeccpars2(250, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(251, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 252, [251 | __Ss], [__T | __Stack]);
+yeccpars2(251, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(252, __Cat, __Ss,  [__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_binary{segments = []},
+ __Nss = lists:nthtail(3, __Ss),
+ yeccpars2(yeccgoto(binary, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(253, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 254, [253 | __Ss], [__T | __Stack]);
+yeccpars2(253, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(254, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_binary{segments = __3},
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(binary, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(255, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 248, [255 | __Ss], [__T | __Stack]);
+yeccpars2(255, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(256, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1|__3],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(segments, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(257, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [257 | __Ss], [__T | __Stack]);
+yeccpars2(257, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(258, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 259, [258 | __Ss], [__T | __Stack]);
+yeccpars2(258, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(259, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 260, [259 | __Ss], [__T | __Stack]);
+yeccpars2(259, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(260, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [260 | __Ss], [__T | __Stack]);
+yeccpars2(260, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(261, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 262, [261 | __Ss], [__T | __Stack]);
+yeccpars2(261, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(262, __Cat, __Ss,  [__7,__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  case __6 of [S,U,T,Fs] -> #c_bitstr{val = __3, size = S, unit = U, type = T, flags = Fs}; true -> return_error(tok_line(__1),"expected 4 arguments in binary segment") end,
+ __Nss = lists:nthtail(6, __Ss),
+ yeccpars2(yeccgoto(segment, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(263, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 26, [263 | __Ss], [__T | __Stack]);
+yeccpars2(263, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [263 | __Ss], [__T | __Stack]);
+yeccpars2(263, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(264, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1|__3],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(anno_variables, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(265, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 65, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 48, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 70, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 63, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 44, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 40, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 46, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 60, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 58, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 23, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 52, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 41, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 34, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 37, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 74, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 36, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 35, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 30, [265 | __Ss], [__T | __Stack]);
+yeccpars2(265, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(266, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_fun{vars = [], body = __5},
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(fun_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(267, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 125, [267 | __Ss], [__T | __Stack]);
+yeccpars2(267, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(268, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 269, [268 | __Ss], [__T | __Stack]);
+yeccpars2(268, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(269, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 126, [269 | __Ss], [__T | __Stack]);
+yeccpars2(269, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(270, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 271, [270 | __Ss], [__T | __Stack]);
+yeccpars2(270, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(271, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  core_lib:set_anno(__2,__4),
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(anno_fun, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(272, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 273, [272 | __Ss], [__T | __Stack]);
+yeccpars2(272, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(273, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 126, [273 | __Ss], [__T | __Stack]);
+yeccpars2(273, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(274, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 275, [274 | __Ss], [__T | __Stack]);
+yeccpars2(274, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(275, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  core_lib:set_anno(__2,__4),
+ __Nss = lists:nthtail(4, __Ss),
+ yeccpars2(yeccgoto(anno_function_name, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(276, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 278, [276 | __Ss], [__T | __Stack]);
+yeccpars2(276, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 277, [276 | __Ss], [__T | __Stack]);
+yeccpars2(276, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(277, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(module_attribute, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(278, '=', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 284, [278 | __Ss], [__T | __Stack]);
+yeccpars2(278, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(279, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 282, [279 | __Ss], [__T | __Stack]);
+yeccpars2(279, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(attribute_list, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(280, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 281, [280 | __Ss], [__T | __Stack]);
+yeccpars2(280, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(281, __Cat, __Ss,  [__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __3,
+ __Nss = lists:nthtail(3, __Ss),
+ yeccpars2(yeccgoto(module_attribute, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(282, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 278, [282 | __Ss], [__T | __Stack]);
+yeccpars2(282, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(283, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1|__3],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(attribute_list, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(284, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 285, [284 | __Ss], [__T | __Stack]);
+yeccpars2(284, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 290, [284 | __Ss], [__T | __Stack]);
+yeccpars2(284, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [284 | __Ss], [__T | __Stack]);
+yeccpars2(284, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [284 | __Ss], [__T | __Stack]);
+yeccpars2(284, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [284 | __Ss], [__T | __Stack]);
+yeccpars2(284, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [284 | __Ss], [__T | __Stack]);
+yeccpars2(284, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [284 | __Ss], [__T | __Stack]);
+yeccpars2(284, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(285, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 285, [285 | __Ss], [__T | __Stack]);
+yeccpars2(285, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 290, [285 | __Ss], [__T | __Stack]);
+yeccpars2(285, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [285 | __Ss], [__T | __Stack]);
+yeccpars2(285, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [285 | __Ss], [__T | __Stack]);
+yeccpars2(285, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [285 | __Ss], [__T | __Stack]);
+yeccpars2(285, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [285 | __Ss], [__T | __Stack]);
+yeccpars2(285, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [285 | __Ss], [__T | __Stack]);
+yeccpars2(285, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 149, [285 | __Ss], [__T | __Stack]);
+yeccpars2(285, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(286, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(287, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(288, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_def{name = #c_atom{val = tok_val(__1)}, val = __3},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(attribute, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(289, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(290, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 285, [290 | __Ss], [__T | __Stack]);
+yeccpars2(290, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 290, [290 | __Ss], [__T | __Stack]);
+yeccpars2(290, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 293, [290 | __Ss], [__T | __Stack]);
+yeccpars2(290, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [290 | __Ss], [__T | __Stack]);
+yeccpars2(290, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [290 | __Ss], [__T | __Stack]);
+yeccpars2(290, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [290 | __Ss], [__T | __Stack]);
+yeccpars2(290, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [290 | __Ss], [__T | __Stack]);
+yeccpars2(290, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [290 | __Ss], [__T | __Stack]);
+yeccpars2(290, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(291, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 295, [291 | __Ss], [__T | __Stack]);
+yeccpars2(291, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(literals, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(292, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 294, [292 | __Ss], [__T | __Stack]);
+yeccpars2(292, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(293, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_tuple{es = []},
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(tuple_literal, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(294, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_tuple{es = __2},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tuple_literal, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(295, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 285, [295 | __Ss], [__T | __Stack]);
+yeccpars2(295, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 290, [295 | __Ss], [__T | __Stack]);
+yeccpars2(295, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [295 | __Ss], [__T | __Stack]);
+yeccpars2(295, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [295 | __Ss], [__T | __Stack]);
+yeccpars2(295, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [295 | __Ss], [__T | __Stack]);
+yeccpars2(295, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [295 | __Ss], [__T | __Stack]);
+yeccpars2(295, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [295 | __Ss], [__T | __Stack]);
+yeccpars2(295, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(296, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1|__3],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(literals, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(297, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 298, [297 | __Ss], [__T | __Stack]);
+yeccpars2(297, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 301, [297 | __Ss], [__T | __Stack]);
+yeccpars2(297, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 299, [297 | __Ss], [__T | __Stack]);
+yeccpars2(297, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(298, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 285, [298 | __Ss], [__T | __Stack]);
+yeccpars2(298, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 290, [298 | __Ss], [__T | __Stack]);
+yeccpars2(298, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [298 | __Ss], [__T | __Stack]);
+yeccpars2(298, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [298 | __Ss], [__T | __Stack]);
+yeccpars2(298, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [298 | __Ss], [__T | __Stack]);
+yeccpars2(298, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [298 | __Ss], [__T | __Stack]);
+yeccpars2(298, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [298 | __Ss], [__T | __Stack]);
+yeccpars2(298, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(299, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_nil{},
+ yeccpars2(yeccgoto(tail_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(300, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_cons{hd = __2, tl = __3},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(cons_literal, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(301, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 285, [301 | __Ss], [__T | __Stack]);
+yeccpars2(301, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 290, [301 | __Ss], [__T | __Stack]);
+yeccpars2(301, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 69, [301 | __Ss], [__T | __Stack]);
+yeccpars2(301, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 104, [301 | __Ss], [__T | __Stack]);
+yeccpars2(301, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 54, [301 | __Ss], [__T | __Stack]);
+yeccpars2(301, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 57, [301 | __Ss], [__T | __Stack]);
+yeccpars2(301, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 50, [301 | __Ss], [__T | __Stack]);
+yeccpars2(301, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(302, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 303, [302 | __Ss], [__T | __Stack]);
+yeccpars2(302, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(303, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __2,
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tail_literal, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(304, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 298, [304 | __Ss], [__T | __Stack]);
+yeccpars2(304, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 301, [304 | __Ss], [__T | __Stack]);
+yeccpars2(304, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 299, [304 | __Ss], [__T | __Stack]);
+yeccpars2(304, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(305, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_cons{hd = __2, tl = __3},
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(tail_literal, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(306, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [],
+ __Nss = lists:nthtail(1, __Ss),
+ yeccpars2(yeccgoto(module_export, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(307, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 311, [307 | __Ss], [__T | __Stack]);
+yeccpars2(307, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1],
+ yeccpars2(yeccgoto(exported_names, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(308, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 310, [308 | __Ss], [__T | __Stack]);
+yeccpars2(308, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(309, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __1,
+ yeccpars2(yeccgoto(exported_name, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(310, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  __2,
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(module_export, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(311, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 11, [311 | __Ss], [__T | __Stack]);
+yeccpars2(311, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(312, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  [__1|__3],
+ __Nss = lists:nthtail(2, __Ss),
+ yeccpars2(yeccgoto(exported_names, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(313, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 314, [313 | __Ss], [__T | __Stack]);
+yeccpars2(313, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(314, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 5, [314 | __Ss], [__T | __Stack]);
+yeccpars2(314, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(315, 'attributes', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 7, [315 | __Ss], [__T | __Stack]);
+yeccpars2(315, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(316, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 9, [316 | __Ss], [__T | __Stack]);
+yeccpars2(316, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 11, [316 | __Ss], [__T | __Stack]);
+yeccpars2(316, __Cat, __Ss,  __Stack, __T, __Ts, __Tzr) ->
+ __Val =  [],
+ yeccpars2(13, __Cat, [316 | __Ss], [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(317, 'end', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 318, [317 | __Ss], [__T | __Stack]);
+yeccpars2(317, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(318, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 319, [318 | __Ss], [__T | __Stack]);
+yeccpars2(318, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(319, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 126, [319 | __Ss], [__T | __Stack]);
+yeccpars2(319, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(320, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
+ yeccpars1(__Ts, __Tzr, 321, [320 | __Ss], [__T | __Stack]);
+yeccpars2(320, _, _, _, __T, _, _) ->
+ yeccerror(__T);
+yeccpars2(321, __Cat, __Ss,  [__10,__9,__8,__7,__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
+ __Val =  #c_module{anno = __9, name = tok_val(__3), exports = __4, attrs = __5, defs = __6},
+ __Nss = lists:nthtail(9, __Ss),
+ yeccpars2(yeccgoto(module_definition, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
+yeccpars2(__Other, _, _, _, _, _, _) ->
+ exit({parser, __Other, missing_state_in_action_table}).
+
+yeccgoto(anno_clause, 65) ->
+ 100;
+yeccgoto(anno_clause, 100) ->
+ 100;
+yeccgoto(anno_clause, 222) ->
+ 100;
+yeccgoto(anno_clauses, 65) ->
+ 101;
+yeccgoto(anno_clauses, 100) ->
+ 169;
+yeccgoto(anno_clauses, 222) ->
+ 223;
+yeccgoto(anno_expression, 33) ->
+ 38;
+yeccgoto(anno_expression, 36) ->
+ 75;
+yeccgoto(anno_expression, 37) ->
+ 231;
+yeccgoto(anno_expression, 40) ->
+ 229;
+yeccgoto(anno_expression, 44) ->
+ 225;
+yeccgoto(anno_expression, 46) ->
+ 221;
+yeccgoto(anno_expression, 48) ->
+ 220;
+yeccgoto(anno_expression, 52) ->
+ 218;
+yeccgoto(anno_expression, 70) ->
+ 81;
+yeccgoto(anno_expression, 74) ->
+ 75;
+yeccgoto(anno_expression, 79) ->
+ 75;
+yeccgoto(anno_expression, 86) ->
+ 87;
+yeccgoto(anno_expression, 90) ->
+ 91;
+yeccgoto(anno_expression, 99) ->
+ 170;
+yeccgoto(anno_expression, 164) ->
+ 165;
+yeccgoto(anno_expression, 166) ->
+ 167;
+yeccgoto(anno_expression, 171) ->
+ 172;
+yeccgoto(anno_expression, 203) ->
+ 75;
+yeccgoto(anno_expression, 211) ->
+ 212;
+yeccgoto(anno_expression, 214) ->
+ 215;
+yeccgoto(anno_expression, 216) ->
+ 217;
+yeccgoto(anno_expression, 218) ->
+ 219;
+yeccgoto(anno_expression, 226) ->
+ 227;
+yeccgoto(anno_expression, 232) ->
+ 238;
+yeccgoto(anno_expression, 235) ->
+ 236;
+yeccgoto(anno_expression, 257) ->
+ 258;
+yeccgoto(anno_expression, 260) ->
+ 75;
+yeccgoto(anno_expression, 265) ->
+ 266;
+yeccgoto(anno_expressions, 36) ->
+ 241;
+yeccgoto(anno_expressions, 74) ->
+ 76;
+yeccgoto(anno_expressions, 79) ->
+ 80;
+yeccgoto(anno_expressions, 203) ->
+ 206;
+yeccgoto(anno_expressions, 260) ->
+ 261;
+yeccgoto(anno_fun, 20) ->
+ 22;
+yeccgoto(anno_function_name, 8) ->
+ 10;
+yeccgoto(anno_function_name, 12) ->
+ 10;
+yeccgoto(anno_function_name, 60) ->
+ 10;
+yeccgoto(anno_function_name, 316) ->
+ 10;
+yeccgoto(anno_pattern, 65) ->
+ 102;
+yeccgoto(anno_pattern, 96) ->
+ 102;
+yeccgoto(anno_pattern, 97) ->
+ 116;
+yeccgoto(anno_pattern, 98) ->
+ 173;
+yeccgoto(anno_pattern, 100) ->
+ 102;
+yeccgoto(anno_pattern, 114) ->
+ 116;
+yeccgoto(anno_pattern, 120) ->
+ 116;
+yeccgoto(anno_pattern, 162) ->
+ 163;
+yeccgoto(anno_pattern, 174) ->
+ 180;
+yeccgoto(anno_pattern, 177) ->
+ 178;
+yeccgoto(anno_pattern, 200) ->
+ 201;
+yeccgoto(anno_pattern, 222) ->
+ 102;
+yeccgoto(anno_patterns, 97) ->
+ 183;
+yeccgoto(anno_patterns, 114) ->
+ 117;
+yeccgoto(anno_patterns, 120) ->
+ 121;
+yeccgoto(anno_variable, 25) ->
+ 28;
+yeccgoto(anno_variable, 58) ->
+ 84;
+yeccgoto(anno_variable, 65) ->
+ 103;
+yeccgoto(anno_variable, 82) ->
+ 84;
+yeccgoto(anno_variable, 83) ->
+ 28;
+yeccgoto(anno_variable, 88) ->
+ 84;
+yeccgoto(anno_variable, 96) ->
+ 103;
+yeccgoto(anno_variable, 97) ->
+ 103;
+yeccgoto(anno_variable, 98) ->
+ 103;
+yeccgoto(anno_variable, 100) ->
+ 103;
+yeccgoto(anno_variable, 114) ->
+ 103;
+yeccgoto(anno_variable, 115) ->
+ 122;
+yeccgoto(anno_variable, 120) ->
+ 103;
+yeccgoto(anno_variable, 162) ->
+ 103;
+yeccgoto(anno_variable, 174) ->
+ 103;
+yeccgoto(anno_variable, 177) ->
+ 103;
+yeccgoto(anno_variable, 200) ->
+ 103;
+yeccgoto(anno_variable, 222) ->
+ 103;
+yeccgoto(anno_variable, 263) ->
+ 28;
+yeccgoto(anno_variables, 25) ->
+ 29;
+yeccgoto(anno_variables, 83) ->
+ 93;
+yeccgoto(anno_variables, 263) ->
+ 264;
+yeccgoto(annotation, 125) ->
+ 127;
+yeccgoto(annotation, 159) ->
+ 160;
+yeccgoto(annotation, 187) ->
+ 188;
+yeccgoto(annotation, 244) ->
+ 245;
+yeccgoto(annotation, 269) ->
+ 270;
+yeccgoto(annotation, 273) ->
+ 274;
+yeccgoto(annotation, 319) ->
+ 320;
+yeccgoto(application_expr, 33) ->
+ 39;
+yeccgoto(application_expr, 35) ->
+ 39;
+yeccgoto(application_expr, 36) ->
+ 39;
+yeccgoto(application_expr, 37) ->
+ 39;
+yeccgoto(application_expr, 40) ->
+ 39;
+yeccgoto(application_expr, 44) ->
+ 39;
+yeccgoto(application_expr, 46) ->
+ 39;
+yeccgoto(application_expr, 48) ->
+ 39;
+yeccgoto(application_expr, 52) ->
+ 39;
+yeccgoto(application_expr, 70) ->
+ 39;
+yeccgoto(application_expr, 74) ->
+ 39;
+yeccgoto(application_expr, 79) ->
+ 39;
+yeccgoto(application_expr, 86) ->
+ 39;
+yeccgoto(application_expr, 90) ->
+ 39;
+yeccgoto(application_expr, 99) ->
+ 39;
+yeccgoto(application_expr, 164) ->
+ 39;
+yeccgoto(application_expr, 166) ->
+ 39;
+yeccgoto(application_expr, 171) ->
+ 39;
+yeccgoto(application_expr, 203) ->
+ 39;
+yeccgoto(application_expr, 211) ->
+ 39;
+yeccgoto(application_expr, 214) ->
+ 39;
+yeccgoto(application_expr, 216) ->
+ 39;
+yeccgoto(application_expr, 218) ->
+ 39;
+yeccgoto(application_expr, 226) ->
+ 39;
+yeccgoto(application_expr, 232) ->
+ 39;
+yeccgoto(application_expr, 235) ->
+ 39;
+yeccgoto(application_expr, 257) ->
+ 39;
+yeccgoto(application_expr, 260) ->
+ 39;
+yeccgoto(application_expr, 265) ->
+ 39;
+yeccgoto(arg_list, 202) ->
+ 204;
+yeccgoto(arg_list, 208) ->
+ 209;
+yeccgoto(arg_list, 227) ->
+ 228;
+yeccgoto(arg_list, 229) ->
+ 230;
+yeccgoto(atomic_constant, 126) ->
+ 132;
+yeccgoto(atomic_constant, 129) ->
+ 132;
+yeccgoto(atomic_constant, 142) ->
+ 132;
+yeccgoto(atomic_constant, 147) ->
+ 132;
+yeccgoto(atomic_constant, 151) ->
+ 132;
+yeccgoto(atomic_constant, 154) ->
+ 132;
+yeccgoto(atomic_literal, 33) ->
+ 42;
+yeccgoto(atomic_literal, 35) ->
+ 42;
+yeccgoto(atomic_literal, 36) ->
+ 42;
+yeccgoto(atomic_literal, 37) ->
+ 42;
+yeccgoto(atomic_literal, 40) ->
+ 42;
+yeccgoto(atomic_literal, 44) ->
+ 42;
+yeccgoto(atomic_literal, 46) ->
+ 42;
+yeccgoto(atomic_literal, 48) ->
+ 42;
+yeccgoto(atomic_literal, 52) ->
+ 42;
+yeccgoto(atomic_literal, 65) ->
+ 105;
+yeccgoto(atomic_literal, 70) ->
+ 42;
+yeccgoto(atomic_literal, 74) ->
+ 42;
+yeccgoto(atomic_literal, 79) ->
+ 42;
+yeccgoto(atomic_literal, 86) ->
+ 42;
+yeccgoto(atomic_literal, 90) ->
+ 42;
+yeccgoto(atomic_literal, 96) ->
+ 105;
+yeccgoto(atomic_literal, 97) ->
+ 105;
+yeccgoto(atomic_literal, 98) ->
+ 105;
+yeccgoto(atomic_literal, 99) ->
+ 42;
+yeccgoto(atomic_literal, 100) ->
+ 105;
+yeccgoto(atomic_literal, 114) ->
+ 105;
+yeccgoto(atomic_literal, 115) ->
+ 105;
+yeccgoto(atomic_literal, 120) ->
+ 105;
+yeccgoto(atomic_literal, 162) ->
+ 105;
+yeccgoto(atomic_literal, 164) ->
+ 42;
+yeccgoto(atomic_literal, 166) ->
+ 42;
+yeccgoto(atomic_literal, 171) ->
+ 42;
+yeccgoto(atomic_literal, 174) ->
+ 105;
+yeccgoto(atomic_literal, 177) ->
+ 105;
+yeccgoto(atomic_literal, 200) ->
+ 105;
+yeccgoto(atomic_literal, 203) ->
+ 42;
+yeccgoto(atomic_literal, 211) ->
+ 42;
+yeccgoto(atomic_literal, 214) ->
+ 42;
+yeccgoto(atomic_literal, 216) ->
+ 42;
+yeccgoto(atomic_literal, 218) ->
+ 42;
+yeccgoto(atomic_literal, 222) ->
+ 105;
+yeccgoto(atomic_literal, 226) ->
+ 42;
+yeccgoto(atomic_literal, 232) ->
+ 42;
+yeccgoto(atomic_literal, 235) ->
+ 42;
+yeccgoto(atomic_literal, 257) ->
+ 42;
+yeccgoto(atomic_literal, 260) ->
+ 42;
+yeccgoto(atomic_literal, 265) ->
+ 42;
+yeccgoto(atomic_literal, 284) ->
+ 286;
+yeccgoto(atomic_literal, 285) ->
+ 286;
+yeccgoto(atomic_literal, 290) ->
+ 286;
+yeccgoto(atomic_literal, 295) ->
+ 286;
+yeccgoto(atomic_literal, 298) ->
+ 286;
+yeccgoto(atomic_literal, 301) ->
+ 286;
+yeccgoto(atomic_pattern, 65) ->
+ 106;
+yeccgoto(atomic_pattern, 96) ->
+ 106;
+yeccgoto(atomic_pattern, 97) ->
+ 106;
+yeccgoto(atomic_pattern, 98) ->
+ 106;
+yeccgoto(atomic_pattern, 100) ->
+ 106;
+yeccgoto(atomic_pattern, 114) ->
+ 106;
+yeccgoto(atomic_pattern, 115) ->
+ 106;
+yeccgoto(atomic_pattern, 120) ->
+ 106;
+yeccgoto(atomic_pattern, 162) ->
+ 106;
+yeccgoto(atomic_pattern, 174) ->
+ 106;
+yeccgoto(atomic_pattern, 177) ->
+ 106;
+yeccgoto(atomic_pattern, 200) ->
+ 106;
+yeccgoto(atomic_pattern, 222) ->
+ 106;
+yeccgoto(attribute, 276) ->
+ 279;
+yeccgoto(attribute, 282) ->
+ 279;
+yeccgoto(attribute_list, 276) ->
+ 280;
+yeccgoto(attribute_list, 282) ->
+ 283;
+yeccgoto(binary, 33) ->
+ 43;
+yeccgoto(binary, 35) ->
+ 43;
+yeccgoto(binary, 36) ->
+ 43;
+yeccgoto(binary, 37) ->
+ 43;
+yeccgoto(binary, 40) ->
+ 43;
+yeccgoto(binary, 44) ->
+ 43;
+yeccgoto(binary, 46) ->
+ 43;
+yeccgoto(binary, 48) ->
+ 43;
+yeccgoto(binary, 52) ->
+ 43;
+yeccgoto(binary, 70) ->
+ 43;
+yeccgoto(binary, 74) ->
+ 43;
+yeccgoto(binary, 79) ->
+ 43;
+yeccgoto(binary, 86) ->
+ 43;
+yeccgoto(binary, 90) ->
+ 43;
+yeccgoto(binary, 99) ->
+ 43;
+yeccgoto(binary, 164) ->
+ 43;
+yeccgoto(binary, 166) ->
+ 43;
+yeccgoto(binary, 171) ->
+ 43;
+yeccgoto(binary, 203) ->
+ 43;
+yeccgoto(binary, 211) ->
+ 43;
+yeccgoto(binary, 214) ->
+ 43;
+yeccgoto(binary, 216) ->
+ 43;
+yeccgoto(binary, 218) ->
+ 43;
+yeccgoto(binary, 226) ->
+ 43;
+yeccgoto(binary, 232) ->
+ 43;
+yeccgoto(binary, 235) ->
+ 43;
+yeccgoto(binary, 257) ->
+ 43;
+yeccgoto(binary, 260) ->
+ 43;
+yeccgoto(binary, 265) ->
+ 43;
+yeccgoto(binary_pattern, 65) ->
+ 107;
+yeccgoto(binary_pattern, 96) ->
+ 107;
+yeccgoto(binary_pattern, 97) ->
+ 107;
+yeccgoto(binary_pattern, 98) ->
+ 107;
+yeccgoto(binary_pattern, 100) ->
+ 107;
+yeccgoto(binary_pattern, 114) ->
+ 107;
+yeccgoto(binary_pattern, 115) ->
+ 107;
+yeccgoto(binary_pattern, 120) ->
+ 107;
+yeccgoto(binary_pattern, 162) ->
+ 107;
+yeccgoto(binary_pattern, 174) ->
+ 107;
+yeccgoto(binary_pattern, 177) ->
+ 107;
+yeccgoto(binary_pattern, 200) ->
+ 107;
+yeccgoto(binary_pattern, 222) ->
+ 107;
+yeccgoto(call_expr, 33) ->
+ 45;
+yeccgoto(call_expr, 35) ->
+ 45;
+yeccgoto(call_expr, 36) ->
+ 45;
+yeccgoto(call_expr, 37) ->
+ 45;
+yeccgoto(call_expr, 40) ->
+ 45;
+yeccgoto(call_expr, 44) ->
+ 45;
+yeccgoto(call_expr, 46) ->
+ 45;
+yeccgoto(call_expr, 48) ->
+ 45;
+yeccgoto(call_expr, 52) ->
+ 45;
+yeccgoto(call_expr, 70) ->
+ 45;
+yeccgoto(call_expr, 74) ->
+ 45;
+yeccgoto(call_expr, 79) ->
+ 45;
+yeccgoto(call_expr, 86) ->
+ 45;
+yeccgoto(call_expr, 90) ->
+ 45;
+yeccgoto(call_expr, 99) ->
+ 45;
+yeccgoto(call_expr, 164) ->
+ 45;
+yeccgoto(call_expr, 166) ->
+ 45;
+yeccgoto(call_expr, 171) ->
+ 45;
+yeccgoto(call_expr, 203) ->
+ 45;
+yeccgoto(call_expr, 211) ->
+ 45;
+yeccgoto(call_expr, 214) ->
+ 45;
+yeccgoto(call_expr, 216) ->
+ 45;
+yeccgoto(call_expr, 218) ->
+ 45;
+yeccgoto(call_expr, 226) ->
+ 45;
+yeccgoto(call_expr, 232) ->
+ 45;
+yeccgoto(call_expr, 235) ->
+ 45;
+yeccgoto(call_expr, 257) ->
+ 45;
+yeccgoto(call_expr, 260) ->
+ 45;
+yeccgoto(call_expr, 265) ->
+ 45;
+yeccgoto(case_expr, 33) ->
+ 47;
+yeccgoto(case_expr, 35) ->
+ 47;
+yeccgoto(case_expr, 36) ->
+ 47;
+yeccgoto(case_expr, 37) ->
+ 47;
+yeccgoto(case_expr, 40) ->
+ 47;
+yeccgoto(case_expr, 44) ->
+ 47;
+yeccgoto(case_expr, 46) ->
+ 47;
+yeccgoto(case_expr, 48) ->
+ 47;
+yeccgoto(case_expr, 52) ->
+ 47;
+yeccgoto(case_expr, 70) ->
+ 47;
+yeccgoto(case_expr, 74) ->
+ 47;
+yeccgoto(case_expr, 79) ->
+ 47;
+yeccgoto(case_expr, 86) ->
+ 47;
+yeccgoto(case_expr, 90) ->
+ 47;
+yeccgoto(case_expr, 99) ->
+ 47;
+yeccgoto(case_expr, 164) ->
+ 47;
+yeccgoto(case_expr, 166) ->
+ 47;
+yeccgoto(case_expr, 171) ->
+ 47;
+yeccgoto(case_expr, 203) ->
+ 47;
+yeccgoto(case_expr, 211) ->
+ 47;
+yeccgoto(case_expr, 214) ->
+ 47;
+yeccgoto(case_expr, 216) ->
+ 47;
+yeccgoto(case_expr, 218) ->
+ 47;
+yeccgoto(case_expr, 226) ->
+ 47;
+yeccgoto(case_expr, 232) ->
+ 47;
+yeccgoto(case_expr, 235) ->
+ 47;
+yeccgoto(case_expr, 257) ->
+ 47;
+yeccgoto(case_expr, 260) ->
+ 47;
+yeccgoto(case_expr, 265) ->
+ 47;
+yeccgoto(catch_expr, 33) ->
+ 49;
+yeccgoto(catch_expr, 35) ->
+ 49;
+yeccgoto(catch_expr, 36) ->
+ 49;
+yeccgoto(catch_expr, 37) ->
+ 49;
+yeccgoto(catch_expr, 40) ->
+ 49;
+yeccgoto(catch_expr, 44) ->
+ 49;
+yeccgoto(catch_expr, 46) ->
+ 49;
+yeccgoto(catch_expr, 48) ->
+ 49;
+yeccgoto(catch_expr, 52) ->
+ 49;
+yeccgoto(catch_expr, 70) ->
+ 49;
+yeccgoto(catch_expr, 74) ->
+ 49;
+yeccgoto(catch_expr, 79) ->
+ 49;
+yeccgoto(catch_expr, 86) ->
+ 49;
+yeccgoto(catch_expr, 90) ->
+ 49;
+yeccgoto(catch_expr, 99) ->
+ 49;
+yeccgoto(catch_expr, 164) ->
+ 49;
+yeccgoto(catch_expr, 166) ->
+ 49;
+yeccgoto(catch_expr, 171) ->
+ 49;
+yeccgoto(catch_expr, 203) ->
+ 49;
+yeccgoto(catch_expr, 211) ->
+ 49;
+yeccgoto(catch_expr, 214) ->
+ 49;
+yeccgoto(catch_expr, 216) ->
+ 49;
+yeccgoto(catch_expr, 218) ->
+ 49;
+yeccgoto(catch_expr, 226) ->
+ 49;
+yeccgoto(catch_expr, 232) ->
+ 49;
+yeccgoto(catch_expr, 235) ->
+ 49;
+yeccgoto(catch_expr, 257) ->
+ 49;
+yeccgoto(catch_expr, 260) ->
+ 49;
+yeccgoto(catch_expr, 265) ->
+ 49;
+yeccgoto(clause, 65) ->
+ 108;
+yeccgoto(clause, 96) ->
+ 185;
+yeccgoto(clause, 100) ->
+ 108;
+yeccgoto(clause, 222) ->
+ 108;
+yeccgoto(clause_pattern, 65) ->
+ 109;
+yeccgoto(clause_pattern, 96) ->
+ 109;
+yeccgoto(clause_pattern, 100) ->
+ 109;
+yeccgoto(clause_pattern, 222) ->
+ 109;
+yeccgoto(cons, 33) ->
+ 51;
+yeccgoto(cons, 35) ->
+ 51;
+yeccgoto(cons, 36) ->
+ 51;
+yeccgoto(cons, 37) ->
+ 51;
+yeccgoto(cons, 40) ->
+ 51;
+yeccgoto(cons, 44) ->
+ 51;
+yeccgoto(cons, 46) ->
+ 51;
+yeccgoto(cons, 48) ->
+ 51;
+yeccgoto(cons, 52) ->
+ 51;
+yeccgoto(cons, 70) ->
+ 51;
+yeccgoto(cons, 74) ->
+ 51;
+yeccgoto(cons, 79) ->
+ 51;
+yeccgoto(cons, 86) ->
+ 51;
+yeccgoto(cons, 90) ->
+ 51;
+yeccgoto(cons, 99) ->
+ 51;
+yeccgoto(cons, 164) ->
+ 51;
+yeccgoto(cons, 166) ->
+ 51;
+yeccgoto(cons, 171) ->
+ 51;
+yeccgoto(cons, 203) ->
+ 51;
+yeccgoto(cons, 211) ->
+ 51;
+yeccgoto(cons, 214) ->
+ 51;
+yeccgoto(cons, 216) ->
+ 51;
+yeccgoto(cons, 218) ->
+ 51;
+yeccgoto(cons, 226) ->
+ 51;
+yeccgoto(cons, 232) ->
+ 51;
+yeccgoto(cons, 235) ->
+ 51;
+yeccgoto(cons, 257) ->
+ 51;
+yeccgoto(cons, 260) ->
+ 51;
+yeccgoto(cons, 265) ->
+ 51;
+yeccgoto(cons_constant, 126) ->
+ 134;
+yeccgoto(cons_constant, 129) ->
+ 134;
+yeccgoto(cons_constant, 142) ->
+ 134;
+yeccgoto(cons_constant, 147) ->
+ 134;
+yeccgoto(cons_constant, 151) ->
+ 134;
+yeccgoto(cons_constant, 154) ->
+ 134;
+yeccgoto(cons_literal, 284) ->
+ 287;
+yeccgoto(cons_literal, 285) ->
+ 287;
+yeccgoto(cons_literal, 290) ->
+ 287;
+yeccgoto(cons_literal, 295) ->
+ 287;
+yeccgoto(cons_literal, 298) ->
+ 287;
+yeccgoto(cons_literal, 301) ->
+ 287;
+yeccgoto(cons_pattern, 65) ->
+ 110;
+yeccgoto(cons_pattern, 96) ->
+ 110;
+yeccgoto(cons_pattern, 97) ->
+ 110;
+yeccgoto(cons_pattern, 98) ->
+ 110;
+yeccgoto(cons_pattern, 100) ->
+ 110;
+yeccgoto(cons_pattern, 114) ->
+ 110;
+yeccgoto(cons_pattern, 115) ->
+ 110;
+yeccgoto(cons_pattern, 120) ->
+ 110;
+yeccgoto(cons_pattern, 162) ->
+ 110;
+yeccgoto(cons_pattern, 174) ->
+ 110;
+yeccgoto(cons_pattern, 177) ->
+ 110;
+yeccgoto(cons_pattern, 200) ->
+ 110;
+yeccgoto(cons_pattern, 222) ->
+ 110;
+yeccgoto(constant, 126) ->
+ 135;
+yeccgoto(constant, 129) ->
+ 150;
+yeccgoto(constant, 142) ->
+ 135;
+yeccgoto(constant, 147) ->
+ 135;
+yeccgoto(constant, 151) ->
+ 157;
+yeccgoto(constant, 154) ->
+ 155;
+yeccgoto(constants, 126) ->
+ 136;
+yeccgoto(constants, 142) ->
+ 143;
+yeccgoto(constants, 147) ->
+ 148;
+yeccgoto(exported_name, 5) ->
+ 307;
+yeccgoto(exported_name, 311) ->
+ 307;
+yeccgoto(exported_names, 5) ->
+ 308;
+yeccgoto(exported_names, 311) ->
+ 312;
+yeccgoto(expression, 33) ->
+ 53;
+yeccgoto(expression, 35) ->
+ 243;
+yeccgoto(expression, 36) ->
+ 53;
+yeccgoto(expression, 37) ->
+ 53;
+yeccgoto(expression, 40) ->
+ 53;
+yeccgoto(expression, 44) ->
+ 53;
+yeccgoto(expression, 46) ->
+ 53;
+yeccgoto(expression, 48) ->
+ 53;
+yeccgoto(expression, 52) ->
+ 53;
+yeccgoto(expression, 70) ->
+ 53;
+yeccgoto(expression, 74) ->
+ 53;
+yeccgoto(expression, 79) ->
+ 53;
+yeccgoto(expression, 86) ->
+ 53;
+yeccgoto(expression, 90) ->
+ 53;
+yeccgoto(expression, 99) ->
+ 53;
+yeccgoto(expression, 164) ->
+ 53;
+yeccgoto(expression, 166) ->
+ 53;
+yeccgoto(expression, 171) ->
+ 53;
+yeccgoto(expression, 203) ->
+ 53;
+yeccgoto(expression, 211) ->
+ 53;
+yeccgoto(expression, 214) ->
+ 53;
+yeccgoto(expression, 216) ->
+ 53;
+yeccgoto(expression, 218) ->
+ 53;
+yeccgoto(expression, 226) ->
+ 53;
+yeccgoto(expression, 232) ->
+ 53;
+yeccgoto(expression, 235) ->
+ 53;
+yeccgoto(expression, 257) ->
+ 53;
+yeccgoto(expression, 260) ->
+ 53;
+yeccgoto(expression, 265) ->
+ 53;
+yeccgoto(fun_expr, 20) ->
+ 24;
+yeccgoto(fun_expr, 21) ->
+ 268;
+yeccgoto(fun_expr, 33) ->
+ 55;
+yeccgoto(fun_expr, 35) ->
+ 55;
+yeccgoto(fun_expr, 36) ->
+ 55;
+yeccgoto(fun_expr, 37) ->
+ 55;
+yeccgoto(fun_expr, 40) ->
+ 55;
+yeccgoto(fun_expr, 44) ->
+ 55;
+yeccgoto(fun_expr, 46) ->
+ 55;
+yeccgoto(fun_expr, 48) ->
+ 55;
+yeccgoto(fun_expr, 52) ->
+ 55;
+yeccgoto(fun_expr, 70) ->
+ 55;
+yeccgoto(fun_expr, 74) ->
+ 55;
+yeccgoto(fun_expr, 79) ->
+ 55;
+yeccgoto(fun_expr, 86) ->
+ 55;
+yeccgoto(fun_expr, 90) ->
+ 55;
+yeccgoto(fun_expr, 99) ->
+ 55;
+yeccgoto(fun_expr, 164) ->
+ 55;
+yeccgoto(fun_expr, 166) ->
+ 55;
+yeccgoto(fun_expr, 171) ->
+ 55;
+yeccgoto(fun_expr, 203) ->
+ 55;
+yeccgoto(fun_expr, 211) ->
+ 55;
+yeccgoto(fun_expr, 214) ->
+ 55;
+yeccgoto(fun_expr, 216) ->
+ 55;
+yeccgoto(fun_expr, 218) ->
+ 55;
+yeccgoto(fun_expr, 226) ->
+ 55;
+yeccgoto(fun_expr, 232) ->
+ 55;
+yeccgoto(fun_expr, 235) ->
+ 55;
+yeccgoto(fun_expr, 257) ->
+ 55;
+yeccgoto(fun_expr, 260) ->
+ 55;
+yeccgoto(fun_expr, 265) ->
+ 55;
+yeccgoto(function_definition, 8) ->
+ 12;
+yeccgoto(function_definition, 12) ->
+ 12;
+yeccgoto(function_definition, 60) ->
+ 12;
+yeccgoto(function_definition, 316) ->
+ 12;
+yeccgoto(function_definitions, 8) ->
+ 13;
+yeccgoto(function_definitions, 12) ->
+ 17;
+yeccgoto(function_definitions, 60) ->
+ 210;
+yeccgoto(function_definitions, 316) ->
+ 13;
+yeccgoto(function_name, 5) ->
+ 309;
+yeccgoto(function_name, 8) ->
+ 14;
+yeccgoto(function_name, 9) ->
+ 272;
+yeccgoto(function_name, 12) ->
+ 14;
+yeccgoto(function_name, 33) ->
+ 56;
+yeccgoto(function_name, 35) ->
+ 56;
+yeccgoto(function_name, 36) ->
+ 56;
+yeccgoto(function_name, 37) ->
+ 56;
+yeccgoto(function_name, 40) ->
+ 56;
+yeccgoto(function_name, 44) ->
+ 56;
+yeccgoto(function_name, 46) ->
+ 56;
+yeccgoto(function_name, 48) ->
+ 56;
+yeccgoto(function_name, 52) ->
+ 56;
+yeccgoto(function_name, 60) ->
+ 14;
+yeccgoto(function_name, 70) ->
+ 56;
+yeccgoto(function_name, 74) ->
+ 56;
+yeccgoto(function_name, 79) ->
+ 56;
+yeccgoto(function_name, 86) ->
+ 56;
+yeccgoto(function_name, 90) ->
+ 56;
+yeccgoto(function_name, 99) ->
+ 56;
+yeccgoto(function_name, 164) ->
+ 56;
+yeccgoto(function_name, 166) ->
+ 56;
+yeccgoto(function_name, 171) ->
+ 56;
+yeccgoto(function_name, 203) ->
+ 56;
+yeccgoto(function_name, 211) ->
+ 56;
+yeccgoto(function_name, 214) ->
+ 56;
+yeccgoto(function_name, 216) ->
+ 56;
+yeccgoto(function_name, 218) ->
+ 56;
+yeccgoto(function_name, 226) ->
+ 56;
+yeccgoto(function_name, 232) ->
+ 56;
+yeccgoto(function_name, 235) ->
+ 56;
+yeccgoto(function_name, 257) ->
+ 56;
+yeccgoto(function_name, 260) ->
+ 56;
+yeccgoto(function_name, 265) ->
+ 56;
+yeccgoto(function_name, 311) ->
+ 309;
+yeccgoto(function_name, 316) ->
+ 14;
+yeccgoto(let_expr, 33) ->
+ 59;
+yeccgoto(let_expr, 35) ->
+ 59;
+yeccgoto(let_expr, 36) ->
+ 59;
+yeccgoto(let_expr, 37) ->
+ 59;
+yeccgoto(let_expr, 40) ->
+ 59;
+yeccgoto(let_expr, 44) ->
+ 59;
+yeccgoto(let_expr, 46) ->
+ 59;
+yeccgoto(let_expr, 48) ->
+ 59;
+yeccgoto(let_expr, 52) ->
+ 59;
+yeccgoto(let_expr, 70) ->
+ 59;
+yeccgoto(let_expr, 74) ->
+ 59;
+yeccgoto(let_expr, 79) ->
+ 59;
+yeccgoto(let_expr, 86) ->
+ 59;
+yeccgoto(let_expr, 90) ->
+ 59;
+yeccgoto(let_expr, 99) ->
+ 59;
+yeccgoto(let_expr, 164) ->
+ 59;
+yeccgoto(let_expr, 166) ->
+ 59;
+yeccgoto(let_expr, 171) ->
+ 59;
+yeccgoto(let_expr, 203) ->
+ 59;
+yeccgoto(let_expr, 211) ->
+ 59;
+yeccgoto(let_expr, 214) ->
+ 59;
+yeccgoto(let_expr, 216) ->
+ 59;
+yeccgoto(let_expr, 218) ->
+ 59;
+yeccgoto(let_expr, 226) ->
+ 59;
+yeccgoto(let_expr, 232) ->
+ 59;
+yeccgoto(let_expr, 235) ->
+ 59;
+yeccgoto(let_expr, 257) ->
+ 59;
+yeccgoto(let_expr, 260) ->
+ 59;
+yeccgoto(let_expr, 265) ->
+ 59;
+yeccgoto(let_vars, 58) ->
+ 213;
+yeccgoto(let_vars, 82) ->
+ 85;
+yeccgoto(let_vars, 88) ->
+ 89;
+yeccgoto(letrec_expr, 33) ->
+ 61;
+yeccgoto(letrec_expr, 35) ->
+ 61;
+yeccgoto(letrec_expr, 36) ->
+ 61;
+yeccgoto(letrec_expr, 37) ->
+ 61;
+yeccgoto(letrec_expr, 40) ->
+ 61;
+yeccgoto(letrec_expr, 44) ->
+ 61;
+yeccgoto(letrec_expr, 46) ->
+ 61;
+yeccgoto(letrec_expr, 48) ->
+ 61;
+yeccgoto(letrec_expr, 52) ->
+ 61;
+yeccgoto(letrec_expr, 70) ->
+ 61;
+yeccgoto(letrec_expr, 74) ->
+ 61;
+yeccgoto(letrec_expr, 79) ->
+ 61;
+yeccgoto(letrec_expr, 86) ->
+ 61;
+yeccgoto(letrec_expr, 90) ->
+ 61;
+yeccgoto(letrec_expr, 99) ->
+ 61;
+yeccgoto(letrec_expr, 164) ->
+ 61;
+yeccgoto(letrec_expr, 166) ->
+ 61;
+yeccgoto(letrec_expr, 171) ->
+ 61;
+yeccgoto(letrec_expr, 203) ->
+ 61;
+yeccgoto(letrec_expr, 211) ->
+ 61;
+yeccgoto(letrec_expr, 214) ->
+ 61;
+yeccgoto(letrec_expr, 216) ->
+ 61;
+yeccgoto(letrec_expr, 218) ->
+ 61;
+yeccgoto(letrec_expr, 226) ->
+ 61;
+yeccgoto(letrec_expr, 232) ->
+ 61;
+yeccgoto(letrec_expr, 235) ->
+ 61;
+yeccgoto(letrec_expr, 257) ->
+ 61;
+yeccgoto(letrec_expr, 260) ->
+ 61;
+yeccgoto(letrec_expr, 265) ->
+ 61;
+yeccgoto(literal, 284) ->
+ 288;
+yeccgoto(literal, 285) ->
+ 297;
+yeccgoto(literal, 290) ->
+ 291;
+yeccgoto(literal, 295) ->
+ 291;
+yeccgoto(literal, 298) ->
+ 304;
+yeccgoto(literal, 301) ->
+ 302;
+yeccgoto(literals, 290) ->
+ 292;
+yeccgoto(literals, 295) ->
+ 296;
+yeccgoto(module_attribute, 6) ->
+ 8;
+yeccgoto(module_attribute, 315) ->
+ 316;
+yeccgoto(module_definition, 0) ->
+ 3;
+yeccgoto(module_defs, 8) ->
+ 15;
+yeccgoto(module_defs, 316) ->
+ 317;
+yeccgoto(module_export, 4) ->
+ 6;
+yeccgoto(module_export, 314) ->
+ 315;
+yeccgoto(nil, 33) ->
+ 62;
+yeccgoto(nil, 35) ->
+ 62;
+yeccgoto(nil, 36) ->
+ 62;
+yeccgoto(nil, 37) ->
+ 62;
+yeccgoto(nil, 40) ->
+ 62;
+yeccgoto(nil, 44) ->
+ 62;
+yeccgoto(nil, 46) ->
+ 62;
+yeccgoto(nil, 48) ->
+ 62;
+yeccgoto(nil, 52) ->
+ 62;
+yeccgoto(nil, 65) ->
+ 62;
+yeccgoto(nil, 70) ->
+ 62;
+yeccgoto(nil, 74) ->
+ 62;
+yeccgoto(nil, 79) ->
+ 62;
+yeccgoto(nil, 86) ->
+ 62;
+yeccgoto(nil, 90) ->
+ 62;
+yeccgoto(nil, 96) ->
+ 62;
+yeccgoto(nil, 97) ->
+ 62;
+yeccgoto(nil, 98) ->
+ 62;
+yeccgoto(nil, 99) ->
+ 62;
+yeccgoto(nil, 100) ->
+ 62;
+yeccgoto(nil, 114) ->
+ 62;
+yeccgoto(nil, 115) ->
+ 62;
+yeccgoto(nil, 120) ->
+ 62;
+yeccgoto(nil, 126) ->
+ 139;
+yeccgoto(nil, 129) ->
+ 139;
+yeccgoto(nil, 142) ->
+ 139;
+yeccgoto(nil, 147) ->
+ 139;
+yeccgoto(nil, 151) ->
+ 139;
+yeccgoto(nil, 154) ->
+ 139;
+yeccgoto(nil, 162) ->
+ 62;
+yeccgoto(nil, 164) ->
+ 62;
+yeccgoto(nil, 166) ->
+ 62;
+yeccgoto(nil, 171) ->
+ 62;
+yeccgoto(nil, 174) ->
+ 62;
+yeccgoto(nil, 177) ->
+ 62;
+yeccgoto(nil, 200) ->
+ 62;
+yeccgoto(nil, 203) ->
+ 62;
+yeccgoto(nil, 211) ->
+ 62;
+yeccgoto(nil, 214) ->
+ 62;
+yeccgoto(nil, 216) ->
+ 62;
+yeccgoto(nil, 218) ->
+ 62;
+yeccgoto(nil, 222) ->
+ 62;
+yeccgoto(nil, 226) ->
+ 62;
+yeccgoto(nil, 232) ->
+ 62;
+yeccgoto(nil, 235) ->
+ 62;
+yeccgoto(nil, 257) ->
+ 62;
+yeccgoto(nil, 260) ->
+ 62;
+yeccgoto(nil, 265) ->
+ 62;
+yeccgoto(nil, 284) ->
+ 62;
+yeccgoto(nil, 285) ->
+ 62;
+yeccgoto(nil, 290) ->
+ 62;
+yeccgoto(nil, 295) ->
+ 62;
+yeccgoto(nil, 298) ->
+ 62;
+yeccgoto(nil, 301) ->
+ 62;
+yeccgoto(other_pattern, 65) ->
+ 111;
+yeccgoto(other_pattern, 96) ->
+ 186;
+yeccgoto(other_pattern, 97) ->
+ 111;
+yeccgoto(other_pattern, 98) ->
+ 111;
+yeccgoto(other_pattern, 100) ->
+ 111;
+yeccgoto(other_pattern, 114) ->
+ 111;
+yeccgoto(other_pattern, 115) ->
+ 123;
+yeccgoto(other_pattern, 120) ->
+ 111;
+yeccgoto(other_pattern, 162) ->
+ 111;
+yeccgoto(other_pattern, 174) ->
+ 111;
+yeccgoto(other_pattern, 177) ->
+ 111;
+yeccgoto(other_pattern, 200) ->
+ 111;
+yeccgoto(other_pattern, 222) ->
+ 111;
+yeccgoto(primop_expr, 33) ->
+ 64;
+yeccgoto(primop_expr, 35) ->
+ 64;
+yeccgoto(primop_expr, 36) ->
+ 64;
+yeccgoto(primop_expr, 37) ->
+ 64;
+yeccgoto(primop_expr, 40) ->
+ 64;
+yeccgoto(primop_expr, 44) ->
+ 64;
+yeccgoto(primop_expr, 46) ->
+ 64;
+yeccgoto(primop_expr, 48) ->
+ 64;
+yeccgoto(primop_expr, 52) ->
+ 64;
+yeccgoto(primop_expr, 70) ->
+ 64;
+yeccgoto(primop_expr, 74) ->
+ 64;
+yeccgoto(primop_expr, 79) ->
+ 64;
+yeccgoto(primop_expr, 86) ->
+ 64;
+yeccgoto(primop_expr, 90) ->
+ 64;
+yeccgoto(primop_expr, 99) ->
+ 64;
+yeccgoto(primop_expr, 164) ->
+ 64;
+yeccgoto(primop_expr, 166) ->
+ 64;
+yeccgoto(primop_expr, 171) ->
+ 64;
+yeccgoto(primop_expr, 203) ->
+ 64;
+yeccgoto(primop_expr, 211) ->
+ 64;
+yeccgoto(primop_expr, 214) ->
+ 64;
+yeccgoto(primop_expr, 216) ->
+ 64;
+yeccgoto(primop_expr, 218) ->
+ 64;
+yeccgoto(primop_expr, 226) ->
+ 64;
+yeccgoto(primop_expr, 232) ->
+ 64;
+yeccgoto(primop_expr, 235) ->
+ 64;
+yeccgoto(primop_expr, 257) ->
+ 64;
+yeccgoto(primop_expr, 260) ->
+ 64;
+yeccgoto(primop_expr, 265) ->
+ 64;
+yeccgoto(receive_expr, 33) ->
+ 66;
+yeccgoto(receive_expr, 35) ->
+ 66;
+yeccgoto(receive_expr, 36) ->
+ 66;
+yeccgoto(receive_expr, 37) ->
+ 66;
+yeccgoto(receive_expr, 40) ->
+ 66;
+yeccgoto(receive_expr, 44) ->
+ 66;
+yeccgoto(receive_expr, 46) ->
+ 66;
+yeccgoto(receive_expr, 48) ->
+ 66;
+yeccgoto(receive_expr, 52) ->
+ 66;
+yeccgoto(receive_expr, 70) ->
+ 66;
+yeccgoto(receive_expr, 74) ->
+ 66;
+yeccgoto(receive_expr, 79) ->
+ 66;
+yeccgoto(receive_expr, 86) ->
+ 66;
+yeccgoto(receive_expr, 90) ->
+ 66;
+yeccgoto(receive_expr, 99) ->
+ 66;
+yeccgoto(receive_expr, 164) ->
+ 66;
+yeccgoto(receive_expr, 166) ->
+ 66;
+yeccgoto(receive_expr, 171) ->
+ 66;
+yeccgoto(receive_expr, 203) ->
+ 66;
+yeccgoto(receive_expr, 211) ->
+ 66;
+yeccgoto(receive_expr, 214) ->
+ 66;
+yeccgoto(receive_expr, 216) ->
+ 66;
+yeccgoto(receive_expr, 218) ->
+ 66;
+yeccgoto(receive_expr, 226) ->
+ 66;
+yeccgoto(receive_expr, 232) ->
+ 66;
+yeccgoto(receive_expr, 235) ->
+ 66;
+yeccgoto(receive_expr, 257) ->
+ 66;
+yeccgoto(receive_expr, 260) ->
+ 66;
+yeccgoto(receive_expr, 265) ->
+ 66;
+yeccgoto(segment, 247) ->
+ 249;
+yeccgoto(segment, 255) ->
+ 249;
+yeccgoto(segment_pattern, 190) ->
+ 192;
+yeccgoto(segment_pattern, 198) ->
+ 192;
+yeccgoto(segment_patterns, 190) ->
+ 193;
+yeccgoto(segment_patterns, 198) ->
+ 199;
+yeccgoto(segments, 247) ->
+ 250;
+yeccgoto(segments, 255) ->
+ 256;
+yeccgoto(sequence, 33) ->
+ 67;
+yeccgoto(sequence, 35) ->
+ 67;
+yeccgoto(sequence, 36) ->
+ 67;
+yeccgoto(sequence, 37) ->
+ 67;
+yeccgoto(sequence, 40) ->
+ 67;
+yeccgoto(sequence, 44) ->
+ 67;
+yeccgoto(sequence, 46) ->
+ 67;
+yeccgoto(sequence, 48) ->
+ 67;
+yeccgoto(sequence, 52) ->
+ 67;
+yeccgoto(sequence, 70) ->
+ 67;
+yeccgoto(sequence, 74) ->
+ 67;
+yeccgoto(sequence, 79) ->
+ 67;
+yeccgoto(sequence, 86) ->
+ 67;
+yeccgoto(sequence, 90) ->
+ 67;
+yeccgoto(sequence, 99) ->
+ 67;
+yeccgoto(sequence, 164) ->
+ 67;
+yeccgoto(sequence, 166) ->
+ 67;
+yeccgoto(sequence, 171) ->
+ 67;
+yeccgoto(sequence, 203) ->
+ 67;
+yeccgoto(sequence, 211) ->
+ 67;
+yeccgoto(sequence, 214) ->
+ 67;
+yeccgoto(sequence, 216) ->
+ 67;
+yeccgoto(sequence, 218) ->
+ 67;
+yeccgoto(sequence, 226) ->
+ 67;
+yeccgoto(sequence, 232) ->
+ 67;
+yeccgoto(sequence, 235) ->
+ 67;
+yeccgoto(sequence, 257) ->
+ 67;
+yeccgoto(sequence, 260) ->
+ 67;
+yeccgoto(sequence, 265) ->
+ 67;
+yeccgoto(single_expression, 33) ->
+ 68;
+yeccgoto(single_expression, 35) ->
+ 68;
+yeccgoto(single_expression, 36) ->
+ 68;
+yeccgoto(single_expression, 37) ->
+ 68;
+yeccgoto(single_expression, 40) ->
+ 68;
+yeccgoto(single_expression, 44) ->
+ 68;
+yeccgoto(single_expression, 46) ->
+ 68;
+yeccgoto(single_expression, 48) ->
+ 68;
+yeccgoto(single_expression, 52) ->
+ 68;
+yeccgoto(single_expression, 70) ->
+ 68;
+yeccgoto(single_expression, 74) ->
+ 68;
+yeccgoto(single_expression, 79) ->
+ 68;
+yeccgoto(single_expression, 86) ->
+ 68;
+yeccgoto(single_expression, 90) ->
+ 68;
+yeccgoto(single_expression, 99) ->
+ 68;
+yeccgoto(single_expression, 164) ->
+ 68;
+yeccgoto(single_expression, 166) ->
+ 68;
+yeccgoto(single_expression, 171) ->
+ 68;
+yeccgoto(single_expression, 203) ->
+ 68;
+yeccgoto(single_expression, 211) ->
+ 68;
+yeccgoto(single_expression, 214) ->
+ 68;
+yeccgoto(single_expression, 216) ->
+ 68;
+yeccgoto(single_expression, 218) ->
+ 68;
+yeccgoto(single_expression, 226) ->
+ 68;
+yeccgoto(single_expression, 232) ->
+ 68;
+yeccgoto(single_expression, 235) ->
+ 68;
+yeccgoto(single_expression, 257) ->
+ 68;
+yeccgoto(single_expression, 260) ->
+ 68;
+yeccgoto(single_expression, 265) ->
+ 68;
+yeccgoto(tail, 231) ->
+ 234;
+yeccgoto(tail, 238) ->
+ 239;
+yeccgoto(tail_constant, 150) ->
+ 153;
+yeccgoto(tail_constant, 157) ->
+ 158;
+yeccgoto(tail_literal, 297) ->
+ 300;
+yeccgoto(tail_literal, 304) ->
+ 305;
+yeccgoto(tail_pattern, 173) ->
+ 176;
+yeccgoto(tail_pattern, 180) ->
+ 181;
+yeccgoto(timeout, 65) ->
+ 112;
+yeccgoto(timeout, 101) ->
+ 168;
+yeccgoto(try_expr, 33) ->
+ 71;
+yeccgoto(try_expr, 35) ->
+ 71;
+yeccgoto(try_expr, 36) ->
+ 71;
+yeccgoto(try_expr, 37) ->
+ 71;
+yeccgoto(try_expr, 40) ->
+ 71;
+yeccgoto(try_expr, 44) ->
+ 71;
+yeccgoto(try_expr, 46) ->
+ 71;
+yeccgoto(try_expr, 48) ->
+ 71;
+yeccgoto(try_expr, 52) ->
+ 71;
+yeccgoto(try_expr, 70) ->
+ 71;
+yeccgoto(try_expr, 74) ->
+ 71;
+yeccgoto(try_expr, 79) ->
+ 71;
+yeccgoto(try_expr, 86) ->
+ 71;
+yeccgoto(try_expr, 90) ->
+ 71;
+yeccgoto(try_expr, 99) ->
+ 71;
+yeccgoto(try_expr, 164) ->
+ 71;
+yeccgoto(try_expr, 166) ->
+ 71;
+yeccgoto(try_expr, 171) ->
+ 71;
+yeccgoto(try_expr, 203) ->
+ 71;
+yeccgoto(try_expr, 211) ->
+ 71;
+yeccgoto(try_expr, 214) ->
+ 71;
+yeccgoto(try_expr, 216) ->
+ 71;
+yeccgoto(try_expr, 218) ->
+ 71;
+yeccgoto(try_expr, 226) ->
+ 71;
+yeccgoto(try_expr, 232) ->
+ 71;
+yeccgoto(try_expr, 235) ->
+ 71;
+yeccgoto(try_expr, 257) ->
+ 71;
+yeccgoto(try_expr, 260) ->
+ 71;
+yeccgoto(try_expr, 265) ->
+ 71;
+yeccgoto(tuple, 33) ->
+ 72;
+yeccgoto(tuple, 35) ->
+ 72;
+yeccgoto(tuple, 36) ->
+ 72;
+yeccgoto(tuple, 37) ->
+ 72;
+yeccgoto(tuple, 40) ->
+ 72;
+yeccgoto(tuple, 44) ->
+ 72;
+yeccgoto(tuple, 46) ->
+ 72;
+yeccgoto(tuple, 48) ->
+ 72;
+yeccgoto(tuple, 52) ->
+ 72;
+yeccgoto(tuple, 70) ->
+ 72;
+yeccgoto(tuple, 74) ->
+ 72;
+yeccgoto(tuple, 79) ->
+ 72;
+yeccgoto(tuple, 86) ->
+ 72;
+yeccgoto(tuple, 90) ->
+ 72;
+yeccgoto(tuple, 99) ->
+ 72;
+yeccgoto(tuple, 164) ->
+ 72;
+yeccgoto(tuple, 166) ->
+ 72;
+yeccgoto(tuple, 171) ->
+ 72;
+yeccgoto(tuple, 203) ->
+ 72;
+yeccgoto(tuple, 211) ->
+ 72;
+yeccgoto(tuple, 214) ->
+ 72;
+yeccgoto(tuple, 216) ->
+ 72;
+yeccgoto(tuple, 218) ->
+ 72;
+yeccgoto(tuple, 226) ->
+ 72;
+yeccgoto(tuple, 232) ->
+ 72;
+yeccgoto(tuple, 235) ->
+ 72;
+yeccgoto(tuple, 257) ->
+ 72;
+yeccgoto(tuple, 260) ->
+ 72;
+yeccgoto(tuple, 265) ->
+ 72;
+yeccgoto(tuple_constant, 126) ->
+ 141;
+yeccgoto(tuple_constant, 129) ->
+ 141;
+yeccgoto(tuple_constant, 142) ->
+ 141;
+yeccgoto(tuple_constant, 147) ->
+ 141;
+yeccgoto(tuple_constant, 151) ->
+ 141;
+yeccgoto(tuple_constant, 154) ->
+ 141;
+yeccgoto(tuple_literal, 284) ->
+ 289;
+yeccgoto(tuple_literal, 285) ->
+ 289;
+yeccgoto(tuple_literal, 290) ->
+ 289;
+yeccgoto(tuple_literal, 295) ->
+ 289;
+yeccgoto(tuple_literal, 298) ->
+ 289;
+yeccgoto(tuple_literal, 301) ->
+ 289;
+yeccgoto(tuple_pattern, 65) ->
+ 113;
+yeccgoto(tuple_pattern, 96) ->
+ 113;
+yeccgoto(tuple_pattern, 97) ->
+ 113;
+yeccgoto(tuple_pattern, 98) ->
+ 113;
+yeccgoto(tuple_pattern, 100) ->
+ 113;
+yeccgoto(tuple_pattern, 114) ->
+ 113;
+yeccgoto(tuple_pattern, 115) ->
+ 113;
+yeccgoto(tuple_pattern, 120) ->
+ 113;
+yeccgoto(tuple_pattern, 162) ->
+ 113;
+yeccgoto(tuple_pattern, 174) ->
+ 113;
+yeccgoto(tuple_pattern, 177) ->
+ 113;
+yeccgoto(tuple_pattern, 200) ->
+ 113;
+yeccgoto(tuple_pattern, 222) ->
+ 113;
+yeccgoto(variable, 25) ->
+ 31;
+yeccgoto(variable, 26) ->
+ 267;
+yeccgoto(variable, 33) ->
+ 73;
+yeccgoto(variable, 35) ->
+ 73;
+yeccgoto(variable, 36) ->
+ 73;
+yeccgoto(variable, 37) ->
+ 73;
+yeccgoto(variable, 40) ->
+ 73;
+yeccgoto(variable, 44) ->
+ 73;
+yeccgoto(variable, 46) ->
+ 73;
+yeccgoto(variable, 48) ->
+ 73;
+yeccgoto(variable, 52) ->
+ 73;
+yeccgoto(variable, 58) ->
+ 31;
+yeccgoto(variable, 65) ->
+ 31;
+yeccgoto(variable, 70) ->
+ 73;
+yeccgoto(variable, 74) ->
+ 73;
+yeccgoto(variable, 79) ->
+ 73;
+yeccgoto(variable, 82) ->
+ 31;
+yeccgoto(variable, 83) ->
+ 31;
+yeccgoto(variable, 86) ->
+ 73;
+yeccgoto(variable, 88) ->
+ 31;
+yeccgoto(variable, 90) ->
+ 73;
+yeccgoto(variable, 96) ->
+ 124;
+yeccgoto(variable, 97) ->
+ 31;
+yeccgoto(variable, 98) ->
+ 31;
+yeccgoto(variable, 99) ->
+ 73;
+yeccgoto(variable, 100) ->
+ 31;
+yeccgoto(variable, 114) ->
+ 31;
+yeccgoto(variable, 115) ->
+ 124;
+yeccgoto(variable, 120) ->
+ 31;
+yeccgoto(variable, 162) ->
+ 31;
+yeccgoto(variable, 164) ->
+ 73;
+yeccgoto(variable, 166) ->
+ 73;
+yeccgoto(variable, 171) ->
+ 73;
+yeccgoto(variable, 174) ->
+ 31;
+yeccgoto(variable, 177) ->
+ 31;
+yeccgoto(variable, 200) ->
+ 31;
+yeccgoto(variable, 203) ->
+ 73;
+yeccgoto(variable, 211) ->
+ 73;
+yeccgoto(variable, 214) ->
+ 73;
+yeccgoto(variable, 216) ->
+ 73;
+yeccgoto(variable, 218) ->
+ 73;
+yeccgoto(variable, 222) ->
+ 31;
+yeccgoto(variable, 226) ->
+ 73;
+yeccgoto(variable, 232) ->
+ 73;
+yeccgoto(variable, 235) ->
+ 73;
+yeccgoto(variable, 257) ->
+ 73;
+yeccgoto(variable, 260) ->
+ 73;
+yeccgoto(variable, 263) ->
+ 31;
+yeccgoto(variable, 265) ->
+ 73;
+yeccgoto(__Symbol, __State) ->
+ exit({__Symbol, __State, missing_in_goto_table}).
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_parse.hrl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_parse.hrl
new file mode 100644
index 0000000000..3d60360f47
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_parse.hrl
@@ -0,0 +1,111 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: core_parse.hrl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+%% Purpose : Core Erlang syntax trees as records.
+
+%% It would be nice to incorporate some generic functions as well but
+%% this could make including this file difficult.
+
+%% Note: the annotation list is *always* the first record field.
+%% Thus it is possible to define the macros:
+%% -define(get_ann(X), element(2, X)).
+%% -define(set_ann(X, Y), setelement(2, X, Y)).
+
+-record(c_int, {anno=[], val}).		% val :: integer()
+
+-record(c_float, {anno=[], val}).	% val :: float()
+
+-record(c_atom, {anno=[], val}).	% val :: atom()
+
+-record(c_char, {anno=[], val}).	% val :: char()
+
+-record(c_string, {anno=[], val}).	% val :: string()
+
+-record(c_nil, {anno=[]}).
+
+-record(c_binary, {anno=[], segments}).	% segments :: [#ce_bitstr{}]
+
+-record(c_bitstr, {anno=[],val,	% val :: Tree,
+		   size,		% size :: Tree,
+		   unit,		% unit :: integer(),
+		   type,		% type :: atom(),
+		   flags}).		% flags :: [atom()],
+
+-record(c_cons, {anno=[], hd,		% hd :: Tree,
+		 tl}).			% tl :: Tree
+
+-record(c_tuple, {anno=[], es}).	% es :: [Tree]
+
+-record(c_var, {anno=[], name}).	% name :: integer() | atom()
+
+-record(c_fname, {anno=[], id,		% id :: atom(),
+		  arity}).		% arity :: integer()
+
+-record(c_values, {anno=[], es}).	% es :: [Tree]
+
+-record(c_fun, {anno=[], vars,		% vars :: [Tree],
+		body}).			% body :: Tree
+
+-record(c_seq, {anno=[], arg,		% arg :: Tree,
+		body}).			% body :: Tree
+
+-record(c_let, {anno=[], vars,		% vars :: [Tree],
+		arg,			% arg :: Tree,
+		body}).			% body :: Tree
+
+-record(c_letrec, {anno=[], defs,	% defs :: [#ce_def{}],
+		   body}).		% body :: Tree
+
+-record(c_def, {anno=[], name,		% name :: Tree,
+		val}).			% val :: Tree,
+
+-record(c_case, {anno=[], arg,		% arg :: Tree,
+		 clauses}).		% clauses :: [Tree]
+
+-record(c_clause, {anno=[], pats,	% pats :: [Tree],
+		   guard,		% guard :: Tree,
+		   body}).		% body :: Tree
+
+-record(c_alias, {anno=[], var,		% var :: Tree,
+		  pat}).		% pat :: Tree
+
+-record(c_receive, {anno=[], clauses,	% clauses :: [Tree],
+		    timeout,		% timeout :: Tree,
+		    action}).		% action :: Tree
+
+-record(c_apply, {anno=[], op,		% op :: Tree,
+		  args}).		% args :: [Tree]
+
+-record(c_call, {anno=[], module,	% module :: Tree,
+		 name,			% name :: Tree,
+		 args}).		% args :: [Tree]
+
+-record(c_primop, {anno=[], name,	% name :: Tree,
+		   args}).		% args :: [Tree]
+
+-record(c_try, {anno=[], arg,		% arg :: Tree,
+		vars,			% vars :: [Tree],
+		body,			% body :: Tree
+		evars,			% evars :: [Tree],
+		handler}).		% handler :: Tree
+
+-record(c_catch, {anno=[], body}).	% body :: Tree
+
+-record(c_module, {anno=[], name,	% name :: Tree,
+		   exports,		% exports :: [Tree],
+		   attrs,		% attrs :: [#ce_def{}],
+		   defs}).		% defs :: [#ce_def{}]
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_pp.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_pp.erl
new file mode 100644
index 0000000000..2bfbcb85e2
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_pp.erl
@@ -0,0 +1,430 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: core_pp.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+%% Purpose : Core Erlang (naive) prettyprinter
+
+-module(core_pp).
+
+-export([format/1]).
+
+-include("core_parse.hrl").
+
+%% ====================================================================== %%
+%% format(Node) -> Text
+%%	Node = coreErlang()
+%%	Text = string() | [Text]
+%%
+%%	Prettyprint-formats (naively) an abstract Core Erlang syntax
+%%	tree.
+
+-record(ctxt, {class = term,
+	       indent = 0,
+	       item_indent = 2,
+	       body_indent = 4,
+	       tab_width = 8,
+	       line = 0}).
+
+format(Node) -> case catch format(Node, #ctxt{}) of
+		    {'EXIT',_} -> io_lib:format("~p",[Node]);
+		    Other -> Other
+		end.
+
+maybe_anno(Node, Fun, Ctxt) ->
+    As = core_lib:get_anno(Node),
+    case get_line(As) of
+	none ->
+	    maybe_anno(Node, Fun, Ctxt, As);
+	Line ->
+	    if  Line > Ctxt#ctxt.line ->
+		    [io_lib:format("%% Line ~w",[Line]),
+		     nl_indent(Ctxt),
+		     maybe_anno(Node, Fun, Ctxt#ctxt{line = Line}, As)
+		    ];
+		true ->
+		    maybe_anno(Node, Fun, Ctxt, As)
+	    end
+    end.
+
+maybe_anno(Node, Fun, Ctxt, As) ->
+    case strip_line(As) of
+	[] ->
+	    Fun(Node, Ctxt);
+	List ->
+	    Ctxt1 = add_indent(Ctxt, 2),
+	    Ctxt2 = add_indent(Ctxt1, 3),
+	    ["( ",
+	     Fun(Node, Ctxt1),
+	     nl_indent(Ctxt1),
+	     "-| ",format_1(core_lib:make_literal(List), Ctxt2)," )"
+	    ]
+    end.
+
+strip_line([A | As]) when integer(A) ->
+    strip_line(As);
+strip_line([A | As]) ->
+    [A | strip_line(As)];
+strip_line([]) ->
+    [].
+
+get_line([L | _As]) when integer(L) ->
+    L;
+get_line([_ | As]) ->
+    get_line(As);
+get_line([]) ->
+    none.
+
+format(Node, Ctxt) ->
+    maybe_anno(Node, fun format_1/2, Ctxt).
+
+format_1(#c_char{val=C}, _) -> io_lib:write_char(C);
+format_1(#c_int{val=I}, _) -> integer_to_list(I);
+format_1(#c_float{val=F}, _) -> float_to_list(F);
+format_1(#c_atom{val=A}, _) -> core_atom(A);
+format_1(#c_nil{}, _) -> "[]";
+format_1(#c_string{val=S}, _) -> io_lib:write_string(S);
+format_1(#c_var{name=V}, _) ->
+    %% Internal variable names may be:
+    %%     - atoms representing proper Erlang variable names, or
+    %%     any atoms that may be printed without single-quoting
+    %%     - nonnegative integers.
+    %% It is important that when printing variables, no two names
+    %% should ever map to the same string.
+    if atom(V) ->
+	    S = atom_to_list(V),
+	    case S of
+		[C | _] when C >= $A, C =< $Z ->
+		    %% Ordinary uppercase-prefixed names are
+		    %% printed just as they are.
+		    S;
+		[$_ | _] ->
+		    %% Already "_"-prefixed names are prefixed
+		    %% with "_X", e.g. '_foo' => '_X_foo', to
+		    %% avoid generating things like "____foo" upon
+		    %% repeated writing and reading of code.
+		    %% ("_X_X_X_foo" is better.)
+		    [$_, $X | S];
+		_ ->
+		    %% Plain atoms are prefixed with a single "_".
+		    %% E.g. foo => "_foo".
+		    [$_ | S]
+	    end;
+       integer(V) ->
+	    %% Integers are also simply prefixed with "_".
+	    [$_ | integer_to_list(V)]
+    end;
+format_1(#c_binary{segments=Segs}, Ctxt) ->
+    ["#{",
+     format_vseq(Segs, "", ",", add_indent(Ctxt, 2),
+		 fun format_bitstr/2),
+     "}#"
+    ];
+format_1(#c_tuple{es=Es}, Ctxt) ->
+    [${,
+     format_hseq(Es, ",", add_indent(Ctxt, 1), fun format/2),
+     $}
+    ];
+format_1(#c_cons{hd=H,tl=T}, Ctxt) ->
+    Txt = ["["|format(H, add_indent(Ctxt, 1))],
+    [Txt|format_list_tail(T, add_indent(Ctxt, width(Txt, Ctxt)))];
+format_1(#c_values{es=Es}, Ctxt) ->
+    format_values(Es, Ctxt);
+format_1(#c_alias{var=V,pat=P}, Ctxt) ->
+    Txt = [format(V, Ctxt)|" = "],
+    [Txt|format(P, add_indent(Ctxt, width(Txt, Ctxt)))];
+format_1(#c_let{vars=Vs,arg=A,body=B}, Ctxt) ->
+    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["let ",
+     format_values(Vs, add_indent(Ctxt, 4)),
+     " =",
+     nl_indent(Ctxt1),
+     format(A, Ctxt1),
+     nl_indent(Ctxt),
+     "in  "
+     | format(B, add_indent(Ctxt, 4))
+    ];
+format_1(#c_letrec{defs=Fs,body=B}, Ctxt) ->
+    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["letrec",
+     nl_indent(Ctxt1),
+     format_funcs(Fs, Ctxt1),
+     nl_indent(Ctxt),
+     "in  "
+     | format(B, add_indent(Ctxt, 4))
+    ];
+format_1(#c_seq{arg=A,body=B}, Ctxt) ->
+    Ctxt1 = add_indent(Ctxt, 4),
+    ["do  ",
+     format(A, Ctxt1),
+     nl_indent(Ctxt1)
+     | format(B, Ctxt1)
+    ];
+format_1(#c_case{arg=A,clauses=Cs}, Ctxt) ->
+    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.item_indent),
+    ["case ",
+     format(A, add_indent(Ctxt, 5)),
+     " of",
+     nl_indent(Ctxt1),
+     format_clauses(Cs, Ctxt1),
+     nl_indent(Ctxt)
+     | "end"
+    ];
+format_1(#c_receive{clauses=Cs,timeout=T,action=A}, Ctxt) ->
+    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.item_indent),
+    ["receive",
+     nl_indent(Ctxt1),
+     format_clauses(Cs, Ctxt1),
+     nl_indent(Ctxt),
+     "after ",
+     format(T, add_indent(Ctxt, 6)),
+     " ->",
+     nl_indent(Ctxt1),
+     format(A, Ctxt1)
+    ];
+format_1(#c_fname{id=I,arity=A}, _) ->
+    [core_atom(I),$/,integer_to_list(A)];
+format_1(#c_fun{vars=Vs,body=B}, Ctxt) ->
+    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["fun (",
+     format_hseq(Vs, ",", add_indent(Ctxt, 5), fun format/2),
+     ") ->",
+     nl_indent(Ctxt1)
+     | format(B, Ctxt1)
+    ];
+format_1(#c_apply{op=O,args=As}, Ctxt0) ->
+    Ctxt1 = add_indent(Ctxt0, 6),		%"apply "
+    Op = format(O, Ctxt1),
+    Ctxt2 = add_indent(Ctxt0, 4),
+    ["apply ",Op,
+     nl_indent(Ctxt2),
+     $(,format_hseq(As, ", ", add_indent(Ctxt2, 1), fun format/2),$)
+    ];
+format_1(#c_call{module=M,name=N,args=As}, Ctxt0) ->
+    Ctxt1 = add_indent(Ctxt0, 5),		%"call "
+    Mod = format(M, Ctxt1),
+    Ctxt2 = add_indent(Ctxt1, width(Mod, Ctxt1)+1),
+    Name = format(N, Ctxt2),
+    Ctxt3 = add_indent(Ctxt0, 4),
+    ["call ",Mod,":",Name,
+     nl_indent(Ctxt3),
+     $(,format_hseq(As, ", ", add_indent(Ctxt3, 1), fun format/2),$)
+    ];
+format_1(#c_primop{name=N,args=As}, Ctxt0) ->
+    Ctxt1 = add_indent(Ctxt0, 7),		%"primop "
+    Name = format(N, Ctxt1),
+    Ctxt2 = add_indent(Ctxt0, 4),
+    ["primop ",Name,
+     nl_indent(Ctxt2),
+     $(,format_hseq(As, ", ", add_indent(Ctxt2, 1), fun format/2),$)
+    ];
+format_1(#c_catch{body=B}, Ctxt) ->
+    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["catch",
+     nl_indent(Ctxt1),
+     format(B, Ctxt1)
+    ];
+format_1(#c_try{arg=E,vars=Vs,body=B,evars=Evs,handler=H}, Ctxt) ->
+    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["try",
+     nl_indent(Ctxt1),
+     format(E, Ctxt1),
+     nl_indent(Ctxt),
+     "of ",
+     format_values(Vs, add_indent(Ctxt, 3)),
+     " ->",
+     nl_indent(Ctxt1),
+     format(B, Ctxt1),
+     nl_indent(Ctxt),
+     "catch ",
+     format_values(Evs, add_indent(Ctxt, 6)),
+     " ->",
+     nl_indent(Ctxt1)
+     | format(H, Ctxt1)
+    ];
+format_1(#c_def{name=N,val=V}, Ctxt) ->
+    Ctxt1 = add_indent(set_class(Ctxt, expr), Ctxt#ctxt.body_indent),
+    [format(N, Ctxt),
+     " =",
+     nl_indent(Ctxt1)
+     | format(V, Ctxt1)
+    ];
+format_1(#c_module{name=N,exports=Es,attrs=As,defs=Ds}, Ctxt) ->
+    Mod = ["module ", format(N, Ctxt)],
+    [Mod," [",
+     format_vseq(Es,
+		 "", ",",
+		 add_indent(set_class(Ctxt, term), width(Mod, Ctxt)+2),
+		 fun format/2),
+     "]",
+     nl_indent(Ctxt),
+     "    attributes [",
+     format_vseq(As,
+		 "", ",",
+		 add_indent(set_class(Ctxt, def), 16),
+		 fun format/2),
+     "]",
+     nl_indent(Ctxt),
+     format_funcs(Ds, Ctxt),
+     nl_indent(Ctxt)
+     | "end"
+    ];
+format_1(Type, _) ->
+    ["** Unsupported type: ",
+     io_lib:write(Type)
+     | " **"
+    ].
+
+format_funcs(Fs, Ctxt) ->
+    format_vseq(Fs,
+		"", "",
+		set_class(Ctxt, def),
+		fun format/2).
+
+format_values(Vs, Ctxt) ->
+    [$<,
+     format_hseq(Vs, ",", add_indent(Ctxt, 1), fun format/2),
+     $>].
+
+format_bitstr(#c_bitstr{val=V,size=S,unit=U,type=T,flags=Fs}, Ctxt0) ->
+    Vs = [S, U, T, Fs],
+    Ctxt1 = add_indent(Ctxt0, 2),
+    Val = format(V, Ctxt1),
+    Ctxt2 = add_indent(Ctxt1, width(Val, Ctxt1) + 2),
+    ["#<", Val, ">(", format_hseq(Vs,",", Ctxt2, fun format/2), $)].
+
+format_clauses(Cs, Ctxt) ->
+    format_vseq(Cs, "", "", set_class(Ctxt, clause),
+		fun format_clause/2).
+
+format_clause(Node, Ctxt) ->
+    maybe_anno(Node, fun format_clause_1/2, Ctxt).
+
+format_clause_1(#c_clause{pats=Ps,guard=G,body=B}, Ctxt) ->
+    Ptxt = format_values(Ps, Ctxt),
+    Ctxt2 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
+    [Ptxt,
+     " when ",
+     format_guard(G, add_indent(set_class(Ctxt, expr),
+				 width(Ptxt, Ctxt) + 6)),
+     " ->",
+     nl_indent(Ctxt2)
+     | format(B, set_class(Ctxt2, expr))
+    ].
+
+format_guard(Node, Ctxt) ->
+    maybe_anno(Node, fun format_guard_1/2, Ctxt).
+
+format_guard_1(#c_call{module=M,name=N,args=As}, Ctxt0) ->
+    Ctxt1 = add_indent(Ctxt0, 5),		%"call "
+    Mod = format(M, Ctxt1),
+    Ctxt2 = add_indent(Ctxt1, width(Mod, Ctxt1)+1),
+    Name = format(N, Ctxt2),
+    Ctxt3 = add_indent(Ctxt0, 4),
+    ["call ",Mod,":",Name,
+     nl_indent(Ctxt3),
+     $(,format_vseq(As, "",",", add_indent(Ctxt3, 1), fun format_guard/2),$)
+    ];
+format_guard_1(E, Ctxt) -> format_1(E, Ctxt).	%Anno already done
+
+%% format_hseq([Thing], Separator, Context, Fun) -> Txt.
+%%  Format a sequence horizontally on the same line with Separator between.
+
+format_hseq([H], _, Ctxt, Fun) ->
+    Fun(H, Ctxt);
+format_hseq([H|T], Sep, Ctxt, Fun) ->
+    Txt = [Fun(H, Ctxt)|Sep],
+    Ctxt1 = add_indent(Ctxt, width(Txt, Ctxt)),
+    [Txt|format_hseq(T, Sep, Ctxt1, Fun)];
+format_hseq([], _, _, _) -> "".
+
+%% format_vseq([Thing], LinePrefix, LineSuffix, Context, Fun) -> Txt.
+%%  Format a sequence vertically in indented lines adding LinePrefix
+%%  to the beginning of each line and LineSuffix to the end of each
+%%  line.  No prefix on the first line or suffix on the last line.
+
+format_vseq([H], _Pre, _Suf, Ctxt, Fun) ->
+    Fun(H, Ctxt);
+format_vseq([H|T], Pre, Suf, Ctxt, Fun) ->
+    [Fun(H, Ctxt),Suf,nl_indent(Ctxt),Pre|
+     format_vseq(T, Pre, Suf, Ctxt, Fun)];
+format_vseq([], _, _, _, _) -> "".
+
+format_list_tail(#c_nil{anno=[]}, _) -> "]";
+format_list_tail(#c_cons{anno=[],hd=H,tl=T}, Ctxt) ->
+    Txt = [$,|format(H, Ctxt)],
+    Ctxt1 = add_indent(Ctxt, width(Txt, Ctxt)),
+    [Txt|format_list_tail(T, Ctxt1)];
+format_list_tail(Tail, Ctxt) ->
+    ["|",format(Tail, add_indent(Ctxt, 1)),"]"].
+
+indent(Ctxt) -> indent(Ctxt#ctxt.indent, Ctxt).
+
+indent(N, _) when N =< 0 -> "";
+indent(N, Ctxt) ->
+    T = Ctxt#ctxt.tab_width,
+    string:chars($\t, N div T, string:chars($\s, N rem T)).
+
+nl_indent(Ctxt) -> [$\n|indent(Ctxt)].
+
+
+unindent(T, Ctxt) ->
+    unindent(T, Ctxt#ctxt.indent, Ctxt, []).
+
+unindent(T, N, _, C) when N =< 0 ->
+    [T|C];
+unindent([$\s|T], N, Ctxt, C) ->
+    unindent(T, N - 1, Ctxt, C);
+unindent([$\t|T], N, Ctxt, C) ->
+    Tab = Ctxt#ctxt.tab_width,
+    if N >= Tab ->
+	    unindent(T, N - Tab, Ctxt, C);
+       true ->
+	    unindent([string:chars($\s, Tab - N)|T], 0, Ctxt, C)
+    end;
+unindent([L|T], N, Ctxt, C) when list(L) ->
+    unindent(L, N, Ctxt, [T|C]);
+unindent([H|T], _, _, C) ->
+    [H|[T|C]];
+unindent([], N, Ctxt, [H|T]) ->
+    unindent(H, N, Ctxt, T);
+unindent([], _, _, []) -> [].
+
+
+width(Txt, Ctxt) ->
+    case catch width(Txt, 0, Ctxt, []) of
+	{'EXIT',_} -> exit({bad_text,Txt});
+	Other -> Other
+    end.
+
+width([$\t|T], A, Ctxt, C) ->
+    width(T, A + Ctxt#ctxt.tab_width, Ctxt, C);
+width([$\n|T], _, Ctxt, C) ->
+    width(unindent([T|C], Ctxt), Ctxt);
+width([H|T], A, Ctxt, C) when list(H) ->
+    width(H, A, Ctxt, [T|C]);
+width([_|T], A, Ctxt, C) ->
+    width(T, A + 1, Ctxt, C);
+width([], A, Ctxt, [H|T]) ->
+    width(H, A, Ctxt, T);
+width([], A, _, []) -> A.
+
+add_indent(Ctxt, Dx) ->
+    Ctxt#ctxt{indent = Ctxt#ctxt.indent + Dx}.
+
+set_class(Ctxt, Class) ->
+    Ctxt#ctxt{class = Class}.
+
+core_atom(A) -> io_lib:write_string(atom_to_list(A), $').
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_scan.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_scan.erl
new file mode 100644
index 0000000000..a97270b9f3
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_scan.erl
@@ -0,0 +1,495 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: core_scan.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+%% Purpose: Scanner for Core Erlang.
+
+%% For handling ISO 8859-1 (Latin-1) we use the following type
+%% information:
+%%
+%% 000 - 037	NUL - US	control
+%% 040 - 057	SPC - /		punctuation
+%% 060 - 071	0 - 9		digit
+%% 072 - 100	: - @		punctuation
+%% 101 - 132	A - Z		uppercase
+%% 133 - 140	[ - `		punctuation
+%% 141 - 172	a - z		lowercase
+%% 173 - 176	{ - ~		punctuation
+%% 177		DEL		control
+%% 200 - 237			control
+%% 240 - 277	NBSP - �	punctuation
+%% 300 - 326	� - �		uppercase
+%% 327		�		punctuation
+%% 330 - 336	� - �		uppercase
+%% 337 - 366	� - �		lowercase
+%% 367		�		punctuation
+%% 370 - 377	� - �		lowercase
+%%
+%% Many punctuation characters region have special meaning.  Must
+%% watch using � \327, bvery close to x \170
+
+-module(core_scan).
+
+-export([string/1,string/2,tokens/3,format_error/1]).
+
+-import(lists, [reverse/1]).
+
+%% tokens(Continuation, CharList, StartPos) ->
+%%	{done, {ok, [Tok], EndPos}, Rest} |
+%%	{done, {error,{ErrorPos,core_scan,What}, EndPos}, Rest} |
+%%	{more, Continuation'}
+%%  This is the main function into the re-entrant scanner. It calls the
+%%  re-entrant pre-scanner until this says done, then calls scan/1 on
+%%  the result.
+%%
+%%  The continuation has the form:
+%%      {RestChars,CharsSoFar,CurrentPos,StartPos}
+
+tokens([], Chars, Pos) ->			%First call
+    tokens({[],[],Pos,Pos}, Chars, Pos);
+tokens({Chars,SoFar0,Cp,Sp}, MoreChars, _) ->
+    In = Chars ++ MoreChars,
+    case pre_scan(In, SoFar0, Cp) of
+	{done,_,[],Ep} ->			%Found nothing
+	    {done,{eof,Ep},[]};
+	{done,_,SoFar1,Ep} ->			%Got complete tokens
+	    Res = case scan(reverse(SoFar1), Sp) of
+		      {ok,Toks} -> {ok,Toks,Ep};
+		      {error,E} -> {error,E,Ep}
+		  end,
+	    {done,Res,[]};
+	{more,Rest,SoFar1,Cp1} ->		%Missing end token
+	    {more,{Rest,SoFar1,Cp1,Sp}};
+	Other ->				%An error has occurred
+	    {done,Other,[]}
+    end.
+
+%% string([Char]) ->
+%% string([Char], StartPos) ->
+%%    {ok, [Tok], EndPos} |
+%%    {error,{Pos,core_scan,What}, EndPos}
+
+string(Cs) -> string(Cs, 1).
+
+string(Cs, Sp) ->
+    %% Add an 'eof' to always get correct handling.
+    case string_pre_scan(Cs, [], Sp) of
+	{done,_,SoFar,Ep} ->			%Got tokens
+	    case scan(reverse(SoFar), Sp) of
+		{ok,Toks} -> {ok,Toks,Ep};
+		{error,E} -> {error,E,Ep}
+	    end;
+	Other -> Other				%An error has occurred
+    end.
+
+%% string_pre_scan(Cs, SoFar0, StartPos) ->
+%%      {done,Rest,SoFar,EndPos} | {error,E,EndPos}.
+
+string_pre_scan(Cs, SoFar0, Sp) ->
+    case pre_scan(Cs, SoFar0, Sp) of
+	{done,Rest,SoFar1,Ep} ->		%Got complete tokens
+	    {done,Rest,SoFar1,Ep};
+	{more,Rest,SoFar1,Ep} ->		%Missing end token
+	    string_pre_scan(Rest ++ eof, SoFar1, Ep);
+	Other -> Other				%An error has occurred
+    end.
+
+%% format_error(Error)
+%%  Return a string describing the error.
+
+format_error({string,Quote,Head}) ->
+    ["unterminated " ++ string_thing(Quote) ++
+     " starting with " ++ io_lib:write_string(Head,Quote)];
+format_error({illegal,Type}) -> io_lib:fwrite("illegal ~w", [Type]);
+format_error(char) -> "unterminated character";
+format_error(scan) -> "premature end";
+format_error({base,Base}) -> io_lib:fwrite("illegal base '~w'", [Base]);
+format_error(float) -> "bad float";
+format_error(Other) -> io_lib:write(Other).
+
+string_thing($') -> "atom";
+string_thing($") -> "string".
+
+%% Re-entrant pre-scanner.
+%%
+%% If the input list of characters is insufficient to build a term the
+%% scanner returns a request for more characters and a continuation to be
+%% used when trying to build a term with more characters. To indicate
+%% end-of-file the input character list should be replaced with 'eof'
+%% as an empty list has meaning.
+%%
+%% When more characters are need inside a comment, string or quoted
+%% atom, which can become rather long, instead of pushing the
+%% characters read so far back onto RestChars to be reread, a special
+%% reentry token is returned indicating the middle of a construct.
+%% The token is the start character as an atom, '%', '"' and '\''.
+
+%% pre_scan([Char], SoFar, StartPos) ->
+%%	{done,RestChars,ScannedChars,NewPos} |
+%%	{more,RestChars,ScannedChars,NewPos} |
+%%	{error,{ErrorPos,core_scan,Description},NewPos}.
+%%  Main pre-scan function. It has been split into 2 functions because of
+%%  efficiency, with a good indexing compiler it would be unnecessary.
+
+pre_scan([C|Cs], SoFar, Pos) ->
+    pre_scan(C, Cs, SoFar, Pos);
+pre_scan([], SoFar, Pos) ->
+    {more,[],SoFar,Pos};
+pre_scan(eof, SoFar, Pos) ->
+    {done,eof,SoFar,Pos}.
+
+%% pre_scan(Char, [Char], SoFar, Pos)
+
+pre_scan($$, Cs0, SoFar0, Pos) ->
+    case pre_char(Cs0, [$$|SoFar0]) of
+	{Cs,SoFar} ->
+	    pre_scan(Cs, SoFar, Pos);
+	more ->
+	    {more,[$$|Cs0],SoFar0, Pos};
+	error ->
+	    pre_error(char, Pos, Pos)
+    end;
+pre_scan($', Cs, SoFar, Pos) ->
+    pre_string(Cs, $', '\'', Pos, [$'|SoFar], Pos);
+pre_scan({'\'',Sp}, Cs, SoFar, Pos) ->		%Re-entering quoted atom
+    pre_string(Cs, $', '\'', Sp, SoFar, Pos);
+pre_scan($", Cs, SoFar, Pos) ->
+    pre_string(Cs, $", '"', Pos, [$"|SoFar], Pos);
+pre_scan({'"',Sp}, Cs, SoFar, Pos) ->		%Re-entering string
+    pre_string(Cs, $", '"', Sp, SoFar, Pos);
+pre_scan($%, Cs, SoFar, Pos) ->
+    pre_comment(Cs, SoFar, Pos);
+pre_scan('%', Cs, SoFar, Pos) ->		%Re-entering comment
+    pre_comment(Cs, SoFar, Pos);
+pre_scan($\n, Cs, SoFar, Pos) ->
+    pre_scan(Cs, [$\n|SoFar], Pos+1);
+pre_scan(C, Cs, SoFar, Pos) ->
+    pre_scan(Cs, [C|SoFar], Pos).
+
+%% pre_string([Char], Quote, Reent, StartPos, SoFar, Pos)
+
+pre_string([Q|Cs], Q, _, _, SoFar, Pos) ->
+    pre_scan(Cs, [Q|SoFar], Pos);
+pre_string([$\n|Cs], Q, Reent, Sp, SoFar, Pos) ->
+    pre_string(Cs, Q, Reent, Sp, [$\n|SoFar], Pos+1);
+pre_string([$\\|Cs0], Q, Reent, Sp, SoFar0, Pos) ->
+    case pre_escape(Cs0, SoFar0) of
+	{Cs,SoFar} ->
+	    pre_string(Cs, Q, Reent, Sp, SoFar, Pos);
+	more ->
+	    {more,[{Reent,Sp},$\\|Cs0],SoFar0,Pos};
+	error ->
+	    pre_string_error(Q, Sp, SoFar0, Pos)
+    end;
+pre_string([C|Cs], Q, Reent, Sp, SoFar, Pos) ->
+    pre_string(Cs, Q, Reent, Sp, [C|SoFar], Pos);
+pre_string([], _, Reent, Sp, SoFar, Pos) ->
+    {more,[{Reent,Sp}],SoFar,Pos};
+pre_string(eof, Q, _, Sp, SoFar, Pos) ->
+    pre_string_error(Q, Sp, SoFar, Pos).
+
+pre_string_error(Q, Sp, SoFar, Pos) ->
+    S = reverse(string:substr(SoFar, 1, string:chr(SoFar, Q)-1)),
+    pre_error({string,Q,string:substr(S, 1, 16)}, Sp, Pos).
+
+pre_char([C|Cs], SoFar) -> pre_char(C, Cs, SoFar);
+pre_char([], _) -> more;
+pre_char(eof, _) -> error.
+
+pre_char($\\, Cs, SoFar) ->
+    pre_escape(Cs, SoFar);
+pre_char(C, Cs, SoFar) ->
+    {Cs,[C|SoFar]}.
+
+pre_escape([$^|Cs0], SoFar) ->
+    case Cs0 of
+	[C3|Cs] ->
+	    {Cs,[C3,$^,$\\|SoFar]};
+	[] -> more;
+	eof -> error
+    end;
+pre_escape([C|Cs], SoFar) ->
+    {Cs,[C,$\\|SoFar]};
+pre_escape([], _) -> more;
+pre_escape(eof, _) -> error.
+
+%% pre_comment([Char], SoFar, Pos)
+%%  Comments are replaced by one SPACE.
+
+pre_comment([$\n|Cs], SoFar, Pos) ->
+    pre_scan(Cs, [$\n,$\s|SoFar], Pos+1);	%Terminate comment
+pre_comment([_|Cs], SoFar, Pos) ->
+    pre_comment(Cs, SoFar, Pos);
+pre_comment([], SoFar, Pos) ->
+    {more,['%'],SoFar,Pos};
+pre_comment(eof, Sofar, Pos) ->
+    pre_scan(eof, [$\s|Sofar], Pos).
+
+pre_error(E, Epos, Pos) ->
+    {error,{Epos,core_scan,E}, Pos}.
+
+%% scan(CharList, StartPos)
+%%  This takes a list of characters and tries to tokenise them.
+%%
+%%  The token list is built in reverse order (in a stack) to save appending
+%%  and then reversed when all the tokens have been collected. Most tokens
+%%  are built in the same way.
+%%
+%%  Returns:
+%%	{ok,[Tok]}
+%%	{error,{ErrorPos,core_scan,What}}
+
+scan(Cs, Pos) ->
+    scan1(Cs, [], Pos).
+
+%% scan1(Characters, TokenStack, Position)
+%%  Scan a list of characters into tokens.
+
+scan1([$\n|Cs], Toks, Pos) ->            	        %Skip newline
+    scan1(Cs, Toks, Pos+1);
+scan1([C|Cs], Toks, Pos) when C >= $\000, C =< $\s -> 	%Skip control chars
+    scan1(Cs, Toks, Pos);
+scan1([C|Cs], Toks, Pos) when C >= $\200, C =< $\240 ->
+    scan1(Cs, Toks, Pos);
+scan1([C|Cs], Toks, Pos) when C >= $a, C =< $z ->	%Keywords
+    scan_key_word(C, Cs, Toks, Pos);
+scan1([C|Cs], Toks, Pos) when C >= $�, C =< $�, C /= $� ->
+    scan_key_word(C, Cs, Toks, Pos);
+scan1([C|Cs], Toks, Pos) when C >= $A, C =< $Z ->	%Variables
+    scan_variable(C, Cs, Toks, Pos);
+scan1([C|Cs], Toks, Pos) when C >= $�, C =< $�, C /= $� ->
+    scan_variable(C, Cs, Toks, Pos);
+scan1([C|Cs], Toks, Pos) when C >= $0, C =< $9 ->	%Numbers
+    scan_number(C, Cs, Toks, Pos);
+scan1([$-,C|Cs], Toks, Pos) when C >= $0, C =< $9 ->	%Signed numbers
+    scan_signed_number($-, C, Cs, Toks, Pos);
+scan1([$+,C|Cs], Toks, Pos) when C >= $0, C =< $9 ->	%Signed numbers
+    scan_signed_number($+, C, Cs, Toks, Pos);
+scan1([$_|Cs], Toks, Pos) ->				%_ variables
+    scan_variable($_, Cs, Toks, Pos);
+scan1([$$|Cs0], Toks, Pos) ->				%Character constant
+    {C,Cs,Pos1} = scan_char(Cs0, Pos),
+    scan1(Cs, [{char,Pos,C}|Toks], Pos1);
+scan1([$'|Cs0], Toks, Pos) ->				%Atom (always quoted)
+    {S,Cs1,Pos1} = scan_string(Cs0, $', Pos),
+    case catch list_to_atom(S) of
+	A when atom(A) ->
+	    scan1(Cs1, [{atom,Pos,A}|Toks], Pos1);
+	_Error -> scan_error({illegal,atom}, Pos)
+    end;
+scan1([$"|Cs0], Toks, Pos) ->				%String
+    {S,Cs1,Pos1} = scan_string(Cs0, $", Pos),
+    scan1(Cs1, [{string,Pos,S}|Toks], Pos1);
+%% Punctuation characters and operators, first recognise multiples.
+scan1("->" ++ Cs, Toks, Pos) ->
+    scan1(Cs, [{'->',Pos}|Toks], Pos);
+scan1("-|" ++ Cs, Toks, Pos) ->
+    scan1(Cs, [{'-|',Pos}|Toks], Pos);
+scan1([C|Cs], Toks, Pos) ->				%Punctuation character
+    P = list_to_atom([C]),
+    scan1(Cs, [{P,Pos}|Toks], Pos);
+scan1([], Toks0, _) ->
+    Toks = reverse(Toks0),
+    {ok,Toks}.
+
+%% scan_key_word(FirstChar, CharList, Tokens, Pos)
+%% scan_variable(FirstChar, CharList, Tokens, Pos)
+
+scan_key_word(C, Cs0, Toks, Pos) ->
+    {Wcs,Cs} = scan_name(Cs0, []),
+    case catch list_to_atom([C|reverse(Wcs)]) of
+	Name when atom(Name) ->
+	    scan1(Cs, [{Name,Pos}|Toks], Pos);
+	_Error -> scan_error({illegal,atom}, Pos)
+    end.
+
+scan_variable(C, Cs0, Toks, Pos) ->
+    {Wcs,Cs} = scan_name(Cs0, []),
+    case catch list_to_atom([C|reverse(Wcs)]) of
+	Name when atom(Name) ->
+	    scan1(Cs, [{var,Pos,Name}|Toks], Pos);
+	_Error -> scan_error({illegal,var}, Pos)
+    end.
+
+%% scan_name(Cs) -> lists:splitwith(fun (C) -> name_char(C) end, Cs).
+
+scan_name([C|Cs], Ncs) ->
+    case name_char(C) of
+	true -> scan_name(Cs, [C|Ncs]);
+	false -> {Ncs,[C|Cs]}			%Must rebuild here, sigh!
+    end;
+scan_name([], Ncs) ->
+    {Ncs,[]}.
+
+name_char(C) when C >= $a, C =< $z -> true;
+name_char(C) when C >= $�, C =< $�, C /= $� -> true;
+name_char(C) when C >= $A, C =< $Z -> true;
+name_char(C) when C >= $�, C =< $�, C /= $� -> true;
+name_char(C) when C >= $0, C =< $9 -> true;
+name_char($_) -> true;
+name_char($@) -> true;
+name_char(_) -> false.
+
+%% scan_string(CharList, QuoteChar, Pos) -> {StringChars,RestChars,NewPos}.
+
+scan_string(Cs, Q, Pos) ->
+    scan_string(Cs, [], Q, Pos).
+
+scan_string([Q|Cs], Scs, Q, Pos) ->
+    {reverse(Scs),Cs,Pos};
+scan_string([$\n|Cs], Scs, Q, Pos) ->
+    scan_string(Cs, [$\n|Scs], Q, Pos+1);
+scan_string([$\\|Cs0], Scs, Q, Pos) ->
+    {C,Cs,Pos1} = scan_escape(Cs0, Pos),
+    scan_string(Cs, [C|Scs], Q, Pos1);
+scan_string([C|Cs], Scs, Q, Pos) ->
+    scan_string(Cs, [C|Scs], Q, Pos).
+
+%% scan_char(Chars, Pos) -> {Char,RestChars,NewPos}.
+%%  Read a single character from a character constant. The pre-scan
+%%  phase has checked for errors here.
+
+scan_char([$\\|Cs], Pos) ->
+    scan_escape(Cs, Pos);
+scan_char([$\n|Cs], Pos) ->                  %Newline
+    {$\n,Cs,Pos+1};
+scan_char([C|Cs], Pos) ->
+    {C,Cs,Pos}.
+
+scan_escape([O1,O2,O3|Cs], Pos) when            %\<1-3> octal digits
+    O1 >= $0, O1 =< $7, O2 >= $0, O2 =< $7, O3 >= $0, O3 =< $7 ->
+    Val = (O1*8 + O2)*8 + O3 - 73*$0,
+    {Val,Cs,Pos};
+scan_escape([O1,O2|Cs], Pos) when
+    O1 >= $0, O1 =< $7, O2 >= $0, O2 =< $7 ->
+    Val = (O1*8 + O2) - 9*$0,
+    {Val,Cs,Pos};
+scan_escape([O1|Cs], Pos) when
+    O1 >= $0, O1 =< $7 ->
+    {O1 - $0,Cs,Pos};
+scan_escape([$^,C|Cs], Pos) ->			%\^X -> CTL-X
+    Val = C band 31,
+    {Val,Cs,Pos};
+%scan_escape([$\n,C1|Cs],Pos) ->
+%    {C1,Cs,Pos+1};
+%scan_escape([C,C1|Cs],Pos) when C >= $\000, C =< $\s ->
+%    {C1,Cs,Pos};
+scan_escape([$\n|Cs],Pos) ->
+    {$\n,Cs,Pos+1};
+scan_escape([C0|Cs],Pos) ->
+    C = escape_char(C0),
+    {C,Cs,Pos}.
+
+escape_char($n) -> $\n;				%\n = LF
+escape_char($r) -> $\r;				%\r = CR
+escape_char($t) -> $\t;				%\t = TAB
+escape_char($v) -> $\v;				%\v = VT
+escape_char($b) -> $\b;				%\b = BS
+escape_char($f) -> $\f;				%\f = FF
+escape_char($e) -> $\e;				%\e = ESC
+escape_char($s) -> $\s;				%\s = SPC
+escape_char($d) -> $\d;				%\d = DEL
+escape_char(C) -> C.
+
+%% scan_number(Char, CharList, TokenStack, Pos)
+%%  We can handle simple radix notation:
+%%    <digit>#<digits>		- the digits read in that base
+%%    <digits>			- the digits in base 10
+%%    <digits>.<digits>
+%%    <digits>.<digits>E+-<digits>
+%%
+%%  Except for explicitly based integers we build a list of all the
+%%  characters and then use list_to_integer/1 or list_to_float/1 to
+%%  generate the value.
+
+%%  SPos == Start position
+%%  CPos == Current position
+
+scan_number(C, Cs0, Toks, Pos) ->
+    {Ncs,Cs,Pos1} = scan_integer(Cs0, [C], Pos),
+    scan_after_int(Cs, Ncs, Toks, Pos, Pos1).
+
+scan_signed_number(S, C, Cs0, Toks, Pos) ->
+    {Ncs,Cs,Pos1} = scan_integer(Cs0, [C,S], Pos),
+    scan_after_int(Cs, Ncs, Toks, Pos, Pos1).
+
+scan_integer([C|Cs], Stack, Pos) when C >= $0, C =< $9 ->
+    scan_integer(Cs, [C|Stack], Pos);
+scan_integer(Cs, Stack, Pos) ->
+    {Stack,Cs,Pos}.
+
+scan_after_int([$.,C|Cs0], Ncs0, Toks, SPos, CPos) when C >= $0, C =< $9 ->
+    {Ncs,Cs,CPos1} = scan_integer(Cs0, [C,$.|Ncs0], CPos),
+    scan_after_fraction(Cs, Ncs, Toks, SPos, CPos1);
+scan_after_int([$#|Cs], Ncs, Toks, SPos, CPos) ->
+    case list_to_integer(reverse(Ncs)) of
+	Base when Base >= 2, Base =< 16 ->
+	    scan_based_int(Cs, 0, Base, Toks, SPos, CPos);
+	Base ->
+	    scan_error({base,Base}, CPos)
+    end;
+scan_after_int(Cs, Ncs, Toks, SPos, CPos) ->
+    N = list_to_integer(reverse(Ncs)),
+    scan1(Cs, [{integer,SPos,N}|Toks], CPos).
+
+scan_based_int([C|Cs], SoFar, Base, Toks, SPos, CPos) when
+    C >= $0, C =< $9, C < Base + $0 ->
+    Next = SoFar * Base + (C - $0),
+    scan_based_int(Cs, Next, Base, Toks, SPos, CPos);
+scan_based_int([C|Cs], SoFar, Base, Toks, SPos, CPos) when
+    C >= $a, C =< $f, C < Base + $a - 10 ->
+    Next = SoFar * Base + (C - $a + 10),
+    scan_based_int(Cs, Next, Base, Toks, SPos, CPos);
+scan_based_int([C|Cs], SoFar, Base, Toks, SPos, CPos) when
+    C >= $A, C =< $F, C < Base + $A - 10 ->
+    Next = SoFar * Base + (C - $A + 10),
+    scan_based_int(Cs, Next, Base, Toks, SPos, CPos);
+scan_based_int(Cs, SoFar, _, Toks, SPos, CPos) ->
+    scan1(Cs, [{integer,SPos,SoFar}|Toks], CPos).
+
+scan_after_fraction([$E|Cs], Ncs, Toks, SPos, CPos) ->
+    scan_exponent(Cs, [$E|Ncs], Toks, SPos, CPos);
+scan_after_fraction([$e|Cs], Ncs, Toks, SPos, CPos) ->
+    scan_exponent(Cs, [$E|Ncs], Toks, SPos, CPos);
+scan_after_fraction(Cs, Ncs, Toks, SPos, CPos) ->
+    case catch list_to_float(reverse(Ncs)) of
+	N when float(N) ->
+	    scan1(Cs, [{float,SPos,N}|Toks], CPos);
+	_Error -> scan_error({illegal,float}, SPos)
+    end.
+
+%% scan_exponent(CharList, NumberCharStack, TokenStack, StartPos, CurPos)
+%%  Generate an error here if E{+|-} not followed by any digits.
+
+scan_exponent([$+|Cs], Ncs, Toks, SPos, CPos) ->
+    scan_exponent1(Cs, [$+|Ncs], Toks, SPos, CPos);
+scan_exponent([$-|Cs], Ncs, Toks, SPos, CPos) ->
+    scan_exponent1(Cs, [$-|Ncs], Toks, SPos, CPos);
+scan_exponent(Cs, Ncs, Toks, SPos, CPos) ->
+    scan_exponent1(Cs, Ncs, Toks, SPos, CPos).
+
+scan_exponent1([C|Cs0], Ncs0, Toks, SPos, CPos) when C >= $0, C =< $9 ->
+    {Ncs,Cs,CPos1} = scan_integer(Cs0, [C|Ncs0], CPos),
+    case catch list_to_float(reverse(Ncs)) of
+	N when float(N) ->
+	    scan1(Cs, [{float,SPos,N}|Toks], CPos1);
+	_Error -> scan_error({illegal,float}, SPos)
+    end;
+scan_exponent1(_, _, _, _, CPos) ->
+    scan_error(float, CPos).
+
+scan_error(In, Pos) ->
+    {error,{Pos,core_scan,In}}.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/erl_bifs.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/erl_bifs.erl
new file mode 100644
index 0000000000..1dbeefb5ac
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/erl_bifs.erl
@@ -0,0 +1,486 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: erl_bifs.erl,v 1.2 2009/09/17 09:46:19 kostis Exp $
+%%
+%% Purpose: Information about the Erlang built-in functions.
+
+-module(erl_bifs).
+
+-export([is_bif/3, is_guard_bif/3, is_pure/3, is_safe/3]).
+
+
+%% =====================================================================
+%% is_bif(Module, Name, Arity) -> boolean()
+%%
+%%	    Module = Name = atom()
+%%	    Arity = integer()
+%%
+%%	Returns `true' if the function `Module:Name/Arity' is a Built-In
+%%	Function (BIF) of Erlang. BIFs "come with the implementation",
+%%	and can be assumed to exist and have the same behaviour in any
+%%	later versions of the same implementation of the language. Being
+%%	a BIF does *not* imply that the function belongs to the module
+%%	`erlang', nor that it is implemented in C or assembler (cf.
+%%	`erlang:is_builtin/3'), or that it is auto-imported by the
+%%	compiler (cf. `erl_internal:bif/3').
+
+is_bif(erlang, '!', 2) -> true;
+is_bif(erlang, '*', 2) -> true;
+is_bif(erlang, '+', 1) -> true;
+is_bif(erlang, '+', 2) -> true;
+is_bif(erlang, '++', 2) -> true;
+is_bif(erlang, '-', 1) -> true;
+is_bif(erlang, '-', 2) -> true;
+is_bif(erlang, '--', 2) -> true;
+is_bif(erlang, '/', 2) -> true;
+is_bif(erlang, '/=', 2) -> true;
+is_bif(erlang, '<', 2) -> true;
+is_bif(erlang, '=/=', 2) -> true;
+is_bif(erlang, '=:=', 2) -> true;
+is_bif(erlang, '=<', 2) -> true;
+is_bif(erlang, '==', 2) -> true;
+is_bif(erlang, '>', 2) -> true;
+is_bif(erlang, '>=', 2) -> true;
+is_bif(erlang, 'and', 2) -> true;
+is_bif(erlang, 'band', 2) -> true;
+is_bif(erlang, 'bnot', 1) -> true;
+is_bif(erlang, 'bor', 2) -> true;
+is_bif(erlang, 'bsl', 2) -> true;
+is_bif(erlang, 'bsr', 2) -> true;
+is_bif(erlang, 'bxor', 2) -> true;
+is_bif(erlang, 'div', 2) -> true;
+is_bif(erlang, 'not', 1) -> true;
+is_bif(erlang, 'or', 2) -> true;
+is_bif(erlang, 'rem', 2) -> true;
+is_bif(erlang, 'xor', 2) -> true;
+is_bif(erlang, abs, 1) -> true;
+is_bif(erlang, append_element, 2) -> true;
+is_bif(erlang, apply, 2) -> true;
+is_bif(erlang, apply, 3) -> true;
+is_bif(erlang, atom_to_list, 1) -> true;
+is_bif(erlang, binary_to_list, 1) -> true;
+is_bif(erlang, binary_to_list, 3) -> true;
+is_bif(erlang, binary_to_term, 1) -> true;
+is_bif(erlang, cancel_timer, 1) -> true;
+is_bif(erlang, concat_binary, 1) -> true;
+is_bif(erlang, date, 0) -> true;
+is_bif(erlang, demonitor, 1) -> true;
+is_bif(erlang, disconnect_node, 1) -> true;
+is_bif(erlang, display, 1) -> true;
+is_bif(erlang, element, 2) -> true;
+is_bif(erlang, erase, 0) -> true;
+is_bif(erlang, erase, 1) -> true;
+is_bif(erlang, error, 1) -> true;
+is_bif(erlang, error, 2) -> true;
+is_bif(erlang, exit, 1) -> true;
+is_bif(erlang, exit, 2) -> true;
+is_bif(erlang, fault, 1) -> true;
+is_bif(erlang, fault, 2) -> true;
+is_bif(erlang, float, 1) -> true;
+is_bif(erlang, float_to_list, 1) -> true;
+is_bif(erlang, fun_info, 1) -> true;
+is_bif(erlang, fun_info, 2) -> true;
+is_bif(erlang, fun_to_list, 1) -> true;
+is_bif(erlang, get, 0) -> true;
+is_bif(erlang, get, 1) -> true;
+is_bif(erlang, get_cookie, 0) -> true;
+is_bif(erlang, get_keys, 1) -> true;
+is_bif(erlang, group_leader, 0) -> true;
+is_bif(erlang, group_leader, 2) -> true;
+is_bif(erlang, halt, 0) -> false;
+is_bif(erlang, halt, 1) -> false;
+is_bif(erlang, hash, 2) -> false;
+is_bif(erlang, hd, 1) -> true;
+is_bif(erlang, info, 1) -> true;
+is_bif(erlang, integer_to_list, 1) -> true;
+is_bif(erlang, is_alive, 0) -> true;
+is_bif(erlang, is_atom, 1) -> true;
+is_bif(erlang, is_binary, 1) -> true;
+is_bif(erlang, is_boolean, 1) -> true;
+is_bif(erlang, is_builtin, 3) -> true;
+is_bif(erlang, is_constant, 1) -> true;
+is_bif(erlang, is_float, 1) -> true;
+is_bif(erlang, is_function, 1) -> true;
+is_bif(erlang, is_integer, 1) -> true;
+is_bif(erlang, is_list, 1) -> true;
+is_bif(erlang, is_number, 1) -> true;
+is_bif(erlang, is_pid, 1) -> true;
+is_bif(erlang, is_port, 1) -> true;
+is_bif(erlang, is_process_alive, 1) -> true;
+is_bif(erlang, is_record, 3) -> true;
+is_bif(erlang, is_reference, 1) -> true;
+is_bif(erlang, is_tuple, 1) -> true;
+is_bif(erlang, length, 1) -> true;
+is_bif(erlang, link, 1) -> true;
+is_bif(erlang, list_to_atom, 1) -> true;
+is_bif(erlang, list_to_binary, 1) -> true;
+is_bif(erlang, list_to_float, 1) -> true;
+is_bif(erlang, list_to_integer, 1) -> true;
+is_bif(erlang, list_to_pid, 1) -> true;
+is_bif(erlang, list_to_tuple, 1) -> true;
+is_bif(erlang, loaded, 0) -> true;
+is_bif(erlang, localtime, 0) -> true;
+is_bif(erlang, localtime_to_universaltime, 1) -> true;
+is_bif(erlang, make_ref, 0) -> true;
+is_bif(erlang, make_tuple, 2) -> true;
+is_bif(erlang, md5, 1) -> true;
+is_bif(erlang, md5_final, 1) -> true;
+is_bif(erlang, md5_init, 0) -> true;
+is_bif(erlang, md5_update, 2) -> true;
+is_bif(erlang, monitor, 2) -> true;
+is_bif(erlang, monitor_node, 2) -> true;
+is_bif(erlang, node, 0) -> true;
+is_bif(erlang, node, 1) -> true;
+is_bif(erlang, nodes, 0) -> true;
+is_bif(erlang, now, 0) -> true;
+is_bif(erlang, open_port, 2) -> true;
+is_bif(erlang, phash, 2) -> true;
+is_bif(erlang, pid_to_list, 1) -> true;
+is_bif(erlang, port_close, 2) -> true;
+is_bif(erlang, port_command, 2) -> true;
+is_bif(erlang, port_connect, 2) -> true;
+is_bif(erlang, port_control, 3) -> true;
+is_bif(erlang, port_info, 2) -> true;
+is_bif(erlang, port_to_list, 1) -> true;
+is_bif(erlang, ports, 0) -> true;
+is_bif(erlang, pre_loaded, 0) -> true;
+is_bif(erlang, process_display, 2) -> true;
+is_bif(erlang, process_flag, 2) -> true;
+is_bif(erlang, process_flag, 3) -> true;
+is_bif(erlang, process_info, 1) -> true;
+is_bif(erlang, process_info, 2) -> true;
+is_bif(erlang, processes, 0) -> true;
+is_bif(erlang, put, 2) -> true;
+is_bif(erlang, read_timer, 1) -> true;
+is_bif(erlang, ref_to_list, 1) -> true;
+is_bif(erlang, register, 2) -> true;
+is_bif(erlang, registered, 0) -> true;
+is_bif(erlang, resume_process, 1) -> true;
+is_bif(erlang, round, 1) -> true;
+is_bif(erlang, self, 0) -> true;
+is_bif(erlang, send_after, 3) -> true;
+is_bif(erlang, set_cookie, 2) -> true;
+is_bif(erlang, setelement, 3) -> true;
+is_bif(erlang, size, 1) -> true;
+is_bif(erlang, spawn, 1) -> true;
+is_bif(erlang, spawn, 2) -> true;
+is_bif(erlang, spawn, 3) -> true;
+is_bif(erlang, spawn, 4) -> true;
+is_bif(erlang, spawn_link, 1) -> true;
+is_bif(erlang, spawn_link, 2) -> true;
+is_bif(erlang, spawn_link, 3) -> true;
+is_bif(erlang, spawn_link, 4) -> true;
+is_bif(erlang, spawn_opt, 4) -> true;
+is_bif(erlang, split_binary, 2) -> true;
+is_bif(erlang, start_timer, 3) -> true;
+is_bif(erlang, statistics, 1) -> true;
+is_bif(erlang, suspend_process, 1) -> true;
+is_bif(erlang, system_flag, 2) -> true;
+is_bif(erlang, system_info, 1) -> true;
+is_bif(erlang, term_to_binary, 1) -> true;
+is_bif(erlang, term_to_binary, 2) -> true;
+is_bif(erlang, throw, 1) -> true;
+is_bif(erlang, time, 0) -> true;
+is_bif(erlang, tl, 1) -> true;
+is_bif(erlang, trace, 3) -> true;
+is_bif(erlang, trace_info, 2) -> true;
+is_bif(erlang, trace_pattern, 2) -> true;
+is_bif(erlang, trace_pattern, 3) -> true;
+is_bif(erlang, trunc, 1) -> true;
+is_bif(erlang, tuple_to_list, 1) -> true;
+is_bif(erlang, universaltime, 0) -> true;
+is_bif(erlang, universaltime_to_localtime, 1) -> true;
+is_bif(erlang, unlink, 1) -> true;
+is_bif(erlang, unregister, 1) -> true;
+is_bif(erlang, whereis, 1) -> true;
+is_bif(erlang, yield, 0) -> true;
+is_bif(lists, append, 2) -> true;
+is_bif(lists, reverse, 1) -> true;
+is_bif(lists, reverse, 2) -> true;
+is_bif(lists, subtract, 2) -> true;
+is_bif(math, acos, 1) -> true;
+is_bif(math, acosh, 1) -> true;
+is_bif(math, asin, 1) -> true;
+is_bif(math, asinh, 1) -> true;
+is_bif(math, atan, 1) -> true;
+is_bif(math, atan2, 2) -> true;
+is_bif(math, atanh, 1) -> true;
+is_bif(math, cos, 1) -> true;
+is_bif(math, cosh, 1) -> true;
+is_bif(math, erf, 1) -> true;
+is_bif(math, erfc, 1) -> true;
+is_bif(math, exp, 1) -> true;
+is_bif(math, log, 1) -> true;
+is_bif(math, log10, 1) -> true;
+is_bif(math, pow, 2) -> true;
+is_bif(math, sin, 1) -> true;
+is_bif(math, sinh, 1) -> true;
+is_bif(math, sqrt, 1) -> true;
+is_bif(math, tan, 1) -> true;
+is_bif(math, tanh, 1) -> true;
+is_bif(_, _, _) -> false.
+
+
+%% =====================================================================
+%% is_guard_bif(Module, Name, Arity) -> boolean()
+%%
+%%	    Module = Name = atom()
+%%	    Arity = integer()
+%%
+%%	Returns `true' if the built-in function `Module:Name/Arity' may
+%%	be called from a clause guard. Note that such "guard BIFs" are
+%%	not necessarily "pure", since some (notably `erlang:self/0') may
+%%	depend on the current state, nor "safe", since many guard BIFs
+%%	can fail. Also note that even a "pure" function could be
+%%	unsuitable for calling from a guard because of its time or space
+%%	complexity.
+
+is_guard_bif(erlang, '*', 2) -> true;
+is_guard_bif(erlang, '+', 1) -> true;
+is_guard_bif(erlang, '+', 2) -> true;
+is_guard_bif(erlang, '-', 1) -> true;
+is_guard_bif(erlang, '-', 2) -> true;
+is_guard_bif(erlang, '/', 2) -> true;
+is_guard_bif(erlang, '/=', 2) -> true;
+is_guard_bif(erlang, '<', 2) -> true;
+is_guard_bif(erlang, '=/=', 2) -> true;
+is_guard_bif(erlang, '=:=', 2) -> true;
+is_guard_bif(erlang, '=<', 2) -> true;
+is_guard_bif(erlang, '==', 2) -> true;
+is_guard_bif(erlang, '>', 2) -> true;
+is_guard_bif(erlang, '>=', 2) -> true;
+is_guard_bif(erlang, 'and', 2) -> true;
+is_guard_bif(erlang, 'band', 2) -> true;
+is_guard_bif(erlang, 'bnot', 1) -> true;
+is_guard_bif(erlang, 'bor', 2) -> true;
+is_guard_bif(erlang, 'bsl', 2) -> true;
+is_guard_bif(erlang, 'bsr', 2) -> true;
+is_guard_bif(erlang, 'bxor', 2) -> true;
+is_guard_bif(erlang, 'div', 2) -> true;
+is_guard_bif(erlang, 'not', 1) -> true;
+is_guard_bif(erlang, 'or', 2) -> true;
+is_guard_bif(erlang, 'rem', 2) -> true;
+is_guard_bif(erlang, 'xor', 2) -> true;
+is_guard_bif(erlang, abs, 1) -> true;
+is_guard_bif(erlang, element, 2) -> true;
+is_guard_bif(erlang, error, 1) -> true;  % unorthodox
+is_guard_bif(erlang, exit, 1) -> true;  % unorthodox
+is_guard_bif(erlang, fault, 1) -> true;  % unorthodox
+is_guard_bif(erlang, float, 1) -> true;  % (the type coercion function)
+is_guard_bif(erlang, hd, 1) -> true;
+is_guard_bif(erlang, is_atom, 1) -> true;
+is_guard_bif(erlang, is_boolean, 1) -> true;
+is_guard_bif(erlang, is_binary, 1) -> true;
+is_guard_bif(erlang, is_constant, 1) -> true;
+is_guard_bif(erlang, is_float, 1) -> true;
+is_guard_bif(erlang, is_function, 1) -> true;
+is_guard_bif(erlang, is_integer, 1) -> true;
+is_guard_bif(erlang, is_list, 1) -> true;
+is_guard_bif(erlang, is_number, 1) -> true;
+is_guard_bif(erlang, is_pid, 1) -> true;
+is_guard_bif(erlang, is_port, 1) -> true;
+is_guard_bif(erlang, is_reference, 1) -> true;
+is_guard_bif(erlang, is_tuple, 1) -> true;
+is_guard_bif(erlang, length, 1) -> true;
+is_guard_bif(erlang, list_to_atom, 1) -> true;  % unorthodox
+is_guard_bif(erlang, node, 0) -> true;  % (not pure)
+is_guard_bif(erlang, node, 1) -> true;  % (not pure)
+is_guard_bif(erlang, round, 1) -> true;
+is_guard_bif(erlang, self, 0) -> true;  % (not pure)
+is_guard_bif(erlang, size, 1) -> true;
+is_guard_bif(erlang, throw, 1) -> true;  % unorthodox
+is_guard_bif(erlang, tl, 1) -> true;
+is_guard_bif(erlang, trunc, 1) -> true;
+is_guard_bif(math, acos, 1) -> true;  % unorthodox
+is_guard_bif(math, acosh, 1) -> true;  % unorthodox
+is_guard_bif(math, asin, 1) -> true;  % unorthodox
+is_guard_bif(math, asinh, 1) -> true;  % unorthodox
+is_guard_bif(math, atan, 1) -> true;  % unorthodox
+is_guard_bif(math, atan2, 2) -> true;  % unorthodox
+is_guard_bif(math, atanh, 1) -> true;  % unorthodox
+is_guard_bif(math, cos, 1) -> true;  % unorthodox
+is_guard_bif(math, cosh, 1) -> true;  % unorthodox
+is_guard_bif(math, erf, 1) -> true;  % unorthodox
+is_guard_bif(math, erfc, 1) -> true;  % unorthodox
+is_guard_bif(math, exp, 1) -> true;  % unorthodox
+is_guard_bif(math, log, 1) -> true;  % unorthodox
+is_guard_bif(math, log10, 1) -> true;  % unorthodox
+is_guard_bif(math, pow, 2) -> true;  % unorthodox
+is_guard_bif(math, sin, 1) -> true;  % unorthodox
+is_guard_bif(math, sinh, 1) -> true;  % unorthodox
+is_guard_bif(math, sqrt, 1) -> true;  % unorthodox
+is_guard_bif(math, tan, 1) -> true;  % unorthodox
+is_guard_bif(math, tanh, 1) -> true;  % unorthodox
+is_guard_bif(_, _, _) -> false.
+
+
+%% =====================================================================
+%% is_pure(Module, Name, Arity) -> boolean()
+%%
+%%	    Module = Name = atom()
+%%	    Arity = integer()
+%%
+%%	Returns `true' if the function `Module:Name/Arity' does not
+%%	affect the state, nor depend on the state, although its
+%%	evaluation is not guaranteed to complete normally for all input.
+
+is_pure(erlang, '*', 2) -> true;
+is_pure(erlang, '+', 1) -> true;    % (even for non-numbers)
+is_pure(erlang, '+', 2) -> true;
+is_pure(erlang, '++', 2) -> true;
+is_pure(erlang, '-', 1) -> true;
+is_pure(erlang, '-', 2) -> true;
+is_pure(erlang, '--', 2) -> true;
+is_pure(erlang, '/', 2) -> true;
+is_pure(erlang, '/=', 2) -> true;
+is_pure(erlang, '<', 2) -> true;
+is_pure(erlang, '=/=', 2) -> true;
+is_pure(erlang, '=:=', 2) -> true;
+is_pure(erlang, '=<', 2) -> true;
+is_pure(erlang, '==', 2) -> true;
+is_pure(erlang, '>', 2) -> true;
+is_pure(erlang, '>=', 2) -> true;
+is_pure(erlang, 'and', 2) -> true;
+is_pure(erlang, 'band', 2) -> true;
+is_pure(erlang, 'bnot', 1) -> true;
+is_pure(erlang, 'bor', 2) -> true;
+is_pure(erlang, 'bsl', 2) -> true;
+is_pure(erlang, 'bsr', 2) -> true;
+is_pure(erlang, 'bxor', 2) -> true;
+is_pure(erlang, 'div', 2) -> true;
+is_pure(erlang, 'not', 1) -> true;
+is_pure(erlang, 'or', 2) -> true;
+is_pure(erlang, 'rem', 2) -> true;
+is_pure(erlang, 'xor', 2) -> true;
+is_pure(erlang, abs, 1) -> true;
+is_pure(erlang, atom_to_list, 1) -> true;
+is_pure(erlang, binary_to_list, 1) -> true;
+is_pure(erlang, binary_to_list, 3) -> true;
+is_pure(erlang, concat_binary, 1) -> true;
+is_pure(erlang, element, 2) -> true;
+is_pure(erlang, float, 1) -> true;
+is_pure(erlang, float_to_list, 1) -> true;
+is_pure(erlang, hash, 2) -> false;
+is_pure(erlang, hd, 1) -> true;
+is_pure(erlang, integer_to_list, 1) -> true;
+is_pure(erlang, is_atom, 1) -> true;
+is_pure(erlang, is_boolean, 1) -> true;
+is_pure(erlang, is_binary, 1) -> true;
+is_pure(erlang, is_builtin, 3) -> true;
+is_pure(erlang, is_constant, 1) -> true;
+is_pure(erlang, is_float, 1) -> true;
+is_pure(erlang, is_function, 1) -> true;
+is_pure(erlang, is_integer, 1) -> true;
+is_pure(erlang, is_list, 1) -> true;
+is_pure(erlang, is_number, 1) -> true;
+is_pure(erlang, is_pid, 1) -> true;
+is_pure(erlang, is_port, 1) -> true;
+is_pure(erlang, is_record, 3) -> true;
+is_pure(erlang, is_reference, 1) -> true;
+is_pure(erlang, is_tuple, 1) -> true;
+is_pure(erlang, length, 1) -> true;
+is_pure(erlang, list_to_atom, 1) -> true;
+is_pure(erlang, list_to_binary, 1) -> true;
+is_pure(erlang, list_to_float, 1) -> true;
+is_pure(erlang, list_to_integer, 1) -> true;
+is_pure(erlang, list_to_pid, 1) -> true;
+is_pure(erlang, list_to_tuple, 1) -> true;
+is_pure(erlang, phash, 2) -> false;
+is_pure(erlang, pid_to_list, 1) -> true;
+is_pure(erlang, round, 1) -> true;
+is_pure(erlang, setelement, 3) -> true;
+is_pure(erlang, size, 1) -> true;
+is_pure(erlang, split_binary, 2) -> true;
+is_pure(erlang, term_to_binary, 1) -> true;
+is_pure(erlang, tl, 1) -> true;
+is_pure(erlang, trunc, 1) -> true;
+is_pure(erlang, tuple_to_list, 1) -> true;
+is_pure(lists, append, 2) -> true;
+is_pure(lists, subtract, 2) -> true;
+is_pure(math, acos, 1) -> true;
+is_pure(math, acosh, 1) -> true;
+is_pure(math, asin, 1) -> true;
+is_pure(math, asinh, 1) -> true;
+is_pure(math, atan, 1) -> true;
+is_pure(math, atan2, 2) -> true;
+is_pure(math, atanh, 1) -> true;
+is_pure(math, cos, 1) -> true;
+is_pure(math, cosh, 1) -> true;
+is_pure(math, erf, 1) -> true;
+is_pure(math, erfc, 1) -> true;
+is_pure(math, exp, 1) -> true;
+is_pure(math, log, 1) -> true;
+is_pure(math, log10, 1) -> true;
+is_pure(math, pow, 2) -> true;
+is_pure(math, sin, 1) -> true;
+is_pure(math, sinh, 1) -> true;
+is_pure(math, sqrt, 1) -> true;
+is_pure(math, tan, 1) -> true;
+is_pure(math, tanh, 1) -> true;
+is_pure(_, _, _) -> false.
+
+
+%% =====================================================================
+%% is_safe(Module, Name, Arity) -> boolean()
+%%
+%%	    Module = Name = atom()
+%%	    Arity = integer()
+%%
+%%	Returns `true' if the function `Module:Name/Arity' is completely
+%%	effect free, i.e., if its evaluation always completes normally
+%%	and does not affect the state (although the value it returns
+%%	might depend on the state).
+
+is_safe(erlang, '/=', 2) -> true;
+is_safe(erlang, '<', 2) -> true;
+is_safe(erlang, '=/=', 2) -> true;
+is_safe(erlang, '=:=', 2) -> true;
+is_safe(erlang, '=<', 2) -> true;
+is_safe(erlang, '==', 2) -> true;
+is_safe(erlang, '>', 2) -> true;
+is_safe(erlang, '>=', 2) -> true;
+is_safe(erlang, date, 0) -> true;
+is_safe(erlang, get, 0) -> true;
+is_safe(erlang, get, 1) -> true;
+is_safe(erlang, get_cookie, 0) -> true;
+is_safe(erlang, get_keys, 1) -> true;
+is_safe(erlang, group_leader, 0) -> true;
+is_safe(erlang, is_alive, 0) -> true;
+is_safe(erlang, is_atom, 1) -> true;
+is_safe(erlang, is_boolean, 1) -> true;
+is_safe(erlang, is_binary, 1) -> true;
+is_safe(erlang, is_constant, 1) -> true;
+is_safe(erlang, is_float, 1) -> true;
+is_safe(erlang, is_function, 1) -> true;
+is_safe(erlang, is_integer, 1) -> true;
+is_safe(erlang, is_list, 1) -> true;
+is_safe(erlang, is_number, 1) -> true;
+is_safe(erlang, is_pid, 1) -> true;
+is_safe(erlang, is_port, 1) -> true;
+is_safe(erlang, is_record, 3) -> true;
+is_safe(erlang, is_reference, 1) -> true;
+is_safe(erlang, is_tuple, 1) -> true;
+is_safe(erlang, make_ref, 0) -> true;
+is_safe(erlang, node, 0) -> true;
+is_safe(erlang, nodes, 0) -> true;
+is_safe(erlang, ports, 0) -> true;
+is_safe(erlang, pre_loaded, 0) -> true;
+is_safe(erlang, processes, 0) -> true;
+is_safe(erlang, registered, 0) -> true;
+is_safe(erlang, self, 0) -> true;
+is_safe(erlang, term_to_binary, 1) -> true;
+is_safe(erlang, time, 0) -> true;
+is_safe(_, _, _) -> false.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/rec_env.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/rec_env.erl
new file mode 100644
index 0000000000..01c2512397
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/rec_env.erl
@@ -0,0 +1,611 @@
+%% =====================================================================
+%% This library is free software; you can redistribute it and/or modify
+%% it under the terms of the GNU Lesser General Public License as
+%% published by the Free Software Foundation; either version 2 of the
+%% License, or (at your option) any later version.
+%%
+%% This library is distributed in the hope that it will be useful, but
+%% WITHOUT ANY WARRANTY; without even the implied warranty of
+%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+%% Lesser General Public License for more details.
+%%
+%% You should have received a copy of the GNU Lesser General Public
+%% License along with this library; if not, write to the Free Software
+%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+%% USA
+%%
+%% $Id: rec_env.erl,v 1.2 2009/09/17 09:46:19 kostis Exp $
+%%
+%% @author Richard Carlsson <[email protected]>
+%% @copyright 1999-2004 Richard Carlsson
+%% @doc Abstract environments, supporting self-referential bindings and
+%% automatic new-key generation.
+
+%% The current implementation is based on Erlang standard library
+%% dictionaries.
+
+%%% -define(DEBUG, true).
+
+-module(rec_env).
+
+-export([bind/3, bind_list/3, bind_recursive/4, delete/2, empty/0,
+	 get/2, is_defined/2, is_empty/1, keys/1, lookup/2, new_key/1,
+	 new_key/2, new_keys/2, new_keys/3, size/1, to_list/1]).
+
+-ifdef(DEBUG).
+-export([test/1, test_custom/1, test_custom/2]).
+-endif.
+
+-ifdef(DEBUG).
+%% Code for testing:
+%%@hidden
+test(N) ->
+    test_0(integer, N).
+
+%%@hidden
+test_custom(N) ->
+    F = fun (X) -> list_to_atom("X"++integer_to_list(X)) end,
+    test_custom(F, N).
+
+%%@hidden
+test_custom(F, N) ->
+    test_0({custom, F}, N).
+
+test_0(Type, N) ->
+    put(new_key_calls, 0),
+    put(new_key_retries, 0),
+    put(new_key_max, 0),
+    Env = test_1(Type, N, empty()),
+    io:fwrite("\ncalls: ~w.\n", [get(new_key_calls)]),
+    io:fwrite("\nretries: ~w.\n", [get(new_key_retries)]),
+    io:fwrite("\nmax: ~w.\n", [get(new_key_max)]),
+    dict:to_list(element(1,Env)).
+
+test_1(integer = Type, N, Env) when integer(N), N > 0 ->
+    Key = new_key(Env),
+    test_1(Type, N - 1, bind(Key, value, Env));
+test_1({custom, F} = Type, N, Env) when integer(N), N > 0 ->
+    Key = new_key(F, Env),
+    test_1(Type, N - 1, bind(Key, value, Env));
+test_1(_,0, Env) ->
+    Env.
+-endif.
+
+
+%% Representation:
+%%
+%%	environment() = [Mapping]
+%%
+%%      Mapping = {map, Dict} | {rec, Dict, Dict}
+%%	Dict = dict:dictionary()
+%%
+%% An empty environment is a list containing a single `{map, Dict}'
+%% element - empty lists are not valid environments. To find a key in an
+%% environment, it is searched for in each mapping in the list, in
+%% order, until it the key is found in some mapping, or the end of the
+%% list is reached. In a 'rec' mapping, we keep the original dictionary
+%% together with a version where entries may have been deleted - this
+%% makes it possible to garbage collect the entire 'rec' mapping when
+%% all its entries are unused (for example, by being shadowed by later
+%% definitions).
+
+
+
+%% =====================================================================
+%% @type environment(). An abstract environment.
+
+
+%% =====================================================================
+%% @spec empty() -> environment()
+%%
+%% @doc Returns an empty environment.
+
+empty() ->
+    [{map, dict:new()}].
+
+
+%% =====================================================================
+%% @spec is_empty(Env::environment()) -> boolean()
+%%
+%% @doc Returns <code>true</code> if the environment is empty, otherwise
+%% <code>false</code>.
+
+is_empty([{map, Dict} | Es]) ->
+    N = dict:size(Dict),
+    if N /= 0 -> false;
+       Es == [] -> true;
+       true -> is_empty(Es)
+    end;
+is_empty([{rec, Dict, _} | Es]) ->
+    N = dict:size(Dict),
+    if N /= 0 -> false;
+       Es == [] -> true;
+       true -> is_empty(Es)
+    end.
+
+
+%% =====================================================================
+%% @spec size(Env::environment()) -> integer()
+%%
+%% @doc Returns the number of entries in an environment.
+
+%% (The name 'size' cannot be used in local calls, since there exists a
+%% built-in function with the same name.)
+
+size(Env) ->
+    env_size(Env).
+
+env_size([{map, Dict}]) ->
+    dict:size(Dict);
+env_size([{map, Dict} | Env]) ->
+    dict:size(Dict) + env_size(Env);
+env_size([{rec, Dict, _Dict0} | Env]) ->
+    dict:size(Dict) + env_size(Env).
+
+
+%% =====================================================================
+%% @spec is_defined(Key, Env) -> boolean()
+%%
+%%	Key = term()
+%%	Env = environment()
+%%
+%% @doc Returns <code>true</code> if <code>Key</code> is bound in the
+%% environment, otherwise <code>false</code>.
+
+is_defined(Key, [{map, Dict} | Env]) ->
+    case dict:is_key(Key, Dict) of
+	true ->
+	    true;
+	false when Env == [] ->
+	    false;
+	false ->
+	    is_defined(Key, Env)
+    end;
+is_defined(Key, [{rec, Dict, _Dict0} | Env]) ->
+    case dict:is_key(Key, Dict) of
+	true ->
+	    true;
+	false ->
+	    is_defined(Key, Env)
+    end.
+
+
+%% =====================================================================
+%% @spec keys(Env::environment()) -> [term()]
+%%
+%% @doc Returns the ordered list of all keys in the environment.
+
+keys(Env) ->
+    lists:sort(keys(Env, [])).
+
+keys([{map, Dict}], S) ->
+    dict:fetch_keys(Dict) ++ S;
+keys([{map, Dict} | Env], S) ->
+    keys(Env, dict:fetch_keys(Dict) ++ S);
+keys([{rec, Dict, _Dict0} | Env], S) ->
+    keys(Env, dict:fetch_keys(Dict) ++ S).
+
+
+%% =====================================================================
+%% @spec to_list(Env) -> [{Key, Value}]
+%%
+%%	Env = environment()
+%%	Key = term()
+%%	Value = term()
+%%
+%% @doc Returns an ordered list of <code>{Key, Value}</code> pairs for
+%% all keys in <code>Env</code>. <code>Value</code> is the same as that
+%% returned by {@link get/2}.
+
+to_list(Env) ->
+    lists:sort(to_list(Env, [])).
+
+to_list([{map, Dict}], S) ->
+    dict:to_list(Dict) ++ S;
+to_list([{map, Dict} | Env], S) ->
+    to_list(Env, dict:to_list(Dict) ++ S);
+to_list([{rec, Dict, _Dict0} | Env], S) ->
+    to_list(Env, dict:to_list(Dict) ++ S).
+
+
+%% =====================================================================
+%% @spec bind(Key, Value, Env) -> environment()
+%%
+%%	Key = term()
+%%	Value = term()
+%%	Env = environment()
+%%
+%% @doc Make a nonrecursive entry. This binds <code>Key</code> to
+%% <code>Value</code>. If the key already existed in the environment,
+%% the old entry is replaced.
+
+%% Note that deletion is done to free old bindings so they can be
+%% garbage collected.
+
+bind(Key, Value, [{map, Dict}]) ->
+    [{map, dict:store(Key, Value, Dict)}];
+bind(Key, Value, [{map, Dict} | Env]) ->
+    [{map, dict:store(Key, Value, Dict)} | delete_any(Key, Env)];
+bind(Key, Value, Env) ->
+    [{map, dict:store(Key, Value, dict:new())} | delete_any(Key, Env)].
+
+
+%% =====================================================================
+%% @spec bind_list(Keys, Values, Env) -> environment()
+%%
+%%	Keys = [term()]
+%%	Values = [term()]
+%%	Env = environment()
+%%
+%% @doc Make N nonrecursive entries. This binds each key in
+%% <code>Keys</code> to the corresponding value in
+%% <code>Values</code>. If some key already existed in the environment,
+%% the previous entry is replaced. If <code>Keys</code> does not have
+%% the same length as <code>Values</code>, an exception is generated.
+
+bind_list(Ks, Vs, [{map, Dict}]) ->
+    [{map, store_list(Ks, Vs, Dict)}];
+bind_list(Ks, Vs, [{map, Dict} | Env]) ->
+    [{map, store_list(Ks, Vs, Dict)} | delete_list(Ks, Env)];
+bind_list(Ks, Vs, Env) ->
+    [{map, store_list(Ks, Vs, dict:new())} | delete_list(Ks, Env)].
+
+store_list([K | Ks], [V | Vs], Dict) ->
+    store_list(Ks, Vs, dict:store(K, V, Dict));
+store_list([], _, Dict) ->
+    Dict.
+
+delete_list([K | Ks], Env) ->
+    delete_list(Ks, delete_any(K, Env));
+delete_list([], Env) ->
+    Env.
+
+%% By not calling `delete' unless we have to, we avoid unnecessary
+%% rewriting of the data.
+
+delete_any(Key, Env) ->
+    case is_defined(Key, Env) of
+	true ->
+	    delete(Key, Env);
+	false ->
+	    Env
+    end.
+
+%% =====================================================================
+%% @spec delete(Key, Env) -> environment()
+%%
+%%	Key = term()
+%%	Env = environment()
+%%
+%% @doc Delete an entry. This removes <code>Key</code> from the
+%% environment.
+
+delete(Key, [{map, Dict} = E | Env]) ->
+    case dict:is_key(Key, Dict) of
+	true ->
+	    [{map, dict:erase(Key, Dict)} | Env];
+	false ->
+	    delete_1(Key, Env, E)
+    end;
+delete(Key, [{rec, Dict, Dict0} = E | Env]) ->
+    case dict:is_key(Key, Dict) of
+	true ->
+	    %% The Dict0 component must be preserved as it is until all
+	    %% keys in Dict have been deleted.
+	    Dict1 = dict:erase(Key, Dict),
+	    case dict:size(Dict1) of
+		0 ->
+		    Env;    % the whole {rec,...} is now garbage
+		_ ->
+		    [{rec, Dict1, Dict0} | Env]
+	    end;
+	false ->
+	    [E | delete(Key, Env)]
+    end.
+
+%% This is just like above, except we pass on the preceding 'map'
+%% mapping in the list to enable merging when removing 'rec' mappings.
+
+delete_1(Key, [{rec, Dict, Dict0} = E | Env], E1) ->
+    case dict:is_key(Key, Dict) of
+	true ->
+	    Dict1 = dict:erase(Key, Dict),
+	    case dict:size(Dict1) of
+		0 ->
+		    concat(E1, Env);
+		_ ->
+		    [E1, {rec, Dict1, Dict0} | Env]
+	    end;
+	false ->
+	    [E1, E | delete(Key, Env)]
+    end.
+
+concat({map, D1}, [{map, D2} | Env]) ->
+    [dict:merge(fun (_K, V1, _V2) -> V1 end, D1, D2) | Env];
+concat(E1, Env) ->
+    [E1 | Env].
+
+
+%% =====================================================================
+%% @spec bind_recursive(Keys, Values, Fun, Env) -> NewEnv
+%%
+%%	Keys = [term()]
+%%	Values = [term()]
+%%	Fun = (Value, Env) -> term()
+%%	Env = environment()
+%%	NewEnv = environment()
+%%
+%% @doc Make N recursive entries. This binds each key in
+%% <code>Keys</code> to the value of <code>Fun(Value, NewEnv)</code> for
+%% the corresponding <code>Value</code>. If <code>Keys</code> does not
+%% have the same length as <code>Values</code>, an exception is
+%% generated. If some key already existed in the environment, the old
+%% entry is replaced.
+%%
+%% <p>Note: the function <code>Fun</code> is evaluated each time one of
+%% the stored keys is looked up, but only then.</p>
+%%
+%% <p>Examples:
+%%<pre>
+%%    NewEnv = bind_recursive([foo, bar], [1, 2],
+%%	                      fun (V, E) -> V end,
+%%	                      Env)</pre>
+%%
+%% This does nothing interesting; <code>get(foo, NewEnv)</code> yields
+%% <code>1</code> and <code>get(bar, NewEnv)</code> yields
+%% <code>2</code>, but there is more overhead than if the {@link
+%% bind_list/3} function had been used.
+%%
+%% <pre>
+%%    NewEnv = bind_recursive([foo, bar], [1, 2],
+%%                            fun (V, E) -> {V, E} end,
+%%                            Env)</pre>
+%%
+%% Here, however, <code>get(foo, NewEnv)</code> will yield <code>{1,
+%% NewEnv}</code> and <code>get(bar, NewEnv)</code> will yield <code>{2,
+%% NewEnv}</code>, i.e., the environment <code>NewEnv</code> contains
+%% recursive bindings.</p>
+
+bind_recursive([], [], _, Env) ->
+    Env;
+bind_recursive(Ks, Vs, F, Env) ->
+    F1 = fun (V) ->
+		 fun (Dict) -> F(V, [{rec, Dict, Dict} | Env]) end
+	 end,
+    Dict = bind_recursive_1(Ks, Vs, F1, dict:new()),
+    [{rec, Dict, Dict} | Env].
+
+bind_recursive_1([K | Ks], [V | Vs], F, Dict) ->
+    bind_recursive_1(Ks, Vs, F, dict:store(K, F(V), Dict));
+bind_recursive_1([], [], _, Dict) ->
+    Dict.
+
+
+%% =====================================================================
+%% @spec lookup(Key, Env) -> error | {ok, Value}
+%%
+%%	Key = term()
+%%	Env = environment()
+%%	Value = term()
+%%
+%% @doc Returns <code>{ok, Value}</code> if <code>Key</code> is bound to
+%% <code>Value</code> in <code>Env</code>, and <code>error</code>
+%% otherwise.
+
+lookup(Key, [{map, Dict} | Env]) ->
+    case dict:find(Key, Dict) of
+	{ok, _}=Value ->
+	    Value;
+	error when Env == [] ->
+	    error;
+	error ->
+	    lookup(Key, Env)
+    end;
+lookup(Key, [{rec, Dict, Dict0} | Env]) ->
+    case dict:find(Key, Dict) of
+	{ok, F} ->
+	    {ok, F(Dict0)};
+	error ->
+	    lookup(Key, Env)
+    end.
+
+
+%% =====================================================================
+%% @spec get(Key, Env) -> Value
+%%
+%%	Key = term()
+%%	Env = environment()
+%%	Value = term()
+%%
+%% @doc Returns the value that <code>Key</code> is bound to in
+%% <code>Env</code>. Throws <code>{undefined, Key}</code> if the key
+%% does not exist in <code>Env</code>.
+
+get(Key, Env) ->
+    case lookup(Key, Env) of
+	{ok, Value} -> Value;
+	error -> throw({undefined, Key})
+    end.
+
+
+%% =====================================================================
+%% The key-generating algorithm could possibly be further improved. The
+%% important thing to keep in mind is, that when we need a new key, we
+%% are generally in mid-traversal of a syntax tree, and existing names
+%% in the tree may be closely grouped and evenly distributed or even
+%% forming a compact range (often having been generated by a "gensym",
+%% or by this very algorithm itself). This means that if we generate an
+%% identifier whose value is too close to those already seen (i.e.,
+%% which are in the environment), it is very probable that we will
+%% shadow a not-yet-seen identifier further down in the tree, the result
+%% being that we induce another later renaming, and end up renaming most
+%% of the identifiers, completely contrary to our intention. We need to
+%% generate new identifiers in a way that avoids such systematic
+%% collisions.
+%%
+%% One way of getting a new key to try when the previous attempt failed
+%% is of course to e.g. add one to the last tried value. However, in
+%% general it's a bad idea to try adjacent identifiers: the percentage
+%% of retries will typically increase a lot, so you may lose big on the
+%% extra lookups while gaining only a little from the quicker
+%% computation.
+%%
+%% We want an initial range that is large enough for most typical cases.
+%% If we start with, say, a range of 10, we might quickly use up most of
+%% the values in the range 1-10 (or 1-100) for new top-level variables -
+%% but as we start traversing the syntax tree, it is quite likely that
+%% exactly those variables will be encountered again (this depends on
+%% how the names in the tree were created), and will then need to be
+%% renamed. If we instead begin with a larger range, it is less likely
+%% that any top-level names that we introduce will shadow names that we
+%% will find in the tree. Of course we cannot know how large is large
+%% enough: for any initial range, there is some syntax tree that uses
+%% all the values in that range, and thus any top-level names introduced
+%% will shadow names in the tree. The point is to avoid this happening
+%% all the time - a range of about 1000 seems enough for most programs.
+%%
+%% The following values have been shown to work well:
+
+-define(MINIMUM_RANGE, 1000).
+-define(START_RANGE_FACTOR, 50).
+-define(MAX_RETRIES, 2).      % retries before enlarging range
+-define(ENLARGE_FACTOR, 10).  % range enlargment factor
+
+-ifdef(DEBUG).
+%% If you want to use these process dictionary counters, make sure to
+%% initialise them to zero before you call any of the key-generating
+%% functions.
+%%
+%%	new_key_calls		total number of calls
+%%	new_key_retries		failed key generation attempts
+%%	new_key_max		maximum generated integer value
+%%
+-define(measure_calls(),
+	put(new_key_calls, 1 + get(new_key_calls))).
+-define(measure_max_key(N),
+	case N > get(new_key_max) of
+	    true ->
+		put(new_key_max, N);
+	    false ->
+		ok
+	end).
+-define(measure_retries(N),
+	put(new_key_retries, get(new_key_retries) + N)).
+-else.
+-define(measure_calls(), ok).
+-define(measure_max_key(N), ok).
+-define(measure_retries(N), ok).
+-endif.
+
+
+%% =====================================================================
+%% @spec new_key(Env::environment()) -> integer()
+%%
+%% @doc Returns an integer which is not already used as key in the
+%% environment. New integers are generated using an algorithm which
+%% tries to keep the values randomly distributed within a reasonably
+%% small range relative to the number of entries in the environment.
+%%
+%% <p>This function uses the Erlang standard library module
+%% <code>random</code> to generate new keys.</p>
+%%
+%% <p>Note that only the new key is returned; the environment itself is
+%% not updated by this function.</p>
+
+new_key(Env) ->
+    new_key(fun (X) -> X end, Env).
+
+
+%% =====================================================================
+%% @spec new_key(Function, Env) -> term()
+%%
+%%	Function = (integer()) -> term()
+%%	Env = environment()
+%%
+%% @doc Returns a term which is not already used as key in the
+%% environment. The term is generated by applying <code>Function</code>
+%% to an integer generated as in {@link new_key/1}.
+%%
+%% <p>Note that only the generated term is returned; the environment
+%% itself is not updated by this function.</p>
+
+new_key(F, Env) ->
+    ?measure_calls(),
+    R = start_range(Env),
+%%%     io:fwrite("Start range: ~w.\n", [R]),
+    new_key(R, F, Env).
+
+new_key(R, F, Env) ->
+    new_key(generate(R, R), R, 0, F, Env).
+
+new_key(N, R, T, F, Env) when T < ?MAX_RETRIES ->
+    A = F(N),
+    case is_defined(A, Env) of
+	true ->
+%%% 	    io:fwrite("CLASH: ~w.\n", [A]),
+	    new_key(generate(N, R), R, T + 1, F, Env);
+	false ->
+	    ?measure_max_key(N),
+	    ?measure_retries(T),
+%%% 	    io:fwrite("New: ~w.\n", [N]),
+	    A
+    end;
+new_key(N, R, _T, F, Env) ->
+    %% Too many retries - enlarge the range and start over.
+    ?measure_retries((_T + 1)),
+    R1 = trunc(R * ?ENLARGE_FACTOR),
+%%%     io:fwrite("**NEW RANGE**: ~w.\n", [R1]),
+    new_key(generate(N, R1), R1, 0, F, Env).
+
+start_range(Env) ->
+    max(env_size(Env) * ?START_RANGE_FACTOR, ?MINIMUM_RANGE).
+
+max(X, Y) when X > Y -> X;
+max(_, Y) -> Y.
+
+%% The previous key might or might not be used to compute the next key
+%% to be tried. It is currently not used.
+%%
+%% In order to avoid causing cascading renamings, it is important that
+%% this function does not generate values in order, but
+%% (pseudo-)randomly distributed over the range.
+
+generate(_N, Range) ->
+    random:uniform(Range).    % works well
+
+
+%% =====================================================================
+%% @spec new_keys(N, Env) -> [integer()]
+%%
+%%	N = integer()
+%%	Env = environment()
+%%
+%% @doc Returns a list of <code>N</code> distinct integers that are not
+%% already used as keys in the environment. See {@link new_key/1} for
+%% details.
+
+new_keys(N, Env) when integer(N) ->
+    new_keys(N, fun (X) -> X end, Env).
+
+
+%% =====================================================================
+%% @spec new_keys(N, Function, Env) -> [term()]
+%%
+%%	    N = integer()
+%%	    Function = (integer()) -> term()
+%%	    Env = environment()
+%%
+%% @doc Returns a list of <code>N</code> distinct terms that are not
+%% already used as keys in the environment. See {@link new_key/3} for
+%% details.
+
+new_keys(N, F, Env) when integer(N) ->
+    R = start_range(Env),
+    new_keys(N, [], R, F, Env).
+
+new_keys(N, Ks, R, F, Env) when N > 0 ->
+    Key = new_key(R, F, Env),
+    Env1 = bind(Key, true, Env),    % dummy binding
+    new_keys(N - 1, [Key | Ks], R, F, Env1);
+new_keys(0, Ks, _, _, _) ->
+    Ks.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_expand_pmod.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_expand_pmod.erl
new file mode 100644
index 0000000000..f48cc05b9c
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_expand_pmod.erl
@@ -0,0 +1,425 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: sys_expand_pmod.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+-module(sys_expand_pmod).
+
+%% Expand function definition forms of parameterized module. We assume
+%% all record definitions, imports, queries, etc., have been expanded
+%% away. Any calls on the form 'foo(...)' must be calls to local
+%% functions. Auto-generated functions (module_info,...) have not yet
+%% been added to the function definitions, but are listed in 'defined'
+%% and 'exports'. The 'new/N' function is neither added to the
+%% definitions nor to the 'exports'/'defines' lists yet.
+
+-export([forms/4]).
+
+-record(pmod, {parameters, exports, defined, predef}).
+
+%% TODO: more abstract handling of predefined/static functions.
+
+forms(Fs0, Ps, Es0, Ds0) ->
+    PreDef = [{module_info,0},{module_info,1}],
+    forms(Fs0, Ps, Es0, Ds0, PreDef).
+
+forms(Fs0, Ps, Es0, Ds0, PreDef) ->
+    St0 = #pmod{parameters=Ps,exports=Es0,defined=Ds0, predef=PreDef},
+    {Fs1, St1} = forms(Fs0, St0),
+    Es1 = update_function_names(Es0, St1),
+    Ds1 = update_function_names(Ds0, St1),
+    Fs2 = update_forms(Fs1, St1),
+    {Fs2,Es1,Ds1}.
+
+%% This is extremely simplistic for now; all functions get an extra
+%% parameter, whether they need it or not, except for static functions.
+
+update_function_names(Es, St) ->
+    [update_function_name(E, St) || E <- Es].
+
+update_function_name(E={F,A}, St) ->
+    case ordsets:is_element(E, St#pmod.predef) of
+	true -> E;
+	false -> {F, A + 1}
+    end.
+
+update_forms([{function,L,N,A,Cs}|Fs],St) ->
+    [{function,L,N,A+1,Cs}|update_forms(Fs,St)];
+update_forms([F|Fs],St) ->
+    [F|update_forms(Fs,St)];
+update_forms([],_St) ->
+    [].
+
+%% Process the program forms.
+
+forms([F0|Fs0],St0) ->
+    {F1,St1} = form(F0,St0),
+    {Fs1,St2} = forms(Fs0,St1),
+    {[F1|Fs1],St2};
+forms([], St0) ->
+    {[], St0}.
+
+%% Only function definitions are of interest here. State is not updated.
+form({function,Line,Name0,Arity0,Clauses0},St) ->
+    {Name,Arity,Clauses} = function(Name0, Arity0, Clauses0, St),
+    {{function,Line,Name,Arity,Clauses},St};
+%% Pass anything else through
+form(F,St) -> {F,St}.
+
+function(Name, Arity, Clauses0, St) ->
+    Clauses1 = clauses(Clauses0,St),
+    {Name,Arity,Clauses1}.
+
+clauses([C|Cs],St) ->
+    {clause,L,H,G,B} = clause(C,St),
+    T = {tuple,L,[{var,L,V} || V <- ['_'|St#pmod.parameters]]},
+    [{clause,L,H++[{match,L,T,{var,L,'THIS'}}],G,B}|clauses(Cs,St)];
+clauses([],_St) -> [].
+
+clause({clause,Line,H0,G0,B0},St) ->
+    H1 = head(H0,St),
+    G1 = guard(G0,St),
+    B1 = exprs(B0,St),
+    {clause,Line,H1,G1,B1}.
+
+head(Ps,St) -> patterns(Ps,St).
+
+patterns([P0|Ps],St) ->
+    P1 = pattern(P0,St),
+    [P1|patterns(Ps,St)];
+patterns([],_St) -> [].
+
+string_to_conses([], _Line, Tail) ->
+    Tail;
+string_to_conses([E|Rest], Line, Tail) ->
+    {cons, Line, {integer, Line, E}, string_to_conses(Rest, Line, Tail)}.
+
+pattern({var,Line,V},_St) -> {var,Line,V};
+pattern({match,Line,L0,R0},St) ->
+    L1 = pattern(L0,St),
+    R1 = pattern(R0,St),
+    {match,Line,L1,R1};
+pattern({integer,Line,I},_St) -> {integer,Line,I};
+pattern({char,Line,C},_St) -> {char,Line,C};
+pattern({float,Line,F},_St) -> {float,Line,F};
+pattern({atom,Line,A},_St) -> {atom,Line,A};
+pattern({string,Line,S},_St) -> {string,Line,S};
+pattern({nil,Line},_St) -> {nil,Line};
+pattern({cons,Line,H0,T0},St) ->
+    H1 = pattern(H0,St),
+    T1 = pattern(T0,St),
+    {cons,Line,H1,T1};
+pattern({tuple,Line,Ps0},St) ->
+    Ps1 = pattern_list(Ps0,St),
+    {tuple,Line,Ps1};
+pattern({bin,Line,Fs},St) ->
+    Fs2 = pattern_grp(Fs,St),
+    {bin,Line,Fs2};
+pattern({op,_Line,'++',{nil,_},R},St) ->
+    pattern(R,St);
+pattern({op,_Line,'++',{cons,Li,{char,C2,I},T},R},St) ->
+    pattern({cons,Li,{char,C2,I},{op,Li,'++',T,R}},St);
+pattern({op,_Line,'++',{cons,Li,{integer,L2,I},T},R},St) ->
+    pattern({cons,Li,{integer,L2,I},{op,Li,'++',T,R}},St);
+pattern({op,_Line,'++',{string,Li,L},R},St) ->
+    pattern(string_to_conses(L, Li, R),St);
+pattern({op,Line,Op,A},_St) ->
+    {op,Line,Op,A};
+pattern({op,Line,Op,L,R},_St) ->
+    {op,Line,Op,L,R}.
+
+pattern_grp([{bin_element,L1,E1,S1,T1} | Fs],St) ->
+    S2 = case S1 of
+	     default ->
+		 default;
+	     _ ->
+		 expr(S1,St)
+	 end,
+    T2 = case T1 of
+	     default ->
+		 default;
+	     _ ->
+		 bit_types(T1)
+	 end,
+    [{bin_element,L1,expr(E1,St),S2,T2} | pattern_grp(Fs,St)];
+pattern_grp([],_St) ->
+    [].
+
+bit_types([]) ->
+    [];
+bit_types([Atom | Rest]) when atom(Atom) ->
+    [Atom | bit_types(Rest)];
+bit_types([{Atom, Integer} | Rest]) when atom(Atom), integer(Integer) ->
+    [{Atom, Integer} | bit_types(Rest)].
+
+pattern_list([P0|Ps],St) ->
+    P1 = pattern(P0,St),
+    [P1|pattern_list(Ps,St)];
+pattern_list([],_St) -> [].
+
+guard([G0|Gs],St) when list(G0) ->
+    [guard0(G0,St) | guard(Gs,St)];
+guard(L,St) ->
+    guard0(L,St).
+
+guard0([G0|Gs],St) ->
+    G1 = guard_test(G0,St),
+    [G1|guard0(Gs,St)];
+guard0([],_St) -> [].
+
+guard_test(Expr={call,Line,{atom,La,F},As0},St) ->
+    case erl_internal:type_test(F, length(As0)) of
+	true ->
+	    As1 = gexpr_list(As0,St),
+	    {call,Line,{atom,La,F},As1};
+	_ ->
+	    gexpr(Expr,St)
+    end;
+guard_test(Any,St) ->
+    gexpr(Any,St).
+
+gexpr({var,L,V},_St) ->
+    {var,L,V};
+% %% alternative implementation of accessing module parameters
+%     case index(V,St#pmod.parameters) of
+% 	N when N > 0 ->
+% 	    {call,L,{remote,L,{atom,L,erlang},{atom,L,element}},
+% 	     [{integer,L,N+1},{var,L,'THIS'}]};
+% 	_ ->
+% 	    {var,L,V}
+%     end;
+gexpr({integer,Line,I},_St) -> {integer,Line,I};
+gexpr({char,Line,C},_St) -> {char,Line,C};
+gexpr({float,Line,F},_St) -> {float,Line,F};
+gexpr({atom,Line,A},_St) -> {atom,Line,A};
+gexpr({string,Line,S},_St) -> {string,Line,S};
+gexpr({nil,Line},_St) -> {nil,Line};
+gexpr({cons,Line,H0,T0},St) ->
+    H1 = gexpr(H0,St),
+    T1 = gexpr(T0,St),
+    {cons,Line,H1,T1};
+gexpr({tuple,Line,Es0},St) ->
+    Es1 = gexpr_list(Es0,St),
+    {tuple,Line,Es1};
+gexpr({call,Line,{atom,La,F},As0},St) ->
+    case erl_internal:guard_bif(F, length(As0)) of
+	true -> As1 = gexpr_list(As0,St),
+		{call,Line,{atom,La,F},As1}
+    end;
+% Pre-expansion generated calls to erlang:is_record/3 must also be handled
+gexpr({call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,is_record}},As0},St)
+  when length(As0) == 3 ->
+    As1 = gexpr_list(As0,St),
+    {call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,is_record}},As1};
+% Guard bif's can be remote, but only in the module erlang...
+gexpr({call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,F}},As0},St) ->
+    case erl_internal:guard_bif(F, length(As0)) or
+	 erl_internal:arith_op(F, length(As0)) or
+	 erl_internal:comp_op(F, length(As0)) or
+	 erl_internal:bool_op(F, length(As0)) of
+	true -> As1 = gexpr_list(As0,St),
+		{call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,F}},As1}
+    end;
+% Unfortunately, writing calls as {M,F}(...) is also allowed.
+gexpr({call,Line,{tuple,La,[{atom,Lb,erlang},{atom,Lc,F}]},As0},St) ->
+    case erl_internal:guard_bif(F, length(As0)) or
+	 erl_internal:arith_op(F, length(As0)) or
+	 erl_internal:comp_op(F, length(As0)) or
+	 erl_internal:bool_op(F, length(As0)) of
+	true -> As1 = gexpr_list(As0,St),
+		{call,Line,{tuple,La,[{atom,Lb,erlang},{atom,Lc,F}]},As1}
+    end;
+gexpr({bin,Line,Fs},St) ->
+    Fs2 = pattern_grp(Fs,St),
+    {bin,Line,Fs2};
+gexpr({op,Line,Op,A0},St) ->
+    case erl_internal:arith_op(Op, 1) or
+	 erl_internal:bool_op(Op, 1) of
+	true -> A1 = gexpr(A0,St),
+		{op,Line,Op,A1}
+    end;
+gexpr({op,Line,Op,L0,R0},St) ->
+    case erl_internal:arith_op(Op, 2) or
+	  erl_internal:bool_op(Op, 2) or
+	  erl_internal:comp_op(Op, 2) of
+	true ->
+	    L1 = gexpr(L0,St),
+	    R1 = gexpr(R0,St),
+	    {op,Line,Op,L1,R1}
+    end.
+
+gexpr_list([E0|Es],St) ->
+    E1 = gexpr(E0,St),
+    [E1|gexpr_list(Es,St)];
+gexpr_list([],_St) -> [].
+
+exprs([E0|Es],St) ->
+    E1 = expr(E0,St),
+    [E1|exprs(Es,St)];
+exprs([],_St) -> [].
+
+expr({var,L,V},_St) ->
+    {var,L,V};
+%     case index(V,St#pmod.parameters) of
+% 	N when N > 0 ->
+% 	    {call,L,{remote,L,{atom,L,erlang},{atom,L,element}},
+% 	     [{integer,L,N+1},{var,L,'THIS'}]};
+% 	_ ->
+% 	    {var,L,V}
+%     end;
+expr({integer,Line,I},_St) -> {integer,Line,I};
+expr({float,Line,F},_St) -> {float,Line,F};
+expr({atom,Line,A},_St) -> {atom,Line,A};
+expr({string,Line,S},_St) -> {string,Line,S};
+expr({char,Line,C},_St) -> {char,Line,C};
+expr({nil,Line},_St) -> {nil,Line};
+expr({cons,Line,H0,T0},St) ->
+    H1 = expr(H0,St),
+    T1 = expr(T0,St),
+    {cons,Line,H1,T1};
+expr({lc,Line,E0,Qs0},St) ->
+    Qs1 = lc_quals(Qs0,St),
+    E1 = expr(E0,St),
+    {lc,Line,E1,Qs1};
+expr({tuple,Line,Es0},St) ->
+    Es1 = expr_list(Es0,St),
+    {tuple,Line,Es1};
+expr({block,Line,Es0},St) ->
+    Es1 = exprs(Es0,St),
+    {block,Line,Es1};
+expr({'if',Line,Cs0},St) ->
+    Cs1 = icr_clauses(Cs0,St),
+    {'if',Line,Cs1};
+expr({'case',Line,E0,Cs0},St) ->
+    E1 = expr(E0,St),
+    Cs1 = icr_clauses(Cs0,St),
+    {'case',Line,E1,Cs1};
+expr({'receive',Line,Cs0},St) ->
+    Cs1 = icr_clauses(Cs0,St),
+    {'receive',Line,Cs1};
+expr({'receive',Line,Cs0,To0,ToEs0},St) ->
+    To1 = expr(To0,St),
+    ToEs1 = exprs(ToEs0,St),
+    Cs1 = icr_clauses(Cs0,St),
+    {'receive',Line,Cs1,To1,ToEs1};
+expr({'try',Line,Es0,Scs0,Ccs0,As0},St) ->
+    Es1 = exprs(Es0,St),
+    Scs1 = icr_clauses(Scs0,St),
+    Ccs1 = icr_clauses(Ccs0,St),
+    As1 = exprs(As0,St),
+    {'try',Line,Es1,Scs1,Ccs1,As1};
+expr({'fun',Line,Body,Info},St) ->
+    case Body of
+	{clauses,Cs0} ->
+	    Cs1 = fun_clauses(Cs0,St),
+	    {'fun',Line,{clauses,Cs1},Info};
+	{function,F,A} ->
+	    {F1,A1} = update_function_name({F,A},St),
+	    if A1 == A ->
+		    {'fun',Line,{function,F,A},Info};
+	       true ->
+		    %% Must rewrite local fun-name to a fun that does a
+		    %% call with the extra THIS parameter.
+		    As = make_vars(A, Line),
+		    As1 = As ++ [{var,Line,'THIS'}],
+		    Call = {call,Line,{atom,Line,F1},As1},
+		    Cs = [{clause,Line,As,[],[Call]}],
+		    {'fun',Line,{clauses,Cs},Info}
+	    end;
+	{function,M,F,A} ->			%This is an error in lint!
+	    {'fun',Line,{function,M,F,A},Info}
+    end;
+expr({call,Lc,{atom,_,new}=Name,As0},#pmod{parameters=Ps}=St)
+  when length(As0) =:= length(Ps) ->
+    %% The new() function does not take a 'THIS' argument (it's static).
+    As1 = expr_list(As0,St),
+    {call,Lc,Name,As1};
+expr({call,Lc,{atom,_,module_info}=Name,As0},St)
+  when length(As0) == 0; length(As0) == 1 ->
+    %% The module_info/0 and module_info/1 functions are also static.
+    As1 = expr_list(As0,St),
+    {call,Lc,Name,As1};
+expr({call,Lc,{atom,Lf,F},As0},St) ->
+    %% Local function call - needs THIS parameter.
+    As1 = expr_list(As0,St),
+    {call,Lc,{atom,Lf,F},As1 ++ [{var,0,'THIS'}]};
+expr({call,Line,F0,As0},St) ->
+    %% Other function call
+    F1 = expr(F0,St),
+    As1 = expr_list(As0,St),
+    {call,Line,F1,As1};
+expr({'catch',Line,E0},St) ->
+    E1 = expr(E0,St),
+    {'catch',Line,E1};
+expr({match,Line,P0,E0},St) ->
+    E1 = expr(E0,St),
+    P1 = pattern(P0,St),
+    {match,Line,P1,E1};
+expr({bin,Line,Fs},St) ->
+    Fs2 = pattern_grp(Fs,St),
+    {bin,Line,Fs2};
+expr({op,Line,Op,A0},St) ->
+    A1 = expr(A0,St),
+    {op,Line,Op,A1};
+expr({op,Line,Op,L0,R0},St) ->
+    L1 = expr(L0,St),
+    R1 = expr(R0,St),
+    {op,Line,Op,L1,R1};
+%% The following are not allowed to occur anywhere!
+expr({remote,Line,M0,F0},St) ->
+    M1 = expr(M0,St),
+    F1 = expr(F0,St),
+    {remote,Line,M1,F1}.
+
+expr_list([E0|Es],St) ->
+    E1 = expr(E0,St),
+    [E1|expr_list(Es,St)];
+expr_list([],_St) -> [].
+
+icr_clauses([C0|Cs],St) ->
+    C1 = clause(C0,St),
+    [C1|icr_clauses(Cs,St)];
+icr_clauses([],_St) -> [].
+
+lc_quals([{generate,Line,P0,E0}|Qs],St) ->
+    E1 = expr(E0,St),
+    P1 = pattern(P0,St),
+    [{generate,Line,P1,E1}|lc_quals(Qs,St)];
+lc_quals([E0|Qs],St) ->
+    E1 = expr(E0,St),
+    [E1|lc_quals(Qs,St)];
+lc_quals([],_St) -> [].
+
+fun_clauses([C0|Cs],St) ->
+    C1 = clause(C0,St),
+    [C1|fun_clauses(Cs,St)];
+fun_clauses([],_St) -> [].
+
+% %% Return index from 1 upwards, or 0 if not in the list.
+%
+% index(X,Ys) -> index(X,Ys,1).
+%
+% index(X,[X|Ys],A) -> A;
+% index(X,[Y|Ys],A) -> index(X,Ys,A+1);
+% index(X,[],A) -> 0.
+
+make_vars(N, L) ->
+    make_vars(1, N, L).
+
+make_vars(N, M, L) when N =< M ->
+    V = list_to_atom("X"++integer_to_list(N)),
+    [{var,L,V} | make_vars(N + 1, M, L)];
+make_vars(_, _, _) ->
+    [].
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_attributes.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_attributes.erl
new file mode 100644
index 0000000000..21d28868f0
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_attributes.erl
@@ -0,0 +1,212 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: sys_pre_attributes.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+%% Purpose : Transform Erlang compiler attributes
+
+-module(sys_pre_attributes).
+
+-export([parse_transform/2]).
+
+-define(OPTION_TAG, attributes).
+
+-record(state, {forms,
+		pre_ops = [],
+		post_ops = [],
+		options}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Inserts, deletes and replaces Erlang compiler attributes.
+%%
+%% Valid options are:
+%%
+%%    {attribute, insert,  AttrName, NewAttrVal}
+%%    {attribute, replace, AttrName, NewAttrVal}   % replace first occurrence
+%%    {attribute, delete,  AttrName}
+%%
+%% The transformation is performed in two passes:
+%%
+%% pre_transform
+%% -------------
+%% Searches for attributes in the list of Forms in order to
+%% delete or replace them. 'delete' will delete all occurrences
+%% of attributes with the given name. 'replace' will replace the
+%% first occurrence of the attribute. This pass is will only be
+%% performed if there are replace or delete operations stated
+%% as options.
+%%
+%% post_transform
+%% -------------
+%% Looks up the module attribute and inserts the new attributes
+%% directly after. This pass will only be performed if there are
+%% any attributes left to be inserted after pre_transform. The left
+%% overs will be those replace operations that not has been performed
+%% due to that the pre_transform pass did not find the attribute plus
+%% all insert operations.
+
+parse_transform(Forms, Options) ->
+    S = #state{forms = Forms, options = Options},
+    S2 = init_transform(S),
+    report_verbose("Pre  options: ~p~n", [S2#state.pre_ops], S2),
+    report_verbose("Post options: ~p~n", [S2#state.post_ops], S2),
+    S3 = pre_transform(S2),
+    S4 = post_transform(S3),
+    S4#state.forms.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Computes the lists of pre_ops and post_ops that are
+%% used in the real transformation.
+init_transform(S) ->
+    case S#state.options of
+	Options when list(Options) ->
+	    init_transform(Options, S);
+	Option ->
+	    init_transform([Option], S)
+    end.
+
+init_transform([{attribute, insert, Name, Val} | Tail], S) ->
+    Op = {insert, Name, Val},
+    PostOps = [Op | S#state.post_ops],
+    init_transform(Tail, S#state{post_ops = PostOps});
+init_transform([{attribute, replace, Name, Val} | Tail], S) ->
+    Op = {replace, Name, Val},
+    PreOps = [Op | S#state.pre_ops],
+    PostOps = [Op | S#state.post_ops],
+    init_transform(Tail, S#state{pre_ops = PreOps, post_ops = PostOps});
+init_transform([{attribute, delete, Name} | Tail], S) ->
+    Op = {delete, Name},
+    PreOps = [Op | S#state.pre_ops],
+    init_transform(Tail, S#state{pre_ops = PreOps});
+init_transform([], S) ->
+    S;
+init_transform([_ | T], S) ->
+    init_transform(T, S);
+init_transform(BadOpt, S) ->
+    report_error("Illegal option (ignored): ~p~n", [BadOpt], S),
+    S.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Handle delete and perhaps replace
+
+pre_transform(S) when S#state.pre_ops == [] ->
+    S;
+pre_transform(S) ->
+    pre_transform(S#state.forms, [], S).
+
+pre_transform([H | T], Acc, S) ->
+    case H of
+	{attribute, Line, Name, Val} ->
+	    case lists:keysearch(Name, 2, S#state.pre_ops) of
+		false ->
+		    pre_transform(T, [H | Acc], S);
+
+		{value, {replace, Name, NewVal}} ->
+		    report_warning("Replace attribute ~p: ~p -> ~p~n",
+				   [Name, Val, NewVal],
+				   S),
+		    New = {attribute, Line, Name, NewVal},
+		    Pre = lists:keydelete(Name, 2, S#state.pre_ops),
+		    Post = lists:keydelete(Name, 2, S#state.post_ops),
+		    S2 = S#state{pre_ops = Pre, post_ops = Post},
+		    if
+			Pre == [] ->
+			    %% No need to search the rest of the Forms
+			    Forms = lists:reverse(Acc, [New | T]),
+			    S2#state{forms = Forms};
+			true ->
+			    pre_transform(T, [New | Acc], S2)
+		    end;
+
+		{value, {delete, Name}} ->
+		    report_warning("Delete attribute ~p: ~p~n",
+				   [Name, Val],
+				   S),
+		    pre_transform(T, Acc, S)
+	    end;
+	_Any ->
+	    pre_transform(T, [H | Acc], S)
+    end;
+pre_transform([], Acc, S) ->
+    S#state{forms = lists:reverse(Acc)}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Handle insert and perhaps replace
+
+post_transform(S) when S#state.post_ops == [] ->
+    S;
+post_transform(S) ->
+    post_transform(S#state.forms, [], S).
+
+post_transform([H | T], Acc, S) ->
+    case H of
+	{attribute, Line, module, Val} ->
+	    Acc2 = lists:reverse([{attribute, Line, module, Val} | Acc]),
+	    Forms = Acc2 ++ attrs(S#state.post_ops, Line, S) ++ T,
+	    S#state{forms = Forms, post_ops = []};
+	_Any ->
+	    post_transform(T, [H | Acc], S)
+    end;
+post_transform([], Acc, S) ->
+    S#state{forms = lists:reverse(Acc)}.
+
+attrs([{replace, Name, NewVal} | T], Line, S) ->
+    report_verbose("Insert attribute ~p: ~p~n", [Name, NewVal], S),
+    [{attribute, Line, Name, NewVal} | attrs(T, Line, S)];
+attrs([{insert, Name, NewVal} | T], Line, S) ->
+    report_verbose("Insert attribute ~p: ~p~n", [Name, NewVal], S),
+    [{attribute, Line, Name, NewVal} | attrs(T, Line, S)];
+attrs([], _, _) ->
+    [].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Report functions.
+%%
+%% Errors messages are controlled with the 'report_errors' compiler option
+%% Warning messages are controlled with the 'report_warnings' compiler option
+%% Verbose messages are controlled with the 'verbose' compiler option
+
+report_error(Format, Args, S) ->
+    case is_error(S) of
+	true ->
+	    io:format("~p: * ERROR * " ++ Format, [?MODULE | Args]);
+	false ->
+	    ok
+    end.
+
+report_warning(Format, Args, S) ->
+    case is_warning(S) of
+	true ->
+	    io:format("~p: * WARNING * " ++ Format, [?MODULE | Args]);
+	false ->
+	    ok
+    end.
+
+report_verbose(Format, Args, S) ->
+    case is_verbose(S) of
+	true ->
+	    io:format("~p: " ++ Format, [?MODULE | Args]);
+	false ->
+	    ok
+    end.
+
+is_error(S) ->
+    lists:member(report_errors, S#state.options) or is_verbose(S).
+
+is_warning(S) ->
+    lists:member(report_warnings, S#state.options) or is_verbose(S).
+
+is_verbose(S) ->
+    lists:member(verbose, S#state.options).
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl
new file mode 100644
index 0000000000..08bc6cb147
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl
@@ -0,0 +1,1026 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: sys_pre_expand.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+%% Purpose : Expand some source Erlang constructions. This is part of the
+%%           pre-processing phase.
+
+%% N.B. Although structs (tagged tuples) are not yet allowed in the
+%% language there is code included in pattern/2 and expr/3 (commented out)
+%% that handles them by transforming them to tuples.
+
+-module(sys_pre_expand).
+
+%% Main entry point.
+-export([module/2]).
+
+-import(ordsets, [from_list/1,add_element/2,
+		  union/1,union/2,intersection/1,intersection/2,subtract/2]).
+-import(lists,   [member/2,map/2,foldl/3,foldr/3,sort/1,reverse/1,duplicate/2]).
+
+-include("../my_include/erl_bits.hrl").
+
+-record(expand, {module=[],			%Module name
+		 parameters=undefined,		%Module parameters
+		 package="",			%Module package
+		 exports=[],			%Exports
+		 imports=[],			%Imports
+		 mod_imports,			%Module Imports
+		 compile=[],			%Compile flags
+		 records=dict:new(),		%Record definitions
+		 attributes=[],			%Attributes
+		 defined=[],			%Defined functions
+		 vcount=0,			%Variable counter
+		 func=[],			%Current function
+		 arity=[],			%Arity for current function
+		 fcount=0,			%Local fun count
+		 fun_index=0,			%Global index for funs
+		 bitdefault,
+		 bittypes
+		}).
+
+%% module(Forms, CompileOptions)
+%%	{ModuleName,Exports,TransformedForms}
+%%  Expand the forms in one module. N.B.: the lists of predefined
+%%  exports and imports are really ordsets!
+
+module(Fs, Opts) ->
+    %% Set pre-defined exported functions.
+    PreExp = [{module_info,0},{module_info,1}],
+
+    %% Set pre-defined module imports.
+    PreModImp = [{erlang,erlang},{packages,packages}],
+
+    %% Build initial expand record.
+    St0 = #expand{exports=PreExp,
+		  mod_imports=dict:from_list(PreModImp),
+		  compile=Opts,
+		  defined=PreExp,
+		  bitdefault = erl_bits:system_bitdefault(),
+		  bittypes = erl_bits:system_bittypes()
+		 },
+    %% Expand the functions.
+    {Tfs,St1} = forms(Fs, foldl(fun define_function/2, St0, Fs)),
+    {Efs,St2} = expand_pmod(Tfs, St1),
+    %% Get the correct list of exported functions.
+    Exports = case member(export_all, St2#expand.compile) of
+		  true -> St2#expand.defined;
+		  false -> St2#expand.exports
+	      end,
+    %% Generate all functions from stored info.
+    {Ats,St3} = module_attrs(St2#expand{exports = Exports}),
+    {Mfs,St4} = module_predef_funcs(St3),
+    {St4#expand.module, St4#expand.exports, Ats ++ Efs ++ Mfs,
+     St4#expand.compile}.
+
+expand_pmod(Fs0, St) ->
+    case St#expand.parameters of
+	undefined ->
+	    {Fs0,St};
+	Ps ->
+	    {Fs1,Xs,Ds} = sys_expand_pmod:forms(Fs0, Ps,
+						St#expand.exports,
+						St#expand.defined),
+	    A = length(Ps),
+	    Vs = [{var,0,V} || V <- Ps],
+	    N = {atom,0,St#expand.module},
+	    B = [{tuple,0,[N|Vs]}],
+	    F = {function,0,new,A,[{clause,0,Vs,[],B}]},
+	    As = St#expand.attributes,
+	    {[F|Fs1],St#expand{exports=add_element({new,A}, Xs),
+			       defined=add_element({new,A}, Ds),
+			       attributes = [{abstract, true} | As]}}
+    end.
+
+%% -type define_function(Form, State) -> State.
+%%  Add function to defined if form a function.
+
+define_function({function,_,N,A,_Cs}, St) ->
+    St#expand{defined=add_element({N,A}, St#expand.defined)};
+define_function(_, St) -> St.
+
+module_attrs(St) ->
+    {[{attribute,0,Name,Val} || {Name,Val} <- St#expand.attributes],St}.
+
+module_predef_funcs(St) ->
+    PreDef = [{module_info,0},{module_info,1}],
+    PreExp = PreDef,
+    {[{function,0,module_info,0,
+       [{clause,0,[],[],
+        [{call,0,{remote,0,{atom,0,erlang},{atom,0,get_module_info}},
+          [{atom,0,St#expand.module}]}]}]},
+      {function,0,module_info,1,
+       [{clause,0,[{var,0,'X'}],[],
+        [{call,0,{remote,0,{atom,0,erlang},{atom,0,get_module_info}},
+          [{atom,0,St#expand.module},{var,0,'X'}]}]}]}],
+     St#expand{defined=union(from_list(PreDef), St#expand.defined),
+	       exports=union(from_list(PreExp), St#expand.exports)}}.
+
+%% forms(Forms, State) ->
+%%	{TransformedForms,State'}
+%%  Process the forms. Attributes are lost and just affect the state.
+%%  Ignore uninteresting forms like eof and type.
+
+forms([{attribute,_,Name,Val}|Fs0], St0) ->
+    St1 = attribute(Name, Val, St0),
+    forms(Fs0, St1);
+forms([{function,L,N,A,Cs}|Fs0], St0) ->
+    {Ff,St1} = function(L, N, A, Cs, St0),
+    {Fs,St2} = forms(Fs0, St1),
+    {[Ff|Fs],St2};
+forms([_|Fs], St) -> forms(Fs, St);
+forms([], St) -> {[],St}.
+
+%% -type attribute(Attribute, Value, State) ->
+%%	State.
+%%  Process an attribute, this just affects the state.
+
+attribute(module, {Module, As}, St) ->
+    M = package_to_string(Module),
+    St#expand{module=list_to_atom(M),
+	      package = packages:strip_last(M),
+	      parameters=As};
+attribute(module, Module, St) ->
+    M = package_to_string(Module),
+    St#expand{module=list_to_atom(M),
+	      package = packages:strip_last(M)};
+attribute(export, Es, St) ->
+    St#expand{exports=union(from_list(Es), St#expand.exports)};
+attribute(import, Is, St) ->
+    import(Is, St);
+attribute(compile, C, St) when list(C) ->
+    St#expand{compile=St#expand.compile ++ C};
+attribute(compile, C, St) ->
+    St#expand{compile=St#expand.compile ++ [C]};
+attribute(record, {Name,Defs}, St) ->
+    St#expand{records=dict:store(Name, normalise_fields(Defs),
+				 St#expand.records)};
+attribute(file, _File, St) -> St;		%This is ignored
+attribute(Name, Val, St) when list(Val) ->
+    St#expand{attributes=St#expand.attributes ++ [{Name,Val}]};
+attribute(Name, Val, St) ->
+    St#expand{attributes=St#expand.attributes ++ [{Name,[Val]}]}.
+
+function(L, N, A, Cs0, St0) ->
+    {Cs,St} = clauses(Cs0, St0#expand{func=N,arity=A,fcount=0}),
+    {{function,L,N,A,Cs},St}.
+
+%% -type clauses([Clause], State) ->
+%%	{[TransformedClause],State}.
+%%  Expand function clauses.
+
+clauses([{clause,Line,H0,G0,B0}|Cs0], St0) ->
+    {H,Hvs,_Hus,St1} = head(H0, St0),
+    {G,Gvs,_Gus,St2} = guard(G0, Hvs, St1),
+    {B,_Bvs,_Bus,St3} = exprs(B0, union(Hvs, Gvs), St2),
+    {Cs,St4} = clauses(Cs0, St3),
+    {[{clause,Line,H,G,B}|Cs],St4};
+clauses([], St) -> {[],St}.
+
+%% head(HeadPatterns, State) ->
+%%	{TransformedPatterns,Variables,UsedVariables,State'}
+
+head(As, St) -> pattern_list(As, St).
+
+%% pattern(Pattern, State) ->
+%%	{TransformedPattern,Variables,UsedVariables,State'}
+%% BITS: added used variables for bit patterns with varaible length
+%%
+
+pattern({var,_,'_'}=Var, St) ->			%Ignore anonymous variable.
+    {Var,[],[],St};
+pattern({var,_,V}=Var, St) ->
+    {Var,[V],[],St};
+pattern({char,_,_}=Char, St) ->
+    {Char,[],[],St};
+pattern({integer,_,_}=Int, St) ->
+    {Int,[],[],St};
+pattern({float,_,_}=Float, St) ->
+    {Float,[],[],St};
+pattern({atom,_,_}=Atom, St) ->
+    {Atom,[],[],St};
+pattern({string,_,_}=String, St) ->
+    {String,[],[],St};
+pattern({nil,_}=Nil, St) ->
+    {Nil,[],[],St};
+pattern({cons,Line,H,T}, St0) ->
+    {TH,THvs,Hus,St1} = pattern(H, St0),
+    {TT,TTvs,Tus,St2} = pattern(T, St1),
+    {{cons,Line,TH,TT},union(THvs, TTvs),union(Hus,Tus),St2};
+pattern({tuple,Line,Ps}, St0) ->
+    {TPs,TPsvs,Tus,St1} = pattern_list(Ps, St0),
+    {{tuple,Line,TPs},TPsvs,Tus,St1};
+%%pattern({struct,Line,Tag,Ps}, St0) ->
+%%    {TPs,TPsvs,St1} = pattern_list(Ps, St0),
+%%    {{tuple,Line,[{atom,Line,Tag}|TPs]},TPsvs,St1};
+pattern({record_field,_,_,_}=M, St) ->
+    {expand_package(M, St), [], [], St};  % must be a package name
+pattern({record_index,Line,Name,Field}, St) ->
+    {index_expr(Line, Field, Name, record_fields(Name, St)),[],[],St};
+pattern({record,Line,Name,Pfs}, St0) ->
+    Fs = record_fields(Name, St0),
+    {TMs,TMsvs,Us,St1} = pattern_list(pattern_fields(Fs, Pfs), St0),
+    {{tuple,Line,[{atom,Line,Name}|TMs]},TMsvs,Us,St1};
+pattern({bin,Line,Es0}, St0) ->
+    {Es1,Esvs,Esus,St1} = pattern_bin(Es0, St0),
+    {{bin,Line,Es1},Esvs,Esus,St1};
+pattern({op,_,'++',{nil,_},R}, St) ->
+    pattern(R, St);
+pattern({op,_,'++',{cons,Li,H,T},R}, St) ->
+    pattern({cons,Li,H,{op,Li,'++',T,R}}, St);
+pattern({op,_,'++',{string,Li,L},R}, St) ->
+    pattern(string_to_conses(Li, L, R), St);
+pattern({match,Line,Pat1, Pat2}, St0) ->
+    {TH,Hvt,Hus,St1} = pattern(Pat2, St0),
+    {TT,Tvt,Tus,St2} = pattern(Pat1, St1),
+    {{match,Line,TT,TH}, union(Hvt,Tvt), union(Hus,Tus), St2};
+%% Compile-time pattern expressions, including unary operators.
+pattern({op,Line,Op,A}, St) ->
+    { erl_eval:partial_eval({op,Line,Op,A}), [], [], St};
+pattern({op,Line,Op,L,R}, St) ->
+    { erl_eval:partial_eval({op,Line,Op,L,R}), [], [], St}.
+
+pattern_list([P0|Ps0], St0) ->
+    {P,Pvs,Pus,St1} = pattern(P0, St0),
+    {Ps,Psvs,Psus,St2} = pattern_list(Ps0, St1),
+    {[P|Ps],union(Pvs, Psvs),union(Pus, Psus),St2};
+pattern_list([], St) -> {[],[],[],St}.
+
+%% guard(Guard, VisibleVariables, State) ->
+%%	{TransformedGuard,NewVariables,UsedVariables,State'}
+%%  Transform a list of guard tests. We KNOW that this has been checked
+%%  and what the guards test are. Use expr for transforming the guard
+%%  expressions.
+
+guard([G0|Gs0], Vs, St0) ->
+    {G,Hvs,Hus,St1} = guard_tests(G0, Vs, St0),
+    {Gs,Tvs,Tus,St2} = guard(Gs0, Vs, St1),
+    {[G|Gs],union(Hvs, Tvs),union(Hus, Tus),St2};
+guard([], _, St) -> {[],[],[],St}.
+
+guard_tests([Gt0|Gts0], Vs, St0) ->
+    {Gt1,Gvs,Gus,St1} = guard_test(Gt0, Vs, St0),
+    {Gts1,Gsvs,Gsus,St2} = guard_tests(Gts0, union(Gvs, Vs), St1),
+    {[Gt1|Gts1],union(Gvs, Gsvs),union(Gus, Gsus),St2};
+guard_tests([], _, St) -> {[],[],[],St}.
+
+guard_test({call,Line,{atom,_,record},[A,{atom,_,Name}]}, Vs, St) ->
+    record_test_in_guard(Line, A, Name, Vs, St);
+guard_test({call,Line,{atom,Lt,Tname},As}, Vs, St) ->
+    %% XXX This is ugly. We can remove this workaround if/when
+    %% we'll allow 'andalso' in guards. For now, we must have
+    %% different code in guards and in bodies.
+    Test = {remote,Lt,
+	    {atom,Lt,erlang},
+	    {atom,Lt,normalise_test(Tname, length(As))}},
+    put(sys_pre_expand_in_guard, yes),
+    R = expr({call,Line,Test,As}, Vs, St),
+    erase(sys_pre_expand_in_guard),
+    R;
+guard_test(Test, Vs, St) ->
+    %% XXX See the previous clause.
+    put(sys_pre_expand_in_guard, yes),
+    R = expr(Test, Vs, St),
+    erase(sys_pre_expand_in_guard),
+    R.
+
+%% record_test(Line, Term, Name, Vs, St) -> TransformedExpr
+%%  Generate code for is_record/1.
+
+record_test(Line, Term, Name, Vs, St) ->
+    case get(sys_pre_expand_in_guard) of
+	undefined ->
+	    record_test_in_body(Line, Term, Name, Vs, St);
+	yes ->
+	    record_test_in_guard(Line, Term, Name, Vs, St)
+    end.
+
+record_test_in_guard(Line, Term, Name, Vs, St) ->
+    %% Notes: (1) To keep is_record/3 properly atomic (e.g. when inverted
+    %%            using 'not'), we cannot convert it to an instruction
+    %%            sequence here. It must remain a single call.
+    %%        (2) Later passes assume that the last argument (the size)
+    %%            is a literal.
+    %%        (3) We don't want calls to erlang:is_record/3 (in the source code)
+    %%            confused we the internal instruction. (Reason: (2) above +
+    %%            code bloat.)
+    %%        (4) Xref may be run on the abstract code, so the name in the
+    %%            abstract code must be erlang:is_record/3.
+    %%        (5) To achive both (3) and (4) at the same time, set the name
+    %%            here to erlang:is_record/3, but mark it as compiler-generated.
+    %%            The v3_core pass will change the name to erlang:internal_is_record/3.
+    Fs = record_fields(Name, St),
+    expr({call,-Line,{remote,-Line,{atom,-Line,erlang},{atom,-Line,is_record}},
+	  [Term,{atom,Line,Name},{integer,Line,length(Fs)+1}]},
+	 Vs, St).
+
+record_test_in_body(Line, Expr, Name, Vs, St0) ->
+    %% As Expr may have side effects, we must evaluate it
+    %% first and bind the value to a new variable.
+    %% We must use also handle the case that Expr does not
+    %% evaluate to a tuple properly.
+    Fs = record_fields(Name, St0),
+    {Var,St} = new_var(Line, St0),
+
+    expr({block,Line,
+	  [{match,Line,Var,Expr},
+	   {op,Line,
+	    'andalso',
+	    {call,Line,{atom,Line,is_tuple},[Var]},
+	    {op,Line,'andalso',
+	     {op,Line,'=:=',
+	      {call,Line,{atom,Line,size},[Var]},
+	      {integer,Line,length(Fs)+1}},
+	     {op,Line,'=:=',
+	      {call,Line,{atom,Line,element},[{integer,Line,1},Var]},
+	      {atom,Line,Name}}}}]}, Vs, St).
+
+normalise_test(atom, 1)      -> is_atom;
+normalise_test(binary, 1)    -> is_binary;
+normalise_test(constant, 1)  -> is_constant;
+normalise_test(float, 1)     -> is_float;
+normalise_test(function, 1)  -> is_function;
+normalise_test(integer, 1)   -> is_integer;
+normalise_test(list, 1)      -> is_list;
+normalise_test(number, 1)    -> is_number;
+normalise_test(pid, 1)       -> is_pid;
+normalise_test(port, 1)      -> is_port;
+normalise_test(reference, 1) -> is_reference;
+normalise_test(tuple, 1)     -> is_tuple;
+normalise_test(Name, _) -> Name.
+
+%% exprs(Expressions, VisibleVariables, State) ->
+%%	{TransformedExprs,NewVariables,UsedVariables,State'}
+
+exprs([E0|Es0], Vs, St0) ->
+    {E,Evs,Eus,St1} = expr(E0, Vs, St0),
+    {Es,Esvs,Esus,St2} = exprs(Es0, union(Evs, Vs), St1),
+    {[E|Es],union(Evs, Esvs),union(Eus, Esus),St2};
+exprs([], _, St) -> {[],[],[],St}.
+
+%% expr(Expression, VisibleVariables, State) ->
+%%	{TransformedExpression,NewVariables,UsedVariables,State'}
+
+expr({var,_,V}=Var, _Vs, St) ->
+    {Var,[],[V],St};
+expr({char,_,_}=Char, _Vs, St) ->
+    {Char,[],[],St};
+expr({integer,_,_}=Int, _Vs, St) ->
+    {Int,[],[],St};
+expr({float,_,_}=Float, _Vs, St) ->
+    {Float,[],[],St};
+expr({atom,_,_}=Atom, _Vs, St) ->
+    {Atom,[],[],St};
+expr({string,_,_}=String, _Vs, St) ->
+    {String,[],[],St};
+expr({nil,_}=Nil, _Vs, St) ->
+    {Nil,[],[],St};
+expr({cons,Line,H0,T0}, Vs, St0) ->
+    {H,Hvs,Hus,St1} = expr(H0, Vs, St0),
+    {T,Tvs,Tus,St2} = expr(T0, Vs, St1),
+    {{cons,Line,H,T},union(Hvs, Tvs),union(Hus, Tus),St2};
+expr({lc,Line,E0,Qs0}, Vs, St0) ->
+    {E1,Qs1,_,Lvs,Lus,St1} = lc_tq(Line, E0, Qs0, {nil,Line}, Vs, St0),
+    {{lc,Line,E1,Qs1},Lvs,Lus,St1};
+expr({tuple,Line,Es0}, Vs, St0) ->
+    {Es1,Esvs,Esus,St1} = expr_list(Es0, Vs, St0),
+    {{tuple,Line,Es1},Esvs,Esus,St1};
+%%expr({struct,Line,Tag,Es0}, Vs, St0) ->
+%%    {Es1,Esvs,Esus,St1} = expr_list(Es0, Vs, St0),
+%%    {{tuple,Line,[{atom,Line,Tag}|Es1]},Esvs,Esus,St1};
+expr({record_field,_,_,_}=M, _Vs, St) ->
+    {expand_package(M, St), [], [], St};  % must be a package name
+expr({record_index,Line,Name,F}, Vs, St) ->
+    I = index_expr(Line, F, Name, record_fields(Name, St)),
+    expr(I, Vs, St);
+expr({record,Line,Name,Is}, Vs, St) ->
+    expr({tuple,Line,[{atom,Line,Name}|
+		      record_inits(record_fields(Name, St), Is)]},
+	 Vs, St);
+expr({record_field,Line,R,Name,F}, Vs, St) ->
+    I = index_expr(Line, F, Name, record_fields(Name, St)),
+    expr({call,Line,{atom,Line,element},[I,R]}, Vs, St);
+expr({record,_,R,Name,Us}, Vs, St0) ->
+    {Ue,St1} = record_update(R, Name, record_fields(Name, St0), Us, St0),
+    expr(Ue, Vs, St1);
+expr({bin,Line,Es0}, Vs, St0) ->
+    {Es1,Esvs,Esus,St1} = expr_bin(Es0, Vs, St0),
+    {{bin,Line,Es1},Esvs,Esus,St1};
+expr({block,Line,Es0}, Vs, St0) ->
+    {Es,Esvs,Esus,St1} = exprs(Es0, Vs, St0),
+    {{block,Line,Es},Esvs,Esus,St1};
+expr({'if',Line,Cs0}, Vs, St0) ->
+    {Cs,Csvss,Csuss,St1} = icr_clauses(Cs0, Vs, St0),
+    All = new_in_all(Vs, Csvss),
+    {{'if',Line,Cs},All,union(Csuss),St1};
+expr({'case',Line,E0,Cs0}, Vs, St0) ->
+    {E,Evs,Eus,St1} = expr(E0, Vs, St0),
+    {Cs,Csvss,Csuss,St2} = icr_clauses(Cs0, union(Evs, Vs), St1),
+    All = new_in_all(Vs, Csvss),
+    {{'case',Line,E,Cs},union(Evs, All),union([Eus|Csuss]),St2};
+expr({'cond',Line,Cs}, Vs, St0) ->
+    {V,St1} = new_var(Line,St0),
+    expr(cond_clauses(Cs,V), Vs, St1);
+expr({'receive',Line,Cs0}, Vs, St0) ->
+    {Cs,Csvss,Csuss,St1} = icr_clauses(Cs0, Vs, St0),
+    All = new_in_all(Vs, Csvss),
+    {{'receive',Line,Cs},All,union(Csuss),St1};
+expr({'receive',Line,Cs0,To0,ToEs0}, Vs, St0) ->
+    {To,Tovs,Tous,St1} = expr(To0, Vs, St0),
+    {ToEs,ToEsvs,_ToEsus,St2} = exprs(ToEs0, Vs, St1),
+    {Cs,Csvss,Csuss,St3} = icr_clauses(Cs0, Vs, St2),
+    All = new_in_all(Vs, [ToEsvs|Csvss]),
+    {{'receive',Line,Cs,To,ToEs},union(Tovs, All),union([Tous|Csuss]),St3};
+expr({'fun',Line,Body}, Vs, St) ->
+    fun_tq(Line, Body, Vs, St);
+%%% expr({call,_,{atom,La,this_module},[]}, _Vs, St) ->
+%%%     {{atom,La,St#expand.module}, [], [], St};
+%%% expr({call,_,{atom,La,this_package},[]}, _Vs, St) ->
+%%%     {{atom,La,list_to_atom(St#expand.package)}, [], [], St};
+%%% expr({call,_,{atom,La,this_package},[{atom,_,Name}]}, _Vs, St) ->
+%%%     M = packages:concat(St#expand.package,Name),
+%%%     {{atom,La,list_to_atom(M)}, [], [], St};
+%%% expr({call,Line,{atom,La,this_package},[A]}, Vs, St) ->
+%%%     M = {call,Line,{remote,La,{atom,La,packages},{atom,La,concat}},
+%%% 	 [{string,La,St#expand.package}, A]},
+%%%     expr({call,Line,{atom,Line,list_to_atom},[M]}, Vs, St);
+expr({call,Line,{atom,_,is_record},[A,{atom,_,Name}]}, Vs, St) ->
+    record_test(Line, A, Name, Vs, St);
+expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,is_record}},
+      [A,{atom,_,Name}]}, Vs, St) ->
+    record_test(Line, A, Name, Vs, St);
+expr({call,Line,{atom,La,N},As0}, Vs, St0) ->
+    {As,Asvs,Asus,St1} = expr_list(As0, Vs, St0),
+    Ar = length(As),
+    case erl_internal:bif(N, Ar) of
+	true ->
+	    {{call,Line,{remote,La,{atom,La,erlang},{atom,La,N}},As},
+	     Asvs,Asus,St1};
+	false ->
+	    case imported(N, Ar, St1) of
+		{yes,Mod} ->
+		    {{call,Line,{remote,La,{atom,La,Mod},{atom,La,N}},As},
+		     Asvs,Asus,St1};
+		no ->
+		    case {N,Ar} of
+			{record_info,2} ->
+			    record_info_call(Line, As, St1);
+			_ ->
+			    {{call,Line,{atom,La,N},As},Asvs,Asus,St1}
+		    end
+	    end
+    end;
+expr({call,Line,{record_field,_,_,_}=M,As0}, Vs, St0) ->
+    expr({call,Line,expand_package(M, St0),As0}, Vs, St0);
+expr({call,Line,{remote,Lr,M,F},As0}, Vs, St0) ->
+    M1 = expand_package(M, St0),
+    {[M2,F1|As1],Asvs,Asus,St1} = expr_list([M1,F|As0], Vs, St0),
+    {{call,Line,{remote,Lr,M2,F1},As1},Asvs,Asus,St1};
+expr({call,Line,{tuple,_,[{atom,_,_}=M,{atom,_,_}=F]},As}, Vs, St) ->
+    %% Rewrite {Mod,Function}(Args...) to Mod:Function(Args...).
+    expr({call,Line,{remote,Line,M,F},As}, Vs, St);
+expr({call,Line,F,As0}, Vs, St0) ->
+    {[Fun1|As1],Asvs,Asus,St1} = expr_list([F|As0], Vs, St0),
+    {{call,Line,Fun1,As1},Asvs,Asus,St1};
+expr({'try',Line,Es0,Scs0,Ccs0,As0}, Vs, St0) ->
+    {Es1,Esvs,Esus,St1} = exprs(Es0, Vs, St0),
+    Cvs = union(Esvs, Vs),
+    {Scs1,Scsvss,Scsuss,St2} = icr_clauses(Scs0, Cvs, St1),
+    {Ccs1,Ccsvss,Ccsuss,St3} = icr_clauses(Ccs0, Cvs, St2),
+    Csvss = Scsvss ++ Ccsvss,
+    Csuss = Scsuss ++ Ccsuss,
+    All = new_in_all(Vs, Csvss),
+    {As1,Asvs,Asus,St4} = exprs(As0, Cvs, St3),
+    {{'try',Line,Es1,Scs1,Ccs1,As1}, union([Asvs,Esvs,All]),
+     union([Esus,Asus|Csuss]), St4};
+expr({'catch',Line,E0}, Vs, St0) ->
+    %% Catch exports no new variables.
+    {E,_Evs,Eus,St1} = expr(E0, Vs, St0),
+    {{'catch',Line,E},[],Eus,St1};
+expr({match,Line,P0,E0}, Vs, St0) ->
+    {E,Evs,Eus,St1} = expr(E0, Vs, St0),
+    {P,Pvs,Pus,St2} = pattern(P0, St1),
+    {{match,Line,P,E},
+     union(subtract(Pvs, Vs), Evs),
+     union(intersection(Pvs, Vs), union(Eus,Pus)),St2};
+expr({op,L,'andalso',E1,E2}, Vs, St0) ->
+    {V,St1} = new_var(L,St0),
+    E = make_bool_switch(L,E1,V,
+			 make_bool_switch(L,E2,V,{atom,L,true},
+					  {atom,L,false}),
+			 {atom,L,false}),
+    expr(E, Vs, St1);
+expr({op,L,'orelse',E1,E2}, Vs, St0) ->
+    {V,St1} = new_var(L,St0),
+    E = make_bool_switch(L,E1,V,{atom,L,true},
+			 make_bool_switch(L,E2,V,{atom,L,true},
+					  {atom,L,false})),
+    expr(E, Vs, St1);
+expr({op,Line,'++',{lc,Ll,E0,Qs0},M0}, Vs, St0) ->
+    {E1,Qs1,M1,Lvs,Lus,St1} = lc_tq(Ll, E0, Qs0, M0, Vs, St0),
+    {{op,Line,'++',{lc,Ll,E1,Qs1},M1},Lvs,Lus,St1};
+expr({op,_,'++',{string,L1,S1},{string,_,S2}}, _Vs, St) ->
+    {{string,L1,S1 ++ S2},[],[],St};
+expr({op,Ll,'++',{string,L1,S1}=Str,R0}, Vs, St0) ->
+    {R1,Rvs,Rus,St1} = expr(R0, Vs, St0),
+    E = case R1 of
+	    {string,_,S2} -> {string,L1,S1 ++ S2};
+	    _Other when length(S1) < 8 -> string_to_conses(L1, S1, R1);
+	    _Other -> {op,Ll,'++',Str,R1}
+	end,
+    {E,Rvs,Rus,St1};
+expr({op,Ll,'++',{cons,Lc,H,T},L2}, Vs, St) ->
+    expr({cons,Ll,H,{op,Lc,'++',T,L2}}, Vs, St);
+expr({op,_,'++',{nil,_},L2}, Vs, St) ->
+    expr(L2, Vs, St);
+expr({op,Line,Op,A0}, Vs, St0) ->
+    {A,Avs,Aus,St1} = expr(A0, Vs, St0),
+    {{op,Line,Op,A},Avs,Aus,St1};
+expr({op,Line,Op,L0,R0}, Vs, St0) ->
+    {L,Lvs,Lus,St1} = expr(L0, Vs, St0),
+    {R,Rvs,Rus,St2} = expr(R0, Vs, St1),
+    {{op,Line,Op,L,R},union(Lvs, Rvs),union(Lus, Rus),St2}.
+
+expr_list([E0|Es0], Vs, St0) ->
+    {E,Evs,Eus,St1} = expr(E0, Vs, St0),
+    {Es,Esvs,Esus,St2} = expr_list(Es0, Vs, St1),
+    {[E|Es],union(Evs, Esvs),union(Eus, Esus),St2};
+expr_list([], _, St) ->
+    {[],[],[],St}.
+
+%% icr_clauses([Clause], [VisibleVariable], State) ->
+%%	{[TransformedClause],[[NewVariable]],[[UsedVariable]],State'}
+%%  Be very careful here to return the variables that are really used
+%%  and really new.
+
+icr_clauses([], _, St) ->
+    {[],[[]],[],St};
+icr_clauses(Clauses, Vs, St) ->
+    icr_clauses2(Clauses, Vs, St).
+
+icr_clauses2([{clause,Line,H0,G0,B0}|Cs0], Vs, St0) ->
+    {H,Hvs,Hus,St1} = head(H0, St0),		%Hvs is really used!
+    {G,Gvs,Gus,St2} = guard(G0, union(Hvs, Vs), St1),
+    {B,Bvs,Bus,St3} = exprs(B0, union([Vs,Hvs,Gvs]), St2),
+    New = subtract(union([Hvs,Gvs,Bvs]), Vs),	%Really new
+    Used = intersection(union([Hvs,Hus,Gus,Bus]), Vs), %Really used
+    {Cs,Csvs,Csus,St4} = icr_clauses2(Cs0, Vs, St3),
+    {[{clause,Line,H,G,B}|Cs],[New|Csvs],[Used|Csus],St4};
+icr_clauses2([], _, St) ->
+    {[],[],[],St}.
+
+%% lc_tq(Line, Expr, Qualifiers, More, [VisibleVar], State) ->
+%%	{TransExpr,[TransQual],TransMore,[NewVar],[UsedVar],State'}
+
+lc_tq(Line, E0, [{generate,Lg,P0,G0}|Qs0], M0, Vs, St0) ->
+    {G1,Gvs,Gus,St1} = expr(G0, Vs, St0),
+    {P1,Pvs,Pus,St2} = pattern(P0, St1),
+    {E1,Qs1,M1,Lvs,Lus,St3} = lc_tq(Line, E0, Qs0, M0, union(Pvs, Vs), St2),
+    {E1,[{generate,Lg,P1,G1}|Qs1],M1,
+     union(Gvs, Lvs),union([Gus,Pus,Lus]),St3};
+lc_tq(Line, E0, [F0|Qs0], M0, Vs, St0) ->
+    %% Allow record/2 and expand out as guard test.
+    case erl_lint:is_guard_test(F0) of
+	true ->
+	    {F1,Fvs,_Fus,St1} = guard_tests([F0], Vs, St0),
+	    {E1,Qs1,M1,Lvs,Lus,St2} = lc_tq(Line, E0, Qs0, M0, union(Fvs, Vs), St1),
+	    {E1,F1++Qs1,M1,Lvs,Lus,St2};
+	false ->
+	    {F1,Fvs,_Fus,St1} = expr(F0, Vs, St0),
+	    {E1,Qs1,M1,Lvs,Lus,St2} = lc_tq(Line, E0, Qs0, M0, union(Fvs, Vs), St1),
+	    {E1,[F1|Qs1],M1,Lvs,Lus,St2}
+    end;
+lc_tq(_Line, E0, [], M0, Vs, St0) ->
+    {E1,Evs,Eus,St1} = expr(E0, Vs, St0),
+    {M1,Mvs,Mus,St2} = expr(M0, Vs, St1),
+    {E1,[],M1,union(Evs, Mvs),union(Eus, Mus),St2}.
+
+%% fun_tq(Line, Body, VisibleVariables, State) ->
+%%	{Fun,NewVariables,UsedVariables,State'}
+%% Transform an "explicit" fun {'fun', Line, {clauses, Cs}} into an
+%% extended form {'fun', Line, {clauses, Cs}, Info}, unless it is the
+%% name of a BIF (erl_lint has checked that it is not an import).
+%% Process the body sequence directly to get the new and used variables.
+%% "Implicit" funs {'fun', Line, {function, F, A}} are not changed.
+
+fun_tq(Lf, {function,F,A}, Vs, St0) ->
+    {As,St1} = new_vars(A, Lf, St0),
+    Cs = [{clause,Lf,As,[],[{call,Lf,{atom,Lf,F},As}]}],
+    case erl_internal:bif(F, A) of
+	true ->
+	    fun_tq(Lf, {clauses,Cs}, Vs, St1);
+	false ->
+	    Index = St0#expand.fun_index,
+	    Uniq = erlang:hash(Cs, (1 bsl 27)-1),
+	    {Fname,St2} = new_fun_name(St1),
+	    {{'fun',Lf,{function,F,A},{Index,Uniq,Fname}},[],[],
+	     St2#expand{fun_index=Index+1}}
+    end;
+fun_tq(Lf, {clauses,Cs0}, Vs, St0) ->
+    Uniq = erlang:hash(Cs0, (1 bsl 27)-1),
+    {Cs1,_Hvss,Frees,St1} = fun_clauses(Cs0, Vs, St0),
+    Ufrees = union(Frees),
+    Index = St1#expand.fun_index,
+    {Fname,St2} = new_fun_name(St1),
+    {{'fun',Lf,{clauses,Cs1},{Index,Uniq,Fname}},[],Ufrees,
+     St2#expand{fun_index=Index+1}}.
+
+fun_clauses([{clause,L,H0,G0,B0}|Cs0], Vs, St0) ->
+    {H,Hvs,Hus,St1} = head(H0, St0),
+    {G,Gvs,Gus,St2} = guard(G0, union(Hvs, Vs), St1),
+    {B,Bvs,Bus,St3} = exprs(B0, union([Vs,Hvs,Gvs]), St2),
+    %% Free variables cannot be new anywhere in the clause.
+    Free = subtract(union([Gus,Hus,Bus]), union([Hvs,Gvs,Bvs])),
+    %%io:format(" Gus :~p~n Bvs :~p~n Bus :~p~n Free:~p~n" ,[Gus,Bvs,Bus,Free]),
+    {Cs,Hvss,Frees,St4} = fun_clauses(Cs0, Vs, St3),
+    {[{clause,L,H,G,B}|Cs],[Hvs|Hvss],[Free|Frees],St4};
+fun_clauses([], _, St) -> {[],[],[],St}.
+
+%% new_fun_name(State) -> {FunName,State}.
+
+new_fun_name(#expand{func=F,arity=A,fcount=I}=St) ->
+    Name = "-" ++ atom_to_list(F) ++ "/" ++ integer_to_list(A)
+	++ "-fun-" ++ integer_to_list(I) ++ "-",
+    {list_to_atom(Name),St#expand{fcount=I+1}}.
+
+
+%% normalise_fields([RecDef]) -> [Field].
+%%  Normalise the field definitions to always have a default value. If
+%%  none has been given then use 'undefined'.
+
+normalise_fields(Fs) ->
+    map(fun ({record_field,Lf,Field}) ->
+		{record_field,Lf,Field,{atom,Lf,undefined}};
+	    (F) -> F end, Fs).
+
+%% record_fields(RecordName, State)
+%% find_field(FieldName, Fields)
+
+record_fields(R, St) -> dict:fetch(R, St#expand.records).
+
+find_field(F, [{record_field,_,{atom,_,F},Val}|_]) -> {ok,Val};
+find_field(F, [_|Fs]) -> find_field(F, Fs);
+find_field(_, []) -> error.
+
+%% field_names(RecFields) -> [Name].
+%%  Return a list of the field names structures.
+
+field_names(Fs) ->
+    map(fun ({record_field,_,Field,_Val}) -> Field end, Fs).
+
+%% index_expr(Line, FieldExpr, Name, Fields) -> IndexExpr.
+%%  Return an expression which evaluates to the index of a
+%%  field. Currently only handle the case where the field is an
+%%  atom. This expansion must be passed through expr again.
+
+index_expr(Line, {atom,_,F}, _Name, Fs) ->
+    {integer,Line,index_expr(F, Fs, 2)}.
+
+index_expr(F, [{record_field,_,{atom,_,F},_}|_], I) -> I;
+index_expr(F, [_|Fs], I) ->
+    index_expr(F, Fs, I+1).
+
+%% pattern_fields([RecDefField], [Match]) -> [Pattern].
+%%  Build a list of match patterns for the record tuple elements.
+%%  This expansion must be passed through pattern again. N.B. We are
+%%  scanning the record definition field list!
+
+pattern_fields(Fs, Ms) ->
+    Wildcard = record_wildcard_init(Ms),
+    map(fun ({record_field,L,{atom,_,F},_}) ->
+		case find_field(F, Ms) of
+		    {ok,Match} -> Match;
+		    error when Wildcard =:= none -> {var,L,'_'};
+		    error -> Wildcard
+		end end,
+	Fs).
+
+%% record_inits([RecDefField], [Init]) -> [InitExpr].
+%%  Build a list of initialisation expressions for the record tuple
+%%  elements. This expansion must be passed through expr
+%%  again. N.B. We are scanning the record definition field list!
+
+record_inits(Fs, Is) ->
+    WildcardInit = record_wildcard_init(Is),
+    map(fun ({record_field,_,{atom,_,F},D}) ->
+		case find_field(F, Is) of
+		    {ok,Init} -> Init;
+		    error when WildcardInit =:= none -> D;
+		    error -> WildcardInit
+		end end,
+	Fs).
+
+record_wildcard_init([{record_field,_,{var,_,'_'},D}|_]) -> D;
+record_wildcard_init([_|Is]) -> record_wildcard_init(Is);
+record_wildcard_init([]) -> none.
+
+%% record_update(Record, RecordName, [RecDefField], [Update], State) ->
+%%	{Expr,State'}
+%%  Build an expression to update fields in a record returning a new
+%%  record.  Try to be smart and optimise this. This expansion must be
+%%  passed through expr again.
+
+record_update(R, Name, Fs, Us0, St0) ->
+    Line = element(2, R),
+    {Pre,Us,St1} = record_exprs(Us0, St0),
+    Nf = length(Fs),				%# of record fields
+    Nu = length(Us),				%# of update fields
+    Nc = Nf - Nu,				%# of copy fields
+
+    %% We need a new variable for the record expression
+    %% to guarantee that it is only evaluated once.
+    {Var,St2} = new_var(Line, St1),
+
+    %% Try to be intelligent about which method of updating record to use.
+    {Update,St} =
+	if
+	    Nu == 0 -> {R,St2};			%No fields updated
+	    Nu =< Nc ->				%Few fields updated
+		{record_setel(Var, Name, Fs, Us), St2};
+	    true ->			      %The wide area inbetween
+		record_match(Var, Name, Fs, Us, St2)
+	end,
+    {{block,element(2, R),Pre ++ [{match,Line,Var,R},Update]},St}.
+
+%% record_match(Record, RecordName, [RecDefField], [Update], State)
+%%  Build a 'case' expression to modify record fields.
+
+record_match(R, Name, Fs, Us, St0) ->
+    {Ps,News,St1} = record_upd_fs(Fs, Us, St0),
+    Lr = element(2, hd(Us)),
+    {{'case',Lr,R,
+      [{clause,Lr,[{tuple,Lr,[{atom,Lr,Name}|Ps]}],[],
+	[{tuple,Lr,[{atom,Lr,Name}|News]}]},
+       {clause,Lr,[{var,Lr,'_'}],[],
+	[call_error(Lr, {tuple,Lr,[{atom,Lr,badrecord},{atom,Lr,Name}]})]}
+      ]},
+     St1}.
+
+record_upd_fs([{record_field,Lf,{atom,_La,F},_Val}|Fs], Us, St0) ->
+    {P,St1} = new_var(Lf, St0),
+    {Ps,News,St2} = record_upd_fs(Fs, Us, St1),
+    case find_field(F, Us) of
+	{ok,New} -> {[P|Ps],[New|News],St2};
+	error -> {[P|Ps],[P|News],St2}
+    end;
+record_upd_fs([], _, St) -> {[],[],St}.
+
+%% record_setel(Record, RecordName, [RecDefField], [Update])
+%%  Build a nested chain of setelement calls to build the
+%%  updated record tuple.
+
+record_setel(R, Name, Fs, Us0) ->
+    Us1 = foldl(fun ({record_field,Lf,Field,Val}, Acc) ->
+			I = index_expr(Lf, Field, Name, Fs),
+			[{I,Lf,Val}|Acc]
+		end, [], Us0),
+    Us = sort(Us1),
+    Lr = element(2, hd(Us)),
+    Wildcards = duplicate(length(Fs), {var,Lr,'_'}),
+    {'case',Lr,R,
+     [{clause,Lr,[{tuple,Lr,[{atom,Lr,Name}|Wildcards]}],[],
+       [foldr(fun ({I,Lf,Val}, Acc) ->
+		      {call,Lf,{atom,Lf,setelement},[I,Acc,Val]} end,
+	      R, Us)]},
+      {clause,Lr,[{var,Lr,'_'}],[],
+       [call_error(Lr, {tuple,Lr,[{atom,Lr,badrecord},{atom,Lr,Name}]})]}]}.
+
+%% Expand a call to record_info/2. We have checked that it is not
+%% shadowed by an import.
+
+record_info_call(Line, [{atom,_Li,Info},{atom,_Ln,Name}], St) ->
+    case Info of
+	size ->
+	    {{integer,Line,1+length(record_fields(Name, St))},[],[],St};
+	fields ->
+	    {make_list(field_names(record_fields(Name, St)), Line),
+	     [],[],St}
+    end.
+
+%% Break out expressions from an record update list and bind to new
+%% variables. The idea is that we will evaluate all update expressions
+%% before starting to update the record.
+
+record_exprs(Us, St) ->
+    record_exprs(Us, St, [], []).
+
+record_exprs([{record_field,Lf,{atom,_La,_F}=Name,Val}=Field0|Us], St0, Pre, Fs) ->
+    case is_simple_val(Val) of
+	true ->
+	    record_exprs(Us, St0, Pre, [Field0|Fs]);
+	false ->
+	    {Var,St} = new_var(Lf, St0),
+	    Bind = {match,Lf,Var,Val},
+	    Field = {record_field,Lf,Name,Var},
+	    record_exprs(Us, St, [Bind|Pre], [Field|Fs])
+    end;
+record_exprs([], St, Pre, Fs) ->
+    {reverse(Pre),Fs,St}.
+
+is_simple_val({var,_,_}) -> true;
+is_simple_val({atom,_,_}) -> true;
+is_simple_val({integer,_,_}) -> true;
+is_simple_val({float,_,_}) -> true;
+is_simple_val({nil,_}) -> true;
+is_simple_val(_) -> false.
+
+%% pattern_bin([Element], State) -> {[Element],[Variable],[UsedVar],State}.
+
+pattern_bin(Es0, St) ->
+    Es1 = bin_expand_strings(Es0),
+    foldr(fun (E, Acc) -> pattern_element(E, Acc) end, {[],[],[],St}, Es1).
+
+pattern_element({bin_element,Line,Expr,Size,Type}, {Es,Esvs,Esus,St0}) ->
+    {Expr1,Vs1,Us1,St1} = pattern(Expr, St0),
+    {Size1,Vs2,Us2,St2} = pat_bit_size(Size, St1),
+    {Size2,Type1} = make_bit_type(Line, Size1,Type),
+    {[{bin_element,Line,Expr1,Size2,Type1}|Es],
+      union([Vs1,Vs2,Esvs]),union([Us1,Us2,Esus]),St2}.
+
+pat_bit_size(default, St) -> {default,[],[],St};
+pat_bit_size({atom,_La,all}=All, St) -> {All,[],[],St};
+pat_bit_size({var,_Lv,V}=Var, St) -> {Var,[],[V],St};
+pat_bit_size(Size, St) ->
+    Line = element(2, Size),
+    {value,Sz,_} = erl_eval:expr(Size, erl_eval:new_bindings()),
+    {{integer,Line,Sz},[],[],St}.
+
+make_bit_type(Line, default, Type0) ->
+    case erl_bits:set_bit_type(default, Type0) of
+	{ok,all,Bt} -> {{atom,Line,all},erl_bits:as_list(Bt)};
+	{ok,Size,Bt} -> {{integer,Line,Size},erl_bits:as_list(Bt)}
+    end;
+make_bit_type(_Line, Size, Type0) ->		%Integer or 'all'
+    {ok,Size,Bt} = erl_bits:set_bit_type(Size, Type0),
+    {Size,erl_bits:as_list(Bt)}.
+
+%% expr_bin([Element], [VisibleVar], State) ->
+%%              {[Element],[NewVar],[UsedVar],State}.
+
+expr_bin(Es0, Vs, St) ->
+    Es1 = bin_expand_strings(Es0),
+    foldr(fun (E, Acc) -> bin_element(E, Vs, Acc) end, {[],[],[],St}, Es1).
+
+bin_element({bin_element,Line,Expr,Size,Type}, Vs, {Es,Esvs,Esus,St0}) ->
+    {Expr1,Vs1,Us1,St1} = expr(Expr, Vs, St0),
+    {Size1,Vs2,Us2,St2} = if Size == default -> {default,[],[],St1};
+			     true -> expr(Size, Vs, St1)
+			  end,
+    {Size2,Type1} = make_bit_type(Line, Size1, Type),
+    {[{bin_element,Line,Expr1,Size2,Type1}|Es],
+     union([Vs1,Vs2,Esvs]),union([Us1,Us2,Esus]),St2}.
+
+bin_expand_strings(Es) ->
+    foldr(fun ({bin_element,Line,{string,_,S},default,default}, Es1) ->
+		  foldr(fun (C, Es2) ->
+				[{bin_element,Line,{char,Line,C},default,default}|Es2]
+			end, Es1, S);
+	      (E, Es1) -> [E|Es1]
+	  end, [], Es).
+
+%% new_var_name(State) -> {VarName,State}.
+
+new_var_name(St) ->
+    C = St#expand.vcount,
+    {list_to_atom("pre" ++ integer_to_list(C)),St#expand{vcount=C+1}}.
+
+%% new_var(Line, State) -> {Var,State}.
+
+new_var(L, St0) ->
+    {New,St1} = new_var_name(St0),
+    {{var,L,New},St1}.
+
+%% new_vars(Count, Line, State) -> {[Var],State}.
+%%  Make Count new variables.
+
+new_vars(N, L, St) -> new_vars(N, L, St, []).
+
+new_vars(N, L, St0, Vs) when N > 0 ->
+    {V,St1} = new_var(L, St0),
+    new_vars(N-1, L, St1, [V|Vs]);
+new_vars(0, _L, St, Vs) -> {Vs,St}.
+
+%% make_list(TermList, Line) ->	ConsTerm.
+
+make_list(Ts, Line) ->
+    foldr(fun (H, T) -> {cons,Line,H,T} end, {nil,Line}, Ts).
+
+string_to_conses(Line, Cs, Tail) ->
+    foldr(fun (C, T) -> {cons,Line,{char,Line,C},T} end, Tail, Cs).
+
+
+%% In syntax trees, module/package names are atoms or lists of atoms.
+
+package_to_string(A) when atom(A) -> atom_to_list(A);
+package_to_string(L) when list(L) -> packages:concat(L).
+
+expand_package({atom,L,A} = M, St) ->
+    case dict:find(A, St#expand.mod_imports) of
+	{ok, A1} ->
+	    {atom,L,A1};
+	error ->
+	    case packages:is_segmented(A) of
+		true ->
+		    M;
+		false ->
+		    M1 = packages:concat(St#expand.package, A),
+		    {atom,L,list_to_atom(M1)}
+	    end
+    end;
+expand_package(M, _St) ->
+    case erl_parse:package_segments(M) of
+	error ->
+	    M;
+	M1 ->
+	    {atom,element(2,M),list_to_atom(package_to_string(M1))}
+    end.
+
+%% Create a case-switch on true/false, generating badarg for all other
+%% values.
+
+make_bool_switch(L, E, V, T, F) ->
+    make_bool_switch_1(L, E, V, [T], [F]).
+
+make_bool_switch_1(L, E, V, T, F) ->
+    case get(sys_pre_expand_in_guard) of
+	undefined -> make_bool_switch_body(L, E, V, T, F);
+	yes -> make_bool_switch_guard(L, E, V, T, F)
+    end.
+
+make_bool_switch_guard(_, E, _, [{atom,_,true}], [{atom,_,false}]) -> E;
+make_bool_switch_guard(L, E, V, T, F) ->
+    NegL = -abs(L),
+    {'case',NegL,E,
+     [{clause,NegL,[{atom,NegL,true}],[],T},
+      {clause,NegL,[{atom,NegL,false}],[],F},
+      {clause,NegL,[V],[],[V]}
+     ]}.
+
+make_bool_switch_body(L, E, V, T, F) ->
+    NegL = -abs(L),
+    {'case',NegL,E,
+     [{clause,NegL,[{atom,NegL,true}],[],T},
+      {clause,NegL,[{atom,NegL,false}],[],F},
+      {clause,NegL,[V],[],
+       [call_error(NegL,{tuple,NegL,[{atom,NegL,badarg},V]})]}
+     ]}.
+
+%% Expand a list of cond-clauses to a sequence of case-switches.
+
+cond_clauses([{clause,L,[],[[E]],B}],V) ->
+    make_bool_switch_1(L,E,V,B,[call_error(L,{atom,L,cond_clause})]);
+cond_clauses([{clause,L,[],[[E]],B} | Cs],V) ->
+    make_bool_switch_1(L,E,V,B,[cond_clauses(Cs,V)]).
+
+%% call_error(Line, Reason) -> Expr.
+%%  Build a call to erlang:error/1 with reason Reason.
+
+call_error(L, R) ->
+    {call,L,{remote,L,{atom,L,erlang},{atom,L,error}},[R]}.
+
+%% new_in_all(Before, RegionList) -> NewInAll
+%%  Return the variables new in all clauses.
+
+new_in_all(Before, Region) ->
+    InAll = intersection(Region),
+    subtract(InAll, Before).
+
+%% import(Line, Imports, State) ->
+%%	State'
+%% imported(Name, Arity, State) ->
+%%	{yes,Module} | no
+%%  Handle import declarations and est for imported functions. No need to
+%%  check when building imports as code is correct.
+
+import({Mod0,Fs}, St) ->
+    Mod = list_to_atom(package_to_string(Mod0)),
+    Mfs = from_list(Fs),
+    St#expand{imports=add_imports(Mod, Mfs, St#expand.imports)};
+import(Mod0, St) ->
+    Mod = package_to_string(Mod0),
+    Key = list_to_atom(packages:last(Mod)),
+    St#expand{mod_imports=dict:store(Key, list_to_atom(Mod),
+				     St#expand.mod_imports)}.
+
+add_imports(Mod, [F|Fs], Is) ->
+    add_imports(Mod, Fs, orddict:store(F, Mod, Is));
+add_imports(_, [], Is) -> Is.
+
+imported(F, A, St) ->
+    case orddict:find({F,A}, St#expand.imports) of
+	{ok,Mod} -> {yes,Mod};
+	error -> no
+    end.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_codegen.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_codegen.erl
new file mode 100644
index 0000000000..6b787e8c95
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_codegen.erl
@@ -0,0 +1,1755 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: v3_codegen.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+%% Purpose : Code generator for Beam.
+
+%% The following assumptions have been made:
+%%
+%% 1. Matches, i.e. things with {match,M,Ret} wrappers, only return
+%% values; no variables are exported. If the match would have returned
+%% extra variables then these have been transformed to multiple return
+%% values.
+%%
+%% 2. All BIF's called in guards are gc-safe so there is no need to
+%% put thing on the stack in the guard.  While this would in principle
+%% work it would be difficult to keep track of the stack depth when
+%% trimming.
+%%
+%% The code generation uses variable lifetime information added by
+%% the v3_life module to save variables, allocate registers and
+%% move registers to the stack when necessary.
+%%
+%% We try to use a consistent variable name scheme throughout.  The
+%% StackReg record is always called Bef,Int<n>,Aft.
+
+-module(v3_codegen).
+
+%% The main interface.
+-export([module/2]).
+
+-import(lists, [member/2,keymember/3,keysort/2,keysearch/3,append/1,
+		map/2,flatmap/2,foldl/3,foldr/3,mapfoldl/3,
+		sort/1,reverse/1,reverse/2]).
+-import(v3_life, [vdb_find/2]).
+
+%%-compile([export_all]).
+
+-include("v3_life.hrl").
+
+%% Main codegen structure.
+-record(cg, {lcount=1,				%Label counter
+	     mod,				%Current module
+	     func,				%Current function
+	     finfo,				%Function info label
+	     fcode,				%Function code label
+	     btype,				%Type of bif used.
+	     bfail,				%Fail label of bif
+	     break,				%Break label
+	     recv,				%Receive label
+	     is_top_block,			%Boolean: top block or not
+	     functable = [],			%Table of local functions:
+						%[{{Name, Arity}, Label}...]
+	     in_catch=false,			%Inside a catch or not.
+	     need_frame,			%Need a stack frame.
+	     new_funs=true}).			%Generate new fun instructions.
+
+%% Stack/register state record.
+-record(sr, {reg=[],				%Register table
+	     stk=[],				%Stack table
+	     res=[]}).				%Reserved regs: [{reserved,I,V}]
+
+module({Mod,Exp,Attr,Forms}, Options) ->
+    NewFunsFlag = not member(no_new_funs, Options),
+    {Fs,St} = functions(Forms, #cg{mod=Mod,new_funs=NewFunsFlag}),
+    {ok,{Mod,Exp,Attr,Fs,St#cg.lcount}}.
+
+functions(Forms, St0) ->
+    mapfoldl(fun (F, St) -> function(F, St) end, St0#cg{lcount=1}, Forms).
+
+function({function,Name,Arity,As0,Vb,Vdb}, St0) ->
+    %%ok = io:fwrite("cg ~w:~p~n", [?LINE,{Name,Arity}]),
+    St1 = St0#cg{func={Name,Arity}},
+    {Fun,St2} = cg_fun(Vb, As0, Vdb, St1),
+    Func0 = {function,Name,Arity,St2#cg.fcode,Fun},
+    Func = bs_function(Func0),
+    {Func,St2}.
+
+%% cg_fun([Lkexpr], [HeadVar], Vdb, State) -> {[Ainstr],State}
+
+cg_fun(Les, Hvs, Vdb, St0) ->
+    {Name,Arity} = St0#cg.func,
+    {Fi,St1} = new_label(St0),			%FuncInfo label
+    {Fl,St2} = local_func_label(Name, Arity, St1),
+    %% Create initial stack/register state, clear unused arguments.
+    Bef = clear_dead(#sr{reg=foldl(fun ({var,V}, Reg) ->
+					   put_reg(V, Reg)
+				   end, [], Hvs),
+			stk=[]}, 0, Vdb),
+    {B2,_Aft,St3} = cg_list(Les, 0, Vdb, Bef, St2#cg{btype=exit,
+						    bfail=Fi,
+						    finfo=Fi,
+						    fcode=Fl,
+						    is_top_block=true}),
+    A = [{label,Fi},{func_info,{atom,St3#cg.mod},{atom,Name},Arity},
+	 {label,Fl}|B2],
+    {A,St3}.
+
+%% cg(Lkexpr, Vdb, StackReg, State) -> {[Ainstr],StackReg,State}.
+%%  Generate code for a kexpr.
+%%  Split function into two steps for clarity, not efficiency.
+
+cg(Le, Vdb, Bef, St) ->
+    cg(Le#l.ke, Le, Vdb, Bef, St).
+
+cg({block,Es}, Le, Vdb, Bef, St) ->
+    block_cg(Es, Le, Vdb, Bef, St);
+cg({match,M,Rs}, Le, Vdb, Bef, St) ->
+    match_cg(M, Rs, Le, Vdb, Bef, St);
+cg({match_fail,F}, Le, Vdb, Bef, St) ->
+    match_fail_cg(F, Le, Vdb, Bef, St);
+cg({call,Func,As,Rs}, Le, Vdb, Bef, St) ->
+    call_cg(Func, As, Rs, Le, Vdb, Bef, St);
+cg({enter,Func,As}, Le, Vdb, Bef, St) ->
+    enter_cg(Func, As, Le, Vdb, Bef, St);
+cg({bif,Bif,As,Rs}, Le, Vdb, Bef, St) ->
+    bif_cg(Bif, As, Rs, Le, Vdb, Bef, St);
+cg({receive_loop,Te,Rvar,Rm,Tes,Rs}, Le, Vdb, Bef, St) ->
+    recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, Vdb, Bef, St);
+cg(receive_next, Le, Vdb, Bef, St) ->
+    recv_next_cg(Le, Vdb, Bef, St);
+cg(receive_accept, _Le, _Vdb, Bef, St) -> {[remove_message],Bef,St};
+cg({'try',Ta,Vs,Tb,Evs,Th,Rs}, Le, Vdb, Bef, St) ->
+    try_cg(Ta, Vs, Tb, Evs, Th, Rs, Le, Vdb, Bef, St);
+cg({'catch',Cb,R}, Le, Vdb, Bef, St) ->
+    catch_cg(Cb, R, Le, Vdb, Bef, St);
+cg({set,Var,Con}, Le, Vdb, Bef, St) -> set_cg(Var, Con, Le, Vdb, Bef, St);
+cg({return,Rs}, Le, Vdb, Bef, St) -> return_cg(Rs, Le, Vdb, Bef, St);
+cg({break,Bs}, Le, Vdb, Bef, St) -> break_cg(Bs, Le, Vdb, Bef, St);
+cg({need_heap,0}, _Le, _Vdb, Bef, St) ->
+    {[],Bef,St};
+cg({need_heap,H}, _Le, _Vdb, Bef, St) ->
+    {[{test_heap,H,max_reg(Bef#sr.reg)}],Bef,St}.
+
+%% cg_list([Kexpr], FirstI, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
+
+cg_list(Kes, I, Vdb, Bef, St0) ->
+    {Keis,{Aft,St1}} =
+	flatmapfoldl(fun (Ke, {Inta,Sta}) ->
+%			     ok = io:fwrite("    %% ~p\n", [Inta]),
+%			     ok = io:fwrite("cgl:~p\n", [Ke]),
+			     {Keis,Intb,Stb} = cg(Ke, Vdb, Inta, Sta),
+%			     ok = io:fwrite("    ~p\n", [Keis]),
+%			     ok = io:fwrite("    %% ~p\n", [Intb]),
+			     {comment(Inta) ++ Keis,{Intb,Stb}}
+		     end, {Bef,St0}, need_heap(Kes, I)),
+    {Keis,Aft,St1}.
+
+%% need_heap([Lkexpr], I, BifType) -> [Lkexpr].
+%%  Insert need_heap instructions in Kexpr list.  Try to be smart and
+%%  collect them together as much as possible.
+
+need_heap(Kes0, I) ->
+    {Kes1,{H,F}} = flatmapfoldr(fun (Ke, {H0,F0}) ->
+					{Ns,H1,F1} = need_heap_1(Ke, H0, F0),
+					{[Ke|Ns],{H1,F1}}
+				end, {0,false}, Kes0),
+    %% Prepend need_heap if necessary.
+    Kes2 = need_heap_need(I, H, F) ++ Kes1,
+%     ok = io:fwrite("need_heap: ~p~n",
+% 		   [{{H,F},
+% 		     map(fun (#l{ke={match,M,Rs}}) -> match;
+% 			     (Lke) -> Lke#l.ke end, Kes2)}]),
+    Kes2.
+
+need_heap_1(#l{ke={set,_,{binary,_}},i=I}, H, F) ->
+    {need_heap_need(I, H, F),0,false};
+need_heap_1(#l{ke={set,_,Val}}, H, F) ->
+    %% Just pass through adding to needed heap.
+    {[],H + case Val of
+		{cons,_} -> 2;
+		{tuple,Es} -> 1 + length(Es);
+		{string,S} -> 2 * length(S);
+		_Other -> 0
+	    end,F};
+need_heap_1(#l{ke={call,_Func,_As,_Rs},i=I}, H, F) ->
+    %% Calls generate a need if necessary and also force one.
+    {need_heap_need(I, H, F),0,true};
+need_heap_1(#l{ke={bif,dsetelement,_As,_Rs},i=I}, H, F) ->
+    {need_heap_need(I, H, F),0,true};
+need_heap_1(#l{ke={bif,{make_fun,_,_,_,_},_As,_Rs},i=I}, H, F) ->
+    {need_heap_need(I, H, F),0,true};
+need_heap_1(#l{ke={bif,_Bif,_As,_Rs}}, H, F) ->
+    {[],H,F};
+need_heap_1(#l{i=I}, H, F) ->
+    %% Others kexprs generate a need if necessary but don't force.
+    {need_heap_need(I, H, F),0,false}.
+
+need_heap_need(_I, 0, false) -> [];
+need_heap_need(I, H, _F) -> [#l{ke={need_heap,H},i=I}].
+
+
+%% match_cg(Match, [Ret], Le, Vdb, StackReg, State) ->
+%%	{[Ainstr],StackReg,State}.
+%%  Generate code for a match.  First save all variables on the stack
+%%  that are to survive after the match.  We leave saved variables in
+%%  their registers as they might actually be in the right place.
+%%  Should test this.
+
+match_cg(M, Rs, Le, Vdb, Bef, St0) ->
+    I = Le#l.i,
+    {Sis,Int0} = adjust_stack(Bef, I, I+1, Vdb),
+    {B,St1} = new_label(St0),
+    {Mis,Int1,St2} = match_cg(M, none, Int0, St1#cg{break=B}),
+    %% Put return values in registers.
+    Reg = load_vars(Rs, Int1#sr.reg),
+    {Sis ++ Mis ++ [{label,B}],
+     clear_dead(Int1#sr{reg=Reg}, I, Vdb),
+     St2#cg{break=St1#cg.break}}.
+
+%% match_cg(Match, Fail, StackReg, State) -> {[Ainstr],StackReg,State}.
+%%  Generate code for a match tree.  N.B. there is no need pass Vdb
+%%  down as each level which uses this takes its own internal Vdb not
+%%  the outer one.
+
+match_cg(Le, Fail, Bef, St) ->
+    match_cg(Le#l.ke, Le, Fail, Bef, St).
+
+match_cg({alt,F,S}, _Le, Fail, Bef, St0) ->
+    {Tf,St1} = new_label(St0),
+    {Fis,Faft,St2} = match_cg(F, Tf, Bef, St1),
+    {Sis,Saft,St3} = match_cg(S, Fail, Bef, St2),
+    Aft = sr_merge(Faft, Saft),
+    {Fis ++ [{label,Tf}] ++ Sis,Aft,St3};
+match_cg({select,V,Scs}, _Va, Fail, Bef, St) ->
+    match_fmf(fun (S, F, Sta) ->
+		      select_cg(S, V, F, Fail, Bef, Sta) end,
+	      Fail, St, Scs);
+match_cg({guard,Gcs}, _Le, Fail, Bef, St) ->
+    match_fmf(fun (G, F, Sta) -> guard_clause_cg(G, F, Bef, Sta) end,
+	      Fail, St, Gcs);
+match_cg({block,Es}, Le, _Fail, Bef, St) ->
+    %% Must clear registers and stack of dead variables.
+    Int = clear_dead(Bef, Le#l.i, Le#l.vdb),
+    block_cg(Es, Le, Int, St).
+
+%% match_fail_cg(FailReason, Le, Vdb, StackReg, State) ->
+%%	{[Ainstr],StackReg,State}.
+%%  Generate code for the match_fail "call".  N.B. there is no generic
+%%  case for when the fail value has been created elsewhere.
+
+match_fail_cg({function_clause,As}, Le, Vdb, Bef, St) ->
+    %% Must have the args in {x,0}, {x,1},...
+    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
+    {Sis ++ [{jump,{f,St#cg.finfo}}],
+     Int#sr{reg=clear_regs(Int#sr.reg)},St};
+match_fail_cg({badmatch,Term}, Le, Vdb, Bef, St) ->
+    R = cg_reg_arg(Term, Bef),
+    Int0 = clear_dead(Bef, Le#l.i, Vdb),
+    {Sis,Int} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
+    {Sis ++ [{badmatch,R}],
+     Int#sr{reg=clear_regs(Int0#sr.reg)},St};
+match_fail_cg({case_clause,Reason}, Le, Vdb, Bef, St) ->
+    R = cg_reg_arg(Reason, Bef),
+    Int0 = clear_dead(Bef, Le#l.i, Vdb),
+    {Sis,Int} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
+    {Sis++[{case_end,R}],
+     Int#sr{reg=clear_regs(Bef#sr.reg)},St};
+match_fail_cg(if_clause, Le, Vdb, Bef, St) ->
+    Int0 = clear_dead(Bef, Le#l.i, Vdb),
+    {Sis,Int1} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
+    {Sis++[if_end],Int1#sr{reg=clear_regs(Int1#sr.reg)},St};
+match_fail_cg({try_clause,Reason}, Le, Vdb, Bef, St) ->
+    R = cg_reg_arg(Reason, Bef),
+    Int0 = clear_dead(Bef, Le#l.i, Vdb),
+    {Sis,Int} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
+    {Sis ++ [{try_case_end,R}],
+     Int#sr{reg=clear_regs(Int0#sr.reg)},St}.
+
+
+%% block_cg([Kexpr], Le, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
+%% block_cg([Kexpr], Le, StackReg, St) -> {[Ainstr],StackReg,St}.
+
+block_cg(Es, Le, _Vdb, Bef, St) ->
+    block_cg(Es, Le, Bef, St).
+
+block_cg(Es, Le, Bef, St0) ->
+    case St0#cg.is_top_block of
+	false ->
+	    cg_block(Es, Le#l.i, Le#l.vdb, Bef, St0);
+	true ->
+	    {Keis,Aft,St1} = cg_block(Es, Le#l.i, Le#l.vdb, Bef,
+				      St0#cg{is_top_block=false,
+					     need_frame=false}),
+	    top_level_block(Keis, Aft, max_reg(Bef#sr.reg), St1)
+    end.
+
+cg_block([], _I, _Vdb, Bef, St0) ->
+    {[],Bef,St0};
+cg_block(Kes0, I, Vdb, Bef, St0) ->
+    {Kes2,Int1,St1} =
+	case basic_block(Kes0) of
+	    {Kes1,LastI,Args,Rest} ->
+		Ke = hd(Kes1),
+		Fb = Ke#l.i,
+		cg_basic_block(Kes1, Fb, LastI, Args, Vdb, Bef, St0);
+	    {Kes1,Rest} ->
+		cg_list(Kes1, I, Vdb, Bef, St0)
+	end,
+    {Kes3,Int2,St2} = cg_block(Rest, I, Vdb, Int1, St1),
+    {Kes2 ++ Kes3,Int2,St2}.
+
+basic_block(Kes) -> basic_block(Kes, []).
+
+basic_block([], Acc) -> {reverse(Acc),[]};
+basic_block([Le|Les], Acc) ->
+    case collect_block(Le#l.ke) of
+	include -> basic_block(Les, [Le|Acc]);
+	{block_end,As} -> {reverse(Acc, [Le]),Le#l.i,As,Les};
+	no_block -> {reverse(Acc, [Le]),Les}
+    end.
+
+collect_block({set,_,{binary,_}})    -> no_block;
+collect_block({set,_,_})             -> include;
+collect_block({call,{var,_}=Var,As,_Rs}) -> {block_end,As++[Var]};
+collect_block({call,Func,As,_Rs})   -> {block_end,As++func_vars(Func)};
+collect_block({enter,{var,_}=Var,As})-> {block_end,As++[Var]};
+collect_block({enter,Func,As})       -> {block_end,As++func_vars(Func)};
+collect_block({return,Rs})           -> {block_end,Rs};
+collect_block({break,Bs})            -> {block_end,Bs};
+collect_block({bif,_Bif,_As,_Rs})    -> include;
+collect_block(_)                     -> no_block.
+
+func_vars({remote,M,F}) when element(1, M) == var;
+			     element(1, F) == var ->
+    [M,F];
+func_vars(_) -> [].
+
+%% cg_basic_block([Kexpr], FirstI, LastI, As, Vdb, StackReg, State) ->
+%%      {[Ainstr],StackReg,State}.
+
+cg_basic_block(Kes, Fb, Lf, As, Vdb, Bef, St0) ->
+    Res = make_reservation(As, 0),
+    Regs0 = reserve(Res, Bef#sr.reg, Bef#sr.stk),
+    Stk = extend_stack(Bef, Lf, Lf+1, Vdb),
+    Int0 = Bef#sr{reg=Regs0,stk=Stk,res=Res},
+    X0_v0 = x0_vars(As, Fb, Lf, Vdb),
+    {Keis,{Aft,_,St1}} =
+	flatmapfoldl(fun(Ke, St) -> cg_basic_block(Ke, St, Lf, Vdb) end,
+		     {Int0,X0_v0,St0}, need_heap(Kes, Fb)),
+    {Keis,Aft,St1}.
+
+cg_basic_block(Ke, {Inta,X0v,Sta}, _Lf, Vdb) when element(1, Ke#l.ke) =:= need_heap ->
+    {Keis,Intb,Stb} = cg(Ke, Vdb, Inta, Sta),
+    {comment(Inta) ++ Keis, {Intb,X0v,Stb}};
+cg_basic_block(Ke, {Inta,X0_v1,Sta}, Lf, Vdb) ->
+    {Sis,Intb} = save_carefully(Inta, Ke#l.i, Lf+1, Vdb),
+    {X0_v2,Intc} = allocate_x0(X0_v1, Ke#l.i, Intb),
+    Intd = reserve(Intc),
+    {Keis,Inte,Stb} = cg(Ke, Vdb, Intd, Sta),
+    {comment(Inta) ++ Sis ++ Keis, {Inte,X0_v2,Stb}}.
+
+make_reservation([], _) -> [];
+make_reservation([{var,V}|As], I) -> [{I,V}|make_reservation(As, I+1)];
+make_reservation([A|As], I) -> [{I,A}|make_reservation(As, I+1)].
+
+reserve(Sr) -> Sr#sr{reg=reserve(Sr#sr.res, Sr#sr.reg, Sr#sr.stk)}.
+
+reserve([{I,V}|Rs], [free|Regs], Stk) -> [{reserved,I,V}|reserve(Rs, Regs, Stk)];
+reserve([{I,V}|Rs], [{I,V}|Regs], Stk) -> [{I,V}|reserve(Rs, Regs, Stk)];
+reserve([{I,V}|Rs], [{I,Var}|Regs], Stk) ->
+    case on_stack(Var, Stk) of
+	true -> [{reserved,I,V}|reserve(Rs, Regs, Stk)];
+	false -> [{I,Var}|reserve(Rs, Regs, Stk)]
+    end;
+reserve([{I,V}|Rs], [{reserved,I,_}|Regs], Stk) ->
+    [{reserved,I,V}|reserve(Rs, Regs, Stk)];
+%reserve([{I,V}|Rs], [Other|Regs], Stk) -> [Other|reserve(Rs, Regs, Stk)];
+reserve([{I,V}|Rs], [], Stk) -> [{reserved,I,V}|reserve(Rs, [], Stk)];
+reserve([], Regs, _) -> Regs.
+
+extend_stack(Bef, Fb, Lf, Vdb) ->
+    Stk0 = clear_dead_stk(Bef#sr.stk, Fb, Vdb),
+    Saves = [V || {V,F,L} <- Vdb,
+		  F < Fb,
+		  L >= Lf,
+		  not on_stack(V, Stk0)],
+    Stk1 = foldl(fun (V, Stk) -> put_stack(V, Stk) end, Stk0, Saves),
+    Bef#sr.stk ++ lists:duplicate(length(Stk1) - length(Bef#sr.stk), free).
+
+save_carefully(Bef, Fb, Lf, Vdb) ->
+    Stk = Bef#sr.stk,
+    %% New variables that are in use but not on stack.
+    New = [ {V,F,L} || {V,F,L} <- Vdb,
+		       F < Fb,
+		   L >= Lf,
+		       not on_stack(V, Stk) ],
+    Saves = [ V || {V,_,_} <- keysort(2, New) ],
+    save_carefully(Saves, Bef, []).
+
+save_carefully([], Bef, Acc) -> {reverse(Acc),Bef};
+save_carefully([V|Vs], Bef, Acc) ->
+    case put_stack_carefully(V, Bef#sr.stk) of
+	error -> {reverse(Acc),Bef};
+	Stk1 ->
+	    SrcReg = fetch_reg(V, Bef#sr.reg),
+	    Move = {move,SrcReg,fetch_stack(V, Stk1)},
+	    {x,_} = SrcReg,			%Assertion - must be X register.
+	    save_carefully(Vs, Bef#sr{stk=Stk1}, [Move|Acc])
+    end.
+
+x0_vars([], _Fb, _Lf, _Vdb) -> [];
+x0_vars([{var,V}|_], Fb, _Lf, Vdb) ->
+    {V,F,_L} = VFL = vdb_find(V, Vdb),
+    x0_vars1([VFL], Fb, F, Vdb);
+x0_vars([X0|_], Fb, Lf, Vdb) ->
+    x0_vars1([{X0,Lf,Lf}], Fb, Lf, Vdb).
+
+x0_vars1(X0, Fb, Xf, Vdb) ->
+    Vs0 = [VFL || {_V,F,L}=VFL <- Vdb,
+		  F >= Fb,
+		  L < Xf],
+    Vs1 = keysort(3, Vs0),
+    keysort(2, X0++Vs1).
+
+allocate_x0([], _, Bef) -> {[],Bef#sr{res=[]}};
+allocate_x0([{_,_,L}|Vs], I, Bef) when L =< I ->
+    allocate_x0(Vs, I, Bef);
+allocate_x0([{V,_F,_L}=VFL|Vs], _, Bef) ->
+    {[VFL|Vs],Bef#sr{res=reserve_x0(V, Bef#sr.res)}}.
+
+reserve_x0(V, [_|Res]) -> [{0,V}|Res];
+reserve_x0(V, []) -> [{0,V}].
+
+top_level_block(Keis, Bef, _MaxRegs, St0) when St0#cg.need_frame =:= false,
+					      length(Bef#sr.stk) =:= 0 ->
+    %% This block need no stack frame.  However, we still need to turn the
+    %% stack frame upside down.
+    MaxY = length(Bef#sr.stk)-1,
+    Keis1 = flatmap(fun (Tuple) when tuple(Tuple) ->
+			    [turn_yregs(size(Tuple), Tuple, MaxY)];
+			(Other) ->
+			    [Other]
+		    end, Keis),
+    {Keis1, Bef, St0#cg{is_top_block=true}};
+top_level_block(Keis, Bef, MaxRegs, St0) ->
+    %% This top block needs an allocate instruction before it, and a
+    %% deallocate instruction before each return.
+    FrameSz = length(Bef#sr.stk),
+    MaxY = FrameSz-1,
+    Keis1 = flatmap(fun ({call_only,Arity,Func}) ->
+			    [{call_last,Arity,Func,FrameSz}];
+			({call_ext_only,Arity,Func}) ->
+			    [{call_ext_last,Arity,Func,FrameSz}];
+			({apply_only,Arity}) ->
+			    [{apply_last,Arity,FrameSz}];
+			(return) ->
+			    [{deallocate,FrameSz}, return];
+			(Tuple) when tuple(Tuple) ->
+			    [turn_yregs(size(Tuple), Tuple, MaxY)];
+			(Other) ->
+			    [Other]
+		    end, Keis),
+    {[{allocate_zero,FrameSz,MaxRegs}|Keis1], Bef, St0#cg{is_top_block=true}}.
+
+%% turn_yregs(Size, Tuple, MaxY) -> Tuple'
+%%   Renumber y register so that {y, 0} becomes {y, FrameSize-1},
+%%   {y, FrameSize-1} becomes {y, 0} and so on.  This is to make nested
+%%   catches work.  The code generation algorithm gives a lower register
+%%   number to the outer catch, which is wrong.
+
+turn_yregs(0, Tp, _) -> Tp;
+turn_yregs(El, Tp, MaxY) when element(1, element(El, Tp)) == yy ->
+    turn_yregs(El-1, setelement(El, Tp, {y,MaxY-element(2, element(El, Tp))}), MaxY);
+turn_yregs(El, Tp, MaxY) when list(element(El, Tp)) ->
+    New = map(fun ({yy,YY}) -> {y,MaxY-YY};
+		  (Other) -> Other end, element(El, Tp)),
+    turn_yregs(El-1, setelement(El, Tp, New), MaxY);
+turn_yregs(El, Tp, MaxY) ->
+    turn_yregs(El-1, Tp, MaxY).
+
+%% select_cg(Sclause, V, TypeFail, ValueFail, StackReg, State) ->
+%%      {Is,StackReg,State}.
+%%  Selecting type and value needs two failure labels, TypeFail is the
+%%  label to jump to of the next type test when this type fails, and
+%%  ValueFail is the label when this type is correct but the value is
+%%  wrong.  These are different as in the second case there is no need
+%%  to try the next type, it will always fail.
+
+select_cg(#l{ke={type_clause,cons,[S]}}, {var,V}, Tf, Vf, Bef, St) ->
+    select_cons(S, V, Tf, Vf, Bef, St);
+select_cg(#l{ke={type_clause,nil,[S]}}, {var,V}, Tf, Vf, Bef, St) ->
+    select_nil(S, V, Tf, Vf, Bef, St);
+select_cg(#l{ke={type_clause,binary,[S]}}, {var,V}, Tf, Vf, Bef, St) ->
+    select_binary(S, V, Tf, Vf, Bef, St);
+select_cg(#l{ke={type_clause,bin_seg,S}}, {var,V}, Tf, Vf, Bef, St) ->
+    select_bin_segs(S, V, Tf, Vf, Bef, St);
+select_cg(#l{ke={type_clause,bin_end,[S]}}, {var,V}, Tf, Vf, Bef, St) ->
+    select_bin_end(S, V, Tf, Vf, Bef, St);
+select_cg(#l{ke={type_clause,Type,Scs}}, {var,V}, Tf, Vf, Bef, St0) ->
+    {Vis,{Aft,St1}} =
+	mapfoldl(fun (S, {Int,Sta}) ->
+			 {Val,Is,Inta,Stb} = select_val(S, V, Vf, Bef, Sta),
+			 {{Is,[Val]},{sr_merge(Int, Inta),Stb}}
+		 end, {void,St0}, Scs),
+    OptVls = combine(lists:sort(combine(Vis))),
+    {Vls,Sis,St2} = select_labels(OptVls, St1, [], []),
+    {select_val_cg(Type, fetch_var(V, Bef), Vls, Tf, Vf, Sis), Aft, St2}.
+
+select_val_cg(tuple, R, [Arity,{f,Lbl}], Tf, Vf, [{label,Lbl}|Sis]) ->
+    [{test,is_tuple,{f,Tf},[R]},{test,test_arity,{f,Vf},[R,Arity]}|Sis];
+select_val_cg(tuple, R, Vls, Tf, Vf, Sis) ->
+    [{test,is_tuple,{f,Tf},[R]},{select_tuple_arity,R,{f,Vf},{list,Vls}}|Sis];
+select_val_cg(Type, R, [Val, {f,Lbl}], Fail, Fail, [{label,Lbl}|Sis]) ->
+    [{test,is_eq_exact,{f,Fail},[R,{Type,Val}]}|Sis];
+select_val_cg(Type, R, [Val, {f,Lbl}], Tf, Vf, [{label,Lbl}|Sis]) ->
+    [{test,select_type_test(Type),{f,Tf},[R]},
+     {test,is_eq_exact,{f,Vf},[R,{Type,Val}]}|Sis];
+select_val_cg(Type, R, Vls0, Tf, Vf, Sis) ->
+    Vls1 = map(fun ({f,Lbl}) -> {f,Lbl};
+		   (Value) -> {Type,Value}
+	       end, Vls0),
+    [{test,select_type_test(Type),{f,Tf},[R]}, {select_val,R,{f,Vf},{list,Vls1}}|Sis].
+
+select_type_test(tuple) -> is_tuple;
+select_type_test(integer) -> is_integer;
+select_type_test(atom) -> is_atom;
+select_type_test(float) -> is_float.
+
+combine([{Is,Vs1}, {Is,Vs2}|Vis]) -> combine([{Is,Vs1 ++ Vs2}|Vis]);
+combine([V|Vis]) -> [V|combine(Vis)];
+combine([]) -> [].
+
+select_labels([{Is,Vs}|Vis], St0, Vls, Sis) ->
+    {Lbl,St1} = new_label(St0),
+    select_labels(Vis, St1, add_vls(Vs, Lbl, Vls), [[{label,Lbl}|Is]|Sis]);
+select_labels([], St, Vls, Sis) ->
+    {Vls,append(Sis),St}.
+
+add_vls([V|Vs], Lbl, Acc) ->
+    add_vls(Vs, Lbl, [V, {f,Lbl}|Acc]);
+add_vls([], _, Acc) -> Acc.
+
+select_cons(#l{ke={val_clause,{cons,Es},B},i=I,vdb=Vdb}, V, Tf, Vf, Bef, St0) ->
+    {Eis,Int,St1} = select_extract_cons(V, Es, I, Vdb, Bef, St0),
+    {Bis,Aft,St2} = match_cg(B, Vf, Int, St1),
+    {[{test,is_nonempty_list,{f,Tf},[fetch_var(V, Bef)]}] ++ Eis ++ Bis,Aft,St2}.
+
+select_nil(#l{ke={val_clause,nil,B}}, V, Tf, Vf, Bef, St0) ->
+    {Bis,Aft,St1} = match_cg(B, Vf, Bef, St0),
+    {[{test,is_nil,{f,Tf},[fetch_var(V, Bef)]}] ++ Bis,Aft,St1}.
+
+select_binary(#l{ke={val_clause,{old_binary,Var},B}}=L,
+	      V, Tf, Vf, Bef, St) ->
+    %% Currently handled in the same way as new binaries.
+    select_binary(L#l{ke={val_clause,{binary,Var},B}}, V, Tf, Vf, Bef, St);
+select_binary(#l{ke={val_clause,{binary,{var,Ivar}},B},i=I,vdb=Vdb},
+	      V, Tf, Vf, Bef, St0) ->
+    Int0 = clear_dead(Bef, I, Vdb),
+    {Bis,Aft,St1} = match_cg(B, Vf, Int0, St0),
+    {[{test,bs_start_match,{f,Tf},[fetch_var(V, Bef)]},{bs_save,Ivar}|Bis],
+     Aft,St1}.
+
+select_bin_segs(Scs, Ivar, Tf, _Vf, Bef, St) ->
+    match_fmf(fun(S, Fail, Sta) ->
+		      select_bin_seg(S, Ivar, Fail, Bef, Sta) end,
+	      Tf, St, Scs).
+
+select_bin_seg(#l{ke={val_clause,{bin_seg,Size,U,T,Fs,Es},B},i=I,vdb=Vdb},
+		   Ivar, Fail, Bef, St0) ->
+    {Mis,Int,St1} = select_extract_bin(Es, Size, U, T, Fs, Fail,
+				       I, Vdb, Bef, St0),
+    {Bis,Aft,St2} = match_cg(B, Fail, Int, St1),
+    {[{bs_restore,Ivar}|Mis] ++ Bis,Aft,St2}.
+
+select_extract_bin([{var,Hd},{var,Tl}], Size0, Unit, Type, Flags, Vf,
+		   I, Vdb, Bef, St) ->
+    SizeReg = get_bin_size_reg(Size0, Bef),
+    {Es,Aft} =
+	case vdb_find(Hd, Vdb) of
+	    {_,_,Lhd} when Lhd =< I ->
+		{[{test,bs_skip_bits,{f,Vf},[SizeReg,Unit,{field_flags,Flags}]},
+		  {bs_save,Tl}],Bef};
+	    {_,_,_} ->
+		Reg0 = put_reg(Hd, Bef#sr.reg),
+		Int1 = Bef#sr{reg=Reg0},
+		Rhd = fetch_reg(Hd, Reg0),
+		Name = get_bits_instr(Type),
+		{[{test,Name,{f,Vf},[SizeReg,Unit,{field_flags,Flags},Rhd]},
+		  {bs_save,Tl}],Int1}
+	end,
+    {Es,clear_dead(Aft, I, Vdb),St}.
+
+get_bin_size_reg({var,V}, Bef) ->
+    fetch_var(V, Bef);
+get_bin_size_reg(Literal, _Bef) ->
+    Literal.
+
+select_bin_end(#l{ke={val_clause,bin_end,B}},
+		   Ivar, Tf, Vf, Bef, St0) ->
+    {Bis,Aft,St2} = match_cg(B, Vf, Bef, St0),
+    {[{bs_restore,Ivar},{test,bs_test_tail,{f,Tf},[0]}|Bis],Aft,St2}.
+
+get_bits_instr(integer) -> bs_get_integer;
+get_bits_instr(float)   -> bs_get_float;
+get_bits_instr(binary)  -> bs_get_binary.
+
+select_val(#l{ke={val_clause,{tuple,Es},B},i=I,vdb=Vdb}, V, Vf, Bef, St0) ->
+    {Eis,Int,St1} = select_extract_tuple(V, Es, I, Vdb, Bef, St0),
+    {Bis,Aft,St2} = match_cg(B, Vf, Int, St1),
+    {length(Es),Eis ++ Bis,Aft,St2};
+select_val(#l{ke={val_clause,{_,Val},B}}, _V, Vf, Bef, St0) ->
+    {Bis,Aft,St1} = match_cg(B, Vf, Bef, St0),
+    {Val,Bis,Aft,St1}.
+
+%% select_extract_tuple(Src, [V], I, Vdb, StackReg, State) ->
+%%      {[E],StackReg,State}.
+%%  Extract tuple elements, but only if they do not immediately die.
+
+select_extract_tuple(Src, Vs, I, Vdb, Bef, St) ->
+    F = fun ({var,V}, {Int0,Elem}) ->
+		case vdb_find(V, Vdb) of
+		    {V,_,L} when L =< I -> {[], {Int0,Elem+1}};
+		    _Other ->
+			Reg1 = put_reg(V, Int0#sr.reg),
+			Int1 = Int0#sr{reg=Reg1},
+			Rsrc = fetch_var(Src, Int1),
+			{[{get_tuple_element,Rsrc,Elem,fetch_reg(V, Reg1)}],
+			 {Int1,Elem+1}}
+		end
+	end,
+    {Es,{Aft,_}} = flatmapfoldl(F, {Bef,0}, Vs),
+    {Es,Aft,St}.
+
+select_extract_cons(Src, [{var,Hd}, {var,Tl}], I, Vdb, Bef, St) ->
+    {Es,Aft} = case {vdb_find(Hd, Vdb), vdb_find(Tl, Vdb)} of
+		   {{_,_,Lhd}, {_,_,Ltl}} when Lhd =< I, Ltl =< I ->
+		       %% Both head and tail are dead.  No need to generate
+		       %% any instruction.
+		       {[], Bef};
+		   _ ->
+		       %% At least one of head and tail will be used,
+		       %% but we must always fetch both.  We will call
+		       %% clear_dead/2 to allow reuse of the register
+		       %% in case only of them is used.
+
+		       Reg0 = put_reg(Tl, put_reg(Hd, Bef#sr.reg)),
+		       Int0 = Bef#sr{reg=Reg0},
+		       Rsrc = fetch_var(Src, Int0),
+		       Rhd = fetch_reg(Hd, Reg0),
+		       Rtl = fetch_reg(Tl, Reg0),
+		       Int1 = clear_dead(Int0, I, Vdb),
+		       {[{get_list,Rsrc,Rhd,Rtl}], Int1}
+	       end,
+    {Es,Aft,St}.
+
+
+guard_clause_cg(#l{ke={guard_clause,G,B},vdb=Vdb}, Fail, Bef, St0) ->
+    {Gis,Int,St1} = guard_cg(G, Fail, Vdb, Bef, St0),
+    {Bis,Aft,St2} = match_cg(B, Fail, Int, St1),
+    {Gis ++ Bis,Aft,St2}.
+
+%% guard_cg(Guard, Fail, Vdb, StackReg, State) ->
+%%      {[Ainstr],StackReg,State}.
+%%  A guard is a boolean expression of tests.  Tests return true or
+%%  false.  A fault in a test causes the test to return false.  Tests
+%%  never return the boolean, instead we generate jump code to go to
+%%  the correct exit point.  Primops and tests all go to the next
+%%  instruction on success or jump to a failure label.
+
+guard_cg(#l{ke={protected,Ts,Rs},i=I,vdb=Pdb}, Fail, _Vdb, Bef, St) ->
+    protected_cg(Ts, Rs, Fail, I, Pdb, Bef, St);
+guard_cg(#l{ke={block,Ts},i=I,vdb=Bdb}, Fail, _Vdb, Bef, St) ->
+    guard_cg_list(Ts, Fail, I, Bdb, Bef, St);
+guard_cg(#l{ke={test,Test,As},i=I,vdb=_Tdb}, Fail, Vdb, Bef, St) ->
+    test_cg(Test, As, Fail, I, Vdb, Bef, St);
+guard_cg(G, _Fail, Vdb, Bef, St) ->
+    %%ok = io:fwrite("cg ~w: ~p~n", [?LINE,{G,Fail,Vdb,Bef}]),
+    {Gis,Aft,St1} = cg(G, Vdb, Bef, St),
+    %%ok = io:fwrite("cg ~w: ~p~n", [?LINE,{Aft}]),
+    {Gis,Aft,St1}.
+
+%% protected_cg([Kexpr], [Ret], Fail, I, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
+%%  Do a protected.  Protecteds without return values are just done
+%%  for effect, the return value is not checked, success passes on to
+%%  the next instruction and failure jumps to Fail.  If there are
+%%  return values then these must be set to 'false' on failure,
+%%  control always passes to the next instruction.
+
+protected_cg(Ts, [], Fail, I, Vdb, Bef, St0) ->
+    %% Protect these calls, revert when done.
+    {Tis,Aft,St1} = guard_cg_list(Ts, Fail, I, Vdb, Bef,
+				  St0#cg{btype=fail,bfail=Fail}),
+    {Tis,Aft,St1#cg{btype=St0#cg.btype,bfail=St0#cg.bfail}};
+protected_cg(Ts, Rs, _Fail, I, Vdb, Bef, St0) ->
+    {Pfail,St1} = new_label(St0),
+    {Psucc,St2} = new_label(St1),
+    {Tis,Aft,St3} = guard_cg_list(Ts, Pfail, I, Vdb, Bef,
+				  St2#cg{btype=fail,bfail=Pfail}),
+    %%ok = io:fwrite("cg ~w: ~p~n", [?LINE,{Rs,I,Vdb,Aft}]),
+    %% Set return values to false.
+    Mis = map(fun ({var,V}) -> {move,{atom,false},fetch_var(V, Aft)} end, Rs),
+    Live = {'%live',max_reg(Aft#sr.reg)},
+    {Tis ++ [Live,{jump,{f,Psucc}},
+	     {label,Pfail}] ++ Mis ++ [Live,{label,Psucc}],
+     Aft,St3#cg{btype=St0#cg.btype,bfail=St0#cg.bfail}}.
+
+%% test_cg(TestName, Args, Fail, I, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
+%%  Generate test instruction.  Use explicit fail label here.
+
+test_cg(Test, As, Fail, I, Vdb, Bef, St) ->
+    case test_type(Test, length(As)) of
+	{cond_op,Op} ->
+	    Ars = cg_reg_args(As, Bef),
+	    Int = clear_dead(Bef, I, Vdb),
+	    {[{test,Op,{f,Fail},Ars}],
+	     clear_dead(Int, I, Vdb),
+	     St};
+	{rev_cond_op,Op} ->
+	    [S1,S2] = cg_reg_args(As, Bef),
+	    Int = clear_dead(Bef, I, Vdb),
+	    {[{test,Op,{f,Fail},[S2,S1]}],
+	     clear_dead(Int, I, Vdb),
+	     St}
+    end.
+
+test_type(is_atom, 1)      -> {cond_op,is_atom};
+test_type(is_boolean, 1)   -> {cond_op,is_boolean};
+test_type(is_binary, 1)    -> {cond_op,is_binary};
+test_type(is_constant, 1)  -> {cond_op,is_constant};
+test_type(is_float, 1)     -> {cond_op,is_float};
+test_type(is_function, 1)  -> {cond_op,is_function};
+test_type(is_integer, 1)   -> {cond_op,is_integer};
+test_type(is_list, 1)      -> {cond_op,is_list};
+test_type(is_number, 1)    -> {cond_op,is_number};
+test_type(is_pid, 1)       -> {cond_op,is_pid};
+test_type(is_port, 1)      -> {cond_op,is_port};
+test_type(is_reference, 1) -> {cond_op,is_reference};
+test_type(is_tuple, 1)     -> {cond_op,is_tuple};
+test_type('=<', 2)  -> {rev_cond_op,is_ge};
+test_type('>', 2)   -> {rev_cond_op,is_lt};
+test_type('<', 2)   -> {cond_op,is_lt};
+test_type('>=', 2)  -> {cond_op,is_ge};
+test_type('==', 2)  -> {cond_op,is_eq};
+test_type('/=', 2)  -> {cond_op,is_ne};
+test_type('=:=', 2) -> {cond_op,is_eq_exact};
+test_type('=/=', 2) -> {cond_op,is_ne_exact};
+test_type(internal_is_record, 3) -> {cond_op,internal_is_record}.
+
+%% guard_cg_list([Kexpr], Fail, I, Vdb, StackReg, St) ->
+%%      {[Ainstr],StackReg,St}.
+
+guard_cg_list(Kes, Fail, I, Vdb, Bef, St0) ->
+    {Keis,{Aft,St1}} =
+	flatmapfoldl(fun (Ke, {Inta,Sta}) ->
+			     {Keis,Intb,Stb} =
+				 guard_cg(Ke, Fail, Vdb, Inta, Sta),
+			     {comment(Inta) ++ Keis,{Intb,Stb}}
+		     end, {Bef,St0}, need_heap(Kes, I)),
+    {Keis,Aft,St1}.
+
+%% match_fmf(Fun, LastFail, State, [Clause]) -> {Is,Aft,State}.
+%%  This is a special flatmapfoldl for match code gen where we
+%%  generate a "failure" label for each clause. The last clause uses
+%%  an externally generated failure label, LastFail.  N.B. We do not
+%%  know or care how the failure labels are used.
+
+match_fmf(F, LastFail, St, [H]) ->
+    F(H, LastFail, St);
+match_fmf(F, LastFail, St0, [H|T]) ->
+    {Fail,St1} = new_label(St0),
+    {R,Aft1,St2} = F(H, Fail, St1),
+    {Rs,Aft2,St3} = match_fmf(F, LastFail, St2, T),
+    {R ++ [{label,Fail}] ++ Rs,sr_merge(Aft1, Aft2),St3};
+match_fmf(_, _, St, []) -> {[],void,St}.
+
+%% call_cg(Func, [Arg], [Ret], Le, Vdb, StackReg, State) ->
+%%      {[Ainstr],StackReg,State}.
+%% enter_cg(Func, [Arg], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
+%%  Call and enter first put the arguments into registers and save any
+%%  other registers, then clean up and compress the stack and set the
+%%  frame size. Finally the actual call is made.  Call then needs the
+%%  return values filled in.
+
+call_cg({var,V}, As, Rs, Le, Vdb, Bef, St0) ->
+    {Sis,Int} = cg_setup_call(As++[{var,V}], Bef, Le#l.i, Vdb),
+    %% Put return values in registers.
+    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
+    %% Build complete code and final stack/register state.
+    Arity = length(As),
+    {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
+    {comment({call_fun,{var,V},As}) ++ Sis ++ Frees ++ [{call_fun,Arity}],
+     Aft,need_stack_frame(St0)};
+call_cg({remote,Mod,Name}, As, Rs, Le, Vdb, Bef, St0)
+  when element(1, Mod) == var;
+       element(1, Name) == var ->
+    {Sis,Int} = cg_setup_call(As++[Mod,Name], Bef, Le#l.i, Vdb),
+    %% Put return values in registers.
+    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
+    %% Build complete code and final stack/register state.
+    Arity = length(As),
+    Call = {apply,Arity},
+    St = need_stack_frame(St0),
+    %%{Call,St1} = build_call(Func, Arity, St0),
+    {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
+    {Sis ++ Frees ++ [Call],Aft,St};
+call_cg(Func, As, Rs, Le, Vdb, Bef, St0) ->
+    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
+    %% Put return values in registers.
+    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
+    %% Build complete code and final stack/register state.
+    Arity = length(As),
+    {Call,St1} = build_call(Func, Arity, St0),
+    {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
+    {comment({call,Func,As}) ++ Sis ++ Frees ++ Call,Aft,St1}.
+
+build_call({remote,{atom,erlang},{atom,'!'}}, 2, St0) ->
+    {[send],need_stack_frame(St0)};
+build_call({remote,{atom,Mod},{atom,Name}}, Arity, St0) ->
+    {[{call_ext,Arity,{extfunc,Mod,Name,Arity}}],need_stack_frame(St0)};
+build_call(Name, Arity, St0) when atom(Name) ->
+    {Lbl,St1} = local_func_label(Name, Arity, need_stack_frame(St0)),
+    {[{call,Arity,{f,Lbl}}],St1}.
+
+free_dead(#sr{stk=Stk0}=Aft) ->
+    {Instr,Stk} = free_dead(Stk0, 0, [], []),
+    {Instr,Aft#sr{stk=Stk}}.
+
+free_dead([dead|Stk], Y, Instr, StkAcc) ->
+    %% Note: kill/1 is equivalent to init/1 (translated by beam_asm).
+    %% We use kill/1 to help further optimisation passes.
+    free_dead(Stk, Y+1, [{kill,{yy,Y}}|Instr], [free|StkAcc]);
+free_dead([Any|Stk], Y, Instr, StkAcc) ->
+    free_dead(Stk, Y+1, Instr, [Any|StkAcc]);
+free_dead([], _, Instr, StkAcc) -> {Instr,reverse(StkAcc)}.
+
+enter_cg({var,V}, As, Le, Vdb, Bef, St0) ->
+    {Sis,Int} = cg_setup_call(As++[{var,V}], Bef, Le#l.i, Vdb),
+    %% Build complete code and final stack/register state.
+    Arity = length(As),
+    {comment({call_fun,{var,V},As}) ++ Sis ++ [{call_fun,Arity},return],
+     clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
+     need_stack_frame(St0)};
+enter_cg({remote,Mod,Name}=Func, As, Le, Vdb, Bef, St0)
+  when element(1, Mod) == var;
+       element(1, Name) == var ->
+    {Sis,Int} = cg_setup_call(As++[Mod,Name], Bef, Le#l.i, Vdb),
+    %% Build complete code and final stack/register state.
+    Arity = length(As),
+    Call = {apply_only,Arity},
+    St = need_stack_frame(St0),
+    {comment({enter,Func,As}) ++ Sis ++ [Call],
+     clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
+     St};
+enter_cg(Func, As, Le, Vdb, Bef, St0) ->
+    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
+    %% Build complete code and final stack/register state.
+    Arity = length(As),
+    {Call,St1} = build_enter(Func, Arity, St0),
+    {comment({enter,Func,As}) ++ Sis ++ Call,
+     clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
+     St1}.
+
+build_enter({remote,{atom,erlang},{atom,'!'}}, 2, St0) ->
+    {[send,return],need_stack_frame(St0)};
+build_enter({remote,{atom,Mod},{atom,Name}}, Arity, St0) ->
+    St1 = case trap_bif(Mod, Name, Arity) of
+	      true -> need_stack_frame(St0);
+	      false -> St0
+	  end,
+    {[{call_ext_only,Arity,{extfunc,Mod,Name,Arity}}],St1};
+build_enter(Name, Arity, St0) when is_atom(Name) ->
+    {Lbl,St1} = local_func_label(Name, Arity, St0),
+    {[{call_only,Arity,{f,Lbl}}],St1}.
+
+%% local_func_label(Name, Arity, State) -> {Label,State'}
+%%  Get the function entry label for a local function.
+
+local_func_label(Name, Arity, St0) ->
+    Key = {Name,Arity},
+    case keysearch(Key, 1, St0#cg.functable) of
+	{value,{Key,Label}} ->
+	    {Label,St0};
+	false ->
+	    {Label,St1} = new_label(St0),
+	    {Label,St1#cg{functable=[{Key,Label}|St1#cg.functable]}}
+    end.
+
+%% need_stack_frame(State) -> State'
+%%  Make a note in the state that this function will need a stack frame.
+
+need_stack_frame(#cg{need_frame=true}=St) -> St;
+need_stack_frame(St) -> St#cg{need_frame=true}.
+
+%% trap_bif(Mod, Name, Arity) -> true|false
+%%   Trap bifs that need a stack frame.
+
+trap_bif(erlang, '!', 2) -> true;
+trap_bif(erlang, link, 1) -> true;
+trap_bif(erlang, unlink, 1) -> true;
+trap_bif(erlang, monitor_node, 2) -> true;
+trap_bif(erlang, group_leader, 2) -> true;
+trap_bif(erlang, exit, 2) -> true;
+trap_bif(_, _, _) -> false.
+
+%% bif_cg(Bif, [Arg], [Ret], Le, Vdb, StackReg, State) ->
+%%      {[Ainstr],StackReg,State}.
+
+bif_cg(dsetelement, [Index0,Tuple0,New0], _Rs, Le, Vdb, Bef, St0) ->
+    [New,Tuple,{integer,Index1}] = cg_reg_args([New0,Tuple0,Index0], Bef),
+    Index = Index1-1,
+    {[{set_tuple_element,New,Tuple,Index}],
+     clear_dead(Bef, Le#l.i, Vdb), St0};
+bif_cg({make_fun,Func,Arity,Index,Uniq}, As, Rs, Le, Vdb, Bef, St0) ->
+    %% This behaves more like a function call.
+    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
+    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
+    {FuncLbl,St1} = local_func_label(Func, Arity, St0),
+    MakeFun = case St0#cg.new_funs of
+		  true -> {make_fun2,{f,FuncLbl},Index,Uniq,length(As)};
+		  false -> {make_fun,{f,FuncLbl},Uniq,length(As)}
+	      end,
+    {comment({make_fun,{Func,Arity,Uniq},As}) ++ Sis ++
+     [MakeFun],
+     clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb),
+     St1};
+bif_cg(Bif, As, [{var,V}], Le, Vdb, Bef, St0) ->
+    Ars = cg_reg_args(As, Bef),
+
+    %% If we are inside a catch, we must save everything that will
+    %% be alive after the catch (because the BIF might fail and there
+    %% will be a jump to the code after the catch).
+    %%   Currently, we are somewhat pessimistic in
+    %% that we save any variable that will be live after this BIF call.
+
+    {Sis,Int0} =
+	case St0#cg.in_catch of
+	    true -> adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb);
+	    false -> {[],Bef}
+	end,
+
+    Int1 = clear_dead(Int0, Le#l.i, Vdb),
+    Reg = put_reg(V, Int1#sr.reg),
+    Int = Int1#sr{reg=Reg},
+    Dst = fetch_reg(V, Reg),
+    {Sis ++ [{bif,Bif,bif_fail(St0#cg.btype, St0#cg.bfail, length(Ars)),Ars,Dst}],
+     clear_dead(Int, Le#l.i, Vdb), St0}.
+
+bif_fail(_, _, 0) -> nofail;
+bif_fail(exit, _, _) -> {f,0};
+bif_fail(fail, Fail, _) -> {f,Fail}.
+
+%% recv_loop_cg(TimeOut, ReceiveVar, ReceiveMatch, TimeOutExprs,
+%%              [Ret], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
+
+recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, Vdb, Bef, St0) ->
+    {Sis,Int0} = adjust_stack(Bef, Le#l.i, Le#l.i, Vdb),
+    Int1 = Int0#sr{reg=clear_regs(Int0#sr.reg)},
+    %% Get labels.
+    {Rl,St1} = new_label(St0),
+    {Tl,St2} = new_label(St1),
+    {Bl,St3} = new_label(St2),
+    St4 = St3#cg{break=Bl,recv=Rl},		%Set correct receive labels
+    {Ris,Raft,St5} = cg_recv_mesg(Rvar, Rm, Tl, Int1, St4),
+    {Wis,Taft,St6} = cg_recv_wait(Te, Tes, Le#l.i, Int1, St5),
+    Int2 = sr_merge(Raft, Taft),		%Merge stack/registers
+    Reg = load_vars(Rs, Int2#sr.reg),
+    {Sis ++ Ris ++ [{label,Tl}] ++ Wis ++ [{label,Bl}],
+     clear_dead(Int2#sr{reg=Reg}, Le#l.i, Vdb),
+     St6#cg{break=St0#cg.break,recv=St0#cg.recv}}.
+
+%% cg_recv_mesg( ) -> {[Ainstr],Aft,St}.
+
+cg_recv_mesg({var,R}, Rm, Tl, Bef, St0) ->
+    Int0 = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
+    Ret = fetch_reg(R, Int0#sr.reg),
+    %% Int1 = clear_dead(Int0, I, Rm#l.vdb),
+    Int1 = Int0,
+    {Mis,Int2,St1} = match_cg(Rm, none, Int1, St0),
+    {[{'%live',0},{label,St1#cg.recv},{loop_rec,{f,Tl},Ret}|Mis],Int2,St1}.
+
+%% cg_recv_wait(Te, Tes, I, Vdb, Int2, St3) -> {[Ainstr],Aft,St}.
+
+cg_recv_wait({atom,infinity}, Tes, I, Bef, St0) ->
+    %% We know that the 'after' body will never be executed.
+    %% But to keep the stack and register information up to date,
+    %% we will generate the code for the 'after' body, and then discard it.
+    Int1 = clear_dead(Bef, I, Tes#l.vdb),
+    {_,Int2,St1} = cg_block(Tes#l.ke, Tes#l.i, Tes#l.vdb,
+			      Int1#sr{reg=clear_regs(Int1#sr.reg)}, St0),
+    {[{wait,{f,St1#cg.recv}}],Int2,St1};
+cg_recv_wait({integer,0}, Tes, _I, Bef, St0) ->
+    {Tis,Int,St1} = cg_block(Tes#l.ke, Tes#l.i, Tes#l.vdb, Bef, St0),
+    {[timeout|Tis],Int,St1};
+cg_recv_wait(Te, Tes, I, Bef, St0) ->
+    Reg = cg_reg_arg(Te, Bef),
+    %% Must have empty registers here!  Bug if anything in registers.
+    Int0 = clear_dead(Bef, I, Tes#l.vdb),
+    {Tis,Int,St1} = cg_block(Tes#l.ke, Tes#l.i, Tes#l.vdb,
+			     Int0#sr{reg=clear_regs(Int0#sr.reg)}, St0),
+    {[{wait_timeout,{f,St1#cg.recv},Reg},timeout] ++ Tis,Int,St1}.
+
+%% recv_next_cg(Le, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
+%%  Use adjust stack to clear stack, but only need it for Aft.
+
+recv_next_cg(Le, Vdb, Bef, St) ->
+    {Sis,Aft} = adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb),
+    {[{loop_rec_end,{f,St#cg.recv}}] ++ Sis,Aft,St}.	%Joke
+
+%% try_cg(TryBlock, [BodyVar], TryBody, [ExcpVar], TryHandler, [Ret],
+%%        Le, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
+
+try_cg(Ta, Vs, Tb, Evs, Th, Rs, Le, Vdb, Bef, St0) ->
+    {B,St1} = new_label(St0),			%Body label
+    {H,St2} = new_label(St1),			%Handler label
+    {E,St3} = new_label(St2),			%End label
+    TryTag = Ta#l.i,
+    Int1 = Bef#sr{stk=put_catch(TryTag, Bef#sr.stk)},
+    TryReg = fetch_stack({catch_tag,TryTag}, Int1#sr.stk),
+    {Ais,Int2,St4} = cg(Ta, Vdb, Int1, St3#cg{break=B,in_catch=true}),
+    Int3 = Int2#sr{stk=drop_catch(TryTag, Int2#sr.stk)},
+    St5 = St4#cg{break=E,in_catch=St3#cg.in_catch},
+    {Bis,Baft,St6} = cg(Tb, Vdb, Int3#sr{reg=load_vars(Vs, Int3#sr.reg)}, St5),
+    {His,Haft,St7} = cg(Th, Vdb, Int3#sr{reg=load_vars(Evs, Int3#sr.reg)}, St6),
+    Int4 = sr_merge(Baft, Haft),		%Merge stack/registers
+    Aft = Int4#sr{reg=load_vars(Rs, Int4#sr.reg)},
+    {[{'try',TryReg,{f,H}}] ++ Ais ++
+     [{label,B},{try_end,TryReg}] ++ Bis ++
+     [{label,H},{try_case,TryReg}] ++ His ++
+     [{label,E}],
+     clear_dead(Aft, Le#l.i, Vdb),
+     St7#cg{break=St0#cg.break}}.
+
+%% catch_cg(CatchBlock, Ret, Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
+
+catch_cg(C, {var,R}, Le, Vdb, Bef, St0) ->
+    {B,St1} = new_label(St0),
+    CatchTag = Le#l.i,
+    Int1 = Bef#sr{stk=put_catch(CatchTag, Bef#sr.stk)},
+    CatchReg = fetch_stack({catch_tag,CatchTag}, Int1#sr.stk),
+    {Cis,Int2,St2} = cg_block(C, Le#l.i, Le#l.vdb, Int1,
+			      St1#cg{break=B,in_catch=true}),
+    Aft = Int2#sr{reg=load_reg(R, 0, Int2#sr.reg),
+		  stk=drop_catch(CatchTag, Int2#sr.stk)},
+    {[{'catch',CatchReg,{f,B}}] ++ Cis ++
+     [{label,B},{catch_end,CatchReg}],
+     clear_dead(Aft, Le#l.i, Vdb),
+     St2#cg{break=St1#cg.break,in_catch=St1#cg.in_catch}}.
+
+%% set_cg([Var], Constr, Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
+%%  We have to be careful how a 'set' works. First the structure is
+%%  built, then it is filled and finally things can be cleared. The
+%%  annotation must reflect this and make sure that the return
+%%  variable is allocated first.
+%%
+%%  put_list for constructing a cons is an atomic instruction
+%%  which can safely resuse one of the source registers as target.
+%%  Also binaries can reuse a source register as target.
+
+set_cg([{var,R}], {cons,Es}, Le, Vdb, Bef, St) ->
+    [S1,S2] = map(fun ({var,V}) -> fetch_var(V, Bef);
+		      (Other) -> Other
+		  end, Es),
+    Int0 = clear_dead(Bef, Le#l.i, Vdb),
+    Int1 = Int0#sr{reg=put_reg(R, Int0#sr.reg)},
+    Ret = fetch_reg(R, Int1#sr.reg),
+    {[{put_list,S1,S2,Ret}], Int1, St};
+set_cg([{var,R}], {old_binary,Segs}, Le, Vdb, Bef, St) ->
+    Fail = bif_fail(St#cg.btype, St#cg.bfail, 42),
+    PutCode = cg_bin_put(Segs, Fail, Bef),
+    Code = cg_binary_old(PutCode),
+    Int0 = clear_dead(Bef, Le#l.i, Vdb),
+    Aft = Int0#sr{reg=put_reg(R, Int0#sr.reg)},
+    Ret = fetch_reg(R, Aft#sr.reg),
+    {Code ++ [{bs_final,Fail,Ret}],Aft,St};
+set_cg([{var,R}], {binary,Segs}, Le, Vdb, Bef, #cg{in_catch=InCatch}=St) ->
+    Int0 = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
+    Target = fetch_reg(R, Int0#sr.reg),
+    Fail = bif_fail(St#cg.btype, St#cg.bfail, 42),
+    Temp = find_scratch_reg(Int0#sr.reg),
+    PutCode = cg_bin_put(Segs, Fail, Bef),
+    {Sis,Int1} =
+	case InCatch of
+	    true -> adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb);
+	    false -> {[],Int0}
+	end,
+    Aft = clear_dead(Int1, Le#l.i, Vdb),
+    Code = cg_binary(PutCode, Target, Temp, Fail, Aft),
+    {Sis++Code,Aft,St};
+set_cg([{var,R}], Con, Le, Vdb, Bef, St) ->
+    %% Find a place for the return register first.
+    Int = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
+    Ret = fetch_reg(R, Int#sr.reg),
+    Ais = case Con of
+	      {tuple,Es} ->
+		  [{put_tuple,length(Es),Ret}] ++ cg_build_args(Es, Bef);
+	      {var,V} ->			% Normally removed by kernel optimizer.
+		  [{move,fetch_var(V, Int),Ret}];
+	      {string,Str} ->
+		  [{put_string,length(Str),{string,Str},Ret}];
+	      Other ->
+		  [{move,Other,Ret}]
+	  end,
+    {Ais,clear_dead(Int, Le#l.i, Vdb),St};
+set_cg([], {binary,Segs}, Le, Vdb, Bef, St) ->
+    Fail = bif_fail(St#cg.btype, St#cg.bfail, 42),
+    Target = find_scratch_reg(Bef#sr.reg),
+    Temp = find_scratch_reg(put_reg(Target, Bef#sr.reg)),
+    PutCode = cg_bin_put(Segs, Fail, Bef),
+    Code = cg_binary(PutCode, Target, Temp, Fail, Bef),
+    Aft = clear_dead(Bef, Le#l.i, Vdb),
+    {Code,Aft,St};
+set_cg([], {old_binary,Segs}, Le, Vdb, Bef, St) ->
+    Fail = bif_fail(St#cg.btype, St#cg.bfail, 42),
+    PutCode = cg_bin_put(Segs, Fail, Bef),
+    Ais0 = cg_binary_old(PutCode),
+    Ret = find_scratch_reg(Bef#sr.reg),
+    Ais = Ais0 ++ [{bs_final,Fail,Ret}],
+    {Ais,clear_dead(Bef, Le#l.i, Vdb),St};
+set_cg([], _, Le, Vdb, Bef, St) ->
+    %% This should have been stripped by compiler, just cleanup.
+    {[],clear_dead(Bef, Le#l.i, Vdb), St}.
+
+
+%%%
+%%% Code generation for constructing binaries.
+%%%
+
+cg_binary(PutCode, Target, Temp, Fail, Bef) ->
+    SzCode = cg_binary_size(PutCode, Target, Temp, Fail),
+    MaxRegs = max_reg(Bef#sr.reg),
+    Code = SzCode ++ [{bs_init2,Fail,Target,MaxRegs,{field_flags,[]},Target}|PutCode],
+    cg_bin_opt(Code).
+
+cg_binary_size(PutCode, Target, Temp, Fail) ->
+    Szs = cg_binary_size_1(PutCode, 0, []),
+    cg_binary_size_expr(Szs, Target, Temp, Fail).
+
+cg_binary_size_1([{_Put,_Fail,S,U,_Flags,Src}|T], Bits, Acc) ->
+    cg_binary_size_2(S, U, Src, T, Bits, Acc);
+cg_binary_size_1([], Bits, Acc) ->
+    Bytes = Bits div 8,
+    RemBits = Bits rem 8,
+    Res = sort([{1,{integer,RemBits}},{8,{integer,Bytes}}|Acc]),
+    cg_binary_size_3(Res).
+
+cg_binary_size_2({integer,N}, U, _, Next, Bits, Acc) ->
+    cg_binary_size_1(Next, Bits+N*U, Acc);
+cg_binary_size_2({atom,all}, 8, E, Next, Bits, Acc) ->
+    cg_binary_size_1(Next, Bits, [{8,{size,E}}|Acc]);
+cg_binary_size_2(Reg, 1, _, Next, Bits, Acc) ->
+    cg_binary_size_1(Next, Bits, [{1,Reg}|Acc]);
+cg_binary_size_2(Reg, 8, _, Next, Bits, Acc) ->
+    cg_binary_size_1(Next, Bits, [{8,Reg}|Acc]);
+cg_binary_size_2(Reg, U, _, Next, Bits, Acc) ->
+    cg_binary_size_1(Next, Bits, [{1,{'*',Reg,U}}|Acc]).
+
+cg_binary_size_3([{_,{integer,0}}|T]) ->
+    cg_binary_size_3(T);
+cg_binary_size_3([{U,S1},{U,S2}|T]) ->
+    {L0,Rest} = cg_binary_size_4(T, U, []),
+    L = [S1,S2|L0],
+    [{U,L}|cg_binary_size_3(Rest)];
+cg_binary_size_3([{U,S}|T]) ->
+    [{U,[S]}|cg_binary_size_3(T)];
+cg_binary_size_3([]) -> [].
+
+cg_binary_size_4([{U,S}|T], U, Acc) ->
+    cg_binary_size_4(T, U, [S|Acc]);
+cg_binary_size_4(T, _, Acc) ->
+    {Acc,T}.
+
+%% cg_binary_size_expr/4
+%%  Generate code for calculating the resulting size of a binary.
+cg_binary_size_expr(Sizes, Target, Temp, Fail) ->
+    cg_binary_size_expr_1(Sizes, Target, Temp, Fail,
+			  [{move,{integer,0},Target}]).
+
+cg_binary_size_expr_1([{1,E0}|T], Target, Temp, Fail, Acc) ->
+    E1 = cg_gen_binsize(E0, Target, Temp, Fail, Acc),
+    E = [{bs_bits_to_bytes,Fail,Target,Target}|E1],
+    cg_binary_size_expr_1(T, Target, Temp, Fail, E);
+cg_binary_size_expr_1([{8,E0}], Target, Temp, Fail, Acc) ->
+    E = cg_gen_binsize(E0, Target, Temp, Fail, Acc),
+    reverse(E);
+cg_binary_size_expr_1([], _, _, _, Acc) -> reverse(Acc).
+
+cg_gen_binsize([{'*',A,B}|T], Target, Temp, Fail, Acc) ->
+    cg_gen_binsize(T, Target, Temp, Fail,
+		   [{bs_add,Fail,[Target,A,B],Target}|Acc]);
+cg_gen_binsize([{size,B}|T], Target, Temp, Fail, Acc) ->
+    cg_gen_binsize([Temp|T], Target, Temp, Fail,
+		   [{bif,size,Fail,[B],Temp}|Acc]);
+cg_gen_binsize([E0|T], Target, Temp, Fail, Acc) ->
+    cg_gen_binsize(T, Target, Temp, Fail,
+		   [{bs_add,Fail,[Target,E0,1],Target}|Acc]);
+cg_gen_binsize([], _, _, _, Acc) -> Acc.
+
+%% cg_bin_opt(Code0) -> Code
+%%  Optimize the size calculations for binary construction.
+
+cg_bin_opt([{move,{integer,0},D},{bs_add,_,[D,{integer,_}=S,1],Dst}|Is]) ->
+    cg_bin_opt([{move,S,Dst}|Is]);
+cg_bin_opt([{move,{integer,0},D},{bs_add,Fail,[D,S,U],Dst}|Is]) ->
+    cg_bin_opt([{bs_add,Fail,[{integer,0},S,U],Dst}|Is]);
+cg_bin_opt([{move,{integer,Bytes},D},{bs_init2,Fail,D,Regs0,Flags,D}|Is]) ->
+    Regs = cg_bo_newregs(Regs0, D),
+    cg_bin_opt([{bs_init2,Fail,Bytes,Regs,Flags,D}|Is]);
+cg_bin_opt([{move,Src,D},{bs_init2,Fail,D,Regs0,Flags,D}|Is]) ->
+    Regs = cg_bo_newregs(Regs0, D),
+    cg_bin_opt([{bs_init2,Fail,Src,Regs,Flags,D}|Is]);
+cg_bin_opt([{move,Src,Dst},{bs_bits_to_bytes,Fail,Dst,Dst}|Is]) ->
+    cg_bin_opt([{bs_bits_to_bytes,Fail,Src,Dst}|Is]);
+cg_bin_opt([{move,Src1,Dst},{bs_add,Fail,[Dst,Src2,U],Dst}|Is]) ->
+    cg_bin_opt([{bs_add,Fail,[Src1,Src2,U],Dst}|Is]);
+cg_bin_opt([{bs_bits_to_bytes,Fail,{integer,N},_}|Is0]) when N rem 8 =/= 0 ->
+    case Fail of
+	{f,0} ->
+	    Is = [{move,{atom,badarg},{x,0}},
+		  {call_ext_only,1,{extfunc,erlang,error,1}}|Is0],
+	    cg_bin_opt(Is);
+	_ ->
+	    cg_bin_opt([{jump,Fail}|Is0])
+    end;
+cg_bin_opt([I|Is]) ->
+    [I|cg_bin_opt(Is)];
+cg_bin_opt([]) -> [].
+
+cg_bo_newregs(R, {x,X}) when R-1 =:= X -> R-1;
+cg_bo_newregs(R, _) -> R.
+
+%% Common for new and old binary code generation.
+
+cg_bin_put({bin_seg,S0,U,T,Fs,[E0,Next]}, Fail, Bef) ->
+    S1 = case S0 of
+	     {var,Sv} -> fetch_var(Sv, Bef);
+	     _ -> S0
+	 end,
+    E1 = case E0 of
+	     {var,V} -> fetch_var(V, Bef);
+	     Other ->   Other
+	 end,
+    Op = case T of
+	     integer -> bs_put_integer;
+	     binary  -> bs_put_binary;
+	     float   -> bs_put_float
+	 end,
+    [{Op,Fail,S1,U,{field_flags,Fs},E1}|cg_bin_put(Next, Fail, Bef)];
+cg_bin_put(bin_end, _, _) -> [].
+
+%% Old style.
+
+cg_binary_old(PutCode) ->
+    [cg_bs_init(PutCode)] ++ need_bin_buf(PutCode).
+
+cg_bs_init(Code) ->
+    {Size,Fs} = foldl(fun ({_,_,{integer,N},U,_,_}, {S,Fs}) ->
+			      {S + N*U,Fs};
+			  (_, {S,_}) ->
+			      {S,[]}
+		      end, {0,[exact]}, Code),
+    {bs_init,(Size+7) div 8,{field_flags,Fs}}.
+
+need_bin_buf(Code0) ->
+    {Code1,F,H} = foldr(fun ({_,_,{integer,N},U,_,_}=Bs, {Code,F,H}) ->
+				{[Bs|Code],F,H + N*U};
+			    ({_,_,_,_,_,_}=Bs, {Code,F,H}) ->
+				{[Bs|need_bin_buf_need(H, F, Code)],true,0}
+			end, {[],false,0}, Code0),
+    need_bin_buf_need(H, F, Code1).
+
+need_bin_buf_need(0, false, Rest) -> Rest;
+need_bin_buf_need(H, _, Rest) -> [{bs_need_buf,H}|Rest].
+
+cg_build_args(As, Bef) ->
+    map(fun ({var,V}) -> {put,fetch_var(V, Bef)};
+	    (Other) -> {put,Other}
+	end, As).
+
+%% return_cg([Val], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
+%% break_cg([Val], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
+%%  These are very simple, just put return/break values in registers
+%%  from 0, then return/break.  Use the call setup to clean up stack,
+%%  but must clear registers to ensure sr_merge works correctly.
+
+return_cg(Rs, Le, Vdb, Bef, St) ->
+    {Ms,Int} = cg_setup_call(Rs, Bef, Le#l.i, Vdb),
+    {comment({return,Rs}) ++ Ms ++ [return],
+     Int#sr{reg=clear_regs(Int#sr.reg)},St}.
+
+break_cg(Bs, Le, Vdb, Bef, St) ->
+    {Ms,Int} = cg_setup_call(Bs, Bef, Le#l.i, Vdb),
+    {comment({break,Bs}) ++ Ms ++ [{jump,{f,St#cg.break}}],
+     Int#sr{reg=clear_regs(Int#sr.reg)},St}.
+
+%% cg_reg_arg(Arg0, Info) -> Arg
+%% cg_reg_args([Arg0], Info) -> [Arg]
+%%  Convert argument[s] into registers. Literal values are returned unchanged.
+
+cg_reg_args(As, Bef) -> [cg_reg_arg(A, Bef) || A <- As].
+
+cg_reg_arg({var,V}, Bef) -> fetch_var(V, Bef);
+cg_reg_arg(Literal, _) -> Literal.
+
+%% cg_setup_call([Arg], Bef, Cur, Vdb) -> {[Instr],Aft}.
+%%  Do the complete setup for a call/enter.
+
+cg_setup_call(As, Bef, I, Vdb) ->
+    {Ms,Int0} = cg_call_args(As, Bef, I, Vdb),
+    %% Have set up arguments, can now clean up, compress and save to stack.
+    Int1 = Int0#sr{stk=clear_dead_stk(Int0#sr.stk, I, Vdb),res=[]},
+    {Sis,Int2} = adjust_stack(Int1, I, I+1, Vdb),
+    {Ms ++ Sis ++ [{'%live',length(As)}],Int2}.
+
+%% cg_call_args([Arg], SrState) -> {[Instr],SrState}.
+%%  Setup the arguments to a call/enter/bif. Put the arguments into
+%%  consecutive registers starting at {x,0} moving any data which
+%%  needs to be saved. Return a modified SrState structure with the
+%%  new register contents.  N.B. the resultant register info will
+%%  contain non-variable values when there are non-variable values.
+%%
+%%  This routine is complicated by unsaved values in x registers.
+%%  We'll move away any unsaved values that are in the registers
+%%  to be overwritten by the arguments.
+
+cg_call_args(As, Bef, I, Vdb) ->
+    Regs0 = load_arg_regs(Bef#sr.reg, As),
+    Unsaved = unsaved_registers(Regs0, Bef#sr.stk, I, I+1, Vdb),
+    {UnsavedMoves,Regs} = move_unsaved(Unsaved, Bef#sr.reg, Regs0),
+    Moves0 = gen_moves(As, Bef),
+    Moves = order_moves(Moves0, find_scratch_reg(Regs)),
+    {UnsavedMoves ++ Moves,Bef#sr{reg=Regs}}.
+
+%% load_arg_regs([Reg], Arguments) -> [Reg]
+%%  Update the register descriptor to include the arguments (from {x,0}
+%%  and upwards). Values in argument register are overwritten.
+%%  Values in x registers above the arguments are preserved.
+
+load_arg_regs(Regs, As) -> load_arg_regs(Regs, As, 0).
+
+load_arg_regs([_|Rs], [{var,V}|As], I) -> [{I,V}|load_arg_regs(Rs, As, I+1)];
+load_arg_regs([_|Rs], [A|As], I) -> [{I,A}|load_arg_regs(Rs, As, I+1)];
+load_arg_regs([], [{var,V}|As], I) -> [{I,V}|load_arg_regs([], As, I+1)];
+load_arg_regs([], [A|As], I) -> [{I,A}|load_arg_regs([], As, I+1)];
+load_arg_regs(Rs, [], _) -> Rs.
+
+%% Returns the variables must be saved and are currently in the
+%% x registers that are about to be overwritten by the arguments.
+
+unsaved_registers(Regs, Stk, Fb, Lf, Vdb) ->
+    [V || {V,F,L} <- Vdb,
+	  F < Fb,
+	  L >= Lf,
+	  not on_stack(V, Stk),
+	  not in_reg(V, Regs)].
+
+in_reg(V, Regs) -> keymember(V, 2, Regs).
+
+%% Move away unsaved variables from the registers that are to be
+%% overwritten by the arguments.
+move_unsaved(Vs, OrigRegs, NewRegs) ->
+    move_unsaved(Vs, OrigRegs, NewRegs, []).
+
+move_unsaved([V|Vs], OrigRegs, NewRegs0, Acc) ->
+    NewRegs = put_reg(V, NewRegs0),
+    Src = fetch_reg(V, OrigRegs),
+    Dst = fetch_reg(V, NewRegs),
+    move_unsaved(Vs, OrigRegs, NewRegs, [{move,Src,Dst}|Acc]);
+move_unsaved([], _, Regs, Acc) -> {Acc,Regs}.
+
+%% gen_moves(As, Sr)
+%%  Generate the basic move instruction to move the arguments
+%%  to their proper registers. The list will be sorted on
+%%  destinations. (I.e. the move to {x,0} will be first --
+%%  see the comment to order_moves/2.)
+
+gen_moves(As, Sr) -> gen_moves(As, Sr, 0, []).
+
+gen_moves([{var,V}|As], Sr, I, Acc) ->
+    case fetch_var(V, Sr) of
+	{x,I} -> gen_moves(As, Sr, I+1, Acc);
+	Reg -> gen_moves(As, Sr, I+1, [{move,Reg,{x,I}}|Acc])
+    end;
+gen_moves([A|As], Sr, I, Acc) ->
+    gen_moves(As, Sr, I+1, [{move,A,{x,I}}|Acc]);
+gen_moves([], _, _, Acc) -> lists:keysort(3, Acc).
+
+%% order_moves([Move], ScratchReg) -> [Move]
+%%  Orders move instruction so that source registers are not
+%%  destroyed before they are used. If there are cycles
+%%  (such as {move,{x,0},{x,1}}, {move,{x,1},{x,1}}),
+%%  the scratch register is used to break up the cycle.
+%%    If possible, the first move of the input list is placed
+%%  last in the result list (to make the move to {x,0} occur
+%%  just before the call to allow the Beam loader to coalesce
+%%  the instructions).
+
+order_moves(Ms, Scr) -> order_moves(Ms, Scr, []).
+
+order_moves([{move,_,_}=M|Ms0], ScrReg, Acc0) ->
+    {Chain,Ms} = collect_chain(Ms0, [M], ScrReg),
+    Acc = reverse(Chain, Acc0),
+    order_moves(Ms, ScrReg, Acc);
+order_moves([], _, Acc) -> Acc.
+
+collect_chain(Ms, Path, ScrReg) ->
+    collect_chain(Ms, Path, [], ScrReg).
+
+collect_chain([{move,Src,Same}=M|Ms0], [{move,Same,_}|_]=Path, Others, ScrReg) ->
+    case keysearch(Src, 3, Path) of
+	{value,_} ->				%We have a cycle.
+	    {break_up_cycle(M, Path, ScrReg),reverse(Others, Ms0)};
+	false ->
+	    collect_chain(reverse(Others, Ms0), [M|Path], [], ScrReg)
+    end;
+collect_chain([M|Ms], Path, Others, ScrReg) ->
+    collect_chain(Ms, Path, [M|Others], ScrReg);
+collect_chain([], Path, Others, _) ->
+    {Path,Others}.
+
+break_up_cycle({move,Src,_}=M, Path, ScrReg) ->
+    [{move,ScrReg,Src},M|break_up_cycle1(Src, Path, ScrReg)].
+
+break_up_cycle1(Dst, [{move,Src,Dst}|Path], ScrReg) ->
+    [{move,Src,ScrReg}|Path];
+break_up_cycle1(Dst, [M|Path], LastMove) ->
+    [M|break_up_cycle1(Dst, Path, LastMove)].
+
+%% clear_dead(Sr, Until, Vdb) -> Aft.
+%%  Remove all variables in Sr which have died AT ALL so far.
+
+clear_dead(Sr, Until, Vdb) ->
+    Sr#sr{reg=clear_dead_reg(Sr, Until, Vdb),
+	  stk=clear_dead_stk(Sr#sr.stk, Until, Vdb)}.
+
+clear_dead_reg(Sr, Until, Vdb) ->
+    Reg = map(fun ({I,V}) ->
+		      case vdb_find(V, Vdb) of
+			  {V,_,L} when L > Until -> {I,V};
+			  _ -> free		%Remove anything else
+		      end;
+		  ({reserved,I,V}) -> {reserved,I,V};
+		  (free) -> free
+	      end, Sr#sr.reg),
+    reserve(Sr#sr.res, Reg, Sr#sr.stk).
+
+clear_dead_stk(Stk, Until, Vdb) ->
+    map(fun ({V}) ->
+		case vdb_find(V, Vdb) of
+		    {V,_,L} when L > Until -> {V};
+		    _ -> dead			%Remove anything else
+		end;
+	    (free) -> free;
+	    (dead) -> dead
+	end, Stk).
+
+%% sr_merge(Sr1, Sr2) -> Sr.
+%%  Merge two stack/register states keeping the longest of both stack
+%%  and register. Perform consistency check on both, elements must be
+%%  the same.  Allow frame size 'void' to make easy creation of
+%%  "empty" frame.
+
+sr_merge(#sr{reg=R1,stk=S1,res=[]}, #sr{reg=R2,stk=S2,res=[]}) ->
+    #sr{reg=longest(R1, R2),stk=longest(S1, S2),res=[]};
+sr_merge(void, S2) -> S2#sr{res=[]};
+sr_merge(S1, void) -> S1#sr{res=[]}.
+
+longest([H|T1], [H|T2]) -> [H|longest(T1, T2)];
+longest([dead|T1], [free|T2]) -> [dead|longest(T1, T2)];
+longest([free|T1], [dead|T2]) -> [dead|longest(T1, T2)];
+longest([dead|T1], []) -> [dead|T1];
+longest([], [dead|T2]) -> [dead|T2];
+longest([free|T1], []) -> [free|T1];
+longest([], [free|T2]) -> [free|T2];
+longest([], []) -> [].
+
+%% adjust_stack(Bef, FirstBefore, LastFrom, Vdb) -> {[Ainstr],Aft}.
+%%  Do complete stack adjustment by compressing stack and adding
+%%  variables to be saved.  Try to optimise ordering on stack by
+%%  having reverse order to their lifetimes.
+%%
+%%  In Beam, there is a fixed stack frame and no need to do stack compression.
+
+adjust_stack(Bef, Fb, Lf, Vdb) ->
+    Stk0 = Bef#sr.stk,
+    {Stk1,Saves} = save_stack(Stk0, Fb, Lf, Vdb),
+    {saves(Saves, Bef#sr.reg, Stk1),
+     Bef#sr{stk=Stk1}}.
+
+%% save_stack(Stack, FirstBefore, LastFrom, Vdb) -> {[SaveVar],NewStack}.
+%%  Save variables which are used past current point and which are not
+%%  already on the stack.
+
+save_stack(Stk0, Fb, Lf, Vdb) ->
+    %% New variables that are in use but not on stack.
+    New = [ {V,F,L} || {V,F,L} <- Vdb,
+		   F < Fb,
+		   L >= Lf,
+		   not on_stack(V, Stk0) ],
+    %% Add new variables that are not just dropped immediately.
+    %% N.B. foldr works backwards from the end!!
+    Saves = [ V || {V,_,_} <- keysort(3, New) ],
+    Stk1 = foldr(fun (V, Stk) -> put_stack(V, Stk) end, Stk0, Saves),
+    {Stk1,Saves}.
+
+%% saves([SaveVar], Reg, Stk) -> [{move,Reg,Stk}].
+%%  Generate move instructions to save variables onto stack.  The
+%%  stack/reg info used is that after the new stack has been made.
+
+saves(Ss, Reg, Stk) ->
+    Res = map(fun (V) ->
+		      {move,fetch_reg(V, Reg),fetch_stack(V, Stk)}
+	      end, Ss),
+    Res.
+
+%% comment(C) -> ['%'{C}].
+
+%comment(C) -> [{'%',C}].
+comment(_) -> [].
+
+%% fetch_var(VarName, StkReg) -> r{R} | sp{Sp}.
+%% find_var(VarName, StkReg) -> ok{r{R} | sp{Sp}} | error.
+%%  Fetch/find a variable in either the registers or on the
+%%  stack. Fetch KNOWS it's there.
+
+fetch_var(V, Sr) ->
+    case find_reg(V, Sr#sr.reg) of
+	{ok,R} -> R;
+	error -> fetch_stack(V, Sr#sr.stk)
+    end.
+
+% find_var(V, Sr) ->
+%     case find_reg(V, Sr#sr.reg) of
+% 	{ok,R} -> {ok,R};
+% 	error ->
+% 	    case find_stack(V, Sr#sr.stk) of
+% 		{ok,S} -> {ok,S};
+% 		error -> error
+% 	    end
+%     end.
+
+load_vars(Vs, Regs) ->
+    foldl(fun ({var,V}, Rs) -> put_reg(V, Rs) end, Regs, Vs).
+
+%% put_reg(Val, Regs) -> Regs.
+%% load_reg(Val, Reg, Regs) -> Regs.
+%% free_reg(Val, Regs) -> Regs.
+%% find_reg(Val, Regs) -> ok{r{R}} | error.
+%% fetch_reg(Val, Regs) -> r{R}.
+%%  Functions to interface the registers.
+%%  put_reg puts a value into a free register,
+%%  load_reg loads a value into a fixed register
+%%  free_reg frees a register containing a specific value.
+
+% put_regs(Vs, Rs) -> foldl(fun put_reg/2, Rs, Vs).
+
+put_reg(V, Rs) -> put_reg_1(V, Rs, 0).
+
+put_reg_1(V, [free|Rs], I) -> [{I,V}|Rs];
+put_reg_1(V, [{reserved,I,V}|Rs], I) -> [{I,V}|Rs];
+put_reg_1(V, [R|Rs], I) -> [R|put_reg_1(V, Rs, I+1)];
+put_reg_1(V, [], I) -> [{I,V}].
+
+load_reg(V, R, Rs) -> load_reg_1(V, R, Rs, 0).
+
+load_reg_1(V, I, [_|Rs], I) -> [{I,V}|Rs];
+load_reg_1(V, I, [R|Rs], C) -> [R|load_reg_1(V, I, Rs, C+1)];
+load_reg_1(V, I, [], I) -> [{I,V}];
+load_reg_1(V, I, [], C) -> [free|load_reg_1(V, I, [], C+1)].
+
+% free_reg(V, [{I,V}|Rs]) -> [free|Rs];
+% free_reg(V, [R|Rs]) -> [R|free_reg(V, Rs)];
+% free_reg(V, []) -> [].
+
+fetch_reg(V, [{I,V}|_]) -> {x,I};
+fetch_reg(V, [_|SRs]) -> fetch_reg(V, SRs).
+
+find_reg(V, [{I,V}|_]) -> {ok,{x,I}};
+find_reg(V, [_|SRs]) -> find_reg(V, SRs);
+find_reg(_, []) -> error.
+
+%% For the bit syntax, we need a scratch register if we are constructing
+%% a binary that will not be used.
+
+find_scratch_reg(Rs) -> find_scratch_reg(Rs, 0).
+
+find_scratch_reg([free|_], I) -> {x,I};
+find_scratch_reg([_|Rs], I) -> find_scratch_reg(Rs, I+1);
+find_scratch_reg([], I) -> {x,I}.
+
+%%copy_reg(Val, R, Regs) -> load_reg(Val, R, Regs).
+%%move_reg(Val, R, Regs) -> load_reg(Val, R, free_reg(Val, Regs)).
+
+%%clear_regs(Regs) -> map(fun (R) -> free end, Regs).
+clear_regs(_) -> [].
+
+max_reg(Regs) ->
+    foldl(fun ({I,_}, _) -> I;
+	      (_, Max) -> Max end,
+	  -1, Regs) + 1.
+
+%% put_stack(Val, [{Val}]) -> [{Val}].
+%% fetch_stack(Var, Stk) -> sp{S}.
+%% find_stack(Var, Stk) -> ok{sp{S}} | error.
+%%  Functions to interface the stack.
+
+put_stack(Val, []) -> [{Val}];
+put_stack(Val, [dead|Stk]) -> [{Val}|Stk];
+put_stack(Val, [free|Stk]) -> [{Val}|Stk];
+put_stack(Val, [NotFree|Stk]) -> [NotFree|put_stack(Val, Stk)].
+
+put_stack_carefully(Val, Stk0) ->
+    case catch put_stack_carefully1(Val, Stk0) of
+	error -> error;
+	Stk1 when list(Stk1) -> Stk1
+    end.
+
+put_stack_carefully1(_, []) -> throw(error);
+put_stack_carefully1(Val, [dead|Stk]) -> [{Val}|Stk];
+put_stack_carefully1(Val, [free|Stk]) -> [{Val}|Stk];
+put_stack_carefully1(Val, [NotFree|Stk]) ->
+    [NotFree|put_stack_carefully1(Val, Stk)].
+
+fetch_stack(Var, Stk) -> fetch_stack(Var, Stk, 0).
+
+fetch_stack(V, [{V}|_], I) -> {yy,I};
+fetch_stack(V, [_|Stk], I) -> fetch_stack(V, Stk, I+1).
+
+% find_stack(Var, Stk) -> find_stack(Var, Stk, 0).
+
+% find_stack(V, [{V}|Stk], I) -> {ok,{yy,I}};
+% find_stack(V, [O|Stk], I) -> find_stack(V, Stk, I+1);
+% find_stack(V, [], I) -> error.
+
+on_stack(V, Stk) -> keymember(V, 1, Stk).
+
+%% put_catch(CatchTag, Stack) -> Stack'
+%% drop_catch(CatchTag, Stack) -> Stack'
+%%  Special interface for putting and removing catch tags, to ensure that
+%%  catches nest properly. Also used for try tags.
+
+put_catch(Tag, Stk0) -> put_catch(Tag, reverse(Stk0), []).
+
+put_catch(Tag, [], Stk) ->
+    put_stack({catch_tag,Tag}, Stk);
+put_catch(Tag, [{{catch_tag,_}}|_]=RevStk, Stk) ->
+    reverse(RevStk, put_stack({catch_tag,Tag}, Stk));
+put_catch(Tag, [Other|Stk], Acc) ->
+    put_catch(Tag, Stk, [Other|Acc]).
+
+drop_catch(Tag, [{{catch_tag,Tag}}|Stk]) -> [free|Stk];
+drop_catch(Tag, [Other|Stk]) -> [Other|drop_catch(Tag, Stk)].
+
+%%%
+%%% Finish the code generation for the bit syntax matching.
+%%%
+
+bs_function({function,Name,Arity,CLabel,Asm0}=Func) ->
+    case bs_needed(Asm0, 0, false, []) of
+	{false,[]} -> Func;
+	{true,Dict} ->
+	    Asm = bs_replace(Asm0, Dict, []),
+	    {function,Name,Arity,CLabel,Asm}
+    end.
+
+%%%
+%%% Pass 1: Found out which bs_restore's that are needed. For now we assume
+%%% that a bs_restore is needed unless it is directly preceeded by a bs_save.
+%%%
+
+bs_needed([{bs_save,Name},{bs_restore,Name}|T], N, _BsUsed, Dict) ->
+    bs_needed(T, N, true, Dict);
+bs_needed([{bs_save,_Name}|T], N, _BsUsed, Dict) ->
+    bs_needed(T, N, true, Dict);
+bs_needed([{bs_restore,Name}|T], N, _BsUsed, Dict) ->
+    case keysearch(Name, 1, Dict) of
+	{value,{Name,_}} -> bs_needed(T, N, true, Dict);
+	false -> bs_needed(T, N+1, true, [{Name,N}|Dict])
+    end;
+bs_needed([{bs_init,_,_}|T], N, _, Dict) ->
+    bs_needed(T, N, true, Dict);
+bs_needed([{bs_init2,_,_,_,_,_}|T], N, _, Dict) ->
+    bs_needed(T, N, true, Dict);
+bs_needed([{bs_start_match,_,_}|T], N, _, Dict) ->
+    bs_needed(T, N, true, Dict);
+bs_needed([_|T], N, BsUsed, Dict) ->
+    bs_needed(T, N, BsUsed, Dict);
+bs_needed([], _, BsUsed, Dict) -> {BsUsed,Dict}.
+
+%%%
+%%% Pass 2: Only needed if there were some bs_* instructions found.
+%%%
+%%% Remove any bs_save with a name that never were found to be restored
+%%% in the first pass.
+%%%
+
+bs_replace([{bs_save,Name}=Save,{bs_restore,Name}|T], Dict, Acc) ->
+    bs_replace([Save|T], Dict, Acc);
+bs_replace([{bs_save,Name}|T], Dict, Acc) ->
+    case keysearch(Name, 1, Dict) of
+	{value,{Name,N}} ->
+	    bs_replace(T, Dict, [{bs_save,N}|Acc]);
+	false ->
+	    bs_replace(T, Dict, Acc)
+    end;
+bs_replace([{bs_restore,Name}|T], Dict, Acc) ->
+    case keysearch(Name, 1, Dict) of
+	{value,{Name,N}} ->
+	    bs_replace(T, Dict, [{bs_restore,N}|Acc]);
+	false ->
+	    bs_replace(T, Dict, Acc)
+    end;
+bs_replace([{bs_init2,Fail,Bytes,Regs,Flags,Dst}|T0], Dict, Acc) ->
+    case bs_find_test_heap(T0) of
+	none ->
+	    bs_replace(T0, Dict, [{bs_init2,Fail,Bytes,0,Regs,Flags,Dst}|Acc]);
+	{T,Words} ->
+	    bs_replace(T, Dict, [{bs_init2,Fail,Bytes,Words,Regs,Flags,Dst}|Acc])
+    end;
+bs_replace([H|T], Dict, Acc) ->
+    bs_replace(T, Dict, [H|Acc]);
+bs_replace([], _, Acc) -> reverse(Acc).
+
+bs_find_test_heap(Is) ->
+    bs_find_test_heap_1(Is, []).
+
+bs_find_test_heap_1([{bs_put_integer,_,_,_,_,_}=I|Is], Acc) ->
+    bs_find_test_heap_1(Is, [I|Acc]);
+bs_find_test_heap_1([{bs_put_float,_,_,_,_,_}=I|Is], Acc) ->
+    bs_find_test_heap_1(Is, [I|Acc]);
+bs_find_test_heap_1([{bs_put_binary,_,_,_,_,_}=I|Is], Acc) ->
+    bs_find_test_heap_1(Is, [I|Acc]);
+bs_find_test_heap_1([{test_heap,Words,_}|Is], Acc) ->
+    {reverse(Acc, Is),Words};
+bs_find_test_heap_1(_, _) -> none.
+
+%% new_label(St) -> {L,St}.
+
+new_label(St) ->
+    L = St#cg.lcount,
+    {L,St#cg{lcount=L+1}}.
+
+flatmapfoldl(F, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = F(Hd, Accu0),
+    {Rs,Accu2} = flatmapfoldl(F, Accu1, Tail),
+    {R++Rs,Accu2};
+flatmapfoldl(_, Accu, []) -> {[],Accu}.
+
+flatmapfoldr(F, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = flatmapfoldr(F, Accu0, Tail),
+    {R,Accu2} = F(Hd, Accu1),
+    {R++Rs,Accu2};
+flatmapfoldr(_, Accu, []) -> {[],Accu}.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_core.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_core.erl
new file mode 100644
index 0000000000..c96837ab5e
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_core.erl
@@ -0,0 +1,1319 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: v3_core.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
+%%
+%% Purpose : Transform normal Erlang to Core Erlang
+
+%% At this stage all preprocessing has been done. All that is left are
+%% "pure" Erlang functions.
+%%
+%% Core transformation is done in three stages:
+%%
+%% 1. Flatten expressions into an internal core form without doing
+%%    matching.
+%%
+%% 2. Step "forwards" over the icore code annotating each "top-level"
+%%    thing with variable usage.  Detect bound variables in matching
+%%    and replace with explicit guard test.  Annotate "internal-core"
+%%    expressions with variables they use and create.  Convert matches
+%%    to cases when not pure assignments.
+%%
+%% 3. Step "backwards" over icore code using variable usage
+%%    annotations to change implicit exported variables to explicit
+%%    returns.
+%%
+%% To ensure the evaluation order we ensure that all arguments are
+%% safe.  A "safe" is basically a core_lib simple with VERY restricted
+%% binaries.
+%%
+%% We have to be very careful with matches as these create variables.
+%% While we try not to flatten things more than necessary we must make
+%% sure that all matches are at the top level.  For this we use the
+%% type "novars" which are non-match expressions.  Cases and receives
+%% can also create problems due to exports variables so they are not
+%% "novars" either.  I.e. a novars will not export variables.
+%%
+%% Annotations in the #iset, #iletrec, and all other internal records
+%% is kept in a record, #a, not in a list as in proper core.  This is
+%% easier and faster and creates no problems as we have complete control
+%% over all annotations.
+%%
+%% On output, the annotation for most Core Erlang terms will contain
+%% the source line number. A few terms will be marked with the atom
+%% atom 'compiler_generated', to indicate that the compiler has generated
+%% them and that no warning should be generated if they are optimized
+%% away.
+%%
+%%
+%% In this translation:
+%%
+%% call ops are safes
+%% call arguments are safes
+%% match arguments are novars
+%% case arguments are novars
+%% receive timeouts are novars
+%% let/set arguments are expressions
+%% fun is not a safe
+
+-module(v3_core).
+
+-export([module/2,format_error/1]).
+
+-import(lists, [map/2,foldl/3,foldr/3,mapfoldl/3,splitwith/2]).
+-import(ordsets, [add_element/2,del_element/2,is_element/2,
+		  union/1,union/2,intersection/2,subtract/2]).
+
+-include("core_parse.hrl").
+
+-record(a, {us=[],ns=[],anno=[]}).		%Internal annotation
+
+%% Internal core expressions and help functions.
+%% N.B. annotations fields in place as normal Core expressions.
+
+-record(iset, {anno=#a{},var,arg}).
+-record(iletrec, {anno=#a{},defs,body}).
+-record(imatch, {anno=#a{},pat,guard=[],arg,fc}).
+-record(icase, {anno=#a{},args,clauses,fc}).
+-record(iclause, {anno=#a{},pats,pguard=[],guard,body}).
+-record(ifun, {anno=#a{},id,vars,clauses,fc}).
+-record(iapply, {anno=#a{},op,args}).
+-record(icall, {anno=#a{},module,name,args}).
+-record(iprimop, {anno=#a{},name,args}).
+-record(itry, {anno=#a{},args,vars,body,evars,handler}).
+-record(icatch, {anno=#a{},body}).
+-record(ireceive1, {anno=#a{},clauses}).
+-record(ireceive2, {anno=#a{},clauses,timeout,action}).
+-record(iprotect, {anno=#a{},body}).
+-record(ibinary, {anno=#a{},segments}).		%Not used in patterns.
+
+-record(core, {vcount=0,			%Variable counter
+	       fcount=0,			%Function counter
+	       ws=[]}).				%Warnings.
+
+module({Mod,Exp,Forms}, _Opts) ->
+    Cexp = map(fun ({N,A}) -> #c_fname{id=N,arity=A} end, Exp),
+    {Kfs,As,Ws} = foldr(fun form/2, {[],[],[]}, Forms),
+    {ok,#c_module{name=#c_atom{val=Mod},exports=Cexp,attrs=As,defs=Kfs},Ws}.
+
+form({function,_,_,_,_}=F0, {Fs,As,Ws0}) ->
+    {F,Ws} = function(F0, Ws0),
+    {[F|Fs],As,Ws};
+form({attribute,_,_,_}=F, {Fs,As,Ws}) ->
+    {Fs,[attribute(F)|As],Ws}.
+
+attribute({attribute,_,Name,Val}) ->
+    #c_def{name=core_lib:make_literal(Name),
+	   val=core_lib:make_literal(Val)}.
+
+function({function,_,Name,Arity,Cs0}, Ws0) ->
+    %%ok = io:fwrite("~p - ", [{Name,Arity}]),
+    St0 = #core{vcount=0,ws=Ws0},
+    {B0,St1} = body(Cs0, Arity, St0),
+    %%ok = io:fwrite("1", []),
+    %%ok = io:fwrite("~w:~p~n", [?LINE,B0]),
+    {B1,St2} = ubody(B0, St1),
+    %%ok = io:fwrite("2", []),
+    %%ok = io:fwrite("~w:~p~n", [?LINE,B1]),
+    {B2,#core{ws=Ws}} = cbody(B1, St2),
+    %%ok = io:fwrite("3~n", []),
+    {#c_def{name=#c_fname{id=Name,arity=Arity},val=B2},Ws}.
+
+body(Cs0, Arity, St0) ->
+    Anno = [element(2, hd(Cs0))],
+    {Args,St1} = new_vars(Anno, Arity, St0),
+    {Cs1,St2} = clauses(Cs0, St1),
+    {Ps,St3} = new_vars(Arity, St2),    %Need new variables here
+    Fc = fail_clause(Ps, #c_tuple{es=[#c_atom{val=function_clause}|Ps]}),
+    {#ifun{anno=#a{anno=Anno},id=[],vars=Args,clauses=Cs1,fc=Fc},St3}.
+
+%% clause(Clause, State) -> {Cclause,State} | noclause.
+%% clauses([Clause], State) -> {[Cclause],State}.
+%%  Convert clauses.  Trap bad pattern aliases and remove clause from
+%%  clause list.
+
+clauses([C0|Cs0], St0) ->
+    case clause(C0, St0) of
+	{noclause,St} -> clauses(Cs0, St);
+	{C,St1} ->
+	    {Cs,St2} = clauses(Cs0, St1),
+	    {[C|Cs],St2}
+    end;
+clauses([], St) -> {[],St}.
+
+clause({clause,Lc,H0,G0,B0}, St0) ->
+    case catch head(H0) of
+	{'EXIT',_}=Exit -> exit(Exit);		%Propagate error
+	nomatch ->
+	    St = add_warning(Lc, nomatch, St0),
+	    {noclause,St};			%Bad pattern
+	H1 ->
+	    {G1,St1} = guard(G0, St0),
+	    {B1,St2} = exprs(B0, St1),
+	    {#iclause{anno=#a{anno=[Lc]},pats=H1,guard=G1,body=B1},St2}
+    end.
+
+%% head([P]) -> [P].
+
+head(Ps) -> pattern_list(Ps).
+
+%% guard([Expr], State) -> {[Cexpr],State}.
+%%  Build an explict and/or tree of guard alternatives, then traverse
+%%  top-level and/or tree and "protect" inner tests.
+
+guard([], St) -> {[],St};
+guard(Gs0, St) ->
+    Gs = foldr(fun (Gt0, Rhs) ->
+		       Gt1 = guard_tests(Gt0),
+		       L = element(2, Gt1),
+		       {op,L,'or',Gt1,Rhs}
+	       end, guard_tests(last(Gs0)), first(Gs0)),
+    gexpr_top(Gs, St).
+
+guard_tests([]) -> [];
+guard_tests(Gs) ->
+    L = element(2, hd(Gs)),
+    {protect,L,foldr(fun (G, Rhs) -> {op,L,'and',G,Rhs} end, last(Gs), first(Gs))}.
+
+%% gexpr_top(Expr, State) -> {Cexpr,State}.
+%%  Generate an internal core expression of a guard test.  Explicitly
+%%  handle outer boolean expressions and "protect" inner tests in a
+%%  reasonably smart way.
+
+gexpr_top(E0, St0) ->
+    {E1,Eps0,Bools,St1} = gexpr(E0, [], St0),
+    {E,Eps,St} = force_booleans(Bools, E1, Eps0, St1),
+    {Eps++[E],St}.
+
+%% gexpr(Expr, Bools, State) -> {Cexpr,[PreExp],Bools,State}.
+%%  Generate an internal core expression of a guard test.
+
+gexpr({protect,Line,Arg}, Bools0, St0) ->
+    case gexpr(Arg, [], St0) of
+	{E0,[],Bools,St1} ->
+	    {E,Eps,St} = force_booleans(Bools, E0, [], St1),
+	    {E,Eps,Bools0,St};
+	{E0,Eps0,Bools,St1} ->
+	    {E,Eps,St} = force_booleans(Bools, E0, Eps0, St1),
+	    {#iprotect{anno=#a{anno=[Line]},body=Eps++[E]},[],Bools0,St}
+    end;
+gexpr({op,Line,Op,L,R}=Call, Bools0, St0) ->
+    case erl_internal:bool_op(Op, 2) of
+	true ->
+	    {Le,Lps,Bools1,St1} = gexpr(L, Bools0, St0),
+	    {Ll,Llps,St2} = force_safe(Le, St1),
+	    {Re,Rps,Bools,St3} = gexpr(R, Bools1, St2),
+	    {Rl,Rlps,St4} = force_safe(Re, St3),
+	    Anno = [Line],
+	    {#icall{anno=#a{anno=Anno},	%Must have an #a{}
+		    module=#c_atom{anno=Anno,val=erlang},name=#c_atom{anno=Anno,val=Op},
+		    args=[Ll,Rl]},Lps ++ Llps ++ Rps ++ Rlps,Bools,St4};
+	false ->
+	    gexpr_test(Call, Bools0, St0)
+    end;
+gexpr({op,Line,Op,A}=Call, Bools0, St0) ->
+    case erl_internal:bool_op(Op, 1) of
+	true ->
+	    {Ae,Aps,Bools,St1} = gexpr(A, Bools0, St0),
+	    {Al,Alps,St2} = force_safe(Ae, St1),
+	    Anno = [Line],
+	    {#icall{anno=#a{anno=Anno},	%Must have an #a{}
+		    module=#c_atom{anno=Anno,val=erlang},name=#c_atom{anno=Anno,val=Op},
+		    args=[Al]},Aps ++ Alps,Bools,St2};
+	false ->
+	    gexpr_test(Call, Bools0, St0)
+    end;
+gexpr(E0, Bools, St0) ->
+    gexpr_test(E0, Bools, St0).
+
+%% gexpr_test(Expr, Bools, State) -> {Cexpr,[PreExp],Bools,State}.
+%%  Generate a guard test.  At this stage we must be sure that we have
+%%  a proper boolean value here so wrap things with an true test if we
+%%  don't know, i.e. if it is not a comparison or a type test.
+
+gexpr_test({atom,L,true}, Bools, St0) ->
+    {#c_atom{anno=[L],val=true},[],Bools,St0};
+gexpr_test({atom,L,false}, Bools, St0) ->
+    {#c_atom{anno=[L],val=false},[],Bools,St0};
+gexpr_test(E0, Bools0, St0) ->
+    {E1,Eps0,St1} = expr(E0, St0),
+    %% Generate "top-level" test and argument calls.
+    case E1 of
+	#icall{anno=Anno,module=#c_atom{val=erlang},name=#c_atom{val=N},args=As} ->
+	    Ar = length(As),
+	    case erl_internal:type_test(N, Ar) orelse
+		erl_internal:comp_op(N, Ar) orelse
+		(N == internal_is_record andalso Ar == 3) of
+		true -> {E1,Eps0,Bools0,St1};
+		false ->
+		    Lanno = Anno#a.anno,
+		    {New,St2} = new_var(Lanno, St1),
+		    Bools = [New|Bools0],
+		    {#icall{anno=Anno,	%Must have an #a{}
+			    module=#c_atom{anno=Lanno,val=erlang},
+			    name=#c_atom{anno=Lanno,val='=:='},
+			    args=[New,#c_atom{anno=Lanno,val=true}]},
+		     Eps0 ++ [#iset{anno=Anno,var=New,arg=E1}],Bools,St2}
+	    end;
+	_ ->
+	    Anno = get_ianno(E1),
+	    Lanno = get_lineno_anno(E1),
+	    case core_lib:is_simple(E1) of
+		true ->
+		    Bools = [E1|Bools0],
+		    {#icall{anno=Anno,	%Must have an #a{}
+			    module=#c_atom{anno=Lanno,val=erlang},
+			    name=#c_atom{anno=Lanno,val='=:='},
+			    args=[E1,#c_atom{anno=Lanno,val=true}]},Eps0,Bools,St1};
+		false ->
+		    {New,St2} = new_var(Lanno, St1),
+		    Bools = [New|Bools0],
+		    {#icall{anno=Anno,	%Must have an #a{}
+			    module=#c_atom{anno=Lanno,val=erlang},
+			    name=#c_atom{anno=Lanno,val='=:='},
+			    args=[New,#c_atom{anno=Lanno,val=true}]},
+		     Eps0 ++ [#iset{anno=Anno,var=New,arg=E1}],Bools,St2}
+	    end
+    end.
+
+force_booleans([], E, Eps, St) ->
+    {E,Eps,St};
+force_booleans([V|Vs], E0, Eps0, St0) ->
+    {E1,Eps1,St1} = force_safe(E0, St0),
+    Lanno = element(2, V),
+    Anno = #a{anno=Lanno},
+    Call = #icall{anno=Anno,module=#c_atom{anno=Lanno,val=erlang},
+		  name=#c_atom{anno=Lanno,val=is_boolean},
+		  args=[V]},
+    {New,St} = new_var(Lanno, St1),
+    Iset = #iset{anno=Anno,var=New,arg=Call},
+    Eps = Eps0 ++ Eps1 ++ [Iset],
+    E = #icall{anno=Anno,
+	       module=#c_atom{anno=Lanno,val=erlang},name=#c_atom{anno=Lanno,val='and'},
+	       args=[E1,New]},
+    force_booleans(Vs, E, Eps, St).
+
+%% exprs([Expr], State) -> {[Cexpr],State}.
+%%  Flatten top-level exprs.
+
+exprs([E0|Es0], St0) ->
+    {E1,Eps,St1} = expr(E0, St0),
+    {Es1,St2} = exprs(Es0, St1),
+    {Eps ++ [E1] ++ Es1,St2};
+exprs([], St) -> {[],St}.
+
+%% expr(Expr, State) -> {Cexpr,[PreExp],State}.
+%%  Generate an internal core expression.
+
+expr({var,L,V}, St) -> {#c_var{anno=[L],name=V},[],St};
+expr({char,L,C}, St) -> {#c_char{anno=[L],val=C},[],St};
+expr({integer,L,I}, St) -> {#c_int{anno=[L],val=I},[],St};
+expr({float,L,F}, St) -> {#c_float{anno=[L],val=F},[],St};
+expr({atom,L,A}, St) -> {#c_atom{anno=[L],val=A},[],St};
+expr({nil,L}, St) -> {#c_nil{anno=[L]},[],St};
+expr({string,L,S}, St) -> {#c_string{anno=[L],val=S},[],St};
+expr({cons,L,H0,T0}, St0) ->
+    {H1,Hps,St1} = safe(H0, St0),
+    {T1,Tps,St2} = safe(T0, St1),
+    {#c_cons{anno=[L],hd=H1,tl=T1},Hps ++ Tps,St2};
+expr({lc,L,E,Qs}, St) ->
+    lc_tq(L, E, Qs, {nil,L}, St);
+expr({tuple,L,Es0}, St0) ->
+    {Es1,Eps,St1} = safe_list(Es0, St0),
+    {#c_tuple{anno=[L],es=Es1},Eps,St1};
+expr({bin,L,Es0}, St0) ->
+    {Es1,Eps,St1} = expr_bin(Es0, St0),
+    {#ibinary{anno=#a{anno=[L]},segments=Es1},Eps,St1};
+expr({block,_,Es0}, St0) ->
+    %% Inline the block directly.
+    {Es1,St1} = exprs(first(Es0), St0),
+    {E1,Eps,St2} = expr(last(Es0), St1),
+    {E1,Es1 ++ Eps,St2};
+expr({'if',L,Cs0}, St0) ->
+    {Cs1,St1} = clauses(Cs0, St0),
+    Fc = fail_clause([], #c_atom{val=if_clause}),
+    {#icase{anno=#a{anno=[L]},args=[],clauses=Cs1,fc=Fc},[],St1};
+expr({'case',L,E0,Cs0}, St0) ->
+    {E1,Eps,St1} = novars(E0, St0),
+    {Cs1,St2} = clauses(Cs0, St1),
+    {Fpat,St3} = new_var(St2),
+    Fc = fail_clause([Fpat], #c_tuple{es=[#c_atom{val=case_clause},Fpat]}),
+    {#icase{anno=#a{anno=[L]},args=[E1],clauses=Cs1,fc=Fc},Eps,St3};
+expr({'receive',L,Cs0}, St0) ->
+    {Cs1,St1} = clauses(Cs0, St0),
+    {#ireceive1{anno=#a{anno=[L]},clauses=Cs1}, [], St1};
+expr({'receive',L,Cs0,Te0,Tes0}, St0) ->
+    {Te1,Teps,St1} = novars(Te0, St0),
+    {Tes1,St2} = exprs(Tes0, St1),
+    {Cs1,St3} = clauses(Cs0, St2),
+    {#ireceive2{anno=#a{anno=[L]},
+		clauses=Cs1,timeout=Te1,action=Tes1},Teps,St3};
+expr({'try',L,Es0,[],Ecs,[]}, St0) ->
+    %% 'try ... catch ... end'
+    {Es1,St1} = exprs(Es0, St0),
+    {V,St2} = new_var(St1),		%This name should be arbitrary
+    {Evs,Hs,St3} = try_exception(Ecs, St2),
+    {#itry{anno=#a{anno=[L]},args=Es1,vars=[V],body=[V],
+	   evars=Evs,handler=Hs},
+     [],St3};
+expr({'try',L,Es0,Cs0,Ecs,[]}, St0) ->
+    %% 'try ... of ... catch ... end'
+    {Es1,St1} = exprs(Es0, St0),
+    {V,St2} = new_var(St1),		%This name should be arbitrary
+    {Cs1,St3} = clauses(Cs0, St2),
+    {Fpat,St4} = new_var(St3),
+    Fc = fail_clause([Fpat], #c_tuple{es=[#c_atom{val=try_clause},Fpat]}),
+    {Evs,Hs,St5} = try_exception(Ecs, St4),
+    {#itry{anno=#a{anno=[L]},args=Es1,
+	   vars=[V],body=[#icase{anno=#a{},args=[V],clauses=Cs1,fc=Fc}],
+	   evars=Evs,handler=Hs},
+     [],St5};
+expr({'try',L,Es0,[],[],As0}, St0) ->
+    %% 'try ... after ... end'
+    {Es1,St1} = exprs(Es0, St0),
+    {As1,St2} = exprs(As0, St1),
+    {Evs,Hs,St3} = try_after(As1,St2),
+    {V,St4} = new_var(St3),		% (must not exist in As1)
+    %% TODO: this duplicates the 'after'-code; should lift to function.
+    {#itry{anno=#a{anno=[L]},args=Es1,vars=[V],body=As1++[V],
+	   evars=Evs,handler=Hs},
+     [],St4};
+expr({'try',L,Es,Cs,Ecs,As}, St0) ->
+    %% 'try ... [of ...] [catch ...] after ... end'
+    expr({'try',L,[{'try',L,Es,Cs,Ecs,[]}],[],[],As}, St0);
+expr({'catch',L,E0}, St0) ->
+    {E1,Eps,St1} = expr(E0, St0),
+    {#icatch{anno=#a{anno=[L]},body=Eps ++ [E1]},[],St1};
+expr({'fun',L,{function,F,A},{_,_,_}=Id}, St) ->
+    {#c_fname{anno=[L,{id,Id}],id=F,arity=A},[],St};
+expr({'fun',L,{clauses,Cs},Id}, St) ->
+    fun_tq(Id, Cs, L, St);
+expr({call,L0,{remote,_,{atom,_,erlang},{atom,_,is_record}},[_,_,_]=As}, St)
+  when L0 < 0 ->
+    %% Compiler-generated erlang:is_record/3 should be converted to
+    %% erlang:internal_is_record/3.
+    L = -L0,
+    expr({call,L,{remote,L,{atom,L,erlang},{atom,L,internal_is_record}},As}, St);
+expr({call,L,{remote,_,M,F},As0}, St0) ->
+    {[M1,F1|As1],Aps,St1} = safe_list([M,F|As0], St0),
+    {#icall{anno=#a{anno=[L]},module=M1,name=F1,args=As1},Aps,St1};
+expr({call,Lc,{atom,Lf,F},As0}, St0) ->
+    {As1,Aps,St1} = safe_list(As0, St0),
+    Op = #c_fname{anno=[Lf],id=F,arity=length(As1)},
+    {#iapply{anno=#a{anno=[Lc]},op=Op,args=As1},Aps,St1};
+expr({call,L,FunExp,As0}, St0) ->
+    {Fun,Fps,St1} = safe(FunExp, St0),
+    {As1,Aps,St2} = safe_list(As0, St1),
+    {#iapply{anno=#a{anno=[L]},op=Fun,args=As1},Fps ++ Aps,St2};
+expr({match,L,P0,E0}, St0) ->
+    %% First fold matches together to create aliases.
+    {P1,E1} = fold_match(E0, P0),
+    {E2,Eps,St1} = novars(E1, St0),
+    P2 = (catch pattern(P1)),
+    {Fpat,St2} = new_var(St1),
+    Fc = fail_clause([Fpat], #c_tuple{es=[#c_atom{val=badmatch},Fpat]}),
+    case P2 of
+	{'EXIT',_}=Exit -> exit(Exit);		%Propagate error
+	nomatch ->
+	    St = add_warning(L, nomatch, St2),
+	    {#icase{anno=#a{anno=[L]},
+		    args=[E2],clauses=[],fc=Fc},Eps,St};
+	_Other ->
+	    {#imatch{anno=#a{anno=[L]},pat=P2,arg=E2,fc=Fc},Eps,St2}
+    end;
+expr({op,_,'++',{lc,Llc,E,Qs},L2}, St) ->
+    %%  Optimise this here because of the list comprehension algorithm.
+    lc_tq(Llc, E, Qs, L2, St);
+expr({op,L,Op,A0}, St0) ->
+    {A1,Aps,St1} = safe(A0, St0),
+    LineAnno = [L],
+    {#icall{anno=#a{anno=LineAnno},		%Must have an #a{}
+	    module=#c_atom{anno=LineAnno,val=erlang},
+	    name=#c_atom{anno=LineAnno,val=Op},args=[A1]},Aps,St1};
+expr({op,L,Op,L0,R0}, St0) ->
+    {As,Aps,St1} = safe_list([L0,R0], St0),
+    LineAnno = [L],
+    {#icall{anno=#a{anno=LineAnno},		%Must have an #a{}
+	    module=#c_atom{anno=LineAnno,val=erlang},
+	    name=#c_atom{anno=LineAnno,val=Op},args=As},Aps,St1}.
+
+%% try_exception([ExcpClause], St) -> {[ExcpVar],Handler,St}.
+
+try_exception(Ecs0, St0) ->
+    %% Note that Tag is not needed for rethrow - it is already in Info.
+    {Evs,St1} = new_vars(3, St0), % Tag, Value, Info
+    {Ecs1,St2} = clauses(Ecs0, St1),
+    [_,Value,Info] = Evs,
+    Ec = #iclause{anno=#a{anno=[compiler_generated]},
+		  pats=[#c_tuple{es=Evs}],guard=[#c_atom{val=true}],
+		  body=[#iprimop{anno=#a{},       %Must have an #a{}
+				 name=#c_atom{val=raise},
+				 args=[Info,Value]}]},
+    Hs = [#icase{anno=#a{},args=[#c_tuple{es=Evs}],clauses=Ecs1,fc=Ec}],
+    {Evs,Hs,St2}.
+
+try_after(As, St0) ->
+    %% See above.
+    {Evs,St1} = new_vars(3, St0), % Tag, Value, Info
+    [_,Value,Info] = Evs,
+    B = As ++ [#iprimop{anno=#a{},       %Must have an #a{}
+			 name=#c_atom{val=raise},
+			 args=[Info,Value]}],
+    Ec = #iclause{anno=#a{anno=[compiler_generated]},
+		  pats=[#c_tuple{es=Evs}],guard=[#c_atom{val=true}],
+		  body=B},
+    Hs = [#icase{anno=#a{},args=[#c_tuple{es=Evs}],clauses=[],fc=Ec}],
+    {Evs,Hs,St1}.
+
+%% expr_bin([ArgExpr], St) -> {[Arg],[PreExpr],St}.
+%%  Flatten the arguments of a bin. Do this straight left to right!
+
+expr_bin(Es, St) ->
+    foldr(fun (E, {Ces,Esp,St0}) ->
+		  {Ce,Ep,St1} = bitstr(E, St0),
+		  {[Ce|Ces],Ep ++ Esp,St1}
+	  end, {[],[],St}, Es).
+
+bitstr({bin_element,_,E0,Size0,[Type,{unit,Unit}|Flags]}, St0) ->
+    {E1,Eps,St1} = safe(E0, St0),
+    {Size1,Eps2,St2} = safe(Size0, St1),
+    {#c_bitstr{val=E1,size=Size1,
+	       unit=core_lib:make_literal(Unit),
+	       type=core_lib:make_literal(Type),
+	       flags=core_lib:make_literal(Flags)},
+     Eps ++ Eps2,St2}.
+
+%% fun_tq(Id, [Clauses], Line, State) -> {Fun,[PreExp],State}.
+
+fun_tq(Id, Cs0, L, St0) ->
+    {Cs1,St1} = clauses(Cs0, St0),
+    Arity = length((hd(Cs1))#iclause.pats),
+    {Args,St2} = new_vars(Arity, St1),
+    {Ps,St3} = new_vars(Arity, St2),		%Need new variables here
+    Fc = fail_clause(Ps, #c_tuple{es=[#c_atom{val=function_clause}|Ps]}),
+    Fun = #ifun{anno=#a{anno=[L]},
+		id=[{id,Id}],				%We KNOW!
+		vars=Args,clauses=Cs1,fc=Fc},
+    {Fun,[],St3}.
+
+%% lc_tq(Line, Exp, [Qualifier], More, State) -> {LetRec,[PreExp],State}.
+%%  This TQ from Simon PJ pp 127-138.
+%%  This gets a bit messy as we must transform all directly here.  We
+%%  recognise guard tests and try to fold them together and join to a
+%%  preceding generators, this should give us better and more compact
+%%  code.
+%%  More could be transformed before calling lc_tq.
+
+lc_tq(Line, E, [{generate,Lg,P,G}|Qs0], More, St0) ->
+    {Gs,Qs1} =  splitwith(fun is_guard_test/1, Qs0),
+    {Name,St1} = new_fun_name("lc", St0),
+    {Head,St2} = new_var(St1),
+    {Tname,St3} = new_var_name(St2),
+    LA = [Line],
+    LAnno = #a{anno=LA},
+    Tail = #c_var{anno=LA,name=Tname},
+    {Arg,St4} = new_var(St3),
+    NewMore = {call,Lg,{atom,Lg,Name},[{var,Lg,Tname}]},
+    {Guardc,St5} = lc_guard_tests(Gs, St4),	%These are always flat!
+    {Lc,Lps,St6} = lc_tq(Line, E, Qs1, NewMore, St5),
+    {Mc,Mps,St7} = expr(More, St6),
+    {Nc,Nps,St8} = expr(NewMore, St7),
+    case catch pattern(P) of
+	{'EXIT',_}=Exit ->
+	    St9 = St8,
+	    Pc = nomatch,
+	    exit(Exit);		%Propagate error
+	nomatch ->
+	    St9 = add_warning(Line, nomatch, St8),
+	    Pc = nomatch;
+	Pc ->
+	    St9 = St8
+    end,
+    {Gc,Gps,St10} = safe(G, St9),		%Will be a function argument!
+    Fc = fail_clause([Arg], #c_tuple{anno=LA,
+				     es=[#c_atom{val=function_clause},Arg]}),
+    Cs0 = [#iclause{anno=#a{anno=[compiler_generated|LA]},
+		    pats=[#c_cons{anno=LA,hd=Head,tl=Tail}],
+		    guard=[],
+		    body=Nps ++ [Nc]},
+	   #iclause{anno=LAnno,
+		    pats=[#c_nil{anno=LA}],guard=[],
+		    body=Mps ++ [Mc]}],
+    Cs = case Pc of
+	     nomatch -> Cs0;
+	     _ ->
+		 [#iclause{anno=LAnno,
+			   pats=[#c_cons{anno=LA,hd=Pc,tl=Tail}],
+			   guard=Guardc,
+			   body=Lps ++ [Lc]}|Cs0]
+	 end,
+    Fun = #ifun{anno=LAnno,id=[],vars=[Arg],clauses=Cs,fc=Fc},
+    {#iletrec{anno=LAnno,defs=[{Name,Fun}],
+	      body=Gps ++ [#iapply{anno=LAnno,
+				   op=#c_fname{anno=LA,id=Name,arity=1},
+				   args=[Gc]}]},
+     [],St10};
+lc_tq(Line, E, [Fil0|Qs0], More, St0) ->
+    %% Special case sequences guard tests.
+    LA = [Line],
+    LAnno = #a{anno=LA},
+    case is_guard_test(Fil0) of
+	true ->
+	    {Gs0,Qs1} = splitwith(fun is_guard_test/1, Qs0),
+	    {Lc,Lps,St1} = lc_tq(Line, E, Qs1, More, St0),
+	    {Mc,Mps,St2} = expr(More, St1),
+	    {Gs,St3} = lc_guard_tests([Fil0|Gs0], St2), %These are always flat!
+	    {#icase{anno=LAnno,
+		    args=[],
+		    clauses=[#iclause{anno=LAnno,pats=[],
+				      guard=Gs,body=Lps ++ [Lc]}],
+		    fc=#iclause{anno=LAnno,pats=[],guard=[],body=Mps ++ [Mc]}},
+	     [],St3};
+	false ->
+	    {Lc,Lps,St1} = lc_tq(Line, E, Qs0, More, St0),
+	    {Mc,Mps,St2} = expr(More, St1),
+	    {Fpat,St3} = new_var(St2),
+	    Fc = fail_clause([Fpat], #c_tuple{es=[#c_atom{val=case_clause},Fpat]}),
+	    %% Do a novars little optimisation here.
+	    case Fil0 of
+		{op,_,'not',Fil1} ->
+		    {Filc,Fps,St4} = novars(Fil1, St3),
+		    {#icase{anno=LAnno,
+			    args=[Filc],
+			    clauses=[#iclause{anno=LAnno,
+					      pats=[#c_atom{anno=LA,val=true}],
+					      guard=[],
+					      body=Mps ++ [Mc]},
+				     #iclause{anno=LAnno,
+					      pats=[#c_atom{anno=LA,val=false}],
+					      guard=[],
+					      body=Lps ++ [Lc]}],
+			    fc=Fc},
+		     Fps,St4};
+		_Other ->
+		    {Filc,Fps,St4} = novars(Fil0, St3),
+		    {#icase{anno=LAnno,
+			    args=[Filc],
+			    clauses=[#iclause{anno=LAnno,
+					      pats=[#c_atom{anno=LA,val=true}],
+					      guard=[],
+					      body=Lps ++ [Lc]},
+				     #iclause{anno=LAnno,
+					      pats=[#c_atom{anno=LA,val=false}],
+					      guard=[],
+					      body=Mps ++ [Mc]}],
+			    fc=Fc},
+		     Fps,St4}
+	    end
+    end;
+lc_tq(Line, E, [], More, St) ->
+    expr({cons,Line,E,More}, St).
+
+lc_guard_tests([], St) -> {[],St};
+lc_guard_tests(Gs0, St) ->
+    Gs = guard_tests(Gs0),
+    gexpr_top(Gs, St).
+
+%% is_guard_test(Expression) -> true | false.
+%%  Test if a general expression is a guard test.  Use erl_lint here
+%%  as it now allows sys_pre_expand transformed source.
+
+is_guard_test(E) -> erl_lint:is_guard_test(E).
+
+%% novars(Expr, State) -> {Novars,[PreExpr],State}.
+%%  Generate a novars expression, basically a call or a safe.  At this
+%%  level we do not need to do a deep check.
+
+novars(E0, St0) ->
+    {E1,Eps,St1} = expr(E0, St0),
+    {Se,Sps,St2} = force_novars(E1, St1),
+    {Se,Eps ++ Sps,St2}.
+
+force_novars(#iapply{}=App, St) -> {App,[],St};
+force_novars(#icall{}=Call, St) -> {Call,[],St};
+force_novars(#iprimop{}=Prim, St) -> {Prim,[],St};
+force_novars(#ifun{}=Fun, St) -> {Fun,[],St};	%These are novars too
+force_novars(#ibinary{}=Bin, St) -> {Bin,[],St};
+force_novars(Ce, St) ->
+    force_safe(Ce, St).
+
+%% safe(Expr, State) -> {Safe,[PreExpr],State}.
+%%  Generate an internal safe expression.  These are simples without
+%%  binaries which can fail.  At this level we do not need to do a
+%%  deep check.  Must do special things with matches here.
+
+safe(E0, St0) ->
+    {E1,Eps,St1} = expr(E0, St0),
+    {Se,Sps,St2} = force_safe(E1, St1),
+    {Se,Eps ++ Sps,St2}.
+
+safe_list(Es, St) ->
+    foldr(fun (E, {Ces,Esp,St0}) ->
+		  {Ce,Ep,St1} = safe(E, St0),
+		  {[Ce|Ces],Ep ++ Esp,St1}
+	  end, {[],[],St}, Es).
+
+force_safe(#imatch{anno=Anno,pat=P,arg=E,fc=Fc}, St0) ->
+    {Le,Lps,St1} = force_safe(E, St0),
+    {Le,Lps ++ [#imatch{anno=Anno,pat=P,arg=Le,fc=Fc}],St1};
+force_safe(Ce, St0) ->
+    case is_safe(Ce) of
+	true -> {Ce,[],St0};
+	false ->
+	    {V,St1} = new_var(St0),
+	    {V,[#iset{var=V,arg=Ce}],St1}
+    end.
+
+is_safe(#c_cons{}) -> true;
+is_safe(#c_tuple{}) -> true;
+is_safe(#c_var{}) -> true;
+is_safe(E) -> core_lib:is_atomic(E).
+
+%%% %% variable(Expr, State) -> {Variable,[PreExpr],State}.
+%%% %% force_variable(Expr, State) -> {Variable,[PreExpr],State}.
+%%% %%  Generate a variable.
+
+%%% variable(E0, St0) ->
+%%%     {E1,Eps,St1} = expr(E0, St0),
+%%%     {V,Vps,St2} = force_variable(E1, St1),
+%%%     {V,Eps ++ Vps,St2}.
+
+%%% force_variable(#c_var{}=Var, St) -> {Var,[],St};
+%%% force_variable(Ce, St0) ->
+%%%     {V,St1} = new_var(St0),
+%%%     {V,[#iset{var=V,arg=Ce}],St1}.
+
+%%% %% atomic(Expr, State) -> {Atomic,[PreExpr],State}.
+%%% %% force_atomic(Expr, State) -> {Atomic,[PreExpr],State}.
+
+%%% atomic(E0, St0) ->
+%%%     {E1,Eps,St1} = expr(E0, St0),
+%%%     {A,Aps,St2} = force_atomic(E1, St1),
+%%%     {A,Eps ++ Aps,St2}.
+
+%%% force_atomic(Ce, St0) ->
+%%%     case core_lib:is_atomic(Ce) of
+%%% 	true -> {Ce,[],St0};
+%%% 	false ->
+%%% 	    {V,St1} = new_var(St0),
+%%% 	    {V,[#iset{var=V,arg=Ce}],St1}
+%%%     end.
+
+%% fold_match(MatchExpr, Pat) -> {MatchPat,Expr}.
+%%  Fold nested matches into one match with aliased patterns.
+
+fold_match({match,L,P0,E0}, P) ->
+    {P1,E1} = fold_match(E0, P),
+    {{match,L,P0,P1},E1};
+fold_match(E, P) -> {P,E}.
+
+%% pattern(Pattern) -> CorePat.
+%% Transform a pattern by removing line numbers.  We also normalise
+%% aliases in patterns to standard form, {alias,Pat,[Var]}.
+
+pattern({var,L,V}) -> #c_var{anno=[L],name=V};
+pattern({char,L,C}) -> #c_char{anno=[L],val=C};
+pattern({integer,L,I}) -> #c_int{anno=[L],val=I};
+pattern({float,L,F}) -> #c_float{anno=[L],val=F};
+pattern({atom,L,A}) -> #c_atom{anno=[L],val=A};
+pattern({string,L,S}) -> #c_string{anno=[L],val=S};
+pattern({nil,L}) -> #c_nil{anno=[L]};
+pattern({cons,L,H,T}) ->
+    #c_cons{anno=[L],hd=pattern(H),tl=pattern(T)};
+pattern({tuple,L,Ps}) ->
+    #c_tuple{anno=[L],es=pattern_list(Ps)};
+pattern({bin,L,Ps}) ->
+    %% We don't create a #ibinary record here, since there is
+    %% no need to hold any used/new annoations in a pattern.
+    #c_binary{anno=[L],segments=pat_bin(Ps)};
+pattern({match,_,P1,P2}) ->
+    pat_alias(pattern(P1), pattern(P2)).
+
+%% bin_pattern_list([BinElement]) -> [BinSeg].
+
+pat_bin(Ps) -> map(fun pat_segment/1, Ps).
+
+pat_segment({bin_element,_,Term,Size,[Type,{unit,Unit}|Flags]}) ->
+    #c_bitstr{val=pattern(Term),size=pattern(Size),
+	      unit=core_lib:make_literal(Unit),
+	      type=core_lib:make_literal(Type),
+	      flags=core_lib:make_literal(Flags)}.
+
+%% pat_alias(CorePat, CorePat) -> AliasPat.
+%%  Normalise aliases.  Trap bad aliases by throwing 'nomatch'.
+
+pat_alias(#c_var{name=V1}, P2) -> #c_alias{var=#c_var{name=V1},pat=P2};
+pat_alias(P1, #c_var{name=V2}) -> #c_alias{var=#c_var{name=V2},pat=P1};
+pat_alias(#c_cons{}=Cons, #c_string{anno=A,val=[H|T]}=S) ->
+    pat_alias(Cons, #c_cons{anno=A,hd=#c_char{anno=A,val=H},
+			    tl=S#c_string{val=T}});
+pat_alias(#c_string{anno=A,val=[H|T]}=S, #c_cons{}=Cons) ->
+    pat_alias(#c_cons{anno=A,hd=#c_char{anno=A,val=H},
+		      tl=S#c_string{val=T}}, Cons);
+pat_alias(#c_nil{}=Nil, #c_string{val=[]}) ->
+    Nil;
+pat_alias(#c_string{val=[]}, #c_nil{}=Nil) ->
+    Nil;
+pat_alias(#c_cons{anno=A,hd=H1,tl=T1}, #c_cons{hd=H2,tl=T2}) ->
+    #c_cons{anno=A,hd=pat_alias(H1, H2),tl=pat_alias(T1, T2)};
+pat_alias(#c_tuple{es=Es1}, #c_tuple{es=Es2}) ->
+    #c_tuple{es=pat_alias_list(Es1, Es2)};
+pat_alias(#c_char{val=C}=Char, #c_int{val=C}) ->
+    Char;
+pat_alias(#c_int{val=C}, #c_char{val=C}=Char) ->
+    Char;
+pat_alias(#c_alias{var=V1,pat=P1},
+	   #c_alias{var=V2,pat=P2}) ->
+    if V1 == V2 -> pat_alias(P1, P2);
+       true -> #c_alias{var=V1,pat=#c_alias{var=V2,pat=pat_alias(P1, P2)}}
+    end;
+pat_alias(#c_alias{var=V1,pat=P1}, P2) ->
+    #c_alias{var=V1,pat=pat_alias(P1, P2)};
+pat_alias(P1, #c_alias{var=V2,pat=P2}) ->
+    #c_alias{var=V2,pat=pat_alias(P1, P2)};
+pat_alias(P, P) -> P;
+pat_alias(_, _) -> throw(nomatch).
+
+%% pat_alias_list([A1], [A2]) -> [A].
+
+pat_alias_list([A1|A1s], [A2|A2s]) ->
+    [pat_alias(A1, A2)|pat_alias_list(A1s, A2s)];
+pat_alias_list([], []) -> [];
+pat_alias_list(_, _) -> throw(nomatch).
+
+%% pattern_list([P]) -> [P].
+
+pattern_list(Ps) -> map(fun pattern/1, Ps).
+
+%% first([A]) -> [A].
+%% last([A]) -> A.
+
+first([_]) -> [];
+first([H|T]) -> [H|first(T)].
+
+last([L]) -> L;
+last([_|T]) -> last(T).
+
+%% make_vars([Name]) -> [{Var,Name}].
+
+make_vars(Vs) -> [ #c_var{name=V} || V <- Vs ].
+
+%% new_fun_name(Type, State) -> {FunName,State}.
+
+new_fun_name(Type, #core{fcount=C}=St) ->
+    {list_to_atom(Type ++ "$^" ++ integer_to_list(C)),St#core{fcount=C+1}}.
+
+%% new_var_name(State) -> {VarName,State}.
+
+new_var_name(#core{vcount=C}=St) ->
+    {list_to_atom("cor" ++ integer_to_list(C)),St#core{vcount=C + 1}}.
+
+%% new_var(State) -> {{var,Name},State}.
+%% new_var(LineAnno, State) -> {{var,Name},State}.
+
+new_var(St) ->
+    new_var([], St).
+
+new_var(Anno, St0) ->
+    {New,St} = new_var_name(St0),
+    {#c_var{anno=Anno,name=New},St}.
+
+%% new_vars(Count, State) -> {[Var],State}.
+%% new_vars(Anno, Count, State) -> {[Var],State}.
+%%  Make Count new variables.
+
+new_vars(N, St) -> new_vars_1(N, [], St, []).
+new_vars(Anno, N, St) -> new_vars_1(N, Anno, St, []).
+
+new_vars_1(N, Anno, St0, Vs) when N > 0 ->
+    {V,St1} = new_var(Anno, St0),
+    new_vars_1(N-1, Anno, St1, [V|Vs]);
+new_vars_1(0, _, St, Vs) -> {Vs,St}.
+
+fail_clause(Pats, A) ->
+    #iclause{anno=#a{anno=[compiler_generated]},
+	     pats=Pats,guard=[],
+	     body=[#iprimop{anno=#a{},name=#c_atom{val=match_fail},args=[A]}]}.
+
+ubody(B, St) -> uexpr(B, [], St).
+
+%% uclauses([Lclause], [KnownVar], State) -> {[Lclause],State}.
+
+uclauses(Lcs, Ks, St0) ->
+    mapfoldl(fun (Lc, St) -> uclause(Lc, Ks, St) end, St0, Lcs).
+
+%% uclause(Lclause, [KnownVar], State) -> {Lclause,State}.
+
+uclause(Cl0, Ks, St0) ->
+    {Cl1,_Pvs,Used,New,St1} = uclause(Cl0, Ks, Ks, St0),
+    A0 = get_ianno(Cl1),
+    A = A0#a{us=Used,ns=New},
+    {Cl1#iclause{anno=A},St1}.
+
+uclause(#iclause{anno=Anno,pats=Ps0,guard=G0,body=B0}, Pks, Ks0, St0) ->
+    {Ps1,Pg,Pvs,Pus,St1} = upattern_list(Ps0, Pks, St0),
+    Pu = union(Pus, intersection(Pvs, Ks0)),
+    Pn = subtract(Pvs, Pu),
+    Ks1 = union(Pn, Ks0),
+    {G1,St2} = uguard(Pg, G0, Ks1, St1),
+    Gu = used_in_any(G1),
+    Gn = new_in_any(G1),
+    Ks2 = union(Gn, Ks1),
+    {B1,St3} = uexprs(B0, Ks2, St2),
+    Used = intersection(union([Pu,Gu,used_in_any(B1)]), Ks0),
+    New = union([Pn,Gn,new_in_any(B1)]),
+    {#iclause{anno=Anno,pats=Ps1,guard=G1,body=B1},Pvs,Used,New,St3}.
+
+%% uguard([Test], [Kexpr], [KnownVar], State) -> {[Kexpr],State}.
+%%  Build a guard expression list by folding in the equality tests.
+
+uguard([], [], _, St) -> {[],St};
+uguard(Pg, [], Ks, St) ->
+    %% No guard, so fold together equality tests.
+    uguard(first(Pg), [last(Pg)], Ks, St);
+uguard(Pg, Gs0, Ks, St0) ->
+    %% Gs0 must contain at least one element here.
+    {Gs3,St5} = foldr(fun (T, {Gs1,St1}) ->
+			      {L,St2} = new_var(St1),
+			      {R,St3} = new_var(St2),
+			      {[#iset{var=L,arg=T}] ++ first(Gs1) ++
+			       [#iset{var=R,arg=last(Gs1)},
+				#icall{anno=#a{}, %Must have an #a{}
+				       module=#c_atom{val=erlang},
+				       name=#c_atom{val='and'},
+				       args=[L,R]}],
+			       St3}
+		      end, {Gs0,St0}, Pg),
+    %%ok = io:fwrite("core ~w: ~p~n", [?LINE,Gs3]),
+    uexprs(Gs3, Ks, St5).
+
+%% uexprs([Kexpr], [KnownVar], State) -> {[Kexpr],State}.
+
+uexprs([#imatch{anno=A,pat=P0,arg=Arg,fc=Fc}|Les], Ks, St0) ->
+    %% Optimise for simple set of unbound variable.
+    case upattern(P0, Ks, St0) of
+	{#c_var{},[],_Pvs,_Pus,_} ->
+	    %% Throw our work away and just set to iset.
+	    uexprs([#iset{var=P0,arg=Arg}|Les], Ks, St0);
+	_Other ->
+	    %% Throw our work away and set to icase.
+	    if
+		Les == [] ->
+		    %% Need to explicitly return match "value", make
+		    %% safe for efficiency.
+		    {La,Lps,St1} = force_safe(Arg, St0),
+		    Mc = #iclause{anno=A,pats=[P0],guard=[],body=[La]},
+		    uexprs(Lps ++ [#icase{anno=A,
+					  args=[La],clauses=[Mc],fc=Fc}], Ks, St1);
+		true ->
+		    Mc = #iclause{anno=A,pats=[P0],guard=[],body=Les},
+		    uexprs([#icase{anno=A,args=[Arg],
+				   clauses=[Mc],fc=Fc}], Ks, St0)
+	    end
+    end;
+uexprs([Le0|Les0], Ks, St0) ->
+    {Le1,St1} = uexpr(Le0, Ks, St0),
+    {Les1,St2} = uexprs(Les0, union((core_lib:get_anno(Le1))#a.ns, Ks), St1),
+    {[Le1|Les1],St2};
+uexprs([], _, St) -> {[],St}.
+
+uexpr(#iset{anno=A,var=V,arg=A0}, Ks, St0) ->
+    {A1,St1} = uexpr(A0, Ks, St0),
+    {#iset{anno=A#a{us=del_element(V#c_var.name, (core_lib:get_anno(A1))#a.us),
+		    ns=add_element(V#c_var.name, (core_lib:get_anno(A1))#a.ns)},
+	   var=V,arg=A1},St1};
+%% imatch done in uexprs.
+uexpr(#iletrec{anno=A,defs=Fs0,body=B0}, Ks, St0) ->
+    %%ok = io:fwrite("~w: ~p~n", [?LINE,{Fs0,B0}]),
+    {Fs1,St1} = mapfoldl(fun ({Name,F0}, St0) ->
+				 {F1,St1} = uexpr(F0, Ks, St0),
+				 {{Name,F1},St1}
+			 end, St0, Fs0),
+    {B1,St2} = uexprs(B0, Ks, St1),
+    Used = used_in_any(map(fun ({_,F}) -> F end, Fs1) ++ B1),
+    {#iletrec{anno=A#a{us=Used,ns=[]},defs=Fs1,body=B1},St2};
+uexpr(#icase{anno=A,args=As0,clauses=Cs0,fc=Fc0}, Ks, St0) ->
+    %% As0 will never generate new variables.
+    {As1,St1} = uexpr_list(As0, Ks, St0),
+    {Cs1,St2} = uclauses(Cs0, Ks, St1),
+    {Fc1,St3} = uclause(Fc0, Ks, St2),
+    Used = union(used_in_any(As1), used_in_any(Cs1)),
+    New = new_in_all(Cs1),
+    {#icase{anno=A#a{us=Used,ns=New},args=As1,clauses=Cs1,fc=Fc1},St3};
+uexpr(#ifun{anno=A,id=Id,vars=As,clauses=Cs0,fc=Fc0}, Ks0, St0) ->
+    Avs = lit_list_vars(As),
+    Ks1 = union(Avs, Ks0),
+    {Cs1,St1} = ufun_clauses(Cs0, Ks1, St0),
+    {Fc1,St2} = ufun_clause(Fc0, Ks1, St1),
+    Used = subtract(intersection(used_in_any(Cs1), Ks0), Avs),
+    {#ifun{anno=A#a{us=Used,ns=[]},id=Id,vars=As,clauses=Cs1,fc=Fc1},St2};
+uexpr(#iapply{anno=A,op=Op,args=As}, _, St) ->
+    Used = union(lit_vars(Op), lit_list_vars(As)),
+    {#iapply{anno=A#a{us=Used},op=Op,args=As},St};
+uexpr(#iprimop{anno=A,name=Name,args=As}, _, St) ->
+    Used = lit_list_vars(As),
+    {#iprimop{anno=A#a{us=Used},name=Name,args=As},St};
+uexpr(#icall{anno=A,module=Mod,name=Name,args=As}, _, St) ->
+    Used = union([lit_vars(Mod),lit_vars(Name),lit_list_vars(As)]),
+    {#icall{anno=A#a{us=Used},module=Mod,name=Name,args=As},St};
+uexpr(#itry{anno=A,args=As0,vars=Vs,body=Bs0,evars=Evs,handler=Hs0}, Ks, St0) ->
+    %% Note that we export only from body and exception.
+    {As1,St1} = uexprs(As0, Ks, St0),
+    {Bs1,St2} = uexprs(Bs0, Ks, St1),
+    {Hs1,St3} = uexprs(Hs0, Ks, St2),
+    Used = intersection(used_in_any(Bs1++Hs1++As1), Ks),
+    New = new_in_all(Bs1++Hs1),
+    {#itry{anno=A#a{us=Used,ns=New},
+	   args=As1,vars=Vs,body=Bs1,evars=Evs,handler=Hs1},St3};
+uexpr(#icatch{anno=A,body=Es0}, Ks, St0) ->
+    {Es1,St1} = uexprs(Es0, Ks, St0),
+    {#icatch{anno=A#a{us=used_in_any(Es1)},body=Es1},St1};
+uexpr(#ireceive1{anno=A,clauses=Cs0}, Ks, St0) ->
+    {Cs1,St1} = uclauses(Cs0, Ks, St0),
+    {#ireceive1{anno=A#a{us=used_in_any(Cs1),ns=new_in_all(Cs1)},
+		clauses=Cs1},St1};
+uexpr(#ireceive2{anno=A,clauses=Cs0,timeout=Te0,action=Tes0}, Ks, St0) ->
+    %% Te0 will never generate new variables.
+    {Te1,St1} = uexpr(Te0, Ks, St0),
+    {Cs1,St2} = uclauses(Cs0, Ks, St1),
+    {Tes1,St3} = uexprs(Tes0, Ks, St2),
+    Used = union([used_in_any(Cs1),used_in_any(Tes1),
+		  (core_lib:get_anno(Te1))#a.us]),
+    New = case Cs1 of
+	      [] -> new_in_any(Tes1);
+	      _ -> intersection(new_in_all(Cs1), new_in_any(Tes1))
+	  end,
+    {#ireceive2{anno=A#a{us=Used,ns=New},
+		clauses=Cs1,timeout=Te1,action=Tes1},St3};
+uexpr(#iprotect{anno=A,body=Es0}, Ks, St0) ->
+    {Es1,St1} = uexprs(Es0, Ks, St0),
+    Used = used_in_any(Es1),
+    {#iprotect{anno=A#a{us=Used},body=Es1},St1}; %No new variables escape!
+uexpr(#ibinary{anno=A,segments=Ss}, _, St) ->
+    Used = bitstr_vars(Ss),
+    {#ibinary{anno=A#a{us=Used},segments=Ss},St};
+uexpr(Lit, _, St) ->
+    true = core_lib:is_simple(Lit),		%Sanity check!
+    Vs = lit_vars(Lit),
+    Anno = core_lib:get_anno(Lit),
+    {core_lib:set_anno(Lit, #a{us=Vs,anno=Anno}),St}.
+
+uexpr_list(Les0, Ks, St0) ->
+    mapfoldl(fun (Le, St) -> uexpr(Le, Ks, St) end, St0, Les0).
+
+%% ufun_clauses([Lclause], [KnownVar], State) -> {[Lclause],State}.
+
+ufun_clauses(Lcs, Ks, St0) ->
+    mapfoldl(fun (Lc, St) -> ufun_clause(Lc, Ks, St) end, St0, Lcs).
+
+%% ufun_clause(Lclause, [KnownVar], State) -> {Lclause,State}.
+
+ufun_clause(Cl0, Ks, St0) ->
+    {Cl1,Pvs,Used,_,St1} = uclause(Cl0, [], Ks, St0),
+    A0 = get_ianno(Cl1),
+    A = A0#a{us=subtract(intersection(Used, Ks), Pvs),ns=[]},
+    {Cl1#iclause{anno=A},St1}.
+
+%% upattern(Pat, [KnownVar], State) ->
+%%              {Pat,[GuardTest],[NewVar],[UsedVar],State}.
+
+upattern(#c_var{name='_'}, _, St0) ->
+    {New,St1} = new_var_name(St0),
+    {#c_var{name=New},[],[New],[],St1};
+upattern(#c_var{name=V}=Var, Ks, St0) ->
+    case is_element(V, Ks) of
+	true ->
+	    {N,St1} = new_var_name(St0),
+	    New = #c_var{name=N},
+	    Test = #icall{anno=#a{us=add_element(N, [V])},
+			  module=#c_atom{val=erlang},
+			  name=#c_atom{val='=:='},
+			  args=[New,Var]},
+	    %% Test doesn't need protecting.
+	    {New,[Test],[N],[],St1};
+	false -> {Var,[],[V],[],St0}
+    end;
+upattern(#c_cons{hd=H0,tl=T0}=Cons, Ks, St0) ->
+    {H1,Hg,Hv,Hu,St1} = upattern(H0, Ks, St0),
+    {T1,Tg,Tv,Tu,St2} = upattern(T0, union(Hv, Ks), St1),
+    {Cons#c_cons{hd=H1,tl=T1},Hg ++ Tg,union(Hv, Tv),union(Hu, Tu),St2};
+upattern(#c_tuple{es=Es0}=Tuple, Ks, St0) ->
+    {Es1,Esg,Esv,Eus,St1} = upattern_list(Es0, Ks, St0),
+    {Tuple#c_tuple{es=Es1},Esg,Esv,Eus,St1};
+upattern(#c_binary{segments=Es0}=Bin, Ks, St0) ->
+    {Es1,Esg,Esv,Eus,St1} = upat_bin(Es0, Ks, St0),
+    {Bin#c_binary{segments=Es1},Esg,Esv,Eus,St1};
+upattern(#c_alias{var=V0,pat=P0}=Alias, Ks, St0) ->
+    {V1,Vg,Vv,Vu,St1} = upattern(V0, Ks, St0),
+    {P1,Pg,Pv,Pu,St2} = upattern(P0, union(Vv, Ks), St1),
+    {Alias#c_alias{var=V1,pat=P1},Vg ++ Pg,union(Vv, Pv),union(Vu, Pu),St2};
+upattern(Other, _, St) -> {Other,[],[],[],St}.	%Constants
+
+%% upattern_list([Pat], [KnownVar], State) ->
+%%                        {[Pat],[GuardTest],[NewVar],[UsedVar],State}.
+
+upattern_list([P0|Ps0], Ks, St0) ->
+    {P1,Pg,Pv,Pu,St1} = upattern(P0, Ks, St0),
+    {Ps1,Psg,Psv,Psu,St2} = upattern_list(Ps0, union(Pv, Ks), St1),
+    {[P1|Ps1],Pg ++ Psg,union(Pv, Psv),union(Pu, Psu),St2};
+upattern_list([], _, St) -> {[],[],[],[],St}.
+
+%% upat_bin([Pat], [KnownVar], State) ->
+%%                        {[Pat],[GuardTest],[NewVar],[UsedVar],State}.
+upat_bin(Es0, Ks, St0) ->
+  upat_bin(Es0, Ks, [], St0).
+
+%% upat_bin([Pat], [KnownVar], [LocalVar], State) ->
+%%                        {[Pat],[GuardTest],[NewVar],[UsedVar],State}.
+upat_bin([P0|Ps0], Ks, Bs, St0) ->
+    {P1,Pg,Pv,Pu,Bs1,St1} = upat_element(P0, Ks, Bs, St0),
+    {Ps1,Psg,Psv,Psu,St2} = upat_bin(Ps0, union(Pv, Ks), Bs1, St1),
+    {[P1|Ps1],Pg ++ Psg,union(Pv, Psv),union(Pu, Psu),St2};
+upat_bin([], _, _, St) -> {[],[],[],[],St}.
+
+
+%% upat_element(Segment, [KnownVar], [LocalVar], State) ->
+%%                        {Segment,[GuardTest],[NewVar],[UsedVar],[LocalVar],State}
+upat_element(#c_bitstr{val=H0,size=Sz}=Seg, Ks, Bs, St0) ->
+  {H1,Hg,Hv,[],St1} = upattern(H0, Ks, St0),
+  Bs1 = case H0 of
+	  #c_var{name=Hname} ->
+	    case H1 of
+	      #c_var{name=Hname} ->
+		Bs;
+	      #c_var{name=Other} ->
+		[{Hname, Other}|Bs]
+	    end;
+	  _ ->
+	    Bs
+	end,
+  {Sz1, Us} = case Sz of
+		  #c_var{name=Vname} ->
+		    rename_bitstr_size(Vname, Bs);
+		  _Other -> {Sz, []}
+		end,
+  {Seg#c_bitstr{val=H1, size=Sz1},Hg,Hv,Us,Bs1,St1}.
+
+rename_bitstr_size(V, [{V, N}|_]) ->
+   New = #c_var{name=N},
+  {New, [N]};
+rename_bitstr_size(V, [_|Rest]) ->
+  rename_bitstr_size(V, Rest);
+rename_bitstr_size(V, []) ->
+  Old = #c_var{name=V},
+  {Old, [V]}.
+
+used_in_any(Les) ->
+    foldl(fun (Le, Ns) -> union((core_lib:get_anno(Le))#a.us, Ns) end,
+	  [], Les).
+
+new_in_any(Les) ->
+    foldl(fun (Le, Ns) -> union((core_lib:get_anno(Le))#a.ns, Ns) end,
+	  [], Les).
+
+new_in_all([Le|Les]) ->
+    foldl(fun (L, Ns) -> intersection((core_lib:get_anno(L))#a.ns, Ns) end,
+	  (core_lib:get_anno(Le))#a.ns, Les);
+new_in_all([]) -> [].
+
+%% The AfterVars are the variables which are used afterwards.  We need
+%% this to work out which variables are actually exported and used
+%% from case/receive.  In subblocks/clauses the AfterVars of the block
+%% are just the exported variables.
+
+cbody(B0, St0) ->
+    {B1,_,_,St1} = cexpr(B0, [], St0),
+    {B1,St1}.
+
+%% cclause(Lclause, [AfterVar], State) -> {Cclause,State}.
+%%  The AfterVars are the exported variables.
+
+cclause(#iclause{anno=#a{anno=Anno},pats=Ps,guard=G0,body=B0}, Exp, St0) ->
+    {B1,_Us1,St1} = cexprs(B0, Exp, St0),
+    {G1,St2} = cguard(G0, St1),
+    {#c_clause{anno=Anno,pats=Ps,guard=G1,body=B1},St2}.
+
+cclauses(Lcs, Es, St0) ->
+    mapfoldl(fun (Lc, St) -> cclause(Lc, Es, St) end, St0, Lcs).
+
+cguard([], St) -> {#c_atom{val=true},St};
+cguard(Gs, St0) ->
+    {G,_,St1} = cexprs(Gs, [], St0),
+    {G,St1}.
+
+%% cexprs([Lexpr], [AfterVar], State) -> {Cexpr,[AfterVar],State}.
+%%  Must be sneaky here at the last expr when combining exports for the
+%%  whole sequence and exports for that expr.
+
+cexprs([#iset{var=#c_var{name=Name}=Var}=Iset], As, St) ->
+    %% Make return value explicit, and make Var true top level.
+    cexprs([Iset,Var#c_var{anno=#a{us=[Name]}}], As, St);
+cexprs([Le], As, St0) ->
+    {Ce,Es,Us,St1} = cexpr(Le, As, St0),
+    Exp = make_vars(As),			%The export variables
+    if
+	Es == [] -> {core_lib:make_values([Ce|Exp]),union(Us, As),St1};
+	true ->
+	    {R,St2} = new_var(St1),
+	    {#c_let{anno=get_lineno_anno(Ce),
+		    vars=[R|make_vars(Es)],arg=Ce,
+		    body=core_lib:make_values([R|Exp])},
+	     union(Us, As),St2}
+    end;
+cexprs([#iset{anno=#a{anno=A},var=V,arg=A0}|Les], As0, St0) ->
+    {Ces,As1,St1} = cexprs(Les, As0, St0),
+    {A1,Es,Us,St2} = cexpr(A0, As1, St1),
+    {#c_let{anno=A,vars=[V|make_vars(Es)],arg=A1,body=Ces},
+     union(Us, As1),St2};
+cexprs([Le|Les], As0, St0) ->
+    {Ces,As1,St1} = cexprs(Les, As0, St0),
+    {Ce,Es,Us,St2} = cexpr(Le, As1, St1),
+    if
+	Es == [] ->
+	    {#c_seq{arg=Ce,body=Ces},union(Us, As1),St2};
+	true ->
+	    {R,St3} = new_var(St2),
+	    {#c_let{vars=[R|make_vars(Es)],arg=Ce,body=Ces},
+	     union(Us, As1),St3}
+    end.
+
+%% cexpr(Lexpr, [AfterVar], State) -> {Cexpr,[ExpVar],[UsedVar],State}.
+
+cexpr(#iletrec{anno=A,defs=Fs0,body=B0}, As, St0) ->
+    {Fs1,{_,St1}} = mapfoldl(fun ({Name,F0}, {Used,St0}) ->
+					{F1,[],Us,St1} = cexpr(F0, [], St0),
+					{#c_def{name=#c_fname{id=Name,arity=1},
+						val=F1},
+					 {union(Us, Used),St1}}
+				end, {[],St0}, Fs0),
+    Exp = intersection(A#a.ns, As),
+    {B1,_Us,St2} = cexprs(B0, Exp, St1),
+    {#c_letrec{anno=A#a.anno,defs=Fs1,body=B1},Exp,A#a.us,St2};
+cexpr(#icase{anno=A,args=Largs,clauses=Lcs,fc=Lfc}, As, St0) ->
+    Exp = intersection(A#a.ns, As),		%Exports
+    {Cargs,St1} = foldr(fun (La, {Cas,Sta}) ->
+				{Ca,[],_Us1,Stb} = cexpr(La, As, Sta),
+				{[Ca|Cas],Stb}
+			end, {[],St0}, Largs),
+    {Ccs,St2} = cclauses(Lcs, Exp, St1),
+    {Cfc,St3} = cclause(Lfc, [], St2),		%Never exports
+    {#c_case{anno=A#a.anno,
+	     arg=core_lib:make_values(Cargs),clauses=Ccs ++ [Cfc]},
+     Exp,A#a.us,St3};
+cexpr(#ireceive1{anno=A,clauses=Lcs}, As, St0) ->
+    Exp = intersection(A#a.ns, As),		%Exports
+    {Ccs,St1} = cclauses(Lcs, Exp, St0),
+    {#c_receive{anno=A#a.anno,
+		clauses=Ccs,
+	       timeout=#c_atom{val=infinity},action=#c_atom{val=true}},
+     Exp,A#a.us,St1};
+cexpr(#ireceive2{anno=A,clauses=Lcs,timeout=Lto,action=Les}, As, St0) ->
+    Exp = intersection(A#a.ns, As),		%Exports
+    {Cto,[],_Us1,St1} = cexpr(Lto, As, St0),
+    {Ccs,St2} = cclauses(Lcs, Exp, St1),
+    {Ces,_Us2,St3} = cexprs(Les, Exp, St2),
+    {#c_receive{anno=A#a.anno,
+		clauses=Ccs,timeout=Cto,action=Ces},
+     Exp,A#a.us,St3};
+cexpr(#itry{anno=A,args=La,vars=Vs,body=Lb,evars=Evs,handler=Lh}, As, St0) ->
+    Exp = intersection(A#a.ns, As),           %Exports
+    {Ca,_Us1,St1} = cexprs(La, [], St0),
+    {Cb,_Us2,St2} = cexprs(Lb, Exp, St1),
+    {Ch,_Us3,St3} = cexprs(Lh, Exp, St2),
+    {#c_try{anno=A#a.anno,arg=Ca,vars=Vs,body=Cb,evars=Evs,handler=Ch},
+     Exp,A#a.us,St3};
+cexpr(#icatch{anno=A,body=Les}, _As, St0) ->
+    {Ces,_Us1,St1} = cexprs(Les, [], St0),	%Never export!
+    {#c_catch{body=Ces},[],A#a.us,St1};
+cexpr(#ifun{anno=A,id=Id,vars=Args,clauses=Lcs,fc=Lfc}, _As, St0) ->
+    {Ccs,St1} = cclauses(Lcs, [], St0),		%NEVER export!
+    {Cfc,St2} = cclause(Lfc, [], St1),
+    Anno = A#a.anno,
+    {#c_fun{anno=Id++Anno,vars=Args,
+	    body=#c_case{anno=Anno,
+			 arg=core_lib:set_anno(core_lib:make_values(Args), Anno),
+			 clauses=Ccs ++ [Cfc]}},
+     [],A#a.us,St2};
+cexpr(#iapply{anno=A,op=Op,args=Args}, _As, St) ->
+    {#c_apply{anno=A#a.anno,op=Op,args=Args},[],A#a.us,St};
+cexpr(#icall{anno=A,module=Mod,name=Name,args=Args}, _As, St) ->
+    {#c_call{anno=A#a.anno,module=Mod,name=Name,args=Args},[],A#a.us,St};
+cexpr(#iprimop{anno=A,name=Name,args=Args}, _As, St) ->
+    {#c_primop{anno=A#a.anno,name=Name,args=Args},[],A#a.us,St};
+cexpr(#iprotect{anno=A,body=Es}, _As, St0) ->
+    {Ce,_,St1} = cexprs(Es, [], St0),
+    V = #c_var{name='Try'},		%The names are arbitrary
+    Vs = [#c_var{name='T'},#c_var{name='R'}],
+    {#c_try{anno=A#a.anno,arg=Ce,vars=[V],body=V,
+	    evars=Vs,handler=#c_atom{val=false}},
+     [],A#a.us,St1};
+cexpr(#ibinary{anno=#a{anno=Anno,us=Us},segments=Segs}, _As, St) ->
+    {#c_binary{anno=Anno,segments=Segs},[],Us,St};
+cexpr(Lit, _As, St) ->
+    true = core_lib:is_simple(Lit),		%Sanity check!
+    Anno = core_lib:get_anno(Lit),
+    Vs = Anno#a.us,
+    %%Vs = lit_vars(Lit),
+    {core_lib:set_anno(Lit, Anno#a.anno),[],Vs,St}.
+
+%% lit_vars(Literal) -> [Var].
+
+lit_vars(Lit) -> lit_vars(Lit, []).
+
+lit_vars(#c_cons{hd=H,tl=T}, Vs) -> lit_vars(H, lit_vars(T, Vs));
+lit_vars(#c_tuple{es=Es}, Vs) -> lit_list_vars(Es, Vs);
+lit_vars(#c_var{name=V}, Vs) -> add_element(V, Vs);
+lit_vars(_, Vs) -> Vs.				%These are atomic
+
+% lit_bin_vars(Segs, Vs) ->
+%     foldl(fun (#c_bitstr{val=V,size=S}, Vs0) ->
+% 		  lit_vars(V, lit_vars(S, Vs0))
+% 	  end, Vs, Segs).
+
+lit_list_vars(Ls) -> lit_list_vars(Ls, []).
+
+lit_list_vars(Ls, Vs) ->
+    foldl(fun (L, Vs0) -> lit_vars(L, Vs0) end, Vs, Ls).
+
+bitstr_vars(Segs) ->
+    bitstr_vars(Segs, []).
+
+bitstr_vars(Segs, Vs) ->
+    foldl(fun (#c_bitstr{val=V,size=S}, Vs0) ->
+		  lit_vars(V, lit_vars(S, Vs0))
+	  end, Vs, Segs).
+
+get_ianno(Ce) ->
+    case core_lib:get_anno(Ce) of
+	#a{}=A -> A;
+	A when is_list(A) -> #a{anno=A}
+    end.
+
+get_lineno_anno(Ce) ->
+    case core_lib:get_anno(Ce) of
+	#a{anno=A} -> A;
+	A when is_list(A) -> A
+    end.
+
+
+%%%
+%%% Handling of warnings.
+%%%
+
+format_error(nomatch) -> "pattern cannot possibly match".
+
+add_warning(Line, Term, #core{ws=Ws}=St) when Line >= 0 ->
+    St#core{ws=[{Line,?MODULE,Term}|Ws]};
+add_warning(_, _, St) -> St.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel.erl
new file mode 100644
index 0000000000..d7c3e1add9
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel.erl
@@ -0,0 +1,1567 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: v3_kernel.erl,v 1.3 2010/03/04 13:54:20 maria Exp $
+%%
+%% Purpose : Transform Core Erlang to Kernel Erlang
+
+%% Kernel erlang is like Core Erlang with a few significant
+%% differences:
+%%
+%% 1. It is flat!  There are no nested calls or sub-blocks.
+%%
+%% 2. All variables are unique in a function.  There is no scoping, or
+%% rather the scope is the whole function.
+%%
+%% 3. Pattern matching (in cases and receives) has been compiled.
+%%
+%% 4. The annotations contain variable usages.  Seeing we have to work
+%% this out anyway for funs we might as well pass it on for free to
+%% later passes.
+%%
+%% 5. All remote-calls are to statically named m:f/a. Meta-calls are
+%% passed via erlang:apply/3.
+%%
+%% The translation is done in two passes:
+%%
+%% 1. Basic translation, translate variable/function names, flatten
+%% completely, pattern matching compilation.
+%%
+%% 2. Fun-lifting (lambda-lifting), variable usage annotation and
+%% last-call handling.
+%%
+%% All new Kexprs are created in the first pass, they are just
+%% annotated in the second.
+%%
+%% Functions and BIFs
+%%
+%% Functions are "call"ed or "enter"ed if it is a last call, their
+%% return values may be ignored.  BIFs are things which are known to
+%% be internal by the compiler and can only be called, their return
+%% values cannot be ignored.
+%%
+%% Letrec's are handled rather naively.  All the functions in one
+%% letrec are handled as one block to find the free variables.  While
+%% this is not optimal it reflects how letrec's often are used.  We
+%% don't have to worry about variable shadowing and nested letrec's as
+%% this is handled in the variable/function name translation.  There
+%% is a little bit of trickery to ensure letrec transformations fit
+%% into the scheme of things.
+%%
+%% To ensure unique variable names we use a variable substitution
+%% table and keep the set of all defined variables.  The nested
+%% scoping of Core means that we must also nest the substitution
+%% tables, but the defined set must be passed through to match the
+%% flat structure of Kernel and to make sure variables with the same
+%% name from different scopes get different substitutions.
+%%
+%% We also use these substitutions to handle the variable renaming
+%% necessary in pattern matching compilation.
+%%
+%% The pattern matching compilation assumes that the values of
+%% different types don't overlap.  This means that as there is no
+%% character type yet in the machine all characters must be converted
+%% to integers!
+
+-module(v3_kernel).
+
+-export([module/2,format_error/1]).
+
+-import(lists, [map/2,foldl/3,foldr/3,mapfoldl/3,splitwith/2,
+		member/2,reverse/1,reverse/2]).
+-import(ordsets, [add_element/2,del_element/2,union/2,union/1,subtract/2]).
+
+-include("core_parse.hrl").
+-include("v3_kernel.hrl").
+
+%% These are not defined in v3_kernel.hrl.
+get_kanno(Kthing) -> element(2, Kthing).
+set_kanno(Kthing, Anno) -> setelement(2, Kthing, Anno).
+
+%% Internal kernel expressions and help functions.
+%% N.B. the annotation field is ALWAYS the first field!
+
+-record(ivalues, {anno=[],args}).
+-record(ifun, {anno=[],vars,body}).
+-record(iset, {anno=[],vars,arg,body}).
+-record(iletrec, {anno=[],defs}).
+-record(ialias, {anno=[],vars,pat}).
+-record(iclause, {anno=[],sub,pats,guard,body}).
+-record(ireceive_accept, {anno=[],arg}).
+-record(ireceive_next, {anno=[],arg}).
+
+%% State record for kernel translator.
+-record(kern, {func,				%Current function
+	       vcount=0,			%Variable counter
+	       fcount=0,			%Fun counter
+	       ds=[],				%Defined variables
+	       funs=[],				%Fun functions
+	       free=[],				%Free variables
+	       ws=[],				%Warnings.
+	       extinstr=false}).		%Generate extended instructions
+
+module(#c_module{anno=A,name=M,exports=Es,attrs=As,defs=Fs}, Options) ->
+    ExtInstr = not member(no_new_apply, Options),
+    {Kfs,St} = mapfoldl(fun function/2, #kern{extinstr=ExtInstr}, Fs),
+    Kes = map(fun (#c_fname{id=N,arity=Ar}) -> {N,Ar} end, Es),
+    Kas = map(fun (#c_def{name=#c_atom{val=N},val=V}) ->
+		      {N,core_lib:literal_value(V)} end, As),
+    {ok,#k_mdef{anno=A,name=M#c_atom.val,exports=Kes,attributes=Kas,
+		body=Kfs ++ St#kern.funs},St#kern.ws}.
+
+function(#c_def{anno=Af,name=#c_fname{id=F,arity=Arity},val=Body}, St0) ->
+    %%ok = io:fwrite("kern: ~p~n", [{F,Arity}]),
+    St1 = St0#kern{func={F,Arity},vcount=0,fcount=0,ds=sets:new()},
+    {#ifun{anno=Ab,vars=Kvs,body=B0},[],St2} = expr(Body, new_sub(), St1),
+    {B1,_,St3} = ubody(B0, return, St2),
+    %%B1 = B0, St3 = St2,				%Null second pass
+    {#k_fdef{anno=#k{us=[],ns=[],a=Af ++ Ab},
+	     func=F,arity=Arity,vars=Kvs,body=B1},St3}.
+
+%% body(Cexpr, Sub, State) -> {Kexpr,[PreKepxr],State}.
+%%  Do the main sequence of a body.  A body ends in an atomic value or
+%%  values.  Must check if vector first so do expr.
+
+body(#c_values{anno=A,es=Ces}, Sub, St0) ->
+    %% Do this here even if only in bodies.
+    {Kes,Pe,St1} = atomic_list(Ces, Sub, St0),
+    %%{Kes,Pe,St1} = expr_list(Ces, Sub, St0),
+    {#ivalues{anno=A,args=Kes},Pe,St1};
+body(#ireceive_next{anno=A}, _, St) ->
+    {#k_receive_next{anno=A},[],St};
+body(Ce, Sub, St0) ->
+    expr(Ce, Sub, St0).
+
+%% guard(Cexpr, Sub, State) -> {Kexpr,State}.
+%%  We handle guards almost as bodies. The only special thing we
+%%  must do is to make the final Kexpr a #k_test{}.
+%%  Also, we wrap the entire guard in a try/catch which is
+%%  not strictly needed, but makes sure that every 'bif' instruction
+%%  will get a proper failure label.
+
+guard(G0, Sub, St0) ->
+    {G1,St1} = wrap_guard(G0, St0),
+    {Ge0,Pre,St2} = expr(G1, Sub, St1),
+    {Ge,St} = gexpr_test(Ge0, St2),
+    {pre_seq(Pre, Ge),St}.
+
+%% Wrap the entire guard in a try/catch if needed.
+
+wrap_guard(#c_try{}=Try, St) -> {Try,St};
+wrap_guard(Core, St0) ->
+    {VarName,St} = new_var_name(St0),
+    Var = #c_var{name=VarName},
+    Try = #c_try{arg=Core,vars=[Var],body=Var,evars=[],handler=#c_atom{val=false}},
+    {Try,St}.
+
+%% gexpr_test(Kexpr, State) -> {Kexpr,State}.
+%%  Builds the final boolean test from the last Kexpr in a guard test.
+%%  Must enter try blocks and isets and find the last Kexpr in them.
+%%  This must end in a recognised BEAM test!
+
+gexpr_test(#k_bif{anno=A,op=#k_remote{mod=#k_atom{val=erlang},
+				      name=#k_atom{val=is_boolean},arity=1}=Op,
+		  args=Kargs}, St) ->
+    %% XXX Remove this clause in R11. For bootstrap purposes, we must
+    %% recognize erlang:is_boolean/1 here.
+    {#k_test{anno=A,op=Op,args=Kargs},St};
+gexpr_test(#k_bif{anno=A,op=#k_remote{mod=#k_atom{val=erlang},
+				      name=#k_atom{val=internal_is_record},arity=3}=Op,
+		  args=Kargs}, St) ->
+    {#k_test{anno=A,op=Op,args=Kargs},St};
+gexpr_test(#k_bif{anno=A,op=#k_remote{mod=#k_atom{val=erlang},
+				      name=#k_atom{val=F},arity=Ar}=Op,
+		  args=Kargs}=Ke, St) ->
+    %% Either convert to test if ok, or add test.
+    %% At this stage, erlang:float/1 is not a type test. (It should
+    %% have been converted to erlang:is_float/1.)
+    case erl_internal:new_type_test(F, Ar) orelse
+	erl_internal:comp_op(F, Ar) of
+	true -> {#k_test{anno=A,op=Op,args=Kargs},St};
+	false -> gexpr_test_add(Ke, St)		%Add equality test
+    end;
+gexpr_test(#k_try{arg=B0,vars=[#k_var{name=X}],body=#k_var{name=X},
+		  handler=#k_atom{val=false}}=Try, St0) ->
+    {B,St} = gexpr_test(B0, St0),
+    %%ok = io:fwrite("~w: ~p~n", [?LINE,{B0,B}]),
+    {Try#k_try{arg=B},St};
+gexpr_test(#iset{body=B0}=Iset, St0) ->
+    {B1,St1} = gexpr_test(B0, St0),
+    {Iset#iset{body=B1},St1};
+gexpr_test(Ke, St) -> gexpr_test_add(Ke, St).	%Add equality test
+
+gexpr_test_add(Ke, St0) ->
+    Test = #k_remote{mod=#k_atom{val='erlang'},
+		     name=#k_atom{val='=:='},
+		     arity=2},
+    {Ae,Ap,St1} = force_atomic(Ke, St0),
+    {pre_seq(Ap, #k_test{anno=get_kanno(Ke),
+			 op=Test,args=[Ae,#k_atom{val='true'}]}),St1}.
+
+%% expr(Cexpr, Sub, State) -> {Kexpr,[PreKexpr],State}.
+%%  Convert a Core expression, flattening it at the same time.
+
+expr(#c_var{anno=A,name=V}, Sub, St) ->
+    {#k_var{anno=A,name=get_vsub(V, Sub)},[],St};
+expr(#c_char{anno=A,val=C}, _Sub, St) ->
+    {#k_int{anno=A,val=C},[],St};		%Convert to integers!
+expr(#c_int{anno=A,val=I}, _Sub, St) ->
+    {#k_int{anno=A,val=I},[],St};
+expr(#c_float{anno=A,val=F}, _Sub, St) ->
+    {#k_float{anno=A,val=F},[],St};
+expr(#c_atom{anno=A,val=At}, _Sub, St) ->
+    {#k_atom{anno=A,val=At},[],St};
+expr(#c_string{anno=A,val=S}, _Sub, St) ->
+    {#k_string{anno=A,val=S},[],St};
+expr(#c_nil{anno=A}, _Sub, St) ->
+    {#k_nil{anno=A},[],St};
+expr(#c_cons{anno=A,hd=Ch,tl=Ct}, Sub, St0) ->
+    %% Do cons in two steps, first the expressions left to right, then
+    %% any remaining literals right to left.
+    {Kh0,Hp0,St1} = expr(Ch, Sub, St0),
+    {Kt0,Tp0,St2} = expr(Ct, Sub, St1),
+    {Kt1,Tp1,St3} = force_atomic(Kt0, St2),
+    {Kh1,Hp1,St4} = force_atomic(Kh0, St3),
+    {#k_cons{anno=A,hd=Kh1,tl=Kt1},Hp0 ++ Tp0 ++ Tp1 ++ Hp1,St4};
+expr(#c_tuple{anno=A,es=Ces}, Sub, St0) ->
+    {Kes,Ep,St1} = atomic_list(Ces, Sub, St0),
+    {#k_tuple{anno=A,es=Kes},Ep,St1};
+expr(#c_binary{anno=A,segments=Cv}, Sub, St0) ->
+    case catch atomic_bin(Cv, Sub, St0, 0) of
+	{'EXIT',R} -> exit(R);
+	bad_element_size ->
+	    Erl = #c_atom{val=erlang},
+	    Name = #c_atom{val=error},
+	    Args = [#c_atom{val=badarg}],
+	    Fault = #c_call{module=Erl,name=Name,args=Args},
+	    expr(Fault, Sub, St0);
+	{Kv,Ep,St1} ->
+	    {#k_binary{anno=A,segs=Kv},Ep,St1}
+    end;
+expr(#c_fname{anno=A,arity=Ar}=Fname, Sub, St) ->
+    %% A local in an expression.
+    %% For now, these are wrapped into a fun by reverse
+    %% etha-conversion, but really, there should be exactly one
+    %% such "lambda function" for each escaping local name,
+    %% instead of one for each occurrence as done now.
+    Vs = [#c_var{name=list_to_atom("V" ++ integer_to_list(V))} ||
+	     V <- integers(1, Ar)],
+    Fun = #c_fun{anno=A,vars=Vs,body=#c_apply{op=Fname,args=Vs}},
+    expr(Fun, Sub, St);
+expr(#c_fun{anno=A,vars=Cvs,body=Cb}, Sub0, St0) ->
+    {Kvs,Sub1,St1} = pattern_list(Cvs, Sub0, St0),
+    %%ok = io:fwrite("~w: ~p~n", [?LINE,{{Cvs,Sub0,St0},{Kvs,Sub1,St1}}]),
+    {Kb,Pb,St2} = body(Cb, Sub1, St1),
+    {#ifun{anno=A,vars=Kvs,body=pre_seq(Pb, Kb)},[],St2};
+expr(#c_seq{arg=Ca,body=Cb}, Sub, St0) ->
+    {Ka,Pa,St1} = body(Ca, Sub, St0),
+    case is_exit_expr(Ka) of
+	true -> {Ka,Pa,St1};
+	false ->
+	    {Kb,Pb,St2} = body(Cb, Sub, St1),
+	    {Kb,Pa ++ [Ka] ++ Pb,St2}
+    end;
+expr(#c_let{anno=A,vars=Cvs,arg=Ca,body=Cb}, Sub0, St0) ->
+    %%ok = io:fwrite("~w: ~p~n", [?LINE,{Cvs,Sub0,St0}]),
+    {Ka,Pa,St1} = body(Ca, Sub0, St0),
+    case is_exit_expr(Ka) of
+	true -> {Ka,Pa,St1};
+	false ->
+	    {Kps,Sub1,St2} = pattern_list(Cvs, Sub0, St1),
+	    %%ok = io:fwrite("~w: ~p~n", [?LINE,{Kps,Sub1,St1,St2}]),
+	    %% Break known multiple values into separate sets.
+	    Sets = case Ka of
+		       #ivalues{args=Kas} ->
+			   foldr2(fun (V, Val, Sb) ->
+					  [#iset{vars=[V],arg=Val}|Sb] end,
+				  [], Kps, Kas);
+		       _Other ->
+			   [#iset{anno=A,vars=Kps,arg=Ka}]
+		   end,
+	    {Kb,Pb,St3} = body(Cb, Sub1, St2),
+	    {Kb,Pa ++ Sets ++ Pb,St3}
+    end;
+expr(#c_letrec{anno=A,defs=Cfs,body=Cb}, Sub0, St0) ->
+    %% Make new function names and store substitution.
+    {Fs0,{Sub1,St1}} =
+	mapfoldl(fun (#c_def{name=#c_fname{id=F,arity=Ar},val=B}, {Sub,St0}) ->
+			 {N,St1} = new_fun_name(atom_to_list(F)
+						++ "/" ++
+						integer_to_list(Ar),
+						St0),
+			 {{N,B},{set_fsub(F, Ar, N, Sub),St1}}
+		 end, {Sub0,St0}, Cfs),
+    %% Run translation on functions and body.
+    {Fs1,St2} = mapfoldl(fun ({N,Fd0}, St1) ->
+				 {Fd1,[],St2} = expr(Fd0, Sub1, St1),
+				 Fd = set_kanno(Fd1, A),
+				 {{N,Fd},St2}
+			 end, St1, Fs0),
+    {Kb,Pb,St3} = body(Cb, Sub1, St2),
+    {Kb,[#iletrec{anno=A,defs=Fs1}|Pb],St3};
+expr(#c_case{arg=Ca,clauses=Ccs}, Sub, St0) ->
+    {Ka,Pa,St1} = body(Ca, Sub, St0),		%This is a body!
+    {Kvs,Pv,St2} = match_vars(Ka, St1),		%Must have variables here!
+    {Km,St3} = kmatch(Kvs, Ccs, Sub, St2),
+    Match = flatten_seq(build_match(Kvs, Km)),
+    {last(Match),Pa ++ Pv ++ first(Match),St3};
+expr(#c_receive{anno=A,clauses=Ccs0,timeout=Ce,action=Ca}, Sub, St0) ->
+    {Ke,Pe,St1} = atomic_lit(Ce, Sub, St0),	%Force this to be atomic!
+    {Rvar,St2} = new_var(St1),
+    %% Need to massage accept clauses and add reject clause before matching.
+    Ccs1 = map(fun (#c_clause{anno=Banno,body=B0}=C) ->
+		       B1 = #c_seq{arg=#ireceive_accept{anno=A},body=B0},
+		       C#c_clause{anno=Banno,body=B1}
+	       end, Ccs0),
+    {Mpat,St3} = new_var_name(St2),
+    Rc = #c_clause{anno=[compiler_generated|A],
+		   pats=[#c_var{name=Mpat}],guard=#c_atom{anno=A,val=true},
+		   body=#ireceive_next{anno=A}},
+    {Km,St4} = kmatch([Rvar], Ccs1 ++ [Rc], Sub, add_var_def(Rvar, St3)),
+    {Ka,Pa,St5} = body(Ca, Sub, St4),
+    {#k_receive{anno=A,var=Rvar,body=Km,timeout=Ke,action=pre_seq(Pa, Ka)},
+     Pe,St5};
+expr(#c_apply{anno=A,op=Cop,args=Cargs}, Sub, St) ->
+    c_apply(A, Cop, Cargs, Sub, St);
+expr(#c_call{anno=A,module=M0,name=F0,args=Cargs}, Sub, St0) ->
+    {[M1,F1|Kargs],Ap,St1} = atomic_list([M0,F0|Cargs], Sub, St0),
+    Ar = length(Cargs),
+    case {M1,F1} of
+	{#k_atom{val=Ma},#k_atom{val=Fa}} ->
+	    Call = case is_remote_bif(Ma, Fa, Ar) of
+		       true ->
+			   #k_bif{anno=A,
+				  op=#k_remote{mod=M1,name=F1,arity=Ar},
+				  args=Kargs};
+		       false ->
+			   #k_call{anno=A,
+				   op=#k_remote{mod=M1,name=F1,arity=Ar},
+				   args=Kargs}
+		   end,
+	    {Call,Ap,St1};
+	_Other when St0#kern.extinstr == false -> %Old explicit apply
+	    Call = #c_call{anno=A,
+			   module=#c_atom{val=erlang},
+			   name=#c_atom{val=apply},
+			   args=[M0,F0,make_list(Cargs)]},
+	    expr(Call, Sub, St0);
+	_Other ->				%New instruction in R10.
+	    Call = #k_call{anno=A,
+			   op=#k_remote{mod=M1,name=F1,arity=Ar},
+			   args=Kargs},
+	    {Call,Ap,St1}
+    end;
+expr(#c_primop{anno=A,name=#c_atom{val=match_fail},args=Cargs}, Sub, St0) ->
+    %% This special case will disappear.
+    {Kargs,Ap,St1} = atomic_list(Cargs, Sub, St0),
+    Ar = length(Cargs),
+    Call = #k_call{anno=A,op=#k_internal{name=match_fail,arity=Ar},args=Kargs},
+    {Call,Ap,St1};
+expr(#c_primop{anno=A,name=#c_atom{val=N},args=Cargs}, Sub, St0) ->
+    {Kargs,Ap,St1} = atomic_list(Cargs, Sub, St0),
+    Ar = length(Cargs),
+    {#k_bif{anno=A,op=#k_internal{name=N,arity=Ar},args=Kargs},Ap,St1};
+expr(#c_try{anno=A,arg=Ca,vars=Cvs,body=Cb,evars=Evs,handler=Ch}, Sub0, St0) ->
+    %% The normal try expression. The body and exception handler
+    %% variables behave as let variables.
+    {Ka,Pa,St1} = body(Ca, Sub0, St0),
+    {Kcvs,Sub1,St2} = pattern_list(Cvs, Sub0, St1),
+    {Kb,Pb,St3} = body(Cb, Sub1, St2),
+    {Kevs,Sub2,St4} = pattern_list(Evs, Sub0, St3),
+    {Kh,Ph,St5} = body(Ch, Sub2, St4),
+    {#k_try{anno=A,arg=pre_seq(Pa, Ka),
+	    vars=Kcvs,body=pre_seq(Pb, Kb),
+	    evars=Kevs,handler=pre_seq(Ph, Kh)},[],St5};
+expr(#c_catch{anno=A,body=Cb}, Sub, St0) ->
+    {Kb,Pb,St1} = body(Cb, Sub, St0),
+    {#k_catch{anno=A,body=pre_seq(Pb, Kb)},[],St1};
+%% Handle internal expressions.
+expr(#ireceive_accept{anno=A}, _Sub, St) -> {#k_receive_accept{anno=A},[],St}.
+
+%% expr_list([Cexpr], Sub, State) -> {[Kexpr],[PreKexpr],State}.
+
+% expr_list(Ces, Sub, St) ->
+%     foldr(fun (Ce, {Kes,Esp,St0}) ->
+% 		  {Ke,Ep,St1} = expr(Ce, Sub, St0),
+% 		  {[Ke|Kes],Ep ++ Esp,St1}
+% 	  end, {[],[],St}, Ces).
+
+%% match_vars(Kexpr, State) -> {[Kvar],[PreKexpr],State}.
+%%  Force return from body into a list of variables.
+
+match_vars(#ivalues{args=As}, St) ->
+    foldr(fun (Ka, {Vs,Vsp,St0}) ->
+		  {V,Vp,St1} = force_variable(Ka, St0),
+		  {[V|Vs],Vp ++ Vsp,St1}
+	  end, {[],[],St}, As);
+match_vars(Ka, St0) ->
+    {V,Vp,St1} = force_variable(Ka, St0),
+    {[V],Vp,St1}.
+
+%% c_apply(A, Op, [Carg], Sub, State) -> {Kexpr,[PreKexpr],State}.
+%%  Transform application, detect which are guaranteed to be bifs.
+
+c_apply(A, #c_fname{anno=Ra,id=F0,arity=Ar}, Cargs, Sub, St0) ->
+    {Kargs,Ap,St1} = atomic_list(Cargs, Sub, St0),
+    F1 = get_fsub(F0, Ar, Sub),			%Has it been rewritten
+    {#k_call{anno=A,op=#k_local{anno=Ra,name=F1,arity=Ar},args=Kargs},
+     Ap,St1};
+c_apply(A, Cop, Cargs, Sub, St0) ->
+    {Kop,Op,St1} = variable(Cop, Sub, St0),
+    {Kargs,Ap,St2} = atomic_list(Cargs, Sub, St1),
+    {#k_call{anno=A,op=Kop,args=Kargs},Op ++ Ap,St2}.
+
+flatten_seq(#iset{anno=A,vars=Vs,arg=Arg,body=B}) ->
+    [#iset{anno=A,vars=Vs,arg=Arg}|flatten_seq(B)];
+flatten_seq(Ke) -> [Ke].
+
+pre_seq([#iset{anno=A,vars=Vs,arg=Arg,body=B}|Ps], K) ->
+    B = undefined,				%Assertion.
+    #iset{anno=A,vars=Vs,arg=Arg,body=pre_seq(Ps, K)};
+pre_seq([P|Ps], K) ->
+    #iset{vars=[],arg=P,body=pre_seq(Ps, K)};
+pre_seq([], K) -> K.
+
+%% atomic_lit(Cexpr, Sub, State) -> {Katomic,[PreKexpr],State}.
+%%  Convert a Core expression making sure the result is an atomic
+%%  literal.
+
+atomic_lit(Ce, Sub, St0) ->
+    {Ke,Kp,St1} = expr(Ce, Sub, St0),
+    {Ka,Ap,St2} = force_atomic(Ke, St1),
+    {Ka,Kp ++ Ap,St2}.
+
+force_atomic(Ke, St0) ->
+    case is_atomic(Ke) of
+	true -> {Ke,[],St0};
+	false ->
+	    {V,St1} = new_var(St0),
+	    {V,[#iset{vars=[V],arg=Ke}],St1}
+    end.
+
+% force_atomic_list(Kes, St) ->
+%     foldr(fun (Ka, {As,Asp,St0}) ->
+% 		  {A,Ap,St1} = force_atomic(Ka, St0),
+% 		  {[A|As],Ap ++ Asp,St1}
+% 	  end, {[],[],St}, Kes).
+
+atomic_bin([#c_bitstr{anno=A,val=E0,size=S0,unit=U,type=T,flags=Fs}|Es0],
+	   Sub, St0, B0) ->
+    {E,Ap1,St1} = atomic_lit(E0, Sub, St0),
+    {S1,Ap2,St2} = atomic_lit(S0, Sub, St1),
+    validate_bin_element_size(S1),
+    U0 = core_lib:literal_value(U),
+    Fs0 = core_lib:literal_value(Fs),
+    {B1,Fs1} = aligned(B0, S1, U0, Fs0),
+    {Es,Ap3,St3} = atomic_bin(Es0, Sub, St2, B1),
+    {#k_bin_seg{anno=A,size=S1,
+		unit=U0,
+		type=core_lib:literal_value(T),
+		flags=Fs1,
+		seg=E,next=Es},
+     Ap1++Ap2++Ap3,St3};
+atomic_bin([], _Sub, St, _Bits) -> {#k_bin_end{},[],St}.
+
+validate_bin_element_size(#k_var{}) -> ok;
+validate_bin_element_size(#k_int{val=V}) when V >= 0 -> ok;
+validate_bin_element_size(#k_atom{val=all}) -> ok;
+validate_bin_element_size(_) -> throw(bad_element_size).
+
+%% atomic_list([Cexpr], Sub, State) -> {[Kexpr],[PreKexpr],State}.
+
+atomic_list(Ces, Sub, St) ->
+    foldr(fun (Ce, {Kes,Esp,St0}) ->
+		  {Ke,Ep,St1} = atomic_lit(Ce, Sub, St0),
+		  {[Ke|Kes],Ep ++ Esp,St1}
+	  end, {[],[],St}, Ces).
+
+%% is_atomic(Kexpr) -> boolean().
+%%  Is a Kexpr atomic?  Strings are NOT considered atomic!
+
+is_atomic(#k_int{}) -> true;
+is_atomic(#k_float{}) -> true;
+is_atomic(#k_atom{}) -> true;
+%%is_atomic(#k_char{}) -> true;			%No characters
+%%is_atomic(#k_string{}) -> true;
+is_atomic(#k_nil{}) -> true;
+is_atomic(#k_var{}) -> true;
+is_atomic(_) -> false.
+
+%% variable(Cexpr, Sub, State) -> {Kvar,[PreKexpr],State}.
+%%  Convert a Core expression making sure the result is a variable.
+
+variable(Ce, Sub, St0) ->
+    {Ke,Kp,St1} = expr(Ce, Sub, St0),
+    {Kv,Vp,St2} = force_variable(Ke, St1),
+    {Kv,Kp ++ Vp,St2}.
+
+force_variable(#k_var{}=Ke, St) -> {Ke,[],St};
+force_variable(Ke, St0) ->
+    {V,St1} = new_var(St0),
+    {V,[#iset{vars=[V],arg=Ke}],St1}.
+
+%% pattern(Cpat, Sub, State) -> {Kpat,Sub,State}.
+%%  Convert patterns.  Variables shadow so rename variables that are
+%%  already defined.
+
+pattern(#c_var{anno=A,name=V}, Sub, St0) ->
+    case sets:is_element(V, St0#kern.ds) of
+	true ->
+	    {New,St1} = new_var_name(St0),
+	    {#k_var{anno=A,name=New},
+	     set_vsub(V, New, Sub),
+	     St1#kern{ds=sets:add_element(New, St1#kern.ds)}};
+	false ->
+	    {#k_var{anno=A,name=V},Sub,
+	     St0#kern{ds=sets:add_element(V, St0#kern.ds)}}
+    end;
+pattern(#c_char{anno=A,val=C}, Sub, St) ->
+    {#k_int{anno=A,val=C},Sub,St};		%Convert to integers!
+pattern(#c_int{anno=A,val=I}, Sub, St) ->
+    {#k_int{anno=A,val=I},Sub,St};
+pattern(#c_float{anno=A,val=F}, Sub, St) ->
+    {#k_float{anno=A,val=F},Sub,St};
+pattern(#c_atom{anno=A,val=At}, Sub, St) ->
+    {#k_atom{anno=A,val=At},Sub,St};
+pattern(#c_string{val=S}, Sub, St) ->
+    L = foldr(fun (C, T) -> #k_cons{hd=#k_int{val=C},tl=T} end,
+	      #k_nil{}, S),
+    {L,Sub,St};
+pattern(#c_nil{anno=A}, Sub, St) ->
+    {#k_nil{anno=A},Sub,St};
+pattern(#c_cons{anno=A,hd=Ch,tl=Ct}, Sub0, St0) ->
+    {Kh,Sub1,St1} = pattern(Ch, Sub0, St0),
+    {Kt,Sub2,St2} = pattern(Ct, Sub1, St1),
+    {#k_cons{anno=A,hd=Kh,tl=Kt},Sub2,St2};
+pattern(#c_tuple{anno=A,es=Ces}, Sub0, St0) ->
+    {Kes,Sub1,St1} = pattern_list(Ces, Sub0, St0),
+    {#k_tuple{anno=A,es=Kes},Sub1,St1};
+pattern(#c_binary{anno=A,segments=Cv}, Sub0, St0) ->
+    {Kv,Sub1,St1} = pattern_bin(Cv, Sub0, St0),
+    {#k_binary{anno=A,segs=Kv},Sub1,St1};
+pattern(#c_alias{anno=A,var=Cv,pat=Cp}, Sub0, St0) ->
+    {Cvs,Cpat} = flatten_alias(Cp),
+    {Kvs,Sub1,St1} = pattern_list([Cv|Cvs], Sub0, St0),
+    {Kpat,Sub2,St2} = pattern(Cpat, Sub1, St1),
+    {#ialias{anno=A,vars=Kvs,pat=Kpat},Sub2,St2}.
+
+flatten_alias(#c_alias{var=V,pat=P}) ->
+    {Vs,Pat} = flatten_alias(P),
+    {[V|Vs],Pat};
+flatten_alias(Pat) -> {[],Pat}.
+
+pattern_bin(Es, Sub, St) -> pattern_bin(Es, Sub, St, 0).
+
+pattern_bin([#c_bitstr{anno=A,val=E0,size=S0,unit=U,type=T,flags=Fs}|Es0],
+	    Sub0, St0, B0) ->
+    {S1,[],St1} = expr(S0, Sub0, St0),
+    U0 = core_lib:literal_value(U),
+    Fs0 = core_lib:literal_value(Fs),
+    %%ok= io:fwrite("~w: ~p~n", [?LINE,{B0,S1,U0,Fs0}]),
+    {B1,Fs1} = aligned(B0, S1, U0, Fs0),
+    {E,Sub1,St2} = pattern(E0, Sub0, St1),
+    {Es,Sub2,St3} = pattern_bin(Es0, Sub1, St2, B1),
+    {#k_bin_seg{anno=A,size=S1,
+		unit=U0,
+		type=core_lib:literal_value(T),
+		flags=Fs1,
+		seg=E,next=Es},
+     Sub2,St3};
+pattern_bin([], Sub, St, _Bits) -> {#k_bin_end{},Sub,St}.
+
+%% pattern_list([Cexpr], Sub, State) -> {[Kexpr],Sub,State}.
+
+pattern_list(Ces, Sub, St) ->
+    foldr(fun (Ce, {Kes,Sub0,St0}) ->
+		  {Ke,Sub1,St1} = pattern(Ce, Sub0, St0),
+		  {[Ke|Kes],Sub1,St1}
+	  end, {[],Sub,St}, Ces).
+
+%% new_sub() -> Subs.
+%% set_vsub(Name, Sub, Subs) -> Subs.
+%% subst_vsub(Name, Sub, Subs) -> Subs.
+%% get_vsub(Name, Subs) -> SubName.
+%%  Add/get substitute Sub for Name to VarSub.  Use orddict so we know
+%%  the format is a list {Name,Sub} pairs.  When adding a new
+%%  substitute we fold substitute chains so we never have to search
+%%  more than once.
+
+new_sub() -> orddict:new().
+
+get_vsub(V, Vsub) ->
+    case orddict:find(V, Vsub) of
+	{ok,Val} -> Val;
+	error -> V
+    end.
+
+set_vsub(V, S, Vsub) ->
+    orddict:store(V, S, Vsub).
+
+subst_vsub(V, S, Vsub0) ->
+    %% Fold chained substitutions.
+    Vsub1 = orddict:map(fun (_, V1) when V1 =:= V -> S;
+			    (_, V1) -> V1
+			end, Vsub0),
+    orddict:store(V, S, Vsub1).
+
+get_fsub(F, A, Fsub) ->
+    case orddict:find({F,A}, Fsub) of
+	{ok,Val} -> Val;
+	error -> F
+    end.
+
+set_fsub(F, A, S, Fsub) ->
+    orddict:store({F,A}, S, Fsub).
+
+new_fun_name(St) ->
+    new_fun_name("anonymous", St).
+
+%% new_fun_name(Type, State) -> {FunName,State}.
+
+new_fun_name(Type, #kern{func={F,Arity},fcount=C}=St) ->
+    Name = "-" ++ atom_to_list(F) ++ "/" ++ integer_to_list(Arity) ++
+	"-" ++ Type ++ "-" ++ integer_to_list(C) ++ "-",
+    {list_to_atom(Name),St#kern{fcount=C+1}}.
+
+%% new_var_name(State) -> {VarName,State}.
+
+new_var_name(#kern{vcount=C}=St) ->
+    {list_to_atom("ker" ++ integer_to_list(C)),St#kern{vcount=C+1}}.
+
+%% new_var(State) -> {#k_var{},State}.
+
+new_var(St0) ->
+    {New,St1} = new_var_name(St0),
+    {#k_var{name=New},St1}.
+
+%% new_vars(Count, State) -> {[#k_var{}],State}.
+%%  Make Count new variables.
+
+new_vars(N, St) -> new_vars(N, St, []).
+
+new_vars(N, St0, Vs) when N > 0 ->
+    {V,St1} = new_var(St0),
+    new_vars(N-1, St1, [V|Vs]);
+new_vars(0, St, Vs) -> {Vs,St}.
+
+make_vars(Vs) -> [ #k_var{name=V} || V <- Vs ].
+
+add_var_def(V, St) ->
+    St#kern{ds=sets:add_element(V#k_var.name, St#kern.ds)}.
+
+%%add_vars_def(Vs, St) ->
+%%    Ds = foldl(fun (#k_var{name=V}, Ds) -> add_element(V, Ds) end,
+%%	       St#kern.ds, Vs),
+%%    St#kern{ds=Ds}.
+
+%% is_remote_bif(Mod, Name, Arity) -> true | false.
+%%  Test if function is really a BIF.
+
+is_remote_bif(erlang, is_boolean, 1) ->
+    %% XXX Remove this clause in R11. For bootstrap purposes, we must
+    %% recognize erlang:is_boolean/1 here.
+    true;
+is_remote_bif(erlang, internal_is_record, 3) -> true;
+is_remote_bif(erlang, get, 1) -> true;
+is_remote_bif(erlang, N, A) ->
+    case erl_internal:guard_bif(N, A) of
+	true -> true;
+	false ->
+	    case erl_internal:type_test(N, A) of
+		true -> true;
+		false ->
+		    case catch erl_internal:op_type(N, A) of
+			arith -> true;
+			bool -> true;
+			comp -> true;
+			_Other -> false		%List, send or not an op
+		    end
+	    end
+    end;
+is_remote_bif(_, _, _) -> false.
+
+%% bif_vals(Name, Arity) -> integer().
+%% bif_vals(Mod, Name, Arity) -> integer().
+%%  Determine how many return values a BIF has.  Provision for BIFs to
+%%  return multiple values.  Only used in bodies where a BIF may be
+%%  called for effect only.
+
+bif_vals(dsetelement, 3) -> 0;
+bif_vals(_, _) -> 1.
+
+bif_vals(_, _, _) -> 1.
+
+%% foldr2(Fun, Acc, List1, List2) -> Acc.
+%%  Fold over two lists.
+
+foldr2(Fun, Acc0, [E1|L1], [E2|L2]) ->
+    Acc1 = Fun(E1, E2, Acc0),
+    foldr2(Fun, Acc1, L1, L2);
+foldr2(_, Acc, [], []) -> Acc.
+
+%% first([A]) -> [A].
+%% last([A]) -> A.
+
+last([L]) -> L;
+last([_|T]) -> last(T).
+
+first([_]) -> [];
+first([H|T]) -> [H|first(T)].
+
+%% This code implements the algorithm for an optimizing compiler for
+%% pattern matching given "The Implementation of Functional
+%% Programming Languages" by Simon Peyton Jones. The code is much
+%% longer as the meaning of constructors is different from the book.
+%%
+%% In Erlang many constructors can have different values, e.g. 'atom'
+%% or 'integer', whereas in the original algorithm thse would be
+%% different constructors. Our view makes it easier in later passes to
+%% handle indexing over each type.
+%%
+%% Patterns are complicated by having alias variables.  The form of a
+%% pattern is Pat | {alias,Pat,[AliasVar]}.  This is hidden by access
+%% functions to pattern arguments but the code must be aware of it.
+%%
+%% The compilation proceeds in two steps:
+%%
+%% 1. The patterns in the clauses to converted to lists of kernel
+%% patterns.  The Core clause is now hybrid, this is easier to work
+%% with.  Remove clauses with trivially false guards, this simplifies
+%% later passes.  Add local defined vars and variable subs to each
+%% clause for later use.
+%%
+%% 2. The pattern matching is optimised.  Variable substitutions are
+%% added to the VarSub structure and new variables are made visible.
+%% The guard and body are then converted to Kernel form.
+
+%% kmatch([Var], [Clause], Sub, State) -> {Kexpr,[PreExpr],State}.
+
+kmatch(Us, Ccs, Sub, St0) ->
+    {Cs,St1} = match_pre(Ccs, Sub, St0),	%Convert clauses
+    %%Def = kernel_match_error,              %The strict case
+    %% This should be a kernel expression from the first pass.
+    Def = #k_call{anno=[compiler_generated],
+		  op=#k_remote{mod=#k_atom{val=erlang},
+			       name=#k_atom{val=exit},
+			       arity=1},
+		  args=[#k_atom{val=kernel_match_error}]},
+    {Km,St2} = match(Us, Cs, Def, St1),               %Do the match.
+    {Km,St2}.
+
+%% match_pre([Cclause], Sub, State) -> {[Clause],State}.
+%%  Must be careful not to generate new substitutions here now!
+%%  Remove clauses with trivially false guards which will never
+%%  succeed.
+
+match_pre(Cs, Sub0, St) ->
+    foldr(fun (#c_clause{anno=A,pats=Ps,guard=G,body=B}, {Cs0,St0}) ->
+		  case is_false_guard(G) of
+		      true -> {Cs0,St0};
+		      false ->
+			  {Kps,Sub1,St1} = pattern_list(Ps, Sub0, St0),
+			  {[#iclause{anno=A,sub=Sub1,pats=Kps,guard=G,body=B}|
+			    Cs0],St1}
+		  end
+	  end, {[],St}, Cs).
+
+%% match([Var], [Clause], Default, State) -> {MatchExpr,State}.
+
+match([U|Us], Cs, Def, St0) ->
+    %%ok = io:format("match ~p~n", [Cs]),
+    Pcss = partition(Cs),
+    foldr(fun (Pcs, {D,St}) -> match_varcon([U|Us], Pcs, D, St) end,
+	  {Def,St0}, Pcss);
+match([], Cs, Def, St) ->
+    match_guard(Cs, Def, St).
+
+%% match_guard([Clause], Default, State) -> {IfExpr,State}.
+%%  Build a guard to handle guards. A guard *ALWAYS* fails if no
+%%  clause matches, there will be a surrounding 'alt' to catch the
+%%  failure.  Drop redundant cases, i.e. those after a true guard.
+
+match_guard(Cs0, Def0, St0) ->
+    {Cs1,Def1,St1} = match_guard_1(Cs0, Def0, St0),
+    {build_alt(build_guard(Cs1), Def1),St1}.
+
+match_guard_1([#iclause{anno=A,sub=Sub,guard=G,body=B}|Cs0], Def0, St0) ->
+    case is_true_guard(G) of
+	true ->
+	    %% The true clause body becomes the default.
+	    {Kb,Pb,St1} = body(B, Sub, St0),
+	    Line = get_line(A),
+	    St2 = maybe_add_warning(Cs0, Line, St1),
+	    St = maybe_add_warning(Def0, Line, St2),
+	    {[],pre_seq(Pb, Kb),St};
+	false ->
+	    {Kg,St1} = guard(G, Sub, St0),
+	    {Kb,Pb,St2} = body(B, Sub, St1),
+	    {Cs1,Def1,St3} = match_guard_1(Cs0, Def0, St2),
+	    {[#k_guard_clause{guard=Kg,body=pre_seq(Pb, Kb)}|Cs1],
+	     Def1,St3}
+    end;
+match_guard_1([], Def, St) -> {[],Def,St}.
+
+maybe_add_warning([C|_], Line, St) ->
+    maybe_add_warning(C, Line, St);
+maybe_add_warning([], _Line, St) -> St;
+maybe_add_warning(fail, _Line, St) -> St;
+maybe_add_warning(Ke, MatchLine, St) ->
+    case get_kanno(Ke) of
+	[compiler_generated|_] -> St;
+	Anno ->
+	    Line = get_line(Anno),
+	    Warn = case MatchLine of
+		       none -> nomatch_shadow;
+		       _ -> {nomatch_shadow,MatchLine}
+		   end,
+	    add_warning(Line, Warn, St)
+    end.
+
+get_line([Line|_]) when is_integer(Line) -> Line;
+get_line([_|T]) -> get_line(T);
+get_line([]) -> none.
+
+
+%% is_true_guard(Guard) -> boolean().
+%% is_false_guard(Guard) -> boolean().
+%%  Test if a guard is either trivially true/false.  This has probably
+%%  already been optimised away, but what the heck!
+
+is_true_guard(G) -> guard_value(G) == true.
+is_false_guard(G) -> guard_value(G) == false.
+
+%% guard_value(Guard) -> true | false | unknown.
+
+guard_value(#c_atom{val=true}) -> true;
+guard_value(#c_atom{val=false}) -> false;
+guard_value(#c_call{module=#c_atom{val=erlang},
+		    name=#c_atom{val='not'},
+		    args=[A]}) ->
+    case guard_value(A) of
+	true -> false;
+	false -> true;
+	unknown -> unknown
+    end;
+guard_value(#c_call{module=#c_atom{val=erlang},
+		    name=#c_atom{val='and'},
+		    args=[Ca,Cb]}) ->
+    case guard_value(Ca) of
+	true -> guard_value(Cb);
+	false -> false;
+	unknown ->
+	    case guard_value(Cb) of
+		false -> false;
+		_Other -> unknown
+	    end
+    end;
+guard_value(#c_call{module=#c_atom{val=erlang},
+		    name=#c_atom{val='or'},
+		    args=[Ca,Cb]}) ->
+    case guard_value(Ca) of
+	true -> true;
+	false -> guard_value(Cb);
+	unknown ->
+	    case guard_value(Cb) of
+		true -> true;
+		_Other -> unknown
+	    end
+    end;
+guard_value(#c_try{arg=E,vars=[#c_var{name=X}],body=#c_var{name=X},
+		   handler=#c_atom{val=false}}) ->
+    guard_value(E);
+guard_value(_) -> unknown.
+
+%% partition([Clause]) -> [[Clause]].
+%%  Partition a list of clauses into groups which either contain
+%%  clauses with a variable first argument, or with a "constructor".
+
+partition([C1|Cs]) ->
+    V1 = is_var_clause(C1),
+    {More,Rest} = splitwith(fun (C) -> is_var_clause(C) == V1 end, Cs),
+    [[C1|More]|partition(Rest)];
+partition([]) -> [].
+
+%% match_varcon([Var], [Clause], Def, [Var], Sub, State) ->
+%%        {MatchExpr,State}.
+
+match_varcon(Us, [C|_]=Cs, Def, St) ->
+    case is_var_clause(C) of
+	true -> match_var(Us, Cs, Def, St);
+	false -> match_con(Us, Cs, Def, St)
+    end.
+
+%% match_var([Var], [Clause], Def, State) -> {MatchExpr,State}.
+%%  Build a call to "select" from a list of clauses all containing a
+%%  variable as the first argument.  We must rename the variable in
+%%  each clause to be the match variable as these clause will share
+%%  this variable and may have different names for it.  Rename aliases
+%%  as well.
+
+match_var([U|Us], Cs0, Def, St) ->
+    Cs1 = map(fun (#iclause{sub=Sub0,pats=[Arg|As]}=C) ->
+		      Vs = [arg_arg(Arg)|arg_alias(Arg)],
+		      Sub1 = foldl(fun (#k_var{name=V}, Acc) ->
+					   subst_vsub(V, U#k_var.name, Acc)
+				   end, Sub0, Vs),
+		      C#iclause{sub=Sub1,pats=As}
+	      end, Cs0),
+    match(Us, Cs1, Def, St).
+
+%% match_con(Variables, [Clause], Default, State) -> {SelectExpr,State}.
+%%  Build call to "select" from a list of clauses all containing a
+%%  constructor/constant as first argument.  Group the constructors
+%%  according to type, the order is really irrelevant but tries to be
+%%  smart.
+
+match_con([U|Us], Cs, Def, St0) ->
+    %% Extract clauses for different constructors (types).
+    %%ok = io:format("match_con ~p~n", [Cs]),
+    Ttcs = [ {T,Tcs} || T <- [k_cons,k_tuple,k_atom,k_float,k_int,k_nil,
+			      k_binary,k_bin_end],
+		       begin Tcs = select(T, Cs),
+			     Tcs /= []
+		       end ] ++ select_bin_con(Cs),
+    %%ok = io:format("ttcs = ~p~n", [Ttcs]),
+    {Scs,St1} =
+	mapfoldl(fun ({T,Tcs}, St) ->
+			 {[S|_]=Sc,S1} = match_value([U|Us], T, Tcs, fail, St),
+			 %%ok = io:format("match_con type2 ~p~n", [T]),
+			 Anno = get_kanno(S),
+			 {#k_type_clause{anno=Anno,type=T,values=Sc},S1} end,
+		 St0, Ttcs),
+    {build_alt_1st_no_fail(build_select(U, Scs), Def),St1}.
+
+%% select_bin_con([Clause]) -> [{Type,[Clause]}].
+%%  Extract clauses for the k_bin_seg constructor.  As k_bin_seg
+%%  matching can overlap, the k_bin_seg constructors cannot be
+%%  reordered, only grouped.
+
+select_bin_con(Cs0) ->
+    Cs1 = lists:filter(fun (C) ->
+			       clause_con(C) == k_bin_seg
+		       end, Cs0),
+    select_bin_con_1(Cs1).
+
+select_bin_con_1([C1|Cs]) ->
+    Con = clause_con(C1),
+    {More,Rest} = splitwith(fun (C) -> clause_con(C) == Con end, Cs),
+    [{Con,[C1|More]}|select_bin_con_1(Rest)];
+select_bin_con_1([]) -> [].
+
+%% select(Con, [Clause]) -> [Clause].
+
+select(T, Cs) -> [ C || C <- Cs, clause_con(C) == T ].
+
+%% match_value([Var], Con, [Clause], Default, State) -> {SelectExpr,State}.
+%%  At this point all the clauses have the same constructor, we must
+%%  now separate them according to value.
+
+match_value(_, _, [], _, St) -> {[],St};
+match_value(Us, T, Cs0, Def, St0) ->
+    Css = group_value(T, Cs0),
+    %%ok = io:format("match_value ~p ~p~n", [T, Css]),
+    {Css1,St1} = mapfoldl(fun (Cs, St) ->
+				  match_clause(Us, Cs, Def, St) end,
+			  St0, Css),
+    {Css1,St1}.
+    %%{#k_select_val{type=T,var=hd(Us),clauses=Css1},St1}.
+
+%% group_value([Clause]) -> [[Clause]].
+%%  Group clauses according to value.  Here we know that
+%%  1. Some types are singled valued
+%%  2. The clauses in bin_segs cannot be reordered only grouped
+%%  3. Other types are disjoint and can be reordered
+
+group_value(k_cons, Cs) -> [Cs];		%These are single valued
+group_value(k_nil, Cs) -> [Cs];
+group_value(k_binary, Cs) -> [Cs];
+group_value(k_bin_end, Cs) -> [Cs];
+group_value(k_bin_seg, Cs) ->
+    group_bin_seg(Cs);
+group_value(_, Cs) ->
+    %% group_value(Cs).
+    Cd = foldl(fun (C, Gcs0) -> dict:append(clause_val(C), C, Gcs0) end,
+	       dict:new(), Cs),
+    dict:fold(fun (_, Vcs, Css) -> [Vcs|Css] end, [], Cd).
+
+group_bin_seg([C1|Cs]) ->
+    V1 = clause_val(C1),
+    {More,Rest} = splitwith(fun (C) -> clause_val(C) == V1 end, Cs),
+    [[C1|More]|group_bin_seg(Rest)];
+group_bin_seg([]) -> [].
+
+%% Profiling shows that this quadratic implementation account for a big amount
+%% of the execution time if there are many values.
+% group_value([C|Cs]) ->
+%     V = clause_val(C),
+%     Same = [ Cv || Cv <- Cs, clause_val(Cv) == V ], %Same value
+%     Rest = [ Cv || Cv <- Cs, clause_val(Cv) /= V ], % and all the rest
+%     [[C|Same]|group_value(Rest)];
+% group_value([]) -> [].
+
+%% match_clause([Var], [Clause], Default, State) -> {Clause,State}.
+%%  At this point all the clauses have the same "value".  Build one
+%%  select clause for this value and continue matching.  Rename
+%%  aliases as well.
+
+match_clause([U|Us], [C|_]=Cs0, Def, St0) ->
+    Anno = get_kanno(C),
+    {Match0,Vs,St1} = get_match(get_con(Cs0), St0),
+    Match = sub_size_var(Match0, Cs0),
+    {Cs1,St2} = new_clauses(Cs0, U, St1),
+    {B,St3} = match(Vs ++ Us, Cs1, Def, St2),
+    {#k_val_clause{anno=Anno,val=Match,body=B},St3}.
+
+sub_size_var(#k_bin_seg{size=#k_var{name=Name}=Kvar}=BinSeg, [#iclause{sub=Sub}|_]) ->
+    BinSeg#k_bin_seg{size=Kvar#k_var{name=get_vsub(Name, Sub)}};
+sub_size_var(K, _) -> K.
+
+get_con([C|_]) -> arg_arg(clause_arg(C)).	%Get the constructor
+
+get_match(#k_cons{}, St0) ->
+    {[H,T],St1} = new_vars(2, St0),
+    {#k_cons{hd=H,tl=T},[H,T],St1};
+get_match(#k_binary{}, St0) ->
+    {[V]=Mes,St1} = new_vars(1, St0),
+    {#k_binary{segs=V},Mes,St1};
+get_match(#k_bin_seg{}=Seg, St0) ->
+    {[S,N]=Mes,St1} = new_vars(2, St0),
+    {Seg#k_bin_seg{seg=S,next=N},Mes,St1};
+get_match(#k_tuple{es=Es}, St0) ->
+    {Mes,St1} = new_vars(length(Es), St0),
+    {#k_tuple{es=Mes},Mes,St1};
+get_match(M, St) ->
+    {M,[],St}.
+
+new_clauses(Cs0, U, St) ->
+    Cs1 = map(fun (#iclause{sub=Sub0,pats=[Arg|As]}=C) ->
+		      Head = case arg_arg(Arg) of
+				 #k_cons{hd=H,tl=T} -> [H,T|As];
+				 #k_tuple{es=Es} -> Es ++ As;
+				 #k_binary{segs=E}  -> [E|As];
+				 #k_bin_seg{seg=S,next=N} ->
+				     [S,N|As];
+				 _Other -> As
+			     end,
+		      Vs = arg_alias(Arg),
+		      Sub1 = foldl(fun (#k_var{name=V}, Acc) ->
+					   subst_vsub(V, U#k_var.name, Acc)
+				   end, Sub0, Vs),
+		      C#iclause{sub=Sub1,pats=Head}
+	      end, Cs0),
+    {Cs1,St}.
+
+%% build_guard([GuardClause]) -> GuardExpr.
+
+build_guard([]) -> fail;
+build_guard(Cs) -> #k_guard{clauses=Cs}.
+
+%% build_select(Var, [ConClause]) -> SelectExpr.
+
+build_select(V, [Tc|_]=Tcs) ->
+    Anno = get_kanno(Tc),
+    #k_select{anno=Anno,var=V,types=Tcs}.
+
+%% build_alt(First, Then) -> AltExpr.
+%%  Build an alt, attempt some simple optimisation.
+
+build_alt(fail, Then) -> Then;
+build_alt(First,Then) -> build_alt_1st_no_fail(First, Then).
+
+build_alt_1st_no_fail(First, fail) -> First;
+build_alt_1st_no_fail(First, Then) -> #k_alt{first=First,then=Then}.
+
+%% build_match([MatchVar], MatchExpr) -> Kexpr.
+%%  Build a match expr if there is a match.
+
+build_match(Us, #k_alt{}=Km) -> #k_match{vars=Us,body=Km};
+build_match(Us, #k_select{}=Km) -> #k_match{vars=Us,body=Km};
+build_match(Us, #k_guard{}=Km) -> #k_match{vars=Us,body=Km};
+build_match(_, Km) -> Km.
+
+%% clause_arg(Clause) -> FirstArg.
+%% clause_con(Clause) -> Constructor.
+%% clause_val(Clause) -> Value.
+%% is_var_clause(Clause) -> boolean().
+
+clause_arg(#iclause{pats=[Arg|_]}) -> Arg.
+
+clause_con(C) -> arg_con(clause_arg(C)).
+
+clause_val(C) -> arg_val(clause_arg(C)).
+
+is_var_clause(C) -> clause_con(C) == k_var.
+
+%% arg_arg(Arg) -> Arg.
+%% arg_alias(Arg) -> Aliases.
+%% arg_con(Arg) -> Constructor.
+%% arg_val(Arg) -> Value.
+%%  These are the basic functions for obtaining fields in an argument.
+
+arg_arg(#ialias{pat=Con}) -> Con;
+arg_arg(Con) -> Con.
+
+arg_alias(#ialias{vars=As}) -> As;
+arg_alias(_Con) -> [].
+
+arg_con(Arg) ->
+    case arg_arg(Arg) of
+	#k_int{} -> k_int;
+	#k_float{} -> k_float;
+	#k_atom{} -> k_atom;
+	#k_nil{} -> k_nil;
+	#k_cons{} -> k_cons;
+	#k_tuple{} -> k_tuple;
+	#k_binary{} -> k_binary;
+	#k_bin_end{} -> k_bin_end;
+	#k_bin_seg{} -> k_bin_seg;
+	#k_var{} -> k_var
+    end.
+
+arg_val(Arg) ->
+    case arg_arg(Arg) of
+	#k_int{val=I} -> I;
+	#k_float{val=F} -> F;
+	#k_atom{val=A} -> A;
+	#k_nil{} -> 0;
+	#k_cons{} -> 2;
+	#k_tuple{es=Es} -> length(Es);
+	#k_bin_seg{size=S,unit=U,type=T,flags=Fs} ->
+	    {set_kanno(S, []),U,T,Fs};
+	#k_bin_end{} -> 0;
+	#k_binary{} -> 0
+    end.
+
+%% ubody(Expr, Break, State) -> {Expr,[UsedVar],State}.
+%%  Tag the body sequence with its used variables.  These bodies
+%%  either end with a #k_break{}, or with #k_return{} or an expression
+%%  which itself can return, #k_enter{}, #k_match{} ... .
+
+ubody(#iset{vars=[],arg=#iletrec{}=Let,body=B0}, Br, St0) ->
+    %% An iletrec{} should never be last.
+    St1 = iletrec_funs(Let, St0),
+    ubody(B0, Br, St1);
+ubody(#iset{anno=A,vars=Vs,arg=E0,body=B0}, Br, St0) ->
+    {E1,Eu,St1} = uexpr(E0, {break,Vs}, St0),
+    {B1,Bu,St2} = ubody(B0, Br, St1),
+    Ns = lit_list_vars(Vs),
+    Used = union(Eu, subtract(Bu, Ns)),		%Used external vars
+    {#k_seq{anno=#k{us=Used,ns=Ns,a=A},arg=E1,body=B1},Used,St2};
+ubody(#ivalues{anno=A,args=As}, return, St) ->
+    Au = lit_list_vars(As),
+    {#k_return{anno=#k{us=Au,ns=[],a=A},args=As},Au,St};
+ubody(#ivalues{anno=A,args=As}, {break,_Vbs}, St) ->
+    Au = lit_list_vars(As),
+    {#k_break{anno=#k{us=Au,ns=[],a=A},args=As},Au,St};
+ubody(E, return, St0) ->
+    %% Enterable expressions need no trailing return.
+    case is_enter_expr(E) of
+	true -> uexpr(E, return, St0);
+	false ->
+	    {Ea,Pa,St1} = force_atomic(E, St0),
+	    ubody(pre_seq(Pa, #ivalues{args=[Ea]}), return, St1)
+    end;
+ubody(E, {break,Rs}, St0) ->
+    %%ok = io:fwrite("ubody ~w:~p~n", [?LINE,{E,Br}]),
+    %% Exiting expressions need no trailing break.
+    case is_exit_expr(E) of
+	true -> uexpr(E, return, St0);
+	false ->
+	    {Ea,Pa,St1} = force_atomic(E, St0),
+	    ubody(pre_seq(Pa, #ivalues{args=[Ea]}), {break,Rs}, St1)
+    end.
+
+iletrec_funs(#iletrec{defs=Fs}, St0) ->
+    %% Use union of all free variables.
+    %% First just work out free variables for all functions.
+    Free = foldl(fun ({_,#ifun{vars=Vs,body=Fb0}}, Free0) ->
+			 {_,Fbu,_} = ubody(Fb0, return, St0),
+			 Ns = lit_list_vars(Vs),
+			 Free1 = subtract(Fbu, Ns),
+			 union(Free1, Free0)
+		 end, [], Fs),
+    FreeVs = make_vars(Free),
+    %% Add this free info to State.
+    St1 = foldl(fun ({N,#ifun{vars=Vs}}, Lst) ->
+			store_free(N, length(Vs), FreeVs, Lst)
+		end, St0, Fs),
+    %% Now regenerate local functions to use free variable information.
+    St2 = foldl(fun ({N,#ifun{anno=Fa,vars=Vs,body=Fb0}}, Lst0) ->
+			{Fb1,_,Lst1} = ubody(Fb0, return, Lst0),
+			Arity = length(Vs) + length(FreeVs),
+			Fun = #k_fdef{anno=#k{us=[],ns=[],a=Fa},
+				      func=N,arity=Arity,
+				      vars=Vs ++ FreeVs,body=Fb1},
+			Lst1#kern{funs=[Fun|Lst1#kern.funs]}
+		end, St1, Fs),
+    St2.
+
+%% is_exit_expr(Kexpr) -> boolean().
+%%  Test whether Kexpr always exits and never returns.
+
+is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=throw,arity=1}}) -> true;
+is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=exit,arity=1}}) -> true;
+is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=error,arity=1}}) -> true;
+is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=error,arity=2}}) -> true;
+is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=fault,arity=1}}) -> true;
+is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=fault,arity=2}}) -> true;
+is_exit_expr(#k_call{op=#k_internal{name=match_fail,arity=1}}) -> true;
+is_exit_expr(#k_bif{op=#k_internal{name=rethrow,arity=2}}) -> true;
+is_exit_expr(#k_receive_next{}) -> true;
+is_exit_expr(_) -> false.
+
+%% is_enter_expr(Kexpr) -> boolean().
+%%  Test whether Kexpr is "enterable", i.e. can handle return from
+%%  within itself without extra #k_return{}.
+
+is_enter_expr(#k_call{}) -> true;
+is_enter_expr(#k_match{}) -> true;
+is_enter_expr(#k_receive{}) -> true;
+is_enter_expr(#k_receive_next{}) -> true;
+%%is_enter_expr(#k_try{}) -> true;		%Soon
+is_enter_expr(_) -> false.
+
+%% uguard(Expr, State) -> {Expr,[UsedVar],State}.
+%%  Tag the guard sequence with its used variables.
+
+uguard(#k_try{anno=A,arg=B0,vars=[#k_var{name=X}],body=#k_var{name=X},
+	      handler=#k_atom{val=false}}=Try, St0) ->
+    {B1,Bu,St1} = uguard(B0, St0),
+    {Try#k_try{anno=#k{us=Bu,ns=[],a=A},arg=B1},Bu,St1};
+uguard(T, St) ->
+    %%ok = io:fwrite("~w: ~p~n", [?LINE,T]),
+    uguard_test(T, St).
+
+%% uguard_test(Expr, State) -> {Test,[UsedVar],State}.
+%%  At this stage tests are just expressions which don't return any
+%%  values.
+
+uguard_test(T, St) -> uguard_expr(T, [], St).
+
+uguard_expr(#iset{anno=A,vars=Vs,arg=E0,body=B0}, Rs, St0) ->
+    Ns = lit_list_vars(Vs),
+    {E1,Eu,St1} = uguard_expr(E0, Vs, St0),
+    {B1,Bu,St2} = uguard_expr(B0, Rs, St1),
+    Used = union(Eu, subtract(Bu, Ns)),
+    {#k_seq{anno=#k{us=Used,ns=Ns,a=A},arg=E1,body=B1},Used,St2};
+uguard_expr(#k_try{anno=A,arg=B0,vars=[#k_var{name=X}],body=#k_var{name=X},
+		   handler=#k_atom{val=false}}=Try, Rs, St0) ->
+    {B1,Bu,St1} = uguard_expr(B0, Rs, St0),
+    {Try#k_try{anno=#k{us=Bu,ns=lit_list_vars(Rs),a=A},arg=B1,ret=Rs},
+     Bu,St1};
+uguard_expr(#k_test{anno=A,op=Op,args=As}=Test, Rs, St) ->
+    [] = Rs,					%Sanity check
+    Used = union(op_vars(Op), lit_list_vars(As)),
+    {Test#k_test{anno=#k{us=Used,ns=lit_list_vars(Rs),a=A}},
+     Used,St};
+uguard_expr(#k_bif{anno=A,op=Op,args=As}=Bif, Rs, St) ->
+    Used = union(op_vars(Op), lit_list_vars(As)),
+    {Bif#k_bif{anno=#k{us=Used,ns=lit_list_vars(Rs),a=A},ret=Rs},
+     Used,St};
+uguard_expr(#ivalues{anno=A,args=As}, Rs, St) ->
+    Sets = foldr2(fun (V, Arg, Rhs) ->
+			  #iset{anno=A,vars=[V],arg=Arg,body=Rhs}
+		  end, #k_atom{val=true}, Rs, As),
+    uguard_expr(Sets, [], St);
+uguard_expr(#k_match{anno=A,vars=Vs,body=B0}, Rs, St0) ->
+    %% Experimental support for andalso/orelse in guards.
+    Br = case Rs of
+	     [] -> return;
+	     _ -> {break,Rs}
+	 end,
+    {B1,Bu,St1} = umatch(B0, Br, St0),
+    {#k_match{anno=#k{us=Bu,ns=lit_list_vars(Rs),a=A},
+	      vars=Vs,body=B1,ret=Rs},Bu,St1};
+uguard_expr(Lit, Rs, St) ->
+    %% Transform literals to puts here.
+    Used = lit_vars(Lit),
+    {#k_put{anno=#k{us=Used,ns=lit_list_vars(Rs),a=get_kanno(Lit)},
+	    arg=Lit,ret=Rs},Used,St}.
+
+%% uexpr(Expr, Break, State) -> {Expr,[UsedVar],State}.
+%%  Tag an expression with its used variables.
+%%  Break = return | {break,[RetVar]}.
+
+uexpr(#k_call{anno=A,op=#k_local{name=F,arity=Ar}=Op,args=As0}=Call, Br, St) ->
+    Free = get_free(F, Ar, St),
+    As1 = As0 ++ Free,				%Add free variables LAST!
+    Used = lit_list_vars(As1),
+    {case Br of
+	 {break,Rs} ->
+	     Call#k_call{anno=#k{us=Used,ns=lit_list_vars(Rs),a=A},
+			 op=Op#k_local{arity=Ar + length(Free)},
+			 args=As1,ret=Rs};
+	 return ->
+	     #k_enter{anno=#k{us=Used,ns=[],a=A},
+		      op=Op#k_local{arity=Ar + length(Free)},
+		      args=As1}
+     end,Used,St};
+uexpr(#k_call{anno=A,op=Op,args=As}=Call, {break,Rs}, St) ->
+    Used = union(op_vars(Op), lit_list_vars(As)),
+    {Call#k_call{anno=#k{us=Used,ns=lit_list_vars(Rs),a=A},ret=Rs},
+     Used,St};
+uexpr(#k_call{anno=A,op=Op,args=As}, return, St) ->
+    Used = union(op_vars(Op), lit_list_vars(As)),
+    {#k_enter{anno=#k{us=Used,ns=[],a=A},op=Op,args=As},
+     Used,St};
+uexpr(#k_bif{anno=A,op=Op,args=As}=Bif, {break,Rs}, St0) ->
+    Used = union(op_vars(Op), lit_list_vars(As)),
+    {Brs,St1} = bif_returns(Op, Rs, St0),
+    {Bif#k_bif{anno=#k{us=Used,ns=lit_list_vars(Brs),a=A},ret=Brs},
+     Used,St1};
+uexpr(#k_match{anno=A,vars=Vs,body=B0}, Br, St0) ->
+    Rs = break_rets(Br),
+    {B1,Bu,St1} = umatch(B0, Br, St0),
+    {#k_match{anno=#k{us=Bu,ns=lit_list_vars(Rs),a=A},
+	      vars=Vs,body=B1,ret=Rs},Bu,St1};
+uexpr(#k_receive{anno=A,var=V,body=B0,timeout=T,action=A0}, Br, St0) ->
+    Rs = break_rets(Br),
+    Tu = lit_vars(T),				%Timeout is atomic
+    {B1,Bu,St1} = umatch(B0, Br, St0),
+    {A1,Au,St2} = ubody(A0, Br, St1),
+    Used = del_element(V#k_var.name, union(Bu, union(Tu, Au))),
+    {#k_receive{anno=#k{us=Used,ns=lit_list_vars(Rs),a=A},
+		var=V,body=B1,timeout=T,action=A1,ret=Rs},
+     Used,St2};
+uexpr(#k_receive_accept{anno=A}, _, St) ->
+    {#k_receive_accept{anno=#k{us=[],ns=[],a=A}},[],St};
+uexpr(#k_receive_next{anno=A}, _, St) ->
+    {#k_receive_next{anno=#k{us=[],ns=[],a=A}},[],St};
+uexpr(#k_try{anno=A,arg=A0,vars=Vs,body=B0,evars=Evs,handler=H0},
+      {break,Rs0}, St0) ->
+    {Avs,St1} = new_vars(length(Vs), St0),	%Need dummy names here
+    {A1,Au,St2} = ubody(A0, {break,Avs}, St1),	%Must break to clean up here!
+    {B1,Bu,St3} = ubody(B0, {break,Rs0}, St2),
+    {H1,Hu,St4} = ubody(H0, {break,Rs0}, St3),
+    %% Guarantee ONE return variable.
+    NumNew = if
+		 Rs0 =:= [] -> 1;
+		 true -> 0
+	     end,
+    {Ns,St5} = new_vars(NumNew, St4),
+    Rs1 = Rs0 ++ Ns,
+    Used = union([Au,subtract(Bu, lit_list_vars(Vs)),
+		  subtract(Hu, lit_list_vars(Evs))]),
+    {#k_try{anno=#k{us=Used,ns=lit_list_vars(Rs1),a=A},
+	    arg=A1,vars=Vs,body=B1,evars=Evs,handler=H1,ret=Rs1},
+     Used,St5};
+uexpr(#k_catch{anno=A,body=B0}, {break,Rs0}, St0) ->
+    {Rb,St1} = new_var(St0),
+    {B1,Bu,St2} = ubody(B0, {break,[Rb]}, St1),
+    %% Guarantee ONE return variable.
+    {Ns,St3} = new_vars(1 - length(Rs0), St2),
+    Rs1 = Rs0 ++ Ns,
+    {#k_catch{anno=#k{us=Bu,ns=lit_list_vars(Rs1),a=A},body=B1,ret=Rs1},Bu,St3};
+uexpr(#ifun{anno=A,vars=Vs,body=B0}=IFun, {break,Rs}, St0) ->
+    {B1,Bu,St1} = ubody(B0, return, St0),	%Return out of new function
+    Ns = lit_list_vars(Vs),
+    Free = subtract(Bu, Ns),			%Free variables in fun
+    Fvs = make_vars(Free),
+    Arity = length(Vs) + length(Free),
+    {{Index,Uniq,Fname}, St3} =
+	case lists:keysearch(id, 1, A) of
+	    {value,{id,Id}} ->
+		{Id, St1};
+	    false ->
+		%% No id annotation. Must invent one.
+		I = St1#kern.fcount,
+		U = erlang:hash(IFun, (1 bsl 27)-1),
+		{N, St2} = new_fun_name(St1),
+		{{I,U,N}, St2}
+	end,
+    Fun = #k_fdef{anno=#k{us=[],ns=[],a=A},func=Fname,arity=Arity,
+		  vars=Vs ++ Fvs,body=B1},
+    {#k_bif{anno=#k{us=Free,ns=lit_list_vars(Rs),a=A},
+	    op=#k_internal{name=make_fun,arity=length(Free)+3},
+	    args=[#k_atom{val=Fname},#k_int{val=Arity},
+		  #k_int{val=Index},#k_int{val=Uniq}|Fvs],
+	    ret=Rs},
+%      {#k_call{anno=#k{us=Free,ns=lit_list_vars(Rs),a=A},
+% 	     op=#k_internal{name=make_fun,arity=length(Free)+3},
+% 	     args=[#k_atom{val=Fname},#k_int{val=Arity},
+% 		   #k_int{val=Index},#k_int{val=Uniq}|Fvs],
+% 	     ret=Rs},
+     Free,St3#kern{funs=[Fun|St3#kern.funs]}};
+uexpr(Lit, {break,Rs}, St) ->
+    %% Transform literals to puts here.
+    %%ok = io:fwrite("uexpr ~w:~p~n", [?LINE,Lit]),
+    Used = lit_vars(Lit),
+    {#k_put{anno=#k{us=Used,ns=lit_list_vars(Rs),a=get_kanno(Lit)},
+	    arg=Lit,ret=Rs},Used,St}.
+
+%% get_free(Name, Arity, State) -> [Free].
+%% store_free(Name, Arity, [Free], State) -> State.
+
+get_free(F, A, St) ->
+    case orddict:find({F,A}, St#kern.free) of
+	{ok,Val} -> Val;
+	error -> []
+    end.
+
+store_free(F, A, Free, St) ->
+    St#kern{free=orddict:store({F,A}, Free, St#kern.free)}.
+
+break_rets({break,Rs}) -> Rs;
+break_rets(return) -> [].
+
+%% bif_returns(Op, [Ret], State) -> {[Ret],State}.
+
+bif_returns(#k_remote{mod=M,name=N,arity=Ar}, Rs, St0) ->
+    %%ok = io:fwrite("uexpr ~w:~p~n", [?LINE,{M,N,Ar,Rs}]),
+    {Ns,St1} = new_vars(bif_vals(M, N, Ar) - length(Rs), St0),
+    {Rs ++ Ns,St1};
+bif_returns(#k_internal{name=N,arity=Ar}, Rs, St0) ->
+    %%ok = io:fwrite("uexpr ~w:~p~n", [?LINE,{N,Ar,Rs}]),
+    {Ns,St1} = new_vars(bif_vals(N, Ar) - length(Rs), St0),
+    {Rs ++ Ns,St1}.
+
+%% umatch(Match, Break, State) -> {Match,[UsedVar],State}.
+%%  Tag a match expression with its used variables.
+
+umatch(#k_alt{anno=A,first=F0,then=T0}, Br, St0) ->
+    {F1,Fu,St1} = umatch(F0, Br, St0),
+    {T1,Tu,St2} = umatch(T0, Br, St1),
+    Used = union(Fu, Tu),
+    {#k_alt{anno=#k{us=Used,ns=[],a=A},first=F1,then=T1},
+     Used,St2};
+umatch(#k_select{anno=A,var=V,types=Ts0}, Br, St0) ->
+    {Ts1,Tus,St1} = umatch_list(Ts0, Br, St0),
+    Used = add_element(V#k_var.name, Tus),
+    {#k_select{anno=#k{us=Used,ns=[],a=A},var=V,types=Ts1},Used,St1};
+umatch(#k_type_clause{anno=A,type=T,values=Vs0}, Br, St0) ->
+    {Vs1,Vus,St1} = umatch_list(Vs0, Br, St0),
+    {#k_type_clause{anno=#k{us=Vus,ns=[],a=A},type=T,values=Vs1},Vus,St1};
+umatch(#k_val_clause{anno=A,val=P,body=B0}, Br, St0) ->
+    {U0,Ps} = pat_vars(P),
+    {B1,Bu,St1} = umatch(B0, Br, St0),
+    Used = union(U0, subtract(Bu, Ps)),
+    {#k_val_clause{anno=#k{us=Used,ns=[],a=A},val=P,body=B1},
+     Used,St1};
+umatch(#k_guard{anno=A,clauses=Gs0}, Br, St0) ->
+    {Gs1,Gus,St1} = umatch_list(Gs0, Br, St0),
+    {#k_guard{anno=#k{us=Gus,ns=[],a=A},clauses=Gs1},Gus,St1};
+umatch(#k_guard_clause{anno=A,guard=G0,body=B0}, Br, St0) ->
+    %%ok = io:fwrite("~w: ~p~n", [?LINE,G0]),
+    {G1,Gu,St1} = uguard(G0, St0),
+    %%ok = io:fwrite("~w: ~p~n", [?LINE,G1]),
+    {B1,Bu,St2} = umatch(B0, Br, St1),
+    Used = union(Gu, Bu),
+    {#k_guard_clause{anno=#k{us=Used,ns=[],a=A},guard=G1,body=B1},Used,St2};
+umatch(B0, Br, St0) -> ubody(B0, Br, St0).
+
+umatch_list(Ms0, Br, St) ->
+    foldr(fun (M0, {Ms1,Us,Sta}) ->
+		  {M1,Mu,Stb} = umatch(M0, Br, Sta),
+		  {[M1|Ms1],union(Mu, Us),Stb}
+	  end, {[],[],St}, Ms0).
+
+%% op_vars(Op) -> [VarName].
+
+op_vars(#k_local{}) -> [];
+op_vars(#k_remote{mod=Mod,name=Name}) ->
+    ordsets:from_list([V || #k_var{name=V} <- [Mod,Name]]);
+op_vars(#k_internal{}) -> [];
+op_vars(Atomic) -> lit_vars(Atomic).
+
+%% lit_vars(Literal) -> [VarName].
+%%  Return the variables in a literal.
+
+lit_vars(#k_var{name=N}) -> [N];
+lit_vars(#k_int{}) -> [];
+lit_vars(#k_float{}) -> [];
+lit_vars(#k_atom{}) -> [];
+%%lit_vars(#k_char{}) -> [];
+lit_vars(#k_string{}) -> [];
+lit_vars(#k_nil{}) -> [];
+lit_vars(#k_cons{hd=H,tl=T}) ->
+    union(lit_vars(H), lit_vars(T));
+lit_vars(#k_binary{segs=V}) -> lit_vars(V);
+lit_vars(#k_bin_end{}) -> [];
+lit_vars(#k_bin_seg{size=Size,seg=S,next=N}) ->
+    union(lit_vars(Size), union(lit_vars(S), lit_vars(N)));
+lit_vars(#k_tuple{es=Es}) ->
+    lit_list_vars(Es).
+
+lit_list_vars(Ps) ->
+    foldl(fun (P, Vs) -> union(lit_vars(P), Vs) end, [], Ps).
+
+%% pat_vars(Pattern) -> {[UsedVarName],[NewVarName]}.
+%%  Return variables in a pattern.  All variables are new variables
+%%  except those in the size field of binary segments.
+
+pat_vars(#k_var{name=N}) -> {[],[N]};
+%%pat_vars(#k_char{}) -> {[],[]};
+pat_vars(#k_int{}) -> {[],[]};
+pat_vars(#k_float{}) -> {[],[]};
+pat_vars(#k_atom{}) -> {[],[]};
+pat_vars(#k_string{}) -> {[],[]};
+pat_vars(#k_nil{}) -> {[],[]};
+pat_vars(#k_cons{hd=H,tl=T}) ->
+    pat_list_vars([H,T]);
+pat_vars(#k_binary{segs=V}) ->
+    pat_vars(V);
+pat_vars(#k_bin_seg{size=Size,seg=S,next=N}) ->
+    {U1,New} = pat_list_vars([S,N]),
+    {[],U2} = pat_vars(Size),
+    {union(U1, U2),New};
+pat_vars(#k_bin_end{}) -> {[],[]};
+pat_vars(#k_tuple{es=Es}) ->
+    pat_list_vars(Es).
+
+pat_list_vars(Ps) ->
+    foldl(fun (P, {Used0,New0}) ->
+		  {Used,New} = pat_vars(P),
+		  {union(Used0, Used),union(New0, New)} end,
+	  {[],[]}, Ps).
+
+%% aligned(Bits, Size, Unit, Flags) -> {Size,Flags}
+%%  Add 'aligned' to the flags if the current field is aligned.
+%%  Number of bits correct modulo 8.
+
+aligned(B, S, U, Fs) when B rem 8 =:= 0 ->
+    {incr_bits(B, S, U),[aligned|Fs]};
+aligned(B, S, U, Fs) ->
+    {incr_bits(B, S, U),Fs}.
+
+incr_bits(B, #k_int{val=S}, U) when integer(B) -> B + S*U;
+incr_bits(_, #k_atom{val=all}, _) -> 0;		%Always aligned
+incr_bits(B, _, 8) -> B;
+incr_bits(_, _, _) -> unknown.
+
+make_list(Es) ->
+    foldr(fun (E, Acc) -> #c_cons{hd=E,tl=Acc} end, #c_nil{}, Es).
+
+%% List of integers in interval [N,M]. Empty list if N > M.
+
+integers(N, M) when N =< M ->
+    [N|integers(N + 1, M)];
+integers(_, _) -> [].
+
+%%%
+%%% Handling of warnings.
+%%%
+
+format_error({nomatch_shadow,Line}) ->
+    M = io_lib:format("this clause cannot match because a previous clause at line ~p "
+		      "always matches", [Line]),
+    lists:flatten(M);
+format_error(nomatch_shadow) ->
+    "this clause cannot match because a previous clause always matches".
+
+add_warning(none, Term, #kern{ws=Ws}=St) ->
+    St#kern{ws=[{?MODULE,Term}|Ws]};
+add_warning(Line, Term, #kern{ws=Ws}=St) when Line >= 0 ->
+    St#kern{ws=[{Line,?MODULE,Term}|Ws]};
+add_warning(_, _, St) -> St.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel.hrl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel.hrl
new file mode 100644
index 0000000000..6e97d4d66a
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel.hrl
@@ -0,0 +1,77 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: v3_kernel.hrl,v 1.1 2008/12/17 09:53:43 mikpe Exp $
+%%
+
+%% Purpose : Kernel Erlang as records.
+
+%% It would be nice to incorporate some generic functions as well but
+%% this could make including this file difficult.
+%% N.B. the annotation field is ALWAYS the first field!
+
+%% Kernel annotation record.
+-record(k, {us,					%Used variables
+	    ns,					%New variables
+	    a}).				%Core annotation
+
+%% Literals
+%% NO CHARACTERS YET.
+%%-record(k_char, {anno=[],val}).
+-record(k_int, {anno=[],val}).
+-record(k_float, {anno=[],val}).
+-record(k_atom, {anno=[],val}).
+-record(k_string, {anno=[],val}).
+-record(k_nil, {anno=[]}).
+
+-record(k_tuple, {anno=[],es}).
+-record(k_cons, {anno=[],hd,tl}).
+-record(k_binary, {anno=[],segs}).
+-record(k_bin_seg, {anno=[],size,unit,type,flags,seg,next}).
+-record(k_bin_end, {anno=[]}).
+-record(k_var, {anno=[],name}).
+
+-record(k_local, {anno=[],name,arity}).
+-record(k_remote, {anno=[],mod,name,arity}).
+-record(k_internal, {anno=[],name,arity}).
+
+-record(k_mdef, {anno=[],name,exports,attributes,body}).
+-record(k_fdef, {anno=[],func,arity,vars,body}).
+
+-record(k_seq, {anno=[],arg,body}).
+-record(k_put, {anno=[],arg,ret=[]}).
+-record(k_bif, {anno=[],op,args,ret=[]}).
+-record(k_test, {anno=[],op,args}).
+-record(k_call, {anno=[],op,args,ret=[]}).
+-record(k_enter, {anno=[],op,args}).
+-record(k_receive, {anno=[],var,body,timeout,action,ret=[]}).
+-record(k_receive_accept, {anno=[]}).
+-record(k_receive_next, {anno=[]}).
+-record(k_try, {anno=[],arg,vars,body,evars,handler,ret=[]}).
+-record(k_catch, {anno=[],body,ret=[]}).
+
+-record(k_match, {anno=[],vars,body,ret=[]}).
+-record(k_alt, {anno=[],first,then}).
+-record(k_select, {anno=[],var,types}).
+-record(k_type_clause, {anno=[],type,values}).
+-record(k_val_clause, {anno=[],val,body}).
+-record(k_guard, {anno=[],clauses}).
+-record(k_guard_clause, {anno=[],guard,body}).
+
+-record(k_break, {anno=[],args=[]}).
+-record(k_return, {anno=[],args=[]}).
+
+%%k_get_anno(Thing) -> element(2, Thing).
+%%k_set_anno(Thing, Anno) -> setelement(2, Thing, Anno).
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel_pp.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel_pp.erl
new file mode 100644
index 0000000000..41f59b7a81
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel_pp.erl
@@ -0,0 +1,444 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: v3_kernel_pp.erl,v 1.1 2008/12/17 09:53:43 mikpe Exp $
+%%
+%% Purpose : Kernel Erlang (naive) prettyprinter
+
+-module(v3_kernel_pp).
+
+-include("v3_kernel.hrl").
+
+-export([format/1]).
+
+%% These are "internal" structures in sys_kernel which are here for
+%% debugging purposes.
+-record(iset, {anno=[],vars,arg,body}).
+-record(ifun, {anno=[],vars,body}).
+
+%% ====================================================================== %%
+%% format(Node) -> Text
+%%	Node = coreErlang()
+%%	Text = string() | [Text]
+%%
+%%	Prettyprint-formats (naively) an abstract Core Erlang syntax
+%%	tree.
+
+-record(ctxt, {indent = 0,
+	       item_indent = 2,
+	       body_indent = 2,
+	       tab_width = 8}).
+
+canno(Cthing) -> element(2, Cthing).
+
+format(Node) -> format(Node, #ctxt{}).
+
+format(Node, Ctxt) ->
+    case canno(Node) of
+	[] ->
+	    format_1(Node, Ctxt);
+	List ->
+	    format_anno(List, Ctxt, fun (Ctxt1) -> format_1(Node, Ctxt1) end)
+    end.
+
+format_anno(Anno, Ctxt, ObjFun) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
+    ["( ",
+     ObjFun(Ctxt1),
+     nl_indent(Ctxt1),
+     "-| ",io_lib:write(Anno),
+     " )"].
+
+%% format_1(Kexpr, Context) -> string().
+
+format_1(#k_atom{val=A}, _Ctxt) -> core_atom(A);
+%%format_1(#k_char{val=C}, _Ctxt) -> io_lib:write_char(C);
+format_1(#k_float{val=F}, _Ctxt) -> float_to_list(F);
+format_1(#k_int{val=I}, _Ctxt) -> integer_to_list(I);
+format_1(#k_nil{}, _Ctxt) -> "[]";
+format_1(#k_string{val=S}, _Ctxt) -> io_lib:write_string(S);
+format_1(#k_var{name=V}, _Ctxt) ->
+    if atom(V) ->
+	    case atom_to_list(V) of
+		[$_|Cs] -> "_X" ++ Cs;
+		[C|Cs] when C >= $A, C =< $Z -> [C|Cs];
+		Cs -> [$_|Cs]
+	    end;
+       integer(V) -> [$_|integer_to_list(V)]
+    end;
+format_1(#k_cons{hd=H,tl=T}, Ctxt) ->
+    Txt = ["["|format(H, ctxt_bump_indent(Ctxt, 1))],
+    [Txt|format_list_tail(T, ctxt_bump_indent(Ctxt, width(Txt, Ctxt)))];
+format_1(#k_tuple{es=Es}, Ctxt) ->
+    [${,
+     format_hseq(Es, ",", ctxt_bump_indent(Ctxt, 1), fun format/2),
+     $}
+    ];
+format_1(#k_binary{segs=S}, Ctxt) ->
+    ["#<",format(S, ctxt_bump_indent(Ctxt, 2)),">#"];
+format_1(#k_bin_seg{}=S, Ctxt) ->
+    [format_bin_seg_1(S, Ctxt),
+     format_bin_seg(S#k_bin_seg.next, ctxt_bump_indent(Ctxt, 2))];
+format_1(#k_bin_end{}, _Ctxt) -> "#<>#";
+format_1(#k_local{name=N,arity=A}, Ctxt) ->
+    "local " ++ format_fa_pair({N,A}, Ctxt);
+format_1(#k_remote{mod=M,name=N,arity=A}, _Ctxt) ->
+    %% This is for our internal translator.
+    io_lib:format("remote ~s:~s/~w", [format(M),format(N),A]);
+format_1(#k_internal{name=N,arity=A}, Ctxt) ->
+    "internal " ++ format_fa_pair({N,A}, Ctxt);
+format_1(#k_seq{arg=A,body=B}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
+    ["do",
+     nl_indent(Ctxt1),
+     format(A, Ctxt1),
+     nl_indent(Ctxt),
+     "then",
+     nl_indent(Ctxt)
+     | format(B, Ctxt)
+    ];
+format_1(#k_match{vars=Vs,body=Bs,ret=Rs}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.item_indent),
+    ["match ",
+     format_hseq(Vs, ",", ctxt_bump_indent(Ctxt, 6), fun format/2),
+     nl_indent(Ctxt1),
+     format(Bs, Ctxt1),
+     nl_indent(Ctxt),
+     "end",
+     format_ret(Rs, Ctxt1)
+    ];
+format_1(#k_alt{first=O,then=T}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.item_indent),
+    ["alt",
+     nl_indent(Ctxt1),
+     format(O, Ctxt1),
+     nl_indent(Ctxt1),
+     format(T, Ctxt1)];
+format_1(#k_select{var=V,types=Cs}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
+    ["select ",
+     format(V, Ctxt),
+     nl_indent(Ctxt1),
+     format_vseq(Cs, "", "", Ctxt1, fun format/2)
+    ];
+format_1(#k_type_clause{type=T,values=Cs}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["type ",
+     io_lib:write(T),
+     nl_indent(Ctxt1),
+     format_vseq(Cs, "", "", Ctxt1, fun format/2)
+    ];
+format_1(#k_val_clause{val=Val,body=B}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
+    [format(Val, Ctxt),
+     " ->",
+     nl_indent(Ctxt1)
+     | format(B, Ctxt1)
+    ];
+format_1(#k_guard{clauses=Gs}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, 5),
+    ["when ",
+     nl_indent(Ctxt1),
+     format_vseq(Gs, "", "", Ctxt1, fun format/2)];
+format_1(#k_guard_clause{guard=G,body=B}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
+    [format(G, Ctxt),
+     nl_indent(Ctxt),
+     "->",
+     nl_indent(Ctxt1)
+     | format(B, Ctxt1)
+    ];
+format_1(#k_call{op=Op,args=As,ret=Rs}, Ctxt) ->
+    Txt = ["call (",format(Op, ctxt_bump_indent(Ctxt, 6)),$)],
+    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
+    [Txt,format_args(As, Ctxt1),
+     format_ret(Rs, Ctxt1)
+    ];
+format_1(#k_enter{op=Op,args=As}, Ctxt) ->
+    Txt = ["enter (",format(Op, ctxt_bump_indent(Ctxt, 7)),$)],
+    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
+    [Txt,format_args(As, Ctxt1)];
+format_1(#k_bif{op=Op,args=As,ret=Rs}, Ctxt) ->
+    Txt = ["bif (",format(Op, ctxt_bump_indent(Ctxt, 5)),$)],
+    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
+    [Txt,format_args(As, Ctxt1),
+     format_ret(Rs, Ctxt1)
+    ];
+format_1(#k_test{op=Op,args=As}, Ctxt) ->
+    Txt = ["test (",format(Op, ctxt_bump_indent(Ctxt, 6)),$)],
+    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
+    [Txt,format_args(As, Ctxt1)];
+format_1(#k_put{arg=A,ret=Rs}, Ctxt) ->
+    [format(A, Ctxt),
+     format_ret(Rs, ctxt_bump_indent(Ctxt, 1))
+    ];
+format_1(#k_try{arg=A,vars=Vs,body=B,evars=Evs,handler=H,ret=Rs}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["try",
+     nl_indent(Ctxt1),
+     format(A, Ctxt1),
+     nl_indent(Ctxt),
+     "of ",
+     format_hseq(Vs, ", ", ctxt_bump_indent(Ctxt, 3), fun format/2),
+     nl_indent(Ctxt1),
+     format(B, Ctxt1),
+     nl_indent(Ctxt),
+     "catch ",
+     format_hseq(Evs, ", ", ctxt_bump_indent(Ctxt, 6), fun format/2),
+     nl_indent(Ctxt1),
+     format(H, Ctxt1),
+     nl_indent(Ctxt),
+     "end",
+     format_ret(Rs, Ctxt1)
+    ];
+format_1(#k_catch{body=B,ret=Rs}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["catch",
+     nl_indent(Ctxt1),
+     format(B, Ctxt1),
+     nl_indent(Ctxt),
+     "end",
+     format_ret(Rs, Ctxt1)
+    ];
+format_1(#k_receive{var=V,body=B,timeout=T,action=A,ret=Rs}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.item_indent),
+    ["receive ",
+     format(V, Ctxt),
+     nl_indent(Ctxt1),
+     format(B, Ctxt1),
+     nl_indent(Ctxt),
+     "after ",
+     format(T, ctxt_bump_indent(Ctxt, 6)),
+     " ->",
+     nl_indent(Ctxt1),
+     format(A, Ctxt1),
+     nl_indent(Ctxt),
+     "end",
+     format_ret(Rs, Ctxt1)
+    ];
+format_1(#k_receive_accept{}, _Ctxt) -> "receive_accept";
+format_1(#k_receive_next{}, _Ctxt) -> "receive_next";
+format_1(#k_break{args=As}, Ctxt) ->
+    ["<",
+     format_hseq(As, ",", ctxt_bump_indent(Ctxt, 1), fun format/2),
+     ">"
+    ];
+format_1(#k_return{args=As}, Ctxt) ->
+    ["<<",
+     format_hseq(As, ",", ctxt_bump_indent(Ctxt, 1), fun format/2),
+     ">>"
+    ];
+format_1(#k_fdef{func=F,arity=A,vars=Vs,body=B}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["fdef ",
+     format_fa_pair({F,A}, ctxt_bump_indent(Ctxt, 5)),
+     format_args(Vs, ctxt_bump_indent(Ctxt, 14)),
+     " =",
+     nl_indent(Ctxt1),
+     format(B, Ctxt1)
+    ];
+format_1(#k_mdef{name=N,exports=Es,attributes=As,body=B}, Ctxt) ->
+    ["module ",
+     format(#k_atom{val=N}, ctxt_bump_indent(Ctxt, 7)),
+     nl_indent(Ctxt),
+     "export [",
+     format_vseq(Es,
+		 "", ",",
+		 ctxt_bump_indent(Ctxt, 8),
+		 fun format_fa_pair/2),
+     "]",
+     nl_indent(Ctxt),
+     "attributes [",
+     format_vseq(As,
+		 "", ",",
+		 ctxt_bump_indent(Ctxt, 12),
+		 fun format_attribute/2),
+     "]",
+     nl_indent(Ctxt),
+     format_vseq(B,
+		 "", "",
+		 Ctxt,
+		 fun format/2),
+     nl_indent(Ctxt)
+     | "end"
+    ];
+%% Internal sys_kernel structures.
+format_1(#iset{vars=Vs,arg=A,body=B}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["set <",
+     format_hseq(Vs, ", ", ctxt_bump_indent(Ctxt, 5), fun format/2),
+     "> =",
+     nl_indent(Ctxt1),
+     format(A, Ctxt1),
+     nl_indent(Ctxt),
+     "in  "
+     | format(B, ctxt_bump_indent(Ctxt, 2))
+    ];
+format_1(#ifun{vars=Vs,body=B}, Ctxt) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
+    ["fun ",
+     format_args(Vs, ctxt_bump_indent(Ctxt, 4)),
+     " ->",
+     nl_indent(Ctxt1)
+     | format(B, Ctxt1)
+    ];
+format_1(Type, _Ctxt) ->
+    ["** Unsupported type: ",
+     io_lib:write(Type)
+     | " **"
+    ].
+
+%% format_ret([RetVar], Context) -> Txt.
+%%  Format the return vars of kexpr.
+
+format_ret(Rs, Ctxt) ->
+    [" >> ",
+     "<",
+     format_hseq(Rs, ",", ctxt_bump_indent(Ctxt, 5), fun format/2),
+     ">"].
+
+%% format_args([Arg], Context) -> Txt.
+%%  Format arguments.
+
+format_args(As, Ctxt) ->
+  [$(,format_hseq(As, ", ", ctxt_bump_indent(Ctxt, 1), fun format/2),$)].
+
+%% format_hseq([Thing], Separator, Context, Fun) -> Txt.
+%%  Format a sequence horizontally.
+
+format_hseq([H], _Sep, Ctxt, Fun) ->
+    Fun(H, Ctxt);
+format_hseq([H|T], Sep, Ctxt, Fun) ->
+    Txt = [Fun(H, Ctxt)|Sep],
+    Ctxt1 = ctxt_bump_indent(Ctxt, width(Txt, Ctxt)),
+    [Txt|format_hseq(T, Sep, Ctxt1, Fun)];
+format_hseq([], _, _, _) -> "".
+
+%% format_vseq([Thing], LinePrefix, LineSuffix, Context, Fun) -> Txt.
+%%  Format a sequence vertically.
+
+format_vseq([H], _Pre, _Suf, Ctxt, Fun) ->
+    Fun(H, Ctxt);
+format_vseq([H|T], Pre, Suf, Ctxt, Fun) ->
+    [Fun(H, Ctxt),Suf,nl_indent(Ctxt),Pre|
+     format_vseq(T, Pre, Suf, Ctxt, Fun)];
+format_vseq([], _, _, _, _) -> "".
+
+format_fa_pair({F,A}, _Ctxt) -> [core_atom(F),$/,integer_to_list(A)].
+
+%% format_attribute({Name,Val}, Context) -> Txt.
+
+format_attribute({Name,Val}, Ctxt) when list(Val) ->
+    Txt = format(#k_atom{val=Name}, Ctxt),
+    Ctxt1 = ctxt_bump_indent(Ctxt, width(Txt,Ctxt)+4),
+    [Txt," = ",
+     $[,format_vseq(Val, "", ",", Ctxt1,
+		    fun (A, _C) -> io_lib:write(A) end),$]
+    ];
+format_attribute({Name,Val}, Ctxt) ->
+    Txt = format(#k_atom{val=Name}, Ctxt),
+    [Txt," = ",io_lib:write(Val)].
+
+format_list_tail(#k_nil{anno=[]}, _Ctxt) -> "]";
+format_list_tail(#k_cons{anno=[],hd=H,tl=T}, Ctxt) ->
+    Txt = [$,|format(H, Ctxt)],
+    Ctxt1 = ctxt_bump_indent(Ctxt, width(Txt, Ctxt)),
+    [Txt|format_list_tail(T, Ctxt1)];
+format_list_tail(Tail, Ctxt) ->
+    ["|",format(Tail, ctxt_bump_indent(Ctxt, 1)), "]"].
+
+format_bin_seg(#k_bin_end{anno=[]}, _Ctxt) -> "";
+format_bin_seg(#k_bin_seg{anno=[],next=N}=Seg, Ctxt) ->
+    Txt = [$,|format_bin_seg_1(Seg, Ctxt)],
+    [Txt|format_bin_seg(N, ctxt_bump_indent(Ctxt, width(Txt, Ctxt)))];
+format_bin_seg(Seg, Ctxt) ->
+    ["|",format(Seg, ctxt_bump_indent(Ctxt, 2))].
+
+format_bin_seg_1(#k_bin_seg{size=S,unit=U,type=T,flags=Fs,seg=Seg}, Ctxt) ->
+    [format(Seg, Ctxt),
+     ":",format(S, Ctxt),"*",io_lib:write(U),
+     ":",io_lib:write(T),
+     lists:map(fun (F) -> [$-,io_lib:write(F)] end, Fs)
+    ].
+
+% format_bin_elements(#k_binary_cons{hd=H,tl=T,size=S,info=I}, Ctxt) ->
+%     A = canno(T),
+%     Fe = fun (Eh, Es, Ei, Ct) ->
+% 		 [format(Eh, Ct),":",format(Es, Ct),"/",io_lib:write(Ei)]
+% 	 end,
+%     case T of
+% 	#k_zero_binary{} when A == [] ->
+% 	    Fe(H, S, I, Ctxt);
+% 	#k_binary_cons{} when A == [] ->
+% 	    Txt = [Fe(H, S, I, Ctxt)|","],
+% 	    Ctxt1 = ctxt_bump_indent(Ctxt, width(Txt, Ctxt)),
+% 	    [Txt|format_bin_elements(T, Ctxt1)];
+% 	_ ->
+% 	    Txt = [Fe(H, S, I, Ctxt)|"|"],
+% 	    [Txt|format(T, ctxt_bump_indent(Ctxt, width(Txt, Ctxt)))]
+%     end.
+
+indent(Ctxt) -> indent(Ctxt#ctxt.indent, Ctxt).
+
+indent(N, _Ctxt) when N =< 0 -> "";
+indent(N, Ctxt) ->
+    T = Ctxt#ctxt.tab_width,
+    string:chars($\t, N div T, string:chars($\s, N rem T)).
+
+nl_indent(Ctxt) -> [$\n|indent(Ctxt)].
+
+
+unindent(T, Ctxt) ->
+    unindent(T, Ctxt#ctxt.indent, Ctxt, []).
+
+unindent(T, N, _Ctxt, C) when N =< 0 ->
+    [T|C];
+unindent([$\s|T], N, Ctxt, C) ->
+    unindent(T, N - 1, Ctxt, C);
+unindent([$\t|T], N, Ctxt, C) ->
+    Tab = Ctxt#ctxt.tab_width,
+    if N >= Tab ->
+	    unindent(T, N - Tab, Ctxt, C);
+       true ->
+	    unindent([string:chars($\s, Tab - N)|T], 0, Ctxt, C)
+    end;
+unindent([L|T], N, Ctxt, C) when list(L) ->
+    unindent(L, N, Ctxt, [T|C]);
+unindent([H|T], _N, _Ctxt, C) ->
+    [H|[T|C]];
+unindent([], N, Ctxt, [H|T]) ->
+    unindent(H, N, Ctxt, T);
+unindent([], _, _, []) -> [].
+
+
+width(Txt, Ctxt) ->
+    width(Txt, 0, Ctxt, []).
+
+width([$\t|T], A, Ctxt, C) ->
+    width(T, A + Ctxt#ctxt.tab_width, Ctxt, C);
+width([$\n|T], _A, Ctxt, C) ->
+    width(unindent([T|C], Ctxt), Ctxt);
+width([H|T], A, Ctxt, C) when list(H) ->
+    width(H, A, Ctxt, [T|C]);
+width([_|T], A, Ctxt, C) ->
+    width(T, A + 1, Ctxt, C);
+width([], A, Ctxt, [H|T]) ->
+    width(H, A, Ctxt, T);
+width([], A, _, []) -> A.
+
+ctxt_bump_indent(Ctxt, Dx) ->
+    Ctxt#ctxt{indent=Ctxt#ctxt.indent + Dx}.
+
+core_atom(A) -> io_lib:write_string(atom_to_list(A), $').
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_life.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_life.erl
new file mode 100644
index 0000000000..9579b5f46a
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_life.erl
@@ -0,0 +1,448 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: v3_life.erl,v 1.2 2010/03/04 13:54:20 maria Exp $
+%%
+%% Purpose : Convert annotated kernel expressions to annotated beam format.
+
+%% This module creates beam format annotated with variable lifetime
+%% information.  Each thing is given an index and for each variable we
+%% store the first and last index for its occurrence.  The variable
+%% database, VDB, attached to each thing is only relevant internally
+%% for that thing.
+%%
+%% For nested things like matches the numbering continues locally and
+%% the VDB for that thing refers to the variable usage within that
+%% thing.  Variables which live through a such a thing are internally
+%% given a very large last index.  Internally the indexes continue
+%% after the index of that thing.  This creates no problems as the
+%% internal variable info never escapes and externally we only see
+%% variable which are alive both before or after.
+%%
+%% This means that variables never "escape" from a thing and the only
+%% way to get values from a thing is to "return" them, with 'break' or
+%% 'return'.  Externally these values become the return values of the
+%% thing.  This is no real limitation as most nested things have
+%% multiple threads so working out a common best variable usage is
+%% difficult.
+
+-module(v3_life).
+
+-export([module/2]).
+
+-export([vdb_find/2]).
+
+-import(lists, [map/2,foldl/3]).
+-import(ordsets, [add_element/2,intersection/2,union/2,union/1]).
+
+-include("v3_kernel.hrl").
+-include("v3_life.hrl").
+
+%% These are not defined in v3_kernel.hrl.
+get_kanno(Kthing) -> element(2, Kthing).
+%%set_kanno(Kthing, Anno) -> setelement(2, Kthing, Anno).
+
+module(#k_mdef{name=M,exports=Es,attributes=As,body=Fs0}, Opts) ->
+    put(?MODULE, Opts),
+    Fs1 = map(fun function/1, Fs0),
+    erase(?MODULE),
+    {ok,{M,Es,As,Fs1}}.
+
+%% function(Kfunc) -> Func.
+
+function(#k_fdef{func=F,arity=Ar,vars=Vs,body=Kb}) ->
+    %%ok = io:fwrite("life ~w: ~p~n", [?LINE,{F,Ar}]),
+    As = var_list(Vs),
+    Vdb0 = foldl(fun ({var,N}, Vdb) -> new_var(N, 0, Vdb) end, [], As),
+    %% Force a top-level match!
+    B0 = case Kb of
+	     #k_match{} -> Kb;
+	     _ ->
+		 Ka = get_kanno(Kb),
+		 #k_match{anno=#k{us=Ka#k.us,ns=[],a=Ka#k.a},
+			  vars=Vs,body=Kb,ret=[]}
+	 end,
+    {B1,_,Vdb1} = body(B0, 1, Vdb0),
+    {function,F,Ar,As,B1,Vdb1}.
+
+%% body(Kbody, I, Vdb) -> {[Expr],MaxI,Vdb}.
+%%  Handle a body, need special cases for transforming match_fails.
+%%  We KNOW that they only occur last in a body.
+
+body(#k_seq{arg=#k_put{anno=Pa,arg=Arg,ret=[R]},
+	    body=#k_enter{anno=Ea,op=#k_internal{name=match_fail,arity=1},
+			  args=[R]}},
+      I, Vdb0) ->
+    Vdb1 = use_vars(Pa#k.us, I, Vdb0),		%All used here
+    {[match_fail(Arg, I, Pa#k.a ++ Ea#k.a)],I,Vdb1};
+body(#k_enter{anno=Ea,op=#k_internal{name=match_fail,arity=1},args=[Arg]},
+      I, Vdb0) ->
+    Vdb1 = use_vars(Ea#k.us, I, Vdb0),
+    {[match_fail(Arg, I, Ea#k.a)],I,Vdb1};
+body(#k_seq{arg=Ke,body=Kb}, I, Vdb0) ->
+    %%ok = io:fwrite("life ~w:~p~n", [?LINE,{Ke,I,Vdb0}]),
+    A = get_kanno(Ke),
+    Vdb1 = use_vars(A#k.us, I, new_vars(A#k.ns, I, Vdb0)),
+    {Es,MaxI,Vdb2} = body(Kb, I+1, Vdb1),
+    E = expr(Ke, I, Vdb2),
+    {[E|Es],MaxI,Vdb2};
+body(Ke, I, Vdb0) ->
+    %%ok = io:fwrite("life ~w:~p~n", [?LINE,{Ke,I,Vdb0}]),
+    A = get_kanno(Ke),
+    Vdb1 = use_vars(A#k.us, I, new_vars(A#k.ns, I, Vdb0)),
+    E = expr(Ke, I, Vdb1),
+    {[E],I,Vdb1}.
+
+%% guard(Kguard, I, Vdb) -> Guard.
+
+guard(#k_try{anno=A,arg=Ts,vars=[#k_var{name=X}],body=#k_var{name=X},
+	     handler=#k_atom{val=false},ret=Rs}, I, Vdb) ->
+    %% Lock variables that are alive before try and used afterwards.
+    %% Don't lock variables that are only used inside the try expression.
+    Pdb0 = vdb_sub(I, I+1, Vdb),
+    {T,MaxI,Pdb1} = guard_body(Ts, I+1, Pdb0),
+    Pdb2 = use_vars(A#k.ns, MaxI+1, Pdb1),	%Save "return" values
+    #l{ke={protected,T,var_list(Rs)},i=I,a=A#k.a,vdb=Pdb2};
+guard(#k_seq{}=G, I, Vdb0) ->
+    {Es,_,Vdb1} = guard_body(G, I, Vdb0),
+    #l{ke={block,Es},i=I,vdb=Vdb1,a=[]};
+guard(G, I, Vdb) -> guard_expr(G, I, Vdb).
+
+%% guard_body(Kbody, I, Vdb) -> {[Expr],MaxI,Vdb}.
+
+guard_body(#k_seq{arg=Ke,body=Kb}, I, Vdb0) ->
+    A = get_kanno(Ke),
+    Vdb1 = use_vars(A#k.us, I, new_vars(A#k.ns, I, Vdb0)),
+    {Es,MaxI,Vdb2} = guard_body(Kb, I+1, Vdb1),
+    E = guard_expr(Ke, I, Vdb2),
+    {[E|Es],MaxI,Vdb2};
+guard_body(Ke, I, Vdb0) ->
+    A = get_kanno(Ke),
+    Vdb1 = use_vars(A#k.us, I, new_vars(A#k.ns, I, Vdb0)),
+    E = guard_expr(Ke, I, Vdb1),
+    {[E],I,Vdb1}.
+
+%% guard_expr(Call, I, Vdb) -> Expr
+
+guard_expr(#k_test{anno=A,op=Op,args=As}, I, _Vdb) ->
+    #l{ke={test,test_op(Op),atomic_list(As)},i=I,a=A#k.a};
+guard_expr(#k_bif{anno=A,op=Op,args=As,ret=Rs}, I, _Vdb) ->
+    #l{ke={bif,bif_op(Op),atomic_list(As),var_list(Rs)},i=I,a=A#k.a};
+guard_expr(#k_put{anno=A,arg=Arg,ret=Rs}, I, _Vdb) ->
+    #l{ke={set,var_list(Rs),literal(Arg)},i=I,a=A#k.a};
+guard_expr(#k_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
+    %% Experimental support for andalso/orelse in guards.
+    %% Work out imported variables which need to be locked.
+    Mdb = vdb_sub(I, I+1, Vdb),
+    M = match(Kb, A#k.us, I+1, Mdb),
+    #l{ke={match,M,var_list(Rs)},i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a};
+guard_expr(G, I, Vdb) -> guard(G, I, Vdb).
+
+%% expr(Kexpr, I, Vdb) -> Expr.
+
+expr(#k_call{anno=A,op=Op,args=As,ret=Rs}, I, _Vdb) ->
+    #l{ke={call,call_op(Op),atomic_list(As),var_list(Rs)},i=I,a=A#k.a};
+expr(#k_enter{anno=A,op=Op,args=As}, I, _Vdb) ->
+    #l{ke={enter,call_op(Op),atomic_list(As)},i=I,a=A#k.a};
+expr(#k_bif{anno=A,op=Op,args=As,ret=Rs}, I, _Vdb) ->
+    Bif = k_bif(A, Op, As, Rs),
+    #l{ke=Bif,i=I,a=A#k.a};
+expr(#k_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
+    %% Work out imported variables which need to be locked.
+    Mdb = vdb_sub(I, I+1, Vdb),
+    M = match(Kb, A#k.us, I+1, Mdb),
+    #l{ke={match,M,var_list(Rs)},i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a};
+expr(#k_try{anno=A,arg=Ka,vars=Vs,body=Kb,evars=Evs,handler=Kh,ret=Rs}, I, Vdb) ->
+    %% Lock variables that are alive before the catch and used afterwards.
+    %% Don't lock variables that are only used inside the try.
+    Tdb0 = vdb_sub(I, I+1, Vdb),
+    %% This is the tricky bit. Lock variables in Arg that are used in
+    %% the body and handler. Add try tag 'variable'.
+    Ab = get_kanno(Kb),
+    Ah = get_kanno(Kh),
+    Tdb1 = use_vars(Ab#k.us, I+3, use_vars(Ah#k.us, I+3, Tdb0)),
+    Tdb2 = vdb_sub(I, I+2, Tdb1),
+    Vnames = fun (Kvar) -> Kvar#k_var.name end,	%Get the variable names
+    {Aes,_,Adb} = body(Ka, I+2, add_var({catch_tag,I+1}, I+1, 1000000, Tdb2)),
+    {Bes,_,Bdb} = body(Kb, I+4, new_vars(map(Vnames, Vs), I+3, Tdb2)),
+    {Hes,_,Hdb} = body(Kh, I+4, new_vars(map(Vnames, Evs), I+3, Tdb2)),
+    #l{ke={'try',#l{ke={block,Aes},i=I+1,vdb=Adb,a=[]},
+	   var_list(Vs),#l{ke={block,Bes},i=I+3,vdb=Bdb,a=[]},
+	   var_list(Evs),#l{ke={block,Hes},i=I+3,vdb=Hdb,a=[]},
+	   var_list(Rs)},
+       i=I,vdb=Tdb1,a=A#k.a};
+expr(#k_catch{anno=A,body=Kb,ret=[R]}, I, Vdb) ->
+    %% Lock variables that are alive before the catch and used afterwards.
+    %% Don't lock variables that are only used inside the catch.
+    %% Add catch tag 'variable'.
+    Cdb0 = vdb_sub(I, I+1, Vdb),
+    {Es,_,Cdb1} = body(Kb, I+1, add_var({catch_tag,I}, I, 1000000, Cdb0)),
+    #l{ke={'catch',Es,variable(R)},i=I,vdb=Cdb1,a=A#k.a};
+expr(#k_receive{anno=A,var=V,body=Kb,timeout=T,action=Ka,ret=Rs}, I, Vdb) ->
+    %% Work out imported variables which need to be locked.
+    Rdb = vdb_sub(I, I+1, Vdb),
+    M = match(Kb, add_element(V#k_var.name, A#k.us), I+1,
+	      new_var(V#k_var.name, I, Rdb)),
+    {Tes,_,Adb} = body(Ka, I+1, Rdb),
+    #l{ke={receive_loop,atomic_lit(T),variable(V),M,
+	   #l{ke=Tes,i=I+1,vdb=Adb,a=[]},var_list(Rs)},
+       i=I,vdb=use_vars(A#k.us, I+1, Vdb),a=A#k.a};
+expr(#k_receive_accept{anno=A}, I, _Vdb) ->
+    #l{ke=receive_accept,i=I,a=A#k.a};
+expr(#k_receive_next{anno=A}, I, _Vdb) ->
+    #l{ke=receive_next,i=I,a=A#k.a};
+expr(#k_put{anno=A,arg=Arg,ret=Rs}, I, _Vdb) ->
+    #l{ke={set,var_list(Rs),literal(Arg)},i=I,a=A#k.a};
+expr(#k_break{anno=A,args=As}, I, _Vdb) ->
+    #l{ke={break,atomic_list(As)},i=I,a=A#k.a};
+expr(#k_return{anno=A,args=As}, I, _Vdb) ->
+    #l{ke={return,atomic_list(As)},i=I,a=A#k.a}.
+
+%% call_op(Op) -> Op.
+%% bif_op(Op) -> Op.
+%% test_op(Op) -> Op.
+%%  Do any necessary name translations here to munge into beam format.
+
+call_op(#k_local{name=N}) -> N;
+call_op(#k_remote{mod=M,name=N}) -> {remote,atomic_lit(M),atomic_lit(N)};
+call_op(Other) -> variable(Other).
+
+bif_op(#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=N}}) -> N;
+bif_op(#k_internal{name=N}) -> N.
+
+test_op(#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=N}}) -> N.
+
+%% k_bif(Anno, Op, [Arg], [Ret]) -> Expr.
+%%  Build bifs, do special handling of internal some calls.
+
+k_bif(_A, #k_internal{name=dsetelement,arity=3}, As, []) ->
+    {bif,dsetelement,atomic_list(As),[]};
+k_bif(_A, #k_internal{name=make_fun},
+      [#k_atom{val=Fun},#k_int{val=Arity},
+       #k_int{val=Index},#k_int{val=Uniq}|Free],
+      Rs) ->
+    {bif,{make_fun,Fun,Arity,Index,Uniq},var_list(Free),var_list(Rs)};
+k_bif(_A, Op, As, Rs) ->
+    %% The general case.
+    {bif,bif_op(Op),atomic_list(As),var_list(Rs)}.
+
+%% match(Kexpr, [LockVar], I, Vdb) -> Expr.
+%%  Convert match tree to old format.
+
+match(#k_alt{anno=A,first=Kf,then=Kt}, Ls, I, Vdb0) ->
+    Vdb1 = use_vars(union(A#k.us, Ls), I, Vdb0),
+    F = match(Kf, Ls, I+1, Vdb1),
+    T = match(Kt, Ls, I+1, Vdb1),
+    #l{ke={alt,F,T},i=I,vdb=Vdb1,a=A#k.a};
+match(#k_select{anno=A,var=V,types=Kts}, Ls0, I, Vdb0) ->
+    Ls1 = add_element(V#k_var.name, Ls0),
+    Vdb1 = use_vars(union(A#k.us, Ls1), I, Vdb0),
+    Ts = map(fun (Tc) -> type_clause(Tc, Ls1, I+1, Vdb1) end, Kts),
+    #l{ke={select,literal(V),Ts},i=I,vdb=Vdb1,a=A#k.a};
+match(#k_guard{anno=A,clauses=Kcs}, Ls, I, Vdb0) ->
+    Vdb1 = use_vars(union(A#k.us, Ls), I, Vdb0),
+    Cs = map(fun (G) -> guard_clause(G, Ls, I+1, Vdb1) end, Kcs),
+    #l{ke={guard,Cs},i=I,vdb=Vdb1,a=A#k.a};
+match(Other, Ls, I, Vdb0) ->
+    Vdb1 = use_vars(Ls, I, Vdb0),
+    {B,_,Vdb2} = body(Other, I+1, Vdb1),
+    #l{ke={block,B},i=I,vdb=Vdb2,a=[]}.
+
+type_clause(#k_type_clause{anno=A,type=T,values=Kvs}, Ls, I, Vdb0) ->
+    %%ok = io:format("life ~w: ~p~n", [?LINE,{T,Kvs}]),
+    Vdb1 = use_vars(union(A#k.us, Ls), I+1, Vdb0),
+    Vs = map(fun (Vc) -> val_clause(Vc, Ls, I+1, Vdb1) end, Kvs),
+    #l{ke={type_clause,type(T),Vs},i=I,vdb=Vdb1,a=A#k.a}.
+
+val_clause(#k_val_clause{anno=A,val=V,body=Kb}, Ls0, I, Vdb0) ->
+    {_Used,New} = match_pat_vars(V),
+    %% Not clear yet how Used should be used.
+    Bus = (get_kanno(Kb))#k.us,
+    %%ok = io:format("Ls0 = ~p, Used=~p\n  New=~p, Bus=~p\n", [Ls0,Used,New,Bus]),
+    Ls1 = union(intersection(New, Bus), Ls0),	%Lock for safety
+    Vdb1 = use_vars(union(A#k.us, Ls1), I+1, new_vars(New, I, Vdb0)),
+    B = match(Kb, Ls1, I+1, Vdb1),
+    #l{ke={val_clause,literal(V),B},i=I,vdb=use_vars(Bus, I+1, Vdb1),a=A#k.a}.
+
+guard_clause(#k_guard_clause{anno=A,guard=Kg,body=Kb}, Ls, I, Vdb0) ->
+    Vdb1 = use_vars(union(A#k.us, Ls), I+2, Vdb0),
+    Gdb = vdb_sub(I+1, I+2, Vdb1),
+    G = guard(Kg, I+1, Gdb),
+    B = match(Kb, Ls, I+2, Vdb1),
+    #l{ke={guard_clause,G,B},
+       i=I,vdb=use_vars((get_kanno(Kg))#k.us, I+2, Vdb1),
+       a=A#k.a}.
+
+%% match_fail(FailValue, I, Anno) -> Expr.
+%%  Generate the correct match_fail instruction.  N.B. there is no
+%%  generic case for when the fail value has been created elsewhere.
+
+match_fail(#k_tuple{es=[#k_atom{val=function_clause}|As]}, I, A) ->
+    #l{ke={match_fail,{function_clause,literal_list(As)}},i=I,a=A};
+match_fail(#k_tuple{es=[#k_atom{val=badmatch},Val]}, I, A) ->
+    #l{ke={match_fail,{badmatch,literal(Val)}},i=I,a=A};
+match_fail(#k_tuple{es=[#k_atom{val=case_clause},Val]}, I, A) ->
+    #l{ke={match_fail,{case_clause,literal(Val)}},i=I,a=A};
+match_fail(#k_atom{val=if_clause}, I, A) ->
+    #l{ke={match_fail,if_clause},i=I,a=A};
+match_fail(#k_tuple{es=[#k_atom{val=try_clause},Val]}, I, A) ->
+    #l{ke={match_fail,{try_clause,literal(Val)}},i=I,a=A}.
+
+%% type(Ktype) -> Type.
+
+type(k_int) -> integer;
+type(k_char) -> integer;			%Hhhmmm???
+type(k_float) -> float;
+type(k_atom) -> atom;
+type(k_nil) -> nil;
+type(k_cons) -> cons;
+type(k_tuple) -> tuple;
+type(k_binary) -> binary;
+type(k_bin_seg) -> bin_seg;
+type(k_bin_end) -> bin_end.
+
+%% variable(Klit) -> Lit.
+%% var_list([Klit]) -> [Lit].
+
+variable(#k_var{name=N}) -> {var,N}.
+
+var_list(Ks) -> map(fun variable/1, Ks).
+
+%% atomic_lit(Klit) -> Lit.
+%% atomic_list([Klit]) -> [Lit].
+
+atomic_lit(#k_var{name=N}) -> {var,N};
+atomic_lit(#k_int{val=I}) -> {integer,I};
+atomic_lit(#k_float{val=F}) -> {float,F};
+atomic_lit(#k_atom{val=N}) -> {atom,N};
+%%atomic_lit(#k_char{val=C}) -> {char,C};
+%%atomic_lit(#k_string{val=S}) -> {string,S};
+atomic_lit(#k_nil{}) -> nil.
+
+atomic_list(Ks) -> map(fun atomic_lit/1, Ks).
+
+%% literal(Klit) -> Lit.
+%% literal_list([Klit]) -> [Lit].
+
+literal(#k_var{name=N}) -> {var,N};
+literal(#k_int{val=I}) -> {integer,I};
+literal(#k_float{val=F}) -> {float,F};
+literal(#k_atom{val=N}) -> {atom,N};
+%%literal(#k_char{val=C}) -> {char,C};
+literal(#k_string{val=S}) -> {string,S};
+literal(#k_nil{}) -> nil;
+literal(#k_cons{hd=H,tl=T}) ->
+    {cons,[literal(H),literal(T)]};
+literal(#k_binary{segs=V}) ->
+    case proplists:get_bool(no_new_binaries, get(?MODULE)) of
+	true ->
+	    {old_binary,literal(V)};
+	false ->
+	    {binary,literal(V)}
+    end;
+literal(#k_bin_seg{size=S,unit=U,type=T,flags=Fs,seg=Seg,next=N}) ->
+    {bin_seg,literal(S),U,T,Fs,[literal(Seg),literal(N)]};
+literal(#k_bin_end{}) -> bin_end;
+literal(#k_tuple{es=Es}) ->
+    {tuple,literal_list(Es)}.
+
+literal_list(Ks) -> map(fun literal/1, Ks).
+
+%% match_pat_vars(Pattern) -> {[UsedVarName],[NewVarName]}.
+
+match_pat_vars(#k_var{name=N}) -> {[],[N]};
+match_pat_vars(#k_int{}) -> {[],[]};
+match_pat_vars(#k_float{}) -> {[],[]};
+match_pat_vars(#k_atom{}) -> {[],[]};
+%%match_pat_vars(#k_char{}) -> {[],[]};
+match_pat_vars(#k_string{}) -> {[],[]};
+match_pat_vars(#k_nil{}) -> {[],[]};
+match_pat_vars(#k_cons{hd=H,tl=T}) ->
+    match_pat_list_vars([H,T]);
+match_pat_vars(#k_binary{segs=V}) ->
+    match_pat_vars(V);
+match_pat_vars(#k_bin_seg{size=S,seg=Seg,next=N}) ->
+    {U1,New1} = match_pat_vars(Seg),
+    {U2,New2} = match_pat_vars(N),
+    {[],U3} = match_pat_vars(S),
+    {union([U1,U2,U3]),union(New1, New2)};
+match_pat_vars(#k_bin_end{}) -> {[],[]};
+match_pat_vars(#k_tuple{es=Es}) ->
+    match_pat_list_vars(Es).
+
+match_pat_list_vars(Ps) ->
+    foldl(fun (P, {Used0,New0}) ->
+		  {Used,New} = match_pat_vars(P),
+		  {union(Used0, Used),union(New0, New)} end,
+	  {[],[]}, Ps).
+
+%% new_var(VarName, I, Vdb) -> Vdb.
+%% new_vars([VarName], I, Vdb) -> Vdb.
+%% use_var(VarName, I, Vdb) -> Vdb.
+%% use_vars([VarName], I, Vdb) -> Vdb.
+%% add_var(VarName, F, L, Vdb) -> Vdb.
+
+new_var(V, I, Vdb) ->
+    case vdb_find(V, Vdb) of
+	{V,F,L} when I < F -> vdb_store(V, I, L, Vdb);
+	{V,_,_} -> Vdb;
+	error -> vdb_store(V, I, I, Vdb)
+    end.
+
+new_vars(Vs, I, Vdb0) ->
+    foldl(fun (V, Vdb) -> new_var(V, I, Vdb) end, Vdb0, Vs).
+
+use_var(V, I, Vdb) ->
+    case vdb_find(V, Vdb) of
+	{V,F,L} when I > L -> vdb_store(V, F, I, Vdb);
+	{V,_,_} -> Vdb;
+	error -> vdb_store(V, I, I, Vdb)
+    end.
+
+use_vars(Vs, I, Vdb0) ->
+    foldl(fun (V, Vdb) -> use_var(V, I, Vdb) end, Vdb0, Vs).
+
+add_var(V, F, L, Vdb) ->
+    use_var(V, L, new_var(V, F, Vdb)).
+
+vdb_find(V, Vdb) ->
+    %% Peformance note: Profiling shows that this function accounts for
+    %% a lot of the execution time when huge constants terms are built.
+    %% Using the BIF lists:keysearch/3 is a lot faster than the
+    %% original Erlang version.
+    case lists:keysearch(V, 1, Vdb) of
+	{value,Vd} -> Vd;
+	false -> error
+    end.
+
+%vdb_find(V, [{V1,F,L}=Vd|Vdb]) when V < V1 -> error;
+%vdb_find(V, [{V1,F,L}=Vd|Vdb]) when V == V1 -> Vd;
+%vdb_find(V, [{V1,F,L}=Vd|Vdb]) when V > V1 -> vdb_find(V, Vdb);
+%vdb_find(V, []) -> error.
+
+vdb_store(V, F, L, [{V1,_,_}=Vd|Vdb]) when V > V1 ->
+    [Vd|vdb_store(V, F, L, Vdb)];
+vdb_store(V, F, L, [{V1,_,_}=Vd|Vdb]) when V < V1 -> [{V,F,L},Vd|Vdb];
+vdb_store(V, F, L, [{_V1,_,_}|Vdb]) -> [{V,F,L}|Vdb]; %V == V1
+vdb_store(V, F, L, []) -> [{V,F,L}].
+
+%% vdb_sub(Min, Max, Vdb) -> Vdb.
+%%  Extract variables which are used before and after Min.  Lock
+%%  variables alive after Max.
+
+vdb_sub(Min, Max, Vdb) ->
+    [ if L >= Max -> {V,F,1000000};
+	 true -> Vd
+      end || {V,F,L}=Vd <- Vdb, F < Min, L >= Min ].
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_life.hrl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_life.hrl
new file mode 100644
index 0000000000..4d183b7234
--- /dev/null
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_life.hrl
@@ -0,0 +1,24 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: v3_life.hrl,v 1.1 2008/12/17 09:53:43 mikpe Exp $
+%%
+%% This record contains variable life-time annotation for a
+%% kernel expression.  Added by v3_life, used by v3_codegen.
+
+-record(l, {ke,					%Kernel expression
+	    i=0,				%Op number
+	    vdb=[],				%Variable database
+	    a}).				%Core annotation
diff --git a/lib/dialyzer/test/options1_tests_SUITE.erl b/lib/dialyzer/test/options1_tests_SUITE.erl
deleted file mode 100644
index 02cafe6c5f..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE.erl
+++ /dev/null
@@ -1,54 +0,0 @@
-%% ATTENTION!
-%% This is an automatically generated file. Do not edit.
-%% Use './remake' script to refresh it if needed.
-%% All Dialyzer options should be defined in dialyzer_options
-%% file.
-
--module(options1_tests_SUITE).
-
--include("ct.hrl").
--include("dialyzer_test_constants.hrl").
-
--export([suite/0, init_per_suite/0, init_per_suite/1,
-         end_per_suite/1, all/0]).
--export([options1_tests_SUITE_consistency/1, compiler/1]).
-
-suite() ->
-  [{timetrap, {minutes, 30}}].
-
-init_per_suite() ->
-  [{timetrap, ?plt_timeout}].
-init_per_suite(Config) ->
-  OutDir = ?config(priv_dir, Config),
-  case dialyzer_common:check_plt(OutDir) of
-    fail -> {skip, "Plt creation/check failed."};
-    ok -> [{dialyzer_options, [{include_dirs,["my_include"]},
-                               {defines,[{'COMPILER_VSN',42}]},
-                               {warnings,[no_improper_lists]}]}|Config]
-  end.
-
-end_per_suite(_Config) ->
-  ok.
-
-all() ->
-  [options1_tests_SUITE_consistency,compiler].
-
-dialyze(Config, TestCase) ->
-  Opts = ?config(dialyzer_options, Config),
-  Dir = ?config(data_dir, Config),
-  OutDir = ?config(priv_dir, Config),
-  dialyzer_common:check(TestCase, Opts, Dir, OutDir).
-
-options1_tests_SUITE_consistency(Config) ->
-  Dir = ?config(data_dir, Config),
-  case dialyzer_common:new_tests(Dir, all()) of
-    []  -> ok;
-    New -> ct:fail({missing_tests,New})
-  end.
-
-compiler(Config) ->
-  case dialyze(Config, compiler) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/my_include/erl_bits.hrl b/lib/dialyzer/test/options1_tests_SUITE_data/my_include/erl_bits.hrl
deleted file mode 100644
index 96d5cec268..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/my_include/erl_bits.hrl
+++ /dev/null
@@ -1,43 +0,0 @@
-%% ``The contents of this file are subject to the Erlang Public License,
-%% Version 1.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.erlang.org/EPL1_0.txt
-%% 
-%% 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.
-%% 
-%% The Original Code is Erlang-4.7.3, December, 1998.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Telecom
-%% AB. Portions created by Ericsson are Copyright (C), 1998, Ericsson
-%% Telecom AB. All Rights Reserved.
-%% 
-%% Contributor(s): ______________________________________.''
-%%
-%% This is an -*- erlang -*- file.
-%% Generic compiler options, passed from the erl_compile module.
-
--record(bittype, {
-          type,       %% integer/float/binary
-	  unit,       %% element unit
-          sign,       %% signed/unsigned
-          endian      %% big/little
-         }).
-
--record(bitdefault, {
-	  integer,    %% default type for integer
-	  float,      %% default type for float
-	  binary      %% default type for binary
-	 }).
-
-%%% (From config.hrl in the bitsyntax branch.)
--define(SYS_ENDIAN, big).
--define(SIZEOF_CHAR, 1).
--define(SIZEOF_DOUBLE, 8).
--define(SIZEOF_FLOAT, 4).
--define(SIZEOF_INT, 4).
--define(SIZEOF_LONG, 4).
--define(SIZEOF_LONG_LONG, 8).
--define(SIZEOF_SHORT, 2).
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/my_include/erl_compile.hrl b/lib/dialyzer/test/options1_tests_SUITE_data/my_include/erl_compile.hrl
deleted file mode 100644
index ef2b68ac9a..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/my_include/erl_compile.hrl
+++ /dev/null
@@ -1,42 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: erl_compile.hrl,v 1.1 2008/12/17 09:53:40 mikpe Exp $
-%%
-
-%% Generic compiler options, passed from the erl_compile module.
-
--record(options,
-	 {includes=[],				% Include paths (list of absolute
-						% directory names).
-	  outdir=".",				% Directory for result (absolute
-						% path).
-	  output_type=undefined,		% Type of output file (atom).
-	  defines=[],				% Preprocessor defines.  Each
-						% element is an atom (the name to
-						% define), or a {Name, Value}
-						% tuple.
-	  warning=1,				% Warning level (0 - no
-						% warnings, 1 - standard level,
-						% 2, 3, ... - more warnings).
-	  verbose=false,			% Verbose (true/false).
-	  optimize=999,				% Optimize options.
-	  specific=[],				% Compiler specific options.
-	  outfile="",				% Name of output file (internal
-						% use in erl_compile.erl).
-	  cwd					% Current working directory
-						% for erlc.
-	 }).
-
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/results/compiler b/lib/dialyzer/test/options1_tests_SUITE_data/results/compiler
deleted file mode 100644
index 924ef389df..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/results/compiler
+++ /dev/null
@@ -1,35 +0,0 @@
-
-beam_asm.erl:32: The pattern {'error', Error} can never match the type <<_:64,_:_*8>>
-beam_bool.erl:193: The pattern {[], _} can never match the type {[{_,_,_,_},...],[any()]}
-beam_bool.erl:510: The pattern [{'set', [Dst], _, _}, {'%live', _}] can never match the type [{_,_,_,_}]
-beam_disasm.erl:537: The variable X can never match since previous clauses completely covered the type 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7
-beam_type.erl:284: The pattern <'pi', 0> can never match the type <_,1 | 2>
-beam_validator.erl:396: The pattern <{'jump', {'f', _}}, Vst = {'vst', 'none', _}> can never match the type <_,#vst{current::#st{ct::[]}}>
-beam_validator.erl:690: The pattern <'term', OldT> can never match the type <{'tuple',[any(),...]},_>
-beam_validator.erl:692: Clause guard cannot succeed. The pattern <NewT = {Type, New}, OldT = {_, Old}> was matched against the type <{'tuple',[any(),...]},_>
-beam_validator.erl:699: Clause guard cannot succeed. The pattern <NewT = {Type, _}, 'number'> was matched against the type <{'tuple',[any(),...]},_>
-beam_validator.erl:702: The pattern <'number', OldT = {Type, _}> can never match the type <{'tuple',[any(),...]},_>
-beam_validator.erl:705: The pattern <'bool', {'atom', A}> can never match the type <{'tuple',[any(),...]},_>
-beam_validator.erl:707: The pattern <{'atom', A}, 'bool'> can never match the type <{'tuple',[any(),...]},_>
-beam_validator.erl:713: Guard test is_integer(Sz::[any(),...]) can never succeed
-beam_validator.erl:727: Function upgrade_bool/1 will never be called
-cerl_inline.erl:190: The pattern 'true' can never match the type 'false'
-cerl_inline.erl:219: The pattern 'true' can never match the type 'false'
-cerl_inline.erl:230: The pattern 'true' can never match the type 'false'
-cerl_inline.erl:2333: The pattern 'true' can never match the type 'false'
-cerl_inline.erl:2355: The pattern 'true' can never match the type 'false'
-cerl_inline.erl:238: The pattern 'true' can never match the type 'false'
-cerl_inline.erl:2436: Function filename/1 will never be called
-cerl_inline.erl:2700: The pattern 'true' can never match the type 'false'
-cerl_inline.erl:2730: The pattern <{F, L, D}, Vs> can never match the type <[1..255,...],[any()]>
-cerl_inline.erl:2738: The pattern <{F, L, D}, Vs> can never match the type <[1..255,...],[any()]>
-cerl_inline.erl:2750: The pattern <{[], L, D}, Vs> can never match the type <[1..255,...],[any()]>
-cerl_inline.erl:2752: The pattern <{[], _L, D}, Vs> can never match the type <[1..255,...],[any()]>
-cerl_inline.erl:2754: The pattern <{F, L, D}, Vs> can never match the type <[1..255,...],[any()]>
-cerl_inline.erl:2756: The pattern <{F, _L, D}, Vs> can never match the type <[1..255,...],[any()]>
-compile.erl:788: The pattern {'error', Es} can never match the type {'ok',<<_:64,_:_*8>>}
-core_lint.erl:473: The pattern <{'c_atom', _, 'all'}, 'binary', _Def, St> can never match the type <_,#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::{_,_} | {_,_,_} | {_,_,_,_},tl::{_,_} | {_,_,_} | {_,_,_,_}},tl::#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::{_,_} | {_,_,_} | {_,_,_,_},tl::{_,_} | {_,_,_} | {_,_,_,_}}},[any()],_>
-core_lint.erl:505: The pattern <_Req, 'unknown', St> can never match the type <non_neg_integer(),non_neg_integer(),_>
-v3_codegen.erl:1569: The call v3_codegen:load_reg_1(V::any(),I::0,Rs::any(),pos_integer()) will never return since it differs in the 4th argument from the success typing arguments: (any(),0,maybe_improper_list(),0)
-v3_codegen.erl:1571: The call v3_codegen:load_reg_1(V::any(),I::0,[],pos_integer()) will never return since it differs in the 4th argument from the success typing arguments: (any(),0,maybe_improper_list(),0)
-v3_core.erl:646: The pattern <Prim = {'iprimop', _, _, _}, St> can never match the type <#c_nil{anno::[any(),...]} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple' | 'c_var' | 'ibinary' | 'icatch' | 'ireceive1',[any(),...] | {_,_,_,_},_} | #c_cons{anno::[any(),...]} | #c_fname{anno::[any(),...]} | #iletrec{anno::{_,_,_,_},defs::[any(),...],body::[any(),...]} | #icase{anno::{_,_,_,_},args::[any()],clauses::[any()],fc::{_,_,_,_,_,_}} | #ireceive2{anno::{_,_,_,_},clauses::[any()],action::[any()]} | #ifun{anno::{_,_,_,_},id::[any(),...],vars::[any()],clauses::[any(),...],fc::{_,_,_,_,_,_}} | #imatch{anno::{_,_,_,_},guard::[],fc::{_,_,_,_,_,_}} | #itry{anno::{_,_,_,_},args::[any()],vars::[any(),...],body::[any(),...],evars::[any(),...],handler::[any(),...]},_>
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_asm.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_asm.erl
deleted file mode 100644
index c2d9edcaa7..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_asm.erl
+++ /dev/null
@@ -1,358 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: beam_asm.erl,v 1.1 2008/12/17 09:53:40 mikpe Exp $
-%%
-%% Purpose : Assembler for threaded Beam.
-
--module(beam_asm).
-
--export([module/4,format_error/1]).
--export([encode/2]).
-
--import(lists, [map/2,member/2,keymember/3,duplicate/2]).
--include("beam_opcodes.hrl").
-
--define(bs_aligned, 1).
-
-module(Code, Abst, SourceFile, Opts) ->
-    case assemble(Code, Abst, SourceFile, Opts) of
-	{error, Error} ->
-	    {error, [{none, ?MODULE, Error}]};
-	Bin when binary(Bin) ->
-	    {ok, Bin}
-    end.
-
-format_error({crashed, Why}) ->
-    io_lib:format("beam_asm_int: EXIT: ~p", [Why]).
-
-assemble({Mod,Exp,Attr,Asm,NumLabels}, Abst, SourceFile, Opts) ->
-    {1,Dict0} = beam_dict:atom(Mod, beam_dict:new()),
-    NumFuncs = length(Asm),
-    {Code,Dict1} = assemble_1(Asm, Exp, Dict0, []),
-    build_file(Code, Attr, Dict1, NumLabels, NumFuncs, Abst, SourceFile, Opts).
-
-assemble_1([{function,Name,Arity,Entry,Asm}|T], Exp, Dict0, Acc) ->
-    Dict1 = case member({Name,Arity}, Exp) of
-		true ->
-		    beam_dict:export(Name, Arity, Entry, Dict0);
-		false ->
-		    beam_dict:local(Name, Arity, Entry, Dict0)
-	    end,
-    {Code, Dict2} = assemble_function(Asm, Acc, Dict1),
-    assemble_1(T, Exp, Dict2, Code);
-assemble_1([], _Exp, Dict0, Acc) ->
-    {IntCodeEnd,Dict1} = make_op(int_code_end, Dict0),
-    {list_to_binary(lists:reverse(Acc, [IntCodeEnd])),Dict1}.
-
-assemble_function([H|T], Acc, Dict0) ->
-    {Code, Dict} = make_op(H, Dict0),
-    assemble_function(T, [Code| Acc], Dict);
-assemble_function([], Code, Dict) ->
-    {Code, Dict}.
-
-build_file(Code, Attr, Dict, NumLabels, NumFuncs, Abst, SourceFile, Opts) ->
-    %% Create the code chunk.
-
-    CodeChunk = chunk(<<"Code">>,
-		      <<16:32,
-		       (beam_opcodes:format_number()):32,
-		       (beam_dict:highest_opcode(Dict)):32,
-		       NumLabels:32,
-		       NumFuncs:32>>,
-		      Code),
-
-    %% Create the atom table chunk.
-
-    {NumAtoms, AtomTab} = beam_dict:atom_table(Dict),
-    AtomChunk = chunk(<<"Atom">>, <<NumAtoms:32>>, AtomTab),
-
-    %% Create the import table chunk.
-
-    {NumImps, ImpTab0} = beam_dict:import_table(Dict),
-    Imp = flatten_imports(ImpTab0),
-    ImportChunk = chunk(<<"ImpT">>, <<NumImps:32>>, Imp),
-
-    %% Create the export table chunk.
-
-    {NumExps, ExpTab0} = beam_dict:export_table(Dict),
-    Exp = flatten_exports(ExpTab0),
-    ExpChunk = chunk(<<"ExpT">>, <<NumExps:32>>, Exp),
-
-    %% Create the local function table chunk.
-
-    {NumLocals, Locals} = beam_dict:local_table(Dict),
-    Loc = flatten_exports(Locals),
-    LocChunk = chunk(<<"LocT">>, <<NumLocals:32>>, Loc),
-
-    %% Create the string table chunk.
-
-    {_,StringTab} = beam_dict:string_table(Dict),
-    StringChunk = chunk(<<"StrT">>, StringTab),
-
-    %% Create the fun table chunk. It is important not to build an empty chunk,
-    %% as that would change the MD5.
-
-    LambdaChunk = case beam_dict:lambda_table(Dict) of
-		      {0,[]} -> [];
-		      {NumLambdas,LambdaTab} ->
-			  chunk(<<"FunT">>, <<NumLambdas:32>>, LambdaTab)
-		  end,
-
-    %% Create the attributes and compile info chunks.
-
-    Essentials = [AtomChunk,CodeChunk,StringChunk,ImportChunk,ExpChunk,LambdaChunk],
-    {Attributes,Compile} = build_attributes(Opts, SourceFile, Attr, Essentials),
-    AttrChunk = chunk(<<"Attr">>, Attributes),
-    CompileChunk = chunk(<<"CInf">>, Compile),
-
-    %% Create the abstract code chunk.
-
-    AbstChunk = chunk(<<"Abst">>, Abst),
-
-    %% Create IFF chunk.
-
-    Chunks = case member(slim, Opts) of
-		 true -> [Essentials,AttrChunk,CompileChunk,AbstChunk];
-		 false -> [Essentials,LocChunk,AttrChunk,CompileChunk,AbstChunk]
-	     end,
-    build_form(<<"BEAM">>, Chunks).
-
-%% Build an IFF form.
-
-build_form(Id, Chunks0) when size(Id) == 4, list(Chunks0) ->
-    Chunks = list_to_binary(Chunks0),
-    Size = size(Chunks),
-    0 = Size rem 4,				% Assertion: correct padding?
-    <<"FOR1",(Size+4):32,Id/binary,Chunks/binary>>.
-
-%% Build a correctly padded chunk (with no sub-header).
-
-chunk(Id, Contents) when size(Id) == 4, binary(Contents) ->
-    Size = size(Contents),
-    [<<Id/binary,Size:32>>,Contents|pad(Size)];
-chunk(Id, Contents) when list(Contents) ->
-    chunk(Id, list_to_binary(Contents)).
-
-%% Build a correctly padded chunk (with a sub-header).
-
-chunk(Id, Head, Contents) when size(Id) == 4, is_binary(Head), is_binary(Contents) ->
-    Size = size(Head)+size(Contents),
-    [<<Id/binary,Size:32,Head/binary>>,Contents|pad(Size)];
-chunk(Id, Head, Contents) when list(Contents) ->
-    chunk(Id, Head, list_to_binary(Contents)).
-
-pad(Size) ->
-    case Size rem 4 of
-	0 -> [];
-	Rem -> duplicate(4 - Rem, 0)
-    end.
-
-flatten_exports(Exps) ->
-    list_to_binary(map(fun({F,A,L}) -> <<F:32,A:32,L:32>> end, Exps)).
-
-flatten_imports(Imps) ->
-    list_to_binary(map(fun({M,F,A}) -> <<M:32,F:32,A:32>> end, Imps)).
-
-build_attributes(Opts, SourceFile, Attr, Essentials) ->
-    Misc = case member(slim, Opts) of
-	       false ->
-		   {{Y,Mo,D},{H,Mi,S}} = erlang:universaltime(),
-		   [{time,{Y,Mo,D,H,Mi,S}},{source,SourceFile}];
-	       true -> []
-	   end,
-    Compile = [{options,Opts},{version,?COMPILER_VSN}|Misc],
-    {term_to_binary(calc_vsn(Attr, Essentials)),term_to_binary(Compile)}.
-
-%%
-%% If the attributes contains no 'vsn' attribute, we'll insert one
-%% with an MD5 "checksum" calculated on the code as its value.
-%% We'll not change an existing 'vsn' attribute.
-%%
-
-calc_vsn(Attr, Essentials) ->
-    case keymember(vsn, 1, Attr) of
-	true -> Attr;
-	false ->
-	    <<Number:128>> = erlang:md5(Essentials),
-	    [{vsn,[Number]}|Attr]
-    end.
-
-bif_type('-', 1)    -> negate;
-bif_type('+', 2)    -> {op, m_plus};
-bif_type('-', 2)    -> {op, m_minus};
-bif_type('*', 2)    -> {op, m_times};
-bif_type('/', 2)    -> {op, m_div};
-bif_type('div', 2)  -> {op, int_div};
-bif_type('rem', 2)  -> {op, int_rem};
-bif_type('band', 2) -> {op, int_band};
-bif_type('bor', 2)  -> {op, int_bor};
-bif_type('bxor', 2) -> {op, int_bxor};
-bif_type('bsl', 2)  -> {op, int_bsl};
-bif_type('bsr', 2)  -> {op, int_bsr};
-bif_type('bnot', 1) -> {op, int_bnot};
-bif_type(fnegate, 1)   -> {op, fnegate};
-bif_type(fadd, 2)   -> {op, fadd};
-bif_type(fsub, 2)   -> {op, fsub};
-bif_type(fmul, 2)   -> {op, fmul};
-bif_type(fdiv, 2)   -> {op, fdiv};
-bif_type(_, _)      -> bif.
-
-make_op(Comment, Dict) when element(1, Comment) == '%' ->
-    {[],Dict};
-make_op({'%live',_R}, Dict) ->
-    {[],Dict};
-make_op({bif, Bif, nofail, [], Dest}, Dict) ->
-    encode_op(bif0, [{extfunc, erlang, Bif, 0}, Dest], Dict);
-make_op({bif, raise, _Fail, [A1,A2], _Dest}, Dict) ->
-    encode_op(raise, [A1,A2], Dict);
-make_op({bif, Bif, Fail, Args, Dest}, Dict) ->
-    Arity = length(Args),
-    case bif_type(Bif, Arity) of
-	{op, Op} ->
-	    make_op(list_to_tuple([Op, Fail|Args++[Dest]]), Dict);
-	negate ->
-	    %% Fake negation operator.
-	    make_op({m_minus, Fail, {integer,0}, hd(Args), Dest}, Dict);
-	bif ->
-	    BifOp = list_to_atom(lists:concat([bif, Arity])),
-	    encode_op(BifOp, [Fail, {extfunc, erlang, Bif, Arity}|Args++[Dest]],
-		      Dict)
-    end;
-make_op({bs_add=Op,Fail,[Src1,Src2,Unit],Dest}, Dict) ->
-    encode_op(Op, [Fail,Src1,Src2,Unit,Dest], Dict);
-make_op({test,Cond,Fail,Ops}, Dict) when list(Ops) ->
-    encode_op(Cond, [Fail|Ops], Dict);
-make_op({make_fun2,{f,Lbl},Index,OldUniq,NumFree}, Dict0) ->
-    {Fun,Dict} = beam_dict:lambda(Lbl, Index, OldUniq, NumFree, Dict0),
-    make_op({make_fun2,Fun}, Dict);
-make_op(Op, Dict) when atom(Op) ->
-    encode_op(Op, [], Dict);
-make_op({kill,Y}, Dict) ->
-    make_op({init,Y}, Dict);
-make_op({Name,Arg1}, Dict) ->
-    encode_op(Name, [Arg1], Dict);
-make_op({Name,Arg1,Arg2}, Dict) ->
-    encode_op(Name, [Arg1,Arg2], Dict);
-make_op({Name,Arg1,Arg2,Arg3}, Dict) ->
-    encode_op(Name, [Arg1,Arg2,Arg3], Dict);
-make_op({Name,Arg1,Arg2,Arg3,Arg4}, Dict) ->
-    encode_op(Name, [Arg1,Arg2,Arg3,Arg4], Dict);
-make_op({Name,Arg1,Arg2,Arg3,Arg4,Arg5}, Dict) ->
-    encode_op(Name, [Arg1,Arg2,Arg3,Arg4,Arg5], Dict);
-make_op({Name,Arg1,Arg2,Arg3,Arg4,Arg5,Arg6}, Dict) ->
-    encode_op(Name, [Arg1,Arg2,Arg3,Arg4,Arg5,Arg6], Dict).
-
-encode_op(Name, Args, Dict0) when atom(Name) ->
-    {EncArgs,Dict1} = encode_args(Args, Dict0),
-    Op = beam_opcodes:opcode(Name, length(Args)),
-    Dict2 = beam_dict:opcode(Op, Dict1),
-    {list_to_binary([Op|EncArgs]),Dict2}.
-
-encode_args([Arg| T], Dict0) ->
-    {EncArg, Dict1} = encode_arg(Arg, Dict0),
-    {EncTail, Dict2} = encode_args(T, Dict1),
-    {[EncArg| EncTail], Dict2};
-encode_args([], Dict) ->
-    {[], Dict}.
-
-encode_arg({x, X}, Dict) when X >= 0 ->
-    {encode(?tag_x, X), Dict};
-encode_arg({y, Y}, Dict) when Y >= 0 ->
-    {encode(?tag_y, Y), Dict};
-encode_arg({atom, Atom}, Dict0) when atom(Atom) ->
-    {Index, Dict} = beam_dict:atom(Atom, Dict0),
-    {encode(?tag_a, Index), Dict};
-encode_arg({integer, N}, Dict) ->
-    {encode(?tag_i, N), Dict};
-encode_arg(nil, Dict) ->
-    {encode(?tag_a, 0), Dict};
-encode_arg({f, W}, Dict) ->
-    {encode(?tag_f, W), Dict};
-encode_arg({'char', C}, Dict) ->
-    {encode(?tag_h, C), Dict};
-encode_arg({string, String}, Dict0) ->
-    {Offset, Dict} = beam_dict:string(String, Dict0),
-    {encode(?tag_u, Offset), Dict};
-encode_arg({extfunc, M, F, A}, Dict0) ->
-    {Index, Dict} = beam_dict:import(M, F, A, Dict0),
-    {encode(?tag_u, Index), Dict};
-encode_arg({list, List}, Dict0) ->
-    {L, Dict} = encode_list(List, Dict0, []),
-    {[encode(?tag_z, 1), encode(?tag_u, length(List))|L], Dict};
-encode_arg({float, Float}, Dict) when float(Float) ->
-    {[encode(?tag_z, 0)|<<Float:64/float>>], Dict};
-encode_arg({fr,Fr}, Dict) ->
-    {[encode(?tag_z, 2),encode(?tag_u,Fr)], Dict};
-encode_arg({field_flags,Flags0}, Dict) ->
-    Flags = lists:foldl(fun (F, S) -> S bor flag_to_bit(F) end, 0, Flags0),
-    {encode(?tag_u, Flags), Dict};
-encode_arg({alloc,List}, Dict) ->
-    {encode_alloc_list(List),Dict};
-encode_arg(Int, Dict) when is_integer(Int) ->
-    {encode(?tag_u, Int),Dict}.
-
-flag_to_bit(aligned) -> 16#01;
-flag_to_bit(little)  -> 16#02;
-flag_to_bit(big)     -> 16#00;
-flag_to_bit(signed)  -> 16#04;
-flag_to_bit(unsigned)-> 16#00;
-flag_to_bit(exact)   -> 16#08;
-flag_to_bit(native) ->  16#10.
-    
-encode_list([H|T], _Dict, _Acc) when is_list(H) ->
-    exit({illegal_nested_list,encode_arg,[H|T]});
-encode_list([H|T], Dict0, Acc) ->
-    {Enc,Dict} = encode_arg(H, Dict0),
-    encode_list(T, Dict, [Enc|Acc]);
-encode_list([], Dict, Acc) ->
-    {lists:reverse(Acc), Dict}.
-
-encode_alloc_list(L0) ->
-    L = encode_alloc_list_1(L0),
-    [encode(?tag_z, 3),encode(?tag_u, length(L0))|L].
-
-encode_alloc_list_1([{words,Words}|T]) ->
-    [encode(?tag_u, 0),encode(?tag_u, Words)|encode_alloc_list_1(T)];
-encode_alloc_list_1([{floats,Floats}|T]) ->
-    [encode(?tag_u, 1),encode(?tag_u, Floats)|encode_alloc_list_1(T)];
-encode_alloc_list_1([]) -> [].
-
-encode(Tag, N) when N < 0 ->
-    encode1(Tag, negative_to_bytes(N, []));
-encode(Tag, N) when N < 16 ->
-    (N bsl 4) bor Tag;
-encode(Tag, N) when N < 16#800  ->
-    [((N bsr 3) band 2#11100000) bor Tag bor 2#00001000, N band 16#ff];
-encode(Tag, N) ->
-    encode1(Tag, to_bytes(N, [])).
-
-encode1(Tag, Bytes) ->
-    case length(Bytes) of
-	Num when 2 =< Num, Num =< 8 ->
-	    [((Num-2) bsl 5) bor 2#00011000 bor Tag| Bytes];
-	Num when 8 < Num ->
-	    [2#11111000 bor Tag, encode(?tag_u, Num-9)| Bytes]
-    end.
-
-to_bytes(0, [B|Acc]) when B < 128 ->
-    [B|Acc];
-to_bytes(N, Acc) ->
-    to_bytes(N bsr 8, [N band 16#ff| Acc]).
-
-negative_to_bytes(-1, [B1, B2|T]) when B1 > 127 ->
-    [B1, B2|T];
-negative_to_bytes(N, Acc) ->
-    negative_to_bytes(N bsr 8, [N band 16#ff|Acc]).
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_block.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_block.erl
deleted file mode 100644
index b0dd3e6380..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_block.erl
+++ /dev/null
@@ -1,601 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: beam_block.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
-%%
-%% Purpose : Partitions assembly instructions into basic blocks and
-%% optimizes them.
-
--module(beam_block).
-
--export([module/2]).
--export([live_at_entry/1]).			%Used by beam_type, beam_bool.
--export([is_killed/2]).				%Used by beam_dead, beam_type, beam_bool.
--export([is_not_used/2]).			%Used by beam_bool.
--export([merge_blocks/2]).			%Used by beam_jump.
--import(lists, [map/2,mapfoldr/3,reverse/1,reverse/2,foldl/3,
-		member/2,sort/1,all/2]).
--define(MAXREG, 1024).
-
-module({Mod,Exp,Attr,Fs,Lc}, _Opt) ->
-    {ok,{Mod,Exp,Attr,map(fun function/1, Fs),Lc}}.
-
-function({function,Name,Arity,CLabel,Is0}) ->
-    %% Collect basic blocks and optimize them.
-    Is = blockify(Is0),
-
-    %% Done.
-    {function,Name,Arity,CLabel,Is}.
-
-%% blockify(Instructions0) -> Instructions
-%%  Collect sequences of instructions to basic blocks and
-%%  optimize the contents of the blocks. Also do some simple
-%%  optimations on instructions outside the blocks.
-
-blockify(Is) ->
-    blockify(Is, []).
-
-blockify([{loop_rec,{f,Fail},{x,0}},{loop_rec_end,_Lbl},{label,Fail}|Is], Acc) ->
-    %% Useless instruction sequence.
-    blockify(Is, Acc);
-blockify([{test,bs_test_tail,F,[Bits]}|Is],
-	 [{test,bs_skip_bits,F,[{integer,I},Unit,_Flags]}|Acc]) ->
-    blockify(Is, [{test,bs_test_tail,F,[Bits+I*Unit]}|Acc]);
-blockify([{test,bs_skip_bits,F,[{integer,I1},Unit1,_]}|Is],
-	 [{test,bs_skip_bits,F,[{integer,I2},Unit2,Flags]}|Acc]) ->
-    blockify(Is, [{test,bs_skip_bits,F,
-		   [{integer,I1*Unit1+I2*Unit2},1,Flags]}|Acc]);
-blockify([{test,is_atom,{f,Fail},[Reg]}=I|
-	  [{select_val,Reg,{f,Fail},
-	    {list,[{atom,false},{f,_}=BrFalse,
-		   {atom,true}=AtomTrue,{f,_}=BrTrue]}}|Is]=Is0],
-	 [{block,Bl}|_]=Acc) ->
-    case is_last_bool(Bl, Reg) of
-	false ->
-	    blockify(Is0, [I|Acc]);
-	true ->
-	    blockify(Is, [{jump,BrTrue},
-			  {test,is_eq_exact,BrFalse,[Reg,AtomTrue]}|Acc])
-    end;
-blockify([{test,is_atom,{f,Fail},[Reg]}=I|
-	  [{select_val,Reg,{f,Fail},
-	    {list,[{atom,true}=AtomTrue,{f,_}=BrTrue,
-		   {atom,false},{f,_}=BrFalse]}}|Is]=Is0],
-	 [{block,Bl}|_]=Acc) ->
-    case is_last_bool(Bl, Reg) of
-	false ->
-	    blockify(Is0, [I|Acc]);
-	true ->
-	    blockify(Is, [{jump,BrTrue},
-			  {test,is_eq_exact,BrFalse,[Reg,AtomTrue]}|Acc])
-    end;
-blockify([I|Is0]=IsAll, Acc) ->
-    case is_bs_put(I) of
-	true ->
-	    {BsPuts0,Is} = collect_bs_puts(IsAll),
-	    BsPuts = opt_bs_puts(BsPuts0),
-	    blockify(Is, reverse(BsPuts, Acc));
-	false ->
-	    case collect(I) of
-		error -> blockify(Is0, [I|Acc]);
-		Instr when is_tuple(Instr) ->
-		    {Block0,Is} = collect_block(IsAll),
-		    Block = opt_block(Block0),
-		    blockify(Is, [{block,Block}|Acc])
-	    end
-    end;
-blockify([], Acc) -> reverse(Acc).
-
-is_last_bool([I,{'%live',_}], Reg) ->
-    is_last_bool([I], Reg);
-is_last_bool([{set,[Reg],As,{bif,N,_}}], Reg) ->
-    Ar = length(As),
-    erl_internal:new_type_test(N, Ar) orelse erl_internal:comp_op(N, Ar)
-	orelse erl_internal:bool_op(N, Ar);
-is_last_bool([_|Is], Reg) -> is_last_bool(Is, Reg);
-is_last_bool([], _) -> false.
-
-collect_block(Is) ->
-    collect_block(Is, []).
-
-collect_block([{allocate_zero,Ns,R},{test_heap,Nh,R}|Is], Acc) ->
-    collect_block(Is, [{allocate,R,{no_opt,Ns,Nh,[]}}|Acc]);
-collect_block([I|Is]=Is0, Acc) ->
-    case collect(I) of
-	error -> {reverse(Acc),Is0};
-	Instr -> collect_block(Is, [Instr|Acc])
-    end;
-collect_block([], Acc) -> {reverse(Acc),[]}.
-
-collect({allocate_zero,N,R}) -> {allocate,R,{zero,N,0,[]}};
-collect({test_heap,N,R})     -> {allocate,R,{nozero,nostack,N,[]}};
-collect({bif,N,nofail,As,D}) -> {set,[D],As,{bif,N}};
-collect({bif,N,F,As,D})      -> {set,[D],As,{bif,N,F}};
-collect({move,S,D})          -> {set,[D],[S],move};
-collect({put_list,S1,S2,D})  -> {set,[D],[S1,S2],put_list};
-collect({put_tuple,A,D})     -> {set,[D],[],{put_tuple,A}};
-collect({put,S})             -> {set,[],[S],put};
-collect({put_string,L,S,D})  -> {set,[D],[],{put_string,L,S}};
-collect({get_tuple_element,S,I,D}) -> {set,[D],[S],{get_tuple_element,I}};
-collect({set_tuple_element,S,D,I}) -> {set,[],[S,D],{set_tuple_element,I}};
-collect({get_list,S,D1,D2})  -> {set,[D1,D2],[S],get_list};
-collect(remove_message)      -> {set,[],[],remove_message};
-collect({'catch',R,L})       -> {set,[R],[],{'catch',L}};
-collect({'%live',_}=Live)    -> Live;
-collect(_)                   -> error.
-
-opt_block(Is0) ->
-    %% We explicitly move any allocate instruction upwards before optimising
-    %% moves, to avoid any potential problems with the calculation of live
-    %% registers.
-    Is1 = find_fixpoint(fun move_allocates/1, Is0),
-    Is2 = find_fixpoint(fun opt/1, Is1),
-    Is = opt_alloc(Is2),
-    share_floats(Is).
-
-find_fixpoint(OptFun, Is0) ->
-    case OptFun(Is0) of
-	Is0 -> Is0;
-	Is1 -> find_fixpoint(OptFun, Is1)
-    end.
-
-move_allocates([{set,_Ds,_Ss,{set_tuple_element,_}}|_]=Is) -> Is;
-move_allocates([{set,Ds,Ss,_Op}=Set,{allocate,R,Alloc}|Is]) when is_integer(R) ->
-    [{allocate,live_regs(Ds, Ss, R),Alloc},Set|Is];
-move_allocates([{allocate,R1,Alloc1},{allocate,R2,Alloc2}|Is]) ->
-    R1 = R2,					% Assertion.
-    move_allocates([{allocate,R1,combine_alloc(Alloc1, Alloc2)}|Is]);
-move_allocates([I|Is]) ->
-    [I|move_allocates(Is)];
-move_allocates([]) -> [].
-
-combine_alloc({_,Ns,Nh1,Init}, {_,nostack,Nh2,[]}) ->
-    {zero,Ns,Nh1+Nh2,Init}.
-
-merge_blocks([{allocate,R,{Attr,Ns,Nh1,Init}}|B1],
-	     [{allocate,_,{_,nostack,Nh2,[]}}|B2]) ->
-    Alloc = {allocate,R,{Attr,Ns,Nh1+Nh2,Init}},
-    [Alloc|merge_blocks(B1, B2)];
-merge_blocks(B1, B2) -> merge_blocks_1(B1++[{set,[],[],stop_here}|B2]).
-
-merge_blocks_1([{set,[],_,stop_here}|Is]) -> Is;
-merge_blocks_1([{set,[D],_,move}=I|Is]) ->
-    case is_killed(D, Is) of
-	true -> merge_blocks_1(Is);
-	false -> [I|merge_blocks_1(Is)]
-    end;
-merge_blocks_1([I|Is]) -> [I|merge_blocks_1(Is)].
-
-opt([{set,[Dst],As,{bif,Bif,Fail}}=I1,
-     {set,[Dst],[Dst],{bif,'not',Fail}}=I2|Is]) ->
-    %% Get rid of the 'not' if the operation can be inverted.
-    case inverse_comp_op(Bif) of
- 	none -> [I1,I2|opt(Is)];
- 	RevBif -> [{set,[Dst],As,{bif,RevBif,Fail}}|opt(Is)]
-    end;
-opt([{set,[X],[X],move}|Is]) -> opt(Is);
-opt([{set,[D1],[{integer,Idx1},Reg],{bif,element,{f,0}}}=I1,
-     {set,[D2],[{integer,Idx2},Reg],{bif,element,{f,0}}}=I2|Is])
-  when Idx1 < Idx2, D1 =/= D2, D1 =/= Reg, D2 =/= Reg ->
-    opt([I2,I1|Is]);
-opt([{set,Ds0,Ss,Op}|Is0]) ->	
-    {Ds,Is} =  opt_moves(Ds0, Is0),
-    [{set,Ds,Ss,Op}|opt(Is)];
-opt([I|Is]) -> [I|opt(Is)];
-opt([]) -> [].
-
-opt_moves([], Is0) -> {[],Is0};
-opt_moves([D0], Is0) ->
-    {D1,Is1} = opt_move(D0, Is0),
-    {[D1],Is1};
-opt_moves([X0,Y0]=Ds, Is0) ->
-    {X1,Is1} = opt_move(X0, Is0),
-    case opt_move(Y0, Is1) of
-	{Y1,Is2} when X1 =/= Y1 -> {[X1,Y1],Is2};
-	_Other when X1 =/= Y0 -> {[X1,Y0],Is1};
-	_Other -> {Ds,Is0}
-    end.
-
-opt_move(R, [{set,[D],[R],move}|Is]=Is0) ->
-    case is_killed(R, Is) of
-	true -> {D,Is};
-	false -> {R,Is0}
-    end;
-opt_move(R, [I|Is0]) ->
-    case is_transparent(R, I) of
-	true ->
-	    {D,Is1} = opt_move(R, Is0),
-	    case is_transparent(D, I) of
-		true ->  {D,[I|Is1]};
-		false -> {R,[I|Is0]}
-	    end;
-	false -> {R,[I|Is0]}
-    end;
-opt_move(R, []) -> {R,[]}.
-
-is_transparent(R, {set,Ds,Ss,_Op}) ->
-    case member(R, Ds) of
-	true -> false;
-	false -> not member(R, Ss)
-    end;
-is_transparent(_, _) -> false.
-
-%% is_killed(Register, [Instruction]) -> true|false
-%%  Determine whether a register is killed by the instruction sequence.
-%%  If true is returned, it means that the register will not be
-%%  referenced in ANY way (not even indirectly by an allocate instruction);
-%%  i.e. it is OK to enter the instruction sequence with Register
-%%  containing garbage.
-
-is_killed({x,N}=R, [{block,Blk}|Is]) ->
-    case is_killed(R, Blk) of
-	true -> true;
-	false ->
-	    %% Before looking beyond the block, we must be
-	    %% sure that the register is not referenced by
-	    %% any allocate instruction in the block.
-	    case all(fun({allocate,Live,_}) when N < Live -> false;
-			(_) -> true
-		     end, Blk) of
-		true -> is_killed(R, Is);
-		false -> false
-	    end
-    end;
-is_killed(R, [{block,Blk}|Is]) ->
-    case is_killed(R, Blk) of
-	true -> true;
-	false -> is_killed(R, Is)
-    end;
-is_killed(R, [{set,Ds,Ss,_Op}|Is]) ->
-    case member(R, Ss) of
-	true -> false;
-	false ->
-	    case member(R, Ds) of
-		true -> true;
-		false -> is_killed(R, Is)
-	    end
-    end;
-is_killed(R, [{case_end,Used}|_]) -> R =/= Used;
-is_killed(R, [{badmatch,Used}|_]) -> R =/= Used;
-is_killed(_, [if_end|_]) -> true;
-is_killed(R, [{func_info,_,_,Ar}|_]) ->
-    case R of
-	{x,X} when X < Ar -> false;
-	_ -> true
-    end;
-is_killed(R, [{kill,R}|_]) -> true;
-is_killed(R, [{kill,_}|Is]) -> is_killed(R, Is);
-is_killed(R, [{bs_init2,_,_,_,_,_,Dst}|Is]) ->
-    if
-	R =:= Dst -> true;
-	true -> is_killed(R, Is)
-    end;
-is_killed(R, [{bs_put_string,_,_}|Is]) -> is_killed(R, Is);
-is_killed({x,R}, [{'%live',Live}|_]) when R >= Live -> true;
-is_killed({x,R}, [{'%live',_}|Is]) -> is_killed(R, Is);
-is_killed({x,R}, [{allocate,Live,_}|_]) ->
-    %% Note: To be safe here, we must return either true or false,
-    %% not looking further at the instructions beyond the allocate
-    %% instruction.
-    R >= Live;
-is_killed({x,R}, [{call,Live,_}|_]) when R >= Live -> true;
-is_killed({x,R}, [{call_last,Live,_,_}|_]) when R >= Live -> true;
-is_killed({x,R}, [{call_only,Live,_}|_]) when R >= Live -> true;
-is_killed({x,R}, [{call_ext,Live,_}|_]) when R >= Live -> true;
-is_killed({x,R}, [{call_ext_last,Live,_,_}|_]) when R >= Live -> true;
-is_killed({x,R}, [{call_ext_only,Live,_}|_]) when R >= Live -> true;
-is_killed({x,R}, [return|_]) when R > 0 -> true;
-is_killed(_, _) -> false.
-
-%% is_not_used(Register, [Instruction]) -> true|false
-%%  Determine whether a register is used by the instruction sequence.
-%%  If true is returned, it means that the register will not be
-%%  referenced directly, but it may be referenced by an allocate
-%%  instruction (meaning that it is NOT allowed to contain garbage).
-
-is_not_used(R, [{block,Blk}|Is]) ->
-    case is_not_used(R, Blk) of
-	true -> true;
-	false -> is_not_used(R, Is)
-    end;
-is_not_used({x,R}=Reg, [{allocate,Live,_}|Is]) ->
-    if
-	R >= Live -> true;
-	true -> is_not_used(Reg, Is)
-    end;
-is_not_used(R, [{set,Ds,Ss,_Op}|Is]) ->
-    case member(R, Ss) of
-	true -> false;
-	false ->
-	    case member(R, Ds) of
-		true -> true;
-		false -> is_not_used(R, Is)
-	    end
-    end;
-is_not_used(R, Is) -> is_killed(R, Is).
-
-%% opt_alloc(Instructions) -> Instructions'
-%%  Optimises all allocate instructions.
-
-opt_alloc([{allocate,R,{_,Ns,Nh,[]}}|Is]) ->
-    [opt_alloc(Is, Ns, Nh, R)|opt(Is)];
-opt_alloc([I|Is]) -> [I|opt_alloc(Is)];
-opt_alloc([]) -> [].
-	
-%% opt_alloc(Instructions, FrameSize, HeapNeed, LivingRegs) -> [Instr]
-%%  Generates the optimal sequence of instructions for
-%%  allocating and initalizing the stack frame and needed heap.
-
-opt_alloc(_Is, nostack, Nh, LivingRegs) ->
-    {allocate,LivingRegs,{nozero,nostack,Nh,[]}};
-opt_alloc(Is, Ns, Nh, LivingRegs) ->
-    InitRegs = init_yreg(Is, 0),
-    case count_ones(InitRegs) of
-	N when N*2 > Ns ->
-	    {allocate,LivingRegs,{nozero,Ns,Nh,gen_init(Ns, InitRegs)}};
-	_ ->
-	    {allocate,LivingRegs,{zero,Ns,Nh,[]}}
-    end.
-
-gen_init(Fs, Regs) -> gen_init(Fs, Regs, 0, []).
-
-gen_init(SameFs, _Regs, SameFs, Acc) -> reverse(Acc);
-gen_init(Fs, Regs, Y, Acc) when Regs band 1 == 0 ->
-    gen_init(Fs, Regs bsr 1, Y+1, [{init, {y,Y}}|Acc]);
-gen_init(Fs, Regs, Y, Acc) ->
-    gen_init(Fs, Regs bsr 1, Y+1, Acc).
-
-%% init_yreg(Instructions, RegSet) -> RegSetInitialized
-%%  Calculate the set of initialized y registers.
-
-init_yreg([{set,_,_,{bif,_,_}}|_], Reg) -> Reg;
-init_yreg([{set,Ds,_,_}|Is], Reg) -> init_yreg(Is, add_yregs(Ds, Reg));
-init_yreg(_Is, Reg) -> Reg.
-
-add_yregs(Ys, Reg) -> foldl(fun(Y, R0) -> add_yreg(Y, R0) end, Reg, Ys).
-    
-add_yreg({y,Y}, Reg) -> Reg bor (1 bsl Y);
-add_yreg(_, Reg)     -> Reg.
-
-count_ones(Bits) -> count_ones(Bits, 0).
-count_ones(0, Acc) -> Acc;
-count_ones(Bits, Acc) ->
-    count_ones(Bits bsr 1, Acc + (Bits band 1)).
-
-%% live_at_entry(Is) -> NumberOfRegisters
-%%  Calculate the number of register live at the entry to the code
-%%  sequence.
-
-live_at_entry([{block,[{allocate,R,_}|_]}|_]) ->
-    R;
-live_at_entry([{label,_}|Is]) ->
-    live_at_entry(Is);
-live_at_entry([{block,Bl}|_]) ->
-    live_at_entry(Bl);
-live_at_entry([{func_info,_,_,Ar}|_]) ->
-    Ar;
-live_at_entry(Is0) ->
-    case reverse(Is0) of
-	[{'%live',Regs}|Is] -> live_at_entry_1(Is, (1 bsl Regs)-1);
-	_ -> unknown
-    end.
-
-live_at_entry_1([{set,Ds,Ss,_}|Is], Rset0) ->
-    Rset = x_live(Ss, x_dead(Ds, Rset0)),
-    live_at_entry_1(Is, Rset);
-live_at_entry_1([{allocate,_,_}|Is], Rset) ->
-    live_at_entry_1(Is, Rset);
-live_at_entry_1([], Rset) -> live_regs_1(0, Rset).
-
-%% Calculate the new number of live registers when we move an allocate
-%% instruction upwards, passing a 'set' instruction.
-
-live_regs(Ds, Ss, Regs0) ->
-    Rset = x_live(Ss, x_dead(Ds, (1 bsl Regs0)-1)),
-    live_regs_1(0, Rset).
-
-live_regs_1(N, 0) -> N;
-live_regs_1(N, Regs) -> live_regs_1(N+1, Regs bsr 1).
-
-x_dead([{x,N}|Rs], Regs) -> x_dead(Rs, Regs band (bnot (1 bsl N)));
-x_dead([_|Rs], Regs) -> x_dead(Rs, Regs);
-x_dead([], Regs) -> Regs.
-
-x_live([{x,N}|Rs], Regs) -> x_live(Rs, Regs bor (1 bsl N));
-x_live([_|Rs], Regs) -> x_live(Rs, Regs);
-x_live([], Regs) -> Regs.
-
-%%
-%% If a floating point literal occurs more than once, move it into
-%% a free register and re-use it.
-%%
-
-share_floats([{allocate,_,_}=Alloc|Is]) ->
-    [Alloc|share_floats(Is)];
-share_floats(Is0) ->
-    All = get_floats(Is0, []),
-    MoreThanOnce0 =  more_than_once(sort(All), gb_sets:empty()),
-    case gb_sets:is_empty(MoreThanOnce0) of
-	true -> Is0;
-	false ->
-	    MoreThanOnce = gb_sets:to_list(MoreThanOnce0),
-	    FreeX = highest_used(Is0, -1) + 1,
-	    Regs0 = make_reg_map(MoreThanOnce, FreeX, []),
-	    Regs = gb_trees:from_orddict(Regs0),
-	    Is = map(fun({set,Ds,[{float,F}],Op}=I) ->
-			     case gb_trees:lookup(F, Regs) of
-				 none -> I;
-				 {value,R} -> {set,Ds,[R],Op}
-			     end;
-			(I) -> I
-		     end, Is0),
-	    [{set,[R],[{float,F}],move} || {F,R} <- Regs0] ++ Is
-    end.
-
-get_floats([{set,_,[{float,F}],_}|Is], Acc) ->
-    get_floats(Is, [F|Acc]);
-get_floats([_|Is], Acc) ->
-    get_floats(Is, Acc);
-get_floats([], Acc) -> Acc.
-
-more_than_once([F,F|Fs], Set) ->
-    more_than_once(Fs, gb_sets:add(F, Set));
-more_than_once([_|Fs], Set) ->
-    more_than_once(Fs, Set);
-more_than_once([], Set) -> Set.
-
-highest_used([{set,Ds,Ss,_}|Is], High) ->
-    highest_used(Is, highest(Ds, highest(Ss, High)));
-highest_used([{'%live',Live}|Is], High) when Live > High ->
-    highest_used(Is, Live);
-highest_used([_|Is], High) ->
-    highest_used(Is, High);
-highest_used([], High) -> High.
-
-highest([{x,R}|Rs], High) when R > High ->
-    highest(Rs, R);
-highest([_|Rs], High) ->
-    highest(Rs, High);
-highest([], High) -> High.
-
-make_reg_map([F|Fs], R, Acc) when R < ?MAXREG ->
-    make_reg_map(Fs, R+1, [{F,{x,R}}|Acc]);
-make_reg_map(_, _, Acc) -> sort(Acc).
-
-%% inverse_comp_op(Op) -> none|RevOp
-
-inverse_comp_op('=:=') -> '=/=';
-inverse_comp_op('=/=') -> '=:=';
-inverse_comp_op('==') -> '/=';
-inverse_comp_op('/=') -> '==';
-inverse_comp_op('>') -> '=<';
-inverse_comp_op('<') -> '>=';
-inverse_comp_op('>=') -> '<';
-inverse_comp_op('=<') -> '>';
-inverse_comp_op(_) -> none.
-
-%%%
-%%% Evaluation of constant bit fields.
-%%%
-
-is_bs_put({bs_put_integer,_,_,_,_,_}) -> true;
-is_bs_put({bs_put_float,_,_,_,_,_}) -> true;
-is_bs_put(_) -> false.
-
-collect_bs_puts(Is) ->
-    collect_bs_puts_1(Is, []).
-    
-collect_bs_puts_1([I|Is]=Is0, Acc) ->
-    case is_bs_put(I) of
-	false -> {reverse(Acc),Is0};
-	true -> collect_bs_puts_1(Is, [I|Acc])
-    end;
-collect_bs_puts_1([], Acc) -> {reverse(Acc),[]}.
-    
-opt_bs_puts(Is) ->
-    opt_bs_1(Is, []).
-
-opt_bs_1([{bs_put_float,Fail,{integer,Sz},1,Flags0,Src}=I0|Is], Acc) ->
-    case catch eval_put_float(Src, Sz, Flags0) of
-	{'EXIT',_} ->
-	    opt_bs_1(Is, [I0|Acc]);
-	<<Int:Sz>> ->
-	    Flags = force_big(Flags0),
-	    I = {bs_put_integer,Fail,{integer,Sz},1,Flags,{integer,Int}},
-	    opt_bs_1([I|Is], Acc)
-    end;
-opt_bs_1([{bs_put_integer,_,{integer,8},1,_,{integer,_}}|_]=IsAll, Acc0) ->
-    {Is,Acc} = bs_collect_string(IsAll, Acc0),
-    opt_bs_1(Is, Acc);
-opt_bs_1([{bs_put_integer,Fail,{integer,Sz},1,F,{integer,N}}=I|Is0], Acc) when Sz > 8 ->
-    case field_endian(F) of
-	big ->
-	    case bs_split_int(N, Sz, Fail, Is0) of
-		no_split -> opt_bs_1(Is0, [I|Acc]);
-		Is -> opt_bs_1(Is, Acc)
-	    end;
-	little ->
-	    case catch <<N:Sz/little>> of
-		{'EXIT',_} ->
-		    opt_bs_1(Is0, [I|Acc]);
-		<<Int:Sz>> ->
-		    Flags = force_big(F),
-		    Is = [{bs_put_integer,Fail,{integer,Sz},1,
-			   Flags,{integer,Int}}|Is0],
-		    opt_bs_1(Is, Acc)
-	    end;
-	native -> opt_bs_1(Is0, [I|Acc])
-    end;
-opt_bs_1([{Op,Fail,{integer,Sz},U,F,Src}|Is], Acc) when U > 1 ->
-    opt_bs_1([{Op,Fail,{integer,U*Sz},1,F,Src}|Is], Acc);
-opt_bs_1([I|Is], Acc) ->
-    opt_bs_1(Is, [I|Acc]);
-opt_bs_1([], Acc) -> reverse(Acc).
-
-eval_put_float(Src, Sz, Flags) ->
-    Val = value(Src),
-    case field_endian(Flags) of
-	little -> <<Val:Sz/little-float-unit:1>>;
-	big -> <<Val:Sz/big-float-unit:1>>
-        %% native intentionally not handled here - we can't optimize it.
-    end.
-
-value({integer,I}) -> I;
-value({float,F}) -> F;
-value({atom,A}) -> A.
-
-bs_collect_string(Is, [{bs_put_string,Len,{string,Str}}|Acc]) ->
-    bs_coll_str_1(Is, Len, reverse(Str), Acc);
-bs_collect_string(Is, Acc) ->
-    bs_coll_str_1(Is, 0, [], Acc).
-    
-bs_coll_str_1([{bs_put_integer,_,{integer,Sz},U,_,{integer,V}}|Is],
-	      Len, StrAcc, IsAcc) when U*Sz =:= 8 ->
-    Byte = V band 16#FF,
-    bs_coll_str_1(Is, Len+1, [Byte|StrAcc], IsAcc);
-bs_coll_str_1(Is, Len, StrAcc, IsAcc) ->
-    {Is,[{bs_put_string,Len,{string,reverse(StrAcc)}}|IsAcc]}.
-
-field_endian({field_flags,F}) -> field_endian_1(F).
-
-field_endian_1([big=E|_]) -> E;
-field_endian_1([little=E|_]) -> E;
-field_endian_1([native=E|_]) -> E;
-field_endian_1([_|Fs]) -> field_endian_1(Fs).
-
-force_big({field_flags,F}) ->
-    {field_flags,force_big_1(F)}.
-
-force_big_1([big|_]=Fs) -> Fs;
-force_big_1([little|Fs]) -> [big|Fs];
-force_big_1([F|Fs]) -> [F|force_big_1(Fs)].
-
-bs_split_int(0, Sz, _, _) when Sz > 64 ->
-    %% We don't want to split in this case because the
-    %% string will consist of only zeroes.
-    no_split;
-bs_split_int(N, Sz, Fail, Acc) ->
-    FirstByteSz = case Sz rem 8 of
-		      0 -> 8;
-		      Rem -> Rem
-		  end,
-    bs_split_int_1(N, FirstByteSz, Sz, Fail, Acc).
-
-bs_split_int_1(N, ByteSz, Sz, Fail, Acc) when Sz > 0 ->
-    Mask = (1 bsl ByteSz) - 1,
-    I = {bs_put_integer,Fail,{integer,ByteSz},1,
-	 {field_flags,[big]},{integer,N band Mask}},
-    bs_split_int_1(N bsr ByteSz, 8, Sz-ByteSz, Fail, [I|Acc]);
-bs_split_int_1(_, _, _, _, Acc) -> Acc.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_bool.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_bool.erl
deleted file mode 100644
index 3180a22433..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_bool.erl
+++ /dev/null
@@ -1,617 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: beam_bool.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
-%%
-%% Purpose: Optimizes booleans in guards.
-
--module(beam_bool).
-
--export([module/2]).
-
--import(lists, [reverse/1,foldl/3,mapfoldl/3,sort/1,member/2]).
--define(MAXREG, 1024).
-
--record(st,
-	{next,					%Next label number.
-	 ll					%Live regs at labels.
-	}).
-	 
-module({Mod,Exp,Attr,Fs0,Lc}, _Opts) ->
-    %%io:format("~p:\n", [Mod]),
-    {Fs,_} = mapfoldl(fun(Fn, Lbl) -> function(Fn, Lbl) end, 100000000, Fs0),
-    {ok,{Mod,Exp,Attr,Fs,Lc}}.
-
-function({function,Name,Arity,CLabel,Is0}, Lbl0) ->
-    %%io:format("~p/~p:\n", [Name,Arity]),
-    {Is,#st{next=Lbl}} = bool_opt(Is0, Lbl0),
-    {{function,Name,Arity,CLabel,Is},Lbl}.
-
-%%
-%% Optimize boolean expressions that use guard bifs. Rewrite to
-%% use test instructions if possible.
-%%
-
-bool_opt(Asm, Lbl) ->
-    LiveInfo = index_instructions(Asm),
-    bopt(Asm, [], #st{next=Lbl,ll=LiveInfo}).
-
-bopt([{block,Bl0}=Block|
-      [{jump,{f,Succ}},
-       {label,Fail},
-       {block,[{set,[Dst],[{atom,false}],move},{'%live',Live}]},
-       {label,Succ}|Is]=Is0], Acc0, St) ->
-    case split_block(Bl0, Dst, Fail) of
-	failed ->
-	    bopt(Is0, [Block|Acc0], St);
-	{Bl,PreBlock} ->
-	    Acc1 = case PreBlock of
-		       [] -> Acc0;
-		       _ -> [{block,PreBlock}|Acc0]
-		   end,
-	    Acc = [{protected,[Dst],Bl,{Fail,Succ,Live}}|Acc1],
-	    bopt(Is, Acc, St)
-    end;
-bopt([{test,is_eq_exact,{f,Fail},[Reg,{atom,true}]}=I|Is], [{block,_}|_]=Acc0, St0) ->
-    case bopt_block(Reg, Fail, Is, Acc0, St0) of
-	failed -> bopt(Is, [I|Acc0], St0);
-	{Acc,St} -> bopt(Is, Acc, St)
-    end;
-bopt([I|Is], Acc, St) ->
-    bopt(Is, [I|Acc], St);
-bopt([], Acc, St) ->
-    {bopt_reverse(Acc, []),St}.
-
-bopt_reverse([{protected,[Dst],Block,{Fail,Succ,Live}}|Is], Acc0) ->
-    Acc = [{block,Block},{jump,{f,Succ}},
-	   {label,Fail},
-	   {block,[{set,[Dst],[{atom,false}],move},{'%live',Live}]},
-	   {label,Succ}|Acc0],
-    bopt_reverse(Is, Acc);
-bopt_reverse([I|Is], Acc) ->
-    bopt_reverse(Is, [I|Acc]);
-bopt_reverse([], Acc) -> Acc.
-
-%% bopt_block(Reg, Fail, OldIs, Accumulator, St) -> failed | {NewAcc,St}
-%%  Attempt to optimized a block of guard BIFs followed by a test
-%%  instruction.
-bopt_block(Reg, Fail, OldIs, [{block,Bl0}|Acc0], St0) ->
-    case split_block(Bl0, Reg, Fail) of
-	failed ->
-	    %% Reason for failure: The block either contained no
-	    %% guard BIFs with the failure label Fail, or the final
-	    %% instruction in the block did not assign the Reg register.
-
-	    %%io:format("split ~p: ~P\n", [Reg,Bl0,20]),
-	    failed;
-	{Bl1,BlPre} ->
-	    %% The block has been splitted. Bl1 is a non-empty list
-	    %% of guard BIF instructions having the failure label Fail.
-	    %% BlPre is a (possibly empty list) of instructions preceeding
-	    %% Bl1.
-	    Acc1 = make_block(BlPre, Acc0),
-	    {Bl,Acc} = extend_block(Bl1, Fail, Acc1),
-	    case catch bopt_block_1(Bl, Fail, St0) of
-		{'EXIT',_Reason} ->
-		    %% Optimization failed for one of the following reasons:
-		    %%
-		    %% 1. Not possible to rewrite because a boolean value is
-		    %%    passed to another guard bif, e.g. 'abs(A > B)'
-		    %%    (in this case, obviously nonsense code). Rare in
-		    %%    practice.
-		    %%
-		    %% 2. Not possible to rewrite because we have not seen
-		    %%    the complete boolan expression (it is spread out
-		    %%    over several blocks with jumps and labels).
-		    %%    The 'or' and 'and' instructions need to that fully
-		    %%    known operands in order to be eliminated.
-		    %%
-		    %% 3. Other bug or limitation.
-
-		    %%io:format("~P\n", [_Reason,20]),
-		    failed;
-		{NewCode,St} ->
-		    case is_opt_safe(Bl, NewCode, OldIs, St) of
-			false ->
-			    %% The optimization is not safe. (A register
-			    %% used by the instructions following the
-			    %% optimized code is either not assigned a
-			    %% value at all or assigned a different value.)
-
-			    %%io:format("\nNot safe:\n"),
-			    %%io:format("~p\n", [Bl]),
-			    %%io:format("~p\n", [reverse(NewCode)]),
-			    failed;
-			true -> {NewCode++Acc,St}
-		    end
-	    end
-    end.
-
-bopt_block_1(Block, Fail, St) ->
-    {Pre0,[{_,Tree}]} = bopt_tree(Block),
-    Pre = update_fail_label(Pre0, Fail, []),
-    bopt_cg(Tree, Fail, make_block(Pre, []), St).
-
-%% is_opt_safe(OriginalCode, OptCode, FollowingCode, State) -> true|false
-%%  Comparing the original code to the optimized code, determine
-%%  whether the optimized code is guaranteed to work in the same
-%%  way as the original code.
-
-is_opt_safe(Bl, NewCode, OldIs, St) ->
-    %% Here are the conditions that must be true for the
-    %% optimization to be safe.
-    %%
-    %% 1. Any register that was assigned a value in the original
-    %%    code, but is not in the optimized code, must be guaranteed
-    %%    to be KILLED in the following code. (NotSet below.)
-    %% 
-    %% 2. Any register that is assigned a value in the optimized
-    %%    code must be UNUSED in the following code. (NewDst, Set.)
-    %%    (Possible future improvement: Registers that are known
-    %%    to be assigned the SAME value in the original and optimized
-    %%    code don't need to be unused in the following code.)
-
-    PrevDst = dst_regs(Bl),
-    NewDst = dst_regs(NewCode),
-    NotSet = ordsets:subtract(PrevDst, NewDst),
-
-    %% Note: The following line is an optimization. We don't need
-    %% to test whether variables in NotSet for being unused, because
-    %% they will all be tested for being killed (a stronger condition
-    %% than being unused).
-    
-    Set = ordsets:subtract(NewDst, NotSet),
-
-    all_killed(NotSet, OldIs, St) andalso
-	none_used(Set, OldIs, St).
-
-% update_fail_label([{set,_,_,{bif,_,{f,0}}}=I|Is], Fail, Acc) ->
-%     update_fail_label(Is, Fail, [I|Acc]);
-update_fail_label([{set,Ds,As,{bif,N,{f,_}}}|Is], Fail, Acc) ->
-    update_fail_label(Is, Fail, [{set,Ds,As,{bif,N,{f,Fail}}}|Acc]);
-update_fail_label([], _, Acc) -> Acc.
-    
-make_block([], Acc) -> Acc;
-make_block(Bl, Acc) -> [{block,Bl}|Acc].
-
-extend_block(BlAcc, Fail, [{protected,_,_,_}=Prot|OldAcc]) ->
-    extend_block([Prot|BlAcc], Fail, OldAcc);
-extend_block(BlAcc0, Fail, [{block,Is0}|OldAcc]=OldAcc0) ->
-    case extend_block_1(reverse(Is0), Fail, BlAcc0) of
-	{[],_} -> {BlAcc0,OldAcc0};
-	{BlAcc,[]} -> extend_block(BlAcc, Fail, OldAcc);
-	{BlAcc,Is} -> {BlAcc,[{block,Is}|OldAcc]}
-    end;
-extend_block(BlAcc, _, OldAcc) -> {BlAcc,OldAcc}.
-
-extend_block_1([{set,[_],_,{bif,_,{f,Fail}}}=I|Is], Fail, Acc) ->
-    extend_block_1(Is, Fail, [I|Acc]);
-extend_block_1([{set,[_],As,{bif,Bif,_}}=I|Is]=Is0, Fail, Acc) ->
-    case safe_bool_op(Bif, length(As)) of
-	false -> {Acc,reverse(Is0)};
-	true -> extend_block_1(Is, Fail, [I|Acc])
-    end;
-extend_block_1([_|_]=Is, _, Acc) -> {Acc,reverse(Is)};
-extend_block_1([], _, Acc) -> {Acc,[]}.
-
-split_block(Is0, Dst, Fail) ->
-    case reverse(Is0) of
-	[{'%live',_}|[{set,[Dst],_,_}|_]=Is] ->
-	    split_block_1(Is, Fail);
-	[{set,[Dst],_,_}|_]=Is ->
-	    split_block_1(Is, Fail);
-	_ -> failed
-    end.
-
-split_block_1(Is, Fail) ->
-    case split_block_2(Is, Fail, []) of
-	{[],_} -> failed;
-	{_,_}=Res -> Res
-    end.
-
-% split_block_2([{set,[_],_,{bif,_,{f,0}}}=I|Is], Fail, Acc) ->
-%     split_block_2(Is, Fail, [I|Acc]);
-split_block_2([{set,[_],_,{bif,_,{f,Fail}}}=I|Is], Fail, Acc) ->
-    split_block_2(Is, Fail, [I|Acc]);
-split_block_2([{'%live',_}|Is], Fail, Acc) ->
-    split_block_2(Is, Fail, Acc);
-split_block_2(Is, _, Acc) -> {Acc,reverse(Is)}.
-
-dst_regs(Is) ->
-    dst_regs(Is, []).
-
-dst_regs([{block,Bl}|Is], Acc) ->
-    dst_regs(Bl, dst_regs(Is, Acc));
-dst_regs([{set,[D],_,{bif,_,{f,_}}}|Is], Acc) ->
-    dst_regs(Is, [D|Acc]);
-dst_regs([_|Is], Acc) ->
-    dst_regs(Is, Acc);
-dst_regs([], Acc) -> ordsets:from_list(Acc).
-
-all_killed([R|Rs], OldIs, St) ->
-    case is_killed(R, OldIs, St) of
- 	false -> false;
-	true -> all_killed(Rs, OldIs, St)
-    end;
-all_killed([], _, _) -> true.
-
-none_used([R|Rs], OldIs, St) ->
-    case is_not_used(R, OldIs, St) of
- 	false -> false;
-	true -> none_used(Rs, OldIs, St)
-    end;
-none_used([], _, _) -> true.
-
-bopt_tree(Block0) ->
-    Block = ssa_block(Block0),
-    Reg = free_variables(Block),
-    %%io:format("~p\n", [Block]),
-    %%io:format("~p\n", [Reg]),
-    Res = bopt_tree_1(Block, Reg, []),
-    %%io:format("~p\n", [Res]),
-    Res.
-
-bopt_tree_1([{set,[Dst],As0,{bif,'not',_}}|Is], Forest0, Pre) ->
-    {[Arg],Forest1} = bopt_bool_args(As0, Forest0),
-    Forest = gb_trees:enter(Dst, {'not',Arg}, Forest1),
-    bopt_tree_1(Is, Forest, Pre);
-bopt_tree_1([{set,[Dst],As0,{bif,'and',_}}|Is], Forest0, Pre) ->
-    {As,Forest1} = bopt_bool_args(As0, Forest0),
-    AndList = make_and_list(As),
-    Forest = gb_trees:enter(Dst, {'and',AndList}, Forest1),
-    bopt_tree_1(Is, Forest, Pre);
-bopt_tree_1([{set,[Dst],[L0,R0],{bif,'or',_}}|Is], Forest0, Pre) ->
-    L = gb_trees:get(L0, Forest0),
-    R = gb_trees:get(R0, Forest0),
-    Forest1 = gb_trees:delete(L0, gb_trees:delete(R0, Forest0)),
-    OrList = make_or_list([L,R]),
-    Forest = gb_trees:enter(Dst, {'or',OrList}, Forest1),
-    bopt_tree_1(Is, Forest, Pre);
-bopt_tree_1([{protected,[Dst],_,_}=Prot|Is], Forest0, Pre) ->
-    Forest = gb_trees:enter(Dst, Prot, Forest0),
-    bopt_tree_1(Is, Forest, Pre);    
-bopt_tree_1([{set,[Dst],As,{bif,N,_}}=Bif|Is], Forest0, Pre) ->
-    Ar = length(As),
-    case safe_bool_op(N, Ar) of
-	false ->
-	    bopt_good_args(As, Forest0),
-	    Forest = gb_trees:enter(Dst, any, Forest0),
-	    bopt_tree_1(Is, Forest, [Bif|Pre]);
-	true ->
-	    bopt_good_args(As, Forest0),
-	    Test = bif_to_test(Dst, N, As),
-	    Forest = gb_trees:enter(Dst, Test, Forest0),
-	    bopt_tree_1(Is, Forest, Pre)
-    end;
-bopt_tree_1([], Forest, Pre) ->
-    {Pre,[R || {_,V}=R <- gb_trees:to_list(Forest), V =/= any]}.
-
-safe_bool_op(internal_is_record, 3) -> true;
-safe_bool_op(N, Ar) ->
-    erl_internal:new_type_test(N, Ar) orelse erl_internal:comp_op(N, Ar).
-
-bopt_bool_args(As, Forest) ->
-    mapfoldl(fun bopt_bool_arg/2, Forest, As).
-
-bopt_bool_arg({T,_}=R, Forest) when T == x; T == y ->
-    {gb_trees:get(R, Forest),gb_trees:delete(R, Forest)};
-bopt_bool_arg(Term, Forest) ->
-    {Term,Forest}.
-
-bopt_good_args([A|As], Regs) ->
-    bopt_good_arg(A, Regs),
-    bopt_good_args(As, Regs);
-bopt_good_args([], _) -> ok.
-
-bopt_good_arg({x,_}=X, Regs) ->
-    case gb_trees:get(X, Regs) of
-	any -> ok;
-	_Other ->
-	    %%io:format("not any: ~p: ~p\n", [X,_Other]),
-	    exit(bad_contents)
-    end;
-bopt_good_arg(_, _) -> ok.
-
-bif_to_test(_, N, As) ->
-    bif_to_test(N, As).
-
-bif_to_test(internal_is_record, [_,_,_]=As) ->
-    {test,internal_is_record,fail,As};
-bif_to_test('=:=', As) -> {test,is_eq_exact,fail,As};
-bif_to_test('=/=', As) -> {test,is_ne_exact,fail,As};
-bif_to_test('==', As) -> {test,is_eq,fail,As};
-bif_to_test('/=', As) -> {test,is_ne,fail,As};
-bif_to_test('=<', [L,R]) -> {test,is_ge,fail,[R,L]};
-bif_to_test('>=', As) -> {test,is_ge,fail,As};
-bif_to_test('>', [L,R]) -> {test,is_lt,fail,[R,L]};
-bif_to_test('<', As) -> {test,is_lt,fail,As};
-bif_to_test(Name, [_]=As) ->
-    case erl_internal:new_type_test(Name, 1) of
-	false -> exit({bif_to_test,Name,As,failed});
-	true -> {test,Name,fail,As}
-    end.
-
-make_and_list([{'and',As}|Is]) ->
-    make_and_list(As++Is);
-make_and_list([I|Is]) ->
-    [I|make_and_list(Is)];
-make_and_list([]) -> [].
-
-make_or_list([{'or',As}|Is]) ->
-    make_or_list(As++Is);
-make_or_list([I|Is]) ->
-    [I|make_or_list(Is)];
-make_or_list([]) -> [].
-
-%% Code generation for a boolean tree.
-
-bopt_cg({'not',Arg}, Fail, Acc, St) ->
-    I = bopt_cg_not(Arg),
-    bopt_cg(I, Fail, Acc, St);
-bopt_cg({'and',As}, Fail, Acc, St) ->
-    bopt_cg_and(As, Fail, Acc, St);
-bopt_cg({'or',As}, Fail, Acc, St0) ->
-    {Succ,St} = new_label(St0),
-    bopt_cg_or(As, Succ, Fail, Acc, St);
-bopt_cg({test,is_tuple_element,fail,[Tmp,Tuple,RecordTag]}, Fail, Acc, St) ->
-    {[{test,is_eq_exact,{f,Fail},[Tmp,RecordTag]},
-      {get_tuple_element,Tuple,0,Tmp}|Acc],St};
-bopt_cg({inverted_test,is_tuple_element,fail,[Tmp,Tuple,RecordTag]}, Fail, Acc, St) ->
-    {[{test,is_ne_exact,{f,Fail},[Tmp,RecordTag]},
-      {get_tuple_element,Tuple,0,Tmp}|Acc],St};
-bopt_cg({test,N,fail,As}, Fail, Acc, St) ->
-    Test = {test,N,{f,Fail},As},
-    {[Test|Acc],St};
-bopt_cg({inverted_test,N,fail,As}, Fail, Acc, St0) ->
-    {Lbl,St} = new_label(St0),
-    {[{label,Lbl},{jump,{f,Fail}},{test,N,{f,Lbl},As}|Acc],St};
-bopt_cg({protected,_,Bl0,{_,_,_}}, Fail, Acc, St0) ->
-    {Bl,St} = bopt_block_1(Bl0, Fail, St0),
-    {Bl++Acc,St};
-bopt_cg([_|_]=And, Fail, Acc, St) ->
-    bopt_cg_and(And, Fail, Acc, St).
-
-bopt_cg_not({'and',As0}) ->
-    As = [bopt_cg_not(A) || A <- As0],
-    {'or',As};
-bopt_cg_not({'or',As0}) ->
-    As = [bopt_cg_not(A) || A <- As0],
-    {'and',As};
-bopt_cg_not({test,Test,Fail,As}) ->
-    {inverted_test,Test,Fail,As}.
-
-bopt_cg_and([{atom,false}|_], Fail, _, St) ->
-    {[{jump,{f,Fail}}],St};
-bopt_cg_and([{atom,true}|Is], Fail, Acc, St) ->
-    bopt_cg_and(Is, Fail, Acc, St);
-bopt_cg_and([I|Is], Fail, Acc0, St0) ->
-    {Acc,St} = bopt_cg(I, Fail, Acc0, St0),
-    bopt_cg_and(Is, Fail, Acc, St);
-bopt_cg_and([], _, Acc, St) -> {Acc,St}.
-
-bopt_cg_or([I], Succ, Fail, Acc0, St0) ->
-    {Acc,St} = bopt_cg(I, Fail, Acc0, St0),
-    {[{label,Succ}|Acc],St};
-bopt_cg_or([I|Is], Succ, Fail, Acc0, St0) ->
-    {Lbl,St1} = new_label(St0),
-    {Acc,St} = bopt_cg(I, Lbl, Acc0, St1),
-    bopt_cg_or(Is, Succ, Fail, [{label,Lbl},{jump,{f,Succ}}|Acc], St).
-    
-new_label(#st{next=LabelNum}=St) when is_integer(LabelNum) ->
-    {LabelNum,St#st{next=LabelNum+1}}.
-
-free_variables(Is) ->
-    E = gb_sets:empty(),
-    free_vars_1(Is, E, E).
-
-free_vars_1([{set,[Dst],As,{bif,_,_}}|Is], F0, N0) ->
-    F = gb_sets:union(F0, gb_sets:difference(var_list(As), N0)),
-    N = gb_sets:union(N0, var_list([Dst])),
-    free_vars_1(Is, F, N);
-free_vars_1([{protected,_,Pa,_}|Is], F, N) ->
-    free_vars_1(Pa++Is, F, N);
-free_vars_1([], F, _) ->
-    gb_trees:from_orddict([{K,any} || K <- gb_sets:to_list(F)]).
-
-var_list(Is) ->
-    var_list_1(Is, gb_sets:empty()).
-
-var_list_1([{x,_}=X|Is], D) ->
-    var_list_1(Is, gb_sets:add(X, D));
-var_list_1([_|Is], D) ->
-    var_list_1(Is, D);
-var_list_1([], D) -> D.
-
-%%%
-%%% Convert a block to Static Single Assignment (SSA) form.
-%%%
-
--record(ssa,
-	{live,
-	 sub}).
-	 
-ssa_block(Is0) ->
-    Next = ssa_first_free(Is0, 0),
-    {Is,_} = ssa_block_1(Is0, #ssa{live=Next,sub=gb_trees:empty()}, []),
-    Is.
-
-ssa_block_1([{protected,[_],Pa0,Pb}|Is], Sub0, Acc) ->
-    {Pa,Sub} = ssa_block_1(Pa0, Sub0, []),
-    Dst = ssa_last_target(Pa),
-    ssa_block_1(Is, Sub, [{protected,[Dst],Pa,Pb}|Acc]);
-ssa_block_1([{set,[Dst],As,Bif}|Is], Sub0, Acc0) ->
-    Sub1 = ssa_in_use_list(As, Sub0),
-    Sub = ssa_assign(Dst, Sub1),
-    Acc = [{set,[ssa_sub(Dst, Sub)],ssa_sub_list(As, Sub0),Bif}|Acc0],
-    ssa_block_1(Is, Sub, Acc);
-ssa_block_1([], Sub, Acc) -> {reverse(Acc),Sub}.
-
-ssa_in_use_list(As, Sub) ->
-    foldl(fun ssa_in_use/2, Sub, As).
-
-ssa_in_use({x,_}=R, #ssa{sub=Sub0}=Ssa) ->
-    case gb_trees:is_defined(R, Sub0) of
-	true -> Ssa;
-	false ->
-	    Sub = gb_trees:insert(R, R, Sub0),
-	    Ssa#ssa{sub=Sub}
-    end;
-ssa_in_use(_, Ssa) -> Ssa.
-
-ssa_assign({x,_}=R, #ssa{sub=Sub0}=Ssa0) ->
-    case gb_trees:is_defined(R, Sub0) of
-	false ->
-	    Sub = gb_trees:insert(R, R, Sub0),
-	    Ssa0#ssa{sub=Sub};
-	true ->
-	    {NewReg,Ssa} = ssa_new_reg(Ssa0),
-	    Sub1 = gb_trees:update(R, NewReg, Sub0),
-	    Sub = gb_trees:insert(NewReg, NewReg, Sub1),
-	    Ssa#ssa{sub=Sub}
-    end;
-ssa_assign(_, Ssa) -> Ssa.
-
-ssa_sub_list(List, Sub) ->
-    [ssa_sub(E, Sub) || E <- List].
-
-ssa_sub(R0, #ssa{sub=Sub}) ->
-    case gb_trees:lookup(R0, Sub) of
-	none -> R0;
-	{value,R} -> R
-    end.
-
-ssa_new_reg(#ssa{live=Reg}=Ssa) ->
-    {{x,Reg},Ssa#ssa{live=Reg+1}}.
-
-ssa_first_free([{protected,Ds,_,_}|Is], Next0) ->
-    Next = ssa_first_free_list(Ds, Next0),
-    ssa_first_free(Is, Next);
-ssa_first_free([{set,[Dst],As,_}|Is], Next0) ->
-    Next = ssa_first_free_list([Dst|As], Next0),
-    ssa_first_free(Is, Next);
-ssa_first_free([], Next) -> Next.
-
-ssa_first_free_list(Regs, Next) ->
-    foldl(fun({x,R}, N) when R >= N -> R+1;
-	     (_, N) -> N end, Next, Regs).
-
-ssa_last_target([{set,[Dst],_,_},{'%live',_}]) -> Dst;
-ssa_last_target([{set,[Dst],_,_}]) -> Dst;
-ssa_last_target([_|Is]) -> ssa_last_target(Is).
-    
-%% index_instructions(FunctionIs) -> GbTree([{Label,Is}])
-%%  Index the instruction sequence so that we can quickly
-%%  look up the instruction following a specific label.
-
-index_instructions(Is) ->
-    ii_1(Is, []).
-
-ii_1([{label,Lbl}|Is0], Acc) ->
-    Is = lists:dropwhile(fun({label,_}) -> true;
-			    (_) -> false end, Is0),
-    ii_1(Is0, [{Lbl,Is}|Acc]);
-ii_1([_|Is], Acc) ->
-    ii_1(Is, Acc);
-ii_1([], Acc) -> gb_trees:from_orddict(sort(Acc)).
-
-%% is_killed(Register, [Instruction], State) -> true|false
-%%  Determine whether a register is killed in the instruction sequence.
-%%  The state is used to allow us to determine the kill state
-%%  across branches.
-
-is_killed(R, Is, St) ->
-    case is_killed_1(R, Is, St) of
-	false ->
-	    %%io:format("nk ~p: ~P\n", [R,Is,15]),
-	    false;
-	true -> true
-    end.
-
-is_killed_1(R, [{block,Blk}|Is], St) ->
-    case is_killed_1(R, Blk, St) of
-	true -> true;
-	false -> is_killed_1(R, Is, St)
-    end;
-is_killed_1(R, [{test,_,{f,Fail},As}|Is], St) ->
-    case not member(R, As) andalso is_reg_killed_at(R, Fail, St) of
-	false -> false;
-	true -> is_killed_1(R, Is, St)
-    end;
-is_killed_1(R, [{select_val,R,_,_}|_], _) -> false;
-is_killed_1(R, [{select_val,_,Fail,{list,Branches}}|_], St) ->
-    is_killed_at_all(R, [Fail|Branches], St);
-is_killed_1(R, [{jump,{f,F}}|_], St) ->
-    is_reg_killed_at(R, F, St);
-is_killed_1(Reg, Is, _) ->
-    beam_block:is_killed(Reg, Is).
-
-is_reg_killed_at(R, Lbl, #st{ll=Ll}=St) ->
-    Is = gb_trees:get(Lbl, Ll),
-    is_killed_1(R, Is, St).
-
-is_killed_at_all(R, [{f,Lbl}|T], St) ->
-    case is_reg_killed_at(R, Lbl, St) of
-	false -> false;
-	true -> is_killed_at_all(R, T, St)
-    end;
-is_killed_at_all(R, [_|T], St) ->
-    is_killed_at_all(R, T, St);
-is_killed_at_all(_, [], _) -> true.
-
-%% is_not_used(Register, [Instruction], State) -> true|false
-%%  Determine whether a register is never used in the instruction sequence
-%%  (it could still referenced by an allocate instruction, meaning that
-%%  it MUST be initialized).
-%%    The state is used to allow us to determine the usage state
-%%  across branches.
-
-is_not_used(R, Is, St) ->
-    case is_not_used_1(R, Is, St) of
-	false ->
-	    %%io:format("used ~p: ~P\n", [R,Is,15]),
-	    false;
-	true -> true
-    end.
-
-is_not_used_1(R, [{block,Blk}|Is], St) ->
-    case is_not_used_1(R, Blk, St) of
-	true -> true;
-	false -> is_not_used_1(R, Is, St)
-    end;
-is_not_used_1(R, [{test,_,{f,Fail},As}|Is], St) ->
-    case not member(R, As) andalso is_reg_not_used_at(R, Fail, St) of
-	false -> false;
-	true -> is_not_used_1(R, Is, St)
-    end;
-is_not_used_1(R, [{select_val,R,_,_}|_], _) -> false;
-is_not_used_1(R, [{select_val,_,Fail,{list,Branches}}|_], St) ->
-    is_used_at_none(R, [Fail|Branches], St);
-is_not_used_1(R, [{jump,{f,F}}|_], St) ->
-    is_reg_not_used_at(R, F, St);
-is_not_used_1(Reg, Is, _) ->
-    beam_block:is_not_used(Reg, Is).
-
-is_reg_not_used_at(R, Lbl, #st{ll=Ll}=St) ->
-    Is = gb_trees:get(Lbl, Ll),
-    is_not_used_1(R, Is, St).
-
-is_used_at_none(R, [{f,Lbl}|T], St) ->
-    case is_reg_not_used_at(R, Lbl, St) of
-	false -> false;
-	true -> is_used_at_none(R, T, St)
-    end;
-is_used_at_none(R, [_|T], St) ->
-    is_used_at_none(R, T, St);
-is_used_at_none(_, [], _) -> true.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_clean.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_clean.erl
deleted file mode 100644
index d47ae9c896..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_clean.erl
+++ /dev/null
@@ -1,232 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: beam_clean.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
-%%
-%% Purpose : Clean up, such as removing unused labels and unused functions.
-
--module(beam_clean).
-
--export([module/2]).
--import(lists, [member/2,map/2,foldl/3,mapfoldl/3,reverse/1]).
-
-module({Mod,Exp,Attr,Fs0,_}, _Opt) ->
-    Order = [Lbl || {function,_,_,Lbl,_} <- Fs0],
-    All = foldl(fun({function,_,_,Lbl,_}=Func,D) -> dict:store(Lbl, Func, D) end,
-		dict:new(), Fs0),
-    {WorkList,Used0} = exp_to_labels(Fs0, Exp),
-    Used = find_all_used(WorkList, All, Used0),
-    Fs1 = remove_unused(Order, Used, All),
-    {Fs,Lc} = clean_labels(Fs1),
-    {ok,{Mod,Exp,Attr,Fs,Lc}}.
-
-%% Convert the export list ({Name,Arity} pairs) to a list of entry labels.
-
-exp_to_labels(Fs, Exp) -> exp_to_labels(Fs, Exp, [], sets:new()).
-    
-exp_to_labels([{function,Name,Arity,Lbl,_}|Fs], Exp, Acc, Used) ->
-    case member({Name,Arity}, Exp) of
-	true -> exp_to_labels(Fs, Exp, [Lbl|Acc], sets:add_element(Lbl, Used));
-	false -> exp_to_labels(Fs, Exp, Acc, Used)
-    end;
-exp_to_labels([], _, Acc, Used) -> {Acc,Used}.
-
-%% Remove the unused functions.
-
-remove_unused([F|Fs], Used, All) ->
-    case sets:is_element(F, Used) of
-	false -> remove_unused(Fs, Used, All);
-	true -> [dict:fetch(F, All)|remove_unused(Fs, Used, All)]
-    end;
-remove_unused([], _, _) -> [].
-	    
-%% Find all used functions.
-
-find_all_used([F|Fs0], All, Used0) ->
-    {function,_,_,_,Code} = dict:fetch(F, All),
-    {Fs,Used} = update_work_list(Code, {Fs0,Used0}),
-    find_all_used(Fs, All, Used);
-find_all_used([], _All, Used) -> Used.
-
-update_work_list([{call,_,{f,L}}|Is], Sets) ->
-    update_work_list(Is, add_to_work_list(L, Sets));
-update_work_list([{call_last,_,{f,L},_}|Is], Sets) ->
-    update_work_list(Is, add_to_work_list(L, Sets));
-update_work_list([{call_only,_,{f,L}}|Is], Sets) ->
-    update_work_list(Is, add_to_work_list(L, Sets));
-update_work_list([{make_fun,{f,L},_,_}|Is], Sets) ->
-    update_work_list(Is, add_to_work_list(L, Sets));
-update_work_list([{make_fun2,{f,L},_,_,_}|Is], Sets) ->
-    update_work_list(Is, add_to_work_list(L, Sets));
-update_work_list([_|Is], Sets) ->
-    update_work_list(Is, Sets);
-update_work_list([], Sets) -> Sets.
-
-add_to_work_list(F, {Fs,Used}=Sets) ->
-    case sets:is_element(F, Used) of
-	true -> Sets;
-	false -> {[F|Fs],sets:add_element(F, Used)}
-    end.
-
-
-%%%
-%%% Coalesce adjacent labels. Renumber all labels to eliminate gaps.
-%%% This cleanup will slightly reduce file size and slightly speed up loading.
-%%%
-%%% We also expand internal_is_record/3 to a sequence of instructions. It is done
-%%% here merely because this module will always be called even if optimization
-%%% is turned off. We don't want to do the expansion in beam_asm because we
-%%% want to see the expanded code in a .S file.
-%%%
-
--record(st, {lmap,				%Translation tables for labels.
-	     entry,				%Number of entry label.
-	     lc					%Label counter
-	     }).
-
-clean_labels(Fs0) ->
-    St0 = #st{lmap=dict:new(),lc=1},
-    {Fs1,#st{lmap=Lmap,lc=Lc}} = mapfoldl(fun function_renumber/2, St0, Fs0),
-    {map(fun(F) -> function_replace(F, Lmap) end, Fs1),Lc}.
-		
-function_renumber({function,Name,Arity,_Entry,Asm0}, St0) ->
-    {Asm,St} = renumber_labels(Asm0, [], St0),
-    {{function,Name,Arity,St#st.entry,Asm},St}.
-
-renumber_labels([{bif,internal_is_record,{f,_},
-		  [Term,Tag,{integer,Arity}],Dst}|Is], Acc, St) ->
-    ContLabel = 900000000+2*St#st.lc,
-    FailLabel = ContLabel+1,
-    Fail = {f,FailLabel},
-    Tmp = Dst,
-    renumber_labels([{test,is_tuple,Fail,[Term]},
-		     {test,test_arity,Fail,[Term,Arity]},
-		     {get_tuple_element,Term,0,Tmp},
-		     {test,is_eq_exact,Fail,[Tmp,Tag]},
-		     {move,{atom,true},Dst},
-		     {jump,{f,ContLabel}},
-		     {label,FailLabel},
-		     {move,{atom,false},Dst},
-		     {label,ContLabel}|Is], Acc, St);
-renumber_labels([{test,internal_is_record,{f,_}=Fail,
-		  [Term,Tag,{integer,Arity}]}|Is], Acc, St) ->
-    Tmp = {x,1023},
-    case Term of
-	{Reg,_} when Reg == x; Reg == y ->
-	    renumber_labels([{test,is_tuple,Fail,[Term]},
-			     {test,test_arity,Fail,[Term,Arity]},
-			     {get_tuple_element,Term,0,Tmp},
-			     {test,is_eq_exact,Fail,[Tmp,Tag]}|Is], Acc, St);
-	_ ->
-	    renumber_labels([{jump,Fail}|Is], Acc, St)
-    end;
-renumber_labels([{label,Old}|Is], [{label,New}|_]=Acc, #st{lmap=D0}=St) ->
-    D = dict:store(Old, New, D0),
-    renumber_labels(Is, Acc, St#st{lmap=D});
-renumber_labels([{label,Old}|Is], Acc, St0) ->
-    New = St0#st.lc,
-    D = dict:store(Old, New, St0#st.lmap),
-    renumber_labels(Is, [{label,New}|Acc], St0#st{lmap=D,lc=New+1});
-renumber_labels([{func_info,_,_,_}=Fi|Is], Acc, St0) ->
-    renumber_labels(Is, [Fi|Acc], St0#st{entry=St0#st.lc});
-renumber_labels([I|Is], Acc, St0) ->
-    renumber_labels(Is, [I|Acc], St0);
-renumber_labels([], Acc, St0) -> {Acc,St0}.
-
-function_replace({function,Name,Arity,Entry,Asm0}, Dict) ->
-    Asm = case catch replace(Asm0, [], Dict) of
-	      {'EXIT',_}=Reason ->
-		  exit(Reason);
-	      {error,{undefined_label,Lbl}=Reason} ->
-		  io:format("Function ~s/~w refers to undefined label ~w\n",
-			    [Name,Arity,Lbl]),
-		  exit(Reason);
-	      Asm1 when list(Asm1) -> Asm1
-	  end,
-    {function,Name,Arity,Entry,Asm}.
-
-replace([{test,Test,{f,Lbl},Ops}|Is], Acc, D) ->
-    replace(Is, [{test,Test,{f,label(Lbl, D)},Ops}|Acc], D);
-replace([{select_val,R,{f,Fail0},{list,Vls0}}|Is], Acc, D) ->
-    Vls1 = map(fun ({f,L}) -> {f,label(L, D)};
-		   (Other) -> Other end, Vls0),
-    Fail = label(Fail0, D),
-    case redundant_values(Vls1, Fail, []) of
-	[] ->
-	    %% Oops, no choices left. The loader will not accept that.
-	    %% Convert to a plain jump.
-	    replace(Is, [{jump,{f,Fail}}|Acc], D);
-	Vls ->
-	    replace(Is, [{select_val,R,{f,Fail},{list,Vls}}|Acc], D)
-    end;
-replace([{select_tuple_arity,R,{f,Fail},{list,Vls0}}|Is], Acc, D) ->
-    Vls = map(fun ({f,L}) -> {f,label(L, D)};
-		  (Other) -> Other end, Vls0),
-    replace(Is, [{select_tuple_arity,R,{f,label(Fail, D)},{list,Vls}}|Acc], D);
-replace([{'try',R,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{'try',R,{f,label(Lbl, D)}}|Acc], D);
-replace([{'catch',R,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{'catch',R,{f,label(Lbl, D)}}|Acc], D);
-replace([{jump,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{jump,{f,label(Lbl, D)}}|Acc], D);
-replace([{loop_rec,{f,Lbl},R}|Is], Acc, D) ->
-    replace(Is, [{loop_rec,{f,label(Lbl, D)},R}|Acc], D);
-replace([{loop_rec_end,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{loop_rec_end,{f,label(Lbl, D)}}|Acc], D);
-replace([{wait,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{wait,{f,label(Lbl, D)}}|Acc], D);
-replace([{wait_timeout,{f,Lbl},To}|Is], Acc, D) ->
-    replace(Is, [{wait_timeout,{f,label(Lbl, D)},To}|Acc], D);
-replace([{bif,Name,{f,Lbl},As,R}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bif,Name,{f,label(Lbl, D)},As,R}|Acc], D);
-replace([{call,Ar,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{call,Ar,{f,label(Lbl,D)}}|Acc], D);
-replace([{call_last,Ar,{f,Lbl},N}|Is], Acc, D) ->
-    replace(Is, [{call_last,Ar,{f,label(Lbl,D)},N}|Acc], D);
-replace([{call_only,Ar,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{call_only,Ar,{f,label(Lbl, D)}}|Acc], D);
-replace([{make_fun,{f,Lbl},U1,U2}|Is], Acc, D) ->
-    replace(Is, [{make_fun,{f,label(Lbl, D)},U1,U2}|Acc], D);
-replace([{make_fun2,{f,Lbl},U1,U2,U3}|Is], Acc, D) ->
-    replace(Is, [{make_fun2,{f,label(Lbl, D)},U1,U2,U3}|Acc], D);
-replace([{bs_init2,{f,Lbl},Sz,Words,R,F,Dst}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_init2,{f,label(Lbl, D)},Sz,Words,R,F,Dst}|Acc], D);
-replace([{bs_put_integer,{f,Lbl},Bits,Unit,Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_put_integer,{f,label(Lbl, D)},Bits,Unit,Fl,Val}|Acc], D);
-replace([{bs_put_binary,{f,Lbl},Bits,Unit,Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_put_binary,{f,label(Lbl, D)},Bits,Unit,Fl,Val}|Acc], D);
-replace([{bs_put_float,{f,Lbl},Bits,Unit,Fl,Val}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_put_float,{f,label(Lbl, D)},Bits,Unit,Fl,Val}|Acc], D);
-replace([{bs_final,{f,Lbl},R}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_final,{f,label(Lbl, D)},R}|Acc], D);
-replace([{bs_add,{f,Lbl},Src,Dst}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_add,{f,label(Lbl, D)},Src,Dst}|Acc], D);
-replace([{bs_bits_to_bytes,{f,Lbl},Bits,Dst}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_bits_to_bytes,{f,label(Lbl, D)},Bits,Dst}|Acc], D);
-replace([I|Is], Acc, D) ->
-    replace(Is, [I|Acc], D);
-replace([], Acc, _) -> Acc.
-
-label(Old, D) ->
-    case dict:find(Old, D) of
-	{ok,Val} -> Val;
-	error -> throw({error,{undefined_label,Old}})
-    end.
-	    
-redundant_values([_,{f,Fail}|Vls], Fail, Acc) ->
-    redundant_values(Vls, Fail, Acc);
-redundant_values([Val,Lbl|Vls], Fail, Acc) ->
-    redundant_values(Vls, Fail, [Lbl,Val|Acc]);
-redundant_values([], _, Acc) -> reverse(Acc).
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_dict.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_dict.erl
deleted file mode 100644
index ddab957704..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_dict.erl
+++ /dev/null
@@ -1,196 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: beam_dict.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
-%%
-%% Purpose : Maintain atom, import, and export tables for assembler.
-
--module(beam_dict).
-
--export([new/0, opcode/2, highest_opcode/1,
-	 atom/2, local/4, export/4, import/4, string/2, lambda/5,
-	 atom_table/1, local_table/1, export_table/1, import_table/1,
-	 string_table/1,lambda_table/1]).
-
--record(asm_dict,
-	{atoms = [],				% [{Index, Atom}]
-	 exports = [],				% [{F, A, Label}]
-	 locals = [],				% [{F, A, Label}]
-	 imports = [],				% [{Index, {M, F, A}]
-	 strings = [],				% Deep list of characters
-	 lambdas = [],				% [{...}]
-	 next_atom = 1,
-	 next_import = 0,
-	 string_offset = 0,
-	 highest_opcode = 0
-	}).
-
-new() ->
-    #asm_dict{}.
-
-%% Remembers highest opcode.
-
-opcode(Op, Dict) when Dict#asm_dict.highest_opcode > Op -> Dict;
-opcode(Op, Dict) -> Dict#asm_dict{highest_opcode=Op}.
-
-%% Returns the highest opcode encountered.
-
-highest_opcode(#asm_dict{highest_opcode=Op}) -> Op.
-
-%% Returns the index for an atom (adding it to the atom table if necessary).
-%%    atom(Atom, Dict) -> {Index, Dict'}
-
-atom(Atom, Dict) when atom(Atom) ->
-    NextIndex = Dict#asm_dict.next_atom,
-    case lookup_store(Atom, Dict#asm_dict.atoms, NextIndex) of
-	{Index, _, NextIndex} ->
-	    {Index, Dict};
-	{Index, Atoms, NewIndex} ->
-	    {Index, Dict#asm_dict{atoms=Atoms, next_atom=NewIndex}}
-    end.
-
-%% Remembers an exported function.
-%%    export(Func, Arity, Label, Dict) -> Dict'
-
-export(Func, Arity, Label, Dict0) when atom(Func), integer(Arity), integer(Label) ->
-    {Index, Dict1} = atom(Func, Dict0),
-    Dict1#asm_dict{exports = [{Index, Arity, Label}| Dict1#asm_dict.exports]}.
-
-%% Remembers a local function.
-%%    local(Func, Arity, Label, Dict) -> Dict'
-
-local(Func, Arity, Label, Dict0) when atom(Func), integer(Arity), integer(Label) ->
-    {Index,Dict1} = atom(Func, Dict0),
-    Dict1#asm_dict{locals = [{Index,Arity,Label}| Dict1#asm_dict.locals]}.
-
-%% Returns the index for an import entry (adding it to the import table if necessary).
-%%    import(Mod, Func, Arity, Dict) -> {Index, Dict'}
-
-import(Mod, Func, Arity, Dict) when atom(Mod), atom(Func), integer(Arity) ->
-    NextIndex = Dict#asm_dict.next_import,
-    case lookup_store({Mod, Func, Arity}, Dict#asm_dict.imports, NextIndex) of
-	{Index, _, NextIndex} ->
-	    {Index, Dict};
-	{Index, Imports, NewIndex} ->
-	    {_, D1} = atom(Mod, Dict#asm_dict{imports=Imports, next_import=NewIndex}),
-	    {_, D2} = atom(Func, D1),
-	    {Index, D2}
-    end.
-
-%% Returns the index for a string in the string table (adding the string to the
-%% table if necessary).
-%%    string(String, Dict) -> {Offset, Dict'}
-
-string(Str, Dict) when list(Str) ->
-    #asm_dict{strings = Strings, string_offset = NextOffset} = Dict,
-    case old_string(Str, Strings) of
-	{true, Offset} ->
-	    {Offset, Dict};
-	false ->
-	    NewDict = Dict#asm_dict{strings = Strings++Str,
-				    string_offset = NextOffset+length(Str)},
-	    {NextOffset, NewDict}
-    end.
-
-%% Returns the index for a funentry (adding it to the table if necessary).
-%%    lambda(Dict, Lbl, Index, Uniq, NumFree) -> {Index,Dict'}
-
-lambda(Lbl, Index, OldUniq, NumFree, #asm_dict{lambdas=Lambdas0}=Dict) ->
-    OldIndex = length(Lambdas0),
-    Lambdas = [{Lbl,{OldIndex,Lbl,Index,NumFree,OldUniq}}|Lambdas0],
-    {OldIndex,Dict#asm_dict{lambdas=Lambdas}}.
-
-%% Returns the atom table.
-%%    atom_table(Dict) -> [Length,AtomString...]
-
-atom_table(#asm_dict{atoms=Atoms, next_atom=NumAtoms}) ->
-    Sorted = lists:sort(Atoms),
-    Fun = fun({_, A}) ->
-		  L = atom_to_list(A),
-		  [length(L)|L]
-	  end,
-    {NumAtoms-1, lists:map(Fun, Sorted)}.
-
-%% Returns the table of local functions.
-%%    local_table(Dict) -> {NumLocals, [{Function, Arity, Label}...]}
-
-local_table(#asm_dict{locals = Locals}) ->
-    {length(Locals),Locals}.
-
-%% Returns the export table.
-%%    export_table(Dict) -> {NumExports, [{Function, Arity, Label}...]}
-
-export_table(#asm_dict{exports = Exports}) ->
-    {length(Exports), Exports}.
-
-%% Returns the import table.
-%%    import_table(Dict) -> {NumImports, [{Module, Function, Arity}...]}
-
-import_table(Dict) ->
-    #asm_dict{imports = Imports, next_import = NumImports} = Dict,
-    Sorted = lists:sort(Imports),
-    Fun = fun({_, {Mod, Func, Arity}}) ->
-		  {Atom0, _} = atom(Mod, Dict),
-		  {Atom1, _} = atom(Func, Dict),
-		  {Atom0, Atom1, Arity}
-	  end,
-    {NumImports, lists:map(Fun, Sorted)}.
-
-string_table(#asm_dict{strings = Strings, string_offset = Size}) ->
-    {Size, Strings}.
-
-lambda_table(#asm_dict{locals=Loc0,lambdas=Lambdas0}) ->
-    Lambdas1 = sofs:relation(Lambdas0),
-    Loc = sofs:relation([{Lbl,{F,A}} || {F,A,Lbl} <- Loc0]),
-    Lambdas2 = sofs:relative_product1(Lambdas1, Loc),
-    Lambdas = [<<F:32,A:32,Lbl:32,Index:32,NumFree:32,OldUniq:32>> ||
-		  {{_,Lbl,Index,NumFree,OldUniq},{F,A}} <- sofs:to_external(Lambdas2)],
-    {length(Lambdas),Lambdas}.
-
-%%% Local helper functions.
-
-lookup_store(Key, Dict, NextIndex) ->
-    case catch lookup_store1(Key, Dict, NextIndex) of
-	Index when integer(Index) ->
-	    {Index, Dict, NextIndex};
-	{Index, NewDict} ->
-	    {Index, NewDict, NextIndex+1}
-    end.
-
-lookup_store1(Key, [Pair|Dict], NextIndex) when Key > element(2, Pair) ->
-    {Index, NewDict} = lookup_store1(Key, Dict, NextIndex),
-    {Index, [Pair|NewDict]};
-lookup_store1(Key, [{Index, Key}|_Dict], _NextIndex) ->
-    throw(Index);
-lookup_store1(Key, Dict, NextIndex) ->
-    {NextIndex, [{NextIndex, Key}|Dict]}.
-
-%% Search for string Str in the string pool Pool.
-%%   old_string(Str, Pool) -> false | {true, Offset}
-
-old_string(Str, Pool) ->
-    old_string(Str, Pool, 0).
-
-old_string([C|Str], [C|Pool], Index) ->
-    case lists:prefix(Str, Pool) of
-	true ->
-	    {true, Index};
-	false ->
-	    old_string([C|Str], Pool, Index+1)
-    end;
-old_string(Str, [_|Pool], Index) ->
-    old_string(Str, Pool, Index+1);
-old_string(_Str, [], _Index) ->
-    false.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_disasm.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_disasm.erl
deleted file mode 100644
index 451b83db66..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_disasm.erl
+++ /dev/null
@@ -1,964 +0,0 @@
-%% -*- erlang-indent-level: 4 -*-
-%%=======================================================================
-%% File        : beam_disasm.erl
-%% Author      : Kostis Sagonas
-%% Description : Disassembles an R5-R10 .beam file into symbolic BEAM code
-%%=======================================================================
-%% $Id: beam_disasm.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
-%%=======================================================================
-%% Notes:
-%%   1. It does NOT work for .beam files of previous BEAM versions.
-%%   2. If handling of new BEAM instructions is needed, this should be 
-%%      inserted at the end of function resolve_inst().
-%%=======================================================================
-
--module(beam_disasm).
-
--export([file/1, format_error/1]).
-
--author("Kostis Sagonas").
-
--include("beam_opcodes.hrl").
-
-%%-----------------------------------------------------------------------
-
--define(NO_DEBUG(Str,Xs),ok).
--define(DEBUG(Str,Xs),io:format(Str,Xs)).
--define(exit(Reason),exit({?MODULE,?LINE,Reason})).
-
-%%-----------------------------------------------------------------------
-%% Error information
-
-format_error({error, Module, Error}) ->
-    Module:format_error(Error);
-format_error({internal, Error}) ->
-    io_lib:format("~p: disassembly failed with reason ~P.",
-		  [?MODULE, Error, 25]).
-
-%%-----------------------------------------------------------------------
-%% The main exported function
-%%   File is either a file name or a binary containing the code.
-%%   Returns `{beam_file, [...]}' or `{error, Module, Reason}'.
-%%   Call `format_error({error, Module, Reason})' for an error string.
-%%-----------------------------------------------------------------------
-
-file(File) ->
-    case beam_lib:info(File) of
-	Info when list(Info) ->
-	    {value,{chunks,Chunks}} = lists:keysearch(chunks,1,Info),
-	    case catch process_chunks(File, Chunks) of
-		{'EXIT', Error} ->
-		    {error, ?MODULE, {internal, Error}};
-		Result ->
-		    Result
-	    end;
-	Error ->
-	    Error
-    end.
-
-%%-----------------------------------------------------------------------
-%% Interface might need to be revised -- do not depend on it.
-%%-----------------------------------------------------------------------
-
-process_chunks(F,ChunkInfoList) ->
-    {ok,{_,Chunks}} = beam_lib:chunks(F, ["Atom","Code","StrT","ImpT","ExpT"]),
-    [{"Atom",AtomBin},{"Code",CodeBin},{"StrT",StrBin},
-     {"ImpT",ImpBin},{"ExpT",ExpBin}] = Chunks,
-    LambdaBin = optional_chunk(F, "FunT", ChunkInfoList),
-    LocBin = optional_chunk(F, "LocT", ChunkInfoList),
-    AttrBin = optional_chunk(F, "Attr", ChunkInfoList),
-    CompBin = optional_chunk(F, "CInf", ChunkInfoList),
-    Atoms = beam_disasm_atoms(AtomBin),
-    Exports = beam_disasm_exports(ExpBin, Atoms),
-    Imports = beam_disasm_imports(ImpBin, Atoms),
-    LocFuns = beam_disasm_exports(LocBin, Atoms),
-    Lambdas = beam_disasm_lambdas(LambdaBin, Atoms),
-    Str = beam_disasm_strings(StrBin),
-    Str1 = binary_to_list(Str),  %% for debugging -- use Str as far as poss.
-    Sym_Code = beam_disasm_code(CodeBin,Atoms,Imports,Str,Lambdas),
-    Attributes = beam_disasm_attributes(AttrBin),
-    CompInfo = beam_disasm_compilation_info(CompBin),
-    All = [{exports,Exports},
-	   {imports,Imports},
-	   {code,Sym_Code},
-	   {atoms,Atoms},
-	   {local_funs,LocFuns},
-	   {strings,Str1},
-	   {attributes,Attributes},
-	   {comp_info,CompInfo}],
-    {beam_file,[Item || {_Key,Data}=Item <- All, Data =/= none]}.
-
-%%-----------------------------------------------------------------------
-%% Retrieve an optional chunk or none if the chunk doesn't exist.
-%%-----------------------------------------------------------------------
-
-optional_chunk(F, ChunkTag, ChunkInfo) ->
-    case lists:keymember(ChunkTag, 1, ChunkInfo) of
-	true ->
-	    {ok,{_,[{ChunkTag,Chunk}]}} = beam_lib:chunks(F, [ChunkTag]),
-	    Chunk;
-	false -> none
-    end.
-
-%%-----------------------------------------------------------------------
-%% UTILITIES -- these actually exist in file "beam_lib"
-%%           -- they should be moved into a common utils file.
-%%-----------------------------------------------------------------------
-
-i32([X1,X2,X3,X4]) ->
-    (X1 bsl 24) bor (X2 bsl 16) bor (X3 bsl 8) bor X4.
-
-get_int(B) ->
-    {I, B1} = split_binary(B, 4),
-    {i32(binary_to_list(I)), B1}.
-
-%%-----------------------------------------------------------------------
-%% Disassembles the atom table of a BEAM file.
-%% - atoms are stored in order 1 ... N (N = Num_atoms, in fact),
-%% - each atom name consists of a length byte, followed by that many
-%%   bytes of name
-%% (nb: atom names max 255 chars?!)
-%%-----------------------------------------------------------------------
-
-beam_disasm_atoms(AtomTabBin) ->
-    {_NumAtoms,B} = get_int(AtomTabBin),
-    disasm_atoms(B).
-
-disasm_atoms(AtomBin) ->
-    disasm_atoms(binary_to_list(AtomBin),1).
-
-disasm_atoms([Len|Xs],N) ->
-    {AtomName,Rest} = get_atom_name(Len,Xs),
-    [{N,list_to_atom(AtomName)}|disasm_atoms(Rest,N+1)];
-disasm_atoms([],_) ->
-    [].
-
-get_atom_name(Len,Xs) ->
-    get_atom_name(Len,Xs,[]).
-
-get_atom_name(N,[X|Xs],RevName) when N > 0 ->
-    get_atom_name(N-1,Xs,[X|RevName]);
-get_atom_name(0,Xs,RevName) ->
-    { lists:reverse(RevName), Xs }.
-
-%%-----------------------------------------------------------------------
-%% Disassembles the export table of a BEAM file.
-%%-----------------------------------------------------------------------
-
-beam_disasm_exports(none, _) -> none;
-beam_disasm_exports(ExpTabBin, Atoms) ->
-    {_NumAtoms,B} = get_int(ExpTabBin),
-    disasm_exports(B,Atoms).
-
-disasm_exports(Bin,Atoms) ->
-    resolve_exports(collect_exports(binary_to_list(Bin)),Atoms).
-
-collect_exports([F3,F2,F1,F0,A3,A2,A1,A0,L3,L2,L1,L0|Exps]) ->
-    [{i32([F3,F2,F1,F0]),  % F = function (atom ID)
-      i32([A3,A2,A1,A0]),  % A = arity (int)
-      i32([L3,L2,L1,L0])}  % L = label (int)
-     |collect_exports(Exps)];
-collect_exports([]) ->
-    [].
-
-resolve_exports(Exps,Atoms) ->
-    [ {lookup_key(F,Atoms), A, L} || {F,A,L} <- Exps ].
-
-%%-----------------------------------------------------------------------
-%% Disassembles the import table of a BEAM file.
-%%-----------------------------------------------------------------------
-
-beam_disasm_imports(ExpTabBin,Atoms) ->
-    {_NumAtoms,B} = get_int(ExpTabBin),
-    disasm_imports(B,Atoms).
-
-disasm_imports(Bin,Atoms) ->
-    resolve_imports(collect_imports(binary_to_list(Bin)),Atoms).
-
-collect_imports([M3,M2,M1,M0,F3,F2,F1,F0,A3,A2,A1,A0|Exps]) ->
-    [{i32([M3,M2,M1,M0]),  % M = module (atom ID)
-      i32([F3,F2,F1,F0]),  % F = function (atom ID)
-      i32([A3,A2,A1,A0])}  % A = arity (int)
-     |collect_imports(Exps)];
-collect_imports([]) ->
-    [].
-
-resolve_imports(Exps,Atoms) ->
-    [{extfunc,lookup_key(M,Atoms),lookup_key(F,Atoms),A} || {M,F,A} <- Exps ].
-
-%%-----------------------------------------------------------------------
-%% Disassembles the lambda (fun) table of a BEAM file.
-%%-----------------------------------------------------------------------
-
-beam_disasm_lambdas(none, _) -> none;
-beam_disasm_lambdas(<<_:32,Tab/binary>>, Atoms) ->
-    disasm_lambdas(Tab, Atoms, 0).
-
-disasm_lambdas(<<F:32,A:32,Lbl:32,Index:32,NumFree:32,OldUniq:32,More/binary>>,
-	       Atoms, OldIndex) ->
-    Info = {lookup_key(F, Atoms),A,Lbl,Index,NumFree,OldUniq},
-    [{OldIndex,Info}|disasm_lambdas(More, Atoms, OldIndex+1)];
-disasm_lambdas(<<>>, _, _) -> [].
-
-%%-----------------------------------------------------------------------
-%% Disassembles the code chunk of a BEAM file:
-%%   - The code is first disassembled into a long list of instructions.
-%%   - This list is then split into functions and all names are resolved.
-%%-----------------------------------------------------------------------
-
-beam_disasm_code(CodeBin,Atoms,Imports,Str,Lambdas) ->
-    [_SS3,_SS2,_SS1,_SS0,  % Sub-Size (length of information before code)
-     _IS3,_IS2,_IS1,_IS0,  % Instruction Set Identifier (always 0)
-     _OM3,_OM2,_OM1,_OM0,  % Opcode Max
-     _L3,_L2,_L1,_L0,_F3,_F2,_F1,_F0|Code] = binary_to_list(CodeBin),
-    case catch disasm_code(Code, Atoms) of
-	{'EXIT',Rsn} ->
-	    ?NO_DEBUG('code disasm failed: ~p~n',[Rsn]),
-	    ?exit(Rsn);
-	DisasmCode ->
-	    Functions = get_function_chunks(DisasmCode),
-	    LocLabels = local_labels(Functions),
-	    [resolve_names(F,Imports,Str,LocLabels,Lambdas) || F <- Functions]
-    end.
-
-%%-----------------------------------------------------------------------
-
-disasm_code([B|Bs], Atoms) ->
-    {Instr,RestBs} = disasm_instr(B, Bs, Atoms),
-    [Instr|disasm_code(RestBs, Atoms)];
-disasm_code([], _) -> [].
-
-%%-----------------------------------------------------------------------
-%% Splits the code stream into chunks representing the code of functions.
-%%
-%% NOTE: code actually looks like
-%%   label L1: ... label Ln:
-%%     func_info ...
-%%   label entry:
-%%     ...
-%%     <on failure, use label Li to show where things died>
-%%     ...
-%% So the labels before each func_info should be included as well.
-%% Ideally, only one such label is needed, but the BEAM compiler
-%% before R8 didn't care to remove the redundant ones.
-%%-----------------------------------------------------------------------
-
-get_function_chunks([I|Code]) ->
-    {LastI,RestCode,Labs} = split_head_labels(I,Code,[]),
-    get_funs(LastI,RestCode,Labs,[]);
-get_function_chunks([]) ->
-    ?exit(empty_code_segment).
-
-get_funs(PrevI,[I|Is],RevF,RevFs) ->
-    case I of
-	{func_info,_Info} ->
-	    [H|T] = RevF,
-	    {Last,Fun,TrailingLabels} = split_head_labels(H,T,[]),
-	    get_funs(I, Is, [PrevI|TrailingLabels], add_funs([Last|Fun],RevFs));
-	_ ->
-	    get_funs(I, Is, [PrevI|RevF], RevFs)
-    end;
-get_funs(PrevI,[],RevF,RevFs) ->
-    case PrevI of
-	{int_code_end,[]} ->
-	    emit_funs(add_fun(RevF,RevFs));
-	_ ->
-	    ?DEBUG('warning: code segment did not end with int_code_end~n',[]),
-            emit_funs(add_funs([PrevI|RevF],RevFs))
-    end.
-
-split_head_labels({label,L},[I|Code],Labs) ->
-    split_head_labels(I,Code,[{label,L}|Labs]);
-split_head_labels(I,Code,Labs) ->
-    {I,Code,Labs}.
-
-add_fun([],Fs) ->
-    Fs;
-add_fun(F,Fs) ->
-    add_funs(F,Fs).
-
-add_funs(F,Fs) ->
-    [ lists:reverse(F) | Fs ].
-
-emit_funs(Fs) ->
-    lists:reverse(Fs).
-
-%%-----------------------------------------------------------------------
-%% Collects local labels -- I am not sure this is 100% what is needed.
-%%-----------------------------------------------------------------------
-
-local_labels(Funs) ->
-    [local_label(Fun) || Fun <- Funs].
-
-%% The first clause below attempts to provide some (limited form of)
-%% backwards compatibility; it is not needed for .beam files generated
-%% by the R8 compiler.  The clause should one fine day be taken out.
-local_label([{label,_},{label,L}|Code]) ->
-    local_label([{label,L}|Code]);
-local_label([{label,_},
-	     {func_info,[M0,F0,{u,A}]},
-	     {label,[{u,L1}]}|_]) ->
-    {atom,M} = resolve_arg(M0),
-    {atom,F} = resolve_arg(F0),
-    {L1, {M, F, A}};
-local_label(Code) ->
-    io:format('beam_disasm: no label in ~p~n', [Code]),
-    {-666,{none,none,0}}.
-
-%%-----------------------------------------------------------------------
-%% Disassembles a single BEAM instruction; most instructions are handled
-%% in a generic way; indexing instructions are handled separately.
-%%-----------------------------------------------------------------------
-
-disasm_instr(B, Bs, Atoms) ->
-    {SymOp,Arity} = beam_opcodes:opname(B),
-    case SymOp of
-	select_val ->
-	    disasm_select_inst(select_val, Bs, Atoms);
-	select_tuple_arity ->
-	    disasm_select_inst(select_tuple_arity, Bs, Atoms);
-	_ ->
-	    case catch decode_n_args(Arity, Bs, Atoms) of
-		{'EXIT',Rsn} ->
-		    ?NO_DEBUG("decode_n_args(~p,~p) failed~n",[Arity,Bs]),
-		    {{'EXIT',{SymOp,Arity,Rsn}},[]};
-		{Args,RestBs} ->
-		    ?NO_DEBUG("instr ~p~n",[{SymOp,Args}]),
-		    {{SymOp,Args}, RestBs}
-	    end
-    end.
-
-%%-----------------------------------------------------------------------
-%% Disassembles a BEAM select_* instruction used for indexing.
-%%   Currently handles {select_val,3} and {select_tuple_arity,3} insts.
-%%
-%%   The arruments of a "select"-type instruction look as follows:
-%%       <reg>, {f,FailLabel}, {list, <num cases>, [<case1> ... <caseN>]}
-%%   where each case is of the form [symbol,{f,Label}].
-%%-----------------------------------------------------------------------
-
-disasm_select_inst(Inst, Bs, Atoms) ->
-    {X, Bs1} = decode_arg(Bs, Atoms),
-    {F, Bs2} = decode_arg(Bs1, Atoms),
-    {Z, Bs3} = decode_arg(Bs2, Atoms),
-    {U, Bs4} = decode_arg(Bs3, Atoms),
-    {u,Len} = U,
-    {List, RestBs} = decode_n_args(Len, Bs4, Atoms),
-    {{Inst,[X,F,{Z,U,List}]},RestBs}.
-
-%%-----------------------------------------------------------------------
-%% decode_arg([Byte]) -> { Arg, [Byte] }
-%%
-%% - an arg can have variable length, so we must return arg + remaining bytes
-%% - decodes an argument into its 'raw' form: { Tag, Value }
-%%   several types map to a single tag, so the byte code instr must then
-%%   assign a type to it
-%%-----------------------------------------------------------------------
-
-decode_arg([B|Bs]) ->
-    Tag = decode_tag(B band 2#111),
-    ?NO_DEBUG('Tag = ~p, B = ~p, Bs = ~p~n',[Tag,B,Bs]),
-    case Tag of
-	z ->
-	    decode_z_tagged(Tag, B, Bs);
-	_ ->
-	    %% all other cases are handled as if they were integers
-	    decode_int(Tag, B, Bs)
-    end.
-
-decode_arg([B|Bs0], Atoms) ->
-    Tag = decode_tag(B band 2#111),
-    ?NO_DEBUG('Tag = ~p, B = ~p, Bs = ~p~n',[Tag,B,Bs]),
-    case Tag of
-	z ->
-	    decode_z_tagged(Tag, B, Bs0);
-	a ->
-	    %% atom or nil
-	    case decode_int(Tag, B, Bs0) of
-		{{a,0},Bs} -> {nil,Bs};
-		{{a,I},Bs} -> {{atom,lookup_key(I, Atoms)},Bs}
-	    end;
-	_ ->
-	    %% all other cases are handled as if they were integers
-	    decode_int(Tag, B, Bs0)
-    end.
-
-%%-----------------------------------------------------------------------
-%% Decodes an integer value.  Handles positives, negatives, and bignums.
-%%
-%% Tries to do the opposite of:
-%%   beam_asm:encode(1, 5) =            [81]
-%%   beam_asm:encode(1, 1000) =         [105,232]
-%%   beam_asm:encode(1, 2047) =         [233,255]
-%%   beam_asm:encode(1, 2048) =         [25,8,0]
-%%   beam_asm:encode(1,-1) =            [25,255,255]
-%%   beam_asm:encode(1,-4294967295) =   [121,255,0,0,0,1]
-%%   beam_asm:encode(1, 4294967295) =   [121,0,255,255,255,255]
-%%   beam_asm:encode(1, 429496729501) = [121,99,255,255,255,157]
-%%-----------------------------------------------------------------------
-
-decode_int(Tag,B,Bs) when (B band 16#08) == 0 ->
-    %% N < 16 = 4 bits, NNNN:0:TTT
-    N = B bsr 4,
-    {{Tag,N},Bs};
-decode_int(Tag,B,Bs) when (B band 16#10) == 0 ->
-    %% N < 2048 = 11 bits = 3:8 bits, NNN:01:TTT, NNNNNNNN
-    [B1|Bs1] = Bs,
-    Val0 = B band 2#11100000,
-    N = (Val0 bsl 3) bor B1,
-    ?NO_DEBUG('NNN:01:TTT, NNNNNNNN = ~n~p:01:~p, ~p = ~p~n', [Val0,Tag,B,N]),
-    {{Tag,N},Bs1};
-decode_int(Tag,B,Bs) ->
-    {Len,Bs1} = decode_int_length(B,Bs),
-    {IntBs,RemBs} = take_bytes(Len,Bs1),
-    N = build_arg(IntBs),
-    [F|_] = IntBs,
-    Num = if F > 127, Tag == i -> decode_negative(N,Len);
-	     true -> N
-	  end,
-    ?NO_DEBUG('Len = ~p, IntBs = ~p, Num = ~p~n', [Len,IntBs,Num]),
-    {{Tag,Num},RemBs}.
-
-decode_int_length(B,Bs) ->
-    %% The following imitates get_erlang_integer() in beam_load.c
-    %% Len is the size of the integer value in bytes
-    case B bsr 5 of
-	7 ->
-	    {Arg,ArgBs} = decode_arg(Bs),
-	    case Arg of
-		{u,L} ->
-		    {L+9,ArgBs};  % 9 stands for 7+2
-		_ -> 
-		    ?exit({decode_int,weird_bignum_sublength,Arg})
-	    end;
-	L ->
-	    {L+2,Bs}
-    end.
-    
-decode_negative(N,Len) ->
-    N - (1 bsl (Len*8)). % 8 is number of bits in a byte
-
-%%-----------------------------------------------------------------------
-%% Decodes lists and floating point numbers.
-%%-----------------------------------------------------------------------
-
-decode_z_tagged(Tag,B,Bs) when (B band 16#08) == 0 ->
-    N = B bsr 4,
-    case N of
-	0 -> % float
-	    decode_float(Bs);
-	1 -> % list
-	    {{Tag,N},Bs};
-	2 -> % fr
-	    decode_fr(Bs);
-	3 -> % allocation list
-	    decode_alloc_list(Bs);
-	_ ->
-	    ?exit({decode_z_tagged,{invalid_extended_tag,N}})
-    end;
-decode_z_tagged(_,B,_) ->
-    ?exit({decode_z_tagged,{weird_value,B}}).
-
-decode_float(Bs) ->
-    {FL,RestBs} = take_bytes(8,Bs),
-    <<Float:64/float>> = list_to_binary(FL),
-    {{float,Float},RestBs}.
-
-decode_fr(Bs) ->
-    {{u,Fr},RestBs} = decode_arg(Bs),
-    {{fr,Fr},RestBs}.
-
-decode_alloc_list(Bs) ->
-    {{u,N},RestBs} = decode_arg(Bs),
-    decode_alloc_list_1(N, RestBs, []).
-
-decode_alloc_list_1(0, RestBs, Acc) ->
-    {{u,{alloc,lists:reverse(Acc)}},RestBs};
-decode_alloc_list_1(N, Bs0, Acc) ->
-    {{u,Type},Bs1} = decode_arg(Bs0),
-    {{u,Val},Bs} = decode_arg(Bs1),
-    case Type of
-	0 ->
-	    decode_alloc_list_1(N-1, Bs, [{words,Val}|Acc]);
-	1 ->
-	    decode_alloc_list_1(N-1, Bs, [{floats,Val}|Acc])
-    end.
-
-%%-----------------------------------------------------------------------
-%% take N bytes from a stream, return { Taken_bytes, Remaining_bytes }
-%%-----------------------------------------------------------------------
-
-take_bytes(N,Bs) ->
-    take_bytes(N,Bs,[]).
-
-take_bytes(N,[B|Bs],Acc) when N > 0 ->
-    take_bytes(N-1,Bs,[B|Acc]);
-take_bytes(0,Bs,Acc) ->
-    { lists:reverse(Acc), Bs }.
-
-%%-----------------------------------------------------------------------
-%% from a list of bytes Bn,Bn-1,...,B1,B0
-%% build  (Bn << 8*n) bor ... bor B1 << 8 bor B0 << 0
-%%-----------------------------------------------------------------------
-
-build_arg(Bs) ->
-    build_arg(Bs,0).
-
-build_arg([B|Bs],N) ->
-    build_arg(Bs, (N bsl 8) bor B);
-build_arg([],N) ->
-    N.
-
-%%-----------------------------------------------------------------------
-%% Decodes a bunch of arguments and returns them in a list
-%%-----------------------------------------------------------------------
-
-decode_n_args(N, Bs, Atoms) when N >= 0 ->
-    decode_n_args(N, [], Bs, Atoms).
-
-decode_n_args(N, Acc, Bs0, Atoms) when N > 0 ->
-    {A1,Bs} = decode_arg(Bs0, Atoms),
-    decode_n_args(N-1, [A1|Acc], Bs, Atoms);
-decode_n_args(0, Acc, Bs, _) ->
-    {lists:reverse(Acc),Bs}.
-
-%%-----------------------------------------------------------------------
-%% Convert a numeric tag value into a symbolic one
-%%-----------------------------------------------------------------------
-
-decode_tag(?tag_u) -> u;
-decode_tag(?tag_i) -> i;
-decode_tag(?tag_a) -> a;
-decode_tag(?tag_x) -> x;
-decode_tag(?tag_y) -> y;
-decode_tag(?tag_f) -> f;
-decode_tag(?tag_h) -> h;
-decode_tag(?tag_z) -> z;
-decode_tag(X) -> ?exit({unknown_tag,X}).
-
-%%-----------------------------------------------------------------------
-%% - replace all references {a,I} with the atom with index I (or {atom,A})
-%% - replace all references to {i,K} in an external call position with
-%%    the proper MFA (position in list, first elt = 0, yields MFA to use)
-%% - resolve strings, represented as <offset, length>, into their
-%%   actual values by using string table
-%%    (note: string table should be passed as a BINARY so that we can
-%%    use binary_to_list/3!)
-%% - convert instruction to its readable form ...
-%% 
-%% Currently, only the first three are done (systematically, at least).
-%%
-%% Note: It MAY be premature to remove the lists of args, since that
-%%  representation means it is simpler to iterate over all args, etc.
-%%-----------------------------------------------------------------------
-
-resolve_names(Fun, Imports, Str, Lbls, Lambdas) ->
-    [resolve_inst(Instr, Imports, Str, Lbls, Lambdas) || Instr <- Fun].
-
-%%
-%% New make_fun2/4 instruction added in August 2001 (R8).
-%% We handle it specially here to avoid adding an argument to
-%% the clause for every instruction.
-%%
-
-resolve_inst({make_fun2,Args},_,_,Lbls,Lambdas) ->
-    [OldIndex] = resolve_args(Args),
-    {value,{OldIndex,{F,A,_Lbl,_Index,NumFree,OldUniq}}} =
-	lists:keysearch(OldIndex, 1, Lambdas),
-    [{_,{M,_,_}}|_] = Lbls,			% Slighly kludgy.
-    {make_fun2,{M,F,A},OldIndex,OldUniq,NumFree};
-resolve_inst(Instr, Imports, Str, Lbls, _Lambdas) ->
-    resolve_inst(Instr, Imports, Str, Lbls).
-
-resolve_inst({label,[{u,L}]},_,_,_) ->
-    {label,L};
-resolve_inst({func_info,RawMFA},_,_,_) ->
-    {func_info,resolve_args(RawMFA)};
-% resolve_inst(int_code_end,_,_,_,_) ->  % instruction already handled
-%    int_code_end;                       % should not really be handled here
-resolve_inst({call,[{u,N},{f,L}]},_,_,Lbls) ->
-    {call,N,catch lookup_key(L,Lbls)};
-resolve_inst({call_last,[{u,N},{f,L},{u,U}]},_,_,Lbls) ->
-    {call_last,N,catch lookup_key(L,Lbls),U};
-resolve_inst({call_only,[{u,N},{f,L}]},_,_,Lbls) ->
-    {call_only,N,catch lookup_key(L,Lbls)};
-resolve_inst({call_ext,[{u,N},{u,MFAix}]},Imports,_,_) ->
-    {call_ext,N,catch lists:nth(MFAix+1,Imports)};
-resolve_inst({call_ext_last,[{u,N},{u,MFAix},{u,X}]},Imports,_,_) ->
-    {call_ext_last,N,catch lists:nth(MFAix+1,Imports),X};
-resolve_inst({bif0,Args},Imports,_,_) ->
-    [Bif,Reg] = resolve_args(Args),
-    {extfunc,_Mod,BifName,_Arity} = lists:nth(Bif+1,Imports),
-    %?NO_DEBUG('bif0(~p, ~p)~n',[BifName,Reg]),
-    {bif,BifName,nofail,[],Reg};
-resolve_inst({bif1,Args},Imports,_,_) ->
-    [F,Bif,A1,Reg] = resolve_args(Args),
-    {extfunc,_Mod,BifName,_Arity} = lists:nth(Bif+1,Imports),
-    %?NO_DEBUG('bif1(~p, ~p, ~p, ~p, ~p)~n',[Bif,BifName,F,[A1],Reg]),
-    {bif,BifName,F,[A1],Reg};
-resolve_inst({bif2,Args},Imports,_,_) ->
-    [F,Bif,A1,A2,Reg] = resolve_args(Args),
-    {extfunc,_Mod,BifName,_Arity} = lists:nth(Bif+1,Imports),
-    %?NO_DEBUG('bif2(~p, ~p, ~p, ~p, ~p)~n',[Bif,BifName,F,[A1,A2],Reg]),
-    {bif,BifName,F,[A1,A2],Reg};
-resolve_inst({allocate,[{u,X0},{u,X1}]},_,_,_) ->
-    {allocate,X0,X1};
-resolve_inst({allocate_heap,[{u,X0},{u,X1},{u,X2}]},_,_,_) ->
-    {allocate_heap,X0,X1,X2};
-resolve_inst({allocate_zero,[{u,X0},{u,X1}]},_,_,_) ->
-    {allocate_zero,X0,X1};
-resolve_inst({allocate_heap_zero,[{u,X0},{u,X1},{u,X2}]},_,_,_) ->
-    {allocate_heap_zero,X0,X1,X2};
-resolve_inst({test_heap,[{u,X0},{u,X1}]},_,_,_) ->
-    {test_heap,X0,X1};
-resolve_inst({init,[Dst]},_,_,_) ->
-    {init,Dst};
-resolve_inst({deallocate,[{u,L}]},_,_,_) ->
-    {deallocate,L};
-resolve_inst({return,[]},_,_,_) ->
-    return;
-resolve_inst({send,[]},_,_,_) ->
-    send;
-resolve_inst({remove_message,[]},_,_,_) ->
-    remove_message;
-resolve_inst({timeout,[]},_,_,_) ->
-    timeout;
-resolve_inst({loop_rec,[Lbl,Dst]},_,_,_) ->
-    {loop_rec,Lbl,Dst};
-resolve_inst({loop_rec_end,[Lbl]},_,_,_) ->
-    {loop_rec_end,Lbl};
-resolve_inst({wait,[Lbl]},_,_,_) ->
-    {wait,Lbl};
-resolve_inst({wait_timeout,[Lbl,Int]},_,_,_) ->
-    {wait_timeout,Lbl,resolve_arg(Int)};
-resolve_inst({m_plus,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'+',W,[SrcR1,SrcR2],DstR};
-resolve_inst({m_minus,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'-',W,[SrcR1,SrcR2],DstR};
-resolve_inst({m_times,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'*',W,[SrcR1,SrcR2],DstR};
-resolve_inst({m_div,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'/',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_div,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'div',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_rem,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'rem',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_band,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'band',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bor,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bor',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bxor,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bxor',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bsl,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bsl',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bsr,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bsr',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bnot,Args},_,_,_) ->
-    [W,SrcR,DstR] = resolve_args(Args),
-    {arithbif,'bnot',W,[SrcR],DstR};
-resolve_inst({is_lt=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_ge=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_eq=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_ne=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_eq_exact=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_ne_exact=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_integer=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_float=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_number=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_atom=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_pid=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_reference=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_port=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_nil=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_binary=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_constant=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_list=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_nonempty_list=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({is_tuple=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({test_arity=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({select_val,Args},_,_,_) ->
-    [Reg,FLbl,{{z,1},{u,_Len},List0}] = Args,
-    List = resolve_args(List0),
-    {select_val,Reg,FLbl,{list,List}};
-resolve_inst({select_tuple_arity,Args},_,_,_) ->
-    [Reg,FLbl,{{z,1},{u,_Len},List0}] = Args,
-    List = resolve_args(List0),
-    {select_tuple_arity,Reg,FLbl,{list,List}};
-resolve_inst({jump,[Lbl]},_,_,_) ->
-    {jump,Lbl};
-resolve_inst({'catch',[Dst,Lbl]},_,_,_) ->
-    {'catch',Dst,Lbl};
-resolve_inst({catch_end,[Dst]},_,_,_) ->
-    {catch_end,Dst};
-resolve_inst({move,[Src,Dst]},_,_,_) ->
-    {move,resolve_arg(Src),Dst};
-resolve_inst({get_list,[Src,Dst1,Dst2]},_,_,_) ->
-    {get_list,Src,Dst1,Dst2};
-resolve_inst({get_tuple_element,[Src,{u,Off},Dst]},_,_,_) ->
-    {get_tuple_element,resolve_arg(Src),Off,resolve_arg(Dst)};
-resolve_inst({set_tuple_element,[Src,Dst,{u,Off}]},_,_,_) ->
-    {set_tuple_element,resolve_arg(Src),resolve_arg(Dst),Off};
-resolve_inst({put_string,[{u,Len},{u,Off},Dst]},_,Strings,_) ->
-    String = if Len > 0 -> binary_to_list(Strings, Off+1, Off+Len);
-		true -> ""
-	     end,
-?NO_DEBUG('put_string(~p, {string,~p}, ~p)~n',[Len,String,Dst]),
-    {put_string,Len,{string,String},Dst};
-resolve_inst({put_list,[Src1,Src2,Dst]},_,_,_) ->
-    {put_list,resolve_arg(Src1),resolve_arg(Src2),Dst};
-resolve_inst({put_tuple,[{u,Arity},Dst]},_,_,_) ->
-    {put_tuple,Arity,Dst};
-resolve_inst({put,[Src]},_,_,_) ->
-    {put,resolve_arg(Src)};
-resolve_inst({badmatch,[X]},_,_,_) ->
-    {badmatch,resolve_arg(X)};
-resolve_inst({if_end,[]},_,_,_) ->
-    if_end;
-resolve_inst({case_end,[X]},_,_,_) ->
-    {case_end,resolve_arg(X)};
-resolve_inst({call_fun,[{u,N}]},_,_,_) ->
-    {call_fun,N};
-resolve_inst({make_fun,Args},_,_,Lbls) ->
-    [{f,L},Magic,FreeVars] = resolve_args(Args),
-    {make_fun,catch lookup_key(L,Lbls),Magic,FreeVars};
-resolve_inst({is_function=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-resolve_inst({call_ext_only,[{u,N},{u,MFAix}]},Imports,_,_) ->
-    {call_ext_only,N,catch lists:nth(MFAix+1,Imports)};
-%%
-%% Instructions for handling binaries added in R7A & R7B
-%%
-resolve_inst({bs_start_match,[F,Reg]},_,_,_) ->
-    {bs_start_match,F,Reg};
-resolve_inst({bs_get_integer=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
-resolve_inst({bs_get_float=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
-resolve_inst({bs_get_binary=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
-resolve_inst({bs_skip_bits,[Lbl,Arg2,{u,N},{u,U}]},_,_,_) ->
-    [A2] = resolve_args([Arg2]),
-    {test,bs_skip_bits,Lbl,[A2,N,decode_field_flags(U)]};
-resolve_inst({bs_test_tail,[F,{u,N}]},_,_,_) ->
-    {test,bs_test_tail,F,[N]};
-resolve_inst({bs_save,[{u,N}]},_,_,_) ->
-    {bs_save,N};
-resolve_inst({bs_restore,[{u,N}]},_,_,_) ->
-    {bs_restore,N};
-resolve_inst({bs_init,[{u,N},{u,U}]},_,_,_) ->
-    {bs_init,N,decode_field_flags(U)};
-resolve_inst({bs_final,[F,X]},_,_,_) ->
-    {bs_final,F,X};
-resolve_inst({bs_put_integer,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    {bs_put_integer,Lbl,A2,N,decode_field_flags(U),A5};
-resolve_inst({bs_put_binary,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    ?NO_DEBUG('bs_put_binary(~p,~p,~p,~p,~p})~n',[Lbl,A2,N,U,A5]),
-    {bs_put_binary,Lbl,A2,N,decode_field_flags(U),A5};
-resolve_inst({bs_put_float,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    ?NO_DEBUG('bs_put_float(~p,~p,~p,~p,~p})~n',[Lbl,A2,N,U,A5]),
-    {bs_put_float,Lbl,A2,N,decode_field_flags(U),A5};
-resolve_inst({bs_put_string,[{u,Len},{u,Off}]},_,Strings,_) ->
-    String = if Len > 0 -> binary_to_list(Strings, Off+1, Off+Len);
-		true -> ""
-	     end,
-    ?NO_DEBUG('bs_put_string(~p, {string,~p})~n',[Len,String]),
-    {bs_put_string,Len,{string,String}};
-resolve_inst({bs_need_buf,[{u,N}]},_,_,_) ->
-    {bs_need_buf,N};
-
-%%
-%% Instructions for handling floating point numbers added in June 2001 (R8).
-%%
-resolve_inst({fclearerror,[]},_,_,_) ->
-    fclearerror;
-resolve_inst({fcheckerror,Args},_,_,_) ->
-    [Fail] = resolve_args(Args),
-    {fcheckerror,Fail};
-resolve_inst({fmove,Args},_,_,_) ->
-    [FR,Reg] = resolve_args(Args),
-    {fmove,FR,Reg};
-resolve_inst({fconv,Args},_,_,_) ->
-    [Reg,FR] = resolve_args(Args),
-    {fconv,Reg,FR};
-resolve_inst({fadd=I,Args},_,_,_) ->
-    [F,A1,A2,Reg] = resolve_args(Args),
-    {arithfbif,I,F,[A1,A2],Reg};
-resolve_inst({fsub=I,Args},_,_,_) ->
-    [F,A1,A2,Reg] = resolve_args(Args),
-    {arithfbif,I,F,[A1,A2],Reg};
-resolve_inst({fmul=I,Args},_,_,_) ->
-    [F,A1,A2,Reg] = resolve_args(Args),
-    {arithfbif,I,F,[A1,A2],Reg};
-resolve_inst({fdiv=I,Args},_,_,_) ->
-    [F,A1,A2,Reg] = resolve_args(Args),
-    {arithfbif,I,F,[A1,A2],Reg};
-resolve_inst({fnegate,Args},_,_,_) ->
-    [F,Arg,Reg] = resolve_args(Args),
-    {arithfbif,fnegate,F,[Arg],Reg};
-
-%%
-%% Instructions for try expressions added in January 2003 (R10).
-%%
-
-resolve_inst({'try',[Reg,Lbl]},_,_,_) -> % analogous to 'catch'
-    {'try',Reg,Lbl};
-resolve_inst({try_end,[Reg]},_,_,_) ->   % analogous to 'catch_end'
-    {try_end,Reg};
-resolve_inst({try_case,[Reg]},_,_,_) ->   % analogous to 'catch_end'
-    {try_case,Reg};
-resolve_inst({try_case_end,[Reg]},_,_,_) ->
-    {try_case_end,Reg};
-resolve_inst({raise,[Reg1,Reg2]},_,_,_) ->
-    {bif,raise,{f,0},[Reg1,Reg2],{x,0}};
-
-%%
-%% New bit syntax instructions added in February 2004 (R10B).
-%%
-
-resolve_inst({bs_init2,[Lbl,Arg2,{u,W},{u,R},{u,F},Arg6]},_,_,_) ->
-    [A2,A6] = resolve_args([Arg2,Arg6]),
-    {bs_init2,Lbl,A2,W,R,decode_field_flags(F),A6};
-resolve_inst({bs_bits_to_bytes,[Lbl,Arg2,Arg3]},_,_,_) ->
-    [A2,A3] = resolve_args([Arg2,Arg3]),
-    {bs_bits_to_bytes,Lbl,A2,A3};
-resolve_inst({bs_add=I,[Lbl,Arg2,Arg3,Arg4,Arg5]},_,_,_) ->
-    [A2,A3,A4,A5] = resolve_args([Arg2,Arg3,Arg4,Arg5]),
-    {I,Lbl,[A2,A3,A4],A5};
-
-%%
-%% New apply instructions added in April 2004 (R10B).
-%%
-resolve_inst({apply,[{u,Arity}]},_,_,_) ->
-    {apply,Arity};
-resolve_inst({apply_last,[{u,Arity},{u,D}]},_,_,_) ->
-    {apply_last,Arity,D};
-
-%%
-%% New test instruction added in April 2004 (R10B).
-%%
-resolve_inst({is_boolean=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
-
-%%
-%% Catches instructions that are not yet handled.
-%%
-
-resolve_inst(X,_,_,_) -> ?exit({resolve_inst,X}).
-
-%%-----------------------------------------------------------------------
-%% Resolves arguments in a generic way.
-%%-----------------------------------------------------------------------
-
-resolve_args(Args) -> [resolve_arg(A) || A <- Args].
-
-resolve_arg({u,N}) -> N;
-resolve_arg({i,N}) -> {integer,N};
-resolve_arg({atom,Atom}=A) when is_atom(Atom) -> A;
-resolve_arg(nil) -> nil;
-resolve_arg(Arg) -> Arg.
-
-%%-----------------------------------------------------------------------
-%% The purpose of the following is just to add a hook for future changes.
-%% Currently, field flags are numbers 1-2-4-8 and only two of these
-%% numbers (BSF_LITTLE 2 -- BSF_SIGNED 4) have a semantic significance;
-%% others are just hints for speeding up the execution; see "erl_bits.h".
-%%-----------------------------------------------------------------------
-
-decode_field_flags(FF) ->
-    {field_flags,FF}.
-
-%%-----------------------------------------------------------------------
-%% Each string is denoted in the assembled code by its offset into this
-%% binary.  This binary contains all strings concatenated together.
-%%-----------------------------------------------------------------------
-
-beam_disasm_strings(Bin) ->
-    Bin.
-
-%%-----------------------------------------------------------------------
-%% Disassembles the attributes of a BEAM file.
-%%-----------------------------------------------------------------------
-
-beam_disasm_attributes(none) -> none;
-beam_disasm_attributes(AttrBin) -> binary_to_term(AttrBin).
-
-%%-----------------------------------------------------------------------
-%% Disassembles the compilation information of a BEAM file.
-%%-----------------------------------------------------------------------
-
-beam_disasm_compilation_info(none) -> none;
-beam_disasm_compilation_info(Bin) ->  binary_to_term(Bin).
-
-%%-----------------------------------------------------------------------
-%% Private Utilities
-%%-----------------------------------------------------------------------
-
-%%-----------------------------------------------------------------------
-
-lookup_key(Key,[{Key,Val}|_]) ->
-    Val;
-lookup_key(Key,[_|KVs]) ->
-    lookup_key(Key,KVs);
-lookup_key(Key,[]) ->
-    ?exit({lookup_key,{key_not_found,Key}}).
-
-%%-----------------------------------------------------------------------
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_flatten.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_flatten.erl
deleted file mode 100644
index a9958f87cd..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_flatten.erl
+++ /dev/null
@@ -1,137 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: beam_flatten.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
-%%
-%% Purpose : Converts intermediate assembly code to final format.
-
--module(beam_flatten).
-
--export([module/2]).
--import(lists, [reverse/1,reverse/2,map/2]).
-
-module({Mod,Exp,Attr,Fs,Lc}, _Opt) ->
-    {ok,{Mod,Exp,Attr,map(fun function/1, Fs),Lc}}.
-
-function({function,Name,Arity,CLabel,Is0}) ->
-    Is1 = block(Is0),
-    Is = opt(Is1),
-    {function,Name,Arity,CLabel,Is}.
-
-block(Is) ->
-    block(Is, []).
-
-block([{block,Is0}|Is1], Acc) -> block(Is1, norm_block(Is0, Acc));
-block([I|Is], Acc) -> block(Is, [I|Acc]);
-block([], Acc) -> reverse(Acc).
-
-norm_block([{allocate,R,Alloc}|Is], Acc0) ->
-    case insert_alloc_in_bs_init(Acc0, Alloc) of
-	not_possible ->
-	    norm_block(Is, reverse(norm_allocate(Alloc, R), Acc0));
-	Acc ->
-	    norm_block(Is, Acc)
-    end;
-norm_block([I|Is], Acc) -> norm_block(Is, [norm(I)|Acc]);
-norm_block([], Acc) -> Acc.
-    
-norm({set,[D],As,{bif,N}})        -> {bif,N,nofail,As,D};
-norm({set,[D],As,{bif,N,F}})      -> {bif,N,F,As,D};
-norm({set,[D],[S],move})          -> {move,S,D};
-norm({set,[D],[S],fmove})         -> {fmove,S,D};
-norm({set,[D],[S],fconv})         -> {fconv,S,D};
-norm({set,[D],[S1,S2],put_list})  -> {put_list,S1,S2,D};
-norm({set,[D],[],{put_tuple,A}})  -> {put_tuple,A,D};
-norm({set,[],[S],put})            -> {put,S};
-norm({set,[D],[],{put_string,L,S}})       -> {put_string,L,S,D};
-norm({set,[D],[S],{get_tuple_element,I}}) -> {get_tuple_element,S,I,D};
-norm({set,[],[S,D],{set_tuple_element,I}}) -> {set_tuple_element,S,D,I};
-norm({set,[D1,D2],[S],get_list})          -> {get_list,S,D1,D2};
-norm({set,[],[],remove_message})   -> remove_message;
-norm({set,[],[],fclearerror}) -> fclearerror;
-norm({set,[],[],fcheckerror}) -> {fcheckerror,{f,0}};
-norm({'%',_}=Comment)   -> Comment;
-norm({'%live',R})                  -> {'%live',R}.
-
-norm_allocate({_Zero,nostack,Nh,[]}, Regs) ->
-    [{test_heap,Nh,Regs}];
-norm_allocate({_Zero,nostack,Nh,Nf,[]}, Regs) ->
-    [{test_heap,alloc_list(Nh, Nf),Regs}];
-norm_allocate({zero,0,Nh,[]}, Regs) ->
-    norm_allocate({nozero,0,Nh,[]}, Regs);
-norm_allocate({zero,0,Nh,Nf,[]}, Regs) ->
-    norm_allocate({nozero,0,Nh,Nf,[]}, Regs);
-norm_allocate({zero,Ns,0,[]}, Regs) ->
-    [{allocate_zero,Ns,Regs}];
-norm_allocate({zero,Ns,Nh,[]}, Regs) ->
-    [{allocate_heap_zero,Ns,Nh,Regs}];
-norm_allocate({nozero,Ns,0,Inits}, Regs) ->
-    [{allocate,Ns,Regs}|Inits];
-norm_allocate({nozero,Ns,Nh,Inits}, Regs) ->
-    [{allocate_heap,Ns,Nh,Regs}|Inits];
-norm_allocate({nozero,Ns,Nh,Floats,Inits}, Regs) ->
-    [{allocate_heap,Ns,alloc_list(Nh, Floats),Regs}|Inits];
-norm_allocate({zero,Ns,Nh,Floats,Inits}, Regs) ->
-    [{allocate_heap_zero,Ns,alloc_list(Nh, Floats),Regs}|Inits].
-
-insert_alloc_in_bs_init([I|_]=Is, Alloc) ->
-    case is_bs_put(I) of
-	false ->
-	    not_possible;
-	true ->
-	    insert_alloc_1(Is, Alloc, [])
-    end.
-
-insert_alloc_1([{bs_init2,Fail,Bs,Ws,Regs,F,Dst}|Is], {_,nostack,Nh,Nf,[]}, Acc) ->
-    Al = alloc_list(Ws+Nh, Nf),
-    I = {bs_init2,Fail,Bs,Al,Regs,F,Dst},
-    reverse(Acc, [I|Is]);
-insert_alloc_1([I|Is], Alloc, Acc) ->
-    insert_alloc_1(Is, Alloc, [I|Acc]).
-
-is_bs_put({bs_put_integer,_,_,_,_,_}) -> true;
-is_bs_put({bs_put_float,_,_,_,_,_}) -> true;
-is_bs_put({bs_put_binary,_,_,_,_,_}) -> true;
-is_bs_put({bs_put_string,_,_}) -> true;
-is_bs_put(_) -> false.
-
-alloc_list(Words, Floats) ->
-    {alloc,[{words,Words},{floats,Floats}]}.
-
-
-%% opt(Is0) -> Is
-%%  Simple peep-hole optimization to move a {move,Any,{x,0}} past
-%%  any kill up to the next call instruction.
-
-opt(Is) ->
-    opt_1(Is, []).
-
-opt_1([{move,_,{x,0}}=I|Is0], Acc0) ->
-    case move_past_kill(Is0, I, Acc0) of
-	impossible -> opt_1(Is0, [I|Acc0]);
-	{Is,Acc} -> opt_1(Is, Acc)
-    end;
-opt_1([I|Is], Acc) ->
-    opt_1(Is, [I|Acc]);
-opt_1([], Acc) -> reverse(Acc).
-
-move_past_kill([{'%live',_}|Is], Move, Acc) ->
-    move_past_kill(Is, Move, Acc);
-move_past_kill([{kill,Src}|_], {move,Src,_}, _) ->
-    impossible;
-move_past_kill([{kill,_}=I|Is], Move, Acc) ->
-    move_past_kill(Is, Move, [I|Acc]);
-move_past_kill(Is, Move, Acc) ->
-    {Is,[Move|Acc]}.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_jump.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_jump.erl
deleted file mode 100644
index fd005898b6..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_jump.erl
+++ /dev/null
@@ -1,477 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: beam_jump.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
-%%
-%%% Purpose : Optimise jumps and remove unreachable code.
-
--module(beam_jump).
-
--export([module/2,module_labels/1,
-	 is_unreachable_after/1,remove_unused_labels/1]).
-
-%%% The following optimisations are done:
-%%%
-%%% (1) This code with two identical instruction sequences
-%%% 
-%%%     L1: <Instruction sequence>
-%%%     L2:
-%%%          . . .
-%%%     L3: <Instruction sequence>
-%%%     L4:
-%%%
-%%%     can be replaced with
-%%% 
-%%%     L1: jump L3
-%%%     L2:
-%%%          . . .
-%%%     L3: <Instruction sequence>
-%%%     L4
-%%%     
-%%%     Note: The instruction sequence must end with an instruction
-%%%     such as a jump that never transfers control to the instruction
-%%%     following it.
-%%%
-%%% (2) case_end, if_end, and badmatch, and function calls that cause an
-%%%     exit (such as calls to exit/1) are moved to the end of the function.
-%%%     The purpose is to allow further optimizations at the place from
-%%%     which the code was moved.
-%%%
-%%% (3) Any unreachable code is removed.  Unreachable code is code after
-%%%     jump, call_last and other instructions which never transfer control
-%%%     to the following instruction.  Code is unreachable up to the next
-%%%     *referenced* label.  Note that the optimisations below might
-%%%     generate more possibilities for removing unreachable code.
-%%%
-%%% (4) This code:
-%%%	L1:	jump L2
-%%%          . . .
-%%%     L2: ...
-%%%
-%%%    will be changed to
-%%%
-%%%    jump L2
-%%%          . . .
-%%%    L1:
-%%%    L2: ...
-%%%
-%%%    If the jump is unreachable, it will be removed according to (1).
-%%%
-%%% (5) In
-%%%
-%%%	 jump L1
-%%%      L1:
-%%%
-%%%	 the jump will be removed.
-%%%
-%%% (6) If test instructions are used to skip a single jump instruction,
-%%%      the test is inverted and the jump is eliminated (provided that
-%%%      the test can be inverted).  Example:
-%%%
-%%%      is_eq L1 {x,1} {x,2}
-%%%      jump L2
-%%%      L1:
-%%%
-%%%      will be changed to
-%%%
-%%%      is_ne L2 {x,1} {x,2}
-%%%
-%%%      (The label L1 will be retained if there were previous references to it.)
-%%%
-%%% (7) Some redundant uses of is_boolean/1 is optimized away.
-%%%
-%%% Terminology note: The optimisation done here is called unreachable-code
-%%% elimination, NOT dead-code elimination.  Dead code elimination
-%%% means the removal of instructions that are executed, but have no visible
-%%% effect on the program state.
-%%% 
-
--import(lists, [reverse/1,reverse/2,map/2,mapfoldl/3,foldl/3,
-		last/1,foreach/2,member/2]).
-
-module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
-    Fs = map(fun function/1, Fs0),
-    {ok,{Mod,Exp,Attr,Fs,Lc}}.
-
-module_labels({Mod,Exp,Attr,Fs,Lc}) ->
-    {Mod,Exp,Attr,map(fun function_labels/1, Fs),Lc}.
-
-function_labels({function,Name,Arity,CLabel,Asm0}) ->
-    Asm = remove_unused_labels(Asm0),
-    {function,Name,Arity,CLabel,Asm}.    
-
-function({function,Name,Arity,CLabel,Asm0}) ->
-    Asm1 = share(Asm0),
-    Asm2 = bopt(Asm1),
-    Asm3 = move(Asm2),
-    Asm4 = opt(Asm3, CLabel),
-    Asm = remove_unused_labels(Asm4),
-    {function,Name,Arity,CLabel,Asm}.
-
-%%%
-%%% (1) We try to share the code for identical code segments by replacing all
-%%% occurrences except the last with jumps to the last occurrence.
-%%%
-
-share(Is) ->
-    share_1(reverse(Is), gb_trees:empty(), [], []).
-
-share_1([{label,_}=Lbl|Is], Dict, [], Acc) ->
-    share_1(Is, Dict, [], [Lbl|Acc]);
-share_1([{label,L}=Lbl|Is], Dict0, Seq, Acc) ->
-    case is_unreachable_after(last(Seq)) of
-	false ->
-	    share_1(Is, Dict0, [], [Lbl|Seq ++ Acc]);
-	true ->
-	    case gb_trees:lookup(Seq, Dict0) of
-		none ->
-		    Dict = gb_trees:insert(Seq, L, Dict0),
-		    share_1(Is, Dict, [], [Lbl|Seq ++ Acc]);
-		{value,Label} ->
-		    share_1(Is, Dict0, [], [Lbl,{jump,{f,Label}}|Acc])
-	    end
-    end;
-share_1([{func_info,_,_,_}=I|Is], _, [], Acc) ->
-    Is++[I|Acc];
-share_1([I|Is], Dict, Seq, Acc) ->
-    case is_unreachable_after(I) of
-	false ->
-	    share_1(Is, Dict, [I|Seq], Acc);
-	true ->
-	    share_1(Is, Dict, [I], Acc)
-    end.
-
-%%%
-%%% (2) Move short code sequences ending in an instruction that causes an exit
-%%% to the end of the function.
-%%%
-
-move(Is) ->
-    move_1(Is, [], []).
-
-move_1([I|Is], End, Acc) ->
-    case is_exit_instruction(I) of
-	false -> move_1(Is, End, [I|Acc]);
-	true -> move_2(I, Is, End, Acc)
-    end;
-move_1([], End, Acc) ->
-    reverse(Acc, reverse(End)).
-
-move_2(Exit, Is, End, [{block,_},{label,_},{func_info,_,_,_}|_]=Acc) ->
-    move_1(Is, End, [Exit|Acc]);
-move_2(Exit, Is, End, [{kill,_Y}|Acc]) ->
-    move_2(Exit, Is, End, Acc);
-move_2(Exit, Is, End, [{block,_}=Blk,{label,_}=Lbl,Dead|More]=Acc) ->
-    case is_unreachable_after(Dead) of
-	false ->
-	    move_1(Is, End, [Exit|Acc]);
-	true ->
-	    move_1([Dead|Is], [Exit,Blk,Lbl|End], More)
-    end;
-move_2(Exit, Is, End, [{label,_}=Lbl,Dead|More]=Acc) ->
-    case is_unreachable_after(Dead) of
-	false ->
-	    move_1(Is, End, [Exit|Acc]);
-	true ->
-	    move_1([Dead|Is], [Exit,Lbl|End], More)
-    end;
-move_2(Exit, Is, End, Acc) ->
-    move_1(Is, End, [Exit|Acc]).
-
-%%%
-%%% (7) Remove redundant is_boolean tests.
-%%%
-
-bopt(Is) ->
-    bopt_1(Is, []).
-
-bopt_1([{test,is_boolean,_,_}=I|Is], Acc0) ->
-    case opt_is_bool(I, Acc0) of
-	no -> bopt_1(Is, [I|Acc0]);
-	yes -> bopt_1(Is, Acc0);
-	{yes,Acc} -> bopt_1(Is, Acc)
-    end;
-bopt_1([I|Is], Acc) -> bopt_1(Is, [I|Acc]);
-bopt_1([], Acc) -> reverse(Acc).
-
-opt_is_bool({test,is_boolean,{f,Lbl},[Reg]}, Acc) ->
-    opt_is_bool_1(Acc, Reg, Lbl).
-
-opt_is_bool_1([{test,is_eq_exact,{f,Lbl},[Reg,{atom,true}]}|_], Reg, Lbl) ->
-    %% Instruction not needed in this context.
-    yes;
-opt_is_bool_1([{test,is_ne_exact,{f,Lbl},[Reg,{atom,true}]}|Acc], Reg, Lbl) ->
-    %% Rewrite to shorter test.
-    {yes,[{test,is_eq_exact,{f,Lbl},[Reg,{atom,false}]}|Acc]};
-opt_is_bool_1([{test,_,{f,Lbl},_}=Test|Acc0], Reg, Lbl) ->
-    case opt_is_bool_1(Acc0, Reg, Lbl) of
-	{yes,Acc} -> {yes,[Test|Acc]};
-	Other -> Other
-    end;
-opt_is_bool_1(_, _, _) -> no.
-
-%%%
-%%% (3) (4) (5) (6) Jump and unreachable code optimizations.
-%%%
-
--record(st, {fc,				%Label for function class errors.
-	     entry,				%Entry label (must not be moved).
-	     mlbl,				%Moved labels.
-	     labels				%Set of referenced labels.
-	    }).
-
-opt([{label,Fc}|_]=Is, CLabel) ->
-    Lbls = initial_labels(Is),
-    St = #st{fc=Fc,entry=CLabel,mlbl=dict:new(),labels=Lbls},
-    opt(Is, [], St).
-
-opt([{test,Test0,{f,Lnum}=Lbl,Ops}=I|Is0], Acc, St) ->
-    case Is0 of
-	[{jump,To}|[{label,Lnum}|Is2]=Is1] ->
-	    case invert_test(Test0) of
-		not_possible ->
-		    opt(Is0, [I|Acc], label_used(Lbl, St));
-		Test ->
-		    Is = case is_label_used(Lnum, St) of
-			     true -> Is1;
-			     false -> Is2
-			 end,
-		    opt([{test,Test,To,Ops}|Is], Acc, label_used(To, St))
-	    end;
-	_Other ->
-	    opt(Is0, [I|Acc], label_used(Lbl, St))
-    end;
-opt([{select_val,_R,Fail,{list,Vls}}=I|Is], Acc, St) ->
-    skip_unreachable(Is, [I|Acc], label_used([Fail|Vls], St));
-opt([{select_tuple_arity,_R,Fail,{list,Vls}}=I|Is], Acc, St) ->
-    skip_unreachable(Is, [I|Acc], label_used([Fail|Vls], St));
-opt([{'try',_R,Lbl}=I|Is], Acc, St) ->
-    opt(Is, [I|Acc], label_used(Lbl, St));
-opt([{'catch',_R,Lbl}=I|Is], Acc, St) ->
-    opt(Is, [I|Acc], label_used(Lbl, St));
-opt([{label,L}=I|Is], Acc, #st{entry=L}=St) ->
-    %% NEVER move the entry label.
-    opt(Is, [I|Acc], St);
-opt([{label,L1},{jump,{f,L2}}=I|Is], [Prev|Acc], St0) ->
-    St = St0#st{mlbl=dict:append(L2, L1, St0#st.mlbl)},
-    opt([Prev,I|Is], Acc, label_used({f,L2}, St));
-opt([{label,Lbl}=I|Is], Acc, #st{mlbl=Mlbl}=St0) ->
-    case dict:find(Lbl, Mlbl) of
-	{ok,Lbls} ->
-	    %% Essential to remove the list of labels from the dictionary,
-	    %% since we will rescan the inserted labels.  We MUST rescan.
-	    St = St0#st{mlbl=dict:erase(Lbl, Mlbl)},
-	    insert_labels([Lbl|Lbls], Is, Acc, St);
-	error -> opt(Is, [I|Acc], St0)
-    end;
-opt([{jump,{f,Lbl}},{label,Lbl}=I|Is], Acc, St) ->
-    opt([I|Is], Acc, St);
-opt([{jump,Lbl}=I|Is], Acc, St) ->
-    skip_unreachable(Is, [I|Acc], label_used(Lbl, St));
-opt([{loop_rec,Lbl,_R}=I|Is], Acc, St) ->
-    opt(Is, [I|Acc], label_used(Lbl, St));
-opt([{bif,_Name,Lbl,_As,_R}=I|Is], Acc, St) ->
-    opt(Is, [I|Acc], label_used(Lbl, St));
-opt([{bs_put_integer,Lbl,_Bits,_Unit,_Fl,_Val}=I|Is], Acc, St) ->
-    opt(Is, [I|Acc], label_used(Lbl, St));
-opt([{bs_put_binary,Lbl,_Bits,_Unit,_Fl,_Val}=I|Is], Acc, St) ->
-    opt(Is, [I|Acc], label_used(Lbl, St));
-opt([{bs_put_float,Lbl,_Bits,_Unit,_Fl,_Val}=I|Is], Acc, St) ->
-    opt(Is, [I|Acc], label_used(Lbl, St));
-opt([{bs_final,Lbl,_R}=I|Is], Acc, St) ->
-    opt(Is, [I|Acc], label_used(Lbl, St));
-opt([{bs_init2,Lbl,_,_,_,_,_}=I|Is], Acc, St) ->
-    opt(Is, [I|Acc], label_used(Lbl, St));
-opt([{bs_add,Lbl,_,_}=I|Is], Acc, St) ->
-    opt(Is, [I|Acc], label_used(Lbl, St));
-opt([{bs_bits_to_bytes,Lbl,_,_}=I|Is], Acc, St) ->
-    opt(Is, [I|Acc], label_used(Lbl, St));
-opt([I|Is], Acc, St) ->
-    case is_unreachable_after(I) of
-	true  -> skip_unreachable(Is, [I|Acc], St);
-	false -> opt(Is, [I|Acc], St)
-    end;
-opt([], Acc, #st{fc=Fc,mlbl=Mlbl}) ->
-    Code = reverse(Acc),
-    case dict:find(Fc, Mlbl) of
- 	{ok,Lbls} -> insert_fc_labels(Lbls, Mlbl, Code);
- 	error -> Code
-    end.
-
-insert_fc_labels([L|Ls], Mlbl, Acc0) ->
-    Acc = [{label,L}|Acc0],
-    case dict:find(L, Mlbl) of
-	error ->
-	    insert_fc_labels(Ls, Mlbl, Acc);
-	{ok,Lbls} ->
-	    insert_fc_labels(Lbls++Ls, Mlbl, Acc)
-    end;
-insert_fc_labels([], _, Acc) -> Acc.
-
-%% invert_test(Test0) -> not_possible | Test
-
-invert_test(is_ge) ->       is_lt;
-invert_test(is_lt) ->       is_ge;
-invert_test(is_eq) ->       is_ne;
-invert_test(is_ne) ->       is_eq;
-invert_test(is_eq_exact) -> is_ne_exact;
-invert_test(is_ne_exact) -> is_eq_exact;
-invert_test(_) ->           not_possible.
-
-insert_labels([L|Ls], Is, [{jump,{f,L}}|Acc], St) ->
-    insert_labels(Ls, [{label,L}|Is], Acc, St);
-insert_labels([L|Ls], Is, Acc, St) ->
-    insert_labels(Ls, [{label,L}|Is], Acc, St);
-insert_labels([], Is, Acc, St) ->
-    opt(Is, Acc, St).
-
-%% Skip unreachable code up to the next referenced label.
-
-skip_unreachable([{label,L}|Is], [{jump,{f,L}}|Acc], St) ->
-    opt([{label,L}|Is], Acc, St);
-skip_unreachable([{label,L}|Is], Acc, St) ->
-    case is_label_used(L, St) of
-	true  -> opt([{label,L}|Is], Acc, St);
-	false -> skip_unreachable(Is, Acc, St)
-    end;
-skip_unreachable([_|Is], Acc, St) ->
-    skip_unreachable(Is, Acc, St);
-skip_unreachable([], Acc, St) ->
-    opt([], Acc, St).
-
-%% Add one or more label to the set of used labels.
-
-label_used({f,0}, St) -> St;
-label_used({f,L}, St) -> St#st{labels=gb_sets:add(L, St#st.labels)};
-label_used([H|T], St0) -> label_used(T, label_used(H, St0));
-label_used([], St) -> St;
-label_used(_Other, St) -> St.
-
-%% Test if label is used.
-
-is_label_used(L, St) ->
-    gb_sets:is_member(L, St#st.labels).
-
-%% is_unreachable_after(Instruction) -> true|false
-%%  Test whether the code after Instruction is unreachable.
-
-is_unreachable_after({func_info,_M,_F,_A}) -> true;
-is_unreachable_after(return) -> true;
-is_unreachable_after({call_ext_last,_Ar,_ExtFunc,_D}) -> true;
-is_unreachable_after({call_ext_only,_Ar,_ExtFunc}) -> true;
-is_unreachable_after({call_last,_Ar,_Lbl,_D}) -> true;
-is_unreachable_after({call_only,_Ar,_Lbl}) -> true;
-is_unreachable_after({apply_last,_Ar,_N}) -> true;
-is_unreachable_after({jump,_Lbl}) -> true;
-is_unreachable_after({select_val,_R,_Lbl,_Cases}) -> true;
-is_unreachable_after({select_tuple_arity,_R,_Lbl,_Cases}) -> true;
-is_unreachable_after({loop_rec_end,_}) -> true;
-is_unreachable_after({wait,_}) -> true;
-is_unreachable_after(I) -> is_exit_instruction(I).
-
-%% is_exit_instruction(Instruction) -> true|false
-%%  Test whether the instruction Instruction always
-%%  causes an exit/failure.
-
-is_exit_instruction({call_ext,_,{extfunc,M,F,A}}) ->
-    is_exit_instruction_1(M, F, A);
-is_exit_instruction({call_ext_last,_,{extfunc,M,F,A},_}) ->
-    is_exit_instruction_1(M, F, A);
-is_exit_instruction({call_ext_only,_,{extfunc,M,F,A}}) ->
-    is_exit_instruction_1(M, F, A);
-is_exit_instruction(if_end) -> true;
-is_exit_instruction({case_end,_}) -> true;
-is_exit_instruction({try_case_end,_}) -> true;
-is_exit_instruction({badmatch,_}) -> true;
-is_exit_instruction(_) -> false.
-
-is_exit_instruction_1(erlang, exit, 1) -> true;
-is_exit_instruction_1(erlang, throw, 1) -> true;
-is_exit_instruction_1(erlang, error, 1) -> true;
-is_exit_instruction_1(erlang, error, 2) -> true;
-is_exit_instruction_1(erlang, fault, 1) -> true;
-is_exit_instruction_1(erlang, fault, 2) -> true;
-is_exit_instruction_1(_, _, _) -> false.
-
-%% remove_unused_labels(Instructions0) -> Instructions
-%%  Remove all unused labels.
-
-remove_unused_labels(Is) ->
-    Used0 = initial_labels(Is),
-    Used = foldl(fun ulbl/2, Used0, Is),
-    rem_unused(Is, Used, []).
-
-rem_unused([{label,Lbl}=I|Is], Used, Acc) ->
-    case gb_sets:is_member(Lbl, Used) of
-	false -> rem_unused(Is, Used, Acc);
-	true -> rem_unused(Is, Used, [I|Acc])
-    end;
-rem_unused([I|Is], Used, Acc) ->
-    rem_unused(Is, Used, [I|Acc]);
-rem_unused([], _, Acc) -> reverse(Acc).
-
-initial_labels(Is) ->
-    initial_labels(Is, []).
-
-initial_labels([{label,Lbl}|Is], Acc) ->
-    initial_labels(Is, [Lbl|Acc]);
-initial_labels([{func_info,_,_,_},{label,Lbl}|_], Acc) ->
-    gb_sets:from_list([Lbl|Acc]).
-
-ulbl({test,_,Fail,_}, Used) ->
-    mark_used(Fail, Used);
-ulbl({select_val,_,Fail,{list,Vls}}, Used) ->
-    mark_used_list(Vls, mark_used(Fail, Used));
-ulbl({select_tuple_arity,_,Fail,{list,Vls}}, Used) ->
-    mark_used_list(Vls, mark_used(Fail, Used));
-ulbl({'try',_,Lbl}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({'catch',_,Lbl}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({jump,Lbl}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({loop_rec,Lbl,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({loop_rec_end,Lbl}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({wait,Lbl}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({wait_timeout,Lbl,_To}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bif,_Name,Lbl,_As,_R}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_init2,Lbl,_,_,_,_,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_put_integer,Lbl,_Bits,_Unit,_Fl,_Val}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_put_float,Lbl,_Bits,_Unit,_Fl,_Val}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_put_binary,Lbl,_Bits,_Unit,_Fl,_Val}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_final,Lbl,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_add,Lbl,_,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_bits_to_bytes,Lbl,_,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl(_, Used) -> Used.
-
-mark_used({f,0}, Used) -> Used;
-mark_used({f,L}, Used) -> gb_sets:add(L, Used);
-mark_used(_, Used) -> Used.
-
-mark_used_list([H|T], Used) ->
-    mark_used_list(T, mark_used(H, Used));
-mark_used_list([], Used) -> Used.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_listing.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_listing.erl
deleted file mode 100644
index 006b8c551a..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_listing.erl
+++ /dev/null
@@ -1,117 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: beam_listing.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
-%%
--module(beam_listing).
-
--export([module/2]).
-
--include("v3_life.hrl").
-
--import(lists, [foreach/2]).
-
-module(File, Core) when element(1, Core) == c_module ->
-    %% This is a core module.
-    io:put_chars(File, core_pp:format(Core));
-module(File, Kern) when element(1, Kern) == k_mdef ->
-    %% This is a kernel module.
-    io:put_chars(File, v3_kernel_pp:format(Kern));
-    %%io:put_chars(File, io_lib:format("~p~n", [Kern]));
-module(File, {Mod,Exp,Attr,Kern}) ->
-    %% This is output from beam_life (v3).
-    io:fwrite(File, "~w.~n~p.~n~p.~n", [Mod,Exp,Attr]),
-    foreach(fun (F) -> function(File, F) end, Kern);
-module(Stream, {Mod,Exp,Attr,Code,NumLabels}) ->
-    %% This is output from beam_codegen.
-    io:format(Stream, "{module, ~s}.  %% version = ~w\n", 
-	      [Mod, beam_opcodes:format_number()]),
-    io:format(Stream, "\n{exports, ~p}.\n", [Exp]),
-    io:format(Stream, "\n{attributes, ~p}.\n", [Attr]),
-    io:format(Stream, "\n{labels, ~p}.\n", [NumLabels]),
-    foreach(
-      fun ({function,Name,Arity,Entry,Asm}) ->
-	      io:format(Stream, "\n\n{function, ~w, ~w, ~w}.\n",
-			[Name, Arity, Entry]),
-	      foreach(fun(Op) -> print_op(Stream, Op) end, Asm) end,
-      Code);
-module(Stream, {Mod,Exp,Inter}) ->
-    %% Other kinds of intermediate formats.
-    io:fwrite(Stream, "~w.~n~p.~n", [Mod,Exp]),
-    foreach(fun (F) -> io:format(Stream, "~p.\n", [F]) end, Inter);
-module(Stream, [_|_]=Fs) ->
-    %% Form-based abstract format.
-    foreach(fun (F) -> io:format(Stream, "~p.\n", [F]) end, Fs).
-
-print_op(Stream, Label) when element(1, Label) == label ->
-    io:format(Stream, "  ~p.\n", [Label]);
-print_op(Stream, Op) ->
-    io:format(Stream, "    ~p.\n", [Op]).
-
-function(File, {function,Name,Arity,Args,Body,Vdb}) ->
-    io:nl(File),
-    io:format(File, "function ~p/~p.\n", [Name,Arity]),
-    io:format(File, " ~p.\n", [Args]),
-    print_vdb(File, Vdb),
-    put(beam_listing_nl, true),
-    foreach(fun(F) -> format(File, F, []) end, Body),
-    nl(File),
-    erase(beam_listing_nl).
-
-format(File, #l{ke=Ke,i=I,vdb=Vdb}, Ind) ->
-    nl(File),
-    ind_format(File, Ind, "~p ", [I]),
-    print_vdb(File, Vdb),
-    nl(File),
-    format(File, Ke, Ind);
-format(File, Tuple, Ind) when is_tuple(Tuple) ->
-    ind_format(File, Ind, "{", []),
-    format_list(File, tuple_to_list(Tuple), [$\s|Ind]),
-    ind_format(File, Ind, "}", []);
-format(File, List, Ind) when is_list(List) ->
-    ind_format(File, Ind, "[", []),
-    format_list(File, List, [$\s|Ind]),
-    ind_format(File, Ind, "]", []);
-format(File, F, Ind) ->
-    ind_format(File, Ind, "~p", [F]).
-
-format_list(File, [F], Ind) ->
-    format(File, F, Ind);
-format_list(File, [F|Fs], Ind) ->
-    format(File, F, Ind),
-    ind_format(File, Ind, ",", []),
-    format_list(File, Fs, Ind);
-format_list(_, [], _) -> ok.
-
-
-print_vdb(File, [{Var,F,E}|Vs]) ->
-    io:format(File, "~p:~p..~p ", [Var,F,E]),
-    print_vdb(File, Vs);
-print_vdb(_, []) -> ok.
-
-ind_format(File, Ind, Format, Args) ->
-    case get(beam_listing_nl) of
-	true ->
-	    put(beam_listing_nl, false),
-	    io:put_chars(File, Ind);
-	false -> ok
-    end,
-    io:format(File, Format, Args).
-    
-nl(File) ->
-    case put(beam_listing_nl, true) of
-	true -> ok;
-	false -> io:nl(File)
-    end.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_opcodes.hrl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_opcodes.hrl
deleted file mode 100644
index 1ad0887314..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_opcodes.hrl
+++ /dev/null
@@ -1,12 +0,0 @@
-%%  Warning: Do not edit this file.  It was automatically
-%%  generated by 'beam_makeops' on Wed Nov 24 17:52:43 2004.
-
--define(tag_u, 0).
--define(tag_i, 1).
--define(tag_a, 2).
--define(tag_x, 3).
--define(tag_y, 4).
--define(tag_f, 5).
--define(tag_h, 6).
--define(tag_z, 7).
-
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_type.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_type.erl
deleted file mode 100644
index 7d288b249c..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_type.erl
+++ /dev/null
@@ -1,551 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: beam_type.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
-%%
-%% Purpose : Type-based optimisations.
-
--module(beam_type).
-
--export([module/2]).
-
--import(lists, [map/2,foldl/3,reverse/1,reverse/2,filter/2,member/2]).
-
-module({Mod,Exp,Attr,Fs0,Lc}, Opt) ->
-    AllowFloatOpts = not member(no_float_opt, Opt),
-    Fs = map(fun(F) -> function(F, AllowFloatOpts) end, Fs0),
-    {ok,{Mod,Exp,Attr,Fs,Lc}}.
-
-function({function,Name,Arity,CLabel,Asm0}, AllowFloatOpts) ->
-    Asm = opt(Asm0, AllowFloatOpts, [], tdb_new()),
-    {function,Name,Arity,CLabel,Asm}.
-
-%% opt([Instruction], AllowFloatOpts, Accumulator, TypeDb) -> {[Instruction'],TypeDb'}
-%%  Keep track of type information; try to simplify.
-
-opt([{block,Body1}|Is], AllowFloatOpts, [{block,Body0}|Acc], Ts0) ->
-    {Body2,Ts} = simplify(Body1, Ts0, AllowFloatOpts),
-    Body = beam_block:merge_blocks(Body0, Body2),
-    opt(Is, AllowFloatOpts, [{block,Body}|Acc], Ts);
-opt([{block,Body0}|Is], AllowFloatOpts, Acc, Ts0) ->
-    {Body,Ts} = simplify(Body0, Ts0, AllowFloatOpts),
-    opt(Is, AllowFloatOpts, [{block,Body}|Acc], Ts);
-opt([I0|Is], AllowFloatOpts, Acc, Ts0) ->
-    case simplify([I0], Ts0, AllowFloatOpts) of
-	{[],Ts} -> opt(Is, AllowFloatOpts, Acc, Ts);
-	{[I],Ts} -> opt(Is, AllowFloatOpts, [I|Acc], Ts)
-    end;
-opt([], _, Acc, _) -> reverse(Acc).
-
-%% simplify(Instruction, TypeDb, AllowFloatOpts) -> NewInstruction
-%%  Simplify an instruction using type information (this is
-%%  technically a "strength reduction").
-
-simplify(Is, TypeDb, false) ->
-    simplify(Is, TypeDb, no_float_opt, []);
-simplify(Is, TypeDb, true) ->
-    case are_live_regs_determinable(Is) of
-	false -> simplify(Is, TypeDb, no_float_opt, []);
-	true -> simplify(Is, TypeDb, [], [])
-    end.
-
-simplify([{set,[D],[{integer,Index},Reg],{bif,element,_}}=I0|Is]=Is0, Ts0, Rs0, Acc0) ->
-    I = case max_tuple_size(Reg, Ts0) of
-	    Sz when 0 < Index, Index =< Sz ->
-		{set,[D],[Reg],{get_tuple_element,Index-1}};
-	    _Other -> I0
-    end,
-    Ts = update(I, Ts0),
-    {Rs,Acc} = flush(Rs0, Is0, Acc0),
-    simplify(Is, Ts, Rs, [I|checkerror(Acc)]);
-simplify([{set,[D0],[A],{bif,'-',{f,0}}}=I|Is]=Is0, Ts0, Rs0, Acc0)
-  when Rs0 =/= no_float_opt ->
-    case tdb_find(A, Ts0) of
-	float ->
-	    {Rs1,Acc1} = load_reg(A, Ts0, Rs0, Acc0),
-	    {D,Rs} = find_dest(D0, Rs1),
-	    Areg = fetch_reg(A, Rs),
-	    Acc = [{set,[D],[Areg],{bif,fnegate,{f,0}}}|clearerror(Acc1)],
-	    Ts = tdb_update([{D0,float}], Ts0),
-	    simplify(Is, Ts, Rs, Acc);
-	_Other ->
-	    Ts = update(I, Ts0),
-	    {Rs,Acc} = flush(Rs0, Is0, Acc0),
-	    simplify(Is, Ts, Rs, [I|checkerror(Acc)])
-    end;
-simplify([{set,[_],[_],{bif,_,{f,0}}}=I|Is]=Is0, Ts0, Rs0, Acc0) ->
-    Ts = update(I, Ts0),
-    {Rs,Acc} = flush(Rs0, Is0, Acc0),
-    simplify(Is, Ts, Rs, [I|checkerror(Acc)]);
-simplify([{set,[D0],[A,B],{bif,Op0,{f,0}}}=I|Is]=Is0, Ts0, Rs0, Acc0)
-  when Rs0 =/= no_float_opt ->
-    case float_op(Op0, A, B, Ts0) of
-	no ->
-	    Ts = update(I, Ts0),
-	    {Rs,Acc} = flush(Rs0, Is0, Acc0),
-	    simplify(Is, Ts, Rs, [I|checkerror(Acc)]);
-	{yes,Op} ->
-	    {Rs1,Acc1} = load_reg(A, Ts0, Rs0, Acc0),
-	    {Rs2,Acc2} = load_reg(B, Ts0, Rs1, Acc1),
-	    {D,Rs} = find_dest(D0, Rs2),
-	    Areg = fetch_reg(A, Rs),
-	    Breg = fetch_reg(B, Rs),
-	    Acc = [{set,[D],[Areg,Breg],{bif,Op,{f,0}}}|clearerror(Acc2)],
-	    Ts = tdb_update([{D0,float}], Ts0),
-	    simplify(Is, Ts, Rs, Acc)
-    end;
-simplify([{set,[D],[TupleReg],{get_tuple_element,0}}=I|Is0], Ts0, Rs0, Acc0) ->
-    case tdb_find(TupleReg, Ts0) of
-	{tuple,_,[Contents]} ->
-	    Ts = tdb_update([{D,Contents}], Ts0),
-	    {Rs,Acc} = flush(Rs0, Is0, Acc0),
-	    simplify(Is0, Ts, Rs, [{set,[D],[Contents],move}|Acc]);
-	_ ->
-	    Ts = update(I, Ts0),
-	    {Rs,Acc} = flush(Rs0, Is0, Acc0),
-	    simplify(Is0, Ts, Rs, [I|checkerror(Acc)])
-    end;
-simplify([{set,_,_,{'catch',_}}=I|Is]=Is0, _Ts, Rs0, Acc0) ->
-    Acc = flush_all(Rs0, Is0, Acc0),
-    simplify(Is, tdb_new(), Rs0, [I|Acc]);
-simplify([{test,is_tuple,_,[R]}=I|Is], Ts, Rs, Acc) ->
-    case tdb_find(R, Ts) of
-	{tuple,_,_} -> simplify(Is, Ts, Rs, Acc);
-	_ ->
-	    simplify(Is, Ts, Rs, [I|Acc])
-    end;
-simplify([{test,test_arity,_,[R,Arity]}=I|Is], Ts0, Rs, Acc) ->
-    case tdb_find(R, Ts0) of
-	{tuple,Arity,_} ->
-	    simplify(Is, Ts0, Rs, Acc);
-	_Other ->
-	    Ts = update(I, Ts0),
-	    simplify(Is, Ts, Rs, [I|Acc])
-    end;
-simplify([{test,is_eq_exact,Fail,[R,{atom,_}=Atom]}=I|Is0], Ts0, Rs0, Acc0) ->
-    Acc1 = case tdb_find(R, Ts0) of
-	       {atom,_}=Atom -> Acc0;
-	       {atom,_} -> [{jump,Fail}|Acc0];
-	       _ -> [I|Acc0]
-	   end,
-    Ts = update(I, Ts0),
-    {Rs,Acc} = flush(Rs0, Is0, Acc1),
-    simplify(Is0, Ts, Rs, Acc);
-simplify([I|Is]=Is0, Ts0, Rs0, Acc0) ->
-    Ts = update(I, Ts0),
-    {Rs,Acc} = flush(Rs0, Is0, Acc0),
-    simplify(Is, Ts, Rs, [I|Acc]);
-simplify([], Ts, Rs, Acc) ->
-    Is0 = reverse(flush_all(Rs, [], Acc)),
-    Is1 = opt_fmoves(Is0, []),
-    Is = add_ftest_heap(Is1),
-    {Is,Ts}.
-
-opt_fmoves([{set,[{x,_}=R],[{fr,_}]=Src,fmove}=I1,
-	    {set,[{y,_}]=Dst,[{x,_}=R],move}=I2|Is], Acc) ->
-    case beam_block:is_killed(R, Is) of
-	false -> opt_fmoves(Is, [I2,I1|Acc]);
-	true -> opt_fmoves(Is, [{set,Dst,Src,fmove}|Acc])
-    end;
-opt_fmoves([I|Is], Acc) ->
-    opt_fmoves(Is, [I|Acc]);
-opt_fmoves([], Acc) -> reverse(Acc).
-
-clearerror(Is) ->
-    clearerror(Is, Is).
-
-clearerror([{set,[],[],fclearerror}|_], OrigIs) -> OrigIs;
-clearerror([{set,[],[],fcheckerror}|_], OrigIs) -> [{set,[],[],fclearerror}|OrigIs];
-clearerror([_|Is], OrigIs) -> clearerror(Is, OrigIs);
-clearerror([], OrigIs) -> [{set,[],[],fclearerror}|OrigIs].
-
-%% update(Instruction, TypeDb) -> NewTypeDb
-%%  Update the type database to account for executing an instruction.
-%%
-%%  First the cases for instructions inside basic blocks.
-update({set,[D],[S],move}, Ts0) ->
-    Ops = case tdb_find(S, Ts0) of
-	      error -> [{D,kill}];
-	      Info -> [{D,Info}]
-	  end,
-    tdb_update(Ops, Ts0);
-update({set,[D],[{integer,I},Reg],{bif,element,_}}, Ts0) ->
-    tdb_update([{Reg,{tuple,I,[]}},{D,kill}], Ts0);
-update({set,[D],[_Index,Reg],{bif,element,_}}, Ts0) ->
-    tdb_update([{Reg,{tuple,0,[]}},{D,kill}], Ts0);
-update({set,[D],[S],{get_tuple_element,0}}, Ts) ->
-    tdb_update([{D,{tuple_element,S,0}}], Ts);
-update({set,[D],[S],{bif,float,{f,0}}}, Ts0) ->
-    %% Make sure we reject non-numeric literal argument.
-    case possibly_numeric(S) of
-	true ->  tdb_update([{D,float}], Ts0);
-	false -> Ts0
-    end;
-update({set,[D],[S1,S2],{bif,'/',{f,0}}}, Ts0) ->
-    %% Make sure we reject non-numeric literals.
-    case possibly_numeric(S1) andalso possibly_numeric(S2) of
-	true ->  tdb_update([{D,float}], Ts0);
-	false -> Ts0
-    end;
-update({set,[D],[S1,S2],{bif,Op,{f,0}}}, Ts0) ->
-    case arith_op(Op) of
-	no ->
-	    tdb_update([{D,kill}], Ts0);
-	{yes,_} ->
-	    case {tdb_find(S1, Ts0),tdb_find(S2, Ts0)} of
-		{float,_} -> tdb_update([{D,float}], Ts0);
-		{_,float} -> tdb_update([{D,float}], Ts0);
-		{_,_} -> tdb_update([{D,kill}], Ts0)
-	    end
-    end;
-update({set,[],_Src,_Op}, Ts0) -> Ts0;
-update({set,[D],_Src,_Op}, Ts0) ->
-    tdb_update([{D,kill}], Ts0);
-update({set,[D1,D2],_Src,_Op}, Ts0) ->
-    tdb_update([{D1,kill},{D2,kill}], Ts0);
-update({allocate,_,_}, Ts) -> Ts;
-update({init,D}, Ts) ->
-    tdb_update([{D,kill}], Ts);
-update({kill,D}, Ts) ->
-    tdb_update([{D,kill}], Ts);
-update({'%live',_}, Ts) -> Ts;
-
-%% Instructions outside of blocks.
-update({test,is_float,_Fail,[Src]}, Ts0) ->
-    tdb_update([{Src,float}], Ts0);
-update({test,test_arity,_Fail,[Src,Arity]}, Ts0) ->
-    tdb_update([{Src,{tuple,Arity,[]}}], Ts0);
-update({test,is_eq_exact,_,[Reg,{atom,_}=Atom]}, Ts) ->
-    case tdb_find(Reg, Ts) of
-	error ->
-	    Ts;
-	{tuple_element,TupleReg,0} ->
-	    tdb_update([{TupleReg,{tuple,1,[Atom]}}], Ts);
-	_ ->
-	    Ts
-    end;
-update({test,_Test,_Fail,_Other}, Ts) -> Ts;
-update({call_ext,1,{extfunc,math,Math,1}}, Ts) ->
-    case is_math_bif(Math, 1) of
-	true -> tdb_update([{{x,0},float}], Ts);
-	false -> tdb_kill_xregs(Ts)
-    end;
-update({call_ext,2,{extfunc,math,Math,2}}, Ts) ->
-    case is_math_bif(Math, 2) of
-	true -> tdb_update([{{x,0},float}], Ts);
-	false -> tdb_kill_xregs(Ts)
-    end;
-update({call_ext,3,{extfunc,erlang,setelement,3}}, Ts0) ->
-    Op = case tdb_find({x,1}, Ts0) of
-	     error -> kill;
-	     Info -> Info
-	 end,
-    Ts1 = tdb_kill_xregs(Ts0),
-    tdb_update([{{x,0},Op}], Ts1);
-update({call,_Arity,_Func}, Ts) -> tdb_kill_xregs(Ts);
-update({call_ext,_Arity,_Func}, Ts) -> tdb_kill_xregs(Ts);
-update({make_fun2,_,_,_,_}, Ts) -> tdb_kill_xregs(Ts);
-
-%% The instruction is unknown.  Kill all information.
-update(_I, _Ts) -> tdb_new().
-
-is_math_bif(cos, 1) -> true;
-is_math_bif(cosh, 1) -> true;
-is_math_bif(sin, 1) -> true;
-is_math_bif(sinh, 1) -> true;
-is_math_bif(tan, 1) -> true;
-is_math_bif(tanh, 1) -> true;
-is_math_bif(acos, 1) -> true;
-is_math_bif(acosh, 1) -> true;
-is_math_bif(asin, 1) -> true;
-is_math_bif(asinh, 1) -> true;
-is_math_bif(atan, 1) -> true;
-is_math_bif(atanh, 1) -> true;
-is_math_bif(erf, 1) -> true;
-is_math_bif(erfc, 1) -> true;
-is_math_bif(exp, 1) -> true;
-is_math_bif(log, 1) -> true;
-is_math_bif(log10, 1) -> true;
-is_math_bif(sqrt, 1) -> true;
-is_math_bif(atan2, 2) -> true;
-is_math_bif(pow, 2) -> true;
-is_math_bif(pi, 0) -> true;
-is_math_bif(_, _) -> false.
-
-%% Reject non-numeric literals.
-possibly_numeric({x,_}) -> true;
-possibly_numeric({y,_}) -> true;
-possibly_numeric({integer,_}) -> true;
-possibly_numeric({float,_}) -> true;
-possibly_numeric(_) -> false.
-
-max_tuple_size(Reg, Ts) ->
-    case tdb_find(Reg, Ts) of
-	{tuple,Sz,_} -> Sz;
-	_Other -> 0
-    end.
-
-float_op('/', A, B, _) ->
-    case possibly_numeric(A) andalso possibly_numeric(B) of
-	true -> {yes,fdiv};
-	false -> no
-    end;
-float_op(Op, {float,_}, B, _) ->
-    case possibly_numeric(B) of
-	true -> arith_op(Op);
-	false -> no
-    end;
-float_op(Op, A, {float,_}, _) ->
-    case possibly_numeric(A) of
-	true -> arith_op(Op);
-	false -> no
-    end;
-float_op(Op, A, B, Ts) ->
-    case {tdb_find(A, Ts),tdb_find(B, Ts)} of
-	{float,_} -> arith_op(Op);
-	{_,float} -> arith_op(Op);
-	{_,_} -> no
-    end.
-
-find_dest(V, Rs0) ->
-    case find_reg(V, Rs0) of
-	{ok,FR} ->
-	    {FR,mark(V, Rs0, dirty)};
-	error ->
-	    Rs = put_reg(V, Rs0, dirty),
-	    {ok,FR} = find_reg(V, Rs),
-	    {FR,Rs}
-    end.
-
-load_reg({float,_}=F, _, Rs0, Is0) ->
-    Rs = put_reg(F, Rs0, clean),
-    {ok,FR} = find_reg(F, Rs),
-    Is = [{set,[FR],[F],fmove}|Is0],
-    {Rs,Is};
-load_reg(V, Ts, Rs0, Is0) ->
-    case find_reg(V, Rs0) of
-	{ok,_FR} -> {Rs0,Is0};
-	error ->
-	    Rs = put_reg(V, Rs0, clean),
-	    {ok,FR} = find_reg(V, Rs),
-	    Op = case tdb_find(V, Ts) of
-		     float -> fmove;
-		     _ -> fconv
-		 end,
-	    Is = [{set,[FR],[V],Op}|Is0],
-	    {Rs,Is}
-    end.
-
-arith_op('+') -> {yes,fadd};
-arith_op('-') -> {yes,fsub};
-arith_op('*') -> {yes,fmul};
-arith_op('/') -> {yes,fdiv};
-arith_op(_) -> no.
-
-flush(no_float_opt, _, Acc) -> {no_float_opt,Acc};
-flush(Rs, [{set,[_],[],{put_tuple,_}}|_]=Is0, Acc0) ->
-    Acc = flush_all(Rs, Is0, Acc0),
-    {[],Acc};
-flush(Rs0, [{set,Ds,Ss,_Op}|_], Acc0) ->
-    Save = gb_sets:from_list(Ss),
-    Acc = save_regs(Rs0, Save, Acc0),
-    Rs1 = foldl(fun(S, A) -> mark(S, A, clean) end, Rs0, Ss),
-    Kill = gb_sets:from_list(Ds),
-    Rs = kill_regs(Rs1, Kill),
-    {Rs,Acc};
-flush(Rs0, Is, Acc0) ->
-    Acc = flush_all(Rs0, Is, Acc0),
-    {[],Acc}.
-
-flush_all(no_float_opt, _, Acc) -> Acc;
-flush_all([{_,{float,_},_}|Rs], Is, Acc) ->
-    flush_all(Rs, Is, Acc);
-flush_all([{I,V,dirty}|Rs], Is, Acc0) ->
-    Acc = checkerror(Acc0),
-    case beam_block:is_killed(V, Is) of
-	true  -> flush_all(Rs, Is, Acc);
-	false -> flush_all(Rs, Is, [{set,[V],[{fr,I}],fmove}|Acc])
-    end;
-flush_all([{_,_,clean}|Rs], Is, Acc) -> flush_all(Rs, Is, Acc);
-flush_all([free|Rs], Is, Acc) -> flush_all(Rs, Is, Acc);
-flush_all([], _, Acc) -> Acc.
-
-save_regs(Rs, Save, Acc) ->
-    foldl(fun(R, A) -> save_reg(R, Save, A) end, Acc, Rs).
-
-save_reg({I,V,dirty}, Save, Acc) ->
-    case gb_sets:is_member(V, Save) of
-	true -> [{set,[V],[{fr,I}],fmove}|checkerror(Acc)];
-	false -> Acc
-    end;
-save_reg(_, _, Acc) -> Acc.
-
-kill_regs(Rs, Kill) ->
-    map(fun(R) -> kill_reg(R, Kill) end, Rs).
-
-kill_reg({_,V,_}=R, Kill) ->
-    case gb_sets:is_member(V, Kill) of
-	true -> free;
-	false -> R
-    end;
-kill_reg(R, _) -> R.
-
-mark(V, [{I,V,_}|Rs], Mark) -> [{I,V,Mark}|Rs];
-mark(V, [R|Rs], Mark) -> [R|mark(V, Rs, Mark)];
-mark(_, [], _) -> [].
-
-fetch_reg(V, [{I,V,_}|_]) -> {fr,I};
-fetch_reg(V, [_|SRs]) -> fetch_reg(V, SRs).
-
-find_reg(V, [{I,V,_}|_]) -> {ok,{fr,I}};
-find_reg(V, [_|SRs]) -> find_reg(V, SRs);
-find_reg(_, []) -> error.
-
-put_reg(V, Rs, Dirty) -> put_reg_1(V, Rs, Dirty, 0).
-
-put_reg_1(V, [free|Rs], Dirty, I) -> [{I,V,Dirty}|Rs];
-put_reg_1(V, [R|Rs], Dirty, I) -> [R|put_reg_1(V, Rs, Dirty, I+1)];
-put_reg_1(V, [], Dirty, I) -> [{I,V,Dirty}].
-
-checkerror(Is) ->
-    checkerror_1(Is, Is).
-
-checkerror_1([{set,[],[],fcheckerror}|_], OrigIs) -> OrigIs;
-checkerror_1([{set,[],[],fclearerror}|_], OrigIs) -> OrigIs;
-checkerror_1([{set,_,_,{bif,fadd,_}}|_], OrigIs) -> checkerror_2(OrigIs);
-checkerror_1([{set,_,_,{bif,fsub,_}}|_], OrigIs) -> checkerror_2(OrigIs);
-checkerror_1([{set,_,_,{bif,fmul,_}}|_], OrigIs) -> checkerror_2(OrigIs);
-checkerror_1([{set,_,_,{bif,fdiv,_}}|_], OrigIs) -> checkerror_2(OrigIs);
-checkerror_1([{set,_,_,{bif,fnegate,_}}|_], OrigIs) -> checkerror_2(OrigIs);
-checkerror_1([_|Is], OrigIs) -> checkerror_1(Is, OrigIs);
-checkerror_1([], OrigIs) -> OrigIs.
-
-checkerror_2(OrigIs) -> [{set,[],[],fcheckerror}|OrigIs].
-
-add_ftest_heap(Is) ->
-    add_ftest_heap_1(reverse(Is), 0, []).
-
-add_ftest_heap_1([{set,_,[{fr,_}],fmove}=I|Is], Floats, Acc) ->
-    add_ftest_heap_1(Is, Floats+1, [I|Acc]);
-add_ftest_heap_1([{allocate,_,_}=I|Is], 0, Acc) ->
-    reverse(Is, [I|Acc]);
-add_ftest_heap_1([{allocate,Regs,{Z,Stk,Heap,Inits}}|Is], Floats, Acc) ->
-    reverse(Is, [{allocate,Regs,{Z,Stk,Heap,Floats,Inits}}|Acc]);
-add_ftest_heap_1([I|Is], Floats, Acc) ->
-    add_ftest_heap_1(Is, Floats, [I|Acc]);
-add_ftest_heap_1([], 0, Acc) ->
-    Acc;
-add_ftest_heap_1([], Floats, Is) ->
-    Regs = beam_block:live_at_entry(Is),
-    [{allocate,Regs,{nozero,nostack,0,Floats,[]}}|Is].
-
-are_live_regs_determinable([{allocate,_,_}|_]) -> true;
-are_live_regs_determinable([{'%live',_}|_]) -> true;
-are_live_regs_determinable([_|Is]) -> are_live_regs_determinable(Is);
-are_live_regs_determinable([]) -> false.
-    
-
-%%% Routines for maintaining a type database.  The type database 
-%%% associates type information with registers.
-%%%
-%%% {tuple,Size,First} means that the corresponding register contains a
-%%% tuple with *at least* Size elements.  An tuple with unknown
-%%% size is represented as {tuple,0}. First is either [] (meaning that
-%%% the tuple's first element is unknown) or [FirstElement] (the contents
-%%% of the first element).
-%%%
-%%% 'float' means that the register contains a float.
-
-%% tdb_new() -> EmptyDataBase
-%%  Creates a new, empty type database.
-
-tdb_new() -> [].
-
-%% tdb_find(Register, Db) -> Information|error
-%%  Returns type information or the atom error if there are no type
-%%  information available for Register.
-
-tdb_find(Key, [{K,_}|_]) when Key < K -> error;
-tdb_find(Key, [{Key,Info}|_]) -> Info;
-tdb_find(Key, [_|Db]) -> tdb_find(Key, Db);
-tdb_find(_, []) -> error.
-
-%% tdb_update([UpdateOp], Db) -> NewDb
-%%        UpdateOp = {Register,kill}|{Register,NewInfo}
-%%  Updates a type database.  If a 'kill' operation is given, the type
-%%  information for that register will be removed from the database.
-%%  A kill operation takes precende over other operations for the same
-%%  register (i.e. [{{x,0},kill},{{x,0},{tuple,5}}] means that the
-%%  the existing type information, if any, will be discarded, and the
-%%  the '{tuple,5}' information ignored.
-%%
-%%  If NewInfo information is given and there exists information about
-%%  the register, the old and new type information will be merged.
-%%  For instance, {tuple,5} and {tuple,10} will be merged to produce
-%%  {tuple,10}.
-
-tdb_update(Uis0, Ts0) ->
-    Uis1 = filter(fun ({{x,_},_Op}) -> true;
-		      ({{y,_},_Op}) -> true;
-		      (_) -> false
-		  end, Uis0),
-    tdb_update1(lists:sort(Uis1), Ts0).
-
-tdb_update1([{Key,kill}|Ops], [{K,_Old}|_]=Db) when Key < K ->
-    tdb_update1(remove_key(Key, Ops), Db);
-tdb_update1([{Key,_New}=New|Ops], [{K,_Old}|_]=Db) when Key < K ->
-    [New|tdb_update1(Ops, Db)];
-tdb_update1([{Key,kill}|Ops], [{Key,_}|Db]) ->
-    tdb_update1(remove_key(Key, Ops), Db);
-tdb_update1([{Key,NewInfo}|Ops], [{Key,OldInfo}|Db]) ->
-    [{Key,merge_type_info(NewInfo, OldInfo)}|tdb_update1(Ops, Db)];
-tdb_update1([{_,_}|_]=Ops, [Old|Db]) ->
-    [Old|tdb_update1(Ops, Db)];
-tdb_update1([{Key,kill}|Ops], []) ->
-    tdb_update1(remove_key(Key, Ops), []);
-tdb_update1([{_,_}=New|Ops], []) ->
-    [New|tdb_update1(Ops, [])];
-tdb_update1([], Db) -> Db.
-
-%% tdb_kill_xregs(Db) -> NewDb
-%%  Kill all information about x registers. Also kill all tuple_element
-%%  dependencies from y registers to x registers.
-
-tdb_kill_xregs([{{x,_},_Type}|Db]) -> tdb_kill_xregs(Db);
-tdb_kill_xregs([{{y,_},{tuple_element,{x,_},_}}|Db]) -> tdb_kill_xregs(Db);
-tdb_kill_xregs([Any|Db]) -> [Any|tdb_kill_xregs(Db)];
-tdb_kill_xregs([]) -> [].
-    
-remove_key(Key, [{Key,_Op}|Ops]) -> remove_key(Key, Ops);
-remove_key(_, Ops) -> Ops.
-    
-merge_type_info(I, I) -> I;
-merge_type_info({tuple,Sz1,Same}, {tuple,Sz2,Same}=Max) when Sz1 < Sz2 ->
-    Max;
-merge_type_info({tuple,Sz1,Same}=Max, {tuple,Sz2,Same}) when Sz1 > Sz2 ->
-    Max;
-merge_type_info({tuple,Sz1,[]}, {tuple,Sz2,First}) ->
-    merge_type_info({tuple,Sz1,First}, {tuple,Sz2,First});
-merge_type_info({tuple,Sz1,First}, {tuple,Sz2,_}) ->
-    merge_type_info({tuple,Sz1,First}, {tuple,Sz2,First});
-merge_type_info(NewType, _) ->
-    verify_type(NewType),
-    NewType.
-
-verify_type({tuple,Sz,[]}) when is_integer(Sz) -> ok;
-verify_type({tuple,Sz,[_]}) when is_integer(Sz) -> ok;
-verify_type({tuple_element,_,_}) -> ok;
-verify_type(float) -> ok;
-verify_type({atom,_}) -> ok.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_validator.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_validator.erl
deleted file mode 100644
index a01be447b0..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/beam_validator.erl
+++ /dev/null
@@ -1,1022 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: beam_validator.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
-
--module(beam_validator).
-
--export([file/1,files/1]).
-
-%% Interface for compiler.
--export([module/2,format_error/1]).
-
--import(lists, [reverse/1,foldl/3]).
-
--define(MAXREG, 1024).
-
--define(DEBUG, 1).
--undef(DEBUG).
--ifdef(DEBUG).
--define(DBG_FORMAT(F, D), (io:format((F), (D)))).
--else.
--define(DBG_FORMAT(F, D), ok).
--endif.
-
-%%%
-%%% API functions.
-%%%
-
-files([F|Fs]) ->
-    ?DBG_FORMAT("# Verifying: ~p~n", [F]),
-    case file(F) of
-	ok -> ok;
-	{error,Es} -> 
-	    io:format("~p:~n~s~n", [F,format_error(Es)])
-    end,
-    files(Fs);
-files([]) -> ok.
-
-file(Name) when is_list(Name) ->
-    case case filename:extension(Name) of
-	     ".S" -> s_file(Name);
-	     ".beam" -> beam_file(Name)
-	 end of
-	[] -> ok;
-	Es -> {error,Es}
-    end.
-
-%% To be called by the compiler.
-module({Mod,Exp,Attr,Fs,Lc}=Code, _Opts)
-  when is_atom(Mod), is_list(Exp), is_list(Attr), is_integer(Lc) ->
-    case validate(Fs) of
-	[] -> {ok,Code};
-	Es0 ->
-	    Es = [{?MODULE,E} || E <- Es0],
-	    {error,[{atom_to_list(Mod),Es}]}
-    end.
-
-format_error([]) -> [];
-format_error([{{M,F,A},{I,Off,Desc}}|Es]) ->
-    [io_lib:format("  ~p:~p/~p+~p:~n    ~p - ~p~n", 
-		   [M,F,A,Off,I,Desc])|format_error(Es)];
-format_error({{_M,F,A},{I,Off,Desc}}) ->
-    io_lib:format(
-      "function ~p/~p+~p:~n"
-      "  Internal consistency check failed - please report this bug.~n"
-      "  Instruction: ~p~n"
-      "  Error:       ~p:~n", [F,A,Off,I,Desc]).
-
-%%%
-%%% Local functions follow.
-%%% 
-
-s_file(Name) ->
-    {ok,Is} = file:consult(Name),
-    Fs = find_functions(Is),
-    validate(Fs).
-
-find_functions(Fs) ->
-    find_functions_1(Fs, none, [], []).
-
-find_functions_1([{function,Name,Arity,Entry}|Is], Func, FuncAcc, Acc0) ->
-    Acc = add_func(Func, FuncAcc, Acc0),
-    find_functions_1(Is, {Name,Arity,Entry}, [], Acc);
-find_functions_1([I|Is], Func, FuncAcc, Acc) ->
-    find_functions_1(Is, Func, [I|FuncAcc], Acc);
-find_functions_1([], Func, FuncAcc, Acc) ->
-    reverse(add_func(Func, FuncAcc, Acc)).
-
-add_func(none, _, Acc) -> Acc;
-add_func({Name,Arity,Entry}, Is, Acc) ->
-    [{function,Name,Arity,Entry,reverse(Is)}|Acc].
-
-beam_file(Name) ->
-    try beam_disasm:file(Name) of
-	{error,beam_lib,Reason} -> [{beam_lib,Reason}];
-	{beam_file,L} ->
-	    {value,{code,Code0}} = lists:keysearch(code, 1, L),
-	    Code = beam_file_1(Code0, []),
-	    validate(Code)
-    catch _:_ -> [disassembly_failed]
-    end.
-
-beam_file_1([F0|Fs], Acc) ->
-    F = conv_func(F0),
-    beam_file_1(Fs, [F|Acc]);
-beam_file_1([], Acc) -> reverse(Acc).
-
-%% Convert from the disassembly format to the internal format
-%% used by the compiler (as passed to the assembler).
-
-conv_func(Is) ->
-    conv_func_1(labels(Is)).
-
-conv_func_1({Ls,[{func_info,[{atom,M},{atom,F},Ar]},
-		 {label,Entry}=Le|Is]}) ->
-    %% The entry label gets maybe not correct here
-    {function,F,Ar,Entry,
-     [{label,L}||L<-Ls]++[{func_info,{atom,M},{atom,F},Ar},Le|Is]}.
-
-%%%
-%%% The validator follows.
-%%%
-%%% The purpose of the validator is find errors in the generated code
-%%% that may cause the emulator to crash or behave strangely.
-%%% We don't care about type errors in the user's code that will
-%%% cause a proper exception at run-time.
-%%%
-
-%%% Things currently not checked. XXX
-%%%
-%%% - That floating point registers are initialized before used.
-%%% - That fclearerror and fcheckerror are used properly.
-%%% - Heap allocation for floating point numbers.
-%%% - Heap allocation for binaries.
-%%% - That a catchtag or trytag is not overwritten by the wrong
-%%%   type of instruction (such as move/2).
-%%% - Make sure that all catchtags and trytags have been removed
-%%%   from the stack at return/tail call.
-%%% - Verify get_list instructions.
-%%%
-
-%% validate([Function]) -> [] | [Error]
-%%  A list of functions with their code. The code is in the same
-%%  format as used in the compiler and in .S files.
-validate([]) -> [];
-validate([{function,Name,Ar,Entry,Code}|Fs]) ->
-    try validate_1(Code, Name, Ar, Entry) of
-	_ -> validate(Fs)
-    catch
-	Error ->
-	    [Error|validate(Fs)];
-	  error:Error ->
-	    [validate_error(Error, Name, Ar)|validate(Fs)]
-    end.
-
--ifdef(DEBUG).
-validate_error(Error, Name, Ar) ->
-    exit(validate_error_1(Error, Name, Ar)).
--else.
-validate_error(Error, Name, Ar) ->
-    validate_error_1(Error, Name, Ar).
--endif.
-validate_error_1(Error, Name, Ar) ->
-    {{'_',Name,Ar},
-     {internal_error,'_',{Error,erlang:get_stacktrace()}}}.
-
--record(st,				%Emulation state
-	{x=init_regs(0, term),		%x register info.
-	 y=init_regs(0, initialized),	%y register info.
-	 numy=none,			%Number of y registers.
-	 h=0,				%Available heap size.
-	 ct=[]				%List of hot catch/try labels
-	}).
-
--record(vst,				%Validator state
-	{current=none,			%Current state
-	 branched=gb_trees:empty()	%States at jumps
-	}).
-
--ifdef(DEBUG).
-print_st(#st{x=Xs,y=Ys,numy=NumY,h=H,ct=Ct}) ->
-    io:format("  #st{x=~p~n"
-	      "      y=~p~n"
-	      "      numy=~p,h=~p,ct=~w~n",
-	      [gb_trees:to_list(Xs),gb_trees:to_list(Ys),NumY,H,Ct]).
--endif.
-
-validate_1(Is, Name, Arity, Entry) ->
-    validate_2(labels(Is), Name, Arity, Entry).
-
-validate_2({Ls1,[{func_info,{atom,Mod},{atom,Name},Arity}=_F|Is]},
-	   Name, Arity, Entry) ->
-    lists:foreach(fun (_L) -> ?DBG_FORMAT("  ~p.~n", [_L]) end, Ls1),
-    ?DBG_FORMAT("  ~p.~n", [_F]),
-    validate_3(labels(Is), Name, Arity, Entry, Mod, Ls1);
-validate_2({Ls1,Is}, Name, Arity, _Entry) ->
-    error({{'_',Name,Arity},{first(Is),length(Ls1),illegal_instruction}}).
-
-validate_3({Ls2,Is}, Name, Arity, Entry, Mod, Ls1) ->
-    lists:foreach(fun (_L) -> ?DBG_FORMAT("  ~p.~n", [_L]) end, Ls2),
-    Offset = 1 + length(Ls2),
-    case lists:member(Entry, Ls2) of
-	true ->
-	    St = init_state(Arity),
-	    Vst = #vst{current=St,
-		       branched=gb_trees_from_list([{L,St} || L <- Ls1])},
-	    valfun(Is, {Mod,Name,Arity}, Offset, Vst);
-	false ->
-	    error({{Mod,Name,Arity},{first(Is),Offset,no_entry_label}})
-    end.
-
-first([X|_]) -> X;
-first([]) -> [].
-
-labels(Is) ->
-    labels_1(Is, []).
-
-labels_1([{label,L}|Is], R) ->
-    labels_1(Is, [L|R]);
-labels_1(Is, R) ->
-    {lists:reverse(R),Is}.
-
-init_state(Arity) ->
-    Xs = init_regs(Arity, term),
-    Ys = init_regs(0, initialized),
-    #st{x=Xs,y=Ys,numy=none,h=0,ct=[]}.
-
-init_regs(0, _) ->
-    gb_trees:empty();
-init_regs(N, Type) ->
-    gb_trees_from_list([{R,Type} || R <- lists:seq(0, N-1)]).
-
-valfun([], _MFA, _Offset, Vst) -> Vst;
-valfun([I|Is], MFA, Offset, Vst) ->
-    ?DBG_FORMAT("    ~p.\n", [I]),
-    valfun(Is, MFA, Offset+1,
-	   try valfun_1(I, Vst)
-	   catch Error ->
-		   error({MFA,{I,Offset,Error}})
-	   end).
-
-%% Instructions that are allowed in dead code or when failing,
-%% that is while the state is undecided in some way.
-valfun_1({label,Lbl}, #vst{current=St0,branched=B}=Vst) ->
-    St = merge_states(Lbl, St0, B),
-    Vst#vst{current=St,branched=gb_trees:enter(Lbl, St, B)};
-valfun_1(_I, #vst{current=none}=Vst) ->
-    %% Ignore instructions after erlang:error/1,2, which
-    %% the original R10B compiler thought would return.
-    ?DBG_FORMAT("Ignoring ~p\n", [_I]),
-    Vst;
-valfun_1({badmatch,Src}, Vst) ->
-    assert_term(Src, Vst),
-    kill_state(Vst);
-valfun_1({case_end,Src}, Vst) ->
-    assert_term(Src, Vst),
-    kill_state(Vst);
-valfun_1(if_end, Vst) ->
-    kill_state(Vst);
-valfun_1({try_case_end,Src}, Vst) ->
-    assert_term(Src, Vst),
-    kill_state(Vst);
-%% Instructions that can not cause exceptions
-valfun_1({move,Src,Dst}, Vst) ->
-    Type = get_term_type(Src, Vst),
-    set_type_reg(Type, Dst, Vst);
-valfun_1({fmove,Src,{fr,_}}, Vst) ->
-    assert_type(float, Src, Vst);
-valfun_1({fmove,{fr,_},Dst}, Vst) ->
-    set_type_reg({float,[]}, Dst, Vst);
-valfun_1({kill,{y,_}=Reg}, Vst) ->
-    set_type_y(initialized, Reg, Vst);
-valfun_1({test_heap,Heap,Live}, Vst) ->
-    test_heap(Heap, Live, Vst);
-valfun_1({bif,_Op,nofail,Src,Dst}, Vst) ->
-    validate_src(Src, Vst),
-    set_type_reg(term, Dst, Vst);
-%% Put instructions.
-valfun_1({put_list,A,B,Dst}, Vst0) ->
-    assert_term(A, Vst0),
-    assert_term(B, Vst0),
-    Vst = eat_heap(2, Vst0),
-    set_type_reg(cons, Dst, Vst);
-valfun_1({put_tuple,Sz,Dst}, Vst0) when is_integer(Sz) ->
-    Vst = eat_heap(1, Vst0),
-    set_type_reg({tuple,Sz}, Dst, Vst);
-valfun_1({put,Src}, Vst) ->
-    assert_term(Src, Vst),
-    eat_heap(1, Vst);
-valfun_1({put_string,Sz,_,Dst}, Vst0) when is_integer(Sz) ->
-    Vst = eat_heap(2*Sz, Vst0),
-    set_type_reg(cons, Dst, Vst);
-%% Allocate and deallocate, et.al
-valfun_1({allocate,Stk,Live}, Vst) ->
-    allocate(false, Stk, 0, Live, Vst);
-valfun_1({allocate_heap,Stk,Heap,Live}, Vst) ->
-    allocate(false, Stk, Heap, Live, Vst);
-valfun_1({allocate_zero,Stk,Live}, Vst) ->
-    allocate(true, Stk, 0, Live, Vst);
-valfun_1({allocate_heap_zero,Stk,Heap,Live}, Vst) ->
-    allocate(true, Stk, Heap, Live, Vst);
-valfun_1({init,{y,_}=Reg}, Vst) ->
-    set_type_y(initialized, Reg, Vst);
-valfun_1({deallocate,StkSize}, #vst{current=#st{numy=StkSize,ct=[]}}=Vst) ->
-    deallocate(Vst);
-valfun_1({deallocate,_}, #vst{current=#st{numy=NumY,ct=[]}}) ->
-    error({allocated,NumY});
-valfun_1({deallocate,_}, #vst{current=#st{ct=Fails}}) ->
-    error({catch_try_stack,Fails});
-%% Catch & try.
-valfun_1({'catch',Dst,{f,Fail}}, Vst0) when Fail /= none ->
-    Vst = #vst{current=#st{ct=Fails}=St} = 
-	set_type_y({catchtag,Fail}, Dst, Vst0),
-    Vst#vst{current=St#st{ct=[Fail|Fails]}};
-valfun_1({'try',Dst,{f,Fail}}, Vst0) ->
-    Vst = #vst{current=#st{ct=Fails}=St} = 
-	set_type_y({trytag,Fail}, Dst, Vst0),
-    Vst#vst{current=St#st{ct=[Fail|Fails]}};
-%% Do a postponed state branch if necessary and try next set of instructions
-valfun_1(I, #vst{current=#st{ct=[]}}=Vst) ->
-    valfun_2(I, Vst);
-valfun_1(I, #vst{current=#st{ct=Fails}}=Vst0) -> 
-    %% Perform a postponed state branch
-    Vst = #vst{current=St} = lists:foldl(fun branch_state/2, Vst0, Fails),
-    valfun_2(I, Vst#vst{current=St#st{ct=[]}}).
-
-%% Instructions that can cause exceptions.
-valfun_2({apply,Live}, Vst) ->
-    call(Live+2, Vst);
-valfun_2({apply_last,Live,_}, Vst) ->
-    tail_call(Live+2, Vst);
-valfun_2({call_fun,Live}, Vst) ->
-    call(Live, Vst);
-valfun_2({call,Live,_}, Vst) ->
-    call(Live, Vst);
-valfun_2({call_ext,Live,Func}, Vst) ->
-    call(Func, Live, Vst);
-valfun_2({call_only,Live,_}, Vst) ->
-    tail_call(Live, Vst);
-valfun_2({call_ext_only,Live,_}, Vst) ->
-    tail_call(Live, Vst);
-valfun_2({call_last,Live,_,_}, Vst) ->
-    tail_call(Live, Vst);
-valfun_2({call_ext_last,Live,_,_}, Vst) ->
-    tail_call(Live, Vst);
-valfun_2({make_fun,_,_,Live}, Vst) ->
-    call(Live, Vst);
-valfun_2({make_fun2,_,_,_,Live}, Vst) ->
-    call(Live, Vst);
-%% Floating point.
-valfun_2({fconv,Src,{fr,_}}, Vst) ->
-    assert_term(Src, Vst);
-valfun_2({bif,fadd,_,[{fr,_},{fr,_}],{fr,_}}, Vst) ->
-    Vst;
-valfun_2({bif,fdiv,_,[{fr,_},{fr,_}],{fr,_}}, Vst) ->
-    Vst;
-valfun_2({bif,fmul,_,[{fr,_},{fr,_}],{fr,_}}, Vst) ->
-    Vst;
-valfun_2({bif,fnegate,_,[{fr,_}],{fr,_}}, Vst) ->
-    Vst;
-valfun_2({bif,fsub,_,[{fr,_},{fr,_}],{fr,_}}, Vst) ->
-    Vst;
-valfun_2(fclearerror, Vst) ->
-    Vst;
-valfun_2({fcheckerror,_}, Vst) ->
-    Vst;
-%% Other BIFs
-valfun_2({bif,element,{f,Fail},[Pos,Tuple],Dst}, Vst0) ->
-    TupleType0 = get_term_type(Tuple, Vst0),
-    PosType = get_term_type(Pos, Vst0),
-    Vst1 = branch_state(Fail, Vst0),
-    TupleType = upgrade_type({tuple,[get_tuple_size(PosType)]}, TupleType0),
-    Vst = set_type(TupleType, Tuple, Vst1),
-    set_type_reg(term, Dst, Vst);
-valfun_2({bif,Op,{f,Fail},Src,Dst}, Vst0) ->
-    validate_src(Src, Vst0),
-    Vst = branch_state(Fail, Vst0),
-    Type = bif_type(Op, Src, Vst),
-    set_type_reg(Type, Dst, Vst);
-valfun_2(return, #vst{current=#st{numy=none}}=Vst) ->
-    kill_state(Vst);
-valfun_2(return, #vst{current=#st{numy=NumY}}) ->
-    error({stack_frame,NumY});
-valfun_2({jump,{f,_}}, #vst{current=none}=Vst) ->
-    %% Must be an unreachable jump which was not optimized away.
-    %% Do nothing.
-    Vst;
-valfun_2({jump,{f,Lbl}}, Vst) ->
-    kill_state(branch_state(Lbl, Vst));
-valfun_2({loop_rec,{f,Fail},Dst}, Vst0) ->
-    Vst = branch_state(Fail, Vst0),
-    set_type_reg(term, Dst, Vst);
-valfun_2(remove_message, Vst) ->
-    Vst;
-valfun_2({wait,_}, Vst) ->
-    kill_state(Vst);
-valfun_2({wait_timeout,_,Src}, Vst) ->
-    assert_term(Src, Vst);
-valfun_2({loop_rec_end,_}, Vst) ->
-    kill_state(Vst);
-valfun_2(timeout, #vst{current=St}=Vst) ->
-    Vst#vst{current=St#st{x=init_regs(0, term)}};
-valfun_2(send, Vst) ->
-    call(2, Vst);
-%% Catch & try.
-valfun_2({catch_end,Reg}, Vst0) ->
-    case get_type(Reg, Vst0) of
-	{catchtag,_} ->
-	    Vst = #vst{current=St} = set_type_reg(initialized, Reg, Vst0),
-	    Xs = gb_trees_from_list([{0,term}]),
-	    Vst#vst{current=St#st{x=Xs}};
-	Type ->
-	    error({bad_type,Type})
-    end;
-valfun_2({try_end,Reg}, Vst) ->
-    case get_type(Reg, Vst) of
-	{trytag,_} ->
-	    set_type_reg(initialized, Reg, Vst);
-	Type ->
-	    error({bad_type,Type})
-    end;
-valfun_2({try_case,Reg}, Vst0) ->
-    case get_type(Reg, Vst0) of
-	{trytag,_} ->
-	    Vst = #vst{current=St} = set_type_reg(initialized, Reg, Vst0),
-	    Xs = gb_trees_from_list([{0,{atom,[]}},{1,term},{2,term}]),
-	    Vst#vst{current=St#st{x=Xs}};
-	Type ->
-	    error({bad_type,Type})
-    end;
-valfun_2({set_tuple_element,Src,Tuple,I}, Vst) ->
-    assert_term(Src, Vst),
-    assert_type({tuple_element,I+1}, Tuple, Vst);
-%% Match instructions.
-valfun_2({select_val,Src,{f,Fail},{list,Choices}}, Vst) ->
-    assert_term(Src, Vst),
-    Lbls = [L || {f,L} <- Choices]++[Fail],
-    kill_state(foldl(fun(L, S) -> branch_state(L, S) end, Vst, Lbls));
-valfun_2({select_tuple_arity,Tuple,{f,Fail},{list,Choices}}, Vst) ->
-    assert_type(tuple, Tuple, Vst),
-    kill_state(branch_arities(Choices, Tuple, branch_state(Fail, Vst)));
-valfun_2({get_list,Src,D1,D2}, Vst0) ->
-    assert_term(Src, Vst0),
-    Vst = set_type_reg(term, D1, Vst0),
-    set_type_reg(term, D2, Vst);
-valfun_2({get_tuple_element,Src,I,Dst}, Vst) ->
-    assert_type({tuple_element,I+1}, Src, Vst),
-    set_type_reg(term, Dst, Vst);
-valfun_2({bs_restore,_}, Vst) ->
-    Vst;
-valfun_2({bs_save,_}, Vst) ->
-    Vst;
-valfun_2({bs_start_match,{f,Fail},Src}, Vst) ->
-    assert_term(Src, Vst),
-    branch_state(Fail, Vst);
-valfun_2({test,bs_skip_bits,{f,Fail},[Src,_,_]}, Vst) ->
-    assert_term(Src, Vst),
-    branch_state(Fail, Vst);
-valfun_2({test,_,{f,Fail},[_,_,_,Dst]}, Vst0) ->
-    Vst = branch_state(Fail, Vst0),
-    set_type_reg({integer,[]}, Dst, Vst);
-valfun_2({test,bs_test_tail,{f,Fail},_}, Vst) ->
-    branch_state(Fail, Vst);
-%% Other test instructions.
-valfun_2({test,is_float,{f,Lbl},[Float]}, Vst0) ->
-    assert_term(Float, Vst0),
-    Vst = branch_state(Lbl, Vst0),
-    set_type({float,[]}, Float, Vst);
-valfun_2({test,is_tuple,{f,Lbl},[Tuple]}, Vst0) ->
-    assert_term(Tuple, Vst0),
-    Vst = branch_state(Lbl, Vst0),
-    set_type({tuple,[0]}, Tuple, Vst);
-valfun_2({test,test_arity,{f,Lbl},[Tuple,Sz]}, Vst0) when is_integer(Sz) ->
-    assert_type(tuple, Tuple, Vst0),
-    Vst = branch_state(Lbl, Vst0),
-    set_type_reg({tuple,Sz}, Tuple, Vst);
-valfun_2({test,_Op,{f,Lbl},Src}, Vst) ->
-    validate_src(Src, Vst),
-    branch_state(Lbl, Vst);
-valfun_2({bs_add,{f,Fail},[A,B,_],Dst}, Vst0) ->
-    assert_term(A, Vst0),
-    assert_term(B, Vst0),
-    Vst = branch_state(Fail, Vst0),
-    set_type_reg({integer,[]}, Dst, Vst);
-valfun_2({bs_bits_to_bytes,{f,Fail},Src,Dst}, Vst0) ->
-    assert_term(Src, Vst0),
-    Vst = branch_state(Fail, Vst0),
-    set_type_reg({integer,[]}, Dst, Vst);
-valfun_2({bs_init2,{f,Fail},_,Heap,_,_,Dst}, Vst0) ->
-    Vst1 = heap_alloc(Heap, Vst0),
-    Vst = branch_state(Fail, Vst1),
-    set_type_reg(binary, Dst, Vst);
-valfun_2({bs_put_string,Sz,_}, Vst) when is_integer(Sz) ->
-    Vst;
-valfun_2({bs_put_binary,{f,Fail},_,_,_,Src}, Vst0) ->
-    assert_term(Src, Vst0),
-    branch_state(Fail, Vst0);
-valfun_2({bs_put_float,{f,Fail},_,_,_,Src}, Vst0) ->
-    assert_term(Src, Vst0),
-    branch_state(Fail, Vst0);
-valfun_2({bs_put_integer,{f,Fail},_,_,_,Src}, Vst0) ->
-    assert_term(Src, Vst0),
-    branch_state(Fail, Vst0);
-%% Old bit syntax construction (before R10B).
-valfun_2({bs_init,_,_}, Vst) -> Vst;
-valfun_2({bs_need_buf,_}, Vst) -> Vst;
-valfun_2({bs_final,{f,Fail},Dst}, Vst0) ->
-    Vst = branch_state(Fail, Vst0),
-    set_type_reg(binary, Dst, Vst);
-%% Misc.
-valfun_2({'%live',Live}, Vst) ->
-    verify_live(Live, Vst),
-    Vst;
-valfun_2(_, _) ->
-    error(unknown_instruction).
-
-kill_state(#vst{current=#st{ct=[]}}=Vst) -> 
-    Vst#vst{current=none};
-kill_state(#vst{current=#st{ct=Fails}}=Vst0) -> 
-    Vst = lists:foldl(fun branch_state/2, Vst0, Fails),
-    Vst#vst{current=none}.
-
-%% A "plain" call.
-%%  The stackframe must have a known size and be initialized.
-%%  The instruction will return to the instruction following the call.
-call(Live, #vst{current=St}=Vst) ->
-    verify_live(Live, Vst),
-    verify_y_init(Vst),
-    Xs = gb_trees_from_list([{0,term}]),
-    Vst#vst{current=St#st{x=Xs}}.
-
-%% A "plain" call.
-%%  The stackframe must have a known size and be initialized.
-%%  The instruction will return to the instruction following the call.
-call(Name, Live, #vst{current=St}=Vst) ->
-    verify_live(Live, Vst),
-    case return_type(Name, Vst) of
-	exception ->
-	    kill_state(Vst);
-	Type ->
-	    verify_y_init(Vst),
-	    Xs = gb_trees_from_list([{0,Type}]),
-	    Vst#vst{current=St#st{x=Xs}}
-    end.
-
-%% Tail call.
-%%  The stackframe must have a known size and be initialized.
-%%  Does not return to the instruction following the call.
-tail_call(Live, Vst) ->
-    kill_state(call(Live, Vst)).
-
-allocate(Zero, Stk, Heap, Live, #vst{current=#st{numy=none}=St}=Vst) ->
-    verify_live(Live, Vst),
-    Ys = init_regs(case Zero of 
-		       true -> Stk;
-		       false -> 0
-		   end, initialized),
-    Vst#vst{current=St#st{y=Ys,numy=Stk,h=heap_alloc_1(Heap)}};
-allocate(_, _, _, _, #vst{current=#st{numy=Numy}}) ->
-    error({existing_stack_frame,{size,Numy}}).
-
-deallocate(#vst{current=St}=Vst) ->
-    Vst#vst{current=St#st{y=init_regs(0, initialized),numy=none}}.
-
-test_heap(Heap, Live, Vst) ->
-    verify_live(Live, Vst),
-    heap_alloc(Heap, Vst).
-
-heap_alloc(Heap, #vst{current=St}=Vst) ->
-    Vst#vst{current=St#st{h=heap_alloc_1(Heap)}}.
-    
-heap_alloc_1({alloc,Alloc}) ->
-    {value,{_,Heap}} = lists:keysearch(words, 1, Alloc),
-    Heap;
-heap_alloc_1(Heap) when is_integer(Heap) -> Heap.
-
-
-set_type(Type, {x,_}=Reg, Vst) -> set_type_reg(Type, Reg, Vst);
-set_type(Type, {y,_}=Reg, Vst) -> set_type_y(Type, Reg, Vst);
-set_type(_, _, #vst{}=Vst) -> Vst.
-
-set_type_reg(Type, {x,X}, #vst{current=#st{x=Xs}=St}=Vst) 
-  when 0 =< X, X < ?MAXREG ->
-    Vst#vst{current=St#st{x=gb_trees:enter(X, Type, Xs)}};
-set_type_reg(Type, Reg, Vst) ->
-    set_type_y(Type, Reg, Vst).
-
-set_type_y(Type, {y,Y}=Reg, #vst{current=#st{y=Ys,numy=NumY}=St}=Vst) 
-  when is_integer(Y), 0 =< Y, Y < ?MAXREG ->
-    case {Y,NumY} of
-	{_,none} ->
-	    error({no_stack_frame,Reg});
-	{_,_} when Y > NumY ->
-	    error({y_reg_out_of_range,Reg,NumY});
-	{_,_} ->
-	    Vst#vst{current=St#st{y=gb_trees:enter(Y, Type, Ys)}}
-    end;
-set_type_y(Type, Reg, #vst{}) -> error({invalid_store,Reg,Type}).
-
-assert_term(Src, Vst) ->
-    get_term_type(Src, Vst),
-    Vst.
-
-%% The possible types.
-%%
-%% First non-term types:
-%%
-%% initialized		Only for Y registers. Means that the Y register
-%%			has been initialized with some valid term so that
-%%			it is safe to pass to the garbage collector.
-%%			NOT safe to use in any other way (will not crash the
-%%			emulator, but clearly points to a bug in the compiler).
-%%
-%% {catchtag,Lbl}	A special term used within a catch. Must only be used
-%%			by the catch instructions; NOT safe to use in other
-%%			instructions.
-%%
-%% {trytag,Lbl}		A special term used within a try block. Must only be
-%%			used by the catch instructions; NOT safe to use in other
-%%			instructions.
-%%
-%% exception		Can only be used as a type returned by return_type/2
-%%			(which gives the type of the value returned by a BIF).
-%%			Thus 'exception' is never stored as type descriptor
-%%			for a register.
-%%
-%% Normal terms:
-%%
-%% term			Any valid Erlang (but not of the special types above).
-%%
-%% bool			The atom 'true' or the atom 'false'.
-%%
-%% cons         	Cons cell: [_|_]
-%%
-%% nil			Empty list: []
-%%
-%% {tuple,[Sz]}		Tuple. An element has been accessed using
-%%              	element/2 or setelement/3 so that it is known that
-%%              	the type is a tuple of size at least Sz.
-%%
-%% {tuple,Sz}		Tuple. A test_arity instruction has been seen
-%%           		so that it is known that the size is exactly Sz.
-%%
-%% {atom,[]}		Atom.
-%% {atom,Atom}
-%%
-%% {integer,[]}		Integer.
-%% {integer,Integer}
-%%
-%% {float,[]}		Float.
-%% {float,Float}
-%%
-%% number		Integer or Float of unknown value
-%%
-
-assert_type(WantedType, Term, Vst) ->
-    assert_type(WantedType, get_type(Term, Vst)),
-    Vst.
-
-assert_type(float, {float,_}) -> ok;
-assert_type(tuple, {tuple,_}) -> ok;
-assert_type({tuple_element,I}, {tuple,[Sz]})
-  when 1 =< I, I =< Sz ->
-    ok;
-assert_type({tuple_element,I}, {tuple,Sz})
-  when is_integer(Sz), 1 =< I, I =< Sz ->
-    ok;
-assert_type(Needed, Actual) ->
-    error({bad_type,{needed,Needed},{actual,Actual}}).
-
-%% upgrade_type/2 is used when linear code finds out more and
-%% more information about a type, so the type gets "narrower"
-%% or perhaps inconsistent. In the case of inconsistency
-%% we mostly widen the type to 'term' to make subsequent
-%% code fail if it assumes anything about the type.
-
-upgrade_type(Same, Same) -> Same;
-upgrade_type(term, OldT) -> OldT;
-upgrade_type(NewT, term) -> NewT;
-upgrade_type({Type,New}=NewT, {Type,Old}=OldT)
-  when Type == atom; Type == integer; Type == float ->
-    if New =:= Old -> OldT;
-       New =:= [] -> OldT;
-       Old =:= [] -> NewT;
-       true -> term
-    end;
-upgrade_type({Type,_}=NewT, number) 
-  when Type == integer; Type == float ->
-    NewT;
-upgrade_type(number, {Type,_}=OldT) 
-  when Type == integer; Type == float ->
-    OldT;
-upgrade_type(bool, {atom,A}) ->
-    upgrade_bool(A);
-upgrade_type({atom,A}, bool) ->
-    upgrade_bool(A);
-upgrade_type({tuple,[Sz]}, {tuple,[OldSz]})
-  when is_integer(Sz) ->
-    {tuple,[max(Sz, OldSz)]};
-upgrade_type({tuple,Sz}=T, {tuple,[_]}) 
-  when is_integer(Sz) ->
-    %% This also takes care of the user error when a tuple element
-    %% is accesed outside the known exact tuple size; there is 
-    %% no more type information, just a runtime error which is not
-    %% our problem.
-    T;
-upgrade_type({tuple,[Sz]}, {tuple,_}=T) 
-  when is_integer(Sz) ->
-    %% Same as the previous clause but mirrored.
-    T;
-upgrade_type(_A, _B) ->
-    %%io:format("upgrade_type: ~p ~p\n", [_A,_B]),
-    term.
-
-upgrade_bool([]) -> bool;
-upgrade_bool(true) -> {atom,true};
-upgrade_bool(false) -> {atom,false};
-upgrade_bool(_) -> term.
-
-get_tuple_size({integer,[]}) -> 0;
-get_tuple_size({integer,Sz}) -> Sz;
-get_tuple_size(_) -> 0.
-
-validate_src(Ss, Vst) when is_list(Ss) ->
-    foldl(fun(S, _) -> get_type(S, Vst) end, ok, Ss).
-
-get_term_type(Src, Vst) ->
-    case get_type(Src, Vst) of
-	initialized -> error({not_assigned,Src});
-	exception -> error({exception,Src});
-	{catchtag,_} -> error({catchtag,Src});
-	{trytag,_} -> error({trytag,Src});
-	Type -> Type
-    end.
-
-get_type(nil=T, _) -> T;
-get_type({atom,A}=T, _) when is_atom(A) -> T;
-get_type({float,F}=T, _) when is_float(F) -> T;
-get_type({integer,I}=T, _) when is_integer(I) -> T;
-get_type({x,X}=Reg, #vst{current=#st{x=Xs}}) when is_integer(X) ->
-    case gb_trees:lookup(X, Xs) of
-	{value,Type} -> Type;
-	none -> error({uninitialized_reg,Reg})
-    end;
-get_type({y,Y}=Reg, #vst{current=#st{y=Ys}}) when is_integer(Y) ->
-    case gb_trees:lookup(Y, Ys) of
-	{value,initialized} -> error({unassigned_reg,Reg});
-	{value,Type} -> Type;
-	none -> error({uninitialized_reg,Reg})
-    end;
-get_type(Src, _) -> error({bad_source,Src}).
-
-branch_arities([], _, #vst{}=Vst) -> Vst;
-branch_arities([Sz,{f,L}|T], Tuple, #vst{current=St}=Vst0) 
-  when is_integer(Sz) ->
-    Vst1 = set_type_reg({tuple,Sz}, Tuple, Vst0),
-    Vst = branch_state(L, Vst1),
-    branch_arities(T, Tuple, Vst#vst{current=St}).
-
-branch_state(0, #vst{}=Vst) -> Vst;
-branch_state(L, #vst{current=St,branched=B}=Vst) ->
-    Vst#vst{
-      branched=case gb_trees:is_defined(L, B) of
-		   false ->
-		       gb_trees:insert(L, St#st{ct=[]}, B);
-		   true ->
-		       MergedSt = merge_states(L, St, B),
-		       gb_trees:update(L, MergedSt#st{ct=[]}, B)
-	       end}.
-
-%% merge_states/3 is used when there are more than one way to arrive
-%% at this point, and the type states for the different paths has
-%% to be merged. The type states are downgraded to the least common
-%% subset for the subsequent code.
-
-merge_states(0, St, _Branched) -> St;
-merge_states(L, St, Branched) ->
-    case gb_trees:lookup(L, Branched) of
-	none -> St;
-	{value,OtherSt} when St == none -> OtherSt;
-	{value,OtherSt} ->
-	    merge_states_1(St, OtherSt)
-    end.
-
-merge_states_1(#st{x=Xs0,y=Ys0,numy=NumY0,h=H0}=St,
-	       #st{x=Xs1,y=Ys1,numy=NumY1,h=H1}) ->
-    NumY = merge_stk(NumY0, NumY1),
-    Xs = merge_regs(Xs0, Xs1),
-    Ys = merge_regs(Ys0, Ys1),
-    St#st{x=Xs,y=Ys,numy=NumY,h=min(H0, H1)}.
-
-merge_stk(S, S) -> S;
-merge_stk(_, _) -> undecided.
-
-merge_regs(Rs0, Rs1) ->
-    Rs = merge_regs_1(gb_trees:to_list(Rs0), gb_trees:to_list(Rs1)),
-    gb_trees_from_list(Rs).
-
-merge_regs_1([Same|Rs1], [Same|Rs2]) ->
-    [Same|merge_regs_1(Rs1, Rs2)];
-merge_regs_1([{R1,_}|Rs1], [{R2,_}|_]=Rs2) when R1 < R2 ->
-    merge_regs_1(Rs1, Rs2);
-merge_regs_1([{R1,_}|_]=Rs1, [{R2,_}|Rs2]) when R1 > R2 ->
-    merge_regs_1(Rs1, Rs2);
-merge_regs_1([{R,Type1}|Rs1], [{R,Type2}|Rs2]) ->
-    [{R,merge_types(Type1, Type2)}|merge_regs_1(Rs1, Rs2)];
-merge_regs_1([], []) -> [];
-merge_regs_1([], [_|_]) -> [];
-merge_regs_1([_|_], []) -> [].
-
-merge_types(T, T) -> T;
-merge_types(initialized=I, _) -> I;
-merge_types(_, initialized=I) -> I;
-merge_types({tuple,Same}=T, {tuple,Same}) -> T;
-merge_types({tuple,A}, {tuple,B}) ->
-    {tuple,[min(tuple_sz(A), tuple_sz(B))]};
-merge_types({Type,A}, {Type,B}) 
-  when Type == atom; Type == integer; Type == float ->
-    if A =:= B -> {Type,A};
-       true -> {Type,[]}
-    end;
-merge_types({Type,_}, number) 
-  when Type == integer; Type == float ->
-    number;
-merge_types(number, {Type,_}) 
-  when Type == integer; Type == float ->
-    number;
-merge_types(bool, {atom,A}) ->
-    merge_bool(A);
-merge_types({atom,A}, bool) ->
-    merge_bool(A);
-merge_types(_, _) -> term.
-
-tuple_sz([Sz]) -> Sz;
-tuple_sz(Sz) -> Sz.
-
-merge_bool([]) -> {atom,[]};
-merge_bool(true) -> bool;
-merge_bool(false) -> bool;
-merge_bool(_) -> {atom,[]}.
-    
-verify_y_init(#vst{current=#st{numy=none}}) -> ok;
-verify_y_init(#vst{current=#st{numy=undecided}}) ->
-    error(unknown_size_of_stackframe);
-verify_y_init(#vst{current=#st{y=Ys,numy=NumY}}) ->
-    verify_y_init_1(NumY, Ys).
-
-verify_y_init_1(0, _) -> ok;
-verify_y_init_1(N, Ys) ->
-    Y = N-1,
-    case gb_trees:is_defined(Y, Ys) of
-	false -> error({{y,Y},not_initialized});
-	true -> verify_y_init_1(Y, Ys)
-    end.
-
-verify_live(0, #vst{}) -> ok;
-verify_live(N, #vst{current=#st{x=Xs}}) ->
-    verify_live_1(N, Xs).
-
-verify_live_1(0, _) -> ok;
-verify_live_1(N, Xs) ->
-    X = N-1,
-    case gb_trees:is_defined(X, Xs) of
-	false -> error({{x,X},not_live});
-	true -> verify_live_1(X, Xs)
-    end.
-
-eat_heap(N, #vst{current=#st{h=Heap0}=St}=Vst) ->
-    case Heap0-N of
-	Neg when Neg < 0 ->
-	    error({heap_overflow,{left,Heap0},{wanted,N}});
-	Heap ->
-	    Vst#vst{current=St#st{h=Heap}}
-    end.
-
-bif_type('-', Src, Vst) ->
-    arith_type(Src, Vst);
-bif_type('+', Src, Vst) ->
-    arith_type(Src, Vst);
-bif_type('*', Src, Vst) ->
-    arith_type(Src, Vst);
-bif_type(abs, [Num], Vst) ->
-    case get_type(Num, Vst) of
-	{float,_}=T -> T;
-	{integer,_}=T -> T;
-	_ -> number
-    end;
-bif_type(float, _, _) -> {float,[]};
-bif_type('/', _, _) -> {float,[]};
-%% Integer operations.
-bif_type('div', [_,_], _) -> {integer,[]};
-bif_type('rem', [_,_], _) -> {integer,[]};
-bif_type(length, [_], _) -> {integer,[]};
-bif_type(size, [_], _) -> {integer,[]};
-bif_type(trunc, [_], _) -> {integer,[]};
-bif_type(round, [_], _) -> {integer,[]};
-bif_type('band', [_,_], _) -> {integer,[]};
-bif_type('bor', [_,_], _) -> {integer,[]};
-bif_type('bxor', [_,_], _) -> {integer,[]};
-bif_type('bnot', [_], _) -> {integer,[]};
-bif_type('bsl', [_,_], _) -> {integer,[]};
-bif_type('bsr', [_,_], _) -> {integer,[]};
-%% Booleans.
-bif_type('==', [_,_], _) -> bool;
-bif_type('/=', [_,_], _) -> bool;
-bif_type('=<', [_,_], _) -> bool;
-bif_type('<', [_,_], _) -> bool;
-bif_type('>=', [_,_], _) -> bool;
-bif_type('>', [_,_], _) -> bool;
-bif_type('=:=', [_,_], _) -> bool;
-bif_type('=/=', [_,_], _) -> bool;
-bif_type('not', [_], _) -> bool;
-bif_type('and', [_,_], _) -> bool;
-bif_type('or', [_,_], _) -> bool;
-bif_type('xor', [_,_], _) -> bool;
-bif_type(is_atom, [_], _) -> bool;
-bif_type(is_boolean, [_], _) -> bool;
-bif_type(is_binary, [_], _) -> bool;
-bif_type(is_constant, [_], _) -> bool;
-bif_type(is_float, [_], _) -> bool;
-bif_type(is_function, [_], _) -> bool;
-bif_type(is_integer, [_], _) -> bool;
-bif_type(is_list, [_], _) -> bool;
-bif_type(is_number, [_], _) -> bool;
-bif_type(is_pid, [_], _) -> bool;
-bif_type(is_port, [_], _) -> bool;
-bif_type(is_reference, [_], _) -> bool;
-bif_type(is_tuple, [_], _) -> bool;
-%% Misc.
-bif_type(node, [], _) -> {atom,[]};
-bif_type(node, [_], _) -> {atom,[]};
-bif_type(hd, [_], _) -> term;
-bif_type(tl, [_], _) -> term;
-bif_type(get, [_], _) -> term;
-bif_type(raise, [_,_], _) -> exception;
-bif_type(_, _, _) -> term.
-
-arith_type([A,B], Vst) ->
-    case {get_type(A, Vst),get_type(B, Vst)} of
-	{{float,_},_} -> {float,[]};
-	{_,{float,_}} -> {float,[]};
-	{_,_} -> number
-    end;
-arith_type(_, _) -> number.
-
-return_type({extfunc,M,F,A}, Vst) ->
-    return_type_1(M, F, A, Vst).
-
-return_type_1(erlang, setelement, 3, Vst) ->
-    Tuple = {x,1},
-    TupleType = 
-	case get_type(Tuple, Vst) of
-	    {tuple,_}=TT -> TT;
-	    _ -> {tuple,[0]}
-	end,
-    case get_type({x,0}, Vst) of
-	{integer,[]} -> TupleType;
-	{integer,I} -> upgrade_type({tuple,[I]}, TupleType);
-	_ -> TupleType
-    end;
-return_type_1(erlang, F, A, _) ->
-    return_type_erl(F, A);
-return_type_1(math, F, A, _) ->
-    return_type_math(F, A);
-return_type_1(_, _, _, _) -> term.
-
-return_type_erl(exit, 1) -> exception;
-return_type_erl(throw, 1) -> exception;
-return_type_erl(fault, 1) -> exception;
-return_type_erl(fault, 2) -> exception;
-return_type_erl(error, 1) -> exception;
-return_type_erl(error, 2) -> exception;
-return_type_erl(_, _) -> term.
-
-return_type_math(cos, 1) -> {float,[]};
-return_type_math(cosh, 1) -> {float,[]};
-return_type_math(sin, 1) -> {float,[]};
-return_type_math(sinh, 1) -> {float,[]};
-return_type_math(tan, 1) -> {float,[]};
-return_type_math(tanh, 1) -> {float,[]};
-return_type_math(acos, 1) -> {float,[]};
-return_type_math(acosh, 1) -> {float,[]};
-return_type_math(asin, 1) -> {float,[]};
-return_type_math(asinh, 1) -> {float,[]};
-return_type_math(atan, 1) -> {float,[]};
-return_type_math(atanh, 1) -> {float,[]};
-return_type_math(erf, 1) -> {float,[]};
-return_type_math(erfc, 1) -> {float,[]};
-return_type_math(exp, 1) -> {float,[]};
-return_type_math(log, 1) -> {float,[]};
-return_type_math(log10, 1) -> {float,[]};
-return_type_math(sqrt, 1) -> {float,[]};
-return_type_math(atan2, 2) -> {float,[]};
-return_type_math(pow, 2) -> {float,[]};
-return_type_math(pi, 0) -> {float,[]};
-return_type_math(_, _) -> term.
-
-min(A, B) when is_integer(A), is_integer(B), A < B -> A;
-min(A, B) when is_integer(A), is_integer(B) -> B.
-
-max(A, B) when is_integer(A), is_integer(B), A > B -> A;
-max(A, B) when is_integer(A), is_integer(B) -> B.
-
-gb_trees_from_list(L) -> gb_trees:from_orddict(orddict:from_list(L)).
-
--ifdef(DEBUG).
-error(Error) -> exit(Error).
--else.
-error(Error) -> throw(Error).
--endif.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl.erl
deleted file mode 100644
index be9e088276..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl.erl
+++ /dev/null
@@ -1,4169 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Richard Carlsson.
-%% Copyright (C) 1999-2002 Richard Carlsson.
-%% Portions created by Ericsson are Copyright 2001, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: cerl.erl,v 1.3 2010/03/04 13:54:20 maria Exp $
-
-%% =====================================================================
-%% @doc Core Erlang abstract syntax trees.
-%%
-%% <p> This module defines an abstract data type for representing Core
-%% Erlang source code as syntax trees.</p>
-%%
-%% <p>A recommended starting point for the first-time user is the
-%% documentation of the function <a
-%% href="#type-1"><code>type/1</code></a>.</p>
-%%
-%% <h3><b>NOTES:</b></h3>
-%%
-%% <p>This module deals with the composition and decomposition of
-%% <em>syntactic</em> entities (as opposed to semantic ones); its
-%% purpose is to hide all direct references to the data structures
-%% used to represent these entities. With few exceptions, the
-%% functions in this module perform no semantic interpretation of
-%% their inputs, and in general, the user is assumed to pass
-%% type-correct arguments - if this is not done, the effects are not
-%% defined.</p>
-%%
-%% <p>The internal representations of abstract syntax trees are
-%% subject to change without notice, and should not be documented
-%% outside this module. Furthermore, we do not give any guarantees on
-%% how an abstract syntax tree may or may not be represented, <em>with
-%% the following exceptions</em>: no syntax tree is represented by a
-%% single atom, such as <code>none</code>, by a list constructor
-%% <code>[X | Y]</code>, or by the empty list <code>[]</code>. This
-%% can be relied on when writing functions that operate on syntax
-%% trees.</p>
-%%
-%% @type cerl(). An abstract Core Erlang syntax tree.
-%%
-%% <p>Every abstract syntax tree has a <em>type</em>, given by the
-%% function <a href="#type-1"><code>type/1</code></a>.  In addition,
-%% each syntax tree has a list of <em>user annotations</em> (cf.  <a
-%% href="#get_ann-1"><code>get_ann/1</code></a>), which are included
-%% in the Core Erlang syntax.</p>
-
--module(cerl).
-
--export([abstract/1, add_ann/2, alias_pat/1, alias_var/1,
-	 ann_abstract/2, ann_c_alias/3, ann_c_apply/3, ann_c_atom/2,
-	 ann_c_call/4, ann_c_case/3, ann_c_catch/2, ann_c_char/2,
-	 ann_c_clause/3, ann_c_clause/4, ann_c_cons/3, ann_c_float/2,
-	 ann_c_fname/3, ann_c_fun/3, ann_c_int/2, ann_c_let/4,
-	 ann_c_letrec/3, ann_c_module/4, ann_c_module/5, ann_c_nil/1,
-	 ann_c_cons_skel/3, ann_c_tuple_skel/2, ann_c_primop/3,
-	 ann_c_receive/2, ann_c_receive/4, ann_c_seq/3, ann_c_string/2,
-	 ann_c_try/6, ann_c_tuple/2, ann_c_values/2, ann_c_var/2,
-	 ann_make_data/3, ann_make_list/2, ann_make_list/3,
-	 ann_make_data_skel/3, ann_make_tree/3, apply_args/1,
-	 apply_arity/1, apply_op/1, atom_lit/1, atom_name/1, atom_val/1,
-	 c_alias/2, c_apply/2, c_atom/1, c_call/3, c_case/2, c_catch/1,
-	 c_char/1, c_clause/2, c_clause/3, c_cons/2, c_float/1,
-	 c_fname/2, c_fun/2, c_int/1, c_let/3, c_letrec/2, c_module/3,
-	 c_module/4, c_nil/0, c_cons_skel/2, c_tuple_skel/1, c_primop/2,
-	 c_receive/1, c_receive/3, c_seq/2, c_string/1, c_try/5,
-	 c_tuple/1, c_values/1, c_var/1, call_args/1, call_arity/1,
-	 call_module/1, call_name/1, case_arg/1, case_arity/1,
-	 case_clauses/1, catch_body/1, char_lit/1, char_val/1,
-	 clause_arity/1, clause_body/1, clause_guard/1, clause_pats/1,
-	 clause_vars/1, concrete/1, cons_hd/1, cons_tl/1, copy_ann/2,
-	 data_arity/1, data_es/1, data_type/1, float_lit/1, float_val/1,
-	 fname_arity/1, fname_id/1, fold_literal/1, from_records/1,
-	 fun_arity/1, fun_body/1, fun_vars/1, get_ann/1, int_lit/1,
-	 int_val/1, is_c_alias/1, is_c_apply/1, is_c_atom/1,
-	 is_c_call/1, is_c_case/1, is_c_catch/1, is_c_char/1,
-	 is_c_clause/1, is_c_cons/1, is_c_float/1, is_c_fname/1,
-	 is_c_fun/1, is_c_int/1, is_c_let/1, is_c_letrec/1, is_c_list/1,
-	 is_c_module/1, is_c_nil/1, is_c_primop/1, is_c_receive/1,
-	 is_c_seq/1, is_c_string/1, is_c_try/1, is_c_tuple/1,
-	 is_c_values/1, is_c_var/1, is_data/1, is_leaf/1, is_literal/1,
-	 is_literal_term/1, is_print_char/1, is_print_string/1,
-	 let_arg/1, let_arity/1, let_body/1, let_vars/1, letrec_body/1,
-	 letrec_defs/1, letrec_vars/1, list_elements/1, list_length/1,
-	 make_data/2, make_list/1, make_list/2, make_data_skel/2,
-	 make_tree/2, meta/1, module_attrs/1, module_defs/1,
-	 module_exports/1, module_name/1, module_vars/1,
-	 pat_list_vars/1, pat_vars/1, primop_args/1, primop_arity/1,
-	 primop_name/1, receive_action/1, receive_clauses/1,
-	 receive_timeout/1, seq_arg/1, seq_body/1, set_ann/2,
-	 string_lit/1, string_val/1, subtrees/1, to_records/1,
-	 try_arg/1, try_body/1, try_vars/1, try_evars/1, try_handler/1,
-	 tuple_arity/1, tuple_es/1, type/1, unfold_literal/1,
-	 update_c_alias/3, update_c_apply/3, update_c_call/4,
-	 update_c_case/3, update_c_catch/2, update_c_clause/4,
-	 update_c_cons/3, update_c_cons_skel/3, update_c_fname/2,
-	 update_c_fname/3, update_c_fun/3, update_c_let/4,
-	 update_c_letrec/3, update_c_module/5, update_c_primop/3,
-	 update_c_receive/4, update_c_seq/3, update_c_try/6,
-	 update_c_tuple/2, update_c_tuple_skel/2, update_c_values/2,
-	 update_c_var/2, update_data/3, update_list/2, update_list/3,
-	 update_data_skel/3, update_tree/2, update_tree/3,
-	 values_arity/1, values_es/1, var_name/1, c_binary/1,
-	 update_c_binary/2, ann_c_binary/2, is_c_binary/1,
-	 binary_segments/1, c_bitstr/3, c_bitstr/4, c_bitstr/5,
-	 update_c_bitstr/5, update_c_bitstr/6, ann_c_bitstr/5,
-	 ann_c_bitstr/6, is_c_bitstr/1, bitstr_val/1, bitstr_size/1,
-	 bitstr_bitsize/1, bitstr_unit/1, bitstr_type/1,
-	 bitstr_flags/1]).
-
--include("core_parse.hrl").
-
-
-%% =====================================================================
-%% Representation (general)
-%%
-%% All nodes are represented by tuples of arity 2 or (generally)
-%% greater, whose first element is an atom which uniquely identifies the
-%% type of the node, and whose second element is a (proper) list of
-%% annotation terms associated with the node - this is by default empty.
-%%
-%% For most node constructor functions, there are analogous functions
-%% named 'ann_...', taking one extra argument 'As' (always the first
-%% argument), specifying an annotation list at node creation time.
-%% Similarly, there are also functions named 'update_...', taking one
-%% extra argument 'Old', specifying a node from which all fields not
-%% explicitly given as arguments should be copied (generally, this is
-%% the annotation field only).
-%% =====================================================================
-
-%% This defines the general representation of constant literals:
-
--record(literal, {ann = [], val}).
-
-
-%% @spec type(Node::cerl()) -> atom()
-%%
-%% @doc Returns the type tag of <code>Node</code>. Current node types
-%% are:
-%%	    
-%% <p><center><table border="1">
-%%  <tr>
-%%    <td>alias</td>
-%%    <td>apply</td>
-%%    <td>binary</td>
-%%    <td>bitstr</td>
-%%    <td>call</td>
-%%    <td>case</td>
-%%    <td>catch</td>
-%%  </tr><tr>
-%%    <td>clause</td>
-%%    <td>cons</td>
-%%    <td>fun</td>
-%%    <td>let</td>
-%%    <td>letrec</td>
-%%    <td>literal</td>
-%%    <td>module</td>
-%%  </tr><tr>
-%%    <td>primop</td>
-%%    <td>receive</td>
-%%    <td>seq</td>
-%%    <td>try</td>
-%%    <td>tuple</td>
-%%    <td>values</td>
-%%    <td>var</td>
-%%  </tr>
-%% </table></center></p>
-%%
-%% <p>Note: The name of the primary constructor function for a node
-%% type is always the name of the type itself, prefixed by
-%% "<code>c_</code>"; recognizer predicates are correspondingly
-%% prefixed by "<code>is_c_</code>". Furthermore, to simplify
-%% preservation of annotations (cf. <code>get_ann/1</code>), there are
-%% analogous constructor functions prefixed by "<code>ann_c_</code>"
-%% and "<code>update_c_</code>", for setting the annotation list of
-%% the new node to either a specific value or to the annotations of an
-%% existing node, respectively.</p>
-%%
-%% @see abstract/1
-%% @see c_alias/2
-%% @see c_apply/2
-%% @see c_binary/1
-%% @see c_bitstr/5
-%% @see c_call/3
-%% @see c_case/2
-%% @see c_catch/1
-%% @see c_clause/3
-%% @see c_cons/2
-%% @see c_fun/2
-%% @see c_let/3
-%% @see c_letrec/2
-%% @see c_module/3
-%% @see c_primop/2
-%% @see c_receive/1
-%% @see c_seq/2
-%% @see c_try/3
-%% @see c_tuple/1
-%% @see c_values/1
-%% @see c_var/1
-%% @see get_ann/1
-%% @see to_records/1
-%% @see from_records/1
-%% @see data_type/1
-%% @see subtrees/1
-%% @see meta/1
-
-type(Node) ->
-    element(1, Node).
-
-
-%% @spec is_leaf(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is a leaf node,
-%% otherwise <code>false</code>. The current leaf node types are
-%% <code>literal</code> and <code>var</code>.
-%%
-%% <p>Note: all literals (cf. <code>is_literal/1</code>) are leaf
-%% nodes, even if they represent structured (constant) values such as
-%% <code>{foo, [bar, baz]}</code>. Also note that variables are leaf
-%% nodes but not literals.</p>
-%%
-%% @see type/1
-%% @see is_literal/1
-
-is_leaf(Node) ->
-    case type(Node) of
-	literal -> true;
-	var -> true;
-	_ -> false
-    end.
-
-
-%% @spec get_ann(cerl()) -> [term()]
-%%
-%% @doc Returns the list of user annotations associated with a syntax
-%% tree node. For a newly created node, this is the empty list. The
-%% annotations may be any terms.
-%%
-%% @see set_ann/2
-
-get_ann(Node) ->
-    element(2, Node).
-
-
-%% @spec set_ann(Node::cerl(), Annotations::[term()]) -> cerl()
-%%
-%% @doc Sets the list of user annotations of <code>Node</code> to
-%% <code>Annotations</code>.
-%%
-%% @see get_ann/1
-%% @see add_ann/2
-%% @see copy_ann/2
-
-set_ann(Node, List) ->
-    setelement(2, Node, List).
-
-
-%% @spec add_ann(Annotations::[term()], Node::cerl()) -> cerl()
-%%
-%% @doc Appends <code>Annotations</code> to the list of user
-%% annotations of <code>Node</code>.
-%%
-%% <p>Note: this is equivalent to <code>set_ann(Node, Annotations ++
-%% get_ann(Node))</code>, but potentially more efficient.</p>
-%%
-%% @see get_ann/1
-%% @see set_ann/2
-
-add_ann(Terms, Node) ->
-    set_ann(Node, Terms ++ get_ann(Node)).
-
-
-%% @spec copy_ann(Source::cerl(), Target::cerl()) -> cerl()
-%%
-%% @doc Copies the list of user annotations from <code>Source</code>
-%% to <code>Target</code>.
-%%
-%% <p>Note: this is equivalent to <code>set_ann(Target,
-%% get_ann(Source))</code>, but potentially more efficient.</p>
-%%
-%% @see get_ann/1
-%% @see set_ann/2
-
-copy_ann(Source, Target) ->
-    set_ann(Target, get_ann(Source)).
-
-
-%% @spec abstract(Term::term()) -> cerl()
-%%
-%% @doc Creates a syntax tree corresponding to an Erlang term.
-%% <code>Term</code> must be a literal term, i.e., one that can be
-%% represented as a source code literal. Thus, it may not contain a
-%% process identifier, port, reference, binary or function value as a
-%% subterm.
-%%
-%% <p>Note: This is a constant time operation.</p>
-%%
-%% @see ann_abstract/2
-%% @see concrete/1
-%% @see is_literal/1
-%% @see is_literal_term/1
-
-abstract(T) ->
-    #literal{val = T}.
-
-
-%% @spec ann_abstract(Annotations::[term()], Term::term()) -> cerl()
-%% @see abstract/1
-
-ann_abstract(As, T) ->
-    #literal{val = T, ann = As}.
-
-
-%% @spec is_literal_term(Term::term()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Term</code> can be
-%% represented as a literal, otherwise <code>false</code>. This
-%% function takes time proportional to the size of <code>Term</code>.
-%%
-%% @see abstract/1
-
-is_literal_term(T) when integer(T) -> true;
-is_literal_term(T) when float(T) -> true;
-is_literal_term(T) when atom(T) -> true;
-is_literal_term([]) -> true;
-is_literal_term([H | T]) ->
-    case is_literal_term(H) of
-	true ->
-	    is_literal_term(T);
-	false ->
-	    false
-    end;
-is_literal_term(T) when tuple(T) ->
-    is_literal_term_list(tuple_to_list(T));
-is_literal_term(_) ->
-    false.
-
-is_literal_term_list([T | Ts]) ->
-    case is_literal_term(T) of
-	true ->
-	    is_literal_term_list(Ts);
-	false ->
-	    false
-    end;
-is_literal_term_list([]) ->
-    true.
-
-
-%% @spec concrete(Node::cerl()) -> term()
-%%
-%% @doc Returns the Erlang term represented by a syntax tree.  An
-%% exception is thrown if <code>Node</code> does not represent a
-%% literal term.
-%%
-%% <p>Note: This is a constant time operation.</p>
-%%
-%% @see abstract/1
-%% @see is_literal/1
-
-%% Because the normal tuple and list constructor operations always
-%% return a literal if the arguments are literals, 'concrete' and
-%% 'is_literal' never need to traverse the structure.
-
-concrete(#literal{val = V}) ->
-    V.
-
-
-%% @spec is_literal(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> represents a
-%% literal term, otherwise <code>false</code>. This function returns
-%% <code>true</code> if and only if the value of
-%% <code>concrete(Node)</code> is defined.
-%%
-%% <p>Note: This is a constant time operation.</p>
-%%
-%% @see abstract/1
-%% @see concrete/1
-%% @see fold_literal/1
-
-is_literal(#literal{}) ->
-    true;
-is_literal(_) ->
-    false.
-
-
-%% @spec fold_literal(Node::cerl()) -> cerl()
-%%
-%% @doc Assures that literals have a compact representation. This is
-%% occasionally useful if <code>c_cons_skel/2</code>,
-%% <code>c_tuple_skel/1</code> or <code>unfold_literal/1</code> were
-%% used in the construction of <code>Node</code>, and you want to revert
-%% to the normal "folded" representation of literals. If
-%% <code>Node</code> represents a tuple or list constructor, its
-%% elements are rewritten recursively, and the node is reconstructed
-%% using <code>c_cons/2</code> or <code>c_tuple/1</code>, respectively;
-%% otherwise, <code>Node</code> is not changed.
-%%
-%% @see is_literal/1
-%% @see c_cons_skel/2
-%% @see c_tuple_skel/1
-%% @see c_cons/2
-%% @see c_tuple/1
-%% @see unfold_literal/1
-
-fold_literal(Node) ->
-    case type(Node) of
-	tuple ->
-	    update_c_tuple(Node, fold_literal_list(tuple_es(Node)));
-	cons ->
-	    update_c_cons(Node, fold_literal(cons_hd(Node)),
-			  fold_literal(cons_tl(Node)));
-	_ ->
-	    Node    
-    end.
-
-fold_literal_list([E | Es]) ->
-    [fold_literal(E) | fold_literal_list(Es)];
-fold_literal_list([]) ->
-    [].
-
-
-%% @spec unfold_literal(Node::cerl()) -> cerl()
-%%
-%% @doc Assures that literals have a fully expanded representation. If
-%% <code>Node</code> represents a literal tuple or list constructor, its
-%% elements are rewritten recursively, and the node is reconstructed
-%% using <code>c_cons_skel/2</code> or <code>c_tuple_skel/1</code>,
-%% respectively; otherwise, <code>Node</code> is not changed. The {@link
-%% fold_literal/1} can be used to revert to the normal compact
-%% representation.
-%%
-%% @see is_literal/1
-%% @see c_cons_skel/2
-%% @see c_tuple_skel/1
-%% @see c_cons/2
-%% @see c_tuple/1
-%% @see fold_literal/1
-
-unfold_literal(Node) ->
-    case type(Node) of
-	literal ->
-	    copy_ann(Node, unfold_concrete(concrete(Node)));
-	_ ->
-	    Node
-    end.
-
-unfold_concrete(Val) ->
-    case Val of
-	_ when tuple(Val) ->
-	    c_tuple_skel(unfold_concrete_list(tuple_to_list(Val)));
-	[H|T] ->
-	    c_cons_skel(unfold_concrete(H), unfold_concrete(T));
-	_ ->
-	    abstract(Val)
-    end.
-
-unfold_concrete_list([E | Es]) ->
-    [unfold_concrete(E) | unfold_concrete_list(Es)];
-unfold_concrete_list([]) ->
-    [].
-
-
-%% ---------------------------------------------------------------------
-
--record(module, {ann = [], name, exports, attrs, defs}).
-
-
-%% @spec c_module(Name::cerl(), Exports, Definitions) -> cerl()
-%%
-%%     Exports = [cerl()]
-%%     Definitions = [{cerl(), cerl()}]
-%%
-%% @equiv c_module(Name, Exports, [], Definitions)
-
-c_module(Name, Exports, Es) ->
-    #module{name = Name, exports = Exports, attrs = [], defs = Es}.
-
-
-%% @spec c_module(Name::cerl(), Exports, Attributes, Definitions) ->
-%%           cerl()
-%%
-%%     Exports = [cerl()]
-%%     Attributes = [{cerl(), cerl()}]
-%%     Definitions = [{cerl(), cerl()}]
-%%
-%% @doc Creates an abstract module definition. The result represents
-%% <pre>
-%%   module <em>Name</em> [<em>E1</em>, ..., <em>Ek</em>]
-%%     attributes [<em>K1</em> = <em>T1</em>, ...,
-%%                 <em>Km</em> = <em>Tm</em>]
-%%     <em>V1</em> = <em>F1</em>
-%%     ...
-%%     <em>Vn</em> = <em>Fn</em>
-%%   end</pre>
-%%
-%% if <code>Exports</code> = <code>[E1, ..., Ek]</code>,
-%% <code>Attributes</code> = <code>[{K1, T1}, ..., {Km, Tm}]</code>,
-%% and <code>Definitions</code> = <code>[{V1, F1}, ..., {Vn,
-%% Fn}]</code>.
-%%
-%% <p><code>Name</code> and all the <code>Ki</code> must be atom
-%% literals, and all the <code>Ti</code> must be constant literals. All
-%% the <code>Vi</code> and <code>Ei</code> must have type
-%% <code>var</code> and represent function names. All the
-%% <code>Fi</code> must have type <code>'fun'</code>.</p>
-%%
-%% @see c_module/3
-%% @see module_name/1
-%% @see module_exports/1
-%% @see module_attrs/1
-%% @see module_defs/1
-%% @see module_vars/1
-%% @see ann_c_module/4
-%% @see ann_c_module/5
-%% @see update_c_module/5
-%% @see c_atom/1
-%% @see c_var/1
-%% @see c_fun/2
-%% @see is_literal/1
-
-c_module(Name, Exports, Attrs, Es) ->
-    #module{name = Name, exports = Exports, attrs = Attrs, defs = Es}.
-
-
-%% @spec ann_c_module(As::[term()], Name::cerl(), Exports,
-%%                    Definitions) -> cerl()
-%%
-%%     Exports = [cerl()]
-%%     Definitions = [{cerl(), cerl()}]
-%%
-%% @see c_module/3
-%% @see ann_c_module/5
-
-ann_c_module(As, Name, Exports, Es) ->
-    #module{name = Name, exports = Exports, attrs = [], defs = Es,
-	    ann = As}.
-
-
-%% @spec ann_c_module(As::[term()], Name::cerl(), Exports,
-%%                    Attributes, Definitions) -> cerl()
-%%
-%%     Exports = [cerl()]
-%%     Attributes = [{cerl(), cerl()}]
-%%     Definitions = [{cerl(), cerl()}]
-%%
-%% @see c_module/4
-%% @see ann_c_module/4
-
-ann_c_module(As, Name, Exports, Attrs, Es) ->
-    #module{name = Name, exports = Exports, attrs = Attrs, defs = Es,
-	    ann = As}.
-
-
-%% @spec update_c_module(Old::cerl(), Name::cerl(), Exports,
-%%                       Attributes, Definitions) -> cerl()
-%%
-%%     Exports = [cerl()]
-%%     Attributes = [{cerl(), cerl()}]
-%%     Definitions = [{cerl(), cerl()}]
-%%
-%% @see c_module/4
-
-update_c_module(Node, Name, Exports, Attrs, Es) ->
-    #module{name = Name, exports = Exports, attrs = Attrs, defs = Es,
-	    ann = get_ann(Node)}.
-
-
-%% @spec is_c_module(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% module definition, otherwise <code>false</code>.
-%%
-%% @see type/1
-
-is_c_module(#module{}) ->
-    true;
-is_c_module(_) ->
-    false.
-
-
-%% @spec module_name(Node::cerl()) -> cerl()
-%%
-%% @doc Returns the name subtree of an abstract module definition.
-%%
-%% @see c_module/4
-
-module_name(Node) ->
-    Node#module.name.
-
-
-%% @spec module_exports(Node::cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of exports subtrees of an abstract module
-%% definition.
-%%
-%% @see c_module/4
-
-module_exports(Node) ->
-    Node#module.exports.
-
-
-%% @spec module_attrs(Node::cerl()) -> [{cerl(), cerl()}]
-%%
-%% @doc Returns the list of pairs of attribute key/value subtrees of
-%% an abstract module definition.
-%%
-%% @see c_module/4
-
-module_attrs(Node) ->
-    Node#module.attrs.
-
-
-%% @spec module_defs(Node::cerl()) -> [{cerl(), cerl()}]
-%%
-%% @doc Returns the list of function definitions of an abstract module
-%% definition.
-%%
-%% @see c_module/4
-
-module_defs(Node) ->
-    Node#module.defs.
-
-
-%% @spec module_vars(Node::cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of left-hand side function variable subtrees
-%% of an abstract module definition.
-%%
-%% @see c_module/4
-
-module_vars(Node) ->
-    [F || {F, _} <- module_defs(Node)].
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_int(Value::integer()) -> cerl()
-%%
-%%
-%% @doc Creates an abstract integer literal. The lexical
-%% representation is the canonical decimal numeral of
-%% <code>Value</code>.
-%%
-%% @see ann_c_int/2
-%% @see is_c_int/1
-%% @see int_val/1
-%% @see int_lit/1
-%% @see c_char/1
-
-c_int(Value) ->
-    #literal{val = Value}.
-
-
-%% @spec ann_c_int(As::[term()], Value::integer()) -> cerl()
-%% @see c_int/1
-
-ann_c_int(As, Value) ->
-    #literal{val = Value, ann = As}.
-
-
-%% @spec is_c_int(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> represents an
-%% integer literal, otherwise <code>false</code>.
-%% @see c_int/1
-
-is_c_int(#literal{val = V}) when integer(V) ->
-    true;
-is_c_int(_) ->
-    false.
-
-
-%% @spec int_val(cerl()) -> integer()
-%%
-%% @doc Returns the value represented by an integer literal node.
-%% @see c_int/1
-
-int_val(Node) ->
-    Node#literal.val.
-
-
-%% @spec int_lit(cerl()) -> string()
-%%
-%% @doc Returns the numeral string represented by an integer literal
-%% node.
-%% @see c_int/1
-
-int_lit(Node) ->
-    integer_to_list(int_val(Node)).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_float(Value::float()) -> cerl()
-%%
-%% @doc Creates an abstract floating-point literal.  The lexical
-%% representation is the decimal floating-point numeral of
-%% <code>Value</code>.
-%%
-%% @see ann_c_float/2
-%% @see is_c_float/1
-%% @see float_val/1
-%% @see float_lit/1
-
-%% Note that not all floating-point numerals can be represented with
-%% full precision.
-
-c_float(Value) ->
-    #literal{val = Value}.
-
-
-%% @spec ann_c_float(As::[term()], Value::float()) -> cerl()
-%% @see c_float/1
-
-ann_c_float(As, Value) ->
-    #literal{val = Value, ann = As}.
-
-
-%% @spec is_c_float(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> represents a
-%% floating-point literal, otherwise <code>false</code>.
-%% @see c_float/1
-
-is_c_float(#literal{val = V}) when float(V) ->
-    true;
-is_c_float(_) ->
-    false.
-
-
-%% @spec float_val(cerl()) -> float()
-%%
-%% @doc Returns the value represented by a floating-point literal
-%% node.
-%% @see c_float/1
-
-float_val(Node) ->
-    Node#literal.val.
-
-
-%% @spec float_lit(cerl()) -> string()
-%%
-%% @doc Returns the numeral string represented by a floating-point
-%% literal node.
-%% @see c_float/1
-
-float_lit(Node) ->
-    float_to_list(float_val(Node)).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_atom(Name) -> cerl()
-%%	    Name = atom() | string()
-%%
-%% @doc Creates an abstract atom literal.  The print name of the atom
-%% is the character sequence represented by <code>Name</code>.
-%%
-%% <p>Note: passing a string as argument to this function causes a
-%% corresponding atom to be created for the internal representation.</p>
-%%
-%% @see ann_c_atom/2
-%% @see is_c_atom/1
-%% @see atom_val/1
-%% @see atom_name/1
-%% @see atom_lit/1
-
-c_atom(Name) when atom(Name) ->
-    #literal{val = Name};
-c_atom(Name) ->
-    #literal{val = list_to_atom(Name)}.
-
-
-%% @spec ann_c_atom(As::[term()], Name) -> cerl()
-%%	    Name = atom() | string()
-%% @see c_atom/1
-
-ann_c_atom(As, Name) when atom(Name) ->
-    #literal{val = Name, ann = As};
-ann_c_atom(As, Name) ->
-    #literal{val = list_to_atom(Name), ann = As}.
-
-
-%% @spec is_c_atom(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> represents an
-%% atom literal, otherwise <code>false</code>.
-%%
-%% @see c_atom/1
-
-is_c_atom(#literal{val = V}) when atom(V) ->
-    true;
-is_c_atom(_) ->
-    false.
-
-%% @spec atom_val(cerl())-> atom()
-%%
-%% @doc Returns the value represented by an abstract atom.
-%%
-%% @see c_atom/1
-
-atom_val(Node) ->
-    Node#literal.val.
-
-
-%% @spec atom_name(cerl()) -> string()
-%%
-%% @doc Returns the printname of an abstract atom.
-%%
-%% @see c_atom/1
-
-atom_name(Node) ->
-    atom_to_list(atom_val(Node)).
-
-
-%% @spec atom_lit(cerl()) -> string()
-%%
-%% @doc Returns the literal string represented by an abstract
-%% atom. This always includes surrounding single-quote characters.
-%%
-%% <p>Note that an abstract atom may have several literal
-%% representations, and that the representation yielded by this
-%% function is not fixed; e.g.,
-%% <code>atom_lit(c_atom("a\012b"))</code> could yield the string
-%% <code>"\'a\\nb\'"</code>.</p>
-%%
-%% @see c_atom/1
-
-%% TODO: replace the use of the unofficial 'write_string/2'.
-
-atom_lit(Node) ->
-    io_lib:write_string(atom_name(Node), $'). %' stupid Emacs.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_char(Value) -> cerl()
-%%
-%%    Value = char() | integer()
-%%
-%% @doc Creates an abstract character literal. If the local
-%% implementation of Erlang defines <code>char()</code> as a subset of
-%% <code>integer()</code>, this function is equivalent to
-%% <code>c_int/1</code>. Otherwise, if the given value is an integer,
-%% it will be converted to the character with the corresponding
-%% code. The lexical representation of a character is
-%% "<code>$<em>Char</em></code>", where <code>Char</code> is a single
-%% printing character or an escape sequence.
-%%
-%% @see c_int/1
-%% @see c_string/1
-%% @see ann_c_char/2
-%% @see is_c_char/1
-%% @see char_val/1
-%% @see char_lit/1
-%% @see is_print_char/1
-
-c_char(Value)  when integer(Value), Value >= 0 ->
-    #literal{val = Value}.
-
-
-%% @spec ann_c_char(As::[term()], Value::char()) -> cerl()
-%% @see c_char/1
-
-ann_c_char(As, Value) ->
-    #literal{val = Value, ann = As}.
-
-
-%% @spec is_c_char(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> may represent a
-%% character literal, otherwise <code>false</code>.
-%%
-%% <p>If the local implementation of Erlang defines
-%% <code>char()</code> as a subset of <code>integer()</code>, then
-%% <code>is_c_int(<em>Node</em>)</code> will also yield
-%% <code>true</code>.</p>
-%%
-%% @see c_char/1
-%% @see is_print_char/1
-
-is_c_char(#literal{val = V}) when integer(V), V >= 0 ->
-    is_char_value(V);
-is_c_char(_) ->
-    false.
-
-
-%% @spec is_print_char(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> may represent a
-%% "printing" character, otherwise <code>false</code>. (Cf.
-%% <code>is_c_char/1</code>.)  A "printing" character has either a
-%% given graphical representation, or a "named" escape sequence such
-%% as "<code>\n</code>". Currently, only ISO 8859-1 (Latin-1)
-%% character values are recognized.
-%%
-%% @see c_char/1
-%% @see is_c_char/1
-
-is_print_char(#literal{val = V}) when integer(V), V >= 0 ->
-    is_print_char_value(V);
-is_print_char(_) ->
-    false.
-
-
-%% @spec char_val(cerl()) -> char()
-%%
-%% @doc Returns the value represented by an abstract character literal.
-%%
-%% @see c_char/1
-
-char_val(Node) ->
-    Node#literal.val.
-
-
-%% @spec char_lit(cerl()) -> string()
-%%
-%% @doc Returns the literal string represented by an abstract
-%% character. This includes a leading <code>$</code>
-%% character. Currently, all characters that are not in the set of ISO
-%% 8859-1 (Latin-1) "printing" characters will be escaped.
-%%
-%% @see c_char/1
-
-char_lit(Node) ->
-    io_lib:write_char(char_val(Node)).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_string(Value::string()) -> cerl()
-%%
-%% @doc Creates an abstract string literal. Equivalent to creating an
-%% abstract list of the corresponding character literals
-%% (cf. <code>is_c_string/1</code>), but is typically more
-%% efficient. The lexical representation of a string is
-%% "<code>"<em>Chars</em>"</code>", where <code>Chars</code> is a
-%% sequence of printing characters or spaces.
-%%
-%% @see c_char/1
-%% @see ann_c_string/2
-%% @see is_c_string/1
-%% @see string_val/1
-%% @see string_lit/1
-%% @see is_print_string/1
-
-c_string(Value) ->
-    #literal{val = Value}.
-
-
-%% @spec ann_c_string(As::[term()], Value::string()) -> cerl()
-%% @see c_string/1
-
-ann_c_string(As, Value) ->
-    #literal{val = Value, ann = As}.
-
-
-%% @spec is_c_string(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> may represent a
-%% string literal, otherwise <code>false</code>. Strings are defined
-%% as lists of characters; see <code>is_c_char/1</code> for details.
-%%
-%% @see c_string/1
-%% @see is_c_char/1
-%% @see is_print_string/1
-
-is_c_string(#literal{val = V}) ->
-    is_char_list(V);
-is_c_string(_) ->
-    false.
-
-
-%% @spec is_print_string(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> may represent a
-%% string literal containing only "printing" characters, otherwise
-%% <code>false</code>. See <code>is_c_string/1</code> and
-%% <code>is_print_char/1</code> for details. Currently, only ISO
-%% 8859-1 (Latin-1) character values are recognized.
-%%
-%% @see c_string/1
-%% @see is_c_string/1
-%% @see is_print_char/1
-
-is_print_string(#literal{val = V}) ->
-    is_print_char_list(V);
-is_print_string(_) ->
-    false.
-
-
-%% @spec string_val(cerl()) -> string()
-%%
-%% @doc Returns the value represented by an abstract string literal.
-%%
-%% @see c_string/1
-
-string_val(Node) ->
-    Node#literal.val.
-
-
-%% @spec string_lit(cerl()) -> string()
-%%
-%% @doc Returns the literal string represented by an abstract string.
-%% This includes surrounding double-quote characters
-%% <code>"..."</code>. Currently, characters that are not in the set
-%% of ISO 8859-1 (Latin-1) "printing" characters will be escaped,
-%% except for spaces.
-%%
-%% @see c_string/1
-
-string_lit(Node) ->
-    io_lib:write_string(string_val(Node)).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_nil() -> cerl()
-%%
-%% @doc Creates an abstract empty list. The result represents
-%% "<code>[]</code>". The empty list is traditionally called "nil".
-%%
-%% @see ann_c_nil/1
-%% @see is_c_list/1
-%% @see c_cons/2
-
-c_nil() ->
-    #literal{val = []}.
-
-
-%% @spec ann_c_nil(As::[term()]) -> cerl()
-%% @see c_nil/0
-
-ann_c_nil(As) ->
-    #literal{val = [], ann = As}.
-
-
-%% @spec is_c_nil(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% empty list, otherwise <code>false</code>.
-
-is_c_nil(#literal{val = []}) ->
-    true;
-is_c_nil(_) ->
-    false.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_cons(Head::cerl(), Tail::cerl()) -> cerl()
-%%
-%% @doc Creates an abstract list constructor. The result represents
-%% "<code>[<em>Head</em> | <em>Tail</em>]</code>". Note that if both
-%% <code>Head</code> and <code>Tail</code> have type
-%% <code>literal</code>, then the result will also have type
-%% <code>literal</code>, and annotations on <code>Head</code> and
-%% <code>Tail</code> are lost.
-%%
-%% <p>Recall that in Erlang, the tail element of a list constructor is
-%% not necessarily a list.</p>
-%%
-%% @see ann_c_cons/3
-%% @see update_c_cons/3
-%% @see c_cons_skel/2
-%% @see is_c_cons/1
-%% @see cons_hd/1
-%% @see cons_tl/1
-%% @see is_c_list/1
-%% @see c_nil/0
-%% @see list_elements/1
-%% @see list_length/1
-%% @see make_list/2
-
--record(cons, {ann = [], hd, tl}).
-
-%% *Always* collapse literals.
-
-c_cons(#literal{val = Head}, #literal{val = Tail}) ->
-    #literal{val = [Head | Tail]};
-c_cons(Head, Tail) ->
-    #cons{hd = Head, tl = Tail}.
-
-
-%% @spec ann_c_cons(As::[term()], Head::cerl(), Tail::cerl()) -> cerl()
-%% @see c_cons/2
-
-ann_c_cons(As, #literal{val = Head}, #literal{val = Tail}) ->
-    #literal{val = [Head | Tail], ann = As};
-ann_c_cons(As, Head, Tail) ->
-    #cons{hd = Head, tl = Tail, ann = As}.
-
-
-%% @spec update_c_cons(Old::cerl(), Head::cerl(), Tail::cerl()) ->
-%%           cerl()
-%% @see c_cons/2
-
-update_c_cons(Node, #literal{val = Head}, #literal{val = Tail}) ->
-    #literal{val = [Head | Tail], ann = get_ann(Node)};
-update_c_cons(Node, Head, Tail) ->
-    #cons{hd = Head, tl = Tail, ann = get_ann(Node)}.
-
-
-%% @spec c_cons_skel(Head::cerl(), Tail::cerl()) -> cerl()
-%%
-%% @doc Creates an abstract list constructor skeleton. Does not fold
-%% constant literals, i.e., the result always has type
-%% <code>cons</code>, representing "<code>[<em>Head</em> |
-%% <em>Tail</em>]</code>".
-%%
-%% <p>This function is occasionally useful when it is necessary to have
-%% annotations on the subnodes of a list constructor node, even when the
-%% subnodes are constant literals. Note however that
-%% <code>is_literal/1</code> will yield <code>false</code> and
-%% <code>concrete/1</code> will fail if passed the result from this
-%% function.</p>
-%%
-%% <p><code>fold_literal/1</code> can be used to revert a node to the
-%% normal-form representation.</p>
-%%
-%% @see ann_c_cons_skel/3
-%% @see update_c_cons_skel/3
-%% @see c_cons/2
-%% @see is_c_cons/1
-%% @see is_c_list/1
-%% @see c_nil/0
-%% @see is_literal/1
-%% @see fold_literal/1
-%% @see concrete/1
-
-%% *Never* collapse literals.
-
-c_cons_skel(Head, Tail) ->
-    #cons{hd = Head, tl = Tail}.
-
-
-%% @spec ann_c_cons_skel(As::[term()], Head::cerl(), Tail::cerl()) ->
-%%           cerl()
-%% @see c_cons_skel/2
-
-ann_c_cons_skel(As, Head, Tail) ->
-    #cons{hd = Head, tl = Tail, ann = As}.
-
-
-%% @spec update_c_cons_skel(Old::cerl(), Head::cerl(), Tail::cerl()) ->
-%%           cerl()
-%% @see c_cons_skel/2
-
-update_c_cons_skel(Node, Head, Tail) ->
-    #cons{hd = Head, tl = Tail, ann = get_ann(Node)}.
-
-
-%% @spec is_c_cons(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% list constructor, otherwise <code>false</code>.
-
-is_c_cons(#cons{}) ->
-    true;
-is_c_cons(#literal{val = [_ | _]}) ->
-    true;
-is_c_cons(_) ->
-    false.
-
-
-%% @spec cons_hd(cerl()) -> cerl()
-%%
-%% @doc Returns the head subtree of an abstract list constructor.
-%%
-%% @see c_cons/2
-
-cons_hd(#cons{hd = Head}) ->
-    Head;
-cons_hd(#literal{val = [Head | _]}) ->
-    #literal{val = Head}.
-
-
-%% @spec cons_tl(cerl()) -> cerl()
-%%
-%% @doc Returns the tail subtree of an abstract list constructor.
-%%
-%% <p>Recall that the tail does not necessarily represent a proper
-%% list.</p>
-%%
-%% @see c_cons/2
-
-cons_tl(#cons{tl = Tail}) ->
-    Tail;
-cons_tl(#literal{val = [_ | Tail]}) ->
-    #literal{val = Tail}.
-
-
-%% @spec is_c_list(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> represents a
-%% proper list, otherwise <code>false</code>. A proper list is either
-%% the empty list <code>[]</code>, or a cons cell <code>[<em>Head</em> |
-%% <em>Tail</em>]</code>, where recursively <code>Tail</code> is a
-%% proper list.
-%% 
-%% <p>Note: Because <code>Node</code> is a syntax tree, the actual
-%% run-time values corresponding to its subtrees may often be partially
-%% or completely unknown. Thus, if <code>Node</code> represents e.g.
-%% "<code>[... | Ns]</code>" (where <code>Ns</code> is a variable), then
-%% the function will return <code>false</code>, because it is not known
-%% whether <code>Ns</code> will be bound to a list at run-time. If
-%% <code>Node</code> instead represents e.g. "<code>[1, 2, 3]</code>" or
-%% "<code>[A | []]</code>", then the function will return
-%% <code>true</code>.</p>
-%%
-%% @see c_cons/2
-%% @see c_nil/0
-%% @see list_elements/1
-%% @see list_length/1
-
-is_c_list(#cons{tl = Tail}) ->
-    is_c_list(Tail);
-is_c_list(#literal{val = V}) ->
-    is_proper_list(V);
-is_c_list(_) ->
-    false.
-
-is_proper_list([_ | Tail]) ->
-    is_proper_list(Tail);
-is_proper_list([]) ->
-    true;
-is_proper_list(_) ->
-    false.
-
-%% @spec list_elements(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of element subtrees of an abstract list.
-%% <code>Node</code> must represent a proper list. E.g., if
-%% <code>Node</code> represents "<code>[<em>X1</em>, <em>X2</em> |
-%% [<em>X3</em>, <em>X4</em> | []]</code>", then
-%% <code>list_elements(Node)</code> yields the list <code>[X1, X2, X3,
-%% X4]</code>.
-%%
-%% @see c_cons/2
-%% @see c_nil/1
-%% @see is_c_list/1
-%% @see list_length/1
-%% @see make_list/2
-
-list_elements(#cons{hd = Head, tl = Tail}) ->
-    [Head | list_elements(Tail)];
-list_elements(#literal{val = V}) ->
-    abstract_list(V).
-
-abstract_list([X | Xs]) ->
-    [abstract(X) | abstract_list(Xs)];
-abstract_list([]) ->
-    [].
-
-
-%% @spec list_length(Node::cerl()) -> integer()
-%%
-%% @doc Returns the number of element subtrees of an abstract list.
-%% <code>Node</code> must represent a proper list. E.g., if
-%% <code>Node</code> represents "<code>[X1 | [X2, X3 | [X4, X5,
-%% X6]]]</code>", then <code>list_length(Node)</code> returns the
-%% integer 6.
-%%
-%% <p>Note: this is equivalent to
-%% <code>length(list_elements(Node))</code>, but potentially more
-%% efficient.</p>
-%%
-%% @see c_cons/2
-%% @see c_nil/1
-%% @see is_c_list/1
-%% @see list_elements/1
-
-list_length(L) ->
-    list_length(L, 0).
-
-list_length(#cons{tl = Tail}, A) ->
-    list_length(Tail, A + 1);
-list_length(#literal{val = V}, A) ->
-    A + length(V).
-
-
-%% @spec make_list(List) -> Node
-%% @equiv make_list(List, none)
-
-make_list(List) ->
-    ann_make_list([], List).
-
-
-%% @spec make_list(List::[cerl()], Tail) -> cerl()
-%%
-%%	    Tail = cerl() | none
-%%
-%% @doc Creates an abstract list from the elements in <code>List</code>
-%% and the optional <code>Tail</code>. If <code>Tail</code> is
-%% <code>none</code>, the result will represent a nil-terminated list,
-%% otherwise it represents "<code>[... | <em>Tail</em>]</code>".
-%%
-%% @see c_cons/2
-%% @see c_nil/0
-%% @see ann_make_list/3
-%% @see update_list/3
-%% @see list_elements/1
-
-make_list(List, Tail) ->
-    ann_make_list([], List, Tail).
-
-
-%% @spec update_list(Old::cerl(), List::[cerl()]) -> cerl()
-%% @equiv update_list(Old, List, none)
-
-update_list(Node, List) ->
-    ann_make_list(get_ann(Node), List).
-
-
-%% @spec update_list(Old::cerl(), List::[cerl()], Tail) -> cerl()
-%%
-%%	    Tail = cerl() | none
-%%
-%% @see make_list/2
-%% @see update_list/2
-
-update_list(Node, List, Tail) ->
-    ann_make_list(get_ann(Node), List, Tail).
-
-
-%% @spec ann_make_list(As::[term()], List::[cerl()]) -> cerl()
-%% @equiv ann_make_list(As, List, none)
-
-ann_make_list(As, List) ->
-    ann_make_list(As, List, none).
-
-
-%% @spec ann_make_list(As::[term()], List::[cerl()], Tail) -> cerl()
-%%
-%%	    Tail = cerl() | none
-%%
-%% @see make_list/2
-%% @see ann_make_list/2
-
-ann_make_list(As, [H | T], Tail) ->
-    ann_c_cons(As, H, make_list(T, Tail));    % `c_cons' folds literals
-ann_make_list(As, [], none) ->
-    ann_c_nil(As);
-ann_make_list(_, [], Node) ->
-    Node.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_tuple(Elements::[cerl()]) -> cerl()
-%%
-%% @doc Creates an abstract tuple. If <code>Elements</code> is
-%% <code>[E1, ..., En]</code>, the result represents
-%% "<code>{<em>E1</em>, ..., <em>En</em>}</code>".  Note that if all
-%% nodes in <code>Elements</code> have type <code>literal</code>, or if
-%% <code>Elements</code> is empty, then the result will also have type
-%% <code>literal</code> and annotations on nodes in
-%% <code>Elements</code> are lost.
-%%
-%% <p>Recall that Erlang has distinct 1-tuples, i.e., <code>{X}</code>
-%% is always distinct from <code>X</code> itself.</p>
-%%
-%% @see ann_c_tuple/2
-%% @see update_c_tuple/2
-%% @see is_c_tuple/1
-%% @see tuple_es/1
-%% @see tuple_arity/1
-%% @see c_tuple_skel/1
-
--record(tuple, {ann = [], es}).
-
-%% *Always* collapse literals.
-
-c_tuple(Es) ->
-    case is_lit_list(Es) of
-	false ->
-	    #tuple{es = Es};
-	true ->
-	    #literal{val = list_to_tuple(lit_list_vals(Es))}
-    end.
-
-
-%% @spec ann_c_tuple(As::[term()], Elements::[cerl()]) -> cerl()
-%% @see c_tuple/1
-
-ann_c_tuple(As, Es) ->
-    case is_lit_list(Es) of
-	false ->
-	    #tuple{es = Es, ann = As};
-	true ->
-	    #literal{val = list_to_tuple(lit_list_vals(Es)), ann = As}
-    end.
-
-
-%% @spec update_c_tuple(Old::cerl(),  Elements::[cerl()]) -> cerl()
-%% @see c_tuple/1
-
-update_c_tuple(Node, Es) ->
-    case is_lit_list(Es) of
-	false ->
-	    #tuple{es = Es, ann = get_ann(Node)};
-	true ->
-	    #literal{val = list_to_tuple(lit_list_vals(Es)),
-		     ann = get_ann(Node)}
-    end.
-
-
-%% @spec c_tuple_skel(Elements::[cerl()]) -> cerl()
-%%
-%% @doc Creates an abstract tuple skeleton. Does not fold constant
-%% literals, i.e., the result always has type <code>tuple</code>,
-%% representing "<code>{<em>E1</em>, ..., <em>En</em>}</code>", if
-%% <code>Elements</code> is <code>[E1, ..., En]</code>.
-%% 
-%% <p>This function is occasionally useful when it is necessary to have
-%% annotations on the subnodes of a tuple node, even when all the
-%% subnodes are constant literals. Note however that
-%% <code>is_literal/1</code> will yield <code>false</code> and
-%% <code>concrete/1</code> will fail if passed the result from this
-%% function.</p>
-%%
-%% <p><code>fold_literal/1</code> can be used to revert a node to the
-%% normal-form representation.</p>
-%%
-%% @see ann_c_tuple_skel/2
-%% @see update_c_tuple_skel/2
-%% @see c_tuple/1
-%% @see tuple_es/1
-%% @see is_c_tuple/1
-%% @see is_literal/1
-%% @see fold_literal/1
-%% @see concrete/1
-
-%% *Never* collapse literals.
-
-c_tuple_skel(Es) ->
-    #tuple{es = Es}.
-
-
-%% @spec ann_c_tuple_skel(As::[term()], Elements::[cerl()]) -> cerl()
-%% @see c_tuple_skel/1
-
-ann_c_tuple_skel(As, Es) ->
-    #tuple{es = Es, ann = As}.
-
-
-%% @spec update_c_tuple_skel(Old::cerl(), Elements::[cerl()]) -> cerl()
-%% @see c_tuple_skel/1
-
-update_c_tuple_skel(Old, Es) ->
-    #tuple{es = Es, ann = get_ann(Old)}.
-
-
-%% @spec is_c_tuple(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% tuple, otherwise <code>false</code>.
-%%
-%% @see c_tuple/1
-
-is_c_tuple(#tuple{}) ->
-    true;
-is_c_tuple(#literal{val = V}) when tuple(V) ->
-    true;
-is_c_tuple(_) ->
-    false.
-
-
-%% @spec tuple_es(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of element subtrees of an abstract tuple.
-%%
-%% @see c_tuple/1
-
-tuple_es(#tuple{es = Es}) ->
-    Es;
-tuple_es(#literal{val = V}) ->
-    make_lit_list(tuple_to_list(V)).
-
-
-%% @spec tuple_arity(Node::cerl()) -> integer()
-%%
-%% @doc Returns the number of element subtrees of an abstract tuple.
-%%
-%% <p>Note: this is equivalent to <code>length(tuple_es(Node))</code>,
-%% but potentially more efficient.</p>
-%%
-%% @see tuple_es/1
-%% @see c_tuple/1
-
-tuple_arity(#tuple{es = Es}) ->
-    length(Es);
-tuple_arity(#literal{val = V}) when tuple(V) ->
-    size(V).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_var(Name::var_name()) -> cerl()
-%%
-%%     var_name() = integer() | atom() | {atom(), integer()}
-%%
-%% @doc Creates an abstract variable. A variable is identified by its
-%% name, given by the <code>Name</code> parameter.
-%%
-%% <p>If a name is given by a single atom, it should either be a
-%% "simple" atom which does not need to be single-quoted in Erlang, or
-%% otherwise its print name should correspond to a proper Erlang
-%% variable, i.e., begin with an uppercase character or an
-%% underscore. Names on the form <code>{A, N}</code> represent
-%% function name variables "<code><em>A</em>/<em>N</em></code>"; these
-%% are special variables which may be bound only in the function
-%% definitions of a module or a <code>letrec</code>.  They may not be
-%% bound in <code>let</code> expressions and cannot occur in clause
-%% patterns. The atom <code>A</code> in a function name may be any
-%% atom; the integer <code>N</code> must be nonnegative. The functions
-%% <code>c_fname/2</code> etc. are utilities for handling function
-%% name variables.</p>
-%%
-%% <p>When printing variable names, they must have the form of proper
-%% Core Erlang variables and function names. E.g., a name represented
-%% by an integer such as <code>42</code> could be formatted as
-%% "<code>_42</code>", an atom <code>'Xxx'</code> simply as
-%% "<code>Xxx</code>", and an atom <code>foo</code> as
-%% "<code>_foo</code>". However, one must assure that any two valid
-%% distinct names are never mapped to the same strings.  Tuples such
-%% as <code>{foo, 2}</code> representing function names can simply by
-%% formatted as "<code>'foo'/2</code>", with no risk of conflicts.</p>
-%%
-%% @see ann_c_var/2
-%% @see update_c_var/2
-%% @see is_c_var/1
-%% @see var_name/1
-%% @see c_fname/2
-%% @see c_module/4
-%% @see c_letrec/2
-
--record(var, {ann = [], name}).
-
-c_var(Name) ->
-    #var{name = Name}.
-
-
-%% @spec ann_c_var(As::[term()], Name::var_name()) -> cerl()
-%%
-%% @see c_var/1
-
-ann_c_var(As, Name) ->
-    #var{name = Name, ann = As}.
-
-%% @spec update_c_var(Old::cerl(), Name::var_name()) -> cerl()
-%%
-%% @see c_var/1
-
-update_c_var(Node, Name) ->
-    #var{name = Name, ann = get_ann(Node)}.
-
-
-%% @spec is_c_var(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% variable, otherwise <code>false</code>.
-%%
-%% @see c_var/1
-
-is_c_var(#var{}) ->
-    true;
-is_c_var(_) ->
-    false.
-
-
-%% @spec c_fname(Name::atom(), Arity::integer()) -> cerl()
-%% @equiv c_var({Name, Arity})
-%% @see fname_id/1
-%% @see fname_arity/1
-%% @see is_c_fname/1
-%% @see ann_c_fname/3
-%% @see update_c_fname/3
-
-c_fname(Atom, Arity) ->
-    c_var({Atom, Arity}).
-
-
-%% @spec ann_c_fname(As::[term()], Name::atom(), Arity::integer()) ->
-%%           cerl()
-%% @equiv ann_c_var(As, {Atom, Arity})
-%% @see c_fname/2
-
-ann_c_fname(As, Atom, Arity) ->
-    ann_c_var(As, {Atom, Arity}).
-
-
-%% @spec update_c_fname(Old::cerl(), Name::atom()) -> cerl()
-%% @doc Like <code>update_c_fname/3</code>, but takes the arity from
-%% <code>Node</code>.
-%% @see update_c_fname/3
-%% @see c_fname/2
-
-update_c_fname(#var{name = {_, Arity}, ann = As}, Atom) ->
-    #var{name = {Atom, Arity}, ann = As}.
-
-
-%% @spec update_c_fname(Old::cerl(), Name::atom(), Arity::integer()) ->
-%%           cerl()
-%% @equiv update_c_var(Old, {Atom, Arity})
-%% @see update_c_fname/2
-%% @see c_fname/2
-
-update_c_fname(Node, Atom, Arity) ->
-    update_c_var(Node, {Atom, Arity}).
-
-
-%% @spec is_c_fname(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% function name variable, otherwise <code>false</code>.
-%%
-%% @see c_fname/2
-%% @see c_var/1
-%% @see c_var_name/1
-
-is_c_fname(#var{name = {A, N}}) when atom(A), integer(N), N >= 0 ->
-    true;
-is_c_fname(_) ->
-    false.
-
-
-%% @spec var_name(cerl()) -> var_name()
-%%
-%% @doc Returns the name of an abstract variable.
-%%
-%% @see c_var/1
-
-var_name(Node) ->
-    Node#var.name.
-
-
-%% @spec fname_id(cerl()) -> atom()
-%%
-%% @doc Returns the identifier part of an abstract function name
-%% variable.
-%% 
-%% @see fname_arity/1
-%% @see c_fname/2
-
-fname_id(#var{name={A,_}}) ->
-    A.
-
-
-%% @spec fname_arity(cerl()) -> integer()
-%%
-%% @doc Returns the arity part of an abstract function name variable.
-%%
-%% @see fname_id/1
-%% @see c_fname/2
-
-fname_arity(#var{name={_,N}}) ->
-    N.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_values(Elements::[cerl()]) -> cerl()
-%%
-%% @doc Creates an abstract value list. If <code>Elements</code> is
-%% <code>[E1, ..., En]</code>, the result represents
-%% "<code>&lt;<em>E1</em>, ..., <em>En</em>&gt;</code>".
-%%
-%% @see ann_c_values/2
-%% @see update_c_values/2
-%% @see is_c_values/1
-%% @see values_es/1
-%% @see values_arity/1
-
--record(values, {ann = [], es}).
-
-c_values(Es) ->
-    #values{es = Es}.
-
-
-%% @spec ann_c_values(As::[term()], Elements::[cerl()]) -> cerl()
-%% @see c_values/1
-
-ann_c_values(As, Es) ->
-    #values{es = Es, ann = As}.
-
-
-%% @spec update_c_values(Old::cerl(), Elements::[cerl()]) -> cerl()
-%% @see c_values/1
-
-update_c_values(Node, Es) ->
-    #values{es = Es, ann = get_ann(Node)}.
-
-
-%% @spec is_c_values(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% value list; otherwise <code>false</code>.
-%%
-%% @see c_values/1
-
-is_c_values(#values{}) ->
-    true;
-is_c_values(_) ->
-    false.
-
-
-%% @spec values_es(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of element subtrees of an abstract value
-%% list.
-%%
-%% @see c_values/1
-%% @see values_arity/1
-
-values_es(Node) ->
-    Node#values.es.
-
-
-%% @spec values_arity(Node::cerl()) -> integer()
-%%
-%% @doc Returns the number of element subtrees of an abstract value
-%% list.
-%% 
-%% <p>Note: This is equivalent to
-%% <code>length(values_es(Node))</code>, but potentially more
-%% efficient.</p>
-%%
-%% @see c_values/1
-%% @see values_es/1
-
-values_arity(Node) ->
-    length(values_es(Node)).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_binary(Segments::[cerl()]) -> cerl()
-%%
-%% @doc Creates an abstract binary-template. A binary object is a
-%% sequence of 8-bit bytes. It is specified by zero or more bit-string
-%% template <em>segments</em> of arbitrary lengths (in number of bits),
-%% such that the sum of the lengths is evenly divisible by 8. If
-%% <code>Segments</code> is <code>[S1, ..., Sn]</code>, the result
-%% represents "<code>#{<em>S1</em>, ..., <em>Sn</em>}#</code>". All the
-%% <code>Si</code> must have type <code>bitstr</code>.
-%%
-%% @see ann_c_binary/2
-%% @see update_c_binary/2
-%% @see is_c_binary/1
-%% @see binary_segments/1
-%% @see c_bitstr/5
-
--record(binary, {ann = [], segments}).
-
-c_binary(Segments) ->
-    #binary{segments = Segments}.
-
-
-%% @spec ann_c_binary(As::[term()], Segments::[cerl()]) -> cerl()
-%% @see c_binary/1
-
-ann_c_binary(As, Segments) ->
-    #binary{segments = Segments, ann = As}.
-
-
-%% @spec update_c_binary(Old::cerl(), Segments::[cerl()]) -> cerl()
-%% @see c_binary/1
-
-update_c_binary(Node, Segments) ->
-    #binary{segments = Segments, ann = get_ann(Node)}.
-
-
-%% @spec is_c_binary(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% binary-template; otherwise <code>false</code>.
-%%
-%% @see c_binary/1
-
-is_c_binary(#binary{}) ->
-    true;
-is_c_binary(_) ->
-    false.
-
-
-%% @spec binary_segments(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of segment subtrees of an abstract
-%% binary-template.
-%%
-%% @see c_binary/1
-%% @see c_bitstr/5
-
-binary_segments(Node) ->
-    Node#binary.segments.
-
-
-%% @spec c_bitstr(Value::cerl(), Size::cerl(), Unit::cerl(),
-%%                Type::cerl(), Flags::cerl()) -> cerl()
-%%
-%% @doc Creates an abstract bit-string template. These can only occur as
-%% components of an abstract binary-template (see {@link c_binary/1}).
-%% The result represents "<code>#&lt;<em>Value</em>&gt;(<em>Size</em>,
-%% <em>Unit</em>, <em>Type</em>, <em>Flags</em>)</code>", where
-%% <code>Unit</code> must represent a positive integer constant,
-%% <code>Type</code> must represent a constant atom (one of
-%% <code>'integer'</code>, <code>'float'</code>, or
-%% <code>'binary'</code>), and <code>Flags</code> must represent a
-%% constant list <code>"[<em>F1</em>, ..., <em>Fn</em>]"</code> where
-%% all the <code>Fi</code> are atoms.
-%% 
-%% @see c_binary/1
-%% @see ann_c_bitstr/6
-%% @see update_c_bitstr/6
-%% @see is_c_bitstr/1
-%% @see bitstr_val/1
-%% @see bitstr_size/1
-%% @see bitstr_unit/1
-%% @see bitstr_type/1
-%% @see bitstr_flags/1
-
--record(bitstr, {ann = [], val, size, unit, type, flags}).
-
-c_bitstr(Val, Size, Unit, Type, Flags) ->
-    #bitstr{val = Val, size = Size, unit = Unit, type = Type,
-	    flags = Flags}.
-
-
-%% @spec c_bitstr(Value::cerl(), Size::cerl(), Type::cerl(),
-%%                Flags::cerl()) -> cerl()
-%% @equiv c_bitstr(Value, Size, abstract(1), Type, Flags)
-
-c_bitstr(Val, Size, Type, Flags) ->
-    c_bitstr(Val, Size, abstract(1), Type, Flags).
-
-
-%% @spec c_bitstr(Value::cerl(), Type::cerl(),
-%%                Flags::cerl()) -> cerl()
-%% @equiv c_bitstr(Value, abstract(all), abstract(1), Type, Flags)
-
-c_bitstr(Val, Type, Flags) ->
-    c_bitstr(Val, abstract(all), abstract(1), Type, Flags).
-
-
-%% @spec ann_c_bitstr(As::[term()], Value::cerl(), Size::cerl(),
-%%           Unit::cerl(), Type::cerl(), Flags::cerl()) -> cerl()
-%% @see c_bitstr/5
-%% @see ann_c_bitstr/5
-
-ann_c_bitstr(As, Val, Size, Unit, Type, Flags) ->
-    #bitstr{val = Val, size = Size, unit = Unit, type = Type,
-	     flags = Flags, ann = As}.
-
-%% @spec ann_c_bitstr(As::[term()], Value::cerl(), Size::cerl(),
-%%                    Type::cerl(), Flags::cerl()) -> cerl()
-%% @equiv ann_c_bitstr(As, Value, Size, abstract(1), Type, Flags)
-
-ann_c_bitstr(As, Value, Size, Type, Flags) ->
-    ann_c_bitstr(As, Value, Size, abstract(1), Type, Flags).
-
-
-%% @spec update_c_bitstr(Old::cerl(), Value::cerl(), Size::cerl(),
-%%           Unit::cerl(), Type::cerl(), Flags::cerl()) -> cerl()
-%% @see c_bitstr/5
-%% @see update_c_bitstr/5
-
-update_c_bitstr(Node, Val, Size, Unit, Type, Flags) ->
-    #bitstr{val = Val, size = Size, unit = Unit, type = Type,
-	     flags = Flags, ann = get_ann(Node)}.
-
-
-%% @spec update_c_bitstr(Old::cerl(), Value::cerl(), Size::cerl(),
-%%                       Type::cerl(), Flags::cerl()) -> cerl()
-%% @equiv update_c_bitstr(Node, Value, Size, abstract(1), Type, Flags)
-
-update_c_bitstr(Node, Value, Size, Type, Flags) ->
-    update_c_bitstr(Node, Value, Size, abstract(1), Type, Flags).
-
-%% @spec is_c_bitstr(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% bit-string template; otherwise <code>false</code>.
-%%
-%% @see c_bitstr/5
-
-is_c_bitstr(#bitstr{}) ->
-    true;
-is_c_bitstr(_) ->
-    false.
-
-
-%% @spec bitstr_val(cerl()) -> cerl()
-%%
-%% @doc Returns the value subtree of an abstract bit-string template.
-%%
-%% @see c_bitstr/5
-
-bitstr_val(Node) ->
-    Node#bitstr.val.
-
-
-%% @spec bitstr_size(cerl()) -> cerl()
-%%
-%% @doc Returns the size subtree of an abstract bit-string template.
-%%
-%% @see c_bitstr/5
-
-bitstr_size(Node) ->
-    Node#bitstr.size.
-
-
-%% @spec bitstr_bitsize(cerl()) -> integer() | any | all
-%%
-%% @doc Returns the total size in bits of an abstract bit-string
-%% template. If the size field is an integer literal, the result is the
-%% product of the size and unit values; if the size field is the atom
-%% literal <code>all</code>, the atom <code>all</code> is returned; in
-%% all other cases, the atom <code>any</code> is returned.
-%%
-%% @see c_bitstr/5
-
-bitstr_bitsize(Node) ->
-    Size = Node#bitstr.size,
-    case is_literal(Size) of
-	true ->
-	    case concrete(Size) of
-		all ->
-		    all;
-		S when integer(S) ->
-		    S*concrete(Node#bitstr.unit);
-		true ->
-		    any
-	    end;
-	false ->
-	    any
-    end.
-
-
-%% @spec bitstr_unit(cerl()) -> cerl()
-%%
-%% @doc Returns the unit subtree of an abstract bit-string template.
-%%
-%% @see c_bitstr/5
-
-bitstr_unit(Node) ->
-    Node#bitstr.unit.
-
-
-%% @spec bitstr_type(cerl()) -> cerl()
-%%
-%% @doc Returns the type subtree of an abstract bit-string template.
-%%
-%% @see c_bitstr/5
-
-bitstr_type(Node) ->
-    Node#bitstr.type.
-
-
-%% @spec bitstr_flags(cerl()) -> cerl()
-%%
-%% @doc Returns the flags subtree of an abstract bit-string template.
-%%
-%% @see c_bitstr/5
-
-bitstr_flags(Node) ->
-    Node#bitstr.flags.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_fun(Variables::[cerl()], Body::cerl()) -> cerl()
-%%
-%% @doc Creates an abstract fun-expression. If <code>Variables</code>
-%% is <code>[V1, ..., Vn]</code>, the result represents "<code>fun
-%% (<em>V1</em>, ..., <em>Vn</em>) -> <em>Body</em></code>". All the
-%% <code>Vi</code> must have type <code>var</code>.
-%%
-%% @see ann_c_fun/3
-%% @see update_c_fun/3
-%% @see is_c_fun/1
-%% @see fun_vars/1
-%% @see fun_body/1
-%% @see fun_arity/1
-
--record('fun', {ann = [], vars, body}).
-
-c_fun(Variables, Body) ->
-    #'fun'{vars = Variables, body = Body}.
-
-
-%% @spec ann_c_fun(As::[term()], Variables::[cerl()], Body::cerl()) ->
-%%           cerl()
-%% @see c_fun/2
-
-ann_c_fun(As, Variables, Body) ->
-    #'fun'{vars = Variables, body = Body, ann = As}.
-
-
-%% @spec update_c_fun(Old::cerl(), Variables::[cerl()],
-%%                    Body::cerl()) -> cerl()
-%% @see c_fun/2
-
-update_c_fun(Node, Variables, Body) ->
-    #'fun'{vars = Variables, body = Body, ann = get_ann(Node)}.
-
-
-%% @spec is_c_fun(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% fun-expression, otherwise <code>false</code>.
-%%
-%% @see c_fun/2
-
-is_c_fun(#'fun'{}) ->
-    true;		% Now this is fun!
-is_c_fun(_) ->
-    false.
-
-
-%% @spec fun_vars(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of parameter subtrees of an abstract
-%% fun-expression.
-%%
-%% @see c_fun/2
-%% @see fun_arity/1
-
-fun_vars(Node) ->
-    Node#'fun'.vars.
-
-
-%% @spec fun_body(cerl()) -> cerl()
-%%
-%% @doc Returns the body subtree of an abstract fun-expression.
-%%
-%% @see c_fun/2
-
-fun_body(Node) ->
-    Node#'fun'.body.
-
-
-%% @spec fun_arity(Node::cerl()) -> integer()
-%%
-%% @doc Returns the number of parameter subtrees of an abstract
-%% fun-expression.
-%% 
-%% <p>Note: this is equivalent to <code>length(fun_vars(Node))</code>,
-%% but potentially more efficient.</p>
-%%
-%% @see c_fun/2
-%% @see fun_vars/1
-
-fun_arity(Node) ->
-    length(fun_vars(Node)).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_seq(Argument::cerl(), Body::cerl()) -> cerl()
-%%
-%% @doc Creates an abstract sequencing expression. The result
-%% represents "<code>do <em>Argument</em> <em>Body</em></code>".
-%%
-%% @see ann_c_seq/3
-%% @see update_c_seq/3
-%% @see is_c_seq/1
-%% @see seq_arg/1
-%% @see seq_body/1
-
--record(seq, {ann = [], arg, body}).
-
-c_seq(Argument, Body) ->
-    #seq{arg = Argument, body = Body}.
-
-
-%% @spec ann_c_seq(As::[term()], Argument::cerl(), Body::cerl()) ->
-%%           cerl()
-%% @see c_seq/2
-
-ann_c_seq(As, Argument, Body) ->
-    #seq{arg = Argument, body = Body, ann = As}.
-
-
-%% @spec update_c_seq(Old::cerl(), Argument::cerl(), Body::cerl()) ->
-%%           cerl()
-%% @see c_seq/2
-
-update_c_seq(Node, Argument, Body) ->
-    #seq{arg = Argument, body = Body, ann = get_ann(Node)}.
-
-
-%% @spec is_c_seq(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% sequencing expression, otherwise <code>false</code>.
-%%
-%% @see c_seq/2
-
-is_c_seq(#seq{}) ->
-    true;
-is_c_seq(_) ->
-    false.
-
-
-%% @spec seq_arg(cerl()) -> cerl()
-%%
-%% @doc Returns the argument subtree of an abstract sequencing
-%% expression.
-%%
-%% @see c_seq/2
-
-seq_arg(Node) ->
-    Node#seq.arg.
-
-
-%% @spec seq_body(cerl()) -> cerl()
-%%
-%% @doc Returns the body subtree of an abstract sequencing expression.
-%%
-%% @see c_seq/2
-
-seq_body(Node) ->
-    Node#seq.body.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_let(Variables::[cerl()], Argument::cerl(), Body::cerl()) ->
-%%           cerl()
-%%
-%% @doc Creates an abstract let-expression. If <code>Variables</code>
-%% is <code>[V1, ..., Vn]</code>, the result represents "<code>let
-%% &lt;<em>V1</em>, ..., <em>Vn</em>&gt; = <em>Argument</em> in
-%% <em>Body</em></code>".  All the <code>Vi</code> must have type
-%% <code>var</code>.
-%%
-%% @see ann_c_let/4
-%% @see update_c_let/4
-%% @see is_c_let/1
-%% @see let_vars/1
-%% @see let_arg/1
-%% @see let_body/1
-%% @see let_arity/1
-
--record('let', {ann = [], vars, arg, body}).
-
-c_let(Variables, Argument, Body) ->
-    #'let'{vars = Variables, arg = Argument, body = Body}.
-
-
-%% ann_c_let(As, Variables, Argument, Body) -> Node
-%% @see c_let/3
-
-ann_c_let(As, Variables, Argument, Body) ->
-    #'let'{vars = Variables, arg = Argument, body = Body, ann = As}.
-
-
-%% update_c_let(Old, Variables, Argument, Body) -> Node
-%% @see c_let/3
-
-update_c_let(Node, Variables, Argument, Body) ->
-    #'let'{vars = Variables, arg = Argument, body = Body,
-	   ann = get_ann(Node)}.
-
-
-%% @spec is_c_let(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% let-expression, otherwise <code>false</code>.
-%%
-%% @see c_let/3
-
-is_c_let(#'let'{}) ->
-    true;
-is_c_let(_) ->
-    false.
-
-
-%% @spec let_vars(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of left-hand side variables of an abstract
-%% let-expression.
-%%
-%% @see c_let/3
-%% @see let_arity/1
-
-let_vars(Node) ->
-    Node#'let'.vars.
-
-
-%% @spec let_arg(cerl()) -> cerl()
-%%
-%% @doc Returns the argument subtree of an abstract let-expression.
-%%
-%% @see c_let/3
-
-let_arg(Node) ->
-    Node#'let'.arg.
-
-
-%% @spec let_body(cerl()) -> cerl()
-%%
-%% @doc Returns the body subtree of an abstract let-expression.
-%%
-%% @see c_let/3
-
-let_body(Node) ->
-    Node#'let'.body.
-
-
-%% @spec let_arity(Node::cerl()) -> integer()
-%%
-%% @doc Returns the number of left-hand side variables of an abstract
-%% let-expression.
-%% 
-%% <p>Note: this is equivalent to <code>length(let_vars(Node))</code>,
-%% but potentially more efficient.</p>
-%%
-%% @see c_let/3
-%% @see let_vars/1
-
-let_arity(Node) ->
-    length(let_vars(Node)).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_letrec(Definitions::[{cerl(), cerl()}], Body::cerl()) ->
-%%           cerl()
-%%
-%% @doc Creates an abstract letrec-expression. If
-%% <code>Definitions</code> is <code>[{V1, F1}, ..., {Vn, Fn}]</code>,
-%% the result represents "<code>letrec <em>V1</em> = <em>F1</em>
-%% ... <em>Vn</em> = <em>Fn</em> in <em>Body</em></code>.  All the
-%% <code>Vi</code> must have type <code>var</code> and represent
-%% function names.  All the <code>Fi</code> must have type
-%% <code>'fun'</code>.
-%%
-%% @see ann_c_letrec/3
-%% @see update_c_letrec/3
-%% @see is_c_letrec/1
-%% @see letrec_defs/1
-%% @see letrec_body/1
-%% @see letrec_vars/1
-
--record(letrec, {ann = [], defs, body}).
-
-c_letrec(Defs, Body) ->
-    #letrec{defs = Defs, body = Body}.
-
-
-%% @spec ann_c_letrec(As::[term()], Definitions::[{cerl(), cerl()}],
-%%                    Body::cerl()) -> cerl()
-%% @see c_letrec/2
-
-ann_c_letrec(As, Defs, Body) ->
-    #letrec{defs = Defs, body = Body, ann = As}.
-
-
-%% @spec update_c_letrec(Old::cerl(),
-%%                       Definitions::[{cerl(), cerl()}],
-%%                       Body::cerl()) -> cerl()
-%% @see c_letrec/2
-
-update_c_letrec(Node, Defs, Body) ->
-    #letrec{defs = Defs, body = Body, ann = get_ann(Node)}.
-
-
-%% @spec is_c_letrec(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% letrec-expression, otherwise <code>false</code>.
-%%
-%% @see c_letrec/2
-
-is_c_letrec(#letrec{}) ->
-    true;
-is_c_letrec(_) ->
-    false.
-
-
-%% @spec letrec_defs(Node::cerl()) -> [{cerl(), cerl()}]
-%%
-%% @doc Returns the list of definitions of an abstract
-%% letrec-expression. If <code>Node</code> represents "<code>letrec
-%% <em>V1</em> = <em>F1</em> ... <em>Vn</em> = <em>Fn</em> in
-%% <em>Body</em></code>", the returned value is <code>[{V1, F1}, ...,
-%% {Vn, Fn}]</code>.
-%%
-%% @see c_letrec/2
-
-letrec_defs(Node) ->
-    Node#letrec.defs.
-
-
-%% @spec letrec_body(cerl()) -> cerl()
-%%
-%% @doc Returns the body subtree of an abstract letrec-expression.
-%%
-%% @see c_letrec/2
-
-letrec_body(Node) ->
-    Node#letrec.body.
-
-
-%% @spec letrec_vars(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of left-hand side function variable subtrees
-%% of a letrec-expression. If <code>Node</code> represents
-%% "<code>letrec <em>V1</em> = <em>F1</em> ... <em>Vn</em> =
-%% <em>Fn</em> in <em>Body</em></code>", the returned value is
-%% <code>[V1, ..., Vn]</code>.
-%%
-%% @see c_letrec/2
-
-letrec_vars(Node) ->
-    [F || {F, _} <- letrec_defs(Node)].
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_case(Argument::cerl(), Clauses::[cerl()]) -> cerl()
-%%
-%% @doc Creates an abstract case-expression. If <code>Clauses</code>
-%% is <code>[C1, ..., Cn]</code>, the result represents "<code>case
-%% <em>Argument</em> of <em>C1</em> ... <em>Cn</em>
-%% end</code>". <code>Clauses</code> must not be empty.
-%%
-%% @see ann_c_case/3
-%% @see update_c_case/3
-%% @see is_c_case/1
-%% @see c_clause/3
-%% @see case_arg/1
-%% @see case_clauses/1
-%% @see case_arity/1
-
--record('case', {ann = [], arg, clauses}).
-
-c_case(Expr, Clauses) ->
-    #'case'{arg = Expr, clauses = Clauses}.
-
-
-%% @spec ann_c_case(As::[term()], Argument::cerl(),
-%%                  Clauses::[cerl()]) -> cerl()
-%% @see c_case/2
-
-ann_c_case(As, Expr, Clauses) ->
-    #'case'{arg = Expr, clauses = Clauses, ann = As}.
-
-
-%% @spec update_c_case(Old::cerl(), Argument::cerl(),
-%%                     Clauses::[cerl()]) -> cerl()
-%% @see c_case/2
-
-update_c_case(Node, Expr, Clauses) ->
-    #'case'{arg = Expr, clauses = Clauses, ann = get_ann(Node)}.
-
-
-%% is_c_case(Node) -> boolean()
-%%
-%%	    Node = cerl()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% case-expression; otherwise <code>false</code>.
-%%
-%% @see c_case/2
-
-is_c_case(#'case'{}) ->
-    true;
-is_c_case(_) ->
-    false.
-
-
-%% @spec case_arg(cerl()) -> cerl()
-%%
-%% @doc Returns the argument subtree of an abstract case-expression.
-%%
-%% @see c_case/2
-
-case_arg(Node) ->
-    Node#'case'.arg.
-
-
-%% @spec case_clauses(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of clause subtrees of an abstract
-%% case-expression.
-%%
-%% @see c_case/2
-%% @see case_arity/1
-
-case_clauses(Node) ->
-    Node#'case'.clauses.
-
-
-%% @spec case_arity(Node::cerl()) -> integer()
-%%
-%% @doc Equivalent to
-%% <code>clause_arity(hd(case_clauses(Node)))</code>, but potentially
-%% more efficient.
-%%
-%% @see c_case/2
-%% @see case_clauses/1
-%% @see clause_arity/1
-
-case_arity(Node) ->
-    clause_arity(hd(case_clauses(Node))).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_clause(Patterns::[cerl()], Body::cerl()) -> cerl()
-%% @equiv c_clause(Patterns, c_atom(true), Body)
-%% @see c_atom/1
-
-c_clause(Patterns, Body) ->
-    c_clause(Patterns, c_atom(true), Body).
-
-
-%% @spec c_clause(Patterns::[cerl()], Guard::cerl(), Body::cerl()) ->
-%%           cerl()
-%%
-%% @doc Creates an an abstract clause. If <code>Patterns</code> is
-%% <code>[P1, ..., Pn]</code>, the result represents
-%% "<code>&lt;<em>P1</em>, ..., <em>Pn</em>&gt; when <em>Guard</em> ->
-%% <em>Body</em></code>".
-%%
-%% @see c_clause/2
-%% @see ann_c_clause/4
-%% @see update_c_clause/4
-%% @see is_c_clause/1
-%% @see c_case/2
-%% @see c_receive/3
-%% @see clause_pats/1
-%% @see clause_guard/1
-%% @see clause_body/1
-%% @see clause_arity/1
-%% @see clause_vars/1
-
--record(clause, {ann = [], pats, guard, body}).
-
-c_clause(Patterns, Guard, Body) ->
-    #clause{pats = Patterns, guard = Guard, body = Body}.
-
-
-%% @spec ann_c_clause(As::[term()], Patterns::[cerl()],
-%%                    Body::cerl()) -> cerl()
-%% @equiv ann_c_clause(As, Patterns, c_atom(true), Body)
-%% @see c_clause/3
-ann_c_clause(As, Patterns, Body) ->
-    ann_c_clause(As, Patterns, c_atom(true), Body).
-
-
-%% @spec ann_c_clause(As::[term()], Patterns::[cerl()], Guard::cerl(),
-%%                    Body::cerl()) -> cerl()
-%% @see ann_c_clause/3
-%% @see c_clause/3
-
-ann_c_clause(As, Patterns, Guard, Body) ->
-    #clause{pats = Patterns, guard = Guard, body = Body, ann = As}.
-
-
-%% @spec update_c_clause(Old::cerl(), Patterns::[cerl()],
-%%                       Guard::cerl(), Body::cerl()) -> cerl()
-%% @see c_clause/3
-
-update_c_clause(Node, Patterns, Guard, Body) ->
-    #clause{pats = Patterns, guard = Guard, body = Body,
-	    ann = get_ann(Node)}.
-
-
-%% @spec is_c_clause(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% clause, otherwise <code>false</code>.
-%%
-%% @see c_clause/3
-
-is_c_clause(#clause{}) ->
-    true;
-is_c_clause(_) ->
-    false.
-
-
-%% @spec clause_pats(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of pattern subtrees of an abstract clause.
-%%
-%% @see c_clause/3
-%% @see clause_arity/1
-
-clause_pats(Node) ->
-    Node#clause.pats.
-
-
-%% @spec clause_guard(cerl()) -> cerl()
-%%
-%% @doc Returns the guard subtree of an abstract clause.
-%% 
-%% @see c_clause/3
-
-clause_guard(Node) ->
-    Node#clause.guard.
-
-
-%% @spec clause_body(cerl()) -> cerl()
-%%
-%% @doc Returns the body subtree of an abstract clause.
-%%
-%% @see c_clause/3
-
-clause_body(Node) ->
-    Node#clause.body.
-
-
-%% @spec clause_arity(Node::cerl()) -> integer()
-%%
-%% @doc Returns the number of pattern subtrees of an abstract clause.
-%%
-%% <p>Note: this is equivalent to
-%% <code>length(clause_pats(Node))</code>, but potentially more
-%% efficient.</p>
-%%
-%% @see c_clause/3
-%% @see clause_pats/1
-
-clause_arity(Node) ->
-    length(clause_pats(Node)).
-
-
-%% @spec clause_vars(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of all abstract variables in the patterns of
-%% an abstract clause. The order of listing is not defined.
-%%
-%% @see c_clause/3
-%% @see pat_list_vars/1
-
-clause_vars(Clause) ->
-    pat_list_vars(clause_pats(Clause)).
-
-
-%% @spec pat_vars(Pattern::cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of all abstract variables in a pattern. An
-%% exception is thrown if <code>Node</code> does not represent a
-%% well-formed Core Erlang clause pattern. The order of listing is not
-%% defined.
-%%
-%% @see pat_list_vars/1
-%% @see clause_vars/1
-
-pat_vars(Node) ->
-    pat_vars(Node, []).
-
-pat_vars(Node, Vs) ->
-    case type(Node) of
-	var ->
-	    [Node | Vs];
-	literal ->
-	    Vs;
-	cons ->
-	    pat_vars(cons_hd(Node), pat_vars(cons_tl(Node), Vs));
-	tuple ->
-	    pat_list_vars(tuple_es(Node), Vs);
-	binary ->
-	    pat_list_vars(binary_segments(Node), Vs);
-	bitstr ->
-	    pat_vars(bitstr_val(Node), Vs);
-	alias ->
-	    pat_vars(alias_pat(Node), [alias_var(Node) | Vs])
-    end.
-
-
-%% @spec pat_list_vars(Patterns::[cerl()]) -> [cerl()]
-%%
-%% @doc Returns the list of all abstract variables in the given
-%% patterns. An exception is thrown if some element in
-%% <code>Patterns</code> does not represent a well-formed Core Erlang
-%% clause pattern. The order of listing is not defined.
-%%
-%% @see pat_vars/1
-%% @see clause_vars/1
-
-pat_list_vars(Ps) ->
-    pat_list_vars(Ps, []).
-
-pat_list_vars([P | Ps], Vs) ->
-    pat_list_vars(Ps, pat_vars(P, Vs));
-pat_list_vars([], Vs) ->
-    Vs.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_alias(Variable::cerl(), Pattern::cerl()) -> cerl()
-%%
-%% @doc Creates an abstract pattern alias. The result represents
-%% "<code><em>Variable</em> = <em>Pattern</em></code>".
-%%
-%% @see ann_c_alias/3
-%% @see update_c_alias/3
-%% @see is_c_alias/1
-%% @see alias_var/1
-%% @see alias_pat/1
-%% @see c_clause/3
-
--record(alias, {ann = [], var, pat}).
-
-c_alias(Var, Pattern) ->
-    #alias{var = Var, pat = Pattern}.
-
-
-%% @spec ann_c_alias(As::[term()], Variable::cerl(),
-%%                   Pattern::cerl()) -> cerl()
-%% @see c_alias/2
-
-ann_c_alias(As, Var, Pattern) ->
-    #alias{var = Var, pat = Pattern, ann = As}.
-
-
-%% @spec update_c_alias(Old::cerl(), Variable::cerl(),
-%%                      Pattern::cerl()) -> cerl()
-%% @see c_alias/2
-
-update_c_alias(Node, Var, Pattern) ->
-    #alias{var = Var, pat = Pattern, ann = get_ann(Node)}.
-
-
-%% @spec is_c_alias(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% pattern alias, otherwise <code>false</code>.
-%%
-%% @see c_alias/2
-
-is_c_alias(#alias{}) ->
-    true;
-is_c_alias(_) ->
-    false.
-
-
-%% @spec alias_var(cerl()) -> cerl()
-%%
-%% @doc Returns the variable subtree of an abstract pattern alias.
-%%
-%% @see c_alias/2
-
-alias_var(Node) ->
-    Node#alias.var.
-
-
-%% @spec alias_pat(cerl()) -> cerl()
-%%
-%% @doc Returns the pattern subtree of an abstract pattern alias.
-%%
-%% @see c_alias/2
-
-alias_pat(Node) ->
-    Node#alias.pat.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_receive(Clauses::[cerl()]) -> cerl()
-%% @equiv c_receive(Clauses, c_atom(infinity), c_atom(true))
-%% @see c_atom/1
-
-c_receive(Clauses) ->
-    c_receive(Clauses, c_atom(infinity), c_atom(true)).
-
-
-%% @spec c_receive(Clauses::[cerl()], Timeout::cerl(),
-%%                 Action::cerl()) -> cerl()
-%%
-%% @doc Creates an abstract receive-expression. If
-%% <code>Clauses</code> is <code>[C1, ..., Cn]</code>, the result
-%% represents "<code>receive <em>C1</em> ... <em>Cn</em> after
-%% <em>Timeout</em> -> <em>Action</em> end</code>".
-%%
-%% @see c_receive/1
-%% @see ann_c_receive/4
-%% @see update_c_receive/4
-%% @see is_c_receive/1
-%% @see receive_clauses/1
-%% @see receive_timeout/1
-%% @see receive_action/1
-
--record('receive', {ann = [], clauses, timeout, action}).
-
-c_receive(Clauses, Timeout, Action) ->
-    #'receive'{clauses = Clauses, timeout = Timeout, action = Action}.
-
-
-%% @spec ann_c_receive(As::[term()], Clauses::[cerl()]) -> cerl()
-%% @equiv ann_c_receive(As, Clauses, c_atom(infinity), c_atom(true))
-%% @see c_receive/3
-%% @see c_atom/1
-
-ann_c_receive(As, Clauses) ->
-    ann_c_receive(As, Clauses, c_atom(infinity), c_atom(true)).
-
-
-%% @spec ann_c_receive(As::[term()], Clauses::[cerl()],
-%%                     Timeout::cerl(), Action::cerl()) -> cerl()
-%% @see ann_c_receive/2
-%% @see c_receive/3
-
-ann_c_receive(As, Clauses, Timeout, Action) ->
-    #'receive'{clauses = Clauses, timeout = Timeout, action = Action,
-	       ann = As}.
-
-
-%% @spec update_c_receive(Old::cerl(), Clauses::[cerl()],
-%%                        Timeout::cerl(), Action::cerl()) -> cerl()
-%% @see c_receive/3
-
-update_c_receive(Node, Clauses, Timeout, Action) ->
-    #'receive'{clauses = Clauses, timeout = Timeout, action = Action,
-	       ann = get_ann(Node)}.
-
-
-%% @spec is_c_receive(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% receive-expression, otherwise <code>false</code>.
-%%
-%% @see c_receive/3
-
-is_c_receive(#'receive'{}) ->
-    true;
-is_c_receive(_) ->
-    false.
-
-
-%% @spec receive_clauses(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of clause subtrees of an abstract
-%% receive-expression.
-%%
-%% @see c_receive/3
-
-receive_clauses(Node) ->
-    Node#'receive'.clauses.
-
-
-%% @spec receive_timeout(cerl()) -> cerl()
-%%
-%% @doc Returns the timeout subtree of an abstract receive-expression.
-%%
-%% @see c_receive/3
-
-receive_timeout(Node) ->
-    Node#'receive'.timeout.
-
-
-%% @spec receive_action(cerl()) -> cerl()
-%%
-%% @doc Returns the action subtree of an abstract receive-expression.
-%%
-%% @see c_receive/3
-
-receive_action(Node) ->
-    Node#'receive'.action.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_apply(Operator::cerl(), Arguments::[cerl()]) -> cerl()
-%%
-%% @doc Creates an abstract function application. If
-%% <code>Arguments</code> is <code>[A1, ..., An]</code>, the result
-%% represents "<code>apply <em>Operator</em>(<em>A1</em>, ...,
-%% <em>An</em>)</code>".
-%%
-%% @see ann_c_apply/3
-%% @see update_c_apply/3
-%% @see is_c_apply/1
-%% @see apply_op/1
-%% @see apply_args/1
-%% @see apply_arity/1
-%% @see c_call/3
-%% @see c_primop/2
-
--record(apply, {ann = [], op, args}).
-
-c_apply(Operator, Arguments) ->
-    #apply{op = Operator, args = Arguments}.
-
-
-%% @spec ann_c_apply(As::[term()], Operator::cerl(),
-%%                   Arguments::[cerl()]) -> cerl()
-%% @see c_apply/2
-
-ann_c_apply(As, Operator, Arguments) ->
-    #apply{op = Operator, args = Arguments, ann = As}.
-
-
-%% @spec update_c_apply(Old::cerl(), Operator::cerl(),
-%%                      Arguments::[cerl()]) -> cerl()
-%% @see c_apply/2
-
-update_c_apply(Node, Operator, Arguments) ->
-    #apply{op = Operator, args = Arguments, ann = get_ann(Node)}.
-
-
-%% @spec is_c_apply(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% function application, otherwise <code>false</code>.
-%%
-%% @see c_apply/2
-
-is_c_apply(#apply{}) ->
-    true;
-is_c_apply(_) ->
-    false.
-
-
-%% @spec apply_op(cerl()) -> cerl()
-%%
-%% @doc Returns the operator subtree of an abstract function
-%% application.
-%%
-%% @see c_apply/2
-
-apply_op(Node) ->
-    Node#apply.op.
-
-
-%% @spec apply_args(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of argument subtrees of an abstract function
-%% application.
-%%
-%% @see c_apply/2
-%% @see apply_arity/1
-
-apply_args(Node) ->
-    Node#apply.args.
-
-
-%% @spec apply_arity(Node::cerl()) -> integer()
-%%
-%% @doc Returns the number of argument subtrees of an abstract
-%% function application.
-%%
-%% <p>Note: this is equivalent to
-%% <code>length(apply_args(Node))</code>, but potentially more
-%% efficient.</p>
-%%
-%% @see c_apply/2
-%% @see apply_args/1
-
-apply_arity(Node) ->
-    length(apply_args(Node)).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_call(Module::cerl(), Name::cerl(), Arguments::[cerl()]) ->
-%%           cerl()
-%%
-%% @doc Creates an abstract inter-module call. If
-%% <code>Arguments</code> is <code>[A1, ..., An]</code>, the result
-%% represents "<code>call <em>Module</em>:<em>Name</em>(<em>A1</em>,
-%% ..., <em>An</em>)</code>".
-%%
-%% @see ann_c_call/4
-%% @see update_c_call/4
-%% @see is_c_call/1
-%% @see call_module/1
-%% @see call_name/1
-%% @see call_args/1
-%% @see call_arity/1
-%% @see c_apply/2
-%% @see c_primop/2
-
--record(call, {ann = [], module, name, args}).
-
-c_call(Module, Name, Arguments) ->
-    #call{module = Module, name = Name, args = Arguments}.
-
-
-%% @spec ann_c_call(As::[term()], Module::cerl(), Name::cerl(),
-%%                  Arguments::[cerl()]) -> cerl()
-%% @see c_call/3
-
-ann_c_call(As, Module, Name, Arguments) ->
-    #call{module = Module, name = Name, args = Arguments, ann = As}.
-
-
-%% @spec update_c_call(Old::cerl(), Module::cerl(), Name::cerl(),
-%%                  Arguments::[cerl()]) -> cerl()
-%% @see c_call/3
-
-update_c_call(Node, Module, Name, Arguments) ->
-    #call{module = Module, name = Name, args = Arguments,
-	  ann = get_ann(Node)}.
-
-
-%% @spec is_c_call(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% inter-module call expression; otherwise <code>false</code>.
-%%
-%% @see c_call/3
-
-is_c_call(#call{}) ->
-    true;
-is_c_call(_) ->
-    false.
-
-
-%% @spec call_module(cerl()) -> cerl()
-%%
-%% @doc Returns the module subtree of an abstract inter-module call.
-%%
-%% @see c_call/3
-
-call_module(Node) ->
-    Node#call.module.
-
-
-%% @spec call_name(cerl()) -> cerl()
-%%
-%% @doc Returns the name subtree of an abstract inter-module call.
-%%
-%% @see c_call/3
-
-call_name(Node) ->
-    Node#call.name.
-
-
-%% @spec call_args(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of argument subtrees of an abstract
-%% inter-module call.
-%%
-%% @see c_call/3
-%% @see call_arity/1
-
-call_args(Node) ->
-    Node#call.args.
-
-
-%% @spec call_arity(Node::cerl()) -> integer()
-%%
-%% @doc Returns the number of argument subtrees of an abstract
-%% inter-module call.
-%%
-%% <p>Note: this is equivalent to
-%% <code>length(call_args(Node))</code>, but potentially more
-%% efficient.</p>
-%%
-%% @see c_call/3
-%% @see call_args/1
-
-call_arity(Node) ->
-    length(call_args(Node)).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_primop(Name::cerl(), Arguments::[cerl()]) -> cerl()
-%%
-%% @doc Creates an abstract primitive operation call. If
-%% <code>Arguments</code> is <code>[A1, ..., An]</code>, the result
-%% represents "<code>primop <em>Name</em>(<em>A1</em>, ...,
-%% <em>An</em>)</code>". <code>Name</code> must be an atom literal.
-%%
-%% @see ann_c_primop/3
-%% @see update_c_primop/3
-%% @see is_c_primop/1
-%% @see primop_name/1
-%% @see primop_args/1
-%% @see primop_arity/1
-%% @see c_apply/2
-%% @see c_call/3
-
--record(primop, {ann = [], name, args}).
-
-c_primop(Name, Arguments) ->
-    #primop{name = Name, args = Arguments}.
-
-
-%% @spec ann_c_primop(As::[term()], Name::cerl(),
-%%                    Arguments::[cerl()]) -> cerl()
-%% @see c_primop/2
-
-ann_c_primop(As, Name, Arguments) ->
-    #primop{name = Name, args = Arguments, ann = As}.
-
-
-%% @spec update_c_primop(Old::cerl(), Name::cerl(),
-%%                       Arguments::[cerl()]) -> cerl()
-%% @see c_primop/2
-
-update_c_primop(Node, Name, Arguments) ->
-    #primop{name = Name, args = Arguments, ann = get_ann(Node)}.
-
-
-%% @spec is_c_primop(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% primitive operation call, otherwise <code>false</code>.
-%%
-%% @see c_primop/2
-
-is_c_primop(#primop{}) ->
-    true;
-is_c_primop(_) ->
-    false.
-
-
-%% @spec primop_name(cerl()) -> cerl()
-%%
-%% @doc Returns the name subtree of an abstract primitive operation
-%% call.
-%%
-%% @see c_primop/2
-
-primop_name(Node) ->
-    Node#primop.name.
-
-
-%% @spec primop_args(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of argument subtrees of an abstract primitive
-%% operation call.
-%%
-%% @see c_primop/2
-%% @see primop_arity/1
-
-primop_args(Node) ->
-    Node#primop.args.
-
-
-%% @spec primop_arity(Node::cerl()) -> integer()
-%%
-%% @doc Returns the number of argument subtrees of an abstract
-%% primitive operation call.
-%%
-%% <p>Note: this is equivalent to
-%% <code>length(primop_args(Node))</code>, but potentially more
-%% efficient.</p>
-%%
-%% @see c_primop/2
-%% @see primop_args/1
-
-primop_arity(Node) ->
-    length(primop_args(Node)).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_try(Argument::cerl(), Variables::[cerl()], Body::cerl(),
-%%             ExceptionVars::[cerl()], Handler::cerl()) -> cerl()
-%%
-%% @doc Creates an abstract try-expression. If <code>Variables</code> is
-%% <code>[V1, ..., Vn]</code> and <code>ExceptionVars</code> is
-%% <code>[X1, ..., Xm]</code>, the result represents "<code>try
-%% <em>Argument</em> of &lt;<em>V1</em>, ..., <em>Vn</em>&gt; ->
-%% <em>Body</em> catch &lt;<em>X1</em>, ..., <em>Xm</em>&gt; ->
-%% <em>Handler</em></code>". All the <code>Vi</code> and <code>Xi</code>
-%% must have type <code>var</code>.
-%%
-%% @see ann_c_try/6
-%% @see update_c_try/6
-%% @see is_c_try/1
-%% @see try_arg/1
-%% @see try_vars/1
-%% @see try_body/1
-%% @see c_catch/1
-
--record('try', {ann = [], arg, vars, body, evars, handler}).
-
-c_try(Expr, Vs, Body, Evs, Handler) ->
-    #'try'{arg = Expr, vars = Vs, body = Body,
-	   evars = Evs, handler = Handler}.
-
-
-%% @spec ann_c_try(As::[term()], Expression::cerl(),
-%%                 Variables::[cerl()], Body::cerl(),
-%%                 EVars::[cerl()], EBody::[cerl()]) -> cerl()
-%% @see c_try/3
-
-ann_c_try(As, Expr, Vs, Body, Evs, Handler) ->
-    #'try'{arg = Expr, vars = Vs, body = Body,
-	   evars = Evs, handler = Handler, ann = As}.
-
-
-%% @spec update_c_try(Old::cerl(), Expression::cerl(),
-%%                    Variables::[cerl()], Body::cerl(),
-%%                    EVars::[cerl()], EBody::[cerl()]) -> cerl()
-%% @see c_try/3
-
-update_c_try(Node, Expr, Vs, Body, Evs, Handler) ->
-    #'try'{arg = Expr, vars = Vs, body = Body,
-	   evars = Evs, handler = Handler, ann = get_ann(Node)}.
-
-
-%% @spec is_c_try(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% try-expression, otherwise <code>false</code>.
-%%
-%% @see c_try/3
-
-is_c_try(#'try'{}) ->
-    true;
-is_c_try(_) ->
-    false.
-
-
-%% @spec try_arg(cerl()) -> cerl()
-%%
-%% @doc Returns the expression subtree of an abstract try-expression.
-%%
-%% @see c_try/3
-
-try_arg(Node) ->
-    Node#'try'.arg.
-
-
-%% @spec try_vars(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of success variable subtrees of an abstract
-%% try-expression.
-%%
-%% @see c_try/3
-
-try_vars(Node) ->
-    Node#'try'.vars.
-
-
-%% @spec try_body(cerl()) -> cerl()
-%%
-%% @doc Returns the success body subtree of an abstract try-expression.
-%%
-%% @see c_try/3
-
-try_body(Node) ->
-    Node#'try'.body.
-
-
-%% @spec try_evars(cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of exception variable subtrees of an abstract
-%% try-expression.
-%%
-%% @see c_try/3
-
-try_evars(Node) ->
-    Node#'try'.evars.
-
-
-%% @spec try_handler(cerl()) -> cerl()
-%%
-%% @doc Returns the exception body subtree of an abstract
-%% try-expression.
-%%
-%% @see c_try/3
-
-try_handler(Node) ->
-    Node#'try'.handler.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec c_catch(Body::cerl()) -> cerl()
-%%
-%% @doc Creates an abstract catch-expression. The result represents
-%% "<code>catch <em>Body</em></code>".
-%%
-%% <p>Note: catch-expressions can be rewritten as try-expressions, and
-%% will eventually be removed from Core Erlang.</p>
-%%
-%% @see ann_c_catch/2
-%% @see update_c_catch/2
-%% @see is_c_catch/1
-%% @see catch_body/1
-%% @see c_try/3
-
--record('catch', {ann = [], body}).
-
-c_catch(Body) ->
-    #'catch'{body = Body}.
-
-
-%% @spec ann_c_catch(As::[term()], Body::cerl()) -> cerl()
-%% @see c_catch/1
-
-ann_c_catch(As, Body) ->
-    #'catch'{body = Body, ann = As}.
-
-
-%% @spec update_c_catch(Old::cerl(), Body::cerl()) -> cerl()
-%% @see c_catch/1
-
-update_c_catch(Node, Body) ->
-    #'catch'{body = Body, ann = get_ann(Node)}.
-
-
-%% @spec is_c_catch(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> is an abstract
-%% catch-expression, otherwise <code>false</code>.
-%%
-%% @see c_catch/1
-
-is_c_catch(#'catch'{}) ->
-    true;
-is_c_catch(_) ->
-    false.
-
-
-%% @spec catch_body(Node::cerl()) -> cerl()
-%%
-%% @doc Returns the body subtree of an abstract catch-expression.
-%%
-%% @see c_catch/1
-
-catch_body(Node) ->
-    Node#'catch'.body.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec to_records(Tree::cerl()) -> record(record_types())
-%%
-%% @doc Translates an abstract syntax tree to a corresponding explicit
-%% record representation. The records are defined in the file
-%% "<code>cerl.hrl</code>".
-%%
-%% <p>Note: Compound constant literals are always unfolded in the
-%% record representation.</p>
-%%
-%% @see type/1
-%% @see from_records/1
-
-to_records(Node) ->
-    A = get_ann(Node),
-    case type(Node) of
-	literal ->
-	    lit_to_records(concrete(Node), A);
-	binary ->
-	    #c_binary{anno = A,
-		      segments =
-		      list_to_records(binary_segments(Node))};
-	bitstr ->
-	    #c_bitstr{anno = A,
-		      val = to_records(bitstr_val(Node)),
-		      size = to_records(bitstr_size(Node)),
-		      unit = to_records(bitstr_unit(Node)),
-		      type = to_records(bitstr_type(Node)),
-		      flags = to_records(bitstr_flags(Node))};
-	cons ->
-	    #c_cons{anno = A,
-		    hd = to_records(cons_hd(Node)),
-		    tl = to_records(cons_tl(Node))};
-	tuple ->
-	    #c_tuple{anno = A,
-		     es = list_to_records(tuple_es(Node))};
-	var ->
-	    case is_c_fname(Node) of
-		true ->
-		    #c_fname{anno = A,
-			     id = fname_id(Node),
-			     arity = fname_arity(Node)};
-		false ->
-		    #c_var{anno = A, name = var_name(Node)}
-	    end;
-	values ->
-	    #c_values{anno = A,
-		      es = list_to_records(values_es(Node))};
-	'fun' ->
-	    #c_fun{anno = A,
-		   vars = list_to_records(fun_vars(Node)),
-		   body = to_records(fun_body(Node))};
-	seq ->
-	    #c_seq{anno = A,
-		   arg = to_records(seq_arg(Node)),
-		   body = to_records(seq_body(Node))};
-	'let' ->
-	    #c_let{anno = A,
-		   vars = list_to_records(let_vars(Node)),
-		   arg = to_records(let_arg(Node)),
-		   body = to_records(let_body(Node))};
-	letrec ->
-	    #c_letrec{anno = A,
-		      defs = [#c_def{name = to_records(N),
-				     val = to_records(F)}
-			      || {N, F} <- letrec_defs(Node)],
-		      body = to_records(letrec_body(Node))};
-	'case' ->
-	    #c_case{anno = A,
-		    arg = to_records(case_arg(Node)),
-		    clauses =
-		    list_to_records(case_clauses(Node))};
-	clause ->
-	    #c_clause{anno = A,
-		      pats = list_to_records(clause_pats(Node)),
-		      guard = to_records(clause_guard(Node)),
-		      body = to_records(clause_body(Node))};
-	alias ->
-	    #c_alias{anno = A,
-		     var = to_records(alias_var(Node)),
-		     pat = to_records(alias_pat(Node))};
-	'receive' ->
-	    #c_receive{anno = A,
-		       clauses = 
-		       list_to_records(receive_clauses(Node)),
-		       timeout =
-		       to_records(receive_timeout(Node)),
-		       action = 
-		       to_records(receive_action(Node))};
-	apply ->
-	    #c_apply{anno = A,
-		     op = to_records(apply_op(Node)),
-		     args = list_to_records(apply_args(Node))};
-	call ->
-	    #c_call{anno = A,
-		    module = to_records(call_module(Node)),
-		    name = to_records(call_name(Node)),
-		    args = list_to_records(call_args(Node))};
-	primop ->
-	    #c_primop{anno = A,
-		      name = to_records(primop_name(Node)),
-		      args = list_to_records(primop_args(Node))};
-	'try' ->
-	    #c_try{anno = A,
-		   arg = to_records(try_arg(Node)),
-		   vars = list_to_records(try_vars(Node)),
-		   body = to_records(try_body(Node)),
-		   evars = list_to_records(try_evars(Node)),
-		   handler = to_records(try_handler(Node))};
-	'catch' ->
-	    #c_catch{anno = A,
-		     body = to_records(catch_body(Node))};
-	module ->
-	    #c_module{anno = A,
-		      name = to_records(module_name(Node)),
-		      exports = list_to_records(
-				  module_exports(Node)),
-		      attrs = [#c_def{name = to_records(K),
-				      val = to_records(V)}
-			       || {K, V} <- module_attrs(Node)],
-		      defs = [#c_def{name = to_records(N),
-				     val = to_records(F)}
-			      || {N, F} <- module_defs(Node)]}
-    end.
-
-list_to_records([T | Ts]) ->
-    [to_records(T) | list_to_records(Ts)];
-list_to_records([]) ->
-    [].
-
-lit_to_records(V, A) when integer(V) ->
-    #c_int{anno = A, val = V};
-lit_to_records(V, A) when float(V) ->
-    #c_float{anno = A, val = V};
-lit_to_records(V, A) when atom(V) ->
-    #c_atom{anno = A, val = V};
-lit_to_records([H | T] = V, A) ->
-    case is_print_char_list(V) of
-	true ->
-	    #c_string{anno = A, val = V};
-	false ->
-	    #c_cons{anno = A,
-		    hd = lit_to_records(H, []),
-		    tl = lit_to_records(T, [])}
-    end;
-lit_to_records([], A) ->
-    #c_nil{anno = A};
-lit_to_records(V, A) when tuple(V) ->
-    #c_tuple{anno = A, es = lit_list_to_records(tuple_to_list(V))}.
-
-lit_list_to_records([T | Ts]) ->
-    [lit_to_records(T, []) | lit_list_to_records(Ts)];
-lit_list_to_records([]) ->
-    [].
-
-
-%% @spec from_records(Tree::record(record_types())) -> cerl()
-%%
-%%     record_types() = c_alias | c_apply | c_call | c_case | c_catch |
-%%                      c_clause | c_cons | c_def| c_fun | c_let |
-%%                      c_letrec |c_lit | c_module | c_primop |
-%%                      c_receive | c_seq | c_try | c_tuple |
-%%                      c_values | c_var
-%%
-%% @doc Translates an explicit record representation to a
-%% corresponding abstract syntax tree.  The records are defined in the
-%% file "<code>cerl.hrl</code>".
-%%
-%% <p>Note: Compound constant literals are folded, discarding
-%% annotations on subtrees. There are no <code>c_def</code> nodes in
-%% the abstract representation; annotations on <code>c_def</code>
-%% records are discarded.</p>
-%%
-%% @see type/1
-%% @see to_records/1
-
-from_records(#c_int{val = V, anno = As}) ->
-    ann_c_int(As, V);
-from_records(#c_float{val = V, anno = As}) ->
-    ann_c_float(As, V);
-from_records(#c_atom{val = V, anno = As}) ->
-    ann_c_atom(As, V);
-from_records(#c_char{val = V, anno = As}) ->
-    ann_c_char(As, V);
-from_records(#c_string{val = V, anno = As}) ->
-    ann_c_string(As, V);
-from_records(#c_nil{anno = As}) ->
-    ann_c_nil(As);
-from_records(#c_binary{segments = Ss, anno = As}) ->
-    ann_c_binary(As, from_records_list(Ss));
-from_records(#c_bitstr{val = V, size = S, unit = U, type = T,
-		       flags = Fs, anno = As}) ->
-    ann_c_bitstr(As, from_records(V), from_records(S), from_records(U),
-		 from_records(T), from_records(Fs));
-from_records(#c_cons{hd = H, tl = T, anno = As}) ->
-    ann_c_cons(As, from_records(H), from_records(T));
-from_records(#c_tuple{es = Es, anno = As}) ->
-    ann_c_tuple(As, from_records_list(Es));
-from_records(#c_var{name = Name, anno = As}) ->
-    ann_c_var(As, Name);
-from_records(#c_fname{id = Id, arity = Arity, anno = As}) ->
-    ann_c_fname(As, Id, Arity);
-from_records(#c_values{es = Es, anno = As}) ->
-    ann_c_values(As, from_records_list(Es));
-from_records(#c_fun{vars = Vs, body = B, anno = As}) ->
-    ann_c_fun(As, from_records_list(Vs), from_records(B));
-from_records(#c_seq{arg = A, body = B, anno = As}) ->
-    ann_c_seq(As, from_records(A), from_records(B));
-from_records(#c_let{vars = Vs, arg = A, body = B, anno = As}) ->
-    ann_c_let(As, from_records_list(Vs), from_records(A),
-	      from_records(B));
-from_records(#c_letrec{defs = Fs, body = B, anno = As}) ->
-    ann_c_letrec(As, [{from_records(N), from_records(F)}
-		      || #c_def{name = N, val = F} <- Fs],
-		 from_records(B));
-from_records(#c_case{arg = A, clauses = Cs, anno = As}) ->
-    ann_c_case(As, from_records(A), from_records_list(Cs));
-from_records(#c_clause{pats = Ps, guard = G, body = B, anno = As}) ->
-    ann_c_clause(As, from_records_list(Ps), from_records(G),
-		 from_records(B));
-from_records(#c_alias{var = V, pat = P, anno = As}) ->
-    ann_c_alias(As, from_records(V), from_records(P));
-from_records(#c_receive{clauses = Cs, timeout = T, action = A,
-			anno = As}) ->
-    ann_c_receive(As, from_records_list(Cs), from_records(T),
-		  from_records(A));
-from_records(#c_apply{op = Op, args = Es, anno = As}) ->
-    ann_c_apply(As, from_records(Op), from_records_list(Es));
-from_records(#c_call{module = M, name = N, args = Es, anno = As}) ->
-    ann_c_call(As, from_records(M), from_records(N),
-	       from_records_list(Es));
-from_records(#c_primop{name = N, args = Es, anno = As}) ->
-    ann_c_primop(As, from_records(N), from_records_list(Es));
-from_records(#c_try{arg = E, vars = Vs, body = B,
-		    evars = Evs, handler = H, anno = As}) ->
-    ann_c_try(As, from_records(E), from_records_list(Vs),
-	      from_records(B), from_records_list(Evs), from_records(H));
-from_records(#c_catch{body = B, anno = As}) ->
-    ann_c_catch(As, from_records(B));
-from_records(#c_module{name = N, exports = Es, attrs = Ds, defs = Fs,
-		       anno = As}) ->
-    ann_c_module(As, from_records(N),
-		 from_records_list(Es),
-		 [{from_records(K), from_records(V)}
-		  || #c_def{name = K, val = V} <- Ds],
-		 [{from_records(V), from_records(F)}
-		  || #c_def{name = V, val = F} <- Fs]).
-
-from_records_list([T | Ts]) ->
-    [from_records(T) | from_records_list(Ts)];
-from_records_list([]) ->
-    [].
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec is_data(Node::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if <code>Node</code> represents a
-%% data constructor, otherwise <code>false</code>. Data constructors
-%% are cons cells, tuples, and atomic literals.
-%%
-%% @see data_type/1
-%% @see data_es/1
-%% @see data_arity/1
-
-is_data(#literal{}) ->
-    true;
-is_data(#cons{}) ->
-    true;
-is_data(#tuple{}) ->
-    true;
-is_data(_) ->
-    false.
-
-
-%% @spec data_type(Node::cerl()) -> dtype()
-%%
-%%     dtype() = cons | tuple | {'atomic', Value}
-%%     Value = integer() | float() | atom() | []
-%%
-%% @doc Returns a type descriptor for a data constructor
-%% node. (Cf. <code>is_data/1</code>.) This is mainly useful for
-%% comparing types and for constructing new nodes of the same type
-%% (cf. <code>make_data/2</code>). If <code>Node</code> represents an
-%% integer, floating-point number, atom or empty list, the result is
-%% <code>{'atomic', Value}</code>, where <code>Value</code> is the value
-%% of <code>concrete(Node)</code>, otherwise the result is either
-%% <code>cons</code> or <code>tuple</code>.
-%%
-%% <p>Type descriptors can be compared for equality or order (in the
-%% Erlang term order), but remember that floating-point values should
-%% in general never be tested for equality.</p>
-%%
-%% @see is_data/1
-%% @see make_data/2
-%% @see type/1
-%% @see concrete/1
-
-data_type(#literal{val = V}) ->
-    case V of
-	[_ | _] ->
-	    cons;
-	_ when tuple(V) ->
-	    tuple;
-	_ ->
-	    {'atomic', V}
-    end;
-data_type(#cons{}) ->
-    cons;
-data_type(#tuple{}) ->
-    tuple.
-
-
-%% @spec data_es(Node::cerl()) -> [cerl()]
-%%
-%% @doc Returns the list of subtrees of a data constructor node. If
-%% the arity of the constructor is zero, the result is the empty list.
-%%
-%% <p>Note: if <code>data_type(Node)</code> is <code>cons</code>, the
-%% number of subtrees is exactly two. If <code>data_type(Node)</code>
-%% is <code>{'atomic', Value}</code>, the number of subtrees is
-%% zero.</p>
-%%
-%% @see is_data/1
-%% @see data_type/1
-%% @see data_arity/1
-%% @see make_data/2
-
-data_es(#literal{val = V}) ->
-    case V of
-	[Head | Tail] ->
-	    [#literal{val = Head}, #literal{val = Tail}];
-	_ when tuple(V) ->
-	    make_lit_list(tuple_to_list(V));
-	_ ->
-	    []
-    end;
-data_es(#cons{hd = H, tl = T}) ->
-    [H, T];
-data_es(#tuple{es = Es}) ->
-    Es.
-
-
-%% @spec data_arity(Node::cerl()) -> integer()
-%%
-%% @doc Returns the number of subtrees of a data constructor
-%% node. This is equivalent to <code>length(data_es(Node))</code>, but
-%% potentially more efficient.
-%%
-%% @see is_data/1
-%% @see data_es/1
-
-data_arity(#literal{val = V}) ->
-    case V of
-	[_ | _] ->
-	    2;
-	_ when tuple(V) ->
-	    size(V);
-	_ ->
-	    0
-    end;
-data_arity(#cons{}) ->
-    2;
-data_arity(#tuple{es = Es}) ->
-    length(Es).
-
-
-%% @spec make_data(Type::dtype(), Elements::[cerl()]) -> cerl()
-%%
-%% @doc Creates a data constructor node with the specified type and
-%% subtrees. (Cf. <code>data_type/1</code>.)  An exception is thrown
-%% if the length of <code>Elements</code> is invalid for the given
-%% <code>Type</code>; see <code>data_es/1</code> for arity constraints
-%% on constructor types.
-%%
-%% @see data_type/1
-%% @see data_es/1
-%% @see ann_make_data/3
-%% @see update_data/3
-%% @see make_data_skel/2
-
-make_data(CType, Es) ->
-    ann_make_data([], CType, Es).
-
-
-%% @spec ann_make_data(As::[term()], Type::dtype(),
-%%                     Elements::[cerl()]) -> cerl()
-%% @see make_data/2
-
-ann_make_data(As, {'atomic', V}, []) -> #literal{val = V, ann = As};
-ann_make_data(As, cons, [H, T]) -> ann_c_cons(As, H, T);
-ann_make_data(As, tuple, Es) -> ann_c_tuple(As, Es).
-
-
-%% @spec update_data(Old::cerl(), Type::dtype(),
-%%                   Elements::[cerl()]) -> cerl()
-%% @see make_data/2
-
-update_data(Node, CType, Es) ->
-    ann_make_data(get_ann(Node), CType, Es).
-
-
-%% @spec make_data_skel(Type::dtype(), Elements::[cerl()]) -> cerl()
-%%
-%% @doc Like <code>make_data/2</code>, but analogous to
-%% <code>c_tuple_skel/1</code> and <code>c_cons_skel/2</code>.
-%%
-%% @see ann_make_data_skel/3
-%% @see update_data_skel/3
-%% @see make_data/2
-%% @see c_tuple_skel/1
-%% @see c_cons_skel/2
-
-make_data_skel(CType, Es) ->
-    ann_make_data_skel([], CType, Es).
-
-
-%% @spec ann_make_data_skel(As::[term()], Type::dtype(),
-%%                          Elements::[cerl()]) -> cerl()
-%% @see make_data_skel/2
-
-ann_make_data_skel(As, {'atomic', V}, []) -> #literal{val = V, ann = As};
-ann_make_data_skel(As, cons, [H, T]) -> ann_c_cons_skel(As, H, T);
-ann_make_data_skel(As, tuple, Es) -> ann_c_tuple_skel(As, Es).
-
-
-%% @spec update_data_skel(Old::cerl(), Type::dtype(),
-%%                        Elements::[cerl()]) -> cerl()
-%% @see make_data_skel/2
-
-update_data_skel(Node, CType, Es) ->
-    ann_make_data_skel(get_ann(Node), CType, Es).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec subtrees(Node::cerl()) -> [[cerl()]]
-%%
-%% @doc Returns the grouped list of all subtrees of a node. If
-%% <code>Node</code> is a leaf node (cf. <code>is_leaf/1</code>), this
-%% is the empty list, otherwise the result is always a nonempty list,
-%% containing the lists of subtrees of <code>Node</code>, in
-%% left-to-right order as they occur in the printed program text, and
-%% grouped by category. Often, each group contains only a single
-%% subtree.
-%%
-%% <p>Depending on the type of <code>Node</code>, the size of some
-%% groups may be variable (e.g., the group consisting of all the
-%% elements of a tuple), while others always contain the same number
-%% of elements - usually exactly one (e.g., the group containing the
-%% argument expression of a case-expression). Note, however, that the
-%% exact structure of the returned list (for a given node type) should
-%% in general not be depended upon, since it might be subject to
-%% change without notice.</p>
-%%
-%% <p>The function <code>subtrees/1</code> and the constructor functions
-%% <code>make_tree/2</code> and <code>update_tree/2</code> can be a
-%% great help if one wants to traverse a syntax tree, visiting all its
-%% subtrees, but treat nodes of the tree in a uniform way in most or all
-%% cases. Using these functions makes this simple, and also assures that
-%% your code is not overly sensitive to extensions of the syntax tree
-%% data type, because any node types not explicitly handled by your code
-%% can be left to a default case.</p>
-%%
-%% <p>For example:
-%% <pre>
-%%   postorder(F, Tree) ->
-%%       F(case subtrees(Tree) of
-%%           [] -> Tree;
-%%           List -> update_tree(Tree,
-%%                               [[postorder(F, Subtree)
-%%                                 || Subtree &lt;- Group]
-%%                                || Group &lt;- List])
-%%         end).
-%% </pre>
-%% maps the function <code>F</code> on <code>Tree</code> and all its
-%% subtrees, doing a post-order traversal of the syntax tree. (Note
-%% the use of <code>update_tree/2</code> to preserve annotations.) For
-%% a simple function like:
-%% <pre>
-%%   f(Node) ->
-%%       case type(Node) of
-%%           atom -> atom("a_" ++ atom_name(Node));
-%%           _ -> Node
-%%       end.
-%% </pre>
-%% the call <code>postorder(fun f/1, Tree)</code> will yield a new
-%% representation of <code>Tree</code> in which all atom names have
-%% been extended with the prefix "a_", but nothing else (including
-%% annotations) has been changed.</p>
-%%
-%% @see is_leaf/1
-%% @see make_tree/2
-%% @see update_tree/2
-
-subtrees(T) ->
-    case is_leaf(T) of
-	true ->
-	    [];
-	false ->
-	    case type(T) of
-		values ->
-		    [values_es(T)];
-		binary ->
-		    [binary_segments(T)];
-		bitstr ->
-		    [[bitstr_val(T)], [bitstr_size(T)],
-		     [bitstr_unit(T)], [bitstr_type(T)],
-		     [bitstr_flags(T)]];
-		cons ->
-		    [[cons_hd(T)], [cons_tl(T)]];
-		tuple ->
-		    [tuple_es(T)];
-		'let' ->
-		    [let_vars(T), [let_arg(T)], [let_body(T)]];
-		seq ->
-		    [[seq_arg(T)], [seq_body(T)]];
-		apply ->
-		    [[apply_op(T)], apply_args(T)];
-		call ->
-		    [[call_module(T)], [call_name(T)],
-		     call_args(T)];
-		primop ->
-		    [[primop_name(T)], primop_args(T)];
-		'case' ->
-		    [[case_arg(T)], case_clauses(T)];
-		clause ->
-		    [clause_pats(T), [clause_guard(T)],
-		     [clause_body(T)]];
-		alias ->
-		    [[alias_var(T)], [alias_pat(T)]];
-		'fun' ->
-		    [fun_vars(T), [fun_body(T)]];
-		'receive' ->
-		    [receive_clauses(T), [receive_timeout(T)],
-		     [receive_action(T)]];
-		'try' ->
-		    [[try_arg(T)], try_vars(T), [try_body(T)],
-		     try_evars(T), [try_handler(T)]];
-		'catch' ->
-		    [[catch_body(T)]];
-		letrec ->
-		    Es = unfold_tuples(letrec_defs(T)),
-		    [Es, [letrec_body(T)]];
-		module ->
-		    As = unfold_tuples(module_attrs(T)),
-		    Es = unfold_tuples(module_defs(T)),
-		    [[module_name(T)], module_exports(T), As, Es]
-	    end
-    end.
-
-
-%% @spec update_tree(Old::cerl(), Groups::[[cerl()]]) -> cerl()
-%%
-%% @doc Creates a syntax tree with the given subtrees, and the same
-%% type and annotations as the <code>Old</code> node. This is
-%% equivalent to <code>ann_make_tree(get_ann(Node), type(Node),
-%% Groups)</code>, but potentially more efficient.
-%%
-%% @see update_tree/3
-%% @see ann_make_tree/3
-%% @see get_ann/1
-%% @see type/1
-
-update_tree(Node, Gs) ->
-    ann_make_tree(get_ann(Node), type(Node), Gs).
-
-
-%% @spec update_tree(Old::cerl(), Type::atom(), Groups::[[cerl()]]) ->
-%%           cerl()
-%%
-%% @doc Creates a syntax tree with the given type and subtrees, and
-%% the same annotations as the <code>Old</code> node. This is
-%% equivalent to <code>ann_make_tree(get_ann(Node), Type,
-%% Groups)</code>, but potentially more efficient.
-%%
-%% @see update_tree/2
-%% @see ann_make_tree/3
-%% @see get_ann/1
-
-update_tree(Node, Type, Gs) ->
-    ann_make_tree(get_ann(Node), Type, Gs).
-
-
-%% @spec make_tree(Type::atom(), Groups::[[cerl()]]) -> cerl()
-%%
-%% @doc Creates a syntax tree with the given type and subtrees.
-%% <code>Type</code> must be a node type name
-%% (cf. <code>type/1</code>) that does not denote a leaf node type
-%% (cf. <code>is_leaf/1</code>).  <code>Groups</code> must be a
-%% <em>nonempty</em> list of groups of syntax trees, representing the
-%% subtrees of a node of the given type, in left-to-right order as
-%% they would occur in the printed program text, grouped by category
-%% as done by <code>subtrees/1</code>.
-%%
-%% <p>The result of <code>ann_make_tree(get_ann(Node), type(Node),
-%% subtrees(Node))</code> (cf. <code>update_tree/2</code>) represents
-%% the same source code text as the original <code>Node</code>,
-%% assuming that <code>subtrees(Node)</code> yields a nonempty
-%% list. However, it does not necessarily have the exact same data
-%% representation as <code>Node</code>.</p>
-%%
-%% @see ann_make_tree/3
-%% @see type/1
-%% @see is_leaf/1
-%% @see subtrees/1
-%% @see update_tree/2
-
-make_tree(Type, Gs) ->
-    ann_make_tree([], Type, Gs).
-
-
-%% @spec ann_make_tree(As::[term()], Type::atom(),
-%%                     Groups::[[cerl()]]) -> cerl()
-%%
-%% @doc Creates a syntax tree with the given annotations, type and
-%% subtrees. See <code>make_tree/2</code> for details.
-%%
-%% @see make_tree/2
-
-ann_make_tree(As, values, [Es]) -> ann_c_values(As, Es);
-ann_make_tree(As, binary, [Ss]) -> ann_c_binary(As, Ss);
-ann_make_tree(As, bitstr, [[V],[S],[U],[T],[Fs]]) ->
-    ann_c_bitstr(As, V, S, U, T, Fs);
-ann_make_tree(As, cons, [[H], [T]]) -> ann_c_cons(As, H, T);
-ann_make_tree(As, tuple, [Es]) -> ann_c_tuple(As, Es);
-ann_make_tree(As, 'let', [Vs, [A], [B]]) -> ann_c_let(As, Vs, A, B);
-ann_make_tree(As, seq, [[A], [B]]) -> ann_c_seq(As, A, B);
-ann_make_tree(As, apply, [[Op], Es]) -> ann_c_apply(As, Op, Es);
-ann_make_tree(As, call, [[M], [N], Es]) -> ann_c_call(As, M, N, Es);
-ann_make_tree(As, primop, [[N], Es]) -> ann_c_primop(As, N, Es);
-ann_make_tree(As, 'case', [[A], Cs]) -> ann_c_case(As, A, Cs);
-ann_make_tree(As, clause, [Ps, [G], [B]]) -> ann_c_clause(As, Ps, G, B);
-ann_make_tree(As, alias, [[V], [P]]) -> ann_c_alias(As, V, P);
-ann_make_tree(As, 'fun', [Vs, [B]]) -> ann_c_fun(As, Vs, B);
-ann_make_tree(As, 'receive', [Cs, [T], [A]]) ->
-    ann_c_receive(As, Cs, T, A);
-ann_make_tree(As, 'try', [[E], Vs, [B], Evs, [H]]) ->
-    ann_c_try(As, E, Vs, B, Evs, H);
-ann_make_tree(As, 'catch', [[B]]) -> ann_c_catch(As, B);
-ann_make_tree(As, letrec, [Es, [B]]) ->
-    ann_c_letrec(As, fold_tuples(Es), B);
-ann_make_tree(As, module, [[N], Xs, Es, Ds]) ->
-    ann_c_module(As, N, Xs, fold_tuples(Es), fold_tuples(Ds)).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec meta(Tree::cerl()) -> cerl()
-%%
-%% @doc Creates a meta-representation of a syntax tree. The result
-%% represents an Erlang expression "<code><em>MetaTree</em></code>"
-%% which, if evaluated, will yield a new syntax tree representing the
-%% same source code text as <code>Tree</code> (although the actual
-%% data representation may be different). The expression represented
-%% by <code>MetaTree</code> is <em>implementation independent</em>
-%% with regard to the data structures used by the abstract syntax tree
-%% implementation.
-%%
-%% <p>Any node in <code>Tree</code> whose node type is
-%% <code>var</code> (cf. <code>type/1</code>), and whose list of
-%% annotations (cf. <code>get_ann/1</code>) contains the atom
-%% <code>meta_var</code>, will remain unchanged in the resulting tree,
-%% except that exactly one occurrence of <code>meta_var</code> is
-%% removed from its annotation list.</p>
-%%
-%% <p>The main use of the function <code>meta/1</code> is to transform
-%% a data structure <code>Tree</code>, which represents a piece of
-%% program code, into a form that is <em>representation independent
-%% when printed</em>. E.g., suppose <code>Tree</code> represents a
-%% variable named "V". Then (assuming a function <code>print/1</code>
-%% for printing syntax trees), evaluating
-%% <code>print(abstract(Tree))</code> - simply using
-%% <code>abstract/1</code> to map the actual data structure onto a
-%% syntax tree representation - would output a string that might look
-%% something like "<code>{var, ..., 'V'}</code>", which is obviously
-%% dependent on the implementation of the abstract syntax trees. This
-%% could e.g. be useful for caching a syntax tree in a file. However,
-%% in some situations like in a program generator generator (with two
-%% "generator"), it may be unacceptable.  Using
-%% <code>print(meta(Tree))</code> instead would output a
-%% <em>representation independent</em> syntax tree generating
-%% expression; in the above case, something like
-%% "<code>cerl:c_var('V')</code>".</p>
-%%
-%% <p>The implementation tries to generate compact code with respect
-%% to literals and lists.</p>
-%%
-%% @see abstract/1
-%% @see type/1
-%% @see get_ann/1
-
-meta(Node) ->
-    %% First of all we check for metavariables:
-    case type(Node) of
-	var ->
-	    case lists:member(meta_var, get_ann(Node)) of
-		false ->
-		    meta_0(var, Node);
-		true ->
-		    %% A meta-variable: remove the first found
-		    %% 'meta_var' annotation, but otherwise leave
-		    %% the node unchanged.
-		    set_ann(Node, lists:delete(meta_var, get_ann(Node)))
-	    end;
-	Type ->
-	    meta_0(Type, Node)
-    end.
-
-meta_0(Type, Node) ->
-    case get_ann(Node) of
-	[] ->
-	    meta_1(Type, Node);
-	As ->
-	    meta_call(set_ann, [meta_1(Type, Node), abstract(As)])
-    end.
-
-meta_1(literal, Node) ->
-    %% We handle atomic literals separately, to get a bit
-    %% more compact code. For the rest, we use 'abstract'.
-    case concrete(Node) of
-	V when atom(V) ->
-	    meta_call(c_atom, [Node]);
-	V when integer(V) ->
-	    meta_call(c_int, [Node]);
-	V when float(V) ->
-	    meta_call(c_float, [Node]);
-	[] ->
-	    meta_call(c_nil, []);
-	_ ->
-	    meta_call(abstract, [Node])
-    end;
-meta_1(var, Node) ->
-    %% A normal variable or function name.
-    meta_call(c_var, [abstract(var_name(Node))]);
-meta_1(values, Node) ->
-    meta_call(c_values,
-	      [make_list(meta_list(values_es(Node)))]);
-meta_1(binary, Node) ->
-    meta_call(c_binary,
-	      [make_list(meta_list(binary_segments(Node)))]);
-meta_1(bitstr, Node) ->
-    meta_call(c_bitstr,
-	      [meta(bitstr_val(Node)),
-	       meta(bitstr_size(Node)),
-	       meta(bitstr_unit(Node)),
-	       meta(bitstr_type(Node)),
-	       meta(bitstr_flags(Node))]);
-meta_1(cons, Node) ->
-    %% The list is split up if some sublist has annotatations. If
-    %% we get exactly one element, we generate a 'c_cons' call
-    %% instead of 'make_list' to reconstruct the node.
-    case split_list(Node) of
-	{[H], none} ->
-	    meta_call(c_cons, [meta(H), meta(c_nil())]);
-	{[H], Node1} ->
-	    meta_call(c_cons, [meta(H), meta(Node1)]);
-	{L, none} ->
-	    meta_call(make_list, [make_list(meta_list(L))]);
-	{L, Node1} ->
-	    meta_call(make_list,
-		      [make_list(meta_list(L)), meta(Node1)])
-    end;
-meta_1(tuple, Node) ->
-    meta_call(c_tuple,
-	      [make_list(meta_list(tuple_es(Node)))]);
-meta_1('let', Node) ->
-    meta_call(c_let,
-	      [make_list(meta_list(let_vars(Node))),
-	       meta(let_arg(Node)), meta(let_body(Node))]);
-meta_1(seq, Node) ->
-    meta_call(c_seq,
-	      [meta(seq_arg(Node)), meta(seq_body(Node))]);
-meta_1(apply, Node) ->
-    meta_call(c_apply,
-	      [meta(apply_op(Node)),
-	       make_list(meta_list(apply_args(Node)))]);
-meta_1(call, Node) ->
-    meta_call(c_call,
-	      [meta(call_module(Node)), meta(call_name(Node)),
-	       make_list(meta_list(call_args(Node)))]);
-meta_1(primop, Node) ->
-    meta_call(c_primop,
-	      [meta(primop_name(Node)),
-	       make_list(meta_list(primop_args(Node)))]);
-meta_1('case', Node) ->
-    meta_call(c_case,
-	      [meta(case_arg(Node)),
-	       make_list(meta_list(case_clauses(Node)))]);
-meta_1(clause, Node) ->
-    meta_call(c_clause,
-	      [make_list(meta_list(clause_pats(Node))),
-	       meta(clause_guard(Node)),
-	       meta(clause_body(Node))]);
-meta_1(alias, Node) ->
-    meta_call(c_alias,
-	      [meta(alias_var(Node)), meta(alias_pat(Node))]);
-meta_1('fun', Node) ->
-    meta_call(c_fun,
-	      [make_list(meta_list(fun_vars(Node))),
-	       meta(fun_body(Node))]);
-meta_1('receive', Node) ->
-    meta_call(c_receive,
-	      [make_list(meta_list(receive_clauses(Node))),
-	       meta(receive_timeout(Node)),
-	       meta(receive_action(Node))]);
-meta_1('try', Node) ->
-    meta_call(c_try,
-	      [meta(try_arg(Node)),
-	       make_list(meta_list(try_vars(Node))),
-	       meta(try_body(Node)),
-	       make_list(meta_list(try_evars(Node))),
-	       meta(try_handler(Node))]);
-meta_1('catch', Node) ->
-    meta_call(c_catch, [meta(catch_body(Node))]);
-meta_1(letrec, Node) ->
-    meta_call(c_letrec,
-	      [make_list([c_tuple([meta(N), meta(F)])
-			  || {N, F} <- letrec_defs(Node)]),
-	       meta(letrec_body(Node))]);
-meta_1(module, Node) ->
-    meta_call(c_module,
-	      [meta(module_name(Node)),
-	       make_list(meta_list(module_exports(Node))),
-	       make_list([c_tuple([meta(A), meta(V)])
-			  || {A, V} <- module_attrs(Node)]),
-	       make_list([c_tuple([meta(N), meta(F)])
-			  || {N, F} <- module_defs(Node)])]).
-
-meta_call(F, As) ->
-    c_call(c_atom(?MODULE), c_atom(F), As).
-
-meta_list([T | Ts]) ->
-    [meta(T) | meta_list(Ts)];
-meta_list([]) ->
-    [].
-
-split_list(Node) ->
-    split_list(set_ann(Node, []), []).
-
-split_list(Node, L) ->
-    A = get_ann(Node),
-    case type(Node) of
-	cons when A == [] ->
-	    split_list(cons_tl(Node), [cons_hd(Node) | L]);
-	nil when A == [] ->
-	    {lists:reverse(L), none};
-	_ ->
-	    {lists:reverse(L), Node}
-    end.
-
-
-%% ---------------------------------------------------------------------
-
-%% General utilities
-
-is_lit_list([#literal{} | Es]) ->
-    is_lit_list(Es);
-is_lit_list([_ | _]) ->
-    false;
-is_lit_list([]) ->
-    true.
-
-lit_list_vals([#literal{val = V} | Es]) ->
-    [V | lit_list_vals(Es)];
-lit_list_vals([]) ->
-    [].
-
-make_lit_list([V | Vs]) ->
-    [#literal{val = V} | make_lit_list(Vs)];
-make_lit_list([]) ->
-    [].
-
-%% The following tests are the same as done by 'io_lib:char_list' and
-%% 'io_lib:printable_list', respectively, but for a single character.
-
-is_char_value(V) when V >= $\000, V =< $\377 -> true;
-is_char_value(_) -> false.
-
-is_print_char_value(V) when V >= $\040, V =< $\176 -> true;
-is_print_char_value(V) when V >= $\240, V =< $\377 -> true;
-is_print_char_value(V) when V =:= $\b -> true;
-is_print_char_value(V) when V =:= $\d -> true;
-is_print_char_value(V) when V =:= $\e -> true;
-is_print_char_value(V) when V =:= $\f -> true;
-is_print_char_value(V) when V =:= $\n -> true;
-is_print_char_value(V) when V =:= $\r -> true;
-is_print_char_value(V) when V =:= $\s -> true;
-is_print_char_value(V) when V =:= $\t -> true;
-is_print_char_value(V) when V =:= $\v -> true;
-is_print_char_value(V) when V =:= $\" -> true;
-is_print_char_value(V) when V =:= $\' -> true;
-is_print_char_value(V) when V =:= $\\ -> true;
-is_print_char_value(_) -> false.
-
-is_char_list([V | Vs]) when integer(V) ->
-    case is_char_value(V) of
-	true ->
-	    is_char_list(Vs);
-	false ->
-	    false
-    end;
-is_char_list([]) ->
-    true;
-is_char_list(_) ->
-    false.
-
-is_print_char_list([V | Vs]) when integer(V) ->
-    case is_print_char_value(V) of
-	true ->
-	    is_print_char_list(Vs);
-	false ->
-	    false
-    end;
-is_print_char_list([]) ->
-    true;
-is_print_char_list(_) ->
-    false.
-
-unfold_tuples([{X, Y} | Ps]) ->
-    [X, Y | unfold_tuples(Ps)];
-unfold_tuples([]) ->
-    [].
-
-fold_tuples([X, Y | Es]) ->
-    [{X, Y} | fold_tuples(Es)];
-fold_tuples([]) ->
-    [].
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl_clauses.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl_clauses.erl
deleted file mode 100644
index f207178f13..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl_clauses.erl
+++ /dev/null
@@ -1,409 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Richard Carlsson.
-%% Copyright (C) 1999-2002 Richard Carlsson.
-%% Portions created by Ericsson are Copyright 2001, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: cerl_clauses.erl,v 1.2 2009/09/17 09:46:19 kostis Exp $
-
-%% @doc Utility functions for Core Erlang case/receive clauses.
-%%
-%% <p>Syntax trees are defined in the module <a
-%% href=""><code>cerl</code></a>.</p>
-%%
-%% @type cerl() = cerl:cerl()
-
--module(cerl_clauses).
-
--export([any_catchall/1, eval_guard/1, is_catchall/1, match/2,
-	 match_list/2, reduce/1, reduce/2]).
-
--import(cerl, [alias_pat/1, alias_var/1, data_arity/1, data_es/1,
-	       data_type/1, clause_guard/1, clause_pats/1, concrete/1,
-	       is_data/1, is_c_var/1, let_body/1, letrec_body/1,
-	       seq_body/1, try_arg/1, type/1, values_es/1]).
-
--import(lists, [reverse/1]).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec is_catchall(Clause::cerl()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if an abstract clause is a
-%% catch-all, otherwise <code>false</code>. A clause is a catch-all if
-%% all its patterns are variables, and its guard expression always
-%% evaluates to <code>true</code>; cf. <code>eval_guard/1</code>.
-%%
-%% <p>Note: <code>Clause</code> must have type
-%% <code>clause</code>.</p>
-%%
-%% @see eval_guard/1
-%% @see any_catchall/1
-
-is_catchall(C) ->
-    case all_vars(clause_pats(C)) of
-	true ->
-	    case eval_guard(clause_guard(C)) of
-		{value, true} ->
-		    true;
-		_ ->
-		    false
-	    end;
-	false ->
-	    false
-    end.
-
-all_vars([C | Cs]) ->
-    case is_c_var(C) of
-	true ->
-	    all_vars(Cs);
-	false ->
-	    false
-    end;
-all_vars([]) ->
-    true.
-
-
-%% @spec any_catchall(Clauses::[cerl()]) -> boolean()
-%%
-%% @doc Returns <code>true</code> if any of the abstract clauses in
-%% the list is a catch-all, otherwise <code>false</code>.  See
-%% <code>is_catchall/1</code> for details.
-%%
-%% <p>Note: each node in <code>Clauses</code> must have type
-%% <code>clause</code>.</p>
-%%
-%% @see is_catchall/1
-
-any_catchall([C | Cs]) ->
-    case is_catchall(C) of
-	true ->
-	    true;
-	false ->
-	    any_catchall(Cs)
-    end;
-any_catchall([]) ->
-    false.
-
-
-%% @spec eval_guard(Expr::cerl()) -> none | {value, term()}
-%%
-%% @doc Tries to reduce a guard expression to a single constant value,
-%% if possible. The returned value is <code>{value, Term}</code> if the
-%% guard expression <code>Expr</code> always yields the constant value
-%% <code>Term</code>, and is otherwise <code>none</code>.
-%%
-%% <p>Note that although guard expressions should only yield boolean
-%% values, this function does not guarantee that <code>Term</code> is
-%% either <code>true</code> or <code>false</code>. Also note that only
-%% simple constructs like let-expressions are examined recursively;
-%% general constant folding is not performed.</p>
-%%
-%% @see is_catchall/1
-
-%% This function could possibly be improved further, but constant
-%% folding should in general be performed elsewhere.
-
-eval_guard(E) ->
-    case type(E) of
-	literal ->
-	    {value, concrete(E)};
-	values ->
-	    case values_es(E) of
-		[E1] ->
-		    eval_guard(E1);
-		_ ->
-		    none
-	    end;
-	'try' ->
-	    eval_guard(try_arg(E));
-	seq ->
-	    eval_guard(seq_body(E));
-	'let' ->
-	    eval_guard(let_body(E));
-	'letrec' ->
-	    eval_guard(letrec_body(E));
-	_ ->
-	    none
-    end.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec reduce(Clauses) -> {true, {Clauses, Bindings}}
-%%                        | {false, Clauses}
-%%
-%% @equiv reduce(Cs, [])
-
-reduce(Cs) ->
-    reduce(Cs, []).
-
-%% @spec reduce(Clauses::[Clause], Exprs::[Expr]) ->
-%%           {true, {Clause, Bindings}}
-%%         | {false, [Clause]}
-%%
-%%    Clause = cerl()
-%%    Expr = any | cerl()
-%%    Bindings = [{cerl(), cerl()}]
-%%
-%% @doc Selects a single clause, if possible, or otherwise reduces the
-%% list of selectable clauses. The input is a list <code>Clauses</code>
-%% of abstract clauses (i.e., syntax trees of type <code>clause</code>),
-%% and a list of switch expressions <code>Exprs</code>. The function
-%% tries to uniquely select a single clause or discard unselectable
-%% clauses, with respect to the switch expressions. All abstract clauses
-%% in the list must have the same number of patterns. If
-%% <code>Exprs</code> is not the empty list, it must have the same
-%% length as the number of patterns in each clause; see
-%% <code>match_list/2</code> for details.
-%% 
-%% <p>A clause can only be selected if its guard expression always
-%% yields the atom <code>true</code>, and a clause whose guard
-%% expression always yields the atom <code>false</code> can never be
-%% selected. Other guard expressions are considered to have unknown
-%% value; cf. <code>eval_guard/1</code>.</p>
-%%
-%% <p>If a particular clause can be selected, the function returns
-%% <code>{true, {Clause, Bindings}}</code>, where <code>Clause</code> is
-%% the selected clause and <code>Bindings</code> is a list of pairs
-%% <code>{Var, SubExpr}</code> associating the variables occurring in
-%% the patterns of <code>Clause</code> with the corresponding
-%% subexpressions in <code>Exprs</code>. The list of bindings is given
-%% in innermost-first order; see the <code>match/2</code> function for
-%% details.</p>
-%% 
-%% <p>If no clause could be definitely selected, the function returns
-%% <code>{false, NewClauses}</code>, where <code>NewClauses</code> is
-%% the list of entries in <code>Clauses</code> that remain after
-%% eliminating unselectable clauses, preserving the relative order.</p>
-%%
-%% @see eval_guard/1
-%% @see match/2
-%% @see match_list/2
-
-reduce(Cs, Es) ->
-    reduce(Cs, Es, []).
-
-reduce([C | Cs], Es, Cs1) ->
-    Ps = clause_pats(C),
-    case match_list(Ps, Es) of
-	none ->
-	    %% Here, we know that the current clause cannot possibly be
-	    %% selected, so we drop it and visit the rest.
-	    reduce(Cs, Es, Cs1);
-	{false, _} ->
-	    %% We are not sure if this clause might be selected, so we
-	    %% save it and visit the rest.
-	    reduce(Cs, Es, [C | Cs1]);
-	{true, Bs} ->
-	    case eval_guard(clause_guard(C)) of
-		{value, true} when Cs1 == [] ->
-		    %% We have a definite match - we return the residual
-		    %% expression and signal that a selection has been
-		    %% made. All other clauses are dropped.
-		    {true, {C, Bs}};
-		{value, true} ->
-		    %% Unless one of the previous clauses is selected,
-		    %% this clause will definitely be, so we can drop
-		    %% the rest.
-		    {false, reverse([C | Cs1])};
-		{value, false} ->
-		    %% This clause can never be selected, since its
-		    %% guard is never 'true', so we drop it.
-		    reduce(Cs, Es, Cs1);
-		_ ->
-		    %% We are not sure if this clause might be selected
-		    %% (or might even cause a crash), so we save it and
-		    %% visit the rest.
-		    reduce(Cs, Es, [C | Cs1])
-	    end
-    end;
-reduce([], _, Cs) ->
-    %% All clauses visited, without a complete match. Signal "not
-    %% reduced" and return the saved clauses, in the correct order.
-    {false, reverse(Cs)}.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec match(Pattern::cerl(), Expr) ->
-%%           none | {true, Bindings} | {false, Bindings}
-%%
-%%     Expr = any | cerl()
-%%     Bindings = [{cerl(), Expr}]
-%%
-%% @doc Matches a pattern against an expression. The returned value is
-%% <code>none</code> if a match is impossible, <code>{true,
-%% Bindings}</code> if <code>Pattern</code> definitely matches
-%% <code>Expr</code>, and <code>{false, Bindings}</code> if a match is
-%% not definite, but cannot be excluded. <code>Bindings</code> is then
-%% a list of pairs <code>{Var, SubExpr}</code>, associating each
-%% variable in the pattern with either the corresponding subexpression
-%% of <code>Expr</code>, or with the atom <code>any</code> if no
-%% matching subexpression exists. (Recall that variables may not be
-%% repeated in a Core Erlang pattern.) The list of bindings is given
-%% in innermost-first order; this should only be of interest if
-%% <code>Pattern</code> contains one or more alias patterns. If the
-%% returned value is <code>{true, []}</code>, it implies that the
-%% pattern and the expression are syntactically identical.
-%%
-%% <p>Instead of a syntax tree, the atom <code>any</code> can be
-%% passed for <code>Expr</code> (or, more generally, be used for any
-%% subtree of <code>Expr</code>, in as much the abstract syntax tree
-%% implementation allows it); this means that it cannot be decided
-%% whether the pattern will match or not, and the corresponding
-%% variable bindings will all map to <code>any</code>. The typical use
-%% is for producing bindings for <code>receive</code> clauses.</p>
-%%
-%% <p>Note: Binary-syntax patterns are never structurally matched
-%% against binary-syntax expressions by this function.</p>
-%%
-%% <p>Examples:
-%% <ul>
-%%   <li>Matching a pattern "<code>{X, Y}</code>" against the
-%%   expression "<code>{foo, f(Z)}</code>" yields <code>{true,
-%%   Bindings}</code> where <code>Bindings</code> associates
-%%   "<code>X</code>" with the subtree "<code>foo</code>" and
-%%   "<code>Y</code>" with the subtree "<code>f(Z)</code>".</li>
-%%
-%%   <li>Matching pattern "<code>{X, {bar, Y}}</code>" against
-%%   expression "<code>{foo, f(Z)}</code>" yields <code>{false,
-%%   Bindings}</code> where <code>Bindings</code> associates
-%%   "<code>X</code>" with the subtree "<code>foo</code>" and
-%%   "<code>Y</code>" with <code>any</code> (because it is not known
-%%   if "<code>{foo, Y}</code>" might match the run-time value of
-%%   "<code>f(Z)</code>" or not).</li>
-%%
-%%   <li>Matching pattern "<code>{foo, bar}</code>" against expression
-%%   "<code>{foo, f()}</code>" yields <code>{false, []}</code>,
-%%   telling us that there might be a match, but we cannot deduce any
-%%   bindings.</li>
-%%
-%%   <li>Matching <code>{foo, X = {bar, Y}}</code> against expression
-%%   "<code>{foo, {bar, baz}}</code>" yields <code>{true,
-%%   Bindings}</code> where <code>Bindings</code> associates
-%%   "<code>Y</code>" with "<code>baz</code>", and "<code>X</code>"
-%%   with "<code>{bar, baz}</code>".</li>
-%%
-%%   <li>Matching a pattern "<code>{X, Y}</code>" against
-%%   <code>any</code> yields <code>{false, Bindings}</code> where
-%%   <code>Bindings</code> associates both "<code>X</code>" and
-%%   "<code>Y</code>" with <code>any</code>.</li>
-%% </ul></p>
-
-match(P, E) ->
-    match(P, E, []).
-
-match(P, E, Bs) ->
-    case type(P) of
-	var ->
-	    %% Variables always match, since they cannot have repeated
-	    %% occurrences in a pattern.
-	    {true, [{P, E} | Bs]};
-	alias ->
-	    %% All variables in P1 will be listed before the alias
-	    %% variable in the result.
-	    match(alias_pat(P), E, [{alias_var(P), E} | Bs]);
-	binary ->
-	    %% The most we can do is to say "definitely no match" if a
-	    %% binary pattern is matched against non-binary data.
-	    if E == any ->
-		    {false, Bs};
-	       true ->
-		    case is_data(E) of
-			true ->
-			    none;
-			false ->
-			    {false, Bs}
-		    end
-	    end;
-	_ ->
-	    match_1(P, E, Bs)
-    end.
-
-match_1(P, E, Bs) ->
-    case is_data(P) of
-	true when E == any ->
-	    %% If we don't know the structure of the value of E at this
-	    %% point, we just match the subpatterns against 'any', and
-	    %% make sure the result is a "maybe".
-	    Ps = data_es(P),
-	    Es = lists:duplicate(length(Ps), any),
-	    case match_list(Ps, Es, Bs) of
-		{_, Bs1} ->
-		    {false, Bs1};
-		none ->
-		    none
-	    end;
-	true ->
-	    %% Test if the expression represents a constructor
-	    case is_data(E) of
-		true ->
-		    T1 = {data_type(E), data_arity(E)},
-		    T2 = {data_type(P), data_arity(P)},
-		    %% Note that we must test for exact equality.
-		    if T1 =:= T2 ->
-			    match_list(data_es(P), data_es(E), Bs);
-		       true ->
-			    none
-		    end;
-		false ->
-		    %% We don't know the run-time structure of E, and P
-		    %% is not a variable or an alias pattern, so we
-		    %% match against 'any' instead.
-		    match_1(P, any, Bs)
-	    end;
-	false ->
-	    %% Strange pattern - give up, but don't say "no match".
-	    {false, Bs}
-    end.
-
-
-%% @spec match_list(Patterns::[cerl()], Exprs::[Expr]) ->
-%%           none | {true, Bindings} | {false, Bindings}
-%%
-%%     Expr = any | cerl()
-%%     Bindings = [{cerl(), cerl()}]
-%%
-%% @doc Like <code>match/2</code>, but matching a sequence of patterns
-%% against a sequence of expressions. Passing an empty list for
-%% <code>Exprs</code> is equivalent to passing a list of
-%% <code>any</code> atoms of the same length as <code>Patterns</code>.
-%%
-%% @see match/2
-
-match_list([], []) ->
-    {true, []};    % no patterns always match
-match_list(Ps, []) ->
-    match_list(Ps, lists:duplicate(length(Ps), any), []);
-match_list(Ps, Es) ->
-    match_list(Ps, Es, []).
-
-match_list([P | Ps], [E | Es], Bs) ->
-    case match(P, E, Bs) of
-	{true, Bs1} ->
-	    match_list(Ps, Es, Bs1);
-	{false, Bs1} ->
-	    %% Make sure "maybe" is preserved
-	    case match_list(Ps, Es, Bs1) of
-		{_, Bs2} ->
-		    {false, Bs2};
-		none ->
-		    none
-	    end;
-	none ->
-	    none
-    end;
-match_list([], [], Bs) ->
-    {true, Bs}.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl_inline.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl_inline.erl
deleted file mode 100644
index e040904a19..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl_inline.erl
+++ /dev/null
@@ -1,2762 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Richard Carlsson.
-%% Copyright (C) 1999-2002 Richard Carlsson.
-%% Portions created by Ericsson are Copyright 2001, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: cerl_inline.erl,v 1.1 2008/12/17 09:53:41 mikpe Exp $
-%%
-%% Core Erlang inliner.
-
-%% =====================================================================
-%%
-%% This is an implementation of the algorithm by Waddell and Dybvig
-%% ("Fast and Effective Procedure Inlining", International Static
-%% Analysis Symposium 1997), adapted to the Core Erlang language.
-%%
-%% Instead of always renaming variables and function variables, this
-%% implementation uses the "no-shadowing strategy" of Peyton Jones and
-%% Marlow ("Secrets of the Glasgow Haskell Compiler Inliner", 1999).
-%%
-%% =====================================================================
-
-%% TODO: inline single-source-reference operands without size limit.
-
--module(cerl_inline).
-
--export([core_transform/2, transform/1, transform/2]).
-
--import(cerl, [abstract/1, alias_pat/1, alias_var/1, apply_args/1,
-	       apply_op/1, atom_name/1, atom_val/1, bitstr_val/1,
-	       bitstr_size/1, bitstr_unit/1, bitstr_type/1,
-	       bitstr_flags/1, binary_segments/1, update_c_alias/3,
-	       update_c_apply/3, update_c_binary/2, update_c_bitstr/6,
-	       update_c_call/4, update_c_case/3, update_c_catch/2,
-	       update_c_clause/4, c_fun/2, c_int/1, c_let/3,
-	       update_c_let/4, update_c_letrec/3, update_c_module/5,
-	       update_c_primop/3, update_c_receive/4, update_c_seq/3,
-	       c_seq/2, update_c_try/6, c_tuple/1, update_c_values/2,
-	       c_values/1, c_var/1, call_args/1, call_module/1,
-	       call_name/1, case_arity/1, case_arg/1, case_clauses/1,
-	       catch_body/1, clause_body/1, clause_guard/1,
-	       clause_pats/1, clause_vars/1, concrete/1, cons_hd/1,
-	       cons_tl/1, data_arity/1, data_es/1, data_type/1,
-	       fun_body/1, fun_vars/1, get_ann/1, int_val/1,
-	       is_c_atom/1, is_c_cons/1, is_c_fun/1, is_c_int/1,
-	       is_c_list/1, is_c_seq/1, is_c_tuple/1, is_c_var/1,
-	       is_data/1, is_literal/1, is_literal_term/1, let_arg/1,
-	       let_body/1, let_vars/1, letrec_body/1, letrec_defs/1,
-	       list_length/1, list_elements/1, update_data/3,
-	       make_list/1, make_data_skel/2, module_attrs/1,
-	       module_defs/1, module_exports/1, module_name/1,
-	       primop_args/1, primop_name/1, receive_action/1,
-	       receive_clauses/1, receive_timeout/1, seq_arg/1,
-	       seq_body/1, set_ann/2, try_arg/1, try_body/1, try_vars/1,
-	       try_evars/1, try_handler/1, tuple_es/1, tuple_arity/1,
-	       type/1, values_es/1, var_name/1]).
-
--import(lists, [foldl/3, foldr/3, mapfoldl/3, reverse/1]).
-
-%%
-%% Constants
-%%
-
-debug_runtime() -> false.
-debug_counters() -> false.
-
-%% Normal execution times for inlining are between 0.1 and 0.3 seconds
-%% (on the author's current equipment). The default effort limit of 150
-%% is high enough that most normal programs never hit the limit even
-%% once, and for difficult programs, it generally keeps the execution
-%% times below 2-5 seconds. Using an effort counter of 1000 will thus
-%% have no further effect on most programs, but some programs may take
-%% as much as 10 seconds or more. Effort counts larger than 2500 have
-%% never been observed even on very ill-conditioned programs.
-%%
-%% Size limits between 6 and 18 tend to actually shrink the code,
-%% because of the simplifications made possible by inlining. A limit of
-%% 16 seems to be optimal for this purpose, often shrinking the
-%% executable code by up to 10%. Size limits between 18 and 30 generally
-%% give the same code size as if no inlining was done (i.e., code
-%% duplication balances out the simplifications at these levels). A size
-%% limit between 1 and 5 tends to inline small functions and propagate
-%% constants, but does not cause much simplifications do be done, so the
-%% net effect will be a slight increase in code size. For size limits
-%% above 30, the executable code size tends to increase with about 10%
-%% per 100 units, with some variations depending on the sizes of
-%% functions in the source code.
-%%
-%% Typically, about 90% of the maximum speedup achievable is already
-%% reached using a size limit of 30, and 98% is reached at limits around
-%% 100-150; there is rarely any point in letting the code size increase
-%% by more than 10-15%. If too large functions are inlined, cache
-%% effects will slow the program down.
-
-default_effort() -> 150.
-default_size() -> 24.
-
-%% Base costs/weights for different kinds of expressions. If these are
-%% modified, the size limits above may have to be adjusted.
-
-weight(var) -> 0;	% We count no cost for variable accesses.
-weight(values) -> 0;	% Value aggregates have no cost in themselves.
-weight(literal) -> 1;	% We assume efficient handling of constants.
-weight(data) -> 1;	% Base cost; add 1 per element.
-weight(element) -> 1;   % Cost of storing/fetching an element.
-weight(argument) -> 1;  % Cost of passing a function argument.
-weight('fun') -> 6;	% Base cost + average number of free vars.
-weight('let') -> 0;	% Count no cost for let-bindings.
-weight(letrec) -> 0;    % Like a let-binding.
-weight('case') -> 0;	% Case switches have no base cost.
-weight(clause) -> 1;    % Count one jump at the end of each clause body.
-weight('receive') -> 9;	% Initialization/cleanup cost.
-weight('try') -> 1;	% Assume efficient implementation.
-weight('catch') -> 1;	% See `try'.
-weight(apply) -> 3;     % Average base cost: call/return.
-weight(call) -> 3;      % Assume remote-calls as efficient as `apply'.
-weight(primop) -> 2;    % Assume more efficient than `apply'.
-weight(binary) -> 4;    % Initialisation base cost.
-weight(bitstr) -> 3;   % Coding/decoding a value; like a primop.
-weight(module) -> 1.    % Like a letrec with a constant body
-
-%% These "reference" structures are used for variables and function
-%% variables. They keep track of the variable name, any bound operand,
-%% and the associated store location.
-
--record(ref, {name, opnd, loc}).
-
-%% Operand structures contain the operand expression, the renaming and
-%% environment, the state location, and the effort counter at the call
-%% site (cf. `visit').
-
--record(opnd, {expr, ren, env, loc, effort}).
-
-%% Since expressions are only visited in `effect' context when they are
-%% not bound to a referenced variable, only expressions visited in
-%% 'value' context are cached.
-
--record(cache, {expr, size}).
-
-%% The context flags for an application structure are kept separate from
-%% the structure itself. Note that the original algorithm had exactly
-%% one operand in each application context structure, while we can have
-%% several, or none.
-
--record(app, {opnds, ctxt, loc}).
-
-
-%%
-%% Interface functions
-%%
-
-%% Use compile option `{core_transform, inline}' to insert this as a
-%% compilation pass.
-
-core_transform(Code, Opts) ->
-    cerl:to_records(transform(cerl:from_records(Code), Opts)).
-
-transform(Tree) ->
-    transform(Tree, []).
-
-transform(Tree, Opts) ->
-    main(Tree, value, Opts).
-
-main(Tree, Ctxt, Opts) ->
-    %% We spawn a new process to do the work, so we don't have to worry
-    %% about cluttering the process dictionary with debugging info, or
-    %% proper deallocation of ets-tables.
-    Opts1 = Opts ++ [{inline_size, default_size()},
-		     {inline_effort, default_effort()}],
-    Reply = self(),
-    Pid = spawn_link(fun () -> start(Reply, Tree, Ctxt, Opts1) end),
-    receive
-        {Pid1, Tree1} when Pid1 == Pid ->
-            Tree1
-    end.
-
-start(Reply, Tree, Ctxt, Opts) ->
-    init_debug(),
-    case debug_runtime() of
-        true ->
-            put(inline_start_time,
-                element(1, erlang:statistics(runtime)));
-        _ ->
-            ok
-    end,
-    Size = max(1, proplists:get_value(inline_size, Opts)),
-    Effort = max(1, proplists:get_value(inline_effort, Opts)),
-    case proplists:get_bool(verbose, Opts) of
-	true ->
-	    io:fwrite("Inlining: inline_size=~w inline_effort=~w\n",
-		      [Size, Effort]);
-	false ->
-	    ok
-    end,
-
-    %% Note that the counters of the new state are passive.
-    S = st__new(Effort, Size),
-
-%%% Initialization is not needed at present. Note that the code in
-%%% `inline_init' is not up-to-date with this module.
-%%%     {Tree1, S1} = inline_init:init(Tree, S),
-%%%     {Tree2, _S2} = i(Tree1, Ctxt, S1),
-    {Tree2, _S2} = i(Tree, Ctxt, S),
-    report_debug(),
-    Reply ! {self(), Tree2}.
-
-init_debug() ->
-    case debug_counters() of
-        true ->
-            put(counter_effort_triggers, 0),
-            put(counter_effort_max, 0),
-            put(counter_size_triggers, 0),
-            put(counter_size_max, 0);
-        _ ->
-            ok
-    end.
-
-report_debug() ->
-    case debug_runtime() of
-        true ->
-            {Time, _} = erlang:statistics(runtime),
-            report("Total run time for inlining: ~.2.0f s.\n",
-		   [(Time - get(inline_start_time))/1000]);
-        _ ->
-            ok
-    end,
-    case debug_counters() of
-        true ->
-            counter_stats();
-        _ ->
-            ok
-    end.
-
-counter_stats() ->
-    T1 = get(counter_effort_triggers),
-    T2 = get(counter_size_triggers),
-    E = get(counter_effort_max),
-    S = get(counter_size_max),
-    M1 = io_lib:fwrite("\tNumber of triggered "
-                       "effort counters: ~p.\n", [T1]),
-    M2 = io_lib:fwrite("\tNumber of triggered "
-                       "size counters: ~p.\n", [T2]),
-    M3 = io_lib:fwrite("\tLargest active effort counter: ~p.\n",
-                       [E]),
-    M4 = io_lib:fwrite("\tLargest active size counter: ~p.\n",
-                       [S]),
-    report("Counter statistics:\n~s", [[M1, M2, M3, M4]]).
-
-
-%% =====================================================================
-%% The main inlining function
-%%
-%% i(E :: coreErlang(),
-%%   Ctxt :: value | effect | #app{}
-%%   Ren :: renaming(),
-%%   Env :: environment(),
-%%   S :: state())
-%%   -> {E', S'}
-%%
-%% Note: It is expected that the input source code ('E') does not
-%% contain free variables. If it does, there is a risk of accidental
-%% name capture, in case a generated "new" variable name happens to be
-%% the same as the name of a variable that is free further below in the
-%% tree; the algorithm only consults the current environment to check if
-%% a name already exists.
-%%
-%% The renaming maps names of source-code variable and function
-%% variables to new names as necessary to avoid clashes, according to
-%% the "no-shadowing" strategy. The environment maps *residual-code*
-%% variables and function variables to operands and global information.
-%% Separating the renaming from the environment, and using the
-%% residual-code variables instead of the source-code variables as its
-%% domain, improves the behaviour of the algorithm when code needs to be
-%% traversed more than once.
-%%
-%% Note that there is no such thing as a `test' context for expressions
-%% in (Core) Erlang (see `i_case' below for details).
-
-i(E, Ctxt, S) ->
-    i(E, Ctxt, ren__identity(), env__empty(), S).
-
-i(E, Ctxt, Ren, Env, S0) ->
-    %% Count one unit of effort on each pass.
-    S = count_effort(1, S0),
-    case is_data(E) of
-        true ->
-            i_data(E, Ctxt, Ren, Env, S);
-        false ->
-            case type(E) of
-                var ->
-                    i_var(E, Ctxt, Ren, Env, S);
-                values ->
-                    i_values(E, Ctxt, Ren, Env, S);
-                'fun' ->
-                    i_fun(E, Ctxt, Ren, Env, S);
-                seq ->
-                    i_seq(E, Ctxt, Ren, Env, S);
-                'let' ->
-                    i_let(E, Ctxt, Ren, Env, S);
-                letrec ->
-                    i_letrec(E, Ctxt, Ren, Env, S);
-                'case' ->
-                    i_case(E, Ctxt, Ren, Env, S);
-                'receive' ->
-                    i_receive(E, Ctxt, Ren, Env, S);
-                apply ->
-                    i_apply(E, Ctxt, Ren, Env, S);
-                call ->
-                    i_call(E, Ctxt, Ren, Env, S);
-                primop ->
-                    i_primop(E, Ren, Env, S);
-                'try' ->
-                    i_try(E, Ctxt, Ren, Env, S);
-                'catch' ->
-                    i_catch(E, Ctxt, Ren, Env, S);
-		binary ->
-		    i_binary(E, Ren, Env, S);
-                module ->
-                    i_module(E, Ctxt, Ren, Env, S)
-            end
-    end.
-
-i_data(E, Ctxt, Ren, Env, S) ->
-    case is_literal(E) of
-        true ->
-            %% This is the `(const c)' case of the original algorithm:
-            %% literal terms which (regardless of size) do not need to
-            %% be constructed dynamically at runtime - boldly assuming
-            %% that the compiler/runtime system can handle this.
-            case Ctxt of
-                effect ->
-                    %% Reduce useless constants to a simple value.
-                    {void(), count_size(weight(literal), S)};
-                _ ->
-                    %% (In Erlang, we cannot set all non-`false'
-                    %% constants to `true' in a `test' context, like we
-                    %% could do in Lisp or C, so the above is the only
-                    %% special case to be handled here.)
-                    {E, count_size(weight(literal), S)}
-            end;
-        false ->
-            %% Data constructors are like to calls to safe built-in
-            %% functions, for which we can "decide to inline"
-            %% immediately; there is no need to create operand
-            %% structures. In `effect' context, we can simply make a
-            %% sequence of the argument expressions, also visited in
-            %% `effect' context. In all other cases, the arguments are
-            %% visited for value.
-            case Ctxt of
-                effect ->
-                    %% Note that this will count the sizes of the
-                    %% subexpressions, even though some or all of them
-                    %% might be discarded by the sequencing afterwards.
-                    {Es1, S1} = mapfoldl(fun (E, S) ->
-						 i(E, effect, Ren, Env,
-						   S)
-					 end,
-					 S, data_es(E)),
-                    E1 = foldl(fun (E1, E2) -> make_seq(E1, E2) end,
-			       void(), Es1),
-                    {E1, S1};
-                _ ->
-                    {Es1, S1} = mapfoldl(fun (E, S) ->
-						 i(E, value, Ren, Env,
-						   S)
-					 end,
-					 S, data_es(E)),
-                    %% The total size/cost is the base cost for a data
-                    %% constructor plus the cost for storing each
-                    %% element.
-                    N = weight(data) + length(Es1) * weight(element),
-                    S2 = count_size(N, S1),
-                    {update_data(E, data_type(E), Es1), S2}
-            end
-    end.
-
-%% This is the `(ref x)' (variable use) case of the original algorithm.
-%% Note that binding occurrences are always handled in the respective
-%% cases of the binding constructs.
-
-i_var(E, Ctxt, Ren, Env, S) ->
-    case Ctxt of
-        effect ->
-            %% Reduce useless variable references to a simple constant.
-	    %% This also avoids useless visiting of bound operands.
-            {void(), count_size(weight(literal), S)};
-        _ ->
-	    Name = var_name(E),
-            case env__lookup(ren__map(Name, Ren), Env) of
-                {ok, R} ->
-                    case R#ref.opnd of
-                        undefined ->
-                            %% The variable is not associated with an
-                            %% argument expression; just residualize it.
-                            residualize_var(R, S);
-                        Opnd ->
-			    i_var_1(R, Opnd, Ctxt, Env, S)
-                    end;
-                error ->
-                    %% The variable is unbound. (It has not been
-                    %% accidentally captured, however, or it would have
-                    %% been in the environment.) We leave it as it is,
-                    %% without any warning.
-		    {E, count_size(weight(var), S)}
-            end
-    end.
-
-%% This first visits the bound operand and then does copy propagation.
-%% Note that we must first set the "inner-pending" flag, and clear the
-%% flag afterwards.
-
-i_var_1(R, Opnd, Ctxt, Env, S) ->
-    %% If the operand is already "inner-pending", it is residualised.
-    %% (In Lisp/C, if the variable might be assigned to, it should also
-    %% be residualised.)
-    L = Opnd#opnd.loc,
-    case st__test_inner_pending(L, S) of
-	true ->
-	    residualize_var(R, S);
-	false ->
-	    S1 = st__mark_inner_pending(L, S),
-	    case catch {ok, visit(Opnd, S1)} of
-		{ok, {E, S2}} ->
-		    %% Note that we pass the current environment and
-		    %% context to `copy', but not the current renaming.
-		    S3 = st__clear_inner_pending(L, S2),
-		    copy(R, Opnd, E, Ctxt, Env, S3);
-		{'EXIT', X} ->
-		    exit(X);
-		X ->
- 		    %% If we use destructive update for the
- 		    %% `inner-pending' flag, we must make sure to clear
- 		    %% it also if we make a nonlocal return.
-		    st__clear_inner_pending(Opnd#opnd.loc, S1),
-		    throw(X)
-	    end
-    end.
-
-%% A multiple-value aggregate `<e1, ..., en>'. This is very much like a
-%% tuple data constructor `{e1, ..., en}'; cf. `i_data' for details.
-
-i_values(E, Ctxt, Ren, Env, S) ->
-    case values_es(E) of
-	[E1] ->
-	    %% Single-value aggregates can be dropped; they are simply
-	    %% notation.
-	    i(E1, Ctxt, Ren, Env, S);
-	Es ->
-	    %% In `effect' context, we can simply make a sequence of the
-	    %% argument expressions, also visited in `effect' context.
-	    %% In all other cases, the arguments are visited for value.
-	    case Ctxt of
-		effect ->
-		    {Es1, S1} =
-			mapfoldl(fun (E, S) ->
-					 i(E, effect, Ren, Env, S)
-				 end,
-				 S, Es),
-		    E1 = foldl(fun (E1, E2) ->
-				       make_seq(E1, E2)
-			       end,
-			       void(), Es1),
-		    {E1, S1};    % drop annotations on E
-		_ ->
-		    {Es1, S1} = mapfoldl(fun (E, S) ->
-						 i(E, value, Ren, Env,
-						   S)
-					 end,
-					 S, Es),
-		    %% Aggregating values does not write them to memory,
-		    %% so we count no extra cost per element.
-		    S2 = count_size(weight(values), S1),
-		    {update_c_values(E, Es1), S2}
-	    end
-    end.
-
-%% A let-expression `let <v1,...,vn> = e0 in e1' is semantically
-%% equivalent to a case-expression `case e0 of <v1,...,vn> when 'true'
-%% -> e1 end'. As a special case, `let <v> = e0 in e1' is also
-%% equivalent to `apply fun (v) -> e0 (e1)'. However, for efficiency,
-%% and in order to allow the handling of `case' clauses to introduce new
-%% let-expressions without entering an infinite rewrite loop, we handle
-%% these directly.
-
-%%% %% Rewriting a `let' to an equivalent expression.
-%%% i_let(E, Ctxt, Ren, Env, S) ->
-%%%     case let_vars(E) of
-%%% 	[V] ->
-%%%  	    E1 = update_c_apply(E, c_fun([V], let_body(E)), [let_arg(E)]),
-%%%  	    i(E1, Ctxt, Ren, Env, S);
-%%% 	Vs ->
-%%%  	    C = c_clause(Vs, abstract(true), let_body(E)),
-%%%  	    E1 = update_c_case(E, let_arg(E), [C]),
-%%%  	    i(E1, Ctxt, Ren, Env, S)
-%%%     end.
-
-i_let(E, Ctxt, Ren, Env, S) ->
-    case let_vars(E) of
- 	[V] ->
- 	    i_let_1(V, E, Ctxt, Ren, Env, S);
-	Vs ->
-	    %% Visit the argument expression in `value' context, to
-	    %% simplify it as far as possible.
-	    {A, S1} = i(let_arg(E), value, Ren, Env, S),
-	    case get_components(length(Vs), result(A)) of
-		{true, As} ->
-		    %% Note that only the components of the result of
-		    %% `A' are passed on; any effects are hoisted.
-		    {E1, S2} = i_let_2(Vs, As, E, Ctxt, Ren, Env, S1),
-		    {hoist_effects(A, E1), S2};
-		false ->
-		    %% We cannot do anything with this `let', since the
-		    %% variables cannot be matched against the argument
-		    %% components. Just visit the variables for renaming
-		    %% and visit the body for value (cf. `i_fun').
-		    {_, Ren1, Env1, S2} = bind_locals(Vs, Ren, Env, S1),
-		    Vs1 = i_params(Vs, Ren1, Env1),
-		    %% The body is always visited for value here.
-		    {B, S3} = i(let_body(E), value, Ren1, Env1, S2),
-		    S4 = count_size(weight('let'), S3),
-		    {update_c_let(E, Vs1, A, B), S4}
-	    end
-    end.
-
-%% Single-variable `let' binding.
-
-i_let_1(V, E, Ctxt, Ren, Env, S) ->
-    %% Make an operand structure for the argument expression, create a
-    %% local binding from the parameter to the operand structure, and
-    %% visit the body. Finally create necessary bindings and/or set
-    %% flags.
-    {Opnd, S1} = make_opnd(let_arg(E), Ren, Env, S),
-    {[R], Ren1, Env1, S2} = bind_locals([V], [Opnd], Ren, Env, S1),
-    {E1, S3} = i(let_body(E), Ctxt, Ren1, Env1, S2),
-    i_let_3([R], [Opnd], E1, S3).
-
-%% Multi-variable `let' binding.
-
-i_let_2(Vs, As, E, Ctxt, Ren, Env, S) ->
-    %% Make operand structures for the argument components. Note that
-    %% since the argument has already been visited at this point, we use
-    %% the identity renaming for the operands.
-    {Opnds, S1} = mapfoldl(fun (E, S) ->
-                                   make_opnd(E, ren__identity(), Env, S)
-                           end,
-                           S, As),
-    %% Create local bindings from the parameters to their respective
-    %% operand structures, and visit the body.
-    {Rs, Ren1, Env1, S2} = bind_locals(Vs, Opnds, Ren, Env, S1),
-    {E1, S3} = i(let_body(E), Ctxt, Ren1, Env1, S2),
-    i_let_3(Rs, Opnds, E1, S3).
-
-i_let_3(Rs, Opnds, E, S) ->
-    %% Create necessary bindings and/or set flags.
-    {E1, S1} = make_let_bindings(Rs, E, S),
-    
-    %% We must also create evaluation for effect, for any unused
-    %% operands, as after an application expression.
-    residualize_operands(Opnds, E1, S1).
-
-%% A sequence `do e1 e2', written `(seq e1 e2)' in the original
-%% algorithm, where `e1' is evaluated for effect only (since its value
-%% is not used), and `e2' yields the final value. Note that we use
-%% `make_seq' to recompose the sequence after visiting the parts.
-
-i_seq(E, Ctxt, Ren, Env, S) ->
-    {E1, S1} = i(seq_arg(E), effect, Ren, Env, S),
-    {E2, S2} = i(seq_body(E), Ctxt, Ren, Env, S1),
-    %% A sequence has no cost in itself.
-    {make_seq(E1, E2), S2}.
-
-
-%% The `case' switch of Core Erlang is rather different from the boolean
-%% `(if e1 e2 e3)' case of the original algorithm, but the central idea
-%% is the same: if, given the simplified switch expression (which is
-%% visited in `value' context - a boolean `test' context would not be
-%% generally useful), there is a clause which could definitely be
-%% selected, such that no clause before it can possibly be selected,
-%% then we can eliminate all other clauses. (And even if this is not the
-%% case, some clauses can often be eliminated.) Furthermore, if a clause
-%% can be selected, we can replace the case-expression (including the
-%% switch expression) with the body of the clause and a set of zero or
-%% more let-bindings of subexpressions of the switch expression. (In the
-%% simplest case, the switch expression is evaluated only for effect.)
-
-i_case(E, Ctxt, Ren, Env, S) ->
-    %% First visit the switch expression in `value' context, to simplify
-    %% it as far as possible. Note that only the result part is passed
-    %% on to the clause matching below; any effects are hoisted.
-    {A, S1} = i(case_arg(E), value, Ren, Env, S),
-    A1 = result(A),
-
-    %% Propagating an application context into the branches could cause
-    %% the arguments of the application to be evaluated *after* the
-    %% switch expression, but *before* the body of the selected clause.
-    %% Such interleaving is not allowed in general, and it does not seem
-    %% worthwile to make a more powerful transformation here. Therefore,
-    %% the clause bodies are conservatively visited for value if the
-    %% context is `application'.
-    Ctxt1 = safe_context(Ctxt),
-    {E1, S2} = case get_components(case_arity(E), A1) of
-		   {true, As} ->
-		       i_case_1(As, E, Ctxt1, Ren, Env, S1);
-		   false ->
-		       i_case_1([], E, Ctxt1, Ren, Env, S1)
-	       end,
-    {hoist_effects(A, E1), S2}.
-
-i_case_1(As, E, Ctxt, Ren, Env, S) ->
-    case i_clauses(As, case_clauses(E), Ctxt, Ren, Env, S) of
-        {false, {As1, Vs, Env1, Cs}, S1} ->
-            %% We still have a list of clauses. Sanity check:
-            if Cs == [] ->
-                    report_warning("empty list of clauses "
-				   "in residual program!.\n");
-               true ->
-                    ok
-            end,
-	    {A, S2} = i(c_values(As1), value, ren__identity(), Env1,
-			S1),
-	    {E1, S3} = i_case_2(Cs, A, E, S2),
-	    i_case_3(Vs, Env1, E1, S3);
-        {true, {_, Vs, Env1, [C]}, S1} ->
-            %% A single clause was selected; we just take the body.
-	    i_case_3(Vs, Env1, clause_body(C), S1)
-    end.
-
-%% Check if all clause bodies are actually equivalent expressions that
-%% do not depent on pattern variables (this sometimes occurs as a
-%% consequence of inlining, e.g., all branches might yield 'true'), and
-%% if so, replace the `case' with a sequence, first evaluating the
-%% clause selection for effect, then evaluating one of the clause bodies
-%% for its value. (Unless the switch contains a catch-all clause, the
-%% clause selection must be evaluated for effect, since there is no
-%% guarantee that any of the clauses will actually match. Assuming that
-%% some clause always matches could make an undefined program produce a
-%% value.) This makes the final size less than what was accounted for
-%% when visiting the clauses, but currently we don't try to adjust for
-%% this.
-
-i_case_2(Cs, A, E, S) ->
-    case equivalent_clauses(Cs) of
-	false ->
-	    %% Count the base sizes for the remaining clauses; pattern
-	    %% and guard sizes are already counted.
-	    N = weight('case') + weight(clause) * length(Cs),
-	    S1 = count_size(N, S),
-	    {update_c_case(E, A, Cs), S1};
-	true ->
-	    case cerl_clauses:any_catchall(Cs) of
-		true ->
-		    %% We know that some clause must be selected, so we
-		    %% can drop all the testing as well.
-		    E1 = make_seq(A, clause_body(hd(Cs))),
-		    {E1, S};
-		false ->
-		    %% The clause selection must be performed for
-		    %% effect.
-		    E1 = update_c_case(E, A,
-				       set_clause_bodies(Cs, void())),
-		    {make_seq(E1, clause_body(hd(Cs))), S}
-	    end
-    end.
-
-i_case_3(Vs, Env, E, S) ->
-    %% For the variables bound to the switch expression subexpressions,
-    %% make let bindings or create evaluation for effect.
-    Rs = [env__get(var_name(V), Env) || V <- Vs],
-    {E1, S1} = make_let_bindings(Rs, E, S),
-    Opnds = [R#ref.opnd || R <- Rs],
-    residualize_operands(Opnds, E1, S1).
-
-%% This function takes a sequence of switch expressions `Es' (which can
-%% be the empty list if these are unknown) and a list `Cs' of clauses,
-%% and returns `{Match, {As, Vs, Env1, Cs1}, S1}' where `As' is a list
-%% of residual switch expressions, `Vs' the list of variables used in
-%% the templates, `Env1' the environment for the templates, and `Cs1'
-%% the list of residual clauses. `Match' is `true' if some clause could
-%% be shown to definitely match (in this case, `Cs1' contains exactly
-%% one element), and `false' otherwise. `S1' is the new state. The given
-%% `Ctxt' is the context to be used for visiting the body of clauses.
-%%
-%% Visiting a clause basically amounts to extending the environment for
-%% all variables in the pattern, as for a `fun' (cf. `i_fun'),
-%% propagating match information if possible, and visiting the guard and
-%% body in the new environment.
-%%
-%% To make it cheaper to do handle a set of clauses, and to avoid
-%% unnecessarily exceeding the size limit, we avoid visiting the bodies
-%% of clauses which are subsequently removed, by dividing the visiting
-%% of a clause into two stages: first construct the environment(s) and
-%% visit the pattern (for renaming) and the guard (for value), then
-%% reduce the switch as much as possible, and lastly visit the body.
-
-i_clauses(Cs, Ctxt, Ren, Env, S) ->
-    i_clauses([], Cs, Ctxt, Ren, Env, S).
-
-i_clauses(Es, Cs, Ctxt, Ren, Env, S) ->
-    %% Create templates for the switch expressions.
-    {Ts, {Vs, Env0}} = mapfoldl(fun (E, {Vs, Env}) ->
-					{T, Vs1, Env1} =
-					    make_template(E, Env),
-					{T, {Vs1 ++ Vs, Env1}}
-				end,
-				{[], Env}, Es),
-    
-    %% Make operand structures for the switch subexpression templates
-    %% (found in `Env0') and add proper ref-structure bindings to the
-    %% environment. Since the subexpressions in general can be
-    %% interdependent (Vs is in reverse-dependency order), the
-    %% environment (and renaming) must be created incrementally. Note
-    %% that since the switch expressions have been visited already, the
-    %% identity renaming is used for the operands.
-    Vs1 = lists:reverse(Vs),
-    {Ren1, Env1, S1} =
-	foldl(fun (V, {Ren, Env, S}) ->
-		      E = env__get(var_name(V), Env0),
-		      {Opnd, S_1} = make_opnd(E, ren__identity(), Env,
-					      S),
-		      {_, Ren1, Env1, S_2} = bind_locals([V], [Opnd],
-							 Ren, Env, S_1),
-		      {Ren1, Env1, S_2}
-	      end,
-	      {Ren, Env, S}, Vs1),
-    
-    %% First we visit the head of each individual clause, renaming
-    %% pattern variables, inserting let-bindings in the guard and body,
-    %% and visiting the guard. The information used for visiting the
-    %% clause body will be prefixed to the clause annotations.
-    {Cs1, S2} = mapfoldl(fun (C, S) ->
-				 i_clause_head(C, Ts, Ren1, Env1, S)
-			 end,
-			 S1, Cs),
-    
-    %% Now that the clause guards have been reduced as far as possible,
-    %% we can attempt to reduce the clauses.
-    As = [hd(get_ann(T)) || T <- Ts],
-    case cerl_clauses:reduce(Cs1, Ts) of
-        {false, Cs2} ->
-            %% We still have one or more clauses (with associated
-            %% extended environments). Their bodies have not yet been
-            %% visited, so we do that (in the respective safe
-            %% environments, adding the sizes of the visited heads to
-            %% the current size counter) and return the final list of
-            %% clauses.
-            {Cs3, S3} = mapfoldl(
-                          fun (C, S) ->
-                                  i_clause_body(C, Ctxt, S)
-                          end,
-                          S2, Cs2),
-            {false, {As, Vs1, Env1, Cs3}, S3};
-        {true, {C, _}} ->
-            %% A clause C could be selected (the bindings have already
-            %% been added to the guard/body). Note that since the clause
-            %% head will probably be discarded, its size is not counted.
-	    {C1, Ren2, Env2, _} = get_clause_extras(C),
-	    {B, S3} = i(clause_body(C), Ctxt, Ren2, Env2, S2),
-	    C2 = update_c_clause(C1, clause_pats(C1), clause_guard(C1), B),
-	    {true, {As, Vs1, Env1, [C2]}, S3}
-    end.
-
-%% This visits the head of a clause, renames pattern variables, inserts
-%% let-bindings in the guard and body, and does inlining on the guard
-%% expression. Returns a list of pairs `{NewClause, Data}', where `Data'
-%% is `{Renaming, Environment, Size}' used for visiting the body of the
-%% new clause.
-
-i_clause_head(C, Ts, Ren, Env, S) ->
-    %% Match the templates against the (non-renamed) patterns to get the
-    %% available information about matching subexpressions. We don't
-    %% care at this point whether an exact match/nomatch is detected.
-    Ps = clause_pats(C),
-    Bs = case cerl_clauses:match_list(Ps, Ts) of
-	     {_, Bs1} -> Bs1;
-	     none -> []
-	 end,
-
-    %% The patterns must be visited for renaming; cf. `i_pattern'. We
-    %% use a passive size counter for visiting the patterns and the
-    %% guard (cf. `visit'), because we do not know at this stage whether
-    %% the clause will be kept or not; the final value of the counter is
-    %% included in the returned value below.
-    {_, Ren1, Env1, S1} = bind_locals(clause_vars(C), Ren, Env, S),
-    S2 = new_passive_size(get_size_limit(S1), S1),
-    {Ps1, S3} = mapfoldl(fun (P, S) ->
-				 i_pattern(P, Ren1, Env1, Ren, Env, S)
-			 end,
-			 S2, Ps),
-    
-    %% Rewrite guard and body and visit the guard for value. Discard the
-    %% latter size count if the guard turns out to be a constant.
-    G = add_match_bindings(Bs, clause_guard(C)),
-    B = add_match_bindings(Bs, clause_body(C)),
-    {G1, S4} = i(G, value, Ren1, Env1, S3),
-    S5 = case is_literal(G1) of
-	     true ->
-		 revert_size(S3, S4);
-	     false ->
-		 S4
-	 end,
-
-    %% Revert to the size counter we had on entry to this function. The
-    %% environment and renaming, together with the size of the clause
-    %% head, are prefixed to the annotations for later use.
-    Size = get_size_value(S5),
-    C1 = update_c_clause(C, Ps1, G1, B),
-    {set_clause_extras(C1, Ren1, Env1, Size), revert_size(S, S5)}.
-
-add_match_bindings(Bs, E) ->
-    %% Don't waste time if the variables definitely cannot be used.
-    %% (Most guards are simply `true'.)
-    case is_literal(E) of
-	true ->
-	    E;
-	false ->
-	    Vs = [V || {V, E} <- Bs, E /= any],
-	    Es = [hd(get_ann(E)) || {_V, E} <- Bs, E /= any],
-	    c_let(Vs, c_values(Es), E)
-    end.
-
-i_clause_body(C0, Ctxt, S) ->
-    {C, Ren, Env, Size} = get_clause_extras(C0),
-    S1 = count_size(Size, S),
-    {B, S2} = i(clause_body(C), Ctxt, Ren, Env, S1),
-    C1 = update_c_clause(C, clause_pats(C), clause_guard(C), B),
-    {C1, S2}.
-
-get_clause_extras(C) ->
-    [{Ren, Env, Size} | As] = get_ann(C),
-    {set_ann(C, As), Ren, Env, Size}.
-
-set_clause_extras(C, Ren, Env, Size) ->
-    As = [{Ren, Env, Size} | get_ann(C)],
-    set_ann(C, As).
-
-%% This is the `(lambda x e)' case of the original algorithm. A
-%% `fun' is like a lambda expression, but with a varying number of
-%% parameters; possibly zero.
-
-i_fun(E, Ctxt, Ren, Env, S) ->
-    case Ctxt of
-        effect ->
-            %% Reduce useless `fun' expressions to a simple constant;
-	    %% visiting the body would be a waste of time, and could
-	    %% needlessly mark variables as referenced.
-            {void(), count_size(weight(literal), S)};
-        value ->
-            %% Note that the variables are visited as patterns.
-            Vs = fun_vars(E),
-            {_, Ren1, Env1, S1} = bind_locals(Vs, Ren, Env, S),
-            Vs1 = i_params(Vs, Ren1, Env1),
-
-            %% The body is always visited for value.
-            {B, S2} = i(fun_body(E), value, Ren1, Env1, S1),
-
-	    %% We don't bother to include the exact number of free
-	    %% variables in the cost for creating a fun-value.
-            S3 = count_size(weight('fun'), S2),
-
-	    %% Inlining might have duplicated code, so we must remove
-	    %% any 'id'-annotations from the original fun-expression.
-	    %% (This forces a later stage to invent new id:s.) This is
-	    %% necessary as long as fun:s may still need to be
-	    %% identified the old way. Function variables that are not
-	    %% in application context also have such annotations, but
-	    %% the inlining will currently lose all annotations on
-	    %% variable references (I think), so that's not a problem.
-            {set_ann(c_fun(Vs1, B), kill_id_anns(get_ann(E))), S3};
-        #app{} ->
-            %% An application of a fun-expression (in the source code)
-            %% is handled by going directly to `inline'; this is never
-            %% residualised, and we don't set up new counters here. Note
-            %% that inlining of copy-propagated fun-expressions is done
-            %% in `copy'; not here.
-            inline(E, Ctxt, Ren, Env, S)
-    end.
-
-%% A `letrec' requires a circular environment, but is otherwise like a
-%% `let', i.e. like a direct lambda application. Note that only
-%% fun-expressions (lambda abstractions) may occur in the right-hand
-%% side of each definition.
-
-i_letrec(E, Ctxt, Ren, Env, S) ->
-    %% Note that we pass an empty list for the auto-referenced
-    %% (exported) functions here.
-    {Es, B, _, S1} = i_letrec(letrec_defs(E), letrec_body(E), [], Ctxt,
-			      Ren, Env, S),
-
-    %% If no bindings remain, only the body is returned.
-    case Es of
-        [] ->
-            {B, S1};    % drop annotations on E
-        _ ->
-            S2 = count_size(weight(letrec), S1),
-            {update_c_letrec(E, Es, B), S2}
-    end.
-
-%% The major part of this is shared by letrec-expressions and module
-%% definitions alike.
-
-i_letrec(Es, B, Xs, Ctxt, Ren, Env, S) ->
-    %% First, we create operands with dummy renamings and environments,
-    %% and with fresh store locations for cached expressions and operand
-    %% info.
-    {Opnds, S1} = mapfoldl(fun ({_, E}, S) ->
-                                   make_opnd(E, undefined, undefined, S)
-                           end,
-                           S, Es),
-
-    %% Then we make recursive bindings for the definitions.
-    {Rs, Ren1, Env1, S2} = bind_recursive([F || {F, _} <- Es],
-                                          Opnds, Ren, Env, S1),
-    
-    %% For the function variables listed in Xs (none for a
-    %% letrec-expression), we must make sure that the corresponding
-    %% operand expressions are visited and that the definitions are
-    %% marked as referenced; we also need to return the possibly renamed
-    %% function variables.
-    {Xs1, S3} =
-        mapfoldl(
-          fun (X, S) ->
-                  Name = ren__map(var_name(X), Ren1),
-                  case env__lookup(Name, Env1) of
-                      {ok, R} ->
-                          S_1 = i_letrec_export(R, S),
-                          {ref_to_var(R), S_1};
-                      error ->
-                          %% We just skip any exports that are not
-                          %% actually defined here, and generate a
-                          %% warning message.
-                          {N, A} = var_name(X),
-                          report_warning("export `~w'/~w "
-					 "not defined.\n", [N, A]),
-                          {X, S}
-                  end
-          end,
-          S2, Xs),
-
-    %% At last, we can then visit the body.
-    {B1, S4} = i(B, Ctxt, Ren1, Env1, S3),
-
-    %% Finally, we create new letrec-bindings for any and all
-    %% residualised definitions. All referenced functions should have
-    %% been visited; the call to `visit' below is expected to retreive a
-    %% cached expression.
-    Rs1 = keep_referenced(Rs, S4),
-    {Es1, S5} = mapfoldl(fun (R, S) ->
-				 {E_1, S_1} = visit(R#ref.opnd, S),
-				 {{ref_to_var(R), E_1}, S_1}
-			 end,
-			 S4, Rs1),
-    {Es1, B1, Xs1, S5}.
-
-%% This visits the operand for a function definition exported by a
-%% `letrec' (which is really a `module' module definition, since normal
-%% letrecs have no export declarations). Only the updated state is
-%% returned. We must handle the "inner-pending" flag when doing this;
-%% cf. `i_var'.
-
-i_letrec_export(R, S) ->
-    Opnd = R#ref.opnd,
-    S1 = st__mark_inner_pending(Opnd#opnd.loc, S),
-    {_, S2} = visit(Opnd, S1),
-    {_, S3} = residualize_var(R, st__clear_inner_pending(Opnd#opnd.loc,
-							 S2)),
-    S3.
-
-%% This is the `(call e1 e2)' case of the original algorithm. The only
-%% difference is that we must handle multiple (or no) operand
-%% expressions.
-
-i_apply(E, Ctxt, Ren, Env, S) ->
-    {Opnds, S1} = mapfoldl(fun (E, S) ->
-                                   make_opnd(E, Ren, Env, S)
-                           end,
-                           S, apply_args(E)),
-
-    %% Allocate a new app-context location and set up an application
-    %% context structure containing the surrounding context.
-    {L, S2} = st__new_app_loc(S1),
-    Ctxt1 = #app{opnds = Opnds, ctxt = Ctxt, loc = L},
-
-    %% Visit the operator expression in the new call context.
-    {E1, S3} = i(apply_op(E), Ctxt1, Ren, Env, S2),
-
-    %% Check the "inlined" flag to find out what to do next. (The store
-    %% location could be recycled after the flag has been tested, but
-    %% there is no real advantage to that, because in practice, only
-    %% 4-5% of all created store locations will ever be reused, while
-    %% there will be a noticable overhead for managing the free list.)
-    case st__get_app_inlined(L, S3) of
-        true ->
-            %% The application was inlined, so we have the final
-            %% expression in `E1'. We just have to handle any operands
-            %% that need to be residualized for effect only (i.e., those
-            %% the values of which are not used).
-            residualize_operands(Opnds, E1, S3);
-        false ->
-            %% Otherwise, `E1' is the residual operator expression. We
-            %% make sure all operands are visited, and rebuild the
-            %% application.
-            {Es, S4} = mapfoldl(fun (Opnd, S) ->
-					visit_and_count_size(Opnd, S)
-				end,
-				S3, Opnds),
-	    N = apply_size(length(Es)),
-            {update_c_apply(E, E1, Es), count_size(N, S4)}
-    end.
-
-apply_size(A) ->
-    weight(apply) + weight(argument) * A.
-
-%% Since it is not the task of this transformation to handle
-%% cross-module inlining, all inter-module calls are handled by visiting
-%% the components (the module and function name, and the arguments of
-%% the call) for value. In `effect' context, if the function itself is
-%% known to be completely effect free, the call can be discarded and the
-%% arguments evaluated for effect. Otherwise, if all the visited
-%% arguments are to constants, and the function is known to be safe to
-%% execute at compile time, then we try to evaluate the call. If
-%% evaluation completes normally, the call is replaced by the result;
-%% otherwise the call is residualised.
-
-i_call(E, Ctxt, Ren, Env, S) ->
-    {M, S1} = i(call_module(E), value, Ren, Env, S),
-    {F, S2} = i(call_name(E), value, Ren, Env, S1),
-    As = call_args(E),
-    Arity = length(As),
-
-    %% Check if the name of the called function is static. If so,
-    %% discard the size counts performed above, since the values will
-    %% not cause any runtime cost.
-    Static =  is_c_atom(M) and is_c_atom(F),
-    S3 = case Static of
-	     true ->
-		 revert_size(S, S2);
-	     false ->
-		 S2
-	 end,
-    case Ctxt of
-        effect when Static == true ->
-            case is_safe_call(atom_val(M), atom_val(F), Arity) of
-                true ->
-                    %% The result will not be used, and the call is
-                    %% effect free, so we create a multiple-value
-                    %% aggregate containing the (not yet visited)
-                    %% arguments and process that instead.
-                    i(c_values(As), effect, Ren, Env, S3);
-                false ->
-                    %% We are not allowed to simply discard the call,
-                    %% but we can try to evaluate it.
-                    i_call_1(Static, M, F, Arity, As, E, Ctxt, Ren, Env,
-                             S3)
-            end;
-        _ ->
-	    i_call_1(Static, M, F, Arity, As, E, Ctxt, Ren, Env, S3)
-    end.
-
-i_call_1(Static, M, F, Arity, As, E, Ctxt, Ren, Env, S) ->
-    %% Visit the arguments for value.
-    {As1, S1} = mapfoldl(fun (X, A) -> i(X, value, Ren, Env, A) end, 
-			 S, As),
-    case Static of
-	true ->
-	    case erl_bifs:is_pure(atom_val(M), atom_val(F), Arity) of
-		true ->
-		    %% It is allowed to evaluate this at compile time.
-		    case all_static(As1) of
-			true ->
-			    i_call_3(M, F, As1, E, Ctxt, Env, S1);
-			false ->
-			    %% See if the call can be rewritten instead.
-			    i_call_4(M, F, As1, E, Ctxt, Env, S1)
-		    end;
-		false ->
-		    i_call_2(M, F, As1, E, S1)
-	    end;
-	false ->
-	    i_call_2(M, F, As1, E, S1)
-    end.
-
-%% Residualise the call.
-
-i_call_2(M, F, As, E, S) ->
-    N = weight(call) + weight(argument) * length(As),
-    {update_c_call(E, M, F, As), count_size(N, S)}.
-
-%% Attempt to evaluate the call to yield a literal; if that fails, try
-%% to rewrite the expression.
-
-i_call_3(M, F, As, E, Ctxt, Env, S) ->
-    %% Note that we extract the results of argument expessions here; the
-    %% expressions could still be sequences with side effects.
-    Vs = [concrete(result(A)) || A <- As],
-    case catch {ok, apply(atom_val(M), atom_val(F), Vs)} of
-	{ok, V} ->
-	    %% Evaluation completed normally - try to turn the result
-	    %% back into a syntax tree (representing a literal).
-	    case is_literal_term(V) of
-		true ->
-		    %% Make a sequence of the arguments (as a
-		    %% multiple-value aggregate) and the final value.
-		    S1 = count_size(weight(values), S),
-		    S2 = count_size(weight(literal), S1),
-		    {make_seq(c_values(As), abstract(V)), S2};
-		false ->
-		    %% The result could not be represented as a literal.
-		    i_call_4(M, F, As, E, Ctxt, Env, S)
-	    end;
-	_ ->
-	    %% The evaluation attempt did not complete normally.
-	    i_call_4(M, F, As, E, Ctxt, Env, S)
-    end.
-
-%% Rewrite the expression, if possible, otherwise residualise it.
-
-i_call_4(M, F, As, E, Ctxt, Env, S) ->
-    case reduce_bif_call(atom_val(M), atom_val(F), As, Env) of
-        false ->
-            %% Nothing more to be done - residualise the call.
-            i_call_2(M, F, As, E, S);
-        {true, E1} ->
-            %% We revisit the result, because the rewriting might have
-            %% opened possibilities for further inlining. Since the
-            %% parts have already been visited once, we use the identity
-            %% renaming here.
-            i(E1, Ctxt, ren__identity(), Env, S)
-    end.
-
-%% For now, we assume that primops cannot be evaluated at compile time,
-%% probably being too special. Also, we have no knowledge about their
-%% side effects.
-
-i_primop(E, Ren, Env, S) ->
-    %% Visit the arguments for value.
-    {As, S1} = mapfoldl(fun (E, S) ->
-				i(E, value, Ren, Env, S)
-			end,
-			S, primop_args(E)),
-    N = weight(primop) + weight(argument) * length(As),
-    {update_c_primop(E, primop_name(E), As), count_size(N, S1)}.
-
-%% This is like having an expression with an extra fun-expression
-%% attached for "exceptional cases"; actually, there are exactly two
-%% parameter variables for the body, but they are easiest handled as if
-%% their number might vary, just as for a `fun'.
-
-i_try(E, Ctxt, Ren, Env, S) ->
-    %% The argument expression is evaluated in `value' context, and the
-    %% surrounding context is propagated into both branches. We do not
-    %% try to recognize cases when the protected expression will
-    %% actually raise an exception. Note that the variables are visited
-    %% as patterns.
-    {A, S1} = i(try_arg(E), value, Ren, Env, S),
-    Vs = try_vars(E),
-    {_, Ren1, Env1, S2} = bind_locals(Vs, Ren, Env, S1),
-    Vs1 = i_params(Vs, Ren1, Env1),
-    {B, S3} = i(try_body(E), Ctxt, Ren1, Env1, S2),
-    case is_safe(A) of
-	true ->
-	    %% The `try' wrapper can be dropped in this case. Since the
-	    %% expressions have been visited already, the identity
-	    %% renaming is used when we revisit the new let-expression.
-	    i(c_let(Vs1, A, B), Ctxt, ren__identity(), Env, S3);
-	false ->
-	    Evs = try_evars(E),
-	    {_, Ren2, Env2, S4} = bind_locals(Evs, Ren, Env, S3),
-	    Evs1 = i_params(Evs, Ren2, Env2),
-	    {H, S5} = i(try_handler(E), Ctxt, Ren2, Env2, S4),
-	    S6 = count_size(weight('try'), S5),
-	    {update_c_try(E, A, Vs1, B, Evs1, H), S6}
-    end.
-
-%% A special case of try-expressions:
-
-i_catch(E, Ctxt, Ren, Env, S) ->
-    %% We cannot propagate application contexts into the catch.
-    {E1, S1} = i(catch_body(E), safe_context(Ctxt), Ren, Env, S),
-    case is_safe(E1) of
-	true ->
-	    %% The `catch' wrapper can be dropped in this case.
-	    {E1, S1};
-	false ->
-	    S2 = count_size(weight('catch'), S1),
-	    {update_c_catch(E, E1), S2}
-    end.
-
-%% A receive-expression is very much like a case-expression, with the
-%% difference that we do not have access to a switch expression, since
-%% the value being switched on is taken from the mailbox. The fact that
-%% the receive-expression may iterate over an arbitrary number of
-%% messages is not of interest to us. All we can do here is to visit its
-%% subexpressions, and possibly eliminate definitely unselectable
-%% clauses.
-
-i_receive(E, Ctxt, Ren, Env, S) ->
-    %% We first visit the expiry expression (for value) and the expiry
-    %% body (in the surrounding context).
-    {T, S1} = i(receive_timeout(E), value, Ren, Env, S),
-    {B, S2} = i(receive_action(E), Ctxt, Ren, Env, S1),
-
-    %% Then we visit the clauses. Note that application contexts may not
-    %% in general be propagated into the branches (and the expiry body),
-    %% because the execution of the `receive' may remove a message from
-    %% the mailbox as a side effect; the situation is thus analogous to
-    %% that in a `case' expression.
-    Ctxt1 = safe_context(Ctxt),
-    case i_clauses(receive_clauses(E), Ctxt1, Ren, Env, S2) of
-        {false, {[], _, _, Cs}, S3} ->
-            %% We still have a list of clauses. If the list is empty,
-            %% and the expiry expression is the integer zero, the
-            %% expression reduces to the expiry body.
-	    if Cs == [] ->
-		    case is_c_int(T) andalso (int_val(T) == 0) of
-			true ->
-			    {B, S3};
-			false ->
-			    i_receive_1(E, Cs, T, B, S3)
-		    end;
-	       true ->
-		    i_receive_1(E, Cs, T, B, S3)
-	    end;
-        {true, {_, _, _, Cs}, S3} ->
-	    %% Cs is a single clause that will always be matched (if a
-	    %% message exists), but we must keep the `receive' statement
-	    %% in order to fetch the message from the mailbox.
-	    i_receive_1(E, Cs, T, B, S3)
-    end.
-
-i_receive_1(E, Cs, T, B, S) ->
-    %% Here, we just add the base sizes for the receive-expression
-    %% itself and for each remaining clause; cf. `case'.
-    N = weight('receive') + weight(clause) * length(Cs),
-    {update_c_receive(E, Cs, T, B), count_size(N, S)}.
-
-%% A module definition is like a `letrec', with some add-ons (export and
-%% attribute declarations) but without an explicit body. Actually, the
-%% exporting of function names has the same effect as if there was a
-%% body consisting of the list of references to the exported functions.
-%% Thus, the exported functions are exactly those which can be
-%% referenced from outside the module.
-
-i_module(E, Ctxt, Ren, Env, S) ->
-    %% Cf. `i_letrec'. Note that we pass a dummy constant value for the
-    %% "body" parameter.
-    {Es, _, Xs1, S1} = i_letrec(module_defs(E), void(),
-                                module_exports(E), Ctxt, Ren, Env, S),
-    %% Sanity check:
-    case Es of
-        [] ->
-            report_warning("no function definitions remaining "
-			   "in module `~s'.\n",
-			   [atom_name(module_name(E))]);
-        _ ->
-            ok
-    end,
-    E1 = update_c_module(E, module_name(E), Xs1, module_attrs(E), Es),
-    {E1, count_size(weight(module), S1)}.
-
-%% Binary-syntax expressions are too complicated to do anything
-%% interesting with here - that is beyond the scope of this program;
-%% also, their construction could have side effects, so even in effect
-%% context we can't remove them. (We don't bother to identify cases of
-%% "safe" unused binaries which could be removed.)
-
-i_binary(E, Ren, Env, S) ->
-    %% Visit the segments for value.
-    {Es, S1} = mapfoldl(fun (E, S) ->
-				i_bitstr(E, Ren, Env, S)
-			end,
-			S, binary_segments(E)),
-    S2 = count_size(weight(binary), S1),
-    {update_c_binary(E, Es), S2}.
-
-i_bitstr(E, Ren, Env, S) ->
-    %% It is not necessary to visit the Unit, Type and Flags fields,
-    %% since these are always literals.
-    {Val, S1} = i(bitstr_val(E), value, Ren, Env, S),
-    {Size, S2} = i(bitstr_size(E), value, Ren, Env, S1),
-    Unit = bitstr_unit(E),
-    Type = bitstr_type(E),
-    Flags = bitstr_flags(E),
-    S3 = count_size(weight(bitstr), S2),
-    {update_c_bitstr(E, Val, Size, Unit, Type, Flags), S3}.
-
-%% This is a simplified version of `i_pattern', for lists of parameter
-%% variables only. It does not modify the state.
-
-i_params([V | Vs], Ren, Env) ->
-    Name = ren__map(var_name(V), Ren),
-    case env__lookup(Name, Env) of
-	{ok, R} ->
-	    [ref_to_var(R) | i_params(Vs, Ren, Env)];
-	error ->
-	    report_internal_error("variable `~w' not bound "
-				  "in pattern.\n", [Name]),
-	    exit(error)
-    end;
-i_params([], _, _) ->
-    [].
-
-%% For ordinary patterns, we just visit to rename variables and count
-%% the size/cost. All occurring binding instances of variables should
-%% already have been added to the renaming and environment; however, to
-%% handle the size expressions of binary-syntax patterns, we must pass
-%% the renaming and environment of the containing expression
-
-i_pattern(E, Ren, Env, Ren0, Env0, S) ->
-    case type(E) of
-	var ->
-	    %% Count no size.
-            Name = ren__map(var_name(E), Ren),
-            case env__lookup(Name, Env) of
-                {ok, R} ->
-                    {ref_to_var(R), S};
-                error ->
-                    report_internal_error("variable `~w' not bound "
-					  "in pattern.\n", [Name]),
-		    exit(error)
-            end;
-	alias ->
-	    %% Count no size.
-	    V = alias_var(E),
-	    Name = ren__map(var_name(V), Ren),
-	    case env__lookup(Name, Env) of
-		{ok, R} ->
-		    %% Visit the subpattern and recompose.
-		    V1 = ref_to_var(R),
-		    {P, S1} = i_pattern(alias_pat(E), Ren, Env, Ren0,
-					Env0, S),
-		    {update_c_alias(E, V1, P), S1};
-		error ->
-		    report_internal_error("variable `~w' not bound "
-					  "in pattern.\n", [Name]),
-		    exit(error)
-	    end;
-	binary ->
-	    {Es, S1} = mapfoldl(fun (E, S) ->
-					i_bitstr_pattern(E, Ren, Env,
-							  Ren0, Env0, S)
-				end,
-				S, binary_segments(E)),
-	    S2 = count_size(weight(binary), S1),
-	    {update_c_binary(E, Es), S2};
-	_ ->
-	    case is_literal(E) of
-		true ->
-                    {E, count_size(weight(literal), S)};
-		false ->
-		    {Es1, S1} = mapfoldl(fun (E, S) ->
-						 i_pattern(E, Ren, Env,
-							   Ren0, Env0,
-							   S)
-					 end,
-					 S, data_es(E)),
-		    %% We assume that in general, the elements of the
-		    %% constructor will all be fetched.
-		    N = weight(data) + length(Es1) * weight(element),
-		    S2 = count_size(N, S1),
-		    {update_data(E, data_type(E), Es1), S2}
-	    end
-    end.
-
-i_bitstr_pattern(E, Ren, Env, Ren0, Env0, S) ->
-    %% It is not necessary to visit the Unit, Type and Flags fields,
-    %% since these are always literals. The Value field is a limited
-    %% pattern - either a literal or an unbound variable. The Size field
-    %% is a limited expression - either a literal or a variable bound in
-    %% the environment of the containing expression.
-    {Val, S1} = i_pattern(bitstr_val(E), Ren, Env, Ren0, Env0, S),
-    {Size, S2} = i(bitstr_size(E), value, Ren0, Env0, S1),
-    Unit = bitstr_unit(E),
-    Type = bitstr_type(E),
-    Flags = bitstr_flags(E),
-    S3 = count_size(weight(bitstr), S2),
-    {update_c_bitstr(E, Val, Size, Unit, Type, Flags), S3}.
-
-
-%% ---------------------------------------------------------------------
-%% Other central inlining functions
-
-%% It is assumed here that `E' is a fun-expression and the context is an
-%% app-structure. If the inlining might be aborted for some reason, a
-%% corresponding catch should have been set up before entering `inline'.
-%%
-%% Note: if the inlined body is a lambda abstraction, and the
-%% surrounding context of the app-context is also an app-context, the
-%% `inlined' flag of the outermost context will be set before that of
-%% the inner context is set. E.g.: `let F = fun (X) -> fun (Y) -> E in
-%% apply apply F(A)(B)' will propagate the body of F, which is a lambda
-%% abstraction, into the outer application context, which will be
-%% inlined to produce expression `E', and the flag of the outer context
-%% will be set. Upon return, the flag of the inner context will also be
-%% set. However, the flags are then tested in innermost-first order.
-%% Thus, if some inlining attempt is aborted, the `inlined' flags of any
-%% nested app-contexts must be cleared.
-%%
-%% This implementation does nothing to handle inlining of calls to
-%% recursive functions in a smart way. This means that as long as the
-%% size and effort counters do not prevent it, the function body will be
-%% inlined (i.e., the first iteration will be unrolled), and the
-%% recursive calls will be residualized.
-
-inline(E, #app{opnds = Opnds, ctxt = Ctxt, loc = L}, Ren, Env, S) ->
-    %% Check that the arities match:
-    Vs = fun_vars(E),
-    if length(Opnds) /= length(Vs) ->
-            report_error("function called with wrong number "
-			 "of arguments!\n"),
-	    %% TODO: should really just residualise the call...
-	    exit(error);
-       true ->
-            ok
-    end,
-    %% Create local bindings for the parameters to their respective
-    %% operand structures from the app-structure, and visit the body in
-    %% the context saved in the structure.
-    {Rs, Ren1, Env1, S1} = bind_locals(Vs, Opnds, Ren, Env, S),
-    {E1, S2} = i(fun_body(E), Ctxt, Ren1, Env1, S1),
-
-    %% Create necessary bindings and/or set flags.
-    {E2, S3} = make_let_bindings(Rs, E1, S2),
-
-    %% Lastly, flag the application as inlined, since the inlining
-    %% attempt was not aborted before we reached this point.
-    {E2, st__set_app_inlined(L, S3)}.
-
-%% For the (possibly renamed) argument variables to an inlined call,
-%% either create `let' bindings for them, if they are still referenced
-%% in the residual expression (in C/Lisp, also if they are assigned to),
-%% or otherwise (if they are not referenced or assigned) mark them for
-%% evaluation for side effects.
-
-make_let_bindings([R | Rs], E, S) ->
-    {E1, S1} = make_let_bindings(Rs, E, S),
-    make_let_binding(R, E1, S1);
-make_let_bindings([], E, S) ->
-    {E, S}.
-
-make_let_binding(R, E, S) ->
-    %% The `referenced' flag is conservatively computed. We therefore
-    %% first check some simple cases where parameter R is definitely not
-    %% referenced in the resulting body E.
-    case is_literal(E) of
-        true ->
-            %% A constant contains no variable references.
-            make_let_binding_1(R, E, S);
-        false ->
-            case is_c_var(E) of
-                true ->
-                    case var_name(E) =:= R#ref.name of
-                        true ->
-                            %% The body is simply the parameter variable
-                            %% itself. Visit the operand for value and
-                            %% substitute the result for the body.
-                            visit_and_count_size(R#ref.opnd, S);
-                        false ->
-                            %% Not the same variable, so the parameter
-                            %% is not referenced at all.
-                            make_let_binding_1(R, E, S)
-                    end;
-                false ->
-		    %% Proceed to check the `referenced' flag.
-		    case st__get_var_referenced(R#ref.loc, S) of
-			true ->
-			    %% The parameter is probably referenced in
-			    %% the residual code (although it might not
-			    %% be). Visit the operand for value and
-			    %% create a let-binding.
-			    {E1, S1} = visit_and_count_size(R#ref.opnd,
-							    S),
-			    S2 = count_size(weight('let'), S1),
-			    {c_let([ref_to_var(R)], E1, E), S2};
-			false ->
-			    %% The parameter is definitely not
-			    %% referenced.
-			    make_let_binding_1(R, E, S)
-		    end
-	    end
-    end.
-
-%% This marks the operand for evaluation for effect.
-
-make_let_binding_1(R, E, S) ->
-    Opnd = R#ref.opnd,
-    {E, st__set_opnd_effect(Opnd#opnd.loc, S)}.
-
-%% Here, `R' is the ref-structure which is the target of the copy
-%% propagation, and `Opnd' is a visited operand structure, to be
-%% propagated through `R' if possible - if not, `R' is residualised.
-%% `Opnd' is normally the operand that `R' is bound to, and `E' is the
-%% result of visiting `Opnd' for value; we pass this as an argument so
-%% we don't have to fetch it multiple times (because we don't have
-%% constant time access).
-%%
-%% We also pass the environment of the site of the variable reference,
-%% for use when inlining a propagated fun-expression. In the original
-%% algorithm by Waddell, the environment used for inlining such cases is
-%% the identity mapping, because the fun-expression body has already
-%% been visited for value, and their algorithm combines renaming of
-%% source-code variables with the looking up of information about
-%% residual-code variables. We, however, need to check the environment
-%% of the call site when creating new non-shadowed variables, but we
-%% must avoid repeated renaming. We therefore separate the renaming and
-%% the environment (as in the renaming algorithm of Peyton-Jones and
-%% Marlow). This also makes our implementation more general, compared to
-%% the original algorithm, because we do not give up on propagating
-%% variables that were free in the fun-body.
-%%
-%%  Example:
-%%
-%%	let F = fun (X) -> {'foo', X} in
-%%	let G = fun (H) -> apply H(F)        % F is free in the fun G
-%%	in apply G(fun (F) -> apply F(42))
-%%	  =>
-%%	let F = fun (X) -> {'foo', X} in
-%%	apply (fun (H) -> apply H(F))(fun (F) -> apply F(42))
-%%	  =>
-%%	let F = fun (X) -> {'foo', X} in
-%%	apply (fun (F) -> apply F(42))(F)
-%%	  =>
-%%	let F = fun (X) -> {'foo', X} in
-%%	apply F(42)
-%%	  =>
-%%	apply (fun (X) -> {'foo', X})(2)
-%%	  =>
-%%	{'foo', 42}
-%%
-%%  The original algorithm would give up at stage 4, because F was free
-%%  in the propagated fun-expression. Our version inlines this example
-%%  completely.
-
-copy(R, Opnd, E, Ctxt, Env, S) ->
-    case is_c_var(E) of
-        true ->
-	    %% The operand reduces to another variable - get its
-	    %% ref-structure and attempt to propagate further.
-            copy_var(env__get(var_name(E), Opnd#opnd.env), Ctxt, Env,
-                     S);
-        false ->
-            %% Apart from variables and functional values (the latter
-            %% are handled by `copy_1' below), only constant literals
-            %% are copyable in general; other things, including e.g.
-            %% tuples `{foo, X}', could cause duplication of work, and
-            %% are not copy propagated.
-            case is_literal(E) of
-                true ->
-                    {E, count_size(weight(literal), S)};
-                false ->
-                    copy_1(R, Opnd, E, Ctxt, Env, S)
-            end
-    end.
-
-copy_var(R, Ctxt, Env, S) ->
-    %% (In Lisp or C, if this other variable might be assigned to, we
-    %% should residualize the "parent" instead, so we don't bypass any
-    %% destructive updates.)
-    case R#ref.opnd of
-        undefined ->
-            %% This variable is not bound to an expression, so just
-            %% residualize it.
-            residualize_var(R, S);
-        Opnd ->
-	    %% Note that because operands are always visited before
-	    %% copied, all copyable operand expressions will be
-	    %% propagated through any number of bindings. If `R' was
-	    %% bound to a constant literal, we would never have reached
-	    %% this point.
-            case st__lookup_opnd_cache(Opnd#opnd.loc, S) of
-                error ->
-                    %% The result for this operand is not yet ready
-                    %% (which should mean that it is a recursive
-                    %% reference). Thus, we must residualise the
-                    %% variable.
-                    residualize_var(R, S);
-                {ok, #cache{expr = E1}} ->
-                    %% The result for the operand is ready, so we can
-                    %% proceed to propagate it.
-                    copy_1(R, Opnd, E1, Ctxt, Env, S)
-            end
-    end.
-
-copy_1(R, Opnd, E, Ctxt, Env, S) ->
-    %% Fun-expression (lambdas) are a bit special; they are copyable,
-    %% but should preferably not be duplicated, so they should not be
-    %% copy propagated except into application contexts, where they can
-    %% be inlined.
-    case is_c_fun(E) of
-        true ->
-            case Ctxt of
-                #app{} ->
-                    %% First test if the operand is "outer-pending"; if
-                    %% so, don't inline.
-                    case st__test_outer_pending(Opnd#opnd.loc, S) of
-                        false ->
-                            copy_inline(R, Opnd, E, Ctxt, Env, S);
-                        true ->
-                            %% Cyclic reference forced inlining to stop
-                            %% (avoiding infinite unfolding).
-                            residualize_var(R, S)
-                    end;
-                _ ->
-                    residualize_var(R, S)
-            end;
-        false ->
-            %% We have no other cases to handle here
-            residualize_var(R, S)
-    end.
-
-%% This inlines a function value that was propagated to an application
-%% context. The inlining is done with an identity renaming (since the
-%% expression is already visited) but in the environment of the call
-%% site (which is OK because of the no-shadowing strategy for renaming,
-%% and because the domain of our environments are the residual-program
-%% variables instead of the source-program variables). Note that we must
-%% first set the "outer-pending" flag, and clear it afterwards.
-
-copy_inline(R, Opnd, E, Ctxt, Env, S) ->
-    S1 = st__mark_outer_pending(Opnd#opnd.loc, S),
-    case catch {ok, copy_inline_1(R, E, Ctxt, Env, S1)} of
-        {ok, {E1, S2}} ->
-            {E1, st__clear_outer_pending(Opnd#opnd.loc, S2)};
-        {'EXIT', X} ->
-            exit(X);
-        X ->
- 	    %% If we use destructive update for the `outer-pending'
- 	    %% flag, we must make sure to clear it upon a nonlocal
- 	    %% return.
-	    st__clear_outer_pending(Opnd#opnd.loc, S1),
-            throw(X)
-    end.
-
-%% If the current effort counter was passive, we use a new active effort
-%% counter with the inherited limit for this particular inlining.
-
-copy_inline_1(R, E, Ctxt, Env, S) ->
-    case effort_is_active(S) of
-        true ->
-            copy_inline_2(R, E, Ctxt, Env, S);
-        false ->
-            S1 = new_active_effort(get_effort_limit(S), S),
-            case catch {ok, copy_inline_2(R, E, Ctxt, Env, S1)} of
-                {ok, {E1, S2}} ->
-                    %% Revert to the old effort counter.
-                    {E1, revert_effort(S, S2)};
-                {counter_exceeded, effort, _} ->
-                    %% Aborted this inlining attempt because too much
-                    %% effort was spent. Residualize the variable and
-                    %% revert to the previous state.
-                    residualize_var(R, S);
-                {'EXIT', X} ->
-                    exit(X);
-                X ->
-                    throw(X)
-            end
-    end.
-
-%% Regardless of whether the current size counter is active or not, we
-%% use a new active size counter for each inlining. If the current
-%% counter was passive, the new counter gets the inherited size limit;
-%% if it was active, the size limit of the new counter will be equal to
-%% the remaining budget of the current counter (which itself is not
-%% affected by the inlining). This distributes the size budget more
-%% evenly over "inlinings within inlinings", so that the whole size
-%% budget is not spent on the first few call sites (in an inlined
-%% function body) forcing the remaining call sites to be residualised.
-
-copy_inline_2(R, E, Ctxt, Env, S) ->
-    Limit = case size_is_active(S) of
-                true ->
-                    get_size_limit(S) - get_size_value(S);
-                false ->
-                    get_size_limit(S)
-            end,
-    %% Add the cost of the application to the new size limit, so we
-    %% always inline functions that are small enough, even if `Limit' is
-    %% close to zero at this point. (This is an extension to the
-    %% original algorithm.)
-    S1 = new_active_size(Limit + apply_size(length(Ctxt#app.opnds)), S),
-    case catch {ok, inline(E, Ctxt, ren__identity(), Env, S1)} of
-        {ok, {E1, S2}} ->
-            %% Revert to the old size counter.
-            {E1, revert_size(S, S2)};
-        {counter_exceeded, size, S2} ->
-            %% Aborted this inlining attempt because it got too big.
-            %% Residualize the variable and revert to the old size
-            %% counter. (It is important that we do not also revert the
-            %% effort counter here. Because the effort and size counters
-            %% are always set up together, we know that the effort
-            %% counter returned in S2 is the same that was passed to
-            %% `inline'.)
-	    S3 = revert_size(S, S2),
-  	    %% If we use destructive update for the `inlined' flag, we
-  	    %% must make sure to clear the flags of any nested
-  	    %% app-contexts upon aborting; see `inline' for details.
- 	    reset_nested_apps(Ctxt, S3),    % for effect
-            residualize_var(R, S3);
-        {'EXIT', X} ->
-            exit(X);
-        X ->
-            throw(X)
-    end.
-
-reset_nested_apps(#app{ctxt = Ctxt, loc = L}, S) ->
-    reset_nested_apps(Ctxt, st__clear_app_inlined(L, S));
-reset_nested_apps(_, S) ->
-    S.
-
-
-%% ---------------------------------------------------------------------
-%%	Support functions
-
-new_var(Env) ->
-    Name = env__new_vname(Env),
-    c_var(Name).
-
-residualize_var(R, S) ->
-    S1 = count_size(weight(var), S),
-    {ref_to_var(R), st__set_var_referenced(R#ref.loc, S1)}.
-
-%% This function returns the value-producing subexpression of any
-%% expression. (Except for sequencing expressions, this is the
-%% expression itself.)
-
-result(E) ->
-    case is_c_seq(E) of
-        true ->
-            %% Also see `make_seq', which is used in all places to build
-            %% sequences so that they are always nested in the first
-            %% position.
-            seq_body(E);
-        false ->
-            E
-    end.
-
-%% This function rewrites E to `do A1 E' if A is `do A1 A2', and
-%% otherwise returns E unchanged.
-
-hoist_effects(A, E) ->
-    case type(A) of
-	seq -> make_seq(seq_arg(A), E);
-	_ -> E
-    end.
-
-%% This "build sequencing expression" operation assures that sequences
-%% are always nested in the first position, which makes it easy to find
-%% the actual value-producing expression of a sequence (cf. `result').
-
-make_seq(E1, E2) ->
-    case is_safe(E1) of
-        true ->
-            %% The first expression can safely be dropped.
-            E2;
-        false ->
-            %% If `E1' is a sequence whose final expression has no side
-            %% effects, then we can lose *that* expression when we
-            %% compose the new sequence, since its value will not be
-            %% used.
-            E3 = case is_c_seq(E1) of
-                     true ->
-                         case is_safe(seq_body(E1)) of
-                             true ->
-                                 %% Drop the final expression.
-                                 seq_arg(E1);
-                             false ->
-                                 E1
-                         end;
-                     false ->
-                         E1
-                 end,
-            case is_c_seq(E2) of
-                true ->
-                    %% `E2' is a sequence (E2' E2''), so we must
-                    %% rearrange the nesting to ((E1, E2') E2''), to
-                    %% preserve the invariant. Annotations on `E2' are
-                    %% lost.
-                    c_seq(c_seq(E3, seq_arg(E2)), seq_body(E2));
-                false ->
-                    c_seq(E3, E2)
-            end
-    end.
-
-%% Currently, safe expressions include variables, lambda expressions,
-%% constructors with safe subexpressions (this includes atoms, integers,
-%% empty lists, etc.), seq-, let- and letrec-expressions with safe
-%% subexpressions, try- and catch-expressions with safe subexpressions
-%% and calls to safe functions with safe argument subexpressions.
-%% Binaries seem too tricky to be considered.
-
-is_safe(E) ->
-    case is_data(E) of
-        true ->
-	    is_safe_list(data_es(E));
-        false ->
-            case type(E) of
-                var ->
-                    true;
-                'fun' ->
-                    true;
-		values ->
-		    is_safe_list(values_es(E));
-                'seq' ->
-                    case is_safe(seq_arg(E)) of
-                        true ->
-                            is_safe(seq_body(E));
-                        false ->
-                            false
-                    end;
-                'let' ->
-                    case is_safe(let_arg(E)) of
-                        true ->
-                            is_safe(let_body(E));
-                        false ->
-                            false
-                    end;
-                letrec ->
-                    is_safe(letrec_body(E));
-		'try' ->
-		    %% If the argument expression is not safe, it could
-		    %% be modifying the state; thus, even if the body is
-		    %% safe, the try-expression as a whole would not be.
-		    %% If the argument is safe, the handler is not used.
-                    case is_safe(try_arg(E)) of
-                        true ->
-                            is_safe(try_body(E));
-                        false ->
-                            false
-                    end;
-		'catch' ->
-                    is_safe(catch_body(E));
-		call ->
-		    M = call_module(E),
-		    F = call_name(E),
-		    case is_c_atom(M) and is_c_atom(F) of
-			true ->
-			    As = call_args(E),
-			    case is_safe_list(As) of
-				true ->
-				    is_safe_call(atom_val(M),
-						 atom_val(F),
-						 length(As));
-				false ->
-				    false
-			    end;
-			false ->
-			    false
-		    end;
-                _ ->
-                    false
-            end
-    end.
-
-is_safe_list([E | Es]) ->
-    case is_safe(E) of
-	true ->
-	    is_safe_list(Es); 
-	false ->
-	    false
-    end;
-is_safe_list([]) ->
-    true.
-
-is_safe_call(M, F, A) ->
-    erl_bifs:is_safe(M, F, A).
-
-%% When setting up local variables, we only create new names if we have
-%% to, according to the "no-shadowing" strategy.
-
-make_locals(Vs, Ren, Env) ->
-    make_locals(Vs, [], Ren, Env).
-
-make_locals([V | Vs], As, Ren, Env) ->
-    Name = var_name(V),
-    case env__is_defined(Name, Env) of
-        false ->
-            %% The variable need not be renamed. Just make sure that the
-            %% renaming will map it to itself.
-            Name1 = Name,
-            Ren1 = ren__add_identity(Name, Ren);
-        true ->
-            %% The variable must be renamed to maintain the no-shadowing
-            %% invariant. Do the right thing for function variables.
-            Name1 = case Name of
-			{A, N} ->
-			    env__new_fname(A, N, Env);
-			_ ->
-			    env__new_vname(Env)
-		    end,
-            Ren1 = ren__add(Name, Name1, Ren)
-    end,
-    %% This temporary binding is added for correct new-key generation.
-    Env1 = env__bind(Name1, dummy, Env),
-    make_locals(Vs, [Name1 | As], Ren1, Env1);
-make_locals([], As, Ren, Env) ->
-    {reverse(As), Ren, Env}.
-
-%% This adds let-bindings for the source code variables in `Es' to the
-%% environment `Env'.
-%%
-%% Note that we always assign a new state location for the
-%% residual-program variable, since we cannot know when a location for a
-%% particular variable in the source code can be reused.
-
-bind_locals(Vs, Ren, Env, S) ->
-    Opnds = lists:duplicate(length(Vs), undefined),
-    bind_locals(Vs, Opnds, Ren, Env, S).
-
-bind_locals(Vs, Opnds, Ren, Env, S) ->
-    {Ns, Ren1, Env1} = make_locals(Vs, Ren, Env),
-    {Rs, Env2, S1} = bind_locals_1(Ns, Opnds, [], Env1, S),
-    {Rs, Ren1, Env2, S1}.
-
-%% Note that the `Vs' are currently not used for anything except the
-%% number of variables. If we were maintaining "source-referenced"
-%% flags, then the flag in the new variable should be initialized to the
-%% current value of the (residual-) referenced-flag of the "parent".
-
-bind_locals_1([N | Ns], [Opnd | Opnds], Rs, Env, S) ->
-    {R, S1} = new_ref(N, Opnd, S),
-    Env1 = env__bind(N, R, Env),
-    bind_locals_1(Ns, Opnds, [R | Rs], Env1, S1);
-bind_locals_1([], [], Rs, Env, S) ->
-    {lists:reverse(Rs), Env, S}.
-
-new_refs(Ns, Opnds, S) ->
-    new_refs(Ns, Opnds, [], S).
-
-new_refs([N | Ns], [Opnd | Opnds], Rs, S) ->
-    {R, S1} = new_ref(N, Opnd, S),
-    new_refs(Ns, Opnds, [R | Rs], S1);
-new_refs([], [], Rs, S) ->
-    {lists:reverse(Rs), S}.
-
-new_ref(N, Opnd, S) ->
-    {L, S1} = st__new_ref_loc(S),
-    {#ref{name = N, opnd = Opnd, loc = L}, S1}.
-
-%% This adds recursive bindings for the source code variables in `Es' to
-%% the environment `Env'. Note that recursive binding of a set of
-%% variables is an atomic operation on the environment - they cannot be
-%% added one at a time.
-
-bind_recursive(Vs, Opnds, Ren, Env, S) ->
-    {Ns, Ren1, Env1} = make_locals(Vs, Ren, Env),
-    {Rs, S1} = new_refs(Ns, Opnds, S),
-
-    %% When this fun-expression is evaluated, it updates the operand
-    %% structure in the ref-structure to contain the recursively defined
-    %% environment and the correct renaming.
-    Fun = fun (R, Env) ->
-		  Opnd = R#ref.opnd,
-		  R#ref{opnd = Opnd#opnd{ren = Ren1, env = Env}}
-	  end,
-    {Rs, Ren1, env__bind_recursive(Ns, Rs, Fun, Env1), S1}.
-
-safe_context(Ctxt) ->
-    case Ctxt of
-        #app{} ->
-            value;
-        _ ->
-            Ctxt
-    end.
-
-%% Note that the name of a variable encodes its type: a "plain" variable
-%% or a function variable. The latter kind also contains an arity number
-%% which should be preserved upon renaming.
-
-ref_to_var(#ref{name = Name}) ->
-    %% If we were maintaining "source-referenced" flags, the annotation
-    %% `add_ann([#source_ref{loc = L}], E)' should also be done here, to
-    %% make the algorithm reapplicable. This is however not necessary
-    %% since there are no destructive variable assignments in Erlang.
-    c_var(Name).
-
-%% Including the effort counter of the call site assures that the cost
-%% of processing an operand via `visit' is charged to the correct
-%% counter. In particular, if the effort counter of the call site was
-%% passive, the operands will also be processed with a passive counter.
-
-make_opnd(E, Ren, Env, S) ->
-    {L, S1} = st__new_opnd_loc(S),
-    C = st__get_effort(S1),
-    Opnd = #opnd{expr = E, ren = Ren, env = Env, loc = L, effort = C},
-    {Opnd, S1}.
-
-keep_referenced(Rs, S) ->
-    [R || R <- Rs, st__get_var_referenced(R#ref.loc, S)].
-
-residualize_operands(Opnds, E, S) ->
-    foldr(fun (Opnd, {E, S}) -> residualize_operand(Opnd, E, S) end,
-          {E, S}, Opnds).
-
-%% This is the only case where an operand expression can be visited in
-%% `effect' context instead of `value' context.
-
-residualize_operand(Opnd, E, S) ->
-    case st__get_opnd_effect(Opnd#opnd.loc, S) of
-        true ->
-            %% The operand has not been visited, so we do that now, but
-            %% in `effect' context. (Waddell's algoritm does some stuff
-            %% here to account specially for the operand size, which
-            %% appears unnecessary.)
-            {E1, S1} = i(Opnd#opnd.expr, effect, Opnd#opnd.ren,
-                         Opnd#opnd.env, S),
-            {make_seq(E1, E), S1};
-        false ->
-            {E, S}
-    end.
-
-%% The `visit' function always visits the operand expression in `value'
-%% context (`residualize_operand' visits an unreferenced operand
-%% expression in `effect' context when necessary). A new passive size
-%% counter is used for visiting the operand, the final value of which is
-%% then cached along with the resulting expression.
-%%
-%% Note that the effort counter of the call site, included in the
-%% operand structure, is not a shared object. Thus, the effort budget is
-%% actually reused over all occurrences of the operands of a single
-%% application. This does not appear to be a problem; just a
-%% modification of the algorithm.
-
-visit(Opnd, S) ->
-    {C, S1} = visit_1(Opnd, S),
-    {C#cache.expr, S1}.
-
-visit_and_count_size(Opnd, S) ->
-    {C, S1} = visit_1(Opnd, S),
-    {C#cache.expr, count_size(C#cache.size, S1)}.
-
-visit_1(Opnd, S) ->
-    case st__lookup_opnd_cache(Opnd#opnd.loc, S) of
-        error ->
-            %% Use a new, passive, size counter for visiting operands,
-            %% and use the effort counter of the context of the operand.
-            %% It turns out that if the latter is active, it must be the
-            %% same object as the one currently used, and if it is
-            %% passive, it does not matter if it is the same object as
-            %% any other counter.
-	    Effort = Opnd#opnd.effort,
-	    Active = counter__is_active(Effort),
-	    S1 = case Active of
-		     true ->
-			 S;    % don't change effort counter
-		     false ->
-			 st__set_effort(Effort, S)
-		 end,
-	    S2 = new_passive_size(get_size_limit(S1), S1),
-	    
-            %% Visit the expression and cache the result, along with the
-            %% final value of the size counter.
-            {E, S3} = i(Opnd#opnd.expr, value, Opnd#opnd.ren,
-                        Opnd#opnd.env, S2),
-            Size = get_size_value(S3),
-            C = #cache{expr = E, size = Size},
-            S4 = revert_size(S, st__set_opnd_cache(Opnd#opnd.loc, C,
-						   S3)),
-	    case Active of
-		true ->
-		    {C, S4};  % keep using the same effort counter
-		false ->
-		    {C, revert_effort(S, S4)}
-	    end;
-	{ok, C} ->
-            {C, S}
-    end.
-
-%% Create a pattern matching template for an expression. A template
-%% contains only data constructors (including atomic ones) and
-%% variables, and compound literals are not folded into a single node.
-%% Each node in the template is annotated with the variable which holds
-%% the corresponding subexpression; these are new, unique variables not
-%% existing in the given `Env'. Returns `{Template, Variables, NewEnv}',
-%% where `Variables' is the list of all variables corresponding to nodes
-%% in the template *listed in reverse dependency order*, and `NewEnv' is
-%% `Env' augmented with mappings from the variable names to
-%% subexpressions of `E' (not #ref{} structures!) rewritten so that no
-%% computations are duplicated. `Variables' is guaranteed to be nonempty
-%% - at least the root node will always be bound to a new variable.
-
-make_template(E, Env) ->
-    make_template(E, [], Env).
-
-make_template(E, Vs0, Env0) ->
-    case is_data(E) of
-	true ->
-	    {Ts, {Vs1, Env1}} = mapfoldl(
-				  fun (E, {Vs0, Env0}) ->
-					  {T, Vs1, Env1} =
-					      make_template(E, Vs0,
-							    Env0),
-					  {T, {Vs1, Env1}}
-				  end,
-				  {Vs0, Env0}, data_es(E)),
-	    T = make_data_skel(data_type(E), Ts),
-	    E1 = update_data(E, data_type(E),
-			     [hd(get_ann(T)) || T <- Ts]),
-	    V = new_var(Env1),
-	    Env2 = env__bind(var_name(V), E1, Env1),
-	    {set_ann(T, [V]), [V | Vs1], Env2};
-	false ->
-	    case type(E) of
-		seq ->
-		    %% For a sequencing, we can rebind the variable used
-		    %% for the body, and pass on the template as it is.
-		    {T, Vs1, Env1} = make_template(seq_body(E), Vs0,
-						   Env0),
-		    V = var_name(hd(get_ann(T))),
-		    E1 = update_c_seq(E, seq_arg(E), env__get(V, Env1)),
-		    Env2 = env__bind(V, E1, Env1),
-		    {T, Vs1, Env2};
-		_ ->
-		    V = new_var(Env0),
-		    Env1 = env__bind(var_name(V), E, Env0),
-		    {set_ann(V, [V]), [V | Vs0], Env1}
-	    end
-    end.
-
-%% Two clauses are equivalent if their bodies are equivalent expressions
-%% given that the respective pattern variables are local.
-
-equivalent_clauses([]) ->
-    true;
-equivalent_clauses([C | Cs]) ->
-    Env = cerl_trees:variables(c_values(clause_pats(C))),
-    equivalent_clauses_1(clause_body(C), Cs, Env).
-
-equivalent_clauses_1(E, [C | Cs], Env) ->
-    Env1 = cerl_trees:variables(c_values(clause_pats(C))),
-    case equivalent(E, clause_body(C), ordsets:union(Env, Env1)) of
-	true ->
-	    equivalent_clauses_1(E, Cs, Env);
-	false ->
-	    false
-    end;
-equivalent_clauses_1(_, [], _Env) ->
-    true.
-
-%% Two expressions are equivalent if and only if they yield the same
-%% value and has the same side effects in the same order. Currently, we
-%% only accept equality between constructors (constants) and nonlocal
-%% variables, since this should cover most cases of interest. If a
-%% variable is locally bound in one expression, it cannot be equivalent
-%% to one with the same name in the other expression, so we need not
-%% keep track of two environments.
-
-equivalent(E1, E2, Env) ->
-    case is_data(E1) of
-        true ->
-            case is_data(E2) of
-                true ->
-                    T1 = {data_type(E1), data_arity(E1)},
-                    T2 = {data_type(E2), data_arity(E2)},
-                    %% Note that we must test for exact equality.
-                    if T1 =:= T2 ->
-                            equivalent_lists(data_es(E1), data_es(E2),
-					     Env);
-                       true ->
-                            false
-                    end;
-                false ->
-                    false
-            end;
-        false ->
-	    case type(E1) of
-		var ->
-		    case is_c_var(E2) of
-			true ->
-			    N1 = var_name(E1),
-			    N2 = var_name(E2),
-			    if N1 =:= N2 ->
-				    not ordsets:is_element(N1, Env);
-			       true ->
-				    false
-			    end;
-			false ->
-			    false
-		    end;
-		_ ->
-		    %% Other constructs are not being considered.
-		    false
-	    end
-    end.
-
-equivalent_lists([E1 | Es1], [E2 | Es2], Env) ->
-    equivalent(E1, E2, Env) and equivalent_lists(Es1, Es2, Env);
-equivalent_lists([], [], _) ->
-    true;
-equivalent_lists(_, _, _) ->
-    false.
-
-%% Return `false' or `{true, EffectExpr, ValueExpr}'. The environment is
-%% passed for new-variable generation.
-
-reduce_bif_call(M, F, As, Env) ->
-    reduce_bif_call_1(M, F, length(As), As, Env).
-
-reduce_bif_call_1(erlang, element, 2, [X, Y], _Env) ->
-    case is_c_int(X) and is_c_tuple(Y) of
-	true ->
-	    %% We are free to change the relative evaluation order of
-	    %% the elements, so lifting out a particular element is OK.
-	    T = list_to_tuple(tuple_es(Y)),
-	    N = int_val(X),
-	    if integer(N), N > 0, N =< size(T) ->
-		    E = element(N, T),
-		    Es = tuple_to_list(setelement(N, T, void())),
-		    {true, make_seq(c_tuple(Es), E)};
-	       true ->
-		    false
-	    end;
-	false ->
-	    false
-    end;
-reduce_bif_call_1(erlang, hd, 1, [X], _Env) ->
-    case is_c_cons(X) of
-	true ->
-	    %% Cf. `element/2' above.
-	    {true, make_seq(cons_tl(X), cons_hd(X))};
-	false ->
-	    false
-    end;
-reduce_bif_call_1(erlang, length, 1, [X], _Env) ->
-    case is_c_list(X) of
-	true ->
-	    %% Cf. `erlang:size/1' below.
-	    {true, make_seq(X, c_int(list_length(X)))};
-	false ->
-	    false
-    end;
-reduce_bif_call_1(erlang, list_to_tuple, 1, [X], _Env) ->
-    case is_c_list(X) of
-	true ->
-	    %% This does not actually preserve all the evaluation order
-	    %% constraints of the list, but I don't imagine that it will
-	    %% be a problem.
-	    {true, c_tuple(list_elements(X))};
-	false ->
-	    false
-    end;
-reduce_bif_call_1(erlang, setelement, 3, [X, Y, Z], Env) ->
-    case is_c_int(X) and is_c_tuple(Y) of
-	true ->
-	    %% Here, unless `Z' is a simple expression, we must bind it
-	    %% to a new variable, because in that case, `Z' must be
-	    %% evaluated before any part of `Y'.
-	    T = list_to_tuple(tuple_es(Y)),
-	    N = int_val(X),
-	    if integer(N), N > 0, N =< size(T) ->
-		    E = element(N, T),
-		    case is_simple(Z) of
-			true ->
-			    Es = tuple_to_list(setelement(N, T, Z)),
-			    {true, make_seq(E, c_tuple(Es))};
-			false ->
-			    V = new_var(Env),
-			    Es = tuple_to_list(setelement(N, T, V)),
-			    E1 = make_seq(E, c_tuple(Es)),
-			    {true, c_let([V], Z, E1)}
-		    end;
-	       true ->
-		    false
-	    end;
-	false ->
-	    false
-    end;
-reduce_bif_call_1(erlang, size, 1, [X], _Env) ->
-    case is_c_tuple(X) of
-	true ->
-	    %% Just evaluate the tuple for effect and use the size (the
-	    %% arity) as the result.
-	    {true, make_seq(X, c_int(tuple_arity(X)))};
-	false ->
-	    false
-    end;
-reduce_bif_call_1(erlang, tl, 1, [X], _Env) ->
-    case is_c_cons(X) of
-	true ->
-	    %% Cf. `element/2' above.
-	    {true, make_seq(cons_hd(X), cons_tl(X))};
-	false ->
-	    false
-    end;
-reduce_bif_call_1(erlang, tuple_to_list, 1, [X], _Env) ->
-    case is_c_tuple(X) of
-	true ->
-	    %% This actually introduces slightly stronger constraints on
-	    %% the evaluation order of the subexpressions.
-	    {true, make_list(tuple_es(X))};
-	false ->
-	    false
-    end;
-reduce_bif_call_1(_M, _F, _A, _As, _Env) ->
-    false.
-
-effort_is_active(S) ->
-    counter__is_active(st__get_effort(S)).
-
-size_is_active(S) ->
-    counter__is_active(st__get_size(S)).
-
-get_effort_limit(S) ->
-    counter__limit(st__get_effort(S)).
-
-new_active_effort(Limit, S) ->
-    st__set_effort(counter__new_active(Limit), S).
-
-revert_effort(S1, S2) ->
-    st__set_effort(st__get_effort(S1), S2).
-
-new_active_size(Limit, S) ->
-    st__set_size(counter__new_active(Limit), S).
-
-new_passive_size(Limit, S) ->
-    st__set_size(counter__new_passive(Limit), S).
-
-revert_size(S1, S2) ->
-    st__set_size(st__get_size(S1), S2).
-
-count_effort(N, S) ->
-    C = st__get_effort(S),
-    C1 = counter__add(N, C, effort, S),
-    case debug_counters() of
-        true ->
-            case counter__is_active(C1) of
-                true ->
-                    V = counter__value(C1),
-                    case V > get(counter_effort_max) of
-                        true ->
-                            put(counter_effort_max, V);
-                        false ->
-                            ok
-                    end;
-                false ->
-                    ok
-            end;
-        _ ->
-            ok
-    end,
-    st__set_effort(C1, S).
-
-count_size(N, S) ->
-    C = st__get_size(S),
-    C1 = counter__add(N, C, size, S),
-    case debug_counters() of
-        true ->
-            case counter__is_active(C1) of
-                true ->
-                    V = counter__value(C1),
-                    case V > get(counter_size_max) of
-                        true ->
-                            put(counter_size_max, V);
-                        false ->
-                            ok
-                    end;
-                false ->
-                    ok
-            end;
-        _ ->
-            ok
-    end,
-    st__set_size(C1, S).
-
-get_size_value(S) ->
-    counter__value(st__get_size(S)).
-
-get_size_limit(S) ->
-    counter__limit(st__get_size(S)).
-
-kill_id_anns([{'id',_} | As]) ->
-    kill_id_anns(As);
-kill_id_anns([A | As]) ->
-    [A | kill_id_anns(As)];
-kill_id_anns([]) ->
-    [].
-
-
-%% =====================================================================
-%% General utilities
-
-max(X, Y) when X > Y -> X;
-max(_, Y) -> Y.
-
-%% The atom `ok', is widely used in Erlang for "void" values.
-
-void() -> abstract(ok).
-
-is_simple(E) ->
-    case type(E) of
-	literal -> true;
-	var -> true;
-	'fun' -> true;
-	_ -> false
-    end.
-
-get_components(N, E) ->
-    case type(E) of
-	values ->
-	    Es = values_es(E),
-	    if length(Es) == N ->
-		    {true, Es};
-	       true ->
-		    false
-	    end;
-	_ when N == 1 ->
-	    {true, [E]};
-	_ ->
-	    false
-    end.
-
-all_static([E | Es]) ->
-    case is_literal(result(E)) of
-	true ->
-	    all_static(Es);
-	false ->
-	    false
-    end;
-all_static([]) ->
-    true.
-
-set_clause_bodies([C | Cs], B) ->
-    [update_c_clause(C, clause_pats(C), clause_guard(C), B)
-     | set_clause_bodies(Cs, B)];
-set_clause_bodies([], _) ->
-    [].
-
-filename([C | T]) when integer(C), C > 0, C =< 255 ->
-    [C | filename(T)];
-filename([H|T]) ->
-    filename(H) ++ filename(T);
-filename([]) ->
-    [];
-filename(N) when atom(N) ->
-    atom_to_list(N);
-filename(N) ->
-    report_error("bad filename: `~P'.", [N, 25]),
-    exit(error).
-
-
-%% =====================================================================
-%% Abstract datatype: renaming()
-
-ren__identity() ->
-    dict:new().
-
-ren__add(X, Y, Ren) ->
-    dict:store(X, Y, Ren).
-
-ren__map(X, Ren) ->
-    case dict:find(X, Ren) of
-	{ok, Y} ->
-	    Y;
-	error ->
-	    X
-    end.
-
-ren__add_identity(X, Ren) ->
-    dict:erase(X, Ren).
-
-
-%% =====================================================================
-%% Abstract datatype: environment()
-
-env__empty() ->
-    rec_env:empty().
-
-env__bind(Key, Val, Env) ->
-    rec_env:bind(Key, Val, Env).
-
-%% `Es' should have type `[{Key, Val}]', and `Fun' should have type
-%% `(Val, Env) -> T', mapping a value together with the recursive
-%% environment itself to some term `T' to be returned when the entry is
-%% looked up.
-
-env__bind_recursive(Ks, Vs, F, Env) ->
-    rec_env:bind_recursive(Ks, Vs, F, Env).
-
-env__lookup(Key, Env) ->
-    rec_env:lookup(Key, Env).
-
-env__get(Key, Env) ->
-    rec_env:get(Key, Env).
-
-env__is_defined(Key, Env) ->
-    rec_env:is_defined(Key, Env).
-
-env__new_vname(Env) ->
-    rec_env:new_key(Env).
-
-env__new_fname(A, N, Env) ->
-    rec_env:new_key(fun (X) ->
-			S = integer_to_list(X),
-			{list_to_atom(atom_to_list(A) ++ "_" ++ S),
-			 N}
-		    end, Env).
-
-
-%% =====================================================================
-%% Abstract datatype: state()
-
--record(state, {free,		% next free location
-		size,		% size counter
-		effort,		% effort counter
-		cache,		% operand expression cache
-		var_flags,	% flags for variables (#ref-structures)
-		opnd_flags,	% flags for operands
-		app_flags}).	% flags for #app-structures
-
-%% Note that we do not have a `var_assigned' flag, since there is no
-%% destructive assignment in Erlang. In the original algorithm, the
-%% "residual-referenced"-flags of the previous inlining pass (or
-%% initialization pass) are used as the "source-referenced"-flags for
-%% the subsequent pass. The latter may then be used as a safe
-%% approximation whenever we need to base a decision on whether or not a
-%% particular variable or function variable could be referenced in the
-%% program being generated, and computation of the new
-%% "residual-referenced" flag for that variable is not yet finished. In
-%% the present algorithm, this can only happen in the presence of
-%% variable assignments, which do not exist in Erlang. Therefore, we do
-%% not keep "source-referenced" flags for residual-code references in
-%% our implementation.
-%%
-%% The "inner-pending" flag tells us whether we are already in the
-%% process of visiting a particular operand, and the "outer-pending"
-%% flag whether we are in the process of inlining a propagated
-%% functional value. The "pending flags" are really counters limiting
-%% the number of times an operand may be inlined recursively, causing
-%% loop unrolling; however, unrolling more than one iteration does not
-%% work offhand in the present implementation. (TODO: find out why.)
-%% Note that the initial value must be greater than zero in order for
-%% any inlining at all to be done.
-
-%% Flags are stored in ETS-tables, one table for each class. The second
-%% element in each stored tuple is the key (the "label").
-
--record(var_flags, {lab, referenced = false}).
--record(opnd_flags, {lab, inner_pending = 1, outer_pending = 1,
-		     effect = false}).
--record(app_flags, {lab, inlined = false}).
-
-st__new(Effort, Size) ->
-    #state{free = 0,
-	   size = counter__new_passive(Size),
-           effort = counter__new_passive(Effort),
-	   cache = dict:new(),
- 	   var_flags = ets:new(var, [set, private, {keypos, 2}]),
-	   opnd_flags = ets:new(opnd, [set, private, {keypos, 2}]),
-	   app_flags = ets:new(app, [set, private, {keypos, 2}])}.
-
-st__new_loc(S) ->
-    N = S#state.free,
-    {N, S#state{free = N + 1}}.
-
-st__get_effort(S) ->
-    S#state.effort.
-
-st__set_effort(C, S) ->
-    S#state{effort = C}.
-
-st__get_size(S) ->
-    S#state.size.
-
-st__set_size(C, S) ->
-    S#state{size = C}.
-
-st__set_var_referenced(L, S) ->
-    T = S#state.var_flags,
-    [F] = ets:lookup(T, L),
-    ets:insert(T, F#var_flags{referenced = true}),
-    S.
-
-st__get_var_referenced(L, S) ->
-    ets:lookup_element(S#state.var_flags, L, #var_flags.referenced).
-
-st__lookup_opnd_cache(L, S) ->
-    dict:find(L, S#state.cache).
-
-%% Note that setting the cache should only be done once.
-
-st__set_opnd_cache(L, C, S) ->
-    S#state{cache = dict:store(L, C, S#state.cache)}.
-
-st__set_opnd_effect(L, S) ->
-    T = S#state.opnd_flags,
-    [F] = ets:lookup(T, L),
-    ets:insert(T, F#opnd_flags{effect = true}),
-    S.
-
-st__get_opnd_effect(L, S) ->
-    ets:lookup_element(S#state.opnd_flags, L, #opnd_flags.effect).
-
-st__set_app_inlined(L, S) ->
-    T = S#state.app_flags,
-    [F] = ets:lookup(T, L),
-    ets:insert(T, F#app_flags{inlined = true}),
-    S.
-
-st__clear_app_inlined(L, S) ->
-    T = S#state.app_flags,
-    [F] = ets:lookup(T, L),
-    ets:insert(T, F#app_flags{inlined = false}),
-    S.
-
-st__get_app_inlined(L, S) ->
-    ets:lookup_element(S#state.app_flags, L, #app_flags.inlined).
-
-%% The pending-flags are initialized by `st__new_opnd_loc' below.
-
-st__test_inner_pending(L, S) ->
-    T = S#state.opnd_flags,
-    P = ets:lookup_element(T, L, #opnd_flags.inner_pending),
-    P =< 0.
-
-st__mark_inner_pending(L, S) ->
-    ets:update_counter(S#state.opnd_flags, L,
-		       {#opnd_flags.inner_pending, -1}),
-    S.
-
-st__clear_inner_pending(L, S) ->
-    ets:update_counter(S#state.opnd_flags, L,
-		       {#opnd_flags.inner_pending, 1}),
-    S.
-
-st__test_outer_pending(L, S) ->
-    T = S#state.opnd_flags,
-    P = ets:lookup_element(T, L, #opnd_flags.outer_pending),
-    P =< 0.
-
-st__mark_outer_pending(L, S) ->
-    ets:update_counter(S#state.opnd_flags, L,
-		       {#opnd_flags.outer_pending, -1}),
-    S.
-
-st__clear_outer_pending(L, S) ->
-    ets:update_counter(S#state.opnd_flags, L,
-		       {#opnd_flags.outer_pending, 1}),
-    S.
-
-st__new_app_loc(S) ->
-    V = {L, _S1} = st__new_loc(S),
-    ets:insert(S#state.app_flags, #app_flags{lab = L}),
-    V.
-
-st__new_ref_loc(S) ->
-    V = {L, _S1} = st__new_loc(S),
-    ets:insert(S#state.var_flags, #var_flags{lab = L}),
-    V.
-
-st__new_opnd_loc(S) ->
-    V = {L, _S1} = st__new_loc(S),
-    ets:insert(S#state.opnd_flags, #opnd_flags{lab = L}),
-    V.
-
-
-%% =====================================================================
-%% Abstract datatype: counter()
-%%
-%% `counter__add' throws `{counter_exceeded, Type, Data}' if the
-%% resulting counter value would exceed the limit for the counter in
-%% question (`Type' and `Data' are given by the user).
-
--record(counter, {active, value, limit}).
-
-counter__new_passive(Limit) when Limit > 0 ->
-    {0, Limit}.
-
-counter__new_active(Limit) when Limit > 0 ->
-    {Limit, Limit}.
-
-%% Active counters have values > 0 internally; passive counters start at
-%% zero. The 'limit' field is only accessed by the 'counter__limit'
-%% function.
-
-counter__is_active({C, _}) ->
-    C > 0.
-
-counter__limit({_, L}) ->
-    L.
-
-counter__value({N, L}) ->
-    if N > 0 ->
-	    L - N;
-       true ->
-            -N
-    end.
-
-counter__add(N, {V, L}, Type, Data) ->
-    N1 = V - N,
-    if V > 0, N1 =< 0 ->
-	    case debug_counters() of
-		true ->
-		    case Type of
-			effort ->
-			    put(counter_effort_triggers,
-				get(counter_effort_triggers) + 1);
-			size ->
-			    put(counter_size_triggers,
-				get(counter_size_triggers) + 1)
-		    end;
-		_ ->
-		    ok
-	    end,
-	    throw({counter_exceeded, Type, Data});
-       true ->
-	    {N1, L}
-    end.
-
-
-%% =====================================================================
-%% Reporting
-
-% report_internal_error(S) ->
-%     report_internal_error(S, []).
-
-report_internal_error(S, Vs) ->
-    report_error("internal error: " ++ S, Vs).
-
-report_error(D) ->
-    report_error(D, []).
-    
-report_error({F, L, D}, Vs) ->
-    report({F, L, {error, D}}, Vs);
-report_error(D, Vs) ->
-    report({error, D}, Vs).
-
-report_warning(D) ->
-    report_warning(D, []).
-
-report_warning({F, L, D}, Vs) ->
-    report({F, L, {warning, D}}, Vs);
-report_warning(D, Vs) ->
-    report({warning, D}, Vs).
-
-report(D, Vs) ->
-    io:put_chars(format(D, Vs)).
-
-format({error, D}, Vs) ->
-    ["error: ", format(D, Vs)];
-format({warning, D}, Vs) ->
-    ["warning: ", format(D, Vs)];
-format({"", L, D}, Vs) when integer(L), L > 0 ->
-    [io_lib:fwrite("~w: ", [L]), format(D, Vs)];
-format({"", _L, D}, Vs) ->
-    format(D, Vs);
-format({F, L, D}, Vs) when integer(L), L > 0 ->
-    [io_lib:fwrite("~s:~w: ", [filename(F), L]), format(D, Vs)];
-format({F, _L, D}, Vs) ->
-    [io_lib:fwrite("~s: ", [filename(F)]), format(D, Vs)];
-format(S, Vs) when list(S) ->
-    [io_lib:fwrite(S, Vs), $\n].
-
-
-%% =====================================================================
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl_trees.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl_trees.erl
deleted file mode 100644
index 50384a6ff8..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/cerl_trees.erl
+++ /dev/null
@@ -1,801 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Richard Carlsson.
-%% Copyright (C) 1999-2002 Richard Carlsson.
-%% Portions created by Ericsson are Copyright 2001, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: cerl_trees.erl,v 1.2 2010/06/07 06:32:39 kostis Exp $
-
-%% @doc Basic functions on Core Erlang abstract syntax trees.
-%%
-%% <p>Syntax trees are defined in the module <a
-%% href=""><code>cerl</code></a>.</p>
-%%
-%% @type cerl() = cerl:cerl()
-
--module(cerl_trees).
-
--export([depth/1, fold/3, free_variables/1, label/1, label/2, map/2,
-	 mapfold/3, size/1, variables/1]).
-
--import(cerl, [alias_pat/1, alias_var/1, ann_c_alias/3, ann_c_apply/3,
-	       ann_c_binary/2, ann_c_bitstr/6, ann_c_call/4,
-	       ann_c_case/3, ann_c_catch/2, ann_c_clause/4,
-	       ann_c_cons_skel/3, ann_c_fun/3, ann_c_let/4,
-	       ann_c_letrec/3, ann_c_module/5, ann_c_primop/3,
-	       ann_c_receive/4, ann_c_seq/3, ann_c_try/6,
-	       ann_c_tuple_skel/2, ann_c_values/2, apply_args/1,
-	       apply_op/1, binary_segments/1, bitstr_val/1,
-	       bitstr_size/1, bitstr_unit/1, bitstr_type/1,
-	       bitstr_flags/1, call_args/1, call_module/1, call_name/1,
-	       case_arg/1, case_clauses/1, catch_body/1, clause_body/1,
-	       clause_guard/1, clause_pats/1, clause_vars/1, concrete/1,
-	       cons_hd/1, cons_tl/1, fun_body/1, fun_vars/1, get_ann/1,
-	       let_arg/1, let_body/1, let_vars/1, letrec_body/1,
-	       letrec_defs/1, letrec_vars/1, module_attrs/1,
-	       module_defs/1, module_exports/1, module_name/1,
-	       module_vars/1, primop_args/1, primop_name/1,
-	       receive_action/1, receive_clauses/1, receive_timeout/1,
-	       seq_arg/1, seq_body/1, set_ann/2, subtrees/1, try_arg/1,
-	       try_body/1, try_vars/1, try_evars/1, try_handler/1,
-	       tuple_es/1, type/1, update_c_alias/3, update_c_apply/3,
-	       update_c_binary/2, update_c_bitstr/6, update_c_call/4,
-	       update_c_case/3, update_c_catch/2, update_c_clause/4,
-	       update_c_cons/3, update_c_cons_skel/3, update_c_fun/3,
-	       update_c_let/4, update_c_letrec/3, update_c_module/5,
-	       update_c_primop/3, update_c_receive/4, update_c_seq/3,
-	       update_c_try/6, update_c_tuple/2, update_c_tuple_skel/2,
-	       update_c_values/2, values_es/1, var_name/1]).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec depth(Tree::cerl) -> integer()
-%%
-%% @doc Returns the length of the longest path in the tree.  A leaf
-%% node has depth zero, the tree representing "<code>{foo,
-%% bar}</code>" has depth one, etc.
-
-depth(T) ->
-    case subtrees(T) of
-	[] ->
-	    0;
-	Gs ->
-	    1 + lists:foldl(fun (G, A) -> erlang:max(depth_1(G), A) end, 0, Gs)
-    end.
-
-depth_1(Ts) ->
-    lists:foldl(fun (T, A) -> erlang:max(depth(T), A) end, 0, Ts).
-
-%% max(X, Y) when X > Y -> X;
-%% max(_, Y) -> Y.
-
-
-%% @spec size(Tree::cerl()) -> integer()
-%%
-%% @doc Returns the number of nodes in <code>Tree</code>.
-
-size(T) ->
-    fold(fun (_, S) -> S + 1 end, 0, T).
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec map(Function, Tree::cerl()) -> cerl()
-%%
-%%	   Function = (cerl()) -> cerl()
-%%	   
-%% @doc Maps a function onto the nodes of a tree. This replaces each
-%% node in the tree by the result of applying the given function on
-%% the original node, bottom-up.
-%%
-%% @see mapfold/3
-
-map(F, T) ->
-    F(map_1(F, T)).
-
-map_1(F, T) ->
-    case type(T) of
- 	literal ->
-	    case concrete(T) of
-		[_ | _] ->
-		    update_c_cons(T, map(F, cons_hd(T)),
-				  map(F, cons_tl(T)));
-		V when tuple_size(V) > 0 ->
-		    update_c_tuple(T, map_list(F, tuple_es(T)));
-		_ ->
-		    T
-	    end;
- 	var ->
- 	    T;
-	values ->
- 	    update_c_values(T, map_list(F, values_es(T)));
-	cons ->
-	    update_c_cons_skel(T, map(F, cons_hd(T)),
-			       map(F, cons_tl(T)));
- 	tuple ->
-	    update_c_tuple_skel(T, map_list(F, tuple_es(T)));
- 	'let' ->
-	    update_c_let(T, map_list(F, let_vars(T)),
-			 map(F, let_arg(T)),
-			 map(F, let_body(T)));
-	seq ->
- 	    update_c_seq(T, map(F, seq_arg(T)),
-			 map(F, seq_body(T)));
- 	apply ->
-	    update_c_apply(T, map(F, apply_op(T)),
-			   map_list(F, apply_args(T)));
- 	call ->
- 	    update_c_call(T, map(F, call_module(T)),
-			  map(F, call_name(T)),
-			  map_list(F, call_args(T)));
- 	primop ->
-	    update_c_primop(T, map(F, primop_name(T)),
-			    map_list(F, primop_args(T)));
- 	'case' ->
- 	    update_c_case(T, map(F, case_arg(T)),
-			  map_list(F, case_clauses(T)));
- 	clause ->
- 	    update_c_clause(T, map_list(F, clause_pats(T)),
-			    map(F, clause_guard(T)),
-			    map(F, clause_body(T)));
- 	alias ->
-	    update_c_alias(T, map(F, alias_var(T)),
-			   map(F, alias_pat(T)));
- 	'fun' ->
-	    update_c_fun(T, map_list(F, fun_vars(T)),
-			 map(F, fun_body(T)));
- 	'receive' ->
-	    update_c_receive(T, map_list(F, receive_clauses(T)),
-			     map(F, receive_timeout(T)),
-			     map(F, receive_action(T)));
- 	'try' ->
- 	    update_c_try(T, map(F, try_arg(T)),
-			 map_list(F, try_vars(T)),
-			 map(F, try_body(T)),
-			 map_list(F, try_evars(T)),
-			 map(F, try_handler(T)));
- 	'catch' ->
-	    update_c_catch(T, map(F, catch_body(T)));
-	binary ->
-	    update_c_binary(T, map_list(F, binary_segments(T)));
-	bitstr ->
-	    update_c_bitstr(T, map(F, bitstr_val(T)),
-			    map(F, bitstr_size(T)),
-			    map(F, bitstr_unit(T)),
-			    map(F, bitstr_type(T)),
-			    map(F, bitstr_flags(T)));
-	letrec ->
-	    update_c_letrec(T, map_pairs(F, letrec_defs(T)),
-			    map(F, letrec_body(T)));
-	module ->
-	    update_c_module(T, map(F, module_name(T)),
-			    map_list(F, module_exports(T)),
-			    map_pairs(F, module_attrs(T)),
-			    map_pairs(F, module_defs(T)))
-    end.
-
-map_list(F, [T | Ts]) ->
-    [map(F, T) | map_list(F, Ts)];
-map_list(_, []) ->
-    [].
-
-map_pairs(F, [{T1, T2} | Ps]) ->
-    [{map(F, T1), map(F, T2)} | map_pairs(F, Ps)];
-map_pairs(_, []) ->
-    [].
-
-
-%% @spec fold(Function, Unit::term(), Tree::cerl()) -> term()
-%%
-%%    Function = (cerl(), term()) -> term()
-%%
-%% @doc Does a fold operation over the nodes of the tree. The result
-%% is the value of <code>Function(X1, Function(X2, ... Function(Xn,
-%% Unit) ... ))</code>, where <code>X1, ..., Xn</code> are the nodes
-%% of <code>Tree</code> in a post-order traversal.
-%%
-%% @see mapfold/3
-
-fold(F, S, T) ->
-    F(T, fold_1(F, S, T)).
-
-fold_1(F, S, T) ->
-    case type(T) of
- 	literal ->
-	    case concrete(T) of
-		[_ | _] ->
-		    fold(F, fold(F, S, cons_hd(T)), cons_tl(T));
-		V when tuple_size(V) > 0 ->
-		    fold_list(F, S, tuple_es(T));
-		_ ->
-		    S
-	    end;
- 	var ->
- 	    S;
-	values ->
- 	    fold_list(F, S, values_es(T));
-	cons ->
-	    fold(F, fold(F, S, cons_hd(T)), cons_tl(T));
-	tuple ->
-	    fold_list(F, S, tuple_es(T));
- 	'let' ->
-	    fold(F, fold(F, fold_list(F, S, let_vars(T)),
-			 let_arg(T)),
-		 let_body(T));
-	seq ->
-	    fold(F, fold(F, S, seq_arg(T)), seq_body(T));
-	apply ->
-	    fold_list(F, fold(F, S, apply_op(T)), apply_args(T));
- 	call ->
-	    fold_list(F, fold(F, fold(F, S, call_module(T)),
-			      call_name(T)),
-		      call_args(T));
- 	primop ->
-	    fold_list(F, fold(F, S, primop_name(T)), primop_args(T));
- 	'case' ->
-	    fold_list(F, fold(F, S, case_arg(T)), case_clauses(T));
- 	clause ->
-	    fold(F, fold(F, fold_list(F, S, clause_pats(T)),
-			 clause_guard(T)),
-		 clause_body(T));
- 	alias ->
-	    fold(F, fold(F, S, alias_var(T)), alias_pat(T));
- 	'fun' ->
-	    fold(F, fold_list(F, S, fun_vars(T)), fun_body(T));
- 	'receive' ->
-	    fold(F, fold(F, fold_list(F, S, receive_clauses(T)),
-			 receive_timeout(T)),
-		 receive_action(T));
- 	'try' ->
-	    fold(F, fold_list(F, fold(F, fold_list(F, fold(F, S, try_arg(T)),
-						   try_vars(T)),
-				      try_body(T)),
-			      try_evars(T)),
-		 try_handler(T));
- 	'catch' ->
-	    fold(F, S, catch_body(T));
-	binary ->
-	    fold_list(F, S, binary_segments(T));
-	bitstr ->
-	    fold(F,
-		 fold(F,
-		      fold(F,
-			   fold(F,
-				fold(F, S, bitstr_val(T)),
-				bitstr_size(T)),
-			   bitstr_unit(T)),
-		      bitstr_type(T)),
-		 bitstr_flags(T));
-	letrec ->
-	    fold(F, fold_pairs(F, S, letrec_defs(T)), letrec_body(T));
-	module ->
-	    fold_pairs(F, 
-		       fold_pairs(F, 
-				  fold_list(F,
-					    fold(F, S, module_name(T)),
-					    module_exports(T)),
-				  module_attrs(T)),
-		       module_defs(T))
-    end.
-
-fold_list(F, S, [T | Ts]) ->
-    fold_list(F, fold(F, S, T), Ts);
-fold_list(_, S, []) ->
-    S.
-
-fold_pairs(F, S, [{T1, T2} | Ps]) ->
-    fold_pairs(F, fold(F, fold(F, S, T1), T2), Ps);
-fold_pairs(_, S, []) ->
-    S.
-
-
-%% @spec mapfold(Function, Initial::term(), Tree::cerl()) ->
-%%           {cerl(), term()}
-%%
-%%    Function = (cerl(), term()) -> {cerl(), term()}
-%%
-%% @doc Does a combined map/fold operation on the nodes of the
-%% tree. This is similar to <code>map/2</code>, but also propagates a
-%% value from each application of <code>Function</code> to the next,
-%% starting with the given value <code>Initial</code>, while doing a
-%% post-order traversal of the tree, much like <code>fold/3</code>.
-%%
-%% @see map/2
-%% @see fold/3
-
-mapfold(F, S0, T) ->
-    case type(T) of
- 	literal ->
-	    case concrete(T) of
-		[_ | _] ->
-		    {T1, S1} = mapfold(F, S0, cons_hd(T)),
-		    {T2, S2} = mapfold(F, S1, cons_tl(T)),
-		    F(update_c_cons(T, T1, T2), S2);
-		V when tuple_size(V) > 0 ->
-		    {Ts, S1} = mapfold_list(F, S0, tuple_es(T)),
-		    F(update_c_tuple(T, Ts), S1);
-		_ ->
-		    F(T, S0)
-	    end;
- 	var ->
- 	    F(T, S0);
-	values ->
-	    {Ts, S1} = mapfold_list(F, S0, values_es(T)),
- 	    F(update_c_values(T, Ts), S1);
-	cons ->
-	    {T1, S1} = mapfold(F, S0, cons_hd(T)),
-	    {T2, S2} = mapfold(F, S1, cons_tl(T)),
-	    F(update_c_cons_skel(T, T1, T2), S2);
- 	tuple ->
-	    {Ts, S1} = mapfold_list(F, S0, tuple_es(T)),
-	    F(update_c_tuple_skel(T, Ts), S1);
- 	'let' ->
-	    {Vs, S1} = mapfold_list(F, S0, let_vars(T)),
-	    {A, S2} = mapfold(F, S1, let_arg(T)),
-	    {B, S3} = mapfold(F, S2, let_body(T)),
-	    F(update_c_let(T, Vs, A, B), S3);
-	seq ->
-	    {A, S1} = mapfold(F, S0, seq_arg(T)),
-	    {B, S2} = mapfold(F, S1, seq_body(T)),
- 	    F(update_c_seq(T, A, B), S2);
- 	apply ->
-	    {E, S1} = mapfold(F, S0, apply_op(T)),
-	    {As, S2} = mapfold_list(F, S1, apply_args(T)),
-	    F(update_c_apply(T, E, As), S2);
- 	call ->
-	    {M, S1} = mapfold(F, S0, call_module(T)),
-	    {N, S2} = mapfold(F, S1, call_name(T)),
-	    {As, S3} = mapfold_list(F, S2, call_args(T)),
- 	    F(update_c_call(T, M, N, As), S3);
- 	primop ->
-	    {N, S1} = mapfold(F, S0, primop_name(T)),
-	    {As, S2} = mapfold_list(F, S1, primop_args(T)),
-	    F(update_c_primop(T, N, As), S2);
- 	'case' ->
-	    {A, S1} = mapfold(F, S0, case_arg(T)),
-	    {Cs, S2} = mapfold_list(F, S1, case_clauses(T)),
- 	    F(update_c_case(T, A, Cs), S2);
- 	clause ->
-	    {Ps, S1} = mapfold_list(F, S0, clause_pats(T)),
-	    {G, S2} = mapfold(F, S1, clause_guard(T)),
-	    {B, S3} = mapfold(F, S2, clause_body(T)),
-	    F(update_c_clause(T, Ps, G, B), S3);
- 	alias ->
-	    {V, S1} = mapfold(F, S0, alias_var(T)),
-	    {P, S2} = mapfold(F, S1, alias_pat(T)),
-	    F(update_c_alias(T, V, P), S2);
- 	'fun' ->
-	    {Vs, S1} = mapfold_list(F, S0, fun_vars(T)),
-	    {B, S2} = mapfold(F, S1, fun_body(T)),
-	    F(update_c_fun(T, Vs, B), S2);
- 	'receive' ->
-	    {Cs, S1} = mapfold_list(F, S0, receive_clauses(T)),
-	    {E, S2} = mapfold(F, S1, receive_timeout(T)),
-	    {A, S3} = mapfold(F, S2, receive_action(T)),
-	    F(update_c_receive(T, Cs, E, A), S3);
- 	'try' ->
-	    {E, S1} = mapfold(F, S0, try_arg(T)),
-	    {Vs, S2} = mapfold_list(F, S1, try_vars(T)),
-	    {B, S3} = mapfold(F, S2, try_body(T)),
-	    {Evs, S4} = mapfold_list(F, S3, try_evars(T)),
-	    {H, S5} = mapfold(F, S4, try_handler(T)),
-	    F(update_c_try(T, E, Vs, B, Evs, H), S5);
- 	'catch' ->
-	    {B, S1} = mapfold(F, S0, catch_body(T)),
-	    F(update_c_catch(T, B), S1);
-	binary ->
-	    {Ds, S1} = mapfold_list(F, S0, binary_segments(T)),
-	    F(update_c_binary(T, Ds), S1);
-	bitstr ->
-	    {Val, S1} = mapfold(F, S0, bitstr_val(T)),
-	    {Size, S2} = mapfold(F, S1, bitstr_size(T)),
-	    {Unit, S3} = mapfold(F, S2, bitstr_unit(T)),
-	    {Type, S4} = mapfold(F, S3, bitstr_type(T)),
-	    {Flags, S5} = mapfold(F, S4, bitstr_flags(T)),
-	    F(update_c_bitstr(T, Val, Size, Unit, Type, Flags), S5);
-	letrec ->
-	    {Ds, S1} = mapfold_pairs(F, S0, letrec_defs(T)),
-	    {B, S2} = mapfold(F, S1, letrec_body(T)),
-	    F(update_c_letrec(T, Ds, B), S2);
-	module ->
-	    {N, S1} = mapfold(F, S0, module_name(T)),
-	    {Es, S2} = mapfold_list(F, S1, module_exports(T)),
-	    {As, S3} = mapfold_pairs(F, S2, module_attrs(T)),
-	    {Ds, S4} = mapfold_pairs(F, S3, module_defs(T)),
-	    F(update_c_module(T, N, Es, As, Ds), S4)
-    end.
-
-mapfold_list(F, S0, [T | Ts]) ->
-    {T1, S1} = mapfold(F, S0, T),
-    {Ts1, S2} = mapfold_list(F, S1, Ts),
-    {[T1 | Ts1], S2};
-mapfold_list(_, S, []) ->
-    {[], S}.
-
-mapfold_pairs(F, S0, [{T1, T2} | Ps]) ->
-    {T3, S1} = mapfold(F, S0, T1),
-    {T4, S2} = mapfold(F, S1, T2),
-    {Ps1, S3} = mapfold_pairs(F, S2, Ps),
-    {[{T3, T4} | Ps1], S3};
-mapfold_pairs(_, S, []) ->
-    {[], S}.
-
-
-%% ---------------------------------------------------------------------
-
-%% @spec variables(Tree::cerl()) -> [var_name()]
-%%
-%%	    var_name() = integer() | atom() | {atom(), integer()}
-%%
-%% @doc Returns an ordered-set list of the names of all variables in
-%% the syntax tree. (This includes function name variables.) An
-%% exception is thrown if <code>Tree</code> does not represent a
-%% well-formed Core Erlang syntax tree.
-%%
-%% @see free_variables/1
-
-variables(T) ->
-    variables(T, false).
-
-
-%% @spec free_variables(Tree::cerl()) -> [var_name()]
-%%
-%% @doc Like <code>variables/1</code>, but only includes variables
-%% that are free in the tree.
-%%
-%% @see variables/1
-
-free_variables(T) ->
-    variables(T, true).
-
-
-%% This is not exported
-
-variables(T, S) ->
-    case type(T) of
-	literal ->
-	    [];
-	var ->
-	    [var_name(T)];
-	values ->
-	    vars_in_list(values_es(T), S);
-	cons ->
-	    ordsets:union(variables(cons_hd(T), S),
-			  variables(cons_tl(T), S));
-	tuple ->
-	    vars_in_list(tuple_es(T), S);
-	'let' ->
-	    Vs = variables(let_body(T), S),
-	    Vs1 = var_list_names(let_vars(T)),
-	    Vs2 = case S of
-		      true ->
-			  ordsets:subtract(Vs, Vs1);
-		      false ->
-			  ordsets:union(Vs, Vs1)
-		  end,
-	    ordsets:union(variables(let_arg(T), S), Vs2);
-	seq ->
-	    ordsets:union(variables(seq_arg(T), S),
-			  variables(seq_body(T), S));
-	apply ->
-	    ordsets:union(
-	      variables(apply_op(T), S),
-	      vars_in_list(apply_args(T), S));
-	call ->
-	    ordsets:union(variables(call_module(T), S),
-			  ordsets:union(
-			    variables(call_name(T), S),
-			    vars_in_list(call_args(T), S)));
-	primop ->
-	    vars_in_list(primop_args(T), S);
-	'case' ->
-	    ordsets:union(variables(case_arg(T), S),
-			  vars_in_list(case_clauses(T), S));
-	clause ->
-	    Vs = ordsets:union(variables(clause_guard(T), S),
-			       variables(clause_body(T), S)),
-	    Vs1 = vars_in_list(clause_pats(T), S),
-	    case S of
-		true ->
-		    ordsets:subtract(Vs, Vs1);
-		false ->
-		    ordsets:union(Vs, Vs1)
-	    end;
-	alias ->
-	    ordsets:add_element(var_name(alias_var(T)),
-				variables(alias_pat(T)));
-	'fun' ->
-	    Vs = variables(fun_body(T), S),
-	    Vs1 = var_list_names(fun_vars(T)),
-	    case S of
-		true ->
-		    ordsets:subtract(Vs, Vs1);
-		false ->
-		    ordsets:union(Vs, Vs1)
-	    end;
-	'receive' ->
-	    ordsets:union(
-	      vars_in_list(receive_clauses(T), S),
-	      ordsets:union(variables(receive_timeout(T), S),
-			    variables(receive_action(T), S)));
-	'try' ->
-	    Vs = variables(try_body(T), S),
-	    Vs1 = var_list_names(try_vars(T)),
-	    Vs2 = case S of
-		      true ->
-			  ordsets:subtract(Vs, Vs1);
-		      false ->
-			  ordsets:union(Vs, Vs1)
-		  end,
-	    Vs3 = variables(try_handler(T), S),
-	    Vs4 = var_list_names(try_evars(T)),
-	    Vs5 = case S of
-		      true ->
-			  ordsets:subtract(Vs3, Vs4);
-		      false ->
-			  ordsets:union(Vs3, Vs4)
-		  end,
-	    ordsets:union(variables(try_arg(T), S),
-			  ordsets:union(Vs2, Vs5));
-	'catch' ->
-	    variables(catch_body(T), S);
-	binary ->
-	    vars_in_list(binary_segments(T), S);
-	bitstr ->
-	    ordsets:union(variables(bitstr_val(T), S),
-			  variables(bitstr_size(T), S));
-	letrec ->
-	    Vs = vars_in_defs(letrec_defs(T), S),
-	    Vs1 = ordsets:union(variables(letrec_body(T), S), Vs),
-	    Vs2 = var_list_names(letrec_vars(T)),
-	    case S of
-		true ->
-		    ordsets:subtract(Vs1, Vs2);
-		false ->
-		    ordsets:union(Vs1, Vs2)
-	    end;
-	module ->
-	    Vs = vars_in_defs(module_defs(T), S),
-	    Vs1 = ordsets:union(vars_in_list(module_exports(T), S), Vs),
-	    Vs2 = var_list_names(module_vars(T)),
-	    case S of
-		true ->
-		    ordsets:subtract(Vs1, Vs2);
-		false ->
-		    ordsets:union(Vs1, Vs2)
-	    end
-    end.
-
-vars_in_list(Ts, S) ->
-    vars_in_list(Ts, S, []).
-
-vars_in_list([T | Ts], S, A) ->
-    vars_in_list(Ts, S, ordsets:union(variables(T, S), A));
-vars_in_list([], _, A) ->
-    A.
-
-%% Note that this function only visits the right-hand side of function
-%% definitions.
-
-vars_in_defs(Ds, S) ->
-    vars_in_defs(Ds, S, []).
-
-vars_in_defs([{_, F} | Ds], S, A) ->
-    vars_in_defs(Ds, S, ordsets:union(variables(F, S), A));
-vars_in_defs([], _, A) ->
-    A.
-
-%% This amounts to insertion sort. Since the lists are generally short,
-%% it is hardly worthwhile to use an asymptotically better sort.
-
-var_list_names(Vs) ->
-    var_list_names(Vs, []).
-
-var_list_names([V | Vs], A) ->
-    var_list_names(Vs, ordsets:add_element(var_name(V), A));
-var_list_names([], A) ->
-    A.
-
-
-%% ---------------------------------------------------------------------
-
-%% label(Tree::cerl()) -> {cerl(), integer()}
-%%
-%% @equiv label(Tree, 0)
-
-label(T) ->
-    label(T, 0).
-
-%% @spec label(Tree::cerl(), N::integer()) -> {cerl(), integer()}
-%%
-%% @doc Labels each expression in the tree. A term <code>{label,
-%% L}</code> is prefixed to the annotation list of each expression node,
-%% where L is a unique number for every node, except for variables (and
-%% function name variables) which get the same label if they represent
-%% the same variable. Constant literal nodes are not labeled.
-%%
-%% <p>The returned value is a tuple <code>{NewTree, Max}</code>, where
-%% <code>NewTree</code> is the labeled tree and <code>Max</code> is 1
-%% plus the largest label value used. All previous annotation terms on
-%% the form <code>{label, X}</code> are deleted.</p>
-%%
-%% <p>The values of L used in the tree is a dense range from
-%% <code>N</code> to <code>Max - 1</code>, where <code>N =&lt; Max
-%% =&lt; N + size(Tree)</code>. Note that it is possible that no
-%% labels are used at all, i.e., <code>N = Max</code>.</p>
-%%
-%% <p>Note: All instances of free variables will be given distinct
-%% labels.</p>
-%%
-%% @see label/1
-%% @see size/1
-
-label(T, N) ->
-    label(T, N, dict:new()).
-
-label(T, N, Env) ->
-    case type(T) of
- 	literal ->
-	    %% Constant literals are not labeled.
-	    {T, N};
-	var ->
-	    case dict:find(var_name(T), Env) of
-		{ok, L} ->
-		    {As, _} = label_ann(T, L),
-		    N1 = N;
-		error ->
-		    {As, N1} = label_ann(T, N)
-	    end,
-	    {set_ann(T, As), N1};
-	values ->
-	    {Ts, N1} = label_list(values_es(T), N, Env),
-	    {As, N2} = label_ann(T, N1),
-	    {ann_c_values(As, Ts), N2};
-	cons ->
-	    {T1, N1} = label(cons_hd(T), N, Env),
-	    {T2, N2} = label(cons_tl(T), N1, Env),
-	    {As, N3} = label_ann(T, N2),
-	    {ann_c_cons_skel(As, T1, T2), N3};
- 	tuple ->
-	    {Ts, N1} = label_list(tuple_es(T), N, Env),
-	    {As, N2} = label_ann(T, N1),
-	    {ann_c_tuple_skel(As, Ts), N2};
- 	'let' ->
-	    {A, N1} = label(let_arg(T), N, Env),
-	    {Vs, N2, Env1} = label_vars(let_vars(T), N1, Env),
-	    {B, N3} = label(let_body(T), N2, Env1),
-	    {As, N4} = label_ann(T, N3),
-	    {ann_c_let(As, Vs, A, B), N4};
-	seq ->
-	    {A, N1} = label(seq_arg(T), N, Env),
-	    {B, N2} = label(seq_body(T), N1, Env),
-	    {As, N3} = label_ann(T, N2),
- 	    {ann_c_seq(As, A, B), N3};
- 	apply ->
-	    {E, N1} = label(apply_op(T), N, Env),
-	    {Es, N2} = label_list(apply_args(T), N1, Env),
-	    {As, N3} = label_ann(T, N2),
-	    {ann_c_apply(As, E, Es), N3};
- 	call ->
-	    {M, N1} = label(call_module(T), N, Env),
-	    {F, N2} = label(call_name(T), N1, Env),
-	    {Es, N3} = label_list(call_args(T), N2, Env),
-	    {As, N4} = label_ann(T, N3),
- 	    {ann_c_call(As, M, F, Es), N4};
- 	primop ->
-	    {F, N1} = label(primop_name(T), N, Env),
-	    {Es, N2} = label_list(primop_args(T), N1, Env),
-	    {As, N3} = label_ann(T, N2),
-	    {ann_c_primop(As, F, Es), N3};
- 	'case' ->
-	    {A, N1} = label(case_arg(T), N, Env),
-	    {Cs, N2} = label_list(case_clauses(T), N1, Env),
-	    {As, N3} = label_ann(T, N2),
- 	    {ann_c_case(As, A, Cs), N3};
- 	clause ->
-	    {_, N1, Env1} = label_vars(clause_vars(T), N, Env),
-	    {Ps, N2} = label_list(clause_pats(T), N1, Env1),
-	    {G, N3} = label(clause_guard(T), N2, Env1),
-	    {B, N4} = label(clause_body(T), N3, Env1),
-	    {As, N5} = label_ann(T, N4),
-	    {ann_c_clause(As, Ps, G, B), N5};
- 	alias ->
-	    {V, N1} = label(alias_var(T), N, Env),
-	    {P, N2} = label(alias_pat(T), N1, Env),
-	    {As, N3} = label_ann(T, N2),
-	    {ann_c_alias(As, V, P), N3};
- 	'fun' ->
-	    {Vs, N1, Env1} = label_vars(fun_vars(T), N, Env),
-	    {B, N2} = label(fun_body(T), N1, Env1),
-	    {As, N3} = label_ann(T, N2),
-	    {ann_c_fun(As, Vs, B), N3};
- 	'receive' ->
-	    {Cs, N1} = label_list(receive_clauses(T), N, Env),
-	    {E, N2} = label(receive_timeout(T), N1, Env),
-	    {A, N3} = label(receive_action(T), N2, Env),
-	    {As, N4} = label_ann(T, N3),
-	    {ann_c_receive(As, Cs, E, A), N4};
- 	'try' ->
-	    {E, N1} = label(try_arg(T), N, Env),
-	    {Vs, N2, Env1} = label_vars(try_vars(T), N1, Env),
-	    {B, N3} = label(try_body(T), N2, Env1),
-	    {Evs, N4, Env2} = label_vars(try_evars(T), N3, Env),
-	    {H, N5} = label(try_handler(T), N4, Env2),
-	    {As, N6} = label_ann(T, N5),
-	    {ann_c_try(As, E, Vs, B, Evs, H), N6};
- 	'catch' ->
-	    {B, N1} = label(catch_body(T), N, Env),
-	    {As, N2} = label_ann(T, N1),
-	    {ann_c_catch(As, B), N2};
-	binary ->
-	    {Ds, N1} = label_list(binary_segments(T), N, Env),
-	    {As, N2} = label_ann(T, N1),
-	    {ann_c_binary(As, Ds), N2};
-	bitstr ->
-	    {Val, N1} = label(bitstr_val(T), N, Env),
-	    {Size, N2} = label(bitstr_size(T), N1, Env),
-	    {Unit, N3} = label(bitstr_unit(T), N2, Env),
-	    {Type, N4} = label(bitstr_type(T), N3, Env),
-	    {Flags, N5} = label(bitstr_flags(T), N4, Env),
-	    {As, N6} = label_ann(T, N5),
-	    {ann_c_bitstr(As, Val, Size, Unit, Type, Flags), N6};
-	letrec ->
-	    {_, N1, Env1} = label_vars(letrec_vars(T), N, Env),
-	    {Ds, N2} = label_defs(letrec_defs(T), N1, Env1),
-	    {B, N3} = label(letrec_body(T), N2, Env1),
-	    {As, N4} = label_ann(T, N3),
-	    {ann_c_letrec(As, Ds, B), N4};
-	module ->
-	    %% The module name is not labeled.
-	    {_, N1, Env1} = label_vars(module_vars(T), N, Env),
-	    {Ts, N2} = label_defs(module_attrs(T), N1, Env1),
-	    {Ds, N3} = label_defs(module_defs(T), N2, Env1),
-	    {Es, N4} = label_list(module_exports(T), N3, Env1),
-	    {As, N5} = label_ann(T, N4),
-	    {ann_c_module(As, module_name(T), Es, Ts, Ds), N5}
-    end.
-
-label_list([T | Ts], N, Env) ->
-    {T1, N1} = label(T, N, Env),
-    {Ts1, N2} = label_list(Ts, N1, Env),
-    {[T1 | Ts1], N2};
-label_list([], N, _Env) ->
-    {[], N}.
-
-label_vars([T | Ts], N, Env) ->
-    Env1 = dict:store(var_name(T), N, Env),
-    {As, N1} = label_ann(T, N),
-    T1 = set_ann(T, As),
-    {Ts1, N2, Env2} = label_vars(Ts, N1, Env1),
-    {[T1 | Ts1], N2, Env2};
-label_vars([], N, Env) ->
-    {[], N, Env}.
-
-label_defs([{F, T} | Ds], N, Env) ->
-    {F1, N1} = label(F, N, Env),
-    {T1, N2} = label(T, N1, Env),
-    {Ds1, N3} = label_defs(Ds, N2, Env),
-    {[{F1, T1} | Ds1], N3};
-label_defs([], N, _Env) ->
-    {[], N}.
-
-label_ann(T, N) ->
-    {[{label, N} | filter_labels(get_ann(T))], N + 1}.
-
-filter_labels([{label, _} | As]) ->
-    filter_labels(As);
-filter_labels([A | As]) ->
-    [A | filter_labels(As)];
-filter_labels([]) ->
-    [].
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/compile.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/compile.erl
deleted file mode 100644
index 4542bf9eb9..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/compile.erl
+++ /dev/null
@@ -1,1109 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: compile.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
-%% Purpose: Run the Erlang compiler.
-
--module(compile).
--include("erl_compile.hrl").
--include("core_parse.hrl").
-
-%% High-level interface.
--export([file/1,file/2,format_error/1,iofile/1]).
--export([forms/1,forms/2]).
--export([output_generated/1]).
--export([options/0]).
-
-%% Erlc interface.
--export([compile/3,compile_beam/3,compile_asm/3,compile_core/3]).
-
-
--import(lists, [member/2,reverse/1,keysearch/3,last/1,
-		map/2,flatmap/2,foreach/2,foldr/3,any/2,filter/2]).
-
-%% file(FileName)
-%% file(FileName, Options)
-%%  Compile the module in file FileName.
-
--define(DEFAULT_OPTIONS, [verbose,report_errors,report_warnings]).
-
--define(pass(P), {P,fun P/1}).
-
-file(File) -> file(File, ?DEFAULT_OPTIONS).
-
-file(File, Opts) when list(Opts) ->
-    do_compile({file,File}, Opts++env_default_opts());
-file(File, Opt) ->
-    file(File, [Opt|?DEFAULT_OPTIONS]).
-
-forms(File) -> forms(File, ?DEFAULT_OPTIONS).
-
-forms(Forms, Opts) when list(Opts) ->
-    do_compile({forms,Forms}, [binary|Opts++env_default_opts()]);
-forms(Forms, Opts) when atom(Opts) ->
-    forms(Forms, [Opts|?DEFAULT_OPTIONS]).
-
-env_default_opts() ->
-    Key = "ERL_COMPILER_OPTIONS",
-    case os:getenv(Key) of
-	false -> [];
-	Str when list(Str) ->
-	    case erl_scan:string(Str) of
-		{ok,Tokens,_} ->
-		    case erl_parse:parse_term(Tokens ++ [{dot, 1}]) of
-			{ok,List} when list(List) -> List;
-			{ok,Term} -> [Term];
-			{error,_Reason} ->
-			    io:format("Ignoring bad term in ~s\n", [Key]),
-			    []
-		    end;
-		{error, {_,_,_Reason}, _} ->
-		    io:format("Ignoring bad term in ~s\n", [Key]),
-		    []
-	    end
-    end.
-	    
-do_compile(Input, Opts0) ->
-    Opts = expand_opts(Opts0),
-    Self = self(),
-    Serv = spawn_link(fun() -> internal(Self, Input, Opts) end),
-    receive
-	{Serv,Rep} -> Rep
-    end.
-
-%% Given a list of compilation options, returns true if compile:file/2
-%% would have generated a Beam file, false otherwise (if only a binary or a
-%% listing file would have been generated).
-
-output_generated(Opts) ->
-    any(fun ({save_binary,_F}) -> true;
-	    (_Other) -> false
-	end, passes(file, expand_opts(Opts))).
-
-expand_opts(Opts) ->
-    foldr(fun expand_opt/2, [], Opts).
-
-expand_opt(basic_validation, Os) ->
-    [no_code_generation,to_pp,binary|Os];
-expand_opt(strong_validation, Os) ->
-    [no_code_generation,to_kernel,binary|Os];
-expand_opt(report, Os) ->
-    [report_errors,report_warnings|Os];
-expand_opt(return, Os) ->
-    [return_errors,return_warnings|Os];
-expand_opt(r7, Os) ->
-    [no_float_opt,no_new_funs,no_new_binaries,no_new_apply|Os];
-expand_opt(O, Os) -> [O|Os].
-
-filter_opts(Opts0) ->
-    %% Native code generation is not supported if no_new_funs is given.
-    case member(no_new_funs, Opts0) of
-	false -> Opts0;
-	true -> Opts0 -- [native]
-    end.
-
-%% format_error(ErrorDescriptor) -> string()
-
-format_error(no_native_support) ->
-    "this system is not configured for native-code compilation.";
-format_error({native, E}) ->
-    io_lib:fwrite("native-code compilation failed with reason: ~P.",
-		  [E, 25]);
-format_error({native_crash, E}) ->
-    io_lib:fwrite("native-code compilation crashed with reason: ~P.",
-		  [E, 25]);
-format_error({open,E}) ->
-    io_lib:format("open error '~s'", [file:format_error(E)]);
-format_error({epp,E}) ->
-    epp:format_error(E);
-format_error(write_error) ->
-    "error writing file";
-format_error({rename,S}) ->
-    io_lib:format("error renaming ~s", [S]);
-format_error({parse_transform,M,R}) ->
-    io_lib:format("error in parse transform '~s': ~p", [M, R]);
-format_error({core_transform,M,R}) ->
-    io_lib:format("error in core transform '~s': ~p", [M, R]);
-format_error({crash,Pass,Reason}) ->
-    io_lib:format("internal error in ~p;\ncrash reason: ~p", [Pass,Reason]);
-format_error({bad_return,Pass,Reason}) ->
-    io_lib:format("internal error in ~p;\nbad return value: ~p", [Pass,Reason]).
-
-%% The compile state record.
--record(compile, {filename="",
-		  dir="",
-		  base="",
-		  ifile="",
-		  ofile="",
-		  module=[],
-		  code=[],
-		  core_code=[],
-		  abstract_code=[],		%Abstract code for debugger.
-		  options=[],
-		  errors=[],
-		  warnings=[]}).
-
-internal(Master, Input, Opts) ->
-    Master ! {self(),
-	      case catch internal(Input, Opts) of
-		  {'EXIT', Reason} ->
-		      {error, Reason};
-		  Other ->
-		      Other
-	      end}.
-
-internal({forms,Forms}, Opts) ->
-    Ps = passes(forms, Opts),
-    internal_comp(Ps, "", "", #compile{code=Forms,options=Opts});
-internal({file,File}, Opts) ->
-    Ps = passes(file, Opts),
-    Compile = #compile{options=Opts},
-    case member(from_core, Opts) of
-	true -> internal_comp(Ps, File, ".core", Compile);
-	false ->
-	    case member(from_beam, Opts) of
-		true ->
-		    internal_comp(Ps, File, ".beam", Compile);
-		false ->
-		    case member(from_asm, Opts) orelse member(asm, Opts) of
-			true ->
-			    internal_comp(Ps, File, ".S", Compile);
-			false ->
-			    internal_comp(Ps, File, ".erl", Compile)
-		    end
-	    end
-    end.
-
-internal_comp(Passes, File, Suffix, St0) ->
-    Dir = filename:dirname(File),
-    Base = filename:basename(File, Suffix),
-    St1 = St0#compile{filename=File, dir=Dir, base=Base,
-		      ifile=erlfile(Dir, Base, Suffix),
-		      ofile=objfile(Base, St0)},
-    Run = case member(time, St1#compile.options) of
-	      true  ->
-		  io:format("Compiling ~p\n", [File]),
-		  fun run_tc/2;
-	      false -> fun({_Name,Fun}, St) -> catch Fun(St) end
-	  end,
-    case fold_comp(Passes, Run, St1) of
-	{ok,St2} -> comp_ret_ok(St2);
-	{error,St2} -> comp_ret_err(St2)
-    end.
-
-fold_comp([{Name,Test,Pass}|Ps], Run, St) ->
-    case Test(St) of
-	false ->				%Pass is not needed.
-	    fold_comp(Ps, Run, St);
-	true ->					%Run pass in the usual way.
-	    fold_comp([{Name,Pass}|Ps], Run, St)
-    end;
-fold_comp([{Name,Pass}|Ps], Run, St0) ->
-    case Run({Name,Pass}, St0) of
-	{ok,St1} -> fold_comp(Ps, Run, St1);
-	{error,St1} -> {error,St1};
-	{'EXIT',Reason} ->
-	    Es = [{St0#compile.ifile,[{none,?MODULE,{crash,Name,Reason}}]}],
-	    {error,St0#compile{errors=St0#compile.errors ++ Es}};
-	Other ->
-	    Es = [{St0#compile.ifile,[{none,?MODULE,{bad_return,Name,Other}}]}],
-	    {error,St0#compile{errors=St0#compile.errors ++ Es}}
-    end;
-fold_comp([], _Run, St) -> {ok,St}.
-
-os_process_size() ->
-    case os:type() of
-	{unix, sunos} ->
-	    Size = os:cmd("ps -o vsz -p " ++ os:getpid() ++ " | tail -1"),
-	    list_to_integer(lib:nonl(Size));
-	_ ->
-	    0
-    end.	    
-
-run_tc({Name,Fun}, St) ->
-    Before0 = statistics(runtime),
-    Val = (catch Fun(St)),
-    After0 = statistics(runtime),
-    {Before_c, _} = Before0,
-    {After_c, _} = After0,
-    io:format(" ~-30s: ~10.3f s (~w k)\n",
-	      [Name, (After_c-Before_c) / 1000, os_process_size()]),
-    Val.
-
-comp_ret_ok(#compile{code=Code,warnings=Warn,module=Mod,options=Opts}=St) ->
-    report_warnings(St),
-    Ret1 = case member(binary, Opts) andalso not member(no_code_generation, Opts) of
-	       true -> [Code];
-	       false -> []
-	   end,
-    Ret2 = case member(return_warnings, Opts) of
-	       true -> Ret1 ++ [Warn];
-	       false -> Ret1
-	   end,
-    list_to_tuple([ok,Mod|Ret2]).
-
-comp_ret_err(St) ->
-    report_errors(St),
-    report_warnings(St),
-    case member(return_errors, St#compile.options) of
-	true -> {error,St#compile.errors,St#compile.warnings};
-	false -> error
-    end.
-
-%% passes(form|file, [Option]) -> [{Name,PassFun}]
-%%  Figure out which passes that need to be run.
-
-passes(forms, Opts) ->
-    select_passes(standard_passes(), Opts);
-passes(file, Opts) ->
-    case member(from_beam, Opts) of
-	true ->
-	    Ps = [?pass(read_beam_file)|binary_passes()],
-	    select_passes(Ps, Opts);
-	false ->
-	    Ps = case member(from_asm, Opts) orelse member(asm, Opts) of
-		     true ->
-			 [?pass(beam_consult_asm)|asm_passes()];
-		     false ->
-			 case member(from_core, Opts) of
-			     true ->
-				 [?pass(parse_core)|core_passes()];
-			     false ->
-				 [?pass(parse_module)|standard_passes()]
-			 end
-		 end,
-	    Fs = select_passes(Ps, Opts),
-    
-	    %% If the last pass saves the resulting binary to a file,
-	    %% insert a first pass to remove the file.
-	    case last(Fs)  of
-		{save_binary,_Fun} -> [?pass(remove_file)|Fs];
-		_Other -> Fs
-	    end
-    end.
-
-%% select_passes([Command], Opts) ->  [{Name,Function}]
-%%  Interpret the lists of commands to return a pure list of passes.
-%%
-%%  Command can be one of:
-%%
-%%    {pass,Mod}	Will be expanded to a call to the external
-%%			function Mod:module(Code, Options).  This
-%%			function must transform the code and return
-%%			{ok,NewCode} or {error,Term}.
-%%			Example: {pass,beam_codegen}
-%%
-%%    {Name,Fun}	Name is an atom giving the name of the pass.
-%%    			Fun is an 'fun' taking one argument: a compile record.
-%%			The fun should return {ok,NewCompileRecord} or
-%%			{error,NewCompileRecord}.
-%%			Note: ?pass(Name) is equvivalent to {Name,fun Name/1}.
-%%			Example: ?pass(parse_module)
-%%
-%%    {Name,Test,Fun}	Like {Name,Fun} above, but the pass will be run
-%%			(and listed by the `time' option) only if Test(St)
-%%			returns true.
-%%
-%%    {src_listing,Ext}	Produces an Erlang source listing with the
-%%			the file extension Ext.  (Ext should not contain
-%%			a period.)  No more passes will be run.
-%%
-%%    {listing,Ext}	Produce an listing of the terms in the internal
-%%			representation.  The extension of the listing
-%%			file will be Ext.  (Ext should not contain
-%%			a period.)   No more passes will be run.
-%%
-%%    {done,Ext}        End compilation at this point. Produce a listing
-%%                      as with {listing,Ext}, unless 'binary' is
-%%                      specified, in which case the current
-%%                      representation of the code is returned without
-%%                      creating an output file.
-%%
-%%    {iff,Flag,Cmd}	If the given Flag is given in the option list,
-%%			Cmd will be interpreted as a command.
-%%			Otherwise, Cmd will be ignored.
-%%			Example: {iff,dcg,{listing,"codegen}}
-%%
-%%    {unless,Flag,Cmd}	If the given Flag is NOT given in the option list,
-%%			Cmd will be interpreted as a command.
-%%			Otherwise, Cmd will be ignored.
-%%			Example: {unless,no_kernopt,{pass,sys_kernopt}}
-%%
-
-select_passes([{pass,Mod}|Ps], Opts) ->
-    F = fun(St) ->
-		case catch Mod:module(St#compile.code, St#compile.options) of
-		    {ok,Code} ->
-			{ok,St#compile{code=Code}};
-		    {error,Es} ->
-			{error,St#compile{errors=St#compile.errors ++ Es}}
-		end
-	end,
-    [{Mod,F}|select_passes(Ps, Opts)];
-select_passes([{src_listing,Ext}|_], _Opts) ->
-    [{listing,fun (St) -> src_listing(Ext, St) end}];
-select_passes([{listing,Ext}|_], _Opts) ->
-    [{listing,fun (St) -> listing(Ext, St) end}];
-select_passes([{done,Ext}|_], Opts) ->
-    select_passes([{unless,binary,{listing,Ext}}], Opts);
-select_passes([{iff,Flag,Pass}|Ps], Opts) ->
-    select_cond(Flag, true, Pass, Ps, Opts);
-select_passes([{unless,Flag,Pass}|Ps], Opts) ->
-    select_cond(Flag, false, Pass, Ps, Opts);
-select_passes([{_,Fun}=P|Ps], Opts) when is_function(Fun) ->
-    [P|select_passes(Ps, Opts)];
-select_passes([{_,Test,Fun}=P|Ps], Opts) when is_function(Test),
-					      is_function(Fun) ->
-    [P|select_passes(Ps, Opts)];
-select_passes([], _Opts) ->
-    [];
-select_passes([List|Ps], Opts) when is_list(List) ->
-    case select_passes(List, Opts) of
-	[] -> select_passes(Ps, Opts);
-	Nested ->
-	    case last(Nested) of
-		{listing,_Fun} -> Nested;
-		_Other         -> Nested ++ select_passes(Ps, Opts)
-	    end
-    end.
-
-select_cond(Flag, ShouldBe, Pass, Ps, Opts) ->
-    ShouldNotBe = not ShouldBe,
-    case member(Flag, Opts) of 
-	ShouldBe    -> select_passes([Pass|Ps], Opts);
-	ShouldNotBe -> select_passes(Ps, Opts)
-    end.
-
-%% The standard passes (almost) always run.
-
-standard_passes() ->
-    [?pass(transform_module),
-     {iff,'dpp',{listing,"pp"}},
-     ?pass(lint_module),
-     {iff,'P',{src_listing,"P"}},
-     {iff,'to_pp',{done,"P"}},
-
-     {iff,'dabstr',{listing,"abstr"}},
-     {iff,debug_info,?pass(save_abstract_code)},
-
-     ?pass(expand_module),
-     {iff,'dexp',{listing,"expand"}},
-     {iff,'E',{src_listing,"E"}},
-     {iff,'to_exp',{done,"E"}},
-
-     %% Conversion to Core Erlang.
-     ?pass(core_module),
-     {iff,'dcore',{listing,"core"}},
-     {iff,'to_core0',{done,"core"}}
-     | core_passes()].
-
-core_passes() ->
-    %% Optimization and transforms of Core Erlang code.
-    [{unless,no_copt,
-      [{core_old_inliner,fun test_old_inliner/1,fun core_old_inliner/1},
-       ?pass(core_fold_module),
-       {core_inline_module,fun test_core_inliner/1,fun core_inline_module/1},
-       {core_fold_after_inline,fun test_core_inliner/1,fun core_fold_module/1},
-       ?pass(core_transforms)]},
-     {iff,dcopt,{listing,"copt"}},
-     {iff,'to_core',{done,"core"}}
-     | kernel_passes()].
-
-kernel_passes() ->
-    %% Destructive setelement/3 optimization and core lint.
-    [?pass(core_dsetel_module),
-     {iff,clint,?pass(core_lint_module)},
-     {iff,core,?pass(save_core_code)},
-     
-     %% Kernel Erlang and code generation.
-     ?pass(kernel_module),
-     {iff,dkern,{listing,"kernel"}},
-     {iff,'to_kernel',{done,"kernel"}},
-     {pass,v3_life},
-     {iff,dlife,{listing,"life"}},
-     {pass,v3_codegen},
-     {iff,dcg,{listing,"codegen"}}
-     | asm_passes()].
-
-asm_passes() ->
-    %% Assembly level optimisations.
-    [{unless,no_postopt,
-      [{pass,beam_block},
-       {iff,dblk,{listing,"block"}},
-       {unless,no_bopt,{pass,beam_bool}},
-       {iff,dbool,{listing,"bool"}},
-       {unless,no_topt,{pass,beam_type}},
-       {iff,dtype,{listing,"type"}},
-       {pass,beam_dead},	      %Must always run since it splits blocks.
-       {iff,ddead,{listing,"dead"}},
-       {unless,no_jopt,{pass,beam_jump}},
-       {iff,djmp,{listing,"jump"}},
-       {pass,beam_clean},
-       {iff,dclean,{listing,"clean"}},
-       {pass,beam_flatten}]},
-
-     %% If post optimizations are turned off, we still coalesce
-     %% adjacent labels and remove unused labels to keep the
-     %% HiPE compiler happy.
-     {iff,no_postopt,
-      [?pass(beam_unused_labels),
-       {pass,beam_clean}]},
-
-     {iff,dopt,{listing,"optimize"}},
-     {iff,'S',{listing,"S"}},
-     {iff,'to_asm',{done,"S"}},
-
-     {pass,beam_validator},
-     ?pass(beam_asm)
-     | binary_passes()].
-
-binary_passes() ->
-    [{native_compile,fun test_native/1,fun native_compile/1},
-     {unless,binary,?pass(save_binary)}].
-
-%%%
-%%% Compiler passes.
-%%%
-
-%% Remove the target file so we don't have an old one if the compilation fail.
-remove_file(St) ->
-    file:delete(St#compile.ofile),
-    {ok,St}.
-
--record(asm_module, {module,
-		     exports,
-		     labels,
-		     functions=[],
-		     cfun,
-		     code,
-		     attributes=[]}).
-
-preprocess_asm_forms(Forms) ->
-    R = #asm_module{},
-    R1 = collect_asm(Forms, R),
-    {R1#asm_module.module,
-     {R1#asm_module.module,
-      R1#asm_module.exports,
-      R1#asm_module.attributes,
-      R1#asm_module.functions,
-      R1#asm_module.labels}}.
-
-collect_asm([], R) ->
-    case R#asm_module.cfun of
-	undefined ->
-	    R;
-	{A,B,C} ->
-	    R#asm_module{functions=R#asm_module.functions++
-			 [{function,A,B,C,R#asm_module.code}]}
-    end;
-collect_asm([{module,M} | Rest], R) ->
-    collect_asm(Rest, R#asm_module{module=M});
-collect_asm([{exports,M} | Rest], R) ->
-    collect_asm(Rest, R#asm_module{exports=M});
-collect_asm([{labels,M} | Rest], R) ->
-    collect_asm(Rest, R#asm_module{labels=M});
-collect_asm([{function,A,B,C} | Rest], R) ->
-    R1 = case R#asm_module.cfun of
-	     undefined ->
-		 R;
-	     {A0,B0,C0} ->
-		 R#asm_module{functions=R#asm_module.functions++
-			      [{function,A0,B0,C0,R#asm_module.code}]}
-	 end,
-    collect_asm(Rest, R1#asm_module{cfun={A,B,C}, code=[]});
-collect_asm([{attributes, Attr} | Rest], R) ->
-    collect_asm(Rest, R#asm_module{attributes=Attr});
-collect_asm([X | Rest], R) ->
-    collect_asm(Rest, R#asm_module{code=R#asm_module.code++[X]}).
-
-beam_consult_asm(St) ->
-    case file:consult(St#compile.ifile) of
-	{ok, Forms0} ->
-	    {Module, Forms} = preprocess_asm_forms(Forms0),
-	    {ok,St#compile{module=Module, code=Forms}};
-	{error,E} ->
-	    Es = [{St#compile.ifile,[{none,?MODULE,{open,E}}]}],
-	    {error,St#compile{errors=St#compile.errors ++ Es}}
-    end.
-
-read_beam_file(St) ->
-    case file:read_file(St#compile.ifile) of
-	{ok,Beam} ->
-	    Infile = St#compile.ifile,
-	    case is_too_old(Infile) of
-		true ->
-		    {ok,St#compile{module=none,code=none}};
-		false ->
-		    Mod0 = filename:rootname(filename:basename(Infile)),
-		    Mod = list_to_atom(Mod0),
-		    {ok,St#compile{module=Mod,code=Beam,ofile=Infile}}
-	    end;
-	{error,E} ->
-	    Es = [{St#compile.ifile,[{none,?MODULE,{open,E}}]}],
-	    {error,St#compile{errors=St#compile.errors ++ Es}}
-    end.
-
-is_too_old(BeamFile) ->
-    case beam_lib:chunks(BeamFile, ["CInf"]) of
-	{ok,{_,[{"CInf",Term0}]}} ->
-	    Term = binary_to_term(Term0),
-	    Opts = proplists:get_value(options, Term, []),
-	    lists:member(no_new_funs, Opts);
-	_ -> false
-    end.
-
-parse_module(St) ->
-    Opts = St#compile.options,
-    Cwd = ".",
-    IncludePath = [Cwd, St#compile.dir|inc_paths(Opts)],
-    Tab = ets:new(compiler__tab, [protected,named_table]),
-    ets:insert(Tab, {compiler_options,Opts}),
-    R =  epp:parse_file(St#compile.ifile, IncludePath, pre_defs(Opts)),
-    ets:delete(Tab),
-    case R of
-	{ok,Forms} ->
-	    {ok,St#compile{code=Forms}};
-	{error,E} ->
-	    Es = [{St#compile.ifile,[{none,?MODULE,{epp,E}}]}],
-	    {error,St#compile{errors=St#compile.errors ++ Es}}
-    end.
-
-parse_core(St) ->
-    case file:read_file(St#compile.ifile) of
-	{ok,Bin} ->
-	    case core_scan:string(binary_to_list(Bin)) of
-		{ok,Toks,_} ->
-		    case core_parse:parse(Toks) of
-			{ok,Mod} ->
-			    Name = (Mod#c_module.name)#c_atom.val,
-			    {ok,St#compile{module=Name,code=Mod}};
-			{error,E} ->
-			    Es = [{St#compile.ifile,[E]}],
-			    {error,St#compile{errors=St#compile.errors ++ Es}}
-		    end;
-		{error,E,_} ->
-		    Es = [{St#compile.ifile,[E]}],
-		    {error,St#compile{errors=St#compile.errors ++ Es}}
-	    end;
-	{error,E} ->
-	    Es = [{St#compile.ifile,[{none,compile,{open,E}}]}],
-	    {error,St#compile{errors=St#compile.errors ++ Es}}
-    end.
-
-compile_options([{attribute,_L,compile,C}|Fs]) when is_list(C) ->
-    C ++ compile_options(Fs);
-compile_options([{attribute,_L,compile,C}|Fs]) ->
-    [C|compile_options(Fs)];
-compile_options([_F|Fs]) -> compile_options(Fs);
-compile_options([]) -> [].
-
-transforms(Os) -> [ M || {parse_transform,M} <- Os ]. 
-
-transform_module(St) ->
-    %% Extract compile options from code into options field.
-    Ts = transforms(St#compile.options ++ compile_options(St#compile.code)),
-    foldl_transform(St, Ts).
-
-foldl_transform(St, [T|Ts]) ->
-    Name = "transform " ++ atom_to_list(T),
-    Fun = fun(S) -> T:parse_transform(S#compile.code, S#compile.options) end,
-    Run = case member(time, St#compile.options) of
-	      true  -> fun run_tc/2;
-	      false -> fun({_Name,F}, S) -> catch F(S) end
-	  end,
-    case Run({Name, Fun}, St) of
-	{error,Es,Ws} ->
-	    {error,St#compile{warnings=St#compile.warnings ++ Ws,
-			      errors=St#compile.errors ++ Es}};
-	{'EXIT',R} ->
-	    Es = [{St#compile.ifile,[{none,compile,{parse_transform,T,R}}]}],
-	    {error,St#compile{errors=St#compile.errors ++ Es}};
-	Forms ->
-	    foldl_transform(St#compile{code=Forms}, Ts)
-    end;
-foldl_transform(St, []) -> {ok,St}.
-
-get_core_transforms(Opts) -> [M || {core_transform,M} <- Opts]. 
-
-core_transforms(St) ->
-    %% The options field holds the complete list of options at this
-
-    Ts = get_core_transforms(St#compile.options),
-    foldl_core_transforms(St, Ts).
-
-foldl_core_transforms(St, [T|Ts]) ->
-    Name = "core transform " ++ atom_to_list(T),
-    Fun = fun(S) -> T:core_transform(S#compile.code, S#compile.options) end,
-    Run = case member(time, St#compile.options) of
-	      true  -> fun run_tc/2;
-	      false -> fun({_Name,F}, S) -> catch F(S) end
-	  end,
-    case Run({Name, Fun}, St) of
-	{'EXIT',R} ->
-	    Es = [{St#compile.ifile,[{none,compile,{core_transform,T,R}}]}],
-	    {error,St#compile{errors=St#compile.errors ++ Es}};
-	Forms ->
-	    foldl_core_transforms(St#compile{code=Forms}, Ts)
-    end;
-foldl_core_transforms(St, []) -> {ok,St}.
-
-%%% Fetches the module name from a list of forms. The module attribute must
-%%% be present.
-get_module([{attribute,_,module,{M,_As}} | _]) -> M;
-get_module([{attribute,_,module,M} | _]) -> M;
-get_module([_ | Rest]) ->
-    get_module(Rest).
-
-%%% A #compile state is returned, where St.base has been filled in
-%%% with the module name from Forms, as a string, in case it wasn't
-%%% set in St (i.e., it was "").
-add_default_base(St, Forms) ->
-    F = St#compile.filename,
-    case F of
-	"" ->
-	    M = get_module(Forms),
-	    St#compile{base = atom_to_list(M)};
-	_ ->
-	    St
-    end.
-
-lint_module(St) ->
-    case erl_lint:module(St#compile.code,
-			 St#compile.ifile, St#compile.options) of
-	{ok,Ws} ->
-	    %% Insert name of module as base name, if needed. This is
-	    %% for compile:forms to work with listing files.
-	    St1 = add_default_base(St, St#compile.code),
-	    {ok,St1#compile{warnings=St1#compile.warnings ++ Ws}};
-	{error,Es,Ws} ->
-	    {error,St#compile{warnings=St#compile.warnings ++ Ws,
-			      errors=St#compile.errors ++ Es}}
-    end.
-
-core_lint_module(St) ->
-    case core_lint:module(St#compile.code, St#compile.options) of
-	{ok,Ws} ->
-	    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
-	{error,Es,Ws} ->
-	    {error,St#compile{warnings=St#compile.warnings ++ Ws,
-			      errors=St#compile.errors ++ Es}}
-    end.
-
-%% expand_module(State) -> State'
-%%  Do the common preprocessing of the input forms.
-
-expand_module(#compile{code=Code,options=Opts0}=St0) ->
-    {Mod,Exp,Forms,Opts1} = sys_pre_expand:module(Code, Opts0),
-    Opts2 = expand_opts(Opts1),
-    Opts = filter_opts(Opts2),
-    {ok,St0#compile{module=Mod,options=Opts,code={Mod,Exp,Forms}}}.
-
-core_module(#compile{code=Code0,options=Opts,ifile=File}=St) ->
-    {ok,Code,Ws} = v3_core:module(Code0, Opts),
-    {ok,St#compile{code=Code,warnings=St#compile.warnings ++ [{File,Ws}]}}.
-
-core_fold_module(#compile{code=Code0,options=Opts,ifile=File}=St) ->
-    {ok,Code,Ws} = sys_core_fold:module(Code0, Opts),
-    {ok,St#compile{code=Code,warnings=St#compile.warnings ++ [{File,Ws}]}}.
-
-test_old_inliner(#compile{options=Opts}) ->
-    %% The point of this test is to avoid loading the old inliner
-    %% if we know that it will not be used.
-    case any(fun(no_inline) -> true;
-		(_) -> false
-	     end, Opts) of
-      true -> false;
-      false ->
-	any(fun({inline,_}) -> true;
-	       (_) -> false
-	    end, Opts)
-    end.
-
-test_core_inliner(#compile{options=Opts}) ->
-    case any(fun(no_inline) -> true;
-		(_) -> false
-	     end, Opts) of
-	true -> false;
-	false ->
-	    any(fun(inline) -> true;
-		   (_) -> false
-		end, Opts)
-    end.
-
-core_old_inliner(#compile{code=Code0,options=Opts}=St) ->
-    case catch sys_core_inline:module(Code0, Opts) of
-	{ok,Code} ->
-	    {ok,St#compile{code=Code}};
-	{error,Es} ->
-	    {error,St#compile{errors=St#compile.errors ++ Es}}
-    end.
-
-core_inline_module(#compile{code=Code0,options=Opts}=St) ->
-    Code = cerl_inline:core_transform(Code0, Opts),
-    {ok,St#compile{code=Code}}.
-
-core_dsetel_module(#compile{code=Code0,options=Opts}=St) ->
-    {ok,Code} = sys_core_dsetel:module(Code0, Opts),
-    {ok,St#compile{code=Code}}.
-
-kernel_module(#compile{code=Code0,options=Opts,ifile=File}=St) ->
-    {ok,Code,Ws} = v3_kernel:module(Code0, Opts),
-    {ok,St#compile{code=Code,warnings=St#compile.warnings ++ [{File,Ws}]}}.
-
-save_abstract_code(St) ->
-    {ok,St#compile{abstract_code=abstract_code(St)}}.
-
-abstract_code(#compile{code=Code}) ->
-    Abstr = {raw_abstract_v1,Code},
-    case catch erlang:term_to_binary(Abstr, [compressed]) of
-	{'EXIT',_} -> term_to_binary(Abstr);
-	Other -> Other
-    end.
-
-save_core_code(St) ->
-    {ok,St#compile{core_code=cerl:from_records(St#compile.code)}}.
-
-beam_unused_labels(#compile{code=Code0}=St) ->
-    Code = beam_jump:module_labels(Code0),
-    {ok,St#compile{code=Code}}.
-
-beam_asm(#compile{ifile=File,code=Code0,abstract_code=Abst,options=Opts0}=St) ->
-    Source = filename:absname(File),
-    Opts = filter(fun is_informative_option/1, Opts0),
-    case beam_asm:module(Code0, Abst, Source, Opts) of
-	{ok,Code} -> {ok,St#compile{code=Code,abstract_code=[]}};
-	{error,Es} -> {error,St#compile{errors=St#compile.errors ++ Es}}
-    end.
-
-test_native(#compile{options=Opts}) ->
-    %% This test must be made late, because the r7 or no_new_funs options
-    %% will turn off the native option.
-    member(native, Opts).
-
-native_compile(#compile{code=none}=St) -> {ok,St};
-native_compile(St) ->
-    case erlang:system_info(hipe_architecture) of
-	undefined ->
-	    Ws = [{St#compile.ifile,[{none,compile,no_native_support}]}],
-	    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
-	_ ->
-	    native_compile_1(St)
-    end.
-
-native_compile_1(St) ->
-    Opts0 = [no_new_binaries|St#compile.options],
-    IgnoreErrors = member(ignore_native_errors, Opts0),
-    Opts = case keysearch(hipe, 1, Opts0) of
-	       {value,{hipe,L}} when list(L) -> L;
-	       {value,{hipe,X}} -> [X];
-	       _ -> []
-	   end,
-    case catch hipe:compile(St#compile.module,
-			    St#compile.core_code,
-			    St#compile.code,
-			    Opts) of
-	{ok, {Type,Bin}} when binary(Bin) ->
-	    {ok, embed_native_code(St, {Type,Bin})};
-	{error, R} ->
-	    case IgnoreErrors of
-		true ->
-		    Ws = [{St#compile.ifile,[{none,?MODULE,{native,R}}]}],
-		    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
-		false ->
-		    Es = [{St#compile.ifile,[{none,?MODULE,{native,R}}]}],
-		    {error,St#compile{errors=St#compile.errors ++ Es}}
-	    end;
-	{'EXIT',R} ->
-	    case IgnoreErrors of
-		true ->
-		    Ws = [{St#compile.ifile,[{none,?MODULE,{native_crash,R}}]}],
-		    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
-		false ->
-		    exit(R)
-	    end
-    end.
-
-embed_native_code(St, {Architecture,NativeCode}) ->
-    {ok, _, Chunks0} = beam_lib:all_chunks(St#compile.code),
-    ChunkName = hipe_unified_loader:chunk_name(Architecture),
-    Chunks1 = lists:keydelete(ChunkName, 1, Chunks0),
-    Chunks = Chunks1 ++ [{ChunkName,NativeCode}],
-    {ok, BeamPlusNative} = beam_lib:build_module(Chunks),
-    St#compile{code=BeamPlusNative}.
-
-%% Returns true if the option is informative and therefore should be included
-%% in the option list of the compiled module.
-
-is_informative_option(beam) -> false;
-is_informative_option(report_warnings) -> false;
-is_informative_option(report_errors) -> false;
-is_informative_option(binary) -> false;
-is_informative_option(verbose) -> false;
-is_informative_option(_) -> true.
-    
-save_binary(#compile{code=none}=St) -> {ok,St};
-save_binary(St) ->
-    Tfile = tmpfile(St#compile.ofile),		%Temp working file
-    case write_binary(Tfile, St#compile.code, St) of
-	ok ->
-	    case file:rename(Tfile, St#compile.ofile) of
-		ok ->
-		    {ok,St};
-		{error,_Error} ->
-		    file:delete(Tfile),
-		    Es = [{St#compile.ofile,[{none,?MODULE,{rename,Tfile}}]}],
-		    {error,St#compile{errors=St#compile.errors ++ Es}}
-	    end;
-	{error,_Error} ->
-	    Es = [{Tfile,[{compile,write_error}]}],
-	    {error,St#compile{errors=St#compile.errors ++ Es}}
-    end.
-
-write_binary(Name, Bin, St) ->
-    Opts = case member(compressed, St#compile.options) of
-	       true -> [compressed];
-	       false -> []
-	   end,
-    case file:write_file(Name, Bin, Opts) of
-	ok -> ok;
-	{error,_}=Error -> Error
-    end.
-
-%% report_errors(State) -> ok
-%% report_warnings(State) -> ok
-
-report_errors(St) ->
-    case member(report_errors, St#compile.options) of
-	true ->
-	    foreach(fun ({{F,_L},Eds}) -> list_errors(F, Eds);
-			({F,Eds}) -> list_errors(F, Eds) end,
-		    St#compile.errors);
-	false -> ok
-    end.
-
-report_warnings(#compile{options=Opts,warnings=Ws0}) ->
-    case member(report_warnings, Opts) of
-	true ->
-	    Ws1 = flatmap(fun({{F,_L},Eds}) -> format_message(F, Eds);
-			     ({F,Eds}) -> format_message(F, Eds) end,
-		     Ws0),
-	    Ws = ordsets:from_list(Ws1),
-	    foreach(fun({_,Str}) -> io:put_chars(Str) end, Ws);
-	false -> ok
-    end.
-
-format_message(F, [{Line,Mod,E}|Es]) ->
-    M = {Line,io_lib:format("~s:~w: Warning: ~s\n", [F,Line,Mod:format_error(E)])},
-    [M|format_message(F, Es)];
-format_message(F, [{Mod,E}|Es]) ->
-    M = {none,io_lib:format("~s: Warning: ~s\n", [F,Mod:format_error(E)])},
-    [M|format_message(F, Es)];
-format_message(_, []) -> [].
-
-%% list_errors(File, ErrorDescriptors) -> ok
-
-list_errors(F, [{Line,Mod,E}|Es]) ->
-    io:fwrite("~s:~w: ~s\n", [F,Line,Mod:format_error(E)]),
-    list_errors(F, Es);
-list_errors(F, [{Mod,E}|Es]) ->
-    io:fwrite("~s: ~s\n", [F,Mod:format_error(E)]),
-    list_errors(F, Es);
-list_errors(_F, []) -> ok.
-
-%% erlfile(Dir, Base) -> ErlFile
-%% outfile(Base, Extension, Options) -> OutputFile
-%% objfile(Base, Target, Options) -> ObjFile
-%% tmpfile(ObjFile) -> TmpFile
-%%  Work out the correct input and output file names.
-
-iofile(File) when atom(File) ->
-    iofile(atom_to_list(File));
-iofile(File) ->
-    {filename:dirname(File), filename:basename(File, ".erl")}.
-
-erlfile(Dir, Base, Suffix) ->
-    filename:join(Dir, Base++Suffix).
-
-outfile(Base, Ext, Opts) when atom(Ext) ->
-    outfile(Base, atom_to_list(Ext), Opts);
-outfile(Base, Ext, Opts) ->
-    Obase = case keysearch(outdir, 1, Opts) of
-		{value, {outdir, Odir}} -> filename:join(Odir, Base);
-		_Other -> Base			% Not found or bad format
-	    end,
-    Obase++"."++Ext.
-
-objfile(Base, St) ->
-    outfile(Base, "beam", St#compile.options).
-
-tmpfile(Ofile) ->
-    reverse([$#|tl(reverse(Ofile))]).
-
-%% pre_defs(Options)
-%% inc_paths(Options)
-%%  Extract the predefined macros and include paths from the option list.
-
-pre_defs([{d,M,V}|Opts]) ->
-    [{M,V}|pre_defs(Opts)];
-pre_defs([{d,M}|Opts]) ->
-    [M|pre_defs(Opts)];
-pre_defs([_|Opts]) ->
-    pre_defs(Opts);
-pre_defs([]) -> [].
-
-inc_paths(Opts) ->
-    [ P || {i,P} <- Opts, list(P) ].
-
-src_listing(Ext, St) ->
-    listing(fun (Lf, {_Mod,_Exp,Fs}) -> do_src_listing(Lf, Fs);
-		(Lf, Fs) -> do_src_listing(Lf, Fs) end,
-	    Ext, St).
-
-do_src_listing(Lf, Fs) ->
-    foreach(fun (F) -> io:put_chars(Lf, [erl_pp:form(F),"\n"]) end,
-	    Fs).
-
-listing(Ext, St) ->
-    listing(fun(Lf, Fs) -> beam_listing:module(Lf, Fs) end, Ext, St).
-
-listing(LFun, Ext, St) ->
-    Lfile = outfile(St#compile.base, Ext, St#compile.options),
-    case file:open(Lfile, [write,delayed_write]) of
-	{ok,Lf} -> 
-	    LFun(Lf, St#compile.code),
-	    ok = file:close(Lf),
-	    {ok,St};
-	{error,_Error} ->
-	    Es = [{Lfile,[{none,compile,write_error}]}],
-	    {error,St#compile{errors=St#compile.errors ++ Es}}
-    end.
-
-options() ->
-    help(standard_passes()).
-
-help([{iff,Flag,{src_listing,Ext}}|T]) ->
-    io:fwrite("~p - Generate .~s source listing file\n", [Flag,Ext]),
-    help(T);
-help([{iff,Flag,{listing,Ext}}|T]) ->
-    io:fwrite("~p - Generate .~s file\n", [Flag,Ext]),
-    help(T);
-help([{iff,Flag,{Name,Fun}}|T]) when function(Fun) ->
-    io:fwrite("~p - Run ~s\n", [Flag,Name]),
-    help(T);
-help([{iff,_Flag,Action}|T]) ->
-    help(Action),
-    help(T);
-help([{unless,Flag,{pass,Pass}}|T]) ->
-    io:fwrite("~p - Skip the ~s pass\n", [Flag,Pass]),
-    help(T);
-help([{unless,no_postopt=Flag,List}|T]) when list(List) ->
-    %% Hard-coded knowledgde here.
-    io:fwrite("~p - Skip all post optimisation\n", [Flag]),
-    help(List),
-    help(T);
-help([{unless,_Flag,Action}|T]) ->
-    help(Action),
-    help(T);
-help([_|T]) ->
-    help(T);
-help(_) ->
-    ok.
-
-
-%% compile(AbsFileName, Outfilename, Options)
-%%   Compile entry point for erl_compile.
-
-compile(File0, _OutFile, Options) ->
-    File = shorten_filename(File0),
-    case file(File, make_erl_options(Options)) of
-	{ok,_Mod} -> ok;
-	Other -> Other
-    end.
-
-compile_beam(File0, _OutFile, Opts) ->
-    File = shorten_filename(File0),
-    case file(File, [from_beam|make_erl_options(Opts)]) of
-	{ok,_Mod} -> ok;
-	Other -> Other
-    end.
-
-compile_asm(File0, _OutFile, Opts) ->
-    File = shorten_filename(File0),
-    case file(File, [asm|make_erl_options(Opts)]) of
-	{ok,_Mod} -> ok;
-	Other -> Other
-    end.
-
-compile_core(File0, _OutFile, Opts) ->
-    File = shorten_filename(File0),
-    case file(File, [from_core|make_erl_options(Opts)]) of
-	{ok,_Mod} -> ok;
-	Other -> Other
-    end.
-
-shorten_filename(Name0) ->
-    {ok,Cwd} = file:get_cwd(),
-    case lists:prefix(Cwd, Name0) of
-	false -> Name0;
-	true ->
-	    Name = case lists:nthtail(length(Cwd), Name0) of
-		       "/"++N -> N;
-		       N -> N
-		   end,
-	    Name
-    end.
-
-%% Converts generic compiler options to specific options.
-
-make_erl_options(Opts) ->
-
-    %% This way of extracting will work even if the record passed
-    %% has more fields than known during compilation.
-
-    Includes = Opts#options.includes,
-    Defines = Opts#options.defines,
-    Outdir = Opts#options.outdir,
-    Warning = Opts#options.warning,
-    Verbose = Opts#options.verbose,
-    Specific = Opts#options.specific,
-    OutputType = Opts#options.output_type,
-    Cwd = Opts#options.cwd,
-
-    Options =
-	case Verbose of
-	    true ->  [verbose];
-	    false -> []
-	end ++
-	case Warning of
-	    0 -> [];
-	    _ -> [report_warnings]
- 	end ++
-	map(
-	  fun ({Name, Value}) ->
-		  {d, Name, Value};
-	      (Name) ->
-		  {d, Name}
-	  end,
-	  Defines) ++
-	case OutputType of
-	    undefined -> [];
-	    jam -> [jam];
-	    beam -> [beam];
-	    native -> [native]
-	end,
-
-    Options++[report_errors, {cwd, Cwd}, {outdir, Outdir}|
-	      map(fun(Dir) -> {i, Dir} end, Includes)]++Specific.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_lib.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_lib.erl
deleted file mode 100644
index 3a6158286f..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_lib.erl
+++ /dev/null
@@ -1,509 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: core_lib.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
-%% Purpose: Core Erlang abstract syntax functions.
-
--module(core_lib).
-
--export([get_anno/1,set_anno/2]).
--export([is_atomic/1,is_literal/1,is_literal_list/1,
-	 is_simple/1,is_simple_list/1,is_simple_top/1]).
--export([literal_value/1,make_literal/1]).
--export([make_values/1]).
--export([map/2, fold/3, mapfold/3]).
--export([is_var_used/2]).
-
-%% -compile([export_all]).
-
--include("core_parse.hrl").
-
-%% get_anno(Core) -> Anno.
-%% set_anno(Core, Anno) -> Core.
-%%  Generic get/set annotation.
-
-get_anno(C) -> element(2, C).
-set_anno(C, A) -> setelement(2, C, A).
-
-%% is_atomic(Expr) -> true | false.
-
-is_atomic(#c_char{}) -> true;
-is_atomic(#c_int{}) -> true;
-is_atomic(#c_float{}) -> true;
-is_atomic(#c_atom{}) -> true;
-is_atomic(#c_string{}) -> true;
-is_atomic(#c_nil{}) -> true;
-is_atomic(#c_fname{}) -> true;
-is_atomic(_) -> false.
-
-%% is_literal(Expr) -> true | false.
-
-is_literal(#c_cons{hd=H,tl=T}) ->
-    case is_literal(H) of
-	true -> is_literal(T); 
-	false -> false
-    end;
-is_literal(#c_tuple{es=Es}) -> is_literal_list(Es);
-is_literal(#c_binary{segments=Es}) -> is_lit_bin(Es);
-is_literal(E) -> is_atomic(E).
-
-is_literal_list(Es) -> lists:all(fun is_literal/1, Es).
-
-is_lit_bin(Es) ->
-    lists:all(fun (#c_bitstr{val=E,size=S}) ->
-		      is_literal(E) and is_literal(S)
-	      end, Es).
-
-%% is_simple(Expr) -> true | false.
-
-is_simple(#c_var{}) -> true;
-is_simple(#c_cons{hd=H,tl=T}) ->
-    case is_simple(H) of
-	true -> is_simple(T); 
-	false -> false
-    end;
-is_simple(#c_tuple{es=Es}) -> is_simple_list(Es);
-is_simple(#c_binary{segments=Es}) -> is_simp_bin(Es);
-is_simple(E) -> is_atomic(E).
-
-is_simple_list(Es) -> lists:all(fun is_simple/1, Es).
-
-is_simp_bin(Es) ->
-    lists:all(fun (#c_bitstr{val=E,size=S}) ->
-		      is_simple(E) and is_simple(S)
-	      end, Es).
-
-%% is_simple_top(Expr) -> true | false.
-%%  Only check if the top-level is a simple.
-
-is_simple_top(#c_var{}) -> true;
-is_simple_top(#c_cons{}) -> true;
-is_simple_top(#c_tuple{}) -> true;
-is_simple_top(#c_binary{}) -> true;
-is_simple_top(E) -> is_atomic(E).
-
-%% literal_value(LitExpr) -> Value.
-%%  Return the value of LitExpr.
-
-literal_value(#c_char{val=C}) -> C;
-literal_value(#c_int{val=I}) -> I;
-literal_value(#c_float{val=F}) -> F;
-literal_value(#c_atom{val=A}) -> A;
-literal_value(#c_string{val=S}) -> S;
-literal_value(#c_nil{}) -> [];
-literal_value(#c_cons{hd=H,tl=T}) ->
-    [literal_value(H)|literal_value(T)];
-literal_value(#c_tuple{es=Es}) ->
-    list_to_tuple(literal_value_list(Es)).
-
-literal_value_list(Vals) -> lists:map(fun literal_value/1, Vals).
-
-%% make_literal(Value) -> LitExpr.
-%%  Make a literal expression from an Erlang value.
-
-make_literal(I) when integer(I) -> #c_int{val=I};
-make_literal(F) when float(F) -> #c_float{val=F};
-make_literal(A) when atom(A) -> #c_atom{val=A};
-make_literal([]) -> #c_nil{};
-make_literal([H|T]) ->
-    #c_cons{hd=make_literal(H),tl=make_literal(T)};
-make_literal(T) when tuple(T) ->
-    #c_tuple{es=make_literal_list(tuple_to_list(T))}.
-
-make_literal_list(Vals) -> lists:map(fun make_literal/1, Vals). 
-
-%% make_values([CoreExpr] | CoreExpr) -> #c_values{} | CoreExpr.
-%%  Make a suitable values structure, expr or values, depending on
-%%  Expr.
-
-make_values([E]) -> E;
-make_values([H|_]=Es) -> #c_values{anno=get_anno(H),es=Es};
-make_values([]) -> #c_values{es=[]};
-make_values(E) -> E.
-
-%% map(MapFun, CoreExpr) -> CoreExpr.
-%%  This function traverses the core parse format, at each level
-%%  applying the submited argument function, assumed to do the real
-%%  work.
-%%
-%%  The "eager" style, where each component of a construct are
-%%  descended to before the construct itself, admits that some
-%%  companion functions (the F:s) may be made simpler, since it may be
-%%  safely assumed that no lower illegal instanced will be
-%%  created/uncovered by actions on the current level.
-
-map(F, #c_tuple{es=Es}=R) ->
-    F(R#c_tuple{es=map_list(F, Es)});
-map(F, #c_cons{hd=Hd, tl=Tl}=R) ->
-    F(R#c_cons{hd=map(F, Hd), 
-	       tl=map(F, Tl)});
-map(F, #c_values{es=Es}=R) ->
-    F(R#c_values{es=map_list(F, Es)});
-
-map(F, #c_alias{var=Var, pat=Pat}=R) ->
-    F(R#c_alias{var=map(F, Var),
-		pat=map(F, Pat)});
-
-map(F, #c_module{defs=Defs}=R) ->
-    F(R#c_module{defs=map_list(F, Defs)});
-map(F, #c_def{val=Val}=R) ->
-    F(R#c_def{val=map(F, Val)});
-
-map(F, #c_fun{vars=Vars, body=Body}=R) ->
-    F(R#c_fun{vars=map_list(F, Vars),
-	      body=map(F, Body)});
-map(F, #c_let{vars=Vs, arg=Arg, body=Body}=R) ->
-    F(R#c_let{vars=map_list(F, Vs), 
-	      arg=map(F, Arg), 
-	      body=map(F, Body)});
-map(F, #c_letrec{defs=Fs,body=Body}=R) ->
-    F(R#c_letrec{defs=map_list(F, Fs),
-		 body=map(F, Body)});
-map(F, #c_seq{arg=Arg, body=Body}=R) ->
-    F(R#c_seq{arg=map(F, Arg),
-	      body=map(F, Body)});
-map(F, #c_case{arg=Arg, clauses=Clauses}=R) ->
-    F(R#c_case{arg=map(F, Arg),
-	       clauses=map_list(F, Clauses)});
-map(F, #c_clause{pats=Ps, guard=Guard, body=Body}=R) ->
-    F(R#c_clause{pats=map_list(F, Ps), 
-		 guard=map(F, Guard), 
-		 body=map(F, Body)});
-map(F, #c_receive{clauses=Cls, timeout=Tout, action=Act}=R) ->
-    F(R#c_receive{clauses=map_list(F, Cls),
-		  timeout=map(F, Tout),
-		  action=map(F, Act)});
-map(F, #c_apply{op=Op,args=Args}=R) ->
-    F(R#c_apply{op=map(F, Op),
-		args=map_list(F, Args)});
-map(F, #c_call{module=M,name=N,args=Args}=R) ->
-    F(R#c_call{module=map(F, M),
-	       name=map(F, N),
-	       args=map_list(F, Args)});
-map(F, #c_primop{name=N,args=Args}=R) ->
-    F(R#c_primop{name=map(F, N),
-		 args=map_list(F, Args)});
-map(F, #c_try{arg=Expr,vars=Vars,body=Body,evars=Evars,handler=Handler}=R) ->
-    F(R#c_try{arg=map(F, Expr), 
-	      vars=map(F, Vars), 
-	      body=map(F, Body),
-	      evars=map(F, Evars),
-	      handler=map(F, Handler)});
-map(F, #c_catch{body=Body}=R) ->
-    F(R#c_catch{body=map(F, Body)});
-map(F, T) -> F(T).				%Atomic nodes.
-
-map_list(F, L) -> lists:map(fun (E) -> map(F, E) end, L).
-
-%% fold(FoldFun, Accumulator, CoreExpr) -> Accumulator.
-%%  This function traverses the core parse format, at each level
-%%  applying the submited argument function, assumed to do the real
-%%  work, and keeping the accumulated result in the A (accumulator)
-%%  argument.
-
-fold(F, Acc, #c_tuple{es=Es}=R) ->
-    F(R, fold_list(F, Acc, Es));
-fold(F, Acc, #c_cons{hd=Hd, tl=Tl}=R) ->
-    F(R, fold(F, fold(F, Acc, Hd), Tl));
-fold(F, Acc, #c_values{es=Es}=R) ->
-    F(R, fold_list(F, Acc, Es));
-
-fold(F, Acc, #c_alias{pat=P,var=V}=R) ->
-    F(R, fold(F, fold(F, Acc, P), V));
-
-fold(F, Acc, #c_module{defs=Defs}=R) ->
-    F(R, fold_list(F, Acc, Defs));
-fold(F, Acc, #c_def{val=Val}=R) ->
-    F(R, fold(F, Acc, Val));
-
-fold(F, Acc, #c_fun{vars=Vars, body=Body}=R) ->
-    F(R, fold(F, fold_list(F, Acc, Vars), Body));
-fold(F, Acc, #c_let{vars=Vs, arg=Arg, body=Body}=R) ->
-    F(R, fold(F, fold(F, fold_list(F, Acc, Vs), Arg), Body));
-fold(F, Acc, #c_letrec{defs=Fs,body=Body}=R) ->
-    F(R, fold(F, fold_list(F, Acc, Fs), Body));
-fold(F, Acc, #c_seq{arg=Arg, body=Body}=R) ->
-    F(R, fold(F, fold(F, Acc, Arg), Body));
-fold(F, Acc, #c_case{arg=Arg, clauses=Clauses}=R) ->
-    F(R, fold_list(F, fold(F, Acc, Arg), Clauses));
-fold(F, Acc, #c_clause{pats=Ps,guard=G,body=B}=R) ->
-    F(R, fold(F, fold(F, fold_list(F, Acc, Ps), G), B));
-fold(F, Acc, #c_receive{clauses=Cl, timeout=Ti, action=Ac}=R) ->
-    F(R, fold_list(F, fold(F, fold(F, Acc, Ac), Ti), Cl));
-fold(F, Acc, #c_apply{op=Op, args=Args}=R) ->
-    F(R, fold_list(F, fold(F, Acc, Op), Args));
-fold(F, Acc, #c_call{module=Mod,name=Name,args=Args}=R) ->
-    F(R, fold_list(F, fold(F, fold(F, Acc, Mod), Name), Args));
-fold(F, Acc, #c_primop{name=Name,args=Args}=R) ->
-    F(R, fold_list(F, fold(F, Acc, Name), Args));
-fold(F, Acc, #c_try{arg=E,vars=Vs,body=Body,evars=Evs,handler=H}=R) ->
-    NewB = fold(F, fold_list(F, fold(F, Acc, E), Vs), Body),
-    F(R, fold(F, fold_list(F, NewB, Evs), H));
-fold(F, Acc, #c_catch{body=Body}=R) ->
-    F(R, fold(F, Acc, Body));
-fold(F, Acc, T) ->				%Atomic nodes
-    F(T, Acc).
-
-fold_list(F, Acc, L) ->
-    lists:foldl(fun (E, A) -> fold(F, A, E) end, Acc, L).
-
-%% mapfold(MapfoldFun, Accumulator, CoreExpr) -> {CoreExpr,Accumulator}.
-%%  This function traverses the core parse format, at each level
-%%  applying the submited argument function, assumed to do the real
-%%  work, and keeping the accumulated result in the A (accumulator)
-%%  argument.
-
-mapfold(F, Acc0, #c_tuple{es=Es0}=R) ->
-    {Es1,Acc1} = mapfold_list(F, Acc0, Es0),
-    F(R#c_tuple{es=Es1}, Acc1);
-mapfold(F, Acc0, #c_cons{hd=H0,tl=T0}=R) ->
-    {H1,Acc1} = mapfold(F, Acc0, H0),
-    {T1,Acc2} = mapfold(F, Acc1, T0),
-    F(R#c_cons{hd=H1,tl=T1}, Acc2);
-mapfold(F, Acc0, #c_values{es=Es0}=R) ->
-    {Es1,Acc1} = mapfold_list(F, Acc0, Es0),
-    F(R#c_values{es=Es1}, Acc1);
-
-mapfold(F, Acc0, #c_alias{pat=P0,var=V0}=R) ->
-    {P1,Acc1} = mapfold(F, Acc0, P0),
-    {V1,Acc2} = mapfold(F, Acc1, V0),
-    F(R#c_alias{pat=P1,var=V1}, Acc2);
-
-mapfold(F, Acc0, #c_module{defs=D0}=R) ->
-    {D1,Acc1} = mapfold_list(F, Acc0, D0),
-    F(R#c_module{defs=D1}, Acc1);
-mapfold(F, Acc0, #c_def{val=V0}=R) ->
-    {V1,Acc1} = mapfold(F, Acc0, V0),
-    F(R#c_def{val=V1}, Acc1);
-
-mapfold(F, Acc0, #c_fun{vars=Vs0, body=B0}=R) ->
-    {Vs1,Acc1} = mapfold_list(F, Acc0, Vs0),
-    {B1,Acc2} = mapfold(F, Acc1, B0),
-    F(R#c_fun{vars=Vs1,body=B1}, Acc2);
-mapfold(F, Acc0, #c_let{vars=Vs0, arg=A0, body=B0}=R) ->
-    {Vs1,Acc1} = mapfold_list(F, Acc0, Vs0),
-    {A1,Acc2} = mapfold(F, Acc1, A0),
-    {B1,Acc3} = mapfold(F, Acc2, B0),
-    F(R#c_let{vars=Vs1,arg=A1,body=B1}, Acc3);
-mapfold(F, Acc0, #c_letrec{defs=Fs0,body=B0}=R) ->
-    {Fs1,Acc1} = mapfold_list(F, Acc0, Fs0),
-    {B1,Acc2} = mapfold(F, Acc1, B0),
-    F(R#c_letrec{defs=Fs1,body=B1}, Acc2);
-mapfold(F, Acc0, #c_seq{arg=A0, body=B0}=R) ->
-    {A1,Acc1} = mapfold(F, Acc0, A0),
-    {B1,Acc2} = mapfold(F, Acc1, B0),
-    F(R#c_seq{arg=A1,body=B1}, Acc2);
-mapfold(F, Acc0, #c_case{arg=A0,clauses=Cs0}=R) ->
-    {A1,Acc1} = mapfold(F, Acc0, A0),
-    {Cs1,Acc2} = mapfold_list(F, Acc1, Cs0),
-    F(R#c_case{arg=A1,clauses=Cs1}, Acc2);
-mapfold(F, Acc0, #c_clause{pats=Ps0,guard=G0,body=B0}=R) ->
-    {Ps1,Acc1} = mapfold_list(F, Acc0, Ps0),
-    {G1,Acc2} = mapfold(F, Acc1, G0),
-    {B1,Acc3} = mapfold(F, Acc2, B0),
-    F(R#c_clause{pats=Ps1,guard=G1,body=B1}, Acc3);
-mapfold(F, Acc0, #c_receive{clauses=Cs0,timeout=T0,action=A0}=R) ->
-    {T1,Acc1} = mapfold(F, Acc0, T0),
-    {Cs1,Acc2} = mapfold_list(F, Acc1, Cs0),
-    {A1,Acc3} = mapfold(F, Acc2, A0),
-    F(R#c_receive{clauses=Cs1,timeout=T1,action=A1}, Acc3);
-mapfold(F, Acc0, #c_apply{op=Op0, args=As0}=R) ->
-    {Op1,Acc1} = mapfold(F, Acc0, Op0),
-    {As1,Acc2} = mapfold_list(F, Acc1, As0),
-    F(R#c_apply{op=Op1,args=As1}, Acc2);
-mapfold(F, Acc0, #c_call{module=M0,name=N0,args=As0}=R) ->
-    {M1,Acc1} = mapfold(F, Acc0, M0),
-    {N1,Acc2} = mapfold(F, Acc1, N0),
-    {As1,Acc3} = mapfold_list(F, Acc2, As0),
-    F(R#c_call{module=M1,name=N1,args=As1}, Acc3);
-mapfold(F, Acc0, #c_primop{name=N0, args=As0}=R) ->
-    {N1,Acc1} = mapfold(F, Acc0, N0),
-    {As1,Acc2} = mapfold_list(F, Acc1, As0),
-    F(R#c_primop{name=N1,args=As1}, Acc2);
-mapfold(F, Acc0, #c_try{arg=E0,vars=Vs0,body=B0,evars=Evs0,handler=H0}=R) ->
-    {E1,Acc1} = mapfold(F, Acc0, E0),
-    {Vs1,Acc2} = mapfold_list(F, Acc1, Vs0),
-    {B1,Acc3} = mapfold(F, Acc2, B0),
-    {Evs1,Acc4} = mapfold_list(F, Acc3, Evs0),
-    {H1,Acc5} = mapfold(F, Acc4, H0),
-    F(R#c_try{arg=E1,vars=Vs1,body=B1,evars=Evs1,handler=H1}, Acc5);
-mapfold(F, Acc0, #c_catch{body=B0}=R) ->
-    {B1,Acc1} = mapfold(F, Acc0, B0),
-    F(R#c_catch{body=B1}, Acc1);
-mapfold(F, Acc, T) ->				%Atomic nodes
-	F(T, Acc).
-
-mapfold_list(F, Acc, L) ->
-    lists:mapfoldl(fun (E, A) -> mapfold(F, A, E) end, Acc, L).
-
-%% is_var_used(VarName, Expr) -> true | false.
-%%  Test if the variable VarName is used in Expr.
-
-is_var_used(V, B) -> vu_body(V, B).
-
-vu_body(V, #c_values{es=Es}) ->
-    vu_expr_list(V, Es);
-vu_body(V, Body) ->
-    vu_expr(V, Body).
-
-vu_expr(V, #c_var{name=V2}) -> V =:= V2;
-vu_expr(V, #c_cons{hd=H,tl=T}) ->
-    case vu_expr(V, H) of
-	true -> true;
-	false -> vu_expr(V, T)
-    end;
-vu_expr(V, #c_tuple{es=Es}) ->
-    vu_expr_list(V, Es);
-vu_expr(V, #c_binary{segments=Ss}) ->
-    vu_seg_list(V, Ss);
-vu_expr(V, #c_fun{vars=Vs,body=B}) ->
-    %% Variables in fun shadow previous variables
-    case vu_var_list(V, Vs) of
-	true -> false;
-	false -> vu_body(V, B)
-    end;
-vu_expr(V, #c_let{vars=Vs,arg=Arg,body=B}) ->
-    case vu_body(V, Arg) of
-	true -> true;
-	false ->
-	    %% Variables in let shadow previous variables.
-	    case vu_var_list(V, Vs) of
-		true -> false;
-		false -> vu_body(V, B)
-	    end
-    end;
-vu_expr(V, #c_letrec{defs=Fs,body=B}) ->
-    case lists:any(fun (#c_def{val=Fb}) -> vu_body(V, Fb) end, Fs) of
-	true -> true;
-	false -> vu_body(V, B)
-    end;
-vu_expr(V, #c_seq{arg=Arg,body=B}) ->
-    case vu_expr(V, Arg) of
-	true -> true;
-	false -> vu_body(V, B)
-    end;
-vu_expr(V, #c_case{arg=Arg,clauses=Cs}) ->
-    case vu_expr(V, Arg) of
-	true -> true;
-	false -> vu_clauses(V, Cs)
-    end;
-vu_expr(V, #c_receive{clauses=Cs,timeout=T,action=A}) ->
-    case vu_clauses(V, Cs) of
-	true -> true;
-	false ->
-	    case vu_expr(V, T) of
-		true -> true;
-		false -> vu_body(V, A)
-	    end
-    end;
-vu_expr(V, #c_apply{op=Op,args=As}) ->
-    vu_expr_list(V, [Op|As]);
-vu_expr(V, #c_call{module=M,name=N,args=As}) ->
-    vu_expr_list(V, [M,N|As]);
-vu_expr(V, #c_primop{args=As}) ->		%Name is an atom
-    vu_expr_list(V, As);
-vu_expr(V, #c_catch{body=B}) ->
-    vu_body(V, B);
-vu_expr(V, #c_try{arg=E,vars=Vs,body=B,evars=Evs,handler=H}) ->
-    case vu_body(V, E) of
-	true -> true;
-	false ->
-	    %% Variables shadow previous ones.
-	    case case vu_var_list(V, Vs) of
-		     true -> false;
-		     false -> vu_body(V, B)
-		 end of
-		true -> true;
-		false ->
-		    case vu_var_list(V, Evs) of
-			true -> false;
-			false -> vu_body(V, H)
-		    end
-	    end
-    end;
-vu_expr(_, _) -> false.				%Everything else
-
-vu_expr_list(V, Es) ->
-    lists:any(fun(E) -> vu_expr(V, E) end, Es).
-
-vu_seg_list(V, Ss) ->
-    lists:any(fun (#c_bitstr{val=Val,size=Size}) ->
-		      case vu_expr(V, Val) of
-			  true -> true;
-			  false -> vu_expr(V, Size)
-		      end
-	      end, Ss).
-
-%% vu_clause(VarName, Clause) -> true | false.
-%% vu_clauses(VarName, [Clause]) -> true | false.
-%%  Have to get the pattern results right.
-
-vu_clause(V, #c_clause{pats=Ps,guard=G,body=B}) ->
-    case vu_pattern_list(V, Ps) of
-	{true,_Shad} -> true;			%It is used
-	{false,true} -> false;			%Shadowed
-	{false,false} ->			%Not affected
-	    case vu_expr(V, G) of
-		true -> true;
-		false ->vu_body(V, B)
-	    end
-    end.
-
-vu_clauses(V, Cs) ->
-    lists:any(fun(C) -> vu_clause(V, C) end, Cs).
-
-%% vu_pattern(VarName, Pattern) -> {Used,Shadow}.
-%% vu_pattern_list(VarName, [Pattern]) -> {Used,Shadow}.
-%%  Binaries complicate patterns as a variable can both be properly
-%%  used, in a bit segment size, and shadow.  They can also do both.
-
-%%vu_pattern(V, Pat) -> vu_pattern(V, Pat, {false,false}).
-
-vu_pattern(V, #c_var{name=V2}, St) ->
-    setelement(2, St, V =:= V2);
-vu_pattern(V, #c_cons{hd=H,tl=T}, St0) ->
-    case vu_pattern(V, H, St0) of
-	{true,true}=St1 -> St1;			%Nothing more to know
-	St1 -> vu_pattern(V, T, St1)
-    end;
-vu_pattern(V, #c_tuple{es=Es}, St) ->
-    vu_pattern_list(V, Es, St);
-vu_pattern(V, #c_binary{segments=Ss}, St) ->
-    vu_pat_seg_list(V, Ss, St);
-vu_pattern(V, #c_alias{var=Var,pat=P}, St0) ->
-    case vu_pattern(V, Var, St0) of
-	{true,true}=St1 -> St1;
-	St1 -> vu_pattern(V, P, St1)
-    end;
-vu_pattern(_, _, St) -> St.
-
-vu_pattern_list(V, Ps) -> vu_pattern_list(V, Ps, {false,false}).
-
-vu_pattern_list(V, Ps, St0) ->
-    lists:foldl(fun(P, St) -> vu_pattern(V, P, St) end, St0, Ps).
-
-vu_pat_seg_list(V, Ss, St) ->
-    lists:foldl(fun (#c_bitstr{val=Val,size=Size}, St0) ->
-			case vu_pattern(V, Val, St0) of
-			    {true,true}=St1 -> St1;
-			    {_Used,Shad} -> {vu_expr(V, Size),Shad}
-			end
-		end, St, Ss).
-
-%% vu_var_list(VarName, [Var]) -> true | false.
-
-vu_var_list(V, Vs) ->
-    lists:any(fun (#c_var{name=V2}) -> V =:= V2 end, Vs).
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_lint.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_lint.erl
deleted file mode 100644
index 2946fcb8c0..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_lint.erl
+++ /dev/null
@@ -1,515 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: core_lint.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
-%% Purpose : Do necessary checking of Core Erlang code.
-
-%% Check Core module for errors.  Seeing this module is used in the
-%% compiler after optimisations wedone more checking than would be
-%% necessary after just parsing.  Don't check all constructs.
-%%
-%% We check the following:
-%%
-%% All referred functions, called and exported, are defined.
-%% Format of export list.
-%% Format of attributes
-%% Used variables are defined.
-%% Variables in let and funs.
-%% Patterns case clauses.
-%% Values only as multiple values/variables/patterns.
-%% Return same number of values as requested
-%% Correct number of arguments
-%%
-%% Checks to add:
-%%
-%% Consistency of values/variables
-%% Consistency of function return values/calls.
-%%
-%% We keep the names defined variables and functions in a ordered list
-%% of variable names and function name/arity pairs.
-
--module(core_lint).
-
-
--export([module/1,module/2,format_error/1]).
-
--import(lists, [reverse/1,all/2,foldl/3]).
--import(ordsets, [add_element/2,is_element/2,union/2]).
-%-import(ordsets, [subtract/2]).
-
--include("core_parse.hrl").
-
-%% Define the lint state record.
-
--record(lint, {module=[],			%Current module
-	       func=[],				%Current function
-	       errors=[],			%Errors
-	       warnings=[]}).			%Warnings
-
-%% Keep track of defined
--record(def, {vars=[],
-	      funs=[]}).
-
-%%-deftype retcount() -> any | unknown | int().
-
-%% format_error(Error)
-%%  Return a string describing the error.
-
-format_error(invalid_exports) -> "invalid exports";
-format_error(invalid_attributes) -> "invalid attributes";
-format_error({undefined_function,{F,A}}) ->
-    io_lib:format("function ~w/~w undefined", [F,A]);
-format_error({undefined_function,{F1,A1},{F2,A2}}) ->
-    io_lib:format("undefined function ~w/~w in ~w/~w", [F1,A1,F2,A2]);
-format_error({illegal_expr,{F,A}}) ->
-    io_lib:format("illegal expression in ~w/~w", [F,A]);
-format_error({illegal_guard,{F,A}}) ->
-    io_lib:format("illegal guard expression in ~w/~w", [F,A]);
-format_error({illegal_pattern,{F,A}}) ->
-    io_lib:format("illegal pattern in ~w/~w", [F,A]);
-format_error({illegal_try,{F,A}}) ->
-    io_lib:format("illegal try expression in ~w/~w", [F,A]);
-format_error({pattern_mismatch,{F,A}}) ->
-    io_lib:format("pattern count mismatch in ~w/~w", [F,A]);
-format_error({return_mismatch,{F,A}}) ->
-    io_lib:format("return count mismatch in ~w/~w", [F,A]);
-format_error({arg_mismatch,{F,A}}) ->
-    io_lib:format("argument count mismatch in ~w/~w", [F,A]);
-format_error({unbound_var,N,{F,A}}) ->
-    io_lib:format("unbound variable ~s in ~w/~w", [N,F,A]);
-format_error({duplicate_var,N,{F,A}}) ->
-    io_lib:format("duplicate variable ~s in ~w/~w", [N,F,A]);
-format_error({not_var,{F,A}}) ->
-    io_lib:format("expecting variable in ~w/~w", [F,A]);
-format_error({not_pattern,{F,A}}) ->
-    io_lib:format("expecting pattern in ~w/~w", [F,A]);
-format_error({not_bs_pattern,{F,A}}) ->
-    io_lib:format("expecting bit syntax pattern in ~w/~w", [F,A]).
-
-%% module(CoreMod) ->
-%% module(CoreMod, [CompileOption]) ->
-%%	{ok,[Warning]} | {error,[Error],[Warning]}
-
-module(M) -> module(M, []).
-
-module(#c_module{name=M,exports=Es,attrs=As,defs=Ds}, _Opts) ->
-    Defined = defined_funcs(Ds),
-    St0 = #lint{module=M#c_atom.val},
-    St1 = check_exports(Es, St0),
-    St2 = check_attrs(As, St1),
-    St3 = module_defs(Ds, Defined, St2),
-    St4 = check_state(Es, Defined, St3),
-    return_status(St4).
-
-%% defined_funcs([FuncDef]) -> [Fname].
-
-defined_funcs(Fs) ->
-    foldl(fun (#c_def{name=#c_fname{id=I,arity=A}}, Def) ->
-		  add_element({I,A}, Def)
-	  end, [], Fs).
-
-%% return_status(State) ->
-%%	{ok,[Warning]} | {error,[Error],[Warning]}
-%%  Pack errors and warnings properly and return ok | error.
-
-return_status(St) ->
-    Ws = reverse(St#lint.warnings),
-    case reverse(St#lint.errors) of
-	[] -> {ok,[{St#lint.module,Ws}]};
-	Es -> {error,[{St#lint.module,Es}],[{St#lint.module,Ws}]}
-    end.
-
-%% add_error(ErrorDescriptor, State) -> State'
-%% add_warning(ErrorDescriptor, State) -> State'
-%%  Note that we don't use line numbers here.
-
-add_error(E, St) -> St#lint{errors=[{none,core_lint,E}|St#lint.errors]}.
-
-%%add_warning(W, St) -> St#lint{warnings=[{none,core_lint,W}|St#lint.warnings]}.
-
-check_exports(Es, St) ->
-    case all(fun (#c_fname{id=Name,arity=Arity}) when
-		       atom(Name), integer(Arity) -> true;
-		 (_) -> false
-	     end, Es) of
-	true -> St;
-	false -> add_error(invalid_exports, St)
-    end.
-
-check_attrs(As, St) ->
-    case all(fun (#c_def{name=#c_atom{},val=V}) -> core_lib:is_literal(V);
-		 (_) -> false
-	     end, As) of
-	true -> St;
-	false -> add_error(invalid_attributes, St)
-    end.
-
-check_state(Es, Defined, St) ->
-    foldl(fun (#c_fname{id=N,arity=A}, St1) ->
-		  F = {N,A},
-		  case is_element(F, Defined) of
-		      true -> St1;
-		      false -> add_error({undefined_function,F}, St)
-		  end
-	  end, St, Es).
-%     Undef = subtract(Es, Defined),
-%     St1 = foldl(fun (F, St) -> add_error({undefined_function,F}, St) end,
-% 		St0, Undef),
-%     St1.
-
-%% module_defs(CoreBody, Defined, State) -> State.
-
-module_defs(B, Def, St) ->
-    %% Set top level function name.
-    foldl(fun (Func, St0) ->
-		  #c_fname{id=F,arity=A} = Func#c_def.name,
-		  St1 = St0#lint{func={F,A}},
-		  function(Func, Def, St1)
-	  end, St, B).
-
-%% functions([Fdef], Defined, State) -> State.
-
-functions(Fs, Def, St0) ->
-    foldl(fun (F, St) -> function(F, Def, St) end, St0, Fs).
-
-%% function(CoreFunc, Defined, State) -> State.
-
-function(#c_def{name=#c_fname{},val=B}, Def, St) ->
-    %% Body must be a fun!
-    case B of
-	#c_fun{} -> expr(B, Def, any, St);
-	_ -> add_error({illegal_expr,St#lint.func}, St)
-    end.
-
-%% body(Expr, Defined, RetCount, State) -> State.
-
-body(#c_values{es=Es}, Def, Rt, St) ->
-    return_match(Rt, length(Es), expr_list(Es, Def, St));
-body(E, Def, Rt, St0) ->
-    St1 = expr(E, Def, Rt, St0),
-    case core_lib:is_simple_top(E) of
-	true -> return_match(Rt, 1, St1);
-	false -> St1
-    end.
-
-%% guard(Expr, Defined, State) -> State.
-%%  Guards are boolean expressions with test wrapped in a protected.
-
-guard(Expr, Def, St) -> gexpr(Expr, Def, 1, St).
-
-%% guard_list([Expr], Defined, State) -> State.
-
-%% guard_list(Es, Def, St0) ->
-%%     foldl(fun (E, St) -> guard(E, Def, St) end, St0, Es).
-
-%% gbody(Expr, Defined, RetCount, State) -> State.
-
-gbody(#c_values{es=Es}, Def, Rt, St) ->
-    return_match(Rt, length(Es), gexpr_list(Es, Def, St));
-gbody(E, Def, Rt, St0) ->
-    St1 = gexpr(E, Def, Rt, St0),
-    case core_lib:is_simple_top(E) of
-	true -> return_match(Rt, 1, St1);
-	false -> St1
-    end.
-
-gexpr(#c_var{name=N}, Def, _Rt, St) -> expr_var(N, Def, St);
-gexpr(#c_int{}, _Def, _Rt, St) -> St;
-gexpr(#c_float{}, _Def, _Rt, St) -> St;
-gexpr(#c_atom{}, _Def, _Rt, St) -> St;
-gexpr(#c_char{}, _Def, _Rt, St) -> St;
-gexpr(#c_string{}, _Def, _Rt, St) -> St;
-gexpr(#c_nil{}, _Def, _Rt, St) -> St;
-gexpr(#c_cons{hd=H,tl=T}, Def, _Rt, St) ->
-    gexpr_list([H,T], Def, St);
-gexpr(#c_tuple{es=Es}, Def, _Rt, St) ->
-    gexpr_list(Es, Def, St);
-gexpr(#c_binary{segments=Ss}, Def, _Rt, St) ->
-    gbitstr_list(Ss, Def, St);
-gexpr(#c_seq{arg=Arg,body=B}, Def, Rt, St0) ->
-    St1 = gexpr(Arg, Def, any, St0),		%Ignore values
-    gbody(B, Def, Rt, St1);
-gexpr(#c_let{vars=Vs,arg=Arg,body=B}, Def, Rt, St0) ->
-    St1 = gbody(Arg, Def, let_varcount(Vs), St0), %This is a guard body
-    {Lvs,St2} = variable_list(Vs, St1),
-    gbody(B, union(Lvs, Def), Rt, St2);
-gexpr(#c_call{module=#c_atom{val=erlang},
-	      name=#c_atom{},
-	      args=As}, Def, 1, St) ->
-    gexpr_list(As, Def, St);
-gexpr(#c_primop{name=N,args=As}, Def, _Rt, St0) when record(N, c_atom) ->
-    gexpr_list(As, Def, St0);
-gexpr(#c_try{arg=E,vars=[#c_var{name=X}],body=#c_var{name=X},
-	     evars=[#c_var{},#c_var{},#c_var{}],handler=#c_atom{val=false}},
-      Def, Rt, St) ->
-    gbody(E, Def, Rt, St);
-gexpr(_, _, _, St) ->
-    add_error({illegal_guard,St#lint.func}, St).
-
-%% gexpr_list([Expr], Defined, State) -> State.
-
-gexpr_list(Es, Def, St0) ->
-    foldl(fun (E, St) -> gexpr(E, Def, 1, St) end, St0, Es).
-
-%% gbitstr_list([Elem], Defined, State) -> State.
-
-gbitstr_list(Es, Def, St0) ->
-    foldl(fun (E, St) -> gbitstr(E, Def, St) end, St0, Es).
-
-gbitstr(#c_bitstr{val=V,size=S,unit=U,type=T,flags=Fs}, Def, St0) ->
-    St1 = bit_type(U, T, Fs, St0),
-    gexpr_list([V,S], Def, St1).
-
-%% expr(Expr, Defined, RetCount, State) -> State.
-
-expr(#c_var{name=N}, Def, _Rt, St) -> expr_var(N, Def, St);
-expr(#c_int{}, _Def, _Rt, St) -> St;
-expr(#c_float{}, _Def, _Rt, St) -> St;
-expr(#c_atom{}, _Def, _Rt, St) -> St;
-expr(#c_char{}, _Def, _Rt, St) -> St;
-expr(#c_string{}, _Def, _Rt, St) -> St;
-expr(#c_nil{}, _Def, _Rt, St) -> St;
-expr(#c_cons{hd=H,tl=T}, Def, _Rt, St) ->
-    expr_list([H,T], Def, St);
-expr(#c_tuple{es=Es}, Def, _Rt, St) ->
-    expr_list(Es, Def, St);
-expr(#c_binary{segments=Ss}, Def, _Rt, St) ->
-    bitstr_list(Ss, Def, St);
-expr(#c_fname{id=I,arity=A}, Def, _Rt, St) ->
-    expr_fname({I,A}, Def, St);
-expr(#c_fun{vars=Vs,body=B}, Def, Rt, St0) ->
-    {Vvs,St1} = variable_list(Vs, St0),
-    return_match(Rt, 1, body(B, union(Vvs, Def), any, St1));
-expr(#c_seq{arg=Arg,body=B}, Def, Rt, St0) ->
-    St1 = expr(Arg, Def, any, St0),		%Ignore values
-    body(B, Def, Rt, St1);
-expr(#c_let{vars=Vs,arg=Arg,body=B}, Def, Rt, St0) ->
-    St1 = body(Arg, Def, let_varcount(Vs), St0), %This is a body
-    {Lvs,St2} = variable_list(Vs, St1),
-    body(B, union(Lvs, Def), Rt, St2);
-expr(#c_letrec{defs=Fs,body=B}, Def0, Rt, St0) ->
-    Def1 = union(defined_funcs(Fs), Def0),	%All defined stuff
-    St1 = functions(Fs, Def1, St0),
-    body(B, Def1, Rt, St1#lint{func=St0#lint.func});
-expr(#c_case{arg=Arg,clauses=Cs}, Def, Rt, St0) ->
-    Pc = case_patcount(Cs),
-    St1 = body(Arg, Def, Pc, St0),
-    clauses(Cs, Def, Pc, Rt, St1);
-expr(#c_receive{clauses=Cs,timeout=T,action=A}, Def, Rt, St0) ->
-    St1 = expr(T, Def, 1, St0),
-    St2 = body(A, Def, Rt, St1),
-    clauses(Cs, Def, 1, Rt, St2);
-expr(#c_apply{op=Op,args=As}, Def, _Rt, St0) ->
-    St1 = apply_op(Op, Def, length(As), St0),
-    expr_list(As, Def, St1);
-expr(#c_call{module=M,name=N,args=As}, Def, _Rt, St0) ->
-    St1 = expr(M, Def, 1, St0),
-    St2 = expr(N, Def, 1, St1),
-    expr_list(As, Def, St2);
-expr(#c_primop{name=N,args=As}, Def, _Rt, St0) when record(N, c_atom) ->
-    expr_list(As, Def, St0);
-expr(#c_catch{body=B}, Def, Rt, St) ->
-    return_match(Rt, 1, body(B, Def, 1, St));
-expr(#c_try{arg=A,vars=Vs,body=B,evars=Evs,handler=H}, Def, Rt, St0) ->
-    St1 = case length(Evs) of
-	      2 -> St0;
-	      _ -> add_error({illegal_try,St0#lint.func}, St0)
-	  end,
-    St2 = body(A, Def, let_varcount(Vs), St1),
-    {Ns,St3} = variable_list(Vs, St2),
-    St4 = body(B, union(Ns, Def), Rt, St3),
-    {Ens,St5} = variable_list(Evs, St4),
-    body(H, union(Ens, Def), Rt, St5);
-expr(_, _, _, St) ->
-    %%io:fwrite("clint: ~p~n", [Other]),
-    add_error({illegal_expr,St#lint.func}, St).
-
-%% expr_list([Expr], Defined, State) -> State.
-
-expr_list(Es, Def, St0) ->
-    foldl(fun (E, St) -> expr(E, Def, 1, St) end, St0, Es).
-
-%% bitstr_list([Elem], Defined, State) -> State.
-
-bitstr_list(Es, Def, St0) ->
-    foldl(fun (E, St) -> bitstr(E, Def, St) end, St0, Es).
-
-bitstr(#c_bitstr{val=V,size=S,unit=U,type=T,flags=Fs}, Def, St0) ->
-    St1 = bit_type(U, T, Fs, St0),
-    expr_list([V,S], Def, St1).
-
-%% apply_op(Op, Defined, ArgCount, State) -> State.
-%%  A apply op is either an fname or an expression.
-
-apply_op(#c_fname{id=I,arity=A}, Def, Ac, St0) ->
-    St1 = expr_fname({I,A}, Def, St0),
-    arg_match(Ac, A, St1);
-apply_op(E, Def, _, St) -> expr(E, Def, 1, St).	%Hard to check
-
-%% expr_var(VarName, Defined, State) -> State.
-
-expr_var(N, Def, St) ->
-    case is_element(N, Def) of
-	true -> St;
-	false -> add_error({unbound_var,N,St#lint.func}, St)
-    end.
-
-%% expr_fname(Fname, Defined, State) -> State.
-
-expr_fname(Fname, Def, St) ->
-    case is_element(Fname, Def) of
-	true -> St;
-	false -> add_error({undefined_function,Fname,St#lint.func}, St)
-    end.
-
-%% let_varcount([Var]) -> int().
-
-let_varcount([]) -> any;			%Ignore values
-let_varcount(Es) -> length(Es).
-
-%% case_patcount([Clause]) -> int().
-
-case_patcount([#c_clause{pats=Ps}|_]) -> length(Ps).
-
-%% clauses([Clause], Defined, PatCount, RetCount, State) -> State.
-
-clauses(Cs, Def, Pc, Rt, St0) ->
-    foldl(fun (C, St) -> clause(C, Def, Pc, Rt, St) end, St0, Cs).
-
-%% clause(Clause, Defined, PatCount, RetCount, State) -> State.
-
-clause(#c_clause{pats=Ps,guard=G,body=B}, Def0, Pc, Rt, St0) ->
-    St1 = pattern_match(Pc, length(Ps), St0),
-    {Pvs,St2} = pattern_list(Ps, Def0, St1),
-    Def1 = union(Pvs, Def0),
-    St3 = guard(G, Def1, St2),
-    body(B, Def1, Rt, St3).
-
-%% variable(Var, [PatVar], State) -> {[VarName],State}.
-
-variable(#c_var{name=N}, Ps, St) ->
-    case is_element(N, Ps) of
-	true -> {[],add_error({duplicate_var,N,St#lint.func}, St)};
-	false -> {[N],St}
-    end;
-variable(_, Def, St) -> {Def,add_error({not_var,St#lint.func}, St)}.
-
-%% variable_list([Var], State) -> {[Var],State}.
-%% variable_list([Var], [PatVar], State) -> {[Var],State}.
-
-variable_list(Vs, St) -> variable_list(Vs, [], St).
-
-variable_list(Vs, Ps, St) ->
-    foldl(fun (V, {Ps0,St0}) ->
-		  {Vvs,St1} = variable(V, Ps0, St0),
-		  {union(Vvs, Ps0),St1}
-	  end, {Ps,St}, Vs).
-
-%% pattern(Pattern, Defined, State) -> {[PatVar],State}.
-%% pattern(Pattern, Defined, [PatVar], State) -> {[PatVar],State}.
-%%  Patterns are complicated by sizes in binaries.  These are pure
-%%  input variables which create no bindings.  We, therefor, need to
-%%  carry around the original defined variables to get the correct
-%%  handling.
-
-%% pattern(P, Def, St) -> pattern(P, Def, [], St).
-
-pattern(#c_var{name=N}, Def, Ps, St) ->
-    pat_var(N, Def, Ps, St);
-pattern(#c_int{}, _Def, Ps, St) -> {Ps,St};
-pattern(#c_float{}, _Def, Ps, St) -> {Ps,St};
-pattern(#c_atom{}, _Def, Ps, St) -> {Ps,St};
-pattern(#c_char{}, _Def, Ps, St) -> {Ps,St};
-pattern(#c_string{}, _Def, Ps, St) -> {Ps,St};
-pattern(#c_nil{}, _Def, Ps, St) -> {Ps,St};
-pattern(#c_cons{hd=H,tl=T}, Def, Ps, St) ->
-    pattern_list([H,T], Def, Ps, St);
-pattern(#c_tuple{es=Es}, Def, Ps, St) ->
-    pattern_list(Es, Def, Ps, St);
-pattern(#c_binary{segments=Ss}, Def, Ps, St) ->
-    pat_bin(Ss, Def, Ps, St);
-pattern(#c_alias{var=V,pat=P}, Def, Ps, St0) ->
-    {Vvs,St1} = variable(V, Ps, St0),
-    pattern(P, Def, union(Vvs, Ps), St1);
-pattern(_, _, Ps, St) -> {Ps,add_error({not_pattern,St#lint.func}, St)}.
-
-pat_var(N, _Def, Ps, St) ->
-    case is_element(N, Ps) of
-	true -> {Ps,add_error({duplicate_var,N,St#lint.func}, St)};
-	false -> {add_element(N, Ps),St}
-    end.
-
-%% pat_bin_list([Elem], Defined, [PatVar], State) -> {[PatVar],State}.
-
-pat_bin(Es, Def, Ps0, St0) ->
-    foldl(fun (E, {Ps,St}) -> pat_segment(E, Def, Ps, St) end, {Ps0,St0}, Es).
-
-pat_segment(#c_bitstr{val=V,size=S,unit=U,type=T,flags=Fs}, Def, Ps, St0) ->
-    St1 = bit_type(U, T, Fs, St0),
-    St2 = pat_bit_expr(S, T, Def, St1),
-    pattern(V, Def, Ps, St2);
-pat_segment(_, _, Ps, St) ->
-    {Ps,add_error({not_bs_pattern,St#lint.func}, St)}.
-
-%% pat_bit_expr(SizePat, Type, Defined, State) -> State.
-%%  Check the Size pattern, this is an input!  Be a bit tough here.
-
-pat_bit_expr(#c_int{val=I}, _, _, St) when I >= 0 -> St;
-pat_bit_expr(#c_var{name=N}, _, Def, St) ->
-    expr_var(N, Def, St);
-pat_bit_expr(#c_atom{val=all}, binary, _Def, St) -> St;
-pat_bit_expr(_, _, _, St) ->
-    add_error({illegal_expr,St#lint.func}, St).
-
-bit_type(Unit, Type, Flags, St) ->
-    U = core_lib:literal_value(Unit),
-    T = core_lib:literal_value(Type),
-    Fs = core_lib:literal_value(Flags),
-    case erl_bits:set_bit_type(default, [T,{unit,U}|Fs]) of
-	{ok,_,_} -> St;
-	{error,E} -> add_error({E,St#lint.func}, St)
-    end.
-
-%% pattern_list([Var], Defined, State) -> {[PatVar],State}.
-%% pattern_list([Var], Defined, [PatVar], State) -> {[PatVar],State}.
-
-pattern_list(Pats, Def, St) -> pattern_list(Pats, Def, [], St).
-
-pattern_list(Pats, Def, Ps0, St0) ->
-    foldl(fun (P, {Ps,St}) -> pattern(P, Def, Ps, St) end, {Ps0,St0}, Pats).
-
-%% pattern_match(Required, Supplied, State) -> State.
-%%  Check that the required number of patterns match the supplied.
-
-pattern_match(N, N, St) -> St;
-pattern_match(_Req, _Sup, St) ->
-    add_error({pattern_mismatch,St#lint.func}, St).
-
-%% return_match(Required, Supplied, State) -> State.
-%%  Check that the required number of return values match the supplied.
-
-return_match(any, _Sup, St) -> St;
-return_match(_Req, unknown, St) -> St;
-return_match(N, N, St) -> St;
-return_match(_Req, _Sup, St) ->
-    add_error({return_mismatch,St#lint.func}, St).
-
-%% arg_match(Required, Supplied, State) -> State.
-
-arg_match(_Req, unknown, St) -> St;
-arg_match(N, N, St) -> St;
-arg_match(_Req, _Sup, St) ->
-    add_error({arg_mismatch,St#lint.func}, St).
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_parse.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_parse.erl
deleted file mode 100644
index 942845bef7..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_parse.erl
+++ /dev/null
@@ -1,4911 +0,0 @@
--module(core_parse).
--define(THIS_MODULE, core_parse).
--export([parse/1, parse_and_scan/1, format_error/1]).
-
--export([abstract/1,abstract/2,normalise/1]).
-
-%% The following directive is needed for (significantly) faster compilation
-%% of the generated .erl file by the HiPE compiler.  Please do not remove.
--compile([{hipe,[{regalloc,linear_scan}]}]).
-
--include("core_parse.hrl").
-
-tok_val(T) -> element(3, T).
-tok_line(T) -> element(2, T).
-
-abstract(T, _N) -> abstract(T).
-
-abstract(Term) -> core_lib:make_literal(Term).
-
-normalise(Core) -> core_lib:literal_value(Core).
-
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: core_parse.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% The parser generator will insert appropriate declarations before this line.%
-
-parse(Tokens) ->
-    case catch yeccpars1(Tokens, false, 0, [], []) of
-	error ->
-	    Errorline =
-		if Tokens == [] -> 0; true -> element(2, hd(Tokens)) end,
-	    {error,
-	     {Errorline, ?THIS_MODULE, "syntax error at or after this line."}};
-	Other ->
-	    Other
-    end.
-
-parse_and_scan({Mod, Fun, Args}) ->
-    case apply(Mod, Fun, Args) of
-	{eof, _} ->
-	    {ok, eof};
-	{error, Descriptor, _} ->
-	    {error, Descriptor};
-	{ok, Tokens, _} ->
-	    yeccpars1(Tokens, {Mod, Fun, Args}, 0, [], [])
-    end.
-
-format_error(Message) ->
-    case io_lib:deep_char_list(Message) of
-	true ->
-	    Message;
-	_ ->
-	    io_lib:write(Message)
-    end.
-
-% To be used in grammar files to throw an error message to the parser toplevel.
-% Doesn't have to be exported!
-return_error(Line, Message) ->
-    throw({error, {Line, ?THIS_MODULE, Message}}).
-
-
-% Don't change yeccpars1/6 too much, it is called recursively by yeccpars2/8!
-yeccpars1([Token | Tokens], Tokenizer, State, States, Vstack) ->
-    yeccpars2(State, element(1, Token), States, Vstack, Token, Tokens,
-	      Tokenizer);
-yeccpars1([], {M, F, A}, State, States, Vstack) ->
-    case catch apply(M, F, A) of
-        {eof, Endline} ->
-            {error, {Endline, ?THIS_MODULE, "end_of_file"}};
-        {error, Descriptor, _Endline} ->
-            {error, Descriptor};
-        {'EXIT', Reason} ->
-            {error, {0, ?THIS_MODULE, Reason}};
-        {ok, Tokens, _Endline} ->
-	    case catch yeccpars1(Tokens, {M, F, A}, State, States, Vstack) of
-		error ->
-		    Errorline = element(2, hd(Tokens)),
-		    {error, {Errorline, ?THIS_MODULE,
-			     "syntax error at or after this line."}};
-		Other ->
-		    Other
-	    end
-    end;
-yeccpars1([], false, State, States, Vstack) ->
-    yeccpars2(State, '$end', States, Vstack, {'$end', 999999}, [], false).
-
-% For internal use only.
-yeccerror(Token) ->
-    {error,
-     {element(2, Token), ?THIS_MODULE,
-      ["syntax error before: ", yecctoken2string(Token)]}}.
-
-yecctoken2string({atom, _, A}) -> io_lib:write(A);
-yecctoken2string({integer,_,N}) -> io_lib:write(N);
-yecctoken2string({float,_,F}) -> io_lib:write(F);
-yecctoken2string({char,_,C}) -> io_lib:write_char(C);
-yecctoken2string({var,_,V}) -> io_lib:format('~s', [V]);
-yecctoken2string({string,_,S}) -> io_lib:write_string(S);
-yecctoken2string({reserved_symbol, _, A}) -> io_lib:format('~w', [A]);
-yecctoken2string({_Cat, _, Val}) -> io_lib:format('~w', [Val]);
-
-yecctoken2string({'dot', _}) -> io_lib:format('~w', ['.']);
-yecctoken2string({'$end', _}) ->
-    [];
-yecctoken2string({Other, _}) when atom(Other) ->
-    io_lib:format('~w', [Other]);
-yecctoken2string(Other) ->
-    io_lib:write(Other).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-yeccpars2(0, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 1, [0 | __Ss], [__T | __Stack]);
-yeccpars2(0, 'module', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 2, [0 | __Ss], [__T | __Stack]);
-yeccpars2(0, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(1, 'module', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 313, [1 | __Ss], [__T | __Stack]);
-yeccpars2(1, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(2, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 4, [2 | __Ss], [__T | __Stack]);
-yeccpars2(2, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(3, '$end', _, __Stack, _, _, _) ->
- {ok, hd(__Stack)};
-yeccpars2(3, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(4, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 5, [4 | __Ss], [__T | __Stack]);
-yeccpars2(4, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(5, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 11, [5 | __Ss], [__T | __Stack]);
-yeccpars2(5, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 306, [5 | __Ss], [__T | __Stack]);
-yeccpars2(5, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(6, 'attributes', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 7, [6 | __Ss], [__T | __Stack]);
-yeccpars2(6, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(7, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 276, [7 | __Ss], [__T | __Stack]);
-yeccpars2(7, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(8, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 9, [8 | __Ss], [__T | __Stack]);
-yeccpars2(8, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 11, [8 | __Ss], [__T | __Stack]);
-yeccpars2(8, __Cat, __Ss,  __Stack, __T, __Ts, __Tzr) ->
- __Val =  [],
- yeccpars2(13, __Cat, [8 | __Ss], [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(9, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 11, [9 | __Ss], [__T | __Stack]);
-yeccpars2(9, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(10, '=', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 20, [10 | __Ss], [__T | __Stack]);
-yeccpars2(10, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(11, '/', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 18, [11 | __Ss], [__T | __Stack]);
-yeccpars2(11, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(12, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 9, [12 | __Ss], [__T | __Stack]);
-yeccpars2(12, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 11, [12 | __Ss], [__T | __Stack]);
-yeccpars2(12, __Cat, __Ss,  __Stack, __T, __Ts, __Tzr) ->
- __Val =  [],
- yeccpars2(17, __Cat, [12 | __Ss], [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(13, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(module_defs, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(14, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(anno_function_name, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(15, 'end', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 16, [15 | __Ss], [__T | __Stack]);
-yeccpars2(15, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(16, __Cat, __Ss,  [__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_module{name = #c_atom{val = tok_val(__2)}, exports = __3, attrs = __4, defs = __5},
- __Nss = lists:nthtail(5, __Ss),
- yeccpars2(yeccgoto(module_definition, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(17, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1|__2],
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(function_definitions, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(18, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 19, [18 | __Ss], [__T | __Stack]);
-yeccpars2(18, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(19, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_fname{id = tok_val(__1), arity = tok_val(__3)},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(function_name, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(20, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [20 | __Ss], [__T | __Stack]);
-yeccpars2(20, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 21, [20 | __Ss], [__T | __Stack]);
-yeccpars2(20, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(21, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [21 | __Ss], [__T | __Stack]);
-yeccpars2(21, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(22, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_def{name = __1, val = __3},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(function_definition, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(23, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 25, [23 | __Ss], [__T | __Stack]);
-yeccpars2(23, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(24, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(anno_fun, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(25, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 27, [25 | __Ss], [__T | __Stack]);
-yeccpars2(25, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 26, [25 | __Ss], [__T | __Stack]);
-yeccpars2(25, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [25 | __Ss], [__T | __Stack]);
-yeccpars2(25, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(26, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [26 | __Ss], [__T | __Stack]);
-yeccpars2(26, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(27, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 265, [27 | __Ss], [__T | __Stack]);
-yeccpars2(27, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(28, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 263, [28 | __Ss], [__T | __Stack]);
-yeccpars2(28, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(anno_variables, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(29, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 32, [29 | __Ss], [__T | __Stack]);
-yeccpars2(29, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(30, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_var{name = tok_val(__1)},
- yeccpars2(yeccgoto(variable, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(31, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(anno_variable, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(32, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 33, [32 | __Ss], [__T | __Stack]);
-yeccpars2(32, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(33, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [33 | __Ss], [__T | __Stack]);
-yeccpars2(33, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(34, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 247, [34 | __Ss], [__T | __Stack]);
-yeccpars2(34, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(35, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [35 | __Ss], [__T | __Stack]);
-yeccpars2(35, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(36, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 240, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [36 | __Ss], [__T | __Stack]);
-yeccpars2(36, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(37, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 149, [37 | __Ss], [__T | __Stack]);
-yeccpars2(37, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(38, __Cat, __Ss,  [__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_fun{vars = __3, body = __6},
- __Nss = lists:nthtail(5, __Ss),
- yeccpars2(yeccgoto(fun_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(39, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(40, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [40 | __Ss], [__T | __Stack]);
-yeccpars2(40, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(41, '/', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 18, [41 | __Ss], [__T | __Stack]);
-yeccpars2(41, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_atom{val = tok_val(__1)},
- yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(42, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(43, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(44, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [44 | __Ss], [__T | __Stack]);
-yeccpars2(44, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(45, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(46, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [46 | __Ss], [__T | __Stack]);
-yeccpars2(46, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(47, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(48, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [48 | __Ss], [__T | __Stack]);
-yeccpars2(48, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(49, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(50, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_char{val = tok_val(__1)},
- yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(51, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(52, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [52 | __Ss], [__T | __Stack]);
-yeccpars2(52, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(53, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(anno_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(54, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_float{val = tok_val(__1)},
- yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(55, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(56, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(57, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_int{val = tok_val(__1)},
- yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(58, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 83, [58 | __Ss], [__T | __Stack]);
-yeccpars2(58, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 26, [58 | __Ss], [__T | __Stack]);
-yeccpars2(58, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [58 | __Ss], [__T | __Stack]);
-yeccpars2(58, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(59, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(60, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 9, [60 | __Ss], [__T | __Stack]);
-yeccpars2(60, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 11, [60 | __Ss], [__T | __Stack]);
-yeccpars2(60, __Cat, __Ss,  __Stack, __T, __Ts, __Tzr) ->
- __Val =  [],
- yeccpars2(210, __Cat, [60 | __Ss], [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(61, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(62, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_nil{},
- yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(63, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 208, [63 | __Ss], [__T | __Stack]);
-yeccpars2(63, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(64, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(65, 'after', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 99, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 97, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 96, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [65 | __Ss], [__T | __Stack]);
-yeccpars2(65, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(66, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(67, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(68, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(69, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_string{val = tok_val(__1)},
- yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(70, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [70 | __Ss], [__T | __Stack]);
-yeccpars2(70, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(71, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(72, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(73, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(single_expression, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(74, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 77, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [74 | __Ss], [__T | __Stack]);
-yeccpars2(74, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(75, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 79, [75 | __Ss], [__T | __Stack]);
-yeccpars2(75, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(anno_expressions, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(76, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 78, [76 | __Ss], [__T | __Stack]);
-yeccpars2(76, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(77, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_tuple{es = []},
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(tuple, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(78, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_tuple{es = __2},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tuple, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(79, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [79 | __Ss], [__T | __Stack]);
-yeccpars2(79, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(80, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1|__3],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(anno_expressions, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(81, 'of', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 82, [81 | __Ss], [__T | __Stack]);
-yeccpars2(81, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(82, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 83, [82 | __Ss], [__T | __Stack]);
-yeccpars2(82, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 26, [82 | __Ss], [__T | __Stack]);
-yeccpars2(82, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [82 | __Ss], [__T | __Stack]);
-yeccpars2(82, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(83, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 92, [83 | __Ss], [__T | __Stack]);
-yeccpars2(83, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 26, [83 | __Ss], [__T | __Stack]);
-yeccpars2(83, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [83 | __Ss], [__T | __Stack]);
-yeccpars2(83, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(84, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(let_vars, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(85, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 86, [85 | __Ss], [__T | __Stack]);
-yeccpars2(85, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(86, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [86 | __Ss], [__T | __Stack]);
-yeccpars2(86, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(87, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 88, [87 | __Ss], [__T | __Stack]);
-yeccpars2(87, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(88, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 83, [88 | __Ss], [__T | __Stack]);
-yeccpars2(88, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 26, [88 | __Ss], [__T | __Stack]);
-yeccpars2(88, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [88 | __Ss], [__T | __Stack]);
-yeccpars2(88, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(89, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 90, [89 | __Ss], [__T | __Stack]);
-yeccpars2(89, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(90, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [90 | __Ss], [__T | __Stack]);
-yeccpars2(90, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(91, __Cat, __Ss,  [__10,__9,__8,__7,__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  if length(__8) == 2 -> #c_try{arg = __2, vars = __4, body = __6, evars = __8, handler = __10}; true -> return_error(tok_line(__7),"expected 2 exception variables in 'try'") end,
- __Nss = lists:nthtail(9, __Ss),
- yeccpars2(yeccgoto(try_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(92, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [],
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(let_vars, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(93, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 94, [93 | __Ss], [__T | __Stack]);
-yeccpars2(93, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(94, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __2,
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(let_vars, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(95, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 190, [95 | __Ss], [__T | __Stack]);
-yeccpars2(95, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(96, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 97, [96 | __Ss], [__T | __Stack]);
-yeccpars2(96, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [96 | __Ss], [__T | __Stack]);
-yeccpars2(96, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [96 | __Ss], [__T | __Stack]);
-yeccpars2(96, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [96 | __Ss], [__T | __Stack]);
-yeccpars2(96, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [96 | __Ss], [__T | __Stack]);
-yeccpars2(96, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [96 | __Ss], [__T | __Stack]);
-yeccpars2(96, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 115, [96 | __Ss], [__T | __Stack]);
-yeccpars2(96, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [96 | __Ss], [__T | __Stack]);
-yeccpars2(96, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [96 | __Ss], [__T | __Stack]);
-yeccpars2(96, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [96 | __Ss], [__T | __Stack]);
-yeccpars2(96, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [96 | __Ss], [__T | __Stack]);
-yeccpars2(96, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(97, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 182, [97 | __Ss], [__T | __Stack]);
-yeccpars2(97, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [97 | __Ss], [__T | __Stack]);
-yeccpars2(97, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [97 | __Ss], [__T | __Stack]);
-yeccpars2(97, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [97 | __Ss], [__T | __Stack]);
-yeccpars2(97, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [97 | __Ss], [__T | __Stack]);
-yeccpars2(97, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [97 | __Ss], [__T | __Stack]);
-yeccpars2(97, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 115, [97 | __Ss], [__T | __Stack]);
-yeccpars2(97, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [97 | __Ss], [__T | __Stack]);
-yeccpars2(97, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [97 | __Ss], [__T | __Stack]);
-yeccpars2(97, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [97 | __Ss], [__T | __Stack]);
-yeccpars2(97, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [97 | __Ss], [__T | __Stack]);
-yeccpars2(97, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(98, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [98 | __Ss], [__T | __Stack]);
-yeccpars2(98, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [98 | __Ss], [__T | __Stack]);
-yeccpars2(98, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [98 | __Ss], [__T | __Stack]);
-yeccpars2(98, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [98 | __Ss], [__T | __Stack]);
-yeccpars2(98, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [98 | __Ss], [__T | __Stack]);
-yeccpars2(98, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 115, [98 | __Ss], [__T | __Stack]);
-yeccpars2(98, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [98 | __Ss], [__T | __Stack]);
-yeccpars2(98, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [98 | __Ss], [__T | __Stack]);
-yeccpars2(98, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [98 | __Ss], [__T | __Stack]);
-yeccpars2(98, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [98 | __Ss], [__T | __Stack]);
-yeccpars2(98, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 149, [98 | __Ss], [__T | __Stack]);
-yeccpars2(98, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(99, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [99 | __Ss], [__T | __Stack]);
-yeccpars2(99, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(100, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 97, [100 | __Ss], [__T | __Stack]);
-yeccpars2(100, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 96, [100 | __Ss], [__T | __Stack]);
-yeccpars2(100, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [100 | __Ss], [__T | __Stack]);
-yeccpars2(100, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [100 | __Ss], [__T | __Stack]);
-yeccpars2(100, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [100 | __Ss], [__T | __Stack]);
-yeccpars2(100, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [100 | __Ss], [__T | __Stack]);
-yeccpars2(100, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [100 | __Ss], [__T | __Stack]);
-yeccpars2(100, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [100 | __Ss], [__T | __Stack]);
-yeccpars2(100, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [100 | __Ss], [__T | __Stack]);
-yeccpars2(100, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [100 | __Ss], [__T | __Stack]);
-yeccpars2(100, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [100 | __Ss], [__T | __Stack]);
-yeccpars2(100, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(anno_clauses, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(101, 'after', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 99, [101 | __Ss], [__T | __Stack]);
-yeccpars2(101, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(102, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(clause_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(103, '=', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 162, [103 | __Ss], [__T | __Stack]);
-yeccpars2(103, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(anno_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(104, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_atom{val = tok_val(__1)},
- yeccpars2(yeccgoto(atomic_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(105, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(atomic_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(106, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(other_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(107, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(other_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(108, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(anno_clause, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(109, 'when', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 164, [109 | __Ss], [__T | __Stack]);
-yeccpars2(109, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(110, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(other_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(111, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(anno_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(112, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val = begin
-   {T,A} = __2, #c_receive{clauses = [], timeout = T, action = A}
-  end,
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(receive_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(113, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(other_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(114, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [114 | __Ss], [__T | __Stack]);
-yeccpars2(114, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [114 | __Ss], [__T | __Stack]);
-yeccpars2(114, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [114 | __Ss], [__T | __Stack]);
-yeccpars2(114, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [114 | __Ss], [__T | __Stack]);
-yeccpars2(114, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [114 | __Ss], [__T | __Stack]);
-yeccpars2(114, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 115, [114 | __Ss], [__T | __Stack]);
-yeccpars2(114, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [114 | __Ss], [__T | __Stack]);
-yeccpars2(114, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [114 | __Ss], [__T | __Stack]);
-yeccpars2(114, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [114 | __Ss], [__T | __Stack]);
-yeccpars2(114, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [114 | __Ss], [__T | __Stack]);
-yeccpars2(114, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 118, [114 | __Ss], [__T | __Stack]);
-yeccpars2(114, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(115, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [115 | __Ss], [__T | __Stack]);
-yeccpars2(115, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [115 | __Ss], [__T | __Stack]);
-yeccpars2(115, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [115 | __Ss], [__T | __Stack]);
-yeccpars2(115, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [115 | __Ss], [__T | __Stack]);
-yeccpars2(115, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [115 | __Ss], [__T | __Stack]);
-yeccpars2(115, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 26, [115 | __Ss], [__T | __Stack]);
-yeccpars2(115, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [115 | __Ss], [__T | __Stack]);
-yeccpars2(115, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [115 | __Ss], [__T | __Stack]);
-yeccpars2(115, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [115 | __Ss], [__T | __Stack]);
-yeccpars2(115, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [115 | __Ss], [__T | __Stack]);
-yeccpars2(115, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(116, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 120, [116 | __Ss], [__T | __Stack]);
-yeccpars2(116, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(anno_patterns, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(117, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 119, [117 | __Ss], [__T | __Stack]);
-yeccpars2(117, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(118, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_tuple{es = []},
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(tuple_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(119, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_tuple{es = __2},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tuple_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(120, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [120 | __Ss], [__T | __Stack]);
-yeccpars2(120, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [120 | __Ss], [__T | __Stack]);
-yeccpars2(120, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [120 | __Ss], [__T | __Stack]);
-yeccpars2(120, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [120 | __Ss], [__T | __Stack]);
-yeccpars2(120, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [120 | __Ss], [__T | __Stack]);
-yeccpars2(120, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 115, [120 | __Ss], [__T | __Stack]);
-yeccpars2(120, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [120 | __Ss], [__T | __Stack]);
-yeccpars2(120, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [120 | __Ss], [__T | __Stack]);
-yeccpars2(120, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [120 | __Ss], [__T | __Stack]);
-yeccpars2(120, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [120 | __Ss], [__T | __Stack]);
-yeccpars2(120, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(121, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1|__3],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(anno_patterns, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(122, '=', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 162, [122 | __Ss], [__T | __Stack]);
-yeccpars2(122, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(123, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 159, [123 | __Ss], [__T | __Stack]);
-yeccpars2(123, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(124, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 125, [124 | __Ss], [__T | __Stack]);
-yeccpars2(124, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(anno_variable, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(125, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 126, [125 | __Ss], [__T | __Stack]);
-yeccpars2(125, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(126, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 129, [126 | __Ss], [__T | __Stack]);
-yeccpars2(126, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 142, [126 | __Ss], [__T | __Stack]);
-yeccpars2(126, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 140, [126 | __Ss], [__T | __Stack]);
-yeccpars2(126, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 131, [126 | __Ss], [__T | __Stack]);
-yeccpars2(126, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 137, [126 | __Ss], [__T | __Stack]);
-yeccpars2(126, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 138, [126 | __Ss], [__T | __Stack]);
-yeccpars2(126, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 133, [126 | __Ss], [__T | __Stack]);
-yeccpars2(126, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 130, [126 | __Ss], [__T | __Stack]);
-yeccpars2(126, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(127, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 128, [127 | __Ss], [__T | __Stack]);
-yeccpars2(127, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(128, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  core_lib:set_anno(__2,__4),
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(anno_variable, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(129, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 129, [129 | __Ss], [__T | __Stack]);
-yeccpars2(129, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 142, [129 | __Ss], [__T | __Stack]);
-yeccpars2(129, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 140, [129 | __Ss], [__T | __Stack]);
-yeccpars2(129, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 131, [129 | __Ss], [__T | __Stack]);
-yeccpars2(129, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 137, [129 | __Ss], [__T | __Stack]);
-yeccpars2(129, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 138, [129 | __Ss], [__T | __Stack]);
-yeccpars2(129, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 133, [129 | __Ss], [__T | __Stack]);
-yeccpars2(129, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 149, [129 | __Ss], [__T | __Stack]);
-yeccpars2(129, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(130, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [],
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(annotation, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(131, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  tok_val(__1),
- yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(132, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(133, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  tok_val(__1),
- yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(134, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(135, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 147, [135 | __Ss], [__T | __Stack]);
-yeccpars2(135, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(constants, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(136, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 146, [136 | __Ss], [__T | __Stack]);
-yeccpars2(136, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(137, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  tok_val(__1),
- yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(138, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  tok_val(__1),
- yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(139, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [],
- yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(140, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  tok_val(__1),
- yeccpars2(yeccgoto(atomic_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(141, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(142, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 129, [142 | __Ss], [__T | __Stack]);
-yeccpars2(142, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 142, [142 | __Ss], [__T | __Stack]);
-yeccpars2(142, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 144, [142 | __Ss], [__T | __Stack]);
-yeccpars2(142, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 140, [142 | __Ss], [__T | __Stack]);
-yeccpars2(142, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 131, [142 | __Ss], [__T | __Stack]);
-yeccpars2(142, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 137, [142 | __Ss], [__T | __Stack]);
-yeccpars2(142, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 138, [142 | __Ss], [__T | __Stack]);
-yeccpars2(142, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 133, [142 | __Ss], [__T | __Stack]);
-yeccpars2(142, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(143, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 145, [143 | __Ss], [__T | __Stack]);
-yeccpars2(143, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(144, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  {},
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(tuple_constant, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(145, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  list_to_tuple(__2),
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tuple_constant, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(146, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __2,
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(annotation, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(147, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 129, [147 | __Ss], [__T | __Stack]);
-yeccpars2(147, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 142, [147 | __Ss], [__T | __Stack]);
-yeccpars2(147, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 140, [147 | __Ss], [__T | __Stack]);
-yeccpars2(147, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 131, [147 | __Ss], [__T | __Stack]);
-yeccpars2(147, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 137, [147 | __Ss], [__T | __Stack]);
-yeccpars2(147, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 138, [147 | __Ss], [__T | __Stack]);
-yeccpars2(147, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 133, [147 | __Ss], [__T | __Stack]);
-yeccpars2(147, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(148, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1|__3],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(constants, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(149, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  {nil,tok_line(__1)},
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(nil, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(150, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 151, [150 | __Ss], [__T | __Stack]);
-yeccpars2(150, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 154, [150 | __Ss], [__T | __Stack]);
-yeccpars2(150, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 152, [150 | __Ss], [__T | __Stack]);
-yeccpars2(150, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(151, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 129, [151 | __Ss], [__T | __Stack]);
-yeccpars2(151, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 142, [151 | __Ss], [__T | __Stack]);
-yeccpars2(151, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 140, [151 | __Ss], [__T | __Stack]);
-yeccpars2(151, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 131, [151 | __Ss], [__T | __Stack]);
-yeccpars2(151, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 137, [151 | __Ss], [__T | __Stack]);
-yeccpars2(151, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 138, [151 | __Ss], [__T | __Stack]);
-yeccpars2(151, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 133, [151 | __Ss], [__T | __Stack]);
-yeccpars2(151, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(152, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [],
- yeccpars2(yeccgoto(tail_constant, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(153, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__2|__3],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(cons_constant, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(154, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 129, [154 | __Ss], [__T | __Stack]);
-yeccpars2(154, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 142, [154 | __Ss], [__T | __Stack]);
-yeccpars2(154, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 140, [154 | __Ss], [__T | __Stack]);
-yeccpars2(154, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 131, [154 | __Ss], [__T | __Stack]);
-yeccpars2(154, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 137, [154 | __Ss], [__T | __Stack]);
-yeccpars2(154, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 138, [154 | __Ss], [__T | __Stack]);
-yeccpars2(154, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 133, [154 | __Ss], [__T | __Stack]);
-yeccpars2(154, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(155, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 156, [155 | __Ss], [__T | __Stack]);
-yeccpars2(155, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(156, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __2,
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tail_constant, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(157, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 151, [157 | __Ss], [__T | __Stack]);
-yeccpars2(157, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 154, [157 | __Ss], [__T | __Stack]);
-yeccpars2(157, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 152, [157 | __Ss], [__T | __Stack]);
-yeccpars2(157, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(158, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__2|__3],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tail_constant, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(159, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 126, [159 | __Ss], [__T | __Stack]);
-yeccpars2(159, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(160, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 161, [160 | __Ss], [__T | __Stack]);
-yeccpars2(160, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(161, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  core_lib:set_anno(__2,__4),
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(anno_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(162, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [162 | __Ss], [__T | __Stack]);
-yeccpars2(162, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [162 | __Ss], [__T | __Stack]);
-yeccpars2(162, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [162 | __Ss], [__T | __Stack]);
-yeccpars2(162, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [162 | __Ss], [__T | __Stack]);
-yeccpars2(162, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [162 | __Ss], [__T | __Stack]);
-yeccpars2(162, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 115, [162 | __Ss], [__T | __Stack]);
-yeccpars2(162, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [162 | __Ss], [__T | __Stack]);
-yeccpars2(162, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [162 | __Ss], [__T | __Stack]);
-yeccpars2(162, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [162 | __Ss], [__T | __Stack]);
-yeccpars2(162, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [162 | __Ss], [__T | __Stack]);
-yeccpars2(162, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(163, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_alias{var = __1, pat = __3},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(other_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(164, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [164 | __Ss], [__T | __Stack]);
-yeccpars2(164, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(165, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 166, [165 | __Ss], [__T | __Stack]);
-yeccpars2(165, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(166, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [166 | __Ss], [__T | __Stack]);
-yeccpars2(166, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(167, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_clause{pats = __1, guard = __3, body = __5},
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(clause, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(168, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val = begin
-   {T,A} = __3, #c_receive{clauses = __2, timeout = T, action = A}
-  end,
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(receive_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(169, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1|__2],
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(anno_clauses, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(170, '->', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 171, [170 | __Ss], [__T | __Stack]);
-yeccpars2(170, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(171, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [171 | __Ss], [__T | __Stack]);
-yeccpars2(171, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(172, __Cat, __Ss,  [__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  {__2,__4},
- __Nss = lists:nthtail(3, __Ss),
- yeccpars2(yeccgoto(timeout, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(173, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 174, [173 | __Ss], [__T | __Stack]);
-yeccpars2(173, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 177, [173 | __Ss], [__T | __Stack]);
-yeccpars2(173, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 175, [173 | __Ss], [__T | __Stack]);
-yeccpars2(173, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(174, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [174 | __Ss], [__T | __Stack]);
-yeccpars2(174, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [174 | __Ss], [__T | __Stack]);
-yeccpars2(174, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [174 | __Ss], [__T | __Stack]);
-yeccpars2(174, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [174 | __Ss], [__T | __Stack]);
-yeccpars2(174, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [174 | __Ss], [__T | __Stack]);
-yeccpars2(174, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 115, [174 | __Ss], [__T | __Stack]);
-yeccpars2(174, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [174 | __Ss], [__T | __Stack]);
-yeccpars2(174, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [174 | __Ss], [__T | __Stack]);
-yeccpars2(174, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [174 | __Ss], [__T | __Stack]);
-yeccpars2(174, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [174 | __Ss], [__T | __Stack]);
-yeccpars2(174, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(175, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_nil{},
- yeccpars2(yeccgoto(tail_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(176, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_cons{hd = __2, tl = __3},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(cons_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(177, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [177 | __Ss], [__T | __Stack]);
-yeccpars2(177, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [177 | __Ss], [__T | __Stack]);
-yeccpars2(177, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [177 | __Ss], [__T | __Stack]);
-yeccpars2(177, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [177 | __Ss], [__T | __Stack]);
-yeccpars2(177, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [177 | __Ss], [__T | __Stack]);
-yeccpars2(177, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 115, [177 | __Ss], [__T | __Stack]);
-yeccpars2(177, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [177 | __Ss], [__T | __Stack]);
-yeccpars2(177, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [177 | __Ss], [__T | __Stack]);
-yeccpars2(177, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [177 | __Ss], [__T | __Stack]);
-yeccpars2(177, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [177 | __Ss], [__T | __Stack]);
-yeccpars2(177, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(178, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 179, [178 | __Ss], [__T | __Stack]);
-yeccpars2(178, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(179, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __2,
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tail_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(180, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 174, [180 | __Ss], [__T | __Stack]);
-yeccpars2(180, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 177, [180 | __Ss], [__T | __Stack]);
-yeccpars2(180, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 175, [180 | __Ss], [__T | __Stack]);
-yeccpars2(180, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(181, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_cons{hd = __2, tl = __3},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tail_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(182, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [],
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(clause_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(183, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 184, [183 | __Ss], [__T | __Stack]);
-yeccpars2(183, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(184, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __2,
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(clause_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(185, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 187, [185 | __Ss], [__T | __Stack]);
-yeccpars2(185, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(186, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 159, [186 | __Ss], [__T | __Stack]);
-yeccpars2(186, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(anno_pattern, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(187, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 126, [187 | __Ss], [__T | __Stack]);
-yeccpars2(187, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(188, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 189, [188 | __Ss], [__T | __Stack]);
-yeccpars2(188, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(189, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  core_lib:set_anno(__2,__4),
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(anno_clause, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(190, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 191, [190 | __Ss], [__T | __Stack]);
-yeccpars2(190, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 194, [190 | __Ss], [__T | __Stack]);
-yeccpars2(190, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(191, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 200, [191 | __Ss], [__T | __Stack]);
-yeccpars2(191, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(192, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 198, [192 | __Ss], [__T | __Stack]);
-yeccpars2(192, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(segment_patterns, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(193, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 196, [193 | __Ss], [__T | __Stack]);
-yeccpars2(193, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(194, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 195, [194 | __Ss], [__T | __Stack]);
-yeccpars2(194, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(195, __Cat, __Ss,  [__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_binary{segments = []},
- __Nss = lists:nthtail(3, __Ss),
- yeccpars2(yeccgoto(binary_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(196, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 197, [196 | __Ss], [__T | __Stack]);
-yeccpars2(196, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(197, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_binary{segments = __3},
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(binary_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(198, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 191, [198 | __Ss], [__T | __Stack]);
-yeccpars2(198, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(199, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1|__3],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(segment_patterns, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(200, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [200 | __Ss], [__T | __Stack]);
-yeccpars2(200, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [200 | __Ss], [__T | __Stack]);
-yeccpars2(200, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [200 | __Ss], [__T | __Stack]);
-yeccpars2(200, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [200 | __Ss], [__T | __Stack]);
-yeccpars2(200, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [200 | __Ss], [__T | __Stack]);
-yeccpars2(200, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 115, [200 | __Ss], [__T | __Stack]);
-yeccpars2(200, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [200 | __Ss], [__T | __Stack]);
-yeccpars2(200, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [200 | __Ss], [__T | __Stack]);
-yeccpars2(200, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [200 | __Ss], [__T | __Stack]);
-yeccpars2(200, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [200 | __Ss], [__T | __Stack]);
-yeccpars2(200, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(201, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 202, [201 | __Ss], [__T | __Stack]);
-yeccpars2(201, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(202, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 203, [202 | __Ss], [__T | __Stack]);
-yeccpars2(202, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(203, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 205, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [203 | __Ss], [__T | __Stack]);
-yeccpars2(203, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(204, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  case __5 of [S,U,T,Fs] -> #c_bitstr{val = __3, size = S, unit = U, type = T, flags = Fs}; true -> return_error(tok_line(__1),"expected 4 arguments in binary segment") end,
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(segment_pattern, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(205, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [],
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(arg_list, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(206, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 207, [206 | __Ss], [__T | __Stack]);
-yeccpars2(206, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(207, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __2,
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(arg_list, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(208, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 203, [208 | __Ss], [__T | __Stack]);
-yeccpars2(208, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(209, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val = begin
-   Name = #c_atom{val = tok_val(__2)}, #c_primop{name = Name, args = __3}
-  end,
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(primop_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(210, 'in', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 211, [210 | __Ss], [__T | __Stack]);
-yeccpars2(210, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(211, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [211 | __Ss], [__T | __Stack]);
-yeccpars2(211, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(212, __Cat, __Ss,  [__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_letrec{defs = __2, body = __4},
- __Nss = lists:nthtail(3, __Ss),
- yeccpars2(yeccgoto(letrec_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(213, '=', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 214, [213 | __Ss], [__T | __Stack]);
-yeccpars2(213, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(214, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [214 | __Ss], [__T | __Stack]);
-yeccpars2(214, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(215, 'in', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 216, [215 | __Ss], [__T | __Stack]);
-yeccpars2(215, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(216, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [216 | __Ss], [__T | __Stack]);
-yeccpars2(216, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(217, __Cat, __Ss,  [__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_let{vars = __2, arg = __4, body = __6},
- __Nss = lists:nthtail(5, __Ss),
- yeccpars2(yeccgoto(let_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(218, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [218 | __Ss], [__T | __Stack]);
-yeccpars2(218, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(219, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_seq{arg = __2, body = __3},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(sequence, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(220, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_catch{body = __2},
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(catch_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(221, 'of', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 222, [221 | __Ss], [__T | __Stack]);
-yeccpars2(221, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(222, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 97, [222 | __Ss], [__T | __Stack]);
-yeccpars2(222, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 96, [222 | __Ss], [__T | __Stack]);
-yeccpars2(222, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [222 | __Ss], [__T | __Stack]);
-yeccpars2(222, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [222 | __Ss], [__T | __Stack]);
-yeccpars2(222, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [222 | __Ss], [__T | __Stack]);
-yeccpars2(222, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [222 | __Ss], [__T | __Stack]);
-yeccpars2(222, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [222 | __Ss], [__T | __Stack]);
-yeccpars2(222, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [222 | __Ss], [__T | __Stack]);
-yeccpars2(222, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 95, [222 | __Ss], [__T | __Stack]);
-yeccpars2(222, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 98, [222 | __Ss], [__T | __Stack]);
-yeccpars2(222, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 114, [222 | __Ss], [__T | __Stack]);
-yeccpars2(222, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(223, 'end', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 224, [223 | __Ss], [__T | __Stack]);
-yeccpars2(223, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(224, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_case{arg = __2, clauses = __4},
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(case_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(225, ':', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 226, [225 | __Ss], [__T | __Stack]);
-yeccpars2(225, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(226, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [226 | __Ss], [__T | __Stack]);
-yeccpars2(226, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(227, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 203, [227 | __Ss], [__T | __Stack]);
-yeccpars2(227, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(228, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_call{module = __2, name = __4, args = __5},
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(call_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(229, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 203, [229 | __Ss], [__T | __Stack]);
-yeccpars2(229, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(230, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_apply{op = __2, args = __3},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(application_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(231, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 232, [231 | __Ss], [__T | __Stack]);
-yeccpars2(231, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 235, [231 | __Ss], [__T | __Stack]);
-yeccpars2(231, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 233, [231 | __Ss], [__T | __Stack]);
-yeccpars2(231, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(232, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [232 | __Ss], [__T | __Stack]);
-yeccpars2(232, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(233, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_nil{},
- yeccpars2(yeccgoto(tail, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(234, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_cons{hd = __2, tl = __3},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(cons, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(235, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [235 | __Ss], [__T | __Stack]);
-yeccpars2(235, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(236, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 237, [236 | __Ss], [__T | __Stack]);
-yeccpars2(236, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(237, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __2,
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tail, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(238, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 232, [238 | __Ss], [__T | __Stack]);
-yeccpars2(238, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 235, [238 | __Ss], [__T | __Stack]);
-yeccpars2(238, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 233, [238 | __Ss], [__T | __Stack]);
-yeccpars2(238, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(239, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_cons{hd = __2, tl = __3},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tail, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(240, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_values{es = []},
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(expression, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(241, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 242, [241 | __Ss], [__T | __Stack]);
-yeccpars2(241, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(242, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_values{es = __2},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(expression, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(243, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 244, [243 | __Ss], [__T | __Stack]);
-yeccpars2(243, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(244, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 126, [244 | __Ss], [__T | __Stack]);
-yeccpars2(244, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(245, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 246, [245 | __Ss], [__T | __Stack]);
-yeccpars2(245, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(246, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  core_lib:set_anno(__2,__4),
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(anno_expression, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(247, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 248, [247 | __Ss], [__T | __Stack]);
-yeccpars2(247, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 251, [247 | __Ss], [__T | __Stack]);
-yeccpars2(247, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(248, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 257, [248 | __Ss], [__T | __Stack]);
-yeccpars2(248, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(249, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 255, [249 | __Ss], [__T | __Stack]);
-yeccpars2(249, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(segments, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(250, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 253, [250 | __Ss], [__T | __Stack]);
-yeccpars2(250, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(251, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 252, [251 | __Ss], [__T | __Stack]);
-yeccpars2(251, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(252, __Cat, __Ss,  [__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_binary{segments = []},
- __Nss = lists:nthtail(3, __Ss),
- yeccpars2(yeccgoto(binary, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(253, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 254, [253 | __Ss], [__T | __Stack]);
-yeccpars2(253, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(254, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_binary{segments = __3},
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(binary, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(255, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 248, [255 | __Ss], [__T | __Stack]);
-yeccpars2(255, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(256, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1|__3],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(segments, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(257, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [257 | __Ss], [__T | __Stack]);
-yeccpars2(257, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(258, '>', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 259, [258 | __Ss], [__T | __Stack]);
-yeccpars2(258, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(259, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 260, [259 | __Ss], [__T | __Stack]);
-yeccpars2(259, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(260, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [260 | __Ss], [__T | __Stack]);
-yeccpars2(260, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(261, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 262, [261 | __Ss], [__T | __Stack]);
-yeccpars2(261, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(262, __Cat, __Ss,  [__7,__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  case __6 of [S,U,T,Fs] -> #c_bitstr{val = __3, size = S, unit = U, type = T, flags = Fs}; true -> return_error(tok_line(__1),"expected 4 arguments in binary segment") end,
- __Nss = lists:nthtail(6, __Ss),
- yeccpars2(yeccgoto(segment, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(263, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 26, [263 | __Ss], [__T | __Stack]);
-yeccpars2(263, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [263 | __Ss], [__T | __Stack]);
-yeccpars2(263, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(264, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1|__3],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(anno_variables, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(265, 'receive', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 65, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'catch', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 48, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'try', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 70, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'primop', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 63, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'call', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 44, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'apply', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 40, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'case', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 46, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'letrec', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 60, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'let', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 58, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'fun', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 23, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'do', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 52, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 41, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, '#', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 34, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 37, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 74, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, '<', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 36, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 35, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, 'var', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 30, [265 | __Ss], [__T | __Stack]);
-yeccpars2(265, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(266, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_fun{vars = [], body = __5},
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(fun_expr, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(267, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 125, [267 | __Ss], [__T | __Stack]);
-yeccpars2(267, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(268, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 269, [268 | __Ss], [__T | __Stack]);
-yeccpars2(268, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(269, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 126, [269 | __Ss], [__T | __Stack]);
-yeccpars2(269, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(270, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 271, [270 | __Ss], [__T | __Stack]);
-yeccpars2(270, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(271, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  core_lib:set_anno(__2,__4),
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(anno_fun, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(272, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 273, [272 | __Ss], [__T | __Stack]);
-yeccpars2(272, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(273, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 126, [273 | __Ss], [__T | __Stack]);
-yeccpars2(273, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(274, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 275, [274 | __Ss], [__T | __Stack]);
-yeccpars2(274, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(275, __Cat, __Ss,  [__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  core_lib:set_anno(__2,__4),
- __Nss = lists:nthtail(4, __Ss),
- yeccpars2(yeccgoto(anno_function_name, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(276, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 278, [276 | __Ss], [__T | __Stack]);
-yeccpars2(276, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 277, [276 | __Ss], [__T | __Stack]);
-yeccpars2(276, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(277, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(module_attribute, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(278, '=', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 284, [278 | __Ss], [__T | __Stack]);
-yeccpars2(278, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(279, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 282, [279 | __Ss], [__T | __Stack]);
-yeccpars2(279, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(attribute_list, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(280, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 281, [280 | __Ss], [__T | __Stack]);
-yeccpars2(280, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(281, __Cat, __Ss,  [__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __3,
- __Nss = lists:nthtail(3, __Ss),
- yeccpars2(yeccgoto(module_attribute, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(282, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 278, [282 | __Ss], [__T | __Stack]);
-yeccpars2(282, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(283, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1|__3],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(attribute_list, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(284, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 285, [284 | __Ss], [__T | __Stack]);
-yeccpars2(284, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 290, [284 | __Ss], [__T | __Stack]);
-yeccpars2(284, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [284 | __Ss], [__T | __Stack]);
-yeccpars2(284, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [284 | __Ss], [__T | __Stack]);
-yeccpars2(284, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [284 | __Ss], [__T | __Stack]);
-yeccpars2(284, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [284 | __Ss], [__T | __Stack]);
-yeccpars2(284, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [284 | __Ss], [__T | __Stack]);
-yeccpars2(284, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(285, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 285, [285 | __Ss], [__T | __Stack]);
-yeccpars2(285, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 290, [285 | __Ss], [__T | __Stack]);
-yeccpars2(285, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [285 | __Ss], [__T | __Stack]);
-yeccpars2(285, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [285 | __Ss], [__T | __Stack]);
-yeccpars2(285, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [285 | __Ss], [__T | __Stack]);
-yeccpars2(285, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [285 | __Ss], [__T | __Stack]);
-yeccpars2(285, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [285 | __Ss], [__T | __Stack]);
-yeccpars2(285, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 149, [285 | __Ss], [__T | __Stack]);
-yeccpars2(285, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(286, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(287, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(288, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_def{name = #c_atom{val = tok_val(__1)}, val = __3},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(attribute, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(289, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(290, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 285, [290 | __Ss], [__T | __Stack]);
-yeccpars2(290, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 290, [290 | __Ss], [__T | __Stack]);
-yeccpars2(290, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 293, [290 | __Ss], [__T | __Stack]);
-yeccpars2(290, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [290 | __Ss], [__T | __Stack]);
-yeccpars2(290, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [290 | __Ss], [__T | __Stack]);
-yeccpars2(290, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [290 | __Ss], [__T | __Stack]);
-yeccpars2(290, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [290 | __Ss], [__T | __Stack]);
-yeccpars2(290, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [290 | __Ss], [__T | __Stack]);
-yeccpars2(290, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(291, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 295, [291 | __Ss], [__T | __Stack]);
-yeccpars2(291, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(literals, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(292, '}', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 294, [292 | __Ss], [__T | __Stack]);
-yeccpars2(292, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(293, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_tuple{es = []},
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(tuple_literal, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(294, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_tuple{es = __2},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tuple_literal, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(295, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 285, [295 | __Ss], [__T | __Stack]);
-yeccpars2(295, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 290, [295 | __Ss], [__T | __Stack]);
-yeccpars2(295, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [295 | __Ss], [__T | __Stack]);
-yeccpars2(295, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [295 | __Ss], [__T | __Stack]);
-yeccpars2(295, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [295 | __Ss], [__T | __Stack]);
-yeccpars2(295, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [295 | __Ss], [__T | __Stack]);
-yeccpars2(295, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [295 | __Ss], [__T | __Stack]);
-yeccpars2(295, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(296, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1|__3],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(literals, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(297, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 298, [297 | __Ss], [__T | __Stack]);
-yeccpars2(297, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 301, [297 | __Ss], [__T | __Stack]);
-yeccpars2(297, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 299, [297 | __Ss], [__T | __Stack]);
-yeccpars2(297, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(298, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 285, [298 | __Ss], [__T | __Stack]);
-yeccpars2(298, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 290, [298 | __Ss], [__T | __Stack]);
-yeccpars2(298, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [298 | __Ss], [__T | __Stack]);
-yeccpars2(298, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [298 | __Ss], [__T | __Stack]);
-yeccpars2(298, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [298 | __Ss], [__T | __Stack]);
-yeccpars2(298, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [298 | __Ss], [__T | __Stack]);
-yeccpars2(298, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [298 | __Ss], [__T | __Stack]);
-yeccpars2(298, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(299, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_nil{},
- yeccpars2(yeccgoto(tail_literal, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(300, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_cons{hd = __2, tl = __3},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(cons_literal, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(301, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 285, [301 | __Ss], [__T | __Stack]);
-yeccpars2(301, '{', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 290, [301 | __Ss], [__T | __Stack]);
-yeccpars2(301, 'string', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 69, [301 | __Ss], [__T | __Stack]);
-yeccpars2(301, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 104, [301 | __Ss], [__T | __Stack]);
-yeccpars2(301, 'float', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 54, [301 | __Ss], [__T | __Stack]);
-yeccpars2(301, 'integer', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 57, [301 | __Ss], [__T | __Stack]);
-yeccpars2(301, 'char', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 50, [301 | __Ss], [__T | __Stack]);
-yeccpars2(301, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(302, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 303, [302 | __Ss], [__T | __Stack]);
-yeccpars2(302, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(303, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __2,
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tail_literal, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(304, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 298, [304 | __Ss], [__T | __Stack]);
-yeccpars2(304, '|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 301, [304 | __Ss], [__T | __Stack]);
-yeccpars2(304, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 299, [304 | __Ss], [__T | __Stack]);
-yeccpars2(304, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(305, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_cons{hd = __2, tl = __3},
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(tail_literal, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(306, __Cat, __Ss,  [__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [],
- __Nss = lists:nthtail(1, __Ss),
- yeccpars2(yeccgoto(module_export, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(307, ',', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 311, [307 | __Ss], [__T | __Stack]);
-yeccpars2(307, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1],
- yeccpars2(yeccgoto(exported_names, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(308, ']', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 310, [308 | __Ss], [__T | __Stack]);
-yeccpars2(308, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(309, __Cat, __Ss,  [__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __1,
- yeccpars2(yeccgoto(exported_name, hd(__Ss)), __Cat, __Ss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(310, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  __2,
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(module_export, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(311, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 11, [311 | __Ss], [__T | __Stack]);
-yeccpars2(311, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(312, __Cat, __Ss,  [__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  [__1|__3],
- __Nss = lists:nthtail(2, __Ss),
- yeccpars2(yeccgoto(exported_names, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(313, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 314, [313 | __Ss], [__T | __Stack]);
-yeccpars2(313, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(314, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 5, [314 | __Ss], [__T | __Stack]);
-yeccpars2(314, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(315, 'attributes', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 7, [315 | __Ss], [__T | __Stack]);
-yeccpars2(315, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(316, '(', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 9, [316 | __Ss], [__T | __Stack]);
-yeccpars2(316, 'atom', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 11, [316 | __Ss], [__T | __Stack]);
-yeccpars2(316, __Cat, __Ss,  __Stack, __T, __Ts, __Tzr) ->
- __Val =  [],
- yeccpars2(13, __Cat, [316 | __Ss], [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(317, 'end', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 318, [317 | __Ss], [__T | __Stack]);
-yeccpars2(317, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(318, '-|', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 319, [318 | __Ss], [__T | __Stack]);
-yeccpars2(318, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(319, '[', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 126, [319 | __Ss], [__T | __Stack]);
-yeccpars2(319, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(320, ')', __Ss, __Stack, __T, __Ts, __Tzr) ->
- yeccpars1(__Ts, __Tzr, 321, [320 | __Ss], [__T | __Stack]);
-yeccpars2(320, _, _, _, __T, _, _) ->
- yeccerror(__T);
-yeccpars2(321, __Cat, __Ss,  [__10,__9,__8,__7,__6,__5,__4,__3,__2,__1|__Stack], __T, __Ts, __Tzr) ->
- __Val =  #c_module{anno = __9, name = tok_val(__3), exports = __4, attrs = __5, defs = __6},
- __Nss = lists:nthtail(9, __Ss),
- yeccpars2(yeccgoto(module_definition, hd(__Nss)), __Cat, __Nss, [__Val | __Stack], __T, __Ts, __Tzr);
-yeccpars2(__Other, _, _, _, _, _, _) ->
- exit({parser, __Other, missing_state_in_action_table}).
-
-yeccgoto(anno_clause, 65) ->
- 100;
-yeccgoto(anno_clause, 100) ->
- 100;
-yeccgoto(anno_clause, 222) ->
- 100;
-yeccgoto(anno_clauses, 65) ->
- 101;
-yeccgoto(anno_clauses, 100) ->
- 169;
-yeccgoto(anno_clauses, 222) ->
- 223;
-yeccgoto(anno_expression, 33) ->
- 38;
-yeccgoto(anno_expression, 36) ->
- 75;
-yeccgoto(anno_expression, 37) ->
- 231;
-yeccgoto(anno_expression, 40) ->
- 229;
-yeccgoto(anno_expression, 44) ->
- 225;
-yeccgoto(anno_expression, 46) ->
- 221;
-yeccgoto(anno_expression, 48) ->
- 220;
-yeccgoto(anno_expression, 52) ->
- 218;
-yeccgoto(anno_expression, 70) ->
- 81;
-yeccgoto(anno_expression, 74) ->
- 75;
-yeccgoto(anno_expression, 79) ->
- 75;
-yeccgoto(anno_expression, 86) ->
- 87;
-yeccgoto(anno_expression, 90) ->
- 91;
-yeccgoto(anno_expression, 99) ->
- 170;
-yeccgoto(anno_expression, 164) ->
- 165;
-yeccgoto(anno_expression, 166) ->
- 167;
-yeccgoto(anno_expression, 171) ->
- 172;
-yeccgoto(anno_expression, 203) ->
- 75;
-yeccgoto(anno_expression, 211) ->
- 212;
-yeccgoto(anno_expression, 214) ->
- 215;
-yeccgoto(anno_expression, 216) ->
- 217;
-yeccgoto(anno_expression, 218) ->
- 219;
-yeccgoto(anno_expression, 226) ->
- 227;
-yeccgoto(anno_expression, 232) ->
- 238;
-yeccgoto(anno_expression, 235) ->
- 236;
-yeccgoto(anno_expression, 257) ->
- 258;
-yeccgoto(anno_expression, 260) ->
- 75;
-yeccgoto(anno_expression, 265) ->
- 266;
-yeccgoto(anno_expressions, 36) ->
- 241;
-yeccgoto(anno_expressions, 74) ->
- 76;
-yeccgoto(anno_expressions, 79) ->
- 80;
-yeccgoto(anno_expressions, 203) ->
- 206;
-yeccgoto(anno_expressions, 260) ->
- 261;
-yeccgoto(anno_fun, 20) ->
- 22;
-yeccgoto(anno_function_name, 8) ->
- 10;
-yeccgoto(anno_function_name, 12) ->
- 10;
-yeccgoto(anno_function_name, 60) ->
- 10;
-yeccgoto(anno_function_name, 316) ->
- 10;
-yeccgoto(anno_pattern, 65) ->
- 102;
-yeccgoto(anno_pattern, 96) ->
- 102;
-yeccgoto(anno_pattern, 97) ->
- 116;
-yeccgoto(anno_pattern, 98) ->
- 173;
-yeccgoto(anno_pattern, 100) ->
- 102;
-yeccgoto(anno_pattern, 114) ->
- 116;
-yeccgoto(anno_pattern, 120) ->
- 116;
-yeccgoto(anno_pattern, 162) ->
- 163;
-yeccgoto(anno_pattern, 174) ->
- 180;
-yeccgoto(anno_pattern, 177) ->
- 178;
-yeccgoto(anno_pattern, 200) ->
- 201;
-yeccgoto(anno_pattern, 222) ->
- 102;
-yeccgoto(anno_patterns, 97) ->
- 183;
-yeccgoto(anno_patterns, 114) ->
- 117;
-yeccgoto(anno_patterns, 120) ->
- 121;
-yeccgoto(anno_variable, 25) ->
- 28;
-yeccgoto(anno_variable, 58) ->
- 84;
-yeccgoto(anno_variable, 65) ->
- 103;
-yeccgoto(anno_variable, 82) ->
- 84;
-yeccgoto(anno_variable, 83) ->
- 28;
-yeccgoto(anno_variable, 88) ->
- 84;
-yeccgoto(anno_variable, 96) ->
- 103;
-yeccgoto(anno_variable, 97) ->
- 103;
-yeccgoto(anno_variable, 98) ->
- 103;
-yeccgoto(anno_variable, 100) ->
- 103;
-yeccgoto(anno_variable, 114) ->
- 103;
-yeccgoto(anno_variable, 115) ->
- 122;
-yeccgoto(anno_variable, 120) ->
- 103;
-yeccgoto(anno_variable, 162) ->
- 103;
-yeccgoto(anno_variable, 174) ->
- 103;
-yeccgoto(anno_variable, 177) ->
- 103;
-yeccgoto(anno_variable, 200) ->
- 103;
-yeccgoto(anno_variable, 222) ->
- 103;
-yeccgoto(anno_variable, 263) ->
- 28;
-yeccgoto(anno_variables, 25) ->
- 29;
-yeccgoto(anno_variables, 83) ->
- 93;
-yeccgoto(anno_variables, 263) ->
- 264;
-yeccgoto(annotation, 125) ->
- 127;
-yeccgoto(annotation, 159) ->
- 160;
-yeccgoto(annotation, 187) ->
- 188;
-yeccgoto(annotation, 244) ->
- 245;
-yeccgoto(annotation, 269) ->
- 270;
-yeccgoto(annotation, 273) ->
- 274;
-yeccgoto(annotation, 319) ->
- 320;
-yeccgoto(application_expr, 33) ->
- 39;
-yeccgoto(application_expr, 35) ->
- 39;
-yeccgoto(application_expr, 36) ->
- 39;
-yeccgoto(application_expr, 37) ->
- 39;
-yeccgoto(application_expr, 40) ->
- 39;
-yeccgoto(application_expr, 44) ->
- 39;
-yeccgoto(application_expr, 46) ->
- 39;
-yeccgoto(application_expr, 48) ->
- 39;
-yeccgoto(application_expr, 52) ->
- 39;
-yeccgoto(application_expr, 70) ->
- 39;
-yeccgoto(application_expr, 74) ->
- 39;
-yeccgoto(application_expr, 79) ->
- 39;
-yeccgoto(application_expr, 86) ->
- 39;
-yeccgoto(application_expr, 90) ->
- 39;
-yeccgoto(application_expr, 99) ->
- 39;
-yeccgoto(application_expr, 164) ->
- 39;
-yeccgoto(application_expr, 166) ->
- 39;
-yeccgoto(application_expr, 171) ->
- 39;
-yeccgoto(application_expr, 203) ->
- 39;
-yeccgoto(application_expr, 211) ->
- 39;
-yeccgoto(application_expr, 214) ->
- 39;
-yeccgoto(application_expr, 216) ->
- 39;
-yeccgoto(application_expr, 218) ->
- 39;
-yeccgoto(application_expr, 226) ->
- 39;
-yeccgoto(application_expr, 232) ->
- 39;
-yeccgoto(application_expr, 235) ->
- 39;
-yeccgoto(application_expr, 257) ->
- 39;
-yeccgoto(application_expr, 260) ->
- 39;
-yeccgoto(application_expr, 265) ->
- 39;
-yeccgoto(arg_list, 202) ->
- 204;
-yeccgoto(arg_list, 208) ->
- 209;
-yeccgoto(arg_list, 227) ->
- 228;
-yeccgoto(arg_list, 229) ->
- 230;
-yeccgoto(atomic_constant, 126) ->
- 132;
-yeccgoto(atomic_constant, 129) ->
- 132;
-yeccgoto(atomic_constant, 142) ->
- 132;
-yeccgoto(atomic_constant, 147) ->
- 132;
-yeccgoto(atomic_constant, 151) ->
- 132;
-yeccgoto(atomic_constant, 154) ->
- 132;
-yeccgoto(atomic_literal, 33) ->
- 42;
-yeccgoto(atomic_literal, 35) ->
- 42;
-yeccgoto(atomic_literal, 36) ->
- 42;
-yeccgoto(atomic_literal, 37) ->
- 42;
-yeccgoto(atomic_literal, 40) ->
- 42;
-yeccgoto(atomic_literal, 44) ->
- 42;
-yeccgoto(atomic_literal, 46) ->
- 42;
-yeccgoto(atomic_literal, 48) ->
- 42;
-yeccgoto(atomic_literal, 52) ->
- 42;
-yeccgoto(atomic_literal, 65) ->
- 105;
-yeccgoto(atomic_literal, 70) ->
- 42;
-yeccgoto(atomic_literal, 74) ->
- 42;
-yeccgoto(atomic_literal, 79) ->
- 42;
-yeccgoto(atomic_literal, 86) ->
- 42;
-yeccgoto(atomic_literal, 90) ->
- 42;
-yeccgoto(atomic_literal, 96) ->
- 105;
-yeccgoto(atomic_literal, 97) ->
- 105;
-yeccgoto(atomic_literal, 98) ->
- 105;
-yeccgoto(atomic_literal, 99) ->
- 42;
-yeccgoto(atomic_literal, 100) ->
- 105;
-yeccgoto(atomic_literal, 114) ->
- 105;
-yeccgoto(atomic_literal, 115) ->
- 105;
-yeccgoto(atomic_literal, 120) ->
- 105;
-yeccgoto(atomic_literal, 162) ->
- 105;
-yeccgoto(atomic_literal, 164) ->
- 42;
-yeccgoto(atomic_literal, 166) ->
- 42;
-yeccgoto(atomic_literal, 171) ->
- 42;
-yeccgoto(atomic_literal, 174) ->
- 105;
-yeccgoto(atomic_literal, 177) ->
- 105;
-yeccgoto(atomic_literal, 200) ->
- 105;
-yeccgoto(atomic_literal, 203) ->
- 42;
-yeccgoto(atomic_literal, 211) ->
- 42;
-yeccgoto(atomic_literal, 214) ->
- 42;
-yeccgoto(atomic_literal, 216) ->
- 42;
-yeccgoto(atomic_literal, 218) ->
- 42;
-yeccgoto(atomic_literal, 222) ->
- 105;
-yeccgoto(atomic_literal, 226) ->
- 42;
-yeccgoto(atomic_literal, 232) ->
- 42;
-yeccgoto(atomic_literal, 235) ->
- 42;
-yeccgoto(atomic_literal, 257) ->
- 42;
-yeccgoto(atomic_literal, 260) ->
- 42;
-yeccgoto(atomic_literal, 265) ->
- 42;
-yeccgoto(atomic_literal, 284) ->
- 286;
-yeccgoto(atomic_literal, 285) ->
- 286;
-yeccgoto(atomic_literal, 290) ->
- 286;
-yeccgoto(atomic_literal, 295) ->
- 286;
-yeccgoto(atomic_literal, 298) ->
- 286;
-yeccgoto(atomic_literal, 301) ->
- 286;
-yeccgoto(atomic_pattern, 65) ->
- 106;
-yeccgoto(atomic_pattern, 96) ->
- 106;
-yeccgoto(atomic_pattern, 97) ->
- 106;
-yeccgoto(atomic_pattern, 98) ->
- 106;
-yeccgoto(atomic_pattern, 100) ->
- 106;
-yeccgoto(atomic_pattern, 114) ->
- 106;
-yeccgoto(atomic_pattern, 115) ->
- 106;
-yeccgoto(atomic_pattern, 120) ->
- 106;
-yeccgoto(atomic_pattern, 162) ->
- 106;
-yeccgoto(atomic_pattern, 174) ->
- 106;
-yeccgoto(atomic_pattern, 177) ->
- 106;
-yeccgoto(atomic_pattern, 200) ->
- 106;
-yeccgoto(atomic_pattern, 222) ->
- 106;
-yeccgoto(attribute, 276) ->
- 279;
-yeccgoto(attribute, 282) ->
- 279;
-yeccgoto(attribute_list, 276) ->
- 280;
-yeccgoto(attribute_list, 282) ->
- 283;
-yeccgoto(binary, 33) ->
- 43;
-yeccgoto(binary, 35) ->
- 43;
-yeccgoto(binary, 36) ->
- 43;
-yeccgoto(binary, 37) ->
- 43;
-yeccgoto(binary, 40) ->
- 43;
-yeccgoto(binary, 44) ->
- 43;
-yeccgoto(binary, 46) ->
- 43;
-yeccgoto(binary, 48) ->
- 43;
-yeccgoto(binary, 52) ->
- 43;
-yeccgoto(binary, 70) ->
- 43;
-yeccgoto(binary, 74) ->
- 43;
-yeccgoto(binary, 79) ->
- 43;
-yeccgoto(binary, 86) ->
- 43;
-yeccgoto(binary, 90) ->
- 43;
-yeccgoto(binary, 99) ->
- 43;
-yeccgoto(binary, 164) ->
- 43;
-yeccgoto(binary, 166) ->
- 43;
-yeccgoto(binary, 171) ->
- 43;
-yeccgoto(binary, 203) ->
- 43;
-yeccgoto(binary, 211) ->
- 43;
-yeccgoto(binary, 214) ->
- 43;
-yeccgoto(binary, 216) ->
- 43;
-yeccgoto(binary, 218) ->
- 43;
-yeccgoto(binary, 226) ->
- 43;
-yeccgoto(binary, 232) ->
- 43;
-yeccgoto(binary, 235) ->
- 43;
-yeccgoto(binary, 257) ->
- 43;
-yeccgoto(binary, 260) ->
- 43;
-yeccgoto(binary, 265) ->
- 43;
-yeccgoto(binary_pattern, 65) ->
- 107;
-yeccgoto(binary_pattern, 96) ->
- 107;
-yeccgoto(binary_pattern, 97) ->
- 107;
-yeccgoto(binary_pattern, 98) ->
- 107;
-yeccgoto(binary_pattern, 100) ->
- 107;
-yeccgoto(binary_pattern, 114) ->
- 107;
-yeccgoto(binary_pattern, 115) ->
- 107;
-yeccgoto(binary_pattern, 120) ->
- 107;
-yeccgoto(binary_pattern, 162) ->
- 107;
-yeccgoto(binary_pattern, 174) ->
- 107;
-yeccgoto(binary_pattern, 177) ->
- 107;
-yeccgoto(binary_pattern, 200) ->
- 107;
-yeccgoto(binary_pattern, 222) ->
- 107;
-yeccgoto(call_expr, 33) ->
- 45;
-yeccgoto(call_expr, 35) ->
- 45;
-yeccgoto(call_expr, 36) ->
- 45;
-yeccgoto(call_expr, 37) ->
- 45;
-yeccgoto(call_expr, 40) ->
- 45;
-yeccgoto(call_expr, 44) ->
- 45;
-yeccgoto(call_expr, 46) ->
- 45;
-yeccgoto(call_expr, 48) ->
- 45;
-yeccgoto(call_expr, 52) ->
- 45;
-yeccgoto(call_expr, 70) ->
- 45;
-yeccgoto(call_expr, 74) ->
- 45;
-yeccgoto(call_expr, 79) ->
- 45;
-yeccgoto(call_expr, 86) ->
- 45;
-yeccgoto(call_expr, 90) ->
- 45;
-yeccgoto(call_expr, 99) ->
- 45;
-yeccgoto(call_expr, 164) ->
- 45;
-yeccgoto(call_expr, 166) ->
- 45;
-yeccgoto(call_expr, 171) ->
- 45;
-yeccgoto(call_expr, 203) ->
- 45;
-yeccgoto(call_expr, 211) ->
- 45;
-yeccgoto(call_expr, 214) ->
- 45;
-yeccgoto(call_expr, 216) ->
- 45;
-yeccgoto(call_expr, 218) ->
- 45;
-yeccgoto(call_expr, 226) ->
- 45;
-yeccgoto(call_expr, 232) ->
- 45;
-yeccgoto(call_expr, 235) ->
- 45;
-yeccgoto(call_expr, 257) ->
- 45;
-yeccgoto(call_expr, 260) ->
- 45;
-yeccgoto(call_expr, 265) ->
- 45;
-yeccgoto(case_expr, 33) ->
- 47;
-yeccgoto(case_expr, 35) ->
- 47;
-yeccgoto(case_expr, 36) ->
- 47;
-yeccgoto(case_expr, 37) ->
- 47;
-yeccgoto(case_expr, 40) ->
- 47;
-yeccgoto(case_expr, 44) ->
- 47;
-yeccgoto(case_expr, 46) ->
- 47;
-yeccgoto(case_expr, 48) ->
- 47;
-yeccgoto(case_expr, 52) ->
- 47;
-yeccgoto(case_expr, 70) ->
- 47;
-yeccgoto(case_expr, 74) ->
- 47;
-yeccgoto(case_expr, 79) ->
- 47;
-yeccgoto(case_expr, 86) ->
- 47;
-yeccgoto(case_expr, 90) ->
- 47;
-yeccgoto(case_expr, 99) ->
- 47;
-yeccgoto(case_expr, 164) ->
- 47;
-yeccgoto(case_expr, 166) ->
- 47;
-yeccgoto(case_expr, 171) ->
- 47;
-yeccgoto(case_expr, 203) ->
- 47;
-yeccgoto(case_expr, 211) ->
- 47;
-yeccgoto(case_expr, 214) ->
- 47;
-yeccgoto(case_expr, 216) ->
- 47;
-yeccgoto(case_expr, 218) ->
- 47;
-yeccgoto(case_expr, 226) ->
- 47;
-yeccgoto(case_expr, 232) ->
- 47;
-yeccgoto(case_expr, 235) ->
- 47;
-yeccgoto(case_expr, 257) ->
- 47;
-yeccgoto(case_expr, 260) ->
- 47;
-yeccgoto(case_expr, 265) ->
- 47;
-yeccgoto(catch_expr, 33) ->
- 49;
-yeccgoto(catch_expr, 35) ->
- 49;
-yeccgoto(catch_expr, 36) ->
- 49;
-yeccgoto(catch_expr, 37) ->
- 49;
-yeccgoto(catch_expr, 40) ->
- 49;
-yeccgoto(catch_expr, 44) ->
- 49;
-yeccgoto(catch_expr, 46) ->
- 49;
-yeccgoto(catch_expr, 48) ->
- 49;
-yeccgoto(catch_expr, 52) ->
- 49;
-yeccgoto(catch_expr, 70) ->
- 49;
-yeccgoto(catch_expr, 74) ->
- 49;
-yeccgoto(catch_expr, 79) ->
- 49;
-yeccgoto(catch_expr, 86) ->
- 49;
-yeccgoto(catch_expr, 90) ->
- 49;
-yeccgoto(catch_expr, 99) ->
- 49;
-yeccgoto(catch_expr, 164) ->
- 49;
-yeccgoto(catch_expr, 166) ->
- 49;
-yeccgoto(catch_expr, 171) ->
- 49;
-yeccgoto(catch_expr, 203) ->
- 49;
-yeccgoto(catch_expr, 211) ->
- 49;
-yeccgoto(catch_expr, 214) ->
- 49;
-yeccgoto(catch_expr, 216) ->
- 49;
-yeccgoto(catch_expr, 218) ->
- 49;
-yeccgoto(catch_expr, 226) ->
- 49;
-yeccgoto(catch_expr, 232) ->
- 49;
-yeccgoto(catch_expr, 235) ->
- 49;
-yeccgoto(catch_expr, 257) ->
- 49;
-yeccgoto(catch_expr, 260) ->
- 49;
-yeccgoto(catch_expr, 265) ->
- 49;
-yeccgoto(clause, 65) ->
- 108;
-yeccgoto(clause, 96) ->
- 185;
-yeccgoto(clause, 100) ->
- 108;
-yeccgoto(clause, 222) ->
- 108;
-yeccgoto(clause_pattern, 65) ->
- 109;
-yeccgoto(clause_pattern, 96) ->
- 109;
-yeccgoto(clause_pattern, 100) ->
- 109;
-yeccgoto(clause_pattern, 222) ->
- 109;
-yeccgoto(cons, 33) ->
- 51;
-yeccgoto(cons, 35) ->
- 51;
-yeccgoto(cons, 36) ->
- 51;
-yeccgoto(cons, 37) ->
- 51;
-yeccgoto(cons, 40) ->
- 51;
-yeccgoto(cons, 44) ->
- 51;
-yeccgoto(cons, 46) ->
- 51;
-yeccgoto(cons, 48) ->
- 51;
-yeccgoto(cons, 52) ->
- 51;
-yeccgoto(cons, 70) ->
- 51;
-yeccgoto(cons, 74) ->
- 51;
-yeccgoto(cons, 79) ->
- 51;
-yeccgoto(cons, 86) ->
- 51;
-yeccgoto(cons, 90) ->
- 51;
-yeccgoto(cons, 99) ->
- 51;
-yeccgoto(cons, 164) ->
- 51;
-yeccgoto(cons, 166) ->
- 51;
-yeccgoto(cons, 171) ->
- 51;
-yeccgoto(cons, 203) ->
- 51;
-yeccgoto(cons, 211) ->
- 51;
-yeccgoto(cons, 214) ->
- 51;
-yeccgoto(cons, 216) ->
- 51;
-yeccgoto(cons, 218) ->
- 51;
-yeccgoto(cons, 226) ->
- 51;
-yeccgoto(cons, 232) ->
- 51;
-yeccgoto(cons, 235) ->
- 51;
-yeccgoto(cons, 257) ->
- 51;
-yeccgoto(cons, 260) ->
- 51;
-yeccgoto(cons, 265) ->
- 51;
-yeccgoto(cons_constant, 126) ->
- 134;
-yeccgoto(cons_constant, 129) ->
- 134;
-yeccgoto(cons_constant, 142) ->
- 134;
-yeccgoto(cons_constant, 147) ->
- 134;
-yeccgoto(cons_constant, 151) ->
- 134;
-yeccgoto(cons_constant, 154) ->
- 134;
-yeccgoto(cons_literal, 284) ->
- 287;
-yeccgoto(cons_literal, 285) ->
- 287;
-yeccgoto(cons_literal, 290) ->
- 287;
-yeccgoto(cons_literal, 295) ->
- 287;
-yeccgoto(cons_literal, 298) ->
- 287;
-yeccgoto(cons_literal, 301) ->
- 287;
-yeccgoto(cons_pattern, 65) ->
- 110;
-yeccgoto(cons_pattern, 96) ->
- 110;
-yeccgoto(cons_pattern, 97) ->
- 110;
-yeccgoto(cons_pattern, 98) ->
- 110;
-yeccgoto(cons_pattern, 100) ->
- 110;
-yeccgoto(cons_pattern, 114) ->
- 110;
-yeccgoto(cons_pattern, 115) ->
- 110;
-yeccgoto(cons_pattern, 120) ->
- 110;
-yeccgoto(cons_pattern, 162) ->
- 110;
-yeccgoto(cons_pattern, 174) ->
- 110;
-yeccgoto(cons_pattern, 177) ->
- 110;
-yeccgoto(cons_pattern, 200) ->
- 110;
-yeccgoto(cons_pattern, 222) ->
- 110;
-yeccgoto(constant, 126) ->
- 135;
-yeccgoto(constant, 129) ->
- 150;
-yeccgoto(constant, 142) ->
- 135;
-yeccgoto(constant, 147) ->
- 135;
-yeccgoto(constant, 151) ->
- 157;
-yeccgoto(constant, 154) ->
- 155;
-yeccgoto(constants, 126) ->
- 136;
-yeccgoto(constants, 142) ->
- 143;
-yeccgoto(constants, 147) ->
- 148;
-yeccgoto(exported_name, 5) ->
- 307;
-yeccgoto(exported_name, 311) ->
- 307;
-yeccgoto(exported_names, 5) ->
- 308;
-yeccgoto(exported_names, 311) ->
- 312;
-yeccgoto(expression, 33) ->
- 53;
-yeccgoto(expression, 35) ->
- 243;
-yeccgoto(expression, 36) ->
- 53;
-yeccgoto(expression, 37) ->
- 53;
-yeccgoto(expression, 40) ->
- 53;
-yeccgoto(expression, 44) ->
- 53;
-yeccgoto(expression, 46) ->
- 53;
-yeccgoto(expression, 48) ->
- 53;
-yeccgoto(expression, 52) ->
- 53;
-yeccgoto(expression, 70) ->
- 53;
-yeccgoto(expression, 74) ->
- 53;
-yeccgoto(expression, 79) ->
- 53;
-yeccgoto(expression, 86) ->
- 53;
-yeccgoto(expression, 90) ->
- 53;
-yeccgoto(expression, 99) ->
- 53;
-yeccgoto(expression, 164) ->
- 53;
-yeccgoto(expression, 166) ->
- 53;
-yeccgoto(expression, 171) ->
- 53;
-yeccgoto(expression, 203) ->
- 53;
-yeccgoto(expression, 211) ->
- 53;
-yeccgoto(expression, 214) ->
- 53;
-yeccgoto(expression, 216) ->
- 53;
-yeccgoto(expression, 218) ->
- 53;
-yeccgoto(expression, 226) ->
- 53;
-yeccgoto(expression, 232) ->
- 53;
-yeccgoto(expression, 235) ->
- 53;
-yeccgoto(expression, 257) ->
- 53;
-yeccgoto(expression, 260) ->
- 53;
-yeccgoto(expression, 265) ->
- 53;
-yeccgoto(fun_expr, 20) ->
- 24;
-yeccgoto(fun_expr, 21) ->
- 268;
-yeccgoto(fun_expr, 33) ->
- 55;
-yeccgoto(fun_expr, 35) ->
- 55;
-yeccgoto(fun_expr, 36) ->
- 55;
-yeccgoto(fun_expr, 37) ->
- 55;
-yeccgoto(fun_expr, 40) ->
- 55;
-yeccgoto(fun_expr, 44) ->
- 55;
-yeccgoto(fun_expr, 46) ->
- 55;
-yeccgoto(fun_expr, 48) ->
- 55;
-yeccgoto(fun_expr, 52) ->
- 55;
-yeccgoto(fun_expr, 70) ->
- 55;
-yeccgoto(fun_expr, 74) ->
- 55;
-yeccgoto(fun_expr, 79) ->
- 55;
-yeccgoto(fun_expr, 86) ->
- 55;
-yeccgoto(fun_expr, 90) ->
- 55;
-yeccgoto(fun_expr, 99) ->
- 55;
-yeccgoto(fun_expr, 164) ->
- 55;
-yeccgoto(fun_expr, 166) ->
- 55;
-yeccgoto(fun_expr, 171) ->
- 55;
-yeccgoto(fun_expr, 203) ->
- 55;
-yeccgoto(fun_expr, 211) ->
- 55;
-yeccgoto(fun_expr, 214) ->
- 55;
-yeccgoto(fun_expr, 216) ->
- 55;
-yeccgoto(fun_expr, 218) ->
- 55;
-yeccgoto(fun_expr, 226) ->
- 55;
-yeccgoto(fun_expr, 232) ->
- 55;
-yeccgoto(fun_expr, 235) ->
- 55;
-yeccgoto(fun_expr, 257) ->
- 55;
-yeccgoto(fun_expr, 260) ->
- 55;
-yeccgoto(fun_expr, 265) ->
- 55;
-yeccgoto(function_definition, 8) ->
- 12;
-yeccgoto(function_definition, 12) ->
- 12;
-yeccgoto(function_definition, 60) ->
- 12;
-yeccgoto(function_definition, 316) ->
- 12;
-yeccgoto(function_definitions, 8) ->
- 13;
-yeccgoto(function_definitions, 12) ->
- 17;
-yeccgoto(function_definitions, 60) ->
- 210;
-yeccgoto(function_definitions, 316) ->
- 13;
-yeccgoto(function_name, 5) ->
- 309;
-yeccgoto(function_name, 8) ->
- 14;
-yeccgoto(function_name, 9) ->
- 272;
-yeccgoto(function_name, 12) ->
- 14;
-yeccgoto(function_name, 33) ->
- 56;
-yeccgoto(function_name, 35) ->
- 56;
-yeccgoto(function_name, 36) ->
- 56;
-yeccgoto(function_name, 37) ->
- 56;
-yeccgoto(function_name, 40) ->
- 56;
-yeccgoto(function_name, 44) ->
- 56;
-yeccgoto(function_name, 46) ->
- 56;
-yeccgoto(function_name, 48) ->
- 56;
-yeccgoto(function_name, 52) ->
- 56;
-yeccgoto(function_name, 60) ->
- 14;
-yeccgoto(function_name, 70) ->
- 56;
-yeccgoto(function_name, 74) ->
- 56;
-yeccgoto(function_name, 79) ->
- 56;
-yeccgoto(function_name, 86) ->
- 56;
-yeccgoto(function_name, 90) ->
- 56;
-yeccgoto(function_name, 99) ->
- 56;
-yeccgoto(function_name, 164) ->
- 56;
-yeccgoto(function_name, 166) ->
- 56;
-yeccgoto(function_name, 171) ->
- 56;
-yeccgoto(function_name, 203) ->
- 56;
-yeccgoto(function_name, 211) ->
- 56;
-yeccgoto(function_name, 214) ->
- 56;
-yeccgoto(function_name, 216) ->
- 56;
-yeccgoto(function_name, 218) ->
- 56;
-yeccgoto(function_name, 226) ->
- 56;
-yeccgoto(function_name, 232) ->
- 56;
-yeccgoto(function_name, 235) ->
- 56;
-yeccgoto(function_name, 257) ->
- 56;
-yeccgoto(function_name, 260) ->
- 56;
-yeccgoto(function_name, 265) ->
- 56;
-yeccgoto(function_name, 311) ->
- 309;
-yeccgoto(function_name, 316) ->
- 14;
-yeccgoto(let_expr, 33) ->
- 59;
-yeccgoto(let_expr, 35) ->
- 59;
-yeccgoto(let_expr, 36) ->
- 59;
-yeccgoto(let_expr, 37) ->
- 59;
-yeccgoto(let_expr, 40) ->
- 59;
-yeccgoto(let_expr, 44) ->
- 59;
-yeccgoto(let_expr, 46) ->
- 59;
-yeccgoto(let_expr, 48) ->
- 59;
-yeccgoto(let_expr, 52) ->
- 59;
-yeccgoto(let_expr, 70) ->
- 59;
-yeccgoto(let_expr, 74) ->
- 59;
-yeccgoto(let_expr, 79) ->
- 59;
-yeccgoto(let_expr, 86) ->
- 59;
-yeccgoto(let_expr, 90) ->
- 59;
-yeccgoto(let_expr, 99) ->
- 59;
-yeccgoto(let_expr, 164) ->
- 59;
-yeccgoto(let_expr, 166) ->
- 59;
-yeccgoto(let_expr, 171) ->
- 59;
-yeccgoto(let_expr, 203) ->
- 59;
-yeccgoto(let_expr, 211) ->
- 59;
-yeccgoto(let_expr, 214) ->
- 59;
-yeccgoto(let_expr, 216) ->
- 59;
-yeccgoto(let_expr, 218) ->
- 59;
-yeccgoto(let_expr, 226) ->
- 59;
-yeccgoto(let_expr, 232) ->
- 59;
-yeccgoto(let_expr, 235) ->
- 59;
-yeccgoto(let_expr, 257) ->
- 59;
-yeccgoto(let_expr, 260) ->
- 59;
-yeccgoto(let_expr, 265) ->
- 59;
-yeccgoto(let_vars, 58) ->
- 213;
-yeccgoto(let_vars, 82) ->
- 85;
-yeccgoto(let_vars, 88) ->
- 89;
-yeccgoto(letrec_expr, 33) ->
- 61;
-yeccgoto(letrec_expr, 35) ->
- 61;
-yeccgoto(letrec_expr, 36) ->
- 61;
-yeccgoto(letrec_expr, 37) ->
- 61;
-yeccgoto(letrec_expr, 40) ->
- 61;
-yeccgoto(letrec_expr, 44) ->
- 61;
-yeccgoto(letrec_expr, 46) ->
- 61;
-yeccgoto(letrec_expr, 48) ->
- 61;
-yeccgoto(letrec_expr, 52) ->
- 61;
-yeccgoto(letrec_expr, 70) ->
- 61;
-yeccgoto(letrec_expr, 74) ->
- 61;
-yeccgoto(letrec_expr, 79) ->
- 61;
-yeccgoto(letrec_expr, 86) ->
- 61;
-yeccgoto(letrec_expr, 90) ->
- 61;
-yeccgoto(letrec_expr, 99) ->
- 61;
-yeccgoto(letrec_expr, 164) ->
- 61;
-yeccgoto(letrec_expr, 166) ->
- 61;
-yeccgoto(letrec_expr, 171) ->
- 61;
-yeccgoto(letrec_expr, 203) ->
- 61;
-yeccgoto(letrec_expr, 211) ->
- 61;
-yeccgoto(letrec_expr, 214) ->
- 61;
-yeccgoto(letrec_expr, 216) ->
- 61;
-yeccgoto(letrec_expr, 218) ->
- 61;
-yeccgoto(letrec_expr, 226) ->
- 61;
-yeccgoto(letrec_expr, 232) ->
- 61;
-yeccgoto(letrec_expr, 235) ->
- 61;
-yeccgoto(letrec_expr, 257) ->
- 61;
-yeccgoto(letrec_expr, 260) ->
- 61;
-yeccgoto(letrec_expr, 265) ->
- 61;
-yeccgoto(literal, 284) ->
- 288;
-yeccgoto(literal, 285) ->
- 297;
-yeccgoto(literal, 290) ->
- 291;
-yeccgoto(literal, 295) ->
- 291;
-yeccgoto(literal, 298) ->
- 304;
-yeccgoto(literal, 301) ->
- 302;
-yeccgoto(literals, 290) ->
- 292;
-yeccgoto(literals, 295) ->
- 296;
-yeccgoto(module_attribute, 6) ->
- 8;
-yeccgoto(module_attribute, 315) ->
- 316;
-yeccgoto(module_definition, 0) ->
- 3;
-yeccgoto(module_defs, 8) ->
- 15;
-yeccgoto(module_defs, 316) ->
- 317;
-yeccgoto(module_export, 4) ->
- 6;
-yeccgoto(module_export, 314) ->
- 315;
-yeccgoto(nil, 33) ->
- 62;
-yeccgoto(nil, 35) ->
- 62;
-yeccgoto(nil, 36) ->
- 62;
-yeccgoto(nil, 37) ->
- 62;
-yeccgoto(nil, 40) ->
- 62;
-yeccgoto(nil, 44) ->
- 62;
-yeccgoto(nil, 46) ->
- 62;
-yeccgoto(nil, 48) ->
- 62;
-yeccgoto(nil, 52) ->
- 62;
-yeccgoto(nil, 65) ->
- 62;
-yeccgoto(nil, 70) ->
- 62;
-yeccgoto(nil, 74) ->
- 62;
-yeccgoto(nil, 79) ->
- 62;
-yeccgoto(nil, 86) ->
- 62;
-yeccgoto(nil, 90) ->
- 62;
-yeccgoto(nil, 96) ->
- 62;
-yeccgoto(nil, 97) ->
- 62;
-yeccgoto(nil, 98) ->
- 62;
-yeccgoto(nil, 99) ->
- 62;
-yeccgoto(nil, 100) ->
- 62;
-yeccgoto(nil, 114) ->
- 62;
-yeccgoto(nil, 115) ->
- 62;
-yeccgoto(nil, 120) ->
- 62;
-yeccgoto(nil, 126) ->
- 139;
-yeccgoto(nil, 129) ->
- 139;
-yeccgoto(nil, 142) ->
- 139;
-yeccgoto(nil, 147) ->
- 139;
-yeccgoto(nil, 151) ->
- 139;
-yeccgoto(nil, 154) ->
- 139;
-yeccgoto(nil, 162) ->
- 62;
-yeccgoto(nil, 164) ->
- 62;
-yeccgoto(nil, 166) ->
- 62;
-yeccgoto(nil, 171) ->
- 62;
-yeccgoto(nil, 174) ->
- 62;
-yeccgoto(nil, 177) ->
- 62;
-yeccgoto(nil, 200) ->
- 62;
-yeccgoto(nil, 203) ->
- 62;
-yeccgoto(nil, 211) ->
- 62;
-yeccgoto(nil, 214) ->
- 62;
-yeccgoto(nil, 216) ->
- 62;
-yeccgoto(nil, 218) ->
- 62;
-yeccgoto(nil, 222) ->
- 62;
-yeccgoto(nil, 226) ->
- 62;
-yeccgoto(nil, 232) ->
- 62;
-yeccgoto(nil, 235) ->
- 62;
-yeccgoto(nil, 257) ->
- 62;
-yeccgoto(nil, 260) ->
- 62;
-yeccgoto(nil, 265) ->
- 62;
-yeccgoto(nil, 284) ->
- 62;
-yeccgoto(nil, 285) ->
- 62;
-yeccgoto(nil, 290) ->
- 62;
-yeccgoto(nil, 295) ->
- 62;
-yeccgoto(nil, 298) ->
- 62;
-yeccgoto(nil, 301) ->
- 62;
-yeccgoto(other_pattern, 65) ->
- 111;
-yeccgoto(other_pattern, 96) ->
- 186;
-yeccgoto(other_pattern, 97) ->
- 111;
-yeccgoto(other_pattern, 98) ->
- 111;
-yeccgoto(other_pattern, 100) ->
- 111;
-yeccgoto(other_pattern, 114) ->
- 111;
-yeccgoto(other_pattern, 115) ->
- 123;
-yeccgoto(other_pattern, 120) ->
- 111;
-yeccgoto(other_pattern, 162) ->
- 111;
-yeccgoto(other_pattern, 174) ->
- 111;
-yeccgoto(other_pattern, 177) ->
- 111;
-yeccgoto(other_pattern, 200) ->
- 111;
-yeccgoto(other_pattern, 222) ->
- 111;
-yeccgoto(primop_expr, 33) ->
- 64;
-yeccgoto(primop_expr, 35) ->
- 64;
-yeccgoto(primop_expr, 36) ->
- 64;
-yeccgoto(primop_expr, 37) ->
- 64;
-yeccgoto(primop_expr, 40) ->
- 64;
-yeccgoto(primop_expr, 44) ->
- 64;
-yeccgoto(primop_expr, 46) ->
- 64;
-yeccgoto(primop_expr, 48) ->
- 64;
-yeccgoto(primop_expr, 52) ->
- 64;
-yeccgoto(primop_expr, 70) ->
- 64;
-yeccgoto(primop_expr, 74) ->
- 64;
-yeccgoto(primop_expr, 79) ->
- 64;
-yeccgoto(primop_expr, 86) ->
- 64;
-yeccgoto(primop_expr, 90) ->
- 64;
-yeccgoto(primop_expr, 99) ->
- 64;
-yeccgoto(primop_expr, 164) ->
- 64;
-yeccgoto(primop_expr, 166) ->
- 64;
-yeccgoto(primop_expr, 171) ->
- 64;
-yeccgoto(primop_expr, 203) ->
- 64;
-yeccgoto(primop_expr, 211) ->
- 64;
-yeccgoto(primop_expr, 214) ->
- 64;
-yeccgoto(primop_expr, 216) ->
- 64;
-yeccgoto(primop_expr, 218) ->
- 64;
-yeccgoto(primop_expr, 226) ->
- 64;
-yeccgoto(primop_expr, 232) ->
- 64;
-yeccgoto(primop_expr, 235) ->
- 64;
-yeccgoto(primop_expr, 257) ->
- 64;
-yeccgoto(primop_expr, 260) ->
- 64;
-yeccgoto(primop_expr, 265) ->
- 64;
-yeccgoto(receive_expr, 33) ->
- 66;
-yeccgoto(receive_expr, 35) ->
- 66;
-yeccgoto(receive_expr, 36) ->
- 66;
-yeccgoto(receive_expr, 37) ->
- 66;
-yeccgoto(receive_expr, 40) ->
- 66;
-yeccgoto(receive_expr, 44) ->
- 66;
-yeccgoto(receive_expr, 46) ->
- 66;
-yeccgoto(receive_expr, 48) ->
- 66;
-yeccgoto(receive_expr, 52) ->
- 66;
-yeccgoto(receive_expr, 70) ->
- 66;
-yeccgoto(receive_expr, 74) ->
- 66;
-yeccgoto(receive_expr, 79) ->
- 66;
-yeccgoto(receive_expr, 86) ->
- 66;
-yeccgoto(receive_expr, 90) ->
- 66;
-yeccgoto(receive_expr, 99) ->
- 66;
-yeccgoto(receive_expr, 164) ->
- 66;
-yeccgoto(receive_expr, 166) ->
- 66;
-yeccgoto(receive_expr, 171) ->
- 66;
-yeccgoto(receive_expr, 203) ->
- 66;
-yeccgoto(receive_expr, 211) ->
- 66;
-yeccgoto(receive_expr, 214) ->
- 66;
-yeccgoto(receive_expr, 216) ->
- 66;
-yeccgoto(receive_expr, 218) ->
- 66;
-yeccgoto(receive_expr, 226) ->
- 66;
-yeccgoto(receive_expr, 232) ->
- 66;
-yeccgoto(receive_expr, 235) ->
- 66;
-yeccgoto(receive_expr, 257) ->
- 66;
-yeccgoto(receive_expr, 260) ->
- 66;
-yeccgoto(receive_expr, 265) ->
- 66;
-yeccgoto(segment, 247) ->
- 249;
-yeccgoto(segment, 255) ->
- 249;
-yeccgoto(segment_pattern, 190) ->
- 192;
-yeccgoto(segment_pattern, 198) ->
- 192;
-yeccgoto(segment_patterns, 190) ->
- 193;
-yeccgoto(segment_patterns, 198) ->
- 199;
-yeccgoto(segments, 247) ->
- 250;
-yeccgoto(segments, 255) ->
- 256;
-yeccgoto(sequence, 33) ->
- 67;
-yeccgoto(sequence, 35) ->
- 67;
-yeccgoto(sequence, 36) ->
- 67;
-yeccgoto(sequence, 37) ->
- 67;
-yeccgoto(sequence, 40) ->
- 67;
-yeccgoto(sequence, 44) ->
- 67;
-yeccgoto(sequence, 46) ->
- 67;
-yeccgoto(sequence, 48) ->
- 67;
-yeccgoto(sequence, 52) ->
- 67;
-yeccgoto(sequence, 70) ->
- 67;
-yeccgoto(sequence, 74) ->
- 67;
-yeccgoto(sequence, 79) ->
- 67;
-yeccgoto(sequence, 86) ->
- 67;
-yeccgoto(sequence, 90) ->
- 67;
-yeccgoto(sequence, 99) ->
- 67;
-yeccgoto(sequence, 164) ->
- 67;
-yeccgoto(sequence, 166) ->
- 67;
-yeccgoto(sequence, 171) ->
- 67;
-yeccgoto(sequence, 203) ->
- 67;
-yeccgoto(sequence, 211) ->
- 67;
-yeccgoto(sequence, 214) ->
- 67;
-yeccgoto(sequence, 216) ->
- 67;
-yeccgoto(sequence, 218) ->
- 67;
-yeccgoto(sequence, 226) ->
- 67;
-yeccgoto(sequence, 232) ->
- 67;
-yeccgoto(sequence, 235) ->
- 67;
-yeccgoto(sequence, 257) ->
- 67;
-yeccgoto(sequence, 260) ->
- 67;
-yeccgoto(sequence, 265) ->
- 67;
-yeccgoto(single_expression, 33) ->
- 68;
-yeccgoto(single_expression, 35) ->
- 68;
-yeccgoto(single_expression, 36) ->
- 68;
-yeccgoto(single_expression, 37) ->
- 68;
-yeccgoto(single_expression, 40) ->
- 68;
-yeccgoto(single_expression, 44) ->
- 68;
-yeccgoto(single_expression, 46) ->
- 68;
-yeccgoto(single_expression, 48) ->
- 68;
-yeccgoto(single_expression, 52) ->
- 68;
-yeccgoto(single_expression, 70) ->
- 68;
-yeccgoto(single_expression, 74) ->
- 68;
-yeccgoto(single_expression, 79) ->
- 68;
-yeccgoto(single_expression, 86) ->
- 68;
-yeccgoto(single_expression, 90) ->
- 68;
-yeccgoto(single_expression, 99) ->
- 68;
-yeccgoto(single_expression, 164) ->
- 68;
-yeccgoto(single_expression, 166) ->
- 68;
-yeccgoto(single_expression, 171) ->
- 68;
-yeccgoto(single_expression, 203) ->
- 68;
-yeccgoto(single_expression, 211) ->
- 68;
-yeccgoto(single_expression, 214) ->
- 68;
-yeccgoto(single_expression, 216) ->
- 68;
-yeccgoto(single_expression, 218) ->
- 68;
-yeccgoto(single_expression, 226) ->
- 68;
-yeccgoto(single_expression, 232) ->
- 68;
-yeccgoto(single_expression, 235) ->
- 68;
-yeccgoto(single_expression, 257) ->
- 68;
-yeccgoto(single_expression, 260) ->
- 68;
-yeccgoto(single_expression, 265) ->
- 68;
-yeccgoto(tail, 231) ->
- 234;
-yeccgoto(tail, 238) ->
- 239;
-yeccgoto(tail_constant, 150) ->
- 153;
-yeccgoto(tail_constant, 157) ->
- 158;
-yeccgoto(tail_literal, 297) ->
- 300;
-yeccgoto(tail_literal, 304) ->
- 305;
-yeccgoto(tail_pattern, 173) ->
- 176;
-yeccgoto(tail_pattern, 180) ->
- 181;
-yeccgoto(timeout, 65) ->
- 112;
-yeccgoto(timeout, 101) ->
- 168;
-yeccgoto(try_expr, 33) ->
- 71;
-yeccgoto(try_expr, 35) ->
- 71;
-yeccgoto(try_expr, 36) ->
- 71;
-yeccgoto(try_expr, 37) ->
- 71;
-yeccgoto(try_expr, 40) ->
- 71;
-yeccgoto(try_expr, 44) ->
- 71;
-yeccgoto(try_expr, 46) ->
- 71;
-yeccgoto(try_expr, 48) ->
- 71;
-yeccgoto(try_expr, 52) ->
- 71;
-yeccgoto(try_expr, 70) ->
- 71;
-yeccgoto(try_expr, 74) ->
- 71;
-yeccgoto(try_expr, 79) ->
- 71;
-yeccgoto(try_expr, 86) ->
- 71;
-yeccgoto(try_expr, 90) ->
- 71;
-yeccgoto(try_expr, 99) ->
- 71;
-yeccgoto(try_expr, 164) ->
- 71;
-yeccgoto(try_expr, 166) ->
- 71;
-yeccgoto(try_expr, 171) ->
- 71;
-yeccgoto(try_expr, 203) ->
- 71;
-yeccgoto(try_expr, 211) ->
- 71;
-yeccgoto(try_expr, 214) ->
- 71;
-yeccgoto(try_expr, 216) ->
- 71;
-yeccgoto(try_expr, 218) ->
- 71;
-yeccgoto(try_expr, 226) ->
- 71;
-yeccgoto(try_expr, 232) ->
- 71;
-yeccgoto(try_expr, 235) ->
- 71;
-yeccgoto(try_expr, 257) ->
- 71;
-yeccgoto(try_expr, 260) ->
- 71;
-yeccgoto(try_expr, 265) ->
- 71;
-yeccgoto(tuple, 33) ->
- 72;
-yeccgoto(tuple, 35) ->
- 72;
-yeccgoto(tuple, 36) ->
- 72;
-yeccgoto(tuple, 37) ->
- 72;
-yeccgoto(tuple, 40) ->
- 72;
-yeccgoto(tuple, 44) ->
- 72;
-yeccgoto(tuple, 46) ->
- 72;
-yeccgoto(tuple, 48) ->
- 72;
-yeccgoto(tuple, 52) ->
- 72;
-yeccgoto(tuple, 70) ->
- 72;
-yeccgoto(tuple, 74) ->
- 72;
-yeccgoto(tuple, 79) ->
- 72;
-yeccgoto(tuple, 86) ->
- 72;
-yeccgoto(tuple, 90) ->
- 72;
-yeccgoto(tuple, 99) ->
- 72;
-yeccgoto(tuple, 164) ->
- 72;
-yeccgoto(tuple, 166) ->
- 72;
-yeccgoto(tuple, 171) ->
- 72;
-yeccgoto(tuple, 203) ->
- 72;
-yeccgoto(tuple, 211) ->
- 72;
-yeccgoto(tuple, 214) ->
- 72;
-yeccgoto(tuple, 216) ->
- 72;
-yeccgoto(tuple, 218) ->
- 72;
-yeccgoto(tuple, 226) ->
- 72;
-yeccgoto(tuple, 232) ->
- 72;
-yeccgoto(tuple, 235) ->
- 72;
-yeccgoto(tuple, 257) ->
- 72;
-yeccgoto(tuple, 260) ->
- 72;
-yeccgoto(tuple, 265) ->
- 72;
-yeccgoto(tuple_constant, 126) ->
- 141;
-yeccgoto(tuple_constant, 129) ->
- 141;
-yeccgoto(tuple_constant, 142) ->
- 141;
-yeccgoto(tuple_constant, 147) ->
- 141;
-yeccgoto(tuple_constant, 151) ->
- 141;
-yeccgoto(tuple_constant, 154) ->
- 141;
-yeccgoto(tuple_literal, 284) ->
- 289;
-yeccgoto(tuple_literal, 285) ->
- 289;
-yeccgoto(tuple_literal, 290) ->
- 289;
-yeccgoto(tuple_literal, 295) ->
- 289;
-yeccgoto(tuple_literal, 298) ->
- 289;
-yeccgoto(tuple_literal, 301) ->
- 289;
-yeccgoto(tuple_pattern, 65) ->
- 113;
-yeccgoto(tuple_pattern, 96) ->
- 113;
-yeccgoto(tuple_pattern, 97) ->
- 113;
-yeccgoto(tuple_pattern, 98) ->
- 113;
-yeccgoto(tuple_pattern, 100) ->
- 113;
-yeccgoto(tuple_pattern, 114) ->
- 113;
-yeccgoto(tuple_pattern, 115) ->
- 113;
-yeccgoto(tuple_pattern, 120) ->
- 113;
-yeccgoto(tuple_pattern, 162) ->
- 113;
-yeccgoto(tuple_pattern, 174) ->
- 113;
-yeccgoto(tuple_pattern, 177) ->
- 113;
-yeccgoto(tuple_pattern, 200) ->
- 113;
-yeccgoto(tuple_pattern, 222) ->
- 113;
-yeccgoto(variable, 25) ->
- 31;
-yeccgoto(variable, 26) ->
- 267;
-yeccgoto(variable, 33) ->
- 73;
-yeccgoto(variable, 35) ->
- 73;
-yeccgoto(variable, 36) ->
- 73;
-yeccgoto(variable, 37) ->
- 73;
-yeccgoto(variable, 40) ->
- 73;
-yeccgoto(variable, 44) ->
- 73;
-yeccgoto(variable, 46) ->
- 73;
-yeccgoto(variable, 48) ->
- 73;
-yeccgoto(variable, 52) ->
- 73;
-yeccgoto(variable, 58) ->
- 31;
-yeccgoto(variable, 65) ->
- 31;
-yeccgoto(variable, 70) ->
- 73;
-yeccgoto(variable, 74) ->
- 73;
-yeccgoto(variable, 79) ->
- 73;
-yeccgoto(variable, 82) ->
- 31;
-yeccgoto(variable, 83) ->
- 31;
-yeccgoto(variable, 86) ->
- 73;
-yeccgoto(variable, 88) ->
- 31;
-yeccgoto(variable, 90) ->
- 73;
-yeccgoto(variable, 96) ->
- 124;
-yeccgoto(variable, 97) ->
- 31;
-yeccgoto(variable, 98) ->
- 31;
-yeccgoto(variable, 99) ->
- 73;
-yeccgoto(variable, 100) ->
- 31;
-yeccgoto(variable, 114) ->
- 31;
-yeccgoto(variable, 115) ->
- 124;
-yeccgoto(variable, 120) ->
- 31;
-yeccgoto(variable, 162) ->
- 31;
-yeccgoto(variable, 164) ->
- 73;
-yeccgoto(variable, 166) ->
- 73;
-yeccgoto(variable, 171) ->
- 73;
-yeccgoto(variable, 174) ->
- 31;
-yeccgoto(variable, 177) ->
- 31;
-yeccgoto(variable, 200) ->
- 31;
-yeccgoto(variable, 203) ->
- 73;
-yeccgoto(variable, 211) ->
- 73;
-yeccgoto(variable, 214) ->
- 73;
-yeccgoto(variable, 216) ->
- 73;
-yeccgoto(variable, 218) ->
- 73;
-yeccgoto(variable, 222) ->
- 31;
-yeccgoto(variable, 226) ->
- 73;
-yeccgoto(variable, 232) ->
- 73;
-yeccgoto(variable, 235) ->
- 73;
-yeccgoto(variable, 257) ->
- 73;
-yeccgoto(variable, 260) ->
- 73;
-yeccgoto(variable, 263) ->
- 31;
-yeccgoto(variable, 265) ->
- 73;
-yeccgoto(__Symbol, __State) ->
- exit({__Symbol, __State, missing_in_goto_table}).
-
-
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_parse.hrl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_parse.hrl
deleted file mode 100644
index aaf913a15a..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_parse.hrl
+++ /dev/null
@@ -1,111 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: core_parse.hrl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
-%% Purpose : Core Erlang syntax trees as records.
-
-%% It would be nice to incorporate some generic functions as well but
-%% this could make including this file difficult.
-
-%% Note: the annotation list is *always* the first record field.
-%% Thus it is possible to define the macros:
-%% -define(get_ann(X), element(2, X)).
-%% -define(set_ann(X, Y), setelement(2, X, Y)).
-
--record(c_int, {anno=[], val}).		% val :: integer()
-
--record(c_float, {anno=[], val}).	% val :: float()
-
--record(c_atom, {anno=[], val}).	% val :: atom()
-
--record(c_char, {anno=[], val}).	% val :: char()
-
--record(c_string, {anno=[], val}).	% val :: string()
-
--record(c_nil, {anno=[]}).
-
--record(c_binary, {anno=[], segments}).	% segments :: [#ce_bitstr{}]
-
--record(c_bitstr, {anno=[],val,	% val :: Tree,
-		   size,		% size :: Tree,
-		   unit,		% unit :: integer(),
-		   type,		% type :: atom(),
-		   flags}).		% flags :: [atom()],
-
--record(c_cons, {anno=[], hd,		% hd :: Tree,
-		 tl}).			% tl :: Tree
-
--record(c_tuple, {anno=[], es}).	% es :: [Tree]
-
--record(c_var, {anno=[], name}).	% name :: integer() | atom()
-
--record(c_fname, {anno=[], id,		% id :: atom(),
-		  arity}).		% arity :: integer()
-
--record(c_values, {anno=[], es}).	% es :: [Tree]
-
--record(c_fun, {anno=[], vars,		% vars :: [Tree],
-		body}).			% body :: Tree
-
--record(c_seq, {anno=[], arg,		% arg :: Tree,
-		body}).			% body :: Tree
-
--record(c_let, {anno=[], vars,		% vars :: [Tree],
-		arg,			% arg :: Tree,
-		body}).			% body :: Tree
-
--record(c_letrec, {anno=[], defs,	% defs :: [#ce_def{}],
-		   body}).		% body :: Tree
-
--record(c_def, {anno=[], name,		% name :: Tree,
-		val}).			% val :: Tree,
-
--record(c_case, {anno=[], arg,		% arg :: Tree,
-		 clauses}).		% clauses :: [Tree]
-
--record(c_clause, {anno=[], pats,	% pats :: [Tree],
-		   guard,		% guard :: Tree,
-		   body}).		% body :: Tree
-
--record(c_alias, {anno=[], var,		% var :: Tree,
-		  pat}).		% pat :: Tree
-
--record(c_receive, {anno=[], clauses,	% clauses :: [Tree],
-		    timeout,		% timeout :: Tree,
-		    action}).		% action :: Tree
-
--record(c_apply, {anno=[], op,		% op :: Tree,
-		  args}).		% args :: [Tree]
-
--record(c_call, {anno=[], module,	% module :: Tree,
-		 name,			% name :: Tree,
-		 args}).		% args :: [Tree]
-
--record(c_primop, {anno=[], name,	% name :: Tree,
-		   args}).		% args :: [Tree]
-
--record(c_try, {anno=[], arg,		% arg :: Tree,
-		vars,			% vars :: [Tree],
-		body,			% body :: Tree
-		evars,			% evars :: [Tree],
-		handler}).		% handler :: Tree
-
--record(c_catch, {anno=[], body}).	% body :: Tree
-
--record(c_module, {anno=[], name,	% name :: Tree,
-		   exports,		% exports :: [Tree],
-		   attrs,		% attrs :: [#ce_def{}],
-		   defs}).		% defs :: [#ce_def{}]
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_pp.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_pp.erl
deleted file mode 100644
index 147a0dba6c..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_pp.erl
+++ /dev/null
@@ -1,430 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: core_pp.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
-%% Purpose : Core Erlang (naive) prettyprinter
-
--module(core_pp).
-
--export([format/1]).
-
--include("core_parse.hrl").
-
-%% ====================================================================== %%
-%% format(Node) -> Text
-%%	Node = coreErlang()
-%%	Text = string() | [Text]
-%%
-%%	Prettyprint-formats (naively) an abstract Core Erlang syntax
-%%	tree.
-
--record(ctxt, {class = term,
-	       indent = 0,
-	       item_indent = 2,
-	       body_indent = 4,
-	       tab_width = 8,
-	       line = 0}).
-
-format(Node) -> case catch format(Node, #ctxt{}) of
-		    {'EXIT',_} -> io_lib:format("~p",[Node]);
-		    Other -> Other
-		end.
-
-maybe_anno(Node, Fun, Ctxt) ->
-    As = core_lib:get_anno(Node),
-    case get_line(As) of
-	none ->
-	    maybe_anno(Node, Fun, Ctxt, As);
-  	Line ->
-	    if  Line > Ctxt#ctxt.line ->
-		    [io_lib:format("%% Line ~w",[Line]),
-		     nl_indent(Ctxt),
-		     maybe_anno(Node, Fun, Ctxt#ctxt{line = Line}, As)
-		    ];
-		true ->
-		    maybe_anno(Node, Fun, Ctxt, As)
-	    end
-    end.
-
-maybe_anno(Node, Fun, Ctxt, As) ->
-    case strip_line(As) of
-	[] ->
-	    Fun(Node, Ctxt);
-	List ->
-	    Ctxt1 = add_indent(Ctxt, 2),
-	    Ctxt2 = add_indent(Ctxt1, 3),
-	    ["( ",
-	     Fun(Node, Ctxt1),
-	     nl_indent(Ctxt1),
-	     "-| ",format_1(core_lib:make_literal(List), Ctxt2)," )"
-	    ]
-    end.
-
-strip_line([A | As]) when integer(A) ->
-    strip_line(As);
-strip_line([A | As]) ->
-    [A | strip_line(As)];
-strip_line([]) ->
-    [].
-
-get_line([L | _As]) when integer(L) ->
-    L;
-get_line([_ | As]) ->
-    get_line(As);
-get_line([]) ->
-    none.
-
-format(Node, Ctxt) ->
-    maybe_anno(Node, fun format_1/2, Ctxt).
-
-format_1(#c_char{val=C}, _) -> io_lib:write_char(C);
-format_1(#c_int{val=I}, _) -> integer_to_list(I);
-format_1(#c_float{val=F}, _) -> float_to_list(F);
-format_1(#c_atom{val=A}, _) -> core_atom(A);
-format_1(#c_nil{}, _) -> "[]";
-format_1(#c_string{val=S}, _) -> io_lib:write_string(S);
-format_1(#c_var{name=V}, _) ->
-    %% Internal variable names may be:
-    %%     - atoms representing proper Erlang variable names, or
-    %%     any atoms that may be printed without single-quoting
-    %%     - nonnegative integers.
-    %% It is important that when printing variables, no two names
-    %% should ever map to the same string.
-    if atom(V) ->
-	    S = atom_to_list(V),
-	    case S of
-		[C | _] when C >= $A, C =< $Z ->
-		    %% Ordinary uppercase-prefixed names are
-		    %% printed just as they are.
-		    S;
-		[$_ | _] ->
-		    %% Already "_"-prefixed names are prefixed
-		    %% with "_X", e.g. '_foo' => '_X_foo', to
-		    %% avoid generating things like "____foo" upon
-		    %% repeated writing and reading of code.
-		    %% ("_X_X_X_foo" is better.)
-		    [$_, $X | S];
-		_ ->
-		    %% Plain atoms are prefixed with a single "_".
-		    %% E.g. foo => "_foo".
-		    [$_ | S]
-	    end;
-       integer(V) ->
-	    %% Integers are also simply prefixed with "_".
-	    [$_ | integer_to_list(V)]
-    end;
-format_1(#c_binary{segments=Segs}, Ctxt) ->
-    ["#{",
-     format_vseq(Segs, "", ",", add_indent(Ctxt, 2),
-		 fun format_bitstr/2),
-     "}#"
-    ];
-format_1(#c_tuple{es=Es}, Ctxt) ->
-    [${,
-     format_hseq(Es, ",", add_indent(Ctxt, 1), fun format/2),
-     $}
-    ];
-format_1(#c_cons{hd=H,tl=T}, Ctxt) ->
-    Txt = ["["|format(H, add_indent(Ctxt, 1))],
-    [Txt|format_list_tail(T, add_indent(Ctxt, width(Txt, Ctxt)))];
-format_1(#c_values{es=Es}, Ctxt) ->
-    format_values(Es, Ctxt);
-format_1(#c_alias{var=V,pat=P}, Ctxt) ->
-    Txt = [format(V, Ctxt)|" = "],
-    [Txt|format(P, add_indent(Ctxt, width(Txt, Ctxt)))];
-format_1(#c_let{vars=Vs,arg=A,body=B}, Ctxt) ->
-    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
-    ["let ",
-     format_values(Vs, add_indent(Ctxt, 4)),
-     " =",
-     nl_indent(Ctxt1),
-     format(A, Ctxt1),
-     nl_indent(Ctxt),
-     "in  "
-     | format(B, add_indent(Ctxt, 4))
-    ];
-format_1(#c_letrec{defs=Fs,body=B}, Ctxt) ->
-    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
-    ["letrec",
-     nl_indent(Ctxt1),
-     format_funcs(Fs, Ctxt1),
-     nl_indent(Ctxt),
-     "in  "
-     | format(B, add_indent(Ctxt, 4))
-    ];
-format_1(#c_seq{arg=A,body=B}, Ctxt) ->
-    Ctxt1 = add_indent(Ctxt, 4),
-    ["do  ",
-     format(A, Ctxt1),
-     nl_indent(Ctxt1)
-     | format(B, Ctxt1)
-    ];
-format_1(#c_case{arg=A,clauses=Cs}, Ctxt) ->
-    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.item_indent),
-    ["case ",
-     format(A, add_indent(Ctxt, 5)),
-     " of",
-     nl_indent(Ctxt1),
-     format_clauses(Cs, Ctxt1),
-     nl_indent(Ctxt)
-     | "end"
-    ];
-format_1(#c_receive{clauses=Cs,timeout=T,action=A}, Ctxt) ->
-    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.item_indent),
-    ["receive",
-     nl_indent(Ctxt1),
-     format_clauses(Cs, Ctxt1),
-     nl_indent(Ctxt),
-     "after ",
-     format(T, add_indent(Ctxt, 6)),
-     " ->",
-     nl_indent(Ctxt1),
-     format(A, Ctxt1)
-    ];
-format_1(#c_fname{id=I,arity=A}, _) ->
-    [core_atom(I),$/,integer_to_list(A)];
-format_1(#c_fun{vars=Vs,body=B}, Ctxt) ->
-    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
-    ["fun (",
-     format_hseq(Vs, ",", add_indent(Ctxt, 5), fun format/2),
-     ") ->",
-     nl_indent(Ctxt1)
-     | format(B, Ctxt1)
-    ];
-format_1(#c_apply{op=O,args=As}, Ctxt0) ->
-    Ctxt1 = add_indent(Ctxt0, 6),		%"apply "
-    Op = format(O, Ctxt1),
-    Ctxt2 = add_indent(Ctxt0, 4),
-    ["apply ",Op,
-     nl_indent(Ctxt2),
-     $(,format_hseq(As, ", ", add_indent(Ctxt2, 1), fun format/2),$)
-    ];
-format_1(#c_call{module=M,name=N,args=As}, Ctxt0) ->
-    Ctxt1 = add_indent(Ctxt0, 5),		%"call "
-    Mod = format(M, Ctxt1),
-    Ctxt2 = add_indent(Ctxt1, width(Mod, Ctxt1)+1),
-    Name = format(N, Ctxt2),
-    Ctxt3 = add_indent(Ctxt0, 4),
-    ["call ",Mod,":",Name,
-     nl_indent(Ctxt3),
-     $(,format_hseq(As, ", ", add_indent(Ctxt3, 1), fun format/2),$)
-    ];
-format_1(#c_primop{name=N,args=As}, Ctxt0) ->
-    Ctxt1 = add_indent(Ctxt0, 7),		%"primop "
-    Name = format(N, Ctxt1),
-    Ctxt2 = add_indent(Ctxt0, 4),
-    ["primop ",Name,
-     nl_indent(Ctxt2),
-     $(,format_hseq(As, ", ", add_indent(Ctxt2, 1), fun format/2),$)
-    ];
-format_1(#c_catch{body=B}, Ctxt) ->
-    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
-    ["catch",
-     nl_indent(Ctxt1),
-     format(B, Ctxt1)
-    ];
-format_1(#c_try{arg=E,vars=Vs,body=B,evars=Evs,handler=H}, Ctxt) ->
-    Ctxt1 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
-    ["try",
-     nl_indent(Ctxt1),
-     format(E, Ctxt1),
-     nl_indent(Ctxt),
-     "of ",
-     format_values(Vs, add_indent(Ctxt, 3)),
-     " ->",
-     nl_indent(Ctxt1),
-     format(B, Ctxt1),
-     nl_indent(Ctxt),
-     "catch ",
-     format_values(Evs, add_indent(Ctxt, 6)),
-     " ->",
-     nl_indent(Ctxt1)
-     | format(H, Ctxt1)
-    ];
-format_1(#c_def{name=N,val=V}, Ctxt) ->
-    Ctxt1 = add_indent(set_class(Ctxt, expr), Ctxt#ctxt.body_indent),
-    [format(N, Ctxt),
-     " =",
-     nl_indent(Ctxt1)
-     | format(V, Ctxt1)
-    ];
-format_1(#c_module{name=N,exports=Es,attrs=As,defs=Ds}, Ctxt) ->
-    Mod = ["module ", format(N, Ctxt)],
-    [Mod," [",
-     format_vseq(Es,
-		 "", ",",
-		 add_indent(set_class(Ctxt, term), width(Mod, Ctxt)+2),
-		 fun format/2),
-     "]",
-     nl_indent(Ctxt),
-     "    attributes [",
-     format_vseq(As,
-		 "", ",",
-		 add_indent(set_class(Ctxt, def), 16),
-		 fun format/2),
-     "]",
-     nl_indent(Ctxt),
-     format_funcs(Ds, Ctxt),
-     nl_indent(Ctxt)
-     | "end"
-    ];
-format_1(Type, _) ->
-    ["** Unsupported type: ",
-     io_lib:write(Type)
-     | " **"
-    ].
-
-format_funcs(Fs, Ctxt) ->
-    format_vseq(Fs,
-		"", "",
-		set_class(Ctxt, def),
-		fun format/2).
-
-format_values(Vs, Ctxt) ->
-    [$<,
-     format_hseq(Vs, ",", add_indent(Ctxt, 1), fun format/2),
-     $>].
-
-format_bitstr(#c_bitstr{val=V,size=S,unit=U,type=T,flags=Fs}, Ctxt0) ->
-    Vs = [S, U, T, Fs],
-    Ctxt1 = add_indent(Ctxt0, 2),
-    Val = format(V, Ctxt1),
-    Ctxt2 = add_indent(Ctxt1, width(Val, Ctxt1) + 2),
-    ["#<", Val, ">(", format_hseq(Vs,",", Ctxt2, fun format/2), $)].
-
-format_clauses(Cs, Ctxt) ->
-    format_vseq(Cs, "", "", set_class(Ctxt, clause),
-		fun format_clause/2).
-
-format_clause(Node, Ctxt) ->
-    maybe_anno(Node, fun format_clause_1/2, Ctxt).
-
-format_clause_1(#c_clause{pats=Ps,guard=G,body=B}, Ctxt) ->
-    Ptxt = format_values(Ps, Ctxt),
-    Ctxt2 = add_indent(Ctxt, Ctxt#ctxt.body_indent),
-    [Ptxt,
-     " when ",
-     format_guard(G, add_indent(set_class(Ctxt, expr),
-				 width(Ptxt, Ctxt) + 6)),
-     " ->",
-     nl_indent(Ctxt2)
-     | format(B, set_class(Ctxt2, expr))
-    ].
-
-format_guard(Node, Ctxt) ->
-    maybe_anno(Node, fun format_guard_1/2, Ctxt).
-
-format_guard_1(#c_call{module=M,name=N,args=As}, Ctxt0) ->
-    Ctxt1 = add_indent(Ctxt0, 5),		%"call "
-    Mod = format(M, Ctxt1),
-    Ctxt2 = add_indent(Ctxt1, width(Mod, Ctxt1)+1),
-    Name = format(N, Ctxt2),
-    Ctxt3 = add_indent(Ctxt0, 4),
-    ["call ",Mod,":",Name,
-     nl_indent(Ctxt3),
-     $(,format_vseq(As, "",",", add_indent(Ctxt3, 1), fun format_guard/2),$)
-    ];
-format_guard_1(E, Ctxt) -> format_1(E, Ctxt).	%Anno already done
-
-%% format_hseq([Thing], Separator, Context, Fun) -> Txt.
-%%  Format a sequence horizontally on the same line with Separator between.
-
-format_hseq([H], _, Ctxt, Fun) ->
-    Fun(H, Ctxt);
-format_hseq([H|T], Sep, Ctxt, Fun) ->
-    Txt = [Fun(H, Ctxt)|Sep],
-    Ctxt1 = add_indent(Ctxt, width(Txt, Ctxt)),
-    [Txt|format_hseq(T, Sep, Ctxt1, Fun)];
-format_hseq([], _, _, _) -> "".
-
-%% format_vseq([Thing], LinePrefix, LineSuffix, Context, Fun) -> Txt.
-%%  Format a sequence vertically in indented lines adding LinePrefix
-%%  to the beginning of each line and LineSuffix to the end of each
-%%  line.  No prefix on the first line or suffix on the last line.
-
-format_vseq([H], _Pre, _Suf, Ctxt, Fun) ->
-    Fun(H, Ctxt);
-format_vseq([H|T], Pre, Suf, Ctxt, Fun) ->
-    [Fun(H, Ctxt),Suf,nl_indent(Ctxt),Pre|
-     format_vseq(T, Pre, Suf, Ctxt, Fun)];
-format_vseq([], _, _, _, _) -> "".
-
-format_list_tail(#c_nil{anno=[]}, _) -> "]";
-format_list_tail(#c_cons{anno=[],hd=H,tl=T}, Ctxt) ->
-    Txt = [$,|format(H, Ctxt)],
-    Ctxt1 = add_indent(Ctxt, width(Txt, Ctxt)),
-    [Txt|format_list_tail(T, Ctxt1)];
-format_list_tail(Tail, Ctxt) ->
-    ["|",format(Tail, add_indent(Ctxt, 1)),"]"].
-
-indent(Ctxt) -> indent(Ctxt#ctxt.indent, Ctxt).
-
-indent(N, _) when N =< 0 -> "";
-indent(N, Ctxt) ->
-    T = Ctxt#ctxt.tab_width,
-    string:chars($\t, N div T, string:chars($\s, N rem T)).
-
-nl_indent(Ctxt) -> [$\n|indent(Ctxt)].
-
-
-unindent(T, Ctxt) ->
-    unindent(T, Ctxt#ctxt.indent, Ctxt, []).
-
-unindent(T, N, _, C) when N =< 0 ->
-    [T|C];
-unindent([$\s|T], N, Ctxt, C) ->
-    unindent(T, N - 1, Ctxt, C);
-unindent([$\t|T], N, Ctxt, C) ->
-    Tab = Ctxt#ctxt.tab_width,
-    if N >= Tab ->
-	    unindent(T, N - Tab, Ctxt, C);
-       true ->
-	    unindent([string:chars($\s, Tab - N)|T], 0, Ctxt, C)
-    end;
-unindent([L|T], N, Ctxt, C) when list(L) ->
-    unindent(L, N, Ctxt, [T|C]);
-unindent([H|T], _, _, C) ->
-    [H|[T|C]];
-unindent([], N, Ctxt, [H|T]) ->
-    unindent(H, N, Ctxt, T);
-unindent([], _, _, []) -> [].
-
-
-width(Txt, Ctxt) ->
-    case catch width(Txt, 0, Ctxt, []) of
-	{'EXIT',_} -> exit({bad_text,Txt});
-	Other -> Other
-    end.
-
-width([$\t|T], A, Ctxt, C) ->
-    width(T, A + Ctxt#ctxt.tab_width, Ctxt, C);
-width([$\n|T], _, Ctxt, C) ->
-    width(unindent([T|C], Ctxt), Ctxt);
-width([H|T], A, Ctxt, C) when list(H) ->
-    width(H, A, Ctxt, [T|C]);
-width([_|T], A, Ctxt, C) ->
-    width(T, A + 1, Ctxt, C);
-width([], A, Ctxt, [H|T]) ->
-    width(H, A, Ctxt, T);
-width([], A, _, []) -> A.
-
-add_indent(Ctxt, Dx) ->
-    Ctxt#ctxt{indent = Ctxt#ctxt.indent + Dx}.
-
-set_class(Ctxt, Class) ->
-    Ctxt#ctxt{class = Class}.
-
-core_atom(A) -> io_lib:write_string(atom_to_list(A), $').
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_scan.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_scan.erl
deleted file mode 100644
index f53c3c1631..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/core_scan.erl
+++ /dev/null
@@ -1,495 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: core_scan.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
-%% Purpose: Scanner for Core Erlang.
-
-%% For handling ISO 8859-1 (Latin-1) we use the following type
-%% information:
-%%
-%% 000 - 037	NUL - US	control
-%% 040 - 057	SPC - /		punctuation
-%% 060 - 071	0 - 9		digit
-%% 072 - 100	: - @		punctuation
-%% 101 - 132	A - Z		uppercase
-%% 133 - 140	[ - `		punctuation
-%% 141 - 172	a - z		lowercase
-%% 173 - 176	{ - ~		punctuation
-%% 177		DEL		control
-%% 200 - 237			control
-%% 240 - 277	NBSP - �	punctuation
-%% 300 - 326	� - �		uppercase
-%% 327		�		punctuation
-%% 330 - 336	� - �		uppercase
-%% 337 - 366	� - �		lowercase
-%% 367		�		punctuation
-%% 370 - 377	� - �		lowercase
-%%
-%% Many punctuation characters region have special meaning.  Must
-%% watch using � \327, bvery close to x \170
-
--module(core_scan).
-
--export([string/1,string/2,tokens/3,format_error/1]).
-
--import(lists, [reverse/1]).
-
-%% tokens(Continuation, CharList, StartPos) ->
-%%	{done, {ok, [Tok], EndPos}, Rest} |
-%%	{done, {error,{ErrorPos,core_scan,What}, EndPos}, Rest} |
-%%	{more, Continuation'}
-%%  This is the main function into the re-entrant scanner. It calls the
-%%  re-entrant pre-scanner until this says done, then calls scan/1 on
-%%  the result.
-%%
-%%  The continuation has the form:
-%%      {RestChars,CharsSoFar,CurrentPos,StartPos}
-
-tokens([], Chars, Pos) ->			%First call
-    tokens({[],[],Pos,Pos}, Chars, Pos);
-tokens({Chars,SoFar0,Cp,Sp}, MoreChars, _) ->
-    In = Chars ++ MoreChars,
-    case pre_scan(In, SoFar0, Cp) of
-	{done,_,[],Ep} ->			%Found nothing
-	    {done,{eof,Ep},[]};
-	{done,_,SoFar1,Ep} ->			%Got complete tokens
-	    Res = case scan(reverse(SoFar1), Sp) of
-		      {ok,Toks} -> {ok,Toks,Ep};
-		      {error,E} -> {error,E,Ep}
-		  end,
-	    {done,Res,[]};
-	{more,Rest,SoFar1,Cp1} ->		%Missing end token
-	    {more,{Rest,SoFar1,Cp1,Sp}};
-	Other ->				%An error has occurred
-	    {done,Other,[]}
-    end.
-
-%% string([Char]) ->
-%% string([Char], StartPos) ->
-%%    {ok, [Tok], EndPos} |
-%%    {error,{Pos,core_scan,What}, EndPos}
-
-string(Cs) -> string(Cs, 1).
-
-string(Cs, Sp) ->
-    %% Add an 'eof' to always get correct handling.
-    case string_pre_scan(Cs, [], Sp) of
-	{done,_,SoFar,Ep} ->			%Got tokens
-	    case scan(reverse(SoFar), Sp) of
-		{ok,Toks} -> {ok,Toks,Ep};
-		{error,E} -> {error,E,Ep}
-	    end;
-	Other -> Other				%An error has occurred
-    end.
-
-%% string_pre_scan(Cs, SoFar0, StartPos) ->
-%%      {done,Rest,SoFar,EndPos} | {error,E,EndPos}.
-
-string_pre_scan(Cs, SoFar0, Sp) ->
-    case pre_scan(Cs, SoFar0, Sp) of
-	{done,Rest,SoFar1,Ep} ->		%Got complete tokens
-	    {done,Rest,SoFar1,Ep};
-	{more,Rest,SoFar1,Ep} ->		%Missing end token
-	    string_pre_scan(Rest ++ eof, SoFar1, Ep);
-	Other -> Other				%An error has occurred
-    end.
-
-%% format_error(Error)
-%%  Return a string describing the error.
-
-format_error({string,Quote,Head}) ->
-    ["unterminated " ++ string_thing(Quote) ++
-     " starting with " ++ io_lib:write_string(Head,Quote)];
-format_error({illegal,Type}) -> io_lib:fwrite("illegal ~w", [Type]);
-format_error(char) -> "unterminated character";
-format_error(scan) -> "premature end";
-format_error({base,Base}) -> io_lib:fwrite("illegal base '~w'", [Base]);
-format_error(float) -> "bad float";
-format_error(Other) -> io_lib:write(Other).
-
-string_thing($') -> "atom";
-string_thing($") -> "string".
-
-%% Re-entrant pre-scanner.
-%%
-%% If the input list of characters is insufficient to build a term the
-%% scanner returns a request for more characters and a continuation to be
-%% used when trying to build a term with more characters. To indicate
-%% end-of-file the input character list should be replaced with 'eof'
-%% as an empty list has meaning.
-%%
-%% When more characters are need inside a comment, string or quoted
-%% atom, which can become rather long, instead of pushing the
-%% characters read so far back onto RestChars to be reread, a special
-%% reentry token is returned indicating the middle of a construct.
-%% The token is the start character as an atom, '%', '"' and '\''.
-
-%% pre_scan([Char], SoFar, StartPos) ->
-%%	{done,RestChars,ScannedChars,NewPos} |
-%%	{more,RestChars,ScannedChars,NewPos} |
-%%	{error,{ErrorPos,core_scan,Description},NewPos}.
-%%  Main pre-scan function. It has been split into 2 functions because of
-%%  efficiency, with a good indexing compiler it would be unnecessary.
-
-pre_scan([C|Cs], SoFar, Pos) ->
-    pre_scan(C, Cs, SoFar, Pos);
-pre_scan([], SoFar, Pos) ->
-    {more,[],SoFar,Pos};
-pre_scan(eof, SoFar, Pos) ->
-    {done,eof,SoFar,Pos}.
-
-%% pre_scan(Char, [Char], SoFar, Pos)
-
-pre_scan($$, Cs0, SoFar0, Pos) ->
-    case pre_char(Cs0, [$$|SoFar0]) of
-	{Cs,SoFar} ->
-	    pre_scan(Cs, SoFar, Pos);
-	more ->
-	    {more,[$$|Cs0],SoFar0, Pos};
-	error ->
-	    pre_error(char, Pos, Pos)
-    end;
-pre_scan($', Cs, SoFar, Pos) ->
-    pre_string(Cs, $', '\'', Pos, [$'|SoFar], Pos);
-pre_scan({'\'',Sp}, Cs, SoFar, Pos) ->		%Re-entering quoted atom
-    pre_string(Cs, $', '\'', Sp, SoFar, Pos);
-pre_scan($", Cs, SoFar, Pos) ->
-    pre_string(Cs, $", '"', Pos, [$"|SoFar], Pos);
-pre_scan({'"',Sp}, Cs, SoFar, Pos) ->		%Re-entering string
-    pre_string(Cs, $", '"', Sp, SoFar, Pos);
-pre_scan($%, Cs, SoFar, Pos) ->
-    pre_comment(Cs, SoFar, Pos);
-pre_scan('%', Cs, SoFar, Pos) ->		%Re-entering comment
-    pre_comment(Cs, SoFar, Pos);
-pre_scan($\n, Cs, SoFar, Pos) ->
-    pre_scan(Cs, [$\n|SoFar], Pos+1);
-pre_scan(C, Cs, SoFar, Pos) ->
-    pre_scan(Cs, [C|SoFar], Pos).
-
-%% pre_string([Char], Quote, Reent, StartPos, SoFar, Pos)
-
-pre_string([Q|Cs], Q, _, _, SoFar, Pos) ->
-    pre_scan(Cs, [Q|SoFar], Pos);
-pre_string([$\n|Cs], Q, Reent, Sp, SoFar, Pos) ->
-    pre_string(Cs, Q, Reent, Sp, [$\n|SoFar], Pos+1);
-pre_string([$\\|Cs0], Q, Reent, Sp, SoFar0, Pos) ->
-    case pre_escape(Cs0, SoFar0) of
-	{Cs,SoFar} ->
-	    pre_string(Cs, Q, Reent, Sp, SoFar, Pos);
-	more ->
-	    {more,[{Reent,Sp},$\\|Cs0],SoFar0,Pos};
-	error ->
-	    pre_string_error(Q, Sp, SoFar0, Pos)
-    end;
-pre_string([C|Cs], Q, Reent, Sp, SoFar, Pos) ->
-    pre_string(Cs, Q, Reent, Sp, [C|SoFar], Pos);
-pre_string([], _, Reent, Sp, SoFar, Pos) ->
-    {more,[{Reent,Sp}],SoFar,Pos};
-pre_string(eof, Q, _, Sp, SoFar, Pos) ->
-    pre_string_error(Q, Sp, SoFar, Pos).
-
-pre_string_error(Q, Sp, SoFar, Pos) ->
-    S = reverse(string:substr(SoFar, 1, string:chr(SoFar, Q)-1)),
-    pre_error({string,Q,string:substr(S, 1, 16)}, Sp, Pos).
-
-pre_char([C|Cs], SoFar) -> pre_char(C, Cs, SoFar);
-pre_char([], _) -> more;
-pre_char(eof, _) -> error.
-
-pre_char($\\, Cs, SoFar) ->
-    pre_escape(Cs, SoFar);
-pre_char(C, Cs, SoFar) ->
-    {Cs,[C|SoFar]}.
-
-pre_escape([$^|Cs0], SoFar) ->
-    case Cs0 of
-	[C3|Cs] ->
-	    {Cs,[C3,$^,$\\|SoFar]};
-	[] -> more;
-	eof -> error
-    end;
-pre_escape([C|Cs], SoFar) ->
-    {Cs,[C,$\\|SoFar]};
-pre_escape([], _) -> more;
-pre_escape(eof, _) -> error.
-
-%% pre_comment([Char], SoFar, Pos)
-%%  Comments are replaced by one SPACE.
-
-pre_comment([$\n|Cs], SoFar, Pos) ->
-    pre_scan(Cs, [$\n,$\s|SoFar], Pos+1);	%Terminate comment
-pre_comment([_|Cs], SoFar, Pos) ->
-    pre_comment(Cs, SoFar, Pos);
-pre_comment([], SoFar, Pos) ->
-    {more,['%'],SoFar,Pos};
-pre_comment(eof, Sofar, Pos) ->
-    pre_scan(eof, [$\s|Sofar], Pos).
-
-pre_error(E, Epos, Pos) ->
-    {error,{Epos,core_scan,E}, Pos}.
-
-%% scan(CharList, StartPos)
-%%  This takes a list of characters and tries to tokenise them.
-%%
-%%  The token list is built in reverse order (in a stack) to save appending
-%%  and then reversed when all the tokens have been collected. Most tokens
-%%  are built in the same way.
-%%
-%%  Returns:
-%%	{ok,[Tok]}
-%%	{error,{ErrorPos,core_scan,What}}
-
-scan(Cs, Pos) ->
-    scan1(Cs, [], Pos).
-
-%% scan1(Characters, TokenStack, Position)
-%%  Scan a list of characters into tokens.
-
-scan1([$\n|Cs], Toks, Pos) ->            	        %Skip newline
-    scan1(Cs, Toks, Pos+1);
-scan1([C|Cs], Toks, Pos) when C >= $\000, C =< $\s -> 	%Skip control chars
-    scan1(Cs, Toks, Pos);
-scan1([C|Cs], Toks, Pos) when C >= $\200, C =< $\240 ->
-    scan1(Cs, Toks, Pos);
-scan1([C|Cs], Toks, Pos) when C >= $a, C =< $z ->	%Keywords
-    scan_key_word(C, Cs, Toks, Pos);
-scan1([C|Cs], Toks, Pos) when C >= $�, C =< $�, C /= $� ->
-    scan_key_word(C, Cs, Toks, Pos);
-scan1([C|Cs], Toks, Pos) when C >= $A, C =< $Z ->	%Variables
-    scan_variable(C, Cs, Toks, Pos);
-scan1([C|Cs], Toks, Pos) when C >= $�, C =< $�, C /= $� ->
-    scan_variable(C, Cs, Toks, Pos);
-scan1([C|Cs], Toks, Pos) when C >= $0, C =< $9 ->	%Numbers
-    scan_number(C, Cs, Toks, Pos);
-scan1([$-,C|Cs], Toks, Pos) when C >= $0, C =< $9 ->	%Signed numbers
-    scan_signed_number($-, C, Cs, Toks, Pos);
-scan1([$+,C|Cs], Toks, Pos) when C >= $0, C =< $9 ->	%Signed numbers
-    scan_signed_number($+, C, Cs, Toks, Pos);
-scan1([$_|Cs], Toks, Pos) ->				%_ variables
-    scan_variable($_, Cs, Toks, Pos);
-scan1([$$|Cs0], Toks, Pos) ->				%Character constant
-    {C,Cs,Pos1} = scan_char(Cs0, Pos),
-    scan1(Cs, [{char,Pos,C}|Toks], Pos1);
-scan1([$'|Cs0], Toks, Pos) ->				%Atom (always quoted)
-    {S,Cs1,Pos1} = scan_string(Cs0, $', Pos),
-    case catch list_to_atom(S) of
-	A when atom(A) ->
-	    scan1(Cs1, [{atom,Pos,A}|Toks], Pos1);
-	_Error -> scan_error({illegal,atom}, Pos)
-    end;
-scan1([$"|Cs0], Toks, Pos) ->				%String
-    {S,Cs1,Pos1} = scan_string(Cs0, $", Pos),
-    scan1(Cs1, [{string,Pos,S}|Toks], Pos1);
-%% Punctuation characters and operators, first recognise multiples.
-scan1("->" ++ Cs, Toks, Pos) ->
-    scan1(Cs, [{'->',Pos}|Toks], Pos);
-scan1("-|" ++ Cs, Toks, Pos) ->
-    scan1(Cs, [{'-|',Pos}|Toks], Pos);
-scan1([C|Cs], Toks, Pos) ->				%Punctuation character
-    P = list_to_atom([C]),
-    scan1(Cs, [{P,Pos}|Toks], Pos);
-scan1([], Toks0, _) ->
-    Toks = reverse(Toks0),
-    {ok,Toks}.
-
-%% scan_key_word(FirstChar, CharList, Tokens, Pos)
-%% scan_variable(FirstChar, CharList, Tokens, Pos)
-
-scan_key_word(C, Cs0, Toks, Pos) ->
-    {Wcs,Cs} = scan_name(Cs0, []),
-    case catch list_to_atom([C|reverse(Wcs)]) of
-	Name when atom(Name) ->
-	    scan1(Cs, [{Name,Pos}|Toks], Pos);
-	_Error -> scan_error({illegal,atom}, Pos)
-    end.
-
-scan_variable(C, Cs0, Toks, Pos) ->
-    {Wcs,Cs} = scan_name(Cs0, []),
-    case catch list_to_atom([C|reverse(Wcs)]) of
-	Name when atom(Name) ->
-	    scan1(Cs, [{var,Pos,Name}|Toks], Pos);
-	_Error -> scan_error({illegal,var}, Pos)
-    end.
-
-%% scan_name(Cs) -> lists:splitwith(fun (C) -> name_char(C) end, Cs).
-
-scan_name([C|Cs], Ncs) ->
-    case name_char(C) of
-	true -> scan_name(Cs, [C|Ncs]);
-	false -> {Ncs,[C|Cs]}			%Must rebuild here, sigh!
-    end;
-scan_name([], Ncs) ->
-    {Ncs,[]}.
-
-name_char(C) when C >= $a, C =< $z -> true;
-name_char(C) when C >= $�, C =< $�, C /= $� -> true;
-name_char(C) when C >= $A, C =< $Z -> true;
-name_char(C) when C >= $�, C =< $�, C /= $� -> true;
-name_char(C) when C >= $0, C =< $9 -> true;
-name_char($_) -> true;
-name_char($@) -> true;
-name_char(_) -> false.
-
-%% scan_string(CharList, QuoteChar, Pos) -> {StringChars,RestChars,NewPos}.
-
-scan_string(Cs, Q, Pos) ->
-    scan_string(Cs, [], Q, Pos).
-
-scan_string([Q|Cs], Scs, Q, Pos) ->
-    {reverse(Scs),Cs,Pos};
-scan_string([$\n|Cs], Scs, Q, Pos) ->
-    scan_string(Cs, [$\n|Scs], Q, Pos+1);
-scan_string([$\\|Cs0], Scs, Q, Pos) ->
-    {C,Cs,Pos1} = scan_escape(Cs0, Pos),
-    scan_string(Cs, [C|Scs], Q, Pos1);
-scan_string([C|Cs], Scs, Q, Pos) ->
-    scan_string(Cs, [C|Scs], Q, Pos).
-
-%% scan_char(Chars, Pos) -> {Char,RestChars,NewPos}.
-%%  Read a single character from a character constant. The pre-scan
-%%  phase has checked for errors here.
-
-scan_char([$\\|Cs], Pos) ->
-    scan_escape(Cs, Pos);
-scan_char([$\n|Cs], Pos) ->                  %Newline
-    {$\n,Cs,Pos+1};
-scan_char([C|Cs], Pos) ->
-    {C,Cs,Pos}.
-
-scan_escape([O1,O2,O3|Cs], Pos) when            %\<1-3> octal digits
-    O1 >= $0, O1 =< $7, O2 >= $0, O2 =< $7, O3 >= $0, O3 =< $7 ->
-    Val = (O1*8 + O2)*8 + O3 - 73*$0,
-    {Val,Cs,Pos};
-scan_escape([O1,O2|Cs], Pos) when
-    O1 >= $0, O1 =< $7, O2 >= $0, O2 =< $7 ->
-    Val = (O1*8 + O2) - 9*$0,
-    {Val,Cs,Pos};
-scan_escape([O1|Cs], Pos) when
-    O1 >= $0, O1 =< $7 ->
-    {O1 - $0,Cs,Pos};
-scan_escape([$^,C|Cs], Pos) ->			%\^X -> CTL-X
-    Val = C band 31,
-    {Val,Cs,Pos};
-%scan_escape([$\n,C1|Cs],Pos) ->
-%    {C1,Cs,Pos+1};
-%scan_escape([C,C1|Cs],Pos) when C >= $\000, C =< $\s ->
-%    {C1,Cs,Pos};
-scan_escape([$\n|Cs],Pos) ->
-    {$\n,Cs,Pos+1};
-scan_escape([C0|Cs],Pos) ->
-    C = escape_char(C0),
-    {C,Cs,Pos}.
-
-escape_char($n) -> $\n;				%\n = LF
-escape_char($r) -> $\r;				%\r = CR
-escape_char($t) -> $\t;				%\t = TAB
-escape_char($v) -> $\v;				%\v = VT
-escape_char($b) -> $\b;				%\b = BS
-escape_char($f) -> $\f;				%\f = FF
-escape_char($e) -> $\e;				%\e = ESC
-escape_char($s) -> $\s;				%\s = SPC
-escape_char($d) -> $\d;				%\d = DEL
-escape_char(C) -> C.
-
-%% scan_number(Char, CharList, TokenStack, Pos)
-%%  We can handle simple radix notation:
-%%    <digit>#<digits>		- the digits read in that base
-%%    <digits>			- the digits in base 10
-%%    <digits>.<digits>
-%%    <digits>.<digits>E+-<digits>
-%%
-%%  Except for explicitly based integers we build a list of all the
-%%  characters and then use list_to_integer/1 or list_to_float/1 to
-%%  generate the value.
-
-%%  SPos == Start position
-%%  CPos == Current position
-
-scan_number(C, Cs0, Toks, Pos) ->
-    {Ncs,Cs,Pos1} = scan_integer(Cs0, [C], Pos),
-    scan_after_int(Cs, Ncs, Toks, Pos, Pos1).
-
-scan_signed_number(S, C, Cs0, Toks, Pos) ->
-    {Ncs,Cs,Pos1} = scan_integer(Cs0, [C,S], Pos),
-    scan_after_int(Cs, Ncs, Toks, Pos, Pos1).
-
-scan_integer([C|Cs], Stack, Pos) when C >= $0, C =< $9 ->
-    scan_integer(Cs, [C|Stack], Pos);
-scan_integer(Cs, Stack, Pos) ->
-    {Stack,Cs,Pos}.
-
-scan_after_int([$.,C|Cs0], Ncs0, Toks, SPos, CPos) when C >= $0, C =< $9 ->
-    {Ncs,Cs,CPos1} = scan_integer(Cs0, [C,$.|Ncs0], CPos),
-    scan_after_fraction(Cs, Ncs, Toks, SPos, CPos1);	
-scan_after_int([$#|Cs], Ncs, Toks, SPos, CPos) ->
-    case list_to_integer(reverse(Ncs)) of
-	Base when Base >= 2, Base =< 16 ->
-	    scan_based_int(Cs, 0, Base, Toks, SPos, CPos);
-	Base ->
-	    scan_error({base,Base}, CPos)
-    end;
-scan_after_int(Cs, Ncs, Toks, SPos, CPos) ->
-    N = list_to_integer(reverse(Ncs)),
-    scan1(Cs, [{integer,SPos,N}|Toks], CPos).
-
-scan_based_int([C|Cs], SoFar, Base, Toks, SPos, CPos) when
-    C >= $0, C =< $9, C < Base + $0 ->
-    Next = SoFar * Base + (C - $0),
-    scan_based_int(Cs, Next, Base, Toks, SPos, CPos);
-scan_based_int([C|Cs], SoFar, Base, Toks, SPos, CPos) when
-    C >= $a, C =< $f, C < Base + $a - 10 ->
-    Next = SoFar * Base + (C - $a + 10),
-    scan_based_int(Cs, Next, Base, Toks, SPos, CPos);
-scan_based_int([C|Cs], SoFar, Base, Toks, SPos, CPos) when
-    C >= $A, C =< $F, C < Base + $A - 10 ->
-    Next = SoFar * Base + (C - $A + 10),
-    scan_based_int(Cs, Next, Base, Toks, SPos, CPos);
-scan_based_int(Cs, SoFar, _, Toks, SPos, CPos) ->
-    scan1(Cs, [{integer,SPos,SoFar}|Toks], CPos).
-
-scan_after_fraction([$E|Cs], Ncs, Toks, SPos, CPos) ->
-    scan_exponent(Cs, [$E|Ncs], Toks, SPos, CPos);
-scan_after_fraction([$e|Cs], Ncs, Toks, SPos, CPos) ->
-    scan_exponent(Cs, [$E|Ncs], Toks, SPos, CPos);
-scan_after_fraction(Cs, Ncs, Toks, SPos, CPos) ->
-    case catch list_to_float(reverse(Ncs)) of
-	N when float(N) ->
-	    scan1(Cs, [{float,SPos,N}|Toks], CPos);
-	_Error -> scan_error({illegal,float}, SPos)
-    end.
-
-%% scan_exponent(CharList, NumberCharStack, TokenStack, StartPos, CurPos)
-%%  Generate an error here if E{+|-} not followed by any digits.
-
-scan_exponent([$+|Cs], Ncs, Toks, SPos, CPos) ->
-    scan_exponent1(Cs, [$+|Ncs], Toks, SPos, CPos);
-scan_exponent([$-|Cs], Ncs, Toks, SPos, CPos) ->
-    scan_exponent1(Cs, [$-|Ncs], Toks, SPos, CPos);
-scan_exponent(Cs, Ncs, Toks, SPos, CPos) ->
-    scan_exponent1(Cs, Ncs, Toks, SPos, CPos).
-
-scan_exponent1([C|Cs0], Ncs0, Toks, SPos, CPos) when C >= $0, C =< $9 ->
-    {Ncs,Cs,CPos1} = scan_integer(Cs0, [C|Ncs0], CPos),
-    case catch list_to_float(reverse(Ncs)) of
-	N when float(N) ->
-	    scan1(Cs, [{float,SPos,N}|Toks], CPos1);
-	_Error -> scan_error({illegal,float}, SPos)
-    end;
-scan_exponent1(_, _, _, _, CPos) ->
-    scan_error(float, CPos).
-
-scan_error(In, Pos) ->
-    {error,{Pos,core_scan,In}}.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/erl_bifs.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/erl_bifs.erl
deleted file mode 100644
index 088f44f9fd..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/erl_bifs.erl
+++ /dev/null
@@ -1,486 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: erl_bifs.erl,v 1.2 2009/09/17 09:46:19 kostis Exp $
-%%
-%% Purpose: Information about the Erlang built-in functions.
-
--module(erl_bifs).
-
--export([is_bif/3, is_guard_bif/3, is_pure/3, is_safe/3]).
-
-
-%% =====================================================================
-%% is_bif(Module, Name, Arity) -> boolean()
-%%
-%%	    Module = Name = atom()
-%%	    Arity = integer()
-%%
-%%	Returns `true' if the function `Module:Name/Arity' is a Built-In
-%%	Function (BIF) of Erlang. BIFs "come with the implementation",
-%%	and can be assumed to exist and have the same behaviour in any
-%%	later versions of the same implementation of the language. Being
-%%	a BIF does *not* imply that the function belongs to the module
-%%	`erlang', nor that it is implemented in C or assembler (cf.
-%%	`erlang:is_builtin/3'), or that it is auto-imported by the
-%%	compiler (cf. `erl_internal:bif/3').
-
-is_bif(erlang, '!', 2) -> true;
-is_bif(erlang, '*', 2) -> true;
-is_bif(erlang, '+', 1) -> true;
-is_bif(erlang, '+', 2) -> true;
-is_bif(erlang, '++', 2) -> true;
-is_bif(erlang, '-', 1) -> true;
-is_bif(erlang, '-', 2) -> true;
-is_bif(erlang, '--', 2) -> true;
-is_bif(erlang, '/', 2) -> true;
-is_bif(erlang, '/=', 2) -> true;
-is_bif(erlang, '<', 2) -> true;
-is_bif(erlang, '=/=', 2) -> true;
-is_bif(erlang, '=:=', 2) -> true;
-is_bif(erlang, '=<', 2) -> true;
-is_bif(erlang, '==', 2) -> true;
-is_bif(erlang, '>', 2) -> true;
-is_bif(erlang, '>=', 2) -> true;
-is_bif(erlang, 'and', 2) -> true;
-is_bif(erlang, 'band', 2) -> true;
-is_bif(erlang, 'bnot', 1) -> true;
-is_bif(erlang, 'bor', 2) -> true;
-is_bif(erlang, 'bsl', 2) -> true;
-is_bif(erlang, 'bsr', 2) -> true;
-is_bif(erlang, 'bxor', 2) -> true;
-is_bif(erlang, 'div', 2) -> true;
-is_bif(erlang, 'not', 1) -> true;
-is_bif(erlang, 'or', 2) -> true;
-is_bif(erlang, 'rem', 2) -> true;
-is_bif(erlang, 'xor', 2) -> true;
-is_bif(erlang, abs, 1) -> true;
-is_bif(erlang, append_element, 2) -> true;
-is_bif(erlang, apply, 2) -> true;
-is_bif(erlang, apply, 3) -> true;
-is_bif(erlang, atom_to_list, 1) -> true;
-is_bif(erlang, binary_to_list, 1) -> true;
-is_bif(erlang, binary_to_list, 3) -> true;
-is_bif(erlang, binary_to_term, 1) -> true;
-is_bif(erlang, cancel_timer, 1) -> true;
-is_bif(erlang, concat_binary, 1) -> true;
-is_bif(erlang, date, 0) -> true;
-is_bif(erlang, demonitor, 1) -> true;
-is_bif(erlang, disconnect_node, 1) -> true;
-is_bif(erlang, display, 1) -> true;
-is_bif(erlang, element, 2) -> true;
-is_bif(erlang, erase, 0) -> true;
-is_bif(erlang, erase, 1) -> true;
-is_bif(erlang, error, 1) -> true;
-is_bif(erlang, error, 2) -> true;
-is_bif(erlang, exit, 1) -> true;
-is_bif(erlang, exit, 2) -> true;
-is_bif(erlang, fault, 1) -> true;
-is_bif(erlang, fault, 2) -> true;
-is_bif(erlang, float, 1) -> true;
-is_bif(erlang, float_to_list, 1) -> true;
-is_bif(erlang, fun_info, 1) -> true;
-is_bif(erlang, fun_info, 2) -> true;
-is_bif(erlang, fun_to_list, 1) -> true;
-is_bif(erlang, get, 0) -> true;
-is_bif(erlang, get, 1) -> true;
-is_bif(erlang, get_cookie, 0) -> true;
-is_bif(erlang, get_keys, 1) -> true;
-is_bif(erlang, group_leader, 0) -> true;
-is_bif(erlang, group_leader, 2) -> true;
-is_bif(erlang, halt, 0) -> false;
-is_bif(erlang, halt, 1) -> false;
-is_bif(erlang, hash, 2) -> false;
-is_bif(erlang, hd, 1) -> true;
-is_bif(erlang, info, 1) -> true;
-is_bif(erlang, integer_to_list, 1) -> true;
-is_bif(erlang, is_alive, 0) -> true;
-is_bif(erlang, is_atom, 1) -> true;
-is_bif(erlang, is_binary, 1) -> true;
-is_bif(erlang, is_boolean, 1) -> true;
-is_bif(erlang, is_builtin, 3) -> true;
-is_bif(erlang, is_constant, 1) -> true;
-is_bif(erlang, is_float, 1) -> true;
-is_bif(erlang, is_function, 1) -> true;
-is_bif(erlang, is_integer, 1) -> true;
-is_bif(erlang, is_list, 1) -> true;
-is_bif(erlang, is_number, 1) -> true;
-is_bif(erlang, is_pid, 1) -> true;
-is_bif(erlang, is_port, 1) -> true;
-is_bif(erlang, is_process_alive, 1) -> true;
-is_bif(erlang, is_record, 3) -> true;
-is_bif(erlang, is_reference, 1) -> true;
-is_bif(erlang, is_tuple, 1) -> true;
-is_bif(erlang, length, 1) -> true;
-is_bif(erlang, link, 1) -> true;
-is_bif(erlang, list_to_atom, 1) -> true;
-is_bif(erlang, list_to_binary, 1) -> true;
-is_bif(erlang, list_to_float, 1) -> true;
-is_bif(erlang, list_to_integer, 1) -> true;
-is_bif(erlang, list_to_pid, 1) -> true;
-is_bif(erlang, list_to_tuple, 1) -> true;
-is_bif(erlang, loaded, 0) -> true;
-is_bif(erlang, localtime, 0) -> true;
-is_bif(erlang, localtime_to_universaltime, 1) -> true;
-is_bif(erlang, make_ref, 0) -> true;
-is_bif(erlang, make_tuple, 2) -> true;
-is_bif(erlang, md5, 1) -> true;
-is_bif(erlang, md5_final, 1) -> true;
-is_bif(erlang, md5_init, 0) -> true;
-is_bif(erlang, md5_update, 2) -> true;
-is_bif(erlang, monitor, 2) -> true;
-is_bif(erlang, monitor_node, 2) -> true;
-is_bif(erlang, node, 0) -> true;
-is_bif(erlang, node, 1) -> true;
-is_bif(erlang, nodes, 0) -> true;
-is_bif(erlang, now, 0) -> true;
-is_bif(erlang, open_port, 2) -> true;
-is_bif(erlang, phash, 2) -> true;
-is_bif(erlang, pid_to_list, 1) -> true;
-is_bif(erlang, port_close, 2) -> true;
-is_bif(erlang, port_command, 2) -> true;
-is_bif(erlang, port_connect, 2) -> true;
-is_bif(erlang, port_control, 3) -> true;
-is_bif(erlang, port_info, 2) -> true;
-is_bif(erlang, port_to_list, 1) -> true;
-is_bif(erlang, ports, 0) -> true;
-is_bif(erlang, pre_loaded, 0) -> true;
-is_bif(erlang, process_display, 2) -> true;
-is_bif(erlang, process_flag, 2) -> true;
-is_bif(erlang, process_flag, 3) -> true;
-is_bif(erlang, process_info, 1) -> true;
-is_bif(erlang, process_info, 2) -> true;
-is_bif(erlang, processes, 0) -> true;
-is_bif(erlang, put, 2) -> true;
-is_bif(erlang, read_timer, 1) -> true;
-is_bif(erlang, ref_to_list, 1) -> true;
-is_bif(erlang, register, 2) -> true;
-is_bif(erlang, registered, 0) -> true;
-is_bif(erlang, resume_process, 1) -> true;
-is_bif(erlang, round, 1) -> true;
-is_bif(erlang, self, 0) -> true;
-is_bif(erlang, send_after, 3) -> true;
-is_bif(erlang, set_cookie, 2) -> true;
-is_bif(erlang, setelement, 3) -> true;
-is_bif(erlang, size, 1) -> true;
-is_bif(erlang, spawn, 1) -> true;
-is_bif(erlang, spawn, 2) -> true;
-is_bif(erlang, spawn, 3) -> true;
-is_bif(erlang, spawn, 4) -> true;
-is_bif(erlang, spawn_link, 1) -> true;
-is_bif(erlang, spawn_link, 2) -> true;
-is_bif(erlang, spawn_link, 3) -> true;
-is_bif(erlang, spawn_link, 4) -> true;
-is_bif(erlang, spawn_opt, 4) -> true;
-is_bif(erlang, split_binary, 2) -> true;
-is_bif(erlang, start_timer, 3) -> true;
-is_bif(erlang, statistics, 1) -> true;
-is_bif(erlang, suspend_process, 1) -> true;
-is_bif(erlang, system_flag, 2) -> true;
-is_bif(erlang, system_info, 1) -> true;
-is_bif(erlang, term_to_binary, 1) -> true;
-is_bif(erlang, term_to_binary, 2) -> true;
-is_bif(erlang, throw, 1) -> true;
-is_bif(erlang, time, 0) -> true;
-is_bif(erlang, tl, 1) -> true;
-is_bif(erlang, trace, 3) -> true;
-is_bif(erlang, trace_info, 2) -> true;
-is_bif(erlang, trace_pattern, 2) -> true;
-is_bif(erlang, trace_pattern, 3) -> true;
-is_bif(erlang, trunc, 1) -> true;
-is_bif(erlang, tuple_to_list, 1) -> true;
-is_bif(erlang, universaltime, 0) -> true;
-is_bif(erlang, universaltime_to_localtime, 1) -> true;
-is_bif(erlang, unlink, 1) -> true;
-is_bif(erlang, unregister, 1) -> true;
-is_bif(erlang, whereis, 1) -> true;
-is_bif(erlang, yield, 0) -> true;
-is_bif(lists, append, 2) -> true;
-is_bif(lists, reverse, 1) -> true;
-is_bif(lists, reverse, 2) -> true;
-is_bif(lists, subtract, 2) -> true;
-is_bif(math, acos, 1) -> true;
-is_bif(math, acosh, 1) -> true;
-is_bif(math, asin, 1) -> true;
-is_bif(math, asinh, 1) -> true;
-is_bif(math, atan, 1) -> true;
-is_bif(math, atan2, 2) -> true;
-is_bif(math, atanh, 1) -> true;
-is_bif(math, cos, 1) -> true;
-is_bif(math, cosh, 1) -> true;
-is_bif(math, erf, 1) -> true;
-is_bif(math, erfc, 1) -> true;
-is_bif(math, exp, 1) -> true;
-is_bif(math, log, 1) -> true;
-is_bif(math, log10, 1) -> true;
-is_bif(math, pow, 2) -> true;
-is_bif(math, sin, 1) -> true;
-is_bif(math, sinh, 1) -> true;
-is_bif(math, sqrt, 1) -> true;
-is_bif(math, tan, 1) -> true;
-is_bif(math, tanh, 1) -> true;
-is_bif(_, _, _) -> false.
-
-
-%% =====================================================================
-%% is_guard_bif(Module, Name, Arity) -> boolean()
-%%
-%%	    Module = Name = atom()
-%%	    Arity = integer()
-%%
-%%	Returns `true' if the built-in function `Module:Name/Arity' may
-%%	be called from a clause guard. Note that such "guard BIFs" are
-%%	not necessarily "pure", since some (notably `erlang:self/0') may
-%%	depend on the current state, nor "safe", since many guard BIFs
-%%	can fail. Also note that even a "pure" function could be
-%%	unsuitable for calling from a guard because of its time or space
-%%	complexity.
-
-is_guard_bif(erlang, '*', 2) -> true;
-is_guard_bif(erlang, '+', 1) -> true;
-is_guard_bif(erlang, '+', 2) -> true;
-is_guard_bif(erlang, '-', 1) -> true;
-is_guard_bif(erlang, '-', 2) -> true;
-is_guard_bif(erlang, '/', 2) -> true;
-is_guard_bif(erlang, '/=', 2) -> true;
-is_guard_bif(erlang, '<', 2) -> true;
-is_guard_bif(erlang, '=/=', 2) -> true;
-is_guard_bif(erlang, '=:=', 2) -> true;
-is_guard_bif(erlang, '=<', 2) -> true;
-is_guard_bif(erlang, '==', 2) -> true;
-is_guard_bif(erlang, '>', 2) -> true;
-is_guard_bif(erlang, '>=', 2) -> true;
-is_guard_bif(erlang, 'and', 2) -> true;
-is_guard_bif(erlang, 'band', 2) -> true;
-is_guard_bif(erlang, 'bnot', 1) -> true;
-is_guard_bif(erlang, 'bor', 2) -> true;
-is_guard_bif(erlang, 'bsl', 2) -> true;
-is_guard_bif(erlang, 'bsr', 2) -> true;
-is_guard_bif(erlang, 'bxor', 2) -> true;
-is_guard_bif(erlang, 'div', 2) -> true;
-is_guard_bif(erlang, 'not', 1) -> true;
-is_guard_bif(erlang, 'or', 2) -> true;
-is_guard_bif(erlang, 'rem', 2) -> true;
-is_guard_bif(erlang, 'xor', 2) -> true;
-is_guard_bif(erlang, abs, 1) -> true;
-is_guard_bif(erlang, element, 2) -> true;
-is_guard_bif(erlang, error, 1) -> true;  % unorthodox
-is_guard_bif(erlang, exit, 1) -> true;  % unorthodox
-is_guard_bif(erlang, fault, 1) -> true;  % unorthodox
-is_guard_bif(erlang, float, 1) -> true;  % (the type coercion function)
-is_guard_bif(erlang, hd, 1) -> true;
-is_guard_bif(erlang, is_atom, 1) -> true;
-is_guard_bif(erlang, is_boolean, 1) -> true;
-is_guard_bif(erlang, is_binary, 1) -> true;
-is_guard_bif(erlang, is_constant, 1) -> true;
-is_guard_bif(erlang, is_float, 1) -> true;
-is_guard_bif(erlang, is_function, 1) -> true;
-is_guard_bif(erlang, is_integer, 1) -> true;
-is_guard_bif(erlang, is_list, 1) -> true;
-is_guard_bif(erlang, is_number, 1) -> true;
-is_guard_bif(erlang, is_pid, 1) -> true;
-is_guard_bif(erlang, is_port, 1) -> true;
-is_guard_bif(erlang, is_reference, 1) -> true;
-is_guard_bif(erlang, is_tuple, 1) -> true;
-is_guard_bif(erlang, length, 1) -> true;
-is_guard_bif(erlang, list_to_atom, 1) -> true;  % unorthodox
-is_guard_bif(erlang, node, 0) -> true;  % (not pure)
-is_guard_bif(erlang, node, 1) -> true;  % (not pure)
-is_guard_bif(erlang, round, 1) -> true;
-is_guard_bif(erlang, self, 0) -> true;  % (not pure)
-is_guard_bif(erlang, size, 1) -> true;
-is_guard_bif(erlang, throw, 1) -> true;  % unorthodox
-is_guard_bif(erlang, tl, 1) -> true;
-is_guard_bif(erlang, trunc, 1) -> true;
-is_guard_bif(math, acos, 1) -> true;  % unorthodox
-is_guard_bif(math, acosh, 1) -> true;  % unorthodox
-is_guard_bif(math, asin, 1) -> true;  % unorthodox
-is_guard_bif(math, asinh, 1) -> true;  % unorthodox
-is_guard_bif(math, atan, 1) -> true;  % unorthodox
-is_guard_bif(math, atan2, 2) -> true;  % unorthodox
-is_guard_bif(math, atanh, 1) -> true;  % unorthodox
-is_guard_bif(math, cos, 1) -> true;  % unorthodox
-is_guard_bif(math, cosh, 1) -> true;  % unorthodox
-is_guard_bif(math, erf, 1) -> true;  % unorthodox
-is_guard_bif(math, erfc, 1) -> true;  % unorthodox
-is_guard_bif(math, exp, 1) -> true;  % unorthodox
-is_guard_bif(math, log, 1) -> true;  % unorthodox
-is_guard_bif(math, log10, 1) -> true;  % unorthodox
-is_guard_bif(math, pow, 2) -> true;  % unorthodox
-is_guard_bif(math, sin, 1) -> true;  % unorthodox
-is_guard_bif(math, sinh, 1) -> true;  % unorthodox
-is_guard_bif(math, sqrt, 1) -> true;  % unorthodox
-is_guard_bif(math, tan, 1) -> true;  % unorthodox
-is_guard_bif(math, tanh, 1) -> true;  % unorthodox
-is_guard_bif(_, _, _) -> false.
-
-
-%% =====================================================================
-%% is_pure(Module, Name, Arity) -> boolean()
-%%
-%%	    Module = Name = atom()
-%%	    Arity = integer()
-%%
-%%	Returns `true' if the function `Module:Name/Arity' does not
-%%	affect the state, nor depend on the state, although its
-%%	evaluation is not guaranteed to complete normally for all input.
-
-is_pure(erlang, '*', 2) -> true;
-is_pure(erlang, '+', 1) -> true;    % (even for non-numbers)
-is_pure(erlang, '+', 2) -> true;
-is_pure(erlang, '++', 2) -> true;
-is_pure(erlang, '-', 1) -> true;
-is_pure(erlang, '-', 2) -> true;
-is_pure(erlang, '--', 2) -> true;
-is_pure(erlang, '/', 2) -> true;
-is_pure(erlang, '/=', 2) -> true;
-is_pure(erlang, '<', 2) -> true;
-is_pure(erlang, '=/=', 2) -> true;
-is_pure(erlang, '=:=', 2) -> true;
-is_pure(erlang, '=<', 2) -> true;
-is_pure(erlang, '==', 2) -> true;
-is_pure(erlang, '>', 2) -> true;
-is_pure(erlang, '>=', 2) -> true;
-is_pure(erlang, 'and', 2) -> true;
-is_pure(erlang, 'band', 2) -> true;
-is_pure(erlang, 'bnot', 1) -> true;
-is_pure(erlang, 'bor', 2) -> true;
-is_pure(erlang, 'bsl', 2) -> true;
-is_pure(erlang, 'bsr', 2) -> true;
-is_pure(erlang, 'bxor', 2) -> true;
-is_pure(erlang, 'div', 2) -> true;
-is_pure(erlang, 'not', 1) -> true;
-is_pure(erlang, 'or', 2) -> true;
-is_pure(erlang, 'rem', 2) -> true;
-is_pure(erlang, 'xor', 2) -> true;
-is_pure(erlang, abs, 1) -> true;
-is_pure(erlang, atom_to_list, 1) -> true;
-is_pure(erlang, binary_to_list, 1) -> true;
-is_pure(erlang, binary_to_list, 3) -> true;
-is_pure(erlang, concat_binary, 1) -> true;
-is_pure(erlang, element, 2) -> true;
-is_pure(erlang, float, 1) -> true;
-is_pure(erlang, float_to_list, 1) -> true;
-is_pure(erlang, hash, 2) -> false;
-is_pure(erlang, hd, 1) -> true;
-is_pure(erlang, integer_to_list, 1) -> true;
-is_pure(erlang, is_atom, 1) -> true;
-is_pure(erlang, is_boolean, 1) -> true;
-is_pure(erlang, is_binary, 1) -> true;
-is_pure(erlang, is_builtin, 3) -> true;
-is_pure(erlang, is_constant, 1) -> true;
-is_pure(erlang, is_float, 1) -> true;
-is_pure(erlang, is_function, 1) -> true;
-is_pure(erlang, is_integer, 1) -> true;
-is_pure(erlang, is_list, 1) -> true;
-is_pure(erlang, is_number, 1) -> true;
-is_pure(erlang, is_pid, 1) -> true;
-is_pure(erlang, is_port, 1) -> true;
-is_pure(erlang, is_record, 3) -> true;
-is_pure(erlang, is_reference, 1) -> true;
-is_pure(erlang, is_tuple, 1) -> true;
-is_pure(erlang, length, 1) -> true;
-is_pure(erlang, list_to_atom, 1) -> true;
-is_pure(erlang, list_to_binary, 1) -> true;
-is_pure(erlang, list_to_float, 1) -> true;
-is_pure(erlang, list_to_integer, 1) -> true;
-is_pure(erlang, list_to_pid, 1) -> true;
-is_pure(erlang, list_to_tuple, 1) -> true;
-is_pure(erlang, phash, 2) -> false;
-is_pure(erlang, pid_to_list, 1) -> true;
-is_pure(erlang, round, 1) -> true;
-is_pure(erlang, setelement, 3) -> true;
-is_pure(erlang, size, 1) -> true;
-is_pure(erlang, split_binary, 2) -> true;
-is_pure(erlang, term_to_binary, 1) -> true;
-is_pure(erlang, tl, 1) -> true;
-is_pure(erlang, trunc, 1) -> true;
-is_pure(erlang, tuple_to_list, 1) -> true;
-is_pure(lists, append, 2) -> true;
-is_pure(lists, subtract, 2) -> true;
-is_pure(math, acos, 1) -> true;
-is_pure(math, acosh, 1) -> true;
-is_pure(math, asin, 1) -> true;
-is_pure(math, asinh, 1) -> true;
-is_pure(math, atan, 1) -> true;
-is_pure(math, atan2, 2) -> true;
-is_pure(math, atanh, 1) -> true;
-is_pure(math, cos, 1) -> true;
-is_pure(math, cosh, 1) -> true;
-is_pure(math, erf, 1) -> true;
-is_pure(math, erfc, 1) -> true;
-is_pure(math, exp, 1) -> true;
-is_pure(math, log, 1) -> true;
-is_pure(math, log10, 1) -> true;
-is_pure(math, pow, 2) -> true;
-is_pure(math, sin, 1) -> true;
-is_pure(math, sinh, 1) -> true;
-is_pure(math, sqrt, 1) -> true;
-is_pure(math, tan, 1) -> true;
-is_pure(math, tanh, 1) -> true;
-is_pure(_, _, _) -> false.
-
-
-%% =====================================================================
-%% is_safe(Module, Name, Arity) -> boolean()
-%%
-%%	    Module = Name = atom()
-%%	    Arity = integer()
-%%
-%%	Returns `true' if the function `Module:Name/Arity' is completely
-%%	effect free, i.e., if its evaluation always completes normally
-%%	and does not affect the state (although the value it returns
-%%	might depend on the state).
-
-is_safe(erlang, '/=', 2) -> true;
-is_safe(erlang, '<', 2) -> true;
-is_safe(erlang, '=/=', 2) -> true;
-is_safe(erlang, '=:=', 2) -> true;
-is_safe(erlang, '=<', 2) -> true;
-is_safe(erlang, '==', 2) -> true;
-is_safe(erlang, '>', 2) -> true;
-is_safe(erlang, '>=', 2) -> true;
-is_safe(erlang, date, 0) -> true;
-is_safe(erlang, get, 0) -> true;
-is_safe(erlang, get, 1) -> true;
-is_safe(erlang, get_cookie, 0) -> true;
-is_safe(erlang, get_keys, 1) -> true;
-is_safe(erlang, group_leader, 0) -> true;
-is_safe(erlang, is_alive, 0) -> true;
-is_safe(erlang, is_atom, 1) -> true;
-is_safe(erlang, is_boolean, 1) -> true;
-is_safe(erlang, is_binary, 1) -> true;
-is_safe(erlang, is_constant, 1) -> true;
-is_safe(erlang, is_float, 1) -> true;
-is_safe(erlang, is_function, 1) -> true;
-is_safe(erlang, is_integer, 1) -> true;
-is_safe(erlang, is_list, 1) -> true;
-is_safe(erlang, is_number, 1) -> true;
-is_safe(erlang, is_pid, 1) -> true;
-is_safe(erlang, is_port, 1) -> true;
-is_safe(erlang, is_record, 3) -> true;
-is_safe(erlang, is_reference, 1) -> true;
-is_safe(erlang, is_tuple, 1) -> true;
-is_safe(erlang, make_ref, 0) -> true;
-is_safe(erlang, node, 0) -> true;
-is_safe(erlang, nodes, 0) -> true;
-is_safe(erlang, ports, 0) -> true;
-is_safe(erlang, pre_loaded, 0) -> true;
-is_safe(erlang, processes, 0) -> true;
-is_safe(erlang, registered, 0) -> true;
-is_safe(erlang, self, 0) -> true;
-is_safe(erlang, term_to_binary, 1) -> true;
-is_safe(erlang, time, 0) -> true;
-is_safe(_, _, _) -> false.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/rec_env.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/rec_env.erl
deleted file mode 100644
index 0dd31b71ea..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/rec_env.erl
+++ /dev/null
@@ -1,611 +0,0 @@
-%% =====================================================================
-%% This library is free software; you can redistribute it and/or modify
-%% it under the terms of the GNU Lesser General Public License as
-%% published by the Free Software Foundation; either version 2 of the
-%% License, or (at your option) any later version.
-%%
-%% This library is distributed in the hope that it will be useful, but
-%% WITHOUT ANY WARRANTY; without even the implied warranty of
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%% Lesser General Public License for more details.
-%%
-%% You should have received a copy of the GNU Lesser General Public
-%% License along with this library; if not, write to the Free Software
-%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-%% USA
-%%
-%% $Id: rec_env.erl,v 1.2 2009/09/17 09:46:19 kostis Exp $
-%%
-%% @author Richard Carlsson <[email protected]>
-%% @copyright 1999-2004 Richard Carlsson
-%% @doc Abstract environments, supporting self-referential bindings and
-%% automatic new-key generation.
-
-%% The current implementation is based on Erlang standard library
-%% dictionaries.
-
-%%% -define(DEBUG, true).
-
--module(rec_env).
-
--export([bind/3, bind_list/3, bind_recursive/4, delete/2, empty/0,
-	 get/2, is_defined/2, is_empty/1, keys/1, lookup/2, new_key/1,
-	 new_key/2, new_keys/2, new_keys/3, size/1, to_list/1]).
-
--ifdef(DEBUG).
--export([test/1, test_custom/1, test_custom/2]).
--endif.
-
--ifdef(DEBUG).
-%% Code for testing:
-%%@hidden
-test(N) ->
-    test_0(integer, N).
-
-%%@hidden
-test_custom(N) ->
-    F = fun (X) -> list_to_atom("X"++integer_to_list(X)) end,
-    test_custom(F, N).
-
-%%@hidden
-test_custom(F, N) ->
-    test_0({custom, F}, N).
-
-test_0(Type, N) ->
-    put(new_key_calls, 0),
-    put(new_key_retries, 0),
-    put(new_key_max, 0),
-    Env = test_1(Type, N, empty()),
-    io:fwrite("\ncalls: ~w.\n", [get(new_key_calls)]),
-    io:fwrite("\nretries: ~w.\n", [get(new_key_retries)]),
-    io:fwrite("\nmax: ~w.\n", [get(new_key_max)]),
-    dict:to_list(element(1,Env)).
-
-test_1(integer = Type, N, Env) when integer(N), N > 0 ->
-    Key = new_key(Env),
-    test_1(Type, N - 1, bind(Key, value, Env));
-test_1({custom, F} = Type, N, Env) when integer(N), N > 0 ->
-    Key = new_key(F, Env),
-    test_1(Type, N - 1, bind(Key, value, Env));
-test_1(_,0, Env) ->
-    Env.
--endif.
-
-
-%% Representation:
-%%
-%%	environment() = [Mapping]
-%%
-%%      Mapping = {map, Dict} | {rec, Dict, Dict}
-%%	Dict = dict:dictionary()
-%%
-%% An empty environment is a list containing a single `{map, Dict}'
-%% element - empty lists are not valid environments. To find a key in an
-%% environment, it is searched for in each mapping in the list, in
-%% order, until it the key is found in some mapping, or the end of the
-%% list is reached. In a 'rec' mapping, we keep the original dictionary
-%% together with a version where entries may have been deleted - this
-%% makes it possible to garbage collect the entire 'rec' mapping when
-%% all its entries are unused (for example, by being shadowed by later
-%% definitions).
-
-
-
-%% =====================================================================
-%% @type environment(). An abstract environment.
-
-
-%% =====================================================================
-%% @spec empty() -> environment()
-%%
-%% @doc Returns an empty environment.
-
-empty() ->
-    [{map, dict:new()}].
-
-
-%% =====================================================================
-%% @spec is_empty(Env::environment()) -> boolean()
-%%
-%% @doc Returns <code>true</code> if the environment is empty, otherwise
-%% <code>false</code>.
-
-is_empty([{map, Dict} | Es]) ->
-    N = dict:size(Dict),
-    if N /= 0 -> false;
-       Es == [] -> true;
-       true -> is_empty(Es)
-    end;
-is_empty([{rec, Dict, _} | Es]) ->
-    N = dict:size(Dict),
-    if N /= 0 -> false;
-       Es == [] -> true;
-       true -> is_empty(Es)
-    end.
-
-
-%% =====================================================================
-%% @spec size(Env::environment()) -> integer()
-%%
-%% @doc Returns the number of entries in an environment.
-
-%% (The name 'size' cannot be used in local calls, since there exists a
-%% built-in function with the same name.)
-
-size(Env) ->
-    env_size(Env).
-
-env_size([{map, Dict}]) ->
-    dict:size(Dict);
-env_size([{map, Dict} | Env]) ->
-    dict:size(Dict) + env_size(Env);
-env_size([{rec, Dict, _Dict0} | Env]) ->
-    dict:size(Dict) + env_size(Env).
-
-
-%% =====================================================================
-%% @spec is_defined(Key, Env) -> boolean()
-%%
-%%	Key = term()
-%%	Env = environment()
-%%
-%% @doc Returns <code>true</code> if <code>Key</code> is bound in the
-%% environment, otherwise <code>false</code>.
-
-is_defined(Key, [{map, Dict} | Env]) ->
-    case dict:is_key(Key, Dict) of
-	true ->
-	    true;
-	false when Env == [] ->
-	    false;
-	false ->
-	    is_defined(Key, Env)
-    end;
-is_defined(Key, [{rec, Dict, _Dict0} | Env]) ->
-    case dict:is_key(Key, Dict) of
-	true ->
-	    true;
-	false ->
-	    is_defined(Key, Env)
-    end.
-
-
-%% =====================================================================
-%% @spec keys(Env::environment()) -> [term()]
-%%
-%% @doc Returns the ordered list of all keys in the environment.
-
-keys(Env) ->
-    lists:sort(keys(Env, [])).
-
-keys([{map, Dict}], S) ->
-    dict:fetch_keys(Dict) ++ S;
-keys([{map, Dict} | Env], S) ->
-    keys(Env, dict:fetch_keys(Dict) ++ S);
-keys([{rec, Dict, _Dict0} | Env], S) ->
-    keys(Env, dict:fetch_keys(Dict) ++ S).
-
-
-%% =====================================================================
-%% @spec to_list(Env) -> [{Key, Value}]
-%%
-%%	Env = environment()
-%%	Key = term()
-%%	Value = term()
-%%
-%% @doc Returns an ordered list of <code>{Key, Value}</code> pairs for
-%% all keys in <code>Env</code>. <code>Value</code> is the same as that
-%% returned by {@link get/2}.
-
-to_list(Env) ->
-    lists:sort(to_list(Env, [])).
-
-to_list([{map, Dict}], S) ->
-    dict:to_list(Dict) ++ S;
-to_list([{map, Dict} | Env], S) ->
-    to_list(Env, dict:to_list(Dict) ++ S);
-to_list([{rec, Dict, _Dict0} | Env], S) ->
-    to_list(Env, dict:to_list(Dict) ++ S).
-
-
-%% =====================================================================
-%% @spec bind(Key, Value, Env) -> environment()
-%%
-%%	Key = term()
-%%	Value = term()
-%%	Env = environment()
-%%
-%% @doc Make a nonrecursive entry. This binds <code>Key</code> to
-%% <code>Value</code>. If the key already existed in the environment,
-%% the old entry is replaced.
-
-%% Note that deletion is done to free old bindings so they can be
-%% garbage collected.
-
-bind(Key, Value, [{map, Dict}]) ->
-    [{map, dict:store(Key, Value, Dict)}];
-bind(Key, Value, [{map, Dict} | Env]) ->
-    [{map, dict:store(Key, Value, Dict)} | delete_any(Key, Env)];
-bind(Key, Value, Env) ->
-    [{map, dict:store(Key, Value, dict:new())} | delete_any(Key, Env)].
-
-
-%% =====================================================================
-%% @spec bind_list(Keys, Values, Env) -> environment()
-%%
-%%	Keys = [term()]
-%%	Values = [term()]
-%%	Env = environment()
-%%
-%% @doc Make N nonrecursive entries. This binds each key in
-%% <code>Keys</code> to the corresponding value in
-%% <code>Values</code>. If some key already existed in the environment,
-%% the previous entry is replaced. If <code>Keys</code> does not have
-%% the same length as <code>Values</code>, an exception is generated.
-
-bind_list(Ks, Vs, [{map, Dict}]) ->
-    [{map, store_list(Ks, Vs, Dict)}];
-bind_list(Ks, Vs, [{map, Dict} | Env]) ->
-    [{map, store_list(Ks, Vs, Dict)} | delete_list(Ks, Env)];
-bind_list(Ks, Vs, Env) ->
-    [{map, store_list(Ks, Vs, dict:new())} | delete_list(Ks, Env)].
-
-store_list([K | Ks], [V | Vs], Dict) ->
-    store_list(Ks, Vs, dict:store(K, V, Dict));
-store_list([], _, Dict) ->
-    Dict.
-
-delete_list([K | Ks], Env) ->
-    delete_list(Ks, delete_any(K, Env));
-delete_list([], Env) ->
-    Env.
-
-%% By not calling `delete' unless we have to, we avoid unnecessary
-%% rewriting of the data.
-
-delete_any(Key, Env) ->
-    case is_defined(Key, Env) of
-	true ->
-	    delete(Key, Env);
-	false ->
-	    Env
-    end.
-
-%% =====================================================================
-%% @spec delete(Key, Env) -> environment()
-%%
-%%	Key = term()
-%%	Env = environment()
-%%
-%% @doc Delete an entry. This removes <code>Key</code> from the
-%% environment.
-
-delete(Key, [{map, Dict} = E | Env]) ->
-    case dict:is_key(Key, Dict) of
-	true ->
-	    [{map, dict:erase(Key, Dict)} | Env];
-	false ->
-	    delete_1(Key, Env, E)
-    end;
-delete(Key, [{rec, Dict, Dict0} = E | Env]) ->
-    case dict:is_key(Key, Dict) of
-	true ->
-	    %% The Dict0 component must be preserved as it is until all
-	    %% keys in Dict have been deleted.
-	    Dict1 = dict:erase(Key, Dict),
-	    case dict:size(Dict1) of
-		0 ->
-		    Env;    % the whole {rec,...} is now garbage
-		_ ->
-		    [{rec, Dict1, Dict0} | Env]
-	    end;
-	false ->
-	    [E | delete(Key, Env)]
-    end.
-
-%% This is just like above, except we pass on the preceding 'map'
-%% mapping in the list to enable merging when removing 'rec' mappings.
-
-delete_1(Key, [{rec, Dict, Dict0} = E | Env], E1) ->
-    case dict:is_key(Key, Dict) of
-	true ->
-	    Dict1 = dict:erase(Key, Dict),
-	    case dict:size(Dict1) of
-		0 ->
-		    concat(E1, Env);
-		_ ->
-		    [E1, {rec, Dict1, Dict0} | Env]
-	    end;
-	false ->
-	    [E1, E | delete(Key, Env)]
-    end.
-
-concat({map, D1}, [{map, D2} | Env]) ->
-    [dict:merge(fun (_K, V1, _V2) -> V1 end, D1, D2) | Env];
-concat(E1, Env) ->
-    [E1 | Env].
-
-
-%% =====================================================================
-%% @spec bind_recursive(Keys, Values, Fun, Env) -> NewEnv
-%%
-%%	Keys = [term()]
-%%	Values = [term()]
-%%	Fun = (Value, Env) -> term()
-%%	Env = environment()
-%%	NewEnv = environment()
-%%
-%% @doc Make N recursive entries. This binds each key in
-%% <code>Keys</code> to the value of <code>Fun(Value, NewEnv)</code> for
-%% the corresponding <code>Value</code>. If <code>Keys</code> does not
-%% have the same length as <code>Values</code>, an exception is
-%% generated. If some key already existed in the environment, the old
-%% entry is replaced.
-%%
-%% <p>Note: the function <code>Fun</code> is evaluated each time one of
-%% the stored keys is looked up, but only then.</p>
-%%
-%% <p>Examples:
-%%<pre>
-%%    NewEnv = bind_recursive([foo, bar], [1, 2],
-%%	                      fun (V, E) -> V end,
-%%	                      Env)</pre>
-%%
-%% This does nothing interesting; <code>get(foo, NewEnv)</code> yields
-%% <code>1</code> and <code>get(bar, NewEnv)</code> yields
-%% <code>2</code>, but there is more overhead than if the {@link
-%% bind_list/3} function had been used.
-%%
-%% <pre>
-%%    NewEnv = bind_recursive([foo, bar], [1, 2],
-%%                            fun (V, E) -> {V, E} end,
-%%                            Env)</pre>
-%%
-%% Here, however, <code>get(foo, NewEnv)</code> will yield <code>{1,
-%% NewEnv}</code> and <code>get(bar, NewEnv)</code> will yield <code>{2,
-%% NewEnv}</code>, i.e., the environment <code>NewEnv</code> contains
-%% recursive bindings.</p>
-
-bind_recursive([], [], _, Env) ->
-    Env;
-bind_recursive(Ks, Vs, F, Env) ->
-    F1 = fun (V) ->
-		 fun (Dict) -> F(V, [{rec, Dict, Dict} | Env]) end
-	 end,
-    Dict = bind_recursive_1(Ks, Vs, F1, dict:new()),
-    [{rec, Dict, Dict} | Env].
-
-bind_recursive_1([K | Ks], [V | Vs], F, Dict) ->
-    bind_recursive_1(Ks, Vs, F, dict:store(K, F(V), Dict));
-bind_recursive_1([], [], _, Dict) ->
-    Dict.
-
-
-%% =====================================================================
-%% @spec lookup(Key, Env) -> error | {ok, Value}
-%%
-%%	Key = term()
-%%	Env = environment()
-%%	Value = term()
-%%
-%% @doc Returns <code>{ok, Value}</code> if <code>Key</code> is bound to
-%% <code>Value</code> in <code>Env</code>, and <code>error</code>
-%% otherwise.
-
-lookup(Key, [{map, Dict} | Env]) ->
-    case dict:find(Key, Dict) of
-	{ok, _}=Value ->
-	    Value;
-	error when Env == [] ->
-	    error;
-	error ->
-	    lookup(Key, Env)
-    end;
-lookup(Key, [{rec, Dict, Dict0} | Env]) ->
-    case dict:find(Key, Dict) of
-	{ok, F} ->
-	    {ok, F(Dict0)};
-	error ->
-	    lookup(Key, Env)
-    end.
-
-
-%% =====================================================================
-%% @spec get(Key, Env) -> Value
-%%
-%%	Key = term()
-%%	Env = environment()
-%%	Value = term()
-%%
-%% @doc Returns the value that <code>Key</code> is bound to in
-%% <code>Env</code>. Throws <code>{undefined, Key}</code> if the key
-%% does not exist in <code>Env</code>.
-
-get(Key, Env) ->
-    case lookup(Key, Env) of
-	{ok, Value} -> Value;
-	error -> throw({undefined, Key})
-    end.
-
-
-%% =====================================================================
-%% The key-generating algorithm could possibly be further improved. The
-%% important thing to keep in mind is, that when we need a new key, we
-%% are generally in mid-traversal of a syntax tree, and existing names
-%% in the tree may be closely grouped and evenly distributed or even
-%% forming a compact range (often having been generated by a "gensym",
-%% or by this very algorithm itself). This means that if we generate an
-%% identifier whose value is too close to those already seen (i.e.,
-%% which are in the environment), it is very probable that we will
-%% shadow a not-yet-seen identifier further down in the tree, the result
-%% being that we induce another later renaming, and end up renaming most
-%% of the identifiers, completely contrary to our intention. We need to
-%% generate new identifiers in a way that avoids such systematic
-%% collisions.
-%%
-%% One way of getting a new key to try when the previous attempt failed
-%% is of course to e.g. add one to the last tried value. However, in
-%% general it's a bad idea to try adjacent identifiers: the percentage
-%% of retries will typically increase a lot, so you may lose big on the
-%% extra lookups while gaining only a little from the quicker
-%% computation.
-%%
-%% We want an initial range that is large enough for most typical cases.
-%% If we start with, say, a range of 10, we might quickly use up most of
-%% the values in the range 1-10 (or 1-100) for new top-level variables -
-%% but as we start traversing the syntax tree, it is quite likely that
-%% exactly those variables will be encountered again (this depends on
-%% how the names in the tree were created), and will then need to be
-%% renamed. If we instead begin with a larger range, it is less likely
-%% that any top-level names that we introduce will shadow names that we
-%% will find in the tree. Of course we cannot know how large is large
-%% enough: for any initial range, there is some syntax tree that uses
-%% all the values in that range, and thus any top-level names introduced
-%% will shadow names in the tree. The point is to avoid this happening
-%% all the time - a range of about 1000 seems enough for most programs.
-%%
-%% The following values have been shown to work well:
-
--define(MINIMUM_RANGE, 1000).
--define(START_RANGE_FACTOR, 50).
--define(MAX_RETRIES, 2).      % retries before enlarging range
--define(ENLARGE_FACTOR, 10).  % range enlargment factor
-
--ifdef(DEBUG).
-%% If you want to use these process dictionary counters, make sure to
-%% initialise them to zero before you call any of the key-generating
-%% functions.
-%%
-%%	new_key_calls		total number of calls
-%%	new_key_retries		failed key generation attempts
-%%	new_key_max		maximum generated integer value
-%%
--define(measure_calls(),
-	put(new_key_calls, 1 + get(new_key_calls))).
--define(measure_max_key(N),
-	case N > get(new_key_max) of
-	    true ->
-		put(new_key_max, N);
-	    false ->
-		ok
-	end).
--define(measure_retries(N),
-	put(new_key_retries, get(new_key_retries) + N)).
--else.
--define(measure_calls(), ok).
--define(measure_max_key(N), ok).
--define(measure_retries(N), ok).
--endif.
-
-
-%% =====================================================================
-%% @spec new_key(Env::environment()) -> integer()
-%%
-%% @doc Returns an integer which is not already used as key in the
-%% environment. New integers are generated using an algorithm which
-%% tries to keep the values randomly distributed within a reasonably
-%% small range relative to the number of entries in the environment.
-%%
-%% <p>This function uses the Erlang standard library module
-%% <code>random</code> to generate new keys.</p>
-%%
-%% <p>Note that only the new key is returned; the environment itself is
-%% not updated by this function.</p>
-
-new_key(Env) ->
-    new_key(fun (X) -> X end, Env).
-
-
-%% =====================================================================
-%% @spec new_key(Function, Env) -> term()
-%%
-%%	Function = (integer()) -> term()
-%%	Env = environment()
-%%
-%% @doc Returns a term which is not already used as key in the
-%% environment. The term is generated by applying <code>Function</code>
-%% to an integer generated as in {@link new_key/1}.
-%%
-%% <p>Note that only the generated term is returned; the environment
-%% itself is not updated by this function.</p>
-
-new_key(F, Env) ->
-    ?measure_calls(),
-    R = start_range(Env),
-%%%     io:fwrite("Start range: ~w.\n", [R]),
-    new_key(R, F, Env).
-
-new_key(R, F, Env) ->
-    new_key(generate(R, R), R, 0, F, Env).
-
-new_key(N, R, T, F, Env) when T < ?MAX_RETRIES ->
-    A = F(N),
-    case is_defined(A, Env) of
-	true ->
-%%% 	    io:fwrite("CLASH: ~w.\n", [A]),
-	    new_key(generate(N, R), R, T + 1, F, Env);
-	false ->
-	    ?measure_max_key(N),
-	    ?measure_retries(T),
-%%% 	    io:fwrite("New: ~w.\n", [N]),
-	    A
-    end;
-new_key(N, R, _T, F, Env) ->
-    %% Too many retries - enlarge the range and start over.
-    ?measure_retries((_T + 1)),
-    R1 = trunc(R * ?ENLARGE_FACTOR),
-%%%     io:fwrite("**NEW RANGE**: ~w.\n", [R1]),
-    new_key(generate(N, R1), R1, 0, F, Env).
-
-start_range(Env) ->
-    max(env_size(Env) * ?START_RANGE_FACTOR, ?MINIMUM_RANGE).
-
-max(X, Y) when X > Y -> X;
-max(_, Y) -> Y.
-
-%% The previous key might or might not be used to compute the next key
-%% to be tried. It is currently not used.
-%%
-%% In order to avoid causing cascading renamings, it is important that
-%% this function does not generate values in order, but
-%% (pseudo-)randomly distributed over the range.
-
-generate(_N, Range) ->
-    random:uniform(Range).    % works well
-
-
-%% =====================================================================
-%% @spec new_keys(N, Env) -> [integer()]
-%%
-%%	N = integer()
-%%	Env = environment()
-%%
-%% @doc Returns a list of <code>N</code> distinct integers that are not
-%% already used as keys in the environment. See {@link new_key/1} for
-%% details.
-
-new_keys(N, Env) when integer(N) ->
-    new_keys(N, fun (X) -> X end, Env).
-
-    
-%% =====================================================================
-%% @spec new_keys(N, Function, Env) -> [term()]
-%%
-%%	    N = integer()
-%%	    Function = (integer()) -> term()
-%%	    Env = environment()
-%%
-%% @doc Returns a list of <code>N</code> distinct terms that are not
-%% already used as keys in the environment. See {@link new_key/3} for
-%% details.
-
-new_keys(N, F, Env) when integer(N) ->
-    R = start_range(Env),
-    new_keys(N, [], R, F, Env).
-
-new_keys(N, Ks, R, F, Env) when N > 0 ->
-    Key = new_key(R, F, Env),
-    Env1 = bind(Key, true, Env),    % dummy binding
-    new_keys(N - 1, [Key | Ks], R, F, Env1);
-new_keys(0, Ks, _, _, _) ->
-    Ks.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/sys_expand_pmod.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/sys_expand_pmod.erl
deleted file mode 100644
index c5052b0e51..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/sys_expand_pmod.erl
+++ /dev/null
@@ -1,425 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: sys_expand_pmod.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
--module(sys_expand_pmod).
-
-%% Expand function definition forms of parameterized module. We assume
-%% all record definitions, imports, queries, etc., have been expanded
-%% away. Any calls on the form 'foo(...)' must be calls to local
-%% functions. Auto-generated functions (module_info,...) have not yet
-%% been added to the function definitions, but are listed in 'defined'
-%% and 'exports'. The 'new/N' function is neither added to the
-%% definitions nor to the 'exports'/'defines' lists yet.
-
--export([forms/4]).
-
--record(pmod, {parameters, exports, defined, predef}).
-
-%% TODO: more abstract handling of predefined/static functions.
-
-forms(Fs0, Ps, Es0, Ds0) ->
-    PreDef = [{module_info,0},{module_info,1}],
-    forms(Fs0, Ps, Es0, Ds0, PreDef).
-
-forms(Fs0, Ps, Es0, Ds0, PreDef) ->
-    St0 = #pmod{parameters=Ps,exports=Es0,defined=Ds0, predef=PreDef},
-    {Fs1, St1} = forms(Fs0, St0),
-    Es1 = update_function_names(Es0, St1),
-    Ds1 = update_function_names(Ds0, St1),
-    Fs2 = update_forms(Fs1, St1),
-    {Fs2,Es1,Ds1}.
-
-%% This is extremely simplistic for now; all functions get an extra
-%% parameter, whether they need it or not, except for static functions.
-
-update_function_names(Es, St) ->
-    [update_function_name(E, St) || E <- Es].
-
-update_function_name(E={F,A}, St) ->
-    case ordsets:is_element(E, St#pmod.predef) of
-	true -> E;
-	false -> {F, A + 1}
-    end.
-
-update_forms([{function,L,N,A,Cs}|Fs],St) ->
-    [{function,L,N,A+1,Cs}|update_forms(Fs,St)];
-update_forms([F|Fs],St) ->
-    [F|update_forms(Fs,St)];
-update_forms([],_St) ->
-    [].
-
-%% Process the program forms.
-
-forms([F0|Fs0],St0) ->
-    {F1,St1} = form(F0,St0),
-    {Fs1,St2} = forms(Fs0,St1),
-    {[F1|Fs1],St2};
-forms([], St0) ->
-    {[], St0}.
-
-%% Only function definitions are of interest here. State is not updated.
-form({function,Line,Name0,Arity0,Clauses0},St) ->
-    {Name,Arity,Clauses} = function(Name0, Arity0, Clauses0, St),
-    {{function,Line,Name,Arity,Clauses},St};
-%% Pass anything else through
-form(F,St) -> {F,St}.
-
-function(Name, Arity, Clauses0, St) ->
-    Clauses1 = clauses(Clauses0,St),
-    {Name,Arity,Clauses1}.
-
-clauses([C|Cs],St) ->
-    {clause,L,H,G,B} = clause(C,St),
-    T = {tuple,L,[{var,L,V} || V <- ['_'|St#pmod.parameters]]},
-    [{clause,L,H++[{match,L,T,{var,L,'THIS'}}],G,B}|clauses(Cs,St)];
-clauses([],_St) -> [].
-
-clause({clause,Line,H0,G0,B0},St) ->
-    H1 = head(H0,St),
-    G1 = guard(G0,St),
-    B1 = exprs(B0,St),
-    {clause,Line,H1,G1,B1}.
-
-head(Ps,St) -> patterns(Ps,St).
-
-patterns([P0|Ps],St) ->
-    P1 = pattern(P0,St),
-    [P1|patterns(Ps,St)];
-patterns([],_St) -> [].
-
-string_to_conses([], _Line, Tail) ->
-    Tail;
-string_to_conses([E|Rest], Line, Tail) ->
-    {cons, Line, {integer, Line, E}, string_to_conses(Rest, Line, Tail)}.
-
-pattern({var,Line,V},_St) -> {var,Line,V};
-pattern({match,Line,L0,R0},St) ->
-    L1 = pattern(L0,St),
-    R1 = pattern(R0,St),
-    {match,Line,L1,R1};
-pattern({integer,Line,I},_St) -> {integer,Line,I};
-pattern({char,Line,C},_St) -> {char,Line,C};
-pattern({float,Line,F},_St) -> {float,Line,F};
-pattern({atom,Line,A},_St) -> {atom,Line,A};
-pattern({string,Line,S},_St) -> {string,Line,S};
-pattern({nil,Line},_St) -> {nil,Line};
-pattern({cons,Line,H0,T0},St) ->
-    H1 = pattern(H0,St),
-    T1 = pattern(T0,St),
-    {cons,Line,H1,T1};
-pattern({tuple,Line,Ps0},St) ->
-    Ps1 = pattern_list(Ps0,St),
-    {tuple,Line,Ps1};
-pattern({bin,Line,Fs},St) ->
-    Fs2 = pattern_grp(Fs,St),
-    {bin,Line,Fs2};
-pattern({op,_Line,'++',{nil,_},R},St) ->
-    pattern(R,St);
-pattern({op,_Line,'++',{cons,Li,{char,C2,I},T},R},St) ->
-    pattern({cons,Li,{char,C2,I},{op,Li,'++',T,R}},St);
-pattern({op,_Line,'++',{cons,Li,{integer,L2,I},T},R},St) ->
-    pattern({cons,Li,{integer,L2,I},{op,Li,'++',T,R}},St);
-pattern({op,_Line,'++',{string,Li,L},R},St) ->
-    pattern(string_to_conses(L, Li, R),St);
-pattern({op,Line,Op,A},_St) ->
-    {op,Line,Op,A};
-pattern({op,Line,Op,L,R},_St) ->
-    {op,Line,Op,L,R}.
-
-pattern_grp([{bin_element,L1,E1,S1,T1} | Fs],St) ->
-    S2 = case S1 of
-	     default ->
-		 default;
-	     _ ->
-		 expr(S1,St)
-	 end,
-    T2 = case T1 of
-	     default ->
-		 default;
-	     _ ->
-		 bit_types(T1)
-	 end,
-    [{bin_element,L1,expr(E1,St),S2,T2} | pattern_grp(Fs,St)];
-pattern_grp([],_St) ->
-    [].
-
-bit_types([]) ->
-    [];
-bit_types([Atom | Rest]) when atom(Atom) ->
-    [Atom | bit_types(Rest)];
-bit_types([{Atom, Integer} | Rest]) when atom(Atom), integer(Integer) ->
-    [{Atom, Integer} | bit_types(Rest)].
-
-pattern_list([P0|Ps],St) ->
-    P1 = pattern(P0,St),
-    [P1|pattern_list(Ps,St)];
-pattern_list([],_St) -> [].
-
-guard([G0|Gs],St) when list(G0) ->
-    [guard0(G0,St) | guard(Gs,St)];
-guard(L,St) ->
-    guard0(L,St).
-
-guard0([G0|Gs],St) ->
-    G1 = guard_test(G0,St),
-    [G1|guard0(Gs,St)];
-guard0([],_St) -> [].
-
-guard_test(Expr={call,Line,{atom,La,F},As0},St) ->
-    case erl_internal:type_test(F, length(As0)) of
-	true ->
-	    As1 = gexpr_list(As0,St),
-	    {call,Line,{atom,La,F},As1};
-	_ ->
-	    gexpr(Expr,St)
-    end;
-guard_test(Any,St) ->
-    gexpr(Any,St).
-
-gexpr({var,L,V},_St) ->
-    {var,L,V};
-% %% alternative implementation of accessing module parameters
-%     case index(V,St#pmod.parameters) of
-% 	N when N > 0 ->
-% 	    {call,L,{remote,L,{atom,L,erlang},{atom,L,element}},
-% 	     [{integer,L,N+1},{var,L,'THIS'}]};
-% 	_ ->
-% 	    {var,L,V}
-%     end;
-gexpr({integer,Line,I},_St) -> {integer,Line,I};
-gexpr({char,Line,C},_St) -> {char,Line,C};
-gexpr({float,Line,F},_St) -> {float,Line,F};
-gexpr({atom,Line,A},_St) -> {atom,Line,A};
-gexpr({string,Line,S},_St) -> {string,Line,S};
-gexpr({nil,Line},_St) -> {nil,Line};
-gexpr({cons,Line,H0,T0},St) ->
-    H1 = gexpr(H0,St),
-    T1 = gexpr(T0,St),
-    {cons,Line,H1,T1};
-gexpr({tuple,Line,Es0},St) ->
-    Es1 = gexpr_list(Es0,St),
-    {tuple,Line,Es1};
-gexpr({call,Line,{atom,La,F},As0},St) ->
-    case erl_internal:guard_bif(F, length(As0)) of
-	true -> As1 = gexpr_list(As0,St),
-		{call,Line,{atom,La,F},As1}
-    end;
-% Pre-expansion generated calls to erlang:is_record/3 must also be handled
-gexpr({call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,is_record}},As0},St)
-  when length(As0) == 3 ->
-    As1 = gexpr_list(As0,St),
-    {call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,is_record}},As1};
-% Guard bif's can be remote, but only in the module erlang...
-gexpr({call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,F}},As0},St) ->
-    case erl_internal:guard_bif(F, length(As0)) or
-	 erl_internal:arith_op(F, length(As0)) or 
-	 erl_internal:comp_op(F, length(As0)) or
-	 erl_internal:bool_op(F, length(As0)) of
-	true -> As1 = gexpr_list(As0,St),
-		{call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,F}},As1}
-    end;
-% Unfortunately, writing calls as {M,F}(...) is also allowed.
-gexpr({call,Line,{tuple,La,[{atom,Lb,erlang},{atom,Lc,F}]},As0},St) ->
-    case erl_internal:guard_bif(F, length(As0)) or
-	 erl_internal:arith_op(F, length(As0)) or 
-	 erl_internal:comp_op(F, length(As0)) or
-	 erl_internal:bool_op(F, length(As0)) of
-	true -> As1 = gexpr_list(As0,St),
-		{call,Line,{tuple,La,[{atom,Lb,erlang},{atom,Lc,F}]},As1}
-    end;
-gexpr({bin,Line,Fs},St) ->
-    Fs2 = pattern_grp(Fs,St),
-    {bin,Line,Fs2};
-gexpr({op,Line,Op,A0},St) ->
-    case erl_internal:arith_op(Op, 1) or 
-	 erl_internal:bool_op(Op, 1) of
-	true -> A1 = gexpr(A0,St),
-		{op,Line,Op,A1}
-    end;
-gexpr({op,Line,Op,L0,R0},St) ->
-    case erl_internal:arith_op(Op, 2) or
-	  erl_internal:bool_op(Op, 2) or 
-	  erl_internal:comp_op(Op, 2) of
-	true ->
-	    L1 = gexpr(L0,St),
-	    R1 = gexpr(R0,St),
-	    {op,Line,Op,L1,R1}
-    end.
-
-gexpr_list([E0|Es],St) ->
-    E1 = gexpr(E0,St),
-    [E1|gexpr_list(Es,St)];
-gexpr_list([],_St) -> [].
-
-exprs([E0|Es],St) ->
-    E1 = expr(E0,St),
-    [E1|exprs(Es,St)];
-exprs([],_St) -> [].
-
-expr({var,L,V},_St) ->
-    {var,L,V};
-%     case index(V,St#pmod.parameters) of
-% 	N when N > 0 ->
-% 	    {call,L,{remote,L,{atom,L,erlang},{atom,L,element}},
-% 	     [{integer,L,N+1},{var,L,'THIS'}]};
-% 	_ ->
-% 	    {var,L,V}
-%     end;
-expr({integer,Line,I},_St) -> {integer,Line,I};
-expr({float,Line,F},_St) -> {float,Line,F};
-expr({atom,Line,A},_St) -> {atom,Line,A};
-expr({string,Line,S},_St) -> {string,Line,S};
-expr({char,Line,C},_St) -> {char,Line,C};
-expr({nil,Line},_St) -> {nil,Line};
-expr({cons,Line,H0,T0},St) ->
-    H1 = expr(H0,St),
-    T1 = expr(T0,St),
-    {cons,Line,H1,T1};
-expr({lc,Line,E0,Qs0},St) ->
-    Qs1 = lc_quals(Qs0,St),
-    E1 = expr(E0,St),
-    {lc,Line,E1,Qs1};
-expr({tuple,Line,Es0},St) ->
-    Es1 = expr_list(Es0,St),
-    {tuple,Line,Es1};
-expr({block,Line,Es0},St) ->
-    Es1 = exprs(Es0,St),
-    {block,Line,Es1};
-expr({'if',Line,Cs0},St) ->
-    Cs1 = icr_clauses(Cs0,St),
-    {'if',Line,Cs1};
-expr({'case',Line,E0,Cs0},St) ->
-    E1 = expr(E0,St),
-    Cs1 = icr_clauses(Cs0,St),
-    {'case',Line,E1,Cs1};
-expr({'receive',Line,Cs0},St) ->
-    Cs1 = icr_clauses(Cs0,St),
-    {'receive',Line,Cs1};
-expr({'receive',Line,Cs0,To0,ToEs0},St) ->
-    To1 = expr(To0,St),
-    ToEs1 = exprs(ToEs0,St),
-    Cs1 = icr_clauses(Cs0,St),
-    {'receive',Line,Cs1,To1,ToEs1};
-expr({'try',Line,Es0,Scs0,Ccs0,As0},St) ->
-    Es1 = exprs(Es0,St),
-    Scs1 = icr_clauses(Scs0,St),
-    Ccs1 = icr_clauses(Ccs0,St),
-    As1 = exprs(As0,St),
-    {'try',Line,Es1,Scs1,Ccs1,As1};
-expr({'fun',Line,Body,Info},St) ->
-    case Body of
-	{clauses,Cs0} ->
-	    Cs1 = fun_clauses(Cs0,St),
-	    {'fun',Line,{clauses,Cs1},Info};
-	{function,F,A} ->
-	    {F1,A1} = update_function_name({F,A},St),
-	    if A1 == A ->
-		    {'fun',Line,{function,F,A},Info};
-	       true ->
-		    %% Must rewrite local fun-name to a fun that does a
-		    %% call with the extra THIS parameter.
-		    As = make_vars(A, Line),
-		    As1 = As ++ [{var,Line,'THIS'}],
-		    Call = {call,Line,{atom,Line,F1},As1},
-		    Cs = [{clause,Line,As,[],[Call]}],
-		    {'fun',Line,{clauses,Cs},Info}
-	    end;
-	{function,M,F,A} ->			%This is an error in lint!
-	    {'fun',Line,{function,M,F,A},Info}
-    end;
-expr({call,Lc,{atom,_,new}=Name,As0},#pmod{parameters=Ps}=St)
-  when length(As0) =:= length(Ps) ->
-    %% The new() function does not take a 'THIS' argument (it's static).
-    As1 = expr_list(As0,St),
-    {call,Lc,Name,As1};
-expr({call,Lc,{atom,_,module_info}=Name,As0},St)
-  when length(As0) == 0; length(As0) == 1 ->
-    %% The module_info/0 and module_info/1 functions are also static.
-    As1 = expr_list(As0,St),
-    {call,Lc,Name,As1};
-expr({call,Lc,{atom,Lf,F},As0},St) ->
-    %% Local function call - needs THIS parameter.
-    As1 = expr_list(As0,St),
-    {call,Lc,{atom,Lf,F},As1 ++ [{var,0,'THIS'}]};
-expr({call,Line,F0,As0},St) ->
-    %% Other function call
-    F1 = expr(F0,St),
-    As1 = expr_list(As0,St),
-    {call,Line,F1,As1};
-expr({'catch',Line,E0},St) ->
-    E1 = expr(E0,St),
-    {'catch',Line,E1};
-expr({match,Line,P0,E0},St) ->
-    E1 = expr(E0,St),
-    P1 = pattern(P0,St),
-    {match,Line,P1,E1};
-expr({bin,Line,Fs},St) ->
-    Fs2 = pattern_grp(Fs,St),
-    {bin,Line,Fs2};
-expr({op,Line,Op,A0},St) ->
-    A1 = expr(A0,St),
-    {op,Line,Op,A1};
-expr({op,Line,Op,L0,R0},St) ->
-    L1 = expr(L0,St),
-    R1 = expr(R0,St),
-    {op,Line,Op,L1,R1};
-%% The following are not allowed to occur anywhere!
-expr({remote,Line,M0,F0},St) ->
-    M1 = expr(M0,St),
-    F1 = expr(F0,St),
-    {remote,Line,M1,F1}.
-
-expr_list([E0|Es],St) ->
-    E1 = expr(E0,St),
-    [E1|expr_list(Es,St)];
-expr_list([],_St) -> [].
-
-icr_clauses([C0|Cs],St) ->
-    C1 = clause(C0,St),
-    [C1|icr_clauses(Cs,St)];
-icr_clauses([],_St) -> [].
-
-lc_quals([{generate,Line,P0,E0}|Qs],St) ->
-    E1 = expr(E0,St),
-    P1 = pattern(P0,St),
-    [{generate,Line,P1,E1}|lc_quals(Qs,St)];
-lc_quals([E0|Qs],St) ->
-    E1 = expr(E0,St),
-    [E1|lc_quals(Qs,St)];
-lc_quals([],_St) -> [].
-
-fun_clauses([C0|Cs],St) ->
-    C1 = clause(C0,St),
-    [C1|fun_clauses(Cs,St)];
-fun_clauses([],_St) -> [].
-
-% %% Return index from 1 upwards, or 0 if not in the list.
-%
-% index(X,Ys) -> index(X,Ys,1).
-%
-% index(X,[X|Ys],A) -> A;
-% index(X,[Y|Ys],A) -> index(X,Ys,A+1);
-% index(X,[],A) -> 0.
-
-make_vars(N, L) ->
-    make_vars(1, N, L).
-
-make_vars(N, M, L) when N =< M ->
-    V = list_to_atom("X"++integer_to_list(N)),
-    [{var,L,V} | make_vars(N + 1, M, L)];
-make_vars(_, _, _) ->
-    [].
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/sys_pre_attributes.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/sys_pre_attributes.erl
deleted file mode 100644
index 6e68611c66..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/sys_pre_attributes.erl
+++ /dev/null
@@ -1,212 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: sys_pre_attributes.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
-%% Purpose : Transform Erlang compiler attributes
-
--module(sys_pre_attributes).
-
--export([parse_transform/2]).
-
--define(OPTION_TAG, attributes).
-
--record(state, {forms,
-		pre_ops = [],
-		post_ops = [],
-		options}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Inserts, deletes and replaces Erlang compiler attributes.
-%% 
-%% Valid options are:
-%% 
-%%    {attribute, insert,  AttrName, NewAttrVal}   
-%%    {attribute, replace, AttrName, NewAttrVal}   % replace first occurrence
-%%    {attribute, delete,  AttrName}
-%%
-%% The transformation is performed in two passes:
-%%
-%% pre_transform
-%% -------------
-%% Searches for attributes in the list of Forms in order to
-%% delete or replace them. 'delete' will delete all occurrences
-%% of attributes with the given name. 'replace' will replace the
-%% first occurrence of the attribute. This pass is will only be
-%% performed if there are replace or delete operations stated
-%% as options.
-%% 
-%% post_transform
-%% -------------
-%% Looks up the module attribute and inserts the new attributes
-%% directly after. This pass will only be performed if there are
-%% any attributes left to be inserted after pre_transform. The left
-%% overs will be those replace operations that not has been performed
-%% due to that the pre_transform pass did not find the attribute plus
-%% all insert operations.
-
-parse_transform(Forms, Options) ->
-    S = #state{forms = Forms, options = Options},
-    S2 = init_transform(S),
-    report_verbose("Pre  options: ~p~n", [S2#state.pre_ops], S2),
-    report_verbose("Post options: ~p~n", [S2#state.post_ops], S2),
-    S3 = pre_transform(S2),
-    S4 = post_transform(S3),
-    S4#state.forms.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Computes the lists of pre_ops and post_ops that are 
-%% used in the real transformation.
-init_transform(S) ->
-    case S#state.options of
-	Options when list(Options) ->
-	    init_transform(Options, S);
-	Option ->
-	    init_transform([Option], S)
-    end.
-
-init_transform([{attribute, insert, Name, Val} | Tail], S) ->
-    Op = {insert, Name, Val},
-    PostOps = [Op | S#state.post_ops],
-    init_transform(Tail, S#state{post_ops = PostOps});
-init_transform([{attribute, replace, Name, Val} | Tail], S) ->
-    Op = {replace, Name, Val},
-    PreOps = [Op | S#state.pre_ops],
-    PostOps = [Op | S#state.post_ops],
-    init_transform(Tail, S#state{pre_ops = PreOps, post_ops = PostOps});
-init_transform([{attribute, delete, Name} | Tail], S) ->
-    Op = {delete, Name},
-    PreOps = [Op | S#state.pre_ops],
-    init_transform(Tail, S#state{pre_ops = PreOps});
-init_transform([], S) ->
-    S;
-init_transform([_ | T], S) ->
-    init_transform(T, S);
-init_transform(BadOpt, S) ->
-    report_error("Illegal option (ignored): ~p~n", [BadOpt], S),
-    S.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Handle delete and perhaps replace
-
-pre_transform(S) when S#state.pre_ops == [] ->
-    S;
-pre_transform(S) ->
-    pre_transform(S#state.forms, [], S).
-
-pre_transform([H | T], Acc, S) ->
-    case H of
-	{attribute, Line, Name, Val} ->
-	    case lists:keysearch(Name, 2, S#state.pre_ops) of
-		false ->
-		    pre_transform(T, [H | Acc], S);
-
-		{value, {replace, Name, NewVal}} ->
-		    report_warning("Replace attribute ~p: ~p -> ~p~n",
-				   [Name, Val, NewVal],
-				   S),
-		    New = {attribute, Line, Name, NewVal},
-		    Pre = lists:keydelete(Name, 2, S#state.pre_ops),
-		    Post = lists:keydelete(Name, 2, S#state.post_ops),
-		    S2 = S#state{pre_ops = Pre, post_ops = Post},
-		    if
-			Pre == [] ->
-			    %% No need to search the rest of the Forms
-			    Forms = lists:reverse(Acc, [New | T]),
-			    S2#state{forms = Forms};
-			true ->
-			    pre_transform(T, [New | Acc], S2)
-		    end;
-
-		{value, {delete, Name}} ->
-		    report_warning("Delete attribute ~p: ~p~n",
-				   [Name, Val],
-				   S),
-		    pre_transform(T, Acc, S)
-	    end;
-	_Any ->
-	    pre_transform(T, [H | Acc], S)
-    end;
-pre_transform([], Acc, S) ->
-    S#state{forms = lists:reverse(Acc)}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Handle insert and perhaps replace
-
-post_transform(S) when S#state.post_ops == [] ->
-    S;
-post_transform(S) ->
-    post_transform(S#state.forms, [], S).
-
-post_transform([H | T], Acc, S) ->
-    case H of
-	{attribute, Line, module, Val} ->
-	    Acc2 = lists:reverse([{attribute, Line, module, Val} | Acc]),
-	    Forms = Acc2 ++ attrs(S#state.post_ops, Line, S) ++ T,
-	    S#state{forms = Forms, post_ops = []};
-	_Any ->
-	    post_transform(T, [H | Acc], S)
-    end;
-post_transform([], Acc, S) ->
-    S#state{forms = lists:reverse(Acc)}.
-
-attrs([{replace, Name, NewVal} | T], Line, S) ->
-    report_verbose("Insert attribute ~p: ~p~n", [Name, NewVal], S),
-    [{attribute, Line, Name, NewVal} | attrs(T, Line, S)];
-attrs([{insert, Name, NewVal} | T], Line, S) ->
-    report_verbose("Insert attribute ~p: ~p~n", [Name, NewVal], S),
-    [{attribute, Line, Name, NewVal} | attrs(T, Line, S)];
-attrs([], _, _) ->
-    [].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Report functions.
-%%
-%% Errors messages are controlled with the 'report_errors' compiler option
-%% Warning messages are controlled with the 'report_warnings' compiler option
-%% Verbose messages are controlled with the 'verbose' compiler option
-
-report_error(Format, Args, S) -> 
-    case is_error(S) of
-	true ->
-	    io:format("~p: * ERROR * " ++ Format, [?MODULE | Args]);
-	false ->
-	    ok
-    end.
-    
-report_warning(Format, Args, S) -> 
-    case is_warning(S) of
-	true ->
-	    io:format("~p: * WARNING * " ++ Format, [?MODULE | Args]);
-	false ->
-	    ok
-    end.
-    
-report_verbose(Format, Args, S) -> 
-    case is_verbose(S) of
-	true ->
-	    io:format("~p: " ++ Format, [?MODULE | Args]);
-	false ->
-	    ok
-    end.
-
-is_error(S) ->
-    lists:member(report_errors, S#state.options) or is_verbose(S).
-
-is_warning(S) ->
-    lists:member(report_warnings, S#state.options) or is_verbose(S).
-
-is_verbose(S) ->
-    lists:member(verbose, S#state.options).
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/sys_pre_expand.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/sys_pre_expand.erl
deleted file mode 100644
index 5e7c1c8bbd..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/sys_pre_expand.erl
+++ /dev/null
@@ -1,1026 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: sys_pre_expand.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
-%% Purpose : Expand some source Erlang constructions. This is part of the
-%%           pre-processing phase.
-
-%% N.B. Although structs (tagged tuples) are not yet allowed in the
-%% language there is code included in pattern/2 and expr/3 (commented out)
-%% that handles them by transforming them to tuples.
-
--module(sys_pre_expand).
-
-%% Main entry point.
--export([module/2]).
-
--import(ordsets, [from_list/1,add_element/2,
-		  union/1,union/2,intersection/1,intersection/2,subtract/2]).
--import(lists,   [member/2,map/2,foldl/3,foldr/3,sort/1,reverse/1,duplicate/2]).
-
--include("../my_include/erl_bits.hrl").
-
--record(expand, {module=[],			%Module name
-		 parameters=undefined,		%Module parameters
-		 package="",			%Module package
-		 exports=[],			%Exports
-		 imports=[],			%Imports
-		 mod_imports,			%Module Imports
-		 compile=[],			%Compile flags
-		 records=dict:new(),		%Record definitions
-		 attributes=[],			%Attributes
-		 defined=[],			%Defined functions
-		 vcount=0,			%Variable counter
-		 func=[],			%Current function
-		 arity=[],			%Arity for current function
-		 fcount=0,			%Local fun count
-		 fun_index=0,			%Global index for funs
-		 bitdefault,
-		 bittypes
-		}).
-
-%% module(Forms, CompileOptions)
-%%	{ModuleName,Exports,TransformedForms}
-%%  Expand the forms in one module. N.B.: the lists of predefined
-%%  exports and imports are really ordsets!
-
-module(Fs, Opts) ->
-    %% Set pre-defined exported functions.
-    PreExp = [{module_info,0},{module_info,1}],
-
-    %% Set pre-defined module imports.
-    PreModImp = [{erlang,erlang},{packages,packages}],
-
-    %% Build initial expand record.
-    St0 = #expand{exports=PreExp,
-		  mod_imports=dict:from_list(PreModImp),
-		  compile=Opts,
-		  defined=PreExp,
-		  bitdefault = erl_bits:system_bitdefault(),
-		  bittypes = erl_bits:system_bittypes()
-		 },
-    %% Expand the functions.
-    {Tfs,St1} = forms(Fs, foldl(fun define_function/2, St0, Fs)),
-    {Efs,St2} = expand_pmod(Tfs, St1),
-    %% Get the correct list of exported functions.
-    Exports = case member(export_all, St2#expand.compile) of
-		  true -> St2#expand.defined;
-		  false -> St2#expand.exports
-	      end,
-    %% Generate all functions from stored info.
-    {Ats,St3} = module_attrs(St2#expand{exports = Exports}),
-    {Mfs,St4} = module_predef_funcs(St3),
-    {St4#expand.module, St4#expand.exports, Ats ++ Efs ++ Mfs,
-     St4#expand.compile}.
-
-expand_pmod(Fs0, St) ->
-    case St#expand.parameters of
-	undefined ->
-	    {Fs0,St};
-	Ps ->
-	    {Fs1,Xs,Ds} = sys_expand_pmod:forms(Fs0, Ps,
-						St#expand.exports,
-						St#expand.defined),
-	    A = length(Ps),
-	    Vs = [{var,0,V} || V <- Ps],
-	    N = {atom,0,St#expand.module},
-	    B = [{tuple,0,[N|Vs]}],
-	    F = {function,0,new,A,[{clause,0,Vs,[],B}]},
-	    As = St#expand.attributes,
-	    {[F|Fs1],St#expand{exports=add_element({new,A}, Xs),
-			       defined=add_element({new,A}, Ds),
-			       attributes = [{abstract, true} | As]}}
-    end.
-
-%% -type define_function(Form, State) -> State.
-%%  Add function to defined if form a function.
-
-define_function({function,_,N,A,_Cs}, St) ->
-    St#expand{defined=add_element({N,A}, St#expand.defined)};
-define_function(_, St) -> St.
-
-module_attrs(St) ->
-    {[{attribute,0,Name,Val} || {Name,Val} <- St#expand.attributes],St}.
-
-module_predef_funcs(St) ->
-    PreDef = [{module_info,0},{module_info,1}],
-    PreExp = PreDef,
-    {[{function,0,module_info,0,
-       [{clause,0,[],[],
-        [{call,0,{remote,0,{atom,0,erlang},{atom,0,get_module_info}},
-          [{atom,0,St#expand.module}]}]}]},
-      {function,0,module_info,1,
-       [{clause,0,[{var,0,'X'}],[],
-        [{call,0,{remote,0,{atom,0,erlang},{atom,0,get_module_info}},
-          [{atom,0,St#expand.module},{var,0,'X'}]}]}]}],
-     St#expand{defined=union(from_list(PreDef), St#expand.defined),
-	       exports=union(from_list(PreExp), St#expand.exports)}}.
-
-%% forms(Forms, State) ->
-%%	{TransformedForms,State'}
-%%  Process the forms. Attributes are lost and just affect the state.
-%%  Ignore uninteresting forms like eof and type.
-
-forms([{attribute,_,Name,Val}|Fs0], St0) ->
-    St1 = attribute(Name, Val, St0),
-    forms(Fs0, St1);
-forms([{function,L,N,A,Cs}|Fs0], St0) ->
-    {Ff,St1} = function(L, N, A, Cs, St0),
-    {Fs,St2} = forms(Fs0, St1),
-    {[Ff|Fs],St2};
-forms([_|Fs], St) -> forms(Fs, St);
-forms([], St) -> {[],St}.
-
-%% -type attribute(Attribute, Value, State) ->
-%%	State.
-%%  Process an attribute, this just affects the state.
-
-attribute(module, {Module, As}, St) ->
-    M = package_to_string(Module),
-    St#expand{module=list_to_atom(M),
-	      package = packages:strip_last(M),
-	      parameters=As};
-attribute(module, Module, St) ->
-    M = package_to_string(Module),
-    St#expand{module=list_to_atom(M),
-	      package = packages:strip_last(M)};
-attribute(export, Es, St) ->
-    St#expand{exports=union(from_list(Es), St#expand.exports)};
-attribute(import, Is, St) ->
-    import(Is, St);
-attribute(compile, C, St) when list(C) ->
-    St#expand{compile=St#expand.compile ++ C};
-attribute(compile, C, St) ->
-    St#expand{compile=St#expand.compile ++ [C]};
-attribute(record, {Name,Defs}, St) ->
-    St#expand{records=dict:store(Name, normalise_fields(Defs),
-				 St#expand.records)};
-attribute(file, _File, St) -> St;		%This is ignored
-attribute(Name, Val, St) when list(Val) ->
-    St#expand{attributes=St#expand.attributes ++ [{Name,Val}]};
-attribute(Name, Val, St) ->
-    St#expand{attributes=St#expand.attributes ++ [{Name,[Val]}]}.
-
-function(L, N, A, Cs0, St0) ->
-    {Cs,St} = clauses(Cs0, St0#expand{func=N,arity=A,fcount=0}),
-    {{function,L,N,A,Cs},St}.
-
-%% -type clauses([Clause], State) ->
-%%	{[TransformedClause],State}.
-%%  Expand function clauses.
-
-clauses([{clause,Line,H0,G0,B0}|Cs0], St0) ->
-    {H,Hvs,_Hus,St1} = head(H0, St0),
-    {G,Gvs,_Gus,St2} = guard(G0, Hvs, St1),
-    {B,_Bvs,_Bus,St3} = exprs(B0, union(Hvs, Gvs), St2),
-    {Cs,St4} = clauses(Cs0, St3),
-    {[{clause,Line,H,G,B}|Cs],St4};
-clauses([], St) -> {[],St}.
-
-%% head(HeadPatterns, State) ->
-%%	{TransformedPatterns,Variables,UsedVariables,State'}
-
-head(As, St) -> pattern_list(As, St).
-
-%% pattern(Pattern, State) ->
-%%	{TransformedPattern,Variables,UsedVariables,State'}
-%% BITS: added used variables for bit patterns with varaible length
-%%
-
-pattern({var,_,'_'}=Var, St) ->			%Ignore anonymous variable.
-    {Var,[],[],St};
-pattern({var,_,V}=Var, St) ->
-    {Var,[V],[],St};
-pattern({char,_,_}=Char, St) ->
-    {Char,[],[],St};
-pattern({integer,_,_}=Int, St) ->
-    {Int,[],[],St};
-pattern({float,_,_}=Float, St) ->
-    {Float,[],[],St};
-pattern({atom,_,_}=Atom, St) ->
-    {Atom,[],[],St};
-pattern({string,_,_}=String, St) ->
-    {String,[],[],St};
-pattern({nil,_}=Nil, St) ->
-    {Nil,[],[],St};
-pattern({cons,Line,H,T}, St0) ->
-    {TH,THvs,Hus,St1} = pattern(H, St0),
-    {TT,TTvs,Tus,St2} = pattern(T, St1),
-    {{cons,Line,TH,TT},union(THvs, TTvs),union(Hus,Tus),St2};
-pattern({tuple,Line,Ps}, St0) ->
-    {TPs,TPsvs,Tus,St1} = pattern_list(Ps, St0),
-    {{tuple,Line,TPs},TPsvs,Tus,St1};
-%%pattern({struct,Line,Tag,Ps}, St0) ->
-%%    {TPs,TPsvs,St1} = pattern_list(Ps, St0),
-%%    {{tuple,Line,[{atom,Line,Tag}|TPs]},TPsvs,St1};
-pattern({record_field,_,_,_}=M, St) ->
-    {expand_package(M, St), [], [], St};  % must be a package name
-pattern({record_index,Line,Name,Field}, St) ->
-    {index_expr(Line, Field, Name, record_fields(Name, St)),[],[],St};
-pattern({record,Line,Name,Pfs}, St0) ->
-    Fs = record_fields(Name, St0),
-    {TMs,TMsvs,Us,St1} = pattern_list(pattern_fields(Fs, Pfs), St0),
-    {{tuple,Line,[{atom,Line,Name}|TMs]},TMsvs,Us,St1};
-pattern({bin,Line,Es0}, St0) ->
-    {Es1,Esvs,Esus,St1} = pattern_bin(Es0, St0),
-    {{bin,Line,Es1},Esvs,Esus,St1};
-pattern({op,_,'++',{nil,_},R}, St) ->
-    pattern(R, St);
-pattern({op,_,'++',{cons,Li,H,T},R}, St) ->
-    pattern({cons,Li,H,{op,Li,'++',T,R}}, St);
-pattern({op,_,'++',{string,Li,L},R}, St) ->
-    pattern(string_to_conses(Li, L, R), St);
-pattern({match,Line,Pat1, Pat2}, St0) ->
-    {TH,Hvt,Hus,St1} = pattern(Pat2, St0),
-    {TT,Tvt,Tus,St2} = pattern(Pat1, St1),
-    {{match,Line,TT,TH}, union(Hvt,Tvt), union(Hus,Tus), St2};
-%% Compile-time pattern expressions, including unary operators.
-pattern({op,Line,Op,A}, St) ->
-    { erl_eval:partial_eval({op,Line,Op,A}), [], [], St};
-pattern({op,Line,Op,L,R}, St) ->
-    { erl_eval:partial_eval({op,Line,Op,L,R}), [], [], St}.
-
-pattern_list([P0|Ps0], St0) ->
-    {P,Pvs,Pus,St1} = pattern(P0, St0),
-    {Ps,Psvs,Psus,St2} = pattern_list(Ps0, St1),
-    {[P|Ps],union(Pvs, Psvs),union(Pus, Psus),St2};
-pattern_list([], St) -> {[],[],[],St}.
-
-%% guard(Guard, VisibleVariables, State) ->
-%%	{TransformedGuard,NewVariables,UsedVariables,State'}
-%%  Transform a list of guard tests. We KNOW that this has been checked
-%%  and what the guards test are. Use expr for transforming the guard
-%%  expressions.
-
-guard([G0|Gs0], Vs, St0) ->
-    {G,Hvs,Hus,St1} = guard_tests(G0, Vs, St0),
-    {Gs,Tvs,Tus,St2} = guard(Gs0, Vs, St1),
-    {[G|Gs],union(Hvs, Tvs),union(Hus, Tus),St2};
-guard([], _, St) -> {[],[],[],St}.
-
-guard_tests([Gt0|Gts0], Vs, St0) ->
-    {Gt1,Gvs,Gus,St1} = guard_test(Gt0, Vs, St0),
-    {Gts1,Gsvs,Gsus,St2} = guard_tests(Gts0, union(Gvs, Vs), St1),
-    {[Gt1|Gts1],union(Gvs, Gsvs),union(Gus, Gsus),St2};
-guard_tests([], _, St) -> {[],[],[],St}.
-
-guard_test({call,Line,{atom,_,record},[A,{atom,_,Name}]}, Vs, St) ->
-    record_test_in_guard(Line, A, Name, Vs, St);
-guard_test({call,Line,{atom,Lt,Tname},As}, Vs, St) ->
-    %% XXX This is ugly. We can remove this workaround if/when
-    %% we'll allow 'andalso' in guards. For now, we must have
-    %% different code in guards and in bodies.
-    Test = {remote,Lt,
-	    {atom,Lt,erlang},
-	    {atom,Lt,normalise_test(Tname, length(As))}},
-    put(sys_pre_expand_in_guard, yes),
-    R = expr({call,Line,Test,As}, Vs, St),
-    erase(sys_pre_expand_in_guard),
-    R;
-guard_test(Test, Vs, St) ->
-    %% XXX See the previous clause.
-    put(sys_pre_expand_in_guard, yes),
-    R = expr(Test, Vs, St),
-    erase(sys_pre_expand_in_guard),
-    R.
-
-%% record_test(Line, Term, Name, Vs, St) -> TransformedExpr
-%%  Generate code for is_record/1.
-
-record_test(Line, Term, Name, Vs, St) ->
-    case get(sys_pre_expand_in_guard) of
-	undefined ->
-	    record_test_in_body(Line, Term, Name, Vs, St);
-	yes ->
-	    record_test_in_guard(Line, Term, Name, Vs, St)
-    end.
-
-record_test_in_guard(Line, Term, Name, Vs, St) ->
-    %% Notes: (1) To keep is_record/3 properly atomic (e.g. when inverted
-    %%            using 'not'), we cannot convert it to an instruction
-    %%            sequence here. It must remain a single call.
-    %%        (2) Later passes assume that the last argument (the size)
-    %%            is a literal.
-    %%        (3) We don't want calls to erlang:is_record/3 (in the source code)
-    %%            confused we the internal instruction. (Reason: (2) above +
-    %%            code bloat.)
-    %%        (4) Xref may be run on the abstract code, so the name in the
-    %%            abstract code must be erlang:is_record/3.
-    %%        (5) To achive both (3) and (4) at the same time, set the name
-    %%            here to erlang:is_record/3, but mark it as compiler-generated.
-    %%            The v3_core pass will change the name to erlang:internal_is_record/3.
-    Fs = record_fields(Name, St),
-    expr({call,-Line,{remote,-Line,{atom,-Line,erlang},{atom,-Line,is_record}},
-	  [Term,{atom,Line,Name},{integer,Line,length(Fs)+1}]},
-	 Vs, St).
-
-record_test_in_body(Line, Expr, Name, Vs, St0) ->
-    %% As Expr may have side effects, we must evaluate it
-    %% first and bind the value to a new variable.
-    %% We must use also handle the case that Expr does not
-    %% evaluate to a tuple properly.
-    Fs = record_fields(Name, St0),
-    {Var,St} = new_var(Line, St0),
-
-    expr({block,Line,
-	  [{match,Line,Var,Expr},
-	   {op,Line,
-	    'andalso',
-	    {call,Line,{atom,Line,is_tuple},[Var]},
-	    {op,Line,'andalso',
-	     {op,Line,'=:=',
-	      {call,Line,{atom,Line,size},[Var]},
-	      {integer,Line,length(Fs)+1}},
-	     {op,Line,'=:=',
-	      {call,Line,{atom,Line,element},[{integer,Line,1},Var]},
-	      {atom,Line,Name}}}}]}, Vs, St).
-
-normalise_test(atom, 1)      -> is_atom;
-normalise_test(binary, 1)    -> is_binary;
-normalise_test(constant, 1)  -> is_constant;
-normalise_test(float, 1)     -> is_float;
-normalise_test(function, 1)  -> is_function;
-normalise_test(integer, 1)   -> is_integer;
-normalise_test(list, 1)      -> is_list;
-normalise_test(number, 1)    -> is_number;
-normalise_test(pid, 1)       -> is_pid; 
-normalise_test(port, 1)      -> is_port; 
-normalise_test(reference, 1) -> is_reference;
-normalise_test(tuple, 1)     -> is_tuple;
-normalise_test(Name, _) -> Name.
-
-%% exprs(Expressions, VisibleVariables, State) ->
-%%	{TransformedExprs,NewVariables,UsedVariables,State'}
-
-exprs([E0|Es0], Vs, St0) ->
-    {E,Evs,Eus,St1} = expr(E0, Vs, St0),
-    {Es,Esvs,Esus,St2} = exprs(Es0, union(Evs, Vs), St1),
-    {[E|Es],union(Evs, Esvs),union(Eus, Esus),St2};
-exprs([], _, St) -> {[],[],[],St}.
-
-%% expr(Expression, VisibleVariables, State) ->
-%%	{TransformedExpression,NewVariables,UsedVariables,State'}
-
-expr({var,_,V}=Var, _Vs, St) ->
-    {Var,[],[V],St};
-expr({char,_,_}=Char, _Vs, St) ->
-    {Char,[],[],St};
-expr({integer,_,_}=Int, _Vs, St) ->
-    {Int,[],[],St};
-expr({float,_,_}=Float, _Vs, St) ->
-    {Float,[],[],St};
-expr({atom,_,_}=Atom, _Vs, St) ->
-    {Atom,[],[],St};
-expr({string,_,_}=String, _Vs, St) ->
-    {String,[],[],St};
-expr({nil,_}=Nil, _Vs, St) ->
-    {Nil,[],[],St};
-expr({cons,Line,H0,T0}, Vs, St0) ->
-    {H,Hvs,Hus,St1} = expr(H0, Vs, St0),
-    {T,Tvs,Tus,St2} = expr(T0, Vs, St1),
-    {{cons,Line,H,T},union(Hvs, Tvs),union(Hus, Tus),St2};
-expr({lc,Line,E0,Qs0}, Vs, St0) ->
-    {E1,Qs1,_,Lvs,Lus,St1} = lc_tq(Line, E0, Qs0, {nil,Line}, Vs, St0),
-    {{lc,Line,E1,Qs1},Lvs,Lus,St1};
-expr({tuple,Line,Es0}, Vs, St0) ->
-    {Es1,Esvs,Esus,St1} = expr_list(Es0, Vs, St0),
-    {{tuple,Line,Es1},Esvs,Esus,St1};
-%%expr({struct,Line,Tag,Es0}, Vs, St0) ->
-%%    {Es1,Esvs,Esus,St1} = expr_list(Es0, Vs, St0),
-%%    {{tuple,Line,[{atom,Line,Tag}|Es1]},Esvs,Esus,St1};
-expr({record_field,_,_,_}=M, _Vs, St) ->
-    {expand_package(M, St), [], [], St};  % must be a package name
-expr({record_index,Line,Name,F}, Vs, St) ->
-    I = index_expr(Line, F, Name, record_fields(Name, St)),
-    expr(I, Vs, St);
-expr({record,Line,Name,Is}, Vs, St) ->
-    expr({tuple,Line,[{atom,Line,Name}|
-		      record_inits(record_fields(Name, St), Is)]},
-	 Vs, St);
-expr({record_field,Line,R,Name,F}, Vs, St) ->
-    I = index_expr(Line, F, Name, record_fields(Name, St)),
-    expr({call,Line,{atom,Line,element},[I,R]}, Vs, St);
-expr({record,_,R,Name,Us}, Vs, St0) ->
-    {Ue,St1} = record_update(R, Name, record_fields(Name, St0), Us, St0),
-    expr(Ue, Vs, St1);
-expr({bin,Line,Es0}, Vs, St0) ->
-    {Es1,Esvs,Esus,St1} = expr_bin(Es0, Vs, St0),
-    {{bin,Line,Es1},Esvs,Esus,St1};
-expr({block,Line,Es0}, Vs, St0) ->
-    {Es,Esvs,Esus,St1} = exprs(Es0, Vs, St0),
-    {{block,Line,Es},Esvs,Esus,St1};
-expr({'if',Line,Cs0}, Vs, St0) ->
-    {Cs,Csvss,Csuss,St1} = icr_clauses(Cs0, Vs, St0),
-    All = new_in_all(Vs, Csvss),
-    {{'if',Line,Cs},All,union(Csuss),St1};
-expr({'case',Line,E0,Cs0}, Vs, St0) ->
-    {E,Evs,Eus,St1} = expr(E0, Vs, St0),
-    {Cs,Csvss,Csuss,St2} = icr_clauses(Cs0, union(Evs, Vs), St1),
-    All = new_in_all(Vs, Csvss),
-    {{'case',Line,E,Cs},union(Evs, All),union([Eus|Csuss]),St2};
-expr({'cond',Line,Cs}, Vs, St0) ->
-    {V,St1} = new_var(Line,St0),
-    expr(cond_clauses(Cs,V), Vs, St1);
-expr({'receive',Line,Cs0}, Vs, St0) ->
-    {Cs,Csvss,Csuss,St1} = icr_clauses(Cs0, Vs, St0),
-    All = new_in_all(Vs, Csvss),
-    {{'receive',Line,Cs},All,union(Csuss),St1};
-expr({'receive',Line,Cs0,To0,ToEs0}, Vs, St0) ->
-    {To,Tovs,Tous,St1} = expr(To0, Vs, St0),
-    {ToEs,ToEsvs,_ToEsus,St2} = exprs(ToEs0, Vs, St1),
-    {Cs,Csvss,Csuss,St3} = icr_clauses(Cs0, Vs, St2),
-    All = new_in_all(Vs, [ToEsvs|Csvss]),
-    {{'receive',Line,Cs,To,ToEs},union(Tovs, All),union([Tous|Csuss]),St3};
-expr({'fun',Line,Body}, Vs, St) ->
-    fun_tq(Line, Body, Vs, St);
-%%% expr({call,_,{atom,La,this_module},[]}, _Vs, St) ->
-%%%     {{atom,La,St#expand.module}, [], [], St};
-%%% expr({call,_,{atom,La,this_package},[]}, _Vs, St) ->
-%%%     {{atom,La,list_to_atom(St#expand.package)}, [], [], St};
-%%% expr({call,_,{atom,La,this_package},[{atom,_,Name}]}, _Vs, St) ->
-%%%     M = packages:concat(St#expand.package,Name),
-%%%     {{atom,La,list_to_atom(M)}, [], [], St};
-%%% expr({call,Line,{atom,La,this_package},[A]}, Vs, St) ->
-%%%     M = {call,Line,{remote,La,{atom,La,packages},{atom,La,concat}},
-%%% 	 [{string,La,St#expand.package}, A]},
-%%%     expr({call,Line,{atom,Line,list_to_atom},[M]}, Vs, St);
-expr({call,Line,{atom,_,is_record},[A,{atom,_,Name}]}, Vs, St) ->
-    record_test(Line, A, Name, Vs, St);
-expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,is_record}},
-      [A,{atom,_,Name}]}, Vs, St) ->
-    record_test(Line, A, Name, Vs, St);
-expr({call,Line,{atom,La,N},As0}, Vs, St0) ->
-    {As,Asvs,Asus,St1} = expr_list(As0, Vs, St0),
-    Ar = length(As),
-    case erl_internal:bif(N, Ar) of
-	true ->
-	    {{call,Line,{remote,La,{atom,La,erlang},{atom,La,N}},As},
-	     Asvs,Asus,St1};
-	false ->
-	    case imported(N, Ar, St1) of
-		{yes,Mod} ->
-		    {{call,Line,{remote,La,{atom,La,Mod},{atom,La,N}},As},
-		     Asvs,Asus,St1};
-		no ->
-		    case {N,Ar} of
-			{record_info,2} ->
-			    record_info_call(Line, As, St1);
-			_ ->
-			    {{call,Line,{atom,La,N},As},Asvs,Asus,St1}
-		    end
-	    end
-    end;
-expr({call,Line,{record_field,_,_,_}=M,As0}, Vs, St0) ->
-    expr({call,Line,expand_package(M, St0),As0}, Vs, St0);
-expr({call,Line,{remote,Lr,M,F},As0}, Vs, St0) ->
-    M1 = expand_package(M, St0),
-    {[M2,F1|As1],Asvs,Asus,St1} = expr_list([M1,F|As0], Vs, St0),
-    {{call,Line,{remote,Lr,M2,F1},As1},Asvs,Asus,St1};
-expr({call,Line,{tuple,_,[{atom,_,_}=M,{atom,_,_}=F]},As}, Vs, St) ->
-    %% Rewrite {Mod,Function}(Args...) to Mod:Function(Args...).
-    expr({call,Line,{remote,Line,M,F},As}, Vs, St);
-expr({call,Line,F,As0}, Vs, St0) ->
-    {[Fun1|As1],Asvs,Asus,St1} = expr_list([F|As0], Vs, St0),
-    {{call,Line,Fun1,As1},Asvs,Asus,St1};
-expr({'try',Line,Es0,Scs0,Ccs0,As0}, Vs, St0) ->
-    {Es1,Esvs,Esus,St1} = exprs(Es0, Vs, St0),
-    Cvs = union(Esvs, Vs),
-    {Scs1,Scsvss,Scsuss,St2} = icr_clauses(Scs0, Cvs, St1),
-    {Ccs1,Ccsvss,Ccsuss,St3} = icr_clauses(Ccs0, Cvs, St2),
-    Csvss = Scsvss ++ Ccsvss,
-    Csuss = Scsuss ++ Ccsuss,
-    All = new_in_all(Vs, Csvss),
-    {As1,Asvs,Asus,St4} = exprs(As0, Cvs, St3),
-    {{'try',Line,Es1,Scs1,Ccs1,As1}, union([Asvs,Esvs,All]),
-     union([Esus,Asus|Csuss]), St4};
-expr({'catch',Line,E0}, Vs, St0) ->
-    %% Catch exports no new variables.
-    {E,_Evs,Eus,St1} = expr(E0, Vs, St0),
-    {{'catch',Line,E},[],Eus,St1};
-expr({match,Line,P0,E0}, Vs, St0) ->
-    {E,Evs,Eus,St1} = expr(E0, Vs, St0),
-    {P,Pvs,Pus,St2} = pattern(P0, St1),
-    {{match,Line,P,E},
-     union(subtract(Pvs, Vs), Evs),
-     union(intersection(Pvs, Vs), union(Eus,Pus)),St2};
-expr({op,L,'andalso',E1,E2}, Vs, St0) ->
-    {V,St1} = new_var(L,St0),
-    E = make_bool_switch(L,E1,V,
-			 make_bool_switch(L,E2,V,{atom,L,true},
-					  {atom,L,false}),
-			 {atom,L,false}),
-    expr(E, Vs, St1);
-expr({op,L,'orelse',E1,E2}, Vs, St0) ->
-    {V,St1} = new_var(L,St0),
-    E = make_bool_switch(L,E1,V,{atom,L,true},
-			 make_bool_switch(L,E2,V,{atom,L,true},
-					  {atom,L,false})),
-    expr(E, Vs, St1);
-expr({op,Line,'++',{lc,Ll,E0,Qs0},M0}, Vs, St0) ->
-    {E1,Qs1,M1,Lvs,Lus,St1} = lc_tq(Ll, E0, Qs0, M0, Vs, St0),
-    {{op,Line,'++',{lc,Ll,E1,Qs1},M1},Lvs,Lus,St1};
-expr({op,_,'++',{string,L1,S1},{string,_,S2}}, _Vs, St) ->
-    {{string,L1,S1 ++ S2},[],[],St};
-expr({op,Ll,'++',{string,L1,S1}=Str,R0}, Vs, St0) ->
-    {R1,Rvs,Rus,St1} = expr(R0, Vs, St0),
-    E = case R1 of
-	    {string,_,S2} -> {string,L1,S1 ++ S2};
-	    _Other when length(S1) < 8 -> string_to_conses(L1, S1, R1);
-	    _Other -> {op,Ll,'++',Str,R1}
-	end,
-    {E,Rvs,Rus,St1};
-expr({op,Ll,'++',{cons,Lc,H,T},L2}, Vs, St) ->
-    expr({cons,Ll,H,{op,Lc,'++',T,L2}}, Vs, St);
-expr({op,_,'++',{nil,_},L2}, Vs, St) ->
-    expr(L2, Vs, St);
-expr({op,Line,Op,A0}, Vs, St0) ->
-    {A,Avs,Aus,St1} = expr(A0, Vs, St0),
-    {{op,Line,Op,A},Avs,Aus,St1};
-expr({op,Line,Op,L0,R0}, Vs, St0) ->
-    {L,Lvs,Lus,St1} = expr(L0, Vs, St0),
-    {R,Rvs,Rus,St2} = expr(R0, Vs, St1),
-    {{op,Line,Op,L,R},union(Lvs, Rvs),union(Lus, Rus),St2}.
-
-expr_list([E0|Es0], Vs, St0) ->
-    {E,Evs,Eus,St1} = expr(E0, Vs, St0),
-    {Es,Esvs,Esus,St2} = expr_list(Es0, Vs, St1),
-    {[E|Es],union(Evs, Esvs),union(Eus, Esus),St2};
-expr_list([], _, St) ->
-    {[],[],[],St}.
-
-%% icr_clauses([Clause], [VisibleVariable], State) ->
-%%	{[TransformedClause],[[NewVariable]],[[UsedVariable]],State'}
-%%  Be very careful here to return the variables that are really used
-%%  and really new.
-
-icr_clauses([], _, St) ->
-    {[],[[]],[],St};
-icr_clauses(Clauses, Vs, St) ->
-    icr_clauses2(Clauses, Vs, St).
-
-icr_clauses2([{clause,Line,H0,G0,B0}|Cs0], Vs, St0) ->
-    {H,Hvs,Hus,St1} = head(H0, St0),		%Hvs is really used!
-    {G,Gvs,Gus,St2} = guard(G0, union(Hvs, Vs), St1),
-    {B,Bvs,Bus,St3} = exprs(B0, union([Vs,Hvs,Gvs]), St2),
-    New = subtract(union([Hvs,Gvs,Bvs]), Vs),	%Really new
-    Used = intersection(union([Hvs,Hus,Gus,Bus]), Vs), %Really used
-    {Cs,Csvs,Csus,St4} = icr_clauses2(Cs0, Vs, St3),
-    {[{clause,Line,H,G,B}|Cs],[New|Csvs],[Used|Csus],St4};
-icr_clauses2([], _, St) ->
-    {[],[],[],St}.
-
-%% lc_tq(Line, Expr, Qualifiers, More, [VisibleVar], State) ->
-%%	{TransExpr,[TransQual],TransMore,[NewVar],[UsedVar],State'}
-
-lc_tq(Line, E0, [{generate,Lg,P0,G0}|Qs0], M0, Vs, St0) ->
-    {G1,Gvs,Gus,St1} = expr(G0, Vs, St0),
-    {P1,Pvs,Pus,St2} = pattern(P0, St1),
-    {E1,Qs1,M1,Lvs,Lus,St3} = lc_tq(Line, E0, Qs0, M0, union(Pvs, Vs), St2),
-    {E1,[{generate,Lg,P1,G1}|Qs1],M1,
-     union(Gvs, Lvs),union([Gus,Pus,Lus]),St3};
-lc_tq(Line, E0, [F0|Qs0], M0, Vs, St0) ->
-    %% Allow record/2 and expand out as guard test.
-    case erl_lint:is_guard_test(F0) of
-	true ->
-	    {F1,Fvs,_Fus,St1} = guard_tests([F0], Vs, St0),
-	    {E1,Qs1,M1,Lvs,Lus,St2} = lc_tq(Line, E0, Qs0, M0, union(Fvs, Vs), St1),
-	    {E1,F1++Qs1,M1,Lvs,Lus,St2};
-	false ->
-	    {F1,Fvs,_Fus,St1} = expr(F0, Vs, St0),
-	    {E1,Qs1,M1,Lvs,Lus,St2} = lc_tq(Line, E0, Qs0, M0, union(Fvs, Vs), St1),
-	    {E1,[F1|Qs1],M1,Lvs,Lus,St2}
-    end;
-lc_tq(_Line, E0, [], M0, Vs, St0) ->
-    {E1,Evs,Eus,St1} = expr(E0, Vs, St0),
-    {M1,Mvs,Mus,St2} = expr(M0, Vs, St1),
-    {E1,[],M1,union(Evs, Mvs),union(Eus, Mus),St2}.
-
-%% fun_tq(Line, Body, VisibleVariables, State) ->
-%%	{Fun,NewVariables,UsedVariables,State'}
-%% Transform an "explicit" fun {'fun', Line, {clauses, Cs}} into an
-%% extended form {'fun', Line, {clauses, Cs}, Info}, unless it is the
-%% name of a BIF (erl_lint has checked that it is not an import).
-%% Process the body sequence directly to get the new and used variables.
-%% "Implicit" funs {'fun', Line, {function, F, A}} are not changed.
-
-fun_tq(Lf, {function,F,A}, Vs, St0) ->
-    {As,St1} = new_vars(A, Lf, St0),
-    Cs = [{clause,Lf,As,[],[{call,Lf,{atom,Lf,F},As}]}],
-    case erl_internal:bif(F, A) of
- 	true ->
- 	    fun_tq(Lf, {clauses,Cs}, Vs, St1);
- 	false ->
-	    Index = St0#expand.fun_index,
-	    Uniq = erlang:hash(Cs, (1 bsl 27)-1),
-	    {Fname,St2} = new_fun_name(St1),
- 	    {{'fun',Lf,{function,F,A},{Index,Uniq,Fname}},[],[],
-	     St2#expand{fun_index=Index+1}}
-    end;
-fun_tq(Lf, {clauses,Cs0}, Vs, St0) ->
-    Uniq = erlang:hash(Cs0, (1 bsl 27)-1),
-    {Cs1,_Hvss,Frees,St1} = fun_clauses(Cs0, Vs, St0),
-    Ufrees = union(Frees),
-    Index = St1#expand.fun_index,
-    {Fname,St2} = new_fun_name(St1),
-    {{'fun',Lf,{clauses,Cs1},{Index,Uniq,Fname}},[],Ufrees,
-     St2#expand{fun_index=Index+1}}.
-
-fun_clauses([{clause,L,H0,G0,B0}|Cs0], Vs, St0) ->
-    {H,Hvs,Hus,St1} = head(H0, St0),
-    {G,Gvs,Gus,St2} = guard(G0, union(Hvs, Vs), St1),
-    {B,Bvs,Bus,St3} = exprs(B0, union([Vs,Hvs,Gvs]), St2),
-    %% Free variables cannot be new anywhere in the clause.
-    Free = subtract(union([Gus,Hus,Bus]), union([Hvs,Gvs,Bvs])),
-    %%io:format(" Gus :~p~n Bvs :~p~n Bus :~p~n Free:~p~n" ,[Gus,Bvs,Bus,Free]),
-    {Cs,Hvss,Frees,St4} = fun_clauses(Cs0, Vs, St3),
-    {[{clause,L,H,G,B}|Cs],[Hvs|Hvss],[Free|Frees],St4};
-fun_clauses([], _, St) -> {[],[],[],St}.
-
-%% new_fun_name(State) -> {FunName,State}.
-
-new_fun_name(#expand{func=F,arity=A,fcount=I}=St) ->
-    Name = "-" ++ atom_to_list(F) ++ "/" ++ integer_to_list(A)
-	++ "-fun-" ++ integer_to_list(I) ++ "-",
-    {list_to_atom(Name),St#expand{fcount=I+1}}.
-
-
-%% normalise_fields([RecDef]) -> [Field].
-%%  Normalise the field definitions to always have a default value. If
-%%  none has been given then use 'undefined'.
-
-normalise_fields(Fs) ->
-    map(fun ({record_field,Lf,Field}) ->
-		{record_field,Lf,Field,{atom,Lf,undefined}};
-	    (F) -> F end, Fs).
-
-%% record_fields(RecordName, State)
-%% find_field(FieldName, Fields)
-
-record_fields(R, St) -> dict:fetch(R, St#expand.records).
-
-find_field(F, [{record_field,_,{atom,_,F},Val}|_]) -> {ok,Val};
-find_field(F, [_|Fs]) -> find_field(F, Fs);
-find_field(_, []) -> error.
-
-%% field_names(RecFields) -> [Name].
-%%  Return a list of the field names structures.
-
-field_names(Fs) ->
-    map(fun ({record_field,_,Field,_Val}) -> Field end, Fs).
-
-%% index_expr(Line, FieldExpr, Name, Fields) -> IndexExpr.
-%%  Return an expression which evaluates to the index of a
-%%  field. Currently only handle the case where the field is an
-%%  atom. This expansion must be passed through expr again.
-
-index_expr(Line, {atom,_,F}, _Name, Fs) ->
-    {integer,Line,index_expr(F, Fs, 2)}.
-
-index_expr(F, [{record_field,_,{atom,_,F},_}|_], I) -> I;
-index_expr(F, [_|Fs], I) ->
-    index_expr(F, Fs, I+1).
-
-%% pattern_fields([RecDefField], [Match]) -> [Pattern].
-%%  Build a list of match patterns for the record tuple elements.
-%%  This expansion must be passed through pattern again. N.B. We are
-%%  scanning the record definition field list!
-
-pattern_fields(Fs, Ms) ->
-    Wildcard = record_wildcard_init(Ms),
-    map(fun ({record_field,L,{atom,_,F},_}) ->
-		case find_field(F, Ms) of
-		    {ok,Match} -> Match;
-		    error when Wildcard =:= none -> {var,L,'_'};
-		    error -> Wildcard
-		end end,
-	Fs).
-
-%% record_inits([RecDefField], [Init]) -> [InitExpr].
-%%  Build a list of initialisation expressions for the record tuple
-%%  elements. This expansion must be passed through expr
-%%  again. N.B. We are scanning the record definition field list!
-
-record_inits(Fs, Is) ->
-    WildcardInit = record_wildcard_init(Is),
-    map(fun ({record_field,_,{atom,_,F},D}) ->
-		case find_field(F, Is) of
-		    {ok,Init} -> Init;
-		    error when WildcardInit =:= none -> D;
-		    error -> WildcardInit
-		end end,
-	Fs).
-
-record_wildcard_init([{record_field,_,{var,_,'_'},D}|_]) -> D;
-record_wildcard_init([_|Is]) -> record_wildcard_init(Is);
-record_wildcard_init([]) -> none.
-
-%% record_update(Record, RecordName, [RecDefField], [Update], State) ->
-%%	{Expr,State'}
-%%  Build an expression to update fields in a record returning a new
-%%  record.  Try to be smart and optimise this. This expansion must be
-%%  passed through expr again.
-
-record_update(R, Name, Fs, Us0, St0) ->
-    Line = element(2, R),
-    {Pre,Us,St1} = record_exprs(Us0, St0),
-    Nf = length(Fs),				%# of record fields
-    Nu = length(Us),				%# of update fields
-    Nc = Nf - Nu,				%# of copy fields
-
-    %% We need a new variable for the record expression
-    %% to guarantee that it is only evaluated once.
-    {Var,St2} = new_var(Line, St1),
-
-    %% Try to be intelligent about which method of updating record to use.
-    {Update,St} =
-	if
-	    Nu == 0 -> {R,St2};			%No fields updated
-	    Nu =< Nc ->				%Few fields updated
-		{record_setel(Var, Name, Fs, Us), St2};
-	    true ->			      %The wide area inbetween
-		record_match(Var, Name, Fs, Us, St2)
-	end,
-    {{block,element(2, R),Pre ++ [{match,Line,Var,R},Update]},St}.
-
-%% record_match(Record, RecordName, [RecDefField], [Update], State)
-%%  Build a 'case' expression to modify record fields.
-
-record_match(R, Name, Fs, Us, St0) ->
-    {Ps,News,St1} = record_upd_fs(Fs, Us, St0),
-    Lr = element(2, hd(Us)),
-    {{'case',Lr,R,
-      [{clause,Lr,[{tuple,Lr,[{atom,Lr,Name}|Ps]}],[],
-	[{tuple,Lr,[{atom,Lr,Name}|News]}]},
-       {clause,Lr,[{var,Lr,'_'}],[],
-	[call_error(Lr, {tuple,Lr,[{atom,Lr,badrecord},{atom,Lr,Name}]})]}
-      ]},
-     St1}.
-
-record_upd_fs([{record_field,Lf,{atom,_La,F},_Val}|Fs], Us, St0) ->
-    {P,St1} = new_var(Lf, St0),
-    {Ps,News,St2} = record_upd_fs(Fs, Us, St1),
-    case find_field(F, Us) of
-	{ok,New} -> {[P|Ps],[New|News],St2};
-	error -> {[P|Ps],[P|News],St2}
-    end;
-record_upd_fs([], _, St) -> {[],[],St}.
-
-%% record_setel(Record, RecordName, [RecDefField], [Update])
-%%  Build a nested chain of setelement calls to build the 
-%%  updated record tuple.
-
-record_setel(R, Name, Fs, Us0) ->
-    Us1 = foldl(fun ({record_field,Lf,Field,Val}, Acc) ->
-			I = index_expr(Lf, Field, Name, Fs),
-			[{I,Lf,Val}|Acc]
-		end, [], Us0),
-    Us = sort(Us1),
-    Lr = element(2, hd(Us)),
-    Wildcards = duplicate(length(Fs), {var,Lr,'_'}),
-    {'case',Lr,R,
-     [{clause,Lr,[{tuple,Lr,[{atom,Lr,Name}|Wildcards]}],[],
-       [foldr(fun ({I,Lf,Val}, Acc) ->
-		      {call,Lf,{atom,Lf,setelement},[I,Acc,Val]} end,
-	      R, Us)]},
-      {clause,Lr,[{var,Lr,'_'}],[],
-       [call_error(Lr, {tuple,Lr,[{atom,Lr,badrecord},{atom,Lr,Name}]})]}]}.
-
-%% Expand a call to record_info/2. We have checked that it is not
-%% shadowed by an import.
-
-record_info_call(Line, [{atom,_Li,Info},{atom,_Ln,Name}], St) ->
-    case Info of
-	size ->
-	    {{integer,Line,1+length(record_fields(Name, St))},[],[],St};
-	fields ->
-	    {make_list(field_names(record_fields(Name, St)), Line),
-	     [],[],St}
-    end.
-
-%% Break out expressions from an record update list and bind to new
-%% variables. The idea is that we will evaluate all update expressions
-%% before starting to update the record.
-
-record_exprs(Us, St) ->
-    record_exprs(Us, St, [], []).
-
-record_exprs([{record_field,Lf,{atom,_La,_F}=Name,Val}=Field0|Us], St0, Pre, Fs) ->
-    case is_simple_val(Val) of
-	true ->
-	    record_exprs(Us, St0, Pre, [Field0|Fs]);
-	false ->
-	    {Var,St} = new_var(Lf, St0),
-	    Bind = {match,Lf,Var,Val},
-	    Field = {record_field,Lf,Name,Var},
-	    record_exprs(Us, St, [Bind|Pre], [Field|Fs])
-    end;
-record_exprs([], St, Pre, Fs) ->
-    {reverse(Pre),Fs,St}.
-
-is_simple_val({var,_,_}) -> true;
-is_simple_val({atom,_,_}) -> true;
-is_simple_val({integer,_,_}) -> true;
-is_simple_val({float,_,_}) -> true;
-is_simple_val({nil,_}) -> true;
-is_simple_val(_) -> false.
-
-%% pattern_bin([Element], State) -> {[Element],[Variable],[UsedVar],State}.
-
-pattern_bin(Es0, St) ->
-    Es1 = bin_expand_strings(Es0),
-    foldr(fun (E, Acc) -> pattern_element(E, Acc) end, {[],[],[],St}, Es1).
-
-pattern_element({bin_element,Line,Expr,Size,Type}, {Es,Esvs,Esus,St0}) ->
-    {Expr1,Vs1,Us1,St1} = pattern(Expr, St0),
-    {Size1,Vs2,Us2,St2} = pat_bit_size(Size, St1),
-    {Size2,Type1} = make_bit_type(Line, Size1,Type),
-    {[{bin_element,Line,Expr1,Size2,Type1}|Es],
-      union([Vs1,Vs2,Esvs]),union([Us1,Us2,Esus]),St2}.
-
-pat_bit_size(default, St) -> {default,[],[],St};
-pat_bit_size({atom,_La,all}=All, St) -> {All,[],[],St};
-pat_bit_size({var,_Lv,V}=Var, St) -> {Var,[],[V],St};
-pat_bit_size(Size, St) ->
-    Line = element(2, Size),
-    {value,Sz,_} = erl_eval:expr(Size, erl_eval:new_bindings()),
-    {{integer,Line,Sz},[],[],St}.
-
-make_bit_type(Line, default, Type0) ->
-    case erl_bits:set_bit_type(default, Type0) of
-	{ok,all,Bt} -> {{atom,Line,all},erl_bits:as_list(Bt)};
-	{ok,Size,Bt} -> {{integer,Line,Size},erl_bits:as_list(Bt)}
-    end;
-make_bit_type(_Line, Size, Type0) ->		%Integer or 'all'
-    {ok,Size,Bt} = erl_bits:set_bit_type(Size, Type0),
-    {Size,erl_bits:as_list(Bt)}.
-
-%% expr_bin([Element], [VisibleVar], State) ->
-%%              {[Element],[NewVar],[UsedVar],State}.
-
-expr_bin(Es0, Vs, St) ->
-    Es1 = bin_expand_strings(Es0),
-    foldr(fun (E, Acc) -> bin_element(E, Vs, Acc) end, {[],[],[],St}, Es1).
-
-bin_element({bin_element,Line,Expr,Size,Type}, Vs, {Es,Esvs,Esus,St0}) ->
-    {Expr1,Vs1,Us1,St1} = expr(Expr, Vs, St0),
-    {Size1,Vs2,Us2,St2} = if Size == default -> {default,[],[],St1};
-			     true -> expr(Size, Vs, St1)
-			  end,
-    {Size2,Type1} = make_bit_type(Line, Size1, Type),
-    {[{bin_element,Line,Expr1,Size2,Type1}|Es],
-     union([Vs1,Vs2,Esvs]),union([Us1,Us2,Esus]),St2}.
-
-bin_expand_strings(Es) ->
-    foldr(fun ({bin_element,Line,{string,_,S},default,default}, Es1) ->
-		  foldr(fun (C, Es2) ->
-				[{bin_element,Line,{char,Line,C},default,default}|Es2]
-			end, Es1, S);
-	      (E, Es1) -> [E|Es1]
-	  end, [], Es).
-
-%% new_var_name(State) -> {VarName,State}.
-
-new_var_name(St) ->
-    C = St#expand.vcount,
-    {list_to_atom("pre" ++ integer_to_list(C)),St#expand{vcount=C+1}}.
-
-%% new_var(Line, State) -> {Var,State}.
-
-new_var(L, St0) ->
-    {New,St1} = new_var_name(St0),
-    {{var,L,New},St1}.
-
-%% new_vars(Count, Line, State) -> {[Var],State}.
-%%  Make Count new variables.
-
-new_vars(N, L, St) -> new_vars(N, L, St, []).
-
-new_vars(N, L, St0, Vs) when N > 0 ->
-    {V,St1} = new_var(L, St0),
-    new_vars(N-1, L, St1, [V|Vs]);
-new_vars(0, _L, St, Vs) -> {Vs,St}.
-
-%% make_list(TermList, Line) ->	ConsTerm.
-
-make_list(Ts, Line) ->
-    foldr(fun (H, T) -> {cons,Line,H,T} end, {nil,Line}, Ts).
-
-string_to_conses(Line, Cs, Tail) ->
-    foldr(fun (C, T) -> {cons,Line,{char,Line,C},T} end, Tail, Cs).
-
-
-%% In syntax trees, module/package names are atoms or lists of atoms.
-
-package_to_string(A) when atom(A) -> atom_to_list(A);
-package_to_string(L) when list(L) -> packages:concat(L).
-
-expand_package({atom,L,A} = M, St) ->
-    case dict:find(A, St#expand.mod_imports) of
-	{ok, A1} ->
-	    {atom,L,A1};
-	error ->
-	    case packages:is_segmented(A) of
-		true ->
-		    M;
-		false -> 
-		    M1 = packages:concat(St#expand.package, A),
-		    {atom,L,list_to_atom(M1)}
-	    end
-    end;
-expand_package(M, _St) ->
-    case erl_parse:package_segments(M) of
-	error ->
-	    M;
-	M1 ->
-	    {atom,element(2,M),list_to_atom(package_to_string(M1))}
-    end.
-
-%% Create a case-switch on true/false, generating badarg for all other
-%% values.
-
-make_bool_switch(L, E, V, T, F) ->
-    make_bool_switch_1(L, E, V, [T], [F]).
-
-make_bool_switch_1(L, E, V, T, F) ->
-    case get(sys_pre_expand_in_guard) of
-	undefined -> make_bool_switch_body(L, E, V, T, F);
-	yes -> make_bool_switch_guard(L, E, V, T, F)
-    end.
-
-make_bool_switch_guard(_, E, _, [{atom,_,true}], [{atom,_,false}]) -> E;
-make_bool_switch_guard(L, E, V, T, F) ->
-    NegL = -abs(L),
-    {'case',NegL,E,
-     [{clause,NegL,[{atom,NegL,true}],[],T},
-      {clause,NegL,[{atom,NegL,false}],[],F},
-      {clause,NegL,[V],[],[V]}
-     ]}.
-
-make_bool_switch_body(L, E, V, T, F) ->
-    NegL = -abs(L),
-    {'case',NegL,E,
-     [{clause,NegL,[{atom,NegL,true}],[],T},
-      {clause,NegL,[{atom,NegL,false}],[],F},
-      {clause,NegL,[V],[],
-       [call_error(NegL,{tuple,NegL,[{atom,NegL,badarg},V]})]}
-     ]}.
-
-%% Expand a list of cond-clauses to a sequence of case-switches.
-
-cond_clauses([{clause,L,[],[[E]],B}],V) ->
-    make_bool_switch_1(L,E,V,B,[call_error(L,{atom,L,cond_clause})]);
-cond_clauses([{clause,L,[],[[E]],B} | Cs],V) ->
-    make_bool_switch_1(L,E,V,B,[cond_clauses(Cs,V)]).
-
-%% call_error(Line, Reason) -> Expr.
-%%  Build a call to erlang:error/1 with reason Reason.
-
-call_error(L, R) ->
-    {call,L,{remote,L,{atom,L,erlang},{atom,L,error}},[R]}.
-
-%% new_in_all(Before, RegionList) -> NewInAll
-%%  Return the variables new in all clauses.
-
-new_in_all(Before, Region) ->
-    InAll = intersection(Region),
-    subtract(InAll, Before).
-
-%% import(Line, Imports, State) ->
-%%	State'
-%% imported(Name, Arity, State) ->
-%%	{yes,Module} | no
-%%  Handle import declarations and est for imported functions. No need to
-%%  check when building imports as code is correct.
-
-import({Mod0,Fs}, St) ->
-    Mod = list_to_atom(package_to_string(Mod0)),
-    Mfs = from_list(Fs),
-    St#expand{imports=add_imports(Mod, Mfs, St#expand.imports)};
-import(Mod0, St) ->
-    Mod = package_to_string(Mod0),
-    Key = list_to_atom(packages:last(Mod)),
-    St#expand{mod_imports=dict:store(Key, list_to_atom(Mod),
-				     St#expand.mod_imports)}.
-
-add_imports(Mod, [F|Fs], Is) ->
-    add_imports(Mod, Fs, orddict:store(F, Mod, Is));
-add_imports(_, [], Is) -> Is.
-
-imported(F, A, St) ->
-    case orddict:find({F,A}, St#expand.imports) of
-	{ok,Mod} -> {yes,Mod};
-	error -> no
-    end.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_codegen.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_codegen.erl
deleted file mode 100644
index 2af4d94655..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_codegen.erl
+++ /dev/null
@@ -1,1755 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: v3_codegen.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
-%% Purpose : Code generator for Beam.
-
-%% The following assumptions have been made:
-%%
-%% 1. Matches, i.e. things with {match,M,Ret} wrappers, only return
-%% values; no variables are exported. If the match would have returned
-%% extra variables then these have been transformed to multiple return
-%% values.
-%% 
-%% 2. All BIF's called in guards are gc-safe so there is no need to
-%% put thing on the stack in the guard.  While this would in principle
-%% work it would be difficult to keep track of the stack depth when
-%% trimming.
-%%
-%% The code generation uses variable lifetime information added by
-%% the v3_life module to save variables, allocate registers and 
-%% move registers to the stack when necessary.
-%%
-%% We try to use a consistent variable name scheme throughout.  The
-%% StackReg record is always called Bef,Int<n>,Aft.
-
--module(v3_codegen).
-
-%% The main interface.
--export([module/2]).
-
--import(lists, [member/2,keymember/3,keysort/2,keysearch/3,append/1,
-		map/2,flatmap/2,foldl/3,foldr/3,mapfoldl/3,
-		sort/1,reverse/1,reverse/2]).
--import(v3_life, [vdb_find/2]).
-
-%%-compile([export_all]).
-
--include("v3_life.hrl").
-
-%% Main codegen structure.
--record(cg, {lcount=1,				%Label counter
-	     mod,				%Current module
-	     func,				%Current function
-	     finfo,				%Function info label
-	     fcode,				%Function code label
-	     btype,				%Type of bif used.
-	     bfail,				%Fail label of bif
-	     break,				%Break label
-	     recv,				%Receive label
-	     is_top_block,			%Boolean: top block or not
-	     functable = [],			%Table of local functions:
-						%[{{Name, Arity}, Label}...]
-	     in_catch=false,			%Inside a catch or not.
-	     need_frame,			%Need a stack frame.
-	     new_funs=true}).			%Generate new fun instructions.
-
-%% Stack/register state record.
--record(sr, {reg=[],				%Register table
-	     stk=[],				%Stack table
-	     res=[]}).				%Reserved regs: [{reserved,I,V}]
-
-module({Mod,Exp,Attr,Forms}, Options) ->
-    NewFunsFlag = not member(no_new_funs, Options),
-    {Fs,St} = functions(Forms, #cg{mod=Mod,new_funs=NewFunsFlag}),
-    {ok,{Mod,Exp,Attr,Fs,St#cg.lcount}}.
-
-functions(Forms, St0) ->
-    mapfoldl(fun (F, St) -> function(F, St) end, St0#cg{lcount=1}, Forms).
-
-function({function,Name,Arity,As0,Vb,Vdb}, St0) ->
-    %%ok = io:fwrite("cg ~w:~p~n", [?LINE,{Name,Arity}]),
-    St1 = St0#cg{func={Name,Arity}},
-    {Fun,St2} = cg_fun(Vb, As0, Vdb, St1),
-    Func0 = {function,Name,Arity,St2#cg.fcode,Fun},
-    Func = bs_function(Func0),
-    {Func,St2}.
-
-%% cg_fun([Lkexpr], [HeadVar], Vdb, State) -> {[Ainstr],State}
-
-cg_fun(Les, Hvs, Vdb, St0) ->
-    {Name,Arity} = St0#cg.func,
-    {Fi,St1} = new_label(St0),			%FuncInfo label
-    {Fl,St2} = local_func_label(Name, Arity, St1),
-    %% Create initial stack/register state, clear unused arguments.
-    Bef = clear_dead(#sr{reg=foldl(fun ({var,V}, Reg) ->
-					   put_reg(V, Reg)
-				   end, [], Hvs),
-			stk=[]}, 0, Vdb),
-    {B2,_Aft,St3} = cg_list(Les, 0, Vdb, Bef, St2#cg{btype=exit,
-						    bfail=Fi,
-						    finfo=Fi,
-						    fcode=Fl,
-						    is_top_block=true}),
-    A = [{label,Fi},{func_info,{atom,St3#cg.mod},{atom,Name},Arity},
-	 {label,Fl}|B2],
-    {A,St3}.
-
-%% cg(Lkexpr, Vdb, StackReg, State) -> {[Ainstr],StackReg,State}.
-%%  Generate code for a kexpr.
-%%  Split function into two steps for clarity, not efficiency.
-
-cg(Le, Vdb, Bef, St) ->
-    cg(Le#l.ke, Le, Vdb, Bef, St).
-
-cg({block,Es}, Le, Vdb, Bef, St) ->
-    block_cg(Es, Le, Vdb, Bef, St);
-cg({match,M,Rs}, Le, Vdb, Bef, St) ->
-    match_cg(M, Rs, Le, Vdb, Bef, St);
-cg({match_fail,F}, Le, Vdb, Bef, St) ->
-    match_fail_cg(F, Le, Vdb, Bef, St);
-cg({call,Func,As,Rs}, Le, Vdb, Bef, St) ->
-    call_cg(Func, As, Rs, Le, Vdb, Bef, St);
-cg({enter,Func,As}, Le, Vdb, Bef, St) ->
-    enter_cg(Func, As, Le, Vdb, Bef, St);
-cg({bif,Bif,As,Rs}, Le, Vdb, Bef, St) ->
-    bif_cg(Bif, As, Rs, Le, Vdb, Bef, St);
-cg({receive_loop,Te,Rvar,Rm,Tes,Rs}, Le, Vdb, Bef, St) ->
-    recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, Vdb, Bef, St);
-cg(receive_next, Le, Vdb, Bef, St) ->
-    recv_next_cg(Le, Vdb, Bef, St);
-cg(receive_accept, _Le, _Vdb, Bef, St) -> {[remove_message],Bef,St};
-cg({'try',Ta,Vs,Tb,Evs,Th,Rs}, Le, Vdb, Bef, St) ->
-    try_cg(Ta, Vs, Tb, Evs, Th, Rs, Le, Vdb, Bef, St);
-cg({'catch',Cb,R}, Le, Vdb, Bef, St) ->
-    catch_cg(Cb, R, Le, Vdb, Bef, St);
-cg({set,Var,Con}, Le, Vdb, Bef, St) -> set_cg(Var, Con, Le, Vdb, Bef, St);
-cg({return,Rs}, Le, Vdb, Bef, St) -> return_cg(Rs, Le, Vdb, Bef, St);
-cg({break,Bs}, Le, Vdb, Bef, St) -> break_cg(Bs, Le, Vdb, Bef, St);
-cg({need_heap,0}, _Le, _Vdb, Bef, St) ->
-    {[],Bef,St};
-cg({need_heap,H}, _Le, _Vdb, Bef, St) ->
-    {[{test_heap,H,max_reg(Bef#sr.reg)}],Bef,St}.
-
-%% cg_list([Kexpr], FirstI, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
-
-cg_list(Kes, I, Vdb, Bef, St0) ->
-    {Keis,{Aft,St1}} =
-	flatmapfoldl(fun (Ke, {Inta,Sta}) ->
-%			     ok = io:fwrite("    %% ~p\n", [Inta]),
-%			     ok = io:fwrite("cgl:~p\n", [Ke]),
-			     {Keis,Intb,Stb} = cg(Ke, Vdb, Inta, Sta),
-%			     ok = io:fwrite("    ~p\n", [Keis]),
-%			     ok = io:fwrite("    %% ~p\n", [Intb]),
-			     {comment(Inta) ++ Keis,{Intb,Stb}}
-		     end, {Bef,St0}, need_heap(Kes, I)),
-    {Keis,Aft,St1}.
-
-%% need_heap([Lkexpr], I, BifType) -> [Lkexpr].
-%%  Insert need_heap instructions in Kexpr list.  Try to be smart and
-%%  collect them together as much as possible.
-
-need_heap(Kes0, I) ->
-    {Kes1,{H,F}} = flatmapfoldr(fun (Ke, {H0,F0}) ->
-					{Ns,H1,F1} = need_heap_1(Ke, H0, F0),
-					{[Ke|Ns],{H1,F1}}
-				end, {0,false}, Kes0),
-    %% Prepend need_heap if necessary.
-    Kes2 = need_heap_need(I, H, F) ++ Kes1,
-%     ok = io:fwrite("need_heap: ~p~n",
-% 		   [{{H,F},
-% 		     map(fun (#l{ke={match,M,Rs}}) -> match;
-% 			     (Lke) -> Lke#l.ke end, Kes2)}]),
-    Kes2.
-
-need_heap_1(#l{ke={set,_,{binary,_}},i=I}, H, F) ->
-    {need_heap_need(I, H, F),0,false};
-need_heap_1(#l{ke={set,_,Val}}, H, F) ->
-    %% Just pass through adding to needed heap.
-    {[],H + case Val of
-		{cons,_} -> 2;
-		{tuple,Es} -> 1 + length(Es);
-		{string,S} -> 2 * length(S);
-		_Other -> 0
-	    end,F};
-need_heap_1(#l{ke={call,_Func,_As,_Rs},i=I}, H, F) ->
-    %% Calls generate a need if necessary and also force one.
-    {need_heap_need(I, H, F),0,true};
-need_heap_1(#l{ke={bif,dsetelement,_As,_Rs},i=I}, H, F) ->
-    {need_heap_need(I, H, F),0,true};
-need_heap_1(#l{ke={bif,{make_fun,_,_,_,_},_As,_Rs},i=I}, H, F) ->
-    {need_heap_need(I, H, F),0,true};
-need_heap_1(#l{ke={bif,_Bif,_As,_Rs}}, H, F) ->
-    {[],H,F};
-need_heap_1(#l{i=I}, H, F) ->
-    %% Others kexprs generate a need if necessary but don't force.
-    {need_heap_need(I, H, F),0,false}.
-
-need_heap_need(_I, 0, false) -> [];
-need_heap_need(I, H, _F) -> [#l{ke={need_heap,H},i=I}].
-
-
-%% match_cg(Match, [Ret], Le, Vdb, StackReg, State) ->
-%%	{[Ainstr],StackReg,State}.
-%%  Generate code for a match.  First save all variables on the stack
-%%  that are to survive after the match.  We leave saved variables in
-%%  their registers as they might actually be in the right place.
-%%  Should test this.
-
-match_cg(M, Rs, Le, Vdb, Bef, St0) ->
-    I = Le#l.i,
-    {Sis,Int0} = adjust_stack(Bef, I, I+1, Vdb),
-    {B,St1} = new_label(St0),
-    {Mis,Int1,St2} = match_cg(M, none, Int0, St1#cg{break=B}),
-    %% Put return values in registers.
-    Reg = load_vars(Rs, Int1#sr.reg),
-    {Sis ++ Mis ++ [{label,B}],
-     clear_dead(Int1#sr{reg=Reg}, I, Vdb),
-     St2#cg{break=St1#cg.break}}.
-
-%% match_cg(Match, Fail, StackReg, State) -> {[Ainstr],StackReg,State}.
-%%  Generate code for a match tree.  N.B. there is no need pass Vdb
-%%  down as each level which uses this takes its own internal Vdb not
-%%  the outer one.
-
-match_cg(Le, Fail, Bef, St) ->
-    match_cg(Le#l.ke, Le, Fail, Bef, St).
-
-match_cg({alt,F,S}, _Le, Fail, Bef, St0) ->
-    {Tf,St1} = new_label(St0),
-    {Fis,Faft,St2} = match_cg(F, Tf, Bef, St1),
-    {Sis,Saft,St3} = match_cg(S, Fail, Bef, St2),
-    Aft = sr_merge(Faft, Saft),
-    {Fis ++ [{label,Tf}] ++ Sis,Aft,St3};
-match_cg({select,V,Scs}, _Va, Fail, Bef, St) ->
-    match_fmf(fun (S, F, Sta) ->
-		      select_cg(S, V, F, Fail, Bef, Sta) end,
-	      Fail, St, Scs);
-match_cg({guard,Gcs}, _Le, Fail, Bef, St) ->
-    match_fmf(fun (G, F, Sta) -> guard_clause_cg(G, F, Bef, Sta) end,
-	      Fail, St, Gcs);
-match_cg({block,Es}, Le, _Fail, Bef, St) ->
-    %% Must clear registers and stack of dead variables.
-    Int = clear_dead(Bef, Le#l.i, Le#l.vdb),
-    block_cg(Es, Le, Int, St).
-
-%% match_fail_cg(FailReason, Le, Vdb, StackReg, State) ->
-%%	{[Ainstr],StackReg,State}.
-%%  Generate code for the match_fail "call".  N.B. there is no generic
-%%  case for when the fail value has been created elsewhere.
-
-match_fail_cg({function_clause,As}, Le, Vdb, Bef, St) ->
-    %% Must have the args in {x,0}, {x,1},...
-    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
-    {Sis ++ [{jump,{f,St#cg.finfo}}],
-     Int#sr{reg=clear_regs(Int#sr.reg)},St};
-match_fail_cg({badmatch,Term}, Le, Vdb, Bef, St) ->
-    R = cg_reg_arg(Term, Bef),
-    Int0 = clear_dead(Bef, Le#l.i, Vdb),
-    {Sis,Int} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
-    {Sis ++ [{badmatch,R}],
-     Int#sr{reg=clear_regs(Int0#sr.reg)},St};
-match_fail_cg({case_clause,Reason}, Le, Vdb, Bef, St) ->
-    R = cg_reg_arg(Reason, Bef),
-    Int0 = clear_dead(Bef, Le#l.i, Vdb),
-    {Sis,Int} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
-    {Sis++[{case_end,R}],
-     Int#sr{reg=clear_regs(Bef#sr.reg)},St};
-match_fail_cg(if_clause, Le, Vdb, Bef, St) ->
-    Int0 = clear_dead(Bef, Le#l.i, Vdb),
-    {Sis,Int1} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
-    {Sis++[if_end],Int1#sr{reg=clear_regs(Int1#sr.reg)},St};
-match_fail_cg({try_clause,Reason}, Le, Vdb, Bef, St) ->
-    R = cg_reg_arg(Reason, Bef),
-    Int0 = clear_dead(Bef, Le#l.i, Vdb),
-    {Sis,Int} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
-    {Sis ++ [{try_case_end,R}],
-     Int#sr{reg=clear_regs(Int0#sr.reg)},St}.
-
-
-%% block_cg([Kexpr], Le, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
-%% block_cg([Kexpr], Le, StackReg, St) -> {[Ainstr],StackReg,St}.
-
-block_cg(Es, Le, _Vdb, Bef, St) ->
-    block_cg(Es, Le, Bef, St).
-
-block_cg(Es, Le, Bef, St0) ->
-    case St0#cg.is_top_block of
-	false ->
-	    cg_block(Es, Le#l.i, Le#l.vdb, Bef, St0);
-	true ->
-	    {Keis,Aft,St1} = cg_block(Es, Le#l.i, Le#l.vdb, Bef,
-				      St0#cg{is_top_block=false,
-					     need_frame=false}),
-	    top_level_block(Keis, Aft, max_reg(Bef#sr.reg), St1)
-    end.
-
-cg_block([], _I, _Vdb, Bef, St0) ->
-    {[],Bef,St0};
-cg_block(Kes0, I, Vdb, Bef, St0) ->
-    {Kes2,Int1,St1} =
-	case basic_block(Kes0) of
-	    {Kes1,LastI,Args,Rest} ->
-		Ke = hd(Kes1),
-		Fb = Ke#l.i,
-		cg_basic_block(Kes1, Fb, LastI, Args, Vdb, Bef, St0);
-	    {Kes1,Rest} ->
-		cg_list(Kes1, I, Vdb, Bef, St0)
-	end,
-    {Kes3,Int2,St2} = cg_block(Rest, I, Vdb, Int1, St1),
-    {Kes2 ++ Kes3,Int2,St2}.
-
-basic_block(Kes) -> basic_block(Kes, []).
-
-basic_block([], Acc) -> {reverse(Acc),[]};
-basic_block([Le|Les], Acc) ->
-    case collect_block(Le#l.ke) of
-	include -> basic_block(Les, [Le|Acc]);
-	{block_end,As} -> {reverse(Acc, [Le]),Le#l.i,As,Les};
-	no_block -> {reverse(Acc, [Le]),Les}
-    end.
-	
-collect_block({set,_,{binary,_}})    -> no_block;
-collect_block({set,_,_})             -> include;
-collect_block({call,{var,_}=Var,As,_Rs}) -> {block_end,As++[Var]};
-collect_block({call,Func,As,_Rs})   -> {block_end,As++func_vars(Func)};
-collect_block({enter,{var,_}=Var,As})-> {block_end,As++[Var]};
-collect_block({enter,Func,As})       -> {block_end,As++func_vars(Func)};
-collect_block({return,Rs})           -> {block_end,Rs};
-collect_block({break,Bs})            -> {block_end,Bs};
-collect_block({bif,_Bif,_As,_Rs})    -> include;
-collect_block(_)                     -> no_block.
-
-func_vars({remote,M,F}) when element(1, M) == var;
-			     element(1, F) == var ->
-    [M,F];
-func_vars(_) -> [].
-
-%% cg_basic_block([Kexpr], FirstI, LastI, As, Vdb, StackReg, State) ->
-%%      {[Ainstr],StackReg,State}.
-
-cg_basic_block(Kes, Fb, Lf, As, Vdb, Bef, St0) ->
-    Res = make_reservation(As, 0),
-    Regs0 = reserve(Res, Bef#sr.reg, Bef#sr.stk),
-    Stk = extend_stack(Bef, Lf, Lf+1, Vdb),
-    Int0 = Bef#sr{reg=Regs0,stk=Stk,res=Res},
-    X0_v0 = x0_vars(As, Fb, Lf, Vdb),
-    {Keis,{Aft,_,St1}} =
-	flatmapfoldl(fun(Ke, St) -> cg_basic_block(Ke, St, Lf, Vdb) end,
-		     {Int0,X0_v0,St0}, need_heap(Kes, Fb)),
-    {Keis,Aft,St1}.
-
-cg_basic_block(Ke, {Inta,X0v,Sta}, _Lf, Vdb) when element(1, Ke#l.ke) =:= need_heap ->
-    {Keis,Intb,Stb} = cg(Ke, Vdb, Inta, Sta),
-    {comment(Inta) ++ Keis, {Intb,X0v,Stb}};
-cg_basic_block(Ke, {Inta,X0_v1,Sta}, Lf, Vdb) ->
-    {Sis,Intb} = save_carefully(Inta, Ke#l.i, Lf+1, Vdb),
-    {X0_v2,Intc} = allocate_x0(X0_v1, Ke#l.i, Intb),
-    Intd = reserve(Intc),
-    {Keis,Inte,Stb} = cg(Ke, Vdb, Intd, Sta),
-    {comment(Inta) ++ Sis ++ Keis, {Inte,X0_v2,Stb}}.
-
-make_reservation([], _) -> [];
-make_reservation([{var,V}|As], I) -> [{I,V}|make_reservation(As, I+1)];
-make_reservation([A|As], I) -> [{I,A}|make_reservation(As, I+1)].
-
-reserve(Sr) -> Sr#sr{reg=reserve(Sr#sr.res, Sr#sr.reg, Sr#sr.stk)}.
-
-reserve([{I,V}|Rs], [free|Regs], Stk) -> [{reserved,I,V}|reserve(Rs, Regs, Stk)];
-reserve([{I,V}|Rs], [{I,V}|Regs], Stk) -> [{I,V}|reserve(Rs, Regs, Stk)];
-reserve([{I,V}|Rs], [{I,Var}|Regs], Stk) ->
-    case on_stack(Var, Stk) of
-	true -> [{reserved,I,V}|reserve(Rs, Regs, Stk)];
-	false -> [{I,Var}|reserve(Rs, Regs, Stk)]
-    end;
-reserve([{I,V}|Rs], [{reserved,I,_}|Regs], Stk) ->
-    [{reserved,I,V}|reserve(Rs, Regs, Stk)];
-%reserve([{I,V}|Rs], [Other|Regs], Stk) -> [Other|reserve(Rs, Regs, Stk)];
-reserve([{I,V}|Rs], [], Stk) -> [{reserved,I,V}|reserve(Rs, [], Stk)];
-reserve([], Regs, _) -> Regs.
-
-extend_stack(Bef, Fb, Lf, Vdb) ->
-    Stk0 = clear_dead_stk(Bef#sr.stk, Fb, Vdb),
-    Saves = [V || {V,F,L} <- Vdb,
-		  F < Fb,
-		  L >= Lf,
-		  not on_stack(V, Stk0)],
-    Stk1 = foldl(fun (V, Stk) -> put_stack(V, Stk) end, Stk0, Saves),
-    Bef#sr.stk ++ lists:duplicate(length(Stk1) - length(Bef#sr.stk), free).
-
-save_carefully(Bef, Fb, Lf, Vdb) ->
-    Stk = Bef#sr.stk,
-    %% New variables that are in use but not on stack.
-    New = [ {V,F,L} || {V,F,L} <- Vdb,
-		       F < Fb,
-		   L >= Lf,
-		       not on_stack(V, Stk) ],
-    Saves = [ V || {V,_,_} <- keysort(2, New) ],
-    save_carefully(Saves, Bef, []).
-
-save_carefully([], Bef, Acc) -> {reverse(Acc),Bef};
-save_carefully([V|Vs], Bef, Acc) ->
-    case put_stack_carefully(V, Bef#sr.stk) of
-	error -> {reverse(Acc),Bef};
-	Stk1 ->
-	    SrcReg = fetch_reg(V, Bef#sr.reg),
-	    Move = {move,SrcReg,fetch_stack(V, Stk1)},
-	    {x,_} = SrcReg,			%Assertion - must be X register.
-	    save_carefully(Vs, Bef#sr{stk=Stk1}, [Move|Acc])
-    end.
-
-x0_vars([], _Fb, _Lf, _Vdb) -> [];
-x0_vars([{var,V}|_], Fb, _Lf, Vdb) ->
-    {V,F,_L} = VFL = vdb_find(V, Vdb),
-    x0_vars1([VFL], Fb, F, Vdb);
-x0_vars([X0|_], Fb, Lf, Vdb) ->
-    x0_vars1([{X0,Lf,Lf}], Fb, Lf, Vdb).
-
-x0_vars1(X0, Fb, Xf, Vdb) ->
-    Vs0 = [VFL || {_V,F,L}=VFL <- Vdb,
-		  F >= Fb,
-		  L < Xf],
-    Vs1 = keysort(3, Vs0),
-    keysort(2, X0++Vs1).
-
-allocate_x0([], _, Bef) -> {[],Bef#sr{res=[]}};
-allocate_x0([{_,_,L}|Vs], I, Bef) when L =< I ->
-    allocate_x0(Vs, I, Bef);
-allocate_x0([{V,_F,_L}=VFL|Vs], _, Bef) ->
-    {[VFL|Vs],Bef#sr{res=reserve_x0(V, Bef#sr.res)}}.
-
-reserve_x0(V, [_|Res]) -> [{0,V}|Res];
-reserve_x0(V, []) -> [{0,V}].
-
-top_level_block(Keis, Bef, _MaxRegs, St0) when St0#cg.need_frame =:= false,
-					      length(Bef#sr.stk) =:= 0 ->
-    %% This block need no stack frame.  However, we still need to turn the
-    %% stack frame upside down.
-    MaxY = length(Bef#sr.stk)-1,
-    Keis1 = flatmap(fun (Tuple) when tuple(Tuple) ->
-			    [turn_yregs(size(Tuple), Tuple, MaxY)];
-			(Other) ->
-			    [Other]
-		    end, Keis),
-    {Keis1, Bef, St0#cg{is_top_block=true}};
-top_level_block(Keis, Bef, MaxRegs, St0) ->
-    %% This top block needs an allocate instruction before it, and a
-    %% deallocate instruction before each return.
-    FrameSz = length(Bef#sr.stk),
-    MaxY = FrameSz-1,
-    Keis1 = flatmap(fun ({call_only,Arity,Func}) ->
-			    [{call_last,Arity,Func,FrameSz}];
-			({call_ext_only,Arity,Func}) ->
-			    [{call_ext_last,Arity,Func,FrameSz}];
-			({apply_only,Arity}) ->
-			    [{apply_last,Arity,FrameSz}];
-			(return) ->
-			    [{deallocate,FrameSz}, return];
-			(Tuple) when tuple(Tuple) ->
-			    [turn_yregs(size(Tuple), Tuple, MaxY)];
-			(Other) ->
-			    [Other]
-		    end, Keis),
-    {[{allocate_zero,FrameSz,MaxRegs}|Keis1], Bef, St0#cg{is_top_block=true}}.
-
-%% turn_yregs(Size, Tuple, MaxY) -> Tuple'
-%%   Renumber y register so that {y, 0} becomes {y, FrameSize-1},
-%%   {y, FrameSize-1} becomes {y, 0} and so on.  This is to make nested
-%%   catches work.  The code generation algorithm gives a lower register
-%%   number to the outer catch, which is wrong.
-
-turn_yregs(0, Tp, _) -> Tp;
-turn_yregs(El, Tp, MaxY) when element(1, element(El, Tp)) == yy ->
-    turn_yregs(El-1, setelement(El, Tp, {y,MaxY-element(2, element(El, Tp))}), MaxY);
-turn_yregs(El, Tp, MaxY) when list(element(El, Tp)) ->
-    New = map(fun ({yy,YY}) -> {y,MaxY-YY};
-		  (Other) -> Other end, element(El, Tp)),
-    turn_yregs(El-1, setelement(El, Tp, New), MaxY);
-turn_yregs(El, Tp, MaxY) ->
-    turn_yregs(El-1, Tp, MaxY).
-
-%% select_cg(Sclause, V, TypeFail, ValueFail, StackReg, State) ->
-%%      {Is,StackReg,State}.
-%%  Selecting type and value needs two failure labels, TypeFail is the
-%%  label to jump to of the next type test when this type fails, and
-%%  ValueFail is the label when this type is correct but the value is
-%%  wrong.  These are different as in the second case there is no need
-%%  to try the next type, it will always fail.
-
-select_cg(#l{ke={type_clause,cons,[S]}}, {var,V}, Tf, Vf, Bef, St) ->
-    select_cons(S, V, Tf, Vf, Bef, St);
-select_cg(#l{ke={type_clause,nil,[S]}}, {var,V}, Tf, Vf, Bef, St) ->
-    select_nil(S, V, Tf, Vf, Bef, St);
-select_cg(#l{ke={type_clause,binary,[S]}}, {var,V}, Tf, Vf, Bef, St) ->
-    select_binary(S, V, Tf, Vf, Bef, St);
-select_cg(#l{ke={type_clause,bin_seg,S}}, {var,V}, Tf, Vf, Bef, St) ->
-    select_bin_segs(S, V, Tf, Vf, Bef, St);
-select_cg(#l{ke={type_clause,bin_end,[S]}}, {var,V}, Tf, Vf, Bef, St) ->
-    select_bin_end(S, V, Tf, Vf, Bef, St);
-select_cg(#l{ke={type_clause,Type,Scs}}, {var,V}, Tf, Vf, Bef, St0) ->
-    {Vis,{Aft,St1}} =
-	mapfoldl(fun (S, {Int,Sta}) ->
-			 {Val,Is,Inta,Stb} = select_val(S, V, Vf, Bef, Sta),
-			 {{Is,[Val]},{sr_merge(Int, Inta),Stb}}
-		 end, {void,St0}, Scs),
-    OptVls = combine(lists:sort(combine(Vis))),
-    {Vls,Sis,St2} = select_labels(OptVls, St1, [], []),
-    {select_val_cg(Type, fetch_var(V, Bef), Vls, Tf, Vf, Sis), Aft, St2}.
-
-select_val_cg(tuple, R, [Arity,{f,Lbl}], Tf, Vf, [{label,Lbl}|Sis]) ->
-    [{test,is_tuple,{f,Tf},[R]},{test,test_arity,{f,Vf},[R,Arity]}|Sis];
-select_val_cg(tuple, R, Vls, Tf, Vf, Sis) ->
-    [{test,is_tuple,{f,Tf},[R]},{select_tuple_arity,R,{f,Vf},{list,Vls}}|Sis];
-select_val_cg(Type, R, [Val, {f,Lbl}], Fail, Fail, [{label,Lbl}|Sis]) ->
-    [{test,is_eq_exact,{f,Fail},[R,{Type,Val}]}|Sis];
-select_val_cg(Type, R, [Val, {f,Lbl}], Tf, Vf, [{label,Lbl}|Sis]) ->
-    [{test,select_type_test(Type),{f,Tf},[R]},
-     {test,is_eq_exact,{f,Vf},[R,{Type,Val}]}|Sis];
-select_val_cg(Type, R, Vls0, Tf, Vf, Sis) ->
-    Vls1 = map(fun ({f,Lbl}) -> {f,Lbl};
-		   (Value) -> {Type,Value}
-	       end, Vls0),
-    [{test,select_type_test(Type),{f,Tf},[R]}, {select_val,R,{f,Vf},{list,Vls1}}|Sis].
-    
-select_type_test(tuple) -> is_tuple;
-select_type_test(integer) -> is_integer;
-select_type_test(atom) -> is_atom;
-select_type_test(float) -> is_float.
-
-combine([{Is,Vs1}, {Is,Vs2}|Vis]) -> combine([{Is,Vs1 ++ Vs2}|Vis]);
-combine([V|Vis]) -> [V|combine(Vis)];
-combine([]) -> [].
-
-select_labels([{Is,Vs}|Vis], St0, Vls, Sis) ->
-    {Lbl,St1} = new_label(St0),
-    select_labels(Vis, St1, add_vls(Vs, Lbl, Vls), [[{label,Lbl}|Is]|Sis]);
-select_labels([], St, Vls, Sis) ->
-    {Vls,append(Sis),St}.
-
-add_vls([V|Vs], Lbl, Acc) ->
-    add_vls(Vs, Lbl, [V, {f,Lbl}|Acc]);
-add_vls([], _, Acc) -> Acc.
-
-select_cons(#l{ke={val_clause,{cons,Es},B},i=I,vdb=Vdb}, V, Tf, Vf, Bef, St0) ->
-    {Eis,Int,St1} = select_extract_cons(V, Es, I, Vdb, Bef, St0),
-    {Bis,Aft,St2} = match_cg(B, Vf, Int, St1),
-    {[{test,is_nonempty_list,{f,Tf},[fetch_var(V, Bef)]}] ++ Eis ++ Bis,Aft,St2}.
-
-select_nil(#l{ke={val_clause,nil,B}}, V, Tf, Vf, Bef, St0) ->
-    {Bis,Aft,St1} = match_cg(B, Vf, Bef, St0),
-    {[{test,is_nil,{f,Tf},[fetch_var(V, Bef)]}] ++ Bis,Aft,St1}.
-
-select_binary(#l{ke={val_clause,{old_binary,Var},B}}=L,
-	      V, Tf, Vf, Bef, St) ->
-    %% Currently handled in the same way as new binaries.
-    select_binary(L#l{ke={val_clause,{binary,Var},B}}, V, Tf, Vf, Bef, St);
-select_binary(#l{ke={val_clause,{binary,{var,Ivar}},B},i=I,vdb=Vdb},
-	      V, Tf, Vf, Bef, St0) ->
-    Int0 = clear_dead(Bef, I, Vdb),
-    {Bis,Aft,St1} = match_cg(B, Vf, Int0, St0),
-    {[{test,bs_start_match,{f,Tf},[fetch_var(V, Bef)]},{bs_save,Ivar}|Bis],
-     Aft,St1}.
-
-select_bin_segs(Scs, Ivar, Tf, _Vf, Bef, St) ->
-    match_fmf(fun(S, Fail, Sta) ->
-		      select_bin_seg(S, Ivar, Fail, Bef, Sta) end,
-	      Tf, St, Scs).
-
-select_bin_seg(#l{ke={val_clause,{bin_seg,Size,U,T,Fs,Es},B},i=I,vdb=Vdb},
-		   Ivar, Fail, Bef, St0) ->
-    {Mis,Int,St1} = select_extract_bin(Es, Size, U, T, Fs, Fail,
-				       I, Vdb, Bef, St0),
-    {Bis,Aft,St2} = match_cg(B, Fail, Int, St1),
-    {[{bs_restore,Ivar}|Mis] ++ Bis,Aft,St2}.
-
-select_extract_bin([{var,Hd},{var,Tl}], Size0, Unit, Type, Flags, Vf,
-		   I, Vdb, Bef, St) ->
-    SizeReg = get_bin_size_reg(Size0, Bef),
-    {Es,Aft} =
-	case vdb_find(Hd, Vdb) of
-	    {_,_,Lhd} when Lhd =< I ->
-		{[{test,bs_skip_bits,{f,Vf},[SizeReg,Unit,{field_flags,Flags}]},
-		  {bs_save,Tl}],Bef};
-	    {_,_,_} ->
-		Reg0 = put_reg(Hd, Bef#sr.reg),
-		Int1 = Bef#sr{reg=Reg0},
-		Rhd = fetch_reg(Hd, Reg0),
-		Name = get_bits_instr(Type),
-		{[{test,Name,{f,Vf},[SizeReg,Unit,{field_flags,Flags},Rhd]},
-		  {bs_save,Tl}],Int1}
-	end,
-    {Es,clear_dead(Aft, I, Vdb),St}.
-
-get_bin_size_reg({var,V}, Bef) ->
-    fetch_var(V, Bef);
-get_bin_size_reg(Literal, _Bef) ->
-    Literal.
-
-select_bin_end(#l{ke={val_clause,bin_end,B}},
-		   Ivar, Tf, Vf, Bef, St0) ->
-    {Bis,Aft,St2} = match_cg(B, Vf, Bef, St0),
-    {[{bs_restore,Ivar},{test,bs_test_tail,{f,Tf},[0]}|Bis],Aft,St2}.
-    
-get_bits_instr(integer) -> bs_get_integer;
-get_bits_instr(float)   -> bs_get_float;
-get_bits_instr(binary)  -> bs_get_binary.
-
-select_val(#l{ke={val_clause,{tuple,Es},B},i=I,vdb=Vdb}, V, Vf, Bef, St0) ->
-    {Eis,Int,St1} = select_extract_tuple(V, Es, I, Vdb, Bef, St0),
-    {Bis,Aft,St2} = match_cg(B, Vf, Int, St1),
-    {length(Es),Eis ++ Bis,Aft,St2};
-select_val(#l{ke={val_clause,{_,Val},B}}, _V, Vf, Bef, St0) ->
-    {Bis,Aft,St1} = match_cg(B, Vf, Bef, St0),
-    {Val,Bis,Aft,St1}.
-
-%% select_extract_tuple(Src, [V], I, Vdb, StackReg, State) ->
-%%      {[E],StackReg,State}.
-%%  Extract tuple elements, but only if they do not immediately die.
-
-select_extract_tuple(Src, Vs, I, Vdb, Bef, St) ->
-    F = fun ({var,V}, {Int0,Elem}) ->
-		case vdb_find(V, Vdb) of
-		    {V,_,L} when L =< I -> {[], {Int0,Elem+1}};
-		    _Other ->
-			Reg1 = put_reg(V, Int0#sr.reg),
-			Int1 = Int0#sr{reg=Reg1},
-			Rsrc = fetch_var(Src, Int1),
-			{[{get_tuple_element,Rsrc,Elem,fetch_reg(V, Reg1)}],
-			 {Int1,Elem+1}}
-		end
-	end,
-    {Es,{Aft,_}} = flatmapfoldl(F, {Bef,0}, Vs),
-    {Es,Aft,St}.
-
-select_extract_cons(Src, [{var,Hd}, {var,Tl}], I, Vdb, Bef, St) ->
-    {Es,Aft} = case {vdb_find(Hd, Vdb), vdb_find(Tl, Vdb)} of
-		   {{_,_,Lhd}, {_,_,Ltl}} when Lhd =< I, Ltl =< I ->
-		       %% Both head and tail are dead.  No need to generate
-		       %% any instruction.
-		       {[], Bef};
-		   _ ->
-		       %% At least one of head and tail will be used,
-		       %% but we must always fetch both.  We will call
-		       %% clear_dead/2 to allow reuse of the register
-		       %% in case only of them is used.
-
-		       Reg0 = put_reg(Tl, put_reg(Hd, Bef#sr.reg)),
-		       Int0 = Bef#sr{reg=Reg0},
-		       Rsrc = fetch_var(Src, Int0),
-		       Rhd = fetch_reg(Hd, Reg0),
-		       Rtl = fetch_reg(Tl, Reg0),
-		       Int1 = clear_dead(Int0, I, Vdb),
-		       {[{get_list,Rsrc,Rhd,Rtl}], Int1}
-	       end,
-    {Es,Aft,St}.
-    
-
-guard_clause_cg(#l{ke={guard_clause,G,B},vdb=Vdb}, Fail, Bef, St0) ->
-    {Gis,Int,St1} = guard_cg(G, Fail, Vdb, Bef, St0),
-    {Bis,Aft,St2} = match_cg(B, Fail, Int, St1),
-    {Gis ++ Bis,Aft,St2}.
-
-%% guard_cg(Guard, Fail, Vdb, StackReg, State) ->
-%%      {[Ainstr],StackReg,State}.
-%%  A guard is a boolean expression of tests.  Tests return true or
-%%  false.  A fault in a test causes the test to return false.  Tests
-%%  never return the boolean, instead we generate jump code to go to
-%%  the correct exit point.  Primops and tests all go to the next
-%%  instruction on success or jump to a failure label.
-
-guard_cg(#l{ke={protected,Ts,Rs},i=I,vdb=Pdb}, Fail, _Vdb, Bef, St) ->
-    protected_cg(Ts, Rs, Fail, I, Pdb, Bef, St);
-guard_cg(#l{ke={block,Ts},i=I,vdb=Bdb}, Fail, _Vdb, Bef, St) ->
-    guard_cg_list(Ts, Fail, I, Bdb, Bef, St);
-guard_cg(#l{ke={test,Test,As},i=I,vdb=_Tdb}, Fail, Vdb, Bef, St) ->
-    test_cg(Test, As, Fail, I, Vdb, Bef, St);
-guard_cg(G, _Fail, Vdb, Bef, St) ->
-    %%ok = io:fwrite("cg ~w: ~p~n", [?LINE,{G,Fail,Vdb,Bef}]),
-    {Gis,Aft,St1} = cg(G, Vdb, Bef, St),
-    %%ok = io:fwrite("cg ~w: ~p~n", [?LINE,{Aft}]),
-    {Gis,Aft,St1}.
-
-%% protected_cg([Kexpr], [Ret], Fail, I, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%%  Do a protected.  Protecteds without return values are just done
-%%  for effect, the return value is not checked, success passes on to
-%%  the next instruction and failure jumps to Fail.  If there are
-%%  return values then these must be set to 'false' on failure,
-%%  control always passes to the next instruction.
-
-protected_cg(Ts, [], Fail, I, Vdb, Bef, St0) ->
-    %% Protect these calls, revert when done.
-    {Tis,Aft,St1} = guard_cg_list(Ts, Fail, I, Vdb, Bef,
-				  St0#cg{btype=fail,bfail=Fail}),
-    {Tis,Aft,St1#cg{btype=St0#cg.btype,bfail=St0#cg.bfail}};
-protected_cg(Ts, Rs, _Fail, I, Vdb, Bef, St0) ->
-    {Pfail,St1} = new_label(St0),
-    {Psucc,St2} = new_label(St1),
-    {Tis,Aft,St3} = guard_cg_list(Ts, Pfail, I, Vdb, Bef,
-				  St2#cg{btype=fail,bfail=Pfail}),
-    %%ok = io:fwrite("cg ~w: ~p~n", [?LINE,{Rs,I,Vdb,Aft}]),
-    %% Set return values to false.
-    Mis = map(fun ({var,V}) -> {move,{atom,false},fetch_var(V, Aft)} end, Rs),
-    Live = {'%live',max_reg(Aft#sr.reg)},
-    {Tis ++ [Live,{jump,{f,Psucc}},
-	     {label,Pfail}] ++ Mis ++ [Live,{label,Psucc}],
-     Aft,St3#cg{btype=St0#cg.btype,bfail=St0#cg.bfail}}.    
-
-%% test_cg(TestName, Args, Fail, I, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%%  Generate test instruction.  Use explicit fail label here.
-
-test_cg(Test, As, Fail, I, Vdb, Bef, St) ->
-    case test_type(Test, length(As)) of
-    	{cond_op,Op} ->
-	    Ars = cg_reg_args(As, Bef),
-	    Int = clear_dead(Bef, I, Vdb),
-	    {[{test,Op,{f,Fail},Ars}],
-	     clear_dead(Int, I, Vdb),
-	     St};
-	{rev_cond_op,Op} ->
-	    [S1,S2] = cg_reg_args(As, Bef),
-	    Int = clear_dead(Bef, I, Vdb),
-	    {[{test,Op,{f,Fail},[S2,S1]}],
-	     clear_dead(Int, I, Vdb),
-	     St}
-    end.
-
-test_type(is_atom, 1)      -> {cond_op,is_atom};
-test_type(is_boolean, 1)   -> {cond_op,is_boolean};
-test_type(is_binary, 1)    -> {cond_op,is_binary};
-test_type(is_constant, 1)  -> {cond_op,is_constant};
-test_type(is_float, 1)     -> {cond_op,is_float};
-test_type(is_function, 1)  -> {cond_op,is_function};
-test_type(is_integer, 1)   -> {cond_op,is_integer};
-test_type(is_list, 1)      -> {cond_op,is_list};
-test_type(is_number, 1)    -> {cond_op,is_number};
-test_type(is_pid, 1)       -> {cond_op,is_pid};
-test_type(is_port, 1)      -> {cond_op,is_port};
-test_type(is_reference, 1) -> {cond_op,is_reference};
-test_type(is_tuple, 1)     -> {cond_op,is_tuple};
-test_type('=<', 2)  -> {rev_cond_op,is_ge};
-test_type('>', 2)   -> {rev_cond_op,is_lt};
-test_type('<', 2)   -> {cond_op,is_lt};
-test_type('>=', 2)  -> {cond_op,is_ge};
-test_type('==', 2)  -> {cond_op,is_eq};
-test_type('/=', 2)  -> {cond_op,is_ne};
-test_type('=:=', 2) -> {cond_op,is_eq_exact};
-test_type('=/=', 2) -> {cond_op,is_ne_exact};
-test_type(internal_is_record, 3) -> {cond_op,internal_is_record}.
-
-%% guard_cg_list([Kexpr], Fail, I, Vdb, StackReg, St) ->
-%%      {[Ainstr],StackReg,St}.
-
-guard_cg_list(Kes, Fail, I, Vdb, Bef, St0) ->
-    {Keis,{Aft,St1}} =
-	flatmapfoldl(fun (Ke, {Inta,Sta}) ->
-			     {Keis,Intb,Stb} =
-				 guard_cg(Ke, Fail, Vdb, Inta, Sta),
-			     {comment(Inta) ++ Keis,{Intb,Stb}}
-		     end, {Bef,St0}, need_heap(Kes, I)),
-    {Keis,Aft,St1}.
-
-%% match_fmf(Fun, LastFail, State, [Clause]) -> {Is,Aft,State}.
-%%  This is a special flatmapfoldl for match code gen where we
-%%  generate a "failure" label for each clause. The last clause uses
-%%  an externally generated failure label, LastFail.  N.B. We do not
-%%  know or care how the failure labels are used.
-
-match_fmf(F, LastFail, St, [H]) ->
-    F(H, LastFail, St);
-match_fmf(F, LastFail, St0, [H|T]) ->
-    {Fail,St1} = new_label(St0),
-    {R,Aft1,St2} = F(H, Fail, St1),
-    {Rs,Aft2,St3} = match_fmf(F, LastFail, St2, T),
-    {R ++ [{label,Fail}] ++ Rs,sr_merge(Aft1, Aft2),St3};
-match_fmf(_, _, St, []) -> {[],void,St}.
-
-%% call_cg(Func, [Arg], [Ret], Le, Vdb, StackReg, State) ->
-%%      {[Ainstr],StackReg,State}.
-%% enter_cg(Func, [Arg], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%%  Call and enter first put the arguments into registers and save any
-%%  other registers, then clean up and compress the stack and set the
-%%  frame size. Finally the actual call is made.  Call then needs the
-%%  return values filled in.
-
-call_cg({var,V}, As, Rs, Le, Vdb, Bef, St0) ->
-    {Sis,Int} = cg_setup_call(As++[{var,V}], Bef, Le#l.i, Vdb),
-    %% Put return values in registers.
-    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
-    %% Build complete code and final stack/register state.
-    Arity = length(As),
-    {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
-    {comment({call_fun,{var,V},As}) ++ Sis ++ Frees ++ [{call_fun,Arity}],
-     Aft,need_stack_frame(St0)};
-call_cg({remote,Mod,Name}, As, Rs, Le, Vdb, Bef, St0)
-  when element(1, Mod) == var;
-       element(1, Name) == var ->
-    {Sis,Int} = cg_setup_call(As++[Mod,Name], Bef, Le#l.i, Vdb),
-    %% Put return values in registers.
-    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
-    %% Build complete code and final stack/register state.
-    Arity = length(As),
-    Call = {apply,Arity},
-    St = need_stack_frame(St0),
-    %%{Call,St1} = build_call(Func, Arity, St0),
-    {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
-    {Sis ++ Frees ++ [Call],Aft,St};
-call_cg(Func, As, Rs, Le, Vdb, Bef, St0) ->
-    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
-    %% Put return values in registers.
-    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
-    %% Build complete code and final stack/register state.
-    Arity = length(As),
-    {Call,St1} = build_call(Func, Arity, St0),
-    {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
-    {comment({call,Func,As}) ++ Sis ++ Frees ++ Call,Aft,St1}.
-
-build_call({remote,{atom,erlang},{atom,'!'}}, 2, St0) ->
-    {[send],need_stack_frame(St0)};
-build_call({remote,{atom,Mod},{atom,Name}}, Arity, St0) ->
-    {[{call_ext,Arity,{extfunc,Mod,Name,Arity}}],need_stack_frame(St0)};
-build_call(Name, Arity, St0) when atom(Name) ->
-    {Lbl,St1} = local_func_label(Name, Arity, need_stack_frame(St0)),
-    {[{call,Arity,{f,Lbl}}],St1}.
-
-free_dead(#sr{stk=Stk0}=Aft) ->
-    {Instr,Stk} = free_dead(Stk0, 0, [], []),
-    {Instr,Aft#sr{stk=Stk}}.
-
-free_dead([dead|Stk], Y, Instr, StkAcc) ->
-    %% Note: kill/1 is equivalent to init/1 (translated by beam_asm).
-    %% We use kill/1 to help further optimisation passes.
-    free_dead(Stk, Y+1, [{kill,{yy,Y}}|Instr], [free|StkAcc]);
-free_dead([Any|Stk], Y, Instr, StkAcc) ->
-    free_dead(Stk, Y+1, Instr, [Any|StkAcc]);
-free_dead([], _, Instr, StkAcc) -> {Instr,reverse(StkAcc)}.
-
-enter_cg({var,V}, As, Le, Vdb, Bef, St0) ->
-    {Sis,Int} = cg_setup_call(As++[{var,V}], Bef, Le#l.i, Vdb),
-    %% Build complete code and final stack/register state.
-    Arity = length(As),
-    {comment({call_fun,{var,V},As}) ++ Sis ++ [{call_fun,Arity},return],
-     clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
-     need_stack_frame(St0)};
-enter_cg({remote,Mod,Name}=Func, As, Le, Vdb, Bef, St0)
-  when element(1, Mod) == var;
-       element(1, Name) == var ->
-    {Sis,Int} = cg_setup_call(As++[Mod,Name], Bef, Le#l.i, Vdb),
-    %% Build complete code and final stack/register state.
-    Arity = length(As),
-    Call = {apply_only,Arity},
-    St = need_stack_frame(St0),
-    {comment({enter,Func,As}) ++ Sis ++ [Call],
-     clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
-     St};
-enter_cg(Func, As, Le, Vdb, Bef, St0) ->
-    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
-    %% Build complete code and final stack/register state.
-    Arity = length(As),
-    {Call,St1} = build_enter(Func, Arity, St0),
-    {comment({enter,Func,As}) ++ Sis ++ Call,
-     clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
-     St1}.
-
-build_enter({remote,{atom,erlang},{atom,'!'}}, 2, St0) ->
-    {[send,return],need_stack_frame(St0)};
-build_enter({remote,{atom,Mod},{atom,Name}}, Arity, St0) ->
-    St1 = case trap_bif(Mod, Name, Arity) of
-	      true -> need_stack_frame(St0);
-	      false -> St0
-	  end,
-    {[{call_ext_only,Arity,{extfunc,Mod,Name,Arity}}],St1};
-build_enter(Name, Arity, St0) when is_atom(Name) ->
-    {Lbl,St1} = local_func_label(Name, Arity, St0),
-    {[{call_only,Arity,{f,Lbl}}],St1}.
-
-%% local_func_label(Name, Arity, State) -> {Label,State'}
-%%  Get the function entry label for a local function.
-
-local_func_label(Name, Arity, St0) ->
-    Key = {Name,Arity},
-    case keysearch(Key, 1, St0#cg.functable) of
-  	{value,{Key,Label}} ->
-	    {Label,St0};
-  	false ->
-  	    {Label,St1} = new_label(St0),
-	    {Label,St1#cg{functable=[{Key,Label}|St1#cg.functable]}}
-    end.
-
-%% need_stack_frame(State) -> State'
-%%  Make a note in the state that this function will need a stack frame.
-
-need_stack_frame(#cg{need_frame=true}=St) -> St;
-need_stack_frame(St) -> St#cg{need_frame=true}.
-
-%% trap_bif(Mod, Name, Arity) -> true|false
-%%   Trap bifs that need a stack frame.
-
-trap_bif(erlang, '!', 2) -> true;
-trap_bif(erlang, link, 1) -> true;
-trap_bif(erlang, unlink, 1) -> true;
-trap_bif(erlang, monitor_node, 2) -> true;
-trap_bif(erlang, group_leader, 2) -> true;
-trap_bif(erlang, exit, 2) -> true;
-trap_bif(_, _, _) -> false.
-
-%% bif_cg(Bif, [Arg], [Ret], Le, Vdb, StackReg, State) ->
-%%      {[Ainstr],StackReg,State}.
-
-bif_cg(dsetelement, [Index0,Tuple0,New0], _Rs, Le, Vdb, Bef, St0) ->
-    [New,Tuple,{integer,Index1}] = cg_reg_args([New0,Tuple0,Index0], Bef),
-    Index = Index1-1,
-    {[{set_tuple_element,New,Tuple,Index}],
-     clear_dead(Bef, Le#l.i, Vdb), St0};
-bif_cg({make_fun,Func,Arity,Index,Uniq}, As, Rs, Le, Vdb, Bef, St0) ->
-    %% This behaves more like a function call.
-    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
-    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
-    {FuncLbl,St1} = local_func_label(Func, Arity, St0),
-    MakeFun = case St0#cg.new_funs of
-		  true -> {make_fun2,{f,FuncLbl},Index,Uniq,length(As)};
-		  false -> {make_fun,{f,FuncLbl},Uniq,length(As)}
-	      end,
-    {comment({make_fun,{Func,Arity,Uniq},As}) ++ Sis ++
-     [MakeFun],
-     clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb),
-     St1};
-bif_cg(Bif, As, [{var,V}], Le, Vdb, Bef, St0) ->
-    Ars = cg_reg_args(As, Bef),
-
-    %% If we are inside a catch, we must save everything that will
-    %% be alive after the catch (because the BIF might fail and there
-    %% will be a jump to the code after the catch).
-    %%   Currently, we are somewhat pessimistic in
-    %% that we save any variable that will be live after this BIF call.
-
-    {Sis,Int0} =
-	case St0#cg.in_catch of
-	    true -> adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb);
-	    false -> {[],Bef}
-	end,
-
-    Int1 = clear_dead(Int0, Le#l.i, Vdb),
-    Reg = put_reg(V, Int1#sr.reg),
-    Int = Int1#sr{reg=Reg},
-    Dst = fetch_reg(V, Reg),
-    {Sis ++ [{bif,Bif,bif_fail(St0#cg.btype, St0#cg.bfail, length(Ars)),Ars,Dst}],
-     clear_dead(Int, Le#l.i, Vdb), St0}.
-
-bif_fail(_, _, 0) -> nofail;
-bif_fail(exit, _, _) -> {f,0};
-bif_fail(fail, Fail, _) -> {f,Fail}.
-
-%% recv_loop_cg(TimeOut, ReceiveVar, ReceiveMatch, TimeOutExprs,
-%%              [Ret], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-
-recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, Vdb, Bef, St0) ->
-    {Sis,Int0} = adjust_stack(Bef, Le#l.i, Le#l.i, Vdb),
-    Int1 = Int0#sr{reg=clear_regs(Int0#sr.reg)},
-    %% Get labels.
-    {Rl,St1} = new_label(St0),
-    {Tl,St2} = new_label(St1),
-    {Bl,St3} = new_label(St2),
-    St4 = St3#cg{break=Bl,recv=Rl},		%Set correct receive labels
-    {Ris,Raft,St5} = cg_recv_mesg(Rvar, Rm, Tl, Int1, St4),
-    {Wis,Taft,St6} = cg_recv_wait(Te, Tes, Le#l.i, Int1, St5),
-    Int2 = sr_merge(Raft, Taft),		%Merge stack/registers
-    Reg = load_vars(Rs, Int2#sr.reg),
-    {Sis ++ Ris ++ [{label,Tl}] ++ Wis ++ [{label,Bl}],
-     clear_dead(Int2#sr{reg=Reg}, Le#l.i, Vdb),
-     St6#cg{break=St0#cg.break,recv=St0#cg.recv}}.
-
-%% cg_recv_mesg( ) -> {[Ainstr],Aft,St}.
-
-cg_recv_mesg({var,R}, Rm, Tl, Bef, St0) ->
-    Int0 = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
-    Ret = fetch_reg(R, Int0#sr.reg),
-    %% Int1 = clear_dead(Int0, I, Rm#l.vdb),
-    Int1 = Int0,
-    {Mis,Int2,St1} = match_cg(Rm, none, Int1, St0),
-    {[{'%live',0},{label,St1#cg.recv},{loop_rec,{f,Tl},Ret}|Mis],Int2,St1}.
-
-%% cg_recv_wait(Te, Tes, I, Vdb, Int2, St3) -> {[Ainstr],Aft,St}.
-
-cg_recv_wait({atom,infinity}, Tes, I, Bef, St0) ->
-    %% We know that the 'after' body will never be executed.
-    %% But to keep the stack and register information up to date,
-    %% we will generate the code for the 'after' body, and then discard it.
-    Int1 = clear_dead(Bef, I, Tes#l.vdb),
-    {_,Int2,St1} = cg_block(Tes#l.ke, Tes#l.i, Tes#l.vdb,
-			      Int1#sr{reg=clear_regs(Int1#sr.reg)}, St0),
-    {[{wait,{f,St1#cg.recv}}],Int2,St1};
-cg_recv_wait({integer,0}, Tes, _I, Bef, St0) ->
-    {Tis,Int,St1} = cg_block(Tes#l.ke, Tes#l.i, Tes#l.vdb, Bef, St0),
-    {[timeout|Tis],Int,St1};
-cg_recv_wait(Te, Tes, I, Bef, St0) ->
-    Reg = cg_reg_arg(Te, Bef),
-    %% Must have empty registers here!  Bug if anything in registers.
-    Int0 = clear_dead(Bef, I, Tes#l.vdb),
-    {Tis,Int,St1} = cg_block(Tes#l.ke, Tes#l.i, Tes#l.vdb,
-			     Int0#sr{reg=clear_regs(Int0#sr.reg)}, St0),
-    {[{wait_timeout,{f,St1#cg.recv},Reg},timeout] ++ Tis,Int,St1}.
-
-%% recv_next_cg(Le, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
-%%  Use adjust stack to clear stack, but only need it for Aft.
-
-recv_next_cg(Le, Vdb, Bef, St) ->
-    {Sis,Aft} = adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb),
-    {[{loop_rec_end,{f,St#cg.recv}}] ++ Sis,Aft,St}.	%Joke
-
-%% try_cg(TryBlock, [BodyVar], TryBody, [ExcpVar], TryHandler, [Ret],
-%%        Le, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
-
-try_cg(Ta, Vs, Tb, Evs, Th, Rs, Le, Vdb, Bef, St0) ->
-    {B,St1} = new_label(St0),			%Body label
-    {H,St2} = new_label(St1),			%Handler label
-    {E,St3} = new_label(St2),			%End label
-    TryTag = Ta#l.i,
-    Int1 = Bef#sr{stk=put_catch(TryTag, Bef#sr.stk)},
-    TryReg = fetch_stack({catch_tag,TryTag}, Int1#sr.stk),
-    {Ais,Int2,St4} = cg(Ta, Vdb, Int1, St3#cg{break=B,in_catch=true}),
-    Int3 = Int2#sr{stk=drop_catch(TryTag, Int2#sr.stk)},
-    St5 = St4#cg{break=E,in_catch=St3#cg.in_catch},
-    {Bis,Baft,St6} = cg(Tb, Vdb, Int3#sr{reg=load_vars(Vs, Int3#sr.reg)}, St5),
-    {His,Haft,St7} = cg(Th, Vdb, Int3#sr{reg=load_vars(Evs, Int3#sr.reg)}, St6),
-    Int4 = sr_merge(Baft, Haft),		%Merge stack/registers
-    Aft = Int4#sr{reg=load_vars(Rs, Int4#sr.reg)},
-    {[{'try',TryReg,{f,H}}] ++ Ais ++ 
-     [{label,B},{try_end,TryReg}] ++ Bis ++
-     [{label,H},{try_case,TryReg}] ++ His ++
-     [{label,E}],
-     clear_dead(Aft, Le#l.i, Vdb),
-     St7#cg{break=St0#cg.break}}.     
-
-%% catch_cg(CatchBlock, Ret, Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-
-catch_cg(C, {var,R}, Le, Vdb, Bef, St0) ->
-    {B,St1} = new_label(St0),
-    CatchTag = Le#l.i,
-    Int1 = Bef#sr{stk=put_catch(CatchTag, Bef#sr.stk)},
-    CatchReg = fetch_stack({catch_tag,CatchTag}, Int1#sr.stk),
-    {Cis,Int2,St2} = cg_block(C, Le#l.i, Le#l.vdb, Int1,
-			      St1#cg{break=B,in_catch=true}),
-    Aft = Int2#sr{reg=load_reg(R, 0, Int2#sr.reg),
-		  stk=drop_catch(CatchTag, Int2#sr.stk)},
-    {[{'catch',CatchReg,{f,B}}] ++ Cis ++
-     [{label,B},{catch_end,CatchReg}],
-     clear_dead(Aft, Le#l.i, Vdb),
-     St2#cg{break=St1#cg.break,in_catch=St1#cg.in_catch}}.
-
-%% set_cg([Var], Constr, Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%%  We have to be careful how a 'set' works. First the structure is
-%%  built, then it is filled and finally things can be cleared. The
-%%  annotation must reflect this and make sure that the return
-%%  variable is allocated first.
-%%
-%%  put_list for constructing a cons is an atomic instruction
-%%  which can safely resuse one of the source registers as target.
-%%  Also binaries can reuse a source register as target.
-
-set_cg([{var,R}], {cons,Es}, Le, Vdb, Bef, St) ->
-    [S1,S2] = map(fun ({var,V}) -> fetch_var(V, Bef);
-		      (Other) -> Other
-		  end, Es),
-    Int0 = clear_dead(Bef, Le#l.i, Vdb),
-    Int1 = Int0#sr{reg=put_reg(R, Int0#sr.reg)},
-    Ret = fetch_reg(R, Int1#sr.reg),
-    {[{put_list,S1,S2,Ret}], Int1, St};
-set_cg([{var,R}], {old_binary,Segs}, Le, Vdb, Bef, St) ->
-    Fail = bif_fail(St#cg.btype, St#cg.bfail, 42),
-    PutCode = cg_bin_put(Segs, Fail, Bef),
-    Code = cg_binary_old(PutCode),
-    Int0 = clear_dead(Bef, Le#l.i, Vdb),
-    Aft = Int0#sr{reg=put_reg(R, Int0#sr.reg)},
-    Ret = fetch_reg(R, Aft#sr.reg),
-    {Code ++ [{bs_final,Fail,Ret}],Aft,St};
-set_cg([{var,R}], {binary,Segs}, Le, Vdb, Bef, #cg{in_catch=InCatch}=St) ->
-    Int0 = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
-    Target = fetch_reg(R, Int0#sr.reg),
-    Fail = bif_fail(St#cg.btype, St#cg.bfail, 42),
-    Temp = find_scratch_reg(Int0#sr.reg),
-    PutCode = cg_bin_put(Segs, Fail, Bef),
-    {Sis,Int1} =
-	case InCatch of
-	    true -> adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb);
-	    false -> {[],Int0}
-	end,
-    Aft = clear_dead(Int1, Le#l.i, Vdb),
-    Code = cg_binary(PutCode, Target, Temp, Fail, Aft),
-    {Sis++Code,Aft,St};
-set_cg([{var,R}], Con, Le, Vdb, Bef, St) ->
-    %% Find a place for the return register first.
-    Int = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
-    Ret = fetch_reg(R, Int#sr.reg),
-    Ais = case Con of
-	      {tuple,Es} ->
-		  [{put_tuple,length(Es),Ret}] ++ cg_build_args(Es, Bef);
-	      {var,V} ->			% Normally removed by kernel optimizer.
-		  [{move,fetch_var(V, Int),Ret}];
-	      {string,Str} ->
-		  [{put_string,length(Str),{string,Str},Ret}];
-	      Other ->
-		  [{move,Other,Ret}]
-	  end,
-    {Ais,clear_dead(Int, Le#l.i, Vdb),St};
-set_cg([], {binary,Segs}, Le, Vdb, Bef, St) ->
-    Fail = bif_fail(St#cg.btype, St#cg.bfail, 42),
-    Target = find_scratch_reg(Bef#sr.reg),
-    Temp = find_scratch_reg(put_reg(Target, Bef#sr.reg)),
-    PutCode = cg_bin_put(Segs, Fail, Bef),
-    Code = cg_binary(PutCode, Target, Temp, Fail, Bef),
-    Aft = clear_dead(Bef, Le#l.i, Vdb),
-    {Code,Aft,St};
-set_cg([], {old_binary,Segs}, Le, Vdb, Bef, St) ->
-    Fail = bif_fail(St#cg.btype, St#cg.bfail, 42),
-    PutCode = cg_bin_put(Segs, Fail, Bef),
-    Ais0 = cg_binary_old(PutCode),
-    Ret = find_scratch_reg(Bef#sr.reg),
-    Ais = Ais0 ++ [{bs_final,Fail,Ret}],
-    {Ais,clear_dead(Bef, Le#l.i, Vdb),St};
-set_cg([], _, Le, Vdb, Bef, St) ->
-    %% This should have been stripped by compiler, just cleanup.
-    {[],clear_dead(Bef, Le#l.i, Vdb), St}.
-
-
-%%%
-%%% Code generation for constructing binaries.
-%%%
-
-cg_binary(PutCode, Target, Temp, Fail, Bef) ->
-    SzCode = cg_binary_size(PutCode, Target, Temp, Fail),
-    MaxRegs = max_reg(Bef#sr.reg),
-    Code = SzCode ++ [{bs_init2,Fail,Target,MaxRegs,{field_flags,[]},Target}|PutCode],
-    cg_bin_opt(Code).
-
-cg_binary_size(PutCode, Target, Temp, Fail) ->
-    Szs = cg_binary_size_1(PutCode, 0, []),
-    cg_binary_size_expr(Szs, Target, Temp, Fail).
-
-cg_binary_size_1([{_Put,_Fail,S,U,_Flags,Src}|T], Bits, Acc) ->
-    cg_binary_size_2(S, U, Src, T, Bits, Acc);
-cg_binary_size_1([], Bits, Acc) ->
-    Bytes = Bits div 8,
-    RemBits = Bits rem 8,
-    Res = sort([{1,{integer,RemBits}},{8,{integer,Bytes}}|Acc]),
-    cg_binary_size_3(Res).
-
-cg_binary_size_2({integer,N}, U, _, Next, Bits, Acc) ->
-    cg_binary_size_1(Next, Bits+N*U, Acc);
-cg_binary_size_2({atom,all}, 8, E, Next, Bits, Acc) ->
-    cg_binary_size_1(Next, Bits, [{8,{size,E}}|Acc]);
-cg_binary_size_2(Reg, 1, _, Next, Bits, Acc) ->
-    cg_binary_size_1(Next, Bits, [{1,Reg}|Acc]);
-cg_binary_size_2(Reg, 8, _, Next, Bits, Acc) ->
-    cg_binary_size_1(Next, Bits, [{8,Reg}|Acc]);
-cg_binary_size_2(Reg, U, _, Next, Bits, Acc) ->
-    cg_binary_size_1(Next, Bits, [{1,{'*',Reg,U}}|Acc]).
-
-cg_binary_size_3([{_,{integer,0}}|T]) ->
-    cg_binary_size_3(T);
-cg_binary_size_3([{U,S1},{U,S2}|T]) ->
-    {L0,Rest} = cg_binary_size_4(T, U, []),
-    L = [S1,S2|L0],
-    [{U,L}|cg_binary_size_3(Rest)];
-cg_binary_size_3([{U,S}|T]) ->
-    [{U,[S]}|cg_binary_size_3(T)];
-cg_binary_size_3([]) -> [].
-
-cg_binary_size_4([{U,S}|T], U, Acc) ->
-    cg_binary_size_4(T, U, [S|Acc]);
-cg_binary_size_4(T, _, Acc) ->
-    {Acc,T}.
-
-%% cg_binary_size_expr/4
-%%  Generate code for calculating the resulting size of a binary.
-cg_binary_size_expr(Sizes, Target, Temp, Fail) ->
-    cg_binary_size_expr_1(Sizes, Target, Temp, Fail,
-			  [{move,{integer,0},Target}]).
-
-cg_binary_size_expr_1([{1,E0}|T], Target, Temp, Fail, Acc) ->
-    E1 = cg_gen_binsize(E0, Target, Temp, Fail, Acc),
-    E = [{bs_bits_to_bytes,Fail,Target,Target}|E1],
-    cg_binary_size_expr_1(T, Target, Temp, Fail, E);
-cg_binary_size_expr_1([{8,E0}], Target, Temp, Fail, Acc) ->
-    E = cg_gen_binsize(E0, Target, Temp, Fail, Acc),
-    reverse(E);
-cg_binary_size_expr_1([], _, _, _, Acc) -> reverse(Acc).
-
-cg_gen_binsize([{'*',A,B}|T], Target, Temp, Fail, Acc) ->
-    cg_gen_binsize(T, Target, Temp, Fail,
-		   [{bs_add,Fail,[Target,A,B],Target}|Acc]);
-cg_gen_binsize([{size,B}|T], Target, Temp, Fail, Acc) ->
-    cg_gen_binsize([Temp|T], Target, Temp, Fail,
-		   [{bif,size,Fail,[B],Temp}|Acc]);
-cg_gen_binsize([E0|T], Target, Temp, Fail, Acc) ->
-    cg_gen_binsize(T, Target, Temp, Fail,
-		   [{bs_add,Fail,[Target,E0,1],Target}|Acc]);
-cg_gen_binsize([], _, _, _, Acc) -> Acc.
-
-%% cg_bin_opt(Code0) -> Code
-%%  Optimize the size calculations for binary construction.
-
-cg_bin_opt([{move,{integer,0},D},{bs_add,_,[D,{integer,_}=S,1],Dst}|Is]) ->
-    cg_bin_opt([{move,S,Dst}|Is]);
-cg_bin_opt([{move,{integer,0},D},{bs_add,Fail,[D,S,U],Dst}|Is]) ->
-    cg_bin_opt([{bs_add,Fail,[{integer,0},S,U],Dst}|Is]);
-cg_bin_opt([{move,{integer,Bytes},D},{bs_init2,Fail,D,Regs0,Flags,D}|Is]) ->
-    Regs = cg_bo_newregs(Regs0, D),
-    cg_bin_opt([{bs_init2,Fail,Bytes,Regs,Flags,D}|Is]);
-cg_bin_opt([{move,Src,D},{bs_init2,Fail,D,Regs0,Flags,D}|Is]) ->
-    Regs = cg_bo_newregs(Regs0, D),
-    cg_bin_opt([{bs_init2,Fail,Src,Regs,Flags,D}|Is]);
-cg_bin_opt([{move,Src,Dst},{bs_bits_to_bytes,Fail,Dst,Dst}|Is]) ->
-    cg_bin_opt([{bs_bits_to_bytes,Fail,Src,Dst}|Is]);
-cg_bin_opt([{move,Src1,Dst},{bs_add,Fail,[Dst,Src2,U],Dst}|Is]) ->
-    cg_bin_opt([{bs_add,Fail,[Src1,Src2,U],Dst}|Is]);
-cg_bin_opt([{bs_bits_to_bytes,Fail,{integer,N},_}|Is0]) when N rem 8 =/= 0 ->
-    case Fail of
-	{f,0} ->
-	    Is = [{move,{atom,badarg},{x,0}},
-		  {call_ext_only,1,{extfunc,erlang,error,1}}|Is0],
-	    cg_bin_opt(Is);
-	_ ->
-	    cg_bin_opt([{jump,Fail}|Is0])
-    end;
-cg_bin_opt([I|Is]) ->
-    [I|cg_bin_opt(Is)];
-cg_bin_opt([]) -> [].
-
-cg_bo_newregs(R, {x,X}) when R-1 =:= X -> R-1;
-cg_bo_newregs(R, _) -> R.
-
-%% Common for new and old binary code generation.
-
-cg_bin_put({bin_seg,S0,U,T,Fs,[E0,Next]}, Fail, Bef) ->
-    S1 = case S0 of
-	     {var,Sv} -> fetch_var(Sv, Bef);
-	     _ -> S0
-	 end,
-    E1 = case E0 of
-	     {var,V} -> fetch_var(V, Bef);
-	     Other ->   Other
-	 end,
-    Op = case T of
-	     integer -> bs_put_integer;
-	     binary  -> bs_put_binary;
-	     float   -> bs_put_float
-	 end,
-    [{Op,Fail,S1,U,{field_flags,Fs},E1}|cg_bin_put(Next, Fail, Bef)];
-cg_bin_put(bin_end, _, _) -> [].
-
-%% Old style.
-
-cg_binary_old(PutCode) ->
-    [cg_bs_init(PutCode)] ++ need_bin_buf(PutCode).
-
-cg_bs_init(Code) ->
-    {Size,Fs} = foldl(fun ({_,_,{integer,N},U,_,_}, {S,Fs}) ->
-			      {S + N*U,Fs};
-			  (_, {S,_}) ->
-			      {S,[]}
-		      end, {0,[exact]}, Code),
-    {bs_init,(Size+7) div 8,{field_flags,Fs}}.
-
-need_bin_buf(Code0) ->
-    {Code1,F,H} = foldr(fun ({_,_,{integer,N},U,_,_}=Bs, {Code,F,H}) ->
-				{[Bs|Code],F,H + N*U};
-			    ({_,_,_,_,_,_}=Bs, {Code,F,H}) ->
-				{[Bs|need_bin_buf_need(H, F, Code)],true,0}
-			end, {[],false,0}, Code0),
-    need_bin_buf_need(H, F, Code1).
-
-need_bin_buf_need(0, false, Rest) -> Rest;
-need_bin_buf_need(H, _, Rest) -> [{bs_need_buf,H}|Rest].
-
-cg_build_args(As, Bef) ->
-    map(fun ({var,V}) -> {put,fetch_var(V, Bef)};
-	    (Other) -> {put,Other}
-	end, As).
-
-%% return_cg([Val], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%% break_cg([Val], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%%  These are very simple, just put return/break values in registers
-%%  from 0, then return/break.  Use the call setup to clean up stack,
-%%  but must clear registers to ensure sr_merge works correctly.
-
-return_cg(Rs, Le, Vdb, Bef, St) ->
-    {Ms,Int} = cg_setup_call(Rs, Bef, Le#l.i, Vdb),
-    {comment({return,Rs}) ++ Ms ++ [return],
-     Int#sr{reg=clear_regs(Int#sr.reg)},St}.
-
-break_cg(Bs, Le, Vdb, Bef, St) ->
-    {Ms,Int} = cg_setup_call(Bs, Bef, Le#l.i, Vdb),
-    {comment({break,Bs}) ++ Ms ++ [{jump,{f,St#cg.break}}],
-     Int#sr{reg=clear_regs(Int#sr.reg)},St}.
-
-%% cg_reg_arg(Arg0, Info) -> Arg
-%% cg_reg_args([Arg0], Info) -> [Arg]
-%%  Convert argument[s] into registers. Literal values are returned unchanged.
-
-cg_reg_args(As, Bef) -> [cg_reg_arg(A, Bef) || A <- As].
-
-cg_reg_arg({var,V}, Bef) -> fetch_var(V, Bef);
-cg_reg_arg(Literal, _) -> Literal.
-
-%% cg_setup_call([Arg], Bef, Cur, Vdb) -> {[Instr],Aft}.
-%%  Do the complete setup for a call/enter.
-
-cg_setup_call(As, Bef, I, Vdb) ->
-    {Ms,Int0} = cg_call_args(As, Bef, I, Vdb),
-    %% Have set up arguments, can now clean up, compress and save to stack.
-    Int1 = Int0#sr{stk=clear_dead_stk(Int0#sr.stk, I, Vdb),res=[]},
-    {Sis,Int2} = adjust_stack(Int1, I, I+1, Vdb),
-    {Ms ++ Sis ++ [{'%live',length(As)}],Int2}.
-
-%% cg_call_args([Arg], SrState) -> {[Instr],SrState}.
-%%  Setup the arguments to a call/enter/bif. Put the arguments into
-%%  consecutive registers starting at {x,0} moving any data which
-%%  needs to be saved. Return a modified SrState structure with the
-%%  new register contents.  N.B. the resultant register info will
-%%  contain non-variable values when there are non-variable values.
-%%
-%%  This routine is complicated by unsaved values in x registers.
-%%  We'll move away any unsaved values that are in the registers
-%%  to be overwritten by the arguments.
-
-cg_call_args(As, Bef, I, Vdb) ->
-    Regs0 = load_arg_regs(Bef#sr.reg, As),
-    Unsaved = unsaved_registers(Regs0, Bef#sr.stk, I, I+1, Vdb),
-    {UnsavedMoves,Regs} = move_unsaved(Unsaved, Bef#sr.reg, Regs0),
-    Moves0 = gen_moves(As, Bef),
-    Moves = order_moves(Moves0, find_scratch_reg(Regs)),
-    {UnsavedMoves ++ Moves,Bef#sr{reg=Regs}}.
-
-%% load_arg_regs([Reg], Arguments) -> [Reg]
-%%  Update the register descriptor to include the arguments (from {x,0}
-%%  and upwards). Values in argument register are overwritten.
-%%  Values in x registers above the arguments are preserved.
-
-load_arg_regs(Regs, As) -> load_arg_regs(Regs, As, 0).
-
-load_arg_regs([_|Rs], [{var,V}|As], I) -> [{I,V}|load_arg_regs(Rs, As, I+1)];
-load_arg_regs([_|Rs], [A|As], I) -> [{I,A}|load_arg_regs(Rs, As, I+1)];
-load_arg_regs([], [{var,V}|As], I) -> [{I,V}|load_arg_regs([], As, I+1)];
-load_arg_regs([], [A|As], I) -> [{I,A}|load_arg_regs([], As, I+1)];
-load_arg_regs(Rs, [], _) -> Rs.
-
-%% Returns the variables must be saved and are currently in the
-%% x registers that are about to be overwritten by the arguments.
-
-unsaved_registers(Regs, Stk, Fb, Lf, Vdb) ->
-    [V || {V,F,L} <- Vdb,
-	  F < Fb,
-	  L >= Lf,
-	  not on_stack(V, Stk),
-	  not in_reg(V, Regs)].
-
-in_reg(V, Regs) -> keymember(V, 2, Regs).
-
-%% Move away unsaved variables from the registers that are to be
-%% overwritten by the arguments.
-move_unsaved(Vs, OrigRegs, NewRegs) ->
-    move_unsaved(Vs, OrigRegs, NewRegs, []).
-    
-move_unsaved([V|Vs], OrigRegs, NewRegs0, Acc) ->
-    NewRegs = put_reg(V, NewRegs0),
-    Src = fetch_reg(V, OrigRegs),
-    Dst = fetch_reg(V, NewRegs),
-    move_unsaved(Vs, OrigRegs, NewRegs, [{move,Src,Dst}|Acc]);
-move_unsaved([], _, Regs, Acc) -> {Acc,Regs}.
-    
-%% gen_moves(As, Sr)
-%%  Generate the basic move instruction to move the arguments
-%%  to their proper registers. The list will be sorted on
-%%  destinations. (I.e. the move to {x,0} will be first --
-%%  see the comment to order_moves/2.)
-
-gen_moves(As, Sr) -> gen_moves(As, Sr, 0, []).
-
-gen_moves([{var,V}|As], Sr, I, Acc) ->
-    case fetch_var(V, Sr) of
-	{x,I} -> gen_moves(As, Sr, I+1, Acc);
-	Reg -> gen_moves(As, Sr, I+1, [{move,Reg,{x,I}}|Acc])
-    end;
-gen_moves([A|As], Sr, I, Acc) ->
-    gen_moves(As, Sr, I+1, [{move,A,{x,I}}|Acc]);
-gen_moves([], _, _, Acc) -> lists:keysort(3, Acc).
-
-%% order_moves([Move], ScratchReg) -> [Move]
-%%  Orders move instruction so that source registers are not
-%%  destroyed before they are used. If there are cycles
-%%  (such as {move,{x,0},{x,1}}, {move,{x,1},{x,1}}),
-%%  the scratch register is used to break up the cycle.
-%%    If possible, the first move of the input list is placed
-%%  last in the result list (to make the move to {x,0} occur
-%%  just before the call to allow the Beam loader to coalesce
-%%  the instructions).
-
-order_moves(Ms, Scr) -> order_moves(Ms, Scr, []).
-
-order_moves([{move,_,_}=M|Ms0], ScrReg, Acc0) ->
-    {Chain,Ms} = collect_chain(Ms0, [M], ScrReg),
-    Acc = reverse(Chain, Acc0),
-    order_moves(Ms, ScrReg, Acc);
-order_moves([], _, Acc) -> Acc.
-
-collect_chain(Ms, Path, ScrReg) ->
-    collect_chain(Ms, Path, [], ScrReg).
-
-collect_chain([{move,Src,Same}=M|Ms0], [{move,Same,_}|_]=Path, Others, ScrReg) ->
-    case keysearch(Src, 3, Path) of
-	{value,_} ->				%We have a cycle.
-	    {break_up_cycle(M, Path, ScrReg),reverse(Others, Ms0)};
-	false ->
-	    collect_chain(reverse(Others, Ms0), [M|Path], [], ScrReg)
-    end;
-collect_chain([M|Ms], Path, Others, ScrReg) ->
-    collect_chain(Ms, Path, [M|Others], ScrReg);
-collect_chain([], Path, Others, _) ->
-    {Path,Others}.
-
-break_up_cycle({move,Src,_}=M, Path, ScrReg) ->
-    [{move,ScrReg,Src},M|break_up_cycle1(Src, Path, ScrReg)].
-
-break_up_cycle1(Dst, [{move,Src,Dst}|Path], ScrReg) ->
-    [{move,Src,ScrReg}|Path];
-break_up_cycle1(Dst, [M|Path], LastMove) ->
-    [M|break_up_cycle1(Dst, Path, LastMove)].
-
-%% clear_dead(Sr, Until, Vdb) -> Aft.
-%%  Remove all variables in Sr which have died AT ALL so far.
-
-clear_dead(Sr, Until, Vdb) ->
-    Sr#sr{reg=clear_dead_reg(Sr, Until, Vdb),
-	  stk=clear_dead_stk(Sr#sr.stk, Until, Vdb)}.
-
-clear_dead_reg(Sr, Until, Vdb) ->
-    Reg = map(fun ({I,V}) ->
-		      case vdb_find(V, Vdb) of
-			  {V,_,L} when L > Until -> {I,V};
-			  _ -> free		%Remove anything else
-		      end;
-		  ({reserved,I,V}) -> {reserved,I,V};
-		  (free) -> free
-	      end, Sr#sr.reg),
-    reserve(Sr#sr.res, Reg, Sr#sr.stk).
-
-clear_dead_stk(Stk, Until, Vdb) ->
-    map(fun ({V}) ->
-		case vdb_find(V, Vdb) of
-		    {V,_,L} when L > Until -> {V};
-		    _ -> dead			%Remove anything else
-		end;
-	    (free) -> free;
-	    (dead) -> dead
-	end, Stk).
-
-%% sr_merge(Sr1, Sr2) -> Sr.
-%%  Merge two stack/register states keeping the longest of both stack
-%%  and register. Perform consistency check on both, elements must be
-%%  the same.  Allow frame size 'void' to make easy creation of
-%%  "empty" frame.
-
-sr_merge(#sr{reg=R1,stk=S1,res=[]}, #sr{reg=R2,stk=S2,res=[]}) ->
-    #sr{reg=longest(R1, R2),stk=longest(S1, S2),res=[]};
-sr_merge(void, S2) -> S2#sr{res=[]};
-sr_merge(S1, void) -> S1#sr{res=[]}.
-
-longest([H|T1], [H|T2]) -> [H|longest(T1, T2)];
-longest([dead|T1], [free|T2]) -> [dead|longest(T1, T2)];
-longest([free|T1], [dead|T2]) -> [dead|longest(T1, T2)];
-longest([dead|T1], []) -> [dead|T1];
-longest([], [dead|T2]) -> [dead|T2];
-longest([free|T1], []) -> [free|T1];
-longest([], [free|T2]) -> [free|T2];
-longest([], []) -> [].
-
-%% adjust_stack(Bef, FirstBefore, LastFrom, Vdb) -> {[Ainstr],Aft}.
-%%  Do complete stack adjustment by compressing stack and adding
-%%  variables to be saved.  Try to optimise ordering on stack by
-%%  having reverse order to their lifetimes.
-%%
-%%  In Beam, there is a fixed stack frame and no need to do stack compression.
-
-adjust_stack(Bef, Fb, Lf, Vdb) ->
-    Stk0 = Bef#sr.stk,
-    {Stk1,Saves} = save_stack(Stk0, Fb, Lf, Vdb),
-    {saves(Saves, Bef#sr.reg, Stk1),
-     Bef#sr{stk=Stk1}}.
-
-%% save_stack(Stack, FirstBefore, LastFrom, Vdb) -> {[SaveVar],NewStack}.
-%%  Save variables which are used past current point and which are not
-%%  already on the stack.
-
-save_stack(Stk0, Fb, Lf, Vdb) ->
-    %% New variables that are in use but not on stack.
-    New = [ {V,F,L} || {V,F,L} <- Vdb,
-		   F < Fb,
-		   L >= Lf,
-		   not on_stack(V, Stk0) ],
-    %% Add new variables that are not just dropped immediately.
-    %% N.B. foldr works backwards from the end!!
-    Saves = [ V || {V,_,_} <- keysort(3, New) ],
-    Stk1 = foldr(fun (V, Stk) -> put_stack(V, Stk) end, Stk0, Saves),
-    {Stk1,Saves}.
-
-%% saves([SaveVar], Reg, Stk) -> [{move,Reg,Stk}].
-%%  Generate move instructions to save variables onto stack.  The
-%%  stack/reg info used is that after the new stack has been made.
-
-saves(Ss, Reg, Stk) ->
-    Res = map(fun (V) ->
-		      {move,fetch_reg(V, Reg),fetch_stack(V, Stk)}
-	      end, Ss),
-    Res.
-
-%% comment(C) -> ['%'{C}].
-
-%comment(C) -> [{'%',C}].
-comment(_) -> [].
-
-%% fetch_var(VarName, StkReg) -> r{R} | sp{Sp}.
-%% find_var(VarName, StkReg) -> ok{r{R} | sp{Sp}} | error.
-%%  Fetch/find a variable in either the registers or on the
-%%  stack. Fetch KNOWS it's there.
-
-fetch_var(V, Sr) ->
-    case find_reg(V, Sr#sr.reg) of
-	{ok,R} -> R;
-	error -> fetch_stack(V, Sr#sr.stk)
-    end.
-
-% find_var(V, Sr) ->
-%     case find_reg(V, Sr#sr.reg) of
-% 	{ok,R} -> {ok,R};
-% 	error ->
-% 	    case find_stack(V, Sr#sr.stk) of
-% 		{ok,S} -> {ok,S};
-% 		error -> error
-% 	    end
-%     end.
-
-load_vars(Vs, Regs) ->
-    foldl(fun ({var,V}, Rs) -> put_reg(V, Rs) end, Regs, Vs).
-
-%% put_reg(Val, Regs) -> Regs.
-%% load_reg(Val, Reg, Regs) -> Regs.
-%% free_reg(Val, Regs) -> Regs.
-%% find_reg(Val, Regs) -> ok{r{R}} | error.
-%% fetch_reg(Val, Regs) -> r{R}.
-%%  Functions to interface the registers.
-%%  put_reg puts a value into a free register,
-%%  load_reg loads a value into a fixed register
-%%  free_reg frees a register containing a specific value.
-
-% put_regs(Vs, Rs) -> foldl(fun put_reg/2, Rs, Vs).
-
-put_reg(V, Rs) -> put_reg_1(V, Rs, 0).
-
-put_reg_1(V, [free|Rs], I) -> [{I,V}|Rs];
-put_reg_1(V, [{reserved,I,V}|Rs], I) -> [{I,V}|Rs];
-put_reg_1(V, [R|Rs], I) -> [R|put_reg_1(V, Rs, I+1)];
-put_reg_1(V, [], I) -> [{I,V}].
-
-load_reg(V, R, Rs) -> load_reg_1(V, R, Rs, 0).
-
-load_reg_1(V, I, [_|Rs], I) -> [{I,V}|Rs];
-load_reg_1(V, I, [R|Rs], C) -> [R|load_reg_1(V, I, Rs, C+1)];
-load_reg_1(V, I, [], I) -> [{I,V}];
-load_reg_1(V, I, [], C) -> [free|load_reg_1(V, I, [], C+1)].
-
-% free_reg(V, [{I,V}|Rs]) -> [free|Rs];
-% free_reg(V, [R|Rs]) -> [R|free_reg(V, Rs)];
-% free_reg(V, []) -> [].
-
-fetch_reg(V, [{I,V}|_]) -> {x,I};
-fetch_reg(V, [_|SRs]) -> fetch_reg(V, SRs).
-
-find_reg(V, [{I,V}|_]) -> {ok,{x,I}};
-find_reg(V, [_|SRs]) -> find_reg(V, SRs);
-find_reg(_, []) -> error.
-
-%% For the bit syntax, we need a scratch register if we are constructing
-%% a binary that will not be used.
-
-find_scratch_reg(Rs) -> find_scratch_reg(Rs, 0).
-    
-find_scratch_reg([free|_], I) -> {x,I};
-find_scratch_reg([_|Rs], I) -> find_scratch_reg(Rs, I+1);
-find_scratch_reg([], I) -> {x,I}.
-
-%%copy_reg(Val, R, Regs) -> load_reg(Val, R, Regs).
-%%move_reg(Val, R, Regs) -> load_reg(Val, R, free_reg(Val, Regs)).
-
-%%clear_regs(Regs) -> map(fun (R) -> free end, Regs).
-clear_regs(_) -> [].
-
-max_reg(Regs) ->
-    foldl(fun ({I,_}, _) -> I;
-	      (_, Max) -> Max end,
-	  -1, Regs) + 1.
-
-%% put_stack(Val, [{Val}]) -> [{Val}].
-%% fetch_stack(Var, Stk) -> sp{S}.
-%% find_stack(Var, Stk) -> ok{sp{S}} | error.
-%%  Functions to interface the stack.
-
-put_stack(Val, []) -> [{Val}];
-put_stack(Val, [dead|Stk]) -> [{Val}|Stk];
-put_stack(Val, [free|Stk]) -> [{Val}|Stk];
-put_stack(Val, [NotFree|Stk]) -> [NotFree|put_stack(Val, Stk)].
-
-put_stack_carefully(Val, Stk0) ->
-    case catch put_stack_carefully1(Val, Stk0) of
-	error -> error;
-	Stk1 when list(Stk1) -> Stk1
-    end.
-
-put_stack_carefully1(_, []) -> throw(error);
-put_stack_carefully1(Val, [dead|Stk]) -> [{Val}|Stk];
-put_stack_carefully1(Val, [free|Stk]) -> [{Val}|Stk];
-put_stack_carefully1(Val, [NotFree|Stk]) ->
-    [NotFree|put_stack_carefully1(Val, Stk)].
-
-fetch_stack(Var, Stk) -> fetch_stack(Var, Stk, 0).
-
-fetch_stack(V, [{V}|_], I) -> {yy,I};
-fetch_stack(V, [_|Stk], I) -> fetch_stack(V, Stk, I+1).
-
-% find_stack(Var, Stk) -> find_stack(Var, Stk, 0).
-
-% find_stack(V, [{V}|Stk], I) -> {ok,{yy,I}};
-% find_stack(V, [O|Stk], I) -> find_stack(V, Stk, I+1);
-% find_stack(V, [], I) -> error.
-
-on_stack(V, Stk) -> keymember(V, 1, Stk).
-
-%% put_catch(CatchTag, Stack) -> Stack'
-%% drop_catch(CatchTag, Stack) -> Stack'
-%%  Special interface for putting and removing catch tags, to ensure that
-%%  catches nest properly. Also used for try tags.
-
-put_catch(Tag, Stk0) -> put_catch(Tag, reverse(Stk0), []).
-
-put_catch(Tag, [], Stk) ->
-    put_stack({catch_tag,Tag}, Stk);
-put_catch(Tag, [{{catch_tag,_}}|_]=RevStk, Stk) ->
-    reverse(RevStk, put_stack({catch_tag,Tag}, Stk));
-put_catch(Tag, [Other|Stk], Acc) ->
-    put_catch(Tag, Stk, [Other|Acc]).
-
-drop_catch(Tag, [{{catch_tag,Tag}}|Stk]) -> [free|Stk];
-drop_catch(Tag, [Other|Stk]) -> [Other|drop_catch(Tag, Stk)].
-
-%%%
-%%% Finish the code generation for the bit syntax matching.
-%%%
-
-bs_function({function,Name,Arity,CLabel,Asm0}=Func) ->
-    case bs_needed(Asm0, 0, false, []) of
-	{false,[]} -> Func;
-	{true,Dict} ->
-	    Asm = bs_replace(Asm0, Dict, []),
-	    {function,Name,Arity,CLabel,Asm}
-    end.
-
-%%%
-%%% Pass 1: Found out which bs_restore's that are needed. For now we assume
-%%% that a bs_restore is needed unless it is directly preceeded by a bs_save.
-%%%
-
-bs_needed([{bs_save,Name},{bs_restore,Name}|T], N, _BsUsed, Dict) ->
-    bs_needed(T, N, true, Dict);
-bs_needed([{bs_save,_Name}|T], N, _BsUsed, Dict) ->
-    bs_needed(T, N, true, Dict);
-bs_needed([{bs_restore,Name}|T], N, _BsUsed, Dict) ->
-    case keysearch(Name, 1, Dict) of
-	{value,{Name,_}} -> bs_needed(T, N, true, Dict);
-	false -> bs_needed(T, N+1, true, [{Name,N}|Dict])
-    end;
-bs_needed([{bs_init,_,_}|T], N, _, Dict) ->
-    bs_needed(T, N, true, Dict);
-bs_needed([{bs_init2,_,_,_,_,_}|T], N, _, Dict) ->
-    bs_needed(T, N, true, Dict);
-bs_needed([{bs_start_match,_,_}|T], N, _, Dict) ->
-    bs_needed(T, N, true, Dict);
-bs_needed([_|T], N, BsUsed, Dict) ->
-    bs_needed(T, N, BsUsed, Dict);
-bs_needed([], _, BsUsed, Dict) -> {BsUsed,Dict}.
-
-%%%
-%%% Pass 2: Only needed if there were some bs_* instructions found.
-%%%
-%%% Remove any bs_save with a name that never were found to be restored
-%%% in the first pass.
-%%%
-
-bs_replace([{bs_save,Name}=Save,{bs_restore,Name}|T], Dict, Acc) ->
-    bs_replace([Save|T], Dict, Acc);
-bs_replace([{bs_save,Name}|T], Dict, Acc) ->
-    case keysearch(Name, 1, Dict) of
-	{value,{Name,N}} ->
-	    bs_replace(T, Dict, [{bs_save,N}|Acc]);
-	false ->
-	    bs_replace(T, Dict, Acc)
-    end;
-bs_replace([{bs_restore,Name}|T], Dict, Acc) ->
-    case keysearch(Name, 1, Dict) of
-	{value,{Name,N}} ->
-	    bs_replace(T, Dict, [{bs_restore,N}|Acc]);
-	false ->
-	    bs_replace(T, Dict, Acc)
-    end;
-bs_replace([{bs_init2,Fail,Bytes,Regs,Flags,Dst}|T0], Dict, Acc) ->
-    case bs_find_test_heap(T0) of
-	none ->
-	    bs_replace(T0, Dict, [{bs_init2,Fail,Bytes,0,Regs,Flags,Dst}|Acc]);
-	{T,Words} ->
-	    bs_replace(T, Dict, [{bs_init2,Fail,Bytes,Words,Regs,Flags,Dst}|Acc])
-    end;
-bs_replace([H|T], Dict, Acc) ->
-    bs_replace(T, Dict, [H|Acc]);
-bs_replace([], _, Acc) -> reverse(Acc).
-
-bs_find_test_heap(Is) ->
-    bs_find_test_heap_1(Is, []).
-
-bs_find_test_heap_1([{bs_put_integer,_,_,_,_,_}=I|Is], Acc) ->
-    bs_find_test_heap_1(Is, [I|Acc]);
-bs_find_test_heap_1([{bs_put_float,_,_,_,_,_}=I|Is], Acc) ->
-    bs_find_test_heap_1(Is, [I|Acc]);
-bs_find_test_heap_1([{bs_put_binary,_,_,_,_,_}=I|Is], Acc) ->
-    bs_find_test_heap_1(Is, [I|Acc]);
-bs_find_test_heap_1([{test_heap,Words,_}|Is], Acc) ->
-    {reverse(Acc, Is),Words};
-bs_find_test_heap_1(_, _) -> none.
-
-%% new_label(St) -> {L,St}.
-
-new_label(St) ->
-    L = St#cg.lcount,
-    {L,St#cg{lcount=L+1}}.
-
-flatmapfoldl(F, Accu0, [Hd|Tail]) ->
-    {R,Accu1} = F(Hd, Accu0),
-    {Rs,Accu2} = flatmapfoldl(F, Accu1, Tail),
-    {R++Rs,Accu2};
-flatmapfoldl(_, Accu, []) -> {[],Accu}.
-
-flatmapfoldr(F, Accu0, [Hd|Tail]) ->
-    {Rs,Accu1} = flatmapfoldr(F, Accu0, Tail),
-    {R,Accu2} = F(Hd, Accu1),
-    {R++Rs,Accu2};
-flatmapfoldr(_, Accu, []) -> {[],Accu}.
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_core.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_core.erl
deleted file mode 100644
index b561182932..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_core.erl
+++ /dev/null
@@ -1,1320 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: v3_core.erl,v 1.1 2008/12/17 09:53:42 mikpe Exp $
-%%
-%% Purpose : Transform normal Erlang to Core Erlang
-
-%% At this stage all preprocessing has been done. All that is left are
-%% "pure" Erlang functions.
-%%
-%% Core transformation is done in three stages:
-%%
-%% 1. Flatten expressions into an internal core form without doing
-%%    matching.
-%%
-%% 2. Step "forwards" over the icore code annotating each "top-level"
-%%    thing with variable usage.  Detect bound variables in matching
-%%    and replace with explicit guard test.  Annotate "internal-core"
-%%    expressions with variables they use and create.  Convert matches
-%%    to cases when not pure assignments.
-%%
-%% 3. Step "backwards" over icore code using variable usage
-%%    annotations to change implicit exported variables to explicit
-%%    returns.
-%%
-%% To ensure the evaluation order we ensure that all arguments are
-%% safe.  A "safe" is basically a core_lib simple with VERY restricted
-%% binaries.
-%%
-%% We have to be very careful with matches as these create variables.
-%% While we try not to flatten things more than necessary we must make
-%% sure that all matches are at the top level.  For this we use the
-%% type "novars" which are non-match expressions.  Cases and receives
-%% can also create problems due to exports variables so they are not
-%% "novars" either.  I.e. a novars will not export variables.
-%%
-%% Annotations in the #iset, #iletrec, and all other internal records
-%% is kept in a record, #a, not in a list as in proper core.  This is
-%% easier and faster and creates no problems as we have complete control
-%% over all annotations.
-%%
-%% On output, the annotation for most Core Erlang terms will contain
-%% the source line number. A few terms will be marked with the atom
-%% atom 'compiler_generated', to indicate that the compiler has generated
-%% them and that no warning should be generated if they are optimized
-%% away.
-%% 
-%%
-%% In this translation:
-%%
-%% call ops are safes
-%% call arguments are safes
-%% match arguments are novars
-%% case arguments are novars
-%% receive timeouts are novars
-%% let/set arguments are expressions
-%% fun is not a safe
-
--module(v3_core).
-
--export([module/2,format_error/1]).
-
--import(lists, [map/2,foldl/3,foldr/3,mapfoldl/3,splitwith/2]).
--import(ordsets, [add_element/2,del_element/2,is_element/2,
-		  union/1,union/2,intersection/2,subtract/2]).
-
--include("core_parse.hrl").
-
--record(a, {us=[],ns=[],anno=[]}).		%Internal annotation
-
-%% Internal core expressions and help functions.
-%% N.B. annotations fields in place as normal Core expressions.
-
--record(iset, {anno=#a{},var,arg}).
--record(iletrec, {anno=#a{},defs,body}).
--record(imatch, {anno=#a{},pat,guard=[],arg,fc}).
--record(icase, {anno=#a{},args,clauses,fc}).
--record(iclause, {anno=#a{},pats,pguard=[],guard,body}).
--record(ifun, {anno=#a{},id,vars,clauses,fc}).
--record(iapply, {anno=#a{},op,args}).
--record(icall, {anno=#a{},module,name,args}).
--record(iprimop, {anno=#a{},name,args}).
--record(itry, {anno=#a{},args,vars,body,evars,handler}).
--record(icatch, {anno=#a{},body}).
--record(ireceive1, {anno=#a{},clauses}).
--record(ireceive2, {anno=#a{},clauses,timeout,action}).
--record(iprotect, {anno=#a{},body}).
--record(ibinary, {anno=#a{},segments}).		%Not used in patterns.
-
--record(core, {vcount=0,			%Variable counter
-	       fcount=0,			%Function counter
-	       ws=[]}).				%Warnings.
-
-module({Mod,Exp,Forms}, _Opts) ->
-    Cexp = map(fun ({N,A}) -> #c_fname{id=N,arity=A} end, Exp),
-    {Kfs,As,Ws} = foldr(fun form/2, {[],[],[]}, Forms),
-    {ok,#c_module{name=#c_atom{val=Mod},exports=Cexp,attrs=As,defs=Kfs},Ws}.
-
-form({function,_,_,_,_}=F0, {Fs,As,Ws0}) ->
-    {F,Ws} = function(F0, Ws0),
-    {[F|Fs],As,Ws};
-form({attribute,_,_,_}=F, {Fs,As,Ws}) ->
-    {Fs,[attribute(F)|As],Ws}.
-
-attribute({attribute,_,Name,Val}) ->
-    #c_def{name=core_lib:make_literal(Name),
-	   val=core_lib:make_literal(Val)}.
-
-function({function,_,Name,Arity,Cs0}, Ws0) ->
-    %%ok = io:fwrite("~p - ", [{Name,Arity}]),
-    St0 = #core{vcount=0,ws=Ws0},
-    {B0,St1} = body(Cs0, Arity, St0),
-    %%ok = io:fwrite("1", []),
-    %%ok = io:fwrite("~w:~p~n", [?LINE,B0]),
-    {B1,St2} = ubody(B0, St1),
-    %%ok = io:fwrite("2", []),
-    %%ok = io:fwrite("~w:~p~n", [?LINE,B1]),
-    {B2,#core{ws=Ws}} = cbody(B1, St2),
-    %%ok = io:fwrite("3~n", []),
-    {#c_def{name=#c_fname{id=Name,arity=Arity},val=B2},Ws}.
-
-body(Cs0, Arity, St0) ->
-    Anno = [element(2, hd(Cs0))],
-    {Args,St1} = new_vars(Anno, Arity, St0),
-    {Cs1,St2} = clauses(Cs0, St1),
-    {Ps,St3} = new_vars(Arity, St2),    %Need new variables here
-    Fc = fail_clause(Ps, #c_tuple{es=[#c_atom{val=function_clause}|Ps]}),
-    {#ifun{anno=#a{anno=Anno},id=[],vars=Args,clauses=Cs1,fc=Fc},St3}.
-
-%% clause(Clause, State) -> {Cclause,State} | noclause.
-%% clauses([Clause], State) -> {[Cclause],State}.
-%%  Convert clauses.  Trap bad pattern aliases and remove clause from
-%%  clause list.
-
-clauses([C0|Cs0], St0) ->
-    case clause(C0, St0) of
-	{noclause,St} -> clauses(Cs0, St);
-	{C,St1} ->
-	    {Cs,St2} = clauses(Cs0, St1),
-	    {[C|Cs],St2}
-    end;
-clauses([], St) -> {[],St}.
-
-clause({clause,Lc,H0,G0,B0}, St0) ->
-    case catch head(H0) of
-	{'EXIT',_}=Exit -> exit(Exit);		%Propagate error
-	nomatch ->
-	    St = add_warning(Lc, nomatch, St0),
-	    {noclause,St};			%Bad pattern
-	H1 ->
-	    {G1,St1} = guard(G0, St0),
-	    {B1,St2} = exprs(B0, St1),
-	    {#iclause{anno=#a{anno=[Lc]},pats=H1,guard=G1,body=B1},St2}
-    end.
-
-%% head([P]) -> [P].
-
-head(Ps) -> pattern_list(Ps).
-
-%% guard([Expr], State) -> {[Cexpr],State}.
-%%  Build an explict and/or tree of guard alternatives, then traverse
-%%  top-level and/or tree and "protect" inner tests.
-
-guard([], St) -> {[],St};
-guard(Gs0, St) ->
-    Gs = foldr(fun (Gt0, Rhs) ->
-		       Gt1 = guard_tests(Gt0),
-		       L = element(2, Gt1),
-		       {op,L,'or',Gt1,Rhs}
-	       end, guard_tests(last(Gs0)), first(Gs0)),
-    gexpr_top(Gs, St).
-    
-guard_tests([]) -> [];
-guard_tests(Gs) ->
-    L = element(2, hd(Gs)),
-    {protect,L,foldr(fun (G, Rhs) -> {op,L,'and',G,Rhs} end, last(Gs), first(Gs))}.
-
-%% gexpr_top(Expr, State) -> {Cexpr,State}.
-%%  Generate an internal core expression of a guard test.  Explicitly
-%%  handle outer boolean expressions and "protect" inner tests in a
-%%  reasonably smart way.
-
-gexpr_top(E0, St0) ->
-    {E1,Eps0,Bools,St1} = gexpr(E0, [], St0),
-    {E,Eps,St} = force_booleans(Bools, E1, Eps0, St1),
-    {Eps++[E],St}.
-
-%% gexpr(Expr, Bools, State) -> {Cexpr,[PreExp],Bools,State}.
-%%  Generate an internal core expression of a guard test.
-
-gexpr({protect,Line,Arg}, Bools0, St0) ->
-    case gexpr(Arg, [], St0) of
-	{E0,[],Bools,St1} ->
-	    {E,Eps,St} = force_booleans(Bools, E0, [], St1),
-	    {E,Eps,Bools0,St};
-	{E0,Eps0,Bools,St1} ->
-	    {E,Eps,St} = force_booleans(Bools, E0, Eps0, St1),
-	    {#iprotect{anno=#a{anno=[Line]},body=Eps++[E]},[],Bools0,St}
-    end;
-gexpr({op,Line,Op,L,R}=Call, Bools0, St0) ->
-    case erl_internal:bool_op(Op, 2) of
-	true ->
-	    {Le,Lps,Bools1,St1} = gexpr(L, Bools0, St0),
-	    {Ll,Llps,St2} = force_safe(Le, St1),
-	    {Re,Rps,Bools,St3} = gexpr(R, Bools1, St2),
-	    {Rl,Rlps,St4} = force_safe(Re, St3),
-	    Anno = [Line],
-	    {#icall{anno=#a{anno=Anno},	%Must have an #a{}
-		    module=#c_atom{anno=Anno,val=erlang},name=#c_atom{anno=Anno,val=Op},
-		    args=[Ll,Rl]},Lps ++ Llps ++ Rps ++ Rlps,Bools,St4};
-	false ->
-	    gexpr_test(Call, Bools0, St0)
-    end;
-gexpr({op,Line,Op,A}=Call, Bools0, St0) ->
-    case erl_internal:bool_op(Op, 1) of
-	true ->
-	    {Ae,Aps,Bools,St1} = gexpr(A, Bools0, St0),
-	    {Al,Alps,St2} = force_safe(Ae, St1),
-	    Anno = [Line],
-	    {#icall{anno=#a{anno=Anno},	%Must have an #a{}
-		    module=#c_atom{anno=Anno,val=erlang},name=#c_atom{anno=Anno,val=Op},
-		    args=[Al]},Aps ++ Alps,Bools,St2};
-	false ->
-	    gexpr_test(Call, Bools0, St0)
-    end;
-gexpr(E0, Bools, St0) ->
-    gexpr_test(E0, Bools, St0).
-
-%% gexpr_test(Expr, Bools, State) -> {Cexpr,[PreExp],Bools,State}.
-%%  Generate a guard test.  At this stage we must be sure that we have
-%%  a proper boolean value here so wrap things with an true test if we
-%%  don't know, i.e. if it is not a comparison or a type test.
-
-gexpr_test({atom,L,true}, Bools, St0) ->
-    {#c_atom{anno=[L],val=true},[],Bools,St0};
-gexpr_test({atom,L,false}, Bools, St0) ->
-    {#c_atom{anno=[L],val=false},[],Bools,St0};
-gexpr_test(E0, Bools0, St0) ->
-    {E1,Eps0,St1} = expr(E0, St0),
-    %% Generate "top-level" test and argument calls.
-    case E1 of
-	#icall{anno=Anno,module=#c_atom{val=erlang},name=#c_atom{val=N},args=As} ->
-	    Ar = length(As),
-	    case erl_internal:type_test(N, Ar) orelse
-		erl_internal:comp_op(N, Ar) orelse
-		(N == internal_is_record andalso Ar == 3) of
-		true -> {E1,Eps0,Bools0,St1};
-		false ->
-		    Lanno = Anno#a.anno,
-		    {New,St2} = new_var(Lanno, St1),
-		    Bools = [New|Bools0],
-		    {#icall{anno=Anno,	%Must have an #a{}
-			    module=#c_atom{anno=Lanno,val=erlang},
-			    name=#c_atom{anno=Lanno,val='=:='},
-			    args=[New,#c_atom{anno=Lanno,val=true}]},
-		     Eps0 ++ [#iset{anno=Anno,var=New,arg=E1}],Bools,St2}
-	    end;
-	_ ->
-	    Anno = get_ianno(E1),
-	    Lanno = get_lineno_anno(E1),
-	    case core_lib:is_simple(E1) of
-		true ->
-		    Bools = [E1|Bools0],
-		    {#icall{anno=Anno,	%Must have an #a{}
-			    module=#c_atom{anno=Lanno,val=erlang},
-			    name=#c_atom{anno=Lanno,val='=:='},
-			    args=[E1,#c_atom{anno=Lanno,val=true}]},Eps0,Bools,St1};
-		false ->
-		    {New,St2} = new_var(Lanno, St1),
-		    Bools = [New|Bools0],
-		    {#icall{anno=Anno,	%Must have an #a{}
-			    module=#c_atom{anno=Lanno,val=erlang},
-			    name=#c_atom{anno=Lanno,val='=:='},
-			    args=[New,#c_atom{anno=Lanno,val=true}]},
-		     Eps0 ++ [#iset{anno=Anno,var=New,arg=E1}],Bools,St2}
-	    end
-    end.
-
-force_booleans([], E, Eps, St) ->
-    {E,Eps,St};
-force_booleans([V|Vs], E0, Eps0, St0) ->
-    {E1,Eps1,St1} = force_safe(E0, St0),
-    Lanno = element(2, V),
-    Anno = #a{anno=Lanno},
-    Call = #icall{anno=Anno,module=#c_atom{anno=Lanno,val=erlang},
-		  name=#c_atom{anno=Lanno,val=is_boolean},
-		  args=[V]},
-    {New,St} = new_var(Lanno, St1),
-    Iset = #iset{anno=Anno,var=New,arg=Call},
-    Eps = Eps0 ++ Eps1 ++ [Iset],
-    E = #icall{anno=Anno,
-	       module=#c_atom{anno=Lanno,val=erlang},name=#c_atom{anno=Lanno,val='and'},
-	       args=[E1,New]},
-    force_booleans(Vs, E, Eps, St).
-
-%% exprs([Expr], State) -> {[Cexpr],State}.
-%%  Flatten top-level exprs.
-
-exprs([E0|Es0], St0) ->
-    {E1,Eps,St1} = expr(E0, St0),
-    {Es1,St2} = exprs(Es0, St1),
-    {Eps ++ [E1] ++ Es1,St2};
-exprs([], St) -> {[],St}.
-
-%% expr(Expr, State) -> {Cexpr,[PreExp],State}.
-%%  Generate an internal core expression.
-
-expr({var,L,V}, St) -> {#c_var{anno=[L],name=V},[],St};
-expr({char,L,C}, St) -> {#c_char{anno=[L],val=C},[],St};
-expr({integer,L,I}, St) -> {#c_int{anno=[L],val=I},[],St};
-expr({float,L,F}, St) -> {#c_float{anno=[L],val=F},[],St};
-expr({atom,L,A}, St) -> {#c_atom{anno=[L],val=A},[],St};
-expr({nil,L}, St) -> {#c_nil{anno=[L]},[],St};
-expr({string,L,S}, St) -> {#c_string{anno=[L],val=S},[],St};
-expr({cons,L,H0,T0}, St0) ->
-    {H1,Hps,St1} = safe(H0, St0),
-    {T1,Tps,St2} = safe(T0, St1),
-    {#c_cons{anno=[L],hd=H1,tl=T1},Hps ++ Tps,St2};
-expr({lc,L,E,Qs}, St) ->
-    lc_tq(L, E, Qs, {nil,L}, St);
-expr({tuple,L,Es0}, St0) ->
-    {Es1,Eps,St1} = safe_list(Es0, St0),
-    {#c_tuple{anno=[L],es=Es1},Eps,St1};
-expr({bin,L,Es0}, St0) ->
-    {Es1,Eps,St1} = expr_bin(Es0, St0),
-    {#ibinary{anno=#a{anno=[L]},segments=Es1},Eps,St1};
-expr({block,_,Es0}, St0) ->
-    %% Inline the block directly.
-    {Es1,St1} = exprs(first(Es0), St0),
-    {E1,Eps,St2} = expr(last(Es0), St1),
-    {E1,Es1 ++ Eps,St2};
-expr({'if',L,Cs0}, St0) ->
-    {Cs1,St1} = clauses(Cs0, St0),
-    Fc = fail_clause([], #c_atom{val=if_clause}),
-    {#icase{anno=#a{anno=[L]},args=[],clauses=Cs1,fc=Fc},[],St1};
-expr({'case',L,E0,Cs0}, St0) ->
-    {E1,Eps,St1} = novars(E0, St0),
-    {Cs1,St2} = clauses(Cs0, St1),
-    {Fpat,St3} = new_var(St2),
-    Fc = fail_clause([Fpat], #c_tuple{es=[#c_atom{val=case_clause},Fpat]}),
-    {#icase{anno=#a{anno=[L]},args=[E1],clauses=Cs1,fc=Fc},Eps,St3};
-expr({'receive',L,Cs0}, St0) ->
-    {Cs1,St1} = clauses(Cs0, St0),
-    {#ireceive1{anno=#a{anno=[L]},clauses=Cs1}, [], St1};
-expr({'receive',L,Cs0,Te0,Tes0}, St0) ->
-    {Te1,Teps,St1} = novars(Te0, St0),
-    {Tes1,St2} = exprs(Tes0, St1),
-    {Cs1,St3} = clauses(Cs0, St2),
-    {#ireceive2{anno=#a{anno=[L]},
-		clauses=Cs1,timeout=Te1,action=Tes1},Teps,St3};
-expr({'try',L,Es0,[],Ecs,[]}, St0) ->
-    %% 'try ... catch ... end'
-    {Es1,St1} = exprs(Es0, St0),
-    {V,St2} = new_var(St1),		%This name should be arbitrary
-    {Evs,Hs,St3} = try_exception(Ecs, St2),
-    {#itry{anno=#a{anno=[L]},args=Es1,vars=[V],body=[V],
-	   evars=Evs,handler=Hs},
-     [],St3};
-expr({'try',L,Es0,Cs0,Ecs,[]}, St0) ->
-    %% 'try ... of ... catch ... end'
-    {Es1,St1} = exprs(Es0, St0),
-    {V,St2} = new_var(St1),		%This name should be arbitrary
-    {Cs1,St3} = clauses(Cs0, St2),
-    {Fpat,St4} = new_var(St3),
-    Fc = fail_clause([Fpat], #c_tuple{es=[#c_atom{val=try_clause},Fpat]}),
-    {Evs,Hs,St5} = try_exception(Ecs, St4),
-    {#itry{anno=#a{anno=[L]},args=Es1,
-	   vars=[V],body=[#icase{anno=#a{},args=[V],clauses=Cs1,fc=Fc}],
-	   evars=Evs,handler=Hs},
-     [],St5};
-expr({'try',L,Es0,[],[],As0}, St0) ->
-    %% 'try ... after ... end'
-    {Es1,St1} = exprs(Es0, St0),
-    {As1,St2} = exprs(As0, St1),
-    {Evs,Hs,St3} = try_after(As1,St2),
-    {V,St4} = new_var(St3),		% (must not exist in As1)
-    %% TODO: this duplicates the 'after'-code; should lift to function.
-    {#itry{anno=#a{anno=[L]},args=Es1,vars=[V],body=As1++[V],
-	   evars=Evs,handler=Hs},
-     [],St4};
-expr({'try',L,Es,Cs,Ecs,As}, St0) ->
-    %% 'try ... [of ...] [catch ...] after ... end'
-    expr({'try',L,[{'try',L,Es,Cs,Ecs,[]}],[],[],As}, St0);
-expr({'catch',L,E0}, St0) ->
-    {E1,Eps,St1} = expr(E0, St0),
-    {#icatch{anno=#a{anno=[L]},body=Eps ++ [E1]},[],St1};
-expr({'fun',L,{function,F,A},{_,_,_}=Id}, St) ->
-    {#c_fname{anno=[L,{id,Id}],id=F,arity=A},[],St};
-expr({'fun',L,{clauses,Cs},Id}, St) ->
-    fun_tq(Id, Cs, L, St);
-expr({call,L0,{remote,_,{atom,_,erlang},{atom,_,is_record}},[_,_,_]=As}, St)
-  when L0 < 0 ->
-    %% Compiler-generated erlang:is_record/3 should be converted to
-    %% erlang:internal_is_record/3.
-    L = -L0,
-    expr({call,L,{remote,L,{atom,L,erlang},{atom,L,internal_is_record}},As}, St);
-expr({call,L,{remote,_,M,F},As0}, St0) ->
-    {[M1,F1|As1],Aps,St1} = safe_list([M,F|As0], St0),
-    {#icall{anno=#a{anno=[L]},module=M1,name=F1,args=As1},Aps,St1};
-expr({call,Lc,{atom,Lf,F},As0}, St0) ->
-    {As1,Aps,St1} = safe_list(As0, St0),
-    Op = #c_fname{anno=[Lf],id=F,arity=length(As1)},
-    {#iapply{anno=#a{anno=[Lc]},op=Op,args=As1},Aps,St1};
-expr({call,L,FunExp,As0}, St0) ->
-    {Fun,Fps,St1} = safe(FunExp, St0),
-    {As1,Aps,St2} = safe_list(As0, St1),
-    {#iapply{anno=#a{anno=[L]},op=Fun,args=As1},Fps ++ Aps,St2};
-expr({match,L,P0,E0}, St0) ->
-    %% First fold matches together to create aliases.
-    {P1,E1} = fold_match(E0, P0),
-    {E2,Eps,St1} = novars(E1, St0),
-    P2 = (catch pattern(P1)),
-    {Fpat,St2} = new_var(St1),
-    Fc = fail_clause([Fpat], #c_tuple{es=[#c_atom{val=badmatch},Fpat]}),
-    case P2 of
-	{'EXIT',_}=Exit -> exit(Exit);		%Propagate error
-	nomatch ->
-	    St = add_warning(L, nomatch, St2),
-	    {#icase{anno=#a{anno=[L]},
-		    args=[E2],clauses=[],fc=Fc},Eps,St};
-	_Other ->
-	    {#imatch{anno=#a{anno=[L]},pat=P2,arg=E2,fc=Fc},Eps,St2}
-    end;
-expr({op,_,'++',{lc,Llc,E,Qs},L2}, St) ->
-    %%  Optimise this here because of the list comprehension algorithm.
-    lc_tq(Llc, E, Qs, L2, St);
-expr({op,L,Op,A0}, St0) ->
-    {A1,Aps,St1} = safe(A0, St0),
-    LineAnno = [L],
-    {#icall{anno=#a{anno=LineAnno},		%Must have an #a{}
-	    module=#c_atom{anno=LineAnno,val=erlang},
-	    name=#c_atom{anno=LineAnno,val=Op},args=[A1]},Aps,St1};
-expr({op,L,Op,L0,R0}, St0) ->
-    {As,Aps,St1} = safe_list([L0,R0], St0),
-    LineAnno = [L],
-    {#icall{anno=#a{anno=LineAnno},		%Must have an #a{}
-	    module=#c_atom{anno=LineAnno,val=erlang},
-	    name=#c_atom{anno=LineAnno,val=Op},args=As},Aps,St1}.
-
-%% try_exception([ExcpClause], St) -> {[ExcpVar],Handler,St}.
-
-try_exception(Ecs0, St0) ->
-    %% Note that Tag is not needed for rethrow - it is already in Info.
-    {Evs,St1} = new_vars(3, St0), % Tag, Value, Info
-    {Ecs1,St2} = clauses(Ecs0, St1),
-    [_,Value,Info] = Evs,
-    Ec = #iclause{anno=#a{anno=[compiler_generated]},
-		  pats=[#c_tuple{es=Evs}],guard=[#c_atom{val=true}],
-		  body=[#iprimop{anno=#a{},       %Must have an #a{}
-				 name=#c_atom{val=raise},
-				 args=[Info,Value]}]},
-    Hs = [#icase{anno=#a{},args=[#c_tuple{es=Evs}],clauses=Ecs1,fc=Ec}],
-    {Evs,Hs,St2}.
-
-try_after(As, St0) ->
-    %% See above.
-    {Evs,St1} = new_vars(3, St0), % Tag, Value, Info
-    [_,Value,Info] = Evs,
-    B = As ++ [#iprimop{anno=#a{},       %Must have an #a{}
-			 name=#c_atom{val=raise},
-			 args=[Info,Value]}],
-    Ec = #iclause{anno=#a{anno=[compiler_generated]},
-		  pats=[#c_tuple{es=Evs}],guard=[#c_atom{val=true}],
-		  body=B},
-    Hs = [#icase{anno=#a{},args=[#c_tuple{es=Evs}],clauses=[],fc=Ec}],
-    {Evs,Hs,St1}.
-
-%% expr_bin([ArgExpr], St) -> {[Arg],[PreExpr],St}.
-%%  Flatten the arguments of a bin. Do this straight left to right!
-
-expr_bin(Es, St) ->
-    foldr(fun (E, {Ces,Esp,St0}) ->
-		  {Ce,Ep,St1} = bitstr(E, St0),
-		  {[Ce|Ces],Ep ++ Esp,St1}
-	  end, {[],[],St}, Es).
-
-bitstr({bin_element,_,E0,Size0,[Type,{unit,Unit}|Flags]}, St0) ->
-    {E1,Eps,St1} = safe(E0, St0),
-    {Size1,Eps2,St2} = safe(Size0, St1),
-    {#c_bitstr{val=E1,size=Size1,
-	       unit=core_lib:make_literal(Unit),
-	       type=core_lib:make_literal(Type),
-	       flags=core_lib:make_literal(Flags)},
-     Eps ++ Eps2,St2}.
-
-%% fun_tq(Id, [Clauses], Line, State) -> {Fun,[PreExp],State}.
-
-fun_tq(Id, Cs0, L, St0) ->
-    {Cs1,St1} = clauses(Cs0, St0),
-    Arity = length((hd(Cs1))#iclause.pats),
-    {Args,St2} = new_vars(Arity, St1),
-    {Ps,St3} = new_vars(Arity, St2),		%Need new variables here
-    Fc = fail_clause(Ps, #c_tuple{es=[#c_atom{val=function_clause}|Ps]}),
-    Fun = #ifun{anno=#a{anno=[L]},
-		id=[{id,Id}],				%We KNOW!
-		vars=Args,clauses=Cs1,fc=Fc},
-    {Fun,[],St3}.
-
-%% lc_tq(Line, Exp, [Qualifier], More, State) -> {LetRec,[PreExp],State}.
-%%  This TQ from Simon PJ pp 127-138.  
-%%  This gets a bit messy as we must transform all directly here.  We
-%%  recognise guard tests and try to fold them together and join to a
-%%  preceding generators, this should give us better and more compact
-%%  code.
-%%  More could be transformed before calling lc_tq.
-
-lc_tq(Line, E, [{generate,Lg,P,G}|Qs0], More, St0) ->
-    {Gs,Qs1} =  splitwith(fun is_guard_test/1, Qs0),
-    {Name,St1} = new_fun_name("lc", St0),
-    {Head,St2} = new_var(St1),
-    {Tname,St3} = new_var_name(St2),
-    LA = [Line],
-    LAnno = #a{anno=LA},
-    Tail = #c_var{anno=LA,name=Tname},
-    {Arg,St4} = new_var(St3),
-    NewMore = {call,Lg,{atom,Lg,Name},[{var,Lg,Tname}]},
-    {Guardc,St5} = lc_guard_tests(Gs, St4),	%These are always flat!
-    {Lc,Lps,St6} = lc_tq(Line, E, Qs1, NewMore, St5),
-    {Mc,Mps,St7} = expr(More, St6),
-    {Nc,Nps,St8} = expr(NewMore, St7),
-    case catch pattern(P) of
-	{'EXIT',_}=Exit ->
-	    St9 = St8,
-	    Pc = nomatch,
-	    exit(Exit);		%Propagate error
-	nomatch ->
-	    St9 = add_warning(Line, nomatch, St8),
-	    Pc = nomatch;
-	Pc ->
-	    St9 = St8
-    end,
-    {Gc,Gps,St10} = safe(G, St9),		%Will be a function argument!
-    Fc = fail_clause([Arg], #c_tuple{anno=LA,
-				     es=[#c_atom{val=function_clause},Arg]}),
-    Cs0 = [#iclause{anno=#a{anno=[compiler_generated|LA]},
-		    pats=[#c_cons{anno=LA,hd=Head,tl=Tail}],
-		    guard=[],
-		    body=Nps ++ [Nc]},
-	   #iclause{anno=LAnno,
-		    pats=[#c_nil{anno=LA}],guard=[],
-		    body=Mps ++ [Mc]}],
-    Cs = case Pc of
-	     nomatch -> Cs0;
-	     _ ->
-		 [#iclause{anno=LAnno,
-			   pats=[#c_cons{anno=LA,hd=Pc,tl=Tail}],
-			   guard=Guardc,
-			   body=Lps ++ [Lc]}|Cs0]
-	 end,
-    Fun = #ifun{anno=LAnno,id=[],vars=[Arg],clauses=Cs,fc=Fc},
-    {#iletrec{anno=LAnno,defs=[{Name,Fun}],
-	      body=Gps ++ [#iapply{anno=LAnno,
-				   op=#c_fname{anno=LA,id=Name,arity=1},
-				   args=[Gc]}]},
-     [],St10};
-lc_tq(Line, E, [Fil0|Qs0], More, St0) ->
-    %% Special case sequences guard tests.
-    LA = [Line],
-    LAnno = #a{anno=LA},
-    case is_guard_test(Fil0) of
-	true ->
-	    {Gs0,Qs1} = splitwith(fun is_guard_test/1, Qs0),
-	    {Lc,Lps,St1} = lc_tq(Line, E, Qs1, More, St0),
-	    {Mc,Mps,St2} = expr(More, St1),
-	    {Gs,St3} = lc_guard_tests([Fil0|Gs0], St2), %These are always flat!
-	    {#icase{anno=LAnno,
-		    args=[],
-		    clauses=[#iclause{anno=LAnno,pats=[],
-				      guard=Gs,body=Lps ++ [Lc]}],
-		    fc=#iclause{anno=LAnno,pats=[],guard=[],body=Mps ++ [Mc]}},
-	     [],St3};
-	false ->
-	    {Lc,Lps,St1} = lc_tq(Line, E, Qs0, More, St0),
-	    {Mc,Mps,St2} = expr(More, St1),
-	    {Fpat,St3} = new_var(St2),
-	    Fc = fail_clause([Fpat], #c_tuple{es=[#c_atom{val=case_clause},Fpat]}),
-	    %% Do a novars little optimisation here.
-	    case Fil0 of
-		{op,_,'not',Fil1} ->
-		    {Filc,Fps,St4} = novars(Fil1, St3),
-		    {#icase{anno=LAnno,
-			    args=[Filc],
-			    clauses=[#iclause{anno=LAnno,
-					      pats=[#c_atom{anno=LA,val=true}],
-					      guard=[],
-					      body=Mps ++ [Mc]},
-				     #iclause{anno=LAnno,
-					      pats=[#c_atom{anno=LA,val=false}],
-					      guard=[],
-					      body=Lps ++ [Lc]}],
-			    fc=Fc},
-		     Fps,St4};
-		_Other ->
-		    {Filc,Fps,St4} = novars(Fil0, St3),
-		    {#icase{anno=LAnno,
-			    args=[Filc],
-			    clauses=[#iclause{anno=LAnno,
-					      pats=[#c_atom{anno=LA,val=true}],
-					      guard=[],
-					      body=Lps ++ [Lc]},
-				     #iclause{anno=LAnno,
-					      pats=[#c_atom{anno=LA,val=false}],
-					      guard=[],
-					      body=Mps ++ [Mc]}],
-			    fc=Fc},
-		     Fps,St4}
-	    end
-    end;
-lc_tq(Line, E, [], More, St) ->
-    expr({cons,Line,E,More}, St).
-
-lc_guard_tests([], St) -> {[],St};
-lc_guard_tests(Gs0, St) ->
-    Gs = guard_tests(Gs0),
-    gexpr_top(Gs, St).
-
-%% is_guard_test(Expression) -> true | false.
-%%  Test if a general expression is a guard test.  Use erl_lint here
-%%  as it now allows sys_pre_expand transformed source.
-
-is_guard_test(E) -> erl_lint:is_guard_test(E).
-
-%% novars(Expr, State) -> {Novars,[PreExpr],State}.
-%%  Generate a novars expression, basically a call or a safe.  At this
-%%  level we do not need to do a deep check.
-
-novars(E0, St0) ->
-    {E1,Eps,St1} = expr(E0, St0),
-    {Se,Sps,St2} = force_novars(E1, St1),
-    {Se,Eps ++ Sps,St2}.
-
-force_novars(#iapply{}=App, St) -> {App,[],St};
-force_novars(#icall{}=Call, St) -> {Call,[],St};
-force_novars(#iprimop{}=Prim, St) -> {Prim,[],St};
-force_novars(#ifun{}=Fun, St) -> {Fun,[],St};	%These are novars too
-force_novars(#ibinary{}=Bin, St) -> {Bin,[],St};
-force_novars(Ce, St) ->
-    force_safe(Ce, St).
-
-%% safe(Expr, State) -> {Safe,[PreExpr],State}.
-%%  Generate an internal safe expression.  These are simples without
-%%  binaries which can fail.  At this level we do not need to do a
-%%  deep check.  Must do special things with matches here.
-
-safe(E0, St0) ->
-    {E1,Eps,St1} = expr(E0, St0),
-    {Se,Sps,St2} = force_safe(E1, St1),
-    {Se,Eps ++ Sps,St2}.
-
-safe_list(Es, St) ->
-    foldr(fun (E, {Ces,Esp,St0}) ->
-		  {Ce,Ep,St1} = safe(E, St0),
-		  {[Ce|Ces],Ep ++ Esp,St1}
-	  end, {[],[],St}, Es).
-
-force_safe(#imatch{anno=Anno,pat=P,arg=E,fc=Fc}, St0) ->
-    {Le,Lps,St1} = force_safe(E, St0),
-    {Le,Lps ++ [#imatch{anno=Anno,pat=P,arg=Le,fc=Fc}],St1};
-force_safe(Ce, St0) ->
-    case is_safe(Ce) of
-	true -> {Ce,[],St0};
-	false ->
-	    {V,St1} = new_var(St0),
-	    {V,[#iset{var=V,arg=Ce}],St1}
-    end.
-
-is_safe(#c_cons{}) -> true;
-is_safe(#c_tuple{}) -> true;
-is_safe(#c_var{}) -> true;
-is_safe(E) -> core_lib:is_atomic(E).
-
-%%% %% variable(Expr, State) -> {Variable,[PreExpr],State}.
-%%% %% force_variable(Expr, State) -> {Variable,[PreExpr],State}.
-%%% %%  Generate a variable.
-
-%%% variable(E0, St0) ->
-%%%     {E1,Eps,St1} = expr(E0, St0),
-%%%     {V,Vps,St2} = force_variable(E1, St1),
-%%%     {V,Eps ++ Vps,St2}.
-
-%%% force_variable(#c_var{}=Var, St) -> {Var,[],St}; 
-%%% force_variable(Ce, St0) ->
-%%%     {V,St1} = new_var(St0),
-%%%     {V,[#iset{var=V,arg=Ce}],St1}.
-
-%%% %% atomic(Expr, State) -> {Atomic,[PreExpr],State}.
-%%% %% force_atomic(Expr, State) -> {Atomic,[PreExpr],State}.
-
-%%% atomic(E0, St0) ->
-%%%     {E1,Eps,St1} = expr(E0, St0),
-%%%     {A,Aps,St2} = force_atomic(E1, St1),
-%%%     {A,Eps ++ Aps,St2}.
-
-%%% force_atomic(Ce, St0) ->
-%%%     case core_lib:is_atomic(Ce) of
-%%% 	true -> {Ce,[],St0};
-%%% 	false ->
-%%% 	    {V,St1} = new_var(St0),
-%%% 	    {V,[#iset{var=V,arg=Ce}],St1}
-%%%     end.
-
-%% fold_match(MatchExpr, Pat) -> {MatchPat,Expr}.
-%%  Fold nested matches into one match with aliased patterns.
-
-fold_match({match,L,P0,E0}, P) ->
-    {P1,E1} = fold_match(E0, P),
-    {{match,L,P0,P1},E1};
-fold_match(E, P) -> {P,E}.
-
-%% pattern(Pattern) -> CorePat.
-%% Transform a pattern by removing line numbers.  We also normalise
-%% aliases in patterns to standard form, {alias,Pat,[Var]}.
-
-pattern({var,L,V}) -> #c_var{anno=[L],name=V};
-pattern({char,L,C}) -> #c_char{anno=[L],val=C};
-pattern({integer,L,I}) -> #c_int{anno=[L],val=I};
-pattern({float,L,F}) -> #c_float{anno=[L],val=F};
-pattern({atom,L,A}) -> #c_atom{anno=[L],val=A};
-pattern({string,L,S}) -> #c_string{anno=[L],val=S};
-pattern({nil,L}) -> #c_nil{anno=[L]};
-pattern({cons,L,H,T}) ->
-    #c_cons{anno=[L],hd=pattern(H),tl=pattern(T)};
-pattern({tuple,L,Ps}) ->
-    #c_tuple{anno=[L],es=pattern_list(Ps)};
-pattern({bin,L,Ps}) ->
-    %% We don't create a #ibinary record here, since there is
-    %% no need to hold any used/new annoations in a pattern.
-    #c_binary{anno=[L],segments=pat_bin(Ps)};
-pattern({match,_,P1,P2}) ->
-    pat_alias(pattern(P1), pattern(P2)).
-
-%% bin_pattern_list([BinElement]) -> [BinSeg].
-
-pat_bin(Ps) -> map(fun pat_segment/1, Ps).
-
-pat_segment({bin_element,_,Term,Size,[Type,{unit,Unit}|Flags]}) ->
-    #c_bitstr{val=pattern(Term),size=pattern(Size),
-	      unit=core_lib:make_literal(Unit),
-	      type=core_lib:make_literal(Type),
-	      flags=core_lib:make_literal(Flags)}.
-
-%% pat_alias(CorePat, CorePat) -> AliasPat.
-%%  Normalise aliases.  Trap bad aliases by throwing 'nomatch'.
-
-pat_alias(#c_var{name=V1}, P2) -> #c_alias{var=#c_var{name=V1},pat=P2};
-pat_alias(P1, #c_var{name=V2}) -> #c_alias{var=#c_var{name=V2},pat=P1};
-pat_alias(#c_cons{}=Cons, #c_string{anno=A,val=[H|T]}=S) ->
-    pat_alias(Cons, #c_cons{anno=A,hd=#c_char{anno=A,val=H},
-			    tl=S#c_string{val=T}});
-pat_alias(#c_string{anno=A,val=[H|T]}=S, #c_cons{}=Cons) ->
-    pat_alias(#c_cons{anno=A,hd=#c_char{anno=A,val=H},
-		      tl=S#c_string{val=T}}, Cons);
-pat_alias(#c_nil{}=Nil, #c_string{val=[]}) ->
-    Nil;
-pat_alias(#c_string{val=[]}, #c_nil{}=Nil) ->
-    Nil;
-pat_alias(#c_cons{anno=A,hd=H1,tl=T1}, #c_cons{hd=H2,tl=T2}) ->
-    #c_cons{anno=A,hd=pat_alias(H1, H2),tl=pat_alias(T1, T2)};
-pat_alias(#c_tuple{es=Es1}, #c_tuple{es=Es2}) ->
-    #c_tuple{es=pat_alias_list(Es1, Es2)};
-pat_alias(#c_char{val=C}=Char, #c_int{val=C}) ->
-    Char;
-pat_alias(#c_int{val=C}, #c_char{val=C}=Char) ->
-    Char;
-pat_alias(#c_alias{var=V1,pat=P1},
-	   #c_alias{var=V2,pat=P2}) ->
-    if V1 == V2 -> pat_alias(P1, P2);
-       true -> #c_alias{var=V1,pat=#c_alias{var=V2,pat=pat_alias(P1, P2)}}
-    end;
-pat_alias(#c_alias{var=V1,pat=P1}, P2) ->
-    #c_alias{var=V1,pat=pat_alias(P1, P2)};
-pat_alias(P1, #c_alias{var=V2,pat=P2}) ->
-    #c_alias{var=V2,pat=pat_alias(P1, P2)};
-pat_alias(P, P) -> P;
-pat_alias(_, _) -> throw(nomatch).
-
-%% pat_alias_list([A1], [A2]) -> [A].
-
-pat_alias_list([A1|A1s], [A2|A2s]) ->
-    [pat_alias(A1, A2)|pat_alias_list(A1s, A2s)];
-pat_alias_list([], []) -> [];
-pat_alias_list(_, _) -> throw(nomatch).
-
-%% pattern_list([P]) -> [P].
-
-pattern_list(Ps) -> map(fun pattern/1, Ps).
-
-%% first([A]) -> [A].
-%% last([A]) -> A.
-
-first([_]) -> [];
-first([H|T]) -> [H|first(T)].
-
-last([L]) -> L;
-last([_|T]) -> last(T).
-
-%% make_vars([Name]) -> [{Var,Name}].
-
-make_vars(Vs) -> [ #c_var{name=V} || V <- Vs ].
-
-%% new_fun_name(Type, State) -> {FunName,State}.
-
-new_fun_name(Type, #core{fcount=C}=St) ->
-    {list_to_atom(Type ++ "$^" ++ integer_to_list(C)),St#core{fcount=C+1}}.
-
-%% new_var_name(State) -> {VarName,State}.
-
-new_var_name(#core{vcount=C}=St) ->
-    {list_to_atom("cor" ++ integer_to_list(C)),St#core{vcount=C + 1}}.
-
-%% new_var(State) -> {{var,Name},State}.
-%% new_var(LineAnno, State) -> {{var,Name},State}.
-
-new_var(St) ->
-    new_var([], St).
-
-new_var(Anno, St0) ->
-    {New,St} = new_var_name(St0),
-    {#c_var{anno=Anno,name=New},St}.
-
-%% new_vars(Count, State) -> {[Var],State}.
-%% new_vars(Anno, Count, State) -> {[Var],State}.
-%%  Make Count new variables.
-
-new_vars(N, St) -> new_vars_1(N, [], St, []).
-new_vars(Anno, N, St) -> new_vars_1(N, Anno, St, []).
-
-new_vars_1(N, Anno, St0, Vs) when N > 0 ->
-    {V,St1} = new_var(Anno, St0),
-    new_vars_1(N-1, Anno, St1, [V|Vs]);
-new_vars_1(0, _, St, Vs) -> {Vs,St}.
-
-fail_clause(Pats, A) ->
-    #iclause{anno=#a{anno=[compiler_generated]},
-	     pats=Pats,guard=[],
-	     body=[#iprimop{anno=#a{},name=#c_atom{val=match_fail},args=[A]}]}.
-
-ubody(B, St) -> uexpr(B, [], St).
-
-%% uclauses([Lclause], [KnownVar], State) -> {[Lclause],State}.
-
-uclauses(Lcs, Ks, St0) ->
-    mapfoldl(fun (Lc, St) -> uclause(Lc, Ks, St) end, St0, Lcs).
-
-%% uclause(Lclause, [KnownVar], State) -> {Lclause,State}.
-
-uclause(Cl0, Ks, St0) ->
-    {Cl1,_Pvs,Used,New,St1} = uclause(Cl0, Ks, Ks, St0),
-    A0 = get_ianno(Cl1),
-    A = A0#a{us=Used,ns=New},
-    {Cl1#iclause{anno=A},St1}.
-
-uclause(#iclause{anno=Anno,pats=Ps0,guard=G0,body=B0}, Pks, Ks0, St0) ->
-    {Ps1,Pg,Pvs,Pus,St1} = upattern_list(Ps0, Pks, St0),
-    Pu = union(Pus, intersection(Pvs, Ks0)),
-    Pn = subtract(Pvs, Pu),
-    Ks1 = union(Pn, Ks0),
-    {G1,St2} = uguard(Pg, G0, Ks1, St1),
-    Gu = used_in_any(G1),
-    Gn = new_in_any(G1),
-    Ks2 = union(Gn, Ks1),
-    {B1,St3} = uexprs(B0, Ks2, St2),
-    Used = intersection(union([Pu,Gu,used_in_any(B1)]), Ks0),
-    New = union([Pn,Gn,new_in_any(B1)]),
-    {#iclause{anno=Anno,pats=Ps1,guard=G1,body=B1},Pvs,Used,New,St3}.
-
-%% uguard([Test], [Kexpr], [KnownVar], State) -> {[Kexpr],State}.
-%%  Build a guard expression list by folding in the equality tests.
-
-uguard([], [], _, St) -> {[],St};
-uguard(Pg, [], Ks, St) ->
-    %% No guard, so fold together equality tests.
-    uguard(first(Pg), [last(Pg)], Ks, St);
-uguard(Pg, Gs0, Ks, St0) ->
-    %% Gs0 must contain at least one element here.
-    {Gs3,St5} = foldr(fun (T, {Gs1,St1}) ->
-			      {L,St2} = new_var(St1),
-			      {R,St3} = new_var(St2),
-			      {[#iset{var=L,arg=T}] ++ first(Gs1) ++
-			       [#iset{var=R,arg=last(Gs1)},
-				#icall{anno=#a{}, %Must have an #a{}
-				       module=#c_atom{val=erlang},
-				       name=#c_atom{val='and'},
-				       args=[L,R]}],
-			       St3}
-		      end, {Gs0,St0}, Pg),
-    %%ok = io:fwrite("core ~w: ~p~n", [?LINE,Gs3]),
-    uexprs(Gs3, Ks, St5).
-
-%% uexprs([Kexpr], [KnownVar], State) -> {[Kexpr],State}.
-
-uexprs([#imatch{anno=A,pat=P0,arg=Arg,fc=Fc}|Les], Ks, St0) ->
-    %% Optimise for simple set of unbound variable.
-    case upattern(P0, Ks, St0) of
-	{#c_var{},[],_Pvs,_Pus,_} ->
-	    %% Throw our work away and just set to iset.
-	    uexprs([#iset{var=P0,arg=Arg}|Les], Ks, St0);
-	_Other ->
-	    %% Throw our work away and set to icase.
-	    if
-		Les == [] ->
-		    %% Need to explicitly return match "value", make
-		    %% safe for efficiency.
-		    {La,Lps,St1} = force_safe(Arg, St0),
-		    Mc = #iclause{anno=A,pats=[P0],guard=[],body=[La]},
-		    uexprs(Lps ++ [#icase{anno=A,
-					  args=[La],clauses=[Mc],fc=Fc}], Ks, St1);
-		true ->
-		    Mc = #iclause{anno=A,pats=[P0],guard=[],body=Les},
-		    uexprs([#icase{anno=A,args=[Arg],
-				   clauses=[Mc],fc=Fc}], Ks, St0)
-	    end
-    end;
-uexprs([Le0|Les0], Ks, St0) ->
-    {Le1,St1} = uexpr(Le0, Ks, St0),
-    {Les1,St2} = uexprs(Les0, union((core_lib:get_anno(Le1))#a.ns, Ks), St1),
-    {[Le1|Les1],St2};
-uexprs([], _, St) -> {[],St}.
-
-uexpr(#iset{anno=A,var=V,arg=A0}, Ks, St0) ->
-    {A1,St1} = uexpr(A0, Ks, St0),
-    {#iset{anno=A#a{us=del_element(V#c_var.name, (core_lib:get_anno(A1))#a.us),
-		    ns=add_element(V#c_var.name, (core_lib:get_anno(A1))#a.ns)},
-	   var=V,arg=A1},St1};
-%% imatch done in uexprs.
-uexpr(#iletrec{anno=A,defs=Fs0,body=B0}, Ks, St0) ->
-    %%ok = io:fwrite("~w: ~p~n", [?LINE,{Fs0,B0}]),
-    {Fs1,St1} = mapfoldl(fun ({Name,F0}, St0) ->
-				 {F1,St1} = uexpr(F0, Ks, St0),
-				 {{Name,F1},St1}
-			 end, St0, Fs0),
-    {B1,St2} = uexprs(B0, Ks, St1),
-    Used = used_in_any(map(fun ({_,F}) -> F end, Fs1) ++ B1),
-    {#iletrec{anno=A#a{us=Used,ns=[]},defs=Fs1,body=B1},St2};
-uexpr(#icase{anno=A,args=As0,clauses=Cs0,fc=Fc0}, Ks, St0) ->
-    %% As0 will never generate new variables.
-    {As1,St1} = uexpr_list(As0, Ks, St0),
-    {Cs1,St2} = uclauses(Cs0, Ks, St1),
-    {Fc1,St3} = uclause(Fc0, Ks, St2),
-    Used = union(used_in_any(As1), used_in_any(Cs1)),
-    New = new_in_all(Cs1),
-    {#icase{anno=A#a{us=Used,ns=New},args=As1,clauses=Cs1,fc=Fc1},St3};
-uexpr(#ifun{anno=A,id=Id,vars=As,clauses=Cs0,fc=Fc0}, Ks0, St0) ->
-    Avs = lit_list_vars(As),
-    Ks1 = union(Avs, Ks0),
-    {Cs1,St1} = ufun_clauses(Cs0, Ks1, St0),
-    {Fc1,St2} = ufun_clause(Fc0, Ks1, St1),
-    Used = subtract(intersection(used_in_any(Cs1), Ks0), Avs),
-    {#ifun{anno=A#a{us=Used,ns=[]},id=Id,vars=As,clauses=Cs1,fc=Fc1},St2};
-uexpr(#iapply{anno=A,op=Op,args=As}, _, St) ->
-    Used = union(lit_vars(Op), lit_list_vars(As)),
-    {#iapply{anno=A#a{us=Used},op=Op,args=As},St};
-uexpr(#iprimop{anno=A,name=Name,args=As}, _, St) ->
-    Used = lit_list_vars(As),
-    {#iprimop{anno=A#a{us=Used},name=Name,args=As},St};
-uexpr(#icall{anno=A,module=Mod,name=Name,args=As}, _, St) ->
-    Used = union([lit_vars(Mod),lit_vars(Name),lit_list_vars(As)]),
-    {#icall{anno=A#a{us=Used},module=Mod,name=Name,args=As},St};
-uexpr(#itry{anno=A,args=As0,vars=Vs,body=Bs0,evars=Evs,handler=Hs0}, Ks, St0) ->
-    %% Note that we export only from body and exception.
-    {As1,St1} = uexprs(As0, Ks, St0),
-    {Bs1,St2} = uexprs(Bs0, Ks, St1),
-    {Hs1,St3} = uexprs(Hs0, Ks, St2),
-    Used = intersection(used_in_any(Bs1++Hs1++As1), Ks),
-    New = new_in_all(Bs1++Hs1),
-    {#itry{anno=A#a{us=Used,ns=New},
-	   args=As1,vars=Vs,body=Bs1,evars=Evs,handler=Hs1},St3};
-uexpr(#icatch{anno=A,body=Es0}, Ks, St0) ->
-    {Es1,St1} = uexprs(Es0, Ks, St0),
-    {#icatch{anno=A#a{us=used_in_any(Es1)},body=Es1},St1};
-uexpr(#ireceive1{anno=A,clauses=Cs0}, Ks, St0) ->
-    {Cs1,St1} = uclauses(Cs0, Ks, St0),
-    {#ireceive1{anno=A#a{us=used_in_any(Cs1),ns=new_in_all(Cs1)},
-		clauses=Cs1},St1};
-uexpr(#ireceive2{anno=A,clauses=Cs0,timeout=Te0,action=Tes0}, Ks, St0) ->
-    %% Te0 will never generate new variables.
-    {Te1,St1} = uexpr(Te0, Ks, St0),
-    {Cs1,St2} = uclauses(Cs0, Ks, St1),
-    {Tes1,St3} = uexprs(Tes0, Ks, St2),
-    Used = union([used_in_any(Cs1),used_in_any(Tes1),
-		  (core_lib:get_anno(Te1))#a.us]),
-    New = case Cs1 of
-	      [] -> new_in_any(Tes1);
-	      _ -> intersection(new_in_all(Cs1), new_in_any(Tes1))
-	  end,
-    {#ireceive2{anno=A#a{us=Used,ns=New},
-		clauses=Cs1,timeout=Te1,action=Tes1},St3};
-uexpr(#iprotect{anno=A,body=Es0}, Ks, St0) ->
-    {Es1,St1} = uexprs(Es0, Ks, St0),
-    Used = used_in_any(Es1),
-    {#iprotect{anno=A#a{us=Used},body=Es1},St1}; %No new variables escape!
-uexpr(#ibinary{anno=A,segments=Ss}, _, St) ->
-    Used = bitstr_vars(Ss),
-    {#ibinary{anno=A#a{us=Used},segments=Ss},St};
-uexpr(Lit, _, St) ->
-    true = core_lib:is_simple(Lit),		%Sanity check!
-    Vs = lit_vars(Lit),
-    Anno = core_lib:get_anno(Lit),
-    {core_lib:set_anno(Lit, #a{us=Vs,anno=Anno}),St}.
-
-uexpr_list(Les0, Ks, St0) ->
-    mapfoldl(fun (Le, St) -> uexpr(Le, Ks, St) end, St0, Les0).
-
-%% ufun_clauses([Lclause], [KnownVar], State) -> {[Lclause],State}.
-
-ufun_clauses(Lcs, Ks, St0) ->
-    mapfoldl(fun (Lc, St) -> ufun_clause(Lc, Ks, St) end, St0, Lcs).
-
-%% ufun_clause(Lclause, [KnownVar], State) -> {Lclause,State}.
-
-ufun_clause(Cl0, Ks, St0) ->
-    {Cl1,Pvs,Used,_,St1} = uclause(Cl0, [], Ks, St0),
-    A0 = get_ianno(Cl1),
-    A = A0#a{us=subtract(intersection(Used, Ks), Pvs),ns=[]},
-    {Cl1#iclause{anno=A},St1}.
-
-%% upattern(Pat, [KnownVar], State) ->
-%%              {Pat,[GuardTest],[NewVar],[UsedVar],State}.
-
-upattern(#c_var{name='_'}, _, St0) ->
-    {New,St1} = new_var_name(St0),
-    {#c_var{name=New},[],[New],[],St1};
-upattern(#c_var{name=V}=Var, Ks, St0) ->
-    case is_element(V, Ks) of
-	true ->
-	    {N,St1} = new_var_name(St0),
-	    New = #c_var{name=N},
-	    Test = #icall{anno=#a{us=add_element(N, [V])},
-			  module=#c_atom{val=erlang},
-			  name=#c_atom{val='=:='},
-			  args=[New,Var]},
-	    %% Test doesn't need protecting.
-	    {New,[Test],[N],[],St1};
-	false -> {Var,[],[V],[],St0}
-    end;
-upattern(#c_cons{hd=H0,tl=T0}=Cons, Ks, St0) ->
-    {H1,Hg,Hv,Hu,St1} = upattern(H0, Ks, St0),
-    {T1,Tg,Tv,Tu,St2} = upattern(T0, union(Hv, Ks), St1),
-    {Cons#c_cons{hd=H1,tl=T1},Hg ++ Tg,union(Hv, Tv),union(Hu, Tu),St2};
-upattern(#c_tuple{es=Es0}=Tuple, Ks, St0) ->
-    {Es1,Esg,Esv,Eus,St1} = upattern_list(Es0, Ks, St0),
-    {Tuple#c_tuple{es=Es1},Esg,Esv,Eus,St1};
-upattern(#c_binary{segments=Es0}=Bin, Ks, St0) ->
-    {Es1,Esg,Esv,Eus,St1} = upat_bin(Es0, Ks, St0),
-    {Bin#c_binary{segments=Es1},Esg,Esv,Eus,St1};
-upattern(#c_alias{var=V0,pat=P0}=Alias, Ks, St0) ->
-    {V1,Vg,Vv,Vu,St1} = upattern(V0, Ks, St0),
-    {P1,Pg,Pv,Pu,St2} = upattern(P0, union(Vv, Ks), St1),
-    {Alias#c_alias{var=V1,pat=P1},Vg ++ Pg,union(Vv, Pv),union(Vu, Pu),St2};
-upattern(Other, _, St) -> {Other,[],[],[],St}.	%Constants
-
-%% upattern_list([Pat], [KnownVar], State) ->
-%%                        {[Pat],[GuardTest],[NewVar],[UsedVar],State}.
-
-upattern_list([P0|Ps0], Ks, St0) ->
-    {P1,Pg,Pv,Pu,St1} = upattern(P0, Ks, St0),
-    {Ps1,Psg,Psv,Psu,St2} = upattern_list(Ps0, union(Pv, Ks), St1),
-    {[P1|Ps1],Pg ++ Psg,union(Pv, Psv),union(Pu, Psu),St2};
-upattern_list([], _, St) -> {[],[],[],[],St}.    
-
-%% upat_bin([Pat], [KnownVar], State) ->
-%%                        {[Pat],[GuardTest],[NewVar],[UsedVar],State}.
-upat_bin(Es0, Ks, St0) ->
-  upat_bin(Es0, Ks, [], St0).
-
-%% upat_bin([Pat], [KnownVar], [LocalVar], State) ->
-%%                        {[Pat],[GuardTest],[NewVar],[UsedVar],State}.
-upat_bin([P0|Ps0], Ks, Bs, St0) ->
-    {P1,Pg,Pv,Pu,Bs1,St1} = upat_element(P0, Ks, Bs, St0),
-    {Ps1,Psg,Psv,Psu,St2} = upat_bin(Ps0, union(Pv, Ks), Bs1, St1),
-    {[P1|Ps1],Pg ++ Psg,union(Pv, Psv),union(Pu, Psu),St2};
-upat_bin([], _, _, St) -> {[],[],[],[],St}.    
-
-
-%% upat_element(Segment, [KnownVar], [LocalVar], State) ->
-%%                        {Segment,[GuardTest],[NewVar],[UsedVar],[LocalVar],State}
-upat_element(#c_bitstr{val=H0,size=Sz}=Seg, Ks, Bs, St0) ->
-  {H1,Hg,Hv,[],St1} = upattern(H0, Ks, St0),
-  Bs1 = case H0 of
-	  #c_var{name=Hname} ->
-	    case H1 of
-	      #c_var{name=Hname} ->
-		Bs;
-	      #c_var{name=Other} ->
-		[{Hname, Other}|Bs]
-	    end;
-	  _ ->
-	    Bs
-	end,
-  {Sz1, Us} = case Sz of
-		  #c_var{name=Vname} -> 
-		    rename_bitstr_size(Vname, Bs);
-		  _Other -> {Sz, []}
-		end,
-  {Seg#c_bitstr{val=H1, size=Sz1},Hg,Hv,Us,Bs1,St1}.
-
-rename_bitstr_size(V, [{V, N}|_]) ->
-   New = #c_var{name=N},
-  {New, [N]};
-rename_bitstr_size(V, [_|Rest]) ->
-  rename_bitstr_size(V, Rest);
-rename_bitstr_size(V, []) ->
-  Old = #c_var{name=V},
-  {Old, [V]}.
- 
-used_in_any(Les) ->
-    foldl(fun (Le, Ns) -> union((core_lib:get_anno(Le))#a.us, Ns) end,
-	  [], Les).
-
-new_in_any(Les) ->
-    foldl(fun (Le, Ns) -> union((core_lib:get_anno(Le))#a.ns, Ns) end,
-	  [], Les).
-
-new_in_all([Le|Les]) ->
-    foldl(fun (L, Ns) -> intersection((core_lib:get_anno(L))#a.ns, Ns) end,
-	  (core_lib:get_anno(Le))#a.ns, Les);
-new_in_all([]) -> [].
-
-%% The AfterVars are the variables which are used afterwards.  We need
-%% this to work out which variables are actually exported and used
-%% from case/receive.  In subblocks/clauses the AfterVars of the block
-%% are just the exported variables.
-
-cbody(B0, St0) ->
-    {B1,_,_,St1} = cexpr(B0, [], St0),
-    {B1,St1}.
-
-%% cclause(Lclause, [AfterVar], State) -> {Cclause,State}.
-%%  The AfterVars are the exported variables.
-
-cclause(#iclause{anno=#a{anno=Anno},pats=Ps,guard=G0,body=B0}, Exp, St0) ->
-    {B1,_Us1,St1} = cexprs(B0, Exp, St0),
-    {G1,St2} = cguard(G0, St1),
-    {#c_clause{anno=Anno,pats=Ps,guard=G1,body=B1},St2}.
-
-cclauses(Lcs, Es, St0) ->
-    mapfoldl(fun (Lc, St) -> cclause(Lc, Es, St) end, St0, Lcs).
-
-cguard([], St) -> {#c_atom{val=true},St};
-cguard(Gs, St0) ->
-    {G,_,St1} = cexprs(Gs, [], St0),
-    {G,St1}.
- 
-%% cexprs([Lexpr], [AfterVar], State) -> {Cexpr,[AfterVar],State}.
-%%  Must be sneaky here at the last expr when combining exports for the
-%%  whole sequence and exports for that expr.
-
-cexprs([#iset{var=#c_var{name=Name}=Var}=Iset], As, St) ->
-    %% Make return value explicit, and make Var true top level.
-    cexprs([Iset,Var#c_var{anno=#a{us=[Name]}}], As, St);
-cexprs([Le], As, St0) ->
-    {Ce,Es,Us,St1} = cexpr(Le, As, St0),
-    Exp = make_vars(As),			%The export variables
-    if
-	Es == [] -> {core_lib:make_values([Ce|Exp]),union(Us, As),St1};
-	true ->
-	    {R,St2} = new_var(St1),
-	    {#c_let{anno=get_lineno_anno(Ce),
-		    vars=[R|make_vars(Es)],arg=Ce,
-		    body=core_lib:make_values([R|Exp])},
-	     union(Us, As),St2}
-    end;
-cexprs([#iset{anno=#a{anno=A},var=V,arg=A0}|Les], As0, St0) ->
-    {Ces,As1,St1} = cexprs(Les, As0, St0),
-    {A1,Es,Us,St2} = cexpr(A0, As1, St1),
-    {#c_let{anno=A,vars=[V|make_vars(Es)],arg=A1,body=Ces},
-     union(Us, As1),St2};
-cexprs([Le|Les], As0, St0) ->
-    {Ces,As1,St1} = cexprs(Les, As0, St0),
-    {Ce,Es,Us,St2} = cexpr(Le, As1, St1),
-    if
-	Es == [] ->
-	    {#c_seq{arg=Ce,body=Ces},union(Us, As1),St2};
-	true ->
-	    {R,St3} = new_var(St2),
-	    {#c_let{vars=[R|make_vars(Es)],arg=Ce,body=Ces},
-	     union(Us, As1),St3}
-    end.
-
-%% cexpr(Lexpr, [AfterVar], State) -> {Cexpr,[ExpVar],[UsedVar],State}.
-
-cexpr(#iletrec{anno=A,defs=Fs0,body=B0}, As, St0) ->
-    {Fs1,{_,St1}} = mapfoldl(fun ({Name,F0}, {Used,St0}) ->
-					{F1,[],Us,St1} = cexpr(F0, [], St0),
-					{#c_def{name=#c_fname{id=Name,arity=1},
-						val=F1},
-					 {union(Us, Used),St1}}
-				end, {[],St0}, Fs0),
-    Exp = intersection(A#a.ns, As),
-    {B1,_Us,St2} = cexprs(B0, Exp, St1),
-    {#c_letrec{anno=A#a.anno,defs=Fs1,body=B1},Exp,A#a.us,St2};
-cexpr(#icase{anno=A,args=Largs,clauses=Lcs,fc=Lfc}, As, St0) ->
-    Exp = intersection(A#a.ns, As),		%Exports
-    {Cargs,St1} = foldr(fun (La, {Cas,Sta}) ->
-				{Ca,[],_Us1,Stb} = cexpr(La, As, Sta),
-				{[Ca|Cas],Stb}
-			end, {[],St0}, Largs),
-    {Ccs,St2} = cclauses(Lcs, Exp, St1),
-    {Cfc,St3} = cclause(Lfc, [], St2),		%Never exports
-    {#c_case{anno=A#a.anno,
-	     arg=core_lib:make_values(Cargs),clauses=Ccs ++ [Cfc]},
-     Exp,A#a.us,St3};
-cexpr(#ireceive1{anno=A,clauses=Lcs}, As, St0) ->
-    Exp = intersection(A#a.ns, As),		%Exports
-    {Ccs,St1} = cclauses(Lcs, Exp, St0),
-    {#c_receive{anno=A#a.anno,
-		clauses=Ccs,
-	       timeout=#c_atom{val=infinity},action=#c_atom{val=true}},
-     Exp,A#a.us,St1};
-cexpr(#ireceive2{anno=A,clauses=Lcs,timeout=Lto,action=Les}, As, St0) ->
-    Exp = intersection(A#a.ns, As),		%Exports
-    {Cto,[],_Us1,St1} = cexpr(Lto, As, St0),
-    {Ccs,St2} = cclauses(Lcs, Exp, St1),
-    {Ces,_Us2,St3} = cexprs(Les, Exp, St2),
-    {#c_receive{anno=A#a.anno,
-		clauses=Ccs,timeout=Cto,action=Ces},
-     Exp,A#a.us,St3};
-cexpr(#itry{anno=A,args=La,vars=Vs,body=Lb,evars=Evs,handler=Lh}, As, St0) ->
-    Exp = intersection(A#a.ns, As),           %Exports
-    {Ca,_Us1,St1} = cexprs(La, [], St0),
-    {Cb,_Us2,St2} = cexprs(Lb, Exp, St1),
-    {Ch,_Us3,St3} = cexprs(Lh, Exp, St2),
-    {#c_try{anno=A#a.anno,arg=Ca,vars=Vs,body=Cb,evars=Evs,handler=Ch},
-     Exp,A#a.us,St3};
-cexpr(#icatch{anno=A,body=Les}, _As, St0) ->
-    {Ces,_Us1,St1} = cexprs(Les, [], St0),	%Never export!
-    {#c_catch{body=Ces},[],A#a.us,St1};
-cexpr(#ifun{anno=A,id=Id,vars=Args,clauses=Lcs,fc=Lfc}, _As, St0) ->
-    {Ccs,St1} = cclauses(Lcs, [], St0),		%NEVER export!
-    {Cfc,St2} = cclause(Lfc, [], St1),
-    Anno = A#a.anno,
-    {#c_fun{anno=Id++Anno,vars=Args,
-	    body=#c_case{anno=Anno,
-			 arg=core_lib:set_anno(core_lib:make_values(Args), Anno),
-			 clauses=Ccs ++ [Cfc]}},
-     [],A#a.us,St2};
-cexpr(#iapply{anno=A,op=Op,args=Args}, _As, St) ->
-    {#c_apply{anno=A#a.anno,op=Op,args=Args},[],A#a.us,St};
-cexpr(#icall{anno=A,module=Mod,name=Name,args=Args}, _As, St) ->
-    {#c_call{anno=A#a.anno,module=Mod,name=Name,args=Args},[],A#a.us,St};
-cexpr(#iprimop{anno=A,name=Name,args=Args}, _As, St) ->
-    {#c_primop{anno=A#a.anno,name=Name,args=Args},[],A#a.us,St};
-cexpr(#iprotect{anno=A,body=Es}, _As, St0) ->
-    {Ce,_,St1} = cexprs(Es, [], St0),
-    V = #c_var{name='Try'},		%The names are arbitrary
-    Vs = [#c_var{name='T'},#c_var{name='R'}],
-    {#c_try{anno=A#a.anno,arg=Ce,vars=[V],body=V,
-	    evars=Vs,handler=#c_atom{val=false}},
-     [],A#a.us,St1};
-cexpr(#ibinary{anno=#a{anno=Anno,us=Us},segments=Segs}, _As, St) ->
-    {#c_binary{anno=Anno,segments=Segs},[],Us,St};
-cexpr(Lit, _As, St) ->
-    true = core_lib:is_simple(Lit),		%Sanity check!
-    Anno = core_lib:get_anno(Lit),
-    Vs = Anno#a.us,
-    %%Vs = lit_vars(Lit),
-    {core_lib:set_anno(Lit, Anno#a.anno),[],Vs,St}.
-
-%% lit_vars(Literal) -> [Var].
-
-lit_vars(Lit) -> lit_vars(Lit, []).
-
-lit_vars(#c_cons{hd=H,tl=T}, Vs) -> lit_vars(H, lit_vars(T, Vs));
-lit_vars(#c_tuple{es=Es}, Vs) -> lit_list_vars(Es, Vs);
-lit_vars(#c_var{name=V}, Vs) -> add_element(V, Vs); 
-lit_vars(_, Vs) -> Vs.				%These are atomic
-
-% lit_bin_vars(Segs, Vs) ->
-%     foldl(fun (#c_bitstr{val=V,size=S}, Vs0) ->
-% 		  lit_vars(V, lit_vars(S, Vs0))
-% 	  end, Vs, Segs).
-
-lit_list_vars(Ls) -> lit_list_vars(Ls, []).
-
-lit_list_vars(Ls, Vs) ->
-    foldl(fun (L, Vs0) -> lit_vars(L, Vs0) end, Vs, Ls).
-
-bitstr_vars(Segs) ->
-    bitstr_vars(Segs, []).
-
-bitstr_vars(Segs, Vs) ->
-    foldl(fun (#c_bitstr{val=V,size=S}, Vs0) ->
- 		  lit_vars(V, lit_vars(S, Vs0))
-	  end, Vs, Segs).
-
-get_ianno(Ce) ->
-    case core_lib:get_anno(Ce) of
-	#a{}=A -> A;
-	A when is_list(A) -> #a{anno=A}
-    end.
-
-get_lineno_anno(Ce) ->
-    case core_lib:get_anno(Ce) of
-	#a{anno=A} -> A;
-	A when is_list(A) -> A
-    end.
-
-
-%%%
-%%% Handling of warnings.
-%%%
-
-format_error(nomatch) -> "pattern cannot possibly match".
-
-add_warning(Line, Term, #core{ws=Ws}=St) when Line >= 0 ->
-    St#core{ws=[{Line,?MODULE,Term}|Ws]};
-add_warning(_, _, St) -> St.
- 
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_kernel.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_kernel.erl
deleted file mode 100644
index 2d600fabc4..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_kernel.erl
+++ /dev/null
@@ -1,1568 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: v3_kernel.erl,v 1.3 2010/03/04 13:54:20 maria Exp $
-%%
-%% Purpose : Transform Core Erlang to Kernel Erlang
-
-%% Kernel erlang is like Core Erlang with a few significant
-%% differences:
-%%
-%% 1. It is flat!  There are no nested calls or sub-blocks.
-%%
-%% 2. All variables are unique in a function.  There is no scoping, or
-%% rather the scope is the whole function.
-%%
-%% 3. Pattern matching (in cases and receives) has been compiled.
-%%
-%% 4. The annotations contain variable usages.  Seeing we have to work
-%% this out anyway for funs we might as well pass it on for free to
-%% later passes.
-%%
-%% 5. All remote-calls are to statically named m:f/a. Meta-calls are
-%% passed via erlang:apply/3.
-%%
-%% The translation is done in two passes:
-%%
-%% 1. Basic translation, translate variable/function names, flatten
-%% completely, pattern matching compilation.
-%%
-%% 2. Fun-lifting (lambda-lifting), variable usage annotation and
-%% last-call handling.
-%%
-%% All new Kexprs are created in the first pass, they are just
-%% annotated in the second.
-%%
-%% Functions and BIFs
-%%
-%% Functions are "call"ed or "enter"ed if it is a last call, their
-%% return values may be ignored.  BIFs are things which are known to
-%% be internal by the compiler and can only be called, their return
-%% values cannot be ignored.
-%%
-%% Letrec's are handled rather naively.  All the functions in one
-%% letrec are handled as one block to find the free variables.  While
-%% this is not optimal it reflects how letrec's often are used.  We
-%% don't have to worry about variable shadowing and nested letrec's as
-%% this is handled in the variable/function name translation.  There
-%% is a little bit of trickery to ensure letrec transformations fit
-%% into the scheme of things.
-%%
-%% To ensure unique variable names we use a variable substitution
-%% table and keep the set of all defined variables.  The nested
-%% scoping of Core means that we must also nest the substitution
-%% tables, but the defined set must be passed through to match the
-%% flat structure of Kernel and to make sure variables with the same
-%% name from different scopes get different substitutions.
-%%
-%% We also use these substitutions to handle the variable renaming
-%% necessary in pattern matching compilation.
-%%
-%% The pattern matching compilation assumes that the values of
-%% different types don't overlap.  This means that as there is no
-%% character type yet in the machine all characters must be converted
-%% to integers!
-
--module(v3_kernel).
-
--export([module/2,format_error/1]).
-
--import(lists, [map/2,foldl/3,foldr/3,mapfoldl/3,splitwith/2,
-		member/2,reverse/1,reverse/2]).
--import(ordsets, [add_element/2,del_element/2,union/2,union/1,subtract/2]).
-
--include("core_parse.hrl").
--include("v3_kernel.hrl").
-
-%% These are not defined in v3_kernel.hrl.
-get_kanno(Kthing) -> element(2, Kthing).
-set_kanno(Kthing, Anno) -> setelement(2, Kthing, Anno).
-
-%% Internal kernel expressions and help functions.
-%% N.B. the annotation field is ALWAYS the first field!
-
--record(ivalues, {anno=[],args}).
--record(ifun, {anno=[],vars,body}).
--record(iset, {anno=[],vars,arg,body}).
--record(iletrec, {anno=[],defs}).
--record(ialias, {anno=[],vars,pat}).
--record(iclause, {anno=[],sub,pats,guard,body}).
--record(ireceive_accept, {anno=[],arg}).
--record(ireceive_next, {anno=[],arg}).
-
-%% State record for kernel translator.
--record(kern, {func,				%Current function
-	       vcount=0,			%Variable counter
-	       fcount=0,			%Fun counter
-	       ds=[],				%Defined variables
-	       funs=[],				%Fun functions
-	       free=[],				%Free variables
-	       ws=[],				%Warnings.
-	       extinstr=false}).		%Generate extended instructions
-
-module(#c_module{anno=A,name=M,exports=Es,attrs=As,defs=Fs}, Options) ->
-    ExtInstr = not member(no_new_apply, Options),
-    {Kfs,St} = mapfoldl(fun function/2, #kern{extinstr=ExtInstr}, Fs),
-    Kes = map(fun (#c_fname{id=N,arity=Ar}) -> {N,Ar} end, Es),
-    Kas = map(fun (#c_def{name=#c_atom{val=N},val=V}) ->
-		      {N,core_lib:literal_value(V)} end, As),
-    {ok,#k_mdef{anno=A,name=M#c_atom.val,exports=Kes,attributes=Kas,
-		body=Kfs ++ St#kern.funs},St#kern.ws}.
-
-function(#c_def{anno=Af,name=#c_fname{id=F,arity=Arity},val=Body}, St0) ->
-    %%ok = io:fwrite("kern: ~p~n", [{F,Arity}]),
-    St1 = St0#kern{func={F,Arity},vcount=0,fcount=0,ds=sets:new()},
-    {#ifun{anno=Ab,vars=Kvs,body=B0},[],St2} = expr(Body, new_sub(), St1),
-    {B1,_,St3} = ubody(B0, return, St2),
-    %%B1 = B0, St3 = St2,				%Null second pass
-    {#k_fdef{anno=#k{us=[],ns=[],a=Af ++ Ab},
-	     func=F,arity=Arity,vars=Kvs,body=B1},St3}.
-
-%% body(Cexpr, Sub, State) -> {Kexpr,[PreKepxr],State}.
-%%  Do the main sequence of a body.  A body ends in an atomic value or
-%%  values.  Must check if vector first so do expr.
-
-body(#c_values{anno=A,es=Ces}, Sub, St0) ->
-    %% Do this here even if only in bodies.
-    {Kes,Pe,St1} = atomic_list(Ces, Sub, St0),
-    %%{Kes,Pe,St1} = expr_list(Ces, Sub, St0),
-    {#ivalues{anno=A,args=Kes},Pe,St1};
-body(#ireceive_next{anno=A}, _, St) ->
-    {#k_receive_next{anno=A},[],St};
-body(Ce, Sub, St0) ->
-    expr(Ce, Sub, St0).
-
-%% guard(Cexpr, Sub, State) -> {Kexpr,State}.
-%%  We handle guards almost as bodies. The only special thing we
-%%  must do is to make the final Kexpr a #k_test{}.
-%%  Also, we wrap the entire guard in a try/catch which is
-%%  not strictly needed, but makes sure that every 'bif' instruction
-%%  will get a proper failure label.
-
-guard(G0, Sub, St0) ->
-    {G1,St1} = wrap_guard(G0, St0),
-    {Ge0,Pre,St2} = expr(G1, Sub, St1),
-    {Ge,St} = gexpr_test(Ge0, St2),
-    {pre_seq(Pre, Ge),St}.
-
-%% Wrap the entire guard in a try/catch if needed.
-
-wrap_guard(#c_try{}=Try, St) -> {Try,St};
-wrap_guard(Core, St0) ->
-    {VarName,St} = new_var_name(St0),
-    Var = #c_var{name=VarName},
-    Try = #c_try{arg=Core,vars=[Var],body=Var,evars=[],handler=#c_atom{val=false}},
-    {Try,St}.
-    
-%% gexpr_test(Kexpr, State) -> {Kexpr,State}.
-%%  Builds the final boolean test from the last Kexpr in a guard test.
-%%  Must enter try blocks and isets and find the last Kexpr in them.
-%%  This must end in a recognised BEAM test!
-
-gexpr_test(#k_bif{anno=A,op=#k_remote{mod=#k_atom{val=erlang},
-				      name=#k_atom{val=is_boolean},arity=1}=Op,
-		  args=Kargs}, St) ->
-    %% XXX Remove this clause in R11. For bootstrap purposes, we must
-    %% recognize erlang:is_boolean/1 here.
-    {#k_test{anno=A,op=Op,args=Kargs},St};
-gexpr_test(#k_bif{anno=A,op=#k_remote{mod=#k_atom{val=erlang},
-				      name=#k_atom{val=internal_is_record},arity=3}=Op,
-		  args=Kargs}, St) ->
-    {#k_test{anno=A,op=Op,args=Kargs},St};
-gexpr_test(#k_bif{anno=A,op=#k_remote{mod=#k_atom{val=erlang},
-				      name=#k_atom{val=F},arity=Ar}=Op,
-		  args=Kargs}=Ke, St) ->
-    %% Either convert to test if ok, or add test.
-    %% At this stage, erlang:float/1 is not a type test. (It should
-    %% have been converted to erlang:is_float/1.)
-    case erl_internal:new_type_test(F, Ar) orelse
-	erl_internal:comp_op(F, Ar) of
-	true -> {#k_test{anno=A,op=Op,args=Kargs},St};
-	false -> gexpr_test_add(Ke, St)		%Add equality test
-    end;
-gexpr_test(#k_try{arg=B0,vars=[#k_var{name=X}],body=#k_var{name=X},
-		  handler=#k_atom{val=false}}=Try, St0) ->
-    {B,St} = gexpr_test(B0, St0),
-    %%ok = io:fwrite("~w: ~p~n", [?LINE,{B0,B}]),
-    {Try#k_try{arg=B},St};
-gexpr_test(#iset{body=B0}=Iset, St0) ->
-    {B1,St1} = gexpr_test(B0, St0),
-    {Iset#iset{body=B1},St1};
-gexpr_test(Ke, St) -> gexpr_test_add(Ke, St).	%Add equality test
-
-gexpr_test_add(Ke, St0) ->
-    Test = #k_remote{mod=#k_atom{val='erlang'},
-		     name=#k_atom{val='=:='},
-		     arity=2},
-    {Ae,Ap,St1} = force_atomic(Ke, St0),
-    {pre_seq(Ap, #k_test{anno=get_kanno(Ke),
-			 op=Test,args=[Ae,#k_atom{val='true'}]}),St1}.
-
-%% expr(Cexpr, Sub, State) -> {Kexpr,[PreKexpr],State}.
-%%  Convert a Core expression, flattening it at the same time.
-
-expr(#c_var{anno=A,name=V}, Sub, St) ->
-    {#k_var{anno=A,name=get_vsub(V, Sub)},[],St};
-expr(#c_char{anno=A,val=C}, _Sub, St) ->
-    {#k_int{anno=A,val=C},[],St};		%Convert to integers!
-expr(#c_int{anno=A,val=I}, _Sub, St) ->
-    {#k_int{anno=A,val=I},[],St};
-expr(#c_float{anno=A,val=F}, _Sub, St) ->
-    {#k_float{anno=A,val=F},[],St};
-expr(#c_atom{anno=A,val=At}, _Sub, St) ->
-    {#k_atom{anno=A,val=At},[],St};
-expr(#c_string{anno=A,val=S}, _Sub, St) ->
-    {#k_string{anno=A,val=S},[],St};
-expr(#c_nil{anno=A}, _Sub, St) ->
-    {#k_nil{anno=A},[],St};
-expr(#c_cons{anno=A,hd=Ch,tl=Ct}, Sub, St0) ->
-    %% Do cons in two steps, first the expressions left to right, then
-    %% any remaining literals right to left.
-    {Kh0,Hp0,St1} = expr(Ch, Sub, St0),
-    {Kt0,Tp0,St2} = expr(Ct, Sub, St1),
-    {Kt1,Tp1,St3} = force_atomic(Kt0, St2),
-    {Kh1,Hp1,St4} = force_atomic(Kh0, St3),
-    {#k_cons{anno=A,hd=Kh1,tl=Kt1},Hp0 ++ Tp0 ++ Tp1 ++ Hp1,St4};
-expr(#c_tuple{anno=A,es=Ces}, Sub, St0) ->
-    {Kes,Ep,St1} = atomic_list(Ces, Sub, St0),
-    {#k_tuple{anno=A,es=Kes},Ep,St1};
-expr(#c_binary{anno=A,segments=Cv}, Sub, St0) ->
-    case catch atomic_bin(Cv, Sub, St0, 0) of
-	{'EXIT',R} -> exit(R);
-	bad_element_size ->
-	    Erl = #c_atom{val=erlang},
-	    Name = #c_atom{val=error},
-	    Args = [#c_atom{val=badarg}],
-	    Fault = #c_call{module=Erl,name=Name,args=Args},
-	    expr(Fault, Sub, St0);
-	{Kv,Ep,St1} ->
-	    {#k_binary{anno=A,segs=Kv},Ep,St1}
-    end;
-expr(#c_fname{anno=A,arity=Ar}=Fname, Sub, St) ->
-    %% A local in an expression.
-    %% For now, these are wrapped into a fun by reverse
-    %% etha-conversion, but really, there should be exactly one
-    %% such "lambda function" for each escaping local name,
-    %% instead of one for each occurrence as done now.
-    Vs = [#c_var{name=list_to_atom("V" ++ integer_to_list(V))} ||
-	     V <- integers(1, Ar)],
-    Fun = #c_fun{anno=A,vars=Vs,body=#c_apply{op=Fname,args=Vs}},
-    expr(Fun, Sub, St);
-expr(#c_fun{anno=A,vars=Cvs,body=Cb}, Sub0, St0) ->
-    {Kvs,Sub1,St1} = pattern_list(Cvs, Sub0, St0),
-    %%ok = io:fwrite("~w: ~p~n", [?LINE,{{Cvs,Sub0,St0},{Kvs,Sub1,St1}}]),
-    {Kb,Pb,St2} = body(Cb, Sub1, St1),
-    {#ifun{anno=A,vars=Kvs,body=pre_seq(Pb, Kb)},[],St2};
-expr(#c_seq{arg=Ca,body=Cb}, Sub, St0) ->
-    {Ka,Pa,St1} = body(Ca, Sub, St0),
-    case is_exit_expr(Ka) of
-	true -> {Ka,Pa,St1};
-	false ->
-	    {Kb,Pb,St2} = body(Cb, Sub, St1),
-	    {Kb,Pa ++ [Ka] ++ Pb,St2}
-    end;
-expr(#c_let{anno=A,vars=Cvs,arg=Ca,body=Cb}, Sub0, St0) ->
-    %%ok = io:fwrite("~w: ~p~n", [?LINE,{Cvs,Sub0,St0}]),
-    {Ka,Pa,St1} = body(Ca, Sub0, St0),
-    case is_exit_expr(Ka) of
-	true -> {Ka,Pa,St1};
-	false ->
-	    {Kps,Sub1,St2} = pattern_list(Cvs, Sub0, St1),
-	    %%ok = io:fwrite("~w: ~p~n", [?LINE,{Kps,Sub1,St1,St2}]),
-	    %% Break known multiple values into separate sets.
-	    Sets = case Ka of
-		       #ivalues{args=Kas} ->
-			   foldr2(fun (V, Val, Sb) ->
-					  [#iset{vars=[V],arg=Val}|Sb] end,
-				  [], Kps, Kas);
-		       _Other ->
-			   [#iset{anno=A,vars=Kps,arg=Ka}]
-		   end,
-	    {Kb,Pb,St3} = body(Cb, Sub1, St2),
-	    {Kb,Pa ++ Sets ++ Pb,St3}
-    end;
-expr(#c_letrec{anno=A,defs=Cfs,body=Cb}, Sub0, St0) ->
-    %% Make new function names and store substitution.
-    {Fs0,{Sub1,St1}} =
-	mapfoldl(fun (#c_def{name=#c_fname{id=F,arity=Ar},val=B}, {Sub,St0}) ->
-			 {N,St1} = new_fun_name(atom_to_list(F)
-						++ "/" ++
-						integer_to_list(Ar),
-						St0),
-			 {{N,B},{set_fsub(F, Ar, N, Sub),St1}}
-		 end, {Sub0,St0}, Cfs),
-    %% Run translation on functions and body.
-    {Fs1,St2} = mapfoldl(fun ({N,Fd0}, St1) ->
-				 {Fd1,[],St2} = expr(Fd0, Sub1, St1),
-				 Fd = set_kanno(Fd1, A),
-				 {{N,Fd},St2}
-			 end, St1, Fs0),
-    {Kb,Pb,St3} = body(Cb, Sub1, St2),
-    {Kb,[#iletrec{anno=A,defs=Fs1}|Pb],St3};
-expr(#c_case{arg=Ca,clauses=Ccs}, Sub, St0) ->
-    {Ka,Pa,St1} = body(Ca, Sub, St0),		%This is a body!
-    {Kvs,Pv,St2} = match_vars(Ka, St1),		%Must have variables here!
-    {Km,St3} = kmatch(Kvs, Ccs, Sub, St2),
-    Match = flatten_seq(build_match(Kvs, Km)),
-    {last(Match),Pa ++ Pv ++ first(Match),St3};
-expr(#c_receive{anno=A,clauses=Ccs0,timeout=Ce,action=Ca}, Sub, St0) ->
-    {Ke,Pe,St1} = atomic_lit(Ce, Sub, St0),	%Force this to be atomic!
-    {Rvar,St2} = new_var(St1),
-    %% Need to massage accept clauses and add reject clause before matching.
-    Ccs1 = map(fun (#c_clause{anno=Banno,body=B0}=C) ->
-		       B1 = #c_seq{arg=#ireceive_accept{anno=A},body=B0},
-		       C#c_clause{anno=Banno,body=B1}
-	       end, Ccs0),
-    {Mpat,St3} = new_var_name(St2),
-    Rc = #c_clause{anno=[compiler_generated|A],
-		   pats=[#c_var{name=Mpat}],guard=#c_atom{anno=A,val=true},
-		   body=#ireceive_next{anno=A}},
-    {Km,St4} = kmatch([Rvar], Ccs1 ++ [Rc], Sub, add_var_def(Rvar, St3)),
-    {Ka,Pa,St5} = body(Ca, Sub, St4),
-    {#k_receive{anno=A,var=Rvar,body=Km,timeout=Ke,action=pre_seq(Pa, Ka)},
-     Pe,St5};
-expr(#c_apply{anno=A,op=Cop,args=Cargs}, Sub, St) ->
-    c_apply(A, Cop, Cargs, Sub, St);
-expr(#c_call{anno=A,module=M0,name=F0,args=Cargs}, Sub, St0) ->
-    {[M1,F1|Kargs],Ap,St1} = atomic_list([M0,F0|Cargs], Sub, St0),
-    Ar = length(Cargs),
-    case {M1,F1} of
-	{#k_atom{val=Ma},#k_atom{val=Fa}} ->
-	    Call = case is_remote_bif(Ma, Fa, Ar) of
-		       true ->
-			   #k_bif{anno=A,
-				  op=#k_remote{mod=M1,name=F1,arity=Ar},
-				  args=Kargs};
-		       false ->
-			   #k_call{anno=A,
-				   op=#k_remote{mod=M1,name=F1,arity=Ar},
-				   args=Kargs}
-		   end,
-	    {Call,Ap,St1};
-	_Other when St0#kern.extinstr == false -> %Old explicit apply
-	    Call = #c_call{anno=A,
-			   module=#c_atom{val=erlang},
-			   name=#c_atom{val=apply},
-			   args=[M0,F0,make_list(Cargs)]},
-	    expr(Call, Sub, St0);
-	_Other ->				%New instruction in R10.
-	    Call = #k_call{anno=A,
-			   op=#k_remote{mod=M1,name=F1,arity=Ar},
-			   args=Kargs},
-	    {Call,Ap,St1}
-    end;
-expr(#c_primop{anno=A,name=#c_atom{val=match_fail},args=Cargs}, Sub, St0) ->
-    %% This special case will disappear.
-    {Kargs,Ap,St1} = atomic_list(Cargs, Sub, St0),
-    Ar = length(Cargs),
-    Call = #k_call{anno=A,op=#k_internal{name=match_fail,arity=Ar},args=Kargs},
-    {Call,Ap,St1};
-expr(#c_primop{anno=A,name=#c_atom{val=N},args=Cargs}, Sub, St0) ->
-    {Kargs,Ap,St1} = atomic_list(Cargs, Sub, St0),
-    Ar = length(Cargs),
-    {#k_bif{anno=A,op=#k_internal{name=N,arity=Ar},args=Kargs},Ap,St1};
-expr(#c_try{anno=A,arg=Ca,vars=Cvs,body=Cb,evars=Evs,handler=Ch}, Sub0, St0) ->
-    %% The normal try expression. The body and exception handler
-    %% variables behave as let variables.
-    {Ka,Pa,St1} = body(Ca, Sub0, St0),
-    {Kcvs,Sub1,St2} = pattern_list(Cvs, Sub0, St1),
-    {Kb,Pb,St3} = body(Cb, Sub1, St2),
-    {Kevs,Sub2,St4} = pattern_list(Evs, Sub0, St3),
-    {Kh,Ph,St5} = body(Ch, Sub2, St4),
-    {#k_try{anno=A,arg=pre_seq(Pa, Ka),
-	    vars=Kcvs,body=pre_seq(Pb, Kb),
-	    evars=Kevs,handler=pre_seq(Ph, Kh)},[],St5};
-expr(#c_catch{anno=A,body=Cb}, Sub, St0) ->
-    {Kb,Pb,St1} = body(Cb, Sub, St0),
-    {#k_catch{anno=A,body=pre_seq(Pb, Kb)},[],St1};
-%% Handle internal expressions.
-expr(#ireceive_accept{anno=A}, _Sub, St) -> {#k_receive_accept{anno=A},[],St}.
-
-%% expr_list([Cexpr], Sub, State) -> {[Kexpr],[PreKexpr],State}.
-
-% expr_list(Ces, Sub, St) ->
-%     foldr(fun (Ce, {Kes,Esp,St0}) ->
-% 		  {Ke,Ep,St1} = expr(Ce, Sub, St0),
-% 		  {[Ke|Kes],Ep ++ Esp,St1}
-% 	  end, {[],[],St}, Ces).
-
-%% match_vars(Kexpr, State) -> {[Kvar],[PreKexpr],State}.
-%%  Force return from body into a list of variables.
-
-match_vars(#ivalues{args=As}, St) ->
-    foldr(fun (Ka, {Vs,Vsp,St0}) ->
-		  {V,Vp,St1} = force_variable(Ka, St0),
-		  {[V|Vs],Vp ++ Vsp,St1}
-	  end, {[],[],St}, As);
-match_vars(Ka, St0) ->
-    {V,Vp,St1} = force_variable(Ka, St0),
-    {[V],Vp,St1}.
-
-%% c_apply(A, Op, [Carg], Sub, State) -> {Kexpr,[PreKexpr],State}.
-%%  Transform application, detect which are guaranteed to be bifs.
-
-c_apply(A, #c_fname{anno=Ra,id=F0,arity=Ar}, Cargs, Sub, St0) ->
-    {Kargs,Ap,St1} = atomic_list(Cargs, Sub, St0),
-    F1 = get_fsub(F0, Ar, Sub),			%Has it been rewritten
-    {#k_call{anno=A,op=#k_local{anno=Ra,name=F1,arity=Ar},args=Kargs},
-     Ap,St1};
-c_apply(A, Cop, Cargs, Sub, St0) ->
-    {Kop,Op,St1} = variable(Cop, Sub, St0),
-    {Kargs,Ap,St2} = atomic_list(Cargs, Sub, St1),
-    {#k_call{anno=A,op=Kop,args=Kargs},Op ++ Ap,St2}.
-
-flatten_seq(#iset{anno=A,vars=Vs,arg=Arg,body=B}) ->
-    [#iset{anno=A,vars=Vs,arg=Arg}|flatten_seq(B)];
-flatten_seq(Ke) -> [Ke].
-
-pre_seq([#iset{anno=A,vars=Vs,arg=Arg,body=B}|Ps], K) ->
-    B = undefined,				%Assertion.
-    #iset{anno=A,vars=Vs,arg=Arg,body=pre_seq(Ps, K)};
-pre_seq([P|Ps], K) ->
-    #iset{vars=[],arg=P,body=pre_seq(Ps, K)};
-pre_seq([], K) -> K.
-
-%% atomic_lit(Cexpr, Sub, State) -> {Katomic,[PreKexpr],State}.
-%%  Convert a Core expression making sure the result is an atomic
-%%  literal.
-
-atomic_lit(Ce, Sub, St0) ->
-    {Ke,Kp,St1} = expr(Ce, Sub, St0),
-    {Ka,Ap,St2} = force_atomic(Ke, St1),
-    {Ka,Kp ++ Ap,St2}.
-
-force_atomic(Ke, St0) ->
-    case is_atomic(Ke) of
-	true -> {Ke,[],St0}; 
-	false ->
-	    {V,St1} = new_var(St0),
-	    {V,[#iset{vars=[V],arg=Ke}],St1}
-    end.
-
-% force_atomic_list(Kes, St) ->
-%     foldr(fun (Ka, {As,Asp,St0}) ->
-% 		  {A,Ap,St1} = force_atomic(Ka, St0),
-% 		  {[A|As],Ap ++ Asp,St1}
-% 	  end, {[],[],St}, Kes).
-
-atomic_bin([#c_bitstr{anno=A,val=E0,size=S0,unit=U,type=T,flags=Fs}|Es0],
-	   Sub, St0, B0) ->
-    {E,Ap1,St1} = atomic_lit(E0, Sub, St0),
-    {S1,Ap2,St2} = atomic_lit(S0, Sub, St1),
-    validate_bin_element_size(S1),
-    U0 = core_lib:literal_value(U),
-    Fs0 = core_lib:literal_value(Fs),
-    {B1,Fs1} = aligned(B0, S1, U0, Fs0),
-    {Es,Ap3,St3} = atomic_bin(Es0, Sub, St2, B1),
-    {#k_bin_seg{anno=A,size=S1,
-		unit=U0,
-		type=core_lib:literal_value(T),
-		flags=Fs1,
-		seg=E,next=Es},
-     Ap1++Ap2++Ap3,St3};
-atomic_bin([], _Sub, St, _Bits) -> {#k_bin_end{},[],St}.
-
-validate_bin_element_size(#k_var{}) -> ok;
-validate_bin_element_size(#k_int{val=V}) when V >= 0 -> ok;
-validate_bin_element_size(#k_atom{val=all}) -> ok;
-validate_bin_element_size(_) -> throw(bad_element_size).
-    
-%% atomic_list([Cexpr], Sub, State) -> {[Kexpr],[PreKexpr],State}.
-
-atomic_list(Ces, Sub, St) ->
-    foldr(fun (Ce, {Kes,Esp,St0}) ->
-		  {Ke,Ep,St1} = atomic_lit(Ce, Sub, St0),
-		  {[Ke|Kes],Ep ++ Esp,St1}
-	  end, {[],[],St}, Ces).
-
-%% is_atomic(Kexpr) -> boolean().
-%%  Is a Kexpr atomic?  Strings are NOT considered atomic!
-
-is_atomic(#k_int{}) -> true;
-is_atomic(#k_float{}) -> true;
-is_atomic(#k_atom{}) -> true;
-%%is_atomic(#k_char{}) -> true;			%No characters
-%%is_atomic(#k_string{}) -> true;
-is_atomic(#k_nil{}) -> true;
-is_atomic(#k_var{}) -> true;
-is_atomic(_) -> false.
-
-%% variable(Cexpr, Sub, State) -> {Kvar,[PreKexpr],State}.
-%%  Convert a Core expression making sure the result is a variable.
-
-variable(Ce, Sub, St0) ->
-    {Ke,Kp,St1} = expr(Ce, Sub, St0),
-    {Kv,Vp,St2} = force_variable(Ke, St1),
-    {Kv,Kp ++ Vp,St2}.
-
-force_variable(#k_var{}=Ke, St) -> {Ke,[],St};
-force_variable(Ke, St0) ->
-    {V,St1} = new_var(St0),
-    {V,[#iset{vars=[V],arg=Ke}],St1}.
-
-%% pattern(Cpat, Sub, State) -> {Kpat,Sub,State}.
-%%  Convert patterns.  Variables shadow so rename variables that are
-%%  already defined.
-
-pattern(#c_var{anno=A,name=V}, Sub, St0) ->
-    case sets:is_element(V, St0#kern.ds) of
-	true ->
-	    {New,St1} = new_var_name(St0),
-	    {#k_var{anno=A,name=New},
-	     set_vsub(V, New, Sub),
-	     St1#kern{ds=sets:add_element(New, St1#kern.ds)}};
-	false ->
-	    {#k_var{anno=A,name=V},Sub,
-	     St0#kern{ds=sets:add_element(V, St0#kern.ds)}}
-    end;
-pattern(#c_char{anno=A,val=C}, Sub, St) ->
-    {#k_int{anno=A,val=C},Sub,St};		%Convert to integers!
-pattern(#c_int{anno=A,val=I}, Sub, St) ->
-    {#k_int{anno=A,val=I},Sub,St};
-pattern(#c_float{anno=A,val=F}, Sub, St) ->
-    {#k_float{anno=A,val=F},Sub,St};
-pattern(#c_atom{anno=A,val=At}, Sub, St) ->
-    {#k_atom{anno=A,val=At},Sub,St};
-pattern(#c_string{val=S}, Sub, St) ->
-    L = foldr(fun (C, T) -> #k_cons{hd=#k_int{val=C},tl=T} end,
-	      #k_nil{}, S),
-    {L,Sub,St};
-pattern(#c_nil{anno=A}, Sub, St) ->
-    {#k_nil{anno=A},Sub,St};
-pattern(#c_cons{anno=A,hd=Ch,tl=Ct}, Sub0, St0) ->
-    {Kh,Sub1,St1} = pattern(Ch, Sub0, St0),
-    {Kt,Sub2,St2} = pattern(Ct, Sub1, St1),
-    {#k_cons{anno=A,hd=Kh,tl=Kt},Sub2,St2};
-pattern(#c_tuple{anno=A,es=Ces}, Sub0, St0) ->
-    {Kes,Sub1,St1} = pattern_list(Ces, Sub0, St0),
-    {#k_tuple{anno=A,es=Kes},Sub1,St1};
-pattern(#c_binary{anno=A,segments=Cv}, Sub0, St0) ->
-    {Kv,Sub1,St1} = pattern_bin(Cv, Sub0, St0),
-    {#k_binary{anno=A,segs=Kv},Sub1,St1};
-pattern(#c_alias{anno=A,var=Cv,pat=Cp}, Sub0, St0) ->
-    {Cvs,Cpat} = flatten_alias(Cp),
-    {Kvs,Sub1,St1} = pattern_list([Cv|Cvs], Sub0, St0),
-    {Kpat,Sub2,St2} = pattern(Cpat, Sub1, St1),
-    {#ialias{anno=A,vars=Kvs,pat=Kpat},Sub2,St2}.
-
-flatten_alias(#c_alias{var=V,pat=P}) ->
-    {Vs,Pat} = flatten_alias(P),
-    {[V|Vs],Pat};
-flatten_alias(Pat) -> {[],Pat}.
-
-pattern_bin(Es, Sub, St) -> pattern_bin(Es, Sub, St, 0).
-
-pattern_bin([#c_bitstr{anno=A,val=E0,size=S0,unit=U,type=T,flags=Fs}|Es0], 
-	    Sub0, St0, B0) ->
-    {S1,[],St1} = expr(S0, Sub0, St0),
-    U0 = core_lib:literal_value(U),
-    Fs0 = core_lib:literal_value(Fs),
-    %%ok= io:fwrite("~w: ~p~n", [?LINE,{B0,S1,U0,Fs0}]),
-    {B1,Fs1} = aligned(B0, S1, U0, Fs0),
-    {E,Sub1,St2} = pattern(E0, Sub0, St1),
-    {Es,Sub2,St3} = pattern_bin(Es0, Sub1, St2, B1),
-    {#k_bin_seg{anno=A,size=S1,
-		unit=U0,
-		type=core_lib:literal_value(T),
-		flags=Fs1,
-		seg=E,next=Es},
-     Sub2,St3};
-pattern_bin([], Sub, St, _Bits) -> {#k_bin_end{},Sub,St}.
-
-%% pattern_list([Cexpr], Sub, State) -> {[Kexpr],Sub,State}.
-
-pattern_list(Ces, Sub, St) ->
-    foldr(fun (Ce, {Kes,Sub0,St0}) ->
-		  {Ke,Sub1,St1} = pattern(Ce, Sub0, St0),
-		  {[Ke|Kes],Sub1,St1}
-	  end, {[],Sub,St}, Ces).
-
-%% new_sub() -> Subs.
-%% set_vsub(Name, Sub, Subs) -> Subs.
-%% subst_vsub(Name, Sub, Subs) -> Subs.
-%% get_vsub(Name, Subs) -> SubName.
-%%  Add/get substitute Sub for Name to VarSub.  Use orddict so we know
-%%  the format is a list {Name,Sub} pairs.  When adding a new
-%%  substitute we fold substitute chains so we never have to search
-%%  more than once.
-
-new_sub() -> orddict:new().
-
-get_vsub(V, Vsub) ->
-    case orddict:find(V, Vsub) of
-	{ok,Val} -> Val;
-	error -> V
-    end.
-
-set_vsub(V, S, Vsub) ->
-    orddict:store(V, S, Vsub).
-
-subst_vsub(V, S, Vsub0) ->
-    %% Fold chained substitutions.
-    Vsub1 = orddict:map(fun (_, V1) when V1 =:= V -> S;
-			    (_, V1) -> V1
-			end, Vsub0),
-    orddict:store(V, S, Vsub1).
-
-get_fsub(F, A, Fsub) ->
-    case orddict:find({F,A}, Fsub) of
-	{ok,Val} -> Val;
-	error -> F
-    end.
-
-set_fsub(F, A, S, Fsub) ->
-    orddict:store({F,A}, S, Fsub).
-
-new_fun_name(St) ->
-    new_fun_name("anonymous", St).
-
-%% new_fun_name(Type, State) -> {FunName,State}.
-
-new_fun_name(Type, #kern{func={F,Arity},fcount=C}=St) ->
-    Name = "-" ++ atom_to_list(F) ++ "/" ++ integer_to_list(Arity) ++
-	"-" ++ Type ++ "-" ++ integer_to_list(C) ++ "-",
-    {list_to_atom(Name),St#kern{fcount=C+1}}.
-
-%% new_var_name(State) -> {VarName,State}.
-
-new_var_name(#kern{vcount=C}=St) ->
-    {list_to_atom("ker" ++ integer_to_list(C)),St#kern{vcount=C+1}}.
-
-%% new_var(State) -> {#k_var{},State}.
-
-new_var(St0) ->
-    {New,St1} = new_var_name(St0),
-    {#k_var{name=New},St1}.
-
-%% new_vars(Count, State) -> {[#k_var{}],State}.
-%%  Make Count new variables.
-
-new_vars(N, St) -> new_vars(N, St, []).
-
-new_vars(N, St0, Vs) when N > 0 ->
-    {V,St1} = new_var(St0),
-    new_vars(N-1, St1, [V|Vs]);
-new_vars(0, St, Vs) -> {Vs,St}.
-
-make_vars(Vs) -> [ #k_var{name=V} || V <- Vs ].
-
-add_var_def(V, St) ->
-    St#kern{ds=sets:add_element(V#k_var.name, St#kern.ds)}.
-
-%%add_vars_def(Vs, St) ->
-%%    Ds = foldl(fun (#k_var{name=V}, Ds) -> add_element(V, Ds) end,
-%%	       St#kern.ds, Vs),
-%%    St#kern{ds=Ds}.
-
-%% is_remote_bif(Mod, Name, Arity) -> true | false.
-%%  Test if function is really a BIF.
-
-is_remote_bif(erlang, is_boolean, 1) ->
-    %% XXX Remove this clause in R11. For bootstrap purposes, we must
-    %% recognize erlang:is_boolean/1 here.
-    true;
-is_remote_bif(erlang, internal_is_record, 3) -> true;
-is_remote_bif(erlang, get, 1) -> true;
-is_remote_bif(erlang, N, A) ->
-    case erl_internal:guard_bif(N, A) of
-	true -> true;
-	false ->
-	    case erl_internal:type_test(N, A) of
-		true -> true;
-		false ->
-		    case catch erl_internal:op_type(N, A) of
-			arith -> true;
-			bool -> true;
-			comp -> true;
-			_Other -> false		%List, send or not an op
-		    end
-	    end
-    end;
-is_remote_bif(_, _, _) -> false.
-
-%% bif_vals(Name, Arity) -> integer().
-%% bif_vals(Mod, Name, Arity) -> integer().
-%%  Determine how many return values a BIF has.  Provision for BIFs to
-%%  return multiple values.  Only used in bodies where a BIF may be
-%%  called for effect only.
-
-bif_vals(dsetelement, 3) -> 0;
-bif_vals(_, _) -> 1.
-
-bif_vals(_, _, _) -> 1.
-
-%% foldr2(Fun, Acc, List1, List2) -> Acc.
-%%  Fold over two lists.
-
-foldr2(Fun, Acc0, [E1|L1], [E2|L2]) ->
-    Acc1 = Fun(E1, E2, Acc0),
-    foldr2(Fun, Acc1, L1, L2);
-foldr2(_, Acc, [], []) -> Acc.
-
-%% first([A]) -> [A].
-%% last([A]) -> A.
-
-last([L]) -> L;
-last([_|T]) -> last(T).
-
-first([_]) -> [];
-first([H|T]) -> [H|first(T)].
-
-%% This code implements the algorithm for an optimizing compiler for
-%% pattern matching given "The Implementation of Functional
-%% Programming Languages" by Simon Peyton Jones. The code is much
-%% longer as the meaning of constructors is different from the book.
-%%
-%% In Erlang many constructors can have different values, e.g. 'atom'
-%% or 'integer', whereas in the original algorithm thse would be
-%% different constructors. Our view makes it easier in later passes to
-%% handle indexing over each type.
-%%
-%% Patterns are complicated by having alias variables.  The form of a
-%% pattern is Pat | {alias,Pat,[AliasVar]}.  This is hidden by access
-%% functions to pattern arguments but the code must be aware of it.
-%%
-%% The compilation proceeds in two steps:
-%%
-%% 1. The patterns in the clauses to converted to lists of kernel
-%% patterns.  The Core clause is now hybrid, this is easier to work
-%% with.  Remove clauses with trivially false guards, this simplifies
-%% later passes.  Add local defined vars and variable subs to each
-%% clause for later use.
-%%
-%% 2. The pattern matching is optimised.  Variable substitutions are
-%% added to the VarSub structure and new variables are made visible.
-%% The guard and body are then converted to Kernel form.
-
-%% kmatch([Var], [Clause], Sub, State) -> {Kexpr,[PreExpr],State}.
-
-kmatch(Us, Ccs, Sub, St0) ->
-    {Cs,St1} = match_pre(Ccs, Sub, St0),	%Convert clauses
-    %%Def = kernel_match_error,              %The strict case
-    %% This should be a kernel expression from the first pass.
-    Def = #k_call{anno=[compiler_generated],
-		  op=#k_remote{mod=#k_atom{val=erlang},
-			       name=#k_atom{val=exit},
-			       arity=1},
-		  args=[#k_atom{val=kernel_match_error}]},
-    {Km,St2} = match(Us, Cs, Def, St1),               %Do the match.
-    {Km,St2}.
-
-%% match_pre([Cclause], Sub, State) -> {[Clause],State}.
-%%  Must be careful not to generate new substitutions here now!
-%%  Remove clauses with trivially false guards which will never
-%%  succeed.
-
-match_pre(Cs, Sub0, St) ->
-    foldr(fun (#c_clause{anno=A,pats=Ps,guard=G,body=B}, {Cs0,St0}) ->
-		  case is_false_guard(G) of
-		      true -> {Cs0,St0};
-		      false ->
-			  {Kps,Sub1,St1} = pattern_list(Ps, Sub0, St0),
-			  {[#iclause{anno=A,sub=Sub1,pats=Kps,guard=G,body=B}|
-			    Cs0],St1}
-		  end
-	  end, {[],St}, Cs).
-
-%% match([Var], [Clause], Default, State) -> {MatchExpr,State}.
-
-match([U|Us], Cs, Def, St0) ->
-    %%ok = io:format("match ~p~n", [Cs]),
-    Pcss = partition(Cs),
-    foldr(fun (Pcs, {D,St}) -> match_varcon([U|Us], Pcs, D, St) end,
-	  {Def,St0}, Pcss);
-match([], Cs, Def, St) ->
-    match_guard(Cs, Def, St).
-
-%% match_guard([Clause], Default, State) -> {IfExpr,State}.
-%%  Build a guard to handle guards. A guard *ALWAYS* fails if no
-%%  clause matches, there will be a surrounding 'alt' to catch the
-%%  failure.  Drop redundant cases, i.e. those after a true guard.
-
-match_guard(Cs0, Def0, St0) ->
-    {Cs1,Def1,St1} = match_guard_1(Cs0, Def0, St0),
-    {build_alt(build_guard(Cs1), Def1),St1}.
-
-match_guard_1([#iclause{anno=A,sub=Sub,guard=G,body=B}|Cs0], Def0, St0) ->
-    case is_true_guard(G) of
-	true ->
-	    %% The true clause body becomes the default.
-	    {Kb,Pb,St1} = body(B, Sub, St0),
-	    Line = get_line(A),
-	    St2 = maybe_add_warning(Cs0, Line, St1),
-	    St = maybe_add_warning(Def0, Line, St2),
-	    {[],pre_seq(Pb, Kb),St};
-	false ->
-	    {Kg,St1} = guard(G, Sub, St0),
-	    {Kb,Pb,St2} = body(B, Sub, St1),
-	    {Cs1,Def1,St3} = match_guard_1(Cs0, Def0, St2),
-	    {[#k_guard_clause{guard=Kg,body=pre_seq(Pb, Kb)}|Cs1],
-	     Def1,St3}
-    end;
-match_guard_1([], Def, St) -> {[],Def,St}. 
-
-maybe_add_warning([C|_], Line, St) ->
-    maybe_add_warning(C, Line, St);
-maybe_add_warning([], _Line, St) -> St;
-maybe_add_warning(fail, _Line, St) -> St;
-maybe_add_warning(Ke, MatchLine, St) ->
-    case get_kanno(Ke) of
-	[compiler_generated|_] -> St;
-	Anno ->
-	    Line = get_line(Anno),
-	    Warn = case MatchLine of
-		       none -> nomatch_shadow;
-		       _ -> {nomatch_shadow,MatchLine}
-		   end,
-	    add_warning(Line, Warn, St)
-    end.
-    
-get_line([Line|_]) when is_integer(Line) -> Line;
-get_line([_|T]) -> get_line(T);
-get_line([]) -> none.
-    
-
-%% is_true_guard(Guard) -> boolean().
-%% is_false_guard(Guard) -> boolean().
-%%  Test if a guard is either trivially true/false.  This has probably
-%%  already been optimised away, but what the heck!
-
-is_true_guard(G) -> guard_value(G) == true.
-is_false_guard(G) -> guard_value(G) == false.
-
-%% guard_value(Guard) -> true | false | unknown.
-
-guard_value(#c_atom{val=true}) -> true;
-guard_value(#c_atom{val=false}) -> false;
-guard_value(#c_call{module=#c_atom{val=erlang},
-		    name=#c_atom{val='not'},
-		    args=[A]}) ->
-    case guard_value(A) of
-	true -> false;
-	false -> true;
-	unknown -> unknown
-    end;
-guard_value(#c_call{module=#c_atom{val=erlang},
-		    name=#c_atom{val='and'},
-		    args=[Ca,Cb]}) ->
-    case guard_value(Ca) of
-	true -> guard_value(Cb);
-	false -> false;
-	unknown ->
-	    case guard_value(Cb) of
-		false -> false;
-		_Other -> unknown
-	    end
-    end;
-guard_value(#c_call{module=#c_atom{val=erlang},
-		    name=#c_atom{val='or'},
-		    args=[Ca,Cb]}) ->
-    case guard_value(Ca) of
-	true -> true;
-	false -> guard_value(Cb);
-	unknown ->
-	    case guard_value(Cb) of
-		true -> true;
-		_Other -> unknown
-	    end
-    end;
-guard_value(#c_try{arg=E,vars=[#c_var{name=X}],body=#c_var{name=X},
-		   handler=#c_atom{val=false}}) ->
-    guard_value(E);
-guard_value(_) -> unknown.
-
-%% partition([Clause]) -> [[Clause]].
-%%  Partition a list of clauses into groups which either contain
-%%  clauses with a variable first argument, or with a "constructor".
-
-partition([C1|Cs]) ->
-    V1 = is_var_clause(C1),
-    {More,Rest} = splitwith(fun (C) -> is_var_clause(C) == V1 end, Cs),
-    [[C1|More]|partition(Rest)];
-partition([]) -> [].
-
-%% match_varcon([Var], [Clause], Def, [Var], Sub, State) ->
-%%        {MatchExpr,State}.
-
-match_varcon(Us, [C|_]=Cs, Def, St) ->
-    case is_var_clause(C) of
-	true -> match_var(Us, Cs, Def, St);
-	false -> match_con(Us, Cs, Def, St)
-    end.
-
-%% match_var([Var], [Clause], Def, State) -> {MatchExpr,State}.
-%%  Build a call to "select" from a list of clauses all containing a
-%%  variable as the first argument.  We must rename the variable in
-%%  each clause to be the match variable as these clause will share
-%%  this variable and may have different names for it.  Rename aliases
-%%  as well.
-
-match_var([U|Us], Cs0, Def, St) ->
-    Cs1 = map(fun (#iclause{sub=Sub0,pats=[Arg|As]}=C) ->
-		      Vs = [arg_arg(Arg)|arg_alias(Arg)],
- 		      Sub1 = foldl(fun (#k_var{name=V}, Acc) ->
- 					   subst_vsub(V, U#k_var.name, Acc)
- 				   end, Sub0, Vs),
-		      C#iclause{sub=Sub1,pats=As}
-	      end, Cs0),
-    match(Us, Cs1, Def, St).
-
-%% match_con(Variables, [Clause], Default, State) -> {SelectExpr,State}.
-%%  Build call to "select" from a list of clauses all containing a
-%%  constructor/constant as first argument.  Group the constructors
-%%  according to type, the order is really irrelevant but tries to be
-%%  smart.
-
-match_con([U|Us], Cs, Def, St0) ->
-    %% Extract clauses for different constructors (types).
-    %%ok = io:format("match_con ~p~n", [Cs]),
-    Ttcs = [ {T,Tcs} || T <- [k_cons,k_tuple,k_atom,k_float,k_int,k_nil,
-			      k_binary,k_bin_end],
-		       begin Tcs = select(T, Cs),
-			     Tcs /= []
-		       end ] ++ select_bin_con(Cs),
-    %%ok = io:format("ttcs = ~p~n", [Ttcs]),
-    {Scs,St1} =
-	mapfoldl(fun ({T,Tcs}, St) ->
-			 {[S|_]=Sc,S1} = match_value([U|Us], T, Tcs, fail, St),
-			 %%ok = io:format("match_con type2 ~p~n", [T]),
-			 Anno = get_kanno(S),
-			 {#k_type_clause{anno=Anno,type=T,values=Sc},S1} end,
-		 St0, Ttcs),
-    {build_alt_1st_no_fail(build_select(U, Scs), Def),St1}.
-
-%% select_bin_con([Clause]) -> [{Type,[Clause]}].
-%%  Extract clauses for the k_bin_seg constructor.  As k_bin_seg
-%%  matching can overlap, the k_bin_seg constructors cannot be
-%%  reordered, only grouped.
-
-select_bin_con(Cs0) ->
-    Cs1 = lists:filter(fun (C) ->
-			       clause_con(C) == k_bin_seg
-		       end, Cs0),
-    select_bin_con_1(Cs1).
-
-select_bin_con_1([C1|Cs]) ->
-    Con = clause_con(C1),
-    {More,Rest} = splitwith(fun (C) -> clause_con(C) == Con end, Cs),
-    [{Con,[C1|More]}|select_bin_con_1(Rest)];
-select_bin_con_1([]) -> [].
-
-%% select(Con, [Clause]) -> [Clause].
-
-select(T, Cs) -> [ C || C <- Cs, clause_con(C) == T ].
-
-%% match_value([Var], Con, [Clause], Default, State) -> {SelectExpr,State}.
-%%  At this point all the clauses have the same constructor, we must
-%%  now separate them according to value.
-
-match_value(_, _, [], _, St) -> {[],St};
-match_value(Us, T, Cs0, Def, St0) ->
-    Css = group_value(T, Cs0),
-    %%ok = io:format("match_value ~p ~p~n", [T, Css]),
-    {Css1,St1} = mapfoldl(fun (Cs, St) ->
-				  match_clause(Us, Cs, Def, St) end,
-			  St0, Css),
-    {Css1,St1}.
-    %%{#k_select_val{type=T,var=hd(Us),clauses=Css1},St1}.
-
-%% group_value([Clause]) -> [[Clause]].
-%%  Group clauses according to value.  Here we know that
-%%  1. Some types are singled valued
-%%  2. The clauses in bin_segs cannot be reordered only grouped
-%%  3. Other types are disjoint and can be reordered
-
-group_value(k_cons, Cs) -> [Cs];		%These are single valued
-group_value(k_nil, Cs) -> [Cs];
-group_value(k_binary, Cs) -> [Cs];
-group_value(k_bin_end, Cs) -> [Cs];
-group_value(k_bin_seg, Cs) ->
-    group_bin_seg(Cs);
-group_value(_, Cs) ->
-    %% group_value(Cs).
-    Cd = foldl(fun (C, Gcs0) -> dict:append(clause_val(C), C, Gcs0) end,
-	       dict:new(), Cs),
-    dict:fold(fun (_, Vcs, Css) -> [Vcs|Css] end, [], Cd).
-
-group_bin_seg([C1|Cs]) ->
-    V1 = clause_val(C1),
-    {More,Rest} = splitwith(fun (C) -> clause_val(C) == V1 end, Cs),
-    [[C1|More]|group_bin_seg(Rest)];
-group_bin_seg([]) -> [].
-
-%% Profiling shows that this quadratic implementation account for a big amount
-%% of the execution time if there are many values.
-% group_value([C|Cs]) ->
-%     V = clause_val(C),
-%     Same = [ Cv || Cv <- Cs, clause_val(Cv) == V ], %Same value
-%     Rest = [ Cv || Cv <- Cs, clause_val(Cv) /= V ], % and all the rest
-%     [[C|Same]|group_value(Rest)];
-% group_value([]) -> [].
-
-%% match_clause([Var], [Clause], Default, State) -> {Clause,State}.
-%%  At this point all the clauses have the same "value".  Build one
-%%  select clause for this value and continue matching.  Rename
-%%  aliases as well.
-
-match_clause([U|Us], [C|_]=Cs0, Def, St0) ->
-    Anno = get_kanno(C),
-    {Match0,Vs,St1} = get_match(get_con(Cs0), St0),
-    Match = sub_size_var(Match0, Cs0),
-    {Cs1,St2} = new_clauses(Cs0, U, St1),
-    {B,St3} = match(Vs ++ Us, Cs1, Def, St2),
-    {#k_val_clause{anno=Anno,val=Match,body=B},St3}.
-
-sub_size_var(#k_bin_seg{size=#k_var{name=Name}=Kvar}=BinSeg, [#iclause{sub=Sub}|_]) ->
-    BinSeg#k_bin_seg{size=Kvar#k_var{name=get_vsub(Name, Sub)}};
-sub_size_var(K, _) -> K.
-
-get_con([C|_]) -> arg_arg(clause_arg(C)).	%Get the constructor
-
-get_match(#k_cons{}, St0) ->
-    {[H,T],St1} = new_vars(2, St0),
-    {#k_cons{hd=H,tl=T},[H,T],St1};
-get_match(#k_binary{}, St0) ->
-    {[V]=Mes,St1} = new_vars(1, St0),
-    {#k_binary{segs=V},Mes,St1};
-get_match(#k_bin_seg{}=Seg, St0) ->
-    {[S,N]=Mes,St1} = new_vars(2, St0),
-    {Seg#k_bin_seg{seg=S,next=N},Mes,St1};
-get_match(#k_tuple{es=Es}, St0) ->
-    {Mes,St1} = new_vars(length(Es), St0),
-    {#k_tuple{es=Mes},Mes,St1};
-get_match(M, St) ->
-    {M,[],St}.
-
-new_clauses(Cs0, U, St) ->
-    Cs1 = map(fun (#iclause{sub=Sub0,pats=[Arg|As]}=C) ->
-		      Head = case arg_arg(Arg) of
-				 #k_cons{hd=H,tl=T} -> [H,T|As];
-				 #k_tuple{es=Es} -> Es ++ As;
-				 #k_binary{segs=E}  -> [E|As];
-				 #k_bin_seg{seg=S,next=N} ->
-				     [S,N|As];
-				 _Other -> As
-			     end,
-		      Vs = arg_alias(Arg),
-		      Sub1 = foldl(fun (#k_var{name=V}, Acc) ->
-					   subst_vsub(V, U#k_var.name, Acc)
-				   end, Sub0, Vs),
-		      C#iclause{sub=Sub1,pats=Head}
-	      end, Cs0),
-    {Cs1,St}.
-
-%% build_guard([GuardClause]) -> GuardExpr.
-
-build_guard([]) -> fail;
-build_guard(Cs) -> #k_guard{clauses=Cs}.
-
-%% build_select(Var, [ConClause]) -> SelectExpr.
-
-build_select(V, [Tc|_]=Tcs) ->
-    Anno = get_kanno(Tc),
-    #k_select{anno=Anno,var=V,types=Tcs}.
-
-%% build_alt(First, Then) -> AltExpr.
-%%  Build an alt, attempt some simple optimisation.
-
-build_alt(fail, Then) -> Then;
-build_alt(First,Then) -> build_alt_1st_no_fail(First, Then).
-
-build_alt_1st_no_fail(First, fail) -> First;
-build_alt_1st_no_fail(First, Then) -> #k_alt{first=First,then=Then}.
-
-%% build_match([MatchVar], MatchExpr) -> Kexpr.
-%%  Build a match expr if there is a match.
-
-build_match(Us, #k_alt{}=Km) -> #k_match{vars=Us,body=Km};
-build_match(Us, #k_select{}=Km) -> #k_match{vars=Us,body=Km};
-build_match(Us, #k_guard{}=Km) -> #k_match{vars=Us,body=Km};
-build_match(_, Km) -> Km.
-
-%% clause_arg(Clause) -> FirstArg.
-%% clause_con(Clause) -> Constructor.
-%% clause_val(Clause) -> Value.
-%% is_var_clause(Clause) -> boolean().
-
-clause_arg(#iclause{pats=[Arg|_]}) -> Arg.
-
-clause_con(C) -> arg_con(clause_arg(C)).
-
-clause_val(C) -> arg_val(clause_arg(C)).
-
-is_var_clause(C) -> clause_con(C) == k_var.
-
-%% arg_arg(Arg) -> Arg.
-%% arg_alias(Arg) -> Aliases.
-%% arg_con(Arg) -> Constructor.
-%% arg_val(Arg) -> Value.
-%%  These are the basic functions for obtaining fields in an argument.
-
-arg_arg(#ialias{pat=Con}) -> Con;
-arg_arg(Con) -> Con.
-
-arg_alias(#ialias{vars=As}) -> As;
-arg_alias(_Con) -> [].
-
-arg_con(Arg) ->
-    case arg_arg(Arg) of
-	#k_int{} -> k_int;
-	#k_float{} -> k_float;
-	#k_atom{} -> k_atom;
-	#k_nil{} -> k_nil;
-	#k_cons{} -> k_cons; 
-	#k_tuple{} -> k_tuple;
-	#k_binary{} -> k_binary;
-	#k_bin_end{} -> k_bin_end;
-	#k_bin_seg{} -> k_bin_seg;
-	#k_var{} -> k_var
-    end.
-
-arg_val(Arg) ->
-    case arg_arg(Arg) of
-	#k_int{val=I} -> I;
-	#k_float{val=F} -> F;
-	#k_atom{val=A} -> A;
-	#k_nil{} -> 0;
-	#k_cons{} -> 2; 
-	#k_tuple{es=Es} -> length(Es);
-	#k_bin_seg{size=S,unit=U,type=T,flags=Fs} ->
-	    {set_kanno(S, []),U,T,Fs};
-	#k_bin_end{} -> 0;
-	#k_binary{} -> 0
-    end.
-
-%% ubody(Expr, Break, State) -> {Expr,[UsedVar],State}.
-%%  Tag the body sequence with its used variables.  These bodies
-%%  either end with a #k_break{}, or with #k_return{} or an expression
-%%  which itself can return, #k_enter{}, #k_match{} ... .
-
-ubody(#iset{vars=[],arg=#iletrec{}=Let,body=B0}, Br, St0) ->
-    %% An iletrec{} should never be last.
-    St1 = iletrec_funs(Let, St0),
-    ubody(B0, Br, St1);
-ubody(#iset{anno=A,vars=Vs,arg=E0,body=B0}, Br, St0) ->
-    {E1,Eu,St1} = uexpr(E0, {break,Vs}, St0),
-    {B1,Bu,St2} = ubody(B0, Br, St1),
-    Ns = lit_list_vars(Vs),
-    Used = union(Eu, subtract(Bu, Ns)),		%Used external vars
-    {#k_seq{anno=#k{us=Used,ns=Ns,a=A},arg=E1,body=B1},Used,St2};
-ubody(#ivalues{anno=A,args=As}, return, St) ->
-    Au = lit_list_vars(As),
-    {#k_return{anno=#k{us=Au,ns=[],a=A},args=As},Au,St};
-ubody(#ivalues{anno=A,args=As}, {break,_Vbs}, St) ->
-    Au = lit_list_vars(As),
-    {#k_break{anno=#k{us=Au,ns=[],a=A},args=As},Au,St};
-ubody(E, return, St0) ->
-    %% Enterable expressions need no trailing return.
-    case is_enter_expr(E) of
-	true -> uexpr(E, return, St0);
-	false ->
-	    {Ea,Pa,St1} = force_atomic(E, St0),
-	    ubody(pre_seq(Pa, #ivalues{args=[Ea]}), return, St1)
-    end;
-ubody(E, {break,Rs}, St0) ->
-    %%ok = io:fwrite("ubody ~w:~p~n", [?LINE,{E,Br}]),
-    %% Exiting expressions need no trailing break.
-    case is_exit_expr(E) of
-	true -> uexpr(E, return, St0);
-	false ->
-	    {Ea,Pa,St1} = force_atomic(E, St0),
-	    ubody(pre_seq(Pa, #ivalues{args=[Ea]}), {break,Rs}, St1)
-    end.
-
-iletrec_funs(#iletrec{defs=Fs}, St0) ->
-    %% Use union of all free variables.
-    %% First just work out free variables for all functions.
-    Free = foldl(fun ({_,#ifun{vars=Vs,body=Fb0}}, Free0) ->
-			 {_,Fbu,_} = ubody(Fb0, return, St0),
-			 Ns = lit_list_vars(Vs),
-			 Free1 = subtract(Fbu, Ns),
-			 union(Free1, Free0)
-		 end, [], Fs),
-    FreeVs = make_vars(Free),
-    %% Add this free info to State.
-    St1 = foldl(fun ({N,#ifun{vars=Vs}}, Lst) ->
-			store_free(N, length(Vs), FreeVs, Lst)
-		end, St0, Fs),
-    %% Now regenerate local functions to use free variable information.
-    St2 = foldl(fun ({N,#ifun{anno=Fa,vars=Vs,body=Fb0}}, Lst0) ->
-			{Fb1,_,Lst1} = ubody(Fb0, return, Lst0),
-			Arity = length(Vs) + length(FreeVs),
-			Fun = #k_fdef{anno=#k{us=[],ns=[],a=Fa},
-				      func=N,arity=Arity,
-				      vars=Vs ++ FreeVs,body=Fb1},
-			Lst1#kern{funs=[Fun|Lst1#kern.funs]}
-		end, St1, Fs),
-    St2.
-
-%% is_exit_expr(Kexpr) -> boolean().
-%%  Test whether Kexpr always exits and never returns.
-
-is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=throw,arity=1}}) -> true;
-is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=exit,arity=1}}) -> true;
-is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=error,arity=1}}) -> true;
-is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=error,arity=2}}) -> true;
-is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=fault,arity=1}}) -> true;
-is_exit_expr(#k_call{op=#k_remote{mod=erlang,name=fault,arity=2}}) -> true;
-is_exit_expr(#k_call{op=#k_internal{name=match_fail,arity=1}}) -> true;
-is_exit_expr(#k_bif{op=#k_internal{name=rethrow,arity=2}}) -> true;
-is_exit_expr(#k_receive_next{}) -> true;
-is_exit_expr(_) -> false.
-
-%% is_enter_expr(Kexpr) -> boolean().
-%%  Test whether Kexpr is "enterable", i.e. can handle return from
-%%  within itself without extra #k_return{}.
-
-is_enter_expr(#k_call{}) -> true;
-is_enter_expr(#k_match{}) -> true;
-is_enter_expr(#k_receive{}) -> true;
-is_enter_expr(#k_receive_next{}) -> true;
-%%is_enter_expr(#k_try{}) -> true;		%Soon
-is_enter_expr(_) -> false.
-
-%% uguard(Expr, State) -> {Expr,[UsedVar],State}.
-%%  Tag the guard sequence with its used variables.
-
-uguard(#k_try{anno=A,arg=B0,vars=[#k_var{name=X}],body=#k_var{name=X},
-	      handler=#k_atom{val=false}}=Try, St0) ->
-    {B1,Bu,St1} = uguard(B0, St0),
-    {Try#k_try{anno=#k{us=Bu,ns=[],a=A},arg=B1},Bu,St1};
-uguard(T, St) ->
-    %%ok = io:fwrite("~w: ~p~n", [?LINE,T]),
-    uguard_test(T, St).
-
-%% uguard_test(Expr, State) -> {Test,[UsedVar],State}.
-%%  At this stage tests are just expressions which don't return any
-%%  values.
-
-uguard_test(T, St) -> uguard_expr(T, [], St).
-
-uguard_expr(#iset{anno=A,vars=Vs,arg=E0,body=B0}, Rs, St0) ->
-    Ns = lit_list_vars(Vs),
-    {E1,Eu,St1} = uguard_expr(E0, Vs, St0),
-    {B1,Bu,St2} = uguard_expr(B0, Rs, St1),
-    Used = union(Eu, subtract(Bu, Ns)),
-    {#k_seq{anno=#k{us=Used,ns=Ns,a=A},arg=E1,body=B1},Used,St2};
-uguard_expr(#k_try{anno=A,arg=B0,vars=[#k_var{name=X}],body=#k_var{name=X},
-		   handler=#k_atom{val=false}}=Try, Rs, St0) ->
-    {B1,Bu,St1} = uguard_expr(B0, Rs, St0),
-    {Try#k_try{anno=#k{us=Bu,ns=lit_list_vars(Rs),a=A},arg=B1,ret=Rs},
-     Bu,St1};
-uguard_expr(#k_test{anno=A,op=Op,args=As}=Test, Rs, St) ->
-    [] = Rs,					%Sanity check
-    Used = union(op_vars(Op), lit_list_vars(As)),
-    {Test#k_test{anno=#k{us=Used,ns=lit_list_vars(Rs),a=A}},
-     Used,St};
-uguard_expr(#k_bif{anno=A,op=Op,args=As}=Bif, Rs, St) ->
-    Used = union(op_vars(Op), lit_list_vars(As)),
-    {Bif#k_bif{anno=#k{us=Used,ns=lit_list_vars(Rs),a=A},ret=Rs},
-     Used,St};
-uguard_expr(#ivalues{anno=A,args=As}, Rs, St) ->
-    Sets = foldr2(fun (V, Arg, Rhs) ->
-			  #iset{anno=A,vars=[V],arg=Arg,body=Rhs}
-		  end, #k_atom{val=true}, Rs, As),
-    uguard_expr(Sets, [], St);
-uguard_expr(#k_match{anno=A,vars=Vs,body=B0}, Rs, St0) ->
-    %% Experimental support for andalso/orelse in guards.
-    Br = case Rs of
-	     [] -> return;
-	     _ -> {break,Rs}
-	 end,
-    {B1,Bu,St1} = umatch(B0, Br, St0),
-    {#k_match{anno=#k{us=Bu,ns=lit_list_vars(Rs),a=A},
-	      vars=Vs,body=B1,ret=Rs},Bu,St1};
-uguard_expr(Lit, Rs, St) ->
-    %% Transform literals to puts here.
-    Used = lit_vars(Lit),
-    {#k_put{anno=#k{us=Used,ns=lit_list_vars(Rs),a=get_kanno(Lit)},
-	    arg=Lit,ret=Rs},Used,St}.
-
-%% uexpr(Expr, Break, State) -> {Expr,[UsedVar],State}.
-%%  Tag an expression with its used variables.
-%%  Break = return | {break,[RetVar]}.
-
-uexpr(#k_call{anno=A,op=#k_local{name=F,arity=Ar}=Op,args=As0}=Call, Br, St) ->
-    Free = get_free(F, Ar, St),
-    As1 = As0 ++ Free,				%Add free variables LAST!
-    Used = lit_list_vars(As1),
-    {case Br of
-	 {break,Rs} ->
-	     Call#k_call{anno=#k{us=Used,ns=lit_list_vars(Rs),a=A},
-			 op=Op#k_local{arity=Ar + length(Free)},
-			 args=As1,ret=Rs};
-	 return ->
-	     #k_enter{anno=#k{us=Used,ns=[],a=A},
-		      op=Op#k_local{arity=Ar + length(Free)},
-		      args=As1}
-     end,Used,St};
-uexpr(#k_call{anno=A,op=Op,args=As}=Call, {break,Rs}, St) ->
-    Used = union(op_vars(Op), lit_list_vars(As)),
-    {Call#k_call{anno=#k{us=Used,ns=lit_list_vars(Rs),a=A},ret=Rs},
-     Used,St};
-uexpr(#k_call{anno=A,op=Op,args=As}, return, St) ->
-    Used = union(op_vars(Op), lit_list_vars(As)),
-    {#k_enter{anno=#k{us=Used,ns=[],a=A},op=Op,args=As},
-     Used,St};
-uexpr(#k_bif{anno=A,op=Op,args=As}=Bif, {break,Rs}, St0) ->
-    Used = union(op_vars(Op), lit_list_vars(As)),
-    {Brs,St1} = bif_returns(Op, Rs, St0),
-    {Bif#k_bif{anno=#k{us=Used,ns=lit_list_vars(Brs),a=A},ret=Brs},
-     Used,St1};
-uexpr(#k_match{anno=A,vars=Vs,body=B0}, Br, St0) ->
-    Rs = break_rets(Br),
-    {B1,Bu,St1} = umatch(B0, Br, St0),
-    {#k_match{anno=#k{us=Bu,ns=lit_list_vars(Rs),a=A},
-	      vars=Vs,body=B1,ret=Rs},Bu,St1};
-uexpr(#k_receive{anno=A,var=V,body=B0,timeout=T,action=A0}, Br, St0) ->
-    Rs = break_rets(Br),
-    Tu = lit_vars(T),				%Timeout is atomic
-    {B1,Bu,St1} = umatch(B0, Br, St0),
-    {A1,Au,St2} = ubody(A0, Br, St1),
-    Used = del_element(V#k_var.name, union(Bu, union(Tu, Au))),
-    {#k_receive{anno=#k{us=Used,ns=lit_list_vars(Rs),a=A},
-		var=V,body=B1,timeout=T,action=A1,ret=Rs},
-     Used,St2};
-uexpr(#k_receive_accept{anno=A}, _, St) ->
-    {#k_receive_accept{anno=#k{us=[],ns=[],a=A}},[],St};
-uexpr(#k_receive_next{anno=A}, _, St) ->
-    {#k_receive_next{anno=#k{us=[],ns=[],a=A}},[],St};
-uexpr(#k_try{anno=A,arg=A0,vars=Vs,body=B0,evars=Evs,handler=H0},
-      {break,Rs0}, St0) ->
-    {Avs,St1} = new_vars(length(Vs), St0),	%Need dummy names here
-    {A1,Au,St2} = ubody(A0, {break,Avs}, St1),	%Must break to clean up here!
-    {B1,Bu,St3} = ubody(B0, {break,Rs0}, St2),
-    {H1,Hu,St4} = ubody(H0, {break,Rs0}, St3),
-    %% Guarantee ONE return variable.
-    NumNew = if
-		 Rs0 =:= [] -> 1;
-		 true -> 0
-	     end,
-    {Ns,St5} = new_vars(NumNew, St4),
-    Rs1 = Rs0 ++ Ns,
-    Used = union([Au,subtract(Bu, lit_list_vars(Vs)),
-		  subtract(Hu, lit_list_vars(Evs))]),
-    {#k_try{anno=#k{us=Used,ns=lit_list_vars(Rs1),a=A},
-	    arg=A1,vars=Vs,body=B1,evars=Evs,handler=H1,ret=Rs1},
-     Used,St5};
-uexpr(#k_catch{anno=A,body=B0}, {break,Rs0}, St0) ->
-    {Rb,St1} = new_var(St0),
-    {B1,Bu,St2} = ubody(B0, {break,[Rb]}, St1),
-    %% Guarantee ONE return variable.
-    {Ns,St3} = new_vars(1 - length(Rs0), St2),
-    Rs1 = Rs0 ++ Ns,
-    {#k_catch{anno=#k{us=Bu,ns=lit_list_vars(Rs1),a=A},body=B1,ret=Rs1},Bu,St3};
-uexpr(#ifun{anno=A,vars=Vs,body=B0}=IFun, {break,Rs}, St0) ->
-    {B1,Bu,St1} = ubody(B0, return, St0),	%Return out of new function
-    Ns = lit_list_vars(Vs),
-    Free = subtract(Bu, Ns),			%Free variables in fun
-    Fvs = make_vars(Free),
-    Arity = length(Vs) + length(Free),
-    {{Index,Uniq,Fname}, St3} =
-	case lists:keysearch(id, 1, A) of 
-	    {value,{id,Id}} ->
-		{Id, St1};
-	    false ->
-		%% No id annotation. Must invent one.
-		I = St1#kern.fcount,
-		U = erlang:hash(IFun, (1 bsl 27)-1),
-		{N, St2} = new_fun_name(St1),
-		{{I,U,N}, St2}
-	end,
-    Fun = #k_fdef{anno=#k{us=[],ns=[],a=A},func=Fname,arity=Arity,
-		  vars=Vs ++ Fvs,body=B1},
-    {#k_bif{anno=#k{us=Free,ns=lit_list_vars(Rs),a=A},
- 	    op=#k_internal{name=make_fun,arity=length(Free)+3},
- 	    args=[#k_atom{val=Fname},#k_int{val=Arity},
- 		  #k_int{val=Index},#k_int{val=Uniq}|Fvs],
- 	    ret=Rs},
-%      {#k_call{anno=#k{us=Free,ns=lit_list_vars(Rs),a=A},
-% 	     op=#k_internal{name=make_fun,arity=length(Free)+3},
-% 	     args=[#k_atom{val=Fname},#k_int{val=Arity},
-% 		   #k_int{val=Index},#k_int{val=Uniq}|Fvs],
-% 	     ret=Rs},
-     Free,St3#kern{funs=[Fun|St3#kern.funs]}};
-uexpr(Lit, {break,Rs}, St) ->
-    %% Transform literals to puts here.
-    %%ok = io:fwrite("uexpr ~w:~p~n", [?LINE,Lit]),
-    Used = lit_vars(Lit),
-    {#k_put{anno=#k{us=Used,ns=lit_list_vars(Rs),a=get_kanno(Lit)},
-	    arg=Lit,ret=Rs},Used,St}.
-
-%% get_free(Name, Arity, State) -> [Free].
-%% store_free(Name, Arity, [Free], State) -> State.
-
-get_free(F, A, St) ->
-    case orddict:find({F,A}, St#kern.free) of
-	{ok,Val} -> Val;
-	error -> []
-    end.
-
-store_free(F, A, Free, St) ->
-    St#kern{free=orddict:store({F,A}, Free, St#kern.free)}.
-
-break_rets({break,Rs}) -> Rs;
-break_rets(return) -> [].
-
-%% bif_returns(Op, [Ret], State) -> {[Ret],State}.
-
-bif_returns(#k_remote{mod=M,name=N,arity=Ar}, Rs, St0) ->
-    %%ok = io:fwrite("uexpr ~w:~p~n", [?LINE,{M,N,Ar,Rs}]),
-    {Ns,St1} = new_vars(bif_vals(M, N, Ar) - length(Rs), St0),
-    {Rs ++ Ns,St1};
-bif_returns(#k_internal{name=N,arity=Ar}, Rs, St0) ->
-    %%ok = io:fwrite("uexpr ~w:~p~n", [?LINE,{N,Ar,Rs}]),
-    {Ns,St1} = new_vars(bif_vals(N, Ar) - length(Rs), St0),
-    {Rs ++ Ns,St1}.
-
-%% umatch(Match, Break, State) -> {Match,[UsedVar],State}.
-%%  Tag a match expression with its used variables.
-
-umatch(#k_alt{anno=A,first=F0,then=T0}, Br, St0) ->
-    {F1,Fu,St1} = umatch(F0, Br, St0),
-    {T1,Tu,St2} = umatch(T0, Br, St1),
-    Used = union(Fu, Tu),
-    {#k_alt{anno=#k{us=Used,ns=[],a=A},first=F1,then=T1},
-     Used,St2};
-umatch(#k_select{anno=A,var=V,types=Ts0}, Br, St0) ->
-    {Ts1,Tus,St1} = umatch_list(Ts0, Br, St0),
-    Used = add_element(V#k_var.name, Tus),
-    {#k_select{anno=#k{us=Used,ns=[],a=A},var=V,types=Ts1},Used,St1};
-umatch(#k_type_clause{anno=A,type=T,values=Vs0}, Br, St0) ->
-    {Vs1,Vus,St1} = umatch_list(Vs0, Br, St0),
-    {#k_type_clause{anno=#k{us=Vus,ns=[],a=A},type=T,values=Vs1},Vus,St1};
-umatch(#k_val_clause{anno=A,val=P,body=B0}, Br, St0) ->
-    {U0,Ps} = pat_vars(P),
-    {B1,Bu,St1} = umatch(B0, Br, St0),
-    Used = union(U0, subtract(Bu, Ps)),
-    {#k_val_clause{anno=#k{us=Used,ns=[],a=A},val=P,body=B1},
-     Used,St1};
-umatch(#k_guard{anno=A,clauses=Gs0}, Br, St0) ->
-    {Gs1,Gus,St1} = umatch_list(Gs0, Br, St0),
-    {#k_guard{anno=#k{us=Gus,ns=[],a=A},clauses=Gs1},Gus,St1};
-umatch(#k_guard_clause{anno=A,guard=G0,body=B0}, Br, St0) ->
-    %%ok = io:fwrite("~w: ~p~n", [?LINE,G0]),
-    {G1,Gu,St1} = uguard(G0, St0),
-    %%ok = io:fwrite("~w: ~p~n", [?LINE,G1]),
-    {B1,Bu,St2} = umatch(B0, Br, St1),
-    Used = union(Gu, Bu),
-    {#k_guard_clause{anno=#k{us=Used,ns=[],a=A},guard=G1,body=B1},Used,St2};
-umatch(B0, Br, St0) -> ubody(B0, Br, St0).
-
-umatch_list(Ms0, Br, St) ->
-    foldr(fun (M0, {Ms1,Us,Sta}) ->
-		  {M1,Mu,Stb} = umatch(M0, Br, Sta),
-		  {[M1|Ms1],union(Mu, Us),Stb}
-	  end, {[],[],St}, Ms0).
-
-%% op_vars(Op) -> [VarName].
-
-op_vars(#k_local{}) -> [];
-op_vars(#k_remote{mod=Mod,name=Name}) ->
-    ordsets:from_list([V || #k_var{name=V} <- [Mod,Name]]);
-op_vars(#k_internal{}) -> [];
-op_vars(Atomic) -> lit_vars(Atomic).
-
-%% lit_vars(Literal) -> [VarName].
-%%  Return the variables in a literal.
-
-lit_vars(#k_var{name=N}) -> [N];
-lit_vars(#k_int{}) -> [];
-lit_vars(#k_float{}) -> [];
-lit_vars(#k_atom{}) -> [];
-%%lit_vars(#k_char{}) -> [];
-lit_vars(#k_string{}) -> [];
-lit_vars(#k_nil{}) -> [];
-lit_vars(#k_cons{hd=H,tl=T}) ->
-    union(lit_vars(H), lit_vars(T));
-lit_vars(#k_binary{segs=V}) -> lit_vars(V);
-lit_vars(#k_bin_end{}) -> [];
-lit_vars(#k_bin_seg{size=Size,seg=S,next=N}) ->
-    union(lit_vars(Size), union(lit_vars(S), lit_vars(N)));
-lit_vars(#k_tuple{es=Es}) ->
-    lit_list_vars(Es).
-
-lit_list_vars(Ps) ->
-    foldl(fun (P, Vs) -> union(lit_vars(P), Vs) end, [], Ps).
-
-%% pat_vars(Pattern) -> {[UsedVarName],[NewVarName]}.
-%%  Return variables in a pattern.  All variables are new variables
-%%  except those in the size field of binary segments.
-
-pat_vars(#k_var{name=N}) -> {[],[N]};
-%%pat_vars(#k_char{}) -> {[],[]};
-pat_vars(#k_int{}) -> {[],[]};
-pat_vars(#k_float{}) -> {[],[]};
-pat_vars(#k_atom{}) -> {[],[]};
-pat_vars(#k_string{}) -> {[],[]};
-pat_vars(#k_nil{}) -> {[],[]};
-pat_vars(#k_cons{hd=H,tl=T}) ->
-    pat_list_vars([H,T]);
-pat_vars(#k_binary{segs=V}) ->
-    pat_vars(V);
-pat_vars(#k_bin_seg{size=Size,seg=S,next=N}) ->
-    {U1,New} = pat_list_vars([S,N]),
-    {[],U2} = pat_vars(Size),
-    {union(U1, U2),New};
-pat_vars(#k_bin_end{}) -> {[],[]};
-pat_vars(#k_tuple{es=Es}) ->
-    pat_list_vars(Es).
-
-pat_list_vars(Ps) ->
-    foldl(fun (P, {Used0,New0}) ->
-		  {Used,New} = pat_vars(P),
-		  {union(Used0, Used),union(New0, New)} end,
-	  {[],[]}, Ps).
-
-%% aligned(Bits, Size, Unit, Flags) -> {Size,Flags}
-%%  Add 'aligned' to the flags if the current field is aligned.
-%%  Number of bits correct modulo 8.
-
-aligned(B, S, U, Fs) when B rem 8 =:= 0 ->
-    {incr_bits(B, S, U),[aligned|Fs]};
-aligned(B, S, U, Fs) ->
-    {incr_bits(B, S, U),Fs}.
-
-incr_bits(B, #k_int{val=S}, U) when integer(B) -> B + S*U;
-incr_bits(_, #k_atom{val=all}, _) -> 0;		%Always aligned
-incr_bits(B, _, 8) -> B;
-incr_bits(_, _, _) -> unknown.
-
-make_list(Es) ->
-    foldr(fun (E, Acc) -> #c_cons{hd=E,tl=Acc} end, #c_nil{}, Es).
-
-%% List of integers in interval [N,M]. Empty list if N > M.
-
-integers(N, M) when N =< M ->
-    [N|integers(N + 1, M)];
-integers(_, _) -> [].
-
-%%%
-%%% Handling of warnings.
-%%%
-
-format_error({nomatch_shadow,Line}) ->
-    M = io_lib:format("this clause cannot match because a previous clause at line ~p "
-		      "always matches", [Line]),
-    lists:flatten(M);
-format_error(nomatch_shadow) ->
-    "this clause cannot match because a previous clause always matches".
-
-add_warning(none, Term, #kern{ws=Ws}=St) ->
-    St#kern{ws=[{?MODULE,Term}|Ws]};
-add_warning(Line, Term, #kern{ws=Ws}=St) when Line >= 0 ->
-    St#kern{ws=[{Line,?MODULE,Term}|Ws]};
-add_warning(_, _, St) -> St.
-
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_kernel.hrl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_kernel.hrl
deleted file mode 100644
index 822a9e34e1..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_kernel.hrl
+++ /dev/null
@@ -1,77 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: v3_kernel.hrl,v 1.1 2008/12/17 09:53:43 mikpe Exp $
-%%
-
-%% Purpose : Kernel Erlang as records.
-
-%% It would be nice to incorporate some generic functions as well but
-%% this could make including this file difficult.
-%% N.B. the annotation field is ALWAYS the first field!
-
-%% Kernel annotation record.
--record(k, {us,					%Used variables
-	    ns,					%New variables
-	    a}).				%Core annotation
-
-%% Literals
-%% NO CHARACTERS YET.
-%%-record(k_char, {anno=[],val}).
--record(k_int, {anno=[],val}).
--record(k_float, {anno=[],val}).
--record(k_atom, {anno=[],val}).
--record(k_string, {anno=[],val}).
--record(k_nil, {anno=[]}).
-
--record(k_tuple, {anno=[],es}).
--record(k_cons, {anno=[],hd,tl}).
--record(k_binary, {anno=[],segs}).
--record(k_bin_seg, {anno=[],size,unit,type,flags,seg,next}).
--record(k_bin_end, {anno=[]}).
--record(k_var, {anno=[],name}).
-
--record(k_local, {anno=[],name,arity}).
--record(k_remote, {anno=[],mod,name,arity}).
--record(k_internal, {anno=[],name,arity}).
-
--record(k_mdef, {anno=[],name,exports,attributes,body}).
--record(k_fdef, {anno=[],func,arity,vars,body}).
-
--record(k_seq, {anno=[],arg,body}).
--record(k_put, {anno=[],arg,ret=[]}).
--record(k_bif, {anno=[],op,args,ret=[]}).
--record(k_test, {anno=[],op,args}).
--record(k_call, {anno=[],op,args,ret=[]}).
--record(k_enter, {anno=[],op,args}).
--record(k_receive, {anno=[],var,body,timeout,action,ret=[]}).
--record(k_receive_accept, {anno=[]}).
--record(k_receive_next, {anno=[]}).
--record(k_try, {anno=[],arg,vars,body,evars,handler,ret=[]}).
--record(k_catch, {anno=[],body,ret=[]}).
-
--record(k_match, {anno=[],vars,body,ret=[]}).
--record(k_alt, {anno=[],first,then}).
--record(k_select, {anno=[],var,types}).
--record(k_type_clause, {anno=[],type,values}).
--record(k_val_clause, {anno=[],val,body}).
--record(k_guard, {anno=[],clauses}).
--record(k_guard_clause, {anno=[],guard,body}).
-
--record(k_break, {anno=[],args=[]}).
--record(k_return, {anno=[],args=[]}).
-
-%%k_get_anno(Thing) -> element(2, Thing).
-%%k_set_anno(Thing, Anno) -> setelement(2, Thing, Anno).
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_kernel_pp.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_kernel_pp.erl
deleted file mode 100644
index 92ff173834..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_kernel_pp.erl
+++ /dev/null
@@ -1,444 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: v3_kernel_pp.erl,v 1.1 2008/12/17 09:53:43 mikpe Exp $
-%%
-%% Purpose : Kernel Erlang (naive) prettyprinter
-
--module(v3_kernel_pp).
-
--include("v3_kernel.hrl").
-
--export([format/1]).
-
-%% These are "internal" structures in sys_kernel which are here for
-%% debugging purposes.
--record(iset, {anno=[],vars,arg,body}).
--record(ifun, {anno=[],vars,body}).
-
-%% ====================================================================== %%
-%% format(Node) -> Text
-%%	Node = coreErlang()
-%%	Text = string() | [Text]
-%%
-%%	Prettyprint-formats (naively) an abstract Core Erlang syntax
-%%	tree.
-
--record(ctxt, {indent = 0,
-	       item_indent = 2,
-	       body_indent = 2,
-	       tab_width = 8}).
-
-canno(Cthing) -> element(2, Cthing).
-
-format(Node) -> format(Node, #ctxt{}).
-
-format(Node, Ctxt) ->
-    case canno(Node) of
-	[] ->
-	    format_1(Node, Ctxt);
-	List ->
-	    format_anno(List, Ctxt, fun (Ctxt1) -> format_1(Node, Ctxt1) end)
-    end.
-
-format_anno(Anno, Ctxt, ObjFun) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
-    ["( ",
-     ObjFun(Ctxt1),
-     nl_indent(Ctxt1),
-     "-| ",io_lib:write(Anno),
-     " )"].
-
-%% format_1(Kexpr, Context) -> string().
-
-format_1(#k_atom{val=A}, _Ctxt) -> core_atom(A);
-%%format_1(#k_char{val=C}, _Ctxt) -> io_lib:write_char(C);
-format_1(#k_float{val=F}, _Ctxt) -> float_to_list(F);
-format_1(#k_int{val=I}, _Ctxt) -> integer_to_list(I);
-format_1(#k_nil{}, _Ctxt) -> "[]";
-format_1(#k_string{val=S}, _Ctxt) -> io_lib:write_string(S);
-format_1(#k_var{name=V}, _Ctxt) ->
-    if atom(V) ->
-	    case atom_to_list(V) of
-		[$_|Cs] -> "_X" ++ Cs;
-		[C|Cs] when C >= $A, C =< $Z -> [C|Cs];
-		Cs -> [$_|Cs]
-	    end;
-       integer(V) -> [$_|integer_to_list(V)]
-    end;
-format_1(#k_cons{hd=H,tl=T}, Ctxt) ->
-    Txt = ["["|format(H, ctxt_bump_indent(Ctxt, 1))],
-    [Txt|format_list_tail(T, ctxt_bump_indent(Ctxt, width(Txt, Ctxt)))];
-format_1(#k_tuple{es=Es}, Ctxt) ->
-    [${,
-     format_hseq(Es, ",", ctxt_bump_indent(Ctxt, 1), fun format/2),
-     $}
-    ];
-format_1(#k_binary{segs=S}, Ctxt) ->
-    ["#<",format(S, ctxt_bump_indent(Ctxt, 2)),">#"];
-format_1(#k_bin_seg{}=S, Ctxt) ->
-    [format_bin_seg_1(S, Ctxt),
-     format_bin_seg(S#k_bin_seg.next, ctxt_bump_indent(Ctxt, 2))];
-format_1(#k_bin_end{}, _Ctxt) -> "#<>#";
-format_1(#k_local{name=N,arity=A}, Ctxt) ->
-    "local " ++ format_fa_pair({N,A}, Ctxt);
-format_1(#k_remote{mod=M,name=N,arity=A}, _Ctxt) ->
-    %% This is for our internal translator.
-    io_lib:format("remote ~s:~s/~w", [format(M),format(N),A]);
-format_1(#k_internal{name=N,arity=A}, Ctxt) ->
-    "internal " ++ format_fa_pair({N,A}, Ctxt);
-format_1(#k_seq{arg=A,body=B}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
-    ["do",
-     nl_indent(Ctxt1),
-     format(A, Ctxt1),
-     nl_indent(Ctxt),
-     "then",
-     nl_indent(Ctxt)
-     | format(B, Ctxt)
-    ];
-format_1(#k_match{vars=Vs,body=Bs,ret=Rs}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.item_indent),
-    ["match ",
-     format_hseq(Vs, ",", ctxt_bump_indent(Ctxt, 6), fun format/2),
-     nl_indent(Ctxt1),
-     format(Bs, Ctxt1),
-     nl_indent(Ctxt),
-     "end",
-     format_ret(Rs, Ctxt1)
-    ];
-format_1(#k_alt{first=O,then=T}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.item_indent),
-    ["alt",
-     nl_indent(Ctxt1),
-     format(O, Ctxt1),
-     nl_indent(Ctxt1),
-     format(T, Ctxt1)];
-format_1(#k_select{var=V,types=Cs}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
-    ["select ",
-     format(V, Ctxt),
-     nl_indent(Ctxt1),
-     format_vseq(Cs, "", "", Ctxt1, fun format/2)
-    ];
-format_1(#k_type_clause{type=T,values=Cs}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
-    ["type ",
-     io_lib:write(T),
-     nl_indent(Ctxt1),
-     format_vseq(Cs, "", "", Ctxt1, fun format/2)
-    ];
-format_1(#k_val_clause{val=Val,body=B}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
-    [format(Val, Ctxt),
-     " ->",
-     nl_indent(Ctxt1)
-     | format(B, Ctxt1)
-    ];
-format_1(#k_guard{clauses=Gs}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, 5),
-    ["when ",
-     nl_indent(Ctxt1),
-     format_vseq(Gs, "", "", Ctxt1, fun format/2)];
-format_1(#k_guard_clause{guard=G,body=B}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
-    [format(G, Ctxt),
-     nl_indent(Ctxt),
-     "->",
-     nl_indent(Ctxt1)
-     | format(B, Ctxt1)
-    ];
-format_1(#k_call{op=Op,args=As,ret=Rs}, Ctxt) ->
-    Txt = ["call (",format(Op, ctxt_bump_indent(Ctxt, 6)),$)],
-    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
-    [Txt,format_args(As, Ctxt1),
-     format_ret(Rs, Ctxt1)
-    ];
-format_1(#k_enter{op=Op,args=As}, Ctxt) ->
-    Txt = ["enter (",format(Op, ctxt_bump_indent(Ctxt, 7)),$)],
-    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
-    [Txt,format_args(As, Ctxt1)];
-format_1(#k_bif{op=Op,args=As,ret=Rs}, Ctxt) ->
-    Txt = ["bif (",format(Op, ctxt_bump_indent(Ctxt, 5)),$)],
-    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
-    [Txt,format_args(As, Ctxt1),
-     format_ret(Rs, Ctxt1)
-    ];
-format_1(#k_test{op=Op,args=As}, Ctxt) ->
-    Txt = ["test (",format(Op, ctxt_bump_indent(Ctxt, 6)),$)],
-    Ctxt1 = ctxt_bump_indent(Ctxt, 2),
-    [Txt,format_args(As, Ctxt1)];
-format_1(#k_put{arg=A,ret=Rs}, Ctxt) ->
-    [format(A, Ctxt),
-     format_ret(Rs, ctxt_bump_indent(Ctxt, 1))
-    ];
-format_1(#k_try{arg=A,vars=Vs,body=B,evars=Evs,handler=H,ret=Rs}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
-    ["try",
-     nl_indent(Ctxt1),
-     format(A, Ctxt1),
-     nl_indent(Ctxt),
-     "of ",
-     format_hseq(Vs, ", ", ctxt_bump_indent(Ctxt, 3), fun format/2),
-     nl_indent(Ctxt1),
-     format(B, Ctxt1),
-     nl_indent(Ctxt),
-     "catch ",
-     format_hseq(Evs, ", ", ctxt_bump_indent(Ctxt, 6), fun format/2),
-     nl_indent(Ctxt1),
-     format(H, Ctxt1),
-     nl_indent(Ctxt),
-     "end",
-     format_ret(Rs, Ctxt1)
-    ];
-format_1(#k_catch{body=B,ret=Rs}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
-    ["catch",
-     nl_indent(Ctxt1),
-     format(B, Ctxt1),
-     nl_indent(Ctxt),
-     "end",
-     format_ret(Rs, Ctxt1)
-    ];
-format_1(#k_receive{var=V,body=B,timeout=T,action=A,ret=Rs}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.item_indent),
-    ["receive ",
-     format(V, Ctxt),
-     nl_indent(Ctxt1),
-     format(B, Ctxt1),
-     nl_indent(Ctxt),
-     "after ",
-     format(T, ctxt_bump_indent(Ctxt, 6)),
-     " ->",
-     nl_indent(Ctxt1),
-     format(A, Ctxt1),
-     nl_indent(Ctxt),
-     "end",
-     format_ret(Rs, Ctxt1)
-    ];
-format_1(#k_receive_accept{}, _Ctxt) -> "receive_accept";
-format_1(#k_receive_next{}, _Ctxt) -> "receive_next";
-format_1(#k_break{args=As}, Ctxt) ->
-    ["<",
-     format_hseq(As, ",", ctxt_bump_indent(Ctxt, 1), fun format/2),
-     ">"
-    ];
-format_1(#k_return{args=As}, Ctxt) ->
-    ["<<",
-     format_hseq(As, ",", ctxt_bump_indent(Ctxt, 1), fun format/2),
-     ">>"
-    ];
-format_1(#k_fdef{func=F,arity=A,vars=Vs,body=B}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
-    ["fdef ",
-     format_fa_pair({F,A}, ctxt_bump_indent(Ctxt, 5)),
-     format_args(Vs, ctxt_bump_indent(Ctxt, 14)),
-     " =",
-     nl_indent(Ctxt1),
-     format(B, Ctxt1)
-    ];
-format_1(#k_mdef{name=N,exports=Es,attributes=As,body=B}, Ctxt) ->
-    ["module ",
-     format(#k_atom{val=N}, ctxt_bump_indent(Ctxt, 7)),
-     nl_indent(Ctxt),
-     "export [",
-     format_vseq(Es,
-		 "", ",",
-		 ctxt_bump_indent(Ctxt, 8),
-		 fun format_fa_pair/2),
-     "]",
-     nl_indent(Ctxt),
-     "attributes [",
-     format_vseq(As,
-		 "", ",",
-		 ctxt_bump_indent(Ctxt, 12),
-		 fun format_attribute/2),
-     "]",
-     nl_indent(Ctxt),
-     format_vseq(B,
-		 "", "",
-		 Ctxt,
-		 fun format/2),
-     nl_indent(Ctxt)
-     | "end"
-    ];
-%% Internal sys_kernel structures.
-format_1(#iset{vars=Vs,arg=A,body=B}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
-    ["set <",
-     format_hseq(Vs, ", ", ctxt_bump_indent(Ctxt, 5), fun format/2),
-     "> =",
-     nl_indent(Ctxt1),
-     format(A, Ctxt1),
-     nl_indent(Ctxt),
-     "in  "
-     | format(B, ctxt_bump_indent(Ctxt, 2))
-    ];
-format_1(#ifun{vars=Vs,body=B}, Ctxt) ->
-    Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
-    ["fun ",
-     format_args(Vs, ctxt_bump_indent(Ctxt, 4)),
-     " ->",
-     nl_indent(Ctxt1)
-     | format(B, Ctxt1)
-    ];
-format_1(Type, _Ctxt) ->
-    ["** Unsupported type: ",
-     io_lib:write(Type)
-     | " **"
-    ].
-
-%% format_ret([RetVar], Context) -> Txt.
-%%  Format the return vars of kexpr.
-
-format_ret(Rs, Ctxt) ->
-    [" >> ",
-     "<",
-     format_hseq(Rs, ",", ctxt_bump_indent(Ctxt, 5), fun format/2),
-     ">"].
-
-%% format_args([Arg], Context) -> Txt.
-%%  Format arguments.
-
-format_args(As, Ctxt) ->
-  [$(,format_hseq(As, ", ", ctxt_bump_indent(Ctxt, 1), fun format/2),$)].
-
-%% format_hseq([Thing], Separator, Context, Fun) -> Txt.
-%%  Format a sequence horizontally.
-
-format_hseq([H], _Sep, Ctxt, Fun) ->
-    Fun(H, Ctxt);
-format_hseq([H|T], Sep, Ctxt, Fun) ->
-    Txt = [Fun(H, Ctxt)|Sep],
-    Ctxt1 = ctxt_bump_indent(Ctxt, width(Txt, Ctxt)),
-    [Txt|format_hseq(T, Sep, Ctxt1, Fun)];
-format_hseq([], _, _, _) -> "".
-
-%% format_vseq([Thing], LinePrefix, LineSuffix, Context, Fun) -> Txt.
-%%  Format a sequence vertically.
-
-format_vseq([H], _Pre, _Suf, Ctxt, Fun) ->
-    Fun(H, Ctxt);
-format_vseq([H|T], Pre, Suf, Ctxt, Fun) ->
-    [Fun(H, Ctxt),Suf,nl_indent(Ctxt),Pre|
-     format_vseq(T, Pre, Suf, Ctxt, Fun)];
-format_vseq([], _, _, _, _) -> "".
-
-format_fa_pair({F,A}, _Ctxt) -> [core_atom(F),$/,integer_to_list(A)].
-
-%% format_attribute({Name,Val}, Context) -> Txt.
-
-format_attribute({Name,Val}, Ctxt) when list(Val) ->
-    Txt = format(#k_atom{val=Name}, Ctxt),
-    Ctxt1 = ctxt_bump_indent(Ctxt, width(Txt,Ctxt)+4),
-    [Txt," = ",
-     $[,format_vseq(Val, "", ",", Ctxt1,
-		    fun (A, _C) -> io_lib:write(A) end),$]
-    ];
-format_attribute({Name,Val}, Ctxt) ->
-    Txt = format(#k_atom{val=Name}, Ctxt),
-    [Txt," = ",io_lib:write(Val)].
-
-format_list_tail(#k_nil{anno=[]}, _Ctxt) -> "]";
-format_list_tail(#k_cons{anno=[],hd=H,tl=T}, Ctxt) ->
-    Txt = [$,|format(H, Ctxt)],
-    Ctxt1 = ctxt_bump_indent(Ctxt, width(Txt, Ctxt)),
-    [Txt|format_list_tail(T, Ctxt1)];
-format_list_tail(Tail, Ctxt) ->
-    ["|",format(Tail, ctxt_bump_indent(Ctxt, 1)), "]"].
-
-format_bin_seg(#k_bin_end{anno=[]}, _Ctxt) -> "";
-format_bin_seg(#k_bin_seg{anno=[],next=N}=Seg, Ctxt) ->
-    Txt = [$,|format_bin_seg_1(Seg, Ctxt)],
-    [Txt|format_bin_seg(N, ctxt_bump_indent(Ctxt, width(Txt, Ctxt)))];
-format_bin_seg(Seg, Ctxt) ->
-    ["|",format(Seg, ctxt_bump_indent(Ctxt, 2))].
-
-format_bin_seg_1(#k_bin_seg{size=S,unit=U,type=T,flags=Fs,seg=Seg}, Ctxt) ->
-    [format(Seg, Ctxt),
-     ":",format(S, Ctxt),"*",io_lib:write(U),
-     ":",io_lib:write(T),
-     lists:map(fun (F) -> [$-,io_lib:write(F)] end, Fs)
-    ].
-
-% format_bin_elements(#k_binary_cons{hd=H,tl=T,size=S,info=I}, Ctxt) ->
-%     A = canno(T),
-%     Fe = fun (Eh, Es, Ei, Ct) ->
-% 		 [format(Eh, Ct),":",format(Es, Ct),"/",io_lib:write(Ei)]
-% 	 end,
-%     case T of
-% 	#k_zero_binary{} when A == [] ->
-% 	    Fe(H, S, I, Ctxt);
-% 	#k_binary_cons{} when A == [] ->
-% 	    Txt = [Fe(H, S, I, Ctxt)|","],
-% 	    Ctxt1 = ctxt_bump_indent(Ctxt, width(Txt, Ctxt)),
-% 	    [Txt|format_bin_elements(T, Ctxt1)];
-% 	_ ->
-% 	    Txt = [Fe(H, S, I, Ctxt)|"|"],
-% 	    [Txt|format(T, ctxt_bump_indent(Ctxt, width(Txt, Ctxt)))]
-%     end.
-
-indent(Ctxt) -> indent(Ctxt#ctxt.indent, Ctxt).
-
-indent(N, _Ctxt) when N =< 0 -> "";
-indent(N, Ctxt) ->
-    T = Ctxt#ctxt.tab_width,
-    string:chars($\t, N div T, string:chars($\s, N rem T)).
-
-nl_indent(Ctxt) -> [$\n|indent(Ctxt)].
-
-
-unindent(T, Ctxt) ->
-    unindent(T, Ctxt#ctxt.indent, Ctxt, []).
-
-unindent(T, N, _Ctxt, C) when N =< 0 ->
-    [T|C];
-unindent([$\s|T], N, Ctxt, C) ->
-    unindent(T, N - 1, Ctxt, C);
-unindent([$\t|T], N, Ctxt, C) ->
-    Tab = Ctxt#ctxt.tab_width,
-    if N >= Tab ->
-	    unindent(T, N - Tab, Ctxt, C);
-       true ->
-	    unindent([string:chars($\s, Tab - N)|T], 0, Ctxt, C)
-    end;
-unindent([L|T], N, Ctxt, C) when list(L) ->
-    unindent(L, N, Ctxt, [T|C]);
-unindent([H|T], _N, _Ctxt, C) ->
-    [H|[T|C]];
-unindent([], N, Ctxt, [H|T]) ->
-    unindent(H, N, Ctxt, T);
-unindent([], _, _, []) -> [].
-
-
-width(Txt, Ctxt) ->
-    width(Txt, 0, Ctxt, []).
-
-width([$\t|T], A, Ctxt, C) ->
-    width(T, A + Ctxt#ctxt.tab_width, Ctxt, C);
-width([$\n|T], _A, Ctxt, C) ->
-    width(unindent([T|C], Ctxt), Ctxt);
-width([H|T], A, Ctxt, C) when list(H) ->
-    width(H, A, Ctxt, [T|C]);
-width([_|T], A, Ctxt, C) ->
-    width(T, A + 1, Ctxt, C);
-width([], A, Ctxt, [H|T]) ->
-    width(H, A, Ctxt, T);
-width([], A, _, []) -> A.
-
-ctxt_bump_indent(Ctxt, Dx) ->
-    Ctxt#ctxt{indent=Ctxt#ctxt.indent + Dx}.
-
-core_atom(A) -> io_lib:write_string(atom_to_list(A), $').
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_life.erl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_life.erl
deleted file mode 100644
index ff210d83f5..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_life.erl
+++ /dev/null
@@ -1,448 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: v3_life.erl,v 1.2 2010/03/04 13:54:20 maria Exp $
-%%
-%% Purpose : Convert annotated kernel expressions to annotated beam format.
-
-%% This module creates beam format annotated with variable lifetime
-%% information.  Each thing is given an index and for each variable we
-%% store the first and last index for its occurrence.  The variable
-%% database, VDB, attached to each thing is only relevant internally
-%% for that thing.
-%%
-%% For nested things like matches the numbering continues locally and
-%% the VDB for that thing refers to the variable usage within that
-%% thing.  Variables which live through a such a thing are internally
-%% given a very large last index.  Internally the indexes continue
-%% after the index of that thing.  This creates no problems as the
-%% internal variable info never escapes and externally we only see
-%% variable which are alive both before or after.
-%%
-%% This means that variables never "escape" from a thing and the only
-%% way to get values from a thing is to "return" them, with 'break' or
-%% 'return'.  Externally these values become the return values of the
-%% thing.  This is no real limitation as most nested things have
-%% multiple threads so working out a common best variable usage is
-%% difficult.
-
--module(v3_life).
-
--export([module/2]).
-
--export([vdb_find/2]).
-
--import(lists, [map/2,foldl/3]).
--import(ordsets, [add_element/2,intersection/2,union/2,union/1]).
-
--include("v3_kernel.hrl").
--include("v3_life.hrl").
-
-%% These are not defined in v3_kernel.hrl.
-get_kanno(Kthing) -> element(2, Kthing).
-%%set_kanno(Kthing, Anno) -> setelement(2, Kthing, Anno).
-
-module(#k_mdef{name=M,exports=Es,attributes=As,body=Fs0}, Opts) ->
-    put(?MODULE, Opts),
-    Fs1 = map(fun function/1, Fs0),
-    erase(?MODULE),
-    {ok,{M,Es,As,Fs1}}.
-
-%% function(Kfunc) -> Func.
-
-function(#k_fdef{func=F,arity=Ar,vars=Vs,body=Kb}) ->
-    %%ok = io:fwrite("life ~w: ~p~n", [?LINE,{F,Ar}]),
-    As = var_list(Vs),
-    Vdb0 = foldl(fun ({var,N}, Vdb) -> new_var(N, 0, Vdb) end, [], As),
-    %% Force a top-level match!
-    B0 = case Kb of
-	     #k_match{} -> Kb;
-	     _ ->
-		 Ka = get_kanno(Kb),
-		 #k_match{anno=#k{us=Ka#k.us,ns=[],a=Ka#k.a},
-			  vars=Vs,body=Kb,ret=[]}
-	 end,
-    {B1,_,Vdb1} = body(B0, 1, Vdb0),
-    {function,F,Ar,As,B1,Vdb1}.
-
-%% body(Kbody, I, Vdb) -> {[Expr],MaxI,Vdb}.
-%%  Handle a body, need special cases for transforming match_fails.
-%%  We KNOW that they only occur last in a body.
-
-body(#k_seq{arg=#k_put{anno=Pa,arg=Arg,ret=[R]},
-	    body=#k_enter{anno=Ea,op=#k_internal{name=match_fail,arity=1},
-			  args=[R]}},
-      I, Vdb0) ->
-    Vdb1 = use_vars(Pa#k.us, I, Vdb0),		%All used here
-    {[match_fail(Arg, I, Pa#k.a ++ Ea#k.a)],I,Vdb1};
-body(#k_enter{anno=Ea,op=#k_internal{name=match_fail,arity=1},args=[Arg]},
-      I, Vdb0) ->
-    Vdb1 = use_vars(Ea#k.us, I, Vdb0),
-    {[match_fail(Arg, I, Ea#k.a)],I,Vdb1};
-body(#k_seq{arg=Ke,body=Kb}, I, Vdb0) ->
-    %%ok = io:fwrite("life ~w:~p~n", [?LINE,{Ke,I,Vdb0}]),
-    A = get_kanno(Ke),
-    Vdb1 = use_vars(A#k.us, I, new_vars(A#k.ns, I, Vdb0)),
-    {Es,MaxI,Vdb2} = body(Kb, I+1, Vdb1),
-    E = expr(Ke, I, Vdb2),
-    {[E|Es],MaxI,Vdb2};
-body(Ke, I, Vdb0) ->
-    %%ok = io:fwrite("life ~w:~p~n", [?LINE,{Ke,I,Vdb0}]),
-    A = get_kanno(Ke),
-    Vdb1 = use_vars(A#k.us, I, new_vars(A#k.ns, I, Vdb0)),
-    E = expr(Ke, I, Vdb1),
-    {[E],I,Vdb1}.
-
-%% guard(Kguard, I, Vdb) -> Guard.
-
-guard(#k_try{anno=A,arg=Ts,vars=[#k_var{name=X}],body=#k_var{name=X},
-	     handler=#k_atom{val=false},ret=Rs}, I, Vdb) ->
-    %% Lock variables that are alive before try and used afterwards.
-    %% Don't lock variables that are only used inside the try expression.
-    Pdb0 = vdb_sub(I, I+1, Vdb),
-    {T,MaxI,Pdb1} = guard_body(Ts, I+1, Pdb0),
-    Pdb2 = use_vars(A#k.ns, MaxI+1, Pdb1),	%Save "return" values
-    #l{ke={protected,T,var_list(Rs)},i=I,a=A#k.a,vdb=Pdb2};
-guard(#k_seq{}=G, I, Vdb0) ->
-    {Es,_,Vdb1} = guard_body(G, I, Vdb0),
-    #l{ke={block,Es},i=I,vdb=Vdb1,a=[]};
-guard(G, I, Vdb) -> guard_expr(G, I, Vdb).
-
-%% guard_body(Kbody, I, Vdb) -> {[Expr],MaxI,Vdb}.
-
-guard_body(#k_seq{arg=Ke,body=Kb}, I, Vdb0) ->
-    A = get_kanno(Ke),
-    Vdb1 = use_vars(A#k.us, I, new_vars(A#k.ns, I, Vdb0)),
-    {Es,MaxI,Vdb2} = guard_body(Kb, I+1, Vdb1), 
-    E = guard_expr(Ke, I, Vdb2),
-    {[E|Es],MaxI,Vdb2};
-guard_body(Ke, I, Vdb0) ->
-    A = get_kanno(Ke),
-    Vdb1 = use_vars(A#k.us, I, new_vars(A#k.ns, I, Vdb0)),
-    E = guard_expr(Ke, I, Vdb1),
-    {[E],I,Vdb1}.
-
-%% guard_expr(Call, I, Vdb) -> Expr
-
-guard_expr(#k_test{anno=A,op=Op,args=As}, I, _Vdb) ->
-    #l{ke={test,test_op(Op),atomic_list(As)},i=I,a=A#k.a};
-guard_expr(#k_bif{anno=A,op=Op,args=As,ret=Rs}, I, _Vdb) ->
-    #l{ke={bif,bif_op(Op),atomic_list(As),var_list(Rs)},i=I,a=A#k.a};
-guard_expr(#k_put{anno=A,arg=Arg,ret=Rs}, I, _Vdb) ->
-    #l{ke={set,var_list(Rs),literal(Arg)},i=I,a=A#k.a};
-guard_expr(#k_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
-    %% Experimental support for andalso/orelse in guards.
-    %% Work out imported variables which need to be locked.
-    Mdb = vdb_sub(I, I+1, Vdb),
-    M = match(Kb, A#k.us, I+1, Mdb),
-    #l{ke={match,M,var_list(Rs)},i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a};
-guard_expr(G, I, Vdb) -> guard(G, I, Vdb).
-
-%% expr(Kexpr, I, Vdb) -> Expr.
-
-expr(#k_call{anno=A,op=Op,args=As,ret=Rs}, I, _Vdb) ->
-    #l{ke={call,call_op(Op),atomic_list(As),var_list(Rs)},i=I,a=A#k.a};
-expr(#k_enter{anno=A,op=Op,args=As}, I, _Vdb) ->
-    #l{ke={enter,call_op(Op),atomic_list(As)},i=I,a=A#k.a};
-expr(#k_bif{anno=A,op=Op,args=As,ret=Rs}, I, _Vdb) ->
-    Bif = k_bif(A, Op, As, Rs),
-    #l{ke=Bif,i=I,a=A#k.a};
-expr(#k_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
-    %% Work out imported variables which need to be locked.
-    Mdb = vdb_sub(I, I+1, Vdb),
-    M = match(Kb, A#k.us, I+1, Mdb),
-    #l{ke={match,M,var_list(Rs)},i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a};
-expr(#k_try{anno=A,arg=Ka,vars=Vs,body=Kb,evars=Evs,handler=Kh,ret=Rs}, I, Vdb) ->
-    %% Lock variables that are alive before the catch and used afterwards.
-    %% Don't lock variables that are only used inside the try.
-    Tdb0 = vdb_sub(I, I+1, Vdb),
-    %% This is the tricky bit. Lock variables in Arg that are used in
-    %% the body and handler. Add try tag 'variable'.
-    Ab = get_kanno(Kb),
-    Ah = get_kanno(Kh),
-    Tdb1 = use_vars(Ab#k.us, I+3, use_vars(Ah#k.us, I+3, Tdb0)),
-    Tdb2 = vdb_sub(I, I+2, Tdb1),
-    Vnames = fun (Kvar) -> Kvar#k_var.name end,	%Get the variable names
-    {Aes,_,Adb} = body(Ka, I+2, add_var({catch_tag,I+1}, I+1, 1000000, Tdb2)),
-    {Bes,_,Bdb} = body(Kb, I+4, new_vars(map(Vnames, Vs), I+3, Tdb2)),
-    {Hes,_,Hdb} = body(Kh, I+4, new_vars(map(Vnames, Evs), I+3, Tdb2)),
-    #l{ke={'try',#l{ke={block,Aes},i=I+1,vdb=Adb,a=[]},
-	   var_list(Vs),#l{ke={block,Bes},i=I+3,vdb=Bdb,a=[]},
-	   var_list(Evs),#l{ke={block,Hes},i=I+3,vdb=Hdb,a=[]},
-	   var_list(Rs)},
-       i=I,vdb=Tdb1,a=A#k.a};
-expr(#k_catch{anno=A,body=Kb,ret=[R]}, I, Vdb) ->
-    %% Lock variables that are alive before the catch and used afterwards.
-    %% Don't lock variables that are only used inside the catch.
-    %% Add catch tag 'variable'.
-    Cdb0 = vdb_sub(I, I+1, Vdb),
-    {Es,_,Cdb1} = body(Kb, I+1, add_var({catch_tag,I}, I, 1000000, Cdb0)),
-    #l{ke={'catch',Es,variable(R)},i=I,vdb=Cdb1,a=A#k.a};
-expr(#k_receive{anno=A,var=V,body=Kb,timeout=T,action=Ka,ret=Rs}, I, Vdb) ->
-    %% Work out imported variables which need to be locked.
-    Rdb = vdb_sub(I, I+1, Vdb),
-    M = match(Kb, add_element(V#k_var.name, A#k.us), I+1,
- 	      new_var(V#k_var.name, I, Rdb)),
-    {Tes,_,Adb} = body(Ka, I+1, Rdb),
-    #l{ke={receive_loop,atomic_lit(T),variable(V),M,
-	   #l{ke=Tes,i=I+1,vdb=Adb,a=[]},var_list(Rs)},
-       i=I,vdb=use_vars(A#k.us, I+1, Vdb),a=A#k.a};
-expr(#k_receive_accept{anno=A}, I, _Vdb) ->
-    #l{ke=receive_accept,i=I,a=A#k.a};
-expr(#k_receive_next{anno=A}, I, _Vdb) ->
-    #l{ke=receive_next,i=I,a=A#k.a};
-expr(#k_put{anno=A,arg=Arg,ret=Rs}, I, _Vdb) ->
-    #l{ke={set,var_list(Rs),literal(Arg)},i=I,a=A#k.a};
-expr(#k_break{anno=A,args=As}, I, _Vdb) ->
-    #l{ke={break,atomic_list(As)},i=I,a=A#k.a};
-expr(#k_return{anno=A,args=As}, I, _Vdb) ->
-    #l{ke={return,atomic_list(As)},i=I,a=A#k.a}.
-
-%% call_op(Op) -> Op.
-%% bif_op(Op) -> Op.
-%% test_op(Op) -> Op.
-%%  Do any necessary name translations here to munge into beam format.
-
-call_op(#k_local{name=N}) -> N; 
-call_op(#k_remote{mod=M,name=N}) -> {remote,atomic_lit(M),atomic_lit(N)};
-call_op(Other) -> variable(Other).
-
-bif_op(#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=N}}) -> N;
-bif_op(#k_internal{name=N}) -> N.
-
-test_op(#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=N}}) -> N.
-
-%% k_bif(Anno, Op, [Arg], [Ret]) -> Expr.
-%%  Build bifs, do special handling of internal some calls.
-
-k_bif(_A, #k_internal{name=dsetelement,arity=3}, As, []) ->
-    {bif,dsetelement,atomic_list(As),[]};
-k_bif(_A, #k_internal{name=make_fun},
-      [#k_atom{val=Fun},#k_int{val=Arity},
-       #k_int{val=Index},#k_int{val=Uniq}|Free],
-      Rs) ->
-    {bif,{make_fun,Fun,Arity,Index,Uniq},var_list(Free),var_list(Rs)};
-k_bif(_A, Op, As, Rs) ->
-    %% The general case.
-    {bif,bif_op(Op),atomic_list(As),var_list(Rs)}.
-
-%% match(Kexpr, [LockVar], I, Vdb) -> Expr.
-%%  Convert match tree to old format.
-
-match(#k_alt{anno=A,first=Kf,then=Kt}, Ls, I, Vdb0) ->
-    Vdb1 = use_vars(union(A#k.us, Ls), I, Vdb0),
-    F = match(Kf, Ls, I+1, Vdb1),
-    T = match(Kt, Ls, I+1, Vdb1),
-    #l{ke={alt,F,T},i=I,vdb=Vdb1,a=A#k.a};
-match(#k_select{anno=A,var=V,types=Kts}, Ls0, I, Vdb0) ->
-    Ls1 = add_element(V#k_var.name, Ls0),
-    Vdb1 = use_vars(union(A#k.us, Ls1), I, Vdb0),
-    Ts = map(fun (Tc) -> type_clause(Tc, Ls1, I+1, Vdb1) end, Kts),
-    #l{ke={select,literal(V),Ts},i=I,vdb=Vdb1,a=A#k.a};
-match(#k_guard{anno=A,clauses=Kcs}, Ls, I, Vdb0) ->
-    Vdb1 = use_vars(union(A#k.us, Ls), I, Vdb0),
-    Cs = map(fun (G) -> guard_clause(G, Ls, I+1, Vdb1) end, Kcs),
-    #l{ke={guard,Cs},i=I,vdb=Vdb1,a=A#k.a};
-match(Other, Ls, I, Vdb0) ->
-    Vdb1 = use_vars(Ls, I, Vdb0),
-    {B,_,Vdb2} = body(Other, I+1, Vdb1),
-    #l{ke={block,B},i=I,vdb=Vdb2,a=[]}.
-
-type_clause(#k_type_clause{anno=A,type=T,values=Kvs}, Ls, I, Vdb0) ->
-    %%ok = io:format("life ~w: ~p~n", [?LINE,{T,Kvs}]),
-    Vdb1 = use_vars(union(A#k.us, Ls), I+1, Vdb0),
-    Vs = map(fun (Vc) -> val_clause(Vc, Ls, I+1, Vdb1) end, Kvs),
-    #l{ke={type_clause,type(T),Vs},i=I,vdb=Vdb1,a=A#k.a}.
-
-val_clause(#k_val_clause{anno=A,val=V,body=Kb}, Ls0, I, Vdb0) ->
-    {_Used,New} = match_pat_vars(V),
-    %% Not clear yet how Used should be used.
-    Bus = (get_kanno(Kb))#k.us,
-    %%ok = io:format("Ls0 = ~p, Used=~p\n  New=~p, Bus=~p\n", [Ls0,Used,New,Bus]),
-    Ls1 = union(intersection(New, Bus), Ls0),	%Lock for safety
-    Vdb1 = use_vars(union(A#k.us, Ls1), I+1, new_vars(New, I, Vdb0)),
-    B = match(Kb, Ls1, I+1, Vdb1),
-    #l{ke={val_clause,literal(V),B},i=I,vdb=use_vars(Bus, I+1, Vdb1),a=A#k.a}.
-
-guard_clause(#k_guard_clause{anno=A,guard=Kg,body=Kb}, Ls, I, Vdb0) ->
-    Vdb1 = use_vars(union(A#k.us, Ls), I+2, Vdb0),
-    Gdb = vdb_sub(I+1, I+2, Vdb1),
-    G = guard(Kg, I+1, Gdb),
-    B = match(Kb, Ls, I+2, Vdb1),
-    #l{ke={guard_clause,G,B},
-       i=I,vdb=use_vars((get_kanno(Kg))#k.us, I+2, Vdb1),
-       a=A#k.a}.
-
-%% match_fail(FailValue, I, Anno) -> Expr.
-%%  Generate the correct match_fail instruction.  N.B. there is no
-%%  generic case for when the fail value has been created elsewhere.
-
-match_fail(#k_tuple{es=[#k_atom{val=function_clause}|As]}, I, A) ->
-    #l{ke={match_fail,{function_clause,literal_list(As)}},i=I,a=A};
-match_fail(#k_tuple{es=[#k_atom{val=badmatch},Val]}, I, A) ->
-    #l{ke={match_fail,{badmatch,literal(Val)}},i=I,a=A};
-match_fail(#k_tuple{es=[#k_atom{val=case_clause},Val]}, I, A) ->
-    #l{ke={match_fail,{case_clause,literal(Val)}},i=I,a=A};
-match_fail(#k_atom{val=if_clause}, I, A) ->
-    #l{ke={match_fail,if_clause},i=I,a=A};
-match_fail(#k_tuple{es=[#k_atom{val=try_clause},Val]}, I, A) ->
-    #l{ke={match_fail,{try_clause,literal(Val)}},i=I,a=A}.
-
-%% type(Ktype) -> Type.
-
-type(k_int) -> integer;
-type(k_char) -> integer;			%Hhhmmm???
-type(k_float) -> float;
-type(k_atom) -> atom;
-type(k_nil) -> nil;
-type(k_cons) -> cons;
-type(k_tuple) -> tuple;
-type(k_binary) -> binary;
-type(k_bin_seg) -> bin_seg;
-type(k_bin_end) -> bin_end.
-
-%% variable(Klit) -> Lit.
-%% var_list([Klit]) -> [Lit].
-
-variable(#k_var{name=N}) -> {var,N}.
-
-var_list(Ks) -> map(fun variable/1, Ks).
-
-%% atomic_lit(Klit) -> Lit.
-%% atomic_list([Klit]) -> [Lit].
-
-atomic_lit(#k_var{name=N}) -> {var,N};
-atomic_lit(#k_int{val=I}) -> {integer,I};
-atomic_lit(#k_float{val=F}) -> {float,F};
-atomic_lit(#k_atom{val=N}) -> {atom,N};
-%%atomic_lit(#k_char{val=C}) -> {char,C};
-%%atomic_lit(#k_string{val=S}) -> {string,S};
-atomic_lit(#k_nil{}) -> nil.
-
-atomic_list(Ks) -> map(fun atomic_lit/1, Ks).
-
-%% literal(Klit) -> Lit.
-%% literal_list([Klit]) -> [Lit].
-
-literal(#k_var{name=N}) -> {var,N};
-literal(#k_int{val=I}) -> {integer,I};
-literal(#k_float{val=F}) -> {float,F};
-literal(#k_atom{val=N}) -> {atom,N};
-%%literal(#k_char{val=C}) -> {char,C};
-literal(#k_string{val=S}) -> {string,S};
-literal(#k_nil{}) -> nil;
-literal(#k_cons{hd=H,tl=T}) ->
-    {cons,[literal(H),literal(T)]};
-literal(#k_binary{segs=V}) ->
-    case proplists:get_bool(no_new_binaries, get(?MODULE)) of
-	true ->
-	    {old_binary,literal(V)};
-	false ->
-	    {binary,literal(V)}
-    end;
-literal(#k_bin_seg{size=S,unit=U,type=T,flags=Fs,seg=Seg,next=N}) ->
-    {bin_seg,literal(S),U,T,Fs,[literal(Seg),literal(N)]};
-literal(#k_bin_end{}) -> bin_end;
-literal(#k_tuple{es=Es}) ->
-    {tuple,literal_list(Es)}.
-
-literal_list(Ks) -> map(fun literal/1, Ks).
-
-%% match_pat_vars(Pattern) -> {[UsedVarName],[NewVarName]}.
-
-match_pat_vars(#k_var{name=N}) -> {[],[N]};
-match_pat_vars(#k_int{}) -> {[],[]};
-match_pat_vars(#k_float{}) -> {[],[]};
-match_pat_vars(#k_atom{}) -> {[],[]};
-%%match_pat_vars(#k_char{}) -> {[],[]};
-match_pat_vars(#k_string{}) -> {[],[]};
-match_pat_vars(#k_nil{}) -> {[],[]};
-match_pat_vars(#k_cons{hd=H,tl=T}) ->
-    match_pat_list_vars([H,T]);
-match_pat_vars(#k_binary{segs=V}) ->
-    match_pat_vars(V);
-match_pat_vars(#k_bin_seg{size=S,seg=Seg,next=N}) ->
-    {U1,New1} = match_pat_vars(Seg),
-    {U2,New2} = match_pat_vars(N),
-    {[],U3} = match_pat_vars(S),
-    {union([U1,U2,U3]),union(New1, New2)};
-match_pat_vars(#k_bin_end{}) -> {[],[]};
-match_pat_vars(#k_tuple{es=Es}) ->
-    match_pat_list_vars(Es).
-
-match_pat_list_vars(Ps) ->
-    foldl(fun (P, {Used0,New0}) ->
-		  {Used,New} = match_pat_vars(P),
-		  {union(Used0, Used),union(New0, New)} end,
-	  {[],[]}, Ps).
-
-%% new_var(VarName, I, Vdb) -> Vdb.
-%% new_vars([VarName], I, Vdb) -> Vdb.
-%% use_var(VarName, I, Vdb) -> Vdb.
-%% use_vars([VarName], I, Vdb) -> Vdb.
-%% add_var(VarName, F, L, Vdb) -> Vdb.
-
-new_var(V, I, Vdb) ->
-    case vdb_find(V, Vdb) of
-	{V,F,L} when I < F -> vdb_store(V, I, L, Vdb);
-	{V,_,_} -> Vdb;
-	error -> vdb_store(V, I, I, Vdb)
-    end.
-
-new_vars(Vs, I, Vdb0) ->
-    foldl(fun (V, Vdb) -> new_var(V, I, Vdb) end, Vdb0, Vs).
-
-use_var(V, I, Vdb) ->
-    case vdb_find(V, Vdb) of
-	{V,F,L} when I > L -> vdb_store(V, F, I, Vdb);
-	{V,_,_} -> Vdb;
-	error -> vdb_store(V, I, I, Vdb)
-    end.
-
-use_vars(Vs, I, Vdb0) ->
-    foldl(fun (V, Vdb) -> use_var(V, I, Vdb) end, Vdb0, Vs).
-
-add_var(V, F, L, Vdb) ->
-    use_var(V, L, new_var(V, F, Vdb)).
-
-vdb_find(V, Vdb) ->
-    %% Peformance note: Profiling shows that this function accounts for
-    %% a lot of the execution time when huge constants terms are built.
-    %% Using the BIF lists:keysearch/3 is a lot faster than the
-    %% original Erlang version.
-    case lists:keysearch(V, 1, Vdb) of
-	{value,Vd} -> Vd;
-	false -> error
-    end.
-
-%vdb_find(V, [{V1,F,L}=Vd|Vdb]) when V < V1 -> error;
-%vdb_find(V, [{V1,F,L}=Vd|Vdb]) when V == V1 -> Vd;
-%vdb_find(V, [{V1,F,L}=Vd|Vdb]) when V > V1 -> vdb_find(V, Vdb);
-%vdb_find(V, []) -> error.
-
-vdb_store(V, F, L, [{V1,_,_}=Vd|Vdb]) when V > V1 ->
-    [Vd|vdb_store(V, F, L, Vdb)];
-vdb_store(V, F, L, [{V1,_,_}=Vd|Vdb]) when V < V1 -> [{V,F,L},Vd|Vdb];
-vdb_store(V, F, L, [{_V1,_,_}|Vdb]) -> [{V,F,L}|Vdb]; %V == V1
-vdb_store(V, F, L, []) -> [{V,F,L}].
-
-%% vdb_sub(Min, Max, Vdb) -> Vdb.
-%%  Extract variables which are used before and after Min.  Lock
-%%  variables alive after Max.
-
-vdb_sub(Min, Max, Vdb) ->
-    [ if L >= Max -> {V,F,1000000};
-	 true -> Vd
-      end || {V,F,L}=Vd <- Vdb, F < Min, L >= Min ].
diff --git a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_life.hrl b/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_life.hrl
deleted file mode 100644
index 95adcfcfd8..0000000000
--- a/lib/dialyzer/test/options1_tests_SUITE_data/src/compiler/v3_life.hrl
+++ /dev/null
@@ -1,25 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: v3_life.hrl,v 1.1 2008/12/17 09:53:43 mikpe Exp $
-%%
-%% This record contains variable life-time annotation for a
-%% kernel expression.  Added by v3_life, used by v3_codegen.
-
--record(l, {ke,					%Kernel expression
-	    i=0,				%Op number
-	    vdb=[],				%Variable database
-	    a}).				%Core annotation
-
diff --git a/lib/dialyzer/test/options2_tests_SUITE_data/dialyzer_options b/lib/dialyzer/test/options2_SUITE_data/dialyzer_options
index 5db2e50d23..5db2e50d23 100644
--- a/lib/dialyzer/test/options2_tests_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/options2_SUITE_data/dialyzer_options
diff --git a/lib/dialyzer/test/options2_tests_SUITE_data/results/kernel b/lib/dialyzer/test/options2_SUITE_data/results/kernel
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/options2_tests_SUITE_data/results/kernel
+++ b/lib/dialyzer/test/options2_SUITE_data/results/kernel
diff --git a/lib/dialyzer/test/options2_SUITE_data/src/kernel/global.erl b/lib/dialyzer/test/options2_SUITE_data/src/kernel/global.erl
new file mode 100644
index 0000000000..4778a39a3c
--- /dev/null
+++ b/lib/dialyzer/test/options2_SUITE_data/src/kernel/global.erl
@@ -0,0 +1,1999 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: global.erl,v 1.4 2009/09/17 09:46:19 kostis Exp $
+%%
+-module(global).
+-behaviour(gen_server).
+
+%%  A Global register that allows the global registration of pid's and
+%% name's, that dynamically keeps up to date with the entire network.
+%% global can operate in two modes; in a fully connected network, or
+%% in a non-fully connected network.  In the latter case, the name
+%% registration mechanism won't work.
+%%
+
+%% External exports
+-export([start/0, start_link/0, stop/0, sync/0, sync/1,
+	 safe_whereis_name/1, whereis_name/1,  register_name/2, register_name/3,
+	 register_name_external/2, register_name_external/3, unregister_name_external/1,
+	 re_register_name/2, re_register_name/3,
+	 unregister_name/1, registered_names/0, send/2, node_disconnected/1,
+	 set_lock/1, set_lock/2, set_lock/3,
+	 del_lock/1, del_lock/2,
+	 trans/2, trans/3, trans/4,
+	 random_exit_name/3, random_notify_name/3, notify_all_name/3, cnode/3]).
+
+%% Internal exports
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
+	 code_change/3, timer/2, sync_init/2, init_locker/5, resolve_it/4,
+	 init_the_locker/1]).
+
+-export([info/0]).
+
+
+%-define(PRINT(X), erlang:display(X)).
+-define(PRINT(X), true).
+
+%-define(P2(X), erlang:display(X)).
+%-define(P2(X), erlang:display({cs(),X})).
+-define(P2(X), true).
+
+%-define(P1(X), erlang:display(X)).
+-define(P1(X), true).
+
+%-define(P(X), erlang:display(X)).
+-define(P(X), true).
+
+%-define(FORMAT(S, A), format(S, A)).
+-define(FORMAT(S, A), ok).
+
+%%% In certain places in the server, calling io:format hangs everything,
+%%% so we'd better use erlang:display/1.
+% format(S, A) ->
+%     erlang:display({format, cs(), S, A}),
+% %    io:format(S, A),
+%     ok.
+
+% cs() ->
+%     {Big, Small, Tiny} = now(),
+%     (Small rem 100) * 100 + (Tiny div 10000).
+
+%% Some notes on the internal structure:
+%% One invariant is that the list of locker processes is keyed; i.e.,
+%% there is only one process per neighboring node.
+%% When an item has been stored in the process dictionary, it is not
+%% necessarily cleared when not in use anymore. In other words, it's
+%% not an error if there is already an item there when one is to be
+%% stored.
+
+
+%% This is the protocol version
+%% Vsn 1 is the original protocol.
+%% Vsn 2 is enhanced with code to take care of registration of names from
+%%       non erlang nodes, e.g. c-nodes.
+%% Vsn 3 is enhanced with a tag in the synch messages to distinguish
+%%       different synch sessions from each other, see OTP-2766.
+%%       Note: This requires also that the ticket OTP-2928 is fixed on the nodes
+%%             running vsn 1 or 2; if such nodes will coexist with vsn 3 nodes.
+%% Vsn 4 uses a single, permanent, locker process, but works like vsn 3
+%% when communicating with vsn 3 nodes.
+
+%% -define(vsn, 4).  %% Now given in options
+
+%%-----------------------------------------------------------------
+%% connect_all = boolean() - true if we are supposed to set up a
+%%                        fully connected net
+%% known       = [Node] - all nodes known to us
+%% synced      = [Node] - all nodes that have the same names as us
+%% lockers     = [{Node, MyLockerPid}] - the pid of the locker
+%%                         process for each Node
+%% syncers     = [pid()] - all current syncers processes
+%% node_name   = atom()  - our node name (can change if distribution
+%%                         is started/stopped dynamically)
+%%
+%% In addition to these, we keep info about messages arrived in
+%% the process dictionary:
+%% {pre_connect, Node} = {Vsn, InitMsg} - init_connect msgs that
+%%                         arrived before nodeup
+%% {wait_lock, Node}   = {exchange, NameList} | lock_is_set
+%%                        - see comment below (handle_cast)
+%% {save_ops, Node}    = [operation()] - save the ops between
+%%                          exchange and resolved
+%% {prot_vsn, Node}    = Vsn - the exchange protocol version
+%% {sync_tag_my, Node} =  My tag, used at synchronization with Node
+%% {sync_tag_his, Node} = The Node's tag, used at synchronization
+%%-----------------------------------------------------------------
+-record(state, {connect_all, known = [], synced = [],
+		lockers = [], syncers = [], node_name = node(),
+		the_locker, the_deleter}).
+
+start() -> gen_server:start({local, global_name_server}, global, [], []).
+start_link() -> gen_server:start_link({local, global_name_server},global,[],[]).
+stop() -> gen_server:call(global_name_server, stop, infinity).
+
+sync() ->
+    case check_sync_nodes() of
+	{error, Error} ->
+	    {error, Error};
+	SyncNodes ->
+	    gen_server:call(global_name_server, {sync, SyncNodes}, infinity)
+    end.
+sync(Nodes) ->
+    case check_sync_nodes(Nodes) of
+	{error, Error} ->
+	    {error, Error};
+	SyncNodes ->
+	    gen_server:call(global_name_server, {sync, SyncNodes}, infinity)
+    end.
+
+
+send(Name, Msg) ->
+    case whereis_name(Name) of
+	Pid when pid(Pid) ->
+	    Pid ! Msg,
+	    Pid;
+	undefined ->
+	    exit({badarg, {Name, Msg}})
+    end.
+
+%% See OTP-3737. (safe_whereis_name/1 is in fact not used anywhere in OTP.)
+whereis_name(Name) ->
+    where(Name).
+
+safe_whereis_name(Name) ->
+    gen_server:call(global_name_server, {whereis, Name}, infinity).
+
+
+node_disconnected(Node) ->
+    global_name_server ! {nodedown, Node}.
+
+
+%%-----------------------------------------------------------------
+%% Method = function(Name, Pid1, Pid2) -> Pid | Pid2 | none
+%% Method is called if a name conflict is detected when two nodes
+%% are connecting to each other.  It is supposed to return one of
+%% the Pids or 'none'.  If a pid is returned, that pid is
+%% registered as Name on all nodes.  If 'none' is returned, the
+%% Name is unregistered on all nodes.  If anything else is returned,
+%% the Name is unregistered as well.
+%% Method is called once at one of the nodes where the processes reside
+%% only.  If different Methods are used for the same name, it is
+%% undefined which one of them is used.
+%% Method is blocking, i.e. when it is called, no calls to whereis/
+%% send is let through until it has returned.
+%%-----------------------------------------------------------------
+register_name(Name, Pid) when pid(Pid) ->
+    register_name(Name, Pid, {global, random_exit_name}).
+register_name(Name, Pid, Method) when pid(Pid) ->
+    trans_all_known(fun(Nodes) ->
+		  case where(Name) of
+		      undefined ->
+			  gen_server:multi_call(Nodes,
+						global_name_server,
+						{register, Name, Pid, Method}),
+			  yes;
+		      _Pid -> no
+		  end
+	  end).
+
+unregister_name(Name) ->
+    case where(Name) of
+	undefined ->
+	    ok;
+	_ ->
+	    trans_all_known(fun(Nodes) ->
+			  gen_server:multi_call(Nodes,
+						global_name_server,
+						{unregister, Name}),
+			  ok
+		  end)
+    end.
+
+re_register_name(Name, Pid) when pid(Pid) ->
+    re_register_name(Name, Pid, {global, random_exit_name}).
+re_register_name(Name, Pid, Method) when pid(Pid) ->
+    trans_all_known(fun(Nodes) ->
+		  gen_server:multi_call(Nodes,
+					global_name_server,
+					{register, Name, Pid, Method}),
+		  yes
+	  end).
+
+%% Returns all globally registered names
+registered_names() -> lists:map(fun({Name, _Pid, _Method}) -> Name end,
+				ets:tab2list(global_names)).
+
+%%-----------------------------------------------------------------
+%% An external node (i.e not an erlang node) (un)registers a name.
+%% If the registered Pid crashes the name is to be removed from global.
+%% If the external node crashes the name is to be removed from global.
+%% If the erlang node which registers the name crashes the name is also to be
+%% removed, because the registered process is not supervised any more,
+%% (i.e there is no link to the registered Pid).
+%%-----------------------------------------------------------------
+register_name_external(Name, Pid) when pid(Pid) ->
+    register_name_external(Name, Pid, {global, random_exit_name}).
+register_name_external(Name, Pid, Method) when pid(Pid) ->
+    trans_all_known(fun(Nodes) ->
+		  case where(Name) of
+		      undefined ->
+			  gen_server:multi_call(Nodes,
+						global_name_server,
+						{register, Name, Pid, Method}),
+			  gen_server:multi_call(Nodes,
+						global_name_server,
+						{register_ext, Name, Pid, node()}),
+			  yes;
+		      _Pid -> no
+		  end
+	  end).
+
+
+
+
+unregister_name_external(Name) ->
+    case where(Name) of
+	undefined ->
+	    ok;
+	_ ->
+	    trans_all_known(fun(Nodes) ->
+			  gen_server:multi_call(Nodes,
+						global_name_server,
+						{unregister, Name}),
+			  gen_server:multi_call(Nodes,
+						global_name_server,
+						{unregister_ext, Name}),
+			  ok
+		  end)
+    end.
+
+
+
+
+
+%%-----------------------------------------------------------------
+%% Args: Id = id()
+%%       Nodes = [node()]
+%%       id() = {ResourceId, LockRequesterId}
+%%       Retries = infinity | int() > 0
+%% Purpose: Sets a lock on the specified nodes (or all nodes if
+%%          none are specified) on ResourceId for LockRequesterId.  If there
+%%          already exists a lock on ResourceId for another owner
+%%          than LockRequesterId, false is returned, otherwise true.
+%% Returns: boolean()
+%%-----------------------------------------------------------------
+set_lock(Id) ->
+    set_lock(Id, [node() | nodes()], infinity, 1).
+set_lock(Id, Nodes) ->
+    set_lock(Id, Nodes, infinity, 1).
+set_lock(Id, Nodes, Retries) when Retries > 0 ->
+    set_lock(Id, Nodes, Retries, 1);
+set_lock(Id, Nodes, infinity) ->
+    set_lock(Id, Nodes, infinity, 1).
+set_lock(_Id, _Nodes, 0, _) -> false;
+set_lock({ResourceId, LockRequesterId}, Nodes, Retries, Times) ->
+    Id = {ResourceId, LockRequesterId},
+    Msg = {set_lock, Id},
+    {Replies, _} =
+	gen_server:multi_call(Nodes, global_name_server, Msg),
+    ?P2({set_lock, node(), self(), {ResourceId, LockRequesterId},
+	 Nodes, Retries, Times, Replies, catch erlang:error(kaka)}),
+    ?P({set_lock, node(), ResourceId,
+	{LockRequesterId, node(LockRequesterId)}}),
+    case check_replies(Replies, Id, Nodes) of
+	true -> ?P({set_lock_true, node(), ResourceId}),
+		true;
+	false ->
+	    random_sleep(Times),
+	    set_lock(Id, Nodes, dec(Retries), Times+1);
+	N when integer(N) ->
+	    ?P({sleeping, N}),
+	    timer:sleep(N*500),
+	    set_lock(Id, Nodes, Retries, Times);
+	Pid when pid(Pid) ->
+	    ?P({waiting_for, Pid}),
+	    Ref = erlang:monitor(process, Pid),
+	    receive
+		{'DOWN', Ref, process, Pid, _Reason} ->
+		    ?P({waited_for, Pid, _Reason}),
+		    set_lock(Id, Nodes, Retries, Times)
+	    end
+    end.
+
+check_replies([{_Node, true} | T], Id, Nodes) ->
+    check_replies(T, Id, Nodes);
+check_replies([{_Node, Status} | _T], Id, Nodes) ->
+    gen_server:multi_call(Nodes, global_name_server, {del_lock, Id}),
+    Status;
+check_replies([], _Id, _Nodes) ->
+    true.
+
+del_lock(Id) ->
+    del_lock(Id, [node() | nodes()]).
+del_lock({ResourceId, LockRequesterId}, Nodes) ->
+    Id = {ResourceId, LockRequesterId},
+    ?P2({del_lock, node(), self(), ResourceId, LockRequesterId, Nodes}),
+    gen_server:multi_call(Nodes, global_name_server, {del_lock, Id}),
+    true.
+
+%%-----------------------------------------------------------------
+%% Args: Id = id()
+%%       Fun = fun() | {M,F}
+%%       Nodes = [node()]
+%%       Retries = infinity | int() > 0
+%% Purpose: Sets a lock on Id (as set_lock), and evaluates
+%%          Res = Fun() on success.
+%% Returns: Res | aborted  (note, if Retries is infinity, the
+%%          transaction won't abort)
+%%-----------------------------------------------------------------
+trans(Id, Fun) -> trans(Id, Fun, [node() | nodes()], infinity).
+trans(Id, Fun, Nodes) -> trans(Id, Fun, Nodes, infinity).
+trans(_Id, _Fun, _Nodes, 0) -> aborted;
+trans(Id, Fun, Nodes, Retries) ->
+    case set_lock(Id, Nodes, Retries) of
+	true ->
+	    case catch Fun() of
+		{'EXIT', R} ->
+		    del_lock(Id, Nodes),
+		    exit(R);
+		Res ->
+		    del_lock(Id, Nodes),
+		    Res
+	    end;
+	false ->
+	    aborted
+    end.
+
+%%% Similar to trans(Id, Fun), but always uses global's own lock,
+%%% on all nodes known to global, making sure that no new nodes have
+%%% become known while we got the list of known nodes.
+trans_all_known(F) ->
+    Id = {global, self()},
+    Nodes = [node() | gen_server:call(global_name_server, get_known)],
+    case set_lock(Id, Nodes) of
+	true ->
+	    Nodes2 = [node() | gen_server:call(global_name_server, get_known)],
+	    case Nodes2 -- Nodes of
+		[] ->
+		    case catch F(Nodes2) of
+			{'EXIT', R} ->
+			    del_lock(Id, Nodes2),
+			    exit(R);
+			Res ->
+			    del_lock(Id, Nodes2),
+			    Res
+		    end;
+		_ ->
+		    del_lock(Id, Nodes),
+		    trans_all_known(F)
+	    end;
+	false ->
+	    aborted
+    end.
+
+info() ->
+    gen_server:call(global_name_server, info).
+
+%%%-----------------------------------------------------------------
+%%% Call-back functions from gen_server
+%%%-----------------------------------------------------------------
+init([]) ->
+    process_flag(trap_exit, true),
+    ets:new(global_locks, [set, named_table, protected]),
+    ets:new(global_names, [set, named_table, protected]),
+    ets:new(global_names_ext, [set, named_table, protected]),
+
+    %% multi
+    S = #state{the_locker = start_the_locker(self()),
+	       the_deleter = start_the_deleter(self())},
+
+    case init:get_argument(connect_all) of
+	{ok, [["false"]]} ->
+	    {ok, S#state{connect_all = false}};
+	_ ->
+	    {ok, S#state{connect_all = true}}
+    end.
+
+%%-----------------------------------------------------------------
+%% Connection algorithm
+%% ====================
+%% This alg solves the problem with partitioned nets as well.
+%%
+%% The main idea in the alg is that when two nodes connect, they
+%% try to set a lock in their own partition (i.e. all nodes already
+%% known to them).  When the lock is set in each partition, these
+%% two nodes send each other a list with all registered names in
+%% resp partition(*).  If no conflict is found, the name tables are
+%% just updated.  If a conflict is found, a resolve function is
+%% called once for each conflict.  The result of the resolving
+%% is sent to the other node.  When the names are exchanged, all
+%% other nodes in each partition are informed of the other nodes,
+%% and they ping each other to form a fully connected net.
+%%
+%% Here's the flow:
+%% Suppose nodes A and B connect, and C is connected to A.
+%%
+%% Node A
+%% ------
+%% << {nodeup, B}
+%%   [spawn locker]
+%% B ! {init_connect, MyLocker}
+%% << {init_connect, MyLocker}
+%%   [The lockers try to set the lock]
+%% << {lock_is_set, B}
+%%   [Now, lock is set in both partitions]
+%% B ! {exchange, Names}
+%% << {exchange, Names}
+%%   [solve conflict]
+%% B ! {resolved, Resolved}
+%% << {resolved, Resolved}
+%% C ! {new_nodes, Resolved, [B]}
+%%
+%% Node C
+%% ------
+%% << {new_nodes, ResolvedOps, NewNodes}
+%%   [insert Ops]
+%% ping(NewNodes)
+%% << {nodeup, B}
+%% <ignore this one>
+%%
+%% Several things can disturb this picture.
+%%
+%% First, the got_names message may arrive *before* the nodeup
+%% message, due to delay in net_kernel and an optimisation in the
+%% emulator.  We handle this by keeping track of these messages in the
+%% pre_connect and lockers variables in our state.
+%%
+%% The most common situation is when a new node connects to an
+%% existing net.  In this case there's no need to set the lock on
+%% all nodes in the net, as we know that there won't be any conflict.
+%% This is optimised by sending {first_contact, Node} instead of got_names.
+%% This implies that first_contact may arrive before nodeup as well.
+%%
+%% Of course we must handle that some node goes down during the
+%% connection.
+%%
+%% (*) When this information is being exchanged, no one is allowed
+%% to change the global register table.  All calls to register etc
+%% are protected by a lock.  If a registered process dies
+%% during this phase, the deregistration is done as soon as possible
+%% on each node (i.e. when the info about the process has arrived).
+%%-----------------------------------------------------------------
+%% Messages in the protocol
+%% ========================
+%% 1. Between connecting nodes  (gen_server:casts)
+%%    {init_connect, Vsn, Node, InitMsg}
+%%         InitMsg = {locker, LockerPid}
+%%    {exchange, Node, ListOfNames}
+%%    {resolved, Node, Ops, Known}
+%%         Known = list of nodes in Node's partition
+%% 2. Between lockers on connecting nodes  (!s)
+%%    {his_locker, Pid} (from our global)
+%%         lockers link to each other
+%%    {lock, Bool} loop until both lockers have lock = true,
+%%          then send to global {lock_is_set, Node}
+%% 3. From connecting node to other nodes in the partition
+%%    {new_nodes, Node, Ops, NewNodes}
+%% 4. sync protocol
+%%    {in_sync, Node, IsKnown}
+%%       - sent by each node to all new nodes
+%%-----------------------------------------------------------------
+
+handle_call({whereis, Name}, From, S) ->
+    do_whereis(Name, From),
+    {noreply, S};
+
+handle_call({register, Name, Pid, Method}, _From, S) ->
+    ?P2({register, node(), Name}),
+    ins_name(Name, Pid, Method),
+    {reply, yes, S};
+
+handle_call({unregister, Name}, _From, S) ->
+    case ets:lookup(global_names, Name) of
+	[{_, Pid, _}] ->
+	    ?P2({unregister, node(), Name, Pid, node(Pid)}),
+	    ets:delete(global_names, Name),
+	    dounlink(Pid);
+	_ -> ok
+    end,
+    {reply, ok, S};
+
+handle_call({register_ext, Name, Pid, RegNode}, _F, S) ->
+    ins_name_ext(Name, Pid, RegNode),
+    {reply, yes, S};
+
+handle_call({unregister_ext, Name}, _From, S) ->
+    ets:delete(global_names_ext, Name),
+    {reply, ok, S};
+
+
+handle_call({set_lock, Lock}, {Pid, _Tag}, S) ->
+    Reply = handle_set_lock(Lock, Pid),
+    {reply, Reply, S};
+
+handle_call({del_lock, Lock}, {Pid, _Tag}, S) ->
+    handle_del_lock(Lock, Pid),
+    {reply, true, S};
+
+handle_call(get_known, _From, S) ->
+    {reply, S#state.known, S};
+
+%% R7 may call us?
+handle_call(get_known_v2, _From, S) ->
+    {reply, S#state.known, S};
+
+handle_call({sync, Nodes}, From, S) ->
+    %% If we have several global groups, this won't work, since we will
+    %% do start_sync on a nonempty list of nodes even if the system
+    %% is quiet.
+    Pid = start_sync(lists:delete(node(), Nodes) -- S#state.synced, From),
+    {noreply, S#state{syncers = [Pid | S#state.syncers]}};
+
+handle_call(get_protocol_version, _From, S) ->
+    {reply, ?vsn, S};
+
+handle_call(get_names_ext, _From, S) ->
+    {reply, get_names_ext(), S};
+
+handle_call(info, _From, S) ->
+    {reply, S, S};
+
+handle_call(stop, _From, S) ->
+    {stop, normal, stopped, S}.
+
+
+%%=======================================================================================
+%% init_connect
+%%
+%% Vsn 1 is the original protocol.
+%% Vsn 2 is enhanced with code to take care of registration of names from
+%%       non erlang nodes, e.g. c-nodes.
+%% Vsn 3 is enhanced with a tag in the synch messages to distinguish
+%%       different synch sessions from each other, see OTP-2766.
+%%       Note: This requires also that the ticket OTP-2928 is fixed on the nodes
+%%             running vsn 1 or 2; if such nodes will coexist with vsn 3 nodes.
+%%=======================================================================================
+handle_cast({init_connect, Vsn, Node, InitMsg}, S) ->
+    ?FORMAT("~p #### init_connect  Vsn ~p, Node ~p, InitMsg ~p~n",[node(), Vsn, Node, InitMsg]),
+    case Vsn of
+	%% It is always the responsibility of newer versions to understand
+	%% older versions of the protocol.
+	{HisVsn, HisTag} when HisVsn > ?vsn ->
+	    init_connect(?vsn, Node, InitMsg, HisTag, S#state.lockers, S);
+	{HisVsn, HisTag} ->
+	    init_connect(HisVsn, Node, InitMsg, HisTag, S#state.lockers, S);
+	%% To be future compatible
+	Tuple when tuple(Tuple) ->
+	    List = tuple_to_list(Tuple),
+	    [_HisVsn, HisTag | _] = List,
+	    %% use own version handling if his is newer.
+	    init_connect(?vsn, Node, InitMsg, HisTag, S#state.lockers, S);
+	_ when Vsn < 3 ->
+	    init_connect(Vsn, Node, InitMsg, undef, S#state.lockers, S);
+	_ ->
+	    Txt = io_lib:format("Illegal global protocol version ~p Node: ~p",[Vsn, Node]),
+	    error_logger:info_report(lists:flatten(Txt))
+    end,
+    {noreply, S};
+
+%%=======================================================================================
+%% lock_is_set
+%%
+%% Ok, the lock is now set on both partitions. Send our names to other node.
+%%=======================================================================================
+handle_cast({lock_is_set, Node, MyTag}, S) ->
+    ?FORMAT("~p #### lock_is_set  Node ~p~n",[node(), Node]),
+    Sync_tag_my = get({sync_tag_my, Node}),
+    PVsn =  get({prot_vsn, Node}),
+    ?P2({lock_is_set, node(), Node, {MyTag, PVsn}, Sync_tag_my}),
+    case {MyTag, PVsn} of
+	{Sync_tag_my, undefined} ->
+	    %% Patch for otp-2728, the connection to the Node is flipping up and down
+	    %% the messages from the 'older' sync tries can disturb the 'new' sync try
+	    %% therefor all messages are discarded if the protocol vsn is not defined.
+	    Txt = io_lib:format("undefined global protocol version Node: ~p",[Node]),
+	    error_logger:info_report(lists:flatten(Txt)),
+	    {noreply, S};
+	{Sync_tag_my, _} ->
+	    %% Check that the Node is still not known
+	    case lists:member(Node, S#state.known) of
+		false ->
+		    ?P2({lset, node(), Node, false}),
+		    lock_is_set(Node, S#state.known),
+		    {noreply, S};
+		true ->
+		    ?P2({lset, node(), Node, true}),
+		    erase({wait_lock, Node}),
+		    NewS = cancel_locker(Node, S),
+		    {noreply, NewS}
+	    end;
+	_ ->
+	    ?P2({lset, illegal, node(), Node}),
+	    %% Illegal tag, delete the locker.
+	    erase({wait_lock, Node}),
+	    NewS = cancel_locker(Node, S),
+	    {noreply, NewS}
+    end;
+
+%%=======================================================================================
+%% exchange
+%%
+%% Here the names are checked to detect name clashes.
+%%=======================================================================================
+%% Vsn 3 of the protocol
+handle_cast({exchange, Node, NameList, NameExtList, MyTag}, S) ->
+    ?FORMAT("~p #### handle_cast 3 lock_is_set  exchange ~p~n",
+	    [node(),{Node, NameList, NameExtList, MyTag}]),
+    Sync_tag_my = get({sync_tag_my, Node}),
+    PVsn =  get({prot_vsn, Node}),
+    case {MyTag, PVsn} of
+	{Sync_tag_my, undefined} ->
+	    %% Patch for otp-2728, the connection to the Node is flipping up and down
+	    %% the messages from the 'older' sync tries can disturb the 'new' sync try
+	    %% therefor all messages are discarded if the protocol vsn is not defined.
+	    Txt = lists:flatten(io_lib:format(
+				  "undefined global protocol version Node: ~p",[Node])),
+	    error_logger:info_report(Txt),
+	    {noreply, S};
+	{Sync_tag_my, _} ->
+	    exchange(PVsn, Node, {NameList, NameExtList}, S#state.known),
+	    {noreply, S};
+	_ ->
+	    %% Illegal tag, delete the locker.
+	    erase({wait_lock, Node}),
+	    NewS = cancel_locker(Node, S),
+	    {noreply, NewS}
+    end;
+
+
+
+%%=======================================================================================
+%% resolved
+%%
+%% Here the name clashes are resolved.
+%%=======================================================================================
+%% Vsn 3 of the protocol
+handle_cast({resolved, Node, Resolved, HisKnown, _HisKnown_v2, Names_ext, MyTag}, S) ->
+    ?FORMAT("~p #### 2 resolved ~p~n",[node(),{Node, Resolved, HisKnown, Names_ext}]),
+    Sync_tag_my = get({sync_tag_my, Node}),
+    PVsn =  get({prot_vsn, Node}),
+    case {MyTag, PVsn} of
+	{Sync_tag_my, undefined} ->
+		%% Patch for otp-2728, the connection to the Node is flipping up and down
+		%% the messages from the 'older' sync tries can disturb the 'new' sync try
+		%% therefor all messages are discarded if the protocol vsn is not defined.
+		Txt = lists:flatten(io_lib:format(
+				      "undefined global protocol version Node: ~p",[Node])),
+		error_logger:info_report(Txt),
+		{noreply, S};
+	{Sync_tag_my, _} ->
+	    NewS = resolved(Node, Resolved, {HisKnown, HisKnown}, Names_ext, S),
+	    {noreply, NewS};
+	_ ->
+	    %% Illegal tag, delete the locker.
+	    erase({wait_lock, Node}),
+	    NewS = cancel_locker(Node, S),
+	    {noreply, NewS}
+    end;
+
+
+
+
+
+
+%%=======================================================================================
+%% new_nodes
+%%
+%% We get to know the other node's known nodes.
+%%=======================================================================================
+%% Vsn 2 and 3 of the protocol
+handle_cast({new_nodes, _Node, Ops, Names_ext, Nodes, _Nodes_v2}, S) ->
+    ?P2({new_nodes, node(), Nodes}),
+    ?FORMAT("~p #### 2 new_nodes  ~p~n",[node(),{Ops, Names_ext, Nodes}]),
+    NewS = new_nodes(Ops, Names_ext, Nodes, S),
+    {noreply, NewS};
+
+
+
+
+%%=======================================================================================
+%% in_sync
+%%
+%% We are in sync with this node (from the other node's known world).
+%%=======================================================================================
+handle_cast({in_sync, Node, IsKnown}, S) ->
+    ?FORMAT("~p #### in_sync  ~p~n",[node(),{Node, IsKnown}]),
+    lists:foreach(fun(Pid) -> Pid ! {synced, [Node]} end, S#state.syncers),
+    %% moved up:
+    NewS = cancel_locker(Node, S),
+    erase({wait_lock, Node}),
+    erase({pre_connect, Node}),
+    erase({sync_tag_my, Node}),
+    erase({sync_tag_his, Node}),
+    NKnown = case lists:member(Node, Known = NewS#state.known) of
+		 false when IsKnown == true ->
+		     gen_server:cast({global_name_server, Node},
+				     {in_sync, node(), false}),
+		     [Node | Known];
+		 _ ->
+		     Known
+	     end,
+    NSynced = case lists:member(Node, Synced = NewS#state.synced) of
+		  true -> Synced;
+		  false -> [Node | Synced]
+	      end,
+    {noreply, NewS#state{known = NKnown, synced = NSynced}};
+
+
+
+
+%% Called when Pid on other node crashed
+handle_cast({async_del_name, Name, Pid}, S) ->
+    ?P2({async_del_name, node(), Name, Pid, node(Pid)}),
+    case ets:lookup(global_names, Name) of
+	[{Name, Pid, _}] ->
+	    ets:delete(global_names, Name),
+	    dounlink(Pid);
+	_ -> ok
+    end,
+    ets:delete(global_names_ext, Name),
+    {noreply, S};
+
+handle_cast({async_del_lock, _ResourceId, Pid}, S) ->
+    del_locks2(ets:tab2list(global_locks), Pid),
+%    ets:match_delete(global_locks, {ResourceId, '_', Pid}),
+    {noreply, S}.
+
+
+handle_info({'EXIT', Deleter, _Reason}=Exit, #state{the_deleter=Deleter}=S) ->
+    {stop, {deleter_died,Exit}, S#state{the_deleter=undefined}};
+handle_info({'EXIT', Pid, _Reason}, #state{the_deleter=Deleter}=S)
+  when pid(Pid) ->
+    ?P2({global, exit, node(), Pid, node(Pid)}),
+    check_exit(Deleter, Pid),
+    Syncers = lists:delete(Pid, S#state.syncers),
+    Lockers = lists:keydelete(Pid, 2, S#state.lockers),
+    ?PRINT({exit, Pid, lockers, node(), S#state.lockers}),
+    {noreply, S#state{syncers = Syncers, lockers = Lockers}};
+
+handle_info({nodedown, Node}, S) when Node == S#state.node_name ->
+    %% Somebody stopped the distribution dynamically - change
+    %% references to old node name (Node) to new node name ('nonode@nohost')
+    {noreply, change_our_node_name(node(), S)};
+
+handle_info({nodedown, Node}, S) ->
+    ?FORMAT("~p #### nodedown 1 ####### Node ~p",[node(),Node]),
+    %% moved up:
+    do_node_down(Node),
+    #state{known = Known, synced = Syncs} = S,
+    NewS = cancel_locker(Node, S),
+
+    erase({wait_lock, Node}),
+    erase({save_ops, Node}),
+    erase({pre_connect, Node}),
+    erase({prot_vsn, Node}),
+    erase({sync_tag_my, Node}),
+    erase({sync_tag_his, Node}),
+    {noreply, NewS#state{known = lists:delete(Node, Known),
+			 synced = lists:delete(Node, Syncs)}};
+
+
+
+handle_info({nodeup, Node}, S) when Node == node() ->
+    ?FORMAT("~p ####  nodeup S ####### Node ~p~n",[node(), Node]),
+    %% Somebody started the distribution dynamically - change
+    %% references to old node name ('nonode@nohost') to Node.
+    {noreply, change_our_node_name(Node, S)};
+
+handle_info({nodeup, Node}, S) when S#state.connect_all == true ->
+    ?FORMAT("~p #### nodeup 1 ####### Node ~p",[node(),Node]),
+    IsKnown = lists:member(Node, S#state.known) or
+              %% This one is only for double nodeups (shouldn't occur!)
+              lists:keymember(Node, 1, S#state.lockers),
+    case IsKnown of
+	true ->
+	    {noreply, S};
+	false ->
+	    %% now() is used as a tag to separate different sycnh sessions
+	    %% from each others. Global could be confused at bursty nodeups
+	    %% because it couldn't separate the messages between the different
+	    %% synch sessions started by a nodeup.
+	    MyTag = now(),
+	    resend_pre_connect(Node),
+
+	    %% multi
+	    S#state.the_locker ! {nodeup, Node, S#state.known, MyTag, self()},
+
+	    Pid = start_locker(Node, S#state.known, MyTag, self(), S#state.the_locker),
+	    Ls = S#state.lockers,
+	    InitC = {init_connect, {?vsn, MyTag}, node(), {locker, Pid, S#state.known}},
+	    ?P2({putting, MyTag}),
+	    put({sync_tag_my, Node}, MyTag),
+	    gen_server:cast({global_name_server, Node}, InitC),
+	    {noreply, S#state{lockers = [{Node, Pid} | Ls]}}
+    end;
+
+
+%% This message is only to test otp-2766 Global may be confused at bursty
+%% nodeup/nodedowns. It's a copy of the complex part of the handling of
+%% the 'nodeup' message.
+handle_info({test_vsn_tag_nodeup, Node}, S) when S#state.connect_all == true,
+						 Node == node() ->
+    {noreply, S};
+handle_info({test_vsn_tag_nodeup, Node}, S) when S#state.connect_all == true ->
+    ?FORMAT("~p #### test_nodeup 1 ####### Node ~p~n",[node(), Node]),
+    MyTag = now(),
+    resend_pre_connect(Node),
+    S#state.the_locker ! {nodeup, Node, S#state.known, MyTag, self()},
+    Pid = start_locker(Node, S#state.known, MyTag, self(), S#state.the_locker),
+    Ls = S#state.lockers,
+    InitC = {init_connect, {?vsn, MyTag}, node(), {locker, Pid, S#state.known}},
+    put({sync_tag_my, Node}, MyTag),
+    gen_server:cast({global_name_server, Node}, InitC),
+    ?PRINT({lockers, node(), Ls}),
+    {noreply, S#state{lockers = [{Node, Pid} | Ls]}};
+
+
+handle_info({whereis, Name, From}, S) ->
+    do_whereis(Name, From),
+    {noreply, S};
+
+handle_info(known, S) ->
+    io:format(">>>> ~p~n",[S#state.known]),
+    {noreply, S};
+
+handle_info(_, S) ->
+    {noreply, S}.
+
+
+
+
+%%=======================================================================================
+%%=======================================================================================
+%%=============================== Internal Functions ====================================
+%%=======================================================================================
+%%=======================================================================================
+
+
+
+%%=======================================================================================
+%% Another node wants to synchronize its registered names with us.
+%% Start a locker process. Both nodes must have a lock before they are
+%% allowed to continue.
+%%=======================================================================================
+init_connect(Vsn, Node, InitMsg, HisTag, Lockers, S) ->
+    ?P2({init_connect, node(), Node}),
+    ?FORMAT("~p #### init_connect  Vsn, Node, InitMsg ~p~n",[node(),{Vsn, Node, InitMsg}]),
+    %% It is always the responsibility of newer versions to understand
+    %% older versions of the protocol.
+    put({prot_vsn, Node}, Vsn),
+    put({sync_tag_his, Node}, HisTag),
+    if
+	Vsn =< 3 ->
+	    case lists:keysearch(Node, 1, Lockers) of
+		{value, {_Node, MyLocker}} ->
+		    %% We both have lockers; let them set the lock
+		    case InitMsg of
+			{locker, HisLocker, HisKnown} -> %% current version
+			    ?PRINT({init_connect1, node(), self(), Node,
+				    MyLocker, HisLocker}),
+			    MyLocker ! {his_locker, HisLocker, HisKnown};
+
+			{locker, _HisLocker, HisKnown, HisTheLocker} -> %% multi
+			    ?PRINT({init_connect1, node(), self(), Node,
+				    MyLocker, _HisLocker}),
+			    S#state.the_locker ! {his_the_locker, HisTheLocker,
+						  HisKnown, S#state.known}
+		    end;
+		false ->
+		    ?PRINT({init_connect11, node(), self(), Node}),
+		    put({pre_connect, Node}, {Vsn, InitMsg, HisTag})
+	    end;
+	true ->					% Vsn > 3
+	    ?P2(vsn4),
+	    case lists:keysearch(Node, 1, Lockers) of
+		{value, {_Node, _MyLocker}} ->
+		    %% We both have lockers; let them set the lock
+		    case InitMsg of
+			{locker, HisLocker, HisKnown} -> %% current version
+			    ?PRINT({init_connect1, node(), self(), Node,
+				    _MyLocker, HisLocker}),
+			    HisLocker ! {his_locker_new, S#state.the_locker,
+					 {HisKnown, S#state.known}};
+
+			{locker, _HisLocker, HisKnown, HisTheLocker} -> %% multi
+			    ?PRINT({init_connect1, node(), self(), Node,
+				    _MyLocker, _HisLocker}),
+			    S#state.the_locker ! {his_the_locker, HisTheLocker,
+						  HisKnown, S#state.known}
+		    end;
+		false ->
+		    ?PRINT({init_connect11, node(), self(), Node}),
+		    put({pre_connect, Node}, {Vsn, InitMsg, HisTag})
+	    end
+    end.
+
+
+
+%%=======================================================================================
+%% In the simple case, we'll get lock_is_set before we get exchange,
+%% but we may get exchange before we get lock_is_set from our locker.
+%% If that's the case, we'll have to remember the exchange info, and
+%% handle it when we get the lock_is_set.  We do this by using the
+%% process dictionary - when the lock_is_set msg is received, we store
+%% this info.  When exchange is received, we can check the dictionary
+%% if the lock_is_set has been received.  If not, we store info about
+%% the exchange instead.  In the lock_is_set we must first check if
+%% exchange info is stored, in that case we take care of it.
+%%=======================================================================================
+lock_is_set(Node, Known) ->
+    ?FORMAT("~p ####  lock_is_set ~p~n",[node(),{Node, Node, Known}]),
+    PVsn = get({prot_vsn, Node}),
+    case PVsn of
+	_ ->					% 3 and higher
+	    gen_server:cast({global_name_server, Node},
+			    {exchange, node(), get_names(), get_names_ext(),
+			     get({sync_tag_his, Node})})
+    end,
+    %% If both have the lock, continue with exchange
+    case get({wait_lock, Node}) of
+	{exchange, NameList, NameExtList} ->
+	    %% vsn 2, 3
+	    put({wait_lock, Node}, lock_is_set),
+	    exchange(PVsn, Node, {NameList, NameExtList}, Known);
+	undefined ->
+	    put({wait_lock, Node}, lock_is_set)
+    end.
+
+
+
+%%=======================================================================================
+%% exchange
+%%=======================================================================================
+%% Vsn 3 and higher of the protocol
+exchange(_Vsn, Node, {NameList, NameExtList}, Known) ->
+    ?FORMAT("~p #### 3 lock_is_set  exchange ~p~n",[node(),{Node, NameList, NameExtList}]),
+    case erase({wait_lock, Node}) of
+	lock_is_set ->
+	    {Ops, Resolved} = exchange_names(NameList, Node, [], []),
+	    put({save_ops, Node}, Ops),
+	    gen_server:cast({global_name_server, Node},
+			    {resolved, node(), Resolved, Known,
+			     Known, get_names_ext(), get({sync_tag_his, Node})});
+	undefined ->
+	    put({wait_lock, Node}, {exchange, NameList, NameExtList})
+    end.
+
+
+
+
+
+resolved(Node, Resolved, {HisKnown, _HisKnown_v2}, Names_ext, S) ->
+    ?P2({resolved, node(), Node, S#state.known}),
+    ?FORMAT("~p #### 2 resolved ~p~n",[node(),{Node, Resolved, HisKnown, Names_ext}]),
+    erase({prot_vsn, Node}),
+    Ops = erase({save_ops, Node}) ++ Resolved,
+    Known = S#state.known,
+    Synced = S#state.synced,
+    NewNodes = [Node | HisKnown],
+    do_ops(Ops),
+    do_ops_ext(Ops,Names_ext),
+    gen_server:abcast(Known, global_name_server,
+		      {new_nodes, node(), Ops, Names_ext, NewNodes, NewNodes}),
+    %% I am synced with Node, but not with HisKnown yet
+    lists:foreach(fun(Pid) -> Pid ! {synced, [Node]} end, S#state.syncers),
+    gen_server:abcast(HisKnown, global_name_server, {in_sync, node(), true}),
+    NewS = lists:foldl(fun(Node1, S1) -> cancel_locker(Node1, S1) end,
+		       S,
+		       NewNodes),
+    %% See (*) below... we're node b in that description
+    NewKnown = Known ++ (NewNodes -- Known),
+    NewS#state{known = NewKnown, synced = [Node | Synced]}.
+
+
+
+
+new_nodes(Ops, Names_ext, Nodes, S) ->
+    ?FORMAT("~p #### 2 new_nodes  ~p~n",[node(),{Ops, Names_ext, Nodes}]),
+    do_ops(Ops),
+    do_ops_ext(Ops,Names_ext),
+    Known = S#state.known,
+    %% (*) This one requires some thought...
+    %% We're node a, other nodes b and c:
+    %% The problem is that {in_sync, a} may arrive before {resolved, [a]} to
+    %% b from c, leading to b sending {new_nodes, [a]} to us (node a).
+    %% Therefore, we make sure we never get duplicates in Known.
+    NewNodes = lists:delete(node(), Nodes -- Known),
+    gen_server:abcast(NewNodes, global_name_server, {in_sync, node(), true}),
+    S#state{known = Known ++ NewNodes}.
+
+
+
+
+
+do_whereis(Name, From) ->
+    case is_lock_set(global) of
+	false ->
+	    gen_server:reply(From, where(Name));
+	true ->
+	    send_again({whereis, Name, From})
+    end.
+
+terminate(_Reason, _S) ->
+    ets:delete(global_names),
+    ets:delete(global_names_ext),
+    ets:delete(global_locks).
+
+code_change(_OldVsn, S, _Extra) ->
+    {ok, S}.
+
+%% Resend init_connect to ourselves.
+resend_pre_connect(Node) ->
+    case erase({pre_connect, Node}) of
+%	{Vsn, InitMsg, undef} ->
+%	    %% Vsn 1 & 2
+%	    ?PRINT({resend_pre_connect2, node(), self(), Node}),
+%	    gen_server:cast(self(), {init_connect, Vsn, Node, InitMsg});
+	{Vsn, InitMsg, HisTag} ->
+	    %% Vsn 3
+	    ?PRINT({resend_pre_connect3, node(), self(), Node}),
+	    gen_server:cast(self(), {init_connect, {Vsn, HisTag}, Node, InitMsg});
+	_ ->
+	    ?PRINT({resend_pre_connect0, node(), self(), Node}),
+	    ok
+    end.
+
+ins_name(Name, Pid, Method) ->
+    case ets:lookup(global_names, Name) of
+	[{Name, Pid2, _}] ->
+	    dounlink(Pid2);
+	[] ->
+	    ok
+    end,
+    dolink(Pid),
+    ets:insert(global_names, {Name, Pid, Method}).
+
+ins_name_ext(Name, Pid, RegNode) ->
+    case ets:lookup(global_names_ext, Name) of
+	[{Name, Pid2, _}] ->
+	    dounlink(Pid2);
+	[] ->
+	    ok
+    end,
+    dolink_ext(Pid, RegNode),
+    ets:insert(global_names_ext, {Name, Pid, RegNode}).
+
+where(Name) ->
+    case ets:lookup(global_names, Name) of
+	[{_, Pid, _}] -> Pid;
+	[] -> undefined
+    end.
+
+handle_set_lock({ResourceId, LockRequesterId}, Pid) ->
+    case ets:lookup(global_locks, ResourceId) of
+	[{ResourceId, LockRequesterId, Pids}] ->
+	    case lists:member(Pid, Pids) of
+		true ->
+		    true;
+		false ->
+		    dolink(Pid),
+		    ets:insert(global_locks, {ResourceId, LockRequesterId, [Pid | Pids]}),
+		    true
+	    end;
+	[{ResourceId, _LockRequesterId2, _Pid2}] ->
+	    case ResourceId of
+		global ->
+		    ?P({before,
+			LockRequesterId,
+			_LockRequesterId2,
+			S#state.lockers}),
+		    false;
+		_ ->
+		    false
+	    end;
+	[] ->
+	    dolink(Pid),
+	    ets:insert(global_locks, {ResourceId, LockRequesterId, [Pid]}),
+	    true
+    end.
+
+is_lock_set(ResourceId) ->
+    case ets:lookup(global_locks, ResourceId) of
+	[_Lock] -> true;
+	[] -> false
+    end.
+
+handle_del_lock({ResourceId, LockRequesterId}, Pid) ->
+    case ets:lookup(global_locks, ResourceId) of
+	[{ResourceId, LockRequesterId, Pids}] when [Pid] == Pids ->
+	    ets:delete(global_locks, ResourceId),
+	    dounlink(Pid);
+	[{ResourceId, LockRequesterId, Pids}] ->
+	    NewPids = lists:delete(Pid, Pids),
+	    ets:insert(global_locks, {ResourceId, LockRequesterId, NewPids}),
+	    dounlink(Pid);
+	_ -> ok
+    end.
+
+do_ops(Ops) ->
+    lists:foreach(fun({insert, Item}) -> ets:insert(global_names, Item);
+		     ({delete, Name}) ->
+			  case ets:lookup(global_names, Name) of
+			      [{Name, Pid, _}] ->
+    ?P2({do_ops_delete, node(), Name, Pid, node(Pid)}),
+				  ets:delete(global_names, Name),
+				  dounlink(Pid);
+			      [] ->
+				  ok
+			  end
+		  end, Ops).
+
+%% If a new name, then it must be checked if it is an external name
+%% If delete a name it is always deleted from global_names_ext
+do_ops_ext(Ops, Names_ext) ->
+    lists:foreach(fun({insert, {Name, Pid, _Method}}) ->
+			  case lists:keysearch(Name, 1, Names_ext) of
+			      {value, {Name, Pid, RegNode}} ->
+				  ets:insert(global_names_ext, {Name, Pid, RegNode});
+			      _ ->
+				  ok
+			  end;
+		     ({delete, Name}) ->
+			  ets:delete(global_names_ext, Name)
+		  end, Ops).
+
+%%-----------------------------------------------------------------
+%% A locker is a process spawned by global_name_server when a
+%% nodeup is received from a new node.  Its purpose is to try to
+%% set a lock in our partition, i.e. on all nodes known to us.
+%% When the lock is set, it tells global about it, and keeps
+%% the lock set.  global sends a cancel message to the locker when
+%% the partitions are connected.
+
+%% Versions: at version 2, the messages exchanged between the lockers
+%% include the known nodes (see OTP-3576). There is no way of knowing
+%% the version number of the other side's locker when sending a message
+%% to it, so we send both version 1 and 2, and flush the version 1 if
+%% we receive version 2.
+%%
+%% Due to a mistake, an intermediate version of the new locking protocol
+%% (using 3-tuples) went out in R7, which only understands itself. This patch
+%% to R7 handles all kinds, which means sending all, and flush the ones we
+%% don't want. (It will remain difficult to make a future version of the
+%% protocol communicate with this one.)
+%%
+%%-----------------------------------------------------------------
+%% (Version 2 in patched R7. No named version in R6 and older - let's call that
+%% version 1.)
+-define(locker_vsn, 2).
+
+%%% multi
+
+-record(multi, {known, others = []}).
+
+start_the_locker(Global) ->
+    spawn_link(?MODULE, init_the_locker, [Global]).
+
+%init_the_locker(Global) ->
+%    ok;
+init_the_locker(Global) ->
+    process_flag(trap_exit, true),		%needed?
+    loop_the_locker(Global, #multi{}),
+    erlang:error(locker_exited).
+
+remove_node(_Node, []) ->
+    [];
+remove_node(Node, [{Node, _HisTheLocker, _HisKnown, _MyTag} | Rest]) ->
+    Rest;
+remove_node(Node, [E | Rest]) ->
+    [E | remove_node(Node, Rest)].
+
+find_node_tag(_Node, []) ->
+    false;
+find_node_tag(Node, [{Node, _HisTheLocker, _HisKnown, MyTag} | _Rest]) ->
+    {true, MyTag};
+find_node_tag(Node, [_E | Rest]) ->
+    find_node_tag(Node, Rest).
+
+loop_the_locker(Global, S) ->
+    ?P2({others, node(), S#multi.others}),
+%    Known = S#multi.known,
+    Timeout = case S#multi.others of
+		  [] ->
+		      infinity;
+		  _ ->
+		      0
+	      end,
+    receive
+%	{nodeup, Node, Known, Tag, P} ->
+%	    ?P2({the_locker, nodeup, time(), node(), nodeup, Node, Tag}),
+%	    loop_the_locker(Global, S);
+	{his_the_locker, HisTheLocker, HisKnown, MyKnown} ->
+	    ?P2({his_the_locker, time(), node(), HisTheLocker,
+			    node(HisTheLocker)}),
+	    receive
+		{nodeup, Node, _Known, MyTag, _P} when node(HisTheLocker) == Node ->
+		    ?P2({the_locker, nodeup, node(), Node,
+				    node(HisTheLocker), MyTag,
+				    process_info(self(), messages)}),
+		    Others = S#multi.others,
+		    loop_the_locker(Global,
+				    S#multi{known=MyKnown,
+					    others=[{node(HisTheLocker), HisTheLocker, HisKnown, MyTag} | Others]});
+		{cancel, Node, _Tag} when node(HisTheLocker) == Node ->
+		    loop_the_locker(Global, S)
+	    after 60000 ->
+		    ?P2({nodeupnevercame, node(), node(HisTheLocker)}),
+		    error_logger:error_msg("global: nodeup never came ~w ~w~n",
+					   [node(), node(HisTheLocker)]),
+		    loop_the_locker(Global, S)
+	    end;
+	{cancel, Node, undefined} ->
+	    ?P2({the_locker, cancel1, undefined, node(), Node}),
+%% If we actually cancel something when a cancel message with the tag
+%% 'undefined' arrives, we may be acting on an old nodedown, to cancel
+%% a new nodeup, so we can't do that.
+%	    receive
+%		{nodeup, Node, _Known, _MyTag, _P} ->
+%		    ?P2({the_locker, cancelnodeup1, node(), Node}),
+%		    ok
+%	    after 0 ->
+%		    ok
+%	    end,
+%	    Others = remove_node(Node, S#multi.others),
+%	    loop_the_locker(Global, S#multi{others = Others});
+	    loop_the_locker(Global, S);
+	{cancel, Node, Tag} ->
+	    ?P2({the_locker, cancel1, Tag, node(), Node}),
+	    receive
+		{nodeup, Node, _Known, Tag, _P} ->
+		    ?P2({the_locker, cancelnodeup2, node(), Node}),
+		    ok
+	    after 0 ->
+		    ok
+	    end,
+	    Others = remove_node(Node, S#multi.others),
+	    loop_the_locker(Global, S#multi{others = Others});
+	{lock_set, _Pid, false, _} ->
+	    ?P2({the_locker, spurious, node(), node(_Pid)}),
+	    loop_the_locker(Global, S);
+	{lock_set, Pid, true, HisKnown} ->
+	    Node = node(Pid),
+	    ?P2({the_locker, spontaneous, node(), Node}),
+
+	    NewKnown = gen_server:call(global_name_server, get_known),
+
+	    Others =
+		case find_node_tag(Node, S#multi.others) of
+		    {true, MyTag} ->
+
+			BothsKnown = HisKnown -- (HisKnown -- NewKnown),
+			Known1 = if
+				     node() < Node ->
+					 [node() | NewKnown];
+				     true ->
+					 [node() | NewKnown] -- BothsKnown
+				 end,
+
+			?P2({lock1, node()}),
+			LockId = {global, self()},
+			IsLockSet = set_lock(LockId, Known1, 1),
+			Pid ! {lock_set, self(), IsLockSet, NewKnown},
+			?P2({the_locker, spontaneous, node(), Node, IsLockSet}),
+			case IsLockSet of
+			    true ->
+				gen_server:cast(global_name_server,
+						{lock_is_set, Node, MyTag}),
+				?P1({lock_sync_done, time(), node(),
+				    {Pid, node(Pid)}, self()}),
+				%% Wait for global to tell us to remove lock.
+				receive
+				    {cancel, Node, _Tag} ->
+					%% All conflicts are resolved,
+					%% remove lock.
+					?PRINT({node(), self(), locked1}),
+					del_lock(LockId, Known1);
+				    {'EXIT', Pid, _} ->
+					?PRINT({node(), self(), locked2}),
+					%% Other node died;
+					%% remove lock and ignore him.
+					del_lock(LockId, Known1),
+					link(Global)
+				end,
+				remove_node(Node, S#multi.others);
+			    false ->
+				S#multi.others
+			end;
+		    false ->
+			?P2({the_locker, spontaneous, node(), Node, not_there}),
+			Pid ! {lock_set, self(), false, NewKnown},
+			S#multi.others
+		end,
+	    loop_the_locker(Global, S#multi{others = Others});
+	Other when element(1, Other) /= nodeup ->
+	    ?P2({the_locker, other_msg, Other}),
+	    loop_the_locker(Global, S)
+    after Timeout ->
+	    NewKnown = gen_server:call(global_name_server, get_known),
+	    [{Node, HisTheLocker, HisKnown, MyTag} | Rest] = S#multi.others,
+	    BothsKnown = HisKnown -- (HisKnown -- NewKnown),
+	    Known1 = if
+			 node() < Node ->
+			     [node() | NewKnown];
+			 true ->
+			     [node() | NewKnown] -- BothsKnown
+		     end,
+	    ?P2({picking, node(), Node}),
+	    case lists:member(Node, NewKnown) of
+		false ->
+		    LockId = {global, self()},
+		    ?P2({lock2, node()}),
+		    IsLockSet = set_lock(LockId, Known1, 1),
+		    Others =
+			case IsLockSet of
+			    true ->
+				HisTheLocker ! {lock_set, self(),
+						IsLockSet, NewKnown},
+				%% OTP-4902
+				lock_set_loop(Global, S,
+					      Node, MyTag, Rest,
+					      Known1,
+					      LockId);
+			    false ->
+				?P2({the_locker, not_locked, node(),
+				    Node}),
+				S#multi.others
+			end,
+		    loop_the_locker(Global, S#multi{known=NewKnown,
+						    others = Others});
+		true ->
+		    ?P2({is_known, node(), Node}),
+		    loop_the_locker(Global, S#multi{known=NewKnown,
+						    others = Rest})
+	    end
+    end.
+
+lock_set_loop(Global, S, Node, MyTag, Rest, Known1, LockId) ->
+    receive
+	{lock_set, P, true, _} when node(P) == Node ->
+	    ?P2({the_locker, both_set, node(), Node}),
+
+	    %% do sync
+	    gen_server:cast(global_name_server, {lock_is_set, Node, MyTag}),
+	    ?P1({lock_sync_done, time(), node(), {Pid, node(Pid)}, self()}),
+
+	    %% Wait for global to tell us to remove lock.
+	    receive
+		{cancel, Node, _} ->
+		    %% All conflicts are resolved, remove lock.
+		    ?PRINT({node(), self(), locked1}),
+		    del_lock(LockId, Known1);
+		{'EXIT', _Pid, _} ->
+		    ?PRINT({node(), self(), locked2}),
+		    %% Other node died; remove lock and ignore him.
+		    del_lock(LockId, Known1),
+		    link(Global)
+	    end,
+	    Rest;
+	{lock_set, P, false, _} when node(P) == Node ->
+	    ?P2({the_locker, not_both_set, node(), Node}),
+	    del_lock(LockId, Known1),
+	    S#multi.others;
+	{cancel, Node, _} ->
+	    ?P2({the_locker, cancel2, node(), Node}),
+	    del_lock(LockId, Known1),
+	    remove_node(Node, S#multi.others);
+	{'EXIT', _, _} ->
+	    ?P2({the_locker, exit, node(), Node}),
+	    del_lock(LockId, Known1),
+	    S#multi.others
+
+    after
+	%% OTP-4902
+	%% A cyclic deadlock could occur in rare cases where three or
+	%% more nodes waited for a reply from each other.
+	%% Therefore, reject lock_set attempts in this state from
+	%% nodes < this node (its enough if at least one node in
+	%% the cycle rejects and thus breaks the deadlock)
+	5000 ->
+	    reject_lock_set(),
+	    lock_set_loop(Global, S, Node, MyTag, Rest, Known1, LockId)
+    end.
+
+reject_lock_set() ->
+    receive
+	{lock_set, P, true, _} when node(P) < node() ->
+	    P ! {lock_set, self(), false, []},
+	    reject_lock_set()
+    after
+	0 ->
+	    true
+    end.
+
+start_locker(Node, Known, MyTag, Global, TheLocker) ->
+    %% No link here!  The del_lock call would delete the link anyway.
+    %% global_name_server has control of these processes anyway...
+    %% When the locker process exits due to being sent the 'cancel' message
+    %% by the server, the server then removes it from its tables.
+    %% When the locker terminates due to other reasons, the server must
+    %% be told, so we make a link to it just before exiting.
+    spawn(?MODULE, init_locker, [Node, Known, MyTag, Global, TheLocker]).
+
+init_locker(Node, Known, MyTag, Global, TheLocker) ->
+    process_flag(trap_exit, true),
+    ?PRINT({init_locker, node(), self(), Node}),
+    ?P1({init_locker, time(), node(), self(), Node}),
+    receive
+	{his_locker, Pid, HisKnown} ->
+	    ?PRINT({init_locker, node(), self(), his_locker, Node}),
+	    link(Pid),
+	    %% If two nodes in a group of nodes first disconnect
+	    %% and then reconnect, this causes global to deadlock.
+	    %% This because both of the reconnecting nodes
+	    %% tries to set lock on the other nodes in the group.
+	    %% This is solved by letting only one of the reconneting nodes set the lock.
+	    BothsKnown = HisKnown -- (HisKnown -- Known),
+	    ?P({loop_locker1, node(), {Pid, node(Pid)}}),
+	    Res = loop_locker(Node, Pid, Known, 1, MyTag, BothsKnown, Global),
+	    ?P({loop_locker2, node(), {Pid, node(Pid)}}),
+	    Res;
+	{his_locker_new, HisTheLocker, {Known1, Known2}} ->
+	    %% slide into the vsn 4 stuff
+	    ?P2({his_locker_new, node()}),
+	    HisTheLocker ! {his_the_locker, TheLocker, Known1, Known2},
+	    exit(normal);
+	cancel ->
+	    ?PRINT({init_locker, node(), self(), cancel, Node}),
+	    exit(normal)
+    end.
+
+loop_locker(Node, Pid, Known0, Try, MyTag, BothsKnown, Global) ->
+    Known = if
+		node() < Node ->
+		    [node() | Known0];
+		true ->
+		    [node() | Known0] -- BothsKnown
+    end,
+
+    ?PRINT({locking, node(), self(), Known}),
+    LockId = {global, self()},
+    ?P2({lock3, node()}),
+    IsLockSet = set_lock(LockId, Known, 1),
+    ?P({loop_locker, IsLockSet,
+	node(), {Pid, node(Pid)}, self(), Try}),
+    ?P1({loop_locker, time(), IsLockSet,
+	 node(), {Pid, node(Pid)}, self(), Try}),
+    ?PRINT({locking1, node(), self(), Known, IsLockSet}),
+    %% Tell other node that we managed to get the lock.
+    Pid ! {lock, ?locker_vsn, IsLockSet, Known},
+    Pid ! {lock, IsLockSet, Known},
+    Pid ! {lock, IsLockSet},
+    %% Wait for other node's result.
+    receive
+	%% R7 patched and later
+	{lock, _LockerVsn, true, _} when IsLockSet == true ->
+	    receive
+		{lock, _} ->
+		    ok
+	    end,
+	    receive
+		{lock, _, _} ->
+		    ok
+	    end,
+	    ?PRINT({node(), self(), locked}),
+	    %% Now we got the lock in both partitions.  Tell
+	    %% global, and let him resolve name conflict.
+	    ?P1({lock_sync, time(), node(), {Pid, node(Pid)}, self()}),
+	    gen_server:cast(global_name_server, {lock_is_set, Node, MyTag}),
+	    ?P1({lock_sync_done, time(), node(), {Pid, node(Pid)}, self()}),
+	    %% Wait for global to tell us to remove lock.
+	    receive
+		cancel ->
+		    %% All conflicts are resolved, remove lock.
+		    ?PRINT({node(), self(), locked1}),
+		    del_lock(LockId, Known);
+		{'EXIT', Pid, _} ->
+		    ?PRINT({node(), self(), locked2}),
+		    %% Other node died; remove lock and ignore him.
+		    del_lock(LockId, Known),
+		    link(Global)
+	    end;
+	{lock, _LockerVsn, _, HisKnown} ->
+	    receive
+		{lock, _} ->
+		    ok
+	    end,
+	    receive
+		{lock, _, _} ->
+		    ok
+	    end,
+	    %% Some of us failed to get the lock; try again
+	    ?PRINT({node(), self(), locked0}),
+	    d_lock(IsLockSet, LockId, Known),
+	    try_again_locker(Node, Pid, Try, MyTag, HisKnown, Global);
+	%% R7 unpatched
+	{lock, true, _} when IsLockSet == true ->
+	    ?PRINT({node(), self(), locked}),
+	    %% Now we got the lock in both partitions.  Tell
+	    %% global, and let him resolve name conflict.
+	    gen_server:cast(global_name_server, {lock_is_set, Node, MyTag}),
+	    %% Wait for global to tell us to remove lock.
+	    receive
+		cancel ->
+		    %% All conflicts are resolved, remove lock.
+		    ?PRINT({node(), self(), locked1}),
+		    del_lock(LockId, Known);
+		{'EXIT', Pid, _} ->
+		    ?PRINT({node(), self(), locked2}),
+		    %% Other node died; remove lock and ignore him.
+		    del_lock(LockId, Known),
+		    link(Global)
+	    end;
+	{lock, _, HisKnown} ->
+	    %% Some of us failed to get the lock; try again
+	    ?PRINT({node(), self(), locked0}),
+	    d_lock(IsLockSet, LockId, Known),
+	    try_again_locker(Node, Pid, Try, MyTag, HisKnown, Global);
+	%% R6 and earlier
+	{lock, true} when IsLockSet == true ->
+	    ?PRINT({node(), self(), locked}),
+	    %% Now we got the lock in both partitions.  Tell
+	    %% global, and let him resolve name conflict.
+	    gen_server:cast(global_name_server, {lock_is_set, Node, MyTag}),
+	    %% Wait for global to tell us to remove lock.
+	    receive
+		cancel ->
+		    %% All conflicts are resolved, remove lock.
+		    ?PRINT({node(), self(), locked1}),
+		    del_lock(LockId, Known);
+		{'EXIT', Pid, _} ->
+		    ?PRINT({node(), self(), locked2}),
+		    %% Other node died; remove lock and ignore him.
+		    del_lock(LockId, Known),
+		    link(Global)
+	    end;
+	{lock, _} ->
+	    %% Some of us failed to get the lock; try again
+	    ?PRINT({node(), self(), locked0}),
+	    d_lock(IsLockSet, LockId, Known),
+	    try_again_locker(Node, Pid, Try, MyTag, BothsKnown, Global);
+	{'EXIT', Pid, _} ->
+	    %% Other node died; remove lock and ignore him.
+	    ?PRINT({node(), self(), locked7}),
+	    d_lock(IsLockSet, LockId, Known),
+	    link(Global);
+	cancel ->
+	    ?PRINT({node(), self(), locked8}),
+	    d_lock(IsLockSet, LockId, Known)
+    end.
+
+d_lock(true, LockId, Known) -> del_lock(LockId, Known);
+d_lock(false, _, _) -> ok.
+
+try_again_locker(Node, Pid, Try, MyTag, HisKnown, Global) ->
+    ?PRINT({try_again, node(), self(), Node, Pid, Known, Try, MyTag}),
+    ?P1({try_again, time(), node(), self(), Node, Pid, Known, Try, MyTag}),
+    random_sleep(Try),
+    ?P1({try_again2, time(), node(), self(), Node, Pid, Known, Try, MyTag}),
+    NewKnown = gen_server:call(global_name_server, get_known),
+    case lists:member(Node, NewKnown) of
+	false ->
+	    BothsKnown1 = HisKnown -- (HisKnown -- NewKnown),
+	    ?PRINT({node(), self(), Node, again, notknown}),
+	    ?PRINT({bothknown, BothsKnown, BothsKnown1}),
+	    loop_locker(Node, Pid, NewKnown, Try+1, MyTag,
+			BothsKnown1, Global);
+	true ->
+	    ?PRINT({node(), self(), Node, again, known}),
+	    link(Global),
+	    %% Node is already handled, we are ready.
+	    ok
+    end.
+
+cancel_locker(Node, S) ->
+    %% multi
+    ?P2({cancel, node(), Node, get({sync_tag_my, Node})}),
+    S#state.the_locker ! {cancel, Node, get({sync_tag_my, Node})},
+
+    Lockers = S#state.lockers,
+    case lists:keysearch(Node, 1, Lockers) of
+	{value, {_, Pid}} ->
+	    Pid ! cancel,
+	    ?PRINT({cancel, Node, lockers, node(), Lockers}),
+	    S#state{lockers = lists:keydelete(Node, 1, Lockers)};
+	_ ->
+	    S
+    end.
+
+%% A node sent us his names. When a name clash is found, the resolve
+%% function is called from the smaller node => all resolve funcs are called
+%% from the same partition.
+exchange_names([{Name, Pid, Method} |Tail], Node, Ops, Res) ->
+    case ets:lookup(global_names, Name) of
+	[{Name, Pid, _}] ->
+	    exchange_names(Tail, Node, Ops, Res);
+	[{Name, Pid2, Method2}] when node() < Node ->
+	    %% Name clash!  Add the result of resolving to Res(olved).
+	    %% We know that node(Pid) /= node(), so we don't
+	    %% need to link/unlink to Pid.
+	    Node2 = node(Pid2), %%&&&&&& check external node???
+	    case rpc:call(Node2, ?MODULE, resolve_it,
+			  [Method2, Name, Pid, Pid2]) of
+		Pid ->
+		    dounlink(Pid2),
+		    ets:insert(global_names, {Name, Pid, Method}),
+		    Op = {insert, {Name, Pid, Method}},
+		    exchange_names(Tail, Node, [Op | Ops], [Op | Res]);
+		Pid2 ->
+		    Op = {insert, {Name, Pid2, Method2}},
+		    exchange_names(Tail, Node, Ops, [Op | Res]);
+		none ->
+		    dounlink(Pid2),
+		    ?P2({unregister, node(), Name, Pid2, node(Pid2)}),
+		    ets:delete(global_names, Name),
+		    Op = {delete, Name},
+		    exchange_names(Tail, Node, [Op | Ops], [Op | Res]);
+		{badrpc, Badrpc} ->
+		    error_logger:info_msg("global: badrpc ~w received when "
+					  "conflicting name ~w was found",
+					  [Badrpc, Name]),
+		    dounlink(Pid2),
+		    ets:insert(global_names, {Name, Pid, Method}),
+		    Op = {insert, {Name, Pid, Method}},
+		    exchange_names(Tail, Node, [Op | Ops], [Op | Res]);
+		Else ->
+		    error_logger:info_msg("global: Resolve method ~w for "
+					  "conflicting name ~w returned ~w~n",
+					  [Method, Name, Else]),
+		    dounlink(Pid2),
+		    ets:delete(global_names, Name),
+		    Op = {delete, Name},
+		    exchange_names(Tail, Node, [Op | Ops], [Op | Res])
+	    end;
+	[{Name, _Pid2, _}] ->
+	    %% The other node will solve the conflict.
+	    exchange_names(Tail, Node, Ops, Res);
+	_ ->
+	    %% Entirely new name.
+	    ets:insert(global_names, {Name, Pid, Method}),
+	    exchange_names(Tail, Node,
+			   [{insert, {Name, Pid, Method}} | Ops], Res)
+    end;
+exchange_names([], _, Ops, Res) ->
+    {Ops, Res}.
+
+resolve_it(Method, Name, Pid1, Pid2) ->
+    catch Method(Name, Pid1, Pid2).
+
+minmax(P1,P2) ->
+    if node(P1) < node(P2) -> {P1, P2}; true -> {P2, P1} end.
+
+random_exit_name(Name, Pid, Pid2) ->
+    {Min, Max} = minmax(Pid, Pid2),
+    error_logger:info_msg("global: Name conflict terminating ~w~n",
+			  [{Name, Max}]),
+    exit(Max, kill),
+    Min.
+
+random_notify_name(Name, Pid, Pid2) ->
+    {Min, Max} = minmax(Pid, Pid2),
+    Max ! {global_name_conflict, Name},
+    Min.
+
+notify_all_name(Name, Pid, Pid2) ->
+    Pid ! {global_name_conflict, Name, Pid2},
+    Pid2 ! {global_name_conflict, Name, Pid},
+    none.
+
+cnode(Name, Pid, Pid2) ->
+    {Min, Max} = minmax(Pid, Pid2),
+    error_logger:info_msg("global: Name conflict terminating ~w~n",
+			  [{Name, Max}]),
+    Max ! {global_name_conflict, Name},
+    Min.
+
+%% Only link to pids on our own node
+dolink(Pid) when node(Pid) == node() ->
+    link(Pid);
+dolink(_) -> ok.
+
+%% Only link to pids on our own node
+dolink_ext(Pid, RegNode) when RegNode == node() -> link(Pid);
+dolink_ext(_, _) -> ok.
+
+dounlink(Pid) when node(Pid) == node() ->
+    case ets:match(global_names, {'_', Pid, '_'}) of
+	[] ->
+	    case is_pid_used(Pid) of
+		false ->
+		    unlink(Pid);
+		true -> ok
+	    end;
+	_ -> ok
+    end;
+dounlink(_Pid) ->
+    ok.
+
+is_pid_used(Pid) ->
+    is_pid_used(ets:tab2list(global_locks), Pid).
+
+is_pid_used([], _Pid) ->
+    false;
+is_pid_used([{_ResourceId, _LockReqId, Pids} | Tail], Pid) ->
+    case lists:member(Pid, Pids) of
+	true ->
+	    true;
+	false ->
+	    is_pid_used(Tail, Pid)
+    end.
+
+
+
+%% check_exit/3 removes the Pid from affected tables.
+%% This function needs to abcast the thingie since only the local
+%% server is linked to the registered process (or the owner of the
+%% lock).  All the other servers rely on the nodedown mechanism.
+check_exit(Deleter, Pid) ->
+    del_names(Deleter, Pid, ets:tab2list(global_names)),
+    del_locks(ets:tab2list(global_locks), Pid).
+
+del_names(Deleter, Pid, [{Name, Pid, _Method} | Tail]) ->
+    %% First, delete the Pid from the local ets; then send to other nodes
+    ets:delete(global_names, Name),
+    ets:delete(global_names_ext, Name),
+    dounlink(Pid),
+    Deleter ! {delete_name,self(),Name,Pid},
+    del_names(Deleter, Pid, Tail);
+del_names(Deleter, Pid, [_|T]) ->
+    del_names(Deleter, Pid, T);
+del_names(_Deleter, _Pid, []) -> done.
+
+del_locks([{ResourceId, LockReqId, Pids} | Tail], Pid) ->
+    case {lists:member(Pid, Pids), Pids} of
+	{true, [Pid]} ->
+	    ets:delete(global_locks, ResourceId),
+	    gen_server:abcast(nodes(), global_name_server,
+			      {async_del_lock, ResourceId, Pid});
+	{true, _} ->
+	    NewPids = lists:delete(Pid, Pids),
+	    ets:insert(global_locks, {ResourceId, LockReqId, NewPids}),
+	    gen_server:abcast(nodes(), global_name_server,
+			      {async_del_lock, ResourceId, Pid});
+	_ ->
+	    continue
+    end,
+    del_locks(Tail, Pid);
+del_locks([], _Pid) -> done.
+
+del_locks2([{ResourceId, LockReqId, Pids} | Tail], Pid) ->
+    case {lists:member(Pid, Pids), Pids} of
+	{true, [Pid]} ->
+	    ets:delete(global_locks, ResourceId);
+	{true, _} ->
+	    NewPids = lists:delete(Pid, Pids),
+	    ets:insert(global_locks, {ResourceId, LockReqId, NewPids});
+	_ ->
+	    continue
+    end,
+    del_locks2(Tail, Pid);
+del_locks2([], _Pid) ->
+    done.
+
+
+
+%% Unregister all Name/Pid pairs such that node(Pid) == Node
+%% and delete all locks where node(Pid) == Node
+do_node_down(Node) ->
+    do_node_down_names(Node, ets:tab2list(global_names)),
+    do_node_down_names_ext(Node, ets:tab2list(global_names_ext)),
+    do_node_down_locks(Node, ets:tab2list(global_locks)).
+
+do_node_down_names(Node, [{Name, Pid, _Method} | T]) when node(Pid) == Node ->
+    ets:delete(global_names, Name),
+    do_node_down_names(Node, T);
+do_node_down_names(Node, [_|T]) ->
+    do_node_down_names(Node, T);
+do_node_down_names(_, []) -> ok.
+
+%%remove all external names registered on the crashed node
+do_node_down_names_ext(Node, [{Name, _Pid, Node} | T]) ->
+    ets:delete(global_names, Name),
+    ets:delete(global_names_ext, Name),
+    do_node_down_names_ext(Node, T);
+do_node_down_names_ext(Node, [_|T]) ->
+    do_node_down_names_ext(Node, T);
+do_node_down_names_ext(_, []) -> ok.
+
+do_node_down_locks(Node, [{ResourceId, LockReqId, Pids} | T]) ->
+    case do_node_down_locks2(Pids, Node) of
+	[] ->
+	    continue;
+	RemovePids ->
+	    case Pids -- RemovePids of
+		[] ->
+		    ets:delete(global_locks, ResourceId);
+		NewPids ->
+		    ets:insert(global_locks, {ResourceId, LockReqId, NewPids})
+	    end
+    end,
+    do_node_down_locks(Node, T);
+do_node_down_locks(Node, [_|T]) ->
+    do_node_down_locks(Node, T);
+do_node_down_locks(_, []) -> done.
+
+
+do_node_down_locks2(Pids, Node) ->
+    do_node_down_locks2(Pids, Node, []).
+
+do_node_down_locks2([], _Node, Res) ->
+    Res;
+do_node_down_locks2([Pid | Pids], Node, Res) when node(Pid) == Node ->
+    do_node_down_locks2(Pids, Node, [Pid | Res]);
+do_node_down_locks2([_ | Pids], Node, Res) ->
+    do_node_down_locks2(Pids, Node, Res).
+
+
+get_names() ->
+    ets:tab2list(global_names).
+
+get_names_ext() ->
+    ets:tab2list(global_names_ext).
+
+random_sleep(Times) ->
+    case (Times rem 10) of
+	0 -> erase(random_seed);
+	_ -> ok
+    end,
+    case get(random_seed) of
+	undefined ->
+	    {A1, A2, A3} = now(),
+	    random:seed(A1, A2, A3 + erlang:phash(node(), 100000));
+	_ -> ok
+    end,
+    %% First time 1/4 seconds, then doubling each time up to 8 seconds max.
+    Tmax = if Times > 5 -> 8000;
+	      true -> ((1 bsl Times) * 1000) div 8
+	   end,
+    T = random:uniform(Tmax),
+    ?P({random_sleep, node(), self(), Times, T}),
+    receive after T -> ok end.
+
+dec(infinity) -> infinity;
+dec(N) -> N-1.
+
+send_again(Msg) ->
+    spawn_link(?MODULE, timer, [self(), Msg]).
+
+timer(Pid, Msg) ->
+    random_sleep(5),
+    Pid ! Msg.
+
+change_our_node_name(NewNode, S) ->
+    S#state{node_name = NewNode}.
+
+
+%%-----------------------------------------------------------------
+%% Each sync process corresponds to one call to sync.  Each such
+%% process asks the global_name_server on all Nodes if it is in sync
+%% with Nodes.  If not, that (other) node spawns a syncer process that
+%% waits for global to get in sync with all Nodes.  When it is in
+%% sync, the syncer process tells the original sync process about it.
+%%-----------------------------------------------------------------
+start_sync(Nodes, From) ->
+    spawn_link(?MODULE, sync_init, [Nodes, From]).
+
+sync_init(Nodes, From) ->
+    lists:foreach(fun(Node) -> monitor_node(Node, true) end, Nodes),
+    sync_loop(Nodes, From).
+
+sync_loop([], From) ->
+    gen_server:reply(From, ok);
+sync_loop(Nodes, From) ->
+    receive
+	{nodedown, Node} ->
+	    monitor_node(Node, false),
+	    sync_loop(lists:delete(Node, Nodes), From);
+	{synced, SNodes} ->
+	    lists:foreach(fun(N) -> monitor_node(N, false) end, SNodes),
+	    sync_loop(Nodes -- SNodes, From)
+    end.
+
+
+%%%====================================================================================
+%%% Get the current global_groups definition
+%%%====================================================================================
+check_sync_nodes() ->
+    case get_own_nodes() of
+	{ok, all} ->
+	    nodes();
+	{ok, NodesNG} ->
+	    %% global_groups parameter is defined, we are not allowed to sync
+	    %% with nodes not in our own global group.
+	    (nodes() -- (nodes() -- NodesNG));
+	{error, Error} ->
+	    {error, Error}
+    end.
+
+check_sync_nodes(SyncNodes) ->
+    case get_own_nodes() of
+	{ok, all} ->
+	    SyncNodes;
+	{ok, NodesNG} ->
+	    %% global_groups parameter is defined, we are not allowed to sync
+	    %% with nodes not in our own global group.
+	    OwnNodeGroup = (nodes() -- (nodes() -- NodesNG)),
+	    IllegalSyncNodes = (SyncNodes -- [node() | OwnNodeGroup]),
+	    case IllegalSyncNodes of
+		[] -> SyncNodes;
+		_ -> {error, {"Trying to sync nodes not defined in the own global group",
+			      IllegalSyncNodes}}
+	    end;
+	{error, Error} ->
+	    {error, Error}
+    end.
+
+get_own_nodes() ->
+    case global_group:get_own_nodes_with_errors() of
+        {error, Error} ->
+            {error, {"global_groups definition error", Error}};
+        OkTup ->
+            OkTup
+    end.
+
+
+%%-----------------------------------------------------------------
+%% The deleter process is a satellite process to global_name_server
+%% that does background batch deleting of names when a process
+%% that had globally registered names dies. It is started by and
+%% linked to global_name_server.
+%%-----------------------------------------------------------------
+
+start_the_deleter(Global) ->
+    spawn_link(
+      fun () ->
+	      loop_the_deleter(Global)
+      end).
+
+loop_the_deleter(Global) ->
+    Deletions = collect_deletions(Global, []),
+    trans({global, self()},
+	  fun() ->
+		  lists:map(
+		    fun ({Name,Pid}) ->
+			    ?P2({delete_name2, Name, Pid, nodes()}),
+			    gen_server:abcast(nodes(), global_name_server,
+					      {async_del_name, Name, Pid})
+		    end, Deletions)
+	  end,
+	  nodes()),
+    loop_the_deleter(Global).
+
+collect_deletions(Global, Deletions) ->
+    receive
+	{delete_name,Global,Name,Pid} ->
+	    ?P2({delete_name, node(), self(), Name, Pid, nodes()}),
+	    collect_deletions(Global, [{Name,Pid}|Deletions]);
+	Other ->
+	    error_logger:error_msg("The global_name_server deleter process "
+				   "received an unexpected message:\n~p\n",
+				   [Other]),
+	    collect_deletions(Global, Deletions)
+    after case Deletions of
+	      [] -> infinity;
+	      _  -> 0
+	  end ->
+	    lists:reverse(Deletions)
+    end.
diff --git a/lib/dialyzer/test/options2_tests_SUITE.erl b/lib/dialyzer/test/options2_tests_SUITE.erl
deleted file mode 100644
index 43b5207744..0000000000
--- a/lib/dialyzer/test/options2_tests_SUITE.erl
+++ /dev/null
@@ -1,52 +0,0 @@
-%% ATTENTION!
-%% This is an automatically generated file. Do not edit.
-%% Use './remake' script to refresh it if needed.
-%% All Dialyzer options should be defined in dialyzer_options
-%% file.
-
--module(options2_tests_SUITE).
-
--include("ct.hrl").
--include("dialyzer_test_constants.hrl").
-
--export([suite/0, init_per_suite/0, init_per_suite/1,
-         end_per_suite/1, all/0]).
--export([options2_tests_SUITE_consistency/1, kernel/1]).
-
-suite() ->
-  [{timetrap, {minutes, 1}}].
-
-init_per_suite() ->
-  [{timetrap, ?plt_timeout}].
-init_per_suite(Config) ->
-  OutDir = ?config(priv_dir, Config),
-  case dialyzer_common:check_plt(OutDir) of
-    fail -> {skip, "Plt creation/check failed."};
-    ok -> [{dialyzer_options, [{defines,[{vsn,4}]},{warnings,[no_return]}]}|Config]
-  end.
-
-end_per_suite(_Config) ->
-  ok.
-
-all() ->
-  [options2_tests_SUITE_consistency,kernel].
-
-dialyze(Config, TestCase) ->
-  Opts = ?config(dialyzer_options, Config),
-  Dir = ?config(data_dir, Config),
-  OutDir = ?config(priv_dir, Config),
-  dialyzer_common:check(TestCase, Opts, Dir, OutDir).
-
-options2_tests_SUITE_consistency(Config) ->
-  Dir = ?config(data_dir, Config),
-  case dialyzer_common:new_tests(Dir, all()) of
-    []  -> ok;
-    New -> ct:fail({missing_tests,New})
-  end.
-
-kernel(Config) ->
-  case dialyze(Config, kernel) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
diff --git a/lib/dialyzer/test/options2_tests_SUITE_data/src/kernel/global.erl b/lib/dialyzer/test/options2_tests_SUITE_data/src/kernel/global.erl
deleted file mode 100644
index 1f0e01d074..0000000000
--- a/lib/dialyzer/test/options2_tests_SUITE_data/src/kernel/global.erl
+++ /dev/null
@@ -1,1999 +0,0 @@
-%% ``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 via the world wide web 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.
-%%
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%%
-%%     $Id: global.erl,v 1.4 2009/09/17 09:46:19 kostis Exp $
-%%
--module(global).
--behaviour(gen_server).
-
-%%  A Global register that allows the global registration of pid's and
-%% name's, that dynamically keeps up to date with the entire network.
-%% global can operate in two modes; in a fully connected network, or
-%% in a non-fully connected network.  In the latter case, the name
-%% registration mechanism won't work.
-%%
-
-%% External exports
--export([start/0, start_link/0, stop/0, sync/0, sync/1,
-	 safe_whereis_name/1, whereis_name/1,  register_name/2, register_name/3,
-	 register_name_external/2, register_name_external/3, unregister_name_external/1,
-	 re_register_name/2, re_register_name/3,
-	 unregister_name/1, registered_names/0, send/2, node_disconnected/1,
-	 set_lock/1, set_lock/2, set_lock/3,
-	 del_lock/1, del_lock/2,
-	 trans/2, trans/3, trans/4,
-	 random_exit_name/3, random_notify_name/3, notify_all_name/3, cnode/3]).
-
-%% Internal exports
--export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
-	 code_change/3, timer/2, sync_init/2, init_locker/5, resolve_it/4,
-	 init_the_locker/1]).
-
--export([info/0]).
-
-
-%-define(PRINT(X), erlang:display(X)).
--define(PRINT(X), true).
-
-%-define(P2(X), erlang:display(X)).
-%-define(P2(X), erlang:display({cs(),X})).
--define(P2(X), true).
-
-%-define(P1(X), erlang:display(X)).
--define(P1(X), true).
-
-%-define(P(X), erlang:display(X)).
--define(P(X), true).
-
-%-define(FORMAT(S, A), format(S, A)).
--define(FORMAT(S, A), ok).
-
-%%% In certain places in the server, calling io:format hangs everything,
-%%% so we'd better use erlang:display/1.
-% format(S, A) ->
-%     erlang:display({format, cs(), S, A}),
-% %    io:format(S, A),
-%     ok.
-
-% cs() ->
-%     {Big, Small, Tiny} = now(),
-%     (Small rem 100) * 100 + (Tiny div 10000).
-
-%% Some notes on the internal structure:
-%% One invariant is that the list of locker processes is keyed; i.e.,
-%% there is only one process per neighboring node.
-%% When an item has been stored in the process dictionary, it is not
-%% necessarily cleared when not in use anymore. In other words, it's
-%% not an error if there is already an item there when one is to be
-%% stored.
-
-
-%% This is the protocol version
-%% Vsn 1 is the original protocol.
-%% Vsn 2 is enhanced with code to take care of registration of names from
-%%       non erlang nodes, e.g. c-nodes.
-%% Vsn 3 is enhanced with a tag in the synch messages to distinguish
-%%       different synch sessions from each other, see OTP-2766.
-%%       Note: This requires also that the ticket OTP-2928 is fixed on the nodes
-%%             running vsn 1 or 2; if such nodes will coexist with vsn 3 nodes.
-%% Vsn 4 uses a single, permanent, locker process, but works like vsn 3
-%% when communicating with vsn 3 nodes.
-
-%% -define(vsn, 4).  %% Now given in options
-
-%%-----------------------------------------------------------------
-%% connect_all = boolean() - true if we are supposed to set up a
-%%                        fully connected net
-%% known       = [Node] - all nodes known to us
-%% synced      = [Node] - all nodes that have the same names as us
-%% lockers     = [{Node, MyLockerPid}] - the pid of the locker
-%%                         process for each Node
-%% syncers     = [pid()] - all current syncers processes
-%% node_name   = atom()  - our node name (can change if distribution
-%%                         is started/stopped dynamically)
-%%
-%% In addition to these, we keep info about messages arrived in
-%% the process dictionary:
-%% {pre_connect, Node} = {Vsn, InitMsg} - init_connect msgs that
-%%                         arrived before nodeup
-%% {wait_lock, Node}   = {exchange, NameList} | lock_is_set
-%%                        - see comment below (handle_cast)
-%% {save_ops, Node}    = [operation()] - save the ops between
-%%                          exchange and resolved
-%% {prot_vsn, Node}    = Vsn - the exchange protocol version
-%% {sync_tag_my, Node} =  My tag, used at synchronization with Node
-%% {sync_tag_his, Node} = The Node's tag, used at synchronization
-%%-----------------------------------------------------------------
--record(state, {connect_all, known = [], synced = [],
-		lockers = [], syncers = [], node_name = node(),
-		the_locker, the_deleter}).
-
-start() -> gen_server:start({local, global_name_server}, global, [], []).
-start_link() -> gen_server:start_link({local, global_name_server},global,[],[]).
-stop() -> gen_server:call(global_name_server, stop, infinity).
-
-sync() ->
-    case check_sync_nodes() of
-	{error, Error} ->
-	    {error, Error};
-	SyncNodes ->
-	    gen_server:call(global_name_server, {sync, SyncNodes}, infinity)
-    end.
-sync(Nodes) ->
-    case check_sync_nodes(Nodes) of
-	{error, Error} ->
-	    {error, Error};
-	SyncNodes ->
-	    gen_server:call(global_name_server, {sync, SyncNodes}, infinity)
-    end.
-
-
-send(Name, Msg) ->
-    case whereis_name(Name) of
-	Pid when pid(Pid) ->
-	    Pid ! Msg,
-	    Pid;
-	undefined ->
-	    exit({badarg, {Name, Msg}})
-    end.
-
-%% See OTP-3737. (safe_whereis_name/1 is in fact not used anywhere in OTP.)
-whereis_name(Name) ->
-    where(Name).
-
-safe_whereis_name(Name) ->
-    gen_server:call(global_name_server, {whereis, Name}, infinity).
-
-
-node_disconnected(Node) ->
-    global_name_server ! {nodedown, Node}.
-
-
-%%-----------------------------------------------------------------
-%% Method = function(Name, Pid1, Pid2) -> Pid | Pid2 | none
-%% Method is called if a name conflict is detected when two nodes
-%% are connecting to each other.  It is supposed to return one of
-%% the Pids or 'none'.  If a pid is returned, that pid is
-%% registered as Name on all nodes.  If 'none' is returned, the
-%% Name is unregistered on all nodes.  If anything else is returned,
-%% the Name is unregistered as well.
-%% Method is called once at one of the nodes where the processes reside
-%% only.  If different Methods are used for the same name, it is
-%% undefined which one of them is used.
-%% Method is blocking, i.e. when it is called, no calls to whereis/
-%% send is let through until it has returned.
-%%-----------------------------------------------------------------
-register_name(Name, Pid) when pid(Pid) ->
-    register_name(Name, Pid, {global, random_exit_name}).
-register_name(Name, Pid, Method) when pid(Pid) ->
-    trans_all_known(fun(Nodes) ->
-		  case where(Name) of
-		      undefined ->
-			  gen_server:multi_call(Nodes,
-						global_name_server,
-						{register, Name, Pid, Method}),
-			  yes;
-		      _Pid -> no
-		  end
-	  end).
-
-unregister_name(Name) ->
-    case where(Name) of
-	undefined ->
-	    ok;
-	_ ->
-	    trans_all_known(fun(Nodes) ->
-			  gen_server:multi_call(Nodes,
-						global_name_server,
-						{unregister, Name}),
-			  ok
-		  end)
-    end.
-
-re_register_name(Name, Pid) when pid(Pid) ->
-    re_register_name(Name, Pid, {global, random_exit_name}).
-re_register_name(Name, Pid, Method) when pid(Pid) ->
-    trans_all_known(fun(Nodes) ->
-		  gen_server:multi_call(Nodes,
-					global_name_server,
-					{register, Name, Pid, Method}),
-		  yes
-	  end).
-
-%% Returns all globally registered names
-registered_names() -> lists:map(fun({Name, _Pid, _Method}) -> Name end,
-				ets:tab2list(global_names)).
-
-%%-----------------------------------------------------------------
-%% An external node (i.e not an erlang node) (un)registers a name.
-%% If the registered Pid crashes the name is to be removed from global.
-%% If the external node crashes the name is to be removed from global.
-%% If the erlang node which registers the name crashes the name is also to be
-%% removed, because the registered process is not supervised any more,
-%% (i.e there is no link to the registered Pid).
-%%-----------------------------------------------------------------
-register_name_external(Name, Pid) when pid(Pid) ->
-    register_name_external(Name, Pid, {global, random_exit_name}).
-register_name_external(Name, Pid, Method) when pid(Pid) ->
-    trans_all_known(fun(Nodes) ->
-		  case where(Name) of
-		      undefined ->
-			  gen_server:multi_call(Nodes,
-						global_name_server,
-						{register, Name, Pid, Method}),
-			  gen_server:multi_call(Nodes,
-						global_name_server,
-						{register_ext, Name, Pid, node()}),
-			  yes;
-		      _Pid -> no
-		  end
-	  end).
-
-
-
-
-unregister_name_external(Name) ->
-    case where(Name) of
-	undefined ->
-	    ok;
-	_ ->
-	    trans_all_known(fun(Nodes) ->
-			  gen_server:multi_call(Nodes,
-						global_name_server,
-						{unregister, Name}),
-			  gen_server:multi_call(Nodes,
-						global_name_server,
-						{unregister_ext, Name}),
-			  ok
-		  end)
-    end.
-
-
-
-
-
-%%-----------------------------------------------------------------
-%% Args: Id = id()
-%%       Nodes = [node()]
-%%       id() = {ResourceId, LockRequesterId}
-%%       Retries = infinity | int() > 0
-%% Purpose: Sets a lock on the specified nodes (or all nodes if
-%%          none are specified) on ResourceId for LockRequesterId.  If there
-%%          already exists a lock on ResourceId for another owner
-%%          than LockRequesterId, false is returned, otherwise true.
-%% Returns: boolean()
-%%-----------------------------------------------------------------
-set_lock(Id) ->
-    set_lock(Id, [node() | nodes()], infinity, 1).
-set_lock(Id, Nodes) ->
-    set_lock(Id, Nodes, infinity, 1).
-set_lock(Id, Nodes, Retries) when Retries > 0 ->
-    set_lock(Id, Nodes, Retries, 1);
-set_lock(Id, Nodes, infinity) ->
-    set_lock(Id, Nodes, infinity, 1).
-set_lock(_Id, _Nodes, 0, _) -> false;
-set_lock({ResourceId, LockRequesterId}, Nodes, Retries, Times) ->
-    Id = {ResourceId, LockRequesterId},
-    Msg = {set_lock, Id},
-    {Replies, _} =
-	gen_server:multi_call(Nodes, global_name_server, Msg),
-    ?P2({set_lock, node(), self(), {ResourceId, LockRequesterId},
-	 Nodes, Retries, Times, Replies, catch erlang:error(kaka)}),
-    ?P({set_lock, node(), ResourceId,
-	{LockRequesterId, node(LockRequesterId)}}),
-    case check_replies(Replies, Id, Nodes) of
-	true -> ?P({set_lock_true, node(), ResourceId}),
-		true;
-	false ->
-	    random_sleep(Times),
-	    set_lock(Id, Nodes, dec(Retries), Times+1);
-	N when integer(N) ->
-	    ?P({sleeping, N}),
-	    timer:sleep(N*500),
-	    set_lock(Id, Nodes, Retries, Times);
-	Pid when pid(Pid) ->
-	    ?P({waiting_for, Pid}),
-	    Ref = erlang:monitor(process, Pid),
-	    receive
-		{'DOWN', Ref, process, Pid, _Reason} ->
-		    ?P({waited_for, Pid, _Reason}),
-		    set_lock(Id, Nodes, Retries, Times)
-	    end
-    end.
-
-check_replies([{_Node, true} | T], Id, Nodes) ->
-    check_replies(T, Id, Nodes);
-check_replies([{_Node, Status} | _T], Id, Nodes) ->
-    gen_server:multi_call(Nodes, global_name_server, {del_lock, Id}),
-    Status;
-check_replies([], _Id, _Nodes) ->
-    true.
-
-del_lock(Id) ->
-    del_lock(Id, [node() | nodes()]).
-del_lock({ResourceId, LockRequesterId}, Nodes) ->
-    Id = {ResourceId, LockRequesterId},
-    ?P2({del_lock, node(), self(), ResourceId, LockRequesterId, Nodes}),
-    gen_server:multi_call(Nodes, global_name_server, {del_lock, Id}),
-    true.
-
-%%-----------------------------------------------------------------
-%% Args: Id = id()
-%%       Fun = fun() | {M,F}
-%%       Nodes = [node()]
-%%       Retries = infinity | int() > 0
-%% Purpose: Sets a lock on Id (as set_lock), and evaluates
-%%          Res = Fun() on success.
-%% Returns: Res | aborted  (note, if Retries is infinity, the
-%%          transaction won't abort)
-%%-----------------------------------------------------------------
-trans(Id, Fun) -> trans(Id, Fun, [node() | nodes()], infinity).
-trans(Id, Fun, Nodes) -> trans(Id, Fun, Nodes, infinity).
-trans(_Id, _Fun, _Nodes, 0) -> aborted;
-trans(Id, Fun, Nodes, Retries) ->
-    case set_lock(Id, Nodes, Retries) of
-	true ->
-	    case catch Fun() of
-		{'EXIT', R} ->
-		    del_lock(Id, Nodes),
-		    exit(R);
-		Res ->
-		    del_lock(Id, Nodes),
-		    Res
-	    end;
-	false ->
-	    aborted
-    end.
-
-%%% Similar to trans(Id, Fun), but always uses global's own lock,
-%%% on all nodes known to global, making sure that no new nodes have
-%%% become known while we got the list of known nodes.
-trans_all_known(F) ->
-    Id = {global, self()},
-    Nodes = [node() | gen_server:call(global_name_server, get_known)],
-    case set_lock(Id, Nodes) of
-	true ->
-	    Nodes2 = [node() | gen_server:call(global_name_server, get_known)],
-	    case Nodes2 -- Nodes of
-		[] ->
-		    case catch F(Nodes2) of
-			{'EXIT', R} ->
-			    del_lock(Id, Nodes2),
-			    exit(R);
-			Res ->
-			    del_lock(Id, Nodes2),
-			    Res
-		    end;
-		_ ->
-		    del_lock(Id, Nodes),
-		    trans_all_known(F)
-	    end;
-	false ->
-	    aborted
-    end.
-
-info() ->
-    gen_server:call(global_name_server, info).
-
-%%%-----------------------------------------------------------------
-%%% Call-back functions from gen_server
-%%%-----------------------------------------------------------------
-init([]) ->
-    process_flag(trap_exit, true),
-    ets:new(global_locks, [set, named_table, protected]),
-    ets:new(global_names, [set, named_table, protected]),
-    ets:new(global_names_ext, [set, named_table, protected]),
-
-    %% multi
-    S = #state{the_locker = start_the_locker(self()),
-	       the_deleter = start_the_deleter(self())},
-
-    case init:get_argument(connect_all) of
-	{ok, [["false"]]} ->
-	    {ok, S#state{connect_all = false}};
-	_ ->
-	    {ok, S#state{connect_all = true}}
-    end.
-
-%%-----------------------------------------------------------------
-%% Connection algorithm
-%% ====================
-%% This alg solves the problem with partitioned nets as well.
-%%
-%% The main idea in the alg is that when two nodes connect, they
-%% try to set a lock in their own partition (i.e. all nodes already
-%% known to them).  When the lock is set in each partition, these
-%% two nodes send each other a list with all registered names in
-%% resp partition(*).  If no conflict is found, the name tables are
-%% just updated.  If a conflict is found, a resolve function is
-%% called once for each conflict.  The result of the resolving
-%% is sent to the other node.  When the names are exchanged, all
-%% other nodes in each partition are informed of the other nodes,
-%% and they ping each other to form a fully connected net.
-%%
-%% Here's the flow:
-%% Suppose nodes A and B connect, and C is connected to A.
-%%
-%% Node A
-%% ------
-%% << {nodeup, B}
-%%   [spawn locker]
-%% B ! {init_connect, MyLocker}
-%% << {init_connect, MyLocker}
-%%   [The lockers try to set the lock]
-%% << {lock_is_set, B}
-%%   [Now, lock is set in both partitions]
-%% B ! {exchange, Names}
-%% << {exchange, Names}
-%%   [solve conflict]
-%% B ! {resolved, Resolved}
-%% << {resolved, Resolved}
-%% C ! {new_nodes, Resolved, [B]}
-%%
-%% Node C
-%% ------
-%% << {new_nodes, ResolvedOps, NewNodes}
-%%   [insert Ops]
-%% ping(NewNodes)
-%% << {nodeup, B}
-%% <ignore this one>
-%%
-%% Several things can disturb this picture.
-%%
-%% First, the got_names message may arrive *before* the nodeup
-%% message, due to delay in net_kernel and an optimisation in the
-%% emulator.  We handle this by keeping track of these messages in the
-%% pre_connect and lockers variables in our state.
-%%
-%% The most common situation is when a new node connects to an
-%% existing net.  In this case there's no need to set the lock on
-%% all nodes in the net, as we know that there won't be any conflict.
-%% This is optimised by sending {first_contact, Node} instead of got_names.
-%% This implies that first_contact may arrive before nodeup as well.
-%%
-%% Of course we must handle that some node goes down during the
-%% connection.
-%%
-%% (*) When this information is being exchanged, no one is allowed
-%% to change the global register table.  All calls to register etc
-%% are protected by a lock.  If a registered process dies
-%% during this phase, the deregistration is done as soon as possible
-%% on each node (i.e. when the info about the process has arrived).
-%%-----------------------------------------------------------------
-%% Messages in the protocol
-%% ========================
-%% 1. Between connecting nodes  (gen_server:casts)
-%%    {init_connect, Vsn, Node, InitMsg}
-%%         InitMsg = {locker, LockerPid}
-%%    {exchange, Node, ListOfNames}
-%%    {resolved, Node, Ops, Known}
-%%         Known = list of nodes in Node's partition
-%% 2. Between lockers on connecting nodes  (!s)
-%%    {his_locker, Pid} (from our global)
-%%         lockers link to each other
-%%    {lock, Bool} loop until both lockers have lock = true,
-%%          then send to global {lock_is_set, Node}
-%% 3. From connecting node to other nodes in the partition
-%%    {new_nodes, Node, Ops, NewNodes}
-%% 4. sync protocol
-%%    {in_sync, Node, IsKnown}
-%%       - sent by each node to all new nodes
-%%-----------------------------------------------------------------
-
-handle_call({whereis, Name}, From, S) ->
-    do_whereis(Name, From),
-    {noreply, S};
-
-handle_call({register, Name, Pid, Method}, _From, S) ->
-    ?P2({register, node(), Name}),
-    ins_name(Name, Pid, Method),
-    {reply, yes, S};
-
-handle_call({unregister, Name}, _From, S) ->
-    case ets:lookup(global_names, Name) of
-	[{_, Pid, _}] ->
-	    ?P2({unregister, node(), Name, Pid, node(Pid)}),
-	    ets:delete(global_names, Name),
-	    dounlink(Pid);
-	_ -> ok
-    end,
-    {reply, ok, S};
-
-handle_call({register_ext, Name, Pid, RegNode}, _F, S) ->
-    ins_name_ext(Name, Pid, RegNode),
-    {reply, yes, S};
-
-handle_call({unregister_ext, Name}, _From, S) ->
-    ets:delete(global_names_ext, Name),
-    {reply, ok, S};
-
-
-handle_call({set_lock, Lock}, {Pid, _Tag}, S) ->
-    Reply = handle_set_lock(Lock, Pid),
-    {reply, Reply, S};
-
-handle_call({del_lock, Lock}, {Pid, _Tag}, S) ->
-    handle_del_lock(Lock, Pid),
-    {reply, true, S};
-
-handle_call(get_known, _From, S) ->
-    {reply, S#state.known, S};
-
-%% R7 may call us?
-handle_call(get_known_v2, _From, S) ->
-    {reply, S#state.known, S};
-
-handle_call({sync, Nodes}, From, S) ->
-    %% If we have several global groups, this won't work, since we will
-    %% do start_sync on a nonempty list of nodes even if the system
-    %% is quiet.
-    Pid = start_sync(lists:delete(node(), Nodes) -- S#state.synced, From),
-    {noreply, S#state{syncers = [Pid | S#state.syncers]}};
-
-handle_call(get_protocol_version, _From, S) ->
-    {reply, ?vsn, S};
-
-handle_call(get_names_ext, _From, S) ->
-    {reply, get_names_ext(), S};
-
-handle_call(info, _From, S) ->
-    {reply, S, S};
-
-handle_call(stop, _From, S) ->
-    {stop, normal, stopped, S}.
-
-
-%%=======================================================================================
-%% init_connect
-%%
-%% Vsn 1 is the original protocol.
-%% Vsn 2 is enhanced with code to take care of registration of names from
-%%       non erlang nodes, e.g. c-nodes.
-%% Vsn 3 is enhanced with a tag in the synch messages to distinguish
-%%       different synch sessions from each other, see OTP-2766.
-%%       Note: This requires also that the ticket OTP-2928 is fixed on the nodes
-%%             running vsn 1 or 2; if such nodes will coexist with vsn 3 nodes.
-%%=======================================================================================
-handle_cast({init_connect, Vsn, Node, InitMsg}, S) ->
-    ?FORMAT("~p #### init_connect  Vsn ~p, Node ~p, InitMsg ~p~n",[node(), Vsn, Node, InitMsg]),
-    case Vsn of
-	%% It is always the responsibility of newer versions to understand
-	%% older versions of the protocol.
-	{HisVsn, HisTag} when HisVsn > ?vsn ->
-	    init_connect(?vsn, Node, InitMsg, HisTag, S#state.lockers, S);
-	{HisVsn, HisTag} ->
-	    init_connect(HisVsn, Node, InitMsg, HisTag, S#state.lockers, S);
-	%% To be future compatible
-	Tuple when tuple(Tuple) ->
-	    List = tuple_to_list(Tuple),
-	    [_HisVsn, HisTag | _] = List,
-	    %% use own version handling if his is newer.
-	    init_connect(?vsn, Node, InitMsg, HisTag, S#state.lockers, S);
-	_ when Vsn < 3 ->
-	    init_connect(Vsn, Node, InitMsg, undef, S#state.lockers, S);
-	_ ->
-	    Txt = io_lib:format("Illegal global protocol version ~p Node: ~p",[Vsn, Node]),
-	    error_logger:info_report(lists:flatten(Txt))
-    end,
-    {noreply, S};
-
-%%=======================================================================================
-%% lock_is_set
-%%
-%% Ok, the lock is now set on both partitions. Send our names to other node.
-%%=======================================================================================
-handle_cast({lock_is_set, Node, MyTag}, S) ->
-    ?FORMAT("~p #### lock_is_set  Node ~p~n",[node(), Node]),
-    Sync_tag_my = get({sync_tag_my, Node}),
-    PVsn =  get({prot_vsn, Node}),
-    ?P2({lock_is_set, node(), Node, {MyTag, PVsn}, Sync_tag_my}),
-    case {MyTag, PVsn} of
-	{Sync_tag_my, undefined} ->
-	    %% Patch for otp-2728, the connection to the Node is flipping up and down
-	    %% the messages from the 'older' sync tries can disturb the 'new' sync try
-	    %% therefor all messages are discarded if the protocol vsn is not defined.
-	    Txt = io_lib:format("undefined global protocol version Node: ~p",[Node]),
-	    error_logger:info_report(lists:flatten(Txt)),
-	    {noreply, S};
-	{Sync_tag_my, _} ->
-	    %% Check that the Node is still not known
-	    case lists:member(Node, S#state.known) of
-		false ->
-		    ?P2({lset, node(), Node, false}),
-		    lock_is_set(Node, S#state.known),
-		    {noreply, S};
-		true ->
-		    ?P2({lset, node(), Node, true}),
-		    erase({wait_lock, Node}),
-		    NewS = cancel_locker(Node, S),
-		    {noreply, NewS}
-	    end;
-	_ ->
-	    ?P2({lset, illegal, node(), Node}),
-	    %% Illegal tag, delete the locker.
-	    erase({wait_lock, Node}),
-	    NewS = cancel_locker(Node, S),
-	    {noreply, NewS}
-    end;
-
-%%=======================================================================================
-%% exchange
-%%
-%% Here the names are checked to detect name clashes.
-%%=======================================================================================
-%% Vsn 3 of the protocol
-handle_cast({exchange, Node, NameList, NameExtList, MyTag}, S) ->
-    ?FORMAT("~p #### handle_cast 3 lock_is_set  exchange ~p~n",
-	    [node(),{Node, NameList, NameExtList, MyTag}]),
-    Sync_tag_my = get({sync_tag_my, Node}),
-    PVsn =  get({prot_vsn, Node}),
-    case {MyTag, PVsn} of
-	{Sync_tag_my, undefined} ->
-	    %% Patch for otp-2728, the connection to the Node is flipping up and down
-	    %% the messages from the 'older' sync tries can disturb the 'new' sync try
-	    %% therefor all messages are discarded if the protocol vsn is not defined.
-	    Txt = lists:flatten(io_lib:format(
-				  "undefined global protocol version Node: ~p",[Node])),
-	    error_logger:info_report(Txt),
-	    {noreply, S};
-	{Sync_tag_my, _} ->
-	    exchange(PVsn, Node, {NameList, NameExtList}, S#state.known),
-	    {noreply, S};
-	_ ->
-	    %% Illegal tag, delete the locker.
-	    erase({wait_lock, Node}),
-	    NewS = cancel_locker(Node, S),
-	    {noreply, NewS}
-    end;
-
-
-
-%%=======================================================================================
-%% resolved
-%%
-%% Here the name clashes are resolved.
-%%=======================================================================================
-%% Vsn 3 of the protocol
-handle_cast({resolved, Node, Resolved, HisKnown, _HisKnown_v2, Names_ext, MyTag}, S) ->
-    ?FORMAT("~p #### 2 resolved ~p~n",[node(),{Node, Resolved, HisKnown, Names_ext}]),
-    Sync_tag_my = get({sync_tag_my, Node}),
-    PVsn =  get({prot_vsn, Node}),
-    case {MyTag, PVsn} of
-	{Sync_tag_my, undefined} ->
-		%% Patch for otp-2728, the connection to the Node is flipping up and down
-		%% the messages from the 'older' sync tries can disturb the 'new' sync try
-		%% therefor all messages are discarded if the protocol vsn is not defined.
-		Txt = lists:flatten(io_lib:format(
-				      "undefined global protocol version Node: ~p",[Node])),
-		error_logger:info_report(Txt),
-		{noreply, S};
-	{Sync_tag_my, _} ->
-	    NewS = resolved(Node, Resolved, {HisKnown, HisKnown}, Names_ext, S),
-	    {noreply, NewS};
-	_ ->
-	    %% Illegal tag, delete the locker.
-	    erase({wait_lock, Node}),
-	    NewS = cancel_locker(Node, S),
-	    {noreply, NewS}
-    end;
-
-
-
-
-
-
-%%=======================================================================================
-%% new_nodes
-%%
-%% We get to know the other node's known nodes.
-%%=======================================================================================
-%% Vsn 2 and 3 of the protocol
-handle_cast({new_nodes, _Node, Ops, Names_ext, Nodes, _Nodes_v2}, S) ->
-    ?P2({new_nodes, node(), Nodes}),
-    ?FORMAT("~p #### 2 new_nodes  ~p~n",[node(),{Ops, Names_ext, Nodes}]),
-    NewS = new_nodes(Ops, Names_ext, Nodes, S),
-    {noreply, NewS};
-
-
-
-
-%%=======================================================================================
-%% in_sync
-%%
-%% We are in sync with this node (from the other node's known world).
-%%=======================================================================================
-handle_cast({in_sync, Node, IsKnown}, S) ->
-    ?FORMAT("~p #### in_sync  ~p~n",[node(),{Node, IsKnown}]),
-    lists:foreach(fun(Pid) -> Pid ! {synced, [Node]} end, S#state.syncers),
-    %% moved up:
-    NewS = cancel_locker(Node, S),
-    erase({wait_lock, Node}),
-    erase({pre_connect, Node}),
-    erase({sync_tag_my, Node}),
-    erase({sync_tag_his, Node}),
-    NKnown = case lists:member(Node, Known = NewS#state.known) of
-		 false when IsKnown == true ->
-		     gen_server:cast({global_name_server, Node},
-				     {in_sync, node(), false}),
-		     [Node | Known];
-		 _ ->
-		     Known
-	     end,
-    NSynced = case lists:member(Node, Synced = NewS#state.synced) of
-		  true -> Synced;
-		  false -> [Node | Synced]
-	      end,
-    {noreply, NewS#state{known = NKnown, synced = NSynced}};
-
-
-
-
-%% Called when Pid on other node crashed
-handle_cast({async_del_name, Name, Pid}, S) ->
-    ?P2({async_del_name, node(), Name, Pid, node(Pid)}),
-    case ets:lookup(global_names, Name) of
-	[{Name, Pid, _}] ->
-	    ets:delete(global_names, Name),
-	    dounlink(Pid);
-	_ -> ok
-    end,
-    ets:delete(global_names_ext, Name),
-    {noreply, S};
-
-handle_cast({async_del_lock, _ResourceId, Pid}, S) ->
-    del_locks2(ets:tab2list(global_locks), Pid),
-%    ets:match_delete(global_locks, {ResourceId, '_', Pid}),
-    {noreply, S}.
-
-
-handle_info({'EXIT', Deleter, _Reason}=Exit, #state{the_deleter=Deleter}=S) ->
-    {stop, {deleter_died,Exit}, S#state{the_deleter=undefined}};
-handle_info({'EXIT', Pid, _Reason}, #state{the_deleter=Deleter}=S) 
-  when pid(Pid) ->
-    ?P2({global, exit, node(), Pid, node(Pid)}),
-    check_exit(Deleter, Pid),
-    Syncers = lists:delete(Pid, S#state.syncers),
-    Lockers = lists:keydelete(Pid, 2, S#state.lockers),
-    ?PRINT({exit, Pid, lockers, node(), S#state.lockers}),
-    {noreply, S#state{syncers = Syncers, lockers = Lockers}};
-
-handle_info({nodedown, Node}, S) when Node == S#state.node_name ->
-    %% Somebody stopped the distribution dynamically - change
-    %% references to old node name (Node) to new node name ('nonode@nohost')
-    {noreply, change_our_node_name(node(), S)};
-
-handle_info({nodedown, Node}, S) ->
-    ?FORMAT("~p #### nodedown 1 ####### Node ~p",[node(),Node]),
-    %% moved up:
-    do_node_down(Node),
-    #state{known = Known, synced = Syncs} = S,
-    NewS = cancel_locker(Node, S),
-
-    erase({wait_lock, Node}),
-    erase({save_ops, Node}),
-    erase({pre_connect, Node}),
-    erase({prot_vsn, Node}),
-    erase({sync_tag_my, Node}),
-    erase({sync_tag_his, Node}),
-    {noreply, NewS#state{known = lists:delete(Node, Known),
-			 synced = lists:delete(Node, Syncs)}};
-
-
-
-handle_info({nodeup, Node}, S) when Node == node() ->
-    ?FORMAT("~p ####  nodeup S ####### Node ~p~n",[node(), Node]),
-    %% Somebody started the distribution dynamically - change
-    %% references to old node name ('nonode@nohost') to Node.
-    {noreply, change_our_node_name(Node, S)};
-
-handle_info({nodeup, Node}, S) when S#state.connect_all == true ->
-    ?FORMAT("~p #### nodeup 1 ####### Node ~p",[node(),Node]),
-    IsKnown = lists:member(Node, S#state.known) or
-              %% This one is only for double nodeups (shouldn't occur!)
-              lists:keymember(Node, 1, S#state.lockers),
-    case IsKnown of
-	true ->
-	    {noreply, S};
-	false ->
-	    %% now() is used as a tag to separate different sycnh sessions
-	    %% from each others. Global could be confused at bursty nodeups
-	    %% because it couldn't separate the messages between the different
-	    %% synch sessions started by a nodeup.
-	    MyTag = now(),
-	    resend_pre_connect(Node),
-
-	    %% multi
-	    S#state.the_locker ! {nodeup, Node, S#state.known, MyTag, self()},
-
-	    Pid = start_locker(Node, S#state.known, MyTag, self(), S#state.the_locker),
-	    Ls = S#state.lockers,
-	    InitC = {init_connect, {?vsn, MyTag}, node(), {locker, Pid, S#state.known}},
-	    ?P2({putting, MyTag}),
-	    put({sync_tag_my, Node}, MyTag),
-	    gen_server:cast({global_name_server, Node}, InitC),
-	    {noreply, S#state{lockers = [{Node, Pid} | Ls]}}
-    end;
-
-
-%% This message is only to test otp-2766 Global may be confused at bursty
-%% nodeup/nodedowns. It's a copy of the complex part of the handling of
-%% the 'nodeup' message.
-handle_info({test_vsn_tag_nodeup, Node}, S) when S#state.connect_all == true,
-						 Node == node() ->
-    {noreply, S};
-handle_info({test_vsn_tag_nodeup, Node}, S) when S#state.connect_all == true ->
-    ?FORMAT("~p #### test_nodeup 1 ####### Node ~p~n",[node(), Node]),
-    MyTag = now(),
-    resend_pre_connect(Node),
-    S#state.the_locker ! {nodeup, Node, S#state.known, MyTag, self()},
-    Pid = start_locker(Node, S#state.known, MyTag, self(), S#state.the_locker),
-    Ls = S#state.lockers,
-    InitC = {init_connect, {?vsn, MyTag}, node(), {locker, Pid, S#state.known}},
-    put({sync_tag_my, Node}, MyTag),
-    gen_server:cast({global_name_server, Node}, InitC),
-    ?PRINT({lockers, node(), Ls}),
-    {noreply, S#state{lockers = [{Node, Pid} | Ls]}};
-
-
-handle_info({whereis, Name, From}, S) ->
-    do_whereis(Name, From),
-    {noreply, S};
-
-handle_info(known, S) ->
-    io:format(">>>> ~p~n",[S#state.known]),
-    {noreply, S};
-
-handle_info(_, S) ->
-    {noreply, S}.
-
-
-
-
-%%=======================================================================================
-%%=======================================================================================
-%%=============================== Internal Functions ====================================
-%%=======================================================================================
-%%=======================================================================================
-
-
-
-%%=======================================================================================
-%% Another node wants to synchronize its registered names with us.
-%% Start a locker process. Both nodes must have a lock before they are
-%% allowed to continue.
-%%=======================================================================================
-init_connect(Vsn, Node, InitMsg, HisTag, Lockers, S) ->
-    ?P2({init_connect, node(), Node}),
-    ?FORMAT("~p #### init_connect  Vsn, Node, InitMsg ~p~n",[node(),{Vsn, Node, InitMsg}]),
-    %% It is always the responsibility of newer versions to understand
-    %% older versions of the protocol.
-    put({prot_vsn, Node}, Vsn),
-    put({sync_tag_his, Node}, HisTag),
-    if
-	Vsn =< 3 ->
-	    case lists:keysearch(Node, 1, Lockers) of
-		{value, {_Node, MyLocker}} ->
-		    %% We both have lockers; let them set the lock
-		    case InitMsg of
-			{locker, HisLocker, HisKnown} -> %% current version
-			    ?PRINT({init_connect1, node(), self(), Node,
-				    MyLocker, HisLocker}),
-			    MyLocker ! {his_locker, HisLocker, HisKnown};
-			
-			{locker, _HisLocker, HisKnown, HisTheLocker} -> %% multi
-			    ?PRINT({init_connect1, node(), self(), Node,
-				    MyLocker, _HisLocker}),
-			    S#state.the_locker ! {his_the_locker, HisTheLocker,
-						  HisKnown, S#state.known}
-		    end;
-		false ->
-		    ?PRINT({init_connect11, node(), self(), Node}),
-		    put({pre_connect, Node}, {Vsn, InitMsg, HisTag})
-	    end;
-	true ->					% Vsn > 3
-	    ?P2(vsn4),
-	    case lists:keysearch(Node, 1, Lockers) of
-		{value, {_Node, _MyLocker}} ->
-		    %% We both have lockers; let them set the lock
-		    case InitMsg of
-			{locker, HisLocker, HisKnown} -> %% current version
-			    ?PRINT({init_connect1, node(), self(), Node,
-				    _MyLocker, HisLocker}),
-			    HisLocker ! {his_locker_new, S#state.the_locker,
-					 {HisKnown, S#state.known}};
-			
-			{locker, _HisLocker, HisKnown, HisTheLocker} -> %% multi
-			    ?PRINT({init_connect1, node(), self(), Node,
-				    _MyLocker, _HisLocker}),
-			    S#state.the_locker ! {his_the_locker, HisTheLocker,
-						  HisKnown, S#state.known}
-		    end;
-		false ->
-		    ?PRINT({init_connect11, node(), self(), Node}),
-		    put({pre_connect, Node}, {Vsn, InitMsg, HisTag})
-	    end
-    end.
-
-
-
-%%=======================================================================================
-%% In the simple case, we'll get lock_is_set before we get exchange,
-%% but we may get exchange before we get lock_is_set from our locker.
-%% If that's the case, we'll have to remember the exchange info, and
-%% handle it when we get the lock_is_set.  We do this by using the
-%% process dictionary - when the lock_is_set msg is received, we store
-%% this info.  When exchange is received, we can check the dictionary
-%% if the lock_is_set has been received.  If not, we store info about
-%% the exchange instead.  In the lock_is_set we must first check if
-%% exchange info is stored, in that case we take care of it.
-%%=======================================================================================
-lock_is_set(Node, Known) ->
-    ?FORMAT("~p ####  lock_is_set ~p~n",[node(),{Node, Node, Known}]),
-    PVsn = get({prot_vsn, Node}),
-    case PVsn of
-	_ ->					% 3 and higher
-	    gen_server:cast({global_name_server, Node},
-			    {exchange, node(), get_names(), get_names_ext(),
-			     get({sync_tag_his, Node})})
-    end,
-    %% If both have the lock, continue with exchange
-    case get({wait_lock, Node}) of
-	{exchange, NameList, NameExtList} ->
-	    %% vsn 2, 3
-	    put({wait_lock, Node}, lock_is_set),
-	    exchange(PVsn, Node, {NameList, NameExtList}, Known);
-	undefined ->
-	    put({wait_lock, Node}, lock_is_set)
-    end.
-
-
-
-%%=======================================================================================
-%% exchange
-%%=======================================================================================
-%% Vsn 3 and higher of the protocol
-exchange(_Vsn, Node, {NameList, NameExtList}, Known) ->
-    ?FORMAT("~p #### 3 lock_is_set  exchange ~p~n",[node(),{Node, NameList, NameExtList}]),
-    case erase({wait_lock, Node}) of
-	lock_is_set ->
-	    {Ops, Resolved} = exchange_names(NameList, Node, [], []),
-	    put({save_ops, Node}, Ops),
-	    gen_server:cast({global_name_server, Node},
-			    {resolved, node(), Resolved, Known,
-			     Known, get_names_ext(), get({sync_tag_his, Node})});
-	undefined ->
-	    put({wait_lock, Node}, {exchange, NameList, NameExtList})
-    end.
-
-
-
-
-
-resolved(Node, Resolved, {HisKnown, _HisKnown_v2}, Names_ext, S) ->
-    ?P2({resolved, node(), Node, S#state.known}),
-    ?FORMAT("~p #### 2 resolved ~p~n",[node(),{Node, Resolved, HisKnown, Names_ext}]),
-    erase({prot_vsn, Node}),
-    Ops = erase({save_ops, Node}) ++ Resolved,
-    Known = S#state.known,
-    Synced = S#state.synced,
-    NewNodes = [Node | HisKnown],
-    do_ops(Ops),
-    do_ops_ext(Ops,Names_ext),
-    gen_server:abcast(Known, global_name_server,
-		      {new_nodes, node(), Ops, Names_ext, NewNodes, NewNodes}),
-    %% I am synced with Node, but not with HisKnown yet
-    lists:foreach(fun(Pid) -> Pid ! {synced, [Node]} end, S#state.syncers),
-    gen_server:abcast(HisKnown, global_name_server, {in_sync, node(), true}),
-    NewS = lists:foldl(fun(Node1, S1) -> cancel_locker(Node1, S1) end,
-		       S,
-		       NewNodes),
-    %% See (*) below... we're node b in that description
-    NewKnown = Known ++ (NewNodes -- Known),
-    NewS#state{known = NewKnown, synced = [Node | Synced]}.
-
-
-
-
-new_nodes(Ops, Names_ext, Nodes, S) ->
-    ?FORMAT("~p #### 2 new_nodes  ~p~n",[node(),{Ops, Names_ext, Nodes}]),
-    do_ops(Ops),
-    do_ops_ext(Ops,Names_ext),
-    Known = S#state.known,
-    %% (*) This one requires some thought...
-    %% We're node a, other nodes b and c:
-    %% The problem is that {in_sync, a} may arrive before {resolved, [a]} to
-    %% b from c, leading to b sending {new_nodes, [a]} to us (node a).
-    %% Therefore, we make sure we never get duplicates in Known.
-    NewNodes = lists:delete(node(), Nodes -- Known),
-    gen_server:abcast(NewNodes, global_name_server, {in_sync, node(), true}),
-    S#state{known = Known ++ NewNodes}.
-
-
-
-
-
-do_whereis(Name, From) ->
-    case is_lock_set(global) of
-	false ->
-	    gen_server:reply(From, where(Name));
-	true ->
-	    send_again({whereis, Name, From})
-    end.
-
-terminate(_Reason, _S) ->
-    ets:delete(global_names),
-    ets:delete(global_names_ext),
-    ets:delete(global_locks).
-
-code_change(_OldVsn, S, _Extra) ->
-    {ok, S}.
-
-%% Resend init_connect to ourselves.
-resend_pre_connect(Node) ->
-    case erase({pre_connect, Node}) of
-%	{Vsn, InitMsg, undef} ->
-%	    %% Vsn 1 & 2
-%	    ?PRINT({resend_pre_connect2, node(), self(), Node}),
-%	    gen_server:cast(self(), {init_connect, Vsn, Node, InitMsg});
-	{Vsn, InitMsg, HisTag} ->
-	    %% Vsn 3
-	    ?PRINT({resend_pre_connect3, node(), self(), Node}),
-	    gen_server:cast(self(), {init_connect, {Vsn, HisTag}, Node, InitMsg});
-	_ ->
-	    ?PRINT({resend_pre_connect0, node(), self(), Node}),
-	    ok
-    end.
-
-ins_name(Name, Pid, Method) ->
-    case ets:lookup(global_names, Name) of
-	[{Name, Pid2, _}] ->
-	    dounlink(Pid2);
-	[] ->
-	    ok
-    end,
-    dolink(Pid),
-    ets:insert(global_names, {Name, Pid, Method}).
-
-ins_name_ext(Name, Pid, RegNode) ->
-    case ets:lookup(global_names_ext, Name) of
-	[{Name, Pid2, _}] ->
-	    dounlink(Pid2);
-	[] ->
-	    ok
-    end,
-    dolink_ext(Pid, RegNode),
-    ets:insert(global_names_ext, {Name, Pid, RegNode}).
-
-where(Name) ->
-    case ets:lookup(global_names, Name) of
-	[{_, Pid, _}] -> Pid;
-	[] -> undefined
-    end.
-
-handle_set_lock({ResourceId, LockRequesterId}, Pid) ->
-    case ets:lookup(global_locks, ResourceId) of
-	[{ResourceId, LockRequesterId, Pids}] ->
-	    case lists:member(Pid, Pids) of
-		true ->
-		    true;
-		false ->
-		    dolink(Pid),
-		    ets:insert(global_locks, {ResourceId, LockRequesterId, [Pid | Pids]}),
-		    true
-	    end;
-	[{ResourceId, _LockRequesterId2, _Pid2}] ->
-	    case ResourceId of
-		global ->
-		    ?P({before,
-			LockRequesterId,
-			_LockRequesterId2,
-			S#state.lockers}),
-		    false;
-		_ ->
-		    false
-	    end;
-	[] ->
-	    dolink(Pid),
-	    ets:insert(global_locks, {ResourceId, LockRequesterId, [Pid]}),
-	    true
-    end.
-
-is_lock_set(ResourceId) ->
-    case ets:lookup(global_locks, ResourceId) of
-	[_Lock] -> true;
-	[] -> false
-    end.
-
-handle_del_lock({ResourceId, LockRequesterId}, Pid) ->
-    case ets:lookup(global_locks, ResourceId) of
-	[{ResourceId, LockRequesterId, Pids}] when [Pid] == Pids ->
-	    ets:delete(global_locks, ResourceId),
-	    dounlink(Pid);
-	[{ResourceId, LockRequesterId, Pids}] ->
-	    NewPids = lists:delete(Pid, Pids),
-	    ets:insert(global_locks, {ResourceId, LockRequesterId, NewPids}),
-	    dounlink(Pid);
-	_ -> ok
-    end.
-
-do_ops(Ops) ->
-    lists:foreach(fun({insert, Item}) -> ets:insert(global_names, Item);
-		     ({delete, Name}) ->
-			  case ets:lookup(global_names, Name) of
-			      [{Name, Pid, _}] ->
-    ?P2({do_ops_delete, node(), Name, Pid, node(Pid)}),
-				  ets:delete(global_names, Name),
-				  dounlink(Pid);
-			      [] ->
-				  ok
-			  end
-		  end, Ops).
-
-%% If a new name, then it must be checked if it is an external name
-%% If delete a name it is always deleted from global_names_ext
-do_ops_ext(Ops, Names_ext) ->
-    lists:foreach(fun({insert, {Name, Pid, _Method}}) ->
-			  case lists:keysearch(Name, 1, Names_ext) of
-			      {value, {Name, Pid, RegNode}} ->
-				  ets:insert(global_names_ext, {Name, Pid, RegNode});
-			      _ ->
-				  ok
-			  end;
-		     ({delete, Name}) ->
-			  ets:delete(global_names_ext, Name)
-		  end, Ops).
-
-%%-----------------------------------------------------------------
-%% A locker is a process spawned by global_name_server when a
-%% nodeup is received from a new node.  Its purpose is to try to
-%% set a lock in our partition, i.e. on all nodes known to us.
-%% When the lock is set, it tells global about it, and keeps
-%% the lock set.  global sends a cancel message to the locker when
-%% the partitions are connected.
-
-%% Versions: at version 2, the messages exchanged between the lockers
-%% include the known nodes (see OTP-3576). There is no way of knowing
-%% the version number of the other side's locker when sending a message
-%% to it, so we send both version 1 and 2, and flush the version 1 if
-%% we receive version 2.
-%%
-%% Due to a mistake, an intermediate version of the new locking protocol
-%% (using 3-tuples) went out in R7, which only understands itself. This patch
-%% to R7 handles all kinds, which means sending all, and flush the ones we
-%% don't want. (It will remain difficult to make a future version of the
-%% protocol communicate with this one.)
-%%
-%%-----------------------------------------------------------------
-%% (Version 2 in patched R7. No named version in R6 and older - let's call that
-%% version 1.)
--define(locker_vsn, 2).
-
-%%% multi
-
--record(multi, {known, others = []}).
-
-start_the_locker(Global) ->
-    spawn_link(?MODULE, init_the_locker, [Global]).
-
-%init_the_locker(Global) ->
-%    ok;
-init_the_locker(Global) ->
-    process_flag(trap_exit, true),		%needed?
-    loop_the_locker(Global, #multi{}),
-    erlang:error(locker_exited).
-
-remove_node(_Node, []) ->
-    [];
-remove_node(Node, [{Node, _HisTheLocker, _HisKnown, _MyTag} | Rest]) ->
-    Rest;
-remove_node(Node, [E | Rest]) ->
-    [E | remove_node(Node, Rest)].
-
-find_node_tag(_Node, []) ->
-    false;
-find_node_tag(Node, [{Node, _HisTheLocker, _HisKnown, MyTag} | _Rest]) ->
-    {true, MyTag};
-find_node_tag(Node, [_E | Rest]) ->
-    find_node_tag(Node, Rest).
-
-loop_the_locker(Global, S) ->
-    ?P2({others, node(), S#multi.others}),
-%    Known = S#multi.known,
-    Timeout = case S#multi.others of
-		  [] ->
-		      infinity;
-		  _ ->
-		      0
-	      end,
-    receive
-%	{nodeup, Node, Known, Tag, P} ->
-%	    ?P2({the_locker, nodeup, time(), node(), nodeup, Node, Tag}),
-%	    loop_the_locker(Global, S);
-	{his_the_locker, HisTheLocker, HisKnown, MyKnown} ->
-	    ?P2({his_the_locker, time(), node(), HisTheLocker,
-			    node(HisTheLocker)}),
-	    receive
-		{nodeup, Node, _Known, MyTag, _P} when node(HisTheLocker) == Node ->
-		    ?P2({the_locker, nodeup, node(), Node,
-				    node(HisTheLocker), MyTag,
-				    process_info(self(), messages)}),
-		    Others = S#multi.others,
-		    loop_the_locker(Global,
-				    S#multi{known=MyKnown,
-					    others=[{node(HisTheLocker), HisTheLocker, HisKnown, MyTag} | Others]});
-		{cancel, Node, _Tag} when node(HisTheLocker) == Node ->
-		    loop_the_locker(Global, S)
-	    after 60000 ->
-		    ?P2({nodeupnevercame, node(), node(HisTheLocker)}),
-		    error_logger:error_msg("global: nodeup never came ~w ~w~n",
-					   [node(), node(HisTheLocker)]),
-		    loop_the_locker(Global, S)
-	    end;
-	{cancel, Node, undefined} ->
-	    ?P2({the_locker, cancel1, undefined, node(), Node}),
-%% If we actually cancel something when a cancel message with the tag
-%% 'undefined' arrives, we may be acting on an old nodedown, to cancel
-%% a new nodeup, so we can't do that.
-%	    receive
-%		{nodeup, Node, _Known, _MyTag, _P} ->
-%		    ?P2({the_locker, cancelnodeup1, node(), Node}),
-%		    ok
-%	    after 0 ->
-%		    ok
-%	    end,
-%	    Others = remove_node(Node, S#multi.others),
-%	    loop_the_locker(Global, S#multi{others = Others});
-	    loop_the_locker(Global, S);
-	{cancel, Node, Tag} ->
-	    ?P2({the_locker, cancel1, Tag, node(), Node}),
-	    receive
-		{nodeup, Node, _Known, Tag, _P} ->
-		    ?P2({the_locker, cancelnodeup2, node(), Node}),
-		    ok
-	    after 0 ->
-		    ok
-	    end,
-	    Others = remove_node(Node, S#multi.others),
-	    loop_the_locker(Global, S#multi{others = Others});
-	{lock_set, _Pid, false, _} ->
-	    ?P2({the_locker, spurious, node(), node(_Pid)}),
-	    loop_the_locker(Global, S);
-	{lock_set, Pid, true, HisKnown} ->
-	    Node = node(Pid),
-	    ?P2({the_locker, spontaneous, node(), Node}),
-
-	    NewKnown = gen_server:call(global_name_server, get_known),
-
-	    Others = 
-		case find_node_tag(Node, S#multi.others) of
-		    {true, MyTag} ->
-
-			BothsKnown = HisKnown -- (HisKnown -- NewKnown),
-			Known1 = if
-				     node() < Node ->
-					 [node() | NewKnown];
-				     true ->
-					 [node() | NewKnown] -- BothsKnown
-				 end,
-
-			?P2({lock1, node()}),
-			LockId = {global, self()},
-			IsLockSet = set_lock(LockId, Known1, 1),
-			Pid ! {lock_set, self(), IsLockSet, NewKnown},
-			?P2({the_locker, spontaneous, node(), Node, IsLockSet}),
-			case IsLockSet of
-			    true ->
-				gen_server:cast(global_name_server, 
-						{lock_is_set, Node, MyTag}),
-				?P1({lock_sync_done, time(), node(), 
-				    {Pid, node(Pid)}, self()}),
-				%% Wait for global to tell us to remove lock.
-				receive
-				    {cancel, Node, _Tag} ->
-					%% All conflicts are resolved, 
-					%% remove lock.
-					?PRINT({node(), self(), locked1}),
-					del_lock(LockId, Known1);
-				    {'EXIT', Pid, _} ->
-					?PRINT({node(), self(), locked2}),
-					%% Other node died; 
-					%% remove lock and ignore him.
-					del_lock(LockId, Known1),
-					link(Global)
-				end,
-				remove_node(Node, S#multi.others);
-			    false ->
-				S#multi.others
-			end;
-		    false ->
-			?P2({the_locker, spontaneous, node(), Node, not_there}),
-			Pid ! {lock_set, self(), false, NewKnown},
-			S#multi.others
-		end,
-	    loop_the_locker(Global, S#multi{others = Others});
-	Other when element(1, Other) /= nodeup ->
-	    ?P2({the_locker, other_msg, Other}),
-	    loop_the_locker(Global, S)
-    after Timeout ->
-	    NewKnown = gen_server:call(global_name_server, get_known),
-	    [{Node, HisTheLocker, HisKnown, MyTag} | Rest] = S#multi.others,
-	    BothsKnown = HisKnown -- (HisKnown -- NewKnown),
-	    Known1 = if
-			 node() < Node ->
-			     [node() | NewKnown];
-			 true ->
-			     [node() | NewKnown] -- BothsKnown
-		     end,
-	    ?P2({picking, node(), Node}),
-	    case lists:member(Node, NewKnown) of
-		false ->
-		    LockId = {global, self()},
-		    ?P2({lock2, node()}),
-		    IsLockSet = set_lock(LockId, Known1, 1),
-		    Others = 
-			case IsLockSet of
-			    true ->
-				HisTheLocker ! {lock_set, self(), 
-						IsLockSet, NewKnown},
-				%% OTP-4902
-				lock_set_loop(Global, S,
-					      Node, MyTag, Rest,
-					      Known1,
-					      LockId);
-			    false ->
-				?P2({the_locker, not_locked, node(),
-				    Node}),
-				S#multi.others
-			end,
-		    loop_the_locker(Global, S#multi{known=NewKnown,
-						    others = Others});
-		true ->
-		    ?P2({is_known, node(), Node}),
-		    loop_the_locker(Global, S#multi{known=NewKnown,
-						    others = Rest})
-	    end
-    end.
-
-lock_set_loop(Global, S, Node, MyTag, Rest, Known1, LockId) ->
-    receive
-	{lock_set, P, true, _} when node(P) == Node ->
-	    ?P2({the_locker, both_set, node(), Node}),
-
-	    %% do sync
-	    gen_server:cast(global_name_server, {lock_is_set, Node, MyTag}),
-	    ?P1({lock_sync_done, time(), node(), {Pid, node(Pid)}, self()}),
-
-	    %% Wait for global to tell us to remove lock.
-	    receive
-		{cancel, Node, _} ->
-		    %% All conflicts are resolved, remove lock.
-		    ?PRINT({node(), self(), locked1}),
-		    del_lock(LockId, Known1);
-		{'EXIT', _Pid, _} ->
-		    ?PRINT({node(), self(), locked2}),
-		    %% Other node died; remove lock and ignore him.
-		    del_lock(LockId, Known1),
-		    link(Global)
-	    end,
-	    Rest;
-	{lock_set, P, false, _} when node(P) == Node ->
-	    ?P2({the_locker, not_both_set, node(), Node}),
-	    del_lock(LockId, Known1),
-	    S#multi.others;
-	{cancel, Node, _} ->
-	    ?P2({the_locker, cancel2, node(), Node}),
-	    del_lock(LockId, Known1),
-	    remove_node(Node, S#multi.others);
-	{'EXIT', _, _} ->
-	    ?P2({the_locker, exit, node(), Node}),
-	    del_lock(LockId, Known1),
-	    S#multi.others
-
-    after
-	%% OTP-4902
-	%% A cyclic deadlock could occur in rare cases where three or
-	%% more nodes waited for a reply from each other.
-	%% Therefore, reject lock_set attempts in this state from
-	%% nodes < this node (its enough if at least one node in
-	%% the cycle rejects and thus breaks the deadlock)
-	5000 ->
-	    reject_lock_set(),
-	    lock_set_loop(Global, S, Node, MyTag, Rest, Known1, LockId)
-    end.
-
-reject_lock_set() ->
-    receive
-	{lock_set, P, true, _} when node(P) < node() ->
-	    P ! {lock_set, self(), false, []},
-	    reject_lock_set()
-    after
-	0 ->
-	    true
-    end.
-
-start_locker(Node, Known, MyTag, Global, TheLocker) ->
-    %% No link here!  The del_lock call would delete the link anyway.
-    %% global_name_server has control of these processes anyway...
-    %% When the locker process exits due to being sent the 'cancel' message
-    %% by the server, the server then removes it from its tables.
-    %% When the locker terminates due to other reasons, the server must
-    %% be told, so we make a link to it just before exiting.
-    spawn(?MODULE, init_locker, [Node, Known, MyTag, Global, TheLocker]).
-
-init_locker(Node, Known, MyTag, Global, TheLocker) ->
-    process_flag(trap_exit, true),
-    ?PRINT({init_locker, node(), self(), Node}),
-    ?P1({init_locker, time(), node(), self(), Node}),
-    receive
-	{his_locker, Pid, HisKnown} ->
-	    ?PRINT({init_locker, node(), self(), his_locker, Node}),
-	    link(Pid),
-	    %% If two nodes in a group of nodes first disconnect
-	    %% and then reconnect, this causes global to deadlock.
-	    %% This because both of the reconnecting nodes
-	    %% tries to set lock on the other nodes in the group.
-	    %% This is solved by letting only one of the reconneting nodes set the lock.
-	    BothsKnown = HisKnown -- (HisKnown -- Known),
-	    ?P({loop_locker1, node(), {Pid, node(Pid)}}),
-	    Res = loop_locker(Node, Pid, Known, 1, MyTag, BothsKnown, Global),
-	    ?P({loop_locker2, node(), {Pid, node(Pid)}}),
-	    Res;
-	{his_locker_new, HisTheLocker, {Known1, Known2}} ->
-	    %% slide into the vsn 4 stuff
-	    ?P2({his_locker_new, node()}),
-	    HisTheLocker ! {his_the_locker, TheLocker, Known1, Known2},
-	    exit(normal);
-	cancel ->
-	    ?PRINT({init_locker, node(), self(), cancel, Node}),
-	    exit(normal)
-    end.
-
-loop_locker(Node, Pid, Known0, Try, MyTag, BothsKnown, Global) ->
-    Known = if
-		node() < Node ->
-		    [node() | Known0];
-		true ->
-		    [node() | Known0] -- BothsKnown
-    end,
-
-    ?PRINT({locking, node(), self(), Known}),
-    LockId = {global, self()},
-    ?P2({lock3, node()}),
-    IsLockSet = set_lock(LockId, Known, 1),
-    ?P({loop_locker, IsLockSet,
-	node(), {Pid, node(Pid)}, self(), Try}),
-    ?P1({loop_locker, time(), IsLockSet,
-	 node(), {Pid, node(Pid)}, self(), Try}),
-    ?PRINT({locking1, node(), self(), Known, IsLockSet}),
-    %% Tell other node that we managed to get the lock.
-    Pid ! {lock, ?locker_vsn, IsLockSet, Known},
-    Pid ! {lock, IsLockSet, Known},
-    Pid ! {lock, IsLockSet},
-    %% Wait for other node's result.
-    receive
-	%% R7 patched and later
-	{lock, _LockerVsn, true, _} when IsLockSet == true ->
-	    receive
-		{lock, _} ->
-		    ok
-	    end,
-	    receive
-		{lock, _, _} ->
-		    ok
-	    end,
-	    ?PRINT({node(), self(), locked}),
-	    %% Now we got the lock in both partitions.  Tell
-	    %% global, and let him resolve name conflict.
-	    ?P1({lock_sync, time(), node(), {Pid, node(Pid)}, self()}),
-	    gen_server:cast(global_name_server, {lock_is_set, Node, MyTag}),
-	    ?P1({lock_sync_done, time(), node(), {Pid, node(Pid)}, self()}),
-	    %% Wait for global to tell us to remove lock.
-	    receive
-		cancel ->
-		    %% All conflicts are resolved, remove lock.
-		    ?PRINT({node(), self(), locked1}),
-		    del_lock(LockId, Known);
-		{'EXIT', Pid, _} ->
-		    ?PRINT({node(), self(), locked2}),
-		    %% Other node died; remove lock and ignore him.
-		    del_lock(LockId, Known),
-		    link(Global)
-	    end;
-	{lock, _LockerVsn, _, HisKnown} ->
-	    receive
-		{lock, _} ->
-		    ok
-	    end,
-	    receive
-		{lock, _, _} ->
-		    ok
-	    end,
-	    %% Some of us failed to get the lock; try again
-	    ?PRINT({node(), self(), locked0}),
-	    d_lock(IsLockSet, LockId, Known),
-	    try_again_locker(Node, Pid, Try, MyTag, HisKnown, Global);
-	%% R7 unpatched
-	{lock, true, _} when IsLockSet == true ->
-	    ?PRINT({node(), self(), locked}),
-	    %% Now we got the lock in both partitions.  Tell
-	    %% global, and let him resolve name conflict.
-	    gen_server:cast(global_name_server, {lock_is_set, Node, MyTag}),
-	    %% Wait for global to tell us to remove lock.
-	    receive
-		cancel ->
-		    %% All conflicts are resolved, remove lock.
-		    ?PRINT({node(), self(), locked1}),
-		    del_lock(LockId, Known);
-		{'EXIT', Pid, _} ->
-		    ?PRINT({node(), self(), locked2}),
-		    %% Other node died; remove lock and ignore him.
-		    del_lock(LockId, Known),
-		    link(Global)
-	    end;
-	{lock, _, HisKnown} ->
-	    %% Some of us failed to get the lock; try again
-	    ?PRINT({node(), self(), locked0}),
-	    d_lock(IsLockSet, LockId, Known),
-	    try_again_locker(Node, Pid, Try, MyTag, HisKnown, Global);
-	%% R6 and earlier
-	{lock, true} when IsLockSet == true ->
-	    ?PRINT({node(), self(), locked}),
-	    %% Now we got the lock in both partitions.  Tell
-	    %% global, and let him resolve name conflict.
-	    gen_server:cast(global_name_server, {lock_is_set, Node, MyTag}),
-	    %% Wait for global to tell us to remove lock.
-	    receive
-		cancel ->
-		    %% All conflicts are resolved, remove lock.
-		    ?PRINT({node(), self(), locked1}),
-		    del_lock(LockId, Known);
-		{'EXIT', Pid, _} ->
-		    ?PRINT({node(), self(), locked2}),
-		    %% Other node died; remove lock and ignore him.
-		    del_lock(LockId, Known),
-		    link(Global)
-	    end;
-	{lock, _} ->
-	    %% Some of us failed to get the lock; try again
-	    ?PRINT({node(), self(), locked0}),
-	    d_lock(IsLockSet, LockId, Known),
-	    try_again_locker(Node, Pid, Try, MyTag, BothsKnown, Global);
-	{'EXIT', Pid, _} ->
-	    %% Other node died; remove lock and ignore him.
-	    ?PRINT({node(), self(), locked7}),
-	    d_lock(IsLockSet, LockId, Known),
-	    link(Global);
-	cancel ->
-	    ?PRINT({node(), self(), locked8}),
-	    d_lock(IsLockSet, LockId, Known)
-    end.
-
-d_lock(true, LockId, Known) -> del_lock(LockId, Known);
-d_lock(false, _, _) -> ok.
-
-try_again_locker(Node, Pid, Try, MyTag, HisKnown, Global) ->
-    ?PRINT({try_again, node(), self(), Node, Pid, Known, Try, MyTag}),
-    ?P1({try_again, time(), node(), self(), Node, Pid, Known, Try, MyTag}),
-    random_sleep(Try),
-    ?P1({try_again2, time(), node(), self(), Node, Pid, Known, Try, MyTag}),
-    NewKnown = gen_server:call(global_name_server, get_known),
-    case lists:member(Node, NewKnown) of
-	false ->
-	    BothsKnown1 = HisKnown -- (HisKnown -- NewKnown),
-	    ?PRINT({node(), self(), Node, again, notknown}),
-	    ?PRINT({bothknown, BothsKnown, BothsKnown1}),
-	    loop_locker(Node, Pid, NewKnown, Try+1, MyTag,
-			BothsKnown1, Global);
-	true ->
-	    ?PRINT({node(), self(), Node, again, known}),
-	    link(Global),
-	    %% Node is already handled, we are ready.
-	    ok
-    end.
-
-cancel_locker(Node, S) ->
-    %% multi
-    ?P2({cancel, node(), Node, get({sync_tag_my, Node})}),
-    S#state.the_locker ! {cancel, Node, get({sync_tag_my, Node})},
-
-    Lockers = S#state.lockers,
-    case lists:keysearch(Node, 1, Lockers) of
-	{value, {_, Pid}} ->
-	    Pid ! cancel,
-	    ?PRINT({cancel, Node, lockers, node(), Lockers}),
-	    S#state{lockers = lists:keydelete(Node, 1, Lockers)};
-	_ ->
-	    S
-    end.
-
-%% A node sent us his names. When a name clash is found, the resolve
-%% function is called from the smaller node => all resolve funcs are called
-%% from the same partition.
-exchange_names([{Name, Pid, Method} |Tail], Node, Ops, Res) ->
-    case ets:lookup(global_names, Name) of
-	[{Name, Pid, _}] ->
-	    exchange_names(Tail, Node, Ops, Res);
-	[{Name, Pid2, Method2}] when node() < Node ->
-	    %% Name clash!  Add the result of resolving to Res(olved).
-	    %% We know that node(Pid) /= node(), so we don't
-	    %% need to link/unlink to Pid.
-	    Node2 = node(Pid2), %%&&&&&& check external node???
-	    case rpc:call(Node2, ?MODULE, resolve_it,
-			  [Method2, Name, Pid, Pid2]) of
-		Pid ->
-		    dounlink(Pid2),
-		    ets:insert(global_names, {Name, Pid, Method}),
-		    Op = {insert, {Name, Pid, Method}},
-		    exchange_names(Tail, Node, [Op | Ops], [Op | Res]);
-		Pid2 ->
-		    Op = {insert, {Name, Pid2, Method2}},
-		    exchange_names(Tail, Node, Ops, [Op | Res]);
-		none ->
-		    dounlink(Pid2),
-		    ?P2({unregister, node(), Name, Pid2, node(Pid2)}),
-		    ets:delete(global_names, Name),
-		    Op = {delete, Name},
-		    exchange_names(Tail, Node, [Op | Ops], [Op | Res]);
-		{badrpc, Badrpc} ->
-		    error_logger:info_msg("global: badrpc ~w received when "
-					  "conflicting name ~w was found",
-					  [Badrpc, Name]),
-		    dounlink(Pid2),
-		    ets:insert(global_names, {Name, Pid, Method}),
-		    Op = {insert, {Name, Pid, Method}},
-		    exchange_names(Tail, Node, [Op | Ops], [Op | Res]);
-		Else ->
-		    error_logger:info_msg("global: Resolve method ~w for "
-					  "conflicting name ~w returned ~w~n",
-					  [Method, Name, Else]),
-		    dounlink(Pid2),
-		    ets:delete(global_names, Name),
-		    Op = {delete, Name},
-		    exchange_names(Tail, Node, [Op | Ops], [Op | Res])
-	    end;
-	[{Name, _Pid2, _}] ->
-	    %% The other node will solve the conflict.
-	    exchange_names(Tail, Node, Ops, Res);
-	_ ->
-	    %% Entirely new name.
-	    ets:insert(global_names, {Name, Pid, Method}),
-	    exchange_names(Tail, Node,
-			   [{insert, {Name, Pid, Method}} | Ops], Res)
-    end;
-exchange_names([], _, Ops, Res) ->
-    {Ops, Res}.
-
-resolve_it(Method, Name, Pid1, Pid2) ->
-    catch Method(Name, Pid1, Pid2).
-
-minmax(P1,P2) ->
-    if node(P1) < node(P2) -> {P1, P2}; true -> {P2, P1} end.
-
-random_exit_name(Name, Pid, Pid2) ->
-    {Min, Max} = minmax(Pid, Pid2),
-    error_logger:info_msg("global: Name conflict terminating ~w~n",
-			  [{Name, Max}]),
-    exit(Max, kill),
-    Min.
-
-random_notify_name(Name, Pid, Pid2) ->
-    {Min, Max} = minmax(Pid, Pid2),
-    Max ! {global_name_conflict, Name},
-    Min.
-
-notify_all_name(Name, Pid, Pid2) ->
-    Pid ! {global_name_conflict, Name, Pid2},
-    Pid2 ! {global_name_conflict, Name, Pid},
-    none.
-
-cnode(Name, Pid, Pid2) ->
-    {Min, Max} = minmax(Pid, Pid2),
-    error_logger:info_msg("global: Name conflict terminating ~w~n",
-			  [{Name, Max}]),
-    Max ! {global_name_conflict, Name},
-    Min.
-
-%% Only link to pids on our own node
-dolink(Pid) when node(Pid) == node() ->
-    link(Pid);
-dolink(_) -> ok.
-
-%% Only link to pids on our own node
-dolink_ext(Pid, RegNode) when RegNode == node() -> link(Pid);
-dolink_ext(_, _) -> ok.
-
-dounlink(Pid) when node(Pid) == node() ->
-    case ets:match(global_names, {'_', Pid, '_'}) of
-	[] ->
-	    case is_pid_used(Pid) of
-		false ->
-		    unlink(Pid);
-		true -> ok
-	    end;
-	_ -> ok
-    end;
-dounlink(_Pid) ->
-    ok.
-
-is_pid_used(Pid) ->
-    is_pid_used(ets:tab2list(global_locks), Pid).
-
-is_pid_used([], _Pid) ->
-    false;
-is_pid_used([{_ResourceId, _LockReqId, Pids} | Tail], Pid) ->
-    case lists:member(Pid, Pids) of
-	true ->
-	    true;
-	false ->
-	    is_pid_used(Tail, Pid)
-    end.
-
-
-
-%% check_exit/3 removes the Pid from affected tables.
-%% This function needs to abcast the thingie since only the local
-%% server is linked to the registered process (or the owner of the
-%% lock).  All the other servers rely on the nodedown mechanism.
-check_exit(Deleter, Pid) ->
-    del_names(Deleter, Pid, ets:tab2list(global_names)),
-    del_locks(ets:tab2list(global_locks), Pid).
-
-del_names(Deleter, Pid, [{Name, Pid, _Method} | Tail]) ->
-    %% First, delete the Pid from the local ets; then send to other nodes
-    ets:delete(global_names, Name),
-    ets:delete(global_names_ext, Name),
-    dounlink(Pid),
-    Deleter ! {delete_name,self(),Name,Pid},
-    del_names(Deleter, Pid, Tail);
-del_names(Deleter, Pid, [_|T]) ->
-    del_names(Deleter, Pid, T);
-del_names(_Deleter, _Pid, []) -> done.
-
-del_locks([{ResourceId, LockReqId, Pids} | Tail], Pid) ->
-    case {lists:member(Pid, Pids), Pids} of
-	{true, [Pid]} ->
-	    ets:delete(global_locks, ResourceId),
-	    gen_server:abcast(nodes(), global_name_server,
-			      {async_del_lock, ResourceId, Pid});
-	{true, _} ->
-	    NewPids = lists:delete(Pid, Pids),
-	    ets:insert(global_locks, {ResourceId, LockReqId, NewPids}),
-	    gen_server:abcast(nodes(), global_name_server,
-			      {async_del_lock, ResourceId, Pid});
-	_ ->
-	    continue
-    end,
-    del_locks(Tail, Pid);
-del_locks([], _Pid) -> done.
-
-del_locks2([{ResourceId, LockReqId, Pids} | Tail], Pid) ->
-    case {lists:member(Pid, Pids), Pids} of
-	{true, [Pid]} ->
-	    ets:delete(global_locks, ResourceId);
-	{true, _} ->
-	    NewPids = lists:delete(Pid, Pids),
-	    ets:insert(global_locks, {ResourceId, LockReqId, NewPids});
-	_ ->
-	    continue
-    end,
-    del_locks2(Tail, Pid);
-del_locks2([], _Pid) ->
-    done.
-
-
-
-%% Unregister all Name/Pid pairs such that node(Pid) == Node
-%% and delete all locks where node(Pid) == Node
-do_node_down(Node) ->
-    do_node_down_names(Node, ets:tab2list(global_names)),
-    do_node_down_names_ext(Node, ets:tab2list(global_names_ext)),
-    do_node_down_locks(Node, ets:tab2list(global_locks)).
-
-do_node_down_names(Node, [{Name, Pid, _Method} | T]) when node(Pid) == Node ->
-    ets:delete(global_names, Name),
-    do_node_down_names(Node, T);
-do_node_down_names(Node, [_|T]) ->
-    do_node_down_names(Node, T);
-do_node_down_names(_, []) -> ok.
-
-%%remove all external names registered on the crashed node
-do_node_down_names_ext(Node, [{Name, _Pid, Node} | T]) ->
-    ets:delete(global_names, Name),
-    ets:delete(global_names_ext, Name),
-    do_node_down_names_ext(Node, T);
-do_node_down_names_ext(Node, [_|T]) ->
-    do_node_down_names_ext(Node, T);
-do_node_down_names_ext(_, []) -> ok.
-
-do_node_down_locks(Node, [{ResourceId, LockReqId, Pids} | T]) ->
-    case do_node_down_locks2(Pids, Node) of
-	[] ->
-	    continue;
-	RemovePids ->
-	    case Pids -- RemovePids of
-		[] ->
-		    ets:delete(global_locks, ResourceId);
-		NewPids ->
-		    ets:insert(global_locks, {ResourceId, LockReqId, NewPids})
-	    end
-    end,
-    do_node_down_locks(Node, T);
-do_node_down_locks(Node, [_|T]) ->
-    do_node_down_locks(Node, T);
-do_node_down_locks(_, []) -> done.
-
-
-do_node_down_locks2(Pids, Node) ->
-    do_node_down_locks2(Pids, Node, []).
-
-do_node_down_locks2([], _Node, Res) ->
-    Res;
-do_node_down_locks2([Pid | Pids], Node, Res) when node(Pid) == Node ->
-    do_node_down_locks2(Pids, Node, [Pid | Res]);
-do_node_down_locks2([_ | Pids], Node, Res) ->
-    do_node_down_locks2(Pids, Node, Res).
-
-
-get_names() ->
-    ets:tab2list(global_names).
-
-get_names_ext() ->
-    ets:tab2list(global_names_ext).
-
-random_sleep(Times) ->
-    case (Times rem 10) of
-	0 -> erase(random_seed);
-	_ -> ok
-    end,
-    case get(random_seed) of
-	undefined ->
-	    {A1, A2, A3} = now(),
-	    random:seed(A1, A2, A3 + erlang:phash(node(), 100000));
-	_ -> ok
-    end,
-    %% First time 1/4 seconds, then doubling each time up to 8 seconds max.
-    Tmax = if Times > 5 -> 8000;
-	      true -> ((1 bsl Times) * 1000) div 8
-	   end,
-    T = random:uniform(Tmax),
-    ?P({random_sleep, node(), self(), Times, T}),
-    receive after T -> ok end.
-
-dec(infinity) -> infinity;
-dec(N) -> N-1.
-
-send_again(Msg) ->
-    spawn_link(?MODULE, timer, [self(), Msg]).
-
-timer(Pid, Msg) ->
-    random_sleep(5),
-    Pid ! Msg.
-
-change_our_node_name(NewNode, S) ->
-    S#state{node_name = NewNode}.
-
-
-%%-----------------------------------------------------------------
-%% Each sync process corresponds to one call to sync.  Each such
-%% process asks the global_name_server on all Nodes if it is in sync
-%% with Nodes.  If not, that (other) node spawns a syncer process that
-%% waits for global to get in sync with all Nodes.  When it is in
-%% sync, the syncer process tells the original sync process about it.
-%%-----------------------------------------------------------------
-start_sync(Nodes, From) ->
-    spawn_link(?MODULE, sync_init, [Nodes, From]).
-
-sync_init(Nodes, From) ->
-    lists:foreach(fun(Node) -> monitor_node(Node, true) end, Nodes),
-    sync_loop(Nodes, From).
-
-sync_loop([], From) ->
-    gen_server:reply(From, ok);
-sync_loop(Nodes, From) ->
-    receive
-	{nodedown, Node} ->
-	    monitor_node(Node, false),
-	    sync_loop(lists:delete(Node, Nodes), From);
-	{synced, SNodes} ->
-	    lists:foreach(fun(N) -> monitor_node(N, false) end, SNodes),
-	    sync_loop(Nodes -- SNodes, From)
-    end.
-
-
-%%%====================================================================================
-%%% Get the current global_groups definition
-%%%====================================================================================
-check_sync_nodes() ->
-    case get_own_nodes() of
-	{ok, all} ->
-	    nodes();
-	{ok, NodesNG} ->
-	    %% global_groups parameter is defined, we are not allowed to sync
-	    %% with nodes not in our own global group.
-	    (nodes() -- (nodes() -- NodesNG));
-	{error, Error} ->
-	    {error, Error}
-    end.
-
-check_sync_nodes(SyncNodes) ->
-    case get_own_nodes() of
-	{ok, all} ->
-	    SyncNodes;
-	{ok, NodesNG} ->
-	    %% global_groups parameter is defined, we are not allowed to sync
-	    %% with nodes not in our own global group.
-	    OwnNodeGroup = (nodes() -- (nodes() -- NodesNG)),
-	    IllegalSyncNodes = (SyncNodes -- [node() | OwnNodeGroup]),
-	    case IllegalSyncNodes of
-		[] -> SyncNodes;
-		_ -> {error, {"Trying to sync nodes not defined in the own global group",
-			      IllegalSyncNodes}}
-	    end;
-	{error, Error} ->
-	    {error, Error}
-    end.
-
-get_own_nodes() ->
-    case global_group:get_own_nodes_with_errors() of
-        {error, Error} ->
-            {error, {"global_groups definition error", Error}};
-        OkTup ->
-            OkTup
-    end.
-
-
-%%-----------------------------------------------------------------
-%% The deleter process is a satellite process to global_name_server
-%% that does background batch deleting of names when a process
-%% that had globally registered names dies. It is started by and 
-%% linked to global_name_server.
-%%-----------------------------------------------------------------
-
-start_the_deleter(Global) ->
-    spawn_link(
-      fun () -> 
-	      loop_the_deleter(Global)
-      end).
-
-loop_the_deleter(Global) ->
-    Deletions = collect_deletions(Global, []),
-    trans({global, self()},
-	  fun() ->
-		  lists:map(
-		    fun ({Name,Pid}) ->
-			    ?P2({delete_name2, Name, Pid, nodes()}),
-			    gen_server:abcast(nodes(), global_name_server,
-					      {async_del_name, Name, Pid})
-		    end, Deletions)
-	  end,
-	  nodes()),
-    loop_the_deleter(Global).
-
-collect_deletions(Global, Deletions) ->
-    receive
-	{delete_name,Global,Name,Pid} ->
-	    ?P2({delete_name, node(), self(), Name, Pid, nodes()}),
-	    collect_deletions(Global, [{Name,Pid}|Deletions]);
-	Other ->
-	    error_logger:error_msg("The global_name_server deleter process "
-				   "received an unexpected message:\n~p\n", 
-				   [Other]),
-	    collect_deletions(Global, Deletions)
-    after case Deletions of
-	      [] -> infinity;
-	      _  -> 0
-	  end ->
-	    lists:reverse(Deletions)
-    end.
diff --git a/lib/dialyzer/test/plt_SUITE.erl b/lib/dialyzer/test/plt_SUITE.erl
new file mode 100644
index 0000000000..aee9f449a6
--- /dev/null
+++ b/lib/dialyzer/test/plt_SUITE.erl
@@ -0,0 +1,21 @@
+%% This suite is the only hand made and simply
+%% checks if we can build a plt.
+
+-module(plt_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+-include("dialyzer_test_constants.hrl").
+
+-export([suite/0, all/0, build_plt/1]).
+
+suite() ->
+  [{timetrap, ?plt_timeout}].
+
+all() -> [build_plt].
+
+build_plt(Config) ->
+  OutDir = ?config(priv_dir, Config),
+  case dialyzer_common:check_plt(OutDir) of
+    ok   -> ok;
+    fail -> ct:fail(plt_build_fail)
+  end.
diff --git a/lib/dialyzer/test/plt_tests_SUITE.erl b/lib/dialyzer/test/plt_tests_SUITE.erl
deleted file mode 100644
index bf45020340..0000000000
--- a/lib/dialyzer/test/plt_tests_SUITE.erl
+++ /dev/null
@@ -1,21 +0,0 @@
-%% This suite is the only hand made and simply
-%% checks if we can build a plt.
-
--module(plt_tests_SUITE).
-
--include("ct.hrl").
--include("dialyzer_test_constants.hrl").
-
--export([suite/0, all/0, build_plt/1]).
-
-suite() ->
-  [{timetrap, ?plt_timeout}].
-
-all() -> [build_plt].
-
-build_plt(Config) ->
-  OutDir = ?config(priv_dir, Config),
-  case dialyzer_common:check_plt(OutDir) of
-    ok   -> ok;
-    fail -> ct:fail(plt_build_fail)
-  end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/dialyzer_options b/lib/dialyzer/test/r9c_SUITE_data/dialyzer_options
index e00e23bb66..e00e23bb66 100644
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/r9c_SUITE_data/dialyzer_options
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/results/asn1 b/lib/dialyzer/test/r9c_SUITE_data/results/asn1
index ac83366bc8..ac83366bc8 100644
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/results/asn1
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/asn1
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/results/inets b/lib/dialyzer/test/r9c_SUITE_data/results/inets
index fd5e36a3cd..fd5e36a3cd 100644
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/results/inets
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/inets
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/results/mnesia b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
index e199581a0e..e199581a0e 100644
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/results/mnesia
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/Makefile b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/Makefile
new file mode 100644
index 0000000000..9dba643327
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/Makefile
@@ -0,0 +1,142 @@
+#
+# Copyright (C) 1997, Ericsson Telecommunications
+# Author: Kenneth Lundin
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+VSN=$(ASN1_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/asn1-$(VSN)
+
+
+
+
+#
+# Common Macros
+#
+# PARSER_SRC = \
+#	asn1ct_parser.yrl
+
+# PARSER_MODULE=$(PARSER_SRC:%.yrl=%)
+
+EBIN = ../ebin
+CT_MODULES= \
+	asn1ct \
+	asn1ct_check \
+	asn1_db \
+	asn1ct_pretty_format \
+	asn1ct_gen \
+	asn1ct_gen_per \
+	asn1ct_gen_per_rt2ct \
+	asn1ct_name \
+	asn1ct_constructed_per \
+	asn1ct_constructed_ber \
+	asn1ct_gen_ber \
+	asn1ct_constructed_ber_bin_v2 \
+	asn1ct_gen_ber_bin_v2 \
+	asn1ct_value \
+	asn1ct_tok \
+	asn1ct_parser2
+
+RT_MODULES= \
+	asn1rt \
+	asn1rt_per \
+	asn1rt_per_bin \
+	asn1rt_per_v1 \
+	asn1rt_ber_bin \
+	asn1rt_ber_bin_v2 \
+	asn1rt_per_bin_rt2ct \
+	asn1rt_driver_handler \
+	asn1rt_check
+
+#	asn1rt_ber_v1 \
+#	asn1rt_ber \
+# the rt module to use is defined in asn1_records.hrl
+# and must be updated when an incompatible change is done in the rt modules
+
+
+MODULES= $(CT_MODULES) $(RT_MODULES)
+
+ERL_FILES = $(MODULES:%=%.erl)
+
+TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+GENERATED_PARSER = $(PARSER_MODULE:%=%.erl)
+
+# internal hrl file
+HRL_FILES = asn1_records.hrl
+
+APP_FILE = asn1.app
+APPUP_FILE = asn1.appup
+
+APP_SRC = $(APP_FILE).src
+APP_TARGET = $(EBIN)/$(APP_FILE)
+
+APPUP_SRC = $(APPUP_FILE).src
+APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
+
+EXAMPLES = \
+	../examples/P-Record.asn
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+ERL_FLAGS +=
+ERL_COMPILE_FLAGS += \
+	-I$(ERL_TOP)/lib/stdlib \
+	+warn_unused_vars
+YRL_FLAGS =
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+
+
+clean:
+	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(GENERATED_PARSER)
+	rm -f core *~
+
+docs:
+
+
+# ----------------------------------------------------
+# Special Build Targets
+# ----------------------------------------------------
+
+$(EBIN)/asn1ct.$(EMULATOR):asn1ct.erl
+	 $(ERLC) -b$(EMULATOR) -o$(EBIN) $(ERL_COMPILE_FLAGS) -Dvsn=\"$(VSN)\" $<
+
+$(APP_TARGET): $(APP_SRC) ../vsn.mk
+	sed -e 's;%VSN%;$(VSN);' $< > $@
+
+$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+	sed -e 's;%VSN%;$(VSN);' $< > $@
+
+
+# ----------------------------------------------------
+# Release Target
+# ----------------------------------------------------
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) $(RELSYSDIR)/src
+	$(INSTALL_DATA) $(PARSER_SRC) $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) $(RELSYSDIR)/src
+	$(INSTALL_DIR) $(RELSYSDIR)/examples
+	$(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)/examples
+
+# there are no include files to be used by the user
+#$(INSTALL_DIR) $(RELSYSDIR)/include
+#$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+
+release_docs_spec:
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/Restrictions.txt b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/Restrictions.txt
new file mode 100644
index 0000000000..d1d1855dc9
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/Restrictions.txt
@@ -0,0 +1,55 @@
+The following restrictions apply to this implementation of the ASN.1 compiler:
+
+Supported encoding rules are:
+BER
+PER (aligned)
+
+PER (unaligned) IS NOT SUPPORTED
+
+Supported types are:
+
+INTEGER
+BOOLEAN
+ENUMERATION
+SEQUENCE
+SEQUENCE OF
+SET
+SET OF
+CHOICE
+OBJECT IDENTIFIER
+RestrictedCharacterStringTypes
+UnrestrictedCharacterStringTypes
+
+
+NOT SUPPORTED types are:
+ANY IS (IS NOT IN THE STANDARD ANY MORE)
+ANY DEFINED BY (IS NOT IN THE STANDARD ANY MORE)
+EXTERNAL
+EMBEDDED-PDV
+REAL
+
+The support for value definitions in the ASN.1 notation is very limited.
+
+The support for constraints is limited to:
+SizeConstraint	SIZE(X)
+SingleValue	(1)
+ValueRange	(X..Y)
+PermittedAlpabet FROM
+
+The only supported value-notation for SEQUENCE and SET in Erlang is
+the record variant.
+The list notation with named components used by the old ASN.1 compiler
+was supported in the first versions of this compiler both are no longer
+supported.
+
+The decode functions always return a symbolic value if they can.
+
+
+Files with ASN.1 source must have a suffix .asn1 the suffix .py used by the
+old ASN.1 compiler is supported in this version but will not be supported in the future.
+
+Generated files:
+X.asn1db	% the intermediate format of a compiled ASN.1 module
+X.hrl		% generated Erlang include file for module X
+X.erl		% generated Erlang module with encode decode functions for
+		% ASN.1 module X
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1.app.src b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1.app.src
index 2ec06ff4db..2ec06ff4db 100644
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1.app.src
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1.app.src
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1.appup.src b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1.appup.src
new file mode 100644
index 0000000000..55ef53994a
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1.appup.src
@@ -0,0 +1,162 @@
+{"%VSN%",
+ [
+  {"1.3",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_per_bin},
+     {add_module, asn1rt_check}
+     {add_module, asn1rt_per_bin_rt2ct},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler}
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
+   ]
+  },
+  {"1.3.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_per_bin},
+     {add_module, asn1rt_check}
+     {add_module, asn1rt_per_bin_rt2ct},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler}
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
+   ]
+  },
+  {"1.3.1.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_per_bin},
+     {add_module, asn1rt_check}
+     {add_module, asn1rt_per_bin_rt2ct},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler}
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
+   ]
+  },
+  {"1.3.2",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {add_module, asn1rt_per_bin_rt2ct},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler}
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
+   ]
+  },
+  {"1.3.3",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler}
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
+   ]
+  },
+  {"1.3.3.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler}
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
+   ]
+  }
+ ],
+ [
+  {"1.3",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_per_bin, soft_purge, soft_purge}},
+     {remove, {asn1rt_check, soft_purge, soft_purge}}
+     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_per_bin, soft_purge, soft_purge}},
+     {remove, {asn1rt_check, soft_purge, soft_purge}}
+     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.1.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_per_bin, soft_purge, soft_purge}},
+     {remove, {asn1rt_check, soft_purge, soft_purge}}
+     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.2",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.3",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.3.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  }
+
+ ]}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1_db.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1_db.erl
new file mode 100644
index 0000000000..d5ddb9582b
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1_db.erl
@@ -0,0 +1,160 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1_db.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
+%%
+-module(asn1_db).
+%-compile(export_all).
+-export([dbnew/1,dbsave/2,dbload/1,dbput/3,dbget/2,dbget_all/1]).
+-export([dbget_all_mod/1,dbstop/0,dbclear/0,dberase_module/1,dbstart/1,stop_server/1]).
+%% internal exports
+-export([dbloop0/1,dbloop/2]).
+
+%% Db stuff
+dbstart(Includes) ->
+    start_server(asn1db, asn1_db, dbloop0, [Includes]).
+
+dbloop0(Includes) ->
+    dbloop(Includes, ets:new(asn1, [set,named_table])).
+
+opentab(Tab,Mod,[]) ->
+    opentab(Tab,Mod,["."]);
+opentab(Tab,Mod,Includes) ->
+    Base = lists:concat([Mod,".asn1db"]),
+    opentab2(Tab,Base,Mod,Includes,ok).
+
+opentab2(_Tab,_Base,_Mod,[],Error) ->
+    Error;
+opentab2(Tab,Base,Mod,[Ih|It],_Error) ->
+    File = filename:join(Ih,Base),
+    case ets:file2tab(File) of
+	{ok,Modtab} ->
+	    ets:insert(Tab,{Mod, Modtab}),
+	    {ok,Modtab};
+	NewErr ->
+	    opentab2(Tab,Base,Mod,It,NewErr)
+    end.
+
+
+dbloop(Includes, Tab) ->
+    receive
+	{From,{set, Mod, K2, V}} ->
+	    [{_,Modtab}] = ets:lookup(Tab,Mod),
+	    ets:insert(Modtab,{K2, V}),
+	    From ! {asn1db, ok},
+	    dbloop(Includes, Tab);
+	{From, {get, Mod, K2}} ->
+	    Result = case ets:lookup(Tab,Mod) of
+			 [] ->
+			     opentab(Tab,Mod,Includes);
+			 [{_,Modtab}] -> {ok,Modtab}
+		     end,
+	    case Result of
+		{ok,Newtab} ->
+		    From ! {asn1db, lookup(Newtab, K2)};
+		_Error ->
+		    From ! {asn1db, undefined}
+	    end,
+	    dbloop(Includes, Tab);
+	{From, {all_mod, Mod}} ->
+	    [{_,Modtab}] = ets:lookup(Tab,Mod),
+	    From ! {asn1db, ets:tab2list(Modtab)},
+	    dbloop(Includes, Tab);
+	{From, {delete_mod, Mod}} ->
+	    [{_,Modtab}] = ets:lookup(Tab,Mod),
+	    ets:delete(Modtab),
+	    ets:delete(Tab,Mod),
+	    From ! {asn1db, ok},
+	    dbloop(Includes, Tab);
+	{From, {save, OutFile,Mod}} ->
+	    [{_,Mtab}] = ets:lookup(Tab,Mod),
+	    {From ! {asn1db, ets:tab2file(Mtab,OutFile)}},
+	    dbloop(Includes,Tab);
+	{From, {load, Mod}} ->
+	    Result = case ets:lookup(Tab,Mod) of
+			 [] ->
+			     opentab(Tab,Mod,Includes);
+			 [{_,Modtab}] -> {ok,Modtab}
+		     end,
+	    {From, {asn1db,Result}},
+	    dbloop(Includes,Tab);
+	{From, {new, Mod}} ->
+	    case ets:lookup(Tab,Mod) of
+		[{_,Modtab}] ->
+		    ets:delete(Modtab);
+		_  ->
+		    true
+	    end,
+	    Tabname = list_to_atom(lists:concat(["asn1_",Mod])),
+	    ets:new(Tabname, [set,named_table]),
+	    ets:insert(Tab,{Mod,Tabname}),
+	    From ! {asn1db, ok},
+	    dbloop(Includes,Tab);
+	{From, stop} ->
+		    From ! {asn1db, ok};  %% nothing to store
+	{From, clear} ->
+	    ModTabList = [Mt||{_,Mt} <- ets:tab2list(Tab)],
+	    lists:foreach(fun(T) -> ets:delete(T) end,ModTabList),
+	    ets:delete(Tab),
+	    From ! {asn1db, cleared},
+	    dbloop(Includes, ets:new(asn1, [set]))
+    end.
+
+
+%%all(Tab, K) ->
+%%    pickup(K, ets:match(Tab, {{K, '$1'}, '$2'})).
+%%pickup(K, []) -> [];
+%%pickup(K, [[V1,V2] |T]) ->
+%%    [{{K,V1},V2} | pickup(K, T)].
+
+lookup(Tab, K) ->
+    case ets:lookup(Tab, K) of
+	[] -> undefined;
+	[{K,V}] -> V
+    end.
+
+
+dbnew(Module) -> req({new,Module}).
+dbsave(OutFile,Module) -> req({save,OutFile,Module}).
+dbload(Module) -> req({load,Module}).
+
+dbput(Module,K,V) -> req({set, Module, K, V}).
+dbget(Module,K) ->   req({get, Module, K}).
+dbget_all(K) ->   req({get_all, K}).
+dbget_all_mod(Mod) -> req({all_mod,Mod}).
+dbstop() ->       stop_server(asn1db).
+dbclear() ->      req(clear).
+dberase_module({module,M})->
+    req({delete_mod, M}).
+
+req(R) ->
+    asn1db ! {self(), R},
+    receive {asn1db, Reply} -> Reply end.
+
+stop_server(Name) ->
+    stop_server(Name, whereis(Name)).
+stop_server(_, undefined) -> stopped;
+stop_server(Name, _Pid) ->
+    Name  ! {self(), stop},
+    receive {Name, _} -> stopped end.
+
+
+start_server(Name,Mod,Fun,Args) ->
+    case whereis(Name) of
+	undefined ->
+	    register(Name, spawn(Mod,Fun, Args));
+	_Pid ->
+	    already_started
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1_records.hrl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1_records.hrl
new file mode 100644
index 0000000000..6ba4877523
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1_records.hrl
@@ -0,0 +1,96 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1_records.hrl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
+%%
+-define('RT_BER',"asn1rt_ber_v1").
+-define('RT_BER_BIN',"asn1rt_ber_bin").
+-define('RT_PER',"asn1rt_per_v1").
+%% change to this when we have this module -define('RT_PER_BIN',"asn1rt_per_bin").
+-define('RT_PER_BIN',"asn1rt_per_bin").
+
+-record(module,{pos,name,defid,tagdefault='EXPLICIT',exports={exports,[]},imports={imports,[]}, extensiondefault=empty,typeorval}).
+
+-record('SEQUENCE',{pname=false,tablecinf=false,components=[]}).
+-record('SET',{pname=false,sorted=false,tablecinf=false,components=[]}).
+-record('ComponentType',{pos,name,typespec,prop,tags}).
+-record('ObjectClassFieldType',{classname,class,fieldname,type}).
+
+-record(typedef,{checked=false,pos,name,typespec}).
+-record(classdef,{checked=false,pos,name,typespec}).
+-record(valuedef,{checked=false,pos,name,type,value}).
+-record(ptypedef,{checked=false,pos,name,args,typespec}).
+-record(pvaluedef,{checked=false,pos,name,args,type,value}).
+-record(pvaluesetdef,{checked=false,pos,name,args,type,valueset}).
+-record(pobjectdef,{checked=false,pos,name,args,class,def}).
+-record(pobjectsetdef,{checked=false,pos,name,args,class,def}).
+
+-record(typereference,{pos,val}).
+-record(identifier,{pos,val}).
+-record(constraint,{c,e}).
+-record('Constraint',{'SingleValue'=no,'SizeConstraint'=no,'ValueRange'=no,'PermittedAlphabet'=no,
+		      'ContainedSubtype'=no, 'TypeConstraint'=no,'InnerSubtyping'=no,e=no,'Other'=no}).
+-record(simpletableattributes,{objectsetname,c_name,c_index,usedclassfield,
+			       uniqueclassfield,valueindex}).
+-record(type,{tag=[],def,constraint=[],tablecinf=[],inlined=no}).
+
+-record(objectclass,{fields=[],syntax}).
+-record('Object',{classname,gen=true,def}).
+-record('ObjectSet',{class,gen=true,uniquefname,set}).
+
+-record(tag,{class,number,type,form=32}). % form = ?CONSTRUCTED
+% This record holds information about allowed constraint types per type
+-record(cmap,{single_value=no,contained_subtype=no,value_range=no,
+		size=no,permitted_alphabet=no,type_constraint=no,
+		inner_subtyping=no}).
+
+
+-record('EXTENSIONMARK',{pos,val}).
+
+% each IMPORT contains a list of 'SymbolsFromModule'
+-record('SymbolsFromModule',{symbols,module,objid}).
+
+% Externaltypereference -> modulename '.' typename
+-record('Externaltypereference',{pos,module,type}).
+% Externalvaluereference -> modulename '.' typename
+-record('Externalvaluereference',{pos,module,value}).
+
+-record(state,{module,mname,type,tname,value,vname,erule,parameters=[],
+	       inputmodules,abscomppath=[],recordtopname=[],options}).
+
+%% state record used by backend at partial decode
+%% active is set to 'yes' when a partial decode function is generated.
+%% prefix is set to 'dec-inc-' or 'dec-partial-' is for
+%% incomplete partial decode or partial decode respectively
+%% inc_tag_pattern holds the tags of the significant types/components
+%% for incomplete partial decode.
+%% tag_pattern holds the tags for partial decode.
+%% inc_type_pattern and type_pattern holds the names of the
+%% significant types/components.
+%% func_name holds the name of the function for the toptype.
+%% namelist holds the list of names of types/components that still
+%% haven't been generated.
+%% tobe_refed_funcs is a list of tuples {function names
+%% (Types),namelist of incomplete decode spec}, with function names
+%% that are referenced within other generated partial incomplete
+%% decode functions. They shall be generated as partial incomplete
+%% decode functions.
+
+%% gen_refed_funcs is as list of function names. Unlike
+%% tobe_refed_funcs these have been generated.
+-record(gen_state,{active=false,prefix,inc_tag_pattern,
+		  tag_pattern,inc_type_pattern,
+		  type_pattern,func_name,namelist,
+		  tobe_refed_funcs=[],gen_refed_funcs=[]}).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct.erl
new file mode 100644
index 0000000000..fd36f1657e
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct.erl
@@ -0,0 +1,1904 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
+%%
+-module(asn1ct).
+
+%% Compile Time functions for ASN.1 (e.g ASN.1 compiler).
+
+%%-compile(export_all).
+%% Public exports
+-export([compile/1, compile/2]).
+-export([start/0, start/1, stop/0]).
+-export([encode/2, encode/3, decode/3]).
+-export([test/1, test/2, test/3, value/2]).
+%% Application internal exports
+-export([compile_asn/3,compile_asn1/3,compile_py/3,compile/3,value/1,vsn/0,
+	 create_ets_table/2,get_name_of_def/1,get_pos_of_def/1]).
+-export([read_config_data/1,get_gen_state_field/1,get_gen_state/0,
+	 partial_inc_dec_toptype/1,save_gen_state/1,update_gen_state/2,
+	 get_tobe_refed_func/1,reset_gen_state/0,is_function_generated/1,
+	 generated_refed_func/1,next_refed_func/0,pop_namelist/0,
+	 next_namelist_el/0,update_namelist/1,step_in_constructed/0,
+	 add_tobe_refed_func/1,add_generated_refed_func/1]).
+
+-include("asn1_records.hrl").
+-include_lib("stdlib/include/erl_compile.hrl").
+
+-import(asn1ct_gen_ber_bin_v2,[encode_tag_val/3,decode_class/1]).
+
+-define(unique_names,0).
+-define(dupl_uniquedefs,1).
+-define(dupl_equaldefs,2).
+-define(dupl_eqdefs_uniquedefs,?dupl_equaldefs bor ?dupl_uniquedefs).
+
+-define(CONSTRUCTED, 2#00100000).
+
+%% macros used for partial decode commands
+-define(CHOOSEN,choosen).
+-define(SKIP,skip).
+-define(SKIP_OPTIONAL,skip_optional).
+
+%% macros used for partial incomplete decode commands
+-define(MANDATORY,mandatory).
+-define(DEFAULT,default).
+-define(OPTIONAL,opt).
+-define(PARTS,parts).
+-define(UNDECODED,undec).
+-define(ALTERNATIVE,alt).
+-define(ALTERNATIVE_UNDECODED,alt_undec).
+-define(ALTERNATIVE_PARTS,alt_parts).
+%-define(BINARY,bin).
+
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This is the interface to the compiler
+%%
+%%
+
+
+compile(File) ->
+    compile(File,[]).
+
+compile(File,Options) when list(Options) ->
+    Options1 =
+	case {lists:member(optimize,Options),lists:member(ber_bin,Options)} of
+	    {true,true} ->
+		[ber_bin_v2|Options--[ber_bin]];
+	    _ -> Options
+	end,
+    case (catch input_file_type(File)) of
+	{single_file,PrefixedFile} ->
+	    (catch compile1(PrefixedFile,Options1));
+	{multiple_files_file,SetBase,FileName} ->
+	    FileList = get_file_list(FileName),
+	    (catch compile_set(SetBase,filename:dirname(FileName),
+			       FileList,Options1));
+	Err = {input_file_error,_Reason} ->
+	    {error,Err}
+    end.
+
+
+compile1(File,Options) when list(Options) ->
+    io:format("Erlang ASN.1 version ~p compiling ~p ~n",[?vsn,File]),
+    io:format("Compiler Options: ~p~n",[Options]),
+    Ext = filename:extension(File),
+    Base = filename:basename(File,Ext),
+    OutFile = outfile(Base,"",Options),
+    DbFile = outfile(Base,"asn1db",Options),
+    Includes = [I || {i,I} <- Options],
+    EncodingRule = get_rule(Options),
+    create_ets_table(asn1_functab,[named_table]),
+    Continue1 = scan({true,true},File,Options),
+    Continue2 = parse(Continue1,File,Options),
+    Continue3 = check(Continue2,File,OutFile,Includes,EncodingRule,
+		      DbFile,Options,[]),
+    Continue4 = generate(Continue3,OutFile,EncodingRule,Options),
+    delete_tables([asn1_functab]),
+    compile_erl(Continue4,OutFile,Options).
+
+%%****************************************************************************%%
+%% functions dealing with compiling of several input files to one output file %%
+%%****************************************************************************%%
+compile_set(SetBase,DirName,Files,Options) when list(hd(Files)),list(Options) ->
+    %% case when there are several input files in a list
+    io:format("Erlang ASN.1 version ~p compiling ~p ~n",[?vsn,Files]),
+    io:format("Compiler Options: ~p~n",[Options]),
+    OutFile = outfile(SetBase,"",Options),
+    DbFile = outfile(SetBase,"asn1db",Options),
+    Includes = [I || {i,I} <- Options],
+    EncodingRule = get_rule(Options),
+    create_ets_table(asn1_functab,[named_table]),
+    ScanRes = scan_set(DirName,Files,Options),
+    ParseRes = parse_set(ScanRes,Options),
+    Result =
+	case [X||X <- ParseRes,element(1,X)==true] of
+	    [] -> %% all were false, time to quit
+		lists:map(fun(X)->element(2,X) end,ParseRes);
+	    ParseRes -> %% all were true, continue with check
+		InputModules =
+		    lists:map(
+		      fun(F)->
+			      E = filename:extension(F),
+			      B = filename:basename(F,E),
+			      if
+				  list(B) -> list_to_atom(B);
+				  true -> B
+			      end
+		      end,
+		      Files),
+		check_set(ParseRes,SetBase,OutFile,Includes,
+			  EncodingRule,DbFile,Options,InputModules);
+	    Other ->
+		{error,{'unexpected error in scan/parse phase',
+			lists:map(fun(X)->element(3,X) end,Other)}}
+	end,
+    delete_tables([asn1_functab]),
+    Result.
+
+check_set(ParseRes,SetBase,OutFile,Includes,EncRule,DbFile,
+	  Options,InputModules) ->
+    lists:foreach(fun({_T,M,File})->
+			  cmp(M#module.name,File)
+		  end,
+		  ParseRes),
+    MergedModule = merge_modules(ParseRes,SetBase),
+    SetM = MergedModule#module{name=SetBase},
+    Continue1 = check({true,SetM},SetBase,OutFile,Includes,EncRule,DbFile,
+		      Options,InputModules),
+    Continue2 = generate(Continue1,OutFile,EncRule,Options),
+
+    delete_tables([renamed_defs,original_imports,automatic_tags]),
+
+    compile_erl(Continue2,OutFile,Options).
+
+%% merge_modules/2 -> returns a module record where the typeorval lists are merged,
+%% the exports lists are merged, the imports lists are merged when the
+%% elements come from other modules than the merge set, the tagdefault
+%% field gets the shared value if all modules have same tagging scheme,
+%% otherwise a tagging_error exception is thrown,
+%% the extensiondefault ...(not handled yet).
+merge_modules(ParseRes,CommonName) ->
+    ModuleList = lists:map(fun(X)->element(2,X) end,ParseRes),
+    NewModuleList = remove_name_collisions(ModuleList),
+    case ets:info(renamed_defs,size) of
+	0 -> ets:delete(renamed_defs);
+	_ -> ok
+    end,
+    save_imports(NewModuleList),
+%    io:format("~p~n~p~n~p~n~n",[ets:lookup(original_imports,'M1'),ets:lookup(original_imports,'M2'),ets:tab2list(original_imports)]),
+    TypeOrVal = lists:append(lists:map(fun(X)->X#module.typeorval end,
+				       NewModuleList)),
+    InputMNameList = lists:map(fun(X)->X#module.name end,
+			       NewModuleList),
+    CExports = common_exports(NewModuleList),
+
+    ImportsModuleNameList = lists:map(fun(X)->
+					      {X#module.imports,
+					       X#module.name} end,
+				      NewModuleList),
+    %% ImportsModuleNameList: [{Imports,ModuleName},...]
+    %% Imports is a tuple {imports,[#'SymbolsFromModule'{},...]}
+    CImports = common_imports(ImportsModuleNameList,InputMNameList),
+    TagDefault = check_tagdefault(NewModuleList),
+    #module{name=CommonName,tagdefault=TagDefault,exports=CExports,
+	    imports=CImports,typeorval=TypeOrVal}.
+
+%% causes an exit if duplicate definition names exist in a module
+remove_name_collisions(Modules) ->
+    create_ets_table(renamed_defs,[named_table]),
+    %% Name duplicates in the same module is not allowed.
+    lists:foreach(fun exit_if_nameduplicate/1,Modules),
+    %% Then remove duplicates in different modules and return the
+    %% new list of modules.
+    remove_name_collisions2(Modules,[]).
+
+%% For each definition in the first module in module list, find
+%% all definitons with same name and rename both definitions in
+%% the first module and in rest of modules
+remove_name_collisions2([M|Ms],Acc) ->
+    TypeOrVal = M#module.typeorval,
+    MName = M#module.name,
+    %% Test each name in TypeOrVal on all modules in Ms
+    {NewM,NewMs} = remove_name_collisions2(MName,TypeOrVal,Ms,[]),
+    remove_name_collisions2(NewMs,[M#module{typeorval=NewM}|Acc]);
+remove_name_collisions2([],Acc) ->
+    finished_warn_prints(),
+    Acc.
+
+%% For each definition in list of defs find definitions in (rest of)
+%% modules that have same name. If duplicate was found rename def.
+%% Test each name in [T|Ts] on all modules in Ms
+remove_name_collisions2(ModName,[T|Ts],Ms,Acc) ->
+    Name = get_name_of_def(T),
+    case discover_dupl_in_mods(Name,T,Ms,[],?unique_names) of
+	{_,?unique_names} -> % there was no name collision
+	    remove_name_collisions2(ModName,Ts,Ms,[T|Acc]);
+	{NewMs,?dupl_uniquedefs} -> % renamed defs in NewMs
+	    %% rename T
+	    NewT = set_name_of_def(ModName,Name,T), %rename def
+	    warn_renamed_def(ModName,get_name_of_def(NewT),Name),
+	    ets:insert(renamed_defs,{get_name_of_def(NewT),Name,ModName}),
+	    remove_name_collisions2(ModName,Ts,NewMs,[NewT|Acc]);
+	{NewMs,?dupl_equaldefs} -> % name duplicates, but identical defs
+	    %% keep name of T
+	    warn_kept_def(ModName,Name),
+	    remove_name_collisions2(ModName,Ts,NewMs,[T|Acc]);
+	{NewMs,?dupl_eqdefs_uniquedefs} ->
+	    %% keep name of T, renamed defs in NewMs
+	    warn_kept_def(ModName,Name),
+	    remove_name_collisions2(ModName,Ts,NewMs,[T|Acc])
+    end;
+remove_name_collisions2(_,[],Ms,Acc) ->
+    {Acc,Ms}.
+
+%% Name is the name of a definition. If a definition with the same name
+%% is found in the modules Ms the definition will be renamed and returned.
+discover_dupl_in_mods(Name,Def,[M=#module{name=N,typeorval=TorV}|Ms],
+			      Acc,AnyRenamed) ->
+    Fun = fun(T,RenamedOrDupl)->
+		  case {get_name_of_def(T),compare_defs(Def,T)} of
+		      {Name,not_equal} ->
+			  %% rename def
+			  NewT=set_name_of_def(N,Name,T),
+			  warn_renamed_def(N,get_name_of_def(NewT),Name),
+			  ets:insert(renamed_defs,{get_name_of_def(NewT),
+						   Name,N}),
+			  {NewT,?dupl_uniquedefs bor RenamedOrDupl};
+		      {Name,equal} ->
+			  %% delete def
+			  warn_deleted_def(N,Name),
+			  {[],?dupl_equaldefs bor RenamedOrDupl};
+		      _ ->
+			  {T,RenamedOrDupl}
+		  end
+	  end,
+    {NewTorV,NewAnyRenamed} = lists:mapfoldl(Fun,AnyRenamed,TorV),
+    %% have to flatten the NewTorV to remove any empty list elements
+    discover_dupl_in_mods(Name,Def,Ms,
+			  [M#module{typeorval=lists:flatten(NewTorV)}|Acc],
+			  NewAnyRenamed);
+discover_dupl_in_mods(_,_,[],Acc,AnyRenamed) ->
+    {Acc,AnyRenamed}.
+
+warn_renamed_def(ModName,NewName,OldName) ->
+    maybe_first_warn_print(),
+    io:format("NOTICE: The ASN.1 definition in module ~p with name ~p has been renamed in generated module. New name is ~p.~n",[ModName,OldName,NewName]).
+
+warn_deleted_def(ModName,DefName) ->
+    maybe_first_warn_print(),
+    io:format("NOTICE: The ASN.1 definition in module ~p with name ~p has been deleted in generated module.~n",[ModName,DefName]).
+
+warn_kept_def(ModName,DefName) ->
+    maybe_first_warn_print(),
+    io:format("NOTICE: The ASN.1 definition in module ~p with name ~p has kept its name due to equal definition as duplicate.~n",[ModName,DefName]).
+
+maybe_first_warn_print() ->
+    case get(warn_duplicate_defs) of
+	undefined ->
+	    put(warn_duplicate_defs,true),
+	    io:format("~nDue to multiple occurrences of a definition name in "
+		      "multi-file compiled files:~n");
+	_ ->
+	    ok
+    end.
+finished_warn_prints() ->
+    put(warn_duplicate_defs,undefined).
+
+
+exit_if_nameduplicate(#module{typeorval=TorV}) ->
+    exit_if_nameduplicate(TorV);
+exit_if_nameduplicate([]) ->
+    ok;
+exit_if_nameduplicate([Def|Rest]) ->
+    Name=get_name_of_def(Def),
+    exit_if_nameduplicate2(Name,Rest),
+    exit_if_nameduplicate(Rest).
+
+exit_if_nameduplicate2(Name,Rest) ->
+    Pred=fun(Def)->
+		 case get_name_of_def(Def) of
+		     Name -> true;
+		     _ -> false
+		 end
+	 end,
+        case lists:any(Pred,Rest) of
+	true ->
+	    throw({error,{"more than one definition with same name",Name}});
+	_ ->
+	    ok
+    end.
+
+compare_defs(D1,D2) ->
+    compare_defs2(unset_pos(D1),unset_pos(D2)).
+compare_defs2(D,D) ->
+    equal;
+compare_defs2(_,_) ->
+    not_equal.
+
+unset_pos(Def) when record(Def,typedef) ->
+    Def#typedef{pos=undefined};
+unset_pos(Def) when record(Def,classdef) ->
+    Def#classdef{pos=undefined};
+unset_pos(Def) when record(Def,valuedef) ->
+    Def#valuedef{pos=undefined};
+unset_pos(Def) when record(Def,ptypedef) ->
+    Def#ptypedef{pos=undefined};
+unset_pos(Def) when record(Def,pvaluedef) ->
+    Def#pvaluedef{pos=undefined};
+unset_pos(Def) when record(Def,pvaluesetdef) ->
+    Def#pvaluesetdef{pos=undefined};
+unset_pos(Def) when record(Def,pobjectdef) ->
+    Def#pobjectdef{pos=undefined};
+unset_pos(Def) when record(Def,pobjectsetdef) ->
+    Def#pobjectsetdef{pos=undefined}.
+
+get_pos_of_def(#typedef{pos=Pos}) ->
+    Pos;
+get_pos_of_def(#classdef{pos=Pos}) ->
+    Pos;
+get_pos_of_def(#valuedef{pos=Pos}) ->
+    Pos;
+get_pos_of_def(#ptypedef{pos=Pos}) ->
+    Pos;
+get_pos_of_def(#pvaluedef{pos=Pos}) ->
+    Pos;
+get_pos_of_def(#pvaluesetdef{pos=Pos}) ->
+    Pos;
+get_pos_of_def(#pobjectdef{pos=Pos}) ->
+    Pos;
+get_pos_of_def(#pobjectsetdef{pos=Pos}) ->
+    Pos.
+
+
+get_name_of_def(#typedef{name=Name}) ->
+    Name;
+get_name_of_def(#classdef{name=Name}) ->
+    Name;
+get_name_of_def(#valuedef{name=Name}) ->
+    Name;
+get_name_of_def(#ptypedef{name=Name}) ->
+    Name;
+get_name_of_def(#pvaluedef{name=Name}) ->
+    Name;
+get_name_of_def(#pvaluesetdef{name=Name}) ->
+    Name;
+get_name_of_def(#pobjectdef{name=Name}) ->
+    Name;
+get_name_of_def(#pobjectsetdef{name=Name}) ->
+    Name.
+
+set_name_of_def(ModName,Name,OldDef) ->
+    NewName = list_to_atom(lists:concat([Name,ModName])),
+    case OldDef of
+	#typedef{} -> OldDef#typedef{name=NewName};
+	#classdef{} -> OldDef#classdef{name=NewName};
+	#valuedef{} -> OldDef#valuedef{name=NewName};
+	#ptypedef{} -> OldDef#ptypedef{name=NewName};
+	#pvaluedef{} -> OldDef#pvaluedef{name=NewName};
+	#pvaluesetdef{} -> OldDef#pvaluesetdef{name=NewName};
+	#pobjectdef{} -> OldDef#pobjectdef{name=NewName};
+	#pobjectsetdef{} -> OldDef#pobjectsetdef{name=NewName}
+    end.
+
+save_imports(ModuleList)->
+    Fun = fun(M) ->
+		  case M#module.imports of
+		      {_,[]} -> [];
+		      {_,I} ->
+			  {M#module.name,I}
+		  end
+	  end,
+    ImportsList = lists:map(Fun,ModuleList),
+    case lists:flatten(ImportsList) of
+	[] ->
+	    ok;
+	ImportsList2 ->
+	    create_ets_table(original_imports,[named_table]),
+	    ets:insert(original_imports,ImportsList2)
+    end.
+
+
+common_exports(ModuleList) ->
+    %% if all modules exports 'all' then export 'all',
+    %% otherwise export each typeorval name
+    case lists:filter(fun(X)->
+			      element(2,X#module.exports) /= all
+		      end,
+		      ModuleList) of
+	[]->
+	    {exports,all};
+	ModsWithExpList ->
+	    CExports1 =
+		lists:append(lists:map(fun(X)->element(2,X#module.exports) end,
+				       ModsWithExpList)),
+	    CExports2 = export_all(lists:subtract(ModuleList,ModsWithExpList)),
+	    {exports,CExports1++CExports2}
+    end.
+
+export_all([])->[];
+export_all(ModuleList) ->
+    ExpList =
+	lists:map(
+	  fun(M)->
+		  TorVL=M#module.typeorval,
+		  MName = M#module.name,
+		  lists:map(
+		    fun(Def)->
+			    case Def of
+				T when record(T,typedef)->
+				    #'Externaltypereference'{pos=0,
+							     module=MName,
+							     type=T#typedef.name};
+				V when record(V,valuedef) ->
+				    #'Externalvaluereference'{pos=0,
+							      module=MName,
+							      value=V#valuedef.name};
+				C when record(C,classdef) ->
+				    #'Externaltypereference'{pos=0,
+							     module=MName,
+							     type=C#classdef.name};
+				P when record(P,ptypedef) ->
+				    #'Externaltypereference'{pos=0,
+							     module=MName,
+							     type=P#ptypedef.name};
+				PV when record(PV,pvaluesetdef) ->
+				    #'Externaltypereference'{pos=0,
+							     module=MName,
+							     type=PV#pvaluesetdef.name};
+				PO when record(PO,pobjectdef) ->
+				    #'Externalvaluereference'{pos=0,
+							      module=MName,
+							      value=PO#pobjectdef.name}
+			    end
+		    end,
+		    TorVL)
+	  end,
+	  ModuleList),
+    lists:append(ExpList).
+
+%% common_imports/2
+%% IList is a list of tuples, {Imports,MName}, where Imports is the imports of
+%% the module with name MName.
+%% InputMNameL holds the names of all merged modules.
+%% Returns an import tuple with a list of imports that are external the merged
+%% set of modules.
+common_imports(IList,InputMNameL) ->
+    SetExternalImportsList = remove_in_set_imports(IList,InputMNameL,[]),
+    {imports,remove_import_doubles(SetExternalImportsList)}.
+
+check_tagdefault(ModList) ->
+    case have_same_tagdefault(ModList) of
+	{true,TagDefault}  -> TagDefault;
+	{false,TagDefault} ->
+	    create_ets_table(automatic_tags,[named_table]),
+	    save_automatic_tagged_types(ModList),
+	    TagDefault
+    end.
+
+have_same_tagdefault([#module{tagdefault=T}|Ms]) ->
+    have_same_tagdefault(Ms,{true,T}).
+
+have_same_tagdefault([],TagDefault) ->
+    TagDefault;
+have_same_tagdefault([#module{tagdefault=T}|Ms],TDefault={_,T}) ->
+    have_same_tagdefault(Ms,TDefault);
+have_same_tagdefault([#module{tagdefault=T1}|Ms],{_,T2}) ->
+    have_same_tagdefault(Ms,{false,rank_tagdef([T1,T2])}).
+
+rank_tagdef(L) ->
+    case lists:member('EXPLICIT',L) of
+	true -> 'EXPLICIT';
+	_ -> 'IMPLICIT'
+    end.
+
+save_automatic_tagged_types([])->
+    done;
+save_automatic_tagged_types([#module{tagdefault='AUTOMATIC',
+				     typeorval=TorV}|Ms]) ->
+    Fun =
+	fun(T) ->
+		ets:insert(automatic_tags,{get_name_of_def(T)})
+	end,
+    lists:foreach(Fun,TorV),
+    save_automatic_tagged_types(Ms);
+save_automatic_tagged_types([_M|Ms]) ->
+    save_automatic_tagged_types(Ms).
+
+%% remove_in_set_imports/3 :
+%% input: list with tuples of each module's imports and module name
+%% respectively.
+%% output: one list with same format but each occured import from a
+%% module in the input set (IMNameL) is removed.
+remove_in_set_imports([{{imports,ImpL},_ModName}|Rest],InputMNameL,Acc) ->
+    NewImpL = remove_in_set_imports1(ImpL,InputMNameL,[]),
+    remove_in_set_imports(Rest,InputMNameL,NewImpL++Acc);
+remove_in_set_imports([],_,Acc) ->
+    lists:reverse(Acc).
+
+remove_in_set_imports1([I|Is],InputMNameL,Acc) ->
+    case I#'SymbolsFromModule'.module of
+	#'Externaltypereference'{type=MName} ->
+	    case lists:member(MName,InputMNameL) of
+		true ->
+		    remove_in_set_imports1(Is,InputMNameL,Acc);
+		false ->
+		    remove_in_set_imports1(Is,InputMNameL,[I|Acc])
+	    end;
+	_ ->
+	    remove_in_set_imports1(Is,InputMNameL,[I|Acc])
+    end;
+remove_in_set_imports1([],_,Acc) ->
+    lists:reverse(Acc).
+
+remove_import_doubles([]) ->
+    [];
+%% If several modules in the merge set imports symbols from
+%% the same external module it might be doubled.
+%% ImportList has #'SymbolsFromModule' elements
+remove_import_doubles(ImportList) ->
+    MergedImportList =
+	merge_symbols_from_module(ImportList,[]),
+%%    io:format("MergedImportList: ~p~n",[MergedImportList]),
+    delete_double_of_symbol(MergedImportList,[]).
+
+merge_symbols_from_module([Imp|Imps],Acc) ->
+    #'Externaltypereference'{type=ModName} = Imp#'SymbolsFromModule'.module,
+    IfromModName =
+	lists:filter(
+	  fun(I)->
+		  case I#'SymbolsFromModule'.module of
+		      #'Externaltypereference'{type=ModName} ->
+			  true;
+		      #'Externalvaluereference'{value=ModName} ->
+			  true;
+		      _ -> false
+		  end
+	  end,
+	  Imps),
+    NewImps = lists:subtract(Imps,IfromModName),
+%%    io:format("Imp: ~p~nIfromModName: ~p~n",[Imp,IfromModName]),
+    NewImp =
+	Imp#'SymbolsFromModule'{
+	  symbols = lists:append(
+		      lists:map(fun(SL)->
+					SL#'SymbolsFromModule'.symbols
+				end,[Imp|IfromModName]))},
+    merge_symbols_from_module(NewImps,[NewImp|Acc]);
+merge_symbols_from_module([],Acc) ->
+    lists:reverse(Acc).
+
+delete_double_of_symbol([I|Is],Acc) ->
+    SymL=I#'SymbolsFromModule'.symbols,
+    NewSymL = delete_double_of_symbol1(SymL,[]),
+    delete_double_of_symbol(Is,[I#'SymbolsFromModule'{symbols=NewSymL}|Acc]);
+delete_double_of_symbol([],Acc) ->
+    Acc.
+
+delete_double_of_symbol1([TRef=#'Externaltypereference'{type=TrefName}|Rest],Acc)->
+    NewRest =
+	lists:filter(fun(S)->
+			     case S of
+				 #'Externaltypereference'{type=TrefName}->
+				     false;
+				 _ -> true
+			     end
+		     end,
+		     Rest),
+    delete_double_of_symbol1(NewRest,[TRef|Acc]);
+delete_double_of_symbol1([VRef=#'Externalvaluereference'{value=VName}|Rest],Acc) ->
+    NewRest =
+	lists:filter(fun(S)->
+			     case S of
+				 #'Externalvaluereference'{value=VName}->
+				     false;
+				 _ -> true
+			     end
+		     end,
+		     Rest),
+    delete_double_of_symbol1(NewRest,[VRef|Acc]);
+delete_double_of_symbol1([TRef={#'Externaltypereference'{type=MRef},
+				#'Externaltypereference'{type=TRef}}|Rest],
+			 Acc)->
+    NewRest =
+	lists:filter(
+	  fun(S)->
+		  case S of
+		      {#'Externaltypereference'{type=MRef},
+		       #'Externaltypereference'{type=TRef}}->
+			  false;
+		      _ -> true
+		  end
+	  end,
+	  Rest),
+    delete_double_of_symbol1(NewRest,[TRef|Acc]);
+delete_double_of_symbol1([],Acc) ->
+    Acc.
+
+
+scan_set(DirName,Files,Options) ->
+    lists:map(
+      fun(F)->
+	      case scan({true,true},filename:join([DirName,F]),Options) of
+		  {false,{error,Reason}} ->
+		      throw({error,{'scan error in file:',F,Reason}});
+		  {TrueOrFalse,Res} ->
+		      {TrueOrFalse,Res,F}
+	      end
+      end,
+      Files).
+
+parse_set(ScanRes,Options) ->
+    lists:map(
+      fun({TorF,Toks,F})->
+	      case parse({TorF,Toks},F,Options) of
+		  {false,{error,Reason}} ->
+		      throw({error,{'parse error in file:',F,Reason}});
+		  {TrueOrFalse,Res} ->
+		      {TrueOrFalse,Res,F}
+	      end
+      end,
+      ScanRes).
+
+
+%%***********************************
+
+
+scan({true,_}, File,Options) ->
+    case asn1ct_tok:file(File) of
+	{error,Reason} ->
+	    io:format("~p~n",[Reason]),
+	    {false,{error,Reason}};
+        Tokens ->
+	    case lists:member(ss,Options) of
+		true -> % we terminate after scan
+		    {false,Tokens};
+		false -> % continue with next pass
+		    {true,Tokens}
+	    end
+    end;
+scan({false,Result},_,_) ->
+    Result.
+
+
+parse({true,Tokens},File,Options) ->
+    %Presult = asn1ct_parser2:parse(Tokens),
+    %%case lists:member(p1,Options) of
+    %%		  true ->
+    %%		      asn1ct_parser:parse(Tokens);
+    %%		  _ ->
+    %%		      asn1ct_parser2:parse(Tokens)
+    %%	      end,
+    case catch asn1ct_parser2:parse(Tokens) of
+	{error,{{Line,_Mod,Message},_TokTup}} ->
+	    if
+		integer(Line) ->
+		    BaseName = filename:basename(File),
+		    io:format("syntax error at line ~p in module ~s:~n",
+			      [Line,BaseName]);
+		true ->
+		    io:format("syntax error in module ~p:~n",[File])
+	    end,
+	    print_error_message(Message),
+	    {false,{error,Message}};
+	{error,{Line,_Mod,[Message,Token]}} ->
+	    io:format("syntax error: ~p ~p at line ~p~n",
+		      [Message,Token,Line]),
+	    {false,{error,{Line,[Message,Token]}}};
+	{ok,M} ->
+	    case lists:member(sp,Options) of
+		true -> % terminate after parse
+		    {false,M};
+		false -> % continue with next pass
+		    {true,M}
+	    end;
+	OtherError ->
+	    io:format("~p~n",[OtherError])
+    end;
+parse({false,Tokens},_,_) ->
+    {false,Tokens}.
+
+check({true,M},File,OutFile,Includes,EncodingRule,DbFile,Options,InputMods) ->
+    cmp(M#module.name,File),
+    start(["."|Includes]),
+    case asn1ct_check:storeindb(M) of
+	ok   ->
+	    Module = asn1_db:dbget(M#module.name,'MODULE'),
+	    State = #state{mname=Module#module.name,
+			   module=Module#module{typeorval=[]},
+			   erule=EncodingRule,
+			   inputmodules=InputMods,
+			   options=Options},
+	    Check = asn1ct_check:check(State,Module#module.typeorval),
+	    case {Check,lists:member(abs,Options)} of
+		{{error,Reason},_} ->
+		    {false,{error,Reason}};
+		{{ok,NewTypeOrVal,_},true} ->
+		    NewM = Module#module{typeorval=NewTypeOrVal},
+		    asn1_db:dbput(NewM#module.name,'MODULE',NewM),
+		    pretty2(M#module.name,lists:concat([OutFile,".abs"])),
+		    {false,ok};
+		{{ok,NewTypeOrVal,GenTypeOrVal},_} ->
+		    NewM = Module#module{typeorval=NewTypeOrVal},
+		    asn1_db:dbput(NewM#module.name,'MODULE',NewM),
+		    asn1_db:dbsave(DbFile,M#module.name),
+		    io:format("--~p--~n",[{generated,DbFile}]),
+		    {true,{M,NewM,GenTypeOrVal}}
+	    end
+    end;
+check({false,M},_,_,_,_,_,_,_) ->
+    {false,M}.
+
+generate({true,{M,_Module,GenTOrV}},OutFile,EncodingRule,Options) ->
+    debug_on(Options),
+    case lists:member(compact_bit_string,Options) of
+	true -> put(compact_bit_string,true);
+	_ -> ok
+    end,
+    put(encoding_options,Options),
+    create_ets_table(check_functions,[named_table]),
+
+    %% create decoding function names and taglists for partial decode
+    %% For the time being leave errors unnoticed !!!!!!!!!
+%    io:format("Options: ~p~n",[Options]),
+    case catch specialized_decode_prepare(EncodingRule,M,GenTOrV,Options) of
+	{error, enoent} -> ok;
+	{error, Reason} -> io:format("WARNING: Error in configuration"
+				     "file: ~n~p~n",[Reason]);
+	{'EXIT',Reason} -> io:format("WARNING: Internal error when "
+				     "analyzing configuration"
+				     "file: ~n~p~n",[Reason]);
+	_ -> ok
+    end,
+
+    asn1ct_gen:pgen(OutFile,EncodingRule,M#module.name,GenTOrV),
+    debug_off(Options),
+    put(compact_bit_string,false),
+    erase(encoding_options),
+    erase(tlv_format), % used in ber_bin, optimize
+    erase(class_default_type),% used in ber_bin, optimize
+    ets:delete(check_functions),
+    case lists:member(sg,Options) of
+	true -> % terminate here , with .erl file generated
+	    {false,true};
+	false ->
+	    {true,true}
+    end;
+generate({false,M},_,_,_) ->
+    {false,M}.
+
+compile_erl({true,_},OutFile,Options) ->
+    erl_compile(OutFile,Options);
+compile_erl({false,true},_,_) ->
+    ok;
+compile_erl({false,Result},_,_) ->
+    Result.
+
+input_file_type([]) ->
+    {empty_name,[]};
+input_file_type(File) ->
+    case filename:extension(File) of
+	[] ->
+	    case file:read_file_info(lists:concat([File,".asn1"])) of
+		{ok,_FileInfo} ->
+		    {single_file, lists:concat([File,".asn1"])};
+		_Error ->
+		    case file:read_file_info(lists:concat([File,".asn"])) of
+			{ok,_FileInfo} ->
+			    {single_file, lists:concat([File,".asn"])};
+			_Error ->
+			    {single_file, lists:concat([File,".py"])}
+		    end
+	    end;
+	".asn1config" ->
+	    case read_config_file(File,asn1_module) of
+		{ok,Asn1Module} ->
+		    put(asn1_config_file,File),
+		    input_file_type(Asn1Module);
+		Error ->
+		    Error
+	    end;
+	Asn1PFix ->
+	    Base = filename:basename(File,Asn1PFix),
+	    case filename:extension(Base) of
+		[] ->
+		    {single_file,File};
+		SetPFix when (SetPFix == ".set") ->
+		    {multiple_files_file,
+		     filename:basename(Base,SetPFix),
+		     File};
+		_Error ->
+		    throw({input_file_error,{'Bad input file',File}})
+	    end
+    end.
+
+get_file_list(File) ->
+    case file:open(File, [read]) of
+	{error,Reason} ->
+	    {error,{File,file:format_error(Reason)}};
+	{ok,Stream} ->
+	    get_file_list1(Stream,[])
+    end.
+
+get_file_list1(Stream,Acc) ->
+    Ret = io:get_line(Stream,''),
+    case Ret of
+	eof ->
+	    file:close(Stream),
+	    lists:reverse(Acc);
+	FileName ->
+	    PrefixedNameList =
+		case (catch input_file_type(lists:delete($\n,FileName))) of
+		    {empty_name,[]} -> [];
+		    {single_file,Name} -> [Name];
+		    {multiple_files_file,Name} ->
+			get_file_list(Name);
+		    Err = {input_file_error,_Reason} ->
+			throw(Err)
+		end,
+	    get_file_list1(Stream,PrefixedNameList++Acc)
+    end.
+
+get_rule(Options) ->
+    case [Rule ||Rule <-[per,ber,ber_bin,ber_bin_v2,per_bin],
+		 Opt <- Options,
+		 Rule==Opt] of
+	[Rule] ->
+	    Rule;
+	[Rule|_] ->
+	    Rule;
+	[] ->
+	    ber
+    end.
+
+erl_compile(OutFile,Options) ->
+%    io:format("Options:~n~p~n",[Options]),
+    case lists:member(noobj,Options) of
+	true ->
+	    ok;
+	_ ->
+	    ErlOptions = remove_asn_flags(Options),
+	    case c:c(OutFile,ErlOptions) of
+		{ok,_Module} ->
+		    ok;
+		_ ->
+		    {error,'no_compilation'}
+	    end
+    end.
+
+remove_asn_flags(Options) ->
+    [X || X <- Options,
+	  X /= get_rule(Options),
+	  X /= optimize,
+	  X /= compact_bit_string,
+	  X /= debug,
+	  X /= keyed_list].
+
+debug_on(Options) ->
+    case lists:member(debug,Options) of
+	true ->
+	    put(asndebug,true);
+	_ ->
+	    true
+    end,
+    case lists:member(keyed_list,Options) of
+	true ->
+	    put(asn_keyed_list,true);
+	_ ->
+	    true
+    end.
+
+
+debug_off(_Options) ->
+    erase(asndebug),
+    erase(asn_keyed_list).
+
+
+outfile(Base, Ext, Opts) when atom(Ext) ->
+    outfile(Base, atom_to_list(Ext), Opts);
+outfile(Base, Ext, Opts) ->
+    Obase = case lists:keysearch(outdir, 1, Opts) of
+		{value, {outdir, Odir}} -> filename:join(Odir, Base);
+		_NotFound -> Base % Not found or bad format
+	    end,
+    case Ext of
+	[] ->
+	    Obase;
+	_ ->
+	    Obase++"."++Ext
+    end.
+
+%% compile(AbsFileName, Options)
+%%   Compile entry point for erl_compile.
+
+compile_asn(File,OutFile,Options) ->
+    compile(lists:concat([File,".asn"]),OutFile,Options).
+
+compile_asn1(File,OutFile,Options) ->
+    compile(lists:concat([File,".asn1"]),OutFile,Options).
+
+compile_py(File,OutFile,Options) ->
+    compile(lists:concat([File,".py"]),OutFile,Options).
+
+compile(File, _OutFile, Options) ->
+    case catch compile(File, make_erl_options(Options)) of
+	Exit = {'EXIT',_Reason} ->
+	    io:format("~p~n~s~n",[Exit,"error"]),
+	    error;
+	{error,_Reason} ->
+	    %% case occurs due to error in asn1ct_parser2,asn1ct_check
+%%	    io:format("~p~n",[_Reason]),
+%%	    io:format("~p~n~s~n",[_Reason,"error"]),
+	    error;
+	ok ->
+	    io:format("ok~n"),
+	    ok;
+	ParseRes when tuple(ParseRes) ->
+	    io:format("~p~n",[ParseRes]),
+	    ok;
+	ScanRes when list(ScanRes) ->
+	    io:format("~p~n",[ScanRes]),
+	    ok;
+	Unknown ->
+	    io:format("~p~n~s~n",[Unknown,"error"]),
+	    error
+    end.
+
+%% Converts generic compiler options to specific options.
+
+make_erl_options(Opts) ->
+
+    %% This way of extracting will work even if the record passed
+    %% has more fields than known during compilation.
+
+    Includes = Opts#options.includes,
+    Defines = Opts#options.defines,
+    Outdir = Opts#options.outdir,
+%%    Warning = Opts#options.warning,
+    Verbose = Opts#options.verbose,
+    Specific = Opts#options.specific,
+    Optimize = Opts#options.optimize,
+    OutputType = Opts#options.output_type,
+    Cwd = Opts#options.cwd,
+
+    Options =
+	case Verbose of
+	    true ->  [verbose];
+	    false -> []
+	end ++
+%%%	case Warning of
+%%%	    0 -> [];
+%%%	    _ -> [report_warnings]
+%%%	end ++
+	[] ++
+	case Optimize of
+	    1 -> [optimize];
+	    999 -> [];
+	    _ -> [{optimize,Optimize}]
+	end ++
+	lists:map(
+	  fun ({Name, Value}) ->
+		  {d, Name, Value};
+	      (Name) ->
+		  {d, Name}
+	  end,
+	  Defines) ++
+	case OutputType of
+	    undefined -> [ber]; % temporary default (ber when it's ready)
+	    ber -> [ber];
+	    ber_bin -> [ber_bin];
+	    ber_bin_v2 -> [ber_bin_v2];
+	    per -> [per];
+	    per_bin -> [per_bin]
+	end,
+
+    Options++[report_errors, {cwd, Cwd}, {outdir, Outdir}|
+	      lists:map(fun(Dir) -> {i, Dir} end, Includes)]++Specific.
+
+pretty2(Module,AbsFile) ->
+    start(),
+    {ok,F} = file:open(AbsFile, [write]),
+    M = asn1_db:dbget(Module,'MODULE'),
+    io:format(F,"%%%%%%%%%%%%%%%%%%%   ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
+    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.defid)]),
+    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.tagdefault)]),
+    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.exports)]),
+    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.imports)]),
+    io:format(F,"~s\n\n",[asn1ct_pretty_format:term(M#module.extensiondefault)]),
+
+    {Types,Values,ParameterizedTypes,Classes,Objects,ObjectSets} = M#module.typeorval,
+    io:format(F,"%%%%%%%%%%%%%%%%%%% TYPES in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
+    lists:foreach(fun(T)-> io:format(F,"~s\n",
+				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])
+		  end,Types),
+    io:format(F,"%%%%%%%%%%%%%%%%%%% VALUES in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
+    lists:foreach(fun(T)-> io:format(F,"~s\n",
+				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])
+		  end,Values),
+    io:format(F,"%%%%%%%%%%%%%%%%%%% Parameterized Types in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
+    lists:foreach(fun(T)-> io:format(F,"~s\n",
+				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])
+		  end,ParameterizedTypes),
+    io:format(F,"%%%%%%%%%%%%%%%%%%% Classes in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
+    lists:foreach(fun(T)-> io:format(F,"~s\n",
+				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])
+		  end,Classes),
+    io:format(F,"%%%%%%%%%%%%%%%%%%% Objects in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
+    lists:foreach(fun(T)-> io:format(F,"~s\n",
+				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])
+		  end,Objects),
+    io:format(F,"%%%%%%%%%%%%%%%%%%% Object Sets in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
+    lists:foreach(fun(T)-> io:format(F,"~s\n",
+				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])
+		  end,ObjectSets).
+start() ->
+    Includes = ["."],
+    start(Includes).
+
+
+start(Includes) when list(Includes) ->
+    asn1_db:dbstart(Includes).
+
+stop() ->
+    save(),
+    asn1_db:stop_server(ns),
+    asn1_db:stop_server(rand),
+    stopped.
+
+save() ->
+    asn1_db:dbstop().
+
+%%clear() ->
+%%    asn1_db:dbclear().
+
+encode(Module,Term) ->
+    asn1rt:encode(Module,Term).
+
+encode(Module,Type,Term) when list(Module) ->
+    asn1rt:encode(list_to_atom(Module),Type,Term);
+encode(Module,Type,Term) ->
+    asn1rt:encode(Module,Type,Term).
+
+decode(Module,Type,Bytes) when list(Module) ->
+    asn1rt:decode(list_to_atom(Module),Type,Bytes);
+decode(Module,Type,Bytes) ->
+    asn1rt:decode(Module,Type,Bytes).
+
+
+test(Module) ->
+    start(),
+    M = asn1_db:dbget(Module,'MODULE'),
+    {Types,_Values,_Ptypes,_Classes,_Objects,_ObjectSets} = M#module.typeorval,
+    test_each(Module,Types).
+
+test_each(Module,[Type | Rest]) ->
+    case test(Module,Type) of
+	{ok,_Result} ->
+	    test_each(Module,Rest);
+	Error ->
+	    Error
+    end;
+test_each(_,[]) ->
+    ok.
+
+test(Module,Type) ->
+    io:format("~p:~p~n",[Module,Type]),
+    case (catch value(Module,Type)) of
+	{ok,Val} ->
+	    %%	    io:format("asn1ct:test/2: ~w~n",[Val]),
+	    test(Module,Type,Val);
+	{'EXIT',Reason} ->
+	    {error,{asn1,{value,Reason}}}
+    end.
+
+
+test(Module,Type,Value) ->
+    case catch encode(Module,Type,Value) of
+	{ok,Bytes} ->
+	    %%	    io:format("test 1: ~p~n",[{Bytes}]),
+	    M = if
+		    list(Module) ->
+			list_to_atom(Module);
+		    true ->
+			Module
+		end,
+	    NewBytes =
+		case M:encoding_rule() of
+		    ber ->
+			lists:flatten(Bytes);
+		    ber_bin when binary(Bytes) ->
+			Bytes;
+		    ber_bin ->
+			list_to_binary(Bytes);
+		    ber_bin_v2 when binary(Bytes) ->
+			Bytes;
+		    ber_bin_v2 ->
+			list_to_binary(Bytes);
+		    per ->
+			lists:flatten(Bytes);
+		    per_bin when binary(Bytes) ->
+			Bytes;
+		    per_bin ->
+			list_to_binary(Bytes)
+		end,
+	    case decode(Module,Type,NewBytes) of
+		{ok,Value} ->
+		    {ok,{Module,Type,Value}};
+		{ok,Res} ->
+		    {error,{asn1,{encode_decode_mismatch,
+				  {{Module,Type,Value},Res}}}};
+		Error ->
+		    {error,{asn1,{{decode,
+				   {Module,Type,Value},Error}}}}
+	    end;
+	Error ->
+	    {error,{asn1,{encode,{{Module,Type,Value},Error}}}}
+    end.
+
+value(Module) ->
+    start(),
+    M = asn1_db:dbget(Module,'MODULE'),
+    {Types,_Values,_Ptypes,_Classes,_Objects,_ObjectSets} = M#module.typeorval,
+    lists:map(fun(A) ->value(Module,A) end,Types).
+
+value(Module,Type) ->
+    start(),
+    case catch asn1ct_value:get_type(Module,Type,no) of
+	{error,Reason} ->
+	    {error,Reason};
+	{'EXIT',Reason} ->
+	    {error,Reason};
+	Result ->
+	    {ok,Result}
+    end.
+
+cmp(Module,InFile) ->
+    Base = filename:basename(InFile),
+    Dir = filename:dirname(InFile),
+    Ext = filename:extension(Base),
+    Finfo = file:read_file_info(InFile),
+    Minfo = file:read_file_info(filename:join(Dir,lists:concat([Module,Ext]))),
+    case Finfo of
+	Minfo ->
+	    ok;
+	_ ->
+	    io:format("asn1error: Modulename and filename must be equal~n",[]),
+	    throw(error)
+    end.
+
+vsn() ->
+    ?vsn.
+
+print_error_message([got,H|T]) when list(H) ->
+    io:format(" got:"),
+    print_listing(H,"and"),
+    print_error_message(T);
+print_error_message([expected,H|T]) when list(H) ->
+    io:format(" expected one of:"),
+    print_listing(H,"or"),
+    print_error_message(T);
+print_error_message([H|T])  ->
+    io:format(" ~p",[H]),
+    print_error_message(T);
+print_error_message([]) ->
+    io:format("~n").
+
+print_listing([H1,H2|[]],AndOr) ->
+    io:format(" ~p ~s ~p",[H1,AndOr,H2]);
+print_listing([H1,H2|T],AndOr) ->
+    io:format(" ~p,",[H1]),
+    print_listing([H2|T],AndOr);
+print_listing([H],_AndOr) ->
+    io:format(" ~p",[H]);
+print_listing([],_) ->
+    ok.
+
+
+%% functions to administer ets tables
+
+%% Always creates a new table
+create_ets_table(Name,Options) when atom(Name) ->
+    case ets:info(Name) of
+	undefined ->
+	    ets:new(Name,Options);
+	_  ->
+	    ets:delete(Name),
+	    ets:new(Name,Options)
+    end.
+
+%% Creates a new ets table only if no table exists
+create_if_no_table(Name,Options) ->
+    case ets:info(Name) of
+	undefined ->
+	    %% create a new table
+	    create_ets_table(Name,Options);
+	_ -> ok
+    end.
+
+
+delete_tables([Table|Ts]) ->
+    case ets:info(Table) of
+	undefined -> ok;
+	_ -> ets:delete(Table)
+    end,
+    delete_tables(Ts);
+delete_tables([]) ->
+    ok.
+
+
+specialized_decode_prepare(Erule,M,TsAndVs,Options) ->
+%     Asn1confMember =
+% 	fun([{asn1config,File}|_],_) ->
+% 		{true,File};
+% 	   ([],_) -> false;
+% 	   ([_H|T],Fun) ->
+% 		Fun(T,Fun)
+% 	end,
+%     case Asn1confMember(Options,Asn1confMember) of
+%	{true,File} ->
+    case lists:member(asn1config,Options) of
+	true ->
+	    partial_decode_prepare(Erule,M,TsAndVs,Options);
+	_ ->
+	    ok
+    end.
+%% Reads the configuration file if it exists and stores information
+%% about partial decode and incomplete decode
+partial_decode_prepare(ber_bin_v2,M,TsAndVs,Options) when tuple(TsAndVs) ->
+    %% read configure file
+%    Types = element(1,TsAndVs),
+    CfgList = read_config_file(M#module.name),
+    SelectedDecode = get_config_info(CfgList,partial_decode),
+    ExclusiveDecode = get_config_info(CfgList,exclusive_decode),
+    CommandList =
+	create_partial_decode_gen_info(M#module.name,SelectedDecode),
+%    io:format("partial_decode = ~p~n",[CommandList]),
+
+    save_config(partial_decode,CommandList),
+    CommandList2 =
+	create_partial_inc_decode_gen_info(M#module.name,ExclusiveDecode),
+%    io:format("partial_incomplete_decode = ~p~n",[CommandList2]),
+    Part_inc_tlv_tags = tag_format(ber_bin_v2,Options,CommandList2),
+%    io:format("partial_incomplete_decode: tlv_tags = ~p~n",[Part_inc_tlv_tags]),
+    save_config(partial_incomplete_decode,Part_inc_tlv_tags),
+    save_gen_state(ExclusiveDecode,Part_inc_tlv_tags);
+partial_decode_prepare(_,_,_,_) ->
+    ok.
+
+
+
+%% create_partial_inc_decode_gen_info/2
+%%
+%% Creats a list of tags out of the information in TypeNameList that
+%% tells which value will be incomplete decoded, i.e. each end
+%% component/type in TypeNameList. The significant types/components in
+%% the path from the toptype must be specified in the
+%% TypeNameList. Significant elements are all constructed types that
+%% branches the path to the leaf and the leaf it selfs.
+%%
+%% Returns a list of elements, where an element may be one of
+%% mandatory|[opt,Tag]|[bin,Tag]. mandatory correspond to a mandatory
+%% element that shall be decoded as usual. [opt,Tag] matches an
+%% OPTIONAL or DEFAULT element that shall be decoded as
+%% usual. [bin,Tag] corresponds to an element, mandatory, OPTIONAL or
+%% DEFAULT, that shall be left encoded (incomplete decoded).
+create_partial_inc_decode_gen_info(ModName,{Mod,[{Name,L}|Ls]}) when list(L) ->
+    TopTypeName = partial_inc_dec_toptype(L),
+    [{Name,TopTypeName,
+      create_partial_inc_decode_gen_info1(ModName,TopTypeName,{Mod,L})}|
+     create_partial_inc_decode_gen_info(ModName,{Mod,Ls})];
+create_partial_inc_decode_gen_info(_,{_,[]}) ->
+    [];
+create_partial_inc_decode_gen_info(_,[]) ->
+    [].
+
+create_partial_inc_decode_gen_info1(ModName,TopTypeName,{ModName,
+					    [_TopType|Rest]}) ->
+    case asn1_db:dbget(ModName,TopTypeName) of
+	#typedef{typespec=TS} ->
+	    TagCommand = get_tag_command(TS,?MANDATORY,mandatory),
+	    create_pdec_inc_command(ModName,get_components(TS#type.def),
+				    Rest,[TagCommand]);
+	_ ->
+	    throw({error,{"wrong type list in asn1 config file",
+			  TopTypeName}})
+    end;
+create_partial_inc_decode_gen_info1(M1,_,{M2,_}) when M1 /= M2 ->
+    throw({error,{"wrong module name in asn1 config file",
+		  M2}});
+create_partial_inc_decode_gen_info1(_,_,TNL) ->
+    throw({error,{"wrong type list in asn1 config file",
+		  TNL}}).
+
+%%
+%% Only when there is a 'ComponentType' the config data C1 may be a
+%% list, where the incomplete decode is branched. So, C1 may be a
+%% list, a "binary tuple", a "parts tuple" or an atom. The second
+%% element of a binary tuple and a parts tuple is an atom.
+create_pdec_inc_command(_ModName,_,[],Acc) ->
+    lists:reverse(Acc);
+create_pdec_inc_command(ModName,{Comps1,Comps2},TNL,Acc)
+  when list(Comps1),list(Comps2) ->
+    create_pdec_inc_command(ModName,Comps1 ++ Comps2,TNL,Acc);
+create_pdec_inc_command(ModN,Clist,[CL|_Rest],Acc) when list(CL) ->
+    create_pdec_inc_command(ModN,Clist,CL,Acc);
+create_pdec_inc_command(ModName,
+			CList=[#'ComponentType'{name=Name,typespec=TS,
+						prop=Prop}|Comps],
+			TNL=[C1|Cs],Acc)  ->
+    case C1 of
+% 	Name ->
+% 	    %% In this case C1 is an atom
+% 	    TagCommand = get_tag_command(TS,?MANDATORY,Prop),
+% 	    create_pdec_inc_command(ModName,get_components(TS#type.def),Cs,[TagCommand|Acc]);
+	{Name,undecoded} ->
+	    TagCommand = get_tag_command(TS,?UNDECODED,Prop),
+	    create_pdec_inc_command(ModName,Comps,Cs,[TagCommand|Acc]);
+	{Name,parts} ->
+	    TagCommand = get_tag_command(TS,?PARTS,Prop),
+	    create_pdec_inc_command(ModName,Comps,Cs,[TagCommand|Acc]);
+	L when list(L) ->
+	    %% This case is only possible as the first element after
+	    %% the top type element, when top type is SEGUENCE or SET.
+	    %% Follow each element in L. Must note every tag on the
+	    %% way until the last command is reached, but it ought to
+	    %% be enough to have a "complete" or "complete optional"
+	    %% command for each component that is not specified in the
+	    %% config file. Then in the TLV decode the components with
+	    %% a "complete" command will be decoded by an ordinary TLV
+	    %% decode.
+	    create_pdec_inc_command(ModName,CList,L,Acc);
+	{Name,RestPartsList} when list(RestPartsList) ->
+	    %% Same as previous, but this may occur at any place in
+	    %% the structure. The previous is only possible as the
+	    %% second element.
+	    case get_tag_command(TS,?MANDATORY,Prop) of
+		?MANDATORY ->
+		    InnerDirectives=
+			create_pdec_inc_command(ModName,TS#type.def,
+						RestPartsList,[]),
+		    create_pdec_inc_command(ModName,Comps,Cs,
+					    [[?MANDATORY,InnerDirectives]|Acc]);
+%		    create_pdec_inc_command(ModName,Comps,Cs,
+%					    [InnerDirectives,?MANDATORY|Acc]);
+		[Opt,EncTag] ->
+		    InnerDirectives =
+			create_pdec_inc_command(ModName,TS#type.def,
+						RestPartsList,[]),
+		    create_pdec_inc_command(ModName,Comps,Cs,
+					    [[Opt,EncTag,InnerDirectives]|Acc])
+	    end;
+%	    create_pdec_inc_command(ModName,CList,RestPartsList,Acc);
+%%	    create_pdec_inc_command(ModName,TS#type.def,RestPartsList,Acc);
+	_ -> %% this component may not be in the config list
+	    TagCommand = get_tag_command(TS,?MANDATORY,Prop),
+	    create_pdec_inc_command(ModName,Comps,TNL,[TagCommand|Acc])
+    end;
+create_pdec_inc_command(ModName,
+			{'CHOICE',[#'ComponentType'{name=C1,
+						    typespec=TS,
+						    prop=Prop}|Comps]},
+			[{C1,Directive}|Rest],Acc) ->
+    case Directive of
+	List when list(List) ->
+	    [Command,Tag] = get_tag_command(TS,?ALTERNATIVE,Prop),
+	    CompAcc = create_pdec_inc_command(ModName,TS#type.def,List,[]),
+	    create_pdec_inc_command(ModName,{'CHOICE',Comps},Rest,
+				    [[Command,Tag,CompAcc]|Acc]);
+	undecoded ->
+	    TagCommand = get_tag_command(TS,?ALTERNATIVE_UNDECODED,Prop),
+	    create_pdec_inc_command(ModName,{'CHOICE',Comps},Rest,
+				    [TagCommand|Acc]);
+	parts ->
+	    TagCommand = get_tag_command(TS,?ALTERNATIVE_PARTS,Prop),
+	    create_pdec_inc_command(ModName,{'CHOICE',Comps},Rest,
+				    [TagCommand|Acc])
+    end;
+create_pdec_inc_command(ModName,
+			{'CHOICE',[#'ComponentType'{typespec=TS,
+						    prop=Prop}|Comps]},
+			TNL,Acc) ->
+    TagCommand = get_tag_command(TS,?ALTERNATIVE,Prop),
+    create_pdec_inc_command(ModName,{'CHOICE',Comps},TNL,[TagCommand|Acc]);
+create_pdec_inc_command(M,{'CHOICE',{Cs1,Cs2}},TNL,Acc)
+  when list(Cs1),list(Cs2) ->
+    create_pdec_inc_command(M,{'CHOICE',Cs1 ++ Cs2},TNL,Acc);
+create_pdec_inc_command(ModName,#'Externaltypereference'{module=M,type=Name},
+			TNL,Acc) ->
+    #type{def=Def} = get_referenced_type(M,Name),
+    create_pdec_inc_command(ModName,get_components(Def),TNL,Acc);
+create_pdec_inc_command(_,_,TNL,_) ->
+    throw({error,{"unexpected error when creating partial "
+		  "decode command",TNL}}).
+
+partial_inc_dec_toptype([T|_]) when atom(T) ->
+    T;
+partial_inc_dec_toptype([{T,_}|_]) when atom(T) ->
+    T;
+partial_inc_dec_toptype([L|_]) when list(L) ->
+    partial_inc_dec_toptype(L);
+partial_inc_dec_toptype(_) ->
+    throw({error,{"no top type found for partial incomplete decode"}}).
+
+
+%% Creats a list of tags out of the information in TypeList and Types
+%% that tells which value will be decoded.  Each constructed type that
+%% is in the TypeList will get a "choosen" command. Only the last
+%% type/component in the TypeList may be a primitive type. Components
+%% "on the way" to the final element may get the "skip" or the
+%% "skip_optional" command.
+%% CommandList = [Elements]
+%% Elements = {choosen,Tag}|{skip_optional,Tag}|skip
+%% Tag is a binary with the tag BER encoded.
+create_partial_decode_gen_info(ModName,{{_,ModName},TypeList}) ->
+    case TypeList of
+	[TopType|Rest] ->
+	    case asn1_db:dbget(ModName,TopType) of
+		#typedef{typespec=TS} ->
+		    TagCommand = get_tag_command(TS,?CHOOSEN),
+		    create_pdec_command(ModName,get_components(TS#type.def),
+					Rest,[TagCommand]);
+		_ ->
+		    throw({error,{"wrong type list in asn1 config file",
+				  TypeList}})
+	    end;
+	_ ->
+	    []
+    end;
+create_partial_decode_gen_info(_,[]) ->
+    [];
+create_partial_decode_gen_info(_M1,{{_,M2},_}) ->
+    throw({error,{"wrong module name in asn1 config file",
+				  M2}}).
+
+%% create_pdec_command/4 for each name (type or component) in the
+%% third argument, TypeNameList, a command is created. The command has
+%% information whether the component/type shall be skipped, looked
+%% into or returned. The list of commands is returned.
+create_pdec_command(_ModName,_,[],Acc) ->
+    lists:reverse(Acc);
+create_pdec_command(ModName,[#'ComponentType'{name=C1,typespec=TS}|_Comps],
+		    [C1|Cs],Acc) ->
+    %% this component is a constructed type or the last in the
+    %% TypeNameList otherwise the config spec is wrong
+    TagCommand = get_tag_command(TS,?CHOOSEN),
+    create_pdec_command(ModName,get_components(TS#type.def),
+			Cs,[TagCommand|Acc]);
+create_pdec_command(ModName,[#'ComponentType'{typespec=TS,
+					      prop=Prop}|Comps],
+		    [C2|Cs],Acc) ->
+    TagCommand =
+	case Prop of
+	    mandatory ->
+		get_tag_command(TS,?SKIP);
+	    _ ->
+		get_tag_command(TS,?SKIP_OPTIONAL)
+	end,
+    create_pdec_command(ModName,Comps,[C2|Cs],[TagCommand|Acc]);
+create_pdec_command(ModName,{'CHOICE',[Comp=#'ComponentType'{name=C1}|_]},TNL=[C1|_Cs],Acc) ->
+    create_pdec_command(ModName,[Comp],TNL,Acc);
+create_pdec_command(ModName,{'CHOICE',[#'ComponentType'{}|Comps]},TNL,Acc) ->
+    create_pdec_command(ModName,{'CHOICE',Comps},TNL,Acc);
+create_pdec_command(ModName,#'Externaltypereference'{module=M,type=C1},
+		    TypeNameList,Acc) ->
+    case get_referenced_type(M,C1) of
+	#type{def=Def} ->
+	    create_pdec_command(ModName,get_components(Def),TypeNameList,
+				Acc);
+	Err ->
+	    throw({error,{"unexpected result when fetching "
+			  "referenced element",Err}})
+    end;
+create_pdec_command(ModName,TS=#type{def=Def},[C1|Cs],Acc) ->
+    %% This case when we got the "components" of a SEQUENCE/SET OF
+    case C1 of
+	[1] ->
+	    %% A list with an integer is the only valid option in a 'S
+	    %% OF', the other valid option would be an empty
+	    %% TypeNameList saying that the entire 'S OF' will be
+	    %% decoded.
+	    TagCommand = get_tag_command(TS,?CHOOSEN),
+	    create_pdec_command(ModName,Def,Cs,[TagCommand|Acc]);
+	[N] when integer(N) ->
+	    TagCommand = get_tag_command(TS,?SKIP),
+	    create_pdec_command(ModName,Def,[[N-1]|Cs],[TagCommand|Acc]);
+	Err ->
+	    throw({error,{"unexpected error when creating partial "
+			  "decode command",Err}})
+    end;
+create_pdec_command(_,_,TNL,_) ->
+    throw({error,{"unexpected error when creating partial "
+		  "decode command",TNL}}).
+
+% get_components({'CHOICE',Components}) ->
+%     Components;
+get_components(#'SEQUENCE'{components=Components}) ->
+    Components;
+get_components(#'SET'{components=Components}) ->
+    Components;
+get_components({'SEQUENCE OF',Components}) ->
+    Components;
+get_components({'SET OF',Components}) ->
+    Components;
+get_components(Def) ->
+    Def.
+
+%% get_tag_command(Type,Command)
+
+%% Type is the type that has information about the tag Command tells
+%% what to do with the encoded value with the tag of Type when
+%% decoding.
+get_tag_command(#type{tag=[]},_) ->
+    [];
+get_tag_command(#type{tag=[_Tag]},?SKIP) ->
+    ?SKIP;
+get_tag_command(#type{tag=[Tag]},Command) ->
+    %% encode the tag according to BER
+    [Command,encode_tag_val(decode_class(Tag#tag.class),Tag#tag.form,
+			    Tag#tag.number)];
+get_tag_command(T=#type{tag=[Tag|Tags]},Command) ->
+    [get_tag_command(T#type{tag=Tag},Command)|
+     get_tag_command(T#type{tag=Tags},Command)].
+
+%% get_tag_command/3 used by create_pdec_inc_command
+get_tag_command(#type{tag=[]},_,_) ->
+    [];
+get_tag_command(#type{tag=[Tag]},?MANDATORY,Prop) ->
+    case Prop of
+	mandatory ->
+	    ?MANDATORY;
+	{'DEFAULT',_} ->
+	    [?DEFAULT,encode_tag_val(decode_class(Tag#tag.class),
+				     Tag#tag.form,Tag#tag.number)];
+	_ -> [?OPTIONAL,encode_tag_val(decode_class(Tag#tag.class),
+				       Tag#tag.form,Tag#tag.number)]
+    end;
+get_tag_command(#type{tag=[Tag]},Command,_) ->
+    [Command,encode_tag_val(decode_class(Tag#tag.class),Tag#tag.form,
+			    Tag#tag.number)].
+
+
+get_referenced_type(M,Name) ->
+    case asn1_db:dbget(M,Name) of
+	#typedef{typespec=TS} ->
+	    case TS of
+		#type{def=#'Externaltypereference'{module=M2,type=Name2}} ->
+		    %% The tags have already been taken care of in the
+		    %% first reference where they were gathered in a
+		    %% list of tags.
+		    get_referenced_type(M2,Name2);
+		#type{} -> TS;
+		_  ->
+		    throw({error,{"unexpected element when"
+				  " fetching referenced type",TS}})
+	    end;
+	T ->
+	    throw({error,{"unexpected element when fetching "
+			  "referenced type",T}})
+    end.
+
+tag_format(EncRule,_Options,CommandList) ->
+    case EncRule of
+	ber_bin_v2 ->
+	    tlv_tags(CommandList);
+	_ ->
+	    CommandList
+    end.
+
+tlv_tags([]) ->
+    [];
+tlv_tags([mandatory|Rest]) ->
+    [mandatory|tlv_tags(Rest)];
+tlv_tags([[Command,Tag]|Rest]) when atom(Command),binary(Tag) ->
+    [[Command,tlv_tag(Tag)]|tlv_tags(Rest)];
+tlv_tags([[Command,Directives]|Rest]) when atom(Command),list(Directives) ->
+    [[Command,tlv_tags(Directives)]|tlv_tags(Rest)];
+%% remove all empty lists
+tlv_tags([[]|Rest]) ->
+    tlv_tags(Rest);
+tlv_tags([{Name,TopType,L1}|Rest]) when list(L1),atom(TopType) ->
+    [{Name,TopType,tlv_tags(L1)}|tlv_tags(Rest)];
+tlv_tags([[Command,Tag,L1]|Rest]) when list(L1),binary(Tag) ->
+    [[Command,tlv_tag(Tag),tlv_tags(L1)]|tlv_tags(Rest)];
+tlv_tags([L=[L1|_]|Rest]) when list(L1) ->
+    [tlv_tags(L)|tlv_tags(Rest)].
+
+tlv_tag(<<Cl:2,_:1,TagNo:5>>) when TagNo < 31 ->
+    (Cl bsl 16) + TagNo;
+tlv_tag(<<Cl:2,_:1,31:5,0:1,TagNo:7>>) ->
+    (Cl bsl 16) + TagNo;
+tlv_tag(<<Cl:2,_:1,31:5,Buffer/binary>>) ->
+    TagNo = tlv_tag1(Buffer,0),
+    (Cl bsl 16) + TagNo.
+tlv_tag1(<<0:1,PartialTag:7>>,Acc) ->
+    (Acc bsl 7) bor PartialTag;
+tlv_tag1(<<1:1,PartialTag:7,Buffer/binary>>,Acc) ->
+    tlv_tag1(Buffer,(Acc bsl 7) bor PartialTag).
+
+%% reads the content from the configuration file and returns the
+%% selected part choosen by InfoType. Assumes that the config file
+%% content is an Erlang term.
+read_config_file(ModuleName,InfoType) when atom(InfoType) ->
+    CfgList = read_config_file(ModuleName),
+    get_config_info(CfgList,InfoType).
+
+
+read_config_file(ModuleName) ->
+    case file:consult(lists:concat([ModuleName,'.asn1config'])) of
+%    case file:consult(ModuleName) of
+	{ok,CfgList} ->
+	    CfgList;
+	{error,enoent} ->
+	    Options = get(encoding_options),
+	    Includes = [I || {i,I} <- Options],
+	    read_config_file1(ModuleName,Includes);
+	{error,Reason} ->
+	    file:format_error(Reason),
+	    throw({error,{"error reading asn1 config file",Reason}})
+    end.
+read_config_file1(ModuleName,[]) ->
+    case filename:extension(ModuleName) of
+	".asn1config" ->
+	    throw({error,enoent});
+	_ ->
+	    read_config_file(lists:concat([ModuleName,".asn1config"]))
+    end;
+read_config_file1(ModuleName,[H|T]) ->
+%    File = filename:join([H,lists:concat([ModuleName,'.asn1config'])]),
+    File = filename:join([H,ModuleName]),
+    case file:consult(File) of
+	{ok,CfgList} ->
+	    CfgList;
+	{error,enoent} ->
+	    read_config_file1(ModuleName,T);
+	{error,Reason} ->
+	    file:format_error(Reason),
+	    throw({error,{"error reading asn1 config file",Reason}})
+    end.
+
+get_config_info(CfgList,InfoType) ->
+    case InfoType of
+	all ->
+	    CfgList;
+	_ ->
+	    case lists:keysearch(InfoType,1,CfgList) of
+		{value,{InfoType,Value}} ->
+		    Value;
+		false ->
+		    []
+	    end
+    end.
+
+%% save_config/2 saves the Info with the key Key
+%% Before saving anything check if a table exists
+save_config(Key,Info) ->
+    create_if_no_table(asn1_general,[named_table]),
+    ets:insert(asn1_general,{{asn1_config,Key},Info}).
+
+read_config_data(Key) ->
+    case ets:info(asn1_general) of
+	undefined -> undefined;
+	_ ->
+	    case ets:lookup(asn1_general,{asn1_config,Key}) of
+		[{_,Data}] -> Data;
+		Err ->
+		    io:format("strange data from config file ~w~n",[Err]),
+		    Err
+	    end
+    end.
+
+
+%%
+%% Functions to manipulate the gen_state record saved in the
+%% asn1_general ets table.
+%%
+
+%% saves input data in a new gen_state record
+save_gen_state({_,ConfList},PartIncTlvTagList) ->
+    %ConfList=[{FunctionName,PatternList}|Rest]
+    StateRec = #gen_state{inc_tag_pattern=PartIncTlvTagList,
+			  inc_type_pattern=ConfList},
+    save_config(gen_state,StateRec);
+save_gen_state(_,_) ->
+%%    ok.
+    save_config(gen_state,#gen_state{}).
+
+save_gen_state(GenState) when record(GenState,gen_state) ->
+    save_config(gen_state,GenState).
+
+
+%% get_gen_state_field returns undefined if no gen_state exists or if
+%% Field is undefined or the data at the field.
+get_gen_state_field(Field) ->
+    case read_config_data(gen_state) of
+	undefined ->
+	    undefined;
+	GenState ->
+	    get_gen_state_field(GenState,Field)
+    end.
+get_gen_state_field(#gen_state{active=Active},active) ->
+    Active;
+get_gen_state_field(_,active) ->
+    false;
+get_gen_state_field(GS,prefix) ->
+    GS#gen_state.prefix;
+get_gen_state_field(GS,inc_tag_pattern) ->
+    GS#gen_state.inc_tag_pattern;
+get_gen_state_field(GS,tag_pattern) ->
+    GS#gen_state.tag_pattern;
+get_gen_state_field(GS,inc_type_pattern) ->
+    GS#gen_state.inc_type_pattern;
+get_gen_state_field(GS,type_pattern) ->
+    GS#gen_state.type_pattern;
+get_gen_state_field(GS,func_name) ->
+    GS#gen_state.func_name;
+get_gen_state_field(GS,namelist) ->
+    GS#gen_state.namelist;
+get_gen_state_field(GS,tobe_refed_funcs) ->
+    GS#gen_state.tobe_refed_funcs;
+get_gen_state_field(GS,gen_refed_funcs) ->
+    GS#gen_state.gen_refed_funcs.
+
+
+get_gen_state() ->
+    read_config_data(gen_state).
+
+
+update_gen_state(Field,Data) ->
+    case get_gen_state() of
+	State when record(State,gen_state) ->
+	    update_gen_state(Field,State,Data);
+	_ ->
+	    exit({error,{asn1,{internal,
+			       "tried to update nonexistent gen_state",Field,Data}}})
+    end.
+update_gen_state(active,State,Data) ->
+    save_gen_state(State#gen_state{active=Data});
+update_gen_state(prefix,State,Data) ->
+    save_gen_state(State#gen_state{prefix=Data});
+update_gen_state(inc_tag_pattern,State,Data) ->
+    save_gen_state(State#gen_state{inc_tag_pattern=Data});
+update_gen_state(tag_pattern,State,Data) ->
+    save_gen_state(State#gen_state{tag_pattern=Data});
+update_gen_state(inc_type_pattern,State,Data) ->
+    save_gen_state(State#gen_state{inc_type_pattern=Data});
+update_gen_state(type_pattern,State,Data) ->
+    save_gen_state(State#gen_state{type_pattern=Data});
+update_gen_state(func_name,State,Data) ->
+    save_gen_state(State#gen_state{func_name=Data});
+update_gen_state(namelist,State,Data) ->
+%     SData =
+% 	case Data of
+% 	    [D] when list(D) -> D;
+% 	    _ -> Data
+% 	end,
+    save_gen_state(State#gen_state{namelist=Data});
+update_gen_state(tobe_refed_funcs,State,Data) ->
+    save_gen_state(State#gen_state{tobe_refed_funcs=Data});
+update_gen_state(gen_refed_funcs,State,Data) ->
+    save_gen_state(State#gen_state{gen_refed_funcs=Data}).
+
+update_namelist(Name) ->
+    case get_gen_state_field(namelist) of
+	[Name,Rest] -> update_gen_state(namelist,Rest);
+	[Name|Rest] -> update_gen_state(namelist,Rest);
+	[{Name,List}] when list(List) -> update_gen_state(namelist,List);
+	[{Name,Atom}|Rest] when atom(Atom) -> update_gen_state(namelist,Rest);
+	Other -> Other
+    end.
+
+pop_namelist() ->
+    DeepTail = %% removes next element in order
+	fun([[{_,A}]|T],_Fun) when atom(A) -> T;
+	   ([{_N,L}|T],_Fun) when list(L) -> [L|T];
+	   ([[]|T],Fun) -> Fun(T,Fun);
+	   ([L1|L2],Fun) when list(L1) ->
+		case lists:flatten(L1) of
+		    [] -> Fun([L2],Fun);
+		    _ -> [Fun(L1,Fun)|L2]
+		end;
+	   ([_H|T],_Fun) -> T
+	end,
+    {Pop,NewNL} =
+	case get_gen_state_field(namelist) of
+	    [] -> {[],[]};
+	    L ->
+		{next_namelist_el(L),
+		 DeepTail(L,DeepTail)}
+	end,
+    update_gen_state(namelist,NewNL),
+    Pop.
+
+%% next_namelist_el fetches the next type/component name in turn in
+%% the namelist, without changing the namelist.
+next_namelist_el() ->
+    case get_gen_state_field(namelist) of
+	undefined -> undefined;
+	L when list(L) -> next_namelist_el(L)
+    end.
+
+next_namelist_el([]) ->
+    [];
+next_namelist_el([L]) when list(L) ->
+    next_namelist_el(L);
+next_namelist_el([H|_]) when atom(H) ->
+    H;
+next_namelist_el([L|T]) when list(L) ->
+    case next_namelist_el(L) of
+	[] ->
+	    next_namelist_el([T]);
+	R ->
+	    R
+    end;
+next_namelist_el([H={_,A}|_]) when atom(A) ->
+    H.
+
+%% removes a bracket from the namelist
+step_in_constructed() ->
+    case get_gen_state_field(namelist) of
+	[L] when list(L) ->
+	    update_gen_state(namelist,L);
+	_ -> ok
+    end.
+
+is_function_generated(Name) ->
+    case get_gen_state_field(gen_refed_funcs) of
+	L when list(L) ->
+	    lists:member(Name,L);
+	_ ->
+	    false
+    end.
+
+get_tobe_refed_func(Name) ->
+    case get_gen_state_field(tobe_refed_funcs) of
+	L when list(L) ->
+	    case lists:keysearch(Name,1,L) of
+		{_,Element} ->
+		    Element;
+		_ ->
+		    undefined
+	    end;
+	_ ->
+	    undefined
+    end.
+
+add_tobe_refed_func(Data) ->
+    L = get_gen_state_field(tobe_refed_funcs),
+    update_gen_state(tobe_refed_funcs,[Data|L]).
+
+%% moves Name from the to be list to the generated list.
+generated_refed_func(Name) ->
+    L = get_gen_state_field(tobe_refed_funcs),
+    NewL = lists:keydelete(Name,1,L),
+    update_gen_state(tobe_refed_funcs,NewL),
+    L2 = get_gen_state_field(gen_refed_funcs),
+    update_gen_state(gen_refed_funcs,[Name|L2]).
+
+add_generated_refed_func(Data) ->
+    L = get_gen_state_field(gen_refed_funcs),
+    update_gen_state(gen_refed_funcs,[Data|L]).
+
+
+next_refed_func() ->
+    case get_gen_state_field(tobe_refed_funcs) of
+	[] ->
+	    [];
+	[H|T] ->
+	    update_gen_state(tobe_refed_funcs,T),
+	    H
+    end.
+
+reset_gen_state() ->
+    save_gen_state(#gen_state{}).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_check.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_check.erl
new file mode 100644
index 0000000000..2f0ada122e
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_check.erl
@@ -0,0 +1,5566 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_check.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
+%%
+-module(asn1ct_check).
+
+%% Main Module for ASN.1 compile time functions
+
+%-compile(export_all).
+-export([check/2,storeindb/1]).
+-include("asn1_records.hrl").
+%%% The tag-number for universal types
+-define(N_BOOLEAN, 1).
+-define(N_INTEGER, 2).
+-define(N_BIT_STRING, 3).
+-define(N_OCTET_STRING, 4).
+-define(N_NULL, 5).
+-define(N_OBJECT_IDENTIFIER, 6).
+-define(N_OBJECT_DESCRIPTOR, 7).
+-define(N_EXTERNAL, 8). % constructed
+-define(N_INSTANCE_OF,8).
+-define(N_REAL, 9).
+-define(N_ENUMERATED, 10).
+-define(N_EMBEDDED_PDV, 11). % constructed
+-define(N_SEQUENCE, 16).
+-define(N_SET, 17).
+-define(N_NumericString, 18).
+-define(N_PrintableString, 19).
+-define(N_TeletexString, 20).
+-define(N_VideotexString, 21).
+-define(N_IA5String, 22).
+-define(N_UTCTime, 23).
+-define(N_GeneralizedTime, 24).
+-define(N_GraphicString, 25).
+-define(N_VisibleString, 26).
+-define(N_GeneralString, 27).
+-define(N_UniversalString, 28).
+-define(N_CHARACTER_STRING, 29). % constructed
+-define(N_BMPString, 30).
+
+-define(TAG_PRIMITIVE(Num),
+	case S#state.erule of
+	    ber_bin_v2 ->
+		#tag{class='UNIVERSAL',number=Num,type='IMPLICIT',form=0};
+	    _ -> []
+	end).
+-define(TAG_CONSTRUCTED(Num),
+	case S#state.erule of
+	    ber_bin_v2 ->
+		#tag{class='UNIVERSAL',number=Num,type='IMPLICIT',form=32};
+	    _ -> []
+	end).
+
+-record(newt,{type=unchanged,tag=unchanged,constraint=unchanged,inlined=no}). % used in check_type to update type and tag
+-record(newv,{type=unchanged,value=unchanged}). % used in check_value to update type and value
+
+check(S,{Types,Values,ParameterizedTypes,Classes,Objects,ObjectSets}) ->
+    %%Predicates used to filter errors
+    TupleIs = fun({T,_},T) -> true;
+		 (_,_) -> false
+	      end,
+    IsClass = fun(X) -> TupleIs(X,asn1_class) end,
+    IsObjSet = fun(X) -> TupleIs(X,objectsetdef) end,
+    IsPObjSet = fun(X) -> TupleIs(X,pobjectsetdef) end,
+    IsObject = fun(X) -> TupleIs(X,objectdef) end,
+    IsValueSet = fun(X) -> TupleIs(X,valueset) end,
+    Element2 = fun(X) -> element(2,X) end,
+
+    _Perror = checkp(S,ParameterizedTypes,[]), % must do this before the templates are used
+    Terror = checkt(S,Types,[]),
+
+    %% get parameterized object sets sent to checkt/3
+    %% and update Terror
+
+    {PObjSetNames1,Terror2} = filter_errors(IsPObjSet,Terror),
+
+    Verror = checkv(S,Values ++ ObjectSets,[]), %value sets may be parsed as object sets
+
+     %% get information object classes wrongly sent to checkt/3
+     %% and update Terror2
+
+    {AddClasses,Terror3} = filter_errors(IsClass,Terror2),
+
+    NewClasses = Classes++AddClasses,
+
+    Cerror = checkc(S,NewClasses,[]),
+
+     %% get object sets incorrectly sent to checkv/3
+     %% and update Verror
+
+    {ObjSetNames,Verror2} = filter_errors(IsObjSet,Verror),
+
+     %% get parameterized object sets incorrectly sent to checkv/3
+     %% and update Verror2
+
+    {PObjSetNames,Verror3} = filter_errors(IsPObjSet,Verror2),
+
+     %% get objects incorrectly sent to checkv/3
+     %% and update Verror3
+
+    {ObjectNames,Verror4} = filter_errors(IsObject,Verror3),
+
+    NewObjects = Objects++ObjectNames,
+    NewObjectSets = ObjSetNames ++ PObjSetNames ++ PObjSetNames1,
+
+     %% get value sets
+     %% and update Verror4
+
+    {ValueSetNames,Verror5} = filter_errors(IsValueSet,Verror4),
+
+    asn1ct:create_ets_table(inlined_objects,[named_table]),
+    {Oerror,ExclO,ExclOS} = checko(S,NewObjects ++
+				   NewObjectSets,
+				   [],[],[]),
+    InlinedObjTuples = ets:tab2list(inlined_objects),
+    InlinedObjects = lists:map(Element2,InlinedObjTuples),
+    ets:delete(inlined_objects),
+
+    Exporterror = check_exports(S,S#state.module),
+    case {Terror3,Verror5,Cerror,Oerror,Exporterror} of
+	{[],[],[],[],[]} ->
+	    ContextSwitchTs = context_switch_in_spec(),
+	    InstanceOf = instance_of_in_spec(),
+	    NewTypes = lists:subtract(Types,AddClasses) ++ ContextSwitchTs
+		++ InstanceOf,
+	    NewValues = lists:subtract(Values,PObjSetNames++ObjectNames++
+				       ValueSetNames),
+	    {ok,
+	     {NewTypes,NewValues,ParameterizedTypes,
+	      NewClasses,NewObjects,NewObjectSets},
+	     {NewTypes,NewValues,ParameterizedTypes,NewClasses,
+	      lists:subtract(NewObjects,ExclO)++InlinedObjects,
+	      lists:subtract(NewObjectSets,ExclOS)}};
+	_ ->{error,{asn1,lists:flatten([Terror3,Verror5,Cerror,
+					Oerror,Exporterror])}}
+    end.
+
+context_switch_in_spec() ->
+    L = [{external,'EXTERNAL'},
+	 {embedded_pdv,'EMBEDDED PDV'},
+	 {character_string,'CHARACTER STRING'}],
+    F = fun({T,TName},Acc) ->
+		case get(T) of
+		    generate -> erase(T),
+				[TName|Acc];
+		    _ -> Acc
+		end
+	end,
+    lists:foldl(F,[],L).
+
+instance_of_in_spec() ->
+    case get(instance_of) of
+	generate ->
+	    erase(instance_of),
+	    ['INSTANCE OF'];
+	_ ->
+	    []
+    end.
+
+filter_errors(Pred,ErrorList) ->
+    Element2 = fun(X) -> element(2,X) end,
+    RemovedTupleElements = lists:filter(Pred,ErrorList),
+    RemovedNames = lists:map(Element2,RemovedTupleElements),
+    %% remove value set name tuples from Verror
+    RestErrors = lists:subtract(ErrorList,RemovedTupleElements),
+    {RemovedNames,RestErrors}.
+
+
+check_exports(S,Module = #module{}) ->
+    case Module#module.exports of
+	{exports,[]} ->
+	    [];
+	{exports,all} ->
+	    [];
+	{exports,ExportList} when list(ExportList) ->
+	    IsNotDefined =
+		fun(X) ->
+			case catch get_referenced_type(S,X) of
+			    {error,{asn1,_}} ->
+				true;
+			    _ -> false
+			end
+		end,
+	    case lists:filter(IsNotDefined,ExportList) of
+		[] ->
+		    [];
+		NoDefExp ->
+		    GetName =
+			fun(T = #'Externaltypereference'{type=N})->
+				%%{exported,undefined,entity,N}
+				NewS=S#state{type=T,tname=N},
+				error({export,"exported undefined entity",NewS})
+			end,
+		    lists:map(GetName,NoDefExp)
+	    end
+    end.
+
+checkt(S,[Name|T],Acc) ->
+    %%io:format("check_typedef:~p~n",[Name]),
+    Result =
+	case asn1_db:dbget(S#state.mname,Name) of
+	    undefined ->
+		error({type,{internal_error,'???'},S});
+	    Type when record(Type,typedef) ->
+		NewS = S#state{type=Type,tname=Name},
+		case catch(check_type(NewS,Type,Type#typedef.typespec)) of
+		    {error,Reason} ->
+			error({type,Reason,NewS});
+		    {'EXIT',Reason} ->
+			error({type,{internal_error,Reason},NewS});
+		    {asn1_class,_ClassDef} ->
+			{asn1_class,Name};
+		    pobjectsetdef ->
+			{pobjectsetdef,Name};
+		    pvalueset ->
+			{pvalueset,Name};
+		    Ts ->
+			case Type#typedef.checked of
+			    true -> % already checked and updated
+				ok;
+			    _ ->
+				NewTypeDef = Type#typedef{checked=true,typespec = Ts},
+				%io:format("checkt:dbput:~p, ~p~n",[S#state.mname,NewTypeDef#typedef.name]),
+				asn1_db:dbput(NewS#state.mname,Name,NewTypeDef), % update the type
+				ok
+			end
+		end
+	end,
+    case Result of
+	ok ->
+	    checkt(S,T,Acc);
+	_ ->
+	    checkt(S,T,[Result|Acc])
+    end;
+checkt(S,[],Acc) ->
+    case check_contextswitchingtypes(S,[]) of
+	[] ->
+	    lists:reverse(Acc);
+	L ->
+	    checkt(S,L,Acc)
+    end.
+
+check_contextswitchingtypes(S,Acc) ->
+    CSTList=[{external,'EXTERNAL'},
+	     {embedded_pdv,'EMBEDDED PDV'},
+	     {character_string,'CHARACTER STRING'}],
+    check_contextswitchingtypes(S,CSTList,Acc).
+
+check_contextswitchingtypes(S,[{T,TName}|Ts],Acc) ->
+     case get(T) of
+	unchecked ->
+	    put(T,generate),
+	    check_contextswitchingtypes(S,Ts,[TName|Acc]);
+	_ ->
+	    check_contextswitchingtypes(S,Ts,Acc)
+     end;
+check_contextswitchingtypes(_,[],Acc) ->
+    Acc.
+
+checkv(S,[Name|T],Acc) ->
+    %%io:format("check_valuedef:~p~n",[Name]),
+    Result = case asn1_db:dbget(S#state.mname,Name) of
+		 undefined -> error({value,{internal_error,'???'},S});
+		 Value when record(Value,valuedef);
+			    record(Value,typedef); %Value set may be parsed as object set.
+			    record(Value,pvaluedef);
+			    record(Value,pvaluesetdef) ->
+		     NewS = S#state{value=Value},
+		     case catch(check_value(NewS,Value)) of
+			 {error,Reason} ->
+			     error({value,Reason,NewS});
+			 {'EXIT',Reason} ->
+			     error({value,{internal_error,Reason},NewS});
+			 {pobjectsetdef} ->
+			     {pobjectsetdef,Name};
+			 {objectsetdef} ->
+			     {objectsetdef,Name};
+			 {objectdef} ->
+			     %% this is an object, save as typedef
+			     #valuedef{checked=C,pos=Pos,name=N,type=Type,
+				       value=Def}=Value,
+%			     Currmod = S#state.mname,
+%			     #type{def=
+%				   #'Externaltypereference'{module=Mod,
+%							    type=CName}} = Type,
+			     ClassName =
+				 Type#type.def,
+% 				 case Mod of
+% 				     Currmod ->
+% 					 {objectclassname,CName};
+% 				     _ ->
+% 					 {objectclassname,Mod,CName}
+% 				 end,
+			     NewSpec = #'Object'{classname=ClassName,
+						 def=Def},
+			     NewDef = #typedef{checked=C,pos=Pos,name=N,
+					       typespec=NewSpec},
+			     asn1_db:dbput(NewS#state.mname,Name,NewDef),
+			     {objectdef,Name};
+			 {valueset,VSet} ->
+			     Pos = asn1ct:get_pos_of_def(Value),
+			     CheckedVSDef = #typedef{checked=true,pos=Pos,
+						     name=Name,typespec=VSet},
+			     asn1_db:dbput(NewS#state.mname,Name,CheckedVSDef),
+			     {valueset,Name};
+			 V ->
+			     %% update the valuedef
+			     asn1_db:dbput(NewS#state.mname,Name,V),
+			     ok
+		     end
+	     end,
+    case Result of
+	ok ->
+	    checkv(S,T,Acc);
+	_ ->
+	    checkv(S,T,[Result|Acc])
+    end;
+checkv(_S,[],Acc) ->
+    lists:reverse(Acc).
+
+
+checkp(S,[Name|T],Acc) ->
+    %io:format("check_ptypedef:~p~n",[Name]),
+    Result = case asn1_db:dbget(S#state.mname,Name) of
+	undefined ->
+	    error({type,{internal_error,'???'},S});
+	Type when record(Type,ptypedef) ->
+	    NewS = S#state{type=Type,tname=Name},
+	    case catch(check_ptype(NewS,Type,Type#ptypedef.typespec)) of
+		{error,Reason} ->
+		    error({type,Reason,NewS});
+		{'EXIT',Reason} ->
+		    error({type,{internal_error,Reason},NewS});
+		{asn1_class,_ClassDef} ->
+		    {asn1_class,Name};
+		Ts ->
+		    NewType = Type#ptypedef{checked=true,typespec = Ts},
+		    asn1_db:dbput(NewS#state.mname,Name,NewType), % update the type
+		    ok
+	    end
+	     end,
+    case Result of
+	ok ->
+	    checkp(S,T,Acc);
+	_ ->
+	    checkp(S,T,[Result|Acc])
+    end;
+checkp(_S,[],Acc) ->
+    lists:reverse(Acc).
+
+
+
+
+checkc(S,[Name|Cs],Acc) ->
+    Result =
+	case asn1_db:dbget(S#state.mname,Name) of
+	    undefined ->
+		error({class,{internal_error,'???'},S});
+	    Class  ->
+		ClassSpec = if
+			       record(Class,classdef) ->
+				   Class#classdef.typespec;
+			       record(Class,typedef) ->
+				   Class#typedef.typespec
+			   end,
+		NewS = S#state{type=Class,tname=Name},
+		case catch(check_class(NewS,ClassSpec)) of
+		    {error,Reason} ->
+			error({class,Reason,NewS});
+		    {'EXIT',Reason} ->
+			error({class,{internal_error,Reason},NewS});
+		    C ->
+			%% update the classdef
+			NewClass =
+			    if
+				record(Class,classdef) ->
+				    Class#classdef{checked=true,typespec=C};
+				record(Class,typedef) ->
+				    #classdef{checked=true,name=Name,typespec=C}
+			    end,
+			asn1_db:dbput(NewS#state.mname,Name,NewClass),
+			ok
+		end
+	end,
+    case Result of
+	ok ->
+	    checkc(S,Cs,Acc);
+	_ ->
+	    checkc(S,Cs,[Result|Acc])
+    end;
+checkc(_S,[],Acc) ->
+%%    include_default_class(S#state.mname),
+    lists:reverse(Acc).
+
+checko(S,[Name|Os],Acc,ExclO,ExclOS) ->
+    Result =
+	case asn1_db:dbget(S#state.mname,Name) of
+	    undefined ->
+		error({type,{internal_error,'???'},S});
+	    Object when record(Object,typedef) ->
+		NewS = S#state{type=Object,tname=Name},
+		case catch(check_object(NewS,Object,Object#typedef.typespec)) of
+		    {error,Reason} ->
+			error({type,Reason,NewS});
+		    {'EXIT',Reason} ->
+			error({type,{internal_error,Reason},NewS});
+		    {asn1,Reason} ->
+			error({type,Reason,NewS});
+		    O ->
+			NewObj = Object#typedef{checked=true,typespec=O},
+			asn1_db:dbput(NewS#state.mname,Name,NewObj),
+			if
+			    record(O,'Object') ->
+				case O#'Object'.gen of
+				    true ->
+					{ok,ExclO,ExclOS};
+				    false ->
+					{ok,[Name|ExclO],ExclOS}
+				end;
+			    record(O,'ObjectSet') ->
+				case O#'ObjectSet'.gen of
+				    true ->
+					{ok,ExclO,ExclOS};
+				    false ->
+					{ok,ExclO,[Name|ExclOS]}
+				end
+			end
+		end;
+	    PObject when record(PObject,pobjectdef) ->
+		NewS = S#state{type=PObject,tname=Name},
+		case (catch check_pobject(NewS,PObject)) of
+		    {error,Reason} ->
+			error({type,Reason,NewS});
+		    {'EXIT',Reason} ->
+			error({type,{internal_error,Reason},NewS});
+		    {asn1,Reason} ->
+			error({type,Reason,NewS});
+		    PO ->
+			NewPObj = PObject#pobjectdef{def=PO},
+			asn1_db:dbput(NewS#state.mname,Name,NewPObj),
+			{ok,[Name|ExclO],ExclOS}
+		end;
+	    PObjSet when record(PObjSet,pvaluesetdef) ->
+		%% this is a parameterized object set. Might be a parameterized
+		%% value set, couldn't it?
+		NewS = S#state{type=PObjSet,tname=Name},
+		case (catch check_pobjectset(NewS,PObjSet)) of
+		    {error,Reason} ->
+			error({type,Reason,NewS});
+		    {'EXIT',Reason} ->
+			error({type,{internal_error,Reason},NewS});
+		    {asn1,Reason} ->
+			error({type,Reason,NewS});
+		    POS ->
+			%%NewPObjSet = PObjSet#pvaluesetdef{valueset=POS},
+			asn1_db:dbput(NewS#state.mname,Name,POS),
+			{ok,ExclO,[Name|ExclOS]}
+		end
+	end,
+    case Result of
+	{ok,NewExclO,NewExclOS} ->
+	    checko(S,Os,Acc,NewExclO,NewExclOS);
+	_ ->
+	    checko(S,Os,[Result|Acc],ExclO,ExclOS)
+    end;
+checko(_S,[],Acc,ExclO,ExclOS) ->
+    {lists:reverse(Acc),lists:reverse(ExclO),lists:reverse(ExclOS)}.
+
+check_class(S,CDef=#classdef{checked=Ch,name=Name,typespec=TS}) ->
+    case Ch of
+	true -> TS;
+	idle -> TS;
+	_ ->
+	    NewCDef = CDef#classdef{checked=idle},
+	    asn1_db:dbput(S#state.mname,Name,NewCDef),
+	    CheckedTS = check_class(S,TS),
+	    asn1_db:dbput(S#state.mname,Name,
+			  NewCDef#classdef{checked=true,
+					   typespec=CheckedTS}),
+	    CheckedTS
+    end;
+check_class(S = #state{mname=M,tname=T},ClassSpec)
+  when record(ClassSpec,type) ->
+    Def = ClassSpec#type.def,
+    case Def of
+	#'Externaltypereference'{module=M,type=T} ->
+	    #objectclass{fields=Def}; % in case of recursive definitions
+	Tref when record(Tref,'Externaltypereference') ->
+	    {_,RefType} = get_referenced_type(S,Tref),
+% 	    case RefType of
+% 		RefClass when record(RefClass,classdef) ->
+% 		    check_class(S,RefClass#classdef.typespec)
+% 	    end
+	    case is_class(S,RefType) of
+		true ->
+		    check_class(S,get_class_def(S,RefType));
+		_ ->
+		    error({class,{internal_error,RefType},S})
+	    end
+    end;
+% check_class(S,{objectclassname,ModuleName,ClassName}) when atom(ModuleName),atom(ClassName) ->
+%     'fix this';
+check_class(S,C) when record(C,objectclass) ->
+    NewFieldSpec = check_class_fields(S,C#objectclass.fields),
+    C#objectclass{fields=NewFieldSpec};
+%check_class(S,{objectclassname,ClassName}) ->
+check_class(S,ClassName) ->
+    {_,Def} = get_referenced_type(S,ClassName),
+    case Def of
+	ClassDef when record(ClassDef,classdef) ->
+	    case ClassDef#classdef.checked of
+		true ->
+		    ClassDef#classdef.typespec;
+		idle ->
+		    ClassDef#classdef.typespec;
+		false ->
+		    check_class(S,ClassDef#classdef.typespec)
+	    end;
+	TypeDef when record(TypeDef,typedef) ->
+	    %% this case may occur when a definition is a reference
+	    %% to a class definition.
+	    case TypeDef#typedef.typespec of
+		#type{def=Ext} when record(Ext,'Externaltypereference') ->
+		    check_class(S,Ext)
+	    end
+    end;
+check_class(_S,{poc,_ObjSet,_Params}) ->
+    'fix this later'.
+
+check_class_fields(S,Fields) ->
+    check_class_fields(S,Fields,[]).
+
+check_class_fields(S,[F|Fields],Acc) ->
+    NewField =
+	case element(1,F) of
+	    fixedtypevaluefield ->
+		{_,Name,Type,Unique,OSpec} = F,
+		RefType = check_type(S,#typedef{typespec=Type},Type),
+		{fixedtypevaluefield,Name,RefType,Unique,OSpec};
+	    object_or_fixedtypevalue_field ->
+		{_,Name,Type,Unique,OSpec} = F,
+		Cat =
+		    case asn1ct_gen:type(asn1ct_gen:get_inner(Type#type.def)) of
+			Def when record(Def,typereference);
+				 record(Def,'Externaltypereference') ->
+			    {_,D} = get_referenced_type(S,Def),
+			    D;
+			{undefined,user} ->
+			    %% neither of {primitive,bif} or {constructed,bif}
+%%			    {_,D} = get_referenced_type(S,#typereference{val=Type#type.def}),
+			    {_,D} = get_referenced_type(S,#'Externaltypereference'{module=S#state.mname,type=Type#type.def}),
+			    D;
+			_ ->
+			    Type
+		    end,
+		case Cat of
+		    Class when record(Class,classdef) ->
+			{objectfield,Name,Type,Unique,OSpec};
+		    _ ->
+			RefType = check_type(S,#typedef{typespec=Type},Type),
+			{fixedtypevaluefield,Name,RefType,Unique,OSpec}
+		end;
+	    objectset_or_fixedtypevalueset_field ->
+		{_,Name,Type,OSpec} = F,
+%%		RefType = check_type(S,#typedef{typespec=Type},Type),
+		RefType =
+		    case (catch check_type(S,#typedef{typespec=Type},Type)) of
+			{asn1_class,_ClassDef} ->
+			    case if_current_checked_type(S,Type) of
+				true ->
+				    Type#type.def;
+				_ ->
+				    check_class(S,Type)
+			    end;
+			CheckedType when record(CheckedType,type) ->
+			    CheckedType;
+			_ ->
+			    error({class,"internal error, check_class_fields",S})
+		    end,
+		if
+		    record(RefType,'Externaltypereference') ->
+			{objectsetfield,Name,Type,OSpec};
+		    record(RefType,classdef) ->
+			{objectsetfield,Name,Type,OSpec};
+		    record(RefType,objectclass) ->
+			{objectsetfield,Name,Type,OSpec};
+		    true ->
+			{fixedtypevaluesetfield,Name,RefType,OSpec}
+		end;
+	    typefield ->
+		case F of
+		    {TF,Name,{'DEFAULT',Type}} ->
+			{TF,Name,{'DEFAULT',check_type(S,#typedef{typespec=Type},Type)}};
+		    _ -> F
+		end;
+	    _ -> F
+	end,
+    check_class_fields(S,Fields,[NewField|Acc]);
+check_class_fields(_S,[],Acc) ->
+    lists:reverse(Acc).
+
+if_current_checked_type(S,#type{def=Def}) ->
+    CurrentCheckedName = S#state.tname,
+    MergedModules = S#state.inputmodules,
+ %   CurrentCheckedModule = S#state.mname,
+    case Def of
+	#'Externaltypereference'{module=CurrentCheckedName,
+				 type=CurrentCheckedName} ->
+	    true;
+	#'Externaltypereference'{module=ModuleName,
+				 type=CurrentCheckedName} ->
+	    case MergedModules of
+		undefined ->
+		    false;
+		_ ->
+		    lists:member(ModuleName,MergedModules)
+	    end;
+	_ ->
+	    false
+    end.
+
+
+
+check_pobject(_S,PObject) when record(PObject,pobjectdef) ->
+    Def = PObject#pobjectdef.def,
+    Def.
+
+
+check_pobjectset(S,PObjSet) ->
+    #pvaluesetdef{pos=Pos,name=Name,args=Args,type=Type,
+		  valueset=ValueSet}=PObjSet,
+    {Mod,Def} = get_referenced_type(S,Type#type.def),
+    case Def of
+	#classdef{} ->
+	    ClassName = #'Externaltypereference'{module=Mod,
+						 type=Def#classdef.name},
+	    {valueset,Set} = ValueSet,
+%	    ObjectSet = #'ObjectSet'{class={objectclassname,ClassName},
+	    ObjectSet = #'ObjectSet'{class=ClassName,
+				     set=Set},
+	    #pobjectsetdef{pos=Pos,name=Name,args=Args,class=Type#type.def,
+			   def=ObjectSet};
+	_ ->
+	    PObjSet
+    end.
+
+check_object(_S,ObjDef,ObjSpec) when (ObjDef#typedef.checked == true) ->
+    ObjSpec;
+check_object(S,_ObjDef,#'Object'{classname=ClassRef,def=ObjectDef}) ->
+    {_,_ClassDef} = get_referenced_type(S,ClassRef),
+    NewClassRef = check_externaltypereference(S,ClassRef),
+    ClassDef =
+	case _ClassDef#classdef.checked of
+	    false ->
+		#classdef{checked=true,
+			  typespec=check_class(S,_ClassDef#classdef.typespec)};
+	    _ ->
+		_ClassDef
+	end,
+    NewObj =
+	case ObjectDef of
+	    Def when tuple(Def), (element(1,Def)==object) ->
+		NewSettingList = check_objectdefn(S,Def,ClassDef),
+		#'Object'{def=NewSettingList};
+%	    Def when tuple(Def), (element(1,Def)=='ObjectFromObject') ->
+%		fixa;
+	    {po,{object,DefObj},ArgsList} ->
+		{_,Object} = get_referenced_type(S,DefObj),%DefObj is a
+		%%#'Externalvaluereference' or a #'Externaltypereference'
+		%% Maybe this call should be catched and in case of an exception
+		%% an nonallocated parameterized object should be returned.
+		instantiate_po(S,ClassDef,Object,ArgsList);
+	    #'Externalvaluereference'{} ->
+		{_,Object} = get_referenced_type(S,ObjectDef),
+		check_object(S,Object,Object#typedef.typespec);
+	    _  ->
+		exit({error,{no_object,ObjectDef},S})
+	end,
+    Gen = gen_incl(S,NewObj#'Object'.def,
+		   (ClassDef#classdef.typespec)#objectclass.fields),
+    NewObj#'Object'{classname=NewClassRef,gen=Gen};
+
+%%check_object(S,ObjSetDef,ObjSet=#type{def={pt,ObjSetRef,Args}}) ->
+    %% A parameterized
+
+check_object(S,
+	     _ObjSetDef,
+	     ObjSet=#'ObjectSet'{class=ClassRef}) ->
+    {_,ClassDef} = get_referenced_type(S,ClassRef),
+    NewClassRef = check_externaltypereference(S,ClassRef),
+    UniqueFieldName =
+	case (catch get_unique_fieldname(ClassDef)) of
+	    {error,'__undefined_'} -> {unique,undefined};
+	    {asn1,Msg,_} -> error({class,Msg,S});
+	    Other -> Other
+	end,
+    NewObjSet=
+	case ObjSet#'ObjectSet'.set of
+	    {'SingleValue',Set} when list(Set) ->
+		CheckedSet = check_object_list(S,NewClassRef,Set),
+		NewSet = get_unique_valuelist(S,CheckedSet,UniqueFieldName),
+		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
+				   set=NewSet};
+	    {'SingleValue',{definedvalue,ObjName}} ->
+		{_,ObjDef} = get_referenced_type(S,#identifier{val=ObjName}),
+		#'Object'{def=CheckedObj} =
+		    check_object(S,ObjDef,ObjDef#typedef.typespec),
+		NewSet = get_unique_valuelist(S,[{ObjDef#typedef.name,
+						  CheckedObj}],
+					      UniqueFieldName),
+		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
+				   set=NewSet};
+	    {'SingleValue',#'Externalvaluereference'{value=ObjName}} ->
+		{_,ObjDef} = get_referenced_type(S,#identifier{val=ObjName}),
+		#'Object'{def=CheckedObj} =
+		    check_object(S,ObjDef,ObjDef#typedef.typespec),
+		NewSet = get_unique_valuelist(S,[{ObjDef#typedef.name,
+						  CheckedObj}],
+					      UniqueFieldName),
+		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
+				   set=NewSet};
+	    ['EXTENSIONMARK'] ->
+		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
+				   set=['EXTENSIONMARK']};
+	    Set when list(Set) ->
+		CheckedSet = check_object_list(S,NewClassRef,Set),
+		NewSet = get_unique_valuelist(S,CheckedSet,UniqueFieldName),
+		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
+				   set=NewSet};
+	    {Set,Ext} when list(Set) ->
+		CheckedSet = check_object_list(S,NewClassRef,Set++Ext),
+		NewSet = get_unique_valuelist(S,CheckedSet,UniqueFieldName),
+		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
+				   set=NewSet++['EXTENSIONMARK']};
+	    {{'SingleValue',Set},Ext} ->
+		CheckedSet = check_object_list(S,NewClassRef,
+					       merge_sets(Set,Ext)),
+		NewSet = get_unique_valuelist(S,CheckedSet,UniqueFieldName),
+		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
+				   set=NewSet++['EXTENSIONMARK']};
+	    {Type,{'EXCEPT',Exclusion}} when record(Type,type) ->
+		{_,TDef} = get_referenced_type(S,Type#type.def),
+		OS = TDef#typedef.typespec,
+		NewSet = reduce_objectset(OS#'ObjectSet'.set,Exclusion),
+		NewOS = OS#'ObjectSet'{set=NewSet},
+		check_object(S,TDef#typedef{typespec=NewOS},
+			     NewOS);
+	    #type{def={pt,DefinedObjSet,ParamList}} ->
+		{_,PObjSetDef} = get_referenced_type(S,DefinedObjSet),
+		instantiate_pos(S,ClassDef,PObjSetDef,ParamList);
+	    {ObjDef={object,definedsyntax,_ObjFields},_Ext} ->
+		CheckedSet = check_object_list(S,NewClassRef,[ObjDef]),
+		NewSet = get_unique_valuelist(S,CheckedSet,UniqueFieldName),
+		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
+				   set=NewSet++['EXTENSIONMARK']}
+	end,
+    Gen = gen_incl_set(S,NewObjSet#'ObjectSet'.set,
+		       ClassDef),
+    NewObjSet#'ObjectSet'{class=NewClassRef,gen=Gen}.
+
+
+merge_sets(Set,Ext) when list(Set),list(Ext) ->
+    Set ++ Ext;
+merge_sets(Set,Ext) when list(Ext) ->
+    [Set|Ext];
+merge_sets(Set,{'SingleValue',Ext}) when list(Set) ->
+    Set ++ [Ext];
+merge_sets(Set,{'SingleValue',Ext}) ->
+    [Set] ++ [Ext].
+
+reduce_objectset(ObjectSet,Exclusion) ->
+    case Exclusion of
+	{'SingleValue',#'Externalvaluereference'{value=Name}} ->
+	    case lists:keysearch(Name,1,ObjectSet) of
+		{value,El} ->
+		    lists:subtract(ObjectSet,[El]);
+		_ ->
+		    ObjectSet
+	    end
+    end.
+
+%% Checks a list of objects or object sets and returns a list of selected
+%% information for the code generation.
+check_object_list(S,ClassRef,ObjectList) ->
+    check_object_list(S,ClassRef,ObjectList,[]).
+
+check_object_list(S,ClassRef,[ObjOrSet|Objs],Acc) ->
+    case ObjOrSet of
+	ObjDef when tuple(ObjDef),(element(1,ObjDef)==object) ->
+	    Def =
+		check_object(S,#typedef{typespec=ObjDef},
+%			     #'Object'{classname={objectclassname,ClassRef},
+			     #'Object'{classname=ClassRef,
+				       def=ObjDef}),
+	    check_object_list(S,ClassRef,Objs,[{no_name,Def#'Object'.def}|Acc]);
+	{'SingleValue',{definedvalue,ObjName}} ->
+	    {_,ObjectDef} = get_referenced_type(S,#identifier{val=ObjName}),
+	    #'Object'{def=Def} = check_object(S,ObjectDef,ObjectDef#typedef.typespec),
+	    check_object_list(S,ClassRef,Objs,[{ObjectDef#typedef.name,Def}|Acc]);
+	{'SingleValue',Ref = #'Externalvaluereference'{}} ->
+	    {_,ObjectDef} = get_referenced_type(S,Ref),
+	    #'Object'{def=Def} = check_object(S,ObjectDef,ObjectDef#typedef.typespec),
+	    check_object_list(S,ClassRef,Objs,[{ObjectDef#typedef.name,Def}|Acc]);
+	ObjRef when record(ObjRef,'Externalvaluereference') ->
+	    {_,ObjectDef} = get_referenced_type(S,ObjRef),
+	    #'Object'{def=Def} = check_object(S,ObjectDef,ObjectDef#typedef.typespec),
+	    check_object_list(S,ClassRef,Objs,
+%%			      [{ObjRef#'Externalvaluereference'.value,Def}|Acc]);
+			      [{ObjectDef#typedef.name,Def}|Acc]);
+	{'ValueFromObject',{_,Object},FieldName} ->
+	    {_,Def} = get_referenced_type(S,Object),
+%%	    TypeOrVal = get_fieldname_element(S,Def,FieldName);%% this must result in an object set
+	    TypeDef = get_fieldname_element(S,Def,FieldName),
+	    (TypeDef#typedef.typespec)#'ObjectSet'.set;
+	ObjSet when record(ObjSet,type) ->
+	    ObjSetDef =
+		case ObjSet#type.def of
+		    Ref when record(Ref,typereference);
+			     record(Ref,'Externaltypereference') ->
+			{_,D} = get_referenced_type(S,ObjSet#type.def),
+			D;
+		    Other ->
+			throw({asn1_error,{'unknown objecset',Other,S}})
+		end,
+	    #'ObjectSet'{set=ObjectsInSet} =
+		check_object(S,ObjSetDef,ObjSetDef#typedef.typespec),
+	    AccList = transform_set_to_object_list(ObjectsInSet,[]),
+	    check_object_list(S,ClassRef,Objs,AccList++Acc);
+	union ->
+	    check_object_list(S,ClassRef,Objs,Acc);
+	Other ->
+	    exit({error,{'unknown object',Other},S})
+    end;
+%% Finally reverse the accumulated list and if there are any extension
+%% marks in the object set put one indicator of that in the end of the
+%% list.
+check_object_list(_,_,[],Acc) ->
+    lists:reverse(Acc).
+%%    case lists:member('EXTENSIONMARK',RevAcc) of
+%%	true ->
+%%	    ExclRevAcc = lists:filter(fun(X)->X /= 'EXTENSIONMARK' end,
+%%				      RevAcc),
+%%	    ExclRevAcc ++ ['EXTENSIONMARK'];
+%%	false ->
+%%	    RevAcc
+%%    end.
+
+
+%%  get_fieldname_element/3
+%%  gets the type/value/object/... of the referenced element in FieldName
+%%  FieldName is a list and may have more than one element.
+%%  Each element in FieldName can be either {typefieldreference,AnyFieldName}
+%%  or {valuefieldreference,AnyFieldName}
+%%  Def is the def of the first object referenced by FieldName
+get_fieldname_element(S,Def,[{_RefType,FieldName}]) when record(Def,typedef) ->
+    {_,_,ObjComps} = (Def#typedef.typespec)#'Object'.def,
+    case lists:keysearch(FieldName,1,ObjComps) of
+	{value,{_,TDef}} when record(TDef,typedef) ->
+	    %%    ORec = TDef#typedef.typespec, %% XXX This must be made general
+% 	    case TDef#typedef.typespec of
+% 		ObjSetRec when record(ObjSetRec,'ObjectSet') ->
+% 		    ObjSet = ObjSetRec#'ObjectSet'.set;
+% 		ObjRec when record(ObjRec,'Object') ->
+% 		    %% now get the field in ObjRec that RestFName points out
+% 		    %ObjRec
+% 		    TDef
+% 	    end;
+	    TDef;
+	{value,{_,VDef}} when record(VDef,valuedef) ->
+	    check_value(S,VDef);
+	_ ->
+	    throw({assigned_object_error,"not_assigned_object",S})
+    end;
+get_fieldname_element(_S,Def,[{_RefType,_FieldName}|_RestFName])
+  when record(Def,typedef) ->
+    ok.
+
+transform_set_to_object_list([{Name,_UVal,Fields}|Objs],Acc) ->
+    transform_set_to_object_list(Objs,[{Name,{object,generatesyntax,Fields}}|Acc]);
+transform_set_to_object_list(['EXTENSIONMARK'|Objs],Acc) ->
+%%    transform_set_to_object_list(Objs,['EXTENSIONMARK'|Acc]);
+    transform_set_to_object_list(Objs,Acc);
+transform_set_to_object_list([],Acc) ->
+    Acc.
+
+get_unique_valuelist(_S,ObjSet,{unique,undefined}) -> % no unique field in object
+    lists:map(fun({N,{_,_,F}})->{N,F};
+		 (V={_,_,_}) ->V end, ObjSet);
+get_unique_valuelist(S,ObjSet,UFN) ->
+    get_unique_vlist(S,ObjSet,UFN,[]).
+
+get_unique_vlist(S,[],_,Acc) ->
+    case catch check_uniqueness(Acc) of
+	{asn1_error,_} ->
+%	    exit({error,Reason,S});
+	    error({'ObjectSet',"not unique objects in object set",S});
+	true ->
+	    lists:reverse(Acc)
+    end;
+get_unique_vlist(S,[{ObjName,Obj}|Rest],UniqueFieldName,Acc) ->
+    {_,_,Fields} = Obj,
+    VDef = get_unique_value(S,Fields,UniqueFieldName),
+    get_unique_vlist(S,Rest,UniqueFieldName,
+		     [{ObjName,VDef#valuedef.value,Fields}|Acc]);
+get_unique_vlist(S,[V={_,_,_}|Rest],UniqueFieldName,Acc) ->
+    get_unique_vlist(S,Rest,UniqueFieldName,[V|Acc]).
+
+get_unique_value(S,Fields,UniqueFieldName) ->
+    Module = S#state.mname,
+    case lists:keysearch(UniqueFieldName,1,Fields) of
+	{value,Field} ->
+	    case element(2,Field) of
+		VDef when record(VDef,valuedef) ->
+		    VDef;
+		{definedvalue,ValName} ->
+		    ValueDef = asn1_db:dbget(Module,ValName),
+		    case ValueDef of
+			VDef when record(VDef,valuedef) ->
+			    ValueDef;
+			undefined ->
+			    #valuedef{value=ValName}
+		    end;
+		{'ValueFromObject',Object,Name} ->
+		    case Object of
+			{object,Ext} when record(Ext,'Externaltypereference') ->
+			    OtherModule = Ext#'Externaltypereference'.module,
+			    ExtObjName = Ext#'Externaltypereference'.type,
+			    ObjDef = asn1_db:dbget(OtherModule,ExtObjName),
+			    ObjSpec = ObjDef#typedef.typespec,
+			    get_unique_value(OtherModule,element(3,ObjSpec),Name);
+			{object,{_,_,ObjName}} ->
+			    ObjDef = asn1_db:dbget(Module,ObjName),
+			    ObjSpec = ObjDef#typedef.typespec,
+			    get_unique_value(Module,element(3,ObjSpec),Name);
+			{po,Object,_Params} ->
+			    exit({error,{'parameterized object not implemented yet',
+					 Object},S})
+		    end;
+		Value when atom(Value);number(Value) ->
+		    #valuedef{value=Value};
+		{'CHOICE',{_,Value}} when atom(Value);number(Value) ->
+		    #valuedef{value=Value}
+	    end;
+	false ->
+	    exit({error,{'no unique value',Fields,UniqueFieldName},S})
+%%	    io:format("WARNING: no unique value in object"),
+%%	    exit(uniqueFieldName)
+    end.
+
+check_uniqueness(NameValueList) ->
+    check_uniqueness1(lists:keysort(2,NameValueList)).
+
+check_uniqueness1([]) ->
+    true;
+check_uniqueness1([_]) ->
+    true;
+check_uniqueness1([{_,N,_},{_,N,_}|_Rest]) ->
+    throw({asn1_error,{'objects in set must have unique values in UNIQUE fields',N}});
+check_uniqueness1([_|Rest]) ->
+    check_uniqueness1(Rest).
+
+%% instantiate_po/4
+%% ClassDef is the class of Object,
+%% Object is the Parameterized object, which is referenced,
+%% ArgsList is the list of actual parameters
+%% returns an #'Object' record.
+instantiate_po(S,_ClassDef,Object,ArgsList) when record(Object,pobjectdef) ->
+    FormalParams = get_pt_args(Object),
+    MatchedArgs = match_args(FormalParams,ArgsList,[]),
+    NewS = S#state{type=Object,parameters=MatchedArgs},
+    check_object(NewS,Object,#'Object'{classname=Object#pobjectdef.class,
+				    def=Object#pobjectdef.def}).
+
+%% instantiate_pos/4
+%% ClassDef is the class of ObjectSetDef,
+%% ObjectSetDef is the Parameterized object set, which is referenced
+%% on the right side of the assignment,
+%% ArgsList is the list of actual parameters, i.e. real objects
+instantiate_pos(S,ClassDef,ObjectSetDef,ArgsList) ->
+    ClassName = ClassDef#classdef.name,
+    FormalParams = get_pt_args(ObjectSetDef),
+    Set = case get_pt_spec(ObjectSetDef) of
+	      {valueset,_Set} -> _Set;
+	      _Set -> _Set
+	  end,
+    MatchedArgs = match_args(FormalParams,ArgsList,[]),
+    NewS = S#state{type=ObjectSetDef,parameters=MatchedArgs},
+    check_object(NewS,ObjectSetDef,
+		 #'ObjectSet'{class=name2Extref(S#state.mname,ClassName),
+			      set=Set}).
+
+
+%% gen_incl -> boolean()
+%% If object with Fields has any of the corresponding class' typefields
+%% then return value is true otherwise it is false.
+%% If an object lacks a typefield but the class has a type field that
+%% is OPTIONAL then we want gen to be true
+gen_incl(S,{_,_,Fields},CFields)->
+    gen_incl1(S,Fields,CFields).
+
+gen_incl1(_,_,[]) ->
+    false;
+gen_incl1(S,Fields,[C|CFields]) ->
+    case element(1,C) of
+	typefield ->
+% 	    case lists:keymember(element(2,C),1,Fields) of
+% 		true ->
+% 		    true;
+% 		false ->
+% 		    gen_incl1(S,Fields,CFields)
+% 	    end;
+	    true; %% should check that field is OPTIONAL or DEFUALT if
+                  %% the object lacks this field
+	objectfield ->
+	    case lists:keysearch(element(2,C),1,Fields) of
+		{value,Field} ->
+		    Type = element(3,C),
+		    {_,ClassDef} = get_referenced_type(S,Type#type.def),
+%		    {_,ClassFields,_} = ClassDef#classdef.typespec,
+		    #objectclass{fields=ClassFields} =
+			ClassDef#classdef.typespec,
+		    ObjTDef = element(2,Field),
+		    case gen_incl(S,(ObjTDef#typedef.typespec)#'Object'.def,
+				  ClassFields) of
+			true ->
+			    true;
+			_ ->
+			    gen_incl1(S,Fields,CFields)
+		    end;
+		_ ->
+		    gen_incl1(S,Fields,CFields)
+	    end;
+	_ ->
+	    gen_incl1(S,Fields,CFields)
+    end.
+
+%% first if no unique field in the class return false.(don't generate code)
+gen_incl_set(S,Fields,ClassDef) ->
+    case catch get_unique_fieldname(ClassDef) of
+	Tuple when tuple(Tuple) ->
+	    false;
+	_ ->
+	    gen_incl_set1(S,Fields,
+			  (ClassDef#classdef.typespec)#objectclass.fields)
+    end.
+
+%% if any of the existing or potentially existing objects has a typefield
+%% then return true.
+gen_incl_set1(_,[],_CFields)->
+    false;
+gen_incl_set1(_,['EXTENSIONMARK'],_) ->
+    true;
+%% Fields are the fields of an object in the object set.
+%% CFields are the fields of the class of the object set.
+gen_incl_set1(S,[Object|Rest],CFields)->
+    Fields = element(size(Object),Object),
+    case gen_incl1(S,Fields,CFields) of
+	true ->
+	    true;
+	false ->
+	    gen_incl_set1(S,Rest,CFields)
+    end.
+
+check_objectdefn(S,Def,CDef) when record(CDef,classdef) ->
+    WithSyntax = (CDef#classdef.typespec)#objectclass.syntax,
+    ClassFields = (CDef#classdef.typespec)#objectclass.fields,
+    case Def of
+	{object,defaultsyntax,Fields} ->
+	    check_defaultfields(S,Fields,ClassFields);
+	{object,definedsyntax,Fields} ->
+	    {_,WSSpec} = WithSyntax,
+	    NewFields =
+		case catch( convert_definedsyntax(S,Fields,WSSpec,
+						  ClassFields,[])) of
+		    {asn1,{_ErrorType,ObjToken,ClassToken}} ->
+			throw({asn1,{'match error in object',ObjToken,
+				     'found in object',ClassToken,'found in class'}});
+		    Err={asn1,_} -> throw(Err);
+		    Err={'EXIT',_} -> throw(Err);
+		    DefaultFields when list(DefaultFields) ->
+			DefaultFields
+		end,
+	    {object,defaultsyntax,NewFields};
+	{object,_ObjectId} -> % This is a DefinedObject
+	    fixa;
+	Other ->
+	    exit({error,{objectdefn,Other}})
+    end.
+
+check_defaultfields(S,Fields,ClassFields) ->
+    check_defaultfields(S,Fields,ClassFields,[]).
+
+check_defaultfields(_S,[],_ClassFields,Acc) ->
+    {object,defaultsyntax,lists:reverse(Acc)};
+check_defaultfields(S,[{FName,Spec}|Fields],ClassFields,Acc) ->
+    case lists:keysearch(FName,2,ClassFields) of
+	{value,CField} ->
+	    NewField = convert_to_defaultfield(S,FName,Spec,CField),
+	    check_defaultfields(S,Fields,ClassFields,[NewField|Acc]);
+	_ ->
+	    throw({error,{asn1,{'unvalid field in object',FName}}})
+    end.
+%%    {object,defaultsyntax,Fields}.
+
+convert_definedsyntax(_S,[],[],_ClassFields,Acc) ->
+    lists:reverse(Acc);
+convert_definedsyntax(S,Fields,WithSyntax,ClassFields,Acc) ->
+    case match_field(S,Fields,WithSyntax,ClassFields) of
+	{MatchedField,RestFields,RestWS} ->
+	    if
+		list(MatchedField) ->
+		    convert_definedsyntax(S,RestFields,RestWS,ClassFields,
+					  lists:append(MatchedField,Acc));
+		true ->
+		    convert_definedsyntax(S,RestFields,RestWS,ClassFields,
+					  [MatchedField|Acc])
+	    end
+%%	    throw({error,{asn1,{'unvalid syntax in object',WorS}}})
+    end.
+
+match_field(S,Fields,WithSyntax,ClassFields) ->
+    match_field(S,Fields,WithSyntax,ClassFields,[]).
+
+match_field(S,Fields,[W|Ws],ClassFields,Acc) when list(W) ->
+    case catch(match_optional_field(S,Fields,W,ClassFields,[])) of
+	{'EXIT',_} ->
+	    match_field(Fields,Ws,ClassFields,Acc); %% add S
+%%	{[Result],RestFields} ->
+%%	    {Result,RestFields,Ws};
+	{Result,RestFields} when list(Result) ->
+	    {Result,RestFields,Ws};
+	_ ->
+	    match_field(S,Fields,Ws,ClassFields,Acc)
+    end;
+match_field(S,Fields,WithSyntax,ClassFields,_Acc) ->
+    match_mandatory_field(S,Fields,WithSyntax,ClassFields,[]).
+
+match_optional_field(_S,RestFields,[],_,Ret) ->
+    {Ret,RestFields};
+%% An additional optional field within an optional field
+match_optional_field(S,Fields,[W|Ws],ClassFields,Ret) when list(W) ->
+    case catch match_optional_field(S,Fields,W,ClassFields,[]) of
+	{'EXIT',_} ->
+	    {Ret,Fields};
+	{asn1,{optional_matcherror,_,_}} ->
+	    {Ret,Fields};
+	{OptionalField,RestFields} ->
+	    match_optional_field(S,RestFields,Ws,ClassFields,
+				 lists:append(OptionalField,Ret))
+    end;
+%% identify and skip word
+%match_optional_field(S,[#'Externaltypereference'{type=WorS}|Rest],
+match_optional_field(S,[{_,_,WorS}|Rest],
+		     [WorS|Ws],ClassFields,Ret) ->
+    match_optional_field(S,Rest,Ws,ClassFields,Ret);
+match_optional_field(S,[],_,ClassFields,Ret) ->
+    match_optional_field(S,[],[],ClassFields,Ret);
+%% identify and skip comma
+match_optional_field(S,[{WorS,_}|Rest],[{WorS,_}|Ws],ClassFields,Ret) ->
+    match_optional_field(S,Rest,Ws,ClassFields,Ret);
+%% identify and save field data
+match_optional_field(S,[Setting|Rest],[{_,W}|Ws],ClassFields,Ret) ->
+    WorS =
+	case Setting of
+	    Type when record(Type,type) -> Type;
+%%	    #'Externalvaluereference'{value=WordOrSetting} -> WordOrSetting;
+	    {'ValueFromObject',_,_} -> Setting;
+	    {object,_,_} -> Setting;
+	    {_,_,WordOrSetting} -> WordOrSetting;
+%%	    Atom when atom(Atom) -> Atom
+	    Other -> Other
+	end,
+    case lists:keysearch(W,2,ClassFields) of
+	false ->
+	    throw({asn1,{optional_matcherror,WorS,W}});
+	{value,CField} ->
+	    NewField = convert_to_defaultfield(S,W,WorS,CField),
+	    match_optional_field(S,Rest,Ws,ClassFields,[NewField|Ret])
+    end;
+match_optional_field(_S,[WorS|_Rest],[W|_Ws],_ClassFields,_Ret) ->
+    throw({asn1,{optional_matcherror,WorS,W}}).
+
+match_mandatory_field(_S,[],[],_,[Acc]) ->
+    {Acc,[],[]};
+match_mandatory_field(_S,[],[],_,Acc) ->
+    {Acc,[],[]};
+match_mandatory_field(S,[],[H|T],CF,Acc) when list(H) ->
+    match_mandatory_field(S,[],T,CF,Acc);
+match_mandatory_field(_S,[],WithSyntax,_,_Acc) ->
+    throw({asn1,{mandatory_matcherror,[],WithSyntax}});
+%match_mandatory_field(_S,Fields,WithSyntax=[W|_Ws],_ClassFields,[Acc]) when list(W) ->
+match_mandatory_field(_S,Fields,WithSyntax=[W|_Ws],_ClassFields,Acc) when list(W), length(Acc) >= 1 ->
+    {Acc,Fields,WithSyntax};
+%% identify and skip word
+match_mandatory_field(S,[{_,_,WorS}|Rest],
+		      [WorS|Ws],ClassFields,Acc) ->
+    match_mandatory_field(S,Rest,Ws,ClassFields,Acc);
+%% identify and skip comma
+match_mandatory_field(S,[{WorS,_}|Rest],[{WorS,_}|Ws],ClassFields,Ret) ->
+    match_mandatory_field(S,Rest,Ws,ClassFields,Ret);
+%% identify and save field data
+match_mandatory_field(S,[Setting|Rest],[{_,W}|Ws],ClassFields,Acc) ->
+    WorS =
+	case Setting of
+%%	    Atom when atom(Atom) -> Atom;
+%%	    #'Externalvaluereference'{value=WordOrSetting} -> WordOrSetting;
+	    {object,_,_} -> Setting;
+	    {_,_,WordOrSetting} -> WordOrSetting;
+	    Type when record(Type,type) -> Type;
+	    Other -> Other
+	end,
+    case lists:keysearch(W,2,ClassFields) of
+	false ->
+	    throw({asn1,{mandatory_matcherror,WorS,W}});
+	{value,CField} ->
+	    NewField = convert_to_defaultfield(S,W,WorS,CField),
+	    match_mandatory_field(S,Rest,Ws,ClassFields,[NewField|Acc])
+    end;
+
+match_mandatory_field(_S,[WorS|_Rest],[W|_Ws],_ClassFields,_Acc) ->
+    throw({asn1,{mandatory_matcherror,WorS,W}}).
+
+%% Converts a field of an object from defined syntax to default syntax
+convert_to_defaultfield(S,ObjFieldName,ObjFieldSetting,CField)->
+    CurrMod = S#state.mname,
+    case element(1,CField) of
+	typefield ->
+	    TypeDef=
+		case ObjFieldSetting of
+		    TypeRec when record(TypeRec,type) -> TypeRec#type.def;
+		    TDef when record(TDef,typedef) ->
+			TDef#typedef{typespec=check_type(S,TDef,
+							 TDef#typedef.typespec)};
+		    _ -> ObjFieldSetting
+		end,
+	    Type =
+		if
+		    record(TypeDef,typedef) -> TypeDef;
+		    true ->
+			case asn1ct_gen:type(asn1ct_gen:get_inner(TypeDef)) of
+			    ERef = #'Externaltypereference'{module=CurrMod} ->
+				{_,T} = get_referenced_type(S,ERef),
+				T#typedef{checked=true,
+					  typespec=check_type(S,T,
+							      T#typedef.typespec)};
+			    ERef = #'Externaltypereference'{module=ExtMod} ->
+				{_,T} = get_referenced_type(S,ERef),
+				#typedef{name=Name} = T,
+				check_type(S,T,T#typedef.typespec),
+				#typedef{checked=true,
+					 name={ExtMod,Name},
+					 typespec=ERef};
+			    Bif when Bif=={primitive,bif};Bif=={constructed,bif} ->
+				T = check_type(S,#typedef{typespec=ObjFieldSetting},
+					       ObjFieldSetting),
+				#typedef{checked=true,name=Bif,typespec=T};
+			    _ ->
+				{Mod,T} =
+				    %% get_referenced_type(S,#typereference{val=ObjFieldSetting}),
+				    get_referenced_type(S,#'Externaltypereference'{module=S#state.mname,type=ObjFieldSetting}),
+				case Mod of
+				    CurrMod ->
+					T;
+				    ExtMod ->
+					#typedef{name=Name} = T,
+					T#typedef{name={ExtMod,Name}}
+				end
+			end
+		end,
+	    {ObjFieldName,Type};
+	fixedtypevaluefield ->
+	    case ObjFieldName of
+		Val when atom(Val) ->
+		    %% ObjFieldSetting can be a value,an objectidentifiervalue,
+		    %% an element in an enumeration or namednumberlist etc.
+		    ValRef =
+			case ObjFieldSetting of
+			    #'Externalvaluereference'{} -> ObjFieldSetting;
+			    {'ValueFromObject',{_,ObjRef},FieldName} ->
+				{_,Object} = get_referenced_type(S,ObjRef),
+				ChObject = check_object(S,Object,
+							Object#typedef.typespec),
+				get_fieldname_element(S,Object#typedef{typespec=ChObject},
+						      FieldName);
+			    #valuedef{} ->
+				ObjFieldSetting;
+			    _ ->
+				#identifier{val=ObjFieldSetting}
+			end,
+		    case ValRef of
+			#valuedef{} ->
+			    {ObjFieldName,check_value(S,ValRef)};
+			_ ->
+			    ValDef =
+				case catch get_referenced_type(S,ValRef) of
+				    {error,_} ->
+					check_value(S,#valuedef{name=Val,
+								type=element(3,CField),
+								value=ObjFieldSetting});
+				    {_,VDef} when record(VDef,valuedef) ->
+					check_value(S,VDef);%% XXX
+				    {_,VDef} ->
+					check_value(S,#valuedef{name=Val,
+								type=element(3,CField),
+								value=VDef})
+				end,
+			    {ObjFieldName,ValDef}
+		    end;
+		Val ->
+		    {ObjFieldName,Val}
+	    end;
+	fixedtypevaluesetfield ->
+	    {ObjFieldName,ObjFieldSetting};
+	objectfield ->
+	    ObjectSpec =
+		case ObjFieldSetting of
+		    Ref when record(Ref,typereference);record(Ref,identifier);
+			     record(Ref,'Externaltypereference');
+			     record(Ref,'Externalvaluereference') ->
+			{_,R} = get_referenced_type(S,ObjFieldSetting),
+			R;
+		    {'ValueFromObject',{_,ObjRef},FieldName} ->
+			%% This is an ObjectFromObject
+			{_,Object} = get_referenced_type(S,ObjRef),
+			ChObject = check_object(S,Object,
+						Object#typedef.typespec),
+			_ObjFromObj=
+			    get_fieldname_element(S,Object#typedef{
+						      typespec=ChObject},
+						  FieldName);
+			%%ClassName = ObjFromObj#'Object'.classname,
+			%%#typedef{name=,
+			%%	 typespec=
+			%%	 ObjFromObj#'Object'{classname=
+			%%			     {objectclassname,ClassName}}};
+		    {object,_,_} ->
+			%% An object defined inlined in another object
+			#type{def=Ref} = element(3,CField),
+% 			CRef = case Ref of
+% 				   #'Externaltypereference'{module=CurrMod,
+% 							    type=CName} ->
+% 				       CName;
+% 				    #'Externaltypereference'{module=ExtMod,
+% 							    type=CName} ->
+% 				       {ExtMod,CName}
+% 			       end,
+			InlinedObjName=
+			    list_to_atom(lists:concat([S#state.tname]++
+						      ['_',ObjFieldName])),
+%			ObjSpec = #'Object'{classname={objectclassname,CRef},
+			ObjSpec = #'Object'{classname=Ref,
+					    def=ObjFieldSetting},
+			CheckedObj=
+			    check_object(S,#typedef{typespec=ObjSpec},ObjSpec),
+			InlObj = #typedef{checked=true,name=InlinedObjName,
+					  typespec=CheckedObj},
+			asn1ct_gen:insert_once(inlined_objects,{InlinedObjName,
+								InlinedObjName}),
+			asn1_db:dbput(S#state.mname,InlinedObjName,InlObj),
+			InlObj;
+		    #type{def=Eref} when record(Eref,'Externaltypereference') ->
+			{_,R} = get_referenced_type(S,Eref),
+			R;
+		    _ ->
+%%			{_,R} = get_referenced_type(S,#typereference{val=ObjFieldSetting}),
+			{_,R} = get_referenced_type(S,#'Externaltypereference'{module=S#state.mname,type=ObjFieldSetting}),
+			R
+		end,
+	    {ObjFieldName,
+	     ObjectSpec#typedef{checked=true,
+		      typespec=check_object(S,ObjectSpec,
+					    ObjectSpec#typedef.typespec)}};
+	variabletypevaluefield ->
+	    {ObjFieldName,ObjFieldSetting};
+	variabletypevaluesetfield ->
+	    {ObjFieldName,ObjFieldSetting};
+	objectsetfield ->
+	    {_,ObjSetSpec} =
+		case ObjFieldSetting of
+		    Ref when record(Ref,'Externaltypereference');
+			     record(Ref,'Externalvaluereference') ->
+			get_referenced_type(S,ObjFieldSetting);
+		    ObjectList when list(ObjectList) ->
+			%% an objctset defined in the object,though maybe
+			%% parsed as a SequenceOfValue
+			%% The ObjectList may be a list of references to
+			%% objects, a ValueFromObject
+			{_,_,Type,_} = CField,
+			ClassDef = Type#type.def,
+			case ClassDef#'Externaltypereference'.module of
+			    CurrMod ->
+				ClassDef#'Externaltypereference'.type;
+			    ExtMod ->
+				{ExtMod,
+				 ClassDef#'Externaltypereference'.type}
+			end,
+			{no_name,
+			 #typedef{typespec=
+				  #'ObjectSet'{class=
+%					       {objectclassname,ClassRef},
+					       ClassDef,
+					       set=ObjectList}}};
+		    ObjectSet={'SingleValue',_} ->
+			%% a Union of defined objects
+			{_,_,Type,_} = CField,
+			ClassDef = Type#type.def,
+% 			ClassRef =
+% 			    case ClassDef#'Externaltypereference'.module of
+% 				CurrMod ->
+% 				    ClassDef#'Externaltypereference'.type;
+% 				ExtMod ->
+% 				    {ExtMod,
+% 				     ClassDef#'Externaltypereference'.type}
+% 			    end,
+			{no_name,
+%			 #typedef{typespec=#'ObjectSet'{class={objectclassname,ClassRef},
+			 #typedef{typespec=#'ObjectSet'{class=ClassDef,
+							set=ObjectSet}}};
+		    {object,_,[#type{def={'TypeFromObject',
+					 {object,RefedObj},
+					 FieldName}}]} ->
+			%% This case occurs when an ObjectSetFromObjects
+			%% production is used
+			{M,Def} = get_referenced_type(S,RefedObj),
+			{M,get_fieldname_element(S,Def,FieldName)};
+		    #type{def=Eref} when
+			  record(Eref,'Externaltypereference') ->
+			get_referenced_type(S,Eref);
+		    _ ->
+%%			get_referenced_type(S,#typereference{val=ObjFieldSetting})
+			get_referenced_type(S,#'Externaltypereference'{module=S#state.mname,type=ObjFieldSetting})
+		end,
+	    {ObjFieldName,
+	     ObjSetSpec#typedef{checked=true,
+				typespec=check_object(S,ObjSetSpec,
+						      ObjSetSpec#typedef.typespec)}}
+    end.
+
+check_value(OldS,V) when record(V,pvaluesetdef) ->
+    #pvaluesetdef{checked=Checked,type=Type} = V,
+    case Checked of
+	true -> V;
+	{error,_} -> V;
+	false ->
+	    case get_referenced_type(OldS,Type#type.def) of
+		{_,Class} when record(Class,classdef) ->
+		    throw({pobjectsetdef});
+		_ -> continue
+	    end
+    end;
+check_value(_OldS,V) when record(V,pvaluedef) ->
+    %% Fix this case later
+    V;
+check_value(OldS,V) when record(V,typedef) ->
+    %% This case when a value set has been parsed as an object set.
+    %% It may be a value set
+    #typedef{typespec=TS} = V,
+    case TS of
+	#'ObjectSet'{class=ClassRef} ->
+	    {_,TSDef} = get_referenced_type(OldS,ClassRef),
+	    %%IsObjectSet(TSDef);
+	    case TSDef of
+		#classdef{} -> throw({objectsetdef});
+		#typedef{typespec=#type{def=Eref}} when
+		      record(Eref,'Externaltypereference') ->
+		    %% This case if the class reference is a defined
+		    %% reference to class
+		    check_value(OldS,V#typedef{typespec=TS#'ObjectSet'{class=Eref}});
+		#typedef{} ->
+		    % an ordinary value set with a type in #typedef.typespec
+		    ValueSet = TS#'ObjectSet'.set,
+		    Type=check_type(OldS,TSDef,TSDef#typedef.typespec),
+		    Value = check_value(OldS,#valuedef{type=Type,
+						       value=ValueSet}),
+		    {valueset,Type#type{constraint=Value#valuedef.value}}
+	    end;
+	_ ->
+	    throw({objectsetdef})
+    end;
+check_value(S,#valuedef{pos=Pos,name=Name,type=Type,
+			  value={valueset,Constr}}) ->
+    NewType = Type#type{constraint=[Constr]},
+    {valueset,
+     check_type(S,#typedef{pos=Pos,name=Name,typespec=NewType},NewType)};
+check_value(OldS=#state{recordtopname=TopName},V) when record(V,valuedef) ->
+    #valuedef{name=Name,checked=Checked,type=Vtype,value=Value} = V,
+    case Checked of
+	true ->
+	    V;
+	{error,_} ->
+	    V;
+	false ->
+	    Def = Vtype#type.def,
+	    Constr = Vtype#type.constraint,
+	    S = OldS#state{type=Vtype,tname=Def,value=V,vname=Name},
+	    NewDef =
+		case Def of
+		    Ext when record(Ext,'Externaltypereference') ->
+			RecName = Ext#'Externaltypereference'.type,
+			{_,Type} = get_referenced_type(S,Ext),
+			%% If V isn't a value but an object Type is a #classdef{}
+			case Type of
+			    #classdef{} ->
+				throw({objectdef});
+			    #typedef{} ->
+				case is_contextswitchtype(Type) of
+				    true ->
+					#valuedef{value=CheckedVal}=
+					    check_value(S,V#valuedef{type=Type#typedef.typespec}),
+					#newv{value=CheckedVal};
+				    _ ->
+					#valuedef{value=CheckedVal}=
+					    check_value(S#state{recordtopname=[RecName|TopName]},
+							V#valuedef{type=Type#typedef.typespec}),
+					#newv{value=CheckedVal}
+				end
+			end;
+		    'ANY' ->
+			throw({error,{asn1,{'cant check value of type',Def}}});
+		    'INTEGER' ->
+			validate_integer(S,Value,[],Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    {'INTEGER',NamedNumberList} ->
+			validate_integer(S,Value,NamedNumberList,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    {'BIT STRING',NamedNumberList} ->
+			validate_bitstring(S,Value,NamedNumberList,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'NULL' ->
+			validate_null(S,Value,Constr),
+			#newv{};
+		    'OBJECT IDENTIFIER' ->
+			validate_objectidentifier(S,Value,Constr),
+			#newv{value = normalize_value(S,Vtype,Value,[])};
+		    'ObjectDescriptor' ->
+			validate_objectdescriptor(S,Value,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    {'ENUMERATED',NamedNumberList} ->
+			validate_enumerated(S,Value,NamedNumberList,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'BOOLEAN'->
+			validate_boolean(S,Value,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'OCTET STRING' ->
+			validate_octetstring(S,Value,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'NumericString' ->
+			validate_restrictedstring(S,Value,Def,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'TeletexString' ->
+			validate_restrictedstring(S,Value,Def,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'VideotexString' ->
+			validate_restrictedstring(S,Value,Def,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'UTCTime' ->
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+%			exit({'cant check value of type' ,Def});
+		    'GeneralizedTime' ->
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+%			exit({'cant check value of type' ,Def});
+		    'GraphicString' ->
+			validate_restrictedstring(S,Value,Def,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'VisibleString' ->
+			validate_restrictedstring(S,Value,Def,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'GeneralString' ->
+			validate_restrictedstring(S,Value,Def,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'PrintableString' ->
+			validate_restrictedstring(S,Value,Def,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'IA5String' ->
+			validate_restrictedstring(S,Value,Def,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+		    'BMPString' ->
+			validate_restrictedstring(S,Value,Def,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,[])};
+%%		    'UniversalString' -> %added 6/12 -00
+%%			#newv{value=validate_restrictedstring(S,Value,Def,Constr)};
+		    Seq when record(Seq,'SEQUENCE') ->
+			SeqVal = validate_sequence(S,Value,
+						   Seq#'SEQUENCE'.components,
+						   Constr),
+			#newv{value=normalize_value(S,Vtype,SeqVal,TopName)};
+		    {'SEQUENCE OF',Components} ->
+			validate_sequenceof(S,Value,Components,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,TopName)};
+		    {'CHOICE',Components} ->
+			validate_choice(S,Value,Components,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,TopName)};
+		    Set when record(Set,'SET') ->
+			validate_set(S,Value,Set#'SET'.components,
+					      Constr),
+			#newv{value=normalize_value(S,Vtype,Value,TopName)};
+		    {'SET OF',Components} ->
+			validate_setof(S,Value,Components,Constr),
+			#newv{value=normalize_value(S,Vtype,Value,TopName)};
+		    Other ->
+			exit({'cant check value of type' ,Other})
+		end,
+	    case NewDef#newv.value of
+		unchanged ->
+		    V#valuedef{checked=true,value=Value};
+		ok ->
+		    V#valuedef{checked=true,value=Value};
+		{error,Reason} ->
+		    V#valuedef{checked={error,Reason},value=Value};
+		_V ->
+		    V#valuedef{checked=true,value=_V}
+	    end
+    end.
+
+is_contextswitchtype(#typedef{name='EXTERNAL'})->
+    true;
+is_contextswitchtype(#typedef{name='EMBEDDED PDV'}) ->
+    true;
+is_contextswitchtype(#typedef{name='CHARACTER STRING'}) ->
+    true;
+is_contextswitchtype(_) ->
+    false.
+
+% validate_integer(S,{identifier,Pos,Id},NamedNumberList,Constr) ->
+%     case lists:keysearch(Id,1,NamedNumberList) of
+% 	{value,_} -> ok;
+% 	false -> error({value,"unknown NamedNumber",S})
+%     end;
+%% This case occurs when there is a valuereference
+validate_integer(S=#state{mname=M},
+		 #'Externalvaluereference'{module=M,value=Id},
+		 NamedNumberList,_Constr) ->
+    case lists:keysearch(Id,1,NamedNumberList) of
+	{value,_} -> ok;
+	false -> error({value,"unknown NamedNumber",S})
+    end;
+validate_integer(S,Id,NamedNumberList,_Constr) when atom(Id) ->
+    case lists:keysearch(Id,1,NamedNumberList) of
+	{value,_} -> ok;
+	false -> error({value,"unknown NamedNumber",S})
+    end;
+validate_integer(_S,Value,_NamedNumberList,Constr) when integer(Value) ->
+    check_integer_range(Value,Constr).
+
+check_integer_range(Int,Constr) when list(Constr) ->
+    NewConstr = [X || #constraint{c=X} <- Constr],
+    check_constr(Int,NewConstr);
+
+check_integer_range(_Int,_Constr) ->
+    %%io:format("~p~n",[Constr]),
+    ok.
+
+check_constr(Int,[{'ValueRange',Lb,Ub}|T]) when Int >= Lb, Int =< Ub ->
+    check_constr(Int,T);
+check_constr(_Int,[]) ->
+    ok.
+
+validate_bitstring(_S,_Value,_NamedNumberList,_Constr) ->
+    ok.
+
+validate_null(_S,'NULL',_Constr) ->
+    ok.
+
+%%------------
+%% This can be removed when the old parser is removed
+%% The function removes 'space' atoms from the list
+
+is_space_list([H],Acc) ->
+    lists:reverse([H|Acc]);
+is_space_list([H,space|T],Acc) ->
+    is_space_list(T,[H|Acc]);
+is_space_list([],Acc) ->
+    lists:reverse(Acc);
+is_space_list([H|T],Acc) ->
+    is_space_list(T,[H|Acc]).
+
+validate_objectidentifier(S,L,_) ->
+    case is_space_list(L,[]) of
+	NewL when list(NewL) ->
+	    case validate_objectidentifier1(S,NewL) of
+		NewL2 when list(NewL2) ->
+		    list_to_tuple(NewL2);
+		Other -> Other
+	    end;
+	{error,_} ->
+	    error({value, "illegal OBJECT IDENTIFIER", S})
+    end.
+
+validate_objectidentifier1(S, [Id|T]) when record(Id,'Externalvaluereference') ->
+    case catch get_referenced_type(S,Id) of
+	{_,V} when record(V,valuedef) ->
+	    case check_value(S,V) of
+		#valuedef{type=#type{def='OBJECT IDENTIFIER'},
+			  checked=true,value=Value} when tuple(Value) ->
+		    validate_objectid(S, T, lists:reverse(tuple_to_list(Value)));
+		_ ->
+		    error({value, "illegal OBJECT IDENTIFIER", S})
+	    end;
+	_ ->
+	    validate_objectid(S, [Id|T], [])
+    end;
+validate_objectidentifier1(S,V) ->
+    validate_objectid(S,V,[]).
+
+validate_objectid(_, [], Acc) ->
+    lists:reverse(Acc);
+validate_objectid(S, [Value|Vrest], Acc) when integer(Value) ->
+    validate_objectid(S, Vrest, [Value|Acc]);
+validate_objectid(S, [{'NamedNumber',_Name,Value}|Vrest], Acc)
+  when integer(Value) ->
+    validate_objectid(S, Vrest, [Value|Acc]);
+validate_objectid(S, [Id|Vrest], Acc)
+  when record(Id,'Externalvaluereference') ->
+    case catch get_referenced_type(S, Id) of
+	{_,V} when record(V,valuedef) ->
+	    case check_value(S, V) of
+		#valuedef{checked=true,value=Value} when integer(Value) ->
+		    validate_objectid(S, Vrest, [Value|Acc]);
+		_ ->
+		    error({value, "illegal OBJECT IDENTIFIER", S})
+	    end;
+	_ ->
+	    case reserved_objectid(Id#'Externalvaluereference'.value, Acc) of
+		Value when integer(Value) ->
+		    validate_objectid(S, Vrest, [Value|Acc]);
+		false ->
+		    error({value, "illegal OBJECT IDENTIFIER", S})
+	    end
+    end;
+validate_objectid(S, [{Atom,Value}],[]) when atom(Atom),integer(Value) ->
+    %% this case when an OBJECT IDENTIFIER value has been parsed as a
+    %% SEQUENCE value
+    Rec = #'Externalvaluereference'{module=S#state.mname,
+				    value=Atom},
+    validate_objectidentifier1(S,[Rec,Value]);
+validate_objectid(S, [{Atom,EVRef}],[])
+  when atom(Atom),record(EVRef,'Externalvaluereference') ->
+    %% this case when an OBJECT IDENTIFIER value has been parsed as a
+    %% SEQUENCE value OTP-4354
+    Rec = #'Externalvaluereference'{module=S#state.mname,
+				    value=Atom},
+    validate_objectidentifier1(S,[Rec,EVRef]);
+validate_objectid(S, _V, _Acc) ->
+    error({value, "illegal OBJECT IDENTIFIER",S}).
+
+
+%% ITU-T Rec. X.680 Annex B - D
+reserved_objectid('itu-t',[]) -> 0;
+reserved_objectid('ccitt',[]) -> 0;
+%% arcs below "itu-t"
+reserved_objectid('recommendation',[0]) -> 0;
+reserved_objectid('question',[0]) -> 1;
+reserved_objectid('administration',[0]) -> 2;
+reserved_objectid('network-operator',[0]) -> 3;
+reserved_objectid('identified-organization',[0]) -> 4;
+%% arcs below "recommendation"
+reserved_objectid('a',[0,0]) -> 1;
+reserved_objectid('b',[0,0]) -> 2;
+reserved_objectid('c',[0,0]) -> 3;
+reserved_objectid('d',[0,0]) -> 4;
+reserved_objectid('e',[0,0]) -> 5;
+reserved_objectid('f',[0,0]) -> 6;
+reserved_objectid('g',[0,0]) -> 7;
+reserved_objectid('h',[0,0]) -> 8;
+reserved_objectid('i',[0,0]) -> 9;
+reserved_objectid('j',[0,0]) -> 10;
+reserved_objectid('k',[0,0]) -> 11;
+reserved_objectid('l',[0,0]) -> 12;
+reserved_objectid('m',[0,0]) -> 13;
+reserved_objectid('n',[0,0]) -> 14;
+reserved_objectid('o',[0,0]) -> 15;
+reserved_objectid('p',[0,0]) -> 16;
+reserved_objectid('q',[0,0]) -> 17;
+reserved_objectid('r',[0,0]) -> 18;
+reserved_objectid('s',[0,0]) -> 19;
+reserved_objectid('t',[0,0]) -> 20;
+reserved_objectid('u',[0,0]) -> 21;
+reserved_objectid('v',[0,0]) -> 22;
+reserved_objectid('w',[0,0]) -> 23;
+reserved_objectid('x',[0,0]) -> 24;
+reserved_objectid('y',[0,0]) -> 25;
+reserved_objectid('z',[0,0]) -> 26;
+
+
+reserved_objectid(iso,[]) -> 1;
+%% arcs below "iso", note that number 1 is not used
+reserved_objectid('standard',[1]) -> 0;
+reserved_objectid('member-body',[1]) -> 2;
+reserved_objectid('identified-organization',[1]) -> 3;
+
+reserved_objectid('joint-iso-itu-t',[]) -> 2;
+reserved_objectid('joint-iso-ccitt',[]) -> 2;
+
+reserved_objectid(_,_) -> false.
+
+
+
+
+
+validate_objectdescriptor(_S,_Value,_Constr) ->
+    ok.
+
+validate_enumerated(S,Id,NamedNumberList,_Constr) when atom(Id) ->
+    case lists:keysearch(Id,1,NamedNumberList) of
+	{value,_} -> ok;
+	false -> error({value,"unknown ENUMERATED",S})
+    end;
+validate_enumerated(S,{identifier,_Pos,Id},NamedNumberList,_Constr) ->
+    case lists:keysearch(Id,1,NamedNumberList) of
+	{value,_} -> ok;
+	false -> error({value,"unknown ENUMERATED",S})
+    end;
+validate_enumerated(S,#'Externalvaluereference'{value=Id},
+		    NamedNumberList,_Constr) ->
+    case lists:keysearch(Id,1,NamedNumberList) of
+	{value,_} -> ok;
+	false -> error({value,"unknown ENUMERATED",S})
+    end.
+
+validate_boolean(_S,_Value,_Constr) ->
+    ok.
+
+validate_octetstring(_S,_Value,_Constr) ->
+    ok.
+
+validate_restrictedstring(_S,_Value,_Def,_Constr) ->
+    ok.
+
+validate_sequence(S=#state{type=Vtype},Value,_Components,_Constr) ->
+    case Vtype of
+	#type{tag=[{tag,'UNIVERSAL',8,'IMPLICIT',32}]} ->
+	    %% this is an 'EXTERNAL' (or INSTANCE OF)
+	    case Value of
+		[{identification,_}|_RestVal] ->
+		    to_EXTERNAL1990(S,Value);
+		_ ->
+		    Value
+	    end;
+	_ ->
+	    Value
+    end.
+
+validate_sequenceof(_S,_Value,_Components,_Constr) ->
+    ok.
+
+validate_choice(_S,_Value,_Components,_Constr) ->
+    ok.
+
+validate_set(_S,_Value,_Components,_Constr) ->
+    ok.
+
+validate_setof(_S,_Value,_Components,_Constr) ->
+    ok.
+
+to_EXTERNAL1990(S,[{identification,{'CHOICE',{syntax,Stx}}}|Rest]) ->
+    to_EXTERNAL1990(S,Rest,[{'direct-reference',Stx}]);
+to_EXTERNAL1990(S,[{identification,{'CHOICE',{'presentation-context-id',I}}}|Rest]) ->
+    to_EXTERNAL1990(S,Rest,[{'indirect-reference',I}]);
+to_EXTERNAL1990(S,[{identification,{'CHOICE',{'context-negotiation',[{_,PCid},{_,TrStx}]}}}|Rest]) ->
+    to_EXTERNAL1990(S,Rest,[{'indirect-reference',PCid},{'direct-reference',TrStx}]);
+to_EXTERNAL1990(S,_) ->
+    error({value,"illegal value in EXTERNAL type",S}).
+
+to_EXTERNAL1990(S,[V={'data-value-descriptor',_}|Rest],Acc) ->
+    to_EXTERNAL1990(S,Rest,[V|Acc]);
+to_EXTERNAL1990(_S,[{'data-value',Val}],Acc) ->
+    Encoding = {encoding,{'CHOICE',{'octet-aligned',Val}}},
+    lists:reverse([Encoding|Acc]);
+to_EXTERNAL1990(S,_,_) ->
+    error({value,"illegal value in EXTERNAL type",S}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Functions to normalize the default values of SEQUENCE
+%% and SET components into Erlang valid format
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+normalize_value(_,_,mandatory,_) ->
+    mandatory;
+normalize_value(_,_,'OPTIONAL',_) ->
+    'OPTIONAL';
+normalize_value(S,Type,{'DEFAULT',Value},NameList) ->
+    case catch get_canonic_type(S,Type,NameList) of
+	{'BOOLEAN',CType,_} ->
+	    normalize_boolean(S,Value,CType);
+	{'INTEGER',CType,_} ->
+	    normalize_integer(S,Value,CType);
+	{'BIT STRING',CType,_} ->
+	    normalize_bitstring(S,Value,CType);
+	{'OCTET STRING',CType,_} ->
+	    normalize_octetstring(S,Value,CType);
+	{'NULL',_CType,_} ->
+	    %%normalize_null(Value);
+	    'NULL';
+	{'OBJECT IDENTIFIER',_,_} ->
+	    normalize_objectidentifier(S,Value);
+	{'ObjectDescriptor',_,_} ->
+	    normalize_objectdescriptor(Value);
+	{'REAL',_,_} ->
+	    normalize_real(Value);
+	{'ENUMERATED',CType,_} ->
+	    normalize_enumerated(Value,CType);
+	{'CHOICE',CType,NewNameList} ->
+	    normalize_choice(S,Value,CType,NewNameList);
+	{'SEQUENCE',CType,NewNameList} ->
+	    normalize_sequence(S,Value,CType,NewNameList);
+	{'SEQUENCE OF',CType,NewNameList} ->
+	    normalize_seqof(S,Value,CType,NewNameList);
+	{'SET',CType,NewNameList} ->
+	    normalize_set(S,Value,CType,NewNameList);
+	{'SET OF',CType,NewNameList} ->
+	    normalize_setof(S,Value,CType,NewNameList);
+	{restrictedstring,CType,_} ->
+	    normalize_restrictedstring(S,Value,CType);
+	_ ->
+	    io:format("WARNING: could not check default value ~p~n",[Value]),
+	    Value
+    end;
+normalize_value(S,Type,Val,NameList) ->
+    normalize_value(S,Type,{'DEFAULT',Val},NameList).
+
+normalize_boolean(S,{Name,Bool},CType) when atom(Name) ->
+    normalize_boolean(S,Bool,CType);
+normalize_boolean(_,true,_) ->
+    true;
+normalize_boolean(_,false,_) ->
+    false;
+normalize_boolean(S,Bool=#'Externalvaluereference'{},CType) ->
+    get_normalized_value(S,Bool,CType,fun normalize_boolean/3,[]);
+normalize_boolean(_,Other,_) ->
+    throw({error,{asn1,{'invalid default value',Other}}}).
+
+normalize_integer(_S,Int,_) when integer(Int) ->
+    Int;
+normalize_integer(_S,{Name,Int},_) when atom(Name),integer(Int) ->
+    Int;
+normalize_integer(S,{Name,Int=#'Externalvaluereference'{}},
+		  Type) when atom(Name) ->
+    normalize_integer(S,Int,Type);
+normalize_integer(S,Int=#'Externalvaluereference'{value=Name},Type) ->
+    case Type of
+	NNL when list(NNL) ->
+	    case lists:keysearch(Name,1,NNL) of
+		{value,{Name,Val}} ->
+		    Val;
+		false ->
+		    get_normalized_value(S,Int,Type,
+					 fun normalize_integer/3,[])
+	    end;
+	_ ->
+	    get_normalized_value(S,Int,Type,fun normalize_integer/3,[])
+    end;
+normalize_integer(_,Int,_) ->
+    exit({'Unknown INTEGER value',Int}).
+
+normalize_bitstring(S,Value,Type)->
+    %% There are four different Erlang formats of BIT STRING:
+    %% 1 - a list of ones and zeros.
+    %% 2 - a list of atoms.
+    %% 3 - as an integer, for instance in hexadecimal form.
+    %% 4 - as a tuple {Unused, Binary} where Unused is an integer
+    %%   and tells how many bits of Binary are unused.
+    %%
+    %% normalize_bitstring/3 transforms Value according to:
+    %% A to 3,
+    %% B to 1,
+    %% C to 1 or 3
+    %% D to 2,
+    %% Value can be on format:
+    %% A - {hstring, String}, where String is a hexadecimal string.
+    %% B - {bstring, String}, where String is a string on bit format
+    %% C - #'Externalvaluereference'{value=V}, where V is a defined value
+    %% D - list of #'Externalvaluereference', where each value component
+    %%     is an identifier corresponing to NamedBits in Type.
+    case Value of
+	{hstring,String} when list(String) ->
+	    hstring_to_int(String);
+	{bstring,String} when list(String) ->
+	    bstring_to_bitlist(String);
+	Rec when record(Rec,'Externalvaluereference') ->
+	    get_normalized_value(S,Value,Type,
+				 fun normalize_bitstring/3,[]);
+	RecList when list(RecList) ->
+	    case Type of
+		NBL when list(NBL) ->
+		    F = fun(#'Externalvaluereference'{value=Name}) ->
+				case lists:keysearch(Name,1,NBL) of
+				    {value,{Name,_}} ->
+					Name;
+				    Other ->
+					throw({error,Other})
+				end;
+			   (Other) ->
+				throw({error,Other})
+			end,
+		    case catch lists:map(F,RecList) of
+			{error,Reason} ->
+			    io:format("WARNING: default value not "
+				      "compatible with type definition ~p~n",
+				      [Reason]),
+			    Value;
+			NewList ->
+			    NewList
+		    end;
+		_ ->
+		    io:format("WARNING: default value not "
+			      "compatible with type definition ~p~n",
+			      [RecList]),
+		    Value
+	    end;
+	{Name,String} when atom(Name) ->
+	    normalize_bitstring(S,String,Type);
+	Other ->
+	    io:format("WARNING: illegal default value ~p~n",[Other]),
+	    Value
+    end.
+
+hstring_to_int(L) when list(L) ->
+    hstring_to_int(L,0).
+hstring_to_int([H|T],Acc) when H >= $A, H =< $F ->
+    hstring_to_int(T,(Acc bsl 4) + (H - $A + 10) ) ;
+hstring_to_int([H|T],Acc) when H >= $0, H =< $9 ->
+    hstring_to_int(T,(Acc bsl 4) + (H - $0));
+hstring_to_int([],Acc) ->
+    Acc.
+
+bstring_to_bitlist([H|T]) when H == $0; H == $1 ->
+    [H - $0 | bstring_to_bitlist(T)];
+bstring_to_bitlist([]) ->
+    [].
+
+%% normalize_octetstring/1 changes representation of input Value to a
+%% list of octets.
+%% Format of Value is one of:
+%% {bstring,String} each element in String corresponds to one bit in an octet
+%% {hstring,String} each element in String corresponds to one byte in an octet
+%% #'Externalvaluereference'
+normalize_octetstring(S,Value,CType) ->
+    case Value of
+	{bstring,String} ->
+	    bstring_to_octetlist(String);
+	{hstring,String} ->
+	    hstring_to_octetlist(String);
+	Rec when record(Rec,'Externalvaluereference') ->
+	    get_normalized_value(S,Value,CType,
+				 fun normalize_octetstring/3,[]);
+	{Name,String} when atom(Name) ->
+	    normalize_octetstring(S,String,CType);
+	List when list(List) ->
+	    %% check if list elements are valid octet values
+	    lists:map(fun([])-> ok;
+			 (H)when H > 255->
+			      io:format("WARNING: not legal octet value ~p in OCTET STRING, ~p~n",[H,List]);
+			 (_)-> ok
+		      end, List),
+	    List;
+	Other ->
+	    io:format("WARNING: unknown default value ~p~n",[Other]),
+	    Value
+    end.
+
+
+bstring_to_octetlist([]) ->
+    [];
+bstring_to_octetlist([H|T]) when H == $0 ; H == $1 ->
+    bstring_to_octetlist(T,6,[(H - $0) bsl 7]).
+bstring_to_octetlist([H|T],0,[Hacc|Tacc]) when H == $0; H == $1 ->
+    bstring_to_octetlist(T, 7, [0,Hacc + (H -$0)| Tacc]);
+bstring_to_octetlist([H|T],BSL,[Hacc|Tacc]) when H == $0; H == $1 ->
+    bstring_to_octetlist(T, BSL-1, [Hacc + ((H - $0) bsl BSL)| Tacc]);
+bstring_to_octetlist([],7,[0|Acc]) ->
+    lists:reverse(Acc);
+bstring_to_octetlist([],_,Acc) ->
+    lists:reverse(Acc).
+
+hstring_to_octetlist([]) ->
+    [];
+hstring_to_octetlist(L) ->
+    hstring_to_octetlist(L,4,[]).
+hstring_to_octetlist([H|T],0,[Hacc|Tacc]) when H >= $A, H =< $F ->
+    hstring_to_octetlist(T,4,[Hacc + (H - $A + 10)|Tacc]);
+hstring_to_octetlist([H|T],BSL,Acc) when H >= $A, H =< $F ->
+    hstring_to_octetlist(T,0,[(H - $A + 10) bsl BSL|Acc]);
+hstring_to_octetlist([H|T],0,[Hacc|Tacc]) when H >= $0; H =< $9 ->
+    hstring_to_octetlist(T,4,[Hacc + (H - $0)|Tacc]);
+hstring_to_octetlist([H|T],BSL,Acc) when H >= $0; H =< $9 ->
+    hstring_to_octetlist(T,0,[(H - $0) bsl BSL|Acc]);
+hstring_to_octetlist([],_,Acc) ->
+    lists:reverse(Acc).
+
+normalize_objectidentifier(S,Value) ->
+    validate_objectidentifier(S,Value,[]).
+
+normalize_objectdescriptor(Value) ->
+    Value.
+
+normalize_real(Value) ->
+    Value.
+
+normalize_enumerated(#'Externalvaluereference'{value=V},CType)
+  when list(CType) ->
+    normalize_enumerated2(V,CType);
+normalize_enumerated(Value,CType) when atom(Value),list(CType) ->
+    normalize_enumerated2(Value,CType);
+normalize_enumerated({Name,EnumV},CType) when atom(Name) ->
+    normalize_enumerated(EnumV,CType);
+normalize_enumerated(Value,{CType1,CType2}) when list(CType1), list(CType2)->
+    normalize_enumerated(Value,CType1++CType2);
+normalize_enumerated(V,CType) ->
+    io:format("WARNING: Enumerated unknown type ~p~n",[CType]),
+    V.
+normalize_enumerated2(V,Enum) ->
+    case lists:keysearch(V,1,Enum) of
+	{value,{Val,_}} -> Val;
+	_ ->
+	    io:format("WARNING: Enumerated value is not correct ~p~n",[V]),
+	    V
+    end.
+
+normalize_choice(S,{'CHOICE',{C,V}},CType,NameList) when atom(C) ->
+    Value =
+	case V of
+	    Rec when record(Rec,'Externalvaluereference') ->
+		get_normalized_value(S,V,CType,
+				     fun normalize_choice/4,
+				     [NameList]);
+	    _ -> V
+	end,
+    case catch lists:keysearch(C,#'ComponentType'.name,CType) of
+	{value,#'ComponentType'{typespec=CT,name=Name}} ->
+	    {C,normalize_value(S,CT,{'DEFAULT',Value},
+			       [Name|NameList])};
+	Other ->
+	    io:format("WARNING: Wrong format of type/value ~p/~p~n",
+		      [Other,Value]),
+	    {C,Value}
+    end;
+normalize_choice(S,{'DEFAULT',ValueList},CType,NameList) ->
+    lists:map(fun(X)-> normalize_choice(S,X,CType,NameList) end, ValueList);
+normalize_choice(S,Val=#'Externalvaluereference'{},CType,NameList) ->
+    {_,#valuedef{value=V}}=get_referenced_type(S,Val),
+    normalize_choice(S,{'CHOICE',V},CType,NameList);
+%    get_normalized_value(S,Val,CType,fun normalize_choice/4,[NameList]);
+normalize_choice(S,{Name,ChoiceVal},CType,NameList)
+  when atom(Name) ->
+    normalize_choice(S,ChoiceVal,CType,NameList).
+
+normalize_sequence(S,{Name,Value},Components,NameList)
+  when atom(Name),list(Value) ->
+    normalize_sequence(S,Value,Components,NameList);
+normalize_sequence(S,Value,Components,NameList) ->
+    normalized_record('SEQUENCE',S,Value,Components,NameList).
+
+normalize_set(S,{Name,Value},Components,NameList)
+  when atom(Name),list(Value) ->
+    normalized_record('SET',S,Value,Components,NameList);
+normalize_set(S,Value,Components,NameList) ->
+    normalized_record('SET',S,Value,Components,NameList).
+
+normalized_record(SorS,S,Value,Components,NameList) ->
+    NewName = list_to_atom(asn1ct_gen:list2name(NameList)),
+    NoComps = length(Components),
+    case normalize_seq_or_set(SorS,S,Value,Components,NameList,[]) of
+	ListOfVals when length(ListOfVals) == NoComps ->
+	    list_to_tuple([NewName|ListOfVals]);
+	_ ->
+	    error({type,{illegal,default,value,Value},S})
+    end.
+
+normalize_seq_or_set(SorS,S,[{Cname,V}|Vs],
+		     [#'ComponentType'{name=Cname,typespec=TS}|Cs],
+		     NameList,Acc) ->
+    NewNameList =
+	case TS#type.def of
+	    #'Externaltypereference'{type=TName} ->
+		[TName];
+	    _ -> [Cname|NameList]
+	end,
+    NVal = normalize_value(S,TS,{'DEFAULT',V},NewNameList),
+    normalize_seq_or_set(SorS,S,Vs,Cs,NameList,[NVal|Acc]);
+normalize_seq_or_set(SorS,S,Values=[{_Cname1,_V}|_Vs],
+		     [#'ComponentType'{prop='OPTIONAL'}|Cs],
+		     NameList,Acc) ->
+    normalize_seq_or_set(SorS,S,Values,Cs,NameList,[asn1_NOVALUE|Acc]);
+normalize_seq_or_set(SorS,S,Values=[{_Cname1,_V}|_Vs],
+		    [#'ComponentType'{name=Cname2,typespec=TS,
+				      prop={'DEFAULT',Value}}|Cs],
+		    NameList,Acc) ->
+    NewNameList =
+	case TS#type.def of
+	    #'Externaltypereference'{type=TName} ->
+		[TName];
+	    _ -> [Cname2|NameList]
+	end,
+    NVal =  normalize_value(S,TS,{'DEFAULT',Value},NewNameList),
+    normalize_seq_or_set(SorS,S,Values,Cs,NameList,[NVal|Acc]);
+normalize_seq_or_set(_SorS,_S,[],[],_,Acc) ->
+    lists:reverse(Acc);
+%% If default value is {} ComponentTypes in SEQUENCE are marked DEFAULT
+%% or OPTIONAL (or the type is defined SEQUENCE{}, which is handled by
+%% the previous case).
+normalize_seq_or_set(SorS,S,[],
+		     [#'ComponentType'{name=Name,typespec=TS,
+				       prop={'DEFAULT',Value}}|Cs],
+		     NameList,Acc) ->
+    NewNameList =
+	case TS#type.def of
+	    #'Externaltypereference'{type=TName} ->
+		[TName];
+	    _ -> [Name|NameList]
+	end,
+    NVal =  normalize_value(S,TS,{'DEFAULT',Value},NewNameList),
+    normalize_seq_or_set(SorS,S,[],Cs,NameList,[NVal|Acc]);
+normalize_seq_or_set(SorS,S,[],[#'ComponentType'{prop='OPTIONAL'}|Cs],
+		     NameList,Acc) ->
+    normalize_seq_or_set(SorS,S,[],Cs,NameList,[asn1_NOVALUE|Acc]);
+normalize_seq_or_set(SorS,S,Value=#'Externalvaluereference'{},
+		     Cs,NameList,Acc) ->
+    get_normalized_value(S,Value,Cs,fun normalize_seq_or_set/6,
+			 [SorS,NameList,Acc]);
+normalize_seq_or_set(_SorS,S,V,_,_,_) ->
+    error({type,{illegal,default,value,V},S}).
+
+normalize_seqof(S,Value,Type,NameList) ->
+    normalize_s_of('SEQUENCE OF',S,Value,Type,NameList).
+
+normalize_setof(S,Value,Type,NameList) ->
+    normalize_s_of('SET OF',S,Value,Type,NameList).
+
+normalize_s_of(SorS,S,Value,Type,NameList) when list(Value) ->
+    DefValueList = lists:map(fun(X) -> {'DEFAULT',X} end,Value),
+    Suffix = asn1ct_gen:constructed_suffix(SorS,Type),
+    Def = Type#type.def,
+    InnerType = asn1ct_gen:get_inner(Def),
+    WhatKind = asn1ct_gen:type(InnerType),
+    NewNameList =
+	case WhatKind of
+	    {constructed,bif} ->
+		[Suffix|NameList];
+	    #'Externaltypereference'{type=Name} ->
+		[Name];
+	    _ -> []
+	end,
+    NormFun = 	fun (X) -> normalize_value(S,Type,X,
+					   NewNameList) end,
+    case catch lists:map(NormFun, DefValueList) of
+	List when list(List) ->
+	    List;
+	_ ->
+	    io:format("WARNING: ~p could not handle value ~p~n",
+		      [SorS,Value]),
+	    Value
+    end;
+normalize_s_of(SorS,S,Value,Type,NameList)
+  when record(Value,'Externalvaluereference') ->
+    get_normalized_value(S,Value,Type,fun normalize_s_of/5,
+			 [SorS,NameList]).
+%     case catch get_referenced_type(S,Value) of
+% 	{_,#valuedef{value=V}} ->
+% 	    normalize_s_of(SorS,S,V,Type);
+% 	{error,Reason} ->
+% 	    io:format("WARNING: ~p could not handle value ~p~n",
+% 		      [SorS,Value]),
+% 	    Value;
+% 	{_,NewVal} ->
+% 	    normalize_s_of(SorS,S,NewVal,Type);
+% 	_ ->
+% 	    io:format("WARNING: ~p could not handle value ~p~n",
+% 		      [SorS,Value]),
+% 	    Value
+%     end.
+
+
+%% normalize_restrictedstring handles all format of restricted strings.
+%% tuple case
+normalize_restrictedstring(_S,[Int1,Int2],_) when integer(Int1),integer(Int2) ->
+    {Int1,Int2};
+%% quadruple case
+normalize_restrictedstring(_S,[Int1,Int2,Int3,Int4],_) when integer(Int1),
+							   integer(Int2),
+							   integer(Int3),
+							   integer(Int4) ->
+    {Int1,Int2,Int3,Int4};
+%% character string list case
+normalize_restrictedstring(S,[H|T],CType) when list(H);tuple(H) ->
+    [normalize_restrictedstring(S,H,CType)|normalize_restrictedstring(S,T,CType)];
+%% character sting case
+normalize_restrictedstring(_S,CString,_) when list(CString) ->
+    Fun =
+	fun(X) ->
+		if
+		    $X =< 255, $X >= 0 ->
+			ok;
+		    true ->
+			io:format("WARNING: illegal character in string"
+				  " ~p~n",[X])
+		end
+	end,
+    lists:foreach(Fun,CString),
+    CString;
+%% definedvalue case or argument in a parameterized type
+normalize_restrictedstring(S,ERef,CType) when record(ERef,'Externalvaluereference') ->
+    get_normalized_value(S,ERef,CType,
+			 fun normalize_restrictedstring/3,[]);
+%%
+normalize_restrictedstring(S,{Name,Val},CType) when atom(Name) ->
+    normalize_restrictedstring(S,Val,CType).
+
+
+get_normalized_value(S,Val,Type,Func,AddArg) ->
+    case catch get_referenced_type(S,Val) of
+	{_,#valuedef{type=_T,value=V}} ->
+	    %% should check that Type and T equals
+	    call_Func(S,V,Type,Func,AddArg);
+	{error,_} ->
+	    io:format("WARNING: default value not "
+		      "comparable ~p~n",[Val]),
+	    Val;
+	{_,NewVal} ->
+	    call_Func(S,NewVal,Type,Func,AddArg);
+	_ ->
+	    io:format("WARNING: default value not "
+		      "comparable ~p~n",[Val]),
+	    Val
+    end.
+
+call_Func(S,Val,Type,Func,ArgList) ->
+    case ArgList of
+	[] ->
+	    Func(S,Val,Type);
+	[LastArg] ->
+	    Func(S,Val,Type,LastArg);
+	[Arg1,LastArg1] ->
+	    Func(Arg1,S,Val,Type,LastArg1);
+	[Arg1,LastArg1,LastArg2] ->
+	    Func(Arg1,S,Val,Type,LastArg1,LastArg2)
+    end.
+
+
+get_canonic_type(S,Type,NameList) ->
+    {InnerType,NewType,NewNameList} =
+	case Type#type.def of
+	    Name when atom(Name) ->
+		{Name,Type,NameList};
+	    Ref when record(Ref,'Externaltypereference') ->
+		{_,#typedef{name=Name,typespec=RefedType}} =
+		    get_referenced_type(S,Ref),
+		get_canonic_type(S,RefedType,[Name]);
+	    {Name,T} when atom(Name) ->
+		{Name,T,NameList};
+	    Seq when record(Seq,'SEQUENCE') ->
+		{'SEQUENCE',Seq#'SEQUENCE'.components,NameList};
+	    Set when record(Set,'SET') ->
+		{'SET',Set#'SET'.components,NameList}
+	end,
+    {asn1ct_gen:unify_if_string(InnerType),NewType,NewNameList}.
+
+
+
+check_ptype(_S,Type,Ts) when record(Ts,type) ->
+    %Tag = Ts#type.tag,
+    %Constr = Ts#type.constraint,
+    Def = Ts#type.def,
+    NewDef=
+	case Def of
+	    Seq when record(Seq,'SEQUENCE') ->
+		#newt{type=Seq#'SEQUENCE'{pname=Type#ptypedef.name}};
+	    Set when record(Set,'SET') ->
+		#newt{type=Set#'SET'{pname=Type#ptypedef.name}};
+	    _Other ->
+		#newt{}
+	end,
+    Ts2 = case NewDef of
+	      #newt{type=unchanged} ->
+		  Ts;
+	      #newt{type=TDef}->
+		  Ts#type{def=TDef}
+	  end,
+    Ts2.
+
+
+% check_type(S,Type,ObjSpec={{objectclassname,_},_}) ->
+%     check_class(S,ObjSpec);
+check_type(_S,Type,Ts) when record(Type,typedef),
+			   (Type#typedef.checked==true) ->
+    Ts;
+check_type(_S,Type,Ts) when record(Type,typedef),
+			   (Type#typedef.checked==idle) -> % the check is going on
+    Ts;
+check_type(S=#state{recordtopname=TopName},Type,Ts) when record(Ts,type) ->
+    {Def,Tag,Constr} =
+	case match_parameters(Ts#type.def,S#state.parameters) of
+	    #type{constraint=_Ctmp,def=Dtmp} ->
+		{Dtmp,Ts#type.tag,Ts#type.constraint};
+	    Dtmp ->
+		{Dtmp,Ts#type.tag,Ts#type.constraint}
+	end,
+    TempNewDef = #newt{type=Def,tag=Tag,constraint=Constr},
+    TestFun =
+	fun(Tref) ->
+		{_,MaybeChoice} = get_referenced_type(S,Tref),
+		case catch((MaybeChoice#typedef.typespec)#type.def) of
+		    {'CHOICE',_} ->
+			maybe_illicit_implicit_tag(choice,Tag);
+		    'ANY' ->
+			maybe_illicit_implicit_tag(open_type,Tag);
+		    'ANY DEFINED BY' ->
+			maybe_illicit_implicit_tag(open_type,Tag);
+		    'ASN1_OPEN_TYPE' ->
+			maybe_illicit_implicit_tag(open_type,Tag);
+		    _ ->
+			Tag
+		end
+	end,
+    NewDef=
+	case Def of
+	    Ext when record(Ext,'Externaltypereference') ->
+		{_,RefTypeDef} = get_referenced_type(S,Ext),
+% 		case RefTypeDef of
+% 		    Class when record(Class,classdef) ->
+% 			throw({asn1_class,Class});
+% 		    _ -> ok
+% 		end,
+		case is_class(S,RefTypeDef) of
+		    true -> throw({asn1_class,RefTypeDef});
+		    _ -> ok
+		end,
+		Ct = TestFun(Ext),
+		RefType =
+%case  S#state.erule of
+%			      ber_bin_v2 ->
+		    case RefTypeDef#typedef.checked of
+			true ->
+			    RefTypeDef#typedef.typespec;
+			_ ->
+			    NewRefTypeDef1 = RefTypeDef#typedef{checked=idle},
+			    asn1_db:dbput(S#state.mname,
+					  NewRefTypeDef1#typedef.name,NewRefTypeDef1),
+			    RefType1 =
+				check_type(S,RefTypeDef,RefTypeDef#typedef.typespec),
+			    NewRefTypeDef2 =
+				RefTypeDef#typedef{checked=true,typespec = RefType1},
+			    asn1_db:dbput(S#state.mname,
+					  NewRefTypeDef2#typedef.name,NewRefTypeDef2),
+			    %% update the type and mark as checked
+			    RefType1
+		    end,
+%			      _ -> RefTypeDef#typedef.typespec
+%			  end,
+
+		case asn1ct_gen:prim_bif(asn1ct_gen:get_inner(RefType#type.def)) of
+		    true ->
+			%% Here we expand to a built in type and inline it
+			TempNewDef#newt{
+			  type=
+			  RefType#type.def,
+			  tag=
+			  merge_tags(Ct,RefType#type.tag),
+			  constraint=
+			  merge_constraints(check_constraints(S,Constr),
+					    RefType#type.constraint)};
+		    _ ->
+			%% Here we only expand the tags and keep the ext ref
+
+			TempNewDef#newt{
+			  type=
+			  check_externaltypereference(S,Ext),
+			  tag =
+			  case S#state.erule of
+			      ber_bin_v2 ->
+				  merge_tags(Ct,RefType#type.tag);
+			      _ ->
+				  Ct
+			  end
+			 }
+		end;
+	    'ANY' ->
+		Ct=maybe_illicit_implicit_tag(open_type,Tag),
+		TempNewDef#newt{type='ASN1_OPEN_TYPE',tag=Ct};
+	    {'ANY_DEFINED_BY',_} ->
+		Ct=maybe_illicit_implicit_tag(open_type,Tag),
+		TempNewDef#newt{type='ASN1_OPEN_TYPE',tag=Ct};
+	    'INTEGER' ->
+		check_integer(S,[],Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_INTEGER))};
+
+	    {'INTEGER',NamedNumberList} ->
+		TempNewDef#newt{type={'INTEGER',check_integer(S,NamedNumberList,Constr)},
+				tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_INTEGER))};
+	    {'BIT STRING',NamedNumberList} ->
+		NewL = check_bitstring(S,NamedNumberList,Constr),
+%%		erlang:display({asn1ct_check,NamedNumberList,NewL}),
+		TempNewDef#newt{type={'BIT STRING',NewL},
+				tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_BIT_STRING))};
+	    'NULL' ->
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_NULL))};
+	    'OBJECT IDENTIFIER' ->
+		check_objectidentifier(S,Constr),
+		TempNewDef#newt{tag=
+			       merge_tags(Tag,?TAG_PRIMITIVE(?N_OBJECT_IDENTIFIER))};
+	    'ObjectDescriptor' ->
+		TempNewDef#newt{tag=
+			       merge_tags(Tag,?TAG_PRIMITIVE(?N_OBJECT_DESCRIPTOR))};
+	    'EXTERNAL' ->
+%%		AssociatedType = asn1_db:dbget(S#state.mname,'EXTERNAL'),
+%%		#newt{type=check_type(S,Type,AssociatedType)};
+		put(external,unchecked),
+		TempNewDef#newt{type=
+				#'Externaltypereference'{module=S#state.mname,
+							 type='EXTERNAL'},
+				tag=
+				merge_tags(Tag,?TAG_CONSTRUCTED(?N_EXTERNAL))};
+	    {'INSTANCE OF',DefinedObjectClass,Constraint} ->
+		%% check that DefinedObjectClass is of TYPE-IDENTIFIER class
+		%% If Constraint is empty make it the general INSTANCE OF type
+		%% If Constraint is not empty make an inlined type
+		%% convert INSTANCE OF to the associated type
+		IOFDef=check_instance_of(S,DefinedObjectClass,Constraint),
+		TempNewDef#newt{type=IOFDef,
+				tag=merge_tags(Tag,?TAG_CONSTRUCTED(?N_INSTANCE_OF))};
+	    {'ENUMERATED',NamedNumberList} ->
+		TempNewDef#newt{type=
+				{'ENUMERATED',
+				 check_enumerated(S,NamedNumberList,Constr)},
+				tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_ENUMERATED))};
+	    'EMBEDDED PDV' ->
+%		AssociatedType = asn1_db:dbget(S#state.mname,'EMBEDDED PDV'),
+%		CheckedType = check_type(S,Type,
+%					 AssociatedType#typedef.typespec),
+		put(embedded_pdv,unchecked),
+		TempNewDef#newt{type=
+				#'Externaltypereference'{module=S#state.mname,
+							 type='EMBEDDED PDV'},
+				tag=
+				merge_tags(Tag,?TAG_CONSTRUCTED(?N_EMBEDDED_PDV))};
+	    'BOOLEAN'->
+		check_boolean(S,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_BOOLEAN))};
+	    'OCTET STRING' ->
+		check_octetstring(S,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_OCTET_STRING))};
+	    'NumericString' ->
+		check_restrictedstring(S,Def,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_NumericString))};
+	    'TeletexString' ->
+		check_restrictedstring(S,Def,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_TeletexString))};
+	    'VideotexString' ->
+		check_restrictedstring(S,Def,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_VideotexString))};
+	    'UTCTime' ->
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_UTCTime))};
+	    'GeneralizedTime' ->
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_GeneralizedTime))};
+	    'GraphicString' ->
+		check_restrictedstring(S,Def,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_GraphicString))};
+	    'VisibleString' ->
+		check_restrictedstring(S,Def,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_VisibleString))};
+	    'GeneralString' ->
+		check_restrictedstring(S,Def,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_GeneralString))};
+	    'PrintableString' ->
+		check_restrictedstring(S,Def,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_PrintableString))};
+	    'IA5String' ->
+		check_restrictedstring(S,Def,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_IA5String))};
+	    'BMPString' ->
+		check_restrictedstring(S,Def,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_BMPString))};
+	    'UniversalString' ->
+		check_restrictedstring(S,Def,Constr),
+		TempNewDef#newt{tag=
+				merge_tags(Tag,?TAG_PRIMITIVE(?N_UniversalString))};
+	    'CHARACTER STRING' ->
+%		AssociatedType = asn1_db:dbget(S#state.mname,
+%					       'CHARACTER STRING'),
+%		CheckedType = check_type(S,Type,
+%					 AssociatedType#typedef.typespec),
+		put(character_string,unchecked),
+		TempNewDef#newt{type=
+				#'Externaltypereference'{module=S#state.mname,
+							 type='CHARACTER STRING'},
+				tag=
+				merge_tags(Tag,?TAG_CONSTRUCTED(?N_CHARACTER_STRING))};
+	    Seq when record(Seq,'SEQUENCE') ->
+		RecordName =
+		    case TopName of
+			[] ->
+			    [Type#typedef.name];
+			_ ->
+			    TopName
+		    end,
+		{TableCInf,Components} =
+		    check_sequence(S#state{recordtopname=
+					   RecordName},
+					   Type,Seq#'SEQUENCE'.components),
+		TempNewDef#newt{type=Seq#'SEQUENCE'{tablecinf=TableCInf,
+					  components=Components},
+				tag=
+				merge_tags(Tag,?TAG_CONSTRUCTED(?N_SEQUENCE))};
+	    {'SEQUENCE OF',Components} ->
+		TempNewDef#newt{type={'SEQUENCE OF',check_sequenceof(S,Type,Components)},
+				tag=
+				merge_tags(Tag,?TAG_CONSTRUCTED(?N_SEQUENCE))};
+	    {'CHOICE',Components} ->
+		Ct = maybe_illicit_implicit_tag(choice,Tag),
+		TempNewDef#newt{type={'CHOICE',check_choice(S,Type,Components)},tag=Ct};
+	    Set when record(Set,'SET') ->
+		RecordName=
+		    case TopName of
+			[] ->
+			    [Type#typedef.name];
+			_ ->
+			    TopName
+		    end,
+		{Sorted,TableCInf,Components} =
+		    check_set(S#state{recordtopname=RecordName},
+			      Type,Set#'SET'.components),
+		TempNewDef#newt{type=Set#'SET'{sorted=Sorted,
+				     tablecinf=TableCInf,
+				     components=Components},
+				tag=
+				merge_tags(Tag,?TAG_CONSTRUCTED(?N_SET))};
+	    {'SET OF',Components} ->
+		TempNewDef#newt{type={'SET OF',check_setof(S,Type,Components)},
+				tag=
+				merge_tags(Tag,?TAG_CONSTRUCTED(?N_SET))};
+	    %% This is a temporary hack until the full Information Obj Spec
+	    %% in X.681 is supported
+	    {{typereference,_,'TYPE-IDENTIFIER'},[{typefieldreference,_,'Type'}]} ->
+		Ct=maybe_illicit_implicit_tag(open_type,Tag),
+		TempNewDef#newt{type='ASN1_OPEN_TYPE',tag=Ct};
+
+	    {#'Externaltypereference'{type='TYPE-IDENTIFIER'},
+	     [{typefieldreference,_,'Type'}]} ->
+		Ct=maybe_illicit_implicit_tag(open_type,Tag),
+		TempNewDef#newt{type='ASN1_OPEN_TYPE',tag=Ct};
+
+	    {pt,Ptype,ParaList} ->
+		%% Ptype might be a parameterized - type, object set or
+		%% value set. If it isn't a parameterized type notify the
+		%% calling function.
+		{_,Ptypedef} = get_referenced_type(S,Ptype),
+		notify_if_not_ptype(S,Ptypedef),
+		NewParaList = [match_parameters(TmpParam,S#state.parameters)||
+				  TmpParam <- ParaList],
+		Instance = instantiate_ptype(S,Ptypedef,NewParaList),
+		TempNewDef#newt{type=Instance#type.def,
+				tag=merge_tags(Tag,Instance#type.tag),
+				constraint=Instance#type.constraint,
+				inlined=yes};
+
+%	    {ClRef,FieldRefList} when record(ClRef,'Externaltypereference') ->
+	    OCFT=#'ObjectClassFieldType'{class=ClRef} ->
+		%% this case occures in a SEQUENCE when
+		%% the type of the component is a ObjectClassFieldType
+		ClassSpec = check_class(S,ClRef),
+		NewTypeDef = maybe_open_type(S,ClassSpec,OCFT,Constr),
+		InnerTag = get_innertag(S,NewTypeDef),
+		MergedTag = merge_tags(Tag,InnerTag),
+		Ct =
+		    case is_open_type(NewTypeDef) of
+			true ->
+			    maybe_illicit_implicit_tag(open_type,MergedTag);
+			_ ->
+			    MergedTag
+		    end,
+		TempNewDef#newt{type=NewTypeDef,tag=Ct};
+	    {valueset,Vtype} ->
+		TempNewDef#newt{type={valueset,check_type(S,Type,Vtype)}};
+	    Other ->
+		exit({'cant check' ,Other})
+	end,
+    Ts2 = case NewDef of
+	      #newt{type=unchanged} ->
+		  Ts#type{def=Def};
+	      #newt{type=TDef}->
+		  Ts#type{def=TDef}
+	  end,
+    NewTag = case NewDef of
+		 #newt{tag=unchanged} ->
+		     Tag;
+		 #newt{tag=TT} ->
+		     TT
+	     end,
+    T3 = Ts2#type{tag = lists:map(fun(TempTag = #tag{type={default,TTx}}) ->
+					  TempTag#tag{type=TTx};
+				     (Else) -> Else end, NewTag)},
+    T4 = case NewDef of
+	     #newt{constraint=unchanged} ->
+		 T3#type{constraint=Constr};
+	     #newt{constraint=NewConstr} ->
+		 T3#type{constraint=NewConstr}
+	 end,
+    T5 = T4#type{inlined=NewDef#newt.inlined},
+    T5#type{constraint=check_constraints(S,T5#type.constraint)}.
+
+
+get_innertag(_S,#'ObjectClassFieldType'{type=Type}) ->
+    case Type of
+	#type{tag=Tag} -> Tag;
+	{fixedtypevaluefield,_,#type{tag=Tag}} -> Tag;
+	{TypeFieldName,_} when atom(TypeFieldName) -> [];
+	_ -> []
+    end;
+get_innertag(_S,_) ->
+    [].
+
+is_class(_S,#classdef{}) ->
+    true;
+is_class(S,#typedef{typespec=#type{def=Eref}})
+  when record(Eref,'Externaltypereference')->
+    {_,NextDef} = get_referenced_type(S,Eref),
+    is_class(S,NextDef);
+is_class(_,_) ->
+    false.
+
+get_class_def(_S,CD=#classdef{}) ->
+    CD;
+get_class_def(S,#typedef{typespec=#type{def=Eref}})
+  when record(Eref,'Externaltypereference') ->
+    {_,NextDef} = get_referenced_type(S,Eref),
+    get_class_def(S,NextDef).
+
+maybe_illicit_implicit_tag(Kind,Tag) ->
+    case Tag of
+	[#tag{type='IMPLICIT'}|_T] ->
+	    throw({error,{asn1,{implicit_tag_before,Kind}}});
+	[ChTag = #tag{type={default,_}}|T] ->
+	    case Kind of
+		open_type ->
+		    [ChTag#tag{type='EXPLICIT',form=32}|T]; %X.680 30.6c, X.690 8.14.2
+		choice ->
+		    [ChTag#tag{type='EXPLICIT',form=32}|T] % X.680 28.6 c, 30.6c
+	    end;
+	_ ->
+	    Tag % unchanged
+    end.
+
+%% maybe_open_type/2 -> {ClassSpec,FieldRefList} | 'ASN1_OPEN_TYPE'
+%% if the FieldRefList points out a typefield and the class don't have
+%% any UNIQUE field, so that a component relation constraint cannot specify
+%% the type of a typefield, return 'ASN1_OPEN_TYPE', otherwise return
+%% {ClassSpec,FieldRefList}.
+maybe_open_type(S,ClassSpec=#objectclass{fields=Fs},
+		OCFT=#'ObjectClassFieldType'{fieldname=FieldRefList},
+		Constr) ->
+    Type = get_ObjectClassFieldType(S,Fs,FieldRefList),
+    FieldNames=get_referenced_fieldname(FieldRefList),
+    case lists:last(FieldRefList) of
+	{valuefieldreference,_} ->
+	    OCFT#'ObjectClassFieldType'{class=ClassSpec,
+					fieldname=FieldNames,
+					type=Type};
+	{typefieldreference,_} ->
+	    case {catch get_unique_fieldname(#classdef{typespec=ClassSpec}),
+		  asn1ct_gen:get_constraint(Constr,componentrelation)}of
+		{Tuple,_} when tuple(Tuple) ->
+		    OCFT#'ObjectClassFieldType'{class=ClassSpec,
+						fieldname=FieldNames,
+						type='ASN1_OPEN_TYPE'};
+		{_,no} ->
+		    OCFT#'ObjectClassFieldType'{class=ClassSpec,
+						fieldname=FieldNames,
+						type='ASN1_OPEN_TYPE'};
+		_ ->
+		    OCFT#'ObjectClassFieldType'{class=ClassSpec,
+						fieldname=FieldNames,
+						type=Type}
+	    end
+    end.
+
+is_open_type(#'ObjectClassFieldType'{type='ASN1_OPEN_TYPE'}) ->
+    true;
+is_open_type(#'ObjectClassFieldType'{}) ->
+    false.
+
+
+notify_if_not_ptype(S,#pvaluesetdef{type=Type}) ->
+    case Type#type.def of
+	Ref when record(Ref,'Externaltypereference') ->
+	    case get_referenced_type(S,Ref) of
+		{_,#classdef{}} ->
+		    throw(pobjectsetdef);
+		{_,#typedef{}} ->
+		    throw(pvalueset)
+	    end;
+	T when record(T,type) -> % this must be a value set
+	    throw(pvalueset)
+    end;
+notify_if_not_ptype(_S,#ptypedef{}) ->
+    ok.
+
+% fix me
+instantiate_ptype(S,Ptypedef,ParaList) ->
+    #ptypedef{args=Args,typespec=Type} = Ptypedef,
+%    Args = get_pt_args(Ptypedef),
+%    Type = get_pt_spec(Ptypedef),
+    MatchedArgs = match_args(Args, ParaList, []),
+    NewS = S#state{type=Type,parameters=MatchedArgs,abscomppath=[]},
+    %The abscomppath must be empty since a table constraint in a
+    %parameterized type only can refer to components within the type
+    check_type(NewS, Ptypedef, Type).
+
+get_pt_args(#ptypedef{args=Args}) ->
+    Args;
+get_pt_args(#pvaluesetdef{args=Args}) ->
+    Args;
+get_pt_args(#pvaluedef{args=Args}) ->
+    Args;
+get_pt_args(#pobjectdef{args=Args}) ->
+    Args;
+get_pt_args(#pobjectsetdef{args=Args}) ->
+    Args.
+
+get_pt_spec(#ptypedef{typespec=Type}) ->
+    Type;
+get_pt_spec(#pvaluedef{value=Value}) ->
+    Value;
+get_pt_spec(#pvaluesetdef{valueset=VS}) ->
+    VS;
+get_pt_spec(#pobjectdef{def=Def}) ->
+    Def;
+get_pt_spec(#pobjectsetdef{def=Def}) ->
+    Def.
+
+
+
+match_args([FormArg|Ft], [ActArg|At], Acc) ->
+    match_args(Ft, At, [{FormArg,ActArg}|Acc]);
+match_args([], [], Acc) ->
+    lists:reverse(Acc);
+match_args(_, _, _) ->
+    throw({error,{asn1,{wrong_number_of_arguments}}}).
+
+check_constraints(S,C) when list(C) ->
+    check_constraints(S, C, []);
+check_constraints(S,C) when record(C,constraint) ->
+    check_constraints(S, C#constraint.c, []).
+
+
+resolv_tuple_or_list(S,List) when list(List) ->
+    lists:map(fun(X)->resolv_value(S,X) end, List);
+resolv_tuple_or_list(S,{Lb,Ub}) ->
+    {resolv_value(S,Lb),resolv_value(S,Ub)}.
+
+%%%-----------------------------------------
+%% If the constraint value is a defined value the valuename
+%% is replaced by the actual value
+%%
+resolv_value(S,Val) ->
+    case match_parameters(Val, S#state.parameters) of
+	Id -> % unchanged
+	    resolv_value1(S,Id);
+	Other ->
+	    resolv_value(S,Other)
+    end.
+
+resolv_value1(S = #state{mname=M,inputmodules=InpMods},
+	      V=#'Externalvaluereference'{pos=Pos,module=ExtM,value=Name}) ->
+    case ExtM of
+	M -> resolv_value2(S,M,Name,Pos);
+	_ ->
+	    case lists:member(ExtM,InpMods) of
+		true ->
+		    resolv_value2(S,M,Name,Pos);
+		false ->
+		    V
+	    end
+    end;
+resolv_value1(S,{gt,V}) ->
+    case V of
+	Int when integer(Int) ->
+	    V + 1;
+	#valuedef{value=Int} ->
+	    1 + resolv_value(S,Int);
+	Other ->
+	    throw({error,{asn1,{undefined_type_or_value,Other}}})
+    end;
+resolv_value1(S,{lt,V}) ->
+    case V of
+	Int when integer(Int) ->
+	    V - 1;
+	#valuedef{value=Int} ->
+	    resolv_value(S,Int) - 1;
+	Other ->
+	    throw({error,{asn1,{undefined_type_or_value,Other}}})
+    end;
+resolv_value1(S,{'ValueFromObject',{object,Object},[{valuefieldreference,
+						     FieldName}]}) ->
+    %% FieldName can hold either a fixed-type value or a variable-type value
+    %% Object is a DefinedObject, i.e. a #'Externaltypereference'
+    {_,ObjTDef} = get_referenced_type(S,Object),
+    TS = check_object(S,ObjTDef,ObjTDef#typedef.typespec),
+    {_,_,Components} = TS#'Object'.def,
+    case lists:keysearch(FieldName,1,Components) of
+	{value,{_,#valuedef{value=Val}}} ->
+	    Val;
+	_ ->
+	    error({value,"illegal value in constraint",S})
+    end;
+% resolv_value1(S,{'ValueFromObject',{po,Object,Params},FieldName}) ->
+%     %% FieldName can hold either a fixed-type value or a variable-type value
+%     %% Object is a ParameterizedObject
+resolv_value1(_,V) ->
+    V.
+
+resolv_value2(S,ModuleName,Name,Pos) ->
+    case asn1_db:dbget(ModuleName,Name) of
+	undefined ->
+	    case imported(S,Name) of
+		{ok,Imodule} ->
+		    {_,V2} = get_referenced(S,Imodule,Name,Pos),
+		    V2#valuedef.value;
+		_  ->
+		    throw({error,{asn1,{undefined_type_or_value,Name}}})
+	    end;
+	Val ->
+	    Val#valuedef.value
+    end.
+
+check_constraints(S,[{'ContainedSubtype',Type} | Rest], Acc) ->
+    {_,CTDef} = get_referenced_type(S,Type#type.def),
+    CType = check_type(S,S#state.tname,CTDef#typedef.typespec),
+    check_constraints(S,Rest,CType#type.constraint ++ Acc);
+check_constraints(S,[C | Rest], Acc) ->
+    check_constraints(S,Rest,[check_constraint(S,C) | Acc]);
+check_constraints(S,[],Acc) ->
+%    io:format("Acc: ~p~n",[Acc]),
+    C = constraint_merge(S,lists:reverse(Acc)),
+%    io:format("C: ~p~n",[C]),
+    lists:flatten(C).
+
+
+range_check(F={FixV,FixV}) ->
+%    FixV;
+    F;
+range_check(VR={Lb,Ub}) when Lb < Ub ->
+    VR;
+range_check(Err={_,_}) ->
+    throw({error,{asn1,{illegal_size_constraint,Err}}});
+range_check(Value) ->
+    Value.
+
+check_constraint(S,Ext) when record(Ext,'Externaltypereference') ->
+    check_externaltypereference(S,Ext);
+
+
+check_constraint(S,{'SizeConstraint',{Lb,Ub}})
+  when list(Lb);tuple(Lb),size(Lb)==2 ->
+    case Lb of
+	#'Externalvaluereference'{} ->
+	    check_constraint(S,{'SizeConstraint',{resolv_value(S,Lb),Ub}});
+	_ ->
+	    NewLb = range_check(resolv_tuple_or_list(S,Lb)),
+	    NewUb = range_check(resolv_tuple_or_list(S,Ub)),
+	    {'SizeConstraint',{NewLb,NewUb}}
+    end;
+check_constraint(S,{'SizeConstraint',{Lb,Ub}}) ->
+    case {resolv_value(S,Lb),resolv_value(S,Ub)} of
+	{FixV,FixV} ->
+	    {'SizeConstraint',FixV};
+	{Low,High} when Low < High ->
+	    {'SizeConstraint',{Low,High}};
+	Err ->
+	    throw({error,{asn1,{illegal_size_constraint,Err}}})
+    end;
+check_constraint(S,{'SizeConstraint',Lb}) ->
+    {'SizeConstraint',resolv_value(S,Lb)};
+
+check_constraint(S,{'SingleValue', L}) when list(L) ->
+    F = fun(A) -> resolv_value(S,A) end,
+    {'SingleValue',lists:map(F,L)};
+
+check_constraint(S,{'SingleValue', V}) when integer(V) ->
+    Val = resolv_value(S,V),
+%%    [{'SingleValue',Val},{'ValueRange',{Val,Val}}]; % Why adding value range?
+    {'SingleValue',Val};
+check_constraint(S,{'SingleValue', V}) ->
+    {'SingleValue',resolv_value(S,V)};
+
+check_constraint(S,{'ValueRange', {Lb, Ub}}) ->
+    {'ValueRange',{resolv_value(S,Lb),resolv_value(S,Ub)}};
+
+%%check_constraint(S,{'ContainedSubtype',Type}) ->
+%%    #typedef{typespec=TSpec} =
+%%	check_type(S,S#state.tname,get_referenced_type(S,Type#type.def)),
+%%    [C] = TSpec#type.constraint,
+%%    C;
+
+check_constraint(S,{valueset,Type}) ->
+    {valueset,check_type(S,S#state.tname,Type)};
+
+check_constraint(S,{simpletable,Type}) ->
+    OSName = (Type#type.def)#'Externaltypereference'.type,
+    C = match_parameters(Type#type.def,S#state.parameters),
+    case C of
+	#'Externaltypereference'{} ->
+	     Type#type{def=check_externaltypereference(S,C)},
+	    {simpletable,OSName};
+	_ ->
+	    check_type(S,S#state.tname,Type),
+	    {simpletable,OSName}
+    end;
+
+check_constraint(S,{componentrelation,{objectset,Opos,Objset},Id}) ->
+    %% Objset is an 'Externaltypereference' record, since Objset is
+    %% a DefinedObjectSet.
+    RealObjset = match_parameters(Objset,S#state.parameters),
+    Ext = check_externaltypereference(S,RealObjset),
+    {componentrelation,{objectset,Opos,Ext},Id};
+
+check_constraint(S,Type) when record(Type,type) ->
+    #type{def=Def} = check_type(S,S#state.tname,Type),
+    Def;
+
+check_constraint(S,C) when list(C) ->
+    lists:map(fun(X)->check_constraint(S,X) end,C);
+% else keep the constraint unchanged
+check_constraint(_S,Any) ->
+%    io:format("Constraint = ~p~n",[Any]),
+    Any.
+
+%% constraint_merge/2
+%% Compute the intersection of the outermost level of the constraint list.
+%% See Dubuisson second paragraph and fotnote on page 285.
+%% If constraints with extension are included in combined constraints. The
+%% resulting combination will have the extension of the last constraint. Thus,
+%% there will be no extension if the last constraint is without extension.
+%% The rootset of all constraints are considered in the "outermoust
+%% intersection". See section 13.1.2 in Dubuisson.
+constraint_merge(_S,C=[H])when tuple(H) ->
+    C;
+constraint_merge(_S,[]) ->
+    [];
+constraint_merge(S,C) ->
+    %% skip all extension but the last
+    C1 = filter_extensions(C),
+    %% perform all internal level intersections, intersections first
+    %% since they have precedence over unions
+    C2 = lists:map(fun(X)when list(X)->constraint_intersection(S,X);
+		      (X) -> X end,
+		   C1),
+    %% perform all internal level unions
+    C3 = lists:map(fun(X)when list(X)->constraint_union(S,X);
+		      (X) -> X end,
+		   C2),
+
+    %% now get intersection of the outermost level
+    %% get the least common single value constraint
+    SVs = get_constraints(C3,'SingleValue'),
+    CombSV = intersection_of_sv(S,SVs),
+    %% get the least common value range constraint
+    VRs = get_constraints(C3,'ValueRange'),
+    CombVR = intersection_of_vr(S,VRs),
+    %% get the least common size constraint
+    SZs = get_constraints(C3,'SizeConstraint'),
+    CombSZ = intersection_of_size(S,SZs),
+    CminusSVs=ordsets:subtract(ordsets:from_list(C3),ordsets:from_list(SVs)),
+    % CminusSVsVRs = ordsets:subtract(ordsets:from_list(CminusSVs),
+% 				    ordsets:from_list(VRs)),
+    RestC = ordsets:subtract(ordsets:from_list(CminusSVs),
+			     ordsets:from_list(SZs)),
+    %% get the least common combined constraint. That is the union of each
+    %% deep costraint and merge of single value and value range constraints
+    combine_constraints(S,CombSV,CombVR,CombSZ++RestC).
+
+%% constraint_union(S,C) takes a list of constraints as input and
+%% merge them to a union. Unions are performed when two
+%% constraints is found with an atom union between.
+%% The list may be nested. Fix that later !!!
+constraint_union(_S,[]) ->
+    [];
+constraint_union(_S,C=[_E]) ->
+    C;
+constraint_union(S,C) when list(C) ->
+    case lists:member(union,C) of
+	true ->
+	    constraint_union1(S,C,[]);
+	_ ->
+	    C
+    end;
+%     SV = get_constraints(C,'SingleValue'),
+%     SV1 = constraint_union_sv(S,SV),
+%     VR = get_constraints(C,'ValueRange'),
+%     VR1 = constraint_union_vr(VR),
+%     RestC = ordsets:filter(fun({'SingleValue',_})->false;
+% 			      ({'ValueRange',_})->false;
+% 			      (_) -> true end,ordsets:from_list(C)),
+%     SV1++VR1++RestC;
+constraint_union(_S,C) ->
+    [C].
+
+constraint_union1(S,[A={'ValueRange',_},union,B={'ValueRange',_}|Rest],Acc) ->
+    AunionB = constraint_union_vr([A,B]),
+    constraint_union1(S,Rest,AunionB++Acc);
+constraint_union1(S,[A={'SingleValue',_},union,B={'SingleValue',_}|Rest],Acc) ->
+    AunionB = constraint_union_sv(S,[A,B]),
+    constraint_union1(S,Rest,AunionB++Acc);
+constraint_union1(S,[A={'SingleValue',_},union,B={'ValueRange',_}|Rest],Acc) ->
+    AunionB = union_sv_vr(S,A,B),
+    constraint_union1(S,Rest,AunionB++Acc);
+constraint_union1(S,[A={'ValueRange',_},union,B={'SingleValue',_}|Rest],Acc) ->
+    AunionB = union_sv_vr(S,B,A),
+    constraint_union1(S,Rest,AunionB++Acc);
+constraint_union1(S,[union|Rest],Acc) -> %skip when unsupported constraints
+    constraint_union1(S,Rest,Acc);
+constraint_union1(S,[A|Rest],Acc) ->
+    constraint_union1(S,Rest,[A|Acc]);
+constraint_union1(_S,[],Acc) ->
+    lists:reverse(Acc).
+
+constraint_union_sv(_S,SV) ->
+    Values=lists:map(fun({_,V})->V end,SV),
+    case ordsets:from_list(Values) of
+	[] -> [];
+	[N] -> [{'SingleValue',N}];
+	L -> [{'SingleValue',L}]
+    end.
+
+%% REMOVE????
+%%constraint_union(S,VR,'ValueRange') ->
+%%    constraint_union_vr(VR).
+
+%% constraint_union_vr(VR)
+%% VR = [{'ValueRange',{Lb,Ub}},...]
+%% Lb = 'MIN' | integer()
+%% Ub = 'MAX' | integer()
+%% Returns if possible only one ValueRange tuple with a range that
+%% is a union of all ranges in VR.
+constraint_union_vr(VR) ->
+    %% Sort VR by Lb in first hand and by Ub in second hand
+    Fun=fun({_,{'MIN',_B1}},{_,{A2,_B2}}) when integer(A2)->true;
+	   ({_,{A1,_B1}},{_,{'MAX',_B2}}) when integer(A1) -> true;
+	   ({_,{A1,_B1}},{_,{A2,_B2}}) when integer(A1),integer(A2),A1<A2 -> true;
+	   ({_,{A,B1}},{_,{A,B2}}) when B1=<B2->true;
+	   (_,_)->false end,
+    constraint_union_vr(lists:usort(Fun,VR),[]).
+
+constraint_union_vr([],Acc) ->
+    lists:reverse(Acc);
+constraint_union_vr([C|Rest],[]) ->
+    constraint_union_vr(Rest,[C]);
+constraint_union_vr([{_,{Lb,Ub2}}|Rest],[{_,{Lb,_Ub1}}|Acc]) -> %Ub2 > Ub1
+    constraint_union_vr(Rest,[{'ValueRange',{Lb,Ub2}}|Acc]);
+constraint_union_vr([{_,{_,Ub}}|Rest],A=[{_,{_,Ub}}|_Acc]) ->
+    constraint_union_vr(Rest,A);
+constraint_union_vr([{_,{Lb2,Ub2}}|Rest],[{_,{Lb1,Ub1}}|Acc]) when Lb2=<Ub1,
+								   Ub2>Ub1->
+    constraint_union_vr(Rest,[{'ValueRange',{Lb1,Ub2}}|Acc]);
+constraint_union_vr([{_,{_,Ub2}}|Rest],A=[{_,{_,Ub1}}|_Acc]) when Ub2=<Ub1->
+    constraint_union_vr(Rest,A);
+constraint_union_vr([VR|Rest],Acc) ->
+    constraint_union_vr(Rest,[VR|Acc]).
+
+union_sv_vr(_S,[],B) ->
+    [B];
+union_sv_vr(_S,A,[]) ->
+    [A];
+union_sv_vr(_S,C1={'SingleValue',SV},C2={'ValueRange',VR={Lb,Ub}})
+  when integer(SV) ->
+    case is_int_in_vr(SV,C2) of
+	true -> [C2];
+	_ ->
+	    case VR of
+		{'MIN',Ub} when SV==Ub+1 -> [{'ValueRange',{'MIN',SV}}];
+		{Lb,'MAX'} when SV==Lb-1 -> [{'ValueRange',{SV,'MAX'}}];
+		{Lb,Ub} when SV==Ub+1 -> [{'ValueRange',{Lb,SV}}];
+		{Lb,Ub} when SV==Lb-1 -> [{'ValueRange',{SV,Ub}}];
+		_ ->
+		    [C1,C2]
+	    end
+    end;
+union_sv_vr(_S,C1={'SingleValue',SV},C2={'ValueRange',{_Lb,_Ub}})
+  when list(SV) ->
+    case lists:filter(fun(X)->is_int_in_vr(X,C2) end,SV) of
+	[] -> [C2];
+	L ->
+	    case expand_vr(L,C2) of
+		{[],C3} -> [C3];
+		{L,C2} -> [C1,C2];
+		{[Val],C3} -> [{'SingleValue',Val},C3];
+		{L2,C3} -> [{'SingleValue',L2},C3]
+	    end
+    end.
+
+expand_vr(L,VR={_,{Lb,Ub}}) ->
+    case lower_Lb(L,Lb) of
+	false ->
+	    case higher_Ub(L,Ub) of
+		false ->
+		    {L,VR};
+		{L1,UbNew} ->
+		    expand_vr(L1,{'ValueRange',{Lb,UbNew}})
+	    end;
+	{L1,LbNew} ->
+	    expand_vr(L1,{'ValueRange',{LbNew,Ub}})
+    end.
+
+lower_Lb(_,'MIN') ->
+    false;
+lower_Lb(L,Lb) ->
+    remove_val_from_list(Lb - 1,L).
+
+higher_Ub(_,'MAX') ->
+    false;
+higher_Ub(L,Ub) ->
+    remove_val_from_list(Ub + 1,L).
+
+remove_val_from_list(List,Val) ->
+    case lists:member(Val,List) of
+	true ->
+	    {lists:delete(Val,List),Val};
+	false ->
+	    false
+    end.
+
+%% get_constraints/2
+%% Arguments are a list of constraints, which has the format {key,value},
+%% and a constraint type
+%% Returns a list of constraints only of the requested type or the atom
+%% 'no' if no such constraints were found
+get_constraints(L=[{CType,_}],CType) ->
+    L;
+get_constraints(C,CType) ->
+   keysearch_allwithkey(CType,1,C).
+
+%% keysearch_allwithkey(Key,Ix,L)
+%% Types:
+%% Key = atom()
+%% Ix = integer()
+%% L  = [TwoTuple]
+%% TwoTuple = [{atom(),term()}|...]
+%% Returns a List that contains all
+%% elements from L that has a key Key as element Ix
+keysearch_allwithkey(Key,Ix,L) ->
+    lists:filter(fun(X) when tuple(X) ->
+			 case element(Ix,X) of
+			     Key -> true;
+			     _ -> false
+			 end;
+		    (_) -> false
+		 end, L).
+
+
+%% filter_extensions(C)
+%% takes a list of constraints as input and
+%% returns a list with the intersection of all extension roots
+%% and only the extension of the last constraint kept if any
+%% extension in the last constraint
+filter_extensions([]) ->
+    [];
+filter_extensions(C=[_H]) ->
+    C;
+filter_extensions(C) when list(C) ->
+    filter_extensions(C,[]).
+
+filter_extensions([C],Acc) ->
+    lists:reverse([C|Acc]);
+filter_extensions([{C,_E},H2|T],Acc) when tuple(C) ->
+    filter_extensions([H2|T],[C|Acc]);
+filter_extensions([{'SizeConstraint',{A,_B}},H2|T],Acc)
+  when list(A);tuple(A) ->
+    filter_extensions([H2|T],[{'SizeConstraint',A}|Acc]);
+filter_extensions([H1,H2|T],Acc) ->
+    filter_extensions([H2|T],[H1|Acc]).
+
+%% constraint_intersection(S,C) takes a list of constraints as input and
+%% performs intersections. Intersecions are performed when an
+%% atom intersection is found between two constraints.
+%% The list may be nested. Fix that later !!!
+constraint_intersection(_S,[]) ->
+    [];
+constraint_intersection(_S,C=[_E]) ->
+    C;
+constraint_intersection(S,C) when list(C) ->
+%    io:format("constraint_intersection: ~p~n",[C]),
+    case lists:member(intersection,C) of
+	true ->
+	    constraint_intersection1(S,C,[]);
+	_ ->
+	    C
+    end;
+constraint_intersection(_S,C) ->
+    [C].
+
+constraint_intersection1(S,[A,intersection,B|Rest],Acc) ->
+    AisecB = c_intersect(S,A,B),
+    constraint_intersection1(S,Rest,AisecB++Acc);
+constraint_intersection1(S,[A|Rest],Acc) ->
+    constraint_intersection1(S,Rest,[A|Acc]);
+constraint_intersection1(_,[],Acc) ->
+    lists:reverse(Acc).
+
+c_intersect(S,C1={'SingleValue',_},C2={'SingleValue',_}) ->
+    intersection_of_sv(S,[C1,C2]);
+c_intersect(S,C1={'ValueRange',_},C2={'ValueRange',_}) ->
+    intersection_of_vr(S,[C1,C2]);
+c_intersect(S,C1={'ValueRange',_},C2={'SingleValue',_}) ->
+    intersection_sv_vr(S,[C2],[C1]);
+c_intersect(S,C1={'SingleValue',_},C2={'ValueRange',_}) ->
+    intersection_sv_vr(S,[C1],[C2]);
+c_intersect(_S,C1,C2) ->
+    [C1,C2].
+
+%% combine_constraints(S,SV,VR,CComb)
+%% Types:
+%% S = record(state,S)
+%% SV = [] | [SVC]
+%% VR = [] | [VRC]
+%% CComb = [] | [Lists]
+%% SVC = {'SingleValue',integer()} | {'SingleValue',[integer(),...]}
+%% VRC = {'ValueRange',{Lb,Ub}}
+%% Lists = List of lists containing any constraint combination
+%% Lb = 'MIN' | integer()
+%% Ub = 'MAX' | integer()
+%% Returns a combination of the least common constraint among SV,VR and all
+%% elements in CComb
+combine_constraints(_S,[],VR,CComb) ->
+    VR ++ CComb;
+%    combine_combined_cnstr(S,VR,CComb);
+combine_constraints(_S,SV,[],CComb) ->
+    SV ++ CComb;
+%    combine_combined_cnstr(S,SV,CComb);
+combine_constraints(S,SV,VR,CComb) ->
+    C=intersection_sv_vr(S,SV,VR),
+    C ++ CComb.
+%    combine_combined_cnstr(S,C,CComb).
+
+intersection_sv_vr(_,[],_VR) ->
+    [];
+intersection_sv_vr(_,_SV,[]) ->
+    [];
+intersection_sv_vr(_S,[C1={'SingleValue',SV}],[C2={'ValueRange',{_Lb,_Ub}}])
+  when integer(SV) ->
+    case is_int_in_vr(SV,C2) of
+	true -> [C1];
+	_ -> %%error({type,{"asn1 illegal constraint",C1,C2},S})
+	    throw({error,{"asn1 illegal constraint",C1,C2}})
+    end;
+intersection_sv_vr(_S,[C1={'SingleValue',SV}],[C2])
+  when list(SV) ->
+    case lists:filter(fun(X)->is_int_in_vr(X,C2) end,SV) of
+	[] ->
+	    %%error({type,{"asn1 illegal constraint",C1,C2},S});
+	    throw({error,{"asn1 illegal constraint",C1,C2}});
+	[V] -> [{'SingleValue',V}];
+	L -> [{'SingleValue',L}]
+    end.
+
+
+
+intersection_of_size(_,[]) ->
+    [];
+intersection_of_size(_,C=[_SZ]) ->
+    C;
+intersection_of_size(S,[SZ,SZ|Rest]) ->
+    intersection_of_size(S,[SZ|Rest]);
+intersection_of_size(S,C=[C1={_,Int},{_,Range}|Rest])
+  when integer(Int),tuple(Range) ->
+    case Range of
+	{Lb,Ub} when Int >= Lb,
+		     Int =< Ub ->
+	    intersection_of_size(S,[C1|Rest]);
+	_ ->
+	    throw({error,{asn1,{illegal_size_constraint,C}}})
+    end;
+intersection_of_size(S,[C1={_,Range},C2={_,Int}|Rest])
+  when integer(Int),tuple(Range) ->
+    intersection_of_size(S,[C2,C1|Rest]);
+intersection_of_size(S,[{_,{Lb1,Ub1}},{_,{Lb2,Ub2}}|Rest]) ->
+    Lb=greatest_LB(ordsets:from_list([Lb1,Lb2])),
+    Ub=smallest_UB(ordsets:from_list([Ub1,Ub2])),
+    intersection_of_size(S,[{'SizeConstraint',{Lb,Ub}}|Rest]);
+intersection_of_size(_,SZ) ->
+    throw({error,{asn1,{illegal_size_constraint,SZ}}}).
+
+intersection_of_vr(_,[]) ->
+    [];
+intersection_of_vr(_,VR=[_C]) ->
+    VR;
+intersection_of_vr(S,[{_,{Lb1,Ub1}},{_,{Lb2,Ub2}}|Rest]) ->
+    Lb=greatest_LB(ordsets:from_list([Lb1,Lb2])),
+    Ub=smallest_UB(ordsets:from_list([Ub1,Ub2])),
+    intersection_of_vr(S,[{'ValueRange',{Lb,Ub}}|Rest]);
+intersection_of_vr(_S,VR) ->
+    %%error({type,{asn1,{illegal_value_range_constraint,VR}},S});
+    throw({error,{asn1,{illegal_value_range_constraint,VR}}}).
+
+intersection_of_sv(_,[]) ->
+    [];
+intersection_of_sv(_,SV=[_C]) ->
+    SV;
+intersection_of_sv(S,[SV,SV|Rest]) ->
+    intersection_of_sv(S,[SV|Rest]);
+intersection_of_sv(S,[{_,Int},{_,SV}|Rest]) when integer(Int),
+						 list(SV) ->
+    SV2=intersection_of_sv1(S,Int,SV),
+    intersection_of_sv(S,[SV2|Rest]);
+intersection_of_sv(S,[{_,SV},{_,Int}|Rest]) when integer(Int),
+						 list(SV) ->
+    SV2=intersection_of_sv1(S,Int,SV),
+    intersection_of_sv(S,[SV2|Rest]);
+intersection_of_sv(S,[{_,SV1},{_,SV2}|Rest]) when list(SV1),
+						  list(SV2) ->
+    SV3=common_set(SV1,SV2),
+    intersection_of_sv(S,[SV3|Rest]);
+intersection_of_sv(_S,SV) ->
+    %%error({type,{asn1,{illegal_single_value_constraint,SV}},S}).
+    throw({error,{asn1,{illegal_single_value_constraint,SV}}}).
+
+intersection_of_sv1(_S,Int,SV) when integer(Int),list(SV) ->
+    case lists:member(Int,SV) of
+	true -> {'SingleValue',Int};
+	_ ->
+	    %%error({type,{asn1,{illegal_single_value_constraint,Int,SV}},S})
+	    throw({error,{asn1,{illegal_single_value_constraint,Int,SV}}})
+    end;
+intersection_of_sv1(_S,SV1,SV2) ->
+    %%error({type,{asn1,{illegal_single_value_constraint,SV1,SV2}},S}).
+    throw({error,{asn1,{illegal_single_value_constraint,SV1,SV2}}}).
+
+greatest_LB([H]) ->
+    H;
+greatest_LB(L) ->
+    greatest_LB1(lists:reverse(L)).
+greatest_LB1(['MIN',H2|_T])->
+    H2;
+greatest_LB1([H|_T]) ->
+    H.
+smallest_UB(L) ->
+    hd(L).
+
+common_set(SV1,SV2) ->
+    lists:filter(fun(X)->lists:member(X,SV1) end,SV2).
+
+is_int_in_vr(Int,{_,{'MIN','MAX'}}) when integer(Int) ->
+    true;
+is_int_in_vr(Int,{_,{'MIN',Ub}}) when integer(Int),Int =< Ub ->
+    true;
+is_int_in_vr(Int,{_,{Lb,'MAX'}}) when integer(Int),Int >= Lb ->
+    true;
+is_int_in_vr(Int,{_,{Lb,Ub}}) when integer(Int),Int >= Lb,Int =< Ub ->
+    true;
+is_int_in_vr(_,_) ->
+    false.
+
+
+
+check_imported(_S,Imodule,Name) ->
+    case asn1_db:dbget(Imodule,'MODULE') of
+	undefined ->
+	    io:format("~s.asn1db not found~n",[Imodule]),
+	    io:format("Type ~s imported from non existing module ~s~n",[Name,Imodule]);
+	Im when record(Im,module) ->
+	    case is_exported(Im,Name) of
+		false ->
+		    io:format("Imported type ~s not exported from module ~s~n",[Name,Imodule]);
+		_ ->
+		    ok
+	    end
+    end,
+    ok.
+
+is_exported(Module,Name) when record(Module,module) ->
+    {exports,Exports} = Module#module.exports,
+    case Exports of
+	all ->
+	    true;
+	[] ->
+	    false;
+	L when list(L) ->
+	    case lists:keysearch(Name,#'Externaltypereference'.type,Exports) of
+		false -> false;
+		_ -> true
+	    end
+    end.
+
+
+
+check_externaltypereference(S,Etref=#'Externaltypereference'{module=Emod})->
+    Currmod = S#state.mname,
+    MergedMods = S#state.inputmodules,
+    case Emod of
+	Currmod ->
+	    %% reference to current module or to imported reference
+		check_reference(S,Etref);
+	 _ ->
+	    %% io:format("Type ~s IMPORTED FROM ~s~n",[Etype,Emod]),
+	    case lists:member(Emod,MergedMods) of
+		true ->
+		    check_reference(S,Etref);
+		false ->
+		    Etref
+	    end
+    end.
+
+check_reference(S,#'Externaltypereference'{pos=Pos,module=Emod,type=Name}) ->
+    ModName = S#state.mname,
+    case asn1_db:dbget(ModName,Name) of
+	undefined ->
+	    case imported(S,Name) of
+		{ok,Imodule} ->
+		    check_imported(S,Imodule,Name),
+		    #'Externaltypereference'{module=Imodule,type=Name};
+		_ ->
+		    %may be a renamed type in multi file compiling!
+		    {_,T}=renamed_reference(S,Name,Emod),
+		    NewName = asn1ct:get_name_of_def(T),
+		    NewPos = asn1ct:get_pos_of_def(T),
+		    #'Externaltypereference'{pos=NewPos,
+					     module=ModName,
+					     type=NewName}
+	    end;
+	_ ->
+	    %% cannot do check_type here due to recursive definitions, like
+	    %% S ::= SEQUENCE {a INTEGER, b S}. This implies that references
+	    %% that appear before the definition will be an
+	    %% Externaltypereference in the abstract syntax tree
+	    #'Externaltypereference'{pos=Pos,module=ModName,type=Name}
+    end.
+
+
+name2Extref(_Mod,Name) when record(Name,'Externaltypereference') ->
+    Name;
+name2Extref(Mod,Name) ->
+    #'Externaltypereference'{module=Mod,type=Name}.
+
+get_referenced_type(S,Ext) when record(Ext,'Externaltypereference') ->
+    case match_parameters(Ext, S#state.parameters) of
+	Ext ->
+	    #'Externaltypereference'{pos=Pos,module=Emod,type=Etype} = Ext,
+	    case S#state.mname of
+		Emod -> % a local reference in this module
+		    get_referenced1(S,Emod,Etype,Pos);
+		_ ->% always when multi file compiling
+		    case lists:member(Emod,S#state.inputmodules) of
+			true ->
+			    get_referenced1(S,Emod,Etype,Pos);
+			false ->
+			    get_referenced(S,Emod,Etype,Pos)
+		    end
+	    end;
+	Other ->
+	    {undefined,Other}
+    end;
+get_referenced_type(S=#state{mname=Emod},
+		    ERef=#'Externalvaluereference'{pos=P,module=Emod,
+						   value=Eval}) ->
+    case match_parameters(ERef,S#state.parameters) of
+	ERef ->
+	    get_referenced1(S,Emod,Eval,P);
+	OtherERef when record(OtherERef,'Externalvaluereference') ->
+	    get_referenced_type(S,OtherERef);
+	Value ->
+	    {Emod,Value}
+    end;
+get_referenced_type(S,ERef=#'Externalvaluereference'{pos=Pos,module=Emod,
+						value=Eval}) ->
+    case match_parameters(ERef,S#state.parameters) of
+	ERef ->
+	    case lists:member(Emod,S#state.inputmodules) of
+		true ->
+		    get_referenced1(S,Emod,Eval,Pos);
+		false ->
+		    get_referenced(S,Emod,Eval,Pos)
+	    end;
+	OtherERef  ->
+	    get_referenced_type(S,OtherERef)
+    end;
+get_referenced_type(S,#identifier{val=Name,pos=Pos}) ->
+    get_referenced1(S,undefined,Name,Pos);
+get_referenced_type(_S,Type) ->
+    {undefined,Type}.
+
+%% get_referenced/3
+%% The referenced entity Ename may in case of an imported parameterized
+%% type reference imported entities in the other module, which implies that
+%% asn1_db:dbget will fail even though the referenced entity exists. Thus
+%% Emod may be the module that imports the entity Ename and not holds the
+%% data about Ename.
+get_referenced(S,Emod,Ename,Pos) ->
+    case asn1_db:dbget(Emod,Ename) of
+	undefined ->
+	    %% May be an imported entity in module Emod
+%	    throw({error,{asn1,{undefined_type_or_value,{Emod,Ename}}}});
+	    NewS = S#state{module=asn1_db:dbget(Emod,'MODULE')},
+	    get_imported(NewS,Ename,Emod,Pos);
+	T when record(T,typedef) ->
+	    Spec = T#typedef.typespec,
+	    case Spec#type.def of
+		Tref when record(Tref,typereference) ->
+		    Def = #'Externaltypereference'{module=Emod,
+					     type=Tref#typereference.val,
+					     pos=Tref#typereference.pos},
+
+
+		    {Emod,T#typedef{typespec=Spec#type{def=Def}}};
+		_ ->
+		    {Emod,T} % should add check that T is exported here
+	    end;
+	V -> {Emod,V}
+    end.
+
+get_referenced1(S,ModuleName,Name,Pos) ->
+    case asn1_db:dbget(S#state.mname,Name) of
+	undefined ->
+	    %% ModuleName may be other than S#state.mname when
+	    %% multi file compiling is used.
+	    get_imported(S,Name,ModuleName,Pos);
+	T ->
+	    {S#state.mname,T}
+    end.
+
+get_imported(S,Name,Module,Pos) ->
+    case imported(S,Name) of
+	{ok,Imodule} ->
+	    case asn1_db:dbget(Imodule,'MODULE') of
+		undefined ->
+		    throw({error,{asn1,{module_not_found,Imodule}}});
+		Im when record(Im,module) ->
+		    case is_exported(Im,Name) of
+			false ->
+			    throw({error,
+				   {asn1,{not_exported,{Im,Name}}}});
+			_ ->
+			    get_referenced_type(S,
+						#'Externaltypereference'
+						{module=Imodule,
+						 type=Name,pos=Pos})
+		    end
+	    end;
+	_ ->
+	    renamed_reference(S,Name,Module)
+    end.
+
+renamed_reference(S,Name,Module) ->
+    %% first check if there is a renamed type in this module
+    %% second check if any type was imported with this name
+    case ets:info(renamed_defs) of
+	undefined -> throw({error,{asn1,{undefined_type,Name}}});
+	_ ->
+	    case ets:match(renamed_defs,{'$1',Name,Module}) of
+		[] ->
+		    case ets:info(original_imports) of
+			undefined ->
+			    throw({error,{asn1,{undefined_type,Name}}});
+			_  ->
+			    case ets:match(original_imports,{Module,'$1'}) of
+				[] ->
+				    throw({error,{asn1,{undefined_type,Name}}});
+				[[ImportsList]] ->
+				    case get_importmoduleoftype(ImportsList,Name) of
+					undefined ->
+					    throw({error,{asn1,{undefined_type,Name}}});
+					NextMod ->
+					    renamed_reference(S,Name,NextMod)
+				    end
+			    end
+		    end;
+		[[NewTypeName]] ->
+		    get_referenced1(S,Module,NewTypeName,undefined)
+	    end
+    end.
+
+get_importmoduleoftype([I|Is],Name) ->
+    Index = #'Externaltypereference'.type,
+    case lists:keysearch(Name,Index,I#'SymbolsFromModule'.symbols) of
+	{value,_Ref} ->
+	    (I#'SymbolsFromModule'.module)#'Externaltypereference'.type;
+	_ ->
+	    get_importmoduleoftype(Is,Name)
+    end;
+get_importmoduleoftype([],_) ->
+    undefined.
+
+
+match_parameters(Name,[]) ->
+    Name;
+
+match_parameters(#'Externaltypereference'{type=Name},[{#'Externaltypereference'{type=Name},NewName}|_T]) ->
+    NewName;
+match_parameters(#'Externaltypereference'{type=Name},[{{_,#'Externaltypereference'{type=Name}},NewName}|_T]) ->
+    NewName;
+% match_parameters(#'Externaltypereference'{type=Name},[{#typereference{val=Name},NewName}|T]) ->
+%     NewName;
+% match_parameters(#'Externaltypereference'{type=Name},[{{_,#typereference{val=Name}},NewName}|T]) ->
+%     NewName;
+%match_parameters(#typereference{val=Name},[{#typereference{val=Name},NewName}|T]) ->
+%    NewName;
+match_parameters(#'Externalvaluereference'{value=Name},[{#'Externalvaluereference'{value=Name},NewName}|_T]) ->
+    NewName;
+match_parameters(#'Externalvaluereference'{value=Name},[{{_,#'Externalvaluereference'{value=Name}},NewName}|_T]) ->
+    NewName;
+% match_parameters(#identifier{val=Name},[{#identifier{val=Name},NewName}|T]) ->
+%     NewName;
+% match_parameters(#identifier{val=Name},[{{_,#identifier{val=Name}},NewName}|T]) ->
+%     NewName;
+match_parameters({valueset,#type{def=#'Externaltypereference'{type=Name}}},
+		 [{{_,#'Externaltypereference'{type=Name}},{valueset,#type{def=NewName}}}|_T]) ->
+    NewName;
+match_parameters({valueset,#type{def=#'Externaltypereference'{type=Name}}},
+		 [{{_,#'Externaltypereference'{type=Name}},NewName}|_T]) ->
+    NewName;
+% match_parameters({valueset,#type{def=#'Externaltypereference'{type=Name}}},
+% 		 [{{_,#typereference{val=Name}},{valueset,#type{def=NewName}}}|T]) ->
+%     NewName;
+% match_parameters({valueset,#type{def=#'Externaltypereference'{type=Name}}},
+% 		 [{{_,#typereference{val=Name}},NewName}|T]) ->
+%     NewName;
+
+match_parameters(Name, [_H|T]) ->
+    %%io:format("match_parameters(~p,~p)~n",[Name,[H|T]]),
+    match_parameters(Name,T).
+
+imported(S,Name) ->
+    {imports,Ilist} = (S#state.module)#module.imports,
+    imported1(Name,Ilist).
+
+imported1(Name,
+	  [#'SymbolsFromModule'{symbols=Symlist,
+				module=#'Externaltypereference'{type=ModuleName}}|T]) ->
+    case lists:keysearch(Name,#'Externaltypereference'.type,Symlist) of
+	{value,_V} ->
+	    {ok,ModuleName};
+	_ ->
+	    imported1(Name,T)
+    end;
+imported1(_Name,[]) ->
+    false.
+
+
+check_integer(_S,[],_C) ->
+    ok;
+check_integer(S,NamedNumberList,_C) ->
+    case check_unique(NamedNumberList,2) of
+	[] ->
+	    check_int(S,NamedNumberList,[]);
+	L when list(L) ->
+	    error({type,{duplicates,L},S}),
+	    unchanged
+
+    end.
+
+check_int(S,[{'NamedNumber',Id,Num}|T],Acc) when integer(Num) ->
+    check_int(S,T,[{Id,Num}|Acc]);
+check_int(S,[{'NamedNumber',Id,{identifier,_,Name}}|T],Acc) ->
+    Val = dbget_ex(S,S#state.mname,Name),
+    check_int(S,[{'NamedNumber',Id,Val#valuedef.value}|T],Acc);
+check_int(_S,[],Acc) ->
+    lists:keysort(2,Acc).
+
+
+
+check_bitstring(_S,[],_Constr) ->
+    [];
+check_bitstring(S,NamedNumberList,_Constr) ->
+    case check_unique(NamedNumberList,2) of
+	[] ->
+	    check_bitstr(S,NamedNumberList,[]);
+	L when list(L) ->
+	    error({type,{duplicates,L},S}),
+	    unchanged
+    end.
+
+check_bitstr(S,[{'NamedNumber',Id,Num}|T],Acc)when integer(Num) ->
+    check_bitstr(S,T,[{Id,Num}|Acc]);
+check_bitstr(S,[{'NamedNumber',Id,Name}|T],Acc) when atom(Name) ->
+%%check_bitstr(S,[{'NamedNumber',Id,{identifier,_,Name}}|T],Acc) ->
+%%    io:format("asn1ct_check:check_bitstr/3 hej hop ~w~n",[Name]),
+    Val = dbget_ex(S,S#state.mname,Name),
+%%    io:format("asn1ct_check:check_bitstr/3: ~w~n",[Val]),
+    check_bitstr(S,[{'NamedNumber',Id,Val#valuedef.value}|T],Acc);
+check_bitstr(S,[],Acc) ->
+    case check_unique(Acc,2) of
+	[] ->
+	    lists:keysort(2,Acc);
+	L when list(L) ->
+	    error({type,{duplicate_values,L},S}),
+	    unchanged
+    end.
+
+%%check_bitstring(S,NamedNumberList,Constr) ->
+%%    NamedNumberList.
+
+%% Check INSTANCE OF
+%% check that DefinedObjectClass is of TYPE-IDENTIFIER class
+%% If Constraint is empty make it the general INSTANCE OF type
+%% If Constraint is not empty make an inlined type
+%% convert INSTANCE OF to the associated type
+check_instance_of(S,DefinedObjectClass,Constraint) ->
+    check_type_identifier(S,DefinedObjectClass),
+    iof_associated_type(S,Constraint).
+
+
+check_type_identifier(_S,'TYPE-IDENTIFIER') ->
+    ok;
+check_type_identifier(S,Eref=#'Externaltypereference'{}) ->
+    case get_referenced_type(S,Eref) of
+	{_,#classdef{name='TYPE-IDENTIFIER'}} -> ok;
+	{_,TD=#typedef{typespec=#type{def=#'Externaltypereference'{}}}} ->
+	    check_type_identifier(S,(TD#typedef.typespec)#type.def);
+	_ ->
+	    error({type,{"object set in type INSTANCE OF "
+			 "not of class TYPE-IDENTIFIER",Eref},S})
+    end.
+
+iof_associated_type(S,[]) ->
+    %% in this case encode/decode functions for INSTANCE OF must be
+    %% generated
+    case get(instance_of) of
+	undefined ->
+	    AssociateSeq = iof_associated_type1(S,[]),
+	    Tag =
+		case S#state.erule of
+		    ber_bin_v2 ->
+			[?TAG_CONSTRUCTED(?N_INSTANCE_OF)];
+		    _ -> []
+		end,
+	    TypeDef=#typedef{checked=true,
+			     name='INSTANCE OF',
+			     typespec=#type{tag=Tag,
+					    def=AssociateSeq}},
+	    asn1_db:dbput(S#state.mname,'INSTANCE OF',TypeDef),
+	    put(instance_of,generate);
+	_ ->
+	    ok
+    end,
+    #'Externaltypereference'{module=S#state.mname,type='INSTANCE OF'};
+iof_associated_type(S,C) ->
+    iof_associated_type1(S,C).
+
+iof_associated_type1(S,C) ->
+    {TableCInf,Comp1Cnstr,Comp2Cnstr,Comp2tablecinf}=
+	instance_of_constraints(S,C),
+
+    ModuleName = S#state.mname,
+    Typefield_type=
+	case C of
+	    [] -> 'ASN1_OPEN_TYPE';
+	    _ -> {typefield,'Type'}
+	end,
+    {ObjIdTag,C1TypeTag}=
+	case S#state.erule of
+	    ber_bin_v2 ->
+		{[{'UNIVERSAL',8}],
+		 [#tag{class='UNIVERSAL',
+		       number=6,
+		       type='IMPLICIT',
+		       form=0}]};
+	    _ -> {[{'UNIVERSAL','INTEGER'}],[]}
+	end,
+    TypeIdentifierRef=#'Externaltypereference'{module=ModuleName,
+					       type='TYPE-IDENTIFIER'},
+    ObjectIdentifier =
+	#'ObjectClassFieldType'{classname=TypeIdentifierRef,
+				class=[],
+				fieldname={id,[]},
+				type={fixedtypevaluefield,id,
+				      #type{def='OBJECT IDENTIFIER'}}},
+    Typefield =
+	#'ObjectClassFieldType'{classname=TypeIdentifierRef,
+				class=[],
+				fieldname={'Type',[]},
+				type=Typefield_type},
+    IOFComponents =
+	[#'ComponentType'{name='type-id',
+			  typespec=#type{tag=C1TypeTag,
+					 def=ObjectIdentifier,
+					 constraint=Comp1Cnstr},
+			  prop=mandatory,
+			  tags=ObjIdTag},
+	 #'ComponentType'{name=value,
+			  typespec=#type{tag=[#tag{class='CONTEXT',
+						   number=0,
+						   type='EXPLICIT',
+						   form=32}],
+					 def=Typefield,
+					 constraint=Comp2Cnstr,
+					 tablecinf=Comp2tablecinf},
+			  prop=mandatory,
+			  tags=[{'CONTEXT',0}]}],
+    #'SEQUENCE'{tablecinf=TableCInf,
+		components=IOFComponents}.
+
+
+%% returns the leading attribute, the constraint of the components and
+%% the tablecinf value for the second component.
+instance_of_constraints(_,[]) ->
+    {false,[],[],[]};
+instance_of_constraints(S,#constraint{c={simpletable,Type}}) ->
+    #type{def=#'Externaltypereference'{type=Name}} = Type,
+    ModuleName = S#state.mname,
+    ObjectSetRef=#'Externaltypereference'{module=ModuleName,
+					  type=Name},
+    CRel=[{componentrelation,{objectset,
+			      undefined, %% pos
+			      ObjectSetRef},
+			      [{innermost,
+				[#'Externalvaluereference'{module=ModuleName,
+							   value=type}]}]}],
+    TableCInf=#simpletableattributes{objectsetname=Name,
+				     c_name='type-id',
+				     c_index=1,
+				     usedclassfield=id,
+				     uniqueclassfield=id,
+				     valueindex=[]},
+    {TableCInf,[{simpletable,Name}],CRel,[{objfun,ObjectSetRef}]}.
+
+%% Check ENUMERATED
+%% ****************************************
+%% Check that all values are unique
+%% assign values to un-numbered identifiers
+%% check that the constraints are allowed and correct
+%% put the updated info back into database
+check_enumerated(_S,[{Name,Number}|Rest],_Constr) when atom(Name), integer(Number)->
+    %% already checked , just return the same list
+    [{Name,Number}|Rest];
+check_enumerated(S,NamedNumberList,_Constr) ->
+    check_enum(S,NamedNumberList,[],[]).
+
+%% identifiers are put in Acc2
+%% returns either [{Name,Number}] or {[{Name,Number}],[{ExtName,ExtNumber}]}
+%% the latter is returned if the ENUMERATION contains EXTENSIONMARK
+check_enum(S,[{'NamedNumber',Id,Num}|T],Acc1,Acc2) when integer(Num) ->
+    check_enum(S,T,[{Id,Num}|Acc1],Acc2);
+check_enum(S,[{'NamedNumber',Id,{identifier,_,Name}}|T],Acc1,Acc2) ->
+    Val = dbget_ex(S,S#state.mname,Name),
+    check_enum(S,[{'NamedNumber',Id,Val#valuedef.value}|T],Acc1,Acc2);
+check_enum(S,['EXTENSIONMARK'|T],Acc1,Acc2) ->
+    NewAcc2 = lists:keysort(2,Acc1),
+    NewList = enum_number(lists:reverse(Acc2),NewAcc2,0,[]),
+    { NewList, check_enum(S,T,[],[])};
+check_enum(S,[Id|T],Acc1,Acc2) when atom(Id) ->
+    check_enum(S,T,Acc1,[Id|Acc2]);
+check_enum(_S,[],Acc1,Acc2) ->
+    NewAcc2 = lists:keysort(2,Acc1),
+    enum_number(lists:reverse(Acc2),NewAcc2,0,[]).
+
+
+% assign numbers to identifiers , numbers from 0 ... but must not
+% be the same as already assigned to NamedNumbers
+enum_number([H|T],[{Id,Num}|T2],Cnt,Acc) when Num > Cnt ->
+    enum_number(T,[{Id,Num}|T2],Cnt+1,[{H,Cnt}|Acc]);
+enum_number([H|T],[{Id,Num}|T2],Cnt,Acc) when Num < Cnt -> % negative Num
+    enum_number(T,T2,Cnt+1,[{H,Cnt},{Id,Num}|Acc]);
+enum_number([],L2,_Cnt,Acc) ->
+    lists:concat([lists:reverse(Acc),L2]);
+enum_number(L,[{Id,Num}|T2],Cnt,Acc) -> % Num == Cnt
+    enum_number(L,T2,Cnt+1,[{Id,Num}|Acc]);
+enum_number([H|T],[],Cnt,Acc) ->
+    enum_number(T,[],Cnt+1,[{H,Cnt}|Acc]).
+
+
+check_boolean(_S,_Constr) ->
+    ok.
+
+check_octetstring(_S,_Constr) ->
+    ok.
+
+% check all aspects of a SEQUENCE
+% - that all component names are unique
+% - that all TAGS are ok (when TAG default is applied)
+% - that each component is of a valid type
+% - that the extension marks are valid
+
+check_sequence(S,Type,Comps)  ->
+    Components = expand_components(S,Comps),
+    case check_unique([C||C <- Components ,record(C,'ComponentType')]
+		      ,#'ComponentType'.name) of
+	[] ->
+	    %% sort_canonical(Components),
+	    Components2 = maybe_automatic_tags(S,Components),
+	    %% check the table constraints from here. The outermost type
+	    %% is Type, the innermost is Comps (the list of components)
+	    NewComps =
+		case check_each_component(S,Type,Components2) of
+		    NewComponents when list(NewComponents) ->
+			check_unique_sequence_tags(S,NewComponents),
+			NewComponents;
+		    Ret = {NewComponents,NewEcomps} ->
+			TagComps = NewComponents ++
+			    [Comp#'ComponentType'{prop='OPTIONAL'}|| Comp <- NewEcomps],
+			%% extension components are like optionals when it comes to tagging
+			check_unique_sequence_tags(S,TagComps),
+			Ret
+		end,
+	    %% CRelInf is the "leading attribute" information
+	    %% necessary for code generating of the look up in the
+	    %% object set table,
+	    %% i.e. getenc_ObjectSet/getdec_ObjectSet.
+	    %% {objfun,ERef} tuple added in NewComps2 in tablecinf
+	    %% field in type record of component relation constrained
+	    %% type
+%	    io:format("NewComps: ~p~n",[NewComps]),
+	    {CRelInf,NewComps2} = componentrelation_leadingattr(S,NewComps),
+%	    io:format("CRelInf: ~p~n",[CRelInf]),
+%	    io:format("NewComps2: ~p~n",[NewComps2]),
+	    %% CompListWithTblInf has got a lot unecessary info about
+	    %% the involved class removed, as the class of the object
+	    %% set.
+	    CompListWithTblInf = get_tableconstraint_info(S,Type,NewComps2),
+%	    io:format("CompListWithTblInf: ~p~n",[CompListWithTblInf]),
+	    {CRelInf,CompListWithTblInf};
+	Dupl ->
+		throw({error,{asn1,{duplicate_components,Dupl}}})
+    end.
+
+expand_components(S, [{'COMPONENTS OF',Type}|T]) ->
+    CompList =
+	case get_referenced_type(S,Type#type.def) of
+	    {_,#typedef{typespec=#type{def=Seq}}} when record(Seq,'SEQUENCE') ->
+		case Seq#'SEQUENCE'.components of
+		    {Root,_Ext} -> Root;
+		    Root -> Root
+		end;
+	    Err -> throw({error,{asn1,{illegal_COMPONENTS_OF,Err}}})
+	end,
+    expand_components(S,CompList) ++ expand_components(S,T);
+expand_components(S,[H|T]) ->
+    [H|expand_components(S,T)];
+expand_components(_,[]) ->
+    [].
+
+check_unique_sequence_tags(S,[#'ComponentType'{prop=mandatory}|Rest]) ->
+    check_unique_sequence_tags(S,Rest);
+check_unique_sequence_tags(S,[C|Rest]) when record(C,'ComponentType') ->
+    check_unique_sequence_tags1(S,Rest,[C]);% optional or default
+check_unique_sequence_tags(S,[_ExtensionMarker|Rest]) ->
+    check_unique_sequence_tags(S,Rest);
+check_unique_sequence_tags(_S,[]) ->
+    true.
+
+check_unique_sequence_tags1(S,[C|Rest],Acc) when record(C,'ComponentType') ->
+    case C#'ComponentType'.prop of
+	mandatory ->
+	    check_unique_tags(S,lists:reverse([C|Acc])),
+	    check_unique_sequence_tags(S,Rest);
+	_  ->
+	    check_unique_sequence_tags1(S,Rest,[C|Acc]) % default or optional
+    end;
+check_unique_sequence_tags1(S,[H|Rest],Acc) ->
+    check_unique_sequence_tags1(S,Rest,[H|Acc]);
+check_unique_sequence_tags1(S,[],Acc) ->
+    check_unique_tags(S,lists:reverse(Acc)).
+
+check_sequenceof(S,Type,Component) when record(Component,type) ->
+    check_type(S,Type,Component).
+
+check_set(S,Type,Components) ->
+    {TableCInf,NewComponents} = check_sequence(S,Type,Components),
+    case lists:member(der,S#state.options) of
+	true when S#state.erule == ber;
+		  S#state.erule == ber_bin ->
+	    {Sorted,SortedComponents} =
+		sort_components(S#state.tname,
+				(S#state.module)#module.tagdefault,
+				NewComponents),
+	    {Sorted,TableCInf,SortedComponents};
+	_ ->
+	    {false,TableCInf,NewComponents}
+    end.
+
+sort_components(_TypeName,'AUTOMATIC',Components) ->
+    {true,Components};
+sort_components(TypeName,_TagDefault,Components) ->
+    case untagged_choice(Components) of
+	false ->
+	    {true,sort_components1(TypeName,Components,[],[],[],[])};
+	true ->
+	    {dynamic,Components} % sort in run-time
+    end.
+
+sort_components1(TypeName,[C=#'ComponentType'{tags=[{'UNIVERSAL',_}|_R]}|Cs],
+		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
+    sort_components1(TypeName,Cs,[C|UnivAcc],ApplAcc,ContAcc,PrivAcc);
+sort_components1(TypeName,[C=#'ComponentType'{tags=[{'APPLICATION',_}|_R]}|Cs],
+		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
+    sort_components1(TypeName,Cs,UnivAcc,[C|ApplAcc],ContAcc,PrivAcc);
+sort_components1(TypeName,[C=#'ComponentType'{tags=[{'CONTEXT',_}|_R]}|Cs],
+		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
+    sort_components1(TypeName,Cs,UnivAcc,ApplAcc,[C|ContAcc],PrivAcc);
+sort_components1(TypeName,[C=#'ComponentType'{tags=[{'PRIVATE',_}|_R]}|Cs],
+		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
+    sort_components1(TypeName,Cs,UnivAcc,ApplAcc,ContAcc,[C|PrivAcc]);
+sort_components1(TypeName,[],UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
+    I = #'ComponentType'.tags,
+    ascending_order_check(TypeName,sort_universal_type(UnivAcc)) ++
+	ascending_order_check(TypeName,lists:keysort(I,ApplAcc)) ++
+	ascending_order_check(TypeName,lists:keysort(I,ContAcc)) ++
+	ascending_order_check(TypeName,lists:keysort(I,PrivAcc)).
+
+ascending_order_check(TypeName,Components) ->
+    ascending_order_check1(TypeName,Components),
+    Components.
+
+ascending_order_check1(TypeName,
+		       [C1 = #'ComponentType'{tags=[{_,T}|_]},
+			C2 = #'ComponentType'{tags=[{_,T}|_]}|Rest]) ->
+    io:format("WARNING: Indistinct tag ~p in SET ~p, components ~p and ~p~n",
+	      [T,TypeName,C1#'ComponentType'.name,C2#'ComponentType'.name]),
+    ascending_order_check1(TypeName,[C2|Rest]);
+ascending_order_check1(TypeName,
+		       [C1 = #'ComponentType'{tags=[{'UNIVERSAL',T1}|_]},
+			C2 = #'ComponentType'{tags=[{'UNIVERSAL',T2}|_]}|Rest]) ->
+    case (asn1ct_gen_ber:decode_type(T1) == asn1ct_gen_ber:decode_type(T2)) of
+	true ->
+	    io:format("WARNING: Indistinct tags ~p and ~p in"
+		      " SET ~p, components ~p and ~p~n",
+		      [T1,T2,TypeName,C1#'ComponentType'.name,
+		       C2#'ComponentType'.name]),
+	    ascending_order_check1(TypeName,[C2|Rest]);
+	_ ->
+	    ascending_order_check1(TypeName,[C2|Rest])
+    end;
+ascending_order_check1(N,[_|Rest]) ->
+    ascending_order_check1(N,Rest);
+ascending_order_check1(_,[_]) ->
+    ok;
+ascending_order_check1(_,[]) ->
+    ok.
+
+sort_universal_type(Components) ->
+    List = lists:map(fun(C) ->
+			     #'ComponentType'{tags=[{_,T}|_]} = C,
+			     {asn1ct_gen_ber:decode_type(T),C}
+		     end,
+		     Components),
+    SortedList = lists:keysort(1,List),
+    lists:map(fun(X)->element(2,X) end,SortedList).
+
+untagged_choice([#'ComponentType'{typespec=#type{tag=[],def={'CHOICE',_}}}|_Rest]) ->
+    true;
+untagged_choice([_|Rest]) ->
+    untagged_choice(Rest);
+untagged_choice([]) ->
+    false.
+
+check_setof(S,Type,Component) when record(Component,type) ->
+    check_type(S,Type,Component).
+
+check_restrictedstring(_S,_Def,_Constr) ->
+    ok.
+
+check_objectidentifier(_S,_Constr) ->
+    ok.
+
+% check all aspects of a CHOICE
+% - that all alternative names are unique
+% - that all TAGS are ok (when TAG default is applied)
+% - that each alternative is of a valid type
+% - that the extension marks are valid
+check_choice(S,Type,Components) when list(Components) ->
+    case check_unique([C||C <- Components,
+			  record(C,'ComponentType')],#'ComponentType'.name) of
+	[] ->
+    %%    sort_canonical(Components),
+	    Components2 = maybe_automatic_tags(S,Components),
+	    %NewComps =
+	    case check_each_alternative(S,Type,Components2) of
+		{NewComponents,NewEcomps} ->
+		    check_unique_tags(S,NewComponents ++ NewEcomps),
+		    {NewComponents,NewEcomps};
+		NewComponents ->
+		    check_unique_tags(S,NewComponents),
+		    NewComponents
+	    end;
+%%	    CompListWithTblInf = get_tableconstraint_info(S,Type,NewComps);
+	Dupl ->
+	    throw({error,{asn1,{duplicate_choice_alternatives,Dupl}}})
+    end;
+check_choice(_S,_,[]) ->
+    [].
+
+%% probably dead code that should be removed
+%%maybe_automatic_tags(S,{Rc,Ec}) ->
+%%    {maybe_automatic_tags1(S,Rc,0),maybe_automatic_tags1(S,Ec,length(Rc))};
+maybe_automatic_tags(#state{erule=per},C) ->
+    C;
+maybe_automatic_tags(#state{erule=per_bin},C) ->
+    C;
+maybe_automatic_tags(S,C) ->
+    maybe_automatic_tags1(S,C,0).
+
+maybe_automatic_tags1(S,C,TagNo) ->
+    case (S#state.module)#module.tagdefault of
+	'AUTOMATIC' ->
+	    generate_automatic_tags(S,C,TagNo);
+	_ ->
+	    %% maybe is the module a multi file module were only some of
+	    %% the modules have defaulttag AUTOMATIC TAGS then the names
+	    %% of those types are saved in the table automatic_tags
+	    Name= S#state.tname,
+	    case is_automatic_tagged_in_multi_file(Name) of
+		true ->
+		    generate_automatic_tags(S,C,TagNo);
+		false ->
+		    C
+	    end
+    end.
+
+is_automatic_tagged_in_multi_file(Name) ->
+    case ets:info(automatic_tags) of
+	undefined ->
+	    %% this case when not multifile compilation
+	    false;
+	_ ->
+	    case ets:member(automatic_tags,Name) of
+		true ->
+		     true;
+		_ ->
+		    false
+	    end
+    end.
+
+generate_automatic_tags(_S,C,TagNo) ->
+    case any_manual_tag(C) of
+	true ->
+	    C;
+	false ->
+	    generate_automatic_tags1(C,TagNo)
+    end.
+
+generate_automatic_tags1([H|T],TagNo) when record(H,'ComponentType') ->
+    #'ComponentType'{typespec=Ts} = H,
+    NewTs = Ts#type{tag=[#tag{class='CONTEXT',
+			     number=TagNo,
+			     type={default,'IMPLICIT'},
+			     form= 0 }]}, % PRIMITIVE
+    [H#'ComponentType'{typespec=NewTs}|generate_automatic_tags1(T,TagNo+1)];
+generate_automatic_tags1([ExtMark|T],TagNo) -> % EXTENSIONMARK
+    [ExtMark | generate_automatic_tags1(T,TagNo)];
+generate_automatic_tags1([],_) ->
+    [].
+
+any_manual_tag([#'ComponentType'{typespec=#type{tag=[]}}|Rest]) ->
+    any_manual_tag(Rest);
+any_manual_tag([{'EXTENSIONMARK',_,_}|Rest]) ->
+    any_manual_tag(Rest);
+any_manual_tag([_|_Rest]) ->
+    true;
+any_manual_tag([]) ->
+    false.
+
+
+check_unique_tags(S,C) ->
+    case (S#state.module)#module.tagdefault of
+	'AUTOMATIC' ->
+	    case any_manual_tag(C) of
+		false -> true;
+		_ -> collect_and_sort_tags(C,[])
+	    end;
+	_ ->
+	    collect_and_sort_tags(C,[])
+    end.
+
+collect_and_sort_tags([C|Rest],Acc) when record(C,'ComponentType') ->
+    collect_and_sort_tags(Rest,C#'ComponentType'.tags ++ Acc);
+collect_and_sort_tags([_|Rest],Acc) ->
+    collect_and_sort_tags(Rest,Acc);
+collect_and_sort_tags([],Acc) ->
+    {Dupl,_}= lists:mapfoldl(fun(El,El)->{{dup,El},El};(El,_Prev)-> {El,El} end,notag,lists:sort(Acc)),
+    Dupl2 = [Dup|| {dup,Dup} <- Dupl],
+    if
+	length(Dupl2) > 0 ->
+	    throw({error,{asn1,{duplicates_of_the_tags,Dupl2}}});
+	true ->
+	    true
+    end.
+
+check_unique(L,Pos) ->
+    Slist = lists:keysort(Pos,L),
+    check_unique2(Slist,Pos,[]).
+
+check_unique2([A,B|T],Pos,Acc) when element(Pos,A) == element(Pos,B) ->
+    check_unique2([B|T],Pos,[element(Pos,B)|Acc]);
+check_unique2([_|T],Pos,Acc) ->
+    check_unique2(T,Pos,Acc);
+check_unique2([],_,Acc) ->
+    lists:reverse(Acc).
+
+check_each_component(S,Type,{Rlist,ExtList}) ->
+    {check_each_component(S,Type,Rlist),
+     check_each_component(S,Type,ExtList)};
+check_each_component(S,Type,Components) ->
+    check_each_component(S,Type,Components,[],[],noext).
+
+check_each_component(S = #state{abscomppath=Path,recordtopname=TopName},Type,
+		     [C|Ct],Acc,Extacc,Ext) when record(C,'ComponentType') ->
+    #'ComponentType'{name=Cname,typespec=Ts,prop=Prop} = C,
+    NewAbsCPath =
+	case Ts#type.def of
+	    #'Externaltypereference'{} -> [];
+	    _ -> [Cname|Path]
+	end,
+    CheckedTs = check_type(S#state{abscomppath=NewAbsCPath,
+				   recordtopname=[Cname|TopName]},Type,Ts),
+    NewTags = get_taglist(S,CheckedTs),
+
+    NewProp =
+%	case lists:member(der,S#state.options) of
+%	    true ->
+%	    True ->
+	case normalize_value(S,CheckedTs,Prop,[Cname|TopName]) of
+	    mandatory -> mandatory;
+	    'OPTIONAL' -> 'OPTIONAL';
+	    DefaultValue -> {'DEFAULT',DefaultValue}
+	end,
+%	    _ ->
+%		Prop
+%	end,
+    NewC = C#'ComponentType'{typespec=CheckedTs,prop=NewProp,tags=NewTags},
+    case Ext of
+	noext ->
+	    check_each_component(S,Type,Ct,[NewC|Acc],Extacc,Ext);
+	ext ->
+	    check_each_component(S,Type,Ct,Acc,[NewC|Extacc],Ext)
+    end;
+check_each_component(S,Type,[_|Ct],Acc,Extacc,noext) -> % skip 'EXTENSIONMARK'
+    check_each_component(S,Type,Ct,Acc,Extacc,ext);
+check_each_component(_S,_,[_C|_Ct],_,_,ext) -> % skip 'EXTENSIONMARK'
+    throw({error,{asn1,{too_many_extension_marks}}});
+check_each_component(_S,_,[],Acc,Extacc,ext) ->
+    {lists:reverse(Acc),lists:reverse(Extacc)};
+check_each_component(_S,_,[],Acc,_,noext) ->
+    lists:reverse(Acc).
+
+check_each_alternative(S,Type,{Rlist,ExtList}) ->
+    {check_each_alternative(S,Type,Rlist),
+     check_each_alternative(S,Type,ExtList)};
+check_each_alternative(S,Type,[C|Ct]) ->
+    check_each_alternative(S,Type,[C|Ct],[],[],noext).
+
+check_each_alternative(S=#state{abscomppath=Path,recordtopname=TopName},Type,[C|Ct],
+		       Acc,Extacc,Ext) when record(C,'ComponentType') ->
+    #'ComponentType'{name=Cname,typespec=Ts,prop=_Prop} = C,
+    NewAbsCPath =
+	case Ts#type.def of
+	    #'Externaltypereference'{} -> [];
+	    _ -> [Cname|Path]
+	end,
+    NewState =
+	S#state{abscomppath=NewAbsCPath,recordtopname=[Cname|TopName]},
+    CheckedTs = check_type(NewState,Type,Ts),
+    NewTags = get_taglist(S,CheckedTs),
+    NewC = C#'ComponentType'{typespec=CheckedTs,tags=NewTags},
+    case Ext of
+	noext ->
+	    check_each_alternative(S,Type,Ct,[NewC|Acc],Extacc,Ext);
+	ext ->
+	    check_each_alternative(S,Type,Ct,Acc,[NewC|Extacc],Ext)
+    end;
+
+check_each_alternative(S,Type,[_|Ct],Acc,Extacc,noext) -> % skip 'EXTENSIONMARK'
+    check_each_alternative(S,Type,Ct,Acc,Extacc,ext);
+check_each_alternative(_S,_,[_C|_Ct],_,_,ext) -> % skip 'EXTENSIONMARK'
+    throw({error,{asn1,{too_many_extension_marks}}});
+check_each_alternative(_S,_,[],Acc,Extacc,ext) ->
+    {lists:reverse(Acc),lists:reverse(Extacc)};
+check_each_alternative(_S,_,[],Acc,_,noext) ->
+    lists:reverse(Acc).
+
+%% componentrelation_leadingattr/2 searches the structure for table
+%% constraints, if any is found componentrelation_leadingattr/5 is
+%% called.
+componentrelation_leadingattr(S,CompList) ->
+%    {Cs1,Cs2} =
+    Cs =
+	case CompList of
+	    {Components,EComponents} when list(Components) ->
+%		{Components,Components};
+		Components ++ EComponents;
+	    CompList when list(CompList) ->
+%		{CompList,CompList}
+		CompList
+	end,
+%    case any_simple_table(S,Cs1,[]) of
+
+    %% get_simple_table_if_used/2 should find out whether there are any
+    %% component relation constraints in the entire tree of Cs1 that
+    %% relates to this level. It returns information about the simple
+    %% table constraint necessary for the the call to
+    %% componentrelation_leadingattr/6. The step when the leading
+    %% attribute and the syntax tree is modified to support the code
+    %% generating.
+    case get_simple_table_if_used(S,Cs) of
+	[] -> {false,CompList};
+	STList ->
+%	    componentrelation_leadingattr(S,Cs1,Cs2,STList,[],[])
+	    componentrelation_leadingattr(S,Cs,Cs,STList,[],[])
+    end.
+
+%% componentrelation_leadingattr/6 when all components are searched
+%% the new modified components are returned together with the "leading
+%% attribute" information, which later is stored in the tablecinf
+%% field in the SEQUENCE/SET record. The "leading attribute"
+%% information is used to generate the lookup in the object set
+%% table. The other information gathered in the #type.tablecinf field
+%% is used in code generating phase too, to recognice the proper
+%% components for "open type" encoding and to propagate the result of
+%% the object set lookup when needed.
+componentrelation_leadingattr(_,[],_CompList,_,[],NewCompList) ->
+    {false,lists:reverse(NewCompList)};
+componentrelation_leadingattr(_,[],_CompList,_,LeadingAttr,NewCompList) ->
+    {lists:last(LeadingAttr),lists:reverse(NewCompList)}; %send all info in Ts later
+componentrelation_leadingattr(S,[C|Cs],CompList,STList,Acc,CompAcc) ->
+    {LAAcc,NewC} =
+	case catch componentrelation1(S,C#'ComponentType'.typespec,
+				      [C#'ComponentType'.name]) of
+	    {'EXIT',_} ->
+		{[],C};
+	    {CRI=[{_A1,_B1,_C1,_D1}|_Rest],NewTSpec} ->
+		%% {ObjectSet,AtPath,ClassDef,Path}
+		%% _A1 is a reference to the object set of the
+		%% component relation constraint.
+		%% _B1 is the path of names in the at-list of the
+		%% component relation constraint.
+		%% _C1 is the class definition of the
+		%% ObjectClassFieldType.
+		%% _D1 is the path of components that was traversed to
+		%% find this constraint.
+		case leading_attr_index(S,CompList,CRI,
+					lists:reverse(S#state.abscomppath),[]) of
+		    [] ->
+			{[],C};
+		    [{ObjSet,Attr,N,ClassDef,_Path,ValueIndex}|_NewRest] ->
+			OS = object_set_mod_name(S,ObjSet),
+			UniqueFieldName =
+			    case (catch get_unique_fieldname(#classdef{typespec=ClassDef})) of
+				{error,'__undefined_'} ->
+				    no_unique;
+				{asn1,Msg,_} ->
+				    error({type,Msg,S});
+				Other -> Other
+			    end,
+%			UsedFieldName = get_used_fieldname(S,Attr,STList),
+			%% Res should be done differently: even though
+			%% a unique field name exists it is not
+			%% certain that the ObjectClassFieldType of
+			%% the simple table constraint picks that
+			%% class field.
+			Res = #simpletableattributes{objectsetname=OS,
+%%						     c_name=asn1ct_gen:un_hyphen_var(Attr),
+						     c_name=Attr,
+						     c_index=N,
+						     usedclassfield=UniqueFieldName,
+						     uniqueclassfield=UniqueFieldName,
+						     valueindex=ValueIndex},
+			{[Res],C#'ComponentType'{typespec=NewTSpec}}
+		end;
+	    _ ->
+		%% no constraint was found
+		{[],C}
+	end,
+    componentrelation_leadingattr(S,Cs,CompList,STList,LAAcc++Acc,
+				  [NewC|CompAcc]).
+
+object_set_mod_name(_S,ObjSet) when atom(ObjSet) ->
+    ObjSet;
+object_set_mod_name(#state{mname=M},
+		    #'Externaltypereference'{module=M,type=T}) ->
+    T;
+object_set_mod_name(S,#'Externaltypereference'{module=M,type=T}) ->
+    case lists:member(M,S#state.inputmodules) of
+	true ->
+	    T;
+	false ->
+	    {M,T}
+    end.
+
+%% get_used_fieldname gets the used field of the class referenced by
+%% the ObjectClassFieldType construct in the simple table constraint
+%% corresponding to the component relation constraint that depends on
+%% it.
+% get_used_fieldname(_S,CName,[{[CName|_Rest],_,ClFieldName}|_RestSimpleT]) ->
+%     ClFieldName;
+% get_used_fieldname(S,CName,[_SimpleTC|Rest]) ->
+%     get_used_fieldname(S,CName,Rest);
+% get_used_fieldname(S,_,[]) ->
+%     error({type,"Error in Simple table constraint",S}).
+
+%% any_simple_table/3 checks if any of the components on this level is
+%% constrained by a simple table constraint. It returns a list of
+%% tuples with three elements. It is a name path to the place in the
+%% type structure where the constraint is, and the name of the object
+%% set and the referenced field in the class.
+% any_simple_table(S = #state{mname=M,abscomppath=Path},
+% 		 [#'ComponentType'{name=Name,typespec=Type}|Cs],Acc) ->
+%     Constraint = Type#type.constraint,
+%     case lists:keysearch(simpletable,1,Constraint) of
+% 	{value,{_,#type{def=Ref}}} ->
+% 	    %% This ObjectClassFieldType, which has a simple table
+% 	    %% constraint, must pick a fixed type value, mustn't it ?
+% 	    {ClassDef,[{_,ClassFieldName}]} = Type#type.def,
+% 	    ST =
+% 		case Ref of
+% 		    #'Externaltypereference'{module=M,type=ObjSetName} ->
+% 			{[Name|Path],ObjSetName,ClassFieldName};
+% 		    _ ->
+% 			{[Name|Path],Ref,ClassFieldName}
+% 		end,
+% 	    any_simple_table(S,Cs,[ST|Acc]);
+% 	false ->
+% 	    any_simple_table(S,Cs,Acc)
+%     end;
+% any_simple_table(_,[],Acc) ->
+%     lists:reverse(Acc);
+% any_simple_table(S,[_|Cs],Acc) ->
+%     any_simple_table(S,Cs,Acc).
+
+%% get_simple_table_if_used/2 searches the structure of Cs for any
+%% component relation constraints due to the present level of the
+%% structure. If there are any, the necessary information for code
+%% generation of the look up functionality in the object set table are
+%% returned.
+get_simple_table_if_used(S,Cs) ->
+    CNames = lists:map(fun(#'ComponentType'{name=Name}) -> Name;
+			  (_) -> [] %% in case of extension marks
+		       end,
+		       Cs),
+    RefedSimpleTable=any_component_relation(S,Cs,CNames,[],[]),
+    get_simple_table_info(S,Cs,remove_doubles(RefedSimpleTable)).
+
+remove_doubles(L) ->
+    remove_doubles(L,[]).
+remove_doubles([H|T],Acc) ->
+    NewT = remove_doubles1(H,T),
+    remove_doubles(NewT,[H|Acc]);
+remove_doubles([],Acc) ->
+    Acc.
+
+remove_doubles1(El,L) ->
+    case lists:delete(El,L) of
+	L -> L;
+	NewL -> remove_doubles1(El,NewL)
+    end.
+
+%% get_simple_table_info searches the commponents Cs by the path from
+%% an at-list (third argument), and follows into a component of it if
+%% necessary, to get information needed for code generating.
+%%
+%% Returns a list of tuples with three elements. It holds a list of
+%% atoms that is the path, the name of the field of the class that are
+%% referred to in the ObjectClassFieldType, and the name of the unique
+%% field of the class of the ObjectClassFieldType.
+%%
+% %% The level information outermost/innermost must be kept. There are
+% %% at least two possibilities to cover here for an outermost case: 1)
+% %% Both the simple table and the component relation have a common path
+% %% at least one step below the outermost level, i.e. the leading
+% %% information shall be on a sub level. 2) They don't have any common
+% %% path.
+get_simple_table_info(S,Cs,[AtList|Rest]) ->
+%%    [get_simple_table_info1(S,Cs,AtList,S#state.abscomppath)|get_simple_table_info(S,Cs,Rest)];
+    [get_simple_table_info1(S,Cs,AtList,[])|get_simple_table_info(S,Cs,Rest)];
+get_simple_table_info(_,_,[]) ->
+    [].
+get_simple_table_info1(S,Cs,[Cname|Cnames],Path) when list(Cs) ->
+    case lists:keysearch(Cname,#'ComponentType'.name,Cs) of
+	{value,C} ->
+	    get_simple_table_info1(S,C,Cnames,[Cname|Path]);
+        _ ->
+	    error({type,"Missing expected simple table constraint",S})
+    end;
+get_simple_table_info1(S,#'ComponentType'{typespec=TS},[],Path) ->
+    %% In this component there must be a simple table constraint
+    %% o.w. the asn1 code is wrong.
+    #type{def=OCFT,constraint=Cnstr} = TS,
+    case Cnstr of
+	[{simpletable,_OSRef}]�->
+	    #'ObjectClassFieldType'{classname=ClRef,
+				    class=ObjectClass,
+				    fieldname=FieldName} = OCFT,
+%	    #'ObjectClassFieldType'{ObjectClass,FieldType} = ObjectClassFieldType,
+	    ObjectClassFieldName =
+		case FieldName of
+		    {LastFieldName,[]} -> LastFieldName;
+		    {_FirstFieldName,FieldNames} ->
+			lists:last(FieldNames)
+		end,
+	    %%ObjectClassFieldName is the last element in the dotted
+	    %%list of the ObjectClassFieldType. The last element may
+	    %%be of another class, that is referenced from the class
+	    %%of the ObjectClassFieldType
+	    ClassDef =
+		case ObjectClass of
+		    [] ->
+			{_,CDef}=get_referenced_type(S,ClRef),
+			CDef;
+		    _ -> #classdef{typespec=ObjectClass}
+		end,
+	    UniqueName =
+		case (catch get_unique_fieldname(ClassDef)) of
+		    {error,'__undefined_'} -> no_unique;
+		    {asn1,Msg,_} ->
+			error({type,Msg,S});
+		    Other -> Other
+		end,
+	    {lists:reverse(Path),ObjectClassFieldName,UniqueName};
+	_ ->
+	    error({type,{asn1,"missing expected simple table constraint",
+			 Cnstr},S})
+    end;
+get_simple_table_info1(S,#'ComponentType'{typespec=TS},Cnames,Path) ->
+    Components = get_atlist_components(TS#type.def),
+    get_simple_table_info1(S,Components,Cnames,Path).
+
+%% any_component_relation searches for all component relation
+%% constraints that refers to the actual level and returns a list of
+%% the "name path" in the at-list to the component relation constraint
+%% that must refer to a simple table constraint. The list is empty if
+%% no component relation constraints were found.
+%%
+%% NamePath has the names of all components that are followed from the
+%% beginning of the search. CNames holds the names of all components
+%% of the start level, this info is used if an outermost at-notation
+%% is found to check the validity of the at-list.
+any_component_relation(S,[C|Cs],CNames,NamePath,Acc) ->
+    CName = C#'ComponentType'.name,
+    Type = C#'ComponentType'.typespec,
+    CRelPath =
+	case Type#type.constraint of
+	    [{componentrelation,_,AtNotation}] ->
+		%% Found component relation constraint, now check
+		%% whether this constraint is relevant for the level
+		%% where the search started
+		AtNot = extract_at_notation(AtNotation),
+		%% evaluate_atpath returns the relative path to the
+		%% simple table constraint from where the component
+		%% relation is found.
+		evaluate_atpath(S#state.abscomppath,NamePath,CNames,AtNot);
+	    _ ->
+		[]
+	end,
+    InnerAcc =
+	case {Type#type.inlined,
+	      asn1ct_gen:type(asn1ct_gen:get_inner(Type#type.def))} of
+	    {no,{constructed,bif}} ->
+		InnerCs =
+		    case get_components(Type#type.def) of
+			{IC1,_IC2} -> IC1 ++ IC1;
+			IC -> IC
+		    end,
+		%% here we are interested in components of an
+		%% SEQUENCE/SET OF as well as SEQUENCE, SET and CHOICE
+		any_component_relation(S,InnerCs,CNames,[CName|NamePath],[]);
+	    _ ->
+		[]
+	end,
+    any_component_relation(S,Cs,CNames,NamePath,InnerAcc++CRelPath++Acc);
+any_component_relation(_,[],_,_,Acc) ->
+    Acc.
+
+%% evaluate_atpath/4 finds out whether the at notation refers to the
+%% search level. The list of referenced names in the AtNot list shall
+%% begin with a name that exists on the level it refers to. If the
+%% found AtPath is refering to the same sub-branch as the simple table
+%% has, then there shall not be any leading attribute info on this
+%% level.
+evaluate_atpath(_,[],Cnames,{innermost,AtPath=[Ref|_Refs]}) ->
+    %% any innermost constraint found deeper in the structure is
+    %% ignored.
+    case lists:member(Ref,Cnames) of
+	true -> [AtPath];
+	false -> []
+    end;
+%% In this case must check that the AtPath doesn't step any step of
+%% the NamePath, in that case the constraint will be handled in an
+%% inner level.
+evaluate_atpath(TopPath,NamePath,Cnames,{outermost,AtPath=[_Ref|_Refs]}) ->
+    AtPathBelowTop =
+	case TopPath of
+	    [] -> AtPath;
+	    _ ->
+		case lists:prefix(TopPath,AtPath) of
+		    true ->
+			lists:subtract(AtPath,TopPath);
+		    _ -> []
+		end
+	end,
+    case {NamePath,AtPathBelowTop} of
+	{[H|_T1],[H|_T2]} -> []; % this must be handled in lower level
+	{_,[]} -> [];% this must be handled in an above level
+	{_,[H|_T]} ->
+	    case lists:member(H,Cnames) of
+		true -> [AtPathBelowTop];
+		_ -> error({type,{asn1,"failed to analyze at-path",AtPath}})
+	    end
+    end;
+evaluate_atpath(_,_,_,_) ->
+    [].
+
+%% Type may be any of SEQUENCE, SET, CHOICE, SEQUENCE OF, SET OF but
+%% only the three first have valid components.
+get_atlist_components(Def) ->
+    get_components(atlist,Def).
+
+get_components(Def) ->
+    get_components(any,Def).
+
+get_components(_,#'SEQUENCE'{components=Cs}) ->
+    Cs;
+get_components(_,#'SET'{components=Cs}) ->
+    Cs;
+get_components(_,{'CHOICE',Cs}) ->
+    Cs;
+get_components(any,{'SEQUENCE OF',#type{def=Def}}) ->
+    get_components(any,Def);
+get_components(any,{'SET OF',#type{def=Def}}) ->
+    get_components(any,Def);
+get_components(_,_) ->
+    [].
+
+
+extract_at_notation([{Level,[#'Externalvaluereference'{value=Name}|Rest]}]) ->
+    {Level,[Name|extract_at_notation1(Rest)]};
+extract_at_notation(At) ->
+    exit({error,{asn1,{at_notation,At}}}).
+extract_at_notation1([#'Externalvaluereference'{value=Name}|Rest]) ->
+    [Name|extract_at_notation1(Rest)];
+extract_at_notation1([]) ->
+    [].
+
+%% componentrelation1/1 identifies all componentrelation constraints
+%% that exist in C or in the substructure of C. Info about the found
+%% constraints are returned in a list. It is ObjectSet, the reference
+%% to the object set, AttrPath, the name atoms extracted from the
+%% at-list in the component relation constraint, ClassDef, the
+%% objectclass record of the class of the ObjectClassFieldType, Path,
+%% that is the component name "path" from the searched level to this
+%% constraint.
+%%
+%% The function is called with one component of the type in turn and
+%% with the component name in Path at the first call. When called from
+%% within, the name of the inner component is added to Path.
+componentrelation1(S,C = #type{def=Def,constraint=Constraint,tablecinf=TCI},
+		   Path) ->
+    Ret =
+	case Constraint of
+	    [{componentrelation,{_,_,ObjectSet},AtList}|_Rest] ->
+		[{_,AL=[#'Externalvaluereference'{}|_R1]}|_R2] = AtList,
+		%% Note: if Path is longer than one,i.e. it is within
+		%% an inner type of the actual level, then the only
+		%% relevant at-list is of "outermost" type.
+%%		#'ObjectClassFieldType'{class=ClassDef} = Def,
+		ClassDef = get_ObjectClassFieldType_classdef(S,Def),
+		AtPath =
+		    lists:map(fun(#'Externalvaluereference'{value=V})->V end,
+			      AL),
+		{[{ObjectSet,AtPath,ClassDef,Path}],Def};
+	    _Other ->
+		%% check the inner type of component
+		innertype_comprel(S,Def,Path)
+	end,
+    case Ret of
+	nofunobj ->
+	    nofunobj; %% ignored by caller
+	{CRelI=[{ObjSet,_,_,_}],NewDef} -> %%
+	    TCItmp = lists:subtract(TCI,[{objfun,ObjSet}]),
+	    {CRelI,C#type{tablecinf=[{objfun,ObjSet}|TCItmp],def=NewDef}};
+	{CompRelInf,NewDef} -> %% more than one tuple in CompRelInf
+	    TCItmp = lists:subtract(TCI,[{objfun,anyset}]),
+	    {CompRelInf,C#type{tablecinf=[{objfun,anyset}|TCItmp],def=NewDef}}
+    end.
+
+innertype_comprel(S,{'SEQUENCE OF',Type},Path) ->
+    case innertype_comprel1(S,Type,Path) of
+	nofunobj ->
+	    nofunobj;
+	{CompRelInf,NewType} ->
+	    {CompRelInf,{'SEQUENCE OF',NewType}}
+    end;
+innertype_comprel(S,{'SET OF',Type},Path) ->
+    case innertype_comprel1(S,Type,Path) of
+	nofunobj ->
+	    nofunobj;
+	{CompRelInf,NewType} ->
+	    {CompRelInf,{'SET OF',NewType}}
+    end;
+innertype_comprel(S,{'CHOICE',CTypeList},Path) ->
+    case componentlist_comprel(S,CTypeList,[],Path,[]) of
+	nofunobj ->
+	    nofunobj;
+	{CompRelInf,NewCs} ->
+	    {CompRelInf,{'CHOICE',NewCs}}
+    end;
+innertype_comprel(S,Seq = #'SEQUENCE'{components=Cs},Path) ->
+    case componentlist_comprel(S,Cs,[],Path,[]) of
+	nofunobj ->
+	    nofunobj;
+	{CompRelInf,NewCs} ->
+	    {CompRelInf,Seq#'SEQUENCE'{components=NewCs}}
+    end;
+innertype_comprel(S,Set = #'SET'{components=Cs},Path) ->
+    case componentlist_comprel(S,Cs,[],Path,[]) of
+	nofunobj ->
+	    nofunobj;
+	{CompRelInf,NewCs} ->
+	    {CompRelInf,Set#'SET'{components=NewCs}}
+    end;
+innertype_comprel(_,_,_) ->
+    nofunobj.
+
+componentlist_comprel(S,[C = #'ComponentType'{name=Name,typespec=Type}|Cs],
+		      Acc,Path,NewCL) ->
+    case catch componentrelation1(S,Type,Path++[Name]) of
+	{'EXIT',_} ->
+	    componentlist_comprel(S,Cs,Acc,Path,[C|NewCL]);
+	nofunobj ->
+	    componentlist_comprel(S,Cs,Acc,Path,[C|NewCL]);
+	{CRelInf,NewType} ->
+	    componentlist_comprel(S,Cs,CRelInf++Acc,Path,
+				  [C#'ComponentType'{typespec=NewType}|NewCL])
+    end;
+componentlist_comprel(_,[],Acc,_,NewCL) ->
+    case Acc of
+	[] ->
+	    nofunobj;
+	_ ->
+	    {Acc,lists:reverse(NewCL)}
+    end.
+
+innertype_comprel1(S,T = #type{def=Def,constraint=Cons,tablecinf=TCI},Path) ->
+    Ret =
+	case Cons of
+	    [{componentrelation,{_,_,ObjectSet},AtList}|_Rest] ->
+		%% This AtList must have an "outermost" at sign to be
+		%% relevent here.
+		[{_,AL=[#'Externalvaluereference'{value=_Attr}|_R1]}|_R2]
+		    = AtList,
+%%		#'ObjectClassFieldType'{class=ClassDef} = Def,
+		ClassDef = get_ObjectClassFieldType_classdef(S,Def),
+		AtPath =
+		    lists:map(fun(#'Externalvaluereference'{value=V})->V end,
+			      AL),
+		[{ObjectSet,AtPath,ClassDef,Path}];
+	    _ ->
+		innertype_comprel(S,Def,Path)
+	end,
+    case Ret of
+	nofunobj -> nofunobj;
+	L = [{ObjSet,_,_,_}] ->
+	    TCItmp = lists:subtract(TCI,[{objfun,ObjSet}]),
+	    {L,T#type{tablecinf=[{objfun,ObjSet}|TCItmp]}};
+	{CRelInf,NewDef} ->
+	    TCItmp = lists:subtract(TCI,[{objfun,anyset}]),
+	    {CRelInf,T#type{def=NewDef,tablecinf=[{objfun,anyset}|TCItmp]}}
+    end.
+
+
+%% leading_attr_index counts the index and picks the name of the
+%% component that is at the actual level in the at-list of the
+%% component relation constraint (AttrP).  AbsP is the path of
+%% component names from the top type level to the actual level. AttrP
+%% is a list with the atoms from the at-list.
+leading_attr_index(S,Cs,[H={_,AttrP,_,_}|T],AbsP,Acc) ->
+    AttrInfo =
+	case lists:prefix(AbsP,AttrP) of
+	    %% why this ?? It is necessary when in same situation as
+	    %% TConstrChoice, there is an inner structure with an
+	    %% outermost at-list and the "leading attribute" code gen
+	    %% may be at a level some steps below the outermost level.
+	    true ->
+		RelativAttrP = lists:subtract(AttrP,AbsP),
+		%% The header is used to calculate the index of the
+		%% component and to give the fun, received from the
+		%% object set look up, an unique name. The tail is
+		%% used to match the proper value input to the fun.
+		{hd(RelativAttrP),tl(RelativAttrP)};
+	    false ->
+		{hd(AttrP),tl(AttrP)}
+	end,
+    case leading_attr_index1(S,Cs,H,AttrInfo,1) of
+	0 ->
+	    leading_attr_index(S,Cs,T,AbsP,Acc);
+	Res ->
+	    leading_attr_index(S,Cs,T,AbsP,[Res|Acc])
+    end;
+leading_attr_index(_,_Cs,[],_,Acc) ->
+    lists:reverse(Acc).
+
+leading_attr_index1(_,[],_,_,_) ->
+    0;
+leading_attr_index1(S,[C|Cs],Arg={ObjectSet,_,CDef,P},
+		    AttrInfo={Attr,SubAttr},N) ->
+    case C#'ComponentType'.name of
+	Attr ->
+	    ValueMatch = value_match(S,C,Attr,SubAttr),
+	    {ObjectSet,Attr,N,CDef,P,ValueMatch};
+	_ ->
+	    leading_attr_index1(S,Cs,Arg,AttrInfo,N+1)
+    end.
+
+%% value_math gathers information for a proper value match in the
+%% generated encode function. For a SEQUENCE or a SET the index of the
+%% component is counted. For a CHOICE the index is 2.
+value_match(S,C,Name,SubAttr) ->
+    value_match(S,C,Name,SubAttr,[]). % C has name Name
+value_match(_S,#'ComponentType'{},_Name,[],Acc) ->
+    Acc;% do not reverse, indexes in reverse order
+value_match(S,#'ComponentType'{typespec=Type},Name,[At|Ats],Acc) ->
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    Components =
+	case get_atlist_components(Type#type.def) of
+	    [] -> error({type,{asn1,"element in at list must be a "
+			       "SEQUENCE, SET or CHOICE.",Name},S});
+	    Comps -> Comps
+	end,
+    {Index,ValueIndex} = component_value_index(S,InnerType,At,Components),
+    value_match(S,lists:nth(Index,Components),At,Ats,[ValueIndex|Acc]).
+
+component_value_index(S,'CHOICE',At,Components) ->
+    {component_index(S,At,Components),2};
+component_value_index(S,_,At,Components) ->
+    %% SEQUENCE or SET
+    Index = component_index(S,At,Components),
+    {Index,{Index+1,At}}.
+
+component_index(S,Name,Components) ->
+    component_index1(S,Name,Components,1).
+component_index1(_S,Name,[#'ComponentType'{name=Name}|_Cs],N) ->
+    N;
+component_index1(S,Name,[_C|Cs],N) ->
+    component_index1(S,Name,Cs,N+1);
+component_index1(S,Name,[],_) ->
+    error({type,{asn1,"component of at-list was not"
+		 " found in substructure",Name},S}).
+
+get_unique_fieldname(ClassDef) ->
+%%    {_,Fields,_} = ClassDef#classdef.typespec,
+    Fields = (ClassDef#classdef.typespec)#objectclass.fields,
+    get_unique_fieldname(Fields,[]).
+
+get_unique_fieldname([],[]) ->
+    throw({error,'__undefined_'});
+get_unique_fieldname([],[Name]) ->
+    Name;
+get_unique_fieldname([],Acc) ->
+    throw({asn1,'only one UNIQUE field is allowed in CLASS',Acc});
+get_unique_fieldname([{fixedtypevaluefield,Name,_,'UNIQUE',_}|Rest],Acc) ->
+    get_unique_fieldname(Rest,[Name|Acc]);
+get_unique_fieldname([_H|T],Acc) ->
+    get_unique_fieldname(T,Acc).
+
+get_tableconstraint_info(S,Type,{CheckedTs,EComps}) ->
+    {get_tableconstraint_info(S,Type,CheckedTs,[]),
+     get_tableconstraint_info(S,Type,EComps,[])};
+get_tableconstraint_info(S,Type,CheckedTs) ->
+    get_tableconstraint_info(S,Type,CheckedTs,[]).
+
+get_tableconstraint_info(_S,_Type,[],Acc) ->
+    lists:reverse(Acc);
+get_tableconstraint_info(S,Type,[C|Cs],Acc) ->
+    CheckedTs = C#'ComponentType'.typespec,
+    AccComp =
+	case CheckedTs#type.def of
+	    %% ObjectClassFieldType
+	    OCFT=#'ObjectClassFieldType'{class=#objectclass{},
+					 type=_AType} ->
+%		AType = get_ObjectClassFieldType(S,Fields,FieldRef),
+%		RefedFieldName =
+%		    get_referencedclassfield(CheckedTs#type.def),%is probably obsolete
+		NewOCFT =
+		    OCFT#'ObjectClassFieldType'{class=[]},
+		C#'ComponentType'{typespec=
+				  CheckedTs#type{
+%				    def=AType,
+				    def=NewOCFT
+				    }};
+%				    constraint=[{tableconstraint_info,
+%						 FieldRef}]}};
+	    {'SEQUENCE OF',SOType} when record(SOType,type),
+					(element(1,SOType#type.def)=='CHOICE') ->
+		CTypeList = element(2,SOType#type.def),
+		NewInnerCList =
+		    get_tableconstraint_info(S,Type,CTypeList,[]),
+		C#'ComponentType'{typespec=
+				  CheckedTs#type{
+				    def={'SEQUENCE OF',
+					 SOType#type{def={'CHOICE',
+							  NewInnerCList}}}}};
+	    {'SET OF',SOType} when record(SOType,type),
+				   (element(1,SOType#type.def)=='CHOICE') ->
+		CTypeList = element(2,SOType#type.def),
+		NewInnerCList =
+		    get_tableconstraint_info(S,Type,CTypeList,[]),
+		C#'ComponentType'{typespec=
+				  CheckedTs#type{
+				    def={'SET OF',
+					 SOType#type{def={'CHOICE',
+							  NewInnerCList}}}}};
+	    _ ->
+		C
+	end,
+    get_tableconstraint_info(S,Type,Cs,[AccComp|Acc]).
+
+get_referenced_fieldname([{_,FirstFieldname}]) ->
+    {FirstFieldname,[]};
+get_referenced_fieldname([{_,FirstFieldname}|Rest]) ->
+    {FirstFieldname,lists:map(fun(X)->element(2,X) end,Rest)};
+get_referenced_fieldname(Def) ->
+    {no_type,Def}.
+
+%% get_ObjectClassFieldType extracts the type from the chain of
+%% objects that leads to a final type.
+get_ObjectClassFieldType(S,ERef,PrimFieldNameList) when
+  record(ERef,'Externaltypereference') ->
+    {_,Type} = get_referenced_type(S,ERef),
+    ClassSpec = check_class(S,Type),
+    Fields = ClassSpec#objectclass.fields,
+    get_ObjectClassFieldType(S,Fields,PrimFieldNameList);
+get_ObjectClassFieldType(S,Fields,L=[_PrimFieldName1|_Rest]) ->
+    check_PrimitiveFieldNames(S,Fields,L),
+    get_OCFType(S,Fields,L).
+
+check_PrimitiveFieldNames(_S,_Fields,_) ->
+    ok.
+
+%% get_ObjectClassFieldType_classdef gets the def of the class of the
+%% ObjectClassFieldType, i.e. the objectclass record. If the type has
+%% been checked (it may be a field type of an internal SEQUENCE) the
+%% class field = [], then the classdef has to be fetched by help of
+%% the class reference in the classname field.
+get_ObjectClassFieldType_classdef(S,#'ObjectClassFieldType'{classname=Name,
+							  class=[]}) ->
+    {_,#classdef{typespec=TS}} = get_referenced_type(S,Name),
+    TS;
+get_ObjectClassFieldType_classdef(_,#'ObjectClassFieldType'{class=Cl}) ->
+    Cl.
+
+get_OCFType(S,Fields,[{_FieldType,PrimFieldName}|Rest]) ->
+    case lists:keysearch(PrimFieldName,2,Fields) of
+	{value,{fixedtypevaluefield,_,Type,_Unique,_OptSpec}} ->
+	    {fixedtypevaluefield,PrimFieldName,Type};
+	{value,{objectfield,_,Type,_Unique,_OptSpec}} ->
+	    {_,ClassDef} = get_referenced_type(S,Type#type.def),
+	    CheckedCDef = check_class(S#state{type=ClassDef,
+					      tname=ClassDef#classdef.name},
+				      ClassDef#classdef.typespec),
+	    get_OCFType(S,CheckedCDef#objectclass.fields,Rest);
+	{value,{objectsetfield,_,Type,_OptSpec}} ->
+	    {_,ClassDef} = get_referenced_type(S,Type#type.def),
+	    CheckedCDef = check_class(S#state{type=ClassDef,
+					      tname=ClassDef#classdef.name},
+				      ClassDef#classdef.typespec),
+	    get_OCFType(S,CheckedCDef#objectclass.fields,Rest);
+
+	{value,Other} ->
+	    {element(1,Other),PrimFieldName};
+	_  ->
+	    error({type,"undefined FieldName in ObjectClassFieldType",S})
+    end.
+
+get_taglist(#state{erule=per},_) ->
+    [];
+get_taglist(#state{erule=per_bin},_) ->
+    [];
+get_taglist(S,Ext) when record(Ext,'Externaltypereference') ->
+    {_,T} = get_referenced_type(S,Ext),
+    get_taglist(S,T#typedef.typespec);
+get_taglist(S,Tref) when record(Tref,typereference) ->
+    {_,T} = get_referenced_type(S,Tref),
+    get_taglist(S,T#typedef.typespec);
+get_taglist(S,Type) when record(Type,type) ->
+    case Type#type.tag of
+	[] ->
+	    get_taglist(S,Type#type.def);
+	[Tag|_]  ->
+% 	    case lists:member(S#state.erule,[ber,ber_bin]) of
+% 		true ->
+% 		   lists:map(fun(Tx) -> asn1ct_gen:def_to_tag(Tx) end,Type#type.tag);
+% 		_ ->
+	    [asn1ct_gen:def_to_tag(Tag)]
+%	    end
+    end;
+get_taglist(S,{'CHOICE',{Rc,Ec}}) ->
+    get_taglist(S,{'CHOICE',Rc ++ Ec});
+get_taglist(S,{'CHOICE',Components}) ->
+    get_taglist1(S,Components);
+%% ObjectClassFieldType OTP-4390
+get_taglist(_S,#'ObjectClassFieldType'{type={typefield,_}}) ->
+    [];
+get_taglist(S,#'ObjectClassFieldType'{type={fixedtypevaluefield,_,Type}}) ->
+    get_taglist(S,Type);
+get_taglist(S,{ERef=#'Externaltypereference'{},FieldNameList})
+  when list(FieldNameList) ->
+    case get_ObjectClassFieldType(S,ERef,FieldNameList) of
+	Type when record(Type,type) ->
+	    get_taglist(S,Type);
+	{fixedtypevaluefield,_,Type} -> get_taglist(S,Type);
+	{TypeFieldName,_} when atom(TypeFieldName) -> []%should check if allowed
+    end;
+get_taglist(S,{ObjCl,FieldNameList}) when record(ObjCl,objectclass),
+					  list(FieldNameList) ->
+    case get_ObjectClassFieldType(S,ObjCl#objectclass.fields,FieldNameList) of
+	Type when record(Type,type) ->
+	    get_taglist(S,Type);
+	{fixedtypevaluefield,_,Type} -> get_taglist(S,Type);
+	{TypeFieldName,_} when atom(TypeFieldName) -> []%should check if allowed
+    end;
+get_taglist(S,Def) ->
+    case lists:member(S#state.erule,[ber_bin_v2]) of
+	false ->
+	    case Def of
+		'ASN1_OPEN_TYPE' -> % open_type has no UNIVERSAL tag as such
+		    [];
+		_ ->
+		    [asn1ct_gen:def_to_tag(Def)]
+	    end;
+	_ ->
+	    []
+    end.
+
+get_taglist1(S,[#'ComponentType'{name=_Cname,tags=TagL}|Rest]) when list(TagL) ->
+    %% tag_list has been here , just return TagL and continue with next alternative
+    TagL ++ get_taglist1(S,Rest);
+get_taglist1(S,[#'ComponentType'{typespec=Ts,tags=undefined}|Rest]) ->
+    get_taglist(S,Ts) ++ get_taglist1(S,Rest);
+get_taglist1(S,[_H|Rest]) -> % skip EXTENSIONMARK
+    get_taglist1(S,Rest);
+get_taglist1(_S,[]) ->
+    [].
+
+dbget_ex(_S,Module,Key) ->
+    case asn1_db:dbget(Module,Key) of
+	undefined ->
+
+	    throw({error,{asn1,{undefined,{Module,Key}}}}); % this is catched on toplevel type or value
+	T -> T
+    end.
+
+merge_tags(T1, T2) when list(T2) ->
+    merge_tags2(T1 ++ T2, []);
+merge_tags(T1, T2) ->
+    merge_tags2(T1 ++ [T2], []).
+
+merge_tags2([T1= #tag{type='IMPLICIT'}, T2 |Rest], Acc) ->
+    merge_tags2([T1#tag{type=T2#tag.type, form=T2#tag.form}|Rest],Acc);
+merge_tags2([T1= #tag{type={default,'IMPLICIT'}}, T2 |Rest], Acc) ->
+    merge_tags2([T1#tag{type=T2#tag.type, form=T2#tag.form}|Rest],Acc);
+merge_tags2([H|T],Acc) ->
+    merge_tags2(T, [H|Acc]);
+merge_tags2([], Acc) ->
+    lists:reverse(Acc).
+
+merge_constraints(C1, []) ->
+    C1;
+merge_constraints([], C2) ->
+    C2;
+merge_constraints(C1, C2) ->
+    {SList,VList,PAList,Rest} = splitlist(C1++C2,[],[],[],[]),
+    SizeC = merge_constraints(SList),
+    ValueC = merge_constraints(VList),
+    PermAlphaC = merge_constraints(PAList),
+    case Rest of
+        [] ->
+            SizeC ++ ValueC ++ PermAlphaC;
+        _ ->
+            throw({error,{asn1,{not_implemented,{merge_constraints,Rest}}}})
+    end.
+
+merge_constraints([]) -> [];
+merge_constraints([C1 = {_,{Low1,High1}},{_,{Low2,High2}}|Rest]) when Low1 >= Low2,
+                                                                      High1 =< High2 ->
+    merge_constraints([C1|Rest]);
+merge_constraints([C1={'PermittedAlphabet',_},C2|Rest]) ->
+    [C1|merge_constraints([C2|Rest])];
+merge_constraints([C1 = {_,{_Low1,_High1}},C2 = {_,{_Low2,_High2}}|_Rest]) ->
+    throw({error,asn1,{conflicting_constraints,{C1,C2}}});
+merge_constraints([C]) ->
+    [C].
+
+splitlist([C={'SizeConstraint',_}|Rest],Sacc,Vacc,PAacc,Restacc) ->
+    splitlist(Rest,[C|Sacc],Vacc,PAacc,Restacc);
+splitlist([C={'ValueRange',_}|Rest],Sacc,Vacc,PAacc,Restacc) ->
+    splitlist(Rest,Sacc,[C|Vacc],PAacc,Restacc);
+splitlist([C={'PermittedAlphabet',_}|Rest],Sacc,Vacc,PAacc,Restacc) ->
+    splitlist(Rest,Sacc,Vacc,[C|PAacc],Restacc);
+splitlist([C|Rest],Sacc,Vacc,PAacc,Restacc) ->
+    splitlist(Rest,Sacc,Vacc,PAacc,[C|Restacc]);
+splitlist([],Sacc,Vacc,PAacc,Restacc) ->
+    {lists:reverse(Sacc),
+     lists:reverse(Vacc),
+     lists:reverse(PAacc),
+     lists:reverse(Restacc)}.
+
+
+
+storeindb(M) when record(M,module) ->
+    TVlist = M#module.typeorval,
+    NewM = M#module{typeorval=findtypes_and_values(TVlist)},
+    asn1_db:dbnew(NewM#module.name),
+    asn1_db:dbput(NewM#module.name,'MODULE',  NewM),
+    Res = storeindb(NewM#module.name,TVlist,[]),
+    include_default_class(NewM#module.name),
+    include_default_type(NewM#module.name),
+    Res.
+
+storeindb(Module,[H|T],ErrAcc) when record(H,typedef) ->
+    storeindb(Module,H#typedef.name,H,T,ErrAcc);
+storeindb(Module,[H|T],ErrAcc) when record(H,valuedef) ->
+    storeindb(Module,H#valuedef.name,H,T,ErrAcc);
+storeindb(Module,[H|T],ErrAcc) when record(H,ptypedef) ->
+    storeindb(Module,H#ptypedef.name,H,T,ErrAcc);
+storeindb(Module,[H|T],ErrAcc) when record(H,classdef) ->
+    storeindb(Module,H#classdef.name,H,T,ErrAcc);
+storeindb(Module,[H|T],ErrAcc) when record(H,pvaluesetdef) ->
+    storeindb(Module,H#pvaluesetdef.name,H,T,ErrAcc);
+storeindb(Module,[H|T],ErrAcc) when record(H,pobjectdef) ->
+    storeindb(Module,H#pobjectdef.name,H,T,ErrAcc);
+storeindb(Module,[H|T],ErrAcc) when record(H,pvaluedef) ->
+    storeindb(Module,H#pvaluedef.name,H,T,ErrAcc);
+storeindb(_,[],[]) -> ok;
+storeindb(_,[],ErrAcc) ->
+    {error,ErrAcc}.
+
+storeindb(Module,Name,H,T,ErrAcc) ->
+    case asn1_db:dbget(Module,Name) of
+	undefined ->
+	    asn1_db:dbput(Module,Name,H),
+	    storeindb(Module,T,ErrAcc);
+	_ ->
+	    case H of
+		_Type when record(H,typedef) ->
+		    error({type,"already defined",
+			   #state{mname=Module,type=H,tname=Name}});
+		_Type when record(H,valuedef) ->
+		    error({value,"already defined",
+			   #state{mname=Module,value=H,vname=Name}});
+		_Type when record(H,ptypedef) ->
+		    error({ptype,"already defined",
+			   #state{mname=Module,type=H,tname=Name}});
+		_Type when record(H,pobjectdef) ->
+		    error({ptype,"already defined",
+			   #state{mname=Module,type=H,tname=Name}});
+		_Type when record(H,pvaluesetdef) ->
+		    error({ptype,"already defined",
+			   #state{mname=Module,type=H,tname=Name}});
+		_Type when record(H,pvaluedef) ->
+		    error({ptype,"already defined",
+			   #state{mname=Module,type=H,tname=Name}});
+		_Type when record(H,classdef) ->
+		    error({class,"already defined",
+			   #state{mname=Module,value=H,vname=Name}})
+	    end,
+	    storeindb(Module,T,[H|ErrAcc])
+    end.
+
+findtypes_and_values(TVList) ->
+    findtypes_and_values(TVList,[],[],[],[],[],[]).%% Types,Values,
+%% Parameterizedtypes,Classes,Objects and ObjectSets
+
+findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
+  when record(H,typedef),record(H#typedef.typespec,'Object') ->
+    findtypes_and_values(T,Tacc,Vacc,Pacc,Cacc,[H#typedef.name|Oacc],OSacc);
+findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
+  when record(H,typedef),record(H#typedef.typespec,'ObjectSet') ->
+    findtypes_and_values(T,Tacc,Vacc,Pacc,Cacc,Oacc,[H#typedef.name|OSacc]);
+findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
+  when record(H,typedef) ->
+    findtypes_and_values(T,[H#typedef.name|Tacc],Vacc,Pacc,Cacc,Oacc,OSacc);
+findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
+  when record(H,valuedef) ->
+    findtypes_and_values(T,Tacc,[H#valuedef.name|Vacc],Pacc,Cacc,Oacc,OSacc);
+findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
+  when record(H,ptypedef) ->
+    findtypes_and_values(T,Tacc,Vacc,[H#ptypedef.name|Pacc],Cacc,Oacc,OSacc);
+findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
+  when record(H,classdef) ->
+    findtypes_and_values(T,Tacc,Vacc,Pacc,[H#classdef.name|Cacc],Oacc,OSacc);
+findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
+  when record(H,pvaluedef) ->
+    findtypes_and_values(T,Tacc,[H#pvaluedef.name|Vacc],Pacc,Cacc,Oacc,OSacc);
+findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
+  when record(H,pvaluesetdef) ->
+    findtypes_and_values(T,Tacc,[H#pvaluesetdef.name|Vacc],Pacc,Cacc,Oacc,OSacc);
+findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
+  when record(H,pobjectdef) ->
+    findtypes_and_values(T,Tacc,Vacc,Pacc,Cacc,[H#pobjectdef.name|Oacc],OSacc);
+findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
+  when record(H,pobjectsetdef) ->
+    findtypes_and_values(T,Tacc,Vacc,Pacc,Cacc,Oacc,[H#pobjectsetdef.name|OSacc]);
+findtypes_and_values([],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc) ->
+    {lists:reverse(Tacc),lists:reverse(Vacc),lists:reverse(Pacc),
+     lists:reverse(Cacc),lists:reverse(Oacc),lists:reverse(OSacc)}.
+
+
+
+error({export,Msg,#state{mname=Mname,type=Ref,tname=Typename}}) ->
+    Pos = Ref#'Externaltypereference'.pos,
+    io:format("asn1error:~p:~p:~p ~p~n",[Pos,Mname,Typename,Msg]),
+    {error,{export,Pos,Mname,Typename,Msg}};
+error({type,Msg,#state{mname=Mname,type=Type,tname=Typename}})
+  when record(Type,typedef) ->
+    io:format("asn1error:~p:~p:~p ~p~n",
+	      [Type#typedef.pos,Mname,Typename,Msg]),
+    {error,{type,Type#typedef.pos,Mname,Typename,Msg}};
+error({type,Msg,#state{mname=Mname,type=Type,tname=Typename}})
+  when record(Type,ptypedef) ->
+    io:format("asn1error:~p:~p:~p ~p~n",
+	      [Type#ptypedef.pos,Mname,Typename,Msg]),
+    {error,{type,Type#ptypedef.pos,Mname,Typename,Msg}};
+error({type,Msg,#state{mname=Mname,value=Value,vname=Valuename}})
+  when record(Value,valuedef) ->
+    io:format("asn1error:~p:~p:~p ~p~n",[Value#valuedef.pos,Mname,Valuename,Msg]),
+    {error,{type,Value#valuedef.pos,Mname,Valuename,Msg}};
+error({type,Msg,#state{mname=Mname,type=Type,tname=Typename}})
+  when record(Type,pobjectdef) ->
+    io:format("asn1error:~p:~p:~p ~p~n",
+	      [Type#pobjectdef.pos,Mname,Typename,Msg]),
+    {error,{type,Type#pobjectdef.pos,Mname,Typename,Msg}};
+error({value,Msg,#state{mname=Mname,value=Value,vname=Valuename}}) ->
+    io:format("asn1error:~p:~p:~p ~p~n",[Value#valuedef.pos,Mname,Valuename,Msg]),
+    {error,{value,Value#valuedef.pos,Mname,Valuename,Msg}};
+error({Other,Msg,#state{mname=Mname,value=#valuedef{pos=Pos},vname=Valuename}}) ->
+    io:format("asn1error:~p:~p:~p ~p~n",[Pos,Mname,Valuename,Msg]),
+    {error,{Other,Pos,Mname,Valuename,Msg}};
+error({Other,Msg,#state{mname=Mname,type=#typedef{pos=Pos},tname=Typename}}) ->
+    io:format("asn1error:~p:~p:~p ~p~n",[Pos,Mname,Typename,Msg]),
+    {error,{Other,Pos,Mname,Typename,Msg}};
+error({Other,Msg,#state{mname=Mname,type=#classdef{pos=Pos},tname=Typename}}) ->
+    io:format("asn1error:~p:~p:~p ~p~n",[Pos,Mname,Typename,Msg]),
+    {error,{Other,Pos,Mname,Typename,Msg}}.
+
+include_default_type(Module) ->
+    NameAbsList = default_type_list(),
+    include_default_type1(Module,NameAbsList).
+
+include_default_type1(_,[]) ->
+    ok;
+include_default_type1(Module,[{Name,TS}|Rest]) ->
+    case asn1_db:dbget(Module,Name) of
+	undefined ->
+	    T = #typedef{name=Name,
+			 typespec=TS},
+		asn1_db:dbput(Module,Name,T);
+	_ -> ok
+    end,
+    include_default_type1(Module,Rest).
+
+default_type_list() ->
+    %% The EXTERNAL type is represented, according to ASN.1 1997,
+    %% as a SEQUENCE with components: identification, data-value-descriptor
+    %% and data-value.
+    Syntax =
+	#'ComponentType'{name=syntax,
+			 typespec=#type{def='OBJECT IDENTIFIER'},
+			 prop=mandatory},
+    Presentation_Cid =
+	#'ComponentType'{name='presentation-context-id',
+			 typespec=#type{def='INTEGER'},
+			 prop=mandatory},
+    Transfer_syntax =
+	#'ComponentType'{name='transfer-syntax',
+			 typespec=#type{def='OBJECT IDENTIFIER'},
+			 prop=mandatory},
+    Negotiation_items =
+	#type{def=
+	      #'SEQUENCE'{components=
+			  [Presentation_Cid,
+			   Transfer_syntax#'ComponentType'{prop=mandatory}]}},
+    Context_negot =
+	#'ComponentType'{name='context-negotiation',
+			 typespec=Negotiation_items,
+			 prop=mandatory},
+
+    Data_value_descriptor =
+	#'ComponentType'{name='data-value-descriptor',
+			 typespec=#type{def='ObjectDescriptor'},
+			 prop='OPTIONAL'},
+    Data_value =
+	#'ComponentType'{name='data-value',
+			 typespec=#type{def='OCTET STRING'},
+			 prop=mandatory},
+
+    %% The EXTERNAL type is represented, according to ASN.1 1990,
+    %% as a SEQUENCE with components: direct-reference, indirect-reference,
+    %% data-value-descriptor and encoding.
+
+    Direct_reference =
+	#'ComponentType'{name='direct-reference',
+			 typespec=#type{def='OBJECT IDENTIFIER'},
+			 prop='OPTIONAL'},
+
+    Indirect_reference =
+	#'ComponentType'{name='indirect-reference',
+			 typespec=#type{def='INTEGER'},
+			 prop='OPTIONAL'},
+
+    Single_ASN1_type =
+	#'ComponentType'{name='single-ASN1-type',
+			 typespec=#type{tag=[{tag,'CONTEXT',0,
+					      'EXPLICIT',32}],
+					def='ANY'},
+			 prop=mandatory},
+
+    Octet_aligned =
+	#'ComponentType'{name='octet-aligned',
+			 typespec=#type{tag=[{tag,'CONTEXT',1,
+					      'IMPLICIT',32}],
+					def='OCTET STRING'},
+			 prop=mandatory},
+
+    Arbitrary =
+	#'ComponentType'{name=arbitrary,
+			 typespec=#type{tag=[{tag,'CONTEXT',2,
+					      'IMPLICIT',32}],
+					def={'BIT STRING',[]}},
+			 prop=mandatory},
+
+    Encoding =
+	#'ComponentType'{name=encoding,
+			 typespec=#type{def={'CHOICE',
+					     [Single_ASN1_type,Octet_aligned,
+					      Arbitrary]}},
+			 prop=mandatory},
+
+    EXTERNAL_components1990 =
+	[Direct_reference,Indirect_reference,Data_value_descriptor,Encoding],
+
+    %% The EMBEDDED PDV type is represented by a SEQUENCE type
+    %% with components: identification and data-value
+    Abstract =
+	#'ComponentType'{name=abstract,
+			 typespec=#type{def='OBJECT IDENTIFIER'},
+			 prop=mandatory},
+    Transfer =
+	#'ComponentType'{name=transfer,
+			 typespec=#type{def='OBJECT IDENTIFIER'},
+			 prop=mandatory},
+    AbstractTrSeq =
+	#'SEQUENCE'{components=[Abstract,Transfer]},
+    Syntaxes =
+	#'ComponentType'{name=syntaxes,
+			 typespec=#type{def=AbstractTrSeq},
+			 prop=mandatory},
+    Fixed = #'ComponentType'{name=fixed,
+			     typespec=#type{def='NULL'},
+			     prop=mandatory},
+    Negotiations =
+	[Syntaxes,Syntax,Presentation_Cid,Context_negot,
+	 Transfer_syntax,Fixed],
+    Identification2 =
+	#'ComponentType'{name=identification,
+			 typespec=#type{def={'CHOICE',Negotiations}},
+			 prop=mandatory},
+    EmbeddedPdv_components =
+	[Identification2,Data_value],
+
+    %% The CHARACTER STRING type is represented by a SEQUENCE type
+    %% with components: identification and string-value
+    String_value =
+	#'ComponentType'{name='string-value',
+			 typespec=#type{def='OCTET STRING'},
+			 prop=mandatory},
+    CharacterString_components =
+	[Identification2,String_value],
+
+    [{'EXTERNAL',
+      #type{tag=[#tag{class='UNIVERSAL',
+		      number=8,
+		      type='IMPLICIT',
+		      form=32}],
+	    def=#'SEQUENCE'{components=
+			    EXTERNAL_components1990}}},
+     {'EMBEDDED PDV',
+      #type{tag=[#tag{class='UNIVERSAL',
+		      number=11,
+		      type='IMPLICIT',
+		      form=32}],
+	    def=#'SEQUENCE'{components=EmbeddedPdv_components}}},
+     {'CHARACTER STRING',
+      #type{tag=[#tag{class='UNIVERSAL',
+		      number=29,
+		      type='IMPLICIT',
+		      form=32}],
+	    def=#'SEQUENCE'{components=CharacterString_components}}}
+     ].
+
+
+include_default_class(Module) ->
+    NameAbsList = default_class_list(),
+    include_default_class1(Module,NameAbsList).
+
+include_default_class1(_,[]) ->
+    ok;
+include_default_class1(Module,[{Name,TS}|_Rest]) ->
+    case asn1_db:dbget(Module,Name) of
+	undefined ->
+	    C = #classdef{checked=true,name=Name,
+			  typespec=TS},
+	    asn1_db:dbput(Module,Name,C);
+	_ -> ok
+    end.
+
+default_class_list() ->
+    [{'TYPE-IDENTIFIER',
+      {objectclass,
+       [{fixedtypevaluefield,
+	 id,
+	 {type,[],'OBJECT IDENTIFIER',[]},
+	 'UNIQUE',
+	 'MANDATORY'},
+	{typefield,'Type','MANDATORY'}],
+       {'WITH SYNTAX',
+	[{typefieldreference,'Type'},
+	 'IDENTIFIED',
+	 'BY',
+	 {valuefieldreference,id}]}}},
+     {'ABSTRACT-SYNTAX',
+      {objectclass,
+       [{fixedtypevaluefield,
+	 id,
+	 {type,[],'OBJECT IDENTIFIER',[]},
+	 'UNIQUE',
+	 'MANDATORY'},
+	{typefield,'Type','MANDATORY'},
+	{fixedtypevaluefield,
+	 property,
+	 {type,
+	  [],
+	  {'BIT STRING',[]},
+	  []},
+	 undefined,
+	 {'DEFAULT',
+	  [0,1,0]}}],
+       {'WITH SYNTAX',
+	[{typefieldreference,'Type'},
+	 'IDENTIFIED',
+	 'BY',
+	 {valuefieldreference,id},
+	 ['HAS',
+	  'PROPERTY',
+	  {valuefieldreference,property}]]}}}].
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_constructed_ber.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_constructed_ber.erl
new file mode 100644
index 0000000000..695f648924
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_constructed_ber.erl
@@ -0,0 +1,1468 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_constructed_ber.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
+%%
+-module(asn1ct_constructed_ber).
+
+-export([gen_encode_sequence/3]).
+-export([gen_decode_sequence/3]).
+-export([gen_encode_set/3]).
+-export([gen_decode_set/3]).
+-export([gen_encode_sof/4]).
+-export([gen_decode_sof/4]).
+-export([gen_encode_choice/3]).
+-export([gen_decode_choice/3]).
+
+%%%% Application internal exports
+-export([match_tag/2]).
+
+-include("asn1_records.hrl").
+
+-import(asn1ct_gen, [emit/1,demit/1]).
+
+% the encoding of class of tag bits 8 and 7
+-define(UNIVERSAL,   0).
+-define(APPLICATION, 16#40).
+-define(CONTEXT,     16#80).
+-define(PRIVATE,     16#C0).
+
+% primitive or constructed encoding % bit 6
+-define(PRIMITIVE,   0).
+-define(CONSTRUCTED, 2#00100000).
+
+
+
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%%  Encode/decode SEQUENCE
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+gen_encode_sequence(Erules,Typename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    asn1ct_name:new(term),
+    asn1ct_name:new(bytes),
+
+    %% if EXTERNAL type the input value must be transformed to
+    %% ASN1 1990 format
+    case Typename of
+	['EXTERNAL'] ->
+	    emit(["   NewVal = asn1rt_check:transform_to_EXTERNAL1990(Val),",
+		  nl]);
+	_ ->
+	    ok
+    end,
+
+    {SeqOrSet,TableConsInfo,CompList} =
+	case D#type.def of
+	    #'SEQUENCE'{tablecinf=TCI,components=CL} ->
+		{'SEQUENCE',TCI,CL};
+	    #'SET'{tablecinf=TCI,components=CL} ->
+		{'SET',TCI,CL}
+	end,
+    Ext = extensible(CompList),
+    CompList1 = case CompList of
+		    {Rl,El} -> Rl ++ El;
+		    _ -> CompList
+		end,
+    EncObj =
+	case TableConsInfo of
+	    #simpletableattributes{usedclassfield=Used,
+				   uniqueclassfield=Unique} when Used /= Unique ->
+		false;
+	    %% ObjectSet, name of the object set in constraints
+	    %%
+	    %%{ObjectSet,AttrN,N,UniqueFieldName}
+	    #simpletableattributes{objectsetname=ObjectSet,
+				   c_name=AttrN,
+				   c_index=N,
+				   usedclassfield=UniqueFieldName,
+				   uniqueclassfield=UniqueFieldName,
+				   valueindex=ValueIndex
+				  } ->
+		OSDef =
+		    case ObjectSet of
+			{Module,OSName} ->
+			    asn1_db:dbget(Module,OSName);
+			OSName ->
+			    asn1_db:dbget(get(currmod),OSName)
+		    end,
+%		io:format("currmod: ~p~nOSName: ~p~nAttrN: ~p~nN: ~p~nUniqueFieldName: ~p~n",
+%			  [get(currmod),OSName,AttrN,N,UniqueFieldName]),
+		case (OSDef#typedef.typespec)#'ObjectSet'.gen of
+		    true ->
+% 			Val = lists:concat(["?RT_BER:cindex(",
+% 					    N+1,",Val,"]),
+			ObjectEncode =
+			    asn1ct_gen:un_hyphen_var(lists:concat(['Obj',
+								   AttrN])),
+			emit({ObjectEncode," = ",nl}),
+			emit({"  'getenc_",ObjectSet,"'(",{asis,UniqueFieldName},
+			      ", ",nl}),
+%			emit({indent(35),"?RT_BER:cindex(",N+1,", Val,",
+%			      {asis,AttrN},")),",nl}),
+			emit([indent(10+length(atom_to_list(ObjectSet))),
+			      "value_match(",{asis,ValueIndex},",",
+			      "?RT_BER:cindex(",N+1,",Val,",
+			      {asis,AttrN},"))),",nl]),
+			notice_value_match(),
+			{AttrN,ObjectEncode};
+		    _ ->
+			false
+		end;
+	    _ ->
+		case D#type.tablecinf of
+		    [{objfun,_}|_] ->
+			%% when the simpletableattributes was at an
+			%% outer level and the objfun has been passed
+			%% through the function call
+			{"got objfun through args","ObjFun"};
+		    _ ->
+			false
+		end
+	end,
+
+    gen_enc_sequence_call(Erules,Typename,CompList1,1,Ext,EncObj),
+
+    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
+	++
+	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
+	      number = asn1ct_gen_ber:decode_type(SeqOrSet),
+	      form = ?CONSTRUCTED,
+	      type = 'IMPLICIT'}],
+    emit([nl,"   BytesSoFar = "]),
+    case SeqOrSet of
+	'SET' when (D#type.def)#'SET'.sorted == dynamic ->
+	    emit("?RT_BER:dynamicsort_SET_components(["),
+	    mkvlist(asn1ct_name:all(encBytes)),
+	    emit(["]),",nl]);
+	_ ->
+	    emit("["),
+	    mkvlist(asn1ct_name:all(encBytes)),
+	    emit(["],",nl])
+    end,
+    emit("  LenSoFar = "),
+    case asn1ct_name:all(encLen) of
+	[] -> emit("0");
+	AllLengths ->
+	    mkvplus(AllLengths)
+    end,
+    emit([",",nl]),
+% emit(["{TagBytes,Len} = ?RT_BER:encode_tags(TagIn ++ ",
+ emit(["  ?RT_BER:encode_tags(TagIn ++ ",
+		  {asis,MyTag},", BytesSoFar, LenSoFar).",nl]).
+
+
+gen_decode_sequence(Erules,Typename,D) when record(D,type) ->
+    asn1ct_name:start(),
+%    asn1ct_name:new(term),
+    asn1ct_name:new(tag),
+    #'SEQUENCE'{tablecinf=TableConsInfo,components=CList} = D#type.def,
+    Ext = extensible(CList),
+    CompList = case CList of
+		   {Rl,El}  -> Rl ++ El;
+		   _ -> CList
+	       end,
+
+    emit({"   %%-------------------------------------------------",nl}),
+    emit({"   %% decode tag and length ",nl}),
+    emit({"   %%-------------------------------------------------",nl}),
+
+    asn1ct_name:new(rb),
+    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
+	++
+	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
+	      number = asn1ct_gen_ber:decode_type('SEQUENCE'),
+	      form = ?CONSTRUCTED,
+	      type = 'IMPLICIT'}],
+    emit(["   {{_,",asn1ct_gen_ber:unused_var("Len",D#type.def),"},",{next,bytes},",",{curr,rb},
+	  "} = ?RT_BER:check_tags(TagIn ++ ",{asis,MyTag},", ",
+	  {curr,bytes},", OptOrMand), ",nl]),
+    asn1ct_name:new(bytes),
+    asn1ct_name:new(len),
+
+    case CompList of
+	[] -> true;
+	_ ->
+	    emit({"{",{next,bytes},
+		  ",RemBytes} = ?RT_BER:split_list(",
+		  {curr,bytes},
+		  ",", {prev,len},"),",nl}),
+	    asn1ct_name:new(bytes)
+    end,
+
+    {DecObjInf,UniqueFName,ValueIndex} =
+	case TableConsInfo of
+	    #simpletableattributes{objectsetname=ObjectSet,
+				   c_name=AttrN,
+				   usedclassfield=UniqueFieldName,
+				   uniqueclassfield=UniqueFieldName,
+				   valueindex=ValIndex
+				  } ->
+		F = fun(#'ComponentType'{typespec=CT})->
+			    case {CT#type.constraint,CT#type.tablecinf} of
+				{[],[{objfun,_}|_R]} -> true;
+				_ -> false
+			    end
+		    end,
+		case lists:any(F,CompList) of
+		    %%AttributeName = asn1ct_gen:un_hyphen_var(AttrN),
+		    true -> % when component relation constraint establish
+			%% relation from a component to another components
+			%% subtype component
+			{{AttrN,{deep,ObjectSet,UniqueFieldName,
+					 ValIndex}},
+			 UniqueFieldName,ValIndex};
+		    false ->
+			{{AttrN,ObjectSet},UniqueFieldName,ValIndex}
+		end;
+	    _ ->
+		{false,false,false}
+	end,
+    case gen_dec_sequence_call(Erules,Typename,CompList,Ext,DecObjInf) of
+	no_terms -> % an empty sequence
+	    emit([nl,nl]),
+	    demit({"Result = "}), %dbg
+	    %% return value as record
+	    asn1ct_name:new(rb),
+	    emit(["   {{'",asn1ct_gen:list2rname(Typename),"'}, ",{curr,bytes},",",nl,"    "]),
+	    asn1ct_gen_ber:add_removed_bytes(),
+	    emit(["}.",nl]);
+	{LeadingAttrTerm,PostponedDecArgs} ->
+	    emit([com,nl,nl]),
+	    case {LeadingAttrTerm,PostponedDecArgs} of
+		{[],[]} ->
+		    ok;
+		{_,[]} ->
+		    ok;
+		{[{ObjSet,LeadingAttr,Term}],PostponedDecArgs} ->
+		    DecObj = asn1ct_gen:un_hyphen_var(lists:concat(['DecObj',LeadingAttr,Term])),
+		    ValueMatch = value_match(ValueIndex,Term),
+		    emit([DecObj," =",nl,"   'getdec_",ObjSet,"'(",
+%			  {asis,UniqueFName},", ",Term,"),",nl}),
+			  {asis,UniqueFName},", ",ValueMatch,"),",nl]),
+		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
+	    end,
+	    demit({"Result = "}), %dbg
+	    %% return value as record
+	    asn1ct_name:new(rb),
+	    asn1ct_name:new(bytes),
+	    ExtStatus = case Ext of
+			    {ext,_,_} -> ext;
+			    noext -> noext
+			end,
+	    emit(["   {",{next,bytes},",",{curr,rb},"} = ?RT_BER:restbytes2(RemBytes, ",
+		  {curr,bytes},",",ExtStatus,"),",nl]),
+	    asn1ct_name:new(rb),
+	    case Typename of
+		['EXTERNAL'] ->
+		    emit(["   OldFormat={'",asn1ct_gen:list2rname(Typename),
+			  "', "]),
+		    mkvlist(asn1ct_name:all(term)),
+		    emit(["},",nl]),
+		    emit(["   ASN11994Format =",nl,
+			  "      asn1rt_check:transform_to_EXTERNAL1994",
+			  "(OldFormat),",nl]),
+		    emit(["   {ASN11994Format,",{next,bytes},", "]);
+		_ ->
+		    emit(["   {{'",asn1ct_gen:list2rname(Typename),"', "]),
+		    mkvlist(asn1ct_name:all(term)),
+		    emit(["}, ",{next,bytes},", "])
+	    end,
+	    asn1ct_gen_ber:add_removed_bytes(),
+	    emit(["}.",nl])
+    end.
+
+gen_dec_postponed_decs(_,[]) ->
+    emit(nl);
+gen_dec_postponed_decs(DecObj,[{_Cname,{FirstPFN,PFNList},Term,TmpTerm,_Tag,OptOrMand}|Rest]) ->
+%    asn1ct_name:new(term),
+    asn1ct_name:new(tmpterm),
+    asn1ct_name:new(reason),
+
+    emit({"{",Term,", _, _} = ",nl}),
+    N = case OptOrMand of
+	    mandatory -> 0;
+	    'OPTIONAL' ->
+		emit_opt_or_mand_check(asn1_NOVALUE,TmpTerm),
+		6;
+	    {'DEFAULT',Val} ->
+		emit_opt_or_mand_check(Val,TmpTerm),
+		6
+	end,
+    emit({indent(N+3),"case (catch ",DecObj,"(",{asis,FirstPFN},
+%	  ", ",TmpTerm,", ", {asis,Tag},", ",{asis,PFNList},")) of",nl}),
+	  ", ",TmpTerm,", [], ",{asis,PFNList},")) of",nl}),
+    emit({indent(N+6),"{'EXIT', ",{curr,reason},"} ->",nl}),
+    emit({indent(N+9),"exit({'Type not compatible with table constraint',",
+	  {curr,reason},"});",nl}),
+    emit({indent(N+6),{curr,tmpterm}," ->",nl}),
+    emit({indent(N+9),{curr,tmpterm},nl}),
+
+    case OptOrMand of
+	mandatory -> emit([indent(N+3),"end,",nl]);
+	_ ->
+	    emit([indent(N+3),"end",nl,
+		  indent(3),"end,",nl])
+    end,
+%    emit({indent(3),"end,",nl}),
+    gen_dec_postponed_decs(DecObj,Rest).
+
+
+emit_opt_or_mand_check(Value,TmpTerm) ->
+    emit([indent(3),"case ",TmpTerm," of",nl,
+	  indent(6),{asis,Value}," -> {",{asis,Value},",[],[]};",nl,
+	  indent(6),"_ ->",nl]).
+
+%%============================================================================
+%%  Encode/decode SET
+%%
+%%============================================================================
+
+gen_encode_set(Erules,Typename,D) when record(D,type) ->
+    gen_encode_sequence(Erules,Typename,D).
+
+gen_decode_set(Erules,Typename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    asn1ct_name:new(term),
+    asn1ct_name:new(tag),
+    #'SET'{components=TCompList} = D#type.def,
+    Ext = extensible(TCompList),
+    CompList = case TCompList of
+		   {Rl,El} -> Rl ++ El;
+		   _ -> TCompList
+	       end,
+
+    emit(["   %%-------------------------------------------------",nl]),
+    emit(["   %% decode tag and length ",nl]),
+    emit(["   %%-------------------------------------------------",nl]),
+
+    asn1ct_name:new(rb),
+    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
+	++
+	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
+	      number = asn1ct_gen_ber:decode_type('SET'),
+	      form = ?CONSTRUCTED,
+	      type = 'IMPLICIT'}],
+    emit(["   {{_,Len},",{next,bytes},",",{curr,rb},
+	  "} = ?RT_BER:check_tags(TagIn ++ ",{asis,MyTag},", ",
+	  {curr,bytes},", OptOrMand), ",nl]),
+    asn1ct_name:new(bytes),
+    asn1ct_name:new(len),
+    asn1ct_name:new(rb),
+
+    emit(["   {SetTerm, SetBytes, ",{curr,rb},"} = ?RT_BER:decode_set(0, Len, ",
+	  {curr,bytes},", OptOrMand, ",
+	  "fun 'dec_",asn1ct_gen:list2name(Typename),"_fun'/2, []),",nl]),
+
+    asn1ct_name:new(rb),
+    emit(["   'dec_",asn1ct_gen:list2name(Typename),"_result'(lists:sort(SetTerm), SetBytes, "]),
+    asn1ct_gen_ber:add_removed_bytes(),
+    emit([").",nl,nl,nl]),
+
+    emit({"%%-------------------------------------------------",nl}),
+    emit({"%% Set loop fun for ",asn1ct_gen:list2name(Typename),nl}),
+    emit({"%%-------------------------------------------------",nl}),
+
+    asn1ct_name:clear(),
+    asn1ct_name:new(term),
+    emit(["'dec_",asn1ct_gen:list2name(Typename),"_fun'(",{curr,bytes},
+	  ", OptOrMand) ->",nl]),
+
+    asn1ct_name:new(bytes),
+    gen_dec_set(Erules,Typename,CompList,1,Ext),
+
+    emit(["      %% tag not found, if extensionmark we should skip bytes here",nl]),
+    emit([indent(6),"_ -> {[], Bytes,0}",nl]),
+    emit([indent(3),"end.",nl,nl,nl]),
+
+
+    emit({"%%-------------------------------------------------",nl}),
+    emit({"%% Result ",asn1ct_gen:list2name(Typename),nl}),
+    emit({"%%-------------------------------------------------",nl}),
+
+    asn1ct_name:clear(),
+    emit({"'dec_",asn1ct_gen:list2name(Typename),"_result'(",
+	  asn1ct_gen_ber:unused_var("TermList",D#type.def),", Bytes, Rb) ->",nl}),
+
+    case gen_dec_set_result(Erules,Typename,CompList) of
+	no_terms ->
+	    %% return value as record
+	    asn1ct_name:new(rb),
+	    emit({"   {{'",asn1ct_gen:list2rname(Typename),"'}, Bytes, Rb}.",nl});
+	_ ->
+	    emit({nl,"   case ",{curr,termList}," of",nl}),
+	    emit({"      [] -> {{'",asn1ct_gen:list2rname(Typename),"', "}),
+	    mkvlist(asn1ct_name:all(term)),
+	    emit({"}, Bytes, Rb};",nl}),
+	    emit({"      ExtraAtt -> exit({error,{asn1,{too_many_attributes, ExtraAtt}}})",nl}),
+	    emit({"   end.",nl}),
+	    emit({nl,nl,nl})
+    end.
+
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%%  Encode/decode SEQUENCE OF and SET OF
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+gen_encode_sof(Erules,Typename,_InnerTypename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    {SeqOrSetOf, Cont} = D#type.def,
+
+    Objfun = case D#type.tablecinf of
+		 [{objfun,_}|_R] ->
+		     ", ObjFun";
+		 _ ->
+		     ""
+	     end,
+
+    emit({"   {EncBytes,EncLen} = 'enc_",asn1ct_gen:list2name(Typename),
+	  "_components'(Val",Objfun,",[],0),",nl}),
+
+    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
+	++
+	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
+	      number = asn1ct_gen_ber:decode_type(SeqOrSetOf),
+	      form = ?CONSTRUCTED,
+	      type = 'IMPLICIT'}],
+%    gen_encode_tags(Erules,MyTag,"EncLen","EncBytes"),
+	    emit(["   ?RT_BER:encode_tags(TagIn ++ ",
+		  {asis,MyTag},", EncBytes, EncLen).",nl,nl]),
+
+    gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont).
+%     gen_enc_line(Erules,Typename,TypeNameSuffix,Cont,"H",0,
+% 		 mandatory,"{EncBytes,EncLen} = "),
+
+
+gen_decode_sof(Erules,Typename,_InnerTypename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    {SeqOrSetOf, TypeTag, Cont} =
+	case D#type.def of
+	    {'SET OF',_Cont} -> {'SET OF','SET',_Cont};
+	    {'SEQUENCE OF',_Cont} -> {'SEQUENCE OF','SEQUENCE',_Cont}
+	end,
+    TypeNameSuffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,Cont#type.def),
+
+    emit({"   %%-------------------------------------------------",nl}),
+    emit({"   %% decode tag and length ",nl}),
+    emit({"   %%-------------------------------------------------",nl}),
+
+    asn1ct_name:new(rb),
+    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
+	++
+	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
+	      number = asn1ct_gen_ber:decode_type(TypeTag),
+	      form = ?CONSTRUCTED,
+	      type = 'IMPLICIT'}],
+    emit(["   {{_,Len},",{next,bytes},",",{curr,rb},
+	  "} = ?RT_BER:check_tags(TagIn ++ ",{asis,MyTag},", ",
+	  {curr,bytes},", OptOrMand), ",nl]),
+
+    emit(["   ?RT_BER:decode_components(",{curr,rb}]),
+    InnerType = asn1ct_gen:get_inner(Cont#type.def),
+    ContName = case asn1ct_gen:type(InnerType) of
+		   Atom when atom(Atom) -> Atom;
+		   _ -> TypeNameSuffix
+	       end,
+    emit([", Len, ",{next,bytes},", "]),
+%    NewCont =
+%	case Cont#type.def of
+%	    {'ENUMERATED',_,Components}->
+%		Cont#type{def={'ENUMERATED',Components}};
+%	    _ -> Cont
+%	end,
+     ObjFun =
+	case D#type.tablecinf of
+	    [{objfun,_}|_R] ->
+		", ObjFun";
+	    _ ->
+		[]
+	end,
+    gen_dec_line_sof(Erules,Typename,ContName,Cont,ObjFun),
+    emit([", []).",nl,nl,nl]).
+
+
+gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont)
+  when record(Cont,type)->
+
+    {Objfun,ObjFun_novar,EncObj} =
+	case Cont#type.tablecinf of
+	    [{objfun,_}|_R] ->
+		{", ObjFun",", _",{no_attr,"ObjFun"}};
+	    _ ->
+		{"","",false}
+	end,
+    emit(["'enc_",asn1ct_gen:list2name(Typename),
+	  "_components'([]",ObjFun_novar,", AccBytes, AccLen) -> ",nl]),
+
+    case catch lists:member(der,get(encoding_options)) of
+	true ->
+	    emit([indent(3),
+		  "{?RT_BER:dynamicsort_SETOF(AccBytes),AccLen};",nl,nl]);
+	_ ->
+	    emit([indent(3),"{lists:reverse(AccBytes),AccLen};",nl,nl])
+    end,
+    emit(["'enc_",asn1ct_gen:list2name(Typename),
+	  "_components'([H|T]",Objfun,",AccBytes, AccLen) ->",nl]),
+    TypeNameSuffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,Cont#type.def),
+    gen_enc_line(Erules,Typename,TypeNameSuffix,Cont,"H",3,
+		 mandatory,"{EncBytes,EncLen} = ",EncObj),
+    emit([",",nl]),
+    emit([indent(3),"'enc_",asn1ct_gen:list2name(Typename),
+	  "_components'(T",Objfun,","]),
+    emit(["[EncBytes|AccBytes], AccLen + EncLen).",nl,nl]).
+
+%%============================================================================
+%%  Encode/decode CHOICE
+%%
+%%============================================================================
+
+gen_encode_choice(Erules,Typename,D) when record(D,type) ->
+    ChoiceTag = D#type.tag,
+    {'CHOICE',CompList} = D#type.def,
+    Ext = extensible(CompList),
+    CompList1 = case CompList of
+		    {Rl,El} -> Rl ++ El;
+		    _ -> CompList
+		end,
+    gen_enc_choice(Erules,Typename,ChoiceTag,CompList1,Ext),
+    emit({nl,nl}).
+
+gen_decode_choice(Erules,Typename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    asn1ct_name:new(bytes),
+    ChoiceTag = D#type.tag,
+    {'CHOICE',CompList} = D#type.def,
+    Ext = extensible(CompList),
+    CompList1 = case CompList of
+		    {Rl,El} -> Rl ++ El;
+		    _ -> CompList
+		end,
+    gen_dec_choice(Erules,Typename,ChoiceTag,CompList1,Ext),
+    emit({".",nl}).
+
+
+%%============================================================================
+%%  Encode SEQUENCE
+%%
+%%============================================================================
+
+gen_enc_sequence_call(Erules,TopType,[#'ComponentType'{name=Cname,typespec=Type,prop=Prop}|Rest],Pos,Ext,EncObj) ->
+    asn1ct_name:new(encBytes),
+    asn1ct_name:new(encLen),
+    Element =
+	case TopType of
+	    ['EXTERNAL'] ->
+		io_lib:format("?RT_BER:cindex(~w,NewVal,~w)",[Pos+1,Cname]);
+	    _ ->
+		io_lib:format("?RT_BER:cindex(~w,Val,~w)",[Pos+1,Cname])
+	end,
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    print_attribute_comment(InnerType,Pos,Prop),
+    gen_enc_line(Erules,TopType,Cname,Type,Element,3,Prop,EncObj),
+    case Rest of
+	[] ->
+	    emit({com,nl});
+	_ ->
+	    emit({com,nl}),
+	    gen_enc_sequence_call(Erules,TopType,Rest,Pos+1,Ext,EncObj)
+    end;
+
+gen_enc_sequence_call(_Erules,_TopType,[],_Num,_,_) ->
+	true.
+
+%%============================================================================
+%%  Decode SEQUENCE
+%%
+%%============================================================================
+
+gen_dec_sequence_call(Erules,TopType,CompList,Ext,DecObjInf) ->
+    gen_dec_sequence_call1(Erules,TopType, CompList, 1, Ext,DecObjInf,[],[]).
+
+
+gen_dec_sequence_call1(Erules,TopType,[#'ComponentType'{name=Cname,typespec=Type,prop=Prop,tags=Tags}|Rest],Num,Ext,DecObjInf,LeadingAttrAcc,ArgsAcc) ->
+    {LA,PostponedDec} =
+	gen_dec_component(Erules,TopType,Cname,Tags,Type,Num,Prop,
+			  Ext,DecObjInf),
+    case Rest of
+	[] ->
+	    {LA ++ LeadingAttrAcc,PostponedDec ++ ArgsAcc};
+	_ ->
+	    emit({com,nl}),
+%	    asn1ct_name:new(term),
+	    asn1ct_name:new(bytes),
+	    gen_dec_sequence_call1(Erules,TopType,Rest,Num+1,Ext,DecObjInf,
+				   LA++LeadingAttrAcc,PostponedDec++ArgsAcc)
+    end;
+
+gen_dec_sequence_call1(_Erules,_TopType,[],1,_,_,_,_) ->
+    no_terms.
+%%gen_dec_sequence_call1(Erules,_TopType,[],Num,_) ->
+%%    true.
+
+
+
+%%----------------------------
+%%SEQUENCE mandatory
+%%----------------------------
+
+gen_dec_component(Erules,TopType,Cname,CTags,Type,Pos,Prop,Ext,DecObjInf) ->
+    InnerType =
+	case Type#type.def of
+	    #'ObjectClassFieldType'{type=OCFTType} -> OCFTType;
+	    _ -> asn1ct_gen:get_inner(Type#type.def)
+	end,
+% 	case asn1ct_gen:get_constraint(Type#type.constraint,
+% 				       tableconstraint_info) of
+% 	    no ->
+% 		asn1ct_gen:get_inner(Type#type.def);
+% 	    _ ->
+% 		Type#type.def
+% 	end,
+    Prop1 = case {Prop,Ext} of
+		{mandatory,{ext,Epos,_}} when Pos >= Epos ->
+		    'OPTIONAL';
+		_ ->
+		    Prop
+	    end,
+    print_attribute_comment(InnerType,Pos,Prop1),
+    emit("   "),
+
+    case {InnerType,DecObjInf} of
+	{{typefield,_},NotFalse} when NotFalse /= false ->
+	    asn1ct_name:new(term),
+	    asn1ct_name:new(tmpterm),
+	    emit({"{",{curr,tmpterm},", ",{next,bytes},",",{next,rb},"} = "});
+	{{objectfield,_,_},_} ->
+	    asn1ct_name:new(term),
+	    asn1ct_name:new(tmpterm),
+	    emit({"{",{curr,tmpterm},", ",{next,bytes},",",{next,rb},"} = "});
+	_ ->
+	    asn1ct_name:new(term),
+	    emit({"{",{curr,term},",",{next,bytes},",",{next,rb},"} = "})
+    end,
+    asn1ct_name:new(rb),
+    PostponedDec =
+	gen_dec_line(Erules,TopType,Cname,CTags,Type,Prop1,DecObjInf),
+    asn1ct_name:new(form),
+    PostponedDec.
+
+
+%%-------------------------------------
+%%  Decode SET
+%%-------------------------------------
+
+gen_dec_set(Erules,TopType,CompList,Pos,_Ext) ->
+    TagList = get_all_choice_tags(CompList),
+    emit({indent(3),
+	  {curr,tagList}," = ",{asis,TagList},",",nl}),
+    emit({indent(3),
+	  "case ?RT_BER:check_if_valid_tag(Bytes, ",
+	  {curr,tagList},", OptOrMand) of",nl}),
+    asn1ct_name:new(tagList),
+    asn1ct_name:new(rbCho),
+    asn1ct_name:new(choTags),
+    gen_dec_set_cases(Erules,TopType,CompList,TagList,Pos),
+    asn1ct_name:new(tag),
+    asn1ct_name:new(bytes).
+
+
+
+gen_dec_set_cases(_,_,[],_,_) ->
+    ok;
+gen_dec_set_cases(Erules,TopType,[H|T],List,Pos) ->
+    case H of
+	{'EXTENSIONMARK', _, _} ->
+	    gen_dec_set_cases(Erules,TopType,T,List,Pos);
+	_ ->
+	    Name = H#'ComponentType'.name,
+	    Type = H#'ComponentType'.typespec,
+
+	    emit({indent(6),"'",Name,"' ->",nl}),
+	    case Type#type.def of
+		{'CHOICE',_NewCompList} ->
+		    gen_dec_set_cases_choice(Erules,TopType,H,Pos);
+		_ ->
+		    gen_dec_set_cases_type(Erules,TopType,H,Pos)
+	    end,
+	    gen_dec_set_cases(Erules,TopType,T,List,Pos+1)
+    end.
+
+
+
+
+gen_dec_set_cases_choice(_Erules,TopType,H,Pos) ->
+    Cname = H#'ComponentType'.name,
+    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
+	   || X <- (H#'ComponentType'.typespec)#type.tag],
+    asn1ct_name:new(rbCho),
+    emit({indent(9),"{Dec, Rest, ",{curr,rbCho},"} = "}),
+    emit({"'dec_",asn1ct_gen:list2name([Cname|TopType]),
+	  "'(Bytes,OptOrMand,",{asis,Tag},"),",nl}),
+    emit(["      {{",Pos,",Dec}, Rest, ",{curr,rbCho},"}"]),
+    emit([";",nl,nl]).
+
+
+gen_dec_set_cases_type(Erules,TopType,H,Pos) ->
+    Cname = H#'ComponentType'.name,
+    Type = H#'ComponentType'.typespec,
+    %% always use Prop = mandatory here    Prop = H#'ComponentType'.prop,
+
+    asn1ct_name:new(rbCho),
+    emit({indent(9),"{Dec, Rest, ",{curr,rbCho},"} = "}),
+    asn1ct_name:delete(bytes),
+    %% we have already seen the tag so now we must find the value
+    %% that why we always use 'mandatory' here
+    gen_dec_line(Erules,TopType,Cname,[],Type,mandatory,decObjInf),
+    asn1ct_name:new(bytes),
+
+    emit([",",nl]),
+    emit(["{{",Pos,",Dec}, Rest, ",{curr,rbCho},"}"]),
+    emit([";",nl,nl]).
+
+
+%%---------------------------------
+%%  Decode SET result
+%%---------------------------------
+
+gen_dec_set_result(Erules,TopType,{CompList,_ExtList}) ->
+    gen_dec_set_result1(Erules,TopType, CompList, 1);
+gen_dec_set_result(Erules,TopType,CompList) ->
+    gen_dec_set_result1(Erules,TopType, CompList, 1).
+
+gen_dec_set_result1(Erules,TopType,
+		   [#'ComponentType'{name=Cname,
+				     typespec=Type,
+				     prop=Prop}|Rest],Num) ->
+    gen_dec_set_component(Erules,TopType,Cname,Type,Num,Prop),
+    case Rest of
+	[] ->
+	    true;
+	_ ->
+	    gen_dec_set_result1(Erules,TopType,Rest,Num+1)
+    end;
+
+gen_dec_set_result1(_Erules,_TopType,[],1) ->
+    no_terms;
+gen_dec_set_result1(_Erules,_TopType,[],_Num) ->
+    true.
+
+
+gen_dec_set_component(_Erules,_TopType,_Cname,Type,Pos,Prop) ->
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    print_attribute_comment(InnerType,Pos,Prop),
+    emit({"   {",{next,term},com,{next,termList},"} =",nl}),
+    emit({"      case ",{curr,termList}," of",nl}),
+    emit({"          [{",Pos,com,{curr,termTmp},"}|",
+	  {curr,rest},"] -> "}),
+    emit({"{",{curr,termTmp},com,
+	  {curr,rest},"};",nl}),
+    case Prop of
+	'OPTIONAL' ->
+	    emit([indent(10),"_ -> {asn1_NOVALUE, ",{curr,termList},"}",nl]);
+	{'DEFAULT', DefVal} ->
+	    emit([indent(10),
+		  "_ -> {",{asis,DefVal},", ",{curr,termList},"}",nl]);
+	mandatory ->
+	    emit([indent(10),
+		  "_ -> exit({error,{asn1,{mandatory_attribute_no, ",
+		  Pos,", missing}}})",nl])
+    end,
+    emit([indent(6),"end,",nl]),
+    asn1ct_name:new(rest),
+    asn1ct_name:new(term),
+    asn1ct_name:new(termList),
+    asn1ct_name:new(termTmp).
+
+
+%%---------------------------------------------
+%%  Encode CHOICE
+%%---------------------------------------------
+%% for BER we currently do care (a little) if the choice has an EXTENSIONMARKER
+
+
+gen_enc_choice(Erules,TopType,Tag,CompList,_Ext) ->
+    gen_enc_choice1(Erules,TopType,Tag,CompList,_Ext).
+
+gen_enc_choice1(Erules,TopType,Tag,CompList,_Ext) ->
+    asn1ct_name:clear(),
+    emit({"   {EncBytes,EncLen} = case element(1,Val) of",nl}),
+    gen_enc_choice2(Erules,TopType,CompList),
+    emit([nl,"   end,",nl,nl]),
+    NewTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- Tag],
+%    gen_encode_tags(Erules,NewTag,"EncLen","EncBytes").
+   emit(["?RT_BER:encode_tags(TagIn ++",{asis,NewTag},", EncBytes, EncLen).",nl]).
+
+
+
+gen_enc_choice2(Erules,TopType,[H1|T]) when record(H1,'ComponentType') ->
+    Cname = H1#'ComponentType'.name,
+    Type = H1#'ComponentType'.typespec,
+    emit({"      ",{asis,Cname}," ->",nl}),
+    {Encobj,Assign} =
+% 	case asn1ct_gen:get_constraint(Type#type.constraint,
+% 				       tableconstraint_info) of
+	case {Type#type.def,asn1ct_gen:get_constraint(Type#type.constraint,
+						      componentrelation)} of
+	    {#'ObjectClassFieldType'{},{componentrelation,_,_}} ->
+		asn1ct_name:new(tmpBytes),
+		asn1ct_name:new(encBytes),
+		asn1ct_name:new(encLen),
+		Emit = ["{",{curr,tmpBytes},", _} = "],
+		{{no_attr,"ObjFun"},Emit};
+	    _ ->
+		{false,[]}
+	end,
+    gen_enc_line(Erules,TopType,Cname,Type,"element(2,Val)",9,
+		 mandatory,Assign,Encobj),
+    case Encobj of
+	false -> ok;
+	_ ->
+	    emit({",",nl,indent(9),"{",{curr,encBytes},", ",
+		  {curr,encLen},"}"})
+    end,
+    emit({";",nl}),
+    case T of
+	[] ->
+	    emit([indent(6), "Else -> ",nl,
+		  indent(9),"exit({error,{asn1,{invalid_choice_type,Else}}})"]);
+	_ ->
+	    true
+    end,
+    gen_enc_choice2(Erules,TopType,T);
+
+gen_enc_choice2(_,_,[])  ->
+    true.
+
+
+
+
+%%--------------------------------------------
+%%  Decode CHOICE
+%%--------------------------------------------
+
+gen_dec_choice(Erules,TopType, ChTag, CompList, Ext) ->
+    asn1ct_name:delete(bytes),
+    Tags = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- ChTag],
+
+    emit(["   {{_,Len},",{next,bytes},
+	  ", RbExp} = ?RT_BER:check_tags(TagIn++",
+	  {asis,Tags},", ",
+	  {curr,bytes},", OptOrMand),",nl]),
+    asn1ct_name:new(bytes),
+    asn1ct_name:new(len),
+    gen_dec_choice_indef_funs(Erules),
+    case Erules of
+	ber_bin ->
+	    emit([indent(3),"case ",{curr,bytes}," of",nl]);
+	ber ->
+	    emit([indent(3),
+		  "case (catch ?RT_BER:peek_tag(",{curr,bytes},")) of",nl])
+    end,
+    asn1ct_name:new(tagList),
+    asn1ct_name:new(choTags),
+    gen_dec_choice_cases(Erules,TopType,CompList),
+    case Ext of
+	noext ->
+	    emit([indent(6), {curr,else}," -> ",nl]),
+	    emit([indent(9),"case OptOrMand of",nl,
+		  indent(12),"mandatory ->","exit({error,{asn1,",
+		  "{invalid_choice_tag,",{curr,else},"}}});",nl,
+		  indent(12),"_ ->","exit({error,{asn1,{no_optional_tag,",
+		  {curr,else},"}}})",nl,
+		  indent(9),"end",nl]);
+	_ ->
+	    emit([indent(6),"_ -> ",nl]),
+	    emit([indent(9),"{{asn1_ExtAlt,",{curr,bytes},"},",
+		  empty_lb(Erules),", RbExp}",nl])
+    end,
+    emit([indent(3),"end"]),
+    asn1ct_name:new(tag),
+    asn1ct_name:new(else).
+
+gen_dec_choice_indef_funs(Erules) ->
+    emit({indent(3),"IndefEndBytes = fun(indefinite,",indefend_match(Erules,used_var),
+	  ")-> R; (_,B)-> B end,",nl}),
+    emit({indent(3),"IndefEndRb = fun(indefinite,",indefend_match(Erules,unused_var),
+	  ")-> 2; (_,_)-> 0 end,",nl}).
+
+
+gen_dec_choice_cases(_,_, []) ->
+    ok;
+gen_dec_choice_cases(Erules,TopType, [H|T]) ->
+    asn1ct_name:push(rbCho),
+    Name = H#'ComponentType'.name,
+    emit([nl,"%% '",Name,"'",nl]),
+    Fcases  = fun([T1,T2|Tail],Fun) ->
+		      emit([indent(6),match_tag(Erules,T1)," ->",nl]),
+		      gen_dec_choice_cases_type(Erules,TopType, H),
+		      Fun([T2|Tail],Fun);
+		 ([T1],_) ->
+		      emit([indent(6),match_tag(Erules,T1)," ->",nl]),
+		      gen_dec_choice_cases_type(Erules,TopType, H)
+	      end,
+    Fcases(H#'ComponentType'.tags,Fcases),
+    asn1ct_name:pop(rbCho),
+    gen_dec_choice_cases(Erules,TopType, T).
+
+
+
+gen_dec_choice_cases_type(Erules,TopType,H) ->
+    Cname = H#'ComponentType'.name,
+    Type = H#'ComponentType'.typespec,
+    Prop = H#'ComponentType'.prop,
+    emit({indent(9),"{Dec, Rest, ",{curr,rbCho},"} = "}),
+    gen_dec_line(Erules,TopType,Cname,[],Type,Prop,false),
+    emit([",",nl,indent(9),"{{",{asis,Cname},
+	  ", Dec}, IndefEndBytes(Len,Rest), RbExp + ",
+	  {curr,rbCho}," + IndefEndRb(Len,Rest)};",nl,nl]).
+
+encode_tag_val(Erules,{Class,TagNo}) when integer(TagNo) ->
+    Rtmod = rtmod(Erules),
+    Rtmod:encode_tag_val({asn1ct_gen_ber:decode_class(Class),
+				  0,TagNo});
+encode_tag_val(Erules,{Class,TypeName}) ->
+    Rtmod = rtmod(Erules),
+    Rtmod:encode_tag_val({asn1ct_gen_ber:decode_class(Class),
+				  0,asn1ct_gen_ber:decode_type(TypeName)}).
+
+
+match_tag(ber_bin,Arg) ->
+    match_tag_with_bitsyntax(Arg);
+match_tag(Erules,Arg) ->
+    io_lib:format("~p",[encode_tag_val(Erules,Arg)]).
+
+match_tag_with_bitsyntax({Class,TagNo}) when integer(TagNo) ->
+    match_tag_with_bitsyntax1({asn1ct_gen_ber:decode_class(Class),
+				  0,TagNo});
+match_tag_with_bitsyntax({Class,TypeName}) ->
+    match_tag_with_bitsyntax1({asn1ct_gen_ber:decode_class(Class),
+				  0,asn1ct_gen_ber:decode_type(TypeName)}).
+
+match_tag_with_bitsyntax1({Class, _Form, TagNo}) when (TagNo =< 30) ->
+    io_lib:format("<<~p:2,_:1,~p:5,_/binary>>",[Class bsr 6,TagNo]);
+
+match_tag_with_bitsyntax1({Class, _Form, TagNo}) ->
+    {Octets,Len} = mk_object_val(TagNo),
+    OctForm = case Len of
+		 1 -> "~p";
+		 2 -> "~p,~p";
+		 3 -> "~p,~p,~p";
+		 4 -> "~p,~p,~p,~p"
+	     end,
+    io_lib:format("<<~p:2,_:1,31:5," ++ OctForm ++ ",_/binary>>",
+		  [Class bsr 6] ++ Octets).
+
+%%%%%%%%%%%
+%% mk_object_val(Value) -> {OctetList, Len}
+%% returns a Val as a list of octets, the 8 bit is allways set to one except
+%% for the last octet, where its 0
+%%
+
+
+mk_object_val(Val) when Val =< 127 ->
+    {[255 band Val], 1};
+mk_object_val(Val) ->
+    mk_object_val(Val bsr 7, [Val band 127], 1).
+mk_object_val(0, Ack, Len) ->
+    {Ack, Len};
+mk_object_val(Val, Ack, Len) ->
+    mk_object_val(Val bsr 7, [((Val band 127) bor 128) | Ack], Len + 1).
+
+
+get_all_choice_tags(ComponentTypeList) ->
+    get_all_choice_tags(ComponentTypeList,[]).
+
+get_all_choice_tags([],TagList) ->
+    TagList;
+get_all_choice_tags([H|T],TagList)  ->
+    Tags = H#'ComponentType'.tags,
+    get_all_choice_tags(T, TagList ++ [{H#'ComponentType'.name, Tags}]).
+
+
+
+%%---------------------------------------
+%% Generate the encode/decode code
+%%---------------------------------------
+
+gen_enc_line(Erules,TopType,Cname,
+	     Type=#type{constraint=[{componentrelation,_,_}],
+			def=#'ObjectClassFieldType'{type={typefield,_}}},
+	     Element,Indent,OptOrMand=mandatory,EncObj)
+  when list(Element) ->
+    asn1ct_name:new(tmpBytes),
+    gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,
+		 ["{",{curr,tmpBytes},",_} = "],EncObj);
+gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,EncObj)
+  when list(Element) ->
+    gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,
+		 ["{",{curr,encBytes},",",{curr,encLen},"} = "],EncObj).
+
+gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,Assign,EncObj)
+  when list(Element) ->
+    IndDeep = indent(Indent),
+
+    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
+	   || X <- Type#type.tag],
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    WhatKind = asn1ct_gen:type(InnerType),
+    emit(IndDeep),
+    emit(Assign),
+    gen_optormand_case(OptOrMand,Erules,TopType,Cname,Type,InnerType,WhatKind,
+		       Element),
+    case {Type,asn1ct_gen:get_constraint(Type#type.constraint,
+					 componentrelation)} of
+% 	#type{constraint=[{tableconstraint_info,RefedFieldName}],
+% 	      def={typefield,_}} ->
+	{#type{def=#'ObjectClassFieldType'{type={typefield,_},
+					   fieldname=RefedFieldName}},
+	 {componentrelation,_,_}} ->
+	    {_LeadingAttrName,Fun} = EncObj,
+	    case RefedFieldName of
+		{notype,T} ->
+		    throw({error,{notype,type_from_object,T}});
+		{Name,RestFieldNames} when atom(Name) ->
+		    case OptOrMand of
+			mandatory -> ok;
+			_ ->
+%			    emit(["{",{curr,tmpBytes},",",{curr,tmpLen},
+			    emit(["{",{curr,tmpBytes},", _} = "])
+%%			    asn1ct_name:new(tmpBytes),
+%%			    asn1ct_name:new(tmpLen)
+		    end,
+		    emit({Fun,"(",{asis,Name},", ",Element,", [], ",
+			  {asis,RestFieldNames},"),",nl}),
+		    emit(IndDeep),
+		    case OptOrMand of
+			mandatory ->
+			    emit({"{",{curr,encBytes},", ",{curr,encLen},"} = "}),
+			    emit({"?RT_BER:encode_open_type(",{curr,tmpBytes},
+				  ",",{asis,Tag},")"});
+			_ ->
+%			    emit({"{",{next,tmpBytes},", _} = "}),
+			    emit({"{",{next,tmpBytes},", ",{curr,tmpLen},
+				  "} = "}),
+			    emit({"?RT_BER:encode_open_type(",{curr,tmpBytes},
+				  ",",{asis,Tag},"),",nl}),
+			    emit(IndDeep),
+			    emit({"{",{next,tmpBytes},", ",{curr,tmpLen},"}"})
+		    end;
+		_ ->
+		    throw({asn1,{'internal error'}})
+	    end;
+% 	#type{constraint=[{tableconstraint_info,_}],
+% 	      def={objectfield,PrimFieldName1,PFNList}} ->
+	{{#'ObjectClassFieldType'{type={objectfield,PrimFieldName1,
+					PFNList}},_},
+	 {componentrelation,_,_}} ->
+	    %% this is when the dotted list in the FieldName has more
+	    %% than one element
+	    {_LeadingAttrName,Fun} = EncObj,
+	    emit({"?RT_BER:encode_open_type(",Fun,"(",{asis,PrimFieldName1},
+		  ", ",Element,", ",{asis,PFNList},"),",{asis,Tag},")"});
+	_ ->
+	    case WhatKind of
+		{primitive,bif} ->
+		    EncType =
+			case Type#type.def of
+			    #'ObjectClassFieldType'{
+					     type={fixedtypevaluefield,
+						   _,Btype}} ->
+				Btype;
+			    _ ->
+				Type
+			end,
+		    asn1ct_gen_ber:gen_encode_prim(ber,EncType,{asis,Tag},
+						   Element);
+		{notype,_} ->
+		    emit({"'enc_",InnerType,"'(",Element,", ",{asis,Tag},")"});
+		'ASN1_OPEN_TYPE' ->
+		    asn1ct_gen_ber:gen_encode_prim(ber,Type#type{def='ASN1_OPEN_TYPE'},{asis,Tag},Element);
+		_ ->
+		    {EncFunName, _, _} =
+			mkfuncname(TopType,Cname,WhatKind,enc),
+		    case {WhatKind,Type#type.tablecinf,EncObj} of
+			{{constructed,bif},[{objfun,_}|_R],{_,Fun}} ->
+			    emit([EncFunName,"(",Element,", ",{asis,Tag},
+				  ", ",Fun,")"]);
+			_ ->
+			    emit([EncFunName,"(",Element,", ",{asis,Tag},")"])
+		    end
+	    end
+    end,
+    case OptOrMand of
+	mandatory -> true;
+	_ ->
+	    emit({nl,indent(7),"end"})
+    end.
+
+
+
+gen_optormand_case(mandatory,_,_,_,_,_,_, _) ->
+    ok;
+gen_optormand_case('OPTIONAL',Erules,_,_,_,_,_,Element) ->
+    emit({" case ",Element," of",nl}),
+    emit({indent(9),"asn1_NOVALUE -> {",
+	  empty_lb(Erules),",0};",nl}),
+    emit({indent(9),"_ ->",nl,indent(12)});
+gen_optormand_case({'DEFAULT',DefaultValue},Erules,TopType,Cname,Type,
+		   InnerType,WhatKind,Element) ->
+    CurrMod = get(currmod),
+    case catch lists:member(der,get(encoding_options)) of
+	true ->
+	    emit(" case catch "),
+	    asn1ct_gen:gen_check_call(TopType,Cname,Type,InnerType,
+				      WhatKind,{asis,DefaultValue},
+				      Element),
+	    emit({" of",nl}),
+	    emit({indent(12),"true -> {[],0};",nl});
+	_ ->
+	    emit({" case ",Element," of",nl}),
+	    emit({indent(9),"asn1_DEFAULT -> {",
+		  empty_lb(Erules),
+		  ",0};",nl}),
+	    case DefaultValue of
+		#'Externalvaluereference'{module=CurrMod,
+					  value=V} ->
+		    emit({indent(9),"?",{asis,V}," -> {",
+			  empty_lb(Erules),",0};",nl});
+		_ ->
+		    emit({indent(9),{asis,
+				     DefaultValue}," -> {",
+			  empty_lb(Erules),",0};",nl})
+	    end
+    end,
+    emit({indent(9),"_ ->",nl,indent(12)}).
+
+
+
+
+gen_dec_line_sof(_Erules,TopType,Cname,Type,ObjFun) ->
+
+    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
+	   || X <- Type#type.tag],
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    WhatKind = asn1ct_gen:type(InnerType),
+    case WhatKind of
+	{primitive,bif} ->
+	    asn1ct_name:delete(len),
+
+	    asn1ct_name:new(len),
+	    emit(["fun(FBytes,_,_)->",nl]),
+	    EncType = case Type#type.def of
+			    #'ObjectClassFieldType'{
+					     type={fixedtypevaluefield,
+						   _,Btype}} ->
+				Btype;
+			    _ ->
+				Type
+		      end,
+	    asn1ct_gen_ber:gen_dec_prim(ber,EncType,"FBytes",Tag,
+					[],no_length,?PRIMITIVE,
+					mandatory),
+	    emit([nl,"end, []"]);
+	_ ->
+	    case ObjFun of
+		[] ->
+		    {DecFunName, _, _} =
+			mkfunname(TopType,Cname,WhatKind,dec,3),
+		    emit([DecFunName,", ",{asis,Tag}]);
+		_ ->
+		    {DecFunName, _, _} =
+			mkfunname(TopType,Cname,WhatKind,dec,4),
+		    emit([DecFunName,", ",{asis,Tag},", ObjFun"])
+	    end
+    end.
+
+
+gen_dec_line(Erules,TopType,Cname,CTags,Type,OptOrMand,DecObjInf)  ->
+    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
+	   || X <- Type#type.tag],
+    InnerType =
+	case Type#type.def of
+	    #'ObjectClassFieldType'{type=OCFTType} ->
+		OCFTType;
+	    _ ->
+		asn1ct_gen:get_inner(Type#type.def)
+	end,
+    PostpDec =
+	case OptOrMand of
+	    mandatory ->
+		gen_dec_call(InnerType,Erules,TopType,Cname,Type,
+			     BytesVar,Tag,mandatory,", mandatory, ",
+			     DecObjInf,OptOrMand);
+	    _ -> %optional or default
+		case {CTags,Erules} of
+		    {[CTag],ber_bin} ->
+			emit(["case ",{curr,bytes}," of",nl]),
+			emit([match_tag(Erules,CTag)," ->",nl]),
+			PostponedDec =
+			    gen_dec_call(InnerType,Erules,TopType,Cname,Type,
+					 BytesVar,Tag,mandatory,
+					 ", opt_or_default, ",DecObjInf,
+					 OptOrMand),
+			emit([";",nl]),
+			emit(["_ ->",nl]),
+			case OptOrMand of
+			    {'DEFAULT', Def} ->
+				emit(["{",{asis,Def},",",
+				      BytesVar,", 0 }",nl]);
+			    'OPTIONAL' ->
+				emit(["{ asn1_NOVALUE, ",
+				      BytesVar,", 0 }",nl])
+			end,
+			emit("end"),
+			PostponedDec;
+		    _ ->
+			emit("case (catch "),
+			PostponedDec =
+			    gen_dec_call(InnerType,Erules,TopType,Cname,Type,
+					 BytesVar,Tag,OptOrMand,
+					 ", opt_or_default, ",DecObjInf,
+					 OptOrMand),
+			emit([") of",nl]),
+			case OptOrMand of
+			    {'DEFAULT', Def} ->
+				emit(["{'EXIT',{error,{asn1,{no_optional_tag,_}}}}",
+				      " -> {",{asis,Def},",",
+				      BytesVar,", 0 };",nl]);
+			    'OPTIONAL' ->
+				emit(["{'EXIT',{error,{asn1,{no_optional_tag,_}}}}",
+				      " -> { asn1_NOVALUE, ",
+				      BytesVar,", 0 };",nl])
+			end,
+			asn1ct_name:new(casetmp),
+			emit([{curr,casetmp},"-> ",{curr,casetmp},nl,"end"]),
+			PostponedDec
+		end
+	end,
+    case DecObjInf of
+	{Cname,ObjSet} -> % this must be the component were an object is
+	    %% choosen from the object set according to the table
+	    %% constraint.
+	    {[{ObjSet,Cname,asn1ct_gen:mk_var(asn1ct_name:curr(term))}],
+	     PostpDec};
+	_  -> {[],PostpDec}
+    end.
+
+
+gen_dec_call({typefield,_},Erules,_,_,Type,_,Tag,_,_,false,_) ->
+    %%  this in case of a choice with typefield components
+    asn1ct_name:new(reason),
+    {FirstPFName,RestPFName} =
+% 	asn1ct_gen:get_constraint(Type#type.constraint,
+% 				  tableconstraint_info),
+	(Type#type.def)#'ObjectClassFieldType'.fieldname,
+    emit([nl,indent(6),"begin",nl]),
+    emit([indent(9),"{OpenDec,TmpRest,TmpRbCho} =",nl,indent(12),
+	  "?RT_BER:decode_open_type(",Erules,",",{curr,bytes},",",
+	  {asis,Tag},"),",nl]),
+    emit([indent(9),"case (catch ObjFun(",{asis,FirstPFName},
+	  ", OpenDec, [], ",{asis,RestPFName},
+	  ")) of", nl]),%% ??? What about Tag
+    emit([indent(12),"{'EXIT',",{curr,reason},"} ->",nl]),
+%%    emit({indent(15),"throw({runtime_error,{'Type not ",
+%%	  "compatible with tableconstraint', OpenDec}});",nl}),
+    emit([indent(15),"exit({'Type not ",
+	  "compatible with table constraint', ",{curr,reason},"});",nl]),
+    emit([indent(12),"{TmpDec,_ ,_} ->",nl]),
+    emit([indent(15),"{TmpDec, TmpRest, TmpRbCho}",nl]),
+    emit([indent(9),"end",nl,indent(6),"end",nl]),
+    [];
+gen_dec_call({typefield,_},_Erules,_,Cname,Type,_BytesVar,Tag,_,_,
+	     _DecObjInf,OptOrMandComp) ->
+    emit(["?RT_BER:decode_open_type(",{curr,bytes},",",{asis,Tag},")"]),
+    RefedFieldName =
+	(Type#type.def)#'ObjectClassFieldType'.fieldname,
+% 	asn1ct_gen:get_constraint(Type#type.constraint,
+% 				  tableconstraint_info),
+    [{Cname,RefedFieldName,
+      asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+%      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),[],OptOrMandComp}];
+      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
+gen_dec_call({objectfield,PrimFieldName,PFNList},_Erules,_,Cname,_,_,Tag,_,_,_,
+	     OptOrMandComp) ->
+    emit(["?RT_BER:decode_open_type(",{curr,bytes},",",{asis,Tag},")"]),
+    [{Cname,{PrimFieldName,PFNList},
+      asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+%      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),[],OptOrMandComp}];
+      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
+gen_dec_call(InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,PrimOptOrMand,
+	     OptOrMand,DecObjInf,_) ->
+    WhatKind = asn1ct_gen:type(InnerType),
+    gen_dec_call1(WhatKind,InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,
+		  PrimOptOrMand,OptOrMand),
+    case DecObjInf of
+	{Cname,{_,OSet,UniqueFName,ValIndex}} ->
+	    Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+	    ValueMatch = value_match(ValIndex,Term),
+	    emit({",",nl,"ObjFun = 'getdec_",OSet,"'(",
+%		  {asis,UniqueFName},", ",{curr,term},")"});
+		  {asis,UniqueFName},", ",ValueMatch,")"});
+	_ ->
+	    ok
+    end,
+    [].
+gen_dec_call1({primitive,bif},InnerType,Erules,_,_,Type,BytesVar,
+	      Tag,OptOrMand,_) ->
+    case InnerType of
+	{fixedtypevaluefield,_,Btype} ->
+	    asn1ct_gen_ber:gen_dec_prim(Erules,Btype,BytesVar,Tag,[],no_length,
+					?PRIMITIVE,OptOrMand);
+	_ ->
+	    asn1ct_gen_ber:gen_dec_prim(Erules,Type,BytesVar,Tag,[],no_length,
+					?PRIMITIVE,OptOrMand)
+    end;
+gen_dec_call1('ASN1_OPEN_TYPE',_InnerType,Erules,_,_,Type,BytesVar,
+	      Tag,OptOrMand,_) ->
+    asn1ct_gen_ber:gen_dec_prim(Erules,Type#type{def='ASN1_OPEN_TYPE'},
+				BytesVar,Tag,[],no_length,
+				?PRIMITIVE,OptOrMand);
+gen_dec_call1(WhatKind,_,_Erules,TopType,Cname,Type,_,Tag,_,OptOrMand) ->
+    {DecFunName,_,_} =
+	mkfuncname(TopType,Cname,WhatKind,dec),
+    case {WhatKind,Type#type.tablecinf} of
+	{{constructed,bif},[{objfun,_}|_R]} ->
+	    emit({DecFunName,"(",{curr,bytes},OptOrMand,{asis,Tag},", ObjFun)"});
+	_ ->
+	    emit({DecFunName,"(",{curr,bytes},OptOrMand,{asis,Tag},")"})
+    end.
+
+
+%%------------------------------------------------------
+%% General and special help functions (not exported)
+%%------------------------------------------------------
+
+
+indent(N) ->
+    lists:duplicate(N,32). % 32 = space
+
+
+mkvlist([H,T1|T], Sep) -> % Sep is a string e.g ", " or "+ "
+    emit([{var,H},Sep]),
+    mkvlist([T1|T], Sep);
+mkvlist([H|T], Sep) ->
+    emit([{var,H}]),
+    mkvlist(T, Sep);
+mkvlist([], _) ->
+    true.
+
+mkvlist(L) ->
+    mkvlist(L,", ").
+
+mkvplus(L) ->
+    mkvlist(L," + ").
+
+extensible(CompList) when list(CompList) ->
+    noext;
+extensible({RootList,ExtList}) ->
+    {ext,length(RootList)+1,length(ExtList)}.
+
+
+print_attribute_comment(InnerType,Pos,Prop) ->
+    CommentLine = "%%-------------------------------------------------",
+    emit([nl,CommentLine]),
+    case InnerType of
+	{typereference,_,Name} ->
+	    emit([nl,"%% attribute number ",Pos," with type ",Name]);
+	{'Externaltypereference',_,XModule,Name} ->
+	    emit([nl,"%% attribute number ",Pos,"   External ",XModule,":",Name]);
+	_ ->
+	    emit([nl,"%% attribute number ",Pos," with type ",InnerType])
+    end,
+    case Prop of
+	mandatory ->
+	    continue;
+	{'DEFAULT', Def} ->
+	    emit([" DEFAULT = ",{asis,Def}]);
+	'OPTIONAL' ->
+	    emit([" OPTIONAL"])
+    end,
+    emit([nl,CommentLine,nl]).
+
+
+mkfuncname(TopType,Cname,WhatKind,DecOrEnc) ->
+    CurrMod = get(currmod),
+    case WhatKind of
+	#'Externaltypereference'{module=CurrMod,type=EType} ->
+	    F = lists:concat(["'",DecOrEnc,"_",EType,"'"]),
+	    {F, "?MODULE", F};
+	#'Externaltypereference'{module=Mod,type=EType} ->
+	    {lists:concat(["'",Mod,"':'",DecOrEnc,"_",EType,"'"]),Mod,
+	     lists:concat(["'",DecOrEnc,"_",EType,"'"])};
+	{constructed,bif} ->
+	    F = lists:concat(["'",DecOrEnc,"_",asn1ct_gen:list2name([Cname|TopType]),"'"]),
+	    {F, "?MODULE", F}
+    end.
+
+mkfunname(TopType,Cname,WhatKind,DecOrEnc,Arity) ->
+    CurrMod = get(currmod),
+    case WhatKind of
+	#'Externaltypereference'{module=CurrMod,type=EType} ->
+	    F = lists:concat(["fun '",DecOrEnc,"_",EType,"'/",Arity]),
+	    {F, "?MODULE", F};
+	#'Externaltypereference'{module=Mod,type=EType} ->
+	    {lists:concat(["{'",Mod,"','",DecOrEnc,"_",EType,"'}"]),Mod,
+	     lists:concat(["'",DecOrEnc,"_",EType,"'"])};
+	{constructed,bif} ->
+	    F =
+		lists:concat(["fun '",DecOrEnc,"_",
+			      asn1ct_gen:list2name([Cname|TopType]),"'/",
+			      Arity]),
+	    {F, "?MODULE", F}
+    end.
+
+empty_lb(ber) ->
+    "[]";
+empty_lb(ber_bin) ->
+    "<<>>".
+
+rtmod(ber) ->
+    list_to_atom(?RT_BER);
+rtmod(ber_bin) ->
+    list_to_atom(?RT_BER_BIN).
+
+indefend_match(ber,used_var) ->
+    "[0,0|R]";
+indefend_match(ber,unused_var) ->
+    "[0,0|_R]";
+indefend_match(ber_bin,used_var) ->
+    "<<0,0,R/binary>>";
+indefend_match(ber_bin,unused_var) ->
+    "<<0,0,_R/binary>>".
+
+notice_value_match() ->
+    Module = get(currmod),
+    put(value_match,{true,Module}).
+
+value_match(Index,Value) when atom(Value) ->
+    value_match(Index,atom_to_list(Value));
+value_match([],Value) ->
+    Value;
+value_match([{VI,_Cname}|VIs],Value) ->
+    value_match1(Value,VIs,lists:concat(["element(",VI,","]),1).
+value_match1(Value,[],Acc,Depth) ->
+    Acc ++ Value ++ lists:concat(lists:duplicate(Depth,")"));
+value_match1(Value,[{VI,_Cname}|VIs],Acc,Depth) ->
+    value_match1(Value,VIs,Acc++lists:concat(["element(",VI,","]),Depth+1).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_constructed_ber_bin_v2.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_constructed_ber_bin_v2.erl
new file mode 100644
index 0000000000..991240731e
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_constructed_ber_bin_v2.erl
@@ -0,0 +1,1357 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_constructed_ber_bin_v2.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
+%%
+-module(asn1ct_constructed_ber_bin_v2).
+
+-export([gen_encode_sequence/3]).
+-export([gen_decode_sequence/3]).
+-export([gen_encode_set/3]).
+-export([gen_decode_set/3]).
+-export([gen_encode_sof/4]).
+-export([gen_decode_sof/4]).
+-export([gen_encode_choice/3]).
+-export([gen_decode_choice/3]).
+
+
+-include("asn1_records.hrl").
+
+-import(asn1ct_gen, [emit/1,demit/1]).
+-import(asn1ct_constructed_ber,[match_tag/2]).
+
+-define(ASN1CT_GEN_BER,asn1ct_gen_ber_bin_v2).
+
+% the encoding of class of tag bits 8 and 7
+-define(UNIVERSAL,   0).
+-define(APPLICATION, 16#40).
+-define(CONTEXT,     16#80).
+-define(PRIVATE,     16#C0).
+
+% primitive or constructed encoding % bit 6
+-define(PRIMITIVE,   0).
+-define(CONSTRUCTED, 2#00100000).
+
+
+
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%%  Encode/decode SEQUENCE (and SET)
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+gen_encode_sequence(Erules,Typename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    asn1ct_name:new(term),
+    asn1ct_name:new(bytes),
+
+    %% if EXTERNAL type the input value must be transformed to
+    %% ASN1 1990 format
+    ValName =
+	case Typename of
+	    ['EXTERNAL'] ->
+		emit([indent(4),
+		      "NewVal = asn1rt_check:transform_to_EXTERNAL1990(Val),",
+		      nl]),
+		"NewVal";
+	    _ ->
+	    "Val"
+	end,
+
+    {SeqOrSet,TableConsInfo,CompList} =
+	case D#type.def of
+	    #'SEQUENCE'{tablecinf=TCI,components=CL} ->
+		{'SEQUENCE',TCI,CL};
+	    #'SET'{tablecinf=TCI,components=CL} ->
+		{'SET',TCI,CL}
+	end,
+    Ext = extensible(CompList),
+    CompList1 = case CompList of
+		    {Rl,El} -> Rl ++ El;
+		    _ -> CompList
+		end,
+
+%% don't match recordname for now, because of compatibility reasons
+%%    emit(["{'",asn1ct_gen:list2rname(Typename),"'"]),
+    emit(["{_"]),
+    case length(CompList1) of
+	0 ->
+	    true;
+	CompListLen ->
+	    emit([","]),
+	    mkcindexlist([Tc || Tc <- lists:seq(1,CompListLen)])
+    end,
+    emit(["} = ",ValName,",",nl]),
+    EncObj =
+	case TableConsInfo of
+	    #simpletableattributes{usedclassfield=Used,
+				   uniqueclassfield=Unique} when Used /= Unique ->
+		false;
+	    %% ObjectSet, name of the object set in constraints
+	    %%
+	    #simpletableattributes{objectsetname=ObjectSet,
+				   c_name=AttrN,
+				   c_index=N,
+				   usedclassfield=UniqueFieldName,
+				   uniqueclassfield=UniqueFieldName,
+				   valueindex=ValueIndex} -> %% N is index of attribute that determines constraint
+		OSDef =
+		    case ObjectSet of
+			{Module,OSName} ->
+			    asn1_db:dbget(Module,OSName);
+			OSName ->
+			    asn1_db:dbget(get(currmod),OSName)
+		    end,
+%		io:format("currmod: ~p~nOSName: ~p~nAttrN: ~p~nN: ~p~nUniqueFieldName: ~p~n",
+%			  [get(currmod),OSName,AttrN,N,UniqueFieldName]),
+		case (OSDef#typedef.typespec)#'ObjectSet'.gen of
+		    true ->
+			ObjectEncode =
+			    asn1ct_gen:un_hyphen_var(lists:concat(['Obj',
+								   AttrN])),
+			emit([ObjectEncode," = ",nl]),
+			emit(["   'getenc_",ObjectSet,"'(",{asis,UniqueFieldName},
+			      ", ",nl]),
+			ValueMatch = value_match(ValueIndex,
+						 lists:concat(["Cindex",N])),
+			emit([indent(35),ValueMatch,"),",nl]),
+			{AttrN,ObjectEncode};
+		    _ ->
+			false
+		end;
+	    _ ->
+		case D#type.tablecinf of
+		    [{objfun,_}|_] ->
+			%% when the simpletableattributes was at an outer
+			%% level and the objfun has been passed through the
+			%% function call
+			{"got objfun through args","ObjFun"};
+		    _ ->
+			false
+		end
+	end,
+
+    gen_enc_sequence_call(Erules,Typename,CompList1,1,Ext,EncObj),
+
+    emit([nl,"   BytesSoFar = "]),
+    case SeqOrSet of
+	'SET' when (D#type.def)#'SET'.sorted == dynamic ->
+	    emit("?RT_BER:dynamicsort_SET_components(["),
+	    mkvlist(asn1ct_name:all(encBytes)),
+	    emit(["]),",nl]);
+	_ ->
+	    emit("["),
+	    mkvlist(asn1ct_name:all(encBytes)),
+	    emit(["],",nl])
+    end,
+    emit("LenSoFar = "),
+    case asn1ct_name:all(encLen) of
+	[] -> emit("0");
+	AllLengths ->
+	    mkvplus(AllLengths)
+    end,
+    emit([",",nl]),
+    emit(["?RT_BER:encode_tags(TagIn, BytesSoFar, LenSoFar)."
+	  ,nl]).
+
+gen_decode_sequence(Erules,Typename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    asn1ct_name:new(tag),
+    #'SEQUENCE'{tablecinf=TableConsInfo,components=CList} = D#type.def,
+    Ext = extensible(CList),
+    CompList = case CList of
+		   {Rl,El}  -> Rl ++ El;
+		   _ -> CList
+	       end,
+
+    emit(["   %%-------------------------------------------------",nl]),
+    emit(["   %% decode tag and length ",nl]),
+    emit(["   %%-------------------------------------------------",nl]),
+
+    asn1ct_name:new(tlv),
+    case CompList of
+	EmptyCL when EmptyCL == [];EmptyCL == {[],[]}-> % empty sequence
+	    true;
+	_ ->
+	    emit([{curr,tlv}," = "])
+    end,
+    emit(["?RT_BER:match_tags(",{prev,tlv},",TagIn), ",nl]),
+    asn1ct_name:new(tlv),
+    asn1ct_name:new(v),
+
+    {DecObjInf,UniqueFName,ValueIndex} =
+	case TableConsInfo of
+	    #simpletableattributes{objectsetname=ObjectSet,
+				   c_name=AttrN,
+				   usedclassfield=UniqueFieldName,
+				   uniqueclassfield=UniqueFieldName,
+				   valueindex=ValIndex} ->
+%	    {ObjectSet,AttrN,_N,UniqueFieldName} ->%% N is index of attribute that determines constraint
+		F = fun(#'ComponentType'{typespec=CT})->
+			    case {CT#type.constraint,CT#type.tablecinf} of
+				{[],[{objfun,_}|_]} -> true;
+				_ -> false
+			    end
+		    end,
+		case lists:any(F,CompList) of
+		    true -> % when component relation constraint establish
+			%% relation from a component to another components
+			%% subtype component
+			{{AttrN,{deep,ObjectSet,UniqueFieldName,ValIndex}},
+			 UniqueFieldName,ValIndex};
+		    false ->
+			{{AttrN,ObjectSet},UniqueFieldName,ValIndex}
+		end;
+	    _ ->
+% 		case D#type.tablecinf of
+% 		    [{objfun,_}|_] ->
+% 			{{"got objfun through args","ObjFun"},false,false};
+% 		    _ ->
+		{false,false,false}
+%	end
+	end,
+    case gen_dec_sequence_call(Erules,Typename,CompList,Ext,DecObjInf) of
+	no_terms -> % an empty sequence
+	    emit([nl,nl]),
+	    demit(["Result = "]), %dbg
+	    %% return value as record
+	    asn1ct_name:new(rb),
+	    emit(["   {'",asn1ct_gen:list2rname(Typename),"'}.",nl,nl]);
+	{LeadingAttrTerm,PostponedDecArgs} ->
+	    emit([com,nl,nl]),
+	    case {LeadingAttrTerm,PostponedDecArgs} of
+		{[],[]} ->
+		    ok;
+		{_,[]} ->
+		    ok;
+		{[{ObjSet,LeadingAttr,Term}],PostponedDecArgs} ->
+		    DecObj = asn1ct_gen:un_hyphen_var(lists:concat(['DecObj',LeadingAttr,Term])),
+		    ValueMatch = value_match(ValueIndex,Term),
+		    emit([DecObj," =",nl,"   'getdec_",ObjSet,"'(",
+			  {asis,UniqueFName},", ",ValueMatch,"),",nl]),
+		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
+	    end,
+	    demit(["Result = "]), %dbg
+	    %% return value as record
+	    case Ext of
+		{ext,_,_} ->
+		    emit(["case ",{prev,tlv}," of [] -> true; _ -> true end, % ... extra fields skipped",nl]);
+		noext ->
+		    emit(["case ",{prev,tlv}," of",nl,
+			  "[] -> true;",
+			  "_ -> exit({error,{asn1, {unexpected,",{prev,tlv},
+			  "}}}) % extra fields not allowed",nl,
+			  "end,",nl])
+	    end,
+	    asn1ct_name:new(rb),
+	    case Typename of
+		['EXTERNAL'] ->
+		    emit(["   OldFormat={'",asn1ct_gen:list2rname(Typename),
+			  "', "]),
+		    mkvlist(asn1ct_name:all(term)),
+		    emit(["},",nl]),
+		    emit(["    asn1rt_check:transform_to_EXTERNAL1994",
+			  "(OldFormat).",nl]);
+		_ ->
+		    emit(["   {'",asn1ct_gen:list2rname(Typename),"', "]),
+		    mkvlist(asn1ct_name:all(term)),
+		    emit(["}.",nl,nl])
+	    end
+    end.
+
+gen_dec_postponed_decs(_,[]) ->
+    emit(nl);
+gen_dec_postponed_decs(DecObj,[{_Cname,{FirstPFN,PFNList},Term,
+				TmpTerm,_Tag,OptOrMand}|Rest]) ->
+
+    asn1ct_name:new(tmpterm),
+    asn1ct_name:new(reason),
+    asn1ct_name:new(tmptlv),
+
+    emit([Term," = ",nl]),
+    N = case OptOrMand of
+	    mandatory -> 0;
+	    'OPTIONAL' ->
+		emit_opt_or_mand_check(asn1_NOVALUE,TmpTerm),
+		6;
+	    {'DEFAULT',Val} ->
+		emit_opt_or_mand_check(Val,TmpTerm),
+		6
+	end,
+    emit([indent(N+3),"case (catch ",DecObj,"(",{asis,FirstPFN},
+	  ", ",TmpTerm,", ",{asis,PFNList},")) of",nl]),
+    emit([indent(N+6),"{'EXIT', ",{curr,reason},"} ->",nl]),
+    emit([indent(N+9),"exit({'Type not compatible with table constraint',",
+	  {curr,reason},"});",nl]),
+    emit([indent(N+6),{curr,tmpterm}," ->",nl]),
+    emit([indent(N+9),{curr,tmpterm},nl]),
+
+    case OptOrMand of
+	mandatory -> emit([indent(N+3),"end,",nl]);
+	_ ->
+	    emit([indent(N+3),"end",nl,
+		  indent(3),"end,",nl])
+    end,
+    gen_dec_postponed_decs(DecObj,Rest).
+
+emit_opt_or_mand_check(Value,TmpTerm) ->
+    emit([indent(3),"case ",TmpTerm," of",nl,
+	  indent(6),{asis,Value}," ->",{asis,Value},";",nl,
+	  indent(6),"_ ->",nl]).
+
+%%============================================================================
+%%  Encode/decode SET
+%%
+%%============================================================================
+
+gen_encode_set(Erules,Typename,D) when record(D,type) ->
+    gen_encode_sequence(Erules,Typename,D).
+
+gen_decode_set(Erules,Typename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    asn1ct_name:new(term),
+    asn1ct_name:new(tag),
+    #'SET'{tablecinf=TableConsInfo,components=TCompList} = D#type.def,
+    Ext = extensible(TCompList),
+    CompList = case TCompList of
+		   {Rl,El} -> Rl ++ El;
+		   _ -> TCompList
+	       end,
+
+    asn1ct_name:clear(),
+    asn1ct_name:new(tlv),
+    case CompList of
+	EmptyCL when EmptyCL == [];EmptyCL == {[],[]}-> % empty sequence
+	    true;
+	_ ->
+	    emit([{curr,tlv}," = "])
+    end,
+    emit(["?RT_BER:match_tags(",{prev,tlv},",TagIn), ",nl]),
+    asn1ct_name:new(v),
+
+
+    {DecObjInf,UniqueFName} =
+	case TableConsInfo of
+	    {ObjectSet,AttrN,_N,UniqueFieldName} ->%% N is index of attribute that determines constraint
+		F = fun(#'ComponentType'{typespec=CT})->
+			    case {CT#type.constraint,CT#type.tablecinf} of
+				{[],[{objfun,_}|_]} -> true;
+				_ -> false
+			    end
+		    end,
+		case lists:any(F,CompList) of
+		    true -> % when component relation constraint establish
+			%% relation from a component to another components
+			%% subtype component
+			{{AttrN,{deep,ObjectSet,UniqueFieldName}},
+			 UniqueFieldName};
+		    false ->
+			{{AttrN,ObjectSet},UniqueFieldName}
+		end;
+	    _ ->
+		{false,false}
+	end,
+
+    case CompList of
+	[] -> % empty set
+	    true;
+	_ ->
+	    emit(["SetFun = fun(FunTlv) ->", nl]),
+	    emit(["case FunTlv of ",nl]),
+	    NextNum = gen_dec_set_cases(Erules,Typename,CompList,1),
+	    emit([indent(6), {curr,else}," -> ",nl,
+		  indent(9),"{",NextNum,", ",{curr,else},"}",nl]),
+	    emit([indent(3),"end",nl]),
+	    emit([indent(3),"end,",nl]),
+
+	    emit(["PositionList = [SetFun(TempTlv)|| TempTlv <- ",{curr,tlv},"],",nl]),
+	    asn1ct_name:new(tlv),
+	    emit([{curr,tlv}," = [Stlv || {_,Stlv} <- lists:sort(PositionList)],",nl]),
+	    asn1ct_name:new(tlv)
+
+    end,
+    case gen_dec_sequence_call(Erules,Typename,CompList,Ext,DecObjInf) of
+	no_terms -> % an empty sequence
+	    emit([nl,nl]),
+	    demit(["Result = "]), %dbg
+	    %% return value as record
+	    emit(["   {'",asn1ct_gen:list2rname(Typename),"'}.",nl]);
+	{LeadingAttrTerm,PostponedDecArgs} ->
+	    emit([com,nl,nl]),
+	    case {LeadingAttrTerm,PostponedDecArgs} of
+		{[],[]} ->
+		    ok;
+		{_,[]} ->
+		    ok;
+		{[{ObjSet,LeadingAttr,Term}],PostponedDecArgs} ->
+		    DecObj = lists:concat(['DecObj',LeadingAttr,Term]),
+		    emit([DecObj," =",nl,"   'getdec_",ObjSet,"'(",
+			  {asis,UniqueFName},", ",Term,"),",nl]),
+		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
+	    end,
+	    demit(["Result = "]), %dbg
+	    %% return value as record
+	    case Ext of
+		{ext,_,_} ->
+		    emit(["case ",{prev,tlv}," of [] -> true; _ -> true end, % ... extra fields skipped",nl]);
+		noext ->
+		    emit(["case ",{prev,tlv}," of",nl,
+			  "[] -> true;",
+			  "_ -> exit({error,{asn1, {unexpected,",{prev,tlv},
+			  "}}}) % extra fields not allowed",nl,
+			  "end,",nl])
+	    end,
+	    emit(["   {'",asn1ct_gen:list2rname(Typename),"', "]),
+	    mkvlist(asn1ct_name:all(term)),
+	    emit(["}.",nl])
+    end.
+
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%%  Encode/decode SEQUENCE OF and SET OF
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+gen_encode_sof(Erules,Typename,_InnerTypename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    {SeqOrSetOf, Cont} = D#type.def,
+
+    Objfun = case D#type.tablecinf of
+		 [{objfun,_}|_R] ->
+		     ", ObjFun";
+		 _ ->
+		     ""
+	     end,
+
+    emit(["   {EncBytes,EncLen} = 'enc_",asn1ct_gen:list2name(Typename),
+	  "_components'(Val",Objfun,",[],0),",nl]),
+
+    emit(["   ?RT_BER:encode_tags(TagIn, EncBytes, EncLen).",nl,nl]),
+
+    gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont).
+
+
+gen_decode_sof(Erules,TypeName,_InnerTypeName,D) when record(D,type) ->
+    asn1ct_name:start(),
+    {SeqOrSetOf, _TypeTag, Cont} =
+	case D#type.def of
+	    {'SET OF',_Cont} -> {'SET OF','SET',_Cont};
+	    {'SEQUENCE OF',_Cont} -> {'SEQUENCE OF','SEQUENCE',_Cont}
+	end,
+    TypeNameSuffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,Cont#type.def),
+
+    emit(["   %%-------------------------------------------------",nl]),
+    emit(["   %% decode tag and length ",nl]),
+    emit(["   %%-------------------------------------------------",nl]),
+
+    asn1ct_name:new(tlv),
+    emit([{curr,tlv},
+	  " = ?RT_BER:match_tags(",{prev,tlv},",TagIn), ",nl]),
+    asn1ct_name:new(v),
+
+    emit(["["]),
+
+    InnerType = asn1ct_gen:get_inner(Cont#type.def),
+    ContName = case asn1ct_gen:type(InnerType) of
+		   Atom when atom(Atom) -> Atom;
+		   _ -> TypeNameSuffix
+	       end,
+%% fix me
+    ObjFun =
+	case D#type.tablecinf of
+	    [{objfun,_}|_R] ->
+		", ObjFun";
+	    _ ->
+		[]
+	end,
+    gen_dec_line(Erules,TypeName,ContName,[],Cont,mandatory,ObjFun),
+    %%    gen_dec_line_sof(Erules,Typename,ContName,Cont,ObjFun),
+    emit([" || ",{curr,v}," <- ",{curr,tlv},"].",nl,nl,nl]).
+
+
+gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont)
+  when record(Cont,type)->
+
+    {Objfun,Objfun_novar,EncObj} =
+	case Cont#type.tablecinf of
+	    [{objfun,_}|_R] ->
+		{", ObjFun",", _",{no_attr,"ObjFun"}};
+	    _ ->
+		{"","",false}
+	end,
+    emit(["'enc_",asn1ct_gen:list2name(Typename),
+	  "_components'([]",Objfun_novar,", AccBytes, AccLen) -> ",nl]),
+
+    case catch lists:member(der,get(encoding_options)) of
+	true ->
+	    emit([indent(3),
+		  "{?RT_BER:dynamicsort_SETOF(AccBytes),AccLen};",nl,nl]);
+	_ ->
+	    emit([indent(3),"{lists:reverse(AccBytes),AccLen};",nl,nl])
+    end,
+    emit(["'enc_",asn1ct_gen:list2name(Typename),
+	  "_components'([H|T]",Objfun,",AccBytes, AccLen) ->",nl]),
+    TypeNameSuffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,Cont#type.def),
+    gen_enc_line(Erules,Typename,TypeNameSuffix,Cont,"H",3,
+		 mandatory,"{EncBytes,EncLen} = ",EncObj),
+    emit([",",nl]),
+    emit([indent(3),"'enc_",asn1ct_gen:list2name(Typename),
+	  "_components'(T",Objfun,","]),
+    emit(["[EncBytes|AccBytes], AccLen + EncLen).",nl,nl]).
+
+%%============================================================================
+%%  Encode/decode CHOICE
+%%
+%%============================================================================
+
+gen_encode_choice(Erules,Typename,D) when record(D,type) ->
+    ChoiceTag = D#type.tag,
+    {'CHOICE',CompList} = D#type.def,
+    Ext = extensible(CompList),
+    CompList1 = case CompList of
+		    {Rl,El} -> Rl ++ El;
+		    _ -> CompList
+		end,
+    gen_enc_choice(Erules,Typename,ChoiceTag,CompList1,Ext),
+    emit([nl,nl]).
+
+gen_decode_choice(Erules,Typename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    asn1ct_name:new(bytes),
+    ChoiceTag = D#type.tag,
+    {'CHOICE',CompList} = D#type.def,
+    Ext = extensible(CompList),
+    CompList1 = case CompList of
+		    {Rl,El} -> Rl ++ El;
+		    _ -> CompList
+		end,
+    gen_dec_choice(Erules,Typename,ChoiceTag,CompList1,Ext),
+    emit([".",nl]).
+
+
+%%============================================================================
+%%  Encode SEQUENCE
+%%
+%%============================================================================
+
+gen_enc_sequence_call(Erules,TopType,[#'ComponentType'{name=Cname,typespec=Type,prop=Prop}|Rest],Pos,Ext,EncObj) ->
+    asn1ct_name:new(encBytes),
+    asn1ct_name:new(encLen),
+    Element =
+	case TopType of
+	    ['EXTERNAL'] ->
+		io_lib:format("Cindex~w",[Pos]);
+	    _ ->
+		io_lib:format("Cindex~w",[Pos])
+	end,
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    print_attribute_comment(InnerType,Pos,Cname,Prop),
+    gen_enc_line(Erules,TopType,Cname,Type,Element,3,Prop,EncObj),
+    emit([com,nl]),
+    gen_enc_sequence_call(Erules,TopType,Rest,Pos+1,Ext,EncObj);
+
+gen_enc_sequence_call(_Erules,_TopType,[],_Num,_,_) ->
+	true.
+
+%%============================================================================
+%%  Decode SEQUENCE
+%%
+%%============================================================================
+
+gen_dec_sequence_call(Erules,TopType,CompList,Ext,DecObjInf) ->
+    gen_dec_sequence_call1(Erules,TopType, CompList, 1, Ext,DecObjInf,[],[]).
+
+
+gen_dec_sequence_call1(Erules,TopType,[#'ComponentType'{name=Cname,typespec=Type,prop=Prop,tags=Tags}|Rest],Num,Ext,DecObjInf,LeadingAttrAcc,ArgsAcc) ->
+    {LA,PostponedDec} =
+	gen_dec_component(Erules,TopType,Cname,Tags,Type,Num,Prop,
+			  Ext,DecObjInf),
+    case Rest of
+	[] ->
+	    {LA ++ LeadingAttrAcc,PostponedDec ++ ArgsAcc};
+	_ ->
+	    emit([com,nl]),
+	    asn1ct_name:new(bytes),
+	    gen_dec_sequence_call1(Erules,TopType,Rest,Num+1,Ext,DecObjInf,
+				   LA++LeadingAttrAcc,PostponedDec++ArgsAcc)
+    end;
+
+gen_dec_sequence_call1(_Erules,_TopType,[],1,_,_,_,_) ->
+    no_terms.
+
+
+%%----------------------------
+%%SEQUENCE mandatory
+%%----------------------------
+
+gen_dec_component(Erules,TopType,Cname,CTags,Type,Pos,Prop,Ext,DecObjInf) ->
+    InnerType =
+	case Type#type.def of
+	    #'ObjectClassFieldType'{type=OCFTType} -> OCFTType;
+	    _ -> asn1ct_gen:get_inner(Type#type.def)
+	end,
+% 	case asn1ct_gen:get_constraint(Type#type.constraint,
+% 				       tableconstraint_info) of
+% 	    no ->
+% 		asn1ct_gen:get_inner(Type#type.def);
+% 	    _ ->
+% 		Type#type.def
+% 	end,
+    Prop1 = case {Prop,Ext} of
+		{mandatory,{ext,Epos,_}} when Pos >= Epos ->
+		    'OPTIONAL';
+		_ ->
+		    Prop
+	    end,
+    print_attribute_comment(InnerType,Pos,Cname,Prop1),
+    asn1ct_name:new(term),
+    emit_term_tlv(Prop1,InnerType,DecObjInf),
+    asn1ct_name:new(rb),
+    PostponedDec =
+	gen_dec_line(Erules,TopType,Cname,CTags,Type,Prop1,DecObjInf),
+    asn1ct_name:new(v),
+    asn1ct_name:new(tlv),
+    asn1ct_name:new(form),
+    PostponedDec.
+
+
+emit_term_tlv({'DEFAULT',_},InnerType,DecObjInf) ->
+    emit_term_tlv(opt_or_def,InnerType,DecObjInf);
+emit_term_tlv('OPTIONAL',InnerType,DecObjInf) ->
+    emit_term_tlv(opt_or_def,InnerType,DecObjInf);
+emit_term_tlv(Prop,{typefield,_},DecObjInf) ->
+    emit_term_tlv(Prop,type_or_object_field,DecObjInf);
+emit_term_tlv(Prop,{objectfield,_,_},DecObjInf) ->
+    emit_term_tlv(Prop,type_or_object_field,DecObjInf);
+emit_term_tlv(opt_or_def,type_or_object_field,_) ->
+    asn1ct_name:new(tmpterm),
+    emit(["{",{curr,tmpterm},",",{curr,tlv},"} = "]);
+emit_term_tlv(opt_or_def,_,_) ->
+    emit(["{",{curr,term},",",{curr,tlv},"} = "]);
+emit_term_tlv(_,type_or_object_field,false) ->
+     emit(["[",{curr,v},"|",{curr,tlv},"] = ",{prev,tlv},", ",nl,
+	  {curr,term}," = "]);
+emit_term_tlv(_,type_or_object_field,_) ->
+    asn1ct_name:new(tmpterm),
+    emit(["[",{curr,v},"|",{curr,tlv},"] = ",{prev,tlv},", ",nl]),
+    emit([nl,"  ",{curr,tmpterm}," = "]);
+emit_term_tlv(mandatory,_,_) ->
+    emit(["[",{curr,v},"|",{curr,tlv},"] = ",{prev,tlv},", ",nl,
+	  {curr,term}," = "]).
+
+
+gen_dec_set_cases(_Erules,_TopType,[],Pos) ->
+    Pos;
+gen_dec_set_cases(Erules,TopType,[Comp|RestComps],Pos) ->
+    Name = Comp#'ComponentType'.name,
+    Type = Comp#'ComponentType'.typespec,
+    CTags = Comp#'ComponentType'.tags,
+
+    emit([indent(6),"%",Name,nl]),
+    Tags = case Type#type.tag of
+	       [] -> % this is a choice without explicit tag
+		   [(?ASN1CT_GEN_BER:decode_class(T1class) bsl 10) + T1number||
+		       {T1class,T1number} <- CTags];
+               [FirstTag|_] ->
+		   [(?ASN1CT_GEN_BER:decode_class(FirstTag#tag.class) bsl 10) + FirstTag#tag.number]
+	   end,
+%    emit([indent(6),"%Tags: ",Tags,nl]),
+%    emit([indent(6),"%Type#type.tag: ",Type#type.tag,nl]),
+    CaseFun = fun(TagList=[H|T],Fun,N) ->
+		      Semicolon = case TagList of
+				      [_Tag1,_|_] -> [";",nl];
+				      _ -> ""
+				  end,
+		      emit(["TTlv = {",H,",_} ->",nl]),
+		      emit([indent(4),"{",Pos,", TTlv}",Semicolon]),
+		      Fun(T,Fun,N+1);
+		 ([],_,0) ->
+		      true;
+		 ([],_,_) ->
+		      emit([";",nl])
+	      end,
+    CaseFun(Tags,CaseFun,0),
+%%    emit([";",nl]),
+    gen_dec_set_cases(Erules,TopType,RestComps,Pos+1).
+
+
+
+%%---------------------------------------------
+%%  Encode CHOICE
+%%---------------------------------------------
+%% for BER we currently do care (a little) if the choice has an EXTENSIONMARKER
+
+
+gen_enc_choice(Erules,TopType,Tag,CompList,_Ext) ->
+    gen_enc_choice1(Erules,TopType,Tag,CompList,_Ext).
+
+gen_enc_choice1(Erules,TopType,_Tag,CompList,_Ext) ->
+    asn1ct_name:clear(),
+    emit(["   {EncBytes,EncLen} = case element(1,Val) of",nl]),
+    gen_enc_choice2(Erules,TopType,CompList),
+    emit([nl,"   end,",nl,nl]),
+
+    emit(["?RT_BER:encode_tags(TagIn, EncBytes, EncLen).",nl]).
+
+
+gen_enc_choice2(Erules,TopType,[H1|T]) when record(H1,'ComponentType') ->
+    Cname = H1#'ComponentType'.name,
+    Type = H1#'ComponentType'.typespec,
+    emit(["      ",{asis,Cname}," ->",nl]),
+    {Encobj,Assign} =
+	case {Type#type.def,asn1ct_gen:get_constraint(Type#type.constraint,
+						      componentrelation)} of
+	    {#'ObjectClassFieldType'{},{componentrelation,_,_}} ->
+		asn1ct_name:new(tmpBytes),
+		asn1ct_name:new(encBytes),
+		asn1ct_name:new(encLen),
+		Emit = ["{",{curr,tmpBytes},", _} = "],
+		{{no_attr,"ObjFun"},Emit};
+	    _ ->
+		{false,[]}
+	end,
+% 	case asn1ct_gen:get_constraint(Type#type.constraint,
+% 				       tableconstraint_info) of
+% 	    no ->
+% 		{false,[]};
+% 	    _ ->
+% 		asn1ct_name:new(tmpBytes),
+% 		asn1ct_name:new(encBytes),
+% 		asn1ct_name:new(encLen),
+% 		Emit = ["{",{curr,tmpBytes},", _} = "],
+% 		{{no_attr,"ObjFun"},Emit}
+% 	end,
+    gen_enc_line(Erules,TopType,Cname,Type,"element(2,Val)",9,
+		 mandatory,Assign,Encobj),
+    case Encobj of
+	false -> ok;
+	_ ->
+	    emit([",",nl,indent(9),"{",{curr,encBytes},", ",
+		  {curr,encLen},"}"])
+    end,
+    emit([";",nl]),
+    case T of
+	[] ->
+	    emit([indent(6), "Else -> ",nl,
+		  indent(9),"exit({error,{asn1,{invalid_choice_type,Else}}})"]);
+	_ ->
+	    true
+    end,
+    gen_enc_choice2(Erules,TopType,T);
+
+gen_enc_choice2(_Erules,_TopType,[])  ->
+    true.
+
+
+
+
+%%--------------------------------------------
+%%  Decode CHOICE
+%%--------------------------------------------
+
+gen_dec_choice(Erules,TopType, _ChTag, CompList, Ext) ->
+    asn1ct_name:clear(),
+    asn1ct_name:new(tlv),
+    emit([{curr,tlv},
+	  " = ?RT_BER:match_tags(",{prev,tlv},",TagIn), ",nl]),
+    asn1ct_name:new(tlv),
+    asn1ct_name:new(v),
+    emit(["case (case ",{prev,tlv},
+	  " of [Ctemp",{prev,tlv},"] -> Ctemp",{prev,tlv},
+	  "; _ -> ",{prev,tlv}," end)"," of",nl]),
+    asn1ct_name:new(tagList),
+    asn1ct_name:new(choTags),
+    asn1ct_name:new(res),
+    gen_dec_choice_cases(Erules,TopType,CompList),
+    emit([indent(6), {curr,else}," -> ",nl]),
+    case Ext of
+	noext ->
+	    emit([indent(9),"exit({error,{asn1,{invalid_choice_tag,",
+		  {curr,else},"}}})",nl]);
+	_ ->
+	    emit([indent(9),"{asn1_ExtAlt, ?RT_BER:encode(",{curr,else},")}",nl])
+    end,
+    emit([indent(3),"end",nl]),
+    asn1ct_name:new(tag),
+    asn1ct_name:new(else).
+
+
+gen_dec_choice_cases(_Erules,_TopType, []) ->
+    ok;
+gen_dec_choice_cases(Erules,TopType, [H|T]) ->
+    Cname = H#'ComponentType'.name,
+    Type = H#'ComponentType'.typespec,
+    Prop = H#'ComponentType'.prop,
+    Tags = Type#type.tag,
+    Fcases  = fun([{T1class,T1number}|Tail],Fun) ->
+		      emit([indent(4),{curr,v}," = {",
+			    (?ASN1CT_GEN_BER:decode_class(T1class) bsl 10) +
+			    T1number,",_} -> ",nl]),
+		      emit([indent(8),"{",{asis,Cname},", "]),
+		      gen_dec_line(Erules,TopType,Cname,[],Type,Prop,false),
+		      emit(["};",nl,nl]),
+		      Fun(Tail,Fun);
+		 ([],_) ->
+		      ok
+	      end,
+    emit([nl,"%% '",Cname,"'",nl]),
+    case {Tags,asn1ct:get_gen_state_field(namelist)} of
+	{[],_} -> % choice without explicit tags
+	    Fcases(H#'ComponentType'.tags,Fcases);
+	{[FirstT|_RestT],[{Cname,undecoded}|Names]} ->
+	    DecTag=(?ASN1CT_GEN_BER:decode_class(FirstT#tag.class) bsl 10) +
+		FirstT#tag.number,
+	    asn1ct:add_generated_refed_func({[Cname|TopType],undecoded,
+					     [DecTag],Type}),
+	    asn1ct:update_gen_state(namelist,Names),
+	    emit([indent(4),{curr,res}," = ",
+		  match_tag(ber_bin,{FirstT#tag.class,FirstT#tag.number}),
+		  " -> ",nl]),
+	    emit([indent(8),"{",{asis,Cname},", {'",
+		  asn1ct_gen:list2name([Cname|TopType]),"',",
+		  {curr,res},"}};",nl,nl]);
+	{[FirstT|RestT],_} ->
+	    emit([indent(4),"{",
+		  (?ASN1CT_GEN_BER:decode_class(FirstT#tag.class) bsl 10) +
+		  FirstT#tag.number,", ",{curr,v},"} -> ",nl]),
+	    emit([indent(8),"{",{asis,Cname},", "]),
+	    gen_dec_line(Erules,TopType,Cname,[],Type#type{tag=RestT},Prop,false),
+	    emit(["};",nl,nl])
+    end,
+    gen_dec_choice_cases(Erules,TopType, T).
+
+
+
+%%---------------------------------------
+%% Generate the encode/decode code
+%%---------------------------------------
+
+gen_enc_line(Erules,TopType,Cname,
+	     Type=#type{constraint=[{componentrelation,_,_}],
+			def=#'ObjectClassFieldType'{type={typefield,_}}},
+	     Element,Indent,OptOrMand=mandatory,EncObj)
+  when list(Element) ->
+    asn1ct_name:new(tmpBytes),
+    gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,
+		 ["{",{curr,tmpBytes},",_} = "],EncObj);
+gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,EncObj)
+  when list(Element) ->
+    gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,
+		 ["{",{curr,encBytes},",",{curr,encLen},"} = "],EncObj).
+
+gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,Assign,EncObj)
+  when list(Element) ->
+    IndDeep = indent(Indent),
+    Tag = lists:reverse([?ASN1CT_GEN_BER:encode_tag_val(
+			    ?ASN1CT_GEN_BER:decode_class(X#tag.class),
+			    X#tag.form,
+			    X#tag.number)
+			 || X <- Type#type.tag]),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    WhatKind = asn1ct_gen:type(InnerType),
+    emit(IndDeep),
+    emit(Assign),
+    gen_optormand_case(OptOrMand,Erules,TopType,Cname,Type,InnerType,WhatKind,
+		       Element),
+    case {Type,asn1ct_gen:get_constraint(Type#type.constraint,
+					 componentrelation)} of
+% 	#type{constraint=[{tableconstraint_info,RefedFieldName}],
+% 	      def={typefield,_}} ->
+	{#type{def=#'ObjectClassFieldType'{type={typefield,_},
+					   fieldname=RefedFieldName}},
+	 {componentrelation,_,_}} ->
+	    {_LeadingAttrName,Fun} = EncObj,
+	    case RefedFieldName of
+		{notype,T} ->
+		    throw({error,{notype,type_from_object,T}});
+		{Name,RestFieldNames} when atom(Name) ->
+		    case OptOrMand of
+			mandatory -> ok;
+			_ ->
+%			    emit(["{",{curr,tmpBytes},",",{curr,tmpLen},
+			    emit(["{",{curr,tmpBytes},",_ } = "])
+%				  "} = "])
+		    end,
+		    emit([Fun,"(",{asis,Name},", ",Element,", ",
+			  {asis,RestFieldNames},"),",nl]),
+		    emit(IndDeep),
+		    case OptOrMand of
+			mandatory ->
+			    emit(["{",{curr,encBytes},",",{curr,encLen},
+				  "} = "]),
+			    emit(["?RT_BER:encode_open_type(",{curr,tmpBytes},
+				  ",",{asis,Tag},")"]);
+			_ ->
+%			    emit(["{",{next,tmpBytes},", _} = "]),
+			    emit(["{",{next,tmpBytes},",",{curr,tmpLen},
+				  "} = "]),
+			    emit(["?RT_BER:encode_open_type(",{curr,tmpBytes},
+				  ",",{asis,Tag},"),",nl]),
+			    emit(IndDeep),
+			    emit(["{",{next,tmpBytes},", ",{curr,tmpLen},"}"])
+		    end;
+		_ ->
+		    throw({asn1,{'internal error'}})
+	    end;
+	{{#'ObjectClassFieldType'{type={objectfield,PrimFieldName1,
+					PFNList}},_},
+	 {componentrelation,_,_}} ->
+	    %% this is when the dotted list in the FieldName has more
+	    %% than one element
+	    {_LeadingAttrName,Fun} = EncObj,
+	    emit(["?RT_BER:encode_open_type(",Fun,"(",{asis,PrimFieldName1},
+		  ", ",Element,", ",{asis,PFNList},"))"]);
+	_ ->
+	    case WhatKind of
+		{primitive,bif} ->
+		    EncType =
+			case Type#type.def of
+			    #'ObjectClassFieldType'{type={fixedtypevaluefield,_,Btype}} ->
+				Btype;
+			    _ ->
+				Type
+			end,
+		    ?ASN1CT_GEN_BER:gen_encode_prim(ber,EncType,{asis,Tag},
+						   Element);
+		{notype,_} ->
+		    emit(["'enc_",InnerType,"'(",Element,", ",{asis,Tag},")"]);
+		'ASN1_OPEN_TYPE' ->
+		    case Type#type.def of
+			#'ObjectClassFieldType'{} -> %Open Type
+			    ?ASN1CT_GEN_BER:gen_encode_prim(ber,#type{def='ASN1_OPEN_TYPE'},{asis,Tag},Element);
+			_ ->
+			    ?ASN1CT_GEN_BER:gen_encode_prim(ber,Type,
+							    {asis,Tag},
+							    Element)
+		    end;
+		_ ->
+		    {EncFunName, _EncMod, _EncFun} =
+			mkfuncname(TopType,Cname,WhatKind,"enc_"),
+		    case {WhatKind,Type#type.tablecinf,EncObj} of
+			{{constructed,bif},[{objfun,_}|_R],{_,Fun}} ->
+			    emit([EncFunName,"(",Element,", ",{asis,Tag},
+				  ", ",Fun,")"]);
+			_ ->
+			    emit([EncFunName,"(",Element,", ",{asis,Tag},")"])
+		    end
+	    end
+    end,
+    case OptOrMand of
+	mandatory -> true;
+	_ ->
+	    emit([nl,indent(7),"end"])
+    end.
+
+gen_optormand_case(mandatory,_Erules,_TopType,_Cname,_Type,_InnerType,_WhatKind,
+		   _Element) ->
+    ok;
+gen_optormand_case('OPTIONAL',Erules,_TopType,_Cname,_Type,_InnerType,_WhatKind,
+		   Element) ->
+    emit([" case ",Element," of",nl]),
+    emit([indent(9),"asn1_NOVALUE -> {",
+	  empty_lb(Erules),",0};",nl]),
+    emit([indent(9),"_ ->",nl,indent(12)]);
+gen_optormand_case({'DEFAULT',DefaultValue},Erules,TopType,Cname,Type,
+		   InnerType,WhatKind,Element) ->
+    CurrMod = get(currmod),
+    case catch lists:member(der,get(encoding_options)) of
+	true ->
+	    emit(" case catch "),
+	    asn1ct_gen:gen_check_call(TopType,Cname,Type,InnerType,
+				      WhatKind,{asis,DefaultValue},
+				      Element),
+	    emit([" of",nl]),
+	    emit([indent(12),"true -> {[],0};",nl]);
+	_ ->
+	    emit([" case ",Element," of",nl]),
+	    emit([indent(9),"asn1_DEFAULT -> {",
+		  empty_lb(Erules),
+		  ",0};",nl]),
+	    case DefaultValue of
+		#'Externalvaluereference'{module=CurrMod,
+					  value=V} ->
+		    emit([indent(9),"?",{asis,V}," -> {",
+			  empty_lb(Erules),",0};",nl]);
+		_ ->
+		    emit([indent(9),{asis,
+				     DefaultValue}," -> {",
+			  empty_lb(Erules),",0};",nl])
+	    end
+    end,
+    emit([indent(9),"_ ->",nl,indent(12)]).
+
+
+
+gen_dec_line(Erules,TopType,Cname,CTags,Type,OptOrMand,DecObjInf)  ->
+    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(v)),
+    Tag =
+	[(?ASN1CT_GEN_BER:decode_class(X#tag.class) bsl 10) + X#tag.number ||
+	    X <- Type#type.tag],
+    ChoiceTags =
+	[(?ASN1CT_GEN_BER:decode_class(Class) bsl 10) + Number||
+	    {Class,Number} <- CTags],
+    InnerType =
+	case Type#type.def of
+	    #'ObjectClassFieldType'{type=OCFTType} ->
+		OCFTType;
+	    _ ->
+		asn1ct_gen:get_inner(Type#type.def)
+	end,
+    PostpDec =
+	case OptOrMand of
+	    mandatory ->
+		gen_dec_call(InnerType,Erules,TopType,Cname,Type,
+			     BytesVar,Tag,
+			     mandatory,", mandatory, ",DecObjInf,OptOrMand);
+	    _ -> %optional or default or a mandatory component after an extensionmark
+		{FirstTag,RestTag} =
+		    case Tag of
+			[] ->
+			    {ChoiceTags,[]};
+			[Ft|Rt] ->
+			    {Ft,Rt}
+		    end,
+		emit(["case ",{prev,tlv}," of",nl]),
+		PostponedDec =
+		    case Tag of
+			[] when length(ChoiceTags) > 0 -> % a choice without explicit tag
+			    Fcases =
+				fun(FirstTag1) ->
+					emit(["[",{curr,v}," = {",{asis,FirstTag1},
+					      ",_}|Temp",
+					      {curr,tlv},
+					      "] ->",nl]),
+					emit([indent(4),"{"]),
+					Pdec=
+					    gen_dec_call(InnerType,Erules,
+							 TopType,Cname,Type,
+							 BytesVar,RestTag,
+							 mandatory,
+							 ", mandatory, ",
+							 DecObjInf,OptOrMand),
+
+					emit([", Temp",{curr,tlv},"}"]),
+					emit([";",nl]),
+					Pdec
+				end,
+			    hd([Fcases(TmpTag)|| TmpTag <- FirstTag]);
+
+			[] -> % an open type without explicit tag
+			    emit(["[",{curr,v},"|Temp",{curr,tlv},"] ->",nl]),
+			    emit([indent(4),"{"]),
+			    Pdec=
+				gen_dec_call(InnerType,Erules,TopType,Cname,
+					     Type,BytesVar,RestTag,mandatory,
+					     ", mandatory, ",DecObjInf,
+					     OptOrMand),
+
+			    emit([", Temp",{curr,tlv},"}"]),
+			    emit([";",nl]),
+			    Pdec;
+
+			_ ->
+			    emit(["[{",{asis,FirstTag},
+				  ",",{curr,v},"}|Temp",
+				  {curr,tlv},
+				  "] ->",nl]),
+			    emit([indent(4),"{"]),
+			    Pdec=
+				gen_dec_call(InnerType,Erules,TopType,Cname,
+					     Type,BytesVar,RestTag,mandatory,
+					     ", mandatory, ",DecObjInf,
+					     OptOrMand),
+
+			    emit([", Temp",{curr,tlv},"}"]),
+			    emit([";",nl]),
+			    Pdec
+		    end,
+
+		emit([indent(4),"_ ->",nl]),
+		case OptOrMand of
+		    {'DEFAULT', Def} ->
+			emit([indent(8),"{",{asis,Def},",",{prev,tlv},"}",nl]);
+		    'OPTIONAL' ->
+			emit([indent(8),"{ asn1_NOVALUE, ",{prev,tlv},"}",nl])
+		end,
+		emit(["end"]),
+		PostponedDec
+	end,
+    case DecObjInf of
+	{Cname,ObjSet} -> % this must be the component were an object is
+	    %% choosen from the object set according to the table
+	    %% constraint.
+	    {[{ObjSet,Cname,asn1ct_gen:mk_var(asn1ct_name:curr(term))}],
+	     PostpDec};
+	_  -> {[],PostpDec}
+    end.
+
+gen_dec_call({typefield,_},_,_,_Cname,Type,BytesVar,Tag,_,_,false,_) ->
+    %%  this in case of a choice with typefield components
+    asn1ct_name:new(reason),
+    asn1ct_name:new(opendec),
+    asn1ct_name:new(tmpterm),
+    asn1ct_name:new(tmptlv),
+
+    {FirstPFName,RestPFName} =
+% 	asn1ct_gen:get_constraint(Type#type.constraint,
+% 				  tableconstraint_info),
+	(Type#type.def)#'ObjectClassFieldType'.fieldname,
+    emit([nl,indent(6),"begin",nl]),
+%    emit([indent(9),{curr,opendec}," = ?RT_BER:decode_open_type(",
+    emit([indent(9),{curr,tmptlv}," = ?RT_BER:decode_open_type(",
+	  BytesVar,",",{asis,Tag},"),",nl]),
+%     emit([indent(9),"{",{curr,tmptlv},",_} = ?RT_BER:decode(",
+% 	  {curr,opendec},"),",nl]),
+
+    emit([indent(9),"case (catch ObjFun(",{asis,FirstPFName},
+	  ", ",{curr,tmptlv},", ",{asis,RestPFName},
+	  ")) of", nl]),%% ??? What about Tag
+    emit([indent(12),"{'EXIT',",{curr,reason},"} ->",nl]),
+    emit([indent(15),"exit({'Type not ",
+	  "compatible with table constraint', ",{curr,reason},"});",nl]),
+    emit([indent(12),{curr,tmpterm}," ->",nl]),
+    emit([indent(15),{curr,tmpterm},nl]),
+    emit([indent(9),"end",nl,indent(6),"end",nl]),
+    [];
+gen_dec_call({typefield,_},_,_,Cname,Type,BytesVar,Tag,_,_,_DecObjInf,OptOrMandComp) ->
+    emit(["?RT_BER:decode_open_type(",BytesVar,",",{asis,Tag},")"]),
+    RefedFieldName =
+% 	asn1ct_gen:get_constraint(Type#type.constraint,
+% 				  tableconstraint_info),
+	(Type#type.def)#'ObjectClassFieldType'.fieldname,
+    [{Cname,RefedFieldName,asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
+gen_dec_call({objectfield,PrimFieldName,PFNList},_,_,Cname,_,BytesVar,Tag,_,_,_,OptOrMandComp) ->
+    emit(["?RT_BER:decode_open_type(",BytesVar,",",{asis,Tag},")"]),
+    [{Cname,{PrimFieldName,PFNList},asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
+gen_dec_call(InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,PrimOptOrMand,
+	     OptOrMand,DecObjInf,_) ->
+    WhatKind = asn1ct_gen:type(InnerType),
+    gen_dec_call1(WhatKind,InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,
+		  PrimOptOrMand,OptOrMand),
+    case DecObjInf of
+	{Cname,{_,OSet,UniqueFName,ValIndex}} ->
+	    Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+	    ValueMatch = value_match(ValIndex,Term),
+	    emit([",",nl,"ObjFun = 'getdec_",OSet,"'(",
+%		  {asis,UniqueFName},", ",{curr,term},")"]);
+		  {asis,UniqueFName},", ",ValueMatch,")"]);
+	_ ->
+	    ok
+    end,
+    [].
+gen_dec_call1({primitive,bif},InnerType,Erules,TopType,Cname,Type,BytesVar,
+	      Tag,OptOrMand,_) ->
+    case {asn1ct:get_gen_state_field(namelist),InnerType} of
+	{[{Cname,undecoded}|Rest],_} ->
+	    asn1ct:add_generated_refed_func({[Cname|TopType],undecoded,
+					     Tag,Type}),
+	    asn1ct:update_gen_state(namelist,Rest),
+%	    emit(["?RT_BER:match_tags(",BytesVar,",",{asis,Tag},")"]);
+	    emit(["{'",asn1ct_gen:list2name([Cname|TopType]),"',",
+		  BytesVar,"}"]);
+	{_,{fixedtypevaluefield,_,Btype}} ->
+	    ?ASN1CT_GEN_BER:gen_dec_prim(Erules,Btype,BytesVar,Tag,[],
+					?PRIMITIVE,OptOrMand);
+	_ ->
+	    ?ASN1CT_GEN_BER:gen_dec_prim(Erules,Type,BytesVar,Tag,[],
+					?PRIMITIVE,OptOrMand)
+    end;
+gen_dec_call1('ASN1_OPEN_TYPE',_InnerType,Erules,TopType,Cname,Type,BytesVar,
+	      Tag,OptOrMand,_) ->
+    case {asn1ct:get_gen_state_field(namelist),Type#type.def} of
+	{[{Cname,undecoded}|Rest],_} ->
+	    asn1ct:add_generated_refed_func({[Cname|TopType],undecoded,
+					     Tag,Type}),
+	    asn1ct:update_gen_state(namelist,Rest),
+	    emit(["{'",asn1ct_gen:list2name([Cname|TopType]),"',",
+		  BytesVar,"}"]);
+%	    emit(["?RT_BER:match_tags(",BytesVar,",",{asis,Tag},")"]);
+	{_,#'ObjectClassFieldType'{type=OpenType}} ->
+	    ?ASN1CT_GEN_BER:gen_dec_prim(Erules,#type{def=OpenType},
+					 BytesVar,Tag,[],
+					 ?PRIMITIVE,OptOrMand);
+	_ ->
+	    ?ASN1CT_GEN_BER:gen_dec_prim(Erules,Type,BytesVar,Tag,[],
+					 ?PRIMITIVE,OptOrMand)
+    end;
+gen_dec_call1(WhatKind,_,_Erules,TopType,Cname,Type,BytesVar,
+	      Tag,_,_OptOrMand) ->
+    case asn1ct:get_gen_state_field(namelist) of
+	[{Cname,undecoded}|Rest] ->
+	    asn1ct:add_generated_refed_func({[Cname|TopType],undecoded,
+					     Tag,Type}),
+	    asn1ct:update_gen_state(namelist,Rest),
+	    emit(["{'",asn1ct_gen:list2name([Cname|TopType]),"',",
+		  BytesVar,"}"]);
+	_ ->
+%	    {DecFunName, _DecMod, _DecFun} =
+%		case {asn1ct:get_gen_state_field(namelist),WhatKind} of
+	    EmitDecFunCall =
+		fun(FuncName) ->
+			case {WhatKind,Type#type.tablecinf} of
+			    {{constructed,bif},[{objfun,_}|_Rest]} ->
+				emit([FuncName,"(",BytesVar,", ",{asis,Tag},
+				      ", ObjFun)"]);
+			    _ ->
+				emit([FuncName,"(",BytesVar,", ",{asis,Tag},")"])
+			end
+		end,
+	    case asn1ct:get_gen_state_field(namelist) of
+		[{Cname,List}|Rest] when list(List) ->
+		    case WhatKind of
+			#'Externaltypereference'{} ->
+			    %%io:format("gen_dec_call1 1:~n~p~n~n",[WhatKind]),
+			    asn1ct:add_tobe_refed_func({WhatKind,List});
+			_ ->
+			    %%io:format("gen_dec_call1 2:~n~p~n~n",[[Cname|TopType]]),
+			    asn1ct:add_tobe_refed_func({[Cname|TopType],
+							List})
+		    end,
+		    asn1ct:update_gen_state(namelist,Rest),
+		    Prefix=asn1ct:get_gen_state_field(prefix),
+		    {DecFunName,_,_}=
+			mkfuncname(TopType,Cname,WhatKind,Prefix),
+		    EmitDecFunCall(DecFunName);
+		[{Cname,parts}|Rest] ->
+		    asn1ct:update_gen_state(namelist,Rest),
+		    asn1ct:get_gen_state_field(prefix),
+		    %% This is to prepare SEQUENCE OF value in
+		    %% partial incomplete decode for a later
+		    %% part-decode, i.e. skip %% the tag.
+		    asn1ct:add_generated_refed_func({[Cname|TopType],
+						     parts,
+						     [],Type}),
+		    emit(["{'",asn1ct_gen:list2name([Cname|TopType]),"',"]),
+		    EmitDecFunCall("?RT_BER:match_tags"),
+		    emit("}");
+		_ ->
+		    {DecFunName,_,_}=
+			mkfuncname(TopType,Cname,WhatKind,"dec_"),
+		    EmitDecFunCall(DecFunName)
+	    end
+% 	    case {WhatKind,Type#type.tablecinf} of
+% 		{{constructed,bif},[{objfun,_}|_Rest]} ->
+% 		    emit([DecFunName,"(",BytesVar,", ",{asis,Tag},
+% 			  ", ObjFun)"]);
+% 		_ ->
+% 		    emit([DecFunName,"(",BytesVar,", ",{asis,Tag},")"])
+% 	    end
+    end.
+
+
+%%------------------------------------------------------
+%% General and special help functions (not exported)
+%%------------------------------------------------------
+
+
+indent(N) ->
+    lists:duplicate(N,32). % 32 = space
+
+mkcindexlist([H,T1|T], Sep) -> % Sep is a string e.g ", " or "+ "
+    emit(["Cindex",H,Sep]),
+    mkcindexlist([T1|T], Sep);
+mkcindexlist([H|T], Sep) ->
+    emit(["Cindex",H]),
+    mkcindexlist(T, Sep);
+mkcindexlist([], _) ->
+    true.
+
+mkcindexlist(L) ->
+    mkcindexlist(L,", ").
+
+
+mkvlist([H,T1|T], Sep) -> % Sep is a string e.g ", " or "+ "
+    emit([{var,H},Sep]),
+    mkvlist([T1|T], Sep);
+mkvlist([H|T], Sep) ->
+    emit([{var,H}]),
+    mkvlist(T, Sep);
+mkvlist([], _) ->
+    true.
+
+mkvlist(L) ->
+    mkvlist(L,", ").
+
+mkvplus(L) ->
+    mkvlist(L," + ").
+
+extensible(CompList) when list(CompList) ->
+    noext;
+extensible({RootList,ExtList}) ->
+    {ext,length(RootList)+1,length(ExtList)}.
+
+
+print_attribute_comment(InnerType,Pos,Cname,Prop) ->
+    CommentLine = "%%-------------------------------------------------",
+    emit([nl,CommentLine]),
+    case InnerType of
+	{typereference,_,Name} ->
+	    emit([nl,"%% attribute ",Cname,"(",Pos,") with type ",Name]);
+	{'Externaltypereference',_,XModule,Name} ->
+	    emit([nl,"%% attribute ",Cname,"(",Pos,")   External ",XModule,":",Name]);
+	_ ->
+	    emit([nl,"%% attribute ",Cname,"(",Pos,") with type ",InnerType])
+    end,
+    case Prop of
+	mandatory ->
+	    continue;
+	{'DEFAULT', Def} ->
+	    emit([" DEFAULT = ",{asis,Def}]);
+	'OPTIONAL' ->
+	    emit([" OPTIONAL"])
+    end,
+    emit([nl,CommentLine,nl]).
+
+
+
+mkfuncname(TopType,Cname,WhatKind,Prefix) ->
+    CurrMod = get(currmod),
+    case WhatKind of
+	#'Externaltypereference'{module=CurrMod,type=EType} ->
+	    F = lists:concat(["'",Prefix,EType,"'"]),
+	    {F, "?MODULE", F};
+	#'Externaltypereference'{module=Mod,type=EType} ->
+	    {lists:concat(["'",Mod,"':'",Prefix,EType,"'"]),Mod,
+	     lists:concat(["'",Prefix,EType,"'"])};
+	{constructed,bif} ->
+	    F = lists:concat(["'",Prefix,asn1ct_gen:list2name([Cname|TopType]),"'"]),
+	    {F, "?MODULE", F}
+    end.
+
+empty_lb(ber) ->
+    "[]";
+empty_lb(ber_bin) ->
+    "<<>>";
+empty_lb(ber_bin_v2) ->
+    "<<>>".
+
+value_match(Index,Value) when atom(Value) ->
+    value_match(Index,atom_to_list(Value));
+value_match([],Value) ->
+    Value;
+value_match([{VI,_}|VIs],Value) ->
+    value_match1(Value,VIs,lists:concat(["element(",VI,","]),1).
+value_match1(Value,[],Acc,Depth) ->
+    Acc ++ Value ++ lists:concat(lists:duplicate(Depth,")"));
+value_match1(Value,[{VI,_}|VIs],Acc,Depth) ->
+    value_match1(Value,VIs,Acc++lists:concat(["element(",VI,","]),Depth+1).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_constructed_per.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_constructed_per.erl
new file mode 100644
index 0000000000..a21c38f8a8
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_constructed_per.erl
@@ -0,0 +1,1234 @@
+% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_constructed_per.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
+%%
+-module(asn1ct_constructed_per).
+
+-export([gen_encode_sequence/3]).
+-export([gen_decode_sequence/3]).
+-export([gen_encode_set/3]).
+-export([gen_decode_set/3]).
+-export([gen_encode_sof/4]).
+-export([gen_decode_sof/4]).
+-export([gen_encode_choice/3]).
+-export([gen_decode_choice/3]).
+
+-include("asn1_records.hrl").
+%-compile(export_all).
+
+-import(asn1ct_gen, [emit/1,demit/1]).
+
+
+%% ENCODE GENERATOR FOR SEQUENCE TYPE  ** **********
+
+
+gen_encode_set(Erules,TypeName,D) ->
+    gen_encode_constructed(Erules,TypeName,D).
+
+gen_encode_sequence(Erules,TypeName,D) ->
+    gen_encode_constructed(Erules,TypeName,D).
+
+gen_encode_constructed(Erules,Typename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    asn1ct_name:new(term),
+    asn1ct_name:new(bytes),
+    {CompList,TableConsInfo} =
+	case D#type.def of
+	    #'SEQUENCE'{tablecinf=TCI,components=CL} ->
+		{CL,TCI};
+	    #'SET'{tablecinf=TCI,components=CL} ->
+		{CL,TCI}
+	end,
+    case Typename of
+	['EXTERNAL'] ->
+	    emit({{var,asn1ct_name:next(val)},
+		  " = asn1rt_check:transform_to_EXTERNAL1990(",
+		  {var,asn1ct_name:curr(val)},"),",nl}),
+	    asn1ct_name:new(val);
+	_ ->
+	    ok
+    end,
+    case {Optionals = optionals(CompList),CompList} of
+	{[],EmptyCL} when EmptyCL == {[],[]};EmptyCL == [] ->
+	    emit(["%%Variable setting just to eliminate ",
+		  "compiler warning for unused vars!",nl,
+		  "_Val = ",{var,asn1ct_name:curr(val)},",",nl]);
+	{[],_} ->
+	    emit([{var,asn1ct_name:next(val)}," = ?RT_PER:list_to_record("]),
+	    emit(["'",asn1ct_gen:list2rname(Typename),"'"]),
+	    emit([", ",{var,asn1ct_name:curr(val)},"),",nl]);
+	_ ->
+	    Fixoptcall =
+		case Erules of
+		    per -> ",Opt} = ?RT_PER:fixoptionals2(";
+		    _ -> ",Opt} = ?RT_PER:fixoptionals("
+		end,
+	    emit({"{",{var,asn1ct_name:next(val)},Fixoptcall,
+		  {asis,Optionals},",",length(Optionals),
+		  ",",{var,asn1ct_name:curr(val)},"),",nl})
+    end,
+    asn1ct_name:new(val),
+    Ext = extensible(CompList),
+    case Ext of
+	{ext,_,NumExt} when NumExt > 0 ->
+	    emit(["Extensions = ?RT_PER:fixextensions(",{asis,Ext},
+		  ", ",{curr,val},"),",nl]);
+	_ -> true
+    end,
+    EncObj =
+	case TableConsInfo of
+	    #simpletableattributes{usedclassfield=Used,
+				   uniqueclassfield=Unique} when Used /= Unique ->
+		false;
+	    %% ObjectSet, name of the object set in constraints
+	    %%
+	    %%{ObjectSet,AttrN,N,UniqueFieldName} -> %% N is index of attribute that determines constraint
+	    #simpletableattributes{objectsetname=ObjectSet,
+				   c_name=AttrN,
+				   c_index=N,
+				   usedclassfield=UniqueFieldName,
+				   uniqueclassfield=UniqueFieldName,
+				   valueindex=ValueIndex
+				  } -> %% N is index of attribute that determines constraint
+		OSDef =
+		    case ObjectSet of
+			{Module,OSName} ->
+			    asn1_db:dbget(Module,OSName);
+			OSName ->
+			    asn1_db:dbget(get(currmod),OSName)
+		    end,
+		case (OSDef#typedef.typespec)#'ObjectSet'.gen of
+		    true ->
+			ObjectEncode =
+			    asn1ct_gen:un_hyphen_var(lists:concat(['Obj',AttrN])),
+			emit([ObjectEncode," = ",nl]),
+			emit(["  'getenc_",ObjectSet,"'(",
+			      {asis,UniqueFieldName},", ",nl]),
+			El = make_element(N+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),AttrN),
+			Indent = 12 + length(atom_to_list(ObjectSet)),
+			case ValueIndex of
+			    [] ->
+				emit([indent(Indent),El,"),",nl]);
+			    _ ->
+				emit([indent(Indent),"value_match(",
+				      {asis,ValueIndex},",",El,")),",nl]),
+				notice_value_match()
+			end,
+			{AttrN,ObjectEncode};
+		    _ ->
+			false
+		end;
+	    _  ->
+		case D#type.tablecinf of
+		    [{objfun,_}|_] ->
+			%% when the simpletableattributes was at an outer
+			%% level and the objfun has been passed through the
+			%% function call
+			{"got objfun through args","ObjFun"};
+		    _ ->
+			false
+		end
+	end,
+    emit({"[",nl}),
+    MaybeComma1 =
+	case Ext of
+	    {ext,_Pos,NumExt2} when NumExt2 > 0 ->
+		emit({"?RT_PER:setext(Extensions =/= [])"}),
+		", ";
+	    {ext,_Pos,_} ->
+		emit({"?RT_PER:setext(false)"}),
+		", ";
+	    _ ->
+		""
+	end,
+    MaybeComma2 =
+	case optionals(CompList) of
+	    [] -> MaybeComma1;
+	    _ ->
+		emit(MaybeComma1),
+		emit("Opt"),
+		{",",nl}
+	end,
+    gen_enc_components_call(Typename,CompList,MaybeComma2,EncObj,Ext),
+    emit({"].",nl}).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% generate decode function for SEQUENCE and SET
+%%
+gen_decode_set(Erules,Typename,D) ->
+    gen_decode_constructed(Erules,Typename,D).
+
+gen_decode_sequence(Erules,Typename,D) ->
+    gen_decode_constructed(Erules,Typename,D).
+
+gen_decode_constructed(_Erules,Typename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    {CompList,TableConsInfo} =
+	case D#type.def of
+	    #'SEQUENCE'{tablecinf=TCI,components=CL} ->
+		{CL,TCI};
+	    #'SET'{tablecinf=TCI,components=CL} ->
+		{CL,TCI}
+	end,
+    Ext = extensible(CompList),
+    MaybeComma1 = case Ext of
+		      {ext,_Pos,_NumExt} ->
+			  gen_dec_extension_value("Bytes"),
+			  {",",nl};
+		      _ ->
+			  ""
+		  end,
+    Optionals = optionals(CompList),
+    MaybeComma2 = case Optionals of
+		      [] -> MaybeComma1;
+		      _ ->
+			  Bcurr = asn1ct_name:curr(bytes),
+			  Bnext = asn1ct_name:next(bytes),
+			  emit(MaybeComma1),
+			  GetoptCall = "} = ?RT_PER:getoptionals2(",
+			  emit({"{Opt,",{var,Bnext},GetoptCall,
+				{var,Bcurr},",",{asis,length(Optionals)},")"}),
+			  asn1ct_name:new(bytes),
+			  ", "
+		  end,
+    {DecObjInf,UniqueFName,ValueIndex} =
+	case TableConsInfo of
+%%	    {ObjectSet,AttrN,N,UniqueFieldName} ->%% N is index of attribute that determines constraint
+	    #simpletableattributes{objectsetname=ObjectSet,
+				   c_name=AttrN,
+				   usedclassfield=UniqueFieldName,
+				   uniqueclassfield=UniqueFieldName,
+				   valueindex=ValIndex} ->
+%%		{AttrN,ObjectSet};
+		F = fun(#'ComponentType'{typespec=CT})->
+			    case {CT#type.constraint,CT#type.tablecinf} of
+				{[],[{objfun,_}|_R]} -> true;
+				_ -> false
+			    end
+		    end,
+		case lists:any(F,CompList) of
+		    true -> % when component relation constraint establish
+			%% relation from a component to another components
+			%% subtype component
+			{{AttrN,{deep,ObjectSet,UniqueFieldName,ValIndex}},
+			 UniqueFieldName,ValIndex};
+		    false ->
+			{{AttrN,ObjectSet},UniqueFieldName,ValIndex}
+		end;
+	    _ ->
+		case D#type.tablecinf of
+		    [{objfun,_}|_] ->
+			{{"got objfun through args","ObjFun"},false,false};
+		    _ ->
+			{false,false,false}
+		end
+	end,
+    {AccTerm,AccBytes} =
+	gen_dec_components_call(Typename,CompList,MaybeComma2,DecObjInf,Ext,length(Optionals)),
+    case asn1ct_name:all(term) of
+	[] -> emit(MaybeComma2); % no components at all
+	_ -> emit({com,nl})
+    end,
+    case {AccTerm,AccBytes} of
+	{[],[]} ->
+	    ok;
+	{_,[]} ->
+	    ok;
+	{[{ObjSet,LeadingAttr,Term}],ListOfOpenTypes} ->
+	    DecObj = asn1ct_gen:un_hyphen_var(lists:concat(['DecObj',LeadingAttr,Term])),
+	    ValueMatch = value_match(ValueIndex,Term),
+	    emit({DecObj," =",nl,"   'getdec_",ObjSet,"'(",
+%		  {asis,UniqueFName},", ",Term,"),",nl}),
+		  {asis,UniqueFName},", ",ValueMatch,"),",nl}),
+	    gen_dec_listofopentypes(DecObj,ListOfOpenTypes,false)
+    end,
+    %% we don't return named lists any more   Cnames = mkcnamelist(CompList),
+    demit({"Result = "}), %dbg
+    %% return value as record
+    case Typename of
+	['EXTERNAL'] ->
+	    emit({"   OldFormat={'",asn1ct_gen:list2rname(Typename),
+		  "'"}),
+	    mkvlist(asn1ct_name:all(term)),
+	    emit({"},",nl}),
+	    emit({"   ASN11994Format =",nl,
+		  "      asn1rt_check:transform_to_EXTERNAL1994",
+		  "(OldFormat),",nl}),
+	    emit("   {ASN11994Format,");
+	_ ->
+	    emit(["{{'",asn1ct_gen:list2rname(Typename),"'"]),
+	    mkvlist(asn1ct_name:all(term)),
+	    emit("},")
+    end,
+    emit({{var,asn1ct_name:curr(bytes)},"}"}),
+    emit({".",nl,nl}).
+
+gen_dec_listofopentypes(_,[],_) ->
+    emit(nl);
+gen_dec_listofopentypes(DecObj,[{_Cname,{FirstPFN,PFNList},Term,TmpTerm,Prop}|Rest],_Update) ->
+
+%    asn1ct_name:new(term),
+    asn1ct_name:new(tmpterm),
+    asn1ct_name:new(reason),
+
+    emit([Term," = ",nl]),
+
+    N = case Prop of
+	    mandatory -> 0;
+	    'OPTIONAL' ->
+		emit_opt_or_mand_check(asn1_NOVALUE,TmpTerm),
+		6;
+	    {'DEFAULT',Val} ->
+		emit_opt_or_mand_check(Val,TmpTerm),
+		6
+	end,
+
+    emit([indent(N+3),"case (catch ",DecObj,"(",
+	  {asis,FirstPFN},", ",TmpTerm,", telltype,",{asis,PFNList},")) of",nl]),
+    emit([indent(N+6),"{'EXIT', ",{curr,reason},"} ->",nl]),
+%%    emit({indent(9),"throw({runtime_error,{","'Type not compatible with table constraint'",",",Term,"}});",nl}),
+    emit([indent(N+9),"exit({'Type not compatible with table constraint',",
+	  {curr,reason},"});",nl]),
+    emit([indent(N+6),"{",{curr,tmpterm},",_} ->",nl]),
+    emit([indent(N+9),{curr,tmpterm},nl]),
+
+    case Prop of
+	mandatory ->
+	    emit([indent(N+3),"end,",nl]);
+	_ ->
+	    emit([indent(N+3),"end",nl,
+		  indent(3),"end,",nl])
+    end,
+    gen_dec_listofopentypes(DecObj,Rest,true).
+
+
+emit_opt_or_mand_check(Val,Term) ->
+    emit([indent(3),"case ",Term," of",nl,
+	  indent(6),{asis,Val}," ->",{asis,Val},";",nl,
+	  indent(6),"_ ->",nl]).
+
+%% ENCODE GENERATOR FOR THE CHOICE TYPE *******
+%% assume Val = {Alternative,AltType}
+%% generate
+%%[
+%% ?RT_PER:set_choice(element(1,Val),Altnum,Altlist,ext),
+%%case element(1,Val) of
+%%    alt1 ->
+%%	encode_alt1(element(2,Val));
+%%    alt2 ->
+%%	encode_alt2(element(2,Val))
+%%end
+%%].
+
+gen_encode_choice(_Erules,Typename,D) when record(D,type) ->
+    {'CHOICE',CompList} = D#type.def,
+    emit({"[",nl}),
+    Ext = extensible(CompList),
+    gen_enc_choice(Typename,CompList,Ext),
+    emit({nl,"].",nl}).
+
+gen_decode_choice(_Erules,Typename,D) when record(D,type) ->
+    asn1ct_name:start(),
+    asn1ct_name:new(bytes),
+    {'CHOICE',CompList} = D#type.def,
+    Ext = extensible(CompList),
+    gen_dec_choice(Typename,CompList,Ext),
+    emit({".",nl}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Encode generator for SEQUENCE OF type
+
+
+gen_encode_sof(_Erules,Typename,SeqOrSetOf,D) when record(D,type) ->
+    asn1ct_name:start(),
+% Val = [Component]
+% ?RT_PER:encode_length(length(Val)),
+% lists:
+    {_SeqOrSetOf,ComponentType} = D#type.def,
+    emit({"[",nl}),
+    SizeConstraint =
+	case asn1ct_gen:get_constraint(D#type.constraint,
+				       'SizeConstraint') of
+	    no -> undefined;
+	    Range -> Range
+	end,
+    ObjFun =
+	case D#type.tablecinf of
+	    [{objfun,_}|_R] ->
+		", ObjFun";
+	    _->
+		""
+	end,
+    emit({nl,indent(3),"?RT_PER:encode_length(",
+	  {asis,SizeConstraint},
+	  ",length(Val)),",nl}),
+    emit({indent(3),"'enc_",asn1ct_gen:list2name(Typename),
+	      "_components'(Val",ObjFun,", [])"}),
+    emit({nl,"].",nl}),
+    NewComponentType =
+	case ComponentType#type.def of
+	    {'ENUMERATED',_,Component}->
+		ComponentType#type{def={'ENUMERATED',Component}};
+	    _ -> ComponentType
+	end,
+    gen_encode_sof_components(Typename,SeqOrSetOf,NewComponentType).
+
+gen_decode_sof(_Erules,Typename,SeqOrSetOf,D) when record(D,type) ->
+    asn1ct_name:start(),
+% Val = [Component]
+% ?RT_PER:encode_length(length(Val)),
+% lists:
+    {_SeqOrSetOf,ComponentType} = D#type.def,
+    SizeConstraint =
+	case asn1ct_gen:get_constraint(D#type.constraint,
+				       'SizeConstraint') of
+	    no -> undefined;
+	    Range -> Range
+	end,
+    ObjFun =
+	case D#type.tablecinf of
+	    [{objfun,_}|_R] ->
+		", ObjFun";
+	    _ ->
+		""
+	end,
+    emit({nl,"{Num,Bytes1} = ?RT_PER:decode_length(Bytes,",{asis,SizeConstraint},"),",nl}),
+    emit({"'dec_",asn1ct_gen:list2name(Typename),
+	      "_components'(Num, Bytes1, telltype",ObjFun,", []).",nl}),
+    NewComponentType =
+	case ComponentType#type.def of
+	    {'ENUMERATED',_,Component}->
+		ComponentType#type{def={'ENUMERATED',Component}};
+	    _ -> ComponentType
+	end,
+    gen_decode_sof_components(Typename,SeqOrSetOf,NewComponentType).
+
+gen_encode_sof_components(Typename,SeqOrSetOf,Cont) ->
+    {ObjFun,ObjFun_Var} =
+	case Cont#type.tablecinf of
+	    [{objfun,_}|_R] ->
+		{", ObjFun",", _"};
+	    _ ->
+		{"",""}
+	end,
+    emit({"'enc_",asn1ct_gen:list2name(Typename),"_components'([]",
+	  ObjFun_Var,", Acc) -> lists:reverse(Acc);",nl,nl}),
+    emit({"'enc_",asn1ct_gen:list2name(Typename),"_components'([H|T]",
+	  ObjFun,", Acc) ->",nl}),
+    emit({"'enc_",asn1ct_gen:list2name(Typename),"_components'(T"}),
+    emit({ObjFun,", ["}),
+    %% the component encoder
+    Constructed_Suffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,
+						       Cont#type.def),
+
+    Conttype = asn1ct_gen:get_inner(Cont#type.def),
+    Currmod = get(currmod),
+    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
+					  asn1ct_gen:rt2ct_suffix()])),
+    case asn1ct_gen:type(Conttype) of
+	{primitive,bif} ->
+	    gen_encode_prim_wrapper(Ctgenmod,per,Cont,false,"H");
+% 	    Ctgenmod:gen_encode_prim(per,Cont,false,"H");
+	{constructed,bif} ->
+	    NewTypename = [Constructed_Suffix|Typename],
+	    emit({"'enc_",asn1ct_gen:list2name(NewTypename),"'(H",
+		  ObjFun,")",nl,nl});
+	#'Externaltypereference'{module=Currmod,type=Ename} ->
+	    emit({"'enc_",Ename,"'(H)",nl,nl});
+	#'Externaltypereference'{module=EMod,type=EType} ->
+	    emit({"'",EMod,"':'enc_",EType,"'(H)",nl,nl});
+	_ ->
+	    emit({"'enc_",Conttype,"'(H)",nl,nl})
+    end,
+    emit({" | Acc]).",nl}).
+
+gen_decode_sof_components(Typename,SeqOrSetOf,Cont) ->
+    {ObjFun,ObjFun_Var} =
+	case Cont#type.tablecinf of
+	    [{objfun,_}|_R] ->
+		{", ObjFun",", _"};
+	    _ ->
+		{"",""}
+	end,
+    emit({"'dec_",asn1ct_gen:list2name(Typename),
+	  "_components'(0, Bytes, _",ObjFun_Var,", Acc) ->",nl,
+	  indent(3),"{lists:reverse(Acc), Bytes};",nl}),
+    emit({"'dec_",asn1ct_gen:list2name(Typename),
+	  "_components'(Num, Bytes, _",ObjFun,", Acc) ->",nl}),
+    emit({indent(3),"{Term,Remain} = "}),
+    Constructed_Suffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,
+						       Cont#type.def),
+    Conttype = asn1ct_gen:get_inner(Cont#type.def),
+    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
+					  asn1ct_gen:rt2ct_suffix()])),
+    case asn1ct_gen:type(Conttype) of
+	{primitive,bif} ->
+	    Ctgenmod:gen_dec_prim(per,Cont,"Bytes"),
+	    emit({com,nl});
+	{constructed,bif} ->
+	    NewTypename = [Constructed_Suffix|Typename],
+	    emit({"'dec_",asn1ct_gen:list2name(NewTypename),
+		  "'(Bytes, telltype",ObjFun,"),",nl});
+	#typereference{val=Dname} ->
+	    emit({"'dec_",Dname,"'(Bytes,telltype),",nl});
+	#'Externaltypereference'{module=EMod,type=EType} ->
+	    emit({"'",EMod,"':'dec_",EType,"'(Bytes,telltype),",nl});
+	_ ->
+	    emit({"'dec_",Conttype,"'(Bytes,telltype),",nl})
+    end,
+    emit({indent(3),"'dec_",asn1ct_gen:list2name(Typename),
+	  "_components'(Num-1, Remain, telltype",ObjFun,", [Term|Acc]).",nl}).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% General and special help functions (not exported)
+
+mkvlist([H|T]) ->
+    emit(","),
+    mkvlist2([H|T]);
+mkvlist([]) ->
+    true.
+mkvlist2([H,T1|T]) ->
+    emit({{var,H},","}),
+    mkvlist2([T1|T]);
+mkvlist2([H|T]) ->
+    emit({{var,H}}),
+    mkvlist2(T);
+mkvlist2([]) ->
+    true.
+
+extensible(CompList) when list(CompList) ->
+    noext;
+extensible({RootList,ExtList}) ->
+    {ext,length(RootList)+1,length(ExtList)}.
+
+gen_dec_extension_value(_) ->
+    emit({"{Ext,",{next,bytes},"} = ?RT_PER:getext(",{curr,bytes},")"}),
+    asn1ct_name:new(bytes).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Produce a list with positions (in the Value record) where
+%% there are optional components, start with 2 because first element
+%% is the record name
+
+optionals({L,_Ext}) -> optionals(L,[],2);
+optionals(L) -> optionals(L,[],2).
+
+optionals([{'EXTENSIONMARK',_,_}|Rest],Acc,Pos) ->
+    optionals(Rest,Acc,Pos); % optionals in extension are currently not handled
+optionals([#'ComponentType'{prop='OPTIONAL'}|Rest],Acc,Pos) ->
+		 optionals(Rest,[Pos|Acc],Pos+1);
+optionals([#'ComponentType'{prop={'DEFAULT',_}}|Rest],Acc,Pos) ->
+		 optionals(Rest,[Pos|Acc],Pos+1);
+optionals([#'ComponentType'{}|Rest],Acc,Pos) ->
+		 optionals(Rest,Acc,Pos+1);
+optionals([],Acc,_) ->
+    lists:reverse(Acc).
+
+
+gen_enc_components_call(TopType,{CompList,ExtList},MaybeComma,DynamicEnc,Ext) ->
+    %% The type has extensionmarker
+    Rpos = gen_enc_components_call1(TopType,CompList,1,MaybeComma,DynamicEnc,noext),
+    case Ext of
+	{ext,_,ExtNum} when ExtNum > 0 ->
+	    emit([nl,
+		  ",Extensions",nl]);
+	_ -> true
+    end,
+    %handle extensions
+    gen_enc_components_call1(TopType,ExtList,Rpos,MaybeComma,DynamicEnc,Ext);
+gen_enc_components_call(TopType, CompList, MaybeComma, DynamicEnc, Ext) ->
+    %% The type has no extensionmarker
+    gen_enc_components_call1(TopType,CompList,1,MaybeComma,DynamicEnc,Ext).
+
+gen_enc_components_call1(TopType,
+			 [C=#'ComponentType'{name=Cname,typespec=Type,prop=Prop}|Rest],
+			 Tpos,
+			 MaybeComma, DynamicEnc, Ext) ->
+
+    put(component_type,{true,C}),
+    %% information necessary in asn1ct_gen_per_rt2ct:gen_encode_prim
+
+    Pos = case Ext of
+	      noext -> Tpos;
+	      {ext,Epos,_Enum} -> Tpos - Epos + 1
+	  end,
+    emit(MaybeComma),
+    case Prop of
+	'OPTIONAL' ->
+	    gen_enc_component_optional(TopType,Cname,Type,Tpos,DynamicEnc,Ext);
+	{'DEFAULT',_DefVal} ->
+	    gen_enc_component_default(TopType,Cname,Type,Tpos,DynamicEnc,Ext);
+	_ ->
+	    case Ext of
+		{ext,ExtPos,_} when Tpos >= ExtPos ->
+		    gen_enc_component_optional(TopType,Cname,Type,Tpos,DynamicEnc,Ext);
+		_ ->
+		    gen_enc_component_mandatory(TopType,Cname,Type,Tpos,DynamicEnc,Ext)
+	    end
+    end,
+
+    erase(component_type),
+
+    case Rest of
+	[] ->
+	    Pos+1;
+	_ ->
+	    emit({com,nl}),
+	    gen_enc_components_call1(TopType,Rest,Tpos+1,"",DynamicEnc,Ext)
+    end;
+gen_enc_components_call1(_TopType,[],Pos,_,_,_) ->
+	Pos.
+
+gen_enc_component_default(TopType,Cname,Type,Pos,DynamicEnc,Ext) ->
+%    Element = io_lib:format("?RT_PER:cindex(~w,Val1,~w)",[Pos+1,Cname]),
+    Element = make_element(Pos+1,"Val1",Cname),
+    emit({"case ",Element," of",nl}),
+%    case Ext of
+%	{ext,ExtPos,_} when Pos >= ExtPos ->
+%	    emit({"asn1_NOEXTVALUE -> [];",nl});
+%	_ ->
+    emit({"asn1_DEFAULT -> [];",nl}),
+%    end,
+    asn1ct_name:new(tmpval),
+    emit({{curr,tmpval}," ->",nl}),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    emit({nl,"%% attribute number ",Pos," with type ",
+	      InnerType,nl}),
+    NextElement = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
+    gen_enc_line(TopType,Cname,Type,NextElement, Pos,DynamicEnc,Ext),
+    emit({nl,"end"}).
+
+gen_enc_component_optional(TopType,Cname,Type,Pos,DynamicEnc,Ext) ->
+%    Element = io_lib:format("?RT_PER:cindex(~w,Val1,~w)",[Pos+1,Cname]),
+    Element = make_element(Pos+1,"Val1",Cname),
+    emit({"case ",Element," of",nl}),
+%    case Ext of
+%	{ext,ExtPos,_} when Pos >= ExtPos ->
+%	    emit({"asn1_NOEXTVALUE -> [];",nl});
+%	_ ->
+    emit({"asn1_NOVALUE -> [];",nl}),
+%    end,
+    asn1ct_name:new(tmpval),
+    emit({{curr,tmpval}," ->",nl}),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    emit({nl,"%% attribute number ",Pos," with type ",
+	      InnerType,nl}),
+    NextElement = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
+    gen_enc_line(TopType,Cname,Type,NextElement, Pos,DynamicEnc,Ext),
+    emit({nl,"end"}).
+
+gen_enc_component_mandatory(TopType,Cname,Type,Pos,DynamicEnc,Ext) ->
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    emit({nl,"%% attribute number ",Pos," with type ",
+	      InnerType,nl}),
+    gen_enc_line(TopType,Cname,Type,[],Pos,DynamicEnc,Ext).
+
+gen_enc_line(TopType, Cname, Type, [], Pos,DynamicEnc,Ext) ->
+%    Element = io_lib:format("?RT_PER:cindex(~w,~s,~w)",[Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),Cname]),
+    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),Cname),
+    gen_enc_line(TopType,Cname,Type,Element, Pos,DynamicEnc,Ext);
+gen_enc_line(TopType,Cname,Type,Element, Pos,DynamicEnc,Ext) ->
+    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
+					  asn1ct_gen:rt2ct_suffix()])),
+    Atype =
+	case Type of
+	    #type{def=#'ObjectClassFieldType'{type=InnerType}} ->
+		InnerType;
+	    _  ->
+		asn1ct_gen:get_inner(Type#type.def)
+	end,
+% 	case asn1ct_gen:get_constraint(Type#type.constraint,
+% 				       tableconstraint_info) of
+% 	    no ->
+% 		asn1ct_gen:get_inner(Type#type.def);
+% 	    _ ->
+% 		Type#type.def
+% 	end,
+    case Ext of
+	{ext,Ep1,_} when  Pos >= Ep1 ->
+	    emit(["?RT_PER:encode_open_type(dummy,?RT_PER:complete("]);
+	_ -> true
+    end,
+    case Atype of
+	{typefield,_} ->
+	    case DynamicEnc of
+		{_LeadingAttrName,Fun} ->
+% 		    case asn1ct_gen:get_constraint(Type#type.constraint,
+% 						   componentrelation) of
+		    case (Type#type.def)#'ObjectClassFieldType'.fieldname of
+			{notype,T} ->
+			    throw({error,{notype,type_from_object,T}});
+			{Name,RestFieldNames} when atom(Name) ->
+			    emit({"?RT_PER:encode_open_type([],?RT_PER:complete(",nl}),
+			    emit({"   ",Fun,"(",{asis,Name},", ",
+				  Element,", ",{asis,RestFieldNames},")))"});
+			Other ->
+			    throw({asn1,{'internal error',Other}})
+		    end
+	    end;
+	{objectfield,PrimFieldName1,PFNList} ->
+	    case DynamicEnc of
+		{_LeadingAttrName,Fun} ->
+		    emit({"?RT_PER:encode_open_type([],"
+			  "?RT_PER:complete(",nl}),
+		    emit({"   ",Fun,"(",{asis,PrimFieldName1},
+			  ", ",Element,", ",{asis,PFNList},")))"})
+	    end;
+	_ ->
+	    CurrMod = get(currmod),
+	    case asn1ct_gen:type(Atype) of
+		#'Externaltypereference'{module=Mod,type=EType} when
+		      (CurrMod==Mod) ->
+		    emit({"'enc_",EType,"'(",Element,")"});
+		#'Externaltypereference'{module=Mod,type=EType} ->
+		    emit({"'",Mod,"':'enc_",
+			  EType,"'(",Element,")"});
+		#typereference{val=Ename} ->
+		    emit({"'enc_",Ename,"'(",Element,")"});
+		{notype,_} ->
+		    emit({"'enc_",Atype,"'(",Element,")"});
+		{primitive,bif} ->
+		    EncType =
+			case Atype of
+			    {fixedtypevaluefield,_,Btype} ->
+				Btype;
+			    _ ->
+				Type
+			end,
+		    gen_encode_prim_wrapper(Ctgenmod,per,EncType,
+					    false,Element);
+% 		    Ctgenmod:gen_encode_prim(per,EncType,
+% 					     false,Element);
+		'ASN1_OPEN_TYPE' ->
+		    case Type#type.def of
+			#'ObjectClassFieldType'{type=OpenType} ->
+			    gen_encode_prim_wrapper(Ctgenmod,per,
+						    #type{def=OpenType},
+						    false,Element);
+			_ ->
+			    gen_encode_prim_wrapper(Ctgenmod,per,Type,
+						    false,Element)
+		    end;
+% 		    Ctgenmod:gen_encode_prim(per,Type,
+% 					     false,Element);
+		{constructed,bif} ->
+		    NewTypename = [Cname|TopType],
+		    case {Type#type.tablecinf,DynamicEnc} of
+			{[{objfun,_}|_R],{_,EncFun}} ->
+%%			    emit({"?RT_PER:encode_open_type([],",
+%%				  "?RT_PER:complete(",nl}),
+			    emit({"'enc_",
+				  asn1ct_gen:list2name(NewTypename),
+				  "'(",Element,", ",EncFun,")"});
+			_ ->
+			    emit({"'enc_",
+				  asn1ct_gen:list2name(NewTypename),
+				  "'(",Element,")"})
+		    end
+	    end
+    end,
+    case Ext of
+	{ext,Ep2,_} when Pos >= Ep2 ->
+	    emit(["))"]);
+	_ -> true
+    end.
+
+gen_dec_components_call(TopType,{CompList,ExtList},MaybeComma,DecInfObj,Ext,NumberOfOptionals) ->
+    %% The type has extensionmarker
+    {Rpos,AccTerm,AccBytes} =
+	gen_dec_components_call1(TopType, CompList, 1, 1, MaybeComma,DecInfObj,
+				 noext,[],[],NumberOfOptionals),
+    emit([",",nl,"{Extensions,",{next,bytes},"} = "]),
+    emit(["?RT_PER:getextension(Ext,",{curr,bytes},"),",nl]),
+    asn1ct_name:new(bytes),
+    {_Epos,AccTermE,AccBytesE} =
+	gen_dec_components_call1(TopType,ExtList,Rpos, 1, "",DecInfObj,Ext,[],[],NumberOfOptionals),
+    case ExtList of
+	[] -> true;
+	_ -> emit([",",nl])
+    end,
+    emit([{next,bytes},"= ?RT_PER:skipextensions(",{curr,bytes},",",
+	  length(ExtList)+1,",Extensions)",nl]),
+    asn1ct_name:new(bytes),
+    {AccTerm++AccTermE,AccBytes++AccBytesE};
+
+gen_dec_components_call(TopType,CompList,MaybeComma,DecInfObj,Ext,NumberOfOptionals) ->
+    %% The type has no extensionmarker
+    {_,AccTerm,AccBytes} =
+	gen_dec_components_call1(TopType, CompList, 1, 1,MaybeComma,DecInfObj,Ext,[],[],NumberOfOptionals),
+    {AccTerm,AccBytes}.
+
+
+gen_dec_components_call1(TopType,
+			 [C=#'ComponentType'{name=Cname,typespec=Type,prop=Prop}|Rest],
+			 Tpos,OptPos,MaybeComma,DecInfObj,Ext,AccTerm,AccBytes,NumberOfOptionals) ->
+    Pos = case Ext of
+	      noext -> Tpos;
+	      {ext,Epos,_Enum} -> Tpos - Epos + 1
+	  end,
+    emit(MaybeComma),
+%%    asn1ct_name:new(term),
+    InnerType =
+	case Type#type.def of
+	    #'ObjectClassFieldType'{type=InType} ->
+		InType;
+	    Def ->
+		asn1ct_gen:get_inner(Def)
+	end,
+% 	case asn1ct_gen:get_constraint(Type#type.constraint,
+% 				       tableconstraint_info) of
+% 	    no ->
+% 		asn1ct_gen:get_inner(Type#type.def);
+% 	    _ ->
+% 		Type#type.def
+% 	end,
+    case InnerType of
+	#'Externaltypereference'{type=T} ->
+	    emit({nl,"%%  attribute number ",Tpos," with type ",
+		  T,nl});
+	IT when tuple(IT) ->
+	    emit({nl,"%%  attribute number ",Tpos," with type ",
+		  element(2,IT),nl});
+	_ ->
+	    emit({nl,"%% attribute number ",Tpos," with type ",
+		  InnerType,nl})
+    end,
+
+    case InnerType of
+	{typefield,_} ->
+	    asn1ct_name:new(term),
+	    asn1ct_name:new(tmpterm),
+	    emit({"{",{curr,tmpterm},", ",{next,bytes},"} = "});
+	{objectfield,_,_} ->
+	    asn1ct_name:new(term),
+	    asn1ct_name:new(tmpterm),
+	    emit({"{",{curr,tmpterm},", ",{next,bytes},"} = "});
+	_ ->
+	    asn1ct_name:new(term),
+	    emit({"{",{curr,term},",",{next,bytes},"} = "})
+    end,
+
+    NewOptPos =
+	case {Ext,Prop} of
+	    {noext,mandatory} -> OptPos; % generate nothing
+	    {noext,_} ->
+		Element = io_lib:format("Opt band (1 bsl ~w)",[NumberOfOptionals - OptPos]),
+		emit({"case ",Element," of",nl}),
+		emit({"_Opt",OptPos," when _Opt",OptPos," > 0 ->"}),
+		OptPos+1;
+	    _ ->
+		emit(["case Extensions of",nl]),
+		emit(["_ when size(Extensions) >= ",Pos,",element(",Pos,",Extensions) == 1 ->",nl])
+	end,
+    put(component_type,{true,C}),
+    {TermVar,BytesVar} = gen_dec_line(TopType,Cname,Type,Tpos,DecInfObj,Ext),
+    erase(component_type),
+    case {Ext,Prop} of
+	{noext,mandatory} -> true; % generate nothing
+	{noext,_} ->
+	    emit([";",nl,"0 ->"]),
+	    gen_dec_component_no_val(TopType,Cname,Type,Prop,Tpos,Ext);
+	_ ->
+	    emit([";",nl,"_  ->",nl]),
+	    gen_dec_component_no_val(TopType,Cname,Type,Prop,Tpos,Ext)
+    end,
+    case {Ext,Prop} of
+	{noext,mandatory} -> true; % generate nothing
+	{noext,_} ->
+	    emit([nl,"end"]);
+	_ ->
+	    emit([nl,"end"])
+
+    end,
+    asn1ct_name:new(bytes),
+    case Rest of
+	[] ->
+	    {Pos+1,AccTerm++TermVar,AccBytes++BytesVar};
+	_ ->
+	    emit({com,nl}),
+	    gen_dec_components_call1(TopType,Rest,Tpos+1,NewOptPos,"",DecInfObj,Ext,
+				     AccTerm++TermVar,AccBytes++BytesVar,NumberOfOptionals)
+    end;
+
+gen_dec_components_call1(_TopType,[],Pos,_OptPos,_,_,_,AccTerm,AccBytes,_NumberOfOptionals) ->
+    {Pos,AccTerm,AccBytes}.
+
+
+%%gen_dec_component_no_val(TopType,Cname,Type,_,Pos,{ext,Ep,Enum}) when Pos >= Ep ->
+%%    emit({"{asn1_NOEXTVALUE,",{curr,bytes},"}",nl});
+gen_dec_component_no_val(_,_,_,{'DEFAULT',DefVal},_,_) ->
+    emit(["{",{asis,DefVal},",",{curr,bytes},"}",nl]);
+gen_dec_component_no_val(_,_,_,'OPTIONAL',_,_) ->
+    emit({"{asn1_NOVALUE,",{curr,bytes},"}",nl});
+gen_dec_component_no_val(_,_,_,mandatory,_,{ext,_,_}) ->
+    emit({"{asn1_NOVALUE,",{curr,bytes},"}",nl}).
+
+
+gen_dec_line(TopType,Cname,Type,Pos,DecInfObj,Ext)  ->
+    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
+					  asn1ct_gen:rt2ct_suffix()])),
+    Atype =
+	case Type of
+	    #type{def=#'ObjectClassFieldType'{type=InnerType}} ->
+		InnerType;
+	    _  ->
+		asn1ct_gen:get_inner(Type#type.def)
+	end,
+% 	case asn1ct_gen:get_constraint(Type#type.constraint,
+% 				       tableconstraint_info) of
+% 	    no ->
+% 		asn1ct_gen:get_inner(Type#type.def);
+% 	    _ ->
+% 		Type#type.def
+% 	end,
+    BytesVar0 = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+    BytesVar = case Ext of
+		   {ext,Ep,_} when Pos >= Ep ->
+		       emit(["begin",nl,"{TmpVal",Pos,",Trem",Pos,
+			     "}=?RT_PER:decode_open_type(",
+			     {curr,bytes},",[]),",nl,
+			     "{TmpValx",Pos,",_}="]),
+		       io_lib:format("TmpVal~p",[Pos]);
+		   _ -> BytesVar0
+	       end,
+    SaveBytes =
+	case Atype of
+	    {typefield,_} ->
+		case DecInfObj of
+		    false -> % This is in a choice with typefield components
+			{Name,RestFieldNames} =
+			    (Type#type.def)#'ObjectClassFieldType'.fieldname,
+% 			    asn1ct_gen:get_constraint(Type#type.constraint,
+% 						      tableconstraint_info),
+			asn1ct_name:new(tmpterm),
+			asn1ct_name:new(reason),
+			emit([indent(2),"{",{curr,tmpterm},", ",{next,bytes},
+			      "} = ?RT_PER:decode_open_type(",{curr,bytes},
+			      ", []),",nl]),
+			emit([indent(2),"case (catch ObjFun(",
+			      {asis,Name},
+			      ",",{curr,tmpterm},",telltype,",
+			      {asis,RestFieldNames},")) of", nl]),
+			emit([indent(4),"{'EXIT',",{curr,reason},"} ->",nl]),
+			emit([indent(6),"exit({'Type not ",
+			      "compatible with table constraint', ",
+			      {curr,reason},"});",nl]),
+			asn1ct_name:new(tmpterm),
+			emit([indent(4),"{",{curr,tmpterm},", _} ->",nl]),
+			emit([indent(6),"{",Cname,", {",{curr,tmpterm},", ",
+			      {next,bytes},"}}",nl]),
+			emit([indent(2),"end"]),
+			[];
+		    {"got objfun through args","ObjFun"} ->
+			%% this is when the generated code gots the
+			%% objfun though arguments on function
+			%% invocation.
+			{Name,RestFieldNames} =
+			    (Type#type.def)#'ObjectClassFieldType'.fieldname,
+			emit(["?RT_PER:decode_open_type(",{curr,bytes},
+			      ", []),",nl]),
+			emit([{curr,term}," =",nl,
+			      "  case (catch ObjFun(",{asis,Name},",",
+			      {curr,tmpterm},",telltype,",
+			      {asis,RestFieldNames},")) of", nl]),
+			emit(["    {'EXIT',",{curr,reason},"} ->",nl]),
+			emit([indent(6),"exit({'Type not ",
+			      "compatible with table constraint', ",
+			      {curr,reason},"});",nl]),
+			asn1ct_name:new(tmpterm),
+			emit([indent(4),"{",{curr,tmpterm},", _} ->",nl]),
+			emit([indent(6),{curr,tmpterm},nl]),
+			emit([indent(2),"end"]),
+			[];
+		    _ ->
+			emit({"?RT_PER:decode_open_type(",{curr,bytes},
+			      ", [])"}),
+			RefedFieldName =
+			    (Type#type.def)#'ObjectClassFieldType'.fieldname,
+% 			    asn1ct_gen:get_constraint(Type#type.constraint,
+% 						      tableconstraint_info),
+			[{Cname,RefedFieldName,
+			  asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+			  asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
+			  get_components_prop()}]
+		end;
+	    {objectfield,PrimFieldName1,PFNList} ->
+		emit({"?RT_PER:decode_open_type(",{curr,bytes},", [])"}),
+		[{Cname,{PrimFieldName1,PFNList},
+		  asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+		  asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
+		  get_components_prop()}];
+	    _ ->
+		CurrMod = get(currmod),
+		case asn1ct_gen:type(Atype) of
+		    #'Externaltypereference'{module=CurrMod,type=EType} ->
+			emit({"'dec_",EType,"'(",BytesVar,",telltype)"});
+		    #'Externaltypereference'{module=Mod,type=EType} ->
+			emit({"'",Mod,"':'dec_",EType,"'(",BytesVar,
+			      ",telltype)"});
+		    {primitive,bif} ->
+			case Atype of
+			   {fixedtypevaluefield,_,Btype} ->
+				Ctgenmod:gen_dec_prim(per,Btype,
+						      BytesVar);
+			    _ ->
+				Ctgenmod:gen_dec_prim(per,Type,
+						      BytesVar)
+			end;
+		    'ASN1_OPEN_TYPE' ->
+			case Type#type.def of
+			    #'ObjectClassFieldType'{type=OpenType} ->
+				Ctgenmod:gen_dec_prim(per,#type{def=OpenType},
+						      BytesVar);
+			    _ ->
+				Ctgenmod:gen_dec_prim(per,Type,
+						      BytesVar)
+			end;
+		    #typereference{val=Dname} ->
+			emit({"'dec_",Dname,"'(",BytesVar,",telltype)"});
+		    {notype,_} ->
+			emit({"'dec_",Atype,"'(",BytesVar,",telltype)"});
+		    {constructed,bif} ->
+			NewTypename = [Cname|TopType],
+			case Type#type.tablecinf of
+			    [{objfun,_}|_R] ->
+				emit({"'dec_",asn1ct_gen:list2name(NewTypename),
+				      "'(",BytesVar,", telltype, ObjFun)"});
+			    _ ->
+				emit({"'dec_",asn1ct_gen:list2name(NewTypename),
+				      "'(",BytesVar,", telltype)"})
+			end
+		end,
+		case DecInfObj of
+		    {Cname,{_,OSet,UniqueFName,ValIndex}} ->
+			Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+			ValueMatch = value_match(ValIndex,Term),
+			emit({",",nl,"ObjFun = 'getdec_",OSet,"'(",
+			      {asis,UniqueFName},", ",ValueMatch,")"});
+		    _ ->
+			ok
+		end,
+		[]
+	end,
+    case Ext of
+	{ext,Ep2,_} when Pos >= Ep2 ->
+	    emit([", {TmpValx",Pos,",Trem",Pos,"}",nl,"end"]);
+	_ -> true
+    end,
+    %% Prepare return value
+    case DecInfObj of
+	{Cname,ObjSet} ->
+	    {[{ObjSet,Cname,asn1ct_gen:mk_var(asn1ct_name:curr(term))}],
+	     SaveBytes};
+	_ ->
+	    {[],SaveBytes}
+    end.
+
+gen_enc_choice(TopType,CompList,Ext) ->
+    gen_enc_choice_tag(CompList, [], Ext),
+    emit({com,nl}),
+    emit({"case element(1,Val) of",nl}),
+    gen_enc_choice2(TopType, CompList, Ext),
+    emit({nl,"end"}).
+
+gen_enc_choice_tag({C1,C2},_,_) ->
+    N1 = get_name_list(C1),
+    N2 = get_name_list(C2),
+    emit(["?RT_PER:set_choice(element(1,Val),",
+	  {asis,{N1,N2}},", ",{asis,{length(N1),length(N2)}},")"]);
+gen_enc_choice_tag(C,_,_) ->
+    N = get_name_list(C),
+    emit(["?RT_PER:set_choice(element(1,Val),",
+	  {asis,N},", ",{asis,length(N)},")"]).
+
+get_name_list(L) ->
+    get_name_list(L,[]).
+
+get_name_list([#'ComponentType'{name=Name}|T], Acc) ->
+    get_name_list(T,[Name|Acc]);
+get_name_list([], Acc) ->
+    lists:reverse(Acc).
+
+%gen_enc_choice_tag([H|T],Acc,Ext) when record(H,'ComponentType') ->
+%    gen_enc_choice_tag(T,[H#'ComponentType'.name|Acc],Ext);
+%gen_enc_choice_tag([H|T],Acc,Ext) -> % skip EXTENSIONMARK
+%    gen_enc_choice_tag(T,Acc,Ext);
+%gen_enc_choice_tag([],Acc,Ext) ->
+%    Length = length(Acc),
+%    emit({"?RT_PER:set_choice(element(1,Val),",{asis,Length},",",
+%	  {asis,lists:reverse(Acc)},",",{asis,Ext},")"}),
+%    Length.
+
+gen_enc_choice2(TopType, {L1,L2}, Ext) ->
+    gen_enc_choice2(TopType, L1 ++ L2, 0, Ext);
+gen_enc_choice2(TopType, L, Ext) ->
+    gen_enc_choice2(TopType, L, 0, Ext).
+
+gen_enc_choice2(TopType,[H1,H2|T], Pos, Ext)
+when record(H1,'ComponentType'), record(H2,'ComponentType') ->
+    Cname = H1#'ComponentType'.name,
+    Type = H1#'ComponentType'.typespec,
+    EncObj =
+% 	case asn1ct_gen:get_constraint(Type#type.constraint,
+% 				       tableconstraint_info) of
+% 	    no ->
+% 		false;
+% 	    _ ->
+% 		{no_attr,"ObjFun"}
+% 	end,
+	case asn1ct_gen:get_constraint(Type#type.constraint,
+				       componentrelation) of
+	    no -> false;
+	    _ -> {no_attr,"ObjFun"}
+	end,
+    emit({{asis,Cname}," ->",nl}),
+    gen_enc_line(TopType,Cname,Type,"element(2,Val)", Pos+1,EncObj,Ext),
+    emit({";",nl}),
+    gen_enc_choice2(TopType,[H2|T], Pos+1, Ext);
+gen_enc_choice2(TopType,[H1|T], Pos, Ext) when record(H1,'ComponentType') ->
+    Cname = H1#'ComponentType'.name,
+    Type = H1#'ComponentType'.typespec,
+    EncObj =
+% 	case asn1ct_gen:get_constraint(Type#type.constraint,
+% 				       tableconstraint_info) of
+% 	    no ->
+% 		false;
+% 	    _ ->
+% 		{no_attr,"ObjFun"}
+% 	end,
+	case asn1ct_gen:get_constraint(Type#type.constraint,
+				       componentrelation) of
+	    no -> false;
+	    _ -> {no_attr,"ObjFun"}
+	end,
+    emit({{asis,H1#'ComponentType'.name}," ->",nl}),
+    gen_enc_line(TopType,Cname,Type,"element(2,Val)", Pos+1,EncObj,Ext),
+    gen_enc_choice2(TopType,T, Pos+1, Ext);
+gen_enc_choice2(_,[], _, _)  ->
+    true.
+
+gen_dec_choice(TopType,CompList,{ext,Pos,NumExt}) ->
+    emit({"{Ext,",{curr,bytes},"} = ?RT_PER:getbit(Bytes),",nl}),
+    asn1ct_name:new(bytes),
+    gen_dec_choice1(TopType,CompList,{ext,Pos,NumExt});
+gen_dec_choice(TopType,CompList,noext) ->
+    gen_dec_choice1(TopType,CompList,noext).
+
+gen_dec_choice1(TopType,CompList,noext) ->
+    emit({"{Choice,",{curr,bytes},
+	  "} = ?RT_PER:getchoice(",{prev,bytes},",",
+	  length(CompList),", 0),",nl}),
+    emit({"{Cname,{Val,NewBytes}} = case Choice of",nl}),
+    gen_dec_choice2(TopType,CompList,noext),
+    emit({nl,"end,",nl}),
+    emit({nl,"{{Cname,Val},NewBytes}"});
+gen_dec_choice1(TopType,{RootList,ExtList},Ext) ->
+    NewList = RootList ++ ExtList,
+    gen_dec_choice1(TopType, NewList, Ext);
+gen_dec_choice1(TopType,CompList,{ext,ExtPos,ExtNum}) ->
+    emit({"{Choice,",{curr,bytes},
+	  "} = ?RT_PER:getchoice(",{prev,bytes},",",
+	  length(CompList)-ExtNum,",Ext ),",nl}),
+    emit({"{Cname,{Val,NewBytes}} = case Choice + Ext*",ExtPos-1," of",nl}),
+    gen_dec_choice2(TopType,CompList,{ext,ExtPos,ExtNum}),
+    emit([";",nl,"_ -> {asn1_ExtAlt, ?RT_PER:decode_open_type(",{curr,bytes},",[])}"]),
+    emit({nl,"end,",nl}),
+    emit({nl,"{{Cname,Val},NewBytes}"}).
+
+
+gen_dec_choice2(TopType,L,Ext) ->
+    gen_dec_choice2(TopType,L,0,Ext).
+
+gen_dec_choice2(TopType,[H1,H2|T],Pos,Ext)
+when record(H1,'ComponentType'), record(H2,'ComponentType') ->
+    Cname = H1#'ComponentType'.name,
+    Type = H1#'ComponentType'.typespec,
+    case Type#type.def of
+	#'ObjectClassFieldType'{type={typefield,_}} ->
+	    emit({Pos," -> ",nl}),
+	    wrap_gen_dec_line(H1,TopType,Cname,Type,Pos+1,false,Ext),
+	    emit({";",nl});
+	_ ->
+	    emit({Pos," -> {",{asis,Cname},",",nl}),
+	    wrap_gen_dec_line(H1,TopType,Cname,Type,Pos+1,false,Ext),
+	    emit({"};",nl})
+    end,
+    gen_dec_choice2(TopType,[H2|T],Pos+1,Ext);
+gen_dec_choice2(TopType,[H1,_H2|T],Pos,Ext) when record(H1,'ComponentType') ->
+    gen_dec_choice2(TopType,[H1|T],Pos,Ext); % skip extensionmark
+gen_dec_choice2(TopType,[H1|T],Pos,Ext) when record(H1,'ComponentType') ->
+    Cname = H1#'ComponentType'.name,
+    Type = H1#'ComponentType'.typespec,
+    case Type#type.def of
+	#'ObjectClassFieldType'{type={typefield,_}} ->
+	    emit({Pos," -> ",nl}),
+	    wrap_gen_dec_line(H1,TopType,Cname,Type,Pos+1,false,Ext);
+	_ ->
+	    emit({Pos," -> {",{asis,Cname},",",nl}),
+	    wrap_gen_dec_line(H1,TopType,Cname,Type,Pos+1,false,Ext),
+	    emit("}")
+    end,
+    gen_dec_choice2(TopType,[T],Pos+1);
+gen_dec_choice2(TopType,[_|T],Pos,Ext) ->
+    gen_dec_choice2(TopType,T,Pos,Ext);% skip extensionmark
+gen_dec_choice2(_,[],Pos,_)  ->
+    Pos.
+
+indent(N) ->
+    lists:duplicate(N,32). % 32 = space
+
+gen_encode_prim_wrapper(CtgenMod,Erule,Cont,DoTag,Value) ->
+%    put(component_type,true), % add more info in component_type
+    CtgenMod:gen_encode_prim(Erule,Cont,DoTag,Value).
+%    erase(component_type).
+
+make_element(I,Val,Cname) ->
+    case lists:member(optimize,get(encoding_options)) of
+	false ->
+	    io_lib:format("?RT_PER:cindex(~w,~s,~w)",[I,Val,Cname]);
+	_ ->
+	    io_lib:format("element(~w,~s)",[I,Val])
+    end.
+
+wrap_gen_dec_line(C,TopType,Cname,Type,Pos,DIO,Ext) ->
+    put(component_type,{true,C}),
+    gen_dec_line(TopType,Cname,Type,Pos,DIO,Ext),
+    erase(component_type).
+
+get_components_prop() ->
+    case get(component_type) of
+	undefined ->
+	    mandatory;
+	{true,#'ComponentType'{prop=Prop}} -> Prop
+    end.
+
+
+value_match(Index,Value) when atom(Value) ->
+    value_match(Index,atom_to_list(Value));
+value_match([],Value) ->
+    Value;
+value_match([{VI,_}|VIs],Value) ->
+    value_match1(Value,VIs,lists:concat(["element(",VI,","]),1).
+value_match1(Value,[],Acc,Depth) ->
+    Acc ++ Value ++ lists:concat(lists:duplicate(Depth,")"));
+value_match1(Value,[{VI,_}|VIs],Acc,Depth) ->
+    value_match1(Value,VIs,Acc++lists:concat(["element(",VI,","]),Depth+1).
+
+notice_value_match() ->
+    Module = get(currmod),
+    put(value_match,{true,Module}).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen.erl
new file mode 100644
index 0000000000..5d2f7a13bd
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen.erl
@@ -0,0 +1,1664 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_gen.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
+%%
+-module(asn1ct_gen).
+
+-include("asn1_records.hrl").
+%%-compile(export_all).
+-export([pgen_exports/3,
+	 pgen_hrl/4,
+	 gen_head/3,
+	 demit/1,
+	 emit/1,
+	 fopen/2,
+	 get_inner/1,type/1,def_to_tag/1,prim_bif/1,
+	 type_from_object/1,
+	 get_typefromobject/1,get_fieldcategory/2,
+	 get_classfieldcategory/2,
+	 list2name/1,
+	 list2rname/1,
+	 constructed_suffix/2,
+	 unify_if_string/1,
+	 gen_check_call/7,
+	 get_constraint/2,
+	 insert_once/2,
+	 rt2ct_suffix/1,rt2ct_suffix/0]).
+-export([pgen/4,pgen_module/5,mk_var/1, un_hyphen_var/1]).
+-export([gen_encode_constructed/4,gen_decode_constructed/4]).
+
+%% pgen(Erules, Module, TypeOrVal)
+%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
+%% .hrl file is only generated if necessary
+%% Erules = per | ber | ber_bin | per_bin
+%% Module = atom()
+%% TypeOrVal = {TypeList,ValueList}
+%% TypeList = ValueList = [atom()]
+
+pgen(OutFile,Erules,Module,TypeOrVal) ->
+    pgen_module(OutFile,Erules,Module,TypeOrVal,true).
+
+
+pgen_module(OutFile,Erules,Module,TypeOrVal,Indent) ->
+    put(outfile,OutFile),
+    HrlGenerated = asn1ct_gen:pgen_hrl(Erules,Module,TypeOrVal,Indent),
+    asn1ct_name:start(),
+    ErlFile = lists:concat([OutFile,".erl"]),
+    Fid = asn1ct_gen:fopen(ErlFile,write),
+    put(gen_file_out,Fid),
+    asn1ct_gen:gen_head(Erules,Module,HrlGenerated),
+    pgen_exports(Erules,Module,TypeOrVal),
+    pgen_dispatcher(Erules,Module,TypeOrVal),
+    pgen_info(Erules,Module),
+    pgen_typeorval(wrap_ber(Erules),Module,TypeOrVal),
+    pgen_partial_incomplete_decode(Erules),
+% gen_vars(asn1_db:mod_to_vars(Module)),
+% gen_tag_table(AllTypes),
+    file:close(Fid),
+    io:format("--~p--~n",[{generated,ErlFile}]).
+
+
+pgen_typeorval(Erules,Module,{Types,Values,_Ptypes,_Classes,Objects,ObjectSets}) ->
+    pgen_types(Erules,Module,Types),
+    pgen_values(Erules,Module,Values),
+    pgen_objects(Erules,Module,Objects),
+    pgen_objectsets(Erules,Module,ObjectSets),
+    case catch lists:member(der,get(encoding_options)) of
+	true ->
+	    pgen_check_defaultval(Erules,Module);
+	_ -> ok
+    end,
+    pgen_partial_decode(Erules,Module).
+
+pgen_values(_,_,[]) ->
+    true;
+pgen_values(Erules,Module,[H|T]) ->
+    Valuedef = asn1_db:dbget(Module,H),
+    gen_value(Valuedef),
+    pgen_values(Erules,Module,T).
+
+pgen_types(_,Module,[]) ->
+    gen_value_match(Module),
+    true;
+pgen_types(Erules,Module,[H|T]) ->
+    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
+				       rt2ct_suffix(Erules)])),
+    asn1ct_name:clear(),
+    Typedef = asn1_db:dbget(Module,H),
+    Rtmod:gen_encode(Erules,Typedef),
+    asn1ct_name:clear(),
+    Rtmod:gen_decode(Erules,Typedef),
+    pgen_types(Erules,Module,T).
+
+pgen_objects(_,_,[]) ->
+    true;
+pgen_objects(Erules,Module,[H|T]) ->
+    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
+				       rt2ct_suffix(Erules)])),
+    asn1ct_name:clear(),
+    Typedef = asn1_db:dbget(Module,H),
+    Rtmod:gen_obj_code(Erules,Module,Typedef),
+    pgen_objects(Erules,Module,T).
+
+pgen_objectsets(_,_,[]) ->
+    true;
+pgen_objectsets(Erules,Module,[H|T]) ->
+    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
+				       rt2ct_suffix(Erules)])),
+    asn1ct_name:clear(),
+    TypeDef = asn1_db:dbget(Module,H),
+    Rtmod:gen_objectset_code(Erules,TypeDef),
+    pgen_objectsets(Erules,Module,T).
+
+pgen_check_defaultval(Erules,Module) ->
+    CheckObjects = ets:tab2list(check_functions),
+    case get(asndebug) of
+	true ->
+	    FileName = lists:concat([Module,'.table']),
+	    {ok,IoDevice} = file:open(FileName,[write]),
+	    Fun =
+		fun(X)->
+			io:format(IoDevice,"~n~n************~n~n~p~n~n*****"
+				  "********~n~n",[X])
+		end,
+	    lists:foreach(Fun,CheckObjects),
+	    file:close(IoDevice);
+	_ -> ok
+    end,
+    gen_check_defaultval(Erules,Module,CheckObjects).
+
+pgen_partial_decode(Erules,Module) ->
+    pgen_partial_inc_dec(Erules,Module),
+    pgen_partial_dec(Erules,Module).
+
+pgen_partial_inc_dec(Erules,Module) ->
+%    io:format("Start partial incomplete decode gen?~n"),
+    case asn1ct:get_gen_state_field(inc_type_pattern) of
+	undefined ->
+%	    io:format("Partial incomplete decode gen not started:�~w~n",[asn1ct:get_gen_state_field(active)]),
+	    ok;
+%	[] ->
+%	    ok;
+	ConfList ->
+	    PatternLists=lists:map(fun({_,P}) -> P end,ConfList),
+	    pgen_partial_inc_dec1(Erules,Module,PatternLists),
+	    gen_partial_inc_dec_refed_funcs(Erules)
+    end.
+
+%% pgen_partial_inc_dec1 generates a function of the toptype in each
+%% of the partial incomplete decoded types.
+pgen_partial_inc_dec1(Erules,Module,[P|Ps]) ->
+    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
+				       rt2ct_suffix(Erules)])),
+    TopTypeName = asn1ct:partial_inc_dec_toptype(P),
+    TypeDef=asn1_db:dbget(Module,TopTypeName),
+    asn1ct_name:clear(),
+    asn1ct:update_gen_state(namelist,P),
+    asn1ct:update_gen_state(active,true),
+    asn1ct:update_gen_state(prefix,"dec-inc-"),
+    Rtmod:gen_decode(Erules,TypeDef),
+%%    asn1ct:update_gen_state(namelist,tl(P)), %%
+    gen_dec_part_inner_constr(Erules,TypeDef,[TopTypeName]),
+    pgen_partial_inc_dec1(Erules,Module,Ps);
+pgen_partial_inc_dec1(_,_,[]) ->
+    ok.
+
+gen_partial_inc_dec_refed_funcs(Erule) when Erule == ber_bin_v2 ->
+    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erule),
+				       rt2ct_suffix(Erule)])),
+    case asn1ct:next_refed_func() of
+	[] ->
+	    ok;
+	{#'Externaltypereference'{module=M,type=Name},Pattern} ->
+	    TypeDef = asn1_db:dbget(M,Name),
+	    asn1ct:update_gen_state(namelist,Pattern),
+	    Rtmod:gen_inc_decode(Erule,TypeDef),
+	    gen_dec_part_inner_constr(Erule,TypeDef,[Name]),
+	    gen_partial_inc_dec_refed_funcs(Erule);
+	_ ->
+	    gen_partial_inc_dec_refed_funcs(Erule)
+    end;
+gen_partial_inc_dec_refed_funcs(_) ->
+    ok.
+
+pgen_partial_dec(_Erules,_Module) ->
+    ok. %%%% implement later
+
+%% generate code for all inner types that are called from the top type
+%% of the partial incomplete decode
+gen_dec_part_inner_constr(Erules,TypeDef,TypeName) ->
+    Def = TypeDef#typedef.typespec,
+    InnerType = asn1ct_gen:get_inner(Def#type.def),
+    case InnerType of
+	'SET' ->
+	    #'SET'{components=Components} = Def#type.def,
+	    gen_dec_part_inner_types(Erules,Components,TypeName);
+	%%  Continue generate the inner of each component
+	'SEQUENCE' ->
+	    #'SEQUENCE'{components=Components} = Def#type.def,
+	    gen_dec_part_inner_types(Erules,Components,TypeName);
+	'CHOICE' ->
+	    {_,Components} = Def#type.def,
+	    gen_dec_part_inner_types(Erules,Components,TypeName);
+	'SEQUENCE OF' ->
+	    %% this and next case must be the last component in the
+	    %% partial decode chain here. Not likely that this occur.
+	    {_,Type} = Def#type.def,
+	    NameSuffix = constructed_suffix(InnerType,Type#type.def),
+	    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
+					       rt2ct_suffix(Erules)])),
+	    asn1ct_name:clear(),
+	    Rtmod:gen_decode(Erules,[NameSuffix|TypeName],Type);
+%%	    gen_types(Erules,[NameSuffix|Typename],Type);
+	'SET OF' ->
+	    {_,Type} = Def#type.def,
+	    NameSuffix = constructed_suffix(InnerType,Type#type.def),
+	    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
+					       rt2ct_suffix(Erules)])),
+	    asn1ct_name:clear(),
+	    Rtmod:gen_decode(Erules,[NameSuffix|TypeName],Type);
+	_ ->
+	    ok
+    end.
+
+gen_dec_part_inner_types(Erules,[ComponentType|Rest],TypeName) ->
+    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
+				       rt2ct_suffix(Erules)])),
+    asn1ct_name:clear(),
+    Rtmod:gen_decode(Erules,TypeName,ComponentType),
+    gen_dec_part_inner_types(Erules,Rest,TypeName);
+gen_dec_part_inner_types(Erules,{Comps1,Comps2},TypeName)
+  when list(Comps1),list(Comps2) ->
+    gen_dec_part_inner_types(Erules,Comps1 ++ Comps2,TypeName);
+gen_dec_part_inner_types(_,[],_) ->
+    ok.
+
+
+pgen_partial_incomplete_decode(Erule) ->
+    case asn1ct:get_gen_state_field(active) of
+	true ->
+	    pgen_partial_incomplete_decode1(Erule),
+	    asn1ct:reset_gen_state();
+	_ ->
+	    ok
+    end.
+pgen_partial_incomplete_decode1(ber_bin_v2) ->
+    case asn1ct:read_config_data(partial_incomplete_decode) of
+	undefined ->
+	    ok;
+	Data ->
+	    lists:foreach(fun emit_partial_incomplete_decode/1,Data)
+    end,
+    GeneratedFs= asn1ct:get_gen_state_field(gen_refed_funcs),
+%    io:format("GeneratedFs :~n~p~n",[GeneratedFs]),
+    gen_part_decode_funcs(GeneratedFs,0);
+pgen_partial_incomplete_decode1(_) -> ok.
+
+emit_partial_incomplete_decode({FuncName,TopTypeName,Pattern}) ->
+    emit([{asis,FuncName},"(Bytes) ->",nl,
+	  "  decode_partial_incomplete(",{asis,TopTypeName},",Bytes,",{asis,Pattern},").",nl]);
+emit_partial_incomplete_decode(D) ->
+    throw({error,{asn1,{"bad data in asn1config file",D}}}).
+
+gen_part_decode_funcs([Data={Name,_,_,Type}|GeneratedFs],N) ->
+    InnerType =
+	case Type#type.def of
+	    #'ObjectClassFieldType'{type=OCFTType} ->
+		OCFTType;
+	    _ ->
+		get_inner(Type#type.def)
+	end,
+    WhatKind = type(InnerType),
+    TypeName=list2name(Name),
+    if
+	N > 0 -> emit([";",nl]);
+	true -> ok
+    end,
+    emit(["decode_inc_disp('",TypeName,"',Data) ->",nl]),
+    gen_part_decode_funcs(WhatKind,TypeName,Data),
+    gen_part_decode_funcs(GeneratedFs,N+1);
+gen_part_decode_funcs([_H|T],N) ->
+    gen_part_decode_funcs(T,N);
+gen_part_decode_funcs([],N) ->
+    if
+	N > 0 ->
+	    .emit([".",nl]);
+	true ->
+	    ok
+    end.
+
+gen_part_decode_funcs(#'Externaltypereference'{module=M,type=T},
+		      _TypeName,Data) ->
+    #typedef{typespec=TS} = asn1_db:dbget(M,T),
+    InnerType =
+	case TS#type.def of
+	    #'ObjectClassFieldType'{type=OCFTType} ->
+		OCFTType;
+	    _ ->
+		get_inner(TS#type.def)
+	end,
+    WhatKind = type(InnerType),
+    gen_part_decode_funcs(WhatKind,[T],Data);
+gen_part_decode_funcs({constructed,bif},TypeName,
+		      {_Name,parts,Tag,_Type}) ->
+    emit(["  case Data of",nl,
+	  "    L when list(L) ->",nl,
+	  "      'dec_",TypeName,"'(lists:map(fun(X)->element(1,?RT_BER:decode(X)) end,L),",{asis,Tag},");",nl,
+	  "    _ ->",nl,
+	  "      [Res] = 'dec_",TypeName,"'([Data],",{asis,Tag},"),",nl,
+	  "      Res",nl,
+	  "  end"]);
+gen_part_decode_funcs(WhatKind,_TypeName,{_Name,parts,_Tag,_Type}) ->
+    throw({error,{asn1,{"only SEQUENCE OF/SET OF may have the partial incomplete directive 'parts'.",WhatKind}}});
+gen_part_decode_funcs({constructed,bif},TypeName,
+		      {_Name,undecoded,Tag,_Type}) ->
+    emit(["  'dec_",TypeName,"'(Data,",{asis,Tag},")"]);
+gen_part_decode_funcs({primitive,bif},_TypeName,
+		      {_Name,undecoded,Tag,Type}) ->
+    % Argument no 6 is 0, i.e. bit 6 for primitive encoding.
+    asn1ct_gen_ber_bin_v2:gen_dec_prim(ber_bin_v2,Type,"Data",Tag,[],0,", mandatory, ");
+gen_part_decode_funcs(WhatKind,_TypeName,{_,Directive,_,_}) ->
+    throw({error,{asn1,{"Not implemented yet",WhatKind," partial incomplete directive:",Directive}}}).
+
+gen_types(Erules,Tname,{RootList,ExtList}) when list(RootList) ->
+    gen_types(Erules,Tname,RootList),
+    gen_types(Erules,Tname,ExtList);
+gen_types(Erules,Tname,[{'EXTENSIONMARK',_,_}|Rest]) ->
+    gen_types(Erules,Tname,Rest);
+gen_types(Erules,Tname,[ComponentType|Rest]) ->
+    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
+				       rt2ct_suffix(Erules)])),
+    asn1ct_name:clear(),
+    Rtmod:gen_encode(Erules,Tname,ComponentType),
+    asn1ct_name:clear(),
+    Rtmod:gen_decode(Erules,Tname,ComponentType),
+    gen_types(Erules,Tname,Rest);
+gen_types(_,_,[]) ->
+    true;
+gen_types(Erules,Tname,Type) when record(Type,type) ->
+    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
+				       rt2ct_suffix(Erules)])),
+    asn1ct_name:clear(),
+    Rtmod:gen_encode(Erules,Tname,Type),
+    asn1ct_name:clear(),
+    Rtmod:gen_decode(Erules,Tname,Type).
+
+gen_value_match(Module) ->
+    case get(value_match) of
+	{true,Module} ->
+	    emit(["value_match([{Index,Cname}|Rest],Value) ->",nl,
+		  "  Value2 =",nl,
+		  "    case element(Index,Value) of",nl,
+		  "      {Cname,Val2} -> Val2;",nl,
+		  "      X -> X",nl,
+		  "    end,",nl,
+		  "  value_match(Rest,Value2);",nl,
+		  "value_match([],Value) ->",nl,
+		  "  Value.",nl]);
+	_  -> ok
+    end,
+    put(value_match,undefined).
+
+gen_check_defaultval(Erules,Module,[{Name,Type}|Rest]) ->
+    gen_check_func(Name,Type),
+    gen_check_defaultval(Erules,Module,Rest);
+gen_check_defaultval(_,_,[]) ->
+    ok.
+
+gen_check_func(Name,FType = #type{def=Def}) ->
+    emit({Name,"(V,asn1_DEFAULT) ->",nl,"   true;",nl}),
+    emit({Name,"(V,V) ->",nl,"   true;",nl}),
+    emit({Name,"(V,{_,V}) ->",nl,"   true;",nl}),
+    case Def of
+	{'SEQUENCE OF',Type} ->
+	    gen_check_sof(Name,'SEQOF',Type);
+	{'SET OF',Type} ->
+	    gen_check_sof(Name,'SETOF',Type);
+	#'SEQUENCE'{components=Components} ->
+	    gen_check_sequence(Name,Components);
+	#'SET'{components=Components} ->
+	    gen_check_sequence(Name,Components);
+	{'CHOICE',Components} ->
+	    gen_check_choice(Name,Components);
+	#'Externaltypereference'{type=T} ->
+	    emit({Name,"(DefaultValue,Value) ->",nl}),
+	    emit({"   ",list2name([T,check]),"(DefaultValue,Value).",nl});
+	MaybePrim ->
+	    InnerType = get_inner(MaybePrim),
+	    case type(InnerType) of
+		{primitive,bif} ->
+		    emit({Name,"(DefaultValue,Value) ->",nl,"   "}),
+		    gen_prim_check_call(InnerType,"DefaultValue","Value",
+					FType),
+		    emit({".",nl,nl});
+		_ ->
+		    throw({asn1_error,{unknown,type,MaybePrim}})
+	    end
+    end.
+
+gen_check_sof(Name,SOF,Type) ->
+    NewName = list2name([sorted,Name]),
+    emit({Name,"(V1,V2) ->",nl}),
+    emit({"   ",NewName,"(lists:sort(V1),lists:sort(V2)).",nl,nl}),
+    emit({NewName,"([],[]) ->",nl,"   true;",nl}),
+    emit({NewName,"([DV|DVs],[V|Vs]) ->",nl,"   "}),
+    InnerType = get_inner(Type#type.def),
+    case type(InnerType) of
+	{primitive,bif} ->
+	    gen_prim_check_call(InnerType,"DV","V",Type),
+	    emit({",",nl});
+	{constructed,bif} ->
+	    emit({list2name([SOF,Name]),"(DV, V),",nl});
+	#'Externaltypereference'{type=T} ->
+	    emit({list2name([T,check]),"(DV,V),",nl})
+    end,
+    emit({"   ",NewName,"(DVs,Vs).",nl,nl}).
+
+gen_check_sequence(Name,Components) ->
+    emit({Name,"(DefaultValue,Value) ->",nl}),
+    gen_check_sequence(Name,Components,1).
+gen_check_sequence(Name,[#'ComponentType'{name=N,typespec=Type}|Cs],Num) ->
+    InnerType = get_inner(Type#type.def),
+%    NthDefV = lists:concat(["lists:nth(",Num,",DefaultValue)"]),
+    NthDefV = ["element(",Num+1,",DefaultValue)"],
+%    NthV = lists:concat(["lists:nth(",Num,",Value)"]),
+    NthV = ["element(",Num+1,",Value)"],
+    gen_check_func_call(Name,Type,InnerType,NthDefV,NthV,N),
+    case Cs of
+	[] ->
+	    emit({".",nl,nl});
+	_ ->
+	    emit({",",nl}),
+	    gen_check_sequence(Name,Cs,Num+1)
+    end;
+gen_check_sequence(_,[],_) ->
+    ok.
+
+gen_check_choice(Name,CList=[#'ComponentType'{}|_Cs]) ->
+    emit({Name,"({Id,DefaultValue},{Id,Value}) ->",nl}),
+    emit({"   case Id of",nl}),
+    gen_check_choice_components(Name,CList,1).
+
+gen_check_choice_components(_,[],_)->
+    ok;
+gen_check_choice_components(Name,[#'ComponentType'{name=N,typespec=Type}|
+				  Cs],Num) ->
+    Ind6 = "      ",
+    InnerType = get_inner(Type#type.def),
+%    DefVal = ["element(2,lists:nth(",Num,",DefaultValue))"],
+    emit({Ind6,N," ->",nl,Ind6}),
+    gen_check_func_call(Name,Type,InnerType,{var,"defaultValue"},
+			{var,"value"},N),
+    case Cs of
+	[] ->
+	    emit({nl,"   end.",nl,nl});
+	_ ->
+	    emit({";",nl}),
+	    gen_check_choice_components(Name,Cs,Num+1)
+    end.
+
+gen_check_func_call(Name,Type,InnerType,DefVal,Val,N) ->
+    case type(InnerType) of
+	{primitive,bif} ->
+	    emit("   "),
+	    gen_prim_check_call(InnerType,DefVal,Val,Type);
+	#'Externaltypereference'{type=T} ->
+	    emit({"   ",list2name([T,check]),"(",DefVal,",",Val,")"});
+	_ ->
+	    emit({"   ",list2name([N,Name]),"(",DefVal,",",Val,")"})
+    end.
+
+
+%% VARIOUS GENERATOR STUFF
+%% *************************************************
+%%**************************************************
+
+mk_var(X) when atom(X) ->
+    list_to_atom(mk_var(atom_to_list(X)));
+
+mk_var([H|T]) ->
+    [H-32|T].
+
+%% Since hyphens are allowed in ASN.1 names, it may occur in a
+%% variable to. Turn a hyphen into a under-score sign.
+un_hyphen_var(X) when atom(X) ->
+    list_to_atom(un_hyphen_var(atom_to_list(X)));
+un_hyphen_var([45|T]) ->
+    [95|un_hyphen_var(T)];
+un_hyphen_var([H|T]) ->
+    [H|un_hyphen_var(T)];
+un_hyphen_var([]) ->
+    [].
+
+%% Generate value functions ***************
+%% ****************************************
+%% Generates a function 'V'/0 for each Value V defined in the ASN.1 module
+%% the function returns the value in an Erlang representation which can be
+%% used as  input to the runtime encode functions
+
+gen_value(Value) when record(Value,valuedef) ->
+%%    io:format(" ~w ",[Value#valuedef.name]),
+    emit({"'",Value#valuedef.name,"'() ->",nl}),
+    V = Value#valuedef.value,
+    emit([{asis,V},".",nl,nl]).
+
+gen_encode_constructed(Erules,Typename,InnerType,D) when record(D,type) ->
+
+    Rtmod = list_to_atom(lists:concat(["asn1ct_constructed_",erule(Erules)])),
+    case InnerType of
+	'SET' ->
+	    Rtmod:gen_encode_set(Erules,Typename,D),
+	    #'SET'{components=Components} = D#type.def,
+	    gen_types(Erules,Typename,Components);
+	'SEQUENCE' ->
+	    Rtmod:gen_encode_sequence(Erules,Typename,D),
+	    #'SEQUENCE'{components=Components} = D#type.def,
+	    gen_types(Erules,Typename,Components);
+	'CHOICE' ->
+	    Rtmod:gen_encode_choice(Erules,Typename,D),
+	    {_,Components} = D#type.def,
+	    gen_types(Erules,Typename,Components);
+	'SEQUENCE OF' ->
+	    Rtmod:gen_encode_sof(Erules,Typename,InnerType,D),
+	    {_,Type} = D#type.def,
+	    NameSuffix = asn1ct_gen:constructed_suffix(InnerType,Type#type.def),
+	    gen_types(Erules,[NameSuffix|Typename],Type);
+	'SET OF' ->
+	    Rtmod:gen_encode_sof(Erules,Typename,InnerType,D),
+	    {_,Type} = D#type.def,
+	    NameSuffix = asn1ct_gen:constructed_suffix(InnerType,Type#type.def),
+	    gen_types(Erules,[NameSuffix|Typename],Type);
+	_ ->
+	    exit({nyi,InnerType})
+    end;
+gen_encode_constructed(Erules,Typename,InnerType,D)
+  when record(D,typedef) ->
+    gen_encode_constructed(Erules,Typename,InnerType,D#typedef.typespec).
+
+gen_decode_constructed(Erules,Typename,InnerType,D) when record(D,type) ->
+    Rtmod = list_to_atom(lists:concat(["asn1ct_constructed_",erule(Erules)])),
+    asn1ct:step_in_constructed(), %% updates namelist for incomplete
+                                  %% partial decode
+    case InnerType of
+	'SET' ->
+	    Rtmod:gen_decode_set(Erules,Typename,D);
+	'SEQUENCE' ->
+	    Rtmod:gen_decode_sequence(Erules,Typename,D);
+	'CHOICE' ->
+	    Rtmod:gen_decode_choice(Erules,Typename,D);
+	'SEQUENCE OF' ->
+	    Rtmod:gen_decode_sof(Erules,Typename,InnerType,D);
+	'SET OF' ->
+	    Rtmod:gen_decode_sof(Erules,Typename,InnerType,D);
+	_ ->
+	    exit({nyi,InnerType})
+    end;
+
+
+gen_decode_constructed(Erules,Typename,InnerType,D) when record(D,typedef) ->
+    gen_decode_constructed(Erules,Typename,InnerType,D#typedef.typespec).
+
+
+pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
+    emit({"-export([encoding_rule/0]).",nl}),
+    case Types of
+	[] -> ok;
+	_ ->
+	    emit({"-export([",nl}),
+	    case Erules of
+		ber ->
+		    gen_exports1(Types,"enc_",2);
+		ber_bin ->
+		    gen_exports1(Types,"enc_",2);
+		ber_bin_v2 ->
+		    gen_exports1(Types,"enc_",2);
+		_ ->
+		    gen_exports1(Types,"enc_",1)
+	    end,
+	    emit({"-export([",nl}),
+	    gen_exports1(Types,"dec_",2),
+	    case Erules of
+		ber ->
+		    emit({"-export([",nl}),
+		    gen_exports1(Types,"dec_",3);
+		ber_bin ->
+		    emit({"-export([",nl}),
+		    gen_exports1(Types,"dec_",3);
+		ber_bin_v2 ->
+		    emit({"-export([",nl}),
+		    gen_exports1(Types,"dec_",2);
+		_ -> ok
+	    end
+    end,
+    case Values of
+	[] -> ok;
+	_ ->
+	    emit({"-export([",nl}),
+	    gen_exports1(Values,"",0)
+    end,
+    case Objects of
+	[] -> ok;
+	_ ->
+	    case erule(Erules) of
+		per ->
+		    emit({"-export([",nl}),
+		    gen_exports1(Objects,"enc_",3),
+		    emit({"-export([",nl}),
+		    gen_exports1(Objects,"dec_",4);
+		ber_bin_v2 ->
+		    emit({"-export([",nl}),
+		    gen_exports1(Objects,"enc_",3),
+		    emit({"-export([",nl}),
+		    gen_exports1(Objects,"dec_",3);
+		_ ->
+		    emit({"-export([",nl}),
+		    gen_exports1(Objects,"enc_",4),
+		    emit({"-export([",nl}),
+		    gen_exports1(Objects,"dec_",4)
+	    end
+    end,
+    case ObjectSets of
+	[] -> ok;
+	_ ->
+	    emit({"-export([",nl}),
+	    gen_exports1(ObjectSets,"getenc_",2),
+	    emit({"-export([",nl}),
+	    gen_exports1(ObjectSets,"getdec_",2)
+    end,
+    emit({"-export([info/0]).",nl}),
+    gen_partial_inc_decode_exports(),
+    emit({nl,nl}).
+
+gen_exports1([F1,F2|T],Prefix,Arity) ->
+	emit({"'",Prefix,F1,"'/",Arity,com,nl}),
+	gen_exports1([F2|T],Prefix,Arity);
+gen_exports1([Flast|_T],Prefix,Arity) ->
+	emit({"'",Prefix,Flast,"'/",Arity,nl,"]).",nl,nl}).
+
+gen_partial_inc_decode_exports() ->
+    case {asn1ct:read_config_data(partial_incomplete_decode),
+	  asn1ct:get_gen_state_field(inc_type_pattern)}  of
+	{undefined,_} ->
+	    ok;
+	{_,undefined} ->
+	    ok;
+	{Data,_} ->
+	    gen_partial_inc_decode_exports(Data),
+	    emit("-export([decode_part/2]).")
+    end.
+gen_partial_inc_decode_exports([]) ->
+    ok;
+gen_partial_inc_decode_exports([{Name,_,_}|Rest]) ->
+    emit(["-export([",Name,"/1"]),
+    gen_partial_inc_decode_exports1(Rest);
+gen_partial_inc_decode_exports([_|Rest]) ->
+    gen_partial_inc_decode_exports(Rest).
+
+gen_partial_inc_decode_exports1([]) ->
+    emit(["]).",nl]);
+gen_partial_inc_decode_exports1([{Name,_,_}|Rest]) ->
+    emit([", ",Name,"/1"]),
+    gen_partial_inc_decode_exports1(Rest);
+gen_partial_inc_decode_exports1([_|Rest]) ->
+    gen_partial_inc_decode_exports1(Rest).
+
+pgen_dispatcher(Erules,_Module,{[],_Values,_,_,_Objects,_ObjectSets}) ->
+    emit(["encoding_rule() ->",nl]),
+    emit([{asis,Erules},".",nl,nl]);
+pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
+    emit(["-export([encode/2,decode/2,encode_disp/2,decode_disp/2]).",nl,nl]),
+    emit(["encoding_rule() ->",nl]),
+    emit(["   ",{asis,Erules},".",nl,nl]),
+    Call = case Erules of
+	       per -> "?RT_PER:complete(encode_disp(Type,Data))";
+	       per_bin -> "?RT_PER:complete(encode_disp(Type,Data))";
+	       ber -> "encode_disp(Type,Data)";
+	       ber_bin -> "encode_disp(Type,Data)";
+	       ber_bin_v2 -> "encode_disp(Type,Data)"
+	   end,
+    EncWrap = case Erules of
+	       ber -> "wrap_encode(Bytes)";
+	       _ -> "Bytes"
+	   end,
+    emit(["encode(Type,Data) ->",nl,
+	  "case catch ",Call," of",nl,
+	  "  {'EXIT',{error,Reason}} ->",nl,
+	  "    {error,Reason};",nl,
+	  "  {'EXIT',Reason} ->",nl,
+	  "    {error,{asn1,Reason}};",nl,
+	  "  {Bytes,_Len} ->",nl,
+	  "    {ok,",EncWrap,"};",nl,
+	  "  Bytes ->",nl,
+	  "    {ok,",EncWrap,"}",nl,
+	  "end.",nl,nl]),
+
+    case Erules of
+	ber_bin_v2 ->
+	    emit(["decode(Type,Data0) ->",nl]),
+	    emit(["{Data,_RestBin} = ?RT_BER:decode(Data0",driver_parameter(),"),",nl]);
+	_ ->
+	    emit(["decode(Type,Data) ->",nl])
+    end,
+    DecWrap = case Erules of
+		  ber -> "wrap_decode(Data)";
+		  _ -> "Data"
+	      end,
+
+    emit(["case catch decode_disp(Type,",DecWrap,") of",nl,
+	  "  {'EXIT',{error,Reason}} ->",nl,
+	  "    {error,Reason};",nl,
+	  "  {'EXIT',Reason} ->",nl,
+	  "    {error,{asn1,Reason}};",nl]),
+    case Erules of
+	ber_bin_v2 ->
+	    emit(["  Result ->",nl,
+		  "    {ok,Result}",nl]);
+	_ ->
+	    emit(["  {X,_Rest} ->",nl,
+		  "    {ok,X};",nl,
+		  "  {X,_Rest,_Len} ->",nl,
+		  "    {ok,X}",nl])
+    end,
+    emit(["end.",nl,nl]),
+
+    gen_decode_partial_incomplete(Erules),
+
+    case Types of
+	[] -> ok;
+	_ ->
+	    case Erules of
+		ber ->
+		    gen_dispatcher(Types,"encode_disp","enc_",",[]"),
+		    gen_dispatcher(Types,"decode_disp","dec_",",mandatory");
+		ber_bin ->
+		    gen_dispatcher(Types,"encode_disp","enc_",",[]"),
+		    gen_dispatcher(Types,"decode_disp","dec_",",mandatory");
+		ber_bin_v2 ->
+		    gen_dispatcher(Types,"encode_disp","enc_",""),
+		    gen_dispatcher(Types,"decode_disp","dec_",""),
+		    gen_partial_inc_dispatcher();
+		_PerOrPer_bin ->
+		    gen_dispatcher(Types,"encode_disp","enc_",""),
+		    gen_dispatcher(Types,"decode_disp","dec_",",mandatory")
+	    end,
+	    emit([nl])
+    end,
+    case Erules of
+	ber ->
+	    gen_wrapper();
+	_ -> ok
+    end,
+    emit({nl,nl}).
+
+
+gen_decode_partial_incomplete(Erule) when Erule == ber;Erule==ber_bin;
+					   Erule==ber_bin_v2 ->
+    case {asn1ct:read_config_data(partial_incomplete_decode),
+	  asn1ct:get_gen_state_field(inc_type_pattern)} of
+	{undefined,_} ->
+	    ok;
+	{_,undefined} ->
+	    ok;
+	_ ->
+	    case Erule of
+		ber_bin_v2 ->
+		    EmitCaseClauses =
+			fun() ->
+				emit(["   {'EXIT',{error,Reason}} ->",nl,
+				      "      {error,Reason};",nl,
+				      "    {'EXIT',Reason} ->",nl,
+				      "      {error,{asn1,Reason}};",nl,
+				      "    Result ->",nl,
+				      "      {ok,Result}",nl,
+				      "  end.",nl,nl])
+			end,
+		    emit(["decode_partial_incomplete(Type,Data0,",
+			  "Pattern) ->",nl]),
+		    emit(["  {Data,_RestBin} =",nl,
+			  "    ?RT_BER:decode_primitive_",
+			  "incomplete(Pattern,Data0),",nl,
+			  "  case catch decode_partial_inc_disp(Type,",
+			  "Data) of",nl]),
+		    EmitCaseClauses(),
+		    emit(["decode_part(Type,Data0) ->",nl,
+			  "  {Data,_RestBin} = ?RT_BER:decode(Data0),",nl,
+			  "  case catch decode_inc_disp(Type,Data) of",nl]),
+		    EmitCaseClauses();
+		_ -> ok % add later
+	    end
+    end;
+gen_decode_partial_incomplete(_Erule) ->
+    ok.
+
+gen_partial_inc_dispatcher() ->
+    case {asn1ct:read_config_data(partial_incomplete_decode),
+	  asn1ct:get_gen_state_field(inc_type_pattern)} of
+	{undefined,_} ->
+	    ok;
+	{_,undefined} ->
+	    ok;
+	{Data,_} ->
+	    gen_partial_inc_dispatcher(Data)
+    end.
+gen_partial_inc_dispatcher([{_FuncName,TopType,_Pattern}|Rest]) ->
+    emit(["decode_partial_inc_disp(",{asis,TopType},",Data) ->",nl,
+	  "  ",{asis,list_to_atom(lists:concat([dec,"-inc-",TopType]))},
+	  "(Data);",nl]),
+    gen_partial_inc_dispatcher(Rest);
+gen_partial_inc_dispatcher([]) ->
+    emit(["decode_partial_inc_disp(Type,_Data) ->",nl,
+	  "  exit({error,{asn1,{undefined_type,Type}}}).",nl]).
+
+driver_parameter() ->
+    Options = get(encoding_options),
+    case lists:member(driver,Options) of
+	true ->
+	    ",driver";
+	_ -> ""
+    end.
+
+gen_wrapper() ->
+    emit(["wrap_encode(Bytes) when list(Bytes) ->",nl,
+	  "   binary_to_list(list_to_binary(Bytes));",nl,
+	  "wrap_encode(Bytes) when binary(Bytes) ->",nl,
+	  "   binary_to_list(Bytes);",nl,
+	  "wrap_encode(Bytes) -> Bytes.",nl,nl]),
+    emit(["wrap_decode(Bytes) when list(Bytes) ->",nl,
+	  "   list_to_binary(Bytes);",nl,
+	  "wrap_decode(Bytes) -> Bytes.",nl]).
+
+gen_dispatcher([F1,F2|T],FuncName,Prefix,ExtraArg) ->
+	emit([FuncName,"('",F1,"',Data) -> '",Prefix,F1,"'(Data",ExtraArg,")",";",nl]),
+	gen_dispatcher([F2|T],FuncName,Prefix,ExtraArg);
+gen_dispatcher([Flast|_T],FuncName,Prefix,ExtraArg) ->
+	emit([FuncName,"('",Flast,"',Data) -> '",Prefix,Flast,"'(Data",ExtraArg,")",";",nl]),
+	emit([FuncName,"(","Type",",_Data) -> exit({error,{asn1,{undefined_type,Type}}}).",nl,nl,nl]).
+
+pgen_info(_Erules,Module) ->
+    Options = get(encoding_options),
+    emit({"info() ->",nl,
+	  "  [{vsn,'",asn1ct:vsn(),"'},",
+	  "   {module,'",Module,"'},",
+	  "   {options,",io_lib:format("~p",[Options]),"}].",nl}).
+
+open_hrl(OutFile,Module) ->
+    File = lists:concat([OutFile,".hrl"]),
+    Fid = fopen(File,write),
+    put(gen_file_out,Fid),
+    gen_hrlhead(Module).
+
+%% EMIT functions ************************
+%% ***************************************
+
+						% debug generation
+demit(Term) ->
+    case get(asndebug) of
+	true -> emit(Term);
+	_ ->true
+    end.
+
+						% always generation
+
+emit({external,_M,T}) ->
+    emit(T);
+
+emit({prev,Variable}) when atom(Variable) ->
+    emit({var,asn1ct_name:prev(Variable)});
+
+emit({next,Variable}) when atom(Variable) ->
+    emit({var,asn1ct_name:next(Variable)});
+
+emit({curr,Variable}) when atom(Variable) ->
+    emit({var,asn1ct_name:curr(Variable)});
+
+emit({var,Variable}) when atom(Variable) ->
+    [Head|V] = atom_to_list(Variable),
+    emit([Head-32|V]);
+
+emit({var,Variable}) ->
+    [Head|V] = Variable,
+    emit([Head-32|V]);
+
+emit({asis,What}) ->
+    format(get(gen_file_out),"~w",[What]);
+
+emit(nl) ->
+    nl(get(gen_file_out));
+
+emit(com) ->
+    emit(",");
+
+emit(tab) ->
+    put_chars(get(gen_file_out),"     ");
+
+emit(What) when integer(What) ->
+    put_chars(get(gen_file_out),integer_to_list(What));
+
+emit(What) when list(What), integer(hd(What)) ->
+    put_chars(get(gen_file_out),What);
+
+emit(What) when atom(What) ->
+    put_chars(get(gen_file_out),atom_to_list(What));
+
+emit(What) when tuple(What) ->
+    emit_parts(tuple_to_list(What));
+
+emit(What) when list(What) ->
+    emit_parts(What);
+
+emit(X) ->
+    exit({'cant emit ',X}).
+
+emit_parts([]) -> true;
+emit_parts([H|T]) ->
+    emit(H),
+    emit_parts(T).
+
+format(undefined,X,Y) ->
+    io:format(X,Y);
+format(X,Y,Z) ->
+    io:format(X,Y,Z).
+
+nl(undefined) -> io:nl();
+nl(X) -> io:nl(X).
+
+put_chars(undefined,X) ->
+    io:put_chars(X);
+put_chars(Y,X) ->
+    io:put_chars(Y,X).
+
+fopen(F, Mode) ->
+    case file:open(F, [Mode]) of
+	{ok, Fd} ->
+	    Fd;
+	{error, Reason} ->
+	    io:format("** Can't open file ~p ~n", [F]),
+	    exit({error,Reason})
+    end.
+
+pgen_hrl(Erules,Module,TypeOrVal,_Indent) ->
+    put(currmod,Module),
+    {Types,Values,Ptypes,_,_,_} = TypeOrVal,
+    Ret =
+	case pgen_hrltypes(Erules,Module,Ptypes++Types,0) of
+	    0 ->
+		case Values of
+		    [] ->
+			0;
+		    _ ->
+			open_hrl(get(outfile),get(currmod)),
+			pgen_macros(Erules,Module,Values),
+			1
+		end;
+	    X ->
+		pgen_macros(Erules,Module,Values),
+		X
+	end,
+    case Ret of
+	0 ->
+	    0;
+	Y ->
+	    Fid = get(gen_file_out),
+	    file:close(Fid),
+	    io:format("--~p--~n",
+		      [{generated,lists:concat([get(outfile),".hrl"])}]),
+	    Y
+    end.
+
+pgen_macros(_,_,[]) ->
+    true;
+pgen_macros(Erules,Module,[H|T]) ->
+    Valuedef = asn1_db:dbget(Module,H),
+    gen_macro(Valuedef),
+    pgen_macros(Erules,Module,T).
+
+pgen_hrltypes(_,_,[],NumRecords) ->
+    NumRecords;
+pgen_hrltypes(Erules,Module,[H|T],NumRecords) ->
+%    io:format("records = ~p~n",NumRecords),
+    Typedef = asn1_db:dbget(Module,H),
+    AddNumRecords = gen_record(Typedef,NumRecords),
+    pgen_hrltypes(Erules,Module,T,NumRecords+AddNumRecords).
+
+
+%% Generates a macro for value Value defined in the ASN.1 module
+gen_macro(Value) when record(Value,valuedef) ->
+    emit({"-define('",Value#valuedef.name,"', ",
+	  {asis,Value#valuedef.value},").",nl}).
+
+%% Generate record functions **************
+%% Generates an Erlang record for each named and unnamed SEQUENCE and SET in the ASN.1
+%% module. If no SEQUENCE or SET is found there is no .hrl file generated
+
+
+gen_record(Tdef,NumRecords) when record(Tdef,typedef) ->
+    Name = [Tdef#typedef.name],
+    Type = Tdef#typedef.typespec,
+    gen_record(type,Name,Type,NumRecords);
+
+gen_record(Tdef,NumRecords) when record(Tdef,ptypedef) ->
+    Name = [Tdef#ptypedef.name],
+    Type = Tdef#ptypedef.typespec,
+    gen_record(ptype,Name,Type,NumRecords).
+
+gen_record(TorPtype,Name,[#'ComponentType'{name=Cname,typespec=Type}|T],Num) ->
+    Num2 = gen_record(TorPtype,[Cname|Name],Type,Num),
+    gen_record(TorPtype,Name,T,Num2);
+gen_record(TorPtype,Name,{Clist1,Clist2},Num) when list(Clist1), list(Clist2) ->
+    gen_record(TorPtype,Name,Clist1++Clist2,Num);
+gen_record(TorPtype,Name,[_|T],Num) -> % skip EXTENSIONMARK
+    gen_record(TorPtype,Name,T,Num);
+gen_record(_TorPtype,_Name,[],Num) ->
+    Num;
+
+gen_record(TorPtype,Name,Type,Num) when record(Type,type) ->
+    Def = Type#type.def,
+    Rec = case Def of
+	      Seq when record(Seq,'SEQUENCE') ->
+		  case Seq#'SEQUENCE'.pname of
+		      false ->
+			  {record,Seq#'SEQUENCE'.components};
+		      _Pname when TorPtype == type ->
+			  false;
+		      _ ->
+			  {record,Seq#'SEQUENCE'.components}
+		  end;
+	      Set when record(Set,'SET') ->
+		  case Set#'SET'.pname of
+		      false ->
+			  {record,Set#'SET'.components};
+		      _Pname when TorPtype == type ->
+			  false;
+		      _ ->
+			  {record,Set#'SET'.components}
+		  end;
+%	      {'SET',{_,_CompList}} ->
+%		  {record,_CompList};
+	      {'CHOICE',_CompList} -> {inner,Def};
+	      {'SEQUENCE OF',_CompList} -> {['SEQOF'|Name],Def};
+	      {'SET OF',_CompList} -> {['SETOF'|Name],Def};
+	      _ -> false
+    end,
+    case Rec of
+	false -> Num;
+	{record,CompList} ->
+	    case Num of
+		0 -> open_hrl(get(outfile),get(currmod));
+		_ -> true
+	    end,
+	    emit({"-record('",list2name(Name),"',{",nl}),
+	    RootList = case CompList of
+			   _ when list(CompList) ->
+			       CompList;
+			   {_Rl,_} -> _Rl
+		       end,
+	    gen_record2(Name,'SEQUENCE',RootList),
+	    NewCompList =
+		case CompList of
+		    {CompList1,[]} ->
+			emit({"}). % with extension mark",nl,nl}),
+			CompList1;
+		    {Tr,ExtensionList2} ->
+			case Tr of
+			    [] -> true;
+			    _ -> emit({",",nl})
+			end,
+			emit({"%% with extensions",nl}),
+			gen_record2(Name, 'SEQUENCE', ExtensionList2,
+				    "", ext),
+			emit({"}).",nl,nl}),
+			Tr ++ ExtensionList2;
+		    _ ->
+			emit({"}).",nl,nl}),
+			CompList
+		end,
+	    gen_record(TorPtype,Name,NewCompList,Num+1);
+	{inner,{'CHOICE', CompList}} ->
+	    gen_record(TorPtype,Name,CompList,Num);
+	{NewName,{_, CompList}} ->
+	    gen_record(TorPtype,NewName,CompList,Num)
+    end;
+gen_record(_,_,_,NumRecords) -> % skip CLASS etc for now.
+     NumRecords.
+
+gen_head(Erules,Mod,Hrl) ->
+    {Rtmac,Rtmod} = case Erules of
+			per ->
+			    emit({"%% Generated by the Erlang ASN.1 PER-"
+				  "compiler version:",asn1ct:vsn(),nl}),
+			    {"RT_PER",?RT_PER};
+			ber ->
+			    emit({"%% Generated by the Erlang ASN.1 BER-"
+				  "compiler version:",asn1ct:vsn(),nl}),
+			    {"RT_BER",?RT_BER_BIN};
+			per_bin ->
+			    emit({"%% Generated by the Erlang ASN.1 BER-"
+				  "compiler version, utilizing bit-syntax:",
+				  asn1ct:vsn(),nl}),
+			    %% temporary code to enable rt2ct optimization
+			    Options = get(encoding_options),
+			    case lists:member(optimize,Options) of
+				true -> {"RT_PER","asn1rt_per_bin_rt2ct"};
+				_ ->
+				    {"RT_PER",?RT_PER_BIN}
+			    end;
+			ber_bin ->
+			    emit({"%% Generated by the Erlang ASN.1 BER-"
+				  "compiler version, utilizing bit-syntax:",
+				  asn1ct:vsn(),nl}),
+			    {"RT_BER",?RT_BER_BIN};
+			ber_bin_v2 ->
+			    emit({"%% Generated by the Erlang ASN.1 BER_V2-"
+				  "compiler version, utilizing bit-syntax:",
+				  asn1ct:vsn(),nl}),
+			    {"RT_BER","asn1rt_ber_bin_v2"}
+    end,
+    emit({"%% Purpose: encoder and decoder to the types in mod ",Mod,nl,nl}),
+    emit({"-module('",Mod,"').",nl}),
+    put(currmod,Mod),
+    %emit({"-compile(export_all).",nl}),
+    case Hrl of
+	0 -> true;
+	_ ->
+	    emit({"-include(\"",Mod,".hrl\").",nl})
+    end,
+    emit(["-define('",Rtmac,"',",Rtmod,").",nl]).
+
+
+gen_hrlhead(Mod) ->
+    emit({"%% Generated by the Erlang ASN.1 compiler version:",asn1ct:vsn(),nl}),
+    emit({"%% Purpose: Erlang record definitions for each named and unnamed",nl}),
+    emit({"%% SEQUENCE and SET, and macro definitions for each value",nl}),
+    emit({"%% definition,in module ",Mod,nl,nl}),
+    emit({nl,nl}).
+
+gen_record2(Name,SeqOrSet,Comps) ->
+    gen_record2(Name,SeqOrSet,Comps,"",noext).
+
+gen_record2(_Name,_SeqOrSet,[],_Com,_Extension) ->
+    true;
+gen_record2(Name,SeqOrSet,[{'EXTENSIONMARK',_,_}|T],Com,Extension) ->
+    gen_record2(Name,SeqOrSet,T,Com,Extension);
+gen_record2(_Name,_SeqOrSet,[H],Com,Extension) ->
+    #'ComponentType'{name=Cname} = H,
+    emit(Com),
+    emit({asis,Cname}),
+    gen_record_default(H, Extension);
+gen_record2(Name,SeqOrSet,[H|T],Com, Extension) ->
+    #'ComponentType'{name=Cname} = H,
+    emit(Com),
+    emit({asis,Cname}),
+    gen_record_default(H, Extension),
+%    emit(", "),
+    gen_record2(Name,SeqOrSet,T,", ", Extension).
+
+%gen_record_default(C, ext) ->
+%    emit(" = asn1_NOEXTVALUE");
+gen_record_default(#'ComponentType'{prop='OPTIONAL'}, _)->
+    emit(" = asn1_NOVALUE");
+gen_record_default(#'ComponentType'{prop={'DEFAULT',_}}, _)->
+    emit(" = asn1_DEFAULT");
+gen_record_default(_, _) ->
+    true.
+
+gen_check_call(TopType,Cname,Type,InnerType,WhatKind,DefaultValue,Element) ->
+    case WhatKind of
+	{primitive,bif} ->
+	    gen_prim_check_call(InnerType,DefaultValue,Element,Type);
+	#'Externaltypereference'{module=M,type=T} ->
+	    %% generate function call
+	    Name = list2name([T,check]),
+	    emit({"'",Name,"'(",DefaultValue,", ",Element,")"}),
+	    %% insert in ets table and do look ahead check
+	    Typedef = asn1_db:dbget(M,T),
+	    RefType = Typedef#typedef.typespec,
+	    InType = asn1ct_gen:get_inner(RefType#type.def),
+	    case insert_once(check_functions,{Name,RefType}) of
+		true ->
+		    lookahead_innertype([T],InType,RefType);
+%		    case asn1ct_gen:type(InType) of
+%			{constructed,bif} ->
+%			    lookahead_innertype([T],InType,RefType);
+%			#'Externaltypereference'{type=TNew} ->
+%			    lookahead_innertype([TNew],InType,RefType);
+%			_ ->
+%			    ok
+%		    end;
+		_ ->
+		    ok
+	    end;
+	{constructed,bif} ->
+	    NameList = [Cname|TopType],
+	    Name = list2name(NameList ++ [check]),
+	    emit({"'",Name,"'(",DefaultValue,", ",Element,")"}),
+	    ets:insert(check_functions,{Name,Type}),
+	    %% Must look for check functions in InnerType,
+	    %% that may be referenced  or internal defined
+	    %% constructed types not used elsewhere.
+	    lookahead_innertype(NameList,InnerType,Type)
+    end.
+
+gen_prim_check_call(PrimType,DefaultValue,Element,Type) ->
+    case unify_if_string(PrimType) of
+	'BOOLEAN' ->
+	    emit({"asn1rt_check:check_bool(",DefaultValue,", ",
+		  Element,")"});
+	'INTEGER' ->
+	    NNL =
+		case Type#type.def of
+		    {_,NamedNumberList} -> NamedNumberList;
+		    _ -> []
+		end,
+	    emit({"asn1rt_check:check_int(",DefaultValue,", ",
+		  Element,", ",{asis,NNL},")"});
+	'BIT STRING' ->
+	    {_,NBL} = Type#type.def,
+	    emit({"asn1rt_check:check_bitstring(",DefaultValue,", ",
+		  Element,", ",{asis,NBL},")"});
+	'OCTET STRING' ->
+	    emit({"asn1rt_check:check_octetstring(",DefaultValue,", ",
+		  Element,")"});
+	'NULL' ->
+	    emit({"asn1rt_check:check_null(",DefaultValue,", ",
+		  Element,")"});
+	'OBJECT IDENTIFIER' ->
+	    emit({"asn1rt_check:check_objectidentifier(",DefaultValue,
+		  ", ",Element,")"});
+	'ObjectDescriptor' ->
+	    emit({"asn1rt_check:check_objectdescriptor(",DefaultValue,
+		  ", ",Element,")"});
+	'REAL' ->
+	    emit({"asn1rt_check:check_real(",DefaultValue,
+		  ", ",Element,")"});
+	'ENUMERATED' ->
+	    {_,Enumerations} = Type#type.def,
+	    emit({"asn1rt_check:check_enum(",DefaultValue,
+		  ", ",Element,", ",{asis,Enumerations},")"});
+	restrictedstring ->
+	    emit({"asn1rt_check:check_restrictedstring(",DefaultValue,
+		  ", ",Element,")"})
+    end.
+
+%% lokahead_innertype/3 traverses Type and checks if check functions
+%% have to be generated, i.e. for all constructed or referenced types.
+lookahead_innertype(Name,'SEQUENCE',Type) ->
+    Components = (Type#type.def)#'SEQUENCE'.components,
+    lookahead_components(Name,Components);
+lookahead_innertype(Name,'SET',Type) ->
+    Components = (Type#type.def)#'SET'.components,
+    lookahead_components(Name,Components);
+lookahead_innertype(Name,'CHOICE',Type) ->
+    {_,Components} = Type#type.def,
+    lookahead_components(Name,Components);
+lookahead_innertype(Name,'SEQUENCE OF',SeqOf) ->
+    lookahead_sof(Name,'SEQOF',SeqOf);
+lookahead_innertype(Name,'SET OF',SeqOf) ->
+    lookahead_sof(Name,'SETOF',SeqOf);
+lookahead_innertype(_Name,#'Externaltypereference'{module=M,type=T},_) ->
+    Typedef = asn1_db:dbget(M,T),
+    RefType = Typedef#typedef.typespec,
+    InType = asn1ct_gen:get_inner(RefType#type.def),
+    case type(InType) of
+	{constructed,bif} ->
+	    NewName = list2name([T,check]),
+	    case insert_once(check_functions,{NewName,RefType}) of
+		true ->
+		    lookahead_innertype([T],InType,RefType);
+		_ ->
+		    ok
+	    end;
+	#'Externaltypereference'{} ->
+	    NewName = list2name([T,check]),
+	    case insert_once(check_functions,{NewName,RefType}) of
+		true ->
+		    lookahead_innertype([T],InType,RefType);
+		_ ->
+		    ok
+	    end;
+	_ ->
+	    ok
+    end;
+%    case insert_once(check_functions,{list2name(Name++[check]),Type}) of
+%	true ->
+%	    InnerType = asn1ct_gen:get_inner(Type#type.def),
+%	    case asn1ct_gen:type(InnerType) of
+%		{constructed,bif} ->
+%		    lookahead_innertype([T],InnerType,Type);
+%		#'Externaltypereference'{type=TNew} ->
+%		    lookahead_innertype([TNew],InnerType,Type);
+%		_ ->
+%		    ok
+%	    end;
+%	_ ->
+%	    ok
+%    end;
+lookahead_innertype(_,_,_) ->
+    ok.
+
+lookahead_components(_,[]) -> ok;
+lookahead_components(Name,[C|Cs]) ->
+    #'ComponentType'{name=Cname,typespec=Type} = C,
+    InType = asn1ct_gen:get_inner(Type#type.def),
+    case asn1ct_gen:type(InType) of
+	{constructed,bif} ->
+	    case insert_once(check_functions,
+			     {list2name([Cname|Name] ++ [check]),Type}) of
+		true ->
+		    lookahead_innertype([Cname|Name],InType,Type);
+		_ ->
+		    ok
+	    end;
+	#'Externaltypereference'{module=RefMod,type=RefName} ->
+	    Typedef = asn1_db:dbget(RefMod,RefName),
+	    RefType = Typedef#typedef.typespec,
+	    case insert_once(check_functions,{list2name([RefName,check]),
+					      RefType}) of
+		true ->
+		    lookahead_innertype([RefName],InType,RefType);
+		_ ->
+		    ok
+	    end;
+	_ ->
+	    ok
+    end,
+    lookahead_components(Name,Cs).
+
+lookahead_sof(Name,SOF,SOFType) ->
+    Type = case SOFType#type.def of
+	       {_,_Type} -> _Type;
+	       _Type -> _Type
+	   end,
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    %% this is if a constructed type is defined in
+	    %% the SEQUENCE OF type
+	    NameList = [SOF|Name],
+	    insert_once(check_functions,
+			{list2name(NameList ++ [check]),Type}),
+	    lookahead_innertype(NameList,InnerType,Type);
+	#'Externaltypereference'{module=M,type=T} ->
+	    Typedef = asn1_db:dbget(M,T),
+	    RefType = Typedef#typedef.typespec,
+	    InType = get_inner(RefType#type.def),
+	    case insert_once(check_functions,
+			     {list2name([T,check]),RefType}) of
+		true ->
+		    lookahead_innertype([T],InType,RefType);
+		_ ->
+		    ok
+	    end;
+	_ ->
+	    ok
+    end.
+
+
+insert_once(Table,Object) ->
+    case ets:lookup(Table,element(1,Object)) of
+	[] ->
+	    ets:insert(Table,Object); %returns true
+	_ -> false
+    end.
+
+unify_if_string(PrimType) ->
+    case PrimType of
+	'NumericString' ->
+	    restrictedstring;
+	'PrintableString' ->
+	    restrictedstring;
+	'TeletexString' ->
+	    restrictedstring;
+	'VideotexString' ->
+	    restrictedstring;
+	'IA5String' ->
+	    restrictedstring;
+	'UTCTime' ->
+	    restrictedstring;
+	'GeneralizedTime' ->
+	    restrictedstring;
+	'GraphicString' ->
+	    restrictedstring;
+	'VisibleString' ->
+	    restrictedstring;
+	'GeneralString' ->
+	    restrictedstring;
+	'UniversalString' ->
+	    restrictedstring;
+	'BMPString' ->
+	    restrictedstring;
+	Other -> Other
+    end.
+
+
+
+
+
+get_inner(A) when atom(A) -> A;
+get_inner(Ext) when record(Ext,'Externaltypereference') -> Ext;
+get_inner(Tref) when record(Tref,typereference) -> Tref;
+get_inner({fixedtypevaluefield,_,Type}) ->
+    if
+	record(Type,type) ->
+	    get_inner(Type#type.def);
+	true ->
+	    get_inner(Type)
+    end;
+get_inner({typefield,TypeName}) ->
+    TypeName;
+get_inner(#'ObjectClassFieldType'{type=Type}) ->
+%    get_inner(Type);
+    Type;
+get_inner(T) when tuple(T) ->
+    case element(1,T) of
+	Tuple when tuple(Tuple),element(1,Tuple) == objectclass ->
+	    case catch(lists:last(element(2,T))) of
+		{valuefieldreference,FieldName} ->
+		    get_fieldtype(element(2,Tuple),FieldName);
+		{typefieldreference,FieldName} ->
+		    get_fieldtype(element(2,Tuple),FieldName);
+		{'EXIT',Reason} ->
+		    throw({asn1,{'internal error in get_inner/1',Reason}})
+	    end;
+	_ -> element(1,T)
+    end.
+
+
+
+
+
+type(X) when record(X,'Externaltypereference') ->
+    X;
+type(X) when record(X,typereference) ->
+    X;
+type('ASN1_OPEN_TYPE') ->
+    'ASN1_OPEN_TYPE';
+type({fixedtypevaluefield,_Name,Type}) when record(Type,type) ->
+    type(get_inner(Type#type.def));
+type({typefield,_}) ->
+    'ASN1_OPEN_TYPE';
+type(X) ->
+    %%    io:format("asn1_types:type(~p)~n",[X]),
+    case catch type2(X) of
+	{'EXIT',_} ->
+	    {notype,X};
+	Normal ->
+	    Normal
+    end.
+
+type2(X) ->
+    case prim_bif(X) of
+	true ->
+	    {primitive,bif};
+	false ->
+	    case construct_bif(X) of
+		true ->
+		    {constructed,bif};
+		false ->
+		    {undefined,user}
+	    end
+    end.
+
+prim_bif(X) ->
+    lists:member(X,['INTEGER' ,
+		    'ENUMERATED',
+		    'OBJECT IDENTIFIER',
+		    'ANY',
+		    'NULL',
+		    'BIT STRING' ,
+		    'OCTET STRING' ,
+		    'ObjectDescriptor',
+		    'NumericString',
+		    'TeletexString',
+		    'VideotexString',
+		    'UTCTime',
+		    'GeneralizedTime',
+		    'GraphicString',
+		    'VisibleString',
+		    'GeneralString',
+		    'PrintableString',
+		    'IA5String',
+		    'UniversalString',
+		    'BMPString',
+		    'ENUMERATED',
+		    'BOOLEAN']).
+
+construct_bif(T) ->
+    lists:member(T,['SEQUENCE' ,
+		    'SEQUENCE OF' ,
+		    'CHOICE' ,
+		    'SET' ,
+		    'SET OF']).
+
+def_to_tag(#tag{class=Class,number=Number}) ->
+    {Class,Number};
+def_to_tag(#'ObjectClassFieldType'{type=Type}) ->
+   case Type of
+       T when tuple(T),element(1,T)==fixedtypevaluefield ->
+	   {'UNIVERSAL',get_inner(Type)};
+       _ ->
+	   []
+   end;
+def_to_tag(Def) ->
+    {'UNIVERSAL',get_inner(Def)}.
+
+
+%% Information Object Class
+
+type_from_object(X) ->
+    case (catch lists:last(element(2,X))) of
+	{'EXIT',_} ->
+	    {notype,X};
+	Normal ->
+	    Normal
+    end.
+
+
+get_fieldtype([],_FieldName)->
+    {no_type,no_name};
+get_fieldtype([Field|Rest],FieldName) ->
+    case element(2,Field) of
+	FieldName ->
+	    case element(1,Field) of
+		fixedtypevaluefield ->
+		    {element(1,Field),FieldName,element(3,Field)};
+		_ ->
+		    {element(1,Field),FieldName}
+	    end;
+	_  ->
+	    get_fieldtype(Rest,FieldName)
+    end.
+
+get_fieldcategory([],_FieldName) ->
+    no_cat;
+get_fieldcategory([Field|Rest],FieldName) ->
+    case element(2,Field) of
+	FieldName ->
+	    element(1,Field);
+	_ ->
+	    get_fieldcategory(Rest,FieldName)
+    end.
+
+get_typefromobject(Type) when record(Type,type) ->
+    case Type#type.def of
+	{{objectclass,_,_},TypeFrObj} when list(TypeFrObj) ->
+	    {_,FieldName} = lists:last(TypeFrObj),
+	    FieldName;
+	_ ->
+	    {no_field}
+    end.
+
+get_classfieldcategory(Type,FieldName) ->
+    case (catch Type#type.def) of
+	{{obejctclass,Fields,_},_} ->
+	    get_fieldcategory(Fields,FieldName);
+	{'EXIT',_} ->
+	    no_cat;
+	_ ->
+	    no_cat
+    end.
+%% Information Object Class
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Convert a list of name parts to something that can be output by emit
+%%
+%% used to output function names in generated code.
+
+list2name(L) ->
+    NewL = list2name1(L),
+    lists:concat(lists:reverse(NewL)).
+
+list2name1([{ptype,H1},H2|T]) ->
+    [H1,"_",list2name([H2|T])];
+list2name1([H1,H2|T]) ->
+    [H1,"_",list2name([H2|T])];
+list2name1([{ptype,H}|_T]) ->
+    [H];
+list2name1([H|_T]) ->
+    [H];
+list2name1([]) ->
+    [].
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Convert a list of name parts to something that can be output by emit
+%% stops at {ptype,Pname} i.e Pname whill be the first part of the name
+%% used to output record names in generated code.
+
+list2rname(L) ->
+    NewL = list2rname1(L),
+    lists:concat(lists:reverse(NewL)).
+
+list2rname1([{ptype,H1},_H2|_T]) ->
+    [H1];
+list2rname1([H1,H2|T]) ->
+    [H1,"_",list2name([H2|T])];
+list2rname1([{ptype,H}|_T]) ->
+    [H];
+list2rname1([H|_T]) ->
+    [H];
+list2rname1([]) ->
+    [].
+
+
+
+constructed_suffix(_,#'SEQUENCE'{pname=Ptypename}) when Ptypename =/= false ->
+    {ptype, Ptypename};
+constructed_suffix(_,#'SET'{pname=Ptypename}) when Ptypename =/= false ->
+    {ptype,Ptypename};
+constructed_suffix('SEQUENCE OF',_) ->
+    'SEQOF';
+constructed_suffix('SET OF',_) ->
+    'SETOF'.
+
+erule(ber) ->
+    ber;
+erule(ber_bin) ->
+    ber;
+erule(ber_bin_v2) ->
+    ber_bin_v2;
+erule(per) ->
+    per;
+erule(per_bin) ->
+    per.
+
+wrap_ber(ber) ->
+    ber_bin;
+wrap_ber(Erule) ->
+    Erule.
+
+rt2ct_suffix() ->
+    Options = get(encoding_options),
+    case {lists:member(optimize,Options),lists:member(per_bin,Options)} of
+	{true,true} -> "_rt2ct";
+	_ -> ""
+    end.
+rt2ct_suffix(per_bin) ->
+    Options = get(encoding_options),
+    case lists:member(optimize,Options) of
+	true -> "_rt2ct";
+	_ -> ""
+    end;
+rt2ct_suffix(_) -> "".
+
+get_constraint(C,Key) ->
+    case lists:keysearch(Key,1,C) of
+	false ->
+	     no;
+	{value,{_,V}} ->
+	    V;
+	{value,Cnstr} ->
+	    Cnstr
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber.erl
new file mode 100644
index 0000000000..765745dc13
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber.erl
@@ -0,0 +1,1525 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_gen_ber.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
+%%
+-module(asn1ct_gen_ber).
+
+%% Generate erlang module which handles (PER) encode and decode for
+%% all types in an ASN.1 module
+
+-include("asn1_records.hrl").
+
+-export([pgen/4]).
+-export([decode_class/1, decode_type/1]).
+-export([add_removed_bytes/0]).
+-export([gen_encode/2,gen_encode/3,gen_decode/2,gen_decode/3]).
+-export([gen_encode_prim/4]).
+-export([gen_dec_prim/8]).
+-export([gen_objectset_code/2, gen_obj_code/3]).
+-export([re_wrap_erule/1]).
+-export([unused_var/2]).
+
+-import(asn1ct_gen, [emit/1,demit/1]).
+
+						% the encoding of class of tag bits 8 and 7
+-define(UNIVERSAL,   0).
+-define(APPLICATION, 16#40).
+-define(CONTEXT,     16#80).
+-define(PRIVATE,     16#C0).
+
+						% primitive or constructed encoding % bit 6
+-define(PRIMITIVE,   0).
+-define(CONSTRUCTED, 2#00100000).
+
+
+-define(T_ObjectDescriptor, ?UNIVERSAL bor ?PRIMITIVE bor 7).
+						% restricted character string types
+-define(T_NumericString,    ?UNIVERSAL bor ?PRIMITIVE bor 18). %can be constructed
+-define(T_PrintableString,  ?UNIVERSAL bor ?PRIMITIVE bor 19). %can be constructed
+-define(T_TeletexString,    ?UNIVERSAL bor ?PRIMITIVE bor 20). %can be constructed
+-define(T_VideotexString,   ?UNIVERSAL bor ?PRIMITIVE bor 21). %can be constructed
+-define(T_IA5String,        ?UNIVERSAL bor ?PRIMITIVE bor 22). %can be constructed
+-define(T_GraphicString,    ?UNIVERSAL bor ?PRIMITIVE bor 25). %can be constructed
+-define(T_VisibleString,    ?UNIVERSAL bor ?PRIMITIVE bor 26). %can be constructed
+-define(T_GeneralString,    ?UNIVERSAL bor ?PRIMITIVE bor 27). %can be constructed
+
+%% pgen(Erules, Module, TypeOrVal)
+%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
+%% .hrl file is only generated if necessary
+%% Erules = per | ber
+%% Module = atom()
+%% TypeOrVal = {TypeList,ValueList,PTypeList}
+%% TypeList = ValueList = [atom()]
+
+pgen(OutFile,Erules,Module,TypeOrVal) ->
+    asn1ct_gen:pgen_module(OutFile,Erules,Module,TypeOrVal,true).
+
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Generate ENCODING
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+%%===============================================================================
+%% encode #{typedef, {pos, name, typespec}}
+%%===============================================================================
+
+gen_encode(Erules,Type) when record(Type,typedef) ->
+    gen_encode_user(Erules,Type).
+
+%%===============================================================================
+%% encode #{type, {tag, def, constraint}}
+%%===============================================================================
+
+gen_encode(Erules,Typename,Type) when record(Type,type) ->
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    ObjFun =
+	case lists:keysearch(objfun,1,Type#type.tablecinf) of
+	    {value,{_,_Name}} ->
+		", ObjFun";
+	    false ->
+		""
+	end,
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    emit([nl,nl,nl,"%%================================"]),
+	    emit([nl,"%%  ",asn1ct_gen:list2name(Typename)]),
+	    emit([nl,"%%================================",nl]),
+	    case lists:member(InnerType,['SET','SEQUENCE']) of
+		true ->
+		    case get(asn_keyed_list) of
+			true ->
+			    CompList =
+				case Type#type.def of
+				    #'SEQUENCE'{components=Cl} -> Cl;
+				    #'SET'{components=Cl} -> Cl
+				end,
+			    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
+				  "'(Val, TagIn",ObjFun,
+				  ") when list(Val) ->",nl]),
+			    emit(["    'enc_",asn1ct_gen:list2name(Typename),
+				  "'(?RT_BER:fixoptionals(",
+				  {asis,optionals(CompList)},
+				  ",Val), TagIn",ObjFun,");",nl,nl]);
+			_ -> true
+		    end;
+		_ ->
+		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
+			  "'({'",asn1ct_gen:list2name(Typename),
+			  "',Val}, TagIn",ObjFun,") ->",nl]),
+		    emit(["   'enc_",asn1ct_gen:list2name(Typename),
+			  "'(Val, TagIn",ObjFun,");",nl,nl])
+	    end,
+	    emit(["'enc_",asn1ct_gen:list2name(Typename),
+		  "'(Val, TagIn",ObjFun,") ->",nl,"   "]),
+	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
+	_ ->
+	    true
+    end;
+
+%%===============================================================================
+%% encode ComponentType
+%%===============================================================================
+
+gen_encode(Erules,Tname,{'ComponentType',_Pos,Cname,Type,_,_}) ->
+    NewTname = [Cname|Tname],
+    %% The tag is set to [] to avoid that it is
+    %% taken into account twice, both as a component/alternative (passed as
+    %% argument to the encode decode function and within the encode decode
+    %% function it self.
+    NewType = Type#type{tag=[]},
+    gen_encode(Erules,NewTname,NewType).
+
+gen_encode_user(Erules,D) when record(D,typedef) ->
+    Typename = [D#typedef.name],
+    Type = D#typedef.typespec,
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    OTag = Type#type.tag,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    emit([nl,nl,"%%================================"]),
+    emit([nl,"%%  ",Typename]),
+    emit([nl,"%%================================",nl]),
+    case lists:member(InnerType,['SET','SEQUENCE']) of
+	true ->
+	    case get(asn_keyed_list) of
+		true ->
+		    CompList =
+			case Type#type.def of
+			    #'SEQUENCE'{components=Cl} -> Cl;
+			    #'SET'{components=Cl} -> Cl
+			end,
+
+		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
+			  "'(Val, TagIn) when list(Val) ->",nl]),
+		    emit(["    'enc_",asn1ct_gen:list2name(Typename),
+			  "'(?RT_BER:fixoptionals(",
+			  {asis,optionals(CompList)},
+			  ",Val), TagIn);",nl,nl]);
+		_ -> true
+	    end;
+	_ ->
+	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
+		  "'({'",asn1ct_gen:list2name(Typename),"',Val}, TagIn) ->",nl}),
+	    emit({"   'enc_",asn1ct_gen:list2name(Typename),"'(Val, TagIn);",nl,nl})
+    end,
+    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(",
+	  unused_var("Val",Type#type.def),", TagIn) ->",nl}),
+    CurrentMod = get(currmod),
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,D);
+	{primitive,bif} ->
+	    asn1ct_gen_ber:gen_encode_prim(ber,Type,["TagIn ++ ",
+						     {asis,Tag}],"Val"),
+	    emit([".",nl]);
+	#typereference{val=Ename} ->
+	    emit(["   'enc_",Ename,"'(Val, TagIn ++ ",{asis,Tag},").",nl]);
+	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
+	    emit(["   'enc_",Etype,"'(Val, TagIn ++ ",
+		  {asis,Tag},").",nl]);
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit(["   '",Emod,"':'enc_",Etype,"'(Val, TagIn ++ ",
+		  {asis,Tag},").",nl]);
+	'ASN1_OPEN_TYPE' ->
+	    emit(["%% OPEN TYPE",nl]),
+	    asn1ct_gen_ber:gen_encode_prim(ber,
+					   Type#type{def='ASN1_OPEN_TYPE'},
+					   ["TagIn ++ ",
+					    {asis,Tag}],"Val"),
+	    emit([".",nl])
+    end.
+
+unused_var(Var,#'SEQUENCE'{components=Cl}) ->
+    unused_var1(Var,Cl);
+unused_var(Var,#'SET'{components=Cl}) ->
+    unused_var1(Var,Cl);
+unused_var(Var,_) ->
+    Var.
+unused_var1(Var,Cs) when Cs == []; Cs == {[],[]} ->
+    lists:concat(["_",Var]);
+unused_var1(Var,_) ->
+    Var.
+
+unused_optormand_var(Var,Def) ->
+    case asn1ct_gen:type(asn1ct_gen:get_inner(Def)) of
+	'ASN1_OPEN_TYPE' ->
+	    lists:concat(["_",Var]);
+	_ ->
+	    Var
+    end.
+
+
+gen_encode_prim(_Erules,D,DoTag,Value) when record(D,type) ->
+
+%%% Currently not used for BER (except for BitString) and therefore replaced
+%%% with [] as a placeholder
+    BitStringConstraint = D#type.constraint,
+    Constraint = [],
+    asn1ct_name:new(enumval),
+    case D#type.def of
+	'BOOLEAN' ->
+	    emit_encode_func('boolean',Value,DoTag);
+	'INTEGER' ->
+	    emit_encode_func('integer',Constraint,Value,DoTag);
+	{'INTEGER',NamedNumberList} ->
+	    emit_encode_func('integer',Constraint,Value,
+			     NamedNumberList,DoTag);
+	{'ENUMERATED',NamedNumberList={_,_}} ->
+
+	    emit(["case (case ",Value," of {asn1_enum,_}->",Value,";{_,_}->element(2,",Value,");_->",
+		  Value," end) of",nl]),
+	    emit_enc_enumerated_cases(NamedNumberList,DoTag);
+	{'ENUMERATED',NamedNumberList} ->
+
+	    emit(["case (case ",Value," of {_,_}->element(2,",Value,");_->",
+		  Value," end) of",nl]),
+	    emit_enc_enumerated_cases(NamedNumberList,DoTag);
+
+	{'BIT STRING',NamedNumberList} ->
+	    emit_encode_func('bit_string',BitStringConstraint,Value,
+			     NamedNumberList,DoTag);
+	'ANY' ->
+	    emit_encode_func('open_type', Value,DoTag);
+	'NULL' ->
+	    emit_encode_func('null',Value,DoTag);
+	'OBJECT IDENTIFIER' ->
+	    emit_encode_func("object_identifier",Value,DoTag);
+	'ObjectDescriptor' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_ObjectDescriptor,DoTag);
+	'OCTET STRING' ->
+	    emit_encode_func('octet_string',Constraint,Value,DoTag);
+	'NumericString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_NumericString,DoTag);
+	'TeletexString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_TeletexString,DoTag);
+	'VideotexString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_VideotexString,DoTag);
+	'GraphicString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_GraphicString,DoTag);
+	'VisibleString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_VisibleString,DoTag);
+	'GeneralString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_GeneralString,DoTag);
+	'PrintableString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_PrintableString,DoTag);
+	'IA5String' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_IA5String,DoTag);
+	'UniversalString' ->
+	    emit_encode_func('universal_string',Constraint,Value,DoTag);
+	'BMPString' ->
+	    emit_encode_func('BMP_string',Constraint,Value,DoTag);
+	'UTCTime' ->
+	    emit_encode_func('utc_time',Constraint,Value,DoTag);
+	'GeneralizedTime' ->
+	    emit_encode_func('generalized_time',Constraint,Value,DoTag);
+	'ASN1_OPEN_TYPE' ->
+	    emit_encode_func('open_type', Value,DoTag);
+	XX ->
+	    exit({'can not encode' ,XX})
+    end.
+
+
+emit_encode_func(Name,Value,Tags) when atom(Name) ->
+    emit_encode_func(atom_to_list(Name),Value,Tags);
+emit_encode_func(Name,Value,Tags) ->
+    Fname = "?RT_BER:encode_" ++ Name,
+    emit([Fname,"(",Value,", ",Tags,")"]).
+
+emit_encode_func(Name,Constraint,Value,Tags) when atom(Name) ->
+    emit_encode_func(atom_to_list(Name),Constraint,Value,Tags);
+emit_encode_func(Name,Constraint,Value,Tags) ->
+    Fname = "?RT_BER:encode_" ++ Name,
+    emit([Fname,"(",{asis,Constraint},", ",Value,", ",Tags,")"]).
+
+emit_encode_func(Name,Constraint,Value,Asis,Tags) when atom(Name) ->
+    emit_encode_func(atom_to_list(Name),Constraint,Value,Asis,Tags);
+emit_encode_func(Name,Constraint,Value,Asis,Tags) ->
+    Fname = "?RT_BER:encode_" ++ Name,
+    emit([Fname,"(",{asis,Constraint},", ",Value,
+	  ", ",{asis,Asis},
+	  ", ",Tags,")"]).
+
+emit_enc_enumerated_cases({L1,L2}, Tags) ->
+    emit_enc_enumerated_cases(L1++L2, Tags, ext);
+emit_enc_enumerated_cases(L, Tags) ->
+    emit_enc_enumerated_cases(L, Tags, noext).
+
+emit_enc_enumerated_cases([{EnumName,EnumVal},H2|T], Tags, Ext) ->
+    emit([{asis,EnumName}," -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,");",nl]),
+%%    emit(["'",{asis,EnumName},"' -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,");",nl]),
+    emit_enc_enumerated_cases([H2|T], Tags, Ext);
+emit_enc_enumerated_cases([{EnumName,EnumVal}], Tags, Ext) ->
+    emit([{asis,EnumName}," -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,")"]),
+%%    emit(["'",{asis,EnumName},"' -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,")"]),
+    case Ext of
+	noext -> emit([";",nl]);
+	ext ->
+	    emit([";",nl,"{asn1_enum,",{curr,enumval},"} -> ",
+		     "?RT_BER:encode_enumerated(",{curr,enumval},",",Tags,");",nl]),
+	    asn1ct_name:new(enumval)
+    end,
+    emit([{curr,enumval}," -> exit({error,{asn1, {enumerated_not_in_range,",{curr, enumval},"}}})"]),
+    emit([nl,"end"]).
+
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Generate DECODING
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+%%===============================================================================
+%% decode #{typedef, {pos, name, typespec}}
+%%===============================================================================
+
+gen_decode(Erules,Type) when record(Type,typedef) ->
+    D = Type,
+    emit({nl,nl}),
+    emit({"'dec_",Type#typedef.name,"'(Bytes, OptOrMand) ->",nl}),
+    emit({"   'dec_",Type#typedef.name,"'(Bytes, OptOrMand, []).",nl,nl}),
+    emit({"'dec_",Type#typedef.name,"'(Bytes, ",
+	  unused_optormand_var("OptOrMand",(Type#typedef.typespec)#type.def),", TagIn) ->",nl}),
+    dbdec(Type#typedef.name),
+    gen_decode_user(Erules,D).
+
+
+%%===============================================================================
+%% decode #{type, {tag, def, constraint}}
+%%===============================================================================
+
+gen_decode(Erules,Tname,Type) when record(Type,type) ->
+    Typename = Tname,
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    ObjFun =
+		case Type#type.tablecinf of
+		    [{objfun,_}|_R] ->
+			", ObjFun";
+		    _ ->
+			""
+		end,
+	    emit({"'dec_",asn1ct_gen:list2name(Typename),"'(Bytes, OptOrMand, TagIn",ObjFun,") ->",nl}),
+	    dbdec(Typename),
+	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
+	_ ->
+	    true
+    end;
+
+
+%%===============================================================================
+%% decode ComponentType
+%%===============================================================================
+
+gen_decode(Erules,Tname,{'ComponentType',_Pos,Cname,Type,_,_}) ->
+    NewTname = [Cname|Tname],
+    %% The tag is set to [] to avoid that it is
+    %% taken into account twice, both as a component/alternative (passed as
+    %% argument to the encode decode function and within the encode decode
+    %% function it self.
+    NewType = Type#type{tag=[]},
+    gen_decode(Erules,NewTname,NewType).
+
+
+gen_decode_user(Erules,D) when record(D,typedef) ->
+    Typename = [D#typedef.name],
+    Def = D#typedef.typespec,
+    InnerType = asn1ct_gen:get_inner(Def#type.def),
+    InnerTag = Def#type.tag ,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- InnerTag],
+    case asn1ct_gen:type(InnerType) of
+	'ASN1_OPEN_TYPE' ->
+	    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+	    asn1ct_name:new(len),
+	    gen_dec_prim(Erules, Def#type{def='ASN1_OPEN_TYPE'},
+			 BytesVar, Tag, "TagIn",no_length,
+			 ?PRIMITIVE,"OptOrMand"),
+	    emit({".",nl,nl});
+	{primitive,bif} ->
+	    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+	    asn1ct_name:new(len),
+	    gen_dec_prim(Erules, Def, BytesVar, Tag, "TagIn",no_length,
+			 ?PRIMITIVE,"OptOrMand"),
+	    emit({".",nl,nl});
+	{constructed,bif} ->
+	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,D);
+	TheType ->
+	    DecFunName = mkfuncname(TheType,dec),
+	    emit({DecFunName,"(",{curr,bytes},
+		  ", OptOrMand, TagIn++",{asis,Tag},")"}),
+	    emit({".",nl,nl})
+    end.
+
+
+gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Length,_Form,OptOrMand) ->
+    Typename = Att#type.def,
+%% Currently not used for BER replaced with [] as place holder
+%%    Constraint = Att#type.constraint,
+%% Constraint = [],
+    Constraint =
+	case get_constraint(Att#type.constraint,'SizeConstraint') of
+	    no -> [];
+	    Tc -> Tc
+	end,
+    ValueRange =
+	case get_constraint(Att#type.constraint,'ValueRange') of
+	    no -> [];
+	    Tv -> Tv
+	end,
+    SingleValue =
+	case get_constraint(Att#type.constraint,'SingleValue') of
+	    no -> [];
+	    Sv -> Sv
+	end,
+    AsBin = case get(binary_strings) of
+		true -> "_as_bin";
+		_ -> ""
+	    end,
+    NewTypeName = case Typename of
+		      'ANY' -> 'ASN1_OPEN_TYPE';
+		      _ -> Typename
+		  end,
+    DoLength =
+	case NewTypeName of
+	    'BOOLEAN'->
+		emit({"?RT_BER:decode_boolean(",BytesVar,","}),
+		false;
+	    'INTEGER' ->
+		emit({"?RT_BER:decode_integer(",BytesVar,",",
+		      {asis,int_constr(SingleValue,ValueRange)},","}),
+		false;
+	    {'INTEGER',NamedNumberList} ->
+		emit({"?RT_BER:decode_integer(",BytesVar,",",
+		      {asis,int_constr(SingleValue,ValueRange)},",",
+		      {asis,NamedNumberList},","}),
+		false;
+	    {'ENUMERATED',NamedNumberList} ->
+		emit({"?RT_BER:decode_enumerated(",BytesVar,",",
+		      {asis,Constraint},",",
+		      {asis,NamedNumberList},","}),
+		false;
+	    {'BIT STRING',NamedNumberList} ->
+		case get(compact_bit_string) of
+		    true ->
+			emit({"?RT_BER:decode_compact_bit_string(",
+			      BytesVar,",",{asis,Constraint},",",
+			      {asis,NamedNumberList},","});
+		    _ ->
+			emit({"?RT_BER:decode_bit_string(",BytesVar,",",
+			      {asis,Constraint},",",
+			      {asis,NamedNumberList},","})
+		end,
+		true;
+	    'NULL' ->
+		emit({"?RT_BER:decode_null(",BytesVar,","}),
+		false;
+	    'OBJECT IDENTIFIER' ->
+		emit({"?RT_BER:decode_object_identifier(",BytesVar,","}),
+		false;
+	    'ObjectDescriptor' ->
+		emit({"?RT_BER:decode_restricted_string(",
+		      BytesVar,",",{asis,Constraint},",",{asis,?T_ObjectDescriptor},","}),
+		true;
+	    'OCTET STRING' ->
+		emit({"?RT_BER:decode_octet_string",AsBin,"(",BytesVar,",",{asis,Constraint},","}),
+		true;
+	    'NumericString' ->
+		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},",",{asis,?T_NumericString},","}),true;
+	    'TeletexString' ->
+		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},",",{asis,?T_TeletexString},","}),
+		true;
+	    'VideotexString' ->
+		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},",",{asis,?T_VideotexString},","}),
+		true;
+	    'GraphicString' ->
+		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},",",{asis,?T_GraphicString},","})
+		    ,true;
+	    'VisibleString' ->
+		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},",",{asis,?T_VisibleString},","}),
+		true;
+	    'GeneralString' ->
+		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},",",{asis,?T_GeneralString},","}),
+		true;
+	    'PrintableString' ->
+		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},",",{asis,?T_PrintableString},","}),
+		true;
+	    'IA5String' ->
+		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},",",{asis,?T_IA5String},","}),
+		true;
+	    'UniversalString' ->
+		emit({"?RT_BER:decode_universal_string",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},","}),
+		true;
+	    'BMPString' ->
+		emit({"?RT_BER:decode_BMP_string",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},","}),
+		true;
+	    'UTCTime' ->
+		emit({"?RT_BER:decode_utc_time",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},","}),
+		true;
+	    'GeneralizedTime' ->
+		emit({"?RT_BER:decode_generalized_time",AsBin,"(",
+		      BytesVar,",",{asis,Constraint},","}),
+		true;
+	    'ASN1_OPEN_TYPE' ->
+		emit(["?RT_BER:decode_open_type(",re_wrap_erule(Erules),",",
+		      BytesVar,","]),
+		false;
+	    Other ->
+		exit({'can not decode' ,Other})
+	end,
+
+    NewLength = case DoLength of
+		    true -> [", ", Length];
+		    false -> ""
+		end,
+    NewOptOrMand = case OptOrMand of
+		       _ when list(OptOrMand) -> OptOrMand;
+		       mandatory -> {asis,mandatory};
+		       _ -> {asis,opt_or_default}
+		   end,
+    case {TagIn,NewTypeName} of
+	{[],'ASN1_OPEN_TYPE'} ->
+	    emit([{asis,DoTag},")"]);
+	{_,'ASN1_OPEN_TYPE'} ->
+	    emit([TagIn,"++",{asis,DoTag},")"]);
+	{[],_} ->
+	    emit([{asis,DoTag},NewLength,", ",NewOptOrMand,")"]);
+	_ when list(TagIn) ->
+	    emit([TagIn,"++",{asis,DoTag},NewLength,", ",NewOptOrMand,")"])
+    end.
+
+
+int_constr([],[]) ->
+    [];
+int_constr([],ValueRange) ->
+    ValueRange;
+int_constr(SingleValue,[]) ->
+    SingleValue;
+int_constr(SV,VR) ->
+    [SV,VR].
+
+%% Object code generating for encoding and decoding
+%% ------------------------------------------------
+
+gen_obj_code(Erules,_Module,Obj) when record(Obj,typedef) ->
+    ObjName = Obj#typedef.name,
+    Def = Obj#typedef.typespec,
+    #'Externaltypereference'{module=M,type=ClName} = Def#'Object'.classname,
+    Class = asn1_db:dbget(M,ClName),
+
+    {object,_,Fields} = Def#'Object'.def,
+    emit({nl,nl,nl,"%%================================"}),
+    emit({nl,"%%  ",ObjName}),
+    emit({nl,"%%================================",nl}),
+    EncConstructed =
+	gen_encode_objectfields(ClName,get_class_fields(Class),
+				ObjName,Fields,[]),
+    emit(nl),
+    gen_encode_constr_type(Erules,EncConstructed),
+    emit(nl),
+    DecConstructed =
+	gen_decode_objectfields(ClName,get_class_fields(Class),
+				ObjName,Fields,[]),
+    emit(nl),
+    gen_decode_constr_type(Erules,DecConstructed);
+gen_obj_code(_Erules,_Module,Obj) when record(Obj,pobjectdef) ->
+    ok.
+
+
+gen_encode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Args) ->
+		emit(["'enc_",ObjName,"'(",{asis,Name},
+		      ", ",Args,", _RestPrimFieldName) ->",nl])
+	end,
+%     emit(["'enc_",ObjName,"'(",{asis,Name},
+% 	  ", Val, TagIn, _RestPrimFieldName) ->",nl]),
+    MaybeConstr=
+	case {get_object_field(Name,ObjectFields),OptOrMand} of
+	    {false,'MANDATORY'} -> %% this case is illegal
+		exit({error,{asn1,{"missing mandatory field in object",
+				   ObjName}}});
+	    {false,'OPTIONAL'} ->
+		EmitFuncClause("_, _"),
+		emit(["   {[],0}"]),
+		[];
+	    {false,{'DEFAULT',DefaultType}} ->
+		EmitFuncClause("Val, TagIn"),
+		gen_encode_default_call(ClassName,Name,DefaultType);
+	    {{Name,TypeSpec},_} ->
+		%% A specified field owerwrites any 'DEFAULT' or
+		%% 'OPTIONAL' field in the class
+		EmitFuncClause("Val, TagIn"),
+		gen_encode_field_call(ObjName,Name,TypeSpec)
+	end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,
+			    MaybeConstr++ConstrAcc);
+gen_encode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Args) ->
+		emit(["'enc_",ObjName,"'(",{asis,Name},
+		      ", ",Args,") ->",nl])
+	end,
+%     emit(["'enc_",ObjName,"'(",{asis,Name},
+% 	  ", Val, TagIn, [H|T]) ->",nl]),
+    case {get_object_field(Name,ObjectFields),OptOrMand} of
+	{false,'MANDATORY'} ->
+	    exit({error,{asn1,{"missing mandatory field in object",
+			       ObjName}}});
+	{false,'OPTIONAL'} ->
+	    EmitFuncClause("_,_,_"),
+	    emit(["  exit({error,{'use of missing field in object', ",Name,
+		  "}})"]);
+	{false,{'DEFAULT',_DefaultObject}} ->
+	    exit({error,{asn1,{"not implemented yet",Name}}});
+	{{Name,TypeSpec},_} ->
+	    EmitFuncClause(" Val, TagIn, [H|T]"),
+	    case TypeSpec#typedef.name of
+		{ExtMod,TypeName} ->
+		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
+			  "'(H, Val, TagIn, T)"});
+		TypeName ->
+		    emit({indent(3),"'enc_",TypeName,"'(H, Val, TagIn, T)"})
+	    end
+    end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
+gen_encode_objectfields(ClassName,[_|Cs],O,OF,Acc) ->
+    gen_encode_objectfields(ClassName,Cs,O,OF,Acc);
+gen_encode_objectfields(_,[],_,_,Acc) ->
+    Acc.
+
+
+% gen_encode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
+%     Fields = Class#objectclass.fields,
+%     MaybeConstr=
+% 	case is_typefield(Fields,FieldName) of
+% 	    true ->
+% 		Def = Type#typedef.typespec,
+% 		OTag = Def#type.tag,
+% 		Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+% 		emit({"'enc_",ObjName,"'(",{asis,FieldName},
+% 		      ", Val, TagIn, RestPrimFieldName) ->",nl}),
+% 		CAcc=
+% 		case Type#typedef.name of
+% 		    {primitive,bif} ->
+% 			gen_encode_prim(ber,Def,["TagIn ++ ",{asis,Tag}],
+% 					"Val"),
+% 			[];
+% 		    {constructed,bif} ->
+% 			%%InnerType = asn1ct_gen:get_inner(Def#type.def),
+% 			%%asn1ct_gen:gen_encode_constructed(ber,[ObjName],
+% 			%%                            InnerType,Def);
+% 			emit({"   'enc_",ObjName,'_',FieldName,
+% 			      "'(Val, TagIn ++ ",{asis,Tag},")"}),
+% 			[{['enc_',ObjName,'_',FieldName],Def}];
+% 		    {ExtMod,TypeName} ->
+% 			emit({"   '",ExtMod,"':'enc_",TypeName,
+% 			      "'(Val, TagIn ++ ",{asis,Tag},")"}),
+% 			[];
+% 		    TypeName ->
+% 			emit({"   'enc_",TypeName,"'(Val, TagIn ++ ",
+% 			      {asis,Tag},")"}),
+% 			[]
+% 		end,
+% 		case more_genfields(Fields,Rest) of
+% 		    true ->
+% 			emit({";",nl});
+% 		    false ->
+% 			emit({".",nl})
+% 		end,
+% 		CAcc;
+% 	{false,objectfield} ->
+% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
+% 		  ", Val, TagIn, [H|T]) ->",nl}),
+% 	    case Type#typedef.name of
+% 		{ExtMod,TypeName} ->
+% 		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
+% 			  "'(H, Val, TagIn, T)"});
+% 		TypeName ->
+% 		    emit({indent(3),"'enc_",TypeName,"'(H, Val, TagIn, T)"})
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    [];
+% 	{false,_} -> []
+%     end,
+%     gen_encode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
+% gen_encode_objectfields(C,O,[H|T],Acc) ->
+%     gen_encode_objectfields(C,O,T,Acc);
+% gen_encode_objectfields(_,_,[],Acc) ->
+%     Acc.
+
+% gen_encode_constr_type([{Name,Def}|Rest]) ->
+%     emit({Name,"(Val,TagIn) ->",nl}),
+%     InnerType = asn1ct_gen:get_inner(Def#type.def),
+%     asn1ct_gen:gen_encode_constructed(ber,Name,InnerType,Def),
+%     gen_encode_constr_type(Rest);
+gen_encode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
+    case is_already_generated(enc,TypeDef#typedef.name) of
+	true -> ok;
+	_ -> gen_encode_user(Erules,TypeDef)
+    end,
+    gen_encode_constr_type(Erules,Rest);
+gen_encode_constr_type(_,[]) ->
+    ok.
+
+gen_encode_field_call(ObjName,FieldName,Type) ->
+    Def = Type#typedef.typespec,
+    OTag = Def#type.tag,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    case Type#typedef.name of
+	{primitive,bif} -> %%tag should be the primitive tag
+	    gen_encode_prim(ber,Def,["TagIn ++ ",{asis,Tag}],
+			    "Val"),
+	    [];
+	{constructed,bif} ->
+	    emit({"   'enc_",ObjName,'_',FieldName,
+		  "'(Val, TagIn ++",{asis,Tag},")"}),
+	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
+	{ExtMod,TypeName} ->
+	    emit({"   '",ExtMod,"':'enc_",TypeName,
+		  "'(Val, TagIn ++ ",{asis,Tag},")"}),
+	    [];
+	TypeName ->
+	    emit({"   'enc_",TypeName,"'(Val, TagIn ++ ",{asis,Tag},")"}),
+	    []
+    end.
+
+gen_encode_default_call(ClassName,FieldName,Type) ->
+    CurrentMod = get(currmod),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    OTag = Type#type.tag,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+%%	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
+	    emit(["   'enc_",ClassName,'_',FieldName,"'(Bytes, TagIn ++ ",
+		  {asis,Tag},")"]),
+	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
+		      typespec=Type}];
+	{primitive,bif} ->
+	    gen_encode_prim(ber,Type,["TagIn ++ ",{asis,Tag}],"Val"),
+	    [];
+	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
+	    emit(["   'enc_",Etype,"'(Val, TagIn ++ ",{asis,Tag},")",nl]),
+	    [];
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit(["   '",Emod,"':'enc_",Etype,"'(Val, TagIn ++ ",{asis,Tag},")",nl]),
+	    []
+    end.
+
+
+
+gen_decode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Args) ->
+		emit(["'dec_",ObjName,"'(",{asis,Name},
+		      ", ",Args,"_) ->",nl])
+	end,
+%     emit(["'dec_",ObjName,"'(",{asis,Name},
+% 	  ", Bytes, TagIn, RestPrimFieldName) ->",nl]),
+    MaybeConstr=
+	case {get_object_field(Name,ObjectFields),OptOrMand} of
+	    {false,'MANDATORY'} -> %% this case is illegal
+		exit({error,{asn1,{"missing mandatory field in object",
+				   ObjName}}});
+	    {false,'OPTIONAL'} ->
+		EmitFuncClause("_, _,"),
+		emit(["   asn1_NOVALUE"]),
+		[];
+	    {false,{'DEFAULT',DefaultType}} ->
+		EmitFuncClause("Bytes, TagIn,"),
+		gen_decode_default_call(ClassName,Name,"Bytes",DefaultType);
+	    {{Name,TypeSpec},_} ->
+		%% A specified field owerwrites any 'DEFAULT' or
+		%% 'OPTIONAL' field in the class
+		EmitFuncClause("Bytes, TagIn,"),
+		gen_decode_field_call(ObjName,Name,"Bytes",TypeSpec)
+	end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,MaybeConstr++ConstrAcc);
+gen_decode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Args) ->
+		emit(["'dec_",ObjName,"'(",{asis,Name},
+		      ", ",Args,") ->",nl])
+	end,
+%     emit(["'dec_",ObjName,"'(",{asis,Name},
+% 	  ", Bytes,TagIn,[H|T]) ->",nl]),
+    case {get_object_field(Name,ObjectFields),OptOrMand} of
+	{false,'MANDATORY'} ->
+	    exit({error,{asn1,{"missing mandatory field in object",
+			       ObjName}}});
+	{false,'OPTIONAL'} ->
+	    EmitFuncClause("_,_,_"),
+	    emit(["  exit({error,{'illegal use of missing field in object', ",Name,
+		  "}})"]);
+	{false,{'DEFAULT',_DefaultObject}} ->
+	    exit({error,{asn1,{"not implemented yet",Name}}});
+	{{Name,TypeSpec},_} ->
+	    EmitFuncClause("Bytes,TagIn,[H|T]"),
+	    case TypeSpec#typedef.name of
+		{ExtMod,TypeName} ->
+		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
+			  "'(H, Bytes, TagIn, T)"});
+		TypeName ->
+		    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, TagIn, T)"})
+	    end
+    end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
+gen_decode_objectfields(CN,[_|Cs],O,OF,CAcc) ->
+    gen_decode_objectfields(CN,Cs,O,OF,CAcc);
+gen_decode_objectfields(_,[],_,_,CAcc) ->
+    CAcc.
+
+
+
+% gen_decode_objectfields(Erules,Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
+%     Fields = Class#objectclass.fields,
+%     MaybeConstr =
+%     case is_typefield(Fields,FieldName) of
+% 	true ->
+% 	    Def = Type#typedef.typespec,
+% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
+% 		  ", Bytes, TagIn, RestPrimFieldName) ->",nl}),
+% 	    OTag = Def#type.tag,
+% 	    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+% 	    Prop =
+% 		case get_optionalityspec(Fields,FieldName) of
+% 		    'OPTIONAL' -> opt_or_default;
+% 		    {'DEFAULT',_} -> opt_or_default;
+% 		    _ -> mandatory
+% 		end,
+% 	    CAcc =
+% 	    case Type#typedef.name of
+% 		{primitive,bif} ->
+% 		    gen_dec_prim(Erules,Def,"Bytes",Tag,"TagIn",no_length,
+% 				 ?PRIMITIVE,Prop),
+% 		    [];
+% 		{constructed,bif} ->
+% 		    emit({"   'dec_",ObjName,'_',FieldName,"'(Bytes,",
+% 			  {asis,Prop},", TagIn ++ ",{asis,Tag},")"}),
+% 		    [{['dec_',ObjName,'_',FieldName],Def}];
+% 		{ExtMod,TypeName} ->
+% 		    emit({"   '",ExtMod,"':'dec_",TypeName,"'(Bytes, ",
+% 			  {asis,Prop},", TagIn ++ ",{asis,Tag},")"}),
+% 		    [];
+% 		TypeName ->
+% 		    emit({"   'dec_",TypeName,"'(Bytes, ",{asis,Prop},
+% 			  ", TagIn ++ ",{asis,Tag},")"}),
+% 		    []
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    CAcc;
+% 	{false,objectfield} ->
+% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
+% 		  ", Bytes, TagIn, [H|T]) ->",nl}),
+% 	    case Type#typedef.name of
+% 		{ExtMod,TypeName} ->
+% 		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
+% 			  "'(H, Bytes, TagIn, T)"});
+% 		TypeName ->
+% 		    emit({indent(3),"'dec_",TypeName,
+% 			  "'(H, Bytes, TagIn, T)"})
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    [];
+% 	{false,_} ->
+% 	    []
+%     end,
+%     gen_decode_objectfields(Erules,Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
+% gen_decode_objectfields(Erules,C,O,[H|T],CAcc) ->
+%     gen_decode_objectfields(Erules,C,O,T,CAcc);
+% gen_decode_objectfields(_,_,_,[],CAcc) ->
+%     CAcc.
+
+gen_decode_constr_type(Erules,[{Name,Def}|Rest]) ->
+%%    emit({Name,"(Bytes, OptOrMand) ->",nl}),
+%%    emit({"   ",Name,"(Bytes, OptOrMand, []).",nl,nl}),
+    emit({Name,"(Bytes, OptOrMand, TagIn) ->",nl}),
+    InnerType = asn1ct_gen:get_inner(Def#type.def),
+    asn1ct_gen:gen_decode_constructed(ber,Name,InnerType,Def),
+    gen_decode_constr_type(Erules,Rest);
+gen_decode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
+    case is_already_generated(dec,TypeDef#typedef.name) of
+	true -> ok;
+	_ ->
+	    gen_decode(Erules,TypeDef)
+    end,
+    gen_decode_constr_type(Erules,Rest);
+gen_decode_constr_type(_,[]) ->
+    ok.
+
+gen_decode_field_call(ObjName,FieldName,Bytes,Type) ->
+    Def = Type#typedef.typespec,
+    OTag = Def#type.tag,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    case Type#typedef.name of
+	{primitive,bif} -> %%tag should be the primitive tag
+	    gen_dec_prim(ber,Def,Bytes,Tag,"TagIn",no_length,
+			 ?PRIMITIVE,opt_or_default),
+	    [];
+	{constructed,bif} ->
+	    emit({"   'dec_",ObjName,'_',FieldName,
+		  "'(",Bytes,",opt_or_default, TagIn ++ ",{asis,Tag},")"}),
+	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
+	{ExtMod,TypeName} ->
+	    emit({"   '",ExtMod,"':'dec_",TypeName,
+		  "'(",Bytes,", opt_or_default,TagIn ++ ",{asis,Tag},")"}),
+	    [];
+	TypeName ->
+	    emit({"   'dec_",TypeName,"'(",Bytes,
+		  ", opt_or_default,TagIn ++ ",{asis,Tag},")"}),
+	    []
+    end.
+
+gen_decode_default_call(ClassName,FieldName,Bytes,Type) ->
+    CurrentMod = get(currmod),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    OTag = Type#type.tag,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    emit(["   'dec_",ClassName,'_',FieldName,"'(",Bytes,
+		  ",opt_or_default, TagIn ++ ",{asis,Tag},")"]),
+	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
+		      typespec=Type}];
+	{primitive,bif} ->
+	    gen_dec_prim(ber,Type,Bytes,Tag,"TagIn",no_length,
+			 ?PRIMITIVE,opt_or_default),
+	    [];
+	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
+	    emit(["   'dec_",Etype,"'(",Bytes,
+		  " ,opt_or_default, TagIn ++ ",{asis,Tag},")",nl]),
+	    [];
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit(["   '",Emod,"':'dec_",Etype,"'(",Bytes,
+		  ", opt_or_defualt, TagIn ++ ",{asis,Tag},")",nl]),
+	    []
+    end.
+
+
+more_genfields([]) ->
+    false;
+more_genfields([Field|Fields]) ->
+    case element(1,Field) of
+	typefield ->
+	    true;
+	objectfield ->
+	    true;
+	_ ->
+	    more_genfields(Fields)
+    end.
+
+
+
+%% Object Set code generating for encoding and decoding
+%% ----------------------------------------------------
+gen_objectset_code(Erules,ObjSet) ->
+    ObjSetName = ObjSet#typedef.name,
+    Def = ObjSet#typedef.typespec,
+%    {ClassName,ClassDef} = Def#'ObjectSet'.class,
+    #'Externaltypereference'{module=ClassModule,
+			     type=ClassName} = Def#'ObjectSet'.class,
+    ClassDef = asn1_db:dbget(ClassModule,ClassName),
+    UniqueFName = Def#'ObjectSet'.uniquefname,
+    Set = Def#'ObjectSet'.set,
+    emit({nl,nl,nl,"%%================================"}),
+    emit({nl,"%%  ",ObjSetName}),
+    emit({nl,"%%================================",nl}),
+    case ClassName of
+	{_Module,ExtClassName} ->
+	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
+			    ExtClassName,ClassDef);
+	_ ->
+	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
+			    ClassName,ClassDef)
+    end,
+    emit(nl).
+
+gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassDef)->
+    ClassFields = (ClassDef#classdef.typespec)#objectclass.fields,
+    InternalFuncs=gen_objset_enc(ObjSetName,UniqueFName,Set,ClassName,ClassFields,1,[]),
+    gen_objset_dec(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassFields,1),
+    gen_internal_funcs(Erules,InternalFuncs).
+
+%% gen_objset_enc iterates over the objects of the object set
+gen_objset_enc(_,{unique,undefined},_,_,_,_,_) ->
+    %% There is no unique field in the class of this object set
+    %% don't bother about the constraint
+    [];
+gen_objset_enc(ObjSName,UniqueName,
+	       [{ObjName,Val,Fields},T|Rest],ClName,ClFields,NthObj,Acc)->
+    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},") ->",nl}),
+    {InternalFunc,NewNthObj}=
+	case ObjName of
+	    no_name ->
+		gen_inlined_enc_funs(Fields,ClFields,ObjSName,NthObj);
+	    _Other ->
+		emit({"    fun 'enc_",ObjName,"'/4"}),
+		{[],NthObj}
+	end,
+    emit({";",nl}),
+    gen_objset_enc(ObjSName,UniqueName,[T|Rest],ClName,ClFields,
+		   NewNthObj,InternalFunc ++ Acc);
+gen_objset_enc(ObjSetName,UniqueName,
+	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
+    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},") ->",nl}),
+    {InternalFunc,_}=
+	case ObjName of
+	    no_name ->
+		gen_inlined_enc_funs(Fields,ClFields,ObjSetName,NthObj);
+	    _Other ->
+		emit({"    fun 'enc_",ObjName,"'/4"}),
+		{[],NthObj}
+	end,
+    emit({".",nl,nl}),
+    InternalFunc ++ Acc;
+%% See X.681 Annex E for the following case
+gen_objset_enc(ObjSetName,_UniqueName,['EXTENSIONMARK'],
+	       _ClName,_ClFields,_NthObj,Acc) ->
+    emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
+    emit({indent(3),"fun(_Attr, Val, _TagIn, _RestPrimFieldName) ->",nl}),
+    emit({indent(6),"Len = case Val of",nl,indent(9),
+	  "Bin when binary(Bin) -> size(Bin);",nl,indent(9),
+	  "_ -> length(Val)",nl,indent(6),"end,"}),
+    emit({indent(6),"{Val,Len}",nl}),
+    emit({indent(3),"end.",nl,nl}),
+    Acc;
+gen_objset_enc(_,_,[],_,_,_,Acc) ->
+    Acc.
+
+%% gen_inlined_enc_funs for each object iterates over all fields of a
+%% class, and for each typefield it checks if the object has that
+%% field and emits the proper code.
+gen_inlined_enc_funs(Fields,[{typefield,Name,_}|Rest],ObjSetName,
+		     NthObj) ->
+    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
+    case lists:keysearch(Name,1,Fields) of
+	{value,{_,Type}} when record(Type,type) ->
+	    emit({indent(3),"fun(Type, Val, TagIn, _RestPrimFieldName) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    {Ret,N} = emit_inner_of_fun(Type,InternalDefFunName),
+	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
+	{value,{_,Type}} when record(Type,typedef) ->
+	    emit({indent(3),"fun(Type, Val, TagIn, _RestPrimFieldName) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    emit({indent(9),{asis,Name}," ->",nl}),
+	    {Ret,N} = emit_inner_of_fun(Type,InternalDefFunName),
+	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
+	false ->
+	    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj)
+    end;
+gen_inlined_enc_funs(Fields,[_H|Rest],ObjSetName,NthObj) ->
+    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj);
+gen_inlined_enc_funs(_,[],_,NthObj) ->
+    {[],NthObj}.
+
+gen_inlined_enc_funs1(Fields,[{typefield,Name,_}|Rest],ObjSetName,
+		      NthObj,Acc) ->
+    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
+    {Acc2,NAdd}=
+	case lists:keysearch(Name,1,Fields) of
+	    {value,{_,Type}} when record(Type,type) ->
+		emit({";",nl}),
+		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+		{Ret++Acc,N};
+	    {value,{_,Type}} when record(Type,typedef) ->
+		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
+		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+		{Ret++Acc,N};
+	    false ->
+		{Acc,0}
+	end,
+    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+NAdd,Acc2);
+gen_inlined_enc_funs1(Fields,[_H|Rest],ObjSetName,NthObj,Acc)->
+    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj,Acc);
+gen_inlined_enc_funs1(_,[],_,NthObj,Acc) ->
+    emit({nl,indent(6),"end",nl}),
+    emit({indent(3),"end"}),
+    {Acc,NthObj}.
+
+
+emit_inner_of_fun(TDef = #typedef{name={ExtMod,Name},typespec=Type},
+		  InternalDefFunName) ->
+    OTag = Type#type.tag,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    case {ExtMod,Name} of
+	{primitive,bif} ->
+	    emit(indent(12)),
+	    gen_encode_prim(ber,Type,["TagIn ++ ",{asis,Tag}],"Val"),
+	    {[],0};
+	{constructed,bif} ->
+	    emit([indent(12),"'enc_",
+		  InternalDefFunName,"'(Val,TagIn ++ ",
+		  {asis,Tag},")"]),
+	    {[TDef#typedef{name=InternalDefFunName}],1};
+	_ ->
+	    emit({indent(12),"'",ExtMod,"':'enc_",Name,"'(Val, TagIn ++ ",
+		  {asis,Tag},")"}),
+	    {[],0}
+    end;
+emit_inner_of_fun(#typedef{name=Name,typespec=Type},_) ->
+    OTag = Type#type.tag,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    emit({indent(12),"'enc_",Name,"'(Val, TagIn ++ ",{asis,Tag},")"}),
+    {[],0};
+emit_inner_of_fun(Type,_) when record(Type,type) ->
+    CurrMod = get(currmod),
+    OTag = Type#type.tag,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    case Type#type.def of
+	Def when atom(Def) ->
+	    emit({indent(9),Def," ->",nl,indent(12)}),
+	    gen_encode_prim(ber,Type,["TagIn ++ ",{asis,Tag}],"Val");
+	TRef when record(TRef,typereference) ->
+	    T = TRef#typereference.val,
+	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,
+		  "'(Val, TagIn ++ ",{asis,Tag},")"});
+	#'Externaltypereference'{module=CurrMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,
+		  "'(Val, TagIn ++ ",{asis,Tag},")"});
+	#'Externaltypereference'{module=ExtMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'enc_",
+		  T,"'(Val, TagIn ++ ",{asis,Tag},")"})
+    end,
+    {[],0}.
+
+indent(N) ->
+    lists:duplicate(N,32). % 32 = space
+
+
+gen_objset_dec(_,_,{unique,undefined},_,_,_,_) ->
+    %% There is no unique field in the class of this object set
+    %% don't bother about the constraint
+    ok;
+gen_objset_dec(Erules,ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
+	       ClName,ClFields,NthObj)->
+    emit({"'getdec_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
+	  ") ->",nl}),
+    NewNthObj=
+	case ObjName of
+	    no_name ->
+		gen_inlined_dec_funs(Erules,Fields,ClFields,ObjSName,
+				     NthObj);
+	    _Other ->
+		emit({"    fun 'dec_",ObjName,"'/4"}),
+		NthObj
+	end,
+    emit({";",nl}),
+    gen_objset_dec(Erules,ObjSName,UniqueName,[T|Rest],ClName,ClFields,
+		   NewNthObj);
+gen_objset_dec(Erules,ObjSetName,UniqueName,[{ObjName,Val,Fields}],_ClName,
+	       ClFields,NthObj) ->
+    emit({"'getdec_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},") ->",nl}),
+    case ObjName of
+	no_name ->
+	    gen_inlined_dec_funs(Erules,Fields,ClFields,ObjSetName,
+				 NthObj);
+	_Other ->
+	    emit({"    fun 'dec_",ObjName,"'/4"})
+    end,
+    emit({".",nl,nl});
+gen_objset_dec(_,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,_ClFields,
+	      _NthObj) ->
+    emit({"'getdec_",ObjSetName,"'(_, _) ->",nl}),
+    emit({indent(3),"fun(_, Bytes, _, _) ->",nl}),
+    emit({indent(6),"Len = case Bytes of",nl,indent(9),
+	  "Bin when binary(Bin) -> size(Bin);",nl,indent(9),
+	  "_ -> length(Bytes)",nl,indent(6),"end,"}),
+    emit({indent(6),"{Bytes,[],Len}",nl}),
+    emit({indent(3),"end.",nl,nl}),
+    ok;
+gen_objset_dec(_,_,_,[],_,_,_) ->
+    ok.
+
+gen_inlined_dec_funs(Erules,Fields,[{typefield,Name,Prop}|Rest],
+		     ObjSetName,NthObj) ->
+    DecProp = case Prop of
+		  'OPTIONAL' -> opt_or_default;
+		  {'DEFAULT',_} -> opt_or_default;
+		  _ -> mandatory
+	      end,
+    InternalDefFunName = [NthObj,Name,ObjSetName],
+    case lists:keysearch(Name,1,Fields) of
+	{value,{_,Type}} when record(Type,type) ->
+	    emit({indent(3),"fun(Type, Bytes, TagIn, _RestPrimFieldName) ->",
+		  nl,indent(6),"case Type of",nl}),
+	    N=emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName),
+	    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj+N);
+	{value,{_,Type}} when record(Type,typedef) ->
+	    emit({indent(3),"fun(Type, Bytes, TagIn, _RestPrimFieldName) ->",
+		  nl,indent(6),"case Type of",nl}),
+	    emit({indent(9),{asis,Name}," ->",nl}),
+	    N=emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName),
+	    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj+N);
+	false ->
+	    gen_inlined_dec_funs(Erules,Fields,Rest,ObjSetName,NthObj)
+    end;
+gen_inlined_dec_funs(Erules,Fields,[_H|Rest],ObjSetName,NthObj) ->
+    gen_inlined_dec_funs(Erules,Fields,Rest,ObjSetName,NthObj);
+gen_inlined_dec_funs(_,_,[],_,NthObj) ->
+    NthObj.
+
+gen_inlined_dec_funs1(Erules,Fields,[{typefield,Name,Prop}|Rest],
+		      ObjSetName,NthObj) ->
+    DecProp = case Prop of
+		  'OPTIONAL' -> opt_or_default;
+		  {'DEFAULT',_} -> opt_or_default;
+		  _ -> mandatory
+	      end,
+    InternalDefFunName = [NthObj,Name,ObjSetName],
+    N=
+	case lists:keysearch(Name,1,Fields) of
+	    {value,{_,Type}} when record(Type,type) ->
+		emit({";",nl}),
+		emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName);
+	    {value,{_,Type}} when record(Type,typedef) ->
+		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
+		emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName);
+	false ->
+		0
+	end,
+    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj+N);
+gen_inlined_dec_funs1(Erules,Fields,[_H|Rest],ObjSetName,NthObj)->
+    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj);
+gen_inlined_dec_funs1(_,_,[],_,NthObj) ->
+    emit({nl,indent(6),"end",nl}),
+    emit({indent(3),"end"}),
+    NthObj.
+
+emit_inner_of_decfun(Erules,#typedef{name={ExtName,Name},typespec=Type},
+		     Prop,InternalDefFunName) ->
+    OTag = Type#type.tag,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    case {ExtName,Name} of
+	{primitive,bif} ->
+	    emit(indent(12)),
+	    gen_dec_prim(Erules,Type,"Bytes",Tag,"TagIn",no_length,
+			 ?PRIMITIVE,Prop),
+	    0;
+	{constructed,bif} ->
+	    emit({indent(12),"'dec_",
+		  asn1ct_gen:list2name(InternalDefFunName),"'(Bytes, ",Prop,
+		  ", TagIn ++ ",{asis,Tag},")"}),
+	    1;
+	_ ->
+	    emit({indent(12),"'",ExtName,"':'dec_",Name,"'(Bytes, ",Prop,
+		  ", TagIn ++ ",{asis,Tag},")"}),
+	    0
+    end;
+emit_inner_of_decfun(_,#typedef{name=Name,typespec=Type},Prop,_) ->
+    OTag = Type#type.tag,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    emit({indent(12),"'dec_",Name,"'(Bytes, ",Prop,", TagIn ++ ",
+	  {asis,Tag},")"}),
+    0;
+emit_inner_of_decfun(Erules,Type,Prop,_) when record(Type,type) ->
+    OTag = Type#type.tag,
+    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    CurrMod = get(currmod),
+    Def = Type#type.def,
+    InnerType = asn1ct_gen:get_inner(Def),
+    WhatKind = asn1ct_gen:type(InnerType),
+    case WhatKind of
+	{primitive,bif} ->
+	    emit({indent(9),Def," ->",nl,indent(12)}),
+	    gen_dec_prim(Erules,Type,"Bytes",Tag,"TagIn",no_length,
+			 ?PRIMITIVE,Prop);
+%	TRef when record(TRef,typereference) ->
+%	    T = TRef#typereference.val,
+%	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
+	#'Externaltypereference'{module=CurrMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,
+		  "'(Bytes, ",Prop,", TagIn ++ ",{asis,Tag},")"});
+	#'Externaltypereference'{module=ExtMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'dec_",
+		  T,"'(Bytes, ",Prop,", TagIn ++ ",{asis,Tag},")"})
+    end,
+    0.
+
+
+gen_internal_funcs(_,[]) ->
+    ok;
+gen_internal_funcs(Erules,[TypeDef|Rest]) ->
+    gen_encode_user(Erules,TypeDef),
+    emit({"'dec_",TypeDef#typedef.name,"'(Bytes, ",
+	  unused_optormand_var("OptOrMand",(TypeDef#typedef.typespec)#type.def),", TagIn) ->",nl}),
+    gen_decode_user(Erules,TypeDef),
+    gen_internal_funcs(Erules,Rest).
+
+
+dbdec(Type) ->
+    demit({"io:format(\"decoding: ",{asis,Type},"~w~n\",[Bytes]),",nl}).
+
+
+decode_class('UNIVERSAL') ->
+    ?UNIVERSAL;
+decode_class('APPLICATION') ->
+    ?APPLICATION;
+decode_class('CONTEXT') ->
+    ?CONTEXT;
+decode_class('PRIVATE') ->
+    ?PRIVATE.
+
+decode_type('BOOLEAN') -> 1;
+decode_type('INTEGER') -> 2;
+decode_type('BIT STRING') -> 3;
+decode_type('OCTET STRING') -> 4;
+decode_type('NULL') -> 5;
+decode_type('OBJECT IDENTIFIER') -> 6;
+decode_type('OBJECT DESCRIPTOR') -> 7;
+decode_type('EXTERNAL') -> 8;
+decode_type('REAL') -> 9;
+decode_type('ENUMERATED') -> 10;
+decode_type('EMBEDDED_PDV') -> 11;
+decode_type('SEQUENCE') -> 16;
+decode_type('SEQUENCE OF') -> 16;
+decode_type('SET') -> 17;
+decode_type('SET OF') -> 17;
+decode_type('NumericString') -> 18;
+decode_type('PrintableString') -> 19;
+decode_type('TeletexString') -> 20;
+decode_type('VideotexString') -> 21;
+decode_type('IA5String') -> 22;
+decode_type('UTCTime') -> 23;
+decode_type('GeneralizedTime') -> 24;
+decode_type('GraphicString') -> 25;
+decode_type('VisibleString') -> 26;
+decode_type('GeneralString') -> 27;
+decode_type('UniversalString') -> 28;
+decode_type('BMPString') -> 30;
+decode_type('CHOICE') -> 'CHOICE'; % choice gets the tag from the actual alternative
+decode_type(Else) -> exit({error,{asn1,{unrecognized_type,Else}}}).
+
+add_removed_bytes() ->
+    asn1ct_name:delete(rb),
+    add_removed_bytes(asn1ct_name:all(rb)).
+
+add_removed_bytes([H,T1|T]) ->
+    emit({{var,H},"+"}),
+    add_removed_bytes([T1|T]);
+add_removed_bytes([H|T]) ->
+    emit({{var,H}}),
+    add_removed_bytes(T);
+add_removed_bytes([]) ->
+    true.
+
+mkfuncname(WhatKind,DecOrEnc) ->
+    case WhatKind of
+	#'Externaltypereference'{module=Mod,type=EType} ->
+	    CurrMod = get(currmod),
+	    case CurrMod of
+		Mod ->
+		    lists:concat(["'",DecOrEnc,"_",EType,"'"]);
+		_ ->
+% 		    io:format("CurrMod: ~p, Mod: ~p~n",[CurrMod,Mod]),
+		    lists:concat(["'",Mod,"':'",DecOrEnc,"_",EType,"'"])
+	    end;
+	#'typereference'{val=EType} ->
+	    lists:concat(["'",DecOrEnc,"_",EType,"'"]);
+	'ASN1_OPEN_TYPE' ->
+	    lists:concat(["'",DecOrEnc,"_",WhatKind,"'"])
+
+    end.
+
+optionals(L) -> optionals(L,[],1).
+
+optionals([{'EXTENSIONMARK',_,_}|Rest],Acc,Pos) ->
+    optionals(Rest,Acc,Pos); % optionals in extension are currently not handled
+optionals([#'ComponentType'{name=Name,prop='OPTIONAL'}|Rest],Acc,Pos) ->
+		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
+optionals([#'ComponentType'{name=Name,prop={'DEFAULT',_}}|Rest],Acc,Pos) ->
+		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
+optionals([#'ComponentType'{}|Rest],Acc,Pos) ->
+		 optionals(Rest,Acc,Pos+1);
+optionals([],Acc,_) ->
+    lists:reverse(Acc).
+
+get_constraint(C,Key) ->
+    case lists:keysearch(Key,1,C) of
+	false ->
+	     no;
+	{value,{_,V}} ->
+	    V
+    end.
+
+%% if the original option was ber and it has been wrapped to ber_bin
+%% turn it back to ber
+re_wrap_erule(ber_bin) ->
+    case get(encoding_options) of
+	Options when list(Options) ->
+	    case lists:member(ber,Options) of
+		true -> ber;
+		_ -> ber_bin
+	    end;
+	_ -> ber_bin
+    end;
+re_wrap_erule(Erule) ->
+    Erule.
+
+is_already_generated(Operation,Name) ->
+    case get(class_default_type) of
+	undefined ->
+	    put(class_default_type,[{Operation,Name}]),
+	    false;
+	GeneratedList ->
+	    case lists:member({Operation,Name},GeneratedList) of
+		true ->
+		    true;
+		false ->
+		    put(class_default_type,[{Operation,Name}|GeneratedList]),
+		    false
+	    end
+    end.
+
+get_class_fields(#classdef{typespec=ObjClass}) ->
+    ObjClass#objectclass.fields;
+get_class_fields(#objectclass{fields=Fields}) ->
+    Fields;
+get_class_fields(_) ->
+    [].
+
+get_object_field(Name,ObjectFields) ->
+    case lists:keysearch(Name,1,ObjectFields) of
+	{value,Field} -> Field;
+	false -> false
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber_bin_v2.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber_bin_v2.erl
new file mode 100644
index 0000000000..89530d4017
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber_bin_v2.erl
@@ -0,0 +1,1562 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_gen_ber_bin_v2.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
+%%
+-module(asn1ct_gen_ber_bin_v2).
+
+%% Generate erlang module which handles (PER) encode and decode for
+%% all types in an ASN.1 module
+
+-include("asn1_records.hrl").
+
+-export([pgen/4]).
+-export([decode_class/1, decode_type/1]).
+-export([add_removed_bytes/0]).
+-export([gen_encode/2,gen_encode/3,gen_decode/2,gen_decode/3]).
+-export([gen_encode_prim/4]).
+-export([gen_dec_prim/7]).
+-export([gen_objectset_code/2, gen_obj_code/3]).
+-export([encode_tag_val/3]).
+-export([gen_inc_decode/2]).
+
+-import(asn1ct_gen, [emit/1,demit/1]).
+
+						% the encoding of class of tag bits 8 and 7
+-define(UNIVERSAL,   0).
+-define(APPLICATION, 16#40).
+-define(CONTEXT,     16#80).
+-define(PRIVATE,     16#C0).
+
+						% primitive or constructed encoding % bit 6
+-define(PRIMITIVE,   0).
+-define(CONSTRUCTED, 2#00100000).
+
+
+-define(T_ObjectDescriptor, ?UNIVERSAL bor ?PRIMITIVE bor 7).
+						% restricted character string types
+-define(T_NumericString,    ?UNIVERSAL bor ?PRIMITIVE bor 18). %can be constructed
+-define(T_PrintableString,  ?UNIVERSAL bor ?PRIMITIVE bor 19). %can be constructed
+-define(T_TeletexString,    ?UNIVERSAL bor ?PRIMITIVE bor 20). %can be constructed
+-define(T_VideotexString,   ?UNIVERSAL bor ?PRIMITIVE bor 21). %can be constructed
+-define(T_IA5String,        ?UNIVERSAL bor ?PRIMITIVE bor 22). %can be constructed
+-define(T_GraphicString,    ?UNIVERSAL bor ?PRIMITIVE bor 25). %can be constructed
+-define(T_VisibleString,    ?UNIVERSAL bor ?PRIMITIVE bor 26). %can be constructed
+-define(T_GeneralString,    ?UNIVERSAL bor ?PRIMITIVE bor 27). %can be constructed
+
+%% pgen(Erules, Module, TypeOrVal)
+%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
+%% .hrl file is only generated if necessary
+%% Erules = per | ber
+%% Module = atom()
+%% TypeOrVal = {TypeList,ValueList,PTypeList}
+%% TypeList = ValueList = [atom()]
+
+pgen(OutFile,Erules,Module,TypeOrVal) ->
+    asn1ct_gen:pgen_module(OutFile,Erules,Module,TypeOrVal,true).
+
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Generate ENCODING
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+%%===============================================================================
+%% encode #{typedef, {pos, name, typespec}}
+%%===============================================================================
+
+gen_encode(Erules,Type) when record(Type,typedef) ->
+    gen_encode_user(Erules,Type).
+
+%%===============================================================================
+%% encode #{type, {tag, def, constraint}}
+%%===============================================================================
+
+gen_encode(Erules,Typename,Type) when record(Type,type) ->
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    ObjFun =
+	case lists:keysearch(objfun,1,Type#type.tablecinf) of
+	    {value,{_,_Name}} ->
+		", ObjFun";
+	    false ->
+		""
+	end,
+
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    emit([nl,nl,nl,"%%================================"]),
+	    emit([nl,"%%  ",asn1ct_gen:list2name(Typename)]),
+	    emit([nl,"%%================================",nl]),
+	    case length(Typename) of
+		1 -> % top level type
+		    emit(["'enc_",asn1ct_gen:list2name(Typename),
+			  "'(Val",ObjFun,") ->",nl]),
+		    emit(["    'enc_",asn1ct_gen:list2name(Typename),
+			  "'(Val, ", {asis,lists:reverse(Type#type.tag)},ObjFun,").",nl,nl]);
+		_ -> % embedded type with constructed name
+		    true
+	    end,
+	    case lists:member(InnerType,['SET','SEQUENCE']) of
+		true ->
+		    case get(asn_keyed_list) of
+			true ->
+			    CompList =
+				case Type#type.def of
+				    #'SEQUENCE'{components=Cl} -> Cl;
+				    #'SET'{components=Cl} -> Cl
+				end,
+			    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
+				  "'(Val, TagIn",ObjFun,
+				  ") when list(Val) ->",nl]),
+			    emit(["    'enc_",asn1ct_gen:list2name(Typename),
+				  "'(?RT_BER:fixoptionals(",
+				  {asis,optionals(CompList)},
+				  ",Val), TagIn",ObjFun,");",nl,nl]);
+			_ -> true
+		    end;
+		_ ->
+		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
+			  "'({'",asn1ct_gen:list2name(Typename),
+			  "',Val}, TagIn",ObjFun,") ->",nl]),
+		    emit(["   'enc_",asn1ct_gen:list2name(Typename),
+			  "'(Val, TagIn",ObjFun,");",nl,nl])
+	    end,
+	    emit(["'enc_",asn1ct_gen:list2name(Typename),
+		  "'(Val, TagIn",ObjFun,") ->",nl,"   "]),
+	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
+	_ ->
+	    true
+    end;
+
+%%===============================================================================
+%% encode ComponentType
+%%===============================================================================
+
+gen_encode(Erules,Tname,{'ComponentType',_Pos,Cname,Type,_Prop,_Tags}) ->
+    NewTname = [Cname|Tname],
+    %% The tag is set to [] to avoid that it is
+    %% taken into account twice, both as a component/alternative (passed as
+    %% argument to the encode decode function and within the encode decode
+    %% function it self.
+    NewType = Type#type{tag=[]},
+    gen_encode(Erules,NewTname,NewType).
+
+gen_encode_user(Erules,D) when record(D,typedef) ->
+    Typename = [D#typedef.name],
+    Type = D#typedef.typespec,
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    OTag = Type#type.tag,
+    Tag = [encode_tag_val(decode_class(X#tag.class),X#tag.form,X#tag.number)|| X <- OTag],
+    emit([nl,nl,"%%================================"]),
+    emit([nl,"%%  ",Typename]),
+    emit([nl,"%%================================",nl]),
+    emit(["'enc_",asn1ct_gen:list2name(Typename),
+	  "'(Val",") ->",nl]),
+    emit(["    'enc_",asn1ct_gen:list2name(Typename),
+	  "'(Val, ", {asis,lists:reverse(Tag)},").",nl,nl]),
+
+    case lists:member(InnerType,['SET','SEQUENCE']) of
+	true ->
+	    case get(asn_keyed_list) of
+		true ->
+		    CompList =
+			case Type#type.def of
+			    #'SEQUENCE'{components=Cl} -> Cl;
+			    #'SET'{components=Cl} -> Cl
+			end,
+
+		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
+			  "'(Val, TagIn) when list(Val) ->",nl]),
+		    emit(["    'enc_",asn1ct_gen:list2name(Typename),
+			  "'(?RT_BER:fixoptionals(",
+			  {asis,optionals(CompList)},
+			  ",Val), TagIn);",nl,nl]);
+		_ -> true
+	    end;
+	_ ->
+	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
+		  "'({'",asn1ct_gen:list2name(Typename),"',Val}, TagIn) ->",nl}),
+	    emit({"   'enc_",asn1ct_gen:list2name(Typename),"'(Val, TagIn);",nl,nl})
+    end,
+    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val, TagIn) ->",nl}),
+    CurrentMod = get(currmod),
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,D);
+	{primitive,bif} ->
+	    gen_encode_prim(ber,Type,"TagIn","Val"),
+	    emit([".",nl]);
+	#typereference{val=Ename} ->
+	    emit(["   'enc_",Ename,"'(Val, TagIn).",nl]);
+	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
+	    emit(["   'enc_",Etype,"'(Val, TagIn).",nl]);
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit(["   '",Emod,"':'enc_",Etype,"'(Val, TagIn).",nl]);
+	'ASN1_OPEN_TYPE' ->
+	    emit(["%% OPEN TYPE",nl]),
+	    gen_encode_prim(ber,
+			    Type#type{def='ASN1_OPEN_TYPE'},
+			    "TagIn","Val"),
+	    emit([".",nl])
+    end.
+
+gen_encode_prim(_Erules,D,DoTag,Value) when record(D,type) ->
+
+%%% Constraint is currently not used for BER (except for BitString) and therefore replaced
+%%% with [] as a placeholder
+    BitStringConstraint = D#type.constraint,
+    Constraint = [],
+    asn1ct_name:new(enumval),
+    case D#type.def of
+	'BOOLEAN' ->
+	    emit_encode_func('boolean',Value,DoTag);
+	'INTEGER' ->
+	    emit_encode_func('integer',Constraint,Value,DoTag);
+	{'INTEGER',NamedNumberList} ->
+	    emit_encode_func('integer',Constraint,Value,
+			     NamedNumberList,DoTag);
+	{'ENUMERATED',NamedNumberList={_,_}} ->
+
+	    emit(["case (case ",Value," of {asn1_enum,_}->",Value,";{_,_}->element(2,",Value,");_->",
+		  Value," end) of",nl]),
+	    emit_enc_enumerated_cases(NamedNumberList,DoTag);
+	{'ENUMERATED',NamedNumberList} ->
+
+	    emit(["case (case ",Value," of {_,_}->element(2,",Value,");_->",
+		  Value," end) of",nl]),
+	    emit_enc_enumerated_cases(NamedNumberList,DoTag);
+
+	{'BIT STRING',NamedNumberList} ->
+	    emit_encode_func('bit_string',BitStringConstraint,Value,
+			     NamedNumberList,DoTag);
+	'ANY' ->
+	    emit_encode_func('open_type', Value,DoTag);
+	'NULL' ->
+	    emit_encode_func('null',Value,DoTag);
+	'OBJECT IDENTIFIER' ->
+	    emit_encode_func("object_identifier",Value,DoTag);
+	'ObjectDescriptor' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_ObjectDescriptor,DoTag);
+	'OCTET STRING' ->
+	    emit_encode_func('octet_string',Constraint,Value,DoTag);
+	'NumericString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_NumericString,DoTag);
+	'TeletexString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_TeletexString,DoTag);
+	'VideotexString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_VideotexString,DoTag);
+	'GraphicString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_GraphicString,DoTag);
+	'VisibleString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_VisibleString,DoTag);
+	'GeneralString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_GeneralString,DoTag);
+	'PrintableString' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_PrintableString,DoTag);
+	'IA5String' ->
+	    emit_encode_func('restricted_string',Constraint,Value,
+			     ?T_IA5String,DoTag);
+	'UniversalString' ->
+	    emit_encode_func('universal_string',Constraint,Value,DoTag);
+	'BMPString' ->
+	    emit_encode_func('BMP_string',Constraint,Value,DoTag);
+	'UTCTime' ->
+	    emit_encode_func('utc_time',Constraint,Value,DoTag);
+	'GeneralizedTime' ->
+	    emit_encode_func('generalized_time',Constraint,Value,DoTag);
+	'ASN1_OPEN_TYPE' ->
+	    emit_encode_func('open_type', Value,DoTag);
+	XX ->
+	    exit({'can not encode' ,XX})
+    end.
+
+
+emit_encode_func(Name,Value,Tags) when atom(Name) ->
+    emit_encode_func(atom_to_list(Name),Value,Tags);
+emit_encode_func(Name,Value,Tags) ->
+    Fname = "?RT_BER:encode_" ++ Name,
+    emit([Fname,"(",Value,", ",Tags,")"]).
+
+emit_encode_func(Name,Constraint,Value,Tags) when atom(Name) ->
+    emit_encode_func(atom_to_list(Name),Constraint,Value,Tags);
+emit_encode_func(Name,Constraint,Value,Tags) ->
+    Fname = "?RT_BER:encode_" ++ Name,
+    emit([Fname,"(",{asis,Constraint},", ",Value,", ",Tags,")"]).
+
+emit_encode_func(Name,Constraint,Value,Asis,Tags) when atom(Name) ->
+    emit_encode_func(atom_to_list(Name),Constraint,Value,Asis,Tags);
+emit_encode_func(Name,Constraint,Value,Asis,Tags) ->
+    Fname = "?RT_BER:encode_" ++ Name,
+    emit([Fname,"(",{asis,Constraint},", ",Value,
+	  ", ",{asis,Asis},
+	  ", ",Tags,")"]).
+
+emit_enc_enumerated_cases({L1,L2}, Tags) ->
+    emit_enc_enumerated_cases(L1++L2, Tags, ext);
+emit_enc_enumerated_cases(L, Tags) ->
+    emit_enc_enumerated_cases(L, Tags, noext).
+
+emit_enc_enumerated_cases([{EnumName,EnumVal},H2|T], Tags, Ext) ->
+    emit([{asis,EnumName}," -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,");",nl]),
+%%    emit(["'",{asis,EnumName},"' -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,");",nl]),
+    emit_enc_enumerated_cases([H2|T], Tags, Ext);
+emit_enc_enumerated_cases([{EnumName,EnumVal}], Tags, Ext) ->
+    emit([{asis,EnumName}," -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,")"]),
+%%    emit(["'",{asis,EnumName},"' -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,")"]),
+    case Ext of
+	noext -> emit([";",nl]);
+	ext ->
+	    emit([";",nl,"{asn1_enum,",{curr,enumval},"} -> ",
+		     "?RT_BER:encode_enumerated(",{curr,enumval},",",Tags,");",nl]),
+	    asn1ct_name:new(enumval)
+    end,
+    emit([{curr,enumval}," -> exit({error,{asn1, {enumerated_not_in_range,",{curr, enumval},"}}})"]),
+    emit([nl,"end"]).
+
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Generate DECODING
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+%%===============================================================================
+%% decode #{typedef, {pos, name, typespec}}
+%%===============================================================================
+
+gen_decode(Erules,Type) when record(Type,typedef) ->
+    Def = Type#typedef.typespec,
+    InnerTag = Def#type.tag ,
+
+    Tag = [(decode_class(X#tag.class) bsl 10) + X#tag.number || X <- InnerTag],
+
+    Prefix =
+	case {asn1ct:get_gen_state_field(active),
+	      asn1ct:get_gen_state_field(prefix)} of
+	    {true,Pref} -> Pref;
+	    _ -> "dec_"
+	end,
+    emit({nl,nl}),
+    emit(["'",Prefix,Type#typedef.name,"'(Tlv) ->",nl]),
+    emit(["   '",Prefix,Type#typedef.name,"'(Tlv, ",{asis,Tag},").",nl,nl]),
+    emit(["'",Prefix,Type#typedef.name,"'(Tlv, TagIn) ->",nl]),
+    dbdec(Type#typedef.name),
+    gen_decode_user(Erules,Type).
+
+gen_inc_decode(Erules,Type) when record(Type,typedef) ->
+    Prefix = asn1ct:get_gen_state_field(prefix),
+    emit({nl,nl}),
+    emit(["'",Prefix,Type#typedef.name,"'(Tlv, TagIn) ->",nl]),
+    gen_decode_user(Erules,Type).
+
+%%===============================================================================
+%% decode #{type, {tag, def, constraint}}
+%%===============================================================================
+
+%% This gen_decode is called by the gen_decode/3 that decodes
+%% ComponentType and the type of a SEQUENCE OF/SET OF.
+gen_decode(Erules,Tname,Type) when record(Type,type) ->
+    Typename = Tname,
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    Prefix =
+	case asn1ct:get_gen_state_field(active) of
+	    true -> "'dec-inc-";
+	    _ -> "'dec_"
+	end,
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    ObjFun =
+		case Type#type.tablecinf of
+		    [{objfun,_}|_R] ->
+			", ObjFun";
+		    _ ->
+			""
+		end,
+	    emit([Prefix,asn1ct_gen:list2name(Typename),"'(Tlv, TagIn",ObjFun,") ->",nl]),
+	    dbdec(Typename),
+	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
+	Rec when record(Rec,'Externaltypereference') ->
+	    case {Typename,asn1ct:get_gen_state_field(namelist)} of
+		{[Cname|_],[{Cname,_}|_]} -> %%
+		    %% This referenced type must only be generated
+		    %% once as incomplete partial decode. Therefore we
+		    %% have to check whether this function already is
+		    %% generated.
+		    case asn1ct:is_function_generated(Typename) of
+			true ->
+			    ok;
+			_ ->
+			    asn1ct:generated_refed_func(Typename),
+			    #'Externaltypereference'{module=M,type=Name}=Rec,
+			    TypeDef = asn1_db:dbget(M,Name),
+			    gen_decode(Erules,TypeDef)
+		    end;
+		_ ->
+		    true
+	    end;
+	_ ->
+	    true
+    end;
+
+
+%%===============================================================================
+%% decode ComponentType
+%%===============================================================================
+
+gen_decode(Erules,Tname,{'ComponentType',_Pos,Cname,Type,_Prop,_Tags}) ->
+    NewTname = [Cname|Tname],
+    %% The tag is set to [] to avoid that it is
+    %% taken into account twice, both as a component/alternative (passed as
+    %% argument to the encode decode function and within the encode decode
+    %% function it self.
+    NewType = Type#type{tag=[]},
+    case {asn1ct:get_gen_state_field(active),
+	  asn1ct:get_tobe_refed_func(NewTname)} of
+	{true,{_,NameList}} ->
+	    asn1ct:update_gen_state(namelist,NameList),
+	    %% remove to gen_refed_funcs list from tobe_refed_funcs later
+	    gen_decode(Erules,NewTname,NewType);
+	{No,_} when No == false; No == undefined ->
+	    gen_decode(Erules,NewTname,NewType);
+	_ ->
+	    ok
+    end.
+
+
+gen_decode_user(Erules,D) when record(D,typedef) ->
+    Typename = [D#typedef.name],
+    Def = D#typedef.typespec,
+    InnerType = asn1ct_gen:get_inner(Def#type.def),
+    BytesVar = "Tlv",
+    case asn1ct_gen:type(InnerType) of
+	'ASN1_OPEN_TYPE' ->
+	    asn1ct_name:new(len),
+	    gen_dec_prim(ber, Def#type{def='ASN1_OPEN_TYPE'},
+			 BytesVar,{string,"TagIn"}, [] ,
+			 ?PRIMITIVE,"OptOrMand"),
+	    emit({".",nl,nl});
+	{primitive,bif} ->
+	    asn1ct_name:new(len),
+	    gen_dec_prim(ber, Def, BytesVar,{string,"TagIn"},[] ,
+			 ?PRIMITIVE,"OptOrMand"),
+	    emit([".",nl,nl]);
+	{constructed,bif} ->
+	    asn1ct:update_namelist(D#typedef.name),
+	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,D);
+	TheType ->
+	    DecFunName = mkfuncname(TheType,dec),
+	    emit([DecFunName,"(",BytesVar,
+		  ", TagIn)"]),
+	    emit([".",nl,nl])
+    end.
+
+
+gen_dec_prim(_Erules,Att,BytesVar,DoTag,_TagIn,_Form,_OptOrMand) ->
+    Typename = Att#type.def,
+%% Currently not used for BER replaced with [] as place holder
+%%    Constraint = Att#type.constraint,
+%% Constraint = [],
+    Constraint =
+	case get_constraint(Att#type.constraint,'SizeConstraint') of
+	    no -> [];
+	    Tc -> Tc
+	end,
+    ValueRange =
+	case get_constraint(Att#type.constraint,'ValueRange') of
+	    no -> [];
+	    Tv -> Tv
+	end,
+    SingleValue =
+	case get_constraint(Att#type.constraint,'SingleValue') of
+	    no -> [];
+	    Sv -> Sv
+	end,
+    AsBin = case get(binary_strings) of
+		true -> "_as_bin";
+		_ -> ""
+	    end,
+    NewTypeName = case Typename of
+		      'ANY' -> 'ASN1_OPEN_TYPE';
+		      _ -> Typename
+		  end,
+%    DoLength =
+    case NewTypeName of
+	'BOOLEAN'->
+	    emit({"?RT_BER:decode_boolean(",BytesVar,","}),
+	    add_func({decode_boolean,2});
+	'INTEGER' ->
+	    emit({"?RT_BER:decode_integer(",BytesVar,",",
+		  {asis,int_constr(SingleValue,ValueRange)},","}),
+	    add_func({decode_integer,3});
+	{'INTEGER',NamedNumberList} ->
+	    emit({"?RT_BER:decode_integer(",BytesVar,",",
+		  {asis,int_constr(SingleValue,ValueRange)},",",
+		  {asis,NamedNumberList},","}),
+	    add_func({decode_integer,4});
+	{'ENUMERATED',NamedNumberList} ->
+	    emit({"?RT_BER:decode_enumerated(",BytesVar,",",
+		  {asis,Constraint},",",
+		  {asis,NamedNumberList},","}),
+	    add_func({decode_enumerated,4});
+	{'BIT STRING',NamedNumberList} ->
+	    case get(compact_bit_string) of
+		true ->
+		    emit({"?RT_BER:decode_compact_bit_string(",
+			  BytesVar,",",{asis,Constraint},",",
+			  {asis,NamedNumberList},","}),
+		    add_func({decode_compact_bit_string,4});
+		_ ->
+		    emit({"?RT_BER:decode_bit_string(",BytesVar,",",
+			  {asis,Constraint},",",
+			  {asis,NamedNumberList},","}),
+		    add_func({decode_bit_string,4})
+	    end;
+	'NULL' ->
+	    emit({"?RT_BER:decode_null(",BytesVar,","}),
+	    add_func({decode_null,2});
+	'OBJECT IDENTIFIER' ->
+	    emit({"?RT_BER:decode_object_identifier(",BytesVar,","}),
+	    add_func({decode_object_identifier,2});
+	'ObjectDescriptor' ->
+	    emit({"?RT_BER:decode_restricted_string(",
+		  BytesVar,",",{asis,Constraint},",",{asis,?T_ObjectDescriptor},","}),
+	    add_func({decode_restricted_string,4});
+	'OCTET STRING' ->
+	    emit({"?RT_BER:decode_octet_string",AsBin,"(",BytesVar,",",{asis,Constraint},","}),
+	    add_func({decode_octet_string,3});
+	'NumericString' ->
+	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},",",{asis,?T_NumericString},","}),
+	    add_func({decode_restricted_string,4});
+	'TeletexString' ->
+	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},",",{asis,?T_TeletexString},","}),
+	    add_func({decode_restricted_string,4});
+	'VideotexString' ->
+	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},",",{asis,?T_VideotexString},","}),
+	    add_func({decode_restricted_string,4});
+	'GraphicString' ->
+	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},",",{asis,?T_GraphicString},","}),
+	    add_func({decode_restricted_string,4});
+	'VisibleString' ->
+	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},",",{asis,?T_VisibleString},","}),
+	    add_func({decode_restricted_string,4});
+	'GeneralString' ->
+	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},",",{asis,?T_GeneralString},","}),
+	    add_func({decode_restricted_string,4});
+	'PrintableString' ->
+	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},",",{asis,?T_PrintableString},","}),
+	    add_func({decode_restricted_string,4});
+	'IA5String' ->
+	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},",",{asis,?T_IA5String},","}),
+	    add_func({decode_restricted_string,4}) ;
+	'UniversalString' ->
+	    emit({"?RT_BER:decode_universal_string",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},","}),
+	    add_func({decode_universal_string,3});
+	'BMPString' ->
+	    emit({"?RT_BER:decode_BMP_string",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},","}),
+	    add_func({decode_BMP_string,3});
+	'UTCTime' ->
+	    emit({"?RT_BER:decode_utc_time",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},","}),
+	    add_func({decode_utc_time,3});
+	'GeneralizedTime' ->
+	    emit({"?RT_BER:decode_generalized_time",AsBin,"(",
+		  BytesVar,",",{asis,Constraint},","}),
+	    add_func({decode_generalized_time,3});
+	'ASN1_OPEN_TYPE' ->
+	    emit(["?RT_BER:decode_open_type_as_binary(",
+		  BytesVar,","]),
+	    add_func({decode_open_type_as_binary,2});
+	Other ->
+	    exit({'can not decode' ,Other})
+    end,
+
+    case {DoTag,NewTypeName} of
+	{{string,TagStr},'ASN1_OPEN_TYPE'} ->
+	    emit([TagStr,")"]);
+	{_,'ASN1_OPEN_TYPE'} ->
+	    emit([{asis,DoTag},")"]);
+	{{string,TagStr},_} ->
+	    emit([TagStr,")"]);
+	_ when list(DoTag) ->
+	    emit([{asis,DoTag},")"])
+    end.
+
+
+int_constr([],[]) ->
+    [];
+int_constr([],ValueRange) ->
+    ValueRange;
+int_constr(SingleValue,[]) ->
+    SingleValue;
+int_constr(SV,VR) ->
+    [SV,VR].
+
+%% Object code generating for encoding and decoding
+%% ------------------------------------------------
+
+gen_obj_code(Erules,_Module,Obj) when record(Obj,typedef) ->
+    ObjName = Obj#typedef.name,
+    Def = Obj#typedef.typespec,
+    #'Externaltypereference'{module=M,type=ClName} = Def#'Object'.classname,
+    Class = asn1_db:dbget(M,ClName),
+    {object,_,Fields} = Def#'Object'.def,
+    emit({nl,nl,nl,"%%================================"}),
+    emit({nl,"%%  ",ObjName}),
+    emit({nl,"%%================================",nl}),
+    EncConstructed =
+	gen_encode_objectfields(ClName,get_class_fields(Class),
+				ObjName,Fields,[]),
+    emit(nl),
+    gen_encode_constr_type(Erules,EncConstructed),
+    emit(nl),
+    DecConstructed =
+	gen_decode_objectfields(ClName,get_class_fields(Class),
+				ObjName,Fields,[]),
+    emit(nl),
+    gen_decode_constr_type(Erules,DecConstructed),
+    emit_tlv_format_function();
+gen_obj_code(_Erules,_Module,Obj) when record(Obj,pobjectdef) ->
+    ok.
+
+gen_encode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Arg) ->
+		emit(["'enc_",ObjName,"'(",{asis,Name},
+		      ", ",Arg,", _RestPrimFieldName) ->",nl])
+	end,
+%     emit(["'enc_",ObjName,"'(",{asis,Name},
+% 	  ", Val, RestPrimFieldName) ->",nl]),
+    MaybeConstr=
+	case {get_object_field(Name,ObjectFields),OptOrMand} of
+	    {false,'MANDATORY'} -> %% this case is illegal
+		exit({error,{asn1,{"missing mandatory field in object",
+				   ObjName}}});
+	    {false,'OPTIONAL'} ->
+		EmitFuncClause("_"),
+		emit(["   {<<>>,0}"]),
+		[];
+	    {false,{'DEFAULT',DefaultType}} ->
+		EmitFuncClause("Val"),
+		gen_encode_default_call(ClassName,Name,DefaultType);
+	    {{Name,TypeSpec},_} ->
+		%% A specified field owerwrites any 'DEFAULT' or
+		%% 'OPTIONAL' field in the class
+		EmitFuncClause("Val"),
+		gen_encode_field_call(ObjName,Name,TypeSpec)
+	end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,
+			    MaybeConstr++ConstrAcc);
+gen_encode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Args) ->
+		emit(["'enc_",ObjName,"'(",{asis,Name},
+		      ", ",Args,") ->",nl])
+	end,
+%     emit(["'enc_",ObjName,"'(",{asis,Name},
+% 	  ", Val,[H|T]) ->",nl]),
+    case {get_object_field(Name,ObjectFields),OptOrMand} of
+	{false,'MANDATORY'} ->
+	    exit({error,{asn1,{"missing mandatory field in object",
+			       ObjName}}});
+	{false,'OPTIONAL'} ->
+	    EmitFuncClause("_,_"),
+	    emit(["  exit({error,{'use of missing field in object', ",Name,
+		  "}})"]);
+	{false,{'DEFAULT',_DefaultObject}} ->
+	    exit({error,{asn1,{"not implemented yet",Name}}});
+	{{Name,TypeSpec},_} ->
+	    EmitFuncClause(" Val, [H|T]"),
+	    case TypeSpec#typedef.name of
+		{ExtMod,TypeName} ->
+		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
+			  "'(H, Val, T)"});
+		TypeName ->
+		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
+	    end
+    end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
+
+% gen_encode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
+%     Fields = Class#objectclass.fields,
+%     MaybeConstr=
+% 	case is_typefield(Fields,FieldName) of
+% 	    true ->
+% 		Def = Type#typedef.typespec,
+% 		emit({"'enc_",ObjName,"'(",{asis,FieldName},
+% 		      ", Val, RestPrimFieldName) ->",nl}),
+% 		CAcc=
+% 		case Type#typedef.name of
+% 		    {primitive,bif} -> %%tag should be the primitive tag
+% 			OTag = Def#type.tag,
+% 			Tag = [encode_tag_val(decode_class(X#tag.class),
+% 					      X#tag.form,X#tag.number)||
+% 				  X <- OTag],
+% 			gen_encode_prim(ber,Def,{asis,lists:reverse(Tag)},
+% 					"Val"),
+% 			[];
+% 		    {constructed,bif} ->
+% 			emit({"   'enc_",ObjName,'_',FieldName,
+% 			      "'(Val)"}),
+% 			[Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
+% 		    {ExtMod,TypeName} ->
+% 			emit({"   '",ExtMod,"':'enc_",TypeName,
+% 			      "'(Val)"}),
+% 			[];
+% 		    TypeName ->
+% 			emit({"   'enc_",TypeName,"'(Val)"}),
+% 			[]
+% 		end,
+% 		case more_genfields(Fields,Rest) of
+% 		    true ->
+% 			emit({";",nl});
+% 		    false ->
+% 			emit({".",nl})
+% 		end,
+% 		CAcc;
+% 	{false,objectfield} ->
+% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
+% 		  ", Val,[H|T]) ->",nl}),
+% 	    case Type#typedef.name of
+% 		{ExtMod,TypeName} ->
+% 		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
+% 			  "'(H, Val, T)"});
+% 		TypeName ->
+% 		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    [];
+% 	{false,_} -> []
+%     end,
+%     gen_encode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
+gen_encode_objectfields(ClassName,[_C|Cs],O,OF,Acc) ->
+    gen_encode_objectfields(ClassName,Cs,O,OF,Acc);
+gen_encode_objectfields(_,[],_,_,Acc) ->
+    Acc.
+
+% gen_encode_constr_type(Erules,[{Name,Def}|Rest]) ->
+%     emit({Name,"(Val,TagIn) ->",nl}),
+%     InnerType = asn1ct_gen:get_inner(Def#type.def),
+%     asn1ct_gen:gen_encode_constructed(Erules,Name,InnerType,Def),
+%     gen_encode_constr_type(Erules,Rest);
+gen_encode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
+    case is_already_generated(enc,TypeDef#typedef.name) of
+	true -> ok;
+	_ -> gen_encode_user(Erules,TypeDef)
+    end,
+    gen_encode_constr_type(Erules,Rest);
+gen_encode_constr_type(_,[]) ->
+    ok.
+
+gen_encode_field_call(ObjName,FieldName,Type) ->
+    Def = Type#typedef.typespec,
+    OTag = Def#type.tag,
+    Tag = [encode_tag_val(decode_class(X#tag.class),
+			  X#tag.form,X#tag.number)||
+	      X <- OTag],
+    case Type#typedef.name of
+	{primitive,bif} -> %%tag should be the primitive tag
+% 	    OTag = Def#type.tag,
+% 	    Tag = [encode_tag_val(decode_class(X#tag.class),
+% 				  X#tag.form,X#tag.number)||
+% 		      X <- OTag],
+	    gen_encode_prim(ber,Def,{asis,lists:reverse(Tag)},
+			    "Val"),
+	    [];
+	{constructed,bif} ->
+	    emit({"   'enc_",ObjName,'_',FieldName,
+		  "'(Val,",{asis,Tag},")"}),
+	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
+	{ExtMod,TypeName} ->
+	    emit({"   '",ExtMod,"':'enc_",TypeName,
+		  "'(Val,",{asis,Tag},")"}),
+	    [];
+	TypeName ->
+	    emit({"   'enc_",TypeName,"'(Val,",{asis,Tag},")"}),
+	    []
+    end.
+
+gen_encode_default_call(ClassName,FieldName,Type) ->
+    CurrentMod = get(currmod),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    OTag = Type#type.tag,
+    Tag = [encode_tag_val(decode_class(X#tag.class),X#tag.form,X#tag.number)|| X <- OTag],
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+%%	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
+	    emit(["   'enc_",ClassName,'_',FieldName,"'(Bytes)"]),
+	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
+		      typespec=Type}];
+	{primitive,bif} ->
+	    gen_encode_prim(ber,Type,{asis,lists:reverse(Tag)},"Val"),
+	    [];
+	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
+	    emit(["   'enc_",Etype,"'(Val, ",{asis,Tag},")",nl]),
+	    [];
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit(["   '",Emod,"':'enc_",Etype,"'(Val, ",{asis,Tag},")",nl]),
+	    []
+% 	'ASN1_OPEN_TYPE' ->
+% 	    emit(["%% OPEN TYPE",nl]),
+% 	    gen_encode_prim(ber,
+% 			    Type#type{def='ASN1_OPEN_TYPE'},
+% 			    "TagIn","Val"),
+% 	    emit([".",nl])
+    end.
+
+%%%%%%%%%%%%%%%%
+
+gen_decode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Arg) ->
+		emit(["'dec_",ObjName,"'(",{asis,Name},
+		      ", ",Arg,",_) ->",nl])
+	end,
+%     emit(["'dec_",ObjName,"'(",{asis,Name},
+% 	  ", Bytes, RestPrimFieldName) ->",nl]),
+    MaybeConstr=
+	case {get_object_field(Name,ObjectFields),OptOrMand} of
+	    {false,'MANDATORY'} -> %% this case is illegal
+		exit({error,{asn1,{"missing mandatory field in object",
+				   ObjName}}});
+	    {false,'OPTIONAL'} ->
+		EmitFuncClause(" _"),
+		emit(["   asn1_NOVALUE"]),
+		[];
+	    {false,{'DEFAULT',DefaultType}} ->
+		EmitFuncClause("Bytes"),
+		emit_tlv_format("Bytes"),
+		gen_decode_default_call(ClassName,Name,"Tlv",DefaultType);
+	    {{Name,TypeSpec},_} ->
+		%% A specified field owerwrites any 'DEFAULT' or
+		%% 'OPTIONAL' field in the class
+		EmitFuncClause("Bytes"),
+		emit_tlv_format("Bytes"),
+		gen_decode_field_call(ObjName,Name,"Tlv",TypeSpec)
+	end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,MaybeConstr++ConstrAcc);
+gen_decode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Args) ->
+		emit(["'dec_",ObjName,"'(",{asis,Name},
+		      ", ",Args,") ->",nl])
+	end,
+%     emit(["'dec_",ObjName,"'(",{asis,Name},
+% 	  ", Bytes,[H|T]) ->",nl]),
+%     emit_tlv_format("Bytes"),
+    case {get_object_field(Name,ObjectFields),OptOrMand} of
+	{false,'MANDATORY'} ->
+	    exit({error,{asn1,{"missing mandatory field in object",
+			       ObjName}}});
+	{false,'OPTIONAL'} ->
+	    EmitFuncClause("_,_"),
+	    emit(["  exit({error,{'illegal use of missing field in object', ",Name,
+		  "}})"]);
+	{false,{'DEFAULT',_DefaultObject}} ->
+	    exit({error,{asn1,{"not implemented yet",Name}}});
+	{{Name,TypeSpec},_} ->
+	    EmitFuncClause("Bytes,[H|T]"),
+%	    emit_tlv_format("Bytes"),
+	    case TypeSpec#typedef.name of
+		{ExtMod,TypeName} ->
+		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
+			  "'(H, Bytes, T)"});
+		TypeName ->
+		    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, T)"})
+	    end
+    end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
+gen_decode_objectfields(CN,[_C|Cs],O,OF,CAcc) ->
+    gen_decode_objectfields(CN,Cs,O,OF,CAcc);
+gen_decode_objectfields(_,[],_,_,CAcc) ->
+    CAcc.
+
+emit_tlv_format(Bytes) ->
+    notice_tlv_format_gen(), % notice for generating of tlv_format/1
+    emit(["  Tlv = tlv_format(",Bytes,"),",nl]).
+
+notice_tlv_format_gen() ->
+    Module = get(currmod),
+%    io:format("Noticed: ~p~n",[Module]),
+    case get(tlv_format) of
+	{done,Module} ->
+	    ok;
+	_ -> % true or undefined
+	    put(tlv_format,true)
+    end.
+
+emit_tlv_format_function() ->
+    Module = get(currmod),
+%    io:format("Tlv formated: ~p",[Module]),
+    case get(tlv_format) of
+	true ->
+%	    io:format(" YES!~n"),
+	    emit_tlv_format_function1(),
+	    put(tlv_format,{done,Module});
+	_ ->
+%	    io:format(" NO!~n"),
+	    ok
+    end.
+emit_tlv_format_function1() ->
+    emit(["tlv_format(Bytes) when binary(Bytes) ->",nl,
+	  "  {Tlv,_}=?RT_BER:decode(Bytes),",nl,
+	  "  Tlv;",nl,
+	  "tlv_format(Bytes) ->",nl,
+	  "  Bytes.",nl]).
+
+
+gen_decode_constr_type(Erules,[{Name,Def}|Rest]) ->
+    emit([Name,"(Tlv, TagIn) ->",nl]),
+    InnerType = asn1ct_gen:get_inner(Def#type.def),
+    asn1ct_gen:gen_decode_constructed(Erules,Name,InnerType,Def),
+    gen_decode_constr_type(Erules,Rest);
+gen_decode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
+    case is_already_generated(dec,TypeDef#typedef.name) of
+	true -> ok;
+	_ ->
+	    gen_decode(Erules,TypeDef)
+    end,
+    gen_decode_constr_type(Erules,Rest);
+gen_decode_constr_type(_,[]) ->
+    ok.
+
+%%%%%%%%%%%
+gen_decode_field_call(ObjName,FieldName,Bytes,Type) ->
+    Def = Type#typedef.typespec,
+    OTag = Def#type.tag,
+    Tag = [(decode_class(X#tag.class) bsl 10) + X#tag.number ||
+	      X <- OTag],
+    case Type#typedef.name of
+	{primitive,bif} -> %%tag should be the primitive tag
+	    gen_dec_prim(ber,Def,Bytes,Tag,"TagIn",?PRIMITIVE,
+			 opt_or_default),
+	    [];
+	{constructed,bif} ->
+	    emit({"   'dec_",ObjName,'_',FieldName,
+		  "'(",Bytes,",",{asis,Tag},")"}),
+	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
+	{ExtMod,TypeName} ->
+	    emit({"   '",ExtMod,"':'dec_",TypeName,
+		  "'(",Bytes,",",{asis,Tag},")"}),
+	    [];
+	TypeName ->
+	    emit({"   'dec_",TypeName,"'(",Bytes,",",{asis,Tag},")"}),
+	    []
+    end.
+
+gen_decode_default_call(ClassName,FieldName,Bytes,Type) ->
+    CurrentMod = get(currmod),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    OTag = Type#type.tag,
+    Tag = [(decode_class(X#tag.class) bsl 10) + X#tag.number || X <- OTag],
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    emit(["   'dec_",ClassName,'_',FieldName,"'(",Bytes,",",
+		  {asis,Tag},")"]),
+	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',
+						      FieldName])),
+		      typespec=Type}];
+	{primitive,bif} ->
+	    gen_dec_prim(ber,Type,Bytes,Tag,"TagIn",
+			 ?PRIMITIVE,opt_or_default),
+	    [];
+	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
+	    emit(["   'dec_",Etype,"'(",Bytes, " ,",{asis,Tag},")",nl]),
+	    [];
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit(["   '",Emod,"':'dec_",Etype,"'(",Bytes,", ",
+		  {asis,Tag},")",nl]),
+	    []
+% 	'ASN1_OPEN_TYPE' ->
+% 	    emit(["%% OPEN TYPE",nl]),
+% 	    gen_encode_prim(ber,
+% 			    Type#type{def='ASN1_OPEN_TYPE'},
+% 			    "TagIn","Val"),
+% 	    emit([".",nl])
+    end.
+%%%%%%%%%%%
+
+is_already_generated(Operation,Name) ->
+    case get(class_default_type) of
+	undefined ->
+	    put(class_default_type,[{Operation,Name}]),
+	    false;
+	GeneratedList ->
+	    case lists:member({Operation,Name},GeneratedList) of
+		true ->
+		    true;
+		false ->
+		    put(class_default_type,[{Operation,Name}|GeneratedList]),
+		    false
+	    end
+    end.
+
+more_genfields([]) ->
+    false;
+more_genfields([Field|Fields]) ->
+    case element(1,Field) of
+	typefield ->
+	    true;
+	objectfield ->
+	    true;
+	_ ->
+	    more_genfields(Fields)
+    end.
+
+
+
+
+%% Object Set code generating for encoding and decoding
+%% ----------------------------------------------------
+gen_objectset_code(Erules,ObjSet) ->
+    ObjSetName = ObjSet#typedef.name,
+    Def = ObjSet#typedef.typespec,
+%    {ClassName,ClassDef} = Def#'ObjectSet'.class,
+    #'Externaltypereference'{module=ClassModule,
+			     type=ClassName} = Def#'ObjectSet'.class,
+    ClassDef = asn1_db:dbget(ClassModule,ClassName),
+    UniqueFName = Def#'ObjectSet'.uniquefname,
+    Set = Def#'ObjectSet'.set,
+    emit({nl,nl,nl,"%%================================"}),
+    emit({nl,"%%  ",ObjSetName}),
+    emit({nl,"%%================================",nl}),
+    case ClassName of
+	{_Module,ExtClassName} ->
+	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ExtClassName,ClassDef);
+	_ ->
+	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassDef)
+    end,
+    emit(nl).
+
+gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassDef)->
+    ClassFields = get_class_fields(ClassDef),
+    InternalFuncs=gen_objset_enc(Erules,ObjSetName,UniqueFName,Set,
+				 ClassName,ClassFields,1,[]),
+    gen_objset_dec(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassFields,1),
+    gen_internal_funcs(Erules,InternalFuncs).
+
+%% gen_objset_enc iterates over the objects of the object set
+gen_objset_enc(_,_,{unique,undefined},_,_,_,_,_) ->
+    %% There is no unique field in the class of this object set
+    %% don't bother about the constraint
+    [];
+gen_objset_enc(Erules,ObjSName,UniqueName,
+	       [{ObjName,Val,Fields},T|Rest],ClName,ClFields,
+	       NthObj,Acc)->
+    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
+	  ") ->",nl}),
+    {InternalFunc,NewNthObj}=
+	case ObjName of
+	    no_name ->
+		gen_inlined_enc_funs(Fields,ClFields,ObjSName,NthObj);
+	    _ ->
+		emit({"    fun 'enc_",ObjName,"'/3"}),
+		{[],NthObj}
+	end,
+    emit({";",nl}),
+    gen_objset_enc(Erules,ObjSName,UniqueName,[T|Rest],ClName,ClFields,
+		   NewNthObj,InternalFunc ++ Acc);
+gen_objset_enc(_,ObjSetName,UniqueName,
+	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
+    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",
+	  {asis,Val},") ->",nl}),
+    {InternalFunc,_} =
+	case ObjName of
+	    no_name ->
+		gen_inlined_enc_funs(Fields,ClFields,ObjSetName,NthObj);
+	    _ ->
+		emit({"    fun 'enc_",ObjName,"'/3"}),
+		{[],NthObj}
+	end,
+    emit({".",nl,nl}),
+    InternalFunc ++ Acc;
+%% See X.681 Annex E for the following case
+gen_objset_enc(_,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
+	       _ClFields,_NthObj,Acc) ->
+    emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
+    emit({indent(3),"fun(_, Val, _RestPrimFieldName) ->",nl}),
+    emit({indent(6),"Len = case Val of",nl,indent(9),
+	  "Bin when binary(Bin) -> size(Bin);",nl,indent(9),
+	  "_ -> length(Val)",nl,indent(6),"end,"}),
+    emit({indent(6),"{Val,Len}",nl}),
+    emit({indent(3),"end.",nl,nl}),
+    Acc;
+gen_objset_enc(_,_,_,[],_,_,_,Acc) ->
+    Acc.
+
+%% gen_inlined_enc_funs for each object iterates over all fields of a
+%% class, and for each typefield it checks if the object has that
+%% field and emits the proper code.
+gen_inlined_enc_funs(Fields,[{typefield,Name,_}|Rest],
+		     ObjSetName,NthObj) ->
+    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
+    case lists:keysearch(Name,1,Fields) of
+	{value,{_,Type}} when record(Type,type) ->
+	    emit({indent(3),"fun(Type, Val, _RestPrimFieldName) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    {Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
+	{value,{_,Type}} when record(Type,typedef) ->
+	    emit({indent(3),"fun(Type, Val, _RestPrimFieldName) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    emit({indent(9),{asis,Name}," ->",nl}),
+	    {Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
+	false ->
+	    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj)
+    end;
+gen_inlined_enc_funs(Fields,[_|Rest],ObjSetName,NthObj) ->
+    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj);
+gen_inlined_enc_funs(_,[],_,NthObj) ->
+    {[],NthObj}.
+
+gen_inlined_enc_funs1(Fields,[{typefield,Name,_}|Rest],ObjSetName,
+		      NthObj,Acc) ->
+    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
+    {Acc2,NAdd}=
+	case lists:keysearch(Name,1,Fields) of
+	    {value,{_,Type}} when record(Type,type) ->
+		emit({";",nl}),
+		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+		{Ret++Acc,N};
+	    {value,{_,Type}} when record(Type,typedef) ->
+		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
+		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+		{Ret++Acc,N};
+	    false ->
+		{Acc,0}
+	end,
+    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+NAdd,Acc2);
+gen_inlined_enc_funs1(Fields,[_|Rest],ObjSetName,NthObj,Acc)->
+    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj,Acc);
+gen_inlined_enc_funs1(_,[],_,NthObj,Acc) ->
+    emit({nl,indent(6),"end",nl}),
+    emit({indent(3),"end"}),
+    {Acc,NthObj}.
+
+emit_inner_of_fun(TDef=#typedef{name={ExtMod,Name},typespec=Type},
+		  InternalDefFunName) ->
+    OTag = Type#type.tag,
+    Tag = [encode_tag_val(decode_class(X#tag.class),X#tag.form,X#tag.number)|| X <- OTag],
+% remove    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    case {ExtMod,Name} of
+	{primitive,bif} ->
+	    emit(indent(12)),
+	    gen_encode_prim(ber,Type,[{asis,lists:reverse(Tag)}],"Val"),
+	    {[],0};
+	{constructed,bif} ->
+	    emit([indent(12),"'enc_",
+		  InternalDefFunName,"'(Val)"]),
+	    {[TDef#typedef{name=InternalDefFunName}],1};
+	_ ->
+	    emit({indent(12),"'",ExtMod,"':'enc_",Name,"'(Val)"}),
+	    {[],0}
+    end;
+emit_inner_of_fun(#typedef{name=Name},_) ->
+%    OTag = Type#type.tag,
+% remove    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+%    Tag = [encode_tag_val(decode_class(X#tag.class),X#tag.form,X#tag.number)|| X <- OTag],
+    emit({indent(12),"'enc_",Name,"'(Val)"}),
+    {[],0};
+emit_inner_of_fun(Type,_) when record(Type,type) ->
+    CurrMod = get(currmod),
+%    OTag = Type#type.tag,
+% remove    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+%    Tag = [encode_tag_val(decode_class(X#tag.class),X#tag.form,X#tag.number)|| X <- OTag],
+    case Type#type.def of
+	Def when atom(Def) ->
+	    OTag = Type#type.tag,
+	    Tag = [encode_tag_val(decode_class(X#tag.class),
+				  X#tag.form,X#tag.number)||X <- OTag],
+	    emit([indent(9),Def," ->",nl,indent(12)]),
+	    gen_encode_prim(ber,Type,{asis,lists:reverse(Tag)},"Val");
+	TRef when record(TRef,typereference) ->
+	    T = TRef#typereference.val,
+	    emit([indent(9),T," ->",nl,indent(12),"'enc_",T,
+		  "'(Val)"]);
+	#'Externaltypereference'{module=CurrMod,type=T} ->
+	    emit([indent(9),T," ->",nl,indent(12),"'enc_",T,
+		  "'(Val)"]);
+	#'Externaltypereference'{module=ExtMod,type=T} ->
+	    emit([indent(9),T," ->",nl,indent(12),ExtMod,":'enc_",
+		  T,"'(Val)"])
+    end,
+    {[],0}.
+
+indent(N) ->
+    lists:duplicate(N,32). % 32 = space
+
+
+gen_objset_dec(_,_,{unique,undefined},_,_,_,_) ->
+    %% There is no unique field in the class of this object set
+    %% don't bother about the constraint
+    ok;
+gen_objset_dec(Erules,ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
+	       ClName,ClFields,NthObj)->
+    emit(["'getdec_",ObjSName,"'(",{asis,UniqueName},",",
+	  {asis,Val},") ->",nl]),
+    NewNthObj=
+	case ObjName of
+	    no_name ->
+		gen_inlined_dec_funs(Fields,ClFields,ObjSName,NthObj);
+	    _ ->
+		emit(["    fun 'dec_",ObjName,"'/3"]),
+		NthObj
+	end,
+    emit([";",nl]),
+    gen_objset_dec(Erules,ObjSName,UniqueName,[T|Rest],ClName,
+		   ClFields,NewNthObj);
+gen_objset_dec(_,ObjSetName,UniqueName,[{ObjName,Val,Fields}],
+	       _ClName,ClFields,NthObj) ->
+    emit(["'getdec_",ObjSetName,"'(",{asis,UniqueName},",",
+	  {asis,Val},") ->",nl]),
+    case ObjName of
+	no_name ->
+	    gen_inlined_dec_funs(Fields,ClFields,ObjSetName,NthObj);
+	_ ->
+	    emit(["    fun 'dec_",ObjName,"'/3"])
+    end,
+    emit([".",nl,nl]),
+    ok;
+gen_objset_dec(Erules,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
+	       _ClFields,_NthObj) ->
+    emit(["'getdec_",ObjSetName,"'(_, _) ->",nl]),
+    emit([indent(2),"fun(_,Bytes, _RestPrimFieldName) ->",nl]),
+    case Erules of
+	ber_bin_v2 ->
+	    emit([indent(4),"case Bytes of",nl,
+		  indent(6),"Bin when binary(Bin) -> ",nl,
+		  indent(8),"Bin;",nl,
+		  indent(6),"_ ->",nl,
+		  indent(8),"?RT_BER:encode(Bytes)",nl,
+		  indent(4),"end",nl]);
+	_ ->
+	    emit([indent(6),"Len = case Bytes of",nl,indent(9),
+		  "Bin when binary(Bin) -> size(Bin);",nl,indent(9),
+		  "_ -> length(Bytes)",nl,indent(6),"end,"]),
+	    emit([indent(4),"{Bytes,[],Len}",nl])
+    end,
+    emit([indent(2),"end.",nl,nl]),
+    ok;
+gen_objset_dec(_,_,_,[],_,_,_) ->
+    ok.
+
+gen_inlined_dec_funs(Fields,[{typefield,Name,Prop}|Rest],
+		     ObjSetName,NthObj) ->
+    DecProp = case Prop of
+		  'OPTIONAL' -> opt_or_default;
+		  {'DEFAULT',_} -> opt_or_default;
+		  _ -> mandatory
+	      end,
+    InternalDefFunName = [NthObj,Name,ObjSetName],
+    case lists:keysearch(Name,1,Fields) of
+	{value,{_,Type}} when record(Type,type) ->
+	    emit([indent(3),"fun(Type, Bytes, _RestPrimFieldName) ->",
+		  nl,indent(6),"case Type of",nl]),
+	    N=emit_inner_of_decfun(Type,DecProp,InternalDefFunName),
+	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
+	{value,{_,Type}} when record(Type,typedef) ->
+	    emit([indent(3),"fun(Type, Bytes, _RestPrimFieldName) ->",
+		  nl,indent(6),"case Type of",nl]),
+	    emit([indent(9),{asis,Name}," ->",nl]),
+	    N=emit_inner_of_decfun(Type,DecProp,InternalDefFunName),
+	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
+	false ->
+	    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj)
+    end;
+gen_inlined_dec_funs(Fields,[_H|Rest],ObjSetName,NthObj) ->
+    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj);
+gen_inlined_dec_funs(_,[],_,NthObj) ->
+    NthObj.
+
+gen_inlined_dec_funs1(Fields,[{typefield,Name,Prop}|Rest],
+		      ObjSetName,NthObj) ->
+    DecProp = case Prop of
+		  'OPTIONAL' -> opt_or_default;
+		  {'DEFAULT',_} -> opt_or_default;
+		  _ -> mandatory
+	      end,
+    InternalDefFunName = [NthObj,Name,ObjSetName],
+    N=
+	case lists:keysearch(Name,1,Fields) of
+	    {value,{_,Type}} when record(Type,type) ->
+		emit([";",nl]),
+		emit_inner_of_decfun(Type,DecProp,InternalDefFunName);
+	    {value,{_,Type}} when record(Type,typedef) ->
+		emit([";",nl,indent(9),{asis,Name}," ->",nl]),
+		emit_inner_of_decfun(Type,DecProp,InternalDefFunName);
+	    false ->
+		0
+    end,
+    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
+gen_inlined_dec_funs1(Fields,[_|Rest],ObjSetName,NthObj)->
+    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
+gen_inlined_dec_funs1(_,[],_,NthObj) ->
+    emit([nl,indent(6),"end",nl]),
+    emit([indent(3),"end"]),
+    NthObj.
+
+emit_inner_of_decfun(#typedef{name={ExtName,Name},typespec=Type},Prop,
+		     InternalDefFunName) ->
+    OTag = Type#type.tag,
+%%    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    Tag = [(decode_class(X#tag.class) bsl 10) + X#tag.number || X <- OTag],
+    case {ExtName,Name} of
+	{primitive,bif} ->
+	    emit(indent(12)),
+	    gen_dec_prim(ber,Type,"Bytes",Tag,"TagIn",
+			 ?PRIMITIVE,Prop),
+	    0;
+	{constructed,bif} ->
+	    emit([indent(12),"'dec_",
+% 		  asn1ct_gen:list2name(InternalDefFunName),"'(Bytes, ",Prop,
+% 		  ", ",{asis,Tag},")"]),
+		  asn1ct_gen:list2name(InternalDefFunName),"'(Bytes, ",
+		  {asis,Tag},")"]),
+	    1;
+	_ ->
+	    emit([indent(12),"'",ExtName,"':'dec_",Name,"'(Bytes)"]),
+	    0
+    end;
+emit_inner_of_decfun(#typedef{name=Name},_Prop,_) ->
+    emit([indent(12),"'dec_",Name,"'(Bytes)"]),
+    0;
+emit_inner_of_decfun(Type,Prop,_) when record(Type,type) ->
+    OTag = Type#type.tag,
+%%    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
+    Tag = [(decode_class(X#tag.class) bsl 10) + X#tag.number || X <- OTag],
+    CurrMod = get(currmod),
+    Def = Type#type.def,
+    InnerType = asn1ct_gen:get_inner(Def),
+    WhatKind = asn1ct_gen:type(InnerType),
+    case WhatKind of
+	{primitive,bif} ->
+	    emit([indent(9),Def," ->",nl,indent(12)]),
+	    gen_dec_prim(ber,Type,"Bytes",Tag,"TagIn",
+			 ?PRIMITIVE,Prop);
+	#'Externaltypereference'{module=CurrMod,type=T} ->
+	    emit([indent(9),T," ->",nl,indent(12),"'dec_",T,
+%		  "'(Bytes, ",Prop,")"]);
+		  "'(Bytes)"]);
+	#'Externaltypereference'{module=ExtMod,type=T} ->
+	    emit([indent(9),T," ->",nl,indent(12),ExtMod,":'dec_",
+%		  T,"'(Bytes, ",Prop,")"])
+		  T,"'(Bytes)"])
+    end,
+    0.
+
+gen_internal_funcs(_,[]) ->
+    ok;
+gen_internal_funcs(Erules,[TypeDef|Rest]) ->
+    gen_encode_user(Erules,TypeDef),
+    emit([nl,nl,"'dec_",TypeDef#typedef.name,
+%	  "'(Tlv, OptOrMand, TagIn) ->",nl]),
+	  "'(Tlv, TagIn) ->",nl]),
+    gen_decode_user(Erules,TypeDef),
+    gen_internal_funcs(Erules,Rest).
+
+
+dbdec(Type) ->
+    demit({"io:format(\"decoding: ",{asis,Type},"~w~n\",[Bytes]),",nl}).
+
+
+decode_class('UNIVERSAL') ->
+    ?UNIVERSAL;
+decode_class('APPLICATION') ->
+    ?APPLICATION;
+decode_class('CONTEXT') ->
+    ?CONTEXT;
+decode_class('PRIVATE') ->
+    ?PRIVATE.
+
+decode_type('BOOLEAN') -> 1;
+decode_type('INTEGER') -> 2;
+decode_type('BIT STRING') -> 3;
+decode_type('OCTET STRING') -> 4;
+decode_type('NULL') -> 5;
+decode_type('OBJECT IDENTIFIER') -> 6;
+decode_type('OBJECT DESCRIPTOR') -> 7;
+decode_type('EXTERNAL') -> 8;
+decode_type('REAL') -> 9;
+decode_type('ENUMERATED') -> 10;
+decode_type('EMBEDDED_PDV') -> 11;
+decode_type('SEQUENCE') -> 16;
+decode_type('SEQUENCE OF') -> 16;
+decode_type('SET') -> 17;
+decode_type('SET OF') -> 17;
+decode_type('NumericString') -> 18;
+decode_type('PrintableString') -> 19;
+decode_type('TeletexString') -> 20;
+decode_type('VideotexString') -> 21;
+decode_type('IA5String') -> 22;
+decode_type('UTCTime') -> 23;
+decode_type('GeneralizedTime') -> 24;
+decode_type('GraphicString') -> 25;
+decode_type('VisibleString') -> 26;
+decode_type('GeneralString') -> 27;
+decode_type('UniversalString') -> 28;
+decode_type('BMPString') -> 30;
+decode_type('CHOICE') -> 'CHOICE'; % choice gets the tag from the actual alternative
+decode_type(Else) -> exit({error,{asn1,{unrecognized_type,Else}}}).
+
+add_removed_bytes() ->
+    asn1ct_name:delete(rb),
+    add_removed_bytes(asn1ct_name:all(rb)).
+
+add_removed_bytes([H,T1|T]) ->
+    emit({{var,H},"+"}),
+    add_removed_bytes([T1|T]);
+add_removed_bytes([H|T]) ->
+    emit({{var,H}}),
+    add_removed_bytes(T);
+add_removed_bytes([]) ->
+    true.
+
+mkfuncname(WhatKind,DecOrEnc) ->
+    case WhatKind of
+	#'Externaltypereference'{module=Mod,type=EType} ->
+	    CurrMod = get(currmod),
+	    case CurrMod of
+		Mod ->
+		    lists:concat(["'",DecOrEnc,"_",EType,"'"]);
+		_ ->
+% 		    io:format("CurrMod: ~p, Mod: ~p~n",[CurrMod,Mod]),
+		    lists:concat(["'",Mod,"':'",DecOrEnc,"_",EType,"'"])
+	    end;
+	#'typereference'{val=EType} ->
+	    lists:concat(["'",DecOrEnc,"_",EType,"'"]);
+	'ASN1_OPEN_TYPE' ->
+	    lists:concat(["'",DecOrEnc,"_",WhatKind,"'"])
+
+    end.
+
+optionals(L) -> optionals(L,[],1).
+
+optionals([{'EXTENSIONMARK',_,_}|Rest],Acc,Pos) ->
+    optionals(Rest,Acc,Pos); % optionals in extension are currently not handled
+optionals([#'ComponentType'{name=Name,prop='OPTIONAL'}|Rest],Acc,Pos) ->
+		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
+optionals([#'ComponentType'{name=Name,prop={'DEFAULT',_}}|Rest],Acc,Pos) ->
+		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
+optionals([#'ComponentType'{}|Rest],Acc,Pos) ->
+		 optionals(Rest,Acc,Pos+1);
+optionals([],Acc,_) ->
+    lists:reverse(Acc).
+
+get_constraint(C,Key) ->
+    case lists:keysearch(Key,1,C) of
+	false ->
+	     no;
+	{value,{_,V}} ->
+	    V
+    end.
+
+
+get_class_fields(#classdef{typespec=ObjClass}) ->
+    ObjClass#objectclass.fields;
+get_class_fields(#objectclass{fields=Fields}) ->
+    Fields;
+get_class_fields(_) ->
+    [].
+
+get_object_field(Name,ObjectFields) ->
+    case lists:keysearch(Name,1,ObjectFields) of
+	{value,Field} -> Field;
+	false -> false
+    end.
+
+%%encode_tag(TagClass(?UNI, APP etc), Form (?PRIM etx), TagInteger) ->
+%%     8bit Int | binary
+encode_tag_val(Class, Form, TagNo) when (TagNo =< 30) ->
+    <<(Class bsr 6):2,(Form bsr 5):1,TagNo:5>>;
+
+encode_tag_val(Class, Form, TagNo) ->
+    {Octets,_Len} = mk_object_val(TagNo),
+    BinOct = list_to_binary(Octets),
+    <<(Class bsr 6):2, (Form bsr 5):1, 31:5,BinOct/binary>>.
+
+%%%%%%%%%%%
+%% mk_object_val(Value) -> {OctetList, Len}
+%% returns a Val as a list of octets, the 8 bit is allways set to one except
+%% for the last octet, where its 0
+%%
+
+
+mk_object_val(Val) when Val =< 127 ->
+    {[255 band Val], 1};
+mk_object_val(Val) ->
+    mk_object_val(Val bsr 7, [Val band 127], 1).
+mk_object_val(0, Ack, Len) ->
+    {Ack, Len};
+mk_object_val(Val, Ack, Len) ->
+    mk_object_val(Val bsr 7, [((Val band 127) bor 128) | Ack], Len + 1).
+
+add_func(F={_Func,_Arity}) ->
+    ets:insert(asn1_functab,{F}).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_per.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_per.erl
new file mode 100644
index 0000000000..b5c70fd856
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_per.erl
@@ -0,0 +1,1189 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_gen_per.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+-module(asn1ct_gen_per).
+
+%% Generate erlang module which handles (PER) encode and decode for
+%% all types in an ASN.1 module
+
+-include("asn1_records.hrl").
+%-compile(export_all).
+
+-export([pgen/4,gen_dec_prim/3,gen_encode_prim/4]).
+-export([gen_obj_code/3,gen_objectset_code/2]).
+-export([gen_decode/2, gen_decode/3]).
+-export([gen_encode/2, gen_encode/3]).
+-export([is_already_generated/2,more_genfields/1,get_class_fields/1,
+	 get_object_field/2]).
+
+-import(asn1ct_gen, [emit/1,demit/1]).
+
+%% pgen(Erules, Module, TypeOrVal)
+%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
+%% .hrl file is only generated if necessary
+%% Erules = per | ber
+%% Module = atom()
+%% TypeOrVal = {TypeList,ValueList}
+%% TypeList = ValueList = [atom()]
+
+pgen(OutFile,Erules,Module,TypeOrVal) ->
+    asn1ct_gen:pgen_module(OutFile,Erules,Module,TypeOrVal,true).
+
+
+%% Generate ENCODING ******************************
+%%****************************************x
+
+
+gen_encode(Erules,Type) when record(Type,typedef) ->
+    gen_encode_user(Erules,Type).
+%%    case Type#typedef.typespec of
+%%	Def when record(Def,type) ->
+%%	    gen_encode_user(Erules,Type);
+%%	Def when tuple(Def),(element(1,Def) == 'Object') ->
+%%	    gen_encode_object(Erules,Type);
+%%	Other ->
+%%	    exit({error,{asn1,{unknown,Other}}})
+%%    end.
+
+gen_encode(Erules,Typename,#'ComponentType'{name=Cname,typespec=Type}) ->
+    NewTypename = [Cname|Typename],
+    gen_encode(Erules,NewTypename,Type);
+
+gen_encode(Erules,Typename,Type) when record(Type,type) ->
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    ObjFun =
+	case lists:keysearch(objfun,1,Type#type.tablecinf) of
+	    {value,{_,_Name}} ->
+%%		lists:concat([", ObjFun",Name]);
+		", ObjFun";
+	    false ->
+		""
+	end,
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    case InnerType of
+		'SET' ->
+		    true;
+		'SEQUENCE' ->
+		    true;
+		_ ->
+		    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
+			  "'({'",asn1ct_gen:list2name(Typename),
+			  "',Val}",ObjFun,") ->",nl}),
+		    emit({"'enc_",asn1ct_gen:list2name(Typename),
+			  "'(Val",ObjFun,");",nl,nl})
+	    end,
+	    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val",ObjFun,
+		  ") ->",nl}),
+	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
+	_ ->
+	    true
+    end.
+
+
+gen_encode_user(Erules,D) when record(D,typedef) ->
+    CurrMod = get(currmod),
+    Typename = [D#typedef.name],
+    Def = D#typedef.typespec,
+    InnerType = asn1ct_gen:get_inner(Def#type.def),
+    case InnerType of
+	'SET' -> true;
+	'SEQUENCE' -> true;
+	_ ->
+	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),"'({'",asn1ct_gen:list2name(Typename),"',Val}) ->",nl}),
+	    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val);",nl,nl})
+    end,
+    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val) ->",nl}),
+    case asn1ct_gen:type(InnerType) of
+	{primitive,bif} ->
+	    gen_encode_prim(Erules,Def,"false"),
+	    emit({".",nl});
+	'ASN1_OPEN_TYPE' ->
+	    gen_encode_prim(Erules,Def#type{def='ASN1_OPEN_TYPE'},"false"),
+	    emit({".",nl});
+	{constructed,bif} ->
+	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,D);
+	#'Externaltypereference'{module=CurrMod,type=Etype} ->
+	    emit({"'enc_",Etype,"'(Val).",nl,nl});
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit({"'",Emod,"':'enc_",Etype,"'(Val).",nl,nl});
+	#typereference{val=Ename} ->
+	    emit({"'enc_",Ename,"'(Val).",nl,nl});
+	{notype,_} ->
+	    emit({"'enc_",InnerType,"'(Val).",nl,nl})
+    end.
+
+
+gen_encode_prim(Erules,D,DoTag) ->
+    Value = case asn1ct_name:active(val) of
+		true ->
+		    asn1ct_gen:mk_var(asn1ct_name:curr(val));
+		false ->
+		    "Val"
+	    end,
+    gen_encode_prim(Erules,D,DoTag,Value).
+
+gen_encode_prim(_Erules,D,_DoTag,Value) when record(D,type) ->
+    Constraint = D#type.constraint,
+    case D#type.def of
+	'INTEGER' ->
+	    emit({"?RT_PER:encode_integer(", %fel
+		  {asis,Constraint},",",Value,")"});
+	{'INTEGER',NamedNumberList} ->
+	    emit({"?RT_PER:encode_integer(",
+		  {asis,Constraint},",",Value,",",
+		  {asis,NamedNumberList},")"});
+	{'ENUMERATED',{Nlist1,Nlist2}} ->
+	    NewList = lists:concat([[{0,X}||{X,_} <- Nlist1],['EXT_MARK'],[{1,X}||{X,_} <- Nlist2]]),
+	    NewC = [{'ValueRange',{0,length(Nlist1)-1}}],
+	    emit(["case (case ",Value," of {_,_}->element(2,",Value,");_->",
+		  Value," end) of",nl]),
+	    emit_enc_enumerated_cases(NewC, NewList++[{asn1_enum,length(Nlist1)-1}], 0);
+	{'ENUMERATED',NamedNumberList} ->
+	    NewList = [X||{X,_} <- NamedNumberList],
+	    NewC = [{'ValueRange',{0,length(NewList)-1}}],
+	    emit(["case (case ",Value," of {_,_}->element(2,",Value,");_->",
+		  Value," end) of",nl]),
+	    emit_enc_enumerated_cases(NewC, NewList, 0);
+	{'BIT STRING',NamedNumberList} ->
+	    emit({"?RT_PER:encode_bit_string(",
+		  {asis,Constraint},",",Value,",",
+		  {asis,NamedNumberList},")"});
+	'NULL' ->
+	    emit({"?RT_PER:encode_null(",Value,")"});
+	'OBJECT IDENTIFIER' ->
+	    emit({"?RT_PER:encode_object_identifier(",Value,")"});
+	'ObjectDescriptor' ->
+	    emit({"?RT_PER:encode_ObjectDescriptor(",{asis,Constraint},
+		  ",",Value,")"});
+	'BOOLEAN' ->
+	    emit({"?RT_PER:encode_boolean(",Value,")"});
+	'OCTET STRING' ->
+	    emit({"?RT_PER:encode_octet_string(",{asis,Constraint},",",Value,")"});
+	'NumericString' ->
+	    emit({"?RT_PER:encode_NumericString(",{asis,Constraint},",",Value,")"});
+	'TeletexString' ->
+	    emit({"?RT_PER:encode_TeletexString(",{asis,Constraint},",",Value,")"});
+	'VideotexString' ->
+	    emit({"?RT_PER:encode_VideotexString(",{asis,Constraint},",",Value,")"});
+	'UTCTime' ->
+	    emit({"?RT_PER:encode_VisibleString(",{asis,Constraint},",",Value,")"});
+	'GeneralizedTime' ->
+	    emit({"?RT_PER:encode_VisibleString(",{asis,Constraint},",",Value,")"});
+	'GraphicString' ->
+	    emit({"?RT_PER:encode_GraphicString(",{asis,Constraint},",",Value,")"});
+	'VisibleString' ->
+	    emit({"?RT_PER:encode_VisibleString(",{asis,Constraint},",",Value,")"});
+	'GeneralString' ->
+	    emit({"?RT_PER:encode_GeneralString(",{asis,Constraint},",",Value,")"});
+	'PrintableString' ->
+	    emit({"?RT_PER:encode_PrintableString(",{asis,Constraint},",",Value,")"});
+	'IA5String' ->
+	    emit({"?RT_PER:encode_IA5String(",{asis,Constraint},",",Value,")"});
+	'BMPString' ->
+	    emit({"?RT_PER:encode_BMPString(",{asis,Constraint},",",Value,")"});
+	'UniversalString' ->
+	    emit({"?RT_PER:encode_UniversalString(",{asis,Constraint},",",Value,")"});
+	'ANY' ->
+	    emit(["?RT_PER:encode_open_type(", {asis,Constraint}, ",",
+		  Value, ")"]);
+	'ASN1_OPEN_TYPE' ->
+	    NewValue = case Constraint of
+			   [#'Externaltypereference'{type=Tname}] ->
+			     io_lib:format(
+			       "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
+			   [#type{def=#'Externaltypereference'{type=Tname}}] ->
+			       io_lib:format(
+				 "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
+			 _ -> Value
+		     end,
+	    emit(["?RT_PER:encode_open_type(", {asis,Constraint}, ",",
+		  NewValue, ")"]);
+	XX ->
+	    exit({asn1_error,nyi,XX})
+    end.
+
+emit_enc_enumerated_cases(C, [H], Count) ->
+    emit_enc_enumerated_case(C, H, Count),
+    emit([";",nl,"EnumVal -> exit({error,{asn1, {enumerated_not_in_range, EnumVal}}})"]),
+    emit([nl,"end"]);
+emit_enc_enumerated_cases(C, ['EXT_MARK'|T], _Count) ->
+    emit_enc_enumerated_cases(C, T, 0);
+emit_enc_enumerated_cases(C, [H1,H2|T], Count) ->
+    emit_enc_enumerated_case(C, H1, Count),
+    emit([";",nl]),
+    emit_enc_enumerated_cases(C, [H2|T], Count+1).
+
+
+
+emit_enc_enumerated_case(_C, {asn1_enum,High}, _) ->
+    emit([
+	  "{asn1_enum,EnumV} when integer(EnumV), EnumV > ",High," -> ",
+	  "[{bit,1},?RT_PER:encode_small_number(EnumV)]"]);
+emit_enc_enumerated_case(_C, 'EXT_MARK', _Count) ->
+    true;
+emit_enc_enumerated_case(_C, {1,EnumName}, Count) ->
+    emit(["'",EnumName,"' -> [{bit,1},?RT_PER:encode_small_number(",Count,")]"]);
+emit_enc_enumerated_case(C, {0,EnumName}, Count) ->
+    emit(["'",EnumName,"' -> [{bit,0},?RT_PER:encode_integer(",{asis,C},", ",Count,")]"]);
+emit_enc_enumerated_case(C, EnumName, Count) ->
+    emit(["'",EnumName,"' -> ?RT_PER:encode_integer(",{asis,C},", ",Count,")"]).
+
+
+%% Object code generating for encoding and decoding
+%% ------------------------------------------------
+
+gen_obj_code(Erules,_Module,Obj) when record(Obj,typedef) ->
+    ObjName = Obj#typedef.name,
+    Def = Obj#typedef.typespec,
+    #'Externaltypereference'{module=Mod,type=ClassName} =
+	Def#'Object'.classname,
+    Class = asn1_db:dbget(Mod,ClassName),
+    {object,_,Fields} = Def#'Object'.def,
+    emit({nl,nl,nl,"%%================================"}),
+    emit({nl,"%%  ",ObjName}),
+    emit({nl,"%%================================",nl}),
+    EncConstructed =
+	gen_encode_objectfields(ClassName,get_class_fields(Class),
+				ObjName,Fields,[]),
+    emit(nl),
+    gen_encode_constr_type(Erules,EncConstructed),
+    emit(nl),
+    DecConstructed =
+	gen_decode_objectfields(ClassName,get_class_fields(Class),
+				ObjName,Fields,[]),
+    emit(nl),
+    gen_decode_constr_type(Erules,DecConstructed),
+    emit(nl);
+gen_obj_code(_,_,Obj) when record(Obj,pobjectdef) ->
+    ok.
+
+
+gen_encode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(V) ->
+		emit(["'enc_",ObjName,"'(",{asis,Name},
+		      ",",V,",_RestPrimFieldName) ->",nl])
+	end,
+%     emit(["'enc_",ObjName,"'(",{asis,Name},
+% 	  ", Val, _RestPrimFieldName) ->",nl]),
+    MaybeConstr =
+	case {get_object_field(Name,ObjectFields),OptOrMand} of
+	    {false,'MANDATORY'} -> %% this case is illegal
+		exit({error,{asn1,{"missing mandatory field in object",
+				   ObjName}}});
+	    {false,'OPTIONAL'} ->
+		EmitFuncClause("_"),
+		emit("   []"),
+		[];
+	    {false,{'DEFAULT',DefaultType}} ->
+		EmitFuncClause("Val"),
+		gen_encode_default_call(ClassName,Name,DefaultType);
+	    {{Name,TypeSpec},_} ->
+		%% A specified field owerwrites any 'DEFAULT' or
+		%% 'OPTIONAL' field in the class
+		EmitFuncClause("Val"),
+		gen_encode_field_call(ObjName,Name,TypeSpec)
+	end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,
+			    MaybeConstr++ConstrAcc);
+gen_encode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Attrs) ->
+		emit(["'enc_",ObjName,"'(",{asis,Name},
+		      ",",Attrs,") ->",nl])
+	end,
+%     emit(["'enc_",ObjName,"'(",{asis,Name},
+% 	  ", Val,[H|T]) ->",nl]),
+    case {get_object_field(Name,ObjectFields),OptOrMand} of
+	{false,'MANDATORY'} ->
+	    exit({error,{asn1,{"missing mandatory field in object",
+			       ObjName}}});
+	{false,'OPTIONAL'} ->
+	    EmitFuncClause("_,_"),
+	    emit(["  exit({error,{'use of missing field in object', ",Name,
+		  "}})"]);
+	{false,{'DEFAULT',_DefaultObject}} ->
+	    exit({error,{asn1,{"not implemented yet",Name}}});
+	{{Name,TypeSpec},_} ->
+	    EmitFuncClause("Val,[H|T]"),
+	    case TypeSpec#typedef.name of
+		{ExtMod,TypeName} ->
+		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
+			  "'(H, Val, T)"});
+		TypeName ->
+		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
+	    end
+    end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
+gen_encode_objectfields(ClassName,[_C|Cs],O,OF,Acc) ->
+    gen_encode_objectfields(ClassName,Cs,O,OF,Acc);
+gen_encode_objectfields(_,[],_,_,Acc) ->
+    Acc.
+
+
+% gen_encode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
+%     Fields = Class#objectclass.fields,
+
+%     MaybeConstr =
+%     case is_typefield(Fields,FieldName) of
+% 	true ->
+% 	    Def = Type#typedef.typespec,
+% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
+% 		  ", Val, Dummy) ->",nl}),
+
+% 	    CAcc =
+% 	    case Type#typedef.name of
+% 		{primitive,bif} ->
+% 		    gen_encode_prim(per,Def,"false","Val"),
+% 		    [];
+% 		{constructed,bif} ->
+% 		    emit({"   'enc_",ObjName,'_',FieldName,
+% 			  "'(Val)"}),
+% 			[{['enc_',ObjName,'_',FieldName],Def}];
+% 		{ExtMod,TypeName} ->
+% 		    emit({"   '",ExtMod,"':'enc_",TypeName,"'(Val)"}),
+% 		    [];
+% 		TypeName ->
+% 		    emit({"   'enc_",TypeName,"'(Val)"}),
+% 		    []
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    CAcc;
+% 	{false,objectfield} ->
+% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
+% 		  ", Val, [H|T]) ->",nl}),
+% 	    case Type#typedef.name of
+% 		{ExtMod,TypeName} ->
+% 		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
+% 			  "'(H, Val, T)"});
+% 		TypeName ->
+% 		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    [];
+% 	{false,_} -> []
+%     end,
+%     gen_encode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
+% gen_encode_objectfields(C,O,[H|T],Acc) ->
+%     gen_encode_objectfields(C,O,T,Acc);
+% gen_encode_objectfields(_,_,[],Acc) ->
+%     Acc.
+
+% gen_encode_constr_type(Erules,[{Name,Def}|Rest]) ->
+%     emit({Name,"(Val) ->",nl}),
+%     InnerType = asn1ct_gen:get_inner(Def#type.def),
+%     asn1ct_gen:gen_encode_constructed(Erules,Name,InnerType,Def),
+%     gen_encode_constr_type(Erules,Rest);
+gen_encode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
+    case is_already_generated(enc,TypeDef#typedef.name) of
+	true -> ok;
+	_ ->
+	    Name = lists:concat(["enc_",TypeDef#typedef.name]),
+	    emit({Name,"(Val) ->",nl}),
+	    Def = TypeDef#typedef.typespec,
+	    InnerType = asn1ct_gen:get_inner(Def#type.def),
+	    asn1ct_gen:gen_encode_constructed(Erules,Name,InnerType,Def),
+	    gen_encode_constr_type(Erules,Rest)
+    end;
+gen_encode_constr_type(_,[]) ->
+    ok.
+
+gen_encode_field_call(ObjName,FieldName,Type) ->
+    Def = Type#typedef.typespec,
+    case Type#typedef.name of
+	{primitive,bif} ->
+	    gen_encode_prim(per,Def,"false",
+			    "Val"),
+	    [];
+	{constructed,bif} ->
+	    emit({"   'enc_",ObjName,'_',FieldName,
+		  "'(Val)"}),
+	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
+	{ExtMod,TypeName} ->
+	    emit({"   '",ExtMod,"':'enc_",TypeName,
+		  "'(Val)"}),
+	    [];
+	TypeName ->
+	    emit({"   'enc_",TypeName,"'(Val)"}),
+	    []
+    end.
+
+gen_encode_default_call(ClassName,FieldName,Type) ->
+    CurrentMod = get(currmod),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+%%	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
+	    emit(["   'enc_",ClassName,'_',FieldName,"'(Val)"]),
+	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
+		      typespec=Type}];
+	{primitive,bif} ->
+	    gen_encode_prim(per,Type,"false","Val"),
+	    [];
+	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
+	    emit(["   'enc_",Etype,"'(Val)",nl]),
+	    [];
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit(["   '",Emod,"':'enc_",Etype,"'(Val)",nl]),
+	    []
+    end.
+
+
+gen_decode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Bytes) ->
+		emit(["'dec_",ObjName,"'(",{asis,Name},",",Bytes,
+		      ",_,_RestPrimFieldName) ->",nl])
+	end,
+    MaybeConstr=
+	case {get_object_field(Name,ObjectFields),OptOrMand} of
+	    {false,'MANDATORY'} -> %% this case is illegal
+		exit({error,{asn1,{"missing mandatory field in object",
+				   ObjName}}});
+	    {false,'OPTIONAL'} ->
+		EmitFuncClause("_"),
+		emit(["   asn1_NOVALUE"]),
+		[];
+	    {false,{'DEFAULT',DefaultType}} ->
+		EmitFuncClause("Bytes"),
+		gen_decode_default_call(ClassName,Name,"Bytes",DefaultType);
+	    {{Name,TypeSpec},_} ->
+		%% A specified field owerwrites any 'DEFAULT' or
+		%% 'OPTIONAL' field in the class
+		EmitFuncClause("Bytes"),
+		gen_decode_field_call(ObjName,Name,"Bytes",TypeSpec)
+	end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,MaybeConstr++ConstrAcc);
+gen_decode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Attrs) ->
+		emit(["'dec_",ObjName,"'(",{asis,Name},
+		      ",",Attrs,") ->",nl])
+	end,
+%     emit(["'dec_",ObjName,"'(",{asis,Name},
+% 	  ", Bytes,_,[H|T]) ->",nl]),
+    case {get_object_field(Name,ObjectFields),OptOrMand} of
+	{false,'MANDATORY'} ->
+	    exit({error,{asn1,{"missing mandatory field in object",
+			       ObjName}}});
+	{false,'OPTIONAL'} ->
+	    EmitFuncClause("_,_,_"),
+	    emit(["  exit({error,{'illegal use of missing field in object', ",Name,
+		  "}})"]);
+	{false,{'DEFAULT',_DefaultObject}} ->
+	    exit({error,{asn1,{"not implemented yet",Name}}});
+	{{Name,TypeSpec},_} ->
+	    EmitFuncClause("Bytes,_,[H|T]"),
+	    case TypeSpec#typedef.name of
+		{ExtMod,TypeName} ->
+		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
+			  "'(H, Bytes, telltype, T)"});
+		TypeName ->
+		    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, telltype, T)"})
+	    end
+    end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
+gen_decode_objectfields(CN,[_C|Cs],O,OF,CAcc) ->
+    gen_decode_objectfields(CN,Cs,O,OF,CAcc);
+gen_decode_objectfields(_,[],_,_,CAcc) ->
+    CAcc.
+
+
+% gen_decode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
+%     Fields = Class#objectclass.fields,
+
+%     MaybeConstr =
+%     case is_typefield(Fields,FieldName) of
+% 	true ->
+% 	    Def = Type#typedef.typespec,
+% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
+% 		  ", Val, Telltype, RestPrimFieldName) ->",nl}),
+
+% 	    CAcc =
+% 	    case Type#typedef.name of
+% 		{primitive,bif} ->
+% 		    gen_dec_prim(per,Def,"Val"),
+% 		    [];
+% 		{constructed,bif} ->
+% 		    emit({"   'dec_",ObjName,'_',FieldName,
+% 			  "'(Val, Telltype)"}),
+% 		    [{['dec_',ObjName,'_',FieldName],Def}];
+% 		{ExtMod,TypeName} ->
+% 		    emit({"   '",ExtMod,"':'dec_",TypeName,
+% 			  "'(Val, Telltype)"}),
+% 		    [];
+% 		TypeName ->
+% 		    emit({"   'dec_",TypeName,"'(Val, Telltype)"}),
+% 		    []
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    CAcc;
+% 	{false,objectfield} ->
+% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
+% 		  ", Val, Telltype, [H|T]) ->",nl}),
+% 	    case Type#typedef.name of
+% 		{ExtMod,TypeName} ->
+% 		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
+% 			  "'(H, Val, Telltype, T)"});
+% 		TypeName ->
+% 		    emit({indent(3),"'dec_",TypeName,
+% 			  "'(H, Val, Telltype, T)"})
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    [];
+% 	{false,_} ->
+% 	    []
+%     end,
+%     gen_decode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
+% gen_decode_objectfields(C,O,[H|T],CAcc) ->
+%     gen_decode_objectfields(C,O,T,CAcc);
+% gen_decode_objectfields(_,_,[],CAcc) ->
+%     CAcc.
+
+
+gen_decode_field_call(ObjName,FieldName,Bytes,Type) ->
+    Def = Type#typedef.typespec,
+    case Type#typedef.name of
+	{primitive,bif} ->
+	    gen_dec_prim(per,Def,Bytes),
+	    [];
+	{constructed,bif} ->
+	    emit({"   'dec_",ObjName,'_',FieldName,
+		  "'(",Bytes,",telltype)"}),
+	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
+	{ExtMod,TypeName} ->
+	    emit({"   '",ExtMod,"':'dec_",TypeName,
+		  "'(",Bytes,", telltype)"}),
+	    [];
+	TypeName ->
+	    emit({"   'dec_",TypeName,"'(",Bytes,", telltype)"}),
+	    []
+    end.
+
+gen_decode_default_call(ClassName,FieldName,Bytes,Type) ->
+    CurrentMod = get(currmod),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    emit(["   'dec_",ClassName,'_',FieldName,"'(",Bytes,", telltype)"]),
+	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
+		      typespec=Type}];
+	{primitive,bif} ->
+	    gen_dec_prim(per,Type,Bytes),
+	    [];
+	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
+	    emit(["   'dec_",Etype,"'(",Bytes,", telltype)",nl]),
+	    [];
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit(["   '",Emod,"':'dec_",Etype,"'(",Bytes,", telltype)",nl]),
+	    []
+    end.
+
+
+gen_decode_constr_type(Erules,[{Name,Def}|Rest]) ->
+    emit({Name,"(Bytes,_) ->",nl}),
+    InnerType = asn1ct_gen:get_inner(Def#type.def),
+    asn1ct_gen:gen_decode_constructed(Erules,Name,InnerType,Def),
+    gen_decode_constr_type(Erules,Rest);
+gen_decode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
+    case is_already_generated(dec,TypeDef#typedef.name) of
+	true -> ok;
+	_ ->
+	    gen_decode(Erules,TypeDef)
+    end,
+    gen_decode_constr_type(Erules,Rest);
+gen_decode_constr_type(_,[]) ->
+    ok.
+
+% more_genfields(Fields,[]) ->
+%     false;
+% more_genfields(Fields,[{FieldName,_}|T]) ->
+%     case is_typefield(Fields,FieldName) of
+% 	true -> true;
+% 	{false,objectfield} -> true;
+% 	{false,_} -> more_genfields(Fields,T)
+%     end.
+
+more_genfields([]) ->
+    false;
+more_genfields([Field|Fields]) ->
+    case element(1,Field) of
+	typefield ->
+	    true;
+	objectfield ->
+	    true;
+	_ ->
+	    more_genfields(Fields)
+    end.
+
+% is_typefield(Fields,FieldName) ->
+%     case lists:keysearch(FieldName,2,Fields) of
+% 	{value,Field} ->
+% 	    case element(1,Field) of
+% 		typefield ->
+% 		    true;
+% 		Other ->
+% 		    {false,Other}
+% 	    end;
+% 	_ ->
+% 	    false
+%     end.
+%% Object Set code generating for encoding and decoding
+%% ----------------------------------------------------
+gen_objectset_code(Erules,ObjSet) ->
+    ObjSetName = ObjSet#typedef.name,
+    Def = ObjSet#typedef.typespec,
+%%    {ClassName,ClassDef} = Def#'ObjectSet'.class,
+    #'Externaltypereference'{module=ClassModule,
+			     type=ClassName} = Def#'ObjectSet'.class,
+    ClassDef = asn1_db:dbget(ClassModule,ClassName),
+    UniqueFName = Def#'ObjectSet'.uniquefname,
+    Set = Def#'ObjectSet'.set,
+    emit({nl,nl,nl,"%%================================"}),
+    emit({nl,"%%  ",ObjSetName}),
+    emit({nl,"%%================================",nl}),
+    case ClassName of
+	{_Module,ExtClassName} ->
+	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
+			    ExtClassName,ClassDef);
+	_ ->
+	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
+			    ClassName,ClassDef)
+    end,
+    emit(nl).
+
+gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassDef)->
+    ClassFields = (ClassDef#classdef.typespec)#objectclass.fields,
+    InternalFuncs=
+	gen_objset_enc(ObjSetName,UniqueFName,Set,ClassName,ClassFields,1,[]),
+    gen_objset_dec(ObjSetName,UniqueFName,Set,ClassName,ClassFields,1),
+    gen_internal_funcs(Erules,InternalFuncs).
+
+%% gen_objset_enc iterates over the objects of the object set
+gen_objset_enc(_,{unique,undefined},_,_,_,_,_) ->
+    %% There is no unique field in the class of this object set
+    %% don't bother about the constraint
+    [];
+gen_objset_enc(ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
+	       ClName,ClFields,NthObj,Acc)->
+    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
+	  ") ->",nl}),
+    {InternalFunc,NewNthObj}=
+	case ObjName of
+	    no_name ->
+		gen_inlined_enc_funs(Fields,ClFields,ObjSName,NthObj);
+	    _Other ->
+		emit({"    fun 'enc_",ObjName,"'/3"}),
+		{[],0}
+	end,
+    emit({";",nl}),
+    gen_objset_enc(ObjSName,UniqueName,[T|Rest],ClName,ClFields,
+		   NewNthObj,InternalFunc ++ Acc);
+gen_objset_enc(ObjSetName,UniqueName,
+	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
+
+    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",
+	  {asis,Val},") ->",nl}),
+    {InternalFunc,_}=
+	case ObjName of
+	    no_name ->
+		gen_inlined_enc_funs(Fields,ClFields,ObjSetName,NthObj);
+	    _Other ->
+		emit({"    fun 'enc_",ObjName,"'/3"}),
+		{[],NthObj}
+	end,
+    emit({".",nl,nl}),
+    InternalFunc++Acc;
+gen_objset_enc(ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
+	       _ClFields,_NthObj,Acc) ->
+    emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
+    emit({indent(3),"fun(_, Val, _) ->",nl}),
+    emit({indent(6),"[{octets,Val}]",nl}),
+    emit({indent(3),"end.",nl,nl}),
+    Acc;
+gen_objset_enc(_,_,[],_,_,_,Acc) ->
+    Acc.
+
+%% gen_inlined_enc_funs for each object iterates over all fields of a
+%% class, and for each typefield it checks if the object has that
+%% field and emits the proper code.
+gen_inlined_enc_funs(Fields,[{typefield,Name,_}|Rest],ObjSetName,NthObj) ->
+    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
+    case lists:keysearch(Name,1,Fields) of
+	{value,{_,Type}} when record(Type,type) ->
+	    emit({indent(3),"fun(Type, Val, _) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    {Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
+	{value,{_,Type}} when record(Type,typedef) ->
+	    emit({indent(3),"fun(Type, Val, _) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    emit({indent(9),{asis,Name}," ->",nl}),
+	    {Ret,N} = emit_inner_of_fun(Type,InternalDefFunName),
+	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
+	false ->
+	    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj)
+    end;
+gen_inlined_enc_funs(Fields,[_H|Rest],ObjSetName,NthObj) ->
+    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj);
+gen_inlined_enc_funs(_,[],_,NthObj) ->
+    {[],NthObj}.
+
+gen_inlined_enc_funs1(Fields,[{typefield,Name,_}|Rest],ObjSetName,
+		     NthObj,Acc) ->
+    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
+    {Acc2,NAdd}=
+	case lists:keysearch(Name,1,Fields) of
+	    {value,{_,Type}} when record(Type,type) ->
+		emit({";",nl}),
+		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+		{Ret++Acc,N};
+	    {value,{_,Type}} when record(Type,typedef) ->
+		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
+		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+		{Ret++Acc,N};
+	    false ->
+		{Acc,0}
+	end,
+    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+NAdd,Acc2);
+gen_inlined_enc_funs1(Fields,[_H|Rest],ObjSetName,NthObj,Acc)->
+    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj,Acc);
+gen_inlined_enc_funs1(_,[],_,NthObj,Acc) ->
+    emit({nl,indent(6),"end",nl}),
+    emit({indent(3),"end"}),
+    {Acc,NthObj}.
+
+emit_inner_of_fun(TDef=#typedef{name={ExtMod,Name},typespec=Type},
+		  InternalDefFunName) ->
+    case {ExtMod,Name} of
+	{primitive,bif} ->
+	    emit(indent(12)),
+	    gen_encode_prim(per,Type,dotag,"Val"),
+	    {[],0};
+	{constructed,bif} ->
+	    emit([indent(12),"'enc_",
+		  InternalDefFunName,"'(Val)"]),
+	    {[TDef#typedef{name=InternalDefFunName}],1};
+	_ ->
+	    emit({indent(12),"'",ExtMod,"':'enc_",Name,"'(Val)"}),
+	    {[],0}
+    end;
+emit_inner_of_fun(#typedef{name=Name},_) ->
+    emit({indent(12),"'enc_",Name,"'(Val)"}),
+    {[],0};
+emit_inner_of_fun(Type,_) when record(Type,type) ->
+    CurrMod = get(currmod),
+    case Type#type.def of
+	Def when atom(Def) ->
+	    emit({indent(9),Def," ->",nl,indent(12)}),
+	    gen_encode_prim(erules,Type,dotag,"Val");
+	TRef when record(TRef,typereference) ->
+	    T = TRef#typereference.val,
+	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,"'(Val)"});
+	#'Externaltypereference'{module=CurrMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,"'(Val)"});
+	#'Externaltypereference'{module=ExtMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'enc_",
+		  T,"'(Val)"})
+    end,
+    {[],0}.
+
+indent(N) ->
+    lists:duplicate(N,32). % 32 = space
+
+
+gen_objset_dec(_,{unique,undefined},_,_,_,_) ->
+    %% There is no unique field in the class of this object set
+    %% don't bother about the constraint
+    ok;
+gen_objset_dec(ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],ClName,
+	       ClFields,NthObj)->
+
+    emit({"'getdec_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
+	  ") ->",nl}),
+    NewNthObj=
+	case ObjName of
+	    no_name ->
+		gen_inlined_dec_funs(Fields,ClFields,ObjSName,NthObj);
+	    _Other ->
+		emit({"    fun 'dec_",ObjName,"'/4"}),
+		NthObj
+    end,
+    emit({";",nl}),
+    gen_objset_dec(ObjSName,UniqueName,[T|Rest],ClName,ClFields,NewNthObj);
+gen_objset_dec(ObjSetName,UniqueName,[{ObjName,Val,Fields}],_ClName,
+	       ClFields,NthObj) ->
+
+    emit({"'getdec_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},
+	  ") ->",nl}),
+    case ObjName of
+	no_name ->
+	    gen_inlined_dec_funs(Fields,ClFields,ObjSetName,NthObj);
+	_Other ->
+	    emit({"    fun 'dec_",ObjName,"'/4"})
+    end,
+    emit({".",nl,nl}),
+    ok;
+gen_objset_dec(ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,_ClFields,
+	      _NthObj) ->
+    emit({"'getdec_",ObjSetName,"'(_, _) ->",nl}),
+    emit({indent(3),"fun(Attr1, Bytes, _,_) ->",nl}),
+%%    emit({indent(6),"?RT_PER:decode_open_type(Bytes,[])",nl}),
+    emit({indent(6),"{Bytes,Attr1}",nl}),
+    emit({indent(3),"end.",nl,nl}),
+    ok;
+gen_objset_dec(_,_,[],_,_,_) ->
+    ok.
+
+gen_inlined_dec_funs(Fields,[{typefield,Name,_}|Rest],
+		    ObjSetName,NthObj) ->
+    InternalDefFunName = [NthObj,Name,ObjSetName],
+    case lists:keysearch(Name,1,Fields) of
+	{value,{_,Type}} when record(Type,type) ->
+	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    N=emit_inner_of_decfun(Type,InternalDefFunName),
+	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
+	{value,{_,Type}} when record(Type,typedef) ->
+	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    emit({indent(9),{asis,Name}," ->",nl}),
+	    N=emit_inner_of_decfun(Type,InternalDefFunName),
+	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
+	false ->
+	    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj)
+    end;
+gen_inlined_dec_funs(Fields,[_|Rest],ObjSetName,NthObj) ->
+    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj);
+gen_inlined_dec_funs(_,[],_,NthObj) ->
+    NthObj.
+
+gen_inlined_dec_funs1(Fields,[{typefield,Name,_}|Rest],
+		      ObjSetName,NthObj) ->
+    InternalDefFunName = [NthObj,Name,ObjSetName],
+    N=case lists:keysearch(Name,1,Fields) of
+	  {value,{_,Type}} when record(Type,type) ->
+	      emit({";",nl}),
+	      emit_inner_of_decfun(Type,InternalDefFunName);
+	  {value,{_,Type}} when record(Type,typedef) ->
+	      emit({";",nl,indent(9),{asis,Name}," ->",nl}),
+	      emit_inner_of_decfun(Type,InternalDefFunName);
+	  false ->
+	      0
+      end,
+    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
+gen_inlined_dec_funs1(Fields,[_|Rest],ObjSetName,NthObj)->
+    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
+gen_inlined_dec_funs1(_,[],_,NthObj) ->
+    emit({nl,indent(6),"end",nl}),
+    emit({indent(3),"end"}),
+    NthObj.
+
+emit_inner_of_decfun(#typedef{name={ExtName,Name},typespec=Type},
+		     InternalDefFunName) ->
+    case {ExtName,Name} of
+	{primitive,bif} ->
+	    emit(indent(12)),
+	    gen_dec_prim(per,Type,"Val"),
+	    0;
+	{constructed,bif} ->
+	    emit({indent(12),"'dec_",
+		  asn1ct_gen:list2name(InternalDefFunName),"'(Val)"}),
+	    1;
+	_ ->
+	    emit({indent(12),"'",ExtName,"':'dec_",Name,"'(Val, telltype)"}),
+	    0
+    end;
+emit_inner_of_decfun(#typedef{name=Name},_) ->
+    emit({indent(12),"'dec_",Name,"'(Val, telltype)"}),
+    0;
+emit_inner_of_decfun(Type,_) when record(Type,type) ->
+    CurrMod = get(currmod),
+    case Type#type.def of
+	Def when atom(Def) ->
+	    emit({indent(9),Def," ->",nl,indent(12)}),
+	    gen_dec_prim(erules,Type,"Val");
+	TRef when record(TRef,typereference) ->
+	    T = TRef#typereference.val,
+	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
+	#'Externaltypereference'{module=CurrMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
+	#'Externaltypereference'{module=ExtMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'dec_",
+		  T,"'(Val)"})
+    end,
+    0.
+
+
+gen_internal_funcs(_,[]) ->
+    ok;
+gen_internal_funcs(Erules,[TypeDef|Rest]) ->
+    gen_encode_user(Erules,TypeDef),
+    emit([nl,nl,"'dec_",TypeDef#typedef.name,"'(Bytes) ->",nl]),
+    gen_decode_user(Erules,TypeDef),
+    gen_internal_funcs(Erules,Rest).
+
+
+
+%% DECODING *****************************
+%%***************************************
+
+
+gen_decode(Erules,Type) when record(Type,typedef) ->
+    D = Type,
+    emit({nl,nl}),
+    emit({"'dec_",Type#typedef.name,"'(Bytes,_) ->",nl}),
+    dbdec(Type#typedef.name),
+    gen_decode_user(Erules,D).
+
+gen_decode(Erules,Tname,#'ComponentType'{name=Cname,typespec=Type}) ->
+    NewTname = [Cname|Tname],
+    gen_decode(Erules,NewTname,Type);
+
+gen_decode(Erules,Typename,Type) when record(Type,type) ->
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    ObjFun =
+		case Type#type.tablecinf of
+		    [{objfun,_}|_R] ->
+			", ObjFun";
+		    _ ->
+			""
+		end,
+	    emit({nl,"'dec_",asn1ct_gen:list2name(Typename),
+		  "'(Bytes,_",ObjFun,") ->",nl}),
+	    dbdec(Typename),
+	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
+	_ ->
+	    true
+    end.
+
+dbdec(Type) when list(Type)->
+    demit({"io:format(\"decoding: ",asn1ct_gen:list2name(Type),"~w~n\",[Bytes]),",nl});
+dbdec(Type) ->
+    demit({"io:format(\"decoding: ",{asis,Type},"~w~n\",[Bytes]),",nl}).
+
+gen_decode_user(Erules,D) when record(D,typedef) ->
+    CurrMod = get(currmod),
+    Typename = [D#typedef.name],
+    Def = D#typedef.typespec,
+    InnerType = asn1ct_gen:get_inner(Def#type.def),
+    case asn1ct_gen:type(InnerType) of
+	{primitive,bif} ->
+	    gen_dec_prim(Erules,Def,"Bytes"),
+	    emit({".",nl,nl});
+	'ASN1_OPEN_TYPE' ->
+	    gen_dec_prim(Erules,Def#type{def='ASN1_OPEN_TYPE'},"Bytes"),
+	    emit({".",nl,nl});
+	{constructed,bif} ->
+	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,D);
+	#typereference{val=Dname} ->
+	    emit({"'dec_",Dname,"'(Bytes,telltype)"}),
+	    emit({".",nl,nl});
+	#'Externaltypereference'{module=CurrMod,type=Etype} ->
+	    emit({"'dec_",Etype,"'(Bytes,telltype).",nl,nl});
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit({"'",Emod,"':'dec_",Etype,"'(Bytes,telltype).",nl,nl});
+	Other ->
+	    exit({error,{asn1,{unknown,Other}}})
+    end.
+
+
+gen_dec_prim(_Erules,Att,BytesVar) ->
+    Typename = Att#type.def,
+    Constraint = Att#type.constraint,
+    case Typename of
+	'INTEGER' ->
+	    emit({"?RT_PER:decode_integer(",BytesVar,",",
+		  {asis,Constraint},")"});
+	{'INTEGER',NamedNumberList} ->
+	    emit({"?RT_PER:decode_integer(",BytesVar,",",
+		  {asis,Constraint},",",
+		  {asis,NamedNumberList},")"});
+	{'BIT STRING',NamedNumberList} ->
+	    case get(compact_bit_string) of
+		true ->
+		    emit({"?RT_PER:decode_compact_bit_string(",
+			  BytesVar,",",{asis,Constraint},",",
+			  {asis,NamedNumberList},")"});
+		_ ->
+		    emit({"?RT_PER:decode_bit_string(",BytesVar,",",
+			  {asis,Constraint},",",
+			  {asis,NamedNumberList},")"})
+	    end;
+	'NULL' ->
+	    emit({"?RT_PER:decode_null(",
+		  BytesVar,")"});
+	'OBJECT IDENTIFIER' ->
+	    emit({"?RT_PER:decode_object_identifier(",
+		  BytesVar,")"});
+	'ObjectDescriptor' ->
+	    emit({"?RT_PER:decode_ObjectDescriptor(",
+		  BytesVar,")"});
+	{'ENUMERATED',{NamedNumberList1,NamedNumberList2}} ->
+	    NewTup = {list_to_tuple([X||{X,_} <- NamedNumberList1]),
+		      list_to_tuple([X||{X,_} <- NamedNumberList2])},
+	    NewC = [{'ValueRange',{0,size(element(1,NewTup))-1}}],
+	    emit({"?RT_PER:decode_enumerated(",BytesVar,",",
+		  {asis,NewC},",",
+		  {asis,NewTup},")"});
+	{'ENUMERATED',NamedNumberList} ->
+	    NewTup = list_to_tuple([X||{X,_} <- NamedNumberList]),
+	    NewC = [{'ValueRange',{0,size(NewTup)-1}}],
+	    emit({"?RT_PER:decode_enumerated(",BytesVar,",",
+		  {asis,NewC},",",
+		  {asis,NewTup},")"});
+	'BOOLEAN'->
+	    emit({"?RT_PER:decode_boolean(",BytesVar,")"});
+	'OCTET STRING' ->
+	    emit({"?RT_PER:decode_octet_string(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'NumericString' ->
+	    emit({"?RT_PER:decode_NumericString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'TeletexString' ->
+	    emit({"?RT_PER:decode_TeletexString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'VideotexString' ->
+	    emit({"?RT_PER:decode_VideotexString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'UTCTime' ->
+	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'GeneralizedTime' ->
+	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'GraphicString' ->
+	    emit({"?RT_PER:decode_GraphicString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'VisibleString' ->
+	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'GeneralString' ->
+	    emit({"?RT_PER:decode_GeneralString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'PrintableString' ->
+	    emit({"?RT_PER:decode_PrintableString(",BytesVar,",",{asis,Constraint},")"});
+	'IA5String' ->
+	    emit({"?RT_PER:decode_IA5String(",BytesVar,",",{asis,Constraint},")"});
+	'BMPString' ->
+	    emit({"?RT_PER:decode_BMPString(",BytesVar,",",{asis,Constraint},")"});
+	'UniversalString' ->
+	    emit({"?RT_PER:decode_UniversalString(",BytesVar,",",{asis,Constraint},")"});
+	'ANY' ->
+	    emit(["?RT_PER:decode_open_type(",BytesVar,",",
+		  {asis,Constraint}, ")"]);
+	'ASN1_OPEN_TYPE' ->
+	    case Constraint of
+		[#'Externaltypereference'{type=Tname}] ->
+		    emit(["fun(FBytes) ->",nl,
+			  "   {XTerm,XBytes} = "]),
+		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
+		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
+		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
+		[#type{def=#'Externaltypereference'{type=Tname}}] ->
+		    emit(["fun(FBytes) ->",nl,
+			  "   {XTerm,XBytes} = "]),
+		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
+		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
+		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
+		_ ->
+		    emit(["?RT_PER:decode_open_type(",BytesVar,",[])"])
+	    end;
+	Other ->
+	    exit({'cant decode' ,Other})
+    end.
+
+
+is_already_generated(Operation,Name) ->
+    case get(class_default_type) of
+	undefined ->
+	    put(class_default_type,[{Operation,Name}]),
+	    false;
+	GeneratedList ->
+	    case lists:member({Operation,Name},GeneratedList) of
+		true ->
+		    true;
+		false ->
+		    put(class_default_type,[{Operation,Name}|GeneratedList]),
+		    false
+	    end
+    end.
+
+get_class_fields(#classdef{typespec=ObjClass}) ->
+    ObjClass#objectclass.fields;
+get_class_fields(#objectclass{fields=Fields}) ->
+    Fields;
+get_class_fields(_) ->
+    [].
+
+
+get_object_field(Name,ObjectFields) ->
+    case lists:keysearch(Name,1,ObjectFields) of
+	{value,Field} -> Field;
+	false -> false
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_per_rt2ct.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_per_rt2ct.erl
new file mode 100644
index 0000000000..ddfa124048
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_per_rt2ct.erl
@@ -0,0 +1,1811 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_gen_per_rt2ct.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+-module(asn1ct_gen_per_rt2ct).
+
+%% Generate erlang module which handles (PER) encode and decode for
+%% all types in an ASN.1 module
+
+-include("asn1_records.hrl").
+%-compile(export_all).
+
+-export([pgen/4,gen_dec_prim/3,gen_encode_prim/4]).
+-export([gen_obj_code/3,gen_objectset_code/2]).
+-export([gen_decode/2, gen_decode/3]).
+-export([gen_encode/2, gen_encode/3]).
+
+-import(asn1ct_gen, [emit/1,demit/1]).
+-import(asn1ct_gen_per, [is_already_generated/2,more_genfields/1,
+			 get_class_fields/1,get_object_field/2]).
+
+%% pgen(Erules, Module, TypeOrVal)
+%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
+%% .hrl file is only generated if necessary
+%% Erules = per | ber
+%% Module = atom()
+%% TypeOrVal = {TypeList,ValueList}
+%% TypeList = ValueList = [atom()]
+
+pgen(OutFile,Erules,Module,TypeOrVal) ->
+    asn1ct_gen:pgen_module(OutFile,Erules,Module,TypeOrVal,true).
+
+
+%% Generate ENCODING ******************************
+%%****************************************x
+
+
+gen_encode(Erules,Type) when record(Type,typedef) ->
+    gen_encode_user(Erules,Type).
+
+gen_encode(Erules,Typename,#'ComponentType'{name=Cname,typespec=Type}) ->
+    NewTypename = [Cname|Typename],
+    gen_encode(Erules,NewTypename,Type);
+
+gen_encode(Erules,Typename,Type) when record(Type,type) ->
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    ObjFun =
+	case lists:keysearch(objfun,1,Type#type.tablecinf) of
+	    {value,{_,_Name}} ->
+		", ObjFun";
+	    false ->
+		""
+	end,
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    case InnerType of
+		'SET' ->
+		    true;
+		'SEQUENCE' ->
+		    true;
+		_ ->
+		    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
+			  "'({'",asn1ct_gen:list2name(Typename),
+			  "',Val}",ObjFun,") ->",nl}),
+		    emit({"'enc_",asn1ct_gen:list2name(Typename),
+			  "'(Val",ObjFun,");",nl,nl})
+	    end,
+	    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val",ObjFun,
+		  ") ->",nl}),
+	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
+	_ ->
+	    true
+    end.
+
+
+gen_encode_user(Erules,D) when record(D,typedef) ->
+    CurrMod = get(currmod),
+    Typename = [D#typedef.name],
+    Def = D#typedef.typespec,
+    InnerType = asn1ct_gen:get_inner(Def#type.def),
+    case InnerType of
+	'SET' -> true;
+	'SEQUENCE' -> true;
+	_ ->
+	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),"'({'",asn1ct_gen:list2name(Typename),"',Val}) ->",nl}),
+	    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val);",nl,nl})
+    end,
+    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val) ->",nl}),
+    case asn1ct_gen:type(InnerType) of
+	{primitive,bif} ->
+	    gen_encode_prim(Erules,Def,"false"),
+	    emit({".",nl});
+	'ASN1_OPEN_TYPE' ->
+	    gen_encode_prim(Erules,Def#type{def='ASN1_OPEN_TYPE'},"false"),
+	    emit({".",nl});
+	{constructed,bif} ->
+	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,D);
+	#'Externaltypereference'{module=CurrMod,type=Etype} ->
+	    emit({"'enc_",Etype,"'(Val).",nl,nl});
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit({"'",Emod,"':'enc_",Etype,"'(Val).",nl,nl});
+	#typereference{val=Ename} ->
+	    emit({"'enc_",Ename,"'(Val).",nl,nl});
+	{notype,_} ->
+	    emit({"'enc_",InnerType,"'(Val).",nl,nl})
+    end.
+
+
+gen_encode_prim(Erules,D,DoTag) ->
+    Value = case asn1ct_name:active(val) of
+		true ->
+		    asn1ct_gen:mk_var(asn1ct_name:curr(val));
+		false ->
+		    "Val"
+	    end,
+    gen_encode_prim(Erules,D,DoTag,Value).
+
+
+
+
+
+gen_encode_prim(_Erules,D,_DoTag,Value) when record(D,type) ->
+    Constraint = D#type.constraint,
+    case D#type.def of
+	'INTEGER' ->
+	    EffectiveConstr = effective_constraint(integer,Constraint),
+	    emit(["  %%INTEGER with effective constraint: ",
+		  {asis,EffectiveConstr},nl]),
+	    emit_enc_integer(EffectiveConstr,Value);
+	{'INTEGER',NamedNumberList} ->
+	    EffectiveConstr = effective_constraint(integer,Constraint),
+	    %% maybe an emit_enc_NNL_integer
+	    emit(["  %%INTEGER with effective constraint: ",
+		  {asis,EffectiveConstr},nl]),
+	    emit_enc_integer_NNL(EffectiveConstr,Value,NamedNumberList);
+	{'ENUMERATED',{Nlist1,Nlist2}} ->
+	    NewList = lists:concat([[{0,X}||{X,_} <- Nlist1],['EXT_MARK'],[{1,X}||{X,_} <- Nlist2]]),
+	    NewC = [{'ValueRange',{0,length(Nlist1)-1}}],
+	    emit(["case (case ",Value," of {_,_}->element(2,",Value,");_->",
+		  Value," end) of",nl]),
+	    emit_enc_enumerated_cases(NewC, NewList++[{asn1_enum,length(Nlist1)-1}], 0);
+	{'ENUMERATED',NamedNumberList} ->
+	    NewList = [X||{X,_} <- NamedNumberList],
+	    NewC = effective_constraint(integer,
+					[{'ValueRange',
+					  {0,length(NewList)-1}}]),
+	    NewVal = enc_enum_cases(Value,NewList),
+	    emit_enc_integer(NewC,NewVal);
+	{'BIT STRING',NamedNumberList} ->
+	    EffectiveC = effective_constraint(bitstring,Constraint),
+	    case EffectiveC of
+		0 -> emit({"[]"});
+		_ ->
+		    emit({"?RT_PER:encode_bit_string(",
+			  {asis,EffectiveC},",",Value,",",
+			  {asis,NamedNumberList},")"})
+	    end;
+	'NULL' ->
+	    emit({"?RT_PER:encode_null(",Value,")"});
+	'OBJECT IDENTIFIER' ->
+	    emit({"?RT_PER:encode_object_identifier(",Value,")"});
+	'ObjectDescriptor' ->
+	    emit({"?RT_PER:encode_ObjectDescriptor(",{asis,Constraint},
+		  ",",Value,")"});
+	'BOOLEAN' ->
+%	    emit({"?RT_PER:encode_boolean(",Value,")"});
+	    emit({"case ",Value," of",nl,
+%		  "  true -> {bits,1,1};",nl,
+		  "  true -> [1];",nl,
+%		  "  false -> {bits,1,0};",nl,
+		  "  false -> [0];",nl,
+		  "  _ -> exit({error,{asn1,{encode_boolean,",Value,"}}})",nl,
+		  "end"});
+	'OCTET STRING' ->
+	    emit_enc_octet_string(Constraint,Value);
+
+	'NumericString' ->
+	    emit_enc_known_multiplier_string('NumericString',Constraint,Value);
+	'TeletexString' ->
+	    emit({"?RT_PER:encode_TeletexString(",{asis,Constraint},",",Value,")"});
+	'VideotexString' ->
+	    emit({"?RT_PER:encode_VideotexString(",{asis,Constraint},",",Value,")"});
+	'UTCTime' ->
+	    emit_enc_known_multiplier_string('VisibleString',Constraint,Value);
+	'GeneralizedTime' ->
+	    emit_enc_known_multiplier_string('VisibleString',Constraint,Value);
+	'GraphicString' ->
+	    emit({"?RT_PER:encode_GraphicString(",{asis,Constraint},",",Value,")"});
+	'VisibleString' ->
+	    emit_enc_known_multiplier_string('VisibleString',Constraint,Value);
+	'GeneralString' ->
+	    emit({"?RT_PER:encode_GeneralString(",{asis,Constraint},",",Value,")"});
+	'PrintableString' ->
+	    emit_enc_known_multiplier_string('PrintableString',Constraint,Value);
+	'IA5String' ->
+	    emit_enc_known_multiplier_string('IA5String',Constraint,Value);
+	'BMPString' ->
+	    emit_enc_known_multiplier_string('BMPString',Constraint,Value);
+	'UniversalString' ->
+	    emit_enc_known_multiplier_string('UniversalString',Constraint,Value);
+	'ANY' ->
+	    emit(["?RT_PER:encode_open_type(", {asis,Constraint}, ",",
+		  Value, ")"]);
+	'ASN1_OPEN_TYPE' ->
+	    NewValue = case Constraint of
+			   [#'Externaltypereference'{type=Tname}] ->
+			     io_lib:format(
+			       "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
+			   [#type{def=#'Externaltypereference'{type=Tname}}] ->
+			       io_lib:format(
+				 "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
+			 _ -> Value
+		     end,
+	    emit(["?RT_PER:encode_open_type(", {asis,Constraint}, ",",
+		  NewValue, ")"]);
+	XX ->
+	    exit({asn1_error,nyi,XX})
+    end.
+
+emit_enc_known_multiplier_string(StringType,C,Value) ->
+    SizeC =
+	case get_constraint(C,'SizeConstraint') of
+	    L when list(L) -> {lists:min(L),lists:max(L)};
+	    L -> L
+	end,
+    PAlphabC = get_constraint(C,'PermittedAlphabet'),
+    case {StringType,PAlphabC} of
+	{'UniversalString',{_,_}} ->
+	    exit({error,{asn1,{'not implemented',"UniversalString with "
+			       "PermittedAlphabet constraint"}}});
+	{'BMPString',{_,_}} ->
+	    exit({error,{asn1,{'not implemented',"BMPString with "
+			       "PermittedAlphabet constraint"}}});
+	_ -> ok
+    end,
+    NumBits = get_NumBits(C,StringType),
+    CharOutTab = get_CharOutTab(C,StringType),
+    %% NunBits and CharOutTab for chars_encode
+    emit_enc_k_m_string(StringType,SizeC,NumBits,CharOutTab,Value).
+
+emit_enc_k_m_string(_StringType,0,_NumBits,_CharOutTab,_Value) ->
+    emit({"[]"});
+emit_enc_k_m_string(StringType,SizeC,NumBits,CharOutTab,Value) ->
+    emit({"?RT_PER:encode_known_multiplier_string(",{asis,StringType},",",
+	  {asis,SizeC},",",NumBits,",",{asis,CharOutTab},",",Value,")"}).
+
+emit_dec_known_multiplier_string(StringType,C,BytesVar) ->
+    SizeC = get_constraint(C,'SizeConstraint'),
+    PAlphabC = get_constraint(C,'PermittedAlphabet'),
+    case {StringType,PAlphabC} of
+	{'BMPString',{_,_}} ->
+	    exit({error,{asn1,
+			 {'not implemented',
+			  "BMPString with PermittedAlphabet "
+			  "constraint"}}});
+	_ ->
+	    ok
+    end,
+    NumBits = get_NumBits(C,StringType),
+    CharInTab = get_CharInTab(C,StringType),
+    case SizeC of
+	0 ->
+	    emit({"{[],",BytesVar,"}"});
+	_ ->
+	    emit({"?RT_PER:decode_known_multiplier_string(",
+		  {asis,StringType},",",{asis,SizeC},",",NumBits,
+		  ",",{asis,CharInTab},",",BytesVar,")"})
+    end.
+
+
+%% copied from run time module
+
+get_CharOutTab(C,StringType) ->
+    get_CharTab(C,StringType,out).
+
+get_CharInTab(C,StringType) ->
+    get_CharTab(C,StringType,in).
+
+get_CharTab(C,StringType,InOut) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	{'SingleValue',Sv} ->
+	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv,InOut);
+	no ->
+	    case StringType of
+		'IA5String' ->
+		    {0,16#7F,notab};
+		'VisibleString' ->
+		    get_CharTab2(C,StringType,16#20,16#7F,notab,InOut);
+		'PrintableString' ->
+		    Chars = lists:sort(
+			      " '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
+		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars,InOut);
+		'NumericString' ->
+		    get_CharTab2(C,StringType,16#20,$9," 0123456789",InOut);
+		'UniversalString' ->
+		    {0,16#FFFFFFFF,notab};
+		'BMPString' ->
+		    {0,16#FFFF,notab}
+	    end
+    end.
+
+get_CharTab2(C,StringType,Min,Max,Chars,InOut) ->
+    BitValMax = (1 bsl get_NumBits(C,StringType))-1,
+    if
+	Max =< BitValMax ->
+	    {0,Max,notab};
+	true ->
+	    case InOut of
+		out ->
+		    {Min,Max,create_char_tab(Min,Chars)};
+		in  ->
+		    {Min,Max,list_to_tuple(Chars)}
+	    end
+    end.
+
+create_char_tab(Min,L) ->
+    list_to_tuple(create_char_tab(Min,L,0)).
+create_char_tab(Min,[Min|T],V) ->
+    [V|create_char_tab(Min+1,T,V+1)];
+create_char_tab(_Min,[],_V) ->
+    [];
+create_char_tab(Min,L,V) ->
+    [false|create_char_tab(Min+1,L,V)].
+
+get_NumBits(C,StringType) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	{'SingleValue',Sv} ->
+	    charbits(length(Sv),aligned);
+	no ->
+	    case StringType of
+		'IA5String' ->
+		    charbits(128,aligned); % 16#00..16#7F
+		'VisibleString' ->
+		    charbits(95,aligned); % 16#20..16#7E
+		'PrintableString' ->
+		    charbits(74,aligned); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+		'NumericString' ->
+		    charbits(11,aligned); % $ ,"0123456789"
+		'UniversalString' ->
+		    32;
+		'BMPString' ->
+		    16
+	    end
+    end.
+
+charbits(NumOfChars,aligned) ->
+    case charbits(NumOfChars) of
+	1 -> 1;
+	2 -> 2;
+	B when B =< 4 -> 4;
+	B when B =< 8 -> 8;
+	B when B =< 16 -> 16;
+	B when B =< 32 -> 32
+    end.
+
+charbits(NumOfChars) when NumOfChars =< 2 -> 1;
+charbits(NumOfChars) when NumOfChars =< 4 -> 2;
+charbits(NumOfChars) when NumOfChars =< 8 -> 3;
+charbits(NumOfChars) when NumOfChars =< 16 -> 4;
+charbits(NumOfChars) when NumOfChars =< 32 -> 5;
+charbits(NumOfChars) when NumOfChars =< 64 -> 6;
+charbits(NumOfChars) when NumOfChars =< 128 -> 7;
+charbits(NumOfChars) when NumOfChars =< 256 -> 8;
+charbits(NumOfChars) when NumOfChars =< 512 -> 9;
+charbits(NumOfChars) when NumOfChars =< 1024 -> 10;
+charbits(NumOfChars) when NumOfChars =< 2048 -> 11;
+charbits(NumOfChars) when NumOfChars =< 4096 -> 12;
+charbits(NumOfChars) when NumOfChars =< 8192 -> 13;
+charbits(NumOfChars) when NumOfChars =< 16384 -> 14;
+charbits(NumOfChars) when NumOfChars =< 32768 -> 15;
+charbits(NumOfChars) when NumOfChars =< 65536 -> 16;
+charbits(NumOfChars) when integer(NumOfChars) ->
+    16 + charbits1(NumOfChars bsr 16).
+
+charbits1(0) ->
+    0;
+charbits1(NumOfChars) ->
+    1 + charbits1(NumOfChars bsr 1).
+
+%% copied from run time module
+
+emit_enc_octet_string(Constraint,Value) ->
+    case get_constraint(Constraint,'SizeConstraint') of
+	0 ->
+	    emit({"  []"});
+	1 ->
+	    asn1ct_name:new(tmpval),
+	    emit({"  begin",nl}),
+	    emit({"    [",{curr,tmpval},"] = ",Value,",",nl}),
+%	    emit({"    {bits,8,",{curr,tmpval},"}",nl}),
+	    emit({"    [10,8,",{curr,tmpval},"]",nl}),
+	    emit("  end");
+	2 ->
+	    asn1ct_name:new(tmpval),
+	    emit({"  begin",nl}),
+	    emit({"    [",{curr,tmpval},",",{next,tmpval},"] = ",
+		  Value,",",nl}),
+%	    emit({"    [{bits,8,",{curr,tmpval},"},{bits,8,",
+%		  {next,tmpval},"}]",nl}),
+	    emit({"    [[10,8,",{curr,tmpval},"],[10,8,",
+		  {next,tmpval},"]]",nl}),
+	    emit("  end"),
+	    asn1ct_name:new(tmpval);
+	Sv when integer(Sv),Sv =< 256  ->
+	    asn1ct_name:new(tmpval),
+	    emit({"  begin",nl}),
+%	    emit({"    case length(",Value,") == ",Sv," of",nl}),
+	    emit({"    case length(",Value,") of",nl}),
+	    emit({"      ",{curr,tmpval}," when ",{curr,tmpval}," == ",Sv," -> [2,20,",{curr,tmpval},",",Value,"];",nl}),
+	    emit({"      _ -> exit({error,{value_out_of_bounds,",Value,"}})",
+		  nl,"    end",nl}),
+	    emit("  end");
+	Sv when integer(Sv),Sv =< 65535  ->
+	    asn1ct_name:new(tmpval),
+	    emit({"  begin",nl}),
+%	    emit({"    case length(",Value,") == ",Sv," of",nl}),
+	    emit({"    case length(",Value,") of",nl}),
+%	    emit({"      true -> [align,{octets,",Value,"}];",nl}),
+	    emit({"      ",{curr,tmpval}," when ",{curr,tmpval}," == ",Sv," -> [2,21,",{curr,tmpval},",",Value,"];",nl}),
+	    emit({"      _ -> exit({error,{value_out_of_bounds,",Value,"}})",
+		  nl,"    end",nl}),
+	    emit("  end");
+	C ->
+	    emit({"  ?RT_PER:encode_octet_string(",{asis,C},",false,",Value,")",nl})
+    end.
+
+emit_dec_octet_string(Constraint,BytesVar) ->
+    case get_constraint(Constraint,'SizeConstraint') of
+	0 ->
+	    emit({"  {[],",BytesVar,"}",nl});
+	{_,0} ->
+	    emit({"  {[],",BytesVar,"}",nl});
+	C ->
+	    emit({"  ?RT_PER:decode_octet_string(",BytesVar,",",
+		  {asis,C},",false)",nl})
+    end.
+
+emit_enc_integer_case(Value) ->
+    case get(component_type) of
+	{true,#'ComponentType'{prop=Prop}} ->
+	    emit({"  begin",nl}),
+	    case Prop of
+		Opt when Opt=='OPTIONAL';
+			 tuple(Opt),element(1,Opt)=='DEFAULT' ->
+		    emit({"  case ",Value," of",nl}),
+		    ok;
+		_ ->
+		    emit({"  ",{curr,tmpval},"=",Value,",",nl}),
+		    emit({"  case ",{curr,tmpval}," of",nl}),
+		    asn1ct_name:new(tmpval)
+	    end;
+%	    asn1ct_name:new(tmpval);
+	_ ->
+	    emit({" case ",Value," of ",nl})
+    end.
+emit_enc_integer_end_case() ->
+    case get(component_type) of
+	{true,_} ->
+	    emit({nl,"  end"}); % end of begin ... end
+	_ -> ok
+    end.
+
+
+emit_enc_integer_NNL(C,Value,NNL) ->
+    EncVal = enc_integer_NNL_cases(Value,NNL),
+    emit_enc_integer(C,EncVal).
+
+enc_integer_NNL_cases(Value,NNL) ->
+    asn1ct_name:new(tmpval),
+    TmpVal = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
+    Cases=enc_integer_NNL_cases1(NNL),
+    lists:flatten(io_lib:format("(case ~s of "++Cases++
+		  "~s when atom(~s)->exit({error,{asn1,{namednumber,~s}}});_->~s end)",[Value,TmpVal,TmpVal,TmpVal,Value])).
+
+enc_integer_NNL_cases1([{NNo,No}|Rest]) ->
+    io_lib:format("~w->~w;",[NNo,No])++enc_integer_NNL_cases1(Rest);
+enc_integer_NNL_cases1([]) ->
+    "".
+
+emit_enc_integer([{'SingleValue',Int}],Value) ->
+    asn1ct_name:new(tmpval),
+    emit_enc_integer_case(Value),%    emit(["  case ",Value," of",nl]),
+    emit(["    ",Int," -> [];",nl]),
+    emit(["    ",{curr,tmpval}," ->",nl]),
+    emit(["      exit({error,{value_out_of_bounds,",{curr,tmpval},"}})",
+	  nl," end",nl]),
+    emit_enc_integer_end_case();
+
+emit_enc_integer([{_,{Lb,Ub},_Range,{bits,NoBs}}],Value) -> % Range =< 255
+    asn1ct_name:new(tmpval),
+    emit_enc_integer_case(Value),
+    emit(["    ",{curr,tmpval}," when ",{curr,tmpval},"=<",Ub,",",
+	  {curr,tmpval},">=",Lb," ->",nl]),
+    emit(["      [10,",NoBs,",",{curr,tmpval},"-",Lb,"];",nl]),
+    emit(["    ",{curr,tmpval}," ->",nl]),
+    emit(["      exit({error,{value_out_of_bounds,",{curr,tmpval},"}})",
+	  nl,"  end",nl]),
+    emit_enc_integer_end_case();
+
+emit_enc_integer([{_,{Lb,Ub},Range,_}],Value) when Range =< 256 ->
+    asn1ct_name:new(tmpval),
+    emit_enc_integer_case(Value),
+    emit(["    ",{curr,tmpval}," when ",{curr,tmpval},"=<",Ub,",",
+	  {curr,tmpval},">=",Lb," ->",nl]),
+    emit(["      [20,1,",{curr,tmpval},"-",Lb,"];",nl]),
+    emit(["    ",{curr,tmpval}," ->",nl]),
+    emit(["      exit({error,{value_out_of_bounds,",{curr,tmpval},"}})",
+	  nl,"  end",nl]),
+    emit_enc_integer_end_case();
+
+emit_enc_integer([{_,{Lb,Ub},Range,_}],Value) when Range =< 65536 ->
+    asn1ct_name:new(tmpval),
+    emit_enc_integer_case(Value),
+    emit(["    ",{curr,tmpval}," when ",{curr,tmpval},"=<",Ub,",",
+	  {curr,tmpval},">=",Lb," ->",nl]),
+    emit(["      [20,2,<<(",{curr,tmpval},"-",Lb,"):16>>];",nl]),
+    emit(["    ",{curr,tmpval}," ->",nl]),
+    emit(["      exit({error,{value_out_of_bounds,",{curr,tmpval},"}})",
+	  nl,"  end",nl]),
+    emit_enc_integer_end_case();
+
+
+emit_enc_integer(C,Value) ->
+    emit({"  ?RT_PER:encode_integer(",{asis,C},",",Value,")"}).
+
+
+
+
+enc_enum_cases(Value,NewList) ->
+    asn1ct_name:new(tmpval),
+    TmpVal = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
+    Cases=enc_enum_cases1(NewList),
+    lists:flatten(io_lib:format("(case ~s of "++Cases++
+				"~s ->exit({error,"
+				"{asn1,{enumerated,~s}}})"
+				" end)",
+				[Value,TmpVal,TmpVal])).
+enc_enum_cases1(NNL) ->
+    enc_enum_cases1(NNL,0).
+enc_enum_cases1([H|T],Index) ->
+    io_lib:format("~w->~w;",[H,Index])++enc_enum_cases1(T,Index+1);
+enc_enum_cases1([],_) ->
+    "".
+
+
+emit_enc_enumerated_cases(C, [H], Count) ->
+    emit_enc_enumerated_case(C, H, Count),
+    emit([";",nl,"EnumVal -> exit({error,{asn1, {enumerated_not_in_range, EnumVal}}})"]),
+    emit([nl,"end"]);
+emit_enc_enumerated_cases(C, ['EXT_MARK'|T], _Count) ->
+    emit_enc_enumerated_cases(C, T, 0);
+emit_enc_enumerated_cases(C, [H1,H2|T], Count) ->
+    emit_enc_enumerated_case(C, H1, Count),
+    emit([";",nl]),
+    emit_enc_enumerated_cases(C, [H2|T], Count+1).
+
+
+%% The function clauses matching on tuples with first element
+%% asn1_enum, 1 or 0 and the atom 'EXT_MARK' are for ENUMERATED
+%% with extension mark.
+emit_enc_enumerated_case(_C, {asn1_enum,High}, _) ->
+    %% ENUMERATED with extensionmark
+    %% value higher than the extension base and not
+    %% present in the extension range.
+    emit(["{asn1_enum,EnumV} when integer(EnumV), EnumV > ",High," -> ",
+	  "[1,?RT_PER:encode_small_number(EnumV)]"]);
+emit_enc_enumerated_case(_C, 'EXT_MARK', _Count) ->
+    %% ENUMERATED with extensionmark
+    true;
+emit_enc_enumerated_case(_C, {1,EnumName}, Count) ->
+    %% ENUMERATED with extensionmark
+    %% values higher than extension root
+    emit(["'",EnumName,"' -> [1,?RT_PER:encode_small_number(",Count,")]"]);
+emit_enc_enumerated_case(C, {0,EnumName}, Count) ->
+    %% ENUMERATED with extensionmark
+    %% values within extension root
+    emit(["'",EnumName,"' -> [0,?RT_PER:encode_integer(",{asis,C},", ",Count,")]"]);
+
+%% This clause is invoked in case of an ENUMERATED without extension mark
+emit_enc_enumerated_case(_C, EnumName, Count) ->
+    emit(["'",EnumName,"' -> ",Count]).
+
+
+get_constraint([{Key,V}],Key) ->
+    V;
+get_constraint([],_) ->
+    no;
+get_constraint(C,Key) ->
+    case lists:keysearch(Key,1,C) of
+	false ->
+	    no;
+	{value,{_,V}} ->
+	    V
+    end.
+
+get_constraints(L=[{Key,_}],Key) ->
+    L;
+get_constraints([],_) ->
+    [];
+get_constraints(C,Key) ->
+    {value,L} = keysearch_allwithkey(Key,1,C,[]),
+    L.
+
+keysearch_allwithkey(Key,Ix,C,Acc) ->
+    case lists:keysearch(Key,Ix,C) of
+	false ->
+	    {value,Acc};
+	{value,T} ->
+	    RestC = lists:delete(T,C),
+	    keysearch_allwithkey(Key,Ix,RestC,[T|Acc])
+    end.
+
+%% effective_constraint(Type,C)
+%% Type = atom()
+%% C = [C1,...]
+%% C1 = {'SingleValue',SV} | {'ValueRange',VR} | {atom(),term()}
+%% SV = integer() | [integer(),...]
+%% VR = {Lb,Ub}
+%% Lb = 'MIN' | integer()
+%% Ub = 'MAX' | integer()
+%% Returns a single value if C only has a single value constraint, and no
+%% value range constraints, that constrains to a single value, otherwise
+%% returns a value range that has the lower bound set to the lowest value
+%% of all single values and lower bound values in C and the upper bound to
+%% the greatest value.
+effective_constraint(integer,[C={{_,_},_}|_Rest]) -> % extension
+    [C]; %% [C|effective_constraint(integer,Rest)]; XXX what is possible ???
+effective_constraint(integer,C) ->
+    SVs = get_constraints(C,'SingleValue'),
+    SV = effective_constr('SingleValue',SVs),
+    VRs = get_constraints(C,'ValueRange'),
+    VR = effective_constr('ValueRange',VRs),
+    CRange = greatest_common_range(SV,VR),
+    pre_encode(integer,CRange);
+effective_constraint(bitstring,C) ->
+%     Constr=get_constraints(C,'SizeConstraint'),
+%     case Constr of
+% 	[] -> no;
+% 	[{'SizeConstraint',Val}] -> Val;
+% 	Other -> Other
+%     end;
+    get_constraint(C,'SizeConstraint');
+effective_constraint(Type,C) ->
+    io:format("Effective constraint for ~p, not implemented yet.~n",[Type]),
+    C.
+
+effective_constr(_,[]) ->
+    [];
+effective_constr('SingleValue',List) ->
+    SVList = lists:flatten(lists:map(fun(X)->element(2,X)end,List)),
+    case lists:usort(SVList) of
+	[N] ->
+	    [{'SingleValue',N}];
+	L when list(L) ->
+	    [{'ValueRange',{hd(L),lists:last(L)}}]
+    end;
+effective_constr('ValueRange',List) ->
+    LBs = lists:map(fun({_,{Lb,_}})-> Lb end,List),
+    UBs = lists:map(fun({_,{_,Ub}})-> Ub end,List),
+    Lb = least_Lb(LBs),
+    [{'ValueRange',{Lb,lists:max(UBs)}}].
+
+greatest_common_range([],VR) ->
+    VR;
+greatest_common_range(SV,[]) ->
+    SV;
+greatest_common_range([{_,Int}],[{_,{'MIN',Ub}}]) when integer(Int),
+						       Int > Ub ->
+    [{'ValueRange',{'MIN',Int}}];
+greatest_common_range([{_,Int}],[{_,{Lb,Ub}}]) when integer(Int),
+						    Int < Lb ->
+    [{'ValueRange',{Int,Ub}}];
+greatest_common_range([{_,Int}],VR=[{_,{_Lb,_Ub}}]) when integer(Int) ->
+    VR;
+greatest_common_range([{_,L}],[{_,{Lb,Ub}}]) when list(L) ->
+    Min = least_Lb([Lb|L]),
+    Max = greatest_Ub([Ub|L]),
+    [{'ValueRange',{Min,Max}}].
+
+
+least_Lb(L) ->
+    case lists:member('MIN',L) of
+	true -> 'MIN';
+	_ -> lists:min(L)
+    end.
+
+greatest_Ub(L) ->
+    case lists:member('MAX',L) of
+	true -> 'MAX';
+	_ -> lists:max(L)
+    end.
+
+% effective_constraint1('SingleValue',List) ->
+%     SVList = lists:map(fun(X)->element(2,X)end,List),
+%     sv_effective_constraint(hd(SVList),tl(SVList));
+% effective_constraint1('ValueRange',List) ->
+%     VRList = lists:map(fun(X)->element(2,X)end,List),
+%     vr_effective_constraint(lists:map(fun(X)->element(1,X)end,VRList),
+% 			    lists:map(fun(X)->element(2,X)end,VRList)).
+
+%% vr_effective_constraint/2
+%% Gets all LowerEndPoints and UpperEndPoints as arguments
+%% Returns {'ValueRange',{Lb,Ub}} where Lb is the highest value of
+%% the LowerEndPoints and Ub is the lowest value of the UpperEndPoints,
+%% i.e. the intersection of all value ranges.
+% vr_effective_constraint(Mins,Maxs) ->
+%     Lb=lists:foldl(fun(X,'MIN') when integer(X) -> X;
+% 		      (X,'MIN') -> 'MIN';
+% 		      (X,AccIn) when integer(X),X >= AccIn -> X;
+% 		      (X,AccIn) -> AccIn
+% 		   end,hd(Mins),tl(Mins)),
+%     Ub = lists:min(Maxs),
+%     {'ValueRange',{Lb,Ub}}.
+
+
+% sv_effective_constraint(SV,[]) ->
+%     {'SingleValue',SV};
+% sv_effective_constraint([],_) ->
+%     exit({error,{asn1,{illegal_single_value_constraint}}});
+% sv_effective_constraint(SV,[SV|Rest]) ->
+%     sv_effective_constraint(SV,Rest);
+% sv_effective_constraint(Int,[SV|Rest]) when integer(Int),list(SV) ->
+%     case lists:member(Int,SV) of
+% 	true ->
+% 	    sv_effective_constraint(Int,Rest);
+% 	_ ->
+% 	    exit({error,{asn1,{illegal_single_value_constraint}}})
+%     end;
+% sv_effective_constraint(SV,[Int|Rest]) when integer(Int),list(SV) ->
+%     case lists:member(Int,SV) of
+% 	true ->
+% 	    sv_effective_constraint(Int,Rest);
+% 	_ ->
+% 	    exit({error,{asn1,{illegal_single_value_constraint}}})
+%     end;
+% sv_effective_constraint(SV1,[SV2|Rest]) when list(SV1),list(SV2) ->
+%     sv_effective_constraint(common_set(SV1,SV2),Rest);
+% sv_effective_constraint(_,_) ->
+%     exit({error,{asn1,{illegal_single_value_constraint}}}).
+
+%% common_set/2
+%% Two lists as input
+%% Returns the list with all elements that are common for both
+%% input lists
+% common_set(SV1,SV2) ->
+%     lists:filter(fun(X)->lists:member(X,SV1) end,SV2).
+
+
+
+pre_encode(integer,[]) ->
+    [];
+pre_encode(integer,C=[{'SingleValue',_}]) ->
+    C;
+pre_encode(integer,C=[{'ValueRange',VR={Lb,Ub}}]) when integer(Lb),integer(Ub)->
+    Range = Ub-Lb+1,
+    if
+	Range =< 255 ->
+	    NoBits = no_bits(Range),
+	    [{'ValueRange',VR,Range,{bits,NoBits}}];
+	Range =< 256 ->
+	    [{'ValueRange',VR,Range,{octets,1}}];
+	Range =< 65536 ->
+	    [{'ValueRange',VR,Range,{octets,2}}];
+	true ->
+	    C
+    end;
+pre_encode(integer,C) ->
+    C.
+
+no_bits(2) -> 1;
+no_bits(N) when N=<4 -> 2;
+no_bits(N) when N=<8 -> 3;
+no_bits(N) when N=<16 -> 4;
+no_bits(N) when N=<32 -> 5;
+no_bits(N) when N=<64 -> 6;
+no_bits(N) when N=<128 -> 7;
+no_bits(N) when N=<255 -> 8.
+
+%% Object code generating for encoding and decoding
+%% ------------------------------------------------
+
+gen_obj_code(Erules,_Module,Obj) when record(Obj,typedef) ->
+    ObjName = Obj#typedef.name,
+    Def = Obj#typedef.typespec,
+    #'Externaltypereference'{module=Mod,type=ClassName} =
+	Def#'Object'.classname,
+    Class = asn1_db:dbget(Mod,ClassName),
+    {object,_,Fields} = Def#'Object'.def,
+    emit({nl,nl,nl,"%%================================"}),
+    emit({nl,"%%  ",ObjName}),
+    emit({nl,"%%================================",nl}),
+    EncConstructed =
+%	gen_encode_objectfields(Class#classdef.typespec,ObjName,Fields,[]),
+	gen_encode_objectfields(ClassName,get_class_fields(Class),
+				ObjName,Fields,[]),
+    emit(nl),
+    gen_encode_constr_type(Erules,EncConstructed),
+    emit(nl),
+    DecConstructed =
+%	gen_decode_objectfields(Class#classdef.typespec,ObjName,Fields,[]),
+	gen_decode_objectfields(ClassName,get_class_fields(Class),
+				ObjName,Fields,[]),
+    emit(nl),
+    gen_decode_constr_type(Erules,DecConstructed),
+    emit(nl);
+gen_obj_code(_Erules,_Module,Obj) when record(Obj,pobjectdef) ->
+    ok.
+
+gen_encode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(V) ->
+		emit(["'enc_",ObjName,"'(",{asis,Name},
+		      ",",V,",_RestPrimFieldName) ->",nl])
+	end,
+%     emit(["'enc_",ObjName,"'(",{asis,Name},
+% 	  ", Val, RestPrimFieldName) ->",nl]),
+    MaybeConstr =
+	case {get_object_field(Name,ObjectFields),OptOrMand} of
+	    {false,'MANDATORY'} -> %% this case is illegal
+		exit({error,{asn1,{"missing mandatory field in object",
+				   ObjName}}});
+	    {false,'OPTIONAL'} ->
+		EmitFuncClause("_"),
+		emit("   <<>>"),
+		[];
+	    {false,{'DEFAULT',DefaultType}} ->
+		EmitFuncClause("Val"),
+		gen_encode_default_call(ClassName,Name,DefaultType);
+	    {{Name,TypeSpec},_} ->
+		%% A specified field owerwrites any 'DEFAULT' or
+		%% 'OPTIONAL' field in the class
+		EmitFuncClause("Val"),
+		gen_encode_field_call(ObjName,Name,TypeSpec)
+	end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,
+			    MaybeConstr++ConstrAcc);
+gen_encode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Attrs) ->
+		emit(["'enc_",ObjName,"'(",{asis,Name},
+		      ",",Attrs,") ->",nl])
+	end,
+%     emit(["'enc_",ObjName,"'(",{asis,Name},
+% 	  ", Val,[H|T]) ->",nl]),
+    case {get_object_field(Name,ObjectFields),OptOrMand} of
+	{false,'MANDATORY'} ->
+	    exit({error,{asn1,{"missing mandatory field in object",
+			       ObjName}}});
+	{false,'OPTIONAL'} ->
+	    EmitFuncClause("_,_"),
+	    emit(["  exit({error,{'use of missing field in object', ",Name,
+		  "}})"]);
+	{false,{'DEFAULT',_DefaultObject}} ->
+	    exit({error,{asn1,{"not implemented yet",Name}}});
+	{{Name,TypeSpec},_} ->
+	    EmitFuncClause("Val,[H|T]"),
+	    case TypeSpec#typedef.name of
+		{ExtMod,TypeName} ->
+		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
+			  "'(H, Val, T)"});
+		TypeName ->
+		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
+	    end
+    end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
+gen_encode_objectfields(ClassName,[_C|Cs],O,OF,Acc) ->
+    gen_encode_objectfields(ClassName,Cs,O,OF,Acc);
+gen_encode_objectfields(_,[],_,_,Acc) ->
+    Acc.
+
+% gen_encode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
+%     Fields = Class#objectclass.fields,
+
+%     MaybeConstr =
+%     case is_typefield(Fields,FieldName) of
+% 	true ->
+% 	    Def = Type#typedef.typespec,
+% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
+% 		  ", Val, Dummy) ->",nl}),
+
+% 	    CAcc =
+% 	    case Type#typedef.name of
+% 		{primitive,bif} ->
+% 		    gen_encode_prim(per,Def,"false","Val"),
+% 		    [];
+% 		{constructed,bif} ->
+% 		    emit({"   'enc_",ObjName,'_',FieldName,
+% 			  "'(Val)"}),
+% 			[{['enc_',ObjName,'_',FieldName],Def}];
+% 		{ExtMod,TypeName} ->
+% 		    emit({"   '",ExtMod,"':'enc_",TypeName,"'(Val)"}),
+% 		    [];
+% 		TypeName ->
+% 		    emit({"   'enc_",TypeName,"'(Val)"}),
+% 		    []
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    CAcc;
+% 	{false,objectfield} ->
+% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
+% 		  ", Val, [H|T]) ->",nl}),
+% 	    case Type#typedef.name of
+% 		{ExtMod,TypeName} ->
+% 		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
+% 			  "'(H, Val, T)"});
+% 		TypeName ->
+% 		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    [];
+% 	{false,_} -> []
+%     end,
+%     gen_encode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
+% gen_encode_objectfields(C,O,[_|T],Acc) ->
+%     gen_encode_objectfields(C,O,T,Acc);
+% gen_encode_objectfields(_,_,[],Acc) ->
+%     Acc.
+
+gen_encode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
+    case is_already_generated(enc,TypeDef#typedef.name) of
+	true -> ok;
+	_ ->
+	    Name = lists:concat(["enc_",TypeDef#typedef.name]),
+	    emit({Name,"(Val) ->",nl}),
+	    Def = TypeDef#typedef.typespec,
+	    InnerType = asn1ct_gen:get_inner(Def#type.def),
+	    asn1ct_gen:gen_encode_constructed(Erules,Name,InnerType,Def),
+	    gen_encode_constr_type(Erules,Rest)
+    end;
+gen_encode_constr_type(_,[]) ->
+    ok.
+
+gen_encode_field_call(ObjName,FieldName,Type) ->
+    Def = Type#typedef.typespec,
+    case Type#typedef.name of
+	{primitive,bif} ->
+	    gen_encode_prim(per,Def,"false",
+			    "Val"),
+	    [];
+	{constructed,bif} ->
+	    emit({"   'enc_",ObjName,'_',FieldName,
+		  "'(Val)"}),
+	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
+	{ExtMod,TypeName} ->
+	    emit({"   '",ExtMod,"':'enc_",TypeName,
+		  "'(Val)"}),
+	    [];
+	TypeName ->
+	    emit({"   'enc_",TypeName,"'(Val)"}),
+	    []
+    end.
+
+gen_encode_default_call(ClassName,FieldName,Type) ->
+    CurrentMod = get(currmod),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+%%	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
+	    emit(["   'enc_",ClassName,'_',FieldName,"'(Val)"]),
+	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
+		      typespec=Type}];
+	{primitive,bif} ->
+	    gen_encode_prim(per,Type,"false","Val"),
+	    [];
+	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
+	    emit(["   'enc_",Etype,"'(Val)",nl]),
+	    [];
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit(["   '",Emod,"':'enc_",Etype,"'(Val)",nl]),
+	    []
+    end.
+
+
+
+gen_decode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+    EmitFuncClause =
+	fun(Bytes) ->
+		emit(["'dec_",ObjName,"'(",{asis,Name},",",Bytes,
+		      ",_,_RestPrimFieldName) ->",nl])
+	end,
+%     emit(["'dec_",ObjName,"'(",{asis,Name},
+% 	  ", Bytes, _, RestPrimFieldName) ->",nl]),
+    MaybeConstr=
+	case {get_object_field(Name,ObjectFields),OptOrMand} of
+	    {false,'MANDATORY'} -> %% this case is illegal
+		exit({error,{asn1,{"missing mandatory field in object",
+				   ObjName}}});
+	    {false,'OPTIONAL'} ->
+		EmitFuncClause("_"),
+		emit(["   asn1_NOVALUE"]),
+		[];
+	    {false,{'DEFAULT',DefaultType}} ->
+		EmitFuncClause("Bytes"),
+		gen_decode_default_call(ClassName,Name,"Bytes",DefaultType);
+	    {{Name,TypeSpec},_} ->
+		%% A specified field owerwrites any 'DEFAULT' or
+		%% 'OPTIONAL' field in the class
+		EmitFuncClause("Bytes"),
+		gen_decode_field_call(ObjName,Name,"Bytes",TypeSpec)
+	end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,MaybeConstr++ConstrAcc);
+gen_decode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
+			ObjName,ObjectFields,ConstrAcc) ->
+     EmitFuncClause =
+	fun(Attrs) ->
+		emit(["'dec_",ObjName,"'(",{asis,Name},
+		      ",",Attrs,") ->",nl])
+	end,
+%     emit(["'dec_",ObjName,"'(",{asis,Name},
+% 	  ", Bytes,_,[H|T]) ->",nl]),
+    case {get_object_field(Name,ObjectFields),OptOrMand} of
+	{false,'MANDATORY'} ->
+	    exit({error,{asn1,{"missing mandatory field in object",
+			       ObjName}}});
+	{false,'OPTIONAL'} ->
+	    EmitFuncClause("_,_,_"),
+	    emit(["  exit({error,{'illegal use of missing field in object', ",Name,
+		  "}})"]);
+	{false,{'DEFAULT',_DefaultObject}} ->
+	    exit({error,{asn1,{"not implemented yet",Name}}});
+	{{Name,TypeSpec},_} ->
+	    EmitFuncClause("Bytes,_,[H|T]"),
+	    case TypeSpec#typedef.name of
+		{ExtMod,TypeName} ->
+		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
+			  "'(H, Bytes, telltype, T)"});
+		TypeName ->
+		    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, telltype, T)"})
+	    end
+    end,
+    case more_genfields(Rest) of
+	true ->
+	    emit([";",nl]);
+	false ->
+	    emit([".",nl])
+    end,
+    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
+gen_decode_objectfields(CN,[_C|Cs],O,OF,CAcc) ->
+    gen_decode_objectfields(CN,Cs,O,OF,CAcc);
+gen_decode_objectfields(_,[],_,_,CAcc) ->
+    CAcc.
+
+
+gen_decode_field_call(ObjName,FieldName,Bytes,Type) ->
+    Def = Type#typedef.typespec,
+    case Type#typedef.name of
+	{primitive,bif} ->
+	    gen_dec_prim(per,Def,Bytes),
+	    [];
+	{constructed,bif} ->
+	    emit({"   'dec_",ObjName,'_',FieldName,
+		  "'(",Bytes,",telltype)"}),
+	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
+	{ExtMod,TypeName} ->
+	    emit({"   '",ExtMod,"':'dec_",TypeName,
+		  "'(",Bytes,", telltype)"}),
+	    [];
+	TypeName ->
+	    emit({"   'dec_",TypeName,"'(",Bytes,", telltype)"}),
+	    []
+    end.
+
+gen_decode_default_call(ClassName,FieldName,Bytes,Type) ->
+    CurrentMod = get(currmod),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    emit(["   'dec_",ClassName,'_',FieldName,"'(",Bytes,", telltype)"]),
+	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
+		      typespec=Type}];
+	{primitive,bif} ->
+	    gen_dec_prim(per,Type,Bytes),
+	    [];
+	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
+	    emit(["   'dec_",Etype,"'(",Bytes,", telltype)",nl]),
+	    [];
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit(["   '",Emod,"':'dec_",Etype,"'(",Bytes,", telltype)",nl]),
+	    []
+    end.
+
+%%%%%%%%%%%%%%%
+
+% gen_decode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
+%     Fields = Class#objectclass.fields,
+
+%     MaybeConstr =
+%     case is_typefield(Fields,FieldName) of
+% 	true ->
+% 	    Def = Type#typedef.typespec,
+% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
+% 		  ", Val, Telltype, RestPrimFieldName) ->",nl}),
+
+% 	    CAcc =
+% 	    case Type#typedef.name of
+% 		{primitive,bif} ->
+% 		    gen_dec_prim(per,Def,"Val"),
+% 		    [];
+% 		{constructed,bif} ->
+% 		    emit({"   'dec_",ObjName,'_',FieldName,
+% 			  "'(Val, Telltype)"}),
+% 		    [{['dec_',ObjName,'_',FieldName],Def}];
+% 		{ExtMod,TypeName} ->
+% 		    emit({"   '",ExtMod,"':'dec_",TypeName,
+% 			  "'(Val, Telltype)"}),
+% 		    [];
+% 		TypeName ->
+% 		    emit({"   'dec_",TypeName,"'(Val, Telltype)"}),
+% 		    []
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    CAcc;
+% 	{false,objectfield} ->
+% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
+% 		  ", Val, Telltype, [H|T]) ->",nl}),
+% 	    case Type#typedef.name of
+% 		{ExtMod,TypeName} ->
+% 		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
+% 			  "'(H, Val, Telltype, T)"});
+% 		TypeName ->
+% 		    emit({indent(3),"'dec_",TypeName,
+% 			  "'(H, Val, Telltype, T)"})
+% 	    end,
+% 	    case more_genfields(Fields,Rest) of
+% 		true ->
+% 		    emit({";",nl});
+% 		false ->
+% 		    emit({".",nl})
+% 	    end,
+% 	    [];
+% 	{false,_} ->
+% 	    []
+%     end,
+%     gen_decode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
+% gen_decode_objectfields(C,O,[_|T],CAcc) ->
+%     gen_decode_objectfields(C,O,T,CAcc);
+% gen_decode_objectfields(_,_,[],CAcc) ->
+%     CAcc.
+
+gen_decode_constr_type(Erules,[{Name,Def}|Rest]) ->
+    emit({Name,"(Bytes,_) ->",nl}),
+    InnerType = asn1ct_gen:get_inner(Def#type.def),
+    asn1ct_gen:gen_decode_constructed(Erules,Name,InnerType,Def),
+    gen_decode_constr_type(Erules,Rest);
+gen_decode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
+    case is_already_generated(dec,TypeDef#typedef.name) of
+	true -> ok;
+	_ ->
+	    gen_decode(Erules,TypeDef)
+    end,
+    gen_decode_constr_type(Erules,Rest);
+gen_decode_constr_type(_,[]) ->
+    ok.
+
+% is_typefield(Fields,FieldName) ->
+%     case lists:keysearch(FieldName,2,Fields) of
+% 	{value,Field} ->
+% 	    case element(1,Field) of
+% 		typefield ->
+% 		    true;
+% 		Other ->
+% 		    {false,Other}
+% 	    end;
+% 	_ ->
+% 	    false
+%     end.
+%% Object Set code generating for encoding and decoding
+%% ----------------------------------------------------
+gen_objectset_code(Erules,ObjSet) ->
+    ObjSetName = ObjSet#typedef.name,
+    Def = ObjSet#typedef.typespec,
+%%    {ClassName,ClassDef} = Def#'ObjectSet'.class,
+    #'Externaltypereference'{module=ClassModule,
+			     type=ClassName} = Def#'ObjectSet'.class,
+    ClassDef = asn1_db:dbget(ClassModule,ClassName),
+    UniqueFName = Def#'ObjectSet'.uniquefname,
+    Set = Def#'ObjectSet'.set,
+    emit({nl,nl,nl,"%%================================"}),
+    emit({nl,"%%  ",ObjSetName}),
+    emit({nl,"%%================================",nl}),
+    case ClassName of
+	{_Module,ExtClassName} ->
+	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
+			    ExtClassName,ClassDef);
+	_ ->
+	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
+			    ClassName,ClassDef)
+    end,
+    emit(nl).
+
+gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassDef)->
+    ClassFields = (ClassDef#classdef.typespec)#objectclass.fields,
+    InternalFuncs=
+	gen_objset_enc(ObjSetName,UniqueFName,Set,ClassName,
+		       ClassFields,1,[]),
+    gen_objset_dec(ObjSetName,UniqueFName,Set,ClassName,ClassFields,1),
+    gen_internal_funcs(Erules,InternalFuncs).
+
+gen_objset_enc(_,{unique,undefined},_,_,_,_,_) ->
+    %% There is no unique field in the class of this object set
+    %% don't bother about the constraint
+    [];
+gen_objset_enc(ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
+	       ClName,ClFields,NthObj,Acc)->
+    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",
+	  {asis,Val},") ->",nl}),
+    {InternalFunc,NewNthObj}=
+	case ObjName of
+	    no_name ->
+		gen_inlined_enc_funs(Fields,ClFields,ObjSName,NthObj);
+	    _ ->
+		emit({"    fun 'enc_",ObjName,"'/3"}),
+		{[],NthObj}
+	end,
+    emit({";",nl}),
+    gen_objset_enc(ObjSName,UniqueName,[T|Rest],ClName,ClFields,
+		  NewNthObj,InternalFunc++Acc);
+gen_objset_enc(ObjSetName,UniqueName,
+	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
+
+    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",
+	  {asis,Val},") ->",nl}),
+    {InternalFunc,_}=
+	case ObjName of
+	    no_name ->
+		gen_inlined_enc_funs(Fields,ClFields,ObjSetName,NthObj);
+	    _ ->
+		emit({"    fun 'enc_",ObjName,"'/3"}),
+		{[],NthObj}
+	end,
+    emit({".",nl,nl}),
+    InternalFunc++Acc;
+gen_objset_enc(ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
+	       _ClFields,_NthObj,Acc) ->
+    emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
+    emit({indent(3),"fun(_, Val, _) ->",nl}),
+    emit({indent(6),"Size = if",nl}),
+    emit({indent(9),"list(Val) -> length(Val);",nl}),
+    emit({indent(9),"true -> size(Val)",nl}),
+    emit({indent(6),"end,",nl}),
+    emit({indent(6),"if",nl}),
+    emit({indent(9),"Size < 256 ->",nl}),
+    emit({indent(12),"[20,Size,Val];",nl}),
+    emit({indent(9),"true ->",nl}),
+    emit({indent(12),"[21,<<Size:16>>,Val]",nl}),
+    emit({indent(6),"end",nl}),
+    emit({indent(3),"end.",nl,nl}),
+    Acc;
+gen_objset_enc(_,_,[],_,_,_,Acc) ->
+    Acc.
+
+%% gen_inlined_enc_funs for each object iterates over all fields of a
+%% class, and for each typefield it checks if the object has that
+%% field and emits the proper code.
+gen_inlined_enc_funs(Fields,[{typefield,Name,_}|Rest],ObjSetName,NthObj) ->
+    InternalDefFunName=asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
+    case lists:keysearch(Name,1,Fields) of
+	{value,{_,Type}} when record(Type,type) ->
+	    emit({indent(3),"fun(Type, Val, _) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    {Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
+	{value,{_,Type}} when record(Type,typedef) ->
+	    emit({indent(3),"fun(Type, Val, _) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    emit({indent(9),{asis,Name}," ->",nl}),
+	    {Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
+	false ->
+	    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj)
+    end;
+gen_inlined_enc_funs(Fields,[_|Rest],ObjSetName,NthObj) ->
+    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj);
+gen_inlined_enc_funs(_,[],_,NthObj) ->
+    {[],NthObj}.
+
+gen_inlined_enc_funs1(Fields,[{typefield,Name,_}|Rest],ObjSetName,
+		      NthObj,Acc) ->
+    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
+    {Acc2,NAdd}=
+	case lists:keysearch(Name,1,Fields) of
+	    {value,{_,Type}} when record(Type,type) ->
+		emit({";",nl}),
+		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+		{Ret++Acc,N};
+	    {value,{_,Type}} when record(Type,typedef) ->
+		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
+		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
+		{Ret++Acc,N};
+	    false ->
+		{Acc,0}
+	end,
+    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+NAdd,Acc2);
+gen_inlined_enc_funs1(Fields,[_|Rest],ObjSetName,NthObj,Acc)->
+    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj,Acc);
+gen_inlined_enc_funs1(_,[],_,NthObj,Acc) ->
+    emit({nl,indent(6),"end",nl}),
+    emit({indent(3),"end"}),
+    {Acc,NthObj}.
+
+emit_inner_of_fun(TDef=#typedef{name={ExtMod,Name},typespec=Type},
+		  InternalDefFunName) ->
+    case {ExtMod,Name} of
+	{primitive,bif} ->
+	    emit(indent(12)),
+	    gen_encode_prim(per,Type,dotag,"Val"),
+	    {[],0};
+	{constructed,bif} ->
+	    emit([indent(12),"'enc_",
+		  InternalDefFunName,"'(Val)"]),
+	    {[TDef#typedef{name=InternalDefFunName}],1};
+	_ ->
+	    emit({indent(12),"'",ExtMod,"':'enc_",Name,"'(Val)"}),
+	    {[],0}
+    end;
+emit_inner_of_fun(#typedef{name=Name},_) ->
+    emit({indent(12),"'enc_",Name,"'(Val)"}),
+    {[],0};
+emit_inner_of_fun(Type,_) when record(Type,type) ->
+    CurrMod = get(currmod),
+    case Type#type.def of
+	Def when atom(Def) ->
+	    emit({indent(9),Def," ->",nl,indent(12)}),
+	    gen_encode_prim(erules,Type,dotag,"Val");
+	TRef when record(TRef,typereference) ->
+	    T = TRef#typereference.val,
+	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,"'(Val)"});
+	#'Externaltypereference'{module=CurrMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,"'(Val)"});
+	#'Externaltypereference'{module=ExtMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'enc_",
+		  T,"'(Val)"})
+    end,
+    {[],0}.
+
+indent(N) ->
+    lists:duplicate(N,32). % 32 = space
+
+
+gen_objset_dec(_,{unique,undefined},_,_,_,_) ->
+    %% There is no unique field in the class of this object set
+    %% don't bother about the constraint
+    ok;
+gen_objset_dec(ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],ClName,
+	       ClFields,NthObj)->
+
+    emit({"'getdec_",ObjSName,"'(",{asis,UniqueName},",",
+	  {asis,Val},") ->",nl}),
+    NewNthObj=
+	case ObjName of
+	    no_name ->
+		gen_inlined_dec_funs(Fields,ClFields,ObjSName,NthObj);
+	    _ ->
+		emit({"    fun 'dec_",ObjName,"'/4"}),
+		NthObj
+	end,
+    emit({";",nl}),
+    gen_objset_dec(ObjSName,UniqueName,[T|Rest],ClName,ClFields,NewNthObj);
+gen_objset_dec(ObjSetName,UniqueName,[{ObjName,Val,Fields}],_ClName,
+	       ClFields,NthObj) ->
+
+    emit({"'getdec_",ObjSetName,"'(",{asis,UniqueName},",",
+	  {asis,Val},") ->",nl}),
+    case ObjName of
+	no_name ->
+	    gen_inlined_dec_funs(Fields,ClFields,ObjSetName,NthObj);
+	_ ->
+	    emit({"    fun 'dec_",ObjName,"'/4"})
+    end,
+    emit({".",nl,nl}),
+    ok;
+gen_objset_dec(ObjSetName,_,['EXTENSIONMARK'],_ClName,_ClFields,
+	       _NthObj) ->
+    emit({"'getdec_",ObjSetName,"'(_, _) ->",nl}),
+    emit({indent(3),"fun(Attr1, Bytes, _, _) ->",nl}),
+    %%    emit({indent(6),"?RT_PER:decode_open_type(Bytes,[])",nl}),
+    emit({indent(6),"{Bytes,Attr1}",nl}),
+    emit({indent(3),"end.",nl,nl}),
+    ok;
+gen_objset_dec(_,_,[],_,_,_) ->
+    ok.
+
+gen_inlined_dec_funs(Fields,[{typefield,Name,_}|Rest],
+		     ObjSetName,NthObj) ->
+    InternalDefFunName = [NthObj,Name,ObjSetName],
+    case lists:keysearch(Name,1,Fields) of
+	{value,{_,Type}} when record(Type,type) ->
+	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    N=emit_inner_of_decfun(Type,InternalDefFunName),
+	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
+	{value,{_,Type}} when record(Type,typedef) ->
+	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
+		  indent(6),"case Type of",nl}),
+	    emit({indent(9),{asis,Name}," ->",nl}),
+	    N=emit_inner_of_decfun(Type,InternalDefFunName),
+	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
+	false ->
+	    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj)
+    end;
+gen_inlined_dec_funs(Fields,[_|Rest],ObjSetName,NthObj) ->
+    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj);
+gen_inlined_dec_funs(_,[],_,NthObj) ->
+    NthObj.
+
+gen_inlined_dec_funs1(Fields,[{typefield,Name,_}|Rest],
+		     ObjSetName,NthObj) ->
+    InternalDefFunName = [NthObj,Name,ObjSetName],
+    N=
+    case lists:keysearch(Name,1,Fields) of
+	{value,{_,Type}} when record(Type,type) ->
+	    emit({";",nl}),
+	    emit_inner_of_decfun(Type,InternalDefFunName);
+	{value,{_,Type}} when record(Type,typedef) ->
+	    emit({";",nl,indent(9),{asis,Name}," ->",nl}),
+	    emit_inner_of_decfun(Type,InternalDefFunName);
+	false ->
+	    0
+    end,
+    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
+gen_inlined_dec_funs1(Fields,[_|Rest],ObjSetName,NthObj)->
+    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
+gen_inlined_dec_funs1(_,[],_,NthObj) ->
+    emit({nl,indent(6),"end",nl}),
+    emit({indent(3),"end"}),
+    NthObj.
+
+emit_inner_of_decfun(#typedef{name={ExtName,Name},typespec=Type},
+		     InternalDefFunName) ->
+    case {ExtName,Name} of
+	{primitive,bif} ->
+	    emit(indent(12)),
+	    gen_dec_prim(per,Type,"Val"),
+	    0;
+	{constructed,bif} ->
+	    emit({indent(12),"'dec_",
+		  asn1ct_gen:list2name(InternalDefFunName),"'(Val)"}),
+	    1;
+	_ ->
+	    emit({indent(12),"'",ExtName,"':'dec_",Name,
+		  "'(Val, telltype)"}),
+	    0
+    end;
+emit_inner_of_decfun(#typedef{name=Name},_) ->
+    emit({indent(12),"'dec_",Name,"'(Val, telltype)"}),
+    0;
+emit_inner_of_decfun(Type,_) when record(Type,type) ->
+    CurrMod = get(currmod),
+    case Type#type.def of
+	Def when atom(Def) ->
+	    emit({indent(9),Def," ->",nl,indent(12)}),
+	    gen_dec_prim(erules,Type,"Val");
+	TRef when record(TRef,typereference) ->
+	    T = TRef#typereference.val,
+	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
+	#'Externaltypereference'{module=CurrMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
+	#'Externaltypereference'{module=ExtMod,type=T} ->
+	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'dec_",
+		  T,"'(Val)"})
+    end,
+    0.
+
+
+gen_internal_funcs(_Erules,[]) ->
+    ok;
+gen_internal_funcs(Erules,[TypeDef|Rest]) ->
+    gen_encode_user(Erules,TypeDef),
+    emit([nl,nl,"'dec_",TypeDef#typedef.name,"'(Bytes) ->",nl]),
+    gen_decode_user(Erules,TypeDef),
+    gen_internal_funcs(Erules,Rest).
+
+
+
+%% DECODING *****************************
+%%***************************************
+
+
+gen_decode(Erules,Type) when record(Type,typedef) ->
+    D = Type,
+    emit({nl,nl}),
+    emit({"'dec_",Type#typedef.name,"'(Bytes,_) ->",nl}),
+    dbdec(Type#typedef.name),
+    gen_decode_user(Erules,D).
+
+gen_decode(Erules,Tname,#'ComponentType'{name=Cname,typespec=Type}) ->
+    NewTname = [Cname|Tname],
+    gen_decode(Erules,NewTname,Type);
+
+gen_decode(Erules,Typename,Type) when record(Type,type) ->
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    case asn1ct_gen:type(InnerType) of
+	{constructed,bif} ->
+	    ObjFun =
+		case Type#type.tablecinf of
+		    [{objfun,_}|_R] ->
+			", ObjFun";
+		    _ ->
+			""
+		end,
+	    emit({nl,"'dec_",asn1ct_gen:list2name(Typename),
+		  "'(Bytes,_",ObjFun,") ->",nl}),
+	    dbdec(Typename),
+	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
+	_ ->
+	    true
+    end.
+
+dbdec(Type) when list(Type)->
+    demit({"io:format(\"decoding: ",asn1ct_gen:list2name(Type),"~w~n\",[Bytes]),",nl});
+dbdec(Type) ->
+    demit({"io:format(\"decoding: ",{asis,Type},"~w~n\",[Bytes]),",nl}).
+
+gen_decode_user(Erules,D) when record(D,typedef) ->
+    CurrMod = get(currmod),
+    Typename = [D#typedef.name],
+    Def = D#typedef.typespec,
+    InnerType = asn1ct_gen:get_inner(Def#type.def),
+    case asn1ct_gen:type(InnerType) of
+	{primitive,bif} ->
+	    gen_dec_prim(Erules,Def,"Bytes"),
+	    emit({".",nl,nl});
+	'ASN1_OPEN_TYPE' ->
+	    gen_dec_prim(Erules,Def#type{def='ASN1_OPEN_TYPE'},"Bytes"),
+	    emit({".",nl,nl});
+	{constructed,bif} ->
+	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,D);
+	#typereference{val=Dname} ->
+	    emit({"'dec_",Dname,"'(Bytes,telltype)"}),
+	    emit({".",nl,nl});
+	#'Externaltypereference'{module=CurrMod,type=Etype} ->
+	    emit({"'dec_",Etype,"'(Bytes,telltype).",nl,nl});
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    emit({"'",Emod,"':'dec_",Etype,"'(Bytes,telltype).",nl,nl});
+	Other ->
+	    exit({error,{asn1,{unknown,Other}}})
+    end.
+
+
+
+gen_dec_prim(_Erules,Att,BytesVar) ->
+    Typename = Att#type.def,
+    Constraint = Att#type.constraint,
+    case Typename of
+	'INTEGER' ->
+	    EffectiveConstr = effective_constraint(integer,Constraint),
+	    emit_dec_integer(EffectiveConstr,BytesVar);
+% 	    emit({"?RT_PER:decode_integer(",BytesVar,",",
+% 		  {asis,EffectiveConstr},")"});
+	{'INTEGER',NamedNumberList} ->
+	    EffectiveConstr = effective_constraint(integer,Constraint),
+	    emit_dec_integer(EffectiveConstr,BytesVar,NamedNumberList);
+% 	    emit({"?RT_PER:decode_integer(",BytesVar,",",
+% 		  {asis,EffectiveConstr},",",
+% 		  {asis,NamedNumberList},")"});
+	{'BIT STRING',NamedNumberList} ->
+	    case get(compact_bit_string) of
+		true ->
+		    emit({"?RT_PER:decode_compact_bit_string(",
+			  BytesVar,",",{asis,Constraint},",",
+			  {asis,NamedNumberList},")"});
+		_ ->
+		    emit({"?RT_PER:decode_bit_string(",BytesVar,",",
+			  {asis,Constraint},",",
+			  {asis,NamedNumberList},")"})
+	    end;
+	'NULL' ->
+	    emit({"?RT_PER:decode_null(",
+		  BytesVar,")"});
+	'OBJECT IDENTIFIER' ->
+	    emit({"?RT_PER:decode_object_identifier(",
+		  BytesVar,")"});
+	'ObjectDescriptor' ->
+	    emit({"?RT_PER:decode_ObjectDescriptor(",
+		  BytesVar,")"});
+	{'ENUMERATED',{NamedNumberList1,NamedNumberList2}} ->
+	    NewTup = {list_to_tuple([X||{X,_} <- NamedNumberList1]),
+		      list_to_tuple([X||{X,_} <- NamedNumberList2])},
+	    NewC = [{'ValueRange',{0,size(element(1,NewTup))-1}}],
+	    emit({"?RT_PER:decode_enumerated(",BytesVar,",",
+		  {asis,NewC},",",
+		  {asis,NewTup},")"});
+	{'ENUMERATED',NamedNumberList} ->
+	    %NewTup = list_to_tuple([X||{X,Y} <- NamedNumberList]),
+	    NewNNL = [X||{X,_} <- NamedNumberList],
+	    NewC = effective_constraint(integer,
+					[{'ValueRange',{0,length(NewNNL)-1}}]),
+	    emit_dec_enumerated(BytesVar,NewC,NewNNL);
+% 	    emit({"?RT_PER:decode_enumerated(",BytesVar,",",
+% 		  {asis,NewC},",",
+% 		  {asis,NewTup},")"});
+	'BOOLEAN'->
+	    emit({"?RT_PER:decode_boolean(",BytesVar,")"});
+	'OCTET STRING' ->
+	    emit_dec_octet_string(Constraint,BytesVar);
+% 	    emit({"?RT_PER:decode_octet_string(",BytesVar,",",
+% 		  {asis,Constraint},")"});
+	'NumericString' ->
+	    emit_dec_known_multiplier_string('NumericString',
+					     Constraint,BytesVar);
+%	    emit({"?RT_PER:decode_NumericString(",BytesVar,",",
+%		  {asis,Constraint},")"});
+	'TeletexString' ->
+	    emit({"?RT_PER:decode_TeletexString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'VideotexString' ->
+	    emit({"?RT_PER:decode_VideotexString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'UTCTime' ->
+	    emit_dec_known_multiplier_string('VisibleString',
+					     Constraint,BytesVar);
+% 	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
+% 		  {asis,Constraint},")"});
+	'GeneralizedTime' ->
+	    emit_dec_known_multiplier_string('VisibleString',
+					     Constraint,BytesVar);
+% 	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
+% 		  {asis,Constraint},")"});
+	'GraphicString' ->
+	    emit({"?RT_PER:decode_GraphicString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'VisibleString' ->
+	    emit_dec_known_multiplier_string('VisibleString',
+					     Constraint,BytesVar);
+%	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
+%		  {asis,Constraint},")"});
+	'GeneralString' ->
+	    emit({"?RT_PER:decode_GeneralString(",BytesVar,",",
+		  {asis,Constraint},")"});
+	'PrintableString' ->
+	    emit_dec_known_multiplier_string('PrintableString',
+					     Constraint,BytesVar);
+%	    emit({"?RT_PER:decode_PrintableString(",BytesVar,",",{asis,Constraint},")"});
+	'IA5String' ->
+	    emit_dec_known_multiplier_string('IA5String',Constraint,BytesVar);
+%	    emit({"?RT_PER:decode_IA5String(",BytesVar,",",{asis,Constraint},")"});
+	'BMPString' ->
+	    emit_dec_known_multiplier_string('BMPString',Constraint,BytesVar);
+%	    emit({"?RT_PER:decode_BMPString(",BytesVar,",",{asis,Constraint},")"});
+	'UniversalString' ->
+	    emit_dec_known_multiplier_string('UniversalString',
+					     Constraint,BytesVar);
+%	    emit({"?RT_PER:decode_UniversalString(",BytesVar,",",{asis,Constraint},")"});
+	'ANY' ->
+	    emit(["?RT_PER:decode_open_type(",BytesVar,",",
+		  {asis,Constraint}, ")"]);
+	'ASN1_OPEN_TYPE' ->
+	    case Constraint of
+		[#'Externaltypereference'{type=Tname}] ->
+		    emit(["fun(FBytes) ->",nl,
+			  "   {XTerm,XBytes} = "]),
+		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
+		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
+		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
+		[#type{def=#'Externaltypereference'{type=Tname}}] ->
+		    emit(["fun(FBytes) ->",nl,
+			  "   {XTerm,XBytes} = "]),
+		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
+		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
+		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
+		_ ->
+		    emit(["?RT_PER:decode_open_type(",BytesVar,",[])"])
+	    end;
+	Other ->
+	    exit({'cant decode' ,Other})
+    end.
+
+
+emit_dec_integer(C,BytesVar,NNL) ->
+    asn1ct_name:new(tmpterm),
+    asn1ct_name:new(buffer),
+    Tmpterm = asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
+    Buffer = asn1ct_gen:mk_var(asn1ct_name:curr(buffer)),
+    emit({" begin {",{curr,tmpterm},",",{curr,buffer},"} = ",nl}),
+    emit_dec_integer(C,BytesVar),
+    emit({",",nl," case ",Tmpterm," of",nl}),
+    lists:map(fun({Name,Int})->emit({"   ",Int," -> {",{asis,Name},",",
+				     Buffer,"};",nl});
+		 (_)-> exit({error,{asn1,{"error in named number list",NNL}}})
+	      end,
+	      NNL),
+    emit({"   _ -> {",Tmpterm,",",Buffer,"}",nl}),
+    emit({" end",nl}), % end of case
+    emit(" end"). % end of begin
+
+emit_dec_integer([{'SingleValue',Int}],BytesVar) when integer(Int) ->
+    emit(["{",Int,",",BytesVar,"}"]);
+emit_dec_integer([{_,{Lb,_Ub},_Range,{BitsOrOctets,N}}],BytesVar) ->
+    GetBorO =
+	case BitsOrOctets of
+	    bits -> "getbits";
+	    _ -> "getoctets"
+	end,
+    asn1ct_name:new(tmpterm),
+    asn1ct_name:new(tmpremain),
+    emit({"  begin",nl,"    {",{curr,tmpterm},",",{curr,tmpremain},"}=",
+	  "?RT_PER:",GetBorO,"(",BytesVar,",",N,"),",nl}),
+    emit({"    {",{curr,tmpterm},"+",Lb,",",{curr,tmpremain},"}",nl,
+	  "  end"});
+emit_dec_integer([{_,{'MIN',_}}],BytesVar) ->
+    emit({"?RT_PER:decode_unconstrained_number(",BytesVar,")"});
+emit_dec_integer([{_,{Lb,'MAX'}}],BytesVar) ->
+    emit({"?RT_PER:decode_semi_constrained_number(",BytesVar,",",Lb,")"});
+emit_dec_integer([{'ValueRange',VR={Lb,Ub}}],BytesVar) ->
+    Range = Ub-Lb+1,
+     emit({"?RT_PER:decode_constrained_number(",BytesVar,",",
+	   {asis,VR},",",Range,")"});
+emit_dec_integer(C=[{Rc,_}],BytesVar) when tuple(Rc) ->
+    emit({"?RT_PER:decode_integer(",BytesVar,",",{asis,C},")"});
+emit_dec_integer(_,BytesVar) ->
+    emit({"?RT_PER:decode_unconstrained_number(",BytesVar,")"}).
+
+
+emit_dec_enumerated(BytesVar,C,NamedNumberList) ->
+    emit_dec_enumerated_begin(),% emits a begin if component
+    asn1ct_name:new(tmpterm),
+    Tmpterm = asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
+    asn1ct_name:new(tmpremain),
+    Tmpremain = asn1ct_gen:mk_var(asn1ct_name:curr(tmpremain)),
+    emit({"    {",{curr,tmpterm},",",{curr,tmpremain},"} =",nl}),
+    emit_dec_integer(C,BytesVar),
+    emit({",",nl,"    case ",Tmpterm," of "}),
+%    Cases=lists:flatten(dec_enumerated_cases(NamedNumberList,asn1ct_gen:mk_var(asn1ct_name:curr(tmpremain)),0)),
+    Cases=lists:flatten(dec_enumerated_cases(NamedNumberList,Tmpremain,0)),
+    emit({Cases++"_->exit({error,{asn1,{decode_enumerated,{",Tmpterm,
+	  ",",{asis,NamedNumberList},"}}}}) end",nl}),
+    emit_dec_enumerated_end().
+
+emit_dec_enumerated_begin() ->
+    case get(component_type) of
+	{true,_} ->
+	    emit({"  begin",nl});
+	_ -> ok
+    end.
+
+emit_dec_enumerated_end() ->
+    case get(component_type) of
+	{true,_} ->
+	    emit("  end");
+	_ -> ok
+    end.
+
+% dec_enumerated_cases(NNL,Tmpremain,No) ->
+%     Cases=dec_enumerated_cases1(NNL,Tmpremain,0),
+%     lists:flatten(io_lib:format("(case ~s "++Cases++
+% 		  "~s when atom(~s)->exit({error,{asn1,{namednumber,~s}}});_->~s end)",[Value,"TmpVal","TmpVal","TmpVal",Value])).
+
+dec_enumerated_cases([Name|Rest],Tmpremain,No) ->
+    io_lib:format("~w->{~w,~s};",[No,Name,Tmpremain])++
+	dec_enumerated_cases(Rest,Tmpremain,No+1);
+dec_enumerated_cases([],_,_) ->
+    "".
+
+
+% more_genfields(_Fields,[]) ->
+%     false;
+% more_genfields(Fields,[{FieldName,_}|T]) ->
+%     case is_typefield(Fields,FieldName) of
+% 	true -> true;
+% 	{false,objectfield} -> true;
+% 	{false,_} -> more_genfields(Fields,T)
+%     end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_name.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_name.erl
new file mode 100644
index 0000000000..1c7769998c
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_name.erl
@@ -0,0 +1,225 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_name.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+-module(asn1ct_name).
+
+%%-compile(export_all).
+-export([name_server_loop/1,
+	 start/0,
+	 stop/0,
+	 push/1,
+	 pop/1,
+	 curr/1,
+	 clear/0,
+	 delete/1,
+	 active/1,
+	 prev/1,
+	 next/1,
+	 all/1,
+	 new/1]).
+
+start() ->
+    start_server(asn1_ns, asn1ct_name,name_server_loop,[[]]).
+
+stop() -> stop_server(asn1_ns).
+
+name_server_loop(Vars) ->
+%%    io:format("name -- ~w~n",[Vars]),
+    receive
+	{From,{current,Variable}} ->
+	    From ! {asn1_ns,get_curr(Vars,Variable)},
+	    name_server_loop(Vars);
+	{From,{pop,Variable}} ->
+	    From ! {asn1_ns,done},
+	    name_server_loop(pop_var(Vars,Variable));
+	{From,{push,Variable}} ->
+	    From ! {asn1_ns,done},
+	    name_server_loop(push_var(Vars,Variable));
+	{From,{delete,Variable}} ->
+	    From ! {asn1_ns,done},
+	    name_server_loop(delete_var(Vars,Variable));
+	{From,{new,Variable}} ->
+	    From ! {asn1_ns,done},
+	    name_server_loop(new_var(Vars,Variable));
+	{From,{prev,Variable}} ->
+	    From ! {asn1_ns,get_prev(Vars,Variable)},
+	    name_server_loop(Vars);
+	{From,{next,Variable}} ->
+	    From ! {asn1_ns,get_next(Vars,Variable)},
+	    name_server_loop(Vars);
+	{From,stop} ->
+	    From ! {asn1_ns,stopped},
+	    exit(normal)
+    end.
+
+active(V) ->
+    case curr(V) of
+	nil -> false;
+	_ -> true
+    end.
+
+req(Req) ->
+    asn1_ns ! {self(), Req},
+    receive {asn1_ns, Reply} -> Reply end.
+
+pop(V) ->     req({pop,V}).
+push(V) ->         req({push,V}).
+clear() ->     req(stop), start().
+curr(V) ->     req({current,V}).
+new(V) ->      req({new,V}).
+delete(V) ->   req({delete,V}).
+prev(V) ->
+    case req({prev,V}) of
+	none ->
+	    exit('cant get prev of none');
+	Rep -> Rep
+    end.
+
+next(V) ->
+    case req({next,V}) of
+	none ->
+	    exit('cant get next of none');
+	Rep -> Rep
+    end.
+
+all(V) ->
+    Curr = curr(V),
+    if Curr == V -> [];
+	true ->
+	    lists:reverse(generate(V,last(Curr),[],0))
+    end.
+
+generate(V,Number,Res,Pos) ->
+    Ell = Pos+1,
+    if
+	Ell > Number ->
+	    Res;
+	true ->
+	    generate(V,Number,[list_to_atom(lists:concat([V,Ell]))|Res],Ell)
+    end.
+
+last(V) ->
+    last2(lists:reverse(atom_to_list(V))).
+
+last2(RevL) ->
+    list_to_integer(lists:reverse(get_digs(RevL))).
+
+
+get_digs([H|T]) ->
+    if
+	H < $9+1,
+	H > $0-1 ->
+	    [H|get_digs(T)];
+	true ->
+	    []
+    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) ->
+    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.
+
+delete_var(Vars,Variable) ->
+    case lists:keysearch(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
+    end.
+
+get_prev(Vars,Variable) ->
+    case lists:keysearch(Variable,1,Vars) of
+	false ->
+	    none;
+	{value,{Variable,[Digit|_]}} when Digit =< 1 ->
+	    Variable;
+	{value,{Variable,[Digit|_]}} when Digit > 1 ->
+	    list_to_atom(lists:concat([Variable,
+				       integer_to_list(Digit-1)]));
+	_ ->
+	    none
+    end.
+
+get_next(Vars,Variable) ->
+    case lists:keysearch(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
+    end.
+
+
+stop_server(Name) ->
+    stop_server(Name, whereis(Name)).
+stop_server(_Name, undefined) -> stopped;
+stop_server(Name, _Pid) ->
+    Name  ! {self(), stop},
+    receive {Name, _} -> stopped end.
+
+
+start_server(Name,Mod,Fun,Args) ->
+    case whereis(Name) of
+	undefined ->
+	    register(Name, spawn(Mod,Fun, Args));
+	_Pid ->
+	    already_started
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_parser.yrl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_parser.yrl
new file mode 100644
index 0000000000..b2c1d70f6e
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_parser.yrl
@@ -0,0 +1,1162 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_parser.yrl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+Nonterminals
+ModuleDefinition ModuleIdentifier DefinitiveIdentifier DefinitiveObjIdComponentList
+DefinitiveObjIdComponent TagDefault ExtensionDefault
+ModuleBody Exports SymbolsExported Imports SymbolsImported
+SymbolsFromModuleList SymbolsFromModule GlobalModuleReference AssignedIdentifier SymbolList
+Symbol Reference AssignmentList Assignment
+ExtensionAndException
+ComponentTypeLists
+Externaltypereference Externalvaluereference DefinedType DefinedValue
+AbsoluteReference ItemSpec ItemId ComponentId TypeAssignment
+ValueAssignment
+% ValueSetTypeAssignment
+ValueSet
+Type BuiltinType NamedType ReferencedType
+Value ValueNotNull BuiltinValue ReferencedValue NamedValue
+% BooleanType
+BooleanValue IntegerType NamedNumberList NamedNumber SignedNumber
+% inlined IntegerValue
+EnumeratedType
+% inlined Enumerations
+Enumeration EnumerationItem
+% inlined EnumeratedValue
+% RealType
+RealValue NumericRealValue SpecialRealValue BitStringType
+% inlined BitStringValue
+IdentifierList
+% OctetStringType
+% inlined OctetStringValue
+% NullType NullValue
+SequenceType ComponentTypeList ComponentType
+% SequenceValue SequenceOfValue
+ComponentValueList SequenceOfType
+SAndSOfValue ValueList SetType
+% SetValue SetOfValue
+SetOfType
+ChoiceType
+% AlternativeTypeList made common with ComponentTypeList
+ChoiceValue
+AnyValue
+AnyDefBy
+SelectionType
+TaggedType Tag ClassNumber Class
+% redundant TaggedValue
+% EmbeddedPDVType EmbeddedPDVValue ExternalType ExternalValue ObjectIdentifierType
+ObjectIdentifierValue ObjIdComponentList ObjIdComponent
+% NameForm NumberForm NameAndNumberForm
+CharacterStringType
+RestrictedCharacterStringValue CharacterStringList
+% CharSyms CharsDefn
+Quadruple
+% Group Plane Row Cell
+Tuple
+% TableColumn TableRow
+% UnrestrictedCharacterString
+CharacterStringValue
+% UnrestrictedCharacterStringValue
+ConstrainedType Constraint ConstraintSpec TypeWithConstraint
+ElementSetSpecs ElementSetSpec
+%GeneralConstraint
+UserDefinedConstraint UserDefinedConstraintParameter
+UserDefinedConstraintParameters
+ExceptionSpec
+ExceptionIdentification
+Unions
+UnionMark
+UElems
+Intersections
+IntersectionElements
+IntersectionMark
+IElems
+Elements
+Elems
+SubTypeElements
+Exclusions
+LowerEndpoint
+UpperEndpoint
+LowerEndValue
+UpperEndValue
+TypeConstraints NamedConstraint PresenceConstraint
+
+ParameterizedTypeAssignment
+ParameterList
+Parameters
+Parameter
+ParameterizedType
+
+% X.681
+ObjectClassAssignment ObjectClass ObjectClassDefn
+FieldSpecs FieldSpec OptionalitySpec WithSyntaxSpec
+TokenOrGroupSpecs TokenOrGroupSpec
+SyntaxList OptionalGroup RequiredToken Word
+TypeOptionalitySpec
+ValueOrObjectOptSpec
+VSetOrOSetOptSpec
+ValueOptionalitySpec
+ObjectOptionalitySpec
+ValueSetOptionalitySpec
+ObjectSetOptionalitySpec
+% X.681 chapter 15
+InformationFromObjects
+ValueFromObject
+%ValueSetFromObjects
+TypeFromObject
+%ObjectFromObject
+%ObjectSetFromObjects
+ReferencedObjects
+FieldName
+PrimitiveFieldName
+
+ObjectAssignment
+ObjectSetAssignment
+ObjectSet
+ObjectSetElements
+Object
+ObjectDefn
+DefaultSyntax
+DefinedSyntax
+FieldSettings
+FieldSetting
+DefinedSyntaxTokens
+DefinedSyntaxToken
+Setting
+DefinedObject
+ObjectFromObject
+ObjectSetFromObjects
+ParameterizedObject
+ExternalObjectReference
+DefinedObjectSet
+DefinedObjectClass
+ExternalObjectClassReference
+
+% X.682
+TableConstraint
+ComponentRelationConstraint
+ComponentIdList
+
+% X.683
+ActualParameter
+.
+
+%UsefulType.
+
+Terminals
+'ABSENT' 'ABSTRACT-SYNTAX' 'ALL' 'ANY'
+'APPLICATION' 'AUTOMATIC' 'BEGIN' 'BIT'
+'BOOLEAN' 'BY' 'CHARACTER' 'CHOICE' 'CLASS' 'COMPONENT'
+'COMPONENTS' 'CONSTRAINED' 'DEFAULT' 'DEFINED' 'DEFINITIONS'
+'EMBEDDED' 'END' 'ENUMERATED' 'EXCEPT' 'EXPLICIT'
+'EXPORTS' 'EXTENSIBILITY' 'EXTERNAL' 'FALSE' 'FROM' 'GeneralizedTime'
+'TYPE-IDENTIFIER'
+'IDENTIFIER' 'IMPLICIT' 'IMPLIED' 'IMPORTS'
+'INCLUDES' 'INSTANCE' 'INTEGER' 'INTERSECTION'
+'MAX' 'MIN' 'MINUS-INFINITY' 'NULL'
+'OBJECT' 'ObjectDescriptor' 'OCTET' 'OF' 'OPTIONAL' 'PDV' 'PLUS-INFINITY'
+'PRESENT' 'PRIVATE' 'REAL' 'SEQUENCE' 'SET' 'SIZE'
+'STRING' 'SYNTAX' 'TAGS' 'TRUE' 'UNION'
+'UNIQUE' 'UNIVERSAL' 'UTCTime' 'WITH'
+'{' '}' '(' ')' '.' '::=' ';' ',' '@' '*' '-' '[' ']'
+'!' '..' '...' '|' '<' ':' '^'
+number identifier typereference restrictedcharacterstringtype
+bstring hstring cstring typefieldreference valuefieldreference
+objectclassreference word.
+
+Rootsymbol ModuleDefinition.
+Endsymbol '$end'.
+
+Left 300 'EXCEPT'.
+Left 200 '^'.
+Left 200 'INTERSECTION'.
+Left 100 '|'.
+Left 100 'UNION'.
+
+
+ModuleDefinition -> ModuleIdentifier
+	'DEFINITIONS'
+	TagDefault
+	ExtensionDefault
+	'::='
+	'BEGIN'
+	ModuleBody
+	'END' :
+		{'ModuleBody',Ex,Im,Types} = '$7',
+		{{typereference,Pos,Name},Defid} = '$1',
+		#module{
+			pos= Pos,
+			name= Name,
+			defid= Defid,
+			tagdefault='$3',
+			extensiondefault='$4',
+			exports=Ex,
+			imports=Im,
+			typeorval=Types}.
+%	{module, '$1','$3','$6'}.
+% Results always in a record of type module defined in asn_records.hlr
+
+ModuleIdentifier -> typereference DefinitiveIdentifier :
+	put(asn1_module,'$1'#typereference.val),
+	{'$1','$2'}.
+
+DefinitiveIdentifier -> '{' DefinitiveObjIdComponentList '}' : '$2' .
+DefinitiveIdentifier -> '$empty': [].
+
+DefinitiveObjIdComponentList -> DefinitiveObjIdComponent : ['$1'].
+DefinitiveObjIdComponentList -> DefinitiveObjIdComponent DefinitiveObjIdComponentList : ['$1'|'$2'].
+
+DefinitiveObjIdComponent -> identifier : '$1' . %expanded->
+% DefinitiveObjIdComponent -> NameForm : '$1' .
+DefinitiveObjIdComponent -> number : '$1' . %expanded->
+% DefinitiveObjIdComponent -> DefinitiveNumberForm : 'fix' .
+DefinitiveObjIdComponent -> identifier '(' number ')' : {'$1','$3'} . %expanded->
+% DefinitiveObjIdComponent -> DefinitiveNameAndNumberForm  : {'$1','$3'} .
+
+% DefinitiveNumberForm -> number : 'fix' .
+
+% DefinitiveNameAndNumberForm -> identifier '(' DefinitiveNumberForm ')' : 'fix' .
+
+TagDefault -> 'EXPLICIT' 'TAGS' : put(tagdefault,'EXPLICIT'),'EXPLICIT' .
+TagDefault -> 'IMPLICIT' 'TAGS' : put(tagdefault,'IMPLICIT'),'IMPLICIT' .
+TagDefault -> 'AUTOMATIC' 'TAGS' : put(tagdefault,'AUTOMATIC'),'AUTOMATIC' .
+TagDefault -> '$empty': put(tagdefault,'EXPLICIT'),'EXPLICIT'. % because this is the default
+
+ExtensionDefault -> 'EXTENSIBILITY' 'IMPLIED' : 'IMPLIED'.
+ExtensionDefault -> '$empty' : 'false'. % because this is the default
+
+ModuleBody -> Exports Imports AssignmentList : {'ModuleBody','$1','$2','$3'}.
+ModuleBody -> '$empty' : {'ModuleBody',nil,nil,[]}.
+
+Exports -> 'EXPORTS' SymbolList ';' : {exports,'$2'}.
+Exports -> 'EXPORTS'  ';' : {exports,[]}.
+Exports -> '$empty' : {exports,all} .
+
+% inlined above SymbolsExported -> SymbolList : '$1'.
+% inlined above SymbolsExported -> '$empty' : [].
+
+Imports -> 'IMPORTS' SymbolsFromModuleList ';' : {imports,'$2'}.
+Imports -> 'IMPORTS'  ';' : {imports,[]}.
+Imports -> '$empty' : {imports,[]} .
+
+% inlined above SymbolsImported -> SymbolsFromModuleList : '$1'.
+% inlined above SymbolsImported -> '$empty' : [].
+
+SymbolsFromModuleList -> SymbolsFromModule :['$1'].
+% SymbolsFromModuleList -> SymbolsFromModuleList SymbolsFromModule :$1.%changed
+SymbolsFromModuleList -> SymbolsFromModule SymbolsFromModuleList :['$1'|'$2'].
+
+% expanded SymbolsFromModule -> SymbolList 'FROM' GlobalModuleReference : #'SymbolsFromModule'{symbols = '$1',module='$3'}.
+SymbolsFromModule -> SymbolList 'FROM' typereference : #'SymbolsFromModule'{symbols = '$1',module='$3'}.
+SymbolsFromModule -> SymbolList 'FROM' typereference '{' ValueList '}': #'SymbolsFromModule'{symbols = '$1',module='$3'}.
+%SymbolsFromModule -> SymbolList 'FROM' typereference identifier: #'SymbolsFromModule'{symbols = '$1',module='$3'}.
+%SymbolsFromModule -> SymbolList 'FROM' typereference Externalvaluereference: #'SymbolsFromModule'{symbols = '$1',module='$3'}.
+%SymbolsFromModule -> SymbolList 'FROM' typereference DefinedValue: #'SymbolsFromModule'{symbols = '$1',module='$3'}.
+
+% inlined GlobalModuleReference -> typereference AssignedIdentifier : {'$1','$2'} .
+
+% inlined above AssignedIdentifier -> '{' ValueList '}' : '$2'.
+% replaced AssignedIdentifier -> '{' DefinedValue ObjIdComponentList '}' :{'$2','$3'}.
+% not necessary , replaced by SAndSOfValue AssignedIdentifier -> ObjectIdentifierValue :'$1'.
+% AssignedIdentifier -> DefinedValue : '$1'.
+% inlined AssignedIdentifier -> '$empty' : undefined.
+
+SymbolList -> Symbol : ['$1'].
+SymbolList -> Symbol ',' SymbolList :['$1'|'$3'].
+
+Symbol -> Reference :'$1'.
+% later Symbol -> ParameterizedReference :'$1'.
+
+Reference -> typereference :'$1'.
+Reference -> identifier:'$1'.
+Reference -> typereference '{' '}':'$1'.
+Reference -> Externaltypereference '{' '}':'$1'.
+
+% later Reference -> objectclassreference :'$1'.
+% later Reference -> objectreference :'$1'.
+% later Reference -> objectsetreference :'$1'.
+
+AssignmentList -> Assignment : ['$1'].
+% modified AssignmentList -> AssignmentList Assignment : '$1'.
+AssignmentList -> Assignment AssignmentList : ['$1'|'$2'].
+
+Assignment -> TypeAssignment : '$1'.
+Assignment -> ValueAssignment : '$1'.
+% later Assignment -> ValueSetTypeAssignment : '$1'.
+Assignment -> ObjectClassAssignment : '$1'.
+% later Assignment -> ObjectAssignment : '$1'.
+% combined with ValueAssignment Assignment -> ObjectAssignment : '$1'.
+Assignment -> ObjectSetAssignment : '$1'.
+Assignment -> ParameterizedTypeAssignment : '$1'.
+%Assignment -> ParameterizedValueAssignment : '$1'.
+%Assignment -> ParameterizedValueSetTypeAssignment : '$1'.
+%Assignment -> ParameterizedObjectClassAssignment : '$1'.
+
+ObjectClassAssignment -> typereference '::=' 'CLASS' '{' FieldSpecs '}' :
+%ObjectClassAssignment -> objectclassreference '::=' 'CLASS' '{' FieldSpecs '}' :
+	#typedef{pos=element(2,'$1'),name=element(3,'$1'),typespec={'CLASS','$5',[]}}.
+ObjectClassAssignment -> typereference '::=' 'CLASS' '{' FieldSpecs '}' WithSyntaxSpec :
+%ObjectClassAssignment -> objectclassreference '::=' 'CLASS' '{' FieldSpecs '}' WithSyntaxSpec :
+	#typedef{pos=element(2,'$1'),name=element(3,'$1'),typespec={'CLASS','$5','$7'}}.
+
+FieldSpecs -> FieldSpec : ['$1'].
+FieldSpecs -> FieldSpec ',' FieldSpecs : ['$1'|'$3'].
+
+FieldSpec -> typefieldreference TypeOptionalitySpec : {typefield,'$1','$2'}.
+
+FieldSpec -> valuefieldreference Type 'UNIQUE' ValueOrObjectOptSpec :
+	{fixedtypevaluefield,'$1','$2','UNIQUE','$4'}.
+FieldSpec -> valuefieldreference Type ValueOrObjectOptSpec :
+	{fixedtypevaluefield,'$1','$2',undefined,'$3'}.
+
+FieldSpec -> valuefieldreference typefieldreference ValueOrObjectOptSpec :
+        {variabletypevaluefield, '$1','$2','$3'}.
+
+FieldSpec -> typefieldreference typefieldreference VSetOrOSetOptSpec :
+        {variabletypevaluesetfield, '$1','$2','$3'}.
+
+FieldSpec -> typefieldreference Type VSetOrOSetOptSpec :
+        {fixedtypevaluesetfield, '$1','$2','$3'}.
+
+TypeOptionalitySpec -> 'DEFAULT' Type : {'DEFAULT','$2'}.
+TypeOptionalitySpec -> 'OPTIONAL' : 'OPTIONAL'.
+TypeOptionalitySpec -> '$empty' : 'MANDATORY'.
+
+ValueOrObjectOptSpec -> ValueOptionalitySpec : '$1'.
+ValueOrObjectOptSpec -> ObjectOptionalitySpec : '$1'.
+ValueOrObjectOptSpec -> 'OPTIONAL' : 'OPTIONAL'.
+ValueOrObjectOptSpec -> '$empty' : 'MANDATORY'.
+
+ValueOptionalitySpec -> 'DEFAULT' Value :
+	case '$2' of
+	{identifier,_,Id} -> {'DEFAULT',Id};
+	_ -> {'DEFAULT','$2'}
+	end.
+
+%ObjectOptionalitySpec -> 'DEFAULT' Object :{'DEFAULT','$1'}.
+ObjectOptionalitySpec -> 'DEFAULT'  '{' FieldSetting ',' FieldSettings '}' :
+        {'DEFAULT',{object,['$2'|'$4']}}.
+ObjectOptionalitySpec -> 'DEFAULT'  '{' FieldSetting '}' :
+        {'DEFAULT',{object, ['$2']}}.
+%ObjectOptionalitySpec -> 'DEFAULT'  '{' DefinedSyntaxTokens '}' :
+%        {'DEFAULT',{object, '$2'}}.
+ObjectOptionalitySpec -> 'DEFAULT'  ObjectFromObject :
+        {'DEFAULT',{object, '$2'}}.
+
+
+VSetOrOSetOptSpec -> ValueSetOptionalitySpec : '$1'.
+%VSetOrOSetOptSpec -> ObjectSetOptionalitySpec : '$1'.
+VSetOrOSetOptSpec -> 'OPTIONAL' : 'OPTIONAL'.
+VSetOrOSetOptSpec -> '$empty' : 'MANDATORY'.
+
+ValueSetOptionalitySpec -> 'DEFAULT' ValueSet : {'DEFAULT','$1'}.
+
+%ObjectSetOptionalitySpec -> 'DEFAULT' ObjectSet : {'DEFAULT','$1'}.
+
+OptionalitySpec -> 'DEFAULT' Type : {'DEFAULT','$2'}.
+OptionalitySpec -> 'DEFAULT' ValueNotNull :
+	case '$2' of
+	{identifier,_,Id} -> {'DEFAULT',Id};
+	_ -> {'DEFAULT','$2'}
+	end.
+OptionalitySpec -> 'OPTIONAL' : 'OPTIONAL'.
+OptionalitySpec -> '$empty' : 'MANDATORY'.
+
+WithSyntaxSpec -> 'WITH' 'SYNTAX' SyntaxList : {'WITH SYNTAX','$3'}.
+
+SyntaxList -> '{' TokenOrGroupSpecs '}' : '$2'.
+SyntaxList -> '{' '}' : [].
+
+TokenOrGroupSpecs -> TokenOrGroupSpec : ['$1'].
+TokenOrGroupSpecs -> TokenOrGroupSpec TokenOrGroupSpecs : ['$1'|'$2'].
+
+TokenOrGroupSpec -> RequiredToken : '$1'.
+TokenOrGroupSpec -> OptionalGroup : '$1'.
+
+OptionalGroup -> '[' TokenOrGroupSpecs ']' : '$2'.
+
+RequiredToken -> typereference : '$1'.
+RequiredToken -> Word : '$1'.
+RequiredToken -> ',' : '$1'.
+RequiredToken -> PrimitiveFieldName : '$1'.
+
+Word -> 'BY' : 'BY'.
+
+ParameterizedTypeAssignment -> typereference ParameterList '::=' Type :
+	#ptypedef{pos=element(2,'$1'),name=element(3,'$1'),
+	args='$2', typespec='$4'}.
+
+ParameterList -> '{' Parameters '}':'$2'.
+
+Parameters -> Parameter: ['$1'].
+Parameters -> Parameter ',' Parameters: ['$1'|'$3'].
+
+Parameter -> typereference: '$1'.
+Parameter -> Value: '$1'.
+Parameter -> Type ':' typereference: {'$1','$3'}.
+Parameter -> Type ':' Value: {'$1','$3'}.
+Parameter -> '{' typereference '}': {objectset,'$2'}.
+
+
+% Externaltypereference -> modulereference '.' typereference : {'$1','$3'} .
+Externaltypereference -> typereference '.' typereference : #'Externaltypereference'{pos=element(2,'$1'),module=element(3,'$1'),type=element(3,'$3')}.
+
+% Externalvaluereference -> modulereference '.' valuereference : {'$1','$3'} .
+% inlined Externalvaluereference -> typereference '.' identifier : #'Externalvaluereference'{pos=element(2,'$1'),module=element(3,'$1'),value=element(3,'$3')}.
+
+
+DefinedType -> Externaltypereference : '$1' .
+DefinedType -> typereference :
+	#'Externaltypereference'{pos='$1'#typereference.pos,
+				module= get(asn1_module),
+				type= '$1'#typereference.val} .
+DefinedType -> typereference ParameterList : {pt,'$1','$2'}.
+DefinedType -> Externaltypereference ParameterList : {pt,'$1','$2'}.
+
+% ActualParameterList -> '{' ActualParameters '}' : '$1'.
+
+% ActualParameters -> ActualParameter : ['$1'].
+% ActualParameters -> ActualParameter ',' ActualParameters : ['$1'|'$3'].
+
+ActualParameter -> Type : '$1'.
+ActualParameter -> ValueNotNull : '$1'.
+ActualParameter -> ValueSet : '$1'.
+% later DefinedType -> ParameterizedType : '$1' .
+% later DefinedType -> ParameterizedValueSetType : '$1' .
+
+% inlined DefinedValue -> Externalvaluereference :'$1'.
+% inlined DefinedValue -> identifier :'$1'.
+% later DefinedValue -> ParameterizedValue :'$1'.
+
+% not referenced yet AbsoluteReference -> '@' GlobalModuleReference '.' ItemSpec :{'$2','$4'}.
+
+% not referenced yet ItemSpec -> typereference :'$1'.
+% not referenced yet ItemSpec -> ItemId '.' ComponentId : {'$1','$3'}.
+
+% not referenced yet ItemId -> ItemSpec : '$1'.
+
+% not referenced yet ComponentId -> identifier :'$1'.
+% not referenced yet ComponentId -> number :'$1'.
+% not referenced yet ComponentId -> '*' :'$1'.
+
+TypeAssignment -> typereference '::=' Type :
+	#typedef{pos=element(2,'$1'),name=element(3,'$1'),typespec='$3'}.
+
+ValueAssignment -> identifier Type '::=' Value :
+	#valuedef{pos=element(2,'$1'),name=element(3,'$1'),type='$2',value='$4'}.
+
+% later ValueSetTypeAssignment -> typereference Type '::=' ValueSet :{'ValueSetTypeAssignment','$1','$2','$4'}.
+
+
+ValueSet -> '{' ElementSetSpec '}' : {valueset,'$2'}.
+
+% record(type,{tag,def,constraint}).
+Type -> BuiltinType :#type{def='$1'}.
+Type -> 'NULL' :#type{def='NULL'}.
+Type -> TaggedType:'$1'.
+Type -> ReferencedType:#type{def='$1'}. % change notag later
+Type -> ConstrainedType:'$1'.
+
+%ANY is here for compatibility with the old ASN.1 standard from 1988
+BuiltinType -> 'ANY' AnyDefBy:
+	case '$2' of
+		[] -> 'ANY';
+	        _ -> {'ANY DEFINED BY','$2'}
+        end.
+BuiltinType -> BitStringType :'$1'.
+BuiltinType -> 'BOOLEAN' :element(1,'$1').
+BuiltinType -> CharacterStringType :'$1'.
+BuiltinType -> ChoiceType :'$1'.
+BuiltinType -> 'EMBEDDED' 'PDV' :'EMBEDDED PDV'.
+BuiltinType -> EnumeratedType :'$1'.
+BuiltinType -> 'EXTERNAL' :element(1,'$1').
+% later BuiltinType -> InstanceOfType :'$1'.
+BuiltinType -> IntegerType :'$1'.
+% BuiltinType -> 'NULL' :element(1,'$1').
+% later BuiltinType -> ObjectClassFieldType :'$1'.
+BuiltinType -> 'OBJECT' 'IDENTIFIER' :'OBJECT IDENTIFIER'.
+BuiltinType -> 'OCTET' 'STRING' :'OCTET STRING'.
+BuiltinType -> 'REAL' :element(1,'$1').
+BuiltinType -> SequenceType :'$1'.
+BuiltinType -> SequenceOfType :'$1'.
+BuiltinType -> SetType :'$1'.
+BuiltinType -> SetOfType :'$1'.
+% The so called Useful types
+BuiltinType -> 'GeneralizedTime': 'GeneralizedTime'.
+BuiltinType -> 'UTCTime' :'UTCTime'.
+BuiltinType -> 'ObjectDescriptor' : 'ObjectDescriptor'.
+
+% moved BuiltinType -> TaggedType :'$1'.
+
+
+AnyDefBy -> 'DEFINED' 'BY' identifier: '$3'.
+AnyDefBy -> '$empty': [].
+
+NamedType -> identifier Type :
+%{_,Pos,Val} = '$1',
+%{'NamedType',Pos,{Val,'$2'}}.
+V1 = '$1',
+{'NamedType',V1#identifier.pos,{V1#identifier.val,'$2'}}.
+NamedType -> SelectionType :'$1'.
+
+ReferencedType -> DefinedType : '$1'.
+% redundant ReferencedType -> UsefulType : 'fix'.
+ReferencedType -> SelectionType : '$1'.
+ReferencedType -> TypeFromObject : '$1'.
+% later ReferencedType -> ValueSetFromObjects : 'fix'.
+
+% to much conflicts Value -> AnyValue :'$1'.
+Value -> ValueNotNull : '$1'.
+Value -> 'NULL' :element(1,'$1').
+
+ValueNotNull -> BuiltinValue :'$1'.
+% inlined Value -> DefinedValue :'$1'. % DefinedValue , identifier
+% inlined Externalvaluereference -> Externalvaluereference :'$1'.
+ValueNotNull -> typereference '.' identifier :
+	#'Externalvaluereference'{pos=element(2,'$1'),module=element(3,'$1'),
+	value=element(3,'$3')}.
+ValueNotNull -> identifier :'$1'.
+
+
+%tmp Value -> NamedNumber: '$1'. % not a value but part of ObjIdC
+% redundant BuiltinValue -> BitStringValue :'$1'.
+BuiltinValue -> BooleanValue :'$1'.
+BuiltinValue -> CharacterStringValue :'$1'.
+BuiltinValue -> ChoiceValue :'$1'.
+% BuiltinValue -> EmbeddedPDVValue :'$1'. ==SequenceValue
+% BuiltinValue -> EnumeratedValue :'$1'. identifier
+% BuiltinValue -> ExternalValue :'$1'. ==SequenceValue
+% later BuiltinValue -> InstanceOfValue :'$1'.
+BuiltinValue -> SignedNumber :'$1'.
+% BuiltinValue -> 'NULL' :'$1'.
+% later BuiltinValue -> ObjectClassFieldValue :'$1'.
+% replaced by SAndSOfValue BuiltinValue -> ObjectIdentifierValue :'$1'.
+BuiltinValue -> bstring :element(3,'$1').
+BuiltinValue -> hstring :element(3,'$1').
+% conflict BuiltinValue -> RealValue :'$1'.
+BuiltinValue -> SAndSOfValue :'$1'.
+% replaced BuiltinValue -> SequenceOfValue :'$1'.
+% replaced BuiltinValue -> SequenceValue :'$1'.
+% replaced BuiltinValue -> SetValue :'$1'.
+% replaced BuiltinValue -> SetOfValue :'$1'.
+% conflict redundant BuiltinValue -> TaggedValue :'$1'.
+
+% inlined ReferencedValue -> DefinedValue:'$1'.
+% ReferencedValue -> Externalvaluereference:'$1'.
+% ReferencedValue -> identifier :'$1'.
+% later ReferencedValue -> ValueFromObject:'$1'.
+
+% inlined BooleanType -> BOOLEAN :'BOOLEAN'.
+
+% to much conflicts AnyValue -> Type ':' Value : {'ANYVALUE',{'$1','$3'}}.
+
+BooleanValue -> TRUE :true.
+BooleanValue -> FALSE :false.
+
+IntegerType -> 'INTEGER' : 'INTEGER'.
+IntegerType -> 'INTEGER' '{' NamedNumberList '}' : {'INTEGER','$3'}.
+
+NamedNumberList -> NamedNumber :['$1'].
+% modified NamedNumberList -> NamedNumberList ',' NamedNumber :'fix'.
+NamedNumberList -> NamedNumber ',' NamedNumberList :['$1'|'$3'].
+
+NamedNumber -> identifier '(' SignedNumber ')' : {'NamedNumber',element(3,'$1'),'$3'}.
+NamedNumber -> identifier '(' typereference '.' identifier ')' : {'NamedNumber',element(3,'$1'),{'ExternalValue',element(3,'$3'),element(3,'$5')}}.
+NamedNumber -> identifier '(' identifier ')' : {'NamedNumber',element(3,'$1'),element(3,'$3')}.
+
+%NamedValue -> identifier Value :
+%	{'NamedValue',element(2,'$1'),element(3,'$1'),'$2'}.
+
+
+SignedNumber -> number : element(3,'$1').
+SignedNumber -> '-' number : - element(3,'$1').
+
+% inlined IntegerValue -> SignedNumber :'$1'.
+% conflict moved to Value IntegerValue -> identifier:'$1'.
+
+EnumeratedType -> ENUMERATED '{' Enumeration '}' :{'ENUMERATED','$3'}.
+
+% inlined Enumerations -> Enumeration :{'$1','false',[]}.
+% inlined Enumerations -> Enumeration ',' '...' : {'$1','true',[]}.
+% inlined Enumerations -> Enumeration ',' '...' ',' Enumeration : {'$1','true','$5'}.
+
+Enumeration -> EnumerationItem :['$1'].
+% modified Enumeration -> EnumerationItem ',' Enumeration :'fix'.
+Enumeration -> EnumerationItem ',' Enumeration :['$1'|'$3'].
+
+EnumerationItem -> identifier:element(3,'$1').
+EnumerationItem -> NamedNumber :'$1'.
+EnumerationItem -> '...' :'EXTENSIONMARK'.
+
+% conflict moved to Value EnumeratedValue -> identifier:'$1'.
+
+% inlined RealType -> REAL:'REAL'.
+
+RealValue -> NumericRealValue :'$1'.
+RealValue -> SpecialRealValue:'$1'.
+
+% ?? NumericRealValue -> number:'$1'. % number MUST BE '0'
+NumericRealValue -> SAndSOfValue : '$1'. % Value of the associated sequence type
+
+SpecialRealValue -> 'PLUS-INFINITY' :'$1'.
+SpecialRealValue -> 'MINUS-INFINITY' :'$1'.
+
+BitStringType -> 'BIT' 'STRING' :{'BIT STRING',[]}.
+BitStringType -> 'BIT' 'STRING' '{' NamedNumberList '}' :{'BIT STRING','$4'}.
+% NamedBitList replaced by NamedNumberList to reduce the grammar
+% Must check later that all "numbers" are positive
+
+% inlined BitStringValue -> bstring:'$1'.
+% inlined BitStringValue -> hstring:'$1'.
+% redundant use SequenceValue BitStringValue -> '{' IdentifierList '}' :$2.
+% redundant use SequenceValue BitStringValue -> '{' '}' :'fix'.
+
+IdentifierList -> identifier :[element(3,'$1')].
+% modified IdentifierList -> IdentifierList ',' identifier :'$1'.
+IdentifierList -> identifier ',' IdentifierList :[element(3,'$1')|'$3'].
+
+% inlined OctetStringType -> 'OCTET' 'STRING' :'OCTET STRING'.
+
+% inlined OctetStringValue -> bstring:'$1'.
+% inlined OctetStringValue -> hstring:'$1'.
+
+% inlined NullType -> 'NULL':'NULL'.
+
+% inlined NullValue -> NULL:'NULL'.
+
+% result is {'SEQUENCE',Optionals,Extensionmark,Componenttypelist}.
+SequenceType -> SEQUENCE '{' ComponentTypeList '}' :{'SEQUENCE','$3'}.
+% SequenceType -> SEQUENCE '{' ComponentTypeLists '}' :{'SEQUENCE','$3'}.
+% SequenceType -> SEQUENCE '{' ExtensionAndException '}' :{'SEQUENCE','$3'}.
+SequenceType -> SEQUENCE '{' '}' :{'SEQUENCE',[]}.
+
+% result is {RootComponentList,ExtensionAndException,AdditionalComponentTypeList}.
+%ComponentTypeLists -> ComponentTypeList ',' ExtensionAndException :{'$1','$3',[]}.
+%ComponentTypeLists -> ComponentTypeList :{'$1','false',[]}.
+%ComponentTypeLists -> ComponentTypeList ',' ExtensionAndException
+%	',' ComponentTypeList :{'$1','$3', '$5'}.
+%ComponentTypeLists -> ExtensionAndException ',' ComponentTypeList :{[],'$1','$3'}.
+
+ComponentTypeList -> ComponentType :['$1'].
+% modified below ComponentTypeList -> ComponentTypeList ',' ComponentType :'$1'.
+ComponentTypeList -> ComponentType ',' ComponentTypeList  :['$1'|'$3'].
+
+% -record('ComponentType',{pos,name,type,attrib}).
+ComponentType -> '...' ExceptionSpec :{'EXTENSIONMARK',element(2,'$1'),'$2'}.
+ComponentType -> NamedType :
+	{'NamedType',Pos,{Name,Type}} = '$1',
+	#'ComponentType'{pos=Pos,name=Name,typespec=Type,prop=mandatory}.
+ComponentType -> NamedType 'OPTIONAL' :
+	{'NamedType',Pos,{Name,Type}} = '$1',
+	#'ComponentType'{pos=Pos,name=Name,typespec=Type,prop='OPTIONAL'}.
+ComponentType -> NamedType 'DEFAULT' Value:
+	{'NamedType',Pos,{Name,Type}} = '$1',
+	#'ComponentType'{pos=Pos,name=Name,typespec=Type,prop={'DEFAULT','$3'}}.
+ComponentType -> 'COMPONENTS' 'OF' Type :{'COMPONENTS OF','$3'}.
+
+% redundant ExtensionAndException -> '...' : extensionmark.
+% ExtensionAndException -> '...' ExceptionSpec : {extensionmark,'$2'}.
+
+% replaced SequenceValue -> '{' ComponentValueList '}':'$2'.
+% replaced SequenceValue -> '{'  '}':[].
+
+ValueList -> Value :['$1'].
+ValueList -> NamedNumber :['$1'].
+% modified ValueList -> ValueList ',' Value :'$1'.
+ValueList -> Value ',' ValueList :['$1'|'$3'].
+ValueList -> Value ',' '...' :['$1' |[]].
+ValueList -> Value ValueList : ['$1',space|'$2'].
+ValueList -> NamedNumber ValueList: ['$1',space|'$2'].
+
+%ComponentValueList -> identifier ObjIdComponent:[{'NamedValue','$1','$2'}].
+%ComponentValueList -> NamedValue :['$1'].
+%ComponentValueList -> NamedValue ',' ComponentValueList:['$1'|'$3'].
+%ComponentValueList -> identifier ObjIdComponent ',' ComponentValueList :[{'NamedValue', '$1','$2'}|'$4'].
+
+SequenceOfType -> SEQUENCE OF Type : {'SEQUENCE OF','$3'}.
+
+% replaced SequenceOfValue with SAndSOfValue
+
+SAndSOfValue -> '{' ValueList '}' :'$2'.
+%SAndSOfValue -> '{' ComponentValueList '}' :'$2'.
+SAndSOfValue -> '{'  '}' :[].
+
+% save for later SetType ->
+% result is {'SET',Optionals,Extensionmark,Componenttypelist}.
+SetType -> SET '{' ComponentTypeList '}' :{'SET','$3'}.
+% SetType -> SET '{' ExtensionAndException '}' :{'SET','$3'}.
+SetType -> SET '{' '}' :{'SET',[]}.
+
+% replaced SetValue with SAndSOfValue
+
+SetOfType -> SET OF Type : {'SET OF','$3'}.
+
+% replaced SetOfValue with SAndSOfValue
+
+ChoiceType -> 'CHOICE' '{' ComponentTypeList '}' :{'CHOICE','$3'}.
+%  AlternativeTypeList is replaced by ComponentTypeList
+ChoiceValue -> identifier ':' Value : {'ChoiceValue',element(3,'$1'),'$3'}.
+% save for later SelectionType ->
+
+TaggedType -> Tag Type : '$2'#type{tag=['$1'#tag{type={default,get(tagdefault)}}]}.
+TaggedType -> Tag IMPLICIT Type :'$3'#type{tag=['$1'#tag{type='IMPLICIT'}]}.
+TaggedType -> Tag EXPLICIT Type :'$3'#type{tag=['$1'#tag{type='EXPLICIT'}]}.
+
+Tag -> '[' Class ClassNumber ']': #tag{class='$2',number='$3'}.
+Tag -> '[' Class typereference '.' identifier ']':
+	#tag{class='$2',number=#'Externalvaluereference'{pos=element(2,'$3'),module=element(3,'$3'),
+	value=element(3,'$5')}}.
+Tag -> '[' Class number ']': #tag{class='$2',number=element(3,'$3')}.
+Tag -> '[' Class identifier ']': #tag{class='$2',number=element(3,'$3')}.
+
+ClassNumber -> number :element(3,'$1').
+% inlined above ClassNumber -> typereference '.' identifier :{'Externalvaluereference',element(3,'$1'),element(3,'$3')}.
+ClassNumber -> identifier :element(3,'$1').
+
+Class -> 'UNIVERSAL' :element(1,'$1').
+Class -> 'APPLICATION' :element(1,'$1').
+Class -> 'PRIVATE' :element(1,'$1').
+Class -> '$empty' :'CONTEXT'.
+
+% conflict redundant TaggedValue -> Value:'$1'.
+
+% inlined EmbeddedPDVType -> 'EMBEDDED' 'PDV' :'EMBEDDED PDV'.
+
+% inlined EmbeddedPDVValue -> SequenceValue:'$1'.
+
+% inlined ExternalType -> 'EXTERNAL' :'EXTERNAL'.
+
+% inlined ExternalValue -> SequenceValue :'$1'.
+
+% inlined ObjectIdentifierType -> 'OBJECT' 'IDENTIFIER' :'OBJECT IDENTIFIER'.
+
+ObjectIdentifierValue -> '{' ObjIdComponentList '}' :'$2'.
+%  inlined ObjectIdentifierValue -> SequenceAndSequenceOfValue :'$1'.
+% ObjectIdentifierValue -> '{' identifier ObjIdComponentList '}' :{'ObjectIdentifierValue','$2','$3'}.
+% ObjectIdentifierValue -> '{' typereference '.' identifier ObjIdComponentList '}' :{'ObjectIdentifierValue',{'$2','$4'},'$5'}.
+
+ObjIdComponentList -> Value:'$1'.
+ObjIdComponentList -> Value ObjIdComponentList :['$1'|'$2'].
+%ObjIdComponentList -> DefinedValue:'$1'.
+%ObjIdComponentList -> number:'$1'.
+%ObjIdComponentList -> DefinedValue ObjIdComponentList :['$1'|'$2'].
+%ObjIdComponentList -> number ObjIdComponentList :['$1'|'$2'].
+%ObjIdComponentList -> ObjIdComponent ObjIdComponentList :['$1'|'$2'].
+%ObjIdComponentList -> ObjIdComponent ObjIdComponentList :['$1'|'$2'].
+
+% redundant ObjIdComponent -> NameForm :'$1'. % expanded
+% replaced by 2 ObjIdComponent -> NumberForm :'$1'.
+% ObjIdComponent -> number :'$1'.
+% ObjIdComponent -> DefinedValue :'$1'. % means DefinedValue
+% ObjIdComponent -> NameAndNumberForm :'$1'.
+% ObjIdComponent -> NamedNumber :'$1'.
+% NamedBit replaced by NamedNumber to reduce grammar
+% must check later that "number" is positive
+
+% NameForm -> identifier:'$1'.
+
+% inlined NumberForm -> number :'$1'.
+% inlined NumberForm -> DefinedValue :'$1'.
+
+% replaced by NamedBit  NameAndNumberForm -> identifier '(' NumberForm ')'.
+% NameAndNumberForm -> NamedBit:'$1'.
+
+
+CharacterStringType -> restrictedcharacterstringtype :element(3,'$1').
+CharacterStringType -> 'CHARACTER' 'STRING' :'CHARACTER STRING'.
+
+RestrictedCharacterStringValue -> cstring :element(3, '$1').
+% modified below RestrictedCharacterStringValue -> CharacterStringList :'$1'.
+% conflict vs BuiltinValue RestrictedCharacterStringValue -> SequenceAndSequenceOfValue :'$1'.
+RestrictedCharacterStringValue -> Quadruple :'$1'.
+RestrictedCharacterStringValue -> Tuple :'$1'.
+
+% redundant CharacterStringList -> '{' ValueList '}' :'$2'. % modified
+
+% redundant CharSyms -> CharsDefn :'$1'.
+% redundant CharSyms -> CharSyms ',' CharsDefn :['$1'|'$3'].
+
+% redundant CharsDefn -> cstring :'$1'.
+% temporary replaced see below CharsDefn -> DefinedValue :'$1'.
+% redundant CharsDefn -> Value :'$1'.
+
+Quadruple -> '{' number ',' number ',' number ',' number '}' :{'Quadruple','$2','$4','$6','$8'}.
+% {Group,Plane,Row,Cell}
+
+Tuple -> '{' number ',' number '}' :{'Tuple', '$2','$4'}.
+% {TableColumn,TableRow}
+
+% inlined UnrestrictedCharacterString -> 'CHARACTER' 'STRING' :'CHARACTER STRING'.
+
+CharacterStringValue -> RestrictedCharacterStringValue :'$1'.
+% conflict vs BuiltinValue CharacterStringValue -> SequenceValue :'$1'. % UnrestrictedCharacterStringValue
+
+% inlined UsefulType -> typereference :'$1'.
+
+SelectionType -> identifier '<' Type : {'SelectionType',element(3,'$1'),'$3'}.
+
+ConstrainedType -> Type Constraint :
+	'$1'#type{constraint=merge_constraints(['$2'])}.
+ConstrainedType -> Type Constraint Constraint :
+	'$1'#type{constraint=merge_constraints(['$2','$3'])}.
+ConstrainedType -> Type Constraint Constraint Constraint:
+	'$1'#type{constraint=merge_constraints(['$2','$3','$4'])}.
+ConstrainedType -> Type Constraint Constraint Constraint Constraint:
+	'$1'#type{constraint=merge_constraints(['$2','$3','$4','$5'])}.
+%ConstrainedType -> Type Constraint :'$1'#type{constraint='$2'}.
+%ConstrainedType -> Type Constraint :'$1'#type{constraint='$2'}.
+ConstrainedType -> TypeWithConstraint :'$1'.
+
+TypeWithConstraint -> 'SET' Constraint 'OF' Type :
+	#type{def = {'SET OF','$4'},constraint=merge_constraints(['$2'])}.
+TypeWithConstraint -> 'SET' 'SIZE' Constraint 'OF' Type :
+	#type{def = {'SET OF','$5'},constraint = merge_constraints([#constraint{c={'SizeConstraint','$3'#constraint.c}}])}.
+TypeWithConstraint -> 'SEQUENCE' Constraint 'OF' Type :
+	#type{def = {'SEQUENCE OF','$4'},constraint =
+	merge_constraints(['$2'])}.
+TypeWithConstraint -> 'SEQUENCE' 'SIZE' Constraint 'OF' Type :
+	#type{def = {'SEQUENCE OF','$5'},constraint = merge_constraints([#constraint{c={'SizeConstraint','$3'#constraint.c}}])}.
+
+
+Constraint -> '(' ConstraintSpec ExceptionSpec ')' :
+		#constraint{c='$2',e='$3'}.
+
+% inlined Constraint -> SubTypeConstraint :'$1'.
+ConstraintSpec -> ElementSetSpecs :'$1'.
+ConstraintSpec -> UserDefinedConstraint :'$1'.
+ConstraintSpec -> TableConstraint :'$1'.
+
+TableConstraint -> ComponentRelationConstraint : '$1'.
+TableConstraint -> ObjectSet : '$1'.
+%TableConstraint -> '{' typereference '}' :tableconstraint.
+
+ComponentRelationConstraint -> '{' typereference '}' '{' '@' ComponentIdList '}' : componentrelation.
+ComponentRelationConstraint -> '{' typereference '}' '{' '@' '.' ComponentIdList '}' : componentrelation.
+
+ComponentIdList -> identifier: ['$1'].
+ComponentIdList -> identifier '.' ComponentIdList: ['$1'| '$3'].
+
+
+% later ConstraintSpec -> GeneralConstraint :'$1'.
+
+% from X.682
+UserDefinedConstraint -> 'CONSTRAINED' 'BY' '{' '}' : {constrained_by,[]}.
+UserDefinedConstraint -> 'CONSTRAINED' 'BY'
+	'{' UserDefinedConstraintParameters '}' : {constrained_by,'$4'}.
+
+UserDefinedConstraintParameters -> UserDefinedConstraintParameter : ['$1'].
+UserDefinedConstraintParameters ->
+	UserDefinedConstraintParameter ','
+	UserDefinedConstraintParameters: ['$1'|'$3'].
+
+UserDefinedConstraintParameter -> Type '.' ActualParameter : {'$1','$3'}.
+UserDefinedConstraintParameter -> ActualParameter : '$1'.
+
+
+
+ExceptionSpec -> '!' ExceptionIdentification : '$1'.
+ExceptionSpec -> '$empty' : undefined.
+
+ExceptionIdentification -> SignedNumber : '$1'.
+% inlined ExceptionIdentification -> DefinedValue : '$1'.
+ExceptionIdentification -> typereference '.' identifier :
+	#'Externalvaluereference'{pos=element(2,'$1'),module=element(3,'$1'),
+	value=element(3,'$1')}.
+ExceptionIdentification -> identifier :'$1'.
+ExceptionIdentification -> Type ':' Value : {'$1','$3'}.
+
+% inlined SubTypeConstraint -> ElementSetSpec
+
+ElementSetSpecs -> ElementSetSpec : '$1'.
+ElementSetSpecs -> ElementSetSpec ',' '...': {'$1',[]}.
+ElementSetSpecs -> '...' ',' ElementSetSpec : {[],'$3'}.
+ElementSetSpecs -> ElementSetSpec ',' '...' ',' ElementSetSpec : {'$1','$5'}.
+
+ElementSetSpec -> Unions : '$1'.
+ElementSetSpec -> 'ALL' Exclusions : {'ALL','$2'}.
+
+Unions -> Intersections : '$1'.
+Unions -> UElems UnionMark IntersectionElements :
+	case {'$1','$3'} of
+	{{'SingleValue',V1},{'SingleValue',V2}} ->
+		{'SingleValue',ordsets:union(to_set(V1),to_set(V2))}
+	end.
+
+UElems -> Unions :'$1'.
+
+Intersections -> IntersectionElements :'$1'.
+Intersections -> IElems IntersectionMark IntersectionElements :
+	case {'$1','$3'} of
+	{{'SingleValue',V1},{'SingleValue',V2}} ->
+		{'SingleValue',ordsets:intersection(to_set(V1),to_set(V2))};
+	{V1,V2} when list(V1) ->
+	        V1 ++ [V2];
+	{V1,V2} ->
+	        [V1,V2]
+	end.
+%Intersections -> IElems '^' IntersectionElements :{'INTERSECTION','$1','$3'}.
+%Intersections -> IElems 'INTERSECTION' IntersectionElements :{'INTERSECTION','$1','$3'}.
+
+IElems -> Intersections :'$1'.
+
+IntersectionElements -> Elements :'$1'.
+IntersectionElements -> Elems Exclusions :{'$1','$2'}.
+
+Elems -> Elements :'$1'.
+
+Exclusions -> 'EXCEPT' Elements :{'EXCEPT','$2'}.
+
+IntersectionMark -> 'INTERSECTION':'$1'.
+IntersectionMark -> '^':'$1'.
+UnionMark -> 'UNION':'$1'.
+UnionMark -> '|':'$1'.
+
+
+Elements -> SubTypeElements : '$1'.
+%Elements -> ObjectSetElements : '$1'.
+Elements -> '(' ElementSetSpec ')' : '$2'.
+Elements -> ReferencedType : '$1'.
+
+SubTypeElements -> ValueList : {'SingleValue','$1'}. % NOTE it must be a Value
+% The rule above modifyed only because of conflicts
+SubTypeElements -> 'INCLUDES' Type : {'ContainedSubType','$2'}.
+%not lalr1 if this is activated SubTypeElements -> Type : {'TypeConstraint','$1'}.
+SubTypeElements -> LowerEndpoint '..' UpperEndpoint : {'ValueRange',{'$1','$3'}}.
+SubTypeElements -> 'FROM' Constraint : {'PermittedAlphabet','$2'#constraint.c}.
+SubTypeElements -> 'SIZE' Constraint: {'SizeConstraint','$2'#constraint.c}.
+% later will introduce conflicts related to NULL SubTypeElements -> Type : {'TypeConstraint','$1'}.
+SubTypeElements -> 'WITH' 'COMPONENT' Constraint:{'WITH COMPONENT','$3'}.
+SubTypeElements -> 'WITH' 'COMPONENTS' '{' TypeConstraints '}':{'WITH COMPONENTS',{'FullSpecification','$4'}}.
+SubTypeElements -> 'WITH' 'COMPONENTS' '{' '...' ',' TypeConstraints '}' :{'WITH COMPONENTS',{'PartialSpecification','$3'}}.
+
+% inlined above InnerTypeConstraints ::=
+% inlined above	SingleTypeConstraint::= Constraint
+% inlined above MultipleTypeConstraints ::= FullSpecification | PartialSpecification
+% inlined above FullSpecification   ::= "{" TypeConstraints "}"
+% inlined above PartialSpecification ::= "{"  "..."   ","   TypeConstraints "}"
+% TypeConstraints -> identifier : [{'NamedConstraint',element(3,'$1'),undefined,undefined}]. % is this really meaningful or allowed
+TypeConstraints -> NamedConstraint : ['$1'].
+TypeConstraints -> NamedConstraint ',' TypeConstraints : ['$1'|'$3'].
+TypeConstraints -> identifier : ['$1'].
+TypeConstraints -> identifier ',' TypeConstraints : ['$1'|'$3'].
+
+NamedConstraint -> identifier Constraint PresenceConstraint :{'NamedConstraint',element(3,'$1'),'$2','$3'}.
+NamedConstraint -> identifier Constraint  :{'NamedConstraint',element(3,'$1'),'$2',undefined}.
+NamedConstraint -> identifier PresenceConstraint :{'NamedConstraint',element(3,'$1'),undefined,'$2'}.
+
+PresenceConstraint -> 'PRESENT' : 'PRESENT'.
+PresenceConstraint -> 'ABSENT' : 'ABSENT'.
+PresenceConstraint -> 'OPTIONAL' : 'OPTIONAL'.
+
+
+
+LowerEndpoint -> LowerEndValue :'$1'.
+%LowerEndpoint -> LowerEndValue '<':{gt,'$1'}.
+LowerEndpoint -> LowerEndValue '<':('$1'+1).
+
+UpperEndpoint -> UpperEndValue :'$1'.
+%UpperEndpoint -> '<' UpperEndValue :{lt,'$2'}.
+UpperEndpoint -> '<' UpperEndValue :('$2'-1).
+
+LowerEndValue -> Value :'$1'.
+LowerEndValue -> 'MIN' :'MIN'.
+
+UpperEndValue -> Value :'$1'.
+UpperEndValue -> 'MAX' :'MAX'.
+
+
+% X.681
+
+
+% X.681 chap 15
+
+%TypeFromObject -> ReferencedObjects '.' FieldName : {'$1','$3'}.
+TypeFromObject -> typereference '.' FieldName : {'$1','$3'}.
+
+ReferencedObjects -> typereference : '$1'.
+%ReferencedObjects -> ParameterizedObject
+%ReferencedObjects -> DefinedObjectSet
+%ReferencedObjects -> ParameterizedObjectSet
+
+FieldName -> typefieldreference : ['$1'].
+FieldName -> valuefieldreference : ['$1'].
+FieldName -> FieldName '.' FieldName : ['$1' | '$3'].
+
+PrimitiveFieldName -> typefieldreference : '$1'.
+PrimitiveFieldName -> valuefieldreference : '$1'.
+
+%ObjectSetAssignment -> typereference DefinedObjectClass '::=' ObjectSet: null.
+ObjectSetAssignment -> typereference typereference '::=' ObjectSet :
+	#typedef{pos=element(2,'$1'),name=element(3,'$1'),typespec={'ObjectSet',element(3,'$2'), '$4'}}.
+ObjectSetAssignment -> typereference typereference '.' typereference '::=' ObjectSet.
+
+ObjectSet -> '{' ElementSetSpecs '}' : '$2'.
+ObjectSet -> '{' '...' '}' : ['EXTENSIONMARK'].
+
+%ObjectSetElements -> Object.
+% ObjectSetElements -> identifier : '$1'.
+%ObjectSetElements -> DefinedObjectSet.
+%ObjectSetElements -> ObjectSetFromObjects.
+%ObjectSetElements -> ParameterizedObjectSet.
+
+%ObjectAssignment -> identifier DefinedObjectClass '::=' Object.
+ObjectAssignment -> ValueAssignment.
+%ObjectAssignment -> identifier typereference '::=' Object.
+%ObjectAssignment -> identifier typereference '.' typereference '::=' Object.
+
+%Object -> DefinedObject: '$1'.
+%Object -> ExternalObjectReference: '$1'.%Object -> DefinedObject: '$1'.
+Object -> typereference '.' identifier: '$1'.%Object -> DefinedObject: '$1'.
+Object -> identifier: '$1'.%Object -> DefinedObject: '$1'.
+
+%Object -> ObjectDefn -> DefaultSyntax: '$1'.
+Object -> '{' FieldSetting ',' FieldSettings '}' : ['$2'|'$4'].
+Object -> '{' FieldSetting '}' :['$2'].
+
+%% For User-friendly notation
+%% Object -> ObjectDefn -> DefinedSyntax
+Object -> '{' '}'.
+Object -> '{' DefinedSyntaxTokens '}'.
+
+% later Object -> ParameterizedObject: '$1'. look in x.683
+
+%DefinedObject -> ExternalObjectReference: '$1'.
+%DefinedObject -> identifier: '$1'.
+
+DefinedObjectClass -> typereference.
+%DefinedObjectClass -> objectclassreference.
+DefinedObjectClass -> ExternalObjectClassReference.
+%DefinedObjectClass -> typereference '.' objectclassreference.
+%%DefinedObjectClass -> UsefulObjectClassReference.
+
+ExternalObjectReference -> typereference '.' identifier.
+ExternalObjectClassReference -> typereference '.' typereference.
+%%ExternalObjectClassReference -> typereference '.' objectclassreference.
+
+ObjectDefn -> DefaultSyntax: '$1'.
+%ObjectDefn -> DefinedSyntax: '$1'.
+
+ObjectFromObject -> ReferencedObjects '.' FieldName : {'ObjectFromObject','$1','$3'}.
+
+% later look in x.683 ParameterizedObject ->
+
+%DefaultSyntax -> '{' '}'.
+%DefaultSyntax -> '{' FieldSettings '}': '$2'.
+DefaultSyntax -> '{' FieldSetting ',' FieldSettings '}': '$2'.
+DefaultSyntax -> '{' FieldSetting '}': '$2'.
+
+FieldSetting -> PrimitiveFieldName Setting: {'$1','$2'}.
+
+FieldSettings -> FieldSetting ',' FieldSettings: ['$1'|'$3'].
+FieldSettings -> FieldSetting ',' FieldSettings: ['$1'|'$3'].
+FieldSettings -> FieldSetting: '$1'.
+
+%DefinedSyntax -> '{' '}'.
+DefinedSyntax -> '{' DefinedSyntaxTokens '}': '$2'.
+
+DefinedSyntaxTokens -> DefinedSyntaxToken: '$1'.
+DefinedSyntaxTokens -> DefinedSyntaxToken DefinedSyntaxTokens: ['$1'|'$2'].
+
+% expanded DefinedSyntaxToken -> Literal: '$1'.
+%DefinedSyntaxToken -> typereference: '$1'.
+DefinedSyntaxToken -> word: '$1'.
+DefinedSyntaxToken -> ',': '$1'.
+DefinedSyntaxToken -> Setting: '$1'.
+%DefinedSyntaxToken -> '$empty': nil .
+
+% Setting ::= Type|Value|ValueSet|Object|ObjectSet
+Setting -> Type: '$1'.
+%Setting -> Value: '$1'.
+%Setting -> ValueNotNull: '$1'.
+Setting -> BuiltinValue: '$1'.
+Setting -> ValueSet: '$1'.
+%Setting -> Object: '$1'.
+%Setting -> ExternalObjectReference.
+Setting -> typereference '.' identifier.
+Setting -> identifier.
+Setting -> ObjectDefn.
+
+Setting -> ObjectSet: '$1'.
+
+
+Erlang code.
+%%-author('[email protected]').
+-copyright('Copyright (c) 1991-99 Ericsson Telecom AB').
+-vsn('$Revision: 1.1 $').
+-include("asn1_records.hrl").
+
+to_set(V) when list(V) ->
+	ordsets:list_to_set(V);
+to_set(V) ->
+	ordsets:list_to_set([V]).
+
+merge_constraints({Rlist,ExtList}) -> % extensionmarker in constraint
+	{merge_constraints(Rlist,[],[]),
+	 merge_constraints(ExtList,[],[])};
+
+merge_constraints(Clist) ->
+	merge_constraints(Clist, [], []).
+
+merge_constraints([Ch|Ct],Cacc, Eacc) ->
+	NewEacc = case Ch#constraint.e of
+			undefined -> Eacc;
+			E -> [E|Eacc]
+		  end,
+	merge_constraints(Ct,[fixup_constraint(Ch#constraint.c)|Cacc],NewEacc);
+
+merge_constraints([],Cacc,[]) ->
+	lists:flatten(Cacc);
+merge_constraints([],Cacc,Eacc) ->
+	lists:flatten(Cacc) ++ [{'Errors',Eacc}].
+
+fixup_constraint(C) ->
+	case C of
+		{'SingleValue',V} when list(V) ->
+			[C,
+			{'ValueRange',{lists:min(V),lists:max(V)}}];
+		{'PermittedAlphabet',{'SingleValue',V}} when list(V) ->
+			V2 = {'SingleValue',
+			       ordsets:list_to_set(lists:flatten(V))},
+			{'PermittedAlphabet',V2};
+		{'PermittedAlphabet',{'SingleValue',V}} ->
+			V2 = {'SingleValue',[V]},
+			{'PermittedAlphabet',V2};
+		{'SizeConstraint',Sc} ->
+			{'SizeConstraint',fixup_size_constraint(Sc)};
+
+		List when list(List) ->
+			[fixup_constraint(Xc)||Xc <- List];
+		Other ->
+			Other
+	end.
+
+fixup_size_constraint({'ValueRange',{Lb,Ub}}) ->
+	{Lb,Ub};
+fixup_size_constraint({{'ValueRange',R},[]}) ->
+	{R,[]};
+fixup_size_constraint({[],{'ValueRange',R}}) ->
+	{[],R};
+fixup_size_constraint({{'ValueRange',R1},{'ValueRange',R2}}) ->
+	{R1,R2};
+fixup_size_constraint({'SingleValue',[Sv]}) ->
+	fixup_size_constraint({'SingleValue',Sv});
+fixup_size_constraint({'SingleValue',L}) when list(L) ->
+	ordsets:list_to_set(L);
+fixup_size_constraint({'SingleValue',L}) ->
+	{L,L};
+fixup_size_constraint({C1,C2}) ->
+	{fixup_size_constraint(C1), fixup_size_constraint(C2)}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_parser2.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_parser2.erl
new file mode 100644
index 0000000000..07dacb73c8
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_parser2.erl
@@ -0,0 +1,2763 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 2000, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_parser2.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+-module(asn1ct_parser2).
+
+-export([parse/1]).
+-include("asn1_records.hrl").
+
+%% parse all types in module
+parse(Tokens) ->
+    case catch parse_ModuleDefinition(Tokens) of
+	{'EXIT',Reason} ->
+	    {error,{{undefined,get(asn1_module),
+		    [internal,error,'when',parsing,module,definition,Reason]},
+		    hd(Tokens)}};
+	{asn1_error,Reason} ->
+	    {error,{Reason,hd(Tokens)}};
+	{ModuleDefinition,Rest1} ->
+	    {Types,Rest2} = parse_AssignmentList(Rest1),
+	    case Rest2 of
+		[{'END',_}|_Rest3] ->
+		    {ok,ModuleDefinition#module{typeorval = Types}};
+		_  ->
+		    {error,{{get_line(hd(Rest2)),get(asn1_module),
+			     [got,get_token(hd(Rest2)),expected,'END']},
+			    hd(Rest2)}}
+	    end
+    end.
+
+parse_ModuleDefinition([{typereference,L1,ModuleIdentifier}|Rest0]) ->
+    put(asn1_module,ModuleIdentifier),
+    {_DefinitiveIdentifier,Rest02} =
+	case Rest0 of
+	    [{'{',_}|_Rest01] ->
+		parse_ObjectIdentifierValue(Rest0);
+	    _ ->
+		{[],Rest0}
+	end,
+    Rest = case Rest02 of
+	       [{'DEFINITIONS',_}|Rest03] ->
+		   Rest03;
+	       _ ->
+		   throw({asn1_error,{get_line(hd(Rest02)),get(asn1_module),
+				      [got,get_token(hd(Rest02)),
+				       expected,'DEFINITIONS']}})
+	   end,
+    {TagDefault,Rest2} =
+	case Rest of
+	    [{'EXPLICIT',_L3},{'TAGS',_L4}|Rest1] ->
+		put(tagdefault,'EXPLICIT'), {'EXPLICIT',Rest1};
+	    [{'IMPLICIT',_L3},{'TAGS',_L4}|Rest1] ->
+		put(tagdefault,'IMPLICIT'), {'IMPLICIT',Rest1};
+	    [{'AUTOMATIC',_L3},{'TAGS',_L4}|Rest1] ->
+		put(tagdefault,'AUTOMATIC'), {'AUTOMATIC',Rest1};
+	    Rest1 ->
+		put(tagdefault,'EXPLICIT'), {'EXPLICIT',Rest1} % The default
+	end,
+    {ExtensionDefault,Rest3} =
+	case Rest2 of
+	    [{'EXTENSIBILITY',_L5}, {'IMPLIED',_L6}|Rest21] ->
+		{'IMPLIED',Rest21};
+	    _  -> {false,Rest2}
+	end,
+    case Rest3 of
+	[{'::=',_L7}, {'BEGIN',_L8}|Rest4] ->
+	    {Exports, Rest5} = parse_Exports(Rest4),
+	    {Imports, Rest6} = parse_Imports(Rest5),
+	    {#module{ pos = L1,
+		     name = ModuleIdentifier,
+		     defid = [], % fix this
+		     tagdefault = TagDefault,
+		     extensiondefault = ExtensionDefault,
+		     exports = Exports,
+		     imports = Imports},Rest6};
+	_ -> throw({asn1_error,{get_line(hd(Rest3)),get(asn1_module),
+				[got,get_token(hd(Rest3)),expected,"::= BEGIN"]}})
+    end;
+parse_ModuleDefinition(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,typereference]}}).
+
+parse_Exports([{'EXPORTS',_L1},{';',_L2}|Rest]) ->
+    {{exports,[]},Rest};
+parse_Exports([{'EXPORTS',_L1}|Rest]) ->
+    {SymbolList,Rest2} = parse_SymbolList(Rest),
+    case Rest2 of
+	[{';',_}|Rest3] ->
+	    {{exports,SymbolList},Rest3};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,';']}})
+    end;
+parse_Exports(Rest) ->
+    {{exports,all},Rest}.
+
+parse_SymbolList(Tokens) ->
+    parse_SymbolList(Tokens,[]).
+
+parse_SymbolList(Tokens,Acc) ->
+    {Symbol,Rest} = parse_Symbol(Tokens),
+    case Rest of
+	[{',',_L1}|Rest2] ->
+	    parse_SymbolList(Rest2,[Symbol|Acc]);
+	Rest2  ->
+	    {lists:reverse([Symbol|Acc]),Rest2}
+    end.
+
+parse_Symbol(Tokens) ->
+    parse_Reference(Tokens).
+
+parse_Reference([{typereference,L1,TrefName},{'{',_L2},{'}',_L3}|Rest]) ->
+%    {Tref,Rest};
+    {tref2Exttref(L1,TrefName),Rest};
+parse_Reference([Tref1 = {typereference,_,_},{'.',_},Tref2 = {typereference,_,_},
+		 {'{',_L2},{'}',_L3}|Rest]) ->
+%    {{Tref1,Tref2},Rest};
+    {{tref2Exttref(Tref1),tref2Exttref(Tref2)},Rest};
+parse_Reference([Tref = {typereference,_L1,_TrefName}|Rest]) ->
+    {tref2Exttref(Tref),Rest};
+parse_Reference([Vref = {identifier,_L1,_VName}|Rest]) ->
+    {identifier2Extvalueref(Vref),Rest};
+parse_Reference(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+			[typereference,identifier]]}}).
+
+parse_Imports([{'IMPORTS',_L1},{';',_L2}|Rest]) ->
+    {{imports,[]},Rest};
+parse_Imports([{'IMPORTS',_L1}|Rest]) ->
+    {SymbolsFromModuleList,Rest2} = parse_SymbolsFromModuleList(Rest),
+    case Rest2 of
+	[{';',_L2}|Rest3] ->
+	    {{imports,SymbolsFromModuleList},Rest3};
+	Rest3 ->
+	    throw({asn1_error,{get_line(hd(Rest3)),get(asn1_module),
+			       [got,get_token(hd(Rest3)),expected,';']}})
+    end;
+parse_Imports(Tokens) ->
+    {{imports,[]},Tokens}.
+
+parse_SymbolsFromModuleList(Tokens) ->
+    parse_SymbolsFromModuleList(Tokens,[]).
+
+parse_SymbolsFromModuleList(Tokens,Acc) ->
+    {SymbolsFromModule,Rest} = parse_SymbolsFromModule(Tokens),
+    case (catch parse_SymbolsFromModule(Rest)) of
+	{Sl,_Rest2} when record(Sl,'SymbolsFromModule') ->
+	    parse_SymbolsFromModuleList(Rest,[SymbolsFromModule|Acc]);
+	_  ->
+	    {lists:reverse([SymbolsFromModule|Acc]),Rest}
+    end.
+
+parse_SymbolsFromModule(Tokens) ->
+    SetRefModuleName =
+	fun(N) ->
+		fun(X) when record(X,'Externaltypereference')->
+			X#'Externaltypereference'{module=N};
+		   (X) when record(X,'Externalvaluereference')->
+			X#'Externalvaluereference'{module=N}
+		end
+	end,
+    {SymbolList,Rest} = parse_SymbolList(Tokens),
+    case Rest of
+	%%How does this case correspond to x.680 ?
+	[{'FROM',_L1},Tref = {typereference,_,_},Ref={identifier,_L2,_Id},C={',',_}|Rest2] ->
+	    {#'SymbolsFromModule'{symbols=SymbolList,
+				  module=tref2Exttref(Tref)},[Ref,C|Rest2]};
+	%%How does this case correspond to x.680 ?
+	[{'FROM',_L1},Tref = {typereference,_,_},{identifier,_L2,_Id}|Rest2] ->
+	    {#'SymbolsFromModule'{symbols=SymbolList,
+				  module=tref2Exttref(Tref)},Rest2};
+	[{'FROM',_L1},Tref = {typereference,_,Name},Brace = {'{',_}|Rest2] ->
+	    {_ObjIdVal,Rest3} = parse_ObjectIdentifierValue([Brace|Rest2]), % value not used yet, fix me
+	    NewSymbolList = lists:map(SetRefModuleName(Name),SymbolList),
+	    {#'SymbolsFromModule'{symbols=NewSymbolList,
+				  module=tref2Exttref(Tref)},Rest3};
+	[{'FROM',_L1},Tref = {typereference,_,Name}|Rest2] ->
+	    NewSymbolList = lists:map(SetRefModuleName(Name),SymbolList),
+	    {#'SymbolsFromModule'{symbols=NewSymbolList,
+				  module=tref2Exttref(Tref)},Rest2};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
+			       [got,get_token(hd(Rest)),expected,
+				['FROM typerefernece identifier ,',
+				 'FROM typereference identifier',
+				 'FROM typereference {',
+				 'FROM typereference']]}})
+    end.
+
+parse_ObjectIdentifierValue([{'{',_}|Rest]) ->
+    parse_ObjectIdentifierValue(Rest,[]).
+
+parse_ObjectIdentifierValue([{number,_,Num}|Rest],Acc) ->
+    parse_ObjectIdentifierValue(Rest,[Num|Acc]);
+parse_ObjectIdentifierValue([{identifier,_,Id},{'(',_}, {number,_,Num}, {')',_}|Rest],Acc) ->
+    parse_ObjectIdentifierValue(Rest,[{'NamedNumber',Id,Num}|Acc]);
+parse_ObjectIdentifierValue([{identifier,_,Id},{'(',_}, {identifier,_,Id2}, {')',_}|Rest],Acc) ->
+    parse_ObjectIdentifierValue(Rest,[{'NamedNumber',Id,Id2}|Acc]);
+parse_ObjectIdentifierValue([{identifier,_,Id},{'(',_}, {typereference,_,Tref},{'.',_},{identifier,_,Id2}, {')',_}|Rest],Acc) ->
+    parse_ObjectIdentifierValue(Rest,[{'NamedNumber',Id,{'ExternalValue',Tref,Id2}}|Acc]);
+parse_ObjectIdentifierValue([Id = {identifier,_,_}|Rest],Acc) ->
+    parse_ObjectIdentifierValue(Rest,[identifier2Extvalueref(Id)|Acc]);
+parse_ObjectIdentifierValue([{'}',_}|Rest],Acc) ->
+    {lists:reverse(Acc),Rest};
+parse_ObjectIdentifierValue([H|_T],_Acc) ->
+    throw({asn1_error,{get_line(H),get(asn1_module),
+		       [got,get_token(H),expected,
+			['{ some of the following }',number,'identifier ( number )',
+			 'identifier ( identifier )',
+			 'identifier ( typereference.identifier)',identifier]]}}).
+
+parse_AssignmentList(Tokens = [{'END',_}|_Rest]) ->
+    {[],Tokens};
+parse_AssignmentList(Tokens = [{'$end',_}|_Rest]) ->
+    {[],Tokens};
+parse_AssignmentList(Tokens) ->
+    parse_AssignmentList(Tokens,[]).
+
+parse_AssignmentList(Tokens= [{'END',_}|_Rest],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_AssignmentList(Tokens= [{'$end',_}|_Rest],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_AssignmentList(Tokens,Acc) ->
+    case (catch parse_Assignment(Tokens)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	{asn1_error,R} ->
+%	    [H|T] = Tokens,
+	    throw({error,{R,hd(Tokens)}});
+	{Assignment,Rest} ->
+	    parse_AssignmentList(Rest,[Assignment|Acc])
+    end.
+
+parse_Assignment(Tokens) ->
+    Flist = [fun parse_TypeAssignment/1,
+	     fun parse_ValueAssignment/1,
+	     fun parse_ObjectClassAssignment/1,
+	     fun parse_ObjectAssignment/1,
+	     fun parse_ObjectSetAssignment/1,
+	     fun parse_ParameterizedAssignment/1,
+	     fun parse_ValueSetTypeAssignment/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	{asn1_assignment_error,Reason} ->
+	    throw({asn1_error,Reason});
+	Result ->
+	    Result
+    end.
+
+
+parse_or(Tokens,Flist) ->
+	parse_or(Tokens,Flist,[]).
+
+parse_or(_Tokens,[],ErrList) ->
+    case ErrList of
+	[] ->
+	    throw({asn1_error,{parse_or,ErrList}});
+	L when list(L) ->
+%%%	    throw({asn1_error,{parse_or,hd(lists:reverse(ErrList))}});
+	    %% chose to throw 1) the error with the highest line no,
+	    %% 2) the last error which is not a asn1_assignment_error or
+	    %% 3) the last error.
+	    throw(prioritize_error(ErrList));
+	Other ->
+	    throw({asn1_error,{parse_or,Other}})
+    end;
+parse_or(Tokens,[Fun|Frest],ErrList) ->
+    case (catch Fun(Tokens)) of
+	Exit = {'EXIT',_Reason} ->
+	    parse_or(Tokens,Frest,[Exit|ErrList]);
+	AsnErr = {asn1_error,_} ->
+	    parse_or(Tokens,Frest,[AsnErr|ErrList]);
+	AsnAssErr = {asn1_assignment_error,_} ->
+	    parse_or(Tokens,Frest,[AsnAssErr|ErrList]);
+	Result = {_,L} when list(L) ->
+	    Result;
+%	Result ->
+%	    Result
+	Error  ->
+	    parse_or(Tokens,Frest,[Error|ErrList])
+    end.
+
+parse_TypeAssignment([{typereference,L1,Tref},{'::=',_}|Rest]) ->
+    {Type,Rest2} = parse_Type(Rest),
+    {#typedef{pos=L1,name=Tref,typespec=Type},Rest2};
+parse_TypeAssignment([H1,H2|_Rest]) ->
+    throw({asn1_assignment_error,{get_line(H1),get(asn1_module),
+				  [got,[get_token(H1),get_token(H2)], expected,
+				   typereference,'::=']}});
+parse_TypeAssignment([H|_T]) ->
+    throw({asn1_assignment_error,{get_line(H),get(asn1_module),
+				  [got,get_token(H),expected,
+				   typereference]}}).
+
+parse_Type(Tokens) ->
+    {Tag,Rest3} = case Tokens of
+		      [Lbr= {'[',_}|Rest] ->
+			  parse_Tag([Lbr|Rest]);
+		      Rest-> {[],Rest}
+		  end,
+    {Tag2,Rest4} = case Rest3 of
+		       [{'IMPLICIT',_}|Rest31] when record(Tag,tag)->
+			   {[Tag#tag{type='IMPLICIT'}],Rest31};
+		       [{'EXPLICIT',_}|Rest31] when record(Tag,tag)->
+			   {[Tag#tag{type='EXPLICIT'}],Rest31};
+		       Rest31 when record(Tag,tag) ->
+			   {[Tag#tag{type={default,get(tagdefault)}}],Rest31};
+		       Rest31 ->
+			   {Tag,Rest31}
+		   end,
+    Flist = [fun parse_BuiltinType/1,fun parse_ReferencedType/1,fun parse_TypeWithConstraint/1],
+    {Type,Rest5} = case (catch parse_or(Rest4,Flist)) of
+		      {'EXIT',Reason} ->
+			  exit(Reason);
+			AsnErr = {asn1_error,_Reason} ->
+			 throw(AsnErr);
+		      Result ->
+			  Result
+		  end,
+    case hd(Rest5) of
+	{'(',_} ->
+	    {Constraints,Rest6} = parse_Constraints(Rest5),
+	    if record(Type,type) ->
+		    {Type#type{constraint=merge_constraints(Constraints),
+			       tag=Tag2},Rest6};
+	       true ->
+		    {#type{def=Type,constraint=merge_constraints(Constraints),
+			   tag=Tag2},Rest6}
+	    end;
+	_ ->
+	    if record(Type,type) ->
+		    {Type#type{tag=Tag2},Rest5};
+	       true ->
+		    {#type{def=Type,tag=Tag2},Rest5}
+	    end
+    end.
+
+parse_BuiltinType([{'BIT',_},{'STRING',_}|Rest]) ->
+    case Rest of
+	[{'{',_}|Rest2] ->
+	    {NamedNumberList,Rest3} = parse_NamedNumberList(Rest2),
+	    case Rest3 of
+		[{'}',_}|Rest4] ->
+		    {#type{def={'BIT STRING',NamedNumberList}},Rest4};
+		_ ->
+		    throw({asn1_error,{get_line(hd(Rest3)),get(asn1_module),
+				       [got,get_token(hd(Rest3)),expected,'}']}})
+	    end;
+	 _ ->
+	    {{'BIT STRING',[]},Rest}
+    end;
+parse_BuiltinType([{'BOOLEAN',_}|Rest]) ->
+    {#type{def='BOOLEAN'},Rest};
+%% CharacterStringType ::= RestrictedCharacterStringType |
+%%                         UnrestrictedCharacterStringType
+parse_BuiltinType([{restrictedcharacterstringtype,_,StringName}|Rest]) ->
+    {#type{def=StringName},Rest};
+parse_BuiltinType([{'CHARACTER',_},{'STRING',_}|Rest]) ->
+    {#type{def='CHARACTER STRING'},Rest};
+
+parse_BuiltinType([{'CHOICE',_},{'{',_}|Rest]) ->
+    {AlternativeTypeLists,Rest2} = parse_AlternativeTypeLists(Rest),
+    case Rest2 of
+	[{'}',_}|Rest3] ->
+	    {#type{def={'CHOICE',AlternativeTypeLists}},Rest3};
+	_  ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'}']}})
+    end;
+parse_BuiltinType([{'EMBEDDED',_},{'PDV',_}|Rest]) ->
+    {#type{def='EMBEDDED PDV'},Rest};
+parse_BuiltinType([{'ENUMERATED',_},{'{',_}|Rest]) ->
+    {Enumerations,Rest2} = parse_Enumerations(Rest),
+    case Rest2 of
+	[{'}',_}|Rest3] ->
+	    {#type{def={'ENUMERATED',Enumerations}},Rest3};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'}']}})
+    end;
+parse_BuiltinType([{'EXTERNAL',_}|Rest]) ->
+    {#type{def='EXTERNAL'},Rest};
+
+% InstanceOfType
+parse_BuiltinType([{'INSTANCE',_},{'OF',_}|Rest]) ->
+    {DefinedObjectClass,Rest2} = parse_DefinedObjectClass(Rest),
+    case Rest2 of
+	[{'(',_}|_] ->
+	    {Constraint,Rest3} = parse_Constraint(Rest2),
+	    {#type{def={'INSTANCE OF',DefinedObjectClass,Constraint}},Rest3};
+	_ ->
+	    {#type{def={'INSTANCE OF',DefinedObjectClass,[]}},Rest2}
+    end;
+
+% parse_BuiltinType(Tokens) ->
+
+parse_BuiltinType([{'INTEGER',_}|Rest]) ->
+    case Rest of
+	[{'{',_}|Rest2] ->
+	    {NamedNumberList,Rest3} = parse_NamedNumberList(Rest2),
+	    case Rest3 of
+		[{'}',_}|Rest4] ->
+		    {#type{def={'INTEGER',NamedNumberList}},Rest4};
+		_ ->
+		    throw({asn1_error,{get_line(hd(Rest3)),get(asn1_module),
+				       [got,get_token(hd(Rest3)),expected,'}']}})
+	    end;
+	 _ ->
+	    {#type{def='INTEGER'},Rest}
+    end;
+parse_BuiltinType([{'NULL',_}|Rest]) ->
+    {#type{def='NULL'},Rest};
+
+% ObjectClassFieldType fix me later
+
+parse_BuiltinType([{'OBJECT',_},{'IDENTIFIER',_}|Rest]) ->
+    {#type{def='OBJECT IDENTIFIER'},Rest};
+parse_BuiltinType([{'OCTET',_},{'STRING',_}|Rest]) ->
+    {#type{def='OCTET STRING'},Rest};
+parse_BuiltinType([{'REAL',_}|Rest]) ->
+    {#type{def='REAL'},Rest};
+parse_BuiltinType([{'SEQUENCE',_},{'{',_},{'...',Line},{'}',_}|Rest]) ->
+    {#type{def=#'SEQUENCE'{components=[{'EXTENSIONMARK',Line,undefined}]}},
+     Rest};
+parse_BuiltinType([{'SEQUENCE',_},{'{',_},{'...',Line},{'!',_}|Rest]) ->
+    {ExceptionIdentification,Rest2} = parse_ExceptionIdentification(Rest),
+    case Rest2 of
+	[{'}',_}|Rest3] ->
+	    {#type{def=#'SEQUENCE'{components=[{'EXTENSIONMARK',
+						Line,
+						ExceptionIdentification}]}},
+	     Rest3};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'}']}})
+    end;
+parse_BuiltinType([{'SEQUENCE',_},{'{',_}|Rest]) ->
+    {ComponentTypeLists,Rest2} = parse_ComponentTypeLists(Rest),
+    case Rest2  of
+	[{'}',_}|Rest3] ->
+	    {#type{def=#'SEQUENCE'{components=ComponentTypeLists}},Rest3};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'}']}})
+    end;
+parse_BuiltinType([{'SEQUENCE',_},{'OF',_}|Rest]) ->
+    {Type,Rest2} = parse_Type(Rest),
+    {#type{def={'SEQUENCE OF',Type}},Rest2};
+
+
+parse_BuiltinType([{'SET',_},{'{',_},{'...',Line},{'}',_}|Rest]) ->
+    {#type{def=#'SET'{components=[{'EXTENSIONMARK',Line,undefined}]}},Rest};
+parse_BuiltinType([{'SET',_},{'{',_},{'...',Line},{'!',_}|Rest]) ->
+    {ExceptionIdentification,Rest2} = parse_ExceptionIdentification(Rest),
+    case Rest2 of
+	[{'}',_}|Rest3] ->
+	    {#type{def=#'SET'{components=
+			      [{'EXTENSIONMARK',Line,ExceptionIdentification}]}},
+	     Rest3};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'}']}})
+    end;
+parse_BuiltinType([{'SET',_},{'{',_}|Rest]) ->
+    {ComponentTypeLists,Rest2} = parse_ComponentTypeLists(Rest),
+    case Rest2  of
+	[{'}',_}|Rest3] ->
+	    {#type{def=#'SET'{components=ComponentTypeLists}},Rest3};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'}']}})
+    end;
+parse_BuiltinType([{'SET',_},{'OF',_}|Rest]) ->
+    {Type,Rest2} = parse_Type(Rest),
+    {#type{def={'SET OF',Type}},Rest2};
+
+%% The so called Useful types
+parse_BuiltinType([{'GeneralizedTime',_}|Rest]) ->
+    {#type{def='GeneralizedTime'},Rest};
+parse_BuiltinType([{'UTCTime',_}|Rest]) ->
+    {#type{def='UTCTime'},Rest};
+parse_BuiltinType([{'ObjectDescriptor',_}|Rest]) ->
+    {#type{def='ObjectDescriptor'},Rest};
+
+%% For compatibility with old standard
+parse_BuiltinType([{'ANY',_},{'DEFINED',_},{'BY',_},{identifier,_,Id}|Rest]) ->
+    {#type{def={'ANY_DEFINED_BY',Id}},Rest};
+parse_BuiltinType([{'ANY',_}|Rest]) ->
+    {#type{def='ANY'},Rest};
+
+parse_BuiltinType(Tokens) ->
+    parse_ObjectClassFieldType(Tokens).
+%    throw({asn1_error,unhandled_type}).
+
+
+parse_TypeWithConstraint([{'SEQUENCE',_},Lpar = {'(',_}|Rest]) ->
+    {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
+    case Rest2 of
+	[{'OF',_}|Rest3] ->
+	    {Type,Rest4} = parse_Type(Rest3),
+	    {#type{def = {'SEQUENCE OF',Type}, constraint = merge_constraints([Constraint])},Rest4};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'OF']}})
+    end;
+parse_TypeWithConstraint([{'SEQUENCE',_},{'SIZE',_},Lpar = {'(',_}|Rest]) ->
+    {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
+    Constraint2 =
+	case Constraint of
+	    #constraint{c=C} ->
+		Constraint#constraint{c={'SizeConstraint',C}};
+	    _ -> Constraint
+	end,
+    case Rest2 of
+	[{'OF',_}|Rest3] ->
+	    {Type,Rest4} = parse_Type(Rest3),
+	    {#type{def = {'SEQUENCE OF',Type}, constraint = merge_constraints([Constraint2])},Rest4};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'OF']}})
+    end;
+parse_TypeWithConstraint([{'SET',_},Lpar = {'(',_}|Rest]) ->
+    {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
+    case Rest2 of
+	[{'OF',_}|Rest3] ->
+	    {Type,Rest4} = parse_Type(Rest3),
+	    {#type{def = {'SET OF',Type}, constraint = merge_constraints([Constraint])},Rest4};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'OF']}})
+    end;
+parse_TypeWithConstraint([{'SET',_},{'SIZE',_},Lpar = {'(',_}|Rest]) ->
+    {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
+    Constraint2 =
+	case Constraint of
+	    #constraint{c=C} ->
+		Constraint#constraint{c={'SizeConstraint',C}};
+	    _ -> Constraint
+	end,
+    case Rest2 of
+	[{'OF',_}|Rest3] ->
+	    {Type,Rest4} = parse_Type(Rest3),
+	    {#type{def = {'SET OF',Type}, constraint = merge_constraints([Constraint2])},Rest4};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'OF']}})
+    end;
+parse_TypeWithConstraint(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+		       ['SEQUENCE','SEQUENCE SIZE','SET','SET SIZE'],
+		       followed,by,a,constraint]}}).
+
+
+%% --------------------------
+
+parse_ReferencedType(Tokens) ->
+    Flist = [fun parse_DefinedType/1,
+	     fun parse_SelectionType/1,
+	     fun parse_TypeFromObject/1,
+	     fun parse_ValueSetFromObjects/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_DefinedType(Tokens=[{typereference,_,_},{'{',_}|_Rest]) ->
+    parse_ParameterizedType(Tokens);
+parse_DefinedType(Tokens=[{typereference,L1,TypeName},
+			  T2={typereference,_,_},T3={'{',_}|Rest]) ->
+    case (catch parse_ParameterizedType(Tokens)) of
+	{'EXIT',_Reason} ->
+	    Rest2 = [T2,T3|Rest],
+	    {#type{def = #'Externaltypereference'{pos=L1,
+						  module=get(asn1_module),
+						  type=TypeName}},Rest2};
+	{asn1_error,_} ->
+	    Rest2 = [T2,T3|Rest],
+	    {#type{def = #'Externaltypereference'{pos=L1,
+						  module=get(asn1_module),
+						  type=TypeName}},Rest2};
+	Result ->
+	    Result
+    end;
+parse_DefinedType([{typereference,L1,Module},{'.',_},{typereference,_,TypeName}|Rest]) ->
+    {#type{def = #'Externaltypereference'{pos=L1,module=Module,type=TypeName}},Rest};
+parse_DefinedType([{typereference,L1,TypeName}|Rest]) ->
+    {#type{def = #'Externaltypereference'{pos=L1,module=get(asn1_module),
+					  type=TypeName}},Rest};
+parse_DefinedType(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+			[typereference,'typereference.typereference',
+			 'typereference typereference']]}}).
+
+parse_SelectionType([{identifier,_,Name},{'<',_}|Rest]) ->
+    {Type,Rest2} = parse_Type(Rest),
+    {{'SelectionType',Name,Type},Rest2};
+parse_SelectionType(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'identifier <']}}).
+
+
+%% --------------------------
+
+
+%% This should probably be removed very soon
+% parse_ConstrainedType(Tokens) ->
+%     case (catch parse_TypeWithConstraint(Tokens)) of
+% 	{'EXIT',Reason} ->
+% 	    {Type,Rest} = parse_Type(Tokens),
+% 	    {Constraint,Rest2} = parse_Constraint(Rest),
+% 	    {Type#type{constraint=Constraint},Rest2};
+% 	{asn1_error,Reason2} ->
+% 	    {Type,Rest} = parse_Type(Tokens),
+% 	    {Constraint,Rest2} = parse_Constraint(Rest),
+% 	    {Type#type{constraint=Constraint},Rest2};
+% 	Result ->
+% 	    Result
+%     end.
+
+parse_Constraints(Tokens) ->
+    parse_Constraints(Tokens,[]).
+
+parse_Constraints(Tokens,Acc) ->
+    {Constraint,Rest} = parse_Constraint(Tokens),
+    case Rest of
+	[{'(',_}|_Rest2] ->
+	    parse_Constraints(Rest,[Constraint|Acc]);
+	_ ->
+	    {lists:reverse([Constraint|Acc]),Rest}
+    end.
+
+parse_Constraint([{'(',_}|Rest]) ->
+    {Constraint,Rest2} = parse_ConstraintSpec(Rest),
+    {Exception,Rest3} = parse_ExceptionSpec(Rest2),
+    case Rest3 of
+	[{')',_}|Rest4] ->
+	    {#constraint{c=Constraint,e=Exception},Rest4};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,')']}})
+    end;
+parse_Constraint(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'(']}}).
+
+parse_ConstraintSpec(Tokens) ->
+    Flist = [fun parse_GeneralConstraint/1,
+	     fun parse_SubtypeConstraint/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	{asn1_error,Reason2} ->
+	    throw({asn1_error,Reason2});
+	Result ->
+	    Result
+    end.
+
+parse_ExceptionSpec([LPar={')',_}|Rest]) ->
+    {undefined,[LPar|Rest]};
+parse_ExceptionSpec([{'!',_}|Rest]) ->
+    parse_ExceptionIdentification(Rest);
+parse_ExceptionSpec(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,[')','!']]}}).
+
+parse_ExceptionIdentification(Tokens) ->
+    Flist = [fun parse_SignedNumber/1,
+	     fun parse_DefinedValue/1,
+	     fun parse_TypeColonValue/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	{asn1_error,Reason2} ->
+	    throw({asn1_error,Reason2});
+	Result ->
+	    Result
+    end.
+
+parse_TypeColonValue(Tokens) ->
+    {Type,Rest} = parse_Type(Tokens),
+    case Rest of
+	[{':',_}|Rest2] ->
+	    {Value,Rest3} = parse_Value(Rest2),
+	    {{Type,Value},Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,':']}})
+    end.
+
+parse_SubtypeConstraint(Tokens) ->
+    parse_ElementSetSpecs(Tokens).
+
+parse_ElementSetSpecs([{'...',_}|Rest]) ->
+    {Elements,Rest2} = parse_ElementSetSpec(Rest),
+    {{[],Elements},Rest2};
+parse_ElementSetSpecs(Tokens) ->
+    {RootElems,Rest} = parse_ElementSetSpec(Tokens),
+    case Rest of
+	[{',',_},{'...',_},{',',_}|Rest2] ->
+	    {AdditionalElems,Rest3} = parse_ElementSetSpec(Rest2),
+	    {{RootElems,AdditionalElems},Rest3};
+	[{',',_},{'...',_}|Rest2] ->
+	    {{RootElems,[]},Rest2};
+	_ ->
+	    {RootElems,Rest}
+    end.
+
+parse_ElementSetSpec([{'ALL',_},{'EXCEPT',_}|Rest]) ->
+    {Exclusions,Rest2} = parse_Elements(Rest),
+    {{'ALL',{'EXCEPT',Exclusions}},Rest2};
+parse_ElementSetSpec(Tokens) ->
+    parse_Unions(Tokens).
+
+
+parse_Unions(Tokens) ->
+    {InterSec,Rest} = parse_Intersections(Tokens),
+    {Unions,Rest2} = parse_UnionsRec(Rest),
+    case {InterSec,Unions} of
+	{InterSec,[]} ->
+	    {InterSec,Rest2};
+	{{'SingleValue',V1},{'SingleValue',V2}} ->
+	    {{'SingleValue',ordsets:union(to_set(V1),to_set(V2))},Rest2};
+	{V1,V2} when list(V2) ->
+	    {[V1] ++ [union|V2],Rest2};
+	{V1,V2} ->
+	    {[V1,union,V2],Rest2}
+%	Other ->
+%	    throw(Other)
+    end.
+
+parse_UnionsRec([{'|',_}|Rest]) ->
+    {InterSec,Rest2} = parse_Intersections(Rest),
+    {URec,Rest3} = parse_UnionsRec(Rest2),
+    case {InterSec,URec} of
+	{V1,[]} ->
+	    {V1,Rest3};
+	{{'SingleValue',V1},{'SingleValue',V2}} ->
+	    {{'SingleValue',ordsets:union(to_set(V1),to_set(V2))},Rest3};
+	{V1,V2} when list(V2) ->
+	    {[V1] ++ V2,Rest3};
+	{V1,V2} ->
+	    {[V1,V2],Rest3}
+	end;
+parse_UnionsRec([{'UNION',_}|Rest]) ->
+    {InterSec,Rest2} = parse_Intersections(Rest),
+    {URec,Rest3} = parse_UnionsRec(Rest2),
+    case {InterSec,URec} of
+	{V1,[]} ->
+	    {V1,Rest3};
+	{{'SingleValue',V1},{'SingleValue',V2}} ->
+	    {{'SingleValue',ordsets:union(to_set(V1),to_set(V2))},Rest3};
+	{V1,V2} when list(V2) ->
+	    {[V1] ++ V2,Rest3};
+	{V1,V2} ->
+	    {[V1,V2],Rest3}
+	end;
+parse_UnionsRec(Tokens) ->
+    {[],Tokens}.
+
+parse_Intersections(Tokens) ->
+    {InterSec,Rest} = parse_IntersectionElements(Tokens),
+    {IRec,Rest2} = parse_IElemsRec(Rest),
+    case {InterSec,IRec} of
+	{V1,[]} ->
+	    {V1,Rest2};
+	{{'SingleValue',V1},{'SingleValue',V2}} ->
+	    {{'SingleValue',
+	      ordsets:intersection(to_set(V1),to_set(V2))},Rest2};
+	{V1,V2} when list(V2) ->
+	    {[V1] ++ [intersection|V2],Rest2};
+	{V1,V2} ->
+	    {[V1,intersection,V2],Rest2};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+			       [got,get_token(hd(Tokens)),expected,'a Union']}})
+    end.
+
+parse_IElemsRec([{'^',_}|Rest]) ->
+    {InterSec,Rest2} = parse_IntersectionElements(Rest),
+    {IRec,Rest3} = parse_IElemsRec(Rest2),
+    case {InterSec,IRec} of
+	{{'SingleValue',V1},{'SingleValue',V2}} ->
+	    {{'SingleValue',
+	      ordsets:intersection(to_set(V1),to_set(V2))},Rest3};
+	{V1,[]} ->
+	    {V1,Rest3};
+	{V1,V2} when list(V2) ->
+	    {[V1] ++ V2,Rest3};
+	{V1,V2} ->
+	    {[V1,V2],Rest3};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
+			       [got,get_token(hd(Rest)),expected,'an Intersection']}})
+    end;
+parse_IElemsRec([{'INTERSECTION',_}|Rest]) ->
+    {InterSec,Rest2} = parse_IntersectionElements(Rest),
+    {IRec,Rest3} = parse_IElemsRec(Rest2),
+    case {InterSec,IRec} of
+	{{'SingleValue',V1},{'SingleValue',V2}} ->
+	    {{'SingleValue',
+	      ordsets:intersection(to_set(V1),to_set(V2))},Rest3};
+	{V1,[]} ->
+	    {V1,Rest3};
+	{V1,V2} when list(V2) ->
+	    {[V1] ++ V2,Rest3};
+	{V1,V2} ->
+	    {[V1,V2],Rest3};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
+			       [got,get_token(hd(Rest)),expected,'an Intersection']}})
+    end;
+parse_IElemsRec(Tokens) ->
+    {[],Tokens}.
+
+parse_IntersectionElements(Tokens) ->
+    {InterSec,Rest} = parse_Elements(Tokens),
+    case Rest of
+	[{'EXCEPT',_}|Rest2] ->
+	    {Exclusion,Rest3} = parse_Elements(Rest2),
+	    {{InterSec,{'EXCEPT',Exclusion}},Rest3};
+	Rest ->
+	    {InterSec,Rest}
+    end.
+
+parse_Elements([{'(',_}|Rest]) ->
+    {Elems,Rest2} = parse_ElementSetSpec(Rest),
+    case Rest2 of
+	[{')',_}|Rest3] ->
+	    {Elems,Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,')']}})
+    end;
+parse_Elements(Tokens) ->
+    Flist = [fun parse_SubtypeElements/1,
+	     fun parse_ObjectSetElements/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	Err = {asn1_error,_} ->
+	    throw(Err);
+	Result ->
+	    Result
+    end.
+
+
+
+
+%% --------------------------
+
+parse_DefinedObjectClass([{typereference,_,_ModName},{'.',_},Tr={typereference,_,_ObjClName}|Rest]) ->
+%%    {{objectclassname,ModName,ObjClName},Rest};
+%    {{objectclassname,tref2Exttref(Tr)},Rest};
+    {tref2Exttref(Tr),Rest};
+parse_DefinedObjectClass([Tr={typereference,_,_ObjClName}|Rest]) ->
+%    {{objectclassname,tref2Exttref(Tr)},Rest};
+    {tref2Exttref(Tr),Rest};
+parse_DefinedObjectClass([{'TYPE-IDENTIFIER',_}|Rest]) ->
+    {'TYPE-IDENTIFIER',Rest};
+parse_DefinedObjectClass([{'ABSTRACT-SYNTAX',_}|Rest]) ->
+    {'ABSTRACT-SYNTAX',Rest};
+parse_DefinedObjectClass(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+			['typereference . typereference',
+			 typereference,
+			 'TYPE-IDENTIFIER',
+			 'ABSTRACT-SYNTAX']]}}).
+
+parse_ObjectClassAssignment([{typereference,L1,ObjClName},{'::=',_}|Rest]) ->
+    {Type,Rest2} = parse_ObjectClass(Rest),
+    {#classdef{pos=L1,name=ObjClName,typespec=Type},Rest2};
+parse_ObjectClassAssignment(Tokens) ->
+    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
+				  [got,get_token(hd(Tokens)),expected,
+				   'typereference ::=']}}).
+
+parse_ObjectClass(Tokens) ->
+    Flist = [fun parse_DefinedObjectClass/1,
+	     fun parse_ObjectClassDefn/1,
+	     fun parse_ParameterizedObjectClass/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	{asn1_error,Reason2} ->
+	    throw({asn1_error,Reason2});
+	Result ->
+	    Result
+    end.
+
+parse_ObjectClassDefn([{'CLASS',_},{'{',_}|Rest]) ->
+    {Type,Rest2} = parse_FieldSpec(Rest),
+    {WithSyntaxSpec,Rest3} = parse_WithSyntaxSpec(Rest2),
+    {#objectclass{fields=Type,syntax=WithSyntaxSpec},Rest3};
+parse_ObjectClassDefn(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'CLASS {']}}).
+
+parse_FieldSpec(Tokens) ->
+    parse_FieldSpec(Tokens,[]).
+
+parse_FieldSpec(Tokens,Acc) ->
+    Flist = [fun parse_FixedTypeValueFieldSpec/1,
+	     fun parse_VariableTypeValueFieldSpec/1,
+	     fun parse_ObjectFieldSpec/1,
+	     fun parse_FixedTypeValueSetFieldSpec/1,
+	     fun parse_VariableTypeValueSetFieldSpec/1,
+	     fun parse_TypeFieldSpec/1,
+	     fun parse_ObjectSetFieldSpec/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	{Type,[{'}',_}|Rest]} ->
+	    {lists:reverse([Type|Acc]),Rest};
+	{Type,[{',',_}|Rest2]} ->
+	    parse_FieldSpec(Rest2,[Type|Acc]);
+	{_,[H|_T]}  ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'}']}})
+    end.
+
+parse_PrimitiveFieldName([{typefieldreference,_,FieldName}|Rest]) ->
+    {{typefieldreference,FieldName},Rest};
+parse_PrimitiveFieldName([{valuefieldreference,_,FieldName}|Rest]) ->
+    {{valuefieldreference,FieldName},Rest};
+parse_PrimitiveFieldName(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+			[typefieldreference,valuefieldreference]]}}).
+
+parse_FieldName(Tokens) ->
+    {Field,Rest} = parse_PrimitiveFieldName(Tokens),
+    parse_FieldName(Rest,[Field]).
+
+parse_FieldName([{'.',_}|Rest],Acc) ->
+    case (catch parse_PrimitiveFieldName(Rest)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	{FieldName,Rest2} ->
+	    parse_FieldName(Rest2,[FieldName|Acc])
+    end;
+parse_FieldName(Tokens,Acc) ->
+    {lists:reverse(Acc),Tokens}.
+
+parse_FixedTypeValueFieldSpec([{valuefieldreference,L1,VFieldName}|Rest]) ->
+    {Type,Rest2} = parse_Type(Rest),
+    {Unique,Rest3} =
+	case Rest2 of
+	    [{'UNIQUE',_}|Rest4] ->
+		{'UNIQUE',Rest4};
+	    _  ->
+		{undefined,Rest2}
+	end,
+    {OptionalitySpec,Rest5} = parse_ValueOptionalitySpec(Rest3),
+    case Unique of
+	'UNIQUE' ->
+	    case OptionalitySpec of
+		{'DEFAULT',_} ->
+		    throw({asn1_error,
+			   {L1,get(asn1_module),
+			    ['UNIQUE and DEFAULT in same field',VFieldName]}});
+		_ ->
+		    {{fixedtypevaluefield,VFieldName,Type,Unique,OptionalitySpec},Rest5}
+	    end;
+	_ ->
+	    {{object_or_fixedtypevalue_field,VFieldName,Type,Unique,OptionalitySpec},Rest5}
+    end;
+parse_FixedTypeValueFieldSpec(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,valuefieldreference]}}).
+
+parse_VariableTypeValueFieldSpec([{valuefieldreference,_,VFieldName}|Rest]) ->
+    {FieldRef,Rest2} = parse_FieldName(Rest),
+    {OptionalitySpec,Rest3} = parse_ValueOptionalitySpec(Rest2),
+    {{variabletypevaluefield,VFieldName,FieldRef,OptionalitySpec},Rest3};
+parse_VariableTypeValueFieldSpec(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,valuefieldreference]}}).
+
+parse_ObjectFieldSpec([{valuefieldreference,_,VFieldName}|Rest]) ->
+    {Class,Rest2} = parse_DefinedObjectClass(Rest),
+    {OptionalitySpec,Rest3} = parse_ObjectOptionalitySpec(Rest2),
+    {{objectfield,VFieldName,Class,OptionalitySpec},Rest3};
+parse_ObjectFieldSpec(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,valuefieldreference]}}).
+
+parse_TypeFieldSpec([{typefieldreference,_,TFieldName}|Rest]) ->
+    {OptionalitySpec,Rest2} = parse_TypeOptionalitySpec(Rest),
+    {{typefield,TFieldName,OptionalitySpec},Rest2};
+parse_TypeFieldSpec(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,typefieldreference]}}).
+
+parse_FixedTypeValueSetFieldSpec([{typefieldreference,_,TFieldName}|Rest]) ->
+    {Type,Rest2} = parse_Type(Rest),
+    {OptionalitySpec,Rest3} = parse_ValueSetOptionalitySpec(Rest2),
+    {{objectset_or_fixedtypevalueset_field,TFieldName,Type,
+      OptionalitySpec},Rest3};
+parse_FixedTypeValueSetFieldSpec(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,typefieldreference]}}).
+
+parse_VariableTypeValueSetFieldSpec([{typefieldreference,_,TFieldName}|Rest]) ->
+    {FieldRef,Rest2} = parse_FieldName(Rest),
+    {OptionalitySpec,Rest3} = parse_ValueSetOptionalitySpec(Rest2),
+    {{variabletypevaluesetfield,TFieldName,FieldRef,OptionalitySpec},Rest3};
+parse_VariableTypeValueSetFieldSpec(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,typefieldreference]}}).
+
+parse_ObjectSetFieldSpec([{typefieldreference,_,TFieldName}|Rest]) ->
+    {Class,Rest2} = parse_DefinedObjectClass(Rest),
+    {OptionalitySpec,Rest3} = parse_ObjectSetOptionalitySpec(Rest2),
+    {{objectsetfield,TFieldName,Class,OptionalitySpec},Rest3};
+parse_ObjectSetFieldSpec(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,typefieldreference]}}).
+
+parse_ValueOptionalitySpec(Tokens)->
+    case Tokens of
+	[{'OPTIONAL',_}|Rest] -> {'OPTIONAL',Rest};
+	[{'DEFAULT',_}|Rest] ->
+	    {Value,Rest2} = parse_Value(Rest),
+	    {{'DEFAULT',Value},Rest2};
+	_  -> {'MANDATORY',Tokens}
+    end.
+
+parse_ObjectOptionalitySpec(Tokens) ->
+    case Tokens of
+	[{'OPTIONAL',_}|Rest] -> {'OPTIONAL',Rest};
+	[{'DEFAULT',_}|Rest] ->
+	    {Object,Rest2} = parse_Object(Rest),
+	    {{'DEFAULT',Object},Rest2};
+	_  -> {'MANDATORY',Tokens}
+    end.
+
+parse_TypeOptionalitySpec(Tokens) ->
+    case Tokens of
+	[{'OPTIONAL',_}|Rest] -> {'OPTIONAL',Rest};
+	[{'DEFAULT',_}|Rest] ->
+	    {Type,Rest2} = parse_Type(Rest),
+	    {{'DEFAULT',Type},Rest2};
+	_  -> {'MANDATORY',Tokens}
+    end.
+
+parse_ValueSetOptionalitySpec(Tokens) ->
+    case Tokens of
+	[{'OPTIONAL',_}|Rest] -> {'OPTIONAL',Rest};
+	[{'DEFAULT',_}|Rest] ->
+	    {ValueSet,Rest2} = parse_ValueSet(Rest),
+	    {{'DEFAULT',ValueSet},Rest2};
+	_  -> {'MANDATORY',Tokens}
+    end.
+
+parse_ObjectSetOptionalitySpec(Tokens) ->
+        case Tokens of
+	[{'OPTIONAL',_}|Rest] -> {'OPTIONAL',Rest};
+	[{'DEFAULT',_}|Rest] ->
+	    {ObjectSet,Rest2} = parse_ObjectSet(Rest),
+	    {{'DEFAULT',ObjectSet},Rest2};
+	_  -> {'MANDATORY',Tokens}
+    end.
+
+parse_WithSyntaxSpec([{'WITH',_},{'SYNTAX',_}|Rest]) ->
+    {SyntaxList,Rest2} = parse_SyntaxList(Rest),
+    {{'WITH SYNTAX',SyntaxList},Rest2};
+parse_WithSyntaxSpec(Tokens) ->
+    {[],Tokens}.
+
+parse_SyntaxList([{'{',_},{'}',_}|Rest]) ->
+    {[],Rest};
+parse_SyntaxList([{'{',_}|Rest]) ->
+    parse_SyntaxList(Rest,[]);
+parse_SyntaxList(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,['{}','{']]}}).
+
+parse_SyntaxList(Tokens,Acc) ->
+    {SyntaxList,Rest} = parse_TokenOrGroupSpec(Tokens),
+    case Rest of
+	[{'}',_}|Rest2] ->
+	    {lists:reverse([SyntaxList|Acc]),Rest2};
+	_ ->
+	    parse_SyntaxList(Rest,[SyntaxList|Acc])
+    end.
+
+parse_TokenOrGroupSpec(Tokens) ->
+    Flist = [fun parse_RequiredToken/1,
+	     fun parse_OptionalGroup/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_RequiredToken([{typereference,L1,WordName}|Rest]) ->
+    case is_word(WordName) of
+	false ->
+	    throw({asn1_error,{L1,get(asn1_module),
+			       [got,WordName,expected,a,'Word']}});
+	true ->
+	    {WordName,Rest}
+    end;
+parse_RequiredToken([{',',L1}|Rest]) ->
+    {{',',L1},Rest};
+parse_RequiredToken([{WordName,L1}|Rest]) ->
+    case is_word(WordName) of
+	false ->
+	    throw({asn1_error,{L1,get(asn1_module),
+			       [got,WordName,expected,a,'Word']}});
+	true ->
+	    {WordName,Rest}
+    end;
+parse_RequiredToken(Tokens) ->
+    parse_PrimitiveFieldName(Tokens).
+
+parse_OptionalGroup([{'[',_}|Rest]) ->
+    {Spec,Rest2} = parse_TokenOrGroupSpec(Rest),
+    {SpecList,Rest3} = parse_OptionalGroup(Rest2,[Spec]),
+    {SpecList,Rest3}.
+
+parse_OptionalGroup([{']',_}|Rest],Acc) ->
+    {lists:reverse(Acc),Rest};
+parse_OptionalGroup(Tokens,Acc) ->
+    {Spec,Rest} = parse_TokenOrGroupSpec(Tokens),
+    parse_OptionalGroup(Rest,[Spec|Acc]).
+
+parse_DefinedObject([Id={identifier,_,_ObjName}|Rest]) ->
+    {{object,identifier2Extvalueref(Id)},Rest};
+parse_DefinedObject([{typereference,L1,ModName},{'.',_},{identifier,_,ObjName}|Rest]) ->
+    {{object, #'Externaltypereference'{pos=L1,module=ModName,type=ObjName}},Rest};
+parse_DefinedObject(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+		       [identifier,'typereference.identifier']]}}).
+
+parse_ObjectAssignment([{identifier,L1,ObjName}|Rest]) ->
+    {Class,Rest2} = parse_DefinedObjectClass(Rest),
+    case Rest2 of
+	[{'::=',_}|Rest3] ->
+	    {Object,Rest4} = parse_Object(Rest3),
+	    {#typedef{pos=L1,name=ObjName,
+		      typespec=#'Object'{classname=Class,def=Object}},Rest4};
+	[H|_T]  ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'::=']}});
+	Other ->
+	    throw({asn1_error,{L1,get(asn1_module),
+			       [got,Other,expected,'::=']}})
+    end;
+parse_ObjectAssignment(Tokens) ->
+    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
+				  [got,get_token(hd(Tokens)),expected,identifier]}}).
+
+parse_Object(Tokens) ->
+    Flist=[fun parse_ObjectDefn/1,
+	   fun parse_ObjectFromObject/1,
+	   fun parse_ParameterizedObject/1,
+	   fun parse_DefinedObject/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_ObjectDefn(Tokens) ->
+    Flist=[fun parse_DefaultSyntax/1,
+	   fun parse_DefinedSyntax/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_DefaultSyntax([{'{',_},{'}',_}|Rest]) ->
+    {{object,defaultsyntax,[]},Rest};
+parse_DefaultSyntax([{'{',_}|Rest]) ->
+    parse_DefaultSyntax(Rest,[]);
+parse_DefaultSyntax(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,['{}','{']]}}).
+
+parse_DefaultSyntax(Tokens,Acc) ->
+    {Setting,Rest} = parse_FieldSetting(Tokens),
+    case Rest of
+	[{',',_}|Rest2] ->
+	    parse_DefaultSyntax(Rest2,[Setting|Acc]);
+	[{'}',_}|Rest3] ->
+	    {{object,defaultsyntax,lists:reverse([Setting|Acc])},Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,[',','}']]}})
+    end.
+
+parse_FieldSetting(Tokens) ->
+    {{_,PrimFieldName},Rest} = parse_PrimitiveFieldName(Tokens),
+    {Setting,Rest2} = parse_Setting(Rest),
+    {{PrimFieldName,Setting},Rest2}.
+
+parse_DefinedSyntax([{'{',_}|Rest]) ->
+    parse_DefinedSyntax(Rest,[]).
+
+parse_DefinedSyntax(Tokens,Acc) ->
+    case Tokens of
+	[{'}',_}|Rest2] ->
+	    {{object,definedsyntax,lists:reverse(Acc)},Rest2};
+	_ ->
+	    {DefSynTok,Rest3} = parse_DefinedSyntaxToken(Tokens),
+	    parse_DefinedSyntax(Rest3,[DefSynTok|Acc])
+    end.
+
+parse_DefinedSyntaxToken([{',',L1}|Rest]) ->
+    {{',',L1},Rest};
+parse_DefinedSyntaxToken([{typereference,L1,Name}|Rest]) ->
+    case is_word(Name) of
+	false ->
+	    {{setting,L1,Name},Rest};
+	true ->
+	    {{word_or_setting,L1,Name},Rest}
+    end;
+parse_DefinedSyntaxToken(Tokens) ->
+    case catch parse_Setting(Tokens) of
+	{asn1_error,_} ->
+	    parse_Word(Tokens);
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	Result ->
+	    Result
+    end.
+
+parse_Word([{Name,Pos}|Rest]) ->
+    case is_word(Name) of
+	false ->
+	    throw({asn1_error,{Pos,get(asn1_module),
+			       [got,Name, expected,a,'Word']}});
+	true ->
+	    {{word_or_setting,Pos,Name},Rest}
+    end.
+
+parse_Setting(Tokens) ->
+    Flist = [fun parse_Type/1,
+	     fun parse_Value/1,
+	     fun parse_Object/1,
+	     fun parse_ObjectSet/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_DefinedObjectSet([{typereference,L1,ModuleName},{'.',_},
+			{typereference,L2,ObjSetName}|Rest]) ->
+    {{objectset,L1,#'Externaltypereference'{pos=L2,module=ModuleName,
+					    type=ObjSetName}},Rest};
+parse_DefinedObjectSet([{typereference,L1,ObjSetName}|Rest]) ->
+    {{objectset,L1,#'Externaltypereference'{pos=L1,module=get(asn1_module),
+					    type=ObjSetName}},Rest};
+parse_DefinedObjectSet(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+			[typereference,'typereference.typereference']]}}).
+
+parse_ObjectSetAssignment([{typereference,L1,ObjSetName}|Rest]) ->
+    {Class,Rest2} = parse_DefinedObjectClass(Rest),
+    case Rest2 of
+	[{'::=',_}|Rest3] ->
+	    {ObjectSet,Rest4} = parse_ObjectSet(Rest3),
+	    {#typedef{pos=L1,name=ObjSetName,
+		      typespec=#'ObjectSet'{class=Class,
+					    set=ObjectSet}},Rest4};
+	[H|_T]  ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'::=']}})
+%%%	Other ->
+%%%	    throw(Other)
+    end;
+parse_ObjectSetAssignment(Tokens) ->
+    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
+				  [got,get_token(hd(Tokens)),expected,
+				   typereference]}}).
+
+parse_ObjectSet([{'{',_}|Rest]) ->
+    {ObjSetSpec,Rest2} = parse_ObjectSetSpec(Rest),
+    case Rest2 of
+	[{'}',_}|Rest3] ->
+	    {ObjSetSpec,Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'}']}})
+    end;
+parse_ObjectSet(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'{']}}).
+
+parse_ObjectSetSpec([{'...',_}|Rest]) ->
+    {['EXTENSIONMARK'],Rest};
+parse_ObjectSetSpec(Tokens) ->
+    parse_ElementSetSpecs(Tokens).
+
+parse_ObjectSetElements(Tokens) ->
+    Flist = [fun parse_Object/1,
+	     fun parse_DefinedObjectSet/1,
+	     fun parse_ObjectSetFromObjects/1,
+	     fun parse_ParameterizedObjectSet/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_ObjectClassFieldType(Tokens) ->
+    {Class,Rest} = parse_DefinedObjectClass(Tokens),
+    case Rest of
+	[{'.',_}|Rest2] ->
+	    {FieldName,Rest3} = parse_FieldName(Rest2),
+	    OCFT = #'ObjectClassFieldType'{
+	      classname=Class,
+	      class=Class,fieldname=FieldName},
+	    {#type{def=OCFT},Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'.']}})
+%%%	Other ->
+%%%	    throw(Other)
+    end.
+
+%parse_ObjectClassFieldValue(Tokens) ->
+%    Flist = [fun parse_OpenTypeFieldVal/1,
+%	     fun parse_FixedTypeFieldVal/1],
+%    case (catch parse_or(Tokens,Flist)) of
+%	{'EXIT',Reason} ->
+%	    throw(Reason);
+%	AsnErr = {asn1_error,_} ->
+%	    throw(AsnErr);
+%	Result ->
+%	    Result
+%    end.
+
+parse_ObjectClassFieldValue(Tokens) ->
+    parse_OpenTypeFieldVal(Tokens).
+
+parse_OpenTypeFieldVal(Tokens) ->
+    {Type,Rest} = parse_Type(Tokens),
+    case Rest of
+	[{':',_}|Rest2] ->
+	    {Value,Rest3} = parse_Value(Rest2),
+	    {{opentypefieldvalue,Type,Value},Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,':']}})
+    end.
+
+% parse_FixedTypeFieldVal(Tokens) ->
+%     parse_Value(Tokens).
+
+% parse_InformationFromObjects(Tokens) ->
+%     Flist = [fun parse_ValueFromObject/1,
+% 	     fun parse_ValueSetFromObjects/1,
+% 	     fun parse_TypeFromObject/1,
+% 	     fun parse_ObjectFromObject/1],
+%     case (catch parse_or(Tokens,Flist)) of
+% 	{'EXIT',Reason} ->
+% 	    throw(Reason);
+% 	AsnErr = {asn1_error,_} ->
+% 	    throw(AsnErr);
+% 	Result ->
+% 	    Result
+%     end.
+
+parse_ReferencedObjects(Tokens) ->
+    Flist = [fun parse_DefinedObject/1,
+	     fun parse_DefinedObjectSet/1,
+	     fun parse_ParameterizedObject/1,
+	     fun parse_ParameterizedObjectSet/1],
+        case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_ValueFromObject(Tokens) ->
+    {Objects,Rest} = parse_ReferencedObjects(Tokens),
+    case Rest of
+	[{'.',_}|Rest2] ->
+	    {Name,Rest3} = parse_FieldName(Rest2),
+	    case lists:last(Name) of
+		{valuefieldreference,_} ->
+		    {{'ValueFromObject',Objects,Name},Rest3};
+		_ ->
+		    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+				       [got,typefieldreference,expected,
+					valuefieldreference]}})
+	    end;
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'.']}})
+%%%	Other ->
+%%%	    throw({asn1_error,{got,Other,expected,'.'}})
+    end.
+
+parse_ValueSetFromObjects(Tokens) ->
+    {Objects,Rest} = parse_ReferencedObjects(Tokens),
+    case Rest of
+	[{'.',_}|Rest2] ->
+	    {Name,Rest3} = parse_FieldName(Rest2),
+	    case lists:last(Name) of
+		{typefieldreference,_FieldName} ->
+		    {{'ValueSetFromObjects',Objects,Name},Rest3};
+		_ ->
+		    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+				       [got,get_token(hd(Rest2)),expected,
+					typefieldreference]}})
+	    end;
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'.']}})
+%%%	Other ->
+%%%	    throw({asn1_error,{got,Other,expected,'.'}})
+    end.
+
+parse_TypeFromObject(Tokens) ->
+    {Objects,Rest} = parse_ReferencedObjects(Tokens),
+    case Rest of
+	[{'.',_}|Rest2] ->
+	    {Name,Rest3} = parse_FieldName(Rest2),
+	    case lists:last(Name) of
+		{typefieldreference,_FieldName} ->
+		    {{'TypeFromObject',Objects,Name},Rest3};
+		_ ->
+		    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+				       [got,get_token(hd(Rest2)),expected,
+					typefieldreference]}})
+	    end;
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'.']}})
+%%%	Other ->
+%%%	    throw({asn1_error,{got,Other,expected,'.'}})
+    end.
+
+parse_ObjectFromObject(Tokens) ->
+    {Objects,Rest} = parse_ReferencedObjects(Tokens),
+    case Rest of
+	[{'.',_}|Rest2] ->
+	    {Name,Rest3} = parse_FieldName(Rest2),
+	    {{'ObjectFromObject',Objects,Name},Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'.']}})
+%%%	Other ->
+%%%	    throw({asn1_error,{got,Other,expected,'.'}})
+    end.
+
+parse_ObjectSetFromObjects(Tokens) ->
+    {Objects,Rest} = parse_ReferencedObjects(Tokens),
+    case Rest of
+	[{'.',_}|Rest2] ->
+	    {Name,Rest3} = parse_FieldName(Rest2),
+	    {{'ObjectSetFromObjects',Objects,Name},Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'.']}})
+%%%	Other ->
+%%%	    throw({asn1_error,{got,Other,expected,'.'}})
+    end.
+
+% parse_InstanceOfType([{'INSTANCE',_},{'OF',_}|Rest]) ->
+%     {Class,Rest2} = parse_DefinedObjectClass(Rest),
+%     {{'InstanceOfType',Class},Rest2}.
+
+% parse_InstanceOfValue(Tokens) ->
+%     parse_Value(Tokens).
+
+
+
+%% X.682 constraint specification
+
+parse_GeneralConstraint(Tokens) ->
+    Flist = [fun parse_UserDefinedConstraint/1,
+	     fun parse_TableConstraint/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_UserDefinedConstraint([{'CONSTRAINED',_},{'BY',_},{'{',_},{'}',_}|Rest])->
+    {{constrained_by,[]},Rest};
+parse_UserDefinedConstraint([{'CONSTRAINED',_},
+			     {'BY',_},
+			     {'{',_}|Rest]) ->
+    {Param,Rest2} = parse_UserDefinedConstraintParameter(Rest),
+    case Rest2 of
+	[{'}',_}|Rest3] ->
+	    {{constrained_by,Param},Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'}']}})
+    end;
+parse_UserDefinedConstraint(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+			['CONSTRAINED BY {}','CONSTRAINED BY {']]}}).
+
+parse_UserDefinedConstraintParameter(Tokens) ->
+    parse_UserDefinedConstraintParameter(Tokens,[]).
+parse_UserDefinedConstraintParameter(Tokens,Acc) ->
+    Flist = [fun parse_GovernorAndActualParameter/1,
+	     fun parse_ActualParameter/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	{Result,Rest} ->
+	    case Rest of
+		[{',',_}|_Rest2] ->
+		    parse_UserDefinedConstraintParameter(Tokens,[Result|Acc]);
+		_  ->
+		    {lists:reverse([Result|Acc]),Rest}
+	    end
+    end.
+
+parse_GovernorAndActualParameter(Tokens) ->
+    {Governor,Rest} = parse_Governor(Tokens),
+    case Rest of
+	[{':',_}|Rest2] ->
+	    {Params,Rest3} = parse_ActualParameter(Rest2),
+	    {{'Governor_Params',Governor,Params},Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,':']}})
+    end.
+
+parse_TableConstraint(Tokens) ->
+    Flist = [fun parse_ComponentRelationConstraint/1,
+	     fun parse_SimpleTableConstraint/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_SimpleTableConstraint(Tokens) ->
+    {ObjectSet,Rest} = parse_ObjectSet(Tokens),
+    {{simpletable,ObjectSet},Rest}.
+
+parse_ComponentRelationConstraint([{'{',_}|Rest]) ->
+    {ObjectSet,Rest2} = parse_DefinedObjectSet(Rest),
+    case Rest2 of
+	[{'}',_},{'{',_}|Rest3] ->
+	    {AtNot,Rest4} = parse_AtNotationList(Rest3,[]),
+	    case Rest4 of
+		[{'}',_}|Rest5] ->
+		    {{componentrelation,ObjectSet,AtNot},Rest5};
+		[H|_T]  ->
+		    throw({asn1_error,{get_line(H),get(asn1_module),
+				       [got,get_token(H),expected,'}']}})
+	    end;
+	[H|_T]  ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,
+				'ComponentRelationConstraint',ended,with,'}']}})
+%%%	Other ->
+%%%	    throw(Other)
+    end;
+parse_ComponentRelationConstraint(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'{']}}).
+
+parse_AtNotationList(Tokens,Acc) ->
+    {AtNot,Rest} = parse_AtNotation(Tokens),
+    case Rest of
+	[{',',_}|Rest2] ->
+	    parse_AtNotationList(Rest2,[AtNot|Acc]);
+	_  ->
+	    {lists:reverse([AtNot|Acc]),Rest}
+    end.
+
+parse_AtNotation([{'@',_},{'.',_}|Rest]) ->
+    {CIdList,Rest2} = parse_ComponentIdList(Rest),
+    {{innermost,CIdList},Rest2};
+parse_AtNotation([{'@',_}|Rest]) ->
+    {CIdList,Rest2} = parse_ComponentIdList(Rest),
+    {{outermost,CIdList},Rest2};
+parse_AtNotation(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,['@','@.']]}}).
+
+parse_ComponentIdList(Tokens) ->
+    parse_ComponentIdList(Tokens,[]).
+
+parse_ComponentIdList([Id = {identifier,_,_},{'.',_}|Rest],Acc) ->
+    parse_ComponentIdList(Rest,[identifier2Extvalueref(Id)|Acc]);
+parse_ComponentIdList([Id = {identifier,_,_}|Rest],Acc) ->
+    {lists:reverse([identifier2Extvalueref(Id)|Acc]),Rest};
+parse_ComponentIdList(Tokens,_) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+			[identifier,'identifier.']]}}).
+
+
+
+
+
+% X.683 Parameterization of ASN.1 specifications
+
+parse_Governor(Tokens) ->
+    Flist = [fun parse_Type/1,
+	     fun parse_DefinedObjectClass/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_ActualParameter(Tokens) ->
+    Flist = [fun parse_Type/1,
+	     fun parse_Value/1,
+	     fun parse_ValueSet/1,
+	     fun parse_DefinedObjectClass/1,
+	     fun parse_Object/1,
+	     fun parse_ObjectSet/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_ParameterizedAssignment(Tokens) ->
+    Flist = [fun parse_ParameterizedTypeAssignment/1,
+	     fun parse_ParameterizedValueAssignment/1,
+	     fun parse_ParameterizedValueSetTypeAssignment/1,
+	     fun parse_ParameterizedObjectClassAssignment/1,
+	     fun parse_ParameterizedObjectAssignment/1,
+	     fun parse_ParameterizedObjectSetAssignment/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	AsnAssErr = {asn1_assignment_error,_} ->
+	    throw(AsnAssErr);
+	Result ->
+	    Result
+    end.
+
+parse_ParameterizedTypeAssignment([{typereference,L1,Name}|Rest]) ->
+    {ParameterList,Rest2} = parse_ParameterList(Rest),
+    case Rest2 of
+	[{'::=',_}|Rest3] ->
+	    {Type,Rest4} = parse_Type(Rest3),
+	    {#ptypedef{pos=L1,name=Name,args=ParameterList,typespec=Type},
+	     Rest4};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'::=']}})
+    end;
+parse_ParameterizedTypeAssignment(Tokens) ->
+    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
+				  [got,get_token(hd(Tokens)),expected,
+				   typereference]}}).
+
+parse_ParameterizedValueAssignment([{identifier,L1,Name}|Rest]) ->
+    {ParameterList,Rest2} = parse_ParameterList(Rest),
+    {Type,Rest3} = parse_Type(Rest2),
+    case Rest3 of
+	[{'::=',_}|Rest4] ->
+	    {Value,Rest5} = parse_Value(Rest4),
+	    {#pvaluedef{pos=L1,name=Name,args=ParameterList,type=Type,
+			 value=Value},Rest5};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'::=']}})
+    end;
+parse_ParameterizedValueAssignment(Tokens) ->
+    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
+				  [got,get_token(hd(Tokens)),expected,identifier]}}).
+
+parse_ParameterizedValueSetTypeAssignment([{typereference,L1,Name}|Rest]) ->
+    {ParameterList,Rest2} = parse_ParameterList(Rest),
+    {Type,Rest3} = parse_Type(Rest2),
+    case Rest3 of
+	[{'::=',_}|Rest4] ->
+	    {ValueSet,Rest5} = parse_ValueSet(Rest4),
+	    {#pvaluesetdef{pos=L1,name=Name,args=ParameterList,
+			   type=Type,valueset=ValueSet},Rest5};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'::=']}})
+    end;
+parse_ParameterizedValueSetTypeAssignment(Tokens) ->
+    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
+				  [got,get_token(hd(Tokens)),expected,
+				   typereference]}}).
+
+parse_ParameterizedObjectClassAssignment([{typereference,L1,Name}|Rest]) ->
+    {ParameterList,Rest2} = parse_ParameterList(Rest),
+    case Rest2 of
+	[{'::=',_}|Rest3] ->
+	    {Class,Rest4} = parse_ObjectClass(Rest3),
+	    {#ptypedef{pos=L1,name=Name,args=ParameterList,typespec=Class},
+	     Rest4};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'::=']}})
+    end;
+parse_ParameterizedObjectClassAssignment(Tokens) ->
+    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
+				  [got,get_token(hd(Tokens)),expected,
+				   typereference]}}).
+
+parse_ParameterizedObjectAssignment([{identifier,L1,Name}|Rest]) ->
+    {ParameterList,Rest2} = parse_ParameterList(Rest),
+    {Class,Rest3} = parse_DefinedObjectClass(Rest2),
+    case Rest3 of
+	[{'::=',_}|Rest4] ->
+	    {Object,Rest5} = parse_Object(Rest4),
+	    {#pobjectdef{pos=L1,name=Name,args=ParameterList,
+			 class=Class,def=Object},Rest5};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'::=']}})
+%%%	Other ->
+%%%	    throw(Other)
+    end;
+parse_ParameterizedObjectAssignment(Tokens) ->
+    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
+				  [got,get_token(hd(Tokens)),expected,identifier]}}).
+
+parse_ParameterizedObjectSetAssignment([{typereference,L1,Name}|Rest]) ->
+    {ParameterList,Rest2} = parse_ParameterList(Rest),
+    {Class,Rest3} = parse_DefinedObjectClass(Rest2),
+    case Rest3 of
+	[{'::=',_}|Rest4] ->
+	    {ObjectSet,Rest5} = parse_ObjectSet(Rest4),
+	    {#pobjectsetdef{pos=L1,name=Name,args=ParameterList,
+			    class=Class,def=ObjectSet},Rest5};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'::=']}})
+%%%	Other ->
+%%%	    throw(Other)
+    end;
+parse_ParameterizedObjectSetAssignment(Tokens) ->
+    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
+				  [got,get_token(hd(Tokens)),expected,
+				   typereference]}}).
+
+parse_ParameterList([{'{',_}|Rest]) ->
+    parse_ParameterList(Rest,[]);
+parse_ParameterList(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'{']}}).
+
+parse_ParameterList(Tokens,Acc) ->
+    {Parameter,Rest} = parse_Parameter(Tokens),
+    case Rest of
+	[{',',_}|Rest2] ->
+	    parse_ParameterList(Rest2,[Parameter|Acc]);
+	[{'}',_}|Rest3] ->
+	    {lists:reverse([Parameter|Acc]),Rest3};
+	[H|_T]  ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,[',','}']]}})
+    end.
+
+parse_Parameter(Tokens) ->
+    Flist = [fun parse_ParamGovAndRef/1,
+	     fun parse_Reference/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_ParamGovAndRef(Tokens) ->
+    {ParamGov,Rest} = parse_ParamGovernor(Tokens),
+    case Rest of
+	[{':',_}|Rest2] ->
+	    {Ref,Rest3} = parse_Reference(Rest2),
+	    {{ParamGov,Ref},Rest3};
+	[H|_T] ->
+	   throw({asn1_error,{get_line(H),get(asn1_module),
+			      [got,get_token(H),expected,':']}})
+    end.
+
+parse_ParamGovernor(Tokens) ->
+    Flist = [fun parse_Governor/1,
+	     fun parse_Reference/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+% parse_ParameterizedReference(Tokens) ->
+%     {Ref,Rest} = parse_Reference(Tokens),
+%     case Rest of
+% 	[{'{',_},{'}',_}|Rest2] ->
+% 	    {{ptref,Ref},Rest2};
+% 	_  ->
+% 	    {{ptref,Ref},Rest}
+%     end.
+
+parse_SimpleDefinedType([{typereference,L1,ModuleName},{'.',_},
+			 {typereference,_,TypeName}|Rest]) ->
+    {#'Externaltypereference'{pos=L1,module=ModuleName,
+						 type=TypeName},Rest};
+parse_SimpleDefinedType([Tref={typereference,_,_}|Rest]) ->
+%    {#'Externaltypereference'{pos=L2,module=get(asn1_module),
+%						 type=TypeName},Rest};
+    {tref2Exttref(Tref),Rest};
+parse_SimpleDefinedType(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+			[typereference,'typereference.typereference']]}}).
+
+parse_SimpleDefinedValue([{typereference,L1,ModuleName},{'.',_},
+			  {identifier,_,Value}|Rest]) ->
+    {{simpledefinedvalue,#'Externalvaluereference'{pos=L1,module=ModuleName,
+						   value=Value}},Rest};
+parse_SimpleDefinedValue([{identifier,L2,Value}|Rest]) ->
+    {{simpledefinedvalue,L2,Value},Rest};
+parse_SimpleDefinedValue(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+			['typereference.identifier',identifier]]}}).
+
+parse_ParameterizedType(Tokens) ->
+    {Type,Rest} = parse_SimpleDefinedType(Tokens),
+    {Params,Rest2} = parse_ActualParameterList(Rest),
+    {{pt,Type,Params},Rest2}.
+
+parse_ParameterizedValue(Tokens) ->
+    {Value,Rest} = parse_SimpleDefinedValue(Tokens),
+    {Params,Rest2} = parse_ActualParameterList(Rest),
+    {{pv,Value,Params},Rest2}.
+
+parse_ParameterizedObjectClass(Tokens) ->
+    {Type,Rest} = parse_DefinedObjectClass(Tokens),
+    {Params,Rest2} = parse_ActualParameterList(Rest),
+    {{poc,Type,Params},Rest2}.
+
+parse_ParameterizedObjectSet(Tokens) ->
+    {ObjectSet,Rest} = parse_DefinedObjectSet(Tokens),
+    {Params,Rest2} = parse_ActualParameterList(Rest),
+    {{pos,ObjectSet,Params},Rest2}.
+
+parse_ParameterizedObject(Tokens) ->
+    {Object,Rest} = parse_DefinedObject(Tokens),
+    {Params,Rest2} = parse_ActualParameterList(Rest),
+    {{po,Object,Params},Rest2}.
+
+parse_ActualParameterList([{'{',_}|Rest]) ->
+    parse_ActualParameterList(Rest,[]);
+parse_ActualParameterList(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'{']}}).
+
+parse_ActualParameterList(Tokens,Acc) ->
+    {Parameter,Rest} = parse_ActualParameter(Tokens),
+    case Rest of
+	[{',',_}|Rest2] ->
+	    parse_ActualParameterList(Rest2,[Parameter|Acc]);
+	[{'}',_}|Rest3] ->
+	    {lists:reverse([Parameter|Acc]),Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,[',','}']]}})
+%%%	Other ->
+%%%	    throw(Other)
+    end.
+
+
+
+
+
+
+
+%-------------------------
+
+is_word(Token) ->
+    case not_allowed_word(Token) of
+	true -> false;
+	_ ->
+	    if
+		atom(Token) ->
+		    Item = atom_to_list(Token),
+		    is_word(Item);
+		list(Token), length(Token) == 1 ->
+		    check_one_char_word(Token);
+		list(Token) ->
+		    [A|Rest] = Token,
+		    case check_first(A) of
+			true ->
+			    check_rest(Rest);
+			_ ->
+			    false
+		    end
+	    end
+    end.
+
+not_allowed_word(Name) ->
+    lists:member(Name,["BIT",
+		       "BOOLEAN",
+		       "CHARACTER",
+		       "CHOICE",
+		       "EMBEDDED",
+		       "END",
+		       "ENUMERATED",
+		       "EXTERNAL",
+		       "FALSE",
+		       "INSTANCE",
+		       "INTEGER",
+		       "INTERSECTION",
+		       "MINUS-INFINITY",
+		       "NULL",
+		       "OBJECT",
+		       "OCTET",
+		       "PLUS-INFINITY",
+		       "REAL",
+		       "SEQUENCE",
+		       "SET",
+		       "TRUE",
+		       "UNION"]).
+
+check_one_char_word([A]) when $A =< A, $Z >= A ->
+    true;
+check_one_char_word([_]) ->
+    false. %% unknown item in SyntaxList
+
+check_first(A) when $A =< A, $Z >= A ->
+    true;
+check_first(_) ->
+    false. %% unknown item in SyntaxList
+
+check_rest([R,R|_Rs]) when $- == R ->
+    false; %% two consecutive hyphens are not allowed in a word
+check_rest([R]) when $- == R ->
+    false; %% word cannot end with hyphen
+check_rest([R|Rs]) when $A=<R, $Z>=R; $-==R ->
+    check_rest(Rs);
+check_rest([]) ->
+    true;
+check_rest(_) ->
+    false.
+
+
+to_set(V) when list(V) ->
+	ordsets:list_to_set(V);
+to_set(V) ->
+	ordsets:list_to_set([V]).
+
+
+parse_AlternativeTypeLists(Tokens) ->
+    {AlternativeTypeList,Rest1} = parse_AlternativeTypeList(Tokens),
+    {ExtensionAndException,Rest2} =
+	case Rest1 of
+	    [{',',_},{'...',L1},{'!',_}|Rest12] ->
+		{_,Rest13} = parse_ExceptionIdentification(Rest12),
+		%% Exception info is currently thrown away
+		{[#'EXTENSIONMARK'{pos=L1}],Rest13};
+	    [{',',_},{'...',L1}|Rest12] ->
+		{[#'EXTENSIONMARK'{pos=L1}],Rest12};
+	    _ ->
+		{[],Rest1}
+	end,
+    case ExtensionAndException of
+	[] ->
+	    {AlternativeTypeList,Rest2};
+	_ ->
+	    {ExtensionAddition,Rest3} =
+		case Rest2 of
+		    [{',',_}|Rest23] ->
+			parse_ExtensionAdditionAlternativeList(Rest23);
+		    _ ->
+			{[],Rest2}
+		end,
+	    {OptionalExtensionMarker,Rest4} =
+		case Rest3 of
+		    [{',',_},{'...',L3}|Rest31] ->
+			{[#'EXTENSIONMARK'{pos=L3}],Rest31};
+		    _ ->
+			{[],Rest3}
+		end,
+	    {AlternativeTypeList ++ ExtensionAndException ++ ExtensionAddition ++ OptionalExtensionMarker, Rest4}
+    end.
+
+
+parse_AlternativeTypeList(Tokens) ->
+    parse_AlternativeTypeList(Tokens,[]).
+
+parse_AlternativeTypeList(Tokens,Acc) ->
+    {NamedType,Rest} = parse_NamedType(Tokens),
+    case Rest of
+	[{',',_},Id = {identifier,_,_}|Rest2] ->
+	    parse_AlternativeTypeList([Id|Rest2],[NamedType|Acc]);
+	_ ->
+	    {lists:reverse([NamedType|Acc]),Rest}
+    end.
+
+
+
+parse_ExtensionAdditionAlternativeList(Tokens) ->
+    parse_ExtensionAdditionAlternativeList(Tokens,[]).
+
+parse_ExtensionAdditionAlternativeList(Tokens,Acc) ->
+    {Element,Rest0} =
+	case Tokens of
+	    [{identifier,_,_}|_Rest] ->
+		parse_NamedType(Tokens);
+	    [{'[[',_}|_] ->
+		parse_ExtensionAdditionAlternatives(Tokens)
+	end,
+    case Rest0 of
+	[{',',_}|Rest01] ->
+	    parse_ExtensionAdditionAlternativeList(Rest01,[Element|Acc]);
+	_  ->
+	    {lists:reverse([Element|Acc]),Rest0}
+    end.
+
+parse_ExtensionAdditionAlternatives([{'[[',_}|Rest]) ->
+    parse_ExtensionAdditionAlternatives(Rest,[]);
+parse_ExtensionAdditionAlternatives(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'[[']}}).
+
+parse_ExtensionAdditionAlternatives([Id = {identifier,_,_}|Rest],Acc) ->
+    {NamedType, Rest2} = parse_NamedType([Id|Rest]),
+    case Rest2 of
+	[{',',_}|Rest21] ->
+	    parse_ExtensionAdditionAlternatives(Rest21,[NamedType|Acc]);
+	[{']]',_}|Rest21] ->
+	    {lists:reverse(Acc),Rest21};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,[',',']]']]}})
+    end.
+
+parse_NamedType([{identifier,L1,Idname}|Rest]) ->
+    {Type,Rest2} = parse_Type(Rest),
+    {#'ComponentType'{pos=L1,name=Idname,typespec=Type,prop=mandatory},Rest2};
+parse_NamedType(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,identifier]}}).
+
+
+parse_ComponentTypeLists(Tokens) ->
+%    Resulting tuple {ComponentTypeList,Rest1} is returned
+    case Tokens of
+	[{identifier,_,_}|_Rest0] ->
+	    {Clist,Rest01} = parse_ComponentTypeList(Tokens),
+	    case Rest01 of
+		[{',',_}|Rest02] ->
+		    parse_ComponentTypeLists(Rest02,Clist);
+		_ ->
+		    {Clist,Rest01}
+	    end;
+	[{'COMPONENTS',_},{'OF',_}|_Rest] ->
+	    {Clist,Rest01} = parse_ComponentTypeList(Tokens),
+	    case Rest01 of
+		[{',',_}|Rest02] ->
+		    parse_ComponentTypeLists(Rest02,Clist);
+		_ ->
+		    {Clist,Rest01}
+	    end;
+	_ ->
+	    parse_ComponentTypeLists(Tokens,[])
+    end.
+
+parse_ComponentTypeLists([{'...',L1},{'!',_}|Rest],Clist1) ->
+    {_,Rest2} = parse_ExceptionIdentification(Rest),
+    %% Exception info is currently thrown away
+    parse_ComponentTypeLists2(Rest2,Clist1++[#'EXTENSIONMARK'{pos=L1}]);
+parse_ComponentTypeLists([{'...',L1}|Rest],Clist1) ->
+    parse_ComponentTypeLists2(Rest,Clist1++[#'EXTENSIONMARK'{pos=L1}]);
+parse_ComponentTypeLists(Tokens,Clist1) ->
+    {Clist1,Tokens}.
+
+
+parse_ComponentTypeLists2(Tokens,Clist1) ->
+    {ExtensionAddition,Rest2} =
+	case Tokens of
+	    [{',',_}|Rest1] ->
+		parse_ExtensionAdditionList(Rest1);
+	    _ ->
+		{[],Tokens}
+	end,
+    {OptionalExtensionMarker,Rest3} =
+	case Rest2 of
+	    [{',',_},{'...',L2}|Rest21] ->
+		{[#'EXTENSIONMARK'{pos=L2}],Rest21};
+	    _ ->
+		{[],Rest2}
+	end,
+    {RootComponentTypeList,Rest4} =
+	case Rest3 of
+	    [{',',_}|Rest31] ->
+		parse_ComponentTypeList(Rest31);
+	    _ ->
+		{[],Rest3}
+	end,
+    {Clist1 ++ ExtensionAddition ++ OptionalExtensionMarker ++ RootComponentTypeList, Rest4}.
+
+
+parse_ComponentTypeList(Tokens) ->
+    parse_ComponentTypeList(Tokens,[]).
+
+parse_ComponentTypeList(Tokens,Acc) ->
+    {ComponentType,Rest} = parse_ComponentType(Tokens),
+    case Rest of
+	[{',',_},Id = {identifier,_,_}|Rest2] ->
+	    parse_ComponentTypeList([Id|Rest2],[ComponentType|Acc]);
+	[{',',_},C1={'COMPONENTS',_},C2={'OF',_}|Rest2] ->
+	    parse_ComponentTypeList([C1,C2|Rest2],[ComponentType|Acc]);
+% 	_ ->
+% 	    {lists:reverse([ComponentType|Acc]),Rest}
+	[{'}',_}|_] ->
+	    {lists:reverse([ComponentType|Acc]),Rest};
+	[{',',_},{'...',_}|_] ->
+	    {lists:reverse([ComponentType|Acc]),Rest};
+	_ ->
+	    throw({asn1_error,
+		   {get_line(hd(Tokens)),get(asn1_module),
+		    [got,[get_token(hd(Rest)),get_token(hd(tl(Rest)))],
+		     expected,['}',', identifier']]}})
+    end.
+
+
+parse_ExtensionAdditionList(Tokens) ->
+    parse_ExtensionAdditionList(Tokens,[]).
+
+parse_ExtensionAdditionList(Tokens,Acc) ->
+    {Element,Rest0} =
+	case Tokens of
+	    [{identifier,_,_}|_Rest] ->
+		parse_ComponentType(Tokens);
+	    [{'[[',_}|_] ->
+		parse_ExtensionAdditions(Tokens);
+	    _ ->
+		throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+				   [got,get_token(hd(Tokens)),expected,
+				    [identifier,'[[']]}})
+	end,
+    case Rest0 of
+	[{',',_}|Rest01] ->
+	    parse_ExtensionAdditionList(Rest01,[Element|Acc]);
+	_  ->
+	    {lists:reverse([Element|Acc]),Rest0}
+    end.
+
+parse_ExtensionAdditions([{'[[',_}|Rest]) ->
+    parse_ExtensionAdditions(Rest,[]);
+parse_ExtensionAdditions(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'[[']}}).
+
+parse_ExtensionAdditions([Id = {identifier,_,_}|Rest],Acc) ->
+    {ComponentType, Rest2} = parse_ComponentType([Id|Rest]),
+    case Rest2 of
+	[{',',_}|Rest21] ->
+	    parse_ExtensionAdditions(Rest21,[ComponentType|Acc]);
+	[{']]',_}|Rest21] ->
+	    {lists:reverse(Acc),Rest21};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,[',',']]']]}})
+    end;
+parse_ExtensionAdditions(Tokens,_) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,identifier]}}).
+
+parse_ComponentType([{'COMPONENTS',_},{'OF',_}|Rest]) ->
+    {Type,Rest2} = parse_Type(Rest),
+    {{'COMPONENTS OF',Type},Rest2};
+parse_ComponentType(Tokens) ->
+    {NamedType,Rest} = parse_NamedType(Tokens),
+    case Rest of
+	[{'OPTIONAL',_}|Rest2] ->
+	    {NamedType#'ComponentType'{prop='OPTIONAL'},Rest2};
+	[{'DEFAULT',_}|Rest2] ->
+	    {Value,Rest21} = parse_Value(Rest2),
+	    {NamedType#'ComponentType'{prop={'DEFAULT',Value}},Rest21};
+	_ ->
+	    {NamedType,Rest}
+    end.
+
+
+
+parse_SignedNumber([{number,_,Value}|Rest]) ->
+    {Value,Rest};
+parse_SignedNumber([{'-',_},{number,_,Value}|Rest]) ->
+    {-Value,Rest};
+parse_SignedNumber(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,
+			[number,'-number']]}}).
+
+parse_Enumerations(Tokens=[{identifier,_,_}|_Rest]) ->
+    parse_Enumerations(Tokens,[]);
+parse_Enumerations([H|_T]) ->
+    throw({asn1_error,{get_line(H),get(asn1_module),
+		       [got,get_token(H),expected,identifier]}}).
+
+parse_Enumerations(Tokens = [{identifier,_,_},{'(',_}|_Rest], Acc) ->
+    {NamedNumber,Rest2} = parse_NamedNumber(Tokens),
+    case Rest2 of
+	[{',',_}|Rest3] ->
+	    parse_Enumerations(Rest3,[NamedNumber|Acc]);
+	_ ->
+	    {lists:reverse([NamedNumber|Acc]),Rest2}
+    end;
+parse_Enumerations([{identifier,_,Id}|Rest], Acc) ->
+    case Rest of
+	[{',',_}|Rest2] ->
+	    parse_Enumerations(Rest2,[Id|Acc]);
+	_ ->
+	    {lists:reverse([Id|Acc]),Rest}
+    end;
+parse_Enumerations([{'...',_}|Rest], Acc) ->
+    case Rest of
+	[{',',_}|Rest2] ->
+	    parse_Enumerations(Rest2,['EXTENSIONMARK'|Acc]);
+	_ ->
+	    {lists:reverse(['EXTENSIONMARK'|Acc]),Rest}
+    end;
+parse_Enumerations([H|_T],_) ->
+    throw({asn1_error,{get_line(H),get(asn1_module),
+		       [got,get_token(H),expected,identifier]}}).
+
+parse_NamedNumberList(Tokens) ->
+    parse_NamedNumberList(Tokens,[]).
+
+parse_NamedNumberList(Tokens,Acc) ->
+    {NamedNum,Rest} = parse_NamedNumber(Tokens),
+    case Rest of
+	[{',',_}|Rest2] ->
+	    parse_NamedNumberList(Rest2,[NamedNum|Acc]);
+	_ ->
+	    {lists:reverse([NamedNum|Acc]),Rest}
+    end.
+
+parse_NamedNumber([{identifier,_,Name},{'(',_}|Rest]) ->
+    Flist = [fun parse_SignedNumber/1,
+	     fun parse_DefinedValue/1],
+    case (catch parse_or(Rest,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	{NamedNum,[{')',_}|Rest2]} ->
+	    {{'NamedNumber',Name,NamedNum},Rest2};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
+			       [got,get_token(hd(Rest)),expected,'NamedNumberList']}})
+    end;
+parse_NamedNumber(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,identifier]}}).
+
+
+parse_Tag([{'[',_}|Rest]) ->
+    {Class,Rest2} = parse_Class(Rest),
+    {ClassNumber,Rest3} =
+	case Rest2 of
+	    [{number,_,Num}|Rest21] ->
+		{Num,Rest21};
+	    _ ->
+		parse_DefinedValue(Rest2)
+	end,
+    case Rest3 of
+	[{']',_}|Rest4] ->
+	    {#tag{class=Class,number=ClassNumber},Rest4};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest3)),get(asn1_module),
+			       [got,get_token(hd(Rest3)),expected,']']}})
+    end;
+parse_Tag(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'[']}}).
+
+parse_Class([{'UNIVERSAL',_}|Rest]) ->
+    {'UNIVERSAL',Rest};
+parse_Class([{'APPLICATION',_}|Rest]) ->
+    {'APPLICATION',Rest};
+parse_Class([{'PRIVATE',_}|Rest]) ->
+    {'PRIVATE',Rest};
+parse_Class(Tokens) ->
+    {'CONTEXT',Tokens}.
+
+parse_Value(Tokens) ->
+    Flist = [fun parse_BuiltinValue/1,
+	     fun parse_ValueFromObject/1,
+	     fun parse_DefinedValue/1],
+
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end.
+
+parse_BuiltinValue([{bstring,_,Bstr}|Rest]) ->
+    {{bstring,Bstr},Rest};
+parse_BuiltinValue([{hstring,_,Hstr}|Rest]) ->
+    {{hstring,Hstr},Rest};
+parse_BuiltinValue([{'{',_},{'}',_}|Rest]) ->
+    {[],Rest};
+parse_BuiltinValue(Tokens = [{'{',_}|_Rest]) ->
+    Flist = [
+	     fun parse_SequenceOfValue/1,
+	     fun parse_SequenceValue/1,
+	     fun parse_ObjectIdentifierValue/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	Result ->
+	    Result
+    end;
+parse_BuiltinValue([{identifier,_,IdName},{':',_}|Rest]) ->
+    {Value,Rest2} = parse_Value(Rest),
+    {{'CHOICE',{IdName,Value}},Rest2};
+parse_BuiltinValue([{'NULL',_}|Rest]) ->
+    {'NULL',Rest};
+parse_BuiltinValue([{'TRUE',_}|Rest]) ->
+    {true,Rest};
+parse_BuiltinValue([{'FALSE',_}|Rest]) ->
+    {false,Rest};
+parse_BuiltinValue([{'PLUS-INFINITY',_}|Rest]) ->
+    {'PLUS-INFINITY',Rest};
+parse_BuiltinValue([{'MINUS-INFINITY',_}|Rest]) ->
+    {'MINUS-INFINITY',Rest};
+parse_BuiltinValue([{cstring,_,Cstr}|Rest]) ->
+    {Cstr,Rest};
+parse_BuiltinValue([{number,_,Num}|Rest]) ->
+    {Num,Rest};
+parse_BuiltinValue([{'-',_},{number,_,Num}|Rest]) ->
+    {- Num,Rest};
+parse_BuiltinValue(Tokens) ->
+    parse_ObjectClassFieldValue(Tokens).
+
+%% Externalvaluereference
+parse_DefinedValue([{typereference,L1,Tname},{'.',_},{identifier,_,Idname}|Rest]) ->
+    {#'Externalvaluereference'{pos=L1,module=Tname,value=Idname},Rest};
+%% valuereference
+parse_DefinedValue([Id = {identifier,_,_}|Rest]) ->
+    {identifier2Extvalueref(Id),Rest};
+%% ParameterizedValue
+parse_DefinedValue(Tokens) ->
+    parse_ParameterizedValue(Tokens).
+
+
+parse_SequenceValue([{'{',_}|Tokens]) ->
+    parse_SequenceValue(Tokens,[]);
+parse_SequenceValue(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'{']}}).
+
+parse_SequenceValue([{identifier,_,IdName}|Rest],Acc) ->
+    {Value,Rest2} = parse_Value(Rest),
+    case Rest2 of
+	[{',',_}|Rest3] ->
+	    parse_SequenceValue(Rest3,[{IdName,Value}|Acc]);
+	[{'}',_}|Rest3] ->
+	    {lists:reverse([{IdName,Value}|Acc]),Rest3};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'}']}})
+    end;
+parse_SequenceValue(Tokens,_Acc) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,identifier]}}).
+
+parse_SequenceOfValue([{'{',_}|Tokens]) ->
+    parse_SequenceOfValue(Tokens,[]);
+parse_SequenceOfValue(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'{']}}).
+
+parse_SequenceOfValue(Tokens,Acc) ->
+    {Value,Rest2} = parse_Value(Tokens),
+    case Rest2 of
+	[{',',_}|Rest3] ->
+	    parse_SequenceOfValue(Rest3,[Value|Acc]);
+	[{'}',_}|Rest3] ->
+	    {lists:reverse([Value|Acc]),Rest3};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'}']}})
+    end.
+
+parse_ValueSetTypeAssignment([{typereference,L1,Name}|Rest]) ->
+    {Type,Rest2} = parse_Type(Rest),
+    case Rest2 of
+	[{'::=',_}|Rest3] ->
+	    {ValueSet,Rest4} = parse_ValueSet(Rest3),
+	    {#valuedef{pos=L1,name=Name,type=Type,value=ValueSet},Rest4};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(L1),get(asn1_module),
+			       [got,get_token(H),expected,'::=']}})
+    end;
+parse_ValueSetTypeAssignment(Tokens) ->
+    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
+				  [got,get_token(hd(Tokens)),expected,
+				   typereference]}}).
+
+parse_ValueSet([{'{',_}|Rest]) ->
+    {Elems,Rest2} = parse_ElementSetSpecs(Rest),
+    case Rest2 of
+	[{'}',_}|Rest3] ->
+	    {{valueset,Elems},Rest3};
+	[H|_T] ->
+	    throw({asn1_error,{get_line(H),get(asn1_module),
+			       [got,get_token(H),expected,'}']}})
+    end;
+parse_ValueSet(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'{']}}).
+
+parse_ValueAssignment([{identifier,L1,IdName}|Rest]) ->
+    {Type,Rest2} = parse_Type(Rest),
+    case Rest2 of
+	[{'::=',_}|Rest3] ->
+	    {Value,Rest4} = parse_Value(Rest3),
+	    case lookahead_assignment(Rest4) of
+		ok ->
+		    {#valuedef{pos=L1,name=IdName,type=Type,value=Value},Rest4};
+		_ ->
+		    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+				       [got,get_token(hd(Rest2)),expected,'::=']}})
+	    end;
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+			       [got,get_token(hd(Rest2)),expected,'::=']}})
+    end;
+parse_ValueAssignment(Tokens) ->
+    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
+				  [got,get_token(hd(Tokens)),expected,identifier]}}).
+
+%% SizeConstraint
+parse_SubtypeElements([{'SIZE',_}|Tokens]) ->
+    {Constraint,Rest} = parse_Constraint(Tokens),
+    {{'SizeConstraint',Constraint#constraint.c},Rest};
+%% PermittedAlphabet
+parse_SubtypeElements([{'FROM',_}|Tokens]) ->
+    {Constraint,Rest} = parse_Constraint(Tokens),
+    {{'PermittedAlphabet',Constraint#constraint.c},Rest};
+%% InnerTypeConstraints
+parse_SubtypeElements([{'WITH',_},{'COMPONENT',_}|Tokens]) ->
+    {Constraint,Rest} = parse_Constraint(Tokens),
+    {{'WITH COMPONENT',Constraint},Rest};
+parse_SubtypeElements([{'WITH',_},{'COMPONENTS',_},{'{',_},{'...',_},{',',_}|Tokens]) ->
+    {Constraint,Rest} = parse_TypeConstraints(Tokens),
+    case Rest of
+	[{'}',_}|Rest2] ->
+	    {{'WITH COMPONENTS',{'PartialSpecification',Constraint}},Rest2};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
+			       [got,get_token(hd(Rest)),expected,'}']}})
+    end;
+parse_SubtypeElements([{'WITH',_},{'COMPONENTS',_},{'{',_}|Tokens]) ->
+    {Constraint,Rest} = parse_TypeConstraints(Tokens),
+    case Rest of
+	[{'}',_}|Rest2] ->
+	    {{'WITH COMPONENTS',{'FullSpecification',Constraint}},Rest2};
+	_ ->
+	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
+			       [got,get_token(hd(Rest)),expected,'}']}})
+    end;
+%% SingleValue
+%% ContainedSubtype
+%% ValueRange
+%% TypeConstraint
+parse_SubtypeElements(Tokens) ->
+    Flist = [fun parse_ContainedSubtype/1,
+	     fun parse_Value/1,
+	     fun([{'MIN',_}|T]) -> {'MIN',T} end,
+	     fun parse_Type/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	{asn1_error,Reason} ->
+	    throw(Reason);
+	Result = {Val,_} when record(Val,type) ->
+	    Result;
+	{Lower,[{'..',_}|Rest]} ->
+	    {Upper,Rest2} = parse_UpperEndpoint(Rest),
+	    {{'ValueRange',{Lower,Upper}},Rest2};
+	{Lower,[{'<',_},{'..',_}|Rest]} ->
+	    {Upper,Rest2} = parse_UpperEndpoint(Rest),
+	    {{'ValueRange',{{gt,Lower},Upper}},Rest2};
+	{Res={'ContainedSubtype',_Type},Rest} ->
+	    {Res,Rest};
+	{Value,Rest} ->
+	    {{'SingleValue',Value},Rest}
+    end.
+
+parse_ContainedSubtype([{'INCLUDES',_}|Rest]) ->
+    {Type,Rest2} = parse_Type(Rest),
+    {{'ContainedSubtype',Type},Rest2};
+parse_ContainedSubtype(Tokens) ->
+    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+		       [got,get_token(hd(Tokens)),expected,'INCLUDES']}}).
+%%parse_ContainedSubtype(Tokens) -> %this option is moved to parse_SubtypeElements
+%%    parse_Type(Tokens).
+
+parse_UpperEndpoint([{'<',_}|Rest]) ->
+    parse_UpperEndpoint(lt,Rest);
+parse_UpperEndpoint(Tokens) ->
+    parse_UpperEndpoint(false,Tokens).
+
+parse_UpperEndpoint(Lt,Tokens) ->
+    Flist = [ fun([{'MAX',_}|T]) -> {'MAX',T} end,
+	      fun parse_Value/1],
+    case (catch parse_or(Tokens,Flist)) of
+	{'EXIT',Reason} ->
+	    exit(Reason);
+	AsnErr = {asn1_error,_} ->
+	    throw(AsnErr);
+	{Value,Rest2} when Lt == lt ->
+	    {{lt,Value},Rest2};
+	{Value,Rest2} ->
+	    {Value,Rest2}
+    end.
+
+parse_TypeConstraints(Tokens) ->
+    parse_TypeConstraints(Tokens,[]).
+
+parse_TypeConstraints([{identifier,_,_}|Rest],Acc) ->
+    {ComponentConstraint,Rest2} = parse_ComponentConstraint(Rest),
+    case Rest2 of
+	[{',',_}|Rest3] ->
+	    parse_TypeConstraints(Rest3,[ComponentConstraint|Acc]);
+	_ ->
+	    {lists:reverse([ComponentConstraint|Acc]),Rest2}
+    end;
+parse_TypeConstraints([H|_T],_) ->
+    throw({asn1_error,{get_line(H),get(asn1_module),
+		       [got,get_token(H),expected,identifier]}}).
+
+parse_ComponentConstraint(Tokens = [{'(',_}|_Rest]) ->
+    {ValueConstraint,Rest2} = parse_Constraint(Tokens),
+    {PresenceConstraint,Rest3} = parse_PresenceConstraint(Rest2),
+    {{ValueConstraint,PresenceConstraint},Rest3};
+parse_ComponentConstraint(Tokens) ->
+    {PresenceConstraint,Rest} = parse_PresenceConstraint(Tokens),
+    {{asn1_empty,PresenceConstraint},Rest}.
+
+parse_PresenceConstraint([{'PRESENT',_}|Rest]) ->
+    {'PRESENT',Rest};
+parse_PresenceConstraint([{'ABSENT',_}|Rest]) ->
+    {'ABSENT',Rest};
+parse_PresenceConstraint([{'OPTIONAL',_}|Rest]) ->
+    {'OPTIONAL',Rest};
+parse_PresenceConstraint(Tokens) ->
+    {asn1_empty,Tokens}.
+
+
+merge_constraints({Rlist,ExtList}) -> % extensionmarker in constraint
+    {merge_constraints(Rlist,[],[]),
+     merge_constraints(ExtList,[],[])};
+
+merge_constraints(Clist) ->
+    merge_constraints(Clist, [], []).
+
+merge_constraints([Ch|Ct],Cacc, Eacc) ->
+    NewEacc = case Ch#constraint.e of
+		  undefined -> Eacc;
+		  E -> [E|Eacc]
+	      end,
+    merge_constraints(Ct,[fixup_constraint(Ch#constraint.c)|Cacc],NewEacc);
+
+merge_constraints([],Cacc,[]) ->
+%%    lists:flatten(Cacc);
+    lists:reverse(Cacc);
+merge_constraints([],Cacc,Eacc) ->
+%%    lists:flatten(Cacc) ++ [{'Errors',Eacc}].
+    lists:reverse(Cacc) ++ [{'Errors',Eacc}].
+
+fixup_constraint(C) ->
+    case C of
+	{'SingleValue',SubType} when element(1,SubType) == 'ContainedSubtype' ->
+	    SubType;
+	{'SingleValue',V} when list(V) ->
+	    C;
+	%%	    [C,{'ValueRange',{lists:min(V),lists:max(V)}}];
+	%% bug, turns wrong when an element in V is a reference to a defined value
+	{'PermittedAlphabet',{'SingleValue',V}} when list(V) ->
+	    %%sort and remove duplicates
+	    V2 = {'SingleValue',
+		  ordsets:list_to_set(lists:flatten(V))},
+	    {'PermittedAlphabet',V2};
+	{'PermittedAlphabet',{'SingleValue',V}} ->
+	    V2 = {'SingleValue',[V]},
+	    {'PermittedAlphabet',V2};
+	{'SizeConstraint',Sc} ->
+	    {'SizeConstraint',fixup_size_constraint(Sc)};
+
+	List when list(List) ->  %% In This case maybe a union or intersection
+	    [fixup_constraint(Xc)||Xc <- List];
+	Other ->
+	    Other
+    end.
+
+fixup_size_constraint({'ValueRange',{Lb,Ub}}) ->
+	{Lb,Ub};
+fixup_size_constraint({{'ValueRange',R},[]}) ->
+	{R,[]};
+fixup_size_constraint({[],{'ValueRange',R}}) ->
+	{[],R};
+fixup_size_constraint({{'ValueRange',R1},{'ValueRange',R2}}) ->
+	{R1,R2};
+fixup_size_constraint({'SingleValue',[Sv]}) ->
+	fixup_size_constraint({'SingleValue',Sv});
+fixup_size_constraint({'SingleValue',L}) when list(L) ->
+	ordsets:list_to_set(L);
+fixup_size_constraint({'SingleValue',L}) ->
+	{L,L};
+fixup_size_constraint({C1,C2}) ->
+	{fixup_size_constraint(C1), fixup_size_constraint(C2)}.
+
+get_line({_,Pos,Token}) when integer(Pos),atom(Token) ->
+    Pos;
+get_line({Token,Pos}) when integer(Pos),atom(Token) ->
+    Pos;
+get_line(_) ->
+    undefined.
+
+get_token({_,Pos,Token}) when integer(Pos),atom(Token) ->
+    Token;
+get_token({'$end',Pos}) when integer(Pos) ->
+    undefined;
+get_token({Token,Pos}) when integer(Pos),atom(Token) ->
+    Token;
+get_token(_) ->
+    undefined.
+
+prioritize_error(ErrList) ->
+    case lists:keymember(asn1_error,1,ErrList) of
+	false -> % only asn1_assignment_error -> take the last
+	    lists:last(ErrList);
+	true -> % contains errors from deeper in a Type
+	    NewErrList = [_Err={_,_}|_RestErr] =
+		lists:filter(fun({asn1_error,_})->true;(_)->false end,
+			     ErrList),
+	    SplitErrs =
+		lists:splitwith(fun({_,X})->
+					case element(1,X) of
+					    Int when integer(Int) -> true;
+					    _ -> false
+					end
+				end,
+				NewErrList),
+	    case SplitErrs of
+		{[],UndefPosErrs} -> % if no error with Positon exists
+		    lists:last(UndefPosErrs);
+		{IntPosErrs,_} ->
+		    IntPosReasons = lists:map(fun(X)->element(2,X) end,IntPosErrs),
+		    SortedReasons = lists:keysort(1,IntPosReasons),
+		    {asn1_error,lists:last(SortedReasons)}
+	    end
+    end.
+
+%% most_prio_error([H={_,Reason}|T],Atom,Err) when atom(Atom) ->
+%%     most_prio_error(T,element(1,Reason),H);
+%% most_prio_error([H={_,Reason}|T],Greatest,Err) ->
+%%     case element(1,Reason) of
+%% 	Pos when integer(Pos),Pos>Greatest ->
+%% 	    most_prio_error(
+
+
+tref2Exttref(#typereference{pos=Pos,val=Name}) ->
+    #'Externaltypereference'{pos=Pos,
+			     module=get(asn1_module),
+			     type=Name}.
+
+tref2Exttref(Pos,Name) ->
+    #'Externaltypereference'{pos=Pos,
+			     module=get(asn1_module),
+			     type=Name}.
+
+identifier2Extvalueref(#identifier{pos=Pos,val=Name}) ->
+    #'Externalvaluereference'{pos=Pos,
+			      module=get(asn1_module),
+			      value=Name}.
+
+%% lookahead_assignment/1 checks that the next sequence of tokens
+%% in Token contain a valid assignment or the
+%% 'END' token. Otherwise an exception is thrown.
+lookahead_assignment([{'END',_}|_Rest]) ->
+    ok;
+lookahead_assignment(Tokens) ->
+    parse_Assignment(Tokens),
+    ok.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_pretty_format.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_pretty_format.erl
new file mode 100644
index 0000000000..99dd246d5c
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_pretty_format.erl
@@ -0,0 +1,197 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_pretty_format.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+
+%% usage:  pretty_format:term(Term) -> PNF list of characters
+%%
+%%  Note: this is usually used in expressions like:
+%%	io:format('~s\n',[pretty_format:term(Term)]).
+%%
+%%  Uses the following simple heuristics
+%%
+%%  1) Simple tuples are printed across the page
+%%     (Simple means *all* the elements are "flat")
+%%  2) The Complex tuple {Arg1, Arg2, Arg3,....} is printed thus:
+%%       {Arg1,
+%%          Arg2,
+%%          Arg3,
+%%          ...}
+%%  3) Lists are treated as for tuples
+%%  4) Lists of printable characters are treated as strings
+%%
+%%  This method seems to work reasonable well for {Tag, ...} type
+%%  data structures
+
+-module(asn1ct_pretty_format).
+
+-export([term/1]).
+
+-import(io_lib, [write/1, write_string/1]).
+
+term(Term) ->
+    element(2, term(Term, 0)).
+
+%%______________________________________________________________________
+%% pretty_format:term(Term, Indent} -> {Indent', Chars}
+%%   Format <Term> -- use <Indent> to indent the *next* line
+%%     Note: Indent' is a new indentaion level (sometimes printing <Term>
+%%     the next line to need an "extra" indent!).
+
+term([], Indent) ->
+    {Indent, [$[,$]]};
+term(L, Indent) when is_list(L) ->
+    case is_string(L) of
+	true ->
+	    {Indent, write_string(L)};
+	false ->
+	    case complex_list(L) of
+		true ->
+		    write_complex_list(L, Indent);
+		false ->
+		    write_simple_list(L, Indent)
+	    end
+    end;
+term(T, Indent) when is_tuple(T) ->
+    case complex_tuple(T) of
+	true ->
+	    write_complex_tuple(T, Indent);
+	false ->
+	    write_simple_tuple(T, Indent)
+    end;
+term(A, Indent) ->
+    {Indent, write(A)}.
+
+%%______________________________________________________________________
+%%  write_simple_list([H|T], Indent) -> {Indent', Chars}
+
+write_simple_list([H|T], Indent) ->
+    {_, S1} = term(H, Indent),
+    {_, S2} = write_simple_list_tail(T, Indent),
+    {Indent, [$[,S1|S2]}.
+
+write_simple_list_tail([H|T], Indent) ->
+    {_, S1} = term(H, Indent),
+    {_, S2} = write_simple_list_tail(T, Indent),
+    {Indent, [$,,S1| S2]};
+write_simple_list_tail([], Indent) ->
+    {Indent, "]"};
+write_simple_list_tail(Other, Indent) ->
+    {_, S} = term(Other, Indent),
+    {Indent, [$|,S,$]]}.
+
+%%______________________________________________________________________
+%%  write_complex_list([H|T], Indent) -> {Indent', Chars}
+
+write_complex_list([H|T], Indent) ->
+    {I1, S1} = term(H, Indent+1),
+    {_, S2} = write_complex_list_tail(T, I1),
+    {Indent, [$[,S1|S2]}.
+
+write_complex_list_tail([H|T], Indent) ->
+    {I1, S1} = term(H, Indent),
+    {_, S2} = write_complex_list_tail(T, I1),
+    {Indent, [$,,nl_indent(Indent),S1,S2]};
+write_complex_list_tail([], Indent) ->
+    {Indent, "]"};
+write_complex_list_tail(Other, Indent) ->$,,
+    {_, S} = term(Other, Indent),
+    {Indent, [$|,S,$]]}.
+
+%%______________________________________________________________________
+%%  complex_list(List) -> true | false
+%%     returns true if the list is complex otherwise false
+
+complex_list([]) ->
+    false;
+complex_list([H|T]) when is_number(H); is_atom(H) ->
+    complex_list(T);
+complex_list([H|T]) ->
+    case is_string(H) of
+	true ->
+	    complex_list(T);
+	false ->
+	    true
+    end;
+complex_list(_) -> true.
+
+%%______________________________________________________________________
+%%  complex_tuple(Tuple) -> true | false
+%%     returns true if the tuple is complex otherwise false
+
+complex_tuple(T) ->
+    complex_list(tuple_to_list(T)).
+
+%%______________________________________________________________________
+%%  write_simple_tuple(Tuple, Indent} -> {Indent', Chars}
+
+write_simple_tuple({}, Indent) ->
+    {Indent, "{}"};
+write_simple_tuple(Tuple, Indent) ->
+    {_, S} = write_simple_tuple_args(tuple_to_list(Tuple), Indent),
+    {Indent, [${, S, $}]}.
+
+write_simple_tuple_args([X], Indent) ->
+    term(X, Indent);
+write_simple_tuple_args([H|T], Indent) ->
+    {_, SH} = term(H, Indent),
+    {_, ST} = write_simple_tuple_args(T, Indent),
+    {Indent, [SH, $,, ST]}.
+
+%%______________________________________________________________________
+%%  write_complex_tuple(Tuple, Indent} -> {Indent', Chars}
+
+write_complex_tuple(Tuple, Indent) ->
+    [H|T] = tuple_to_list(Tuple),
+    {I1, SH} = term(H, Indent+2),
+    {_, ST} = write_complex_tuple_args(T, I1),
+    {Indent, [${, SH, ST, $}]}.
+
+write_complex_tuple_args([X], Indent) ->
+    {_, S} = term(X, Indent),
+    {Indent, [$,, nl_indent(Indent), S]};
+write_complex_tuple_args([H|T], Indent) ->
+    {I1, SH} = term(H, Indent),
+    {_, ST} = write_complex_tuple_args(T, I1),
+    {Indent, [$,, nl_indent(Indent) , SH, ST]};
+write_complex_tuple_args([], Indent) ->
+    {Indent, []}.
+
+%%______________________________________________________________________
+%% utilities
+
+nl_indent(I) when I >= 0 ->
+    ["\n"|indent(I)];
+nl_indent(_) ->
+    [$\s].
+
+indent(I) when I >= 8 ->
+    [$\t|indent(I-8)];
+indent(I) when I > 0 ->
+    [$\s|indent(I-1)];
+indent(_) ->
+    [].
+
+is_string([9|T]) ->
+    is_string(T);
+is_string([10|T]) ->
+    is_string(T);
+is_string([H|T]) when H >31, H < 127 ->
+    is_string(T);
+is_string([]) ->
+    true;
+is_string(_) ->
+    false.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_tok.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_tok.erl
new file mode 100644
index 0000000000..b5ccc4a5d2
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_tok.erl
@@ -0,0 +1,351 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_tok.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+-module(asn1ct_tok).
+
+%% Tokenize ASN.1 code (input to parser generated with yecc)
+
+-export([get_name/2,tokenise/2, file/1]).
+
+
+file(File) ->
+    case file:open(File, [read])  of
+	{error, Reason} ->
+	    {error,{File,file:format_error(Reason)}};
+	{ok,Stream} ->
+	    process0(Stream)
+    end.
+
+process0(Stream) ->
+    process(Stream,0,[]).
+
+process(Stream,Lno,R) ->
+    process(io:get_line(Stream, ''), Stream,Lno+1,R).
+
+process(eof, Stream,Lno,R) ->
+    file:close(Stream),
+    lists:flatten(lists:reverse([{'$end',Lno}|R]));
+
+
+process(L, Stream,Lno,R) when list(L) ->
+    %%io:format('read:~s',[L]),
+    case catch tokenise(L,Lno) of
+	{'ERR',Reason} ->
+	    io:format("Tokeniser error on line: ~w ~w~n",[Lno,Reason]),
+	    exit(0);
+	T ->
+	    %%io:format('toks:~w~n',[T]),
+	    process(Stream,Lno,[T|R])
+    end.
+
+
+tokenise([H|T],Lno) when $a =< H , H =< $z ->
+    {X, T1} = get_name(T, [H]),
+    [{identifier,Lno, list_to_atom(X)}|tokenise(T1,Lno)];
+
+tokenise([$&,H|T],Lno) when $A =< H , H =< $Z ->
+    {Y, T1} = get_name(T, [H]),
+    X = list_to_atom(Y),
+    [{typefieldreference, Lno, X} | tokenise(T1, Lno)];
+
+tokenise([$&,H|T],Lno) when $a =< H , H =< $z ->
+    {Y, T1} = get_name(T, [H]),
+    X = list_to_atom(Y),
+    [{valuefieldreference, Lno, X} | tokenise(T1, Lno)];
+
+tokenise([H|T],Lno) when $A =< H , H =< $Z ->
+    {Y, T1} = get_name(T, [H]),
+    X = list_to_atom(Y),
+    case reserved_word(X) of
+	true ->
+	    [{X,Lno}|tokenise(T1,Lno)];
+	false ->
+	    [{typereference,Lno,X}|tokenise(T1,Lno)];
+	rstrtype ->
+	    [{restrictedcharacterstringtype,Lno,X}|tokenise(T1,Lno)]
+    end;
+
+tokenise([$-,H|T],Lno) when $0 =< H , H =< $9 ->
+    {X, T1} = get_number(T, [H]),
+    [{number,Lno,-1 * list_to_integer(X)}|tokenise(T1,Lno)];
+
+tokenise([H|T],Lno) when $0 =< H , H =< $9 ->
+    {X, T1} = get_number(T, [H]),
+    [{number,Lno,list_to_integer(X)}|tokenise(T1,Lno)];
+
+tokenise([$-,$-|T],Lno) ->
+    tokenise(skip_comment(T),Lno);
+tokenise([$:,$:,$=|T],Lno) ->
+    [{'::=',Lno}|tokenise(T,Lno)];
+
+tokenise([$'|T],Lno) ->
+    case catch collect_quoted(T,Lno,[]) of
+         {'ERR',_} ->
+             throw({'ERR','bad_quote'});
+         {Thing, T1} ->
+             [Thing|tokenise(T1,Lno)]
+    end;
+
+tokenise([$"|T],Lno) ->
+    collect_string(T,Lno);
+
+tokenise([${|T],Lno) ->
+    [{'{',Lno}|tokenise(T,Lno)];
+
+tokenise([$}|T],Lno) ->
+    [{'}',Lno}|tokenise(T,Lno)];
+
+tokenise([$]|T],Lno) ->
+    [{']',Lno}|tokenise(T,Lno)];
+
+tokenise([$[|T],Lno) ->
+    [{'[',Lno}|tokenise(T,Lno)];
+
+tokenise([$,|T],Lno) ->
+    [{',',Lno}|tokenise(T,Lno)];
+
+tokenise([$(|T],Lno) ->
+    [{'(',Lno}|tokenise(T,Lno)];
+tokenise([$)|T],Lno) ->
+    [{')',Lno}|tokenise(T,Lno)];
+
+tokenise([$.,$.,$.|T],Lno) ->
+    [{'...',Lno}|tokenise(T,Lno)];
+
+tokenise([$.,$.|T],Lno) ->
+    [{'..',Lno}|tokenise(T,Lno)];
+
+tokenise([$.|T],Lno) ->
+    [{'.',Lno}|tokenise(T,Lno)];
+tokenise([$^|T],Lno) ->
+    [{'^',Lno}|tokenise(T,Lno)];
+tokenise([$!|T],Lno) ->
+    [{'!',Lno}|tokenise(T,Lno)];
+tokenise([$||T],Lno) ->
+    [{'|',Lno}|tokenise(T,Lno)];
+
+
+tokenise([H|T],Lno) ->
+    case white_space(H) of
+	true ->
+	    tokenise(T,Lno);
+	false ->
+	    [{list_to_atom([H]),Lno}|tokenise(T,Lno)]
+    end;
+tokenise([],_) ->
+    [].
+
+
+collect_string(L,Lno) ->
+    collect_string(L,Lno,[]).
+
+collect_string([],_,_) ->
+    throw({'ERR','bad_quote found eof'});
+
+collect_string([H|T],Lno,Str) ->
+    case H of
+	$" ->
+           [{cstring,1,lists:reverse(Str)}|tokenise(T,Lno)];
+        Ch ->
+           collect_string(T,Lno,[Ch|Str])
+    end.
+
+
+
+% <name> is letters digits hyphens
+% hypen is not the last character. Hypen hyphen is NOT allowed
+%
+% <identifier> ::= <lowercase> <name>
+
+get_name([$-,Char|T], L) ->
+    case isalnum(Char) of
+	true ->
+	    get_name(T,[Char,$-|L]);
+	false ->
+	    {lists:reverse(L),[$-,Char|T]}
+    end;
+get_name([$-|T], L) ->
+    {lists:reverse(L),[$-|T]};
+get_name([Char|T], L) ->
+    case isalnum(Char) of
+	true ->
+	    get_name(T,[Char|L]);
+	false ->
+	    {lists:reverse(L),[Char|T]}
+    end;
+get_name([], L) ->
+    {lists:reverse(L), []}.
+
+
+isalnum(H) when $A =< H , H =< $Z ->
+    true;
+isalnum(H) when $a =< H , H =< $z ->
+    true;
+isalnum(H) when $0 =< H , H =< $9 ->
+    true;
+isalnum(_) ->
+    false.
+
+isdigit(H) when $0 =< H , H =< $9 ->
+    true;
+isdigit(_) ->
+    false.
+
+white_space(9) -> true;
+white_space(10) -> true;
+white_space(13) -> true;
+white_space(32) -> true;
+white_space(_) -> false.
+
+
+get_number([H|T], L) ->
+    case isdigit(H) of
+	true ->
+	    get_number(T, [H|L]);
+	false ->
+	    {lists:reverse(L), [H|T]}
+    end;
+get_number([], L) ->
+    {lists:reverse(L), []}.
+
+skip_comment([]) ->
+    [];
+skip_comment([$-,$-|T]) ->
+    T;
+skip_comment([_|T]) ->
+    skip_comment(T).
+
+collect_quoted([$',$B|T],Lno, L) ->
+    case check_bin(L) of
+        true ->
+            {{bstring,Lno, lists:reverse(L)}, T};
+        false ->
+            throw({'ERR',{invalid_binary_number, lists:reverse(L)}})
+    end;
+collect_quoted([$',$H|T],Lno, L) ->
+    case check_hex(L) of
+        true ->
+            {{hstring,Lno, lists:reverse(L)}, T};
+        false ->
+            throw({'ERR',{invalid_binary_number, lists:reverse(L)}})
+    end;
+collect_quoted([H|T], Lno, L) ->
+    collect_quoted(T, Lno,[H|L]);
+collect_quoted([], _, _) ->        % This should be allowed FIX later
+    throw({'ERR',{eol_in_token}}).
+
+check_bin([$0|T]) ->
+    check_bin(T);
+check_bin([$1|T]) ->
+    check_bin(T);
+check_bin([]) ->
+    true;
+check_bin(_) ->
+    false.
+
+check_hex([H|T]) when $0 =< H , H =< $9 ->
+    check_hex(T);
+check_hex([H|T])  when $A =< H , H =< $F ->
+    check_hex(T);
+check_hex([]) ->
+    true;
+check_hex(_) ->
+    false.
+
+
+%% reserved_word(A) -> true|false|rstrtype
+%% A = atom()
+%% returns true if A is a reserved ASN.1 word
+%% returns false if A is not a reserved word
+%% returns rstrtype if A is a reserved word in the group
+%% 	RestrictedCharacterStringType
+reserved_word('ABSENT') -> true;
+%reserved_word('ABSTRACT-SYNTAX') -> true; % impl as predef item
+reserved_word('ALL') -> true;
+reserved_word('ANY') -> true;
+reserved_word('APPLICATION') -> true;
+reserved_word('AUTOMATIC') -> true;
+reserved_word('BEGIN') -> true;
+reserved_word('BIT') -> true;
+reserved_word('BMPString') -> rstrtype;
+reserved_word('BOOLEAN') -> true;
+reserved_word('BY') -> true;
+reserved_word('CHARACTER') -> true;
+reserved_word('CHOICE') -> true;
+reserved_word('CLASS') -> true;
+reserved_word('COMPONENT') -> true;
+reserved_word('COMPONENTS') -> true;
+reserved_word('CONSTRAINED') -> true;
+reserved_word('DEFAULT') -> true;
+reserved_word('DEFINED') -> true;
+reserved_word('DEFINITIONS') -> true;
+reserved_word('EMBEDDED') -> true;
+reserved_word('END') -> true;
+reserved_word('ENUMERATED') -> true;
+reserved_word('EXCEPT') -> true;
+reserved_word('EXPLICIT') -> true;
+reserved_word('EXPORTS') -> true;
+reserved_word('EXTERNAL') -> true;
+reserved_word('FALSE') -> true;
+reserved_word('FROM') -> true;
+reserved_word('GeneralizedTime') -> true;
+reserved_word('GeneralString') -> rstrtype;
+reserved_word('GraphicString') -> rstrtype;
+reserved_word('IA5String') -> rstrtype;
+% reserved_word('TYPE-IDENTIFIER') -> true; % impl as predef item
+reserved_word('IDENTIFIER') -> true;
+reserved_word('IMPLICIT') -> true;
+reserved_word('IMPORTS') -> true;
+reserved_word('INCLUDES') -> true;
+reserved_word('INSTANCE') -> true;
+reserved_word('INTEGER') -> true;
+reserved_word('INTERSECTION') -> true;
+reserved_word('ISO646String') -> rstrtype;
+reserved_word('MAX') -> true;
+reserved_word('MIN') -> true;
+reserved_word('MINUS-INFINITY') -> true;
+reserved_word('NULL') -> true;
+reserved_word('NumericString') -> rstrtype;
+reserved_word('OBJECT') -> true;
+reserved_word('ObjectDescriptor') -> true;
+reserved_word('OCTET') -> true;
+reserved_word('OF') -> true;
+reserved_word('OPTIONAL') -> true;
+reserved_word('PDV') -> true;
+reserved_word('PLUS-INFINITY') -> true;
+reserved_word('PRESENT') -> true;
+reserved_word('PrintableString') -> rstrtype;
+reserved_word('PRIVATE') -> true;
+reserved_word('REAL') -> true;
+reserved_word('SEQUENCE') -> true;
+reserved_word('SET') -> true;
+reserved_word('SIZE') -> true;
+reserved_word('STRING') -> true;
+reserved_word('SYNTAX') -> true;
+reserved_word('T61String') -> rstrtype;
+reserved_word('TAGS') -> true;
+reserved_word('TeletexString') -> rstrtype;
+reserved_word('TRUE') -> true;
+reserved_word('UNION') -> true;
+reserved_word('UNIQUE') -> true;
+reserved_word('UNIVERSAL') -> true;
+reserved_word('UniversalString') -> rstrtype;
+reserved_word('UTCTime') -> true;
+reserved_word('VideotexString') -> rstrtype;
+reserved_word('VisibleString') -> rstrtype;
+reserved_word('WITH') -> true;
+reserved_word(_) -> false.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_value.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_value.erl
new file mode 100644
index 0000000000..3d366a1a27
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_value.erl
@@ -0,0 +1,330 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1ct_value.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+-module(asn1ct_value).
+
+%%  Generate Erlang values for ASN.1 types.
+%%  The value is randomized within it's constraints
+
+-include("asn1_records.hrl").
+%-compile(export_all).
+
+-export([get_type/3]).
+
+
+
+%% Generate examples of values ******************************
+%%****************************************x
+
+
+get_type(M,Typename,Tellname) ->
+    case asn1_db:dbget(M,Typename) of
+	undefined ->
+	    {asn1_error,{not_found,{M,Typename}}};
+	Tdef when record(Tdef,typedef) ->
+	    Type = Tdef#typedef.typespec,
+	    get_type(M,[Typename],Type,Tellname);
+	Err ->
+	    {asn1_error,{other,Err}}
+    end.
+
+get_type(M,Typename,Type,Tellname) when record(Type,type) ->
+    InnerType = get_inner(Type#type.def),
+    case asn1ct_gen:type(InnerType) of
+	#'Externaltypereference'{module=Emod,type=Etype} ->
+	    get_type(Emod,Etype,Tellname);
+	{_,user} ->
+	    case Tellname of
+		yes -> {Typename,get_type(M,InnerType,no)};
+		no -> get_type(M,InnerType,no)
+	    end;
+	{notype,_} ->
+	    true;
+	{primitive,bif} ->
+	    get_type_prim(Type);
+	'ASN1_OPEN_TYPE' ->
+	    case  Type#type.constraint of
+		[#'Externaltypereference'{type=TrefConstraint}] ->
+		    get_type(M,TrefConstraint,no);
+		_ ->
+		    "open_type"
+	    end;
+	{constructed,bif} ->
+	    get_type_constructed(M,Typename,InnerType,Type)
+    end;
+get_type(M,Typename,#'ComponentType'{name = Name,typespec = Type},_)  ->
+    get_type(M,[Name|Typename],Type,no);
+get_type(_,_,_,_) -> % 'EXTENSIONMARK'
+    undefined.
+
+get_inner(A) when atom(A) -> A;
+get_inner(Ext) when record(Ext,'Externaltypereference') -> Ext;
+get_inner({typereference,_Pos,Name}) -> Name;
+get_inner(T) when tuple(T) ->
+    case asn1ct_gen:get_inner(T) of
+	{fixedtypevaluefield,_,Type} ->
+	    Type#type.def;
+	{typefield,_FieldName} ->
+	    'ASN1_OPEN_TYPE';
+	Other ->
+	    Other
+    end.
+%%get_inner(T) when tuple(T) -> element(1,T).
+
+
+
+get_type_constructed(M,Typename,InnerType,D) when record(D,type) ->
+    case InnerType of
+	'SET' ->
+	    get_sequence(M,Typename,D);
+	'SEQUENCE' ->
+	    get_sequence(M,Typename,D);
+	'CHOICE' ->
+	    get_choice(M,Typename,D);
+	'SEQUENCE OF' ->
+	    {_,Type} = D#type.def,
+	    NameSuffix = asn1ct_gen:constructed_suffix(InnerType,Type#type.def),
+	    get_sequence_of(M,Typename,D,NameSuffix);
+	'SET OF' ->
+	    {_,Type} = D#type.def,
+	    NameSuffix = asn1ct_gen:constructed_suffix(InnerType,Type#type.def),
+	    get_sequence_of(M,Typename,D,NameSuffix);
+	_ ->
+	    exit({nyi,InnerType})
+    end.
+
+get_sequence(M,Typename,Type) ->
+    {_SEQorSET,CompList} =
+	case Type#type.def of
+	    #'SEQUENCE'{components=Cl} -> {'SEQUENCE',Cl};
+	    #'SET'{components=Cl} -> {'SET',Cl}
+	end,
+    case get_components(M,Typename,CompList) of
+        [] ->
+            {list_to_atom(asn1ct_gen:list2rname(Typename))};
+        C ->
+            list_to_tuple([list_to_atom(asn1ct_gen:list2rname(Typename))|C])
+    end.
+
+get_components(M,Typename,{Root,Ext}) ->
+    get_components(M,Typename,Root++Ext);
+
+%% Should enhance this *** HERE *** with proper handling of extensions
+
+get_components(M,Typename,[H|T]) ->
+    [get_type(M,Typename,H,no)|
+    get_components(M,Typename,T)];
+get_components(_,_,[]) ->
+    [].
+
+get_choice(M,Typename,Type) ->
+    {'CHOICE',TCompList} = Type#type.def,
+    case TCompList of
+	[] ->
+	    {asn1_EMPTY,asn1_EMPTY};
+	{CompList,ExtList} -> % Should be enhanced to handle extensions too
+	    CList = CompList ++ ExtList,
+	    C = lists:nth(random(length(CList)),CList),
+	    {C#'ComponentType'.name,get_type(M,Typename,C,no)};
+	CompList when list(CompList) ->
+	    C = lists:nth(random(length(CompList)),CompList),
+	    {C#'ComponentType'.name,get_type(M,Typename,C,no)}
+    end.
+
+get_sequence_of(M,Typename,Type,TypeSuffix) ->
+    %% should generate length according to constraints later
+    {_,Oftype} = Type#type.def,
+    C = Type#type.constraint,
+    S = size_random(C),
+    NewTypeName = [TypeSuffix|Typename],
+    gen_list(M,NewTypeName,Oftype,no,S).
+
+gen_list(_,_,_,_,0) ->
+    [];
+gen_list(M,Typename,Oftype,Tellname,N) ->
+    [get_type(M,Typename,Oftype,no)|gen_list(M,Typename,Oftype,Tellname,N-1)].
+
+get_type_prim(D) ->
+    C = D#type.constraint,
+    case D#type.def of
+	'INTEGER' ->
+	    i_random(C);
+	{'INTEGER',NamedNumberList} ->
+	    NN = [X||{X,_} <- NamedNumberList],
+	    case NN of
+		[] ->
+		    i_random(C);
+		_ ->
+		    lists:nth(random(length(NN)),NN)
+	    end;
+	Enum when tuple(Enum),element(1,Enum)=='ENUMERATED' ->
+	    NamedNumberList =
+		case Enum of
+		    {_,_,NNL} -> NNL;
+		    {_,NNL} -> NNL
+		end,
+	    NNew=
+		case NamedNumberList of
+		    {N1,N2} ->
+			N1 ++ N2;
+		    _->
+			NamedNumberList
+		end,
+	    NN = [X||{X,_} <- NNew],
+	    case NN of
+		[] ->
+		    asn1_EMPTY;
+		_ ->
+		    lists:nth(random(length(NN)),NN)
+	    end;
+	{'BIT STRING',NamedNumberList} ->
+%%	    io:format("get_type_prim 1: ~w~n",[NamedNumberList]),
+	    NN = [X||{X,_} <- NamedNumberList],
+	    case NN of
+		[] ->
+		    Bl1 =lists:reverse(adjust_list(size_random(C),[1,0,1,1])),
+		    lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,Bl1));
+		_ ->
+%%		    io:format("get_type_prim 2: ~w~n",[NN]),
+		    [lists:nth(random(length(NN)),NN)]
+	    end;
+	'ANY' ->
+	    exit({asn1_error,nyi,'ANY'});
+	'NULL' ->
+	    'NULL';
+	'OBJECT IDENTIFIER' ->
+	    Len = random(3),
+	    Olist = [(random(1000)-1)||_X <-lists:seq(1,Len)],
+	    list_to_tuple([random(3)-1,random(40)-1|Olist]);
+	'ObjectDescriptor' ->
+	    object_descriptor_nyi;
+	'BOOLEAN' ->
+	    true;
+	'OCTET STRING' ->
+	    adjust_list(size_random(C),c_string(C,"OCTET STRING"));
+	'NumericString' ->
+	    adjust_list(size_random(C),c_string(C,"0123456789"));
+	'TeletexString' ->
+	    adjust_list(size_random(C),c_string(C,"TeletexString"));
+	'VideotexString' ->
+	    adjust_list(size_random(C),c_string(C,"VideotexString"));
+	'UTCTime' ->
+	    "97100211-0500";
+	'GeneralizedTime' ->
+	    "19971002103130.5";
+	'GraphicString' ->
+	    adjust_list(size_random(C),c_string(C,"GraphicString"));
+	'VisibleString' ->
+	    adjust_list(size_random(C),c_string(C,"VisibleString"));
+	'GeneralString' ->
+	    adjust_list(size_random(C),c_string(C,"GeneralString"));
+	'PrintableString' ->
+	    adjust_list(size_random(C),c_string(C,"PrintableString"));
+	'IA5String' ->
+	    adjust_list(size_random(C),c_string(C,"IA5String"));
+	'BMPString' ->
+	    adjust_list(size_random(C),c_string(C,"BMPString"));
+	'UniversalString' ->
+	    adjust_list(size_random(C),c_string(C,"UniversalString"));
+	XX ->
+	    exit({asn1_error,nyi,XX})
+    end.
+
+c_string(undefined,Default) ->
+    Default;
+c_string(C,Default) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	{'SingleValue',Sv} when list(Sv) ->
+	    Sv;
+	{'SingleValue',V} when integer(V) ->
+	    [V];
+	no ->
+	    Default
+    end.
+
+random(Upper) ->
+    {A1,A2,A3} = erlang:now(),
+    random:seed(A1,A2,A3),
+    random:uniform(Upper).
+
+size_random(C) ->
+    case get_constraint(C,'SizeConstraint') of
+	no ->
+	    c_random({0,5},no);
+	{Lb,Ub} when Ub-Lb =< 4 ->
+	    c_random({Lb,Ub},no);
+	{Lb,_}  ->
+	    c_random({Lb,Lb+4},no);
+	Sv ->
+	    c_random(no,Sv)
+    end.
+
+i_random(C) ->
+    c_random(get_constraint(C,'ValueRange'),get_constraint(C,'SingleValue')).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% c_random(Range,SingleValue)
+%% only called from other X_random functions
+
+c_random(VRange,Single) ->
+    case {VRange,Single} of
+	{no,no} ->
+	    random(16#fffffff) - (16#fffffff bsr 1);
+	{R,no} ->
+	    case R of
+		{Lb,Ub} when integer(Lb),integer(Ub) ->
+		    Range = Ub - Lb +1,
+		    Lb + (random(Range)-1);
+		{Lb,'MAX'} ->
+		    Lb + random(16#fffffff)-1;
+		{'MIN',Ub} ->
+		    Ub - random(16#fffffff)-1;
+		{A,{'ASN1_OK',B}} ->
+		    Range = B - A +1,
+		    A + (random(Range)-1)
+	    end;
+	{_,S} when integer(S) ->
+	    S;
+	{_,S} when list(S) ->
+	    lists:nth(random(length(S)),S)
+%%	{S1,S2} ->
+%%	    io:format("asn1ct_value: hejsan hoppsan~n");
+%%	_ ->
+%%	    io:format("asn1ct_value: hejsan hoppsan 2~n")
+%%	    io:format("asn1ct_value: c_random/2: S1 = ~w~n"
+%%		      "S2 = ~w,~n",[S1,S2])
+%%	    exit(self(),goodbye)
+    end.
+
+adjust_list(Len,Orig) ->
+    adjust_list1(Len,Orig,Orig,[]).
+
+adjust_list1(0,_Orig,[_Oh|_Ot],Acc) ->
+    lists:reverse(Acc);
+adjust_list1(Len,Orig,[],Acc) ->
+    adjust_list1(Len,Orig,Orig,Acc);
+adjust_list1(Len,Orig,[Oh|Ot],Acc) ->
+    adjust_list1(Len-1,Orig,Ot,[Oh|Acc]).
+
+
+get_constraint(C,Key) ->
+    case lists:keysearch(Key,1,C) of
+	false ->
+	     no;
+	{value,{_,V}} ->
+	    V
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt.erl
new file mode 100644
index 0000000000..efac8daf6b
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt.erl
@@ -0,0 +1,69 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1rt.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+-module(asn1rt).
+
+%% Runtime functions for ASN.1 (i.e encode, decode)
+
+-export([encode/2,encode/3,decode/3,load_driver/0,unload_driver/0,info/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.
+
+load_driver() ->
+    asn1rt_driver_handler:load_driver(),
+    receive
+	driver_ready ->
+	    ok;
+	Err={error,_Reason} ->
+	    Err;
+	Error ->
+	    {error,Error}
+    end.
+
+unload_driver() ->
+    case catch asn1rt_driver_handler:unload_driver() of
+	ok ->
+	    ok;
+	Error ->
+	    {error,Error}
+    end.
+
+
+info(Module) ->
+    case catch apply(Module,info,[]) of
+	{'EXIT',{undef,_Reason}} ->
+	    {error,{asn1,{undef,Module,info}}};
+	Result ->
+	    {ok,Result}
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin.erl
new file mode 100644
index 0000000000..6064515a7e
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin.erl
@@ -0,0 +1,2310 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1rt_ber_bin.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+-module(asn1rt_ber_bin).
+
+%% encoding / decoding of BER
+
+-export([decode/1]).
+-export([fixoptionals/2,split_list/2,cindex/3,restbytes2/3,
+	 list_to_record/2,
+	 encode_tag_val/1,decode_tag/1,peek_tag/1,
+	 check_tags/3, encode_tags/3]).
+-export([encode_boolean/2,decode_boolean/3,
+	 encode_integer/3,encode_integer/4,
+	 decode_integer/4,decode_integer/5,encode_enumerated/2,
+	 encode_enumerated/4,decode_enumerated/5,
+	 encode_real/2,decode_real/4,
+	 encode_bit_string/4,decode_bit_string/6,
+	 decode_compact_bit_string/6,
+	 encode_octet_string/3,decode_octet_string/5,
+	 encode_null/2,decode_null/3,
+	 encode_object_identifier/2,decode_object_identifier/3,
+	 encode_restricted_string/4,decode_restricted_string/6,
+	 encode_universal_string/3,decode_universal_string/5,
+	 encode_BMP_string/3,decode_BMP_string/5,
+	 encode_generalized_time/3,decode_generalized_time/5,
+	 encode_utc_time/3,decode_utc_time/5,
+	 encode_length/1,decode_length/1,
+	 check_if_valid_tag/3,
+	 decode_tag_and_length/1, decode_components/6,
+	 decode_components/7, decode_set/6]).
+
+-export([encode_open_type/1,encode_open_type/2,decode_open_type/1,decode_open_type/2,decode_open_type/3]).
+-export([skipvalue/1, skipvalue/2]).
+
+-include("asn1_records.hrl").
+
+% the encoding of class of tag bits 8 and 7
+-define(UNIVERSAL,   0).
+-define(APPLICATION, 16#40).
+-define(CONTEXT,     16#80).
+-define(PRIVATE,     16#C0).
+
+%%% primitive or constructed encoding % bit 6
+-define(PRIMITIVE,   0).
+-define(CONSTRUCTED, 2#00100000).
+
+%%% The tag-number for universal types
+-define(N_BOOLEAN, 1).
+-define(N_INTEGER, 2).
+-define(N_BIT_STRING, 3).
+-define(N_OCTET_STRING, 4).
+-define(N_NULL, 5).
+-define(N_OBJECT_IDENTIFIER, 6).
+-define(N_OBJECT_DESCRIPTOR, 7).
+-define(N_EXTERNAL, 8).
+-define(N_REAL, 9).
+-define(N_ENUMERATED, 10).
+-define(N_EMBEDDED_PDV, 11).
+-define(N_SEQUENCE, 16).
+-define(N_SET, 17).
+-define(N_NumericString, 18).
+-define(N_PrintableString, 19).
+-define(N_TeletexString, 20).
+-define(N_VideotexString, 21).
+-define(N_IA5String, 22).
+-define(N_UTCTime, 23).
+-define(N_GeneralizedTime, 24).
+-define(N_GraphicString, 25).
+-define(N_VisibleString, 26).
+-define(N_GeneralString, 27).
+-define(N_UniversalString, 28).
+-define(N_BMPString, 30).
+
+
+% the complete tag-word of built-in types
+-define(T_BOOLEAN,          ?UNIVERSAL bor ?PRIMITIVE bor 1).
+-define(T_INTEGER,          ?UNIVERSAL bor ?PRIMITIVE bor 2).
+-define(T_BIT_STRING,       ?UNIVERSAL bor ?PRIMITIVE bor 3). % can be CONSTRUCTED
+-define(T_OCTET_STRING,     ?UNIVERSAL bor ?PRIMITIVE bor 4). % can be CONSTRUCTED
+-define(T_NULL,             ?UNIVERSAL bor ?PRIMITIVE bor 5).
+-define(T_OBJECT_IDENTIFIER,?UNIVERSAL bor ?PRIMITIVE bor 6).
+-define(T_OBJECT_DESCRIPTOR,?UNIVERSAL bor ?PRIMITIVE bor 7).
+-define(T_EXTERNAL,         ?UNIVERSAL bor ?PRIMITIVE bor 8).
+-define(T_REAL,             ?UNIVERSAL bor ?PRIMITIVE bor 9).
+-define(T_ENUMERATED,       ?UNIVERSAL bor ?PRIMITIVE bor 10).
+-define(T_EMBEDDED_PDV,     ?UNIVERSAL bor ?PRIMITIVE bor 11).
+-define(T_SEQUENCE,         ?UNIVERSAL bor ?CONSTRUCTED bor 16).
+-define(T_SET,              ?UNIVERSAL bor ?CONSTRUCTED bor 17).
+-define(T_NumericString,    ?UNIVERSAL bor ?PRIMITIVE bor 18). %can be constructed
+-define(T_PrintableString,  ?UNIVERSAL bor ?PRIMITIVE bor 19). %can be constructed
+-define(T_TeletexString,    ?UNIVERSAL bor ?PRIMITIVE bor 20). %can be constructed
+-define(T_VideotexString,   ?UNIVERSAL bor ?PRIMITIVE bor 21). %can be constructed
+-define(T_IA5String,        ?UNIVERSAL bor ?PRIMITIVE bor 22). %can be constructed
+-define(T_UTCTime,          ?UNIVERSAL bor ?PRIMITIVE bor 23).
+-define(T_GeneralizedTime,  ?UNIVERSAL bor ?PRIMITIVE bor 24).
+-define(T_GraphicString,    ?UNIVERSAL bor ?PRIMITIVE bor 25). %can be constructed
+-define(T_VisibleString,    ?UNIVERSAL bor ?PRIMITIVE bor 26). %can be constructed
+-define(T_GeneralString,    ?UNIVERSAL bor ?PRIMITIVE bor 27). %can be constructed
+-define(T_UniversalString,  ?UNIVERSAL bor ?PRIMITIVE bor 28). %can be constructed
+-define(T_BMPString,        ?UNIVERSAL bor ?PRIMITIVE bor 30). %can be constructed
+
+
+decode(Bin) ->
+    decode_primitive(Bin).
+
+decode_primitive(Bin) ->
+    {Tlv = {Tag,Len,V},<<>>} = decode_tlv(Bin),
+    case element(2,Tag) of
+	?CONSTRUCTED ->
+	    {Tag,Len,decode_constructed(V)};
+	_ ->
+	    Tlv
+    end.
+
+decode_constructed(<<>>) ->
+    [];
+decode_constructed(Bin) ->
+    {Tlv = {Tag,Len,V},Rest} = decode_tlv(Bin),
+    NewTlv =
+	case element(2,Tag) of
+	    ?CONSTRUCTED ->
+		{Tag,Len,decode_constructed(V)};
+	    _ ->
+		Tlv
+	end,
+    [NewTlv|decode_constructed(Rest)].
+
+decode_tlv(Bin) ->
+    {Tag,Bin1,_Rb1} = decode_tag(Bin),
+    {{Len,Bin2},_Rb2} = decode_length(Bin1),
+    <<V:Len/binary,Bin3/binary>> = Bin2,
+    {{Tag,Len,V},Bin3}.
+
+
+
+%%%%%%%%%%%%%
+% split_list(List,HeadLen) -> {HeadList,TailList}
+%
+% splits List into HeadList (Length=HeadLen) and TailList
+% if HeadLen == indefinite -> return {List,indefinite}
+split_list(List,indefinite) ->
+    {List, indefinite};
+split_list(Bin, Len) when binary(Bin) ->
+    split_binary(Bin,Len);
+split_list(List,Len) ->
+    {lists:sublist(List,Len),lists:nthtail(Len,List)}.
+
+
+%%% new function which fixes a bug regarding indefinite length decoding
+restbytes2(indefinite,<<0,0,RemBytes/binary>>,_) ->
+    {RemBytes,2};
+restbytes2(indefinite,RemBytes,ext) ->
+    skipvalue(indefinite,RemBytes);
+restbytes2(RemBytes,<<>>,_) ->
+    {RemBytes,0};
+restbytes2(_RemBytes,Bytes,noext) ->
+    exit({error,{asn1, {unexpected,Bytes}}});
+restbytes2(RemBytes,_Bytes,ext) ->
+    {RemBytes,0}.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% skipvalue(Length, Bytes) -> {RemainingBytes, RemovedNumberOfBytes}
+%%
+%% skips the one complete (could be nested) TLV from Bytes
+%% handles both definite and indefinite length encodings
+%%
+
+skipvalue(L, Bytes) ->
+    skipvalue(L, Bytes, 0).
+
+skipvalue(indefinite, Bytes, Rb) ->
+    {_T,Bytes2,R2} = decode_tag(Bytes),
+    {{L,Bytes3},R3} = decode_length(Bytes2),
+    {Bytes4,Rb4} = case L of
+		       indefinite ->
+			   skipvalue(indefinite,Bytes3,R2+R3);
+		       _ ->
+			   <<_:L/binary, RestBytes/binary>> = Bytes3,
+			   {RestBytes, R2+R3+L}
+		   end,
+    case Bytes4 of
+	<<0,0,Bytes5/binary>> ->
+	    {Bytes5,Rb+Rb4+2};
+	_  -> skipvalue(indefinite,Bytes4,Rb+Rb4)
+    end;
+skipvalue(L, Bytes, Rb) ->
+%    <<Skip:L/binary, RestBytes/binary>> = Bytes,
+    <<_:L/binary, RestBytes/binary>> = Bytes,
+    {RestBytes,Rb+L}.
+
+%%skipvalue(indefinite, Bytes, Rb) ->
+%%    {T,Bytes2,R2} = decode_tag(Bytes),
+%%    {L,Bytes3,R3} = decode_length(Bytes2),
+%%    {Bytes4,Rb4} = case L of
+%%		 indefinite ->
+%%		     skipvalue(indefinite,Bytes3,R2+R3);
+%%		 _ ->
+%%		     lists:nthtail(L,Bytes3) %% konstigt !?
+%%	     end,
+%%    case Bytes4 of
+%%	[0,0|Bytes5] ->
+%%	    {Bytes5,Rb4+2};
+%%	_  -> skipvalue(indefinite,Bytes4,Rb4)
+%%    end;
+%%skipvalue(L, Bytes, Rb) ->
+%%    {lists:nthtail(L,Bytes),Rb+L}.
+
+skipvalue(Bytes) ->
+    {_T,Bytes2,R2} = decode_tag(Bytes),
+    {{L,Bytes3},R3} = decode_length(Bytes2),
+    skipvalue(L,Bytes3,R2+R3).
+
+
+cindex(Ix,Val,Cname) ->
+    case element(Ix,Val) of
+	{Cname,Val2} -> Val2;
+	X -> X
+    end.
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Optionals, preset not filled optionals with asn1_NOVALUE
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+% converts a list to a record if necessary
+list_to_record(Name,List) when list(List) ->
+    list_to_tuple([Name|List]);
+list_to_record(_Name,Tuple) when tuple(Tuple) ->
+    Tuple.
+
+
+fixoptionals(OptList,Val) when list(Val) ->
+    fixoptionals(OptList,Val,1,[],[]).
+
+fixoptionals([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) ->
+    fixoptionals(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]);
+fixoptionals([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) ->
+    fixoptionals(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]);
+fixoptionals(O,[Vh|Vt],Pos,Acc1,Acc2) ->
+    fixoptionals(O,Vt,Pos+1,Acc1,[Vh|Acc2]);
+fixoptionals([],[Vh|Vt],Pos,Acc1,Acc2) ->
+    fixoptionals([],Vt,Pos+1,Acc1,[Vh|Acc2]);
+fixoptionals([],[],_,_Acc1,Acc2) ->
+    % return Val as a record
+    list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]).
+
+
+%%encode_tag(TagClass(?UNI, APP etc), Form (?PRIM etx), TagInteger) ->
+%%     8bit Int | binary
+encode_tag_val({Class, Form, TagNo}) when (TagNo =< 30) ->
+    <<(Class bsr 6):2,(Form bsr 5):1,TagNo:5>>;
+
+encode_tag_val({Class, Form, TagNo}) ->
+    {Octets,_Len} = mk_object_val(TagNo),
+    BinOct = list_to_binary(Octets),
+    <<(Class bsr 6):2, (Form bsr 5):1, 31:5,BinOct/binary>>;
+
+%% asumes whole correct tag bitpattern, multiple of 8
+encode_tag_val(Tag) when (Tag =< 255) -> Tag;  %% anv�nds denna funktion??!!
+%% asumes correct bitpattern of 0-5
+encode_tag_val(Tag) -> encode_tag_val2(Tag,[]).
+
+encode_tag_val2(Tag, OctAck) when (Tag =< 255) ->
+    [Tag | OctAck];
+encode_tag_val2(Tag, OctAck) ->
+    encode_tag_val2(Tag bsr 8, [255 band Tag | OctAck]).
+
+
+%%%encode_tag(TagClass(?UNI, APP etc), Form (?PRIM etx), TagInteger) ->
+%%%     8bit Int | [list of octets]
+%encode_tag_val({Class, Form, TagNo}) when (TagNo =< 30) ->
+%%%    <<Class:2,Form:1,TagNo:5>>;
+%    [Class bor Form bor TagNo];
+%encode_tag_val({Class, Form, TagNo}) ->
+%    {Octets,L} = mk_object_val(TagNo),
+%    [Class bor Form bor 31 | Octets];
+
+
+%%============================================================================\%% Peek on the initial tag
+%% peek_tag(Bytes) -> TagBytes
+%% interprets the first byte and possible  second, third and fourth byte as
+%% a tag and returns all the bytes comprising the tag, the constructed/primitive bit (6:th bit of first byte) is normalised to 0
+%%
+
+peek_tag(<<B7_6:2,_:1,31:5,Buffer/binary>>) ->
+    Bin = peek_tag(Buffer, <<>>),
+    <<B7_6:2,31:6,Bin/binary>>;
+%% single tag (tagno < 31)
+peek_tag(<<B7_6:2,_:1,B4_0:5,_Buffer/binary>>) ->
+    <<B7_6:2,B4_0:6>>.
+
+peek_tag(<<0:1,PartialTag:7,_Buffer/binary>>, TagAck) ->
+    <<TagAck/binary,PartialTag>>;
+peek_tag(<<PartialTag,Buffer/binary>>, TagAck) ->
+    peek_tag(Buffer,<<TagAck/binary,PartialTag>>);
+peek_tag(_,TagAck) ->
+    exit({error,{asn1, {invalid_tag,TagAck}}}).
+%%peek_tag([Tag|Buffer]) when (Tag band 31) == 31 ->
+%%    [Tag band 2#11011111 | peek_tag(Buffer,[])];
+%%%% single tag (tagno < 31)
+%%peek_tag([Tag|Buffer]) ->
+%%    [Tag band 2#11011111].
+
+%%peek_tag([PartialTag|Buffer], TagAck) when (PartialTag < 128 ) ->
+%%    lists:reverse([PartialTag|TagAck]);
+%%peek_tag([PartialTag|Buffer], TagAck) ->
+%%    peek_tag(Buffer,[PartialTag|TagAck]);
+%%peek_tag(Buffer,TagAck) ->
+%%    exit({error,{asn1, {invalid_tag,lists:reverse(TagAck)}}}).
+
+
+%%===============================================================================
+%% Decode a tag
+%%
+%% decode_tag(OctetListBuffer) -> {{Class, Form, TagNo}, RestOfBuffer, RemovedBytes}
+%%===============================================================================
+
+%% multiple octet tag
+decode_tag(<<Class:2, Form:1, 31:5, Buffer/binary>>) ->
+    {TagNo, Buffer1, RemovedBytes} = decode_tag(Buffer, 0, 1),
+    {{(Class bsl 6), (Form bsl 5), TagNo}, Buffer1, RemovedBytes};
+
+%% single tag (< 31 tags)
+decode_tag(<<Class:2,Form:1,TagNo:5, Buffer/binary>>) ->
+    {{(Class bsl 6), (Form bsl 5), TagNo}, Buffer, 1}.
+
+%% last partial tag
+decode_tag(<<0:1,PartialTag:7, Buffer/binary>>, TagAck, RemovedBytes) ->
+    TagNo = (TagAck bsl 7) bor PartialTag,
+    %%<<TagNo>> = <<TagAck:1, PartialTag:7>>,
+    {TagNo, Buffer, RemovedBytes+1};
+% more tags
+decode_tag(<<_:1,PartialTag:7, Buffer/binary>>, TagAck, RemovedBytes) ->
+    TagAck1 = (TagAck bsl 7) bor PartialTag,
+    %%<<TagAck1:16>> = <<TagAck:1, PartialTag:7,0:8>>,
+    decode_tag(Buffer, TagAck1, RemovedBytes+1).
+
+%%------------------------------------------------------------------
+%% check_tags_i is the same as check_tags except that it stops and
+%% returns the remaining tags not checked when it encounters an
+%% indefinite length field
+%% only called internally within this module
+
+check_tags_i([Tag], Buffer, OptOrMand) -> % optimized very usual case
+    {[],check_one_tag(Tag, Buffer, OptOrMand)};
+check_tags_i(Tags, Buffer, OptOrMand) ->
+    check_tags_i(Tags, Buffer, 0, OptOrMand).
+
+check_tags_i([Tag1,Tag2|TagRest], Buffer, Rb, OptOrMand)
+  when Tag1#tag.type == 'IMPLICIT' ->
+    check_tags_i([Tag1#tag{type=Tag2#tag.type}|TagRest], Buffer, Rb, OptOrMand);
+
+check_tags_i([Tag1|TagRest], Buffer, Rb, OptOrMand) ->
+    {Form_Length,Buffer2,Rb1} = check_one_tag(Tag1, Buffer, OptOrMand),
+    case TagRest of
+	[] -> {TagRest, {Form_Length, Buffer2, Rb + Rb1}};
+	_ ->
+	    case Form_Length of
+		{?CONSTRUCTED,_} ->
+		    {TagRest, {Form_Length, Buffer2, Rb + Rb1}};
+		_ ->
+		    check_tags_i(TagRest, Buffer2, Rb + Rb1, mandatory)
+	    end
+    end;
+
+check_tags_i([], Buffer, Rb, _) ->
+    {[],{{0,0},Buffer,Rb}}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This function is called from generated code
+
+check_tags([Tag], Buffer, OptOrMand) -> % optimized very usual case
+    check_one_tag(Tag, Buffer, OptOrMand);
+check_tags(Tags, Buffer, OptOrMand) ->
+    check_tags(Tags, Buffer, 0, OptOrMand).
+
+check_tags([Tag1,Tag2|TagRest], Buffer, Rb, OptOrMand)
+  when Tag1#tag.type == 'IMPLICIT' ->
+    check_tags([Tag1#tag{type=Tag2#tag.type}|TagRest], Buffer, Rb, OptOrMand);
+
+check_tags([Tag1|TagRest], Buffer, Rb, OptOrMand) ->
+    {Form_Length,Buffer2,Rb1} = check_one_tag(Tag1, Buffer, OptOrMand),
+    case TagRest of
+	[] -> {Form_Length, Buffer2, Rb + Rb1};
+	_ -> check_tags(TagRest, Buffer2, Rb + Rb1, mandatory)
+    end;
+
+check_tags([], Buffer, Rb, _) ->
+    {{0,0},Buffer,Rb}.
+
+check_one_tag(Tag=#tag{class=ExpectedClass,number=ExpectedNumber}, Buffer, OptOrMand) ->
+    case catch decode_tag(Buffer) of
+	{'EXIT',_Reason} ->
+	    tag_error(no_data,Tag,Buffer,OptOrMand);
+	{{ExpectedClass,Form,ExpectedNumber},Buffer2,Rb} ->
+	    {{L,Buffer3},RemBytes2} = decode_length(Buffer2),
+	    {{Form,L}, Buffer3, RemBytes2+Rb};
+	{ErrorTag,_,_} ->
+	    tag_error(ErrorTag, Tag, Buffer, OptOrMand)
+    end.
+
+tag_error(ErrorTag, Tag, Buffer, OptOrMand) ->
+    case OptOrMand of
+	mandatory ->
+	    exit({error,{asn1, {invalid_tag,
+				{ErrorTag, Tag, Buffer}}}});
+	_ ->
+	    exit({error,{asn1, {no_optional_tag,
+				{ErrorTag, Tag, Buffer}}}})
+    end.
+%%=======================================================================
+%%
+%% Encode all tags in the list Tags and return a possibly deep list of
+%% bytes with tag and length encoded
+%%
+%% prepend_tags(Tags, BytesSoFar, LenSoFar) -> {Bytes, Len}
+encode_tags(Tags, BytesSoFar, LenSoFar) ->
+    NewTags = encode_tags1(Tags, []),
+    %% NewTags contains the resulting tags in reverse order
+    encode_tags2(NewTags, BytesSoFar, LenSoFar).
+
+%encode_tags2([#tag{class=?UNIVERSAL,number=No}|Trest], BytesSoFar, LenSoFar) ->
+%    {Bytes2,L2} = encode_length(LenSoFar),
+%    encode_tags2(Trest,[[No|Bytes2],BytesSoFar], LenSoFar + 1 + L2);
+encode_tags2([Tag|Trest], BytesSoFar, LenSoFar) ->
+    {Bytes1,L1} = encode_one_tag(Tag),
+    {Bytes2,L2} = encode_length(LenSoFar),
+    encode_tags2(Trest, [Bytes1,Bytes2|BytesSoFar],
+		 LenSoFar + L1 + L2);
+encode_tags2([], BytesSoFar, LenSoFar) ->
+    {BytesSoFar,LenSoFar}.
+
+encode_tags1([Tag1, Tag2| Trest], Acc)
+  when Tag1#tag.type == 'IMPLICIT' ->
+    encode_tags1([Tag1#tag{type=Tag2#tag.type,form=Tag2#tag.form}|Trest],Acc);
+encode_tags1([Tag1 | Trest], Acc) ->
+    encode_tags1(Trest, [Tag1|Acc]);
+encode_tags1([], Acc) ->
+    Acc. % the resulting tags are returned in reverse order
+
+encode_one_tag(Bin) when binary(Bin) ->
+    {Bin,size(Bin)};
+encode_one_tag(#tag{class=Class,number=No,type=Type, form = Form}) ->
+    NewForm = case Type of
+	       'EXPLICIT' ->
+		   ?CONSTRUCTED;
+	       _ ->
+		   Form
+	   end,
+    Bytes = encode_tag_val({Class,NewForm,No}),
+    {Bytes,size(Bytes)}.
+
+%%===============================================================================
+%% Change the tag (used when an implicit tagged type has a reference to something else)
+%% The constructed bit in the tag is taken from the tag to be replaced.
+%%
+%% change_tag(NewTag,[Tag,Buffer]) -> [NewTag,Buffer]
+%%===============================================================================
+
+%change_tag({NewClass,NewTagNr}, Buffer) ->
+%    {{OldClass, OldForm, OldTagNo}, Buffer1, RemovedBytes} = decode_tag(lists:flatten(Buffer)),
+%    [encode_tag_val({NewClass, OldForm, NewTagNr}) | Buffer1].
+
+
+
+
+
+
+
+%%===============================================================================
+%%
+%% This comment is valid for all the encode/decode functions
+%%
+%% C = Constraint -> typically {'ValueRange',LowerBound,UpperBound}
+%%     used for PER-coding but not for BER-coding.
+%%
+%% Val = Value.  If Val is an atom then it is a symbolic integer value
+%%       (i.e the atom must be one of the names in the NamedNumberList).
+%%       The NamedNumberList is used to translate the atom to an integer value
+%%       before encoding.
+%%
+%%===============================================================================
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_open_type(Value) -> CompleteList
+%% Value = list of bytes of an already encoded value (the list must be flat)
+%%         | binary
+
+%% This version does not consider Explicit tagging of the open type. It
+%% is only left because of backward compatibility.
+encode_open_type(Val) when list(Val) ->
+    {Val,size(list_to_binary(Val))};
+encode_open_type(Val) ->
+    {Val, size(Val)}.
+
+%%
+encode_open_type(Val, []) when list(Val) ->
+    {Val,size(list_to_binary(Val))};
+encode_open_type(Val,[]) ->
+    {Val, size(Val)};
+encode_open_type(Val, Tag) when list(Val) ->
+    encode_tags(Tag,Val,size(list_to_binary(Val)));
+encode_open_type(Val,Tag) ->
+    encode_tags(Tag,Val, size(Val)).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_open_type(Buffer) -> Value
+%% Bytes = [byte] with BER encoded data
+%% Value = [byte] with decoded data (which must be decoded again as some type)
+%%
+decode_open_type(Bytes) ->
+    {_Tag, Len, _RemainingBuffer, RemovedBytes} = decode_tag_and_length(Bytes),
+    N = Len + RemovedBytes,
+    <<Val:N/binary, RemainingBytes/binary>> = Bytes,
+    {Val, RemainingBytes, Len + RemovedBytes}.
+
+decode_open_type(Bytes,ExplTag) ->
+    {Tag, Len, RemainingBuffer, RemovedBytes} = decode_tag_and_length(Bytes),
+    case {Tag,ExplTag} of
+	{{Class,Form,No},[#tag{class=Class,number=No,form=Form}]} ->
+	    {_Tag2, Len2, _RemainingBuffer2, RemovedBytes2} = decode_tag_and_length(RemainingBuffer),
+	    N = Len2 + RemovedBytes2,
+	    <<_:RemovedBytes/unit:8,Val:N/binary,RemainingBytes/binary>> = Bytes,
+	    {Val, RemainingBytes, N + RemovedBytes};
+	_ ->
+	    N = Len + RemovedBytes,
+	    <<Val:N/binary, RemainingBytes/binary>> = Bytes,
+	    {Val, RemainingBytes, Len + RemovedBytes}
+    end.
+
+decode_open_type(ber_bin,Bytes,ExplTag) ->
+    decode_open_type(Bytes,ExplTag);
+decode_open_type(ber,Bytes,ExplTag) ->
+    {Val,RemBytes,Len}=decode_open_type(Bytes,ExplTag),
+    {binary_to_list(Val),RemBytes,Len}.
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Boolean, ITU_T X.690 Chapter 8.2
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+%%===============================================================================
+%% encode_boolean(Integer, tag | notag) -> [octet list]
+%%===============================================================================
+
+encode_boolean({Name, Val}, DoTag) when atom(Name) ->
+    dotag(DoTag, ?N_BOOLEAN, encode_boolean(Val));
+encode_boolean(true,[]) ->
+    {[1,1,16#FF],3};
+encode_boolean(false,[]) ->
+    {[1,1,0],3};
+encode_boolean(Val, DoTag) ->
+    dotag(DoTag, ?N_BOOLEAN, encode_boolean(Val)).
+
+%% encode_boolean(Boolean) -> [Len, Boolean] = [1, $FF | 0]
+encode_boolean(true)   ->    {[16#FF],1};
+encode_boolean(false)  ->    {[0],1};
+encode_boolean(X) -> exit({error,{asn1, {encode_boolean, X}}}).
+
+
+%%===============================================================================
+%% decode_boolean(BuffList, HasTag, TotalLen) -> {true, Remain, RemovedBytes} |
+%%                                               {false, Remain, RemovedBytes}
+%%===============================================================================
+
+decode_boolean(Buffer, Tags, OptOrMand) ->
+    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_BOOLEAN}),
+    decode_boolean_notag(Buffer, NewTags, OptOrMand).
+
+decode_boolean_notag(Buffer, Tags, OptOrMand) ->
+    {RestTags, {FormLen,Buffer0,Rb0}} =
+	check_tags_i(Tags, Buffer, OptOrMand),
+    case FormLen of
+	{?CONSTRUCTED,Len} ->
+	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
+	    {Val,Buffer1,Rb1} = decode_boolean_notag(Buffer00, RestTags, OptOrMand),
+	    {Buffer2, Rb2} = restbytes2(RestBytes,Buffer1,noext),
+	    {Val, Buffer2, Rb0+Rb1+Rb2};
+	{_,_} ->
+	    decode_boolean2(Buffer0, Rb0)
+    end.
+
+decode_boolean2(<<0:8, Buffer/binary>>, RemovedBytes) ->
+    {false, Buffer, RemovedBytes + 1};
+decode_boolean2(<<_:8, Buffer/binary>>, RemovedBytes) ->
+    {true, Buffer, RemovedBytes + 1};
+decode_boolean2(Buffer, _) ->
+    exit({error,{asn1, {decode_boolean, Buffer}}}).
+
+
+
+
+%%===========================================================================
+%% Integer, ITU_T X.690 Chapter 8.3
+
+%% encode_integer(Constraint, Value, Tag) -> [octet list]
+%% encode_integer(Constraint, Name, NamedNumberList, Tag) -> [octet list]
+%%    Value = INTEGER | {Name,INTEGER}
+%%    Tag = tag | notag
+%%===========================================================================
+
+encode_integer(C, Val, []) when integer(Val) ->
+    {EncVal,Len}=encode_integer(C, Val),
+    dotag_universal(?N_INTEGER,EncVal,Len);
+encode_integer(C, Val, Tag) when integer(Val) ->
+    dotag(Tag, ?N_INTEGER, encode_integer(C, Val));
+encode_integer(C,{Name,Val},Tag) when atom(Name) ->
+    encode_integer(C,Val,Tag);
+encode_integer(_, Val, _) ->
+    exit({error,{asn1, {encode_integer, Val}}}).
+
+
+
+encode_integer(C, Val, NamedNumberList, Tag) when atom(Val) ->
+    case lists:keysearch(Val, 1, NamedNumberList) of
+	{value,{_, NewVal}} ->
+	    dotag(Tag, ?N_INTEGER, encode_integer(C, NewVal));
+	_ ->
+	    exit({error,{asn1, {encode_integer_namednumber, Val}}})
+    end;
+encode_integer(C,{_,Val},NamedNumberList,Tag) ->
+    encode_integer(C,Val,NamedNumberList,Tag);
+encode_integer(C, Val, _NamedNumberList, Tag) ->
+    dotag(Tag, ?N_INTEGER, encode_integer(C, Val)).
+
+
+
+
+encode_integer(_C, Val) ->
+    Bytes =
+	if
+	    Val >= 0 ->
+		encode_integer_pos(Val, []);
+	    true ->
+		encode_integer_neg(Val, [])
+	end,
+    {Bytes,length(Bytes)}.
+
+encode_integer_pos(0, L=[B|_Acc]) when B < 128 ->
+    L;
+encode_integer_pos(N, Acc) ->
+    encode_integer_pos((N bsr 8), [N band 16#ff| Acc]).
+
+encode_integer_neg(-1, L=[B1|_T]) when B1 > 127 ->
+    L;
+encode_integer_neg(N, Acc) ->
+    encode_integer_neg(N bsr 8, [N band 16#ff|Acc]).
+
+%%===============================================================================
+%% decode integer
+%%    (Buffer, Range, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}
+%%    (Buffer, Range, NamedNumberList, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}
+%%===============================================================================
+
+
+decode_integer(Buffer, Range, Tags, OptOrMand) ->
+    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_INTEGER}),
+    decode_integer_notag(Buffer, Range, [], NewTags, OptOrMand).
+
+decode_integer(Buffer, Range, NamedNumberList, Tags, OptOrMand) ->
+    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_INTEGER}),
+    decode_integer_notag(Buffer, Range, NamedNumberList, NewTags, OptOrMand).
+
+decode_integer_notag(Buffer, Range, NamedNumberList, NewTags, OptOrMand) ->
+    {RestTags, {FormLen, Buffer0, Rb0}} =
+	check_tags_i(NewTags, Buffer, OptOrMand),
+%    Result = {Val, Buffer2, RemovedBytes} =
+	case FormLen of
+	    {?CONSTRUCTED,Len} ->
+		{Buffer00, RestBytes} = split_list(Buffer0,Len),
+		{Val01, Buffer01, Rb01} =
+		    decode_integer_notag(Buffer00, Range, NamedNumberList,
+					 RestTags, OptOrMand),
+		{Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
+		{Val01, Buffer02, Rb0+Rb01+Rb02};
+	    {_, Len} ->
+		Result =
+		    decode_integer2(Len,Buffer0,Rb0+Len),
+		Result2 = check_integer_constraint(Result,Range),
+		resolve_named_value(Result2,NamedNumberList)
+	end.
+
+resolve_named_value(Result={Val,Buffer,RemBytes},NamedNumberList) ->
+    case NamedNumberList of
+	[] -> Result;
+	_ ->
+	    NewVal = case lists:keysearch(Val, 2, NamedNumberList) of
+			 {value,{NamedVal, _}} ->
+			     NamedVal;
+			 _ ->
+			     Val
+		     end,
+	    {NewVal, Buffer, RemBytes}
+    end.
+
+check_integer_constraint(Result={Val, _Buffer,_},Range) ->
+    case Range of
+	[] -> % No length constraint
+	    Result;
+	{Lb,Ub} when Val >= Lb, Ub >= Val -> % variable length constraint
+	    Result;
+	Val -> % fixed value constraint
+	    Result;
+	{_,_} ->
+	    exit({error,{asn1,{integer_range,Range,Val}}});
+	SingleValue when integer(SingleValue) ->
+	    exit({error,{asn1,{integer_range,Range,Val}}});
+	_ -> % some strange constraint that we don't support yet
+	    Result
+    end.
+
+%%============================================================================
+%% Enumerated value, ITU_T X.690 Chapter 8.4
+
+%% encode enumerated value
+%%============================================================================
+encode_enumerated(Val, []) when integer(Val)->
+    {EncVal,Len} = encode_integer(false,Val),
+    dotag_universal(?N_ENUMERATED,EncVal,Len);
+encode_enumerated(Val, DoTag) when integer(Val)->
+    dotag(DoTag, ?N_ENUMERATED, encode_integer(false,Val));
+encode_enumerated({Name,Val}, DoTag) when atom(Name) ->
+    encode_enumerated(Val, DoTag).
+
+%% The encode_enumerated functions below this line can be removed when the
+%% new code generation is stable. (the functions might have to be kept here
+%% a while longer for compatibility reasons)
+
+encode_enumerated(C, Val, {NamedNumberList,ExtList}, DoTag) when atom(Val) ->
+    case catch encode_enumerated(C, Val, NamedNumberList, DoTag) of
+	{'EXIT',_} -> encode_enumerated(C, Val, ExtList, DoTag);
+	Result -> Result
+    end;
+
+encode_enumerated(C, Val, NamedNumberList, DoTag) when atom(Val) ->
+    case lists:keysearch(Val, 1, NamedNumberList) of
+	{value, {_, NewVal}} when DoTag == []->
+	    {EncVal,Len} = encode_integer(C,NewVal),
+	    dotag_universal(?N_ENUMERATED,EncVal,Len);
+	{value, {_, NewVal}} ->
+	    dotag(DoTag, ?N_ENUMERATED, encode_integer(C, NewVal));
+	_ ->
+	    exit({error,{asn1, {enumerated_not_in_range, Val}}})
+    end;
+
+encode_enumerated(C, {asn1_enum, Val}, {_,_}, DoTag) when integer(Val) ->
+    dotag(DoTag, ?N_ENUMERATED, encode_integer(C,Val));
+
+encode_enumerated(C, {Name,Val}, NamedNumberList, DoTag) when atom(Name) ->
+    encode_enumerated(C, Val, NamedNumberList, DoTag);
+
+encode_enumerated(_, Val, _, _) ->
+    exit({error,{asn1, {enumerated_not_namednumber, Val}}}).
+
+
+
+%%============================================================================
+%% decode enumerated value
+%%   (Buffer, Range, NamedNumberList, HasTag, TotalLen) ->
+%%                                    {Value, RemainingBuffer, RemovedBytes}
+%%===========================================================================
+decode_enumerated(Buffer, Range, NamedNumberList, Tags, OptOrMand) ->
+    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_ENUMERATED}),
+    decode_enumerated_notag(Buffer, Range, NamedNumberList,
+			    NewTags, OptOrMand).
+
+decode_enumerated_notag(Buffer, Range, NNList = {NamedNumberList,ExtList}, Tags, OptOrMand) ->
+    {RestTags, {FormLen, Buffer0, Rb0}} =
+	check_tags_i(Tags, Buffer, OptOrMand),
+
+    case FormLen of
+	{?CONSTRUCTED,Len} ->
+	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
+	    {Val01, Buffer01, Rb01} =
+		decode_enumerated_notag(Buffer00, Range, NNList, RestTags, OptOrMand),
+	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
+	    {Val01, Buffer02, Rb0+Rb01+Rb02};
+	{_,Len} ->
+	    {Val01, Buffer01, Rb01} =
+		decode_integer2(Len, Buffer0, Rb0+Len),
+	    case decode_enumerated1(Val01, NamedNumberList) of
+		{asn1_enum,Val01} ->
+		    {decode_enumerated1(Val01,ExtList), Buffer01, Rb01};
+		Result01 ->
+		    {Result01, Buffer01, Rb01}
+	    end
+    end;
+
+decode_enumerated_notag(Buffer, Range, NNList, Tags, OptOrMand) ->
+    {RestTags, {FormLen, Buffer0, Rb0}} =
+	check_tags_i(Tags, Buffer, OptOrMand),
+
+    case FormLen of
+	{?CONSTRUCTED,Len} ->
+	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
+	    {Val01, Buffer01, Rb01} =
+		decode_enumerated_notag(Buffer00, Range, NNList, RestTags, OptOrMand),
+	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
+	    {Val01, Buffer02, Rb0+Rb01+Rb02};
+	{_,Len} ->
+	    {Val01, Buffer02, Rb02} =
+		decode_integer2(Len, Buffer0, Rb0+Len),
+	    case decode_enumerated1(Val01, NNList) of
+		{asn1_enum,_} ->
+		    exit({error,{asn1, {illegal_enumerated, Val01}}});
+		Result01 ->
+		    {Result01, Buffer02, Rb02}
+	    end
+    end.
+
+decode_enumerated1(Val, NamedNumberList) ->
+    %% it must be a named integer
+    case lists:keysearch(Val, 2, NamedNumberList) of
+	{value,{NamedVal, _}} ->
+	    NamedVal;
+	_ ->
+	    {asn1_enum,Val}
+    end.
+
+
+%%============================================================================
+%%
+%% Real value, ITU_T X.690 Chapter 8.5
+%%============================================================================
+%%
+%% encode real value
+%%============================================================================
+
+%% only base 2 internally so far!!
+encode_real(0, DoTag) ->
+    dotag(DoTag, ?N_REAL, {[],0});
+encode_real('PLUS-INFINITY', DoTag) ->
+    dotag(DoTag, ?N_REAL, {[64],1});
+encode_real('MINUS-INFINITY', DoTag) ->
+    dotag(DoTag, ?N_REAL, {[65],1});
+encode_real(Val, DoTag) when tuple(Val)->
+    dotag(DoTag, ?N_REAL, encode_real(Val)).
+
+%%%%%%%%%%%%%%
+%% not optimal efficient..
+%% only base 2 of Mantissa encoding!
+%% only base 2 of ExpBase encoding!
+encode_real({Man, Base, Exp}) ->
+%%    io:format("Mantissa: ~w Base: ~w, Exp: ~w~n",[Man, Base, Exp]),
+
+    OctExp = if Exp >= 0 -> list_to_binary(encode_integer_pos(Exp, []));
+		true     -> list_to_binary(encode_integer_neg(Exp, []))
+	     end,
+%%    ok = io:format("OctExp: ~w~n",[OctExp]),
+    SignBit = if  Man > 0 -> 0;  % bit 7 is pos or neg, no Zeroval
+		  true -> 1
+	      end,
+%%    ok = io:format("SignBitMask: ~w~n",[SignBitMask]),
+    InBase = if  Base =:= 2 -> 0;   % bit 6,5: only base 2 this far!
+			   true ->
+			       exit({error,{asn1, {encode_real_non_supported_encodeing, Base}}})
+		       end,
+    SFactor = 0,   % bit 4,3: no scaling since only base 2
+    OctExpLen = size(OctExp),
+    if OctExpLen > 255 ->
+	    exit({error,{asn1, {to_big_exp_in_encode_real, OctExpLen}}});
+       true  -> true %% make real assert later..
+    end,
+    {LenCode, EOctets} = case OctExpLen of   % bit 2,1
+			     1 -> {0, OctExp};
+			     2 -> {1, OctExp};
+			     3 -> {2, OctExp};
+			     _ -> {3, <<OctExpLen, OctExp/binary>>}
+			 end,
+    FirstOctet = <<1:1,SignBit:1,InBase:2,SFactor:2,LenCode:2>>,
+    OctMantissa = if Man > 0 -> list_to_binary(minimum_octets(Man));
+		     true    -> list_to_binary(minimum_octets(-(Man))) % signbit keeps track of sign
+		  end,
+    %%    ok = io:format("LenMask: ~w EOctets: ~w~nFirstOctet: ~w OctMantissa: ~w OctExpLen: ~w~n", [LenMask, EOctets, FirstOctet, OctMantissa, OctExpLen]),
+    Bin = <<FirstOctet/binary, EOctets/binary, OctMantissa/binary>>,
+    {Bin, size(Bin)}.
+
+
+%encode_real({Man, Base, Exp}) ->
+%%    io:format("Mantissa: ~w Base: ~w, Exp: ~w~n",[Man, Base, Exp]),
+
+%    OctExp = if Exp >= 0 -> encode_integer_pos(Exp, []);
+%		true     -> encode_integer_neg(Exp, [])
+%	     end,
+%%    ok = io:format("OctExp: ~w~n",[OctExp]),
+%    SignBitMask = if  Man > 0 -> 2#00000000;  % bit 7 is pos or neg, no Zeroval
+%		      true    -> 2#01000000
+%		  end,
+%%    ok = io:format("SignBitMask: ~w~n",[SignBitMask]),
+%    InternalBaseMask = if  Base =:= 2 -> 2#00000000;   % bit 6,5: only base 2 this far!
+%			   true ->
+%			       exit({error,{asn1, {encode_real_non_supported_encodeing, Base}}})
+%		       end,
+%    ScalingFactorMask =2#00000000,   % bit 4,3: no scaling since only base 2
+%    OctExpLen = length(OctExp),
+%    if OctExpLen > 255  ->
+%	    exit({error,{asn1, {to_big_exp_in_encode_real, OctExpLen}}});
+%       true  -> true %% make real assert later..
+%    end,
+%    {LenMask, EOctets} = case OctExpLen of   % bit 2,1
+%			     1 -> {0, OctExp};
+%			     2 -> {1, OctExp};
+%			     3 -> {2, OctExp};
+%			     _ -> {3, [OctExpLen, OctExp]}
+%			 end,
+%    FirstOctet = (SignBitMask bor InternalBaseMask bor
+%		  ScalingFactorMask bor LenMask bor
+%		  2#10000000), % bit set for binary mantissa encoding!
+%    OctMantissa = if Man > 0 -> minimum_octets(Man);
+%		     true    -> minimum_octets(-(Man)) % signbit keeps track of sign
+%		  end,
+%%    ok = io:format("LenMask: ~w EOctets: ~w~nFirstOctet: ~w OctMantissa: ~w OctExpLen: ~w~n", [LenMask, EOctets, FirstOctet, OctMantissa, OctExpLen]),
+%     {[FirstOctet, EOctets, OctMantissa],
+%      length(OctMantissa) +
+%      (if OctExpLen > 3 ->
+%	       OctExpLen + 2;
+%	  true ->
+%	       OctExpLen + 1
+%       end)
+%     }.
+
+
+%%============================================================================
+%% decode real value
+%%
+%% decode_real([OctetBufferList], tuple|value, tag|notag) ->
+%%  {{Mantissa, Base, Exp} | realval | PLUS-INFINITY | MINUS-INFINITY | 0,
+%%     RestBuff}
+%%
+%% only for base 2 decoding sofar!!
+%%============================================================================
+
+decode_real(Buffer, Form, Tags, OptOrMand) ->
+    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_REAL}),
+    decode_real_notag(Buffer, Form, NewTags, OptOrMand).
+
+decode_real_notag(Buffer, Form, Tags, OptOrMand) ->
+    {RestTags, {FormLen, Buffer0, Rb0}} =
+	check_tags_i(Tags, Buffer, OptOrMand),
+
+    case FormLen of
+	{?CONSTRUCTED,Len} ->
+	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
+	    {Val01, Buffer01, Rb01} =
+		decode_real_notag(Buffer00, Form, RestTags, OptOrMand),
+	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
+	    {Val01, Buffer02, Rb0+Rb01+Rb02};
+	{_,Len} ->
+	    decode_real2(Buffer0, Form, Len, Rb0)
+    end.
+
+decode_real2(Buffer0, Form, Len, RemBytes1) ->
+    <<First, Buffer2/binary>> = Buffer0,
+    if
+	First =:= 2#01000000 -> {'PLUS-INFINITY', Buffer2};
+	First =:= 2#01000001 -> {'MINUS-INFINITY', Buffer2};
+	First =:= 2#00000000 -> {0, Buffer2};
+	true ->
+	    %% have some check here to verify only supported bases (2)
+	    <<_B7:1,B6:1,B5_4:2,B3_2:2,B1_0:2>> = <<First>>,
+		Sign = B6,
+	    Base =
+		case B5_4 of
+		    0 -> 2;  % base 2, only one so far
+		    _ -> exit({error,{asn1, {non_supported_base, First}}})
+		end,
+%	    ScalingFactor =
+		case B3_2 of
+		    0 -> 0;  % no scaling so far
+		    _ -> exit({error,{asn1, {non_supported_scaling, First}}})
+		end,
+						%	    ok = io:format("Buffer2: ~w~n",[Buffer2]),
+	    {FirstLen, {Exp, Buffer3}, RemBytes2} =
+		case B1_0 of
+		    0 -> {2, decode_integer2(1, Buffer2, RemBytes1), RemBytes1+1};
+		    1 -> {3, decode_integer2(2, Buffer2, RemBytes1), RemBytes1+2};
+		    2 -> {4, decode_integer2(3, Buffer2, RemBytes1), RemBytes1+3};
+		    3 ->
+			<<ExpLen1,RestBuffer/binary>> = Buffer2,
+			{ ExpLen1 + 2,
+			  decode_integer2(ExpLen1, RestBuffer, RemBytes1),
+			  RemBytes1+ExpLen1}
+		end,
+						%	    io:format("FirstLen: ~w, Exp: ~w, Buffer3: ~w ~n",
+						%	    [FirstLen, Exp, Buffer3]),
+	    Length = Len - FirstLen,
+	    <<LongInt:Length/unit:8,RestBuff/binary>> = Buffer3,
+	    {{Mantissa, Buffer4}, RemBytes3} =
+		if Sign =:= 0 ->
+						%			io:format("sign plus~n"),
+			{{LongInt, RestBuff}, 1 + Length};
+		   true ->
+						%			io:format("sign minus~n"),
+			{{-LongInt, RestBuff}, 1 + Length}
+		end,
+						%	    io:format("Form: ~w~n",[Form]),
+	    case Form of
+		tuple ->
+		    {Val,Buf,_RemB} = Exp,
+		    {{Mantissa, Base, {Val,Buf}}, Buffer4, RemBytes2+RemBytes3};
+		_value ->
+		    comming
+	    end
+    end.
+
+
+%%============================================================================
+%% Bitstring value, ITU_T X.690 Chapter 8.6
+%%
+%% encode bitstring value
+%%
+%% bitstring NamedBitList
+%% Val can be  of:
+%% - [identifiers] where only named identifers are set to one,
+%%   the Constraint must then have some information of the
+%%   bitlength.
+%% - [list of ones and zeroes] all bits
+%% - integer value representing the bitlist
+%% C is constrint Len, only valid when identifiers
+%%============================================================================
+
+encode_bit_string(C,Bin={Unused,BinBits},NamedBitList,DoTag) when integer(Unused), binary(BinBits) ->
+    encode_bin_bit_string(C,Bin,NamedBitList,DoTag);
+encode_bit_string(C, [FirstVal | RestVal], NamedBitList, DoTag) when atom(FirstVal) ->
+    encode_bit_string_named(C, [FirstVal | RestVal], NamedBitList, DoTag);
+
+encode_bit_string(C, [{bit,X} | RestVal], NamedBitList, DoTag) ->
+    encode_bit_string_named(C, [{bit,X} | RestVal], NamedBitList, DoTag);
+
+encode_bit_string(C, [FirstVal| RestVal], NamedBitList, DoTag) when integer(FirstVal) ->
+    encode_bit_string_bits(C, [FirstVal | RestVal], NamedBitList, DoTag);
+
+encode_bit_string(_, 0, _, []) ->
+    {[?N_BIT_STRING,1,0],3};
+
+encode_bit_string(_, 0, _, DoTag) ->
+    dotag(DoTag, ?N_BIT_STRING, {<<0>>,1});
+
+encode_bit_string(_, [], _, []) ->
+    {[?N_BIT_STRING,1,0],3};
+
+encode_bit_string(_, [], _, DoTag) ->
+    dotag(DoTag, ?N_BIT_STRING, {<<0>>,1});
+
+encode_bit_string(C, IntegerVal, NamedBitList, DoTag) when integer(IntegerVal) ->
+    BitListVal = int_to_bitlist(IntegerVal),
+    encode_bit_string_bits(C, BitListVal, NamedBitList, DoTag);
+
+encode_bit_string(C, {Name,BitList}, NamedBitList, DoTag) when atom(Name) ->
+    encode_bit_string(C, BitList, NamedBitList, DoTag).
+
+
+
+int_to_bitlist(0) ->
+    [];
+int_to_bitlist(Int) when integer(Int), Int >= 0 ->
+    [Int band 1 | int_to_bitlist(Int bsr 1)].
+
+
+%%=================================================================
+%% Encode BIT STRING of the form {Unused,BinBits}.
+%% Unused is the number of unused bits in the last byte in BinBits
+%% and BinBits is a binary representing the BIT STRING.
+%%=================================================================
+encode_bin_bit_string(C,{Unused,BinBits},_NamedBitList,DoTag)->
+    case get_constraint(C,'SizeConstraint') of
+	no ->
+	    remove_unused_then_dotag(DoTag,?N_BIT_STRING,Unused,BinBits);
+	{_Min,Max} ->
+	    BBLen = (size(BinBits)*8)-Unused,
+	    if
+		BBLen > Max ->
+		    exit({error,{asn1,
+				 {bitstring_length,
+				  {{was,BBLen},{maximum,Max}}}}});
+		true ->
+		    remove_unused_then_dotag(DoTag,?N_BIT_STRING,
+					     Unused,BinBits)
+	    end;
+	Size ->
+	    case ((size(BinBits)*8)-Unused) of
+		BBSize when BBSize =< Size ->
+		    remove_unused_then_dotag(DoTag,?N_BIT_STRING,
+					     Unused,BinBits);
+		BBSize  ->
+		    exit({error,{asn1,
+				 {bitstring_length,
+				  {{was,BBSize},{should_be,Size}}}}})
+	    end
+    end.
+
+remove_unused_then_dotag(DoTag,StringType,Unused,BinBits) ->
+    case Unused of
+	0 when (size(BinBits) == 0),DoTag==[] ->
+	    %% time optimization of next case
+	   {[StringType,1,0],3};
+	0 when (size(BinBits) == 0) ->
+	    dotag(DoTag,StringType,{<<0>>,1});
+	0 when DoTag==[]-> % time optimization of next case
+	    dotag_universal(StringType,[Unused|BinBits],size(BinBits)+1);
+% 	    {LenEnc,Len} = encode_legth(size(BinBits)+1),
+% 	    {[StringType,LenEnc,[Unused|BinBits]],size(BinBits)+1+Len+1};
+	0 ->
+	    dotag(DoTag,StringType,<<Unused,BinBits/binary>>);
+	Num when DoTag == [] -> % time optimization of next case
+	    N = (size(BinBits)-1),
+	    <<BBits:N/binary,LastByte>> = BinBits,
+	    dotag_universal(StringType,
+			    [Unused,BBits,(LastByte bsr Num) bsl Num],
+			    size(BinBits)+1);
+% 	    {LenEnc,Len} = encode_legth(size(BinBits)+1),
+% 	    {[StringType,LenEnc,[Unused,BBits,(LastByte bsr Num) bsl Num],
+% 	      1+Len+size(BinBits)+1};
+	Num ->
+	    N = (size(BinBits)-1),
+	    <<BBits:N/binary,LastByte>> = BinBits,
+	    dotag(DoTag,StringType,{[Unused,binary_to_list(BBits) ++
+				     [(LastByte bsr Num) bsl Num]],
+				    1+size(BinBits)})
+    end.
+
+
+%%=================================================================
+%% Encode named bits
+%%=================================================================
+
+encode_bit_string_named(C, [FirstVal | RestVal], NamedBitList, DoTag) ->
+    {Len,Unused,OctetList} =
+	case get_constraint(C,'SizeConstraint') of
+	    no ->
+		ToSetPos = get_all_bitposes([FirstVal | RestVal],
+					    NamedBitList, []),
+		BitList = make_and_set_list(lists:max(ToSetPos)+1,
+					    ToSetPos, 0),
+		encode_bitstring(BitList);
+	    {_Min,Max} ->
+		ToSetPos = get_all_bitposes([FirstVal | RestVal],
+					    NamedBitList, []),
+		BitList = make_and_set_list(Max, ToSetPos, 0),
+		encode_bitstring(BitList);
+	    Size ->
+		ToSetPos = get_all_bitposes([FirstVal | RestVal],
+					    NamedBitList, []),
+		BitList = make_and_set_list(Size, ToSetPos, 0),
+		encode_bitstring(BitList)
+	end,
+    case DoTag of
+	[] ->
+	    dotag_universal(?N_BIT_STRING,[Unused|OctetList],Len+1);
+% 	    {EncLen,LenLen} = encode_length(Len+1),
+% 	    {[?N_BIT_STRING,EncLen,Unused,OctetList],1+LenLen+Len+1};
+	_ ->
+	    dotag(DoTag, ?N_BIT_STRING, {[Unused|OctetList],Len+1})
+    end.
+
+
+%%----------------------------------------
+%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
+%%   [sorted_list_of_bitpositions_to_set]
+%%----------------------------------------
+
+get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
+    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
+get_all_bitposes([Val | Rest], NamedBitList, Ack) when atom(Val) ->
+    case lists:keysearch(Val, 1, NamedBitList) of
+	{value, {_ValName, ValPos}} ->
+	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
+	_ ->
+	    exit({error,{asn1, {bitstring_namedbit, Val}}})
+    end;
+get_all_bitposes([], _NamedBitList, Ack) ->
+    lists:sort(Ack).
+
+
+%%----------------------------------------
+%% make_and_set_list(Len of list to return, [list of positions to set to 1])->
+%% returns list of Len length, with all in SetPos set.
+%% in positioning in list the first element is 0, the second 1 etc.., but
+%% Len will make a list of length Len, not Len + 1.
+%%    BitList = make_and_set_list(C, ToSetPos, 0),
+%%----------------------------------------
+
+make_and_set_list(0, [], _) -> [];
+make_and_set_list(0, _, _) ->
+    exit({error,{asn1,bitstring_sizeconstraint}});
+make_and_set_list(Len, [XPos|SetPos], XPos) ->
+    [1 | make_and_set_list(Len - 1, SetPos, XPos + 1)];
+make_and_set_list(Len, [Pos|SetPos], XPos) ->
+    [0 | make_and_set_list(Len - 1, [Pos | SetPos], XPos + 1)];
+make_and_set_list(Len, [], XPos) ->
+    [0 | make_and_set_list(Len - 1, [], XPos + 1)].
+
+
+
+
+
+
+%%=================================================================
+%% Encode bit string for lists of ones and zeroes
+%%=================================================================
+encode_bit_string_bits(C, BitListVal, _NamedBitList, DoTag) when list(BitListVal) ->
+    {Len,Unused,OctetList} =
+	case get_constraint(C,'SizeConstraint') of
+	    no ->
+		encode_bitstring(BitListVal);
+	    Constr={Min,Max} when integer(Min),integer(Max) ->
+		encode_constr_bit_str_bits(Constr,BitListVal,DoTag);
+	    {Constr={_,_},[]} ->
+		%% constraint with extension mark
+		encode_constr_bit_str_bits(Constr,BitListVal,DoTag);
+	    Constr={{_,_},{_,_}} ->%{{Min1,Max1},{Min2,Max2}}
+		%% constraint with extension mark
+		encode_constr_bit_str_bits(Constr,BitListVal,DoTag);
+	    Size ->
+		case length(BitListVal) of
+		    BitSize when BitSize == Size ->
+			encode_bitstring(BitListVal);
+		    BitSize when BitSize < Size ->
+			PaddedList =
+			    pad_bit_list(Size-BitSize,BitListVal),
+			encode_bitstring(PaddedList);
+		    BitSize ->
+			exit({error,
+			      {asn1,
+			       {bitstring_length,
+				{{was,BitSize},
+				 {should_be,Size}}}}})
+		end
+	end,
+    %%add unused byte to the Len
+    case DoTag of
+	[] ->
+	    dotag_universal(?N_BIT_STRING,[Unused|OctetList],Len+1);
+% 	    {EncLen,LenLen}=encode_length(Len+1),
+% 	    {[?N_BIT_STRING,EncLen,Unused|OctetList],1+LenLen+Len+1};
+	_ ->
+	    dotag(DoTag, ?N_BIT_STRING,
+		  {[Unused | OctetList],Len+1})
+    end.
+
+
+encode_constr_bit_str_bits({_Min,Max},BitListVal,_DoTag) ->
+    BitLen = length(BitListVal),
+    if
+	BitLen > Max ->
+	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
+						 {maximum,Max}}}}});
+	true ->
+	    encode_bitstring(BitListVal)
+    end;
+encode_constr_bit_str_bits({{_Min1,Max1},{Min2,Max2}},BitListVal,_DoTag) ->
+    BitLen = length(BitListVal),
+    case BitLen of
+	Len when Len > Max2 ->
+	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
+						 {maximum,Max2}}}}});
+	Len when Len > Max1, Len < Min2  ->
+	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
+						 {not_allowed_interval,
+						  Max1,Min2}}}}});
+	_ ->
+	    encode_bitstring(BitListVal)
+    end.
+
+%% returns a list of length Size + length(BitListVal), with BitListVal
+%% as the most significant elements followed by padded zero elements
+pad_bit_list(Size,BitListVal) ->
+    Tail = lists:duplicate(Size,0),
+    lists:append(BitListVal,Tail).
+
+%%=================================================================
+%% Do the actual encoding
+%%     ([bitlist]) -> {ListLen, UnusedBits, OctetList}
+%%=================================================================
+
+encode_bitstring([B8, B7, B6, B5, B4, B3, B2, B1 | Rest]) ->
+    Val = (B8 bsl 7) bor (B7 bsl 6) bor (B6 bsl 5) bor (B5 bsl 4) bor
+	(B4 bsl 3) bor (B3 bsl 2) bor (B2 bsl 1) bor B1,
+    encode_bitstring(Rest, [Val], 1);
+encode_bitstring(Val) ->
+    {Unused, Octet} = unused_bitlist(Val, 7, 0),
+    {1, Unused, [Octet]}.
+
+encode_bitstring([B8, B7, B6, B5, B4, B3, B2, B1 | Rest], Ack, Len) ->
+    Val = (B8 bsl 7) bor (B7 bsl 6) bor (B6 bsl 5) bor (B5 bsl 4) bor
+	(B4 bsl 3) bor (B3 bsl 2) bor (B2 bsl 1) bor B1,
+    encode_bitstring(Rest, [Ack | [Val]], Len + 1);
+%%even multiple of 8 bits..
+encode_bitstring([], Ack, Len) ->
+    {Len, 0, Ack};
+%% unused bits in last octet
+encode_bitstring(Rest, Ack, Len) ->
+%    io:format("uneven ~w ~w ~w~n",[Rest, Ack, Len]),
+    {Unused, Val} = unused_bitlist(Rest, 7, 0),
+    {Len + 1, Unused, [Ack | [Val]]}.
+
+%%%%%%%%%%%%%%%%%%
+%% unused_bitlist([list of ones and zeros <= 7], 7, []) ->
+%%  {Unused bits, Last octet with bits moved to right}
+unused_bitlist([], Trail, Ack) ->
+    {Trail + 1, Ack};
+unused_bitlist([Bit | Rest], Trail, Ack) ->
+%%    io:format("trail Bit: ~w Rest: ~w Trail: ~w Ack:~w~n",[Bit, Rest, Trail, Ack]),
+    unused_bitlist(Rest, Trail - 1, (Bit bsl Trail) bor Ack).
+
+
+%%============================================================================
+%% decode bitstring value
+%%    (Buffer, Range, NamedNumberList, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}
+%%============================================================================
+
+decode_compact_bit_string(Buffer, Range, NamedNumberList, Tags, LenIn, OptOrMand) ->
+%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_BIT_STRING}),
+     decode_restricted_string(Buffer, Range, ?N_BIT_STRING, Tags, LenIn,
+			     NamedNumberList, OptOrMand,bin).
+
+decode_bit_string(Buffer, Range, NamedNumberList, Tags, LenIn, OptOrMand) ->
+%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_BIT_STRING}),
+    decode_restricted_string(Buffer, Range, ?N_BIT_STRING, Tags, LenIn,
+			     NamedNumberList, OptOrMand,old).
+
+
+decode_bit_string2(1,<<0 ,Buffer/binary>>,_NamedNumberList,RemovedBytes,BinOrOld) ->
+    case BinOrOld of
+	bin ->
+	    {{0,<<>>},Buffer,RemovedBytes};
+	_ ->
+	    {[], Buffer, RemovedBytes}
+    end;
+decode_bit_string2(Len,<<Unused,Buffer/binary>>,NamedNumberList,
+		   RemovedBytes,BinOrOld) ->
+    L = Len - 1,
+    <<Bits:L/binary,BufferTail/binary>> = Buffer,
+    case NamedNumberList of
+	[] ->
+	    case BinOrOld of
+		bin ->
+		    {{Unused,Bits},BufferTail,RemovedBytes};
+		_ ->
+		    BitString = decode_bitstring2(L, Unused, Buffer),
+		    {BitString,BufferTail, RemovedBytes}
+	    end;
+	_ ->
+	    BitString = decode_bitstring2(L, Unused, Buffer),
+	    {decode_bitstring_NNL(BitString,NamedNumberList),
+	     BufferTail,
+	     RemovedBytes}
+    end.
+
+%%----------------------------------------
+%% Decode the in buffer to bits
+%%----------------------------------------
+decode_bitstring2(1,Unused,<<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,_/binary>>) ->
+    lists:sublist([B7,B6,B5,B4,B3,B2,B1,B0],8-Unused);
+decode_bitstring2(Len, Unused,
+		  <<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Buffer/binary>>) ->
+    [B7, B6, B5, B4, B3, B2, B1, B0 |
+     decode_bitstring2(Len - 1, Unused, Buffer)].
+
+%%decode_bitstring2(1, Unused, Buffer) ->
+%%    make_bits_of_int(hd(Buffer), 128, 8-Unused);
+%%decode_bitstring2(Len, Unused, [BitVal | Buffer]) ->
+%%    [B7, B6, B5, B4, B3, B2, B1, B0] = make_bits_of_int(BitVal, 128, 8),
+%%    [B7, B6, B5, B4, B3, B2, B1, B0 |
+%%     decode_bitstring2(Len - 1, Unused, Buffer)].
+
+
+%%make_bits_of_int(_, _, 0) ->
+%%    [];
+%%make_bits_of_int(BitVal, MaskVal, Unused) when Unused > 0 ->
+%%    X = case MaskVal band BitVal of
+%%	    0 -> 0 ;
+%%	    _ -> 1
+%%	end,
+%%    [X | make_bits_of_int(BitVal, MaskVal bsr 1, Unused - 1)].
+
+
+
+%%----------------------------------------
+%% Decode the bitlist to names
+%%----------------------------------------
+
+
+decode_bitstring_NNL(BitList,NamedNumberList) ->
+    decode_bitstring_NNL(BitList,NamedNumberList,0,[]).
+
+
+decode_bitstring_NNL([],_,_No,Result) ->
+    lists:reverse(Result);
+
+decode_bitstring_NNL([B|BitList],[{Name,No}|NamedNumberList],No,Result) ->
+    if
+	B == 0 ->
+	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,Result);
+	true ->
+	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,[Name|Result])
+    end;
+decode_bitstring_NNL([1|BitList],NamedNumberList,No,Result) ->
+	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,[{bit,No}|Result]);
+decode_bitstring_NNL([0|BitList],NamedNumberList,No,Result) ->
+	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,Result).
+
+
+%%============================================================================
+%% Octet string, ITU_T X.690 Chapter 8.7
+%%
+%% encode octet string
+%% The OctetList must be a flat list of integers in the range 0..255
+%% the function does not check this because it takes to much time
+%%============================================================================
+encode_octet_string(_C, OctetList, []) when binary(OctetList) ->
+    dotag_universal(?N_OCTET_STRING,OctetList,size(OctetList));
+encode_octet_string(_C, OctetList, DoTag) when binary(OctetList) ->
+    dotag(DoTag, ?N_OCTET_STRING, {OctetList,size(OctetList)});
+encode_octet_string(_C, OctetList, DoTag) when list(OctetList) ->
+    case length(OctetList) of
+	Len when DoTag == [] ->
+	    dotag_universal(?N_OCTET_STRING,OctetList,Len);
+	Len ->
+	    dotag(DoTag, ?N_OCTET_STRING, {OctetList,Len})
+    end;
+% encode_octet_string(C, OctetList, DoTag) when list(OctetList) ->
+%     dotag(DoTag, ?N_OCTET_STRING, {OctetList,length(OctetList)});
+encode_octet_string(C, {Name,OctetList}, DoTag) when atom(Name) ->
+    encode_octet_string(C, OctetList, DoTag).
+
+
+%%============================================================================
+%% decode octet string
+%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
+%%
+%% Octet string is decoded as a restricted string
+%%============================================================================
+decode_octet_string(Buffer, Range, Tags, TotalLen, OptOrMand) ->
+%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_OCTET_STRING}),
+    decode_restricted_string(Buffer, Range, ?N_OCTET_STRING,
+			     Tags, TotalLen, [], OptOrMand,old).
+
+%%============================================================================
+%% Null value, ITU_T X.690 Chapter 8.8
+%%
+%% encode NULL value
+%%============================================================================
+
+encode_null(_, []) ->
+    {[?N_NULL,0],2};
+encode_null(_, DoTag) ->
+    dotag(DoTag, ?N_NULL, {[],0}).
+
+%%============================================================================
+%% decode NULL value
+%%    (Buffer, HasTag, TotalLen) -> {NULL, Remain, RemovedBytes}
+%%============================================================================
+decode_null(Buffer, Tags, OptOrMand) ->
+    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_NULL}),
+    decode_null_notag(Buffer, NewTags, OptOrMand).
+
+decode_null_notag(Buffer, Tags, OptOrMand) ->
+    {RestTags, {FormLen, Buffer0, Rb0}} =
+	check_tags_i(Tags, Buffer, OptOrMand),
+
+    case FormLen of
+	{?CONSTRUCTED,Len} ->
+	    {_Buffer00,RestBytes} = split_list(Buffer0,Len),
+	    {Val01, Buffer01, Rb01} = decode_null_notag(Buffer0, RestTags,
+							OptOrMand),
+	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
+	    {Val01, Buffer02, Rb0+Rb01+Rb02};
+	{_,0} ->
+	    {'NULL', Buffer0, Rb0};
+	{_,Len} ->
+	    exit({error,{asn1,{invalid_length,'NULL',Len}}})
+    end.
+
+
+%%============================================================================
+%% Object identifier, ITU_T X.690 Chapter 8.19
+%%
+%% encode Object Identifier value
+%%============================================================================
+
+encode_object_identifier({Name,Val}, DoTag) when atom(Name) ->
+    encode_object_identifier(Val, DoTag);
+encode_object_identifier(Val, []) ->
+    {EncVal,Len} = e_object_identifier(Val),
+    dotag_universal(?N_OBJECT_IDENTIFIER,EncVal,Len);
+encode_object_identifier(Val, DoTag) ->
+    dotag(DoTag, ?N_OBJECT_IDENTIFIER, e_object_identifier(Val)).
+
+e_object_identifier({'OBJECT IDENTIFIER', V}) ->
+    e_object_identifier(V);
+e_object_identifier({Cname, V}) when atom(Cname), tuple(V) ->
+    e_object_identifier(tuple_to_list(V));
+e_object_identifier({Cname, V}) when atom(Cname), list(V) ->
+    e_object_identifier(V);
+e_object_identifier(V) when tuple(V) ->
+    e_object_identifier(tuple_to_list(V));
+
+%%%%%%%%%%%%%%%
+%% e_object_identifier([List of Obect Identifiers]) ->
+%% {[Encoded Octetlist of ObjIds], IntLength}
+%%
+e_object_identifier([E1, E2 | Tail]) ->
+    Head = 40*E1 + E2,  % wow!
+    {H,Lh} = mk_object_val(Head),
+    {R,Lr} = enc_obj_id_tail(Tail, [], 0),
+    {[H|R], Lh+Lr}.
+
+enc_obj_id_tail([], Ack, Len) ->
+    {lists:reverse(Ack), Len};
+enc_obj_id_tail([H|T], Ack, Len) ->
+    {B, L} = mk_object_val(H),
+    enc_obj_id_tail(T, [B|Ack], Len+L).
+
+%% e_object_identifier([List of Obect Identifiers]) ->
+%% {[Encoded Octetlist of ObjIds], IntLength}
+%%
+%%e_object_identifier([E1, E2 | Tail]) ->
+%%    Head = 40*E1 + E2,  % wow!
+%%    F = fun(Val, AckLen) ->
+%%		{L, Ack} = mk_object_val(Val),
+%%		{L, Ack + AckLen}
+%%	end,
+%%    {Octets, Len} = lists:mapfoldl(F, 0, [Head | Tail]).
+
+%%%%%%%%%%%
+%% mk_object_val(Value) -> {OctetList, Len}
+%% returns a Val as a list of octets, the 8 bit is allways set to one except
+%% for the last octet, where its 0
+%%
+
+
+mk_object_val(Val) when Val =< 127 ->
+    {[255 band Val], 1};
+mk_object_val(Val) ->
+    mk_object_val(Val bsr 7, [Val band 127], 1).
+mk_object_val(0, Ack, Len) ->
+    {Ack, Len};
+mk_object_val(Val, Ack, Len) ->
+    mk_object_val(Val bsr 7, [((Val band 127) bor 128) | Ack], Len + 1).
+
+
+
+%%============================================================================
+%% decode Object Identifier value
+%%    (Buffer, HasTag, TotalLen) -> {{ObjId}, Remain, RemovedBytes}
+%%============================================================================
+
+decode_object_identifier(Buffer, Tags, OptOrMand) ->
+    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,
+				 number=?N_OBJECT_IDENTIFIER}),
+    decode_object_identifier_notag(Buffer, NewTags, OptOrMand).
+
+decode_object_identifier_notag(Buffer, Tags, OptOrMand) ->
+    {RestTags, {FormLen, Buffer0, Rb0}} =
+	check_tags_i(Tags, Buffer, OptOrMand),
+
+    case FormLen of
+	{?CONSTRUCTED,Len} ->
+	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
+	    {Val01, Buffer01, Rb01} =
+		decode_object_identifier_notag(Buffer00,
+					       RestTags, OptOrMand),
+	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
+	    {Val01, Buffer02, Rb0+Rb01+Rb02};
+	{_,Len} ->
+	    {[AddedObjVal|ObjVals],Buffer01} =
+		dec_subidentifiers(Buffer0,0,[],Len),
+	    {Val1, Val2} = if
+			       AddedObjVal < 40 ->
+				   {0, AddedObjVal};
+			       AddedObjVal < 80 ->
+				   {1, AddedObjVal - 40};
+			       true ->
+				   {2, AddedObjVal - 80}
+			   end,
+	    {list_to_tuple([Val1, Val2 | ObjVals]), Buffer01,
+	     Rb0+Len}
+    end.
+
+dec_subidentifiers(Buffer,_Av,Al,0) ->
+    {lists:reverse(Al),Buffer};
+dec_subidentifiers(<<1:1,H:7,T/binary>>,Av,Al,Len) ->
+    dec_subidentifiers(T,(Av bsl 7) + H,Al,Len-1);
+dec_subidentifiers(<<H,T/binary>>,Av,Al,Len) ->
+    dec_subidentifiers(T,0,[((Av bsl 7) + H)|Al],Len-1).
+
+
+%%dec_subidentifiers(Buffer,Av,Al,0) ->
+%%    {lists:reverse(Al),Buffer};
+%%dec_subidentifiers([H|T],Av,Al,Len) when H >=16#80 ->
+%%    dec_subidentifiers(T,(Av bsl 7) + (H band 16#7F),Al,Len-1);
+%%dec_subidentifiers([H|T],Av,Al,Len) ->
+%%    dec_subidentifiers(T,0,[(Av bsl 7) + H |Al],Len-1).
+
+
+%%============================================================================
+%% Restricted character string types, ITU_T X.690 Chapter 8.20
+%%
+%% encode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings
+%%============================================================================
+encode_restricted_string(_C, OctetList, StringType, [])
+  when binary(OctetList) ->
+    dotag_universal(StringType,OctetList,size(OctetList));
+encode_restricted_string(_C, OctetList, StringType, DoTag)
+  when binary(OctetList) ->
+    dotag(DoTag, StringType, {OctetList, size(OctetList)});
+encode_restricted_string(_C, OctetList, StringType, [])
+  when list(OctetList) ->
+    dotag_universal(StringType,OctetList,length(OctetList));
+encode_restricted_string(_C, OctetList, StringType, DoTag)
+  when list(OctetList) ->
+    dotag(DoTag, StringType, {OctetList, length(OctetList)});
+encode_restricted_string(C,{Name,OctetL},StringType,DoTag) when atom(Name)->
+    encode_restricted_string(C, OctetL, StringType, DoTag).
+
+%%============================================================================
+%% decode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings
+%%    (Buffer, Range, StringType, HasTag, TotalLen) ->
+%%                                  {String, Remain, RemovedBytes}
+%%============================================================================
+
+decode_restricted_string(Buffer, Range, StringType, Tags, LenIn, OptOrMand) ->
+    {Val,Buffer2,Rb} =
+	decode_restricted_string_tag(Buffer, Range, StringType, Tags,
+				  LenIn, [], OptOrMand,old),
+    {check_and_convert_restricted_string(Val,StringType,Range,[],old),
+     Buffer2,Rb}.
+
+
+decode_restricted_string(Buffer, Range, StringType, Tags, LenIn, NNList, OptOrMand, BinOrOld ) ->
+    {Val,Buffer2,Rb} =
+	decode_restricted_string_tag(Buffer, Range, StringType, Tags,
+			     LenIn, NNList, OptOrMand, BinOrOld),
+    {check_and_convert_restricted_string(Val,StringType,Range,NNList,BinOrOld),
+     Buffer2,Rb}.
+
+decode_restricted_string_tag(Buffer, Range, StringType, TagsIn, LenIn, NNList, OptOrMand, BinOrOld ) ->
+    NewTags = new_tags(TagsIn, #tag{class=?UNIVERSAL,number=StringType}),
+    decode_restricted_string_notag(Buffer, Range, StringType, NewTags,
+				   LenIn, NNList, OptOrMand, BinOrOld).
+
+
+
+
+check_and_convert_restricted_string(Val,StringType,Range,NamedNumberList,_BinOrOld) ->
+    {StrLen,NewVal} = case StringType of
+			  ?N_BIT_STRING when NamedNumberList /= [] ->
+			      {no_check,Val};
+			  ?N_BIT_STRING when list(Val) ->
+			      {length(Val),Val};
+			  ?N_BIT_STRING when tuple(Val) ->
+			      {(size(element(2,Val))*8) - element(1,Val),Val};
+			  _ when binary(Val) ->
+			      {size(Val),binary_to_list(Val)};
+			  _ when list(Val) ->
+			      {length(Val), Val}
+		      end,
+    case Range of
+	_ when StrLen == no_check ->
+	    NewVal;
+	[] -> % No length constraint
+	    NewVal;
+	{Lb,Ub} when StrLen >= Lb, Ub >= StrLen -> % variable length constraint
+	    NewVal;
+	{{Lb,_Ub},[]} when StrLen >= Lb ->
+	    NewVal;
+	{{Lb1,Ub1},{Lb2,Ub2}} when StrLen >= Lb1, StrLen =< Ub1;
+				   StrLen =< Ub2, StrLen >= Lb2 ->
+	    NewVal;
+	StrLen -> % fixed length constraint
+	    NewVal;
+	{_,_} ->
+	    exit({error,{asn1,{length,Range,Val}}});
+	_Len when integer(_Len) ->
+	    exit({error,{asn1,{length,Range,Val}}});
+	_ -> % some strange constraint that we don't support yet
+	    NewVal
+    end.
+
+
+%%=============================================================================
+%% Common routines for several string types including bit string
+%% handles indefinite length
+%%=============================================================================
+
+
+decode_restricted_string_notag(Buffer, _Range, StringType, TagsIn,
+			 _, NamedNumberList, OptOrMand,BinOrOld) ->
+    %%-----------------------------------------------------------
+    %% Get inner (the implicit tag or no tag) and
+    %%     outer (the explicit tag) lengths.
+    %%-----------------------------------------------------------
+    {RestTags, {FormLength={_,_Len01}, Buffer0, Rb0}} =
+	check_tags_i(TagsIn, Buffer, OptOrMand),
+
+    case FormLength of
+	{?CONSTRUCTED,Len} ->
+	    {Buffer00, RestBytes} = split_list(Buffer0,Len),
+	    {Val01, Buffer01, Rb01} =
+		decode_restricted_parts(Buffer00, RestBytes, [], StringType,
+					RestTags,
+					Len, NamedNumberList,
+					OptOrMand,
+					BinOrOld, 0, []),
+	    {Val01, Buffer01, Rb0+Rb01};
+	{_, Len} ->
+	    {Val01, Buffer01, Rb01} =
+		decode_restricted(Buffer0, Len, StringType,
+				  NamedNumberList, BinOrOld),
+	    {Val01, Buffer01, Rb0+Rb01}
+    end.
+
+
+decode_restricted_parts(Buffer, RestBytes, [], StringType, RestTags, Len, NNList,
+			OptOrMand, BinOrOld, AccRb, AccVal) ->
+    DecodeFun = case RestTags of
+		    [] -> fun decode_restricted_string_tag/8;
+		    _ -> fun decode_restricted_string_notag/8
+		end,
+    {Val, Buffer1, Rb} =
+	DecodeFun(Buffer, [], StringType, RestTags,
+		  no_length, NNList,
+		  OptOrMand, BinOrOld),
+    {Buffer2,More} =
+	case Buffer1 of
+	    <<0,0,Buffer10/binary>> when Len == indefinite ->
+		{Buffer10,false};
+	    <<>> ->
+		{RestBytes,false};
+	    _ ->
+		{Buffer1,true}
+	end,
+    {NewVal, NewRb} =
+	case StringType of
+	    ?N_BIT_STRING when BinOrOld == bin ->
+		{concat_bit_binaries(AccVal, Val), AccRb+Rb};
+	    _ when binary(Val),binary(AccVal) ->
+		{<<AccVal/binary,Val/binary>>,AccRb+Rb};
+	    _ when binary(Val), AccVal==[] ->
+		{Val,AccRb+Rb};
+	    _ ->
+		{AccVal++Val, AccRb+Rb}
+	end,
+    case More of
+	false ->
+	    {NewVal, Buffer2, NewRb};
+	true ->
+	    decode_restricted_parts(Buffer2, RestBytes, [], StringType, RestTags, Len, NNList,
+				    OptOrMand, BinOrOld, NewRb, NewVal)
+    end.
+
+
+
+decode_restricted(Buffer, InnerLen, StringType, NamedNumberList,BinOrOld) ->
+
+    case StringType of
+	?N_BIT_STRING ->
+	    decode_bit_string2(InnerLen,Buffer,NamedNumberList,InnerLen,BinOrOld);
+
+	?N_UniversalString ->
+	    <<PreBuff:InnerLen/binary,RestBuff/binary>> = Buffer,%%added for binary
+	    UniString = mk_universal_string(binary_to_list(PreBuff)),
+	    {UniString,RestBuff,InnerLen};
+	?N_BMPString ->
+	    <<PreBuff:InnerLen/binary,RestBuff/binary>> = Buffer,%%added for binary
+	    BMP = mk_BMP_string(binary_to_list(PreBuff)),
+	    {BMP,RestBuff,InnerLen};
+	_ ->
+	    <<PreBuff:InnerLen/binary,RestBuff/binary>> = Buffer,%%added for binary
+	    {PreBuff, RestBuff, InnerLen}
+    end.
+
+
+
+%%============================================================================
+%% encode Universal string
+%%============================================================================
+
+encode_universal_string(C, {Name, Universal}, DoTag) when atom(Name) ->
+    encode_universal_string(C, Universal, DoTag);
+encode_universal_string(_C, Universal, []) ->
+    OctetList = mk_uni_list(Universal),
+    dotag_universal(?N_UniversalString,OctetList,length(OctetList));
+encode_universal_string(_C, Universal, DoTag) ->
+    OctetList = mk_uni_list(Universal),
+    dotag(DoTag, ?N_UniversalString, {OctetList,length(OctetList)}).
+
+mk_uni_list(In) ->
+    mk_uni_list(In,[]).
+
+mk_uni_list([],List) ->
+    lists:reverse(List);
+mk_uni_list([{A,B,C,D}|T],List) ->
+    mk_uni_list(T,[D,C,B,A|List]);
+mk_uni_list([H|T],List) ->
+    mk_uni_list(T,[H,0,0,0|List]).
+
+%%===========================================================================
+%% decode Universal strings
+%%    (Buffer, Range, StringType, HasTag, LenIn) ->
+%%                           {String, Remain, RemovedBytes}
+%%===========================================================================
+
+decode_universal_string(Buffer, Range, Tags, LenIn, OptOrMand) ->
+%    NewTags = new_tags(HasTag, #tag{class=?UNIVERSAL,number=?N_UniversalString}),
+    decode_restricted_string(Buffer, Range, ?N_UniversalString,
+			     Tags, LenIn, [], OptOrMand,old).
+
+
+mk_universal_string(In) ->
+    mk_universal_string(In,[]).
+
+mk_universal_string([],Acc) ->
+    lists:reverse(Acc);
+mk_universal_string([0,0,0,D|T],Acc) ->
+    mk_universal_string(T,[D|Acc]);
+mk_universal_string([A,B,C,D|T],Acc) ->
+    mk_universal_string(T,[{A,B,C,D}|Acc]).
+
+
+%%============================================================================
+%% encode BMP string
+%%============================================================================
+
+encode_BMP_string(C, {Name,BMPString}, DoTag) when atom(Name)->
+    encode_BMP_string(C, BMPString, DoTag);
+encode_BMP_string(_C, BMPString, []) ->
+    OctetList = mk_BMP_list(BMPString),
+    dotag_universal(?N_BMPString,OctetList,length(OctetList));
+encode_BMP_string(_C, BMPString, DoTag) ->
+    OctetList = mk_BMP_list(BMPString),
+    dotag(DoTag, ?N_BMPString, {OctetList,length(OctetList)}).
+
+mk_BMP_list(In) ->
+    mk_BMP_list(In,[]).
+
+mk_BMP_list([],List) ->
+    lists:reverse(List);
+mk_BMP_list([{0,0,C,D}|T],List) ->
+    mk_BMP_list(T,[D,C|List]);
+mk_BMP_list([H|T],List) ->
+    mk_BMP_list(T,[H,0|List]).
+
+%%============================================================================
+%% decode (OctetList, Range(ignored), tag|notag) -> {ValList, RestList}
+%%    (Buffer, Range, StringType, HasTag, TotalLen) ->
+%%                               {String, Remain, RemovedBytes}
+%%============================================================================
+decode_BMP_string(Buffer, Range, Tags, LenIn, OptOrMand) ->
+%    NewTags = new_tags(HasTag, #tag{class=?UNIVERSAL,number=?N_BMPString}),
+    decode_restricted_string(Buffer, Range, ?N_BMPString,
+			     Tags, LenIn, [], OptOrMand,old).
+
+mk_BMP_string(In) ->
+    mk_BMP_string(In,[]).
+
+mk_BMP_string([],US) ->
+    lists:reverse(US);
+mk_BMP_string([0,B|T],US) ->
+    mk_BMP_string(T,[B|US]);
+mk_BMP_string([C,D|T],US) ->
+    mk_BMP_string(T,[{0,0,C,D}|US]).
+
+
+%%============================================================================
+%% Generalized time, ITU_T X.680 Chapter 39
+%%
+%% encode Generalized time
+%%============================================================================
+
+encode_generalized_time(C, {Name,OctetList}, DoTag) when atom(Name) ->
+    encode_generalized_time(C, OctetList, DoTag);
+encode_generalized_time(_C, OctetList, []) ->
+    dotag_universal(?N_GeneralizedTime,OctetList,length(OctetList));
+encode_generalized_time(_C, OctetList, DoTag) ->
+    dotag(DoTag, ?N_GeneralizedTime, {OctetList,length(OctetList)}).
+
+%%============================================================================
+%% decode Generalized time
+%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
+%%============================================================================
+
+decode_generalized_time(Buffer, Range, Tags, TotalLen, OptOrMand) ->
+    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,
+			 number=?N_GeneralizedTime}),
+    decode_generalized_time_notag(Buffer, Range, NewTags, TotalLen, OptOrMand).
+
+decode_generalized_time_notag(Buffer, Range, Tags, TotalLen, OptOrMand) ->
+    {RestTags, {FormLen, Buffer0, Rb0}} =
+	check_tags_i(Tags, Buffer, OptOrMand),
+
+    case FormLen of
+	{?CONSTRUCTED,Len} ->
+	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
+	    {Val01, Buffer01, Rb01} =
+		decode_generalized_time_notag(Buffer00, Range,
+					      RestTags, TotalLen,
+					      OptOrMand),
+	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
+	    {Val01, Buffer02, Rb0+Rb01+Rb02};
+	{_,Len} ->
+	    <<PreBuff:Len/binary,RestBuff/binary>> = Buffer0,
+	    {binary_to_list(PreBuff), RestBuff, Rb0+Len}
+    end.
+
+%%============================================================================
+%% Universal time, ITU_T X.680 Chapter 40
+%%
+%% encode UTC time
+%%============================================================================
+
+encode_utc_time(C, {Name,OctetList}, DoTag) when atom(Name) ->
+    encode_utc_time(C, OctetList, DoTag);
+encode_utc_time(_C, OctetList, []) ->
+    dotag_universal(?N_UTCTime, OctetList,length(OctetList));
+encode_utc_time(_C, OctetList, DoTag) ->
+    dotag(DoTag, ?N_UTCTime, {OctetList,length(OctetList)}).
+
+%%============================================================================
+%% decode UTC time
+%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
+%%============================================================================
+
+decode_utc_time(Buffer, Range, Tags, TotalLen, OptOrMand) ->
+    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_UTCTime}),
+    decode_utc_time_notag(Buffer, Range, NewTags, TotalLen, OptOrMand).
+
+decode_utc_time_notag(Buffer, Range, Tags, TotalLen, OptOrMand) ->
+    {RestTags, {FormLen, Buffer0, Rb0}} =
+	check_tags_i(Tags, Buffer, OptOrMand),
+
+    case FormLen of
+	{?CONSTRUCTED,Len} ->
+	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
+	    {Val01, Buffer01, Rb01} =
+		decode_utc_time_notag(Buffer00, Range,
+				      RestTags, TotalLen,
+				      OptOrMand),
+	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
+	    {Val01, Buffer02, Rb0+Rb01+Rb02};
+	{_,Len} ->
+	    <<PreBuff:Len/binary,RestBuff/binary>> = Buffer0,
+	    {binary_to_list(PreBuff), RestBuff, Rb0+Len}
+    end.
+
+
+%%============================================================================
+%% Length handling
+%%
+%% Encode length
+%%
+%% encode_length(Int | indefinite) ->
+%%          [<127]| [128 + Int (<127),OctetList] | [16#80]
+%%============================================================================
+
+encode_length(indefinite) ->
+    {[16#80],1}; % 128
+encode_length(L) when L =< 16#7F ->
+    {[L],1};
+encode_length(L) ->
+    Oct = minimum_octets(L),
+    Len = length(Oct),
+    if
+	Len =< 126 ->
+	    {[ (16#80+Len) | Oct ],Len+1};
+	true ->
+	    exit({error,{asn1, to_long_length_oct, Len}})
+    end.
+
+
+%% Val must be >= 0
+minimum_octets(Val) ->
+    minimum_octets(Val,[]).
+
+minimum_octets(0,Acc) ->
+    Acc;
+minimum_octets(Val, Acc) ->
+    minimum_octets((Val bsr 8),[Val band 16#FF | Acc]).
+
+
+%%===========================================================================
+%% Decode length
+%%
+%% decode_length(OctetList) -> {{indefinite, RestOctetsL}, NoRemovedBytes} |
+%%                             {{Length, RestOctetsL}, NoRemovedBytes}
+%%===========================================================================
+
+decode_length(<<1:1,0:7,T/binary>>) ->
+    {{indefinite, T}, 1};
+decode_length(<<0:1,Length:7,T/binary>>) ->
+    {{Length,T},1};
+decode_length(<<1:1,LL:7,T/binary>>) ->
+    <<Length:LL/unit:8,Rest/binary>> = T,
+    {{Length,Rest}, LL+1}.
+
+%decode_length([128 | T]) ->
+%    {{indefinite, T},1};
+%decode_length([H | T]) when H =< 127 ->
+%    {{H, T},1};
+%decode_length([H | T]) ->
+%    dec_long_length(H band 16#7F, T, 0, 1).
+
+
+%%dec_long_length(0, Buffer, Acc, Len) ->
+%%    {{Acc, Buffer},Len};
+%%dec_long_length(Bytes, [H | T], Acc, Len) ->
+%%    dec_long_length(Bytes - 1, T, (Acc bsl 8) + H, Len+1).
+
+%%===========================================================================
+%% Decode tag and length
+%%
+%% decode_tag_and_length(Buffer) -> {Tag, Len, RemainingBuffer, RemovedBytes}
+%%
+%%===========================================================================
+
+decode_tag_and_length(Buffer) ->
+    {Tag, Buffer2, RemBytesTag} = decode_tag(Buffer),
+    {{Len, Buffer3}, RemBytesLen} = decode_length(Buffer2),
+    {Tag, Len, Buffer3, RemBytesTag+RemBytesLen}.
+
+
+%%============================================================================
+%% Check if valid tag
+%%
+%% check_if_valid_tag(Tag, List_of_valid_tags, OptOrMand) -> name of the tag
+%%===============================================================================
+
+check_if_valid_tag(<<0,0,_/binary>>,_,_) ->
+    asn1_EOC;
+check_if_valid_tag(<<>>, _, OptOrMand) ->
+    check_if_valid_tag2(false,[],[],OptOrMand);
+check_if_valid_tag(Bytes, ListOfTags, OptOrMand) when binary(Bytes) ->
+    {Tag, _, _} = decode_tag(Bytes),
+    check_if_valid_tag(Tag, ListOfTags, OptOrMand);
+
+%% This alternative should be removed in the near future
+%% Bytes as input should be the only necessary call
+check_if_valid_tag(Tag, ListOfTags, OptOrMand) ->
+    {Class, _Form, TagNo} = Tag,
+    C = code_class(Class),
+    T = case C of
+	    'UNIVERSAL' ->
+		code_type(TagNo);
+	    _ ->
+		TagNo
+	end,
+    check_if_valid_tag2({C,T}, ListOfTags, Tag, OptOrMand).
+
+check_if_valid_tag2(_Class_TagNo, [], Tag, mandatory) ->
+    exit({error,{asn1,{invalid_tag,Tag}}});
+check_if_valid_tag2(_Class_TagNo, [], Tag, _) ->
+    exit({error,{asn1,{no_optional_tag,Tag}}});
+
+check_if_valid_tag2(Class_TagNo, [{TagName,TagList}|T], Tag, OptOrMand) ->
+    case check_if_valid_tag_loop(Class_TagNo, TagList) of
+	true ->
+	    TagName;
+	false ->
+	    check_if_valid_tag2(Class_TagNo, T, Tag, OptOrMand)
+    end.
+
+check_if_valid_tag_loop(_Class_TagNo,[]) ->
+    false;
+check_if_valid_tag_loop(Class_TagNo,[H|T]) ->
+    %% It is not possible to distinguish between SEQUENCE OF and SEQUENCE, and
+    %% between SET OF and SET because both are coded as 16 and 17, respectively.
+    H_without_OF = case H of
+		       {C, 'SEQUENCE OF'} ->
+			   {C, 'SEQUENCE'};
+		       {C, 'SET OF'} ->
+			   {C, 'SET'};
+		       Else ->
+			   Else
+		   end,
+
+    case H_without_OF of
+	Class_TagNo ->
+	    true;
+	{_,_} ->
+	    check_if_valid_tag_loop(Class_TagNo,T);
+	_ ->
+	    check_if_valid_tag_loop(Class_TagNo,H),
+	    check_if_valid_tag_loop(Class_TagNo,T)
+    end.
+
+
+
+code_class(0) -> 'UNIVERSAL';
+code_class(16#40) -> 'APPLICATION';
+code_class(16#80) -> 'CONTEXT';
+code_class(16#C0) -> 'PRIVATE'.
+
+
+code_type(1) -> 'BOOLEAN';
+code_type(2) -> 'INTEGER';
+code_type(3) -> 'BIT STRING';
+code_type(4) -> 'OCTET STRING';
+code_type(5) -> 'NULL';
+code_type(6) -> 'OBJECT IDENTIFIER';
+code_type(7) -> 'OBJECT DESCRIPTOR';
+code_type(8) -> 'EXTERNAL';
+code_type(9) -> 'REAL';
+code_type(10) -> 'ENUMERATED';
+code_type(11) -> 'EMBEDDED_PDV';
+code_type(16) -> 'SEQUENCE';
+code_type(16) -> 'SEQUENCE OF';
+code_type(17) -> 'SET';
+code_type(17) -> 'SET OF';
+code_type(18) -> 'NumericString';
+code_type(19) -> 'PrintableString';
+code_type(20) -> 'TeletexString';
+code_type(21) -> 'VideotexString';
+code_type(22) -> 'IA5String';
+code_type(23) -> 'UTCTime';
+code_type(24) -> 'GeneralizedTime';
+code_type(25) -> 'GraphicString';
+code_type(26) -> 'VisibleString';
+code_type(27) -> 'GeneralString';
+code_type(28) -> 'UniversalString';
+code_type(30) -> 'BMPString';
+code_type(Else) -> exit({error,{asn1,{unrecognized_type,Else}}}).
+
+%%-------------------------------------------------------------------------
+%% decoding of the components of a SET
+%%-------------------------------------------------------------------------
+
+decode_set(Rb, indefinite, <<0,0,Bytes/binary>>, _OptOrMand, _Fun3, Acc) ->
+   {lists:reverse(Acc),Bytes,Rb+2};
+
+decode_set(Rb, indefinite, Bytes, OptOrMand, Fun3, Acc) ->
+   {Term, Remain, Rb1} = Fun3(Bytes, OptOrMand),
+   decode_set(Rb+Rb1, indefinite, Remain, OptOrMand, Fun3, [Term|Acc]);
+
+decode_set(Rb, Num, Bytes, _OptOrMand, _Fun3, Acc) when Num == 0 ->
+   {lists:reverse(Acc), Bytes, Rb};
+
+decode_set(_, Num, _, _, _, _) when Num < 0 ->
+   exit({error,{asn1,{length_error,'SET'}}});
+
+decode_set(Rb, Num, Bytes, OptOrMand, Fun3, Acc) ->
+   {Term, Remain, Rb1} = Fun3(Bytes, OptOrMand),
+   decode_set(Rb+Rb1, Num-Rb1, Remain, OptOrMand, Fun3, [Term|Acc]).
+
+
+%%-------------------------------------------------------------------------
+%% decoding of SEQUENCE OF and SET OF
+%%-------------------------------------------------------------------------
+
+decode_components(Rb, indefinite, <<0,0,Bytes/binary>>, _Fun3, _TagIn, Acc) ->
+   {lists:reverse(Acc),Bytes,Rb+2};
+
+decode_components(Rb, indefinite, Bytes, Fun3, TagIn, Acc) ->
+   {Term, Remain, Rb1} = Fun3(Bytes, mandatory, TagIn),
+   decode_components(Rb+Rb1, indefinite, Remain, Fun3, TagIn, [Term|Acc]);
+
+decode_components(Rb, Num, Bytes, _Fun3, _TagIn, Acc) when Num == 0 ->
+   {lists:reverse(Acc), Bytes, Rb};
+
+decode_components(_, Num, _, _, _, _) when Num < 0 ->
+   exit({error,{asn1,{length_error,'SET/SEQUENCE OF'}}});
+
+decode_components(Rb, Num, Bytes, Fun3, TagIn, Acc) ->
+   {Term, Remain, Rb1} = Fun3(Bytes, mandatory, TagIn),
+   decode_components(Rb+Rb1, Num-Rb1, Remain, Fun3, TagIn, [Term|Acc]).
+
+%%decode_components(Rb, indefinite, [0,0|Bytes], _Fun3, _TagIn, Acc) ->
+%%   {lists:reverse(Acc),Bytes,Rb+2};
+
+decode_components(Rb, indefinite, <<0,0,Bytes/binary>>, _Fun4, _TagIn, _Fun, Acc) ->
+   {lists:reverse(Acc),Bytes,Rb+2};
+
+decode_components(Rb, indefinite, Bytes, _Fun4, TagIn, _Fun, Acc) ->
+   {Term, Remain, Rb1} = _Fun4(Bytes, mandatory, TagIn, _Fun),
+   decode_components(Rb+Rb1, indefinite, Remain, _Fun4, TagIn, _Fun, [Term|Acc]);
+
+decode_components(Rb, Num, Bytes, _Fun4, _TagIn, _Fun, Acc) when Num == 0 ->
+   {lists:reverse(Acc), Bytes, Rb};
+
+decode_components(_, Num, _, _, _, _, _) when Num < 0 ->
+   exit({error,{asn1,{length_error,'SET/SEQUENCE OF'}}});
+
+decode_components(Rb, Num, Bytes, _Fun4, TagIn, _Fun, Acc) ->
+   {Term, Remain, Rb1} = _Fun4(Bytes, mandatory, TagIn, _Fun),
+   decode_components(Rb+Rb1, Num-Rb1, Remain, _Fun4, TagIn, _Fun, [Term|Acc]).
+
+
+
+%%-------------------------------------------------------------------------
+%% INTERNAL HELPER FUNCTIONS (not exported)
+%%-------------------------------------------------------------------------
+
+
+%%==========================================================================
+%% Encode tag
+%%
+%% dotag(tag | notag, TagValpattern | TagValTuple, [Length, Value]) -> [Tag]
+%% TagValPattern is a correct bitpattern for a tag
+%% TagValTuple is a tuple of three bitpatterns, Class, Form and TagNo where
+%%     Class = UNIVERSAL | APPLICATION | CONTEXT | PRIVATE
+%%     Form  = Primitive | Constructed
+%%     TagNo = Number of tag
+%%==========================================================================
+
+
+dotag([], Tag, {Bytes,Len}) ->
+    dotag_universal(Tag,Bytes,Len);
+dotag(Tags, Tag, {Bytes,Len}) ->
+    encode_tags(Tags ++ [#tag{class=?UNIVERSAL,number=Tag,form=?PRIMITIVE}],
+		Bytes, Len);
+
+dotag(Tags, Tag, Bytes) ->
+    encode_tags(Tags ++ [#tag{class=?UNIVERSAL,number=Tag,form=?PRIMITIVE}],
+		Bytes, size(Bytes)).
+
+dotag_universal(UniversalTag,Bytes,Len) when Len =< 16#7F->
+    {[UniversalTag,Len,Bytes],2+Len};
+dotag_universal(UniversalTag,Bytes,Len) ->
+    {EncLen,LenLen}=encode_length(Len),
+    {[UniversalTag,EncLen,Bytes],1+LenLen+Len}.
+
+%% decoding postitive integer values.
+decode_integer2(Len,Bin = <<0:1,_:7,_Bs/binary>>,RemovedBytes) ->
+    <<Int:Len/unit:8,Buffer2/binary>> = Bin,
+    {Int,Buffer2,RemovedBytes};
+%% decoding negative integer values.
+decode_integer2(Len,<<1:1,B2:7,Bs/binary>>,RemovedBytes)  ->
+    <<N:Len/unit:8,Buffer2/binary>> = <<B2,Bs/binary>>,
+    Int = N - (1 bsl (8 * Len - 1)),
+    {Int,Buffer2,RemovedBytes}.
+
+%%decode_integer2(Len,Buffer,Acc,RemovedBytes) when (hd(Buffer) band 16#FF) =< 16#7F ->
+%%    {decode_integer_pos(Buffer, 8 * (Len - 1)),skip(Buffer,Len),RemovedBytes};
+%%decode_integer2(Len,Buffer,Acc,RemovedBytes)  ->
+%%    {decode_integer_neg(Buffer, 8 * (Len - 1)),skip(Buffer,Len),RemovedBytes}.
+
+%%decode_integer_pos([Byte|Tail], Shift) ->
+%%    (Byte bsl Shift) bor decode_integer_pos(Tail, Shift-8);
+%%decode_integer_pos([], _) -> 0.
+
+
+%%decode_integer_neg([Byte|Tail], Shift) ->
+%%    (-128 + (Byte band 127) bsl Shift) bor decode_integer_pos(Tail, Shift-8).
+
+
+concat_bit_binaries([],Bin={_,_}) ->
+    Bin;
+concat_bit_binaries({0,B1},{U2,B2}) ->
+    {U2,<<B1/binary,B2/binary>>};
+concat_bit_binaries({U1,B1},{U2,B2}) ->
+    S1 = (size(B1) * 8) - U1,
+    S2 = (size(B2) * 8) - U2,
+    PadBits = 8 - ((S1+S2) rem 8),
+    {PadBits, <<B1:S1/binary-unit:1,B2:S2/binary-unit:1,0:PadBits>>};
+concat_bit_binaries(L1,L2) when list(L1),list(L2) ->
+    %% this case occur when decoding with NNL
+    L1 ++ L2.
+
+
+get_constraint(C,Key) ->
+    case lists:keysearch(Key,1,C) of
+	false ->
+	     no;
+	{value,{_,V}} ->
+	    V
+    end.
+
+%%skip(Buffer, 0) ->
+%%    Buffer;
+%%skip([H | T], Len) ->
+%%    skip(T, Len-1).
+
+new_tags([],LastTag) ->
+    [LastTag];
+new_tags(Tags=[#tag{type='IMPLICIT'}],_LastTag) ->
+    Tags;
+new_tags([T1 = #tag{type='IMPLICIT'},#tag{type=T2Type}|Rest],LastTag) ->
+    new_tags([T1#tag{type=T2Type}|Rest],LastTag);
+new_tags(Tags,LastTag) ->
+    case lists:last(Tags) of
+	#tag{type='IMPLICIT'} ->
+	    Tags;
+	_ ->
+	    Tags ++ [LastTag]
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin_v2.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin_v2.erl
new file mode 100644
index 0000000000..50a91cf201
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin_v2.erl
@@ -0,0 +1,1849 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1rt_ber_bin_v2.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+-module(asn1rt_ber_bin_v2).
+
+%% encoding / decoding of BER
+
+-export([decode/1, decode/2, match_tags/2, encode/1]).
+-export([fixoptionals/2, cindex/3,
+	 list_to_record/2,
+	 encode_tag_val/1,
+	 encode_tags/3]).
+-export([encode_boolean/2,decode_boolean/2,
+	 encode_integer/3,encode_integer/4,
+	 decode_integer/3, decode_integer/4,
+	 encode_enumerated/2,
+	 encode_enumerated/4,decode_enumerated/4,
+	 encode_real/2,decode_real/3,
+	 encode_bit_string/4,decode_bit_string/4,
+	 decode_compact_bit_string/4,
+	 encode_octet_string/3,decode_octet_string/3,
+	 encode_null/2,decode_null/2,
+	 encode_object_identifier/2,decode_object_identifier/2,
+	 encode_restricted_string/4,decode_restricted_string/4,
+	 encode_universal_string/3,decode_universal_string/3,
+	 encode_BMP_string/3,decode_BMP_string/3,
+	 encode_generalized_time/3,decode_generalized_time/3,
+	 encode_utc_time/3,decode_utc_time/3,
+	 encode_length/1,decode_length/1,
+	 decode_tag_and_length/1]).
+
+-export([encode_open_type/1,encode_open_type/2,
+	 decode_open_type/2,decode_open_type_as_binary/2]).
+
+-export([decode_primitive_incomplete/2]).
+
+-include("asn1_records.hrl").
+
+% the encoding of class of tag bits 8 and 7
+-define(UNIVERSAL,   0).
+-define(APPLICATION, 16#40).
+-define(CONTEXT,     16#80).
+-define(PRIVATE,     16#C0).
+
+%%% primitive or constructed encoding % bit 6
+-define(PRIMITIVE,   0).
+-define(CONSTRUCTED, 2#00100000).
+
+%%% The tag-number for universal types
+-define(N_BOOLEAN, 1).
+-define(N_INTEGER, 2).
+-define(N_BIT_STRING, 3).
+-define(N_OCTET_STRING, 4).
+-define(N_NULL, 5).
+-define(N_OBJECT_IDENTIFIER, 6).
+-define(N_OBJECT_DESCRIPTOR, 7).
+-define(N_EXTERNAL, 8).
+-define(N_REAL, 9).
+-define(N_ENUMERATED, 10).
+-define(N_EMBEDDED_PDV, 11).
+-define(N_SEQUENCE, 16).
+-define(N_SET, 17).
+-define(N_NumericString, 18).
+-define(N_PrintableString, 19).
+-define(N_TeletexString, 20).
+-define(N_VideotexString, 21).
+-define(N_IA5String, 22).
+-define(N_UTCTime, 23).
+-define(N_GeneralizedTime, 24).
+-define(N_GraphicString, 25).
+-define(N_VisibleString, 26).
+-define(N_GeneralString, 27).
+-define(N_UniversalString, 28).
+-define(N_BMPString, 30).
+
+
+% the complete tag-word of built-in types
+-define(T_BOOLEAN,          ?UNIVERSAL bor ?PRIMITIVE bor 1).
+-define(T_INTEGER,          ?UNIVERSAL bor ?PRIMITIVE bor 2).
+-define(T_BIT_STRING,       ?UNIVERSAL bor ?PRIMITIVE bor 3). % can be CONSTRUCTED
+-define(T_OCTET_STRING,     ?UNIVERSAL bor ?PRIMITIVE bor 4). % can be CONSTRUCTED
+-define(T_NULL,             ?UNIVERSAL bor ?PRIMITIVE bor 5).
+-define(T_OBJECT_IDENTIFIER,?UNIVERSAL bor ?PRIMITIVE bor 6).
+-define(T_OBJECT_DESCRIPTOR,?UNIVERSAL bor ?PRIMITIVE bor 7).
+-define(T_EXTERNAL,         ?UNIVERSAL bor ?PRIMITIVE bor 8).
+-define(T_REAL,             ?UNIVERSAL bor ?PRIMITIVE bor 9).
+-define(T_ENUMERATED,       ?UNIVERSAL bor ?PRIMITIVE bor 10).
+-define(T_EMBEDDED_PDV,     ?UNIVERSAL bor ?PRIMITIVE bor 11).
+-define(T_SEQUENCE,         ?UNIVERSAL bor ?CONSTRUCTED bor 16).
+-define(T_SET,              ?UNIVERSAL bor ?CONSTRUCTED bor 17).
+-define(T_NumericString,    ?UNIVERSAL bor ?PRIMITIVE bor 18). %can be constructed
+-define(T_PrintableString,  ?UNIVERSAL bor ?PRIMITIVE bor 19). %can be constructed
+-define(T_TeletexString,    ?UNIVERSAL bor ?PRIMITIVE bor 20). %can be constructed
+-define(T_VideotexString,   ?UNIVERSAL bor ?PRIMITIVE bor 21). %can be constructed
+-define(T_IA5String,        ?UNIVERSAL bor ?PRIMITIVE bor 22). %can be constructed
+-define(T_UTCTime,          ?UNIVERSAL bor ?PRIMITIVE bor 23).
+-define(T_GeneralizedTime,  ?UNIVERSAL bor ?PRIMITIVE bor 24).
+-define(T_GraphicString,    ?UNIVERSAL bor ?PRIMITIVE bor 25). %can be constructed
+-define(T_VisibleString,    ?UNIVERSAL bor ?PRIMITIVE bor 26). %can be constructed
+-define(T_GeneralString,    ?UNIVERSAL bor ?PRIMITIVE bor 27). %can be constructed
+-define(T_UniversalString,  ?UNIVERSAL bor ?PRIMITIVE bor 28). %can be constructed
+-define(T_BMPString,        ?UNIVERSAL bor ?PRIMITIVE bor 30). %can be constructed
+
+% encode(Tlv={_Tag={?PRIMITIVE,_},_VList}) ->
+%     encode_primitive(Tlv);
+% encode(Tlv) ->
+%     encode_constructed(Tlv).
+
+encode([Tlv]) ->
+    encode(Tlv);
+encode({TlvTag,TlvVal}) when list(TlvVal) ->
+    %% constructed form of value
+    encode_tlv(TlvTag,TlvVal,?CONSTRUCTED);
+encode({TlvTag,TlvVal}) ->
+    encode_tlv(TlvTag,TlvVal,?PRIMITIVE);
+encode(Bin) when binary(Bin) ->
+    Bin.
+
+encode_tlv(TlvTag,TlvVal,Form) ->
+    Tag = encode_tlv_tag(TlvTag,Form),
+    {Val,VLen} = encode_tlv_val(TlvVal),
+    {Len,_LLen} = encode_length(VLen),
+    BinLen = list_to_binary(Len),
+    <<Tag/binary,BinLen/binary,Val/binary>>.
+
+encode_tlv_tag(ClassTagNo,Form) ->
+    Class = ClassTagNo bsr 16,
+    case encode_tag_val({Class bsl 6,Form,(ClassTagNo - (Class bsl 16))}) of
+	T when list(T) ->
+	    list_to_binary(T);
+	T ->
+	    T
+    end.
+
+encode_tlv_val(TlvL) when list(TlvL) ->
+    encode_tlv_list(TlvL,[]);
+encode_tlv_val(Bin) ->
+    {Bin,size(Bin)}.
+
+encode_tlv_list([Tlv|Tlvs],Acc) ->
+    EncTlv = encode(Tlv),
+    encode_tlv_list(Tlvs,[EncTlv|Acc]);
+encode_tlv_list([],Acc) ->
+    Bin=list_to_binary(lists:reverse(Acc)),
+    {Bin,size(Bin)}.
+
+% encode_primitive({{_,ClassTagNo},V}) ->
+%     Len = size(V), % not sufficient as length encode
+%     Class = ClassTagNo bsr 16,
+%     {TagLen,Tag} =
+%     case encode_tag_val({Class,?PRIMITIVE,ClassTagNo - Class}) of
+% 	T when list(T) ->
+% 	    {length(T),list_to_binary(T)};
+% 	T ->
+% 	    {1,T}
+%     end,
+
+
+decode(B,driver) ->
+    case catch port_control(drv_complete,2,B) of
+	Bin when binary(Bin) ->
+	    binary_to_term(Bin);
+	List when list(List) -> handle_error(List,B);
+	{'EXIT',{badarg,Reason}} ->
+	    asn1rt_driver_handler:load_driver(),
+	    receive
+		driver_ready ->
+		    case catch port_control(drv_complete,2,B) of
+			Bin2 when binary(Bin2) -> binary_to_term(Bin2);
+			List when list(List) -> handle_error(List,B);
+			Error -> exit(Error)
+		    end;
+		{error,Error} -> % error when loading driver
+		    %% the driver could not be loaded
+		    exit(Error);
+		Error={port_error,Reason} ->
+		    exit(Error)
+	    end;
+	{'EXIT',Reason} ->
+	    exit(Reason)
+    end.
+
+handle_error([],_)->
+    exit({error,{"memory allocation problem"}});
+handle_error([$1|_],L) -> % error in driver
+    exit({error,{asn1_error,L}});
+handle_error([$2|_],L) -> % error in driver due to wrong tag
+    exit({error,{asn1_error,{"bad tag",L}}});
+handle_error([$3|_],L) -> % error in driver due to length error
+    exit({error,{asn1_error,{"bad length field",L}}});
+handle_error([$4|_],L) -> % error in driver due to indefinite length error
+    exit({error,{asn1_error,{"indefinite length without end bytes",L}}});
+handle_error(ErrL,L) ->
+    exit({error,{unknown_error,ErrL,L}}).
+
+
+decode(Bin) when binary(Bin) ->
+    decode_primitive(Bin);
+decode(Tlv) -> % assume it is a tlv
+    {Tlv,<<>>}.
+
+
+decode_primitive(Bin) ->
+    {{Form,TagNo,Len,V},Rest} = decode_tlv(Bin),
+    case Form of
+	1 when Len == indefinite -> % constructed
+	    {Vlist,Rest2} = decode_constructed_indefinite(V,[]),
+	    {{TagNo,Vlist},Rest2};
+	1 -> % constructed
+	    {{TagNo,decode_constructed(V)},Rest};
+	0 -> % primitive
+	    {{TagNo,V},Rest}
+    end.
+
+decode_constructed(<<>>) ->
+    [];
+decode_constructed(Bin) ->
+    {Tlv,Rest} = decode_primitive(Bin),
+    [Tlv|decode_constructed(Rest)].
+
+decode_constructed_indefinite(<<0,0,Rest/binary>>,Acc) ->
+    {lists:reverse(Acc),Rest};
+decode_constructed_indefinite(Bin,Acc) ->
+    {Tlv,Rest} = decode_primitive(Bin),
+    decode_constructed_indefinite(Rest, [Tlv|Acc]).
+
+decode_tlv(Bin) ->
+    {Form,TagNo,Len,Bin2} = decode_tag_and_length(Bin),
+    case Len of
+	indefinite ->
+	    {{Form,TagNo,Len,Bin2},[]};
+	_ ->
+	    <<V:Len/binary,Bin3/binary>> = Bin2,
+	    {{Form,TagNo,Len,V},Bin3}
+    end.
+
+%% decode_primitive_incomplete/2 decodes an encoded message incomplete
+%% by help of the pattern attribute (first argument).
+decode_primitive_incomplete([[default,TagNo]],Bin) -> %default
+    case decode_tlv(Bin) of
+	{{Form,TagNo,Len,V},Rest} ->
+	    decode_incomplete2(Form,TagNo,Len,V,[],Rest);
+	_ ->
+	    %{asn1_DEFAULT,Bin}
+	    asn1_NOVALUE
+    end;
+decode_primitive_incomplete([[default,TagNo,Directives]],Bin) -> %default, constructed type, Directives points into this type
+    case decode_tlv(Bin) of
+	{{Form,TagNo,Len,V},Rest} ->
+	    decode_incomplete2(Form,TagNo,Len,V,Directives,Rest);
+	_ ->
+	    %{asn1_DEFAULT,Bin}
+	    asn1_NOVALUE
+    end;
+decode_primitive_incomplete([[opt,TagNo]],Bin) -> %optional
+    case decode_tlv(Bin) of
+	{{Form,TagNo,Len,V},Rest} ->
+	    decode_incomplete2(Form,TagNo,Len,V,[],Rest);
+	_ ->
+	    %{{TagNo,asn1_NOVALUE},Bin}
+	    asn1_NOVALUE
+    end;
+decode_primitive_incomplete([[opt,TagNo,Directives]],Bin) -> %optional
+    case decode_tlv(Bin) of
+	{{Form,TagNo,Len,V},Rest} ->
+	    decode_incomplete2(Form,TagNo,Len,V,Directives,Rest);
+	_ ->
+	    %{{TagNo,asn1_NOVALUE},Bin}
+	    asn1_NOVALUE
+    end;
+%% A choice alternative that shall be undecoded
+decode_primitive_incomplete([[alt_undec,TagNo]|RestAlts],Bin) ->
+%    decode_incomplete_bin(Bin);
+    case decode_tlv(Bin) of
+	{{_Form,TagNo,_Len,_V},_R} ->
+	    decode_incomplete_bin(Bin);
+	_ ->
+	    decode_primitive_incomplete(RestAlts,Bin)
+    end;
+decode_primitive_incomplete([[alt,TagNo]|RestAlts],Bin) ->
+    case decode_tlv(Bin) of
+	{{_Form,TagNo,_Len,V},Rest} ->
+	    {{TagNo,V},Rest};
+	_ ->
+	    decode_primitive_incomplete(RestAlts,Bin)
+    end;
+decode_primitive_incomplete([[alt,TagNo,Directives]|RestAlts],Bin) ->
+    case decode_tlv(Bin) of
+	{{Form,TagNo,Len,V},Rest} ->
+	    decode_incomplete2(Form,TagNo,Len,V,Directives,Rest);
+	_ ->
+	    decode_primitive_incomplete(RestAlts,Bin)
+    end;
+decode_primitive_incomplete([[alt_parts,TagNo]|RestAlts],Bin) ->
+    case decode_tlv(Bin) of
+	{{_Form,TagNo,_Len,V},Rest} ->
+	    {{TagNo,decode_parts_incomplete(V)},Rest};
+	_ ->
+	    decode_primitive_incomplete(RestAlts,Bin)
+    end;
+decode_primitive_incomplete([[undec,_TagNo]|_RestTag],Bin) -> %incomlete decode
+    decode_incomplete_bin(Bin); %% use this if changing handling of
+decode_primitive_incomplete([[parts,TagNo]|_RestTag],Bin) ->
+    case decode_tlv(Bin) of
+	{{_Form,TagNo,_Len,V},Rest} ->
+	    {{TagNo,decode_parts_incomplete(V)},Rest};
+	Err ->
+	    {error,{asn1,"tag failure",TagNo,Err}}
+    end;
+decode_primitive_incomplete([mandatory|RestTag],Bin) ->
+    case decode_tlv(Bin) of
+	{{Form,TagNo,Len,V},Rest} ->
+	    decode_incomplete2(Form,TagNo,Len,V,RestTag,Rest);
+	 _ ->
+	    {error,{asn1,"partial incomplete decode failure"}}
+    end;
+%% A choice that is a toptype or a mandatory component of a
+%% SEQUENCE or SET.
+decode_primitive_incomplete([[mandatory,Directives]],Bin) ->
+    case decode_tlv(Bin) of
+	{{Form,TagNo,Len,V},Rest} ->
+	    decode_incomplete2(Form,TagNo,Len,V,Directives,Rest);
+	 _ ->
+	    {error,{asn1,"partial incomplete decode failure"}}
+    end;
+decode_primitive_incomplete([],Bin) ->
+    decode_primitive(Bin).
+
+%% decode_parts_incomplete/1 receives a number of values encoded in
+%% sequence and returns the parts as unencoded binaries
+decode_parts_incomplete(<<>>) ->
+    [];
+decode_parts_incomplete(Bin) ->
+    {ok,Rest} = skip_tag(Bin),
+    {ok,Rest2} = skip_length_and_value(Rest),
+    LenPart = size(Bin) - size(Rest2),
+    <<Part:LenPart/binary,RestBin/binary>> = Bin,
+    [Part|decode_parts_incomplete(RestBin)].
+
+
+%% decode_incomplete2 checks if V is a value of a constructed or
+%% primitive type, and continues the decode propeerly.
+decode_incomplete2(1,TagNo,indefinite,V,TagMatch,_) ->
+    %% constructed indefinite length
+    {Vlist,Rest2} = decode_constr_indef_incomplete(TagMatch,V,[]),
+    {{TagNo,Vlist},Rest2};
+decode_incomplete2(1,TagNo,_Len,V,TagMatch,Rest) ->
+    {{TagNo,decode_constructed_incomplete(TagMatch,V)},Rest};
+decode_incomplete2(0,TagNo,_Len,V,_TagMatch,Rest) ->
+    {{TagNo,V},Rest}.
+
+decode_constructed_incomplete(_TagMatch,<<>>) ->
+    [];
+decode_constructed_incomplete([mandatory|RestTag],Bin) ->
+    {Tlv,Rest} = decode_primitive(Bin),
+    [Tlv|decode_constructed_incomplete(RestTag,Rest)];
+decode_constructed_incomplete(Directives=[[Alt,_]|_],Bin)
+  when Alt == alt_undec; Alt == alt ->
+    case decode_tlv(Bin) of
+	{{_Form,TagNo,_Len,V},Rest} ->
+	    case incomplete_choice_alt(TagNo,Directives) of
+		alt_undec ->
+		    LenA = size(Bin)-size(Rest),
+		    <<A:LenA/binary,Rest/binary>> = Bin,
+		    A;
+%		    {UndecBin,_}=decode_incomplete_bin(Bin),
+%		    UndecBin;
+%		    [{TagNo,V}];
+		alt ->
+		    {Tlv,_} = decode_primitive(V),
+		    [{TagNo,Tlv}];
+		alt_parts ->
+		    %{{TagNo,decode_parts_incomplete(V)},Rest}; % maybe wrong
+		    [{TagNo,decode_parts_incomplete(V)}];
+		Err ->
+		    {error,{asn1,"partial incomplete decode failure",Err}}
+	    end;
+	_ ->
+	    {error,{asn1,"partial incomplete decode failure"}}
+    end;
+decode_constructed_incomplete([TagNo|RestTag],Bin) ->
+%%    {Tlv,Rest} = decode_primitive_incomplete([TagNo],Bin),
+    case decode_primitive_incomplete([TagNo],Bin) of
+	{Tlv,Rest} ->
+	    [Tlv|decode_constructed_incomplete(RestTag,Rest)];
+	asn1_NOVALUE ->
+	    decode_constructed_incomplete(RestTag,Bin)
+    end;
+decode_constructed_incomplete([],Bin) ->
+    {Tlv,_Rest}=decode_primitive(Bin),
+    [Tlv].
+
+decode_constr_indef_incomplete(_TagMatch,<<0,0,Rest/binary>>,Acc) ->
+    {lists:reverse(Acc),Rest};
+decode_constr_indef_incomplete([Tag|RestTags],Bin,Acc) ->
+%    {Tlv,Rest} = decode_primitive_incomplete([Tag],Bin),
+    case decode_primitive_incomplete([Tag],Bin) of
+	{Tlv,Rest} ->
+	    decode_constr_indef_incomplete(RestTags,Rest,[Tlv|Acc]);
+	asn1_NOVALUE ->
+	    decode_constr_indef_incomplete(RestTags,Bin,Acc)
+    end.
+
+
+decode_incomplete_bin(Bin) ->
+    {ok,Rest} = skip_tag(Bin),
+    {ok,Rest2} = skip_length_and_value(Rest),
+    IncLen = size(Bin) - size(Rest2),
+    <<IncBin:IncLen/binary,Ret/binary>> = Bin,
+    {IncBin,Ret}.
+
+incomplete_choice_alt(TagNo,[[Alt,TagNo]|_Directives]) ->
+    Alt;
+incomplete_choice_alt(TagNo,[_H|Directives]) ->
+    incomplete_choice_alt(TagNo,Directives);
+incomplete_choice_alt(_,[]) ->
+    error.
+
+
+%% skip_tag and skip_length_and_value are rutines used both by
+%% decode_partial_incomplete and decode_partial (decode/2).
+
+skip_tag(<<_:3,31:5,Rest/binary>>)->
+    skip_long_tag(Rest);
+skip_tag(<<_:3,_Tag:5,Rest/binary>>) ->
+    {ok,Rest}.
+
+skip_long_tag(<<1:1,_:7,Rest/binary>>) ->
+    skip_long_tag(Rest);
+skip_long_tag(<<0:1,_:7,Rest/binary>>) ->
+    {ok,Rest}.
+
+skip_length_and_value(Binary) ->
+    case decode_length(Binary) of
+	{indefinite,RestBinary} ->
+	    skip_indefinite_value(RestBinary);
+	{Length,RestBinary} ->
+	    <<_:Length/unit:8,Rest/binary>> = RestBinary,
+	    {ok,Rest}
+    end.
+
+skip_indefinite_value(<<0,0,Rest/binary>>) ->
+    {ok,Rest};
+skip_indefinite_value(Binary) ->
+    {ok,RestBinary}=skip_tag(Binary),
+    {ok,RestBinary2} = skip_length_and_value(RestBinary),
+    skip_indefinite_value(RestBinary2).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% match_tags takes a Tlv (Tag, Length, Value) structure and matches
+%% it with the tags in TagList. If the tags does not match the function
+%% crashes otherwise it returns the remaining Tlv after that the tags have
+%% been removed.
+%%
+%% match_tags(Tlv, TagList)
+%%
+
+
+match_tags({T,V}, [T|Tt]) ->
+    match_tags(V,Tt);
+match_tags([{T,V}],[T|Tt]) ->
+    match_tags(V, Tt);
+match_tags(Vlist = [{T,_V}|_], [T]) ->
+    Vlist;
+match_tags(Tlv, []) ->
+    Tlv;
+match_tags({Tag,_V},[T|_Tt]) ->
+    {error,{asn1,{wrong_tag,{Tag,T}}}}.
+
+
+cindex(Ix,Val,Cname) ->
+    case element(Ix,Val) of
+	{Cname,Val2} -> Val2;
+	X -> X
+    end.
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Optionals, preset not filled optionals with asn1_NOVALUE
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+% converts a list to a record if necessary
+list_to_record(Name,List) when list(List) ->
+    list_to_tuple([Name|List]);
+list_to_record(_Name,Tuple) when tuple(Tuple) ->
+    Tuple.
+
+
+fixoptionals(OptList,Val) when list(Val) ->
+    fixoptionals(OptList,Val,1,[],[]).
+
+fixoptionals([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) ->
+    fixoptionals(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]);
+fixoptionals([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) ->
+    fixoptionals(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]);
+fixoptionals(O,[Vh|Vt],Pos,Acc1,Acc2) ->
+    fixoptionals(O,Vt,Pos+1,Acc1,[Vh|Acc2]);
+fixoptionals([],[Vh|Vt],Pos,Acc1,Acc2) ->
+    fixoptionals([],Vt,Pos+1,Acc1,[Vh|Acc2]);
+fixoptionals([],[],_,_Acc1,Acc2) ->
+    % return Val as a record
+    list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]).
+
+
+%%encode_tag(TagClass(?UNI, APP etc), Form (?PRIM etx), TagInteger) ->
+%%     8bit Int | binary
+encode_tag_val({Class, Form, TagNo}) when (TagNo =< 30) ->
+    <<(Class bsr 6):2,(Form bsr 5):1,TagNo:5>>;
+
+encode_tag_val({Class, Form, TagNo}) ->
+    {Octets,_Len} = mk_object_val(TagNo),
+    BinOct = list_to_binary(Octets),
+    <<(Class bsr 6):2, (Form bsr 5):1, 31:5,BinOct/binary>>;
+
+%% asumes whole correct tag bitpattern, multiple of 8
+encode_tag_val(Tag) when (Tag =< 255) -> Tag;  %% anv�nds denna funktion??!!
+%% asumes correct bitpattern of 0-5
+encode_tag_val(Tag) -> encode_tag_val2(Tag,[]).
+
+encode_tag_val2(Tag, OctAck) when (Tag =< 255) ->
+    [Tag | OctAck];
+encode_tag_val2(Tag, OctAck) ->
+    encode_tag_val2(Tag bsr 8, [255 band Tag | OctAck]).
+
+
+%%===============================================================================
+%% Decode a tag
+%%
+%% decode_tag(OctetListBuffer) -> {{Form, (Class bsl 16)+ TagNo}, RestOfBuffer, RemovedBytes}
+%%===============================================================================
+
+decode_tag_and_length(<<Class:2, Form:1, TagNo:5, 0:1, Length:7, RestBuffer/binary>>) when TagNo < 31 ->
+    {Form, (Class bsl 16) + TagNo, Length, RestBuffer};
+decode_tag_and_length(<<Class:2, Form:1, TagNo:5, 1:1, 0:7, T/binary>>) when TagNo < 31 ->
+    {Form, (Class bsl 16) + TagNo, indefinite, T};
+decode_tag_and_length(<<Class:2, Form:1, TagNo:5, 1:1, LL:7, T/binary>>) when TagNo < 31 ->
+    <<Length:LL/unit:8,RestBuffer/binary>> = T,
+    {Form, (Class bsl 16) + TagNo, Length, RestBuffer};
+decode_tag_and_length(<<Class:2, Form:1, 31:5, 0:1, TagNo:7, 0:1, Length:7, RestBuffer/binary>>) ->
+    {Form, (Class bsl 16) + TagNo, Length, RestBuffer};
+decode_tag_and_length(<<Class:2, Form:1, 31:5, 0:1, TagNo:7, 1:1, 0:7, T/binary>>)  ->
+    {Form, (Class bsl 16) + TagNo, indefinite, T};
+decode_tag_and_length(<<Class:2, Form:1, 31:5, 0:1, TagNo:7, 1:1, LL:7, T/binary>>)  ->
+    <<Length:LL/unit:8,RestBuffer/binary>> = T,
+    {Form, (Class bsl 16) + TagNo, Length, RestBuffer};
+decode_tag_and_length(<<Class:2, Form:1, 31:5, Buffer/binary>>) ->
+    {TagNo, Buffer1} = decode_tag(Buffer, 0),
+    {Length, RestBuffer} = decode_length(Buffer1),
+    {Form, (Class bsl 16) + TagNo, Length, RestBuffer}.
+
+
+
+%% last partial tag
+decode_tag(<<0:1,PartialTag:7, Buffer/binary>>, TagAck) ->
+    TagNo = (TagAck bsl 7) bor PartialTag,
+    %%<<TagNo>> = <<TagAck:1, PartialTag:7>>,
+    {TagNo, Buffer};
+% more tags
+decode_tag(<<_:1,PartialTag:7, Buffer/binary>>, TagAck) ->
+    TagAck1 = (TagAck bsl 7) bor PartialTag,
+    %%<<TagAck1:16>> = <<TagAck:1, PartialTag:7,0:8>>,
+    decode_tag(Buffer, TagAck1).
+
+
+%%=======================================================================
+%%
+%% Encode all tags in the list Tags and return a possibly deep list of
+%% bytes with tag and length encoded
+%% The taglist must be in reverse order (fixed by the asn1 compiler)
+%% e.g [T1,T2] will result in
+%% {[EncodedT2,EncodedT1|BytesSoFar],LenSoFar+LenT2+LenT1}
+%%
+
+encode_tags([Tag|Trest], BytesSoFar, LenSoFar) ->
+% remove    {Bytes1,L1} = encode_one_tag(Tag),
+    {Bytes2,L2} = encode_length(LenSoFar),
+    encode_tags(Trest, [Tag,Bytes2|BytesSoFar],
+		 LenSoFar + size(Tag) + L2);
+encode_tags([], BytesSoFar, LenSoFar) ->
+    {BytesSoFar,LenSoFar}.
+
+encode_tags(TagIn, {BytesSoFar,LenSoFar}) ->
+    encode_tags(TagIn, BytesSoFar, LenSoFar).
+
+% encode_one_tag(#tag{class=Class,number=No,type=Type, form = Form}) ->
+%     NewForm = case Type of
+% 	       'EXPLICIT' ->
+% 		   ?CONSTRUCTED;
+% 	       _ ->
+% 		   Form
+% 	   end,
+%     Bytes = encode_tag_val({Class,NewForm,No}),
+%     {Bytes,size(Bytes)}.
+
+
+%%===============================================================================
+%%
+%% This comment is valid for all the encode/decode functions
+%%
+%% C = Constraint -> typically {'ValueRange',LowerBound,UpperBound}
+%%     used for PER-coding but not for BER-coding.
+%%
+%% Val = Value.  If Val is an atom then it is a symbolic integer value
+%%       (i.e the atom must be one of the names in the NamedNumberList).
+%%       The NamedNumberList is used to translate the atom to an integer value
+%%       before encoding.
+%%
+%%===============================================================================
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_open_type(Value) -> io_list (i.e nested list with integers, binaries)
+%% Value = list of bytes of an already encoded value (the list must be flat)
+%%         | binary
+
+%%
+encode_open_type(Val) when list(Val) ->
+%    {Val,length(Val)};
+    encode_open_type(list_to_binary(Val));
+encode_open_type(Val) ->
+    {Val, size(Val)}.
+
+%%
+encode_open_type(Val, T) when list(Val) ->
+    encode_open_type(list_to_binary(Val),T);
+encode_open_type(Val,[]) ->
+    {Val, size(Val)};
+encode_open_type(Val,Tag) ->
+    encode_tags(Tag,Val, size(Val)).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_open_type(Tlv, TagIn) -> Value
+%% Tlv = {Tag,V} | V where V -> binary()
+%% TagIn = [TagVal] where TagVal -> int()
+%% Value = binary with decoded data (which must be decoded again as some type)
+%%
+decode_open_type(Tlv, TagIn) ->
+    case match_tags(Tlv,TagIn) of
+	Bin when binary(Bin) ->
+	    {InnerTlv,_} = decode(Bin),
+	    InnerTlv;
+	TlvBytes -> TlvBytes
+    end.
+
+
+decode_open_type_as_binary(Tlv,TagIn)->
+    case match_tags(Tlv,TagIn) of
+	V when binary(V) ->
+	    V;
+	[Tlv2] -> encode(Tlv2);
+	Tlv2 -> encode(Tlv2)
+    end.
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Boolean, ITU_T X.690 Chapter 8.2
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+%%===============================================================================
+%% encode_boolean(Integer, ReversedTagList) -> {[Octet],Len}
+%%===============================================================================
+
+encode_boolean({Name, Val}, TagIn) when atom(Name) ->
+    encode_boolean(Val, TagIn);
+encode_boolean(true, TagIn) ->
+    encode_tags(TagIn, [16#FF],1);
+encode_boolean(false, TagIn) ->
+    encode_tags(TagIn, [0],1);
+encode_boolean(X,_) ->
+    exit({error,{asn1, {encode_boolean, X}}}).
+
+
+%%===============================================================================
+%% decode_boolean(BuffList, HasTag, TotalLen) -> {true, Remain, RemovedBytes} |
+%%                                               {false, Remain, RemovedBytes}
+%%===============================================================================
+decode_boolean(Tlv,TagIn) ->
+    Val = match_tags(Tlv, TagIn),
+    case Val of
+	<<0:8>> ->
+	    false;
+	<<_:8>> ->
+	    true;
+	_ ->
+	    exit({error,{asn1, {decode_boolean, Val}}})
+    end.
+
+
+%%===========================================================================
+%% Integer, ITU_T X.690 Chapter 8.3
+
+%% encode_integer(Constraint, Value, Tag) -> [octet list]
+%% encode_integer(Constraint, Name, NamedNumberList, Tag) -> [octet list]
+%%    Value = INTEGER | {Name,INTEGER}
+%%    Tag = tag | notag
+%%===========================================================================
+
+encode_integer(C, Val, Tag) when integer(Val) ->
+    encode_tags(Tag, encode_integer(C, Val));
+encode_integer(C,{Name,Val},Tag) when atom(Name) ->
+    encode_integer(C,Val,Tag);
+encode_integer(_C, Val, _Tag) ->
+    exit({error,{asn1, {encode_integer, Val}}}).
+
+
+
+encode_integer(C, Val, NamedNumberList, Tag) when atom(Val) ->
+    case lists:keysearch(Val, 1, NamedNumberList) of
+	{value,{_, NewVal}} ->
+	    encode_tags(Tag, encode_integer(C, NewVal));
+	_ ->
+	    exit({error,{asn1, {encode_integer_namednumber, Val}}})
+    end;
+encode_integer(C,{_Name,Val},NamedNumberList,Tag) ->
+    encode_integer(C,Val,NamedNumberList,Tag);
+encode_integer(C, Val, _NamedNumberList, Tag) ->
+    encode_tags(Tag, encode_integer(C, Val)).
+
+
+encode_integer(_, Val) ->
+    Bytes =
+	if
+	    Val >= 0 ->
+		encode_integer_pos(Val, []);
+	    true ->
+		encode_integer_neg(Val, [])
+	end,
+    {Bytes,length(Bytes)}.
+
+encode_integer_pos(0, L=[B|_Acc]) when B < 128 ->
+    L;
+encode_integer_pos(N, Acc) ->
+    encode_integer_pos((N bsr 8), [N band 16#ff| Acc]).
+
+encode_integer_neg(-1, L=[B1|_T]) when B1 > 127 ->
+    L;
+encode_integer_neg(N, Acc) ->
+    encode_integer_neg(N bsr 8, [N band 16#ff|Acc]).
+
+%%===============================================================================
+%% decode integer
+%%    (Buffer, Range, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}
+%%    (Buffer, Range, NamedNumberList, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}
+%%===============================================================================
+
+decode_integer(Tlv,Range,NamedNumberList,TagIn) ->
+    V = match_tags(Tlv,TagIn),
+    Int = decode_integer(V),
+    range_check_integer(Int,Range),
+    number2name(Int,NamedNumberList).
+
+decode_integer(Tlv,Range,TagIn) ->
+    V = match_tags(Tlv, TagIn),
+    Int = decode_integer(V),
+    range_check_integer(Int,Range),
+    Int.
+
+%% decoding postitive integer values.
+decode_integer(Bin = <<0:1,_:7,_/binary>>) ->
+    Len = size(Bin),
+%    <<Int:Len/unit:8,Buffer2/binary>> = Bin,
+    <<Int:Len/unit:8>> = Bin,
+    Int;
+%% decoding negative integer values.
+decode_integer(Bin = <<1:1,B2:7,Bs/binary>>)  ->
+    Len = size(Bin),
+%    <<N:Len/unit:8,Buffer2/binary>> = <<B2,Bs/binary>>,
+    <<N:Len/unit:8>> = <<B2,Bs/binary>>,
+    Int = N - (1 bsl (8 * Len - 1)),
+    Int.
+
+range_check_integer(Int,Range) ->
+    case Range of
+	[] -> % No length constraint
+	    Int;
+	{Lb,Ub} when Int >= Lb, Ub >= Int -> % variable length constraint
+	    Int;
+	Int -> % fixed value constraint
+	    Int;
+	{_,_} ->
+	    exit({error,{asn1,{integer_range,Range,Int}}});
+	SingleValue when integer(SingleValue) ->
+	    exit({error,{asn1,{integer_range,Range,Int}}});
+	_ -> % some strange constraint that we don't support yet
+	    Int
+    end.
+
+number2name(Int,[]) ->
+    Int;
+number2name(Int,NamedNumberList) ->
+    case lists:keysearch(Int, 2, NamedNumberList) of
+	{value,{NamedVal, _}} ->
+	    NamedVal;
+	_ ->
+	    Int
+    end.
+
+
+%%============================================================================
+%% Enumerated value, ITU_T X.690 Chapter 8.4
+
+%% encode enumerated value
+%%============================================================================
+encode_enumerated(Val, TagIn) when integer(Val)->
+    encode_tags(TagIn, encode_integer(false,Val));
+encode_enumerated({Name,Val}, TagIn) when atom(Name) ->
+    encode_enumerated(Val, TagIn).
+
+%% The encode_enumerated functions below this line can be removed when the
+%% new code generation is stable. (the functions might have to be kept here
+%% a while longer for compatibility reasons)
+
+encode_enumerated(C, Val, {NamedNumberList,ExtList}, TagIn) when atom(Val) ->
+    case catch encode_enumerated(C, Val, NamedNumberList, TagIn) of
+	{'EXIT',_} -> encode_enumerated(C, Val, ExtList, TagIn);
+	Result -> Result
+    end;
+
+encode_enumerated(C, Val, NamedNumberList, TagIn) when atom(Val) ->
+    case lists:keysearch(Val, 1, NamedNumberList) of
+	{value, {_, NewVal}} ->
+	    encode_tags(TagIn, encode_integer(C, NewVal));
+	_ ->
+	    exit({error,{asn1, {enumerated_not_in_range, Val}}})
+    end;
+
+encode_enumerated(C, {asn1_enum, Val}, {_,_}, TagIn) when integer(Val) ->
+    encode_tags(TagIn, encode_integer(C,Val));
+
+encode_enumerated(C, {Name,Val}, NamedNumberList, TagIn) when atom(Name) ->
+    encode_enumerated(C, Val, NamedNumberList, TagIn);
+
+encode_enumerated(_C, Val, _NamedNumberList, _TagIn) ->
+    exit({error,{asn1, {enumerated_not_namednumber, Val}}}).
+
+
+
+%%============================================================================
+%% decode enumerated value
+%%   (Buffer, Range, NamedNumberList, HasTag, TotalLen) ->  Value
+%%===========================================================================
+decode_enumerated(Tlv, Range, NamedNumberList, Tags) ->
+    Buffer = match_tags(Tlv,Tags),
+    decode_enumerated_notag(Buffer, Range, NamedNumberList, Tags).
+
+decode_enumerated_notag(Buffer, _Range, {NamedNumberList,ExtList}, _Tags) ->
+
+    IVal = decode_integer2(size(Buffer), Buffer),
+    case decode_enumerated1(IVal, NamedNumberList) of
+	{asn1_enum,IVal} ->
+	    decode_enumerated1(IVal,ExtList);
+	EVal ->
+	    EVal
+    end;
+decode_enumerated_notag(Buffer, _Range, NNList, _Tags) ->
+    IVal = decode_integer2(size(Buffer), Buffer),
+    case decode_enumerated1(IVal, NNList) of
+	{asn1_enum,_} ->
+	    exit({error,{asn1, {illegal_enumerated, IVal}}});
+	EVal ->
+	    EVal
+    end.
+
+decode_enumerated1(Val, NamedNumberList) ->
+    %% it must be a named integer
+    case lists:keysearch(Val, 2, NamedNumberList) of
+	{value,{NamedVal, _}} ->
+	    NamedVal;
+	_ ->
+	    {asn1_enum,Val}
+    end.
+
+
+%%============================================================================
+%%
+%% Real value, ITU_T X.690 Chapter 8.5
+%%============================================================================
+%%
+%% encode real value
+%%============================================================================
+
+%% only base 2 internally so far!!
+encode_real(0, TagIn) ->
+    encode_tags(TagIn, {[],0});
+encode_real('PLUS-INFINITY', TagIn) ->
+    encode_tags(TagIn, {[64],1});
+encode_real('MINUS-INFINITY', TagIn) ->
+    encode_tags(TagIn, {[65],1});
+encode_real(Val, TagIn) when tuple(Val)->
+    encode_tags(TagIn, encode_real(Val)).
+
+%%%%%%%%%%%%%%
+%% not optimal efficient..
+%% only base 2 of Mantissa encoding!
+%% only base 2 of ExpBase encoding!
+encode_real({Man, Base, Exp}) ->
+%%    io:format("Mantissa: ~w Base: ~w, Exp: ~w~n",[Man, Base, Exp]),
+
+    OctExp = if Exp >= 0 -> list_to_binary(encode_integer_pos(Exp, []));
+		true     -> list_to_binary(encode_integer_neg(Exp, []))
+	     end,
+%%    ok = io:format("OctExp: ~w~n",[OctExp]),
+    SignBit = if  Man > 0 -> 0;  % bit 7 is pos or neg, no Zeroval
+		  true -> 1
+	      end,
+%%    ok = io:format("SignBitMask: ~w~n",[SignBitMask]),
+    InBase = if  Base =:= 2 -> 0;   % bit 6,5: only base 2 this far!
+			   true ->
+			       exit({error,{asn1, {encode_real_non_supported_encodeing, Base}}})
+		       end,
+    SFactor = 0,   % bit 4,3: no scaling since only base 2
+    OctExpLen = size(OctExp),
+    if OctExpLen > 255 ->
+	    exit({error,{asn1, {to_big_exp_in_encode_real, OctExpLen}}});
+       true  -> true %% make real assert later..
+    end,
+    {LenCode, EOctets} = case OctExpLen of   % bit 2,1
+			     1 -> {0, OctExp};
+			     2 -> {1, OctExp};
+			     3 -> {2, OctExp};
+			     _ -> {3, <<OctExpLen, OctExp/binary>>}
+			 end,
+    FirstOctet = <<1:1,SignBit:1,InBase:2,SFactor:2,LenCode:2>>,
+    OctMantissa = if Man > 0 -> list_to_binary(minimum_octets(Man));
+		     true    -> list_to_binary(minimum_octets(-(Man))) % signbit keeps track of sign
+		  end,
+    %%    ok = io:format("LenMask: ~w EOctets: ~w~nFirstOctet: ~w OctMantissa: ~w OctExpLen: ~w~n", [LenMask, EOctets, FirstOctet, OctMantissa, OctExpLen]),
+    Bin = <<FirstOctet/binary, EOctets/binary, OctMantissa/binary>>,
+    {Bin, size(Bin)}.
+
+
+%%============================================================================
+%% decode real value
+%%
+%% decode_real([OctetBufferList], tuple|value, tag|notag) ->
+%%  {{Mantissa, Base, Exp} | realval | PLUS-INFINITY | MINUS-INFINITY | 0,
+%%     RestBuff}
+%%
+%% only for base 2 decoding sofar!!
+%%============================================================================
+
+decode_real(Tlv, Form, Tags) ->
+    Buffer = match_tags(Tlv,Tags),
+    decode_real_notag(Buffer, Form).
+
+decode_real_notag(_Buffer, _Form) ->
+    exit({error,{asn1, {unimplemented,real}}}).
+%%  decode_real2(Buffer, Form, size(Buffer)).
+
+% decode_real2(Buffer, Form, Len) ->
+%     <<First, Buffer2/binary>> = Buffer,
+%     if
+% 	First =:= 2#01000000 -> {'PLUS-INFINITY', Buffer2};
+% 	First =:= 2#01000001 -> {'MINUS-INFINITY', Buffer2};
+% 	First =:= 2#00000000 -> {0, Buffer2};
+% 	true ->
+% 	    %% have some check here to verify only supported bases (2)
+% 	    <<B7:1,B6:1,B5_4:2,B3_2:2,B1_0:2>> = <<First>>,
+% 		Sign = B6,
+% 	    Base =
+% 		case B5_4 of
+% 		    0 -> 2;  % base 2, only one so far
+% 		    _ -> exit({error,{asn1, {non_supported_base, First}}})
+% 		end,
+% 	    ScalingFactor =
+% 		case B3_2 of
+% 		    0 -> 0;  % no scaling so far
+% 		    _ -> exit({error,{asn1, {non_supported_scaling, First}}})
+% 		end,
+
+% 	    {FirstLen,Exp,Buffer3} =
+% 		case B1_0 of
+% 		    0 ->
+% 			<<_:1/unit:8,Buffer21/binary>> = Buffer2,
+% 			{2, decode_integer2(1, Buffer2),Buffer21};
+% 		    1 ->
+% 			<<_:2/unit:8,Buffer21/binary>> = Buffer2,
+% 			{3, decode_integer2(2, Buffer2)};
+% 		    2 ->
+% 			<<_:3/unit:8,Buffer21/binary>> = Buffer2,
+% 			{4, decode_integer2(3, Buffer2)};
+% 		    3 ->
+% 			<<ExpLen1,RestBuffer/binary>> = Buffer2,
+% 			<<_:ExpLen1/unit:8,RestBuffer2/binary>> = RestBuffer,
+% 			{ ExpLen1 + 2,
+% 			  decode_integer2(ExpLen1, RestBuffer, RemBytes1),
+% 			  RestBuffer2}
+% 		end,
+% 	    Length = Len - FirstLen,
+% 	    <<LongInt:Length/unit:8,RestBuff/binary>> = Buffer3,
+% 	    {Mantissa, Buffer4} =
+% 		if Sign =:= 0 ->
+
+% 			{LongInt, RestBuff};%  sign plus,
+% 		   true ->
+
+% 			{-LongInt, RestBuff}%  sign minus
+% 		end,
+% 	    case Form of
+% 		tuple ->
+% 		    {Val,Buf,RemB} = Exp,
+% 		    {{Mantissa, Base, {Val,Buf}}, Buffer4, RemBytes2+RemBytes3};
+% 		_value ->
+% 		    comming
+% 	    end
+%     end.
+
+
+%%============================================================================
+%% Bitstring value, ITU_T X.690 Chapter 8.6
+%%
+%% encode bitstring value
+%%
+%% bitstring NamedBitList
+%% Val can be  of:
+%% - [identifiers] where only named identifers are set to one,
+%%   the Constraint must then have some information of the
+%%   bitlength.
+%% - [list of ones and zeroes] all bits
+%% - integer value representing the bitlist
+%% C is constrint Len, only valid when identifiers
+%%============================================================================
+
+encode_bit_string(C,Bin={Unused,BinBits},NamedBitList,TagIn) when integer(Unused), binary(BinBits) ->
+    encode_bin_bit_string(C,Bin,NamedBitList,TagIn);
+encode_bit_string(C, [FirstVal | RestVal], NamedBitList, TagIn) when atom(FirstVal) ->
+    encode_bit_string_named(C, [FirstVal | RestVal], NamedBitList, TagIn);
+
+encode_bit_string(C, [{bit,X} | RestVal], NamedBitList, TagIn) ->
+    encode_bit_string_named(C, [{bit,X} | RestVal], NamedBitList, TagIn);
+
+encode_bit_string(C, [FirstVal| RestVal], NamedBitList, TagIn) when integer(FirstVal) ->
+    encode_bit_string_bits(C, [FirstVal | RestVal], NamedBitList, TagIn);
+
+encode_bit_string(_C, 0, _NamedBitList, TagIn) ->
+    encode_tags(TagIn, <<0>>,1);
+
+encode_bit_string(_C, [], _NamedBitList, TagIn) ->
+    encode_tags(TagIn, <<0>>,1);
+
+encode_bit_string(C, IntegerVal, NamedBitList, TagIn) when integer(IntegerVal) ->
+    BitListVal = int_to_bitlist(IntegerVal),
+    encode_bit_string_bits(C, BitListVal, NamedBitList, TagIn);
+
+encode_bit_string(C, {Name,BitList}, NamedBitList, TagIn) when atom(Name) ->
+    encode_bit_string(C, BitList, NamedBitList, TagIn).
+
+
+
+int_to_bitlist(0) ->
+    [];
+int_to_bitlist(Int) when integer(Int), Int >= 0 ->
+    [Int band 1 | int_to_bitlist(Int bsr 1)].
+
+
+%%=================================================================
+%% Encode BIT STRING of the form {Unused,BinBits}.
+%% Unused is the number of unused bits in the last byte in BinBits
+%% and BinBits is a binary representing the BIT STRING.
+%%=================================================================
+encode_bin_bit_string(C,{Unused,BinBits},_NamedBitList,TagIn)->
+    case get_constraint(C,'SizeConstraint') of
+	no ->
+	    remove_unused_then_dotag(TagIn, Unused, BinBits);
+	{_Min,Max} ->
+	    BBLen = (size(BinBits)*8)-Unused,
+	    if
+		BBLen > Max ->
+		    exit({error,{asn1,
+				 {bitstring_length,
+				  {{was,BBLen},{maximum,Max}}}}});
+		true ->
+		    remove_unused_then_dotag(TagIn, Unused, BinBits)
+	    end;
+	Size ->
+	    case ((size(BinBits)*8)-Unused) of
+		BBSize when BBSize =< Size ->
+		    remove_unused_then_dotag(TagIn, Unused, BinBits);
+		BBSize  ->
+		    exit({error,{asn1,
+				 {bitstring_length,
+				  {{was,BBSize},{should_be,Size}}}}})
+	    end
+    end.
+
+remove_unused_then_dotag(TagIn,Unused,BinBits) ->
+    case Unused of
+	0 when (size(BinBits) == 0) ->
+	    encode_tags(TagIn,<<0>>,1);
+	0 ->
+	    Bin = <<Unused,BinBits/binary>>,
+	    encode_tags(TagIn,Bin,size(Bin));
+	Num ->
+	    N = (size(BinBits)-1),
+	    <<BBits:N/binary,LastByte>> = BinBits,
+	    encode_tags(TagIn,
+			[Unused,binary_to_list(BBits) ++[(LastByte bsr Num) bsl Num]],
+			1+size(BinBits))
+    end.
+
+
+%%=================================================================
+%% Encode named bits
+%%=================================================================
+
+encode_bit_string_named(C, [FirstVal | RestVal], NamedBitList, TagIn) ->
+    ToSetPos = get_all_bitposes([FirstVal | RestVal], NamedBitList, []),
+    Size =
+	case get_constraint(C,'SizeConstraint') of
+	    no ->
+		lists:max(ToSetPos)+1;
+	    {_Min,Max} ->
+		Max;
+	    TSize ->
+		TSize
+	end,
+    BitList = make_and_set_list(Size, ToSetPos, 0),
+    {Len, Unused, OctetList} = encode_bitstring(BitList),
+    encode_tags(TagIn, [Unused|OctetList],Len+1).
+
+
+%%----------------------------------------
+%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
+%%   [sorted_list_of_bitpositions_to_set]
+%%----------------------------------------
+
+get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
+    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
+get_all_bitposes([Val | Rest], NamedBitList, Ack) when atom(Val) ->
+    case lists:keysearch(Val, 1, NamedBitList) of
+	{value, {_ValName, ValPos}} ->
+	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
+	_ ->
+	    exit({error,{asn1, {bitstring_namedbit, Val}}})
+    end;
+get_all_bitposes([], _NamedBitList, Ack) ->
+    lists:sort(Ack).
+
+
+%%----------------------------------------
+%% make_and_set_list(Len of list to return, [list of positions to set to 1])->
+%% returns list of Len length, with all in SetPos set.
+%% in positioning in list the first element is 0, the second 1 etc.., but
+%% Len will make a list of length Len, not Len + 1.
+%%    BitList = make_and_set_list(C, ToSetPos, 0),
+%%----------------------------------------
+
+make_and_set_list(0, [], _) -> [];
+make_and_set_list(0, _, _) ->
+    exit({error,{asn1,bitstring_sizeconstraint}});
+make_and_set_list(Len, [XPos|SetPos], XPos) ->
+    [1 | make_and_set_list(Len - 1, SetPos, XPos + 1)];
+make_and_set_list(Len, [Pos|SetPos], XPos) ->
+    [0 | make_and_set_list(Len - 1, [Pos | SetPos], XPos + 1)];
+make_and_set_list(Len, [], XPos) ->
+    [0 | make_and_set_list(Len - 1, [], XPos + 1)].
+
+
+
+
+
+
+%%=================================================================
+%% Encode bit string for lists of ones and zeroes
+%%=================================================================
+encode_bit_string_bits(C, BitListVal, _NamedBitList, TagIn) when list(BitListVal) ->
+    case get_constraint(C,'SizeConstraint') of
+	no ->
+	    {Len, Unused, OctetList} = encode_bitstring(BitListVal),
+	    %%add unused byte to the Len
+	    encode_tags(TagIn, [Unused | OctetList], Len+1);
+	Constr={Min,Max} when integer(Min),integer(Max) ->
+	    encode_constr_bit_str_bits(Constr,BitListVal,TagIn);
+	{Constr={_,_},[]} ->%Constr={Min,Max}
+	    %% constraint with extension mark
+	    encode_constr_bit_str_bits(Constr,BitListVal,TagIn);
+	Constr={{_,_},{_,_}} ->%{{Min1,Max1},{Min2,Max2}}
+	    %% constraint with extension mark
+	    encode_constr_bit_str_bits(Constr,BitListVal,TagIn);
+	Size ->
+	    case length(BitListVal) of
+		BitSize when BitSize == Size ->
+		    {Len, Unused, OctetList} = encode_bitstring(BitListVal),
+		    %%add unused byte to the Len
+		    encode_tags(TagIn, [Unused | OctetList], Len+1);
+		BitSize when BitSize < Size ->
+		    PaddedList = pad_bit_list(Size-BitSize,BitListVal),
+		    {Len, Unused, OctetList} = encode_bitstring(PaddedList),
+		    %%add unused byte to the Len
+		    encode_tags(TagIn, [Unused | OctetList], Len+1);
+		BitSize ->
+		    exit({error,{asn1,
+			  {bitstring_length, {{was,BitSize},{should_be,Size}}}}})
+	    end
+
+    end.
+
+encode_constr_bit_str_bits({_Min,Max},BitListVal,TagIn) ->
+    BitLen = length(BitListVal),
+    if
+	BitLen > Max ->
+	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
+						 {maximum,Max}}}}});
+	true ->
+	    {Len, Unused, OctetList} = encode_bitstring(BitListVal),
+	    %%add unused byte to the Len
+	    encode_tags(TagIn, [Unused, OctetList], Len+1)
+    end;
+encode_constr_bit_str_bits({{_Min1,Max1},{Min2,Max2}},BitListVal,TagIn) ->
+    BitLen = length(BitListVal),
+    case BitLen of
+	Len when Len > Max2 ->
+	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
+						 {maximum,Max2}}}}});
+	Len when Len > Max1, Len < Min2  ->
+	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
+						 {not_allowed_interval,
+						  Max1,Min2}}}}});
+	_ ->
+	    {Len, Unused, OctetList} = encode_bitstring(BitListVal),
+	    %%add unused byte to the Len
+	    encode_tags(TagIn, [Unused, OctetList], Len+1)
+    end.
+
+%% returns a list of length Size + length(BitListVal), with BitListVal
+%% as the most significant elements followed by padded zero elements
+pad_bit_list(Size,BitListVal) ->
+    Tail = lists:duplicate(Size,0),
+    lists:append(BitListVal,Tail).
+
+%%=================================================================
+%% Do the actual encoding
+%%     ([bitlist]) -> {ListLen, UnusedBits, OctetList}
+%%=================================================================
+
+encode_bitstring([B8, B7, B6, B5, B4, B3, B2, B1 | Rest]) ->
+    Val = (B8 bsl 7) bor (B7 bsl 6) bor (B6 bsl 5) bor (B5 bsl 4) bor
+	(B4 bsl 3) bor (B3 bsl 2) bor (B2 bsl 1) bor B1,
+    encode_bitstring(Rest, [Val], 1);
+encode_bitstring(Val) ->
+    {Unused, Octet} = unused_bitlist(Val, 7, 0),
+    {1, Unused, [Octet]}.
+
+encode_bitstring([B8, B7, B6, B5, B4, B3, B2, B1 | Rest], Ack, Len) ->
+    Val = (B8 bsl 7) bor (B7 bsl 6) bor (B6 bsl 5) bor (B5 bsl 4) bor
+	(B4 bsl 3) bor (B3 bsl 2) bor (B2 bsl 1) bor B1,
+    encode_bitstring(Rest, [Ack | [Val]], Len + 1);
+%%even multiple of 8 bits..
+encode_bitstring([], Ack, Len) ->
+    {Len, 0, Ack};
+%% unused bits in last octet
+encode_bitstring(Rest, Ack, Len) ->
+%    io:format("uneven ~w ~w ~w~n",[Rest, Ack, Len]),
+    {Unused, Val} = unused_bitlist(Rest, 7, 0),
+    {Len + 1, Unused, [Ack | [Val]]}.
+
+%%%%%%%%%%%%%%%%%%
+%% unused_bitlist([list of ones and zeros <= 7], 7, []) ->
+%%  {Unused bits, Last octet with bits moved to right}
+unused_bitlist([], Trail, Ack) ->
+    {Trail + 1, Ack};
+unused_bitlist([Bit | Rest], Trail, Ack) ->
+%%    io:format("trail Bit: ~w Rest: ~w Trail: ~w Ack:~w~n",[Bit, Rest, Trail, Ack]),
+    unused_bitlist(Rest, Trail - 1, (Bit bsl Trail) bor Ack).
+
+
+%%============================================================================
+%% decode bitstring value
+%%    (Buffer, Range, NamedNumberList, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}
+%%============================================================================
+
+decode_compact_bit_string(Buffer, Range, NamedNumberList, Tags) ->
+%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_BIT_STRING}),
+     decode_restricted_string(Buffer, Range, ?N_BIT_STRING, Tags,
+			     NamedNumberList,bin).
+
+decode_bit_string(Buffer, Range, NamedNumberList, Tags) ->
+%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_BIT_STRING}),
+    decode_restricted_string(Buffer, Range, ?N_BIT_STRING, Tags,
+			     NamedNumberList,old).
+
+
+decode_bit_string2(<<0>>,_NamedNumberList,BinOrOld) ->
+    case BinOrOld of
+	bin ->
+	    {0,<<>>};
+	_ ->
+	    []
+    end;
+decode_bit_string2(<<Unused,Bits/binary>>,NamedNumberList,BinOrOld) ->
+    case NamedNumberList of
+	[] ->
+	    case BinOrOld of
+		bin ->
+		    {Unused,Bits};
+		_ ->
+		    decode_bitstring2(size(Bits), Unused, Bits)
+	    end;
+	_ ->
+	    BitString = decode_bitstring2(size(Bits), Unused, Bits),
+	    decode_bitstring_NNL(BitString,NamedNumberList)
+    end.
+
+%%----------------------------------------
+%% Decode the in buffer to bits
+%%----------------------------------------
+decode_bitstring2(1,Unused,<<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,_/binary>>) ->
+    lists:sublist([B7,B6,B5,B4,B3,B2,B1,B0],8-Unused);
+decode_bitstring2(Len, Unused,
+		  <<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Buffer/binary>>) ->
+    [B7, B6, B5, B4, B3, B2, B1, B0 |
+     decode_bitstring2(Len - 1, Unused, Buffer)].
+
+%%decode_bitstring2(1, Unused, Buffer) ->
+%%    make_bits_of_int(hd(Buffer), 128, 8-Unused);
+%%decode_bitstring2(Len, Unused, [BitVal | Buffer]) ->
+%%    [B7, B6, B5, B4, B3, B2, B1, B0] = make_bits_of_int(BitVal, 128, 8),
+%%    [B7, B6, B5, B4, B3, B2, B1, B0 |
+%%     decode_bitstring2(Len - 1, Unused, Buffer)].
+
+
+%%make_bits_of_int(_, _, 0) ->
+%%    [];
+%%make_bits_of_int(BitVal, MaskVal, Unused) when Unused > 0 ->
+%%    X = case MaskVal band BitVal of
+%%	    0 -> 0 ;
+%%	    _ -> 1
+%%	end,
+%%    [X | make_bits_of_int(BitVal, MaskVal bsr 1, Unused - 1)].
+
+
+
+%%----------------------------------------
+%% Decode the bitlist to names
+%%----------------------------------------
+
+
+decode_bitstring_NNL(BitList,NamedNumberList) ->
+    decode_bitstring_NNL(BitList,NamedNumberList,0,[]).
+
+
+decode_bitstring_NNL([],_,_No,Result) ->
+    lists:reverse(Result);
+
+decode_bitstring_NNL([B|BitList],[{Name,No}|NamedNumberList],No,Result) ->
+    if
+	B == 0 ->
+	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,Result);
+	true ->
+	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,[Name|Result])
+    end;
+decode_bitstring_NNL([1|BitList],NamedNumberList,No,Result) ->
+	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,[{bit,No}|Result]);
+decode_bitstring_NNL([0|BitList],NamedNumberList,No,Result) ->
+	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,Result).
+
+
+%%============================================================================
+%% Octet string, ITU_T X.690 Chapter 8.7
+%%
+%% encode octet string
+%% The OctetList must be a flat list of integers in the range 0..255
+%% the function does not check this because it takes to much time
+%%============================================================================
+encode_octet_string(_C, OctetList, TagIn) when binary(OctetList) ->
+    encode_tags(TagIn, OctetList, size(OctetList));
+encode_octet_string(_C, OctetList, TagIn) when list(OctetList) ->
+    encode_tags(TagIn, OctetList, length(OctetList));
+encode_octet_string(C, {Name,OctetList}, TagIn) when atom(Name) ->
+    encode_octet_string(C, OctetList, TagIn).
+
+
+%%============================================================================
+%% decode octet string
+%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
+%%
+%% Octet string is decoded as a restricted string
+%%============================================================================
+decode_octet_string(Buffer, Range, Tags) ->
+%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_OCTET_STRING}),
+    decode_restricted_string(Buffer, Range, ?N_OCTET_STRING,
+			     Tags, [], old).
+
+%%============================================================================
+%% Null value, ITU_T X.690 Chapter 8.8
+%%
+%% encode NULL value
+%%============================================================================
+
+encode_null({Name, _Val}, TagIn) when atom(Name) ->
+    encode_tags(TagIn, [], 0);
+encode_null(_Val, TagIn) ->
+    encode_tags(TagIn, [], 0).
+
+%%============================================================================
+%% decode NULL value
+%%    (Buffer, HasTag, TotalLen) -> {NULL, Remain, RemovedBytes}
+%%============================================================================
+
+decode_null(Tlv, Tags) ->
+    Val = match_tags(Tlv, Tags),
+    case Val of
+	<<>> ->
+	    'NULL';
+	_ ->
+	    exit({error,{asn1,{decode_null,Val}}})
+	end.
+
+%%============================================================================
+%% Object identifier, ITU_T X.690 Chapter 8.19
+%%
+%% encode Object Identifier value
+%%============================================================================
+
+encode_object_identifier({Name,Val}, TagIn) when atom(Name) ->
+    encode_object_identifier(Val, TagIn);
+encode_object_identifier(Val, TagIn) ->
+    encode_tags(TagIn, e_object_identifier(Val)).
+
+e_object_identifier({'OBJECT IDENTIFIER', V}) ->
+    e_object_identifier(V);
+e_object_identifier({Cname, V}) when atom(Cname), tuple(V) ->
+    e_object_identifier(tuple_to_list(V));
+e_object_identifier({Cname, V}) when atom(Cname), list(V) ->
+    e_object_identifier(V);
+e_object_identifier(V) when tuple(V) ->
+    e_object_identifier(tuple_to_list(V));
+
+%%%%%%%%%%%%%%%
+%% e_object_identifier([List of Obect Identifiers]) ->
+%% {[Encoded Octetlist of ObjIds], IntLength}
+%%
+e_object_identifier([E1, E2 | Tail]) ->
+    Head = 40*E1 + E2,  % wow!
+    {H,Lh} = mk_object_val(Head),
+    {R,Lr} = enc_obj_id_tail(Tail, [], 0),
+    {[H|R], Lh+Lr}.
+
+enc_obj_id_tail([], Ack, Len) ->
+    {lists:reverse(Ack), Len};
+enc_obj_id_tail([H|T], Ack, Len) ->
+    {B, L} = mk_object_val(H),
+    enc_obj_id_tail(T, [B|Ack], Len+L).
+
+%% e_object_identifier([List of Obect Identifiers]) ->
+%% {[Encoded Octetlist of ObjIds], IntLength}
+%%
+%%e_object_identifier([E1, E2 | Tail]) ->
+%%    Head = 40*E1 + E2,  % wow!
+%%    F = fun(Val, AckLen) ->
+%%		{L, Ack} = mk_object_val(Val),
+%%		{L, Ack + AckLen}
+%%	end,
+%%    {Octets, Len} = lists:mapfoldl(F, 0, [Head | Tail]).
+
+%%%%%%%%%%%
+%% mk_object_val(Value) -> {OctetList, Len}
+%% returns a Val as a list of octets, the 8 bit is allways set to one except
+%% for the last octet, where its 0
+%%
+
+
+mk_object_val(Val) when Val =< 127 ->
+    {[255 band Val], 1};
+mk_object_val(Val) ->
+    mk_object_val(Val bsr 7, [Val band 127], 1).
+mk_object_val(0, Ack, Len) ->
+    {Ack, Len};
+mk_object_val(Val, Ack, Len) ->
+    mk_object_val(Val bsr 7, [((Val band 127) bor 128) | Ack], Len + 1).
+
+
+
+%%============================================================================
+%% decode Object Identifier value
+%%    (Buffer, HasTag, TotalLen) -> {{ObjId}, Remain, RemovedBytes}
+%%============================================================================
+
+decode_object_identifier(Tlv, Tags) ->
+    Val = match_tags(Tlv, Tags),
+    [AddedObjVal|ObjVals] = dec_subidentifiers(Val,0,[]),
+    {Val1, Val2} = if
+		       AddedObjVal < 40 ->
+			   {0, AddedObjVal};
+		       AddedObjVal < 80 ->
+			   {1, AddedObjVal - 40};
+		       true ->
+			   {2, AddedObjVal - 80}
+		   end,
+    list_to_tuple([Val1, Val2 | ObjVals]).
+
+dec_subidentifiers(<<>>,_Av,Al) ->
+    lists:reverse(Al);
+dec_subidentifiers(<<1:1,H:7,T/binary>>,Av,Al) ->
+    dec_subidentifiers(T,(Av bsl 7) + H,Al);
+dec_subidentifiers(<<H,T/binary>>,Av,Al) ->
+    dec_subidentifiers(T,0,[((Av bsl 7) + H)|Al]).
+
+
+%%============================================================================
+%% Restricted character string types, ITU_T X.690 Chapter 8.20
+%%
+%% encode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings
+%%============================================================================
+%% The StringType arg is kept for future use but might be removed
+encode_restricted_string(_C, OctetList, _StringType, TagIn)
+  when binary(OctetList) ->
+    encode_tags(TagIn, OctetList, size(OctetList));
+encode_restricted_string(_C, OctetList, _StringType, TagIn)
+  when list(OctetList) ->
+    encode_tags(TagIn, OctetList, length(OctetList));
+encode_restricted_string(C,{Name,OctetL}, StringType, TagIn) when atom(Name)->
+    encode_restricted_string(C, OctetL, StringType, TagIn).
+
+%%============================================================================
+%% decode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings
+%%    (Buffer, Range, StringType, HasTag, TotalLen) ->
+%%                                  {String, Remain, RemovedBytes}
+%%============================================================================
+
+decode_restricted_string(Buffer, Range, StringType, Tags) ->
+	decode_restricted_string(Buffer, Range, StringType, Tags, [], old).
+
+
+decode_restricted_string(Tlv, Range, StringType, TagsIn,
+			 NamedNumberList, BinOrOld) ->
+    Val = match_tags(Tlv, TagsIn),
+    Val2 =
+	case Val of
+	    PartList = [_H|_T] -> % constructed val
+		Bin = collect_parts(PartList),
+		decode_restricted(Bin, StringType,
+				      NamedNumberList, BinOrOld);
+	    Bin ->
+		decode_restricted(Bin, StringType,
+				      NamedNumberList, BinOrOld)
+	end,
+    check_and_convert_restricted_string(Val2,StringType,Range,NamedNumberList,BinOrOld).
+
+
+
+% 	case StringType of
+% 	    ?N_BIT_STRING when BinOrOld == bin ->
+% 		{concat_bit_binaries(AccVal, Val), AccRb+Rb};
+% 	    _ when binary(Val),binary(AccVal) ->
+% 		{<<AccVal/binary,Val/binary>>,AccRb+Rb};
+% 	    _ when binary(Val), AccVal==[] ->
+% 		{Val,AccRb+Rb};
+% 	    _ ->
+% 		{AccVal++Val, AccRb+Rb}
+% 	end,
+
+
+
+decode_restricted(Bin, StringType, NamedNumberList,BinOrOld) ->
+	case StringType of
+	    ?N_BIT_STRING ->
+		decode_bit_string2(Bin, NamedNumberList, BinOrOld);
+	    ?N_UniversalString ->
+		mk_universal_string(binary_to_list(Bin));
+	    ?N_BMPString ->
+		mk_BMP_string(binary_to_list(Bin));
+	    _ ->
+		Bin
+	end.
+
+
+check_and_convert_restricted_string(Val,StringType,Range,NamedNumberList,_BinOrOld) ->
+    {StrLen,NewVal} = case StringType of
+			  ?N_BIT_STRING when NamedNumberList /= [] ->
+			      {no_check,Val};
+			  ?N_BIT_STRING when list(Val) ->
+			      {length(Val),Val};
+			  ?N_BIT_STRING when tuple(Val) ->
+			      {(size(element(2,Val))*8) - element(1,Val),Val};
+			  _ when binary(Val) ->
+			      {size(Val),binary_to_list(Val)};
+			  _ when list(Val) ->
+			      {length(Val), Val}
+		      end,
+    case Range of
+	_ when StrLen == no_check ->
+	    NewVal;
+	[] -> % No length constraint
+	    NewVal;
+	{Lb,Ub} when StrLen >= Lb, Ub >= StrLen -> % variable length constraint
+	    NewVal;
+	{{Lb,_Ub},[]} when StrLen >= Lb ->
+	    NewVal;
+	{{Lb1,Ub1},{Lb2,Ub2}} when StrLen >= Lb1, StrLen =< Ub1;
+				   StrLen =< Ub2, StrLen >= Lb2 ->
+	    NewVal;
+	StrLen -> % fixed length constraint
+	    NewVal;
+	{_,_} ->
+	    exit({error,{asn1,{length,Range,Val}}});
+	_Len when integer(_Len) ->
+	    exit({error,{asn1,{length,Range,Val}}});
+	_ -> % some strange constraint that we don't support yet
+	    NewVal
+    end.
+
+
+%%============================================================================
+%% encode Universal string
+%%============================================================================
+
+encode_universal_string(C, {Name, Universal}, TagIn) when atom(Name) ->
+    encode_universal_string(C, Universal, TagIn);
+encode_universal_string(_C, Universal, TagIn) ->
+    OctetList = mk_uni_list(Universal),
+    encode_tags(TagIn, OctetList, length(OctetList)).
+
+mk_uni_list(In) ->
+    mk_uni_list(In,[]).
+
+mk_uni_list([],List) ->
+    lists:reverse(List);
+mk_uni_list([{A,B,C,D}|T],List) ->
+    mk_uni_list(T,[D,C,B,A|List]);
+mk_uni_list([H|T],List) ->
+    mk_uni_list(T,[H,0,0,0|List]).
+
+%%===========================================================================
+%% decode Universal strings
+%%    (Buffer, Range, StringType, HasTag, LenIn) ->
+%%                           {String, Remain, RemovedBytes}
+%%===========================================================================
+
+decode_universal_string(Buffer, Range, Tags) ->
+    decode_restricted_string(Buffer, Range, ?N_UniversalString,
+			     Tags, [], old).
+
+
+mk_universal_string(In) ->
+    mk_universal_string(In,[]).
+
+mk_universal_string([],Acc) ->
+    lists:reverse(Acc);
+mk_universal_string([0,0,0,D|T],Acc) ->
+    mk_universal_string(T,[D|Acc]);
+mk_universal_string([A,B,C,D|T],Acc) ->
+    mk_universal_string(T,[{A,B,C,D}|Acc]).
+
+
+%%============================================================================
+%% encode BMP string
+%%============================================================================
+
+encode_BMP_string(C, {Name,BMPString}, TagIn) when atom(Name)->
+    encode_BMP_string(C, BMPString, TagIn);
+encode_BMP_string(_C, BMPString, TagIn) ->
+    OctetList = mk_BMP_list(BMPString),
+    encode_tags(TagIn, OctetList, length(OctetList)).
+
+mk_BMP_list(In) ->
+    mk_BMP_list(In,[]).
+
+mk_BMP_list([],List) ->
+    lists:reverse(List);
+mk_BMP_list([{0,0,C,D}|T],List) ->
+    mk_BMP_list(T,[D,C|List]);
+mk_BMP_list([H|T],List) ->
+    mk_BMP_list(T,[H,0|List]).
+
+%%============================================================================
+%% decode (OctetList, Range(ignored), tag|notag) -> {ValList, RestList}
+%%    (Buffer, Range, StringType, HasTag, TotalLen) ->
+%%                               {String, Remain, RemovedBytes}
+%%============================================================================
+decode_BMP_string(Buffer, Range, Tags) ->
+    decode_restricted_string(Buffer, Range, ?N_BMPString,
+			     Tags, [], old).
+
+mk_BMP_string(In) ->
+    mk_BMP_string(In,[]).
+
+mk_BMP_string([],US) ->
+    lists:reverse(US);
+mk_BMP_string([0,B|T],US) ->
+    mk_BMP_string(T,[B|US]);
+mk_BMP_string([C,D|T],US) ->
+    mk_BMP_string(T,[{0,0,C,D}|US]).
+
+
+%%============================================================================
+%% Generalized time, ITU_T X.680 Chapter 39
+%%
+%% encode Generalized time
+%%============================================================================
+
+encode_generalized_time(C, {Name,OctetList}, TagIn) when atom(Name) ->
+    encode_generalized_time(C, OctetList, TagIn);
+encode_generalized_time(_C, OctetList, TagIn) ->
+    encode_tags(TagIn, OctetList, length(OctetList)).
+
+%%============================================================================
+%% decode Generalized time
+%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
+%%============================================================================
+
+decode_generalized_time(Tlv, _Range, Tags) ->
+    Val = match_tags(Tlv, Tags),
+    NewVal = case Val of
+		 PartList = [_H|_T] -> % constructed
+		     collect_parts(PartList);
+		 Bin ->
+		     Bin
+	     end,
+    binary_to_list(NewVal).
+
+%%============================================================================
+%% Universal time, ITU_T X.680 Chapter 40
+%%
+%% encode UTC time
+%%============================================================================
+
+encode_utc_time(C, {Name,OctetList}, TagIn) when atom(Name) ->
+    encode_utc_time(C, OctetList, TagIn);
+encode_utc_time(_C, OctetList, TagIn) ->
+    encode_tags(TagIn, OctetList, length(OctetList)).
+
+%%============================================================================
+%% decode UTC time
+%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
+%%============================================================================
+
+decode_utc_time(Tlv, _Range, Tags) ->
+    Val = match_tags(Tlv, Tags),
+    NewVal = case Val of
+		 PartList = [_H|_T] -> % constructed
+		     collect_parts(PartList);
+		 Bin ->
+		     Bin
+	     end,
+    binary_to_list(NewVal).
+
+
+%%============================================================================
+%% Length handling
+%%
+%% Encode length
+%%
+%% encode_length(Int | indefinite) ->
+%%          [<127]| [128 + Int (<127),OctetList] | [16#80]
+%%============================================================================
+
+encode_length(indefinite) ->
+    {[16#80],1}; % 128
+encode_length(L) when L =< 16#7F ->
+    {[L],1};
+encode_length(L) ->
+    Oct = minimum_octets(L),
+    Len = length(Oct),
+    if
+	Len =< 126 ->
+	    {[ (16#80+Len) | Oct ],Len+1};
+	true ->
+	    exit({error,{asn1, to_long_length_oct, Len}})
+    end.
+
+
+%% Val must be >= 0
+minimum_octets(Val) ->
+    minimum_octets(Val,[]).
+
+minimum_octets(0,Acc) ->
+    Acc;
+minimum_octets(Val, Acc) ->
+    minimum_octets((Val bsr 8),[Val band 16#FF | Acc]).
+
+
+%%===========================================================================
+%% Decode length
+%%
+%% decode_length(OctetList) -> {{indefinite, RestOctetsL}, NoRemovedBytes} |
+%%                             {{Length, RestOctetsL}, NoRemovedBytes}
+%%===========================================================================
+
+decode_length(<<1:1,0:7,T/binary>>) ->
+    {indefinite, T};
+decode_length(<<0:1,Length:7,T/binary>>) ->
+    {Length,T};
+decode_length(<<1:1,LL:7,T/binary>>) ->
+    <<Length:LL/unit:8,Rest/binary>> = T,
+    {Length,Rest}.
+
+
+
+%%-------------------------------------------------------------------------
+%% INTERNAL HELPER FUNCTIONS (not exported)
+%%-------------------------------------------------------------------------
+
+
+%% decoding postitive integer values.
+decode_integer2(Len,Bin = <<0:1,_:7,_Bs/binary>>) ->
+    <<Int:Len/unit:8>> = Bin,
+    Int;
+%% decoding negative integer values.
+decode_integer2(Len,<<1:1,B2:7,Bs/binary>>)  ->
+    <<N:Len/unit:8>> = <<B2,Bs/binary>>,
+    Int = N - (1 bsl (8 * Len - 1)),
+    Int.
+
+get_constraint(C,Key) ->
+    case lists:keysearch(Key,1,C) of
+	false ->
+	     no;
+	{value,{_,V}} ->
+	    V
+    end.
+
+collect_parts(TlvList) ->
+    collect_parts(TlvList,[]).
+
+collect_parts([{_,L}|Rest],Acc) when list(L) ->
+    collect_parts(Rest,[collect_parts(L)|Acc]);
+collect_parts([{?N_BIT_STRING,<<Unused,Bits/binary>>}|Rest],_Acc) ->
+    collect_parts_bit(Rest,[Bits],Unused);
+collect_parts([{_T,V}|Rest],Acc) ->
+    collect_parts(Rest,[V|Acc]);
+collect_parts([],Acc) ->
+    list_to_binary(lists:reverse(Acc)).
+
+collect_parts_bit([{?N_BIT_STRING,<<Unused,Bits/binary>>}|Rest],Acc,Uacc) ->
+    collect_parts_bit(Rest,[Bits|Acc],Unused+Uacc);
+collect_parts_bit([],Acc,Uacc) ->
+    list_to_binary([Uacc|lists:reverse(Acc)]).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_check.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_check.erl
new file mode 100644
index 0000000000..cfda8a2a88
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_check.erl
@@ -0,0 +1,333 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1rt_check.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+-module(asn1rt_check).
+
+-include("asn1_records.hrl").
+
+-export([check_bool/2,
+	 check_int/3,
+	 check_bitstring/3,
+	 check_octetstring/2,
+	 check_null/2,
+	 check_objectidentifier/2,
+	 check_objectdescriptor/2,
+	 check_real/2,
+	 check_enum/3,
+	 check_restrictedstring/2]).
+
+-export([transform_to_EXTERNAL1990/1,
+	 transform_to_EXTERNAL1994/1]).
+
+
+check_bool(_Bool,asn1_DEFAULT) ->
+    true;
+check_bool(Bool,Bool) when Bool == true; Bool == false ->
+    true;
+check_bool(_Bool1,Bool2) ->
+    throw({error,Bool2}).
+
+check_int(_,asn1_DEFAULT,_) ->
+    true;
+check_int(Value,Value,_) when integer(Value) ->
+    true;
+check_int(DefValue,Value,NNL) when atom(Value) ->
+    case lists:keysearch(Value,1,NNL) of
+	{value,{_,DefValue}} ->
+	    true;
+	_ ->
+	    throw({error,DefValue})
+    end;
+check_int(DefaultValue,_Value,_) ->
+    throw({error,DefaultValue}).
+
+% check_bitstring([H|T],[H|T],_) when integer(H) ->
+%     true;
+% check_bitstring(V,V,_) when integer(V) ->
+%     true;
+%% Two equal lists or integers
+check_bitstring(_,asn1_DEFAULT,_) ->
+    true;
+check_bitstring(V,V,_) ->
+    true;
+%% Default value as a list of 1 and 0 and user value as an integer
+check_bitstring(L=[H|T],Int,_) when integer(Int),integer(H) ->
+    case bit_list_to_int(L,length(T)) of
+	Int -> true;
+	_ -> throw({error,L,Int})
+    end;
+%% Default value as an integer, val as list
+check_bitstring(Int,Val,NBL) when integer(Int),list(Val) ->
+    BL = int_to_bit_list(Int,[],length(Val)),
+    check_bitstring(BL,Val,NBL);
+%% Default value and user value as lists of ones and zeros
+check_bitstring(L1=[H1|_T1],L2=[H2|_T2],NBL=[_H|_T]) when integer(H1),integer(H2) ->
+    L2new = remove_trailing_zeros(L2),
+    check_bitstring(L1,L2new,NBL);
+%% Default value as a list of 1 and 0 and user value as a list of atoms
+check_bitstring(L1=[H1|_T1],L2=[H2|_T2],NBL) when integer(H1),atom(H2) ->
+    case bit_list_to_nbl(L1,NBL,0,[]) of
+	L3 -> check_bitstring(L3,L2,NBL);
+	_ -> throw({error,L2})
+    end;
+%% Both default value and user value as a list of atoms
+check_bitstring(L1=[H1|T1],L2=[H2|_T2],_) when atom(H1),atom(H2) ->
+    length(L1) == length(L2),
+    case lists:member(H1,L2) of
+	true ->
+	    check_bitstring1(T1,L2);
+	false -> throw({error,L2})
+    end;
+%% Default value as a list of atoms and user value as a list of 1 and 0
+check_bitstring(L1=[H1|_T1],L2=[H2|_T2],NBL) when atom(H1),integer(H2) ->
+    case bit_list_to_nbl(L2,NBL,0,[]) of
+	L3 ->
+	    check_bitstring(L1,L3,NBL);
+	_ -> throw({error,L2})
+    end;
+%% User value in compact format
+check_bitstring(DefVal,CBS={_,_},NBL) ->
+    NewVal = cbs_to_bit_list(CBS),
+    check_bitstring(DefVal,NewVal,NBL);
+check_bitstring(DV,V,_) ->
+    throw({error,DV,V}).
+
+
+bit_list_to_int([0|Bs],ShL)->
+    bit_list_to_int(Bs,ShL-1) + 0;
+bit_list_to_int([1|Bs],ShL) ->
+    bit_list_to_int(Bs,ShL-1) + (1 bsl ShL);
+bit_list_to_int([],_) ->
+    0.
+
+int_to_bit_list(0,Acc,0) ->
+    Acc;
+int_to_bit_list(Int,Acc,Len) ->
+    int_to_bit_list(Int bsr 1,[Int band 1|Acc],Len - 1).
+
+bit_list_to_nbl([0|T],NBL,Pos,Acc) ->
+    bit_list_to_nbl(T,NBL,Pos+1,Acc);
+bit_list_to_nbl([1|T],NBL,Pos,Acc) ->
+    case lists:keysearch(Pos,2,NBL) of
+	{value,{N,_}} ->
+	    bit_list_to_nbl(T,NBL,Pos+1,[N|Acc]);
+	_ ->
+	    throw({error,{no,named,element,at,pos,Pos}})
+    end;
+bit_list_to_nbl([],_,_,Acc) ->
+    Acc.
+
+remove_trailing_zeros(L2) ->
+    remove_trailing_zeros1(lists:reverse(L2)).
+remove_trailing_zeros1(L) ->
+    lists:reverse(lists:dropwhile(fun(0)->true;
+				     (_) ->false
+				  end,
+				  L)).
+
+check_bitstring1([H|T],NBL) ->
+    case lists:member(H,NBL) of
+	true ->
+	    check_bitstring1(T,NBL);
+	V -> throw({error,V})
+    end;
+check_bitstring1([],_) ->
+    true.
+
+cbs_to_bit_list({Unused,<<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Rest/binary>>}) when size(Rest) >= 1 ->
+    [B7,B6,B5,B4,B3,B2,B1,B0|cbs_to_bit_list({Unused,Rest})];
+cbs_to_bit_list({0,<<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1>>}) ->
+    [B7,B6,B5,B4,B3,B2,B1,B0];
+cbs_to_bit_list({Unused,Bin}) when size(Bin) == 1 ->
+    Used = 8-Unused,
+    <<Int:Used,_:Unused>> = Bin,
+    int_to_bit_list(Int,[],Used).
+
+
+check_octetstring(_,asn1_DEFAULT) ->
+    true;
+check_octetstring(L,L) ->
+    true;
+check_octetstring(L,Int) when list(L),integer(Int) ->
+    case integer_to_octetlist(Int) of
+	L -> true;
+	V -> throw({error,V})
+    end;
+check_octetstring(_,V) ->
+    throw({error,V}).
+
+integer_to_octetlist(Int) ->
+    integer_to_octetlist(Int,[]).
+integer_to_octetlist(0,Acc) ->
+    Acc;
+integer_to_octetlist(Int,Acc) ->
+    integer_to_octetlist(Int bsr 8,[(Int band 255)|Acc]).
+
+check_null(_,asn1_DEFAULT) ->
+    true;
+check_null('NULL','NULL') ->
+    true;
+check_null(_,V) ->
+    throw({error,V}).
+
+check_objectidentifier(_,asn1_DEFAULT) ->
+    true;
+check_objectidentifier(OI,OI) ->
+    true;
+check_objectidentifier(DOI,OI) when tuple(DOI),tuple(OI) ->
+    check_objectidentifier1(tuple_to_list(DOI),tuple_to_list(OI));
+check_objectidentifier(_,OI) ->
+    throw({error,OI}).
+
+check_objectidentifier1([V|Rest1],[V|Rest2]) ->
+    check_objectidentifier1(Rest1,Rest2,V);
+check_objectidentifier1([V1|Rest1],[V2|Rest2]) ->
+    case reserved_objectid(V2,[]) of
+	V1 ->
+	    check_objectidentifier1(Rest1,Rest2,[V1]);
+	V ->
+	    throw({error,V})
+    end.
+check_objectidentifier1([V|Rest1],[V|Rest2],Above) ->
+    check_objectidentifier1(Rest1,Rest2,[V|Above]);
+check_objectidentifier1([V1|Rest1],[V2|Rest2],Above) ->
+    case reserved_objectid(V2,Above) of
+	V1 ->
+	    check_objectidentifier1(Rest1,Rest2,[V1|Above]);
+	V ->
+	    throw({error,V})
+    end;
+check_objectidentifier1([],[],_) ->
+    true;
+check_objectidentifier1(_,V,_) ->
+    throw({error,object,identifier,V}).
+
+%% ITU-T Rec. X.680 Annex B - D
+reserved_objectid('itu-t',[]) -> 0;
+reserved_objectid('ccitt',[]) -> 0;
+%% arcs below "itu-t"
+reserved_objectid('recommendation',[0]) -> 0;
+reserved_objectid('question',[0]) -> 1;
+reserved_objectid('administration',[0]) -> 2;
+reserved_objectid('network-operator',[0]) -> 3;
+reserved_objectid('identified-organization',[0]) -> 4;
+
+reserved_objectid(iso,[]) -> 1;
+%% arcs below "iso", note that number 1 is not used
+reserved_objectid('standard',[1]) -> 0;
+reserved_objectid('member-body',[1]) -> 2;
+reserved_objectid('identified-organization',[1]) -> 3;
+
+reserved_objectid('joint-iso-itu-t',[]) -> 2;
+reserved_objectid('joint-iso-ccitt',[]) -> 2;
+
+reserved_objectid(_,_) -> false.
+
+
+check_objectdescriptor(_,asn1_DEFAULT) ->
+    true;
+check_objectdescriptor(OD,OD) ->
+    true;
+check_objectdescriptor(OD,OD) ->
+    throw({error,{not_implemented_yet,check_objectdescriptor}}).
+
+check_real(_,asn1_DEFAULT) ->
+    true;
+check_real(R,R) ->
+    true;
+check_real(_,_) ->
+    throw({error,{not_implemented_yet,check_real}}).
+
+check_enum(_,asn1_DEFAULT,_) ->
+    true;
+check_enum(Val,Val,_) ->
+    true;
+check_enum(Int,Atom,Enumerations) when integer(Int),atom(Atom) ->
+    case lists:keysearch(Atom,1,Enumerations) of
+	{value,{_,Int}} -> true;
+	_ -> throw({error,{enumerated,Int,Atom}})
+    end;
+check_enum(DefVal,Val,_) ->
+    throw({error,{enumerated,DefVal,Val}}).
+
+
+check_restrictedstring(_,asn1_DEFAULT) ->
+    true;
+check_restrictedstring(Val,Val) ->
+    true;
+check_restrictedstring([V|Rest1],[V|Rest2]) ->
+    check_restrictedstring(Rest1,Rest2);
+check_restrictedstring([V1|Rest1],[V2|Rest2]) ->
+    check_restrictedstring(V1,V2),
+    check_restrictedstring(Rest1,Rest2);
+%% tuple format of value
+check_restrictedstring({V1,V2},[V1,V2]) ->
+    true;
+check_restrictedstring([V1,V2],{V1,V2}) ->
+    true;
+%% quadruple format of value
+check_restrictedstring({V1,V2,V3,V4},[V1,V2,V3,V4]) ->
+    true;
+check_restrictedstring([V1,V2,V3,V4],{V1,V2,V3,V4}) ->
+    true;
+%% character string list
+check_restrictedstring(V1,V2) when list(V1),tuple(V2) ->
+    check_restrictedstring(V1,tuple_to_list(V2));
+check_restrictedstring(V1,V2) ->
+    throw({error,{restricted,string,V1,V2}}).
+
+transform_to_EXTERNAL1990(Val) when tuple(Val),size(Val) == 4 ->
+    transform_to_EXTERNAL1990(tuple_to_list(Val),[]);
+transform_to_EXTERNAL1990(Val) when tuple(Val) ->
+    %% Data already in ASN1 1990 format
+    Val.
+
+transform_to_EXTERNAL1990(['EXTERNAL'|Rest],Acc) ->
+    transform_to_EXTERNAL1990(Rest,['EXTERNAL'|Acc]);
+transform_to_EXTERNAL1990([{syntax,Syntax}|Rest],Acc) ->
+    transform_to_EXTERNAL1990(Rest,[asn1_NOVALUE,Syntax|Acc]);
+transform_to_EXTERNAL1990([{'presentation-context-id',PCid}|Rest],Acc) ->
+    transform_to_EXTERNAL1990(Rest,[PCid,asn1_NOVALUE|Acc]);
+transform_to_EXTERNAL1990([{'context-negotiation',Context_negot}|Rest],Acc) ->
+    {_,Presentation_Cid,Transfer_syntax} = Context_negot,
+    transform_to_EXTERNAL1990(Rest,[Transfer_syntax,Presentation_Cid|Acc]);
+transform_to_EXTERNAL1990([asn1_NOVALUE|Rest],Acc) ->
+    transform_to_EXTERNAL1990(Rest,[asn1_NOVALUE|Acc]);
+transform_to_EXTERNAL1990([Data_val_desc,Data_value],Acc) when list(Data_value)->
+    list_to_tuple(lists:reverse([{'octet-aligned',Data_value},
+				 Data_val_desc|Acc]));
+transform_to_EXTERNAL1990([Data_value],Acc) when list(Data_value)->
+    list_to_tuple(lists:reverse([{'octet-aligned',Data_value}|Acc])).
+
+
+transform_to_EXTERNAL1994(V={'EXTERNAL',DRef,IndRef,Data_v_desc,Encoding}) ->
+    Identification =
+	case {DRef,IndRef} of
+	    {DRef,asn1_NOVALUE} ->
+		{syntax,DRef};
+	    {asn1_NOVALUE,IndRef} ->
+		{'presentation-context-id',IndRef};
+	     _ ->
+		{'context-negotiation',
+		 {'EXTERNAL_identification_context-negotiation',IndRef,DRef}}
+	end,
+    case Encoding of
+	{_,Val} when list(Val) ->
+	    {'EXTERNAL',Identification,Data_v_desc,Val};
+	_  ->
+	    V
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_driver_handler.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_driver_handler.erl
new file mode 100644
index 0000000000..5200f9d2d9
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_driver_handler.erl
@@ -0,0 +1,108 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1rt_driver_handler.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
+%%
+
+-module(asn1rt_driver_handler).
+
+-export([init/1,load_driver/0,unload_driver/0]).
+
+
+load_driver() ->
+    spawn(asn1rt_driver_handler, init, [self()]).
+
+init(From) ->
+    Port=
+	case load_driver("asn1_erl_drv") of
+	    ok ->
+		open_named_port(From);
+	    already_done ->
+		From ! driver_ready;
+	    Error -> % if erl_ddll:load_driver fails
+		erl_ddll:unload_driver("asn1_erl_drv"),
+		From ! Error
+	end,
+    register_and_loop(Port).
+
+load_driver(DriverName) ->
+    case is_driver_loaded(DriverName) of
+	false ->
+	    Dir = filename:join([code:priv_dir(asn1),"lib"]),
+	    erl_ddll:load_driver(Dir,DriverName);
+	true ->
+	    ok
+    end.
+
+
+is_driver_loaded(_Name) ->
+    case whereis(asn1_driver_owner) of
+	undefined ->
+	    false;
+	_ ->
+	    true
+    end.
+
+open_named_port(From) ->
+    case is_port_open(drv_complete) of
+	false ->
+	    case catch open_port({spawn,"asn1_erl_drv"},[]) of
+		{'EXIT',Reason} ->
+		    From ! {port_error,Reason};
+		Port ->
+		    register(drv_complete,Port),
+		    From ! driver_ready,
+		    Port
+	    end;
+	_ ->
+	    From ! driver_ready,
+	    ok
+    end.
+
+is_port_open(Name) ->
+    case whereis(Name) of
+	Port when port(Port) ->
+	    true;
+	_ -> false
+    end.
+
+register_and_loop(Port) when port(Port) ->
+    register(asn1_driver_owner,self()),
+    loop();
+register_and_loop(_) ->
+    ok.
+
+loop() ->
+    receive
+	unload ->
+	    case whereis(drv_complete) of
+		Port when port(Port) ->
+		    port_close(Port);
+		_ -> ok
+	    end,
+	    erl_ddll:unload_driver("asn1_erl_drv"),
+	    ok;
+	_ ->
+	    loop()
+    end.
+
+unload_driver() ->
+    case whereis(asn1_driver_owner) of
+	Pid when pid(Pid) ->
+	    Pid ! unload,
+	    ok;
+	_ ->
+	    ok
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per.erl
new file mode 100644
index 0000000000..4999dde2cc
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per.erl
@@ -0,0 +1,1593 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1rt_per.erl,v 1.1 2008/12/17 09:53:31 mikpe Exp $
+%%
+-module(asn1rt_per).
+
+%% encoding / decoding of PER aligned
+
+-include("asn1_records.hrl").
+
+-export([dec_fixup/3, cindex/3, list_to_record/2]).
+-export([setchoiceext/1, setext/1, fixoptionals/2, fixextensions/2, setoptionals/1,
+	 getext/1, getextension/2, skipextensions/3, getbit/1, getchoice/3 ]).
+-export([getoptionals/3, set_choice/3, encode_integer/2, encode_integer/3  ]).
+-export([decode_integer/2, decode_integer/3, encode_boolean/1,
+	 decode_boolean/1, encode_length/2, decode_length/1, decode_length/2,
+	encode_small_length/1, decode_small_length/1]).
+-export([encode_enumerated/3, decode_enumerated/3,
+	 encode_bit_string/3, decode_bit_string/3  ]).
+-export([encode_octet_string/2, decode_octet_string/2,
+	encode_restricted_string/4, encode_restricted_string/5,
+	decode_restricted_string/4, decode_restricted_string/5,
+	encode_null/1, decode_null/1,
+	encode_object_identifier/1, decode_object_identifier/1,
+	complete/1]).
+
+-export([encode_open_type/2, decode_open_type/2]).
+
+-export([encode_UniversalString/2, decode_UniversalString/2,
+	 encode_PrintableString/2, decode_PrintableString/2,
+	 encode_GeneralString/2, decode_GeneralString/2,
+	 encode_GraphicString/2, decode_GraphicString/2,
+	 encode_TeletexString/2, decode_TeletexString/2,
+	 encode_VideotexString/2, decode_VideotexString/2,
+	 encode_VisibleString/2, decode_VisibleString/2,
+	 encode_BMPString/2, decode_BMPString/2,
+	 encode_IA5String/2, decode_IA5String/2,
+	 encode_NumericString/2, decode_NumericString/2
+	 ]).
+
+
+dec_fixup(Terms,Cnames,RemBytes) ->
+    dec_fixup(Terms,Cnames,RemBytes,[]).
+
+dec_fixup([novalue|T],[_Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,Acc);
+dec_fixup([{_Name,novalue}|T],[_Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,Acc);
+dec_fixup([H|T],[Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,[{Hc,H}|Acc]);
+dec_fixup([],_Cnames,RemBytes,Acc) ->
+    {lists:reverse(Acc),RemBytes}.
+
+cindex(Ix,Val,Cname) ->
+    case element(Ix,Val) of
+	{Cname,Val2} -> Val2;
+	X -> X
+    end.
+
+% converts a list to a record if necessary
+list_to_record(Name,List) when list(List) ->
+    list_to_tuple([Name|List]);
+list_to_record(_Name,Tuple) when tuple(Tuple) ->
+    Tuple.
+
+%%--------------------------------------------------------
+%% setchoiceext(InRootSet) -> [{bit,X}]
+%% X  is set to  1 when InRootSet==false
+%% X  is set to  0 when InRootSet==true
+%%
+setchoiceext(true) ->
+    [{debug,choiceext},{bit,0}];
+setchoiceext(false) ->
+    [{debug,choiceext},{bit,1}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% setext(true|false) ->  CompleteList
+%%
+
+setext(true) ->
+    [{debug,ext},{bit,1}];
+setext(false) ->
+    [{debug,ext},{bit,0}].
+
+fixoptionals(OptList,Val) when tuple(Val) ->
+    fixoptionals(OptList,Val,[]);
+
+fixoptionals(OptList,Val) when list(Val) ->
+    fixoptionals(OptList,Val,1,[],[]).
+
+fixoptionals([],Val,Acc) ->
+    % return {Val,Opt}
+    {Val,lists:reverse(Acc)};
+fixoptionals([{_,Pos}|Ot],Val,Acc) ->
+    case element(Pos+1,Val) of
+	asn1_NOVALUE -> fixoptionals(Ot,Val,[0|Acc]);
+	asn1_DEFAULT -> fixoptionals(Ot,Val,[0|Acc]);
+	_ -> fixoptionals(Ot,Val,[1|Acc])
+    end.
+
+
+%setoptionals(OptList,Val) ->
+%    Vlist = tuple_to_list(Val),
+%    setoptionals(OptList,Vlist,1,[]).
+
+fixoptionals([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) ->
+    fixoptionals(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]);
+fixoptionals([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) ->
+    fixoptionals(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]);
+fixoptionals(O,[Vh|Vt],Pos,Acc1,Acc2) ->
+    fixoptionals(O,Vt,Pos+1,Acc1,[Vh|Acc2]);
+fixoptionals([],[Vh|Vt],Pos,Acc1,Acc2) ->
+    fixoptionals([],Vt,Pos+1,Acc1,[Vh|Acc2]);
+fixoptionals([],[],_,Acc1,Acc2) ->
+    % return {Val,Opt}
+    {list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]),lists:reverse(Acc1)}.
+
+setoptionals([H|T]) ->
+    [{bit,H}|setoptionals(T)];
+setoptionals([]) ->
+    [{debug,optionals}].
+
+getext(Bytes) when tuple(Bytes) ->
+    getbit(Bytes);
+getext(Bytes) when list(Bytes) ->
+    getbit({0,Bytes}).
+
+getextension(0, Bytes) ->
+    {{},Bytes};
+getextension(1, Bytes) ->
+    {Len,Bytes2} = decode_small_length(Bytes),
+    {Blist, Bytes3} = getbits_as_list(Len,Bytes2),
+    {list_to_tuple(Blist),Bytes3}.
+
+fixextensions({ext,ExtPos,ExtNum},Val) ->
+    case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
+	0 -> [];
+	ExtBits ->
+	    [encode_small_length(ExtNum),{bits,ExtNum,ExtBits}]
+    end.
+
+fixextensions(Pos,MaxPos,_,Acc) when Pos >= MaxPos ->
+    Acc;
+fixextensions(Pos,ExtPos,Val,Acc) ->
+    Bit = case catch(element(Pos+1,Val)) of
+	      asn1_NOVALUE ->
+		  0;
+	      asn1_NOEXTVALUE ->
+		  0;
+	      {'EXIT',_} ->
+		  0;
+	      _ ->
+		  1
+	  end,
+    fixextensions(Pos+1,ExtPos,Val,(Acc bsl 1)+Bit).
+
+skipextensions(Bytes,Nr,ExtensionBitPattern) ->
+    case (catch element(Nr,ExtensionBitPattern)) of
+	1 ->
+	    {_,Bytes2} = decode_open_type(Bytes,[]),
+	    skipextensions(Bytes2, Nr+1, ExtensionBitPattern);
+	0 ->
+	    skipextensions(Bytes, Nr+1, ExtensionBitPattern);
+	{'EXIT',_} -> % badarg, no more extensions
+	    Bytes
+    end.
+
+
+getchoice(Bytes,1,0) -> % only 1 alternative is not encoded
+    {0,Bytes};
+getchoice(Bytes,_NumChoices,1) ->
+    decode_small_number(Bytes);
+getchoice(Bytes,NumChoices,0) ->
+    decode_integer(Bytes,[{'ValueRange',{0,NumChoices-1}}]).
+
+getoptionals(Bytes,L,NumComp) when list(L) ->
+    {Blist,Bytes1} = getbits_as_list(length(L),Bytes),
+    {list_to_tuple(comptuple(Blist,L,NumComp,1)),Bytes1}.
+
+comptuple([Bh|Bt],[{_Name,Nr}|T],NumComp,Nr) ->
+    [Bh|comptuple(Bt,T,NumComp-1,Nr+1)];
+comptuple(Bl,[{Name,Tnr}|Tl],NumComp,Nr) ->
+    [0|comptuple(Bl,[{Name,Tnr}|Tl],NumComp-1,Nr+1)];
+comptuple(_B,_L,0,_Nr) ->
+    [];
+comptuple(B,O,N,Nr) ->
+    [0|comptuple(B,O,N-1,Nr+1)].
+
+getbits_as_list(Num,Bytes) ->
+    getbits_as_list(Num,Bytes,[]).
+
+getbits_as_list(0,Bytes,Acc) ->
+    {lists:reverse(Acc),Bytes};
+getbits_as_list(Num,Bytes,Acc) ->
+    {Bit,NewBytes} = getbit(Bytes),
+    getbits_as_list(Num-1,NewBytes,[Bit|Acc]).
+
+getbit(Bytes) ->
+%    io:format("getbit:~p~n",[Bytes]),
+    getbit1(Bytes).
+
+getbit1({7,[H|T]}) ->
+    {H band 1,{0,T}};
+getbit1({Pos,[H|T]}) ->
+    {(H bsr (7-Pos)) band 1,{(Pos+1) rem 8,[H|T]}};
+getbit1(Bytes) when list(Bytes) ->
+    getbit1({0,Bytes}).
+
+%% This could be optimized
+getbits(Buffer,Num) ->
+%    io:format("getbits:Buffer = ~p~nNum=~p~n",[Buffer,Num]),
+    getbits(Buffer,Num,0).
+
+getbits(Buffer,0,Acc) ->
+    {Acc,Buffer};
+getbits(Buffer,Num,Acc) ->
+    {B,NewBuffer} = getbit(Buffer),
+    getbits(NewBuffer,Num-1,B + (Acc bsl 1)).
+
+
+getoctet(Bytes) when list(Bytes) ->
+    getoctet({0,Bytes});
+getoctet(Bytes) ->
+%    io:format("getoctet:Buffer = ~p~n",[Bytes]),
+    getoctet1(Bytes).
+
+getoctet1({0,[H|T]}) ->
+    {H,{0,T}};
+getoctet1({_Pos,[_,H|T]}) ->
+    {H,{0,T}}.
+
+align({0,L}) ->
+    {0,L};
+align({_Pos,[_H|T]}) ->
+    {0,T};
+align(Bytes) ->
+    {0,Bytes}.
+
+getoctets(Buffer,Num) ->
+%    io:format("getoctets:Buffer = ~p~nNum = ~p~n",[Buffer,Num]),
+    getoctets(Buffer,Num,0).
+
+getoctets(Buffer,0,Acc) ->
+    {Acc,Buffer};
+getoctets(Buffer,Num,Acc) ->
+    {Oct,NewBuffer} = getoctet(Buffer),
+    getoctets(NewBuffer,Num-1,(Acc bsl 8)+Oct).
+
+getoctets_as_list(Buffer,Num) ->
+    getoctets_as_list(Buffer,Num,[]).
+
+getoctets_as_list(Buffer,0,Acc) ->
+    {lists:reverse(Acc),Buffer};
+getoctets_as_list(Buffer,Num,Acc) ->
+    {Oct,NewBuffer} = getoctet(Buffer),
+    getoctets_as_list(NewBuffer,Num-1,[Oct|Acc]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% set_choice(Alt,Choices,Altnum) -> ListofBitSettings
+%% Alt = atom()
+%% Altnum = integer() | {integer(),integer()}% number of alternatives
+%% Choices = [atom()] | {[atom()],[atom()]}
+%% When Choices is a tuple the first list is the Rootset and the
+%% second is the Extensions and then Altnum must also be a tuple with the
+%% lengths of the 2 lists
+%%
+set_choice(Alt,{L1,L2},{Len1,_Len2}) ->
+    case set_choice_tag(Alt,L1) of
+	N when integer(N), Len1 > 1 ->
+	    [{bit,0}, % the value is in the root set
+	     encode_integer([{'ValueRange',{0,Len1-1}}],N)];
+	N when integer(N) ->
+	    [{bit,0}]; % no encoding if only 0 or 1 alternative
+	false ->
+	    [{bit,1}, % extension value
+	     case set_choice_tag(Alt,L2) of
+		 N2 when integer(N2) ->
+		     encode_small_number(N2);
+		 false ->
+		     unknown_choice_alt
+	     end]
+    end;
+set_choice(Alt,L,Len) ->
+    case set_choice_tag(Alt,L) of
+	N when integer(N), Len > 1 ->
+	    encode_integer([{'ValueRange',{0,Len-1}}],N);
+	N when integer(N) ->
+	    []; % no encoding if only 0 or 1 alternative
+	false ->
+	    [unknown_choice_alt]
+    end.
+
+set_choice_tag(Alt,Choices) ->
+    set_choice_tag(Alt,Choices,0).
+
+set_choice_tag(Alt,[Alt|_Rest],Tag) ->
+    Tag;
+set_choice_tag(Alt,[_H|Rest],Tag) ->
+    set_choice_tag(Alt,Rest,Tag+1);
+set_choice_tag(_,[],_) ->
+    false.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_open_type(Constraint, Value) -> CompleteList
+%% Value = list of bytes of an already encoded value (the list must be flat)
+%%         | binary
+%% Contraint = not used in this version
+%%
+encode_open_type(_Constraint, Val) when list(Val) ->
+    [encode_length(undefined,length(Val)),align,
+	     {octets,Val}];
+encode_open_type(_Constraint, Val) when binary(Val) ->
+    [encode_length(undefined,size(Val)),align,
+	     {octets,binary_to_list(Val)}].
+%% the binary_to_list is not optimal but compatible with the current solution
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_open_type(Buffer,Constraint) -> Value
+%% Constraint is not used in this version
+%% Buffer = [byte] with PER encoded data
+%% Value = [byte] with decoded data (which must be decoded again as some type)
+%%
+decode_open_type(Bytes, _Constraint) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    Bytes3 = align(Bytes2),
+    getoctets_as_list(Bytes3,Len).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_integer(Constraint,Value,NamedNumberList) -> CompleteList
+%% encode_integer(Constraint,Value) -> CompleteList
+%% encode_integer(Constraint,{Name,Value}) -> CompleteList
+%%
+%%
+encode_integer(C,V,NamedNumberList) when atom(V) ->
+    case lists:keysearch(V,1,NamedNumberList) of
+	{value,{_,NewV}} ->
+	    encode_integer(C,NewV);
+	_ ->
+	    exit({error,{asn1,{namednumber,V}}})
+    end;
+encode_integer(C,V,_NamedNumberList) when integer(V) ->
+    encode_integer(C,V).
+
+encode_integer(C,{Name,Val}) when atom(Name) ->
+    encode_integer(C,Val);
+
+encode_integer({Rc,_Ec},Val) ->
+    case (catch encode_integer(Rc,Val)) of
+	{'EXIT',{error,{asn1,_}}} ->
+	    [{bit,1},encode_unconstrained_number(Val)];
+	Encoded ->
+	    [{bit,0},Encoded]
+    end;
+encode_integer(C,Val ) when list(C) ->
+    case get_constraint(C,'SingleValue') of
+	no ->
+	    encode_integer1(C,Val);
+	V when integer(V),V == Val ->
+	    []; % a type restricted to a single value encodes to nothing
+	V when list(V) ->
+	    case lists:member(Val,V) of
+		true ->
+		    encode_integer1(C,Val);
+		_ ->
+		    exit({error,{asn1,{illegal_value,Val}}})
+	    end;
+	_ ->
+	    exit({error,{asn1,{illegal_value,Val}}})
+    end.
+
+encode_integer1(C, Val) ->
+    case VR = get_constraint(C,'ValueRange') of
+	no ->
+	    encode_unconstrained_number(Val);
+	{Lb,'MAX'} ->
+	    encode_semi_constrained_number(Lb,Val);
+	%% positive with range
+	{Lb,Ub} when Val >= Lb,
+		     Ub >= Val ->
+	    encode_constrained_number(VR,Val)
+    end.
+
+decode_integer(Buffer,Range,NamedNumberList) ->
+    {Val,Buffer2} = decode_integer(Buffer,Range),
+    case lists:keysearch(Val,2,NamedNumberList) of
+	{value,{NewVal,_}} -> {NewVal,Buffer2};
+	_ -> {Val,Buffer2}
+    end.
+
+decode_integer(Buffer,{Rc,_Ec}) ->
+    {Ext,Buffer2} = getext(Buffer),
+    case Ext of
+	0 -> decode_integer(Buffer2,Rc);
+	1 -> decode_unconstrained_number(Buffer2)
+    end;
+decode_integer(Buffer,undefined) ->
+    decode_unconstrained_number(Buffer);
+decode_integer(Buffer,C) ->
+    case get_constraint(C,'SingleValue') of
+	V when integer(V) ->
+	    {V,Buffer};
+	V when list(V) ->
+	    {Val,Buffer2} = decode_integer1(Buffer,C),
+	    case lists:member(Val,V) of
+		true ->
+		    {Val,Buffer2};
+		_ ->
+		    exit({error,{asn1,{illegal_value,Val}}})
+	    end;
+	_ ->
+	    decode_integer1(Buffer,C)
+    end.
+
+decode_integer1(Buffer,C) ->
+    case VR = get_constraint(C,'ValueRange') of
+	no ->
+	    decode_unconstrained_number(Buffer);
+	{Lb, 'MAX'} ->
+	    decode_semi_constrained_number(Buffer,Lb);
+	{_,_} ->
+	    decode_constrained_number(Buffer,VR)
+    end.
+
+% X.691:10.6 Encoding of a normally small non-negative whole number
+% Use this for encoding of CHOICE index if there is an extension marker in
+% the CHOICE
+encode_small_number({Name,Val}) when atom(Name) ->
+    encode_small_number(Val);
+encode_small_number(Val) when Val =< 63 ->
+    [{bit,0},{bits,6,Val}];
+encode_small_number(Val) ->
+    [{bit,1},encode_semi_constrained_number(0,Val)].
+
+decode_small_number(Bytes) ->
+    {Bit,Bytes2} = getbit(Bytes),
+    case Bit of
+	0 ->
+	    getbits(Bytes2,6);
+	1 ->
+	    decode_semi_constrained_number(Bytes2,{0,'MAX'})
+    end.
+
+% X.691:10.7 Encoding of a semi-constrained whole number
+%% might be an optimization encode_semi_constrained_number(0,Val) ->
+encode_semi_constrained_number(C,{Name,Val}) when atom(Name) ->
+    encode_semi_constrained_number(C,Val);
+encode_semi_constrained_number({Lb,'MAX'},Val) ->
+    encode_semi_constrained_number(Lb,Val);
+encode_semi_constrained_number(Lb,Val) ->
+    Val2 = Val - Lb,
+    Octs = eint_positive(Val2),
+    [encode_length(undefined,length(Octs)),{octets,Octs}].
+
+decode_semi_constrained_number(Bytes,{Lb,_}) ->
+    decode_semi_constrained_number(Bytes,Lb);
+decode_semi_constrained_number(Bytes,Lb) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {V,Bytes3} = getoctets(Bytes2,Len),
+    {V+Lb,Bytes3}.
+
+encode_constrained_number(Range,{Name,Val}) when atom(Name) ->
+    encode_constrained_number(Range,Val);
+encode_constrained_number({Lb,Ub},Val) when Val >= Lb, Ub >= Val ->
+    Range = Ub - Lb + 1,
+    Val2 = Val - Lb,
+    if
+	Range  == 2 ->
+	    {bits,1,Val2};
+	Range  =< 4 ->
+	    {bits,2,Val2};
+	Range  =< 8 ->
+	    {bits,3,Val2};
+	Range  =< 16 ->
+	    {bits,4,Val2};
+	Range  =< 32 ->
+	    {bits,5,Val2};
+	Range  =< 64 ->
+	    {bits,6,Val2};
+	Range  =< 128 ->
+	    {bits,7,Val2};
+	Range  =< 255 ->
+	    {bits,8,Val2};
+	Range  =< 256 ->
+	    {octets,1,Val2};
+	Range  =< 65536 ->
+	    {octets,2,Val2};
+	Range =< 16#1000000  ->
+	    Octs = eint_positive(Val2),
+	    [encode_length({1,3},length(Octs)),{octets,Octs}];
+	Range =< 16#100000000  ->
+	    Octs = eint_positive(Val2),
+	    [encode_length({1,4},length(Octs)),{octets,Octs}];
+	Range =< 16#10000000000  ->
+	    Octs = eint_positive(Val2),
+	    [encode_length({1,5},length(Octs)),{octets,Octs}];
+       true  ->
+	    exit({not_supported,{integer_range,Range}})
+    end.
+
+decode_constrained_number(Buffer,{Lb,Ub}) ->
+    Range = Ub - Lb + 1,
+%    Val2 = Val - Lb,
+    {Val,Remain} =
+	if
+	   Range  == 2 ->
+		getbits(Buffer,1);
+	   Range  =< 4 ->
+		getbits(Buffer,2);
+	   Range  =< 8 ->
+		getbits(Buffer,3);
+	   Range  =< 16 ->
+		getbits(Buffer,4);
+	   Range  =< 32 ->
+		getbits(Buffer,5);
+	   Range  =< 64 ->
+		getbits(Buffer,6);
+	   Range  =< 128 ->
+		getbits(Buffer,7);
+	   Range  =< 255 ->
+		getbits(Buffer,8);
+	   Range  =< 256 ->
+		getoctets(Buffer,1);
+	   Range  =< 65536 ->
+		getoctets(Buffer,2);
+	   Range =< 16#1000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,3}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	   Range =< 16#100000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,4}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	   Range =< 16#10000000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,5}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	   true  ->
+		exit({not_supported,{integer_range,Range}})
+	end,
+    {Val+Lb,Remain}.
+
+% X.691:10.8 Encoding of an unconstrained whole number
+
+encode_unconstrained_number(Val) when Val >= 0 ->
+    Oct = eint(Val,[]),
+    [{debug,unconstrained_number},
+     encode_length({0,'MAX'},length(Oct)),
+     {octets,Oct}];
+encode_unconstrained_number(Val) -> % negative
+    Oct = enint(Val,[]),
+    [{debug,unconstrained_number},
+     encode_length({0,'MAX'},length(Oct)),
+     {octets,Oct}].
+
+%% used for positive Values which don't need a sign bit
+eint_positive(Val) ->
+    case eint(Val,[]) of
+	[0,B1|T] ->
+	    [B1|T];
+	T ->
+	    T
+    end.
+
+eint(0, [B|Acc]) when B < 128 ->
+    [B|Acc];
+eint(N, Acc) ->
+    eint(N bsr 8, [N band 16#ff| Acc]).
+
+enint(-1, [B1|T]) when B1 > 127 ->
+    [B1|T];
+enint(N, Acc) ->
+    enint(N bsr 8, [N band 16#ff|Acc]).
+
+%% used for signed positive values
+
+%eint(Val, Ack) ->
+%    X = Val band 255,
+%    Next = Val bsr 8,
+%    if
+%	Next == 0, X >= 127 ->
+%	    [0,X|Ack];
+%	Next == 0 ->
+%	    [X|Ack];
+%	true ->
+%	    eint(Next,[X|Ack])
+%    end.
+
+%%% used for signed negative values
+%enint(Val, Acc) ->
+%    NumOctets = if
+%		    -Val < 16#80 -> 1;
+%		    -Val < 16#8000 ->2;
+%		    -Val < 16#800000 ->3;
+%		    -Val < 16#80000000 ->4;
+%		    -Val < 16#8000000000 ->5;
+%		    -Val < 16#800000000000 ->6;
+%		    -Val < 16#80000000000000 ->7;
+%		    -Val < 16#8000000000000000 ->8;
+%		    -Val < 16#800000000000000000 ->9
+%		end,
+%    enint(Val,Acc,NumOctets).
+
+%enint(Val, Acc,0) ->
+%    Acc;
+%enint(Val, Acc,NumOctets) ->
+%    enint(Val bsr 8,[Val band 255|Acc],NumOctets-1).
+
+
+decode_unconstrained_number(Bytes) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {Ints,Bytes3} = getoctets_as_list(Bytes2,Len),
+    {dec_integer(Ints),Bytes3}.
+
+dec_pos_integer(Ints) ->
+    decpint(Ints, 8 * (length(Ints) - 1)).
+dec_integer(Ints) when hd(Ints) band 255 =< 127 -> %% Positive number
+    decpint(Ints, 8 * (length(Ints) - 1));
+dec_integer(Ints) ->                        %% Negative
+    decnint(Ints,  8 * (length(Ints) - 1)).
+
+decpint([Byte|Tail], Shift) ->
+    (Byte bsl Shift) bor decpint(Tail, Shift-8);
+decpint([], _) -> 0.
+
+decnint([Byte|Tail], Shift) ->
+    (-128 + (Byte band 127) bsl Shift) bor decpint(Tail, Shift-8).
+
+minimum_octets(Val) ->
+    minimum_octets(Val,[]).
+
+minimum_octets(Val,Acc) when Val > 0 ->
+    minimum_octets((Val bsr 8),[Val band 16#FF|Acc]);
+minimum_octets(0,Acc) ->
+    Acc.
+
+
+%% X.691:10.9 Encoding of a length determinant
+%%encode_small_length(undefined,Len) -> % null means no UpperBound
+%%    encode_small_number(Len).
+
+%% X.691:10.9.3.5
+%% X.691:10.9.3.7
+encode_length(undefined,Len) -> % un-constrained
+    if
+	Len < 128 ->
+	    {octet,Len band 16#7F};
+	Len < 16384 ->
+	    {octets,2,2#1000000000000000 bor Len};
+	true  ->
+	    exit({error,{asn1,{encode_length,{nyi,above_16k}}}})
+    end;
+
+encode_length({0,'MAX'},Len) ->
+    encode_length(undefined,Len);
+encode_length({Lb,Ub},Len) when Ub =< 65535 ,Lb >= 0 -> % constrained
+    encode_constrained_number({Lb,Ub},Len);
+encode_length(SingleValue,_Len) when integer(SingleValue) ->
+    [].
+
+encode_small_length(Len) when Len =< 64 ->
+    [{bit,0},{bits,6,Len-1}];
+encode_small_length(Len) ->
+    [{bit,1},encode_length(undefined,Len)].
+
+decode_small_length(Buffer) ->
+    case getbit(Buffer) of
+	{0,Remain} ->
+	    {Bits,Remain2} = getbits(Remain,6),
+	    {Bits+1,Remain2};
+	{1,Remain} ->
+	    decode_length(Remain,undefined)
+    end.
+
+decode_length(Buffer) ->
+    decode_length(Buffer,undefined).
+
+decode_length(Buffer,undefined)  -> % un-constrained
+    Buffer2 = align(Buffer),
+    {Bits,_} = getbits(Buffer2,2),
+    case Bits of
+	2 ->
+	    {Val,Bytes3} = getoctets(Buffer2,2),
+	    {(Val band 16#3FFF),Bytes3};
+	3 ->
+	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}});
+	_ ->
+	    {Val,Bytes3} = getoctet(Buffer2),
+	    {Val band 16#7F,Bytes3}
+    end;
+
+decode_length(Buffer,{Lb,Ub}) when Ub =< 65535 ,Lb >= 0 -> % constrained
+    decode_constrained_number(Buffer,{Lb,Ub});
+						% X.691:10.9.3.5
+decode_length(Buffer,{_,_Lb,_Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub
+    case getbit(Buffer) of
+	{0,Remain} ->
+	    getbits(Remain,7);
+	{1,_Remain} ->
+	    {Val,Remain2} = getoctets(Buffer,2),
+	    {Val band 2#0111111111111111, Remain2}
+    end;
+decode_length(Buffer,SingleValue) when integer(SingleValue) ->
+    {SingleValue,Buffer}.
+
+
+% X.691:11
+encode_boolean({Name,Val}) when atom(Name) ->
+    encode_boolean(Val);
+encode_boolean(true) ->
+    {bit,1};
+encode_boolean(false) ->
+    {bit,0};
+encode_boolean(Val) ->
+    exit({error,{asn1,{encode_boolean,Val}}}).
+
+
+decode_boolean(Buffer) -> %when record(Buffer,buffer)
+    case getbit(Buffer) of
+	{1,Remain} -> {true,Remain};
+	{0,Remain} -> {false,Remain}
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% X.691:12
+%% ENUMERATED
+%%
+%% encode_enumerated(C,Value,NamedNumberTup) -> CompleteList
+%%
+%%
+
+encode_enumerated(C,{Name,Value},NamedNumberList) when
+  atom(Name),list(NamedNumberList) ->
+    encode_enumerated(C,Value,NamedNumberList);
+
+%% ENUMERATED with extension mark
+encode_enumerated(_C,{asn1_enum,Value},{_Nlist1,Nlist2}) when Value >= length(Nlist2) ->
+    [{bit,1},encode_small_number(Value)];
+encode_enumerated(C,Value,{Nlist1,Nlist2}) ->
+    case enum_search(Value,Nlist1,0) of
+	NewV when integer(NewV) ->
+	    [{bit,0},encode_integer(C,NewV)];
+	false ->
+	    case enum_search(Value,Nlist2,0) of
+		ExtV when integer(ExtV) ->
+		    [{bit,1},encode_small_number(ExtV)];
+		false ->
+		    exit({error,{asn1,{encode_enumerated,Value}}})
+	    end
+    end;
+
+encode_enumerated(C,Value,NamedNumberList) when list(NamedNumberList) ->
+    case enum_search(Value,NamedNumberList,0) of
+	NewV when integer(NewV) ->
+	    encode_integer(C,NewV);
+	false ->
+	    exit({error,{asn1,{encode_enumerated,Value}}})
+    end.
+
+%% returns the ordinal number from 0 ,1 ... in the list where Name is found
+%% or false if not found
+%%
+enum_search(Name,[Name|_NamedNumberList],Acc) ->
+    Acc;
+enum_search(Name,[_H|T],Acc) ->
+    enum_search(Name,T,Acc+1);
+enum_search(_,[],_) ->
+    false. % name not found !error
+
+%% ENUMERATED with extension marker
+decode_enumerated(Buffer,C,{Ntup1,Ntup2}) when tuple(Ntup1), tuple(Ntup2) ->
+    {Ext,Buffer2} = getext(Buffer),
+    case Ext of
+	0 -> % not an extension value
+	    {Val,Buffer3} = decode_integer(Buffer2,C),
+	    case catch (element(Val+1,Ntup1)) of
+		NewVal when atom(NewVal) -> {NewVal,Buffer3};
+		_Error -> exit({error,{asn1,{decode_enumerated,{Val,[Ntup1,Ntup2]}}}})
+	    end;
+	1 -> % this an extension value
+	    {Val,Buffer3} = decode_small_number(Buffer2),
+	    case catch (element(Val+1,Ntup2)) of
+		NewVal when atom(NewVal) -> {NewVal,Buffer3};
+		_ -> {{asn1_enum,Val},Buffer3}
+	    end
+    end;
+
+decode_enumerated(Buffer,C,NamedNumberTup) when tuple(NamedNumberTup) ->
+    {Val,Buffer2} = decode_integer(Buffer,C),
+    case catch (element(Val+1,NamedNumberTup)) of
+	NewVal when atom(NewVal) -> {NewVal,Buffer2};
+	_Error -> exit({error,{asn1,{decode_enumerated,{Val,NamedNumberTup}}}})
+    end.
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Bitstring value, ITU_T X.690 Chapter 8.5
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+%%===============================================================================
+%% encode bitstring value
+%%===============================================================================
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% bitstring NamedBitList
+%% Val can be  of:
+%% - [identifiers] where only named identifers are set to one,
+%%   the Constraint must then have some information of the
+%%   bitlength.
+%% - [list of ones and zeroes] all bits
+%% - integer value representing the bitlist
+%% C is constraint Len, only valid when identifiers
+
+%% when the value is a list of named bits
+encode_bit_string(C, [FirstVal | RestVal], NamedBitList) when atom(FirstVal) ->
+    ToSetPos = get_all_bitposes([FirstVal | RestVal], NamedBitList, []),
+    BitList = make_and_set_list(ToSetPos,0),
+    encode_bit_string(C,BitList,NamedBitList);
+
+encode_bit_string(C, [{bit,No} | RestVal], NamedBitList) ->
+    ToSetPos = get_all_bitposes([{bit,No} | RestVal], NamedBitList, []),
+    BitList = make_and_set_list(ToSetPos,0),
+    encode_bit_string(C,BitList,NamedBitList);
+
+%% when the value is a list of ones and zeroes
+
+encode_bit_string(C, BitListValue, _NamedBitList) when list(BitListValue) ->
+    %% first remove any trailing zeroes
+    Bl1 = lists:dropwhile(fun(0)->true;(1)->false end,lists:reverse(BitListValue)),
+    BitList = [{bit,X} || X <- lists:reverse(Bl1)],
+    case get_constraint(C,'SizeConstraint') of
+	0 -> % fixed length
+	    []; % nothing to encode
+	V when integer(V),V=<16 -> % fixed length 16 bits or less
+	    pad_list(V,BitList);
+	V when integer(V) -> % fixed length more than 16 bits
+	    [align,pad_list(V,BitList)];
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+	    [encode_length({Lb,Ub},length(BitList)),align,BitList];
+	no ->
+	    [encode_length(undefined,length(BitList)),align,BitList]
+    end;
+
+%% when the value is an integer
+encode_bit_string(C, IntegerVal, NamedBitList) ->
+    BitList = int_to_bitlist(IntegerVal),
+    encode_bit_string(C,BitList,NamedBitList).
+
+
+
+
+%%%%%%%%%%%%%%%
+%% The result is presented as a list of named bits (if possible)
+%% else as a list of 0 and 1.
+%%
+decode_bit_string(Buffer, C, NamedNumberList) ->
+    case get_constraint(C,'SizeConstraint') of
+	0 -> % fixed length
+	    {[],Buffer}; % nothing to encode
+	V when integer(V),V=<16 -> % fixed length 16 bits or less
+	    bit_list_to_named(Buffer,V,NamedNumberList);
+	V when integer(V) -> % fixed length 16 bits or less
+	    Bytes2 = align(Buffer),
+	    bit_list_to_named(Bytes2,V,NamedNumberList);
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
+	    Bytes3 = align(Bytes2),
+	    bit_list_to_named(Bytes3,Len,NamedNumberList);
+	no ->
+	    {Len,Bytes2} = decode_length(Buffer,undefined),
+	    Bytes3 = align(Bytes2),
+	    bit_list_to_named(Bytes3,Len,NamedNumberList)
+    end.
+
+%% if no named bits are declared we will return a
+%% BitList = [0 | 1]
+
+bit_list_to_named(Buffer,Len,[]) ->
+    getbits_as_list(Len,Buffer);
+
+%% if there are named bits declared we will return a named
+%% BitList where the names are atoms and unnamed bits represented
+%% as {bit,Pos}
+%% BitList = [atom() | {bit,Pos}]
+%% Pos = integer()
+
+bit_list_to_named(Buffer,Len,NamedNumberList) ->
+    {BitList,Rest} = getbits_as_list(Len,Buffer),
+    {bit_list_to_named1(0,BitList,NamedNumberList,[]), Rest}.
+
+bit_list_to_named1(Pos,[0|Bt],Names,Acc) ->
+    bit_list_to_named1(Pos+1,Bt,Names,Acc);
+bit_list_to_named1(Pos,[1|Bt],Names,Acc) ->
+    case lists:keysearch(Pos,2,Names) of
+	{value,{Name,_}} ->
+	    bit_list_to_named1(Pos+1,Bt,Names,[Name|Acc]);
+	_  ->
+	    bit_list_to_named1(Pos+1,Bt,Names,[{bit,Pos}|Acc])
+    end;
+bit_list_to_named1(_Pos,[],_Names,Acc) ->
+    lists:reverse(Acc).
+
+
+
+%%%%%%%%%%%%%%%
+%%
+
+int_to_bitlist(0) ->
+    [];
+int_to_bitlist(Int) when integer(Int), Int >= 0 ->
+    [Int band 1 | int_to_bitlist(Int bsr 1)].
+
+
+%%%%%%%%%%%%%%%%%%
+%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
+%%   [sorted_list_of_bitpositions_to_set]
+
+get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
+    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
+
+get_all_bitposes([Val | Rest], NamedBitList, Ack) ->
+    case lists:keysearch(Val, 1, NamedBitList) of
+	{value, {_ValName, ValPos}} ->
+	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
+	_ ->
+	    exit({error,{asn1, {bitstring_namedbit, Val}}})
+    end;
+get_all_bitposes([], _NamedBitList, Ack) ->
+    lists:sort(Ack).
+
+%%%%%%%%%%%%%%%%%%
+%% make_and_set_list([list of positions to set to 1])->
+%% returns list with all in SetPos set.
+%% in positioning in list the first element is 0, the second 1 etc.., but
+%%
+
+make_and_set_list([XPos|SetPos], XPos) ->
+    [1 | make_and_set_list(SetPos, XPos + 1)];
+make_and_set_list([Pos|SetPos], XPos) ->
+    [0 | make_and_set_list([Pos | SetPos], XPos + 1)];
+make_and_set_list([], _) ->
+    [].
+
+%%%%%%%%%%%%%%%%%
+%% pad_list(N,BitList) -> PaddedList
+%% returns a padded (with trailing {bit,0} elements) list of length N
+%% if Bitlist contains more than N significant bits set an exit asn1_error
+%% is generated
+
+pad_list(0,BitList) ->
+    case BitList of
+	[] -> [];
+	_ -> exit({error,{asn1,{range_error,{bit_string,BitList}}}})
+    end;
+pad_list(N,[Bh|Bt]) ->
+    [Bh|pad_list(N-1,Bt)];
+pad_list(N,[]) ->
+    [{bit,0},pad_list(N-1,[])].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% X.691:16
+%% encode_octet_string(Constraint,ExtensionMarker,Val)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+encode_octet_string(C,{Name,Val}) when atom(Name) ->
+    encode_octet_string(C,false,Val);
+encode_octet_string(C,Val) ->
+    encode_octet_string(C,false,Val).
+
+encode_octet_string(_C,true,_Val) ->
+    exit({error,{asn1,{'not_supported',extensionmarker}}});
+encode_octet_string(C,false,Val) ->
+    case get_constraint(C,'SizeConstraint') of
+	0 ->
+	    [];
+	1 ->
+	    [V] = Val,
+	    {bits,8,V};
+	2 ->
+	    [V1,V2] = Val,
+	    [{bits,8,V1},{bits,8,V2}];
+	Sv when Sv =<65535, Sv == length(Val) -> % fixed length
+	    [align,{octets,Val}];
+	{Lb,Ub}  ->
+	    [encode_length({Lb,Ub},length(Val)),align,
+	     {octets,Val}];
+	Sv when list(Sv) ->
+	    [encode_length({hd(Sv),lists:max(Sv)},length(Val)),align,
+	     {octets,Val}];
+	no  ->
+	    [encode_length(undefined,length(Val)),align,
+	     {octets,Val}]
+    end.
+
+decode_octet_string(Bytes,Range) ->
+    decode_octet_string(Bytes,Range,false).
+
+decode_octet_string(Bytes,C,false) ->
+    case get_constraint(C,'SizeConstraint') of
+	0 ->
+	    {[],Bytes};
+	1 ->
+	    {B1,Bytes2} = getbits(Bytes,8),
+	    {[B1],Bytes2};
+	2 ->
+	    {B1,Bytes2}= getbits(Bytes,8),
+	    {B2,Bytes3}= getbits(Bytes2,8),
+	    {[B1,B2],Bytes3};
+	{_,0} ->
+	    {[],Bytes};
+	Sv when integer(Sv), Sv =<65535 -> % fixed length
+	    Bytes2 = align(Bytes),
+	    getoctets_as_list(Bytes2,Sv);
+	{Lb,Ub}  ->
+	    {Len,Bytes2} = decode_length(Bytes,{Lb,Ub}),
+	    Bytes3 = align(Bytes2),
+	    getoctets_as_list(Bytes3,Len);
+	Sv when list(Sv) ->
+	    {Len,Bytes2} = decode_length(Bytes,{hd(Sv),lists:max(Sv)}),
+	    Bytes3 = align(Bytes2),
+	    getoctets_as_list(Bytes3,Len);
+	no  ->
+	    {Len,Bytes2} = decode_length(Bytes,undefined),
+	    Bytes3 = align(Bytes2),
+	    getoctets_as_list(Bytes3,Len)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Restricted char string types
+%% (NumericString, PrintableString,VisibleString,IA5String,BMPString,UniversalString)
+%% X.691:26 and X.680:34-36
+%%encode_restricted_string(aligned,'BMPString',Constraints,Extension,Val)
+
+encode_restricted_string(aligned,StringType,C,Val) ->
+encode_restricted_string(aligned,StringType,C,false,Val).
+
+
+encode_restricted_string(aligned,StringType,C,_Ext,{Name,Val}) when atom(Name) ->
+    encode_restricted_string(aligned,StringType,C,false,Val);
+encode_restricted_string(aligned,StringType,C,_Ext,Val) ->
+    Result = chars_encode(C,StringType,Val),
+    NumBits = get_NumBits(C,StringType),
+    case get_constraint(C,'SizeConstraint') of
+	Ub when integer(Ub), Ub*NumBits =< 16  ->
+	    case {StringType,Result} of
+		{'BMPString',{octets,Ol}} ->
+		    [{bits,8,Oct}||Oct <- Ol];
+		_ ->
+		    Result
+	    end;
+	0 ->
+	    [];
+	Ub when integer(Ub),Ub =<65535 -> % fixed length
+	    [align,Result];
+	{Ub,Lb} ->
+	    [encode_length({Ub,Lb},length(Val)),align,Result];
+	Vl when list(Vl) ->
+	    [encode_length({lists:min(Vl),lists:max(Vl)},length(Val)),align,Result];
+	no  ->
+	    [encode_length(undefined,length(Val)),align,Result]
+    end.
+
+decode_restricted_string(Bytes,aligned,StringType,C) ->
+    decode_restricted_string(Bytes,aligned,StringType,C,false).
+
+decode_restricted_string(Bytes,aligned,StringType,C,_Ext) ->
+    NumBits = get_NumBits(C,StringType),
+    case get_constraint(C,'SizeConstraint') of
+	Ub when integer(Ub), Ub*NumBits =< 16  ->
+	    chars_decode(Bytes,NumBits,StringType,C,Ub);
+	Ub when integer(Ub),Ub =<65535 -> % fixed length
+	    Bytes1 = align(Bytes),
+	    chars_decode(Bytes1,NumBits,StringType,C,Ub);
+	0 ->
+	    {[],Bytes};
+	Vl when list(Vl) ->
+	    {Len,Bytes1} = decode_length(Bytes,{hd(Vl),lists:max(Vl)}),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,C,Len);
+	no  ->
+	    {Len,Bytes1} = decode_length(Bytes,undefined),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,C,Len);
+	{Lb,Ub}->
+	    {Len,Bytes1} = decode_length(Bytes,{Lb,Ub}),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,C,Len)
+    end.
+
+
+
+encode_BMPString(C,Val) ->
+    encode_restricted_string(aligned,'BMPString',C,false,Val).
+decode_BMPString(Bytes,C) ->
+    decode_restricted_string(Bytes,aligned,'BMPString',C,false).
+
+encode_GeneralString(C,Val) ->
+    encode_restricted_string(aligned,'GeneralString',C,false,Val).
+decode_GeneralString(Bytes,C) ->
+    decode_restricted_string(Bytes,aligned,'GeneralString',C,false).
+
+encode_GraphicString(C,Val) ->
+    encode_restricted_string(aligned,'GraphicString',C,false,Val).
+decode_GraphicString(Bytes,C) ->
+    decode_restricted_string(Bytes,aligned,'GraphicString',C,false).
+
+encode_IA5String(C,Val) ->
+    encode_restricted_string(aligned,'IA5String',C,false,Val).
+decode_IA5String(Bytes,C) ->
+    decode_restricted_string(Bytes,aligned,'IA5String',C,false).
+
+encode_NumericString(C,Val) ->
+    encode_restricted_string(aligned,'NumericString',C,false,Val).
+decode_NumericString(Bytes,C) ->
+    decode_restricted_string(Bytes,aligned,'NumericString',C,false).
+
+encode_PrintableString(C,Val) ->
+    encode_restricted_string(aligned,'PrintableString',C,false,Val).
+decode_PrintableString(Bytes,C) ->
+    decode_restricted_string(Bytes,aligned,'PrintableString',C,false).
+
+encode_TeletexString(C,Val) -> % equivalent with T61String
+    encode_restricted_string(aligned,'TeletexString',C,false,Val).
+decode_TeletexString(Bytes,C) ->
+    decode_restricted_string(Bytes,aligned,'TeletexString',C,false).
+
+encode_UniversalString(C,Val) ->
+    encode_restricted_string(aligned,'UniversalString',C,false,Val).
+decode_UniversalString(Bytes,C) ->
+    decode_restricted_string(Bytes,aligned,'UniversalString',C,false).
+
+encode_VideotexString(C,Val) ->
+    encode_restricted_string(aligned,'VideotexString',C,false,Val).
+decode_VideotexString(Bytes,C) ->
+    decode_restricted_string(Bytes,aligned,'VideotexString',C,false).
+
+encode_VisibleString(C,Val) -> % equivalent with ISO646String
+    encode_restricted_string(aligned,'VisibleString',C,false,Val).
+decode_VisibleString(Bytes,C) ->
+    decode_restricted_string(Bytes,aligned,'VisibleString',C,false).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% getBMPChars(Bytes,Len) ->{BMPcharList,RemainingBytes}
+%%
+getBMPChars(Bytes,1) ->
+    {O1,Bytes2} = getbits(Bytes,8),
+    {O2,Bytes3} = getbits(Bytes2,8),
+    if
+	O1 == 0 ->
+	    {[O2],Bytes3};
+	true ->
+	    {[{O1,O2}],Bytes3}
+    end;
+getBMPChars(Bytes,Len) ->
+    getBMPChars(Bytes,Len,[]).
+
+getBMPChars(Bytes,0,Acc) ->
+    {lists:reverse(Acc),Bytes};
+getBMPChars(Bytes,Len,Acc) ->
+    {Octs,Bytes1} = getoctets_as_list(Bytes,2),
+    case Octs of
+	[0,O2] ->
+	    getBMPChars(Bytes1,Len-1,[O2|Acc]);
+	[O1,O2]->
+	    getBMPChars(Bytes1,Len-1,[{O1,O2}|Acc])
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% chars_encode(C,StringType,Value) -> ValueList
+%%
+%% encodes chars according to the per rules taking the constraint PermittedAlphabet
+%% into account.
+%% This function does only encode the value part and NOT the length
+
+chars_encode(C,StringType,Value) ->
+    case {StringType,get_constraint(C,'PermittedAlphabet')} of
+	{'UniversalString',{_,_Sv}} ->
+	    exit({error,{asn1,{'not implemented',"UniversalString with PermittedAlphabet constraint"}}});
+	{'BMPString',{_,_Sv}} ->
+	    exit({error,{asn1,{'not implemented',"BMPString with PermittedAlphabet constraint"}}});
+	_ ->
+	    {NumBits,CharOutTab} = {get_NumBits(C,StringType),get_CharOutTab(C,StringType)},
+	    chars_encode2(Value,NumBits,CharOutTab)
+    end.
+
+chars_encode2([H|T],NumBits,{Min,Max,notab}) when  H =< Max, H >= Min ->
+    [{bits,NumBits,H-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
+chars_encode2([H|T],NumBits,{Min,Max,Tab}) when H =< Max, H >= Min ->
+    [{bits,NumBits,element(H-Min+1,Tab)}|chars_encode2(T,NumBits,{Min,Max,Tab})];
+chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,notab}) ->
+    %% no value range check here (ought to be, but very expensive)
+    [{bits,NumBits,(A*B*C*D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
+chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,Tab}) ->
+    %% no value range check here (ought to be, but very expensive)
+    [{bits,NumBits,element((A*B*C*D)-Min,Tab)}|chars_encode2(T,NumBits,{Min,Max,notab})];
+chars_encode2([H|_T],_NumBits,{_Min,_Max,_Tab}) ->
+    exit({error,{asn1,{illegal_char_value,H}}});
+chars_encode2([],_,_) ->
+    [].
+
+
+get_NumBits(C,StringType) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	{'SingleValue',Sv} ->
+	    charbits(length(Sv),aligned);
+	no ->
+	    case StringType of
+		'GeneralString' ->
+		    exit({error,{asn1,{not implemented,'GeneralString'}}});
+		'GraphicString' ->
+		    exit({error,{asn1,{not implemented,'GraphicString'}}});
+		'TeletexString' ->
+		    exit({error,{asn1,{not implemented,'TeletexString'}}});
+		'VideotexString' ->
+		    exit({error,{asn1,{not implemented,'VideotexString'}}});
+		'IA5String' ->
+		    charbits(128,aligned); % 16#00..16#7F
+		'VisibleString' ->
+		    charbits(95,aligned); % 16#20..16#7E
+		'PrintableString' ->
+		    charbits(74,aligned); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+		'NumericString' ->
+		    charbits(11,aligned); % $ ,"0123456789"
+		'UniversalString' ->
+		    32;
+		'BMPString' ->
+		    16
+	    end
+    end.
+
+%%Maybe used later
+%%get_MaxChar(C,StringType) ->
+%%    case get_constraint(C,'PermittedAlphabet') of
+%%	{'SingleValue',Sv} ->
+%%	    lists:nth(length(Sv),Sv);
+%%	no ->
+%%	    case StringType of
+%%		'IA5String' ->
+%%		    16#7F; % 16#00..16#7F
+%%		'VisibleString' ->
+%%		    16#7E; % 16#20..16#7E
+%%		'PrintableString' ->
+%%		    $z; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+%%		'NumericString' ->
+%%		    $9; % $ ,"0123456789"
+%%		'UniversalString' ->
+%%		    16#ffffffff;
+%%		'BMPString' ->
+%%		    16#ffff
+%%	    end
+%%    end.
+
+%%Maybe used later
+%%get_MinChar(C,StringType) ->
+%%    case get_constraint(C,'PermittedAlphabet') of
+%%	{'SingleValue',Sv} ->
+%%	    hd(Sv);
+%%	no ->
+%%	    case StringType of
+%%		'IA5String' ->
+%%		    16#00; % 16#00..16#7F
+%%		'VisibleString' ->
+%%		    16#20; % 16#20..16#7E
+%%		'PrintableString' ->
+%%		    $\s; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+%%		'NumericString' ->
+%%		    $\s; % $ ,"0123456789"
+%%		'UniversalString' ->
+%%		    16#00;
+%%		'BMPString' ->
+%%		    16#00
+%%	    end
+%%    end.
+
+get_CharOutTab(C,StringType) ->
+    get_CharTab(C,StringType,out).
+
+get_CharInTab(C,StringType) ->
+    get_CharTab(C,StringType,in).
+
+get_CharTab(C,StringType,InOut) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	{'SingleValue',Sv} ->
+	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv,InOut);
+	no ->
+	    case StringType of
+		'IA5String' ->
+		    {0,16#7F,notab};
+		'VisibleString' ->
+		    get_CharTab2(C,StringType,16#20,16#7F,notab,InOut);
+		'PrintableString' ->
+		    Chars = lists:sort(
+			" '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
+		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars,InOut);
+		'NumericString' ->
+		    get_CharTab2(C,StringType,16#20,$9," 0123456789",InOut);
+		'UniversalString' ->
+		    {0,16#FFFFFFFF,notab};
+		'BMPString' ->
+		    {0,16#FFFF,notab}
+	    end
+    end.
+
+get_CharTab2(C,StringType,Min,Max,Chars,InOut) ->
+    BitValMax = (1 bsl get_NumBits(C,StringType))-1,
+    if
+	Max =< BitValMax ->
+	    {0,Max,notab};
+	true ->
+	    case InOut of
+		out ->
+		    {Min,Max,create_char_tab(Min,Chars)};
+		in  ->
+		    {Min,Max,list_to_tuple(Chars)}
+	    end
+    end.
+
+create_char_tab(Min,L) ->
+    list_to_tuple(create_char_tab(Min,L,0)).
+create_char_tab(Min,[Min|T],V) ->
+    [V|create_char_tab(Min+1,T,V+1)];
+create_char_tab(_Min,[],_V) ->
+    [];
+create_char_tab(Min,L,V) ->
+    [false|create_char_tab(Min+1,L,V)].
+
+%% This very inefficient and should be moved to compiletime
+charbits(NumOfChars,aligned) ->
+    case charbits(NumOfChars) of
+	1 -> 1;
+	2 -> 2;
+	B when B > 2, B =< 4 -> 4;
+	B when B > 4, B =< 8 -> 8;
+	B when B > 8, B =< 16 -> 16;
+	B when B > 16, B =< 32 -> 32
+    end.
+
+charbits(NumOfChars) when NumOfChars =< 2 -> 1;
+charbits(NumOfChars) when NumOfChars =< 4 -> 2;
+charbits(NumOfChars) when NumOfChars =< 8 -> 3;
+charbits(NumOfChars) when NumOfChars =< 16 -> 4;
+charbits(NumOfChars) when NumOfChars =< 32 -> 5;
+charbits(NumOfChars) when NumOfChars =< 64 -> 6;
+charbits(NumOfChars) when NumOfChars =< 128 -> 7;
+charbits(NumOfChars) when NumOfChars =< 256 -> 8;
+charbits(NumOfChars) when NumOfChars =< 512 -> 9;
+charbits(NumOfChars) when NumOfChars =< 1024 -> 10;
+charbits(NumOfChars) when NumOfChars =< 2048 -> 11;
+charbits(NumOfChars) when NumOfChars =< 4096 -> 12;
+charbits(NumOfChars) when NumOfChars =< 8192 -> 13;
+charbits(NumOfChars) when NumOfChars =< 16384 -> 14;
+charbits(NumOfChars) when NumOfChars =< 32768 -> 15;
+charbits(NumOfChars) when NumOfChars =< 65536 -> 16;
+charbits(NumOfChars) when integer(NumOfChars) ->
+    16 + charbits1(NumOfChars bsr 16).
+
+charbits1(0) ->
+    0;
+charbits1(NumOfChars) ->
+    1 + charbits1(NumOfChars bsr 1).
+
+
+chars_decode(Bytes,_,'BMPString',C,Len) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	no ->
+	    getBMPChars(Bytes,Len);
+	_ ->
+	    exit({error,{asn1,
+			 {'not implemented',
+			  "BMPString with PermittedAlphabet constraint"}}})
+    end;
+chars_decode(Bytes,NumBits,StringType,C,Len) ->
+    CharInTab = get_CharInTab(C,StringType),
+    chars_decode2(Bytes,CharInTab,NumBits,Len).
+
+
+chars_decode2(Bytes,CharInTab,NumBits,Len) ->
+    chars_decode2(Bytes,CharInTab,NumBits,Len,[]).
+
+chars_decode2(Bytes,_CharInTab,_NumBits,0,Acc) ->
+    {lists:reverse(Acc),Bytes};
+chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    Result = case minimum_octets(Char+Min) of
+	[NewChar] -> NewChar;
+	[C1,C2] -> {0,0,C1,C2};
+	[C1,C2,C3] -> {0,C1,C2,C3};
+	[C1,C2,C3,C4] -> {C1,C2,C3,C4}
+    end,
+    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
+chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Char+Min|Acc]);
+
+%% BMPString and UniversalString with PermittedAlphabet is currently not supported
+chars_decode2(Bytes,{Min,Max,CharInTab},NumBits,Len,Acc) ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    chars_decode2(Bytes2,{Min,Max,CharInTab},NumBits,Len -1,[element(Char+1,CharInTab)|Acc]).
+
+
+			% X.691:17
+encode_null({Name,Val}) when atom(Name) ->
+    encode_null(Val);
+encode_null(_) -> []. % encodes to nothing
+
+decode_null(Bytes) ->
+    {'NULL',Bytes}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_object_identifier(Val) -> CompleteList
+%% encode_object_identifier({Name,Val}) -> CompleteList
+%% Val -> {Int1,Int2,...,IntN} % N >= 2
+%% Name -> atom()
+%% Int1 -> integer(0..2)
+%% Int2 -> integer(0..39) when Int1 (0..1) else integer()
+%% Int3-N -> integer()
+%% CompleteList -> [{bits,8,Val}|{octets,Ol}|align|...]
+%%
+encode_object_identifier(Val) ->
+    Octets = e_object_identifier(Val,notag),
+    [{debug,object_identifier},encode_length(undefined,length(Octets)),{octets,Octets}].
+
+%% This code is copied from asn1_encode.erl (BER) and corrected and modified
+
+e_object_identifier({'OBJECT IDENTIFIER',V},DoTag) ->
+    e_object_identifier(V,DoTag);
+e_object_identifier({Cname,V},DoTag) when atom(Cname),tuple(V) ->
+    e_object_identifier(tuple_to_list(V),DoTag);
+e_object_identifier({Cname,V},DoTag) when atom(Cname),list(V) ->
+    e_object_identifier(V,DoTag);
+e_object_identifier(V,DoTag) when tuple(V) ->
+    e_object_identifier(tuple_to_list(V),DoTag);
+
+% E1 = 0|1|2 and (E2 < 40 when E1 = 0|1)
+e_object_identifier([E1,E2|Tail],_DoTag) when E1 =< 2 ->
+    Head = 40*E1 + E2,  % weird
+    Res = e_object_elements([Head|Tail]),
+%    dotag(DoTag,[6],elength(length(Res)+1),[Head|Res]),
+    Res.
+
+e_object_elements([]) ->
+    [];
+e_object_elements([H|T]) ->
+    lists:append(e_object_element(H),e_object_elements(T)).
+
+e_object_element(Num) when Num < 128 ->
+    [Num];
+% must be changed to handle more than 2 octets
+e_object_element(Num) ->  %% when Num < ???
+    Left = ((Num band 2#11111110000000) bsr 7) bor 2#10000000,
+    Right = Num band 2#1111111 ,
+    [Left,Right].
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_object_identifier(Bytes) -> {ObjId,RemainingBytes}
+%% ObjId -> {integer(),integer(),...} % at least 2 integers
+%% RemainingBytes -> [integer()] when integer() (0..255)
+decode_object_identifier(Bytes) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+    [First|Rest] = dec_subidentifiers(Octs,0,[]),
+    Idlist = if
+	First < 40 ->
+	    [0,First|Rest];
+	First < 80 ->
+	    [1,First - 40|Rest];
+	true ->
+	    [2,First - 80|Rest]
+    end,
+    {list_to_tuple(Idlist),Bytes3}.
+
+dec_subidentifiers([H|T],Av,Al) when H >=16#80 ->
+    dec_subidentifiers(T,(Av bsl 7) + (H band 16#7F),Al);
+dec_subidentifiers([H|T],Av,Al) ->
+    dec_subidentifiers(T,0,[(Av bsl 7) + H |Al]);
+dec_subidentifiers([],_Av,Al) ->
+    lists:reverse(Al).
+
+get_constraint(C,Key) ->
+    case lists:keysearch(Key,1,C) of
+	false ->
+	     no;
+	{value,{_,V}} ->
+	    V
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% complete(InList) -> ByteList
+%% Takes a coded list with bits and bytes and converts it to a list of bytes
+%% Should be applied as the last step at encode of a complete ASN.1 type
+%%
+complete(InList) when list(InList) ->
+    complete(InList,[],0);
+complete(InList) ->
+    complete([InList],[],0).
+
+complete([{debug,_}|T], Acc, Acclen) ->
+    complete(T,Acc,Acclen);
+complete([H|T],Acc,Acclen) when list(H) ->
+    complete(lists:concat([H,T]),Acc,Acclen);
+
+
+complete([{octets,N,Val}|T],Acc,Acclen) when N =< 4 ,integer(Val) ->
+    Newval = case N of
+	1 ->
+	    Val4 = Val band 16#FF,
+	    [Val4];
+	2 ->
+	    Val3 = (Val bsr 8) band 16#FF,
+	    Val4 = Val band 16#FF,
+	    [Val3,Val4];
+	3 ->
+	    Val2 = (Val bsr 16) band 16#FF,
+	    Val3 = (Val bsr 8) band 16#FF,
+	    Val4 = Val band 16#FF,
+	    [Val2,Val3,Val4];
+	    4 ->
+	    Val1 = (Val bsr 24) band 16#FF,
+	    Val2 = (Val bsr 16) band 16#FF,
+	    Val3 = (Val bsr 8) band 16#FF,
+	    Val4 = Val band 16#FF,
+	    [Val1,Val2,Val3,Val4]
+    end,
+    complete([{octets,Newval}|T],Acc,Acclen);
+
+complete([{octets,Oct}|T],[],_Acclen) when list(Oct) ->
+    complete(T,lists:reverse(Oct),0);
+complete([{octets,Oct}|T],[Hacc|Tacc],Acclen) when list(Oct) ->
+    Rest = 8 - Acclen,
+    if
+	Rest == 8 ->
+	    complete(T,lists:concat([lists:reverse(Oct),[Hacc|Tacc]]),0);
+	true ->
+	    complete(T,lists:concat([lists:reverse(Oct),[Hacc bsl Rest|Tacc]]),0)
+    end;
+
+complete([{bit,Val}|T], Acc, Acclen) ->
+    complete([{bits,1,Val}|T],Acc,Acclen);
+complete([{octet,Val}|T], Acc, Acclen) ->
+    complete([{octets,1,Val}|T],Acc,Acclen);
+
+complete([{bits,N,Val}|T], Acc, 0) when N =< 8 ->
+    complete(T,[Val|Acc],N);
+complete([{bits,N,Val}|T], [Hacc|Tacc], Acclen) when N =< 8 ->
+    Rest = 8 - Acclen,
+    if
+	Rest >= N ->
+	    complete(T,[(Hacc bsl N) + Val|Tacc],(Acclen+N) rem 8);
+	true ->
+	    Diff = N - Rest,
+	    NewHacc = (Hacc bsl Rest) + (Val bsr Diff),
+	    Mask = element(Diff,{1,3,7,15,31,63,127,255}),
+	    complete(T,[(Val band Mask),NewHacc|Tacc],(Acclen+N) rem 8)
+    end;
+complete([{bits,N,Val}|T], Acc, Acclen) -> % N > 8
+    complete([{bits,N-8,Val bsr 8},{bits,8,Val band 255}|T],Acc,Acclen);
+
+complete([align|T],Acc,0) ->
+    complete(T,Acc,0);
+complete([align|T],[Hacc|Tacc],Acclen) ->
+    Rest = 8 - Acclen,
+    complete(T,[Hacc bsl Rest|Tacc],0);
+complete([{octets,_N,Val}|T],Acc,Acclen) when list(Val) -> % no security check here
+    complete([{octets,Val}|T],Acc,Acclen);
+complete([],Acc,0) ->
+    lists:reverse(Acc);
+complete([],[Hacc|Tacc],Acclen) when Acclen > 0->
+    Rest = 8 - Acclen,
+    NewHacc = Hacc bsl Rest,
+    lists:reverse([NewHacc|Tacc]).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_bin.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_bin.erl
new file mode 100644
index 0000000000..8b4512b58e
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_bin.erl
@@ -0,0 +1,2176 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1rt_per_bin.erl,v 1.1 2008/12/17 09:53:31 mikpe Exp $
+%%
+-module(asn1rt_per_bin).
+
+%% encoding / decoding of PER aligned
+
+-include("asn1_records.hrl").
+
+-export([dec_fixup/3, cindex/3, list_to_record/2]).
+-export([setchoiceext/1, setext/1, fixoptionals/2, fixoptionals/3,
+	 fixextensions/2,
+	 getext/1, getextension/2, skipextensions/3, getbit/1, getchoice/3 ]).
+-export([getoptionals/2, getoptionals2/2, set_choice/3, encode_integer/2, encode_integer/3  ]).
+-export([decode_integer/2, decode_integer/3, encode_small_number/1, encode_boolean/1,
+	 decode_boolean/1, encode_length/2, decode_length/1, decode_length/2,
+	 encode_small_length/1, decode_small_length/1,
+	 decode_compact_bit_string/3]).
+-export([decode_enumerated/3,
+	 encode_bit_string/3, decode_bit_string/3  ]).
+-export([encode_octet_string/2, decode_octet_string/2,
+	 encode_null/1, decode_null/1,
+	 encode_object_identifier/1, decode_object_identifier/1,
+	 complete/1]).
+
+
+-export([encode_open_type/2, decode_open_type/2]).
+
+-export([encode_UniversalString/2, decode_UniversalString/2,
+	 encode_PrintableString/2, decode_PrintableString/2,
+	 encode_GeneralString/2, decode_GeneralString/2,
+	 encode_GraphicString/2, decode_GraphicString/2,
+	 encode_TeletexString/2, decode_TeletexString/2,
+	 encode_VideotexString/2, decode_VideotexString/2,
+	 encode_VisibleString/2, decode_VisibleString/2,
+	 encode_BMPString/2, decode_BMPString/2,
+	 encode_IA5String/2, decode_IA5String/2,
+	 encode_NumericString/2, decode_NumericString/2,
+	 encode_ObjectDescriptor/2, decode_ObjectDescriptor/1
+	]).
+-export([complete_bytes/1]).
+
+-define('16K',16384).
+-define('32K',32768).
+-define('64K',65536).
+
+dec_fixup(Terms,Cnames,RemBytes) ->
+    dec_fixup(Terms,Cnames,RemBytes,[]).
+
+dec_fixup([novalue|T],[_Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,Acc);
+dec_fixup([{_Name,novalue}|T],[_Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,Acc);
+dec_fixup([H|T],[Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,[{Hc,H}|Acc]);
+dec_fixup([],_Cnames,RemBytes,Acc) ->
+    {lists:reverse(Acc),RemBytes}.
+
+cindex(Ix,Val,Cname) ->
+    case element(Ix,Val) of
+	{Cname,Val2} -> Val2;
+	X -> X
+    end.
+
+%% converts a list to a record if necessary
+list_to_record(_Name,Tuple) when tuple(Tuple) ->
+    Tuple;
+list_to_record(Name,List) when list(List) ->
+    list_to_tuple([Name|List]).
+
+%%--------------------------------------------------------
+%% setchoiceext(InRootSet) -> [{bit,X}]
+%% X  is set to  1 when InRootSet==false
+%% X  is set to  0 when InRootSet==true
+%%
+setchoiceext(true) ->
+    [{debug,choiceext},{bits,1,0}];
+setchoiceext(false) ->
+    [{debug,choiceext},{bits,1,1}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% setext(true|false) ->  CompleteList
+%%
+
+setext(false) ->
+    [{debug,ext},{bits,1,0}];
+setext(true) ->
+    [{debug,ext},{bits,1,1}].
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This version of fixoptionals/2 are left only because of
+%% backward compatibility with older generates
+
+fixoptionals(OptList,Val) when tuple(Val) ->
+    fixoptionals1(OptList,Val,[]);
+
+fixoptionals(OptList,Val) when list(Val) ->
+    fixoptionals1(OptList,Val,1,[],[]).
+
+fixoptionals1([],Val,Acc) ->
+    %% return {Val,Opt}
+    {Val,lists:reverse(Acc)};
+fixoptionals1([{_,Pos}|Ot],Val,Acc) ->
+    case element(Pos+1,Val) of
+	asn1_NOVALUE -> fixoptionals1(Ot,Val,[0|Acc]);
+	asn1_DEFAULT -> fixoptionals1(Ot,Val,[0|Acc]);
+	_ -> fixoptionals1(Ot,Val,[1|Acc])
+    end.
+
+
+fixoptionals1([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) ->
+    fixoptionals1(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]);
+fixoptionals1([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) ->
+    fixoptionals1(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]);
+fixoptionals1(O,[Vh|Vt],Pos,Acc1,Acc2) ->
+    fixoptionals1(O,Vt,Pos+1,Acc1,[Vh|Acc2]);
+fixoptionals1([],[Vh|Vt],Pos,Acc1,Acc2) ->
+    fixoptionals1([],Vt,Pos+1,Acc1,[Vh|Acc2]);
+fixoptionals1([],[],_,Acc1,Acc2) ->
+						% return {Val,Opt}
+    {list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]),lists:reverse(Acc1)}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This is the new fixoptionals/3 which is used by the new generates
+%%
+fixoptionals(OptList,OptLength,Val) when tuple(Val) ->
+    Bits = fixoptionals(OptList,Val,0),
+    {Val,{bits,OptLength,Bits}};
+
+fixoptionals([],_Val,Acc) ->
+    %% Optbits
+    Acc;
+fixoptionals([Pos|Ot],Val,Acc) ->
+    case element(Pos,Val) of
+	asn1_NOVALUE -> fixoptionals(Ot,Val,Acc bsl 1);
+	asn1_DEFAULT -> fixoptionals(Ot,Val,Acc bsl 1);
+	_ -> fixoptionals(Ot,Val,(Acc bsl 1) + 1)
+    end.
+
+
+getext(Bytes) when tuple(Bytes) ->
+    getbit(Bytes);
+getext(Bytes) when binary(Bytes) ->
+    getbit({0,Bytes});
+getext(Bytes) when list(Bytes) ->
+    getbit({0,Bytes}).
+
+getextension(0, Bytes) ->
+    {{},Bytes};
+getextension(1, Bytes) ->
+    {Len,Bytes2} = decode_small_length(Bytes),
+    {Blist, Bytes3} = getbits_as_list(Len,Bytes2),
+    {list_to_tuple(Blist),Bytes3}.
+
+fixextensions({ext,ExtPos,ExtNum},Val) ->
+    case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
+	0 -> [];
+	ExtBits ->
+	    [encode_small_length(ExtNum),{bits,ExtNum,ExtBits}]
+    end.
+
+fixextensions(Pos,MaxPos,_,Acc) when Pos >= MaxPos ->
+    Acc;
+fixextensions(Pos,ExtPos,Val,Acc) ->
+    Bit = case catch(element(Pos+1,Val)) of
+	      asn1_NOVALUE ->
+		  0;
+	      asn1_NOEXTVALUE ->
+		  0;
+	      {'EXIT',_} ->
+		  0;
+	      _ ->
+		  1
+	  end,
+    fixextensions(Pos+1,ExtPos,Val,(Acc bsl 1)+Bit).
+
+skipextensions(Bytes,Nr,ExtensionBitPattern) ->
+    case (catch element(Nr,ExtensionBitPattern)) of
+	1 ->
+	    {_,Bytes2} = decode_open_type(Bytes,[]),
+	    skipextensions(Bytes2, Nr+1, ExtensionBitPattern);
+	0 ->
+	    skipextensions(Bytes, Nr+1, ExtensionBitPattern);
+	{'EXIT',_} -> % badarg, no more extensions
+	    Bytes
+    end.
+
+
+getchoice(Bytes,1,0) -> % only 1 alternative is not encoded
+    {0,Bytes};
+getchoice(Bytes,_,1) ->
+    decode_small_number(Bytes);
+getchoice(Bytes,NumChoices,0) ->
+    decode_constrained_number(Bytes,{0,NumChoices-1}).
+
+%% old version kept for backward compatibility with generates from R7B
+getoptionals(Bytes,NumOpt) ->
+    {Blist,Bytes1} = getbits_as_list(NumOpt,Bytes),
+    {list_to_tuple(Blist),Bytes1}.
+
+%% new version used in generates from r8b_patch/3 and later
+getoptionals2(Bytes,NumOpt) ->
+    getbits(Bytes,NumOpt).
+
+
+%% getbits_as_binary(Num,Bytes) -> {{Unused,BinBits},RestBytes},
+%% Num = integer(),
+%% Bytes = list() | tuple(),
+%% Unused = integer(),
+%% BinBits = binary(),
+%% RestBytes = tuple()
+getbits_as_binary(Num,Bytes) when binary(Bytes) ->
+    getbits_as_binary(Num,{0,Bytes});
+getbits_as_binary(0,Buffer) ->
+    {{0,<<>>},Buffer};
+getbits_as_binary(Num,{0,Bin}) when Num > 16 ->
+    Used = Num rem 8,
+    Pad = (8 - Used) rem 8,
+%    Nbytes = Num div 8,
+    <<Bits:Num,_:Pad,RestBin/binary>> = Bin,
+    {{Pad,<<Bits:Num,0:Pad>>},RestBin};
+getbits_as_binary(Num,Buffer={_Used,_Bin}) -> % Unaligned buffer
+    %% Num =< 16,
+    {Bits2,Buffer2} = getbits(Buffer,Num),
+    Pad = (8 - (Num rem 8)) rem 8,
+    {{Pad,<<Bits2:Num,0:Pad>>},Buffer2}.
+
+
+% integer_from_list(Int,[],BigInt) ->
+%     BigInt;
+% integer_from_list(Int,[H|T],BigInt) when Int < 8 ->
+%     (BigInt bsl Int) bor (H bsr (8-Int));
+% integer_from_list(Int,[H|T],BigInt) ->
+%     integer_from_list(Int-8,T,(BigInt bsl 8) bor H).
+
+getbits_as_list(Num,Bytes) when binary(Bytes) ->
+    getbits_as_list(Num,{0,Bytes},[]);
+getbits_as_list(Num,Bytes) ->
+    getbits_as_list(Num,Bytes,[]).
+
+%% If buffer is empty and nothing more will be picked.
+getbits_as_list(0, B, Acc) ->
+    {lists:reverse(Acc),B};
+%% If first byte in buffer is full and at least one byte will be picked,
+%% then pick one byte.
+getbits_as_list(N,{0,Bin},Acc) when N >= 8 ->
+    <<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Rest/binary>> = Bin,
+    getbits_as_list(N-8,{0,Rest},[B0,B1,B2,B3,B4,B5,B6,B7|Acc]);
+getbits_as_list(N,{Used,Bin},Acc) when N >= 4, Used =< 4 ->
+    NewUsed = Used + 4,
+    Rem = 8 - NewUsed,
+    <<_:Used,B3:1,B2:1,B1:1,B0:1,_:Rem, Rest/binary>> = Bin,
+    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
+    getbits_as_list(N-4,{NewUsed rem 8,NewRest},[B0,B1,B2,B3|Acc]);
+getbits_as_list(N,{Used,Bin},Acc) when N >= 2, Used =< 6  ->
+    NewUsed = Used + 2,
+    Rem = 8 - NewUsed,
+    <<_:Used,B1:1,B0:1,_:Rem, Rest/binary>> = Bin,
+    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
+    getbits_as_list(N-2,{NewUsed rem 8,NewRest},[B0,B1|Acc]);
+getbits_as_list(N,{Used,Bin},Acc) when Used =< 7 ->
+    NewUsed = Used + 1,
+    Rem = 8 - NewUsed,
+    <<_:Used,B0:1,_:Rem, Rest/binary>> = Bin,
+    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
+    getbits_as_list(N-1,{NewUsed rem 8,NewRest},[B0|Acc]).
+
+
+getbit({7,<<_:7,B:1,Rest/binary>>}) ->
+    {B,{0,Rest}};
+getbit({0,Buffer = <<B:1,_:7,_/binary>>}) ->
+    {B,{1,Buffer}};
+getbit({Used,Buffer}) ->
+    Unused = (8 - Used) - 1,
+    <<_:Used,B:1,_:Unused,_/binary>> = Buffer,
+    {B,{Used+1,Buffer}};
+getbit(Buffer) when binary(Buffer) ->
+    getbit({0,Buffer}).
+
+
+getbits({0,Buffer},Num) when (Num rem 8) == 0 ->
+    <<Bits:Num,Rest/binary>> = Buffer,
+    {Bits,{0,Rest}};
+getbits({Used,Bin},Num) ->
+    NumPlusUsed = Num + Used,
+    NewUsed = NumPlusUsed rem 8,
+    Unused = (8-NewUsed) rem 8,
+    case Unused of
+	0 ->
+	    <<_:Used,Bits:Num,Rest/binary>> = Bin,
+	    {Bits,{0,Rest}};
+	_ ->
+	    Bytes = NumPlusUsed div 8,
+	    <<_:Used,Bits:Num,_UBits:Unused,_/binary>> = Bin,
+	    <<_:Bytes/binary,Rest/binary>> = Bin,
+	    {Bits,{NewUsed,Rest}}
+    end;
+getbits(Bin,Num) when binary(Bin) ->
+    getbits({0,Bin},Num).
+
+
+
+% getoctet(Bytes) when list(Bytes) ->
+%     getoctet({0,Bytes});
+% getoctet(Bytes) ->
+%     %%    io:format("getoctet:Buffer = ~p~n",[Bytes]),
+%     getoctet1(Bytes).
+
+% getoctet1({0,[H|T]}) ->
+%     {H,{0,T}};
+% getoctet1({Pos,[_,H|T]}) ->
+%     {H,{0,T}}.
+
+align({0,L}) ->
+    {0,L};
+align({_Pos,<<_H,T/binary>>}) ->
+    {0,T};
+align(Bytes) ->
+    {0,Bytes}.
+
+%% First align buffer, then pick the first Num octets.
+%% Returns octets as an integer with bit significance as in buffer.
+getoctets({0,Buffer},Num) ->
+    <<Val:Num/integer-unit:8,RestBin/binary>> = Buffer,
+    {Val,{0,RestBin}};
+getoctets({U,<<_Padding,Rest/binary>>},Num) when U /= 0 ->
+    getoctets({0,Rest},Num);
+getoctets(Buffer,Num) when binary(Buffer) ->
+    getoctets({0,Buffer},Num).
+% getoctets(Buffer,Num) ->
+%     %%    io:format("getoctets:Buffer = ~p~nNum = ~p~n",[Buffer,Num]),
+%     getoctets(Buffer,Num,0).
+
+% getoctets(Buffer,0,Acc) ->
+%     {Acc,Buffer};
+% getoctets(Buffer,Num,Acc) ->
+%     {Oct,NewBuffer} = getoctet(Buffer),
+%     getoctets(NewBuffer,Num-1,(Acc bsl 8)+Oct).
+
+% getoctets_as_list(Buffer,Num) ->
+%     getoctets_as_list(Buffer,Num,[]).
+
+% getoctets_as_list(Buffer,0,Acc) ->
+%     {lists:reverse(Acc),Buffer};
+% getoctets_as_list(Buffer,Num,Acc) ->
+%     {Oct,NewBuffer} = getoctet(Buffer),
+%     getoctets_as_list(NewBuffer,Num-1,[Oct|Acc]).
+
+%% First align buffer, then pick the first Num octets.
+%% Returns octets as a binary
+getoctets_as_bin({0,Bin},Num)->
+    <<Octets:Num/binary,RestBin/binary>> = Bin,
+    {Octets,{0,RestBin}};
+getoctets_as_bin({_U,Bin},Num) ->
+    <<_Padding,Octets:Num/binary,RestBin/binary>> = Bin,
+    {Octets,{0,RestBin}};
+getoctets_as_bin(Bin,Num) when binary(Bin) ->
+    getoctets_as_bin({0,Bin},Num).
+
+%% same as above but returns octets as a List
+getoctets_as_list(Buffer,Num) ->
+    {Bin,Buffer2} = getoctets_as_bin(Buffer,Num),
+    {binary_to_list(Bin),Buffer2}.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% set_choice(Alt,Choices,Altnum) -> ListofBitSettings
+%% Alt = atom()
+%% Altnum = integer() | {integer(),integer()}% number of alternatives
+%% Choices = [atom()] | {[atom()],[atom()]}
+%% When Choices is a tuple the first list is the Rootset and the
+%% second is the Extensions and then Altnum must also be a tuple with the
+%% lengths of the 2 lists
+%%
+set_choice(Alt,{L1,L2},{Len1,_Len2}) ->
+    case set_choice_tag(Alt,L1) of
+	N when integer(N), Len1 > 1 ->
+	    [{bits,1,0}, % the value is in the root set
+	     encode_integer([{'ValueRange',{0,Len1-1}}],N)];
+	N when integer(N) ->
+	    [{bits,1,0}]; % no encoding if only 0 or 1 alternative
+	false ->
+	    [{bits,1,1}, % extension value
+	     case set_choice_tag(Alt,L2) of
+		 N2 when integer(N2) ->
+		     encode_small_number(N2);
+		 false ->
+		     unknown_choice_alt
+	     end]
+    end;
+set_choice(Alt,L,Len) ->
+    case set_choice_tag(Alt,L) of
+	N when integer(N), Len > 1 ->
+	    encode_integer([{'ValueRange',{0,Len-1}}],N);
+	N when integer(N) ->
+	    []; % no encoding if only 0 or 1 alternative
+	false ->
+	    [unknown_choice_alt]
+    end.
+
+set_choice_tag(Alt,Choices) ->
+    set_choice_tag(Alt,Choices,0).
+
+set_choice_tag(Alt,[Alt|_Rest],Tag) ->
+    Tag;
+set_choice_tag(Alt,[_H|Rest],Tag) ->
+    set_choice_tag(Alt,Rest,Tag+1);
+set_choice_tag(_Alt,[],_Tag) ->
+    false.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_fragmented_XXX; decode of values encoded fragmented according
+%% to ITU-T X.691 clause 10.9.3.8. The unit (XXX) is either bits, octets,
+%% characters or number of components (in a choice,sequence or similar).
+%% Buffer is a buffer {Used, Bin}.
+%% C is the constrained length.
+%% If the buffer is not aligned, this function does that.
+decode_fragmented_bits({0,Buffer},C) ->
+    decode_fragmented_bits(Buffer,C,[]);
+decode_fragmented_bits({_N,<<_,Bs/binary>>},C) ->
+    decode_fragmented_bits(Bs,C,[]).
+
+decode_fragmented_bits(<<3:2,Len:6,Bin/binary>>,C,Acc) ->
+    {Value,Bin2} = split_binary(Bin, Len * ?'16K'),
+    decode_fragmented_bits(Bin2,C,[Value,Acc]);
+decode_fragmented_bits(<<0:1,0:7,Bin/binary>>,C,Acc) ->
+    BinBits = list_to_binary(lists:reverse(Acc)),
+    case C of
+	Int when integer(Int),C == size(BinBits) ->
+	    {BinBits,{0,Bin}};
+	Int when integer(Int) ->
+	    exit({error,{asn1,{illegal_value,C,BinBits}}});
+	_ ->
+	    {BinBits,{0,Bin}}
+    end;
+decode_fragmented_bits(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
+    Result = {BinBits,{Used,_Rest}} =
+	case (Len rem 8) of
+	    0 ->
+		<<Value:Len/binary-unit:1,Bin2/binary>> = Bin,
+		{list_to_binary(lists:reverse([Value|Acc])),{0,Bin2}};
+	    Rem ->
+		Bytes = Len div 8,
+		U = 8 - Rem,
+		<<Value:Bytes/binary-unit:8,Bits1:Rem,Bits2:U,Bin2/binary>> = Bin,
+		{list_to_binary(lists:reverse([Bits1 bsl U,Value|Acc])),
+		 {Rem,<<Bits2,Bin2/binary>>}}
+	end,
+    case C of
+	 Int when integer(Int),C == (size(BinBits) - ((8 - Used) rem 8)) ->
+	    Result;
+	Int when integer(Int) ->
+	    exit({error,{asn1,{illegal_value,C,BinBits}}});
+	_ ->
+	    Result
+    end.
+
+
+decode_fragmented_octets({0,Bin},C) ->
+    decode_fragmented_octets(Bin,C,[]);
+decode_fragmented_octets({_N,<<_,Bs/binary>>},C) ->
+    decode_fragmented_octets(Bs,C,[]).
+
+decode_fragmented_octets(<<3:2,Len:6,Bin/binary>>,C,Acc) ->
+    {Value,Bin2} = split_binary(Bin,Len * ?'16K'),
+    decode_fragmented_octets(Bin2,C,[Value,Acc]);
+decode_fragmented_octets(<<0:1,0:7,Bin/binary>>,C,Acc) ->
+    Octets = list_to_binary(lists:reverse(Acc)),
+    case C of
+	Int when integer(Int), C == size(Octets) ->
+	    {Octets,{0,Bin}};
+	Int when integer(Int) ->
+	    exit({error,{asn1,{illegal_value,C,Octets}}});
+	_ ->
+	    {Octets,{0,Bin}}
+    end;
+decode_fragmented_octets(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
+    <<Value:Len/binary-unit:8,Bin2/binary>> = Bin,
+    BinOctets = list_to_binary(lists:reverse([Value|Acc])),
+    case C of
+	Int when integer(Int),size(BinOctets) == Int ->
+	    {BinOctets,Bin2};
+	Int when integer(Int) ->
+	    exit({error,{asn1,{illegal_value,C,BinOctets}}});
+	_ ->
+	    {BinOctets,Bin2}
+    end.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_open_type(Constraint, Value) -> CompleteList
+%% Value = list of bytes of an already encoded value (the list must be flat)
+%%         | binary
+%% Contraint = not used in this version
+%%
+encode_open_type(_C, Val) when list(Val) ->
+    Bin = list_to_binary(Val),
+    [encode_length(undefined,size(Bin)),{octets,Bin}]; % octets implies align
+encode_open_type(_C, Val) when binary(Val) ->
+    [encode_length(undefined,size(Val)),{octets,Val}]. % octets implies align
+%% the binary_to_list is not optimal but compatible with the current solution
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_open_type(Buffer,Constraint) -> Value
+%% Constraint is not used in this version
+%% Buffer = [byte] with PER encoded data
+%% Value = [byte] with decoded data (which must be decoded again as some type)
+%%
+decode_open_type(Bytes, _C) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    getoctets_as_bin(Bytes2,Len).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_integer(Constraint,Value,NamedNumberList) -> CompleteList
+%% encode_integer(Constraint,Value) -> CompleteList
+%% encode_integer(Constraint,{Name,Value}) -> CompleteList
+%%
+%%
+encode_integer(C,V,NamedNumberList) when atom(V) ->
+    case lists:keysearch(V,1,NamedNumberList) of
+	{value,{_,NewV}} ->
+	    encode_integer(C,NewV);
+	_ ->
+	    exit({error,{asn1,{namednumber,V}}})
+    end;
+encode_integer(C,V,_NamedNumberList) when integer(V) ->
+    encode_integer(C,V);
+encode_integer(C,{Name,V},NamedNumberList) when atom(Name) ->
+    encode_integer(C,V,NamedNumberList).
+
+encode_integer(C,{Name,Val}) when atom(Name) ->
+    encode_integer(C,Val);
+
+encode_integer([{Rc,_Ec}],Val) when tuple(Rc) -> % XXX when is this invoked? First argument most often a list,...Ok this is the extension case...but it doesn't work.
+    case (catch encode_integer([Rc],Val)) of
+	{'EXIT',{error,{asn1,_}}} ->
+	    [{bits,1,1},encode_unconstrained_number(Val)];
+	Encoded ->
+	    [{bits,1,0},Encoded]
+    end;
+encode_integer(C,Val ) when list(C) ->
+    case get_constraint(C,'SingleValue') of
+	no ->
+	    encode_integer1(C,Val);
+	V when integer(V),V == Val ->
+	    []; % a type restricted to a single value encodes to nothing
+	V when list(V) ->
+	    case lists:member(Val,V) of
+		true ->
+		    encode_integer1(C,Val);
+		_ ->
+		    exit({error,{asn1,{illegal_value,Val}}})
+	    end;
+	_ ->
+	    exit({error,{asn1,{illegal_value,Val}}})
+    end.
+
+encode_integer1(C, Val) ->
+    case VR = get_constraint(C,'ValueRange') of
+	no ->
+	    encode_unconstrained_number(Val);
+	{Lb,'MAX'} ->
+	    encode_semi_constrained_number(Lb,Val);
+	%% positive with range
+	{Lb,Ub} when Val >= Lb,
+		     Ub >= Val ->
+	    encode_constrained_number(VR,Val);
+	_ ->
+	    exit({error,{asn1,{illegal_value,VR,Val}}})
+    end.
+
+decode_integer(Buffer,Range,NamedNumberList) ->
+    {Val,Buffer2} = decode_integer(Buffer,Range),
+    case lists:keysearch(Val,2,NamedNumberList) of
+	{value,{NewVal,_}} -> {NewVal,Buffer2};
+	_ -> {Val,Buffer2}
+    end.
+
+decode_integer(Buffer,[{Rc,_Ec}]) when tuple(Rc) ->
+    {Ext,Buffer2} = getext(Buffer),
+    case Ext of
+	0 -> decode_integer(Buffer2,[Rc]);
+	1 -> decode_unconstrained_number(Buffer2)
+    end;
+decode_integer(Buffer,undefined) ->
+    decode_unconstrained_number(Buffer);
+decode_integer(Buffer,C) ->
+    case get_constraint(C,'SingleValue') of
+	V when integer(V) ->
+	    {V,Buffer};
+	V when list(V) ->
+	    {Val,Buffer2} = decode_integer1(Buffer,C),
+	    case lists:member(Val,V) of
+		true ->
+		    {Val,Buffer2};
+		_ ->
+		    exit({error,{asn1,{illegal_value,Val}}})
+	    end;
+	_ ->
+	    decode_integer1(Buffer,C)
+    end.
+
+decode_integer1(Buffer,C) ->
+    case VR = get_constraint(C,'ValueRange') of
+	no ->
+	    decode_unconstrained_number(Buffer);
+	{Lb, 'MAX'} ->
+	    decode_semi_constrained_number(Buffer,Lb);
+	{_,_} ->
+	    decode_constrained_number(Buffer,VR)
+    end.
+
+						% X.691:10.6 Encoding of a normally small non-negative whole number
+						% Use this for encoding of CHOICE index if there is an extension marker in
+						% the CHOICE
+encode_small_number({Name,Val}) when atom(Name) ->
+    encode_small_number(Val);
+encode_small_number(Val) when Val =< 63 ->
+%    [{bits,1,0},{bits,6,Val}];
+    [{bits,7,Val}]; % same as above but more efficient
+encode_small_number(Val) ->
+    [{bits,1,1},encode_semi_constrained_number(0,Val)].
+
+decode_small_number(Bytes) ->
+    {Bit,Bytes2} = getbit(Bytes),
+    case Bit of
+	0 ->
+	    getbits(Bytes2,6);
+	1 ->
+	    decode_semi_constrained_number(Bytes2,0)
+    end.
+
+%% X.691:10.7 Encoding of a semi-constrained whole number
+%% might be an optimization encode_semi_constrained_number(0,Val) ->
+encode_semi_constrained_number(C,{Name,Val}) when atom(Name) ->
+    encode_semi_constrained_number(C,Val);
+encode_semi_constrained_number({Lb,'MAX'},Val) ->
+    encode_semi_constrained_number(Lb,Val);
+encode_semi_constrained_number(Lb,Val) ->
+    Val2 = Val - Lb,
+    Oct = eint_positive(Val2),
+    Len = length(Oct),
+    if
+	Len < 128 ->
+	    {octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
+	true ->
+	    [encode_length(undefined,Len),{octets,Oct}]
+    end.
+
+decode_semi_constrained_number(Bytes,{Lb,_}) ->
+    decode_semi_constrained_number(Bytes,Lb);
+decode_semi_constrained_number(Bytes,Lb) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {V,Bytes3} = getoctets(Bytes2,Len),
+    {V+Lb,Bytes3}.
+
+encode_constrained_number(Range,{Name,Val}) when atom(Name) ->
+    encode_constrained_number(Range,Val);
+encode_constrained_number({Lb,Ub},Val) when Val >= Lb, Ub >= Val ->
+    Range = Ub - Lb + 1,
+    Val2 = Val - Lb,
+    if
+	Range  == 2 ->
+	    {bits,1,Val2};
+	Range  =< 4 ->
+	    {bits,2,Val2};
+	Range  =< 8 ->
+	    {bits,3,Val2};
+	Range  =< 16 ->
+	    {bits,4,Val2};
+	Range  =< 32 ->
+	    {bits,5,Val2};
+	Range  =< 64 ->
+	    {bits,6,Val2};
+	Range  =< 128 ->
+	    {bits,7,Val2};
+	Range  =< 255 ->
+	    {bits,8,Val2};
+	Range  =< 256 ->
+	    {octets,[Val2]};
+	Range  =< 65536 ->
+	    {octets,<<Val2:16>>};
+	Range =< 16#1000000  ->
+	    Octs = eint_positive(Val2),
+	    [{bits,2,length(Octs)-1},{octets,Octs}];
+	Range =< 16#100000000  ->
+	    Octs = eint_positive(Val2),
+	    [{bits,2,length(Octs)-1},{octets,Octs}];
+	Range =< 16#10000000000  ->
+	    Octs = eint_positive(Val2),
+	    [{bits,3,length(Octs)-1},{octets,Octs}];
+	true  ->
+	    exit({not_supported,{integer_range,Range}})
+    end;
+encode_constrained_number(Range,Val) ->
+    exit({error,{asn1,{integer_range,Range,value,Val}}}).
+
+
+decode_constrained_number(Buffer,{Lb,Ub}) ->
+    Range = Ub - Lb + 1,
+						%    Val2 = Val - Lb,
+    {Val,Remain} =
+	if
+	    Range  == 2 ->
+		getbits(Buffer,1);
+	    Range  =< 4 ->
+		getbits(Buffer,2);
+	    Range  =< 8 ->
+		getbits(Buffer,3);
+	    Range  =< 16 ->
+		getbits(Buffer,4);
+	    Range  =< 32 ->
+		getbits(Buffer,5);
+	    Range  =< 64 ->
+		getbits(Buffer,6);
+	    Range  =< 128 ->
+		getbits(Buffer,7);
+	    Range  =< 255 ->
+		getbits(Buffer,8);
+	    Range  =< 256 ->
+		getoctets(Buffer,1);
+	    Range  =< 65536 ->
+		getoctets(Buffer,2);
+	    Range =< 16#1000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,3}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	    Range =< 16#100000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,4}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	    Range =< 16#10000000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,5}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	    true  ->
+		exit({not_supported,{integer_range,Range}})
+	end,
+    {Val+Lb,Remain}.
+
+%% X.691:10.8 Encoding of an unconstrained whole number
+
+encode_unconstrained_number(Val) when Val >= 0 ->
+    Oct = eint(Val,[]),
+    Len = length(Oct),
+    if
+	Len < 128 ->
+	    {octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
+	true ->
+	    [encode_length(undefined,Len),{octets,Oct}]
+    end;
+encode_unconstrained_number(Val) -> % negative
+    Oct = enint(Val,[]),
+    Len = length(Oct),
+    if
+	Len < 128 ->
+	    {octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
+	true ->
+	    [encode_length(undefined,Len),{octets,Oct}]
+    end.
+
+
+%% used for positive Values which don't need a sign bit
+%% returns a binary
+eint_positive(Val) ->
+    case eint(Val,[]) of
+	[0,B1|T] ->
+	    [B1|T];
+	T ->
+	    T
+    end.
+
+
+eint(0, [B|Acc]) when B < 128 ->
+    [B|Acc];
+eint(N, Acc) ->
+    eint(N bsr 8, [N band 16#ff| Acc]).
+
+enint(-1, [B1|T]) when B1 > 127 ->
+    [B1|T];
+enint(N, Acc) ->
+    enint(N bsr 8, [N band 16#ff|Acc]).
+
+decode_unconstrained_number(Bytes) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {Ints,Bytes3} = getoctets_as_list(Bytes2,Len),
+    {dec_integer(Ints),Bytes3}.
+
+dec_pos_integer(Ints) ->
+    decpint(Ints, 8 * (length(Ints) - 1)).
+dec_integer(Ints) when hd(Ints) band 255 =< 127 -> %% Positive number
+    decpint(Ints, 8 * (length(Ints) - 1));
+dec_integer(Ints) ->                        %% Negative
+    decnint(Ints,  8 * (length(Ints) - 1)).
+
+decpint([Byte|Tail], Shift) ->
+    (Byte bsl Shift) bor decpint(Tail, Shift-8);
+decpint([], _) -> 0.
+
+decnint([Byte|Tail], Shift) ->
+    (-128 + (Byte band 127) bsl Shift) bor decpint(Tail, Shift-8).
+
+% minimum_octets(Val) ->
+%     minimum_octets(Val,[]).
+
+% minimum_octets(Val,Acc) when Val > 0 ->
+%     minimum_octets((Val bsr 8),[Val band 16#FF|Acc]);
+% minimum_octets(0,Acc) ->
+%     Acc.
+
+
+%% X.691:10.9 Encoding of a length determinant
+%%encode_small_length(undefined,Len) -> % null means no UpperBound
+%%    encode_small_number(Len).
+
+%% X.691:10.9.3.5
+%% X.691:10.9.3.7
+encode_length(undefined,Len) -> % un-constrained
+    if
+	Len < 128 ->
+	    {octets,[Len]};
+	Len < 16384 ->
+	    {octets,<<2:2,Len:14>>};
+	true  -> % should be able to endode length >= 16384
+	    exit({error,{asn1,{encode_length,{nyi,above_16k}}}})
+    end;
+
+encode_length({0,'MAX'},Len) ->
+    encode_length(undefined,Len);
+encode_length(Vr={Lb,Ub},Len) when Ub =< 65535 ,Lb >= 0 -> % constrained
+    encode_constrained_number(Vr,Len);
+encode_length({Lb,_Ub},Len) when integer(Lb), Lb >= 0 -> % Ub > 65535
+    encode_length(undefined,Len);
+encode_length({Vr={Lb,Ub},[]},Len) when Ub =< 65535 ,Lb >= 0 ->
+    %% constrained extensible
+    [{bits,1,0},encode_constrained_number(Vr,Len)];
+encode_length(SingleValue,_Len) when integer(SingleValue) ->
+    [].
+
+%% X.691 10.9.3.4 (only used for length of bitmap that prefixes extension
+%% additions in a sequence or set
+encode_small_length(Len) when Len =< 64 ->
+%%    [{bits,1,0},{bits,6,Len-1}];
+    {bits,7,Len-1}; % the same as above but more efficient
+encode_small_length(Len) ->
+    [{bits,1,1},encode_length(undefined,Len)].
+
+% decode_small_length({Used,<<_:Used,0:1,Num:6,_:((8-Used+1) rem 8),Rest/binary>>}) ->
+%     case Buffer of
+% 	<<_:Used,0:1,Num:6,_:((8-Used+1) rem 8),Rest/binary>> ->
+% 	    {Num,
+%     case getbit(Buffer) of
+% 	{0,Remain} ->
+% 	    {Bits,Remain2} = getbits(Remain,6),
+% 	    {Bits+1,Remain2};
+% 	{1,Remain} ->
+% 	    decode_length(Remain,undefined)
+%     end.
+
+decode_small_length(Buffer) ->
+    case getbit(Buffer) of
+	{0,Remain} ->
+	    {Bits,Remain2} = getbits(Remain,6),
+	    {Bits+1,Remain2};
+	{1,Remain} ->
+	    decode_length(Remain,undefined)
+    end.
+
+decode_length(Buffer) ->
+    decode_length(Buffer,undefined).
+
+decode_length(Buffer,undefined)  -> % un-constrained
+    {0,Buffer2} = align(Buffer),
+    case Buffer2 of
+	<<0:1,Oct:7,Rest/binary>> ->
+	    {Oct,{0,Rest}};
+	<<2:2,Val:14,Rest/binary>> ->
+	    {Val,{0,Rest}};
+	<<3:2,_:14,_Rest/binary>> ->
+	    %% this case should be fixed
+	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}})
+    end;
+%%    {Bits,_} = getbits(Buffer2,2),
+%     case Bits of
+% 	2 ->
+% 	    {Val,Bytes3} = getoctets(Buffer2,2),
+% 	    {(Val band 16#3FFF),Bytes3};
+% 	3 ->
+% 	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}});
+% 	_ ->
+% 	    {Val,Bytes3} = getoctet(Buffer2),
+% 	    {Val band 16#7F,Bytes3}
+%     end;
+
+decode_length(Buffer,{Lb,Ub}) when Ub =< 65535 ,Lb >= 0 -> % constrained
+    decode_constrained_number(Buffer,{Lb,Ub});
+decode_length(_,{Lb,_}) when integer(Lb), Lb >= 0 -> % Ub > 65535
+    exit({error,{asn1,{decode_length,{nyi,above_64K}}}});
+decode_length(Buffer,{{Lb,Ub},[]}) ->
+    case getbit(Buffer) of
+	{0,Buffer2} ->
+	    decode_length(Buffer2, {Lb,Ub})
+    end;
+
+
+%When does this case occur with {_,_Lb,Ub} ??
+% X.691:10.9.3.5
+decode_length({Used,Bin},{_,_Lb,_Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub NOTE! this case does not cover case when Ub > 65535
+    Unused = (8-Used) rem 8,
+    case Bin of
+	<<_:Used,0:1,Val:7,R:Unused,Rest/binary>> ->
+	    {Val,{Used,<<R,Rest/binary>>}};
+	<<_:Used,_:Unused,2:2,Val:14,Rest/binary>> ->
+	    {Val, {0,Rest}};
+	<<_:Used,_:Unused,3:2,_:14,_Rest/binary>> ->
+	    exit({error,{asn1,{decode_length,{nyi,length_above_64K}}}})
+    end;
+% decode_length(Buffer,{_,_Lb,Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub
+%     case getbit(Buffer) of
+% 	{0,Remain} ->
+% 	    getbits(Remain,7);
+% 	{1,Remain} ->
+% 	    {Val,Remain2} = getoctets(Buffer,2),
+% 	    {Val band 2#0111111111111111, Remain2}
+%     end;
+decode_length(Buffer,SingleValue) when integer(SingleValue) ->
+    {SingleValue,Buffer}.
+
+
+						% X.691:11
+encode_boolean(true) ->
+    {bits,1,1};
+encode_boolean(false) ->
+    {bits,1,0};
+encode_boolean({Name,Val}) when atom(Name) ->
+    encode_boolean(Val);
+encode_boolean(Val) ->
+    exit({error,{asn1,{encode_boolean,Val}}}).
+
+decode_boolean(Buffer) -> %when record(Buffer,buffer)
+    case getbit(Buffer) of
+	{1,Remain} -> {true,Remain};
+	{0,Remain} -> {false,Remain}
+    end.
+
+
+%% ENUMERATED with extension marker
+decode_enumerated(Buffer,C,{Ntup1,Ntup2}) when tuple(Ntup1), tuple(Ntup2) ->
+    {Ext,Buffer2} = getext(Buffer),
+    case Ext of
+	0 -> % not an extension value
+	    {Val,Buffer3} = decode_integer(Buffer2,C),
+	    case catch (element(Val+1,Ntup1)) of
+		NewVal when atom(NewVal) -> {NewVal,Buffer3};
+		_Error -> exit({error,{asn1,{decode_enumerated,{Val,[Ntup1,Ntup2]}}}})
+	    end;
+	1 -> % this an extension value
+	    {Val,Buffer3} = decode_small_number(Buffer2),
+	    case catch (element(Val+1,Ntup2)) of
+		NewVal when atom(NewVal) -> {NewVal,Buffer3};
+		_ -> {{asn1_enum,Val},Buffer3}
+	    end
+    end;
+
+decode_enumerated(Buffer,C,NamedNumberTup) when tuple(NamedNumberTup) ->
+    {Val,Buffer2} = decode_integer(Buffer,C),
+    case catch (element(Val+1,NamedNumberTup)) of
+	NewVal when atom(NewVal) -> {NewVal,Buffer2};
+	_Error -> exit({error,{asn1,{decode_enumerated,{Val,NamedNumberTup}}}})
+    end.
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Bitstring value, ITU_T X.690 Chapter 8.5
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+%%===============================================================================
+%% encode bitstring value
+%%===============================================================================
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% bitstring NamedBitList
+%% Val can be  of:
+%% - [identifiers] where only named identifers are set to one,
+%%   the Constraint must then have some information of the
+%%   bitlength.
+%% - [list of ones and zeroes] all bits
+%% - integer value representing the bitlist
+%% C is constraint Len, only valid when identifiers
+
+
+%% when the value is a list of {Unused,BinBits}, where
+%% Unused = integer(),
+%% BinBits = binary().
+
+encode_bit_string(C,Bin={Unused,BinBits},NamedBitList) when integer(Unused),
+							    binary(BinBits) ->
+    encode_bin_bit_string(C,Bin,NamedBitList);
+
+%% when the value is a list of named bits
+encode_bit_string(C, LoNB=[FirstVal | _RestVal], NamedBitList) when atom(FirstVal) ->
+    ToSetPos = get_all_bitposes(LoNB, NamedBitList, []),
+    BitList = make_and_set_list(ToSetPos,0),
+    encode_bit_string(C,BitList,NamedBitList);
+
+encode_bit_string(C, BL=[{bit,_No} | _RestVal], NamedBitList) ->
+    ToSetPos = get_all_bitposes(BL, NamedBitList, []),
+    BitList = make_and_set_list(ToSetPos,0),
+    encode_bit_string(C,BitList,NamedBitList);
+
+%% when the value is a list of ones and zeroes
+
+% encode_bit_string(C, BitListValue, NamedBitList) when list(BitListValue) ->
+%     Bl1 =
+% 	case NamedBitList of
+% 	    [] ->  % dont remove trailing zeroes
+% 		BitListValue;
+% 	    _ -> % first remove any trailing zeroes
+% 		lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,
+% 					      lists:reverse(BitListValue)))
+% 	end,
+%     BitList = [{bit,X} || X <- Bl1],
+% %%    BListLen = length(BitList),
+%     case get_constraint(C,'SizeConstraint') of
+% 	0 -> % fixed length
+% 	    []; % nothing to encode
+% 	V when integer(V),V=<16 -> % fixed length 16 bits or less
+% 	    pad_list(V,BitList);
+% 	V when integer(V) -> % fixed length 16 bits or more
+% 	    [align,pad_list(V,BitList)]; % should be another case for V >= 65537
+% 	{Lb,Ub} when integer(Lb),integer(Ub) ->
+% 	    [encode_length({Lb,Ub},length(BitList)),align,BitList];
+% 	no ->
+% 	    [encode_length(undefined,length(BitList)),align,BitList];
+% 	Sc -> % extension marker
+% 	    [encode_length(Sc,length(BitList)),align,BitList]
+%     end;
+encode_bit_string(C, BitListValue, NamedBitList) when list(BitListValue) ->
+    BitListToBinary =
+	%% fun that transforms a list of 1 and 0 to a tuple:
+	%% {UnusedBitsInLastByte, Binary}
+	fun([H|T],Acc,N,Fun) ->
+		Fun(T,(Acc bsl 1)+H,N+1,Fun);
+	   ([],Acc,N,_) ->
+		Unused = (8 - (N rem 8)) rem 8,
+		{Unused,<<Acc:N,0:Unused>>}
+	end,
+    UnusedAndBin =
+	case NamedBitList of
+	    [] ->  % dont remove trailing zeroes
+		BitListToBinary(BitListValue,0,0,BitListToBinary);
+	    _ ->
+		BitListToBinary(lists:reverse(
+			       lists:dropwhile(fun(0)->true;(1)->false end,
+					       lists:reverse(BitListValue))),
+			     0,0,BitListToBinary)
+	end,
+    encode_bin_bit_string(C,UnusedAndBin,NamedBitList);
+
+%% when the value is an integer
+encode_bit_string(C, IntegerVal, NamedBitList) when integer(IntegerVal)->
+    BitList = int_to_bitlist(IntegerVal),
+    encode_bit_string(C,BitList,NamedBitList);
+
+%% when the value is a tuple
+encode_bit_string(C,{Name,Val}, NamedBitList) when atom(Name) ->
+    encode_bit_string(C,Val,NamedBitList).
+
+
+%% encode_bin_bit_string/3, when value is a tuple of Unused and BinBits.
+%% Unused = integer(),i.e. number unused bits in least sign. byte of
+%% BinBits = binary().
+
+
+encode_bin_bit_string(C,UnusedAndBin={_Unused,_BinBits},NamedBitList) ->
+    Constr = get_constraint(C,'SizeConstraint'),
+    UnusedAndBin1 = {Unused1,Bin1} =
+	remove_trailing_bin(NamedBitList,UnusedAndBin,lower_bound(Constr)),
+    case Constr of
+	0 ->
+	    [];
+	V when integer(V),V=<16 ->
+	    {Unused2,Bin2} = pad_list(V,UnusedAndBin1),
+	    <<BitVal:V,_:Unused2>> = Bin2,
+	    {bits,V,BitVal};
+	V when integer(V) ->
+	    [align, pad_list(V, UnusedAndBin1)];
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+	    [encode_length({Lb,Ub},size(Bin1)*8 - Unused1),
+	     align,UnusedAndBin1];
+	no ->
+	    [encode_length(undefined,size(Bin1)*8 - Unused1),
+	     align,UnusedAndBin1];
+	Sc ->
+	    [encode_length(Sc,size(Bin1)*8 - Unused1),
+	     align,UnusedAndBin1]
+    end.
+
+remove_trailing_bin([], {Unused,Bin},_) ->
+    {Unused,Bin};
+remove_trailing_bin(NamedNumberList, {_Unused,Bin},C) ->
+    Size = size(Bin)-1,
+    <<Bfront:Size/binary, LastByte:8>> = Bin,
+    %% clear the Unused bits to be sure
+%    LastByte1 = LastByte band (((1 bsl Unused) -1) bxor 255),
+    Unused1 = trailingZeroesInNibble(LastByte band 15),
+    Unused2 =
+	case Unused1 of
+	    4 ->
+		4 + trailingZeroesInNibble(LastByte bsr 4);
+	    _ -> Unused1
+	end,
+    case Unused2 of
+	8 ->
+	    remove_trailing_bin(NamedNumberList,{0,Bfront},C);
+	_ ->
+	    case C of
+		Int when integer(Int),Int > ((size(Bin)*8)-Unused2) ->
+		    %% this padding see OTP-4353
+		    pad_list(Int,{Unused2,Bin});
+		_ -> {Unused2,Bin}
+	    end
+    end.
+
+
+trailingZeroesInNibble(0) ->
+    4;
+trailingZeroesInNibble(1) ->
+    0;
+trailingZeroesInNibble(2) ->
+    1;
+trailingZeroesInNibble(3) ->
+    0;
+trailingZeroesInNibble(4) ->
+    2;
+trailingZeroesInNibble(5) ->
+    0;
+trailingZeroesInNibble(6) ->
+    1;
+trailingZeroesInNibble(7) ->
+    0;
+trailingZeroesInNibble(8) ->
+    3;
+trailingZeroesInNibble(9) ->
+    0;
+trailingZeroesInNibble(10) ->
+    1;
+trailingZeroesInNibble(11) ->
+    0;
+trailingZeroesInNibble(12) -> %#1100
+    2;
+trailingZeroesInNibble(13) ->
+    0;
+trailingZeroesInNibble(14) ->
+    1;
+trailingZeroesInNibble(15) ->
+    0.
+
+lower_bound({{Lb,_},_}) when integer(Lb) ->
+    Lb;
+lower_bound({Lb,_}) when integer(Lb) ->
+    Lb;
+lower_bound(C) ->
+    C.
+
+%%%%%%%%%%%%%%%
+%% The result is presented as a list of named bits (if possible)
+%% else as a tuple {Unused,Bits}. Unused is the number of unused
+%% bits, least significant bits in the last byte of Bits. Bits is
+%% the BIT STRING represented as a binary.
+%%
+decode_compact_bit_string(Buffer, C, NamedNumberList) ->
+    case get_constraint(C,'SizeConstraint') of
+	0 -> % fixed length
+	    {{8,0},Buffer};
+	V when integer(V),V=<16 -> %fixed length 16 bits or less
+	    compact_bit_string(Buffer,V,NamedNumberList);
+	V when integer(V),V=<65536 -> %fixed length > 16 bits
+	    Bytes2 = align(Buffer),
+	    compact_bit_string(Bytes2,V,NamedNumberList);
+	V when integer(V) -> % V > 65536 => fragmented value
+	    {Bin,Buffer2} = decode_fragmented_bits(Buffer,V),
+	    case Buffer2 of
+		{0,_} -> {{0,Bin},Buffer2};
+		{U,_} -> {{8-U,Bin},Buffer2}
+	    end;
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+	    %% This case may demand decoding of fragmented length/value
+	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
+	    Bytes3 = align(Bytes2),
+	    compact_bit_string(Bytes3,Len,NamedNumberList);
+	no ->
+	    %% This case may demand decoding of fragmented length/value
+	    {Len,Bytes2} = decode_length(Buffer,undefined),
+	    Bytes3 = align(Bytes2),
+	    compact_bit_string(Bytes3,Len,NamedNumberList);
+	Sc ->
+	    {Len,Bytes2} = decode_length(Buffer,Sc),
+	    Bytes3 = align(Bytes2),
+	    compact_bit_string(Bytes3,Len,NamedNumberList)
+    end.
+
+
+%%%%%%%%%%%%%%%
+%% The result is presented as a list of named bits (if possible)
+%% else as a list of 0 and 1.
+%%
+decode_bit_string(Buffer, C, NamedNumberList) ->
+    case get_constraint(C,'SizeConstraint') of
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
+	    Bytes3 = align(Bytes2),
+	    bit_list_or_named(Bytes3,Len,NamedNumberList);
+	no ->
+	    {Len,Bytes2} = decode_length(Buffer,undefined),
+	    Bytes3 = align(Bytes2),
+	    bit_list_or_named(Bytes3,Len,NamedNumberList);
+	0 -> % fixed length
+	    {[],Buffer}; % nothing to encode
+	V when integer(V),V=<16 -> % fixed length 16 bits or less
+	    bit_list_or_named(Buffer,V,NamedNumberList);
+	V when integer(V),V=<65536 ->
+	    Bytes2 = align(Buffer),
+	    bit_list_or_named(Bytes2,V,NamedNumberList);
+	V when integer(V) ->
+	    Bytes2 = align(Buffer),
+	    {BinBits,_} = decode_fragmented_bits(Bytes2,V),
+	    bit_list_or_named(BinBits,V,NamedNumberList);
+	Sc -> % extension marker
+	    {Len,Bytes2} = decode_length(Buffer,Sc),
+	    Bytes3 = align(Bytes2),
+	    bit_list_or_named(Bytes3,Len,NamedNumberList)
+    end.
+
+
+%% if no named bits are declared we will return a
+%% {Unused,Bits}. Unused = integer(),
+%% Bits = binary().
+compact_bit_string(Buffer,Len,[]) ->
+    getbits_as_binary(Len,Buffer); % {{Unused,BinBits},NewBuffer}
+compact_bit_string(Buffer,Len,NamedNumberList) ->
+    bit_list_or_named(Buffer,Len,NamedNumberList).
+
+
+%% if no named bits are declared we will return a
+%% BitList = [0 | 1]
+
+bit_list_or_named(Buffer,Len,[]) ->
+    getbits_as_list(Len,Buffer);
+
+%% if there are named bits declared we will return a named
+%% BitList where the names are atoms and unnamed bits represented
+%% as {bit,Pos}
+%% BitList = [atom() | {bit,Pos}]
+%% Pos = integer()
+
+bit_list_or_named(Buffer,Len,NamedNumberList) ->
+    {BitList,Rest} = getbits_as_list(Len,Buffer),
+    {bit_list_or_named1(0,BitList,NamedNumberList,[]), Rest}.
+
+bit_list_or_named1(Pos,[0|Bt],Names,Acc) ->
+    bit_list_or_named1(Pos+1,Bt,Names,Acc);
+bit_list_or_named1(Pos,[1|Bt],Names,Acc) ->
+    case lists:keysearch(Pos,2,Names) of
+	{value,{Name,_}} ->
+	    bit_list_or_named1(Pos+1,Bt,Names,[Name|Acc]);
+	_  ->
+	    bit_list_or_named1(Pos+1,Bt,Names,[{bit,Pos}|Acc])
+    end;
+bit_list_or_named1(_,[],_,Acc) ->
+    lists:reverse(Acc).
+
+
+
+%%%%%%%%%%%%%%%
+%%
+
+int_to_bitlist(Int) when integer(Int), Int > 0 ->
+    [Int band 1 | int_to_bitlist(Int bsr 1)];
+int_to_bitlist(0) ->
+    [].
+
+
+%%%%%%%%%%%%%%%%%%
+%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
+%%   [sorted_list_of_bitpositions_to_set]
+
+get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
+    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
+
+get_all_bitposes([Val | Rest], NamedBitList, Ack) ->
+    case lists:keysearch(Val, 1, NamedBitList) of
+	{value, {_ValName, ValPos}} ->
+	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
+	_ ->
+	    exit({error,{asn1, {bitstring_namedbit, Val}}})
+    end;
+get_all_bitposes([], _NamedBitList, Ack) ->
+    lists:sort(Ack).
+
+%%%%%%%%%%%%%%%%%%
+%% make_and_set_list([list of positions to set to 1])->
+%% returns list with all in SetPos set.
+%% in positioning in list the first element is 0, the second 1 etc.., but
+%%
+
+make_and_set_list([XPos|SetPos], XPos) ->
+    [1 | make_and_set_list(SetPos, XPos + 1)];
+make_and_set_list([Pos|SetPos], XPos) ->
+    [0 | make_and_set_list([Pos | SetPos], XPos + 1)];
+make_and_set_list([], _) ->
+    [].
+
+%%%%%%%%%%%%%%%%%
+%% pad_list(N,BitList) -> PaddedList
+%% returns a padded (with trailing {bit,0} elements) list of length N
+%% if Bitlist contains more than N significant bits set an exit asn1_error
+%% is generated
+
+pad_list(N,In={Unused,Bin}) ->
+    pad_list(N, size(Bin)*8 - Unused, In).
+
+pad_list(N,Size,In={_,_}) when N < Size ->
+    exit({error,{asn1,{range_error,{bit_string,In}}}});
+pad_list(N,Size,{Unused,Bin}) when N > Size, Unused > 0 ->
+    pad_list(N,Size+1,{Unused-1,Bin});
+pad_list(N,Size,{_Unused,Bin}) when N > Size ->
+    pad_list(N,Size+1,{7,<<Bin/binary,0>>});
+pad_list(N,N,In={_,_}) ->
+    In.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% X.691:16
+%% encode_octet_string(Constraint,ExtensionMarker,Val)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+encode_octet_string(C,Val) ->
+    encode_octet_string(C,false,Val).
+
+encode_octet_string(C,Bool,{_Name,Val}) ->
+    encode_octet_string(C,Bool,Val);
+encode_octet_string(_,true,_) ->
+    exit({error,{asn1,{'not_supported',extensionmarker}}});
+encode_octet_string(C,false,Val) ->
+    case get_constraint(C,'SizeConstraint') of
+	0 ->
+	    [];
+	1 ->
+	    [V] = Val,
+	    {bits,8,V};
+	2 ->
+	    [V1,V2] = Val,
+	    [{bits,8,V1},{bits,8,V2}];
+	Sv when Sv =<65535, Sv == length(Val) -> % fixed length
+	    {octets,Val};
+	{Lb,Ub}  ->
+	    [encode_length({Lb,Ub},length(Val)),{octets,Val}];
+	Sv when list(Sv) ->
+	    [encode_length({hd(Sv),lists:max(Sv)},length(Val)),{octets,Val}];
+	no  ->
+	    [encode_length(undefined,length(Val)),{octets,Val}]
+    end.
+
+decode_octet_string(Bytes,Range) ->
+    decode_octet_string(Bytes,Range,false).
+
+decode_octet_string(Bytes,C,false) ->
+    case get_constraint(C,'SizeConstraint') of
+	0 ->
+	    {[],Bytes};
+	1 ->
+	    {B1,Bytes2} = getbits(Bytes,8),
+	    {[B1],Bytes2};
+	2 ->
+	    {Bs,Bytes2}= getbits(Bytes,16),
+	    {binary_to_list(<<Bs:16>>),Bytes2};
+	{_,0} ->
+	    {[],Bytes};
+	Sv when integer(Sv), Sv =<65535 -> % fixed length
+	    getoctets_as_list(Bytes,Sv);
+	Sv when integer(Sv) -> % fragmented encoding
+	    Bytes2 = align(Bytes),
+	    decode_fragmented_octets(Bytes2,Sv);
+	{Lb,Ub}  ->
+	    {Len,Bytes2} = decode_length(Bytes,{Lb,Ub}),
+	    getoctets_as_list(Bytes2,Len);
+	Sv when list(Sv) ->
+	    {Len,Bytes2} = decode_length(Bytes,{hd(Sv),lists:max(Sv)}),
+	    getoctets_as_list(Bytes2,Len);
+	no  ->
+	    {Len,Bytes2} = decode_length(Bytes,undefined),
+	    getoctets_as_list(Bytes2,Len)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Restricted char string types
+%% (NumericString, PrintableString,VisibleString,IA5String,BMPString,UniversalString)
+%% X.691:26 and X.680:34-36
+%%encode_restricted_string(aligned,'BMPString',Constraints,Extension,Val)
+
+
+encode_restricted_string(aligned,{Name,Val}) when atom(Name) ->
+    encode_restricted_string(aligned,Val);
+
+encode_restricted_string(aligned,Val) when list(Val)->
+    [encode_length(undefined,length(Val)),{octets,Val}].
+
+encode_known_multiplier_string(aligned,StringType,C,_Ext,{Name,Val}) when atom(Name) ->
+    encode_known_multiplier_string(aligned,StringType,C,false,Val);
+
+encode_known_multiplier_string(aligned,StringType,C,_Ext,Val) ->
+    Result = chars_encode(C,StringType,Val),
+    NumBits = get_NumBits(C,StringType),
+    case get_constraint(C,'SizeConstraint') of
+	Ub when integer(Ub), Ub*NumBits =< 16  ->
+	    case {StringType,Result} of
+		{'BMPString',{octets,Ol}} ->
+		    [{bits,8,Oct}||Oct <- Ol];
+		_ ->
+		    Result
+	    end;
+	0 ->
+	    [];
+	Ub when integer(Ub),Ub =<65535 -> % fixed length
+	    [align,Result];
+	{Ub,Lb} ->
+	    [encode_length({Ub,Lb},length(Val)),align,Result];
+	Vl when list(Vl) ->
+	    [encode_length({lists:min(Vl),lists:max(Vl)},length(Val)),align,Result];
+	no  ->
+	    [encode_length(undefined,length(Val)),align,Result]
+    end.
+
+decode_restricted_string(Bytes,aligned) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    getoctets_as_list(Bytes2,Len).
+
+decode_known_multiplier_string(Bytes,aligned,StringType,C,_Ext) ->
+    NumBits = get_NumBits(C,StringType),
+    case get_constraint(C,'SizeConstraint') of
+	Ub when integer(Ub), Ub*NumBits =< 16  ->
+	    chars_decode(Bytes,NumBits,StringType,C,Ub);
+	Ub when integer(Ub),Ub =<65535 -> % fixed length
+	    Bytes1 = align(Bytes),
+	    chars_decode(Bytes1,NumBits,StringType,C,Ub);
+	0 ->
+	    {[],Bytes};
+	Vl when list(Vl) ->
+	    {Len,Bytes1} = decode_length(Bytes,{hd(Vl),lists:max(Vl)}),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,C,Len);
+	no  ->
+	    {Len,Bytes1} = decode_length(Bytes,undefined),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,C,Len);
+	{Lb,Ub}->
+	    {Len,Bytes1} = decode_length(Bytes,{Lb,Ub}),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,C,Len)
+    end.
+
+
+encode_NumericString(C,Val) ->
+    encode_known_multiplier_string(aligned,'NumericString',C,false,Val).
+decode_NumericString(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'NumericString',C,false).
+
+encode_PrintableString(C,Val) ->
+    encode_known_multiplier_string(aligned,'PrintableString',C,false,Val).
+decode_PrintableString(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'PrintableString',C,false).
+
+encode_VisibleString(C,Val) -> % equivalent with ISO646String
+    encode_known_multiplier_string(aligned,'VisibleString',C,false,Val).
+decode_VisibleString(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'VisibleString',C,false).
+
+encode_IA5String(C,Val) ->
+    encode_known_multiplier_string(aligned,'IA5String',C,false,Val).
+decode_IA5String(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'IA5String',C,false).
+
+encode_BMPString(C,Val) ->
+    encode_known_multiplier_string(aligned,'BMPString',C,false,Val).
+decode_BMPString(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'BMPString',C,false).
+
+encode_UniversalString(C,Val) ->
+    encode_known_multiplier_string(aligned,'UniversalString',C,false,Val).
+decode_UniversalString(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'UniversalString',C,false).
+
+%% end of known-multiplier strings for which PER visible constraints are
+%% applied
+
+encode_GeneralString(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_GeneralString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_GraphicString(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_GraphicString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_ObjectDescriptor(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_ObjectDescriptor(Bytes) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_TeletexString(_C,Val) -> % equivalent with T61String
+    encode_restricted_string(aligned,Val).
+decode_TeletexString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_VideotexString(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_VideotexString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% getBMPChars(Bytes,Len) ->{BMPcharList,RemainingBytes}
+%%
+getBMPChars(Bytes,1) ->
+    {O1,Bytes2} = getbits(Bytes,8),
+    {O2,Bytes3} = getbits(Bytes2,8),
+    if
+	O1 == 0 ->
+	    {[O2],Bytes3};
+	true ->
+	    {[{0,0,O1,O2}],Bytes3}
+    end;
+getBMPChars(Bytes,Len) ->
+    getBMPChars(Bytes,Len,[]).
+
+getBMPChars(Bytes,0,Acc) ->
+    {lists:reverse(Acc),Bytes};
+getBMPChars(Bytes,Len,Acc) ->
+    {Octs,Bytes1} = getoctets_as_list(Bytes,2),
+    case Octs of
+	[0,O2] ->
+	    getBMPChars(Bytes1,Len-1,[O2|Acc]);
+	[O1,O2]->
+	    getBMPChars(Bytes1,Len-1,[{0,0,O1,O2}|Acc])
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% chars_encode(C,StringType,Value) -> ValueList
+%%
+%% encodes chars according to the per rules taking the constraint PermittedAlphabet
+%% into account.
+%% This function does only encode the value part and NOT the length
+
+chars_encode(C,StringType,Value) ->
+    case {StringType,get_constraint(C,'PermittedAlphabet')} of
+	{'UniversalString',{_,_Sv}} ->
+	    exit({error,{asn1,{'not implemented',"UniversalString with PermittedAlphabet constraint"}}});
+	{'BMPString',{_,_Sv}} ->
+	    exit({error,{asn1,{'not implemented',"BMPString with PermittedAlphabet constraint"}}});
+	_ ->
+	    {NumBits,CharOutTab} = {get_NumBits(C,StringType),get_CharOutTab(C,StringType)},
+	    chars_encode2(Value,NumBits,CharOutTab)
+    end.
+
+chars_encode2([H|T],NumBits,{Min,Max,notab}) when  H =< Max, H >= Min ->
+    [{bits,NumBits,H-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
+chars_encode2([H|T],NumBits,{Min,Max,Tab}) when H =< Max, H >= Min ->
+    [{bits,NumBits,exit_if_false(H,element(H-Min+1,Tab))}|chars_encode2(T,NumBits,{Min,Max,Tab})];
+chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,notab}) ->
+    %% no value range check here (ought to be, but very expensive)
+%    [{bits,NumBits,(A*B*C*D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
+    [{bits,NumBits,((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
+chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,Tab}) ->
+    %% no value range check here (ought to be, but very expensive)
+%    [{bits,NumBits,element((A*B*C*D)-Min,Tab)}|chars_encode2(T,NumBits,{Min,Max,notab})];
+    [{bits,NumBits,exit_if_false({A,B,C,D},element(((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min,Tab))}|chars_encode2(T,NumBits,{Min,Max,notab})];
+chars_encode2([H|_T],_,{_,_,_}) ->
+    exit({error,{asn1,{illegal_char_value,H}}});
+chars_encode2([],_,_) ->
+    [].
+
+exit_if_false(V,false)->
+    exit({error,{asn1,{"illegal value according to Permitted alphabet constraint",V}}});
+exit_if_false(_,V) ->V.
+
+
+get_NumBits(C,StringType) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	{'SingleValue',Sv} ->
+	    charbits(length(Sv),aligned);
+	no ->
+	    case StringType of
+		'IA5String' ->
+		    charbits(128,aligned); % 16#00..16#7F
+		'VisibleString' ->
+		    charbits(95,aligned); % 16#20..16#7E
+		'PrintableString' ->
+		    charbits(74,aligned); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+		'NumericString' ->
+		    charbits(11,aligned); % $ ,"0123456789"
+		'UniversalString' ->
+		    32;
+		'BMPString' ->
+		    16
+	    end
+    end.
+
+%%Maybe used later
+%%get_MaxChar(C,StringType) ->
+%%    case get_constraint(C,'PermittedAlphabet') of
+%%	{'SingleValue',Sv} ->
+%%	    lists:nth(length(Sv),Sv);
+%%	no ->
+%%	    case StringType of
+%%		'IA5String' ->
+%%		    16#7F; % 16#00..16#7F
+%%		'VisibleString' ->
+%%		    16#7E; % 16#20..16#7E
+%%		'PrintableString' ->
+%%		    $z; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+%%		'NumericString' ->
+%%		    $9; % $ ,"0123456789"
+%%		'UniversalString' ->
+%%		    16#ffffffff;
+%%		'BMPString' ->
+%%		    16#ffff
+%%	    end
+%%    end.
+
+%%Maybe used later
+%%get_MinChar(C,StringType) ->
+%%    case get_constraint(C,'PermittedAlphabet') of
+%%	{'SingleValue',Sv} ->
+%%	    hd(Sv);
+%%	no ->
+%%	    case StringType of
+%%		'IA5String' ->
+%%		    16#00; % 16#00..16#7F
+%%		'VisibleString' ->
+%%		    16#20; % 16#20..16#7E
+%%		'PrintableString' ->
+%%		    $\s; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+%%		'NumericString' ->
+%%		    $\s; % $ ,"0123456789"
+%%		'UniversalString' ->
+%%		    16#00;
+%%		'BMPString' ->
+%%		    16#00
+%%	    end
+%%    end.
+
+get_CharOutTab(C,StringType) ->
+    get_CharTab(C,StringType,out).
+
+get_CharInTab(C,StringType) ->
+    get_CharTab(C,StringType,in).
+
+get_CharTab(C,StringType,InOut) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	{'SingleValue',Sv} ->
+	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv,InOut);
+	no ->
+	    case StringType of
+		'IA5String' ->
+		    {0,16#7F,notab};
+		'VisibleString' ->
+		    get_CharTab2(C,StringType,16#20,16#7F,notab,InOut);
+		'PrintableString' ->
+		    Chars = lists:sort(
+			      " '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
+		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars,InOut);
+		'NumericString' ->
+		    get_CharTab2(C,StringType,16#20,$9," 0123456789",InOut);
+		'UniversalString' ->
+		    {0,16#FFFFFFFF,notab};
+		'BMPString' ->
+		    {0,16#FFFF,notab}
+	    end
+    end.
+
+get_CharTab2(C,StringType,Min,Max,Chars,InOut) ->
+    BitValMax = (1 bsl get_NumBits(C,StringType))-1,
+    if
+	Max =< BitValMax ->
+	    {0,Max,notab};
+	true ->
+	    case InOut of
+		out ->
+		    {Min,Max,create_char_tab(Min,Chars)};
+		in  ->
+		    {Min,Max,list_to_tuple(Chars)}
+	    end
+    end.
+
+create_char_tab(Min,L) ->
+    list_to_tuple(create_char_tab(Min,L,0)).
+create_char_tab(Min,[Min|T],V) ->
+    [V|create_char_tab(Min+1,T,V+1)];
+create_char_tab(_Min,[],_V) ->
+    [];
+create_char_tab(Min,L,V) ->
+    [false|create_char_tab(Min+1,L,V)].
+
+%% This very inefficient and should be moved to compiletime
+charbits(NumOfChars,aligned) ->
+    case charbits(NumOfChars) of
+	1 -> 1;
+	2 -> 2;
+	B when B =< 4 -> 4;
+	B when B =< 8 -> 8;
+	B when B =< 16 -> 16;
+	B when B =< 32 -> 32
+    end.
+
+charbits(NumOfChars) when NumOfChars =< 2 -> 1;
+charbits(NumOfChars) when NumOfChars =< 4 -> 2;
+charbits(NumOfChars) when NumOfChars =< 8 -> 3;
+charbits(NumOfChars) when NumOfChars =< 16 -> 4;
+charbits(NumOfChars) when NumOfChars =< 32 -> 5;
+charbits(NumOfChars) when NumOfChars =< 64 -> 6;
+charbits(NumOfChars) when NumOfChars =< 128 -> 7;
+charbits(NumOfChars) when NumOfChars =< 256 -> 8;
+charbits(NumOfChars) when NumOfChars =< 512 -> 9;
+charbits(NumOfChars) when NumOfChars =< 1024 -> 10;
+charbits(NumOfChars) when NumOfChars =< 2048 -> 11;
+charbits(NumOfChars) when NumOfChars =< 4096 -> 12;
+charbits(NumOfChars) when NumOfChars =< 8192 -> 13;
+charbits(NumOfChars) when NumOfChars =< 16384 -> 14;
+charbits(NumOfChars) when NumOfChars =< 32768 -> 15;
+charbits(NumOfChars) when NumOfChars =< 65536 -> 16;
+charbits(NumOfChars) when integer(NumOfChars) ->
+    16 + charbits1(NumOfChars bsr 16).
+
+charbits1(0) ->
+    0;
+charbits1(NumOfChars) ->
+    1 + charbits1(NumOfChars bsr 1).
+
+
+chars_decode(Bytes,_,'BMPString',C,Len) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	no ->
+	    getBMPChars(Bytes,Len);
+	_ ->
+	    exit({error,{asn1,
+			 {'not implemented',
+			  "BMPString with PermittedAlphabet constraint"}}})
+    end;
+chars_decode(Bytes,NumBits,StringType,C,Len) ->
+    CharInTab = get_CharInTab(C,StringType),
+    chars_decode2(Bytes,CharInTab,NumBits,Len).
+
+
+chars_decode2(Bytes,CharInTab,NumBits,Len) ->
+    chars_decode2(Bytes,CharInTab,NumBits,Len,[]).
+
+chars_decode2(Bytes,_CharInTab,_NumBits,0,Acc) ->
+    {lists:reverse(Acc),Bytes};
+chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    Result =
+	if
+	    Char < 256 -> Char;
+	    true ->
+		list_to_tuple(binary_to_list(<<Char:32>>))
+	end,
+    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
+% chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
+%     {Char,Bytes2} = getbits(Bytes,NumBits),
+%     Result = case minimum_octets(Char+Min) of
+% 		 [NewChar] -> NewChar;
+% 		 [C1,C2] -> {0,0,C1,C2};
+% 		 [C1,C2,C3] -> {0,C1,C2,C3};
+% 		 [C1,C2,C3,C4] -> {C1,C2,C3,C4}
+% 	     end,
+%     chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
+chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Char+Min|Acc]);
+
+%% BMPString and UniversalString with PermittedAlphabet is currently not supported
+chars_decode2(Bytes,{Min,Max,CharInTab},NumBits,Len,Acc) ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    chars_decode2(Bytes2,{Min,Max,CharInTab},NumBits,Len -1,[element(Char+1,CharInTab)|Acc]).
+
+
+						% X.691:17
+encode_null(_) -> []; % encodes to nothing
+encode_null({Name,Val}) when atom(Name) ->
+    encode_null(Val).
+
+decode_null(Bytes) ->
+    {'NULL',Bytes}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_object_identifier(Val) -> CompleteList
+%% encode_object_identifier({Name,Val}) -> CompleteList
+%% Val -> {Int1,Int2,...,IntN} % N >= 2
+%% Name -> atom()
+%% Int1 -> integer(0..2)
+%% Int2 -> integer(0..39) when Int1 (0..1) else integer()
+%% Int3-N -> integer()
+%% CompleteList -> [{bits,8,Val}|{octets,Ol}|align|...]
+%%
+encode_object_identifier({Name,Val}) when atom(Name) ->
+    encode_object_identifier(Val);
+encode_object_identifier(Val) ->
+    OctetList = e_object_identifier(Val),
+    Octets = list_to_binary(OctetList), % performs a flatten at the same time
+    [{debug,object_identifier},encode_length(undefined,size(Octets)),{octets,Octets}].
+
+%% This code is copied from asn1_encode.erl (BER) and corrected and modified
+
+e_object_identifier({'OBJECT IDENTIFIER',V}) ->
+    e_object_identifier(V);
+e_object_identifier({Cname,V}) when atom(Cname),tuple(V) ->
+    e_object_identifier(tuple_to_list(V));
+e_object_identifier({Cname,V}) when atom(Cname),list(V) ->
+    e_object_identifier(V);
+e_object_identifier(V) when tuple(V) ->
+    e_object_identifier(tuple_to_list(V));
+
+%% E1 = 0|1|2 and (E2 < 40 when E1 = 0|1)
+e_object_identifier([E1,E2|Tail]) when E1 >= 0, E1 < 2, E2 < 40 ; E1==2 ->
+    Head = 40*E1 + E2,  % weird
+    e_object_elements([Head|Tail],[]);
+e_object_identifier(Oid=[_,_|_Tail]) ->
+    exit({error,{asn1,{'illegal_value',Oid}}}).
+
+e_object_elements([],Acc) ->
+    lists:reverse(Acc);
+e_object_elements([H|T],Acc) ->
+    e_object_elements(T,[e_object_element(H)|Acc]).
+
+e_object_element(Num) when Num < 128 ->
+    Num;
+%% must be changed to handle more than 2 octets
+e_object_element(Num) ->  %% when Num < ???
+    Left = ((Num band 2#11111110000000) bsr 7) bor 2#10000000,
+    Right = Num band 2#1111111 ,
+    [Left,Right].
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_object_identifier(Bytes) -> {ObjId,RemainingBytes}
+%% ObjId -> {integer(),integer(),...} % at least 2 integers
+%% RemainingBytes -> [integer()] when integer() (0..255)
+decode_object_identifier(Bytes) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+    [First|Rest] = dec_subidentifiers(Octs,0,[]),
+    Idlist = if
+		 First < 40 ->
+		     [0,First|Rest];
+		 First < 80 ->
+		     [1,First - 40|Rest];
+		 true ->
+		     [2,First - 80|Rest]
+	     end,
+    {list_to_tuple(Idlist),Bytes3}.
+
+dec_subidentifiers([H|T],Av,Al) when H >=16#80 ->
+    dec_subidentifiers(T,(Av bsl 7) + (H band 16#7F),Al);
+dec_subidentifiers([H|T],Av,Al) ->
+    dec_subidentifiers(T,0,[(Av bsl 7) + H |Al]);
+dec_subidentifiers([],_Av,Al) ->
+    lists:reverse(Al).
+
+get_constraint([{Key,V}],Key) ->
+    V;
+get_constraint([],_Key) ->
+    no;
+get_constraint(C,Key) ->
+    case lists:keysearch(Key,1,C) of
+	false ->
+	    no;
+	{value,{_,V}} ->
+	    V
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% complete(InList) -> ByteList
+%% Takes a coded list with bits and bytes and converts it to a list of bytes
+%% Should be applied as the last step at encode of a complete ASN.1 type
+%%
+
+% complete(L) ->
+%     case complete1(L) of
+% 	{[],0} ->
+% 	    <<0>>;
+% 	{Acc,0} ->
+% 	    lists:reverse(Acc);
+% 	{[Hacc|Tacc],Acclen}  -> % Acclen >0
+% 	    Rest = 8 - Acclen,
+% 	    NewHacc = Hacc bsl Rest,
+% 	    lists:reverse([NewHacc|Tacc])
+%     end.
+
+
+% complete1(InList) when list(InList) ->
+%     complete1(InList,[]);
+% complete1(InList) ->
+%     complete1([InList],[]).
+
+% complete1([{debug,_}|T], Acc) ->
+%     complete1(T,Acc);
+% complete1([H|T],Acc) when list(H) ->
+%     {NewH,NewAcclen} = complete1(H,Acc),
+%     complete1(T,NewH,NewAcclen);
+
+% complete1([{0,Bin}|T],Acc,0) when binary(Bin) ->
+%     complete1(T,[Bin|Acc],0);
+% complete1([{Unused,Bin}|T],Acc,0) when integer(Unused),binary(Bin) ->
+%     Size = size(Bin)-1,
+%     <<Bs:Size/binary,B>> = Bin,
+%     complete1(T,[(B bsr Unused),Bs|Acc],8-Unused);
+% complete1([{Unused,Bin}|T],[Hacc|Tacc],Acclen) when integer(Unused),binary(Bin) ->
+%     Rest = 8 - Acclen,
+%     Used = 8 - Unused,
+%     case size(Bin) of
+% 	1 ->
+% 	    if
+% 		Rest >= Used ->
+% 		    <<B:Used,_:Unused>> = Bin,
+% 		    complete1(T,[(Hacc bsl Used) + B|Tacc],
+% 			     (Acclen+Used) rem 8);
+% 		true ->
+% 		    LeftOver = 8 - Rest - Unused,
+% 		    <<Val2:Rest,Val1:LeftOver,_:Unused>> = Bin,
+% 		    complete1(T,[Val1,(Hacc bsl Rest) + Val2|Tacc],
+% 			     (Acclen+Used) rem 8)
+% 	    end;
+% 	N ->
+% 	    if
+% 		Rest == Used ->
+% 		    N1 = N - 1,
+% 		    <<B:Rest,Bs:N1/binary,_:Unused>> = Bin,
+% 		    complete1(T,[Bs,(Hacc bsl Rest) + B|Tacc],0);
+% 		Rest > Used ->
+% 		    N1 = N - 2,
+% 		    N2 = (8 - Rest) + Used,
+% 		    <<B1:Rest,Bytes:N1/binary,B2:N2,_:Unused>> = Bin,
+% 		    complete1(T,[B2,Bytes,(Hacc bsl Rest) + B1|Tacc],
+% 			     (Acclen + Used) rem 8);
+% 		true -> % Rest < Used
+% 		    N1 = N - 1,
+% 		    N2 = Used - Rest,
+% 		    <<B1:Rest,Bytes:N1/binary,B2:N2,_:Unused>> = Bin,
+% 		    complete1(T,[B2,Bytes,(Hacc bsl Rest) + B1|Tacc],
+% 			     (Acclen + Used) rem 8)
+% 	    end
+%     end;
+
+% %complete1([{octets,N,Val}|T],Acc,Acclen) when N =< 4 ,integer(Val) ->
+% %    complete1([{octets,<<Val:N/unit:8>>}|T],Acc,Acclen);
+% complete1([{octets,N,Val}|T],Acc,Acclen) when N =< 4 ,integer(Val) ->
+%    Newval = case N of
+% 		 1 ->
+% 		     Val4 = Val band 16#FF,
+% 		     [Val4];
+% 		 2 ->
+% 		     Val3 = (Val bsr 8) band 16#FF,
+% 		     Val4 = Val band 16#FF,
+% 		     [Val3,Val4];
+% 		 3 ->
+% 		     Val2 = (Val bsr 16) band 16#FF,
+% 		     Val3 = (Val bsr 8) band 16#FF,
+% 		     Val4 = Val band 16#FF,
+% 		     [Val2,Val3,Val4];
+% 		 4 ->
+% 		     Val1 = (Val bsr 24) band 16#FF,
+% 		     Val2 = (Val bsr 16) band 16#FF,
+% 		     Val3 = (Val bsr 8) band 16#FF,
+% 		     Val4 = Val band 16#FF,
+% 		     [Val1,Val2,Val3,Val4]
+% 	     end,
+%    complete1([{octets,Newval}|T],Acc,Acclen);
+
+% complete1([{octets,Bin}|T],Acc,Acclen) when binary(Bin) ->
+%     Rest = 8 - Acclen,
+%     if
+% 	Rest == 8 ->
+% 	    complete1(T,[Bin|Acc],0);
+% 	true ->
+% 	    [Hacc|Tacc]=Acc,
+% 	    complete1(T,[Bin, Hacc bsl Rest|Tacc],0)
+%     end;
+
+% complete1([{octets,Oct}|T],Acc,Acclen) when list(Oct) ->
+%     Rest = 8 - Acclen,
+%     if
+% 	Rest == 8 ->
+% 	    complete1(T,[list_to_binary(Oct)|Acc],0);
+% 	true ->
+% 	    [Hacc|Tacc]=Acc,
+% 	    complete1(T,[list_to_binary(Oct), Hacc bsl Rest|Tacc],0)
+%     end;
+
+% complete1([{bit,Val}|T], Acc, Acclen) ->
+%     complete1([{bits,1,Val}|T],Acc,Acclen);
+% complete1([{octet,Val}|T], Acc, Acclen) ->
+%     complete1([{octets,1,Val}|T],Acc,Acclen);
+
+% complete1([{bits,N,Val}|T], Acc, 0) when N =< 8 ->
+%     complete1(T,[Val|Acc],N);
+% complete1([{bits,N,Val}|T], [Hacc|Tacc], Acclen) when N =< 8 ->
+%     Rest = 8 - Acclen,
+%     if
+% 	Rest >= N ->
+% 	    complete1(T,[(Hacc bsl N) + Val|Tacc],(Acclen+N) rem 8);
+% 	true ->
+% 	    Diff = N - Rest,
+% 	    NewHacc = (Hacc bsl Rest) + (Val bsr Diff),
+% 	    Mask = element(Diff,{1,3,7,15,31,63,127,255}),
+% 	    complete1(T,[(Val band Mask),NewHacc|Tacc],(Acclen+N) rem 8)
+%     end;
+% complete1([{bits,N,Val}|T], Acc, Acclen) -> % N > 8
+%     complete1([{bits,N-8,Val bsr 8},{bits,8,Val band 255}|T],Acc,Acclen);
+
+% complete1([align|T],Acc,0) ->
+%     complete1(T,Acc,0);
+% complete1([align|T],[Hacc|Tacc],Acclen) ->
+%     Rest = 8 - Acclen,
+%     complete1(T,[Hacc bsl Rest|Tacc],0);
+% complete1([{octets,N,Val}|T],Acc,Acclen) when list(Val) -> % no security check here
+%     complete1([{octets,Val}|T],Acc,Acclen);
+
+% complete1([],Acc,Acclen) ->
+%     {Acc,Acclen}.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% complete(InList) -> ByteList
+%% Takes a coded list with bits and bytes and converts it to a list of bytes
+%% Should be applied as the last step at encode of a complete ASN.1 type
+%%
+
+complete(L) ->
+    case complete1(L) of
+	{[],[]} ->
+	    <<0>>;
+	{Acc,[]} ->
+	    Acc;
+	{Acc,Bacc}  ->
+	    [Acc|complete_bytes(Bacc)]
+    end.
+
+%% this function builds the ugly form of lists [E1|E2] to avoid having to reverse it at the end.
+%% this is done because it is efficient and that the result always will be sent on a port or
+%% converted by means of list_to_binary/1
+complete1(InList) when list(InList) ->
+    complete1(InList,[],[]);
+complete1(InList) ->
+    complete1([InList],[],[]).
+
+complete1([],Acc,Bacc) ->
+    {Acc,Bacc};
+complete1([H|T],Acc,Bacc) when list(H) ->
+    {NewH,NewBacc} = complete1(H,Acc,Bacc),
+    complete1(T,NewH,NewBacc);
+
+complete1([{octets,Bin}|T],Acc,[]) ->
+    complete1(T,[Acc|Bin],[]);
+
+complete1([{octets,Bin}|T],Acc,Bacc) ->
+    complete1(T,[Acc|[complete_bytes(Bacc),Bin]],[]);
+
+complete1([{debug,_}|T], Acc,Bacc) ->
+    complete1(T,Acc,Bacc);
+
+complete1([{bits,N,Val}|T],Acc,Bacc) ->
+    complete1(T,Acc,complete_update_byte(Bacc,Val,N));
+
+complete1([{bit,Val}|T],Acc,Bacc) ->
+    complete1(T,Acc,complete_update_byte(Bacc,Val,1));
+
+complete1([align|T],Acc,[]) ->
+    complete1(T,Acc,[]);
+complete1([align|T],Acc,Bacc) ->
+    complete1(T,[Acc|complete_bytes(Bacc)],[]);
+complete1([{0,Bin}|T],Acc,[]) when binary(Bin) ->
+    complete1(T,[Acc|Bin],[]);
+complete1([{Unused,Bin}|T],Acc,[]) when integer(Unused),binary(Bin) ->
+    Size = size(Bin)-1,
+    <<Bs:Size/binary,B>> = Bin,
+    NumBits = 8-Unused,
+    complete1(T,[Acc|Bs],[[B bsr Unused]|NumBits]);
+complete1([{Unused,Bin}|T],Acc,Bacc) when integer(Unused),binary(Bin) ->
+    Size = size(Bin)-1,
+    <<Bs:Size/binary,B>> = Bin,
+    NumBits = 8 - Unused,
+    Bf = complete_bytes(Bacc),
+    complete1(T,[Acc|[Bf,Bs]],[[B bsr Unused]|NumBits]).
+
+
+complete_update_byte([],Val,Len) ->
+    complete_update_byte([[0]|0],Val,Len);
+complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len == 8 ->
+    [[0,((Byte bsl Len) + Val) band 255|Bacc]|0];
+complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len > 8  ->
+    Rem = 8 - NumBits,
+    Rest = Len - Rem,
+    complete_update_byte([[0,((Byte bsl Rem) + (Val bsr Rest)) band 255 |Bacc]|0],Val,Rest);
+complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) ->
+    [[((Byte bsl Len) + Val) band 255|Bacc]|NumBits+Len].
+
+
+complete_bytes([[_Byte|Bacc]|0]) ->
+    lists:reverse(Bacc);
+complete_bytes([[Byte|Bacc]|NumBytes]) ->
+    lists:reverse([(Byte bsl (8-NumBytes)) band 255|Bacc]);
+complete_bytes([]) ->
+    [].
+
+% complete_bytes(L) ->
+%     complete_bytes1(lists:reverse(L),[],[],0,0).
+
+% complete_bytes1([H={V,B}|T],Acc,ReplyAcc,NumBits,NumFields) when ((NumBits+B) rem 8) == 0 ->
+% 	    NewReplyAcc = [complete_bytes2([H|Acc],0)|ReplyAcc],
+% 	    complete_bytes1(T,[],NewReplyAcc,0,0);
+% complete_bytes1([H={V,B}|T],Acc,ReplyAcc,NumBits,NumFields)  when NumFields == 7; (NumBits+B) div 8 > 0 ->
+%     Rem = (NumBits+B) rem 8,
+%     NewReplyAcc = [complete_bytes2([{V bsr Rem,B - Rem}|Acc],0)|ReplyAcc],
+%     complete_bytes1([{V,Rem}|T],[],NewReplyAcc,0,0);
+% complete_bytes1([H={V,B}|T],Acc,ReplyAcc,NumBits,NumFields)  ->
+%     complete_bytes1(T,[H|Acc],ReplyAcc,NumBits+B,NumFields+1);
+% complete_bytes1([],[],ReplyAcc,_,_) ->
+%     lists:reverse(ReplyAcc);
+% complete_bytes1([],Acc,ReplyAcc,NumBits,_) ->
+%     PadBits = case NumBits rem 8 of
+% 		  0 -> 0;
+% 		  Rem -> 8 - Rem
+% 	      end,
+%     lists:reverse([complete_bytes2(Acc,PadBits)|ReplyAcc]).
+
+
+% complete_bytes2([{V1,B1}],PadBits) ->
+%     <<V1:B1,0:PadBits>>;
+% complete_bytes2([{V2,B2},{V1,B1}],PadBits) ->
+%     <<V1:B1,V2:B2,0:PadBits>>;
+% complete_bytes2([{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
+%     <<V1:B1,V2:B2,V3:B3,0:PadBits>>;
+% complete_bytes2([{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
+%     <<V1:B1,V2:B2,V3:B3,V4:B4,0:PadBits>>;
+% complete_bytes2([{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
+%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,0:PadBits>>;
+% complete_bytes2([{V6,B6},{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
+%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,V6:B6,0:PadBits>>;
+% complete_bytes2([{V7,B7},{V6,B6},{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
+%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,V6:B6,V7:B7,0:PadBits>>;
+% complete_bytes2([{V8,B8},{V7,B7},{V6,B6},{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
+%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,V6:B6,V7:B7,V8:B8,0:PadBits>>.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_bin_rt2ct.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_bin_rt2ct.erl
new file mode 100644
index 0000000000..9f02ad4466
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_bin_rt2ct.erl
@@ -0,0 +1,2102 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1rt_per_bin_rt2ct.erl,v 1.1 2008/12/17 09:53:31 mikpe Exp $
+%%
+-module(asn1rt_per_bin_rt2ct).
+
+%% encoding / decoding of PER aligned
+
+-include("asn1_records.hrl").
+
+-export([dec_fixup/3, cindex/3, list_to_record/2]).
+-export([setchoiceext/1, setext/1, fixoptionals/3, fixextensions/2,
+	 getext/1, getextension/2, skipextensions/3, getbit/1, getchoice/3 ]).
+-export([getoptionals/2, getoptionals2/2,
+	 set_choice/3, encode_integer/2, encode_integer/3  ]).
+-export([decode_integer/2, decode_integer/3, encode_small_number/1,
+	 decode_boolean/1, encode_length/2, decode_length/1, decode_length/2,
+	 encode_small_length/1, decode_small_length/1,
+	 decode_compact_bit_string/3]).
+-export([decode_enumerated/3,
+	 encode_bit_string/3, decode_bit_string/3  ]).
+-export([encode_octet_string/2, decode_octet_string/2,
+	 encode_null/1, decode_null/1,
+	 encode_object_identifier/1, decode_object_identifier/1,
+	 complete/1]).
+
+
+-export([encode_open_type/2, decode_open_type/2]).
+
+-export([%encode_UniversalString/2, decode_UniversalString/2,
+	 %encode_PrintableString/2, decode_PrintableString/2,
+	 encode_GeneralString/2, decode_GeneralString/2,
+	 encode_GraphicString/2, decode_GraphicString/2,
+	 encode_TeletexString/2, decode_TeletexString/2,
+	 encode_VideotexString/2, decode_VideotexString/2,
+	 %encode_VisibleString/2, decode_VisibleString/2,
+	 %encode_BMPString/2, decode_BMPString/2,
+	 %encode_IA5String/2, decode_IA5String/2,
+	 %encode_NumericString/2, decode_NumericString/2,
+	 encode_ObjectDescriptor/2, decode_ObjectDescriptor/1
+	]).
+
+-export([decode_constrained_number/2,
+	 decode_constrained_number/3,
+	 decode_unconstrained_number/1,
+	 decode_semi_constrained_number/2,
+	 encode_unconstrained_number/1,
+	 decode_constrained_number/4,
+	 encode_octet_string/3,
+	 decode_octet_string/3,
+	 encode_known_multiplier_string/5,
+	 decode_known_multiplier_string/5,
+	 getoctets/2, getbits/2
+%	 start_drv/1,start_drv2/1,init_drv/1
+	]).
+
+
+-export([eint_positive/1]).
+-export([pre_complete_bits/2]).
+
+-define('16K',16384).
+-define('32K',32768).
+-define('64K',65536).
+
+%%-define(nodriver,true).
+
+dec_fixup(Terms,Cnames,RemBytes) ->
+    dec_fixup(Terms,Cnames,RemBytes,[]).
+
+dec_fixup([novalue|T],[_Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,Acc);
+dec_fixup([{_Name,novalue}|T],[_Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,Acc);
+dec_fixup([H|T],[Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,[{Hc,H}|Acc]);
+dec_fixup([],_Cnames,RemBytes,Acc) ->
+    {lists:reverse(Acc),RemBytes}.
+
+cindex(Ix,Val,Cname) ->
+    case element(Ix,Val) of
+	{Cname,Val2} -> Val2;
+	X -> X
+    end.
+
+%% converts a list to a record if necessary
+list_to_record(_,Tuple) when tuple(Tuple) ->
+    Tuple;
+list_to_record(Name,List) when list(List) ->
+    list_to_tuple([Name|List]).
+
+%%--------------------------------------------------------
+%% setchoiceext(InRootSet) -> [{bit,X}]
+%% X  is set to  1 when InRootSet==false
+%% X  is set to  0 when InRootSet==true
+%%
+setchoiceext(true) ->
+%    [{debug,choiceext},{bits,1,0}];
+    [0];
+setchoiceext(false) ->
+%    [{debug,choiceext},{bits,1,1}].
+    [1].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% setext(true|false) ->  CompleteList
+%%
+
+setext(false) ->
+%    [{debug,ext},{bits,1,0}];
+    [0];
+setext(true) ->
+%    [{debug,ext},{bits,1,1}];
+    [1].
+
+fixoptionals(OptList,_OptLength,Val) when tuple(Val) ->
+%    Bits = fixoptionals(OptList,Val,0),
+%    {Val,{bits,OptLength,Bits}};
+%    {Val,[10,OptLength,Bits]};
+    {Val,fixoptionals(OptList,Val,[])};
+
+fixoptionals([],_,Acc) ->
+    %% Optbits
+    lists:reverse(Acc);
+fixoptionals([Pos|Ot],Val,Acc) ->
+    case element(Pos,Val) of
+% 	asn1_NOVALUE -> fixoptionals(Ot,Val,Acc bsl 1);
+% 	asn1_DEFAULT -> fixoptionals(Ot,Val,Acc bsl 1);
+% 	_ -> fixoptionals(Ot,Val,(Acc bsl 1) + 1)
+	asn1_NOVALUE -> fixoptionals(Ot,Val,[0|Acc]);
+	asn1_DEFAULT -> fixoptionals(Ot,Val,[0|Acc]);
+	_ -> fixoptionals(Ot,Val,[1|Acc])
+    end.
+
+
+getext(Bytes) when tuple(Bytes) ->
+    getbit(Bytes);
+getext(Bytes) when binary(Bytes) ->
+    getbit({0,Bytes});
+getext(Bytes) when list(Bytes) ->
+    getbit({0,Bytes}).
+
+getextension(0, Bytes) ->
+    {{},Bytes};
+getextension(1, Bytes) ->
+    {Len,Bytes2} = decode_small_length(Bytes),
+    {Blist, Bytes3} = getbits_as_list(Len,Bytes2),
+    {list_to_tuple(Blist),Bytes3}.
+
+fixextensions({ext,ExtPos,ExtNum},Val) ->
+    case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
+	0 -> [];
+	ExtBits ->
+%	    [encode_small_length(ExtNum),{bits,ExtNum,ExtBits}]
+%	    [encode_small_length(ExtNum),[10,ExtNum,ExtBits]]
+	    [encode_small_length(ExtNum),pre_complete_bits(ExtNum,ExtBits)]
+    end.
+
+fixextensions(Pos,MaxPos,_,Acc) when Pos >= MaxPos ->
+    Acc;
+fixextensions(Pos,ExtPos,Val,Acc) ->
+    Bit = case catch(element(Pos+1,Val)) of
+	      asn1_NOVALUE ->
+		  0;
+	      asn1_NOEXTVALUE ->
+		  0;
+	      {'EXIT',_} ->
+		  0;
+	      _ ->
+		  1
+	  end,
+    fixextensions(Pos+1,ExtPos,Val,(Acc bsl 1)+Bit).
+
+skipextensions(Bytes,Nr,ExtensionBitPattern) ->
+    case (catch element(Nr,ExtensionBitPattern)) of
+	1 ->
+	    {_,Bytes2} = decode_open_type(Bytes,[]),
+	    skipextensions(Bytes2, Nr+1, ExtensionBitPattern);
+	0 ->
+	    skipextensions(Bytes, Nr+1, ExtensionBitPattern);
+	{'EXIT',_} -> % badarg, no more extensions
+	    Bytes
+    end.
+
+
+getchoice(Bytes,1,0) -> % only 1 alternative is not encoded
+    {0,Bytes};
+getchoice(Bytes,_,1) ->
+    decode_small_number(Bytes);
+getchoice(Bytes,NumChoices,0) ->
+    decode_constrained_number(Bytes,{0,NumChoices-1}).
+
+%% old version kept for backward compatibility with generates from R7B01
+getoptionals(Bytes,NumOpt) ->
+    {Blist,Bytes1} = getbits_as_list(NumOpt,Bytes),
+    {list_to_tuple(Blist),Bytes1}.
+
+%% new version used in generates from r8b_patch/3 and later
+getoptionals2(Bytes,NumOpt) ->
+    {_,_} = getbits(Bytes,NumOpt).
+
+
+%% getbits_as_binary(Num,Bytes) -> {{Unused,BinBits},RestBytes},
+%% Num = integer(),
+%% Bytes = list() | tuple(),
+%% Unused = integer(),
+%% BinBits = binary(),
+%% RestBytes = tuple()
+getbits_as_binary(Num,Bytes) when binary(Bytes) ->
+    getbits_as_binary(Num,{0,Bytes});
+getbits_as_binary(0,Buffer) ->
+    {{0,<<>>},Buffer};
+getbits_as_binary(Num,{0,Bin}) when Num > 16 ->
+    Used = Num rem 8,
+    Pad = (8 - Used) rem 8,
+%%    Nbytes = Num div 8,
+    <<Bits:Num,_:Pad,RestBin/binary>> = Bin,
+    {{Pad,<<Bits:Num,0:Pad>>},RestBin};
+getbits_as_binary(Num,Buffer={_Used,_Bin}) -> % Unaligned buffer
+    %% Num =< 16,
+    {Bits2,Buffer2} = getbits(Buffer,Num),
+    Pad = (8 - (Num rem 8)) rem 8,
+    {{Pad,<<Bits2:Num,0:Pad>>},Buffer2}.
+
+
+% integer_from_list(Int,[],BigInt) ->
+%     BigInt;
+% integer_from_list(Int,[H|T],BigInt) when Int < 8 ->
+%     (BigInt bsl Int) bor (H bsr (8-Int));
+% integer_from_list(Int,[H|T],BigInt) ->
+%     integer_from_list(Int-8,T,(BigInt bsl 8) bor H).
+
+getbits_as_list(Num,Bytes) when binary(Bytes) ->
+    getbits_as_list(Num,{0,Bytes},[]);
+getbits_as_list(Num,Bytes) ->
+    getbits_as_list(Num,Bytes,[]).
+
+%% If buffer is empty and nothing more will be picked.
+getbits_as_list(0, B, Acc) ->
+    {lists:reverse(Acc),B};
+%% If first byte in buffer is full and at least one byte will be picked,
+%% then pick one byte.
+getbits_as_list(N,{0,Bin},Acc) when N >= 8 ->
+    <<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Rest/binary>> = Bin,
+    getbits_as_list(N-8,{0,Rest},[B0,B1,B2,B3,B4,B5,B6,B7|Acc]);
+getbits_as_list(N,{Used,Bin},Acc) when N >= 4, Used =< 4 ->
+    NewUsed = Used + 4,
+    Rem = 8 - NewUsed,
+    <<_:Used,B3:1,B2:1,B1:1,B0:1,_:Rem, Rest/binary>> = Bin,
+    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
+    getbits_as_list(N-4,{NewUsed rem 8,NewRest},[B0,B1,B2,B3|Acc]);
+getbits_as_list(N,{Used,Bin},Acc) when N >= 2, Used =< 6  ->
+    NewUsed = Used + 2,
+    Rem = 8 - NewUsed,
+    <<_:Used,B1:1,B0:1,_:Rem, Rest/binary>> = Bin,
+    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
+    getbits_as_list(N-2,{NewUsed rem 8,NewRest},[B0,B1|Acc]);
+getbits_as_list(N,{Used,Bin},Acc) when Used =< 7 ->
+    NewUsed = Used + 1,
+    Rem = 8 - NewUsed,
+    <<_:Used,B0:1,_:Rem, Rest/binary>> = Bin,
+    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
+    getbits_as_list(N-1,{NewUsed rem 8,NewRest},[B0|Acc]).
+
+
+getbit({7,<<_:7,B:1,Rest/binary>>}) ->
+    {B,{0,Rest}};
+getbit({0,Buffer = <<B:1,_:7,_/binary>>}) ->
+    {B,{1,Buffer}};
+getbit({Used,Buffer}) ->
+    Unused = (8 - Used) - 1,
+    <<_:Used,B:1,_:Unused,_/binary>> = Buffer,
+    {B,{Used+1,Buffer}};
+getbit(Buffer) when binary(Buffer) ->
+    getbit({0,Buffer}).
+
+
+getbits({0,Buffer},Num) when (Num rem 8) == 0 ->
+    <<Bits:Num,Rest/binary>> = Buffer,
+    {Bits,{0,Rest}};
+getbits({Used,Bin},Num) ->
+    NumPlusUsed = Num + Used,
+    NewUsed = NumPlusUsed rem 8,
+    Unused = (8-NewUsed) rem 8,
+    case Unused of
+	0 ->
+	    <<_:Used,Bits:Num,Rest/binary>> = Bin,
+	    {Bits,{0,Rest}};
+	_ ->
+	    Bytes = NumPlusUsed div 8,
+	    <<_:Used,Bits:Num,_:Unused,_/binary>> = Bin,
+	    <<_:Bytes/binary,Rest/binary>> = Bin,
+	    {Bits,{NewUsed,Rest}}
+    end;
+getbits(Bin,Num) when binary(Bin) ->
+    getbits({0,Bin},Num).
+
+
+
+% getoctet(Bytes) when list(Bytes) ->
+%     getoctet({0,Bytes});
+% getoctet(Bytes) ->
+%     %%    io:format("getoctet:Buffer = ~p~n",[Bytes]),
+%     getoctet1(Bytes).
+
+% getoctet1({0,[H|T]}) ->
+%     {H,{0,T}};
+% getoctet1({Pos,[_,H|T]}) ->
+%     {H,{0,T}}.
+
+align({0,L}) ->
+    {0,L};
+align({_Pos,<<_H,T/binary>>}) ->
+    {0,T};
+align(Bytes) ->
+    {0,Bytes}.
+
+%% First align buffer, then pick the first Num octets.
+%% Returns octets as an integer with bit significance as in buffer.
+getoctets({0,Buffer},Num) ->
+    <<Val:Num/integer-unit:8,RestBin/binary>> = Buffer,
+    {Val,{0,RestBin}};
+getoctets({U,<<_Padding,Rest/binary>>},Num) when U /= 0 ->
+    getoctets({0,Rest},Num);
+getoctets(Buffer,Num) when binary(Buffer) ->
+    getoctets({0,Buffer},Num).
+% getoctets(Buffer,Num) ->
+%     %%    io:format("getoctets:Buffer = ~p~nNum = ~p~n",[Buffer,Num]),
+%     getoctets(Buffer,Num,0).
+
+% getoctets(Buffer,0,Acc) ->
+%     {Acc,Buffer};
+% getoctets(Buffer,Num,Acc) ->
+%     {Oct,NewBuffer} = getoctet(Buffer),
+%     getoctets(NewBuffer,Num-1,(Acc bsl 8)+Oct).
+
+% getoctets_as_list(Buffer,Num) ->
+%     getoctets_as_list(Buffer,Num,[]).
+
+% getoctets_as_list(Buffer,0,Acc) ->
+%     {lists:reverse(Acc),Buffer};
+% getoctets_as_list(Buffer,Num,Acc) ->
+%     {Oct,NewBuffer} = getoctet(Buffer),
+%     getoctets_as_list(NewBuffer,Num-1,[Oct|Acc]).
+
+%% First align buffer, then pick the first Num octets.
+%% Returns octets as a binary
+getoctets_as_bin({0,Bin},Num)->
+    <<Octets:Num/binary,RestBin/binary>> = Bin,
+    {Octets,{0,RestBin}};
+getoctets_as_bin({_U,Bin},Num) ->
+    <<_Padding,Octets:Num/binary,RestBin/binary>> = Bin,
+    {Octets,{0,RestBin}};
+getoctets_as_bin(Bin,Num) when binary(Bin) ->
+    getoctets_as_bin({0,Bin},Num).
+
+%% same as above but returns octets as a List
+getoctets_as_list(Buffer,Num) ->
+    {Bin,Buffer2} = getoctets_as_bin(Buffer,Num),
+    {binary_to_list(Bin),Buffer2}.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% set_choice(Alt,Choices,Altnum) -> ListofBitSettings
+%% Alt = atom()
+%% Altnum = integer() | {integer(),integer()}% number of alternatives
+%% Choices = [atom()] | {[atom()],[atom()]}
+%% When Choices is a tuple the first list is the Rootset and the
+%% second is the Extensions and then Altnum must also be a tuple with the
+%% lengths of the 2 lists
+%%
+set_choice(Alt,{L1,L2},{Len1,_Len2}) ->
+    case set_choice_tag(Alt,L1) of
+	N when integer(N), Len1 > 1 ->
+%	    [{bits,1,0}, % the value is in the root set
+%	     encode_constrained_number({0,Len1-1},N)];
+	    [0, % the value is in the root set
+	     encode_constrained_number({0,Len1-1},N)];
+	N when integer(N) ->
+%	    [{bits,1,0}]; % no encoding if only 0 or 1 alternative
+	    [0]; % no encoding if only 0 or 1 alternative
+	false ->
+%	    [{bits,1,1}, % extension value
+	    [1, % extension value
+	     case set_choice_tag(Alt,L2) of
+		 N2 when integer(N2) ->
+		     encode_small_number(N2);
+		 false ->
+		     unknown_choice_alt
+	     end]
+    end;
+set_choice(Alt,L,Len) ->
+    case set_choice_tag(Alt,L) of
+	N when integer(N), Len > 1 ->
+	    encode_constrained_number({0,Len-1},N);
+	N when integer(N) ->
+	    []; % no encoding if only 0 or 1 alternative
+	false ->
+	    [unknown_choice_alt]
+    end.
+
+set_choice_tag(Alt,Choices) ->
+    set_choice_tag(Alt,Choices,0).
+
+set_choice_tag(Alt,[Alt|_Rest],Tag) ->
+    Tag;
+set_choice_tag(Alt,[_H|Rest],Tag) ->
+    set_choice_tag(Alt,Rest,Tag+1);
+set_choice_tag(_Alt,[],_Tag) ->
+    false.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_fragmented_XXX; decode of values encoded fragmented according
+%% to ITU-T X.691 clause 10.9.3.8. The unit (XXX) is either bits, octets,
+%% characters or number of components (in a choice,sequence or similar).
+%% Buffer is a buffer {Used, Bin}.
+%% C is the constrained length.
+%% If the buffer is not aligned, this function does that.
+decode_fragmented_bits({0,Buffer},C) ->
+    decode_fragmented_bits(Buffer,C,[]);
+decode_fragmented_bits({_N,<<_B,Bs/binary>>},C) ->
+    decode_fragmented_bits(Bs,C,[]).
+
+decode_fragmented_bits(<<3:2,Len:6,Bin/binary>>,C,Acc) ->
+    {Value,Bin2} = split_binary(Bin, Len * ?'16K'),
+    decode_fragmented_bits(Bin2,C,[Value,Acc]);
+decode_fragmented_bits(<<0:1,0:7,Bin/binary>>,C,Acc) ->
+    BinBits = list_to_binary(lists:reverse(Acc)),
+    case C of
+	Int when integer(Int),C == size(BinBits) ->
+	    {BinBits,{0,Bin}};
+	Int when integer(Int) ->
+	    exit({error,{asn1,{illegal_value,C,BinBits}}});
+	_ ->
+	    {BinBits,{0,Bin}}
+    end;
+decode_fragmented_bits(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
+    Result = {BinBits,{Used,_Rest}} =
+	case (Len rem 8) of
+	    0 ->
+		<<Value:Len/binary-unit:1,Bin2/binary>> = Bin,
+		{list_to_binary(lists:reverse([Value|Acc])),{0,Bin2}};
+	    Rem ->
+		Bytes = Len div 8,
+		U = 8 - Rem,
+		<<Value:Bytes/binary-unit:8,Bits1:Rem,Bits2:U,Bin2/binary>> = Bin,
+		{list_to_binary(lists:reverse([Bits1 bsl U,Value|Acc])),
+		 {Rem,<<Bits2,Bin2/binary>>}}
+	end,
+    case C of
+	 Int when integer(Int),C == (size(BinBits) - ((8 - Used) rem 8)) ->
+	    Result;
+	Int when integer(Int) ->
+	    exit({error,{asn1,{illegal_value,C,BinBits}}});
+	_ ->
+	    Result
+    end.
+
+
+decode_fragmented_octets({0,Bin},C) ->
+    decode_fragmented_octets(Bin,C,[]);
+decode_fragmented_octets({_N,<<_B,Bs/binary>>},C) ->
+    decode_fragmented_octets(Bs,C,[]).
+
+decode_fragmented_octets(<<3:2,Len:6,Bin/binary>>,C,Acc) ->
+    {Value,Bin2} = split_binary(Bin,Len * ?'16K'),
+    decode_fragmented_octets(Bin2,C,[Value,Acc]);
+decode_fragmented_octets(<<0:1,0:7,Bin/binary>>,C,Acc) ->
+    Octets = list_to_binary(lists:reverse(Acc)),
+    case C of
+	Int when integer(Int), C == size(Octets) ->
+	    {Octets,{0,Bin}};
+	Int when integer(Int) ->
+	    exit({error,{asn1,{illegal_value,C,Octets}}});
+	_ ->
+	    {Octets,{0,Bin}}
+    end;
+decode_fragmented_octets(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
+    <<Value:Len/binary-unit:8,Bin2/binary>> = Bin,
+    BinOctets = list_to_binary(lists:reverse([Value|Acc])),
+    case C of
+	Int when integer(Int),size(BinOctets) == Int ->
+	    {BinOctets,Bin2};
+	Int when integer(Int) ->
+	    exit({error,{asn1,{illegal_value,C,BinOctets}}});
+	_ ->
+	    {BinOctets,Bin2}
+    end.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_open_type(Constraint, Value) -> CompleteList
+%% Value = list of bytes of an already encoded value (the list must be flat)
+%%         | binary
+%% Contraint = not used in this version
+%%
+encode_open_type(_Constraint, Val) when list(Val) ->
+    Bin = list_to_binary(Val),
+    case size(Bin) of
+	Size when Size>255 ->
+	    [encode_length(undefined,Size),[21,<<Size:16>>,Bin]];
+	Size ->
+	    [encode_length(undefined,Size),[20,Size,Bin]]
+    end;
+%    [encode_length(undefined,size(Bin)),{octets,Bin}]; % octets implies align
+encode_open_type(_Constraint, Val) when binary(Val) ->
+%    [encode_length(undefined,size(Val)),{octets,Val}]. % octets implies align
+    case size(Val) of
+	Size when Size>255 ->
+	    [encode_length(undefined,size(Val)),[21,<<Size:16>>,Val]]; % octets implies align
+	Size ->
+	    [encode_length(undefined,Size),[20,Size,Val]]
+    end.
+%% the binary_to_list is not optimal but compatible with the current solution
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_open_type(Buffer,Constraint) -> Value
+%% Constraint is not used in this version
+%% Buffer = [byte] with PER encoded data
+%% Value = [byte] with decoded data (which must be decoded again as some type)
+%%
+decode_open_type(Bytes, _Constraint) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    getoctets_as_bin(Bytes2,Len).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_integer(Constraint,Value,NamedNumberList) -> CompleteList
+%% encode_integer(Constraint,Value) -> CompleteList
+%% encode_integer(Constraint,{Name,Value}) -> CompleteList
+%%
+%%
+encode_integer(C,V,NamedNumberList) when atom(V) ->
+    case lists:keysearch(V,1,NamedNumberList) of
+	{value,{_,NewV}} ->
+	    encode_integer(C,NewV);
+	_ ->
+	    exit({error,{asn1,{namednumber,V}}})
+    end;
+encode_integer(C,V,_NamedNumberList) when integer(V) ->
+    encode_integer(C,V);
+encode_integer(C,{Name,V},NamedNumberList) when atom(Name) ->
+    encode_integer(C,V,NamedNumberList).
+
+encode_integer(C,{Name,Val}) when atom(Name) ->
+    encode_integer(C,Val);
+
+encode_integer([{Rc,_Ec}],Val) when tuple(Rc) -> % XXX when is this invoked? First argument most often a list,...Ok this is the extension case...but it doesn't work.
+    case (catch encode_integer([Rc],Val)) of
+	{'EXIT',{error,{asn1,_}}} ->
+%	    [{bits,1,1},encode_unconstrained_number(Val)];
+	    [1,encode_unconstrained_number(Val)];
+	Encoded ->
+%	    [{bits,1,0},Encoded]
+	    [0,Encoded]
+    end;
+
+encode_integer([],Val) ->
+    encode_unconstrained_number(Val);
+%% The constraint is the effective constraint, and in this case is a number
+encode_integer([{'SingleValue',V}],V) ->
+    [];
+encode_integer([{'ValueRange',VR={Lb,Ub},Range,PreEnc}],Val) when Val >= Lb,
+						Ub >= Val ->
+    %% this case when NamedNumberList
+    encode_constrained_number(VR,Range,PreEnc,Val);
+encode_integer([{'ValueRange',{Lb,'MAX'}}],Val) ->
+    encode_semi_constrained_number(Lb,Val);
+encode_integer([{'ValueRange',{'MIN',_}}],Val) ->
+    encode_unconstrained_number(Val);
+encode_integer([{'ValueRange',VR={_Lb,_Ub}}],Val) ->
+    encode_constrained_number(VR,Val);
+encode_integer(_,Val) ->
+    exit({error,{asn1,{illegal_value,Val}}}).
+
+
+
+decode_integer(Buffer,Range,NamedNumberList) ->
+    {Val,Buffer2} = decode_integer(Buffer,Range),
+    case lists:keysearch(Val,2,NamedNumberList) of
+	{value,{NewVal,_}} -> {NewVal,Buffer2};
+	_ -> {Val,Buffer2}
+    end.
+
+decode_integer(Buffer,[{Rc,_Ec}]) when tuple(Rc) ->
+    {Ext,Buffer2} = getext(Buffer),
+    case Ext of
+	0 -> decode_integer(Buffer2,[Rc]);
+	1 -> decode_unconstrained_number(Buffer2)
+    end;
+decode_integer(Buffer,undefined) ->
+    decode_unconstrained_number(Buffer);
+decode_integer(Buffer,C) ->
+    case get_constraint(C,'SingleValue') of
+	V when integer(V) ->
+	    {V,Buffer};
+	_ ->
+	    decode_integer1(Buffer,C)
+    end.
+
+decode_integer1(Buffer,C) ->
+    case VR = get_constraint(C,'ValueRange') of
+	no ->
+	    decode_unconstrained_number(Buffer);
+	{Lb, 'MAX'} ->
+	    decode_semi_constrained_number(Buffer,Lb);
+	{_Lb,_Ub} ->
+	    decode_constrained_number(Buffer,VR)
+    end.
+
+%% X.691:10.6 Encoding of a normally small non-negative whole number
+%% Use this for encoding of CHOICE index if there is an extension marker in
+%% the CHOICE
+encode_small_number({Name,Val}) when atom(Name) ->
+    encode_small_number(Val);
+encode_small_number(Val) when Val =< 63 ->
+%    [{bits,1,0},{bits,6,Val}];
+%    [{bits,7,Val}]; % same as above but more efficient
+    [10,7,Val]; % same as above but more efficient
+encode_small_number(Val) ->
+%    [{bits,1,1},encode_semi_constrained_number(0,Val)].
+    [1,encode_semi_constrained_number(0,Val)].
+
+decode_small_number(Bytes) ->
+    {Bit,Bytes2} = getbit(Bytes),
+    case Bit of
+	0 ->
+	    getbits(Bytes2,6);
+	1 ->
+	    decode_semi_constrained_number(Bytes2,0)
+    end.
+
+%% X.691:10.7 Encoding of a semi-constrained whole number
+%% might be an optimization encode_semi_constrained_number(0,Val) ->
+encode_semi_constrained_number(C,{Name,Val}) when atom(Name) ->
+    encode_semi_constrained_number(C,Val);
+encode_semi_constrained_number({Lb,'MAX'},Val) ->
+    encode_semi_constrained_number(Lb,Val);
+encode_semi_constrained_number(Lb,Val) ->
+    Val2 = Val - Lb,
+    Oct = eint_positive(Val2),
+    Len = length(Oct),
+    if
+	Len < 128 ->
+	    %{octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
+	    [20,Len+1,[Len|Oct]];
+	Len < 256 ->
+	    [encode_length(undefined,Len),[20,Len,Oct]];
+	true ->
+	    [encode_length(undefined,Len),[21,<<Len:16>>,Oct]]
+    end.
+
+decode_semi_constrained_number(Bytes,{Lb,_}) ->
+    decode_semi_constrained_number(Bytes,Lb);
+decode_semi_constrained_number(Bytes,Lb) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {V,Bytes3} = getoctets(Bytes2,Len),
+    {V+Lb,Bytes3}.
+
+encode_constrained_number({Lb,_Ub},_Range,{bits,N},Val) ->
+    Val2 = Val-Lb,
+%    {bits,N,Val2};
+    [10,N,Val2];
+encode_constrained_number({Lb,_Ub},_Range,{octets,N},Val) when N < 256->
+    %% N is 8 or 16 (1 or 2 octets)
+    Val2 = Val-Lb,
+%    {octets,<<Val2:N/unit:8>>};
+    [20,N,Val2];
+encode_constrained_number({Lb,_Ub},_Range,{octets,N},Val) -> % N>255
+    %% N is 8 or 16 (1 or 2 octets)
+    Val2 = Val-Lb,
+%    {octets,<<Val2:N/unit:8>>};
+    [21,<<N:16>>,Val2];
+encode_constrained_number({Lb,_Ub},Range,_,Val) ->
+    Val2 = Val-Lb,
+    if
+	Range =< 16#1000000  -> % max 3 octets
+	    Octs = eint_positive(Val2),
+%	    [encode_length({1,3},size(Octs)),{octets,Octs}];
+	    L = length(Octs),
+	    [encode_length({1,3},L),[20,L,Octs]];
+	Range =< 16#100000000  -> % max 4 octets
+	    Octs = eint_positive(Val2),
+%	    [encode_length({1,4},size(Octs)),{octets,Octs}];
+	    L = length(Octs),
+	    [encode_length({1,4},L),[20,L,Octs]];
+	Range =< 16#10000000000  -> % max 5 octets
+	    Octs = eint_positive(Val2),
+%	    [encode_length({1,5},size(Octs)),{octets,Octs}];
+	    L = length(Octs),
+	    [encode_length({1,5},L),[20,L,Octs]];
+	true  ->
+	    exit({not_supported,{integer_range,Range}})
+    end.
+
+encode_constrained_number(Range,{Name,Val}) when atom(Name) ->
+    encode_constrained_number(Range,Val);
+encode_constrained_number({Lb,Ub},Val) when Val >= Lb, Ub >= Val ->
+    Range = Ub - Lb + 1,
+    Val2 = Val - Lb,
+    if
+	Range  == 2 ->
+%	    Size = {bits,1,Val2};
+	    [Val2];
+	Range  =< 4 ->
+%	    Size = {bits,2,Val2};
+	    [10,2,Val2];
+	Range  =< 8 ->
+	    [10,3,Val2];
+	Range  =< 16 ->
+	    [10,4,Val2];
+	Range  =< 32 ->
+	    [10,5,Val2];
+	Range  =< 64 ->
+	    [10,6,Val2];
+	Range  =< 128 ->
+	    [10,7,Val2];
+	Range  =< 255 ->
+	    [10,8,Val2];
+	Range  =< 256 ->
+%	    Size = {octets,[Val2]};
+	    [20,1,Val2];
+	Range  =< 65536 ->
+%	    Size = {octets,<<Val2:16>>};
+	    [20,2,<<Val2:16>>];
+	Range =< 16#1000000  ->
+	    Octs = eint_positive(Val2),
+%	    [{bits,2,length(Octs)-1},{octets,Octs}];
+	    Len = length(Octs),
+	    [10,2,Len-1,20,Len,Octs];
+	Range =< 16#100000000  ->
+	    Octs = eint_positive(Val2),
+	    Len = length(Octs),
+	    [10,2,Len-1,20,Len,Octs];
+	Range =< 16#10000000000  ->
+	    Octs = eint_positive(Val2),
+	    Len = length(Octs),
+	    [10,3,Len-1,20,Len,Octs];
+	true  ->
+	    exit({not_supported,{integer_range,Range}})
+    end;
+encode_constrained_number({_,_},Val) ->
+    exit({error,{asn1,{illegal_value,Val}}}).
+
+decode_constrained_number(Buffer,VR={Lb,Ub}) ->
+    Range = Ub - Lb + 1,
+    decode_constrained_number(Buffer,VR,Range).
+
+decode_constrained_number(Buffer,{Lb,_Ub},_Range,{bits,N}) ->
+    {Val,Remain} = getbits(Buffer,N),
+    {Val+Lb,Remain};
+decode_constrained_number(Buffer,{Lb,_Ub},_Range,{octets,N}) ->
+    {Val,Remain} = getoctets(Buffer,N),
+    {Val+Lb,Remain}.
+
+decode_constrained_number(Buffer,{Lb,_Ub},Range) ->
+						%    Val2 = Val - Lb,
+    {Val,Remain} =
+	if
+	    Range  == 2 ->
+		getbits(Buffer,1);
+	    Range  =< 4 ->
+		getbits(Buffer,2);
+	    Range  =< 8 ->
+		getbits(Buffer,3);
+	    Range  =< 16 ->
+		getbits(Buffer,4);
+	    Range  =< 32 ->
+		getbits(Buffer,5);
+	    Range  =< 64 ->
+		getbits(Buffer,6);
+	    Range  =< 128 ->
+		getbits(Buffer,7);
+	    Range  =< 255 ->
+		getbits(Buffer,8);
+	    Range  =< 256 ->
+		getoctets(Buffer,1);
+	    Range  =< 65536 ->
+		getoctets(Buffer,2);
+	    Range =< 16#1000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,3}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	    Range =< 16#100000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,4}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	    Range =< 16#10000000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,5}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	    true  ->
+		exit({not_supported,{integer_range,Range}})
+	end,
+    {Val+Lb,Remain}.
+
+%% X.691:10.8 Encoding of an unconstrained whole number
+
+encode_unconstrained_number(Val) when Val >= 0 ->
+    Oct = eint(Val,[]),
+    Len = length(Oct),
+    if
+	Len < 128 ->
+	    %{octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
+	    [20,Len+1,[Len|Oct]];
+	Len < 256 ->
+%	    [encode_length(undefined,Len),20,Len,Oct];
+	    [20,Len+2,<<2:2,Len:14>>,Oct];% equiv with encode_length(undefined,Len) but faster
+	true ->
+%	    [encode_length(undefined,Len),{octets,Oct}]
+	    [encode_length(undefined,Len),[21,<<Len:16>>,Oct]]
+    end;
+encode_unconstrained_number(Val) -> % negative
+    Oct = enint(Val,[]),
+    Len = length(Oct),
+    if
+	Len < 128 ->
+%	    {octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
+	    [20,Len+1,[Len|Oct]];% equiv with encode_length(undefined,Len) but faster
+	Len < 256 ->
+%	    [encode_length(undefined,Len),20,Len,Oct];
+	    [20,Len+2,<<2:2,Len:14>>,Oct];% equiv with encode_length(undefined,Len) but faster
+	true ->
+	    %[encode_length(undefined,Len),{octets,Oct}]
+	    [encode_length(undefined,Len),[21,<<Len:16>>,Oct]]
+    end.
+
+
+%% used for positive Values which don't need a sign bit
+%% returns a list
+eint_positive(Val) ->
+    case eint(Val,[]) of
+	[0,B1|T] ->
+	    [B1|T];
+	T ->
+	    T
+    end.
+
+
+eint(0, [B|Acc]) when B < 128 ->
+    [B|Acc];
+eint(N, Acc) ->
+    eint(N bsr 8, [N band 16#ff| Acc]).
+
+enint(-1, [B1|T]) when B1 > 127 ->
+    [B1|T];
+enint(N, Acc) ->
+    enint(N bsr 8, [N band 16#ff|Acc]).
+
+decode_unconstrained_number(Bytes) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {Ints,Bytes3} = getoctets_as_list(Bytes2,Len),
+    {dec_integer(Ints),Bytes3}.
+
+dec_pos_integer(Ints) ->
+    decpint(Ints, 8 * (length(Ints) - 1)).
+dec_integer(Ints) when hd(Ints) band 255 =< 127 -> %% Positive number
+    decpint(Ints, 8 * (length(Ints) - 1));
+dec_integer(Ints) ->                        %% Negative
+    decnint(Ints,  8 * (length(Ints) - 1)).
+
+decpint([Byte|Tail], Shift) ->
+    (Byte bsl Shift) bor decpint(Tail, Shift-8);
+decpint([], _) -> 0.
+
+decnint([Byte|Tail], Shift) ->
+    (-128 + (Byte band 127) bsl Shift) bor decpint(Tail, Shift-8).
+
+% minimum_octets(Val) ->
+%     minimum_octets(Val,[]).
+
+% minimum_octets(Val,Acc) when Val > 0 ->
+%     minimum_octets((Val bsr 8),[Val band 16#FF|Acc]);
+% minimum_octets(0,Acc) ->
+%     Acc.
+
+
+%% X.691:10.9 Encoding of a length determinant
+%%encode_small_length(undefined,Len) -> % null means no UpperBound
+%%    encode_small_number(Len).
+
+%% X.691:10.9.3.5
+%% X.691:10.9.3.7
+encode_length(undefined,Len) -> % un-constrained
+    if
+	Len < 128 ->
+%	    {octets,[Len]};
+	    [20,1,Len];
+	Len < 16384 ->
+	    %{octets,<<2:2,Len:14>>};
+	    [20,2,<<2:2,Len:14>>];
+	true  -> % should be able to endode length >= 16384 i.e. fragmented length
+	    exit({error,{asn1,{encode_length,{nyi,above_16k}}}})
+    end;
+
+encode_length({0,'MAX'},Len) ->
+    encode_length(undefined,Len);
+encode_length(Vr={Lb,Ub},Len) when Ub =< 65535 ,Lb >= 0 -> % constrained
+    encode_constrained_number(Vr,Len);
+encode_length({Lb,_Ub},Len) when integer(Lb), Lb >= 0 -> % Ub > 65535
+    encode_length(undefined,Len);
+encode_length({Vr={Lb,Ub},[]},Len) when Ub =< 65535 ,Lb >= 0,Len=<Ub ->
+    %% constrained extensible
+%    [{bits,1,0},encode_constrained_number(Vr,Len)];
+    [0,encode_constrained_number(Vr,Len)];
+encode_length({{Lb,_},[]},Len) ->
+    [1,encode_semi_constrained_number(Lb,Len)];
+encode_length(SingleValue,_Len) when integer(SingleValue) ->
+    [].
+
+%% X.691 10.9.3.4 (only used for length of bitmap that prefixes extension
+%% additions in a sequence or set
+encode_small_length(Len) when Len =< 64 ->
+%%    [{bits,1,0},{bits,6,Len-1}];
+%    {bits,7,Len-1}; % the same as above but more efficient
+    [10,7,Len-1];
+encode_small_length(Len) ->
+%    [{bits,1,1},encode_length(undefined,Len)].
+    [1,encode_length(undefined,Len)].
+
+% decode_small_length({Used,<<_:Used,0:1,Num:6,_:((8-Used+1) rem 8),Rest/binary>>}) ->
+%     case Buffer of
+% 	<<_:Used,0:1,Num:6,_:((8-Used+1) rem 8),Rest/binary>> ->
+% 	    {Num,
+%     case getbit(Buffer) of
+% 	{0,Remain} ->
+% 	    {Bits,Remain2} = getbits(Remain,6),
+% 	    {Bits+1,Remain2};
+% 	{1,Remain} ->
+% 	    decode_length(Remain,undefined)
+%     end.
+
+decode_small_length(Buffer) ->
+    case getbit(Buffer) of
+	{0,Remain} ->
+	    {Bits,Remain2} = getbits(Remain,6),
+	    {Bits+1,Remain2};
+	{1,Remain} ->
+	    decode_length(Remain,undefined)
+    end.
+
+decode_length(Buffer) ->
+    decode_length(Buffer,undefined).
+
+decode_length(Buffer,undefined)  -> % un-constrained
+    {0,Buffer2} = align(Buffer),
+    case Buffer2 of
+	<<0:1,Oct:7,Rest/binary>> ->
+	    {Oct,{0,Rest}};
+	<<2:2,Val:14,Rest/binary>> ->
+	    {Val,{0,Rest}};
+	<<3:2,_Val:14,_Rest/binary>> ->
+	    %% this case should be fixed
+	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}})
+    end;
+%%    {Bits,_} = getbits(Buffer2,2),
+%     case Bits of
+% 	2 ->
+% 	    {Val,Bytes3} = getoctets(Buffer2,2),
+% 	    {(Val band 16#3FFF),Bytes3};
+% 	3 ->
+% 	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}});
+% 	_ ->
+% 	    {Val,Bytes3} = getoctet(Buffer2),
+% 	    {Val band 16#7F,Bytes3}
+%     end;
+
+decode_length(Buffer,{Lb,Ub}) when Ub =< 65535 ,Lb >= 0 -> % constrained
+    decode_constrained_number(Buffer,{Lb,Ub});
+decode_length(_Buffer,{Lb,_Ub}) when integer(Lb), Lb >= 0 -> % Ub > 65535
+    exit({error,{asn1,{decode_length,{nyi,above_64K}}}});
+decode_length(Buffer,{{Lb,Ub},[]}) ->
+    case getbit(Buffer) of
+	{0,Buffer2} ->
+	    decode_length(Buffer2, {Lb,Ub})
+    end;
+
+
+%When does this case occur with {_,_Lb,Ub} ??
+% X.691:10.9.3.5
+decode_length({Used,Bin},{_,_Lb,_Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub NOTE! this case does not cover case when Ub > 65535
+    Unused = (8-Used) rem 8,
+    case Bin of
+	<<_:Used,0:1,Val:7,R:Unused,Rest/binary>> ->
+	    {Val,{Used,<<R,Rest/binary>>}};
+	<<_:Used,_:Unused,2:2,Val:14,Rest/binary>> ->
+	    {Val, {0,Rest}};
+	<<_:Used,_:Unused,3:2,_:14,_Rest/binary>> ->
+	    exit({error,{asn1,{decode_length,{nyi,length_above_64K}}}})
+    end;
+% decode_length(Buffer,{_,_Lb,Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub
+%     case getbit(Buffer) of
+% 	{0,Remain} ->
+% 	    getbits(Remain,7);
+% 	{1,Remain} ->
+% 	    {Val,Remain2} = getoctets(Buffer,2),
+% 	    {Val band 2#0111111111111111, Remain2}
+%     end;
+decode_length(Buffer,SingleValue) when integer(SingleValue) ->
+    {SingleValue,Buffer}.
+
+
+						% X.691:11
+decode_boolean(Buffer) -> %when record(Buffer,buffer)
+    case getbit(Buffer) of
+	{1,Remain} -> {true,Remain};
+	{0,Remain} -> {false,Remain}
+    end.
+
+
+%% ENUMERATED with extension marker
+decode_enumerated(Buffer,C,{Ntup1,Ntup2}) when tuple(Ntup1), tuple(Ntup2) ->
+    {Ext,Buffer2} = getext(Buffer),
+    case Ext of
+	0 -> % not an extension value
+	    {Val,Buffer3} = decode_integer(Buffer2,C),
+	    case catch (element(Val+1,Ntup1)) of
+		NewVal when atom(NewVal) -> {NewVal,Buffer3};
+		_Error -> exit({error,{asn1,{decode_enumerated,{Val,[Ntup1,Ntup2]}}}})
+	    end;
+	1 -> % this an extension value
+	    {Val,Buffer3} = decode_small_number(Buffer2),
+	    case catch (element(Val+1,Ntup2)) of
+		NewVal when atom(NewVal) -> {NewVal,Buffer3};
+		_ -> {{asn1_enum,Val},Buffer3}
+	    end
+    end;
+
+decode_enumerated(Buffer,C,NamedNumberTup) when tuple(NamedNumberTup) ->
+    {Val,Buffer2} = decode_integer(Buffer,C),
+    case catch (element(Val+1,NamedNumberTup)) of
+	NewVal when atom(NewVal) -> {NewVal,Buffer2};
+	_Error -> exit({error,{asn1,{decode_enumerated,{Val,NamedNumberTup}}}})
+    end.
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Bitstring value, ITU_T X.690 Chapter 8.5
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+%%===============================================================================
+%% encode bitstring value
+%%===============================================================================
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% bitstring NamedBitList
+%% Val can be  of:
+%% - [identifiers] where only named identifers are set to one,
+%%   the Constraint must then have some information of the
+%%   bitlength.
+%% - [list of ones and zeroes] all bits
+%% - integer value representing the bitlist
+%% C is constraint Len, only valid when identifiers
+
+
+%% when the value is a list of {Unused,BinBits}, where
+%% Unused = integer(),
+%% BinBits = binary().
+
+encode_bit_string(C,Bin={Unused,BinBits},NamedBitList) when integer(Unused),
+							    binary(BinBits) ->
+    encode_bin_bit_string(C,Bin,NamedBitList);
+
+%% when the value is a list of named bits
+
+encode_bit_string(C, LoNB=[FirstVal | _RestVal], NamedBitList) when atom(FirstVal) ->
+    ToSetPos = get_all_bitposes(LoNB, NamedBitList, []),
+    BitList = make_and_set_list(ToSetPos,0),
+    encode_bit_string(C,BitList,NamedBitList);% consider the constraint
+
+encode_bit_string(C, BL=[{bit,_} | _RestVal], NamedBitList) ->
+    ToSetPos = get_all_bitposes(BL, NamedBitList, []),
+    BitList = make_and_set_list(ToSetPos,0),
+    encode_bit_string(C,BitList,NamedBitList);
+
+%% when the value is a list of ones and zeroes
+encode_bit_string(Int, BitListValue, _)
+  when list(BitListValue),integer(Int) ->
+    %% The type is constrained by a single value size constraint
+    [40,Int,length(BitListValue),BitListValue];
+% encode_bit_string(C, BitListValue,NamedBitList)
+%   when list(BitListValue) ->
+%     [encode_bit_str_length(C,BitListValue),
+%      2,45,BitListValue];
+encode_bit_string(no, BitListValue,[])
+  when list(BitListValue) ->
+    [encode_length(undefined,length(BitListValue)),
+     2,BitListValue];
+encode_bit_string(C, BitListValue,[])
+  when list(BitListValue) ->
+    [encode_length(C,length(BitListValue)),
+     2,BitListValue];
+encode_bit_string(no, BitListValue,_NamedBitList)
+  when list(BitListValue) ->
+    %% this case with an unconstrained BIT STRING can be made more efficient
+    %% if the complete driver can take a special code so the length field
+    %% is encoded there.
+    NewBitLVal = lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,
+					    lists:reverse(BitListValue))),
+    [encode_length(undefined,length(NewBitLVal)),
+     2,NewBitLVal];
+encode_bit_string(C,BitListValue,_NamedBitList)
+  when list(BitListValue) ->% C = {_,'MAX'}
+%     NewBitLVal = lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,
+% 					    lists:reverse(BitListValue))),
+    NewBitLVal = bit_string_trailing_zeros(BitListValue,C),
+    [encode_length(C,length(NewBitLVal)),
+     2,NewBitLVal];
+
+% encode_bit_string(C, BitListValue, NamedBitList) when list(BitListValue) ->
+%     BitListToBinary =
+% 	%% fun that transforms a list of 1 and 0 to a tuple:
+% 	%% {UnusedBitsInLastByte, Binary}
+% 	fun([H|T],Acc,N,Fun) ->
+% 		Fun(T,(Acc bsl 1)+H,N+1,Fun);
+% 	   ([],Acc,N,_) -> % length fits in one byte
+% 		Unused = (8 - (N rem 8)) rem 8,
+% % 		case N/8 of
+% % 		    _Len =< 255 ->
+% % 			[30,Unused,(Unused+N)/8,<<Acc:N,0:Unused>>];
+% % 		    _Len ->
+% % 			Len = (Unused+N)/8,
+% % 			[31,Unused,<<Len:16>>,<<Acc:N,0:Unused>>]
+% % 		end
+% 		{Unused,<<Acc:N,0:Unused>>}
+% 	end,
+%     UnusedAndBin =
+% 	case NamedBitList of
+% 	    [] ->  % dont remove trailing zeroes
+% 		BitListToBinary(BitListValue,0,0,BitListToBinary);
+% 	    _ ->
+% 		BitListToBinary(lists:reverse(
+% 				  lists:dropwhile(fun(0)->true;(1)->false end,
+% 						  lists:reverse(BitListValue))),
+% 				0,0,BitListToBinary)
+% 	end,
+%     encode_bin_bit_string(C,UnusedAndBin,NamedBitList);
+
+%% when the value is an integer
+encode_bit_string(C, IntegerVal, NamedBitList) when integer(IntegerVal)->
+    BitList = int_to_bitlist(IntegerVal),
+    encode_bit_string(C,BitList,NamedBitList);
+
+%% when the value is a tuple
+encode_bit_string(C,{Name,Val}, NamedBitList) when atom(Name) ->
+    encode_bit_string(C,Val,NamedBitList).
+
+bit_string_trailing_zeros(BitList,C) when integer(C) ->
+    bit_string_trailing_zeros1(BitList,C,C);
+bit_string_trailing_zeros(BitList,{Lb,Ub}) when integer(Lb) ->
+    bit_string_trailing_zeros1(BitList,Lb,Ub);
+bit_string_trailing_zeros(BitList,{{Lb,Ub},_}) when integer(Lb) ->
+    bit_string_trailing_zeros1(BitList,Lb,Ub);
+bit_string_trailing_zeros(BitList,_) ->
+    BitList.
+
+bit_string_trailing_zeros1(BitList,Lb,Ub) ->
+    case length(BitList) of
+	Lb -> BitList;
+	B when B<Lb -> BitList++lists:duplicate(Lb-B,0);
+	D -> F = fun(L,LB,LB,_,_)->lists:reverse(L);
+		    ([0|R],L1,LB,UB,Fun)->Fun(R,L1-1,LB,UB,Fun);
+		    (L,L1,_,UB,_)when L1 =< UB -> lists:reverse(L);
+		    (_,_L1,_,_,_) ->exit({error,{list_length_BIT_STRING,
+						 BitList}}) end,
+	     F(lists:reverse(BitList),D,Lb,Ub,F)
+    end.
+
+%% encode_bin_bit_string/3, when value is a tuple of Unused and BinBits.
+%% Unused = integer(),i.e. number unused bits in least sign. byte of
+%% BinBits = binary().
+encode_bin_bit_string(C,{_,BinBits},_NamedBitList)
+  when integer(C),C=<16 ->
+    [45,C,size(BinBits),BinBits];
+encode_bin_bit_string(C,{_Unused,BinBits},_NamedBitList)
+  when integer(C) ->
+    [2,45,C,size(BinBits),BinBits];
+encode_bin_bit_string(C,UnusedAndBin={_,_},NamedBitList) ->
+%    UnusedAndBin1 = {Unused1,Bin1} =
+    {Unused1,Bin1} =
+	%% removes all trailing bits if NamedBitList is not empty
+	remove_trailing_bin(NamedBitList,UnusedAndBin),
+    case C of
+%    case get_constraint(C,'SizeConstraint') of
+
+% 	0 ->
+% 	    []; % borde avg�ras i compile-time
+% 	V when integer(V),V=<16 ->
+% 	    {Unused2,Bin2} = pad_list(V,UnusedAndBin1),
+% 	    <<BitVal:V,_:Unused2>> = Bin2,
+% %	    {bits,V,BitVal};
+% 	    [10,V,BitVal];
+% 	V when integer(V) ->
+% 	    %[align, pad_list(V, UnusedAndBin1)];
+% 	    {Unused2,Bin2} = pad_list(V, UnusedAndBin1),
+% 	    <<BitVal:V,_:Unused2>> = Bin2,
+% 	    [2,octets_unused_to_complete(Unused2,size(Bin2),Bin2)];
+
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+%	    [encode_length({Lb,Ub},size(Bin1)*8 - Unused1),
+%	     align,UnusedAndBin1];
+	    Size=size(Bin1),
+	    [encode_length({Lb,Ub},Size*8 - Unused1),
+	     2,octets_unused_to_complete(Unused1,Size,Bin1)];
+	no ->
+	    Size=size(Bin1),
+	    [encode_length(undefined,Size*8 - Unused1),
+	     2,octets_unused_to_complete(Unused1,Size,Bin1)];
+	Sc ->
+	    Size=size(Bin1),
+	    [encode_length(Sc,Size*8 - Unused1),
+	     2,octets_unused_to_complete(Unused1,Size,Bin1)]
+    end.
+
+remove_trailing_bin([], {Unused,Bin}) ->
+    {Unused,Bin};
+remove_trailing_bin(NamedNumberList, {_Unused,Bin}) ->
+    Size = size(Bin)-1,
+    <<Bfront:Size/binary, LastByte:8>> = Bin,
+    %% clear the Unused bits to be sure
+%    LastByte1 = LastByte band (((1 bsl Unused) -1) bxor 255),% why this???
+    Unused1 = trailingZeroesInNibble(LastByte band 15),
+    Unused2 =
+	case Unused1 of
+	    4 ->
+		4 + trailingZeroesInNibble(LastByte bsr 4);
+	    _ -> Unused1
+	end,
+    case Unused2 of
+	8 ->
+	    remove_trailing_bin(NamedNumberList,{0,Bfront});
+	_ ->
+	    {Unused2,Bin}
+    end.
+
+
+trailingZeroesInNibble(0) ->
+    4;
+trailingZeroesInNibble(1) ->
+    0;
+trailingZeroesInNibble(2) ->
+    1;
+trailingZeroesInNibble(3) ->
+    0;
+trailingZeroesInNibble(4) ->
+    2;
+trailingZeroesInNibble(5) ->
+    0;
+trailingZeroesInNibble(6) ->
+    1;
+trailingZeroesInNibble(7) ->
+    0;
+trailingZeroesInNibble(8) ->
+    3;
+trailingZeroesInNibble(9) ->
+    0;
+trailingZeroesInNibble(10) ->
+    1;
+trailingZeroesInNibble(11) ->
+    0;
+trailingZeroesInNibble(12) -> %#1100
+    2;
+trailingZeroesInNibble(13) ->
+    0;
+trailingZeroesInNibble(14) ->
+    1;
+trailingZeroesInNibble(15) ->
+    0.
+
+%%%%%%%%%%%%%%%
+%% The result is presented as a list of named bits (if possible)
+%% else as a tuple {Unused,Bits}. Unused is the number of unused
+%% bits, least significant bits in the last byte of Bits. Bits is
+%% the BIT STRING represented as a binary.
+%%
+decode_compact_bit_string(Buffer, C, NamedNumberList) ->
+    case get_constraint(C,'SizeConstraint') of
+	0 -> % fixed length
+	    {{8,0},Buffer};
+	V when integer(V),V=<16 -> %fixed length 16 bits or less
+	    compact_bit_string(Buffer,V,NamedNumberList);
+	V when integer(V),V=<65536 -> %fixed length > 16 bits
+	    Bytes2 = align(Buffer),
+	    compact_bit_string(Bytes2,V,NamedNumberList);
+	V when integer(V) -> % V > 65536 => fragmented value
+	    {Bin,Buffer2} = decode_fragmented_bits(Buffer,V),
+	    case Buffer2 of
+		{0,_} -> {{0,Bin},Buffer2};
+		{U,_} -> {{8-U,Bin},Buffer2}
+	    end;
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+	    %% This case may demand decoding of fragmented length/value
+	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
+	    Bytes3 = align(Bytes2),
+	    compact_bit_string(Bytes3,Len,NamedNumberList);
+	no ->
+	    %% This case may demand decoding of fragmented length/value
+	    {Len,Bytes2} = decode_length(Buffer,undefined),
+	    Bytes3 = align(Bytes2),
+	    compact_bit_string(Bytes3,Len,NamedNumberList);
+	Sc ->
+	    {Len,Bytes2} = decode_length(Buffer,Sc),
+	    Bytes3 = align(Bytes2),
+	    compact_bit_string(Bytes3,Len,NamedNumberList)
+    end.
+
+
+%%%%%%%%%%%%%%%
+%% The result is presented as a list of named bits (if possible)
+%% else as a list of 0 and 1.
+%%
+decode_bit_string(Buffer, C, NamedNumberList) ->
+    case get_constraint(C,'SizeConstraint') of
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
+	    Bytes3 = align(Bytes2),
+	    bit_list_or_named(Bytes3,Len,NamedNumberList);
+	no ->
+	    {Len,Bytes2} = decode_length(Buffer,undefined),
+	    Bytes3 = align(Bytes2),
+	    bit_list_or_named(Bytes3,Len,NamedNumberList);
+	0 -> % fixed length
+	    {[],Buffer}; % nothing to encode
+	V when integer(V),V=<16 -> % fixed length 16 bits or less
+	    bit_list_or_named(Buffer,V,NamedNumberList);
+	V when integer(V),V=<65536 ->
+	    Bytes2 = align(Buffer),
+	    bit_list_or_named(Bytes2,V,NamedNumberList);
+	V when integer(V) ->
+	    Bytes2 = align(Buffer),
+	    {BinBits,_Bytes3} = decode_fragmented_bits(Bytes2,V),
+	    bit_list_or_named(BinBits,V,NamedNumberList);
+	Sc -> % extension marker
+	    {Len,Bytes2} = decode_length(Buffer,Sc),
+	    Bytes3 = align(Bytes2),
+	    bit_list_or_named(Bytes3,Len,NamedNumberList)
+    end.
+
+
+%% if no named bits are declared we will return a
+%% {Unused,Bits}. Unused = integer(),
+%% Bits = binary().
+compact_bit_string(Buffer,Len,[]) ->
+    getbits_as_binary(Len,Buffer); % {{Unused,BinBits},NewBuffer}
+compact_bit_string(Buffer,Len,NamedNumberList) ->
+    bit_list_or_named(Buffer,Len,NamedNumberList).
+
+
+%% if no named bits are declared we will return a
+%% BitList = [0 | 1]
+
+bit_list_or_named(Buffer,Len,[]) ->
+    getbits_as_list(Len,Buffer);
+
+%% if there are named bits declared we will return a named
+%% BitList where the names are atoms and unnamed bits represented
+%% as {bit,Pos}
+%% BitList = [atom() | {bit,Pos}]
+%% Pos = integer()
+
+bit_list_or_named(Buffer,Len,NamedNumberList) ->
+    {BitList,Rest} = getbits_as_list(Len,Buffer),
+    {bit_list_or_named1(0,BitList,NamedNumberList,[]), Rest}.
+
+bit_list_or_named1(Pos,[0|Bt],Names,Acc) ->
+    bit_list_or_named1(Pos+1,Bt,Names,Acc);
+bit_list_or_named1(Pos,[1|Bt],Names,Acc) ->
+    case lists:keysearch(Pos,2,Names) of
+	{value,{Name,_}} ->
+	    bit_list_or_named1(Pos+1,Bt,Names,[Name|Acc]);
+	_  ->
+	    bit_list_or_named1(Pos+1,Bt,Names,[{bit,Pos}|Acc])
+    end;
+bit_list_or_named1(_Pos,[],_Names,Acc) ->
+    lists:reverse(Acc).
+
+
+
+%%%%%%%%%%%%%%%
+%%
+
+int_to_bitlist(Int) when integer(Int), Int > 0 ->
+    [Int band 1 | int_to_bitlist(Int bsr 1)];
+int_to_bitlist(0) ->
+    [].
+
+
+%%%%%%%%%%%%%%%%%%
+%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
+%%   [sorted_list_of_bitpositions_to_set]
+
+get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
+    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
+
+get_all_bitposes([Val | Rest], NamedBitList, Ack) ->
+    case lists:keysearch(Val, 1, NamedBitList) of
+	{value, {_ValName, ValPos}} ->
+	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
+	_ ->
+	    exit({error,{asn1, {bitstring_namedbit, Val}}})
+    end;
+get_all_bitposes([], _NamedBitList, Ack) ->
+    lists:sort(Ack).
+
+%%%%%%%%%%%%%%%%%%
+%% make_and_set_list([list of positions to set to 1])->
+%% returns list with all in SetPos set.
+%% in positioning in list the first element is 0, the second 1 etc.., but
+%%
+
+make_and_set_list([XPos|SetPos], XPos) ->
+    [1 | make_and_set_list(SetPos, XPos + 1)];
+make_and_set_list([Pos|SetPos], XPos) ->
+    [0 | make_and_set_list([Pos | SetPos], XPos + 1)];
+make_and_set_list([], _) ->
+    [].
+
+%%%%%%%%%%%%%%%%%
+%% pad_list(N,BitList) -> PaddedList
+%% returns a padded (with trailing {bit,0} elements) list of length N
+%% if Bitlist contains more than N significant bits set an exit asn1_error
+%% is generated
+
+% pad_list(N,In={Unused,Bin}) ->
+%     pad_list(N, size(Bin)*8 - Unused, In).
+
+% pad_list(N,Size,In={Unused,Bin}) when N < Size ->
+%     exit({error,{asn1,{range_error,{bit_string,In}}}});
+% pad_list(N,Size,{Unused,Bin}) when N > Size, Unused > 0 ->
+%     pad_list(N,Size+1,{Unused-1,Bin});
+% pad_list(N,Size,{Unused,Bin}) when N > Size ->
+%     pad_list(N,Size+1,{7,<<Bin/binary,0>>});
+% pad_list(N,N,In={Unused,Bin}) ->
+%     In.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% X.691:16
+%% encode_octet_string(Constraint,ExtensionMarker,Val)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+encode_octet_string(C,Val) ->
+    encode_octet_string(C,false,Val).
+
+encode_octet_string(C,Bool,{_Name,Val}) ->
+    encode_octet_string(C,Bool,Val);
+encode_octet_string(_C,true,_Val) ->
+    exit({error,{asn1,{'not_supported',extensionmarker}}});
+encode_octet_string(SZ={_,_},false,Val) ->
+%    [encode_length(SZ,length(Val)),align,
+%	     {octets,Val}];
+    Len = length(Val),
+    [encode_length(SZ,Len),2,
+     octets_to_complete(Len,Val)];
+encode_octet_string(SZ,false,Val) when list(SZ) ->
+    Len = length(Val),
+    [encode_length({hd(SZ),lists:max(SZ)},Len),2,
+     octets_to_complete(Len,Val)];
+encode_octet_string(no,false,Val) ->
+    Len = length(Val),
+    [encode_length(undefined,Len),2,
+     octets_to_complete(Len,Val)];
+encode_octet_string(C,_,_) ->
+    exit({error,{not_implemented,C}}).
+
+
+decode_octet_string(Bytes,Range) ->
+    decode_octet_string(Bytes,Range,false).
+
+decode_octet_string(Bytes,1,false) ->
+    {B1,Bytes2} = getbits(Bytes,8),
+    {[B1],Bytes2};
+decode_octet_string(Bytes,2,false) ->
+    {Bs,Bytes2}= getbits(Bytes,16),
+    {binary_to_list(<<Bs:16>>),Bytes2};
+decode_octet_string(Bytes,Sv,false) when integer(Sv),Sv=<65535 ->
+    Bytes2 = align(Bytes),
+    getoctets_as_list(Bytes2,Sv);
+decode_octet_string(Bytes,Sv,false) when integer(Sv) ->
+    Bytes2 = align(Bytes),
+    decode_fragmented_octets(Bytes2,Sv);
+decode_octet_string(Bytes,{Lb,Ub},false) ->
+    {Len,Bytes2} = decode_length(Bytes,{Lb,Ub}),
+    Bytes3 = align(Bytes2),
+    getoctets_as_list(Bytes3,Len);
+decode_octet_string(Bytes,Sv,false) when list(Sv) ->
+    {Len,Bytes2} = decode_length(Bytes,{hd(Sv),lists:max(Sv)}),
+    Bytes3 = align(Bytes2),
+    getoctets_as_list(Bytes3,Len);
+decode_octet_string(Bytes,no,false) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    Bytes3 = align(Bytes2),
+    getoctets_as_list(Bytes3,Len).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Restricted char string types
+%% (NumericString, PrintableString,VisibleString,IA5String,BMPString,UniversalString)
+%% X.691:26 and X.680:34-36
+%%encode_restricted_string(aligned,'BMPString',Constraints,Extension,Val)
+
+
+encode_restricted_string(aligned,{Name,Val}) when atom(Name) ->
+    encode_restricted_string(aligned,Val);
+
+encode_restricted_string(aligned,Val) when list(Val)->
+    Len = length(Val),
+%    [encode_length(undefined,length(Val)),{octets,Val}].
+    [encode_length(undefined,Len),octets_to_complete(Len,Val)].
+
+
+encode_known_multiplier_string(StringType,SizeC,NumBits,CharOutTab,{Name,Val}) when atom(Name) ->
+    encode_known_multiplier_string(StringType,SizeC,NumBits,CharOutTab,Val);
+encode_known_multiplier_string(StringType,SizeC,NumBits,CharOutTab,Val) ->
+    Result = chars_encode2(Val,NumBits,CharOutTab),
+    case SizeC of
+	Ub when integer(Ub), Ub*NumBits =< 16  ->
+	    case {StringType,Result} of
+		{'BMPString',{octets,Ol}} -> %% this case cannot happen !!??
+		    [{bits,8,Oct}||Oct <- Ol];
+		_ ->
+		    Result
+	    end;
+	Ub when integer(Ub),Ub =<65535 -> % fixed length
+%%	    [align,Result];
+	    [2,Result];
+	{Ub,Lb} ->
+%	    [encode_length({Ub,Lb},length(Val)),align,Result];
+	    [encode_length({Ub,Lb},length(Val)),2,Result];
+	no  ->
+%	    [encode_length(undefined,length(Val)),align,Result]
+	    [encode_length(undefined,length(Val)),2,Result]
+    end.
+
+decode_restricted_string(Bytes,aligned) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    getoctets_as_list(Bytes2,Len).
+
+decode_known_multiplier_string(StringType,SizeC,NumBits,CharInTab,Bytes) ->
+    case SizeC of
+	Ub when integer(Ub), Ub*NumBits =< 16  ->
+	    chars_decode(Bytes,NumBits,StringType,CharInTab,Ub);
+	Ub when integer(Ub),Ub =<65535 -> % fixed length
+	    Bytes1 = align(Bytes),
+	    chars_decode(Bytes1,NumBits,StringType,CharInTab,Ub);
+	Vl when list(Vl) ->
+	    {Len,Bytes1} = decode_length(Bytes,{hd(Vl),lists:max(Vl)}),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,CharInTab,Len);
+	no  ->
+	    {Len,Bytes1} = decode_length(Bytes,undefined),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,CharInTab,Len);
+	{Lb,Ub}->
+	    {Len,Bytes1} = decode_length(Bytes,{Lb,Ub}),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,CharInTab,Len)
+    end.
+
+encode_GeneralString(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_GeneralString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_GraphicString(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_GraphicString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_ObjectDescriptor(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_ObjectDescriptor(Bytes) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_TeletexString(_C,Val) -> % equivalent with T61String
+    encode_restricted_string(aligned,Val).
+decode_TeletexString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_VideotexString(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_VideotexString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% getBMPChars(Bytes,Len) ->{BMPcharList,RemainingBytes}
+%%
+getBMPChars(Bytes,1) ->
+    {O1,Bytes2} = getbits(Bytes,8),
+    {O2,Bytes3} = getbits(Bytes2,8),
+    if
+	O1 == 0 ->
+	    {[O2],Bytes3};
+	true ->
+	    {[{0,0,O1,O2}],Bytes3}
+    end;
+getBMPChars(Bytes,Len) ->
+    getBMPChars(Bytes,Len,[]).
+
+getBMPChars(Bytes,0,Acc) ->
+    {lists:reverse(Acc),Bytes};
+getBMPChars(Bytes,Len,Acc) ->
+    {Octs,Bytes1} = getoctets_as_list(Bytes,2),
+    case Octs of
+	[0,O2] ->
+	    getBMPChars(Bytes1,Len-1,[O2|Acc]);
+	[O1,O2]->
+	    getBMPChars(Bytes1,Len-1,[{0,0,O1,O2}|Acc])
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% chars_encode(C,StringType,Value) -> ValueList
+%%
+%% encodes chars according to the per rules taking the constraint PermittedAlphabet
+%% into account.
+%% This function does only encode the value part and NOT the length
+
+% chars_encode(C,StringType,Value) ->
+%     case {StringType,get_constraint(C,'PermittedAlphabet')} of
+% 	{'UniversalString',{_,Sv}} ->
+% 	    exit({error,{asn1,{'not implemented',"UniversalString with PermittedAlphabet constraint"}}});
+% 	{'BMPString',{_,Sv}} ->
+% 	    exit({error,{asn1,{'not implemented',"BMPString with PermittedAlphabet constraint"}}});
+% 	_ ->
+% 	    {NumBits,CharOutTab} = {get_NumBits(C,StringType),get_CharOutTab(C,StringType)},
+% 	    chars_encode2(Value,NumBits,CharOutTab)
+%     end.
+
+
+chars_encode2([H|T],NumBits,T1={Min,Max,notab}) when  H =< Max, H >= Min ->
+%    [[10,NumBits,H-Min]|chars_encode2(T,NumBits,T1)];
+    [pre_complete_bits(NumBits,H-Min)|chars_encode2(T,NumBits,T1)];
+chars_encode2([H|T],NumBits,T1={Min,Max,Tab}) when H =< Max, H >= Min ->
+%    [[10,NumBits,element(H-Min+1,Tab)]|chars_encode2(T,NumBits,T1)];
+    [pre_complete_bits(NumBits,exit_if_false(H,element(H-Min+1,Tab)))|
+     chars_encode2(T,NumBits,T1)];
+chars_encode2([{A,B,C,D}|T],NumBits,T1={Min,_Max,notab}) ->
+    %% no value range check here (ought to be, but very expensive)
+%    [{bits,NumBits,(A*B*C*D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
+%    [[10,NumBits,((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min]|chars_encode2(T,NumBits,T1)];
+    [pre_complete_bits(NumBits,
+			       ((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min)|
+     chars_encode2(T,NumBits,T1)];
+chars_encode2([H={A,B,C,D}|T],NumBits,{Min,Max,Tab}) ->
+    %% no value range check here (ought to be, but very expensive)
+    [pre_complete_bits(NumBits,exit_if_false(H,element(((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min,Tab)))|chars_encode2(T,NumBits,{Min,Max,notab})];
+chars_encode2([H|_T],_NumBits,{_Min,_Max,_Tab}) ->
+    exit({error,{asn1,{illegal_char_value,H}}});
+chars_encode2([],_,_) ->
+    [].
+
+exit_if_false(V,false)->
+    exit({error,{asn1,{"illegal value according to Permitted alphabet constraint",V}}});
+exit_if_false(_,V) ->V.
+
+pre_complete_bits(NumBits,Val) when NumBits =< 8 ->
+    [10,NumBits,Val];
+pre_complete_bits(NumBits,Val) when NumBits =< 16 ->
+    [10,NumBits-8,Val bsr 8,10,8,(Val band 255)];
+pre_complete_bits(NumBits,Val) when NumBits =< 2040 -> % 255 * 8
+%     LBUsed = NumBits rem 8,
+%     {Unused,Len} = case (8 - LBUsed) of
+% 		       8 -> {0,NumBits div 8};
+% 		       U -> {U,(NumBits div 8) + 1}
+% 		   end,
+%     NewVal = Val bsr LBUsed,
+%     [30,Unused,Len,<<NewVal:Len/unit:8,Val:LBUsed,0:Unused>>].
+    Unused = (8 - (NumBits rem 8)) rem 8,
+    Len = NumBits + Unused,
+    [30,Unused,Len div 8,<<(Val bsl Unused):Len>>].
+
+% get_NumBits(C,StringType) ->
+%     case get_constraint(C,'PermittedAlphabet') of
+% 	{'SingleValue',Sv} ->
+% 	    charbits(length(Sv),aligned);
+% 	no ->
+% 	    case StringType of
+% 		'IA5String' ->
+% 		    charbits(128,aligned); % 16#00..16#7F
+% 		'VisibleString' ->
+% 		    charbits(95,aligned); % 16#20..16#7E
+% 		'PrintableString' ->
+% 		    charbits(74,aligned); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+% 		'NumericString' ->
+% 		    charbits(11,aligned); % $ ,"0123456789"
+% 		'UniversalString' ->
+% 		    32;
+% 		'BMPString' ->
+% 		    16
+% 	    end
+%     end.
+
+%%Maybe used later
+%%get_MaxChar(C,StringType) ->
+%%    case get_constraint(C,'PermittedAlphabet') of
+%%	{'SingleValue',Sv} ->
+%%	    lists:nth(length(Sv),Sv);
+%%	no ->
+%%	    case StringType of
+%%		'IA5String' ->
+%%		    16#7F; % 16#00..16#7F
+%%		'VisibleString' ->
+%%		    16#7E; % 16#20..16#7E
+%%		'PrintableString' ->
+%%		    $z; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+%%		'NumericString' ->
+%%		    $9; % $ ,"0123456789"
+%%		'UniversalString' ->
+%%		    16#ffffffff;
+%%		'BMPString' ->
+%%		    16#ffff
+%%	    end
+%%    end.
+
+%%Maybe used later
+%%get_MinChar(C,StringType) ->
+%%    case get_constraint(C,'PermittedAlphabet') of
+%%	{'SingleValue',Sv} ->
+%%	    hd(Sv);
+%%	no ->
+%%	    case StringType of
+%%		'IA5String' ->
+%%		    16#00; % 16#00..16#7F
+%%		'VisibleString' ->
+%%		    16#20; % 16#20..16#7E
+%%		'PrintableString' ->
+%%		    $\s; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+%%		'NumericString' ->
+%%		    $\s; % $ ,"0123456789"
+%%		'UniversalString' ->
+%%		    16#00;
+%%		'BMPString' ->
+%%		    16#00
+%%	    end
+%%    end.
+
+% get_CharOutTab(C,StringType) ->
+%     get_CharTab(C,StringType,out).
+
+% get_CharInTab(C,StringType) ->
+%     get_CharTab(C,StringType,in).
+
+% get_CharTab(C,StringType,InOut) ->
+%     case get_constraint(C,'PermittedAlphabet') of
+% 	{'SingleValue',Sv} ->
+% 	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv,InOut);
+% 	no ->
+% 	    case StringType of
+% 		'IA5String' ->
+% 		    {0,16#7F,notab};
+% 		'VisibleString' ->
+% 		    get_CharTab2(C,StringType,16#20,16#7F,notab,InOut);
+% 		'PrintableString' ->
+% 		    Chars = lists:sort(
+% 			      " '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
+% 		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars,InOut);
+% 		'NumericString' ->
+% 		    get_CharTab2(C,StringType,16#20,$9," 0123456789",InOut);
+% 		'UniversalString' ->
+% 		    {0,16#FFFFFFFF,notab};
+% 		'BMPString' ->
+% 		    {0,16#FFFF,notab}
+% 	    end
+%     end.
+
+% get_CharTab2(C,StringType,Min,Max,Chars,InOut) ->
+%     BitValMax = (1 bsl get_NumBits(C,StringType))-1,
+%     if
+% 	Max =< BitValMax ->
+% 	    {0,Max,notab};
+% 	true ->
+% 	    case InOut of
+% 		out ->
+% 		    {Min,Max,create_char_tab(Min,Chars)};
+% 		in  ->
+% 		    {Min,Max,list_to_tuple(Chars)}
+% 	    end
+%     end.
+
+% create_char_tab(Min,L) ->
+%     list_to_tuple(create_char_tab(Min,L,0)).
+% create_char_tab(Min,[Min|T],V) ->
+%     [V|create_char_tab(Min+1,T,V+1)];
+% create_char_tab(_Min,[],_V) ->
+%     [];
+% create_char_tab(Min,L,V) ->
+%     [false|create_char_tab(Min+1,L,V)].
+
+%% This very inefficient and should be moved to compiletime
+% charbits(NumOfChars,aligned) ->
+%     case charbits(NumOfChars) of
+% 	1 -> 1;
+% 	2 -> 2;
+% 	B when B =< 4 -> 4;
+% 	B when B =< 8 -> 8;
+% 	B when B =< 16 -> 16;
+% 	B when B =< 32 -> 32
+%     end.
+
+% charbits(NumOfChars) when NumOfChars =< 2 -> 1;
+% charbits(NumOfChars) when NumOfChars =< 4 -> 2;
+% charbits(NumOfChars) when NumOfChars =< 8 -> 3;
+% charbits(NumOfChars) when NumOfChars =< 16 -> 4;
+% charbits(NumOfChars) when NumOfChars =< 32 -> 5;
+% charbits(NumOfChars) when NumOfChars =< 64 -> 6;
+% charbits(NumOfChars) when NumOfChars =< 128 -> 7;
+% charbits(NumOfChars) when NumOfChars =< 256 -> 8;
+% charbits(NumOfChars) when NumOfChars =< 512 -> 9;
+% charbits(NumOfChars) when NumOfChars =< 1024 -> 10;
+% charbits(NumOfChars) when NumOfChars =< 2048 -> 11;
+% charbits(NumOfChars) when NumOfChars =< 4096 -> 12;
+% charbits(NumOfChars) when NumOfChars =< 8192 -> 13;
+% charbits(NumOfChars) when NumOfChars =< 16384 -> 14;
+% charbits(NumOfChars) when NumOfChars =< 32768 -> 15;
+% charbits(NumOfChars) when NumOfChars =< 65536 -> 16;
+% charbits(NumOfChars) when integer(NumOfChars) ->
+%     16 + charbits1(NumOfChars bsr 16).
+
+% charbits1(0) ->
+%     0;
+% charbits1(NumOfChars) ->
+%     1 + charbits1(NumOfChars bsr 1).
+
+
+chars_decode(Bytes,_,'BMPString',_,Len) ->
+    getBMPChars(Bytes,Len);
+chars_decode(Bytes,NumBits,_StringType,CharInTab,Len) ->
+    chars_decode2(Bytes,CharInTab,NumBits,Len).
+
+
+chars_decode2(Bytes,CharInTab,NumBits,Len) ->
+    chars_decode2(Bytes,CharInTab,NumBits,Len,[]).
+
+chars_decode2(Bytes,_CharInTab,_NumBits,0,Acc) ->
+    {lists:reverse(Acc),Bytes};
+chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    Result =
+	if
+	    Char < 256 -> Char;
+	    true ->
+		list_to_tuple(binary_to_list(<<Char:32>>))
+	end,
+    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
+chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Char+Min|Acc]);
+
+%% BMPString and UniversalString with PermittedAlphabet is currently not supported
+chars_decode2(Bytes,{Min,Max,CharInTab},NumBits,Len,Acc) ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    chars_decode2(Bytes2,{Min,Max,CharInTab},NumBits,Len -1,[element(Char+1,CharInTab)|Acc]).
+
+
+						% X.691:17
+encode_null(_Val) -> []; % encodes to nothing
+encode_null({Name,Val}) when atom(Name) ->
+    encode_null(Val).
+
+decode_null(Bytes) ->
+    {'NULL',Bytes}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_object_identifier(Val) -> CompleteList
+%% encode_object_identifier({Name,Val}) -> CompleteList
+%% Val -> {Int1,Int2,...,IntN} % N >= 2
+%% Name -> atom()
+%% Int1 -> integer(0..2)
+%% Int2 -> integer(0..39) when Int1 (0..1) else integer()
+%% Int3-N -> integer()
+%% CompleteList -> [{bits,8,Val}|{octets,Ol}|align|...]
+%%
+encode_object_identifier({Name,Val}) when atom(Name) ->
+    encode_object_identifier(Val);
+encode_object_identifier(Val) ->
+    OctetList = e_object_identifier(Val),
+    Octets = list_to_binary(OctetList), % performs a flatten at the same time
+%    [{debug,object_identifier},encode_length(undefined,size(Octets)),{octets,Octets}].
+    [encode_length(undefined,size(Octets)),
+     octets_to_complete(size(Octets),Octets)].
+
+%% This code is copied from asn1_encode.erl (BER) and corrected and modified
+
+e_object_identifier({'OBJECT IDENTIFIER',V}) ->
+    e_object_identifier(V);
+e_object_identifier({Cname,V}) when atom(Cname),tuple(V) ->
+    e_object_identifier(tuple_to_list(V));
+e_object_identifier({Cname,V}) when atom(Cname),list(V) ->
+    e_object_identifier(V);
+e_object_identifier(V) when tuple(V) ->
+    e_object_identifier(tuple_to_list(V));
+
+%% E1 = 0|1|2 and (E2 < 40 when E1 = 0|1)
+e_object_identifier([E1,E2|Tail]) when E1 >= 0, E1 < 2, E2 < 40 ; E1==2 ->
+    Head = 40*E1 + E2,  % weird
+    e_object_elements([Head|Tail],[]);
+e_object_identifier(Oid=[_,_|_Tail]) ->
+    exit({error,{asn1,{'illegal_value',Oid}}}).
+
+e_object_elements([],Acc) ->
+    lists:reverse(Acc);
+e_object_elements([H|T],Acc) ->
+    e_object_elements(T,[e_object_element(H)|Acc]).
+
+e_object_element(Num) when Num < 128 ->
+    Num;
+%% must be changed to handle more than 2 octets
+e_object_element(Num) ->  %% when Num < ???
+    Left = ((Num band 2#11111110000000) bsr 7) bor 2#10000000,
+    Right = Num band 2#1111111 ,
+    [Left,Right].
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_object_identifier(Bytes) -> {ObjId,RemainingBytes}
+%% ObjId -> {integer(),integer(),...} % at least 2 integers
+%% RemainingBytes -> [integer()] when integer() (0..255)
+decode_object_identifier(Bytes) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+    [First|Rest] = dec_subidentifiers(Octs,0,[]),
+    Idlist = if
+		 First < 40 ->
+		     [0,First|Rest];
+		 First < 80 ->
+		     [1,First - 40|Rest];
+		 true ->
+		     [2,First - 80|Rest]
+	     end,
+    {list_to_tuple(Idlist),Bytes3}.
+
+dec_subidentifiers([H|T],Av,Al) when H >=16#80 ->
+    dec_subidentifiers(T,(Av bsl 7) + (H band 16#7F),Al);
+dec_subidentifiers([H|T],Av,Al) ->
+    dec_subidentifiers(T,0,[(Av bsl 7) + H |Al]);
+dec_subidentifiers([],_Av,Al) ->
+    lists:reverse(Al).
+
+get_constraint([{Key,V}],Key) ->
+    V;
+get_constraint([],_) ->
+    no;
+get_constraint(C,Key) ->
+    case lists:keysearch(Key,1,C) of
+	false ->
+	    no;
+	{value,{_,V}} ->
+	    V
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% complete(InList) -> ByteList
+%% Takes a coded list with bits and bytes and converts it to a list of bytes
+%% Should be applied as the last step at encode of a complete ASN.1 type
+%%
+
+-ifdef(nodriver).
+
+complete(L) ->
+    case complete1(L) of
+	{[],[]} ->
+	    <<0>>;
+	{Acc,[]} ->
+	    Acc;
+	{Acc,Bacc}  ->
+	    [Acc|complete_bytes(Bacc)]
+    end.
+
+
+% this function builds the ugly form of lists [E1|E2] to avoid having to reverse it at the end.
+% this is done because it is efficient and that the result always will be sent on a port or
+% converted by means of list_to_binary/1
+ complete1(InList) when list(InList) ->
+     complete1(InList,[],[]);
+ complete1(InList) ->
+     complete1([InList],[],[]).
+
+ complete1([],Acc,Bacc) ->
+     {Acc,Bacc};
+ complete1([H|T],Acc,Bacc) when list(H) ->
+     {NewH,NewBacc} = complete1(H,Acc,Bacc),
+     complete1(T,NewH,NewBacc);
+
+ complete1([{octets,Bin}|T],Acc,[]) ->
+     complete1(T,[Acc|Bin],[]);
+
+ complete1([{octets,Bin}|T],Acc,Bacc) ->
+     complete1(T,[Acc|[complete_bytes(Bacc),Bin]],[]);
+
+ complete1([{debug,_}|T], Acc,Bacc) ->
+     complete1(T,Acc,Bacc);
+
+ complete1([{bits,N,Val}|T],Acc,Bacc) ->
+     complete1(T,Acc,complete_update_byte(Bacc,Val,N));
+
+ complete1([{bit,Val}|T],Acc,Bacc) ->
+     complete1(T,Acc,complete_update_byte(Bacc,Val,1));
+
+ complete1([align|T],Acc,[]) ->
+     complete1(T,Acc,[]);
+ complete1([align|T],Acc,Bacc) ->
+     complete1(T,[Acc|complete_bytes(Bacc)],[]);
+ complete1([{0,Bin}|T],Acc,[]) when binary(Bin) ->
+     complete1(T,[Acc|Bin],[]);
+ complete1([{Unused,Bin}|T],Acc,[]) when integer(Unused),binary(Bin) ->
+     Size = size(Bin)-1,
+     <<Bs:Size/binary,B>> = Bin,
+     NumBits = 8-Unused,
+     complete1(T,[Acc|Bs],[[B bsr Unused]|NumBits]);
+ complete1([{Unused,Bin}|T],Acc,Bacc) when integer(Unused),binary(Bin) ->
+     Size = size(Bin)-1,
+     <<Bs:Size/binary,B>> = Bin,
+     NumBits = 8 - Unused,
+     Bf = complete_bytes(Bacc),
+     complete1(T,[Acc|[Bf,Bs]],[[B bsr Unused]|NumBits]).
+
+
+ complete_update_byte([],Val,Len) ->
+     complete_update_byte([[0]|0],Val,Len);
+ complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len == 8 ->
+     [[0,((Byte bsl Len) + Val) band 255|Bacc]|0];
+ complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len > 8  ->
+     Rem = 8 - NumBits,
+     Rest = Len - Rem,
+     complete_update_byte([[0,((Byte bsl Rem) + (Val bsr Rest)) band 255 |Bacc]|0],Val,Rest);
+ complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) ->
+     [[((Byte bsl Len) + Val) band 255|Bacc]|NumBits+Len].
+
+
+ complete_bytes([[Byte|Bacc]|0]) ->
+     lists:reverse(Bacc);
+ complete_bytes([[Byte|Bacc]|NumBytes]) ->
+     lists:reverse([(Byte bsl (8-NumBytes)) band 255|Bacc]);
+ complete_bytes([]) ->
+     [].
+
+-else.
+
+
+ complete(L) ->
+    case catch port_control(drv_complete,1,L) of
+	Bin when binary(Bin) ->
+	    Bin;
+	List when list(List) -> handle_error(List,L);
+	{'EXIT',{badarg,Reason}} ->
+	    asn1rt_driver_handler:load_driver(),
+	    receive
+		driver_ready ->
+		    case catch port_control(drv_complete,1,L) of
+			Bin2 when binary(Bin2) -> Bin2;
+			List when list(List) -> handle_error(List,L);
+			Error -> exit(Error)
+		    end;
+		{error,Error} -> % error when loading driver
+		    %% the driver could not be loaded
+		    exit(Error);
+		Error={port_error,Reason} ->
+		    exit(Error)
+	    end;
+	{'EXIT',Reason} ->
+	    exit(Reason)
+    end.
+
+handle_error([],_)->
+    exit({error,{"memory allocation problem"}});
+handle_error("1",L) -> % error in complete in driver
+    exit({error,{asn1_error,L}});
+handle_error(ErrL,L) ->
+    exit({error,{unknown_error,ErrL,L}}).
+
+-endif.
+
+
+octets_to_complete(Len,Val) when Len < 256 ->
+    [20,Len,Val];
+octets_to_complete(Len,Val) ->
+    [21,<<Len:16>>,Val].
+
+octets_unused_to_complete(Unused,Len,Val) when Len < 256 ->
+    [30,Unused,Len,Val];
+octets_unused_to_complete(Unused,Len,Val) ->
+    [31,Unused,<<Len:16>>,Val].
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_v1.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_v1.erl
new file mode 100644
index 0000000000..90ffb0cb1c
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_v1.erl
@@ -0,0 +1,1827 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: asn1rt_per_v1.erl,v 1.1 2008/12/17 09:53:31 mikpe Exp $
+%%
+-module(asn1rt_per_v1).
+
+%% encoding / decoding of PER aligned
+
+-include("asn1_records.hrl").
+
+-export([dec_fixup/3, cindex/3, list_to_record/2]).
+-export([setchoiceext/1, setext/1, fixoptionals/2, fixextensions/2,
+	 setoptionals/1, fixoptionals2/3, getext/1, getextension/2,
+	 skipextensions/3, getbit/1, getchoice/3 ]).
+-export([getoptionals/2, getoptionals/3, set_choice/3,
+	 getoptionals2/2,
+	 encode_integer/2, encode_integer/3  ]).
+-export([decode_integer/2, decode_integer/3, encode_small_number/1,
+	 encode_boolean/1, decode_boolean/1, encode_length/2,
+	 decode_length/1, decode_length/2,
+	 encode_small_length/1, decode_small_length/1,
+	 decode_compact_bit_string/3]).
+-export([encode_enumerated/3, decode_enumerated/3,
+	 encode_bit_string/3, decode_bit_string/3  ]).
+-export([encode_octet_string/2, decode_octet_string/2,
+	encode_null/1, decode_null/1,
+	encode_object_identifier/1, decode_object_identifier/1,
+	complete/1]).
+
+-export([encode_open_type/2, decode_open_type/2]).
+
+-export([encode_UniversalString/2, decode_UniversalString/2,
+	 encode_PrintableString/2, decode_PrintableString/2,
+	 encode_GeneralString/2, decode_GeneralString/2,
+	 encode_GraphicString/2, decode_GraphicString/2,
+	 encode_TeletexString/2, decode_TeletexString/2,
+	 encode_VideotexString/2, decode_VideotexString/2,
+	 encode_VisibleString/2, decode_VisibleString/2,
+	 encode_BMPString/2, decode_BMPString/2,
+	 encode_IA5String/2, decode_IA5String/2,
+	 encode_NumericString/2, decode_NumericString/2,
+	 encode_ObjectDescriptor/2, decode_ObjectDescriptor/1
+	 ]).
+
+
+dec_fixup(Terms,Cnames,RemBytes) ->
+    dec_fixup(Terms,Cnames,RemBytes,[]).
+
+dec_fixup([novalue|T],[_Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,Acc);
+dec_fixup([{_Name,novalue}|T],[_Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,Acc);
+dec_fixup([H|T],[Hc|Tc],RemBytes,Acc) ->
+    dec_fixup(T,Tc,RemBytes,[{Hc,H}|Acc]);
+dec_fixup([],_Cnames,RemBytes,Acc) ->
+    {lists:reverse(Acc),RemBytes}.
+
+cindex(Ix,Val,Cname) ->
+    case element(Ix,Val) of
+	{Cname,Val2} -> Val2;
+	X -> X
+    end.
+
+% converts a list to a record if necessary
+list_to_record(Name,List) when list(List) ->
+    list_to_tuple([Name|List]);
+list_to_record(_Name,Tuple) when tuple(Tuple) ->
+    Tuple.
+
+%%--------------------------------------------------------
+%% setchoiceext(InRootSet) -> [{bit,X}]
+%% X  is set to  1 when InRootSet==false
+%% X  is set to  0 when InRootSet==true
+%%
+setchoiceext(true) ->
+    [{debug,choiceext},{bit,0}];
+setchoiceext(false) ->
+    [{debug,choiceext},{bit,1}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% setext(true|false) ->  CompleteList
+%%
+
+setext(true) ->
+    [{debug,ext},{bit,1}];
+setext(false) ->
+    [{debug,ext},{bit,0}].
+
+%%
+
+fixoptionals2(OptList,OptLength,Val) when tuple(Val) ->
+    Bits = fixoptionals2(OptList,Val,0),
+    {Val,{bits,OptLength,Bits}};
+
+fixoptionals2([],_Val,Acc) ->
+    %% Optbits
+    Acc;
+fixoptionals2([Pos|Ot],Val,Acc) ->
+    case element(Pos,Val) of
+	asn1_NOVALUE -> fixoptionals2(Ot,Val,Acc bsl 1);
+	asn1_DEFAULT -> fixoptionals2(Ot,Val,Acc bsl 1);
+	_ -> fixoptionals2(Ot,Val,(Acc bsl 1) + 1)
+    end.
+
+
+%%
+%% fixoptionals remains only for backward compatibility purpose
+fixoptionals(OptList,Val) when tuple(Val) ->
+    fixoptionals(OptList,Val,[]);
+
+fixoptionals(OptList,Val) when list(Val) ->
+    fixoptionals(OptList,Val,1,[],[]).
+
+fixoptionals([],Val,Acc) ->
+    % return {Val,Opt}
+    {Val,lists:reverse(Acc)};
+fixoptionals([{_,Pos}|Ot],Val,Acc) ->
+    case element(Pos+1,Val) of
+	asn1_NOVALUE -> fixoptionals(Ot,Val,[0|Acc]);
+	asn1_DEFAULT -> fixoptionals(Ot,Val,[0|Acc]);
+	_ -> fixoptionals(Ot,Val,[1|Acc])
+    end.
+
+
+%setoptionals(OptList,Val) ->
+%    Vlist = tuple_to_list(Val),
+%    setoptionals(OptList,Vlist,1,[]).
+
+fixoptionals([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) ->
+    fixoptionals(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]);
+fixoptionals([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) ->
+    fixoptionals(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]);
+fixoptionals(O,[Vh|Vt],Pos,Acc1,Acc2) ->
+    fixoptionals(O,Vt,Pos+1,Acc1,[Vh|Acc2]);
+fixoptionals([],[Vh|Vt],Pos,Acc1,Acc2) ->
+    fixoptionals([],Vt,Pos+1,Acc1,[Vh|Acc2]);
+fixoptionals([],[],_,Acc1,Acc2) ->
+    % return {Val,Opt}
+    {list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]),lists:reverse(Acc1)}.
+
+setoptionals([H|T]) ->
+    [{bit,H}|setoptionals(T)];
+setoptionals([]) ->
+    [{debug,optionals}].
+
+getext(Bytes) when tuple(Bytes) ->
+    getbit(Bytes);
+getext(Bytes) when list(Bytes) ->
+    getbit({0,Bytes}).
+
+getextension(0, Bytes) ->
+    {{},Bytes};
+getextension(1, Bytes) ->
+    {Len,Bytes2} = decode_small_length(Bytes),
+    {Blist, Bytes3} = getbits_as_list(Len,Bytes2),
+    {list_to_tuple(Blist),Bytes3}.
+
+fixextensions({ext,ExtPos,ExtNum},Val) ->
+    case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
+	0 -> [];
+	ExtBits ->
+	    [encode_small_length(ExtNum),{bits,ExtNum,ExtBits}]
+    end.
+
+fixextensions(Pos,MaxPos,_,Acc) when Pos >= MaxPos ->
+    Acc;
+fixextensions(Pos,ExtPos,Val,Acc) ->
+    Bit = case catch(element(Pos+1,Val)) of
+	      asn1_NOVALUE ->
+		  0;
+	      asn1_NOEXTVALUE ->
+		  0;
+	      {'EXIT',_} ->
+		  0;
+	      _ ->
+		  1
+	  end,
+    fixextensions(Pos+1,ExtPos,Val,(Acc bsl 1)+Bit).
+
+skipextensions(Bytes,Nr,ExtensionBitPattern) ->
+    case (catch element(Nr,ExtensionBitPattern)) of
+	1 ->
+	    {_,Bytes2} = decode_open_type(Bytes,[]),
+	    skipextensions(Bytes2, Nr+1, ExtensionBitPattern);
+	0 ->
+	    skipextensions(Bytes, Nr+1, ExtensionBitPattern);
+	{'EXIT',_} -> % badarg, no more extensions
+	    Bytes
+    end.
+
+
+getchoice(Bytes,1,0) -> % only 1 alternative is not encoded
+    {0,Bytes};
+getchoice(Bytes,_NumChoices,1) ->
+    decode_small_number(Bytes);
+getchoice(Bytes,NumChoices,0) ->
+    decode_integer(Bytes,[{'ValueRange',{0,NumChoices-1}}]).
+
+getoptionals2(Bytes,NumOpt) ->
+    getbits(Bytes,NumOpt).
+
+%% getoptionals is kept only for bakwards compatibility
+getoptionals(Bytes,NumOpt) ->
+    {Blist,Bytes1} = getbits_as_list(NumOpt,Bytes),
+    {list_to_tuple(Blist),Bytes1}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% getoptionals/3 is only here for compatibility from 1.3.2
+%% the codegenerator uses getoptionals/2
+
+getoptionals(Bytes,L,NumComp) when list(L) ->
+    {Blist,Bytes1} = getbits_as_list(length(L),Bytes),
+    {list_to_tuple(comptuple(Blist,L,NumComp,1)),Bytes1}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% comptuple is only here for compatibility not used from 1.3.2
+comptuple([Bh|Bt],[{_Name,Nr}|T],NumComp,Nr) ->
+    [Bh|comptuple(Bt,T,NumComp-1,Nr+1)];
+comptuple(Bl,[{Name,Tnr}|Tl],NumComp,Nr) ->
+    [0|comptuple(Bl,[{Name,Tnr}|Tl],NumComp-1,Nr+1)];
+comptuple(_B,_L,0,_Nr) ->
+    [];
+comptuple(B,O,N,Nr) ->
+    [0|comptuple(B,O,N-1,Nr+1)].
+
+%% getbits_as_binary(Num,Bytes) -> {{Unused,BinBits},RestBytes},
+%% Num = integer(),
+%% Bytes = list() | tuple(),
+%% Unused = integer(),
+%% BinBits = binary(),
+%% RestBytes = tuple()
+getbits_as_binary(Num,Bytes) when list(Bytes) ->
+    getbits_as_binary(Num,{0,Bytes});
+getbits_as_binary(_Num,{Used,[]}) ->
+    {{0,<<>>},{Used,[]}};
+getbits_as_binary(Num,{Used,Bits=[H|T]}) ->
+    B1 = case (Num+Used) =< 8 of
+	     true -> Num;
+	     _ -> 8-Used
+	 end,
+    B2 = Num - B1,
+    Pad = (8 - ((B1+B2) rem 8)) rem 8,% Pad /= 8
+    RestBits = lists:nthtail((B1+B2) div 8,Bits),
+    Int = integer_from_list(B2,T,0),
+    NewUsed = (Used + Num) rem 8,
+    {{Pad,<<(H bsr (8-(Used+B1))):B1,Int:B2,0:Pad>>},{NewUsed,RestBits}}.
+
+integer_from_list(_Int,[],BigInt) ->
+    BigInt;
+integer_from_list(Int,[H|_T],BigInt) when Int < 8 ->
+    (BigInt bsl Int) bor (H bsr (8-Int));
+integer_from_list(Int,[H|T],BigInt) ->
+    integer_from_list(Int-8,T,(BigInt bsl 8) bor H).
+
+getbits_as_list(Num,Bytes) ->
+    getbits_as_list(Num,Bytes,[]).
+
+getbits_as_list(0,Bytes,Acc) ->
+    {lists:reverse(Acc),Bytes};
+getbits_as_list(Num,Bytes,Acc) ->
+    {Bit,NewBytes} = getbit(Bytes),
+    getbits_as_list(Num-1,NewBytes,[Bit|Acc]).
+
+getbit(Bytes) ->
+%    io:format("getbit:~p~n",[Bytes]),
+    getbit1(Bytes).
+
+getbit1({7,[H|T]}) ->
+    {H band 1,{0,T}};
+getbit1({Pos,[H|T]}) ->
+    {(H bsr (7-Pos)) band 1,{(Pos+1) rem 8,[H|T]}};
+getbit1(Bytes) when list(Bytes) ->
+    getbit1({0,Bytes}).
+
+%% This could be optimized
+getbits(Buffer,Num) ->
+%    io:format("getbits:Buffer = ~p~nNum=~p~n",[Buffer,Num]),
+    getbits(Buffer,Num,0).
+
+getbits(Buffer,0,Acc) ->
+    {Acc,Buffer};
+getbits(Buffer,Num,Acc) ->
+    {B,NewBuffer} = getbit(Buffer),
+    getbits(NewBuffer,Num-1,B + (Acc bsl 1)).
+
+
+getoctet(Bytes) when list(Bytes) ->
+    getoctet({0,Bytes});
+getoctet(Bytes) ->
+%    io:format("getoctet:Buffer = ~p~n",[Bytes]),
+    getoctet1(Bytes).
+
+getoctet1({0,[H|T]}) ->
+    {H,{0,T}};
+getoctet1({_Pos,[_,H|T]}) ->
+    {H,{0,T}}.
+
+align({0,L}) ->
+    {0,L};
+align({_Pos,[_H|T]}) ->
+    {0,T};
+align(Bytes) ->
+    {0,Bytes}.
+
+getoctets(Buffer,Num) ->
+%    io:format("getoctets:Buffer = ~p~nNum = ~p~n",[Buffer,Num]),
+    getoctets(Buffer,Num,0).
+
+getoctets(Buffer,0,Acc) ->
+    {Acc,Buffer};
+getoctets(Buffer,Num,Acc) ->
+    {Oct,NewBuffer} = getoctet(Buffer),
+    getoctets(NewBuffer,Num-1,(Acc bsl 8)+Oct).
+
+getoctets_as_list(Buffer,Num) ->
+    getoctets_as_list(Buffer,Num,[]).
+
+getoctets_as_list(Buffer,0,Acc) ->
+    {lists:reverse(Acc),Buffer};
+getoctets_as_list(Buffer,Num,Acc) ->
+    {Oct,NewBuffer} = getoctet(Buffer),
+    getoctets_as_list(NewBuffer,Num-1,[Oct|Acc]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% set_choice(Alt,Choices,Altnum) -> ListofBitSettings
+%% Alt = atom()
+%% Altnum = integer() | {integer(),integer()}% number of alternatives
+%% Choices = [atom()] | {[atom()],[atom()]}
+%% When Choices is a tuple the first list is the Rootset and the
+%% second is the Extensions and then Altnum must also be a tuple with the
+%% lengths of the 2 lists
+%%
+set_choice(Alt,{L1,L2},{Len1,_Len2}) ->
+    case set_choice_tag(Alt,L1) of
+	N when integer(N), Len1 > 1 ->
+	    [{bit,0}, % the value is in the root set
+	     encode_integer([{'ValueRange',{0,Len1-1}}],N)];
+	N when integer(N) ->
+	    [{bit,0}]; % no encoding if only 0 or 1 alternative
+	false ->
+	    [{bit,1}, % extension value
+	     case set_choice_tag(Alt,L2) of
+		 N2 when integer(N2) ->
+		     encode_small_number(N2);
+		 false ->
+		     unknown_choice_alt
+	     end]
+    end;
+set_choice(Alt,L,Len) ->
+    case set_choice_tag(Alt,L) of
+	N when integer(N), Len > 1 ->
+	    encode_integer([{'ValueRange',{0,Len-1}}],N);
+	N when integer(N) ->
+	    []; % no encoding if only 0 or 1 alternative
+	false ->
+	    [unknown_choice_alt]
+    end.
+
+set_choice_tag(Alt,Choices) ->
+    set_choice_tag(Alt,Choices,0).
+
+set_choice_tag(Alt,[Alt|_Rest],Tag) ->
+    Tag;
+set_choice_tag(Alt,[_H|Rest],Tag) ->
+    set_choice_tag(Alt,Rest,Tag+1);
+set_choice_tag(_Alt,[],_Tag) ->
+    false.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_open_type(Constraint, Value) -> CompleteList
+%% Value = list of bytes of an already encoded value (the list must be flat)
+%%         | binary
+%% Contraint = not used in this version
+%%
+encode_open_type(_Constraint, Val) when list(Val) ->
+    [encode_length(undefined,length(Val)),align,
+	     {octets,Val}];
+encode_open_type(_Constraint, Val) when binary(Val) ->
+    [encode_length(undefined,size(Val)),align,
+	     {octets,binary_to_list(Val)}].
+%% the binary_to_list is not optimal but compatible with the current solution
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_open_type(Buffer,Constraint) -> Value
+%% Constraint is not used in this version
+%% Buffer = [byte] with PER encoded data
+%% Value = [byte] with decoded data (which must be decoded again as some type)
+%%
+decode_open_type(Bytes, _Constraint) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    Bytes3 = align(Bytes2),
+    getoctets_as_list(Bytes3,Len).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_integer(Constraint,Value,NamedNumberList) -> CompleteList
+%% encode_integer(Constraint,Value) -> CompleteList
+%% encode_integer(Constraint,{Name,Value}) -> CompleteList
+%%
+%%
+encode_integer(C,V,NamedNumberList) when atom(V) ->
+    case lists:keysearch(V,1,NamedNumberList) of
+	{value,{_,NewV}} ->
+	    encode_integer(C,NewV);
+	_ ->
+	    exit({error,{asn1,{namednumber,V}}})
+    end;
+encode_integer(C,V,_) when integer(V) ->
+    encode_integer(C,V);
+encode_integer(C,{Name,V},NamedNumberList) when atom(Name) ->
+    encode_integer(C,V,NamedNumberList).
+
+encode_integer(C,{Name,Val}) when atom(Name) ->
+    encode_integer(C,Val);
+
+encode_integer({Rc,_Ec},Val) ->
+    case (catch encode_integer(Rc,Val)) of
+	{'EXIT',{error,{asn1,_}}} ->
+	    [{bit,1},encode_unconstrained_number(Val)];
+	Encoded ->
+	    [{bit,0},Encoded]
+    end;
+encode_integer(C,Val ) when list(C) ->
+    case get_constraint(C,'SingleValue') of
+	no ->
+	    encode_integer1(C,Val);
+	V when integer(V),V == Val ->
+	    []; % a type restricted to a single value encodes to nothing
+	V when list(V) ->
+	    case lists:member(Val,V) of
+		true ->
+		    encode_integer1(C,Val);
+		_ ->
+		    exit({error,{asn1,{illegal_value,Val}}})
+	    end;
+	_ ->
+	    exit({error,{asn1,{illegal_value,Val}}})
+    end.
+
+encode_integer1(C, Val) ->
+    case VR = get_constraint(C,'ValueRange') of
+	no ->
+	    encode_unconstrained_number(Val);
+	{Lb,'MAX'} ->
+	    encode_semi_constrained_number(Lb,Val);
+	%% positive with range
+	{Lb,Ub} when Val >= Lb,
+		     Ub >= Val ->
+	    encode_constrained_number(VR,Val);
+	_ ->
+	    exit({error,{asn1,{illegal_value,VR,Val}}})
+    end.
+
+decode_integer(Buffer,Range,NamedNumberList) ->
+    {Val,Buffer2} = decode_integer(Buffer,Range),
+    case lists:keysearch(Val,2,NamedNumberList) of
+	{value,{NewVal,_}} -> {NewVal,Buffer2};
+	_ -> {Val,Buffer2}
+    end.
+
+decode_integer(Buffer,{Rc,_Ec}) ->
+    {Ext,Buffer2} = getext(Buffer),
+    case Ext of
+	0 -> decode_integer(Buffer2,Rc);
+	1 -> decode_unconstrained_number(Buffer2)
+    end;
+decode_integer(Buffer,undefined) ->
+    decode_unconstrained_number(Buffer);
+decode_integer(Buffer,C) ->
+    case get_constraint(C,'SingleValue') of
+	V when integer(V) ->
+	    {V,Buffer};
+	V when list(V) ->
+	    {Val,Buffer2} = decode_integer1(Buffer,C),
+	    case lists:member(Val,V) of
+		true ->
+		    {Val,Buffer2};
+		_ ->
+		    exit({error,{asn1,{illegal_value,Val}}})
+	    end;
+	_ ->
+	    decode_integer1(Buffer,C)
+    end.
+
+decode_integer1(Buffer,C) ->
+    case VR = get_constraint(C,'ValueRange') of
+	no ->
+	    decode_unconstrained_number(Buffer);
+	{Lb, 'MAX'} ->
+	    decode_semi_constrained_number(Buffer,Lb);
+	{_,_} ->
+	    decode_constrained_number(Buffer,VR)
+    end.
+
+% X.691:10.6 Encoding of a normally small non-negative whole number
+% Use this for encoding of CHOICE index if there is an extension marker in
+% the CHOICE
+encode_small_number({Name,Val}) when atom(Name) ->
+    encode_small_number(Val);
+encode_small_number(Val) when Val =< 63 ->
+    [{bit,0},{bits,6,Val}];
+encode_small_number(Val) ->
+    [{bit,1},encode_semi_constrained_number(0,Val)].
+
+decode_small_number(Bytes) ->
+    {Bit,Bytes2} = getbit(Bytes),
+    case Bit of
+	0 ->
+	    getbits(Bytes2,6);
+	1 ->
+	    decode_semi_constrained_number(Bytes2,{0,'MAX'})
+    end.
+
+% X.691:10.7 Encoding of a semi-constrained whole number
+%% might be an optimization encode_semi_constrained_number(0,Val) ->
+encode_semi_constrained_number(C,{Name,Val}) when atom(Name) ->
+    encode_semi_constrained_number(C,Val);
+encode_semi_constrained_number({Lb,'MAX'},Val) ->
+    encode_semi_constrained_number(Lb,Val);
+encode_semi_constrained_number(Lb,Val) ->
+    Val2 = Val - Lb,
+    Octs = eint_positive(Val2),
+    [encode_length(undefined,length(Octs)),{octets,Octs}].
+
+decode_semi_constrained_number(Bytes,{Lb,_}) ->
+    decode_semi_constrained_number(Bytes,Lb);
+decode_semi_constrained_number(Bytes,Lb) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {V,Bytes3} = getoctets(Bytes2,Len),
+    {V+Lb,Bytes3}.
+
+encode_constrained_number(Range,{Name,Val}) when atom(Name) ->
+    encode_constrained_number(Range,Val);
+encode_constrained_number({Lb,Ub},Val) when Val >= Lb, Ub >= Val ->
+    Range = Ub - Lb + 1,
+    Val2 = Val - Lb,
+    if
+	Range  == 2 ->
+	    {bits,1,Val2};
+	Range  =< 4 ->
+	    {bits,2,Val2};
+	Range  =< 8 ->
+	    {bits,3,Val2};
+	Range  =< 16 ->
+	    {bits,4,Val2};
+	Range  =< 32 ->
+	    {bits,5,Val2};
+	Range  =< 64 ->
+	    {bits,6,Val2};
+	Range  =< 128 ->
+	    {bits,7,Val2};
+	Range  =< 255 ->
+	    {bits,8,Val2};
+	Range  =< 256 ->
+	    {octets,1,Val2};
+	Range  =< 65536 ->
+	    {octets,2,Val2};
+	Range =< 16#1000000  ->
+	    Octs = eint_positive(Val2),
+	    [encode_length({1,3},length(Octs)),{octets,Octs}];
+	Range =< 16#100000000  ->
+	    Octs = eint_positive(Val2),
+	    [encode_length({1,4},length(Octs)),{octets,Octs}];
+	Range =< 16#10000000000  ->
+	    Octs = eint_positive(Val2),
+	    [encode_length({1,5},length(Octs)),{octets,Octs}];
+       true  ->
+	    exit({not_supported,{integer_range,Range}})
+    end.
+
+decode_constrained_number(Buffer,{Lb,Ub}) ->
+    Range = Ub - Lb + 1,
+%    Val2 = Val - Lb,
+    {Val,Remain} =
+	if
+	   Range  == 2 ->
+		getbits(Buffer,1);
+	   Range  =< 4 ->
+		getbits(Buffer,2);
+	   Range  =< 8 ->
+		getbits(Buffer,3);
+	   Range  =< 16 ->
+		getbits(Buffer,4);
+	   Range  =< 32 ->
+		getbits(Buffer,5);
+	   Range  =< 64 ->
+		getbits(Buffer,6);
+	   Range  =< 128 ->
+		getbits(Buffer,7);
+	   Range  =< 255 ->
+		getbits(Buffer,8);
+	   Range  =< 256 ->
+		getoctets(Buffer,1);
+	   Range  =< 65536 ->
+		getoctets(Buffer,2);
+	   Range =< 16#1000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,3}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	   Range =< 16#100000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,4}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	   Range =< 16#10000000000  ->
+		{Len,Bytes2} = decode_length(Buffer,{1,5}),
+		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+		{dec_pos_integer(Octs),Bytes3};
+	   true  ->
+		exit({not_supported,{integer_range,Range}})
+	end,
+    {Val+Lb,Remain}.
+
+% X.691:10.8 Encoding of an unconstrained whole number
+
+encode_unconstrained_number(Val) when Val >= 0 ->
+    Oct = eint(Val,[]),
+    [{debug,unconstrained_number},
+     encode_length({0,'MAX'},length(Oct)),
+     {octets,Oct}];
+encode_unconstrained_number(Val) -> % negative
+    Oct = enint(Val,[]),
+    [{debug,unconstrained_number},
+     encode_length({0,'MAX'},length(Oct)),
+     {octets,Oct}].
+
+%% used for positive Values which don't need a sign bit
+eint_positive(Val) ->
+    case eint(Val,[]) of
+	[0,B1|T] ->
+	    [B1|T];
+	T ->
+	    T
+    end.
+
+eint(0, [B|Acc]) when B < 128 ->
+    [B|Acc];
+eint(N, Acc) ->
+    eint(N bsr 8, [N band 16#ff| Acc]).
+
+enint(-1, [B1|T]) when B1 > 127 ->
+    [B1|T];
+enint(N, Acc) ->
+    enint(N bsr 8, [N band 16#ff|Acc]).
+
+%% used for signed positive values
+
+%eint(Val, Ack) ->
+%    X = Val band 255,
+%    Next = Val bsr 8,
+%    if
+%	Next == 0, X >= 127 ->
+%	    [0,X|Ack];
+%	Next == 0 ->
+%	    [X|Ack];
+%	true ->
+%	    eint(Next,[X|Ack])
+%    end.
+
+%%% used for signed negative values
+%enint(Val, Acc) ->
+%    NumOctets = if
+%		    -Val < 16#80 -> 1;
+%		    -Val < 16#8000 ->2;
+%		    -Val < 16#800000 ->3;
+%		    -Val < 16#80000000 ->4;
+%		    -Val < 16#8000000000 ->5;
+%		    -Val < 16#800000000000 ->6;
+%		    -Val < 16#80000000000000 ->7;
+%		    -Val < 16#8000000000000000 ->8;
+%		    -Val < 16#800000000000000000 ->9
+%		end,
+%    enint(Val,Acc,NumOctets).
+
+%enint(Val, Acc,0) ->
+%    Acc;
+%enint(Val, Acc,NumOctets) ->
+%    enint(Val bsr 8,[Val band 255|Acc],NumOctets-1).
+
+
+decode_unconstrained_number(Bytes) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {Ints,Bytes3} = getoctets_as_list(Bytes2,Len),
+    {dec_integer(Ints),Bytes3}.
+
+dec_pos_integer(Ints) ->
+    decpint(Ints, 8 * (length(Ints) - 1)).
+dec_integer(Ints) when hd(Ints) band 255 =< 127 -> %% Positive number
+    decpint(Ints, 8 * (length(Ints) - 1));
+dec_integer(Ints) ->                        %% Negative
+    decnint(Ints,  8 * (length(Ints) - 1)).
+
+decpint([Byte|Tail], Shift) ->
+    (Byte bsl Shift) bor decpint(Tail, Shift-8);
+decpint([], _) -> 0.
+
+decnint([Byte|Tail], Shift) ->
+    (-128 + (Byte band 127) bsl Shift) bor decpint(Tail, Shift-8).
+
+minimum_octets(Val) ->
+    minimum_octets(Val,[]).
+
+minimum_octets(Val,Acc) when Val > 0 ->
+    minimum_octets((Val bsr 8),[Val band 16#FF|Acc]);
+minimum_octets(0,Acc) ->
+    Acc.
+
+
+%% X.691:10.9 Encoding of a length determinant
+%%encode_small_length(undefined,Len) -> % null means no UpperBound
+%%    encode_small_number(Len).
+
+%% X.691:10.9.3.5
+%% X.691:10.9.3.7
+encode_length(undefined,Len) -> % un-constrained
+    if
+	Len < 128 ->
+	    {octet,Len band 16#7F};
+	Len < 16384 ->
+	    {octets,2,2#1000000000000000 bor Len};
+	true  ->
+	    exit({error,{asn1,{encode_length,{nyi,above_16k}}}})
+    end;
+
+encode_length({0,'MAX'},Len) ->
+    encode_length(undefined,Len);
+encode_length({Lb,Ub},Len) when Ub =< 65535 ,Lb >= 0 -> % constrained
+    encode_constrained_number({Lb,Ub},Len);
+encode_length({{Lb,Ub},[]},Len) when Ub =< 65535 ,Lb >= 0 ->
+    %% constrained extensible
+    [{bit,0},encode_constrained_number({Lb,Ub},Len)];
+encode_length(SingleValue,_) when integer(SingleValue) ->
+    [].
+
+encode_small_length(Len) when Len =< 64 ->
+    [{bit,0},{bits,6,Len-1}];
+encode_small_length(Len) ->
+    [{bit,1},encode_length(undefined,Len)].
+
+decode_small_length(Buffer) ->
+    case getbit(Buffer) of
+	{0,Remain} ->
+	    {Bits,Remain2} = getbits(Remain,6),
+	    {Bits+1,Remain2};
+	{1,Remain} ->
+	    decode_length(Remain,undefined)
+    end.
+
+decode_length(Buffer) ->
+    decode_length(Buffer,undefined).
+
+decode_length(Buffer,undefined)  -> % un-constrained
+    Buffer2 = align(Buffer),
+    {Bits,_} = getbits(Buffer2,2),
+    case Bits of
+	2 ->
+	    {Val,Bytes3} = getoctets(Buffer2,2),
+	    {(Val band 16#3FFF),Bytes3};
+	3 ->
+	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}});
+	_ ->
+	    {Val,Bytes3} = getoctet(Buffer2),
+	    {Val band 16#7F,Bytes3}
+    end;
+
+decode_length(Buffer,{Lb,Ub}) when Ub =< 65535 ,Lb >= 0 -> % constrained
+    decode_constrained_number(Buffer,{Lb,Ub});
+
+decode_length(Buffer,{{Lb,Ub},[]}) ->
+    case getbit(Buffer) of
+	{0,Buffer2} ->
+	    decode_length(Buffer2, {Lb,Ub})
+    end;
+						% X.691:10.9.3.5
+decode_length(Buffer,{_,_Lb,_Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub
+    case getbit(Buffer) of
+	{0,Remain} ->
+	    getbits(Remain,7);
+	{1,_Remain} ->
+	    {Val,Remain2} = getoctets(Buffer,2),
+	    {Val band 2#0111111111111111, Remain2}
+    end;
+decode_length(Buffer,SingleValue) when integer(SingleValue) ->
+    {SingleValue,Buffer}.
+
+
+% X.691:11
+encode_boolean({Name,Val}) when atom(Name) ->
+    encode_boolean(Val);
+encode_boolean(true) ->
+    {bit,1};
+encode_boolean(false) ->
+    {bit,0};
+encode_boolean(Val) ->
+    exit({error,{asn1,{encode_boolean,Val}}}).
+
+
+decode_boolean(Buffer) -> %when record(Buffer,buffer)
+    case getbit(Buffer) of
+	{1,Remain} -> {true,Remain};
+	{0,Remain} -> {false,Remain}
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% X.691:12
+%% ENUMERATED
+%%
+%% encode_enumerated(C,Value,NamedNumberTup) -> CompleteList
+%%
+%%
+
+encode_enumerated(C,{Name,Value},NamedNumberList) when
+  atom(Name),list(NamedNumberList) ->
+    encode_enumerated(C,Value,NamedNumberList);
+
+%% ENUMERATED with extension mark
+encode_enumerated(_C,{asn1_enum,Value},{_Nlist1,Nlist2}) when Value >= length(Nlist2) ->
+    [{bit,1},encode_small_number(Value)];
+encode_enumerated(C,Value,{Nlist1,Nlist2}) ->
+    case enum_search(Value,Nlist1,0) of
+	NewV when integer(NewV) ->
+	    [{bit,0},encode_integer(C,NewV)];
+	false ->
+	    case enum_search(Value,Nlist2,0) of
+		ExtV when integer(ExtV) ->
+		    [{bit,1},encode_small_number(ExtV)];
+		false ->
+		    exit({error,{asn1,{encode_enumerated,Value}}})
+	    end
+    end;
+
+encode_enumerated(C,Value,NamedNumberList) when list(NamedNumberList) ->
+    case enum_search(Value,NamedNumberList,0) of
+	NewV when integer(NewV) ->
+	    encode_integer(C,NewV);
+	false ->
+	    exit({error,{asn1,{encode_enumerated,Value}}})
+    end.
+
+%% returns the ordinal number from 0 ,1 ... in the list where Name is found
+%% or false if not found
+%%
+enum_search(Name,[Name|_NamedNumberList],Acc) ->
+    Acc;
+enum_search(Name,[_H|T],Acc) ->
+    enum_search(Name,T,Acc+1);
+enum_search(_,[],_) ->
+    false. % name not found !error
+
+%% ENUMERATED with extension marker
+decode_enumerated(Buffer,C,{Ntup1,Ntup2}) when tuple(Ntup1), tuple(Ntup2) ->
+    {Ext,Buffer2} = getext(Buffer),
+    case Ext of
+	0 -> % not an extension value
+	    {Val,Buffer3} = decode_integer(Buffer2,C),
+	    case catch (element(Val+1,Ntup1)) of
+		NewVal when atom(NewVal) -> {NewVal,Buffer3};
+		_Error -> exit({error,{asn1,{decode_enumerated,{Val,[Ntup1,Ntup2]}}}})
+	    end;
+	1 -> % this an extension value
+	    {Val,Buffer3} = decode_small_number(Buffer2),
+	    case catch (element(Val+1,Ntup2)) of
+		NewVal when atom(NewVal) -> {NewVal,Buffer3};
+		_ -> {{asn1_enum,Val},Buffer3}
+	    end
+    end;
+
+decode_enumerated(Buffer,C,NamedNumberTup) when tuple(NamedNumberTup) ->
+    {Val,Buffer2} = decode_integer(Buffer,C),
+    case catch (element(Val+1,NamedNumberTup)) of
+	NewVal when atom(NewVal) -> {NewVal,Buffer2};
+	_Error -> exit({error,{asn1,{decode_enumerated,{Val,NamedNumberTup}}}})
+    end.
+
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+%% Bitstring value, ITU_T X.690 Chapter 8.5
+%%===============================================================================
+%%===============================================================================
+%%===============================================================================
+
+%%===============================================================================
+%% encode bitstring value
+%%===============================================================================
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% bitstring NamedBitList
+%% Val can be  of:
+%% - [identifiers] where only named identifers are set to one,
+%%   the Constraint must then have some information of the
+%%   bitlength.
+%% - [list of ones and zeroes] all bits
+%% - integer value representing the bitlist
+%% C is constraint Len, only valid when identifiers
+
+
+%% when the value is a list of {Unused,BinBits}, where
+%% Unused = integer(),
+%% BinBits = binary().
+encode_bit_string(C,Bin={Unused,BinBits},NamedBitList) when integer(Unused),
+							    binary(BinBits) ->
+    encode_bin_bit_string(C,Bin,NamedBitList);
+
+%% when the value is a list of named bits
+encode_bit_string(C, [FirstVal | RestVal], NamedBitList) when atom(FirstVal) ->
+    ToSetPos = get_all_bitposes([FirstVal | RestVal], NamedBitList, []),
+    BitList = make_and_set_list(ToSetPos,0),
+    encode_bit_string(C,BitList,NamedBitList);
+
+encode_bit_string(C, [{bit,No} | RestVal], NamedBitList) ->
+    ToSetPos = get_all_bitposes([{bit,No} | RestVal], NamedBitList, []),
+    BitList = make_and_set_list(ToSetPos,0),
+    encode_bit_string(C,BitList,NamedBitList);
+
+%% when the value is a list of ones and zeroes
+
+encode_bit_string(C, BitListValue, NamedBitList) when list(BitListValue) ->
+    Bl1 =
+	case NamedBitList of
+	    [] ->  % dont remove trailing zeroes
+		BitListValue;
+	    _ -> % first remove any trailing zeroes
+		lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,
+					      lists:reverse(BitListValue)))
+	end,
+    BitList = [{bit,X} || X <- Bl1],
+    BListLen = length(BitList),
+    case get_constraint(C,'SizeConstraint') of
+	0 -> % fixed length
+	    []; % nothing to encode
+	V when integer(V),V=<16 -> % fixed length 16 bits or less
+	    pad_list(V,BitList);
+	V when integer(V) -> % fixed length 16 bits or less
+	    [align,pad_list(V,BitList)];
+	{Lb,Ub} when integer(Lb),integer(Ub),BListLen<Lb ->
+	    %% padding due to OTP-4353
+	    [encode_length({Lb,Ub},Lb),align,pad_list(Lb,BitList)];
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+	    [encode_length({Lb,Ub},length(BitList)),align,BitList];
+	no ->
+	    [encode_length(undefined,length(BitList)),align,BitList];
+	Sc={{Lb,Ub},_} when integer(Lb),integer(Ub),BListLen<Lb ->
+	    %% padding due to OTP-4353
+	    [encode_length(Sc,Lb),align,pad_list(Lb,BitList)];
+	Sc -> % extension marker
+	    [encode_length(Sc,length(BitList)),align,BitList]
+    end;
+
+%% when the value is an integer
+encode_bit_string(C, IntegerVal, NamedBitList) when integer(IntegerVal)->
+    BitList = int_to_bitlist(IntegerVal),
+    encode_bit_string(C,BitList,NamedBitList);
+
+%% when the value is a tuple
+encode_bit_string(C,{Name,Val}, NamedBitList) when atom(Name) ->
+    encode_bit_string(C,Val,NamedBitList).
+
+
+%% encode_bin_bit_string/3, when value is a tuple of Unused and BinBits.
+%% Unused = integer(),
+%% BinBits = binary().
+
+encode_bin_bit_string(C,{Unused,BinBits},NamedBitList) ->
+    RemoveZerosIfNNL =
+	fun({NNL,BitList}) ->
+		case NNL of
+		    [] -> BitList;
+		    _ ->
+			lists:reverse(
+			  lists:dropwhile(fun(0)->true;(1)->false end,
+					  lists:reverse(BitList)))
+		end
+	end,
+    {OctetList,OLSize,LastBits} =
+	case size(BinBits) of
+	    N when N>1 ->
+		IntList = binary_to_list(BinBits),
+		[H|T] = lists:reverse(IntList),
+		Bl1 = RemoveZerosIfNNL({NamedBitList,lists:reverse(int_to_bitlist(H,8-Unused))}),% lists:sublist obsolete if trailing bits are zero !
+		{[{octet,X} || X <- lists:reverse(T)],size(BinBits)-1,
+		 [{bit,X} || X <- Bl1]};
+	    1 ->
+		<<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1>> = BinBits,
+		{[],0,[{bit,X} || X <- lists:sublist([B7,B6,B5,B4,B3,B2,B1,B0],8-Unused)]};
+	    _ ->
+		{[],0,[]}
+	end,
+    case get_constraint(C,'SizeConstraint') of
+	0 ->
+	    [];
+	V when integer(V),V=<16 ->
+	    [OctetList, pad_list(V,LastBits)];
+	V when integer(V) ->
+%	    [OctetList, align, pad_list(V rem 8,LastBits)];
+	    [align,OctetList, pad_list(V rem 8,LastBits)];
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+	    NewLastBits = maybe_pad(Lb,length(LastBits)+(OLSize*8),LastBits,NamedBitList),
+	    [encode_length({Lb,Ub},length(NewLastBits)+(OLSize*8)),
+%			   OctetList,align,LastBits];
+			   align,OctetList,NewLastBits];
+	no ->
+	    [encode_length(undefined,length(LastBits)+(OLSize*8)),
+%	     OctetList,align,LastBits];
+	     align,OctetList,LastBits];
+	Sc={{Lb,_},_} when integer(Lb) ->
+	    NewLastBits = maybe_pad(Lb,length(LastBits)+(OLSize*8),LastBits,NamedBitList),
+	    [encode_length(Sc,length(NewLastBits)+(OLSize*8)),
+	     align,OctetList,NewLastBits];
+	Sc ->
+	    [encode_length(Sc,length(LastBits)+(OLSize*8)),
+%	     OctetList,align,LastBits]
+	     align,OctetList,LastBits]
+    end.
+
+maybe_pad(_,_,Bits,[]) ->
+    Bits;
+maybe_pad(Lb,LenBits,Bits,_) when Lb>LenBits ->
+    pad_list(Lb,Bits);
+maybe_pad(_,_,Bits,_) ->
+    Bits.
+
+%%%%%%%%%%%%%%%
+%% The result is presented as a list of named bits (if possible)
+%% else as a tuple {Unused,Bits}. Unused is the number of unused
+%% bits, least significant bits in the last byte of Bits. Bits is
+%% the BIT STRING represented as a binary.
+%%
+decode_compact_bit_string(Buffer, C, NamedNumberList) ->
+    case get_constraint(C,'SizeConstraint') of
+	0 -> % fixed length
+	    {{0,<<>>},Buffer};
+	V when integer(V),V=<16 -> %fixed length 16 bits or less
+	    compact_bit_string(Buffer,V,NamedNumberList);
+	V when integer(V) -> %fixed length > 16 bits
+	    Bytes2 = align(Buffer),
+	    compact_bit_string(Bytes2,V,NamedNumberList);
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
+	    Bytes3 = align(Bytes2),
+	    compact_bit_string(Bytes3,Len,NamedNumberList);
+	no ->
+	    {Len,Bytes2} = decode_length(Buffer,undefined),
+	    Bytes3 = align(Bytes2),
+	    compact_bit_string(Bytes3,Len,NamedNumberList);
+	Sc ->
+	    {Len,Bytes2} = decode_length(Buffer,Sc),
+	    Bytes3 = align(Bytes2),
+	    compact_bit_string(Bytes3,Len,NamedNumberList)
+    end.
+
+
+%%%%%%%%%%%%%%%
+%% The result is presented as a list of named bits (if possible)
+%% else as a list of 0 and 1.
+%%
+decode_bit_string(Buffer, C, NamedNumberList) ->
+    case get_constraint(C,'SizeConstraint') of
+	0 -> % fixed length
+	    {[],Buffer}; % nothing to encode
+	V when integer(V),V=<16 -> % fixed length 16 bits or less
+	    bit_list_to_named(Buffer,V,NamedNumberList);
+	V when integer(V) -> % fixed length 16 bits or less
+	    Bytes2 = align(Buffer),
+	    bit_list_to_named(Bytes2,V,NamedNumberList);
+	{Lb,Ub} when integer(Lb),integer(Ub) ->
+	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
+	    Bytes3 = align(Bytes2),
+	    bit_list_to_named(Bytes3,Len,NamedNumberList);
+	no ->
+	    {Len,Bytes2} = decode_length(Buffer,undefined),
+	    Bytes3 = align(Bytes2),
+	    bit_list_to_named(Bytes3,Len,NamedNumberList);
+	Sc -> % extension marker
+	    {Len,Bytes2} = decode_length(Buffer,Sc),
+	    Bytes3 = align(Bytes2),
+	    bit_list_to_named(Bytes3,Len,NamedNumberList)
+    end.
+
+
+%% if no named bits are declared we will return a
+%% {Unused,Bits}. Unused = integer(),
+%% Bits = binary().
+compact_bit_string(Buffer,Len,[]) ->
+    getbits_as_binary(Len,Buffer); % {{Unused,BinBits},NewBuffer}
+compact_bit_string(Buffer,Len,NamedNumberList) ->
+    bit_list_to_named(Buffer,Len,NamedNumberList).
+
+
+%% if no named bits are declared we will return a
+%% BitList = [0 | 1]
+
+bit_list_to_named(Buffer,Len,[]) ->
+    getbits_as_list(Len,Buffer);
+
+%% if there are named bits declared we will return a named
+%% BitList where the names are atoms and unnamed bits represented
+%% as {bit,Pos}
+%% BitList = [atom() | {bit,Pos}]
+%% Pos = integer()
+
+bit_list_to_named(Buffer,Len,NamedNumberList) ->
+    {BitList,Rest} = getbits_as_list(Len,Buffer),
+    {bit_list_to_named1(0,BitList,NamedNumberList,[]), Rest}.
+
+bit_list_to_named1(Pos,[0|Bt],Names,Acc) ->
+    bit_list_to_named1(Pos+1,Bt,Names,Acc);
+bit_list_to_named1(Pos,[1|Bt],Names,Acc) ->
+    case lists:keysearch(Pos,2,Names) of
+	{value,{Name,_}} ->
+	    bit_list_to_named1(Pos+1,Bt,Names,[Name|Acc]);
+	_  ->
+	    bit_list_to_named1(Pos+1,Bt,Names,[{bit,Pos}|Acc])
+    end;
+bit_list_to_named1(_Pos,[],_Names,Acc) ->
+    lists:reverse(Acc).
+
+
+
+%%%%%%%%%%%%%%%
+%%
+
+int_to_bitlist(0) ->
+    [];
+int_to_bitlist(Int) when integer(Int), Int >= 0 ->
+    [Int band 1 | int_to_bitlist(Int bsr 1)].
+
+int_to_bitlist(_Int,0) ->
+    [];
+int_to_bitlist(0,N) ->
+    [0|int_to_bitlist(0,N-1)];
+int_to_bitlist(Int,N) ->
+    [Int band 1 | int_to_bitlist(Int bsr 1, N-1)].
+
+
+%%%%%%%%%%%%%%%%%%
+%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
+%%   [sorted_list_of_bitpositions_to_set]
+
+get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
+    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
+
+get_all_bitposes([Val | Rest], NamedBitList, Ack) ->
+    case lists:keysearch(Val, 1, NamedBitList) of
+	{value, {_ValName, ValPos}} ->
+	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
+	_ ->
+	    exit({error,{asn1, {bitstring_namedbit, Val}}})
+    end;
+get_all_bitposes([], _NamedBitList, Ack) ->
+    lists:sort(Ack).
+
+%%%%%%%%%%%%%%%%%%
+%% make_and_set_list([list of positions to set to 1])->
+%% returns list with all in SetPos set.
+%% in positioning in list the first element is 0, the second 1 etc.., but
+%%
+
+make_and_set_list([XPos|SetPos], XPos) ->
+    [1 | make_and_set_list(SetPos, XPos + 1)];
+make_and_set_list([Pos|SetPos], XPos) ->
+    [0 | make_and_set_list([Pos | SetPos], XPos + 1)];
+make_and_set_list([], _XPos) ->
+    [].
+
+%%%%%%%%%%%%%%%%%
+%% pad_list(N,BitList) -> PaddedList
+%% returns a padded (with trailing {bit,0} elements) list of length N
+%% if Bitlist contains more than N significant bits set an exit asn1_error
+%% is generated
+
+pad_list(0,BitList) ->
+    case BitList of
+	[] -> [];
+	_ -> exit({error,{asn1,{range_error,{bit_string,BitList}}}})
+    end;
+pad_list(N,[Bh|Bt]) ->
+    [Bh|pad_list(N-1,Bt)];
+pad_list(N,[]) ->
+    [{bit,0},pad_list(N-1,[])].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% X.691:16
+%% encode_octet_string(Constraint,ExtensionMarker,Val)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+encode_octet_string(C,{Name,Val}) when atom(Name) ->
+    encode_octet_string(C,false,Val);
+encode_octet_string(C,Val) ->
+    encode_octet_string(C,false,Val).
+
+encode_octet_string(C,Bool,{_Name,Val}) ->
+    encode_octet_string(C,Bool,Val);
+encode_octet_string(_,true,_) ->
+    exit({error,{asn1,{'not_supported',extensionmarker}}});
+encode_octet_string(C,false,Val) ->
+    case get_constraint(C,'SizeConstraint') of
+	0 ->
+	    [];
+	1 ->
+	    [V] = Val,
+	    {bits,8,V};
+	2 ->
+	    [V1,V2] = Val,
+	    [{bits,8,V1},{bits,8,V2}];
+	Sv when Sv =<65535, Sv == length(Val) -> % fixed length
+	    [align,{octets,Val}];
+	{Lb,Ub}  ->
+	    [encode_length({Lb,Ub},length(Val)),align,
+	     {octets,Val}];
+	Sv when list(Sv) ->
+	    [encode_length({hd(Sv),lists:max(Sv)},length(Val)),align,
+	     {octets,Val}];
+	no  ->
+	    [encode_length(undefined,length(Val)),align,
+	     {octets,Val}]
+    end.
+
+decode_octet_string(Bytes,Range) ->
+    decode_octet_string(Bytes,Range,false).
+
+decode_octet_string(Bytes,C,false) ->
+    case get_constraint(C,'SizeConstraint') of
+	0 ->
+	    {[],Bytes};
+	1 ->
+	    {B1,Bytes2} = getbits(Bytes,8),
+	    {[B1],Bytes2};
+	2 ->
+	    {B1,Bytes2}= getbits(Bytes,8),
+	    {B2,Bytes3}= getbits(Bytes2,8),
+	    {[B1,B2],Bytes3};
+	{_,0} ->
+	    {[],Bytes};
+	Sv when integer(Sv), Sv =<65535 -> % fixed length
+	    Bytes2 = align(Bytes),
+	    getoctets_as_list(Bytes2,Sv);
+	{Lb,Ub}  ->
+	    {Len,Bytes2} = decode_length(Bytes,{Lb,Ub}),
+	    Bytes3 = align(Bytes2),
+	    getoctets_as_list(Bytes3,Len);
+	Sv when list(Sv) ->
+	    {Len,Bytes2} = decode_length(Bytes,{hd(Sv),lists:max(Sv)}),
+	    Bytes3 = align(Bytes2),
+	    getoctets_as_list(Bytes3,Len);
+	no  ->
+	    {Len,Bytes2} = decode_length(Bytes,undefined),
+	    Bytes3 = align(Bytes2),
+	    getoctets_as_list(Bytes3,Len)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Restricted char string types
+%% (NumericString, PrintableString,VisibleString,IA5String,BMPString,UniversalString)
+%% X.691:26 and X.680:34-36
+%%encode_restricted_string(aligned,'BMPString',Constraints,Extension,Val)
+
+
+encode_restricted_string(aligned,{Name,Val}) when atom(Name) ->
+    encode_restricted_string(aligned,Val);
+
+encode_restricted_string(aligned,Val) when list(Val)->
+    [encode_length(undefined,length(Val)),align,
+     {octets,Val}].
+
+encode_known_multiplier_string(aligned,StringType,C,_Ext,{Name,Val}) when atom(Name) ->
+    encode_known_multiplier_string(aligned,StringType,C,false,Val);
+
+encode_known_multiplier_string(aligned,StringType,C,_Ext,Val) ->
+    Result = chars_encode(C,StringType,Val),
+    NumBits = get_NumBits(C,StringType),
+    case get_constraint(C,'SizeConstraint') of
+	Ub when integer(Ub), Ub*NumBits =< 16  ->
+	    case {StringType,Result} of
+		{'BMPString',{octets,Ol}} ->
+		    [{bits,8,Oct}||Oct <- Ol];
+		_ ->
+		    Result
+	    end;
+	0 ->
+	    [];
+	Ub when integer(Ub),Ub =<65535 -> % fixed length
+	    [align,Result];
+	{Ub,Lb} ->
+	    [encode_length({Ub,Lb},length(Val)),align,Result];
+	Vl when list(Vl) ->
+	    [encode_length({lists:min(Vl),lists:max(Vl)},length(Val)),align,Result];
+	no  ->
+	    [encode_length(undefined,length(Val)),align,Result]
+    end.
+
+decode_restricted_string(Bytes,aligned) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    Bytes3 = align(Bytes2),
+    getoctets_as_list(Bytes3,Len).
+
+decode_known_multiplier_string(Bytes,aligned,StringType,C,_Ext) ->
+    NumBits = get_NumBits(C,StringType),
+    case get_constraint(C,'SizeConstraint') of
+	Ub when integer(Ub), Ub*NumBits =< 16  ->
+	    chars_decode(Bytes,NumBits,StringType,C,Ub);
+	Ub when integer(Ub),Ub =<65535 -> % fixed length
+	    Bytes1 = align(Bytes),
+	    chars_decode(Bytes1,NumBits,StringType,C,Ub);
+	0 ->
+	    {[],Bytes};
+	Vl when list(Vl) ->
+	    {Len,Bytes1} = decode_length(Bytes,{hd(Vl),lists:max(Vl)}),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,C,Len);
+	no  ->
+	    {Len,Bytes1} = decode_length(Bytes,undefined),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,C,Len);
+	{Lb,Ub}->
+	    {Len,Bytes1} = decode_length(Bytes,{Lb,Ub}),
+	    Bytes2 = align(Bytes1),
+	    chars_decode(Bytes2,NumBits,StringType,C,Len)
+    end.
+
+
+encode_NumericString(C,Val) ->
+    encode_known_multiplier_string(aligned,'NumericString',C,false,Val).
+decode_NumericString(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'NumericString',C,false).
+
+encode_PrintableString(C,Val) ->
+    encode_known_multiplier_string(aligned,'PrintableString',C,false,Val).
+decode_PrintableString(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'PrintableString',C,false).
+
+encode_VisibleString(C,Val) -> % equivalent with ISO646String
+    encode_known_multiplier_string(aligned,'VisibleString',C,false,Val).
+decode_VisibleString(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'VisibleString',C,false).
+
+encode_IA5String(C,Val) ->
+    encode_known_multiplier_string(aligned,'IA5String',C,false,Val).
+decode_IA5String(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'IA5String',C,false).
+
+encode_BMPString(C,Val) ->
+    encode_known_multiplier_string(aligned,'BMPString',C,false,Val).
+decode_BMPString(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'BMPString',C,false).
+
+encode_UniversalString(C,Val) ->
+    encode_known_multiplier_string(aligned,'UniversalString',C,false,Val).
+decode_UniversalString(Bytes,C) ->
+    decode_known_multiplier_string(Bytes,aligned,'UniversalString',C,false).
+
+%% end of known-multiplier strings for which PER visible constraints are
+%% applied
+
+encode_GeneralString(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_GeneralString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_GraphicString(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_GraphicString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_ObjectDescriptor(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_ObjectDescriptor(Bytes) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_TeletexString(_C,Val) -> % equivalent with T61String
+    encode_restricted_string(aligned,Val).
+decode_TeletexString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+encode_VideotexString(_C,Val) ->
+    encode_restricted_string(aligned,Val).
+decode_VideotexString(Bytes,_C) ->
+    decode_restricted_string(Bytes,aligned).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% getBMPChars(Bytes,Len) ->{BMPcharList,RemainingBytes}
+%%
+getBMPChars(Bytes,1) ->
+    {O1,Bytes2} = getbits(Bytes,8),
+    {O2,Bytes3} = getbits(Bytes2,8),
+    if
+	O1 == 0 ->
+	    {[O2],Bytes3};
+	true ->
+	    {[{0,0,O1,O2}],Bytes3}
+    end;
+getBMPChars(Bytes,Len) ->
+    getBMPChars(Bytes,Len,[]).
+
+getBMPChars(Bytes,0,Acc) ->
+    {lists:reverse(Acc),Bytes};
+getBMPChars(Bytes,Len,Acc) ->
+    {Octs,Bytes1} = getoctets_as_list(Bytes,2),
+    case Octs of
+	[0,O2] ->
+	    getBMPChars(Bytes1,Len-1,[O2|Acc]);
+	[O1,O2]->
+	    getBMPChars(Bytes1,Len-1,[{0,0,O1,O2}|Acc])
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% chars_encode(C,StringType,Value) -> ValueList
+%%
+%% encodes chars according to the per rules taking the constraint PermittedAlphabet
+%% into account.
+%% This function does only encode the value part and NOT the length
+
+chars_encode(C,StringType,Value) ->
+    case {StringType,get_constraint(C,'PermittedAlphabet')} of
+	{'UniversalString',{_,_Sv}} ->
+	    exit({error,{asn1,{'not implemented',"UniversalString with PermittedAlphabet constraint"}}});
+	{'BMPString',{_,_Sv}} ->
+	    exit({error,{asn1,{'not implemented',"BMPString with PermittedAlphabet constraint"}}});
+	_ ->
+	    {NumBits,CharOutTab} = {get_NumBits(C,StringType),get_CharOutTab(C,StringType)},
+	    chars_encode2(Value,NumBits,CharOutTab)
+    end.
+
+chars_encode2([H|T],NumBits,{Min,Max,notab}) when  H =< Max, H >= Min ->
+    [{bits,NumBits,H-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
+chars_encode2([H|T],NumBits,{Min,Max,Tab}) when H =< Max, H >= Min ->
+    [{bits,NumBits,element(H-Min+1,Tab)}|chars_encode2(T,NumBits,{Min,Max,Tab})];
+chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,notab}) ->
+    %% no value range check here (ought to be, but very expensive)
+%    [{bits,NumBits,(A*B*C*D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
+    [{bits,NumBits,((((((A bsl 8) + B) bsl 8) + C) bsl 8) + D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
+chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,Tab}) ->
+    %% no value range check here (ought to be, but very expensive)
+%    [{bits,NumBits,element((A*B*C*D)-Min,Tab)}|chars_encode2(T,NumBits,{Min,Max,notab})];
+    [{bits,NumBits,element(((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min,Tab)}|chars_encode2(T,NumBits,{Min,Max,notab})];
+chars_encode2([H|_T],_,{_,_,_}) ->
+    exit({error,{asn1,{illegal_char_value,H}}});
+chars_encode2([],_,_) ->
+    [].
+
+
+get_NumBits(C,StringType) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	{'SingleValue',Sv} ->
+	    charbits(length(Sv),aligned);
+	no ->
+	    case StringType of
+		'IA5String' ->
+		    charbits(128,aligned); % 16#00..16#7F
+		'VisibleString' ->
+		    charbits(95,aligned); % 16#20..16#7E
+		'PrintableString' ->
+		    charbits(74,aligned); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+		'NumericString' ->
+		    charbits(11,aligned); % $ ,"0123456789"
+		'UniversalString' ->
+		    32;
+		'BMPString' ->
+		    16
+	    end
+    end.
+
+%%Maybe used later
+%%get_MaxChar(C,StringType) ->
+%%    case get_constraint(C,'PermittedAlphabet') of
+%%	{'SingleValue',Sv} ->
+%%	    lists:nth(length(Sv),Sv);
+%%	no ->
+%%	    case StringType of
+%%		'IA5String' ->
+%%		    16#7F; % 16#00..16#7F
+%%		'VisibleString' ->
+%%		    16#7E; % 16#20..16#7E
+%%		'PrintableString' ->
+%%		    $z; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+%%		'NumericString' ->
+%%		    $9; % $ ,"0123456789"
+%%		'UniversalString' ->
+%%		    16#ffffffff;
+%%		'BMPString' ->
+%%		    16#ffff
+%%	    end
+%%    end.
+
+%%Maybe used later
+%%get_MinChar(C,StringType) ->
+%%    case get_constraint(C,'PermittedAlphabet') of
+%%	{'SingleValue',Sv} ->
+%%	    hd(Sv);
+%%	no ->
+%%	    case StringType of
+%%		'IA5String' ->
+%%		    16#00; % 16#00..16#7F
+%%		'VisibleString' ->
+%%		    16#20; % 16#20..16#7E
+%%		'PrintableString' ->
+%%		    $\s; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
+%%		'NumericString' ->
+%%		    $\s; % $ ,"0123456789"
+%%		'UniversalString' ->
+%%		    16#00;
+%%		'BMPString' ->
+%%		    16#00
+%%	    end
+%%    end.
+
+get_CharOutTab(C,StringType) ->
+    get_CharTab(C,StringType,out).
+
+get_CharInTab(C,StringType) ->
+    get_CharTab(C,StringType,in).
+
+get_CharTab(C,StringType,InOut) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	{'SingleValue',Sv} ->
+	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv,InOut);
+	no ->
+	    case StringType of
+		'IA5String' ->
+		    {0,16#7F,notab};
+		'VisibleString' ->
+		    get_CharTab2(C,StringType,16#20,16#7F,notab,InOut);
+		'PrintableString' ->
+		    Chars = lists:sort(
+			" '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
+		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars,InOut);
+		'NumericString' ->
+		    get_CharTab2(C,StringType,16#20,$9," 0123456789",InOut);
+		'UniversalString' ->
+		    {0,16#FFFFFFFF,notab};
+		'BMPString' ->
+		    {0,16#FFFF,notab}
+	    end
+    end.
+
+get_CharTab2(C,StringType,Min,Max,Chars,InOut) ->
+    BitValMax = (1 bsl get_NumBits(C,StringType))-1,
+    if
+	Max =< BitValMax ->
+	    {0,Max,notab};
+	true ->
+	    case InOut of
+		out ->
+		    {Min,Max,create_char_tab(Min,Chars)};
+		in  ->
+		    {Min,Max,list_to_tuple(Chars)}
+	    end
+    end.
+
+create_char_tab(Min,L) ->
+    list_to_tuple(create_char_tab(Min,L,0)).
+create_char_tab(Min,[Min|T],V) ->
+    [V|create_char_tab(Min+1,T,V+1)];
+create_char_tab(_Min,[],_V) ->
+    [];
+create_char_tab(Min,L,V) ->
+    [false|create_char_tab(Min+1,L,V)].
+
+%% This very inefficient and should be moved to compiletime
+charbits(NumOfChars,aligned) ->
+    case charbits(NumOfChars) of
+	1 -> 1;
+	2 -> 2;
+	B when B > 2, B =< 4 -> 4;
+	B when B > 4, B =< 8 -> 8;
+	B when B > 8, B =< 16 -> 16;
+	B when B > 16, B =< 32 -> 32
+    end.
+
+charbits(NumOfChars) when NumOfChars =< 2 -> 1;
+charbits(NumOfChars) when NumOfChars =< 4 -> 2;
+charbits(NumOfChars) when NumOfChars =< 8 -> 3;
+charbits(NumOfChars) when NumOfChars =< 16 -> 4;
+charbits(NumOfChars) when NumOfChars =< 32 -> 5;
+charbits(NumOfChars) when NumOfChars =< 64 -> 6;
+charbits(NumOfChars) when NumOfChars =< 128 -> 7;
+charbits(NumOfChars) when NumOfChars =< 256 -> 8;
+charbits(NumOfChars) when NumOfChars =< 512 -> 9;
+charbits(NumOfChars) when NumOfChars =< 1024 -> 10;
+charbits(NumOfChars) when NumOfChars =< 2048 -> 11;
+charbits(NumOfChars) when NumOfChars =< 4096 -> 12;
+charbits(NumOfChars) when NumOfChars =< 8192 -> 13;
+charbits(NumOfChars) when NumOfChars =< 16384 -> 14;
+charbits(NumOfChars) when NumOfChars =< 32768 -> 15;
+charbits(NumOfChars) when NumOfChars =< 65536 -> 16;
+charbits(NumOfChars) when integer(NumOfChars) ->
+    16 + charbits1(NumOfChars bsr 16).
+
+charbits1(0) ->
+    0;
+charbits1(NumOfChars) ->
+    1 + charbits1(NumOfChars bsr 1).
+
+
+chars_decode(Bytes,_,'BMPString',C,Len) ->
+    case get_constraint(C,'PermittedAlphabet') of
+	no ->
+	    getBMPChars(Bytes,Len);
+	_ ->
+	    exit({error,{asn1,
+			 {'not implemented',
+			  "BMPString with PermittedAlphabet constraint"}}})
+    end;
+chars_decode(Bytes,NumBits,StringType,C,Len) ->
+    CharInTab = get_CharInTab(C,StringType),
+    chars_decode2(Bytes,CharInTab,NumBits,Len).
+
+
+chars_decode2(Bytes,CharInTab,NumBits,Len) ->
+    chars_decode2(Bytes,CharInTab,NumBits,Len,[]).
+
+chars_decode2(Bytes,_CharInTab,_NumBits,0,Acc) ->
+    {lists:reverse(Acc),Bytes};
+chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    Result = case minimum_octets(Char+Min) of
+	[NewChar] -> NewChar;
+	[C1,C2] -> {0,0,C1,C2};
+	[C1,C2,C3] -> {0,C1,C2,C3};
+	[C1,C2,C3,C4] -> {C1,C2,C3,C4}
+    end,
+    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
+chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Char+Min|Acc]);
+
+%% BMPString and UniversalString with PermittedAlphabet is currently not supported
+chars_decode2(Bytes,{Min,Max,CharInTab},NumBits,Len,Acc) ->
+    {Char,Bytes2} = getbits(Bytes,NumBits),
+    chars_decode2(Bytes2,{Min,Max,CharInTab},NumBits,Len -1,[element(Char+1,CharInTab)|Acc]).
+
+
+			% X.691:17
+encode_null({Name,Val}) when atom(Name) ->
+    encode_null(Val);
+encode_null(_) -> []. % encodes to nothing
+
+decode_null(Bytes) ->
+    {'NULL',Bytes}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% encode_object_identifier(Val) -> CompleteList
+%% encode_object_identifier({Name,Val}) -> CompleteList
+%% Val -> {Int1,Int2,...,IntN} % N >= 2
+%% Name -> atom()
+%% Int1 -> integer(0..2)
+%% Int2 -> integer(0..39) when Int1 (0..1) else integer()
+%% Int3-N -> integer()
+%% CompleteList -> [{bits,8,Val}|{octets,Ol}|align|...]
+%%
+encode_object_identifier({Name,Val}) when atom(Name) ->
+    encode_object_identifier(Val);
+encode_object_identifier(Val) ->
+    Octets = e_object_identifier(Val,notag),
+    [{debug,object_identifier},encode_length(undefined,length(Octets)),{octets,Octets}].
+
+%% This code is copied from asn1_encode.erl (BER) and corrected and modified
+
+e_object_identifier({'OBJECT IDENTIFIER',V},DoTag) ->
+    e_object_identifier(V,DoTag);
+e_object_identifier({Cname,V},DoTag) when atom(Cname),tuple(V) ->
+    e_object_identifier(tuple_to_list(V),DoTag);
+e_object_identifier({Cname,V},DoTag) when atom(Cname),list(V) ->
+    e_object_identifier(V,DoTag);
+e_object_identifier(V,DoTag) when tuple(V) ->
+    e_object_identifier(tuple_to_list(V),DoTag);
+
+% E1 = 0|1|2 and (E2 < 40 when E1 = 0|1)
+e_object_identifier([E1,E2|Tail],_DoTag) when E1 =< 2 ->
+    Head = 40*E1 + E2,  % weird
+    Res = e_object_elements([Head|Tail]),
+%    dotag(DoTag,[6],elength(length(Res)+1),[Head|Res]),
+    Res.
+
+e_object_elements([]) ->
+    [];
+e_object_elements([H|T]) ->
+    lists:append(e_object_element(H),e_object_elements(T)).
+
+e_object_element(Num) when Num < 128 ->
+    [Num];
+% must be changed to handle more than 2 octets
+e_object_element(Num) ->  %% when Num < ???
+    Left = ((Num band 2#11111110000000) bsr 7) bor 2#10000000,
+    Right = Num band 2#1111111 ,
+    [Left,Right].
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode_object_identifier(Bytes) -> {ObjId,RemainingBytes}
+%% ObjId -> {integer(),integer(),...} % at least 2 integers
+%% RemainingBytes -> [integer()] when integer() (0..255)
+decode_object_identifier(Bytes) ->
+    {Len,Bytes2} = decode_length(Bytes,undefined),
+    {Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
+    [First|Rest] = dec_subidentifiers(Octs,0,[]),
+    Idlist = if
+	First < 40 ->
+	    [0,First|Rest];
+	First < 80 ->
+	    [1,First - 40|Rest];
+	true ->
+	    [2,First - 80|Rest]
+    end,
+    {list_to_tuple(Idlist),Bytes3}.
+
+dec_subidentifiers([H|T],Av,Al) when H >=16#80 ->
+    dec_subidentifiers(T,(Av bsl 7) + (H band 16#7F),Al);
+dec_subidentifiers([H|T],Av,Al) ->
+    dec_subidentifiers(T,0,[(Av bsl 7) + H |Al]);
+dec_subidentifiers([],_Av,Al) ->
+    lists:reverse(Al).
+
+get_constraint(C,Key) ->
+    case lists:keysearch(Key,1,C) of
+	false ->
+	     no;
+	{value,{_,V}} ->
+	    V
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% complete(InList) -> ByteList
+%% Takes a coded list with bits and bytes and converts it to a list of bytes
+%% Should be applied as the last step at encode of a complete ASN.1 type
+%%
+complete(InList) when list(InList) ->
+    complete(InList,[],0);
+complete(InList) ->
+    complete([InList],[],0).
+
+complete([{debug,_}|T], Acc, Acclen) ->
+    complete(T,Acc,Acclen);
+complete([H|T],Acc,Acclen) when list(H) ->
+    complete(lists:concat([H,T]),Acc,Acclen);
+
+
+complete([{octets,N,Val}|T],Acc,Acclen) when N =< 4 ,integer(Val) ->
+    Newval = case N of
+	1 ->
+	    Val4 = Val band 16#FF,
+	    [Val4];
+	2 ->
+	    Val3 = (Val bsr 8) band 16#FF,
+	    Val4 = Val band 16#FF,
+	    [Val3,Val4];
+	3 ->
+	    Val2 = (Val bsr 16) band 16#FF,
+	    Val3 = (Val bsr 8) band 16#FF,
+	    Val4 = Val band 16#FF,
+	    [Val2,Val3,Val4];
+	    4 ->
+	    Val1 = (Val bsr 24) band 16#FF,
+	    Val2 = (Val bsr 16) band 16#FF,
+	    Val3 = (Val bsr 8) band 16#FF,
+	    Val4 = Val band 16#FF,
+	    [Val1,Val2,Val3,Val4]
+    end,
+    complete([{octets,Newval}|T],Acc,Acclen);
+
+complete([{octets,Oct}|T],[],_Acclen) when list(Oct) ->
+    complete(T,lists:reverse(Oct),0);
+complete([{octets,Oct}|T],[Hacc|Tacc],Acclen) when list(Oct) ->
+    Rest = 8 - Acclen,
+    if
+	Rest == 8 ->
+	    complete(T,lists:concat([lists:reverse(Oct),[Hacc|Tacc]]),0);
+	true ->
+	    complete(T,lists:concat([lists:reverse(Oct),[Hacc bsl Rest|Tacc]]),0)
+    end;
+
+complete([{bit,Val}|T], Acc, Acclen) ->
+    complete([{bits,1,Val}|T],Acc,Acclen);
+complete([{octet,Val}|T], Acc, Acclen) ->
+    complete([{octets,1,Val}|T],Acc,Acclen);
+
+complete([{bits,N,Val}|T], Acc, 0) when N =< 8 ->
+    complete(T,[Val|Acc],N);
+complete([{bits,N,Val}|T], [Hacc|Tacc], Acclen) when N =< 8 ->
+    Rest = 8 - Acclen,
+    if
+	Rest >= N ->
+	    complete(T,[(Hacc bsl N) + Val|Tacc],(Acclen+N) rem 8);
+	true ->
+	    Diff = N - Rest,
+	    NewHacc = (Hacc bsl Rest) + (Val bsr Diff),
+	    Mask = element(Diff,{1,3,7,15,31,63,127,255}),
+	    complete(T,[(Val band Mask),NewHacc|Tacc],(Acclen+N) rem 8)
+    end;
+complete([{bits,N,Val}|T], Acc, Acclen) -> % N > 8
+    complete([{bits,N-8,Val bsr 8},{bits,8,Val band 255}|T],Acc,Acclen);
+
+complete([align|T],Acc,0) ->
+    complete(T,Acc,0);
+complete([align|T],[Hacc|Tacc],Acclen) ->
+    Rest = 8 - Acclen,
+    complete(T,[Hacc bsl Rest|Tacc],0);
+complete([{octets,_N,Val}|T],Acc,Acclen) when list(Val) -> % no security check here
+    complete([{octets,Val}|T],Acc,Acclen);
+
+complete([],[],0) ->
+    [0]; % a complete encoding must always be at least 1 byte
+complete([],Acc,0) ->
+    lists:reverse(Acc);
+complete([],[Hacc|Tacc],Acclen) when Acclen > 0->
+    Rest = 8 - Acclen,
+    NewHacc = Hacc bsl Rest,
+    lists:reverse([NewHacc|Tacc]).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/notes_history.sgml b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/notes_history.sgml
new file mode 100644
index 0000000000..3b50c1b73f
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/notes_history.sgml
@@ -0,0 +1,97 @@
+<!doctype chapter PUBLIC "-//Stork//DTD chapter//EN">
+<!--
+ ``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 via the world wide web 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.
+
+ The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+ Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+ AB. All Rights Reserved.''
+
+     $Id: notes_history.sgml,v 1.1 2008/12/17 09:53:31 mikpe Exp $
+-->
+<chapter>
+  <header>
+    <title>ASN1 Release Notes (Old)</title>
+    <prepared>Kenneth Lundin</prepared>
+    <responsible>Kenneth Lundin</responsible>
+    <docno></docno>
+    <approved>Kenneth Lundin</approved>
+    <checked>Kenneth Lundin</checked>
+    <date>98-02-02</date>
+    <rev>A</rev>
+    <file>notes_history.sgml</file>
+  </header>
+
+  <p>This document describes the changes made to old versions of the <c>asn1</c> application.
+
+  <section>
+    <title>ASN1 0.8.1</title>
+    <p>This is the first release of the ASN1 application. This version is released
+      for beta-testing. Some functionality will be added until the 1.0 version is
+      released. A list of missing features and restrictions can be found in the
+      chapter below.
+
+    <section>
+      <title>Missing features and other restrictions</title>
+      <list>
+	<item>
+	  <p>The encoding rules BER and PER (aligned) is supported. <em>PER (unaligned)
+	      IS NOT SUPPORTED</em>.
+	<item>
+	  <p>NOT SUPPORTED types <c>ANY</c> and <c>ANY DEFINED BY</c>
+	    (is not in the standard any more).
+	<item>
+	  <p>NOT SUPPORTED types <c>EXTERNAL</c> and <c>EMBEDDED-PDV</c>.
+	<item>
+	  <p>NOT SUPPORTED type <c>REAL</c> (planned to  be implemented).
+	<item>
+	  <p>The code generation support for value definitions in the ASN.1 notation is very limited
+	    (planned to be enhanced).
+	<item>
+	  <p>The support for constraints is limited to:
+	  <list>
+	    <item><p>
+		SizeConstraint	SIZE(X)
+	    <item><p>
+		SingleValue	(1)
+	    <item><p>
+		ValueRange	(X..Y)
+	    <item><p>
+		PermittedAlpabet FROM (but not for BMPString and UniversalString when generating PER).
+	  </list>
+	  <p>Complex expressions in constraints is not supported (planned to be extended).
+	<item>
+	  <p>The current version of the compiler has very limited error checking:
+	    <list>
+	    <item><p>Stops at first syntax error.
+	    <item><p>Does not stop when a reference to an undefined type is found ,
+		but prints an error message. Compilation of the generated
+		Erlang module will then fail.
+	    <item><p>A whole number of other semantical controls is currently missing. This
+		means that the compiler will give little or bad help to detect what's wrong
+		with an ASN.1 specification, but will mostly work very well when the
+		ASN.1 specification is correct.
+	  </list>
+	<item>
+	  <p>The maximum INTEGER supported in this version is a signed 64 bit integer. This
+	    limitation is probably quite reasonable. (Planned to be extended).
+	<item>
+	  <p>Only AUTOMATIC TAGS supported for PER.
+	<item>
+	  <p>Only EXPLICIT and IMPLICIT TAGS supported for BER.
+	<item>
+	  <p>The compiler supports decoding of BER-data with indefinite length but it is
+	    not possible to produce data with indefinite length with the encoder.
+      </list>
+    </section>
+
+  </section>
+</chapter>
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/notes_latest.sgml b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/notes_latest.sgml
new file mode 100644
index 0000000000..ff1f5adfa2
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/notes_latest.sgml
@@ -0,0 +1,97 @@
+<!doctype chapter PUBLIC "-//Stork//DTD chapter//EN">
+<!--
+ ``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 via the world wide web 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.
+
+ The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+ Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+ AB. All Rights Reserved.''
+
+     $Id: notes_latest.sgml,v 1.1 2008/12/17 09:53:31 mikpe Exp $
+-->
+<chapter>
+  <header>
+    <title>ASN1 Release Notes</title>
+    <prepared>Kenneth Lundin</prepared>
+    <responsible>Kenneth Lundin</responsible>
+    <docno></docno>
+    <approved>Kenneth Lundin</approved>
+    <checked>Kenneth Lundin</checked>
+    <date>97-10-07</date>
+    <rev>A</rev>
+    <file>notes_latest.sgml</file>
+  </header>
+
+  <p>This document describes the changes made to the asn1 application.
+
+  <section>
+    <title>ASN1 0.8.1</title>
+    <p>This is the first release of the ASN1 application. This version is released
+      for beta-testing. Some functionality will be added until the 1.0 version is
+      released. A list of missing features and restrictions can be found in the
+      chapter below.
+
+    <section>
+      <title>Missing features and other restrictions</title>
+      <list>
+	<item>
+	  <p>The encoding rules BER and PER (aligned) is supported. <em>PER (unaligned)
+	      IS NOT SUPPORTED</em>.
+	<item>
+	  <p>NOT SUPPORTED types <c>ANY</c> and <c>ANY DEFINED BY</c>
+	    (is not in the standard any more).
+	<item>
+	  <p>NOT SUPPORTED types <c>EXTERNAL</c> and <c>EMBEDDED-PDV</c>.
+	<item>
+	  <p>NOT SUPPORTED type <c>REAL</c> (planned to  be implemented).
+	<item>
+	  <p>The code generation support for value definitions in the ASN.1 notation is very limited
+	    (planned to be enhanced).
+	<item>
+	  <p>The support for constraints is limited to:
+	  <list>
+	    <item><p>
+		SizeConstraint	SIZE(X)
+	    <item><p>
+		SingleValue	(1)
+	    <item><p>
+		ValueRange	(X..Y)
+	    <item><p>
+		PermittedAlpabet FROM (but not for BMPString and UniversalString when generating PER).
+	  </list>
+	  <p>Complex expressions in constraints is not supported (planned to be extended).
+	<item>
+	  <p>The current version of the compiler has very limited error checking:
+	    <list>
+	    <item><p>Stops at first syntax error.
+	    <item><p>Does not stop when a reference to an undefined type is found ,
+		but prints an error message. Compilation of the generated
+		Erlang module will then fail.
+	    <item><p>A whole number of other semantical controls is currently missing. This
+		means that the compiler will give little or bad help to detect what's wrong
+		with an ASN.1 specification, but will mostly work very well when the
+		ASN.1 specification is correct.
+	  </list>
+	<item>
+	  <p>The maximum INTEGER supported in this version is a signed 64 bit integer. This
+	    limitation is probably quite reasonable. (Planned to be extended).
+	<item>
+	  <p>Only AUTOMATIC TAGS supported for PER.
+	<item>
+	  <p>Only EXPLICIT and IMPLICIT TAGS supported for BER.
+	<item>
+	  <p>The compiler supports decoding of BER-data with indefinite length but it is
+	    not possible to produce data with indefinite length with the encoder.
+      </list>
+    </section>
+
+  </section>
+</chapter>
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/Makefile b/lib/dialyzer/test/r9c_SUITE_data/src/inets/Makefile
new file mode 100644
index 0000000000..be63eb73b2
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/Makefile
@@ -0,0 +1,178 @@
+# ``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 via the world wide web 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.
+#
+# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+# AB. All Rights Reserved.''
+#
+#     $Id: Makefile,v 1.1 2008/12/17 09:53:33 mikpe Exp $
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+
+VSN     = $(INETS_VSN)
+APP_VSN = "inets-$(VSN)"
+
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/inets-$(VSN)
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+MODULES = \
+	ftp \
+	http \
+	http_lib \
+	httpc_handler \
+	httpc_manager \
+	uri \
+	httpd \
+	httpd_acceptor \
+	httpd_acceptor_sup \
+	httpd_conf \
+	httpd_example \
+	httpd_manager \
+	httpd_misc_sup \
+	httpd_parse \
+	httpd_request_handler \
+	httpd_response \
+	httpd_socket \
+	httpd_sup \
+	httpd_util \
+	httpd_verbosity \
+	inets_sup \
+	mod_actions \
+	mod_alias \
+	mod_auth \
+	mod_auth_plain \
+	mod_auth_dets \
+	mod_auth_mnesia \
+	mod_auth_server \
+	mod_browser \
+	mod_cgi \
+	mod_dir \
+	mod_disk_log \
+	mod_esi \
+	mod_get \
+	mod_head \
+	mod_htaccess \
+	mod_include \
+	mod_log \
+	mod_range \
+	mod_responsecontrol \
+	mod_trace \
+	mod_security \
+	mod_security_server
+
+HRL_FILES = httpd.hrl httpd_verbosity.hrl mod_auth.hrl \
+            http.hrl jnets_httpd.hrl
+
+ERL_FILES = $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
+
+APP_FILE= inets.app
+APPUP_FILE= inets.appup
+
+APP_SRC= $(APP_FILE).src
+APP_TARGET= $(EBIN)/$(APP_FILE)
+
+APPUP_SRC= $(APPUP_FILE).src
+APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
+
+# ----------------------------------------------------
+# INETS FLAGS
+# ----------------------------------------------------
+# DONT_USE_VERBOSITY = -Ddont_use_verbosity=true
+INETS_FLAGS = -D'SERVER_SOFTWARE="inets/$(VSN)"' \
+              -Ddefault_verbosity=silence \
+              $(DONT_USE_VERBOSITY)
+
+# INETS_DEBUG_DEFAULT = d
+ifeq ($(INETS_DEBUG),)
+  INETS_DEBUG = $(INETS_DEBUG_DEFAULT)
+endif
+
+ifeq ($(INETS_DEBUG),c)
+  INETS_FLAGS += -Dinets_cdebug -Dinets_debug -Dinets_log -Dinets_error
+endif
+ifeq ($(INETS_DEBUG),d)
+  INETS_FLAGS += -Dinets_debug -Dinets_log -Dinets_error
+endif
+ifeq ($(INETS_DEBUG),l)
+  INETS_FLAGS += -Dinets_log -Dinets_error
+endif
+ifeq ($(INETS_DEBUG),e)
+  INETS_FLAGS += -Dinets_error
+endif
+
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+ERL_FLAGS +=
+
+ifeq ($(WARN_UNUSED_WARS),true)
+ERL_COMPILE_FLAGS += +warn_unused_vars
+endif
+
+ERL_COMPILE_FLAGS += $(INETS_FLAGS) \
+                     +'{parse_transform,sys_pre_attributes}' \
+                     +'{attribute,insert,app_vsn,$(APP_VSN)}'
+
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+debug opt: $(TARGET_FILES)
+
+clean:
+	rm -f $(TARGET_FILES)
+	rm -f core
+
+docs:
+
+# ----------------------------------------------------
+# Special Build Targets
+# ----------------------------------------------------
+
+$(APP_TARGET): $(APP_SRC) ../vsn.mk
+	sed -e 's;%VSN%;$(VSN);' $< > $@
+
+$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+	sed -e 's;%VSN%;$(VSN);' $< > $@
+
+# ----------------------------------------------------
+# Release Target
+# ----------------------------------------------------
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR) $(RELSYSDIR)/src
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
+	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+release_docs_spec:
+
+info:
+	@echo "INETS_DEBUG       = $(INETS_DEBUG)"
+	@echo "INETS_FLAGS       = $(INETS_FLAGS)"
+	@echo "ERL_COMPILE_FLAGS = $(ERL_COMPILE_FLAGS)"
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/ftp.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/ftp.erl
new file mode 100644
index 0000000000..312bb3a5c8
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/ftp.erl
@@ -0,0 +1,1582 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: ftp.erl,v 1.2 2009/03/03 01:55:01 kostis Exp $
+%%
+-module(ftp).
+
+-behaviour(gen_server).
+
+%% This module implements an ftp client based on socket(3)/gen_tcp(3),
+%% file(3) and filename(3).
+%%
+
+
+-define(OPEN_TIMEOUT, 60*1000).
+-define(BYTE_TIMEOUT, 1000).   % Timeout for _ONE_ byte to arrive. (ms)
+-define(OPER_TIMEOUT, 300).    % Operation timeout (seconds)
+-define(FTP_PORT, 21).
+
+%% Client interface
+-export([cd/2, close/1, delete/2, formaterror/1, help/0,
+	 lcd/2, lpwd/1, ls/1, ls/2,
+	 mkdir/2, nlist/1, nlist/2,
+	 open/1, open/2, open/3,
+	 pwd/1,
+	 recv/2, recv/3, recv_bin/2,
+	 recv_chunk_start/2, recv_chunk/1,
+	 rename/3, rmdir/2,
+	 send/2, send/3, send_bin/3,
+	 send_chunk_start/2, send_chunk/2, send_chunk_end/1,
+	 type/2, user/3,user/4,account/2,
+	 append/3, append/2, append_bin/3,
+	 append_chunk/2, append_chunk_end/1, append_chunk_start/2]).
+
+%% Internal
+-export([init/1, handle_call/3, handle_cast/2,
+	 handle_info/2, terminate/2,code_change/3]).
+
+
+%%
+%% CLIENT FUNCTIONS
+%%
+
+%% open(Host)
+%% open(Host, Flags)
+%%
+%% Purpose:  Start an ftp client and connect to a host.
+%% Args:     Host = string(),
+%%           Port = integer(),
+%%           Flags = [Flag],
+%%           Flag = verbose | debug
+%% Returns:  {ok, Pid} | {error, ehost}
+
+%%Tho only option was the host in textual form
+open({option_list,Option_list})->
+    %% Dbg = {debug,[trace,log,statistics]},
+    %% Options = [Dbg],
+    Options = [],
+    {ok,Pid1}=case lists:keysearch(flags,1,Option_list) of
+		  {value,{flags,Flags}}->
+		      {ok, Pid} = gen_server:start_link(?MODULE, [Flags], Options);
+		  false ->
+		      {ok, Pid} = gen_server:start_link(?MODULE, [], Options)
+	      end,
+    gen_server:call(Pid1, {open, ip_comm,Option_list}, infinity);
+
+
+%%The only option was the tuple form of the ip-number
+open(Host)when tuple(Host) ->
+    open(Host, ?FTP_PORT, []);
+
+%%Host is the string form of the hostname
+open(Host)->
+    open(Host,?FTP_PORT,[]).
+
+
+
+open(Host, Port) when integer(Port) ->
+    open(Host,Port,[]);
+
+open(Host, Flags) when list(Flags) ->
+    open(Host,?FTP_PORT, Flags).
+
+open(Host,Port,Flags) when integer(Port), list(Flags) ->
+    %% Dbg = {debug,[trace,log,statistics]},
+    %% Options = [Dbg],
+    Options = [],
+    {ok, Pid} = gen_server:start_link(?MODULE, [Flags], Options),
+    gen_server:call(Pid, {open, ip_comm, Host, Port}, infinity).
+
+%% user(Pid, User, Pass)
+%% Purpose:  Login.
+%% Args:     Pid = pid(), User = Pass = string()
+%% Returns:  ok | {error, euser} | {error, econn}
+user(Pid, User, Pass) ->
+  gen_server:call(Pid, {user, User, Pass}, infinity).
+
+%% user(Pid, User, Pass,Acc)
+%% Purpose:  Login whith a supplied account name
+%% Args:     Pid = pid(), User = Pass = Acc = string()
+%% Returns:  ok | {error, euser} | {error, econn} | {error, eacct}
+user(Pid, User, Pass,Acc) ->
+  gen_server:call(Pid, {user, User, Pass,Acc}, infinity).
+
+%% account(Pid,Acc)
+%% Purpose:  Set a user Account.
+%% Args:     Pid = pid(), Acc= string()
+%% Returns:  ok | {error, eacct}
+account(Pid,Acc) ->
+  gen_server:call(Pid, {account,Acc}, infinity).
+
+%% pwd(Pid)
+%%
+%% Purpose:  Get the current working directory at remote server.
+%% Args:     Pid = pid()
+%% Returns:  {ok, Dir} | {error, elogin} | {error, econn}
+pwd(Pid) ->
+  gen_server:call(Pid, pwd, infinity).
+
+%% lpwd(Pid)
+%%
+%% Purpose:  Get the current working directory at local server.
+%% Args:     Pid = pid()
+%% Returns:  {ok, Dir} | {error, elogin}
+lpwd(Pid) ->
+  gen_server:call(Pid, lpwd, infinity).
+
+%% cd(Pid, Dir)
+%%
+%% Purpose:  Change current working directory at remote server.
+%% Args:     Pid = pid(), Dir = string()
+%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
+cd(Pid, Dir) ->
+  gen_server:call(Pid, {cd, Dir}, infinity).
+
+%% lcd(Pid, Dir)
+%%
+%% Purpose:  Change current working directory for the local client.
+%% Args:     Pid = pid(), Dir = string()
+%% Returns:  ok | {error, epath}
+lcd(Pid, Dir) ->
+  gen_server:call(Pid, {lcd, Dir}, infinity).
+
+%% ls(Pid)
+%% ls(Pid, Dir)
+%%
+%% Purpose:  List the contents of current directory (ls/1) or directory
+%%           Dir (ls/2) at remote server.
+%% Args:     Pid = pid(), Dir = string()
+%% Returns:  {ok, Listing} | {error, epath} | {error, elogin} | {error, econn}
+ls(Pid) ->
+  ls(Pid, "").
+ls(Pid, Dir) ->
+  gen_server:call(Pid, {dir, long, Dir}, infinity).
+
+%% nlist(Pid)
+%% nlist(Pid, Dir)
+%%
+%% Purpose:  List the contents of current directory (ls/1) or directory
+%%           Dir (ls/2) at remote server. The returned list is a stream
+%%           of file names.
+%% Args:     Pid = pid(), Dir = string()
+%% Returns:  {ok, Listing} | {error, epath} | {error, elogin} | {error, econn}
+nlist(Pid) ->
+  nlist(Pid, "").
+nlist(Pid, Dir) ->
+  gen_server:call(Pid, {dir, short, Dir}, infinity).
+
+%% rename(Pid, CurrFile, NewFile)
+%%
+%% Purpose:  Rename a file at remote server.
+%% Args:     Pid = pid(), CurrFile = NewFile = string()
+%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
+rename(Pid, CurrFile, NewFile) ->
+  gen_server:call(Pid, {rename, CurrFile, NewFile}, infinity).
+
+%% delete(Pid, File)
+%%
+%% Purpose:  Remove file at remote server.
+%% Args:     Pid = pid(), File = string()
+%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
+delete(Pid, File) ->
+  gen_server:call(Pid, {delete, File}, infinity).
+
+%% mkdir(Pid, Dir)
+%%
+%% Purpose:  Make directory at remote server.
+%% Args:     Pid = pid(), Dir = string()
+%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
+mkdir(Pid, Dir) ->
+  gen_server:call(Pid, {mkdir, Dir}, infinity).
+
+%% rmdir(Pid, Dir)
+%%
+%% Purpose:  Remove directory at remote server.
+%% Args:     Pid = pid(), Dir = string()
+%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
+rmdir(Pid, Dir) ->
+  gen_server:call(Pid, {rmdir, Dir}, infinity).
+
+%% type(Pid, Type)
+%%
+%% Purpose:  Set transfer type.
+%% Args:     Pid = pid(), Type = ascii | binary
+%% Returns:  ok | {error, etype} | {error, elogin} | {error, econn}
+type(Pid, Type) ->
+  gen_server:call(Pid, {type, Type}, infinity).
+
+%% recv(Pid, RFile [, LFile])
+%%
+%% Purpose:  Transfer file from remote server.
+%% Args:     Pid = pid(), RFile = LFile = string()
+%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
+recv(Pid, RFile) ->
+  recv(Pid, RFile, "").
+
+recv(Pid, RFile, LFile) ->
+  gen_server:call(Pid, {recv, RFile, LFile}, infinity).
+
+%% recv_bin(Pid, RFile)
+%%
+%% Purpose:  Transfer file from remote server into binary.
+%% Args:     Pid = pid(), RFile = string()
+%% Returns:  {ok, Bin} | {error, epath} | {error, elogin} | {error, econn}
+recv_bin(Pid, RFile) ->
+  gen_server:call(Pid, {recv_bin, RFile}, infinity).
+
+%% recv_chunk_start(Pid, RFile)
+%%
+%% Purpose:  Start receive of chunks of remote file.
+%% Args:     Pid = pid(), RFile = string().
+%% Returns:  ok | {error, elogin} | {error, epath} | {error, econn}
+recv_chunk_start(Pid, RFile) ->
+  gen_server:call(Pid, {recv_chunk_start, RFile}, infinity).
+
+
+%% recv_chunk(Pid, RFile)
+%%
+%% Purpose:  Transfer file from remote server into binary in chunks
+%% Args:     Pid = pid(), RFile = string()
+%% Returns:  Reference
+recv_chunk(Pid) ->
+    gen_server:call(Pid, recv_chunk, infinity).
+
+%% send(Pid, LFile [, RFile])
+%%
+%% Purpose:  Transfer file to remote server.
+%% Args:     Pid = pid(), LFile = RFile = string()
+%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
+send(Pid, LFile) ->
+  send(Pid, LFile, "").
+
+send(Pid, LFile, RFile) ->
+  gen_server:call(Pid, {send, LFile, RFile}, infinity).
+
+%% send_bin(Pid, Bin, RFile)
+%%
+%% Purpose:  Transfer a binary to a remote file.
+%% Args:     Pid = pid(), Bin = binary(), RFile = string()
+%% Returns:  ok | {error, epath} | {error, elogin} | {error, enotbinary}
+%%           | {error, econn}
+send_bin(Pid, Bin, RFile) when binary(Bin) ->
+  gen_server:call(Pid, {send_bin, Bin, RFile}, infinity);
+send_bin(Pid, Bin, RFile) ->
+  {error, enotbinary}.
+
+%% send_chunk_start(Pid, RFile)
+%%
+%% Purpose:  Start transfer of chunks to remote file.
+%% Args:     Pid = pid(), RFile = string().
+%% Returns:  ok | {error, elogin} | {error, epath} | {error, econn}
+send_chunk_start(Pid, RFile) ->
+  gen_server:call(Pid, {send_chunk_start, RFile}, infinity).
+
+
+%% append_chunk_start(Pid, RFile)
+%%
+%% Purpose:  Start append chunks of data to remote file.
+%% Args:     Pid = pid(), RFile = string().
+%% Returns:  ok | {error, elogin} | {error, epath} | {error, econn}
+append_chunk_start(Pid, RFile) ->
+  gen_server:call(Pid, {append_chunk_start, RFile}, infinity).
+
+
+%% send_chunk(Pid, Bin)
+%%
+%% Purpose:  Send chunk to remote file.
+%% Args:     Pid = pid(), Bin = binary().
+%% Returns:  ok | {error, elogin} | {error, enotbinary} | {error, echunk}
+%%           | {error, econn}
+send_chunk(Pid, Bin) when binary(Bin) ->
+  gen_server:call(Pid, {send_chunk, Bin}, infinity);
+send_chunk(Pid, Bin) ->
+  {error, enotbinary}.
+
+%%append_chunk(Pid, Bin)
+%%
+%% Purpose:  Append chunk to remote file.
+%% Args:     Pid = pid(), Bin = binary().
+%% Returns:  ok | {error, elogin} | {error, enotbinary} | {error, echunk}
+%%           | {error, econn}
+append_chunk(Pid, Bin) when binary(Bin) ->
+  gen_server:call(Pid, {append_chunk, Bin}, infinity);
+append_chunk(Pid, Bin) ->
+  {error, enotbinary}.
+
+%% send_chunk_end(Pid)
+%%
+%% Purpose:  End sending of chunks to remote file.
+%% Args:     Pid = pid().
+%% Returns:  ok | {error, elogin} | {error, echunk} | {error, econn}
+send_chunk_end(Pid) ->
+  gen_server:call(Pid, send_chunk_end, infinity).
+
+%% append_chunk_end(Pid)
+%%
+%% Purpose:  End appending of chunks to remote file.
+%% Args:     Pid = pid().
+%% Returns:  ok | {error, elogin} | {error, echunk} | {error, econn}
+append_chunk_end(Pid) ->
+  gen_server:call(Pid, append_chunk_end, infinity).
+
+%% append(Pid, LFile,RFile)
+%%
+%% Purpose:  Append the local file to the remote file
+%% Args:     Pid = pid(), LFile = RFile = string()
+%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
+append(Pid, LFile) ->
+    append(Pid, LFile, "").
+
+append(Pid, LFile, RFile) ->
+  gen_server:call(Pid, {append, LFile, RFile}, infinity).
+
+%% append_bin(Pid, Bin, RFile)
+%%
+%% Purpose:  Append a binary to a remote file.
+%% Args:     Pid = pid(), Bin = binary(), RFile = string()
+%% Returns:  ok | {error, epath} | {error, elogin} | {error, enotbinary}
+%%           | {error, econn}
+append_bin(Pid, Bin, RFile) when binary(Bin) ->
+  gen_server:call(Pid, {append_bin, Bin, RFile}, infinity);
+append_bin(Pid, Bin, RFile) ->
+  {error, enotbinary}.
+
+
+%% close(Pid)
+%%
+%% Purpose:  End the ftp session.
+%% Args:     Pid = pid()
+%% Returns:  ok
+close(Pid) ->
+  case (catch gen_server:call(Pid, close, 30000)) of
+      ok ->
+	  ok;
+      {'EXIT',{noproc,_}} ->
+	  %% Already gone...
+	  ok;
+      Res ->
+	  Res
+  end.
+
+%% formaterror(Tag)
+%%
+%% Purpose:  Return diagnostics.
+%% Args:     Tag = atom() | {error, atom()}
+%% Returns:  string().
+formaterror(Tag) ->
+  errstr(Tag).
+
+%% help()
+%%
+%% Purpose:  Print list of valid commands.
+%%
+%% Undocumented.
+%%
+help() ->
+  io:format("\n  Commands:\n"
+	    "  ---------\n"
+	    "  cd(Pid, Dir)\n"
+	    "  close(Pid)\n"
+	    "  delete(Pid, File)\n"
+	    "  formaterror(Tag)\n"
+	    "  help()\n"
+	    "  lcd(Pid, Dir)\n"
+	    "  lpwd(Pid)\n"
+	    "  ls(Pid [, Dir])\n"
+	    "  mkdir(Pid, Dir)\n"
+	    "  nlist(Pid [, Dir])\n"
+	    "  open(Host [Port, Flags])\n"
+	    "  pwd(Pid)\n"
+	    "  recv(Pid, RFile [, LFile])\n"
+	    "  recv_bin(Pid, RFile)\n"
+	    "  recv_chunk_start(Pid, RFile)\n"
+	    "  recv_chunk(Pid)\n"
+	    "  rename(Pid, CurrFile, NewFile)\n"
+	    "  rmdir(Pid, Dir)\n"
+	    "  send(Pid, LFile [, RFile])\n"
+	    "  send_chunk(Pid, Bin)\n"
+	    "  send_chunk_start(Pid, RFile)\n"
+	    "  send_chunk_end(Pid)\n"
+	    "  send_bin(Pid, Bin, RFile)\n"
+	    "  append(Pid, LFile [, RFile])\n"
+	    "  append_chunk(Pid, Bin)\n"
+	    "  append_chunk_start(Pid, RFile)\n"
+	    "  append_chunk_end(Pid)\n"
+	    "  append_bin(Pid, Bin, RFile)\n"
+	    "  type(Pid, Type)\n"
+	    "  account(Pid,Account)\n"
+	    "  user(Pid, User, Pass)\n"
+	    "  user(Pid, User, Pass,Account)\n").
+
+%%
+%% INIT
+%%
+
+-record(state, {csock = undefined, dsock = undefined, flags = undefined,
+		ldir = undefined, type = undefined, chunk = false,
+		pending = undefined}).
+
+init([Flags]) ->
+    sock_start(),
+    put(debug,get_debug(Flags)),
+    put(verbose,get_verbose(Flags)),
+    process_flag(priority, low),
+    {ok, LDir} = file:get_cwd(),
+    {ok, #state{flags = Flags, ldir = LDir}}.
+
+%%
+%% HANDLERS
+%%
+
+%% First group of reply code digits
+-define(POS_PREL, 1).
+-define(POS_COMPL, 2).
+-define(POS_INTERM, 3).
+-define(TRANS_NEG_COMPL, 4).
+-define(PERM_NEG_COMPL, 5).
+
+%% Second group of reply code digits
+-define(SYNTAX,0).
+-define(INFORMATION,1).
+-define(CONNECTION,2).
+-define(AUTH_ACC,3).
+-define(UNSPEC,4).
+-define(FILE_SYSTEM,5).
+
+
+-define(STOP_RET(E),{stop, normal, {error, E},
+		     State#state{csock = undefined}}).
+
+
+rescode(?POS_PREL,_,_)                   -> pos_prel; %%Positive Preleminary Reply
+rescode(?POS_COMPL,_,_)                  -> pos_compl; %%Positive Completion Reply
+rescode(?POS_INTERM,?AUTH_ACC,2)         -> pos_interm_acct; %%Positive Intermediate Reply nedd account
+rescode(?POS_INTERM,_,_)                 -> pos_interm; %%Positive Intermediate Reply
+rescode(?TRANS_NEG_COMPL,?FILE_SYSTEM,2) -> trans_no_space; %%No storage area no action taken
+rescode(?TRANS_NEG_COMPL,_,_)            -> trans_neg_compl;%%Temporary Error, no action taken
+rescode(?PERM_NEG_COMPL,?FILE_SYSTEM,2)  -> perm_no_space; %%Permanent disk space error, the user shall not try again
+rescode(?PERM_NEG_COMPL,?FILE_SYSTEM,3)  -> perm_fname_not_allowed;
+rescode(?PERM_NEG_COMPL,_,_)             -> perm_neg_compl.
+
+retcode(trans_no_space,_)         -> etnospc;
+retcode(perm_no_space,_)          -> epnospc;
+retcode(perm_fname_not_allowed,_) -> efnamena;
+retcode(_,Otherwise)              -> Otherwise.
+
+handle_call({open,ip_comm,Conn_data},From,State) ->
+    case lists:keysearch(host,1,Conn_data) of
+	{value,{host,Host}}->
+	    Port=get_key1(port,Conn_data,?FTP_PORT),
+	    Timeout=get_key1(timeout,Conn_data,?OPEN_TIMEOUT),
+	    open(Host,Port,Timeout,State);
+	false ->
+	    ehost
+    end;
+
+handle_call({open,ip_comm,Host,Port},From,State) ->
+    open(Host,Port,?OPEN_TIMEOUT,State);
+
+handle_call({user, User, Pass}, _From, State) ->
+    #state{csock = CSock} = State,
+    case ctrl_cmd(CSock, "USER ~s", [User]) of
+	pos_interm ->
+	    case ctrl_cmd(CSock, "PASS ~s", [Pass]) of
+		pos_compl ->
+		    set_type(binary, CSock),
+		    {reply, ok, State#state{type = binary}};
+		{error,enotconn} ->
+		    ?STOP_RET(econn);
+		_ ->
+		    {reply, {error, euser}, State}
+	    end;
+	pos_compl ->
+	    set_type(binary, CSock),
+	    {reply, ok, State#state{type = binary}};
+	{error, enotconn} ->
+	    ?STOP_RET(econn);
+	_ ->
+	    {reply, {error, euser}, State}
+    end;
+
+handle_call({user, User, Pass,Acc}, _From, State) ->
+    #state{csock = CSock} = State,
+    case ctrl_cmd(CSock, "USER ~s", [User]) of
+	pos_interm ->
+	    case ctrl_cmd(CSock, "PASS ~s", [Pass]) of
+		pos_compl ->
+		    set_type(binary, CSock),
+		    {reply, ok, State#state{type = binary}};
+		pos_interm_acct->
+		    case ctrl_cmd(CSock,"ACCT ~s",[Acc]) of
+			pos_compl->
+			    set_type(binary, CSock),
+			    {reply, ok, State#state{type = binary}};
+			{error,enotconn}->
+			    ?STOP_RET(econn);
+			_ ->
+			    {reply, {error, eacct}, State}
+		    end;
+		{error,enotconn} ->
+		    ?STOP_RET(econn);
+		_ ->
+		    {reply, {error, euser}, State}
+	    end;
+	pos_compl ->
+	    set_type(binary, CSock),
+	    {reply, ok, State#state{type = binary}};
+	{error, enotconn} ->
+	    ?STOP_RET(econn);
+	_ ->
+	    {reply, {error, euser}, State}
+    end;
+
+%%set_account(Acc,State)->Reply
+%%Reply={reply, {error, euser}, State} | {error,enotconn}->
+handle_call({account,Acc},_From,State)->
+    #state{csock = CSock} = State,
+    case ctrl_cmd(CSock,"ACCT ~s",[Acc]) of
+	pos_compl->
+	    {reply, ok,State};
+	{error,enotconn}->
+	    ?STOP_RET(econn);
+	Error ->
+	    debug(" error: ~p",[Error]),
+	    {reply, {error, eacct}, State}
+    end;
+
+handle_call(pwd, _From, State) when State#state.chunk == false ->
+  #state{csock = CSock} = State,
+  %%
+  %% NOTE: The directory string comes over the control connection.
+  case sock_write(CSock, mk_cmd("PWD", [])) of
+    ok ->
+      {_, Line} = result_line(CSock),
+      {_, Cs} = split($", Line),			% XXX Ugly
+      {Dir0, _} = split($", Cs),
+      Dir = lists:delete($", Dir0),
+      {reply, {ok, Dir}, State};
+    {error, enotconn} ->
+      ?STOP_RET(econn)
+  end;
+
+handle_call(lpwd, _From, State) ->
+  #state{csock = CSock, ldir = LDir} = State,
+  {reply, {ok, LDir}, State};
+
+handle_call({cd, Dir}, _From, State) when State#state.chunk == false ->
+  #state{csock = CSock} = State,
+  case ctrl_cmd(CSock, "CWD ~s", [Dir]) of
+    pos_compl ->
+      {reply, ok, State};
+    {error, enotconn} ->
+      ?STOP_RET(econn);
+    _ ->
+      {reply, {error, epath}, State}
+  end;
+
+handle_call({lcd, Dir}, _From, State) ->
+  #state{csock = CSock, ldir = LDir0} = State,
+  LDir = absname(LDir0, Dir),
+  case file:read_file_info(LDir) of
+    {ok, _ } ->
+      {reply, ok, State#state{ldir = LDir}};
+    _  ->
+      {reply, {error, epath}, State}
+  end;
+
+handle_call({dir, Len, Dir}, _From, State) when State#state.chunk == false ->
+    debug("  dir : ~p: ~s~n",[Len,Dir]),
+    #state{csock = CSock, type = Type} = State,
+    set_type(ascii, Type, CSock),
+    LSock = listen_data(CSock, raw),
+    Cmd = case Len of
+	      short -> "NLST";
+	      long -> "LIST"
+	  end,
+    Result = case Dir of
+		 "" ->
+		     ctrl_cmd(CSock, Cmd, "");
+		 _ ->
+		     ctrl_cmd(CSock, Cmd ++ " ~s", [Dir])
+	     end,
+    debug(" ctrl : command result: ~p~n",[Result]),
+    case Result of
+	pos_prel ->
+	    debug("  dbg : await the data connection", []),
+	    DSock = accept_data(LSock),
+	    debug("  dbg : await the data", []),
+	    Reply0 =
+		case recv_data(DSock) of
+		    {ok, DirData} ->
+			debug(" data : DirData: ~p~n",[DirData]),
+			case result(CSock) of
+			    pos_compl ->
+				{ok, DirData};
+			    _ ->
+				{error, epath}
+			end;
+		    {error, Reason} ->
+			sock_close(DSock),
+			verbose(" data : error: ~p, ~p~n",[Reason, result(CSock)]),
+			{error, epath}
+		end,
+
+	    debug(" ctrl : reply: ~p~n",[Reply0]),
+	    reset_type(ascii, Type, CSock),
+	    {reply, Reply0, State};
+	{closed, _Why} ->
+	    ?STOP_RET(econn);
+	_ ->
+	    sock_close(LSock),
+	    {reply, {error, epath}, State}
+    end;
+
+
+handle_call({rename, CurrFile, NewFile}, _From, State) when State#state.chunk == false ->
+  #state{csock = CSock} = State,
+  case ctrl_cmd(CSock, "RNFR ~s", [CurrFile]) of
+    pos_interm ->
+      case ctrl_cmd(CSock, "RNTO ~s", [NewFile]) of
+	pos_compl ->
+	  {reply, ok, State};
+	_ ->
+	  {reply, {error, epath}, State}
+      end;
+    {error, enotconn} ->
+      ?STOP_RET(econn);
+    _ ->
+      {reply, {error, epath}, State}
+  end;
+
+handle_call({delete, File}, _From, State) when State#state.chunk == false ->
+  #state{csock = CSock} = State,
+  case ctrl_cmd(CSock, "DELE ~s", [File]) of
+    pos_compl ->
+      {reply, ok, State};
+    {error, enotconn} ->
+      ?STOP_RET(econn);
+    _ ->
+      {reply, {error, epath}, State}
+  end;
+
+handle_call({mkdir, Dir}, _From, State) when State#state.chunk == false ->
+  #state{csock = CSock} = State,
+  case ctrl_cmd(CSock, "MKD ~s", [Dir]) of
+    pos_compl ->
+      {reply, ok, State};
+    {error, enotconn} ->
+      ?STOP_RET(econn);
+    _ ->
+      {reply, {error, epath}, State}
+  end;
+
+handle_call({rmdir, Dir}, _From, State) when State#state.chunk == false ->
+  #state{csock = CSock} = State,
+  case ctrl_cmd(CSock, "RMD ~s", [Dir]) of
+    pos_compl ->
+      {reply, ok, State};
+    {error, enotconn} ->
+      ?STOP_RET(econn);
+    _ ->
+      {reply, {error, epath}, State}
+  end;
+
+handle_call({type, Type}, _From, State) when State#state.chunk == false ->
+  #state{csock = CSock} = State,
+  case Type of
+    ascii ->
+      set_type(ascii, CSock),
+      {reply, ok, State#state{type = ascii}};
+    binary ->
+      set_type(binary, CSock),
+      {reply, ok, State#state{type = binary}};
+    _ ->
+      {reply, {error, etype}, State}
+  end;
+
+handle_call({recv, RFile, LFile}, _From, State) when State#state.chunk == false ->
+  #state{csock = CSock, ldir = LDir} = State,
+  ALFile = case LFile of
+	     "" ->
+	       absname(LDir, RFile);
+	     _ ->
+	       absname(LDir, LFile)
+	   end,
+  case file_open(ALFile, write) of
+    {ok, Fd} ->
+      LSock = listen_data(CSock, binary),
+      Ret = case ctrl_cmd(CSock, "RETR ~s", [RFile]) of
+	      pos_prel ->
+		DSock = accept_data(LSock),
+		recv_file(DSock, Fd),
+		Reply0 = case result(CSock) of
+			   pos_compl ->
+			     ok;
+			   _ ->
+			     {error, epath}
+			 end,
+		sock_close(DSock),
+		{reply, Reply0, State};
+	      {error, enotconn} ->
+		?STOP_RET(econn);
+	      _ ->
+		{reply, {error, epath}, State}
+	    end,
+      file_close(Fd),
+      Ret;
+    {error, _What} ->
+      {reply, {error, epath}, State}
+  end;
+
+handle_call({recv_bin, RFile}, _From, State) when State#state.chunk == false ->
+    #state{csock = CSock, ldir = LDir} = State,
+    LSock = listen_data(CSock, binary),
+    case ctrl_cmd(CSock, "RETR ~s", [RFile]) of
+	pos_prel ->
+	    DSock = accept_data(LSock),
+	    Reply = recv_binary(DSock,CSock),
+	    sock_close(DSock),
+	    {reply, Reply, State};
+	{error, enotconn} ->
+	    ?STOP_RET(econn);
+	_ ->
+	    {reply, {error, epath}, State}
+    end;
+
+
+handle_call({recv_chunk_start, RFile}, _From, State)
+  when State#state.chunk == false ->
+    start_chunk_transfer("RETR",RFile,State);
+
+handle_call(recv_chunk, _From, State)
+  when State#state.chunk == true ->
+    do_recv_chunk(State);
+
+
+handle_call({send, LFile, RFile}, _From, State)
+  when State#state.chunk == false ->
+    transfer_file("STOR",LFile,RFile,State);
+
+handle_call({append, LFile, RFile}, _From, State)
+  when State#state.chunk == false ->
+    transfer_file("APPE",LFile,RFile,State);
+
+
+handle_call({send_bin, Bin, RFile}, _From, State)
+  when State#state.chunk == false ->
+    transfer_data("STOR",Bin,RFile,State);
+
+handle_call({append_bin, Bin, RFile}, _From, State)
+  when State#state.chunk == false ->
+  transfer_data("APPE",Bin,RFile,State);
+
+
+
+handle_call({send_chunk_start, RFile}, _From, State)
+  when State#state.chunk == false ->
+    start_chunk_transfer("STOR",RFile,State);
+
+handle_call({append_chunk_start,RFile},_From,State)
+  when State#state.chunk==false->
+    start_chunk_transfer("APPE",RFile,State);
+
+handle_call({send_chunk, Bin}, _From, State)
+  when State#state.chunk == true ->
+    chunk_transfer(Bin,State);
+
+handle_call({append_chunk, Bin}, _From, State)
+  when State#state.chunk == true ->
+    chunk_transfer(Bin,State);
+
+handle_call(append_chunk_end, _From, State)
+  when State#state.chunk == true ->
+    end_chunk_transfer(State);
+
+handle_call(send_chunk_end, _From, State)
+  when State#state.chunk == true ->
+    end_chunk_transfer(State);
+
+
+
+handle_call(close, _From, State) when State#state.chunk == false ->
+  #state{csock = CSock} = State,
+  ctrl_cmd(CSock, "QUIT", []),
+  sock_close(CSock),
+  {stop, normal, ok, State};
+
+handle_call(_, _From, State) when State#state.chunk == true ->
+  {reply, {error, echunk}, State}.
+
+
+handle_cast(Msg, State) ->
+  {noreply, State}.
+
+
+handle_info({Sock, {fromsocket, Bytes}}, State) when Sock == State#state.csock ->
+  put(leftovers, Bytes ++ leftovers()),
+  {noreply, State};
+
+%% Data connection closed (during chunk sending)
+handle_info({Sock, {socket_closed, _Reason}}, State) when Sock == State#state.dsock ->
+  {noreply, State#state{dsock = undefined}};
+
+%% Control connection closed.
+handle_info({Sock, {socket_closed, _Reason}}, State) when Sock == State#state.csock ->
+  debug("   sc : ~s~n",[leftovers()]),
+  {stop, ftp_server_close, State#state{csock = undefined}};
+
+handle_info(Info, State) ->
+  error_logger:info_msg("ftp : ~w : Unexpected message: ~w\n", [self(),Info]),
+  {noreply, State}.
+
+code_change(OldVsn,State,Extra)->
+    {ok,State}.
+
+terminate(Reason, State) ->
+  ok.
+%%
+%% OPEN CONNECTION
+%%
+open(Host,Port,Timeout,State)->
+    case sock_connect(Host,Port,Timeout) of
+	{error, What} ->
+	    {stop, normal, {error, What}, State};
+	CSock ->
+	    case result(CSock, State#state.flags) of
+		{error,Reason} ->
+		    sock_close(CSock),
+		    {stop,normal,{error,Reason},State};
+		_ -> % We should really check this...
+		    {reply, {ok, self()}, State#state{csock = CSock}}
+	    end
+    end.
+
+
+
+%%
+%% CONTROL CONNECTION
+%%
+
+ctrl_cmd(CSock, Fmt, Args) ->
+    Cmd = mk_cmd(Fmt, Args),
+    case sock_write(CSock, Cmd) of
+	ok ->
+	    debug("  cmd : ~s",[Cmd]),
+	    result(CSock);
+	{error, enotconn} ->
+	    {error, enotconn};
+	Other ->
+	    Other
+    end.
+
+mk_cmd(Fmt, Args) ->
+    [io_lib:format(Fmt, Args)| "\r\n"].		% Deep list ok.
+
+%%
+%% TRANSFER TYPE
+%%
+
+%%
+%% set_type(NewType, CurrType, CSock)
+%% reset_type(NewType, CurrType, CSock)
+%%
+set_type(Type, Type, CSock) ->
+  ok;
+set_type(NewType, _OldType, CSock) ->
+  set_type(NewType, CSock).
+
+reset_type(Type, Type, CSock) ->
+  ok;
+reset_type(_NewType, OldType, CSock) ->
+  set_type(OldType, CSock).
+
+set_type(ascii, CSock) ->
+  ctrl_cmd(CSock, "TYPE A", []);
+set_type(binary, CSock) ->
+  ctrl_cmd(CSock, "TYPE I", []).
+
+%%
+%% DATA CONNECTION
+%%
+
+%% Create a listen socket for a data connection and send a PORT command
+%% containing the IP address and port number. Mode is binary or raw.
+%%
+listen_data(CSock, Mode) ->
+  {IP, _} = sock_name(CSock), % IP address of control conn.
+  LSock = sock_listen(Mode, IP),
+  Port = sock_listen_port(LSock),
+  {A1, A2, A3, A4} = IP,
+  {P1, P2} = {Port div 256, Port rem 256},
+  ctrl_cmd(CSock, "PORT ~w,~w,~w,~w,~w,~w", [A1, A2, A3, A4, P1, P2]),
+  LSock.
+
+%%
+%% Accept the data connection and close the listen socket.
+%%
+accept_data(LSock) ->
+  Sock = sock_accept(LSock),
+  sock_close(LSock),
+  Sock.
+
+%%
+%% DATA COLLECTION (ls, dir)
+%%
+%% Socket is a byte stream in ASCII mode.
+%%
+
+%% Receive data (from data connection).
+recv_data(Sock) ->
+    recv_data(Sock, [], 0).
+recv_data(Sock, Sofar, ?OPER_TIMEOUT) ->
+    sock_close(Sock),
+    {ok, lists:flatten(lists:reverse(Sofar))};
+recv_data(Sock, Sofar, Retry) ->
+    case sock_read(Sock) of
+	{ok, Data} ->
+	    debug("  dbg : received some data: ~n~s", [Data]),
+	    recv_data(Sock, [Data| Sofar], 0);
+	{error, timeout} ->
+	    %% Retry..
+	    recv_data(Sock, Sofar, Retry+1);
+	{error, Reason} ->
+	    SoFar1 = lists:flatten(lists:reverse(Sofar)),
+	    {error, {socket_error, Reason, SoFar1, Retry}};
+	{closed, _} ->
+	    {ok, lists:flatten(lists:reverse(Sofar))}
+    end.
+
+%%
+%% BINARY TRANSFER
+%%
+
+%% --------------------------------------------------
+
+%% recv_binary(DSock,CSock) = {ok,Bin} | {error,Reason}
+%%
+recv_binary(DSock,CSock) ->
+    recv_binary1(recv_binary2(DSock,[],0),CSock).
+
+recv_binary1(Reply,Sock) ->
+    case result(Sock) of
+	pos_compl -> Reply;
+	_         -> {error, epath}
+    end.
+
+recv_binary2(Sock, _Bs, ?OPER_TIMEOUT) ->
+    sock_close(Sock),
+    {error,eclosed};
+recv_binary2(Sock, Bs, Retry) ->
+    case sock_read(Sock) of
+	{ok, Bin} ->
+	    recv_binary2(Sock, [Bs, Bin], 0);
+	{error, timeout} ->
+	    recv_binary2(Sock, Bs, Retry+1);
+	{closed, _Why} ->
+	    {ok,list_to_binary(Bs)}
+  end.
+
+%% --------------------------------------------------
+
+%%
+%% recv_chunk
+%%
+
+do_recv_chunk(#state{dsock = undefined} = State) ->
+    {reply, {error,econn}, State};
+do_recv_chunk(State) ->
+    recv_chunk1(recv_chunk2(State, 0), State).
+
+recv_chunk1({ok, _Bin} = Reply, State) ->
+    {reply, Reply, State};
+%% Reply = ok | {error, Reason}
+recv_chunk1(Reply, #state{csock = CSock} = State) ->
+    State1 = State#state{dsock = undefined, chunk = false},
+    case result(CSock) of
+	pos_compl ->
+	    {reply, Reply, State1};
+	_         ->
+	    {reply, {error, epath}, State1}
+    end.
+
+recv_chunk2(#state{dsock = DSock} = State, ?OPER_TIMEOUT) ->
+    sock_close(DSock),
+    {error, eclosed};
+recv_chunk2(#state{dsock = DSock} = State, Retry) ->
+    case sock_read(DSock) of
+	{ok, Bin} ->
+	    {ok, Bin};
+	{error, timeout} ->
+           recv_chunk2(State, Retry+1);
+	{closed, Reason} ->
+	    debug("  dbg : socket closed: ~p", [Reason]),
+	    ok
+    end.
+
+
+%% --------------------------------------------------
+
+%%
+%% FILE TRANSFER
+%%
+
+recv_file(Sock, Fd) ->
+    recv_file(Sock, Fd, 0).
+
+recv_file(Sock, Fd, ?OPER_TIMEOUT) ->
+    sock_close(Sock),
+    {closed, timeout};
+recv_file(Sock, Fd, Retry) ->
+    case sock_read(Sock) of
+	{ok, Bin} ->
+	    file_write(Fd, Bin),
+	    recv_file(Sock, Fd);
+	{error, timeout} ->
+	    recv_file(Sock, Fd, Retry+1);
+% 	{error, Reason} ->
+% 	    SoFar1 = lists:flatten(lists:reverse(Sofar)),
+% 	    exit({socket_error, Reason, Sock, SoFar1, Retry});
+	{closed, How} ->
+	    {closed, How}
+  end.
+
+%%
+%% send_file(Fd, Sock) = ok | {error, Why}
+%%
+
+send_file(Fd, Sock) ->
+  {N, Bin} = file_read(Fd),
+  if
+    N > 0 ->
+      case sock_write(Sock, Bin) of
+	ok ->
+	  send_file(Fd, Sock);
+	{error, Reason} ->
+	  {error, Reason}
+      end;
+    true ->
+      ok
+  end.
+
+
+
+%%
+%% PARSING OF RESULT LINES
+%%
+
+%% Excerpt from RFC 959:
+%%
+%%      "A reply is defined to contain the 3-digit code, followed by Space
+%%      <SP>, followed by one line of text (where some maximum line length
+%%      has been specified), and terminated by the Telnet end-of-line
+%%      code.  There will be cases however, where the text is longer than
+%%      a single line.  In these cases the complete text must be bracketed
+%%      so the User-process knows when it may stop reading the reply (i.e.
+%%      stop processing input on the control connection) and go do other
+%%      things.  This requires a special format on the first line to
+%%      indicate that more than one line is coming, and another on the
+%%      last line to designate it as the last.  At least one of these must
+%%      contain the appropriate reply code to indicate the state of the
+%%      transaction.  To satisfy all factions, it was decided that both
+%%      the first and last line codes should be the same.
+%%
+%%         Thus the format for multi-line replies is that the first line
+%%         will begin with the exact required reply code, followed
+%%         immediately by a Hyphen, "-" (also known as Minus), followed by
+%%         text.  The last line will begin with the same code, followed
+%%         immediately by Space <SP>, optionally some text, and the Telnet
+%%         end-of-line code.
+%%
+%%            For example:
+%%                                123-First line
+%%                                Second line
+%%                                  234 A line beginning with numbers
+%%                                123 The last line
+%%
+%%         The user-process then simply needs to search for the second
+%%         occurrence of the same reply code, followed by <SP> (Space), at
+%%         the beginning of a line, and ignore all intermediary lines.  If
+%%         an intermediary line begins with a 3-digit number, the Server
+%%         must pad the front  to avoid confusion.
+%%
+%%            This scheme allows standard system routines to be used for
+%%            reply information (such as for the STAT reply), with
+%%            "artificial" first and last lines tacked on.  In rare cases
+%%            where these routines are able to generate three digits and a
+%%            Space at the beginning of any line, the beginning of each
+%%            text line should be offset by some neutral text, like Space.
+%%
+%%         This scheme assumes that multi-line replies may not be nested."
+
+%% We have to collect the stream of result characters into lines (ending
+%% in "\r\n"; we check for "\n"). When a line is assembled, left-over
+%% characters are saved in the process dictionary.
+%%
+
+%% result(Sock) = rescode()
+%%
+result(Sock) ->
+  result(Sock, false).
+
+result_line(Sock) ->
+  result(Sock, true).
+
+%% result(Sock, Bool) = {error,Reason} | rescode() | {rescode(), Lines}
+%% Printout if Bool = true.
+%%
+result(Sock, RetForm) ->
+    case getline(Sock) of
+	Line when length(Line) > 3 ->
+	    [D1, D2, D3| Tail] = Line,
+	    case Tail of
+		[$-| _] ->
+		    parse_to_end(Sock, [D1, D2, D3, $ ]); % 3 digits + space
+		_ ->
+		    ok
+	    end,
+	    result(D1,D2,D3,Line,RetForm);
+	_ ->
+	    retform(rescode(?PERM_NEG_COMPL,-1,-1),[],RetForm)
+    end.
+
+result(D1,_D2,_D3,Line,_RetForm) when D1 - $0 > 10 ->
+    {error,{invalid_server_response,Line}};
+result(D1,_D2,_D3,Line,_RetForm) when D1 - $0 < 0 ->
+    {error,{invalid_server_response,Line}};
+result(D1,D2,D3,Line,RetForm) ->
+    Res1 = D1 - $0,
+    Res2 = D2 - $0,
+    Res3 = D3 - $0,
+    verbose("    ~w : ~s", [Res1, Line]),
+    retform(rescode(Res1,Res2,Res3),Line,RetForm).
+
+retform(ResCode,Line,true) ->
+    {ResCode,Line};
+retform(ResCode,_,_) ->
+    ResCode.
+
+leftovers() ->
+  case get(leftovers) of
+    undefined -> [];
+    X -> X
+  end.
+
+%% getline(Sock) = Line
+%%
+getline(Sock) ->
+  getline(Sock, leftovers()).
+
+getline(Sock, Rest) ->
+  getline1(Sock, split($\n, Rest), 0).
+
+getline1(Sock, {[], Rest}, ?OPER_TIMEOUT) ->
+    sock_close(Sock),
+    put(leftovers, Rest),
+    [];
+getline1(Sock, {[], Rest}, Retry) ->
+    case sock_read(Sock) of
+	{ok, More} ->
+	    debug(" read : ~s~n",[More]),
+	    getline(Sock, Rest ++ More);
+	{error, timeout} ->
+	    %% Retry..
+	    getline1(Sock, {[], Rest}, Retry+1);
+	Error ->
+	    put(leftovers, Rest),
+	    []
+    end;
+getline1(Sock, {Line, Rest}, Retry) ->
+    put(leftovers, Rest),
+    Line.
+
+parse_to_end(Sock, Prefix) ->
+  Line = getline(Sock),
+  case lists:prefix(Prefix, Line) of
+    false ->
+      parse_to_end(Sock, Prefix);
+    true ->
+      ok
+  end.
+
+
+%% Split list after first occurence of S.
+%% Returns {Prefix, Suffix} ({[], Cs} if S not found).
+split(S, Cs) ->
+  split(S, Cs, []).
+
+split(S, [S| Cs], As) ->
+  {lists:reverse([S|As]), Cs};
+split(S, [C| Cs], As) ->
+  split(S, Cs, [C| As]);
+split(_, [], As) ->
+  {[], lists:reverse(As)}.
+
+%%
+%%  FILE INTERFACE
+%%
+%%  All files are opened raw in binary mode.
+%%
+-define(BUFSIZE, 4096).
+
+file_open(File, Option) ->
+  file:open(File, [raw, binary, Option]).
+
+file_close(Fd) ->
+  file:close(Fd).
+
+
+file_read(Fd) ->				% Compatible with pre R2A.
+  case file:read(Fd, ?BUFSIZE) of
+    {ok, {N, Bytes}} ->
+      {N, Bytes};
+    {ok, Bytes} ->
+      {size(Bytes), Bytes};
+    eof ->
+      {0, []}
+  end.
+
+file_write(Fd, Bytes) ->
+  file:write(Fd, Bytes).
+
+absname(Dir, File) ->				% Args swapped.
+  filename:absname(File, Dir).
+
+
+
+%% sock_start()
+%%
+
+%%
+%% USE GEN_TCP
+%%
+
+sock_start() ->
+  inet_db:start().
+
+%%
+%% Connect to FTP server at Host (default is TCP port 21) in raw mode,
+%% in order to establish a control connection.
+%%
+
+sock_connect(Host,Port,TimeOut) ->
+    debug(" info : connect to server on ~p:~p~n",[Host,Port]),
+    Opts = [{packet, 0}, {active, false}],
+    case (catch gen_tcp:connect(Host, Port, Opts,TimeOut)) of
+	{'EXIT', R1} ->	% XXX Probably no longer needed.
+	    debug(" error: socket connectionn failed with exit reason:"
+		  "~n   ~p",[R1]),
+	    {error, ehost};
+	{error, R2} ->
+	    debug(" error: socket connectionn failed with exit reason:"
+		  "~n   ~p",[R2]),
+	    {error, ehost};
+	{ok, Sock} ->
+	    Sock
+    end.
+
+%%
+%% Create a listen socket (any port) in binary or raw non-packet mode for
+%% data connection.
+%%
+sock_listen(Mode, IP) ->
+  Opts = case Mode of
+	   binary ->
+	     [binary, {packet, 0}];
+	   raw ->
+	     [{packet, 0}]
+	 end,
+  {ok, Sock} = gen_tcp:listen(0, [{ip, IP}, {active, false} | Opts]),
+  Sock.
+
+sock_accept(LSock) ->
+  {ok, Sock} = gen_tcp:accept(LSock),
+  Sock.
+
+sock_close(undefined) ->
+  ok;
+sock_close(Sock) ->
+  gen_tcp:close(Sock).
+
+sock_read(Sock) ->
+  case gen_tcp:recv(Sock, 0, ?BYTE_TIMEOUT) of
+      {ok, Bytes} ->
+	  {ok, Bytes};
+
+      {error, closed} ->
+	  {closed, closed};			% Yes
+
+      %% --- OTP-4770 begin ---
+      %%
+      %% This seems to happen on windows
+      %% "Someone" tried to close an already closed socket...
+      %%
+
+      {error, enotsock} ->
+	  {closed, enotsock};
+
+      %%
+      %% --- OTP-4770 end ---
+
+      {error, etimedout} ->
+	  {error, timeout};
+
+      Other ->
+	  Other
+  end.
+
+%%    receive
+%%	{tcp, Sock, Bytes} ->
+%%	    {ok, Bytes};
+%%	{tcp_closed, Sock} ->
+%%	    {closed, closed}
+%%    end.
+
+sock_write(Sock, Bytes) ->
+  gen_tcp:send(Sock, Bytes).
+
+sock_name(Sock) ->
+  {ok, {IP, Port}} = inet:sockname(Sock),
+  {IP, Port}.
+
+sock_listen_port(LSock) ->
+  {ok, Port} = inet:port(LSock),
+  Port.
+
+
+%%
+%%  ERROR STRINGS
+%%
+errstr({error, Reason}) ->
+  errstr(Reason);
+
+errstr(echunk) -> "Synchronisation error during chung sending.";
+errstr(eclosed) -> "Session has been closed.";
+errstr(econn) ->  "Connection to remote server prematurely closed.";
+errstr(eexists) ->"File or directory already exists.";
+errstr(ehost) ->  "Host not found, FTP server not found, "
+"or connection rejected.";
+errstr(elogin) -> "User not logged in.";
+errstr(enotbinary) -> "Term is not a binary.";
+errstr(epath) ->  "No such file or directory, already exists, "
+"or permission denied.";
+errstr(etype) ->  "No such type.";
+errstr(euser) ->  "User name or password not valid.";
+errstr(etnospc) -> "Insufficient storage space in system.";
+errstr(epnospc) -> "Exceeded storage allocation "
+"(for current directory or dataset).";
+errstr(efnamena) -> "File name not allowed.";
+errstr(Reason) ->
+  lists:flatten(io_lib:format("Unknown error: ~w", [Reason])).
+
+
+
+%% ----------------------------------------------------------
+
+get_verbose(Params) -> check_param(verbose,Params).
+
+get_debug(Flags)    -> check_param(debug,Flags).
+
+check_param(P,Ps)   -> lists:member(P,Ps).
+
+
+%% verbose -> ok
+%%
+%% Prints the string if the Flags list is non-epmty
+%%
+%% Params: F   Format string
+%%         A   Arguments to the format string
+%%
+verbose(F,A) -> verbose(get(verbose),F,A).
+
+verbose(true,F,A) -> print(F,A);
+verbose(_,_F,_A)  -> ok.
+
+
+
+
+%% debug -> ok
+%%
+%% Prints the string if debug enabled
+%%
+%% Params: F   Format string
+%%         A   Arguments to the format string
+%%
+debug(F,A) -> debug(get(debug),F,A).
+
+debug(true,F,A) -> print(F,A);
+debug(_,_F,_A)  -> ok.
+
+
+print(F,A) -> io:format(F,A).
+
+
+
+transfer_file(Cmd,LFile,RFile,State)->
+    #state{csock = CSock, ldir = LDir} = State,
+    ARFile = case RFile of
+	       "" ->
+		   LFile;
+	       _ ->
+		   RFile
+	   end,
+    ALFile = absname(LDir, LFile),
+    case file_open(ALFile, read) of
+      {ok, Fd} ->
+	  LSock = listen_data(CSock, binary),
+	  case ctrl_cmd(CSock, "~s ~s", [Cmd,ARFile]) of
+	      pos_prel ->
+		  DSock = accept_data(LSock),
+		  SFreply = send_file(Fd, DSock),
+		  file_close(Fd),
+		  sock_close(DSock),
+		  case {SFreply,result(CSock)} of
+		      {ok,pos_compl} ->
+			  {reply, ok, State};
+		      {ok,Other} ->
+			  debug(" error: unknown reply: ~p~n",[Other]),
+			  {reply, {error, epath}, State};
+		      {{error,Why},Result} ->
+			  ?STOP_RET(retcode(Result,econn))
+		  end;
+	      {error, enotconn} ->
+		  ?STOP_RET(econn);
+	      Other ->
+		  debug(" error: ctrl failed: ~p~n",[Other]),
+		  {reply, {error, epath}, State}
+	  end;
+	{error, Reason} ->
+	    debug(" error: file open: ~p~n",[Reason]),
+	    {reply, {error, epath}, State}
+    end.
+
+transfer_data(Cmd,Bin,RFile,State)->
+    #state{csock = CSock, ldir = LDir} = State,
+    LSock = listen_data(CSock, binary),
+    case ctrl_cmd(CSock, "~s ~s", [Cmd,RFile]) of
+	pos_prel ->
+	    DSock  = accept_data(LSock),
+	    SReply = sock_write(DSock, Bin),
+	    sock_close(DSock),
+	    case {SReply,result(CSock)} of
+		{ok,pos_compl} ->
+		    {reply, ok, State};
+		{ok,trans_no_space} ->
+		    ?STOP_RET(etnospc);
+		{ok,perm_no_space} ->
+		    ?STOP_RET(epnospc);
+		{ok,perm_fname_not_allowed} ->
+		    ?STOP_RET(efnamena);
+		{ok,Other} ->
+		    debug(" error: unknown reply: ~p~n",[Other]),
+		    {reply, {error, epath}, State};
+		{{error,Why},Result} ->
+		    ?STOP_RET(retcode(Result,econn))
+	    %% {{error,_Why},_Result} ->
+	    %%    ?STOP_RET(econn)
+	    end;
+
+	{error, enotconn} ->
+	    ?STOP_RET(econn);
+
+	Other ->
+	    debug(" error: ctrl failed: ~p~n",[Other]),
+	    {reply, {error, epath}, State}
+    end.
+
+
+start_chunk_transfer(Cmd, RFile, #state{csock = CSock} = State) ->
+  LSock = listen_data(CSock, binary),
+  case ctrl_cmd(CSock, "~s ~s", [Cmd,RFile]) of
+    pos_prel ->
+      DSock = accept_data(LSock),
+      {reply, ok, State#state{dsock = DSock, chunk = true}};
+    {error, enotconn} ->
+      ?STOP_RET(econn);
+    Otherwise ->
+      debug(" error: ctrl failed: ~p~n",[Otherwise]),
+      {reply, {error, epath}, State}
+  end.
+
+
+chunk_transfer(Bin,State)->
+  #state{dsock = DSock, csock = CSock} = State,
+  case DSock of
+    undefined ->
+      {reply,{error,econn},State};
+    _ ->
+      case sock_write(DSock, Bin) of
+	ok ->
+	  {reply, ok, State};
+	Other ->
+	  debug(" error: chunk write error: ~p~n",[Other]),
+	  {reply, {error, econn}, State#state{dsock = undefined}}
+      end
+  end.
+
+
+
+end_chunk_transfer(State)->
+    #state{csock = CSock, dsock = DSock} = State,
+    case DSock of
+	undefined ->
+	    Result = result(CSock),
+	    case Result of
+		pos_compl ->
+		    {reply,ok,State#state{dsock = undefined,
+					  chunk = false}};
+		trans_no_space ->
+		    ?STOP_RET(etnospc);
+		perm_no_space ->
+		    ?STOP_RET(epnospc);
+		perm_fname_not_allowed ->
+		    ?STOP_RET(efnamena);
+		Result ->
+		    debug(" error: send chunk end (1): ~p~n",
+			  [Result]),
+		    {reply,{error,epath},State#state{dsock = undefined,
+						     chunk = false}}
+	    end;
+	_ ->
+	    sock_close(DSock),
+	    Result = result(CSock),
+	    case Result of
+		pos_compl ->
+		    {reply,ok,State#state{dsock = undefined,
+					  chunk = false}};
+		trans_no_space ->
+		    sock_close(CSock),
+		    ?STOP_RET(etnospc);
+		perm_no_space ->
+		    sock_close(CSock),
+		    ?STOP_RET(epnospc);
+		perm_fname_not_allowed ->
+		    sock_close(CSock),
+		    ?STOP_RET(efnamena);
+		Result ->
+		    debug(" error: send chunk end (2): ~p~n",
+			  [Result]),
+		    {reply,{error,epath},State#state{dsock = undefined,
+						     chunk = false}}
+	    end
+    end.
+
+get_key1(Key,List,Default)->
+    case lists:keysearch(Key,1,List)of
+	{value,{_,Val}}->
+	    Val;
+	false->
+	    Default
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/http.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/http.erl
new file mode 100644
index 0000000000..a732f23aec
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/http.erl
@@ -0,0 +1,260 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Mobile Arts AB
+%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
+%% All Rights Reserved.''
+%%
+%%
+
+%%% This version of the HTTP/1.1 client implements:
+%%%      - RFC 2616 HTTP 1.1 client part
+%%%      - RFC 2817 Upgrading to TLS Within HTTP/1.1 (not yet!)
+%%%      - RFC 2818 HTTP Over TLS
+%%%      - RFC 3229 Delta encoding in HTTP (not yet!)
+%%%      - RFC 3230 Instance Digests in HTTP (not yet!)
+%%%      - RFC 3310 Authentication and Key Agreement (AKA) (not yet!)
+%%%      - HTTP/1.1 Specification Errata found at
+%%%        http://world.std.com/~lawrence/http_errata.html
+%%%    Additionaly follows the following recommendations:
+%%%      - RFC 3143 Known HTTP Proxy/Caching Problems (not yet!)
+%%%      - draft-nottingham-hdrreg-http-00.txt (not yet!)
+%%%
+%%% Depends on
+%%%      - uri.erl for all URL parsing (except what is handled by the C driver)
+%%%      - http_lib.erl for all parsing of body and headers
+%%%
+%%% Supported Settings are:
+%%% http_timeout      % (int) Milliseconds before a request times out
+%%% http_useproxy     % (bool) True if a proxy should be used
+%%% http_proxy        % (string) Proxy
+%%% http_noproxylist  % (list) List with hosts not requiring proxy
+%%% http_autoredirect % (bool) True if automatic redirection on 30X responses
+%%% http_ssl          % (list) SSL settings. A non-empty list enables SSL/TLS
+%%%                      support in the HTTP client
+%%% http_pipelinesize % (int) Length of pipeline. 1 means no pipeline.
+%%%                      Only has effect when initiating a new session.
+%%% http_sessions     % (int) Max number of open sessions for {Addr,Port}
+%%%
+%%% TODO: (Known bugs!)
+%% - Cache handling
+%% - Doesn't handle a bunch of entity headers properly
+%% - Better handling of status codes different from 200,30X and 50X
+%% - Many of the settings above are not implemented!
+%% - close_session/2 and cancel_request/1 doesn't work
+%% - Variable pipe size.
+%% - Due to the fact that inet_drv only has a single timer, the timeouts given
+%%   for pipelined requests are not ok (too long)
+%%
+%% Note:
+%% - Some servers (e.g. Microsoft-IIS/5.0) may sometimes not return a proper
+%%   'Location' header on a redirect.
+%%   The client will fail with {error,no_scheme} in these cases.
+
+-module(http).
+-author("[email protected]").
+
+-export([start/0,
+	 request/3,request/4,cancel_request/1,
+	 request_sync/2,request_sync/3]).
+
+-include("http.hrl").
+-include("jnets_httpd.hrl").
+
+-define(START_OPTIONS,[]).
+
+%%% HTTP Client manager. Used to store open connections.
+%%% Will be started automatically unless started explicitly.
+start() ->
+    application:start(ssl),
+    httpc_manager:start().
+
+%%% Asynchronous HTTP request that spawns a handler.
+%%% Method                          HTTPReq
+%%% options,get,head,delete,trace = {Url,Headers}
+%%% post,put                      = {Url,Headers,ContentType,Body}
+%%%  where Url is a {Scheme,Host,Port,PathQuery} tuple, as returned by uri.erl
+%%%
+%%% Returns: {ok,ReqId} |
+%%%          {error,Reason}
+%%% If {ok,Pid} was returned, the handler will return with
+%%%    gen_server:cast(From,{Ref,ReqId,{error,Reason}}) |
+%%%    gen_server:cast(From,{Ref,ReqId,{Status,Headers,Body}})
+%%%  where Reason is an atom and Headers a #res_headers{} record
+%%% http:format_error(Reason) gives a more informative description.
+%%%
+%%% Note:
+%%% - Always try to find an open connection to a given host and port, and use
+%%%   the associated socket.
+%%% - Unless a 'Connection: close' header is provided don't close the socket
+%%%   after a response is given
+%%% - A given Pid, found in the database, might be terminated before the
+%%%   message is sent to the Pid. This will happen e.g., if the connection is
+%%%   closed by the other party and there are no pending requests.
+%%% - The HTTP connection process is spawned, if necessary, in
+%%%   httpc_manager:add_connection/4
+request(Ref,Method,HTTPReqCont) ->
+    request(Ref,Method,HTTPReqCont,[],self()).
+
+request(Ref,Method,HTTPReqCont,Settings) ->
+    request(Ref,Method,HTTPReqCont,Settings,self()).
+
+request(Ref,Method,{{Scheme,Host,Port,PathQuery},
+		    Headers,ContentType,Body},Settings,From) ->
+    case create_settings(Settings,#client_settings{}) of
+	{error,Reason} ->
+	    {error,Reason};
+	CS ->
+	    case create_headers(Headers,#req_headers{}) of
+		{error,Reason} ->
+		    {error,Reason};
+		H ->
+		    Req=#request{ref=Ref,from=From,
+				 scheme=Scheme,address={Host,Port},
+				 pathquery=PathQuery,method=Method,
+				 headers=H,content={ContentType,Body},
+				 settings=CS},
+		    httpc_manager:request(Req)
+	    end
+    end;
+request(Ref,Method,{Url,Headers},Settings,From) ->
+    request(Ref,Method,{Url,Headers,[],[]},Settings,From).
+
+%%% Cancels requests identified with ReqId.
+%%% FIXME! Doesn't work...
+cancel_request(ReqId) ->
+    httpc_manager:cancel_request(ReqId).
+
+%%% Close all sessions currently open to Host:Port
+%%% FIXME! Doesn't work...
+close_session(Host,Port) ->
+    httpc_manager:close_session(Host,Port).
+
+
+%%% Synchronous HTTP request that waits until a response is created
+%%% (e.g. successfull reply or timeout)
+%%% Method                          HTTPReq
+%%% options,get,head,delete,trace = {Url,Headers}
+%%% post,put                      = {Url,Headers,ContentType,Body}
+%%%  where Url is a string() or a {Scheme,Host,Port,PathQuery} tuple
+%%%
+%%% Returns: {Status,Headers,Body} |
+%%%          {error,Reason}
+%%% where Reason is an atom.
+%%% http:format_error(Reason) gives a more informative description.
+request_sync(Method,HTTPReqCont) ->
+    request_sync(Method,HTTPReqCont,[]).
+
+request_sync(Method,{Url,Headers},Settings)
+  when Method==options;Method==get;Method==head;Method==delete;Method==trace ->
+    case uri:parse(Url) of
+	{error,Reason} ->
+	    {error,Reason};
+	ParsedUrl ->
+	    request_sync(Method,{ParsedUrl,Headers,[],[]},Settings,0)
+    end;
+request_sync(Method,{Url,Headers,ContentType,Body},Settings)
+  when Method==post;Method==put ->
+    case uri:parse(Url) of
+	{error,Reason} ->
+	    {error,Reason};
+	ParsedUrl ->
+	    request_sync(Method,{ParsedUrl,Headers,ContentType,Body},Settings,0)
+    end;
+request_sync(Method,Request,Settings) ->
+    {error,bad_request}.
+
+request_sync(Method,HTTPCont,Settings,_Redirects) ->
+    case request(request_sync,Method,HTTPCont,Settings,self()) of
+	{ok,_ReqId} ->
+	    receive
+		{'$gen_cast',{request_sync,_ReqId2,{Status,Headers,Body}}} ->
+		    {Status,pp_headers(Headers),binary_to_list(Body)};
+		{'$gen_cast',{request_sync,_ReqId2,{error,Reason}}} ->
+		    {error,Reason};
+		Error ->
+		    Error
+	    end;
+	Error ->
+	    Error
+    end.
+
+
+create_settings([],Out) ->
+    Out;
+create_settings([{http_timeout,Val}|Settings],Out) ->
+    create_settings(Settings,Out#client_settings{timeout=Val});
+create_settings([{http_useproxy,Val}|Settings],Out) ->
+    create_settings(Settings,Out#client_settings{useproxy=Val});
+create_settings([{http_proxy,Val}|Settings],Out) ->
+    create_settings(Settings,Out#client_settings{proxy=Val});
+create_settings([{http_noproxylist,Val}|Settings],Out) ->
+    create_settings(Settings,Out#client_settings{noproxylist=Val});
+create_settings([{http_autoredirect,Val}|Settings],Out) ->
+    create_settings(Settings,Out#client_settings{autoredirect=Val});
+create_settings([{http_ssl,Val}|Settings],Out) ->
+    create_settings(Settings,Out#client_settings{ssl=Val});
+create_settings([{http_pipelinesize,Val}|Settings],Out)
+  when integer(Val),Val>0 ->
+    create_settings(Settings,Out#client_settings{max_quelength=Val});
+create_settings([{http_sessions,Val}|Settings],Out)
+  when integer(Val),Val>0 ->
+    create_settings(Settings,Out#client_settings{max_sessions=Val});
+create_settings([{Key,_Val}|_Settings],_Out) ->
+    io:format("ERROR bad settings, got ~p~n",[Key]),
+    {error,bad_settings}.
+
+
+create_headers([],Req) ->
+    Req;
+create_headers([{Key,Val}|Rest],Req) ->
+    case httpd_util:to_lower(Key) of
+	"expect" ->
+	    create_headers(Rest,Req#req_headers{expect=Val});
+	OtherKey ->
+	    create_headers(Rest,
+			   Req#req_headers{other=[{OtherKey,Val}|
+						  Req#req_headers.other]})
+    end.
+
+
+pp_headers(#res_headers{connection=Connection,
+			transfer_encoding=Transfer_encoding,
+			retry_after=Retry_after,
+			content_length=Content_length,
+			content_type=Content_type,
+			location=Location,
+			other=Other}) ->
+    H1=case Connection of
+	   undefined -> [];
+	   _ ->	 [{'Connection',Connection}]
+       end,
+    H2=case Transfer_encoding of
+	   undefined -> [];
+	   _ ->	 [{'Transfer-Encoding',Transfer_encoding}]
+       end,
+    H3=case Retry_after of
+	   undefined -> [];
+	   _ ->	 [{'Retry-After',Retry_after}]
+       end,
+    H4=case Location of
+	   undefined -> [];
+	   _ ->	 [{'Location',Location}]
+       end,
+    HCL=case Content_length of
+	   "0" -> [];
+	   _ ->	 [{'Content-Length',Content_length}]
+       end,
+    HCT=case Content_type of
+	   undefined -> [];
+	   _ ->	 [{'Content-Type',Content_type}]
+       end,
+    H1++H2++H3++H4++HCL++HCT++Other.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/http.hrl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/http.hrl
new file mode 100644
index 0000000000..6904a2379f
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/http.hrl
@@ -0,0 +1,127 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Mobile Arts AB
+%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
+%% All Rights Reserved.''
+%%
+%%
+
+-define(HTTP_REQUEST_TIMEOUT,   5000).
+-define(PIPELINE_LENGTH,3).
+-define(OPEN_SESSIONS,400).
+
+
+%%% FIXME! These definitions should probably be possible to defined via
+%%% user settings
+-define(MAX_REDIRECTS, 4).
+
+
+%%% Note that if not persitent the connection can be closed immediately on a
+%%% response, because new requests are not sent to this connection process.
+%%%	  address,     % ({Host,Port}) Destination Host and Port
+-record(session,{
+	  id,          % (int) Session Id identifies session in http_manager
+	  clientclose, % (bool) true if client requested "close" connection
+	  scheme,      % (atom) http (HTTP/TCP) or https (TCP/SSL/TCP)
+	  socket,      % (socket) Open socket, used by connection
+	  pipeline=[], % (list) Sent requests, not yet taken care of by the
+	               %        associated http_responder.
+	  quelength=1, % (int) Current length of pipeline (1 when created)
+	  max_quelength% (int) Max pipeline length
+	 }).
+
+%%%      [{Pid,RequestQue,QueLength},...] list where
+%%%   - RequestQue (implemented with a list) contains sent requests that
+%%%      has not yet received a response (pipelined) AND is not currently
+%%%      handled (awaiting data) by the session process.
+%%%   - QueLength is the length of this que, but
+
+%%% Response headers
+-record(res_headers,{
+%%% --- Standard "General" headers
+% 	  cache_control,
+	  connection,
+% 	  date,
+% 	  pragma,
+% 	  trailer,
+	  transfer_encoding,
+% 	  upgrade,
+% 	  via,
+% 	  warning,
+%%% --- Standard "Request" headers
+% 	  accept_ranges,
+% 	  age,
+% 	  etag,
+	  location,
+% 	  proxy_authenticate,
+	  retry_after,
+% 	  server,
+% 	  vary,
+% 	  www_authenticate,
+%%% --- Standard "Entity" headers
+% 	  allow,
+% 	  content_encoding,
+% 	  content_language,
+	  content_length="0",
+% 	  content_location,
+% 	  content_md5,
+% 	  content_range,
+	  content_type,
+% 	  expires,
+% 	  last_modified,
+	  other=[]        % (list) Key/Value list with other headers
+	 }).
+
+%%% All data associated to a specific HTTP request
+-record(request,{
+	  id,          % (int) Request Id
+	  ref,         % Caller specific
+	  from,        % (pid) Caller
+	  redircount=0,% (int) Number of redirects made for this request
+	  scheme,      % (http|https) (HTTP/TCP) or (TCP/SSL/TCP) connection
+	  address,     % ({Host,Port}) Destination Host and Port
+	  pathquery,   % (string) Rest of parsed URL
+	  method,      % (atom) HTTP request Method
+	  headers,     % (list) Key/Value list with Headers
+	  content,     % ({ContentType,Body}) Current HTTP request
+	  settings     % (#client_settings{}) User defined settings
+	 }).
+
+-record(response,{
+	  scheme,      % (atom) http (HTTP/TCP) or https (TCP/SSL/TCP)
+	  socket,      % (socket) Open socket, used by connection
+	  status,
+	  http_version,
+	  headers=#res_headers{},
+	  body = <<>>
+	 }).
+
+
+
+
+%%% HTTP Client settings
+-record(client_settings,{
+	  timeout=?HTTP_REQUEST_TIMEOUT,
+	                     % (int) Milliseconds before a request times out
+	  useproxy=false,    % (bool) True if the proxy should be used
+	  proxy=undefined,   % (tuple) Parsed Proxy URL
+	  noproxylist=[],    % (list) List with hosts not requiring proxy
+	  autoredirect=true, % (bool) True if automatic redirection on 30X
+			     %        responses.
+	  max_sessions=?OPEN_SESSIONS,% (int) Max open sessions for any Adr,Port
+	  max_quelength=?PIPELINE_LENGTH, % (int) Max pipeline length
+%	  ssl=[{certfile,"/jb/server_root/ssl/ssl_client.pem"},
+%	       {keyfile,"/jb/server_root/ssl/ssl_client.pem"},
+%	       {verify,0}]
+	  ssl=false    % (list) SSL settings. A non-empty list enables SSL/TLS
+                       %  support in the HTTP client
+	 }).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/http_lib.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/http_lib.erl
new file mode 100644
index 0000000000..4f6c43710b
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/http_lib.erl
@@ -0,0 +1,745 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Mobile Arts AB
+%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
+%% All Rights Reserved.''
+%%
+%%
+%%% File    : http_lib.erl
+%%% Author  : Johan Blom <[email protected]>
+%%% Description : Generic, HTTP specific helper functions
+%%% Created :  4 Mar 2002 by Johan Blom
+
+%%% TODO
+%%% - Check if I need to anything special when parsing
+%%%   "Content-Type:multipart/form-data"
+
+-module(http_lib).
+-author("[email protected]").
+
+-include("http.hrl").
+-include("jnets_httpd.hrl").
+
+-export([connection_close/1,
+	 accept/3,deliver/3,recv/4,recv0/3,
+	 connect/1,send/3,close/2,controlling_process/3,setopts/3,
+	 getParameterValue/2,
+%	 get_var/2,
+	 create_request_line/3]).
+
+-export([read_client_headers/2,read_server_headers/2,
+	 get_auth_data/1,create_header_list/1,
+	 read_client_body/2,read_client_multipartrange_body/3,
+	 read_server_body/2]).
+
+
+%%% Server response:
+%%%    Check "Connection" header if server requests session to be closed.
+%%%    No 'close' means returns false
+%%% Client Request:
+%%%    Check if 'close' in request headers
+%%% Only care about HTTP 1.1 clients!
+connection_close(Headers) when record(Headers,req_headers) ->
+    case Headers#req_headers.connection of
+	"close" ->
+	    true;
+	"keep-alive" ->
+	    false;
+	Value when list(Value) ->
+	    true;
+	_ ->
+	    false
+    end;
+connection_close(Headers) when record(Headers,res_headers) ->
+    case Headers#res_headers.connection of
+	"close" ->
+	    true;
+	"keep-alive" ->
+	    false;
+	Value when list(Value) ->
+	    true;
+	_ ->
+	    false
+    end.
+
+
+%% =============================================================================
+%%% Debugging:
+
+% format_time(TS) ->
+%     {_,_,MicroSecs}=TS,
+%     {{Y,Mon,D},{H,M,S}}=calendar:now_to_universal_time(TS),
+%     lists:flatten(io_lib:format("~4.4.0w-~2.2.0w-~2.2.0w,~2.2.0w:~2.2.0w:~6.3.0f",
+% 				[Y,Mon,D,H,M,S+(MicroSecs/1000000)])).
+
+%% Time in milli seconds
+% t() ->
+%     {A,B,C} = erlang:now(),
+%     A*1000000000+B*1000+(C div 1000).
+
+% sz(L) when list(L) ->
+%     length(L);
+% sz(B) when binary(B) ->
+%     size(B);
+% sz(O) ->
+%     {unknown_size,O}.
+
+
+%% =============================================================================
+
+getHeaderValue(_Attr,[]) ->
+    [];
+getHeaderValue(Attr,[{Attr,Value}|_Rest]) ->
+    Value;
+getHeaderValue(Attr,[_|Rest]) ->
+    getHeaderValue(Attr,Rest).
+
+getParameterValue(_Attr,undefined) ->
+    undefined;
+getParameterValue(Attr,List) ->
+    case lists:keysearch(Attr,1,List) of
+	{value,{Attr,Val}} ->
+	    Val;
+	_ ->
+	    undefined
+    end.
+
+create_request_line(Method,Path,{Major,Minor}) ->
+    [atom_to_list(Method)," ",Path,
+     " HTTP/",integer_to_list(Major),".",integer_to_list(Minor)];
+create_request_line(Method,Path,Minor) ->
+    [atom_to_list(Method)," ",Path," HTTP/1.",integer_to_list(Minor)].
+
+
+%%% ============================================================================
+read_client_headers(Info,Timeout) ->
+    Headers=read_response_h(Info#response.scheme,Info#response.socket,Timeout,
+			    Info#response.headers),
+    Info#response{headers=Headers}.
+
+read_server_headers(Info,Timeout) ->
+    Headers=read_request_h(Info#mod.socket_type,Info#mod.socket,Timeout,
+			   Info#mod.headers),
+    Info#mod{headers=Headers}.
+
+
+%% Parses the header of a HTTP request and returns a key,value tuple
+%% list containing Name and Value of each header directive as of:
+%%
+%% Content-Type: multipart/mixed -> {"Content-Type", "multipart/mixed"}
+%%
+%% But in http/1.1 the field-names are case insencitive so now it must be
+%% Content-Type: multipart/mixed -> {"content-type", "multipart/mixed"}
+%% The standard furthermore says that leading and traling white space
+%% is not a part of the fieldvalue and shall therefore be removed.
+read_request_h(SType,S,Timeout,H) ->
+    case recv0(SType,S,Timeout) of
+	{ok,{http_header,_,'Connection',_,Value}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{connection=Value});
+	{ok,{http_header,_,'Content-Type',_,Val}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{content_type=Val});
+	{ok,{http_header,_,'Host',_,Value}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{host=Value});
+	{ok,{http_header,_,'Content-Length',_,Value}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{content_length=Value});
+%	{ok,{http_header,_,'Expect',_,Value}} -> % FIXME! Update inet_drv.c!!
+%	    read_request_h(SType,S,Timeout,H#req_headers{expect=Value});
+	{ok,{http_header,_,'Transfer-Encoding',_,V}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{transfer_encoding=V});
+	{ok,{http_header,_,'Authorization',_,Value}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{authorization=Value});
+	{ok,{http_header,_,'User-Agent',_,Value}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{user_agent=Value});
+	{ok,{http_header,_,'Range',_,Value}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{range=Value});
+	{ok,{http_header,_,'If-Range',_,Value}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{if_range=Value});
+	{ok,{http_header,_,'If-Match',_,Value}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{if_match=Value});
+	{ok,{http_header,_,'If-None-Match',_,Value}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{if_none_match=Value});
+	{ok,{http_header,_,'If-Modified-Since',_,V}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{if_modified_since=V});
+	{ok,{http_header,_,'If-Unmodified-Since',_,V}} ->
+	    read_request_h(SType,S,Timeout,H#req_headers{if_unmodified_since=V});
+	{ok,{http_header,_,K,_,V}} ->
+	    read_request_h(SType,S,Timeout,
+			   H#req_headers{other=H#req_headers.other++[{K,V}]});
+	{ok,http_eoh} ->
+	    H;
+	{error, timeout} when SType==http ->
+	    throw({error, session_local_timeout});
+	{error, etimedout} when SType==https ->
+	    throw({error, session_local_timeout});
+	{error, Reason} when Reason==closed;Reason==enotconn ->
+	    throw({error, session_remotely_closed});
+	{error, Reason} ->
+	    throw({error,Reason})
+    end.
+
+
+read_response_h(SType,S,Timeout,H) ->
+    case recv0(SType,S,Timeout) of
+	{ok,{http_header,_,'Connection',_,Val}} ->
+	    read_response_h(SType,S,Timeout,H#res_headers{connection=Val});
+	{ok,{http_header,_,'Content-Length',_,Val}} ->
+	    read_response_h(SType,S,Timeout,H#res_headers{content_length=Val});
+	{ok,{http_header,_,'Content-Type',_,Val}} ->
+	    read_response_h(SType,S,Timeout,H#res_headers{content_type=Val});
+	{ok,{http_header,_,'Transfer-Encoding',_,V}} ->
+	    read_response_h(SType,S,Timeout,H#res_headers{transfer_encoding=V});
+	{ok,{http_header,_,'Location',_,V}} ->
+	    read_response_h(SType,S,Timeout,H#res_headers{location=V});
+	{ok,{http_header,_,'Retry-After',_,V}} ->
+	    read_response_h(SType,S,Timeout,H#res_headers{retry_after=V});
+	{ok,{http_header,_,K,_,V}} ->
+	    read_response_h(SType,S,Timeout,
+			    H#res_headers{other=H#res_headers.other++[{K,V}]});
+	{ok,http_eoh} ->
+	    H;
+	{error, timeout} when SType==http ->
+	    throw({error, session_local_timeout});
+	{error, etimedout} when SType==https ->
+	    throw({error, session_local_timeout});
+	{error, Reason} when Reason==closed;Reason==enotconn ->
+	    throw({error, session_remotely_closed});
+	{error, Reason} ->
+	    throw({error,Reason})
+    end.
+
+
+%%% Got the headers, and maybe a part of the body, now read in the rest
+%%% Note:
+%%% - No need to check for Expect header if client
+%%% - Currently no support for setting MaxHeaderSize in client, set to
+%%%   unlimited.
+%%% - Move to raw packet mode as we are finished with HTTP parsing
+read_client_body(Info,Timeout) ->
+    Headers=Info#response.headers,
+    case Headers#res_headers.transfer_encoding of
+	"chunked" ->
+	    ?DEBUG("read_entity_body2()->"
+		"Transfer-encoding:Chunked Data:",[]),
+	    read_client_chunked_body(Info,Timeout,?MAXBODYSIZE);
+	Encoding when list(Encoding) ->
+	    ?DEBUG("read_entity_body2()->"
+		"Transfer-encoding:Unknown",[]),
+	    throw({error,unknown_coding});
+	_ ->
+	    ContLen=list_to_integer(Headers#res_headers.content_length),
+	    if
+		ContLen>?MAXBODYSIZE ->
+		    throw({error,body_too_big});
+		true ->
+		    ?DEBUG("read_entity_body2()->"
+			"Transfer-encoding:none ",[]),
+		    Info#response{body=read_plain_body(Info#response.scheme,
+						       Info#response.socket,
+						       ContLen,
+						       Info#response.body,
+						       Timeout)}
+	    end
+    end.
+
+
+%%% ----------------------------------------------------------------------
+read_server_body(Info,Timeout) ->
+    MaxBodySz=httpd_util:lookup(Info#mod.config_db,max_body_size,?MAXBODYSIZE),
+    ContLen=list_to_integer((Info#mod.headers)#req_headers.content_length),
+    %% ?vtrace("ContentLength: ~p", [ContLen]),
+    if
+	integer(ContLen),integer(MaxBodySz),ContLen>MaxBodySz ->
+	    throw({error,body_too_big});
+	true ->
+	    read_server_body2(Info,Timeout,ContLen,MaxBodySz)
+    end.
+
+
+%%----------------------------------------------------------------------
+%% Control if the body is transfer encoded, if so decode it.
+%% Note:
+%% - MaxBodySz has an integer value or 'nolimit'
+%% - ContLen has an integer value or 'undefined'
+%% All applications MUST be able to receive and decode the "chunked"
+%% transfer-coding, see RFC 2616 Section 3.6.1
+read_server_body2(Info,Timeout,ContLen,MaxBodySz) ->
+    ?DEBUG("read_entity_body2()->Max: ~p ~nLength:~p ~nSocket: ~p ~n",
+	[MaxBodySz,ContLen,Info#mod.socket]),
+    case (Info#mod.headers)#req_headers.transfer_encoding of
+	"chunked" ->
+	    ?DEBUG("read_entity_body2()->"
+		"Transfer-encoding:Chunked Data:",[]),
+	    read_server_chunked_body(Info,Timeout,MaxBodySz);
+	Encoding when list(Encoding) ->
+	    ?DEBUG("read_entity_body2()->"
+		"Transfer-encoding:Unknown",[]),
+	    httpd_response:send_status(Info,501,"Unknown Transfer-Encoding"),
+	    http_lib:close(Info#mod.socket_type,Info#mod.socket),
+	    throw({error,{status_sent,"Unknown Transfer-Encoding "++Encoding}});
+	_ when integer(ContLen),integer(MaxBodySz),ContLen>MaxBodySz ->
+	    throw({error,body_too_big});
+	_ when integer(ContLen) ->
+	    ?DEBUG("read_entity_body2()->"
+		"Transfer-encoding:none ",[]),
+	    Info#mod{entity_body=read_plain_body(Info#mod.socket_type,
+						 Info#mod.socket,
+						 ContLen,Info#mod.entity_body,
+						 Timeout)}
+    end.
+
+
+%%% ----------------------------------------------------------------------------
+%%% The body was plain, just read it from the socket.
+read_plain_body(_SocketType,Socket,0,Cont,_Timeout) ->
+    Cont;
+read_plain_body(SocketType,Socket,ContLen,Cont,Timeout) ->
+    Body=read_more_data(SocketType,Socket,ContLen,Timeout),
+    <<Cont/binary,Body/binary>>.
+
+%%% ----------------------------------------------------------------------------
+%%% The body was chunked, decode it.
+%%% From RFC2616, Section 3.6.1
+%%        Chunked-Body   = *chunk
+%%                         last-chunk
+%%                         trailer
+%%                         CRLF
+%%
+%%        chunk          = chunk-size [ chunk-extension ] CRLF
+%%                         chunk-data CRLF
+%%        chunk-size     = 1*HEX
+%%        last-chunk     = 1*("0") [ chunk-extension ] CRLF
+%%
+%%        chunk-extension= *( ";" chunk-ext-name [ "=" chunk-ext-val ] )
+%%        chunk-ext-name = token
+%%        chunk-ext-val  = token | quoted-string
+%%        chunk-data     = chunk-size(OCTET)
+%%        trailer        = *(entity-header CRLF)
+%%
+%%% "All applications MUST ignore chunk-extension extensions they do not
+%%% understand.", see RFC 2616 Section 3.6.1
+%%% We don't understand any extension...
+read_client_chunked_body(Info,Timeout,MaxChunkSz) ->
+    case read_chunk(Info#response.scheme,Info#response.socket,
+		    Timeout,0,MaxChunkSz) of
+	{last_chunk,_ExtensionList} -> % Ignore extension
+	    TrailH=read_headers_old(Info#response.scheme,Info#response.socket,
+				    Timeout),
+	    H=Info#response.headers,
+	    OtherHeaders=H#res_headers.other++TrailH,
+	    Info#response{headers=H#res_headers{other=OtherHeaders}};
+	{Chunk,ChunkSize,_ExtensionList} -> % Ignore extension
+	    Info1=Info#response{body= <<(Info#response.body)/binary,
+				        Chunk/binary>>},
+	    read_client_chunked_body(Info1,Timeout,MaxChunkSz-ChunkSize);
+	{error,Reason} ->
+	    throw({error,Reason})
+    end.
+
+
+read_server_chunked_body(Info,Timeout,MaxChunkSz) ->
+    case read_chunk(Info#mod.socket_type,Info#mod.socket,
+		    Timeout,0,MaxChunkSz) of
+	{last_chunk,_ExtensionList} -> % Ignore extension
+	    TrailH=read_headers_old(Info#mod.socket_type,Info#mod.socket,
+				    Timeout),
+	    H=Info#mod.headers,
+	    OtherHeaders=H#req_headers.other++TrailH,
+	    Info#mod{headers=H#req_headers{other=OtherHeaders}};
+	{Chunk,ChunkSize,_ExtensionList} -> % Ignore extension
+	    Info1=Info#mod{entity_body= <<(Info#mod.entity_body)/binary,
+					   Chunk/binary>>},
+	    read_server_chunked_body(Info1,Timeout,MaxChunkSz-ChunkSize);
+	{error,Reason} ->
+	    throw({error,Reason})
+    end.
+
+
+read_chunk(Scheme,Socket,Timeout,Int,MaxChunkSz) when MaxChunkSz>Int ->
+    case read_more_data(Scheme,Socket,1,Timeout) of
+	<<C>> when $0=<C,C=<$9 ->
+	    read_chunk(Scheme,Socket,Timeout,16*Int+(C-$0),MaxChunkSz);
+	<<C>> when $a=<C,C=<$f ->
+	    read_chunk(Scheme,Socket,Timeout,16*Int+10+(C-$a),MaxChunkSz);
+	<<C>> when $A=<C,C=<$F ->
+	    read_chunk(Scheme,Socket,Timeout,16*Int+10+(C-$A),MaxChunkSz);
+	<<$;>> when Int>0 ->
+	    ExtensionList=read_chunk_ext_name(Scheme,Socket,Timeout,[],[]),
+	    read_chunk_data(Scheme,Socket,Int+1,ExtensionList,Timeout);
+	<<$;>> when Int==0 ->
+	    ExtensionList=read_chunk_ext_name(Scheme,Socket,Timeout,[],[]),
+	    read_data_lf(Scheme,Socket,Timeout),
+	    {last_chunk,ExtensionList};
+	<<?CR>> when Int>0 ->
+	    read_chunk_data(Scheme,Socket,Int+1,[],Timeout);
+	<<?CR>> when Int==0 ->
+	    read_data_lf(Scheme,Socket,Timeout),
+	    {last_chunk,[]};
+	<<C>> when C==$ -> % Some servers (e.g., Apache 1.3.6) throw in
+			   % additional whitespace...
+	    read_chunk(Scheme,Socket,Timeout,Int,MaxChunkSz);
+	_Other ->
+	    {error,unexpected_chunkdata}
+    end;
+read_chunk(_Scheme,_Socket,_Timeout,_Int,_MaxChunkSz) ->
+    {error,body_too_big}.
+
+
+%%% Note:
+%%% - Got the initial ?CR already!
+%%% - Bitsyntax does not allow matching of ?CR,?LF in the end of the first read
+read_chunk_data(Scheme,Socket,Int,ExtensionList,Timeout) ->
+    case read_more_data(Scheme,Socket,Int,Timeout) of
+	<<?LF,Chunk/binary>> ->
+	    case read_more_data(Scheme,Socket,2,Timeout) of
+		<<?CR,?LF>> ->
+		    {Chunk,size(Chunk),ExtensionList};
+		_ ->
+		    {error,bad_chunkdata}
+	    end;
+	_ ->
+	    {error,bad_chunkdata}
+    end.
+
+read_chunk_ext_name(Scheme,Socket,Timeout,Name,Acc) ->
+    Len=length(Name),
+    case read_more_data(Scheme,Socket,1,Timeout) of
+	$= when Len>0 ->
+	    read_chunk_ext_val(Scheme,Socket,Timeout,Name,[],Acc);
+	$; when Len>0 ->
+	    read_chunk_ext_name(Scheme,Socket,Timeout,[],
+				[{lists:reverse(Name),""}|Acc]);
+	?CR when Len>0 ->
+	    lists:reverse([{lists:reverse(Name,"")}|Acc]);
+	Token -> % FIXME Check that it is "token"
+	    read_chunk_ext_name(Scheme,Socket,Timeout,[Token|Name],Acc);
+	_ ->
+	    {error,bad_chunk_extension_name}
+    end.
+
+read_chunk_ext_val(Scheme,Socket,Timeout,Name,Val,Acc) ->
+    Len=length(Val),
+    case read_more_data(Scheme,Socket,1,Timeout) of
+	$; when Len>0 ->
+	    read_chunk_ext_name(Scheme,Socket,Timeout,[],
+				[{Name,lists:reverse(Val)}|Acc]);
+	?CR when Len>0 ->
+	    lists:reverse([{Name,lists:reverse(Val)}|Acc]);
+	Token -> % FIXME Check that it is "token" or "quoted-string"
+	    read_chunk_ext_val(Scheme,Socket,Timeout,Name,[Token|Val],Acc);
+	_ ->
+	    {error,bad_chunk_extension_value}
+    end.
+
+read_data_lf(Scheme,Socket,Timeout) ->
+    case read_more_data(Scheme,Socket,1,Timeout) of
+	?LF ->
+	    ok;
+	_ ->
+	    {error,bad_chunkdata}
+    end.
+
+%%% ----------------------------------------------------------------------------
+%%% The body was "multipart/byteranges", decode it.
+%%% Example from RFC 2616, Appendix 19.2
+%%%    HTTP/1.1 206 Partial Content
+%%%    Date: Wed, 15 Nov 1995 06:25:24 GMT
+%%%    Last-Modified: Wed, 15 Nov 1995 04:58:08 GMT
+%%%    Content-type: multipart/byteranges; boundary=THIS_STRING_SEPARATES
+%%%
+%%%    --THIS_STRING_SEPARATES
+%%%    Content-type: application/pdf
+%%%    Content-range: bytes 500-999/8000
+%%%
+%%%    ...the first range...
+%%%    --THIS_STRING_SEPARATES
+%%%    Content-type: application/pdf
+%%%    Content-range: bytes 7000-7999/8000
+%%%
+%%%    ...the second range
+%%%    --THIS_STRING_SEPARATES--
+%%%
+%%%       Notes:
+%%%
+%%%       1) Additional CRLFs may precede the first boundary string in the
+%%%          entity.
+%%% FIXME!!
+read_client_multipartrange_body(Info,Parstr,Timeout) ->
+    Boundary=get_boundary(Parstr),
+    scan_boundary(Info,Boundary),
+    Info#response{body=read_multipart_body(Info,Boundary,Timeout)}.
+
+read_multipart_body(Info,Boundary,Timeout) ->
+    Info.
+
+%     Headers=read_headers_old(Info#response.scheme,Info#response.socket,Timeout),
+%     H=Info#response.headers,
+%     OtherHeaders=H#res_headers.other++TrailH,
+%     Info#response{headers=H#res_headers{other=OtherHeaders}}.
+
+
+scan_boundary(Info,Boundary) ->
+    Info.
+
+
+get_boundary(Parstr) ->
+    case skip_lwsp(Parstr) of
+	[] ->
+	    throw({error,missing_range_boundary_parameter});
+	Val ->
+	    get_boundary2(string:tokens(Val, ";"))
+    end.
+
+get_boundary2([]) ->
+    undefined;
+get_boundary2([Param|Rest]) ->
+    case string:tokens(skip_lwsp(Param), "=") of
+	["boundary"++Attribute,Value] ->
+	    Value;
+	_ ->
+	    get_boundary2(Rest)
+    end.
+
+
+%% skip space & tab
+skip_lwsp([$ | Cs]) -> skip_lwsp(Cs);
+skip_lwsp([$\t | Cs]) -> skip_lwsp(Cs);
+skip_lwsp(Cs) -> Cs.
+
+%%% ----------------------------------------------------------------------------
+
+%%% Read the incoming data from the open socket.
+read_more_data(http,Socket,Len,Timeout) ->
+    case gen_tcp:recv(Socket,Len,Timeout) of
+	{ok,Val} ->
+	    Val;
+	{error, timeout} ->
+	    throw({error, session_local_timeout});
+	{error, Reason} when Reason==closed;Reason==enotconn ->
+	    throw({error, session_remotely_closed});
+	{error, Reason} ->
+%	    httpd_response:send_status(Info,400,none),
+	    throw({error, Reason})
+    end;
+read_more_data(https,Socket,Len,Timeout) ->
+    case ssl:recv(Socket,Len,Timeout) of
+	{ok,Val} ->
+	    Val;
+	{error, etimedout} ->
+	    throw({error, session_local_timeout});
+	{error, Reason} when Reason==closed;Reason==enotconn ->
+	    throw({error, session_remotely_closed});
+	{error, Reason} ->
+%	    httpd_response:send_status(Info,400,none),
+	    throw({error, Reason})
+    end.
+
+
+%% =============================================================================
+%%% Socket handling
+
+accept(http,ListenSocket, Timeout) ->
+    gen_tcp:accept(ListenSocket, Timeout);
+accept(https,ListenSocket, Timeout) ->
+    ssl:accept(ListenSocket, Timeout).
+
+
+close(http,Socket) ->
+    gen_tcp:close(Socket);
+close(https,Socket) ->
+    ssl:close(Socket).
+
+
+connect(#request{scheme=http,settings=Settings,address=Addr}) ->
+    case proxyusage(Addr,Settings) of
+	{error,Reason} ->
+	    {error,Reason};
+	{Host,Port} ->
+	    Opts=[binary,{active,false},{reuseaddr,true}],
+	    gen_tcp:connect(Host,Port,Opts)
+    end;
+connect(#request{scheme=https,settings=Settings,address=Addr}) ->
+    case proxyusage(Addr,Settings) of
+	{error,Reason} ->
+	    {error,Reason};
+	{Host,Port} ->
+	    Opts=case Settings#client_settings.ssl of
+		     false ->
+			 [binary,{active,false}];
+		     SSLSettings ->
+			 [binary,{active,false}]++SSLSettings
+		 end,
+	    ssl:connect(Host,Port,Opts)
+    end.
+
+
+%%% Check to see if the given {Host,Port} tuple is in the NoProxyList
+%%% Returns an eventually updated {Host,Port} tuple, with the proxy address
+proxyusage(HostPort,Settings) ->
+    case Settings#client_settings.useproxy of
+	true ->
+	    case noProxy(HostPort,Settings#client_settings.noproxylist) of
+		true ->
+		    HostPort;
+		_ ->
+		    case Settings#client_settings.proxy of
+			undefined ->
+			    {error,no_proxy_defined};
+			ProxyHostPort ->
+			    ProxyHostPort
+		    end
+	    end;
+	_ ->
+	    HostPort
+    end.
+
+noProxy(_HostPort,[]) ->
+    false;
+noProxy({Host,Port},[{Host,Port}|Rest]) ->
+    true;
+noProxy(HostPort,[_|Rest]) ->
+    noProxy(HostPort,Rest).
+
+
+controlling_process(http,Socket,Pid) ->
+    gen_tcp:controlling_process(Socket,Pid);
+controlling_process(https,Socket,Pid) ->
+    ssl:controlling_process(Socket,Pid).
+
+
+deliver(SocketType, Socket, Message)  ->
+    case send(SocketType, Socket, Message) of
+	{error, einval} ->
+	    close(SocketType, Socket),
+	    socket_closed;
+	{error, _Reason} ->
+%	    ?vlog("deliver(~p) failed for reason:"
+%		  "~n   Reason: ~p",[SocketType,_Reason]),
+	    close(SocketType, Socket),
+	    socket_closed;
+	_Other ->
+	    ok
+    end.
+
+
+recv0(http,Socket,Timeout) ->
+    gen_tcp:recv(Socket,0,Timeout);
+recv0(https,Socket,Timeout) ->
+    ssl:recv(Socket,0,Timeout).
+
+recv(http,Socket,Len,Timeout) ->
+    gen_tcp:recv(Socket,Len,Timeout);
+recv(https,Socket,Len,Timeout) ->
+    ssl:recv(Socket,Len,Timeout).
+
+
+setopts(http,Socket,Options) ->
+    inet:setopts(Socket,Options);
+setopts(https,Socket,Options) ->
+    ssl:setopts(Socket,Options).
+
+
+send(http,Socket,Message) ->
+    gen_tcp:send(Socket,Message);
+send(https,Socket,Message) ->
+    ssl:send(Socket,Message).
+
+
+%%% ============================================================================
+%%% HTTP Server only
+
+%%% Returns the Authenticating data in the HTTP request
+get_auth_data("Basic "++EncodedString) ->
+    UnCodedString=httpd_util:decode_base64(EncodedString),
+    case catch string:tokens(UnCodedString,":") of
+	[User,PassWord] ->
+	    {User,PassWord};
+	{error,Error}->
+	    {error,Error}
+    end;
+get_auth_data(BadCredentials) when list(BadCredentials) ->
+    {error,BadCredentials};
+get_auth_data(_) ->
+    {error,nouser}.
+
+
+create_header_list(H) ->
+    lookup(connection,H#req_headers.connection)++
+	lookup(host,H#req_headers.host)++
+	lookup(content_length,H#req_headers.content_length)++
+	lookup(transfer_encoding,H#req_headers.transfer_encoding)++
+	lookup(authorization,H#req_headers.authorization)++
+	lookup(user_agent,H#req_headers.user_agent)++
+	lookup(user_agent,H#req_headers.range)++
+	lookup(user_agent,H#req_headers.if_range)++
+	lookup(user_agent,H#req_headers.if_match)++
+	lookup(user_agent,H#req_headers.if_none_match)++
+	lookup(user_agent,H#req_headers.if_modified_since)++
+	lookup(user_agent,H#req_headers.if_unmodified_since)++
+	H#req_headers.other.
+
+lookup(_Key,undefined) ->
+    [];
+lookup(Key,Val) ->
+    [{Key,Val}].
+
+
+
+%%% ============================================================================
+%%% This code is for parsing trailer headers in chunked messages.
+%%% Will be deprecated whenever I have found an alternative working solution!
+%%% Note:
+%%% - The header names are returned slighly different from what the what
+%%%   inet_drv returns
+read_headers_old(Scheme,Socket,Timeout) ->
+    read_headers_old(<<>>,Scheme,Socket,Timeout,[],[]).
+
+read_headers_old(<<>>,Scheme,Socket,Timeout,Acc,AccHdrs) ->
+    read_headers_old(read_more_data(Scheme,Socket,1,Timeout),
+		     Scheme,Socket,Timeout,Acc,AccHdrs);
+read_headers_old(<<$\r>>,Scheme,Socket,Timeout,Acc,AccHdrs) ->
+    read_headers_old(<<$\r,(read_more_data(Scheme,Socket,1,Timeout))/binary>>,
+		     Scheme,Socket,Timeout,Acc,AccHdrs);
+read_headers_old(<<$\r,$\n>>,Scheme,Socket,Timeout,Acc,AccHdrs) ->
+    if
+	Acc==[] -> % Done!
+            tagup_header(lists:reverse(AccHdrs));
+        true ->
+            read_headers_old(read_more_data(Scheme,Socket,1,Timeout),
+			     Scheme,Socket,
+			     Timeout,[],[lists:reverse(Acc)|AccHdrs])
+    end;
+read_headers_old(<<C>>,Scheme,Socket,Timeout,Acc,AccHdrs) ->
+    read_headers_old(read_more_data(Scheme,Socket,1,Timeout),
+		     Scheme,Socket,Timeout,[C|Acc],AccHdrs);
+read_headers_old(Bin,_Scheme,_Socket,_Timeout,_Acc,_AccHdrs) ->
+    io:format("ERROR: Unexpected data from inet driver: ~p",[Bin]),
+    throw({error,this_is_a_bug}).
+
+
+%% Parses the header of a HTTP request and returns a key,value tuple
+%% list containing Name and Value of each header directive as of:
+%%
+%% Content-Type: multipart/mixed -> {"Content-Type", "multipart/mixed"}
+%%
+%% But in http/1.1 the field-names are case insencitive so now it must be
+%% Content-Type: multipart/mixed -> {"content-type", "multipart/mixed"}
+%% The standard furthermore says that leading and traling white space
+%% is not a part of the fieldvalue and shall therefore be removed.
+tagup_header([]) ->          [];
+tagup_header([Line|Rest]) -> [tag(Line, [])|tagup_header(Rest)].
+
+tag([], Tag) ->
+    {httpd_util:to_lower(lists:reverse(Tag)), ""};
+tag([$:|Rest], Tag) ->
+    {httpd_util:to_lower(lists:reverse(Tag)), httpd_util:strip(Rest)};
+tag([Chr|Rest], Tag) ->
+    tag(Rest, [Chr|Tag]).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpc_handler.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpc_handler.erl
new file mode 100644
index 0000000000..8e5e1c709a
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpc_handler.erl
@@ -0,0 +1,724 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Mobile Arts AB
+%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
+%% All Rights Reserved.''
+%%
+%%
+
+%%% TODO:
+%%% - If an error is returned when sending a request, don't use this
+%%%   session anymore.
+%%% - Closing of sessions not properly implemented for some cases
+
+%%% File    : httpc_handler.erl
+%%% Author  : Johan Blom <[email protected]>
+%%% Description : Handles HTTP client responses, for a single TCP session
+%%% Created :  4 Mar 2002 by Johan Blom
+
+-module(httpc_handler).
+
+-include("http.hrl").
+-include("jnets_httpd.hrl").
+
+-export([init_connection/2,http_request/2]).
+
+%%% ==========================================================================
+%%% "Main" function in the spawned process for the session.
+init_connection(Req,Session) when record(Req,request) ->
+    case catch http_lib:connect(Req) of
+	{ok,Socket} ->
+	    case catch http_request(Req,Socket) of
+		ok ->
+		    case Session#session.clientclose of
+			true ->
+			    ok;
+			false ->
+			    httpc_manager:register_socket(Req#request.address,
+							  Session#session.id,
+							  Socket)
+		    end,
+		    next_response_with_request(Req,
+					       Session#session{socket=Socket});
+		{error,Reason} -> % Not possible to use new session
+		    gen_server:cast(Req#request.from,
+				    {Req#request.ref,Req#request.id,{error,Reason}}),
+		    exit_session_ok(Req#request.address,
+				    Session#session{socket=Socket})
+	    end;
+	{error,Reason} -> % Not possible to set up new session
+	    gen_server:cast(Req#request.from,
+			    {Req#request.ref,Req#request.id,{error,Reason}}),
+	    exit_session_ok2(Req#request.address,
+			     Session#session.clientclose,Session#session.id)
+    end.
+
+next_response_with_request(Req,Session) ->
+    Timeout=(Req#request.settings)#client_settings.timeout,
+    case catch read(Timeout,Session#session.scheme,Session#session.socket) of
+	{Status,Headers,Body} ->
+	    NewReq=handle_response({Status,Headers,Body},Timeout,Req,Session),
+	    next_response_with_request(NewReq,Session);
+	{error,Reason} ->
+	    gen_server:cast(Req#request.from,
+			    {Req#request.ref,Req#request.id,{error,Reason}}),
+	    exit_session(Req#request.address,Session,aborted_request);
+	{'EXIT',Reason} ->
+	    gen_server:cast(Req#request.from,
+			    {Req#request.ref,Req#request.id,{error,Reason}}),
+	    exit_session(Req#request.address,Session,aborted_request)
+    end.
+
+handle_response(Response,Timeout,Req,Session) ->
+    case http_response(Response,Req,Session) of
+	ok ->
+	    next_response(Timeout,Req#request.address,Session);
+	stop ->
+	    exit(normal);
+	{error,Reason} ->
+	    gen_server:cast(Req#request.from,
+			    {Req#request.ref,Req#request.id,{error,Reason}}),
+	    exit_session(Req#request.address,Session,aborted_request)
+    end.
+
+
+
+%%% Wait for the next respond until
+%%% - session is closed by the other side
+%%%      => set up a new a session, if there are pending requests in the que
+%%% - "Connection:close" header is received
+%%%      => close the connection (release socket) then
+%%%         set up a new a session, if there are pending requests in the que
+%%%
+%%% Note:
+%%% - When invoked there are no pending responses on received requests.
+%%% - Never close the session explicitly, let it timeout instead!
+next_response(Timeout,Address,Session) ->
+    case httpc_manager:next_request(Address,Session#session.id) of
+	no_more_requests ->
+	    %% There are no more pending responses, now just wait for
+	    %% timeout or a new response.
+	    case catch read(Timeout,
+			    Session#session.scheme,Session#session.socket) of
+		{error,Reason} when Reason==session_remotely_closed;
+				    Reason==session_local_timeout ->
+		    exit_session_ok(Address,Session);
+		{error,Reason} ->
+		    exit_session(Address,Session,aborted_request);
+		{'EXIT',Reason} ->
+		    exit_session(Address,Session,aborted_request);
+		{Status2,Headers2,Body2} ->
+		    case httpc_manager:next_request(Address,
+						    Session#session.id) of
+			no_more_requests -> % Should not happen!
+			    exit_session(Address,Session,aborted_request);
+			{error,Reason} -> % Should not happen!
+			    exit_session(Address,Session,aborted_request);
+			NewReq ->
+			    handle_response({Status2,Headers2,Body2},
+					    Timeout,NewReq,Session)
+		    end
+	    end;
+	{error,Reason} -> % The connection has been closed by httpc_manager
+	    exit_session(Address,Session,aborted_request);
+	NewReq ->
+	    NewReq
+    end.
+
+%% ===========================================================================
+%% Internals
+
+%%% Read in and parse response data from the socket
+read(Timeout,SockType,Socket) ->
+    Info=#response{scheme=SockType,socket=Socket},
+    http_lib:setopts(SockType,Socket,[{packet, http}]),
+    Info1=read_response(SockType,Socket,Info,Timeout),
+    http_lib:setopts(SockType,Socket,[binary,{packet, raw}]),
+    case (Info1#response.headers)#res_headers.content_type of
+	"multipart/byteranges"++Param ->
+	    range_response_body(Info1,Timeout,Param);
+	_ ->
+	    #response{status=Status2,headers=Headers2,body=Body2}=
+		http_lib:read_client_body(Info1,Timeout),
+	    {Status2,Headers2,Body2}
+    end.
+
+
+%%% From RFC 2616:
+%%%      Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF
+%%%      HTTP-Version   = "HTTP" "/" 1*DIGIT "." 1*DIGIT
+%%%      Status-Code    = 3DIGIT
+%%%      Reason-Phrase  = *<TEXT, excluding CR, LF>
+read_response(SockType,Socket,Info,Timeout) ->
+    case http_lib:recv0(SockType,Socket,Timeout) of
+	{ok,{http_response,{1,VerMin}, Status, _Phrase}} when VerMin==0;
+							      VerMin==1 ->
+	    Info1=Info#response{status=Status,http_version=VerMin},
+	    http_lib:read_client_headers(Info1,Timeout);
+	{ok,{http_response,_Version, _Status, _Phrase}} ->
+	    throw({error,bad_status_line});
+	{error, timeout} ->
+	    throw({error,session_local_timeout});
+	{error, Reason} when Reason==closed;Reason==enotconn ->
+	    throw({error,session_remotely_closed});
+	{error, Reason} ->
+	    throw({error,Reason})
+    end.
+
+%%% From RFC 2616, Section 4.4, Page 34
+%% 4.If the message uses the media type "multipart/byteranges", and the
+%%   transfer-length is not otherwise specified, then this self-
+%%   delimiting media type defines the transfer-length. This media type
+%%   MUST NOT be used unless the sender knows that the recipient can parse
+%%   it; the presence in a request of a Range header with multiple byte-
+%%   range specifiers from a 1.1 client implies that the client can parse
+%%   multipart/byteranges responses.
+%%% FIXME !!
+range_response_body(Info,Timeout,Param) ->
+    Headers=Info#response.headers,
+    case {Headers#res_headers.content_length,
+	  Headers#res_headers.transfer_encoding} of
+	{undefined,undefined} ->
+	    #response{status=Status2,headers=Headers2,body=Body2}=
+		http_lib:read_client_multipartrange_body(Info,Param,Timeout),
+	    {Status2,Headers2,Body2};
+	_ ->
+	    #response{status=Status2,headers=Headers2,body=Body2}=
+		http_lib:read_client_body(Info,Timeout),
+	    {Status2,Headers2,Body2}
+    end.
+
+
+%%% ----------------------------------------------------------------------------
+%%% Host: field is required when addressing multi-homed sites ...
+%%% It must not be present when the request is being made to a proxy.
+http_request(#request{method=Method,id=Id,
+		      scheme=Scheme,address={Host,Port},pathquery=PathQuery,
+		      headers=Headers, content={ContentType,Body},
+		      settings=Settings},
+	     Socket) ->
+    PostData=
+	if
+	    Method==post;Method==put ->
+		case Headers#req_headers.expect of
+		    "100-continue" ->
+			content_type_header(ContentType) ++
+			    content_length_header(length(Body)) ++
+			    "\r\n";
+		    _ ->
+			content_type_header(ContentType) ++
+			    content_length_header(length(Body)) ++
+			    "\r\n" ++ Body
+		end;
+	    true ->
+		"\r\n"
+	end,
+    Message=
+	case useProxy(Settings#client_settings.useproxy,
+		      {Scheme,Host,Port,PathQuery}) of
+	    false ->
+		method(Method)++" "++PathQuery++" HTTP/1.1\r\n"++
+		    host_header(Host)++te_header()++
+		    headers(Headers) ++ PostData;
+	    AbsURI ->
+		method(Method)++" "++AbsURI++" HTTP/1.1\r\n"++
+		    te_header()++
+		    headers(Headers)++PostData
+	end,
+    http_lib:send(Scheme,Socket,Message).
+
+useProxy(false,_) ->
+    false;
+useProxy(true,{Scheme,Host,Port,PathQuery}) ->
+    [atom_to_list(Scheme),"://",Host,":",integer_to_list(Port),PathQuery].
+
+
+
+headers(#req_headers{expect=Expect,
+		     other=Other}) ->
+    H1=case Expect of
+	   undefined ->[];
+	   _ -> "Expect: "++Expect++"\r\n"
+       end,
+    H1++headers_other(Other).
+
+
+headers_other([]) ->
+    [];
+headers_other([{Key,Value}|Rest]) when atom(Key) ->
+    Head = atom_to_list(Key)++": "++Value++"\r\n",
+    Head ++ headers_other(Rest);
+headers_other([{Key,Value}|Rest]) ->
+    Head = Key++": "++Value++"\r\n",
+    Head ++ headers_other(Rest).
+
+host_header(Host) ->
+    "Host: "++lists:concat([Host])++"\r\n".
+content_type_header(ContentType) ->
+    "Content-Type: " ++ ContentType ++ "\r\n".
+content_length_header(ContentLength) ->
+    "Content-Length: "++integer_to_list(ContentLength) ++ "\r\n".
+te_header() ->
+    "TE: \r\n".
+
+method(Method) ->
+    httpd_util:to_upper(atom_to_list(Method)).
+
+
+%%% ----------------------------------------------------------------------------
+http_response({Status,Headers,Body},Req,Session) ->
+    case Status of
+	100 ->
+	    status_continue(Req,Session);
+	200 ->
+	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+					      {Status,Headers,Body}}),
+	    ServerClose=http_lib:connection_close(Headers),
+	    handle_connection(Session#session.clientclose,ServerClose,
+			      Req,Session);
+	300 -> status_multiple_choices(Headers,Body,Req,Session);
+	301 -> status_moved_permanently(Req#request.method,
+					Headers,Body,Req,Session);
+	302 -> status_found(Headers,Body,Req,Session);
+	303 -> status_see_other(Headers,Body,Req,Session);
+	304 -> status_not_modified(Headers,Body,Req,Session);
+	305 -> status_use_proxy(Headers,Body,Req,Session);
+	%% 306 This Status code is not used in HTTP 1.1
+	307 -> status_temporary_redirect(Headers,Body,Req,Session);
+	503 -> status_service_unavailable({Status,Headers,Body},Req,Session);
+	Status50x when Status50x==500;Status50x==501;Status50x==502;
+		       Status50x==504;Status50x==505 ->
+	    status_server_error_50x({Status,Headers,Body},Req,Session);
+	_ -> % FIXME May want to take some action on other Status codes as well
+	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+					      {Status,Headers,Body}}),
+	    ServerClose=http_lib:connection_close(Headers),
+	    handle_connection(Session#session.clientclose,ServerClose,
+			      Req,Session)
+    end.
+
+
+%%% Status code dependent functions.
+
+%%% Received a 100 Status code ("Continue")
+%%% From RFC2616
+%%% The client SHOULD continue with its request. This interim response is
+%%% used to inform the client that the initial part of the request has
+%%% been received and has not yet been rejected by the server. The client
+%%% SHOULD continue by sending the remainder of the request or, if the
+%%% request has already been completed, ignore this response. The server
+%%% MUST send a final response after the request has been completed. See
+%%% section 8.2.3 for detailed discussion of the use and handling of this
+%%% status code.
+status_continue(Req,Session) ->
+    {_,Body}=Req#request.content,
+    http_lib:send(Session#session.scheme,Session#session.socket,Body),
+    next_response_with_request(Req,Session).
+
+
+%%% Received a 300 Status code ("Multiple Choices")
+%%% The resource is located in any one of a set of locations
+%%% - If a 'Location' header is present (preserved server choice), use that
+%%%   to automatically redirect to the given URL
+%%% - else if the Content-Type/Body both are non-empty let the user agent make
+%%%   the choice and thus return a response with status 300
+%%% Note:
+%%% - If response to a HEAD request, the Content-Type/Body both should be empty.
+%%% - The behaviour on an empty Content-Type or Body is unspecified.
+%%%   However, e.g. "Apache/1.3" servers returns both empty if the header
+%%%   'if-modified-since: Date' was sent in the request and the content is
+%%%   "not modified" (instead of 304). Thus implicitly giving the cache as the
+%%%   only choice.
+status_multiple_choices(Headers,Body,Req,Session)
+  when ((Req#request.settings)#client_settings.autoredirect)==true ->
+    ServerClose=http_lib:connection_close(Headers),
+    case Headers#res_headers.location of
+	undefined ->
+	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+					      {300,Headers,Body}}),
+	    handle_connection(Session#session.clientclose,ServerClose,
+			      Req,Session);
+	RedirUrl ->
+	    Scheme=Session#session.scheme,
+	    case uri:parse(RedirUrl) of
+		{error,Reason} ->
+		    {error,Reason};
+		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
+		    NewReq=Req#request{redircount=Req#request.redircount+1,
+				       address={Host,Port},pathquery=PathQuery},
+		    handle_redirect(Session#session.clientclose,ServerClose,
+				    NewReq,Session)
+	    end
+    end;
+status_multiple_choices(Headers,Body,Req,Session) ->
+    ServerClose=http_lib:connection_close(Headers),
+    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+				      {300,Headers,Body}}),
+    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
+
+
+%%% Received a 301 Status code ("Moved Permanently")
+%%% The resource has been assigned a new permanent URI
+%%% - If a 'Location' header is present, use that to automatically redirect to
+%%%   the given URL if GET or HEAD request
+%%% - else return
+%%% Note:
+%%% - The Body should contain a short hypertext note with a hyperlink to the
+%%%   new URI. Return this if Content-Type acceptable (some HTTP servers doesn't
+%%%   deal properly with Accept headers)
+status_moved_permanently(Method,Headers,Body,Req,Session)
+  when (((Req#request.settings)#client_settings.autoredirect)==true) and
+       (Method==get) or (Method==head) ->
+    ServerClose=http_lib:connection_close(Headers),
+    case Headers#res_headers.location of
+	undefined ->
+	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+					      {301,Headers,Body}}),
+	    handle_connection(Session#session.clientclose,ServerClose,
+			      Req,Session);
+	RedirUrl ->
+	    Scheme=Session#session.scheme,
+	    case uri:parse(RedirUrl) of
+		{error,Reason} ->
+		    {error,Reason};
+		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
+		    NewReq=Req#request{redircount=Req#request.redircount+1,
+				       address={Host,Port},pathquery=PathQuery},
+		    handle_redirect(Session#session.clientclose,ServerClose,
+				    NewReq,Session)
+	    end
+    end;
+status_moved_permanently(_Method,Headers,Body,Req,Session) ->
+    ServerClose=http_lib:connection_close(Headers),
+    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+				      {301,Headers,Body}}),
+    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
+
+
+%%% Received a 302 Status code ("Found")
+%%% The requested resource resides temporarily under a different URI.
+%%% Note:
+%%% - Only cacheable if indicated by a Cache-Control or Expires header
+status_found(Headers,Body,Req,Session)
+  when ((Req#request.settings)#client_settings.autoredirect)==true ->
+    ServerClose=http_lib:connection_close(Headers),
+    case Headers#res_headers.location of
+	undefined ->
+	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+					      {302,Headers,Body}}),
+	    handle_connection(Session#session.clientclose,ServerClose,
+			      Req,Session);
+	RedirUrl ->
+	    Scheme=Session#session.scheme,
+	    case uri:parse(RedirUrl) of
+		{error,Reason} ->
+		    {error,Reason};
+		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
+		    NewReq=Req#request{redircount=Req#request.redircount+1,
+				       address={Host,Port},pathquery=PathQuery},
+		    handle_redirect(Session#session.clientclose,ServerClose,
+				    NewReq,Session)
+	    end
+    end;
+status_found(Headers,Body,Req,Session) ->
+    ServerClose=http_lib:connection_close(Headers),
+    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+				      {302,Headers,Body}}),
+    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
+
+%%% Received a 303 Status code ("See Other")
+%%% The request found under a different URI and should be retrieved using GET
+%%% Note:
+%%% - Must not be cached
+status_see_other(Headers,Body,Req,Session)
+  when ((Req#request.settings)#client_settings.autoredirect)==true ->
+    ServerClose=http_lib:connection_close(Headers),
+    case Headers#res_headers.location of
+	undefined ->
+	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+					      {303,Headers,Body}}),
+	    handle_connection(Session#session.clientclose,ServerClose,
+			      Req,Session);
+	RedirUrl ->
+	    Scheme=Session#session.scheme,
+	    case uri:parse(RedirUrl) of
+		{error,Reason} ->
+		    {error,Reason};
+		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
+		    NewReq=Req#request{redircount=Req#request.redircount+1,
+				       method=get,
+				       address={Host,Port},pathquery=PathQuery},
+		    handle_redirect(Session#session.clientclose,ServerClose,
+				    NewReq,Session)
+	    end
+    end;
+status_see_other(Headers,Body,Req,Session) ->
+    ServerClose=http_lib:connection_close(Headers),
+    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+				      {303,Headers,Body}}),
+    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
+
+
+%%% Received a 304 Status code ("Not Modified")
+%%% Note:
+%%% - The response MUST NOT contain a body.
+%%% - The response MUST include the following header fields:
+%%%   - Date, unless its omission is required
+%%%   - ETag and/or Content-Location, if the header would have been sent
+%%%        in a 200 response to the same request
+%%%   - Expires, Cache-Control, and/or Vary, if the field-value might
+%%%        differ from that sent in any previous response for the same
+%%%        variant
+status_not_modified(Headers,Body,Req,Session)
+  when ((Req#request.settings)#client_settings.autoredirect)==true ->
+    ServerClose=http_lib:connection_close(Headers),
+    case Headers#res_headers.location of
+	undefined ->
+	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+					      {304,Headers,Body}}),
+	    handle_connection(Session#session.clientclose,ServerClose,
+			      Req,Session);
+	RedirUrl ->
+	    Scheme=Session#session.scheme,
+	    case uri:parse(RedirUrl) of
+		{error,Reason} ->
+		    {error,Reason};
+		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
+		    NewReq=Req#request{redircount=Req#request.redircount+1,
+				       address={Host,Port},pathquery=PathQuery},
+		    handle_redirect(Session#session.clientclose,ServerClose,
+				    NewReq,Session)
+	    end
+    end;
+status_not_modified(Headers,Body,Req,Session) ->
+    ServerClose=http_lib:connection_close(Headers),
+    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+				      {304,Headers,Body}}),
+    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
+
+
+
+%%% Received a 305 Status code ("Use Proxy")
+%%% The requested resource MUST be accessed through the proxy given by the
+%%% Location field
+status_use_proxy(Headers,Body,Req,Session)
+  when ((Req#request.settings)#client_settings.autoredirect)==true ->
+    ServerClose=http_lib:connection_close(Headers),
+    case Headers#res_headers.location of
+	undefined ->
+	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+					      {305,Headers,Body}}),
+	    handle_connection(Session#session.clientclose,ServerClose,
+			      Req,Session);
+	RedirUrl ->
+	    Scheme=Session#session.scheme,
+	    case uri:parse(RedirUrl) of
+		{error,Reason} ->
+		    {error,Reason};
+		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
+		    NewReq=Req#request{redircount=Req#request.redircount+1,
+				       address={Host,Port},pathquery=PathQuery},
+		    handle_redirect(Session#session.clientclose,ServerClose,
+				    NewReq,Session)
+	    end
+    end;
+status_use_proxy(Headers,Body,Req,Session) ->
+    ServerClose=http_lib:connection_close(Headers),
+    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+				      {305,Headers,Body}}),
+    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
+
+
+%%% Received a 307 Status code ("Temporary Redirect")
+status_temporary_redirect(Headers,Body,Req,Session)
+  when ((Req#request.settings)#client_settings.autoredirect)==true ->
+    ServerClose=http_lib:connection_close(Headers),
+    case Headers#res_headers.location of
+	undefined ->
+	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+					      {307,Headers,Body}}),
+	    handle_connection(Session#session.clientclose,ServerClose,
+			      Req,Session);
+	RedirUrl ->
+	    Scheme=Session#session.scheme,
+	    case uri:parse(RedirUrl) of
+		{error,Reason} ->
+		    {error,Reason};
+		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
+		    NewReq=Req#request{redircount=Req#request.redircount+1,
+				       address={Host,Port},pathquery=PathQuery},
+		    handle_redirect(Session#session.clientclose,ServerClose,
+				    NewReq,Session)
+	    end
+    end;
+status_temporary_redirect(Headers,Body,Req,Session) ->
+    ServerClose=http_lib:connection_close(Headers),
+    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+				      {307,Headers,Body}}),
+    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
+
+
+
+%%% Received a 503 Status code ("Service Unavailable")
+%%%    The server is currently unable to handle the request due to a
+%%%    temporary overloading or maintenance of the server. The implication
+%%%    is that this is a temporary condition which will be alleviated after
+%%%    some delay. If known, the length of the delay MAY be indicated in a
+%%%    Retry-After header. If no Retry-After is given, the client SHOULD
+%%%    handle the response as it would for a 500 response.
+%% Note:
+%% - This session is now considered busy, thus cancel any requests in the
+%%   pipeline and close the session.
+%% FIXME! Implement a user option to automatically retry if the 'Retry-After'
+%%        header is given.
+status_service_unavailable(Resp,Req,Session) ->
+%    RetryAfter=Headers#res_headers.retry_after,
+    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,Resp}),
+    close_session(server_connection_close,Req,Session).
+
+
+%%% Received a 50x Status code (~ "Service Error")
+%%%   Response status codes beginning with the digit "5" indicate cases in
+%%%   which the server is aware that it has erred or is incapable of
+%%%   performing the request.
+status_server_error_50x(Resp,Req,Session) ->
+    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,Resp}),
+    close_session(server_connection_close,Req,Session).
+
+
+%%% Handles requests for redirects
+%%% The redirected request might be:
+%%% - FIXME! on another TCP session, another scheme
+%%% - on the same TCP session, same scheme
+%%% - on another TCP session , same scheme
+%%% However, in all cases treat it as a new request, with redircount updated.
+%%%
+%%% The redirect may fail, but this not a reason to close this session.
+%%% Instead return a error for this request, and continue as ok.
+handle_redirect(ClientClose,ServerClose,Req,Session) ->
+    case httpc_manager:request(Req) of
+	{ok,_ReqId} -> % FIXME Should I perhaps reuse the Reqid?
+	    handle_connection(ClientClose,ServerClose,Req,Session);
+	{error,Reason} ->
+	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
+					      {error,Reason}}),
+	    handle_connection(ClientClose,ServerClose,Req,Session)
+    end.
+
+%%% Check if the persistent connection flag is false (ie client request
+%%% non-persistive connection), or if the server requires a closed connection
+%%% (by sending a "Connection: close" header). If the connection required
+%%% non-persistent, we may close the connection immediately.
+handle_connection(ClientClose,ServerClose,Req,Session) ->
+    case {ClientClose,ServerClose} of
+	{false,false} ->
+	    ok;
+	{false,true} -> % The server requests this session to be closed.
+	    close_session(server_connection_close,Req,Session);
+	{true,_} -> % The client requested a non-persistent connection
+	    close_session(client_connection_close,Req,Session)
+    end.
+
+
+%%% Close the session.
+%%% We now have three cases:
+%%% - Client request a non-persistent connection when initiating the request.
+%%%   Session info not stored in httpc_manager
+%%% - Server requests a non-persistent connection when answering a request.
+%%%   No need to resend request, but there might be a pipeline.
+%%% - Some kind of error
+%%%   Close the session, we may then try resending all requests in the pipeline
+%%%   including the current depending on the error.
+%%% FIXME! Should not always abort the session (see close_session in
+%%%     httpc_manager for more details)
+close_session(client_connection_close,_Req,Session) ->
+    http_lib:close(Session#session.scheme,Session#session.socket),
+    stop;
+close_session(server_connection_close,Req,Session) ->
+    http_lib:close(Session#session.scheme,Session#session.socket),
+    httpc_manager:abort_session(Req#request.address,Session#session.id,
+			       aborted_request),
+    stop.
+
+exit_session(Address,Session,Reason) ->
+    http_lib:close(Session#session.scheme,Session#session.socket),
+    httpc_manager:abort_session(Address,Session#session.id,Reason),
+    exit(normal).
+
+%%% This is the "normal" case to close a persistent connection. I.e., there are
+%%% no more requests waiting and the session was closed by the client, or
+%%% server because of a timeout or user request.
+exit_session_ok(Address,Session) ->
+    http_lib:close(Session#session.scheme,Session#session.socket),
+    exit_session_ok2(Address,Session#session.clientclose,Session#session.id).
+
+exit_session_ok2(Address,ClientClose,Sid) ->
+    case ClientClose of
+	false ->
+	    httpc_manager:close_session(Address,Sid);
+	true ->
+	    ok
+    end,
+    exit(normal).
+
+%%% ============================================================================
+%%% This is deprecated code, to be removed
+
+format_time() ->
+    {_,_,MicroSecs}=TS=now(),
+    {{Y,Mon,D},{H,M,S}}=calendar:now_to_universal_time(TS),
+    lists:flatten(io_lib:format("~4.4.0w-~2.2.0w-~2.2.0w,~2.2.0w:~2.2.0w:~6.3.0f",
+				[Y,Mon,D,H,M,S+(MicroSecs/1000000)])).
+
+%%% Read more data from the open socket.
+%%% Two different read functions is used because for the {active, once} socket
+%%% option is (currently) not available for SSL...
+%%% FIXME
+% read_more_data(http,Socket,Timeout) ->
+%     io:format("read_more_data(ip_comm) -> "
+% 	"~n   set active = 'once' and "
+% 	"await a chunk data", []),
+%     http_lib:setopts(Socket, [{active,once}]),
+%     read_more_data_ipcomm(Socket,Timeout);
+% read_more_data(https,Socket,Timeout) ->
+%     case ssl:recv(Socket,0,Timeout) of
+% 	{ok,MoreData} ->
+% 	    MoreData;
+% 	{error,closed} ->
+% 	    throw({error, session_remotely_closed});
+% 	{error,etimedout} ->
+% 	    throw({error, session_local_timeout});
+% 	{error,Reason} ->
+% 	    throw({error, Reason});
+% 	Other ->
+% 	    throw({error, Other})
+%     end.
+
+% %%% Send any incoming requests on the open session immediately
+% read_more_data_ipcomm(Socket,Timeout) ->
+%     receive
+% 	{tcp,Socket,MoreData} ->
+% %	    ?vtrace("read_more_data(ip_comm) -> got some data:~p",
+% %		[MoreData]),
+% 	    MoreData;
+% 	{tcp_closed,Socket} ->
+% %	    ?vtrace("read_more_data(ip_comm) -> socket closed",[]),
+% 	    throw({error,session_remotely_closed});
+% 	{tcp_error,Socket,Reason} ->
+% %	    ?vtrace("read_more_data(ip_comm) -> ~p socket error: ~p",
+% %		[self(),Reason]),
+% 	    throw({error, Reason});
+% 	stop ->
+% 	    throw({error, user_req})
+%     after Timeout ->
+% 	    throw({error, session_local_timeout})
+%     end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpc_manager.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpc_manager.erl
new file mode 100644
index 0000000000..29659ce1ce
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpc_manager.erl
@@ -0,0 +1,542 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Mobile Arts AB
+%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
+%% All Rights Reserved.''
+%%
+%%
+%% Created : 18 Dec 2001 by Johan Blom <[email protected]>
+%%
+
+-module(httpc_manager).
+
+-behaviour(gen_server).
+
+-include("http.hrl").
+
+-define(HMACALL, ?MODULE).
+-define(HMANAME, ?MODULE).
+
+%%--------------------------------------------------------------------
+%% External exports
+-export([start_link/0,start/0,
+	 request/1,cancel_request/1,
+	 next_request/2,
+	 register_socket/3,
+	 abort_session/3,close_session/2,close_session/3
+	]).
+
+%% Debugging only
+-export([status/0]).
+
+%% gen_server callbacks
+-export([init/1,handle_call/3,handle_cast/2,handle_info/2,terminate/2,
+	 code_change/3]).
+
+%%% address_db - ets() Contains mappings from a tuple {Host,Port} to a tuple
+%%%  {LastSID,OpenSessions,ets()} where
+%%%      LastSid is the last allocated session id,
+%%%      OpenSessions is the number of currently open sessions and
+%%%      ets() contains mappings from Session Id to #session{}.
+%%%
+%%% Note:
+%%% - Only persistent connections are stored in address_db
+%%% - When automatically redirecting, multiple requests are performed.
+-record(state,{
+	  address_db,   % ets()
+	  reqid         % int() Next Request id to use (identifies request).
+	 }).
+
+%%====================================================================
+%% External functions
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Function: start_link/0
+%% Description: Starts the server
+%%--------------------------------------------------------------------
+start() ->
+    ensure_started().
+
+start_link() ->
+    gen_server:start_link({local,?HMACALL}, ?HMANAME, [], []).
+
+
+%% Find available session process and store in address_db. If no
+%% available, start new handler process.
+request(Req) ->
+    ensure_started(),
+    ClientClose=http_lib:connection_close(Req#request.headers),
+    gen_server:call(?HMACALL,{request,ClientClose,Req},infinity).
+
+cancel_request(ReqId) ->
+    gen_server:call(?HMACALL,{cancel_request,ReqId},infinity).
+
+
+%%% Close Session
+close_session(Addr,Sid) ->
+    gen_server:call(?HMACALL,{close_session,Addr,Sid},infinity).
+close_session(Req,Addr,Sid) ->
+    gen_server:call(?HMACALL,{close_session,Req,Addr,Sid},infinity).
+
+abort_session(Addr,Sid,Msg) ->
+    gen_server:call(?HMACALL,{abort_session,Addr,Sid,Msg},infinity).
+
+
+%%%  Pick next in request que
+next_request(Addr,Sid) ->
+    gen_server:call(?HMACALL,{next_request,Addr,Sid},infinity).
+
+%%% Session handler has succeded to set up a new session, now register
+%%% the socket
+register_socket(Addr,Sid,Socket) ->
+    gen_server:cast(?HMACALL,{register_socket,Addr,Sid,Socket}).
+
+
+%%% Debugging
+status() ->
+    gen_server:cast(?HMACALL,status).
+
+
+%%--------------------------------------------------------------------
+%% Function: init/1
+%% Description: Initiates the server
+%% Returns: {ok, State}          |
+%%          {ok, State, Timeout} |
+%%          ignore               |
+%%          {stop, Reason}
+%%--------------------------------------------------------------------
+init([]) ->
+    process_flag(trap_exit, true),
+    {ok,#state{address_db=ets:new(address_db,[private]),
+	       reqid=0}}.
+
+
+%%--------------------------------------------------------------------
+%% Function: handle_call/3
+%% Description: Handling call messages
+%% Returns: {reply, Reply, State}          |
+%%          {reply, Reply, State, Timeout} |
+%%          {noreply, State}               |
+%%          {noreply, State, Timeout}      |
+%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
+%%          {stop, Reason, State}            (terminate/2 is called)
+%%--------------------------------------------------------------------
+%%% Note:
+%%% - We may have multiple non-persistent connections, each will be handled in
+%%%   separate processes, thus don't add such connections to address_db
+handle_call({request,false,Req},_From,State) ->
+    case ets:lookup(State#state.address_db,Req#request.address) of
+	[] ->
+	    STab=ets:new(session_db,[private,{keypos,2},set]),
+	    case persistent_new_session_request(0,Req,STab,State) of
+		{Reply,LastSid,State2} ->
+		    ets:insert(State2#state.address_db,
+			       {Req#request.address,{LastSid,1,STab}}),
+		    {reply,Reply,State2};
+		{ErrorReply,State2} ->
+		    {reply,ErrorReply,State2}
+	    end;
+	[{_,{LastSid,OpenS,STab}}] ->
+	    case lookup_session_entry(STab) of
+		{ok,Session} ->
+		    old_session_request(Session,Req,STab,State);
+		need_new_session when OpenS<(Req#request.settings)#client_settings.max_sessions ->
+		    case persistent_new_session_request(LastSid,Req,
+							STab,State) of
+			{Reply,LastSid2,State2} ->
+			    ets:insert(State2#state.address_db,
+				       {Req#request.address,
+					{LastSid2,OpenS+1,STab}}),
+			    {reply,Reply,State2};
+			{ErrorReply,State2} ->
+			    {reply,ErrorReply,State2}
+		    end;
+		need_new_session ->
+		    {reply,{error,too_many_sessions},State}
+	    end
+    end;
+handle_call({request,true,Req},_From,State) ->
+    {Reply,State2}=not_persistent_new_session_request(Req,State),
+    {reply,Reply,State2};
+handle_call({cancel_request,true,_ReqId},_From,State) ->
+%% FIXME Should be possible to scan through all requests made, but perhaps
+%% better to give some more hints (such as Addr etc)
+    Reply=ok,
+    {reply,Reply,State};
+handle_call({next_request,Addr,Sid},_From,State) ->
+    case ets:lookup(State#state.address_db,Addr) of
+	[] ->
+	    {reply,{error,no_connection},State};
+	[{_,{_,_,STab}}] ->
+	    case ets:lookup(STab,Sid) of
+		[] ->
+		    {reply,{error,session_not_registered},State};
+		[S=#session{pipeline=[],quelength=QueLen}] ->
+		    if
+			QueLen==1 ->
+			    ets:insert(STab,S#session{quelength=0});
+			true ->
+			    ok
+		    end,
+		    {reply,no_more_requests,State};
+		[S=#session{pipeline=Que}] ->
+		    [Req|RevQue]=lists:reverse(Que),
+		    ets:insert(STab,S#session{pipeline=lists:reverse(RevQue),
+					      quelength=S#session.quelength-1}),
+		    {reply,Req,State}
+	    end
+    end;
+handle_call({close_session,Addr,Sid},_From,State) ->
+    case ets:lookup(State#state.address_db,Addr) of
+	[] ->
+	    {reply,{error,no_connection},State};
+	[{_,{LastSid,OpenS,STab}}] ->
+	    case ets:lookup(STab,Sid) of
+		[#session{pipeline=Que}] ->
+		    R=handle_close_session(lists:reverse(Que),STab,Sid,State),
+		    ets:insert(State#state.address_db,
+			       {Addr,{LastSid,OpenS-1,STab}}),
+		    {reply,R,State};
+		[] ->
+		    {reply,{error,session_not_registered},State}
+	    end
+    end;
+handle_call({close_session,Req,Addr,Sid},_From,State) ->
+    case ets:lookup(State#state.address_db,Addr) of
+	[] ->
+	    {reply,{error,no_connection},State};
+	[{_,{LastSid,OpenS,STab}}] ->
+	    case ets:lookup(STab,Sid) of
+		[#session{pipeline=Que}] ->
+		    R=handle_close_session([Req|lists:reverse(Que)],
+					   STab,Sid,State),
+		    ets:insert(State#state.address_db,
+			       {Addr,{LastSid,OpenS-1,STab}}),
+		    {reply,R,State};
+		[] ->
+		    {reply,{error,session_not_registered},State}
+	    end
+    end;
+handle_call({abort_session,Addr,Sid,Msg},_From,State) ->
+    case ets:lookup(State#state.address_db,Addr) of
+	[] ->
+	    {reply,{error,no_connection},State};
+	[{_,{LastSid,OpenS,STab}}] ->
+	    case ets:lookup(STab,Sid) of
+		[#session{pipeline=Que}] ->
+		    R=abort_request_que(Que,{error,Msg}),
+		    ets:delete(STab,Sid),
+		    ets:insert(State#state.address_db,
+			       {Addr,{LastSid,OpenS-1,STab}}),
+		    {reply,R,State};
+		[] ->
+		    {reply,{error,session_not_registered},State}
+	    end
+    end.
+
+
+%%--------------------------------------------------------------------
+%% Function: handle_cast/2
+%% Description: Handling cast messages
+%% Returns: {noreply, State}          |
+%%          {noreply, State, Timeout} |
+%%          {stop, Reason, State}            (terminate/2 is called)
+%%--------------------------------------------------------------------
+handle_cast(status, State) ->
+    io:format("Status:~n"),
+    print_all(lists:sort(ets:tab2list(State#state.address_db))),
+    {noreply, State};
+handle_cast({register_socket,Addr,Sid,Socket},State) ->
+    case ets:lookup(State#state.address_db,Addr) of
+	[] ->
+	    {noreply,State};
+	[{_,{_,_,STab}}] ->
+	    case ets:lookup(STab,Sid) of
+		[Session] ->
+		    ets:insert(STab,Session#session{socket=Socket}),
+		    {noreply,State};
+		[] ->
+		    {noreply,State}
+	    end
+    end.
+
+print_all([]) ->
+    ok;
+print_all([{Addr,{LastSid,OpenSessions,STab}}|Rest]) ->
+    io:format(" Address:~p LastSid=~p OpenSessions=~p~n",[Addr,LastSid,OpenSessions]),
+    SortedList=lists:sort(fun(A,B) ->
+				  if
+				      A#session.id<B#session.id ->
+					  true;
+				      true ->
+					  false
+				  end
+			  end,ets:tab2list(STab)),
+    print_all2(SortedList),
+    print_all(Rest).
+
+print_all2([]) ->
+    ok;
+print_all2([Session|Rest]) ->
+    io:format("   Session:~p~n",[Session#session.id]),
+    io:format("     Client close:~p~n",[Session#session.clientclose]),
+    io:format("     Socket:~p~n",[Session#session.socket]),
+    io:format("     Pipe: length=~p Que=~p~n",[Session#session.quelength,Session#session.pipeline]),
+    print_all2(Rest).
+
+%%--------------------------------------------------------------------
+%% Function: handle_info/2
+%% Description: Handling all non call/cast messages
+%% Returns: {noreply, State}          |
+%%          {noreply, State, Timeout} |
+%%          {stop, Reason, State}            (terminate/2 is called)
+%%--------------------------------------------------------------------
+handle_info({'EXIT',_Pid,normal}, State) ->
+    {noreply, State};
+handle_info(Info, State) ->
+    io:format("ERROR httpc_manager:handle_info ~p~n",[Info]),
+    {noreply, State}.
+
+%%--------------------------------------------------------------------
+%% Function: terminate/2
+%% Description: Shutdown the server
+%% Returns: any (ignored by gen_server)
+%%--------------------------------------------------------------------
+terminate(_Reason, State) ->
+    ets:delete(State#state.address_db).
+
+%%--------------------------------------------------------------------
+%% Func: code_change/3
+%% Purpose: Convert process state when code is changed
+%% Returns: {ok, NewState}
+%%--------------------------------------------------------------------
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
+%%% From RFC 2616, Section 8.1.4
+%%%   A client, server, or proxy MAY close the transport connection at any
+%%%   time. For example, a client might have started to send a new request
+%%%   at the same time that the server has decided to close the "idle"
+%%%   connection. From the server's point of view, the connection is being
+%%%   closed while it was idle, but from the client's point of view, a
+%%%   request is in progress.
+%%%
+%%%   This means that clients, servers, and proxies MUST be able to recover
+%%%   from asynchronous close events. Client software SHOULD reopen the
+%%%   transport connection and retransmit the aborted sequence of requests
+%%%   without user interaction so long as the request sequence is
+%%%   idempotent (see section 9.1.2). Non-idempotent methods or sequences
+%%%
+%%% FIXME
+%%% Note:
+%%% - If this happen (server close because of idle) there can't be any requests
+%%%   in the que.
+%%% - This is the main function for closing of sessions
+handle_close_session([],STab,Sid,_State) ->
+    ets:delete(STab,Sid);
+handle_close_session(Que,STab,Sid,_State) ->
+    ets:delete(STab,Sid),
+    abort_request_que(Que,{error,aborted_request}).
+
+
+%%% From RFC 2616, Section 8.1.2.2
+%%%   Clients which assume persistent connections and pipeline immediately
+%%%   after connection establishment SHOULD be prepared to retry their
+%%%   connection if the first pipelined attempt fails. If a client does
+%%%   such a retry, it MUST NOT pipeline before it knows the connection is
+%%%   persistent. Clients MUST also be prepared to resend their requests if
+%%%   the server closes the connection before sending all of the
+%%%   corresponding responses.
+%%% FIXME! I'm currently not checking if tis is the first attempt on the session
+%%% FIXME! Pipeline size must be dynamically variable (e.g. 0 if resend, 2 else)
+%%% The que contains requests that have been sent ok previously, but the session
+%%% was closed prematurely when reading the response.
+%%% Try setup a new session and resend these requests.
+%%% Note:
+%%% - This MUST be a persistent session
+% handle_closed_pipelined_session_que([],_State) ->
+%     ok;
+% handle_closed_pipelined_session_que(_Que,_State) ->
+%     ok.
+
+
+%%% From RFC 2616, Section 8.2.4
+%%%   If an HTTP/1.1 client sends a request which includes a request body,
+%%%   but which does not include an Expect request-header field with the
+%%%   "100-continue" expectation, and if the client is not directly
+%%%   connected to an HTTP/1.1 origin server, and if the client sees the
+%%%   connection close before receiving any status from the server, the
+%%%   client SHOULD retry the request.  If the client does retry this
+%%%   request, it MAY use the following "binary exponential backoff"
+%%%   algorithm to be assured of obtaining a reliable response:
+%%%   ...
+%%% FIXME! I'm currently not checking if a "Expect: 100-continue" has been sent.
+% handle_remotely_closed_session_que([],_State) ->
+%     ok;
+% handle_remotely_closed_session_que(_Que,_State) ->
+% %    resend_que(Que,Socket),
+%     ok.
+
+%%% Resend all requests in the request que
+% resend_que([],_) ->
+%     ok;
+% resend_que([Req|Que],Socket) ->
+%     case catch httpc_handler:http_request(Req,Socket) of
+% 	ok ->
+% 	    resend_que(Que,Socket);
+% 	{error,Reason} ->
+% 	    {error,Reason}
+%     end.
+
+
+%%% From RFC 2616,
+%%% Section 8.1.2.2:
+%%%   Clients SHOULD NOT pipeline requests using non-idempotent methods or
+%%%   non-idempotent sequences of methods (see section 9.1.2). Otherwise, a
+%%%   premature termination of the transport connection could lead to
+%%%   indeterminate results. A client wishing to send a non-idempotent
+%%%   request SHOULD wait to send that request until it has received the
+%%%   response status for the previous request.
+%%% Section 9.1.2:
+%%%   Methods can also have the property of "idempotence" in that (aside
+%%%   from error or expiration issues) the side-effects of N > 0 identical
+%%%   requests is the same as for a single request. The methods GET, HEAD,
+%%%   PUT and DELETE share this property. Also, the methods OPTIONS and
+%%%   TRACE SHOULD NOT have side effects, and so are inherently idempotent.
+%%%
+%%% Note that POST and CONNECT are idempotent methods.
+%%%
+%%% Tries to find an open, free session i STab. Such a session has quelength
+%%% less than ?MAX_PIPELINE_LENGTH
+%%% Don't care about non-standard, user defined methods.
+%%%
+%%% Returns {ok,Session} or need_new_session where
+%%%  Session is the session that may be used
+lookup_session_entry(STab) ->
+    MS=[{#session{quelength='$1',max_quelength='$2',
+		  id='_',clientclose='_',socket='$3',scheme='_',pipeline='_'},
+	 [{'<','$1','$2'},{is_port,'$3'}],
+	 ['$_']}],
+    case ets:select(STab,MS) of
+	[] ->
+	    need_new_session;
+	SessionList -> % Now check if any of these has an empty pipeline.
+	    case lists:keysearch(0,2,SessionList) of
+		{value,Session} ->
+		    {ok,Session};
+		false ->
+		    {ok,hd(SessionList)}
+	    end
+    end.
+
+
+%%% Returns a tuple {Reply,State} where
+%%%  Reply is the response sent back to the application
+%%%
+%%% Note:
+%%% - An {error,einval} from a send should sometimes rather be {error,closed}
+%%% - Don't close the session from here, let httpc_handler take care of that.
+%old_session_request(Session,Req,STab,State)
+%  when (Req#request.settings)#client_settings.max_quelength==0 ->
+%    Session1=Session#session{pipeline=[Req]},
+%    ets:insert(STab,Session1),
+%    {reply,{ok,ReqId},State#state{reqid=ReqId+1}};
+old_session_request(Session,Req,STab,State) ->
+    ReqId=State#state.reqid,
+    Req1=Req#request{id=ReqId},
+    case catch httpc_handler:http_request(Req1,Session#session.socket) of
+	ok ->
+	    Session1=Session#session{pipeline=[Req1|Session#session.pipeline],
+				     quelength=Session#session.quelength+1},
+	    ets:insert(STab,Session1),
+	    {reply,{ok,ReqId},State#state{reqid=ReqId+1}};
+	{error,Reason} ->
+	    ets:insert(STab,Session#session{socket=undefined}),
+%	    http_lib:close(Session#session.sockettype,Session#session.socket),
+	    {reply,{error,Reason},State#state{reqid=ReqId+1}}
+    end.
+
+%%% Returns atuple {Reply,Sid,State} where
+%%%  Reply is the response sent back to the application, and
+%%%  Sid is the last used Session Id
+persistent_new_session_request(Sid,Req,STab,State) ->
+    ReqId=State#state.reqid,
+    case setup_new_session(Req#request{id=ReqId},false,Sid) of
+	{error,Reason} ->
+	    {{error,Reason},State#state{reqid=ReqId+1}};
+	{NewSid,Session} ->
+	    ets:insert(STab,Session),
+	    {{ok,ReqId},NewSid,State#state{reqid=ReqId+1}}
+    end.
+
+%%% Returns a tuple {Reply,State} where
+%%%  Reply is the response sent back to the application
+not_persistent_new_session_request(Req,State) ->
+    ReqId=State#state.reqid,
+    case setup_new_session(Req#request{id=ReqId},true,undefined) of
+	{error,Reason} ->
+	    {{error,Reason},State#state{reqid=ReqId+1}};
+	ok ->
+	    {{ok,ReqId},State#state{reqid=ReqId+1}}
+    end.
+
+%%% As there are no sessions available, setup a new session and send the request
+%%% on it.
+setup_new_session(Req,ClientClose,Sid) ->
+    S=#session{id=Sid,clientclose=ClientClose,
+	       scheme=Req#request.scheme,
+	       max_quelength=(Req#request.settings)#client_settings.max_quelength},
+    spawn_link(httpc_handler,init_connection,[Req,S]),
+    case ClientClose of
+	false ->
+	    {Sid+1,S};
+	true ->
+	    ok
+    end.
+
+
+%%% ----------------------------------------------------------------------------
+%%% Abort all requests in the request que.
+abort_request_que([],_Msg) ->
+    ok;
+abort_request_que([#request{from=From,ref=Ref,id=Id}|Que],Msg) ->
+    gen_server:cast(From,{Ref,Id,Msg}),
+    abort_request_que(Que,Msg);
+abort_request_que(#request{from=From,ref=Ref,id=Id},Msg) ->
+    gen_server:cast(From,{Ref,Id,Msg}).
+
+
+%%% --------------------------------
+%            C={httpc_manager,{?MODULE,start_link,[]},permanent,1000,
+%	       worker,[?MODULE]},
+%            supervisor:start_child(inets_sup, C),
+ensure_started() ->
+    case whereis(?HMANAME) of
+        undefined ->
+	    start_link();
+        _ ->
+	    ok
+    end.
+
+
+%%% ============================================================================
+%%% This is deprecated code, to be removed
+
+% format_time() ->
+%     {_,_,MicroSecs}=TS=now(),
+%     {{Y,Mon,D},{H,M,S}}=calendar:now_to_universal_time(TS),
+%     lists:flatten(io_lib:format("~4.4.0w-~2.2.0w-~2.2.0w,~2.2.0w:~2.2.0w:~6.3.0f",
+% 				[Y,Mon,D,H,M,S+(MicroSecs/1000000)])).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd.erl
new file mode 100644
index 0000000000..3199e4430d
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd.erl
@@ -0,0 +1,594 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd.erl,v 1.1 2008/12/17 09:53:33 mikpe Exp $
+%%
+-module(httpd).
+-export([multi_start/1, multi_start_link/1,
+	 start/0, start/1, start/2,
+	 start_link/0, start_link/1, start_link/2,
+	 start_child/0,start_child/1,
+	 multi_stop/1,
+	 stop/0,stop/1,stop/2,
+	 stop_child/0,stop_child/1,stop_child/2,
+	 multi_restart/1,
+	 restart/0,restart/1,restart/2,
+	 parse_query/1]).
+
+%% Optional start related stuff...
+-export([load/1,        load_mime_types/1,
+	 start2/1,      start2/2,
+	 start_link2/1, start_link2/2,
+	 stop2/1]).
+
+%% Management stuff
+-export([block/0,block/1,block/2,block/3,block/4,
+	 unblock/0,unblock/1,unblock/2]).
+
+%% Debugging and status info stuff...
+-export([verbosity/3,verbosity/4]).
+-export([get_status/1,get_status/2,get_status/3,
+	 get_admin_state/0,get_admin_state/1,get_admin_state/2,
+	 get_usage_state/0,get_usage_state/1,get_usage_state/2]).
+
+-include("httpd.hrl").
+
+-define(D(F, A), io:format("~p:" ++ F ++ "~n", [?MODULE|A])).
+
+
+%% start
+
+start() ->
+    start("/var/tmp/server_root/conf/8888.conf").
+
+start(ConfigFile) ->
+    %% ?D("start(~s) -> entry", [ConfigFile]),
+    start(ConfigFile, []).
+
+start(ConfigFile, Verbosity) when list(ConfigFile), list(Verbosity) ->
+    httpd_sup:start(ConfigFile, Verbosity).
+
+
+%% start_link
+
+start_link() ->
+    start("/var/tmp/server_root/conf/8888.conf").
+
+start_link(ConfigFile) ->
+    start_link(ConfigFile, []).
+
+start_link(ConfigFile, Verbosity) when list(ConfigFile), list(Verbosity) ->
+    httpd_sup:start_link(ConfigFile, Verbosity).
+
+
+%% start2 & start_link2
+
+start2(Config) ->
+    start2(Config, []).
+
+start2(Config, Verbosity) when list(Config), list(Verbosity) ->
+    httpd_sup:start2(Config, Verbosity).
+
+start_link2(Config) ->
+    start_link2(Config, []).
+
+start_link2(Config, Verbosity) when list(Config), list(Verbosity) ->
+    httpd_sup:start_link2(Config, Verbosity).
+
+
+%% stop
+
+stop() ->
+  stop(8888).
+
+stop(Port) when integer(Port) ->
+    stop(undefined, Port);
+stop(Pid) when pid(Pid) ->
+    httpd_sup:stop(Pid);
+stop(ConfigFile) when list(ConfigFile) ->
+    %% ?D("stop(~s) -> entry", [ConfigFile]),
+    httpd_sup:stop(ConfigFile).
+
+stop(Addr, Port) when integer(Port) ->
+    httpd_sup:stop(Addr, Port).
+
+stop2(Config) when list(Config) ->
+    httpd_sup:stop2(Config).
+
+%% start_child
+
+start_child() ->
+    start_child("/var/tmp/server_root/conf/8888.conf").
+
+start_child(ConfigFile) ->
+    start_child(ConfigFile, []).
+
+start_child(ConfigFile, Verbosity) ->
+    inets_sup:start_child(ConfigFile, Verbosity).
+
+
+%% stop_child
+
+stop_child() ->
+  stop_child(8888).
+
+stop_child(Port) ->
+    stop_child(undefined,Port).
+
+stop_child(Addr, Port) when integer(Port) ->
+    inets_sup:stop_child(Addr, Port).
+
+
+%% multi_start
+
+multi_start(MultiConfigFile) ->
+    case read_multi_file(MultiConfigFile) of
+	{ok,ConfigFiles} ->
+	    mstart(ConfigFiles);
+	Error ->
+	    Error
+    end.
+
+mstart(ConfigFiles) ->
+    mstart(ConfigFiles,[]).
+mstart([],Results) ->
+    {ok,lists:reverse(Results)};
+mstart([H|T],Results) ->
+    Res = start(H),
+    mstart(T,[Res|Results]).
+
+
+%% multi_start_link
+
+multi_start_link(MultiConfigFile) ->
+    case read_multi_file(MultiConfigFile) of
+	{ok,ConfigFiles} ->
+	    mstart_link(ConfigFiles);
+	Error ->
+	    Error
+    end.
+
+mstart_link(ConfigFiles) ->
+    mstart_link(ConfigFiles,[]).
+mstart_link([],Results) ->
+    {ok,lists:reverse(Results)};
+mstart_link([H|T],Results) ->
+    Res = start_link(H),
+    mstart_link(T,[Res|Results]).
+
+
+%% multi_stop
+
+multi_stop(MultiConfigFile) ->
+    case read_multi_file(MultiConfigFile) of
+	{ok,ConfigFiles} ->
+	    mstop(ConfigFiles);
+	Error ->
+	    Error
+    end.
+
+mstop(ConfigFiles) ->
+    mstop(ConfigFiles,[]).
+mstop([],Results) ->
+    {ok,lists:reverse(Results)};
+mstop([H|T],Results) ->
+    Res = stop(H),
+    mstop(T,[Res|Results]).
+
+
+%% multi_restart
+
+multi_restart(MultiConfigFile) ->
+    case read_multi_file(MultiConfigFile) of
+	{ok,ConfigFiles} ->
+	    mrestart(ConfigFiles);
+	Error ->
+	    Error
+    end.
+
+mrestart(ConfigFiles) ->
+    mrestart(ConfigFiles,[]).
+mrestart([],Results) ->
+    {ok,lists:reverse(Results)};
+mrestart([H|T],Results) ->
+    Res = restart(H),
+    mrestart(T,[Res|Results]).
+
+
+%% restart
+
+restart() -> restart(undefined,8888).
+
+restart(Port) when integer(Port) ->
+    restart(undefined,Port);
+restart(ConfigFile) when list(ConfigFile) ->
+    case get_addr_and_port(ConfigFile) of
+	{ok,Addr,Port} ->
+	    restart(Addr,Port);
+	Error ->
+	    Error
+    end.
+
+
+restart(Addr,Port) when integer(Port) ->
+    do_restart(Addr,Port).
+
+do_restart(Addr,Port) when integer(Port) ->
+    Name = make_name(Addr,Port),
+    case whereis(Name) of
+	Pid when pid(Pid) ->
+	    httpd_manager:restart(Pid);
+	_ ->
+	    {error,not_started}
+    end.
+
+
+%%% =========================================================
+%%% Function:    block/0, block/1, block/2, block/3, block/4
+%%%              block()
+%%%              block(Port)
+%%%              block(ConfigFile)
+%%%              block(Addr,Port)
+%%%              block(Port,Mode)
+%%%              block(ConfigFile,Mode)
+%%%              block(Addr,Port,Mode)
+%%%              block(ConfigFile,Mode,Timeout)
+%%%              block(Addr,Port,Mode,Timeout)
+%%%
+%%% Returns:     ok | {error,Reason}
+%%%
+%%% Description: This function is used to block an HTTP server.
+%%%              The blocking can be done in two ways,
+%%%              disturbing or non-disturbing. Default is disturbing.
+%%%              When a HTTP server is blocked, all requests are rejected
+%%%              (status code 503).
+%%%
+%%%              disturbing:
+%%%              By performing a disturbing block, the server
+%%%              is blocked forcefully and all ongoing requests
+%%%              are terminated. No new connections are accepted.
+%%%              If a timeout time is given then, on-going requests
+%%%              are given this much time to complete before the
+%%%              server is forcefully blocked. In this case no new
+%%%              connections is accepted.
+%%%
+%%%              non-disturbing:
+%%%              A non-disturbing block is more gracefull. No
+%%%              new connections are accepted, but the ongoing
+%%%              requests are allowed to complete.
+%%%              If a timeout time is given, it waits this long before
+%%%              giving up (the block operation is aborted and the
+%%%              server state is once more not-blocked).
+%%%
+%%% Types:       Port       -> integer()
+%%%              Addr       -> {A,B,C,D} | string() | undefined
+%%%              ConfigFile -> string()
+%%%              Mode       -> disturbing | non_disturbing
+%%%              Timeout    -> integer()
+%%%
+block() -> block(undefined,8888,disturbing).
+
+block(Port) when integer(Port) ->
+    block(undefined,Port,disturbing);
+
+block(ConfigFile) when list(ConfigFile) ->
+    case get_addr_and_port(ConfigFile) of
+	{ok,Addr,Port} ->
+	    block(Addr,Port,disturbing);
+	Error ->
+	    Error
+    end.
+
+block(Addr,Port) when integer(Port) ->
+    block(Addr,Port,disturbing);
+
+block(Port,Mode) when integer(Port), atom(Mode) ->
+    block(undefined,Port,Mode);
+
+block(ConfigFile,Mode) when list(ConfigFile), atom(Mode) ->
+    case get_addr_and_port(ConfigFile) of
+	{ok,Addr,Port} ->
+	    block(Addr,Port,Mode);
+	Error ->
+	    Error
+    end.
+
+
+block(Addr,Port,disturbing) when integer(Port) ->
+    do_block(Addr,Port,disturbing);
+block(Addr,Port,non_disturbing) when integer(Port) ->
+    do_block(Addr,Port,non_disturbing);
+
+block(ConfigFile,Mode,Timeout) when list(ConfigFile), atom(Mode), integer(Timeout) ->
+    case get_addr_and_port(ConfigFile) of
+	{ok,Addr,Port} ->
+	    block(Addr,Port,Mode,Timeout);
+	Error ->
+	    Error
+    end.
+
+
+block(Addr,Port,non_disturbing,Timeout) when integer(Port), integer(Timeout) ->
+    do_block(Addr,Port,non_disturbing,Timeout);
+block(Addr,Port,disturbing,Timeout) when integer(Port), integer(Timeout) ->
+    do_block(Addr,Port,disturbing,Timeout).
+
+do_block(Addr,Port,Mode) when integer(Port), atom(Mode) ->
+    Name = make_name(Addr,Port),
+    case whereis(Name) of
+	Pid when pid(Pid) ->
+	    httpd_manager:block(Pid,Mode);
+	_ ->
+	    {error,not_started}
+    end.
+
+
+do_block(Addr,Port,Mode,Timeout) when integer(Port), atom(Mode) ->
+    Name = make_name(Addr,Port),
+    case whereis(Name) of
+	Pid when pid(Pid) ->
+	    httpd_manager:block(Pid,Mode,Timeout);
+	_ ->
+	    {error,not_started}
+    end.
+
+
+%%% =========================================================
+%%% Function:    unblock/0, unblock/1, unblock/2
+%%%              unblock()
+%%%              unblock(Port)
+%%%              unblock(ConfigFile)
+%%%              unblock(Addr,Port)
+%%%
+%%% Description: This function is used to reverse a previous block
+%%%              operation on the HTTP server.
+%%%
+%%% Types:       Port       -> integer()
+%%%              Addr       -> {A,B,C,D} | string() | undefined
+%%%              ConfigFile -> string()
+%%%
+unblock()                        -> unblock(undefined,8888).
+unblock(Port) when integer(Port) -> unblock(undefined,Port);
+
+unblock(ConfigFile) when list(ConfigFile) ->
+    case get_addr_and_port(ConfigFile) of
+	{ok,Addr,Port} ->
+	    unblock(Addr,Port);
+	Error ->
+	    Error
+    end.
+
+unblock(Addr,Port) when integer(Port) ->
+    Name = make_name(Addr,Port),
+    case whereis(Name) of
+	Pid when pid(Pid) ->
+	    httpd_manager:unblock(Pid);
+	_ ->
+	    {error,not_started}
+    end.
+
+
+verbosity(Port,Who,Verbosity) ->
+    verbosity(undefined,Port,Who,Verbosity).
+
+verbosity(Addr,Port,Who,Verbosity) ->
+    Name = make_name(Addr,Port),
+    case whereis(Name) of
+	Pid when pid(Pid) ->
+	    httpd_manager:verbosity(Pid,Who,Verbosity);
+	_ ->
+	    not_started
+    end.
+
+
+%%% =========================================================
+%%% Function:    get_admin_state/0, get_admin_state/1, get_admin_state/2
+%%%              get_admin_state()
+%%%              get_admin_state(Port)
+%%%              get_admin_state(Addr,Port)
+%%%
+%%% Returns:     {ok,State} | {error,Reason}
+%%%
+%%% Description: This function is used to retrieve the administrative
+%%%              state of the HTTP server.
+%%%
+%%% Types:       Port    -> integer()
+%%%              Addr    -> {A,B,C,D} | string() | undefined
+%%%              State   -> unblocked | shutting_down | blocked
+%%%              Reason  -> term()
+%%%
+get_admin_state()                        -> get_admin_state(undefined,8888).
+get_admin_state(Port) when integer(Port) -> get_admin_state(undefined,Port);
+
+get_admin_state(ConfigFile) when list(ConfigFile) ->
+    case get_addr_and_port(ConfigFile) of
+	{ok,Addr,Port} ->
+	    unblock(Addr,Port);
+	Error ->
+	    Error
+    end.
+
+get_admin_state(Addr,Port) when integer(Port) ->
+    Name = make_name(Addr,Port),
+    case whereis(Name) of
+	Pid when pid(Pid) ->
+	    httpd_manager:get_admin_state(Pid);
+	_ ->
+	    {error,not_started}
+    end.
+
+
+
+%%% =========================================================
+%%% Function:    get_usage_state/0, get_usage_state/1, get_usage_state/2
+%%%              get_usage_state()
+%%%              get_usage_state(Port)
+%%%              get_usage_state(Addr,Port)
+%%%
+%%% Returns:     {ok,State} | {error,Reason}
+%%%
+%%% Description: This function is used to retrieve the usage
+%%%              state of the HTTP server.
+%%%
+%%% Types:       Port    -> integer()
+%%%              Addr    -> {A,B,C,D} | string() | undefined
+%%%              State   -> idle | active | busy
+%%%              Reason  -> term()
+%%%
+get_usage_state()                        -> get_usage_state(undefined,8888).
+get_usage_state(Port) when integer(Port) -> get_usage_state(undefined,Port);
+
+get_usage_state(ConfigFile) when list(ConfigFile) ->
+    case get_addr_and_port(ConfigFile) of
+	{ok,Addr,Port} ->
+	    unblock(Addr,Port);
+	Error ->
+	    Error
+    end.
+
+get_usage_state(Addr,Port) when integer(Port) ->
+    Name = make_name(Addr,Port),
+    case whereis(Name) of
+	Pid when pid(Pid) ->
+	    httpd_manager:get_usage_state(Pid);
+	_ ->
+	    {error,not_started}
+    end.
+
+
+
+%%% =========================================================
+%% Function:    get_status(ConfigFile)        -> Status
+%%              get_status(Port)              -> Status
+%%              get_status(Addr,Port)         -> Status
+%%              get_status(Port,Timeout)      -> Status
+%%              get_status(Addr,Port,Timeout) -> Status
+%%
+%% Arguments:   ConfigFile -> string()
+%%                            Configuration file from which Port and
+%%                            BindAddress will be extracted.
+%%              Addr       -> {A,B,C,D} | string()
+%%                            Bind Address of the http server
+%%              Port       -> integer()
+%%                            Port number of the http server
+%%              Timeout    -> integer()
+%%                            Timeout time for the call
+%%
+%% Returns:     Status -> list()
+%%
+%% Description: This function is used when the caller runs in the
+%%              same node as the http server or if calling with a
+%%              program such as erl_call (see erl_interface).
+%%
+
+get_status(ConfigFile) when list(ConfigFile) ->
+    case get_addr_and_port(ConfigFile) of
+	{ok,Addr,Port} ->
+	    get_status(Addr,Port);
+	Error ->
+	    Error
+    end;
+
+get_status(Port) when integer(Port) ->
+    get_status(undefined,Port,5000).
+
+get_status(Port,Timeout) when integer(Port), integer(Timeout) ->
+    get_status(undefined,Port,Timeout);
+
+get_status(Addr,Port) when list(Addr), integer(Port) ->
+    get_status(Addr,Port,5000).
+
+get_status(Addr,Port,Timeout) when integer(Port) ->
+    Name = make_name(Addr,Port),
+    case whereis(Name) of
+	Pid when pid(Pid) ->
+	    httpd_manager:get_status(Pid,Timeout);
+	_ ->
+	    not_started
+    end.
+
+
+%% load config
+
+load(ConfigFile) ->
+    httpd_conf:load(ConfigFile).
+
+load_mime_types(MimeTypesFile) ->
+    httpd_conf:load_mime_types(MimeTypesFile).
+
+
+%% parse_query
+
+parse_query(String) ->
+  {ok, SplitString} = regexp:split(String,"[&;]"),
+  foreach(SplitString).
+
+foreach([]) ->
+  [];
+foreach([KeyValue|Rest]) ->
+  {ok, Plus2Space, _} = regexp:gsub(KeyValue,"[\+]"," "),
+  case regexp:split(Plus2Space,"=") of
+    {ok,[Key|Value]} ->
+      [{httpd_util:decode_hex(Key),
+	httpd_util:decode_hex(lists:flatten(Value))}|foreach(Rest)];
+    {ok,_} ->
+      foreach(Rest)
+  end.
+
+
+%% get_addr_and_port
+
+get_addr_and_port(ConfigFile) ->
+    case httpd_conf:load(ConfigFile) of
+	{ok,ConfigList} ->
+	    Port = httpd_util:key1search(ConfigList,port,80),
+	    Addr = httpd_util:key1search(ConfigList,bind_address),
+	    {ok,Addr,Port};
+	Error ->
+	    Error
+    end.
+
+
+%% make_name
+
+make_name(Addr,Port) ->
+    httpd_util:make_name("httpd",Addr,Port).
+
+
+%% Multi stuff
+%%
+
+read_multi_file(File) ->
+    read_mfile(file:open(File,[read])).
+
+read_mfile({ok,Fd}) ->
+    read_mfile(read_line(Fd),Fd,[]);
+read_mfile(Error) ->
+    Error.
+
+read_mfile(eof,_Fd,SoFar) ->
+    {ok,lists:reverse(SoFar)};
+read_mfile({error,Reason},_Fd,SoFar) ->
+    {error,Reason};
+read_mfile([$#|Comment],Fd,SoFar) ->
+    read_mfile(read_line(Fd),Fd,SoFar);
+read_mfile([],Fd,SoFar) ->
+    read_mfile(read_line(Fd),Fd,SoFar);
+read_mfile(Line,Fd,SoFar) ->
+    read_mfile(read_line(Fd),Fd,[Line|SoFar]).
+
+read_line(Fd)      -> read_line1(io:get_line(Fd,[])).
+read_line1(eof)    -> eof;
+read_line1(String) -> httpd_conf:clean(String).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd.hrl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd.hrl
new file mode 100644
index 0000000000..015c1b1e2d
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd.hrl
@@ -0,0 +1,77 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd.hrl,v 1.1 2008/12/17 09:53:33 mikpe Exp $
+%%
+
+-include_lib("kernel/include/file.hrl").
+
+-ifndef(SERVER_SOFTWARE).
+-define(SERVER_SOFTWARE,"inets/develop").	% Define in Makefile!
+-endif.
+-define(SERVER_PROTOCOL,"HTTP/1.1").
+-define(SOCKET_CHUNK_SIZE,8192).
+-define(SOCKET_MAX_POLL,25).
+-define(FILE_CHUNK_SIZE,64*1024).
+-define(NICE(Reason),lists:flatten(atom_to_list(?MODULE)++": "++Reason)).
+-define(DEFAULT_CONTEXT,
+	[{errmsg,"[an error occurred while processing this directive]"},
+	 {timefmt,"%A, %d-%b-%y %T %Z"},
+	 {sizefmt,"abbrev"}]).
+
+
+-ifdef(inets_error).
+-define(ERROR(Format, Args), io:format("E(~p:~p:~p) : "++Format++"~n",
+				       [self(),?MODULE,?LINE]++Args)).
+-else.
+-define(ERROR(F,A),[]).
+-endif.
+
+-ifdef(inets_log).
+-define(LOG(Format, Args), io:format("L(~p:~p:~p) : "++Format++"~n",
+				     [self(),?MODULE,?LINE]++Args)).
+-else.
+-define(LOG(F,A),[]).
+-endif.
+
+-ifdef(inets_debug).
+-define(DEBUG(Format, Args), io:format("D(~p:~p:~p) : "++Format++"~n",
+				       [self(),?MODULE,?LINE]++Args)).
+-else.
+-define(DEBUG(F,A),[]).
+-endif.
+
+-ifdef(inets_cdebug).
+-define(CDEBUG(Format, Args), io:format("C(~p:~p:~p) : "++Format++"~n",
+				       [self(),?MODULE,?LINE]++Args)).
+-else.
+-define(CDEBUG(F,A),[]).
+-endif.
+
+
+-record(init_data,{peername,resolve}).
+-record(mod,{init_data,
+	     data=[],
+	     socket_type=ip_comm,
+	     socket,
+	     config_db,
+	     method,
+	     absolute_uri=[],
+	     request_uri,
+	     http_version,
+	     request_line,
+	     parsed_header=[],
+	     entity_body,
+	     connection}).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_acceptor.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_acceptor.erl
new file mode 100644
index 0000000000..7bf2d5d868
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_acceptor.erl
@@ -0,0 +1,174 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_acceptor.erl,v 1.1 2008/12/17 09:53:33 mikpe Exp $
+%%
+-module(httpd_acceptor).
+
+-include("httpd.hrl").
+-include("httpd_verbosity.hrl").
+
+
+%% External API
+-export([start_link/6]).
+
+%% Other exports (for spawn's etc.)
+-export([acceptor/4, acceptor/7]).
+
+
+%%
+%% External API
+%%
+
+%% start_link
+
+start_link(Manager, SocketType, Addr, Port, ConfigDb, Verbosity) ->
+    Args = [self(), Manager, SocketType, Addr, Port, ConfigDb, Verbosity],
+    proc_lib:start_link(?MODULE, acceptor, Args).
+
+
+acceptor(Parent, Manager, SocketType, Addr, Port, ConfigDb, Verbosity) ->
+    put(sname,acc),
+    put(verbosity,Verbosity),
+    ?vlog("starting",[]),
+    case (catch do_init(SocketType, Addr, Port)) of
+	{ok, ListenSocket} ->
+	    proc_lib:init_ack(Parent, {ok, self()}),
+	    acceptor(Manager, SocketType, ListenSocket, ConfigDb);
+	Error ->
+	    proc_lib:init_ack(Parent, Error),
+	    error
+    end.
+
+do_init(SocketType, Addr, Port) ->
+    do_socket_start(SocketType),
+    ListenSocket = do_socket_listen(SocketType, Addr, Port),
+    {ok, ListenSocket}.
+
+
+do_socket_start(SocketType) ->
+    case httpd_socket:start(SocketType) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    ?vinfo("failed socket start: ~p",[Reason]),
+	    throw({error, {socket_start_failed, Reason}})
+    end.
+
+
+do_socket_listen(SocketType, Addr, Port) ->
+    case httpd_socket:listen(SocketType, Addr, Port) of
+	{error, Reason} ->
+	    ?vinfo("failed socket listen operation: ~p", [Reason]),
+	    throw({error, {listen, Reason}});
+	ListenSocket ->
+	    ListenSocket
+    end.
+
+
+%% acceptor
+
+acceptor(Manager, SocketType, ListenSocket, ConfigDb) ->
+    ?vdebug("await connection",[]),
+    case (catch httpd_socket:accept(SocketType, ListenSocket, 30000)) of
+	{error, Reason} ->
+	    handle_error(Reason, ConfigDb, SocketType),
+	    ?MODULE:acceptor(Manager, SocketType, ListenSocket, ConfigDb);
+
+	{'EXIT', Reason} ->
+	    handle_error({'EXIT', Reason}, ConfigDb, SocketType),
+	    ?MODULE:acceptor(Manager, SocketType, ListenSocket, ConfigDb);
+
+	Socket ->
+	    handle_connection(Manager, ConfigDb, SocketType, Socket),
+	    ?MODULE:acceptor(Manager, SocketType, ListenSocket, ConfigDb)
+    end.
+
+
+handle_connection(Manager, ConfigDb, SocketType, Socket) ->
+    case httpd_request_handler:start_link(Manager, ConfigDb) of
+	{ok, Pid} ->
+	    httpd_socket:controlling_process(SocketType, Socket, Pid),
+	    httpd_request_handler:synchronize(Pid, SocketType, Socket);
+	{error, Reason} ->
+	    handle_connection_err(SocketType, Socket, ConfigDb, Reason)
+    end.
+
+
+handle_connection_err(SocketType, Socket, ConfigDb, Reason) ->
+    String =
+	lists:flatten(
+	  io_lib:format("failed starting request handler:~n   ~p", [Reason])),
+    report_error(ConfigDb, String),
+    httpd_socket:close(SocketType, Socket).
+
+
+handle_error(timeout, _, _) ->
+    ?vtrace("Accept timeout",[]),
+    ok;
+
+handle_error({enfile, _}, _, _) ->
+    ?vinfo("Accept error: enfile",[]),
+    %% Out of sockets...
+    sleep(200);
+
+handle_error(emfile, _, _) ->
+    ?vinfo("Accept error: emfile",[]),
+    %% Too many open files -> Out of sockets...
+    sleep(200);
+
+handle_error(closed, _, _) ->
+    ?vlog("Accept error: closed",[]),
+    %% This propably only means that the application is stopping,
+    %% but just in case
+    exit(closed);
+
+handle_error(econnaborted, _, _) ->
+    ?vlog("Accept aborted",[]),
+    ok;
+
+handle_error(esslaccept, _, _) ->
+    %% The user has selected to cancel the installation of
+    %% the certifikate, This is not a real error, so we do
+    %% not write an error message.
+    ok;
+
+handle_error({'EXIT', Reason}, ConfigDb, SocketType) ->
+    ?vinfo("Accept exit:~n   ~p",[Reason]),
+    String = lists:flatten(io_lib:format("Accept exit: ~p", [Reason])),
+    accept_failed(SocketType, ConfigDb, String);
+
+handle_error(Reason, ConfigDb, SocketType) ->
+    ?vinfo("Accept error:~n   ~p",[Reason]),
+    String = lists:flatten(io_lib:format("Accept error: ~p", [Reason])),
+    accept_failed(SocketType, ConfigDb, String).
+
+
+accept_failed(SocketType, ConfigDb, String) ->
+    error_logger:error_report(String),
+    mod_log:error_log(SocketType, undefined, ConfigDb,
+		      {0, "unknown"}, String),
+    mod_disk_log:error_log(SocketType, undefined, ConfigDb,
+			   {0, "unknown"}, String),
+    exit({accept_failed, String}).
+
+
+report_error(Db, String) ->
+    error_logger:error_report(String),
+    mod_log:report_error(Db, String),
+    mod_disk_log:report_error(Db, String).
+
+
+sleep(T) -> receive after T -> ok end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_acceptor_sup.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_acceptor_sup.erl
new file mode 100644
index 0000000000..86c31ad5df
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_acceptor_sup.erl
@@ -0,0 +1,116 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_acceptor_sup.erl,v 1.1 2008/12/17 09:53:33 mikpe Exp $
+%%
+%%----------------------------------------------------------------------
+%% Purpose: The top supervisor for the Megaco/H.248 application
+%%----------------------------------------------------------------------
+
+-module(httpd_acceptor_sup).
+
+-behaviour(supervisor).
+
+-include("httpd_verbosity.hrl").
+
+%% public
+-export([start/3, stop/1, init/1]).
+
+-export([start_acceptor/4, stop_acceptor/2]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% supervisor callback functions
+
+
+start(Addr, Port, AccSupVerbosity) ->
+    SupName = make_name(Addr, Port),
+    supervisor:start_link({local, SupName}, ?MODULE, [AccSupVerbosity]).
+
+stop(StartArgs) ->
+    ok.
+
+init([Verbosity]) -> % Supervisor
+    do_init(Verbosity);
+init(BadArg) ->
+    {error, {badarg, BadArg}}.
+
+do_init(Verbosity) ->
+    put(verbosity,?vvalidate(Verbosity)),
+    put(sname,acc_sup),
+    ?vlog("starting", []),
+    Flags     = {one_for_one, 500, 100},
+    KillAfter = timer:seconds(1),
+    Workers   = [],
+    {ok, {Flags, Workers}}.
+
+
+%%----------------------------------------------------------------------
+%% Function: [start|stop]_acceptor/5
+%% Description: Starts a [auth | security] worker (child) process
+%%----------------------------------------------------------------------
+
+start_acceptor(SocketType, Addr, Port, ConfigDb) ->
+    Verbosity = get_acc_verbosity(),
+    start_worker(httpd_acceptor, SocketType, Addr, Port,
+		 ConfigDb, Verbosity, self(), []).
+
+stop_acceptor(Addr, Port) ->
+    stop_worker(httpd_acceptor, Addr, Port).
+
+
+%%----------------------------------------------------------------------
+%% Function:    start_worker/5
+%% Description: Starts a (permanent) worker (child) process
+%%----------------------------------------------------------------------
+
+start_worker(M, SocketType, Addr, Port, ConfigDB, Verbosity, Manager,
+	     Modules) ->
+    SupName = make_name(Addr, Port),
+    Args    = [Manager, SocketType, Addr, Port, ConfigDB, Verbosity],
+    Spec    = {{M, Addr, Port},
+	       {M, start_link, Args},
+	       permanent, timer:seconds(1), worker, [M] ++ Modules},
+    supervisor:start_child(SupName, Spec).
+
+
+%%----------------------------------------------------------------------
+%% Function:    stop_permanent_worker/3
+%% Description: Stops a permanent worker (child) process
+%%----------------------------------------------------------------------
+
+stop_worker(M, Addr, Port) ->
+    SupName = make_name(Addr, Port),
+    Name    = {M, Addr, Port},
+    case supervisor:terminate_child(SupName, Name) of
+	ok ->
+	    supervisor:delete_child(SupName, Name);
+	Error ->
+	    Error
+    end.
+
+
+make_name(Addr,Port) ->
+    httpd_util:make_name("httpd_acc_sup",Addr,Port).
+
+
+
+get_acc_verbosity() ->
+    get_verbosity(get(acceptor_verbosity)).
+
+get_verbosity(undefined) ->
+    ?default_verbosity;
+get_verbosity(V) ->
+    ?vvalidate(V).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_conf.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_conf.erl
new file mode 100644
index 0000000000..69419b1eb3
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_conf.erl
@@ -0,0 +1,688 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_conf.erl,v 1.1 2008/12/17 09:53:33 mikpe Exp $
+%%
+-module(httpd_conf).
+-export([load/1, load_mime_types/1,
+	 load/2, store/1, store/2,
+	 remove_all/1, remove/1,
+	 is_directory/1, is_file/1,
+	 make_integer/1, clean/1, custom_clean/3, check_enum/2]).
+
+
+-define(VMODULE,"CONF").
+-include("httpd_verbosity.hrl").
+
+%% The configuration data is handled in three (3) phases:
+%% 1. Parse the config file and put all directives into a key-vale
+%%    tuple list (load/1).
+%% 2. Traverse the key-value tuple list store it into an ETS table.
+%%    Directives depending on other directives are taken care of here
+%%    (store/1).
+%% 3. Traverse the ETS table and do a complete clean-up (remove/1).
+
+-include("httpd.hrl").
+
+%%
+%% Phase 1: Load
+%%
+
+%% load
+
+load(ConfigFile) ->
+    ?CDEBUG("load -> ConfigFile: ~p",[ConfigFile]),
+    case read_config_file(ConfigFile) of
+	{ok, Config} ->
+	    case bootstrap(Config) of
+		{error, Reason} ->
+		    {error, Reason};
+		{ok, Modules} ->
+		    load_config(Config, lists:append(Modules, [?MODULE]))
+	    end;
+	{error, Reason} ->
+	    {error, ?NICE("Error while reading config file: "++Reason)}
+    end.
+
+
+bootstrap([]) ->
+    {error, ?NICE("Modules must be specified in the config file")};
+bootstrap([Line|Config]) ->
+    case Line of
+	[$M,$o,$d,$u,$l,$e,$s,$ |Modules] ->
+	    {ok, ModuleList} = regexp:split(Modules," "),
+	    TheMods = [list_to_atom(X) || X <- ModuleList],
+	    case verify_modules(TheMods) of
+		ok ->
+		    {ok, TheMods};
+		{error, Reason} ->
+		    ?ERROR("bootstrap -> : validation failed: ~p",[Reason]),
+		    {error, Reason}
+	    end;
+	_ ->
+	    bootstrap(Config)
+    end.
+
+
+%%
+%% verify_modules/1 -> ok | {error, Reason}
+%%
+%% Verifies that all specified modules are available.
+%%
+verify_modules([]) ->
+    ok;
+verify_modules([Mod|Rest]) ->
+    case code:which(Mod) of
+	non_existing ->
+	    {error, ?NICE(atom_to_list(Mod)++" does not exist")};
+	Path ->
+	    verify_modules(Rest)
+    end.
+
+%%
+%% read_config_file/1 -> {ok, [line(), line()..]} | {error, Reason}
+%%
+%% Reads the entire configuration file and returns list of strings or
+%% and error.
+%%
+
+
+read_config_file(FileName) ->
+    case file:open(FileName, [read]) of
+	{ok, Stream} ->
+	    read_config_file(Stream, []);
+	{error, Reason} ->
+	    {error, ?NICE("Cannot open "++FileName)}
+    end.
+
+read_config_file(Stream, SoFar) ->
+    case io:get_line(Stream, []) of
+	eof ->
+	    {ok, lists:reverse(SoFar)};
+	{error, Reason} ->
+	    {error, Reason};
+	[$#|Rest] ->
+	    %% Ignore commented lines for efficiency later ..
+	    read_config_file(Stream, SoFar);
+	Line ->
+	    {ok, NewLine, _}=regexp:sub(clean(Line),"[\t\r\f ]"," "),
+	    case NewLine of
+		[] ->
+		    %% Also ignore empty lines ..
+		    read_config_file(Stream, SoFar);
+		Other ->
+		    read_config_file(Stream, [NewLine|SoFar])
+	    end
+    end.
+
+is_exported(Module, ToFind) ->
+    Exports = Module:module_info(exports),
+    lists:member(ToFind, Exports).
+
+%%
+%% load/4 -> {ok, ConfigList} | {error, Reason}
+%%
+%% This loads the config file into each module specified by Modules
+%% Each module has its own context that is passed to and (optionally)
+%% returned by the modules load function. The module can also return
+%% a ConfigEntry, which will be added to the global configuration
+%% list.
+%% All configuration directives are guaranteed to be passed to all
+%% modules. Each module only implements the function clauses of
+%% the load function for the configuration directives it supports,
+%% it's ok if an apply returns {'EXIT', {function_clause, ..}}.
+%%
+load_config(Config, Modules) ->
+    %% Create default contexts for all modules
+    Contexts = lists:duplicate(length(Modules), []),
+    load_config(Config, Modules, Contexts, []).
+
+
+load_config([], _Modules, _Contexts, ConfigList) ->
+    case a_must(ConfigList, [server_name,port,server_root,document_root]) of
+	ok ->
+	    {ok, ConfigList};
+	{missing, Directive} ->
+	    {error, ?NICE(atom_to_list(Directive)++
+			  " must be specified in the config file")}
+    end;
+
+load_config([Line|Config], Modules, Contexts, ConfigList) ->
+    ?CDEBUG("load_config -> Line: ~p",[Line]),
+    case load_traverse(Line, Contexts, Modules, [], ConfigList, no) of
+	{ok, NewContexts, NewConfigList} ->
+	    load_config(Config, Modules, NewContexts, NewConfigList);
+	{error, Reason} ->
+	    ?ERROR("load_config -> traverse failed: ~p",[Reason]),
+	    {error, Reason}
+    end.
+
+
+load_traverse(Line, [], [], NewContexts, ConfigList, no) ->
+    ?CDEBUG("load_traverse/no -> ~n"
+	    "     Line:        ~p~n"
+	    "     NewContexts: ~p~n"
+	    "     ConfigList:  ~p",
+	    [Line,NewContexts,ConfigList]),
+    {error, ?NICE("Configuration directive not recognized: "++Line)};
+load_traverse(Line, [], [], NewContexts, ConfigList, yes) ->
+    ?CDEBUG("load_traverse/yes -> ~n"
+	    "     Line:        ~p~n"
+	    "     NewContexts: ~p~n"
+	    "     ConfigList:  ~p",
+	    [Line,NewContexts,ConfigList]),
+    {ok, lists:reverse(NewContexts), ConfigList};
+load_traverse(Line, [Context|Contexts], [Module|Modules], NewContexts, ConfigList, State) ->
+    ?CDEBUG("load_traverse/~p -> ~n"
+	    "     Line:        ~p~n"
+	    "     Module:      ~p~n"
+	    "     Context:     ~p~n"
+	    "     Contexts:    ~p~n"
+	    "     NewContexts: ~p",
+	    [State,Line,Module,Context,Contexts,NewContexts]),
+    case is_exported(Module, {load, 2}) of
+	true ->
+	    ?CDEBUG("load_traverse -> ~p:load/2 exported",[Module]),
+	    case catch apply(Module, load, [Line, Context]) of
+		{'EXIT', {function_clause, _}} ->
+		    ?CDEBUG("load_traverse -> exit: function_clause"
+			    "~n   Module: ~p"
+			    "~n   Line:   ~s",[Module,Line]),
+		    load_traverse(Line, Contexts, Modules, [Context|NewContexts], ConfigList, State);
+		{'EXIT', Reason} ->
+		    ?CDEBUG("load_traverse -> exit: ~p",[Reason]),
+		    error_logger:error_report({'EXIT', Reason}),
+		    load_traverse(Line, Contexts, Modules, [Context|NewContexts], ConfigList, State);
+		{ok, NewContext} ->
+		    ?CDEBUG("load_traverse -> ~n"
+			    "     NewContext: ~p",[NewContext]),
+		    load_traverse(Line, Contexts, Modules, [NewContext|NewContexts], ConfigList,yes);
+		{ok, NewContext, ConfigEntry} when tuple(ConfigEntry) ->
+		    ?CDEBUG("load_traverse (tuple) -> ~n"
+			    "     NewContext:  ~p~n"
+			    "     ConfigEntry: ~p",[NewContext,ConfigEntry]),
+		    load_traverse(Line, Contexts, Modules, [NewContext|NewContexts],
+				  [ConfigEntry|ConfigList], yes);
+		{ok, NewContext, ConfigEntry} when list(ConfigEntry) ->
+		    ?CDEBUG("load_traverse (list) -> ~n"
+			    "     NewContext:  ~p~n"
+			    "     ConfigEntry: ~p",[NewContext,ConfigEntry]),
+		    load_traverse(Line, Contexts, Modules, [NewContext|NewContexts],
+				  lists:append(ConfigEntry, ConfigList), yes);
+		{error, Reason} ->
+		    ?CDEBUG("load_traverse -> error: ~p",[Reason]),
+		    {error, Reason}
+	    end;
+	false ->
+	    ?CDEBUG("load_traverse -> ~p:load/2 not exported",[Module]),
+	    load_traverse(Line, Contexts, Modules, [Context|NewContexts],
+			  ConfigList,yes)
+    end.
+
+
+load(eof, []) ->
+    eof;
+
+load([$M,$a,$x,$H,$e,$a,$d,$e,$r,$S,$i,$z,$e,$ |MaxHeaderSize], []) ->
+    ?DEBUG("load -> MaxHeaderSize: ~p",[MaxHeaderSize]),
+    case make_integer(MaxHeaderSize) of
+        {ok, Integer} ->
+            {ok, [], {max_header_size,Integer}};
+        {error, _} ->
+            {error, ?NICE(clean(MaxHeaderSize)++
+                          " is an invalid number of MaxHeaderSize")}
+    end;
+load([$M,$a,$x,$H,$e,$a,$d,$e,$r,$A,$c,$t,$i,$o,$n,$ |Action], []) ->
+    ?DEBUG("load -> MaxHeaderAction: ~p",[Action]),
+    {ok, [], {max_header_action,list_to_atom(clean(Action))}};
+load([$M,$a,$x,$B,$o,$d,$y,$S,$i,$z,$e,$ |MaxBodySize], []) ->
+    ?DEBUG("load -> MaxBodySize: ~p",[MaxBodySize]),
+    case make_integer(MaxBodySize) of
+        {ok, Integer} ->
+            {ok, [], {max_body_size,Integer}};
+        {error, _} ->
+            {error, ?NICE(clean(MaxBodySize)++
+                          " is an invalid number of MaxBodySize")}
+    end;
+load([$M,$a,$x,$B,$o,$d,$y,$A,$c,$t,$i,$o,$n,$ |Action], []) ->
+    ?DEBUG("load -> MaxBodyAction: ~p",[Action]),
+    {ok, [], {max_body_action,list_to_atom(clean(Action))}};
+load([$S,$e,$r,$v,$e,$r,$N,$a,$m,$e,$ |ServerName], []) ->
+    ?DEBUG("load -> ServerName: ~p",[ServerName]),
+    {ok,[],{server_name,clean(ServerName)}};
+load([$S,$o,$c,$k,$e,$t,$T,$y,$p,$e,$ |SocketType], []) ->
+    ?DEBUG("load -> SocketType: ~p",[SocketType]),
+    case check_enum(clean(SocketType),["ssl","ip_comm"]) of
+	{ok, ValidSocketType} ->
+	    {ok, [], {com_type,ValidSocketType}};
+	{error,_} ->
+	    {error, ?NICE(clean(SocketType) ++ " is an invalid SocketType")}
+    end;
+load([$P,$o,$r,$t,$ |Port], []) ->
+    ?DEBUG("load -> Port: ~p",[Port]),
+    case make_integer(Port) of
+	{ok, Integer} ->
+	    {ok, [], {port,Integer}};
+	{error, _} ->
+	    {error, ?NICE(clean(Port)++" is an invalid Port")}
+    end;
+load([$B,$i,$n,$d,$A,$d,$d,$r,$e,$s,$s,$ |Address], []) ->
+    ?DEBUG("load -> Address:  ~p",[Address]),
+    case clean(Address) of
+	"*" ->
+	    {ok, [], {bind_address,any}};
+	CAddress ->
+	    ?CDEBUG("load -> CAddress:  ~p",[CAddress]),
+	    case inet:getaddr(CAddress,inet) of
+		{ok, IPAddr} ->
+		    ?CDEBUG("load -> IPAddr:  ~p",[IPAddr]),
+		    {ok, [], {bind_address,IPAddr}};
+		{error, _} ->
+		    {error, ?NICE(CAddress++" is an invalid address")}
+	    end
+    end;
+load([$K,$e,$e,$p,$A,$l,$i,$v,$e,$ |OnorOff], []) ->
+    case list_to_atom(clean(OnorOff)) of
+	off ->
+	    {ok, [], {persistent_conn, false}};
+	_ ->
+	    {ok, [], {persistent_conn, true}}
+    end;
+load([$M,$a,$x,$K,$e,$e,$p,$A,$l,$i,$v,$e,$R,$e,$q,$u,$e,$s,$t,$ |MaxRequests], []) ->
+    case make_integer(MaxRequests) of
+	{ok, Integer} ->
+	    {ok, [], {max_keep_alive_request, Integer}};
+	{error, _} ->
+	    {error, ?NICE(clean(MaxRequests)++" is an invalid MaxKeepAliveRequest")}
+    end;
+load([$K,$e,$e,$p,$A,$l,$i,$v,$e,$T,$i,$m,$e,$o,$u,$t,$ |Timeout], []) ->
+    case make_integer(Timeout) of
+	{ok, Integer} ->
+	    {ok, [], {keep_alive_timeout, Integer*1000}};
+	{error, _} ->
+	    {error, ?NICE(clean(Timeout)++" is an invalid KeepAliveTimeout")}
+    end;
+load([$M,$o,$d,$u,$l,$e,$s,$ |Modules], []) ->
+    {ok, ModuleList} = regexp:split(Modules," "),
+    {ok, [], {modules,[list_to_atom(X) || X <- ModuleList]}};
+load([$S,$e,$r,$v,$e,$r,$A,$d,$m,$i,$n,$ |ServerAdmin], []) ->
+    {ok, [], {server_admin,clean(ServerAdmin)}};
+load([$S,$e,$r,$v,$e,$r,$R,$o,$o,$t,$ |ServerRoot], []) ->
+    case is_directory(clean(ServerRoot)) of
+	{ok, Directory} ->
+	    MimeTypesFile =
+		filename:join([clean(ServerRoot),"conf", "mime.types"]),
+	    case load_mime_types(MimeTypesFile) of
+		{ok, MimeTypesList} ->
+		    {ok, [], [{server_root,string:strip(Directory,right,$/)},
+			      {mime_types,MimeTypesList}]};
+		{error, Reason} ->
+		    {error, Reason}
+	    end;
+	{error, _} ->
+	    {error, ?NICE(clean(ServerRoot)++" is an invalid ServerRoot")}
+    end;
+load([$M,$a,$x,$C,$l,$i,$e,$n,$t,$s,$ |MaxClients], []) ->
+    ?DEBUG("load -> MaxClients: ~p",[MaxClients]),
+    case make_integer(MaxClients) of
+	{ok, Integer} ->
+	    {ok, [], {max_clients,Integer}};
+	{error, _} ->
+	    {error, ?NICE(clean(MaxClients)++" is an invalid number of MaxClients")}
+    end;
+load([$D,$o,$c,$u,$m,$e,$n,$t,$R,$o,$o,$t,$ |DocumentRoot],[]) ->
+    case is_directory(clean(DocumentRoot)) of
+	{ok, Directory} ->
+	    {ok, [], {document_root,string:strip(Directory,right,$/)}};
+	{error, _} ->
+	    {error, ?NICE(clean(DocumentRoot)++"is an invalid DocumentRoot")}
+    end;
+load([$D,$e,$f,$a,$u,$l,$t,$T,$y,$p,$e,$ |DefaultType], []) ->
+    {ok, [], {default_type,clean(DefaultType)}};
+load([$S,$S,$L,$C,$e,$r,$t,$i,$f,$i,$c,$a,$t,$e,$F,$i,$l,$e,$ | SSLCertificateFile], []) ->
+    ?DEBUG("load -> SSLCertificateFile: ~p",[SSLCertificateFile]),
+    case is_file(clean(SSLCertificateFile)) of
+	{ok, File} ->
+	    {ok, [], {ssl_certificate_file,File}};
+    {error, _} ->
+	    {error, ?NICE(clean(SSLCertificateFile)++
+			  " is an invalid SSLCertificateFile")}
+    end;
+load([$S,$S,$L,$C,$e,$r,$t,$i,$f,$i,$c,$a,$t,$e,$K,$e,$y,$F,$i,$l,$e,$ |
+      SSLCertificateKeyFile], []) ->
+    ?DEBUG("load -> SSLCertificateKeyFile: ~p",[SSLCertificateKeyFile]),
+    case is_file(clean(SSLCertificateKeyFile)) of
+	{ok, File} ->
+	    {ok, [], {ssl_certificate_key_file,File}};
+	{error, _} ->
+	    {error, ?NICE(clean(SSLCertificateKeyFile)++
+			  " is an invalid SSLCertificateKeyFile")}
+    end;
+load([$S,$S,$L,$V,$e,$r,$i,$f,$y,$C,$l,$i,$e,$n,$t,$ |SSLVerifyClient], []) ->
+    ?DEBUG("load -> SSLVerifyClient: ~p",[SSLVerifyClient]),
+    case make_integer(clean(SSLVerifyClient)) of
+	{ok, Integer} when Integer >=0,Integer =< 2 ->
+	    {ok, [], {ssl_verify_client,Integer}};
+	{ok, Integer} ->
+	    {error,?NICE(clean(SSLVerifyClient)++" is an invalid SSLVerifyClient")};
+	{error, nomatch} ->
+	    {error,?NICE(clean(SSLVerifyClient)++" is an invalid SSLVerifyClient")}
+    end;
+load([$S,$S,$L,$V,$e,$r,$i,$f,$y,$D,$e,$p,$t,$h,$ |
+      SSLVerifyDepth], []) ->
+    ?DEBUG("load -> SSLVerifyDepth: ~p",[SSLVerifyDepth]),
+    case make_integer(clean(SSLVerifyDepth)) of
+	{ok, Integer} when Integer > 0 ->
+	    {ok, [], {ssl_verify_client_depth,Integer}};
+	{ok, Integer} ->
+	    {error,?NICE(clean(SSLVerifyDepth) ++
+			 " is an invalid SSLVerifyDepth")};
+	{error, nomatch} ->
+	    {error,?NICE(clean(SSLVerifyDepth) ++
+			 " is an invalid SSLVerifyDepth")}
+    end;
+load([$S,$S,$L,$C,$i,$p,$h,$e,$r,$s,$ | SSLCiphers], []) ->
+    ?DEBUG("load -> SSLCiphers: ~p",[SSLCiphers]),
+    {ok, [], {ssl_ciphers, clean(SSLCiphers)}};
+load([$S,$S,$L,$C,$A,$C,$e,$r,$t,$i,$f,$i,$c,$a,$t,$e,$F,$i,$l,$e,$ |
+      SSLCACertificateFile], []) ->
+    case is_file(clean(SSLCACertificateFile)) of
+	{ok, File} ->
+	    {ok, [], {ssl_ca_certificate_file,File}};
+	{error, _} ->
+	    {error, ?NICE(clean(SSLCACertificateFile)++
+			  " is an invalid SSLCACertificateFile")}
+    end;
+load([$S,$S,$L,$P,$a,$s,$s,$w,$o,$r,$d,$C,$a,$l,$l,$b,$a,$c,$k,$M,$o,$d,$u,$l,$e,$ | SSLPasswordCallbackModule], []) ->
+    ?DEBUG("load -> SSLPasswordCallbackModule: ~p",
+	   [SSLPasswordCallbackModule]),
+    {ok, [], {ssl_password_callback_module,
+	      list_to_atom(clean(SSLPasswordCallbackModule))}};
+load([$S,$S,$L,$P,$a,$s,$s,$w,$o,$r,$d,$C,$a,$l,$l,$b,$a,$c,$k,$F,$u,$n,$c,$t,$i,$o,$n,$ | SSLPasswordCallbackFunction], []) ->
+    ?DEBUG("load -> SSLPasswordCallbackFunction: ~p",
+	   [SSLPasswordCallbackFunction]),
+    {ok, [], {ssl_password_callback_function,
+	      list_to_atom(clean(SSLPasswordCallbackFunction))}}.
+
+
+%%
+%% load_mime_types/1 -> {ok, MimeTypes} | {error, Reason}
+%%
+load_mime_types(MimeTypesFile) ->
+    case file:open(MimeTypesFile, [read]) of
+	{ok, Stream} ->
+	    parse_mime_types(Stream, []);
+	{error, _} ->
+	    {error, ?NICE("Can't open " ++ MimeTypesFile)}
+    end.
+
+parse_mime_types(Stream,MimeTypesList) ->
+    Line=
+	case io:get_line(Stream,'') of
+	    eof ->
+		eof;
+	    String ->
+		clean(String)
+	end,
+    parse_mime_types(Stream, MimeTypesList, Line).
+
+parse_mime_types(Stream, MimeTypesList, eof) ->
+    file:close(Stream),
+    {ok, MimeTypesList};
+parse_mime_types(Stream, MimeTypesList, "") ->
+    parse_mime_types(Stream, MimeTypesList);
+parse_mime_types(Stream, MimeTypesList, [$#|_]) ->
+    parse_mime_types(Stream, MimeTypesList);
+parse_mime_types(Stream, MimeTypesList, Line) ->
+    case regexp:split(Line, " ") of
+	{ok, [NewMimeType|Suffixes]} ->
+	    parse_mime_types(Stream,lists:append(suffixes(NewMimeType,Suffixes),
+						 MimeTypesList));
+	{ok, _} ->
+	    {error, ?NICE(Line)}
+    end.
+
+suffixes(MimeType,[]) ->
+    [];
+suffixes(MimeType,[Suffix|Rest]) ->
+    [{Suffix,MimeType}|suffixes(MimeType,Rest)].
+
+%%
+%% Phase 2: Store
+%%
+
+%% store
+
+store(ConfigList) ->
+    Modules = httpd_util:key1search(ConfigList, modules, []),
+    Port = httpd_util:key1search(ConfigList, port),
+    Addr = httpd_util:key1search(ConfigList,bind_address),
+    Name = httpd_util:make_name("httpd_conf",Addr,Port),
+    ?CDEBUG("store -> Name = ~p",[Name]),
+    ConfigDB = ets:new(Name, [named_table, bag, protected]),
+    ?CDEBUG("store -> ConfigDB = ~p",[ConfigDB]),
+    store(ConfigDB, ConfigList, lists:append(Modules,[?MODULE]),ConfigList).
+
+store(ConfigDB, ConfigList, Modules,[]) ->
+    ?vtrace("store -> done",[]),
+    ?CDEBUG("store -> done",[]),
+    {ok, ConfigDB};
+store(ConfigDB, ConfigList, Modules, [ConfigListEntry|Rest]) ->
+    ?vtrace("store -> entry with"
+	    "~n   ConfigListEntry: ~p",[ConfigListEntry]),
+    ?CDEBUG("store -> "
+	"~n   ConfigListEntry: ~p",[ConfigListEntry]),
+    case store_traverse(ConfigListEntry,ConfigList,Modules) of
+	{ok, ConfigDBEntry} when tuple(ConfigDBEntry) ->
+	    ?vtrace("store -> ConfigDBEntry(tuple): "
+		    "~n   ~p",[ConfigDBEntry]),
+	    ?CDEBUG("store -> ConfigDBEntry(tuple): "
+		    "~n   ~p",[ConfigDBEntry]),
+	    ets:insert(ConfigDB,ConfigDBEntry),
+	    store(ConfigDB,ConfigList,Modules,Rest);
+	{ok, ConfigDBEntry} when list(ConfigDBEntry) ->
+	    ?vtrace("store -> ConfigDBEntry(list): "
+		    "~n   ~p",[ConfigDBEntry]),
+	    ?CDEBUG("store -> ConfigDBEntry(list): "
+		"~n   ~p",[ConfigDBEntry]),
+	    lists:foreach(fun(Entry) ->
+				  ets:insert(ConfigDB,Entry)
+			  end,ConfigDBEntry),
+	    store(ConfigDB,ConfigList,Modules,Rest);
+	{error, Reason} ->
+	    ?vlog("store -> error: ~p",[Reason]),
+	    ?ERROR("store -> error: ~p",[Reason]),
+	    {error,Reason}
+    end.
+
+store_traverse(ConfigListEntry,ConfigList,[]) ->
+    {error,?NICE("Unable to store configuration...")};
+store_traverse(ConfigListEntry, ConfigList, [Module|Rest]) ->
+    case is_exported(Module, {store, 2}) of
+	true ->
+	    ?CDEBUG("store_traverse -> call ~p:store/2",[Module]),
+	    case catch apply(Module,store,[ConfigListEntry, ConfigList]) of
+		{'EXIT',{function_clause,_}} ->
+		    ?CDEBUG("store_traverse -> exit: function_clause",[]),
+		    store_traverse(ConfigListEntry,ConfigList,Rest);
+		{'EXIT',Reason} ->
+		    ?ERROR("store_traverse -> exit: ~p",[Reason]),
+		    error_logger:error_report({'EXIT',Reason}),
+		    store_traverse(ConfigListEntry,ConfigList,Rest);
+		Result ->
+		    ?CDEBUG("store_traverse -> ~n"
+			    "      Result: ~p",[Result]),
+		    Result
+	    end;
+	false ->
+	    store_traverse(ConfigListEntry,ConfigList,Rest)
+    end.
+
+store({mime_types,MimeTypesList},ConfigList) ->
+    Port = httpd_util:key1search(ConfigList, port),
+    Addr = httpd_util:key1search(ConfigList, bind_address),
+    Name = httpd_util:make_name("httpd_mime",Addr,Port),
+    ?CDEBUG("store(mime_types) -> Name: ~p",[Name]),
+    {ok, MimeTypesDB} = store_mime_types(Name,MimeTypesList),
+    ?CDEBUG("store(mime_types) -> ~n"
+	    "     MimeTypesDB:      ~p~n"
+	    "     MimeTypesDB info: ~p",
+	    [MimeTypesDB,ets:info(MimeTypesDB)]),
+    {ok, {mime_types,MimeTypesDB}};
+store(ConfigListEntry,ConfigList) ->
+    ?CDEBUG("store/2 -> ~n"
+	    "        ConfigListEntry: ~p~n"
+	    "        ConfigList:      ~p",
+	    [ConfigListEntry,ConfigList]),
+    {ok, ConfigListEntry}.
+
+
+%% store_mime_types
+store_mime_types(Name,MimeTypesList) ->
+    ?CDEBUG("store_mime_types -> Name: ~p",[Name]),
+    MimeTypesDB = ets:new(Name, [set, protected]),
+    ?CDEBUG("store_mime_types -> MimeTypesDB: ~p",[MimeTypesDB]),
+    store_mime_types1(MimeTypesDB, MimeTypesList).
+
+store_mime_types1(MimeTypesDB,[]) ->
+    {ok, MimeTypesDB};
+store_mime_types1(MimeTypesDB,[Type|Rest]) ->
+    ?CDEBUG("store_mime_types1 -> Type: ~p",[Type]),
+    ets:insert(MimeTypesDB, Type),
+    store_mime_types1(MimeTypesDB, Rest).
+
+
+%%
+%% Phase 3: Remove
+%%
+
+remove_all(ConfigDB) ->
+    Modules = httpd_util:lookup(ConfigDB,modules,[]),
+    remove_traverse(ConfigDB, lists:append(Modules,[?MODULE])).
+
+remove_traverse(ConfigDB,[]) ->
+    ?vtrace("remove_traverse -> done", []),
+    ok;
+remove_traverse(ConfigDB,[Module|Rest]) ->
+    ?vtrace("remove_traverse -> call ~p:remove", [Module]),
+    case (catch apply(Module,remove,[ConfigDB])) of
+	{'EXIT',{undef,_}} ->
+	    ?vtrace("remove_traverse -> undef", []),
+	    remove_traverse(ConfigDB,Rest);
+	{'EXIT',{function_clause,_}} ->
+	    ?vtrace("remove_traverse -> function_clause", []),
+	    remove_traverse(ConfigDB,Rest);
+	{'EXIT',Reason} ->
+	    ?vtrace("remove_traverse -> exit: ~p", [Reason]),
+	    error_logger:error_report({'EXIT',Reason}),
+	    remove_traverse(ConfigDB,Rest);
+	{error,Reason} ->
+	    ?vtrace("remove_traverse -> error: ~p", [Reason]),
+	    error_logger:error_report(Reason),
+	    remove_traverse(ConfigDB,Rest);
+	_ ->
+	    remove_traverse(ConfigDB,Rest)
+    end.
+
+remove(ConfigDB) ->
+    ets:delete(ConfigDB),
+    ok.
+
+
+%%
+%% Utility functions
+%%
+
+%% is_directory
+
+is_directory(Directory) ->
+    case file:read_file_info(Directory) of
+	{ok,FileInfo} ->
+	    #file_info{type = Type, access = Access} = FileInfo,
+	    is_directory(Type,Access,FileInfo,Directory);
+	{error,Reason} ->
+	    {error,Reason}
+    end.
+
+is_directory(directory,read,_FileInfo,Directory) ->
+    {ok,Directory};
+is_directory(directory,read_write,_FileInfo,Directory) ->
+    {ok,Directory};
+is_directory(_Type,_Access,FileInfo,_Directory) ->
+    {error,FileInfo}.
+
+
+%% is_file
+
+is_file(File) ->
+    case file:read_file_info(File) of
+	{ok,FileInfo} ->
+	    #file_info{type = Type, access = Access} = FileInfo,
+	    is_file(Type,Access,FileInfo,File);
+	{error,Reason} ->
+	    {error,Reason}
+    end.
+
+is_file(regular,read,_FileInfo,File) ->
+    {ok,File};
+is_file(regular,read_write,_FileInfo,File) ->
+    {ok,File};
+is_file(_Type,_Access,FileInfo,_File) ->
+    {error,FileInfo}.
+
+%% make_integer
+
+make_integer(String) ->
+    case regexp:match(clean(String),"[0-9]+") of
+	{match, _, _} ->
+	    {ok, list_to_integer(clean(String))};
+	nomatch ->
+	    {error, nomatch}
+    end.
+
+
+%% clean
+
+clean(String) ->
+    {ok,CleanedString,_} = regexp:gsub(String, "^[ \t\n\r\f]*|[ \t\n\r\f]*\$",""),
+    CleanedString.
+
+%% custom_clean
+
+custom_clean(String,MoreBefore,MoreAfter) ->
+    {ok,CleanedString,_}=regexp:gsub(String,"^[ \t\n\r\f"++MoreBefore++
+				     "]*|[ \t\n\r\f"++MoreAfter++"]*\$",""),
+    CleanedString.
+
+%% check_enum
+
+check_enum(Enum,[]) ->
+    {error, not_valid};
+check_enum(Enum,[Enum|Rest]) ->
+    {ok, list_to_atom(Enum)};
+check_enum(Enum, [NotValid|Rest]) ->
+    check_enum(Enum, Rest).
+
+%% a_must
+
+a_must(ConfigList,[]) ->
+    ok;
+a_must(ConfigList,[Directive|Rest]) ->
+    case httpd_util:key1search(ConfigList,Directive) of
+	undefined ->
+	    {missing,Directive};
+	_ ->
+	    a_must(ConfigList,Rest)
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_example.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_example.erl
new file mode 100644
index 0000000000..4aec440db3
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_example.erl
@@ -0,0 +1,134 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_example.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+-module(httpd_example).
+-export([print/1]).
+-export([get/2, post/2, yahoo/2, test1/2]).
+
+-export([newformat/3]).
+%% These are used by the inets test-suite
+-export([delay/1]).
+
+
+print(String) ->
+  [header(),
+   top("Print"),
+   String++"\n",
+   footer()].
+
+
+test1(Env, []) ->
+    io:format("Env:~p~n",[Env]),
+    ["<html>",
+     "<head>",
+     "<title>Test1</title>",
+     "</head>",
+     "<body>",
+     "<h1>Erlang Body</h1>",
+     "<h2>Stuff</h2>",
+     "</body>",
+     "</html>"].
+
+
+get(Env,[]) ->
+  [header(),
+   top("GET Example"),
+   "<FORM ACTION=\"/cgi-bin/erl/httpd_example:get\" METHOD=GET>
+<B>Input:</B> <INPUT TYPE=\"text\" NAME=\"input1\">
+<INPUT TYPE=\"text\" NAME=\"input2\">
+<INPUT TYPE=\"submit\"><BR>
+</FORM>" ++ "\n",
+   footer()];
+
+get(Env,Input) ->
+  default(Env,Input).
+
+post(Env,[]) ->
+  [header(),
+   top("POST Example"),
+   "<FORM ACTION=\"/cgi-bin/erl/httpd_example:post\" METHOD=POST>
+<B>Input:</B> <INPUT TYPE=\"text\" NAME=\"input1\">
+<INPUT TYPE=\"text\" NAME=\"input2\">
+<INPUT TYPE=\"submit\"><BR>
+</FORM>" ++ "\n",
+   footer()];
+
+post(Env,Input) ->
+  default(Env,Input).
+
+yahoo(Env,Input) ->
+  "Location: http://www.yahoo.com\r\n\r\n".
+
+default(Env,Input) ->
+  [header(),
+   top("Default Example"),
+   "<B>Environment:</B> ",io_lib:format("~p",[Env]),"<BR>\n",
+   "<B>Input:</B> ",Input,"<BR>\n",
+   "<B>Parsed Input:</B> ",
+   io_lib:format("~p",[httpd:parse_query(Input)]),"\n",
+   footer()].
+
+header() ->
+  header("text/html").
+header(MimeType) ->
+  "Content-type: " ++ MimeType ++ "\r\n\r\n".
+
+top(Title) ->
+  "<HTML>
+<HEAD>
+<TITLE>" ++ Title ++ "</TITLE>
+</HEAD>
+<BODY>\n".
+
+footer() ->
+  "</BODY>
+</HTML>\n".
+
+
+newformat(SessionID,Env,Input)->
+    mod_esi:deliver(SessionID,"Content-Type:text/html\r\n\r\n"),
+    mod_esi:deliver(SessionID,top("new esi format test")),
+    mod_esi:deliver(SessionID,"This new format is nice<BR>"),
+    mod_esi:deliver(SessionID,"This new format is nice<BR>"),
+    mod_esi:deliver(SessionID,"This new format is nice<BR>"),
+    mod_esi:deliver(SessionID,footer()).
+
+%% ------------------------------------------------------
+
+delay(Time) when integer(Time) ->
+    i("httpd_example:delay(~p) -> do the delay",[Time]),
+    sleep(Time),
+    i("httpd_example:delay(~p) -> done, now reply",[Time]),
+    delay_reply("delay ok");
+delay(Time) when list(Time) ->
+    delay(httpd_conf:make_integer(Time));
+delay({ok,Time}) when integer(Time) ->
+    delay(Time);
+delay({error,_Reason}) ->
+    i("delay -> called with invalid time"),
+    delay_reply("delay failed: invalid delay time").
+
+delay_reply(Reply) ->
+    [header(),
+     top("delay"),
+     Reply,
+     footer()].
+
+i(F)   -> i(F,[]).
+i(F,A) -> io:format(F ++ "~n",A).
+
+sleep(T) -> receive after T -> ok end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_manager.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_manager.erl
new file mode 100644
index 0000000000..704cb1f319
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_manager.erl
@@ -0,0 +1,1029 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_manager.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+
+-module(httpd_manager).
+
+-include("httpd.hrl").
+-include("httpd_verbosity.hrl").
+
+-behaviour(gen_server).
+
+%% External API
+-export([start/2, start/3, start_link/2, start_link/3, stop/1, restart/1]).
+
+%% Internal API
+-export([new_connection/1, done_connection/1]).
+
+%% Module API
+-export([config_lookup/2, config_lookup/3,
+	 config_multi_lookup/2, config_multi_lookup/3,
+	 config_match/2, config_match/3]).
+
+%% gen_server exports
+-export([init/1,
+	 handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2,
+         code_change/3]).
+
+
+%% Management exports
+-export([block/2, block/3, unblock/1]).
+-export([get_admin_state/1, get_usage_state/1]).
+-export([is_busy/1,is_busy/2,is_busy_or_blocked/1,is_blocked/1]). %% ???????
+-export([get_status/1, get_status/2]).
+-export([verbosity/2, verbosity/3]).
+
+
+-export([c/1]).
+
+-record(state,{socket_type  = ip_comm,
+	       config_file,
+	       config_db    = null,
+	       connections, %% Current request handlers
+	       admin_state  = unblocked,
+	       blocker_ref  = undefined,
+	       blocking_tmr = undefined,
+	       status       = []}).
+
+
+c(Port) ->
+    Ref = httpd_util:make_name("httpd",undefined,Port),
+    gen_server:call(Ref, fake_close).
+
+
+%%
+%% External API
+%%
+
+start(ConfigFile, ConfigList) ->
+    start(ConfigFile, ConfigList, []).
+
+start(ConfigFile, ConfigList, Verbosity) ->
+    Port = httpd_util:key1search(ConfigList,port,80),
+    Addr = httpd_util:key1search(ConfigList,bind_address),
+    Name = make_name(Addr,Port),
+    ?LOG("start -> Name = ~p",[Name]),
+    gen_server:start({local,Name},?MODULE,
+		     [ConfigFile, ConfigList, Addr, Port, Verbosity],[]).
+
+start_link(ConfigFile, ConfigList) ->
+    start_link(ConfigFile, ConfigList, []).
+
+start_link(ConfigFile, ConfigList, Verbosity) ->
+    Port = httpd_util:key1search(ConfigList,port,80),
+    Addr = httpd_util:key1search(ConfigList,bind_address),
+    Name = make_name(Addr,Port),
+    ?LOG("start_link -> Name = ~p",[Name]),
+    gen_server:start_link({local, Name},?MODULE,
+			  [ConfigFile, ConfigList, Addr, Port, Verbosity],[]).
+
+%% stop
+
+stop(ServerRef) ->
+    gen_server:call(ServerRef, stop).
+
+%% restart
+
+restart(ServerRef) ->
+    gen_server:call(ServerRef, restart).
+
+
+%%%----------------------------------------------------------------
+
+block(ServerRef, disturbing) ->
+    call(ServerRef,block);
+
+block(ServerRef, non_disturbing) ->
+    do_block(ServerRef, non_disturbing, infinity).
+
+block(ServerRef, Method, Timeout) ->
+    do_block(ServerRef, Method, Timeout).
+
+
+%% The reason for not using call here, is that the manager cannot
+%% _wait_ for completion of the requests. It must be able to do
+%% do other things at the same time as the blocking goes on.
+do_block(ServerRef, Method, infinity) ->
+    Ref = make_ref(),
+    cast(ServerRef, {block, Method, infinity, self(), Ref}),
+    receive
+	{block_reply, Reply, Ref} ->
+	    Reply
+    end;
+do_block(ServerRef,Method,Timeout) when Timeout > 0 ->
+    Ref = make_ref(),
+    cast(ServerRef,{block,Method,Timeout,self(),Ref}),
+    receive
+	{block_reply,Reply,Ref} ->
+	    Reply
+    end.
+
+
+%%%----------------------------------------------------------------
+
+%% unblock
+
+unblock(ServerRef) ->
+    call(ServerRef,unblock).
+
+%% get admin/usage state
+
+get_admin_state(ServerRef) ->
+    call(ServerRef,get_admin_state).
+
+get_usage_state(ServerRef) ->
+    call(ServerRef,get_usage_state).
+
+
+%% get_status
+
+get_status(ServerRef) ->
+    gen_server:call(ServerRef,get_status).
+
+get_status(ServerRef,Timeout) ->
+    gen_server:call(ServerRef,get_status,Timeout).
+
+
+verbosity(ServerRef,Verbosity) ->
+    verbosity(ServerRef,all,Verbosity).
+
+verbosity(ServerRef,all,Verbosity) ->
+    gen_server:call(ServerRef,{verbosity,all,Verbosity});
+verbosity(ServerRef,manager,Verbosity) ->
+    gen_server:call(ServerRef,{verbosity,manager,Verbosity});
+verbosity(ServerRef,request,Verbosity) ->
+    gen_server:call(ServerRef,{verbosity,request,Verbosity});
+verbosity(ServerRef,acceptor,Verbosity) ->
+    gen_server:call(ServerRef,{verbosity,acceptor,Verbosity});
+verbosity(ServerRef,security,Verbosity) ->
+    gen_server:call(ServerRef,{verbosity,security,Verbosity});
+verbosity(ServerRef,auth,Verbosity) ->
+    gen_server:call(ServerRef,{verbosity,auth,Verbosity}).
+
+%%
+%% Internal API
+%%
+
+
+%% new_connection
+
+new_connection(Manager) ->
+    gen_server:call(Manager, {new_connection, self()}).
+
+%% done
+
+done_connection(Manager) ->
+    gen_server:cast(Manager, {done_connection, self()}).
+
+
+%% is_busy(ServerRef) -> true | false
+%%
+%% Tests if the server is (in usage state) busy,
+%% i.e. has rached the heavy load limit.
+%%
+
+is_busy(ServerRef) ->
+    gen_server:call(ServerRef,is_busy).
+
+is_busy(ServerRef,Timeout) ->
+    gen_server:call(ServerRef,is_busy,Timeout).
+
+
+%% is_busy_or_blocked(ServerRef) -> busy | blocked | false
+%%
+%% Tests if the server is busy (usage state), i.e. has rached,
+%% the heavy load limit, or blocked (admin state) .
+%%
+
+is_busy_or_blocked(ServerRef) ->
+    gen_server:call(ServerRef,is_busy_or_blocked).
+
+
+%% is_blocked(ServerRef) -> true | false
+%%
+%% Tests if the server is blocked (admin state) .
+%%
+
+is_blocked(ServerRef) ->
+    gen_server:call(ServerRef,is_blocked).
+
+
+%%
+%% Module API. Theese functions are intended for use from modules only.
+%%
+
+config_lookup(Port, Query) ->
+    config_lookup(undefined, Port, Query).
+config_lookup(Addr, Port, Query) ->
+    Name = httpd_util:make_name("httpd",Addr,Port),
+    gen_server:call(whereis(Name), {config_lookup, Query}).
+
+config_multi_lookup(Port, Query) ->
+    config_multi_lookup(undefined,Port,Query).
+config_multi_lookup(Addr,Port, Query) ->
+    Name = httpd_util:make_name("httpd",Addr,Port),
+    gen_server:call(whereis(Name), {config_multi_lookup, Query}).
+
+config_match(Port, Pattern) ->
+    config_match(undefined,Port,Pattern).
+config_match(Addr, Port, Pattern) ->
+    Name = httpd_util:make_name("httpd",Addr,Port),
+    gen_server:call(whereis(Name), {config_match, Pattern}).
+
+
+%%
+%% Server call-back functions
+%%
+
+%% init
+
+init([ConfigFile, ConfigList, Addr, Port, Verbosity]) ->
+    process_flag(trap_exit, true),
+    case (catch do_init(ConfigFile, ConfigList, Addr, Port, Verbosity)) of
+	{error, Reason} ->
+	    ?vlog("failed starting server: ~p", [Reason]),
+	    {stop, Reason};
+	{ok, State} ->
+	    {ok, State}
+    end.
+
+
+do_init(ConfigFile, ConfigList, Addr, Port, Verbosity) ->
+    put(sname,man),
+    set_verbosity(Verbosity),
+    ?vlog("starting",[]),
+    ConfigDB   = do_initial_store(ConfigList),
+    ?vtrace("config db: ~p", [ConfigDB]),
+    SocketType = httpd_socket:config(ConfigDB),
+    ?vtrace("socket type: ~p, now start acceptor", [SocketType]),
+    case httpd_acceptor_sup:start_acceptor(SocketType, Addr, Port, ConfigDB) of
+	{ok, Pid} ->
+	    ?vtrace("acceptor started: ~p", [Pid]),
+	    Status = [{max_conn,0}, {last_heavy_load,never},
+		      {last_connection,never}],
+	    State  = #state{socket_type = SocketType,
+			    config_file = ConfigFile,
+			    config_db   = ConfigDB,
+			    connections = [],
+			    status      = Status},
+	    ?vdebug("started",[]),
+	    {ok, State};
+	Else ->
+	    Else
+    end.
+
+
+do_initial_store(ConfigList) ->
+    case httpd_conf:store(ConfigList) of
+	{ok, ConfigDB} ->
+	    ConfigDB;
+	{error, Reason} ->
+	    ?vinfo("failed storing configuration: ~p",[Reason]),
+	    throw({error, Reason})
+    end.
+
+
+
+%% handle_call
+
+handle_call(stop, _From, State) ->
+    ?vlog("stop",[]),
+    {stop, normal, ok, State};
+
+handle_call({config_lookup, Query}, _From, State) ->
+    ?vlog("config lookup: Query = ~p",[Query]),
+    Res = httpd_util:lookup(State#state.config_db, Query),
+    ?vdebug("config lookup result: ~p",[Res]),
+    {reply, Res, State};
+
+handle_call({config_multi_lookup, Query}, _From, State) ->
+    ?vlog("multi config lookup: Query = ~p",[Query]),
+    Res = httpd_util:multi_lookup(State#state.config_db, Query),
+    ?vdebug("multi config lookup result: ~p",[Res]),
+    {reply, Res, State};
+
+handle_call({config_match, Query}, _From, State) ->
+    ?vlog("config match: Query = ~p",[Query]),
+    Res = ets:match_object(State#state.config_db, Query),
+    ?vdebug("config match result: ~p",[Res]),
+    {reply, Res, State};
+
+handle_call(get_status, _From, State) ->
+    ?vdebug("get status",[]),
+    ManagerStatus  = manager_status(self()),
+    %% AuthStatus     = auth_status(get(auth_server)),
+    %% SecStatus      = sec_status(get(sec_server)),
+    %% AccStatus      = sec_status(get(acceptor_server)),
+    S1 = [{current_conn,length(State#state.connections)}|State#state.status]++
+	[ManagerStatus],
+    ?vtrace("status = ~p",[S1]),
+    {reply,S1,State};
+
+handle_call(is_busy, From, State) ->
+    Reply = case get_ustate(State) of
+		busy ->
+		    true;
+		_ ->
+		    false
+	  end,
+    ?vlog("is busy: ~p",[Reply]),
+    {reply,Reply,State};
+
+handle_call(is_busy_or_blocked, From, State) ->
+    Reply =
+	case get_astate(State) of
+	    unblocked ->
+		case get_ustate(State) of
+		    busy ->
+			busy;
+		    _ ->
+			false
+		end;
+	    _ ->
+		blocked
+	  end,
+    ?vlog("is busy or blocked: ~p",[Reply]),
+    {reply,Reply,State};
+
+handle_call(is_blocked, From, State) ->
+    Reply =
+	case get_astate(State) of
+	    unblocked ->
+		false;
+	    _ ->
+		true
+	  end,
+    ?vlog("is blocked: ~p",[Reply]),
+    {reply,Reply,State};
+
+handle_call(get_admin_state, From, State) ->
+    Reply = get_astate(State),
+    ?vlog("admin state: ~p",[Reply]),
+    {reply,Reply,State};
+
+handle_call(get_usage_state, From, State) ->
+    Reply = get_ustate(State),
+    ?vlog("usage state: ~p",[Reply]),
+    {reply,Reply,State};
+
+handle_call({verbosity,Who,Verbosity}, From, State) ->
+    V = ?vvalidate(Verbosity),
+    ?vlog("~n   Set new verbosity to ~p for ~p",[V,Who]),
+    Reply = set_verbosity(Who,V,State),
+    {reply,Reply,State};
+
+handle_call(restart, From, State) when State#state.admin_state == blocked ->
+    ?vlog("restart",[]),
+    case handle_restart(State) of
+	{stop, Reply,S1} ->
+	    {stop, Reply, S1};
+	{_, Reply, S1} ->
+	    {reply,Reply,S1}
+    end;
+
+handle_call(restart, From, State) ->
+    ?vlog("restart(~p)",[State#state.admin_state]),
+    {reply,{error,{invalid_admin_state,State#state.admin_state}},State};
+
+handle_call(block, From, State) ->
+    ?vlog("block(disturbing)",[]),
+    {Reply,S1} = handle_block(State),
+    {reply,Reply,S1};
+
+handle_call(unblock, {From,_Tag}, State) ->
+    ?vlog("unblock",[]),
+    {Reply,S1} = handle_unblock(State,From),
+    {reply, Reply, S1};
+
+handle_call({new_connection, Pid}, From, State) ->
+    ?vlog("~n   New connection (~p) when connection count = ~p",
+	  [Pid,length(State#state.connections)]),
+    {S, S1} = handle_new_connection(State, Pid),
+    Reply = {S, get(request_handler_verbosity)},
+    {reply, Reply, S1};
+
+handle_call(Request, From, State) ->
+    ?vinfo("~n   unknown request '~p' from ~p", [Request,From]),
+    String =
+	lists:flatten(
+	  io_lib:format("Unknown request "
+			"~n   ~p"
+			"~nto manager (~p)"
+			"~nfrom ~p",
+			[Request, self(), From])),
+    report_error(State,String),
+    {reply, ok, State}.
+
+
+%% handle_cast
+
+handle_cast({done_connection, Pid}, State) ->
+    ?vlog("~n   Done connection (~p)", [Pid]),
+    S1 = handle_done_connection(State, Pid),
+    {noreply, S1};
+
+handle_cast({block, disturbing, Timeout, From, Ref}, State) ->
+    ?vlog("block(disturbing,~p)",[Timeout]),
+    S1 = handle_block(State, Timeout, From, Ref),
+    {noreply,S1};
+
+handle_cast({block, non_disturbing, Timeout, From, Ref}, State) ->
+    ?vlog("block(non-disturbing,~p)",[Timeout]),
+    S1 = handle_nd_block(State, Timeout, From, Ref),
+    {noreply,S1};
+
+handle_cast(Message, State) ->
+    ?vinfo("~n   received unknown message '~p'",[Message]),
+    String =
+	lists:flatten(
+	  io_lib:format("Unknown message "
+			"~n   ~p"
+			"~nto manager (~p)",
+			[Message, self()])),
+    report_error(State, String),
+    {noreply, State}.
+
+%% handle_info
+
+handle_info({block_timeout, Method}, State) ->
+    ?vlog("received block_timeout event",[]),
+    S1 = handle_block_timeout(State,Method),
+    {noreply, S1};
+
+handle_info({'DOWN', Ref, process, _Object, Info}, State) ->
+    ?vlog("~n   down message for ~p",[Ref]),
+    S1 =
+	case State#state.blocker_ref of
+	    Ref ->
+		handle_blocker_exit(State);
+	    _ ->
+		%% Not our blocker, so ignore
+		State
+	end,
+    {noreply, S1};
+
+handle_info({'EXIT', Pid, normal}, State) ->
+    ?vdebug("~n   Normal exit message from ~p", [Pid]),
+    {noreply, State};
+
+handle_info({'EXIT', Pid, blocked}, S) ->
+    ?vdebug("blocked exit signal from request handler (~p)", [Pid]),
+    {noreply, S};
+
+handle_info({'EXIT', Pid, Reason}, State) ->
+    ?vlog("~n   Exit message from ~p for reason ~p",[Pid, Reason]),
+    S1 = check_connections(State, Pid, Reason),
+    {noreply, S1};
+
+handle_info(Info, State) ->
+    ?vinfo("~n   received unknown info '~p'",[Info]),
+    String =
+	lists:flatten(
+	  io_lib:format("Unknown info "
+			"~n   ~p"
+			"~nto manager (~p)",
+			[Info, self()])),
+    report_error(State, String),
+    {noreply, State}.
+
+
+%% terminate
+
+terminate(R, #state{config_db = Db}) ->
+    ?vlog("Terminating for reason: ~n   ~p", [R]),
+    httpd_conf:remove_all(Db),
+    ok.
+
+
+%% code_change({down,ToVsn}, State, Extra)
+%%
+%% NOTE:
+%% Actually upgrade from 2.5.1 to 2.5.3 and downgrade from
+%% 2.5.3 to 2.5.1 is done with an application restart, so
+%% these function is actually never used. The reason for keeping
+%% this stuff is only for future use.
+%%
+code_change({down,ToVsn},State,Extra) ->
+    {ok,State};
+
+%% code_change(FromVsn, State, Extra)
+%%
+code_change(FromVsn,State,Extra) ->
+    {ok,State}.
+
+
+
+%% -------------------------------------------------------------------------
+%% check_connection
+%%
+%%
+%%
+%%
+
+check_connections(#state{connections = []} = State, _Pid, _Reason) ->
+    State;
+check_connections(#state{admin_state = shutting_down,
+			 connections = Connections} = State, Pid, Reason) ->
+    %% Could be a crashing request handler
+    case lists:delete(Pid, Connections) of
+	[] -> % Crashing request handler => block complete
+	    String =
+		lists:flatten(
+		  io_lib:format("request handler (~p) crashed:"
+				"~n   ~p", [Pid, Reason])),
+	    report_error(State, String),
+	    ?vlog("block complete",[]),
+	    demonitor_blocker(State#state.blocker_ref),
+	    {Tmr,From,Ref} = State#state.blocking_tmr,
+	    ?vlog("(possibly) stop block timer",[]),
+	    stop_block_tmr(Tmr),
+	    ?vlog("and send the reply",[]),
+	    From ! {block_reply,ok,Ref},
+	    State#state{admin_state = blocked, connections = [],
+			blocker_ref = undefined};
+	Connections1 ->
+	    State#state{connections = Connections1}
+    end;
+check_connections(#state{connections = Connections} = State, Pid, Reason) ->
+    case lists:delete(Pid, Connections) of
+	Connections -> % Not a request handler, so ignore
+	    State;
+	Connections1 ->
+	    String =
+		lists:flatten(
+		  io_lib:format("request handler (~p) crashed:"
+				"~n   ~p", [Pid, Reason])),
+	    report_error(State, String),
+	    State#state{connections = lists:delete(Pid, Connections)}
+    end.
+
+
+%% -------------------------------------------------------------------------
+%% handle_[new | done]_connection
+%%
+%%
+%%
+%%
+
+handle_new_connection(State, Handler) ->
+    UsageState = get_ustate(State),
+    AdminState = get_astate(State),
+    handle_new_connection(UsageState, AdminState, State, Handler).
+
+handle_new_connection(busy, unblocked, State, Handler) ->
+    Status = update_heavy_load_status(State#state.status),
+    {{reject, busy},
+     State#state{status = Status}};
+
+handle_new_connection(_UsageState, unblocked, State, Handler) ->
+    Connections = State#state.connections,
+    Status      = update_connection_status(State#state.status,
+					   length(Connections)+1),
+    link(Handler),
+    {accept,
+     State#state{connections = [Handler|Connections], status = Status}};
+
+handle_new_connection(_UsageState, _AdminState, State, _Handler) ->
+    {{reject, blocked},
+     State}.
+
+
+handle_done_connection(#state{admin_state = shutting_down,
+			      connections = Connections} = State, Handler) ->
+    unlink(Handler),
+    case lists:delete(Handler, Connections) of
+	[] -> % Ok, block complete
+	    ?vlog("block complete",[]),
+	    demonitor_blocker(State#state.blocker_ref),
+	    {Tmr,From,Ref} = State#state.blocking_tmr,
+	    ?vlog("(possibly) stop block timer",[]),
+	    stop_block_tmr(Tmr),
+	    ?vlog("and send the reply",[]),
+	    From ! {block_reply,ok,Ref},
+	    State#state{admin_state = blocked, connections = [],
+			blocker_ref = undefined};
+	Connections1 ->
+	    State#state{connections = Connections1}
+    end;
+
+handle_done_connection(#state{connections = Connections} = State, Handler) ->
+    State#state{connections = lists:delete(Handler, Connections)}.
+
+
+%% -------------------------------------------------------------------------
+%% handle_block
+%%
+%%
+%%
+%%
+handle_block(#state{admin_state = AdminState} = S) ->
+    handle_block(S, AdminState).
+
+handle_block(S,unblocked) ->
+    %% Kill all connections
+    ?vtrace("handle_block(unblocked) -> kill all request handlers",[]),
+%%    [exit(Pid,blocked) || Pid <- S#state.connections],
+    [kill_handler(Pid) || Pid <- S#state.connections],
+    {ok,S#state{connections = [], admin_state = blocked}};
+handle_block(S,blocked) ->
+    ?vtrace("handle_block(blocked) -> already blocked",[]),
+    {ok,S};
+handle_block(S,shutting_down) ->
+    ?vtrace("handle_block(shutting_down) -> ongoing...",[]),
+    {{error,shutting_down},S}.
+
+
+kill_handler(Pid) ->
+    ?vtrace("kill request handler: ~p",[Pid]),
+    exit(Pid, blocked).
+%%    exit(Pid, kill).
+
+handle_block(S,Timeout,From,Ref) when Timeout >= 0 ->
+    do_block(S,Timeout,From,Ref);
+
+handle_block(S,Timeout,From,Ref) ->
+    Reply = {error,{invalid_block_request,Timeout}},
+    From ! {block_reply,Reply,Ref},
+    S.
+
+do_block(S,Timeout,From,Ref) ->
+    case S#state.connections of
+	[] ->
+	    %% Already in idle usage state => go directly to blocked
+	    ?vdebug("do_block -> already in idle usage state",[]),
+	    From ! {block_reply,ok,Ref},
+	    S#state{admin_state = blocked};
+	_ ->
+	    %% Active or Busy usage state => go to shutting_down
+	    ?vdebug("do_block -> active or busy usage state",[]),
+	    %% Make sure we get to know if blocker dies...
+	    ?vtrace("do_block -> create blocker monitor",[]),
+	    MonitorRef = monitor_blocker(From),
+	    ?vtrace("do_block -> (possibly) start block timer",[]),
+	    Tmr = {start_block_tmr(Timeout,disturbing),From,Ref},
+	    S#state{admin_state = shutting_down,
+		    blocker_ref = MonitorRef, blocking_tmr = Tmr}
+    end.
+
+handle_nd_block(S,infinity,From,Ref) ->
+    do_nd_block(S,infinity,From,Ref);
+
+handle_nd_block(S,Timeout,From,Ref) when Timeout >= 0 ->
+    do_nd_block(S,Timeout,From,Ref);
+
+handle_nd_block(S,Timeout,From,Ref) ->
+    Reply = {error,{invalid_block_request,Timeout}},
+    From ! {block_reply,Reply,Ref},
+    S.
+
+do_nd_block(S,Timeout,From,Ref) ->
+    case S#state.connections of
+	[] ->
+	    %% Already in idle usage state => go directly to blocked
+	    ?vdebug("do_nd_block -> already in idle usage state",[]),
+	    From ! {block_reply,ok,Ref},
+	    S#state{admin_state = blocked};
+	_ ->
+	    %% Active or Busy usage state => go to shutting_down
+	    ?vdebug("do_nd_block -> active or busy usage state",[]),
+	    %% Make sure we get to know if blocker dies...
+	    ?vtrace("do_nd_block -> create blocker monitor",[]),
+	    MonitorRef = monitor_blocker(From),
+	    ?vtrace("do_nd_block -> (possibly) start block timer",[]),
+	    Tmr = {start_block_tmr(Timeout,non_disturbing),From,Ref},
+	    S#state{admin_state = shutting_down,
+		    blocker_ref = MonitorRef, blocking_tmr = Tmr}
+    end.
+
+handle_block_timeout(S,Method) ->
+    %% Time to take this to the road...
+    demonitor_blocker(S#state.blocker_ref),
+    handle_block_timeout1(S,Method,S#state.blocking_tmr).
+
+handle_block_timeout1(S,non_disturbing,{_,From,Ref}) ->
+    ?vdebug("handle_block_timeout1(non-disturbing) -> send reply: timeout",[]),
+    From ! {block_reply,{error,timeout},Ref},
+    S#state{admin_state = unblocked,
+	    blocker_ref = undefined, blocking_tmr = undefined};
+
+handle_block_timeout1(S,disturbing,{_,From,Ref}) ->
+    ?vdebug("handle_block_timeout1(disturbing) -> kill all connections",[]),
+    [exit(Pid,blocked) || Pid <- S#state.connections],
+
+    ?vdebug("handle_block_timeout1 -> send reply: ok",[]),
+    From ! {block_reply,ok,Ref},
+    S#state{admin_state = blocked,    connections = [],
+	    blocker_ref = undefined, blocking_tmr = undefined};
+
+handle_block_timeout1(S,Method,{_,From,Ref}) ->
+    ?vinfo("received block timeout with unknown block method:"
+	   "~n   Method:  ~p",[Method]),
+    From ! {block_reply,{error,{unknown_block_method,Method}},Ref},
+    S#state{admin_state = blocked,    connections = [],
+	    blocker_ref = undefined, blocking_tmr = undefined};
+
+handle_block_timeout1(S,Method,TmrInfo) ->
+    ?vinfo("received block timeout with erroneous timer info:"
+	   "~n   Method:  ~p"
+	   "~n   TmrInfo: ~p",[Method,TmrInfo]),
+    S#state{admin_state = unblocked,
+	    blocker_ref = undefined, blocking_tmr = undefined}.
+
+handle_unblock(S,FromA) ->
+    handle_unblock(S,FromA,S#state.admin_state).
+
+handle_unblock(S,_FromA,unblocked) ->
+    {ok,S};
+handle_unblock(S,FromA,_AdminState) ->
+    ?vtrace("handle_unblock -> (possibly) stop block timer",[]),
+    stop_block_tmr(S#state.blocking_tmr),
+    case S#state.blocking_tmr of
+	{Tmr,FromB,Ref} ->
+	    %% Another process is trying to unblock
+	    %% Inform the blocker
+	    FromB ! {block_reply, {error,{unblocked,FromA}},Ref};
+	_ ->
+	    ok
+    end,
+    {ok,S#state{admin_state = unblocked, blocking_tmr = undefined}}.
+
+%% The blocker died so we give up on the block.
+handle_blocker_exit(S) ->
+    {Tmr,_From,_Ref} = S#state.blocking_tmr,
+    ?vtrace("handle_blocker_exit -> (possibly) stop block timer",[]),
+    stop_block_tmr(Tmr),
+    S#state{admin_state = unblocked,
+	    blocker_ref = undefined, blocking_tmr = undefined}.
+
+
+
+%% -------------------------------------------------------------------------
+%% handle_restart
+%%
+%%
+%%
+%%
+handle_restart(#state{config_file = undefined} = State) ->
+    {continue, {error, undefined_config_file}, State};
+handle_restart(#state{config_db = Db, config_file = ConfigFile} = State) ->
+    ?vtrace("load new configuration",[]),
+    {ok, Config} = httpd_conf:load(ConfigFile),
+    ?vtrace("check for illegal changes (addr, port and socket-type)",[]),
+    case (catch check_constant_values(Db, Config)) of
+	ok ->
+	    %% If something goes wrong between the remove
+	    %% and the store where fu-ed
+	    ?vtrace("remove old configuration, now hold you breath...",[]),
+	    httpd_conf:remove_all(Db),
+	    ?vtrace("store new configuration",[]),
+	    case httpd_conf:store(Config) of
+		{ok, NewConfigDB} ->
+		    ?vlog("restart done, puh!",[]),
+		    {continue, ok, State#state{config_db = NewConfigDB}};
+		Error ->
+		    ?vlog("failed store new config: ~n   ~p",[Error]),
+		    {stop, Error, State}
+	    end;
+	Error ->
+	    ?vlog("restart NOT performed due to:"
+		  "~n   ~p",[Error]),
+	    {continue, Error, State}
+    end.
+
+
+check_constant_values(Db, Config) ->
+    %% Check port number
+    ?vtrace("check_constant_values -> check port number",[]),
+    Port = httpd_util:lookup(Db,port),
+    case httpd_util:key1search(Config,port) of  %% MUST be equal
+	Port ->
+	    ok;
+	OtherPort ->
+	    throw({error,{port_number_changed,Port,OtherPort}})
+    end,
+
+    %% Check bind address
+    ?vtrace("check_constant_values -> check bind address",[]),
+    Addr = httpd_util:lookup(Db,bind_address),
+    case httpd_util:key1search(Config,bind_address) of  %% MUST be equal
+	Addr ->
+	    ok;
+	OtherAddr ->
+	    throw({error,{addr_changed,Addr,OtherAddr}})
+    end,
+
+    %% Check socket type
+    ?vtrace("check_constant_values -> check socket type",[]),
+    SockType = httpd_util:lookup(Db, com_type),
+    case httpd_util:key1search(Config, com_type) of  %% MUST be equal
+	SockType ->
+	    ok;
+	OtherSockType ->
+	    throw({error,{sock_type_changed,SockType,OtherSockType}})
+    end,
+    ?vtrace("check_constant_values -> done",[]),
+    ok.
+
+
+%% get_ustate(State) -> idle | active | busy
+%%
+%% Retrieve the usage state of the HTTP server:
+%%   0 active connection            -> idle
+%%   max_clients active connections -> busy
+%%   Otherwise                      -> active
+%%
+get_ustate(State) ->
+    get_ustate(length(State#state.connections),State).
+
+get_ustate(0,_State) ->
+    idle;
+get_ustate(ConnectionCnt,State) ->
+    ConfigDB = State#state.config_db,
+    case httpd_util:lookup(ConfigDB, max_clients, 150) of
+	ConnectionCnt ->
+	    busy;
+	_ ->
+	    active
+    end.
+
+
+get_astate(S) -> S#state.admin_state.
+
+
+%% Timer handling functions
+start_block_tmr(infinity,_) ->
+    undefined;
+start_block_tmr(T,M) ->
+    erlang:send_after(T,self(),{block_timeout,M}).
+
+stop_block_tmr(undefined) ->
+    ok;
+stop_block_tmr(Ref) ->
+    erlang:cancel_timer(Ref).
+
+
+%% Monitor blocker functions
+monitor_blocker(Pid) when pid(Pid) ->
+    case (catch erlang:monitor(process,Pid)) of
+	MonitorRef ->
+	    MonitorRef;
+	{'EXIT',Reason} ->
+	    undefined
+    end;
+monitor_blocker(_) ->
+    undefined.
+
+demonitor_blocker(undefined) ->
+    ok;
+demonitor_blocker(Ref) ->
+    (catch erlang:demonitor(Ref)).
+
+
+%% Some status utility functions
+
+update_heavy_load_status(Status) ->
+    update_status_with_time(Status,last_heavy_load).
+
+update_connection_status(Status,ConnCount) ->
+    S1 = case lists:keysearch(max_conn,1,Status) of
+	     {value,{max_conn,C1}} when ConnCount > C1 ->
+		 lists:keyreplace(max_conn,1,Status,{max_conn,ConnCount});
+	     {value,{max_conn,C2}} ->
+		 Status;
+	     false ->
+		 [{max_conn,ConnCount}|Status]
+	 end,
+    update_status_with_time(S1,last_connection).
+
+update_status_with_time(Status,Key) ->
+    lists:keyreplace(Key,1,Status,{Key,universal_time()}).
+
+universal_time() -> calendar:universal_time().
+
+
+auth_status(P) when pid(P) ->
+    Items = [status, message_queue_len, reductions,
+	     heap_size, stack_size, current_function],
+    {auth_status, process_status(P,Items,[])};
+auth_status(_) ->
+    {auth_status, undefined}.
+
+sec_status(P) when pid(P) ->
+    Items = [status, message_queue_len, reductions,
+	     heap_size, stack_size, current_function],
+    {security_status, process_status(P,Items,[])};
+sec_status(_) ->
+    {security_status, undefined}.
+
+acceptor_status(P) when pid(P) ->
+    Items = [status, message_queue_len, reductions,
+	     heap_size, stack_size, current_function],
+    {acceptor_status, process_status(P,Items,[])};
+acceptor_status(_) ->
+    {acceptor_status, undefined}.
+
+
+manager_status(P) ->
+    Items = [status, message_queue_len, reductions,
+	     heap_size, stack_size],
+    {manager_status, process_status(P,Items,[])}.
+
+
+process_status(P,[],L) ->
+    [{pid,P}|lists:reverse(L)];
+process_status(P,[H|T],L) ->
+    case (catch process_info(P,H)) of
+	{H, Value} ->
+	    process_status(P,T,[{H,Value}|L]);
+	_ ->
+	    process_status(P,T,[{H,undefined}|L])
+    end.
+
+make_name(Addr,Port) ->
+    httpd_util:make_name("httpd",Addr,Port).
+
+
+report_error(State,String) ->
+    Cdb = State#state.config_db,
+    error_logger:error_report(String),
+    mod_log:report_error(Cdb,String),
+    mod_disk_log:report_error(Cdb,String).
+
+
+set_verbosity(V) ->
+    Units = [manager_verbosity,
+	     acceptor_verbosity, request_handler_verbosity,
+	     security_verbosity, auth_verbosity],
+    case httpd_util:key1search(V, all) of
+	undefined ->
+	    set_verbosity(V, Units);
+	Verbosity when atom(Verbosity) ->
+	    V1 = [{Unit, Verbosity} || Unit <- Units],
+	    set_verbosity(V1, Units)
+    end.
+
+set_verbosity(_V, []) ->
+    ok;
+set_verbosity(V, [manager_verbosity = Unit|Units]) ->
+    Verbosity = httpd_util:key1search(V, Unit, ?default_verbosity),
+    put(verbosity, ?vvalidate(Verbosity)),
+    set_verbosity(V, Units);
+set_verbosity(V, [Unit|Units]) ->
+    Verbosity = httpd_util:key1search(V, Unit, ?default_verbosity),
+    put(Unit, ?vvalidate(Verbosity)),
+    set_verbosity(V, Units).
+
+
+set_verbosity(manager,V,_S) ->
+    put(verbosity,V);
+set_verbosity(acceptor,V,_S) ->
+    put(acceptor_verbosity,V);
+set_verbosity(request,V,_S) ->
+    put(request_handler_verbosity,V);
+set_verbosity(security,V,S) ->
+    OldVerbosity = put(security_verbosity,V),
+    Addr = httpd_util:lookup(S#state.config_db, bind_address),
+    Port = httpd_util:lookup(S#state.config_db, port),
+    mod_security_server:verbosity(Addr,Port,V),
+    OldVerbosity;
+set_verbosity(auth,V,S) ->
+    OldVerbosity = put(auth_verbosity,V),
+    Addr = httpd_util:lookup(S#state.config_db, bind_address),
+    Port = httpd_util:lookup(S#state.config_db, port),
+    mod_auth_server:verbosity(Addr,Port,V),
+    OldVerbosity;
+
+set_verbosity(all,V,S) ->
+    OldMv = put(verbosity,V),
+    OldAv = put(acceptor_verbosity,V),
+    OldRv = put(request_handler_verbosity,V),
+    OldSv = put(security_verbosity,V),
+    OldAv = put(auth_verbosity,V),
+    Addr  = httpd_util:lookup(S#state.config_db, bind_address),
+    Port  = httpd_util:lookup(S#state.config_db, port),
+    mod_security_server:verbosity(Addr,Port,V),
+    mod_auth_server:verbosity(Addr,Port,V),
+    [{manager,OldMv}, {request,OldRv}, {security,OldSv}, {auth, OldAv}].
+
+
+%%
+call(ServerRef,Request) ->
+    gen_server:call(ServerRef,Request).
+
+cast(ServerRef,Message) ->
+    gen_server:cast(ServerRef,Message).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_misc_sup.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_misc_sup.erl
new file mode 100644
index 0000000000..e671f05206
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_misc_sup.erl
@@ -0,0 +1,113 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_misc_sup.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+%%----------------------------------------------------------------------
+%% Purpose: The top supervisor for the Megaco/H.248 application
+%%----------------------------------------------------------------------
+
+-module(httpd_misc_sup).
+
+-behaviour(supervisor).
+
+-include("httpd_verbosity.hrl").
+
+%% public
+-export([start/3, stop/1, init/1]).
+
+-export([start_auth_server/3, stop_auth_server/2,
+	 start_sec_server/3,  stop_sec_server/2]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% supervisor callback functions
+
+
+start(Addr, Port, MiscSupVerbosity) ->
+    SupName = make_name(Addr, Port),
+    supervisor:start_link({local, SupName}, ?MODULE, [MiscSupVerbosity]).
+
+stop(StartArgs) ->
+    ok.
+
+init([Verbosity]) -> % Supervisor
+    do_init(Verbosity);
+init(BadArg) ->
+    {error, {badarg, BadArg}}.
+
+do_init(Verbosity) ->
+    put(verbosity,?vvalidate(Verbosity)),
+    put(sname,misc_sup),
+    ?vlog("starting", []),
+    Flags     = {one_for_one, 0, 1},
+    KillAfter = timer:seconds(1),
+    Workers   = [],
+    {ok, {Flags, Workers}}.
+
+
+%%----------------------------------------------------------------------
+%% Function: [start|stop]_[auth|sec]_server/3
+%% Description: Starts a [auth | security] worker (child) process
+%%----------------------------------------------------------------------
+
+start_auth_server(Addr, Port, Verbosity) ->
+    start_permanent_worker(mod_auth_server, Addr, Port,
+			   Verbosity, [gen_server]).
+
+stop_auth_server(Addr, Port) ->
+    stop_permanent_worker(mod_auth_server, Addr, Port).
+
+
+start_sec_server(Addr, Port, Verbosity) ->
+    start_permanent_worker(mod_security_server, Addr, Port,
+			   Verbosity, [gen_server]).
+
+stop_sec_server(Addr, Port) ->
+    stop_permanent_worker(mod_security_server, Addr, Port).
+
+
+
+%%----------------------------------------------------------------------
+%% Function:    start_permanent_worker/5
+%% Description: Starts a permanent worker (child) process
+%%----------------------------------------------------------------------
+
+start_permanent_worker(Mod, Addr, Port, Verbosity, Modules) ->
+    SupName = make_name(Addr, Port),
+    Spec    = {{Mod, Addr, Port},
+	       {Mod, start_link, [Addr, Port, Verbosity]},
+	       permanent, timer:seconds(1), worker, [Mod] ++ Modules},
+    supervisor:start_child(SupName, Spec).
+
+
+%%----------------------------------------------------------------------
+%% Function:    stop_permanent_worker/3
+%% Description: Stops a permanent worker (child) process
+%%----------------------------------------------------------------------
+
+stop_permanent_worker(Mod, Addr, Port) ->
+    SupName = make_name(Addr, Port),
+    Name    = {Mod, Addr, Port},
+    case supervisor:terminate_child(SupName, Name) of
+	ok ->
+	    supervisor:delete_child(SupName, Name);
+	Error ->
+	    Error
+    end.
+
+
+make_name(Addr,Port) ->
+    httpd_util:make_name("httpd_misc_sup",Addr,Port).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_parse.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_parse.erl
new file mode 100644
index 0000000000..2f4163de00
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_parse.erl
@@ -0,0 +1,344 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_parse.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+-module(httpd_parse).
+-export([
+	 request_header/1,
+	 hsplit/2,
+	 get_request_record/10,
+	 split_lines/1,
+	 tagup_header/1]).
+-include("httpd.hrl").
+
+
+%%----------------------------------------------------------------------
+%% request_header
+%%
+%% Input: The request as sent from the client (list of characters)
+%%        (may include part of the entity body)
+%%
+%% Returns:
+%%   {ok, Info#mod}
+%%   {not_implemented,Info#mod}
+%%   {bad_request, Reason}
+%%----------------------------------------------------------------------
+
+request_header(Header)->
+    [RequestLine|HeaderFields] = split_lines(Header),
+    ?DEBUG("request ->"
+	   "~n   RequestLine: ~p"
+	   "~n   Header:      ~p",[RequestLine,Header]),
+    ParsedHeader = tagup_header(HeaderFields),
+    ?DEBUG("request ->"
+	   "~n   ParseHeader: ~p",[ParsedHeader]),
+    case verify_request(string:tokens(RequestLine," ")) of
+	["HEAD", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
+	    {ok, ["HEAD", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
+		 ParsedHeader]};
+	["GET", RequestURI, "HTTP/0.9"] ->
+	    {ok, ["GET", RequestURI, "HTTP/0.9", RequestLine, ParsedHeader]};
+	["GET", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
+	    {ok, ["GET", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
+		 ParsedHeader]};
+	["POST", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
+	    {ok, ["POST", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
+		 ParsedHeader]};
+	%%HTTP must be 1.1 or higher
+	["TRACE", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] when N>48->
+	    {ok, ["TRACE", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
+		 ParsedHeader]};
+	[Method, RequestURI] ->
+	    {not_implemented, RequestLine, Method, RequestURI,ParsedHeader,"HTTP/0.9"};
+	[Method, RequestURI, HTTPVersion] ->
+	    {not_implemented, RequestLine, Method, RequestURI,ParsedHeader, HTTPVersion};
+	{bad_request, Reason} ->
+	    {bad_request, Reason};
+	Reason ->
+	    {bad_request, "Unknown request method"}
+    end.
+
+
+
+
+
+
+%%----------------------------------------------------------------------
+%% The request is passed through the server as a record of type mod get it
+%% ----------------------------------------------------------------------
+
+get_request_record(Socket,SocketType,ConfigDB,Method,RequestURI,
+		 HTTPVersion,RequestLine,ParsedHeader,EntityBody,InitData)->
+    PersistentConn=get_persistens(HTTPVersion,ParsedHeader,ConfigDB),
+    Info=#mod{init_data=InitData,
+	      data=[],
+	      socket_type=SocketType,
+	      socket=Socket,
+	      config_db=ConfigDB,
+	      method=Method,
+	      absolute_uri=formatAbsoluteURI(RequestURI,ParsedHeader),
+	      request_uri=formatRequestUri(RequestURI),
+	      http_version=HTTPVersion,
+	      request_line=RequestLine,
+	      parsed_header=ParsedHeader,
+	      entity_body=maybe_remove_nl(ParsedHeader,EntityBody),
+	      connection=PersistentConn},
+    {ok,Info}.
+
+%%----------------------------------------------------------------------
+%% Conmtrol wheater we shall maintain a persistent connection or not
+%%----------------------------------------------------------------------
+get_persistens(HTTPVersion,ParsedHeader,ConfigDB)->
+    case httpd_util:lookup(ConfigDB,persistent_conn,true) of
+	true->
+	    case HTTPVersion of
+		%%If it is version prio to 1.1 kill the conneciton
+		[$H, $T, $T, $P, $\/, $1, $.,N] ->
+		    case httpd_util:key1search(ParsedHeader,"connection","keep-alive")of
+			%%if the connection isnt ordered to go down let it live
+			%%The keep-alive value is the older http/1.1 might be older
+			%%Clients that use it.
+			"keep-alive" when N >= 49 ->
+			    ?DEBUG("CONNECTION MODE: ~p",[true]),
+			    true;
+			"close" ->
+			    ?DEBUG("CONNECTION MODE: ~p",[false]),
+			    false;
+			Connect ->
+			    ?DEBUG("CONNECTION MODE: ~p VALUE: ~p",[false,Connect]),
+			    false
+		    end;
+		_ ->
+		    ?DEBUG("CONNECTION MODE: ~p VERSION: ~p",[false,HTTPVersion]),
+		    false
+
+	    end;
+	_ ->
+	    false
+    end.
+
+
+
+
+%%----------------------------------------------------------------------
+%% Control whether the last newline of the body is a part of the message or
+%%it is a part of the multipart message.
+%%----------------------------------------------------------------------
+maybe_remove_nl(Header,Rest) ->
+    case find_content_type(Header) of
+	false ->
+	    {ok,EntityBody,_}=regexp:sub(Rest,"\r\n\$",""),
+	    EntityBody;
+	{ok, Value} ->
+	    case string:str(Value, "multipart/form-data") of
+		0 ->
+		    {ok,EntityBody,_}=regexp:sub(Rest,"\r\n\$",""),
+		    EntityBody;
+		_ ->
+		    Rest
+	    end
+    end.
+
+%%----------------------------------------------------------------------
+%% Cet the content type of the incomming request
+%%----------------------------------------------------------------------
+
+
+find_content_type([]) ->
+    false;
+find_content_type([{Name,Value}|Tail]) ->
+    case httpd_util:to_lower(Name) of
+	"content-type" ->
+	    {ok, Value};
+	_ ->
+	    find_content_type(Tail)
+    end.
+
+%%----------------------------------------------------------------------
+%% Split the header to a list of strings where each string represents a
+%% HTTP header-field
+%%----------------------------------------------------------------------
+split_lines(Request) ->
+    split_lines(Request, [], []).
+split_lines([], CAcc, Acc) ->
+    lists:reverse([lists:reverse(CAcc)|Acc]);
+
+%%White space in the header fields are allowed but the new line must begin with LWS se
+%%rfc2616 chap 4.2. The rfc do not say what to
+split_lines([$\r, $\n, $\t |Rest], CAcc, Acc) ->
+    split_lines(Rest, [$\r, $\n |CAcc], Acc);
+
+split_lines([$\r, $\n, $\s |Rest], CAcc, Acc) ->
+    split_lines(Rest, [$\r, $\n |CAcc], Acc);
+
+split_lines([$\r, $\n|Rest], CAcc, Acc) ->
+    split_lines(Rest, [], [lists:reverse(CAcc)|Acc]);
+split_lines([Chr|Rest], CAcc, Acc) ->
+    split_lines(Rest, [Chr|CAcc], Acc).
+
+
+%%----------------------------------------------------------------------
+%% This is a 'hack' to stop people from trying to access directories/files
+%% relative to the ServerRoot.
+%%----------------------------------------------------------------------
+
+
+verify_request([Request, RequestURI]) ->
+    verify_request([Request, RequestURI, "HTTP/0.9"]);
+
+verify_request([Request, RequestURI, Protocol]) ->
+    NewRequestURI =
+	case string:str(RequestURI, "?") of
+	    0 ->
+		RequestURI;
+	    Ndx ->
+		string:left(RequestURI, Ndx)
+	end,
+   case string:str(NewRequestURI, "..") of
+	0 ->
+	    [Request, RequestURI, Protocol];
+	_ ->
+	    {bad_request, {forbidden, RequestURI}}
+    end;
+verify_request(Request) ->
+    Request.
+
+%%----------------------------------------------------------------------
+%% tagup_header
+%%
+%% Parses the header of a HTTP request and returns a key,value tuple
+%% list containing Name and Value of each header directive as of:
+%%
+%% Content-Type: multipart/mixed -> {"Content-Type", "multipart/mixed"}
+%%
+%% But in http/1.1 the field-names are case insencitive so now it must be
+%% Content-Type: multipart/mixed -> {"content-type", "multipart/mixed"}
+%% The standard furthermore says that leading and traling white space
+%% is not a part of the fieldvalue and shall therefore be removed.
+%%----------------------------------------------------------------------
+
+tagup_header([]) ->          [];
+tagup_header([Line|Rest]) -> [tag(Line, [])|tagup_header(Rest)].
+
+tag([], Tag) ->
+    {httpd_util:to_lower(lists:reverse(Tag)), ""};
+tag([$:|Rest], Tag) ->
+    {httpd_util:to_lower(lists:reverse(Tag)), httpd_util:strip(Rest)};
+tag([Chr|Rest], Tag) ->
+    tag(Rest, [Chr|Tag]).
+
+
+%%----------------------------------------------------------------------
+%% There are 3 possible forms of the reuqest URI
+%%
+%%  1. * When the request is not for a special assset. is is instead
+%%     to the server itself
+%%
+%%  2. absoluteURI the whole servername port and asset is in the request
+%%
+%%  3. The most common form that http/1.0 used abs path that is a path
+%%     to the requested asset.
+%5----------------------------------------------------------------------
+formatRequestUri("*")->
+    "*";
+formatRequestUri([$h,$t,$t,$p,$:,$\/,$\/|ServerAndPath]) ->
+   removeServer(ServerAndPath);
+
+formatRequestUri([$H,$T,$T,$P,$:,$\/,$\/|ServerAndPath]) ->
+    removeServer(ServerAndPath);
+
+formatRequestUri(ABSPath) ->
+    ABSPath.
+
+removeServer([$\/|Url])->
+    case Url of
+	[]->
+	    "/";
+        _->
+	    [$\/|Url]
+    end;
+removeServer([N|Url]) ->
+    removeServer(Url).
+
+
+formatAbsoluteURI([$h,$t,$t,$p,$:,$\/,$\/|Uri],ParsedHeader)->
+    [$H,$T,$T,$P,$:,$\/,$\/|Uri];
+
+formatAbsoluteURI([$H,$T,$T,$P,$:,$\/,$\/|Uri],ParsedHeader)->
+    [$H,$T,$T,$P,$:,$\/,$\/|Uri];
+
+formatAbsoluteURI(Uri,ParsedHeader)->
+    case httpd_util:key1search(ParsedHeader,"host") of
+	undefined ->
+	    nohost;
+	Host ->
+	    Host++Uri
+    end.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%Code below is crap from an older version shall be removed when
+%%transformation to http/1.1 is finished
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+%request(Request) ->
+%    ?DEBUG("request -> entry with:"
+%	   "~n   Request: ~s",[Request]),
+ %   {BeforeEntityBody, Rest} = hsplit([], Request),
+ %   ?DEBUG("request ->"
+%	   "~n   BeforeEntityBody: ~p"
+%	   "~n   Rest:             ~p",[BeforeEntityBody, Rest]),
+%    [RequestLine|Header] = split_lines(BeforeEntityBody),
+%    ?DEBUG("request ->"
+%	   "~n   RequestLine: ~p"
+%	   "~n   Header:      ~p",[RequestLine,Header]),
+%    ParsedHeader = tagup_header(Header),
+%    ?DEBUG("request ->"
+%	   "~n   ParseHeader: ~p",[ParsedHeader]),
+%    EntityBody = maybe_remove_nl(ParsedHeader,Rest),
+%    ?DEBUG("request ->"
+%	   "~n   EntityBody: ~p",[EntityBody]),
+%    case verify_request(string:tokens(RequestLine," ")) of
+%	["HEAD", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
+%	    {ok, ["HEAD", formatRequestUri(RequestURI), [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
+%		 ParsedHeader, EntityBody]};
+%	["GET", RequestURI, "HTTP/0.9"] ->
+%	    {ok, ["GET", RequestURI, "HTTP/0.9", RequestLine, ParsedHeader,
+%		 EntityBody]};
+%	["GET", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
+%	    {ok, ["GET", formatRequestUri(RequestURI), [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
+%		 ParsedHeader,EntityBody]};
+%%	["POST", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
+%	    {ok, ["POST", formatRequestUri(RequestURI), [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
+%		 ParsedHeader, EntityBody]};
+%	[Method, RequestURI] ->
+%	    {not_implemented, RequestLine, Method, RequestURI,ParsedHeader,"HTTP/0.9"};
+%	[Method, RequestURI, HTTPVersion] ->
+%	    {not_implemented, RequestLine, Method, RequestURI,ParsedHeader, HTTPVersion};
+%	{bad_request, Reason} ->
+%	    {bad_request, Reason};
+%	Reason ->
+%	    {bad_request, "Unknown request method"}
+%    end.
+
+hsplit(Accu,[]) ->
+    {lists:reverse(Accu), []};
+hsplit(Accu, [ $\r, $\n, $\r, $\n | Tail]) ->
+    {lists:reverse(Accu), Tail};
+hsplit(Accu, [H|T]) ->
+    hsplit([H|Accu],T).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_request_handler.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_request_handler.erl
new file mode 100644
index 0000000000..b2d375ceff
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_request_handler.erl
@@ -0,0 +1,994 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_request_handler.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+-module(httpd_request_handler).
+
+%% app internal api
+-export([start_link/2, synchronize/3]).
+
+%% module internal api
+-export([connection/2, do_next_connection/6, read_header/7]).
+-export([parse_trailers/1, newline/1]).
+
+-include("httpd.hrl").
+-include("httpd_verbosity.hrl").
+
+
+%% start_link
+
+start_link(Manager, ConfigDB) ->
+    Pid = proc_lib:spawn(?MODULE, connection, [Manager, ConfigDB]),
+    {ok, Pid}.
+
+
+%% synchronize
+
+synchronize(Pid, SocketType, Socket) ->
+    Pid ! {synchronize, SocketType, Socket}.
+
+% connection
+
+connection(Manager, ConfigDB) ->
+    {SocketType, Socket, {Status, Verbosity}} = await_synchronize(Manager),
+    put(sname,self()),
+    put(verbosity,?vvalidate(Verbosity)),
+    connection1(Status, Manager, ConfigDB, SocketType, Socket).
+
+
+connection1({reject, busy}, Manager, ConfigDB, SocketType, Socket) ->
+    handle_busy(Manager, ConfigDB, SocketType, Socket);
+
+connection1({reject, blocked}, Manager, ConfigDB, SocketType, Socket) ->
+    handle_blocked(Manager, ConfigDB, SocketType, Socket);
+
+connection1(accept, Manager, ConfigDB, SocketType, Socket) ->
+    handle_connection(Manager, ConfigDB, SocketType, Socket).
+
+
+%% await_synchronize
+
+await_synchronize(Manager) ->
+    receive
+	{synchronize, SocketType, Socket} ->
+	    ?vlog("received syncronize: "
+		  "~n   SocketType: ~p"
+		  "~n   Socket:     ~p", [SocketType, Socket]),
+	    {SocketType, Socket, httpd_manager:new_connection(Manager)}
+    after 5000 ->
+	    exit(synchronize_timeout)
+    end.
+
+
+% handle_busy
+
+handle_busy(Manager, ConfigDB, SocketType, Socket) ->
+    ?vlog("handle busy: ~p", [Socket]),
+    MaxClients = httpd_util:lookup(ConfigDB, max_clients, 150),
+    String = io_lib:format("heavy load (>~w processes)", [MaxClients]),
+    reject_connection(Manager, ConfigDB, SocketType, Socket, String).
+
+
+% handle_blocked
+
+handle_blocked(Manager, ConfigDB, SocketType, Socket) ->
+    ?vlog("handle blocked: ~p", [Socket]),
+    String = "Server maintenance performed, try again later",
+    reject_connection(Manager, ConfigDB, SocketType, Socket, String).
+
+
+% reject_connection
+
+reject_connection(Manager, ConfigDB, SocketType, Socket, Info) ->
+    String = lists:flatten(Info),
+    ?vtrace("send status (503) message", []),
+    httpd_response:send_status(SocketType, Socket, 503, String, ConfigDB),
+    %% This ugly thing is to make ssl deliver the message, before the close...
+    close_sleep(SocketType, 1000),
+    ?vtrace("close the socket", []),
+    close(SocketType, Socket, ConfigDB).
+
+
+% handle_connection
+
+handle_connection(Manager, ConfigDB, SocketType, Socket) ->
+    ?vlog("handle connection: ~p", [Socket]),
+    Resolve     = httpd_socket:resolve(SocketType),
+    Peername    = httpd_socket:peername(SocketType, Socket),
+    InitData    = #init_data{peername=Peername, resolve=Resolve},
+    TimeOut     = httpd_util:lookup(ConfigDB, keep_alive_timeout, 150000),
+    NrOfRequest = httpd_util:lookup(ConfigDB, max_keep_alive_request, forever),
+    ?MODULE:do_next_connection(ConfigDB, InitData,
+			       SocketType, Socket,NrOfRequest,TimeOut),
+    ?vlog("handle connection: done", []),
+    httpd_manager:done_connection(Manager),
+    ?vlog("handle connection: close socket", []),
+    close(SocketType, Socket, ConfigDB).
+
+
+% do_next_connection
+do_next_connection(_ConfigDB, _InitData, _SocketType, _Socket, NrOfRequests,
+		   _Timeout) when NrOfRequests < 1 ->
+    ?vtrace("do_next_connection: done", []),
+    ok;
+do_next_connection(ConfigDB, InitData, SocketType, Socket, NrOfRequests,
+		   Timeout) ->
+    Peername = InitData#init_data.peername,
+    case (catch read(ConfigDB, SocketType, Socket, InitData, Timeout)) of
+        {'EXIT', Reason} ->
+            ?vlog("exit reading from socket: ~p",[Reason]),
+            error_logger:error_report({'EXIT',Reason}),
+	    String =
+		lists:flatten(
+		  io_lib:format("exit reading from socket: ~p => ~n~p~n",
+				[Socket, Reason])),
+	    error_log(mod_log,
+		      SocketType, Socket, ConfigDB, Peername, String),
+	    error_log(mod_disk_log,
+		      SocketType, Socket, ConfigDB, Peername, String);
+        {error, Reason} ->
+            handle_read_error(Reason,SocketType,Socket,ConfigDB,Peername);
+        Info when record(Info, mod) ->
+            case Info#mod.connection of
+                true ->
+                    ReqTimeout = httpd_util:lookup(ConfigDB,
+						   keep_alive_timeout, 150000),
+		    ?MODULE:do_next_connection(ConfigDB,          InitData,
+					       SocketType,        Socket,
+					       dec(NrOfRequests), ReqTimeout);
+		_ ->
+                    ok
+            end;
+        _ ->
+            ok
+    end.
+
+
+
+%% read
+read(ConfigDB, SocketType, Socket, InitData, Timeout) ->
+    ?vdebug("read from socket ~p with Timeout ~p",[Socket, Timeout]),
+    MaxHdrSz = httpd_util:lookup(ConfigDB, max_header_size, 10240),
+    case ?MODULE:read_header(SocketType, Socket, Timeout, MaxHdrSz,
+			     ConfigDB, InitData, []) of
+	{socket_closed, Reason} ->
+	    ?vlog("Socket closed while reading request header: "
+		  "~n   ~p", [Reason]),
+	    socket_close;
+	{error, Error} ->
+	    {error, Error};
+	{ok, Info, EntityBodyPart} ->
+	    read1(SocketType, Socket, ConfigDB, InitData, Timeout, Info,
+		  EntityBodyPart)
+    end.
+
+%% Got the head and maybe a part of the body: read in the rest
+read1(SocketType, Socket, ConfigDB, InitData, Timeout, Info, BodyPart)->
+    MaxBodySz     = httpd_util:lookup(ConfigDB, max_body_size, nolimit),
+    ContentLength = content_length(Info),
+    ?vtrace("ContentLength: ~p", [ContentLength]),
+    case read_entity_body(SocketType, Socket, Timeout, MaxBodySz,
+			  ContentLength, BodyPart, Info, ConfigDB) of
+	{socket_closed, Reason} ->
+	    ?vlog("Socket closed while reading request body: "
+		  "~n   ~p", [Reason]),
+	    socket_close;
+	{ok, EntityBody} ->
+	    finish_request(EntityBody, [], Info);
+	{ok, ExtraHeader, EntityBody} ->
+	    finish_request(EntityBody, ExtraHeader, Info);
+	Response ->
+	    httpd_socket:close(SocketType, Socket),
+	    socket_closed
+	    %% Catch up all bad return values
+    end.
+
+
+%% The request is read in send it forward to the module that
+%% generates the response
+
+finish_request(EntityBody, ExtraHeader,
+	       #mod{parsed_header = ParsedHeader} = Info)->
+    ?DEBUG("finish_request -> ~n"
+	"    EntityBody:   ~p~n"
+	"    ExtraHeader:  ~p~n"
+	"    ParsedHeader: ~p~n",
+	[EntityBody, ExtraHeader, ParsedHeader]),
+    httpd_response:send(Info#mod{parsed_header = ParsedHeader ++ ExtraHeader,
+				 entity_body   = EntityBody}).
+
+
+%% read_header
+
+%% This algorithm rely on the buffer size of the inet driver together
+%% with the {active, once} socket option. Atmost one message of this
+%% size will be received at a given time. When a full header has been
+%% read, the body is read with the recv function (the body size is known).
+%%
+read_header(SocketType, Socket, Timeout, MaxHdrSz, ConfigDB,
+	    InitData, SoFar0) ->
+    T = t(),
+    %% remove any newlines at the begining, they might be crap from ?
+    SoFar = remove_newline(SoFar0),
+
+    case terminated_header(MaxHdrSz, SoFar) of
+	{true, Header, EntityBodyPart} ->
+	    ?vdebug("read_header -> done reading header: "
+		    "~n   length(Header):         ~p"
+		    "~n   length(EntityBodyPart): ~p",
+		    [length(Header), length(EntityBodyPart)]),
+	    transform_header(SocketType, Socket, Header, ConfigDB, InitData,
+			     EntityBodyPart);
+	false ->
+	    ?vtrace("read_header -> "
+		    "~n   set active = 'once' and "
+		    "await a chunk of the header", []),
+
+	    case httpd_socket:active_once(SocketType, Socket) of
+		ok ->
+		    receive
+			%%
+			%% TCP
+			%%
+			{tcp, Socket, Data} ->
+			    ?vtrace("read_header(ip) -> got some data: ~p",
+				[sz(Data)]),
+			    ?MODULE:read_header(SocketType, Socket,
+						Timeout - (t()-T),
+						MaxHdrSz, ConfigDB,
+						InitData, SoFar ++ Data);
+			{tcp_closed, Socket} ->
+			    ?vtrace("read_header(ip) -> socket closed",[]),
+			    {socket_closed,normal};
+			{tcp_error, Socket, Reason} ->
+			    ?vtrace("read_header(ip) -> socket error: ~p",
+				[Reason]),
+			    {socket_closed, Reason};
+
+			%%
+			%% SSL
+			%%
+			{ssl, Socket, Data} ->
+			    ?vtrace("read_header(ssl) -> got some data: ~p",
+				[sz(Data)]),
+			    ?MODULE:read_header(SocketType, Socket,
+						Timeout - (t()-T),
+						MaxHdrSz, ConfigDB,
+						InitData, SoFar ++ Data);
+			{ssl_closed, Socket} ->
+			    ?vtrace("read_header(ssl) -> socket closed", []),
+			    {socket_closed, normal};
+			{ssl_error, Socket, Reason} ->
+			    ?vtrace("read_header(ssl) -> socket error: ~p",
+				[Reason]),
+			    {socket_closed, Reason}
+
+		    after Timeout ->
+			    ?vlog("read_header -> timeout", []),
+			    {socket_closed, timeout}
+		    end;
+
+		Error ->
+		    httpd_response:send_status(SocketType, Socket,
+					       500, none, ConfigDB),
+		    Error
+	    end
+    end.
+
+
+terminated_header(MaxHdrSz, Data) ->
+    D1 = lists:flatten(Data),
+    ?vtrace("terminated_header -> Data size: ~p",[sz(D1)]),
+    case hsplit(MaxHdrSz,[],D1) of
+	not_terminated ->
+	    false;
+	[Header, EntityBodyPart] ->
+	    {true, Header++"\r\n\r\n",EntityBodyPart}
+    end.
+
+
+transform_header(SocketType, Socket, Request, ConfigDB, InitData, BodyPart) ->
+    case httpd_parse:request_header(Request) of
+	{not_implemented, RequestLine, Method, RequestURI, ParsedHeader,
+	 HTTPVersion} ->
+	    httpd_response:send_status(SocketType, Socket, 501,
+				       {Method, RequestURI, HTTPVersion},
+				       ConfigDB),
+	    {error,"Not Implemented"};
+	{bad_request, {forbidden, URI}} ->
+	    httpd_response:send_status(SocketType, Socket, 403, URI, ConfigDB),
+	    {error,"Forbidden Request"};
+	{bad_request, Reason} ->
+	    httpd_response:send_status(SocketType, Socket, 400, none,
+				       ConfigDB),
+	    {error,"Malformed request"};
+	{ok,[Method, RequestURI, HTTPVersion, RequestLine, ParsedHeader]} ->
+	    ?DEBUG("send -> ~n"
+		   "    Method:      ~p~n"
+		   "    RequestURI:  ~p~n"
+		   "    HTTPVersion: ~p~n"
+		   "    RequestLine: ~p~n",
+		   [Method, RequestURI, HTTPVersion, RequestLine]),
+	    {ok, Info} =
+		httpd_parse:get_request_record(Socket, SocketType, ConfigDB,
+					       Method, RequestURI, HTTPVersion,
+					       RequestLine, ParsedHeader,
+					       [], InitData),
+	    %% Control that the Host header field is provided
+	    case Info#mod.absolute_uri of
+		nohost ->
+		    case Info#mod.http_version of
+			"HTTP/1.1" ->
+			    httpd_response:send_status(Info, 400, none),
+			    {error,"No host specified"};
+			_ ->
+			    {ok, Info, BodyPart}
+		    end;
+		_ ->
+		    {ok, Info, BodyPart}
+	    end
+    end.
+
+
+hsplit(_MaxHdrSz, Accu,[]) ->
+    not_terminated;
+hsplit(_MaxHdrSz, Accu, [ $\r, $\n, $\r, $\n | Tail]) ->
+    [lists:reverse(Accu), Tail];
+hsplit(nolimit, Accu, [H|T]) ->
+    hsplit(nolimit,[H|Accu],T);
+hsplit(MaxHdrSz, Accu, [H|T]) when length(Accu) < MaxHdrSz ->
+    hsplit(MaxHdrSz,[H|Accu],T);
+hsplit(MaxHdrSz, Accu, D) ->
+    throw({error,{header_too_long,length(Accu),length(D)}}).
+
+
+
+%%----------------------------------------------------------------------
+%% The http/1.1 standard chapter 8.2.3 says that a request containing
+%% An Except header-field must be responded to by 100 (Continue) by
+%% the server before the client sends the body.
+%%----------------------------------------------------------------------
+
+read_entity_body(SocketType, Socket, Timeout, Max, Length, BodyPart, Info,
+		 ConfigDB) when integer(Max) ->
+    case expect(Info#mod.http_version, Info#mod.parsed_header, ConfigDB) of
+	continue when Max > Length ->
+	    ?DEBUG("read_entity_body()->100 Continue  ~n", []),
+	    httpd_response:send_status(Info, 100, ""),
+	    read_entity_body2(SocketType, Socket, Timeout, Max, Length,
+			      BodyPart, Info, ConfigDB);
+	continue when Max < Length ->
+	    httpd_response:send_status(Info, 417, "Body to big"),
+	    httpd_socket:close(SocketType, Socket),
+	    {socket_closed,"Expect denied according to size"};
+	break ->
+	    httpd_response:send_status(Info, 417, "Method not allowed"),
+	    httpd_socket:close(SocketType, Socket),
+	    {socket_closed,"Expect conditions was not fullfilled"};
+	no_expect_header ->
+	    read_entity_body2(SocketType, Socket, Timeout, Max, Length,
+			      BodyPart, Info, ConfigDB);
+	http_1_0_expect_header ->
+	    httpd_response:send_status(Info, 400,
+				       "Only HTTP/1.1 Clients "
+				       "may use the Expect Header"),
+	    httpd_socket:close(SocketType, Socket),
+	    {socket_closed,"Due to a HTTP/1.0 expect header"}
+    end;
+
+read_entity_body(SocketType, Socket, Timeout, Max, Length, BodyPart,
+		 Info, ConfigDB) ->
+    case expect(Info#mod.http_version, Info#mod.parsed_header, ConfigDB) of
+	continue ->
+	    ?DEBUG("read_entity_body() -> 100 Continue  ~n", []),
+	    httpd_response:send_status(Info, 100, ""),
+	    read_entity_body2(SocketType, Socket, Timeout, Max, Length,
+			      BodyPart, Info, ConfigDB);
+	break->
+	    httpd_response:send_status(Info, 417, "Method not allowed"),
+	    httpd_socket:close(SocketType, Socket),
+	    {socket_closed,"Expect conditions was not fullfilled"};
+	no_expect_header ->
+	    read_entity_body2(SocketType, Socket, Timeout, Max, Length,
+			      BodyPart, Info, ConfigDB);
+	http_1_0_expect_header ->
+	    httpd_response:send_status(Info, 400,
+				       "HTTP/1.0 Clients are not allowed "
+				       "to use the Expect Header"),
+	    httpd_socket:close(SocketType, Socket),
+	    {socket_closed,"Expect header field in an HTTP/1.0 request"}
+	end.
+
+%%----------------------------------------------------------------------
+%% control if the body is transfer encoded
+%%----------------------------------------------------------------------
+read_entity_body2(SocketType, Socket, Timeout, Max, Length, BodyPart,
+		  Info, ConfigDB) ->
+    ?DEBUG("read_entity_body2() -> "
+	"~n   Max:    ~p"
+	"~n   Length: ~p"
+	"~n   Socket: ~p", [Max, Length, Socket]),
+
+    case transfer_coding(Info) of
+	{chunked, ChunkedData} ->
+	    ?DEBUG("read_entity_body2() -> "
+		"Transfer-encoding: Chunked Data: BodyPart ~s", [BodyPart]),
+	    read_chunked_entity(Info, Timeout, Max, Length, ChunkedData, [],
+				BodyPart);
+	unknown_coding ->
+	    ?DEBUG("read_entity_body2() -> Transfer-encoding: Unknown",[]),
+	    httpd_response:send_status(Info, 501, "Unknown Transfer-Encoding"),
+	    httpd_socket:close(SocketType, Socket),
+	    {socket_closed,"Expect conditions was not fullfilled"};
+	none ->
+	      ?DEBUG("read_entity_body2() -> Transfer-encoding: none",[]),
+	    read_entity_body(SocketType, Socket, Timeout, Max, Length,
+			     BodyPart)
+    end.
+
+
+%%----------------------------------------------------------------------
+%% The body was plain read it from the socket
+%% ----------------------------------------------------------------------
+read_entity_body(_SocketType, _Socket, _Timeout, _Max, 0, _BodyPart) ->
+    {ok, []};
+
+read_entity_body(_SocketType, _Socket, _Timeout, Max, Len, _BodyPart)
+  when Max < Len ->
+    ?vlog("body to long: "
+	  "~n   Max: ~p"
+	  "~n   Len: ~p", [Max,Len]),
+    throw({error,{body_too_long,Max,Len}});
+
+%% OTP-4409: Fixing POST problem
+read_entity_body(_,_,_,_, Len, BodyPart) when Len == length(BodyPart) ->
+    ?vtrace("read_entity_body -> done when"
+	"~n   Len = length(BodyPart): ~p", [Len]),
+    {ok, BodyPart};
+
+%% OTP-4550: Fix problem with trailing garbage produced by some clients.
+read_entity_body(_, _, _, _, Len, BodyPart) when Len < length(BodyPart) ->
+    ?vtrace("read_entity_body -> done when"
+	"~n   Len:              ~p"
+	"~n   length(BodyPart): ~p", [Len, length(BodyPart)]),
+    {ok, lists:sublist(BodyPart,Len)};
+
+read_entity_body(SocketType, Socket, Timeout, Max, Len, BodyPart) ->
+    ?vtrace("read_entity_body -> entry when"
+	"~n   Len:              ~p"
+	"~n   length(BodyPart): ~p", [Len, length(BodyPart)]),
+    %% OTP-4548:
+    %% The length calculation was previously (inets-2.*) done in the
+    %% read function. As of 3.0 it was removed from read but not
+    %% included here.
+    L = Len - length(BodyPart),
+    case httpd_socket:recv(SocketType, Socket, L, Timeout) of
+	{ok, Body} ->
+	    ?vtrace("read_entity_body -> received some data:"
+		"~n   length(Body): ~p", [length(Body)]),
+	    {ok, BodyPart ++ Body};
+	{error,closed} ->
+	    {socket_closed,normal};
+	{error,etimedout} ->
+	    {socket_closed, timeout};
+	{error,Reason} ->
+	    {socket_closed, Reason};
+	Other ->
+	    {socket_closed, Other}
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% If the body of the message is encoded used the chunked transfer encoding
+%% it looks somethin like this:
+%% METHOD URI HTTP/VSN
+%% Transfer-Encoding: chunked
+%% CRLF
+%% ChunkSize
+%% Chunk
+%% ChunkSize
+%% Chunk
+%% 0
+%% Trailer
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+read_chunked_entity(Info, Timeout, Max, Length, ChunkedData, Body, []) ->
+    ?DEBUG("read_chunked_entity()->:no_chunks ~n", []),
+    read_chunked_entity(Info#mod.socket_type, Info#mod.socket,
+			Timeout, Max, Length, ChunkedData, Body,
+			Info#mod.config_db, Info);
+
+read_chunked_entity(Info, Timeout, Max, Length, ChunkedData, Body, BodyPart) ->
+    %% Get the size
+    ?DEBUG("read_chunked_entity() -> PrefetchedBodyPart: ~p ~n",[BodyPart]),
+    case parse_chunk_size(Info, Timeout, BodyPart) of
+	{ok, Size, NewBodyPart} when Size > 0 ->
+	    ?DEBUG("read_chunked_entity() -> Size: ~p ~n", [Size]),
+	    case parse_chunked_entity_body(Info, Timeout, Max, length(Body),
+					   Size, NewBodyPart) of
+		{ok, Chunk, NewBodyPart1} ->
+		    ?DEBUG("read_chunked_entity()->Size: ~p ~n", [Size]),
+		    read_chunked_entity(Info, Timeout, Max, Length,
+					ChunkedData, Body ++ Chunk,
+					NewBodyPart1);
+		OK ->
+		    httpd_socket:close(Info#mod.socket_type, Info#mod.socket),
+		    {socket_closed, error}
+	    end;
+	{ok, 0, Trailers} ->
+	   ?DEBUG("read_chunked_entity()->Size: 0, Trailers: ~s Body: ~s ~n",
+		[Trailers, Body]),
+	    case parse_chunk_trailer(Info, Timeout, Info#mod.config_db,
+				     Trailers) of
+		{ok, TrailerFields} ->
+		    {ok, TrailerFields, Body};
+		_->
+		    {ok, []}
+	    end;
+	Error ->
+	    Error
+    end.
+
+
+parse_chunk_size(Info, Timeout, BodyPart) ->
+    case httpd_util:split(remove_newline(BodyPart), "\r\n", 2) of
+	{ok, [Size, Body]} ->
+	    ?DEBUG("parse_chunk_size()->Size: ~p ~n", [Size]),
+	    {ok, httpd_util:hexlist_to_integer(Size), Body};
+	{ok, [Size]} ->
+	    ?DEBUG("parse_chunk_size()->Size: ~p ~n", [Size]),
+	    Sz = get_chunk_size(Info#mod.socket_type,
+				Info#mod.socket, Timeout,
+				lists:reverse(Size)),
+	    {ok, Sz, []}
+    end.
+
+%%----------------------------------------------------------------------
+%% We got the chunk size get the chunk
+%%
+%% Max:     Max numbers of bytes to read may also be undefined
+%% Length:  Numbers of bytes already read
+%% Size     Numbers of byte to read for the chunk
+%%----------------------------------------------------------------------
+
+%% body to big
+parse_chunked_entity_body(Info, Timeout, Max, Length, Size, BodyPart)
+  when Max =< (Length + Size) ->
+    {error, body_to_big};
+
+%% Prefetched body part is bigger than the current chunk
+%% (i.e. BodyPart includes more than one chunk)
+parse_chunked_entity_body(Info, Timeout, Max, Length, Size, BodyPart)
+  when (Size+2) =< length(BodyPart) ->
+    Chunk = string:substr(BodyPart, 1, Size),
+    Rest  = string:substr(BodyPart, Size+3),
+    ?DEBUG("parse_chunked_entity_body() -> ~nChunk: ~s ~nRest: ~s ~n",
+	[Chunk, Rest]),
+    {ok, Chunk, Rest};
+
+
+%% We just got a part of the current chunk
+parse_chunked_entity_body(Info, Timeout, Max, Length, Size, BodyPart) ->
+    %% OTP-4551:
+    %% Subtracting BodyPart from Size does not produce an integer
+    %% when BodyPart is a list...
+    Remaining = Size - length(BodyPart),
+    LastPartOfChunk = read_chunked_entity_body(Info#mod.socket_type,
+					       Info#mod.socket,
+					       Timeout, Max,
+					       Length, Remaining),
+    %% Remove newline
+    httpd_socket:recv(Info#mod.socket_type, Info#mod.socket, 2, Timeout),
+    ?DEBUG("parse_chunked_entity_body() -> "
+	"~nBodyPart: ~s"
+	"~nLastPartOfChunk: ~s  ~n",
+	[BodyPart, LastPartOfChunk]),
+    {ok, BodyPart ++ LastPartOfChunk, []}.
+
+
+%%----------------------------------------------------------------------
+%% If the data we got along with the header contained the whole chunked body
+%% It may aswell contain the trailer :-(
+%%----------------------------------------------------------------------
+%% Either trailer begins with  \r\n and then all data is there or
+%% The trailer has data  then read upto \r\n\r\n
+parse_chunk_trailer(Info,Timeout,ConfigDB,"\r\n")->
+    {ok,[]};
+parse_chunk_trailer(Info,Timeout,ConfigDB,Trailers) ->
+    ?DEBUG("parse_chunk_trailer()->Trailers: ~s ~n", [Trailers]),
+    case string:rstr(Trailers,"\r\n\r\n") of
+	0 ->
+	    MaxHdrSz=httpd_util:lookup(ConfigDB, max_header_size, 10240),
+	    read_trailer_end(Info,Timeout,MaxHdrSz,Trailers);
+	_->
+	    %%We got the whole header parse it up
+	    parse_trailers(Trailers)
+    end.
+
+parse_trailers(Trailer)->
+    ?DEBUG("parse_trailer()->Trailer: ~s",[Trailer]),
+    {ok,[Fields0|Crap]}=httpd_util:split(Trailer,"\r\n\r\n",2),
+    Fields=string:tokens(Fields0,"\r\n"),
+	[getTrailerField(X)||X<-Fields,lists:member($:,X)].
+
+
+read_trailer_end(Info,Timeout,MaxHdrSz,[])->
+    ?DEBUG("read_trailer_end()->[]",[]),
+    case read_trailer(Info#mod.socket_type,Info#mod.socket,
+		 Timeout,MaxHdrSz,[],[],
+		      httpd_util:key1search(Info#mod.parsed_header,"trailer",[])) of
+	{ok,Trailers}->
+	    Trailers;
+	_->
+	    []
+    end;
+read_trailer_end(Info,Timeout,MaxHdrSz,Trailers)->
+    ?DEBUG("read_trailer_end()->Trailers: ~s ~n ",[Trailers]),
+    %% Get the last paart of the the last headerfield
+    End=lists:reverse(lists:takewhile(fun(X)->case X of 10 ->false;13->false;_ ->true end end,lists:reverse(Trailers))),
+    Fields0=regexp:split(Trailers,"\r\n"),
+    %%Get rid of the last header field
+    [_Last|Fields]=lists:reverse(Fields0),
+    Headers=[getTrailerField(X)||X<-Fields,lists:member($:,X)],
+    case read_trailer(Info#mod.socket_type,Info#mod.socket,
+		 Timeout,MaxHdrSz,Headers,End,
+		      httpd_util:key1search(Info#mod.parsed_header,"trailer",[])) of
+	{ok,Trailers}->
+	    Trailers;
+	_->
+	    []
+    end.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% The code below is a a good way to read in chunked encoding but
+%% that require that the encoding comes from a stream and not from a list
+%%&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
+
+%%----------------------------------------------------------------------
+%% The body is encoded by chubnked encoding read it in
+%% ChunkedData= Chunked extensions
+%% Body= the inread chunked body
+%% Max:     Max numbers of bytes to read
+%% Length:  Numbers of bytes already readed
+%% Size     Numbers of byte to read for the chunk
+%%----------------------------------------------------------------------
+
+
+
+read_chunked_entity(SocketType, Socket, Timeout, Max, Length, ChunkedData,
+		    Body, ConfigDB, Info) ->
+    T = t(),
+    case get_chunk_size(SocketType,Socket,Timeout,[]) of
+	Size when integer(Size), Size>0 ->
+	    case read_chunked_entity_body(SocketType, Socket,
+					  Timeout-(t()-T),
+					  Max, length(Body), Size) of
+		{ok,Chunk} ->
+		    ?DEBUG("read_chunked_entity/9 Got a chunk: ~p " ,[Chunk]),
+		    %% Two bytes are left of the chunk, that is the CRLF
+		    %% at the end that is not a part of the message
+		    %% So we read it and do nothing with it.
+		    httpd_socket:recv(SocketType,Socket,2,Timeout-(t()-T)),
+		    read_chunked_entity(SocketType, Socket, Timeout-(t()-T),
+					Max, Length, ChunkedData, Body++Chunk,
+					ConfigDB, Info);
+		Error ->
+		    ?DEBUG("read_chunked_entity/9 Error: ~p " ,[Error]),
+		    httpd_socket:close(SocketType,Socket),
+		    {socket_closed,error}
+	    end;
+	Size when integer(Size), Size == 0 ->
+	    %% Must read in any trailer fields here
+	    read_chunk_trailer(SocketType, Socket, Timeout,
+			       Max, Info, ChunkedData, Body, ConfigDB);
+	Error ->
+	    Error
+    end.
+
+
+%% If a user wants to send header data after the chunked data we
+%% must pick it out
+read_chunk_trailer(SocketType, Socket, Timeout, Max, Info, ChunkedData,
+		   Body, ConfigDB) ->
+    ?DEBUG("read_chunk_trailer/8: ~p " ,[Body]),
+    MaxHdrSz = httpd_util:lookup(ConfigDB,max_header_size,10240),
+    case httpd_util:key1search(Info#mod.parsed_header,"trailer")of
+	undefined ->
+	    {ok,Body};
+	Fields ->
+	    case read_trailer(SocketType, Socket, Timeout,
+			      MaxHdrSz, [], [],
+			      string:tokens(
+				httpd_util:to_lower(Fields),",")) of
+		{ok,[]} ->
+		    {ok,Body};
+		{ok,HeaderFields} ->
+		    % ParsedExtraHeaders =
+		    % httpd_parse:tagup_header(httpd_parse:split_lines(HeaderFields)),
+		    {ok,HeaderFields,Body};
+		Error ->
+		    Error
+	    end
+    end.
+
+read_chunked_entity_body(SocketType, Socket, Timeout, Max, Length, Size)
+  when integer(Max) ->
+    read_entity_body(SocketType, Socket, Timeout, Max-Length, Size, []);
+
+read_chunked_entity_body(SocketType, Socket, Timeout, Max, _Length, Size) ->
+    read_entity_body(SocketType, Socket, Timeout, Max, Size, []).
+
+%% If we read in the \r\n the httpd_util:hexlist_to_integer
+%% Will remove it and we get rid of it emmediatly :-)
+get_chunk_size(SocketType, Socket, Timeout, Size) ->
+    T = t(),
+    ?DEBUG("get_chunk_size: ~p " ,[Size]),
+    case httpd_socket:recv(SocketType,Socket,1,Timeout) of
+	{ok,[Digit]} when Digit==$\n ->
+	    httpd_util:hexlist_to_integer(lists:reverse(Size));
+       {ok,[Digit]} ->
+	    get_chunk_size(SocketType,Socket,Timeout-(t()-T),[Digit|Size]);
+	{error,closed} ->
+	    {socket_closed,normal};
+	{error,etimedout} ->
+	    {socket_closed, timeout};
+	{error,Reason} ->
+	    {socket_closed, Reason};
+	Other ->
+	    {socket_closed,Other}
+    end.
+
+
+
+
+%%----------------------------------------------------------------------
+%% Reads the HTTP-trailer
+%% Would be easy to tweak the read_head to do this but in this way
+%% the chunked encoding can be updated better.
+%%----------------------------------------------------------------------
+
+
+%% When end is reached
+%% read_trailer(SocketType,Socket,Timeout,MaxHdrSz,Headers,Last,[]) ->
+%%    {ok,Headers};
+
+%% When header to big
+read_trailer(_,_,_,MaxHdrSz,Headers,Bs,_Fields)
+  when MaxHdrSz < length(Headers) ->
+    ?vlog("header to long: "
+	  "~n   MaxHdrSz:   ~p"
+	  "~n   length(Bs): ~p", [MaxHdrSz,length(Bs)]),
+    throw({error,{header_too_long,MaxHdrSz,length(Bs)}});
+
+%% The last Crlf is there
+read_trailer(_, _, _, _, Headers, [$\n, $\r], _) ->
+    {ok,Headers};
+
+read_trailer(SocketType, Socket, Timeout, MaxHdrSz, Headers,
+	     [$\n, $\r|Rest], Fields) ->
+    case getTrailerField(lists:reverse(Rest))of
+	{error,Reason}->
+	    {error,"Bad trailer"};
+	{HeaderField,Value}->
+	    case lists:member(HeaderField,Fields) of
+		true ->
+		    read_trailer(SocketType,Socket,Timeout,MaxHdrSz,
+				 [{HeaderField,Value} |Headers],[],
+				 lists:delete(HeaderField,Fields));
+		false ->
+		    read_trailer(SocketType,Socket,Timeout,MaxHdrSz,
+				 Headers,[],Fields)
+	    end
+    end;
+
+% read_trailer(SocketType,Socket,Timeout,MaxHdrSz,Headers,[$\n, $\r|Rest],Fields) ->
+%     case Rest of
+% 	[] ->
+% 	   read_trailer(SocketType,Socket,Timeout,MaxHdrSz,Headers,Rest,Fields);
+% 	Field ->
+% 	    case getTrailerField(lists:reverse(Rest))of
+% 		{error,Reason}->
+% 		    {error,"Bad trailer"};
+% 		{HeaderField,Value}->
+% 		    case lists:member(HeaderField,Fields) of
+% 			true ->
+% 			    read_trailer(SocketType,Socket,Timeout,MaxHdrSz,
+% 					 [{HeaderField,Value} |Headers],[],
+% 					 lists:delete(HeaderField,Fields));
+% 			false ->
+% 			    read_trailer(SocketType,Socket,Timeout,MaxHdrSz,
+% 					 Headers,[],Fields)
+% 		    end
+% 	    end
+%     end;
+
+read_trailer(SocketType,Socket,Timeout,MaxHdrSz,Headers,Bs,Fields) ->
+    %% ?vlog("read_header -> entry with Timeout: ~p",[Timeout]),
+    T = t(),
+    case (catch httpd_socket:recv(SocketType,Socket,1,Timeout)) of
+	{ok,[B]} ->
+	    read_trailer(SocketType, Socket, Timeout-(t()-T),
+			 MaxHdrSz, Headers, [B|Bs], Fields);
+	{error,closed} ->
+	    {socket_closed,normal};
+	{error,etimedout} ->
+	    {socket_closed, timeout};
+	{error,Reason} ->
+	    {socket_closed, Reason};
+	Other ->
+	    {socket_closed,Other}
+    end.
+
+getTrailerField(HeaderField)->
+   case string:str(HeaderField,":") of
+       0->
+	   {error,"badheaderfield"};
+       Number ->
+	   {httpd_util:to_lower(string:substr(HeaderField,1,Number-1)),
+	    httpd_util:to_lower(string:substr(HeaderField,Number+1))}
+   end.
+
+
+
+
+%% Time in milli seconds
+t() ->
+    {A,B,C} = erlang:now(),
+    A*1000000000+B*1000+(C div 1000).
+
+%%----------------------------------------------------------------------
+%% If the user sends an expect header-field with the value 100-continue
+%% We must send a 100 status message if he is a HTTP/1.1 client.
+
+%% If it is an HTTP/1.0 client it's little more difficult.
+%% If expect is not defined it is easy but in the other case shall we
+%% Break or the transmission or let it continue the standard is not clear
+%% if to break connection or wait for data.
+%%----------------------------------------------------------------------
+expect(HTTPVersion,ParsedHeader,ConfigDB)->
+    case HTTPVersion of
+	[$H,$T,$T,$P,$\/,$1,$.,N|_Whatever]when N>=1->
+	    case httpd_util:key1search(ParsedHeader,"expect") of
+		"100-continue" ->
+		    continue;
+		undefined ->
+		    no_expect_header;
+		NewValue ->
+		    break
+	    end;
+	_OldVersion ->
+	    case httpd_util:key1search(ParsedHeader,"expect") of
+		undefined ->
+		    no_expect_header;
+		NewValue ->
+		    case httpd_util:lookup(ConfigDB,expect,continue) of
+			continue->
+			    no_expect_header;
+			_ ->
+			    http_1_0_expect_header
+		    end
+	    end
+    end.
+
+
+%%----------------------------------------------------------------------
+%% According to the http/1.1 standard all applications must understand
+%% Chunked encoded data. (Last line chapter 3.6.1).
+transfer_coding(#mod{parsed_header = Ph}) ->
+    case httpd_util:key1search(Ph, "transfer-encoding", none) of
+	none ->
+	    none;
+	[$c,$h,$u,$n,$k,$e,$d|Data]->
+	    {chunked,Data};
+	_ ->
+	    unknown_coding
+    end.
+
+
+
+handle_read_error({header_too_long,Max,Rem},
+                  SocketType,Socket,ConfigDB,Peername) ->
+    String = io_lib:format("header too long: ~p : ~p",[Max,Rem]),
+    handle_read_error(ConfigDB,String,SocketType,Socket,Peername,
+                      max_header_action,close);
+handle_read_error({body_too_long,Max,Actual},
+                  SocketType,Socket,ConfigDB,Peername) ->
+    String = io_lib:format("body too long: ~p : ~p",[Max,Actual]),
+    handle_read_error(ConfigDB,String,SocketType,Socket,Peername,
+                      max_body_action,close);
+handle_read_error(Error,SocketType,Socket,ConfigDB,Peername) ->
+    ok.
+
+
+handle_read_error(ConfigDB, ReasonString, SocketType, Socket, Peername,
+                  Item, Default) ->
+    ?vlog("error reading request: ~s",[ReasonString]),
+    E = lists:flatten(
+          io_lib:format("Error reading request: ~s",[ReasonString])),
+    error_log(mod_log, SocketType, Socket, ConfigDB, Peername, E),
+    error_log(mod_disk_log, SocketType, Socket, ConfigDB, Peername, E),
+    case httpd_util:lookup(ConfigDB,Item,Default) of
+        reply414 ->
+            send_read_status(SocketType, Socket, 414, ReasonString, ConfigDB);
+        _ ->
+            ok
+    end.
+
+send_read_status(SocketType, Socket, Code, ReasonString, ConfigDB) ->
+    httpd_response:send_status(SocketType, Socket, Code, ReasonString,
+			       ConfigDB).
+
+
+error_log(Mod, SocketType, Socket, ConfigDB, Peername, String) ->
+    Modules = httpd_util:lookup(ConfigDB, modules,
+				[mod_get, mod_head, mod_log]),
+    case lists:member(Mod, Modules) of
+	true ->
+	    Mod:error_log(SocketType, Socket, ConfigDB, Peername, String);
+	_ ->
+	    ok
+    end.
+
+
+sz(L) when list(L) ->
+    length(L);
+sz(B) when binary(B) ->
+    size(B);
+sz(O) ->
+    {unknown_size,O}.
+
+
+%% Socket utility functions:
+
+close(SocketType, Socket, ConfigDB) ->
+    case httpd_socket:close(SocketType, Socket) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            ?vlog("error while closing socket: ~p",[Reason]),
+	    ok
+    end.
+
+close_sleep({ssl, _}, Time) ->
+    sleep(Time);
+close_sleep(_, _) ->
+    ok.
+
+
+sleep(T) -> receive after T -> ok end.
+
+
+dec(N) when integer(N) ->
+    N-1;
+dec(N) ->
+    N.
+
+
+content_length(#mod{parsed_header = Ph}) ->
+    list_to_integer(httpd_util:key1search(Ph, "content-length","0")).
+
+
+remove_newline(List)->
+    lists:dropwhile(fun newline/1,List).
+
+newline($\r) ->
+    true;
+newline($\n) ->
+    true;
+newline(_Sign) ->
+    false.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_response.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_response.erl
new file mode 100644
index 0000000000..1685cbc129
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_response.erl
@@ -0,0 +1,437 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_response.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+-module(httpd_response).
+-export([send/1, send_status/3, send_status/5]).
+
+%%code is the key for the statuscode ex: 200 404 ...
+-define(HTTP11HEADERFIELDS,[content_length, accept_ranges, cache_control, date,
+			    pragma, trailer, transfer_encoding, etag, location,
+			    retry_after, server, allow,
+			    content_encoding, content_language,
+			    content_location, content_MD5, content_range,
+			    content_type, expires, last_modified]).
+
+-define(HTTP10HEADERFIELDS,[content_length, date, pragma, transfer_encoding,
+			    location, server, allow, content_encoding,
+			    content_type, last_modified]).
+
+-define(PROCEED_RESPONSE(StatusCode, Info),
+	{proceed,
+	 [{response,{already_sent, StatusCode,
+		     httpd_util:key1search(Info#mod.data,content_lenght)}}]}).
+
+
+-include("httpd.hrl").
+
+-define(VMODULE,"RESPONSE").
+-include("httpd_verbosity.hrl").
+
+%% send
+
+send(#mod{config_db = ConfigDB} = Info) ->
+    ?vtrace("send -> Request line: ~p", [Info#mod.request_line]),
+    Modules = httpd_util:lookup(ConfigDB,modules,[mod_get, mod_head, mod_log]),
+    case traverse_modules(Info, Modules) of
+	done ->
+	    Info;
+	{proceed, Data} ->
+	    case httpd_util:key1search(Data, status) of
+		{StatusCode, PhraseArgs, Reason} ->
+		    ?vdebug("send -> proceed/status: ~n"
+			    "~n   StatusCode: ~p"
+			    "~n   PhraseArgs: ~p"
+			    "~n   Reason:     ~p",
+			    [StatusCode, PhraseArgs, Reason]),
+		    send_status(Info, StatusCode, PhraseArgs),
+		    Info;
+
+		undefined ->
+		    case httpd_util:key1search(Data, response) of
+			{already_sent, StatusCode, Size} ->
+			    ?vtrace("send -> already sent: "
+				    "~n   StatusCode: ~p"
+				    "~n   Size:       ~p",
+				    [StatusCode, Size]),
+			    Info;
+			{response, Header, Body} -> %% New way
+			    send_response(Info, Header, Body),
+			    Info;
+			{StatusCode, Response} ->   %% Old way
+			    send_response_old(Info, StatusCode, Response),
+			    Info;
+			undefined ->
+			    ?vtrace("send -> undefined response", []),
+			    send_status(Info, 500, none),
+			    Info
+		    end
+	    end
+    end.
+
+
+%% traverse_modules
+
+traverse_modules(Info,[]) ->
+    {proceed,Info#mod.data};
+traverse_modules(Info,[Module|Rest]) ->
+    case (catch apply(Module,do,[Info])) of
+	{'EXIT', Reason} ->
+	    ?vlog("traverse_modules -> exit reason: ~p",[Reason]),
+	    String =
+		lists:flatten(
+		  io_lib:format("traverse exit from apply: ~p:do => ~n~p",
+				[Module, Reason])),
+	    report_error(mod_log, Info#mod.config_db, String),
+	    report_error(mod_disk_log, Info#mod.config_db, String),
+	    done;
+	done ->
+	    done;
+	{break,NewData} ->
+	    {proceed,NewData};
+	{proceed,NewData} ->
+	    traverse_modules(Info#mod{data=NewData},Rest)
+    end.
+
+%% send_status %%
+
+
+send_status(#mod{socket_type = SocketType,
+		 socket      = Socket,
+		 connection  = Conn} = Info, 100, _PhraseArgs) ->
+    ?DEBUG("send_status -> StatusCode: ~p~n",[100]),
+    Header = httpd_util:header(100, Conn),
+    httpd_socket:deliver(SocketType, Socket,
+			 [Header, "Content-Length:0\r\n\r\n"]);
+
+send_status(#mod{socket_type = SocketType,
+		 socket      = Socket,
+		 config_db   = ConfigDB} = Info, StatusCode, PhraseArgs) ->
+    send_status(SocketType, Socket, StatusCode, PhraseArgs, ConfigDB).
+
+send_status(SocketType, Socket, StatusCode, PhraseArgs, ConfigDB) ->
+    ?DEBUG("send_status -> ~n"
+	"    StatusCode: ~p~n"
+	"    PhraseArgs: ~p",
+	[StatusCode, PhraseArgs]),
+    Header       = httpd_util:header(StatusCode, "text/html", false),
+    ReasonPhrase = httpd_util:reason_phrase(StatusCode),
+    Message      = httpd_util:message(StatusCode, PhraseArgs, ConfigDB),
+    Body         = get_body(ReasonPhrase, Message),
+    Header1 =
+	Header ++
+	"Content-Length:" ++
+	integer_to_list(length(Body)) ++
+	"\r\n\r\n",
+    httpd_socket:deliver(SocketType, Socket, [Header1, Body]).
+
+
+get_body(ReasonPhrase, Message)->
+    "<HTML>
+       <HEAD>
+           <TITLE>"++ReasonPhrase++"</TITLE>
+      </HEAD>
+      <BODY>
+      <H1>"++ReasonPhrase++"</H1>\n"++Message++"\n</BODY>
+      </HTML>\n".
+
+
+%%% Create a response from the Key/Val tuples In the Head  List
+%%% Body is a tuple {body,Fun(),Args}
+
+%% send_response
+%% Allowed Fields
+
+% HTTP-Version StatusCode Reason-Phrase
+% *((general-headers
+%   response-headers
+%    entity-headers)CRLF)
+%  CRLF
+% ?(BODY)
+
+% General Header fields
+% ======================
+% Cache-Control cache_control
+% Connection %%Is set dependiong on the request
+% Date
+% Pramga
+% Trailer
+% Transfer-Encoding
+
+% Response Header field
+% =====================
+% Accept-Ranges
+% (Age) Mostly for proxys
+% Etag
+% Location
+% (Proxy-Authenticate) Only for proxies
+% Retry-After
+% Server
+% Vary
+% WWW-Authenticate
+%
+% Entity Header Fields
+% ====================
+% Allow
+% Content-Encoding
+% Content-Language
+% Content-Length
+% Content-Location
+% Content-MD5
+% Content-Range
+% Content-Type
+% Expires
+% Last-Modified
+
+
+send_response(Info, Header, Body) ->
+    ?vtrace("send_response -> (new) entry with"
+	    "~n   Header:       ~p", [Header]),
+    case httpd_util:key1search(Header, code) of
+	undefined ->
+	    %% No status code
+	    %% Ooops this must be very bad:
+	    %% generate a 404 content not availible
+	    send_status(Info, 404, "The file is not availible");
+	StatusCode ->
+	    case send_header(Info, StatusCode, Header) of
+		ok ->
+		    send_body(Info, StatusCode, Body);
+		Error ->
+		    ?vlog("head delivery failure: ~p", [Error]),
+		    done
+	    end
+    end.
+
+
+send_header(#mod{socket_type  = Type, socket     = Sock,
+		 http_version = Ver,  connection = Conn} = Info,
+	    StatusCode, Head0) ->
+    ?vtrace("send_haeder -> entry with"
+	    "~n   Ver:  ~p"
+	    "~n   Conn: ~p", [Ver, Conn]),
+    Head1 = create_header(Ver, Head0),
+    StatusLine = [Ver, " ",
+		  io_lib:write(StatusCode), " ",
+		  httpd_util:reason_phrase(StatusCode), "\r\n"],
+    Connection = get_connection(Conn, Ver),
+    Head = list_to_binary([StatusLine, Head1, Connection,"\r\n"]),
+    ?vtrace("deliver head", []),
+    httpd_socket:deliver(Type, Sock, Head).
+
+
+send_body(_, _, nobody) ->
+    ?vtrace("send_body -> no body", []),
+    ok;
+
+send_body(#mod{socket_type = Type, socket = Sock},
+	  StatusCode, Body) when list(Body) ->
+    ?vtrace("deliver body of size ~p", [length(Body)]),
+    httpd_socket:deliver(Type, Sock, Body);
+
+send_body(#mod{socket_type = Type, socket = Sock} = Info,
+	  StatusCode, {Fun, Args}) ->
+    case (catch apply(Fun, Args)) of
+	close ->
+	    httpd_socket:close(Type, Sock),
+	    done;
+
+	sent ->
+	    ?PROCEED_RESPONSE(StatusCode, Info);
+
+	{ok, Body} ->
+	    ?vtrace("deliver body", []),
+	    case httpd_socket:deliver(Type, Sock, Body) of
+		ok ->
+		    ?PROCEED_RESPONSE(StatusCode, Info);
+		Error ->
+		    ?vlog("body delivery failure: ~p", [Error]),
+		    done
+	    end;
+
+	Error ->
+	    ?vlog("failure of apply(~p,~p): ~p", [Fun, Args, Error]),
+	    done
+    end;
+send_body(I, S, B) ->
+    ?vinfo("BAD ARGS: "
+	   "~n   I: ~p"
+	   "~n   S: ~p"
+	   "~n   B: ~p", [I, S, B]),
+    exit({bad_args, {I, S, B}}).
+
+
+%% Return a HTTP-header field that indicates that the
+%% connection will be inpersistent
+get_connection(true,"HTTP/1.0")->
+    "Connection:close\r\n";
+get_connection(false,"HTTP/1.1") ->
+    "Connection:close\r\n";
+get_connection(_,_) ->
+    "".
+
+
+create_header("HTTP/1.1", Data) ->
+    create_header1(?HTTP11HEADERFIELDS, Data);
+create_header(_, Data) ->
+    create_header1(?HTTP10HEADERFIELDS, Data).
+
+create_header1(Fields, Data) ->
+    ?DEBUG("create_header() -> "
+	   "~n   Fields :~p~n   Data: ~p ~n", [Fields, Data]),
+    mapfilter(fun(Field)->
+		      transform({Field, httpd_util:key1search(Data, Field)})
+	      end, Fields, undefined).
+
+
+%% Do a map and removes the values that evaluates to RemoveVal
+mapfilter(Fun,List,RemoveVal)->
+    mapfilter(Fun,List,[],RemoveVal).
+
+mapfilter(Fun,[],[RemoveVal|Acc],RemoveVal)->
+    Acc;
+mapfilter(Fun,[],Acc,_RemoveVal)->
+    Acc;
+
+mapfilter(Fun,[Elem|Rest],[RemoveVal|Acc],RemoveVal)->
+    mapfilter(Fun,Rest,[Fun(Elem)|Acc],RemoveVal);
+mapfilter(Fun,[Elem|Rest],Acc,RemoveVal)->
+    mapfilter(Fun,Rest,[Fun(Elem)|Acc],RemoveVal).
+
+
+transform({content_type,undefined})->
+    ["Content-Type:text/plain\r\n"];
+
+transform({date,undefined})->
+    ["Date:",httpd_util:rfc1123_date(),"\r\n"];
+
+transform({date,RFCDate})->
+    ["Date:",RFCDate,"\r\n"];
+
+
+transform({_Key,undefined})->
+		 undefined;
+transform({accept_ranges,Value})->
+    ["Accept-Ranges:",Value,"\r\n"];
+transform({cache_control,Value})->
+    ["Cache-Control:",Value,"\r\n"];
+transform({pragma,Value})->
+    ["Pragma:",Value,"\r\n"];
+transform({trailer,Value})->
+    ["Trailer:",Value,"\r\n"];
+transform({transfer_encoding,Value})->
+    ["Pragma:",Value,"\r\n"];
+transform({etag,Value})->
+    ["ETag:",Value,"\r\n"];
+transform({location,Value})->
+    ["Retry-After:",Value,"\r\n"];
+transform({server,Value})->
+    ["Server:",Value,"\r\n"];
+transform({allow,Value})->
+    ["Allow:",Value,"\r\n"];
+transform({content_encoding,Value})->
+    ["Content-Encoding:",Value,"\r\n"];
+transform({content_language,Value})->
+    ["Content-Language:",Value,"\r\n"];
+transform({retry_after,Value})->
+    ["Retry-After:",Value,"\r\n"];
+transform({server,Value})->
+    ["Server:",Value,"\r\n"];
+transform({allow,Value})->
+    ["Allow:",Value,"\r\n"];
+transform({content_encoding,Value})->
+    ["Content-Encoding:",Value,"\r\n"];
+transform({content_language,Value})->
+    ["Content-Language:",Value,"\r\n"];
+transform({content_location,Value})->
+    ["Content-Location:",Value,"\r\n"];
+transform({content_length,Value})->
+    ["Content-Length:",Value,"\r\n"];
+transform({content_MD5,Value})->
+    ["Content-MD5:",Value,"\r\n"];
+transform({content_range,Value})->
+    ["Content-Range:",Value,"\r\n"];
+transform({content_type,Value})->
+    ["Content-Type:",Value,"\r\n"];
+transform({expires,Value})->
+    ["Expires:",Value,"\r\n"];
+transform({last_modified,Value})->
+    ["Last-Modified:",Value,"\r\n"].
+
+
+
+%%----------------------------------------------------------------------
+%% This is the old way of sending data it is strongly encouraged to
+%% Leave this method and go on to the newer form of response
+%% OTP-4408
+%%----------------------------------------------------------------------
+
+send_response_old(#mod{socket_type = Type,
+		       socket      = Sock,
+		       method      = "HEAD"} = Info,
+		  StatusCode, Response) ->
+    ?vtrace("send_response_old(HEAD) -> entry with"
+	    "~n   StatusCode: ~p"
+	    "~n   Response:   ~p",
+	    [StatusCode,Response]),
+    case httpd_util:split(lists:flatten(Response),"\r\n\r\n|\n\n",2) of
+	{ok, [Head, Body]} ->
+	    Header =
+		httpd_util:header(StatusCode,Info#mod.connection) ++
+		"Content-Length:" ++ content_length(Body),
+	    httpd_socket:deliver(Type, Sock, [Header,Head,"\r\n"]);
+
+	Error ->
+	    send_status(Info, 500, "Internal Server Error")
+    end;
+
+send_response_old(#mod{socket_type = Type,
+		       socket      = Sock} = Info,
+		  StatusCode, Response) ->
+    ?vtrace("send_response_old -> entry with"
+	    "~n   StatusCode: ~p"
+	    "~n   Response:   ~p",
+	    [StatusCode,Response]),
+    case httpd_util:split(lists:flatten(Response),"\r\n\r\n|\n\n",2) of
+	{ok, [_Head, Body]} ->
+	    Header =
+		httpd_util:header(StatusCode,Info#mod.connection) ++
+		"Content-Length:" ++ content_length(Body),
+	    httpd_socket:deliver(Type, Sock, [Header, Response]);
+
+	{ok, Body} ->
+	    Header =
+		httpd_util:header(StatusCode,Info#mod.connection) ++
+		"Content-Length:" ++ content_length(Body) ++ "\r\n",
+	    httpd_socket:deliver(Type, Sock, [Header, Response]);
+
+	{error, Reason} ->
+	    send_status(Info, 500, "Internal Server Error")
+    end.
+
+content_length(Body)->
+    integer_to_list(httpd_util:flatlength(Body))++"\r\n".
+
+
+report_error(Mod, ConfigDB, Error) ->
+    Modules = httpd_util:lookup(ConfigDB, modules,
+				[mod_get, mod_head, mod_log]),
+    case lists:member(Mod, Modules) of
+	true ->
+	    Mod:report_error(ConfigDB, Error);
+	_ ->
+	    ok
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_socket.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_socket.erl
new file mode 100644
index 0000000000..375b43784b
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_socket.erl
@@ -0,0 +1,381 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_socket.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+-module(httpd_socket).
+-export([start/1,
+	 listen/2, listen/3, accept/2, accept/3,
+	 deliver/3, send/3, recv/4,
+	 close/2,
+	 peername/2, resolve/1, config/1,
+	 controlling_process/3,
+	 active_once/2]).
+
+-include("httpd.hrl").
+
+-define(VMODULE,"SOCKET").
+-include("httpd_verbosity.hrl").
+
+-include_lib("kernel/include/inet.hrl").
+
+%% start -> ok | {error,Reason}
+
+start(ip_comm) ->
+    case inet_db:start() of
+	{ok,_Pid} ->
+	    ok;
+	{error,{already_started,_Pid}} ->
+	    ok;
+	Error ->
+	    Error
+    end;
+start({ssl,_SSLConfig}) ->
+    case ssl:start() of
+	ok ->
+	    ok;
+	{ok, _} ->
+	    ok;
+	{error,{already_started,_}} ->
+	    ok;
+	Error ->
+	    Error
+    end.
+
+%% listen
+
+listen(SocketType,Port) ->
+    listen(SocketType,undefined,Port).
+
+listen(ip_comm,Addr,Port) ->
+    ?DEBUG("listening(ip_comm) to port ~p", [Port]),
+    Opt = sock_opt(Addr,[{backlog,128},{reuseaddr,true}]),
+    case gen_tcp:listen(Port,Opt) of
+	{ok,ListenSocket} ->
+	    ListenSocket;
+	Error ->
+	    Error
+    end;
+listen({ssl,SSLConfig},Addr,Port) ->
+    ?DEBUG("listening(ssl) to port ~p"
+           "~n   SSLConfig: ~p", [Port,SSLConfig]),
+    Opt = sock_opt(Addr,SSLConfig),
+    case ssl:listen(Port, Opt) of
+	{ok,ListenSocket} ->
+	    ListenSocket;
+	Error ->
+	    Error
+    end.
+
+
+sock_opt(undefined,Opt) -> [{packet,0},{active,false}|Opt];
+sock_opt(Addr,Opt)      -> [{ip, Addr},{packet,0},{active,false}|Opt].
+
+%% -define(packet_type_http,true).
+%% -define(packet_type_httph,true).
+
+%% -ifdef(packet_type_http).
+%% sock_opt(undefined,Opt) -> [{packet,http},{active,false}|Opt];
+%% sock_opt(Addr,Opt)      -> [{ip, Addr},{packet,http},{active,false}|Opt].
+%% -elif(packet_type_httph).
+%% sock_opt(undefined,Opt) -> [{packet,httph},{active,false}|Opt];
+%% sock_opt(Addr,Opt)      -> [{ip, Addr},{packet,httph},{active,false}|Opt].
+%% -else.
+%% sock_opt(undefined,Opt) -> [{packet,0},{active,false}|Opt];
+%% sock_opt(Addr,Opt)      -> [{ip, Addr},{packet,0},{active,false}|Opt].
+%% -endif.
+
+
+%% active_once
+
+active_once(Type, Sock) ->
+    active(Type, Sock, once).
+
+active(ip_comm, Sock, Active) ->
+    inet:setopts(Sock, [{active, Active}]);
+active({ssl, _SSLConfig}, Sock, Active) ->
+    ssl:setopts(Sock, [{active, Active}]).
+
+%% accept
+
+accept(A, B) ->
+    accept(A, B, infinity).
+
+
+accept(ip_comm,ListenSocket, T) ->
+    ?DEBUG("accept(ip_comm) on socket ~p", [ListenSocket]),
+    case gen_tcp:accept(ListenSocket, T) of
+	{ok,Socket} ->
+	    Socket;
+	Error ->
+	    ?vtrace("accept(ip_comm) failed for reason:"
+		    "~n   Error: ~p",[Error]),
+	    Error
+    end;
+accept({ssl,_SSLConfig},ListenSocket, T) ->
+    ?DEBUG("accept(ssl) on socket ~p", [ListenSocket]),
+    case ssl:accept(ListenSocket, T) of
+	{ok,Socket} ->
+	    Socket;
+	Error ->
+	    ?vtrace("accept(ssl) failed for reason:"
+		    "~n   Error: ~p",[Error]),
+	    Error
+    end.
+
+
+%% controlling_process
+
+controlling_process(ip_comm, Socket, Pid) ->
+    gen_tcp:controlling_process(Socket, Pid);
+controlling_process({ssl, _}, Socket, Pid) ->
+    ssl:controlling_process(Socket, Pid).
+
+
+%% deliver
+
+deliver(SocketType, Socket, IOListOrBinary)  ->
+    case send(SocketType, Socket, IOListOrBinary) of
+% 	{error, einval} ->
+% 	    ?vlog("deliver failed for reason: einval"
+% 		  "~n   SocketType: ~p"
+% 		  "~n   Socket:     ~p"
+% 		  "~n   Data:       ~p",
+% 		  [SocketType, Socket, type(IOListOrBinary)]),
+% 	    (catch close(SocketType, Socket)),
+% 	    socket_closed;
+	{error, _Reason} ->
+	    ?vlog("deliver(~p) failed for reason:"
+		  "~n   Reason: ~p",[SocketType,_Reason]),
+	    (catch close(SocketType, Socket)),
+	    socket_closed;
+	_ ->
+	    ok
+    end.
+
+% type(L) when list(L) ->
+%     {list, L};
+% type(B) when binary(B) ->
+%     Decoded =
+% 	case (catch binary_to_term(B)) of
+% 	    {'EXIT', _} ->
+% 		%% Oups, not a term, try list
+% 		case (catch binary_to_list(B)) of
+% 		    %% Oups, not a list either, give up
+% 		    {'EXIT', _} ->
+% 			{size, size(B)};
+% 		    L ->
+% 		    {list, L}
+% 		end;
+
+% 	    T ->
+% 		{term, T}
+% 	end,
+%     {binary, Decoded};
+% type(T) when tuple(T) ->
+%     {tuple, T};
+% type(I) when integer(I) ->
+%     {integer, I};
+% type(F) when float(F) ->
+%     {float, F};
+% type(P) when pid(P) ->
+%     {pid, P};
+% type(P) when port(P) ->
+%     {port, P};
+% type(R) when reference(R) ->
+%     {reference, R};
+% type(T) ->
+%     {term, T}.
+
+
+
+send(ip_comm,Socket,Data) ->
+    ?DEBUG("send(ip_comm) -> ~p bytes on socket ~p",[data_size(Data),Socket]),
+    gen_tcp:send(Socket,Data);
+send({ssl,SSLConfig},Socket,Data) ->
+    ?DEBUG("send(ssl) -> ~p bytes on socket ~p",[data_size(Data),Socket]),
+    ssl:send(Socket, Data).
+
+recv(ip_comm,Socket,Length,Timeout) ->
+    ?DEBUG("recv(ip_comm) -> read from socket ~p",[Socket]),
+    gen_tcp:recv(Socket,Length,Timeout);
+recv({ssl,SSLConfig},Socket,Length,Timeout) ->
+    ?DEBUG("recv(ssl) -> read from socket ~p",[Socket]),
+    ssl:recv(Socket,Length,Timeout).
+
+-ifdef(inets_debug).
+data_size(L) when list(L) ->
+    httpd_util:flatlength(L);
+data_size(B) when binary(B) ->
+    size(B);
+data_size(O) ->
+    {unknown_size,O}.
+-endif.
+
+
+%% peername
+
+peername(ip_comm, Socket) ->
+    case inet:peername(Socket) of
+	{ok,{{A,B,C,D},Port}} ->
+	    PeerName = integer_to_list(A)++"."++integer_to_list(B)++"."++
+		integer_to_list(C)++"."++integer_to_list(D),
+	    ?DEBUG("peername(ip_comm) on socket ~p: ~p",
+		   [Socket,{Port,PeerName}]),
+	    {Port,PeerName};
+	{error,Reason} ->
+	    ?vlog("failed getting peername:"
+		  "~n   Reason: ~p"
+		  "~n   Socket: ~p",
+		  [Reason,Socket]),
+	    {-1,"unknown"}
+    end;
+peername({ssl,_SSLConfig},Socket) ->
+    case ssl:peername(Socket) of
+	{ok,{{A,B,C,D},Port}} ->
+	    PeerName = integer_to_list(A)++"."++integer_to_list(B)++"."++
+		integer_to_list(C)++"."++integer_to_list(D),
+	    ?DEBUG("peername(ssl) on socket ~p: ~p",
+		   [Socket, {Port,PeerName}]),
+	    {Port,PeerName};
+	{error,_Reason} ->
+	    {-1,"unknown"}
+    end.
+
+%% resolve
+
+resolve(_) ->
+    {ok,Name} = inet:gethostname(),
+    Name.
+
+%% close
+
+close(ip_comm,Socket) ->
+    Res =
+	case (catch gen_tcp:close(Socket)) of
+	    ok ->                  ok;
+	    {error,Reason} ->      {error,Reason};
+	    {'EXIT',{noproc,_}} -> {error,closed};
+	    {'EXIT',Reason} ->     {error,Reason};
+	    Otherwise ->           {error,Otherwise}
+	end,
+    ?vtrace("close(ip_comm) result: ~p",[Res]),
+    Res;
+close({ssl,_SSLConfig},Socket) ->
+    Res =
+	case (catch ssl:close(Socket)) of
+	    ok ->                  ok;
+	    {error,Reason} ->      {error,Reason};
+	    {'EXIT',{noproc,_}} -> {error,closed};
+	    {'EXIT',Reason} ->     {error,Reason};
+	    Otherwise ->           {error,Otherwise}
+	end,
+    ?vtrace("close(ssl) result: ~p",[Res]),
+    Res.
+
+%% config (debug: {certfile, "/var/tmp/server_root/conf/ssl_server.pem"})
+
+config(ConfigDB) ->
+    case httpd_util:lookup(ConfigDB,com_type,ip_comm) of
+	ssl ->
+	    case ssl_certificate_file(ConfigDB) of
+		undefined ->
+		    {error,
+		     ?NICE("Directive SSLCertificateFile "
+			   "not found in the config file")};
+		SSLCertificateFile ->
+		    {ssl,
+		     SSLCertificateFile++
+		     ssl_certificate_key_file(ConfigDB)++
+		     ssl_verify_client(ConfigDB)++
+		     ssl_ciphers(ConfigDB)++
+		     ssl_password(ConfigDB)++
+		     ssl_verify_depth(ConfigDB)++
+		     ssl_ca_certificate_file(ConfigDB)}
+	    end;
+	ip_comm ->
+	    ip_comm
+    end.
+
+ssl_certificate_file(ConfigDB) ->
+    case httpd_util:lookup(ConfigDB,ssl_certificate_file) of
+	undefined ->
+	    undefined;
+	SSLCertificateFile ->
+	    [{certfile,SSLCertificateFile}]
+    end.
+
+ssl_certificate_key_file(ConfigDB) ->
+    case httpd_util:lookup(ConfigDB,ssl_certificate_key_file) of
+	undefined ->
+	    [];
+	SSLCertificateKeyFile ->
+	    [{keyfile,SSLCertificateKeyFile}]
+    end.
+
+ssl_verify_client(ConfigDB) ->
+    case httpd_util:lookup(ConfigDB,ssl_verify_client) of
+	undefined ->
+	    [];
+	SSLVerifyClient ->
+	    [{verify,SSLVerifyClient}]
+    end.
+
+ssl_ciphers(ConfigDB) ->
+    case httpd_util:lookup(ConfigDB,ssl_ciphers) of
+	undefined ->
+	    [];
+	Ciphers ->
+	    [{ciphers, Ciphers}]
+    end.
+
+ssl_password(ConfigDB) ->
+    case httpd_util:lookup(ConfigDB,ssl_password_callback_module) of
+	undefined ->
+	    [];
+	Module ->
+	    case httpd_util:lookup(ConfigDB, ssl_password_callback_function) of
+		undefined ->
+		    [];
+		Function ->
+		    case catch apply(Module, Function, []) of
+			Password when list(Password) ->
+			    [{password, Password}];
+			Error ->
+			    error_report(ssl_password,Module,Function,Error),
+			    []
+		    end
+	    end
+    end.
+
+ssl_verify_depth(ConfigDB) ->
+    case httpd_util:lookup(ConfigDB, ssl_verify_client_depth) of
+	undefined ->
+	    [];
+	Depth ->
+	    [{depth, Depth}]
+    end.
+
+ssl_ca_certificate_file(ConfigDB) ->
+    case httpd_util:lookup(ConfigDB, ssl_ca_certificate_file) of
+	undefined ->
+	    [];
+	File ->
+	    [{cacertfile, File}]
+    end.
+
+
+error_report(Where,M,F,Error) ->
+    error_logger:error_report([{?MODULE, Where}, {apply, {M, F, []}}, Error]).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_sup.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_sup.erl
new file mode 100644
index 0000000000..e7a3557c9d
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_sup.erl
@@ -0,0 +1,202 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_sup.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+%%----------------------------------------------------------------------
+%% Purpose: The top supervisor for the inets application
+%%----------------------------------------------------------------------
+
+-module(httpd_sup).
+
+-behaviour(supervisor).
+
+-include("httpd_verbosity.hrl").
+
+%% public
+-export([start/2, start_link/2, start2/2, start_link2/2, stop/1, stop/2, stop2/1]).
+-export([init/1]).
+
+
+-define(D(F, A), io:format("~p:" ++ F ++ "~n", [?MODULE|A])).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% supervisor callback functions
+
+start(ConfigFile, Verbosity) ->
+    case start_link(ConfigFile, Verbosity) of
+	{ok, Pid} ->
+	    unlink(Pid),
+	    {ok, Pid};
+
+	Else ->
+	    Else
+    end.
+
+
+start_link(ConfigFile, Verbosity) ->
+    case get_addr_and_port(ConfigFile) of
+	{ok, ConfigList, Addr, Port} ->
+	    Name    = make_name(Addr, Port),
+	    SupName = {local, Name},
+	    supervisor:start_link(SupName, ?MODULE,
+				  [ConfigFile, ConfigList,
+				   Verbosity, Addr, Port]);
+
+	{error, Reason} ->
+	    error_logger:error_report(Reason),
+	    {stop, Reason};
+
+	Else ->
+	    error_logger:error_report(Else),
+	    {stop, Else}
+    end.
+
+
+start2(ConfigList, Verbosity) ->
+    case start_link2(ConfigList, Verbosity) of
+	{ok, Pid} ->
+	    unlink(Pid),
+	    {ok, Pid};
+
+	Else ->
+	    Else
+    end.
+
+
+start_link2(ConfigList, Verbosity) ->
+    case get_addr_and_port2(ConfigList) of
+	{ok, Addr, Port} ->
+	    Name    = make_name(Addr, Port),
+	    SupName = {local, Name},
+	    supervisor:start_link(SupName, ?MODULE,
+				  [undefined, ConfigList, Verbosity, Addr, Port]);
+
+	{error, Reason} ->
+	    error_logger:error_report(Reason),
+	    {stop, Reason};
+
+	Else ->
+	    error_logger:error_report(Else),
+	    {stop, Else}
+    end.
+
+
+
+stop(Pid) when pid(Pid) ->
+    do_stop(Pid);
+stop(ConfigFile) when list(ConfigFile) ->
+    case get_addr_and_port(ConfigFile) of
+	{ok, _, Addr, Port} ->
+	    stop(Addr, Port);
+
+	Error ->
+	    Error
+    end;
+stop(StartArgs) ->
+    ok.
+
+
+stop(Addr, Port) when integer(Port) ->
+    Name = make_name(Addr, Port),
+    case whereis(Name) of
+	Pid when pid(Pid) ->
+	    do_stop(Pid),
+	    ok;
+	_ ->
+	    not_started
+    end.
+
+stop2(ConfigList) when list(ConfigList) ->
+    {ok, Addr, Port} = get_addr_and_port2(ConfigList),
+    stop(Addr, Port).
+
+
+do_stop(Pid) ->
+    exit(Pid, shutdown).
+
+
+init([ConfigFile, ConfigList, Verbosity, Addr, Port]) ->
+    init(ConfigFile, ConfigList, Verbosity, Addr, Port);
+init(BadArg) ->
+    {error, {badarg, BadArg}}.
+
+init(ConfigFile, ConfigList, Verbosity, Addr, Port) ->
+    Flags = {one_for_one, 0, 1},
+    AccSupVerbosity  = get_acc_sup_verbosity(Verbosity),
+    MiscSupVerbosity = get_misc_sup_verbosity(Verbosity),
+    Sups  = [sup_spec(httpd_acceptor_sup, Addr, Port, AccSupVerbosity),
+	     sup_spec(httpd_misc_sup, Addr, Port, MiscSupVerbosity),
+	     worker_spec(httpd_manager, Addr, Port, ConfigFile, ConfigList,
+			 Verbosity, [gen_server])],
+    {ok, {Flags, Sups}}.
+
+
+sup_spec(Name, Addr, Port, Verbosity) ->
+    {{Name, Addr, Port},
+     {Name, start, [Addr, Port, Verbosity]},
+     permanent, 2000, supervisor, [Name, supervisor]}.
+
+worker_spec(Name, Addr, Port, ConfigFile, ConfigList, Verbosity, Modules) ->
+    {{Name, Addr, Port},
+     {Name, start_link, [ConfigFile, ConfigList, Verbosity]},
+     permanent, 2000, worker, [Name] ++ Modules}.
+
+
+make_name(Addr,Port) ->
+    httpd_util:make_name("httpd_sup",Addr,Port).
+
+
+%% get_addr_and_port
+
+get_addr_and_port(ConfigFile) ->
+    case httpd_conf:load(ConfigFile) of
+	{ok, ConfigList} ->
+	    {ok, Addr, Port} = get_addr_and_port2(ConfigList),
+	    {ok, ConfigList, Addr, Port};
+	Error ->
+	    Error
+    end.
+
+
+get_addr_and_port2(ConfigList) ->
+    Port = httpd_util:key1search(ConfigList, port, 80),
+    Addr = httpd_util:key1search(ConfigList, bind_address),
+    {ok, Addr, Port}.
+
+get_acc_sup_verbosity(V) ->
+    case key1search(V, all) of
+	undefined ->
+	    key1search(V, acceptor_sup_verbosity, ?default_verbosity);
+	Verbosity ->
+	    Verbosity
+    end.
+
+
+get_misc_sup_verbosity(V) ->
+    case key1search(V, all) of
+	undefined ->
+	    key1search(V, misc_sup_verbosity, ?default_verbosity);
+	Verbosity ->
+	    Verbosity
+    end.
+
+
+key1search(L, K) ->
+    httpd_util:key1search(L, K).
+
+key1search(L, K, D) ->
+    httpd_util:key1search(L, K, D).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_util.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_util.erl
new file mode 100644
index 0000000000..045e6f6516
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_util.erl
@@ -0,0 +1,773 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_util.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+-module(httpd_util).
+-export([key1search/2, key1search/3, lookup/2, lookup/3, multi_lookup/2,
+	 lookup_mime/2, lookup_mime/3, lookup_mime_default/2,
+	 lookup_mime_default/3, reason_phrase/1, message/3, rfc1123_date/0,
+	 rfc1123_date/1, day/1, month/1, decode_hex/1, decode_base64/1, encode_base64/1,
+	 flatlength/1, split_path/1, split_script_path/1, suffix/1, to_upper/1,
+	 to_lower/1, split/3, header/2, header/3, header/4, uniq/1,
+	 make_name/2,make_name/3,make_name/4,strip/1,
+	 hexlist_to_integer/1,integer_to_hexlist/1,
+	 convert_request_date/1,create_etag/1,create_etag/2,getSize/1,
+	 response_generated/1]).
+
+%%Since hexlist_to_integer is a lousy name make a name convert
+-export([encode_hex/1]).
+-include("httpd.hrl").
+
+%% key1search
+
+key1search(TupleList,Key) ->
+  key1search(TupleList,Key,undefined).
+
+key1search(TupleList,Key,Undefined) ->
+  case lists:keysearch(Key,1,TupleList) of
+    {value,{Key,Value}} ->
+      Value;
+    false ->
+      Undefined
+  end.
+
+%% lookup
+
+lookup(Table,Key) ->
+  lookup(Table,Key,undefined).
+
+lookup(Table,Key,Undefined) ->
+    case catch ets:lookup(Table,Key) of
+	[{Key,Value}|_] ->
+	    Value;
+	_->
+	    Undefined
+    end.
+
+%% multi_lookup
+
+multi_lookup(Table,Key) ->
+    remove_key(ets:lookup(Table,Key)).
+
+remove_key([]) ->
+    [];
+remove_key([{_Key,Value}|Rest]) ->
+    [Value|remove_key(Rest)].
+
+%% lookup_mime
+
+lookup_mime(ConfigDB,Suffix) ->
+    lookup_mime(ConfigDB,Suffix,undefined).
+
+lookup_mime(ConfigDB,Suffix,Undefined) ->
+    [{mime_types,MimeTypesDB}|_]=ets:lookup(ConfigDB,mime_types),
+    case ets:lookup(MimeTypesDB,Suffix) of
+	[] ->
+	    Undefined;
+	[{Suffix,MimeType}|_] ->
+	    MimeType
+    end.
+
+%% lookup_mime_default
+
+lookup_mime_default(ConfigDB,Suffix) ->
+    lookup_mime_default(ConfigDB,Suffix,undefined).
+
+lookup_mime_default(ConfigDB,Suffix,Undefined) ->
+    [{mime_types,MimeTypesDB}|_]=ets:lookup(ConfigDB,mime_types),
+    case ets:lookup(MimeTypesDB,Suffix) of
+	[] ->
+	    case ets:lookup(ConfigDB,default_type) of
+		[] ->
+		    Undefined;
+		[{default_type,DefaultType}|_] ->
+		    DefaultType
+	    end;
+	[{Suffix,MimeType}|_] ->
+	    MimeType
+    end.
+
+%% reason_phrase
+reason_phrase(100) -> "Continue";
+reason_phrase(101) -> "Swithing protocol";
+reason_phrase(200) -> "OK";
+reason_phrase(201) -> "Created";
+reason_phrase(202) -> "Accepted";
+reason_phrase(204) -> "No Content";
+reason_phrase(205) -> "Reset Content";
+reason_phrase(206) -> "Partial Content";
+reason_phrase(301) -> "Moved Permanently";
+reason_phrase(302) -> "Moved Temporarily";
+reason_phrase(304) -> "Not Modified";
+reason_phrase(400) -> "Bad Request";
+reason_phrase(401) -> "Unauthorized";
+reason_phrase(402) -> "Payment Required";
+reason_phrase(403) -> "Forbidden";
+reason_phrase(404) -> "Not Found";
+reason_phrase(405) -> "Method Not Allowed";
+reason_phrase(408) -> "Request Timeout";
+reason_phrase(411) -> "Length Required";
+reason_phrase(414) -> "Request-URI Too Long";
+reason_phrase(412) -> "Precondition Failed";
+reason_phrase(416) -> "request Range Not Satisfiable";
+reason_phrase(417) -> "Expectation failed";
+reason_phrase(500) -> "Internal Server Error";
+reason_phrase(501) -> "Not Implemented";
+reason_phrase(502) -> "Bad Gateway";
+reason_phrase(503) -> "Service Unavailable";
+reason_phrase(_) -> "Internal Server Error".
+
+%% message
+
+message(301,URL,_) ->
+  "The document has moved <A HREF=\""++URL++"\">here</A>.";
+message(304,_URL,_) ->
+    "The document has not been changed.";
+message(400,none,_) ->
+  "Your browser sent a query that this server could not understand.";
+message(401,none,_) ->
+  "This server could not verify that you
+are authorized to access the document you
+requested.  Either you supplied the wrong
+credentials (e.g., bad password), or your
+browser does not understand how to supply
+the credentials required.";
+message(403,RequestURI,_) ->
+  "You do not have permission to access "++RequestURI++" on this server.";
+message(404,RequestURI,_) ->
+  "The requested URL "++RequestURI++" was not found on this server.";
+message(412,none,_) ->
+  "The requested preconditions where false";
+message(414,ReasonPhrase,_) ->
+  "Message "++ReasonPhrase++".";
+message(416,ReasonPhrase,_) ->
+    ReasonPhrase;
+
+message(500,none,ConfigDB) ->
+  ServerAdmin=lookup(ConfigDB,server_admin,"unknown@unknown"),
+  "The server encountered an internal error or
+misconfiguration and was unable to complete
+your request.
+<P>Please contact the server administrator "++ServerAdmin++",
+and inform them of the time the error occurred
+and anything you might have done that may have
+caused the error.";
+message(501,{Method,RequestURI,HTTPVersion},_ConfigDB) ->
+  Method++" to "++RequestURI++" ("++HTTPVersion++") not supported.";
+message(503,String,_ConfigDB) ->
+  "This service in unavailable due to: "++String.
+
+%%convert_rfc_date(Date)->{{YYYY,MM,DD},{HH,MIN,SEC}}
+
+convert_request_date([D,A,Y,DateType|Rest]) ->
+    Func=case DateType of
+	     $\, ->
+		 fun convert_rfc1123_date/1;
+	     $\  ->
+		 fun convert_ascii_date/1;
+	     _ ->
+		 fun convert_rfc850_date/1
+	 end,
+    case catch Func([D,A,Y,DateType|Rest])of
+	{ok,Date} ->
+	    Date;
+	_Error ->
+	    bad_date
+    end.
+
+convert_rfc850_date(DateStr) ->
+    case string:tokens(DateStr," ") of
+	[_WeekDay,Date,Time,_TimeZone|_Rest] ->
+	   convert_rfc850_date(Date,Time);
+	_Error ->
+	    bad_date
+    end.
+
+convert_rfc850_date([D1,D2,_,M,O,N,_,Y1,Y2|_Rest],[H1,H2,_Col,M1,M2,_Col,S1,S2|_Rest2])->
+    Year=list_to_integer([50,48,Y1,Y2]),
+    Day=list_to_integer([D1,D2]),
+    Month=convert_month([M,O,N]),
+    Hour=list_to_integer([H1,H2]),
+    Min=list_to_integer([M1,M2]),
+    Sec=list_to_integer([S1,S2]),
+    {ok,{{Year,Month,Day},{Hour,Min,Sec}}};
+convert_rfc850_date(_BadDate,_BadTime)->
+    bad_date.
+
+convert_ascii_date([_D,_A,_Y,_SP,M,O,N,_SP,D1,D2,_SP,H1,H2,_Col,M1,M2,_Col,S1,S2,_SP,Y1,Y2,Y3,Y4|_Rest])->
+    Year=list_to_integer([Y1,Y2,Y3,Y4]),
+    Day=case D1 of
+	$\ ->
+	    list_to_integer([D2]);
+	_->
+	    list_to_integer([D1,D2])
+    end,
+    Month=convert_month([M,O,N]),
+    Hour=list_to_integer([H1,H2]),
+    Min=list_to_integer([M1,M2]),
+    Sec=list_to_integer([S1,S2]),
+    {ok,{{Year,Month,Day},{Hour,Min,Sec}}};
+convert_ascii_date(BadDate)->
+    bad_date.
+convert_rfc1123_date([_D,_A,_Y,_C,_SP,D1,D2,_SP,M,O,N,_SP,Y1,Y2,Y3,Y4,_SP,H1,H2,_Col,M1,M2,_Col,S1,S2|Rest])->
+    Year=list_to_integer([Y1,Y2,Y3,Y4]),
+    Day=list_to_integer([D1,D2]),
+    Month=convert_month([M,O,N]),
+    Hour=list_to_integer([H1,H2]),
+    Min=list_to_integer([M1,M2]),
+    Sec=list_to_integer([S1,S2]),
+    {ok,{{Year,Month,Day},{Hour,Min,Sec}}};
+convert_rfc1123_date(BadDate)->
+    bad_date.
+
+convert_month("Jan")->1;
+convert_month("Feb") ->2;
+convert_month("Mar") ->3;
+convert_month("Apr") ->4;
+convert_month("May") ->5;
+convert_month("Jun") ->6;
+convert_month("Jul") ->7;
+convert_month("Aug") ->8;
+convert_month("Sep") ->9;
+convert_month("Oct") ->10;
+convert_month("Nov") ->11;
+convert_month("Dec") ->12.
+
+
+%% rfc1123_date
+
+rfc1123_date() ->
+  {{YYYY,MM,DD},{Hour,Min,Sec}}=calendar:universal_time(),
+  DayNumber=calendar:day_of_the_week({YYYY,MM,DD}),
+  lists:flatten(io_lib:format("~s, ~2.2.0w ~3.s ~4.4.0w ~2.2.0w:~2.2.0w:~2.2.0w GMT",
+                        [day(DayNumber),DD,month(MM),YYYY,Hour,Min,Sec])).
+
+rfc1123_date({{YYYY,MM,DD},{Hour,Min,Sec}}) ->
+  DayNumber=calendar:day_of_the_week({YYYY,MM,DD}),
+  lists:flatten(io_lib:format("~s, ~2.2.0w ~3.s ~4.4.0w ~2.2.0w:~2.2.0w:~2.2.0w GMT",
+                        [day(DayNumber),DD,month(MM),YYYY,Hour,Min,Sec])).
+
+%% uniq
+
+uniq([]) ->
+    [];
+uniq([First,First|Rest]) ->
+    uniq([First|Rest]);
+uniq([First|Rest]) ->
+    [First|uniq(Rest)].
+
+
+%% day
+
+day(1) -> "Mon";
+day(2) -> "Tue";
+day(3) -> "Wed";
+day(4) -> "Thu";
+day(5) -> "Fri";
+day(6) -> "Sat";
+day(7) -> "Sun".
+
+%% month
+
+month(1) -> "Jan";
+month(2) -> "Feb";
+month(3) -> "Mar";
+month(4) -> "Apr";
+month(5) -> "May";
+month(6) -> "Jun";
+month(7) -> "Jul";
+month(8) -> "Aug";
+month(9) -> "Sep";
+month(10) -> "Oct";
+month(11) -> "Nov";
+month(12) -> "Dec".
+
+%% decode_hex
+
+decode_hex([$%,Hex1,Hex2|Rest]) ->
+  [hex2dec(Hex1)*16+hex2dec(Hex2)|decode_hex(Rest)];
+decode_hex([First|Rest]) ->
+  [First|decode_hex(Rest)];
+decode_hex([]) ->
+  [].
+
+hex2dec(X) when X>=$0,X=<$9 -> X-$0;
+hex2dec(X) when X>=$A,X=<$F -> X-$A+10;
+hex2dec(X) when X>=$a,X=<$f -> X-$a+10.
+
+%% decode_base64 (DEBUG STRING: QWxhZGRpbjpvcGVuIHNlc2FtZQ==)
+
+decode_base64([]) ->
+  [];
+decode_base64([Sextet1,Sextet2,$=,$=|Rest]) ->
+  Bits2x6=
+    (d(Sextet1) bsl 18) bor
+    (d(Sextet2) bsl 12),
+  Octet1=Bits2x6 bsr 16,
+  [Octet1|decode_base64(Rest)];
+decode_base64([Sextet1,Sextet2,Sextet3,$=|Rest]) ->
+  Bits3x6=
+    (d(Sextet1) bsl 18) bor
+    (d(Sextet2) bsl 12) bor
+    (d(Sextet3) bsl 6),
+  Octet1=Bits3x6 bsr 16,
+  Octet2=(Bits3x6 bsr 8) band 16#ff,
+  [Octet1,Octet2|decode_base64(Rest)];
+decode_base64([Sextet1,Sextet2,Sextet3,Sextet4|Rest]) ->
+  Bits4x6=
+    (d(Sextet1) bsl 18) bor
+    (d(Sextet2) bsl 12) bor
+    (d(Sextet3) bsl 6) bor
+    d(Sextet4),
+  Octet1=Bits4x6 bsr 16,
+  Octet2=(Bits4x6 bsr 8) band 16#ff,
+  Octet3=Bits4x6 band 16#ff,
+  [Octet1,Octet2,Octet3|decode_base64(Rest)];
+decode_base64(CatchAll) ->
+  "BAD!".
+
+d(X) when X >= $A, X =<$Z ->
+    X-65;
+d(X) when X >= $a, X =<$z ->
+    X-71;
+d(X) when X >= $0, X =<$9 ->
+    X+4;
+d($+) -> 62;
+d($/) -> 63;
+d(_) -> 63.
+
+
+encode_base64([]) ->
+    [];
+encode_base64([A]) ->
+    [e(A bsr 2), e((A band 3) bsl 4), $=, $=];
+encode_base64([A,B]) ->
+    [e(A bsr 2), e(((A band 3) bsl 4) bor (B bsr 4)), e((B band 15) bsl 2), $=];
+encode_base64([A,B,C|Ls]) ->
+    encode_base64_do(A,B,C, Ls).
+encode_base64_do(A,B,C, Rest) ->
+    BB = (A bsl 16) bor (B bsl 8) bor C,
+    [e(BB bsr 18), e((BB bsr 12) band 63),
+     e((BB bsr 6) band 63), e(BB band 63)|encode_base64(Rest)].
+
+e(X) when X >= 0, X < 26 -> X+65;
+e(X) when X>25, X<52 ->     X+71;
+e(X) when X>51, X<62 ->     X-4;
+e(62) ->                    $+;
+e(63) ->                    $/;
+e(X) ->                     exit({bad_encode_base64_token, X}).
+
+
+%% flatlength
+
+flatlength(List) ->
+    flatlength(List, 0).
+
+flatlength([H|T],L) when list(H) ->
+    flatlength(H,flatlength(T,L));
+flatlength([H|T],L) when binary(H) ->
+    flatlength(T,L+size(H));
+flatlength([H|T],L) ->
+    flatlength(T,L+1);
+flatlength([],L) ->
+  L.
+
+%% split_path
+
+split_path(Path) ->
+    case regexp:match(Path,"[\?].*\$") of
+	%% A QUERY_STRING exists!
+	{match,Start,Length} ->
+	    {httpd_util:decode_hex(string:substr(Path,1,Start-1)),
+	     string:substr(Path,Start,Length)};
+	%% A possible PATH_INFO exists!
+	nomatch ->
+	    split_path(Path,[])
+    end.
+
+split_path([],SoFar) ->
+    {httpd_util:decode_hex(lists:reverse(SoFar)),[]};
+split_path([$/|Rest],SoFar) ->
+    Path=httpd_util:decode_hex(lists:reverse(SoFar)),
+    case file:read_file_info(Path) of
+	{ok,FileInfo} when FileInfo#file_info.type == regular ->
+	    {Path,[$/|Rest]};
+	{ok,FileInfo} ->
+	    split_path(Rest,[$/|SoFar]);
+	{error,Reason} ->
+	    split_path(Rest,[$/|SoFar])
+    end;
+split_path([C|Rest],SoFar) ->
+    split_path(Rest,[C|SoFar]).
+
+%% split_script_path
+
+split_script_path(Path) ->
+    case split_script_path(Path, []) of
+	{Script, AfterPath} ->
+	    {PathInfo, QueryString} = pathinfo_querystring(AfterPath),
+	    {Script, {PathInfo, QueryString}};
+	not_a_script ->
+	    not_a_script
+    end.
+
+pathinfo_querystring(Str) ->
+    pathinfo_querystring(Str, []).
+pathinfo_querystring([], SoFar) ->
+    {lists:reverse(SoFar), []};
+pathinfo_querystring([$?|Rest], SoFar) ->
+    {lists:reverse(SoFar), Rest};
+pathinfo_querystring([C|Rest], SoFar) ->
+    pathinfo_querystring(Rest, [C|SoFar]).
+
+split_script_path([$?|QueryString], SoFar) ->
+    Path = httpd_util:decode_hex(lists:reverse(SoFar)),
+    case file:read_file_info(Path) of
+	{ok,FileInfo} when FileInfo#file_info.type == regular ->
+	    {Path, [$?|QueryString]};
+	{ok,FileInfo} ->
+	    not_a_script;
+	{error,Reason} ->
+	    not_a_script
+    end;
+split_script_path([], SoFar) ->
+    Path = httpd_util:decode_hex(lists:reverse(SoFar)),
+    case file:read_file_info(Path) of
+	{ok,FileInfo} when FileInfo#file_info.type == regular ->
+	    {Path, []};
+	{ok,FileInfo} ->
+	    not_a_script;
+	{error,Reason} ->
+	    not_a_script
+    end;
+split_script_path([$/|Rest], SoFar) ->
+    Path = httpd_util:decode_hex(lists:reverse(SoFar)),
+    case file:read_file_info(Path) of
+	{ok, FileInfo} when FileInfo#file_info.type == regular ->
+	    {Path, [$/|Rest]};
+	{ok, _FileInfo} ->
+	    split_script_path(Rest, [$/|SoFar]);
+	{error, _Reason} ->
+	    split_script_path(Rest, [$/|SoFar])
+    end;
+split_script_path([C|Rest], SoFar) ->
+    split_script_path(Rest,[C|SoFar]).
+
+%% suffix
+
+suffix(Path) ->
+    case filename:extension(Path) of
+	[] ->
+	    [];
+	Extension ->
+	    tl(Extension)
+    end.
+
+%% to_upper
+
+to_upper([C|Cs]) when C >= $a, C =< $z ->
+    [C-($a-$A)|to_upper(Cs)];
+to_upper([C|Cs]) ->
+    [C|to_upper(Cs)];
+to_upper([]) ->
+    [].
+
+%% to_lower
+
+to_lower([C|Cs]) when C >= $A, C =< $Z ->
+    [C+($a-$A)|to_lower(Cs)];
+to_lower([C|Cs]) ->
+    [C|to_lower(Cs)];
+to_lower([]) ->
+    [].
+
+
+%% strip
+strip(Value)->
+    lists:reverse(remove_ws(lists:reverse(remove_ws(Value)))).
+
+remove_ws([$\s|Rest])->
+    remove_ws(Rest);
+remove_ws([$\t|Rest]) ->
+    remove_ws(Rest);
+remove_ws(Rest) ->
+    Rest.
+
+%% split
+
+split(String,RegExp,Limit) ->
+    case regexp:parse(RegExp) of
+	{error,Reason} ->
+	    {error,Reason};
+	{ok,_} ->
+	    {ok,do_split(String,RegExp,Limit)}
+    end.
+
+do_split(String,RegExp,1) ->
+    [String];
+
+do_split(String,RegExp,Limit) ->
+    case regexp:first_match(String,RegExp) of
+	{match,Start,Length} ->
+	    [string:substr(String,1,Start-1)|
+	     do_split(lists:nthtail(Start+Length-1,String),RegExp,Limit-1)];
+	nomatch ->
+	    [String]
+    end.
+
+%% header
+header(StatusCode,Date)when list(Date)->
+    header(StatusCode,"text/plain",false);
+
+header(StatusCode, PersistentConnection) when integer(StatusCode)->
+    Date = rfc1123_date(),
+    Connection =
+	case PersistentConnection of
+	    true ->
+		"";
+	    _ ->
+		"Connection: close \r\n"
+	end,
+    io_lib:format("HTTP/1.1 ~w ~s \r\nDate: ~s\r\nServer: ~s\r\n~s",
+		  [StatusCode, httpd_util:reason_phrase(StatusCode),
+		   Date, ?SERVER_SOFTWARE, Connection]).
+
+%%----------------------------------------------------------------------
+
+header(StatusCode, MimeType, Date) when list(Date) ->
+    header(StatusCode, MimeType, false,rfc1123_date());
+
+
+header(StatusCode, MimeType, PersistentConnection) when integer(StatusCode) ->
+    header(StatusCode, MimeType, PersistentConnection,rfc1123_date()).
+
+
+%%----------------------------------------------------------------------
+
+header(416, MimeType,PersistentConnection,Date)->
+    Connection =
+	case PersistentConnection of
+	    true ->
+		"";
+	    _ ->
+		"Connection: close \r\n"
+	end,
+    io_lib:format("HTTP/1.1 ~w ~s \r\nDate: ~s\r\nServer: ~s\r\n"
+		  "Content-Range:bytes *"
+		  "Content-Type: ~s\r\n~s",
+		  [416, httpd_util:reason_phrase(416),
+		   Date, ?SERVER_SOFTWARE, MimeType, Connection]);
+
+
+header(StatusCode, MimeType,PersistentConnection,Date) when integer(StatusCode)->
+    Connection =
+	case PersistentConnection of
+	    true ->
+		"";
+	    _ ->
+		"Connection: close \r\n"
+	end,
+    io_lib:format("HTTP/1.1 ~w ~s \r\nDate: ~s\r\nServer: ~s\r\n"
+		  "Content-Type: ~s\r\n~s",
+		  [StatusCode, httpd_util:reason_phrase(StatusCode),
+		   Date, ?SERVER_SOFTWARE, MimeType, Connection]).
+
+
+
+%% make_name/2, make_name/3
+%% Prefix  -> string()
+%%            First part of the name, e.g. "httpd"
+%% Addr    -> {A,B,C,D} | string() | undefined
+%%            The address part of the name.
+%%            e.g. "123.234.55.66" or {123,234,55,66} or "otp.ericsson.se"
+%%            for a host address or undefined if local host.
+%% Port    -> integer()
+%%            Last part of the name, such as the HTTPD server port
+%%            number (80).
+%% Postfix -> Any string that will be added last to the name
+%%
+%% Example:
+%% make_name("httpd","otp.ericsson.se",80) => httpd__otp_ericsson_se__80
+%% make_name("httpd",undefined,8088)       => httpd_8088
+
+make_name(Prefix,Port) ->
+    make_name(Prefix,undefined,Port,"").
+
+make_name(Prefix,Addr,Port) ->
+    make_name(Prefix,Addr,Port,"").
+
+make_name(Prefix,"*",Port,Postfix) ->
+    make_name(Prefix,undefined,Port,Postfix);
+
+make_name(Prefix,any,Port,Postfix) ->
+    make_name1(io_lib:format("~s_~w~s",[Prefix,Port,Postfix]));
+
+make_name(Prefix,undefined,Port,Postfix) ->
+    make_name1(io_lib:format("~s_~w~s",[Prefix,Port,Postfix]));
+
+make_name(Prefix,Addr,Port,Postfix) ->
+    NameString =
+        Prefix ++ "__" ++ make_name2(Addr) ++ "__" ++
+	integer_to_list(Port) ++ Postfix,
+    make_name1(NameString).
+
+make_name1(String) ->
+    list_to_atom(lists:flatten(String)).
+
+make_name2({A,B,C,D}) ->
+    io_lib:format("~w_~w_~w_~w",[A,B,C,D]);
+make_name2(Addr) ->
+    search_and_replace(Addr,$.,$_).
+
+search_and_replace(S,A,B) ->
+    Fun = fun(What) ->
+                  case What of
+                      A -> B;
+                      O -> O
+                  end
+          end,
+    lists:map(Fun,S).
+
+
+
+%%----------------------------------------------------------------------
+%% Converts  a string that constists of 0-9,A-F,a-f to a
+%% integer
+%%----------------------------------------------------------------------
+
+hexlist_to_integer([])->
+    empty;
+
+
+%%When the string only contains one value its eaasy done.
+%% 0-9
+hexlist_to_integer([Size]) when Size>=48 , Size=<57 ->
+   Size-48;
+%% A-F
+hexlist_to_integer([Size]) when Size>=65 , Size=<70 ->
+    Size-55;
+%% a-f
+hexlist_to_integer([Size]) when Size>=97 , Size=<102 ->
+    Size-87;
+hexlist_to_integer([Size]) ->
+    not_a_num;
+
+hexlist_to_integer(Size) ->
+    Len=string:span(Size,"1234567890abcdefABCDEF"),
+    hexlist_to_integer2(Size,16 bsl (4 *(Len-2)),0).
+
+hexlist_to_integer2([],_Pos,Sum)->
+    Sum;
+hexlist_to_integer2([HexVal|HexString],Pos,Sum)when HexVal>=48,HexVal=<57->
+    hexlist_to_integer2(HexString,Pos bsr 4,Sum+((HexVal-48)*Pos));
+
+hexlist_to_integer2([HexVal|HexString],Pos,Sum)when HexVal>=65,HexVal=<70->
+    hexlist_to_integer2(HexString,Pos bsr 4,Sum+((HexVal-55)*Pos));
+
+hexlist_to_integer2([HexVal|HexString],Pos,Sum)when HexVal>=97,HexVal=<102->
+    hexlist_to_integer2(HexString,Pos bsr 4,Sum+((HexVal-87)*Pos));
+
+hexlist_to_integer2(_AfterHexString,_Pos,Sum)->
+    Sum.
+
+%%----------------------------------------------------------------------
+%%Converts an integer to an hexlist
+%%----------------------------------------------------------------------
+encode_hex(Num)->
+    integer_to_hexlist(Num).
+
+
+integer_to_hexlist(Num)->
+    integer_to_hexlist(Num,getSize(Num),[]).
+
+integer_to_hexlist(Num,Pot,Res) when Pot<0 ->
+    convert_to_ascii([Num|Res]);
+
+integer_to_hexlist(Num,Pot,Res) ->
+    Position=(16 bsl (Pot*4)),
+    PosVal=Num div Position,
+    integer_to_hexlist(Num-(PosVal*Position),Pot-1,[PosVal|Res]).
+convert_to_ascii(RevesedNum)->
+    convert_to_ascii(RevesedNum,[]).
+
+convert_to_ascii([],Num)->
+    Num;
+convert_to_ascii([Num|Reversed],Number)when Num>-1, Num<10 ->
+    convert_to_ascii(Reversed,[Num+48|Number]);
+convert_to_ascii([Num|Reversed],Number)when Num>9, Num<16 ->
+    convert_to_ascii(Reversed,[Num+55|Number]);
+convert_to_ascii(NumReversed,Number) ->
+    error.
+
+
+
+getSize(Num)->
+    getSize(Num,0).
+
+getSize(Num,Pot)when Num<(16 bsl(Pot *4))  ->
+    Pot-1;
+
+getSize(Num,Pot) ->
+    getSize(Num,Pot+1).
+
+
+
+
+
+create_etag(FileInfo)->
+    create_etag(FileInfo#file_info.mtime,FileInfo#file_info.size).
+
+create_etag({{Year,Month,Day},{Hour,Min,Sec}},Size)->
+    create_part([Year,Month,Day,Hour,Min,Sec])++io_lib:write(Size);
+
+create_etag(FileInfo,Size)->
+    create_etag(FileInfo#file_info.mtime,Size).
+
+create_part(Values)->
+    lists:map(fun(Val0)->
+		      Val=Val0 rem 60,
+			  if
+			      Val=<25 ->
+				  65+Val;  % A-Z
+			      Val=<50 ->
+				  72+Val;  % a-z
+			      %%Since no date s
+			      true ->
+				  Val-3
+			  end
+	      end,Values).
+
+
+
+%%----------------------------------------------------------------------
+%%Function that controls whether a response is generated or not
+%%----------------------------------------------------------------------
+response_generated(Info)->
+    case httpd_util:key1search(Info#mod.data,status) of
+	%% A status code has been generated!
+	{StatusCode,PhraseArgs,Reason}->
+	    true;
+	%%No status code control repsonsxe
+	undefined ->
+	    case httpd_util:key1search(Info#mod.data, response) of
+		%% No response has been generated!
+		undefined ->
+		    false;
+		%% A response has been generated or sent!
+		Response ->
+		    true
+	    end
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_verbosity.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_verbosity.erl
new file mode 100644
index 0000000000..f676eb4c99
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_verbosity.erl
@@ -0,0 +1,93 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_verbosity.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+-module(httpd_verbosity).
+
+-include_lib("stdlib/include/erl_compile.hrl").
+
+-export([print/4,print/5,printc/4,validate/1]).
+
+print(silence,_Severity,_Format,_Arguments) ->
+    ok;
+print(Verbosity,Severity,Format,Arguments) ->
+    print1(printable(Verbosity,Severity),Format,Arguments).
+
+
+print(silence,_Severity,_Module,_Format,_Arguments) ->
+    ok;
+print(Verbosity,Severity,Module,Format,Arguments) ->
+    print1(printable(Verbosity,Severity),Module,Format,Arguments).
+
+
+printc(silence,Severity,Format,Arguments) ->
+    ok;
+printc(Verbosity,Severity,Format,Arguments) ->
+    print2(printable(Verbosity,Severity),Format,Arguments).
+
+
+print1(false,_Format,_Arguments) -> ok;
+print1(Verbosity,Format,Arguments) ->
+    V = image_of_verbosity(Verbosity),
+    S = image_of_sname(get(sname)),
+    io:format("** HTTPD ~s ~s: " ++ Format ++ "~n",[S,V]++Arguments).
+
+print1(false,_Module,_Format,_Arguments) -> ok;
+print1(Verbosity,Module,Format,Arguments) ->
+    V = image_of_verbosity(Verbosity),
+    S = image_of_sname(get(sname)),
+    io:format("** HTTPD ~s ~s ~s: " ++ Format ++ "~n",[S,Module,V]++Arguments).
+
+
+print2(false,_Format,_Arguments) -> ok;
+print2(_Verbosity,Format,Arguments) ->
+    io:format(Format ++ "~n",Arguments).
+
+
+%% printable(Verbosity,Severity)
+printable(info,info)      -> info;
+printable(log,info)       -> info;
+printable(log,log)        -> log;
+printable(debug,info)     -> info;
+printable(debug,log)      -> log;
+printable(debug,debug)    -> debug;
+printable(trace,V)        -> V;
+printable(_Verb,_Sev)     -> false.
+
+
+image_of_verbosity(info)  -> "INFO";
+image_of_verbosity(log)   -> "LOG";
+image_of_verbosity(debug) -> "DEBUG";
+image_of_verbosity(trace) -> "TRACE";
+image_of_verbosity(_)     -> "".
+
+%% ShortName
+image_of_sname(acc)           -> "ACCEPTOR";
+image_of_sname(acc_sup)       -> "ACCEPTOR_SUP";
+image_of_sname(auth)          -> "AUTH";
+image_of_sname(man)           -> "MANAGER";
+image_of_sname(misc_sup)      -> "MISC_SUP";
+image_of_sname(sec)           -> "SECURITY";
+image_of_sname(P) when pid(P) -> io_lib:format("REQUEST_HANDLER(~p)",[P]);
+image_of_sname(undefined)     -> "";
+image_of_sname(V)             -> io_lib:format("~p",[V]).
+
+
+validate(info)  -> info;
+validate(log)   -> log;
+validate(debug) -> debug;
+validate(trace) -> trace;
+validate(_)     -> silence.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_verbosity.hrl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_verbosity.hrl
new file mode 100644
index 0000000000..cecaf693d3
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/httpd_verbosity.hrl
@@ -0,0 +1,62 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: httpd_verbosity.hrl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+
+-ifndef(dont_use_verbosity).
+
+-ifndef(default_verbosity).
+-define(default_verbosity,silence).
+-endif.
+
+-define(vvalidate(V), httpd_verbosity:validate(V)).
+
+-ifdef(VMODULE).
+
+-define(vinfo(F,A), httpd_verbosity:print(get(verbosity),info, ?VMODULE,F,A)).
+-define(vlog(F,A),  httpd_verbosity:print(get(verbosity),log,  ?VMODULE,F,A)).
+-define(vdebug(F,A),httpd_verbosity:print(get(verbosity),debug,?VMODULE,F,A)).
+-define(vtrace(F,A),httpd_verbosity:print(get(verbosity),trace,?VMODULE,F,A)).
+
+-else.
+
+-define(vinfo(F,A), httpd_verbosity:print(get(verbosity),info, F,A)).
+-define(vlog(F,A),  httpd_verbosity:print(get(verbosity),log,  F,A)).
+-define(vdebug(F,A),httpd_verbosity:print(get(verbosity),debug,F,A)).
+-define(vtrace(F,A),httpd_verbosity:print(get(verbosity),trace,F,A)).
+
+-endif.
+
+-define(vinfoc(F,A), httpd_verbosity:printc(get(verbosity),info, F,A)).
+-define(vlogc(F,A),  httpd_verbosity:printc(get(verbosity),log,  F,A)).
+-define(vdebugc(F,A),httpd_verbosity:printc(get(verbosity),debug,F,A)).
+-define(vtracec(F,A),httpd_verbosity:printc(get(verbosity),trace,F,A)).
+
+-else.
+
+-define(vvalidate(V),ok).
+
+-define(vinfo(F,A),ok).
+-define(vlog(F,A),ok).
+-define(vdebug(F,A),ok).
+-define(vtrace(F,A),ok).
+
+-define(vinfoc(F,A),ok).
+-define(vlogc(F,A),ok).
+-define(vdebugc(F,A),ok).
+-define(vtracec(F,A),ok).
+
+-endif.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets.app.src b/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets.app.src
new file mode 100644
index 0000000000..750dbc6dba
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets.app.src
@@ -0,0 +1,56 @@
+{application,inets,
+ [{description,"INETS  CXC 138 49"},
+  {vsn,"%VSN%"},
+  {modules,[
+	    %% FTP
+	    ftp,
+
+            %% HTTP client:
+            http,
+            http_lib,
+            httpc_handler,
+            httpc_manager,
+            uri,
+
+            %% HTTP server:
+            httpd,
+            httpd_acceptor,
+            httpd_acceptor_sup,
+            httpd_conf,
+            httpd_example,
+            httpd_manager,
+            httpd_misc_sup,
+            httpd_parse,
+            httpd_request_handler,
+            httpd_response,
+            httpd_socket,
+            httpd_sup,
+            httpd_util,
+            httpd_verbosity,
+            inets_sup,
+            mod_actions,
+            mod_alias,
+            mod_auth,
+	    mod_auth_dets,
+	    mod_auth_mnesia,
+	    mod_auth_plain,
+	    mod_auth_server,
+            mod_browser,
+	    mod_cgi,
+            mod_dir,
+            mod_disk_log,
+            mod_esi,
+            mod_get,
+            mod_head,
+            mod_htaccess,
+            mod_include,
+            mod_log,
+	    mod_range,
+	    mod_responsecontrol,
+	    mod_security,
+	    mod_security_server,
+	    mod_trace
+	]},
+  {registered,[inets_sup]},
+  {applications,[kernel,stdlib]},
+  {mod,{inets_sup,[]}}]}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets.appup.src b/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets.appup.src
new file mode 100644
index 0000000000..e9ad0d0fe2
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets.appup.src
@@ -0,0 +1,133 @@
+{"%VSN%",
+ [{"3.0.5",
+   [
+    {load_module, ftp, soft_purge, soft_purge, []}
+   ]
+  },
+  {"3.0.4",
+   [
+    {update, httpd_acceptor, soft, soft_purge, soft_purge, []}
+   ]
+  },
+  {"3.0.3",
+   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
+    {load_module, httpd_conf, soft_purge, soft_purge, []},
+    {load_module, httpd_socket, soft_purge, soft_purge, []},
+    {load_module, httpd_response, soft_purge, soft_purge, [mod_disk_log]},
+    {load_module, mod_disk_log, soft_purge, soft_purge, []},
+    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
+    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
+    {update, httpd_manager, soft, soft_purge, soft_purge,
+     [mod_disk_log, httpd_conf, httpd_socket]}]
+  },
+  {"3.0.2",
+   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
+    {load_module, httpd_conf, soft_purge, soft_purge, []},
+    {load_module, httpd_socket, soft_purge, soft_purge, []},
+    {load_module, mod_disk_log, soft_purge, soft_purge, []},
+    {load_module, httpd_response, soft_purge, soft_purge, [mod_disk_log]},
+    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
+    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
+    {update, httpd_manager, soft, soft_purge, soft_purge,
+     [httpd_request_handler, httpd_conf, httpd_socket]},
+    {update, httpd_request_handler, soft, soft_purge, soft_purge,
+     [httpd_response]}]
+  },
+  {"3.0.1",
+   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
+    {load_module, httpd_conf, soft_purge, soft_purge, []},
+    {load_module, httpd_socket, soft_purge, soft_purge, []},
+    {load_module, httpd_response, soft_purge, soft_purge,
+     [mod_auth, mod_disk_log]},
+    {load_module, mod_disk_log, soft_purge, soft_purge, []},
+    {load_module, mod_auth, soft_purge, soft_purge, []},
+    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
+    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
+    {update, httpd_manager, soft, soft_purge, soft_purge,
+     [httpd_request_handler, httpd_conf, httpd_socket]},
+    {update, httpd_request_handler, soft, soft_purge, soft_purge,
+     [httpd_response]}]
+  },
+  {"3.0",
+   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
+    {load_module, httpd_conf, soft_purge, soft_purge, []},
+    {load_module, httpd_socket, soft_purge, soft_purge, []},
+    {load_module, httpd_response, soft_purge, soft_purge,
+     [mod_auth, mod_disk_log]},
+    {load_module, mod_disk_log, soft_purge, soft_purge, []},
+    {load_module, mod_auth, soft_purge, soft_purge, []},
+    {update, httpd_sup, soft, soft_purge, soft_purge,
+     [httpd_manager, httpd_misc_sup]},
+    {update, httpd_misc_sup, soft, soft_purge, soft_purge, []},
+    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
+    {update, httpd_manager, soft, soft_purge, soft_purge,
+     [httpd_request_handler, httpd_conf, httpd_socket]},
+    {update, httpd_request_handler, soft, soft_purge, soft_purge,
+     [httpd_response]}]
+  }
+ ],
+ [{"3.0.5",
+   [
+    {load_module, ftp, soft_purge, soft_purge, []}
+   ]
+  },
+  {"3.0.4",
+   [{update, httpd_acceptor, soft, soft_purge, soft_purge, []}]
+  },
+  {"3.0.3",
+   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
+    {load_module, httpd_conf, soft_purge, soft_purge, []},
+    {load_module, httpd_socket, soft_purge, soft_purge, []},
+    {load_module, httpd_response, soft_purge, soft_purge, [mod_disk_log]},
+    {load_module, mod_disk_log, soft_purge, soft_purge, []},
+    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
+    {update, httpd_manager, soft, soft_purge, soft_purge,
+     [mod_disk_log, httpd_conf, httpd_socket]}]
+  },
+  {"3.0.2",
+   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
+    {load_module, httpd_conf, soft_purge, soft_purge, []},
+    {load_module, httpd_socket, soft_purge, soft_purge, []},
+    {load_module, httpd_response, soft_purge, soft_purge, [mod_disk_log]},
+    {load_module, mod_disk_log, soft_purge, soft_purge, []},
+    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
+    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
+    {update, httpd_manager, soft, soft_purge, soft_purge,
+     [httpd_request_handler, httpd_conf, httpd_socket]},
+    {update, httpd_request_handler, soft, soft_purge, soft_purge,
+     [httpd_response]}]
+  },
+  {"3.0.1",
+   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
+    {load_module, httpd_conf, soft_purge, soft_purge, []},
+    {load_module, httpd_socket, soft_purge, soft_purge, []},
+    {load_module, httpd_response, soft_purge, soft_purge,
+     [mod_auth, mod_disk_log]},
+    {load_module, mod_disk_log, soft_purge, soft_purge, []},
+    {load_module, mod_auth, soft_purge, soft_purge, []},
+    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
+    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
+    {update, httpd_manager, soft, soft_purge, soft_purge,
+     [httpd_request_handler, httpd_conf, httpd_socket]},
+    {update, httpd_request_handler, soft, soft_purge, soft_purge,
+     [httpd_response]}]
+  },
+  {"3.0",
+   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
+    {load_module, httpd_conf, soft_purge, soft_purge, []},
+    {load_module, httpd_socket, soft_purge, soft_purge, []},
+    {load_module, httpd_response, soft_purge, soft_purge,
+     [mod_auth, mod_disk_log]},
+    {load_module, mod_disk_log, soft_purge, soft_purge, []},
+    {load_module, mod_auth, soft_purge, soft_purge, []},
+    {update, httpd_sup, soft, soft_purge, soft_purge,
+     [httpd_manager, httpd_misc_sup]},
+    {update, httpd_misc_sup, soft, soft_purge, soft_purge, []},
+    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
+    {update, httpd_manager, soft, soft_purge, soft_purge,
+     [httpd_request_handler, httpd_conf, httpd_socket]},
+    {update, httpd_request_handler, soft, soft_purge, soft_purge,
+     [httpd_response]}]
+  }
+ ]
+}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets.config b/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets.config
new file mode 100644
index 0000000000..814ddd9fc0
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets.config
@@ -0,0 +1,2 @@
+[{inets,[{services,[{httpd,"/var/tmp/server_root/conf/8888.conf"},
+		    {httpd,"/var/tmp/server_root/conf/8080.conf"}]}]}].
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets_sup.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets_sup.erl
new file mode 100644
index 0000000000..878fa2c54b
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/inets_sup.erl
@@ -0,0 +1,158 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: inets_sup.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+-module(inets_sup).
+
+-export([crock/0]).
+-export([start/2, stop/1, init/1]).
+-export([start_child/2, stop_child/2, which_children/0]).
+
+
+%% crock (Used for debugging!)
+
+crock() ->
+    application:start(sasl),
+    application:start(inets).
+
+
+%% start
+
+start(Type, State) ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+
+%% stop
+
+stop(State) ->
+    ok.
+
+
+%% start_child
+
+start_child(ConfigFile, Verbosity) ->
+    {ok, Spec} = httpd_child_spec(ConfigFile, Verbosity),
+    supervisor:start_child(?MODULE, Spec).
+
+
+%% stop_child
+
+stop_child(Addr, Port) ->
+    Name = {httpd_sup, Addr, Port},
+    case supervisor:terminate_child(?MODULE, Name) of
+        ok ->
+            supervisor:delete_child(?MODULE, Name);
+        Error ->
+            Error
+    end.
+
+
+%% which_children
+
+which_children() ->
+    supervisor:which_children(?MODULE).
+
+
+%% init
+
+init([]) ->
+    case get_services() of
+	{error, Reason} ->
+	    {error,Reason};
+	Services ->
+	    SupFlags = {one_for_one, 10, 3600},
+	    {ok, {SupFlags, child_spec(Services, [])}}
+    end.
+
+get_services() ->
+    case (catch application:get_env(inets, services)) of
+	{ok, Services} ->
+	    Services;
+	_ ->
+	    []
+    end.
+
+
+child_spec([], Acc) ->
+    Acc;
+child_spec([{httpd, ConfigFile, Verbosity}|Rest], Acc) ->
+    case httpd_child_spec(ConfigFile, Verbosity) of
+	{ok, Spec} ->
+	    child_spec(Rest, [Spec | Acc]);
+	{error, Reason} ->
+	    error_msg("Failed creating child spec "
+		      "using ~p for reason: ~p", [ConfigFile, Reason]),
+	    child_spec(Rest, Acc)
+    end;
+child_spec([{httpd, ConfigFile}|Rest], Acc) ->
+    case httpd_child_spec(ConfigFile, []) of
+	{ok, Spec} ->
+	    child_spec(Rest, [Spec | Acc]);
+	{error, Reason} ->
+	    error_msg("Failed creating child spec "
+		      "using ~p for reason: ~p", [ConfigFile, Reason]),
+	    child_spec(Rest, Acc)
+    end.
+
+
+httpd_child_spec(ConfigFile, Verbosity) ->
+    case httpd_conf:load(ConfigFile) of
+	{ok, ConfigList} ->
+	    Port = httpd_util:key1search(ConfigList, port, 80),
+	    Addr = httpd_util:key1search(ConfigList, bind_address),
+	    {ok, httpd_child_spec(ConfigFile, Addr, Port, Verbosity)};
+	Error ->
+	    Error
+    end.
+
+
+httpd_child_spec(ConfigFile, Addr, Port, Verbosity) ->
+    {{httpd_sup, Addr, Port},{httpd_sup, start_link,[ConfigFile, Verbosity]},
+     permanent, 20000, supervisor,
+     [ftp,
+      httpd,
+      httpd_conf,
+      httpd_example,
+      httpd_manager,
+      httpd_misc_sup,
+      httpd_listener,
+      httpd_parse,
+      httpd_request,
+      httpd_response,
+      httpd_socket,
+      httpd_sup,
+      httpd_util,
+      httpd_verbosity,
+      inets_sup,
+      mod_actions,
+      mod_alias,
+      mod_auth,
+      mod_cgi,
+      mod_dir,
+      mod_disk_log,
+      mod_esi,
+      mod_get,
+      mod_head,
+      mod_include,
+      mod_log,
+      mod_auth_mnesia,
+      mod_auth_plain,
+      mod_auth_dets,
+      mod_security]}.
+
+
+error_msg(F, A) ->
+    error_logger:error_msg(F ++ "~n", A).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/jnets_httpd.hrl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/jnets_httpd.hrl
new file mode 100644
index 0000000000..0a96560c92
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/jnets_httpd.hrl
@@ -0,0 +1,138 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Mobile Arts AB
+%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
+%% All Rights Reserved.''
+%%
+%%
+
+-include_lib("kernel/include/file.hrl").
+
+-define(SOCKET_CHUNK_SIZE,8192).
+-define(SOCKET_MAX_POLL,25).
+-define(FILE_CHUNK_SIZE,64*1024).
+-define(NICE(Reason),lists:flatten(atom_to_list(?MODULE)++": "++Reason)).
+-define(DEFAULT_CONTEXT,
+	[{errmsg,"[an error occurred while processing this directive]"},
+	 {timefmt,"%A, %d-%b-%y %T %Z"},
+	 {sizefmt,"abbrev"}]).
+
+
+-ifdef(inets_debug).
+-define(DEBUG(Format, Args), io:format("D(~p:~p:~p) : "++Format++"~n",
+				       [self(),?MODULE,?LINE]++Args)).
+-else.
+-define(DEBUG(F,A),[]).
+-endif.
+
+-define(MAXBODYSIZE,16#ffffffff).
+
+-define(HTTP_VERSION_10,0).
+-define(HTTP_VERSION_11,1).
+
+-define(CR,13).
+-define(LF,10).
+
+
+-record(init_data,{peername,resolve}).
+
+
+-record(mod,{
+	  init_data,           %
+	  data= [],            % list() Used to propagate data between modules
+	  socket_type=ip_comm, % socket_type() IP or SSL socket
+	  socket,              % socket() Actual socket
+	  config_db,           % ets() {key,val} db with config entries
+	  method,              % atom() HTTP method, e.g. 'GET'
+%	  request_uri,         % string() Request URI
+	  path,                % string() Absolute path. May include query etc
+	  http_version,        % int() HTTP minor version number, e.g. 0 or 1
+%	  request_line,        % string() Request Line
+	  headers,             % #req_headers{} Parsed request headers
+	  entity_body= <<>>,   % binary() Body of request
+	  connection,          % boolean() true if persistant connection
+	  status_code,         % int() Status code
+	  logging              % int() 0=No logging
+	                       %       1=Only mod_log present
+	                       %       2=Only mod_disk_log present
+	                       %       3=Both mod_log and mod_disk_log present
+	 }).
+
+% -record(ssl,{
+% 	  certfile,      %
+% 	  keyfile,       %
+% 	  verify= 0,     %
+% 	  ciphers,       %
+% 	  password,      %
+% 	  depth = 1,     %
+% 	  cacertfile,    %
+
+% 	  cachetimeout   % Found in yaws....
+% 	 }).
+
+
+-record(http_request,{
+	  method,  % atom() if known else string() HTTP methd
+	  path,    % {abs_path,string()} URL path
+	  version  % {int(),int()}  {Major,Minor} HTTP version
+	 }).
+
+-record(http_response,{
+	  version, % {int(),int()}  {Major,Minor} HTTP version
+	  status,  % int() Status code
+	  phrase   % string() HTTP Reason phrase
+	 }).
+
+
+%%% Request headers
+-record(req_headers,{
+%%% --- Standard "General" headers
+% 	  cache_control,
+	  connection="keep-alive",
+% 	  date,
+% 	  pragma,
+% 	  trailer,
+	  transfer_encoding,
+% 	  upgrade,
+% 	  via,
+% 	  warning,
+%%% --- Standard "Request" headers
+% 	  accept,
+% 	  accept_charset,
+% 	  accept_encoding,
+% 	  accept_language,
+	  authorization,
+	  expect, %% FIXME! Update inet_drv.c!!
+% 	  from,
+	  host,
+	  if_match,
+	  if_modified_since,
+	  if_none_match,
+	  if_range,
+	  if_unmodified_since,
+% 	  max_forwards,
+% 	  proxy_authorization,
+	  range,
+% 	  referer,
+% 	  te, %% FIXME! Update inet_drv.c!!
+	  user_agent,
+%%% --- Standard "Entity" headers
+% 	  content_encoding,
+% 	  content_language,
+	  content_length="0",
+% 	  content_location,
+% 	  content_md5,
+% 	  content_range,
+	  content_type,
+% 	  last_modified,
+	  other=[]        % (list) Key/Value list with other headers
+	 }).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_actions.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_actions.erl
new file mode 100644
index 0000000000..47395d4c12
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_actions.erl
@@ -0,0 +1,92 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_actions.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+-module(mod_actions).
+-export([do/1,load/2]).
+
+-include("httpd.hrl").
+
+%% do
+
+do(Info) ->
+  case httpd_util:key1search(Info#mod.data,status) of
+    %% A status code has been generated!
+    {StatusCode,PhraseArgs,Reason} ->
+      {proceed,Info#mod.data};
+    %% No status code has been generated!
+    undefined ->
+      case httpd_util:key1search(Info#mod.data,response) of
+	%% No response has been generated!
+	undefined ->
+	  Path=mod_alias:path(Info#mod.data,Info#mod.config_db,
+			      Info#mod.request_uri),
+	  Suffix=httpd_util:suffix(Path),
+	  MimeType=httpd_util:lookup_mime(Info#mod.config_db,Suffix,
+					  "text/plain"),
+	  Actions=httpd_util:multi_lookup(Info#mod.config_db,action),
+	  case action(Info#mod.request_uri,MimeType,Actions) of
+	    {yes,RequestURI} ->
+	      {proceed,[{new_request_uri,RequestURI}|Info#mod.data]};
+	    no ->
+	      Scripts=httpd_util:multi_lookup(Info#mod.config_db,script),
+	      case script(Info#mod.request_uri,Info#mod.method,Scripts) of
+		{yes,RequestURI} ->
+		  {proceed,[{new_request_uri,RequestURI}|Info#mod.data]};
+		no ->
+		  {proceed,Info#mod.data}
+	      end
+	  end;
+	%% A response has been generated or sent!
+	Response ->
+	  {proceed,Info#mod.data}
+      end
+  end.
+
+action(RequestURI,MimeType,[]) ->
+  no;
+action(RequestURI,MimeType,[{MimeType,CGIScript}|Rest]) ->
+  {yes,CGIScript++RequestURI};
+action(RequestURI,MimeType,[_|Rest]) ->
+  action(RequestURI,MimeType,Rest).
+
+script(RequestURI,Method,[]) ->
+  no;
+script(RequestURI,Method,[{Method,CGIScript}|Rest]) ->
+  {yes,CGIScript++RequestURI};
+script(RequestURI,Method,[_|Rest]) ->
+  script(RequestURI,Method,Rest).
+
+%%
+%% Configuration
+%%
+
+%% load
+
+load([$A,$c,$t,$i,$o,$n,$ |Action],[]) ->
+  case regexp:split(Action," ") of
+    {ok,[MimeType,CGIScript]} ->
+      {ok,[],{action,{MimeType,CGIScript}}};
+    {ok,_} ->
+      {error,?NICE(httpd_conf:clean(Action)++" is an invalid Action")}
+  end;
+load([$S,$c,$r,$i,$p,$t,$ |Script],[]) ->
+  case regexp:split(Script," ") of
+    {ok,[Method,CGIScript]} ->
+      {ok,[],{script,{Method,CGIScript}}};
+    {ok,_} ->
+      {error,?NICE(httpd_conf:clean(Script)++" is an invalid Script")}
+  end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_alias.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_alias.erl
new file mode 100644
index 0000000000..6b8f7210c4
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_alias.erl
@@ -0,0 +1,175 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_alias.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+-module(mod_alias).
+-export([do/1,real_name/3,real_script_name/3,default_index/2,load/2,path/3]).
+
+-include("httpd.hrl").
+
+%% do
+
+do(Info) ->
+    ?DEBUG("do -> entry",[]),
+    case httpd_util:key1search(Info#mod.data,status) of
+	%% A status code has been generated!
+	{StatusCode,PhraseArgs,Reason} ->
+	    {proceed,Info#mod.data};
+	%% No status code has been generated!
+	undefined ->
+	    case httpd_util:key1search(Info#mod.data,response) of
+		%% No response has been generated!
+		undefined ->
+		    do_alias(Info);
+		%% A response has been generated or sent!
+		Response ->
+		    {proceed,Info#mod.data}
+	    end
+    end.
+
+do_alias(Info) ->
+    ?DEBUG("do_alias -> Request URI: ~p",[Info#mod.request_uri]),
+    {ShortPath,Path,AfterPath} =
+	real_name(Info#mod.config_db,Info#mod.request_uri,
+		  httpd_util:multi_lookup(Info#mod.config_db,alias)),
+    %% Relocate if a trailing slash is missing else proceed!
+    LastChar = lists:last(ShortPath),
+    case file:read_file_info(ShortPath) of
+	{ok,FileInfo} when FileInfo#file_info.type == directory,LastChar /= $/ ->
+	    ?LOG("do_alias -> ~n"
+		 "      ShortPath: ~p~n"
+		 "      LastChar:  ~p~n"
+		 "      FileInfo:  ~p",
+		 [ShortPath,LastChar,FileInfo]),
+	    ServerName = httpd_util:lookup(Info#mod.config_db,server_name),
+	    Port = port_string(httpd_util:lookup(Info#mod.config_db,port,80)),
+	    URL = "http://"++ServerName++Port++Info#mod.request_uri++"/",
+	    ReasonPhrase = httpd_util:reason_phrase(301),
+	    Message = httpd_util:message(301,URL,Info#mod.config_db),
+	    {proceed,
+	     [{response,
+	       {301, ["Location: ", URL, "\r\n"
+		      "Content-Type: text/html\r\n",
+		      "\r\n",
+		      "<HTML>\n<HEAD>\n<TITLE>",ReasonPhrase,
+		      "</TITLE>\n</HEAD>\n"
+		      "<BODY>\n<H1>",ReasonPhrase,
+		      "</H1>\n", Message,
+		      "\n</BODY>\n</HTML>\n"]}}|
+	      [{real_name,{Path,AfterPath}}|Info#mod.data]]};
+	NoFile ->
+	    {proceed,[{real_name,{Path,AfterPath}}|Info#mod.data]}
+    end.
+
+port_string(80) ->
+    "";
+port_string(Port) ->
+    ":"++integer_to_list(Port).
+
+%% real_name
+
+real_name(ConfigDB, RequestURI,[]) ->
+    DocumentRoot = httpd_util:lookup(ConfigDB, document_root, ""),
+    RealName = DocumentRoot++RequestURI,
+    {ShortPath, _AfterPath} = httpd_util:split_path(RealName),
+    {Path, AfterPath}=httpd_util:split_path(default_index(ConfigDB,RealName)),
+    {ShortPath, Path, AfterPath};
+real_name(ConfigDB, RequestURI, [{FakeName,RealName}|Rest]) ->
+    case regexp:match(RequestURI, "^"++FakeName) of
+	{match, _, _} ->
+	    {ok, ActualName, _} = regexp:sub(RequestURI,
+					     "^"++FakeName, RealName),
+	    {ShortPath, _AfterPath} = httpd_util:split_path(ActualName),
+	    {Path, AfterPath} =
+		httpd_util:split_path(default_index(ConfigDB, ActualName)),
+	    {ShortPath, Path, AfterPath};
+	nomatch ->
+	    real_name(ConfigDB,RequestURI,Rest)
+    end.
+
+%% real_script_name
+
+real_script_name(ConfigDB,RequestURI,[]) ->
+    not_a_script;
+real_script_name(ConfigDB,RequestURI,[{FakeName,RealName}|Rest]) ->
+    case regexp:match(RequestURI,"^"++FakeName) of
+	{match,_,_} ->
+	    {ok,ActualName,_}=regexp:sub(RequestURI,"^"++FakeName,RealName),
+	    httpd_util:split_script_path(default_index(ConfigDB,ActualName));
+	nomatch ->
+	    real_script_name(ConfigDB,RequestURI,Rest)
+    end.
+
+%% default_index
+
+default_index(ConfigDB, Path) ->
+    case file:read_file_info(Path) of
+	{ok, FileInfo} when FileInfo#file_info.type == directory ->
+	    DirectoryIndex = httpd_util:lookup(ConfigDB, directory_index, []),
+	    append_index(Path, DirectoryIndex);
+	_ ->
+	    Path
+    end.
+
+append_index(RealName, []) ->
+    RealName;
+append_index(RealName, [Index|Rest]) ->
+    case file:read_file_info(filename:join(RealName, Index)) of
+	{error,Reason} ->
+	    append_index(RealName, Rest);
+	_ ->
+	    filename:join(RealName,Index)
+    end.
+
+%% path
+
+path(Data, ConfigDB, RequestURI) ->
+    case httpd_util:key1search(Data,real_name) of
+	undefined ->
+	    DocumentRoot = httpd_util:lookup(ConfigDB, document_root, ""),
+	    {Path,AfterPath} =
+		httpd_util:split_path(DocumentRoot++RequestURI),
+	    Path;
+	{Path,AfterPath} ->
+	    Path
+    end.
+
+%%
+%% Configuration
+%%
+
+%% load
+
+load([$D,$i,$r,$e,$c,$t,$o,$r,$y,$I,$n,$d,$e,$x,$ |DirectoryIndex],[]) ->
+    {ok, DirectoryIndexes} = regexp:split(DirectoryIndex," "),
+    {ok,[], {directory_index, DirectoryIndexes}};
+load([$A,$l,$i,$a,$s,$ |Alias],[]) ->
+    case regexp:split(Alias," ") of
+	{ok, [FakeName, RealName]} ->
+	    {ok,[],{alias,{FakeName,RealName}}};
+	{ok, _} ->
+	    {error,?NICE(httpd_conf:clean(Alias)++" is an invalid Alias")}
+    end;
+load([$S,$c,$r,$i,$p,$t,$A,$l,$i,$a,$s,$ |ScriptAlias],[]) ->
+    case regexp:split(ScriptAlias," ") of
+	{ok, [FakeName, RealName]} ->
+	    %% Make sure the path always has a trailing slash..
+	    RealName1 = filename:join(filename:split(RealName)),
+	    {ok, [], {script_alias,{FakeName, RealName1++"/"}}};
+	{ok, _} ->
+	    {error, ?NICE(httpd_conf:clean(ScriptAlias)++
+			  " is an invalid ScriptAlias")}
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth.erl
new file mode 100644
index 0000000000..9f3289c826
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth.erl
@@ -0,0 +1,748 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_auth.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+-module(mod_auth).
+
+
+%% The functions that the webbserver call on startup stop
+%% and when the server traverse the modules.
+-export([do/1, load/2, store/2, remove/1]).
+
+%% User entries to the gen-server.
+-export([add_user/2, add_user/5, add_user/6,
+	 add_group_member/3, add_group_member/4, add_group_member/5,
+	 list_users/1, list_users/2, list_users/3,
+	 delete_user/2, delete_user/3, delete_user/4,
+	 delete_group_member/3, delete_group_member/4, delete_group_member/5,
+	 list_groups/1, list_groups/2, list_groups/3,
+	 delete_group/2, delete_group/3, delete_group/4,
+	 get_user/2, get_user/3, get_user/4,
+	 list_group_members/2, list_group_members/3, list_group_members/4,
+	 update_password/6, update_password/5]).
+
+-include("httpd.hrl").
+-include("mod_auth.hrl").
+
+-define(VMODULE,"AUTH").
+-include("httpd_verbosity.hrl").
+
+-define(NOPASSWORD,"NoPassword").
+
+
+%% do
+do(Info) ->
+    ?vtrace("do", []),
+    case httpd_util:key1search(Info#mod.data,status) of
+	%% A status code has been generated!
+	{StatusCode,PhraseArgs,Reason} ->
+	    {proceed, Info#mod.data};
+	%% No status code has been generated!
+	undefined ->
+	    case httpd_util:key1search(Info#mod.data,response) of
+		%% No response has been generated!
+		undefined ->
+		    Path = mod_alias:path(Info#mod.data,Info#mod.config_db,
+					  Info#mod.request_uri),
+		    %% Is it a secret area?
+		    case secretp(Path,Info#mod.config_db) of
+			{yes, Directory, DirectoryData} ->
+			    %% Authenticate (allow)
+			    case allow((Info#mod.init_data)#init_data.peername,
+				       Info#mod.socket_type,Info#mod.socket,
+				       DirectoryData) of
+				allowed ->
+				    case deny((Info#mod.init_data)#init_data.peername,
+					      Info#mod.socket_type, Info#mod.socket,
+					      DirectoryData) of
+					not_denied ->
+					    case httpd_util:key1search(DirectoryData,
+								       auth_type) of
+						undefined ->
+						    {proceed, Info#mod.data};
+						none ->
+						    {proceed, Info#mod.data};
+						AuthType ->
+						    do_auth(Info,
+							    Directory,
+							    DirectoryData,
+							    AuthType)
+					    end;
+					{denied, Reason} ->
+					    {proceed,
+					     [{status,{403,Info#mod.request_uri,Reason}}|
+					      Info#mod.data]}
+				    end;
+				{not_allowed, Reason} ->
+				    {proceed,[{status,{403,Info#mod.request_uri,Reason}}|
+					      Info#mod.data]}
+			    end;
+			no ->
+			    {proceed, Info#mod.data}
+		    end;
+		%% A response has been generated or sent!
+		Response ->
+		    {proceed, Info#mod.data}
+	    end
+    end.
+
+
+do_auth(Info, Directory, DirectoryData, AuthType) ->
+    %% Authenticate (require)
+    case require(Info, Directory, DirectoryData) of
+	authorized ->
+	    {proceed,Info#mod.data};
+	{authorized, User} ->
+	    {proceed, [{remote_user,User}|Info#mod.data]};
+	{authorization_failed, Reason} ->
+	    ?vtrace("do_auth -> authorization_failed: ~p",[Reason]),
+	    {proceed, [{status,{401,none,Reason}}|Info#mod.data]};
+	{authorization_required, Realm} ->
+	    ?vtrace("do_auth -> authorization_required: ~p",[Realm]),
+	    ReasonPhrase = httpd_util:reason_phrase(401),
+	    Message = httpd_util:message(401,none,Info#mod.config_db),
+	    {proceed,
+	     [{response,
+	       {401,
+		["WWW-Authenticate: Basic realm=\"",Realm,
+		 "\"\r\n\r\n","<HTML>\n<HEAD>\n<TITLE>",
+		 ReasonPhrase,"</TITLE>\n",
+		 "</HEAD>\n<BODY>\n<H1>",ReasonPhrase,
+		 "</H1>\n",Message,"\n</BODY>\n</HTML>\n"]}}|
+	      Info#mod.data]};
+	{status, {StatusCode,PhraseArgs,Reason}} ->
+	    {proceed, [{status,{StatusCode,PhraseArgs,Reason}}|
+		       Info#mod.data]}
+    end.
+
+
+%% require
+
+require(Info, Directory, DirectoryData) ->
+    ParsedHeader = Info#mod.parsed_header,
+    ValidUsers   = httpd_util:key1search(DirectoryData, require_user),
+    ValidGroups  = httpd_util:key1search(DirectoryData, require_group),
+
+    %% Any user or group restrictions?
+    case ValidGroups of
+	undefined when ValidUsers == undefined ->
+	    authorized;
+	_ ->
+	    case httpd_util:key1search(ParsedHeader, "authorization") of
+		%% Authorization required!
+		undefined ->
+		    case httpd_util:key1search(DirectoryData, auth_name) of
+			undefined ->
+			    {status,{500,none,?NICE("AuthName directive not specified")}};
+			Realm ->
+			    {authorization_required, Realm}
+		    end;
+		%% Check credentials!
+		[$B,$a,$s,$i,$c,$ | EncodedString] ->
+		    DecodedString = httpd_util:decode_base64(EncodedString),
+		    case a_valid_user(Info, DecodedString,
+				      ValidUsers, ValidGroups,
+				      Directory, DirectoryData) of
+			{yes, User} ->
+			    {authorized, User};
+			{no, Reason} ->
+			    {authorization_failed, Reason};
+			{status, {StatusCode,PhraseArgs,Reason}} ->
+			    {status,{StatusCode,PhraseArgs,Reason}}
+		    end;
+		%% Bad credentials!
+		BadCredentials ->
+		    {status,{401,none,?NICE("Bad credentials "++BadCredentials)}}
+	    end
+    end.
+
+a_valid_user(Info,DecodedString,ValidUsers,ValidGroups,Dir,DirData) ->
+    case httpd_util:split(DecodedString,":",2) of
+	{ok,[SupposedUser, Password]} ->
+	    case user_accepted(SupposedUser, ValidUsers) of
+		true ->
+		    check_password(SupposedUser, Password, Dir, DirData);
+		false ->
+		    case group_accepted(Info,SupposedUser,ValidGroups,Dir,DirData) of
+			true ->
+			    check_password(SupposedUser,Password,Dir,DirData);
+			false ->
+			    {no,?NICE("No such user exists")}
+		    end
+	    end;
+	{ok,BadCredentials} ->
+	    {status,{401,none,?NICE("Bad credentials "++BadCredentials)}}
+    end.
+
+user_accepted(SupposedUser, undefined) ->
+    false;
+user_accepted(SupposedUser, ValidUsers) ->
+    lists:member(SupposedUser, ValidUsers).
+
+
+group_accepted(Info, User, undefined, Dir, DirData) ->
+    false;
+group_accepted(Info, User, [], Dir, DirData) ->
+    false;
+group_accepted(Info, User, [Group|Rest], Dir, DirData) ->
+    Ret = int_list_group_members(Group, Dir, DirData),
+    case Ret of
+	{ok, UserList} ->
+	    case lists:member(User, UserList) of
+		true ->
+		    true;
+		false ->
+		    group_accepted(Info, User, Rest, Dir, DirData)
+	    end;
+	Other ->
+	    false
+    end.
+
+check_password(User, Password, Dir, DirData) ->
+    case int_get_user(DirData, User) of
+	{ok, UStruct} ->
+	    case UStruct#httpd_user.password of
+		Password ->
+		    %% FIXME
+		    {yes, UStruct#httpd_user.username};
+		Other ->
+		    {no, "No such user"}   % Don't say 'Bad Password' !!!
+	    end;
+	_ ->
+	    {no, "No such user"}
+    end.
+
+
+%% Middle API. Theese functions call the appropriate authentication module.
+int_get_user(DirData, User) ->
+    AuthMod = auth_mod_name(DirData),
+    apply(AuthMod, get_user, [DirData, User]).
+
+int_list_group_members(Group, Dir, DirData) ->
+    AuthMod = auth_mod_name(DirData),
+    apply(AuthMod, list_group_members, [DirData, Group]).
+
+auth_mod_name(DirData) ->
+    case httpd_util:key1search(DirData, auth_type, plain) of
+	plain ->    mod_auth_plain;
+	mnesia ->   mod_auth_mnesia;
+	dets ->	    mod_auth_dets
+    end.
+
+
+%%
+%% Is it a secret area?
+%%
+
+%% secretp
+
+secretp(Path,ConfigDB) ->
+    Directories = ets:match(ConfigDB,{directory,'$1','_'}),
+    case secret_path(Path, Directories) of
+	{yes,Directory} ->
+	    {yes,Directory,
+	     lists:flatten(ets:match(ConfigDB,{directory,Directory,'$1'}))};
+	no ->
+	    no
+    end.
+
+secret_path(Path,Directories) ->
+    secret_path(Path, httpd_util:uniq(lists:sort(Directories)),to_be_found).
+
+secret_path(Path,[],to_be_found) ->
+    no;
+secret_path(Path,[],Directory) ->
+    {yes,Directory};
+secret_path(Path,[[NewDirectory]|Rest],Directory) ->
+    case regexp:match(Path,NewDirectory) of
+	{match,_,_} when Directory == to_be_found ->
+	    secret_path(Path,Rest,NewDirectory);
+	{match,_,Length} when Length > length(Directory)->
+	    secret_path(Path,Rest,NewDirectory);
+	{match,_,Length} ->
+	    secret_path(Path,Rest,Directory);
+	nomatch ->
+	    secret_path(Path,Rest,Directory)
+    end.
+
+%%
+%% Authenticate
+%%
+
+%% allow
+
+allow({_,RemoteAddr},SocketType,Socket,DirectoryData) ->
+    Hosts = httpd_util:key1search(DirectoryData, allow_from, all),
+    case validate_addr(RemoteAddr,Hosts) of
+	true ->
+	    allowed;
+	false ->
+	    {not_allowed, ?NICE("Connection from your host is not allowed")}
+    end.
+
+validate_addr(RemoteAddr,all) ->            % When called from 'allow'
+    true;
+validate_addr(RemoteAddr,none) ->           % When called from 'deny'
+    false;
+validate_addr(RemoteAddr,[]) ->
+    false;
+validate_addr(RemoteAddr,[HostRegExp|Rest]) ->
+    ?DEBUG("validate_addr -> RemoteAddr: ~p HostRegExp: ~p",
+	   [RemoteAddr, HostRegExp]),
+    case regexp:match(RemoteAddr, HostRegExp) of
+	{match,_,_} ->
+	    true;
+	nomatch ->
+	    validate_addr(RemoteAddr,Rest)
+    end.
+
+%% deny
+
+deny({_,RemoteAddr},SocketType,Socket,DirectoryData) ->
+    ?DEBUG("deny -> RemoteAddr: ~p",[RemoteAddr]),
+    Hosts = httpd_util:key1search(DirectoryData, deny_from, none),
+    ?DEBUG("deny -> Hosts: ~p",[Hosts]),
+    case validate_addr(RemoteAddr,Hosts) of
+	true ->
+	    {denied, ?NICE("Connection from your host is not allowed")};
+	false ->
+	    not_denied
+    end.
+
+%%
+%% Configuration
+%%
+
+%% load/2
+%%
+
+%% mod_auth recognizes the following Configuration Directives:
+%% <Directory /path/to/directory>
+%%  AuthDBType
+%%  AuthName
+%%  AuthUserFile
+%%  AuthGroupFile
+%%  AuthAccessPassword
+%%  require
+%%  allow
+%% </Directory>
+
+%% When a <Directory> directive is found, a new context is set to
+%% [{directory, Directory, DirData}|OtherContext]
+%% DirData in this case is a key-value list of data belonging to the
+%% directory in question.
+%%
+%% When the </Directory> statement is found, the Context created earlier
+%% will be returned as a ConfigList and the context will return to the
+%% state it was previously.
+
+load([$<,$D,$i,$r,$e,$c,$t,$o,$r,$y,$ |Directory],[]) ->
+    Dir = httpd_conf:custom_clean(Directory,"",">"),
+    {ok,[{directory, Dir, [{path, Dir}]}]};
+load(eof,[{directory,Directory, DirData}|_]) ->
+    {error, ?NICE("Premature end-of-file in "++Directory)};
+
+load([$A,$u,$t,$h,$N,$a,$m,$e,$ |AuthName], [{directory,Directory, DirData}|Rest]) ->
+    {ok, [{directory,Directory,
+	   [ {auth_name, httpd_conf:clean(AuthName)}|DirData]} | Rest ]};
+
+load([$A,$u,$t,$h,$U,$s,$e,$r,$F,$i,$l,$e,$ |AuthUserFile0],
+     [{directory, Directory, DirData}|Rest]) ->
+    AuthUserFile = httpd_conf:clean(AuthUserFile0),
+    {ok,[{directory,Directory,
+	  [ {auth_user_file, AuthUserFile}|DirData]} | Rest ]};
+
+load([$A,$u,$t,$h,$G,$r,$o,$u,$p,$F,$i,$l,$e,$ |AuthGroupFile0],
+	 [{directory,Directory, DirData}|Rest]) ->
+    AuthGroupFile = httpd_conf:clean(AuthGroupFile0),
+    {ok,[{directory,Directory,
+	  [ {auth_group_file, AuthGroupFile}|DirData]} | Rest]};
+
+%AuthAccessPassword
+load([$A,$u,$t,$h,$A,$c,$c,$e,$s,$s,$P,$a,$s,$s,$w,$o,$r,$d,$ |AuthAccessPassword0],
+	 [{directory,Directory, DirData}|Rest]) ->
+    AuthAccessPassword = httpd_conf:clean(AuthAccessPassword0),
+    {ok,[{directory,Directory,
+	  [{auth_access_password, AuthAccessPassword}|DirData]} | Rest]};
+
+
+
+
+load([$A,$u,$t,$h,$D,$B,$T,$y,$p,$e,$ |Type],
+	 [{directory, Dir, DirData}|Rest]) ->
+    case httpd_conf:clean(Type) of
+	"plain" ->
+	    {ok, [{directory, Dir, [{auth_type, plain}|DirData]} | Rest ]};
+	"mnesia" ->
+	    {ok, [{directory, Dir, [{auth_type, mnesia}|DirData]} | Rest ]};
+	"dets" ->
+	    {ok, [{directory, Dir, [{auth_type, dets}|DirData]} | Rest ]};
+	_ ->
+	    {error, ?NICE(httpd_conf:clean(Type)++" is an invalid AuthDBType")}
+    end;
+
+load([$r,$e,$q,$u,$i,$r,$e,$ |Require],[{directory,Directory, DirData}|Rest]) ->
+    case regexp:split(Require," ") of
+	{ok,["user"|Users]} ->
+	    {ok,[{directory,Directory,
+		  [{require_user,Users}|DirData]} | Rest]};
+	{ok,["group"|Groups]} ->
+	    {ok,[{directory,Directory,
+		  [{require_group,Groups}|DirData]} | Rest]};
+	{ok,_} ->
+	    {error,?NICE(httpd_conf:clean(Require)++" is an invalid require")}
+    end;
+
+load([$a,$l,$l,$o,$w,$ |Allow],[{directory,Directory, DirData}|Rest]) ->
+    case regexp:split(Allow," ") of
+	{ok,["from","all"]} ->
+	    {ok,[{directory,Directory,
+		  [{allow_from,all}|DirData]} | Rest]};
+	{ok,["from"|Hosts]} ->
+	    {ok,[{directory,Directory,
+		  [{allow_from,Hosts}|DirData]} | Rest]};
+	{ok,_} ->
+	    {error,?NICE(httpd_conf:clean(Allow)++" is an invalid allow")}
+    end;
+
+load([$d,$e,$n,$y,$ |Deny],[{directory,Directory, DirData}|Rest]) ->
+    case regexp:split(Deny," ") of
+	{ok, ["from", "all"]} ->
+	    {ok,[{directory, Directory,
+		  [{deny_from, all}|DirData]} | Rest]};
+	{ok, ["from"|Hosts]} ->
+	    {ok,[{directory, Directory,
+		  [{deny_from, Hosts}|DirData]} | Rest]};
+	{ok, _} ->
+	    {error,?NICE(httpd_conf:clean(Deny)++" is an invalid deny")}
+    end;
+
+load("</Directory>",[{directory,Directory, DirData}|Rest]) ->
+    {ok, Rest, {directory, Directory, DirData}};
+
+load([$A,$u,$t,$h,$M,$n,$e,$s,$i,$a,$D,$B,$ |AuthMnesiaDB],
+      [{directory, Dir, DirData}|Rest]) ->
+    case httpd_conf:clean(AuthMnesiaDB) of
+	"On" ->
+	    {ok,[{directory,Dir,[{auth_type,mnesia}|DirData]}|Rest]};
+	"Off" ->
+	    {ok,[{directory,Dir,[{auth_type,plain}|DirData]}|Rest]};
+	_ ->
+	    {error, ?NICE(httpd_conf:clean(AuthMnesiaDB)++" is an invalid AuthMnesiaDB")}
+    end.
+
+%% store
+
+store({directory,Directory0, DirData0}, ConfigList) ->
+    Port = httpd_util:key1search(ConfigList, port),
+    DirData = case httpd_util:key1search(ConfigList, bind_address) of
+		  undefined ->
+		      [{port, Port}|DirData0];
+		  Addr ->
+		      [{port, Port},{bind_address,Addr}|DirData0]
+	      end,
+    Directory =
+	case filename:pathtype(Directory0) of
+	    relative ->
+		SR = httpd_util:key1search(ConfigList, server_root),
+		filename:join(SR, Directory0);
+	    _ ->
+		Directory0
+	end,
+    AuthMod =
+	case httpd_util:key1search(DirData0, auth_type) of
+	    mnesia -> mod_auth_mnesia;
+	    dets ->   mod_auth_dets;
+	    plain ->  mod_auth_plain;
+	    _ ->      no_module_at_all
+	end,
+    case AuthMod of
+	no_module_at_all ->
+	    {ok, {directory, Directory, DirData}};
+	_ ->
+	    %% Control that there are a password or add a standard password:
+	    %% "NoPassword"
+	    %% In this way a user must select to use a noPassword
+	    Pwd = case httpd_util:key1search(DirData,auth_access_password)of
+		      undefined->
+			  ?NOPASSWORD;
+		      PassW->
+			  PassW
+		  end,
+	    DirDataLast = lists:keydelete(auth_access_password,1,DirData),
+	    case catch AuthMod:store_directory_data(Directory, DirDataLast) of
+		ok ->
+		    add_auth_password(Directory,Pwd,ConfigList),
+		    {ok, {directory, Directory, DirDataLast}};
+		{ok, NewDirData} ->
+		    add_auth_password(Directory,Pwd,ConfigList),
+		    {ok, {directory, Directory, NewDirData}};
+		{error, Reason} ->
+		    {error, Reason};
+		Other ->
+		    ?ERROR("unexpected result: ~p",[Other]),
+		    {error, Other}
+	    end
+    end.
+
+
+add_auth_password(Dir, Pwd0, ConfigList) ->
+    Addr = httpd_util:key1search(ConfigList, bind_address),
+    Port = httpd_util:key1search(ConfigList, port),
+    mod_auth_server:start(Addr, Port),
+    mod_auth_server:add_password(Addr, Port, Dir, Pwd0).
+
+%% remove
+
+
+remove(ConfigDB) ->
+    lists:foreach(fun({directory, Dir, DirData}) ->
+			  AuthMod = auth_mod_name(DirData),
+			  (catch apply(AuthMod, remove, [DirData]))
+		  end,
+		  ets:match_object(ConfigDB,{directory,'_','_'})),
+    Addr = case lookup(ConfigDB, bind_address) of
+	       [] ->
+		   undefined;
+	       [{bind_address, Address}] ->
+		   Address
+	   end,
+    [{port, Port}] = lookup(ConfigDB, port),
+    mod_auth_server:stop(Addr, Port),
+    ok.
+
+
+
+
+%% --------------------------------------------------------------------
+
+%% update_password
+
+update_password(Port, Dir, Old, New, New)->
+    update_password(undefined, Port, Dir, Old, New, New).
+
+update_password(Addr, Port, Dir, Old, New, New) when list(New) ->
+    mod_auth_server:update_password(Addr, Port, Dir, Old, New);
+
+update_password(_Addr, _Port, _Dir, _Old, New, New) ->
+    {error, badtype};
+update_password(_Addr, _Port, _Dir, _Old, New, New1) ->
+    {error, notqeual}.
+
+
+%% add_user
+
+add_user(UserName, Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd}->
+	    case get_options(Opt, userData) of
+		{error, Reason}->
+		    {error, Reason};
+		{UserData, Password}->
+		    User = [#httpd_user{username  = UserName,
+					password  = Password,
+					user_data = UserData}],
+		    mod_auth_server:add_user(Addr, Port, Dir, User, AuthPwd);
+		{error, Reason} ->
+		    {error, Reason}
+	    end
+    end.
+
+
+add_user(UserName, Password, UserData, Port, Dir) ->
+    add_user(UserName, Password, UserData, undefined, Port, Dir).
+add_user(UserName, Password, UserData, Addr, Port, Dir) ->
+    User = [#httpd_user{username  = UserName,
+			password  = Password,
+			user_data = UserData}],
+    mod_auth_server:add_user(Addr, Port, Dir, User, ?NOPASSWORD).
+
+
+%% get_user
+
+get_user(UserName, Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:get_user(Addr, Port, Dir, UserName, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+get_user(UserName, Port, Dir) ->
+    get_user(UserName, undefined, Port, Dir).
+get_user(UserName, Addr, Port, Dir) ->
+    mod_auth_server:get_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
+
+
+%% add_group_member
+
+add_group_member(GroupName, UserName, Opt)->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd}->
+	    mod_auth_server:add_group_member(Addr, Port, Dir,
+					     GroupName, UserName, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+add_group_member(GroupName, UserName, Port, Dir) ->
+    add_group_member(GroupName, UserName, undefined, Port, Dir).
+
+add_group_member(GroupName, UserName, Addr, Port, Dir) ->
+    mod_auth_server:add_group_member(Addr, Port, Dir,
+				     GroupName, UserName, ?NOPASSWORD).
+
+
+%% delete_group_member
+
+delete_group_member(GroupName, UserName, Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:delete_group_member(Addr, Port, Dir,
+						GroupName, UserName, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+delete_group_member(GroupName, UserName, Port, Dir) ->
+    delete_group_member(GroupName, UserName, undefined, Port, Dir).
+delete_group_member(GroupName, UserName, Addr, Port, Dir) ->
+    mod_auth_server:delete_group_member(Addr, Port, Dir,
+					GroupName, UserName, ?NOPASSWORD).
+
+
+%% list_users
+
+list_users(Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:list_users(Addr, Port, Dir, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+list_users(Port, Dir) ->
+    list_users(undefined, Port, Dir).
+list_users(Addr, Port, Dir) ->
+    mod_auth_server:list_users(Addr, Port, Dir, ?NOPASSWORD).
+
+
+%% delete_user
+
+delete_user(UserName, Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:delete_user(Addr, Port, Dir, UserName, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+delete_user(UserName, Port, Dir) ->
+    delete_user(UserName, undefined, Port, Dir).
+delete_user(UserName, Addr, Port, Dir) ->
+    mod_auth_server:delete_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
+
+
+%% delete_group
+
+delete_group(GroupName, Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd}->
+	    mod_auth_server:delete_group(Addr, Port, Dir, GroupName, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+delete_group(GroupName, Port, Dir) ->
+    delete_group(GroupName, undefined, Port, Dir).
+delete_group(GroupName, Addr, Port, Dir) ->
+    mod_auth_server:delete_group(Addr, Port, Dir, GroupName, ?NOPASSWORD).
+
+
+%% list_groups
+
+list_groups(Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd}->
+	    mod_auth_server:list_groups(Addr, Port, Dir, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+list_groups(Port, Dir) ->
+    list_groups(undefined, Port, Dir).
+list_groups(Addr, Port, Dir) ->
+    mod_auth_server:list_groups(Addr, Port, Dir, ?NOPASSWORD).
+
+
+%% list_group_members
+
+list_group_members(GroupName,Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:list_group_members(Addr, Port, Dir, GroupName,
+					       AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+list_group_members(GroupName, Port, Dir) ->
+    list_group_members(GroupName, undefined, Port, Dir).
+list_group_members(GroupName, Addr, Port, Dir) ->
+    mod_auth_server:list_group_members(Addr, Port, Dir, GroupName, ?NOPASSWORD).
+
+
+
+%% Opt = [{port, Port},
+%%        {addr, Addr},
+%%        {dir,  Dir},
+%%        {authPassword, AuthPassword} | FunctionSpecificData]
+get_options(Opt, mandatory)->
+    case httpd_util:key1search(Opt, port, undefined) of
+	Port when integer(Port) ->
+	    case httpd_util:key1search(Opt, dir, undefined) of
+		Dir when list(Dir) ->
+		    Addr = httpd_util:key1search(Opt,
+						 addr,
+						 undefined),
+		    AuthPwd = httpd_util:key1search(Opt,
+						    authPassword,
+						    ?NOPASSWORD),
+		    {Addr, Port, Dir, AuthPwd};
+		_->
+		    {error, bad_dir}
+	    end;
+	_ ->
+	    {error, bad_dir}
+    end;
+
+%% FunctionSpecificData = {userData, UserData} | {password, Password}
+get_options(Opt, userData)->
+    case httpd_util:key1search(Opt, userData, undefined) of
+	undefined ->
+	    {error, no_userdata};
+	UserData ->
+	    case httpd_util:key1search(Opt, password, undefined) of
+		undefined->
+		    {error, no_password};
+		Pwd ->
+		    {UserData, Pwd}
+	    end
+    end.
+
+
+lookup(Db, Key) ->
+    ets:lookup(Db, Key).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth.hrl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth.hrl
new file mode 100644
index 0000000000..2b8ea6657f
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth.hrl
@@ -0,0 +1,26 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_auth.hrl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
+%%
+
+-record(httpd_user,
+	{username,
+	 password,
+	 user_data}).
+
+-record(httpd_group,
+	{name,
+	 userlist}).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_dets.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_dets.erl
new file mode 100644
index 0000000000..d947d6cf49
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_dets.erl
@@ -0,0 +1,222 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_auth_dets.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_auth_dets).
+
+%% dets authentication storage
+
+-export([get_user/2,
+	 list_group_members/2,
+	 add_user/2,
+	 add_group_member/3,
+	 list_users/1,
+	 delete_user/2,
+	 list_groups/1,
+	 delete_group_member/3,
+	 delete_group/2,
+	 remove/1]).
+
+-export([store_directory_data/2]).
+
+-include("httpd.hrl").
+-include("mod_auth.hrl").
+
+store_directory_data(Directory, DirData) ->
+    ?CDEBUG("store_directory_data -> ~n"
+	    "     Directory: ~p~n"
+	    "     DirData:   ~p",
+	    [Directory, DirData]),
+
+    PWFile = httpd_util:key1search(DirData, auth_user_file),
+    GroupFile = httpd_util:key1search(DirData, auth_group_file),
+    Addr = httpd_util:key1search(DirData, bind_address),
+    Port = httpd_util:key1search(DirData, port),
+
+    PWName  = httpd_util:make_name("httpd_dets_pwdb",Addr,Port),
+    case dets:open_file(PWName,[{type,set},{file,PWFile},{repair,true}]) of
+	{ok, PWDB} ->
+	    GDBName = httpd_util:make_name("httpd_dets_groupdb",Addr,Port),
+	    case dets:open_file(GDBName,[{type,set},{file,GroupFile},{repair,true}]) of
+		{ok, GDB} ->
+		    NDD1 = lists:keyreplace(auth_user_file, 1, DirData,
+					    {auth_user_file, PWDB}),
+		    NDD2 = lists:keyreplace(auth_group_file, 1, NDD1,
+					    {auth_group_file, GDB}),
+		    {ok, NDD2};
+		{error, Err}->
+		    {error, {{file, GroupFile},Err}}
+	    end;
+	{error, Err2} ->
+	    {error, {{file, PWFile},Err2}}
+    end.
+
+%%
+%% Storage format of users in the dets table:
+%% {{UserName, Addr, Port, Dir}, Password, UserData}
+%%
+
+add_user(DirData, UStruct) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    PWDB = httpd_util:key1search(DirData, auth_user_file),
+    Record = {{UStruct#httpd_user.username, Addr, Port, Dir},
+	      UStruct#httpd_user.password, UStruct#httpd_user.user_data},
+    case dets:lookup(PWDB, UStruct#httpd_user.username) of
+	[Record] ->
+	    {error, user_already_in_db};
+	_ ->
+	    dets:insert(PWDB, Record),
+	    true
+    end.
+
+get_user(DirData, UserName) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    PWDB = httpd_util:key1search(DirData, auth_user_file),
+    User = {UserName, Addr, Port, Dir},
+    case dets:lookup(PWDB, User) of
+	[{User, Password, UserData}] ->
+	    {ok, #httpd_user{username=UserName, password=Password, user_data=UserData}};
+	Other ->
+	    {error, no_such_user}
+    end.
+
+list_users(DirData) ->
+    ?DEBUG("list_users -> ~n"
+	   "     DirData: ~p", [DirData]),
+    {Addr, Port, Dir} = lookup_common(DirData),
+    PWDB = httpd_util:key1search(DirData, auth_user_file),
+    case dets:traverse(PWDB, fun(X) -> {continue, X} end) of    %% SOOOO Ugly !
+	Records when list(Records) ->
+	    ?DEBUG("list_users -> ~n"
+		   "     Records: ~p", [Records]),
+	    {ok, [UserName || {{UserName, AnyAddr, AnyPort, AnyDir}, Password, _Data} <- Records,
+			      AnyAddr == Addr, AnyPort == Port, AnyDir == Dir]};
+	O ->
+	    ?DEBUG("list_users -> ~n"
+		   "     O: ~p", [O]),
+	    {ok, []}
+    end.
+
+delete_user(DirData, UserName) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    PWDB = httpd_util:key1search(DirData, auth_user_file),
+    User = {UserName, Addr, Port, Dir},
+    case dets:lookup(PWDB, User) of
+	[{User, SomePassword, UserData}] ->
+	    dets:delete(PWDB, User),
+	    lists:foreach(fun(Group) -> delete_group_member(DirData, Group, UserName) end,
+			  list_groups(DirData)),
+	    true;
+	_ ->
+	    {error, no_such_user}
+    end.
+
+%%
+%% Storage of groups in the dets table:
+%% {Group, UserList} where UserList is a list of strings.
+%%
+add_group_member(DirData, GroupName, UserName) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    GDB = httpd_util:key1search(DirData, auth_group_file),
+    Group = {GroupName, Addr, Port, Dir},
+    case dets:lookup(GDB, Group) of
+	[{Group, Users}] ->
+	    case lists:member(UserName, Users) of
+		true ->
+		    true;
+		false ->
+		    dets:insert(GDB, {Group, [UserName|Users]}),
+		    true
+	    end;
+	[] ->
+	    dets:insert(GDB, {Group, [UserName]}),
+	    true;
+	Other ->
+	    {error, Other}
+    end.
+
+list_group_members(DirData, GroupName) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    GDB = httpd_util:key1search(DirData, auth_group_file),
+    Group = {GroupName, Addr, Port, Dir},
+    case dets:lookup(GDB, Group) of
+	[{Group, Users}] ->
+	    {ok, Users};
+	Other ->
+	    {error, no_such_group}
+    end.
+
+list_groups(DirData) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    GDB  = httpd_util:key1search(DirData, auth_group_file),
+    case dets:match(GDB, {'$1', '_'}) of
+	[] ->
+	    {ok, []};
+	List when list(List) ->
+	    Groups = lists:flatten(List),
+	    {ok, [GroupName || {GroupName, AnyAddr, AnyPort, AnyDir} <- Groups,
+			   AnyAddr == Addr, AnyPort == Port, AnyDir == Dir]};
+	_ ->
+	    {ok, []}
+    end.
+
+delete_group_member(DirData, GroupName, UserName) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    GDB = httpd_util:key1search(DirData, auth_group_file),
+    Group = {GroupName, Addr, Port, Dir},
+    case dets:lookup(GDB, GroupName) of
+	[{Group, Users}] ->
+	    case lists:member(UserName, Users) of
+		true ->
+		    dets:delete(GDB, Group),
+		    dets:insert(GDB, {Group,
+				      lists:delete(UserName, Users)}),
+		    true;
+		false ->
+		    {error, no_such_group_member}
+	    end;
+	_ ->
+	    {error, no_such_group}
+    end.
+
+delete_group(DirData, GroupName) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    GDB = httpd_util:key1search(DirData, auth_group_file),
+    Group = {GroupName, Addr, Port, Dir},
+    case dets:lookup(GDB, Group) of
+	[{Group, Users}] ->
+	    dets:delete(GDB, Group),
+	    true;
+	_ ->
+	    {error, no_such_group}
+    end.
+
+lookup_common(DirData) ->
+    Dir  = httpd_util:key1search(DirData, path),
+    Port = httpd_util:key1search(DirData, port),
+    Addr = httpd_util:key1search(DirData, bind_address),
+    {Addr, Port, Dir}.
+
+%% remove/1
+%%
+%% Closes dets tables used by this auth mod.
+%%
+remove(DirData) ->
+    PWDB = httpd_util:key1search(DirData, auth_user_file),
+    GDB = httpd_util:key1search(DirData, auth_group_file),
+    dets:close(GDB),
+    dets:close(PWDB),
+    ok.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_mnesia.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_mnesia.erl
new file mode 100644
index 0000000000..ea2f0cb905
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_mnesia.erl
@@ -0,0 +1,269 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_auth_mnesia.erl,v 1.2 2010/03/04 13:54:19 maria Exp $
+%%
+-module(mod_auth_mnesia).
+-export([get_user/2,
+	 list_group_members/2,
+	 add_user/2,
+	 add_group_member/3,
+	 list_users/1,
+	 delete_user/2,
+	 list_groups/1,
+	 delete_group_member/3,
+	 delete_group/2]).
+
+-export([store_user/5, store_user/6,
+	 store_group_member/5, store_group_member/6,
+	 list_group_members/3, list_group_members/4,
+	 list_groups/2, list_groups/3,
+	 list_users/2, list_users/3,
+	 remove_user/4, remove_user/5,
+	 remove_group_member/5, remove_group_member/6,
+	 remove_group/4, remove_group/5]).
+
+-export([store_directory_data/2]).
+
+-include("httpd.hrl").
+-include("mod_auth.hrl").
+
+
+
+store_directory_data(Directory, DirData) ->
+    %% We don't need to do anything here, we could ofcourse check that the appropriate
+    %% mnesia tables has been created prior to starting the http server.
+    ok.
+
+
+%%
+%% API
+%%
+
+%% Compability API
+
+
+store_user(UserName, Password, Port, Dir, AccessPassword) ->
+   %% AccessPassword is ignored - was not used in previous version
+   DirData = [{path,Dir},{port,Port}],
+   UStruct = #httpd_user{username = UserName,
+			 password = Password},
+   add_user(DirData, UStruct).
+
+store_user(UserName, Password, Addr, Port, Dir, AccessPassword) ->
+   %% AccessPassword is ignored - was not used in previous version
+   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
+   UStruct = #httpd_user{username = UserName,
+			 password = Password},
+   add_user(DirData, UStruct).
+
+store_group_member(GroupName, UserName, Port, Dir, AccessPassword) ->
+   DirData = [{path,Dir},{port,Port}],
+   add_group_member(DirData, GroupName, UserName).
+
+store_group_member(GroupName, UserName, Addr, Port, Dir, AccessPassword) ->
+   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
+   add_group_member(DirData, GroupName, UserName).
+
+list_group_members(GroupName, Port, Dir) ->
+   DirData = [{path,Dir},{port,Port}],
+   list_group_members(DirData, GroupName).
+
+list_group_members(GroupName, Addr, Port, Dir) ->
+   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
+   list_group_members(DirData, GroupName).
+
+list_groups(Port, Dir) ->
+   DirData = [{path,Dir},{port,Port}],
+   list_groups(DirData).
+
+list_groups(Addr, Port, Dir) ->
+   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
+   list_groups(DirData).
+
+list_users(Port, Dir) ->
+   DirData = [{path,Dir},{port,Port}],
+   list_users(DirData).
+
+list_users(Addr, Port, Dir) ->
+   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
+   list_users(DirData).
+
+remove_user(UserName, Port, Dir, _AccessPassword) ->
+   DirData = [{path,Dir},{port,Port}],
+   delete_user(DirData, UserName).
+
+remove_user(UserName, Addr, Port, Dir, _AccessPassword) ->
+   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
+   delete_user(DirData, UserName).
+
+remove_group_member(GroupName,UserName,Port,Dir,_AccessPassword) ->
+   DirData = [{path,Dir},{port,Port}],
+   delete_group_member(DirData, GroupName, UserName).
+
+remove_group_member(GroupName,UserName,Addr,Port,Dir,_AccessPassword) ->
+   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
+   delete_group_member(DirData, GroupName, UserName).
+
+remove_group(GroupName,Port,Dir,_AccessPassword) ->
+   DirData = [{path,Dir},{port,Port}],
+   delete_group(DirData, GroupName).
+
+remove_group(GroupName,Addr,Port,Dir,_AccessPassword) ->
+   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
+   delete_group(DirData, GroupName).
+
+%%
+%% Storage format of users in the mnesia table:
+%% httpd_user records
+%%
+
+add_user(DirData, UStruct) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    UserName = UStruct#httpd_user.username,
+    Password = UStruct#httpd_user.password,
+    Data     = UStruct#httpd_user.user_data,
+    User=#httpd_user{username={UserName,Addr,Port,Dir},
+		     password=Password,
+		     user_data=Data},
+    case mnesia:transaction(fun() -> mnesia:write(User) end) of
+	{aborted,Reason} ->
+	    {error,Reason};
+	_ ->
+	    true
+    end.
+
+get_user(DirData, UserName) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    case mnesia:transaction(fun() ->
+				    mnesia:read({httpd_user,
+						 {UserName,Addr,Port,Dir}})
+			    end) of
+	{aborted,Reason} ->
+	    {error, Reason};
+	{'atomic',[]} ->
+	    {error, no_such_user};
+	{'atomic', [Record]} when record(Record, httpd_user) ->
+	    {ok, Record#httpd_user{username=UserName}};
+	Other ->
+	    {error, no_such_user}
+    end.
+
+list_users(DirData) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    case mnesia:transaction(fun() ->
+				    mnesia:match_object({httpd_user,
+							 {'_',Addr,Port,Dir},'_','_'})
+			    end) of
+	{aborted,Reason} ->
+	    {error,Reason};
+	{'atomic',Users} ->
+	    {ok,
+	     lists:foldr(fun({httpd_user, {UserName, AnyAddr, AnyPort, AnyDir},
+			      Password, Data}, Acc) ->
+				 [UserName|Acc]
+			 end,
+			 [], Users)}
+    end.
+
+delete_user(DirData, UserName) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    case mnesia:transaction(fun() ->
+				    mnesia:delete({httpd_user,
+						   {UserName,Addr,Port,Dir}})
+			    end) of
+	{aborted,Reason} ->
+	    {error,Reason};
+	_ ->
+	    true
+    end.
+
+%%
+%% Storage of groups in the mnesia table:
+%% Multiple instances of {#httpd_group, User}
+%%
+
+add_group_member(DirData, GroupName, User) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    Group=#httpd_group{name={GroupName, Addr, Port, Dir}, userlist=User},
+    case mnesia:transaction(fun() -> mnesia:write(Group) end) of
+	{aborted,Reason} ->
+	    {error,Reason};
+	_ ->
+	    true
+    end.
+
+list_group_members(DirData, GroupName) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    case mnesia:transaction(fun() ->
+				    mnesia:read({httpd_group,
+						 {GroupName,Addr,Port,Dir}})
+			    end) of
+	{aborted, Reason} ->
+	    {error,Reason};
+	{'atomic', Members} ->
+	    {ok,[UserName || {httpd_group,{AnyGroupName,AnyAddr,AnyPort,AnyDir},UserName} <- Members,
+			     AnyGroupName == GroupName, AnyAddr == Addr,
+			     AnyPort == Port, AnyDir == Dir]}
+  end.
+
+list_groups(DirData) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    case mnesia:transaction(fun() ->
+				    mnesia:match_object({httpd_group,
+							 {'_',Addr,Port,Dir},'_'})
+			    end) of
+	{aborted, Reason} ->
+	    {error, Reason};
+	{'atomic', Groups} ->
+	    GroupNames=
+		[GroupName || {httpd_group,{GroupName,AnyAddr,AnyPort,AnyDir}, UserName} <- Groups,
+			      AnyAddr == Addr, AnyPort == AnyPort, AnyDir == Dir],
+	    {ok, httpd_util:uniq(lists:sort(GroupNames))}
+    end.
+
+delete_group_member(DirData, GroupName, UserName) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    Group = #httpd_group{name={GroupName, Addr, Port, Dir}, userlist=UserName},
+    case mnesia:transaction(fun() -> mnesia:delete_object(Group) end) of
+	{aborted,Reason} ->
+	    {error,Reason};
+	_ ->
+	    true
+    end.
+
+%% THIS IS WRONG (?) !
+%% Should first match out all httpd_group records for this group and then
+%% do mnesia:delete on those. Or ?
+
+delete_group(DirData, GroupName) ->
+    {Addr, Port, Dir} = lookup_common(DirData),
+    case mnesia:transaction(fun() ->
+				    mnesia:delete({httpd_group,
+						   {GroupName,Addr,Port,Dir}})
+			    end) of
+	{aborted,Reason} ->
+	    {error,Reason};
+	_ ->
+	    true
+    end.
+
+%% Utility functions.
+
+lookup_common(DirData) ->
+    Dir = httpd_util:key1search(DirData, path),
+    Port = httpd_util:key1search(DirData, port),
+    Addr = httpd_util:key1search(DirData, bind_address),
+    {Addr, Port, Dir}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_plain.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_plain.erl
new file mode 100644
index 0000000000..75cc60f288
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_plain.erl
@@ -0,0 +1,338 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_auth_plain.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_auth_plain).
+
+-include("httpd.hrl").
+-include("mod_auth.hrl").
+
+-define(VMODULE,"AUTH_PLAIN").
+-include("httpd_verbosity.hrl").
+
+
+%% Internal API
+-export([store_directory_data/2]).
+
+
+-export([get_user/2,
+	 list_group_members/2,
+	 add_user/2,
+	 add_group_member/3,
+	 list_users/1,
+	 delete_user/2,
+	 list_groups/1,
+	 delete_group_member/3,
+	 delete_group/2,
+	 remove/1]).
+
+%%
+%% API
+%%
+
+%%
+%% Storage format of users in the ets table:
+%% {UserName, Password, UserData}
+%%
+
+add_user(DirData, #httpd_user{username = User} = UStruct) ->
+    ?vtrace("add_user -> entry with:"
+	"~n   User: ~p",[User]),
+    PWDB = httpd_util:key1search(DirData, auth_user_file),
+    Record = {User,
+	      UStruct#httpd_user.password,
+	      UStruct#httpd_user.user_data},
+    case ets:lookup(PWDB, User) of
+	[{User, _SomePassword, _SomeData}] ->
+	    {error, user_already_in_db};
+	_ ->
+	    ets:insert(PWDB, Record),
+	    true
+    end.
+
+get_user(DirData, User) ->
+    ?vtrace("get_user -> entry with:"
+	"~n   User: ~p",[User]),
+    PWDB = httpd_util:key1search(DirData, auth_user_file),
+    case ets:lookup(PWDB, User) of
+	[{User, PassWd, Data}] ->
+	    {ok, #httpd_user{username=User, password=PassWd, user_data=Data}};
+	_ ->
+	    {error, no_such_user}
+    end.
+
+list_users(DirData) ->
+    PWDB = httpd_util:key1search(DirData, auth_user_file),
+    case ets:match(PWDB, '$1') of
+	Records when list(Records) ->
+	    {ok, lists:foldr(fun({User,PassWd,Data}, A) -> [User|A] end,
+			     [], lists:flatten(Records))};
+	O ->
+	    {ok, []}
+    end.
+
+delete_user(DirData, UserName) ->
+    ?vtrace("delete_user -> entry with:"
+	"~n   UserName: ~p",[UserName]),
+    PWDB = httpd_util:key1search(DirData, auth_user_file),
+    case ets:lookup(PWDB, UserName) of
+	[{UserName, SomePassword, SomeData}] ->
+	    ets:delete(PWDB, UserName),
+	    case list_groups(DirData) of
+		{ok,Groups}->
+		    lists:foreach(fun(Group) ->
+					  delete_group_member(DirData, Group, UserName)
+				  end,Groups),
+		    true;
+		_->
+		    true
+	    end;
+	_ ->
+	    {error, no_such_user}
+    end.
+
+%%
+%% Storage of groups in the ets table:
+%% {Group, UserList} where UserList is a list of strings.
+%%
+
+add_group_member(DirData, Group, UserName) ->
+    ?DEBUG("add_group_members -> ~n"
+	   "    Group:    ~p~n"
+	   "    UserName: ~p",[Group,UserName]),
+    GDB = httpd_util:key1search(DirData, auth_group_file),
+    case ets:lookup(GDB, Group) of
+	[{Group, Users}] ->
+	    case lists:member(UserName, Users) of
+		true ->
+		    ?DEBUG("add_group_members -> already member in group",[]),
+		    true;
+		false ->
+		    ?DEBUG("add_group_members -> add",[]),
+		    ets:insert(GDB, {Group, [UserName|Users]}),
+		    true
+	    end;
+	[] ->
+	    ?DEBUG("add_group_members -> create grouo",[]),
+	    ets:insert(GDB, {Group, [UserName]}),
+	    true;
+	Other ->
+	    ?ERROR("add_group_members -> Other: ~p",[Other]),
+	    {error, Other}
+    end.
+
+list_group_members(DirData, Group) ->
+    ?DEBUG("list_group_members -> Group: ~p",[Group]),
+    GDB = httpd_util:key1search(DirData, auth_group_file),
+    case ets:lookup(GDB, Group) of
+	[{Group, Users}] ->
+	    ?DEBUG("list_group_members -> Users: ~p",[Users]),
+	    {ok, Users};
+	_ ->
+	    {error, no_such_group}
+    end.
+
+list_groups(DirData) ->
+    ?DEBUG("list_groups -> entry",[]),
+    GDB = httpd_util:key1search(DirData, auth_group_file),
+    case ets:match(GDB, '$1') of
+	[] ->
+	    ?DEBUG("list_groups -> []",[]),
+	    {ok, []};
+	Groups0 when list(Groups0) ->
+	    ?DEBUG("list_groups -> Groups0: ~p",[Groups0]),
+	    {ok, httpd_util:uniq(lists:foldr(fun({G, U}, A) -> [G|A] end,
+					     [], lists:flatten(Groups0)))};
+	_ ->
+	    {ok, []}
+    end.
+
+delete_group_member(DirData, Group, User) ->
+    ?DEBUG("list_group_members -> ~n"
+	   "     Group: ~p~n"
+	   "     User:  ~p",[Group,User]),
+    GDB = httpd_util:key1search(DirData, auth_group_file),
+    UDB = httpd_util:key1search(DirData, auth_user_file),
+    case ets:lookup(GDB, Group) of
+	[{Group, Users}] when list(Users) ->
+	    case lists:member(User, Users) of
+		true ->
+		    ?DEBUG("list_group_members -> deleted from group",[]),
+		    ets:delete(GDB, Group),
+		    ets:insert(GDB, {Group, lists:delete(User, Users)}),
+		    true;
+		false ->
+		    ?DEBUG("list_group_members -> not member",[]),
+		    {error, no_such_group_member}
+	    end;
+	_ ->
+	    ?ERROR("list_group_members -> no such group",[]),
+	    {error, no_such_group}
+    end.
+
+delete_group(DirData, Group) ->
+    ?DEBUG("list_group_members -> Group: ~p",[Group]),
+    GDB = httpd_util:key1search(DirData, auth_group_file),
+    case ets:lookup(GDB, Group) of
+	[{Group, Users}] ->
+	    ?DEBUG("list_group_members -> delete",[]),
+	    ets:delete(GDB, Group),
+	    true;
+	_ ->
+	    ?ERROR("delete_group -> no such group",[]),
+	    {error, no_such_group}
+    end.
+
+
+store_directory_data(Directory, DirData) ->
+    PWFile = httpd_util:key1search(DirData, auth_user_file),
+    GroupFile = httpd_util:key1search(DirData, auth_group_file),
+    case load_passwd(PWFile) of
+	{ok, PWDB} ->
+	    case load_group(GroupFile) of
+		{ok, GRDB} ->
+		    %% Address and port is included in the file names...
+		    Addr = httpd_util:key1search(DirData, bind_address),
+		    Port = httpd_util:key1search(DirData, port),
+		    {ok, PasswdDB} = store_passwd(Addr,Port,PWDB),
+		    {ok, GroupDB}  = store_group(Addr,Port,GRDB),
+		    NDD1 = lists:keyreplace(auth_user_file, 1, DirData,
+					    {auth_user_file, PasswdDB}),
+		    NDD2 = lists:keyreplace(auth_group_file, 1, NDD1,
+					    {auth_group_file, GroupDB}),
+		    {ok, NDD2};
+		Err ->
+		    ?ERROR("failed storing directory data: "
+			   "load group error: ~p",[Err]),
+		    {error, Err}
+	    end;
+	Err2 ->
+	    ?ERROR("failed storing directory data: "
+		   "load passwd error: ~p",[Err2]),
+	    {error, Err2}
+    end.
+
+
+
+%% load_passwd
+
+load_passwd(AuthUserFile) ->
+    case file:open(AuthUserFile, [read]) of
+	{ok,Stream} ->
+	    parse_passwd(Stream, []);
+	{error, _} ->
+	    {error, ?NICE("Can't open "++AuthUserFile)}
+    end.
+
+parse_passwd(Stream,PasswdList) ->
+    Line =
+	case io:get_line(Stream, '') of
+	    eof ->
+		eof;
+	    String ->
+		httpd_conf:clean(String)
+	end,
+    parse_passwd(Stream, PasswdList, Line).
+
+parse_passwd(Stream, PasswdList, eof) ->
+    file:close(Stream),
+    {ok, PasswdList};
+parse_passwd(Stream, PasswdList, "") ->
+    parse_passwd(Stream, PasswdList);
+parse_passwd(Stream, PasswdList, [$#|_]) ->
+    parse_passwd(Stream, PasswdList);
+parse_passwd(Stream, PasswdList, Line) ->
+    case regexp:split(Line,":") of
+	{ok, [User,Password]} ->
+	    parse_passwd(Stream, [{User,Password, []}|PasswdList]);
+	{ok,_} ->
+	    {error, ?NICE(Line)}
+    end.
+
+%% load_group
+
+load_group(AuthGroupFile) ->
+    case file:open(AuthGroupFile, [read]) of
+	{ok, Stream} ->
+	    parse_group(Stream,[]);
+	{error, _} ->
+	    {error, ?NICE("Can't open "++AuthGroupFile)}
+    end.
+
+parse_group(Stream, GroupList) ->
+    Line=
+	case io:get_line(Stream,'') of
+	    eof ->
+		eof;
+	    String ->
+		httpd_conf:clean(String)
+	end,
+    parse_group(Stream, GroupList, Line).
+
+parse_group(Stream, GroupList, eof) ->
+    file:close(Stream),
+    {ok, GroupList};
+parse_group(Stream, GroupList, "") ->
+    parse_group(Stream, GroupList);
+parse_group(Stream, GroupList, [$#|_]) ->
+    parse_group(Stream, GroupList);
+parse_group(Stream, GroupList, Line) ->
+    case regexp:split(Line, ":") of
+	{ok, [Group,Users]} ->
+	    {ok, UserList} = regexp:split(Users," "),
+	    parse_group(Stream, [{Group,UserList}|GroupList]);
+	{ok, _} ->
+	    {error, ?NICE(Line)}
+    end.
+
+
+%% store_passwd
+
+store_passwd(Addr,Port,PasswdList) ->
+    Name = httpd_util:make_name("httpd_passwd",Addr,Port),
+    PasswdDB = ets:new(Name, [set, public]),
+    store_passwd(PasswdDB, PasswdList).
+
+store_passwd(PasswdDB, []) ->
+    {ok, PasswdDB};
+store_passwd(PasswdDB, [User|Rest]) ->
+    ets:insert(PasswdDB, User),
+    store_passwd(PasswdDB, Rest).
+
+%% store_group
+
+store_group(Addr,Port,GroupList) ->
+    Name = httpd_util:make_name("httpd_group",Addr,Port),
+    GroupDB = ets:new(Name, [set, public]),
+    store_group(GroupDB, GroupList).
+
+
+store_group(GroupDB,[]) ->
+    {ok, GroupDB};
+store_group(GroupDB,[User|Rest]) ->
+    ets:insert(GroupDB, User),
+    store_group(GroupDB, Rest).
+
+
+%% remove/1
+%%
+%% Deletes ets tables used by this auth mod.
+%%
+remove(DirData) ->
+    PWDB = httpd_util:key1search(DirData, auth_user_file),
+    GDB = httpd_util:key1search(DirData, auth_group_file),
+    ets:delete(PWDB),
+    ets:delete(GDB).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_server.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_server.erl
new file mode 100644
index 0000000000..59402ac169
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_auth_server.erl
@@ -0,0 +1,422 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_auth_server.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+
+-module(mod_auth_server).
+
+-include("httpd.hrl").
+%% -include("mod_auth.hrl").
+-include("httpd_verbosity.hrl").
+
+-behaviour(gen_server).
+
+
+%% mod_auth exports
+-export([start/2, stop/2,
+	 add_password/4, update_password/5,
+	 add_user/5, delete_user/5, get_user/5, list_users/4,
+	 add_group_member/6, delete_group_member/6, list_group_members/5,
+	 delete_group/5, list_groups/4]).
+
+%% Management exports
+-export([verbosity/3]).
+
+%% gen_server exports
+-export([start_link/3,
+	 init/1,
+	 handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+
+-record(state,{tab}).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%% External API                                                     %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% start_link/3
+%%
+%% NOTE: This is called by httpd_misc_sup when the process is started
+%%
+start_link(Addr, Port, Verbosity)->
+    ?vlog("start_link -> entry with"
+	  "~n   Addr: ~p"
+	  "~n   Port: ~p", [Addr, Port]),
+    Name = make_name(Addr, Port),
+    gen_server:start_link({local, Name}, ?MODULE, [Verbosity],
+			  [{timeout, infinity}]).
+
+
+%% start/2
+
+start(Addr, Port)->
+    ?vtrace("start -> entry with"
+	    "~n   Addr: ~p"
+	    "~n   Port: ~p", [Addr, Port]),
+    Name = make_name(Addr, Port),
+    case whereis(Name) of
+	undefined ->
+           Verbosity = get(auth_verbosity),
+           case (catch httpd_misc_sup:start_auth_server(Addr, Port,
+                                                        Verbosity)) of
+		{ok, Pid} ->
+		    put(auth_server, Pid),
+		    ok;
+		{error, Reason} ->
+		    exit({failed_start_auth_server, Reason});
+		Error ->
+		    exit({failed_start_auth_server, Error})
+	    end;
+	_ -> %% Already started...
+	    ok
+    end.
+
+
+%% stop/2
+
+stop(Addr, Port)->
+    ?vtrace("stop -> entry with"
+	    "~n   Addr: ~p"
+	    "~n   Port: ~p", [Addr, Port]),
+    Name = make_name(Addr, Port),
+    case whereis(Name) of
+	undefined -> %% Already stopped
+	    ok;
+	_ ->
+           (catch httpd_misc_sup:stop_auth_server(Addr, Port))
+    end.
+
+
+%% verbosity/3
+
+verbosity(Addr, Port, Verbosity) ->
+    Name = make_name(Addr, Port),
+    Req  = {verbosity, Verbosity},
+    call(Name, Req).
+
+
+%% add_password/4
+
+add_password(Addr, Port, Dir, Password)->
+    Name = make_name(Addr, Port),
+    Req  = {add_password, Dir, Password},
+    call(Name, Req).
+
+
+%% update_password/6
+
+update_password(Addr, Port, Dir, Old, New) when list(New) ->
+    Name = make_name(Addr, Port),
+    Req  = {update_password, Dir, Old, New},
+    call(Name, Req).
+
+
+%% add_user/5
+
+add_user(Addr, Port, Dir, User, Password) ->
+    Name = make_name(Addr, Port),
+    Req  = {add_user, Addr, Port, Dir, User, Password},
+    call(Name, Req).
+
+
+%% delete_user/5
+
+delete_user(Addr, Port, Dir, UserName, Password) ->
+    Name = make_name(Addr, Port),
+    Req  = {delete_user, Addr, Port, Dir, UserName, Password},
+    call(Name, Req).
+
+
+%% get_user/5
+
+get_user(Addr, Port, Dir, UserName, Password) ->
+    Name = make_name(Addr, Port),
+    Req  = {get_user, Addr, Port, Dir, UserName, Password},
+    call(Name, Req).
+
+
+%% list_users/4
+
+list_users(Addr, Port, Dir, Password) ->
+    Name = make_name(Addr,Port),
+    Req  = {list_users, Addr, Port, Dir, Password},
+    call(Name, Req).
+
+
+%% add_group_member/6
+
+add_group_member(Addr, Port, Dir, GroupName, UserName, Password) ->
+    Name = make_name(Addr,Port),
+    Req  = {add_group_member, Addr, Port, Dir, GroupName, UserName, Password},
+    call(Name, Req).
+
+
+%% delete_group_member/6
+
+delete_group_member(Addr, Port, Dir, GroupName, UserName, Password) ->
+    Name = make_name(Addr,Port),
+    Req  = {delete_group_member, Addr, Port, Dir, GroupName, UserName, Password},
+    call(Name, Req).
+
+
+%% list_group_members/4
+
+list_group_members(Addr, Port, Dir, Group, Password) ->
+    Name = make_name(Addr, Port),
+    Req  = {list_group_members, Addr, Port, Dir, Group, Password},
+    call(Name, Req).
+
+
+%% delete_group/5
+
+delete_group(Addr, Port, Dir, GroupName, Password) ->
+    Name = make_name(Addr, Port),
+    Req  = {delete_group, Addr, Port, Dir, GroupName, Password},
+    call(Name, Req).
+
+
+%% list_groups/4
+
+list_groups(Addr, Port, Dir, Password) ->
+    Name = make_name(Addr, Port),
+    Req  = {list_groups, Addr, Port, Dir, Password},
+    call(Name, Req).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%% Server call-back functions                                       %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% init
+
+init([undefined]) ->
+    init([?default_verbosity]);
+
+init([Verbosity]) ->
+    put(sname,auth),
+    put(verbosity,Verbosity),
+    ?vlog("starting",[]),
+    {ok,#state{tab = ets:new(auth_pwd,[set,protected])}}.
+
+
+%% handle_call
+
+%% Add a user
+handle_call({add_user, Addr, Port, Dir, User, AuthPwd}, _From, State) ->
+    Reply = api_call(Addr, Port, Dir, add_user, User, AuthPwd, State),
+    {reply, Reply, State};
+
+%% Get data about a user
+handle_call({get_user, Addr, Port, Dir, User, AuthPwd}, _From, State) ->
+    Reply = api_call(Addr, Port, Dir, get_user, [User], AuthPwd, State),
+    {reply, Reply, State};
+
+%% Add a group member
+handle_call({add_group_member, Addr, Port, Dir, Group, User, AuthPwd},
+	    _From, State) ->
+    Reply = api_call(Addr, Port, Dir, add_group_member, [Group, User],
+		     AuthPwd, State),
+    {reply, Reply, State};
+
+%% delete a group
+handle_call({delete_group_member, Addr, Port, Dir, Group, User, AuthPwd},
+	    _From, State)->
+    Reply = api_call(Addr, Port, Dir, delete_group_member, [Group, User],
+		     AuthPwd, State),
+    {reply, Reply, State};
+
+%% List all users thats standalone users
+handle_call({list_users, Addr, Port, Dir, AuthPwd}, _From, State)->
+    Reply = api_call(Addr, Port, Dir, list_users, [], AuthPwd, State),
+    {reply, Reply, State};
+
+%% Delete a user
+handle_call({delete_user, Addr, Port, Dir, User, AuthPwd}, _From, State)->
+    Reply = api_call(Addr, Port, Dir, delete_user, [User], AuthPwd, State),
+    {reply, Reply, State};
+
+%% Delete a group
+handle_call({delete_group, Addr, Port, Dir, Group, AuthPwd}, _From, State)->
+    Reply = api_call(Addr, Port, Dir, delete_group, [Group], AuthPwd, State),
+    {reply, Reply, State};
+
+%% List the current groups
+handle_call({list_groups, Addr, Port, Dir, AuthPwd}, _From, State)->
+    Reply = api_call(Addr, Port, Dir, list_groups, [], AuthPwd, State),
+    {reply, Reply, State};
+
+%% List the members of the given group
+handle_call({list_group_members, Addr, Port, Dir, Group, AuthPwd},
+	    _From, State)->
+    Reply = api_call(Addr, Port, Dir, list_group_members, [Group],
+		     AuthPwd, State),
+    {reply, Reply, State};
+
+
+%% Add password for a directory
+handle_call({add_password, Dir, Password}, _From, State)->
+    Reply = do_add_password(Dir, Password, State),
+    {reply, Reply, State};
+
+
+%% Update the password for a directory
+
+handle_call({update_password, Dir, Old, New},_From,State)->
+    Reply =
+	case getPassword(State, Dir) of
+	    OldPwd when binary(OldPwd)->
+		case erlang:md5(Old) of
+		    OldPwd ->
+			%% The old password is right =>
+			%% update the password to the new
+			do_update_password(Dir,New,State),
+			ok;
+		_->
+		    {error, error_new}
+	    end;
+	_->
+	    {error, error_old}
+    end,
+    {reply, Reply, State};
+
+handle_call(stop, _From, State)->
+    {stop, normal, State};
+
+handle_call({verbosity,Verbosity},_From,State)->
+    OldVerbosity = put(verbosity,Verbosity),
+    ?vlog("set verbosity:  ~p -> ~p",[Verbosity,OldVerbosity]),
+    {reply,OldVerbosity,State}.
+
+handle_info(Info,State)->
+    {noreply,State}.
+
+handle_cast(Request,State)->
+    {noreply,State}.
+
+
+terminate(Reason,State) ->
+    ets:delete(State#state.tab),
+    ok.
+
+
+%% code_change({down, ToVsn}, State, Extra)
+%%
+code_change({down, _}, #state{tab = Tab}, downgrade_to_2_6_0) ->
+    ?vlog("downgrade to 2.6.0", []),
+    {ok, {state, Tab, undefined}};
+
+
+%% code_change(FromVsn, State, Extra)
+%%
+code_change(_, {state, Tab, _}, upgrade_from_2_6_0) ->
+    ?vlog("upgrade from 2.6.0", []),
+    {ok, #state{tab = Tab}}.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%% The functions that really changes the data in the database       %%
+%% of users to different directories                                %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% API gateway
+
+api_call(Addr, Port, Dir, Func, Args,Password,State) ->
+    case controlPassword(Password,State,Dir) of
+	ok->
+	    ConfigName = httpd_util:make_name("httpd_conf",Addr,Port),
+	    case ets:match_object(ConfigName, {directory, Dir, '$1'}) of
+		[{directory, Dir, DirData}] ->
+		    AuthMod = auth_mod_name(DirData),
+		    ?DEBUG("api_call -> call ~p:~p",[AuthMod,Func]),
+		    Ret = (catch apply(AuthMod, Func, [DirData|Args])),
+		    ?DEBUG("api_call -> Ret: ~p",[ret]),
+		    Ret;
+		O ->
+		    ?DEBUG("api_call -> O: ~p",[O]),
+		    {error, no_such_directory}
+	    end;
+	bad_password ->
+	    {error,bad_password}
+    end.
+
+controlPassword(Password,State,Dir)when Password=:="DummyPassword"->
+    bad_password;
+
+controlPassword(Password,State,Dir)->
+    case getPassword(State,Dir) of
+	Pwd when binary(Pwd)->
+	    case erlang:md5(Password) of
+		Pwd ->
+		    ok;
+		_->
+		    bad_password
+	    end;
+	_ ->
+	    bad_password
+    end.
+
+
+getPassword(State,Dir)->
+    case lookup(State#state.tab, Dir) of
+	[{_,Pwd}]->
+	    Pwd;
+	_ ->
+	    {error,bad_password}
+    end.
+
+do_update_password(Dir, New, State) ->
+    ets:insert(State#state.tab, {Dir, erlang:md5(New)}).
+
+do_add_password(Dir, Password, State) ->
+    case getPassword(State,Dir) of
+	PwdExists when binary(PwdExists) ->
+	    {error, dir_protected};
+	{error, _} ->
+	    do_update_password(Dir, Password, State)
+    end.
+
+
+auth_mod_name(DirData) ->
+    case httpd_util:key1search(DirData, auth_type, plain) of
+	plain ->    mod_auth_plain;
+	mnesia ->   mod_auth_mnesia;
+	dets ->	    mod_auth_dets
+    end.
+
+
+lookup(Db, Key) ->
+    ets:lookup(Db, Key).
+
+
+make_name(Addr,Port) ->
+    httpd_util:make_name("httpd_auth",Addr,Port).
+
+
+call(Name, Req) ->
+    case (catch gen_server:call(Name, Req)) of
+	{'EXIT', Reason} ->
+	    {error, Reason};
+	Reply ->
+	    Reply
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_browser.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_browser.erl
new file mode 100644
index 0000000000..1153a5fc47
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_browser.erl
@@ -0,0 +1,213 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_browser.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+%% ----------------------------------------------------------------------
+%%
+%% Browsers sends a string to the webbserver
+%% to identify themsevles. They are a bit nasty
+%% since the only thing that the specification really
+%% is strict about is that they shall be short
+%% tree axamples:
+%%
+%% Netscape Mozilla/4.75 [en] (X11; U; SunOS 5.8 sun4u)
+%% IE5      Mozilla/4.0 (compatible; MSIE 5.0; SP1B; SunOS 5.8 sun4u; X11)
+%% Lynx     Lynx/2.8.3rel.1 libwww-FM/2.142
+%%
+%% ----------------------------------------------------------------------
+
+-module(mod_browser).
+
+%% Remember that the order of the mozilla browsers are
+%% important since some browsers include others to behave
+%% as they were something else
+-define(MOZILLA_BROWSERS,[{opera,"opera"},{msie,"msie"}]).
+
+
+%% If your operatingsystem is not recognized add it to this list.
+-define(OPERATIVE_SYSTEMS,[{win3x,["win16","windows 3","windows 16-bit"]},
+			   {win95,["win95","windows 95"]},
+			   {win98,["win98", "windows 98"]},
+			   {winnt,["winnt", "windows nt"]},
+			   {win2k,["nt 5"]},
+			   {sunos4,["sunos 4"]},
+			   {sunos5,["sunos 5"]},
+			   {sun,["sunos"]},
+			   {aix,["aix"]},
+			   {linux,["linux"]},
+			   {sco,["sco","unix_sv"]},
+			   {freebsd,["freebsd"]},
+			   {bsd,["bsd"]}]).
+
+-define(LYNX,lynx).
+-define(MOZILLA,mozilla).
+-define(EMACS,emacs).
+-define(STAROFFICE,soffice).
+-define(MOSAIC,mosaic).
+-define(NETSCAPE,netscape).
+-define(UNKOWN,unknown).
+
+-include("httpd.hrl").
+
+-export([do/1, test/0, getBrowser/1]).
+
+
+do(Info) ->
+    case httpd_util:key1search(Info#mod.data,status) of
+	{Status_code,PhraseArgs,Reason} ->
+	    {proceed,Info#mod.data};
+	undefined ->
+	    {proceed,[{'user-agent',getBrowser1(Info)}|Info#mod.data]}
+    end.
+
+getBrowser1(Info) ->
+    PHead=Info#mod.parsed_header,
+    case httpd_util:key1search(PHead,"User-Agent") of
+	undefined->
+	   undefined;
+	AgentString ->
+	    getBrowser(AgentString)
+    end.
+
+getBrowser(AgentString) ->
+    LAgentString = httpd_util:to_lower(AgentString),
+    case regexp:first_match(LAgentString,"^[^ ]*") of
+	{match,Start,Length} ->
+	    Browser=lists:sublist(LAgentString,Start,Length),
+	    case browserType(Browser) of
+		{mozilla,Vsn} ->
+		    {getMozilla(LAgentString,
+				?MOZILLA_BROWSERS,{?NETSCAPE,Vsn}),
+		     operativeSystem(LAgentString)};
+		AnyBrowser ->
+		      {AnyBrowser,operativeSystem(LAgentString)}
+	    end;
+	nomatch ->
+	    browserType(LAgentString)
+    end.
+
+browserType([$l,$y,$n,$x|Version]) ->
+    {?LYNX,browserVersion(Version)};
+browserType([$m,$o,$z,$i,$l,$l,$a|Version]) ->
+    {?MOZILLA,browserVersion(Version)};
+browserType([$e,$m,$a,$c,$s|Version]) ->
+    {?EMACS,browserVersion(Version)};
+browserType([$e,$t,$a,$r,$o,$f,$f,$i,$c,$e|Version]) ->
+    {?STAROFFICE,browserVersion(Version)};
+browserType([$m,$o,$s,$a,$i,$c|Version]) ->
+    {?MOSAIC,browserVersion(Version)};
+browserType(Unknown)->
+    unknown.
+
+
+browserVersion([$/|VsnString]) ->
+    case catch list_to_float(VsnString) of
+	Number when float(Number) ->
+	    Number;
+	Whatever ->
+	    case string:span(VsnString,"1234567890.") of
+		0 ->
+		    unknown;
+		VLength ->
+		    Vsn = string:substr(VsnString,1,VLength),
+		    case string:tokens(Vsn,".") of
+			[Number] ->
+			   list_to_float(Number++".0");
+			[Major,Minor|_MinorMinor] ->
+			    list_to_float(Major++"."++Minor)
+		    end
+	    end
+    end;
+browserVersion(VsnString) ->
+    browserVersion([$/|VsnString]).
+
+operativeSystem(OpString) ->
+  operativeSystem(OpString, ?OPERATIVE_SYSTEMS).
+
+operativeSystem(OpString,[]) ->
+    unknown;
+operativeSystem(OpString,[{RetVal,RegExps}|Rest]) ->
+    case controlOperativeSystem(OpString,RegExps) of
+	true->
+	    RetVal;
+	_ ->
+	    operativeSystem(OpString,Rest)
+    end.
+
+controlOperativeSystem(OpString,[]) ->
+    false;
+controlOperativeSystem(OpString,[Regexp|Regexps]) ->
+    case regexp:match(OpString,Regexp) of
+	{match,_,_}->
+	    true;
+	nomatch->
+	    controlOperativeSystem(OpString,Regexps)
+    end.
+
+
+%% OK this is ugly but thats the only way since
+%% all browsers dont conform to the name/vsn standard
+%% First we check if it is one of the browsers that
+%% not are the default mozillaborwser against the regexp
+%% for the different browsers. if no match it a mozilla
+%% browser i.e opera netscape or internet explorer
+
+getMozilla(AgentString,[],Default) ->
+    Default;
+getMozilla(AgentString,[{Agent,AgentRegExp}|Rest],Default) ->
+    case regexp:match(AgentString,AgentRegExp) of
+	{match,_,_} ->
+	    {Agent,getVersion(AgentString,AgentRegExp)};
+	nomatch ->
+	    getMozilla(AgentString,Rest,Default)
+    end.
+
+getVersion(AgentString,AgentRegExp) ->
+    case regexp:match(AgentString,AgentRegExp++"[0-9\.\ ]*") of
+	{match,Start,Length} when length(AgentRegExp) < Length ->
+	    %% Ok we got the number split it out
+	    RealStart=Start+length(AgentRegExp),
+	    RealLength=Length-length(AgentRegExp),
+	    VsnString=string:substr(AgentString,RealStart,RealLength),
+	    case string:strip(VsnString,both,$\ ) of
+		[] ->
+		    unknown;
+		Vsn ->
+		    case string:tokens(Vsn,".") of
+			[Number]->
+			    list_to_float(Number++".0");
+			[Major,Minor|_MinorMinor]->
+			    list_to_float(Major++"."++Minor)
+		    end
+	    end;
+	nomatch ->
+	    unknown
+    end.
+
+
+test()->
+    io:format("~n--------------------------------------------------------~n"),
+    Res1=getBrowser("Mozilla/4.75 [en] (X11; U; SunOS 5.8 sun4u)"),
+    io:format("~p",[Res1]),
+    io:format("~n--------------------------------------------------------~n"),
+    io:format("~n--------------------------------------------------------~n"),
+    Res2=getBrowser("Mozilla/4.0 (compatible; MSIE 5.0; SP1B; SunOS 5.8 sun4u; X11)"),
+    io:format("~p",[Res2]),
+    io:format("~n--------------------------------------------------------~n"),
+    io:format("~n--------------------------------------------------------~n"),
+    Res3=getBrowser("Lynx/2.8.3rel.1 libwww-FM/2.142"),
+    io:format("~p",[Res3]),
+    io:format("~n--------------------------------------------------------~n").
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl
new file mode 100644
index 0000000000..d3f67eb77a
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl
@@ -0,0 +1,692 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_cgi.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_cgi).
+-export([do/1,env/3,status_code/1,load/2]).
+
+%%Exports to the interface for sending chunked data
+%% to http/1.1 users and full responses to http/1.0
+-export([send/5,final_send/4, update_status_code/2,get_new_size/2]).
+-include("httpd.hrl").
+
+-define(VMODULE,"CGI").
+-include("httpd_verbosity.hrl").
+
+-define(GATEWAY_INTERFACE,"CGI/1.1").
+-define(DEFAULT_CGI_TIMEOUT,15000).
+
+%% do
+
+do(Info) ->
+    ?vtrace("do",[]),
+    case httpd_util:key1search(Info#mod.data,status) of
+	%% A status code has been generated!
+	{StatusCode, PhraseArgs, Reason} ->
+	    {proceed, Info#mod.data};
+	%% No status code has been generated!
+	undefined ->
+	    ?vtrace("do -> no status code has been generated", []),
+	    case httpd_util:key1search(Info#mod.data,response) of
+		%% No response has been generated!
+		undefined ->
+		    ?vtrace("do -> no response has been generated", []),
+		    RequestURI =
+			case httpd_util:key1search(Info#mod.data,
+						   new_request_uri) of
+			    undefined ->
+				Info#mod.request_uri;
+			    Value ->
+				Value
+			end,
+		    ?vtrace("do -> RequestURI: ~p", [RequestURI]),
+		    ScriptAliases =
+			httpd_util:multi_lookup(Info#mod.config_db,
+						script_alias),
+		    ?vtrace("do -> ScriptAliases: ~p", [ScriptAliases]),
+		    case mod_alias:real_script_name(Info#mod.config_db,
+						    RequestURI,
+						    ScriptAliases) of
+			{Script, AfterScript} ->
+			    exec_script(Info, Script, AfterScript, RequestURI);
+			not_a_script ->
+			    {proceed,Info#mod.data}
+		    end;
+		%% A response has been generated or sent!
+		Response ->
+		    {proceed,Info#mod.data}
+	    end
+    end.
+
+
+%% is_executable(File) ->
+%%    ?DEBUG("is_executable -> entry with~n"
+%%	   "   File: ~s",[File]),
+%%    Dir      = filename:dirname(File),
+%%    FileName = filename:basename(File),
+%%    is_executable(FileName,Dir).
+%%
+%% is_executable(FileName,Dir) ->
+%%    ?DEBUG("is_executable -> entry with~n"
+%%	   "   Dir:      ~s~n"
+%%	   "   FileName: ~s",[Dir,FileName]),
+%%    case os:find_executable(FileName, Dir) of
+%%	false ->
+%%	    false;
+%%	_ ->
+%%	    true
+%%    end.
+
+
+%% -------------------------
+%% Start temporary (hopefully) fix for win32
+%% OTP-3627
+%%
+
+is_executable(File) ->
+    Dir      = filename:dirname(File),
+    FileName = filename:basename(File),
+    case os:type() of
+	{win32,_} ->
+	    is_win32_executable(Dir,FileName);
+	_ ->
+	    is_other_executable(Dir,FileName)
+    end.
+
+
+is_win32_executable(D,F) ->
+    case ends_with(F,[".bat",".exe",".com"]) of
+	false ->
+	    %% This is why we cant use 'os:find_executable' directly.
+	    %% It assumes that executable files is given without extension
+	    case os:find_executable(F,D) of
+		false ->
+		    false;
+		_ ->
+		    true
+	    end;
+	true ->
+	    case file:read_file_info(D ++ "/" ++ F) of
+		{ok,_} ->
+		    true;
+		_ ->
+		    false
+	    end
+    end.
+
+
+is_other_executable(D,F) ->
+    case os:find_executable(F,D) of
+	false ->
+	    false;
+	_ ->
+	    true
+    end.
+
+
+ends_with(File,[]) ->
+    false;
+ends_with(File,[Ext|Rest]) ->
+    case ends_with1(File,Ext) of
+	true ->
+	    true;
+	false ->
+	    ends_with(File,Rest)
+    end.
+
+ends_with1(S,E) when length(S) >= length(E) ->
+    case to_lower(string:right(S,length(E))) of
+	E ->
+	    true;
+	_ ->
+	    false
+    end;
+ends_with1(_S,_E) ->
+    false.
+
+
+to_lower(S)       -> to_lower(S,[]).
+
+to_lower([],L)    -> lists:reverse(L);
+to_lower([H|T],L) -> to_lower(T,[to_lower1(H)|L]).
+
+to_lower1(C) when C >= $A, C =< $Z ->
+    C + ($a - $A);
+to_lower1(C) ->
+    C.
+
+%%
+%% End fix
+%% ---------------------------------
+
+
+env(VarName, Value) ->
+    {VarName, Value}.
+
+env(Info, Script, AfterScript) ->
+    ?vtrace("env -> entry with"
+	    "~n   Script:      ~p"
+	    "~n   AfterScript: ~p",
+	    [Script, AfterScript]),
+    {_, RemoteAddr} = (Info#mod.init_data)#init_data.peername,
+    ServerName = (Info#mod.init_data)#init_data.resolve,
+    PH = parsed_header(Info#mod.parsed_header),
+    Env =
+	[env("SERVER_SOFTWARE",?SERVER_SOFTWARE),
+	 env("SERVER_NAME",ServerName),
+	 env("GATEWAY_INTERFACE",?GATEWAY_INTERFACE),
+	 env("SERVER_PROTOCOL",?SERVER_PROTOCOL),
+	 env("SERVER_PORT",
+	     integer_to_list(httpd_util:lookup(Info#mod.config_db,port,80))),
+	 env("REQUEST_METHOD",Info#mod.method),
+	 env("REMOTE_ADDR",RemoteAddr),
+	 env("SCRIPT_NAME",Script)],
+    Env1 =
+        case Info#mod.method of
+            "GET" ->
+                case AfterScript of
+		    {[], QueryString} ->
+                        [env("QUERY_STRING", QueryString)|Env];
+		    {PathInfo, []} ->
+                        Aliases = httpd_util:multi_lookup(
+				    Info#mod.config_db,alias),
+                        {_, PathTranslated, _} =
+                            mod_alias:real_name(
+                              Info#mod.config_db, PathInfo, Aliases),
+                        [Env|
+                         [env("PATH_INFO","/"++httpd_util:decode_hex(PathInfo)),
+                          env("PATH_TRANSLATED",PathTranslated)]];
+		    {PathInfo, QueryString} ->
+                        Aliases = httpd_util:multi_lookup(
+				    Info#mod.config_db,alias),
+                        {_, PathTranslated, _} =
+                            mod_alias:real_name(
+                              Info#mod.config_db, PathInfo, Aliases),
+                        [Env|
+                         [env("PATH_INFO",
+			      httpd_util:decode_hex(PathInfo)),
+                          env("PATH_TRANSLATED",PathTranslated),
+			  env("QUERY_STRING", QueryString)]];
+		    [] ->
+			Env
+                end;
+            "POST" ->
+                [env("CONTENT_LENGTH",
+                     integer_to_list(httpd_util:flatlength(
+                                       Info#mod.entity_body)))|Env];
+            _ ->
+                Env
+        end,
+    Env2 =
+        case httpd_util:key1search(Info#mod.data,remote_user) of
+            undefined ->
+                Env1;
+            RemoteUser ->
+                [env("REMOTE_USER",RemoteUser)|Env1] %% OTP-4416
+        end,
+    lists:flatten([Env2|PH]).
+
+
+parsed_header(List) ->
+    parsed_header(List, []).
+
+parsed_header([], SoFar) ->
+    SoFar;
+parsed_header([{Name,[Value|R1]}|R2], SoFar) when list(Value)->
+    NewName=lists:map(fun(X) -> if X == $- -> $_; true -> X end end,Name),
+    Env = env("HTTP_"++httpd_util:to_upper(NewName),
+	      multi_value([Value|R1])),
+    parsed_header(R2, [Env|SoFar]);
+
+parsed_header([{Name,Value}|Rest], SoFar) ->
+    {ok,NewName,_} = regexp:gsub(Name, "-", "_"),
+    Env=env("HTTP_"++httpd_util:to_upper(NewName),Value),
+    parsed_header(Rest, [Env|SoFar]).
+
+
+multi_value([]) ->
+  [];
+multi_value([Value]) ->
+  Value;
+multi_value([Value|Rest]) ->
+  Value++", "++multi_value(Rest).
+
+
+exec_script(Info, Script, AfterScript, RequestURI) ->
+    ?vdebug("exec_script -> entry with"
+	    "~n   Script:      ~p"
+	    "~n   AfterScript: ~p",
+	    [Script,AfterScript]),
+    exec_script(is_executable(Script),Info,Script,AfterScript,RequestURI).
+
+exec_script(true, Info, Script, AfterScript, RequestURI) ->
+    ?vtrace("exec_script -> entry when script is executable",[]),
+    process_flag(trap_exit,true),
+    Dir  = filename:dirname(Script),
+    [Script_Name|_] = string:tokens(RequestURI, "?"),
+    Env  = env(Info, Script_Name, AfterScript),
+    Port = (catch open_port({spawn,Script},[stream,{cd, Dir},{env, Env}])),
+    ?vtrace("exec_script -> Port: ~w",[Port]),
+    case Port of
+	P when port(P) ->
+	    %% Send entity_body to port.
+	    Res = case Info#mod.entity_body of
+		      [] ->
+			  true;
+		      EntityBody ->
+			  (catch port_command(Port, EntityBody))
+		  end,
+	    case Res of
+		{'EXIT',Reason} ->
+		    ?vlog("port send failed:"
+			  "~n   Port:   ~p"
+			  "~n   URI:    ~p"
+			  "~n   Reason: ~p",
+			  [Port,Info#mod.request_uri,Reason]),
+		    exit({open_cmd_failed,Reason,
+			  [{mod,?MODULE},{port,Port},
+			   {uri,Info#mod.request_uri},
+			   {script,Script},{env,Env},{dir,Dir},
+			   {ebody_size,sz(Info#mod.entity_body)}]});
+		 true ->
+		    proxy(Info, Port)
+	    end;
+	{'EXIT',Reason} ->
+	    ?vlog("open port failed: exit"
+		  "~n   URI:    ~p"
+		  "~n   Reason: ~p",
+		  [Info#mod.request_uri,Reason]),
+	    exit({open_port_failed,Reason,
+		  [{mod,?MODULE},{uri,Info#mod.request_uri},{script,Script},
+		   {env,Env},{dir,Dir}]});
+	O ->
+	    ?vlog("open port failed: unknown result"
+		  "~n   URI: ~p"
+		  "~n   O:   ~p",
+		  [Info#mod.request_uri,O]),
+	    exit({open_port_failed,O,
+		  [{mod,?MODULE},{uri,Info#mod.request_uri},{script,Script},
+		   {env,Env},{dir,Dir}]})
+    end;
+
+exec_script(false,Info,Script,_AfterScript,_RequestURI) ->
+    ?vlog("script ~s not executable",[Script]),
+    {proceed,
+     [{status,
+       {404,Info#mod.request_uri,
+	?NICE("You don't have permission to execute " ++
+	      Info#mod.request_uri ++ " on this server")}}|
+      Info#mod.data]}.
+
+
+
+%%
+%% Socket <-> Port communication
+%%
+
+proxy(#mod{config_db = ConfigDb} = Info, Port) ->
+    Timeout = httpd_util:lookup(ConfigDb, cgi_timeout, ?DEFAULT_CGI_TIMEOUT),
+    proxy(Info, Port, 0, undefined,[], Timeout).
+
+proxy(Info, Port, Size, StatusCode, AccResponse, Timeout) ->
+    ?vdebug("proxy -> entry with"
+	    "~n   Size:      ~p"
+	    "~n   StatusCode ~p"
+	    "~n   Timeout:   ~p",
+	    [Size, StatusCode, Timeout]),
+    receive
+	{Port, {data, Response}} when port(Port) ->
+	    ?vtrace("proxy -> got some data from the port",[]),
+
+	    NewStatusCode = update_status_code(StatusCode, Response),
+
+	    ?vtrace("proxy -> NewStatusCode: ~p",[NewStatusCode]),
+	    case send(Info, NewStatusCode, Response, Size, AccResponse) of
+		socket_closed ->
+		    ?vtrace("proxy -> socket closed: kill port",[]),
+		    (catch port_close(Port)), % KILL the port !!!!
+		    process_flag(trap_exit,false),
+		    {proceed,
+		     [{response,{already_sent,200,Size}}|Info#mod.data]};
+
+		head_sent ->
+		    ?vtrace("proxy -> head sent: kill port",[]),
+		    (catch port_close(Port)), % KILL the port !!!!
+		    process_flag(trap_exit,false),
+		    {proceed,
+		     [{response,{already_sent,200,Size}}|Info#mod.data]};
+
+		{http_response, NewAccResponse} ->
+		    ?vtrace("proxy -> head response: continue",[]),
+		    NewSize = get_new_size(Size, Response),
+		    proxy(Info, Port, NewSize, NewStatusCode,
+			  NewAccResponse, Timeout);
+
+		_ ->
+		    ?vtrace("proxy -> continue",[]),
+		    %% The data is sent and the socket is not closed, continue
+		    NewSize = get_new_size(Size, Response),
+		    proxy(Info, Port, NewSize, NewStatusCode,
+			  "nonempty", Timeout)
+	    end;
+
+	{'EXIT', Port, normal} when port(Port) ->
+	    ?vtrace("proxy -> exit signal from port: normal",[]),
+	    NewStatusCode = update_status_code(StatusCode,AccResponse),
+	    final_send(Info,NewStatusCode,Size,AccResponse),
+	    process_flag(trap_exit,false),
+	    {proceed, [{response,{already_sent,200,Size}}|Info#mod.data]};
+
+	{'EXIT', Port, Reason} when port(Port) ->
+	    ?vtrace("proxy -> exit signal from port: ~p",[Reason]),
+	    process_flag(trap_exit, false),
+	    {proceed, [{status,{400,none,reason(Reason)}}|Info#mod.data]};
+
+	{'EXIT', Pid, Reason} when pid(Pid) ->
+	    %% This is the case that a linked process has died,
+	    %% It would be nice to response with a server error
+	    %% but since the heade alredy is sent
+	    ?vtrace("proxy -> exit signal from ~p: ~p",[Pid, Reason]),
+	    proxy(Info, Port, Size, StatusCode, AccResponse, Timeout);
+
+	%% This should not happen
+	WhatEver ->
+	    ?vinfo("proxy -> received garbage: ~n~p", [WhatEver]),
+	    NewStatusCode = update_status_code(StatusCode, AccResponse),
+	    final_send(Info, StatusCode, Size, AccResponse),
+	    process_flag(trap_exit, false),
+	    {proceed, [{response,{already_sent,200,Size}}|Info#mod.data]}
+
+    after Timeout ->
+	    ?vlog("proxy -> timeout",[]),
+	    (catch port_close(Port)), % KILL the port !!!!
+	    httpd_socket:close(Info#mod.socket_type, Info#mod.socket),
+	    process_flag(trap_exit,false),
+	    {proceed,[{response,{already_sent,200,Size}}|Info#mod.data]}
+    end.
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                    %%
+%% The functions that handles the sending of the data to the client   %%
+%%                                                                    %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%----------------------------------------------------------------------
+%% Send the header the first time the size of the body is Zero
+%%----------------------------------------------------------------------
+
+send(#mod{method = "HEAD"} = Info, StatusCode, Response, 0, []) ->
+    first_handle_head_request(Info, StatusCode, Response);
+send(Info, StatusCode, Response, 0, []) ->
+    first_handle_other_request(Info, StatusCode, Response);
+
+%%----------------------------------------------------------------------
+%% The size of the body is bigger than zero =>
+%% we have a part of the body to send
+%%----------------------------------------------------------------------
+send(Info, StatusCode, Response, Size, AccResponse) ->
+    handle_other_request(Info, StatusCode, Response).
+
+
+%%----------------------------------------------------------------------
+%% The function is called the last time when the port has closed
+%%----------------------------------------------------------------------
+
+final_send(Info, StatusCode, Size, AccResponse)->
+    final_handle_other_request(Info, StatusCode).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                    %%
+%% The code that handles the head requests                            %%
+%%                                                                    %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%----------------------------------------------------------------------
+%% The request is a head request if its a HTPT/1.1 request answer to it
+%% otherwise we must collect the size of hte body before we can answer.
+%% Return Values:
+%% head_sent
+%%----------------------------------------------------------------------
+first_handle_head_request(Info, StatusCode, Response)->
+    case Info#mod.http_version of
+	"HTTP/1.1" ->
+	    %% Since we have all we need to create the header create it
+	    %% send it and return head_sent.
+	    case httpd_util:split(Response,"\r\n\r\n|\n\n",2) of
+		{ok, [HeadEnd, Rest]} ->
+		    HeadEnd1 = removeStatus(HeadEnd),
+		    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket,
+					 [create_header(Info,StatusCode),
+					  HeadEnd1,"\r\n\r\n"]);
+		_ ->
+		    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket,
+					 [create_header(Info, StatusCode),
+					  "Content-Type:text/html\r\n\r\n"])
+	    end;
+	_ ->
+	  Response1= case regexp:split(Response,"\r\n\r\n|\n\n") of
+			  {ok,[HeadEnd|Rest]} ->
+			     removeStatus(HeadEnd);
+			  _ ->
+			     ["Content-Type:text/html"]
+		     end,
+	    H1 = httpd_util:header(StatusCode,Info#mod.connection),
+	    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket,
+				 [H1,Response1,"\r\n\r\n"])
+    end,
+    head_sent.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                    %%
+%% Handle the requests that is to the other methods                   %%
+%%                                                                    %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%----------------------------------------------------------------------
+%% Create the http-response header and send it to the user if it is
+%% a http/1.1 request otherwise we must accumulate it
+%%----------------------------------------------------------------------
+first_handle_other_request(Info,StatusCode,Response)->
+    Header = create_header(Info,StatusCode),
+    Response1 =
+	case httpd_util:split(Response,"\r\n\r\n|\n\n",2) of
+	    {ok,[HeadPart,[]]} ->
+		[Header, removeStatus(HeadPart),"\r\n\r\n"];
+
+	    {ok,[HeadPart,BodyPart]} ->
+		      [Header, removeStatus(HeadPart), "\r\n\r\n",
+		       httpd_util:integer_to_hexlist(length(BodyPart)),
+		       "\r\n", BodyPart];
+	    _WhatEver ->
+		%% No response header field from the cgi-script,
+		%% Just a body
+		[Header, "Content-Type:text/html","\r\n\r\n",
+		 httpd_util:integer_to_hexlist(length(Response)),
+		 "\r\n", Response]
+	end,
+    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket, Response1).
+
+
+handle_other_request(#mod{http_version = "HTTP/1.1",
+			  socket_type = Type, socket = Sock} = Info,
+		     StatusCode, Response0) ->
+    Response = create_chunk(Info, Response0),
+    httpd_socket:deliver(Type, Sock, Response);
+handle_other_request(#mod{socket_type = Type, socket = Sock} = Info,
+		     StatusCode, Response) ->
+    httpd_socket:deliver(Type, Sock, Response).
+
+
+final_handle_other_request(#mod{http_version = "HTTP/1.1",
+				socket_type = Type, socket = Sock},
+			   StatusCode) ->
+    httpd_socket:deliver(Type, Sock, "0\r\n");
+final_handle_other_request(#mod{socket_type = Type, socket = Sock},
+			   StatusCode) ->
+    httpd_socket:close(Type, Sock),
+    socket_closed.
+
+
+create_chunk(_Info, Response) ->
+    HEXSize = httpd_util:integer_to_hexlist(length(lists:flatten(Response))),
+    HEXSize++"\r\n"++Response++"\r\n".
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                    %%
+%% The various helper functions                                       %%
+%%                                                                    %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+update_status_code(undefined, Response) ->
+    case status_code(Response) of
+	{ok, StatusCode1} ->
+	    StatusCode1;
+	_ ->
+	    ?vlog("invalid response from script:~n~p", [Response]),
+	    500
+    end;
+update_status_code(StatusCode,_Response)->
+    StatusCode.
+
+
+get_new_size(0,Response)->
+    case httpd_util:split(Response,"\r\n\r\n|\n\n",2) of
+	{ok,[Head,Body]}->
+	    length(lists:flatten(Body));
+	_ ->
+	    %%No header in the respone
+	    length(lists:flatten(Response))
+    end;
+
+get_new_size(Size,Response)->
+    Size+length(lists:flatten(Response)).
+
+%%----------------------------------------------------------------------
+%% Creates the http-header for a response
+%%----------------------------------------------------------------------
+create_header(Info,StatusCode)->
+    Cache=case httpd_util:lookup(Info#mod.config_db,script_nocache,false) of
+	      true->
+		  Date=httpd_util:rfc1123_date(),
+		  "Cache-Control:no-cache\r\nPragma:no-cache\r\nExpires:"++ Date ++ "\r\n";
+	      false ->
+		  []
+	  end,
+    case Info#mod.http_version of
+	"HTTP/1.1"  ->
+	    Header=httpd_util:header(StatusCode, Info#mod.connection),
+	    Header++"Transfer-encoding:chunked\r\n"++Cache;
+	_ ->
+	    httpd_util:header(StatusCode,Info#mod.connection)++Cache
+    end.
+
+
+
+%% status_code
+
+status_code(Response) ->
+  case httpd_util:split(Response,"\n\n|\r\n\r\n",2) of
+    {ok,[Header,Body]} ->
+      case regexp:split(Header,"\n|\r\n") of
+	{ok,HeaderFields} ->
+	  {ok,extract_status_code(HeaderFields)};
+	{error,_} ->
+	      {error, bad_script_output(Response)}
+      end;
+    _ ->
+	  %% No header field in the returned data return 200 the standard code
+	  {ok, 200}
+  end.
+
+bad_script_output(Bad) ->
+    lists:flatten(io_lib:format("Bad script output ~s",[Bad])).
+
+
+extract_status_code([]) ->
+  200;
+extract_status_code([[$L,$o,$c,$a,$t,$i,$o,$n,$:,$ |_]|_]) ->
+  302;
+extract_status_code([[$S,$t,$a,$t,$u,$s,$:,$ |CodeAndReason]|_]) ->
+  case httpd_util:split(CodeAndReason," ",2) of
+    {ok,[Code,_]} ->
+      list_to_integer(Code);
+    {ok,_} ->
+      200
+  end;
+extract_status_code([_|Rest]) ->
+  extract_status_code(Rest).
+
+
+sz(B) when binary(B) -> {binary,size(B)};
+sz(L) when list(L)   -> {list,length(L)};
+sz(_)                -> undefined.
+
+
+%% Convert error to printable string
+%%
+reason({error,emfile})     -> ": To many open files";
+reason({error,{enfile,_}}) -> ": File/port table overflow";
+reason({error,enomem})     -> ": Not enough memory";
+reason({error,eagain})     -> ": No more available OS processes";
+reason(_)                  -> "".
+
+removeStatus(Head)->
+    case httpd_util:split(Head,"Status:.\r\n",2) of
+	{ok,[HeadPart,HeadEnd]}->
+	    HeadPart++HeadEnd;
+	_ ->
+	    Head
+    end.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                    %%
+%% There are 2 config directives for mod_cgi:                         %%
+%% ScriptNoCache true|false, defines whether the server shall add     %%
+%%                           header fields to stop proxies and        %%
+%%                           clients from saving the page in history  %%
+%%                           or cache                                 %%
+%%                                                                    %%
+%% ScriptTimeout Seconds, The number of seconds that the server       %%
+%%                        maximum will wait for the script to         %%
+%%                        generate a part of the document             %%
+%%                                                                    %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+load([$S,$c,$r,$i,$p,$t,$N,$o,$C,$a,$c,$h,$e |CacheArg],[])->
+    case catch list_to_atom(httpd_conf:clean(CacheArg)) of
+        true ->
+	    {ok, [], {script_nocache,true}};
+	false ->
+	   {ok, [], {script_nocache,false}};
+	_ ->
+	   {error, ?NICE(httpd_conf:clean(CacheArg)++
+			 " is an invalid ScriptNoCache directive")}
+    end;
+
+load([$S,$c,$r,$i,$p,$t,$T,$i,$m,$e,$o,$u,$t,$ |Timeout],[])->
+    case catch list_to_integer(httpd_conf:clean(Timeout)) of
+	TimeoutSec when integer(TimeoutSec)  ->
+	   {ok, [], {script_timeout,TimeoutSec*1000}};
+	_ ->
+	   {error, ?NICE(httpd_conf:clean(Timeout)++
+			 " is an invalid ScriptTimeout")}
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_dir.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_dir.erl
new file mode 100644
index 0000000000..9dda6d9119
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_dir.erl
@@ -0,0 +1,266 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_dir.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_dir).
+-export([do/1]).
+
+-include("httpd.hrl").
+
+%% do
+
+do(Info) ->
+    ?DEBUG("do -> entry",[]),
+    case Info#mod.method of
+	"GET" ->
+	    case httpd_util:key1search(Info#mod.data,status) of
+		%% A status code has been generated!
+		{StatusCode,PhraseArgs,Reason} ->
+		    {proceed,Info#mod.data};
+		%% No status code has been generated!
+		undefined ->
+		    case httpd_util:key1search(Info#mod.data,response) of
+			%% No response has been generated!
+			undefined ->
+			    do_dir(Info);
+			%% A response has been generated or sent!
+			Response ->
+			    {proceed,Info#mod.data}
+		    end
+	    end;
+	%% Not a GET method!
+	_ ->
+	    {proceed,Info#mod.data}
+    end.
+
+do_dir(Info) ->
+    ?DEBUG("do_dir -> Request URI: ~p",[Info#mod.request_uri]),
+    Path = mod_alias:path(Info#mod.data,Info#mod.config_db,
+			  Info#mod.request_uri),
+    DefaultPath = mod_alias:default_index(Info#mod.config_db,Path),
+    %% Is it a directory?
+    case file:read_file_info(DefaultPath) of
+	{ok,FileInfo} when FileInfo#file_info.type == directory ->
+	    DecodedRequestURI =
+		httpd_util:decode_hex(Info#mod.request_uri),
+	    ?DEBUG("do_dir -> ~n"
+		   "      Path:              ~p~n"
+		   "      DefaultPath:       ~p~n"
+		   "      DecodedRequestURI: ~p",
+		   [Path,DefaultPath,DecodedRequestURI]),
+	    case dir(DefaultPath,string:strip(DecodedRequestURI,right,$/),Info#mod.config_db) of
+		{ok, Dir} ->
+		    Head=[{content_type,"text/html"},
+			  {content_length,integer_to_list(httpd_util:flatlength(Dir))},
+			   {date,httpd_util:rfc1123_date(FileInfo#file_info.mtime)},
+			  {code,200}],
+		    {proceed,[{response,{response,Head,Dir}},
+			      {mime_type,"text/html"}|Info#mod.data]};
+		{error, Reason} ->
+		    ?ERROR("do_dir -> dir operation failed: ~p",[Reason]),
+		    {proceed,
+		     [{status,{404,Info#mod.request_uri,Reason}}|
+		      Info#mod.data]}
+	    end;
+	{ok,FileInfo} ->
+	    ?DEBUG("do_dir -> ~n"
+		   "      Path:        ~p~n"
+		   "      DefaultPath: ~p~n"
+		   "      FileInfo:    ~p",
+		   [Path,DefaultPath,FileInfo]),
+	    {proceed,Info#mod.data};
+	{error,Reason} ->
+	    ?LOG("do_dir -> failed reading file info (~p) for: ~p",
+		 [Reason,DefaultPath]),
+	    {proceed,
+	     [{status,read_file_info_error(Reason,Info,DefaultPath)}|
+	      Info#mod.data]}
+    end.
+
+dir(Path,RequestURI,ConfigDB) ->
+    case file:list_dir(Path) of
+	{ok,FileList} ->
+	    SortedFileList=lists:sort(FileList),
+	    {ok,[header(Path,RequestURI),
+		 body(Path,RequestURI,ConfigDB,SortedFileList),
+		 footer(Path,SortedFileList)]};
+	{error,Reason} ->
+	    {error,?NICE("Can't open directory "++Path++": "++Reason)}
+  end.
+
+%% header
+
+header(Path,RequestURI) ->
+  Header=
+    "<HTML>\n<HEAD>\n<TITLE>Index of "++RequestURI++"</TITLE>\n</HEAD>\n<BODY>\n<H1>Index of "++
+    RequestURI++"</H1>\n<PRE><IMG SRC=\""++icon(blank)++
+    "\" ALT="     "> Name                   Last modified         Size  Description
+<HR>\n",
+  case regexp:sub(RequestURI,"[^/]*\$","") of
+    {ok,"/",_} ->
+      Header;
+    {ok,ParentRequestURI,_} ->
+      {ok,ParentPath,_}=regexp:sub(string:strip(Path,right,$/),"[^/]*\$",""),
+      Header++format(ParentPath,ParentRequestURI)
+  end.
+
+format(Path,RequestURI) ->
+  {ok,FileInfo}=file:read_file_info(Path),
+  {{Year,Month,Day},{Hour,Minute,Second}}=FileInfo#file_info.mtime,
+  io_lib:format("<IMG SRC=\"~s\" ALT=\"[~s]\"> <A HREF=\"~s\">Parent directory</A>       ~2.2.0w-~s-~w ~2.2.0w:~2.2.0w        -\n",
+		[icon(back),"DIR",RequestURI,Day,
+		 httpd_util:month(Month),Year,Hour,Minute]).
+
+%% body
+
+body(Path,RequestURI,ConfigDB,[]) ->
+  [];
+body(Path,RequestURI,ConfigDB,[Entry|Rest]) ->
+  [format(Path,RequestURI,ConfigDB,Entry)|body(Path,RequestURI,ConfigDB,Rest)].
+
+format(Path,RequestURI,ConfigDB,Entry) ->
+  case file:read_file_info(Path++"/"++Entry) of
+    {ok,FileInfo} when FileInfo#file_info.type == directory ->
+      {{Year,Month,Day},{Hour,Minute,Second}}=FileInfo#file_info.mtime,
+      EntryLength=length(Entry),
+      if
+	EntryLength > 21 ->
+	  io_lib:format("<IMG SRC=\"~s\" ALT=\"[~s]\"> <A HREF=\"~s\">~-21.s..</A>~2.2.0w-~s-~w ~2.2.0w:~2.2.0w        -\n",
+			[icon(folder),"DIR",RequestURI++"/"++Entry++"/",Entry,
+			 Day,httpd_util:month(Month),Year,Hour,Minute]);
+	true ->
+	  io_lib:format("<IMG SRC=\"~s\" ALT=\"[~s]\"> <A HREF=\"~s\">~s</A>~*.*c~2.2.0w-~s-~w ~2.2.0w:~2.2.0w        -\n",
+			[icon(folder),"DIR",RequestURI++"/"++Entry++"/",Entry,
+			 23-EntryLength,23-EntryLength,$ ,Day,
+			 httpd_util:month(Month),Year,Hour,Minute])
+      end;
+    {ok,FileInfo} ->
+      {{Year,Month,Day},{Hour,Minute,Second}}=FileInfo#file_info.mtime,
+      Suffix=httpd_util:suffix(Entry),
+      MimeType=httpd_util:lookup_mime(ConfigDB,Suffix,""),
+      EntryLength=length(Entry),
+      if
+	EntryLength > 21 ->
+	  io_lib:format("<IMG SRC=\"~s\" ALT=\"[~s]\"> <A HREF=\"~s\">~-21.s..</A>~2.2.0w-~s-~w ~2.2.0w:~2.2.0w~8wk  ~s\n",
+			[icon(Suffix,MimeType),Suffix,RequestURI++"/"++Entry,
+			 Entry,Day,httpd_util:month(Month),Year,Hour,Minute,
+			 trunc(FileInfo#file_info.size/1024+1),MimeType]);
+	true ->
+	  io_lib:format("<IMG SRC=\"~s\" ALT=\"[~s]\"> <A HREF=\"~s\">~s</A>~*.*c~2.2.0w-~s-~w ~2.2.0w:~2.2.0w~8wk  ~s\n",
+			[icon(Suffix,MimeType),Suffix,RequestURI++"/"++Entry,
+			 Entry,23-EntryLength,23-EntryLength,$ ,Day,
+			 httpd_util:month(Month),Year,Hour,Minute,
+			 trunc(FileInfo#file_info.size/1024+1),MimeType])
+      end;
+    {error,Reason} ->
+      ""
+  end.
+
+%% footer
+
+footer(Path,FileList) ->
+  case lists:member("README",FileList) of
+    true ->
+      {ok,Body}=file:read_file(Path++"/README"),
+      "</PRE>\n<HR>\n<PRE>\n"++binary_to_list(Body)++
+	"\n</PRE>\n</BODY>\n</HTML>\n";
+    false ->
+      "</PRE>\n</BODY>\n</HTML>\n"
+  end.
+
+%%
+%% Icon mappings are hard-wired ala default Apache (Ugly!)
+%%
+
+icon(Suffix,MimeType) ->
+  case icon(Suffix) of
+    undefined ->
+      case MimeType of
+	[$t,$e,$x,$t,$/|_] ->
+	  "/icons/text.gif";
+	[$i,$m,$a,$g,$e,$/|_] ->
+	  "/icons/image2.gif";
+	[$a,$u,$d,$i,$o,$/|_] ->
+	  "/icons/sound2.gif";
+	[$v,$i,$d,$e,$o,$/|_] ->
+	  "/icons/movie.gif";
+	_ ->
+	  "/icons/unknown.gif"
+      end;
+    Icon ->
+      Icon
+  end.
+
+icon(blank) -> "/icons/blank.gif";
+icon(back) -> "/icons/back.gif";
+icon(folder) -> "/icons/folder.gif";
+icon("bin") -> "/icons/binary.gif";
+icon("exe") -> "/icons/binary.gif";
+icon("hqx") -> "/icons/binhex.gif";
+icon("tar") -> "/icons/tar.gif";
+icon("wrl") -> "/icons/world2.gif";
+icon("wrl.gz") -> "/icons/world2.gif";
+icon("vrml") -> "/icons/world2.gif";
+icon("vrm") -> "/icons/world2.gif";
+icon("iv") -> "/icons/world2.gif";
+icon("Z") -> "/icons/compressed.gif";
+icon("z") -> "/icons/compressed.gif";
+icon("tgz") -> "/icons/compressed.gif";
+icon("gz") -> "/icons/compressed.gif";
+icon("zip") -> "/icons/compressed.gif";
+icon("ps") -> "/icons/a.gif";
+icon("ai") -> "/icons/a.gif";
+icon("eps") -> "/icons/a.gif";
+icon("html") -> "/icons/layout.gif";
+icon("shtml") -> "/icons/layout.gif";
+icon("htm") -> "/icons/layout.gif";
+icon("pdf") -> "/icons/layout.gif";
+icon("txt") -> "/icons/text.gif";
+icon("erl") -> "/icons/burst.gif";
+icon("c") -> "/icons/c.gif";
+icon("pl") -> "/icons/p.gif";
+icon("py") -> "/icons/p.gif";
+icon("for") -> "/icons/f.gif";
+icon("dvi") -> "/icons/dvi.gif";
+icon("uu") -> "/icons/uuencoded.gif";
+icon("conf") -> "/icons/script.gif";
+icon("sh") -> "/icons/script.gif";
+icon("shar") -> "/icons/script.gif";
+icon("csh") -> "/icons/script.gif";
+icon("ksh") -> "/icons/script.gif";
+icon("tcl") -> "/icons/script.gif";
+icon("tex") -> "/icons/tex.gif";
+icon("core") -> "/icons/tex.gif";
+icon(_) -> undefined.
+
+
+read_file_info_error(eacces,Info,Path) ->
+    read_file_info_error(403,Info,Path,
+			 ": Missing search permissions for one "
+			 "of the parent directories");
+read_file_info_error(enoent,Info,Path) ->
+    read_file_info_error(404,Info,Path,"");
+read_file_info_error(enotdir,Info,Path) ->
+    read_file_info_error(404,Info,Path,
+			 ": A component of the file name is not a directory");
+read_file_info_error(_,Info,Path) ->
+    read_file_info_error(500,none,Path,"").
+
+read_file_info_error(StatusCode,none,Path,Reason) ->
+    {StatusCode,none,?NICE("Can't access "++Path++Reason)};
+read_file_info_error(StatusCode,Info,Path,Reason) ->
+    {StatusCode,Info#mod.request_uri,
+     ?NICE("Can't access "++Path++Reason)}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_disk_log.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_disk_log.erl
new file mode 100644
index 0000000000..bb175f24b0
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_disk_log.erl
@@ -0,0 +1,404 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_disk_log.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_disk_log).
+-export([do/1,error_log/5,security_log/2,load/2,store/2,remove/1]).
+
+-export([report_error/2]).
+
+-define(VMODULE,"DISK_LOG").
+-include("httpd_verbosity.hrl").
+
+-include("httpd.hrl").
+
+%% do
+
+do(Info) ->
+    AuthUser  = auth_user(Info#mod.data),
+    Date      = custom_date(),
+    log_internal_info(Info,Date,Info#mod.data),
+    LogFormat = get_log_format(Info#mod.config_db),
+    case httpd_util:key1search(Info#mod.data,status) of
+	%% A status code has been generated!
+	{StatusCode,PhraseArgs,Reason} ->
+	    transfer_log(Info, "-", AuthUser, Date, StatusCode, 0, LogFormat),
+	    if
+		StatusCode >= 400 ->
+		    error_log(Info, Date, Reason, LogFormat);
+		true ->
+		    not_an_error
+	    end,
+	    {proceed,Info#mod.data};
+	%% No status code has been generated!
+	undefined ->
+	    case httpd_util:key1search(Info#mod.data,response) of
+		{already_sent,StatusCode,Size} ->
+		    transfer_log(Info, "-", AuthUser, Date, StatusCode,
+				 Size, LogFormat),
+		    {proceed,Info#mod.data};
+
+		{response, Head, Body} ->
+		    Size = httpd_util:key1search(Head, content_length, 0),
+		    Code = httpd_util:key1search(Head, code, 200),
+		    transfer_log(Info, "-", AuthUser, Date, Code,
+				 Size, LogFormat),
+		    {proceed,Info#mod.data};
+
+		{StatusCode,Response} ->
+		    transfer_log(Info, "-", AuthUser, Date, 200,
+				 httpd_util:flatlength(Response), LogFormat),
+		    {proceed,Info#mod.data};
+		undefined ->
+		    transfer_log(Info, "-", AuthUser, Date, 200,
+				 0, LogFormat),
+		    {proceed,Info#mod.data}
+	    end
+    end.
+
+custom_date() ->
+    LocalTime     = calendar:local_time(),
+    UniversalTime = calendar:universal_time(),
+    Minutes       = round(diff_in_minutes(LocalTime,UniversalTime)),
+    {{YYYY,MM,DD},{Hour,Min,Sec}} = LocalTime,
+    Date =
+	io_lib:format("~.2.0w/~.3s/~.4w:~.2.0w:~.2.0w:~.2.0w ~c~.2.0w~.2.0w",
+		      [DD,httpd_util:month(MM),YYYY,Hour,Min,Sec,sign(Minutes),
+		       abs(Minutes) div 60,abs(Minutes) rem 60]),
+    lists:flatten(Date).
+
+diff_in_minutes(L,U) ->
+    (calendar:datetime_to_gregorian_seconds(L) -
+     calendar:datetime_to_gregorian_seconds(U))/60.
+
+sign(Minutes) when Minutes > 0 ->
+    $+;
+sign(Minutes) ->
+    $-.
+
+auth_user(Data) ->
+    case httpd_util:key1search(Data,remote_user) of
+	undefined ->
+	    "-";
+	RemoteUser ->
+	    RemoteUser
+    end.
+
+%% log_internal_info
+
+log_internal_info(Info,Date,[]) ->
+    ok;
+log_internal_info(Info,Date,[{internal_info,Reason}|Rest]) ->
+    Format = get_log_format(Info#mod.config_db),
+    error_log(Info,Date,Reason,Format),
+    log_internal_info(Info,Date,Rest);
+log_internal_info(Info,Date,[_|Rest]) ->
+    log_internal_info(Info,Date,Rest).
+
+
+%% transfer_log
+
+transfer_log(Info,RFC931,AuthUser,Date,StatusCode,Bytes,Format) ->
+    case httpd_util:lookup(Info#mod.config_db,transfer_disk_log) of
+	undefined ->
+	    no_transfer_log;
+	TransferDiskLog ->
+	    {PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
+	    Entry = io_lib:format("~s ~s ~s [~s] \"~s\" ~w ~w~n",
+				  [RemoteHost,RFC931,AuthUser,Date,
+				   Info#mod.request_line,StatusCode,Bytes]),
+	    write(TransferDiskLog, Entry, Format)
+    end.
+
+
+%% error_log
+
+error_log(Info, Date, Reason, Format) ->
+    Format=get_log_format(Info#mod.config_db),
+    case httpd_util:lookup(Info#mod.config_db,error_disk_log) of
+	undefined ->
+	    no_error_log;
+	ErrorDiskLog ->
+	    {PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
+	    Entry =
+		io_lib:format("[~s] access to ~s failed for ~s, reason: ~p~n",
+			      [Date, Info#mod.request_uri,
+			       RemoteHost, Reason]),
+	    write(ErrorDiskLog, Entry, Format)
+    end.
+
+error_log(SocketType, Socket, ConfigDB, {PortNumber, RemoteHost}, Reason) ->
+    Format = get_log_format(ConfigDB),
+    case httpd_util:lookup(ConfigDB,error_disk_log) of
+	undefined ->
+	    no_error_log;
+	ErrorDiskLog ->
+	    Date  = custom_date(),
+	    Entry =
+		io_lib:format("[~s] server crash for ~s, reason: ~p~n",
+			      [Date,RemoteHost,Reason]),
+	    write(ErrorDiskLog, Entry, Format),
+	    ok
+    end.
+
+
+%% security_log
+
+security_log(ConfigDB, Event) ->
+    Format = get_log_format(ConfigDB),
+    case httpd_util:lookup(ConfigDB,security_disk_log) of
+	undefined ->
+	    no_error_log;
+	DiskLog ->
+	    Date  = custom_date(),
+	    Entry = io_lib:format("[~s] ~s ~n", [Date, Event]),
+	    write(DiskLog, Entry, Format),
+	    ok
+    end.
+
+report_error(ConfigDB, Error) ->
+    Format = get_log_format(ConfigDB),
+    case httpd_util:lookup(ConfigDB, error_disk_log) of
+	undefined ->
+	    no_error_log;
+	ErrorDiskLog ->
+	    Date  = custom_date(),
+	    Entry = io_lib:format("[~s] reporting error: ~s",[Date,Error]),
+	    write(ErrorDiskLog, Entry, Format),
+	    ok
+    end.
+
+%%----------------------------------------------------------------------
+%% Get the current format of the disklog
+%%----------------------------------------------------------------------
+get_log_format(ConfigDB)->
+    httpd_util:lookup(ConfigDB,disk_log_format,external).
+
+
+%%
+%% Configuration
+%%
+
+%% load
+
+load([$T,$r,$a,$n,$s,$f,$e,$r,$D,$i,$s,$k,$L,$o,$g,$S,$i,$z,$e,$ |
+      TransferDiskLogSize],[]) ->
+    case regexp:split(TransferDiskLogSize," ") of
+	{ok,[MaxBytes,MaxFiles]} ->
+	    case httpd_conf:make_integer(MaxBytes) of
+		{ok,MaxBytesInteger} ->
+		    case httpd_conf:make_integer(MaxFiles) of
+			{ok,MaxFilesInteger} ->
+			    {ok,[],{transfer_disk_log_size,
+				    {MaxBytesInteger,MaxFilesInteger}}};
+			{error,_} ->
+			    {error,
+			     ?NICE(httpd_conf:clean(TransferDiskLogSize)++
+				   " is an invalid TransferDiskLogSize")}
+		    end;
+		{error,_} ->
+		    {error,?NICE(httpd_conf:clean(TransferDiskLogSize)++
+				 " is an invalid TransferDiskLogSize")}
+	    end
+    end;
+load([$T,$r,$a,$n,$s,$f,$e,$r,$D,$i,$s,$k,$L,$o,$g,$ |TransferDiskLog],[]) ->
+    {ok,[],{transfer_disk_log,httpd_conf:clean(TransferDiskLog)}};
+
+load([$E,$r,$r,$o,$r,$D,$i,$s,$k,$L,$o,$g,$S,$i,$z,$e,$ | ErrorDiskLogSize],[]) ->
+    case regexp:split(ErrorDiskLogSize," ") of
+	{ok,[MaxBytes,MaxFiles]} ->
+	    case httpd_conf:make_integer(MaxBytes) of
+		{ok,MaxBytesInteger} ->
+		    case httpd_conf:make_integer(MaxFiles) of
+			{ok,MaxFilesInteger} ->
+			    {ok,[],{error_disk_log_size,
+				    {MaxBytesInteger,MaxFilesInteger}}};
+			{error,_} ->
+			    {error,?NICE(httpd_conf:clean(ErrorDiskLogSize)++
+					 " is an invalid ErrorDiskLogSize")}
+		    end;
+		{error,_} ->
+		    {error,?NICE(httpd_conf:clean(ErrorDiskLogSize)++
+				 " is an invalid ErrorDiskLogSize")}
+	    end
+    end;
+load([$E,$r,$r,$o,$r,$D,$i,$s,$k,$L,$o,$g,$ |ErrorDiskLog],[]) ->
+    {ok, [], {error_disk_log, httpd_conf:clean(ErrorDiskLog)}};
+
+load([$S,$e,$c,$u,$r,$i,$t,$y,$D,$i,$s,$k,$L,$o,$g,$S,$i,$z,$e,$ |SecurityDiskLogSize],[]) ->
+    case regexp:split(SecurityDiskLogSize, " ") of
+	{ok, [MaxBytes, MaxFiles]} ->
+	    case httpd_conf:make_integer(MaxBytes) of
+		{ok, MaxBytesInteger} ->
+		    case httpd_conf:make_integer(MaxFiles) of
+			{ok, MaxFilesInteger} ->
+			    {ok, [], {security_disk_log_size,
+				      {MaxBytesInteger, MaxFilesInteger}}};
+			{error,_} ->
+			    {error, ?NICE(httpd_conf:clean(SecurityDiskLogSize)++
+					  " is an invalid SecurityDiskLogSize")}
+		    end;
+		{error, _} ->
+		    {error, ?NICE(httpd_conf:clean(SecurityDiskLogSize)++
+				  " is an invalid SecurityDiskLogSize")}
+	    end
+    end;
+load([$S,$e,$c,$u,$r,$i,$t,$y,$D,$i,$s,$k,$L,$o,$g,$ |SecurityDiskLog],[]) ->
+    {ok, [], {security_disk_log, httpd_conf:clean(SecurityDiskLog)}};
+
+load([$D,$i,$s,$k,$L,$o,$g,$F,$o,$r,$m,$a,$t,$ |Format],[]) ->
+    case httpd_conf:clean(Format) of
+	"internal" ->
+	    {ok, [], {disk_log_format,internal}};
+	"external" ->
+	    {ok, [], {disk_log_format,external}};
+	_Default ->
+	    {ok, [], {disk_log_format,external}}
+    end.
+
+%% store
+
+store({transfer_disk_log,TransferDiskLog},ConfigList) ->
+    case create_disk_log(TransferDiskLog, transfer_disk_log_size, ConfigList) of
+	{ok,TransferDB} ->
+	    {ok,{transfer_disk_log,TransferDB}};
+	{error,Reason} ->
+	    {error,Reason}
+    end;
+store({security_disk_log,SecurityDiskLog},ConfigList) ->
+    case create_disk_log(SecurityDiskLog, security_disk_log_size, ConfigList) of
+	{ok,SecurityDB} ->
+	    {ok,{security_disk_log,SecurityDB}};
+	{error,Reason} ->
+	    {error,Reason}
+    end;
+store({error_disk_log,ErrorDiskLog},ConfigList) ->
+    case create_disk_log(ErrorDiskLog, error_disk_log_size, ConfigList) of
+	{ok,ErrorDB} ->
+	    {ok,{error_disk_log,ErrorDB}};
+	{error,Reason} ->
+	    {error,Reason}
+    end.
+
+
+%%----------------------------------------------------------------------
+%% Open or creates the disklogs
+%%----------------------------------------------------------------------
+log_size(ConfigList, Tag) ->
+    httpd_util:key1search(ConfigList, Tag, {500*1024,8}).
+
+create_disk_log(LogFile, SizeTag, ConfigList) ->
+    Filename = httpd_conf:clean(LogFile),
+    {MaxBytes, MaxFiles} = log_size(ConfigList, SizeTag),
+    case filename:pathtype(Filename) of
+	absolute ->
+	    create_disk_log(Filename, MaxBytes, MaxFiles, ConfigList);
+	volumerelative ->
+	    create_disk_log(Filename, MaxBytes, MaxFiles, ConfigList);
+	relative ->
+	    case httpd_util:key1search(ConfigList,server_root) of
+		undefined ->
+		    {error,
+		     ?NICE(Filename++
+			   " is an invalid ErrorLog beacuse ServerRoot is not defined")};
+		ServerRoot ->
+		    AbsoluteFilename = filename:join(ServerRoot,Filename),
+		    create_disk_log(AbsoluteFilename, MaxBytes, MaxFiles,
+				     ConfigList)
+	    end
+    end.
+
+create_disk_log(Filename, MaxBytes, MaxFiles, ConfigList) ->
+    Format = httpd_util:key1search(ConfigList, disk_log_format, external),
+    open(Filename, MaxBytes, MaxFiles, Format).
+
+
+
+%% remove
+remove(ConfigDB) ->
+    lists:foreach(fun([DiskLog]) -> close(DiskLog) end,
+		  ets:match(ConfigDB,{transfer_disk_log,'$1'})),
+    lists:foreach(fun([DiskLog]) -> close(DiskLog) end,
+		  ets:match(ConfigDB,{error_disk_log,'$1'})),
+    ok.
+
+
+%%
+%% Some disk_log wrapper functions:
+%%
+
+%%----------------------------------------------------------------------
+%% Function:    open/4
+%% Description: Open a disk log file.
+%% Control which format the disk log will be in. The external file
+%% format is used as default since that format was used by older
+%% implementations of inets.
+%%
+%% When the internal disk log format is used, we will do some extra
+%% controls. If the files are valid, try to repair them and if
+%% thats not possible, truncate.
+%%----------------------------------------------------------------------
+
+open(Filename, MaxBytes, MaxFiles, internal) ->
+    Opts = [{format, internal}, {repair, truncate}],
+    open1(Filename, MaxBytes, MaxFiles, Opts);
+open(Filename, MaxBytes, MaxFiles, _) ->
+    Opts = [{format, external}],
+    open1(Filename, MaxBytes, MaxFiles, Opts).
+
+open1(Filename, MaxBytes, MaxFiles, Opts0) ->
+    Opts1 = [{name, Filename}, {file, Filename}, {type, wrap}] ++ Opts0,
+    case open2(Opts1, {MaxBytes, MaxFiles}) of
+        {ok, LogDB} ->
+            {ok, LogDB};
+        {error, Reason} ->
+            ?vlog("failed opening disk log with args:"
+                  "~n   Filename: ~p"
+                  "~n   MaxBytes: ~p"
+                  "~n   MaxFiles: ~p"
+                  "~n   Opts0:    ~p"
+                  "~nfor reason:"
+                  "~n   ~p", [Filename, MaxBytes, MaxFiles, Opts0, Reason]),
+            {error,
+             ?NICE("Can't create " ++ Filename ++
+                   lists:flatten(io_lib:format(", ~p",[Reason])))};
+        _ ->
+            {error, ?NICE("Can't create "++Filename)}
+    end.
+
+open2(Opts, Size) ->
+    case disk_log:open(Opts) of
+        {error, {badarg, size}} ->
+            %% File did not exist, add the size option and try again
+            disk_log:open([{size, Size} | Opts]);
+        Else ->
+            Else
+    end.
+
+
+%%----------------------------------------------------------------------
+%% Actually writes the entry to the disk_log. If the log is an
+%% internal disk_log write it with log otherwise with blog.
+%%----------------------------------------------------------------------
+write(Log, Entry, internal) ->
+    disk_log:log(Log, Entry);
+
+write(Log, Entry, _) ->
+    disk_log:blog(Log, Entry).
+
+%% Close the log file
+close(Log) ->
+    disk_log:close(Log).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl
new file mode 100644
index 0000000000..cb211749da
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl
@@ -0,0 +1,481 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_esi.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_esi).
+-export([do/1,load/2]).
+
+%%Functions provided to help erl scheme alias programmer to
+%%Create dynamic webpages that are sent back to the user during
+%%Generation
+-export([deliver/2]).
+
+
+-include("httpd.hrl").
+
+-define(VMODULE,"ESI").
+-include("httpd_verbosity.hrl").
+
+-define(GATEWAY_INTERFACE,"CGI/1.1").
+-define(DEFAULT_ERL_TIMEOUT,15000).
+%% do
+
+do(Info) ->
+    ?vtrace("do",[]),
+    case httpd_util:key1search(Info#mod.data,status) of
+	%% A status code has been generated!
+	{StatusCode,PhraseArgs,Reason} ->
+	    {proceed,Info#mod.data};
+	%% No status code has been generated!
+	undefined ->
+	    case httpd_util:key1search(Info#mod.data,response) of
+		%% No response has been generated!
+		undefined ->
+		    case erl_or_eval(Info#mod.request_uri,
+				     Info#mod.config_db) of
+			{eval,CGIBody,Modules} ->
+			    eval(Info,Info#mod.method,CGIBody,Modules);
+			{erl,CGIBody,Modules} ->
+			    erl(Info,Info#mod.method,CGIBody,Modules);
+			proceed ->
+			    {proceed,Info#mod.data}
+		    end;
+		%% A response has been generated or sent!
+		Response ->
+		    {proceed,Info#mod.data}
+	    end
+    end.
+
+
+
+%% erl_or_eval
+
+erl_or_eval(RequestURI, ConfigDB) ->
+    case erlp(RequestURI, ConfigDB) of
+	false ->
+	    case evalp(RequestURI, ConfigDB) of
+		false ->
+		    ?vtrace("neither erl nor eval",[]),
+		    proceed;
+		Other ->
+		    Other
+	    end;
+	Other ->
+	    Other
+    end.
+
+erlp(RequestURI, ConfigDB) ->
+    case httpd_util:multi_lookup(ConfigDB, erl_script_alias) of
+	[] ->
+	    false;
+	AliasMods ->
+	    erlp_find_alias(RequestURI,AliasMods)
+    end.
+
+erlp_find_alias(_RequestURI,[]) ->
+    ?vtrace("erlp_find_alias -> no match",[]),
+    false;
+erlp_find_alias(RequestURI,[{Alias,Modules}|Rest]) ->
+    case regexp:first_match(RequestURI,"^"++Alias++"/") of
+	{match,1,Length} ->
+	    ?vtrace("erlp -> match with Length: ~p",[Length]),
+	    {erl,string:substr(RequestURI,Length+1),Modules};
+	nomatch ->
+	    erlp_find_alias(RequestURI,Rest)
+    end.
+
+evalp(RequestURI, ConfigDB) ->
+    case httpd_util:multi_lookup(ConfigDB, eval_script_alias) of
+	[] ->
+	    false;
+	AliasMods ->
+	    evalp_find_alias(RequestURI,AliasMods)
+    end.
+
+evalp_find_alias(_RequestURI,[]) ->
+    ?vtrace("evalp_find_alias -> no match",[]),
+    false;
+evalp_find_alias(RequestURI,[{Alias,Modules}|Rest]) ->
+    case regexp:first_match(RequestURI,"^"++Alias++"\\?") of
+	{match, 1, Length} ->
+	    ?vtrace("evalp_find_alias -> match with Length: ~p",[Length]),
+	    {eval, string:substr(RequestURI,Length+1),Modules};
+	nomatch ->
+	    evalp_find_alias(RequestURI,Rest)
+    end.
+
+
+%%
+%% Erl mechanism
+%%
+
+%%This is exactly the same as the GET method the difference is that
+%%The response must not contain any data expect the response header
+
+
+erl(Info,"HEAD",CGIBody,Modules) ->
+    erl(Info,"GET",CGIBody,Modules);
+
+erl(Info,"GET",CGIBody,Modules) ->
+    ?vtrace("erl GET request",[]),
+    case httpd_util:split(CGIBody,":|%3A|/",2) of
+	{ok, [Mod,FuncAndInput]} ->
+	    ?vtrace("~n   Mod:          ~p"
+		    "~n   FuncAndInput: ~p",[Mod,FuncAndInput]),
+	    case httpd_util:split(FuncAndInput,"[\?/]",2) of
+		{ok, [Func,Input]} ->
+		    ?vtrace("~n   Func:  ~p"
+			    "~n   Input: ~p",[Func,Input]),
+		    exec(Info,"GET",CGIBody,Modules,Mod,Func,
+			 {input_type(FuncAndInput),Input});
+		{ok, [Func]} ->
+		    exec(Info,"GET",CGIBody,Modules,Mod,Func,{no_input,""});
+		{ok, BadRequest} ->
+		    {proceed,[{status,{400,none,BadRequest}}|Info#mod.data]}
+	    end;
+	{ok, BadRequest} ->
+	    ?vlog("erl BAD (GET-) request",[]),
+	    {proceed, [{status,{400,none,BadRequest}}|Info#mod.data]}
+    end;
+
+erl(Info, "POST", CGIBody, Modules) ->
+    ?vtrace("erl POST request",[]),
+    case httpd_util:split(CGIBody,":|%3A|/",2) of
+	{ok,[Mod,Func]} ->
+	    ?vtrace("~n   Mod:  ~p"
+		    "~n   Func: ~p",[Mod,Func]),
+	    exec(Info,"POST",CGIBody,Modules,Mod,Func,
+		 {entity_body,Info#mod.entity_body});
+	{ok,BadRequest} ->
+	    ?vlog("erl BAD (POST-) request",[]),
+	    {proceed,[{status,{400,none,BadRequest}}|Info#mod.data]}
+    end.
+
+input_type([]) ->
+    no_input;
+input_type([$/|Rest]) ->
+    path_info;
+input_type([$?|Rest]) ->
+    query_string;
+input_type([First|Rest]) ->
+    input_type(Rest).
+
+
+%% exec
+
+exec(Info,Method,CGIBody,["all"],Mod,Func,{Type,Input}) ->
+    ?vtrace("exec ~s 'all'",[Method]),
+    exec(Info,Method,CGIBody,[Mod],Mod,Func,{Type,Input});
+exec(Info,Method,CGIBody,Modules,Mod,Func,{Type,Input}) ->
+    ?vtrace("exec ~s request with:"
+	    "~n   Modules: ~p"
+	    "~n   Mod:     ~p"
+	    "~n   Func:    ~p"
+	    "~n   Type:    ~p"
+	    "~n   Input:   ~p",
+	    [Method,Modules,Mod,Func,Type,Input]),
+    case lists:member(Mod,Modules) of
+	true ->
+	    {_,RemoteAddr}=(Info#mod.init_data)#init_data.peername,
+	    ServerName=(Info#mod.init_data)#init_data.resolve,
+	    Env=get_environment(Info,ServerName,Method,RemoteAddr,Type,Input),
+	    ?vtrace("and now call the module",[]),
+	    case try_new_erl_scheme_method(Info,Env,Input,list_to_atom(Mod),list_to_atom(Func)) of
+		{error,not_new_method}->
+		    case catch apply(list_to_atom(Mod),list_to_atom(Func),[Env,Input]) of
+			{'EXIT',Reason} ->
+			    ?vlog("exit with Reason: ~p",[Reason]),
+			    {proceed,[{status,{500,none,Reason}}|Info#mod.data]};
+			Response ->
+			    control_response_header(Info,Mod,Func,Response)
+		    end;
+		ResponseResult->
+		    ResponseResult
+	    end;
+	false ->
+	    ?vlog("unknown module",[]),
+	    {proceed,[{status,{403,Info#mod.request_uri,
+			       ?NICE("Client not authorized to evaluate: "++CGIBody)}}|Info#mod.data]}
+    end.
+
+control_response_header(Info,Mod,Func,Response)->
+    case control_response(Response,Info,Mod,Func) of
+	{proceed,[{response,{StatusCode,Response}}|Rest]} ->
+	    case httpd_util:lookup(Info#mod.config_db,erl_script_nocache,false) of
+		true ->
+		    case httpd_util:split(Response,"\r\n\r\n|\n\n",2) of
+			{ok,[Head,Body]}->
+			    Date=httpd_util:rfc1123_date(),
+			    Cache="Cache-Control:no-cache\r\nPragma:no-cache\r\nExpires:"++ Date ++ "\r\n",
+			    {proceed,[{response,{StatusCode,[Head,"\r\n",Cache,"\r\n",Body]}}|Rest]};
+			_->
+			   {proceed,[{response,{StatusCode,Response}}|Rest]}
+		    end;
+		WhatEver->
+		    {proceed,[{response,{StatusCode,Response}}|Rest]}
+	    end;
+	WhatEver->
+	    WhatEver
+    end.
+
+control_response(Response,Info,Mod,Func)->
+    ?vdebug("Response: ~n~p",[Response]),
+    case mod_cgi:status_code(lists:flatten(Response)) of
+	{ok,StatusCode} ->
+	    {proceed,[{response,{StatusCode,Response}}|Info#mod.data]};
+	{error,Reason} ->
+	    {proceed,
+	     [{status,{400,none,
+		       ?NICE("Error in "++Mod++":"++Func++"/2: "++
+			     lists:flatten(io_lib:format("~p",[Reason])))}}|
+	      Info#mod.data]}
+    end.
+
+parsed_header([]) ->
+    [];
+parsed_header([{Name,[Value|R1]}|R2]) when list(Value) ->
+    NewName=lists:map(fun(X) -> if X == $- -> $_; true -> X end end,Name),
+    [{list_to_atom("http_"++httpd_util:to_lower(NewName)),
+      multi_value([Value|R1])}|parsed_header(R2)];
+parsed_header([{Name,Value}|Rest]) when list(Value)->
+    {ok,NewName,_}=regexp:gsub(Name,"-","_"),
+    [{list_to_atom("http_"++httpd_util:to_lower(NewName)),Value}|
+     parsed_header(Rest)].
+
+multi_value([]) ->
+    [];
+multi_value([Value]) ->
+    Value;
+multi_value([Value|Rest]) ->
+    Value++", "++multi_value(Rest).
+
+%%
+%% Eval mechanism
+%%
+
+
+eval(Info,"POST",CGIBody,Modules) ->
+    ?vtrace("eval(POST) -> method not supported",[]),
+    {proceed,[{status,{501,{"POST",Info#mod.request_uri,Info#mod.http_version},
+		       ?NICE("Eval mechanism doesn't support method POST")}}|
+	      Info#mod.data]};
+
+eval(Info,"HEAD",CGIBody,Modules) ->
+    %%The function that sends the data in httpd_response handles HEAD reqest by not
+    %% Sending the body
+    eval(Info,"GET",CGIBody,Modules);
+
+
+eval(Info,"GET",CGIBody,Modules) ->
+    ?vtrace("eval(GET) -> entry when"
+	    "~n   Modules: ~p",[Modules]),
+    case auth(CGIBody,Modules) of
+	true ->
+	    case lib:eval_str(string:concat(CGIBody,". ")) of
+		{error,Reason} ->
+		    ?vlog("eval -> error:"
+			  "~n   Reason: ~p",[Reason]),
+		    {proceed,[{status,{500,none,Reason}}|Info#mod.data]};
+		{ok,Response} ->
+		    ?vtrace("eval -> ok:"
+			    "~n   Response: ~p",[Response]),
+		    case mod_cgi:status_code(lists:flatten(Response)) of
+			{ok,StatusCode} ->
+			    {proceed,[{response,{StatusCode,Response}}|Info#mod.data]};
+			{error,Reason} ->
+			    {proceed,[{status,{400,none,Reason}}|Info#mod.data]}
+		    end
+	    end;
+	false ->
+	    ?vlog("eval -> auth failed",[]),
+	    {proceed,[{status,
+		       {403,Info#mod.request_uri,
+			?NICE("Client not authorized to evaluate: "++CGIBody)}}|
+		      Info#mod.data]}
+    end.
+
+auth(CGIBody,["all"]) ->
+    true;
+auth(CGIBody,Modules) ->
+    case regexp:match(CGIBody,"^[^\:(%3A)]*") of
+	{match,Start,Length} ->
+	    lists:member(string:substr(CGIBody,Start,Length),Modules);
+	nomatch ->
+	    false
+    end.
+
+%%----------------------------------------------------------------------
+%%Creates the environment list that will be the first arg to the
+%%Functions that is called through the ErlScript Schema
+%%----------------------------------------------------------------------
+
+get_environment(Info,ServerName,Method,RemoteAddr,Type,Input)->
+    Env=[{server_software,?SERVER_SOFTWARE},
+		 {server_name,ServerName},
+		 {gateway_interface,?GATEWAY_INTERFACE},
+		 {server_protocol,?SERVER_PROTOCOL},
+		 {server_port,httpd_util:lookup(Info#mod.config_db,port,80)},
+		 {request_method,Method},
+		 {remote_addr,RemoteAddr},
+		 {script_name,Info#mod.request_uri}|
+		 parsed_header(Info#mod.parsed_header)],
+    get_environment(Type,Input,Env,Info).
+
+
+get_environment(Type,Input,Env,Info)->
+    Env1=case Type of
+	query_string ->
+	    [{query_string,Input}|Env];
+	path_info ->
+	    Aliases=httpd_util:multi_lookup(Info#mod.config_db,alias),
+	    {_,PathTranslated,_}=mod_alias:real_name(Info#mod.config_db,[$/|Input],Aliases),
+	    [{path_info,"/"++httpd_util:decode_hex(Input)},
+	     {path_translated,PathTranslated}|Env];
+	entity_body ->
+	    [{content_length,httpd_util:flatlength(Input)}|Env];
+	no_input ->
+	    Env
+    end,
+    get_environment(Info,Env1).
+
+get_environment(Info,Env)->
+    case httpd_util:key1search(Info#mod.data,remote_user) of
+	undefined ->
+	    Env;
+	RemoteUser ->
+	    [{remote_user,RemoteUser}|Env]
+    end.
+%%
+%% Configuration
+%%
+
+%% load
+
+load([$E,$r,$l,$S,$c,$r,$i,$p,$t,$A,$l,$i,$a,$s,$ |ErlScriptAlias],[]) ->
+    case regexp:split(ErlScriptAlias," ") of
+	{ok, [ErlName|Modules]} ->
+	    {ok, [], {erl_script_alias, {ErlName,Modules}}};
+	{ok, _} ->
+	    {error,?NICE(httpd_conf:clean(ErlScriptAlias)++
+			 " is an invalid ErlScriptAlias")}
+    end;
+load([$E,$v,$a,$l,$S,$c,$r,$i,$p,$t,$A,$l,$i,$a,$s,$ |EvalScriptAlias],[]) ->
+    case regexp:split(EvalScriptAlias, " ") of
+	{ok, [EvalName|Modules]} ->
+	    {ok, [], {eval_script_alias, {EvalName,Modules}}};
+	{ok, _} ->
+	    {error, ?NICE(httpd_conf:clean(EvalScriptAlias)++
+			  " is an invalid EvalScriptAlias")}
+    end;
+load([$E,$r,$l,$S,$c,$r,$i,$p,$t,$T,$i,$m,$e,$o,$u,$t,$ |Timeout],[])->
+    case catch list_to_integer(httpd_conf:clean(Timeout)) of
+	TimeoutSec when integer(TimeoutSec)  ->
+	   {ok, [], {erl_script_timeout,TimeoutSec*1000}};
+	_ ->
+	   {error, ?NICE(httpd_conf:clean(Timeout)++
+			 " is an invalid ErlScriptTimeout")}
+    end;
+load([$E,$r,$l,$S,$c,$r,$i,$p,$t,$N,$o,$C,$a,$c,$h,$e |CacheArg],[])->
+    case catch list_to_atom(httpd_conf:clean(CacheArg)) of
+        true ->
+	    {ok, [], {erl_script_nocache,true}};
+	false ->
+	   {ok, [], {erl_script_nocache,false}};
+	_ ->
+	   {error, ?NICE(httpd_conf:clean(CacheArg)++
+			 " is an invalid ErlScriptNoCache directive")}
+    end.
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                    %%
+%% Functions below handles the data from the dynamic webpages         %%
+%% That sends data back to the user part by part                      %%
+%%                                                                    %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%----------------------------------------------------------------------
+%%Deliver is the callback function users can call to deliver back data to the
+%%client
+%%----------------------------------------------------------------------
+
+deliver(SessionID,Data)when pid(SessionID) ->
+    SessionID ! {ok,Data},
+    ok;
+deliver(SessionID,Data) ->
+    {error,bad_sessionID}.
+
+
+%%----------------------------------------------------------------------
+%% The method that tries to execute the new format
+%%----------------------------------------------------------------------
+
+%%It would be nicer to use erlang:function_exported/3 but if the
+%%Module isn't loaded the function says that it is not loaded
+
+
+try_new_erl_scheme_method(Info,Env,Input,Mod,Func)->
+    process_flag(trap_exit,true),
+    Pid=spawn_link(Mod,Func,[self(),Env,Input]),
+    Timeout=httpd_util:lookup(Info#mod.config_db,erl_script_timeout,?DEFAULT_ERL_TIMEOUT),
+    RetVal=receive_response_data(Info,Pid,0,undefined,[],Timeout),
+    process_flag(trap_exit,false),
+    RetVal.
+
+
+%%----------------------------------------------------------------------
+%%The function recieves the data from the process that generates the page
+%%and send the data to the client through the mod_cgi:send function
+%%----------------------------------------------------------------------
+
+receive_response_data(Info,Pid,Size,StatusCode,AccResponse,Timeout) ->
+    ?DEBUG("receive_response_data()-> Script Size: ~p,StatusCode ~p ,Timeout: ~p ~n",[Size,StatusCode,Timeout]),
+    receive
+	{ok, Response} ->
+	    NewStatusCode=mod_cgi:update_status_code(StatusCode,Response),
+
+	    ?DEBUG("receive_response_data/2 NewStatusCode: ~p~n",[NewStatusCode]),
+	    case mod_cgi:send(Info, NewStatusCode,Response, Size,AccResponse) of
+		socket_closed ->
+		    (catch exit(Pid,final)),
+		    {proceed,[{response,{already_sent,200,Size}}|Info#mod.data]};
+		head_sent->
+		    (catch exit(Pid,final)),
+		    {proceed,[{response,{already_sent,200,Size}}|Info#mod.data]};
+		_ ->
+		    %%The data is sent and the socket is not closed contine
+		    NewSize = mod_cgi:get_new_size(Size,Response),
+		    receive_response_data(Info,Pid,NewSize,NewStatusCode,"notempty",Timeout)
+	    end;
+	{'EXIT', Pid, Reason} when AccResponse==[] ->
+	    {error,not_new_method};
+	{'EXIT', Pid, Reason} when pid(Pid) ->
+	    NewStatusCode=mod_cgi:update_status_code(StatusCode,AccResponse),
+	    mod_cgi:final_send(Info,NewStatusCode,Size,AccResponse),
+	    {proceed, [{response,{already_sent,200,Size}}|Info#mod.data]};
+	%% This should not happen!
+	WhatEver ->
+	    NewStatusCode=mod_cgi:update_status_code(StatusCode,AccResponse),
+	    mod_cgi:final_send(Info,StatusCode,Size,AccResponse),
+	    {proceed, [{response,{already_sent,200,Size}}|Info#mod.data]}
+    after
+	Timeout ->
+	    (catch exit(Pid,timeout)), % KILL the port !!!!
+	    httpd_socket:close(Info#mod.socket_type,Info#mod.socket),
+	    {proceed,[{response,{already_sent,200,Size}}|Info#mod.data]}
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_get.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_get.erl
new file mode 100644
index 0000000000..4136d31669
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_get.erl
@@ -0,0 +1,151 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_get.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_get).
+-export([do/1]).
+-include("httpd.hrl").
+
+%% do
+
+do(Info) ->
+    ?DEBUG("do -> entry",[]),
+    case Info#mod.method of
+	"GET" ->
+	    case httpd_util:key1search(Info#mod.data,status) of
+		%% A status code has been generated!
+		{StatusCode,PhraseArgs,Reason} ->
+		    {proceed,Info#mod.data};
+		%% No status code has been generated!
+		undefined ->
+		    case httpd_util:key1search(Info#mod.data,response) of
+			%% No response has been generated!
+			undefined ->
+			    do_get(Info);
+			%% A response has been generated or sent!
+			Response ->
+			    {proceed,Info#mod.data}
+		    end
+	    end;
+	%% Not a GET method!
+	_ ->
+	    {proceed,Info#mod.data}
+    end.
+
+
+do_get(Info) ->
+    ?DEBUG("do_get -> Request URI: ~p",[Info#mod.request_uri]),
+    Path = mod_alias:path(Info#mod.data, Info#mod.config_db,
+			  Info#mod.request_uri),
+    {FileInfo, LastModified} =get_modification_date(Path),
+
+    send_response(Info#mod.socket,Info#mod.socket_type,Path,Info,FileInfo,LastModified).
+
+
+%%The common case when no range is specified
+send_response(Socket,SocketType,Path,Info,FileInfo,LastModified)->
+    %% Send the file!
+    %% Find the modification date of the file
+    case file:open(Path,[raw,binary]) of
+	{ok, FileDescriptor} ->
+	    ?DEBUG("do_get -> FileDescriptor: ~p",[FileDescriptor]),
+	    Suffix = httpd_util:suffix(Path),
+	    MimeType = httpd_util:lookup_mime_default(Info#mod.config_db,
+						      Suffix,"text/plain"),
+	    %FileInfo=file:read_file_info(Path),
+	    Date = httpd_util:rfc1123_date(),
+	    Size = integer_to_list(FileInfo#file_info.size),
+	    Header=case Info#mod.http_version of
+		       "HTTP/1.1" ->
+			   [httpd_util:header(200, MimeType, Info#mod.connection),
+			    "Last-Modified: ", LastModified, "\r\n",
+			    "Etag: ",httpd_util:create_etag(FileInfo),"\r\n",
+			    "Content-Length: ",Size,"\r\n\r\n"];
+		       "HTTP/1.0" ->
+			   [httpd_util:header(200, MimeType, Info#mod.connection),
+			    "Last-Modified: ", LastModified, "\r\n",
+			    "Content-Length: ",Size,"\r\n\r\n"]
+		   end,
+
+	    send(Info#mod.socket_type, Info#mod.socket,
+		 Header, FileDescriptor),
+	    file:close(FileDescriptor),
+	    {proceed,[{response,{already_sent,200,
+				 FileInfo#file_info.size}},
+		      {mime_type,MimeType}|Info#mod.data]};
+	{error, Reason} ->
+
+	    {proceed,
+	     [{status,open_error(Reason,Info,Path)}|Info#mod.data]}
+    end.
+
+%% send
+
+send(SocketType,Socket,Header,FileDescriptor) ->
+    ?DEBUG("send -> send header",[]),
+    case httpd_socket:deliver(SocketType,Socket,Header) of
+	socket_closed ->
+	    ?LOG("send -> socket closed while sending header",[]),
+	    socket_close;
+	_ ->
+	    send_body(SocketType,Socket,FileDescriptor)
+    end.
+
+send_body(SocketType,Socket,FileDescriptor) ->
+    case file:read(FileDescriptor,?FILE_CHUNK_SIZE) of
+	{ok,Binary} ->
+	    ?DEBUG("send_body -> send another chunk: ~p",[size(Binary)]),
+	    case httpd_socket:deliver(SocketType,Socket,Binary) of
+		socket_closed ->
+		    ?LOG("send_body -> socket closed while sending",[]),
+		    socket_close;
+		_ ->
+		    send_body(SocketType,Socket,FileDescriptor)
+	    end;
+	eof ->
+	    ?DEBUG("send_body -> done with this file",[]),
+	    eof
+    end.
+
+
+%% open_error - Handle file open failure
+%%
+open_error(eacces,Info,Path) ->
+    open_error(403,Info,Path,"");
+open_error(enoent,Info,Path) ->
+    open_error(404,Info,Path,"");
+open_error(enotdir,Info,Path) ->
+    open_error(404,Info,Path,
+	       ": A component of the file name is not a directory");
+open_error(emfile,_Info,Path) ->
+    open_error(500,none,Path,": To many open files");
+open_error({enfile,_},_Info,Path) ->
+    open_error(500,none,Path,": File table overflow");
+open_error(_Reason,_Info,Path) ->
+    open_error(500,none,Path,"").
+
+open_error(StatusCode,none,Path,Reason) ->
+    {StatusCode,none,?NICE("Can't open "++Path++Reason)};
+open_error(StatusCode,Info,Path,Reason) ->
+    {StatusCode,Info#mod.request_uri,?NICE("Can't open "++Path++Reason)}.
+
+get_modification_date(Path)->
+    case file:read_file_info(Path) of
+	{ok, FileInfo0} ->
+	    {FileInfo0, httpd_util:rfc1123_date(FileInfo0#file_info.mtime)};
+	_ ->
+	    {#file_info{},""}
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_head.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_head.erl
new file mode 100644
index 0000000000..ce71e6532e
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_head.erl
@@ -0,0 +1,89 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_head.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_head).
+-export([do/1]).
+
+-include("httpd.hrl").
+
+%% do
+
+do(Info) ->
+    ?DEBUG("do -> entry",[]),
+    case Info#mod.method of
+	"HEAD" ->
+	    case httpd_util:key1search(Info#mod.data,status) of
+		%% A status code has been generated!
+		{StatusCode,PhraseArgs,Reason} ->
+		    {proceed,Info#mod.data};
+		%% No status code has been generated!
+		_undefined ->
+		    case httpd_util:key1search(Info#mod.data,response) of
+			%% No response has been generated!
+			undefined ->
+			    do_head(Info);
+			%% A response has been sent! Nothing to do about it!
+			{already_sent,StatusCode,Size} ->
+			    {proceed,Info#mod.data};
+			%% A response has been generated!
+			{StatusCode,Response} ->
+			    {proceed,Info#mod.data}
+		    end
+	    end;
+	%% Not a HEAD method!
+	_ ->
+	    {proceed,Info#mod.data}
+    end.
+
+do_head(Info) ->
+    ?DEBUG("do_head -> Request URI: ~p",[Info#mod.request_uri]),
+    Path = mod_alias:path(Info#mod.data,Info#mod.config_db,
+			  Info#mod.request_uri),
+    Suffix = httpd_util:suffix(Path),
+    %% Does the file exists?
+    case file:read_file_info(Path) of
+	{ok,FileInfo} ->
+	    MimeType=httpd_util:lookup_mime_default(Info#mod.config_db,Suffix,"text/plain"),
+	    Length=io_lib:write(FileInfo#file_info.size),
+	    Head=[{content_type,MimeType},{content_length,Length},{code,200}],
+	    {proceed,[{response,{response,Head,nobody}}|Info#mod.data]};
+	{error,Reason} ->
+	    {proceed,
+	     [{status,read_file_info_error(Reason,Info,Path)}|Info#mod.data]}
+    end.
+
+%% read_file_info_error - Handle file info read failure
+%%
+read_file_info_error(eacces,Info,Path) ->
+    read_file_info_error(403,Info,Path,"");
+read_file_info_error(enoent,Info,Path) ->
+    read_file_info_error(404,Info,Path,"");
+read_file_info_error(enotdir,Info,Path) ->
+    read_file_info_error(404,Info,Path,
+			 ": A component of the file name is not a directory");
+read_file_info_error(emfile,_Info,Path) ->
+    read_file_info_error(500,none,Path,": To many open files");
+read_file_info_error({enfile,_},_Info,Path) ->
+    read_file_info_error(500,none,Path,": File table overflow");
+read_file_info_error(_Reason,_Info,Path) ->
+    read_file_info_error(500,none,Path,"").
+
+read_file_info_error(StatusCode,none,Path,Reason) ->
+    {StatusCode,none,?NICE("Can't access "++Path++Reason)};
+read_file_info_error(StatusCode,Info,Path,Reason) ->
+    {StatusCode,Info#mod.request_uri,
+     ?NICE("Can't access "++Path++Reason)}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_htaccess.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_htaccess.erl
new file mode 100644
index 0000000000..3806ce2e06
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_htaccess.erl
@@ -0,0 +1,1136 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_htaccess.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+
+-module(mod_htaccess).
+
+-export([do/1, load/2]).
+-export([debug/0]).
+
+-include("httpd.hrl").
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Public methods that interface the eswapi                         %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%----------------------------------------------------------------------
+% Public method called by the webbserver to insert the data about
+% Names on accessfiles
+%----------------------------------------------------------------------
+load([$A,$c,$c,$e,$s,$s,$F,$i,$l,$e,$N,$a,$m,$e|FileNames],Context)->
+    CleanFileNames=httpd_conf:clean(FileNames),
+    %%io:format("\n The filenames is:" ++ FileNames ++ "\n"),
+    {ok,[],{access_files,string:tokens(CleanFileNames," ")}}.
+
+
+%----------------------------------------------------------------------
+% Public method that the webbserver calls to control the page
+%----------------------------------------------------------------------
+do(Info)->
+    case httpd_util:key1search(Info#mod.data,status) of
+	{Status_code,PhraseArgs,Reason}->
+	    {proceed,Info#mod.data};
+	undefined ->
+	    control_path(Info)
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%% The functions that start the control if there is a accessfile    %%
+%% and if so controls if the dir is allowed or not                  %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%----------------------------------------------------------------------
+%Info = record mod as specified in httpd.hrl
+%returns either {proceed,Info#mod.data}
+%{proceed,[{status,403....}|Info#mod.data]}
+%{proceed,[{status,401....}|Info#mod.data]}
+%{proceed,[{status,500....}|Info#mod.data]}
+%----------------------------------------------------------------------
+control_path(Info) ->
+    Path = mod_alias:path(Info#mod.data,
+			  Info#mod.config_db,
+			  Info#mod.request_uri),
+    case isErlScriptOrNotAccessibleFile(Path,Info) of
+	true->
+	    {proceed,Info#mod.data};
+	false->
+	    case getHtAccessData(Path,Info)of
+		{ok,public}->
+		    %%There was no restrictions on the page continue
+		    {proceed,Info#mod.data};
+		{error,Reason} ->
+		    %Something got wrong continue or quit??????????????????/
+                   {proceed,Info#mod.data};
+		{accessData,AccessData}->
+		    controlAllowedMethod(Info,AccessData)
+	    end
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%% These methods controls that the method the client used in the    %%
+%% request is one of the limited                                    %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%----------------------------------------------------------------------
+%Control that if the accessmethod used is in the list of modes to challenge
+%
+%Info is the mod record as specified in httpd.hrl
+%AccessData is an ets table whit the data in the .htaccessfiles
+%----------------------------------------------------------------------
+controlAllowedMethod(Info,AccessData)->
+    case allowedRequestMethod(Info,AccessData) of
+	allow->
+	    %%The request didnt use one of the limited methods
+	    ets:delete(AccessData),
+	    {proceed,Info#mod.data};
+	challenge->
+	    authenticateUser(Info,AccessData)
+    end.
+
+%----------------------------------------------------------------------
+%Check the specified access method in the .htaccessfile
+%----------------------------------------------------------------------
+allowedRequestMethod(Info,AccessData)->
+    case ets:lookup(AccessData,limit) of
+	[{limit,all}]->
+	    challenge;
+	[{limit,Methods}]->
+	    isLimitedRequestMethod(Info,Methods)
+    end.
+
+
+%----------------------------------------------------------------------
+%Check the specified accessmethods in the .htaccesfile against the users
+%accessmethod
+%
+%Info is the record from the do call
+%Methods is a list of the methods specified in the .htaccessfile
+%----------------------------------------------------------------------
+isLimitedRequestMethod(Info,Methods)->
+    case lists:member(Info#mod.method,Methods) of
+	true->
+	    challenge;
+	false ->
+	    allow
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%% These methods controls that the user comes from an allowwed net  %%
+%% and if so wheather its a valid user or a challenge shall be      %%
+%% generated                                                        %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%----------------------------------------------------------------------
+%The first thing to control is that the user is from a network
+%that has access to the page
+%----------------------------------------------------------------------
+authenticateUser(Info,AccessData)->
+    case controlNet(Info,AccessData) of
+	allow->
+	    %the network is ok control that it is an allowed user
+	    authenticateUser2(Info,AccessData);
+	deny->
+	    %The user isnt allowed to access the pages from that network
+	    ets:delete(AccessData),
+	    {proceed,[{status,{403,Info#mod.request_uri,
+	    "Restricted area not allowed from your network"}}|Info#mod.data]}
+    end.
+
+
+%----------------------------------------------------------------------
+%The network the user comes from is allowed to view the resources
+%control whether the user needsto supply a password or not
+%----------------------------------------------------------------------
+authenticateUser2(Info,AccessData)->
+    case ets:lookup(AccessData,require) of
+	[{require,AllowedUsers}]->
+	    case ets:lookup(AccessData,auth_name) of
+		[{auth_name,Realm}]->
+		    authenticateUser2(Info,AccessData,Realm,AllowedUsers);
+		_NoAuthName->
+		    ets:delete(AccessData),
+		    {break,[{status,{500,none,
+				     ?NICE("mod_htaccess:AuthName directive not specified")}}]}
+	    end;
+	[] ->
+	    %%No special user is required the network is ok so let
+	    %%the user in
+	    ets:delete(AccessData),
+	    {proceed,Info#mod.data}
+    end.
+
+
+%----------------------------------------------------------------------
+%The user must send a userId and a password to get the resource
+%Control if its already in the http-request
+%if the file with users is bad send an 500 response
+%----------------------------------------------------------------------
+authenticateUser2(Info,AccessData,Realm,AllowedUsers)->
+    case authenticateUser(Info,AccessData,AllowedUsers) of
+	allow ->
+	    ets:delete(AccessData),
+	    {user,Name,Pwd}=getAuthenticatingDataFromHeader(Info),
+	    {proceed, [{remote_user_name,Name}|Info#mod.data]};
+	challenge->
+	    ets:delete(AccessData),
+	    ReasonPhrase = httpd_util:reason_phrase(401),
+	    Message = httpd_util:message(401,none,Info#mod.config_db),
+	    {proceed,
+	     [{response,
+	       {401,
+		["WWW-Authenticate: Basic realm=\"",Realm,
+		 "\"\r\n\r\n","<HTML>\n<HEAD>\n<TITLE>",
+		 ReasonPhrase,"</TITLE>\n",
+		 "</HEAD>\n<BODY>\n<H1>",ReasonPhrase,
+		 "</H1>\n",Message,"\n</BODY>\n</HTML>\n"]}}|
+	      Info#mod.data]};
+	deny->
+	    ets:delete(AccessData),
+	    {break,[{status,{500,none,
+			     ?NICE("mod_htaccess:Bad path to user or group file")}}]}
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%% Methods that validate the netwqork the user comes from           %%
+%% according to the allowed networks                                %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%---------------------------------------------------------------------
+%Controls the users networkaddress agains the specifed networks to
+%allow or deny
+%
+%returns either allow or deny
+%----------------------------------------------------------------------
+controlNet(Info,AccessData)->
+    UserNetwork=getUserNetworkAddress(Info),
+    case getAllowDenyOrder(AccessData) of
+	{_deny,[],_allow,[]}->
+	    allow;
+	{deny,[],allow,AllowedNetworks}->
+	    controlIfAllowed(AllowedNetworks,UserNetwork,allow,deny);
+	{allow,AllowedNetworks,deny,[]}->
+	    controlIfAllowed(AllowedNetworks,UserNetwork,allow,deny);
+
+	{deny,DeniedNetworks,allow,[]}->
+	    controlIfAllowed(DeniedNetworks,UserNetwork,allow,deny);
+	{allow,[],deny,DeniedNetworks}->
+	    controlIfAllowed(DeniedNetworks,UserNetwork,allow,deny);
+
+	{deny,DeniedNetworks,allow,AllowedNetworks}->
+	    controlDenyAllow(DeniedNetworks,AllowedNetworks,UserNetwork);
+	{allow,AllowedNetworks,deny,DeniedNetworks}->
+	    controlAllowDeny(AllowedNetworks,DeniedNetworks,UserNetwork)
+    end.
+
+
+%----------------------------------------------------------------------
+%Returns the users IP-Number
+%----------------------------------------------------------------------
+getUserNetworkAddress(Info)->
+    {_Socket,Address}=(Info#mod.init_data)#init_data.peername,
+    Address.
+
+
+%----------------------------------------------------------------------
+%Control the users Ip-number against the ip-numbers in the .htaccessfile
+%----------------------------------------------------------------------
+controlIfAllowed(AllowedNetworks,UserNetwork,IfAllowed,IfDenied)->
+    case AllowedNetworks of
+	[{allow,all}]->
+	   IfAllowed;
+	[{deny,all}]->
+	    IfDenied;
+        [{deny,Networks}]->
+	    memberNetwork(Networks,UserNetwork,IfDenied,IfAllowed);
+	[{allow,Networks}]->
+	    memberNetwork(Networks,UserNetwork,IfAllowed,IfDenied);
+	_Error->
+	    IfDenied
+    end.
+
+
+%---------------------------------------------------------------------%
+%The Denycontrol isn't neccessary to preform since the allow control  %
+%override the deny control                                            %
+%---------------------------------------------------------------------%
+controlDenyAllow(DeniedNetworks,AllowedNetworks,UserNetwork)->
+    case AllowedNetworks of
+	[{allow,all}]->
+	    allow;
+	[{allow,Networks}]->
+	  case memberNetwork(Networks,UserNetwork) of
+	      true->
+		  allow;
+	      false->
+		  deny
+	  end
+    end.
+
+
+%----------------------------------------------------------------------%
+%Control that the user is in the allowed list if so control that the   %
+%network is in the denied list
+%----------------------------------------------------------------------%
+controlAllowDeny(AllowedNetworks,DeniedNetworks,UserNetwork)->
+    case controlIfAllowed(AllowedNetworks,UserNetwork,allow,deny) of
+	allow->
+	    controlIfAllowed(DeniedNetworks,UserNetwork,deny,allow);
+	deny ->
+	    deny
+    end.
+
+%----------------------------------------------------------------------
+%Controls if the users Ipnumber is in the list of either denied or
+%allowed networks
+%----------------------------------------------------------------------
+memberNetwork(Networks,UserNetwork,IfTrue,IfFalse)->
+    case memberNetwork(Networks,UserNetwork) of
+	true->
+	    IfTrue;
+	false->
+	    IfFalse
+    end.
+
+
+%----------------------------------------------------------------------
+%regexp match the users ip-address against the networks in the list of
+%ipadresses or subnet addresses.
+memberNetwork(Networks,UserNetwork)->
+    case lists:filter(fun(Net)->
+			      case regexp:match(UserNetwork,
+						formatRegexp(Net)) of
+				  {match,1,_}->
+				      true;
+				  _NotSubNet ->
+				      false
+			      end
+		      end,Networks) of
+	[]->
+	    false;
+	MemberNetWork ->
+	    true
+    end.
+
+
+%----------------------------------------------------------------------
+%Creates a regexp from an ip-number i.e "127.0.0-> "^127[.]0[.]0.*"
+%"127.0.0.-> "^127[.]0[.]0[.].*"
+%----------------------------------------------------------------------
+formatRegexp(Net)->
+    [SubNet1|SubNets]=string:tokens(Net,"."),
+    NetRegexp=lists:foldl(fun(SubNet,Newnet)->
+				  Newnet ++ "[.]" ++SubNet
+			  end,"^"++SubNet1,SubNets),
+    case string:len(Net)-string:rchr(Net,$.) of
+	0->
+	    NetRegexp++"[.].*";
+	_->
+	    NetRegexp++".*"
+    end.
+
+
+%----------------------------------------------------------------------
+%If the user has specified if the allow or deny check shall be preformed
+%first get that order if no order is specified take
+%allow - deny since its harder that deny - allow
+%----------------------------------------------------------------------
+getAllowDenyOrder(AccessData)->
+    case ets:lookup(AccessData,order) of
+	[{order,{deny,allow}}]->
+	    {deny,ets:lookup(AccessData,deny),
+	     allow,ets:lookup(AccessData,allow)};
+	_DefaultOrder->
+	    {allow,ets:lookup(AccessData,allow),
+	     deny,ets:lookup(AccessData,deny)}
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%% The methods that validates the user                              %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%----------------------------------------------------------------------
+%Control if there is anyu autheticating data in threquest header
+%if so it controls it against the users in the list Allowed Users
+%----------------------------------------------------------------------
+authenticateUser(Info,AccessData,AllowedUsers)->
+    case getAuthenticatingDataFromHeader(Info) of
+	{user,User,PassWord}->
+	    authenticateUser(Info,AccessData,AllowedUsers,
+			     {user,User,PassWord});
+	{error,nouser}->
+	    challenge;
+	{error,BadData}->
+	    challenge
+    end.
+
+
+%----------------------------------------------------------------------
+%Returns the Autheticating data in the http-request
+%----------------------------------------------------------------------
+getAuthenticatingDataFromHeader(Info)->
+    PrsedHeader=Info#mod.parsed_header,
+    case httpd_util:key1search(PrsedHeader,"authorization" ) of
+	undefined->
+	    {error,nouser};
+	[$B,$a,$s,$i,$c,$\ |EncodedString]->
+	    UnCodedString=httpd_util:decode_base64(EncodedString),
+	    case httpd_util:split(UnCodedString,":",2) of
+		{ok,[User,PassWord]}->
+		    {user,User,PassWord};
+		{error,Error}->
+		    {error,Error}
+	    end;
+	BadCredentials ->
+	    {error,BadCredentials}
+    end.
+
+
+%----------------------------------------------------------------------
+%Returns a list of all members of the allowed groups
+%----------------------------------------------------------------------
+getGroupMembers(Groups,AllowedGroups)->
+    Allowed=lists:foldl(fun({group,Name,Members},AllowedMembers)->
+				case lists:member(Name,AllowedGroups) of
+				    true->
+					AllowedMembers++Members;
+				    false ->
+					AllowedMembers
+				end
+	       end,[],Groups),
+    {ok,Allowed}.
+
+authenticateUser(Info,AccessData,{{users,[]},{groups,Groups}},User)->
+    authenticateUser(Info,AccessData,{groups,Groups},User);
+authenticateUser(Info,AccessData,{{users,Users},{groups,[]}},User)->
+    authenticateUser(Info,AccessData,{users,Users},User);
+
+authenticateUser(Info,AccessData,{{users,Users},{groups,Groups}},User)->
+    AllowUser=authenticateUser(Info,AccessData,{users,Users},User),
+    AllowGroup=authenticateUser(Info,AccessData,{groups,Groups},User),
+    case {AllowGroup,AllowUser} of
+	{_,allow}->
+	    allow;
+	{allow,_}->
+	    allow;
+	{challenge,_}->
+	    challenge;
+	{_,challenge}->
+	    challenge;
+	{_deny,_deny}->
+	    deny
+    end;
+
+
+%----------------------------------------------------------------------
+%Controls that the user is a member in one of the allowed group
+%----------------------------------------------------------------------
+authenticateUser(Info,AccessData,{groups,AllowedGroups},{user,User,PassWord})->
+    case getUsers(AccessData,group_file) of
+	{group_data,Groups}->
+	    case  getGroupMembers(Groups,AllowedGroups) of
+	       {ok,Members}->
+		    authenticateUser(Info,AccessData,{users,Members},
+				     {user,User,PassWord});
+		{error,BadData}->
+		    deny
+	    end;
+	{error,BadData}->
+	    deny
+    end;
+
+
+%----------------------------------------------------------------------
+%Control that the user is one of the allowed users and that the passwd is ok
+%----------------------------------------------------------------------
+authenticateUser(Info,AccessData,{users,AllowedUsers},{user,User,PassWord})->
+    case lists:member(User,AllowedUsers) of
+       true->
+	    %Get the usernames and passwords from the file
+	    case getUsers(AccessData,user_file) of
+		{error,BadData}->
+		    deny;
+		{user_data,Users}->
+		    %Users is a list of the users in
+		    %the userfile [{user,User,Passwd}]
+		    checkPassWord(Users,{user,User,PassWord})
+	    end;
+	false ->
+	    challenge
+    end.
+
+
+%----------------------------------------------------------------------
+%Control that the user User={user,"UserName","PassWd"} is
+%member of the list of Users
+%----------------------------------------------------------------------
+checkPassWord(Users,User)->
+    case lists:member(User,Users) of
+	true->
+	    allow;
+	false->
+	    challenge
+    end.
+
+
+%----------------------------------------------------------------------
+%Get the users in the specified file
+%UserOrGroup is an atom that specify if its a group file or a user file
+%i.e. group_file or user_file
+%----------------------------------------------------------------------
+getUsers({file,FileName},UserOrGroup)->
+    case file:open(FileName,[read]) of
+        {ok,AccessFileHandle} ->
+	    getUsers({stream,AccessFileHandle},[],UserOrGroup);
+        {error,Reason} ->
+	    {error,{Reason,FileName}}
+    end;
+
+
+%----------------------------------------------------------------------
+%The method that starts the lokkong for user files
+%----------------------------------------------------------------------
+
+getUsers(AccessData,UserOrGroup)->
+    case ets:lookup(AccessData,UserOrGroup) of
+	[{UserOrGroup,File}]->
+	    getUsers({file,File},UserOrGroup);
+	_ ->
+	    {error,noUsers}
+    end.
+
+
+%----------------------------------------------------------------------
+%Reads data from the filehandle File to the list FileData and when its
+%reach the end it returns the list in a tuple {user_file|group_file,FileData}
+%----------------------------------------------------------------------
+getUsers({stream,File},FileData,UserOrGroup)->
+    case io:get_line(File,[]) of
+        eof when UserOrGroup==user_file->
+	    {user_data,FileData};
+	eof when UserOrGroup ==group_file->
+	   {group_data,FileData};
+        Line ->
+	    getUsers({stream,File},
+		     formatUser(Line,FileData,UserOrGroup),UserOrGroup)
+    end.
+
+
+%----------------------------------------------------------------------
+%If the line is a comment remove it
+%----------------------------------------------------------------------
+formatUser([$#|UserDataComment],FileData,_UserOrgroup)->
+    FileData;
+
+
+%----------------------------------------------------------------------
+%The user name in the file is Username:Passwd\n
+%Remove the newline sign and split the user name in
+%UserName and Password
+%----------------------------------------------------------------------
+formatUser(UserData,FileData,UserOrGroup)->
+    case string:tokens(UserData," \r\n")of
+	[User|Whitespace] when UserOrGroup==user_file->
+	    case string:tokens(User,":") of
+		[Name,PassWord]->
+		    [{user,Name,PassWord}|FileData];
+		_Error->
+		    FileData
+	    end;
+	GroupData when UserOrGroup==group_file ->
+	    parseGroupData(GroupData,FileData);
+	_Error ->
+	    FileData
+    end.
+
+
+%----------------------------------------------------------------------
+%if everything is right GroupData is on the form
+% ["groupName:", "Member1", "Member2", "Member2"
+%----------------------------------------------------------------------
+parseGroupData([GroupName|GroupData],FileData)->
+    [{group,formatGroupName(GroupName),GroupData}|FileData].
+
+
+%----------------------------------------------------------------------
+%the line in the file is GroupName: Member1 Member2 .....MemberN
+%Remove the : from the group name
+%----------------------------------------------------------------------
+formatGroupName(GroupName)->
+    string:strip(GroupName,right,$:).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%%  Functions that parses the accessfiles                           %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%----------------------------------------------------------------------
+%Control that the asset is a real file and not a request for an virtual
+%asset
+%----------------------------------------------------------------------
+isErlScriptOrNotAccessibleFile(Path,Info)->
+    case file:read_file_info(Path) of
+	{ok,_fileInfo}->
+	    false;
+	{error,_Reason} ->
+	    true
+    end.
+
+
+%----------------------------------------------------------------------
+%Path=PathToTheRequestedFile=String
+%Innfo=record#mod
+%----------------------------------------------------------------------
+getHtAccessData(Path,Info)->
+    HtAccessFileNames=getHtAccessFileNames(Info),
+    case getData(Path,Info,HtAccessFileNames) of
+	{ok,public}->
+	    {ok,public};
+	{accessData,AccessData}->
+	    {accessData,AccessData};
+	{error,Reason} ->
+	    {error,Reason}
+    end.
+
+
+%----------------------------------------------------------------------
+%returns the names of the accessfiles
+%----------------------------------------------------------------------
+getHtAccessFileNames(Info)->
+    case httpd_util:lookup(Info#mod.config_db,access_files) of
+	undefined->
+	    [".htaccess"];
+	Files->
+	    Files
+    end.
+%----------------------------------------------------------------------
+%HtAccessFileNames=["accessfileName1",..."AccessFileName2"]
+%----------------------------------------------------------------------
+getData(Path,Info,HtAccessFileNames)->
+    case regexp:split(Path,"/") of
+	{error,Error}->
+	    {error,Error};
+	{ok,SplittedPath}->
+	    getData2(HtAccessFileNames,SplittedPath,Info)
+	end.
+
+
+%----------------------------------------------------------------------
+%Add to together the data in the Splittedpath up to the path
+%that is the alias or the document root
+%Since we do not need to control after any accessfiles before here
+%----------------------------------------------------------------------
+getData2(HtAccessFileNames,SplittedPath,Info)->
+    case getRootPath(SplittedPath,Info) of
+	{error,Path}->
+	    {error,Path};
+	{ok,StartPath,RestOfSplittedPath} ->
+	    getData2(HtAccessFileNames,StartPath,RestOfSplittedPath,Info)
+    end.
+
+
+%----------------------------------------------------------------------
+%HtAccessFilenames is a list the names the accesssfiles can have
+%Path is the shortest match agains all alias and documentroot
+%rest of splitted path is a list of the parts of the path
+%Info is the mod recod from the server
+%----------------------------------------------------------------------
+getData2(HtAccessFileNames,StartPath,RestOfSplittedPath,Info)->
+    case getHtAccessFiles(HtAccessFileNames,StartPath,RestOfSplittedPath) of
+	[]->
+	    %No accessfile qiut its a public directory
+	    {ok,public};
+	Files ->
+	    loadAccessFilesData(Files)
+    end.
+
+
+%----------------------------------------------------------------------
+%Loads the data in the accessFiles specifiied by
+% AccessFiles=["/hoem/public/html/accefile",
+%               "/home/public/html/priv/accessfile"]
+%----------------------------------------------------------------------
+loadAccessFilesData(AccessFiles)->
+    loadAccessFilesData(AccessFiles,ets:new(accessData,[])).
+
+
+%----------------------------------------------------------------------
+%Returns the found data
+%----------------------------------------------------------------------
+contextToValues(AccessData)->
+    case ets:lookup(AccessData,context) of
+	[{context,Values}]->
+	    ets:delete(AccessData,context),
+	    insertContext(AccessData,Values),
+	    {accessData,AccessData};
+	_Error->
+	    {error,errorInAccessFile}
+    end.
+
+
+insertContext(AccessData,[])->
+    ok;
+
+insertContext(AccessData,[{allow,From}|Values])->
+    insertDenyAllowContext(AccessData,{allow,From}),
+    insertContext(AccessData,Values);
+
+insertContext(AccessData,[{deny,From}|Values])->
+    insertDenyAllowContext(AccessData,{deny,From}),
+    insertContext(AccessData,Values);
+
+insertContext(AccessData,[{require,{GrpOrUsr,Members}}|Values])->
+    case ets:lookup(AccessData,require) of
+	[]when GrpOrUsr==users->
+	    ets:insert(AccessData,{require,{{users,Members},{groups,[]}}});
+
+	[{require,{{users,Users},{groups,Groups}}}]when GrpOrUsr==users ->
+	    ets:insert(AccessData,{require,{{users,Users++Members},
+					   {groups,Groups}}});
+	[]when GrpOrUsr==groups->
+	    ets:insert(AccessData,{require,{{users,[]},{groups,Members}}});
+
+	[{require,{{users,Users},{groups,Groups}}}]when GrpOrUsr==groups ->
+	    ets:insert(AccessData,{require,{{users,Users},
+					   {groups,Groups++Members}}})
+    end,
+    insertContext(AccessData,Values);
+
+
+
+%%limit and order directive need no transforming they areis just to insert
+insertContext(AccessData,[Elem|Values])->
+    ets:insert(AccessData,Elem),
+    insertContext(AccessData,Values).
+
+
+insertDenyAllowContext(AccessData,{AllowDeny,From})->
+    case From of
+	all->
+	    ets:insert(AccessData,{AllowDeny,all});
+	AllowedSubnets->
+	    case ets:lookup(AccessData,AllowDeny) of
+		[]->
+		    ets:insert(AccessData,{AllowDeny,From});
+		[{AllowDeny,all}]->
+		    ok;
+		[{AllowDeny,Networks}]->
+		    ets:insert(AccessData,{allow,Networks++From})
+	    end
+    end.
+
+loadAccessFilesData([],AccessData)->
+    %preform context to limits
+    contextToValues(AccessData),
+    {accessData,AccessData};
+
+%----------------------------------------------------------------------
+%Takes each file in the list and load the data to the ets table
+%AccessData
+%----------------------------------------------------------------------
+loadAccessFilesData([FileName|FileNames],AccessData)->
+    case loadAccessFileData({file,FileName},AccessData) of
+	overRide->
+	    loadAccessFilesData(FileNames,AccessData);
+	noOverRide ->
+	    {accessData,AccessData};
+	error->
+	    ets:delete(AccessData),
+	    {error,errorInAccessFile}
+    end.
+
+%----------------------------------------------------------------------
+%opens the filehandle to the specified file
+%----------------------------------------------------------------------
+loadAccessFileData({file,FileName},AccessData)->
+    case file:open(FileName,[read]) of
+        {ok,AccessFileHandle}->
+	    loadAccessFileData({stream,AccessFileHandle},AccessData,[]);
+        {error,Reason} ->
+	    overRide
+    end.
+
+%----------------------------------------------------------------------
+%%look att each line in the file and add them to the database
+%%When end of file is reached control i overrride is allowed
+%% if so return
+%----------------------------------------------------------------------
+loadAccessFileData({stream,File},AccessData,FileData)->
+    case io:get_line(File,[]) of
+        eof->
+	    insertData(AccessData,FileData),
+	    case ets:match_object(AccessData,{'_',error}) of
+		[]->
+		    %Case we got no error control that we can override a
+		    %at least some of the values
+		    case ets:match_object(AccessData,
+					  {allow_over_ride,none}) of
+			[]->
+			    overRide;
+			_NoOverride->
+			    noOverRide
+		    end;
+		Errors->
+		    error
+	    end;
+	Line ->
+	    loadAccessFileData({stream,File},AccessData,
+			       insertLine(string:strip(Line,left),FileData))
+    end.
+
+%----------------------------------------------------------------------
+%AccessData is a ets table where the previous found data is inserted
+%FileData is a list of the directives in the last parsed file
+%before insertion a control is done that the directive is allowed to
+%override
+%----------------------------------------------------------------------
+insertData(AccessData,{{context,Values},FileData})->
+    insertData(AccessData,[{context,Values}|FileData]);
+
+insertData(AccessData,FileData)->
+    case ets:lookup(AccessData,allow_over_ride) of
+	[{allow_over_ride,all}]->
+	    lists:foreach(fun(Elem)->
+				  ets:insert(AccessData,Elem)
+			  end,FileData);
+	[]->
+	    lists:foreach(fun(Elem)->
+				  ets:insert(AccessData,Elem)
+			  end,FileData);
+	[{allow_over_ride,Directives}]when list(Directives)->
+	    lists:foreach(fun({Key,Value})->
+				  case lists:member(Key,Directives) of
+				      true->
+					  ok;
+				      false ->
+					  ets:insert(AccessData,{Key,Value})
+				  end
+			  end,FileData);
+	[{allow_over_ride,_}]->
+	    %Will never appear if the user
+	    %aint doing very strang econfig files
+	    ok
+    end.
+%----------------------------------------------------------------------
+%Take a line in the accessfile and transform it into a tuple that
+%later can be inserted in to the ets:table
+%----------------------------------------------------------------------
+%%%Here is the alternatives that resides inside the limit context
+
+insertLine([$o,$r,$d,$e,$r|Order],{{context,Values},FileData})->
+    {{context,[{order,getOrder(Order)}|Values]},FileData};
+%%Let the user place a tab in the beginning
+insertLine([$\t,$o,$r,$d,$e,$r|Order],{{context,Values},FileData})->
+    {{context,[{order,getOrder(Order)}|Values]},FileData};
+
+insertLine([$a,$l,$l,$o,$w|Allow],{{context,Values},FileData})->
+    {{context,[{allow,getAllowDenyData(Allow)}|Values]},FileData};
+insertLine([$\t,$a,$l,$l,$o,$w|Allow],{{context,Values},FileData})->
+    {{context,[{allow,getAllowDenyData(Allow)}|Values]},FileData};
+
+insertLine([$d,$e,$n,$y|Deny],{{context,Values},FileData})->
+    {{context,[{deny,getAllowDenyData(Deny)}|Values]},FileData};
+insertLine([$\t,$d,$e,$n,$y|Deny],{{context,Values},FileData})->
+    {{context,[{deny,getAllowDenyData(Deny)}|Values]},FileData};
+
+
+insertLine([$r,$e,$q,$u,$i,$r,$e|Require],{{context,Values},FileData})->
+    {{context,[{require,getRequireData(Require)}|Values]},FileData};
+insertLine([$\t,$r,$e,$q,$u,$i,$r,$e|Require],{{context,Values},FileData})->
+    {{context,[{require,getRequireData(Require)}|Values]},FileData};
+
+
+insertLine([$<,$/,$L,$i,$m,$i,$t|EndLimit],{Context,FileData})->
+    [Context|FileData];
+
+insertLine([$<,$L,$i,$m,$i,$t|Limit],FileData)->
+    {{context,[{limit,getLimits(Limit)}]}, FileData};
+
+
+
+insertLine([$A,$u,$t,$h,$U,$s,$e,$r,$F,$i,$l,$e,$\ |AuthUserFile],FileData)->
+    [{user_file,string:strip(AuthUserFile,right,$\n)}|FileData];
+
+insertLine([$A,$u,$t,$h,$G,$r,$o,$u,$p,$F,$i,$l,$e,$\ |AuthGroupFile],
+	   FileData)->
+    [{group_file,string:strip(AuthGroupFile,right,$\n)}|FileData];
+
+insertLine([$A,$l,$l,$o,$w,$O,$v,$e,$r,$R,$i,$d,$e|AllowOverRide],FileData)->
+    [{allow_over_ride,getAllowOverRideData(AllowOverRide)}
+     |FileData];
+
+insertLine([$A,$u,$t,$h,$N,$a,$m,$e,$\ |AuthName],FileData)->
+    [{auth_name,string:strip(AuthName,right,$\n)}|FileData];
+
+insertLine([$A,$u,$t,$h,$T,$y,$p,$e|AuthType],FileData)->
+    [{auth_type,getAuthorizationType(AuthType)}|FileData];
+
+insertLine(_BadDirectiveOrComment,FileData)->
+    FileData.
+
+%----------------------------------------------------------------------
+%transform the Data specified about override to a form that is ieasier
+%handled later
+%Override data="all"|"md5"|"Directive1 .... DirectioveN"
+%----------------------------------------------------------------------
+
+getAllowOverRideData(OverRideData)->
+   case string:tokens(OverRideData," \r\n") of
+       [[$a,$l,$l]|_]->
+	   all;
+        [[$n,$o,$n,$e]|_]->
+	   none;
+       Directives ->
+	   getOverRideDirectives(Directives)
+   end.
+
+getOverRideDirectives(Directives)->
+    lists:map(fun(Directive)->
+		      transformDirective(Directive)
+	      end,Directives).
+transformDirective([$A,$u,$t,$h,$U,$s,$e,$r,$F,$i,$l,$e|_])->
+    user_file;
+transformDirective([$A,$u,$t,$h,$G,$r,$o,$u,$p,$F,$i,$l,$e|_]) ->
+    group_file;
+transformDirective([$A,$u,$t,$h,$N,$a,$m,$e|_])->
+    auth_name;
+transformDirective([$A,$u,$t,$h,$T,$y,$p,$e|_])->
+    auth_type;
+transformDirective(_UnAllowedOverRideDirective) ->
+    unallowed.
+%----------------------------------------------------------------------
+%Replace the string that specify which method to use for authentication
+%and replace it with the atom for easier mathing
+%----------------------------------------------------------------------
+getAuthorizationType(AuthType)->
+    [Arg|Crap]=string:tokens(AuthType,"\n\r\ "),
+    case Arg of
+	[$B,$a,$s,$i,$c]->
+	    basic;
+	[$M,$D,$5] ->
+	    md5;
+	_What ->
+	    error
+    end.
+%----------------------------------------------------------------------
+%Returns a list of the specified methods to limit or the atom all
+%----------------------------------------------------------------------
+getLimits(Limits)->
+    case regexp:split(Limits,">")of
+	{ok,[_NoEndOnLimit]}->
+	    error;
+	{ok,[Methods|Crap]}->
+	    case regexp:split(Methods," ")of
+		{ok,[]}->
+		    all;
+		{ok,SplittedMethods}->
+		    SplittedMethods;
+		{error,Error}->
+		    error
+	    end;
+	{error,_Error}->
+	    error
+    end.
+
+
+%----------------------------------------------------------------------
+% Transform the order to prefrom deny allow control to a tuple of atoms
+%----------------------------------------------------------------------
+getOrder(Order)->
+    [First|Rest]=lists:map(fun(Part)->
+		      list_to_atom(Part)
+	      end,string:tokens(Order," \n\r")),
+    case First of
+	deny->
+	    {deny,allow};
+	allow->
+	    {allow,deny};
+	_Error->
+	    error
+    end.
+
+%----------------------------------------------------------------------
+% The string AllowDeny is "from all" or "from Subnet1 Subnet2...SubnetN"
+%----------------------------------------------------------------------
+getAllowDenyData(AllowDeny)->
+    case string:tokens(AllowDeny," \n\r") of
+	[_From|AllowDenyData] when length(AllowDenyData)>=1->
+	    case lists:nth(1,AllowDenyData) of
+		[$a,$l,$l]->
+		    all;
+		Hosts->
+		    AllowDenyData
+	    end;
+	Error->
+	    errror
+    end.
+%----------------------------------------------------------------------
+% Fix the string that describes who is allowed to se the page
+%----------------------------------------------------------------------
+getRequireData(Require)->
+    [UserOrGroup|UserData]=string:tokens(Require," \n\r"),
+    case UserOrGroup of
+	[$u,$s,$e,$r]->
+	    {users,UserData};
+	[$g,$r,$o,$u,$p] ->
+	    {groups,UserData};
+	_Whatever ->
+	    error
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%% Methods that collects the searchways to the accessfiles          %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%----------------------------------------------------------------------
+% Get the whole path to the different accessfiles
+%----------------------------------------------------------------------
+getHtAccessFiles(HtAccessFileNames,Path,RestOfSplittedPath)->
+    getHtAccessFiles(HtAccessFileNames,Path,RestOfSplittedPath,[]).
+
+getHtAccessFiles(HtAccessFileNames,Path,[[]],HtAccessFiles)->
+    HtAccessFiles ++ accessFilesOfPath(HtAccessFileNames,Path++"/");
+
+getHtAccessFiles(HtAccessFileNames,Path,[],HtAccessFiles)->
+    HtAccessFiles;
+getHtAccessFiles(HtAccessFileNames,Path,[NextDir|RestOfSplittedPath],
+		 AccessFiles)->
+    getHtAccessFiles(HtAccessFileNames,Path++"/"++NextDir,RestOfSplittedPath,
+		     AccessFiles ++
+		     accessFilesOfPath(HtAccessFileNames,Path++"/")).
+
+
+%----------------------------------------------------------------------
+%Control if therer are any accessfies in the path
+%----------------------------------------------------------------------
+accessFilesOfPath(HtAccessFileNames,Path)->
+    lists:foldl(fun(HtAccessFileName,Files)->
+			case file:read_file_info(Path++HtAccessFileName) of
+			    {ok,FileInfo}->
+				[Path++HtAccessFileName|Files];
+			    {error,_Error} ->
+				Files
+			end
+		end,[],HtAccessFileNames).
+
+
+%----------------------------------------------------------------------
+%Sake the splitted path and joins it up to the documentroot or the alias
+%that match first
+%----------------------------------------------------------------------
+
+getRootPath(SplittedPath,Info)->
+    DocRoot=httpd_util:lookup(Info#mod.config_db,document_root,"/"),
+    PresumtiveRootPath=
+	[DocRoot|lists:map(fun({Alias,RealPath})->
+				   RealPath
+			   end,
+		 httpd_util:multi_lookup(Info#mod.config_db,alias))],
+    getRootPath(PresumtiveRootPath,SplittedPath,Info).
+
+
+getRootPath(PresumtiveRootPath,[[],Splittedpath],Info)->
+    getRootPath(PresumtiveRootPath,["/",Splittedpath],Info);
+
+
+getRootPath(PresumtiveRootPath,[Part,NextPart|SplittedPath],Info)->
+    case lists:member(Part,PresumtiveRootPath)of
+	true->
+	    {ok,Part,[NextPart|SplittedPath]};
+	false ->
+	    getRootPath(PresumtiveRootPath,
+			[Part++"/"++NextPart|SplittedPath],Info)
+    end;
+
+getRootPath(PresumtiveRootPath,[Part],Info)->
+    case lists:member(Part,PresumtiveRootPath)of
+	true->
+	    {ok,Part,[]};
+	false ->
+	    {error,Part}
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%Debug methods                                                     %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%----------------------------------------------------------------------
+% Simulate the webserver by calling do/1 with apropiate parameters
+%----------------------------------------------------------------------
+debug()->
+    Conf=getConfigData(),
+    Uri=getUri(),
+    {_Proceed,Data}=getDataFromAlias(Conf,Uri),
+    Init_data=#init_data{peername={socket,"127.0.0.1"}},
+    ParsedHeader=headerparts(),
+    do(#mod{init_data=Init_data,
+	    data=Data,
+	    config_db=Conf,
+	    request_uri=Uri,
+	    parsed_header=ParsedHeader,
+	   method="GET"}).
+
+%----------------------------------------------------------------------
+%Add authenticate data to the fake http-request header
+%----------------------------------------------------------------------
+headerparts()->
+    [{"authorization","Basic " ++ httpd_util:encode_base64("lotta:potta")}].
+
+getDataFromAlias(Conf,Uri)->
+    mod_alias:do(#mod{config_db=Conf,request_uri=Uri}).
+
+getUri()->
+    "/appmon/test/test.html".
+
+getConfigData()->
+    Tab=ets:new(test_inets,[bag,public]),
+    ets:insert(Tab,{server_name,"localhost"}),
+    ets:insert(Tab,{bind_addresss,{127,0,0,1}}),
+    ets:insert(Tab,{erl_script_alias,{"/webcover/erl",["webcover"]}}),
+    ets:insert(Tab,{erl_script_alias,{"/erl",["webappmon"]}}),
+    ets:insert(Tab,{com_type,ip_comm}),
+    ets:insert(Tab,{modules,[mod_alias,mod_auth,mod_header]}),
+    ets:insert(Tab,{default_type,"text/plain"}),
+    ets:insert(Tab,{server_root,
+		    "/home/gandalf/marting/exjobb/webtool-1.0/priv/root"}),
+    ets:insert(Tab,{port,8888}),
+    ets:insert(Tab,{document_root,
+		    "/home/gandalf/marting/exjobb/webtool-1.0/priv/root"}),
+    ets:insert(Tab,
+	       {alias,
+		{"/appmon"
+		 ,"/home/gandalf/marting/exjobb/webappmon-1.0/priv"}}),
+    ets:insert(Tab,{alias,
+		    {"/webcover"
+		     ,"/home/gandalf/marting/exjobb/webcover-1.0/priv"}}),
+    ets:insert(Tab,{access_file,[".htaccess","kalle","pelle"]}),
+    Tab.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_include.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_include.erl
new file mode 100644
index 0000000000..eedbf4a669
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_include.erl
@@ -0,0 +1,722 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_include.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_include).
+-export([do/1,parse/2,config/6,include/6,echo/6,fsize/6,flastmod/6,exec/6]).
+
+-include("httpd.hrl").
+
+-define(VMODULE,"INCLUDE").
+-include("httpd_verbosity.hrl").
+
+%% do
+
+do(Info) ->
+    ?vtrace("do",[]),
+    case Info#mod.method of
+	"GET" ->
+	    case httpd_util:key1search(Info#mod.data,status) of
+		%% A status code has been generated!
+		{StatusCode,PhraseArgs,Reason} ->
+		    {proceed,Info#mod.data};
+		%% No status code has been generated!
+		undefined ->
+		    case httpd_util:key1search(Info#mod.data, response) of
+			%% No response has been generated!
+			undefined ->
+			    do_include(Info);
+			%% A response has been generated or sent!
+			Response ->
+			    {proceed,Info#mod.data}
+		    end
+	    end;
+	%% Not a GET method!
+	_ ->
+	    {proceed,Info#mod.data}
+    end.
+
+do_include(Info) ->
+    ?vtrace("do_include -> entry with"
+	    "~n   URI: ~p",[Info#mod.request_uri]),
+    Path = mod_alias:path(Info#mod.data,Info#mod.config_db,
+			  Info#mod.request_uri),
+    Suffix = httpd_util:suffix(Path),
+    case httpd_util:lookup_mime_default(Info#mod.config_db,Suffix) of
+	"text/x-server-parsed-html" ->
+	    HeaderStart =
+		httpd_util:header(200, "text/html", Info#mod.connection),
+	    ?vtrace("do_include -> send ~p", [Path]),
+	    case send_in(Info,Path,HeaderStart,file:read_file_info(Path)) of
+		{ok, ErrorLog, Size} ->
+		    ?vtrace("do_include -> sent ~w bytes", [Size]),
+		    {proceed,[{response,{already_sent,200,Size}},
+			      {mime_type,"text/html"}|
+			      lists:append(ErrorLog,Info#mod.data)]};
+		{error, Reason} ->
+		    ?vlog("send in failed:"
+			  "~n   Reason: ~p"
+			  "~n   Path:   ~p"
+			  "~n   Info:   ~p",
+			  [Reason,Info,Path]),
+		    {proceed,
+		     [{status,send_error(Reason,Info,Path)}|Info#mod.data]}
+	    end;
+	_ -> %% Unknown mime type, ignore
+	    {proceed,Info#mod.data}
+    end.
+
+
+%%
+%% config directive
+%%
+
+config(Info, Context, ErrorLog, TagList, ValueList, R) ->
+    case verify_tags("config",[errmsg,timefmt,sizefmt],
+		     TagList,ValueList) of
+	ok ->
+	    {ok,update_context(TagList,ValueList,Context),ErrorLog,"",R};
+	{error,Reason} ->
+	    {ok,Context,[{internal_info,Reason}|ErrorLog],
+	     httpd_util:key1search(Context,errmsg,""),R}
+    end.
+
+update_context([],[],Context) ->
+    Context;
+update_context([Tag|R1],[Value|R2],Context) ->
+    update_context(R1,R2,[{Tag,Value}|Context]).
+
+verify_tags(Command,ValidTags,TagList,ValueList) when length(TagList)==length(ValueList) ->
+    verify_tags(Command,ValidTags,TagList);
+verify_tags(Command,ValidTags,TagList,ValueList) ->
+    {error,?NICE(Command++" directive has spurious tags")}.
+
+verify_tags(Command, ValidTags, []) ->
+    ok;
+verify_tags(Command, ValidTags, [Tag|Rest]) ->
+    case lists:member(Tag, ValidTags) of
+	true ->
+	    verify_tags(Command, ValidTags, Rest);
+	false ->
+	    {error,?NICE(Command++" directive has a spurious tag ("++
+			 atom_to_list(Tag)++")")}
+    end.
+
+%%
+%% include directive
+%%
+
+include(Info,Context,ErrorLog,[virtual],[VirtualPath],R) ->
+    Aliases = httpd_util:multi_lookup(Info#mod.config_db,alias),
+    {_, Path, _AfterPath} =
+	mod_alias:real_name(Info#mod.config_db, VirtualPath, Aliases),
+    include(Info,Context,ErrorLog,R,Path);
+include(Info, Context, ErrorLog, [file], [FileName], R) ->
+    Path = file(Info#mod.config_db, Info#mod.request_uri, FileName),
+    include(Info, Context, ErrorLog, R, Path);
+include(Info, Context, ErrorLog, TagList, ValueList, R) ->
+    {ok, Context,
+     [{internal_info,?NICE("include directive has a spurious tag")}|
+      ErrorLog], httpd_util:key1search(Context, errmsg, ""), R}.
+
+include(Info, Context, ErrorLog, R, Path) ->
+    ?DEBUG("include -> read file: ~p",[Path]),
+    case file:read_file(Path) of
+	{ok, Body} ->
+	    ?DEBUG("include -> size(Body): ~p",[size(Body)]),
+	    {ok, NewContext, NewErrorLog, Result} =
+		parse(Info, binary_to_list(Body), Context, ErrorLog, []),
+	    {ok, Context, NewErrorLog, Result, R};
+	{error, Reason} ->
+	    {ok, Context,
+	     [{internal_info, ?NICE("Can't open "++Path)}|ErrorLog],
+	     httpd_util:key1search(Context, errmsg, ""), R}
+    end.
+
+file(ConfigDB, RequestURI, FileName) ->
+    Aliases = httpd_util:multi_lookup(ConfigDB, alias),
+    {_, Path, _AfterPath}
+	= mod_alias:real_name(ConfigDB, RequestURI, Aliases),
+    Pwd = filename:dirname(Path),
+    filename:join(Pwd, FileName).
+
+%%
+%% echo directive
+%%
+
+echo(Info,Context,ErrorLog,[var],["DOCUMENT_NAME"],R) ->
+    {ok,Context,ErrorLog,document_name(Info#mod.data,Info#mod.config_db,
+				       Info#mod.request_uri),R};
+echo(Info,Context,ErrorLog,[var],["DOCUMENT_URI"],R) ->
+    {ok,Context,ErrorLog,document_uri(Info#mod.config_db,
+				      Info#mod.request_uri),R};
+echo(Info,Context,ErrorLog,[var],["QUERY_STRING_UNESCAPED"],R) ->
+    {ok,Context,ErrorLog,query_string_unescaped(Info#mod.request_uri),R};
+echo(Info,Context,ErrorLog,[var],["DATE_LOCAL"],R) ->
+    {ok,Context,ErrorLog,date_local(),R};
+echo(Info,Context,ErrorLog,[var],["DATE_GMT"],R) ->
+    {ok,Context,ErrorLog,date_gmt(),R};
+echo(Info,Context,ErrorLog,[var],["LAST_MODIFIED"],R) ->
+    {ok,Context,ErrorLog,last_modified(Info#mod.data,Info#mod.config_db,
+				       Info#mod.request_uri),R};
+echo(Info,Context,ErrorLog,TagList,ValueList,R) ->
+    {ok,Context,
+     [{internal_info,?NICE("echo directive has a spurious tag")}|
+      ErrorLog],"(none)",R}.
+
+document_name(Data,ConfigDB,RequestURI) ->
+    Path = mod_alias:path(Data,ConfigDB,RequestURI),
+    case regexp:match(Path,"[^/]*\$") of
+	{match,Start,Length} ->
+	    string:substr(Path,Start,Length);
+	nomatch ->
+	    "(none)"
+    end.
+
+document_uri(ConfigDB, RequestURI) ->
+    Aliases = httpd_util:multi_lookup(ConfigDB, alias),
+    {Path, AfterPath} =
+	case mod_alias:real_name(ConfigDB, RequestURI, Aliases) of
+	    {_, Name, {[], []}} ->
+		{Name, ""};
+	    {_, Name, {PathInfo, []}} ->
+		{Name, "/"++PathInfo};
+	    {_, Name, {PathInfo, QueryString}} ->
+		{Name, "/"++PathInfo++"?"++QueryString};
+	    {_, Name, _} ->
+		{Name, ""};
+	    Gurka ->
+		io:format("Gurka: ~p~n", [Gurka])
+	end,
+    VirtualPath = string:substr(RequestURI, 1,
+				length(RequestURI)-length(AfterPath)),
+    {match, Start, Length} = regexp:match(Path,"[^/]*\$"),
+    FileName = string:substr(Path,Start,Length),
+    case regexp:match(VirtualPath, FileName++"\$") of
+	{match, _, _} ->
+	    httpd_util:decode_hex(VirtualPath)++AfterPath;
+	nomatch ->
+	    string:strip(httpd_util:decode_hex(VirtualPath),right,$/)++
+		"/"++FileName++AfterPath
+    end.
+
+query_string_unescaped(RequestURI) ->
+  case regexp:match(RequestURI,"[\?].*\$") of
+    {match,Start,Length} ->
+      %% Escape all shell-special variables with \
+      escape(string:substr(RequestURI,Start+1,Length-1));
+    nomatch ->
+      "(none)"
+  end.
+
+escape([]) -> [];
+escape([$;|R]) -> [$\\,$;|escape(R)];
+escape([$&|R]) -> [$\\,$&|escape(R)];
+escape([$(|R]) -> [$\\,$(|escape(R)];
+escape([$)|R]) -> [$\\,$)|escape(R)];
+escape([$||R]) -> [$\\,$||escape(R)];
+escape([$^|R]) -> [$\\,$^|escape(R)];
+escape([$<|R]) -> [$\\,$<|escape(R)];
+escape([$>|R]) -> [$\\,$>|escape(R)];
+escape([$\n|R]) -> [$\\,$\n|escape(R)];
+escape([$ |R]) -> [$\\,$ |escape(R)];
+escape([$\t|R]) -> [$\\,$\t|escape(R)];
+escape([C|R]) -> [C|escape(R)].
+
+date_local() ->
+  {{Year,Month,Day},{Hour,Minute,Second}}=calendar:local_time(),
+  %% Time format hard-wired to: "%a %b %e %T %Y" according to strftime(3)
+  io_lib:format("~s ~s ~2w ~2.2.0w:~2.2.0w:~2.2.0w ~w",
+		[httpd_util:day(calendar:day_of_the_week(Year,Month,Day)),
+		 httpd_util:month(Month),Day,Hour,Minute,Second,Year]).
+
+date_gmt() ->
+  {{Year,Month,Day},{Hour,Minute,Second}}=calendar:universal_time(),
+  %% Time format hard-wired to: "%a %b %e %T %Z %Y" according to strftime(3)
+  io_lib:format("~s ~s ~2w ~2.2.0w:~2.2.0w:~2.2.0w GMT ~w",
+		[httpd_util:day(calendar:day_of_the_week(Year,Month,Day)),
+		 httpd_util:month(Month),Day,Hour,Minute,Second,Year]).
+
+last_modified(Data,ConfigDB,RequestURI) ->
+  {ok,FileInfo}=file:read_file_info(mod_alias:path(Data,ConfigDB,RequestURI)),
+  {{Year,Month,Day},{Hour,Minute,Second}}=FileInfo#file_info.mtime,
+  io_lib:format("~s ~s ~2w ~2.2.0w:~2.2.0w:~2.2.0w ~w",
+		[httpd_util:day(calendar:day_of_the_week(Year,Month,Day)),
+		 httpd_util:month(Month),Day,Hour,Minute,Second,Year]).
+
+%%
+%% fsize directive
+%%
+
+fsize(Info,Context,ErrorLog,[virtual],[VirtualPath],R) ->
+  Aliases=httpd_util:multi_lookup(Info#mod.config_db,alias),
+  {_,Path,AfterPath}=
+    mod_alias:real_name(Info#mod.config_db,VirtualPath,Aliases),
+  fsize(Info, Context, ErrorLog, R, Path);
+fsize(Info,Context,ErrorLog,[file],[FileName],R) ->
+  Path=file(Info#mod.config_db,Info#mod.request_uri,FileName),
+  fsize(Info,Context,ErrorLog,R,Path);
+fsize(Info,Context,ErrorLog,TagList,ValueList,R) ->
+  {ok,Context,[{internal_info,?NICE("fsize directive has a spurious tag")}|
+	       ErrorLog],httpd_util:key1search(Context,errmsg,""),R}.
+
+fsize(Info,Context,ErrorLog,R,Path) ->
+    case file:read_file_info(Path) of
+	{ok,FileInfo} ->
+	    case httpd_util:key1search(Context,sizefmt) of
+		"bytes" ->
+		    {ok,Context,ErrorLog,
+		     integer_to_list(FileInfo#file_info.size),R};
+		"abbrev" ->
+		    Size = integer_to_list(trunc(FileInfo#file_info.size/1024+1))++"k",
+		    {ok,Context,ErrorLog,Size,R};
+		Value->
+		    {ok,Context,
+		     [{internal_info,
+		       ?NICE("fsize directive has a spurious tag value ("++
+			     Value++")")}|
+		      ErrorLog],
+		     httpd_util:key1search(Context, errmsg, ""), R}
+	    end;
+	{error,Reason} ->
+	    {ok,Context,[{internal_info,?NICE("Can't open "++Path)}|ErrorLog],
+	     httpd_util:key1search(Context,errmsg,""),R}
+    end.
+
+%%
+%% flastmod directive
+%%
+
+flastmod(Info, Context, ErrorLog, [virtual], [VirtualPath],R) ->
+    Aliases=httpd_util:multi_lookup(Info#mod.config_db,alias),
+    {_,Path,AfterPath}=
+	mod_alias:real_name(Info#mod.config_db,VirtualPath,Aliases),
+    flastmod(Info,Context,ErrorLog,R,Path);
+flastmod(Info, Context, ErrorLog, [file], [FileName], R) ->
+    Path = file(Info#mod.config_db, Info#mod.request_uri, FileName),
+    flastmod(Info, Context, ErrorLog, R, Path);
+flastmod(Info,Context,ErrorLog,TagList,ValueList,R) ->
+    {ok,Context,[{internal_info,?NICE("flastmod directive has a spurious tag")}|
+		 ErrorLog],httpd_util:key1search(Context,errmsg,""),R}.
+
+flastmod(Info,Context,ErrorLog,R,File) ->
+    case file:read_file_info(File) of
+	{ok,FileInfo} ->
+	    {{Yr,Mon,Day},{Hour,Minute,Second}}=FileInfo#file_info.mtime,
+	    Result=
+		io_lib:format("~s ~s ~2w ~w:~w:~w ~w",
+			      [httpd_util:day(
+				 calendar:day_of_the_week(Yr,Mon, Day)),
+			       httpd_util:month(Mon),Day,Hour,Minute,Second, Yr]),
+	    {ok,Context,ErrorLog,Result,R};
+	{error,Reason} ->
+	    {ok,Context,[{internal_info,?NICE("Can't open "++File)}|ErrorLog],
+	     httpd_util:key1search(Context,errmsg,""),R}
+    end.
+
+%%
+%% exec directive
+%%
+
+exec(Info,Context,ErrorLog,[cmd],[Command],R) ->
+    ?vtrace("exec cmd:~n   Command: ~p",[Command]),
+    cmd(Info,Context,ErrorLog,R,Command);
+exec(Info,Context,ErrorLog,[cgi],[RequestURI],R) ->
+    ?vtrace("exec cgi:~n   RequestURI: ~p",[RequestURI]),
+    cgi(Info,Context,ErrorLog,R,RequestURI);
+exec(Info,Context,ErrorLog,TagList,ValueList,R) ->
+    ?vtrace("exec with spurious tag:"
+	    "~n   TagList:   ~p"
+	    "~n   ValueList: ~p",
+	    [TagList,ValueList]),
+    {ok, Context,
+     [{internal_info,?NICE("exec directive has a spurious tag")}|
+      ErrorLog], httpd_util:key1search(Context,errmsg,""),R}.
+
+%% cmd
+
+cmd(Info, Context, ErrorLog, R, Command) ->
+    process_flag(trap_exit,true),
+    Env  = env(Info),
+    Dir  = filename:dirname(Command),
+    Port = (catch open_port({spawn,Command},[stream,{cd,Dir},{env,Env}])),
+    case Port of
+	P when port(P) ->
+	    {NewErrorLog, Result} = proxy(Port, ErrorLog),
+	    {ok, Context, NewErrorLog, Result, R};
+	{'EXIT', Reason} ->
+	    ?vlog("open port failed: exit"
+		  "~n   URI:    ~p"
+		  "~n   Reason: ~p",
+		  [Info#mod.request_uri,Reason]),
+	    exit({open_port_failed,Reason,
+		  [{uri,Info#mod.request_uri},{script,Command},
+		   {env,Env},{dir,Dir}]});
+	O ->
+	    ?vlog("open port failed: unknown result"
+		  "~n   URI: ~p"
+		  "~n   O:   ~p",
+		  [Info#mod.request_uri,O]),
+	    exit({open_port_failed,O,
+		  [{uri,Info#mod.request_uri},{script,Command},
+		   {env,Env},{dir,Dir}]})
+    end.
+
+env(Info) ->
+    [{"DOCUMENT_NAME",document_name(Info#mod.data,Info#mod.config_db,
+				    Info#mod.request_uri)},
+     {"DOCUMENT_URI", document_uri(Info#mod.config_db, Info#mod.request_uri)},
+     {"QUERY_STRING_UNESCAPED", query_string_unescaped(Info#mod.request_uri)},
+     {"DATE_LOCAL", date_local()},
+     {"DATE_GMT", date_gmt()},
+     {"LAST_MODIFIED", last_modified(Info#mod.data, Info#mod.config_db,
+				     Info#mod.request_uri)}
+    ].
+
+%% cgi
+
+cgi(Info, Context, ErrorLog, R, RequestURI) ->
+    ScriptAliases = httpd_util:multi_lookup(Info#mod.config_db, script_alias),
+    case mod_alias:real_script_name(Info#mod.config_db, RequestURI,
+				    ScriptAliases) of
+	{Script, AfterScript} ->
+	    exec_script(Info,Script,AfterScript,ErrorLog,Context,R);
+	not_a_script ->
+	    {ok, Context,
+	     [{internal_info, ?NICE(RequestURI++" is not a script")}|
+	      ErrorLog], httpd_util:key1search(Context, errmsg, ""),R}
+    end.
+
+remove_header([]) ->
+    [];
+remove_header([$\n,$\n|Rest]) ->
+    Rest;
+remove_header([C|Rest]) ->
+    remove_header(Rest).
+
+
+exec_script(Info,Script,AfterScript,ErrorLog,Context,R) ->
+    process_flag(trap_exit,true),
+    Aliases = httpd_util:multi_lookup(Info#mod.config_db, alias),
+    {_, Path, AfterPath} = mod_alias:real_name(Info#mod.config_db,
+					       Info#mod.request_uri,
+					       Aliases),
+    Env  = env(Info)++mod_cgi:env(Info, Path, AfterPath),
+    Dir  = filename:dirname(Path),
+    Port = (catch open_port({spawn,Script},[stream,{env, Env},{cd, Dir}])),
+    case Port of
+	P when port(P) ->
+	    %% Send entity body to port.
+	    Res = case Info#mod.entity_body of
+		      [] ->
+			  true;
+		      EntityBody ->
+			  (catch port_command(Port,EntityBody))
+		  end,
+	    case Res of
+		{'EXIT', Reason} ->
+		    ?vlog("port send failed:"
+			  "~n   Port:   ~p"
+			  "~n   URI:    ~p"
+			  "~n   Reason: ~p",
+			  [Port,Info#mod.request_uri,Reason]),
+		    exit({open_cmd_failed,Reason,
+			  [{mod,?MODULE},{port,Port},
+			   {uri,Info#mod.request_uri},
+			   {script,Script},{env,Env},{dir,Dir},
+			   {ebody_size,sz(Info#mod.entity_body)}]});
+		true ->
+		    {NewErrorLog, Result} = proxy(Port, ErrorLog),
+		    {ok, Context, NewErrorLog, remove_header(Result), R}
+	    end;
+	{'EXIT', Reason} ->
+	    ?vlog("open port failed: exit"
+		  "~n   URI:    ~p"
+		  "~n   Reason: ~p",
+		  [Info#mod.request_uri,Reason]),
+	    exit({open_port_failed,Reason,
+		  [{mod,?MODULE},{uri,Info#mod.request_uri},{script,Script},
+		   {env,Env},{dir,Dir}]});
+	O ->
+	    ?vlog("open port failed: unknown result"
+		  "~n   URI: ~p"
+		  "~n   O:   ~p",
+		  [Info#mod.request_uri,O]),
+	    exit({open_port_failed,O,
+		  [{mod,?MODULE},{uri,Info#mod.request_uri},{script,Script},
+		   {env,Env},{dir,Dir}]})
+    end.
+
+
+%%
+%% Port communication
+%%
+
+proxy(Port,ErrorLog) ->
+    process_flag(trap_exit, true),
+    proxy(Port, ErrorLog, []).
+
+proxy(Port, ErrorLog, Result) ->
+    receive
+	{Port, {data, Response}} ->
+	    proxy(Port, ErrorLog, lists:append(Result,Response));
+	{'EXIT', Port, normal} when port(Port) ->
+	    process_flag(trap_exit, false),
+	    {ErrorLog, Result};
+	{'EXIT', Port, Reason} when port(Port) ->
+	    process_flag(trap_exit, false),
+	    {[{internal_info,
+	       ?NICE("Scrambled output from CGI-script")}|ErrorLog],
+	     Result};
+	{'EXIT', Pid, Reason} when pid(Pid) ->
+	    process_flag(trap_exit, false),
+	    {'EXIT', Pid, Reason};
+	%% This should not happen!
+	WhatEver ->
+	    process_flag(trap_exit, false),
+	    {ErrorLog, Result}
+    end.
+
+
+%% ------
+%% Temporary until I figure out a way to fix send_in_chunks
+%% (comments and directives that start in one chunk but end
+%% in another is not handled).
+%%
+
+send_in(Info, Path,Head, {ok,FileInfo}) ->
+    case file:read_file(Path) of
+	{ok, Bin} ->
+	    send_in1(Info, binary_to_list(Bin), Head, FileInfo);
+	{error, Reason} ->
+	    ?vlog("failed reading file: ~p",[Reason]),
+	    {error, {open,Reason}}
+    end;
+send_in(Info,Path,Head,{error,Reason}) ->
+    ?vlog("failed open file: ~p",[Reason]),
+    {error, {open,Reason}}.
+
+send_in1(Info, Data,Head,FileInfo) ->
+    {ok, _Context, Err, ParsedBody} = parse(Info,Data,?DEFAULT_CONTEXT,[],[]),
+    Size = length(ParsedBody),
+    ?vdebug("send_in1 -> Size: ~p",[Size]),
+    Head1 = case Info#mod.http_version of
+		"HTTP/1.1"->
+		    Head ++
+			"Content-Length: " ++
+			integer_to_list(Size) ++
+			"\r\nEtag:" ++
+			httpd_util:create_etag(FileInfo,Size) ++"\r\n" ++
+			"Last-Modified: " ++
+			httpd_util:rfc1123_date(FileInfo#file_info.mtime)  ++
+			"\r\n\r\n";
+		_->
+		    %% i.e http/1.0 and http/0.9
+		    Head ++
+			"Content-Length: " ++
+			integer_to_list(Size) ++
+			"\r\nLast-Modified: " ++
+			httpd_util:rfc1123_date(FileInfo#file_info.mtime)  ++
+			"\r\n\r\n"
+	    end,
+    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket,
+			 [Head1,ParsedBody]),
+    {ok, Err, Size}.
+
+
+
+%%
+%% Addition to "Fuzzy" HTML parser. This is actually a ugly hack to
+%% avoid putting to much data on the heap. To be rewritten...
+%%
+
+% -define(CHUNK_SIZE, 4096).
+
+% send_in_chunks(Info, Path) ->
+%     ?DEBUG("send_in_chunks -> Path: ~p",[Path]),
+%     case file:open(Path, [read, raw]) of
+% 	{ok, Stream} ->
+% 	    send_in_chunks(Info, Stream, ?DEFAULT_CONTEXT,[]);
+% 	{error, Reason} ->
+% 	    ?ERROR("Failed open file: ~p",[Reason]),
+% 	    {error, {open,Reason}}
+%     end.
+
+% send_in_chunks(Info, Stream, Context, ErrorLog) ->
+%     case file:read(Stream, ?CHUNK_SIZE) of
+% 	{ok, Data} ->
+% 	    ?DEBUG("send_in_chunks -> read ~p bytes",[length(Data)]),
+% 	    {ok, NewContext, NewErrorLog, ParsedBody}=
+% 		parse(Info, Data, Context, ErrorLog, []),
+% 	    httpd_socket:deliver(Info#mod.socket_type,
+% 				 Info#mod.socket, ParsedBody),
+% 	    send_in_chunks(Info,Stream,NewContext,NewErrorLog);
+% 	eof ->
+% 	    {ok, ErrorLog};
+% 	{error, Reason} ->
+% 	    ?ERROR("Failed read from file: ~p",[Reason]),
+% 	    {error, {read,Reason}}
+%     end.
+
+
+%%
+%% "Fuzzy" HTML parser
+%%
+
+parse(Info,Body) ->
+  parse(Info, Body, ?DEFAULT_CONTEXT, [], []).
+
+parse(Info, [], Context, ErrorLog, Result) ->
+    {ok, Context, lists:reverse(ErrorLog), lists:reverse(Result)};
+parse(Info,[$<,$!,$-,$-,$#|R1],Context,ErrorLog,Result) ->
+  ?DEBUG("parse -> start command directive when length(R1): ~p",[length(R1)]),
+  case catch parse0(R1,Context) of
+    {parse_error,Reason} ->
+      parse(Info,R1,Context,[{internal_info,?NICE(Reason)}|ErrorLog],
+	    [$#,$-,$-,$!,$<|Result]);
+    {ok,Context,Command,TagList,ValueList,R2} ->
+      ?DEBUG("parse -> Command: ~p",[Command]),
+      {ok,NewContext,NewErrorLog,MoreResult,R3}=
+	handle(Info,Context,ErrorLog,Command,TagList,ValueList,R2),
+      parse(Info,R3,NewContext,NewErrorLog,lists:reverse(MoreResult)++Result)
+  end;
+parse(Info,[$<,$!,$-,$-|R1],Context,ErrorLog,Result) ->
+  ?DEBUG("parse -> start comment when length(R1) = ~p",[length(R1)]),
+  case catch parse5(R1,[],0) of
+    {parse_error,Reason} ->
+      ?ERROR("parse -> parse error: ~p",[Reason]),
+      parse(Info,R1,Context,[{internal_info,?NICE(Reason)}|ErrorLog],Result);
+    {Comment,R2} ->
+      ?DEBUG("parse -> length(Comment) = ~p, length(R2) = ~p",
+	     [length(Comment),length(R2)]),
+      parse(Info,R2,Context,ErrorLog,Comment++Result)
+  end;
+parse(Info,[C|R],Context,ErrorLog,Result) ->
+  parse(Info,R,Context,ErrorLog,[C|Result]).
+
+handle(Info,Context,ErrorLog,Command,TagList,ValueList,R) ->
+  case catch apply(?MODULE,Command,[Info,Context,ErrorLog,TagList,ValueList,
+				    R]) of
+    {'EXIT',{undef,_}} ->
+      throw({parse_error,"Unknown command "++atom_to_list(Command)++
+	     " in parsed doc"});
+    Result ->
+      Result
+  end.
+
+parse0([],Context) ->
+  throw({parse_error,"Premature EOF in parsed file"});
+parse0([$-,$-,$>|R],Context) ->
+  throw({parse_error,"Premature EOF in parsed file"});
+parse0([$ |R],Context) ->
+  parse0(R,Context);
+parse0(String,Context) ->
+  parse1(String,Context,"").
+
+parse1([],Context,Command) ->
+  throw({parse_error,"Premature EOF in parsed file"});
+parse1([$-,$-,$>|R],Context,Command) ->
+  throw({parse_error,"Premature EOF in parsed file"});
+parse1([$ |R],Context,Command) ->
+  parse2(R,Context,list_to_atom(lists:reverse(Command)),[],[],"");
+parse1([C|R],Context,Command) ->
+  parse1(R,Context,[C|Command]).
+
+parse2([],Context,Command,TagList,ValueList,Tag) ->
+  throw({parse_error,"Premature EOF in parsed file"});
+parse2([$-,$-,$>|R],Context,Command,TagList,ValueList,Tag) ->
+  {ok,Context,Command,TagList,ValueList,R};
+parse2([$ |R],Context,Command,TagList,ValueList,Tag) ->
+  parse2(R,Context,Command,TagList,ValueList,Tag);
+parse2([$=|R],Context,Command,TagList,ValueList,Tag) ->
+  parse3(R,Context,Command,[list_to_atom(lists:reverse(Tag))|TagList],
+	 ValueList);
+parse2([C|R],Context,Command,TagList,ValueList,Tag) ->
+  parse2(R,Context,Command,TagList,ValueList,[C|Tag]).
+
+parse3([],Context,Command,TagList,ValueList) ->
+  throw({parse_error,"Premature EOF in parsed file"});
+parse3([$-,$-,$>|R],Context,Command,TagList,ValueList) ->
+  throw({parse_error,"Premature EOF in parsed file"});
+parse3([$ |R],Context,Command,TagList,ValueList) ->
+  parse3(R,Context,Command,TagList,ValueList);
+parse3([$"|R],Context,Command,TagList,ValueList) ->
+  parse4(R,Context,Command,TagList,ValueList,"");
+parse3(String,Context,Command,TagList,ValueList) ->
+  throw({parse_error,"Premature EOF in parsed file"}).
+
+parse4([],Context,Command,TagList,ValueList,Value) ->
+  throw({parse_error,"Premature EOF in parsed file"});
+parse4([$-,$-,$>|R],Context,Command,TagList,ValueList,Value) ->
+  throw({parse_error,"Premature EOF in parsed file"});
+parse4([$"|R],Context,Command,TagList,ValueList,Value) ->
+  parse2(R,Context,Command,TagList,[lists:reverse(Value)|ValueList],"");
+parse4([C|R],Context,Command,TagList,ValueList,Value) ->
+  parse4(R,Context,Command,TagList,ValueList,[C|Value]).
+
+parse5([],Comment,Depth) ->
+  ?ERROR("parse5 -> unterminated comment of ~p bytes when Depth = ~p",
+	 [length(Comment),Depth]),
+  throw({parse_error,"Premature EOF in parsed file"});
+parse5([$<,$!,$-,$-|R],Comment,Depth) ->
+  parse5(R,[$-,$-,$!,$<|Comment],Depth+1);
+parse5([$-,$-,$>|R],Comment,0) ->
+  {">--"++Comment++"--!<",R};
+parse5([$-,$-,$>|R],Comment,Depth) ->
+  parse5(R,[$>,$-,$-|Comment],Depth-1);
+parse5([C|R],Comment,Depth) ->
+  parse5(R,[C|Comment],Depth).
+
+
+sz(B) when binary(B) -> {binary,size(B)};
+sz(L) when list(L)   -> {list,length(L)};
+sz(_)                -> undefined.
+
+
+%% send_error - Handle failure to send the file
+%%
+send_error({open,Reason},Info,Path) -> open_error(Reason,Info,Path);
+send_error({read,Reason},Info,Path) -> read_error(Reason,Info,Path).
+
+
+%% open_error - Handle file open failure
+%%
+open_error(eacces,Info,Path) ->
+    open_error(403,Info,Path,"");
+open_error(enoent,Info,Path) ->
+    open_error(404,Info,Path,"");
+open_error(enotdir,Info,Path) ->
+    open_error(404,Info,Path,
+	       ": A component of the file name is not a directory");
+open_error(emfile,_Info,Path) ->
+    open_error(500,none,Path,": To many open files");
+open_error({enfile,_},_Info,Path) ->
+    open_error(500,none,Path,": File table overflow");
+open_error(_Reason,_Info,Path) ->
+    open_error(500,none,Path,"").
+
+open_error(StatusCode,none,Path,Reason) ->
+    {StatusCode,none,?NICE("Can't open "++Path++Reason)};
+open_error(StatusCode,Info,Path,Reason) ->
+    {StatusCode,Info#mod.request_uri,?NICE("Can't open "++Path++Reason)}.
+
+read_error(_Reason,_Info,Path) ->
+    read_error(500,none,Path,"").
+
+read_error(StatusCode,none,Path,Reason) ->
+    {StatusCode,none,?NICE("Can't read "++Path++Reason)};
+read_error(StatusCode,Info,Path,Reason) ->
+    {StatusCode,Info#mod.request_uri,?NICE("Can't read "++Path++Reason)}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_log.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_log.erl
new file mode 100644
index 0000000000..a24ac425e6
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_log.erl
@@ -0,0 +1,250 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_log.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_log).
+-export([do/1,error_log/5,security_log/2,load/2,store/2,remove/1]).
+
+-export([report_error/2]).
+
+-include("httpd.hrl").
+
+-define(VMODULE,"LOG").
+-include("httpd_verbosity.hrl").
+
+%% do
+
+do(Info) ->
+    AuthUser = auth_user(Info#mod.data),
+    Date     = custom_date(),
+    log_internal_info(Info,Date,Info#mod.data),
+    case httpd_util:key1search(Info#mod.data,status) of
+	%% A status code has been generated!
+	{StatusCode,PhraseArgs,Reason} ->
+	    transfer_log(Info,"-",AuthUser,Date,StatusCode,0),
+	    if
+		StatusCode >= 400 ->
+		    error_log(Info,Date,Reason);
+		true ->
+		    not_an_error
+	    end,
+	    {proceed,Info#mod.data};
+	%% No status code has been generated!
+	undefined ->
+	    case httpd_util:key1search(Info#mod.data,response) of
+		{already_sent,StatusCode,Size} ->
+		    transfer_log(Info,"-",AuthUser,Date,StatusCode,Size),
+		    {proceed,Info#mod.data};
+		{response,Head,Body} ->
+		    Size=httpd_util:key1search(Head,content_length,unknown),
+		    Code=httpd_util:key1search(Head,code,unknown),
+		    transfer_log(Info,"-",AuthUser,Date,Code,Size),
+		    {proceed,Info#mod.data};
+		{StatusCode,Response} ->
+		    transfer_log(Info,"-",AuthUser,Date,200,
+				 httpd_util:flatlength(Response)),
+		    {proceed,Info#mod.data};
+		undefined ->
+		    transfer_log(Info,"-",AuthUser,Date,200,0),
+		    {proceed,Info#mod.data}
+	    end
+    end.
+
+custom_date() ->
+    LocalTime=calendar:local_time(),
+    UniversalTime=calendar:universal_time(),
+    Minutes=round(diff_in_minutes(LocalTime,UniversalTime)),
+    {{YYYY,MM,DD},{Hour,Min,Sec}}=LocalTime,
+    Date =
+	io_lib:format("~.2.0w/~.3s/~.4w:~.2.0w:~.2.0w:~.2.0w ~c~.2.0w~.2.0w",
+		      [DD, httpd_util:month(MM), YYYY, Hour, Min, Sec,
+		       sign(Minutes),
+		       abs(Minutes) div 60, abs(Minutes) rem 60]),
+    lists:flatten(Date).
+
+diff_in_minutes(L,U) ->
+    (calendar:datetime_to_gregorian_seconds(L) -
+     calendar:datetime_to_gregorian_seconds(U))/60.
+
+sign(Minutes) when Minutes > 0 ->
+    $+;
+sign(Minutes) ->
+    $-.
+
+auth_user(Data) ->
+    case httpd_util:key1search(Data,remote_user) of
+	undefined ->
+	    "-";
+	RemoteUser ->
+	    RemoteUser
+    end.
+
+%% log_internal_info
+
+log_internal_info(Info,Date,[]) ->
+    ok;
+log_internal_info(Info,Date,[{internal_info,Reason}|Rest]) ->
+    error_log(Info,Date,Reason),
+    log_internal_info(Info,Date,Rest);
+log_internal_info(Info,Date,[_|Rest]) ->
+    log_internal_info(Info,Date,Rest).
+
+%% transfer_log
+
+transfer_log(Info,RFC931,AuthUser,Date,StatusCode,Bytes) ->
+    case httpd_util:lookup(Info#mod.config_db,transfer_log) of
+	undefined ->
+	    no_transfer_log;
+	TransferLog ->
+	    {PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
+	    case (catch io:format(TransferLog, "~s ~s ~s [~s] \"~s\" ~w ~w~n",
+				  [RemoteHost, RFC931, AuthUser,
+				   Date, Info#mod.request_line,
+				   StatusCode, Bytes])) of
+		ok ->
+		    ok;
+		Error ->
+		    error_logger:error_report(Error)
+	    end
+    end.
+
+%% security log
+
+security_log(Info, Reason) ->
+    case httpd_util:lookup(Info#mod.config_db, security_log) of
+	undefined ->
+	    no_security_log;
+	SecurityLog ->
+	    io:format(SecurityLog,"[~s] ~s~n", [custom_date(), Reason])
+    end.
+
+%% error_log
+
+error_log(Info,Date,Reason) ->
+    case httpd_util:lookup(Info#mod.config_db, error_log) of
+	undefined ->
+	    no_error_log;
+	ErrorLog ->
+	    {PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
+	    io:format(ErrorLog,"[~s] access to ~s failed for ~s, reason: ~p~n",
+		      [Date,Info#mod.request_uri,RemoteHost,Reason])
+    end.
+
+error_log(SocketType,Socket,ConfigDB,{PortNumber,RemoteHost},Reason) ->
+    case httpd_util:lookup(ConfigDB,error_log) of
+	undefined ->
+	    no_error_log;
+	ErrorLog ->
+	    Date=custom_date(),
+	    io:format(ErrorLog,"[~s] server crash for ~s, reason: ~p~n",
+		      [Date,RemoteHost,Reason]),
+	    ok
+    end.
+
+report_error(ConfigDB,Error) ->
+    case httpd_util:lookup(ConfigDB,error_log) of
+	undefined ->
+	    no_error_log;
+	ErrorLog ->
+	    Date=custom_date(),
+	    io:format(ErrorLog,"[~s] reporting error: ~s~n",[Date,Error]),
+	    ok
+    end.
+
+%%
+%% Configuration
+%%
+
+%% load
+
+load([$T,$r,$a,$n,$s,$f,$e,$r,$L,$o,$g,$ |TransferLog],[]) ->
+    {ok,[],{transfer_log,httpd_conf:clean(TransferLog)}};
+load([$E,$r,$r,$o,$r,$L,$o,$g,$ |ErrorLog],[]) ->
+    {ok,[],{error_log,httpd_conf:clean(ErrorLog)}};
+load([$S,$e,$c,$u,$r,$i,$t,$y,$L,$o,$g,$ |SecurityLog], []) ->
+    {ok, [], {security_log, httpd_conf:clean(SecurityLog)}}.
+
+%% store
+
+store({transfer_log,TransferLog},ConfigList) ->
+    case create_log(TransferLog,ConfigList) of
+	{ok,TransferLogStream} ->
+	    {ok,{transfer_log,TransferLogStream}};
+	{error,Reason} ->
+	    {error,Reason}
+    end;
+store({error_log,ErrorLog},ConfigList) ->
+    case create_log(ErrorLog,ConfigList) of
+	{ok,ErrorLogStream} ->
+	    {ok,{error_log,ErrorLogStream}};
+	{error,Reason} ->
+	    {error,Reason}
+    end;
+store({security_log, SecurityLog},ConfigList) ->
+    case create_log(SecurityLog, ConfigList) of
+	{ok, SecurityLogStream} ->
+	    {ok, {security_log, SecurityLogStream}};
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+create_log(LogFile,ConfigList) ->
+    Filename = httpd_conf:clean(LogFile),
+    case filename:pathtype(Filename) of
+	absolute ->
+	    case file:open(Filename, [read,write]) of
+		{ok,LogStream} ->
+		    file:position(LogStream,{eof,0}),
+		    {ok,LogStream};
+		{error,_} ->
+		    {error,?NICE("Can't create "++Filename)}
+	    end;
+	volumerelative ->
+	    case file:open(Filename, [read,write]) of
+		{ok,LogStream} ->
+		    file:position(LogStream,{eof,0}),
+		    {ok,LogStream};
+		{error,_} ->
+		    {error,?NICE("Can't create "++Filename)}
+	    end;
+	relative ->
+	    case httpd_util:key1search(ConfigList,server_root) of
+		undefined ->
+		    {error,
+		     ?NICE(Filename++
+			   " is an invalid logfile name beacuse ServerRoot is not defined")};
+		ServerRoot ->
+		    AbsoluteFilename=filename:join(ServerRoot,Filename),
+		    case file:open(AbsoluteFilename, [read,write]) of
+			{ok,LogStream} ->
+			    file:position(LogStream,{eof,0}),
+			    {ok,LogStream};
+			{error,Reason} ->
+			    {error,?NICE("Can't create "++AbsoluteFilename)}
+		    end
+	    end
+    end.
+
+%% remove
+
+remove(ConfigDB) ->
+    lists:foreach(fun([Stream]) -> file:close(Stream) end,
+		  ets:match(ConfigDB,{transfer_log,'$1'})),
+    lists:foreach(fun([Stream]) -> file:close(Stream) end,
+		  ets:match(ConfigDB,{error_log,'$1'})),
+    lists:foreach(fun([Stream]) -> file:close(Stream) end,
+		  ets:match(ConfigDB,{security_log,'$1'})),
+    ok.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_range.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_range.erl
new file mode 100644
index 0000000000..f623dc3ec8
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_range.erl
@@ -0,0 +1,380 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_range.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_range).
+-export([do/1]).
+-include("httpd.hrl").
+
+%% do
+
+
+
+do(Info) ->
+    ?DEBUG("do -> entry",[]),
+    case Info#mod.method of
+	"GET" ->
+	    case httpd_util:key1search(Info#mod.data,status) of
+		%% A status code has been generated!
+		{StatusCode,PhraseArgs,Reason} ->
+		    {proceed,Info#mod.data};
+		%% No status code has been generated!
+		undefined ->
+		    case httpd_util:key1search(Info#mod.data,response) of
+			%% No response has been generated!
+			undefined ->
+			    case httpd_util:key1search(Info#mod.parsed_header,"range") of
+				undefined ->
+				    %Not a range response
+				    {proceed,Info#mod.data};
+				Range ->
+				    %%Control that there weren't a if-range field that stopped
+				    %%The range request in favor for the whole file
+				    case httpd_util:key1search(Info#mod.data,if_range) of
+					send_file ->
+					    {proceed,Info#mod.data};
+					_undefined ->
+					    do_get_range(Info,Range)
+				    end
+			    end;
+			%% A response has been generated or sent!
+			Response ->
+			    {proceed,Info#mod.data}
+		    end
+	    end;
+	%% Not a GET method!
+	_ ->
+	    {proceed,Info#mod.data}
+    end.
+
+do_get_range(Info,Ranges) ->
+    ?DEBUG("do_get_range -> Request URI: ~p",[Info#mod.request_uri]),
+     Path = mod_alias:path(Info#mod.data, Info#mod.config_db,
+			  Info#mod.request_uri),
+    {FileInfo, LastModified} =get_modification_date(Path),
+    send_range_response(Path,Info,Ranges,FileInfo,LastModified).
+
+
+send_range_response(Path,Info,Ranges,FileInfo,LastModified)->
+    case parse_ranges(Ranges) of
+	error->
+	    ?ERROR("send_range_response-> Unparsable range request",[]),
+	    {proceed,Info#mod.data};
+	{multipart,RangeList}->
+	    send_multi_range_response(Path,Info,RangeList);
+	{Start,Stop}->
+	    send_range_response(Path,Info,Start,Stop,FileInfo,LastModified)
+    end.
+%%More than one range specified
+%%Send a multipart reponse to the user
+%
+%%An example of an multipart range response
+
+% HTTP/1.1 206 Partial Content
+% Date:Wed 15 Nov 1995 04:08:23 GMT
+% Last-modified:Wed 14 Nov 1995 04:08:23 GMT
+% Content-type: multipart/byteranges; boundary="SeparatorString"
+%
+% --"SeparatorString"
+% Content-Type: application/pdf
+% Content-Range: bytes 500-600/1010
+% .... The data..... 101 bytes
+%
+% --"SeparatorString"
+% Content-Type: application/pdf
+% Content-Range: bytes 700-1009/1010
+% .... The data.....
+
+
+
+send_multi_range_response(Path,Info,RangeList)->
+    case file:open(Path, [raw,binary]) of
+	{ok, FileDescriptor} ->
+	    file:close(FileDescriptor),
+	    ?DEBUG("send_multi_range_response -> FileDescriptor: ~p",[FileDescriptor]),
+	    Suffix = httpd_util:suffix(Path),
+	    PartMimeType = httpd_util:lookup_mime_default(Info#mod.config_db,Suffix,"text/plain"),
+	    Date = httpd_util:rfc1123_date(),
+	    {FileInfo,LastModified}=get_modification_date(Path),
+	    case valid_ranges(RangeList,Path,FileInfo) of
+		{ValidRanges,true}->
+		    ?DEBUG("send_multi_range_response -> Ranges are valid:",[]),
+		    %Apache breaks the standard by sending the size field in the Header.
+		    Header = [{code,206},
+			      {content_type,"multipart/byteranges;boundary=RangeBoundarySeparator"},
+			      {etag,httpd_util:create_etag(FileInfo)},
+			      {last_modified,LastModified}
+			     ],
+		    ?DEBUG("send_multi_range_response -> Valid Ranges: ~p",[RagneList]),
+		    Body={fun send_multiranges/4,[ValidRanges,Info,PartMimeType,Path]},
+		    {proceed,[{response,{response,Header,Body}}|Info#mod.data]};
+		_ ->
+		    {proceed, [{status, {416,"Range not valid",bad_range_boundaries }}]}
+	    end;
+	{error, Reason} ->
+	    ?ERROR("do_get -> failed open file: ~p",[Reason]),
+	    {proceed,Info#mod.data}
+    end.
+
+send_multiranges(ValidRanges,Info,PartMimeType,Path)->
+    ?DEBUG("send_multiranges -> Start sending the ranges",[]),
+    case file:open(Path, [raw,binary]) of
+	{ok,FileDescriptor} ->
+	    lists:foreach(fun(Range)->
+				  send_multipart_start(Range,Info,PartMimeType,FileDescriptor)
+			  end,ValidRanges),
+	    file:close(FileDescriptor),
+	    %%Sends an end of the multipart
+	    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket,"\r\n--RangeBoundarySeparator--"),
+	    sent;
+	_ ->
+	    close
+    end.
+
+send_multipart_start({{Start,End},{StartByte,EndByte,Size}},Info,PartMimeType,FileDescriptor)when StartByte<Size->
+    PartHeader=["\r\n--RangeBoundarySeparator\r\n","Content-type: ",PartMimeType,"\r\n",
+                "Content-Range:bytes=",integer_to_list(StartByte),"-",integer_to_list(EndByte),"/",
+		integer_to_list(Size),"\r\n\r\n"],
+    send_part_start(Info#mod.socket_type,Info#mod.socket,PartHeader,FileDescriptor,Start,End);
+
+
+send_multipart_start({{Start,End},{StartByte,EndByte,Size}},Info,PartMimeType,FileDescriptor)->
+    PartHeader=["\r\n--RangeBoundarySeparator\r\n","Content-type: ",PartMimeType,"\r\n",
+                "Content-Range:bytes=",integer_to_list(Size-(StartByte-Size)),"-",integer_to_list(EndByte),"/",
+		integer_to_list(Size),"\r\n\r\n"],
+    send_part_start(Info#mod.socket_type,Info#mod.socket,PartHeader,FileDescriptor,Start,End).
+
+send_part_start(SocketType,Socket,PartHeader,FileDescriptor,Start,End)->
+    case httpd_socket:deliver(SocketType,Socket,PartHeader) of
+	ok ->
+	    send_part_start(SocketType,Socket,FileDescriptor,Start,End);
+	_ ->
+	    close
+    end.
+
+send_range_response(Path,Info,Start,Stop,FileInfo,LastModified)->
+    case file:open(Path, [raw,binary]) of
+	{ok, FileDescriptor} ->
+	    file:close(FileDescriptor),
+	    ?DEBUG("send_range_response -> FileDescriptor: ~p",[FileDescriptor]),
+	    Suffix = httpd_util:suffix(Path),
+	    MimeType = httpd_util:lookup_mime_default(Info#mod.config_db,Suffix,"text/plain"),
+	    Date = httpd_util:rfc1123_date(),
+	    Size = get_range_size(Start,Stop,FileInfo),
+	    case valid_range(Start,Stop,FileInfo) of
+		{true,StartByte,EndByte,TotByte}->
+		   Head=[{code,206},{content_type, MimeType},
+			 {last_modified, LastModified},
+			 {etag,httpd_util:create_etag(FileInfo)},
+			 {content_range,["bytes=",integer_to_list(StartByte),"-",
+					 integer_to_list(EndByte),"/",integer_to_list(TotByte)]},
+			 {content_length,Size}],
+		    BodyFunc=fun send_range_body/5,
+		    Arg=[Info#mod.socket_type, Info#mod.socket,Path,Start,Stop],
+		    {proceed,[{response,{response,Head,{BodyFunc,Arg}}}|Info#mod.data]};
+		{false,Reason} ->
+		    {proceed, [{status, {416,Reason,bad_range_boundaries }}]}
+	    end;
+	{error, Reason} ->
+	    ?ERROR("send_range_response -> failed open file: ~p",[Reason]),
+	    {proceed,Info#mod.data}
+    end.
+
+
+send_range_body(SocketType,Socket,Path,Start,End) ->
+    ?DEBUG("mod_range -> send_range_body",[]),
+    case file:open(Path, [raw,binary]) of
+	{ok,FileDescriptor} ->
+	    send_part_start(SocketType,Socket,FileDescriptor,Start,End),
+	    file:close(FileDescriptor);
+	_ ->
+	    close
+    end.
+
+send_part_start(SocketType,Socket,FileDescriptor,Start,End) ->
+    case Start of
+	from_end ->
+	    file:position(FileDescriptor,{eof,End}),
+	    send_body(SocketType,Socket,FileDescriptor);
+	from_start ->
+	    file:position(FileDescriptor,{bof,End}),
+	    send_body(SocketType,Socket,FileDescriptor);
+	Byte when integer(Byte) ->
+	    file:position(FileDescriptor,{bof,Start}),
+	    send_part(SocketType,Socket,FileDescriptor,End)
+    end,
+    sent.
+
+
+%%This function could replace send_body by calling it with Start=0 end =FileSize
+%% But i gues it would be stupid when we look at performance
+send_part(SocketType,Socket,FileDescriptor,End)->
+    case file:position(FileDescriptor,{cur,0}) of
+	{ok,NewPos} ->
+	   if
+	       NewPos > End ->
+		   ok;
+	       true ->
+		   Size=get_file_chunk_size(NewPos,End,?FILE_CHUNK_SIZE),
+		   case file:read(FileDescriptor,Size) of
+		       eof ->
+			   ok;
+		       {error,Reason} ->
+			   ok;
+		       {ok,Binary} ->
+			   case httpd_socket:deliver(SocketType,Socket,Binary) of
+			       socket_closed ->
+				   ?LOG("send_range of body -> socket closed while sending",[]),
+				   socket_close;
+			       _ ->
+				   send_part(SocketType,Socket,FileDescriptor,End)
+			   end
+		   end
+	   end;
+	_->
+	    ok
+    end.
+
+%% validate that the range is in the limits of the file
+valid_ranges(RangeList,Path,FileInfo)->
+    lists:mapfoldl(fun({Start,End},Acc)->
+			case Acc of
+			    true ->
+				case valid_range(Start,End,FileInfo) of
+				    {true,StartB,EndB,Size}->
+					{{{Start,End},{StartB,EndB,Size}},true};
+				    _ ->
+					false
+				end;
+			    _ ->
+				{false,false}
+			end
+		   end,true,RangeList).
+
+
+
+valid_range(from_end,End,FileInfo)->
+    Size=FileInfo#file_info.size,
+    if
+	End < Size ->
+	    {true,(Size+End),Size-1,Size};
+	true ->
+	    false
+    end;
+valid_range(from_start,End,FileInfo)->
+  Size=FileInfo#file_info.size,
+    if
+	End < Size ->
+	    {true,End,Size-1,Size};
+	true ->
+	    false
+    end;
+
+valid_range(Start,End,FileInfo)when Start=<End->
+    case FileInfo#file_info.size of
+	FileSize when Start< FileSize ->
+	    case FileInfo#file_info.size of
+		Size when End<Size ->
+		    {true,Start,End,FileInfo#file_info.size};
+		Size ->
+		    {true,Start,Size-1,Size}
+	    end;
+	_->
+	    {false,"The size of the range is negative"}
+    end;
+
+valid_range(Start,End,FileInfo)->
+    {false,"Range starts out of file boundaries"}.
+%% Find the modification date of the file
+get_modification_date(Path)->
+    case file:read_file_info(Path) of
+	{ok, FileInfo0} ->
+	    {FileInfo0, httpd_util:rfc1123_date(FileInfo0#file_info.mtime)};
+	_ ->
+	    {#file_info{},""}
+    end.
+
+%Calculate the size of the chunk to read
+
+get_file_chunk_size(Position,End,DefaultChunkSize)when (Position+DefaultChunkSize) =< End->
+    DefaultChunkSize;
+get_file_chunk_size(Position,End,DefaultChunkSize)->
+    (End-Position) +1.
+
+
+
+%Get the size of the range to send. Remember that
+%A range is from startbyte up to endbyte which means that
+%the nuber of byte in a range is (StartByte-EndByte)+1
+
+get_range_size(from_end,Stop,FileInfo)->
+    integer_to_list(-1*Stop);
+
+get_range_size(from_start,StartByte,FileInfo) ->
+    integer_to_list((((FileInfo#file_info.size)-StartByte)));
+
+get_range_size(StartByte,EndByte,FileInfo) ->
+    integer_to_list((EndByte-StartByte)+1).
+
+parse_ranges([$\ ,$b,$y,$t,$e,$s,$\=|Ranges])->
+    parse_ranges([$b,$y,$t,$e,$s,$\=|Ranges]);
+parse_ranges([$b,$y,$t,$e,$s,$\=|Ranges])->
+    case string:tokens(Ranges,", ") of
+       [Range] ->
+	   parse_range(Range);
+       [Range1|SplittedRanges]->
+	   {multipart,lists:map(fun parse_range/1,[Range1|SplittedRanges])}
+    end;
+%Bad unit
+parse_ranges(Ranges)->
+    io:format("Bad Ranges : ~p",[Ranges]),
+    error.
+%Parse the range  specification from the request to {Start,End}
+%Start=End : Numreric string | []
+
+parse_range(Range)->
+    format_range(split_range(Range,[],[])).
+format_range({[],BytesFromEnd})->
+    {from_end,-1*(list_to_integer(BytesFromEnd))};
+format_range({StartByte,[]})->
+    {from_start,list_to_integer(StartByte)};
+format_range({StartByte,EndByte})->
+    {list_to_integer(StartByte),list_to_integer(EndByte)}.
+%Last case return the splitted range
+split_range([],Current,Other)->
+    {lists:reverse(Other),lists:reverse(Current)};
+
+split_range([$-|Rest],Current,Other)->
+    split_range(Rest,Other,Current);
+
+split_range([N|Rest],Current,End) ->
+    split_range(Rest,[N|Current],End).
+
+send_body(SocketType,Socket,FileDescriptor) ->
+    case file:read(FileDescriptor,?FILE_CHUNK_SIZE) of
+	{ok,Binary} ->
+	    ?DEBUG("send_body -> send another chunk: ~p",[size(Binary)]),
+	    case httpd_socket:deliver(SocketType,Socket,Binary) of
+		socket_closed ->
+		    ?LOG("send_body -> socket closed while sending",[]),
+		    socket_close;
+		_ ->
+		    send_body(SocketType,Socket,FileDescriptor)
+	    end;
+	eof ->
+	    ?DEBUG("send_body -> done with this file",[]),
+	    eof
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_responsecontrol.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_responsecontrol.erl
new file mode 100644
index 0000000000..b818a15f32
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_responsecontrol.erl
@@ -0,0 +1,320 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_responsecontrol.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+
+-module(mod_responsecontrol).
+-export([do/1]).
+
+-include("httpd.hrl").
+
+
+do(Info) ->
+    ?DEBUG("do -> response_control",[]),
+    case httpd_util:key1search(Info#mod.data,status) of
+	%% A status code has been generated!
+	{StatusCode,PhraseArgs,Reason} ->
+	    {proceed,Info#mod.data};
+	%% No status code has been generated!
+	undefined ->
+	    case httpd_util:key1search(Info#mod.data,response) of
+		%% No response has been generated!
+		undefined ->
+		    case do_responsecontrol(Info) of
+			continue ->
+			    {proceed,Info#mod.data};
+			Response ->
+			    {proceed,[Response|Info#mod.data]}
+		    end;
+		%% A response has been generated or sent!
+		Response ->
+		    {proceed,Info#mod.data}
+	    end
+    end.
+
+
+%%----------------------------------------------------------------------
+%%Control that the request header did not contians any limitations
+%%wheather a response shall be createed or not
+%%----------------------------------------------------------------------
+
+do_responsecontrol(Info) ->
+    ?DEBUG("do_response_control -> Request URI: ~p",[Info#mod.request_uri]),
+    Path = mod_alias:path(Info#mod.data, Info#mod.config_db,
+			  Info#mod.request_uri),
+    case file:read_file_info(Path) of
+	{ok, FileInfo} ->
+	    control(Path,Info,FileInfo);
+	_ ->
+	    %% The requested asset is not a plain file and then it must
+	    %% be generated everytime its requested
+	    continue
+    end.
+
+%%----------------------------------------------------------------------
+%%Control the If-Match, If-None-Match,  and If-Modified-Since
+%%----------------------------------------------------------------------
+
+
+%% If a client sends more then one of the if-XXXX fields in a request
+%% The standard says it does not specify the behaviuor so I specified it :-)
+%% The priority between the fields is
+%% 1.If-modified
+%% 2.If-Unmodified
+%% 3.If-Match
+%% 4.If-Nomatch
+
+%% This means if more than one of the fields are in the request the
+%% field with highest priority will be used
+
+%%If the request is a range request the If-Range field will be the winner.
+
+control(Path,Info,FileInfo)->
+    case control_range(Path,Info,FileInfo) of
+	undefined ->
+	    case control_Etag(Path,Info,FileInfo) of
+		undefined ->
+		    case control_modification(Path,Info,FileInfo) of
+			continue ->
+			    continue;
+			ReturnValue ->
+			    send_return_value(ReturnValue,FileInfo)
+		    end;
+		continue ->
+		    continue;
+		ReturnValue ->
+		    send_return_value(ReturnValue,FileInfo)
+	    end;
+	Response->
+	    Response
+    end.
+
+%%----------------------------------------------------------------------
+%%If there are both a range and an if-range field control if
+%%----------------------------------------------------------------------
+control_range(Path,Info,FileInfo) ->
+    case httpd_util:key1search(Info#mod.parsed_header,"range") of
+	undefined->
+	    undefined;
+	_Range ->
+	    case httpd_util:key1search(Info#mod.parsed_header,"if-range") of
+		undefined ->
+		    undefined;
+		EtagOrDate ->
+		    control_if_range(Path,Info,FileInfo,EtagOrDate)
+	    end
+    end.
+
+control_if_range(Path,Info,FileInfo,EtagOrDate) ->
+    case httpd_util:convert_request_date(strip_date(EtagOrDate)) of
+	bad_date ->
+	    FileEtag=httpd_util:create_etag(FileInfo),
+	    case FileEtag of
+		EtagOrDate ->
+		    continue;
+		_ ->
+		    {if_range,send_file}
+	    end;
+	ErlDate ->
+	    %%We got the date in the request if it is
+	    case control_modification_data(Info,FileInfo#file_info.mtime,"if-range") of
+		modified ->
+		    {if_range,send_file};
+		_UnmodifiedOrUndefined->
+		    continue
+	    end
+    end.
+
+%%----------------------------------------------------------------------
+%%Controls the values of the If-Match and I-None-Mtch
+%%----------------------------------------------------------------------
+control_Etag(Path,Info,FileInfo)->
+    FileEtag=httpd_util:create_etag(FileInfo),
+    %%Control if the E-Tag for the resource  matches one of the Etags in
+    %%the -if-match header field
+    case control_match(Info,FileInfo,"if-match",FileEtag) of
+	nomatch ->
+	    %%None of the Etags in the if-match field matched the current
+	    %%Etag for the resource return a 304
+	    {412,Info,Path};
+	match ->
+	    continue;
+	undefined ->
+	    case control_match(Info,FileInfo,"if-none-match",FileEtag) of
+		nomatch ->
+		    continue;
+		match ->
+		    case  Info#mod.method of
+			"GET" ->
+			    {304,Info,Path};
+			"HEAD" ->
+			    {304,Info,Path};
+			_OtherrequestMethod ->
+			    {412,Info,Path}
+		    end;
+		undefined ->
+		    undefined
+	    end
+    end.
+
+%%----------------------------------------------------------------------
+%%Control if there are any Etags for HeaderField in the request if so
+%%Control if they match the Etag for the requested file
+%%----------------------------------------------------------------------
+control_match(Info,FileInfo,HeaderField,FileEtag)->
+    case split_etags(httpd_util:key1search(Info#mod.parsed_header,HeaderField)) of
+	undefined->
+	    undefined;
+        Etags->
+	    %%Control that the match any star not is availible
+	    case lists:member("*",Etags) of
+		true->
+		    match;
+		false->
+		    compare_etags(FileEtag,Etags)
+	    end
+    end.
+
+%%----------------------------------------------------------------------
+%%Split the etags from the request
+%%----------------------------------------------------------------------
+split_etags(undefined)->
+    undefined;
+split_etags(Tags) ->
+    string:tokens(Tags,", ").
+
+%%----------------------------------------------------------------------
+%%Control if the etag for the file is in the list
+%%----------------------------------------------------------------------
+compare_etags(Tag,Etags) ->
+    case lists:member(Tag,Etags) of
+	true ->
+	    match;
+	_ ->
+	    nomatch
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                   %%
+%%Control if the file is modificated                                 %%
+%%                                                                   %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%----------------------------------------------------------------------
+%%Control the If-Modified-Since and If-Not-Modified-Since header fields
+%%----------------------------------------------------------------------
+control_modification(Path,Info,FileInfo)->
+    ?DEBUG("control_modification() -> entry",[]),
+    case control_modification_data(Info,FileInfo#file_info.mtime,"if-modified-since") of
+	modified->
+	    continue;
+	unmodified->
+	    {304,Info,Path};
+	undefined ->
+	    case control_modification_data(Info,FileInfo#file_info.mtime,"if-unmodified-since") of
+		modified  ->
+		    {412,Info,Path};
+		_ContinueUndefined ->
+		    continue
+	    end
+    end.
+
+%%----------------------------------------------------------------------
+%%Controls the date from the http-request if-modified-since and
+%%if-not-modified-since against the modification data of the
+%%File
+%%----------------------------------------------------------------------
+%%Info is the record about the request
+%%ModificationTime is the time the file was edited last
+%%Header Field is the name of the field  to control
+
+control_modification_data(Info,ModificationTime,HeaderField)->
+    case strip_date(httpd_util:key1search(Info#mod.parsed_header,HeaderField)) of
+	undefined->
+	    undefined;
+	LastModified0 ->
+	    LastModified=httpd_util:convert_request_date(LastModified0),
+	    ?DEBUG("control_modification_data() -> "
+		   "~n   Request-Field:    ~s"
+		   "~n   FileLastModified: ~p"
+		   "~n   FieldValue:       ~p",
+		   [HeaderField,ModificationTime,LastModified]),
+	    case LastModified of
+		bad_date ->
+		    undefined;
+		_ ->
+		    FileTime=calendar:datetime_to_gregorian_seconds(ModificationTime),
+		    FieldTime=calendar:datetime_to_gregorian_seconds(LastModified),
+		    if
+			FileTime=<FieldTime ->
+			    ?DEBUG("File unmodified~n", []),
+			    unmodified;
+			FileTime>=FieldTime ->
+			    ?DEBUG("File modified~n", []),
+			    modified
+		    end
+	    end
+    end.
+
+%%----------------------------------------------------------------------
+%%Compare to dates on the form {{YYYY,MM,DD},{HH,MIN,SS}}
+%%If the first date is the biggest returns biggest1 (read biggestFirst)
+%%If the first date is smaller
+% compare_date(Date,bad_date)->
+%     bad_date;
+
+% compare_date({D1,T1},{D2,T2})->
+%     case compare_date1(D1,D2) of
+%       	equal ->
+% 	    compare_date1(T1,T2);
+% 	GTorLT->
+% 	    GTorLT
+%     end.
+
+% compare_date1({T1,T2,T3},{T12,T22,T32}) when T1>T12 ->
+%     bigger1;
+% compare_date1({T1,T2,T3},{T1,T22,T32}) when T2>T22 ->
+%     bigger1;
+% compare_date1({T1,T2,T3},{T1,T2,T32}) when T3>T32 ->
+%     bigger1;
+% compare_date1({T1,T2,T3},{T1,T2,T3})->
+%     equal;
+% compare_date1(_D1,_D2)->
+%     smaller1.
+
+
+%% IE4 & NS4 sends an extra '; length=xxxx' string at the end of the If-Modified-Since
+%% header, we detect this and ignore it (the RFCs does not mention this).
+strip_date(undefined) ->
+    undefined;
+strip_date([]) ->
+    [];
+strip_date([$;,$ |Rest]) ->
+    [];
+strip_date([C|Rest]) ->
+    [C|strip_date(Rest)].
+
+send_return_value({412,_,_},FileInfo)->
+    {status,{412,none,"Precondition Failed"}};
+
+send_return_value({304,Info,Path},FileInfo)->
+    Suffix=httpd_util:suffix(Path),
+    MimeType = httpd_util:lookup_mime_default(Info#mod.config_db,Suffix,"text/plain"),
+    Header = [{code,304},
+	      {etag,httpd_util:create_etag(FileInfo)},
+	      {content_length,0},
+	      {last_modified,httpd_util:rfc1123_date(FileInfo#file_info.mtime)}],
+    {response,{response,Header,nobody}}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_security.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_security.erl
new file mode 100644
index 0000000000..b4d52d1599
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_security.erl
@@ -0,0 +1,307 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_security.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
+%%
+-module(mod_security).
+
+%% Security Audit Functionality
+
+%% User API exports
+-export([list_blocked_users/1, list_blocked_users/2, list_blocked_users/3,
+	 block_user/4, block_user/5,
+	 unblock_user/2, unblock_user/3, unblock_user/4,
+	 list_auth_users/1, list_auth_users/2, list_auth_users/3]).
+
+%% module API exports
+-export([do/1, load/2, store/2, remove/1]).
+
+-include("httpd.hrl").
+
+-define(VMODULE,"SEC").
+-include("httpd_verbosity.hrl").
+
+
+%% do/1
+do(Info) ->
+    ?vdebug("~n   do with ~n   Info: ~p",[Info]),
+    %% Check and see if any user has been authorized.
+    case httpd_util:key1search(Info#mod.data,remote_user,not_defined_user) of
+	not_defined_user ->
+	    %% No user has been authorized.
+	    case httpd_util:key1search(Info#mod.data, status) of
+		%% A status code has been generated!
+		{401, PhraseArgs, Reason} ->
+		    case httpd_util:key1search(Info#mod.parsed_header,
+					       "authorization") of
+			undefined ->
+			    %% Not an authorization attempt (server just replied to
+			    %% challenge for authentication)
+			    {proceed, Info#mod.data};
+			[$B,$a,$s,$i,$c,$ |EncodedString] ->
+			    %% Someone tried to authenticate, and obviously failed!
+			    ?vlog("~n   Authentication failed: ~s",
+				  [EncodedString]),
+			    report_failed(Info, EncodedString,"Failed authentication"),
+			    take_failed_action(Info, EncodedString),
+			    {proceed, Info#mod.data}
+		    end;
+		_ ->
+		    {proceed, Info#mod.data}
+	    end;
+	User ->
+	    %% A user has been authenticated, now is he blocked ?
+	    ?vtrace("user '~p' authentication",[User]),
+	    Path = mod_alias:path(Info#mod.data,
+				  Info#mod.config_db,
+				  Info#mod.request_uri),
+	    {Dir, SDirData} = secretp(Path, Info#mod.config_db),
+	    Addr = httpd_util:lookup(Info#mod.config_db, bind_address),
+	    Port = httpd_util:lookup(Info#mod.config_db, port),
+	    DF   = httpd_util:key1search(SDirData, data_file),
+	    case mod_security_server:check_blocked_user(Info, User,
+							SDirData,
+							Addr, Port) of
+		true ->
+		    ?vtrace("user blocked",[]),
+		    report_failed(Info,httpd_util:decode_base64(User) ,"User Blocked"),
+		    {proceed, [{status, {403, Info#mod.request_uri, ""}}|Info#mod.data]};
+		false ->
+		    ?vtrace("user not blocked",[]),
+		    EncodedUser=httpd_util:decode_base64(User),
+		    report_failed(Info, EncodedUser,"Authentication Succedded"),
+		    mod_security_server:store_successful_auth(Addr, Port,
+							      User, SDirData),
+		    {proceed, Info#mod.data}
+	    end
+    end.
+
+
+
+report_failed(Info, EncodedString,Event) ->
+    Request = Info#mod.request_line,
+    Decoded = httpd_util:decode_base64(EncodedString),
+    {PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
+    String = RemoteHost++" : " ++ Event ++ " : "++Request++" : "++Decoded,
+    mod_disk_log:security_log(Info,String),
+    mod_log:security_log(Info, String).
+
+take_failed_action(Info, EncodedString) ->
+    Path = mod_alias:path(Info#mod.data,Info#mod.config_db, Info#mod.request_uri),
+    {Dir, SDirData} = secretp(Path, Info#mod.config_db),
+    Addr = httpd_util:lookup(Info#mod.config_db, bind_address),
+    Port = httpd_util:lookup(Info#mod.config_db, port),
+    DecodedString = httpd_util:decode_base64(EncodedString),
+    mod_security_server:store_failed_auth(Info, Addr, Port,
+					  DecodedString, SDirData).
+
+secretp(Path, ConfigDB) ->
+    Directories = ets:match(ConfigDB,{directory,'$1','_'}),
+    case secret_path(Path, Directories) of
+	{yes, Directory} ->
+	    SDirs0 = httpd_util:multi_lookup(ConfigDB, security_directory),
+	    SDir = lists:filter(fun(X) ->
+					lists:member({path, Directory}, X)
+				end, SDirs0),
+	    {Directory, lists:flatten(SDir)};
+	no ->
+	    error_report({internal_error_secretp, ?MODULE}),
+	    {[], []}
+    end.
+
+secret_path(Path,Directories) ->
+    secret_path(Path, httpd_util:uniq(lists:sort(Directories)), to_be_found).
+
+secret_path(Path, [], to_be_found) ->
+    no;
+secret_path(Path, [], Directory) ->
+    {yes, Directory};
+secret_path(Path, [[NewDirectory]|Rest], Directory) ->
+    case regexp:match(Path, NewDirectory) of
+	{match, _, _} when Directory == to_be_found ->
+	    secret_path(Path, Rest, NewDirectory);
+	{match, _, Length} when Length > length(Directory)->
+	    secret_path(Path, Rest, NewDirectory);
+	{match, _, Length} ->
+	    secret_path(Path, Rest, Directory);
+	nomatch ->
+	    secret_path(Path, Rest, Directory)
+    end.
+
+
+load([$<,$D,$i,$r,$e,$c,$t,$o,$r,$y,$ |Directory],[]) ->
+    Dir = httpd_conf:custom_clean(Directory,"",">"),
+    {ok, [{security_directory, Dir, [{path, Dir}]}]};
+load(eof,[{security_directory,Directory, DirData}|_]) ->
+    {error, ?NICE("Premature end-of-file in "++Directory)};
+load([$S,$e,$c,$u,$r,$i,$t,$y,$D,$a,$t,$a,$F,$i,$l,$e,$ |FileName],
+     [{security_directory, Dir, DirData}]) ->
+    File = httpd_conf:clean(FileName),
+    {ok, [{security_directory, Dir, [{data_file, File}|DirData]}]};
+load([$S,$e,$c,$u,$r,$i,$t,$y,$C,$a,$l,$l,$b,$a,$c,$k,$M,$o,$d,$u,$l,$e,$ |ModuleName],
+     [{security_directory, Dir, DirData}]) ->
+    Mod = list_to_atom(httpd_conf:clean(ModuleName)),
+    {ok, [{security_directory, Dir, [{callback_module, Mod}|DirData]}]};
+load([$S,$e,$c,$u,$r,$i,$t,$y,$M,$a,$x,$R,$e,$t,$r,$i,$e,$s,$ |Retries],
+     [{security_directory, Dir, DirData}]) ->
+    MaxRetries = httpd_conf:clean(Retries),
+    load_return_int_tag("SecurityMaxRetries", max_retries,
+			httpd_conf:clean(Retries), Dir, DirData);
+load([$S,$e,$c,$u,$r,$i,$t,$y,$B,$l,$o,$c,$k,$T,$i,$m,$e,$ |Time],
+     [{security_directory, Dir, DirData}]) ->
+    load_return_int_tag("SecurityBlockTime", block_time,
+			httpd_conf:clean(Time), Dir, DirData);
+load([$S,$e,$c,$u,$r,$i,$t,$y,$F,$a,$i,$l,$E,$x,$p,$i,$r,$e,$T,$i,$m,$e,$ |Time],
+     [{security_directory, Dir, DirData}]) ->
+    load_return_int_tag("SecurityFailExpireTime", fail_expire_time,
+			httpd_conf:clean(Time), Dir, DirData);
+load([$S,$e,$c,$u,$r,$i,$t,$y,$A,$u,$t,$h,$T,$i,$m,$e,$o,$u,$t,$ |Time0],
+     [{security_directory, Dir, DirData}]) ->
+    Time = httpd_conf:clean(Time0),
+    load_return_int_tag("SecurityAuthTimeout", auth_timeout,
+			httpd_conf:clean(Time), Dir, DirData);
+load([$A,$u,$t,$h,$N,$a,$m,$e,$ |Name0],
+     [{security_directory, Dir, DirData}]) ->
+    Name = httpd_conf:clean(Name0),
+    {ok, [{security_directory, Dir, [{auth_name, Name}|DirData]}]};
+load("</Directory>",[{security_directory,Directory, DirData}]) ->
+    {ok, [], {security_directory, Directory, DirData}}.
+
+load_return_int_tag(Name, Atom, Time, Dir, DirData) ->
+    case Time of
+	"infinity" ->
+	    {ok, [{security_directory, Dir, [{Atom, 99999999999999999999999999999}|DirData]}]};
+	Int ->
+	    case catch list_to_integer(Time) of
+		{'EXIT', _} ->
+		    {error, Time++" is an invalid "++Name};
+		Val ->
+		    {ok, [{security_directory, Dir, [{Atom, Val}|DirData]}]}
+	    end
+    end.
+
+store({security_directory, Dir0, DirData}, ConfigList) ->
+    ?CDEBUG("store(security_directory) -> ~n"
+	    "      Dir0:       ~p~n"
+	    "      DirData:    ~p",
+	    [Dir0, DirData]),
+    Addr = httpd_util:key1search(ConfigList, bind_address),
+    Port = httpd_util:key1search(ConfigList, port),
+    mod_security_server:start(Addr, Port),
+    SR = httpd_util:key1search(ConfigList, server_root),
+    Dir =
+	case filename:pathtype(Dir0) of
+	    relative ->
+		filename:join(SR, Dir0);
+	    _ ->
+		Dir0
+	end,
+    case httpd_util:key1search(DirData, data_file, no_data_file) of
+	no_data_file ->
+	    {error, no_security_data_file};
+	DataFile0 ->
+	    DataFile =
+		case filename:pathtype(DataFile0) of
+		    relative ->
+			filename:join(SR, DataFile0);
+		    _ ->
+			DataFile0
+		end,
+	    case mod_security_server:new_table(Addr, Port, DataFile) of
+		{ok, TwoTables} ->
+		    NewDirData0 = lists:keyreplace(data_file, 1, DirData,
+						   {data_file, TwoTables}),
+		    NewDirData1 = case Addr of
+				      undefined ->
+					  [{port,Port}|NewDirData0];
+				      _ ->
+					  [{port,Port},{bind_address,Addr}|
+					   NewDirData0]
+				  end,
+		    {ok, {security_directory,NewDirData1}};
+		{error, Err} ->
+		    {error, {{open_data_file, DataFile}, Err}}
+	    end
+    end.
+
+
+remove(ConfigDB) ->
+    Addr = case ets:lookup(ConfigDB, bind_address) of
+	       [] ->
+		   undefined;
+	       [{bind_address, Address}] ->
+		   Address
+	   end,
+    [{port, Port}] = ets:lookup(ConfigDB, port),
+    mod_security_server:delete_tables(Addr, Port),
+    mod_security_server:stop(Addr, Port).
+
+
+%%
+%% User API
+%%
+
+%% list_blocked_users
+
+list_blocked_users(Port) ->
+    list_blocked_users(undefined, Port).
+
+list_blocked_users(Port, Dir) when integer(Port) ->
+    list_blocked_users(undefined,Port,Dir);
+list_blocked_users(Addr, Port) when integer(Port) ->
+    mod_security_server:list_blocked_users(Addr, Port).
+
+list_blocked_users(Addr, Port, Dir) ->
+    mod_security_server:list_blocked_users(Addr, Port, Dir).
+
+
+%% block_user
+
+block_user(User, Port, Dir, Time) ->
+    block_user(User, undefined, Port, Dir, Time).
+block_user(User, Addr, Port, Dir, Time) ->
+    mod_security_server:block_user(User, Addr, Port, Dir, Time).
+
+
+%% unblock_user
+
+unblock_user(User, Port) ->
+    unblock_user(User, undefined, Port).
+
+unblock_user(User, Port, Dir) when integer(Port) ->
+    unblock_user(User, undefined, Port, Dir);
+unblock_user(User, Addr, Port) when integer(Port) ->
+    mod_security_server:unblock_user(User, Addr, Port).
+
+unblock_user(User, Addr, Port, Dir) ->
+    mod_security_server:unblock_user(User, Addr, Port, Dir).
+
+
+%% list_auth_users
+
+list_auth_users(Port) ->
+    list_auth_users(undefined,Port).
+
+list_auth_users(Port, Dir) when integer(Port) ->
+    list_auth_users(undefined, Port, Dir);
+list_auth_users(Addr, Port) when integer(Port) ->
+    mod_security_server:list_auth_users(Addr, Port).
+
+list_auth_users(Addr, Port, Dir) ->
+    mod_security_server:list_auth_users(Addr, Port, Dir).
+
+
+error_report(M) ->
+    error_logger:error_report(M).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_security_server.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_security_server.erl
new file mode 100644
index 0000000000..81156c24e8
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_security_server.erl
@@ -0,0 +1,727 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_security_server.erl,v 1.1 2008/12/17 09:53:36 mikpe Exp $
+%%
+%% Security Audit Functionality
+
+%%
+%% The gen_server code.
+%%
+%% A gen_server is needed in this module to take care of shared access to the
+%% data file used to store failed and successful authentications aswell as
+%% user blocks.
+%%
+%% The storage model is a write-through model with both an ets and a dets
+%% table. Writes are done to both the ets and then the dets table, but reads
+%% are only done from the ets table.
+%%
+%% This approach also enables parallelism when using dets by returning the
+%% same dets table identifier when opening several files with the same
+%% physical location.
+%%
+%% NOTE: This could be implemented using a single dets table, as it is
+%%       possible to open a dets file with the ram_file flag, but this
+%%       would require periodical sync's to disk, and it would be hard
+%%       to decide when such an operation should occur.
+%%
+
+
+-module(mod_security_server).
+
+-include("httpd.hrl").
+-include("httpd_verbosity.hrl").
+
+
+-behaviour(gen_server).
+
+
+%% User API exports (called via mod_security)
+-export([list_blocked_users/2, list_blocked_users/3,
+	 block_user/5,
+	 unblock_user/3, unblock_user/4,
+	 list_auth_users/2, list_auth_users/3]).
+
+%% Internal exports (for mod_security only)
+-export([start/2, stop/1, stop/2,
+	 new_table/3, delete_tables/2,
+	 store_failed_auth/5, store_successful_auth/4,
+	 check_blocked_user/5]).
+
+%% gen_server exports
+-export([start_link/3,
+	 init/1,
+	 handle_info/2, handle_call/3, handle_cast/2,
+	 terminate/2,
+	 code_change/3]).
+
+-export([verbosity/3]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%% External API                                                     %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% start_link/3
+%%
+%% NOTE: This is called by httpd_misc_sup when the process is started
+%%
+
+start_link(Addr, Port, Verbosity) ->
+    ?vtrace("start_link -> entry with"
+	    "~n   Addr: ~p"
+	    "~n   Port: ~p", [Addr, Port]),
+    Name = make_name(Addr, Port),
+    gen_server:start_link({local, Name}, ?MODULE, [Verbosity],
+			  [{timeout, infinity}]).
+
+
+%% start/2
+%% Called  by the mod_security module.
+
+start(Addr, Port) ->
+    Name = make_name(Addr, Port),
+    case whereis(Name) of
+	undefined ->
+	    Verbosity = get(security_verbosity),
+	    case httpd_misc_sup:start_sec_server(Addr, Port, Verbosity) of
+		{ok, Pid} ->
+		    put(security_server, Pid),
+		    ok;
+		Error ->
+		    exit({failed_start_security_server, Error})
+	    end;
+	_ -> %% Already started...
+	    ok
+    end.
+
+
+%% stop
+
+stop(Port) ->
+    stop(undefined, Port).
+stop(Addr, Port) ->
+    Name = make_name(Addr, Port),
+    case whereis(Name) of
+	undefined ->
+	    ok;
+	_ ->
+	    httpd_misc_sup:stop_sec_server(Addr, Port)
+    end.
+
+
+%% verbosity
+
+verbosity(Addr, Port, Verbosity) ->
+    Name = make_name(Addr, Port),
+    Req  = {verbosity, Verbosity},
+    call(Name, Req).
+
+
+%% list_blocked_users
+
+list_blocked_users(Addr, Port) ->
+    Name = make_name(Addr,Port),
+    Req  = {list_blocked_users, Addr, Port, '_'},
+    call(Name, Req).
+
+list_blocked_users(Addr, Port, Dir) ->
+    Name = make_name(Addr, Port),
+    Req  = {list_blocked_users, Addr, Port, Dir},
+    call(Name, Req).
+
+
+%% block_user
+
+block_user(User, Addr, Port, Dir, Time) ->
+    Name = make_name(Addr, Port),
+    Req  = {block_user, User, Addr, Port, Dir, Time},
+    call(Name, Req).
+
+
+%% unblock_user
+
+unblock_user(User, Addr, Port) ->
+    Name = make_name(Addr, Port),
+    Req  = {unblock_user, User, Addr, Port, '_'},
+    call(Name, Req).
+
+unblock_user(User, Addr, Port, Dir) ->
+    Name = make_name(Addr, Port),
+    Req  = {unblock_user, User, Addr, Port, Dir},
+    call(Name, Req).
+
+
+%% list_auth_users
+
+list_auth_users(Addr, Port) ->
+    Name = make_name(Addr, Port),
+    Req  = {list_auth_users, Addr, Port, '_'},
+    call(Name, Req).
+
+list_auth_users(Addr, Port, Dir) ->
+    Name = make_name(Addr,Port),
+    Req  = {list_auth_users, Addr, Port, Dir},
+    call(Name, Req).
+
+
+%% new_table
+
+new_table(Addr, Port, TabName) ->
+    Name = make_name(Addr,Port),
+    Req  = {new_table, Addr, Port, TabName},
+    call(Name, Req).
+
+
+%% delete_tables
+
+delete_tables(Addr, Port) ->
+    Name = make_name(Addr, Port),
+    case whereis(Name) of
+	undefined ->
+	    ok;
+	_ ->
+	    call(Name, delete_tables)
+    end.
+
+
+%% store_failed_auth
+
+store_failed_auth(Info, Addr, Port, DecodedString, SDirData) ->
+    Name = make_name(Addr,Port),
+    Msg  = {store_failed_auth,[Info,DecodedString,SDirData]},
+    cast(Name, Msg).
+
+
+%% store_successful_auth
+
+store_successful_auth(Addr, Port, User, SDirData) ->
+    Name = make_name(Addr,Port),
+    Msg  = {store_successful_auth, [User,Addr,Port,SDirData]},
+    cast(Name, Msg).
+
+
+%% check_blocked_user
+
+check_blocked_user(Info, User, SDirData, Addr, Port) ->
+    Name = make_name(Addr, Port),
+    Req  = {check_blocked_user, [Info, User, SDirData]},
+    call(Name, Req).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                  %%
+%% Server call-back functions                                       %%
+%%                                                                  %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% init
+
+init([undefined]) ->
+    init([?default_verbosity]);
+init([Verbosity]) ->
+    ?DEBUG("init -> entry with Verbosity: ~p",[Verbosity]),
+    process_flag(trap_exit, true),
+    put(sname, sec),
+    put(verbosity, Verbosity),
+    ?vlog("starting",[]),
+    {ok, []}.
+
+
+%% handle_call
+
+handle_call(stop, _From, Tables) ->
+    ?vlog("stop",[]),
+    {stop, normal, ok, []};
+
+
+handle_call({verbosity,Verbosity}, _From, Tables) ->
+    ?vlog("set verbosity to ~p",[Verbosity]),
+    OldVerbosity = get(verbosity),
+    put(verbosity,Verbosity),
+    ?vdebug("old verbosity: ~p",[OldVerbosity]),
+    {reply,OldVerbosity,Tables};
+
+
+handle_call({block_user, User, Addr, Port, Dir, Time}, _From, Tables) ->
+    ?vlog("block user '~p' for ~p",[User,Dir]),
+    Ret = block_user_int({User, Addr, Port, Dir, Time}),
+    ?vdebug("block user result: ~p",[Ret]),
+    {reply, Ret, Tables};
+
+
+handle_call({list_blocked_users, Addr, Port, Dir}, _From, Tables) ->
+    ?vlog("list blocked users for ~p",[Dir]),
+    Blocked = list_blocked(Tables, Addr, Port, Dir, []),
+    ?vdebug("list blocked users: ~p",[Blocked]),
+    {reply, Blocked, Tables};
+
+
+handle_call({unblock_user, User, Addr, Port, Dir}, _From, Tables) ->
+    ?vlog("unblock user '~p' for ~p",[User,Dir]),
+    Ret = unblock_user_int({User, Addr, Port, Dir}),
+    ?vdebug("unblock user result: ~p",[Ret]),
+    {reply, Ret, Tables};
+
+
+handle_call({list_auth_users, Addr, Port, Dir}, _From, Tables) ->
+    ?vlog("list auth users for ~p",[Dir]),
+    Auth = list_auth(Tables, Addr, Port, Dir, []),
+    ?vdebug("list auth users result: ~p",[Auth]),
+    {reply, Auth, Tables};
+
+
+handle_call({new_table, Addr, Port, Name}, _From, Tables) ->
+    case lists:keysearch(Name, 1, Tables) of
+	{value, {Name, {Ets, Dets}}} ->
+	    ?DEBUG("handle_call(new_table) -> we already have this table: ~p",
+		   [Name]),
+	    ?vdebug("new table; we already have this one: ~p",[Name]),
+	    {reply, {ok, {Ets, Dets}}, Tables};
+	false ->
+	    ?LOG("handle_call(new_table) -> new_table: Name = ~p",[Name]),
+	    ?vlog("new table: ~p",[Name]),
+	    TName = make_name(Addr,Port,length(Tables)),
+	    ?DEBUG("handle_call(new_table) -> TName: ~p",[TName]),
+	    ?vdebug("new table: ~p",[TName]),
+	    case dets:open_file(TName, [{type, bag}, {file, Name},
+					{repair, true},
+					{access, read_write}]) of
+		{ok, DFile} ->
+		    ETS = ets:new(TName, [bag, private]),
+		    sync_dets_to_ets(DFile, ETS),
+		    NewTables = [{Name, {ETS, DFile}}|Tables],
+		    ?DEBUG("handle_call(new_table) -> ~n"
+			   "       NewTables: ~p",[NewTables]),
+		    ?vtrace("new tables: ~p",[NewTables]),
+		    {reply, {ok, {ETS, DFile}}, NewTables};
+		{error, Err} ->
+		    ?LOG("handle_call -> Err: ~p",[Err]),
+		    ?vinfo("failed open dets file: ~p",[Err]),
+		    {reply, {error, {create_dets, Err}}, Tables}
+	    end
+    end;
+
+handle_call(delete_tables, _From, Tables) ->
+    ?vlog("delete tables",[]),
+    lists:foreach(fun({Name, {ETS, DETS}}) ->
+			  dets:close(DETS),
+			  ets:delete(ETS)
+		  end, Tables),
+    {reply, ok, []};
+
+handle_call({check_blocked_user, [Info, User, SDirData]}, _From, Tables) ->
+    ?vlog("check blocked user '~p'",[User]),
+    {ETS, DETS} = httpd_util:key1search(SDirData, data_file),
+    Dir = httpd_util:key1search(SDirData, path),
+    Addr = httpd_util:key1search(SDirData, bind_address),
+    Port = httpd_util:key1search(SDirData, port),
+    CBModule = httpd_util:key1search(SDirData, callback_module, no_module_at_all),
+    ?vdebug("call back module: ~p",[CBModule]),
+    Ret = check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule),
+    ?vdebug("check result: ~p",[Ret]),
+    {reply, Ret, Tables};
+handle_call(Request,From,Tables) ->
+    ?vinfo("~n   unknown call '~p' from ~p",[Request,From]),
+    {reply,ok,Tables}.
+
+
+%% handle_cast
+
+handle_cast({store_failed_auth, [Info, DecodedString, SDirData]}, Tables) ->
+    ?vlog("store failed auth",[]),
+    {ETS, DETS} = httpd_util:key1search(SDirData, data_file),
+    Dir  = httpd_util:key1search(SDirData, path),
+    Addr = httpd_util:key1search(SDirData, bind_address),
+    Port = httpd_util:key1search(SDirData, port),
+    {ok, [User,Password]} = httpd_util:split(DecodedString,":",2),
+    ?vdebug("user '~p' and password '~p'",[User,Password]),
+    Seconds = universal_time(),
+    Key = {User, Dir, Addr, Port},
+
+    %% Event
+    CBModule = httpd_util:key1search(SDirData, callback_module, no_module_at_all),
+    ?vtrace("call back module: ~p",[CBModule]),
+    auth_fail_event(CBModule,Addr,Port,Dir,User,Password),
+
+    %% Find out if any of this user's other failed logins are too old to keep..
+    ?vtrace("remove old login failures",[]),
+    case ets:match_object(ETS, {failed, {Key, '_', '_'}}) of
+	[] ->
+	    ?vtrace("no old login failures",[]),
+	    no;
+	List when list(List) ->
+	    ?vtrace("~p old login failures",[length(List)]),
+	    ExpireTime = httpd_util:key1search(SDirData, fail_expire_time, 30)*60,
+	    ?vtrace("expire time ~p",[ExpireTime]),
+	    lists:map(fun({failed, {TheKey, LS, Gen}}) ->
+			      Diff = Seconds-LS,
+			      if
+				  Diff > ExpireTime ->
+				      ?vtrace("~n   '~p' is to old to keep: ~p",
+					      [TheKey,Gen]),
+				      ets:match_delete(ETS, {failed, {TheKey, LS, Gen}}),
+				      dets:match_delete(DETS, {failed, {TheKey, LS, Gen}});
+				  true ->
+				      ?vtrace("~n   '~p' is not old enough: ~p",
+					      [TheKey,Gen]),
+				      ok
+			      end
+		      end,
+		      List);
+	O ->
+	    ?vlog("~n   unknown login failure search resuylt: ~p",[O]),
+	    no
+    end,
+
+    %% Insert the new failure..
+    Generation = length(ets:match_object(ETS, {failed, {Key, '_', '_'}})),
+    ?vtrace("insert ('~p') new login failure: ~p",[Key,Generation]),
+    ets:insert(ETS, {failed, {Key, Seconds, Generation}}),
+    dets:insert(DETS, {failed, {Key, Seconds, Generation}}),
+
+    %% See if we should block this user..
+    MaxRetries = httpd_util:key1search(SDirData, max_retries, 3),
+    BlockTime = httpd_util:key1search(SDirData, block_time, 60),
+    ?vtrace("~n   Max retries ~p, block time ~p",[MaxRetries,BlockTime]),
+    case ets:match_object(ETS, {failed, {Key, '_', '_'}}) of
+	List1 ->
+	    ?vtrace("~n   ~p tries so far",[length(List1)]),
+	    if
+		length(List1) >= MaxRetries ->
+		    %% Block this user until Future
+		    ?vtrace("block user '~p'",[User]),
+		    Future = Seconds+BlockTime*60,
+		    ?vtrace("future: ~p",[Future]),
+		    Reason = io_lib:format("Blocking user ~s from dir ~s "
+					   "for ~p minutes",
+					   [User, Dir, BlockTime]),
+		    mod_log:security_log(Info, lists:flatten(Reason)),
+
+		    %% Event
+		    user_block_event(CBModule,Addr,Port,Dir,User),
+
+		    ets:match_delete(ETS,{blocked_user,
+					  {User, Addr, Port, Dir, '$1'}}),
+		    dets:match_delete(DETS, {blocked_user,
+					     {User, Addr, Port, Dir, '$1'}}),
+		    BlockRecord = {blocked_user,
+				   {User, Addr, Port, Dir, Future}},
+		    ets:insert(ETS, BlockRecord),
+		    dets:insert(DETS, BlockRecord),
+		    %% Remove previous failed requests.
+		    ets:match_delete(ETS, {failed, {Key, '_', '_'}}),
+		    dets:match_delete(DETS, {failed, {Key, '_', '_'}});
+		true ->
+		    ?vtrace("still some tries to go",[]),
+		    no
+	    end;
+	Other ->
+	    no
+    end,
+    {noreply, Tables};
+
+handle_cast({store_successful_auth, [User, Addr, Port, SDirData]}, Tables) ->
+    ?vlog("store successfull auth",[]),
+    {ETS, DETS} = httpd_util:key1search(SDirData, data_file),
+    AuthTimeOut = httpd_util:key1search(SDirData, auth_timeout, 30),
+    Dir = httpd_util:key1search(SDirData, path),
+    Key = {User, Dir, Addr, Port},
+
+    %% Remove failed entries for this Key
+    dets:match_delete(DETS, {failed, {Key, '_', '_'}}),
+    ets:match_delete(ETS, {failed, {Key, '_', '_'}}),
+
+    %% Keep track of when the last successful login took place.
+    Seconds = universal_time()+AuthTimeOut,
+    ets:match_delete(ETS, {success, {Key, '_'}}),
+    dets:match_delete(DETS, {success, {Key, '_'}}),
+    ets:insert(ETS, {success, {Key, Seconds}}),
+    dets:insert(DETS, {success, {Key, Seconds}}),
+    {noreply, Tables};
+
+handle_cast(Req, Tables) ->
+    ?vinfo("~n   unknown cast '~p'",[Req]),
+    error_msg("security server got unknown cast: ~p",[Req]),
+    {noreply, Tables}.
+
+
+%% handle_info
+
+handle_info(Info, State) ->
+    ?vinfo("~n   unknown info '~p'",[Info]),
+    {noreply, State}.
+
+
+%% terminate
+
+terminate(Reason, _Tables) ->
+    ?vlog("~n   Terminating for reason: ~p",[Reason]),
+    ok.
+
+
+%% code_change({down, ToVsn}, State, Extra)
+%%
+code_change({down, _}, State, _Extra) ->
+    ?vlog("downgrade", []),
+    {ok, State};
+
+
+%% code_change(FromVsn, State, Extra)
+%%
+code_change(_, State, Extra) ->
+    ?vlog("upgrade", []),
+    {ok, State}.
+
+
+
+
+%% block_user_int/2
+block_user_int({User, Addr, Port, Dir, Time}) ->
+    Dirs = httpd_manager:config_match(Addr, Port, {security_directory, '_'}),
+    ?vtrace("block '~p' for ~p during ~p",[User,Dir,Time]),
+    case find_dirdata(Dirs, Dir) of
+	{ok, DirData, {ETS, DETS}} ->
+	    Time1 =
+		case Time of
+		    infinity ->
+			99999999999999999999999999999;
+		    _ ->
+			Time
+		end,
+	    Future = universal_time()+Time1,
+	    ets:match_delete(ETS, {blocked_user, {User,Addr,Port,Dir,'_'}}),
+	    dets:match_delete(DETS, {blocked_user, {User,Addr,Port,Dir,'_'}}),
+	    ets:insert(ETS, {blocked_user, {User,Addr,Port,Dir,Future}}),
+	    dets:insert(DETS, {blocked_user, {User,Addr,Port,Dir,Future}}),
+	    CBModule = httpd_util:key1search(DirData, callback_module,
+					     no_module_at_all),
+	    ?vtrace("call back module ~p",[CBModule]),
+	    user_block_event(CBModule,Addr,Port,Dir,User),
+	    true;
+	_ ->
+	    {error, no_such_directory}
+    end.
+
+
+find_dirdata([], _Dir) ->
+    false;
+find_dirdata([{security_directory, DirData}|SDirs], Dir) ->
+    case lists:keysearch(path, 1, DirData) of
+	{value, {path, Dir}} ->
+	    {value, {data_file, {ETS, DETS}}} =
+		lists:keysearch(data_file, 1, DirData),
+	    {ok, DirData, {ETS, DETS}};
+	_ ->
+	    find_dirdata(SDirs, Dir)
+    end.
+
+%% unblock_user_int/2
+
+unblock_user_int({User, Addr, Port, Dir}) ->
+    ?vtrace("unblock user '~p' for ~p",[User,Dir]),
+    Dirs = httpd_manager:config_match(Addr, Port, {security_directory, '_'}),
+    ?vtrace("~n   dirs: ~p",[Dirs]),
+    case find_dirdata(Dirs, Dir) of
+	{ok, DirData, {ETS, DETS}} ->
+	    case ets:match_object(ETS,{blocked_user,{User,Addr,Port,Dir,'_'}}) of
+		[] ->
+		    ?vtrace("not blocked",[]),
+		    {error, not_blocked};
+		Objects ->
+		    ets:match_delete(ETS, {blocked_user,
+					   {User, Addr, Port, Dir, '_'}}),
+		    dets:match_delete(DETS, {blocked_user,
+					     {User, Addr, Port, Dir, '_'}}),
+		    CBModule = httpd_util:key1search(DirData, callback_module,
+						     no_module_at_all),
+		    user_unblock_event(CBModule,Addr,Port,Dir,User),
+		    true
+	    end;
+	_ ->
+	    ?vlog("~n   cannot unblock: no such directory '~p'",[Dir]),
+	    {error, no_such_directory}
+    end.
+
+
+
+%% list_auth/2
+
+list_auth([], _Addr, _Port, Dir, Acc) ->
+    Acc;
+list_auth([{Name, {ETS, DETS}}|Tables], Addr, Port, Dir, Acc) ->
+    case ets:match_object(ETS, {success, {{'_', Dir, Addr, Port}, '_'}}) of
+	[] ->
+	    list_auth(Tables, Addr, Port, Dir, Acc);
+	List when list(List) ->
+	    TN = universal_time(),
+	    NewAcc = lists:foldr(fun({success,{{U,Ad,P,D},T}},Ac) ->
+					 if
+					     T-TN > 0 ->
+						 [U|Ac];
+					     true ->
+						 Rec = {success,{{U,Ad,P,D},T}},
+						 ets:match_delete(ETS,Rec),
+						 dets:match_delete(DETS,Rec),
+						 Ac
+					 end
+				 end,
+				 Acc, List),
+	    list_auth(Tables, Addr, Port, Dir, NewAcc);
+	_ ->
+	    list_auth(Tables, Addr, Port, Dir, Acc)
+    end.
+
+
+%% list_blocked/2
+
+list_blocked([], Addr, Port, Dir, Acc) ->
+    TN = universal_time(),
+    lists:foldl(fun({U,Ad,P,D,T}, Ac) ->
+			if
+			    T-TN > 0 ->
+				[{U,Ad,P,D,local_time(T)}|Ac];
+			    true ->
+				Ac
+			end
+		end,
+		[], Acc);
+list_blocked([{Name, {ETS, DETS}}|Tables], Addr, Port, Dir, Acc) ->
+    NewBlocked =
+	case ets:match_object(ETS, {blocked_user, {'_',Addr,Port,Dir,'_'}}) of
+	    List when list(List) ->
+		lists:foldl(fun({blocked_user, X}, A) -> [X|A] end, Acc, List);
+	    _ ->
+		Acc
+	end,
+    list_blocked(Tables, Addr, Port, Dir, NewBlocked).
+
+
+%%
+%% sync_dets_to_ets/2
+%%
+%% Reads dets-table DETS and syncronizes it with the ets-table ETS.
+%%
+sync_dets_to_ets(DETS, ETS) ->
+    dets:traverse(DETS, fun(X) ->
+				ets:insert(ETS, X),
+				continue
+			end).
+
+%%
+%% check_blocked_user/7 -> true | false
+%%
+%% Check if a specific user is blocked from access.
+%%
+%% The sideeffect of this routine is that it unblocks also other users
+%% whos blocking time has expired. This to keep the tables as small
+%% as possible.
+%%
+check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule) ->
+    TN = universal_time(),
+    case ets:match_object(ETS, {blocked_user, {User, '_', '_', '_', '_'}}) of
+	List when list(List) ->
+	    Blocked = lists:foldl(fun({blocked_user, X}, A) ->
+					  [X|A] end, [], List),
+	    check_blocked_user(Info,User,Dir,Addr,Port,ETS,DETS,TN,Blocked,CBModule);
+	_ ->
+	    false
+    end.
+check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, TN, [], CBModule) ->
+    false;
+check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, TN,
+		   [{User,Addr,Port,Dir,T}|Ls], CBModule) ->
+    TD = T-TN,
+    if
+	TD =< 0 ->
+	    %% Blocking has expired, remove and grant access.
+	    unblock_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule),
+	    false;
+	true ->
+	    true
+    end;
+check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, TN,
+		   [{OUser,ODir,OAddr,OPort,T}|Ls], CBModule) ->
+    TD = T-TN,
+    if
+	TD =< 0 ->
+	    %% Blocking has expired, remove.
+	    unblock_user(Info, OUser, ODir, OAddr, OPort, ETS, DETS, CBModule);
+	true ->
+	    true
+    end,
+    check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, TN, Ls, CBModule).
+
+unblock_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule) ->
+    Reason=io_lib:format("User ~s was removed from the block list for dir ~s",
+			 [User, Dir]),
+    mod_log:security_log(Info, lists:flatten(Reason)),
+    user_unblock_event(CBModule,Addr,Port,Dir,User),
+    dets:match_delete(DETS, {blocked_user, {User, Addr, Port, Dir, '_'}}),
+    ets:match_delete(ETS, {blocked_user, {User, Addr, Port, Dir, '_'}}).
+
+
+make_name(Addr,Port) ->
+    httpd_util:make_name("httpd_security",Addr,Port).
+
+make_name(Addr,Port,Num) ->
+    httpd_util:make_name("httpd_security",Addr,Port,
+			 "__" ++ integer_to_list(Num)).
+
+
+auth_fail_event(Mod,Addr,Port,Dir,User,Passwd) ->
+    event(auth_fail,Mod,Addr,Port,Dir,[{user,User},{password,Passwd}]).
+
+user_block_event(Mod,Addr,Port,Dir,User) ->
+    event(user_block,Mod,Addr,Port,Dir,[{user,User}]).
+
+user_unblock_event(Mod,Addr,Port,Dir,User) ->
+    event(user_unblock,Mod,Addr,Port,Dir,[{user,User}]).
+
+event(Event,Mod,undefined,Port,Dir,Info) ->
+    (catch Mod:event(Event,Port,Dir,Info));
+event(Event,Mod,Addr,Port,Dir,Info) ->
+    (catch Mod:event(Event,Addr,Port,Dir,Info)).
+
+universal_time() ->
+    calendar:datetime_to_gregorian_seconds(calendar:universal_time()).
+
+local_time(T) ->
+    calendar:universal_time_to_local_time(
+      calendar:gregorian_seconds_to_datetime(T)).
+
+
+error_msg(F, A) ->
+    error_logger:error_msg(F, A).
+
+
+call(Name, Req) ->
+    case (catch gen_server:call(Name, Req)) of
+        {'EXIT', Reason} ->
+            {error, Reason};
+        Reply ->
+            Reply
+    end.
+
+
+cast(Name, Msg) ->
+    case (catch gen_server:cast(Name, Msg)) of
+        {'EXIT', Reason} ->
+            {error, Reason};
+        Result ->
+            Result
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_trace.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_trace.erl
new file mode 100644
index 0000000000..9f4d331d82
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_trace.erl
@@ -0,0 +1,64 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mod_trace.erl,v 1.1 2008/12/17 09:53:36 mikpe Exp $
+%%
+-module(mod_trace).
+
+-export([do/1]).
+
+-include("httpd.hrl").
+
+
+do(Info) ->
+    %%?vtrace("do",[]),
+    case Info#mod.method of
+	"TRACE" ->
+	    case httpd_util:response_generated(Info) of
+		false->
+		    generate_trace_response(Info);
+	        true->
+		    {proceed,Info#mod.data}
+	    end;
+	_ ->
+	    {proceed,Info#mod.data}
+    end.
+
+
+%%---------------------------------------------------------------------
+%%Generate the trace response the trace response consists of a
+%%http-header and the body will be the request.
+%5----------------------------------------------------------------------
+
+generate_trace_response(Info)->
+    RequestHead=Info#mod.parsed_header,
+    Body=generate_trace_response_body(RequestHead),
+    Len=length(Body),
+    Response=["HTTP/1.1 200 OK\r\n",
+	      "Content-Type:message/http\r\n",
+	      "Content-Length:",integer_to_list(Len),"\r\n\r\n",
+	      Info#mod.request_line,Body],
+    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket,Response),
+    {proceed,[{response,{already_sent,200,Len}}|Info#mod.data]}.
+
+generate_trace_response_body(Parsed_header)->
+    generate_trace_response_body(Parsed_header,[]).
+
+generate_trace_response_body([],Head)->
+    lists:flatten(Head);
+generate_trace_response_body([{[],[]}|Rest],Head) ->
+    generate_trace_response_body(Rest,Head);
+generate_trace_response_body([{Field,Value}|Rest],Head) ->
+    generate_trace_response_body(Rest,[Field ++ ":" ++ Value ++ "\r\n"|Head]).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/uri.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/uri.erl
new file mode 100644
index 0000000000..9a4f77f87b
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/uri.erl
@@ -0,0 +1,349 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Mobile Arts AB
+%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
+%% All Rights Reserved.''
+%%
+%%
+%% Author  : Johan Blom <[email protected]>
+%% Description :
+%%   Implements various scheme dependent subsets (e.g. HTTP, FTP etc) based on
+%%   RFC 2396, Uniform Resource Identifiers (URI): Generic Syntax
+%% Created : 27 Jul 2001 by Johan Blom <[email protected]>
+%%
+
+-module(uri).
+
+-author('[email protected]').
+
+-export([parse/1,resolve/2]).
+
+
+%%% Parse URI and return {Scheme,Path}
+%%% Note that Scheme specific parsing/validation is not handled here!
+resolve(Root,Rel) ->
+    ok.
+
+%%% See "http://www.isi.edu/in-notes/iana/assignments/url-schemes" for a list of
+%%% defined URL schemes and references to its sources.
+
+parse(URI) ->
+    case parse_scheme(URI) of
+	{http,Cont} -> parse_http(Cont,http);
+	{https,Cont} -> parse_http(Cont,https);
+	{ftp,Cont} -> parse_ftp(Cont,ftp);
+	{sip,Cont} -> parse_sip(Cont,sip);
+	{sms,Cont} -> parse_sms(Cont,sip);
+	{error,Error} -> {error,Error};
+	{Scheme,Cont} -> {Scheme,Cont}
+    end.
+
+
+%%% Parse the scheme.
+parse_scheme(URI) ->
+    parse_scheme(URI,[]).
+
+parse_scheme([H|URI],Acc) when $a=<H,H=<$z; $A=<H,H=<$Z  ->
+    parse_scheme2(URI,[H|Acc]);
+parse_scheme(_,_) ->
+    {error,no_scheme}.
+
+parse_scheme2([H|URI],Acc)
+  when $a=<H,H=<$z; $A=<H,H=<$Z; $0=<H,H=<$9; H==$-;H==$+;H==$. ->
+    parse_scheme2(URI,[H|Acc]);
+parse_scheme2([$:|URI],Acc) ->
+    {list_to_atom(lists:reverse(Acc)),URI};
+parse_scheme2(_,_) ->
+    {error,no_scheme}.
+
+
+%%% ............................................................................
+-define(HTTP_DEFAULT_PORT, 80).
+-define(HTTPS_DEFAULT_PORT, 443).
+
+%%% HTTP (Source RFC 2396, RFC 2616)
+%%%  http_URL = "*" | absoluteURI | abs_path [ "?" query ] | authority
+
+%%%  http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]
+%%% Returns a tuple {http,Host,Port,PathQuery} where
+%%%  Host     = string() Host value
+%%%  Port     = string() Port value
+%%%  PathQuery= string() Combined absolute path and query value
+parse_http("//"++C0,Scheme) ->
+    case scan_hostport(C0,Scheme) of
+	{C1,Host,Port} ->
+	    case scan_pathquery(C1) of
+		{error,Error} ->
+		    {error,Error};
+		PathQuery ->
+		    {Scheme,Host,Port,PathQuery}
+	    end;
+	{error,Error} ->
+	    {error,Error}
+    end;
+parse_http(_,_) ->
+    {error,invalid_url}.
+
+scan_pathquery(C0) ->
+    case scan_abspath(C0) of
+	{error,Error} ->
+	    {error,Error};
+	{[],[]} -> % Add implicit path
+	    "/";
+	{"?"++C1,Path} ->
+	    case scan_query(C1,[]) of
+		{error,Error} ->
+		    {error,Error};
+		Query ->
+		    Path++"?"++Query
+	    end;
+	{[],Path} ->
+	    Path
+    end.
+
+
+%%% ............................................................................
+%%% FIXME!!! This is just a quick hack that doesn't work!
+-define(FTP_DEFAULT_PORT, 80).
+
+%%% FTP (Source RFC 2396, RFC 1738, RFC 959)
+%%% Note: This BNF has been modified to better fit with RFC 2396
+%%%  ftp_URL = "ftp:" "//" [ ftp_userinfo ] host [ ":" port ] ftp_abs_path
+%%%  ftp_userinfo	= ftp_user [ ":" ftp_password ]
+%%%  ftp_abs_path 	= "/" ftp_path_segments [ ";type=" ftp_type ]
+%%%  ftp_path_segments	= ftp_segment *( "/" ftp_segment)
+%%%  ftp_segment	= *[ ftp_uchar | "?" | ":" | "@" | "&" | "=" ]
+%%%  ftp_type		= "A" | "I" | "D" | "a" | "i" | "d"
+%%%  ftp_user		= *[ ftp_uchar | ";" | "?" | "&" | "=" ]
+%%%  ftp_password	= *[ ftp_uchar | ";" | "?" | "&" | "=" ]
+%%%  ftp_uchar		= ftp_unreserved | escaped
+%%%  ftp_unreserved	= alphanum | mark | "$" | "+" | ","
+parse_ftp("//"++C0,Scheme) ->
+    case ftp_userinfo(C0) of
+	{C1,Creds} ->
+	    case scan_hostport(C1,Scheme) of
+		{C2,Host,Port} ->
+		    case scan_abspath(C2) of
+			{error,Error} ->
+			    {error,Error};
+			{[],[]} -> % Add implicit path
+			    {Scheme,Creds,Host,Port,"/"};
+			{[],Path} ->
+			    {Scheme,Creds,Host,Port,Path}
+		    end;
+		{error,Error} ->
+		    {error,Error}
+	    end;
+	{error,Error} ->
+	    {error,Error}
+    end.
+
+ftp_userinfo(C0) ->
+    User="",
+    Password="",
+    {C0,{User,Password}}.
+
+
+%%% ............................................................................
+%%% SIP (Source RFC 2396, RFC 2543)
+%%%  sip_URL = "sip:" [ sip_userinfo "@" ] host [ ":" port ]
+%%%				sip_url-parameters [ sip_headers ]
+%%%  sip_userinfo    = sip_user [ ":" sip_password ]
+%%%  sip_user	     = *( unreserved | escaped | "&" | "=" | "+" | "$" | "," )
+%%%  sip_password    = *( unreserved | escaped | "&" | "=" | "+" | "$" | "," )
+%%%  sip_url-parameters  = *( ";" sip_url-parameter )
+%%%  sip_url-parameter   = sip_transport-param | sip_user-param |
+%%%  				sip_method-param | sip_ttl-param |
+%%%				sip_maddr-param | sip_other-param
+%%%  sip_transport-param = "transport=" ( "udp" | "tcp" )
+%%%  sip_ttl-param       = "ttl=" sip_ttl
+%%%  sip_ttl             = 1*3DIGIT       ; 0 to 255
+%%%  sip_maddr-param     = "maddr=" host
+%%%  sip_user-param      = "user=" ( "phone" | "ip" )
+%%%  sip_method-param    = "method=" sip_Method
+%%%  sip_tag-param       = "tag=" sip_UUID
+%%%  sip_UUID            = 1*( hex | "-" )
+%%%  sip_other-param     = ( token | ( token "=" ( token | quoted-string )))
+%%%  sip_Method		 = "INVITE" | "ACK" | "OPTIONS" | "BYE" |
+%%%				"CANCEL" | "REGISTER"
+%%%  sip_token		 = 1*< any CHAR  except CTL's  or separators>
+%%%  sip_quoted-string	 = ( <"> *(qdtext | quoted-pair ) <"> )
+%%%  sip_qdtext		 = <any TEXT-UTF8 except <">>
+%%%  sip_quoted-pair	 =  " \ " CHAR
+parse_sip(Cont,Scheme) ->
+    {Scheme,Cont}.
+
+
+
+
+%%% ............................................................................
+%%% SMS (Source draft-wilde-sms-uri-01, January 24 2002 and
+%%%        draft-allocchio-gstn-01, November 2001)
+%%% The syntax definition for "gstn-phone" is taken from
+%%% [draft-allocchio-gstn-01], allowing global as well as local telephone
+%%% numbers.
+%%% Note: This BNF has been modified to better fit with RFC 2396
+%%%   sms_URI               =  sms ":" 1*( sms-recipient ) [ sms-body ]
+%%%   sms-recipient         =  gstn-phone sms-qualifier
+%%%                            [ "," sms-recipient ]
+%%%   sms-qualifier         =  *( smsc-qualifier / pid-qualifier )
+%%%   smsc-qualifier        =  ";smsc=" SMSC-sub-addr
+%%%   pid-qualifier         =  ";pid=" PID-sub-addr
+%%%   sms-body              =  ";body=" *urlc
+%%%   gstn-phone = ( global-phone / local-phone )
+%%%   global-phone = "+" 1*( DIGIT / written-sep )
+%%%   local-phone =  [ exit-code ] dial-number / exit-code [ dial-number ]
+%%%   exit-code = phone-string
+%%%   dial-number = phone-string
+%%%   subaddr-string = phone-string
+%%%   post-dial = phone-string
+%%%   phone-string = 1*( DTMF / pause / tonewait / written-sep )
+%%%   DTMF = ( DIGIT / "#" / "*" / "A" / "B" / "C" / "D" )
+%%%   written-sep = ( "-" / "." )
+%%%   pause = "p"
+%%%   tonewait = "w"
+parse_sms(Cont,Scheme) ->
+    {Scheme,Cont}.
+
+
+%%% ============================================================================
+%%% Generic URI parsing. BNF rules from RFC 2396
+
+%%%      hostport      = host [ ":" port ]
+scan_hostport(C0,Scheme) ->
+    case scan_host(C0) of
+	{error,Error} ->
+	    {error,Error};
+	{":"++C1,Host} ->
+	    {C2,Port}=scan_port(C1,[]),
+	    {C2,Host,list_to_integer(Port)};
+	{C1,Host} when Scheme==http ->
+	    {C1,Host,?HTTP_DEFAULT_PORT};
+	{C1,Host} when Scheme==https ->
+	    {C1,Host,?HTTPS_DEFAULT_PORT};
+	{C1,Host} when Scheme==ftp ->
+	    {C1,Host,?FTP_DEFAULT_PORT}
+    end.
+
+
+%%%      host          = hostname | IPv4address
+%%%      hostname      = *( domainlabel "." ) toplabel [ "." ]
+%%%      domainlabel   = alphanum | alphanum *( alphanum | "-" ) alphanum
+%%%      toplabel      = alpha | alpha *( alphanum | "-" ) alphanum
+%%%      IPv4address   = 1*digit "." 1*digit "." 1*digit "." 1*digit
+
+-define(ALPHA, 1).
+-define(DIGIT, 2).
+
+scan_host(C0) ->
+    case scan_host2(C0,[],0,[],[]) of
+	{C1,IPv4address,[?DIGIT,?DIGIT,?DIGIT,?DIGIT]} ->
+	    {C1,lists:reverse(lists:append(IPv4address))};
+	{C1,Hostname,[?ALPHA|HostF]} ->
+	    {C1,lists:reverse(lists:append(Hostname))};
+	_ ->
+	    {error,no_host}
+    end.
+
+scan_host2([H|C0],Acc,CurF,Host,HostF) when $0=<H,H=<$9 ->
+    scan_host2(C0,[H|Acc],CurF bor ?DIGIT,Host,HostF);
+scan_host2([H|C0],Acc,CurF,Host,HostF) when $a=<H,H=<$z; $A=<H,H=<$Z ->
+    scan_host2(C0,[H|Acc],CurF bor ?ALPHA,Host,HostF);
+scan_host2([$-|C0],Acc,CurF,Host,HostF) when CurF=/=0 ->
+    scan_host2(C0,[$-|Acc],CurF,Host,HostF);
+scan_host2([$.|C0],Acc,CurF,Host,HostF) when CurF=/=0 ->
+    scan_host2(C0,[],0,[".",Acc|Host],[CurF|HostF]);
+scan_host2(C0,Acc,CurF,Host,HostF) ->
+    {C0,[Acc|Host],[CurF|HostF]}.
+
+
+%%%      port          = *digit
+scan_port([H|C0],Acc) when $0=<H,H=<$9 ->
+    scan_port(C0,[H|Acc]);
+scan_port(C0,Acc) ->
+    {C0,lists:reverse(Acc)}.
+
+%%%      abs_path      = "/"  path_segments
+scan_abspath([]) ->
+    {[],[]};
+scan_abspath("/"++C0) ->
+    scan_pathsegments(C0,["/"]);
+scan_abspath(_) ->
+    {error,no_abspath}.
+
+%%%      path_segments = segment *( "/" segment )
+scan_pathsegments(C0,Acc) ->
+    case scan_segment(C0,[]) of
+	{"/"++C1,Segment} ->
+	    scan_pathsegments(C1,["/",Segment|Acc]);
+	{C1,Segment} ->
+	    {C1,lists:reverse(lists:append([Segment|Acc]))}
+    end.
+
+
+%%%      segment       = *pchar *( ";" param )
+%%%      param         = *pchar
+scan_segment(";"++C0,Acc) ->
+    {C1,ParamAcc}=scan_pchars(C0,";"++Acc),
+    scan_segment(C1,ParamAcc);
+scan_segment(C0,Acc) ->
+    case scan_pchars(C0,Acc) of
+	{";"++C1,Segment} ->
+	    {C2,ParamAcc}=scan_pchars(C1,";"++Segment),
+	    scan_segment(C2,ParamAcc);
+	{C1,Segment} ->
+	    {C1,Segment}
+    end.
+
+%%%      query         = *uric
+%%%      uric          = reserved | unreserved | escaped
+%%%      reserved      = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+%%%                      "$" | ","
+%%%      unreserved    = alphanum | mark
+%%%      mark          = "-" | "_" | "." | "!" | "~" | "*" | "'" |
+%%%                      "(" | ")"
+%%%      escaped       = "%" hex hex
+scan_query([],Acc) ->
+    lists:reverse(Acc);
+scan_query([$%,H1,H2|C0],Acc) -> % escaped
+    scan_query(C0,[hex2dec(H1)*16+hex2dec(H2)|Acc]);
+scan_query([H|C0],Acc) when $a=<H,H=<$z;$A=<H,H=<$Z;$0=<H,H=<$9 -> % alphanum
+    scan_query(C0,[H|Acc]);
+scan_query([H|C0],Acc) when H==$;; H==$/; H==$?; H==$:; H==$@;
+			    H==$&; H==$=; H==$+; H==$$; H==$, -> % reserved
+    scan_query(C0,[H|Acc]);
+scan_query([H|C0],Acc) when H==$-; H==$_; H==$.; H==$!; H==$~;
+			    H==$*; H==$'; H==$(; H==$) -> % mark
+    scan_query(C0,[H|Acc]);
+scan_query([H|C0],Acc) ->
+    {error,no_query}.
+
+
+%%%      pchar         = unreserved | escaped |
+%%%                      ":" | "@" | "&" | "=" | "+" | "$" | ","
+scan_pchars([],Acc) ->
+    {[],Acc};
+scan_pchars([$%,H1,H2|C0],Acc) -> % escaped
+    scan_pchars(C0,[hex2dec(H1)*16+hex2dec(H2)|Acc]);
+scan_pchars([H|C0],Acc) when $a=<H,H=<$z;$A=<H,H=<$Z;$0=<H,H=<$9  -> % alphanum
+    scan_pchars(C0,[H|Acc]);
+scan_pchars([H|C0],Acc) when H==$-; H==$_; H==$.; H==$!; H==$~;
+			     H==$*; H==$'; H==$(; H==$) -> % mark
+    scan_pchars(C0,[H|Acc]);
+scan_pchars([H|C0],Acc) when H==$:; H==$@; H==$&; H==$=; H==$+; H==$$; H==$, ->
+    scan_pchars(C0,[H|Acc]);
+scan_pchars(C0,Acc) ->
+    {C0,Acc}.
+
+hex2dec(X) when X>=$0,X=<$9 -> X-$0;
+hex2dec(X) when X>=$A,X=<$F -> X-$A+10;
+hex2dec(X) when X>=$a,X=<$f -> X-$a+10.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/Makefile b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/Makefile
new file mode 100644
index 0000000000..8b57868117
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/Makefile
@@ -0,0 +1,136 @@
+# ``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 via the world wide web 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.
+#
+# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+# AB. All Rights Reserved.''
+#
+#     $Id: Makefile,v 1.1 2008/12/17 09:53:37 mikpe Exp $
+#
+include $(ERL_TOP)/make/target.mk
+
+ifeq ($(TYPE),debug)
+ERL_COMPILE_FLAGS += -Ddebug -W
+endif
+
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+VSN=$(MNESIA_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/mnesia-$(VSN)
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+MODULES= \
+	mnesia \
+	mnesia_backup \
+	mnesia_bup \
+	mnesia_checkpoint \
+	mnesia_checkpoint_sup \
+	mnesia_controller \
+	mnesia_dumper\
+	mnesia_event \
+	mnesia_frag \
+	mnesia_frag_hash \
+	mnesia_frag_old_hash \
+	mnesia_index \
+	mnesia_kernel_sup \
+	mnesia_late_loader \
+	mnesia_lib\
+	mnesia_loader \
+	mnesia_locker \
+	mnesia_log \
+	mnesia_monitor \
+	mnesia_recover \
+	mnesia_registry \
+	mnesia_schema\
+	mnesia_snmp_hook \
+	mnesia_snmp_sup \
+	mnesia_subscr \
+	mnesia_sup \
+	mnesia_sp  \
+	mnesia_text \
+	mnesia_tm
+
+HRL_FILES= mnesia.hrl
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
+
+APP_FILE= mnesia.app
+
+APP_SRC= $(APP_FILE).src
+APP_TARGET= $(EBIN)/$(APP_FILE)
+
+APPUP_FILE= mnesia.appup
+
+APPUP_SRC= $(APPUP_FILE).src
+APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
+
+
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+ERL_FLAGS +=
+ERL_COMPILE_FLAGS += \
+	+warn_unused_vars \
+	+'{parse_transform,sys_pre_attributes}' \
+	+'{attribute,insert,vsn,"mnesia_$(MNESIA_VSN)"}' \
+	-W
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+opt: $(TARGET_FILES)
+
+debug:
+	@${MAKE} TYPE=debug
+
+clean:
+	rm -f $(TARGET_FILES)
+	rm -f core
+
+docs:
+
+# ----------------------------------------------------
+# Special Build Targets
+# ----------------------------------------------------
+
+$(APP_TARGET): $(APP_SRC) ../vsn.mk
+	sed -e 's;%VSN%;$(VSN);' $< > $@
+
+$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+	sed -e 's;%VSN%;$(VSN);' $< > $@
+
+
+# ----------------------------------------------------
+# Release Target
+# ----------------------------------------------------
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR) $(RELSYSDIR)/src
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
+	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+release_docs_spec:
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.app.src b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.app.src
new file mode 100644
index 0000000000..fb9d7aa0ca
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.app.src
@@ -0,0 +1,50 @@
+{application, mnesia,
+ [{description, "MNESIA  CXC 138 12"},
+  {vsn, "%VSN%"},
+  {modules, [
+	     mnesia,
+	     mnesia_backup,
+	     mnesia_bup,
+	     mnesia_checkpoint,
+	     mnesia_checkpoint_sup,
+	     mnesia_controller,
+	     mnesia_dumper,
+	     mnesia_event,
+	     mnesia_frag,
+	     mnesia_frag_hash,
+             mnesia_frag_old_hash,
+	     mnesia_index,
+             mnesia_kernel_sup,
+	     mnesia_late_loader,
+	     mnesia_lib,
+	     mnesia_loader,
+	     mnesia_locker,
+	     mnesia_log,
+	     mnesia_monitor,
+	     mnesia_recover,
+	     mnesia_registry,
+	     mnesia_schema,
+	     mnesia_snmp_hook,
+	     mnesia_snmp_sup,
+	     mnesia_subscr,
+	     mnesia_sup,
+	     mnesia_sp,
+	     mnesia_text,
+	     mnesia_tm
+            ]},
+  {registered, [
+		mnesia_dumper_load_regulator,
+		mnesia_event,
+		mnesia_fallback,
+		mnesia_controller,
+		mnesia_kernel_sup,
+		mnesia_late_loader,
+		mnesia_locker,
+		mnesia_monitor,
+		mnesia_recover,
+		mnesia_substr,
+		mnesia_sup,
+		mnesia_tm
+	       ]},
+  {applications, [kernel, stdlib]},
+  {mod, {mnesia_sup, []}}]}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.appup.src b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.appup.src
new file mode 100644
index 0000000000..64f50dd5c6
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.appup.src
@@ -0,0 +1,6 @@
+{"%VSN%",
+ [
+  ],
+ [
+  ]
+}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.erl
new file mode 100644
index 0000000000..b4f03fab03
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.erl
@@ -0,0 +1,2191 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia.erl,v 1.2 2010/03/04 13:54:19 maria Exp $
+%%
+%% This module exports the public interface of the Mnesia DBMS engine
+
+-module(mnesia).
+%-behaviour(mnesia_access).
+
+-export([
+	 %% Start, stop and debugging
+	 start/0, start/1, stop/0,           % Not for public use
+	 set_debug_level/1, lkill/0, kill/0, % Not for public use
+	 ms/0, nc/0, nc/1, ni/0, ni/1,       % Not for public use
+	 change_config/2,
+
+	 %% Activity mgt
+	 abort/1, transaction/1, transaction/2, transaction/3,
+	 sync_transaction/1, sync_transaction/2, sync_transaction/3,
+	 async_dirty/1, async_dirty/2, sync_dirty/1, sync_dirty/2, ets/1, ets/2,
+	 activity/2, activity/3, activity/4, % Not for public use
+
+	 %% Access within an activity - Lock acquisition
+	 lock/2, lock/4,
+	 read_lock_table/1,
+	 write_lock_table/1,
+
+	 %% Access within an activity - Updates
+	 write/1, s_write/1, write/3, write/5,
+	 delete/1, s_delete/1, delete/3, delete/5,
+	 delete_object/1, s_delete_object/1, delete_object/3, delete_object/5,
+
+	 %% Access within an activity - Reads
+	 read/1, wread/1, read/3, read/5,
+	 match_object/1, match_object/3, match_object/5,
+	 select/2, select/3, select/5,
+	 all_keys/1, all_keys/4,
+	 index_match_object/2, index_match_object/4, index_match_object/6,
+	 index_read/3, index_read/6,
+
+	 %% Iterators within an activity
+	 foldl/3, foldl/4, foldr/3, foldr/4,
+
+	 %% Dirty access regardless of activities - Updates
+	 dirty_write/1, dirty_write/2,
+	 dirty_delete/1, dirty_delete/2,
+	 dirty_delete_object/1, dirty_delete_object/2,
+	 dirty_update_counter/2, dirty_update_counter/3,
+
+	 %% Dirty access regardless of activities - Read
+	 dirty_read/1, dirty_read/2,
+	 dirty_select/2,
+	 dirty_match_object/1, dirty_match_object/2, dirty_all_keys/1,
+	 dirty_index_match_object/2, dirty_index_match_object/3,
+	 dirty_index_read/3, dirty_slot/2,
+	 dirty_first/1, dirty_next/2, dirty_last/1, dirty_prev/2,
+
+	 %% Info
+	 table_info/2, table_info/4, schema/0, schema/1,
+	 error_description/1, info/0, system_info/1,
+	 system_info/0,                      % Not for public use
+
+	 %% Database mgt
+	 create_schema/1, delete_schema/1,
+	 backup/1, backup/2, traverse_backup/4, traverse_backup/6,
+	 install_fallback/1, install_fallback/2,
+	 uninstall_fallback/0, uninstall_fallback/1,
+	 activate_checkpoint/1, deactivate_checkpoint/1,
+	 backup_checkpoint/2, backup_checkpoint/3, restore/2,
+
+	 %% Table mgt
+	 create_table/1, create_table/2, delete_table/1,
+	 add_table_copy/3, del_table_copy/2, move_table_copy/3,
+	 add_table_index/2, del_table_index/2,
+	 transform_table/3, transform_table/4,
+	 change_table_copy_type/3,
+	 read_table_property/2, write_table_property/2, delete_table_property/2,
+	 change_table_frag/2,
+	 clear_table/1,
+
+	 %% Table load
+	 dump_tables/1, wait_for_tables/2, force_load_table/1,
+	 change_table_access_mode/2, change_table_load_order/2,
+	 set_master_nodes/1, set_master_nodes/2,
+
+	 %% Misc admin
+	 dump_log/0, subscribe/1, unsubscribe/1, report_event/1,
+
+	 %% Snmp
+	 snmp_open_table/2, snmp_close_table/1,
+	 snmp_get_row/2, snmp_get_next_index/2, snmp_get_mnesia_key/2,
+
+	 %% Textfile access
+	 load_textfile/1, dump_to_textfile/1,
+
+	 %% Mnemosyne exclusive
+	 get_activity_id/0, put_activity_id/1, % Not for public use
+
+	 %% Mnesia internal functions
+	 dirty_rpc/4,                          % Not for public use
+	 has_var/1, fun_select/7,
+	 foldl/6, foldr/6,
+
+	 %% Module internal callback functions
+	 remote_dirty_match_object/2,           % Not for public use
+	 remote_dirty_select/2                  % Not for public use
+	]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-include("mnesia.hrl").
+-import(mnesia_lib, [verbose/2]).
+
+-define(DEFAULT_ACCESS, ?MODULE).
+
+%% Select
+-define(PATTERN_TO_OBJECT_MATCH_SPEC(Pat), [{Pat,[],['$_']}]).
+-define(PATTERN_TO_BINDINGS_MATCH_SPEC(Pat), [{Pat,[],['$$']}]).
+
+%% Local function in order to avoid external function call
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason);
+	Value -> Value
+    end.
+
+is_dollar_digits(Var) ->
+    case atom_to_list(Var) of
+	[$$ | Digs] ->
+	    is_digits(Digs);
+	_ ->
+	    false
+    end.
+
+is_digits([Dig | Tail]) ->
+    if
+	$0 =< Dig, Dig =< $9 ->
+	    is_digits(Tail);
+	true ->
+	    false
+    end;
+is_digits([]) ->
+    true.
+
+has_var(X) when atom(X) ->
+    if
+	X == '_' ->
+	    true;
+	atom(X) ->
+	    is_dollar_digits(X);
+	true  ->
+	    false
+    end;
+has_var(X) when tuple(X) ->
+    e_has_var(X, size(X));
+has_var([H|T]) ->
+    case has_var(H) of
+	false -> has_var(T);
+	Other -> Other
+    end;
+has_var(_) -> false.
+
+e_has_var(_, 0) -> false;
+e_has_var(X, Pos) ->
+    case has_var(element(Pos, X))of
+	false -> e_has_var(X, Pos-1);
+	Other -> Other
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Start and stop
+
+start() ->
+    {Time , Res} =  timer:tc(application, start, [?APPLICATION, temporary]),
+
+    Secs = Time div 1000000,
+    case Res of
+	ok ->
+	    verbose("Mnesia started, ~p seconds~n",[ Secs]),
+	    ok;
+	{error, {already_started, mnesia}} ->
+	    verbose("Mnesia already started, ~p seconds~n",[ Secs]),
+	    ok;
+	{error, R} ->
+	    verbose("Mnesia failed to start, ~p seconds: ~p~n",[ Secs, R]),
+	    {error, R}
+    end.
+
+start(ExtraEnv) when list(ExtraEnv) ->
+    case mnesia_lib:ensure_loaded(?APPLICATION) of
+	ok ->
+	    patched_start(ExtraEnv);
+	Error ->
+	    Error
+    end;
+start(ExtraEnv) ->
+    {error, {badarg, ExtraEnv}}.
+
+patched_start([{Env, Val} | Tail]) when atom(Env) ->
+    case mnesia_monitor:patch_env(Env, Val) of
+	{error, Reason} ->
+	    {error, Reason};
+	_NewVal ->
+	    patched_start(Tail)
+    end;
+patched_start([Head | _]) ->
+    {error, {bad_type, Head}};
+patched_start([]) ->
+    start().
+
+stop() ->
+    case application:stop(?APPLICATION) of
+	ok -> stopped;
+	{error, {not_started, ?APPLICATION}} -> stopped;
+	Other -> Other
+    end.
+
+change_config(extra_db_nodes, Ns) when list(Ns) ->
+    mnesia_controller:connect_nodes(Ns);
+change_config(BadKey, _BadVal) ->
+    {error, {badarg, BadKey}}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Debugging
+
+set_debug_level(Level) ->
+    mnesia_subscr:set_debug_level(Level).
+
+lkill() ->
+    mnesia_sup:kill().
+
+kill() ->
+    rpc:multicall(mnesia_sup, kill, []).
+
+ms() ->
+    [
+     mnesia,
+     mnesia_backup,
+     mnesia_bup,
+     mnesia_checkpoint,
+     mnesia_checkpoint_sup,
+     mnesia_controller,
+     mnesia_dumper,
+     mnesia_loader,
+     mnesia_frag,
+     mnesia_frag_hash,
+     mnesia_frag_old_hash,
+     mnesia_index,
+     mnesia_kernel_sup,
+     mnesia_late_loader,
+     mnesia_lib,
+     mnesia_log,
+     mnesia_registry,
+     mnesia_schema,
+     mnesia_snmp_hook,
+     mnesia_snmp_sup,
+     mnesia_subscr,
+     mnesia_sup,
+     mnesia_text,
+     mnesia_tm,
+     mnesia_recover,
+     mnesia_locker,
+
+     %% Keep these last in the list, so
+     %% mnesia_sup kills these last
+     mnesia_monitor,
+     mnesia_event
+    ].
+
+nc() ->
+    Mods = ms(),
+    nc(Mods).
+
+nc(Mods) when list(Mods)->
+    [Mod || Mod <- Mods, ok /= load(Mod, compile)].
+
+ni() ->
+    Mods = ms(),
+    ni(Mods).
+
+ni(Mods) when list(Mods) ->
+    [Mod || Mod <- Mods, ok /= load(Mod, interpret)].
+
+load(Mod, How) when atom(Mod) ->
+    case try_load(Mod, How) of
+	ok ->
+	    ok;
+	_ ->
+	    mnesia_lib:show( "~n RETRY ~p FROM: ", [Mod]),
+	    Abs = mod2abs(Mod),
+	    load(Abs, How)
+    end;
+load(Abs, How) ->
+    case try_load(Abs, How) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    mnesia_lib:show( " *** ERROR *** ~p~n", [Reason]),
+	    {error, Reason}
+    end.
+
+try_load(Mod, How) ->
+    mnesia_lib:show( " ~p ", [Mod]),
+    Flags = [{d, debug}],
+    case How of
+	compile ->
+	    case catch c:nc(Mod, Flags) of
+		{ok, _} -> ok;
+		Other -> {error, Other}
+	    end;
+	interpret ->
+	    case catch int:ni(Mod, Flags) of
+		{module, _} -> ok;
+		Other -> {error, Other}
+	    end
+    end.
+
+mod2abs(Mod) ->
+    ModString = atom_to_list(Mod),
+    SubDir =
+	case lists:suffix("test", ModString) of
+	    true -> test;
+	    false -> src
+	end,
+    filename:join([code:lib_dir(?APPLICATION), SubDir, ModString]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Activity mgt
+
+abort(Reason) ->
+    exit({aborted, Reason}).
+
+transaction(Fun) ->
+    transaction(get(mnesia_activity_state), Fun, [], infinity, ?DEFAULT_ACCESS, async).
+transaction(Fun, Retries) when integer(Retries), Retries >= 0 ->
+    transaction(get(mnesia_activity_state), Fun, [], Retries, ?DEFAULT_ACCESS, async);
+transaction(Fun, Retries) when Retries == infinity ->
+    transaction(get(mnesia_activity_state), Fun, [], Retries, ?DEFAULT_ACCESS, async);
+transaction(Fun, Args) ->
+    transaction(get(mnesia_activity_state), Fun, Args, infinity, ?DEFAULT_ACCESS, async).
+transaction(Fun, Args, Retries) ->
+    transaction(get(mnesia_activity_state), Fun, Args, Retries, ?DEFAULT_ACCESS, async).
+
+sync_transaction(Fun) ->
+    transaction(get(mnesia_activity_state), Fun, [], infinity, ?DEFAULT_ACCESS, sync).
+sync_transaction(Fun, Retries) when integer(Retries), Retries >= 0 ->
+    transaction(get(mnesia_activity_state), Fun, [], Retries, ?DEFAULT_ACCESS, sync);
+sync_transaction(Fun, Retries) when Retries == infinity ->
+    transaction(get(mnesia_activity_state), Fun, [], Retries, ?DEFAULT_ACCESS, sync);
+sync_transaction(Fun, Args) ->
+    transaction(get(mnesia_activity_state), Fun, Args, infinity, ?DEFAULT_ACCESS, sync).
+sync_transaction(Fun, Args, Retries) ->
+    transaction(get(mnesia_activity_state), Fun, Args, Retries, ?DEFAULT_ACCESS, sync).
+
+
+transaction(State, Fun, Args, Retries, Mod, Kind)
+  when function(Fun), list(Args), Retries == infinity, atom(Mod) ->
+    mnesia_tm:transaction(State, Fun, Args, Retries, Mod, Kind);
+transaction(State, Fun, Args, Retries, Mod, Kind)
+  when function(Fun), list(Args), integer(Retries), Retries >= 0, atom(Mod) ->
+    mnesia_tm:transaction(State, Fun, Args, Retries, Mod, Kind);
+transaction(_State, Fun, Args, Retries, Mod, _Kind) ->
+    {aborted, {badarg, Fun, Args, Retries, Mod}}.
+
+non_transaction(State, Fun, Args, ActivityKind, Mod)
+  when function(Fun), list(Args), atom(Mod) ->
+    mnesia_tm:non_transaction(State, Fun, Args, ActivityKind, Mod);
+non_transaction(_State, Fun, Args, _ActivityKind, _Mod) ->
+    {aborted, {badarg, Fun, Args}}.
+
+async_dirty(Fun) ->
+    async_dirty(Fun, []).
+async_dirty(Fun, Args) ->
+    non_transaction(get(mnesia_activity_state), Fun, Args, async_dirty, ?DEFAULT_ACCESS).
+
+sync_dirty(Fun) ->
+    sync_dirty(Fun, []).
+sync_dirty(Fun, Args) ->
+    non_transaction(get(mnesia_activity_state), Fun, Args, sync_dirty, ?DEFAULT_ACCESS).
+
+ets(Fun) ->
+    ets(Fun, []).
+ets(Fun, Args) ->
+    non_transaction(get(mnesia_activity_state), Fun, Args, ets, ?DEFAULT_ACCESS).
+
+activity(Kind, Fun) ->
+    activity(Kind, Fun, []).
+activity(Kind, Fun, Args) when list(Args) ->
+    activity(Kind, Fun, Args, mnesia_monitor:get_env(access_module));
+activity(Kind, Fun, Mod) ->
+    activity(Kind, Fun, [], Mod).
+
+activity(Kind, Fun, Args, Mod) ->
+    State = get(mnesia_activity_state),
+    case Kind of
+	ets ->                    non_transaction(State, Fun, Args, Kind, Mod);
+	async_dirty ->            non_transaction(State, Fun, Args, Kind, Mod);
+	sync_dirty ->             non_transaction(State, Fun, Args, Kind, Mod);
+	transaction ->            wrap_trans(State, Fun, Args, infinity, Mod, async);
+	{transaction, Retries} -> wrap_trans(State, Fun, Args, Retries, Mod, async);
+	sync_transaction ->            wrap_trans(State, Fun, Args, infinity, Mod, sync);
+	{sync_transaction, Retries} -> wrap_trans(State, Fun, Args, Retries, Mod, sync);
+	_ ->                      {aborted, {bad_type, Kind}}
+    end.
+
+wrap_trans(State, Fun, Args, Retries, Mod, Kind) ->
+    case transaction(State, Fun, Args, Retries, Mod, Kind) of
+	{'atomic', GoodRes} -> GoodRes;
+	BadRes -> exit(BadRes)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Access within an activity - lock acquisition
+
+%% Grab a lock on an item in the global lock table
+%% Item may be any term. Lock may be write or read.
+%% write lock is set on all the given nodes
+%% read lock is only set on the first node
+%% Nodes may either be a list of nodes or one node as an atom
+%% Mnesia on all Nodes must be connected to each other, but
+%% it is not neccessary that they are up and running.
+
+lock(LockItem, LockKind) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    lock(Tid, Ts, LockItem, LockKind);
+	{Mod, Tid, Ts} ->
+	    Mod:lock(Tid, Ts, LockItem, LockKind);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+lock(Tid, Ts, LockItem, LockKind) ->
+    case element(1, Tid) of
+	tid ->
+	    case LockItem of
+		{record, Tab, Key} ->
+		    lock_record(Tid, Ts, Tab, Key, LockKind);
+		{table, Tab} ->
+		    lock_table(Tid, Ts, Tab, LockKind);
+		{global, GlobalKey, Nodes} ->
+		    global_lock(Tid, Ts, GlobalKey, LockKind, Nodes);
+		_ ->
+		    abort({bad_type, LockItem})
+	    end;
+	_Protocol ->
+	    []
+    end.
+
+%% Grab a read lock on a whole table
+read_lock_table(Tab) ->
+    lock({table, Tab}, read),
+    ok.
+
+%% Grab a write lock on a whole table
+write_lock_table(Tab) ->
+    lock({table, Tab}, write),
+    ok.
+
+lock_record(Tid, Ts, Tab, Key, LockKind) when atom(Tab) ->
+    Store = Ts#tidstore.store,
+    Oid =  {Tab, Key},
+    case LockKind of
+	read ->
+	    mnesia_locker:rlock(Tid, Store, Oid);
+	write ->
+	    mnesia_locker:wlock(Tid, Store, Oid);
+	sticky_write ->
+	    mnesia_locker:sticky_wlock(Tid, Store, Oid);
+	none ->
+	    [];
+	_ ->
+	    abort({bad_type, Tab, LockKind})
+    end;
+lock_record(_Tid, _Ts, Tab, _Key, _LockKind) ->
+    abort({bad_type, Tab}).
+
+lock_table(Tid, Ts, Tab, LockKind) when atom(Tab) ->
+    Store = Ts#tidstore.store,
+    case LockKind of
+	read ->
+	    mnesia_locker:rlock_table(Tid, Store, Tab);
+	write ->
+	    mnesia_locker:wlock_table(Tid, Store, Tab);
+	sticky_write ->
+	    mnesia_locker:sticky_wlock_table(Tid, Store, Tab);
+	none ->
+	    [];
+	_ ->
+	    abort({bad_type, Tab, LockKind})
+    end;
+lock_table(_Tid, _Ts, Tab, _LockKind) ->
+    abort({bad_type, Tab}).
+
+global_lock(Tid, Ts, Item, Kind, Nodes) when list(Nodes) ->
+    case element(1, Tid) of
+	tid ->
+	    Store = Ts#tidstore.store,
+	    GoodNs = good_global_nodes(Nodes),
+	    if
+		Kind /= read, Kind /= write ->
+		    abort({bad_type, Kind});
+		true ->
+		    mnesia_locker:global_lock(Tid, Store, Item, Kind, GoodNs)
+	    end;
+	_Protocol ->
+	    []
+    end;
+global_lock(_Tid, _Ts, _Item, _Kind, Nodes) ->
+    abort({bad_type, Nodes}).
+
+good_global_nodes(Nodes) ->
+    Recover = [node() | val(recover_nodes)],
+    mnesia_lib:intersect(Nodes, Recover).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Access within an activity - updates
+
+write(Val) when tuple(Val), size(Val) > 2 ->
+    Tab = element(1, Val),
+    write(Tab, Val, write);
+write(Val) ->
+    abort({bad_type, Val}).
+
+s_write(Val) when tuple(Val), size(Val) > 2 ->
+    Tab = element(1, Val),
+    write(Tab, Val, sticky_write).
+
+write(Tab, Val, LockKind) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    write(Tid, Ts, Tab, Val, LockKind);
+	{Mod, Tid, Ts} ->
+	    Mod:write(Tid, Ts, Tab, Val, LockKind);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+write(Tid, Ts, Tab, Val, LockKind)
+  when atom(Tab), Tab /= schema, tuple(Val), size(Val) > 2 ->
+    case element(1, Tid) of
+	ets ->
+	    ?ets_insert(Tab, Val),
+	    ok;
+	tid ->
+	    Store = Ts#tidstore.store,
+	    Oid = {Tab, element(2, Val)},
+	    case LockKind of
+		write ->
+		    mnesia_locker:wlock(Tid, Store, Oid);
+		sticky_write ->
+		    mnesia_locker:sticky_wlock(Tid, Store, Oid);
+		_ ->
+		    abort({bad_type, Tab, LockKind})
+	    end,
+	    write_to_store(Tab, Store, Oid, Val);
+	Protocol ->
+	    do_dirty_write(Protocol, Tab, Val)
+    end;
+write(_Tid, _Ts, Tab, Val, LockKind) ->
+    abort({bad_type, Tab, Val, LockKind}).
+
+write_to_store(Tab, Store, Oid, Val) ->
+    case ?catch_val({Tab, record_validation}) of
+	{RecName, Arity, Type}
+	  when size(Val) == Arity, RecName == element(1, Val) ->
+	    case Type of
+		bag ->
+		    ?ets_insert(Store, {Oid, Val, write});
+		_  ->
+		    ?ets_delete(Store, Oid),
+		    ?ets_insert(Store, {Oid, Val, write})
+	    end,
+	    ok;
+	{'EXIT', _} ->
+	    abort({no_exists, Tab});
+	_ ->
+	    abort({bad_type, Val})
+    end.
+
+delete({Tab, Key}) ->
+    delete(Tab, Key, write);
+delete(Oid) ->
+    abort({bad_type, Oid}).
+
+s_delete({Tab, Key}) ->
+    delete(Tab, Key, sticky_write);
+s_delete(Oid) ->
+    abort({bad_type, Oid}).
+
+delete(Tab, Key, LockKind) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    delete(Tid, Ts, Tab, Key, LockKind);
+	{Mod, Tid, Ts} ->
+	    Mod:delete(Tid, Ts, Tab, Key, LockKind);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+delete(Tid, Ts, Tab, Key, LockKind)
+  when atom(Tab), Tab /= schema ->
+      case element(1, Tid) of
+	  ets ->
+	      ?ets_delete(Tab, Key),
+	      ok;
+	  tid ->
+	      Store = Ts#tidstore.store,
+	      Oid = {Tab, Key},
+	      case LockKind of
+		  write ->
+		      mnesia_locker:wlock(Tid, Store, Oid);
+		  sticky_write ->
+		      mnesia_locker:sticky_wlock(Tid, Store, Oid);
+		  _ ->
+		      abort({bad_type, Tab, LockKind})
+	      end,
+	      ?ets_delete(Store, Oid),
+	      ?ets_insert(Store, {Oid, Oid, delete}),
+	      ok;
+	Protocol ->
+	      do_dirty_delete(Protocol, Tab, Key)
+    end;
+delete(_Tid, _Ts, Tab, _Key, _LockKind) ->
+    abort({bad_type, Tab}).
+
+delete_object(Val) when tuple(Val), size(Val) > 2 ->
+    Tab = element(1, Val),
+    delete_object(Tab, Val, write);
+delete_object(Val) ->
+    abort({bad_type, Val}).
+
+s_delete_object(Val) when tuple(Val), size(Val) > 2 ->
+    Tab = element(1, Val),
+    delete_object(Tab, Val, sticky_write);
+s_delete_object(Val) ->
+    abort({bad_type, Val}).
+
+delete_object(Tab, Val, LockKind) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    delete_object(Tid, Ts, Tab, Val, LockKind);
+	{Mod, Tid, Ts} ->
+	    Mod:delete_object(Tid, Ts, Tab, Val, LockKind);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+delete_object(Tid, Ts, Tab, Val, LockKind)
+  when atom(Tab), Tab /= schema, tuple(Val), size(Val) > 2 ->
+      case element(1, Tid) of
+	  ets ->
+	      ?ets_match_delete(Tab, Val),
+	      ok;
+	  tid ->
+	      Store = Ts#tidstore.store,
+	      Oid = {Tab, element(2, Val)},
+	      case LockKind of
+		  write ->
+		      mnesia_locker:wlock(Tid, Store, Oid);
+		  sticky_write ->
+		      mnesia_locker:sticky_wlock(Tid, Store, Oid);
+		  _ ->
+		      abort({bad_type, Tab, LockKind})
+	      end,
+	      case val({Tab, setorbag}) of
+		  bag ->
+		      ?ets_match_delete(Store, {Oid, Val, '_'}),
+		      ?ets_insert(Store, {Oid, Val, delete_object});
+		  _ ->
+		      case ?ets_match_object(Store, {Oid, '_', write}) of
+			  [] ->
+			      ?ets_match_delete(Store, {Oid, Val, '_'}),
+			      ?ets_insert(Store, {Oid, Val, delete_object});
+			  _  ->
+			      ?ets_delete(Store, Oid),
+			      ?ets_insert(Store, {Oid, Oid, delete})
+		      end
+	      end,
+	      ok;
+	Protocol ->
+	      do_dirty_delete_object(Protocol, Tab, Val)
+    end;
+delete_object(_Tid, _Ts, Tab, _Key, _LockKind) ->
+    abort({bad_type, Tab}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Access within an activity - read
+
+read({Tab, Key}) ->
+    read(Tab, Key, read);
+read(Oid) ->
+    abort({bad_type, Oid}).
+
+wread({Tab, Key}) ->
+    read(Tab, Key, write);
+wread(Oid) ->
+    abort({bad_type, Oid}).
+
+read(Tab, Key, LockKind) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    read(Tid, Ts, Tab, Key, LockKind);
+	{Mod, Tid, Ts} ->
+	    Mod:read(Tid, Ts, Tab, Key, LockKind);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+read(Tid, Ts, Tab, Key, LockKind)
+  when atom(Tab), Tab /= schema ->
+      case element(1, Tid) of
+	  ets ->
+	      ?ets_lookup(Tab, Key);
+	  tid ->
+	      Store = Ts#tidstore.store,
+	      Oid = {Tab, Key},
+	      Objs =
+		  case LockKind of
+		      read ->
+			  mnesia_locker:rlock(Tid, Store, Oid);
+		      write ->
+			  mnesia_locker:rwlock(Tid, Store, Oid);
+		      sticky_write ->
+			  mnesia_locker:sticky_rwlock(Tid, Store, Oid);
+		      _ ->
+			  abort({bad_type, Tab, LockKind})
+		  end,
+	      add_written(?ets_lookup(Store, Oid), Tab, Objs);
+	  _Protocol ->
+	      dirty_read(Tab, Key)
+    end;
+read(_Tid, _Ts, Tab, _Key, _LockKind) ->
+    abort({bad_type, Tab}).
+
+%%%%%%%%%%%%%%%%%%%%%
+%% Iterators
+
+foldl(Fun, Acc, Tab) ->
+    foldl(Fun, Acc, Tab, read).
+
+foldl(Fun, Acc, Tab, LockKind) when function(Fun) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    foldl(Tid, Ts, Fun, Acc, Tab, LockKind);
+	{Mod, Tid, Ts} ->
+	    Mod:foldl(Tid, Ts, Fun, Acc, Tab, LockKind);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+foldl(ActivityId, Opaque, Fun, Acc, Tab, LockKind) ->
+    {Type, Prev} = init_iteration(ActivityId, Opaque, Tab, LockKind),
+    Res = (catch do_foldl(ActivityId, Opaque, Tab, dirty_first(Tab), Fun, Acc, Type, Prev)),
+    close_iteration(Res, Tab).
+
+do_foldl(A, O, Tab, '$end_of_table', Fun, RAcc, _Type, Stored) ->
+    lists:foldl(fun(Key, Acc) ->
+			lists:foldl(Fun, Acc, read(A, O, Tab, Key, read))
+		end, RAcc, Stored);
+do_foldl(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H == Key ->
+    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
+    do_foldl(A, O, Tab, dirty_next(Tab, Key), Fun, NewAcc, ordered_set, Stored);
+do_foldl(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H < Key ->
+    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, H, read)),
+    do_foldl(A, O, Tab, Key, Fun, NewAcc, ordered_set, Stored);
+do_foldl(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H > Key ->
+    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
+    do_foldl(A, O, Tab, dirty_next(Tab, Key), Fun, NewAcc, ordered_set, [H |Stored]);
+do_foldl(A, O, Tab, Key, Fun, Acc, Type, Stored) ->  %% Type is set or bag
+    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
+    NewStored = ordsets:del_element(Key, Stored),
+    do_foldl(A, O, Tab, dirty_next(Tab, Key), Fun, NewAcc, Type, NewStored).
+
+foldr(Fun, Acc, Tab) ->
+    foldr(Fun, Acc, Tab, read).
+foldr(Fun, Acc, Tab, LockKind) when function(Fun) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    foldr(Tid, Ts, Fun, Acc, Tab, LockKind);
+	{Mod, Tid, Ts} ->
+	    Mod:foldr(Tid, Ts, Fun, Acc, Tab, LockKind);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+foldr(ActivityId, Opaque, Fun, Acc, Tab, LockKind) ->
+    {Type, TempPrev} = init_iteration(ActivityId, Opaque, Tab, LockKind),
+    Prev =
+	if
+	    Type == ordered_set ->
+		lists:reverse(TempPrev);
+	    true ->      %% Order doesn't matter for set and bag
+		TempPrev %% Keep the order so we can use ordsets:del_element
+	end,
+    Res = (catch do_foldr(ActivityId, Opaque, Tab, dirty_last(Tab), Fun, Acc, Type, Prev)),
+    close_iteration(Res, Tab).
+
+do_foldr(A, O, Tab, '$end_of_table', Fun, RAcc, _Type, Stored) ->
+    lists:foldl(fun(Key, Acc) ->
+			lists:foldl(Fun, Acc, read(A, O, Tab, Key, read))
+		end, RAcc, Stored);
+do_foldr(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H == Key ->
+    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
+    do_foldr(A, O, Tab, dirty_prev(Tab, Key), Fun, NewAcc, ordered_set, Stored);
+do_foldr(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H > Key ->
+    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, H, read)),
+    do_foldr(A, O, Tab, Key, Fun, NewAcc, ordered_set, Stored);
+do_foldr(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H < Key ->
+    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
+    do_foldr(A, O, Tab, dirty_prev(Tab, Key), Fun, NewAcc, ordered_set, [H |Stored]);
+do_foldr(A, O, Tab, Key, Fun, Acc, Type, Stored) ->  %% Type is set or bag
+    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
+    NewStored = ordsets:del_element(Key, Stored),
+    do_foldr(A, O, Tab, dirty_prev(Tab, Key), Fun, NewAcc, Type, NewStored).
+
+init_iteration(ActivityId, Opaque, Tab, LockKind) ->
+    lock(ActivityId, Opaque, {table, Tab}, LockKind),
+    Type = val({Tab, setorbag}),
+    Previous = add_previous(ActivityId, Opaque, Type, Tab),
+    St = val({Tab, storage_type}),
+    if
+	St == unknown ->
+	    ignore;
+	true ->
+	    mnesia_lib:db_fixtable(St, Tab, true)
+    end,
+    {Type, Previous}.
+
+close_iteration(Res, Tab) ->
+    case val({Tab, storage_type}) of
+	unknown ->
+	    ignore;
+	St ->
+	    mnesia_lib:db_fixtable(St, Tab, false)
+    end,
+    case Res of
+	{'EXIT', {aborted, What}} ->
+	   abort(What);
+	{'EXIT', What} ->
+	    abort(What);
+	_ ->
+	    Res
+    end.
+
+add_previous(_ActivityId, non_transaction, _Type, _Tab) ->
+    [];
+add_previous(_Tid, Ts, _Type, Tab) ->
+    Previous = ?ets_match(Ts#tidstore.store, {{Tab, '$1'}, '_', write}),
+    lists:sort(lists:concat(Previous)).
+
+%% This routine fixes up the return value from read/1 so that
+%% it is correct with respect to what this particular transaction
+%% has already written, deleted .... etc
+
+add_written([], _Tab, Objs) ->
+    Objs;  % standard normal fast case
+add_written(Written, Tab, Objs) ->
+    case val({Tab, setorbag}) of
+	bag ->
+	    add_written_to_bag(Written, Objs, []);
+	_   ->
+	    add_written_to_set(Written)
+    end.
+
+add_written_to_set(Ws) ->
+    case lists:last(Ws) of
+	{_, _, delete} -> [];
+	{_, Val, write} -> [Val];
+	{_, _, delete_object} -> []
+    end.
+
+add_written_to_bag([{_, Val, write} | Tail], Objs, Ack) ->
+    add_written_to_bag(Tail, lists:delete(Val, Objs), [Val | Ack]);
+add_written_to_bag([], Objs, Ack) ->
+    Objs ++ lists:reverse(Ack); %% Oldest write first as in ets
+add_written_to_bag([{_, _ , delete} | Tail], _Objs, _Ack) ->
+    %% This transaction just deleted all objects
+    %% with this key
+    add_written_to_bag(Tail, [], []);
+add_written_to_bag([{_, Val, delete_object} | Tail], Objs, Ack) ->
+    add_written_to_bag(Tail, lists:delete(Val, Objs), lists:delete(Val, Ack)).
+
+match_object(Pat) when tuple(Pat), size(Pat) > 2 ->
+    Tab = element(1, Pat),
+    match_object(Tab, Pat, read);
+match_object(Pat) ->
+    abort({bad_type, Pat}).
+
+match_object(Tab, Pat, LockKind) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    match_object(Tid, Ts, Tab, Pat, LockKind);
+	{Mod, Tid, Ts} ->
+	    Mod:match_object(Tid, Ts, Tab, Pat, LockKind);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+match_object(Tid, Ts, Tab, Pat, LockKind)
+  when atom(Tab), Tab /= schema, tuple(Pat), size(Pat) > 2 ->
+    case element(1, Tid) of
+	ets ->
+	    mnesia_lib:db_match_object(ram_copies, Tab, Pat);
+	tid ->
+	    Key = element(2, Pat),
+	    case has_var(Key) of
+		false -> lock_record(Tid, Ts, Tab, Key, LockKind);
+		true  -> lock_table(Tid, Ts, Tab, LockKind)
+	    end,
+	    Objs = dirty_match_object(Tab, Pat),
+	    add_written_match(Ts#tidstore.store, Pat, Tab, Objs);
+	_Protocol ->
+	    dirty_match_object(Tab, Pat)
+    end;
+match_object(_Tid, _Ts, Tab, Pat, _LockKind) ->
+    abort({bad_type, Tab, Pat}).
+
+add_written_match(S, Pat, Tab, Objs) ->
+    Ops = find_ops(S, Tab, Pat),
+    add_match(Ops, Objs, val({Tab, setorbag})).
+
+find_ops(S, Tab, Pat) ->
+    GetWritten = [{{{Tab, '_'}, Pat, write}, [], ['$_']},
+		  {{{Tab, '_'}, '_', delete}, [], ['$_']},
+		  {{{Tab, '_'}, Pat, delete_object}, [], ['$_']}],
+    ets:select(S, GetWritten).
+
+add_match([], Objs, _Type) ->
+    Objs;
+add_match(Written, Objs, ordered_set) ->
+    %% Must use keysort which is stable
+    add_ordered_match(lists:keysort(1,Written), Objs, []);
+add_match([{Oid, _, delete}|R], Objs, Type) ->
+    add_match(R, deloid(Oid, Objs), Type);
+add_match([{_Oid, Val, delete_object}|R], Objs, Type) ->
+    add_match(R, lists:delete(Val, Objs), Type);
+add_match([{_Oid, Val, write}|R], Objs, bag) ->
+    add_match(R, [Val | lists:delete(Val, Objs)], bag);
+add_match([{Oid, Val, write}|R], Objs, set) ->
+    add_match(R, [Val | deloid(Oid,Objs)],set).
+
+%% For ordered_set only !!
+add_ordered_match(Written = [{{_, Key}, _, _}|_], [Obj|Objs], Acc)
+  when Key > element(2, Obj) ->
+    add_ordered_match(Written, Objs, [Obj|Acc]);
+add_ordered_match([{{_, Key}, Val, write}|Rest], Objs =[Obj|_], Acc)
+  when Key < element(2, Obj) ->
+    add_ordered_match(Rest, [Val|Objs],Acc);
+add_ordered_match([{{_, Key}, _, _DelOP}|Rest], Objs =[Obj|_], Acc)
+  when Key < element(2, Obj) ->
+    add_ordered_match(Rest,Objs,Acc);
+%% Greater than last object
+add_ordered_match([{_, Val, write}|Rest], [], Acc) ->
+    add_ordered_match(Rest, [Val], Acc);
+add_ordered_match([_|Rest], [], Acc) ->
+    add_ordered_match(Rest, [], Acc);
+%% Keys are equal from here
+add_ordered_match([{_, Val, write}|Rest], [_Obj|Objs], Acc) ->
+    add_ordered_match(Rest, [Val|Objs], Acc);
+add_ordered_match([{_, _Val, delete}|Rest], [_Obj|Objs], Acc) ->
+    add_ordered_match(Rest, Objs, Acc);
+add_ordered_match([{_, Val, delete_object}|Rest], [Val|Objs], Acc) ->
+    add_ordered_match(Rest, Objs, Acc);
+add_ordered_match([{_, _, delete_object}|Rest], Objs, Acc) ->
+    add_ordered_match(Rest, Objs, Acc);
+add_ordered_match([], Objs, Acc) ->
+    lists:reverse(Acc, Objs).
+
+
+%%%%%%%%%%%%%%%%%%
+% select
+
+select(Tab, Pat) ->
+    select(Tab, Pat, read).
+select(Tab, Pat, LockKind)
+  when atom(Tab), Tab /= schema, list(Pat) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    select(Tid, Ts, Tab, Pat, LockKind);
+	{Mod, Tid, Ts} ->
+	    Mod:select(Tid, Ts, Tab, Pat, LockKind);
+	_ ->
+	    abort(no_transaction)
+    end;
+select(Tab, Pat, _Lock) ->
+    abort({badarg, Tab, Pat}).
+
+select(Tid, Ts, Tab, Spec, LockKind) ->
+    SelectFun = fun(FixedSpec) -> dirty_select(Tab, FixedSpec) end,
+    fun_select(Tid, Ts, Tab, Spec, LockKind, Tab, SelectFun).
+
+fun_select(Tid, Ts, Tab, Spec, LockKind, TabPat, SelectFun) ->
+    case element(1, Tid) of
+	ets ->
+	    mnesia_lib:db_select(ram_copies, Tab, Spec);
+	tid ->
+	    Store = Ts#tidstore.store,
+	    Written = ?ets_match_object(Store, {{TabPat, '_'}, '_', '_'}),
+	    %% Avoid table lock if possible
+	    case Spec of
+		[{HeadPat,_, _}] when tuple(HeadPat), size(HeadPat) > 2 ->
+		    Key = element(2, HeadPat),
+		    case has_var(Key) of
+			false -> lock_record(Tid, Ts, Tab, Key, LockKind);
+			true  -> lock_table(Tid, Ts, Tab, LockKind)
+		    end;
+		_ ->
+		    lock_table(Tid, Ts, Tab, LockKind)
+	    end,
+	    case Written of
+		[] ->
+		    %% Nothing changed in the table during this transaction,
+		    %% Simple case get results from [d]ets
+		    SelectFun(Spec);
+		_ ->
+		    %% Hard (slow case) records added or deleted earlier
+		    %% in the transaction, have to cope with that.
+		    Type = val({Tab, setorbag}),
+		    FixedSpec = get_record_pattern(Spec),
+		    TabRecs = SelectFun(FixedSpec),
+		    FixedRes = add_match(Written, TabRecs, Type),
+		    CMS = ets:match_spec_compile(Spec),
+% 		    case Type of
+% 			ordered_set ->
+% 			    ets:match_spec_run(lists:sort(FixedRes), CMS);
+% 			_ ->
+% 			    ets:match_spec_run(FixedRes, CMS)
+% 		    end
+		    ets:match_spec_run(FixedRes, CMS)
+	    end;
+	_Protocol ->
+	    SelectFun(Spec)
+    end.
+
+get_record_pattern([]) ->
+    [];
+get_record_pattern([{M,C,_B}|R]) ->
+    [{M,C,['$_']} | get_record_pattern(R)].
+
+deloid(_Oid, []) ->
+    [];
+deloid({Tab, Key}, [H | T]) when element(2, H) == Key ->
+    deloid({Tab, Key}, T);
+deloid(Oid, [H | T]) ->
+    [H | deloid(Oid, T)].
+
+all_keys(Tab) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    all_keys(Tid, Ts, Tab, read);
+	{Mod, Tid, Ts} ->
+	    Mod:all_keys(Tid, Ts, Tab, read);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+all_keys(Tid, Ts, Tab, LockKind)
+  when atom(Tab), Tab /= schema ->
+    Pat0 = val({Tab, wild_pattern}),
+    Pat = setelement(2, Pat0, '$1'),
+    Keys = select(Tid, Ts, Tab, [{Pat, [], ['$1']}], LockKind),
+    case val({Tab, setorbag}) of
+	bag ->
+	    mnesia_lib:uniq(Keys);
+	_ ->
+	    Keys
+    end;
+all_keys(_Tid, _Ts, Tab, _LockKind) ->
+    abort({bad_type, Tab}).
+
+index_match_object(Pat, Attr) when tuple(Pat), size(Pat) > 2 ->
+    Tab = element(1, Pat),
+    index_match_object(Tab, Pat, Attr, read);
+index_match_object(Pat, _Attr) ->
+    abort({bad_type, Pat}).
+
+index_match_object(Tab, Pat, Attr, LockKind) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    index_match_object(Tid, Ts, Tab, Pat, Attr, LockKind);
+	{Mod, Tid, Ts} ->
+	    Mod:index_match_object(Tid, Ts, Tab, Pat, Attr, LockKind);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+index_match_object(Tid, Ts, Tab, Pat, Attr, LockKind)
+  when atom(Tab), Tab /= schema, tuple(Pat), size(Pat) > 2 ->
+    case element(1, Tid) of
+	ets ->
+	    dirty_index_match_object(Tab, Pat, Attr); % Should be optimized?
+	tid ->
+	    case mnesia_schema:attr_tab_to_pos(Tab, Attr) of
+		Pos when Pos =< size(Pat) ->
+		    case LockKind of
+			read ->
+			    Store = Ts#tidstore.store,
+			    mnesia_locker:rlock_table(Tid, Store, Tab),
+			    Objs = dirty_index_match_object(Tab, Pat, Attr),
+			    add_written_match(Store, Pat, Tab, Objs);
+			_ ->
+			    abort({bad_type, Tab, LockKind})
+		    end;
+		BadPos ->
+		    abort({bad_type, Tab, BadPos})
+	    end;
+	_Protocol ->
+	    dirty_index_match_object(Tab, Pat, Attr)
+    end;
+index_match_object(_Tid, _Ts, Tab, Pat, _Attr, _LockKind) ->
+    abort({bad_type, Tab, Pat}).
+
+index_read(Tab, Key, Attr) ->
+    case get(mnesia_activity_state) of
+	{?DEFAULT_ACCESS, Tid, Ts} ->
+	    index_read(Tid, Ts, Tab, Key, Attr, read);
+	{Mod, Tid, Ts} ->
+	    Mod:index_read(Tid, Ts, Tab, Key, Attr, read);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+index_read(Tid, Ts, Tab, Key, Attr, LockKind)
+  when atom(Tab), Tab /= schema ->
+    case element(1, Tid) of
+	ets ->
+	    dirty_index_read(Tab, Key, Attr); % Should be optimized?
+	tid ->
+	    Pos = mnesia_schema:attr_tab_to_pos(Tab, Attr),
+	    case LockKind of
+		read ->
+		    case has_var(Key) of
+			false ->
+			    Store = Ts#tidstore.store,
+			    Objs = mnesia_index:read(Tid, Store, Tab, Key, Pos),
+			    Pat = setelement(Pos, val({Tab, wild_pattern}), Key),
+			    add_written_match(Store, Pat, Tab, Objs);
+			true ->
+			    abort({bad_type, Tab, Attr, Key})
+		    end;
+		_ ->
+		    abort({bad_type, Tab, LockKind})
+	    end;
+	_Protocol ->
+	    dirty_index_read(Tab, Key, Attr)
+    end;
+index_read(_Tid, _Ts, Tab, _Key, _Attr, _LockKind) ->
+    abort({bad_type, Tab}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Dirty access regardless of activities - updates
+
+dirty_write(Val) when tuple(Val), size(Val) > 2  ->
+    Tab = element(1, Val),
+    dirty_write(Tab, Val);
+dirty_write(Val) ->
+    abort({bad_type, Val}).
+
+dirty_write(Tab, Val) ->
+    do_dirty_write(async_dirty, Tab, Val).
+
+do_dirty_write(SyncMode, Tab, Val)
+  when atom(Tab), Tab /= schema, tuple(Val), size(Val) > 2 ->
+    case ?catch_val({Tab, record_validation}) of
+	{RecName, Arity, _Type}
+	when size(Val) == Arity, RecName == element(1, Val) ->
+	    Oid = {Tab, element(2, Val)},
+	    mnesia_tm:dirty(SyncMode, {Oid, Val, write});
+	{'EXIT', _} ->
+	    abort({no_exists, Tab});
+	_ ->
+	    abort({bad_type, Val})
+    end;
+do_dirty_write(_SyncMode, Tab, Val) ->
+    abort({bad_type, Tab, Val}).
+
+dirty_delete({Tab, Key}) ->
+    dirty_delete(Tab, Key);
+dirty_delete(Oid) ->
+    abort({bad_type, Oid}).
+
+dirty_delete(Tab, Key) ->
+    do_dirty_delete(async_dirty, Tab, Key).
+
+do_dirty_delete(SyncMode, Tab, Key) when atom(Tab), Tab /= schema  ->
+    Oid = {Tab, Key},
+    mnesia_tm:dirty(SyncMode, {Oid, Oid, delete});
+do_dirty_delete(_SyncMode, Tab, _Key) ->
+    abort({bad_type, Tab}).
+
+dirty_delete_object(Val) when tuple(Val), size(Val) > 2 ->
+    Tab = element(1, Val),
+    dirty_delete_object(Tab, Val);
+dirty_delete_object(Val) ->
+    abort({bad_type, Val}).
+
+dirty_delete_object(Tab, Val) ->
+    do_dirty_delete_object(async_dirty, Tab, Val).
+
+do_dirty_delete_object(SyncMode, Tab, Val)
+    when atom(Tab), Tab /= schema, tuple(Val), size(Val) > 2 ->
+    Oid = {Tab, element(2, Val)},
+    mnesia_tm:dirty(SyncMode, {Oid, Val, delete_object});
+do_dirty_delete_object(_SyncMode, Tab, Val) ->
+    abort({bad_type, Tab, Val}).
+
+%% A Counter is an Oid being {CounterTab, CounterName}
+
+dirty_update_counter({Tab, Key}, Incr) ->
+    dirty_update_counter(Tab, Key, Incr);
+dirty_update_counter(Counter, _Incr) ->
+    abort({bad_type, Counter}).
+
+dirty_update_counter(Tab, Key, Incr) ->
+    do_dirty_update_counter(async_dirty, Tab, Key, Incr).
+
+do_dirty_update_counter(SyncMode, Tab, Key, Incr)
+  when atom(Tab), Tab /= schema, integer(Incr) ->
+    case ?catch_val({Tab, record_validation}) of
+	{RecName, 3, set} ->
+	    Oid = {Tab, Key},
+	    mnesia_tm:dirty(SyncMode, {Oid, {RecName, Incr}, update_counter});
+	_ ->
+	    abort({combine_error, Tab, update_counter})
+    end;
+do_dirty_update_counter(_SyncMode, Tab, _Key, Incr) ->
+    abort({bad_type, Tab, Incr}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Dirty access regardless of activities - read
+
+dirty_read({Tab, Key}) ->
+    dirty_read(Tab, Key);
+dirty_read(Oid) ->
+    abort({bad_type, Oid}).
+
+dirty_read(Tab, Key)
+  when atom(Tab), Tab /= schema ->
+%%    case catch ?ets_lookup(Tab, Key) of
+%%        {'EXIT', _} ->
+            %% Bad luck, we have to perform a real lookup
+            dirty_rpc(Tab, mnesia_lib, db_get, [Tab, Key]);
+%%        Val ->
+%%            Val
+%%    end;
+dirty_read(Tab, _Key) ->
+    abort({bad_type, Tab}).
+
+dirty_match_object(Pat) when tuple(Pat), size(Pat) > 2 ->
+    Tab = element(1, Pat),
+    dirty_match_object(Tab, Pat);
+dirty_match_object(Pat) ->
+    abort({bad_type, Pat}).
+
+dirty_match_object(Tab, Pat)
+  when atom(Tab), Tab /= schema, tuple(Pat), size(Pat) > 2 ->
+    dirty_rpc(Tab, ?MODULE, remote_dirty_match_object, [Tab, Pat]);
+dirty_match_object(Tab, Pat) ->
+    abort({bad_type, Tab, Pat}).
+
+remote_dirty_match_object(Tab, Pat) ->
+    Key = element(2, Pat),
+    case has_var(Key) of
+	false ->
+	    mnesia_lib:db_match_object(Tab, Pat);
+	true ->
+	    PosList = val({Tab, index}),
+	    remote_dirty_match_object(Tab, Pat, PosList)
+    end.
+
+remote_dirty_match_object(Tab, Pat, [Pos | Tail]) when Pos =< size(Pat) ->
+    IxKey = element(Pos, Pat),
+    case has_var(IxKey) of
+	false ->
+	    mnesia_index:dirty_match_object(Tab, Pat, Pos);
+	true ->
+	    remote_dirty_match_object(Tab, Pat, Tail)
+    end;
+remote_dirty_match_object(Tab, Pat, []) ->
+    mnesia_lib:db_match_object(Tab, Pat);
+remote_dirty_match_object(Tab, Pat, _PosList) ->
+    abort({bad_type, Tab, Pat}).
+
+dirty_select(Tab, Spec) when atom(Tab), Tab /= schema, list(Spec) ->
+    dirty_rpc(Tab, ?MODULE, remote_dirty_select, [Tab, Spec]);
+dirty_select(Tab, Spec) ->
+    abort({bad_type, Tab, Spec}).
+
+remote_dirty_select(Tab, Spec) ->
+    case Spec of
+	[{HeadPat, _, _}] when tuple(HeadPat), size(HeadPat) > 2 ->
+	    Key = element(2, HeadPat),
+	    case has_var(Key) of
+		false ->
+		    mnesia_lib:db_select(Tab, Spec);
+		true  ->
+		    PosList = val({Tab, index}),
+		    remote_dirty_select(Tab, Spec, PosList)
+	    end;
+	_ ->
+	    mnesia_lib:db_select(Tab, Spec)
+    end.
+
+remote_dirty_select(Tab, [{HeadPat,_, _}] = Spec, [Pos | Tail])
+  when tuple(HeadPat), size(HeadPat) > 2, Pos =< size(Spec) ->
+    Key = element(Pos, HeadPat),
+    case has_var(Key) of
+	false ->
+	    Recs = mnesia_index:dirty_select(Tab, Spec, Pos),
+	    %% Returns the records without applying the match spec
+	    %% The actual filtering is handled by the caller
+	    CMS = ets:match_spec_compile(Spec),
+	    case val({Tab, setorbag}) of
+		ordered_set ->
+		    ets:match_spec_run(lists:sort(Recs), CMS);
+		_ ->
+		    ets:match_spec_run(Recs, CMS)
+	    end;
+	true  ->
+	    remote_dirty_select(Tab, Spec, Tail)
+    end;
+remote_dirty_select(Tab, Spec, _) ->
+    mnesia_lib:db_select(Tab, Spec).
+
+dirty_all_keys(Tab) when atom(Tab), Tab /= schema ->
+    case ?catch_val({Tab, wild_pattern}) of
+	{'EXIT', _} ->
+	    abort({no_exists, Tab});
+	Pat0 ->
+	    Pat = setelement(2, Pat0, '$1'),
+	    Keys = dirty_select(Tab, [{Pat, [], ['$1']}]),
+	    case val({Tab, setorbag}) of
+		bag -> mnesia_lib:uniq(Keys);
+		_ -> Keys
+	    end
+    end;
+dirty_all_keys(Tab) ->
+    abort({bad_type, Tab}).
+
+dirty_index_match_object(Pat, Attr) when tuple(Pat), size(Pat) > 2 ->
+    Tab = element(1, Pat),
+    dirty_index_match_object(Tab, Pat, Attr);
+dirty_index_match_object(Pat, _Attr) ->
+    abort({bad_type, Pat}).
+
+dirty_index_match_object(Tab, Pat, Attr)
+  when atom(Tab), Tab /= schema, tuple(Pat), size(Pat) > 2 ->
+    case mnesia_schema:attr_tab_to_pos(Tab, Attr) of
+	Pos when Pos =< size(Pat) ->
+	    case has_var(element(2, Pat)) of
+		false ->
+		    dirty_match_object(Tab, Pat);
+		true ->
+		    Elem = element(Pos, Pat),
+		    case has_var(Elem) of
+			false ->
+			    dirty_rpc(Tab, mnesia_index, dirty_match_object,
+				      [Tab, Pat, Pos]);
+			true ->
+			    abort({bad_type, Tab, Attr, Elem})
+		    end
+	    end;
+	BadPos ->
+	    abort({bad_type, Tab, BadPos})
+    end;
+dirty_index_match_object(Tab, Pat, _Attr) ->
+    abort({bad_type, Tab, Pat}).
+
+dirty_index_read(Tab, Key, Attr) when atom(Tab), Tab /= schema ->
+    Pos = mnesia_schema:attr_tab_to_pos(Tab, Attr),
+    case has_var(Key) of
+	false ->
+	    mnesia_index:dirty_read(Tab, Key, Pos);
+	true ->
+	    abort({bad_type, Tab, Attr, Key})
+    end;
+dirty_index_read(Tab, _Key, _Attr) ->
+    abort({bad_type, Tab}).
+
+dirty_slot(Tab, Slot) when atom(Tab), Tab /= schema, integer(Slot)  ->
+    dirty_rpc(Tab, mnesia_lib, db_slot, [Tab, Slot]);
+dirty_slot(Tab, Slot) ->
+    abort({bad_type, Tab, Slot}).
+
+dirty_first(Tab) when atom(Tab), Tab /= schema ->
+    dirty_rpc(Tab, mnesia_lib, db_first, [Tab]);
+dirty_first(Tab) ->
+    abort({bad_type, Tab}).
+
+dirty_last(Tab) when atom(Tab), Tab /= schema ->
+    dirty_rpc(Tab, mnesia_lib, db_last, [Tab]);
+dirty_last(Tab) ->
+    abort({bad_type, Tab}).
+
+dirty_next(Tab, Key) when atom(Tab), Tab /= schema ->
+    dirty_rpc(Tab, mnesia_lib, db_next_key, [Tab, Key]);
+dirty_next(Tab, _Key) ->
+    abort({bad_type, Tab}).
+
+dirty_prev(Tab, Key) when atom(Tab), Tab /= schema ->
+    dirty_rpc(Tab, mnesia_lib, db_prev_key, [Tab, Key]);
+dirty_prev(Tab, _Key) ->
+    abort({bad_type, Tab}).
+
+
+dirty_rpc(Tab, M, F, Args) ->
+    Node = val({Tab, where_to_read}),
+    do_dirty_rpc(Tab, Node, M, F, Args).
+
+do_dirty_rpc(_Tab, nowhere, _, _, Args) ->
+    mnesia:abort({no_exists, Args});
+do_dirty_rpc(Tab, Node, M, F, Args) ->
+    case rpc:call(Node, M, F, Args) of
+	{badrpc,{'EXIT', {undef, [{ M, F, _} | _]}}}
+	  when M == ?MODULE, F == remote_dirty_select ->
+	    %% Oops, the other node has not been upgraded
+	    %% to 4.0.3 yet. Lets do it the old way.
+	    %% Remove this in next release.
+	    do_dirty_rpc(Tab, Node, mnesia_lib, db_select, Args);
+	{badrpc, Reason} ->
+	    erlang:yield(), %% Do not be too eager
+	    case mnesia_controller:call({check_w2r, Node, Tab}) of % Sync
+		NewNode when NewNode == Node ->
+		    ErrorTag = mnesia_lib:dirty_rpc_error_tag(Reason),
+		    mnesia:abort({ErrorTag, Args});
+		NewNode ->
+		    case get(mnesia_activity_state) of
+			{_Mod, Tid, _Ts} when record(Tid, tid) ->
+			    %% In order to perform a consistent
+			    %% retry of a transaction we need
+			    %% to acquire the lock on the NewNode.
+			    %% In this context we do neither know
+			    %% the kind or granularity of the lock.
+			    %% --> Abort the transaction
+			    mnesia:abort({node_not_running, Node});
+			_ ->
+			    %% Splendid! A dirty retry is safe
+			    %% 'Node' probably went down now
+			    %% Let mnesia_controller get broken link message first
+			    do_dirty_rpc(Tab, NewNode, M, F, Args)
+		    end
+	    end;
+	Other ->
+	    Other
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Info
+
+%% Info about one table
+table_info(Tab, Item) ->
+    case get(mnesia_activity_state) of
+	undefined ->
+	    any_table_info(Tab, Item);
+	{?DEFAULT_ACCESS, _Tid, _Ts} ->
+	    any_table_info(Tab, Item);
+	{Mod, Tid, Ts} ->
+	    Mod:table_info(Tid, Ts, Tab, Item);
+	_ ->
+	    abort(no_transaction)
+    end.
+
+table_info(_Tid, _Ts, Tab, Item) ->
+    any_table_info(Tab, Item).
+
+
+any_table_info(Tab, Item) when atom(Tab) ->
+    case Item of
+	master_nodes ->
+	    mnesia_recover:get_master_nodes(Tab);
+%	checkpoints ->
+%	    case ?catch_val({Tab, commit_work}) of
+%		[{checkpoints, List} | _] -> List;
+%		No_chk when list(No_chk) ->  [];
+%		Else -> info_reply(Else, Tab, Item)
+%	    end;
+	size ->
+	    raw_table_info(Tab, Item);
+	memory ->
+	    raw_table_info(Tab, Item);
+	type ->
+	    case ?catch_val({Tab, setorbag}) of
+		{'EXIT', _} ->
+		    bad_info_reply(Tab, Item);
+		Val ->
+		    Val
+	    end;
+	all ->
+	    case mnesia_schema:get_table_properties(Tab) of
+		[] ->
+		    abort({no_exists, Tab, Item});
+		Props ->
+		    lists:map(fun({setorbag, Type}) -> {type, Type};
+				 (Prop) -> Prop end,
+			      Props)
+	    end;
+	_ ->
+	    case ?catch_val({Tab, Item}) of
+		{'EXIT', _} ->
+		    bad_info_reply(Tab, Item);
+		Val ->
+		    Val
+	    end
+    end;
+any_table_info(Tab, _Item) ->
+    abort({bad_type, Tab}).
+
+raw_table_info(Tab, Item) ->
+    case ?catch_val({Tab, storage_type}) of
+	ram_copies ->
+	    info_reply(catch ?ets_info(Tab, Item), Tab, Item);
+	disc_copies ->
+	    info_reply(catch ?ets_info(Tab, Item), Tab, Item);
+	disc_only_copies ->
+	    info_reply(catch dets:info(Tab, Item), Tab, Item);
+	unknown ->
+	    bad_info_reply(Tab, Item);
+	{'EXIT', _} ->
+	    bad_info_reply(Tab, Item)
+    end.
+
+info_reply({'EXIT', _Reason}, Tab, Item) ->
+    bad_info_reply(Tab, Item);
+info_reply({error, _Reason}, Tab, Item) ->
+    bad_info_reply(Tab, Item);
+info_reply(Val, _Tab, _Item) ->
+    Val.
+
+bad_info_reply(_Tab, size) -> 0;
+bad_info_reply(_Tab, memory) -> 0;
+bad_info_reply(Tab, Item) -> abort({no_exists, Tab, Item}).
+
+%% Raw info about all tables
+schema() ->
+    mnesia_schema:info().
+
+%% Raw info about one tables
+schema(Tab) ->
+    mnesia_schema:info(Tab).
+
+error_description(Err) ->
+    mnesia_lib:error_desc(Err).
+
+info() ->
+    case mnesia_lib:is_running() of
+	yes ->
+	    TmInfo = mnesia_tm:get_info(10000),
+	    Held = system_info(held_locks),
+	    Queued = system_info(lock_queue),
+
+	    io:format("---> Processes holding locks <--- ~n", []),
+	    lists:foreach(fun(L) -> io:format("Lock: ~p~n", [L]) end,
+			  Held),
+
+	    io:format( "---> Processes waiting for locks <--- ~n", []),
+	    lists:foreach(fun({Oid, Op, _Pid, Tid, OwnerTid}) ->
+				  io:format("Tid ~p waits for ~p lock "
+					    "on oid ~p owned by ~p ~n",
+					    [Tid, Op, Oid, OwnerTid])
+		  end, Queued),
+	    mnesia_tm:display_info(group_leader(), TmInfo),
+
+	    Pat = {'_', unclear, '_'},
+	    Uncertain = ets:match_object(mnesia_decision, Pat),
+
+	    io:format( "---> Uncertain transactions <--- ~n", []),
+	    lists:foreach(fun({Tid, _, Nodes}) ->
+				  io:format("Tid ~w waits for decision "
+					    "from ~w~n",
+					    [Tid, Nodes])
+		  end, Uncertain),
+
+	    mnesia_controller:info(),
+	    display_system_info(Held, Queued, TmInfo, Uncertain);
+	_ ->
+	    mini_info()
+    end,
+    ok.
+
+mini_info() ->
+    io:format("===> System info in version ~p, debug level = ~p <===~n",
+	      [system_info(version), system_info(debug)]),
+    Not =
+	case system_info(use_dir) of
+	    true -> "";
+	    false  -> "NOT "
+	end,
+
+    io:format("~w. Directory ~p is ~sused.~n",
+	      [system_info(schema_location), system_info(directory), Not]),
+    io:format("use fallback at restart = ~w~n",
+	      [system_info(fallback_activated)]),
+    Running = system_info(running_db_nodes),
+    io:format("running db nodes   = ~w~n", [Running]),
+    All = mnesia_lib:all_nodes(),
+    io:format("stopped db nodes   = ~w ~n", [All -- Running]).
+
+display_system_info(Held, Queued, TmInfo, Uncertain) ->
+    mini_info(),
+    display_tab_info(),
+    S = fun(Items) -> [system_info(I) || I <- Items] end,
+
+    io:format("~w transactions committed, ~w aborted, "
+	      "~w restarted, ~w logged to disc~n",
+	      S([transaction_commits, transaction_failures,
+		transaction_restarts, transaction_log_writes])),
+
+    {Active, Pending} =
+	case TmInfo of
+	    {timeout, _} -> {infinity, infinity};
+	    {info, P, A} -> {length(A), length(P)}
+	end,
+    io:format("~w held locks, ~w in queue; "
+	      "~w local transactions, ~w remote~n",
+	      [length(Held), length(Queued), Active, Pending]),
+
+    Ufold = fun({_, _, Ns}, {C, Old}) ->
+		    New = [N || N <- Ns, not lists:member(N, Old)],
+		    {C + 1, New ++ Old}
+	    end,
+    {Ucount, Unodes} = lists:foldl(Ufold, {0, []}, Uncertain),
+    io:format("~w transactions waits for other nodes: ~p~n",
+	      [Ucount, Unodes]).
+
+display_tab_info() ->
+    MasterTabs = mnesia_recover:get_master_node_tables(),
+    io:format("master node tables = ~p~n", [lists:sort(MasterTabs)]),
+
+    Tabs = system_info(tables),
+
+    {Unknown, Ram, Disc, DiscOnly} =
+	lists:foldl(fun storage_count/2, {[], [], [], []}, Tabs),
+
+    io:format("remote             = ~p~n", [lists:sort(Unknown)]),
+    io:format("ram_copies         = ~p~n", [lists:sort(Ram)]),
+    io:format("disc_copies        = ~p~n", [lists:sort(Disc)]),
+    io:format("disc_only_copies   = ~p~n", [lists:sort(DiscOnly)]),
+
+    Rfoldl = fun(T, Acc) ->
+		     Rpat =
+			 case val({T, access_mode}) of
+			     read_only ->
+				 lists:sort([{A, read_only} || A <- val({T, active_replicas})]);
+			     read_write ->
+				 table_info(T, where_to_commit)
+			 end,
+		     case lists:keysearch(Rpat, 1, Acc) of
+			 {value, {_Rpat, Rtabs}} ->
+			     lists:keyreplace(Rpat, 1, Acc, {Rpat, [T | Rtabs]});
+			 false ->
+			     [{Rpat, [T]} | Acc]
+		     end
+	     end,
+    Repl = lists:foldl(Rfoldl, [], Tabs),
+    Rdisp = fun({Rpat, Rtabs}) -> io:format("~p = ~p~n", [Rpat, Rtabs]) end,
+    lists:foreach(Rdisp, lists:sort(Repl)).
+
+storage_count(T, {U, R, D, DO}) ->
+    case table_info(T, storage_type) of
+	unknown -> {[T | U], R, D, DO};
+	ram_copies -> {U, [T | R], D, DO};
+	disc_copies -> {U, R, [T | D], DO};
+	disc_only_copies -> {U, R, D, [T | DO]}
+    end.
+
+system_info(Item) ->
+    case catch system_info2(Item) of
+	{'EXIT',Error} -> abort(Error);
+	Other -> Other
+    end.
+
+system_info2(all) ->
+    Items = system_info_items(mnesia_lib:is_running()),
+    [{I, system_info(I)} || I <- Items];
+
+system_info2(db_nodes) ->
+    DiscNs = ?catch_val({schema, disc_copies}),
+    RamNs = ?catch_val({schema, ram_copies}),
+    if
+	list(DiscNs), list(RamNs) ->
+	    DiscNs ++ RamNs;
+	true ->
+	    case mnesia_schema:read_nodes() of
+		{ok, Nodes} -> Nodes;
+		{error,Reason} -> exit(Reason)
+	    end
+    end;
+system_info2(running_db_nodes) ->
+    case ?catch_val({current, db_nodes}) of
+	{'EXIT',_} ->
+	    %% Ensure that we access the intended Mnesia
+	    %% directory. This function may not be called
+	    %% during startup since it will cause the
+	    %% application_controller to get into deadlock
+	    load_mnesia_or_abort(),
+	    mnesia_lib:running_nodes();
+	Other ->
+	    Other
+    end;
+
+system_info2(extra_db_nodes) ->
+    case ?catch_val(extra_db_nodes) of
+	{'EXIT',_} ->
+	    %% Ensure that we access the intended Mnesia
+	    %% directory. This function may not be called
+	    %% during startup since it will cause the
+	    %% application_controller to get into deadlock
+	    load_mnesia_or_abort(),
+	    mnesia_monitor:get_env(extra_db_nodes);
+	Other ->
+	    Other
+    end;
+
+system_info2(directory) ->
+    case ?catch_val(directory) of
+	{'EXIT',_} ->
+	    %% Ensure that we access the intended Mnesia
+	    %% directory. This function may not be called
+	    %% during startup since it will cause the
+	    %% application_controller to get into deadlock
+	    load_mnesia_or_abort(),
+	    mnesia_monitor:get_env(dir);
+	Other ->
+	    Other
+    end;
+
+system_info2(use_dir) ->
+    case ?catch_val(use_dir) of
+	{'EXIT',_} ->
+	    %% Ensure that we access the intended Mnesia
+	    %% directory. This function may not be called
+	    %% during startup since it will cause the
+	    %% application_controller to get into deadlock
+	    load_mnesia_or_abort(),
+	    mnesia_monitor:use_dir();
+	Other ->
+	    Other
+    end;
+
+system_info2(schema_location) ->
+    case ?catch_val(schema_location) of
+	{'EXIT',_} ->
+	    %% Ensure that we access the intended Mnesia
+	    %% directory. This function may not be called
+	    %% during startup since it will cause the
+	    %% application_controller to get into deadlock
+	    load_mnesia_or_abort(),
+	    mnesia_monitor:get_env(schema_location);
+	Other ->
+	    Other
+    end;
+
+system_info2(fallback_activated) ->
+    case ?catch_val(fallback_activated) of
+	{'EXIT',_} ->
+	    %% Ensure that we access the intended Mnesia
+	    %% directory. This function may not be called
+	    %% during startup since it will cause the
+	    %% application_controller to get into deadlock
+	    load_mnesia_or_abort(),
+	    mnesia_bup:fallback_exists();
+	Other ->
+	    Other
+    end;
+
+system_info2(version) ->
+    case ?catch_val(version) of
+	{'EXIT', _} ->
+	    Apps = application:loaded_applications(),
+	    case lists:keysearch(?APPLICATION, 1, Apps) of
+		{value, {_Name, _Desc, Version}} ->
+		    Version;
+		false ->
+		    %% Ensure that it does not match
+		    {mnesia_not_loaded, node(), now()}
+	    end;
+	Version ->
+	    Version
+    end;
+
+system_info2(access_module) -> mnesia_monitor:get_env(access_module);
+system_info2(auto_repair) -> mnesia_monitor:get_env(auto_repair);
+system_info2(is_running) -> mnesia_lib:is_running();
+system_info2(backup_module) -> mnesia_monitor:get_env(backup_module);
+system_info2(event_module) -> mnesia_monitor:get_env(event_module);
+system_info2(debug) -> mnesia_monitor:get_env(debug);
+system_info2(dump_log_load_regulation) -> mnesia_monitor:get_env(dump_log_load_regulation);
+system_info2(dump_log_write_threshold) -> mnesia_monitor:get_env(dump_log_write_threshold);
+system_info2(dump_log_time_threshold) -> mnesia_monitor:get_env(dump_log_time_threshold);
+system_info2(dump_log_update_in_place) ->
+    mnesia_monitor:get_env(dump_log_update_in_place);
+system_info2(dump_log_update_in_place) ->
+    mnesia_monitor:get_env(dump_log_update_in_place);
+system_info2(max_wait_for_decision) -> mnesia_monitor:get_env(max_wait_for_decision);
+system_info2(embedded_mnemosyne) -> mnesia_monitor:get_env(embedded_mnemosyne);
+system_info2(ignore_fallback_at_startup) -> mnesia_monitor:get_env(ignore_fallback_at_startup);
+system_info2(fallback_error_function) ->  mnesia_monitor:get_env(fallback_error_function);
+system_info2(log_version) -> mnesia_log:version();
+system_info2(protocol_version) -> mnesia_monitor:protocol_version();
+system_info2(schema_version) -> mnesia_schema:version(); %backward compatibility
+system_info2(tables) -> val({schema, tables});
+system_info2(local_tables) -> val({schema, local_tables});
+system_info2(master_node_tables) -> mnesia_recover:get_master_node_tables();
+system_info2(subscribers) -> mnesia_subscr:subscribers();
+system_info2(checkpoints) -> mnesia_checkpoint:checkpoints();
+system_info2(held_locks) -> mnesia_locker:get_held_locks();
+system_info2(lock_queue) -> mnesia_locker:get_lock_queue();
+system_info2(transactions) -> mnesia_tm:get_transactions();
+system_info2(transaction_failures) -> mnesia_lib:read_counter(trans_failures);
+system_info2(transaction_commits) -> mnesia_lib:read_counter(trans_commits);
+system_info2(transaction_restarts) -> mnesia_lib:read_counter(trans_restarts);
+system_info2(transaction_log_writes) -> mnesia_dumper:get_log_writes();
+
+system_info2(Item) -> exit({badarg, Item}).
+
+system_info_items(yes) ->
+    [
+     access_module,
+     auto_repair,
+     backup_module,
+     checkpoints,
+     db_nodes,
+     debug,
+     directory,
+     dump_log_load_regulation,
+     dump_log_time_threshold,
+     dump_log_update_in_place,
+     dump_log_write_threshold,
+     embedded_mnemosyne,
+     event_module,
+     extra_db_nodes,
+     fallback_activated,
+     held_locks,
+     ignore_fallback_at_startup,
+     fallback_error_function,
+     is_running,
+     local_tables,
+     lock_queue,
+     log_version,
+     master_node_tables,
+     max_wait_for_decision,
+     protocol_version,
+     running_db_nodes,
+     schema_location,
+     schema_version,
+     subscribers,
+     tables,
+     transaction_commits,
+     transaction_failures,
+     transaction_log_writes,
+     transaction_restarts,
+     transactions,
+     use_dir,
+     version
+    ];
+system_info_items(no) ->
+    [
+     auto_repair,
+     backup_module,
+     db_nodes,
+     debug,
+     directory,
+     dump_log_load_regulation,
+     dump_log_time_threshold,
+     dump_log_update_in_place,
+     dump_log_write_threshold,
+     event_module,
+     extra_db_nodes,
+     ignore_fallback_at_startup,
+     fallback_error_function,
+     is_running,
+     log_version,
+     max_wait_for_decision,
+     protocol_version,
+     running_db_nodes,
+     schema_location,
+     schema_version,
+     use_dir,
+     version
+    ].
+
+system_info() ->
+    IsRunning = mnesia_lib:is_running(),
+    case IsRunning of
+	yes ->
+	    TmInfo = mnesia_tm:get_info(10000),
+	    Held = system_info(held_locks),
+	    Queued = system_info(lock_queue),
+	    Pat = {'_', unclear, '_'},
+	    Uncertain = ets:match_object(mnesia_decision, Pat),
+	    display_system_info(Held, Queued, TmInfo, Uncertain);
+	_ ->
+	    mini_info()
+    end,
+    IsRunning.
+
+load_mnesia_or_abort() ->
+    case mnesia_lib:ensure_loaded(?APPLICATION) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    abort(Reason)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Database mgt
+
+create_schema(Ns) ->
+    mnesia_bup:create_schema(Ns).
+
+delete_schema(Ns) ->
+    mnesia_schema:delete_schema(Ns).
+
+backup(Opaque) ->
+    mnesia_log:backup(Opaque).
+
+backup(Opaque, Mod) ->
+    mnesia_log:backup(Opaque, Mod).
+
+traverse_backup(S, T, Fun, Acc) ->
+    mnesia_bup:traverse_backup(S, T, Fun, Acc).
+
+traverse_backup(S, SM, T, TM, F, A) ->
+    mnesia_bup:traverse_backup(S, SM, T, TM, F, A).
+
+install_fallback(Opaque) ->
+    mnesia_bup:install_fallback(Opaque).
+
+install_fallback(Opaque, Mod) ->
+    mnesia_bup:install_fallback(Opaque, Mod).
+
+uninstall_fallback() ->
+    mnesia_bup:uninstall_fallback().
+
+uninstall_fallback(Args) ->
+    mnesia_bup:uninstall_fallback(Args).
+
+activate_checkpoint(Args) ->
+    mnesia_checkpoint:activate(Args).
+
+deactivate_checkpoint(Name) ->
+    mnesia_checkpoint:deactivate(Name).
+
+backup_checkpoint(Name, Opaque) ->
+    mnesia_log:backup_checkpoint(Name, Opaque).
+
+backup_checkpoint(Name, Opaque, Mod) ->
+    mnesia_log:backup_checkpoint(Name, Opaque, Mod).
+
+restore(Opaque, Args) ->
+    mnesia_schema:restore(Opaque, Args).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Table mgt
+
+create_table(Arg) ->
+    mnesia_schema:create_table(Arg).
+create_table(Name, Arg) when list(Arg) ->
+    mnesia_schema:create_table([{name, Name}| Arg]);
+create_table(Name, Arg) ->
+    {aborted, badarg, Name, Arg}.
+
+delete_table(Tab) ->
+    mnesia_schema:delete_table(Tab).
+
+add_table_copy(Tab, N, S) ->
+    mnesia_schema:add_table_copy(Tab, N, S).
+del_table_copy(Tab, N) ->
+    mnesia_schema:del_table_copy(Tab, N).
+
+move_table_copy(Tab, From, To) ->
+    mnesia_schema:move_table(Tab, From, To).
+
+add_table_index(Tab, Ix) ->
+    mnesia_schema:add_table_index(Tab, Ix).
+del_table_index(Tab, Ix) ->
+    mnesia_schema:del_table_index(Tab, Ix).
+
+transform_table(Tab, Fun, NewA) ->
+    case catch val({Tab, record_name}) of
+	{'EXIT', Reason} ->
+	    mnesia:abort(Reason);
+	OldRN ->
+	    mnesia_schema:transform_table(Tab, Fun, NewA, OldRN)
+    end.
+
+transform_table(Tab, Fun, NewA, NewRN) ->
+    mnesia_schema:transform_table(Tab, Fun, NewA, NewRN).
+
+change_table_copy_type(T, N, S) ->
+    mnesia_schema:change_table_copy_type(T, N, S).
+
+clear_table(Tab) ->
+    mnesia_schema:clear_table(Tab).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Table mgt - user properties
+
+read_table_property(Tab, PropKey) ->
+    val({Tab, user_property, PropKey}).
+
+write_table_property(Tab, Prop) ->
+    mnesia_schema:write_table_property(Tab, Prop).
+
+delete_table_property(Tab, PropKey) ->
+    mnesia_schema:delete_table_property(Tab, PropKey).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Table mgt - user properties
+
+change_table_frag(Tab, FragProp) ->
+    mnesia_schema:change_table_frag(Tab, FragProp).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Table mgt - table load
+
+%% Dump a ram table to disc
+dump_tables(Tabs) ->
+    mnesia_schema:dump_tables(Tabs).
+
+%% allow the user to wait for some tables to be loaded
+wait_for_tables(Tabs, Timeout) ->
+    mnesia_controller:wait_for_tables(Tabs, Timeout).
+
+force_load_table(Tab) ->
+    case mnesia_controller:force_load_table(Tab) of
+	ok -> yes; % Backwards compatibility
+	Other -> Other
+    end.
+
+change_table_access_mode(T, Access) ->
+    mnesia_schema:change_table_access_mode(T, Access).
+
+change_table_load_order(T, O) ->
+    mnesia_schema:change_table_load_order(T, O).
+
+set_master_nodes(Nodes) when list(Nodes) ->
+    UseDir = system_info(use_dir),
+    IsRunning = system_info(is_running),
+    case IsRunning of
+	yes ->
+	    CsPat = {{'_', cstruct}, '_'},
+	    Cstructs0 = ?ets_match_object(mnesia_gvar, CsPat),
+	    Cstructs = [Cs || {_, Cs} <- Cstructs0],
+	    log_valid_master_nodes(Cstructs, Nodes, UseDir, IsRunning);
+	_NotRunning ->
+	    case UseDir of
+		true ->
+		    mnesia_lib:lock_table(schema),
+		    Res =
+			case mnesia_schema:read_cstructs_from_disc() of
+			    {ok, Cstructs} ->
+				log_valid_master_nodes(Cstructs, Nodes, UseDir, IsRunning);
+			    {error, Reason} ->
+				{error, Reason}
+			end,
+			mnesia_lib:unlock_table(schema),
+		    Res;
+		false ->
+		    ok
+	    end
+    end;
+set_master_nodes(Nodes) ->
+    {error, {bad_type, Nodes}}.
+
+log_valid_master_nodes(Cstructs, Nodes, UseDir, IsRunning) ->
+    Fun = fun(Cs) ->
+		  Copies = mnesia_lib:copy_holders(Cs),
+		  Valid = mnesia_lib:intersect(Nodes, Copies),
+		  {Cs#cstruct.name, Valid}
+	  end,
+    Args = lists:map(Fun, Cstructs),
+    mnesia_recover:log_master_nodes(Args, UseDir, IsRunning).
+
+set_master_nodes(Tab, Nodes) when list(Nodes) ->
+    UseDir = system_info(use_dir),
+    IsRunning = system_info(is_running),
+    case IsRunning of
+	yes ->
+	    case ?catch_val({Tab, cstruct}) of
+		{'EXIT', _} ->
+		    {error, {no_exists, Tab}};
+		Cs ->
+		    case Nodes -- mnesia_lib:copy_holders(Cs) of
+			[] ->
+			    Args = [{Tab , Nodes}],
+			    mnesia_recover:log_master_nodes(Args, UseDir, IsRunning);
+			BadNodes ->
+			    {error, {no_exists, Tab,  BadNodes}}
+		    end
+	    end;
+	_NotRunning ->
+	    case UseDir of
+		true ->
+		    mnesia_lib:lock_table(schema),
+		    Res =
+			case mnesia_schema:read_cstructs_from_disc() of
+			    {ok, Cstructs} ->
+				case lists:keysearch(Tab, 2, Cstructs) of
+				    {value, Cs} ->
+					case Nodes -- mnesia_lib:copy_holders(Cs) of
+					    [] ->
+						Args = [{Tab , Nodes}],
+						mnesia_recover:log_master_nodes(Args, UseDir, IsRunning);
+					    BadNodes ->
+						{error, {no_exists, Tab,  BadNodes}}
+					end;
+				    false ->
+					{error, {no_exists, Tab}}
+				end;
+			    {error, Reason} ->
+				{error, Reason}
+			end,
+		    mnesia_lib:unlock_table(schema),
+		    Res;
+		false ->
+		    ok
+	    end
+    end;
+set_master_nodes(Tab, Nodes) ->
+    {error, {bad_type, Tab, Nodes}}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Misc admin
+
+dump_log() ->
+    mnesia_controller:sync_dump_log(user).
+
+subscribe(What) ->
+    mnesia_subscr:subscribe(self(), What).
+
+unsubscribe(What) ->
+    mnesia_subscr:unsubscribe(self(), What).
+
+report_event(Event) ->
+    mnesia_lib:report_system_event({mnesia_user, Event}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Snmp
+
+snmp_open_table(Tab, Us) ->
+    mnesia_schema:add_snmp(Tab, Us).
+
+snmp_close_table(Tab) ->
+    mnesia_schema:del_snmp(Tab).
+
+snmp_get_row(Tab, RowIndex) when atom(Tab), Tab /= schema ->
+    dirty_rpc(Tab, mnesia_snmp_hook, get_row, [Tab, RowIndex]);
+snmp_get_row(Tab, _RowIndex) ->
+    abort({bad_type, Tab}).
+
+snmp_get_next_index(Tab, RowIndex) when atom(Tab), Tab /= schema ->
+    dirty_rpc(Tab, mnesia_snmp_hook, get_next_index, [Tab, RowIndex]);
+snmp_get_next_index(Tab, _RowIndex) ->
+    abort({bad_type, Tab}).
+
+snmp_get_mnesia_key(Tab, RowIndex) when atom(Tab), Tab /= schema ->
+    dirty_rpc(Tab, mnesia_snmp_hook, get_mnesia_key, [Tab, RowIndex]);
+snmp_get_mnesia_key(Tab, _RowIndex) ->
+    abort({bad_type, Tab}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Textfile access
+
+load_textfile(F) ->
+    mnesia_text:load_textfile(F).
+dump_to_textfile(F) ->
+    mnesia_text:dump_to_textfile(F).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Mnemosyne exclusive
+
+get_activity_id() ->
+    get(mnesia_activity_state).
+
+put_activity_id(Activity) ->
+    mnesia_tm:put_activity_id(Activity).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.hrl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.hrl
new file mode 100644
index 0000000000..cd3cee974b
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.hrl
@@ -0,0 +1,117 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia.hrl,v 1.1 2008/12/17 09:53:37 mikpe Exp $
+%%
+
+-define(APPLICATION, mnesia).
+
+-define(ets_lookup(Tab, Key), ets:lookup(Tab, Key)).
+-define(ets_lookup_element(Tab, Key, Pos), ets:lookup_element(Tab, Key, Pos)).
+-define(ets_insert(Tab, Rec), ets:insert(Tab, Rec)).
+-define(ets_delete(Tab, Key), ets:delete(Tab, Key)).
+-define(ets_match_delete(Tab, Pat), ets:match_delete(Tab, Pat)).
+-define(ets_match_object(Tab, Pat), ets:match_object(Tab, Pat)).
+-define(ets_match(Tab, Pat), ets:match(Tab, Pat)).
+-define(ets_info(Tab, Item), ets:info(Tab, Item)).
+-define(ets_update_counter(Tab, Key, Incr), ets:update_counter(Tab, Key, Incr)).
+-define(ets_first(Tab), ets:first(Tab)).
+-define(ets_next(Tab, Key), ets:next(Tab, Key)).
+-define(ets_last(Tab), ets:last(Tab)).
+-define(ets_prev(Tab, Key), ets:prev(Tab, Key)).
+-define(ets_slot(Tab, Pos), ets:slot(Tab, Pos)).
+-define(ets_new_table(Tab, Props), ets:new(Tab, Props)).
+-define(ets_delete_table(Tab), ets:delete(Tab)).
+-define(ets_fixtable(Tab, Bool), ets:fixtable(Tab, Bool)).
+
+-define(catch_val(Var), (catch ?ets_lookup_element(mnesia_gvar, Var, 2))).
+
+%% It's important that counter is first, since we compare tid's
+
+-record(tid,
+        {counter,         %% serial no for tid
+         pid}).           %%  owner of tid
+
+
+-record(tidstore,
+        {store,           %% current ets table for tid
+         up_stores = [],  %% list of upper layer stores for nested trans
+         level = 1}).     %% transaction level
+
+-define(unique_cookie, {erlang:now(), node()}).
+
+-record(cstruct, {name,                            % Atom
+		  type = set,                      % set | bag
+		  ram_copies = [],                 % [Node]
+		  disc_copies = [],                % [Node]
+		  disc_only_copies = [],           % [Node]
+		  load_order = 0,                  % Integer
+		  access_mode = read_write,        % read_write | read_only
+		  index = [],                      % [Integer]
+		  snmp = [],                       % Snmp Ustruct
+		  local_content = false,           % true | false
+		  record_name = {bad_record_name}, % Atom (Default = Name)
+		  attributes = [key, val],         % [Atom]
+		  user_properties = [],            % [Record]
+		  frag_properties = [],            % [{Key, Val]
+                  cookie = ?unique_cookie,         % Term
+                  version = {{2, 0}, []}}).        % {{Integer, Integer}, [Node]}
+
+%% Record for the head structure in Mnesia's log files
+%%
+%% The definition of this record may *NEVER* be changed
+%% since it may be written to very old backup files.
+%% By holding this record definition stable we can be
+%% able to comprahend backups from timepoint 0. It also
+%% allows us to use the backup format as an interchange
+%% format between Mnesia releases.
+
+-record(log_header,{log_kind,
+		    log_version,
+		    mnesia_version,
+		    node,
+		    now}).
+
+%% Commit records stored in the transaction log
+-record(commit, {node,
+		 decision, % presume_commit | Decision
+		 ram_copies = [],
+		 disc_copies = [],
+		 disc_only_copies = [],
+		 snmp = [],
+		 schema_ops = []
+		}).
+
+-record(decision, {tid,
+		   outcome, % presume_abort | committed
+		   disc_nodes,
+		   ram_nodes}).
+
+%% Maybe cyclic wait
+-record(cyclic, {node = node(),
+		 oid,  % {Tab, Key}
+		 op,   % read | write
+		 lock, % read | write
+		 lucky
+		}).
+
+%% Managing conditional debug functions
+
+-ifdef(debug).
+    -define(eval_debug_fun(I, C),
+	    mnesia_lib:eval_debug_fun(I, C, ?FILE, ?LINE)).
+-else.
+    -define(eval_debug_fun(I, C), ok).
+-endif.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_backup.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_backup.erl
new file mode 100644
index 0000000000..f01310530e
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_backup.erl
@@ -0,0 +1,194 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_backup.erl,v 1.1 2008/12/17 09:53:37 mikpe Exp $
+%%
+%0
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% This module contains one implementation of callback functions
+%% used by Mnesia at backup and restore. The user may however
+%% write an own module the same interface as mnesia_backup and
+%% configure Mnesia so the alternate module performs the actual
+%% accesses to the backup media. This means that the user may put
+%% the backup on medias that Mnesia does not know about, possibly
+%% on hosts where Erlang is not running.
+%%
+%% The OpaqueData argument is never interpreted by other parts of
+%% Mnesia. It is the property of this module. Alternate implementations
+%% of this module may have different interpretations of OpaqueData.
+%% The OpaqueData argument given to open_write/1 and open_read/1
+%% are forwarded directly from the user.
+%%
+%% All functions must return {ok, NewOpaqueData} or {error, Reason}.
+%%
+%% The NewOpaqueData arguments returned by backup callback functions will
+%% be given as input when the next backup callback function is invoked.
+%% If any return value does not match {ok, _} the backup will be aborted.
+%%
+%% The NewOpaqueData arguments returned by restore callback functions will
+%% be given as input when the next restore callback function is invoked
+%% If any return value does not match {ok, _} the restore will be aborted.
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-module(mnesia_backup).
+-behaviour(mnesia_backup).
+
+-include_lib("kernel/include/file.hrl").
+
+-export([
+	 %% Write access
+         open_write/1,
+	 write/2,
+	 commit_write/1,
+	 abort_write/1,
+
+	 %% Read access
+         open_read/1,
+	 read/1,
+	 close_read/1
+        ]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Backup callback interface
+-record(backup, {tmp_file, file, file_desc}).
+
+%% Opens backup media for write
+%%
+%% Returns {ok, OpaqueData} or {error, Reason}
+open_write(OpaqueData) ->
+    File = OpaqueData,
+    Tmp = lists:concat([File,".BUPTMP"]),
+    file:delete(Tmp),
+    file:delete(File),
+    case disk_log:open([{name, make_ref()},
+			{file, Tmp},
+			{repair, false},
+			{linkto, self()}]) of
+	{ok, Fd} ->
+	    {ok, #backup{tmp_file = Tmp, file = File, file_desc = Fd}};
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+%% Writes BackupItems to the backup media
+%%
+%% Returns {ok, OpaqueData} or {error, Reason}
+write(OpaqueData, BackupItems) ->
+    B = OpaqueData,
+    case disk_log:log_terms(B#backup.file_desc, BackupItems) of
+        ok ->
+            {ok, B};
+        {error, Reason} ->
+            abort_write(B),
+            {error, Reason}
+    end.
+
+%% Closes the backup media after a successful backup
+%%
+%% Returns {ok, ReturnValueToUser} or {error, Reason}
+commit_write(OpaqueData) ->
+    B = OpaqueData,
+    case disk_log:sync(B#backup.file_desc) of
+        ok ->
+            case disk_log:close(B#backup.file_desc) of
+                ok ->
+		    case file:rename(B#backup.tmp_file, B#backup.file) of
+		       ok ->
+			    {ok, B#backup.file};
+		       {error, Reason} ->
+			    {error, Reason}
+		    end;
+                {error, Reason} ->
+		    {error, Reason}
+            end;
+        {error, Reason} ->
+            {error, Reason}
+    end.
+
+%% Closes the backup media after an interrupted backup
+%%
+%% Returns {ok, ReturnValueToUser} or {error, Reason}
+abort_write(BackupRef) ->
+    Res = disk_log:close(BackupRef#backup.file_desc),
+    file:delete(BackupRef#backup.tmp_file),
+    case Res of
+        ok ->
+            {ok, BackupRef#backup.file};
+        {error, Reason} ->
+            {error, Reason}
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Restore callback interface
+
+-record(restore, {file, file_desc, cont}).
+
+%% Opens backup media for read
+%%
+%% Returns {ok, OpaqueData} or {error, Reason}
+open_read(OpaqueData) ->
+    File = OpaqueData,
+    case file:read_file_info(File) of
+	{error, Reason} ->
+	    {error, Reason};
+	_FileInfo -> %% file exists
+	    case disk_log:open([{file, File},
+				{name, make_ref()},
+				{repair, false},
+				{mode, read_only},
+				{linkto, self()}]) of
+		{ok, Fd} ->
+		    {ok, #restore{file = File, file_desc = Fd, cont = start}};
+		{repaired, Fd, _, {badbytes, 0}} ->
+		    {ok, #restore{file = File, file_desc = Fd, cont = start}};
+		{repaired, Fd, _, _} ->
+		    {ok, #restore{file = File, file_desc = Fd, cont = start}};
+		{error, Reason} ->
+		    {error, Reason}
+	    end
+    end.
+
+%% Reads BackupItems from the backup media
+%%
+%% Returns {ok, OpaqueData, BackupItems} or {error, Reason}
+%%
+%% BackupItems == [] is interpreted as eof
+read(OpaqueData) ->
+    R = OpaqueData,
+    Fd = R#restore.file_desc,
+    case disk_log:chunk(Fd, R#restore.cont) of
+        {error, Reason} ->
+            {error, {"Possibly truncated", Reason}};
+        eof ->
+            {ok, R, []};
+        {Cont, []} ->
+            read(R#restore{cont = Cont});
+        {Cont, BackupItems} ->
+            {ok, R#restore{cont = Cont}, BackupItems}
+    end.
+
+%% Closes the backup media after restore
+%%
+%% Returns {ok, ReturnValueToUser} or {error, Reason}
+close_read(OpaqueData) ->
+    R = OpaqueData,
+    case disk_log:close(R#restore.file_desc) of
+        ok -> {ok, R#restore.file};
+        {error, Reason} -> {error, Reason}
+    end.
+%0
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_bup.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_bup.erl
new file mode 100644
index 0000000000..eb636a8447
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_bup.erl
@@ -0,0 +1,1168 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_bup.erl,v 1.1 2008/12/17 09:53:37 mikpe Exp $
+%%
+-module(mnesia_bup).
+-export([
+	 %% Public interface
+	 iterate/4,
+	 read_schema/2,
+	 fallback_bup/0,
+	 fallback_exists/0,
+	 tm_fallback_start/1,
+	 create_schema/1,
+	 install_fallback/1,
+	 install_fallback/2,
+	 uninstall_fallback/0,
+	 uninstall_fallback/1,
+	 traverse_backup/4,
+	 traverse_backup/6,
+	 make_initial_backup/3,
+	 fallback_to_schema/0,
+	 lookup_schema/2,
+	 schema2bup/1,
+	 refresh_cookie/2,
+
+	 %% Internal
+	 fallback_receiver/2,
+	 install_fallback_master/2,
+	 uninstall_fallback_master/2,
+	 local_uninstall_fallback/2,
+	 do_traverse_backup/7,
+	 trav_apply/4
+	]).
+
+-include("mnesia.hrl").
+-import(mnesia_lib, [verbose/2, dbg_out/2]).
+
+-record(restore, {mode, bup_module, bup_data}).
+
+-record(fallback_args, {opaque,
+			scope = global,
+			module = mnesia_monitor:get_env(backup_module),
+			use_default_dir = true,
+			mnesia_dir,
+			fallback_bup,
+			fallback_tmp,
+			skip_tables = [],
+			keep_tables = [],
+			default_op = keep_tables
+		       }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Backup iterator
+
+%% Reads schema section and iterates over all records in a backup.
+%%
+%% Fun(BunchOfRecords, Header, Schema, Acc) is applied when a suitable amount
+%% of records has been collected.
+%%
+%% BunchOfRecords will be [] when the iteration is done.
+iterate(Mod, Fun, Opaque, Acc) ->
+    R = #restore{bup_module = Mod, bup_data = Opaque},
+    case catch read_schema_section(R) of
+	{error, Reason} ->
+	    {error, Reason};
+	{R2, {Header, Schema, Rest}} ->
+	    case catch iter(R2, Header, Schema, Fun, Acc, Rest) of
+		{ok, R3, Res} ->
+		    catch safe_apply(R3, close_read, [R3#restore.bup_data]),
+		    {ok, Res};
+		{error, Reason} ->
+		    catch safe_apply(R2, close_read, [R2#restore.bup_data]),
+		    {error, Reason};
+		{'EXIT', Pid, Reason} ->
+		    catch safe_apply(R2, close_read, [R2#restore.bup_data]),
+		    {error, {'EXIT', Pid, Reason}};
+		{'EXIT', Reason} ->
+		    catch safe_apply(R2, close_read, [R2#restore.bup_data]),
+		    {error, {'EXIT', Reason}}
+	    end
+    end.
+
+iter(R, Header, Schema, Fun, Acc, []) ->
+    case safe_apply(R, read, [R#restore.bup_data]) of
+	{R2, []} ->
+	    Res = Fun([], Header, Schema, Acc),
+	    {ok, R2, Res};
+	{R2, BupItems} ->
+	    iter(R2, Header, Schema, Fun, Acc, BupItems)
+    end;
+iter(R, Header, Schema, Fun, Acc, BupItems) ->
+    Acc2 = Fun(BupItems, Header, Schema, Acc),
+    iter(R, Header, Schema, Fun, Acc2, []).
+
+safe_apply(R, write, [_, Items]) when Items == [] ->
+    R;
+safe_apply(R, What, Args) ->
+    Abort = fun(Re) -> abort_restore(R, What, Args, Re) end,
+    receive
+	{'EXIT', Pid, Re} -> Abort({'EXIT', Pid, Re})
+    after 0 ->
+	    Mod = R#restore.bup_module,
+	    case catch apply(Mod, What, Args) of
+		{ok, Opaque, Items} when What == read ->
+		    {R#restore{bup_data = Opaque}, Items};
+		{ok, Opaque}  when What /= read->
+		    R#restore{bup_data = Opaque};
+		{error, Re} ->
+		    Abort(Re);
+		Re ->
+		    Abort(Re)
+	    end
+    end.
+
+abort_restore(R, What, Args, Reason) ->
+    Mod = R#restore.bup_module,
+    Opaque = R#restore.bup_data,
+    dbg_out("Restore aborted. ~p:~p~p -> ~p~n",
+	    [Mod, What, Args, Reason]),
+    catch apply(Mod, close_read, [Opaque]),
+    throw({error, Reason}).
+
+fallback_to_schema() ->
+    Fname = fallback_bup(),
+    fallback_to_schema(Fname).
+
+fallback_to_schema(Fname) ->
+    Mod = mnesia_backup,
+    case read_schema(Mod, Fname) of
+	{error, Reason} ->
+	    {error, Reason};
+	Schema ->
+	    case catch lookup_schema(schema, Schema) of
+		{error, _} ->
+		    {error, "No schema in fallback"};
+		List ->
+		    {ok, fallback, List}
+	    end
+    end.
+
+%% Opens Opaque reads schema and then close
+read_schema(Mod, Opaque) ->
+    R = #restore{bup_module = Mod, bup_data = Opaque},
+    case catch read_schema_section(R) of
+	{error, Reason} ->
+	    {error, Reason};
+	{R2, {_Header, Schema, _}} ->
+	    catch safe_apply(R2, close_read, [R2#restore.bup_data]),
+	    Schema
+    end.
+
+%% Open backup media and extract schema
+%% rewind backup media and leave it open
+%% Returns {R, {Header, Schema}}
+read_schema_section(R) ->
+    case catch do_read_schema_section(R) of
+	{'EXIT', Reason} ->
+	    catch safe_apply(R, close_read, [R#restore.bup_data]),
+	    {error, {'EXIT', Reason}};
+	{error, Reason} ->
+	    catch safe_apply(R, close_read, [R#restore.bup_data]),
+	    {error, Reason};
+	{R2, {H, Schema, Rest}} ->
+	    Schema2 = convert_schema(H#log_header.log_version, Schema),
+	    {R2, {H, Schema2, Rest}}
+    end.
+
+do_read_schema_section(R) ->
+    R2 = safe_apply(R, open_read, [R#restore.bup_data]),
+    {R3, RawSchema} = safe_apply(R2, read, [R2#restore.bup_data]),
+    do_read_schema_section(R3, verify_header(RawSchema), []).
+
+do_read_schema_section(R, {ok, B, C, []}, Acc) ->
+    case safe_apply(R, read, [R#restore.bup_data]) of
+	{R2, []} ->
+	    {R2, {B, Acc, []}};
+	{R2, RawSchema} ->
+	    do_read_schema_section(R2, {ok, B, C, RawSchema}, Acc)
+    end;
+
+do_read_schema_section(R, {ok, B, C, [Head | Tail]}, Acc)
+        when element(1, Head) == schema ->
+    do_read_schema_section(R, {ok, B, C, Tail}, Acc ++ [Head]);
+
+do_read_schema_section(R, {ok, B, _C, Rest}, Acc) ->
+    {R, {B, Acc, Rest}};
+
+do_read_schema_section(_R, {error, Reason}, _Acc) ->
+    {error, Reason}.
+
+verify_header([H | RawSchema])  when record(H, log_header) ->
+    Current = mnesia_log:backup_log_header(),
+    if
+	H#log_header.log_kind == Current#log_header.log_kind ->
+	    Versions = ["0.1", "1.1", Current#log_header.log_version],
+	    case lists:member(H#log_header.log_version, Versions) of
+		true ->
+		    {ok, H, Current, RawSchema};
+		false ->
+		    {error, {"Bad header version. Cannot be used as backup.", H}}
+	    end;
+	true ->
+	    {error, {"Bad kind of header. Cannot be used as backup.", H}}
+    end;
+verify_header(RawSchema) ->
+    {error, {"Missing header. Cannot be used as backup.", catch hd(RawSchema)}}.
+
+refresh_cookie(Schema, NewCookie) ->
+    case lists:keysearch(schema, 2, Schema) of
+	{value, {schema, schema, List}} ->
+	    Cs = mnesia_schema:list2cs(List),
+	    Cs2 = Cs#cstruct{cookie = NewCookie},
+	    Item = {schema, schema, mnesia_schema:cs2list(Cs2)},
+	    lists:keyreplace(schema, 2, Schema, Item);
+
+	false ->
+	    Reason = "No schema found. Cannot be used as backup.",
+	    throw({error, {Reason, Schema}})
+    end.
+
+%% Convert schema items from an external backup
+%% If backup format is the latest, no conversion is needed
+%% All supported backup formats should have their converters
+%% here as separate function clauses.
+convert_schema("0.1", Schema) ->
+    convert_0_1(Schema);
+convert_schema("1.1", Schema) ->
+    %% The new backup format is a pure extension of the old one
+    Current = mnesia_log:backup_log_header(),
+    convert_schema(Current#log_header.log_version, Schema);
+convert_schema(Latest, Schema) ->
+    H = mnesia_log:backup_log_header(),
+    if
+	H#log_header.log_version == Latest ->
+	    Schema;
+	true ->
+	    Reason = "Bad backup header version. Cannot convert schema.",
+	    throw({error, {Reason, H}})
+    end.
+
+%% Backward compatibility for 0.1
+convert_0_1(Schema) ->
+    case lists:keysearch(schema, 2, Schema) of
+	{value, {schema, schema, List}} ->
+	    Schema2 = lists:keydelete(schema, 2, Schema),
+	    Cs = mnesia_schema:list2cs(List),
+	    convert_0_1(Schema2, [], Cs);
+	false ->
+	    List = mnesia_schema:get_initial_schema(disc_copies, [node()]),
+	    Cs = mnesia_schema:list2cs(List),
+	    convert_0_1(Schema, [], Cs)
+    end.
+
+convert_0_1([{schema, cookie, Cookie} | Schema], Acc, Cs) ->
+    convert_0_1(Schema, Acc, Cs#cstruct{cookie = Cookie});
+convert_0_1([{schema, db_nodes, DbNodes} | Schema], Acc, Cs) ->
+    convert_0_1(Schema, Acc, Cs#cstruct{disc_copies = DbNodes});
+convert_0_1([{schema, version, Version} | Schema], Acc, Cs) ->
+    convert_0_1(Schema, Acc, Cs#cstruct{version = Version});
+convert_0_1([{schema, Tab, Def} | Schema], Acc, Cs) ->
+    Head =
+	case lists:keysearch(index, 1, Def) of
+	    {value, {index, PosList}} ->
+		%% Remove the snmp "index"
+		P = PosList -- [snmp],
+		Def2 = lists:keyreplace(index, 1, Def, {index, P}),
+		{schema, Tab, Def2};
+	    false ->
+		{schema, Tab, Def}
+	end,
+    convert_0_1(Schema, [Head | Acc], Cs);
+convert_0_1([Head | Schema], Acc, Cs) ->
+    convert_0_1(Schema, [Head | Acc], Cs);
+convert_0_1([], Acc, Cs) ->
+    [schema2bup({schema, schema, Cs}) | Acc].
+
+%% Returns Val or throw error
+lookup_schema(Key, Schema) ->
+    case lists:keysearch(Key, 2, Schema) of
+	{value, {schema, Key, Val}} -> Val;
+	false -> throw({error, {"Cannot lookup", Key}})
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Backup compatibility
+
+%% Convert internal schema items to backup dito
+schema2bup({schema, Tab}) ->
+    {schema, Tab};
+schema2bup({schema, Tab, TableDef}) ->
+    {schema, Tab, mnesia_schema:cs2list(TableDef)}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Create schema on the given nodes
+%% Requires that old schemas has been deleted
+%% Returns ok | {error, Reason}
+create_schema([]) ->
+    create_schema([node()]);
+create_schema(Ns) when list(Ns) ->
+    case is_set(Ns) of
+	true ->
+	    create_schema(Ns, mnesia_schema:ensure_no_schema(Ns));
+	false ->
+	    {error, {combine_error, Ns}}
+    end;
+create_schema(Ns) ->
+    {error, {badarg, Ns}}.
+
+is_set(List) when list(List) ->
+    ordsets:is_set(lists:sort(List));
+is_set(_) ->
+    false.
+
+create_schema(Ns, ok) ->
+    %% Ensure that we access the intended Mnesia
+    %% directory. This function may not be called
+    %% during startup since it will cause the
+    %% application_controller to get into deadlock
+    case mnesia_lib:ensure_loaded(?APPLICATION) of
+	ok ->
+	    case mnesia_monitor:get_env(schema_location) of
+		ram ->
+		    {error, {has_no_disc, node()}};
+		_ ->
+		    case mnesia_schema:opt_create_dir(true, mnesia_lib:dir()) of
+			{error, What} ->
+			    {error, What};
+			ok ->
+			    Mod = mnesia_backup,
+			    Str = mk_str(),
+			    File = mnesia_lib:dir(Str),
+			    file:delete(File),
+			    case catch make_initial_backup(Ns, File, Mod) of
+				{ok, _Res} ->
+				    case do_install_fallback(File, Mod) of
+					ok ->
+					    file:delete(File),
+					    ok;
+					{error, Reason} ->
+					    {error, Reason}
+				    end;
+				{error, Reason} ->
+				    {error, Reason}
+			    end
+		    end
+	    end;
+	{error, Reason} ->
+	    {error, Reason}
+    end;
+create_schema(_Ns, {error, Reason}) ->
+    {error, Reason};
+create_schema(_Ns, Reason) ->
+    {error, Reason}.
+
+mk_str() ->
+    Now = [integer_to_list(I) || I <- tuple_to_list(now())],
+    lists:concat([node()] ++ Now ++ ".TMP").
+
+make_initial_backup(Ns, Opaque, Mod) ->
+    Schema = [{schema, schema, mnesia_schema:get_initial_schema(disc_copies, Ns)}],
+    O2 = do_apply(Mod, open_write, [Opaque], Opaque),
+    O3 = do_apply(Mod, write, [O2, [mnesia_log:backup_log_header()]], O2),
+    O4 = do_apply(Mod, write, [O3, Schema], O3),
+    O5 = do_apply(Mod, commit_write, [O4], O4),
+    {ok, O5}.
+
+do_apply(_, write, [_, Items], Opaque) when Items == [] ->
+    Opaque;
+do_apply(Mod, What, Args, _Opaque) ->
+    case catch apply(Mod, What, Args) of
+	{ok, Opaque2} ->  Opaque2;
+	{error, Reason} -> throw({error, Reason});
+	{'EXIT', Reason} -> throw({error, {'EXIT', Reason}})
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Restore
+
+%% Restore schema and possibly other tables from a backup
+%% and replicate them to the necessary nodes
+%% Requires that old schemas has been deleted
+%% Returns ok | {error, Reason}
+install_fallback(Opaque) ->
+    install_fallback(Opaque, []).
+
+install_fallback(Opaque, Args) ->
+    %% Ensure that we access the intended Mnesia
+    %% directory. This function may not be called
+    %% during startup since it will cause the
+    %% application_controller to get into deadlock
+    case mnesia_lib:ensure_loaded(?APPLICATION) of
+	ok ->
+	    do_install_fallback(Opaque, Args);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+do_install_fallback(Opaque,  Mod) when atom(Mod) ->
+    do_install_fallback(Opaque, [{module, Mod}]);
+do_install_fallback(Opaque, Args) when list(Args) ->
+    case check_fallback_args(Args, #fallback_args{opaque = Opaque}) of
+	{ok, FA} ->
+	    do_install_fallback(FA);
+	{error, Reason} ->
+	    {error, Reason}
+    end;
+do_install_fallback(_Opaque, Args) ->
+    {error, {badarg, Args}}.
+
+check_fallback_args([Arg | Tail], FA) ->
+    case catch check_fallback_arg_type(Arg, FA) of
+	{'EXIT', _Reason} ->
+	    {error, {badarg, Arg}};
+	FA2 ->
+	    check_fallback_args(Tail, FA2)
+    end;
+check_fallback_args([], FA) ->
+    {ok, FA}.
+
+check_fallback_arg_type(Arg, FA) ->
+    case Arg of
+	{scope, global} ->
+	    FA#fallback_args{scope = global};
+	{scope, local} ->
+	    FA#fallback_args{scope = local};
+	{module, Mod} ->
+	    Mod2 = mnesia_monitor:do_check_type(backup_module, Mod),
+	    FA#fallback_args{module = Mod2};
+	{mnesia_dir, Dir} ->
+	    FA#fallback_args{mnesia_dir = Dir,
+			     use_default_dir = false};
+	{keep_tables, Tabs} ->
+	    atom_list(Tabs),
+	    FA#fallback_args{keep_tables = Tabs};
+	{skip_tables, Tabs} ->
+	    atom_list(Tabs),
+	    FA#fallback_args{skip_tables = Tabs};
+	{default_op, keep_tables} ->
+	    FA#fallback_args{default_op = keep_tables};
+	{default_op, skip_tables} ->
+	    FA#fallback_args{default_op = skip_tables}
+    end.
+
+atom_list([H | T]) when atom(H) ->
+    atom_list(T);
+atom_list([]) ->
+    ok.
+
+do_install_fallback(FA) ->
+    Pid = spawn_link(?MODULE, install_fallback_master, [self(), FA]),
+    Res =
+	receive
+	    {'EXIT', Pid, Reason} -> % if appl has trapped exit
+		{error, {'EXIT', Reason}};
+	    {Pid, Res2} ->
+		case Res2 of
+		    {ok, _} ->
+			ok;
+		    {error, Reason} ->
+			{error, {"Cannot install fallback", Reason}}
+		end
+	end,
+    Res.
+
+install_fallback_master(ClientPid, FA) ->
+    process_flag(trap_exit, true),
+    State = {start, FA},
+    Opaque = FA#fallback_args.opaque,
+    Mod = FA#fallback_args.module,
+    Res = (catch iterate(Mod, fun restore_recs/4, Opaque, State)),
+    unlink(ClientPid),
+    ClientPid ! {self(), Res},
+    exit(shutdown).
+
+restore_recs(_, _, _, stop) ->
+    throw({error, "restore_recs already stopped"});
+
+restore_recs(Recs, Header, Schema, {start, FA}) ->
+    %% No records in backup
+    Schema2 = convert_schema(Header#log_header.log_version, Schema),
+    CreateList = lookup_schema(schema, Schema2),
+    case catch mnesia_schema:list2cs(CreateList) of
+	{'EXIT', Reason} ->
+	    throw({error, {"Bad schema in restore_recs", Reason}});
+	Cs ->
+	    Ns = get_fallback_nodes(FA, Cs#cstruct.disc_copies),
+	    global:set_lock({{mnesia_table_lock, schema}, self()}, Ns, infinity),
+	    Args = [self(), FA],
+	    Pids = [spawn_link(N, ?MODULE, fallback_receiver, Args) || N <- Ns],
+	    send_fallback(Pids, {start, Header, Schema2}),
+	    Res = restore_recs(Recs, Header, Schema2, Pids),
+	    global:del_lock({{mnesia_table_lock, schema}, self()}, Ns),
+	    Res
+    end;
+
+restore_recs([], _Header, _Schema, Pids) ->
+    send_fallback(Pids, swap),
+    send_fallback(Pids, stop),
+    stop;
+
+restore_recs(Recs, _, _, Pids) ->
+    send_fallback(Pids, {records, Recs}),
+    Pids.
+
+get_fallback_nodes(FA, Ns) ->
+    This = node(),
+    case lists:member(This, Ns) of
+	true ->
+	    case FA#fallback_args.scope of
+		global ->  Ns;
+		local -> [This]
+	    end;
+	false ->
+	    throw({error, {"No disc resident schema on local node", Ns}})
+    end.
+
+send_fallback(Pids, Msg) when list(Pids), Pids /= [] ->
+    lists:foreach(fun(Pid) -> Pid ! {self(), Msg} end, Pids),
+    rec_answers(Pids, []).
+
+rec_answers([], Acc) ->
+    case {lists:keysearch(error, 1, Acc), mnesia_lib:uniq(Acc)} of
+	{{value, {error, Val}}, _} -> throw({error, Val});
+	{_, [SameAnswer]} -> SameAnswer;
+	{_, Other} -> throw({error, {"Different answers", Other}})
+    end;
+rec_answers(Pids, Acc) ->
+    receive
+	{'EXIT', Pid, stopped} ->
+	    Pids2 = lists:delete(Pid, Pids),
+	    rec_answers(Pids2, [stopped|Acc]);
+	{'EXIT', Pid, Reason} ->
+	    Pids2 = lists:delete(Pid, Pids),
+	    rec_answers(Pids2, [{error, {'EXIT', Pid, Reason}}|Acc]);
+	{Pid, Reply} ->
+	    Pids2 = lists:delete(Pid, Pids),
+	    rec_answers(Pids2, [Reply|Acc])
+    end.
+
+fallback_exists() ->
+    Fname = fallback_bup(),
+    fallback_exists(Fname).
+
+fallback_exists(Fname) ->
+    case mnesia_monitor:use_dir() of
+	true ->
+	    mnesia_lib:exists(Fname);
+	false ->
+	    case ?catch_val(active_fallback) of
+		{'EXIT', _} -> false;
+		Bool -> Bool
+	    end
+    end.
+
+fallback_name() -> "FALLBACK.BUP".
+fallback_bup() -> mnesia_lib:dir(fallback_name()).
+
+fallback_tmp_name() -> "FALLBACK.TMP".
+%% fallback_full_tmp_name() -> mnesia_lib:dir(fallback_tmp_name()).
+
+fallback_receiver(Master, FA) ->
+    process_flag(trap_exit, true),
+
+    case catch register(mnesia_fallback, self()) of
+	{'EXIT', _} ->
+	    Reason = {already_exists, node()},
+	    local_fallback_error(Master, Reason);
+	true ->
+	    FA2 = check_fallback_dir(Master, FA),
+	    Bup = FA2#fallback_args.fallback_bup,
+	    case mnesia_lib:exists(Bup) of
+		true ->
+		    Reason2 = {already_exists, node()},
+		    local_fallback_error(Master, Reason2);
+		false ->
+		    Mod = mnesia_backup,
+		    Tmp = FA2#fallback_args.fallback_tmp,
+		    R = #restore{mode = replace,
+				 bup_module = Mod,
+				 bup_data = Tmp},
+		    file:delete(Tmp),
+		    case catch fallback_receiver_loop(Master, R, FA2, schema) of
+			{error, Reason} ->
+			    local_fallback_error(Master, Reason);
+			Other ->
+			    exit(Other)
+		    end
+	    end
+    end.
+
+local_fallback_error(Master, Reason) ->
+    Master ! {self(), {error, Reason}},
+    unlink(Master),
+    exit(Reason).
+
+check_fallback_dir(Master, FA) ->
+    case mnesia:system_info(schema_location) of
+	ram ->
+	    Reason = {has_no_disc, node()},
+	    local_fallback_error(Master, Reason);
+	_ ->
+	    Dir = check_fallback_dir_arg(Master, FA),
+	    Bup = filename:join([Dir, fallback_name()]),
+	    Tmp = filename:join([Dir, fallback_tmp_name()]),
+	    FA#fallback_args{fallback_bup = Bup,
+			     fallback_tmp = Tmp,
+			     mnesia_dir = Dir}
+    end.
+
+check_fallback_dir_arg(Master, FA) ->
+    case FA#fallback_args.use_default_dir of
+	true ->
+	    mnesia_lib:dir();
+	false when FA#fallback_args.scope == local ->
+	    Dir = FA#fallback_args.mnesia_dir,
+	    case catch mnesia_monitor:do_check_type(dir, Dir) of
+		{'EXIT', _R} ->
+		    Reason = {badarg, {dir, Dir}, node()},
+		    local_fallback_error(Master, Reason);
+		AbsDir->
+		    AbsDir
+	    end;
+	false when FA#fallback_args.scope == global ->
+	    Reason = {combine_error, global, dir, node()},
+	    local_fallback_error(Master, Reason)
+    end.
+
+fallback_receiver_loop(Master, R, FA, State) ->
+    receive
+	{Master, {start, Header, Schema}} when State == schema ->
+	    Dir = FA#fallback_args.mnesia_dir,
+	    throw_bad_res(ok, mnesia_schema:opt_create_dir(true, Dir)),
+	    R2 = safe_apply(R, open_write, [R#restore.bup_data]),
+	    R3 = safe_apply(R2, write, [R2#restore.bup_data, [Header]]),
+	    BupSchema = [schema2bup(S) || S <- Schema],
+	    R4 = safe_apply(R3, write, [R3#restore.bup_data, BupSchema]),
+	    Master ! {self(), ok},
+	    fallback_receiver_loop(Master, R4, FA, records);
+
+	{Master, {records, Recs}} when State == records ->
+	    R2 = safe_apply(R, write, [R#restore.bup_data, Recs]),
+	    Master ! {self(), ok},
+	    fallback_receiver_loop(Master, R2, FA, records);
+
+	{Master, swap} when State /= schema ->
+	    ?eval_debug_fun({?MODULE, fallback_receiver_loop, pre_swap}, []),
+	    safe_apply(R, commit_write, [R#restore.bup_data]),
+	    Bup = FA#fallback_args.fallback_bup,
+	    Tmp = FA#fallback_args.fallback_tmp,
+	    throw_bad_res(ok, file:rename(Tmp, Bup)),
+	    catch mnesia_lib:set(active_fallback, true),
+	    ?eval_debug_fun({?MODULE, fallback_receiver_loop, post_swap}, []),
+	    Master ! {self(), ok},
+	    fallback_receiver_loop(Master, R, FA, stop);
+
+	{Master, stop} when State == stop ->
+	    stopped;
+
+	Msg ->
+	    safe_apply(R, abort_write, [R#restore.bup_data]),
+	    Tmp = FA#fallback_args.fallback_tmp,
+	    file:delete(Tmp),
+	    throw({error, "Unexpected msg fallback_receiver_loop", Msg})
+    end.
+
+throw_bad_res(Expected, Expected) -> Expected;
+throw_bad_res(_Expected, {error, Actual}) -> throw({error, Actual});
+throw_bad_res(_Expected, Actual) -> throw({error, Actual}).
+
+-record(local_tab, {name, storage_type, dets_args, open, close, add, record_name}).
+
+tm_fallback_start(IgnoreFallback) ->
+    mnesia_schema:lock_schema(),
+    Res = do_fallback_start(fallback_exists(), IgnoreFallback),
+    mnesia_schema: unlock_schema(),
+    case Res of
+	ok -> ok;
+	{error, Reason} -> exit(Reason)
+    end.
+
+do_fallback_start(false, _IgnoreFallback) ->
+    ok;
+do_fallback_start(true, true) ->
+    verbose("Ignoring fallback at startup, but leaving it active...~n", []),
+    mnesia_lib:set(active_fallback, true),
+    ok;
+do_fallback_start(true, false) ->
+    verbose("Starting from fallback...~n", []),
+
+    Fname = fallback_bup(),
+    Mod = mnesia_backup,
+    Ets = ?ets_new_table(mnesia_local_tables, [set, public, {keypos, 2}]),
+    case catch iterate(Mod, fun restore_tables/4, Fname, {start, Ets}) of
+	{ok, Res} ->
+	    case Res of
+		{local, _, LT} ->  %% Close the last file
+		    (LT#local_tab.close)(LT);
+		_ ->
+		    ignore
+	    end,
+	    List = ?ets_match_object(Ets, '_'),
+	    Tabs = [L#local_tab.name || L <- List, L#local_tab.name /= schema],
+	    ?ets_delete_table(Ets),
+	    mnesia_lib:swap_tmp_files(Tabs),
+	    catch dets:close(schema),
+	    Tmp = mnesia_lib:tab2tmp(schema),
+	    Dat = mnesia_lib:tab2dat(schema),
+	    case file:rename(Tmp, Dat) of
+		ok ->
+		    file:delete(Fname),
+		    ok;
+		{error, Reason} ->
+		    file:delete(Tmp),
+		    {error, {"Cannot start from fallback. Rename error.", Reason}}
+	    end;
+	{error, Reason} ->
+	    {error, {"Cannot start from fallback", Reason}};
+	{'EXIT', Reason} ->
+	    {error, {"Cannot start from fallback", Reason}}
+    end.
+
+restore_tables(Recs, Header, Schema, {start, LocalTabs}) ->
+    Dir = mnesia_lib:dir(),
+    OldDir = filename:join([Dir, "OLD_DIR"]),
+    mnesia_schema:purge_dir(OldDir, []),
+    mnesia_schema:purge_dir(Dir, [fallback_name()]),
+    init_dat_files(Schema, LocalTabs),
+    State = {new, LocalTabs},
+    restore_tables(Recs, Header, Schema, State);
+restore_tables([Rec | Recs], Header, Schema, {new, LocalTabs}) ->
+    Tab = element(1, Rec),
+    case ?ets_lookup(LocalTabs, Tab) of
+	[] ->
+	    State = {not_local, LocalTabs, Tab},
+	    restore_tables(Recs, Header, Schema, State);
+	[L] when record(L, local_tab) ->
+	    (L#local_tab.open)(Tab, L),
+	    State = {local, LocalTabs, L},
+	    restore_tables([Rec | Recs], Header, Schema, State)
+    end;
+restore_tables([Rec | Recs], Header, Schema, S = {not_local, LocalTabs, PrevTab}) ->
+    Tab = element(1, Rec),
+    if
+	Tab == PrevTab ->
+	    restore_tables(Recs, Header, Schema, S);
+	true ->
+	    State = {new, LocalTabs},
+	    restore_tables([Rec | Recs], Header, Schema, State)
+    end;
+restore_tables([Rec | Recs], Header, Schema, State = {local, LocalTabs, L}) ->
+    Tab = element(1, Rec),
+    if
+	Tab == L#local_tab.name ->
+	    Key = element(2, Rec),
+	    (L#local_tab.add)(Tab, Key, Rec, L),
+	    restore_tables(Recs, Header, Schema, State);
+	true ->
+	    (L#local_tab.close)(L),
+	    NState = {new, LocalTabs},
+	    restore_tables([Rec | Recs], Header, Schema, NState)
+    end;
+restore_tables([], _Header, _Schema, State) ->
+    State.
+
+%% Creates all neccessary dat files and inserts
+%% the table definitions in the schema table
+%%
+%% Returns a list of local_tab tuples for all local tables
+init_dat_files(Schema, LocalTabs) ->
+    Fname = mnesia_lib:tab2tmp(schema),
+    Args = [{file, Fname}, {keypos, 2}, {type, set}],
+    case dets:open_file(schema, Args) of % Assume schema lock
+	{ok, _} ->
+	    create_dat_files(Schema, LocalTabs),
+	    dets:close(schema),
+	    LocalTab = #local_tab{name = schema,
+				  storage_type = disc_copies,
+				  dets_args = Args,
+				  open   = fun open_media/2,
+				  close  = fun close_media/1,
+				  add    = fun add_to_media/4,
+				  record_name = schema},
+	    ?ets_insert(LocalTabs, LocalTab);
+	{error, Reason} ->
+	    throw({error, {"Cannot open file", schema, Args, Reason}})
+    end.
+
+create_dat_files([{schema, schema, TabDef} | Tail], LocalTabs) ->
+    ok = dets:insert(schema, {schema, schema, TabDef}),
+    create_dat_files(Tail, LocalTabs);
+create_dat_files([{schema, Tab, TabDef} | Tail], LocalTabs) ->
+    Cs =  mnesia_schema:list2cs(TabDef),
+    ok = dets:insert(schema, {schema, Tab, TabDef}),
+    RecName = Cs#cstruct.record_name,
+    case mnesia_lib:cs_to_storage_type(node(), Cs) of
+	unknown ->
+	    cleanup_dat_file(Tab),
+	    create_dat_files(Tail, LocalTabs);
+	disc_only_copies ->
+	    Fname = mnesia_lib:tab2tmp(Tab),
+	    Args = [{file, Fname}, {keypos, 2},
+		    {type, mnesia_lib:disk_type(Tab, Cs#cstruct.type)}],
+	    case mnesia_lib:dets_sync_open(Tab, Args) of
+		{ok, _} ->
+		    mnesia_lib:dets_sync_close(Tab),
+		    LocalTab = #local_tab{name = Tab,
+					  storage_type = disc_only_copies,
+					  dets_args = Args,
+					  open   = fun open_media/2,
+					  close  = fun close_media/1,
+					  add    = fun add_to_media/4,
+					  record_name = RecName},
+		    ?ets_insert(LocalTabs, LocalTab),
+		    create_dat_files(Tail, LocalTabs);
+		{error, Reason} ->
+		    throw({error, {"Cannot open file", Tab, Args, Reason}})
+	    end;
+	ram_copies ->
+	    %% Create .DCD if needed in open_media in case any ram_copies
+	    %% are backed up.
+	    LocalTab = #local_tab{name = Tab,
+				  storage_type = ram_copies,
+				  dets_args = ignore,
+				  open   = fun open_media/2,
+				  close  = fun close_media/1,
+				  add    = fun add_to_media/4,
+				  record_name = RecName},
+	    ?ets_insert(LocalTabs, LocalTab),
+	    create_dat_files(Tail, LocalTabs);
+	Storage ->
+	    %% Create DCD
+	    Fname = mnesia_lib:tab2dcd(Tab),
+	    file:delete(Fname),
+	    Log = mnesia_log:open_log(fallback_tab, mnesia_log:dcd_log_header(),
+				      Fname, false),
+	    LocalTab = #local_tab{name = Tab,
+				  storage_type = Storage,
+				  dets_args = ignore,
+				  open   = fun open_media/2,
+				  close  = fun close_media/1,
+				  add    = fun add_to_media/4,
+				  record_name = RecName},
+	    mnesia_log:close_log(Log),
+	    ?ets_insert(LocalTabs, LocalTab),
+	    create_dat_files(Tail, LocalTabs)
+    end;
+create_dat_files([{schema, Tab} | Tail], LocalTabs) ->
+    cleanup_dat_file(Tab),
+    create_dat_files(Tail, LocalTabs);
+create_dat_files([], _LocalTabs) ->
+    ok.
+
+cleanup_dat_file(Tab) ->
+    ok = dets:delete(schema, {schema, Tab}),
+    mnesia_lib:cleanup_tmp_files([Tab]).
+
+open_media(Tab, LT) ->
+    case LT#local_tab.storage_type of
+	disc_only_copies ->
+	    Args = LT#local_tab.dets_args,
+	    case mnesia_lib:dets_sync_open(Tab, Args) of
+		{ok, _} -> ok;
+		{error, Reason} ->
+		    throw({error, {"Cannot open file", Tab, Args, Reason}})
+	    end;
+	ram_copies ->
+	    %% Create .DCD as ram_copies backed up.
+	    FnameDCD = mnesia_lib:tab2dcd(Tab),
+	    file:delete(FnameDCD),
+	    Log = mnesia_log:open_log(fallback_tab,
+				      mnesia_log:dcd_log_header(),
+				      FnameDCD, false),
+	    mnesia_log:close_log(Log),
+
+	    %% Create .DCL
+	    Fname = mnesia_lib:tab2dcl(Tab),
+	    file:delete(Fname),
+	    mnesia_log:open_log({?MODULE,Tab},
+				mnesia_log:dcl_log_header(),
+				Fname, false, false,
+				read_write);
+	_ ->
+	    Fname = mnesia_lib:tab2dcl(Tab),
+	    file:delete(Fname),
+	    mnesia_log:open_log({?MODULE,Tab},
+				mnesia_log:dcl_log_header(),
+				Fname, false, false,
+				read_write)
+    end.
+close_media(L) ->
+    Tab = L#local_tab.name,
+    case L#local_tab.storage_type of
+	disc_only_copies ->
+	    mnesia_lib:dets_sync_close(Tab);
+	_ ->
+	    mnesia_log:close_log({?MODULE,Tab})
+    end.
+
+add_to_media(Tab, Key, Rec, L) ->
+    RecName = L#local_tab.record_name,
+    case L#local_tab.storage_type of
+	disc_only_copies ->
+	    case Rec of
+		{Tab, Key} ->
+		    ok = dets:delete(Tab, Key);
+		(Rec) when Tab == RecName ->
+		    ok = dets:insert(Tab, Rec);
+		(Rec) ->
+		    Rec2 = setelement(1, Rec, RecName),
+		    ok = dets:insert(Tab, Rec2)
+	    end;
+	_ ->
+	    Log = {?MODULE, Tab},
+	    case Rec of
+		{Tab, Key} ->
+		    mnesia_log:append(Log, {{Tab, Key}, {Tab, Key}, delete});
+		(Rec) when Tab == RecName ->
+		    mnesia_log:append(Log, {{Tab, Key}, Rec, write});
+		(Rec) ->
+		    Rec2 = setelement(1, Rec, RecName),
+		    mnesia_log:append(Log, {{Tab, Key}, Rec2, write})
+	    end
+    end.
+
+uninstall_fallback() ->
+    uninstall_fallback([{scope, global}]).
+
+uninstall_fallback(Args) ->
+    case check_fallback_args(Args, #fallback_args{}) of
+	{ok, FA} ->
+	    do_uninstall_fallback(FA);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+do_uninstall_fallback(FA) ->
+    %% Ensure that we access the intended Mnesia
+    %% directory. This function may not be called
+    %% during startup since it will cause the
+    %% application_controller to get into deadlock
+    case mnesia_lib:ensure_loaded(?APPLICATION) of
+	ok ->
+	    Pid = spawn_link(?MODULE, uninstall_fallback_master, [self(), FA]),
+	    receive
+		{'EXIT', Pid, Reason} -> % if appl has trapped exit
+		    {error, {'EXIT', Reason}};
+		{Pid, Res} ->
+		    Res
+	    end;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+uninstall_fallback_master(ClientPid, FA) ->
+    process_flag(trap_exit, true),
+
+    FA2 = check_fallback_dir(ClientPid, FA), % May exit
+    Bup = FA2#fallback_args.fallback_bup,
+    case fallback_to_schema(Bup) of
+	{ok, fallback, List} ->
+	    Cs = mnesia_schema:list2cs(List),
+	    case catch get_fallback_nodes(FA, Cs#cstruct.disc_copies) of
+		Ns when list(Ns) ->
+		    do_uninstall(ClientPid, Ns, FA);
+		{error, Reason} ->
+		    local_fallback_error(ClientPid, Reason)
+	    end;
+	{error, Reason} ->
+	    local_fallback_error(ClientPid, Reason)
+    end.
+
+do_uninstall(ClientPid, Ns, FA) ->
+    Args = [self(), FA],
+    global:set_lock({{mnesia_table_lock, schema}, self()}, Ns, infinity),
+    Pids = [spawn_link(N, ?MODULE, local_uninstall_fallback, Args) || N <- Ns],
+    Res = do_uninstall(ClientPid, Pids, [], [], ok),
+    global:del_lock({{mnesia_table_lock, schema}, self()}, Ns),
+    ClientPid ! {self(), Res},
+    unlink(ClientPid),
+    exit(shutdown).
+
+do_uninstall(ClientPid, [Pid | Pids], GoodPids, BadNodes, Res) ->
+    receive
+	%% {'EXIT', ClientPid, _} ->
+	%% client_exit;
+	{'EXIT', Pid, Reason} ->
+	    BadNode = node(Pid),
+	    BadRes = {error, {"Uninstall fallback", BadNode, Reason}},
+	    do_uninstall(ClientPid, Pids, GoodPids, [BadNode | BadNodes], BadRes);
+	{Pid, {error, Reason}} ->
+	    BadNode = node(Pid),
+	    BadRes = {error, {"Uninstall fallback", BadNode, Reason}},
+	    do_uninstall(ClientPid, Pids, GoodPids, [BadNode | BadNodes], BadRes);
+	{Pid, started} ->
+	    do_uninstall(ClientPid, Pids, [Pid | GoodPids], BadNodes, Res)
+    end;
+do_uninstall(ClientPid, [], GoodPids, [], ok) ->
+    lists:foreach(fun(Pid) -> Pid ! {self(), do_uninstall} end, GoodPids),
+    rec_uninstall(ClientPid, GoodPids, ok);
+do_uninstall(_ClientPid, [], GoodPids, BadNodes, BadRes) ->
+    lists:foreach(fun(Pid) -> exit(Pid, shutdown) end, GoodPids),
+    {error, {node_not_running, BadNodes, BadRes}}.
+
+local_uninstall_fallback(Master, FA) ->
+    %% Don't trap exit
+
+    register(mnesia_fallback, self()),        % May exit
+    FA2 = check_fallback_dir(Master, FA), % May exit
+    Master ! {self(), started},
+
+    receive
+	{Master, do_uninstall} ->
+	    ?eval_debug_fun({?MODULE, uninstall_fallback2, pre_delete}, []),
+	    catch mnesia_lib:set(active_fallback, false),
+	    Tmp = FA2#fallback_args.fallback_tmp,
+	    Bup = FA2#fallback_args.fallback_bup,
+	    file:delete(Tmp),
+	    Res =
+		case fallback_exists(Bup) of
+		    true -> file:delete(Bup);
+		    false -> ok
+		end,
+	    ?eval_debug_fun({?MODULE, uninstall_fallback2, post_delete}, []),
+	    Master ! {self(), Res},
+	    unlink(Master),
+	    exit(normal)
+    end.
+
+rec_uninstall(ClientPid, [Pid | Pids], AccRes) ->
+    receive
+	%% {'EXIT', ClientPid, _} ->
+	%% exit(shutdown);
+	{'EXIT', Pid, R} ->
+	    Reason = {node_not_running, {node(Pid), R}},
+	    rec_uninstall(ClientPid, Pids, {error, Reason});
+	{Pid, ok} ->
+	    rec_uninstall(ClientPid, Pids, AccRes);
+	{Pid, BadRes} ->
+	    rec_uninstall(ClientPid, Pids, BadRes)
+    end;
+rec_uninstall(ClientPid, [], Res) ->
+    ClientPid ! {self(), Res},
+    unlink(ClientPid),
+    exit(normal).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Backup traversal
+
+%% Iterate over a backup and produce a new backup.
+%% Fun(BackupItem, Acc) is applied for each BackupItem.
+%%
+%% Valid BackupItems are:
+%%
+%%   {schema, Tab}		Table to be deleted
+%%   {schema, Tab, CreateList}	Table to be created, CreateList may be empty
+%%   {schema, db_nodes, DbNodes}List of nodes, defaults to [node()] OLD
+%%   {schema, version, Version} Schema version                      OLD
+%%   {schema, cookie, Cookie}	Unique schema cookie                OLD
+%%   {Tab, Key}			Oid for record to be deleted
+%%   Record			Record to be inserted.
+%%
+%% The Fun must return a tuple {BackupItems, NewAcc}
+%% where BackupItems is a list of valid BackupItems and
+%% NewAcc is a new accumulator value. Once BackupItems
+%% that not are schema  related has been returned, no more schema
+%% items may be  returned. The schema related items must always be
+%% first in the backup.
+%%
+%% If TargetMod == read_only, no new backup will be created.
+%%
+%% Opening of the source media will be performed by
+%% to SourceMod:open_read(Source)
+%%
+%% Opening of the target media will be performed by
+%% to TargetMod:open_write(Target)
+traverse_backup(Source, Target, Fun, Acc) ->
+    Mod = mnesia_monitor:get_env(backup_module),
+    traverse_backup(Source, Mod, Target, Mod, Fun, Acc).
+
+traverse_backup(Source, SourceMod, Target, TargetMod, Fun, Acc) ->
+    Args = [self(), Source, SourceMod, Target, TargetMod, Fun, Acc],
+    Pid = spawn_link(?MODULE, do_traverse_backup, Args),
+    receive
+	{'EXIT', Pid, Reason} ->
+	    {error, {"Backup traversal crashed", Reason}};
+	{iter_done, Pid, Res} ->
+	    Res
+    end.
+
+do_traverse_backup(ClientPid, Source, SourceMod, Target, TargetMod, Fun, Acc) ->
+    process_flag(trap_exit, true),
+    Iter =
+	if
+	    TargetMod /= read_only ->
+		case catch do_apply(TargetMod, open_write, [Target], Target) of
+		    {error, Error} ->
+			unlink(ClientPid),
+			ClientPid ! {iter_done, self(), {error, Error}},
+			exit(Error);
+		    Else -> Else
+		end;
+	    true ->
+		ignore
+	end,
+    A = {start, Fun, Acc, TargetMod, Iter},
+    Res =
+	case iterate(SourceMod, fun trav_apply/4, Source, A) of
+	    {ok, {iter, _, Acc2, _, Iter2}} when TargetMod /= read_only ->
+		case catch do_apply(TargetMod, commit_write, [Iter2], Iter2) of
+		    {error, Reason} ->
+			{error, Reason};
+		    _ ->
+			{ok, Acc2}
+		end;
+	    {ok, {iter, _, Acc2, _, _}} ->
+		{ok, Acc2};
+	    {error, Reason} when TargetMod /= read_only->
+		catch do_apply(TargetMod, abort_write, [Iter], Iter),
+		{error, {"Backup traversal failed", Reason}};
+	    {error, Reason} ->
+		{error, {"Backup traversal failed", Reason}}
+	end,
+    unlink(ClientPid),
+    ClientPid ! {iter_done, self(), Res}.
+
+trav_apply(Recs, _Header, _Schema, {iter, Fun, Acc, Mod, Iter}) ->
+    {NewRecs, Acc2} = filter_foldl(Fun, Acc, Recs),
+    if
+	Mod /= read_only, NewRecs /= [] ->
+	    Iter2 = do_apply(Mod, write, [Iter, NewRecs], Iter),
+	    {iter, Fun, Acc2, Mod, Iter2};
+	true ->
+	    {iter, Fun, Acc2, Mod, Iter}
+    end;
+trav_apply(Recs, Header, Schema, {start, Fun, Acc, Mod, Iter}) ->
+    Iter2 =
+	if
+	    Mod /= read_only ->
+		do_apply(Mod, write, [Iter, [Header]], Iter);
+	    true ->
+		Iter
+	end,
+    TravAcc = trav_apply(Schema, Header, Schema, {iter, Fun, Acc, Mod, Iter2}),
+    trav_apply(Recs, Header, Schema, TravAcc).
+
+filter_foldl(Fun, Acc, [Head|Tail]) ->
+    case Fun(Head, Acc) of
+	{HeadItems, HeadAcc} when list(HeadItems) ->
+	    {TailItems, TailAcc} = filter_foldl(Fun, HeadAcc, Tail),
+	    {HeadItems ++ TailItems, TailAcc};
+	Other ->
+	    throw({error, {"Fun must return a list", Other}})
+    end;
+filter_foldl(_Fun, Acc, []) ->
+    {[], Acc}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_checkpoint.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_checkpoint.erl
new file mode 100644
index 0000000000..60a7a29861
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_checkpoint.erl
@@ -0,0 +1,1283 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_checkpoint.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
+%%
+-module(mnesia_checkpoint).
+
+%% TM callback interface
+-export([
+	 tm_add_copy/2,
+	 tm_change_table_copy_type/3,
+	 tm_del_copy/2,
+	 tm_mnesia_down/1,
+	 tm_prepare/1,
+	 tm_retain/4,
+	 tm_retain/5,
+	 tm_enter_pending/1,
+	 tm_enter_pending/3,
+	 tm_exit_pending/1,
+	 convert_cp_record/1
+	]).
+
+%% Public interface
+-export([
+	 activate/1,
+	 checkpoints/0,
+	 deactivate/1,
+	 deactivate/2,
+	 iterate/6,
+	 most_local_node/2,
+	 really_retain/2,
+	 stop/0,
+	 stop_iteration/1,
+	 tables_and_cookie/1
+	]).
+
+%% Internal
+-export([
+	 call/2,
+	 cast/2,
+	 init/1,
+	 remote_deactivate/1,
+	 start/1
+	]).
+
+%% sys callback interface
+-export([
+	 system_code_change/4,
+	 system_continue/3,
+	 system_terminate/4
+	]).
+
+-include("mnesia.hrl").
+-import(mnesia_lib, [add/2, del/2, set/2, unset/1]).
+-import(mnesia_lib, [dbg_out/2]).
+
+-record(tm, {log, pending, transactions, checkpoints}).
+
+-record(checkpoint_args, {name = {now(), node()},
+			  allow_remote = true,
+			  ram_overrides_dump = false,
+			  nodes = [],
+			  node = node(),
+			  now = now(),
+			  cookie = ?unique_cookie,
+			  min = [],
+			  max = [],
+			  pending_tab,
+			  wait_for_old, % Initially undefined then List
+			  is_activated = false,
+			  ignore_new = [],
+			  retainers = [],
+			  iterators = [],
+			  supervisor,
+			  pid
+			 }).
+
+%% Old record definition
+-record(checkpoint, {name,
+		     allow_remote,
+		     ram_overrides_dump,
+		     nodes,
+		     node,
+		     now,
+		     min,
+		     max,
+		     pending_tab,
+		     wait_for_old,
+		     is_activated,
+		     ignore_new,
+		     retainers,
+		     iterators,
+		     supervisor,
+		     pid
+		    }).
+
+-record(retainer, {cp_name, tab_name, store, writers = [], really_retain = true}).
+
+-record(iter, {tab_name, oid_tab, main_tab, retainer_tab, source, val, pid}).
+
+-record(pending, {tid, disc_nodes = [], ram_nodes = []}).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% TM callback functions
+
+stop() ->
+    lists:foreach(fun(Name) -> call(Name, stop) end,
+		  checkpoints()),
+    ok.
+
+tm_prepare(Cp) when record(Cp, checkpoint_args) ->
+    Name = Cp#checkpoint_args.name,
+    case lists:member(Name, checkpoints()) of
+	false ->
+	    start_retainer(Cp);
+	true ->
+	    {error, {already_exists, Name, node()}}
+    end;
+tm_prepare(Cp) when record(Cp, checkpoint) ->
+    %% Node with old protocol sent an old checkpoint record
+    %% and we have to convert it
+    case convert_cp_record(Cp) of
+	{ok, NewCp} ->
+	    tm_prepare(NewCp);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+tm_mnesia_down(Node) ->
+    lists:foreach(fun(Name) -> cast(Name, {mnesia_down, Node}) end,
+		  checkpoints()).
+
+%% Returns pending
+tm_enter_pending(Tid, DiscNs, RamNs) ->
+    Pending = #pending{tid = Tid, disc_nodes = DiscNs, ram_nodes = RamNs},
+    tm_enter_pending(Pending).
+
+tm_enter_pending(Pending) ->
+    PendingTabs = val(pending_checkpoints),
+    tm_enter_pending(PendingTabs, Pending).
+
+tm_enter_pending([], Pending) ->
+    Pending;
+tm_enter_pending([Tab | Tabs], Pending) ->
+    catch ?ets_insert(Tab, Pending),
+    tm_enter_pending(Tabs, Pending).
+
+tm_exit_pending(Tid) ->
+    Pids = val(pending_checkpoint_pids),
+    tm_exit_pending(Pids, Tid).
+
+tm_exit_pending([], Tid) ->
+    Tid;
+tm_exit_pending([Pid | Pids], Tid) ->
+    Pid ! {self(), {exit_pending, Tid}},
+    tm_exit_pending(Pids, Tid).
+
+enter_still_pending([Tid | Tids], Tab) ->
+    ?ets_insert(Tab, #pending{tid = Tid}),
+    enter_still_pending(Tids, Tab);
+enter_still_pending([], _Tab) ->
+    ok.
+
+
+%% Looks up checkpoints for functions in mnesia_tm.
+tm_retain(Tid, Tab, Key, Op) ->
+    case val({Tab, commit_work}) of
+	[{checkpoints, Checkpoints} | _ ] ->
+	    tm_retain(Tid, Tab, Key, Op, Checkpoints);
+	_ ->
+	    undefined
+    end.
+
+tm_retain(Tid, Tab, Key, Op, Checkpoints) ->
+    case Op of
+	clear_table ->
+	    OldRecs = mnesia_lib:db_match_object(Tab, '_'),
+	    send_group_retain(OldRecs, Checkpoints, Tid, Tab, []),
+	    OldRecs;
+	_ ->
+	    OldRecs = mnesia_lib:db_get(Tab, Key),
+	    send_retain(Checkpoints, {retain, Tid, Tab, Key, OldRecs}),
+	    OldRecs
+    end.
+
+send_group_retain([Rec | Recs], Checkpoints, Tid, Tab, [PrevRec | PrevRecs])
+  when element(2, Rec) /= element(2, PrevRec) ->
+    Key = element(2, PrevRec),
+    OldRecs = lists:reverse([PrevRec | PrevRecs]),
+    send_retain(Checkpoints, {retain, Tid, Tab, Key, OldRecs}),
+    send_group_retain(Recs, Checkpoints, Tid, Tab, [Rec]);
+send_group_retain([Rec | Recs], Checkpoints, Tid, Tab, Acc) ->
+    send_group_retain(Recs, Checkpoints, Tid, Tab, [Rec | Acc]);
+send_group_retain([], Checkpoints, Tid, Tab, [PrevRec | PrevRecs]) ->
+    Key = element(2, PrevRec),
+    OldRecs = lists:reverse([PrevRec | PrevRecs]),
+    send_retain(Checkpoints, {retain, Tid, Tab, Key, OldRecs}),
+    ok;
+send_group_retain([], _Checkpoints, _Tid, _Tab, []) ->
+    ok.
+
+send_retain([Name | Names], Msg) ->
+    cast(Name, Msg),
+    send_retain(Names, Msg);
+send_retain([], _Msg) ->
+    ok.
+
+tm_add_copy(Tab, Node) when Node /= node() ->
+    case val({Tab, commit_work}) of
+	[{checkpoints, Checkpoints} | _ ] ->
+	    Fun = fun(Name) -> call(Name, {add_copy, Tab, Node}) end,
+	    map_call(Fun, Checkpoints, ok);
+	_  ->
+	    ok
+    end.
+
+tm_del_copy(Tab, Node) when Node == node() ->
+    mnesia_subscr:unsubscribe_table(Tab),
+    case val({Tab, commit_work}) of
+	[{checkpoints, Checkpoints} | _ ] ->
+	    Fun = fun(Name) -> call(Name, {del_copy, Tab, Node}) end,
+	    map_call(Fun, Checkpoints, ok);
+	_ ->
+	    ok
+    end.
+
+tm_change_table_copy_type(Tab, From, To) ->
+    case val({Tab, commit_work}) of
+	[{checkpoints, Checkpoints} | _ ] ->
+	    Fun = fun(Name) -> call(Name, {change_copy, Tab, From, To}) end,
+	    map_call(Fun, Checkpoints, ok);
+	_ ->
+	    ok
+    end.
+
+map_call(Fun, [Name | Names], Res) ->
+    case Fun(Name) of
+	 ok ->
+	    map_call(Fun, Names, Res);
+	{error, {no_exists, Name}} ->
+	    map_call(Fun, Names, Res);
+	{error, Reason} ->
+	    %% BUGBUG: We may end up with some checkpoint retainers
+	    %% too much in the add_copy case. How do we remove them?
+	    map_call(Fun, Names, {error, Reason})
+    end;
+map_call(_Fun, [], Res) ->
+    Res.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Public functions
+
+deactivate(Name) ->
+    case call(Name, get_checkpoint) of
+	{error, Reason} ->
+	    {error, Reason};
+	Cp ->
+	    deactivate(Cp#checkpoint_args.nodes, Name)
+    end.
+
+deactivate(Nodes, Name) ->
+    rpc:multicall(Nodes, ?MODULE, remote_deactivate, [Name]),
+    ok.
+
+remote_deactivate(Name) ->
+    call(Name, deactivate).
+
+checkpoints() -> val(checkpoints).
+
+tables_and_cookie(Name) ->
+    case call(Name, get_checkpoint) of
+	{error, Reason} ->
+	    {error, Reason};
+	Cp ->
+	    Tabs = Cp#checkpoint_args.min ++ Cp#checkpoint_args.max,
+	    Cookie = Cp#checkpoint_args.cookie,
+	    {ok, Tabs, Cookie}
+    end.
+
+most_local_node(Name, Tab) ->
+    case ?catch_val({Tab, {retainer, Name}}) of
+	{'EXIT', _} ->
+	    {error, {"No retainer attached to table", [Tab, Name]}};
+	R ->
+	    Writers = R#retainer.writers,
+	    LocalWriter = lists:member(node(), Writers),
+	    if
+		LocalWriter == true ->
+		    {ok, node()};
+		Writers /= [] ->
+		    {ok, hd(Writers)};
+		true  ->
+		    {error, {"No retainer attached to table", [Tab, Name]}}
+	    end
+    end.
+
+really_retain(Name, Tab) ->
+    R = val({Tab, {retainer, Name}}),
+    R#retainer.really_retain.
+
+%% Activate a checkpoint.
+%%
+%% A checkpoint is a transaction consistent state that may be used to
+%% perform a distributed backup or to rollback the involved tables to
+%% their old state. Backups may also be used to restore tables to
+%% their old state. Args is a list of the following tuples:
+%%
+%% {name, Name}
+%%    Name of checkpoint. Each checkpoint must have a name which
+%%    is unique on the reachable nodes. The name may be reused when
+%%    the checkpoint has been deactivated.
+%%    By default a probably unique name is generated.
+%%    Multiple checkpoints may be set on the same table.
+%%
+%% {allow_remote, Bool}
+%%   false means that all retainers must be local. If the
+%%   table does not reside locally, the checkpoint fails.
+%%   true allows retainers on other nodes.
+%%
+%% {min, MinTabs}
+%%   Minimize redundancy and only keep checkpoint info together with
+%%   one replica, preferrably at the local node. If any node involved
+%%   the checkpoint goes down, the checkpoint is deactivated.
+%%
+%% {max, MaxTabs}
+%%    Maximize redundancy and keep checkpoint info together with all
+%%    replicas. The checkpoint becomes more fault tolerant if the
+%%    tables has several replicas. When new replicas are added, they
+%%    will also get a retainer attached to them.
+%%
+%% {ram_overrides_dump, Bool}
+%% {ram_overrides_dump, Tabs}
+%%   Only applicable for ram_copies. Bool controls which versions of
+%%   the records that should be included in the checkpoint state.
+%%   true means that the latest comitted records in ram (i.e. the
+%%   records that the application accesses) should be included
+%%   in the checkpoint. false means that the records dumped to
+%%   dat-files (the records that will be loaded at startup) should
+%%   be included in the checkpoint. Tabs is a list of tables.
+%%   Default is false.
+%%
+%% {ignore_new, TidList}
+%%   Normally we wait for all pending transactions to complete
+%%   before we allow iteration over the checkpoint. But in order
+%%   to cope with checkpoint activation inside a transaction that
+%%   currently prepares commit (mnesia_init:get_net_work_copy) we
+%%   need to have the ability to ignore the enclosing transaction.
+%%   We do not wait for the transactions in TidList to end. The
+%%   transactions in TidList are regarded as newer than the checkpoint.
+
+activate(Args) ->
+    case args2cp(Args) of
+	{ok, Cp} ->
+	    do_activate(Cp);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+args2cp(Args) when list(Args)->
+    case catch lists:foldl(fun check_arg/2, #checkpoint_args{}, Args) of
+	{'EXIT', Reason} ->
+	    {error, Reason};
+	Cp ->
+	    case check_tables(Cp) of
+		{error, Reason} ->
+		    {error, Reason};
+		{ok, Overriders, AllTabs} ->
+		    arrange_retainers(Cp, Overriders, AllTabs)
+	    end
+    end;
+args2cp(Args) ->
+    {error, {badarg, Args}}.
+
+check_arg({name, Name}, Cp) ->
+    case lists:member(Name, checkpoints()) of
+	true ->
+	    exit({already_exists, Name});
+	false ->
+	    case catch tab2retainer({foo, Name}) of
+		List when list(List) ->
+		    Cp#checkpoint_args{name = Name};
+		_ ->
+		    exit({badarg, Name})
+	    end
+    end;
+check_arg({allow_remote, true}, Cp) ->
+    Cp#checkpoint_args{allow_remote = true};
+check_arg({allow_remote, false}, Cp) ->
+    Cp#checkpoint_args{allow_remote = false};
+check_arg({ram_overrides_dump, true}, Cp) ->
+    Cp#checkpoint_args{ram_overrides_dump = true};
+check_arg({ram_overrides_dump, false}, Cp) ->
+    Cp#checkpoint_args{ram_overrides_dump = false};
+check_arg({ram_overrides_dump, Tabs}, Cp) when list(Tabs) ->
+    Cp#checkpoint_args{ram_overrides_dump = Tabs};
+check_arg({min, Tabs}, Cp) when list(Tabs) ->
+    Cp#checkpoint_args{min = Tabs};
+check_arg({max, Tabs}, Cp) when list(Tabs) ->
+    Cp#checkpoint_args{max = Tabs};
+check_arg({ignore_new, Tids}, Cp) when list(Tids) ->
+    Cp#checkpoint_args{ignore_new = Tids};
+check_arg(Arg, _) ->
+    exit({badarg, Arg}).
+
+check_tables(Cp) ->
+    Min = Cp#checkpoint_args.min,
+    Max = Cp#checkpoint_args.max,
+    AllTabs = Min ++ Max,
+    DoubleTabs = [T || T <- Min, lists:member(T, Max)],
+    Overriders = Cp#checkpoint_args.ram_overrides_dump,
+    if
+	DoubleTabs /= [] ->
+	    {error, {combine_error, Cp#checkpoint_args.name,
+		     [{min, DoubleTabs}, {max, DoubleTabs}]}};
+	Min == [], Max == [] ->
+	    {error, {combine_error, Cp#checkpoint_args.name,
+		     [{min, Min}, {max, Max}]}};
+	Overriders == false ->
+	    {ok, [], AllTabs};
+	Overriders == true ->
+	    {ok, AllTabs, AllTabs};
+	list(Overriders) ->
+	    case [T || T <- Overriders, not lists:member(T, Min)] of
+		[] ->
+		    case [T || T <- Overriders, not lists:member(T, Max)] of
+			[] ->
+			    {ok, Overriders, AllTabs};
+			Outsiders ->
+			    {error, {combine_error, Cp#checkpoint_args.name,
+				     [{ram_overrides_dump, Outsiders},
+				      {max, Outsiders}]}}
+		    end;
+		Outsiders ->
+		    {error, {combine_error, Cp#checkpoint_args.name,
+			     [{ram_overrides_dump, Outsiders},
+			      {min, Outsiders}]}}
+	    end
+    end.
+
+arrange_retainers(Cp, Overriders, AllTabs) ->
+    R = #retainer{cp_name = Cp#checkpoint_args.name},
+    case catch [R#retainer{tab_name = Tab,
+			   writers = select_writers(Cp, Tab)}
+		|| Tab <- AllTabs] of
+	{'EXIT', Reason} ->
+	    {error, Reason};
+	Retainers ->
+	    {ok, Cp#checkpoint_args{ram_overrides_dump = Overriders,
+			       retainers = Retainers,
+			       nodes = writers(Retainers)}}
+    end.
+
+select_writers(Cp, Tab) ->
+    case filter_remote(Cp, val({Tab, active_replicas})) of
+	[] ->
+	    exit({"Cannot prepare checkpoint (replica not available)",
+		 [Tab, Cp#checkpoint_args.name]});
+	Writers ->
+	    This = node(),
+	    case {lists:member(Tab, Cp#checkpoint_args.max),
+		  lists:member(This, Writers)} of
+		{true, _} -> Writers; % Max
+		{false, true} -> [This];
+		{false, false} -> [hd(Writers)]
+	    end
+    end.
+
+filter_remote(Cp, Writers) when Cp#checkpoint_args.allow_remote == true ->
+    Writers;
+filter_remote(_Cp, Writers) ->
+    This = node(),
+    case lists:member(This, Writers) of
+	true -> [This];
+	false  -> []
+    end.
+
+writers(Retainers) ->
+    Fun = fun(R, Acc) -> R#retainer.writers ++ Acc end,
+    Writers = lists:foldl(Fun, [], Retainers),
+    mnesia_lib:uniq(Writers).
+
+do_activate(Cp) ->
+    Name = Cp#checkpoint_args.name,
+    Nodes = Cp#checkpoint_args.nodes,
+    case mnesia_tm:prepare_checkpoint(Nodes, Cp) of
+	{Replies, []} ->
+	    check_prep(Replies, Name, Nodes, Cp#checkpoint_args.ignore_new);
+	{_, BadNodes} ->
+	    {error, {"Cannot prepare checkpoint (bad nodes)",
+		     [Name, BadNodes]}}
+    end.
+
+check_prep([{ok, Name, IgnoreNew, _Node} | Replies], Name, Nodes, IgnoreNew) ->
+    check_prep(Replies, Name, Nodes, IgnoreNew);
+check_prep([{error, Reason} | _Replies], Name, _Nodes, _IgnoreNew) ->
+    {error, {"Cannot prepare checkpoint (bad reply)",
+	     [Name, Reason]}};
+check_prep([{badrpc, Reason} | _Replies], Name, _Nodes, _IgnoreNew) ->
+    {error, {"Cannot prepare checkpoint (badrpc)",
+	     [Name, Reason]}};
+check_prep([], Name, Nodes, IgnoreNew) ->
+    collect_pending(Name, Nodes, IgnoreNew).
+
+collect_pending(Name, Nodes, IgnoreNew) ->
+    case rpc:multicall(Nodes, ?MODULE, call, [Name, collect_pending]) of
+	{Replies, []} ->
+	    case catch ?ets_new_table(mnesia_union, [bag]) of
+		{'EXIT', Reason} -> %% system limit
+		    Msg = "Cannot create an ets table pending union",
+		    {error, {system_limit, Msg, Reason}};
+		UnionTab ->
+		    compute_union(Replies, Nodes, Name, UnionTab, IgnoreNew)
+	    end;
+	{_, BadNodes} ->
+	    deactivate(Nodes, Name),
+	    {error, {"Cannot collect from pending checkpoint", Name, BadNodes}}
+    end.
+
+compute_union([{ok, Pending} | Replies], Nodes, Name, UnionTab, IgnoreNew) ->
+    add_pending(Pending, UnionTab),
+    compute_union(Replies, Nodes, Name, UnionTab, IgnoreNew);
+compute_union([{error, Reason} | _Replies], Nodes, Name, UnionTab, _IgnoreNew) ->
+    deactivate(Nodes, Name),
+    ?ets_delete_table(UnionTab),
+    {error, Reason};
+compute_union([{badrpc, Reason} | _Replies], Nodes, Name, UnionTab, _IgnoreNew) ->
+    deactivate(Nodes, Name),
+    ?ets_delete_table(UnionTab),
+    {error, {badrpc, Reason}};
+compute_union([], Nodes, Name, UnionTab, IgnoreNew) ->
+    send_activate(Nodes, Nodes, Name, UnionTab, IgnoreNew).
+
+add_pending([P | Pending], UnionTab) ->
+    add_pending_node(P#pending.disc_nodes, P#pending.tid, UnionTab),
+    add_pending_node(P#pending.ram_nodes, P#pending.tid, UnionTab),
+    add_pending(Pending, UnionTab);
+add_pending([], _UnionTab) ->
+    ok.
+
+add_pending_node([Node | Nodes], Tid, UnionTab) ->
+    ?ets_insert(UnionTab, {Node, Tid}),
+    add_pending_node(Nodes, Tid, UnionTab);
+add_pending_node([], _Tid, _UnionTab) ->
+    ok.
+
+send_activate([Node | Nodes], AllNodes, Name, UnionTab, IgnoreNew) ->
+    Pending = [Tid || {_, Tid} <- ?ets_lookup(UnionTab, Node),
+		      not lists:member(Tid, IgnoreNew)],
+    case rpc:call(Node, ?MODULE, call, [Name, {activate, Pending}]) of
+	activated ->
+	    send_activate(Nodes, AllNodes, Name, UnionTab, IgnoreNew);
+	{badrpc, Reason} ->
+	    deactivate(Nodes, Name),
+	    ?ets_delete_table(UnionTab),
+	    {error, {"Activation failed (bad node)", Name, Node, Reason}};
+	{error, Reason} ->
+	    deactivate(Nodes, Name),
+	    ?ets_delete_table(UnionTab),
+	    {error, {"Activation failed", Name, Node, Reason}}
+    end;
+send_activate([], AllNodes, Name, UnionTab, _IgnoreNew) ->
+    ?ets_delete_table(UnionTab),
+    {ok, Name, AllNodes}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Checkpoint server
+
+cast(Name, Msg) ->
+    case ?catch_val({checkpoint, Name}) of
+	{'EXIT', _} ->
+	    {error, {no_exists, Name}};
+
+	Pid when pid(Pid) ->
+	    Pid ! {self(), Msg},
+	    {ok, Pid}
+    end.
+
+call(Name, Msg) ->
+    case cast(Name, Msg) of
+	{ok, Pid} ->
+	    catch link(Pid), % Always local
+	    Self = self(),
+	    receive
+		{'EXIT', Pid, Reason} ->
+		    {error, {"Got exit", [Name, Reason]}};
+		{Name, Self, Reply} ->
+		    unlink(Pid),
+		    Reply
+	    end;
+	Error ->
+	    Error
+    end.
+
+abcast(Nodes, Name, Msg) ->
+    rpc:eval_everywhere(Nodes, ?MODULE, cast, [Name, Msg]).
+
+reply(nopid, _Name, _Reply) ->
+    ignore;
+reply(ReplyTo, Name, Reply) ->
+    ReplyTo ! {Name, ReplyTo, Reply}.
+
+%% Returns {ok, NewCp} or {error, Reason}
+start_retainer(Cp) ->
+    % Will never be restarted
+    Name = Cp#checkpoint_args.name,
+    case supervisor:start_child(mnesia_checkpoint_sup, [Cp]) of
+	{ok, _Pid} ->
+	    {ok, Name, Cp#checkpoint_args.ignore_new, node()};
+	{error, Reason} ->
+	    {error, {"Cannot create checkpoint retainer",
+		     Name, node(), Reason}}
+    end.
+
+start(Cp) ->
+    Name = Cp#checkpoint_args.name,
+    Args = [Cp#checkpoint_args{supervisor = self()}],
+    mnesia_monitor:start_proc({?MODULE, Name}, ?MODULE, init, Args).
+
+init(Cp) ->
+    process_flag(trap_exit, true),
+    Name = Cp#checkpoint_args.name,
+    Props = [set, public, {keypos, 2}],
+    case catch ?ets_new_table(mnesia_pending_checkpoint, Props) of
+	{'EXIT', Reason} -> %% system limit
+	    Msg = "Cannot create an ets table for pending transactions",
+	    Error = {error, {system_limit, Name, Msg, Reason}},
+	    proc_lib:init_ack(Cp#checkpoint_args.supervisor, Error);
+	PendingTab ->
+	    Rs = [prepare_tab(Cp, R) || R <- Cp#checkpoint_args.retainers],
+	    Cp2 = Cp#checkpoint_args{retainers = Rs,
+				pid = self(),
+				pending_tab = PendingTab},
+	    add(pending_checkpoint_pids, self()),
+	    add(pending_checkpoints, PendingTab),
+	    set({checkpoint, Name}, self()),
+	    add(checkpoints, Name),
+	    dbg_out("Checkpoint ~p (~p) started~n", [Name, self()]),
+	    proc_lib:init_ack(Cp2#checkpoint_args.supervisor, {ok, self()}),
+	    retainer_loop(Cp2)
+    end.
+
+prepare_tab(Cp, R) ->
+    Tab = R#retainer.tab_name,
+    prepare_tab(Cp, R, val({Tab, storage_type})).
+
+prepare_tab(Cp, R, Storage) ->
+    Tab = R#retainer.tab_name,
+    Name = R#retainer.cp_name,
+    case lists:member(node(), R#retainer.writers) of
+	true ->
+	    R2 = retainer_create(Cp, R, Tab, Name, Storage),
+	    set({Tab, {retainer, Name}}, R2),
+	    add({Tab, checkpoints}, Name), %% Keep checkpoint info for table_info & mnesia_session
+	    add_chkp_info(Tab, Name),
+	    R2;
+	false ->
+	    set({Tab, {retainer, Name}}, R#retainer{store = undefined}),
+	    R
+    end.
+
+add_chkp_info(Tab, Name) ->
+    case val({Tab, commit_work}) of
+	[{checkpoints, OldList} | CommitList] ->
+	    case lists:member(Name, OldList) of
+		true ->
+		    ok;
+		false ->
+		    NewC = [{checkpoints, [Name | OldList]} | CommitList],
+		    mnesia_lib:set({Tab, commit_work}, NewC)
+	    end;
+	CommitList ->
+	    Chkp = {checkpoints, [Name]},
+	    %% OBS checkpoints needs to be first in the list!
+	    mnesia_lib:set({Tab, commit_work}, [Chkp | CommitList])
+    end.
+
+tab2retainer({Tab, Name}) ->
+    FlatName = lists:flatten(io_lib:write(Name)),
+    mnesia_lib:dir(lists:concat([?MODULE, "_", Tab, "_", FlatName, ".RET"])).
+
+retainer_create(_Cp, R, Tab, Name, disc_only_copies) ->
+    Fname = tab2retainer({Tab, Name}),
+    file:delete(Fname),
+    Args = [{file, Fname}, {type, set}, {keypos, 2}, {repair, false}],
+    {ok, _} = mnesia_lib:dets_sync_open({Tab, Name}, Args),
+    dbg_out("Checkpoint retainer created ~p ~p~n", [Name, Tab]),
+    R#retainer{store = {dets, {Tab, Name}}, really_retain = true};
+retainer_create(Cp, R, Tab, Name, Storage) ->
+    T = ?ets_new_table(mnesia_retainer, [set, public, {keypos, 2}]),
+    Overriders = Cp#checkpoint_args.ram_overrides_dump,
+    ReallyR = R#retainer.really_retain,
+    ReallyCp = lists:member(Tab, Overriders),
+    ReallyR2 = prepare_ram_tab(Tab, T, Storage, ReallyR, ReallyCp),
+    dbg_out("Checkpoint retainer created ~p ~p~n", [Name, Tab]),
+    R#retainer{store = {ets, T}, really_retain = ReallyR2}.
+
+%% Copy the dumped table into retainer if needed
+%% If the really_retain flag already has been set to false,
+%% it should remain false even if we change storage type
+%% while the checkpoint is activated.
+prepare_ram_tab(Tab, T, ram_copies, true, false) ->
+    Fname = mnesia_lib:tab2dcd(Tab),
+    case mnesia_lib:exists(Fname) of
+	true ->
+	    Log = mnesia_log:open_log(prepare_ram_tab,
+				      mnesia_log:dcd_log_header(),
+				      Fname, true,
+				      mnesia_monitor:get_env(auto_repair),
+				      read_only),
+	    Add = fun(Rec) ->
+			  Key = element(2, Rec),
+			  Recs =
+			      case ?ets_lookup(T, Key) of
+				  [] -> [];
+				  [{_, _, Old}] -> Old
+			      end,
+			  ?ets_insert(T, {Tab, Key, [Rec | Recs]}),
+			  continue
+		  end,
+	    traverse_dcd(mnesia_log:chunk_log(Log, start), Log, Add),
+	    mnesia_log:close_log(Log);
+	false ->
+	    ok
+    end,
+    false;
+prepare_ram_tab(_, _, _, ReallyRetain, _) ->
+    ReallyRetain.
+
+traverse_dcd({Cont, [LogH | Rest]}, Log, Fun)
+  when record(LogH, log_header),
+       LogH#log_header.log_kind == dcd_log,
+       LogH#log_header.log_version >= "1.0" ->
+    traverse_dcd({Cont, Rest}, Log, Fun);   %% BUGBUG Error handling repaired files
+traverse_dcd({Cont, Recs}, Log, Fun) ->     %% trashed data??
+    lists:foreach(Fun, Recs),
+    traverse_dcd(mnesia_log:chunk_log(Log, Cont), Log, Fun);
+traverse_dcd(eof, _Log, _Fun) ->
+    ok.
+
+retainer_get({ets, Store}, Key) -> ?ets_lookup(Store, Key);
+retainer_get({dets, Store}, Key) -> dets:lookup(Store, Key).
+
+retainer_put({ets, Store}, Val) -> ?ets_insert(Store, Val);
+retainer_put({dets, Store}, Val) -> dets:insert(Store, Val).
+
+retainer_first({ets, Store}) -> ?ets_first(Store);
+retainer_first({dets, Store}) -> dets:first(Store).
+
+retainer_next({ets, Store}, Key) -> ?ets_next(Store, Key);
+retainer_next({dets, Store}, Key) -> dets:next(Store, Key).
+
+%% retainer_next_slot(Tab, Pos) ->
+%%     case retainer_slot(Tab, Pos) of
+%% 	   '$end_of_table' ->
+%% 	       '$end_of_table';
+%% 	   [] ->
+%% 	       retainer_next_slot(Tab, Pos + 1);
+%% 	   Recs when list(Recs) ->
+%% 	       {Pos, Recs}
+%%     end.
+%%
+%% retainer_slot({ets, Store}, Pos) -> ?ets_next(Store, Pos);
+%% retainer_slot({dets, Store}, Pos) -> dets:slot(Store, Pos).
+
+retainer_fixtable(Tab, Bool) when atom(Tab) ->
+    mnesia_lib:db_fixtable(val({Tab, storage_type}), Tab, Bool);
+retainer_fixtable({ets, Tab}, Bool) ->
+    mnesia_lib:db_fixtable(ram_copies, Tab, Bool);
+retainer_fixtable({dets, Tab}, Bool) ->
+    mnesia_lib:db_fixtable(disc_only_copies, Tab, Bool).
+
+retainer_delete({ets, Store}) ->
+    ?ets_delete_table(Store);
+retainer_delete({dets, Store}) ->
+    mnesia_lib:dets_sync_close(Store),
+    Fname = tab2retainer(Store),
+    file:delete(Fname).
+
+retainer_loop(Cp) ->
+    Name = Cp#checkpoint_args.name,
+    receive
+	{_From, {retain, Tid, Tab, Key, OldRecs}}
+	when Cp#checkpoint_args.wait_for_old == [] ->
+	    R = val({Tab, {retainer, Name}}),
+	    case R#retainer.really_retain of
+		true ->
+		    PendingTab = Cp#checkpoint_args.pending_tab,
+		    case catch ?ets_lookup_element(PendingTab, Tid, 1) of
+			{'EXIT', _} ->
+			    Store = R#retainer.store,
+			    case retainer_get(Store, Key) of
+				[] ->
+				    retainer_put(Store, {Tab, Key, OldRecs});
+				_ ->
+				    already_retained
+			    end;
+			pending ->
+			    ignore
+		    end;
+		false ->
+		    ignore
+	    end,
+	    retainer_loop(Cp);
+
+	%% Adm
+	{From, deactivate} ->
+	    do_stop(Cp),
+	    reply(From, Name, deactivated),
+	    unlink(From),
+	    exit(shutdown);
+
+	{'EXIT', Parent, _} when Parent == Cp#checkpoint_args.supervisor ->
+	    %% do_stop(Cp),
+	    %% assume that entire Mnesia is terminating
+	    exit(shutdown);
+
+	{_From, {mnesia_down, Node}} ->
+	    Cp2 = do_del_retainers(Cp, Node),
+	    retainer_loop(Cp2);
+	{From, get_checkpoint} ->
+	    reply(From, Name, Cp),
+	    retainer_loop(Cp);
+	{From, {add_copy, Tab, Node}} when Cp#checkpoint_args.wait_for_old == [] ->
+	    {Res, Cp2} = do_add_copy(Cp, Tab, Node),
+	    reply(From, Name, Res),
+	    retainer_loop(Cp2);
+	{From, {del_copy, Tab, Node}} when Cp#checkpoint_args.wait_for_old == [] ->
+	    Cp2 = do_del_copy(Cp, Tab, Node),
+	    reply(From, Name, ok),
+	    retainer_loop(Cp2);
+	{From, {change_copy, Tab, From, To}} when Cp#checkpoint_args.wait_for_old == [] ->
+	    Cp2 = do_change_copy(Cp, Tab, From, To),
+	    reply(From, Name, ok),
+	    retainer_loop(Cp2);
+	{_From, {add_retainer, R, Node}} ->
+	    Cp2 = do_add_retainer(Cp, R, Node),
+	    retainer_loop(Cp2);
+	{_From, {del_retainer, R, Node}} when Cp#checkpoint_args.wait_for_old == [] ->
+	    Cp2 = do_del_retainer(Cp, R, Node),
+	    retainer_loop(Cp2);
+
+	%% Iteration
+	{From, {iter_begin, Iter}} when Cp#checkpoint_args.wait_for_old == [] ->
+	    Cp2 = iter_begin(Cp, From, Iter),
+	    retainer_loop(Cp2);
+
+	{From, {iter_end, Iter}} when Cp#checkpoint_args.wait_for_old == [] ->
+	    retainer_fixtable(Iter#iter.oid_tab, false),
+	    Iters = Cp#checkpoint_args.iterators -- [Iter],
+	    reply(From, Name, ok),
+	    retainer_loop(Cp#checkpoint_args{iterators = Iters});
+
+	{_From, {exit_pending, Tid}}
+	    when list(Cp#checkpoint_args.wait_for_old) ->
+	    StillPending = lists:delete(Tid, Cp#checkpoint_args.wait_for_old),
+	    Cp2 = Cp#checkpoint_args{wait_for_old = StillPending},
+	    Cp3 = maybe_activate(Cp2),
+	    retainer_loop(Cp3);
+
+	{From, collect_pending} ->
+	    PendingTab = Cp#checkpoint_args.pending_tab,
+	    del(pending_checkpoints, PendingTab),
+	    Pending = ?ets_match_object(PendingTab, '_'),
+	    reply(From, Name, {ok, Pending}),
+	    retainer_loop(Cp);
+
+	{From, {activate, Pending}} ->
+            StillPending = mnesia_recover:still_pending(Pending),
+            enter_still_pending(StillPending, Cp#checkpoint_args.pending_tab),
+            Cp2 = maybe_activate(Cp#checkpoint_args{wait_for_old = StillPending}),
+            reply(From, Name, activated),
+	    retainer_loop(Cp2);
+
+	{'EXIT', From, _Reason} ->
+	    Iters = [Iter || Iter <- Cp#checkpoint_args.iterators,
+			     check_iter(From, Iter)],
+	    retainer_loop(Cp#checkpoint_args{iterators = Iters});
+
+	{system, From, Msg} ->
+	    dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
+	    sys:handle_system_msg(Msg, From, no_parent, ?MODULE, [], Cp)
+    end.
+
+maybe_activate(Cp)
+        when Cp#checkpoint_args.wait_for_old == [],
+             Cp#checkpoint_args.is_activated == false ->
+    Cp#checkpoint_args{pending_tab = undefined, is_activated = true};
+maybe_activate(Cp) ->
+    Cp.
+
+iter_begin(Cp, From, Iter) ->
+    Name = Cp#checkpoint_args.name,
+    R = val({Iter#iter.tab_name, {retainer, Name}}),
+    Iter2 = init_tabs(R, Iter),
+    Iter3 = Iter2#iter{pid = From},
+    retainer_fixtable(Iter3#iter.oid_tab, true),
+    Iters = [Iter3 | Cp#checkpoint_args.iterators],
+    reply(From, Name, {ok, Iter3, self()}),
+    Cp#checkpoint_args{iterators = Iters}.
+
+do_stop(Cp) ->
+    Name = Cp#checkpoint_args.name,
+    del(pending_checkpoints, Cp#checkpoint_args.pending_tab),
+    del(pending_checkpoint_pids, self()),
+    del(checkpoints, Name),
+    unset({checkpoint, Name}),
+    lists:foreach(fun deactivate_tab/1, Cp#checkpoint_args.retainers),
+    Iters = Cp#checkpoint_args.iterators,
+    lists:foreach(fun(I) -> retainer_fixtable(I#iter.oid_tab, false) end, Iters).
+
+deactivate_tab(R) ->
+    Name = R#retainer.cp_name,
+    Tab = R#retainer.tab_name,
+    del({Tab, checkpoints}, Name),   %% Keep checkpoint info for table_info & mnesia_session
+    del_chkp_info(Tab, Name),
+    unset({Tab, {retainer, Name}}),
+    Active = lists:member(node(), R#retainer.writers),
+    case R#retainer.store of
+	undefined ->
+	    ignore;
+	Store when Active == true ->
+	    retainer_delete(Store);
+	_ ->
+	    ignore
+    end.
+
+del_chkp_info(Tab, Name) ->
+    case val({Tab, commit_work}) of
+	[{checkpoints, ChkList} | Rest] ->
+	    case lists:delete(Name, ChkList) of
+		[] ->
+		    %% The only checkpoint was deleted
+		    mnesia_lib:set({Tab, commit_work}, Rest);
+		NewList ->
+		    mnesia_lib:set({Tab, commit_work},
+				   [{checkpoints, NewList} | Rest])
+	    end;
+	_  -> ignore
+    end.
+
+do_del_retainers(Cp, Node) ->
+    Rs = [do_del_retainer2(Cp, R, Node) || R <- Cp#checkpoint_args.retainers],
+    Cp#checkpoint_args{retainers = Rs, nodes = writers(Rs)}.
+
+do_del_retainer2(Cp, R, Node) ->
+    Writers = R#retainer.writers -- [Node],
+    R2 = R#retainer{writers = Writers},
+    set({R2#retainer.tab_name, {retainer, R2#retainer.cp_name}}, R2),
+    if
+	Writers == [] ->
+	    Event = {mnesia_checkpoint_deactivated, Cp#checkpoint_args.name},
+	    mnesia_lib:report_system_event(Event),
+	    do_stop(Cp),
+	    exit(shutdown);
+	Node == node() ->
+	    deactivate_tab(R), % Avoids unnecessary tm_retain accesses
+	    set({R2#retainer.tab_name, {retainer, R2#retainer.cp_name}}, R2),
+	    R2;
+	true ->
+	    R2
+    end.
+
+do_del_retainer(Cp, R0, Node) ->
+    {R, Rest} = find_retainer(R0, Cp#checkpoint_args.retainers, []),
+    R2 = do_del_retainer2(Cp, R, Node),
+    Rs = [R2|Rest],
+    Cp#checkpoint_args{retainers = Rs, nodes = writers(Rs)}.
+
+do_del_copy(Cp, Tab, ThisNode) when ThisNode == node() ->
+    Name = Cp#checkpoint_args.name,
+    Others = Cp#checkpoint_args.nodes -- [ThisNode],
+    R = val({Tab, {retainer, Name}}),
+    abcast(Others, Name, {del_retainer, R, ThisNode}),
+    do_del_retainer(Cp, R, ThisNode).
+
+do_add_copy(Cp, Tab, Node) when Node /= node()->
+    case lists:member(Tab, Cp#checkpoint_args.max) of
+	false ->
+	    {ok, Cp};
+	true ->
+	    Name = Cp#checkpoint_args.name,
+	    R0 = val({Tab, {retainer, Name}}),
+	    W = R0#retainer.writers,
+	    R = R0#retainer{writers = W ++ [Node]},
+
+	    case lists:member(Node, Cp#checkpoint_args.nodes) of
+		true ->
+		    send_retainer(Cp, R, Node);
+		false ->
+		    case tm_remote_prepare(Node, Cp) of
+			{ok, Name, _IgnoreNew, Node} ->
+			    case lists:member(schema, Cp#checkpoint_args.max) of
+				true ->
+				    %% We need to send schema retainer somewhere
+				    RS0 = val({schema, {retainer, Name}}),
+				    W = RS0#retainer.writers,
+				    RS1 = RS0#retainer{writers = W ++ [Node]},
+				    case send_retainer(Cp, RS1, Node) of
+					{ok, Cp1} ->
+					    send_retainer(Cp1, R, Node);
+					Error ->
+					    Error
+				    end;
+				false ->
+				    send_retainer(Cp, R, Node)
+			    end;
+			{badrpc, Reason} ->
+			    {{error, {badrpc, Reason}}, Cp};
+			{error, Reason} ->
+			    {{error, Reason}, Cp}
+		    end
+	    end
+    end.
+
+tm_remote_prepare(Node, Cp) ->
+    rpc:call(Node, ?MODULE, tm_prepare, [Cp]).
+
+do_add_retainer(Cp, R0, Node) ->
+    Writers = R0#retainer.writers,
+    {R, Rest} = find_retainer(R0, Cp#checkpoint_args.retainers, []),
+    NewRet =
+	if
+	    Node == node() ->
+		prepare_tab(Cp, R#retainer{writers = Writers});
+	    true ->
+		R#retainer{writers = Writers}
+	end,
+    Rs = [NewRet | Rest],
+    set({NewRet#retainer.tab_name, {retainer, NewRet#retainer.cp_name}}, NewRet),
+    Cp#checkpoint_args{retainers = Rs, nodes = writers(Rs)}.
+
+find_retainer(#retainer{cp_name = CP, tab_name = Tab},
+	      [Ret = #retainer{cp_name = CP, tab_name = Tab} | R], Acc) ->
+    {Ret, R ++ Acc};
+find_retainer(Ret, [H|R], Acc) ->
+    find_retainer(Ret, R, [H|Acc]).
+
+send_retainer(Cp, R, Node) ->
+    Name = Cp#checkpoint_args.name,
+    Nodes0 = Cp#checkpoint_args.nodes -- [Node],
+    Nodes1 = Nodes0 ++ [Node],
+    Nodes = Nodes1 -- [node()],
+    abcast(Nodes, Name, {add_retainer, R, Node}),
+    Store = R#retainer.store,
+%%    send_retainer2(Node, Name, Store, retainer_next_slot(Store, 0)),
+    send_retainer2(Node, Name, Store, retainer_first(Store)),
+    Cp2 = do_add_retainer(Cp, R, Node),
+    {ok, Cp2}.
+
+send_retainer2(_, _, _, '$end_of_table') ->
+    ok;
+%%send_retainer2(Node, Name, Store, {Slot, Records}) ->
+send_retainer2(Node, Name, Store, Key) ->
+    [{Tab, _, Records}] = retainer_get(Store, Key),
+    abcast([Node], Name, {retain, {dirty, send_retainer}, Tab, Key, Records}),
+    send_retainer2(Node, Name, Store, retainer_next(Store, Key)).
+
+do_change_copy(Cp, Tab, FromType, ToType) ->
+    Name = Cp#checkpoint_args.name,
+    R = val({Tab, {retainer, Name}}),
+    R2 = prepare_tab(Cp, R, ToType),
+    {_, Old} = R#retainer.store,
+    {_, New} = R2#retainer.store,
+
+    Fname = tab2retainer({Tab, Name}),
+    if
+	FromType == disc_only_copies ->
+	    mnesia_lib:dets_sync_close(Old),
+	    loaded = mnesia_lib:dets_to_ets(Old, New, Fname, set, no, yes),
+	    ok = file:delete(Fname);
+	ToType == disc_only_copies ->
+	    TabSize = ?ets_info(Old, size),
+	    Props = [{file, Fname},
+		     {type, set},
+		     {keypos, 2},
+%%	             {ram_file, true},
+		     {estimated_no_objects, TabSize + 256},
+		     {repair, false}],
+	    {ok, _} = mnesia_lib:dets_sync_open(New, Props),
+	    ok = mnesia_dumper:raw_dump_table(New, Old),
+	    ?ets_delete_table(Old);
+	true ->
+	    ignore
+    end,
+    Pos = #retainer.tab_name,
+    Rs = lists:keyreplace(Tab, Pos, Cp#checkpoint_args.retainers, R2),
+    Cp#checkpoint_args{retainers = Rs, nodes = writers(Rs)}.
+
+check_iter(From, Iter) when Iter#iter.pid == From ->
+    retainer_fixtable(Iter#iter.oid_tab, false),
+    false;
+check_iter(_From, _Iter) ->
+    true.
+
+init_tabs(R, Iter) ->
+    {Kind, _} = Store = R#retainer.store,
+    Main = {Kind, Iter#iter.tab_name},
+    Ret = Store,
+    Iter2 = Iter#iter{main_tab = Main, retainer_tab = Ret},
+    case Iter#iter.source of
+	table -> Iter2#iter{oid_tab = Main};
+	retainer -> Iter2#iter{oid_tab = Ret}
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Iteration
+%%
+%% Iterates over a table and applies Fun(ListOfRecords)
+%% with a suitable amount of records, e.g. 1000 or so.
+%% ListOfRecords is [] when the iteration is over.
+%%
+%% OidKind affects which internal table to be iterated over and
+%% ValKind affects which table to pick the actual records from. Legal
+%% values for OidKind and ValKind is the atom table or the atom
+%% retainer.
+%%
+%% The iteration may either be performed over the main table (which
+%% contains the latest values of the records, i.e. the values that
+%% are visible to the applications) or over the checkpoint retainer
+%% (which contains the values as the looked like the timepoint when
+%% the checkpoint was activated).
+%%
+%% It is possible to iterate over the main table and pick values
+%% from the retainer and vice versa.
+
+iterate(Name, Tab, Fun, Acc, Source, Val) ->
+    Iter0 = #iter{tab_name = Tab, source = Source, val = Val},
+    case call(Name, {iter_begin, Iter0}) of
+	{error, Reason} ->
+	    {error, Reason};
+	{ok, Iter, Pid} ->
+	    link(Pid), % We don't want any pending fixtable's
+	    Res = (catch iter(Fun, Acc, Iter)),
+	    unlink(Pid),
+	    call(Name, {iter_end, Iter}),
+	    case Res of
+		{'EXIT', Reason} -> {error, Reason};
+		{error, Reason} -> {error, Reason};
+		Acc2 -> {ok, Acc2}
+	    end
+    end.
+
+iter(Fun, Acc, Iter)->
+    iter(Fun, Acc, Iter, retainer_first(Iter#iter.oid_tab)).
+
+iter(Fun, Acc, Iter, Key) ->
+    case get_records(Iter, Key) of
+	{'$end_of_table', []} ->
+	    Fun([], Acc);
+	{'$end_of_table', Records} ->
+	    Acc2 = Fun(Records, Acc),
+	    Fun([], Acc2);
+	{Next, Records} ->
+	    Acc2 = Fun(Records, Acc),
+	    iter(Fun, Acc2, Iter, Next)
+    end.
+
+stop_iteration(Reason) ->
+    throw({error, {stopped, Reason}}).
+
+get_records(Iter, Key) ->
+    get_records(Iter, Key, 500, []). % 500 keys
+
+get_records(_Iter, Key, 0, Acc) ->
+    {Key, lists:append(lists:reverse(Acc))};
+get_records(_Iter, '$end_of_table', _I, Acc) ->
+    {'$end_of_table', lists:append(lists:reverse(Acc))};
+get_records(Iter, Key, I, Acc) ->
+    Recs = get_val(Iter, Key),
+    Next = retainer_next(Iter#iter.oid_tab, Key),
+    get_records(Iter, Next, I-1, [Recs | Acc]).
+
+get_val(Iter, Key) when Iter#iter.val == latest ->
+    get_latest_val(Iter, Key);
+get_val(Iter, Key) when Iter#iter.val == checkpoint ->
+    get_checkpoint_val(Iter, Key).
+
+get_latest_val(Iter, Key) when Iter#iter.source == table ->
+    retainer_get(Iter#iter.main_tab, Key);
+get_latest_val(Iter, Key) when Iter#iter.source == retainer ->
+    DeleteOid = {Iter#iter.tab_name, Key},
+    [DeleteOid | retainer_get(Iter#iter.main_tab, Key)].
+
+get_checkpoint_val(Iter, Key) when Iter#iter.source == table ->
+    retainer_get(Iter#iter.main_tab, Key);
+get_checkpoint_val(Iter, Key) when Iter#iter.source == retainer ->
+    DeleteOid = {Iter#iter.tab_name, Key},
+    case retainer_get(Iter#iter.retainer_tab, Key) of
+	[{_, _, []}] -> [DeleteOid];
+	[{_, _, Records}] -> [DeleteOid | Records]
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% System upgrade
+
+system_continue(_Parent, _Debug, Cp) ->
+    retainer_loop(Cp).
+
+system_terminate(_Reason, _Parent,_Debug, Cp) ->
+    do_stop(Cp).
+
+system_code_change(Cp, _Module, _OldVsn, _Extra) ->
+    {ok, Cp}.
+
+convert_cp_record(Cp) when record(Cp, checkpoint) ->
+    ROD =
+	case Cp#checkpoint.ram_overrides_dump of
+	    true -> Cp#checkpoint.min ++ Cp#checkpoint.max;
+	    false -> []
+	end,
+
+    {ok, #checkpoint_args{name = Cp#checkpoint.name,
+			  allow_remote = Cp#checkpoint.name,
+			  ram_overrides_dump = ROD,
+			  nodes = Cp#checkpoint.nodes,
+			  node = Cp#checkpoint.node,
+			  now = Cp#checkpoint.now,
+			  cookie = ?unique_cookie,
+			  min = Cp#checkpoint.min,
+			  max = Cp#checkpoint.max,
+			  pending_tab = Cp#checkpoint.pending_tab,
+			  wait_for_old = Cp#checkpoint.wait_for_old,
+			  is_activated = Cp#checkpoint.is_activated,
+			  ignore_new = Cp#checkpoint.ignore_new,
+			  retainers = Cp#checkpoint.retainers,
+			  iterators = Cp#checkpoint.iterators,
+			  supervisor = Cp#checkpoint.supervisor,
+			  pid = Cp#checkpoint.pid
+			 }};
+convert_cp_record(Cp) when record(Cp, checkpoint_args) ->
+    AllTabs = Cp#checkpoint_args.min ++ Cp#checkpoint_args.max,
+    ROD = case Cp#checkpoint_args.ram_overrides_dump of
+	      [] ->
+		  false;
+	      AllTabs ->
+		  true;
+	      _ ->
+		  error
+	  end,
+    if
+	ROD == error ->
+	    {error, {"Old node cannot handle new checkpoint protocol",
+		     ram_overrides_dump}};
+	true ->
+	    {ok, #checkpoint{name = Cp#checkpoint_args.name,
+			     allow_remote = Cp#checkpoint_args.name,
+			     ram_overrides_dump = ROD,
+			     nodes = Cp#checkpoint_args.nodes,
+			     node = Cp#checkpoint_args.node,
+			     now = Cp#checkpoint_args.now,
+			     min = Cp#checkpoint_args.min,
+			     max = Cp#checkpoint_args.max,
+			     pending_tab = Cp#checkpoint_args.pending_tab,
+			     wait_for_old = Cp#checkpoint_args.wait_for_old,
+			     is_activated = Cp#checkpoint_args.is_activated,
+			     ignore_new = Cp#checkpoint_args.ignore_new,
+			     retainers = Cp#checkpoint_args.retainers,
+			     iterators = Cp#checkpoint_args.iterators,
+			     supervisor = Cp#checkpoint_args.supervisor,
+			     pid = Cp#checkpoint_args.pid
+			    }}
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_);
+	_VaLuE_ -> _VaLuE_
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_checkpoint_sup.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_checkpoint_sup.erl
new file mode 100644
index 0000000000..36425537eb
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_checkpoint_sup.erl
@@ -0,0 +1,39 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_checkpoint_sup.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
+%%
+-module(mnesia_checkpoint_sup).
+
+-behaviour(supervisor).
+
+-export([start/0, init/1]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% top supervisor callback functions
+
+start() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% sub supervisor callback functions
+
+init([]) ->
+    Flags = {simple_one_for_one, 0, timer:hours(24)}, % Trust the top supervisor
+    MFA = {mnesia_checkpoint, start, []},
+    Modules = [?MODULE, mnesia_checkpoint, supervisor],
+    KillAfter = mnesia_kernel_sup:supervisor_timeout(timer:seconds(3)),
+    Workers = [{?MODULE, MFA, transient, KillAfter, worker, Modules}],
+    {ok, {Flags, Workers}}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_controller.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_controller.erl
new file mode 100644
index 0000000000..1d7f29bfbd
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_controller.erl
@@ -0,0 +1,2010 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_controller.erl,v 1.3 2010/03/04 13:54:19 maria Exp $
+%%
+%% The mnesia_init process loads tables from local disc or from
+%% another nodes. It also coordinates updates of the info about
+%% where we can read and write tables.
+%%
+%% Tables may need to be loaded initially at startup of the local
+%% node or when other nodes announces that they already have loaded
+%% tables that we also want.
+%%
+%% Initially we set the load request queue to those tables that we
+%% safely can load locally, i.e. tables where we have the last
+%% consistent replica and we have received mnesia_down from all
+%% other nodes holding the table. Then we let the mnesia_init
+%% process enter its normal working state.
+%%
+%% When we need to load a table we append a request to the load
+%% request queue. All other requests are regarded as high priority
+%% and are processed immediately (e.g. update table whereabouts).
+%% We processes the load request queue as a "background" job..
+
+-module(mnesia_controller).
+
+-behaviour(gen_server).
+
+%% Mnesia internal stuff
+-export([
+	 start/0,
+	 i_have_tab/1,
+	 info/0,
+	 get_info/1,
+	 get_workers/1,
+	 force_load_table/1,
+	 async_dump_log/1,
+	 sync_dump_log/1,
+	 connect_nodes/1,
+	 wait_for_schema_commit_lock/0,
+	 release_schema_commit_lock/0,
+	 create_table/1,
+	 get_disc_copy/1,
+	 get_cstructs/0,
+	 sync_and_block_table_whereabouts/4,
+	 sync_del_table_copy_whereabouts/2,
+	 block_table/1,
+	 unblock_table/1,
+	 block_controller/0,
+	 unblock_controller/0,
+	 unannounce_add_table_copy/2,
+	 master_nodes_updated/2,
+	 mnesia_down/1,
+	 add_active_replica/2,
+	 add_active_replica/3,
+	 add_active_replica/4,
+	 change_table_access_mode/1,
+	 del_active_replica/2,
+	 wait_for_tables/2,
+	 get_network_copy/2,
+	 merge_schema/0,
+	 start_remote_sender/4,
+	 schedule_late_disc_load/2
+	]).
+
+%% gen_server callbacks
+-export([init/1,
+	 handle_call/3,
+	 handle_cast/2,
+	 handle_info/2,
+	 terminate/2,
+	 code_change/3]).
+
+%% Module internal stuff
+-export([call/1,
+	 cast/1,
+	 dump_and_reply/2,
+	 load_and_reply/2,
+	 send_and_reply/2,
+	 wait_for_tables_init/2
+	]).
+
+-import(mnesia_lib, [set/2, add/2]).
+-import(mnesia_lib, [fatal/2, error/2, verbose/2, dbg_out/2]).
+
+-include("mnesia.hrl").
+
+-define(SERVER_NAME, ?MODULE).
+
+-record(state, {supervisor,
+		schema_is_merged = false,
+		early_msgs = [],
+		loader_pid,
+		loader_queue = [],
+		sender_pid,
+		sender_queue =  [],
+		late_loader_queue = [],
+		dumper_pid,          % Dumper or schema commit pid
+		dumper_queue = [],   % Dumper or schema commit queue
+		dump_log_timer_ref,
+		is_stopping = false
+	       }).
+
+-record(worker_reply, {what,
+		       pid,
+		       result
+		      }).
+
+-record(schema_commit_lock, {owner}).
+-record(block_controller, {owner}).
+
+-record(dump_log, {initiated_by,
+		   opt_reply_to
+		  }).
+
+-record(net_load, {table,
+		   reason,
+		   opt_reply_to,
+		   cstruct = unknown
+		  }).
+
+-record(send_table, {table,
+		     receiver_pid,
+		     remote_storage
+		    }).
+
+-record(disc_load, {table,
+		    reason,
+		    opt_reply_to
+		   }).
+
+-record(late_load, {table,
+		    reason,
+		    opt_reply_to,
+		    loaders
+		   }).
+
+-record(loader_done, {worker_pid,
+		      is_loaded,
+		      table_name,
+		      needs_announce,
+		      needs_sync,
+		      needs_reply,
+		      reply_to,
+		      reply}).
+
+-record(sender_done, {worker_pid,
+		      worker_res,
+		      table_name
+		     }).
+
+-record(dumper_done, {worker_pid,
+		      worker_res
+		     }).
+
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason);
+	Value -> Value
+    end.
+
+start() ->
+    gen_server:start_link({local, ?SERVER_NAME}, ?MODULE, [self()],
+			  [{timeout, infinity}
+			   %% ,{debug, [trace]}
+			  ]).
+
+sync_dump_log(InitBy) ->
+    call({sync_dump_log, InitBy}).
+
+async_dump_log(InitBy) ->
+    ?SERVER_NAME ! {async_dump_log, InitBy}.
+
+%% Wait for tables to be active
+%% If needed, we will wait for Mnesia to start
+%% If Mnesia stops, we will wait for Mnesia to restart
+%% We will wait even if the list of tables is empty
+%%
+wait_for_tables(Tabs, Timeout) when list(Tabs), Timeout == infinity ->
+    do_wait_for_tables(Tabs, Timeout);
+wait_for_tables(Tabs, Timeout) when list(Tabs),
+                                    integer(Timeout), Timeout >= 0 ->
+    do_wait_for_tables(Tabs, Timeout);
+wait_for_tables(Tabs, Timeout) ->
+    {error, {badarg, Tabs, Timeout}}.
+
+do_wait_for_tables(Tabs, 0) ->
+    reply_wait(Tabs);
+do_wait_for_tables(Tabs, Timeout) ->
+    Pid = spawn_link(?MODULE, wait_for_tables_init, [self(), Tabs]),
+    receive
+	{?SERVER_NAME, Pid, Res} ->
+	    Res;
+
+	{'EXIT', Pid, _} ->
+	    reply_wait(Tabs)
+
+    after Timeout ->
+	    unlink(Pid),
+	    exit(Pid, timeout),
+	    reply_wait(Tabs)
+    end.
+
+reply_wait(Tabs) ->
+    case catch mnesia_lib:active_tables() of
+	{'EXIT', _} ->
+	    {error, {node_not_running, node()}};
+	Active when list(Active) ->
+	    case Tabs -- Active of
+		[] ->
+		    ok;
+		BadTabs ->
+		    {timeout, BadTabs}
+	    end
+    end.
+
+wait_for_tables_init(From, Tabs) ->
+    process_flag(trap_exit, true),
+    Res = wait_for_init(From, Tabs, whereis(?SERVER_NAME)),
+    From ! {?SERVER_NAME, self(), Res},
+    unlink(From),
+    exit(normal).
+
+wait_for_init(From, Tabs, Init) ->
+    case catch link(Init) of
+	{'EXIT', _} ->
+	    %% Mnesia is not started
+	    {error, {node_not_running, node()}};
+	true when pid(Init) ->
+	    cast({sync_tabs, Tabs, self()}),
+	    rec_tabs(Tabs, Tabs, From, Init)
+    end.
+
+sync_reply(Waiter, Tab) ->
+    Waiter ! {?SERVER_NAME, {tab_synced, Tab}}.
+
+rec_tabs([Tab | Tabs], AllTabs, From, Init) ->
+    receive
+	{?SERVER_NAME, {tab_synced, Tab}} ->
+	    rec_tabs(Tabs, AllTabs, From, Init);
+
+	{'EXIT', From, _} ->
+	    %% This will trigger an exit signal
+	    %% to mnesia_init
+	    exit(wait_for_tables_timeout);
+
+	{'EXIT', Init, _} ->
+	    %% Oops, mnesia_init stopped,
+	    exit(mnesia_stopped)
+    end;
+rec_tabs([], _, _, Init) ->
+    unlink(Init),
+    ok.
+
+get_cstructs() ->
+    call(get_cstructs).
+
+mnesia_down(Node) ->
+    case cast({mnesia_down, Node}) of
+	{error, _} -> mnesia_monitor:mnesia_down(?SERVER_NAME, Node);
+	_Pid ->  ok
+    end.
+wait_for_schema_commit_lock() ->
+    link(whereis(?SERVER_NAME)),
+    unsafe_call(wait_for_schema_commit_lock).
+
+block_controller() ->
+    call(block_controller).
+
+unblock_controller() ->
+    cast(unblock_controller).
+
+release_schema_commit_lock() ->
+    cast({release_schema_commit_lock, self()}),
+    unlink(whereis(?SERVER_NAME)).
+
+%% Special for preparation of add table copy
+get_network_copy(Tab, Cs) ->
+    Work = #net_load{table = Tab,
+		     reason = {dumper, add_table_copy},
+		     cstruct = Cs
+		    },
+    Res = (catch load_table(Work)),
+    if Res#loader_done.is_loaded == true ->
+	    Tab = Res#loader_done.table_name,
+	    case Res#loader_done.needs_announce of
+		true ->
+		    i_have_tab(Tab);
+		false ->
+		    ignore
+	    end;
+       true -> ignore
+    end,
+
+    receive %% Flush copier done message
+	{copier_done, _Node} ->
+	    ok
+    after 500 ->  %% avoid hanging if something is wrong and we shall fail.
+	    ignore
+    end,
+    Res#loader_done.reply.
+
+%% This functions is invoked from the dumper
+%%
+%% There are two cases here:
+%% startup ->
+%%   no need for sync, since mnesia_controller not started yet
+%% schema_trans ->
+%%   already synced with mnesia_controller since the dumper
+%%   is syncronously started from mnesia_controller
+
+create_table(Tab) ->
+    {loaded, ok} = mnesia_loader:disc_load_table(Tab, {dumper,create_table}).
+
+get_disc_copy(Tab) ->
+    disc_load_table(Tab, {dumper,change_table_copy_type}, undefined).
+
+%% Returns ok instead of yes
+force_load_table(Tab) when atom(Tab), Tab /= schema ->
+    case ?catch_val({Tab, storage_type}) of
+	ram_copies ->
+	    do_force_load_table(Tab);
+	disc_copies ->
+	    do_force_load_table(Tab);
+	disc_only_copies ->
+	    do_force_load_table(Tab);
+	unknown ->
+	    set({Tab, load_by_force}, true),
+	    cast({force_load_updated, Tab}),
+	    wait_for_tables([Tab], infinity);
+	{'EXIT', _} ->
+	    {error, {no_exists, Tab}}
+    end;
+force_load_table(Tab) ->
+    {error, {bad_type, Tab}}.
+
+do_force_load_table(Tab) ->
+    Loaded = ?catch_val({Tab, load_reason}),
+    case Loaded of
+	unknown ->
+	    set({Tab, load_by_force}, true),
+	    mnesia_late_loader:async_late_disc_load(node(), [Tab], forced_by_user),
+	    wait_for_tables([Tab], infinity);
+	{'EXIT', _} ->
+	    set({Tab, load_by_force}, true),
+	    mnesia_late_loader:async_late_disc_load(node(), [Tab], forced_by_user),
+	    wait_for_tables([Tab], infinity);
+	_ ->
+	    ok
+    end.
+master_nodes_updated(schema, _Masters) ->
+    ignore;
+master_nodes_updated(Tab, Masters) ->
+    cast({master_nodes_updated, Tab, Masters}).
+
+schedule_late_disc_load(Tabs, Reason) ->
+    MsgTag = late_disc_load,
+    try_schedule_late_disc_load(Tabs, Reason, MsgTag).
+
+try_schedule_late_disc_load(Tabs, _Reason, MsgTag)
+  when Tabs == [], MsgTag /= schema_is_merged ->
+    ignore;
+try_schedule_late_disc_load(Tabs, Reason, MsgTag) ->
+    GetIntents =
+	fun() ->
+		Item = mnesia_late_disc_load,
+		Nodes = val({current, db_nodes}),
+		mnesia:lock({global, Item, Nodes}, write),
+		case multicall(Nodes -- [node()], disc_load_intents) of
+		    {Replies, []} ->
+			call({MsgTag, Tabs, Reason, Replies}),
+			done;
+		    {_, BadNodes} ->
+			%% Some nodes did not respond, lets try again
+			{retry, BadNodes}
+		end
+	end,
+    case mnesia:transaction(GetIntents) of
+	{'atomic', done} ->
+	    done;
+	{'atomic', {retry, BadNodes}} ->
+	    verbose("Retry late_load_tables because bad nodes: ~p~n",
+		    [BadNodes]),
+	    try_schedule_late_disc_load(Tabs, Reason, MsgTag);
+	{aborted, AbortReason} ->
+	    fatal("Cannot late_load_tables~p: ~p~n",
+		  [[Tabs, Reason, MsgTag], AbortReason])
+    end.
+
+connect_nodes(Ns) ->
+    case mnesia:system_info(is_running) of
+	no ->
+	    {error, {node_not_running, node()}};
+	yes ->
+	    {NewC, OldC} = mnesia_recover:connect_nodes(Ns),
+	    Connected = NewC ++OldC,
+	    New1 = mnesia_lib:intersect(Ns, Connected),
+	    New = New1 -- val({current, db_nodes}),
+
+	    case try_merge_schema(New) of
+		ok ->
+		    mnesia_lib:add_list(extra_db_nodes, New),
+		    {ok, New};
+		{aborted, {throw, Str}} when list(Str) ->
+		    %%mnesia_recover:disconnect_nodes(New),
+		    {error, {merge_schema_failed, lists:flatten(Str)}};
+		Else ->
+		    %% Unconnect nodes where merge failed!!
+		    %% mnesia_recover:disconnect_nodes(New),
+		    {error, Else}
+	    end
+    end.
+
+%% Merge the local schema with the schema on other nodes.
+%% But first we must let all processes that want to force
+%% load tables wait until the schema merge is done.
+
+merge_schema() ->
+    AllNodes = mnesia_lib:all_nodes(),
+    case try_merge_schema(AllNodes) of
+	ok ->
+	    schema_is_merged();
+	{aborted, {throw, Str}} when list(Str) ->
+	    fatal("Failed to merge schema: ~s~n", [Str]);
+	Else ->
+	    fatal("Failed to merge schema: ~p~n", [Else])
+    end.
+
+try_merge_schema(Nodes) ->
+    case mnesia_schema:merge_schema() of
+	{'atomic', not_merged} ->
+	    %% No more nodes that we need to merge the schema with
+	    ok;
+	{'atomic', {merged, OldFriends, NewFriends}} ->
+	    %% Check if new nodes has been added to the schema
+	    Diff = mnesia_lib:all_nodes() -- [node() | Nodes],
+	    mnesia_recover:connect_nodes(Diff),
+
+	    %% Tell everybody to adopt orphan tables
+	    im_running(OldFriends, NewFriends),
+	    im_running(NewFriends, OldFriends),
+
+	    try_merge_schema(Nodes);
+	{'atomic', {"Cannot get cstructs", Node, Reason}} ->
+	    dbg_out("Cannot get cstructs, Node ~p ~p~n", [Node, Reason]),
+	    timer:sleep(1000), % Avoid a endless loop look alike
+	    try_merge_schema(Nodes);
+	Other ->
+	    Other
+    end.
+
+im_running(OldFriends, NewFriends) ->
+    abcast(OldFriends, {im_running, node(), NewFriends}).
+
+schema_is_merged() ->
+    MsgTag = schema_is_merged,
+    SafeLoads = initial_safe_loads(),
+
+    %% At this point we do not know anything about
+    %% which tables that the other nodes already
+    %% has loaded and therefore we let the normal
+    %% processing of the loader_queue take care
+    %% of it, since we at that time point will
+    %% know the whereabouts. We rely on the fact
+    %% that all nodes tells each other directly
+    %% when they have loaded a table and are
+    %% willing to share it.
+
+    try_schedule_late_disc_load(SafeLoads, initial, MsgTag).
+
+
+cast(Msg) ->
+    case whereis(?SERVER_NAME) of
+	undefined ->{error, {node_not_running, node()}};
+	Pid ->  gen_server:cast(Pid, Msg)
+    end.
+
+abcast(Nodes, Msg) ->
+    gen_server:abcast(Nodes, ?SERVER_NAME, Msg).
+
+unsafe_call(Msg) ->
+    case whereis(?SERVER_NAME) of
+	undefined -> {error, {node_not_running, node()}};
+	Pid -> gen_server:call(Pid, Msg, infinity)
+    end.
+
+call(Msg) ->
+    case whereis(?SERVER_NAME) of
+	undefined ->
+	    {error, {node_not_running, node()}};
+	Pid ->
+	    link(Pid),
+	    Res = gen_server:call(Pid, Msg, infinity),
+	    unlink(Pid),
+
+	    %% We get an exit signal if server dies
+            receive
+                {'EXIT', Pid, _Reason} ->
+                    {error, {node_not_running, node()}}
+            after 0 ->
+                    ignore
+            end,
+	    Res
+    end.
+
+remote_call(Node, Func, Args) ->
+    case catch gen_server:call({?MODULE, Node}, {Func, Args, self()}, infinity) of
+	{'EXIT', Error} ->
+	    {error, Error};
+	Else ->
+	    Else
+    end.
+
+multicall(Nodes, Msg) ->
+    {Good, Bad} = gen_server:multi_call(Nodes, ?MODULE, Msg, infinity),
+    PatchedGood = [Reply || {_Node, Reply} <- Good],
+    {PatchedGood, Bad}.  %% Make the replies look like rpc:multicalls..
+%%    rpc:multicall(Nodes, ?MODULE, call, [Msg]).
+
+%%%----------------------------------------------------------------------
+%%% Callback functions from gen_server
+%%%----------------------------------------------------------------------
+
+%%----------------------------------------------------------------------
+%% Func: init/1
+%% Returns: {ok, State}          |
+%%          {ok, State, Timeout} |
+%%          {stop, Reason}
+%%----------------------------------------------------------------------
+init([Parent]) ->
+    process_flag(trap_exit, true),
+    mnesia_lib:verbose("~p starting: ~p~n", [?SERVER_NAME, self()]),
+
+    %% Handshake and initialize transaction recovery
+    %% for new nodes detected in the schema
+    All = mnesia_lib:all_nodes(),
+    Diff = All -- [node() | val(original_nodes)],
+    mnesia_lib:unset(original_nodes),
+    mnesia_recover:connect_nodes(Diff),
+
+    Interval = mnesia_monitor:get_env(dump_log_time_threshold),
+    Msg = {async_dump_log, time_threshold},
+    {ok, Ref} = timer:send_interval(Interval, Msg),
+    mnesia_dumper:start_regulator(),
+
+    {ok, #state{supervisor = Parent, dump_log_timer_ref = Ref}}.
+
+%%----------------------------------------------------------------------
+%% Func: handle_call/3
+%% Returns: {reply, Reply, State}          |
+%%          {reply, Reply, State, Timeout} |
+%%          {noreply, State}               |
+%%          {noreply, State, Timeout}      |
+%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
+%%          {stop, Reason, Reply, State}     (terminate/2 is called)
+%%----------------------------------------------------------------------
+
+handle_call({sync_dump_log, InitBy}, From, State) ->
+    Worker = #dump_log{initiated_by = InitBy,
+		       opt_reply_to = From
+		      },
+    State2 = add_worker(Worker, State),
+    noreply(State2);
+
+handle_call(wait_for_schema_commit_lock, From, State) ->
+    Worker = #schema_commit_lock{owner = From},
+    State2 = add_worker(Worker, State),
+    noreply(State2);
+
+handle_call(block_controller, From, State) ->
+    Worker = #block_controller{owner = From},
+    State2 = add_worker(Worker, State),
+    noreply(State2);
+
+
+handle_call(get_cstructs, From, State) ->
+    Tabs = val({schema, tables}),
+    Cstructs = [val({T, cstruct}) || T <- Tabs],
+    Running = val({current, db_nodes}),
+    reply(From, {cstructs, Cstructs, Running}),
+    noreply(State);
+
+handle_call({schema_is_merged, TabsR, Reason, RemoteLoaders}, From, State) ->
+    State2 = late_disc_load(TabsR, Reason, RemoteLoaders, From, State),
+
+    %% Handle early messages
+    Msgs = State2#state.early_msgs,
+    State3 = State2#state{early_msgs = [], schema_is_merged = true},
+    Ns = val({current, db_nodes}),
+    dbg_out("Schema is merged ~w, State ~w~n", [Ns, State3]),
+%%    dbg_out("handle_early_msgs ~p ~n", [Msgs]), % qqqq
+    handle_early_msgs(lists:reverse(Msgs), State3);
+
+handle_call(disc_load_intents, From, State) ->
+    Tabs = disc_load_intents(State#state.loader_queue) ++
+           disc_load_intents(State#state.late_loader_queue),
+    ActiveTabs = mnesia_lib:local_active_tables(),
+    reply(From, {ok, node(), mnesia_lib:union(Tabs, ActiveTabs)}),
+    noreply(State);
+
+handle_call({update_where_to_write, [add, Tab, AddNode], _From}, _Dummy, State) ->
+%%%    dbg_out("update_w2w ~p", [[add, Tab, AddNode]]), %%% qqqq
+    Current = val({current, db_nodes}),
+    Res =
+	case lists:member(AddNode, Current) and
+	    State#state.schema_is_merged == true of
+	    true ->
+		mnesia_lib:add({Tab, where_to_write}, AddNode);
+	    false ->
+		ignore
+	end,
+    {reply, Res, State};
+
+handle_call({add_active_replica, [Tab, ToNode, RemoteS, AccessMode], From},
+	    ReplyTo, State) ->
+    KnownNode = lists:member(ToNode, val({current, db_nodes})),
+    Merged = State#state.schema_is_merged,
+    if
+	KnownNode == false ->
+	    reply(ReplyTo, ignore),
+	    noreply(State);
+	Merged == true ->
+	    Res = add_active_replica(Tab, ToNode, RemoteS, AccessMode),
+	    reply(ReplyTo, Res),
+	    noreply(State);
+	true -> %% Schema is not merged
+	    Msg = {add_active_replica, [Tab, ToNode, RemoteS, AccessMode], From},
+	    Msgs = State#state.early_msgs,
+	    reply(ReplyTo, ignore),   %% Reply ignore and add data after schema merge
+	    noreply(State#state{early_msgs = [{call, Msg, undefined} | Msgs]})
+    end;
+
+handle_call({unannounce_add_table_copy, [Tab, Node], From}, ReplyTo, State) ->
+    KnownNode = lists:member(node(From), val({current, db_nodes})),
+    Merged = State#state.schema_is_merged,
+    if
+	KnownNode == false ->
+	    reply(ReplyTo, ignore),
+	    noreply(State);
+	Merged == true ->
+	    Res = unannounce_add_table_copy(Tab, Node),
+	    reply(ReplyTo, Res),
+	    noreply(State);
+	true -> %% Schema is not merged
+	    Msg = {unannounce_add_table_copy, [Tab, Node], From},
+	    Msgs = State#state.early_msgs,
+	    reply(ReplyTo, ignore),   %% Reply ignore and add data after schema merge
+	    %% Set ReplyTO to undefined so we don't reply twice
+	    noreply(State#state{early_msgs = [{call, Msg, undefined} | Msgs]})
+    end;
+
+handle_call(Msg, From, State) when State#state.schema_is_merged == false ->
+    %% Buffer early messages
+%%    dbg_out("Buffered early msg ~p ~n", [Msg]),   %% qqqq
+    Msgs = State#state.early_msgs,
+    noreply(State#state{early_msgs = [{call, Msg, From} | Msgs]});
+
+handle_call({net_load, Tab, Cs}, From, State) ->
+    Worker = #net_load{table = Tab,
+		       opt_reply_to = From,
+		       reason = add_table_copy,
+		       cstruct = Cs
+		      },
+    State2 = add_worker(Worker, State),
+    noreply(State2);
+
+handle_call({late_disc_load, Tabs, Reason, RemoteLoaders}, From, State) ->
+    State2 = late_disc_load(Tabs, Reason, RemoteLoaders, From, State),
+    noreply(State2);
+
+handle_call({block_table, [Tab], From}, _Dummy, State) ->
+    case lists:member(node(From), val({current, db_nodes})) of
+	true ->
+	    block_table(Tab);
+	false ->
+	    ignore
+    end,
+    {reply, ok, State};
+
+handle_call({check_w2r, _Node, Tab}, _From, State) ->
+    {reply, val({Tab, where_to_read}), State};
+
+handle_call(Msg, _From, State) ->
+    error("~p got unexpected call: ~p~n", [?SERVER_NAME, Msg]),
+    noreply(State).
+
+disc_load_intents([H | T]) when record(H, disc_load) ->
+    [H#disc_load.table | disc_load_intents(T)];
+disc_load_intents([H | T]) when record(H, late_load) ->
+    [H#late_load.table | disc_load_intents(T)];
+disc_load_intents( [H | T]) when record(H, net_load) ->
+    disc_load_intents(T);
+disc_load_intents([]) ->
+    [].
+
+late_disc_load(TabsR, Reason, RemoteLoaders, From, State) ->
+    verbose("Intend to load tables: ~p~n", [TabsR]),
+    ?eval_debug_fun({?MODULE, late_disc_load},
+		    [{tabs, TabsR},
+		     {reason, Reason},
+		     {loaders, RemoteLoaders}]),
+
+    reply(From, queued),
+    %% RemoteLoaders is a list of {ok, Node, Tabs} tuples
+
+    %% Remove deleted tabs
+    LocalTabs = mnesia_lib:val({schema, local_tables}),
+    Filter = fun({Tab, Reas}, Acc) ->
+		     case lists:member(Tab, LocalTabs) of
+			 true -> [{Tab, Reas} | Acc];
+		         false -> Acc
+		     end;
+		(Tab, Acc) ->
+		     case lists:member(Tab, LocalTabs) of
+			 true -> [Tab | Acc];
+		         false -> Acc
+		     end
+	     end,
+
+    Tabs = lists:foldl(Filter, [], TabsR),
+
+    Nodes = val({current, db_nodes}),
+    LateLoaders = late_loaders(Tabs, Reason, RemoteLoaders, Nodes),
+    LateQueue = State#state.late_loader_queue ++ LateLoaders,
+    State#state{late_loader_queue = LateQueue}.
+
+late_loaders([{Tab, Reason} | Tabs], DefaultReason, RemoteLoaders, Nodes) ->
+    LoadNodes = late_load_filter(RemoteLoaders, Tab, Nodes, []),
+    case LoadNodes of
+	[] ->
+	    cast({disc_load, Tab, Reason}); % Ugly cast
+	_ ->
+	    ignore
+    end,
+    LateLoad = #late_load{table = Tab, loaders = LoadNodes, reason = Reason},
+    [LateLoad | late_loaders(Tabs, DefaultReason, RemoteLoaders, Nodes)];
+
+late_loaders([Tab | Tabs], Reason, RemoteLoaders, Nodes) ->
+    Loaders = late_load_filter(RemoteLoaders, Tab, Nodes, []),
+    case Loaders of
+	[] ->
+	    cast({disc_load, Tab, Reason});  % Ugly cast
+	_ ->
+	    ignore
+    end,
+    LateLoad = #late_load{table = Tab, loaders = Loaders, reason = Reason},
+    [LateLoad | late_loaders(Tabs, Reason, RemoteLoaders, Nodes)];
+late_loaders([], _Reason, _RemoteLoaders, _Nodes) ->
+    [].
+
+late_load_filter([{error, _} | RemoteLoaders], Tab, Nodes, Acc) ->
+    late_load_filter(RemoteLoaders, Tab, Nodes, Acc);
+late_load_filter([{badrpc, _} | RemoteLoaders], Tab, Nodes, Acc) ->
+    late_load_filter(RemoteLoaders, Tab, Nodes, Acc);
+late_load_filter([RL | RemoteLoaders], Tab, Nodes, Acc) ->
+    {ok, Node, Intents} = RL,
+    Access = val({Tab, access_mode}),
+    LocalC = val({Tab, local_content}),
+    StillActive = lists:member(Node, Nodes),
+    RemoteIntent = lists:member(Tab, Intents),
+    if
+	Access == read_write,
+	LocalC == false,
+	StillActive == true,
+	RemoteIntent == true ->
+	    Masters = mnesia_recover:get_master_nodes(Tab),
+	    case lists:member(Node, Masters) of
+		true ->
+		    %% The other node is master node for
+		    %% the table, accept his load intent
+		    late_load_filter(RemoteLoaders, Tab, Nodes, [Node | Acc]);
+		false when Masters == [] ->
+		    %% The table has no master nodes
+		    %% accept his load intent
+		    late_load_filter(RemoteLoaders, Tab, Nodes, [Node | Acc]);
+		false ->
+		    %% Some one else is master node for
+		    %% the table, ignore his load intent
+		    late_load_filter(RemoteLoaders, Tab, Nodes, Acc)
+	    end;
+	true ->
+	    late_load_filter(RemoteLoaders, Tab, Nodes, Acc)
+    end;
+late_load_filter([], _Tab, _Nodes, Acc) ->
+    Acc.
+
+%%----------------------------------------------------------------------
+%% Func: handle_cast/2
+%% Returns: {noreply, State}          |
+%%          {noreply, State, Timeout} |
+%%          {stop, Reason, State}            (terminate/2 is called)
+%%----------------------------------------------------------------------
+
+handle_cast({release_schema_commit_lock, _Owner}, State) ->
+    if
+	State#state.is_stopping == true ->
+	    {stop, shutdown, State};
+	true ->
+	    case State#state.dumper_queue of
+		[#schema_commit_lock{}|Rest] ->
+		    [_Worker | Rest] = State#state.dumper_queue,
+		    State2 = State#state{dumper_pid = undefined,
+					 dumper_queue = Rest},
+		    State3 = opt_start_worker(State2),
+		    noreply(State3);
+		_ ->
+		    noreply(State)
+	    end
+    end;
+
+handle_cast(unblock_controller, State) ->
+    if
+	State#state.is_stopping == true ->
+	    {stop, shutdown, State};
+	record(hd(State#state.dumper_queue), block_controller) ->
+	    [_Worker | Rest] = State#state.dumper_queue,
+	    State2 = State#state{dumper_pid = undefined,
+				 dumper_queue = Rest},
+	    State3 = opt_start_worker(State2),
+	    noreply(State3)
+    end;
+
+handle_cast({mnesia_down, Node}, State) ->
+    maybe_log_mnesia_down(Node),
+    mnesia_lib:del({current, db_nodes}, Node),
+    mnesia_checkpoint:tm_mnesia_down(Node),
+    Alltabs = val({schema, tables}),
+    State2 = reconfigure_tables(Node, State, Alltabs),
+    case State#state.sender_pid of
+	undefined -> ignore;
+	Pid when pid(Pid) -> Pid ! {copier_done, Node}
+    end,
+    case State#state.loader_pid of
+	undefined -> ignore;
+	Pid2 when pid(Pid2) -> Pid2 ! {copier_done, Node}
+    end,
+    NewSenders =
+	case State#state.sender_queue of
+	    [OldSender | RestSenders] ->
+		Remove = fun(ST) ->
+				 node(ST#send_table.receiver_pid) /= Node
+			 end,
+		NewS = lists:filter(Remove, RestSenders),
+		%% Keep old sender it will be removed by sender_done
+		[OldSender | NewS];
+	    [] ->
+		[]
+	end,
+    Early = remove_early_messages(State2#state.early_msgs, Node),
+    mnesia_monitor:mnesia_down(?SERVER_NAME, Node),
+    noreply(State2#state{sender_queue = NewSenders, early_msgs = Early});
+
+handle_cast({im_running, _Node, NewFriends}, State) ->
+    Tabs = mnesia_lib:local_active_tables() -- [schema],
+    Ns = mnesia_lib:intersect(NewFriends, val({current, db_nodes})),
+    abcast(Ns, {adopt_orphans, node(), Tabs}),
+    noreply(State);
+
+handle_cast(Msg, State) when State#state.schema_is_merged == false ->
+    %% Buffer early messages
+    Msgs = State#state.early_msgs,
+    noreply(State#state{early_msgs = [{cast, Msg} | Msgs]});
+
+handle_cast({disc_load, Tab, Reason}, State) ->
+    Worker = #disc_load{table = Tab, reason = Reason},
+    State2 = add_worker(Worker, State),
+    noreply(State2);
+
+handle_cast(Worker, State) when record(Worker, send_table) ->
+    State2 = add_worker(Worker, State),
+    noreply(State2);
+
+handle_cast({sync_tabs, Tabs, From}, State) ->
+    %% user initiated wait_for_tables
+    handle_sync_tabs(Tabs, From),
+    noreply(State);
+
+handle_cast({i_have_tab, Tab, Node}, State) ->
+    case lists:member(Node, val({current, db_nodes})) of
+	true ->
+	    State2 = node_has_tabs([Tab], Node, State),
+	    noreply(State2);
+	false ->
+	    noreply(State)
+    end;
+
+handle_cast({force_load_updated, Tab}, State) ->
+    case val({Tab, active_replicas}) of
+	[] ->
+	    %% No valid replicas
+	    noreply(State);
+	[SomeNode | _] ->
+	    State2 = node_has_tabs([Tab], SomeNode, State),
+	    noreply(State2)
+    end;
+
+handle_cast({master_nodes_updated, Tab, Masters}, State) ->
+    Active = val({Tab, active_replicas}),
+    Valid =
+	case val({Tab, load_by_force}) of
+	    true ->
+		Active;
+	    false ->
+		if
+		    Masters == [] ->
+			Active;
+		    true ->
+			mnesia_lib:intersect(Masters, Active)
+		end
+	end,
+    case Valid of
+	[] ->
+	    %% No valid replicas
+	    noreply(State);
+	[SomeNode | _] ->
+	    State2 = node_has_tabs([Tab], SomeNode, State),
+	    noreply(State2)
+    end;
+
+handle_cast({adopt_orphans, Node, Tabs}, State) ->
+
+    State2 = node_has_tabs(Tabs, Node, State),
+
+    %% Register the other node as up and running
+    mnesia_recover:log_mnesia_up(Node),
+    verbose("Logging mnesia_up ~w~n", [Node]),
+    mnesia_lib:report_system_event({mnesia_up, Node}),
+
+    %% Load orphan tables
+    LocalTabs = val({schema, local_tables}) -- [schema],
+    Nodes = val({current, db_nodes}),
+    {LocalOrphans, RemoteMasters} =
+	orphan_tables(LocalTabs, Node, Nodes, [], []),
+    Reason = {adopt_orphan, node()},
+    mnesia_late_loader:async_late_disc_load(node(), LocalOrphans, Reason),
+
+    Fun =
+	fun(N) ->
+		RemoteOrphans =
+		    [Tab || {Tab, Ns} <- RemoteMasters,
+			    lists:member(N, Ns)],
+		mnesia_late_loader:maybe_async_late_disc_load(N, RemoteOrphans, Reason)
+	  end,
+    lists:foreach(Fun, Nodes),
+
+    Queue = State2#state.loader_queue,
+    State3 = State2#state{loader_queue = Queue},
+    noreply(State3);
+
+handle_cast(Msg, State) ->
+    error("~p got unexpected cast: ~p~n", [?SERVER_NAME, Msg]),
+    noreply(State).
+
+handle_sync_tabs([Tab | Tabs], From) ->
+    case val({Tab, where_to_read}) of
+	nowhere ->
+	    case get({sync_tab, Tab}) of
+		undefined ->
+		    put({sync_tab, Tab}, [From]);
+		Pids ->
+		    put({sync_tab, Tab}, [From | Pids])
+	    end;
+	_ ->
+	    sync_reply(From, Tab)
+    end,
+    handle_sync_tabs(Tabs, From);
+handle_sync_tabs([], _From) ->
+    ok.
+
+%%----------------------------------------------------------------------
+%% Func: handle_info/2
+%% Returns: {noreply, State}          |
+%%          {noreply, State, Timeout} |
+%%          {stop, Reason, State}            (terminate/2 is called)
+%%----------------------------------------------------------------------
+
+handle_info({async_dump_log, InitBy}, State) ->
+    Worker = #dump_log{initiated_by = InitBy},
+    State2 = add_worker(Worker, State),
+    noreply(State2);
+
+handle_info(Done, State) when record(Done, dumper_done) ->
+    Pid = Done#dumper_done.worker_pid,
+    Res = Done#dumper_done.worker_res,
+    if
+	State#state.is_stopping == true ->
+	    {stop, shutdown, State};
+	Res == dumped, Pid == State#state.dumper_pid ->
+	    [Worker | Rest] = State#state.dumper_queue,
+	    reply(Worker#dump_log.opt_reply_to, Res),
+	    State2 = State#state{dumper_pid = undefined,
+				 dumper_queue = Rest},
+	    State3 = opt_start_worker(State2),
+	    noreply(State3);
+	true ->
+	    fatal("Dumper failed: ~p~n state: ~p~n", [Res, State]),
+	    {stop, fatal, State}
+    end;
+
+handle_info(Done, State) when record(Done, loader_done) ->
+    if
+	%% Assertion
+	Done#loader_done.worker_pid == State#state.loader_pid -> ok
+    end,
+
+    [_Worker | Rest] = LoadQ0 = State#state.loader_queue,
+    LateQueue0 = State#state.late_loader_queue,
+    {LoadQ, LateQueue} =
+	case Done#loader_done.is_loaded of
+	    true ->
+		Tab = Done#loader_done.table_name,
+
+		%% Optional user sync
+		case Done#loader_done.needs_sync of
+		    true -> user_sync_tab(Tab);
+		    false -> ignore
+		end,
+
+		%% Optional table announcement
+		case Done#loader_done.needs_announce of
+		    true ->
+			i_have_tab(Tab),
+			case Tab of
+			    schema ->
+				ignore;
+			    _ ->
+				%% Local node needs to perform user_sync_tab/1
+				Ns = val({current, db_nodes}),
+				abcast(Ns, {i_have_tab, Tab, node()})
+			end;
+		    false ->
+			case Tab of
+			    schema ->
+				ignore;
+			    _ ->
+				%% Local node needs to perform user_sync_tab/1
+				Ns = val({current, db_nodes}),
+				AlreadyKnows = val({Tab, active_replicas}),
+				abcast(Ns -- AlreadyKnows, {i_have_tab, Tab, node()})
+			end
+		end,
+
+		%% Optional client reply
+		case Done#loader_done.needs_reply of
+		    true ->
+			reply(Done#loader_done.reply_to,
+			      Done#loader_done.reply);
+		    false ->
+			ignore
+		end,
+		{Rest, reply_late_load(Tab, LateQueue0)};
+	    false ->
+		case Done#loader_done.reply of
+		    restart ->
+			{LoadQ0, LateQueue0};
+		    _ ->
+			{Rest, LateQueue0}
+		end
+	end,
+
+    State2 = State#state{loader_pid = undefined,
+			 loader_queue = LoadQ,
+			 late_loader_queue = LateQueue},
+
+    State3 = opt_start_worker(State2),
+    noreply(State3);
+
+handle_info(Done, State) when record(Done, sender_done) ->
+    Pid = Done#sender_done.worker_pid,
+    Res = Done#sender_done.worker_res,
+    if
+	Res == ok, Pid == State#state.sender_pid ->
+	    [Worker | Rest] = State#state.sender_queue,
+	    Worker#send_table.receiver_pid ! {copier_done, node()},
+	    State2 = State#state{sender_pid = undefined,
+				 sender_queue = Rest},
+	    State3 = opt_start_worker(State2),
+	    noreply(State3);
+	true ->
+	    %% No need to send any message to the table receiver
+	    %% since it will soon get a mnesia_down anyway
+	    fatal("Sender failed: ~p~n state: ~p~n", [Res, State]),
+	    {stop, fatal, State}
+    end;
+
+handle_info({'EXIT', Pid, R}, State) when Pid == State#state.supervisor ->
+    catch set(mnesia_status, stopping),
+    case State#state.dumper_pid of
+	undefined ->
+	    dbg_out("~p was ~p~n", [?SERVER_NAME, R]),
+	    {stop, shutdown, State};
+	_ ->
+	    noreply(State#state{is_stopping = true})
+    end;
+
+handle_info({'EXIT', Pid, R}, State) when Pid == State#state.dumper_pid ->
+    case State#state.dumper_queue of
+	[#schema_commit_lock{}|Workers] ->  %% Schema trans crashed or was killed
+	    State2 = State#state{dumper_queue = Workers, dumper_pid = undefined},
+	    State3 = opt_start_worker(State2),
+	    noreply(State3);
+	_Other ->
+	    fatal("Dumper or schema commit crashed: ~p~n state: ~p~n", [R, State]),
+	    {stop, fatal, State}
+    end;
+
+handle_info({'EXIT', Pid, R}, State) when Pid == State#state.loader_pid ->
+    fatal("Loader crashed: ~p~n state: ~p~n", [R, State]),
+    {stop, fatal, State};
+
+handle_info({'EXIT', Pid, R}, State) when Pid == State#state.sender_pid ->
+    %% No need to send any message to the table receiver
+    %% since it will soon get a mnesia_down anyway
+    fatal("Sender crashed: ~p~n state: ~p~n", [R, State]),
+    {stop, fatal, State};
+
+handle_info({From, get_state}, State) ->
+    From ! {?SERVER_NAME, State},
+    noreply(State);
+
+%% No real need for buffering
+handle_info(Msg, State) when State#state.schema_is_merged == false ->
+    %% Buffer early messages
+    Msgs = State#state.early_msgs,
+    noreply(State#state{early_msgs = [{info, Msg} | Msgs]});
+
+handle_info({'EXIT', Pid, wait_for_tables_timeout}, State) ->
+    sync_tab_timeout(Pid, get()),
+    noreply(State);
+
+handle_info(Msg, State) ->
+    error("~p got unexpected info: ~p~n", [?SERVER_NAME, Msg]),
+    noreply(State).
+
+reply_late_load(Tab, [H | T]) when H#late_load.table == Tab ->
+    reply(H#late_load.opt_reply_to, ok),
+    reply_late_load(Tab, T);
+reply_late_load(Tab, [H | T])  ->
+    [H | reply_late_load(Tab, T)];
+reply_late_load(_Tab, []) ->
+    [].
+
+sync_tab_timeout(Pid, [{{sync_tab, Tab}, Pids} | Tail]) ->
+    case lists:delete(Pid, Pids) of
+	[] ->
+	    erase({sync_tab, Tab});
+	Pids2 ->
+	    put({sync_tab, Tab}, Pids2)
+    end,
+    sync_tab_timeout(Pid, Tail);
+sync_tab_timeout(Pid, [_ | Tail]) ->
+    sync_tab_timeout(Pid, Tail);
+sync_tab_timeout(_Pid, []) ->
+    ok.
+
+%% Pick the load record that has the highest load order
+%% Returns {BestLoad, RemainingQueue} or {none, []} if queue is empty
+pick_next(Queue) ->
+    pick_next(Queue, none, none, []).
+
+pick_next([Head | Tail], Load, Order, Rest) when record(Head, net_load) ->
+    Tab = Head#net_load.table,
+    select_best(Head, Tail, val({Tab, load_order}), Load, Order, Rest);
+pick_next([Head | Tail], Load, Order, Rest) when record(Head, disc_load) ->
+    Tab = Head#disc_load.table,
+    select_best(Head, Tail, val({Tab, load_order}), Load, Order, Rest);
+pick_next([], Load, _Order, Rest) ->
+    {Load, Rest}.
+
+select_best(Load, Tail, Order, none, none, Rest) ->
+    pick_next(Tail, Load, Order, Rest);
+select_best(Load, Tail, Order, OldLoad, OldOrder, Rest) when Order > OldOrder ->
+    pick_next(Tail, Load, Order, [OldLoad | Rest]);
+select_best(Load, Tail, _Order, OldLoad, OldOrder, Rest) ->
+    pick_next(Tail, OldLoad, OldOrder, [Load | Rest]).
+
+%%----------------------------------------------------------------------
+%% Func: terminate/2
+%% Purpose: Shutdown the server
+%% Returns: any (ignored by gen_server)
+%%----------------------------------------------------------------------
+terminate(Reason, State) ->
+    mnesia_monitor:terminate_proc(?SERVER_NAME, Reason, State).
+
+%%----------------------------------------------------------------------
+%% Func: code_change/3
+%% Purpose: Upgrade process when its code is to be changed
+%% Returns: {ok, NewState}
+%%----------------------------------------------------------------------
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%%----------------------------------------------------------------------
+%%% Internal functions
+%%%----------------------------------------------------------------------
+
+maybe_log_mnesia_down(N) ->
+    %% We use mnesia_down when deciding which tables to load locally,
+    %% so if we are not running (i.e haven't decided which tables
+    %% to load locally), don't log mnesia_down yet.
+    case mnesia_lib:is_running() of
+	yes ->
+	    verbose("Logging mnesia_down ~w~n", [N]),
+	    mnesia_recover:log_mnesia_down(N),
+	    ok;
+	_ ->
+	    Filter = fun(Tab) ->
+			     inactive_copy_holders(Tab, N)
+		     end,
+	    HalfLoadedTabs = lists:any(Filter, val({schema, local_tables}) -- [schema]),
+	    if
+		HalfLoadedTabs == true ->
+		    verbose("Logging mnesia_down ~w~n", [N]),
+		    mnesia_recover:log_mnesia_down(N),
+		    ok;
+		true ->
+		    %% Unfortunately we have not loaded some common
+		    %% tables yet, so we cannot rely on the nodedown
+		    log_later   %% BUGBUG handle this case!!!
+	    end
+    end.
+
+inactive_copy_holders(Tab, Node) ->
+    Cs = val({Tab, cstruct}),
+    case mnesia_lib:cs_to_storage_type(Node, Cs) of
+	unknown ->
+	    false;
+	_Storage ->
+	    mnesia_lib:not_active_here(Tab)
+    end.
+
+orphan_tables([Tab | Tabs], Node, Ns, Local, Remote) ->
+    Cs = val({Tab, cstruct}),
+    CopyHolders = mnesia_lib:copy_holders(Cs),
+    RamCopyHolders = Cs#cstruct.ram_copies,
+    DiscCopyHolders = CopyHolders -- RamCopyHolders,
+    DiscNodes = val({schema, disc_copies}),
+    LocalContent = Cs#cstruct.local_content,
+    RamCopyHoldersOnDiscNodes = mnesia_lib:intersect(RamCopyHolders, DiscNodes),
+    Active = val({Tab, active_replicas}),
+    case lists:member(Node, DiscCopyHolders) of
+	true when Active == [] ->
+	    case DiscCopyHolders -- Ns of
+		[] ->
+		    %% We're last up and the other nodes have not
+		    %% loaded the table. Lets load it if we are
+		    %% the smallest node.
+		    case lists:min(DiscCopyHolders) of
+			Min when Min == node() ->
+			    case mnesia_recover:get_master_nodes(Tab) of
+				[] ->
+				    L = [Tab | Local],
+				    orphan_tables(Tabs, Node, Ns, L, Remote);
+				Masters ->
+				    R = [{Tab, Masters} | Remote],
+				    orphan_tables(Tabs, Node, Ns, Local, R)
+			    end;
+			_ ->
+			    orphan_tables(Tabs, Node, Ns, Local, Remote)
+		    end;
+		_ ->
+		    orphan_tables(Tabs, Node, Ns, Local, Remote)
+	    end;
+	false when Active == [], DiscCopyHolders == [], RamCopyHoldersOnDiscNodes == [] ->
+	    %% Special case when all replicas resides on disc less nodes
+	    orphan_tables(Tabs, Node, Ns, [Tab | Local], Remote);
+	_ when LocalContent == true ->
+	    orphan_tables(Tabs, Node, Ns, [Tab | Local], Remote);
+	_ ->
+	    orphan_tables(Tabs, Node, Ns, Local, Remote)
+    end;
+orphan_tables([], _, _, LocalOrphans, RemoteMasters) ->
+    {LocalOrphans, RemoteMasters}.
+
+node_has_tabs([Tab | Tabs], Node, State) when Node /= node() ->
+    State2 = update_whereabouts(Tab, Node, State),
+    node_has_tabs(Tabs, Node, State2);
+node_has_tabs([Tab | Tabs], Node, State) ->
+    user_sync_tab(Tab),
+    node_has_tabs(Tabs, Node, State);
+node_has_tabs([], _Node, State) ->
+    State.
+
+update_whereabouts(Tab, Node, State) ->
+    Storage = val({Tab, storage_type}),
+    Read = val({Tab, where_to_read}),
+    LocalC = val({Tab, local_content}),
+    BeingCreated = (?catch_val({Tab, create_table}) == true),
+    Masters = mnesia_recover:get_master_nodes(Tab),
+    ByForce = val({Tab, load_by_force}),
+    GoGetIt =
+	if
+	    ByForce == true ->
+		true;
+	    Masters == [] ->
+		true;
+	    true ->
+		lists:member(Node, Masters)
+	end,
+
+    dbg_out("Table ~w is loaded on ~w. s=~w, r=~w, lc=~w, f=~w, m=~w~n",
+	    [Tab, Node, Storage, Read, LocalC, ByForce, GoGetIt]),
+    if
+	LocalC == true ->
+	    %% Local contents, don't care about other node
+	    State;
+	Storage == unknown, Read == nowhere ->
+	    %% No own copy, time to read remotely
+	    %% if the other node is a good node
+	    add_active_replica(Tab, Node),
+	    case GoGetIt of
+		true ->
+		    set({Tab, where_to_read}, Node),
+		    user_sync_tab(Tab),
+		    State;
+		false ->
+		    State
+	    end;
+	Storage == unknown ->
+	    %% No own copy, continue to read remotely
+	    add_active_replica(Tab, Node),
+	    NodeST = mnesia_lib:storage_type_at_node(Node, Tab),
+	    ReadST = mnesia_lib:storage_type_at_node(Read, Tab),
+	    if   %% Avoid reading from disc_only_copies
+		NodeST == disc_only_copies ->
+		    ignore;
+		ReadST == disc_only_copies ->
+		    mnesia_lib:set_remote_where_to_read(Tab);
+		true ->
+		    ignore
+	    end,
+	    user_sync_tab(Tab),
+	    State;
+	BeingCreated == true ->
+	    %% The table is currently being created
+	    %% and we shall have an own copy of it.
+	    %% We will load the (empty) table locally.
+	    add_active_replica(Tab, Node),
+	    State;
+	Read == nowhere ->
+	    %% Own copy, go and get a copy of the table
+	    %% if the other node is master or if there
+	    %% are no master at all
+	    add_active_replica(Tab, Node),
+	    case GoGetIt of
+		true ->
+		    Worker = #net_load{table = Tab,
+				       reason = {active_remote, Node}},
+		    add_worker(Worker, State);
+		false ->
+		    State
+	    end;
+	true ->
+	    %% We already have an own copy
+	    add_active_replica(Tab, Node),
+	    user_sync_tab(Tab),
+	    State
+    end.
+
+initial_safe_loads() ->
+    case val({schema, storage_type}) of
+	ram_copies ->
+	    Downs = [],
+	    Tabs = val({schema, local_tables}) -- [schema],
+	    LastC = fun(T) -> last_consistent_replica(T, Downs) end,
+	    lists:zf(LastC, Tabs);
+
+	disc_copies ->
+	    Downs = mnesia_recover:get_mnesia_downs(),
+	    dbg_out("mnesia_downs = ~p~n", [Downs]),
+
+	    Tabs = val({schema, local_tables}) -- [schema],
+	    LastC = fun(T) -> last_consistent_replica(T, Downs) end,
+	    lists:zf(LastC, Tabs)
+    end.
+
+last_consistent_replica(Tab, Downs) ->
+    Cs = val({Tab, cstruct}),
+    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
+    Ram = Cs#cstruct.ram_copies,
+    Disc = Cs#cstruct.disc_copies,
+    DiscOnly = Cs#cstruct.disc_only_copies,
+    BetterCopies0 = mnesia_lib:remote_copy_holders(Cs) -- Downs,
+    BetterCopies = BetterCopies0 -- Ram,
+    AccessMode = Cs#cstruct.access_mode,
+    Copies = mnesia_lib:copy_holders(Cs),
+    Masters = mnesia_recover:get_master_nodes(Tab),
+    LocalMaster0 = lists:member(node(), Masters),
+    LocalContent = Cs#cstruct.local_content,
+    RemoteMaster =
+	if
+	    Masters == [] -> false;
+	    true -> not LocalMaster0
+	end,
+    LocalMaster =
+	if
+	    Masters == [] -> false;
+	    true -> LocalMaster0
+	end,
+    if
+	Copies == [node()]  ->
+	    %% Only one copy holder and it is local.
+	    %% It may also be a local contents table
+	    {true, {Tab, local_only}};
+	LocalContent == true ->
+	    {true, {Tab, local_content}};
+	LocalMaster == true ->
+	    %% We have a local master
+	    {true, {Tab, local_master}};
+	RemoteMaster == true ->
+	    %% Wait for remote master copy
+	    false;
+	Storage == ram_copies ->
+	    if
+		Disc == [], DiscOnly == [] ->
+		    %% Nobody has copy on disc
+		    {true, {Tab, ram_only}};
+		true ->
+		    %% Some other node has copy on disc
+		    false
+	    end;
+	AccessMode == read_only ->
+	    %% No one has been able to update the table,
+	    %% i.e. all disc resident copies are equal
+	    {true, {Tab, read_only}};
+	BetterCopies /= [], Masters /= [node()] ->
+	    %% There are better copies on other nodes
+	    %% and we do not have the only master copy
+	    false;
+	true ->
+	    {true, {Tab, initial}}
+    end.
+
+reconfigure_tables(N, State, [Tab |Tail]) ->
+    del_active_replica(Tab, N),
+    case val({Tab, where_to_read}) of
+	N ->  mnesia_lib:set_remote_where_to_read(Tab);
+	_ ->  ignore
+    end,
+    LateQ = drop_loaders(Tab, N, State#state.late_loader_queue),
+    reconfigure_tables(N, State#state{late_loader_queue = LateQ}, Tail);
+
+reconfigure_tables(_, State, []) ->
+    State.
+
+remove_early_messages([], _Node) ->
+    [];
+remove_early_messages([{call, {add_active_replica, [_, Node, _, _], _}, _}|R], Node) ->
+    remove_early_messages(R, Node); %% Does a reply before queuing
+remove_early_messages([{call, {block_table, _, From}, ReplyTo}|R], Node)
+  when node(From) == Node ->
+    reply(ReplyTo, ok),  %% Remove gen:server waits..
+    remove_early_messages(R, Node);
+remove_early_messages([{cast, {i_have_tab, _Tab, Node}}|R], Node) ->
+    remove_early_messages(R, Node);
+remove_early_messages([{cast, {adopt_orphans, Node, _Tabs}}|R], Node) ->
+    remove_early_messages(R, Node);
+remove_early_messages([M|R],Node) ->
+    [M|remove_early_messages(R,Node)].
+
+%% Drop loader from late load queue and possibly trigger a disc_load
+drop_loaders(Tab, Node, [H | T]) when H#late_load.table == Tab ->
+    %% Check if it is time to issue a disc_load request
+    case H#late_load.loaders of
+	[Node] ->
+	    Reason = {H#late_load.reason, last_loader_down, Node},
+	    cast({disc_load, Tab, Reason});  % Ugly cast
+	_ ->
+	    ignore
+    end,
+    %% Drop the node from the list of loaders
+    H2 = H#late_load{loaders = H#late_load.loaders -- [Node]},
+    [H2 | drop_loaders(Tab, Node, T)];
+drop_loaders(Tab, Node, [H | T]) ->
+    [H | drop_loaders(Tab, Node, T)];
+drop_loaders(_, _, []) ->
+    [].
+
+add_active_replica(Tab, Node) ->
+    add_active_replica(Tab, Node, val({Tab, cstruct})).
+
+add_active_replica(Tab, Node, Cs) when record(Cs, cstruct) ->
+    Storage = mnesia_lib:schema_cs_to_storage_type(Node, Cs),
+    AccessMode = Cs#cstruct.access_mode,
+    add_active_replica(Tab, Node, Storage, AccessMode).
+
+%% Block table primitives
+
+block_table(Tab) ->
+    Var = {Tab, where_to_commit},
+    Old = val(Var),
+    New = {blocked, Old},
+    set(Var, New). % where_to_commit
+
+unblock_table(Tab) ->
+    Var = {Tab, where_to_commit},
+    New =
+	case val(Var) of
+	    {blocked, List} ->
+		List;
+	    List ->
+		List
+	end,
+    set(Var, New). % where_to_commit
+
+is_tab_blocked(W2C) when list(W2C) ->
+    {false, W2C};
+is_tab_blocked({blocked, W2C}) when list(W2C) ->
+    {true, W2C}.
+
+mark_blocked_tab(true, Value) ->
+    {blocked, Value};
+mark_blocked_tab(false, Value) ->
+    Value.
+
+%%
+
+add_active_replica(Tab, Node, Storage, AccessMode) ->
+    Var = {Tab, where_to_commit},
+    {Blocked, Old} = is_tab_blocked(val(Var)),
+    Del = lists:keydelete(Node, 1, Old),
+    case AccessMode of
+	read_write ->
+	    New = lists:sort([{Node, Storage} | Del]),
+	    set(Var, mark_blocked_tab(Blocked, New)), % where_to_commit
+	    add({Tab, where_to_write}, Node);
+	read_only ->
+	    set(Var, mark_blocked_tab(Blocked, Del)),
+	    mnesia_lib:del({Tab, where_to_write}, Node)
+    end,
+    add({Tab, active_replicas}, Node).
+
+del_active_replica(Tab, Node) ->
+    Var = {Tab, where_to_commit},
+    {Blocked, Old} = is_tab_blocked(val(Var)),
+    Del = lists:keydelete(Node, 1, Old),
+    New = lists:sort(Del),
+    set(Var, mark_blocked_tab(Blocked, New)),      % where_to_commit
+    mnesia_lib:del({Tab, active_replicas}, Node),
+    mnesia_lib:del({Tab, where_to_write}, Node).
+
+change_table_access_mode(Cs) ->
+    Tab = Cs#cstruct.name,
+    lists:foreach(fun(N) -> add_active_replica(Tab, N, Cs) end,
+		  val({Tab, active_replicas})).
+
+%% node To now has tab loaded, but this must be undone
+%% This code is rpc:call'ed from the tab_copier process
+%% when it has *not* released it's table lock
+unannounce_add_table_copy(Tab, To) ->
+    del_active_replica(Tab, To),
+    case val({Tab , where_to_read}) of
+	To ->
+	    mnesia_lib:set_remote_where_to_read(Tab);
+	_ ->
+	    ignore
+    end.
+
+user_sync_tab(Tab) ->
+    case val(debug) of
+	trace ->
+	    mnesia_subscr:subscribe(whereis(mnesia_event), {table, Tab});
+	_ ->
+	    ignore
+    end,
+
+    case erase({sync_tab, Tab}) of
+	undefined ->
+	    ok;
+	Pids ->
+	    lists:foreach(fun(Pid) -> sync_reply(Pid, Tab) end, Pids)
+    end.
+
+i_have_tab(Tab) ->
+    case val({Tab, local_content}) of
+	true ->
+	    mnesia_lib:set_local_content_whereabouts(Tab);
+	false ->
+	    set({Tab, where_to_read}, node())
+    end,
+    add_active_replica(Tab, node()).
+
+sync_and_block_table_whereabouts(Tab, ToNode, RemoteS, AccessMode) when Tab /= schema ->
+    Current = val({current, db_nodes}),
+    Ns =
+	case lists:member(ToNode, Current) of
+	    true -> Current -- [ToNode];
+	    false -> Current
+	end,
+    remote_call(ToNode, block_table, [Tab]),
+    [remote_call(Node, add_active_replica, [Tab, ToNode, RemoteS, AccessMode]) ||
+	Node <- [ToNode | Ns]],
+    ok.
+
+sync_del_table_copy_whereabouts(Tab, ToNode) when Tab /= schema ->
+    Current = val({current, db_nodes}),
+    Ns =
+	case lists:member(ToNode, Current) of
+	    true -> Current;
+	    false -> [ToNode | Current]
+	end,
+    Args = [Tab, ToNode],
+    [remote_call(Node, unannounce_add_table_copy, Args) || Node <- Ns],
+    ok.
+
+get_info(Timeout) ->
+    case whereis(?SERVER_NAME) of
+	undefined ->
+	    {timeout, Timeout};
+	Pid ->
+	    Pid ! {self(), get_state},
+	    receive
+		{?SERVER_NAME, State} when record(State, state) ->
+		    {info,State}
+	    after Timeout ->
+		    {timeout, Timeout}
+	    end
+    end.
+
+get_workers(Timeout) ->
+    case whereis(?SERVER_NAME) of
+	undefined ->
+	    {timeout, Timeout};
+	Pid ->
+	    Pid ! {self(), get_state},
+	    receive
+		{?SERVER_NAME, State} when record(State, state) ->
+		    {workers, State#state.loader_pid, State#state.sender_pid, State#state.dumper_pid}
+	    after Timeout ->
+		    {timeout, Timeout}
+	    end
+    end.
+
+info() ->
+    Tabs = mnesia_lib:local_active_tables(),
+    io:format( "---> Active tables <--- ~n", []),
+    info(Tabs).
+
+info([Tab | Tail]) ->
+    case val({Tab, storage_type}) of
+	disc_only_copies ->
+	    info_format(Tab,
+			dets:info(Tab, size),
+			dets:info(Tab, file_size),
+			"bytes on disc");
+	_ ->
+	    info_format(Tab,
+			?ets_info(Tab, size),
+			?ets_info(Tab, memory),
+			"words of mem")
+    end,
+    info(Tail);
+info([]) -> ok;
+info(Tab) -> info([Tab]).
+
+info_format(Tab, Size, Mem, Media) ->
+    StrT = mnesia_lib:pad_name(atom_to_list(Tab), 15, []),
+    StrS = mnesia_lib:pad_name(integer_to_list(Size), 8, []),
+    StrM = mnesia_lib:pad_name(integer_to_list(Mem), 8, []),
+    io:format("~s: with ~s records occupying ~s ~s~n",
+	      [StrT, StrS, StrM, Media]).
+
+%% Handle early arrived messages
+handle_early_msgs([Msg | Msgs], State) ->
+    %% The messages are in reverse order
+    case handle_early_msg(Msg, State) of
+        {stop, Reason, Reply, State2} ->
+	    {stop, Reason, Reply, State2};
+        {stop, Reason, State2} ->
+	    {stop, Reason, State2};
+	{noreply, State2} ->
+	    handle_early_msgs(Msgs, State2);
+	{noreply, State2, _Timeout} ->
+	    handle_early_msgs(Msgs, State2);
+	Else ->
+	    dbg_out("handle_early_msgs case clause ~p ~n", [Else]),
+	    erlang:error(Else, [[Msg | Msgs], State])
+    end;
+handle_early_msgs([], State) ->
+    noreply(State).
+
+handle_early_msg({call, Msg, From}, State) ->
+    handle_call(Msg, From, State);
+handle_early_msg({cast, Msg}, State) ->
+    handle_cast(Msg, State);
+handle_early_msg({info, Msg}, State) ->
+    handle_info(Msg, State).
+
+noreply(State) ->
+    {noreply, State}.
+
+reply(undefined, Reply) ->
+    Reply;
+reply(ReplyTo, Reply) ->
+    gen_server:reply(ReplyTo, Reply),
+    Reply.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Worker management
+
+%% Returns new State
+add_worker(Worker, State) when record(Worker, dump_log) ->
+    InitBy = Worker#dump_log.initiated_by,
+    Queue = State#state.dumper_queue,
+    case lists:keymember(InitBy, #dump_log.initiated_by, Queue) of
+	false ->
+	    ignore;
+	true when Worker#dump_log.opt_reply_to == undefined ->
+	    %% The same threshold has been exceeded again,
+	    %% before we have had the possibility to
+	    %% process the older one.
+	    DetectedBy = {dump_log, InitBy},
+	    Event = {mnesia_overload, DetectedBy},
+	    mnesia_lib:report_system_event(Event)
+    end,
+    Queue2 = Queue ++ [Worker],
+    State2 = State#state{dumper_queue = Queue2},
+    opt_start_worker(State2);
+add_worker(Worker, State) when record(Worker, schema_commit_lock) ->
+    Queue = State#state.dumper_queue,
+    Queue2 = Queue ++ [Worker],
+    State2 = State#state{dumper_queue = Queue2},
+    opt_start_worker(State2);
+add_worker(Worker, State) when record(Worker, net_load) ->
+    Queue = State#state.loader_queue,
+    State2 = State#state{loader_queue = Queue ++ [Worker]},
+    opt_start_worker(State2);
+add_worker(Worker, State) when record(Worker, send_table) ->
+    Queue = State#state.sender_queue,
+    State2 = State#state{sender_queue = Queue ++ [Worker]},
+    opt_start_worker(State2);
+add_worker(Worker, State) when record(Worker, disc_load) ->
+    Queue = State#state.loader_queue,
+    State2 = State#state{loader_queue = Queue ++ [Worker]},
+    opt_start_worker(State2);
+% Block controller should be used for upgrading mnesia.
+add_worker(Worker, State) when record(Worker, block_controller) ->
+    Queue = State#state.dumper_queue,
+    Queue2 = [Worker | Queue],
+    State2 = State#state{dumper_queue = Queue2},
+    opt_start_worker(State2).
+
+%% Optionally start a worker
+%%
+%% Dumpers and loaders may run simultaneously
+%% but neither of them may run during schema commit.
+%% Loaders may not start if a schema commit is enqueued.
+opt_start_worker(State) when State#state.is_stopping == true ->
+    State;
+opt_start_worker(State) ->
+    %% Prioritize dumper and schema commit
+    %% by checking them first
+    case State#state.dumper_queue of
+	[Worker | _Rest] when State#state.dumper_pid == undefined ->
+	    %% Great, a worker in queue and neither
+	    %% a schema transaction is being
+	    %% committed and nor a dumper is running
+
+	    %% Start worker but keep him in the queue
+	    if
+		record(Worker, schema_commit_lock) ->
+		    ReplyTo = Worker#schema_commit_lock.owner,
+		    reply(ReplyTo, granted),
+		    {Owner, _Tag} = ReplyTo,
+		    State#state{dumper_pid = Owner};
+
+		record(Worker, dump_log) ->
+		    Pid = spawn_link(?MODULE, dump_and_reply, [self(), Worker]),
+		    State2 = State#state{dumper_pid = Pid},
+
+		    %% If the worker was a dumper we may
+		    %% possibly be able to start a loader
+		    %% or sender
+		    State3 = opt_start_sender(State2),
+		    opt_start_loader(State3);
+
+		record(Worker, block_controller) ->
+		    case {State#state.sender_pid, State#state.loader_pid} of
+			{undefined, undefined} ->
+			    ReplyTo = Worker#block_controller.owner,
+			    reply(ReplyTo, granted),
+			    {Owner, _Tag} = ReplyTo,
+			    State#state{dumper_pid = Owner};
+			_ ->
+			    State
+		    end
+	    end;
+	_ ->
+	    %% Bad luck, try with a loader or sender instead
+	    State2 = opt_start_sender(State),
+	    opt_start_loader(State2)
+    end.
+
+opt_start_sender(State) ->
+    case State#state.sender_queue of
+	[]->
+	    %% No need
+	    State;
+
+	_ when State#state.sender_pid /= undefined ->
+	    %% Bad luck, a sender is already running
+	    State;
+
+	[Sender | _SenderRest] ->
+	    case State#state.loader_queue of
+		[Loader | _LoaderRest]
+		when State#state.loader_pid /= undefined,
+		     Loader#net_load.table == Sender#send_table.table ->
+		    %% A conflicting loader is running
+		    State;
+		_ ->
+		    SchemaQueue = State#state.dumper_queue,
+		    case lists:keymember(schema_commit, 1, SchemaQueue) of
+			false ->
+
+			    %% Start worker but keep him in the queue
+			    Pid = spawn_link(?MODULE, send_and_reply,
+					     [self(), Sender]),
+			    State#state{sender_pid = Pid};
+			true ->
+			    %% Bad luck, we must wait for the schema commit
+			    State
+		    end
+	    end
+    end.
+
+opt_start_loader(State) ->
+    LoaderQueue = State#state.loader_queue,
+    if
+	LoaderQueue == [] ->
+	    %% No need
+	    State;
+
+	State#state.loader_pid /= undefined ->
+	    %% Bad luck, an loader is already running
+	    State;
+
+	true ->
+	    SchemaQueue = State#state.dumper_queue,
+	    case lists:keymember(schema_commit, 1, SchemaQueue) of
+		false ->
+		    {Worker, Rest} = pick_next(LoaderQueue),
+
+		    %% Start worker but keep him in the queue
+		    Pid = spawn_link(?MODULE, load_and_reply, [self(), Worker]),
+		    State#state{loader_pid = Pid,
+				loader_queue = [Worker | Rest]};
+		true ->
+		    %% Bad luck, we must wait for the schema commit
+		    State
+	    end
+    end.
+
+start_remote_sender(Node, Tab, Receiver, Storage) ->
+    Msg = #send_table{table = Tab,
+		      receiver_pid = Receiver,
+		      remote_storage = Storage},
+    gen_server:cast({?SERVER_NAME, Node}, Msg).
+
+dump_and_reply(ReplyTo, Worker) ->
+    %% No trap_exit, die intentionally instead
+    Res = mnesia_dumper:opt_dump_log(Worker#dump_log.initiated_by),
+    ReplyTo ! #dumper_done{worker_pid = self(),
+			   worker_res = Res},
+    unlink(ReplyTo),
+    exit(normal).
+
+send_and_reply(ReplyTo, Worker) ->
+    %% No trap_exit, die intentionally instead
+    Res = mnesia_loader:send_table(Worker#send_table.receiver_pid,
+				   Worker#send_table.table,
+				   Worker#send_table.remote_storage),
+    ReplyTo ! #sender_done{worker_pid = self(),
+			   worker_res = Res},
+    unlink(ReplyTo),
+    exit(normal).
+
+
+load_and_reply(ReplyTo, Worker) ->
+    process_flag(trap_exit, true),
+    Done = load_table(Worker),
+    ReplyTo ! Done#loader_done{worker_pid = self()},
+    unlink(ReplyTo),
+    exit(normal).
+
+%% Now it is time to load the table
+%% but first we must check if it still is neccessary
+load_table(Load) when record(Load, net_load) ->
+    Tab = Load#net_load.table,
+    ReplyTo = Load#net_load.opt_reply_to,
+    Reason =  Load#net_load.reason,
+    LocalC = val({Tab, local_content}),
+    AccessMode = val({Tab, access_mode}),
+    ReadNode = val({Tab, where_to_read}),
+    Active = filter_active(Tab),
+    Done = #loader_done{is_loaded = true,
+			table_name = Tab,
+			needs_announce = false,
+			needs_sync = false,
+			needs_reply = true,
+			reply_to = ReplyTo,
+			reply = {loaded, ok}
+		       },
+    if
+	ReadNode == node() ->
+	    %% Already loaded locally
+	    Done;
+	LocalC == true ->
+	    Res = mnesia_loader:disc_load_table(Tab, load_local_content),
+	    Done#loader_done{reply = Res, needs_announce = true, needs_sync = true};
+	AccessMode == read_only ->
+	    disc_load_table(Tab, Reason, ReplyTo);
+	true ->
+	    %% Either we cannot read the table yet
+	    %% or someone is moving a replica between
+	    %% two nodes
+	    Cs =  Load#net_load.cstruct,
+	    Res = mnesia_loader:net_load_table(Tab, Reason, Active, Cs),
+	    case Res of
+		{loaded, ok} ->
+		    Done#loader_done{needs_sync = true,
+				     reply = Res};
+		{not_loaded, storage_unknown} ->
+		    Done#loader_done{reply = Res};
+		{not_loaded, _} ->
+		    Done#loader_done{is_loaded = false,
+				     needs_reply = false,
+				     reply = Res}
+	    end
+    end;
+
+load_table(Load) when record(Load, disc_load) ->
+    Tab = Load#disc_load.table,
+    Reason =  Load#disc_load.reason,
+    ReplyTo = Load#disc_load.opt_reply_to,
+    ReadNode = val({Tab, where_to_read}),
+    Active = filter_active(Tab),
+    Done = #loader_done{is_loaded = true,
+			table_name = Tab,
+			needs_announce = false,
+			needs_sync = false,
+			needs_reply = false
+		       },
+    if
+	Active == [], ReadNode == nowhere ->
+	    %% Not loaded anywhere, lets load it from disc
+	    disc_load_table(Tab, Reason, ReplyTo);
+	ReadNode == nowhere ->
+	    %% Already loaded on other node, lets get it
+	    Cs = val({Tab, cstruct}),
+	    case mnesia_loader:net_load_table(Tab, Reason, Active, Cs) of
+		{loaded, ok} ->
+		    Done#loader_done{needs_sync = true};
+		{not_loaded, storage_unknown} ->
+		    Done#loader_done{is_loaded = false};
+		{not_loaded, ErrReason} ->
+		    Done#loader_done{is_loaded = false,
+				     reply = {not_loaded,ErrReason}}
+	    end;
+	true ->
+	    %% Already readable, do not worry be happy
+	    Done
+    end.
+
+disc_load_table(Tab, Reason, ReplyTo) ->
+    Done = #loader_done{is_loaded = true,
+			table_name = Tab,
+			needs_announce = false,
+			needs_sync = false,
+			needs_reply = true,
+			reply_to = ReplyTo,
+			reply = {loaded, ok}
+		       },
+    Res = mnesia_loader:disc_load_table(Tab, Reason),
+    if
+	Res == {loaded, ok} ->
+	    Done#loader_done{needs_announce = true,
+			     needs_sync = true,
+			     reply = Res};
+	ReplyTo /= undefined ->
+	    Done#loader_done{is_loaded = false,
+			     reply = Res};
+	true ->
+	    fatal("Cannot load table ~p from disc: ~p~n", [Tab, Res])
+    end.
+
+filter_active(Tab) ->
+    ByForce = val({Tab, load_by_force}),
+    Active = val({Tab, active_replicas}),
+    Masters = mnesia_recover:get_master_nodes(Tab),
+    do_filter_active(ByForce, Active, Masters).
+
+do_filter_active(true, Active, _Masters) ->
+    Active;
+do_filter_active(false, Active, []) ->
+    Active;
+do_filter_active(false, Active, Masters) ->
+    mnesia_lib:intersect(Active, Masters).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_dumper.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_dumper.erl
new file mode 100644
index 0000000000..116823a779
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_dumper.erl
@@ -0,0 +1,1092 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_dumper.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
+%%
+-module(mnesia_dumper).
+
+%% The InitBy arg may be one of the following:
+%% scan_decisions     Initial scan for decisions
+%% startup	      Initial dump during startup
+%% schema_prepare     Dump initiated during schema transaction preparation
+%% schema_update      Dump initiated during schema transaction commit
+%% fast_schema_update A schema_update, but ignores the log file
+%% user		      Dump initiated by user
+%% write_threshold    Automatic dump caused by too many log writes
+%% time_threshold     Automatic dump caused by timeout
+
+%% Public interface
+-export([
+	 get_log_writes/0,
+	 incr_log_writes/0,
+	 raw_dump_table/2,
+	 raw_named_dump_table/2,
+	 start_regulator/0,
+	 opt_dump_log/1,
+	 update/3
+	]).
+
+ %% Internal stuff
+-export([regulator_init/1]).
+
+-include("mnesia.hrl").
+-include_lib("kernel/include/file.hrl").
+
+-import(mnesia_lib, [fatal/2, dbg_out/2]).
+
+-define(REGULATOR_NAME, mnesia_dumper_load_regulator).
+-define(DumpToEtsMultiplier, 4).
+
+-record(state, {initiated_by = nobody,
+		dumper = nopid,
+		regulator_pid,
+		supervisor_pid,
+		queue = [],
+		timeout}).
+
+get_log_writes() ->
+    Max = mnesia_monitor:get_env(dump_log_write_threshold),
+    Prev = mnesia_lib:read_counter(trans_log_writes),
+    Left = mnesia_lib:read_counter(trans_log_writes_left),
+    Diff = Max - Left,
+    Prev + Diff.
+
+incr_log_writes() ->
+    Left = mnesia_lib:incr_counter(trans_log_writes_left, -1),
+    if
+	Left > 0 ->
+	    ignore;
+	true ->
+	    adjust_log_writes(true)
+    end.
+
+adjust_log_writes(DoCast) ->
+    Token = {mnesia_adjust_log_writes, self()},
+    case global:set_lock(Token, [node()], 1) of
+	false ->
+	    ignore; %% Somebody else is sending a dump request
+	true ->
+	    case DoCast of
+		false ->
+		    ignore;
+		true ->
+		    mnesia_controller:async_dump_log(write_threshold)
+	    end,
+	    Max = mnesia_monitor:get_env(dump_log_write_threshold),
+	    Left = mnesia_lib:read_counter(trans_log_writes_left),
+	    %% Don't care if we lost a few writes
+	    mnesia_lib:set_counter(trans_log_writes_left, Max),
+	    Diff = Max - Left,
+	    mnesia_lib:incr_counter(trans_log_writes, Diff),
+	    global:del_lock(Token, [node()])
+    end.
+
+%% Returns 'ok' or exits
+opt_dump_log(InitBy) ->
+    Reg = case whereis(?REGULATOR_NAME) of
+	      undefined ->
+		  nopid;
+	      Pid when pid(Pid) ->
+		  Pid
+	  end,
+    perform_dump(InitBy, Reg).
+
+%% Scan for decisions
+perform_dump(InitBy, Regulator) when InitBy == scan_decisions ->
+    ?eval_debug_fun({?MODULE, perform_dump}, [InitBy]),
+
+    dbg_out("Transaction log dump initiated by ~w~n", [InitBy]),
+    scan_decisions(mnesia_log:previous_log_file(), InitBy, Regulator),
+    scan_decisions(mnesia_log:latest_log_file(), InitBy, Regulator);
+
+%% Propagate the log into the DAT-files
+perform_dump(InitBy, Regulator) ->
+    ?eval_debug_fun({?MODULE, perform_dump}, [InitBy]),
+    LogState = mnesia_log:prepare_log_dump(InitBy),
+    dbg_out("Transaction log dump initiated by ~w: ~w~n",
+	    [InitBy, LogState]),
+    adjust_log_writes(false),
+    mnesia_recover:allow_garb(),
+    case LogState of
+	already_dumped ->
+	    dumped;
+	{needs_dump, Diff} ->
+	    U = mnesia_monitor:get_env(dump_log_update_in_place),
+	    Cont = mnesia_log:init_log_dump(),
+	    case catch do_perform_dump(Cont, U, InitBy, Regulator, undefined) of
+		ok ->
+		    ?eval_debug_fun({?MODULE, post_dump}, [InitBy]),
+		    case mnesia_monitor:use_dir() of
+			true ->
+			    mnesia_recover:dump_decision_tab();
+			false ->
+			    mnesia_log:purge_some_logs()
+		    end,
+		    %% And now to the crucial point...
+		    mnesia_log:confirm_log_dump(Diff);
+		{error, Reason} ->
+		    {error, Reason};
+		{'EXIT', {Desc, Reason}} ->
+		    case mnesia_monitor:get_env(auto_repair) of
+			true ->
+			    mnesia_lib:important(Desc, Reason),
+			    %% Ignore rest of the log
+			    mnesia_log:confirm_log_dump(Diff);
+			false ->
+			    fatal(Desc, Reason)
+		    end
+	    end;
+	{error, Reason} ->
+	    {error, {"Cannot prepare log dump", Reason}}
+    end.
+
+scan_decisions(Fname, InitBy, Regulator) ->
+    Exists = mnesia_lib:exists(Fname),
+    case Exists of
+	false ->
+	    ok;
+	true ->
+	    Header = mnesia_log:trans_log_header(),
+	    Name = previous_log,
+	    mnesia_log:open_log(Name, Header, Fname, Exists,
+				mnesia_monitor:get_env(auto_repair), read_only),
+	    Cont = start,
+	    Res = (catch do_perform_dump(Cont, false, InitBy, Regulator, undefined)),
+	    mnesia_log:close_log(Name),
+	    case Res of
+		ok -> ok;
+		{'EXIT', Reason} -> {error, Reason}
+	    end
+    end.
+
+do_perform_dump(Cont, InPlace, InitBy, Regulator, OldVersion) ->
+    case mnesia_log:chunk_log(Cont) of
+	{C2, Recs} ->
+	    case catch insert_recs(Recs, InPlace, InitBy, Regulator, OldVersion) of
+		{'EXIT', R} ->
+		    Reason = {"Transaction log dump error: ~p~n", [R]},
+		    close_files(InPlace, {error, Reason}, InitBy),
+		    exit(Reason);
+		Version ->
+		    do_perform_dump(C2, InPlace, InitBy, Regulator, Version)
+	    end;
+	eof ->
+	    close_files(InPlace, ok, InitBy),
+	    ok
+    end.
+
+insert_recs([Rec | Recs], InPlace, InitBy, Regulator, LogV) ->
+    regulate(Regulator),
+    case insert_rec(Rec, InPlace, InitBy, LogV) of
+	LogH when record(LogH, log_header) ->
+	    insert_recs(Recs, InPlace, InitBy, Regulator, LogH#log_header.log_version);
+	_ ->
+	    insert_recs(Recs, InPlace, InitBy, Regulator, LogV)
+    end;
+
+insert_recs([], _InPlace, _InitBy, _Regulator, Version) ->
+    Version.
+
+insert_rec(Rec, _InPlace, scan_decisions, _LogV) ->
+    if
+	record(Rec, commit) ->
+	    ignore;
+	record(Rec, log_header) ->
+	    ignore;
+	true ->
+	    mnesia_recover:note_log_decision(Rec, scan_decisions)
+    end;
+insert_rec(Rec, InPlace, InitBy, LogV) when record(Rec, commit) ->
+    %% Determine the Outcome of the transaction and recover it
+    D = Rec#commit.decision,
+    case mnesia_recover:wait_for_decision(D, InitBy) of
+	{Tid, committed} ->
+	    do_insert_rec(Tid, Rec, InPlace, InitBy, LogV);
+	{Tid, aborted} ->
+	    mnesia_schema:undo_prepare_commit(Tid, Rec)
+    end;
+insert_rec(H, _InPlace, _InitBy, _LogV) when record(H, log_header) ->
+    CurrentVersion = mnesia_log:version(),
+    if
+        H#log_header.log_kind /= trans_log ->
+	    exit({"Bad kind of transaction log", H});
+	H#log_header.log_version == CurrentVersion ->
+	    ok;
+	H#log_header.log_version == "4.2" ->
+	    ok;
+	H#log_header.log_version == "4.1" ->
+	    ok;
+	H#log_header.log_version == "4.0" ->
+	    ok;
+	true ->
+	    fatal("Bad version of transaction log: ~p~n", [H])
+    end,
+    H;
+
+insert_rec(_Rec, _InPlace, _InitBy, _LogV) ->
+    ok.
+
+do_insert_rec(Tid, Rec, InPlace, InitBy, LogV) ->
+    case Rec#commit.schema_ops of
+	[] ->
+	    ignore;
+	SchemaOps ->
+	    case val({schema, storage_type}) of
+		ram_copies ->
+		    insert_ops(Tid, schema_ops, SchemaOps, InPlace, InitBy, LogV);
+	        Storage ->
+		    true = open_files(schema, Storage, InPlace, InitBy),
+		    insert_ops(Tid, schema_ops, SchemaOps, InPlace, InitBy, LogV)
+	    end
+    end,
+    D = Rec#commit.disc_copies,
+    insert_ops(Tid, disc_copies, D, InPlace, InitBy, LogV),
+    case InitBy of
+	startup ->
+	    DO = Rec#commit.disc_only_copies,
+	    insert_ops(Tid, disc_only_copies, DO, InPlace, InitBy, LogV);
+	_ ->
+	    ignore
+    end.
+
+
+update(_Tid, [], _DumperMode) ->
+    dumped;
+update(Tid, SchemaOps, DumperMode) ->
+    UseDir = mnesia_monitor:use_dir(),
+    Res = perform_update(Tid, SchemaOps, DumperMode, UseDir),
+    mnesia_controller:release_schema_commit_lock(),
+    Res.
+
+perform_update(_Tid, _SchemaOps, mandatory, true) ->
+    %% Force a dump of the transaction log in order to let the
+    %% dumper perform needed updates
+
+    InitBy = schema_update,
+    ?eval_debug_fun({?MODULE, dump_schema_op}, [InitBy]),
+    opt_dump_log(InitBy);
+perform_update(Tid, SchemaOps, _DumperMode, _UseDir) ->
+    %% No need for a full transaction log dump.
+    %% Ignore the log file and perform only perform
+    %% the corresponding updates.
+
+    InitBy = fast_schema_update,
+    InPlace = mnesia_monitor:get_env(dump_log_update_in_place),
+    ?eval_debug_fun({?MODULE, dump_schema_op}, [InitBy]),
+    case catch insert_ops(Tid, schema_ops, SchemaOps, InPlace, InitBy,
+			  mnesia_log:version()) of
+	{'EXIT', Reason} ->
+	    Error = {error, {"Schema update error", Reason}},
+	    close_files(InPlace, Error, InitBy),
+            fatal("Schema update error ~p ~p", [Reason, SchemaOps]);
+	_ ->
+	    ?eval_debug_fun({?MODULE, post_dump}, [InitBy]),
+	    close_files(InPlace, ok, InitBy),
+	    ok
+    end.
+
+insert_ops(_Tid, _Storage, [], _InPlace, _InitBy, _) ->    ok;
+insert_ops(Tid, Storage, [Op], InPlace, InitBy, Ver)  when Ver >= "4.3"->
+    insert_op(Tid, Storage, Op, InPlace, InitBy),
+    ok;
+insert_ops(Tid, Storage, [Op | Ops], InPlace, InitBy, Ver)  when Ver >= "4.3"->
+    insert_op(Tid, Storage, Op, InPlace, InitBy),
+    insert_ops(Tid, Storage, Ops, InPlace, InitBy, Ver);
+insert_ops(Tid, Storage, [Op | Ops], InPlace, InitBy, Ver) when Ver < "4.3" ->
+    insert_ops(Tid, Storage, Ops, InPlace, InitBy, Ver),
+    insert_op(Tid, Storage, Op, InPlace, InitBy).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Normal ops
+
+disc_insert(_Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy) ->
+    case open_files(Tab, Storage, InPlace, InitBy) of
+	true ->
+	    case Storage of
+		disc_copies when Tab /= schema ->
+		    mnesia_log:append({?MODULE,Tab}, {{Tab, Key}, Val, Op}),
+		    ok;
+		_ ->
+		    case Op of
+			write ->
+			    ok = dets:insert(Tab, Val);
+			delete ->
+			    ok = dets:delete(Tab, Key);
+			update_counter ->
+			    {RecName, Incr} = Val,
+			    case catch dets:update_counter(Tab, Key, Incr) of
+				CounterVal when integer(CounterVal) ->
+				    ok;
+				_ ->
+				    Zero = {RecName, Key, 0},
+				    ok = dets:insert(Tab, Zero)
+			    end;
+			delete_object ->
+			    ok = dets:delete_object(Tab, Val);
+			clear_table ->
+			    ok = dets:match_delete(Tab, '_')
+		    end
+	    end;
+	false ->
+	    ignore
+    end.
+
+insert(Tid, Storage, Tab, Key, [Val | Tail], Op, InPlace, InitBy) ->
+    insert(Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy),
+    insert(Tid, Storage, Tab, Key, Tail, Op, InPlace, InitBy);
+
+insert(_Tid, _Storage, _Tab, _Key, [], _Op, _InPlace, _InitBy) ->
+    ok;
+
+insert(Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy) ->
+    Item = {{Tab, Key}, Val, Op},
+    case InitBy of
+	startup ->
+	    disc_insert(Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy);
+
+	_ when Storage == ram_copies ->
+	    mnesia_tm:do_update_op(Tid, Storage, Item),
+	    Snmp = mnesia_tm:prepare_snmp(Tab, Key, [Item]),
+	    mnesia_tm:do_snmp(Tid, Snmp);
+
+	_ when Storage == disc_copies ->
+	    disc_insert(Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy),
+	    mnesia_tm:do_update_op(Tid, Storage, Item),
+	    Snmp = mnesia_tm:prepare_snmp(Tab, Key, [Item]),
+	    mnesia_tm:do_snmp(Tid, Snmp);
+
+	_ when Storage == disc_only_copies ->
+	    mnesia_tm:do_update_op(Tid, Storage, Item),
+	    Snmp = mnesia_tm:prepare_snmp(Tab, Key, [Item]),
+	    mnesia_tm:do_snmp(Tid, Snmp);
+
+	_ when Storage == unknown ->
+	    ignore
+    end.
+
+disc_delete_table(Tab, Storage) ->
+    case mnesia_monitor:use_dir() of
+	true ->
+	    if
+		Storage == disc_only_copies; Tab == schema ->
+		    mnesia_monitor:unsafe_close_dets(Tab),
+		    Dat = mnesia_lib:tab2dat(Tab),
+		    file:delete(Dat);
+		true ->
+		    DclFile = mnesia_lib:tab2dcl(Tab),
+		    case get({?MODULE,Tab}) of
+			{opened_dumper, dcl} ->
+			    del_opened_tab(Tab),
+			    mnesia_log:unsafe_close_log(Tab);
+			_ ->
+			    ok
+		    end,
+		    file:delete(DclFile),
+		    DcdFile = mnesia_lib:tab2dcd(Tab),
+		    file:delete(DcdFile),
+		    ok
+	    end,
+	    erase({?MODULE, Tab});
+	false ->
+	    ignore
+    end.
+
+disc_delete_indecies(_Tab, _Cs, Storage) when Storage /= disc_only_copies ->
+    ignore;
+disc_delete_indecies(Tab, Cs, disc_only_copies) ->
+    Indecies = Cs#cstruct.index,
+    mnesia_index:del_transient(Tab, Indecies, disc_only_copies).
+
+insert_op(Tid, Storage, {{Tab, Key}, Val, Op}, InPlace, InitBy) ->
+    %% Propagate to disc only
+    disc_insert(Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy);
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% NOTE that all operations below will only
+%% be performed if the dump is initiated by
+%% startup or fast_schema_update
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+insert_op(_Tid, schema_ops, _OP, _InPlace, Initby)
+  when Initby /= startup,
+       Initby /= fast_schema_update,
+       Initby /= schema_update ->
+    ignore;
+
+insert_op(Tid, _, {op, rec, Storage, Item}, InPlace, InitBy) ->
+    {{Tab, Key}, ValList, Op} = Item,
+    insert(Tid, Storage, Tab, Key, ValList, Op, InPlace, InitBy);
+
+insert_op(Tid, _, {op, change_table_copy_type, N, FromS, ToS, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    Val = mnesia_schema:insert_cstruct(Tid, Cs, true), % Update ram only
+    {schema, Tab, _} = Val,
+    if
+	InitBy /= startup ->
+	    mnesia_controller:add_active_replica(Tab, N, Cs);
+	true ->
+	    ignore
+    end,
+    if
+	N == node() ->
+	    Dmp  = mnesia_lib:tab2dmp(Tab),
+	    Dat  = mnesia_lib:tab2dat(Tab),
+	    Dcd  = mnesia_lib:tab2dcd(Tab),
+	    Dcl  = mnesia_lib:tab2dcl(Tab),
+	    case {FromS, ToS} of
+		{ram_copies, disc_copies} when Tab == schema ->
+		    ok = ensure_rename(Dmp, Dat);
+		{ram_copies, disc_copies} ->
+		    file:delete(Dcl),
+		    ok = ensure_rename(Dmp, Dcd);
+		{disc_copies, ram_copies} when Tab == schema ->
+		    mnesia_lib:set(use_dir, false),
+		    mnesia_monitor:unsafe_close_dets(Tab),
+		    file:delete(Dat);
+		{disc_copies, ram_copies} ->
+		    file:delete(Dcl),
+		    file:delete(Dcd);
+		{ram_copies, disc_only_copies} ->
+		    ok = ensure_rename(Dmp, Dat),
+		    true = open_files(Tab, disc_only_copies, InPlace, InitBy),
+		    %% ram_delete_table must be done before init_indecies,
+		    %% it uses info which is reset in init_indecies,
+		    %% it doesn't matter, because init_indecies don't use
+		    %% the ram replica of the table when creating the disc
+		    %% index; Could be improved :)
+		    mnesia_schema:ram_delete_table(Tab, FromS),
+		    PosList = Cs#cstruct.index,
+		    mnesia_index:init_indecies(Tab, disc_only_copies, PosList);
+		{disc_only_copies, ram_copies} ->
+		    mnesia_monitor:unsafe_close_dets(Tab),
+		    disc_delete_indecies(Tab, Cs, disc_only_copies),
+		    case InitBy of
+			startup ->
+			    ignore;
+			_ ->
+			    mnesia_controller:get_disc_copy(Tab)
+		    end,
+		    disc_delete_table(Tab, disc_only_copies);
+		{disc_copies, disc_only_copies} ->
+		    ok = ensure_rename(Dmp, Dat),
+		    true = open_files(Tab, disc_only_copies, InPlace, InitBy),
+		    mnesia_schema:ram_delete_table(Tab, FromS),
+		    PosList = Cs#cstruct.index,
+		    mnesia_index:init_indecies(Tab, disc_only_copies, PosList),
+		    file:delete(Dcl),
+		    file:delete(Dcd);
+		{disc_only_copies, disc_copies} ->
+		    mnesia_monitor:unsafe_close_dets(Tab),
+		    disc_delete_indecies(Tab, Cs, disc_only_copies),
+		    case InitBy of
+			startup ->
+			    ignore;
+			_ ->
+			    mnesia_log:ets2dcd(Tab),
+			    mnesia_controller:get_disc_copy(Tab),
+			    disc_delete_table(Tab, disc_only_copies)
+		    end
+	    end;
+	true ->
+	    ignore
+    end,
+    S = val({schema, storage_type}),
+    disc_insert(Tid, S, schema, Tab, Val, write, InPlace, InitBy);
+
+insert_op(Tid, _, {op, transform, _Fun, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    case mnesia_lib:cs_to_storage_type(node(), Cs) of
+	disc_copies ->
+	    open_dcl(Cs#cstruct.name);
+	_ ->
+	    ignore
+    end,
+    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
+
+%%%  Operations below this are handled without using the logg.
+
+insert_op(Tid, _, {op, restore_recreate, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    Type = Cs#cstruct.type,
+    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
+    %% Delete all possbibly existing files and tables
+    disc_delete_table(Tab, Storage),
+    disc_delete_indecies(Tab, Cs, Storage),
+    case InitBy of
+	startup ->
+	    ignore;
+	_ ->
+	    mnesia_schema:ram_delete_table(Tab, Storage),
+	    mnesia_checkpoint:tm_del_copy(Tab, node())
+    end,
+    %%    delete_cstruct(Tid, Cs, InPlace, InitBy),
+    %% And create new ones..
+    if
+	(InitBy == startup) or (Storage == unknown) ->
+	    ignore;
+	Storage == ram_copies ->
+	    Args = [{keypos, 2}, public, named_table, Type],
+	    mnesia_monitor:mktab(Tab, Args);
+	Storage == disc_copies ->
+	    Args = [{keypos, 2}, public, named_table, Type],
+	    mnesia_monitor:mktab(Tab, Args),
+	    File = mnesia_lib:tab2dcd(Tab),
+	    FArg = [{file, File}, {name, {mnesia,create}},
+		    {repair, false}, {mode, read_write}],
+	    {ok, Log} = mnesia_monitor:open_log(FArg),
+	    mnesia_monitor:unsafe_close_log(Log);
+	Storage == disc_only_copies ->
+	    File = mnesia_lib:tab2dat(Tab),
+	    file:delete(File),
+	    Args = [{file, mnesia_lib:tab2dat(Tab)},
+		    {type, mnesia_lib:disk_type(Tab, Type)},
+		    {keypos, 2},
+		    {repair, mnesia_monitor:get_env(auto_repair)}],
+	    mnesia_monitor:open_dets(Tab, Args)
+    end,
+    insert_op(Tid, ignore, {op, create_table, TabDef}, InPlace, InitBy);
+
+insert_op(Tid, _, {op, create_table, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    insert_cstruct(Tid, Cs, false, InPlace, InitBy),
+    Tab = Cs#cstruct.name,
+    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
+    case InitBy of
+	startup ->
+	    case Storage of
+		unknown ->
+		    ignore;
+		ram_copies ->
+		    ignore;
+		disc_copies ->
+		    Dcd = mnesia_lib:tab2dcd(Tab),
+		    case mnesia_lib:exists(Dcd) of
+			true -> ignore;
+			false ->
+			    mnesia_log:open_log(temp,
+						mnesia_log:dcl_log_header(),
+						Dcd,
+						false,
+						false,
+						read_write),
+			    mnesia_log:unsafe_close_log(temp)
+		    end;
+		_ ->
+		    Args = [{file, mnesia_lib:tab2dat(Tab)},
+			    {type, mnesia_lib:disk_type(Tab, Cs#cstruct.type)},
+			    {keypos, 2},
+			    {repair, mnesia_monitor:get_env(auto_repair)}],
+		    case mnesia_monitor:open_dets(Tab, Args) of
+			{ok, _} ->
+			    mnesia_monitor:unsafe_close_dets(Tab);
+			{error, Error} ->
+			    exit({"Failed to create dets table", Error})
+		    end
+	    end;
+	_ ->
+	    Copies = mnesia_lib:copy_holders(Cs),
+	    Active = mnesia_lib:intersect(Copies, val({current, db_nodes})),
+	    [mnesia_controller:add_active_replica(Tab, N, Cs) || N <- Active],
+
+	    case Storage of
+		unknown ->
+		    case Cs#cstruct.local_content of
+			true ->
+			    ignore;
+			false ->
+			    mnesia_lib:set_remote_where_to_read(Tab)
+		    end;
+		_ ->
+		    case Cs#cstruct.local_content of
+			true ->
+			    mnesia_lib:set_local_content_whereabouts(Tab);
+			false ->
+			    mnesia_lib:set({Tab, where_to_read}, node())
+		    end,
+		    case Storage of
+			ram_copies ->
+			    ignore;
+			_ ->
+			    %% Indecies are still created by loader
+			    disc_delete_indecies(Tab, Cs, Storage)
+			    %% disc_delete_table(Tab, Storage)
+		    end,
+
+		    %% Update whereabouts and create table
+		    mnesia_controller:create_table(Tab)
+	    end
+    end;
+
+insert_op(_Tid, _, {op, dump_table, Size, TabDef}, _InPlace, _InitBy) ->
+    case Size of
+	unknown ->
+	    ignore;
+	_ ->
+	    Cs = mnesia_schema:list2cs(TabDef),
+	    Tab = Cs#cstruct.name,
+	    Dmp = mnesia_lib:tab2dmp(Tab),
+	    Dat = mnesia_lib:tab2dcd(Tab),
+	    case Size of
+		0 ->
+		    %% Assume that table files already are closed
+		    file:delete(Dmp),
+		    file:delete(Dat);
+		_ ->
+		    ok = ensure_rename(Dmp, Dat)
+	    end
+    end;
+
+insert_op(Tid, _, {op, delete_table, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    case mnesia_lib:cs_to_storage_type(node(), Cs) of
+	unknown ->
+	    ignore;
+	Storage ->
+	    disc_delete_table(Tab, Storage),
+	    disc_delete_indecies(Tab, Cs, Storage),
+	    case InitBy of
+		startup ->
+		    ignore;
+		_ ->
+		    mnesia_schema:ram_delete_table(Tab, Storage),
+		    mnesia_checkpoint:tm_del_copy(Tab, node())
+	    end
+    end,
+    delete_cstruct(Tid, Cs, InPlace, InitBy);
+
+insert_op(Tid, _, {op, clear_table, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    case mnesia_lib:cs_to_storage_type(node(), Cs) of
+	unknown ->
+	    ignore;
+	Storage ->
+	    Oid = '_', %%val({Tab, wild_pattern}),
+	    if Storage == disc_copies ->
+		    open_dcl(Cs#cstruct.name);
+	       true ->
+		    ignore
+	    end,
+	    insert(Tid, Storage, Tab, '_', Oid, clear_table, InPlace, InitBy)
+    end;
+
+insert_op(Tid, _, {op, merge_schema, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    insert_cstruct(Tid, Cs, false, InPlace, InitBy);
+
+insert_op(Tid, _, {op, del_table_copy, Storage, Node, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    if
+	Tab == schema, Storage == ram_copies ->
+	    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
+        Tab /= schema ->
+	    mnesia_controller:del_active_replica(Tab, Node),
+	    mnesia_lib:del({Tab, Storage}, Node),
+	    if
+		Node == node() ->
+		    case Cs#cstruct.local_content of
+			true -> mnesia_lib:set({Tab, where_to_read}, nowhere);
+			false -> mnesia_lib:set_remote_where_to_read(Tab)
+		    end,
+		    mnesia_lib:del({schema, local_tables}, Tab),
+		    mnesia_lib:set({Tab, storage_type}, unknown),
+		    insert_cstruct(Tid, Cs, true, InPlace, InitBy),
+		    disc_delete_table(Tab, Storage),
+		    disc_delete_indecies(Tab, Cs, Storage),
+		    mnesia_schema:ram_delete_table(Tab, Storage),
+		    mnesia_checkpoint:tm_del_copy(Tab, Node);
+		true ->
+		    case val({Tab, where_to_read}) of
+			Node ->
+			    mnesia_lib:set_remote_where_to_read(Tab);
+			_  ->
+			    ignore
+		    end,
+		    insert_cstruct(Tid, Cs, true, InPlace, InitBy)
+	    end
+    end;
+
+insert_op(Tid, _, {op, add_table_copy, _Storage, _Node, TabDef}, InPlace, InitBy) ->
+    %% During prepare commit, the files was created
+    %% and the replica was announced
+    Cs = mnesia_schema:list2cs(TabDef),
+    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
+
+insert_op(Tid, _, {op, add_snmp, _Us, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
+
+insert_op(Tid, _, {op, del_snmp, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
+    if
+	InitBy /= startup,
+	Storage /= unknown ->
+	    case ?catch_val({Tab, {index, snmp}}) of
+		{'EXIT', _} ->
+		    ignore;
+		Stab ->
+		    mnesia_snmp_hook:delete_table(Tab, Stab),
+		    mnesia_lib:unset({Tab, {index, snmp}})
+	    end;
+	true ->
+	    ignore
+    end,
+    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
+
+insert_op(Tid, _, {op, add_index, Pos, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    Tab = insert_cstruct(Tid, Cs, true, InPlace, InitBy),
+    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
+    case InitBy of
+	startup when Storage == disc_only_copies ->
+	    mnesia_index:init_indecies(Tab, Storage, [Pos]);
+	startup ->
+	    ignore;
+	_  ->
+	    mnesia_index:init_indecies(Tab, Storage, [Pos])
+    end;
+
+insert_op(Tid, _, {op, del_index, Pos, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
+    case InitBy of
+	startup when Storage == disc_only_copies ->
+	    mnesia_index:del_index_table(Tab, Storage, Pos);
+	startup ->
+	    ignore;
+	_ ->
+	    mnesia_index:del_index_table(Tab, Storage, Pos)
+    end,
+    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
+
+insert_op(Tid, _, {op, change_table_access_mode,TabDef, _OldAccess, _Access}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    case InitBy of
+	startup -> ignore;
+	_ -> mnesia_controller:change_table_access_mode(Cs)
+    end,
+    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
+
+insert_op(Tid, _, {op, change_table_load_order, TabDef, _OldLevel, _Level}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
+
+insert_op(Tid, _, {op, delete_property, TabDef, PropKey}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    mnesia_lib:unset({Tab, user_property, PropKey}),
+    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
+
+insert_op(Tid, _, {op, write_property, TabDef, _Prop}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
+
+insert_op(Tid, _, {op, change_table_frag, _Change, TabDef}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    insert_cstruct(Tid, Cs, true, InPlace, InitBy).
+
+open_files(Tab, Storage, UpdateInPlace, InitBy)
+  when Storage /= unknown, Storage /= ram_copies ->
+    case get({?MODULE, Tab}) of
+	undefined ->
+	    case ?catch_val({Tab, setorbag}) of
+		{'EXIT', _} ->
+		    false;
+		Type ->
+		    case Storage of
+			disc_copies when Tab /= schema ->
+			    Bool = open_disc_copies(Tab, InitBy),
+			    Bool;
+			_ ->
+			    Fname = prepare_open(Tab, UpdateInPlace),
+			    Args = [{file, Fname},
+				    {keypos, 2},
+				    {repair, mnesia_monitor:get_env(auto_repair)},
+				    {type, mnesia_lib:disk_type(Tab, Type)}],
+			    {ok, _} = mnesia_monitor:open_dets(Tab, Args),
+			    put({?MODULE, Tab}, {opened_dumper, dat}),
+			    true
+		    end
+	    end;
+	already_dumped ->
+	    false;
+	{opened_dumper, _} ->
+	    true
+    end;
+open_files(_Tab, _Storage, _UpdateInPlace, _InitBy) ->
+    false.
+
+open_disc_copies(Tab, InitBy) ->
+    DclF = mnesia_lib:tab2dcl(Tab),
+    DumpEts =
+	case file:read_file_info(DclF) of
+	    {error, enoent} ->
+		false;
+	    {ok, DclInfo} ->
+		DcdF =  mnesia_lib:tab2dcd(Tab),
+		case file:read_file_info(DcdF) of
+		    {error, Reason} ->
+			mnesia_lib:dbg_out("File ~p info_error ~p ~n",
+					   [DcdF, Reason]),
+			true;
+		    {ok, DcdInfo} ->
+			DcdInfo#file_info.size =<
+			    (DclInfo#file_info.size *
+			     ?DumpToEtsMultiplier)
+		end
+	end,
+    if
+	DumpEts == false; InitBy == startup ->
+	    mnesia_log:open_log({?MODULE,Tab},
+				mnesia_log:dcl_log_header(),
+				DclF,
+				mnesia_lib:exists(DclF),
+				mnesia_monitor:get_env(auto_repair),
+				read_write),
+	    put({?MODULE, Tab}, {opened_dumper, dcl}),
+	    true;
+	true ->
+	    mnesia_log:ets2dcd(Tab),
+	    put({?MODULE, Tab}, already_dumped),
+	    false
+    end.
+
+%% Always opens the dcl file for writing overriding already_dumped
+%% mechanismen, used for schema transactions.
+open_dcl(Tab) ->
+    case get({?MODULE, Tab}) of
+	{opened_dumper, _} ->
+	    true;
+	_ -> %% undefined or already_dumped
+	    DclF = mnesia_lib:tab2dcl(Tab),
+	    mnesia_log:open_log({?MODULE,Tab},
+				mnesia_log:dcl_log_header(),
+				DclF,
+				mnesia_lib:exists(DclF),
+				mnesia_monitor:get_env(auto_repair),
+				read_write),
+	    put({?MODULE, Tab}, {opened_dumper, dcl}),
+	    true
+    end.
+
+prepare_open(Tab, UpdateInPlace) ->
+    Dat =  mnesia_lib:tab2dat(Tab),
+    case UpdateInPlace of
+	true ->
+	    Dat;
+	false ->
+	    Tmp = mnesia_lib:tab2tmp(Tab),
+	    case catch mnesia_lib:copy_file(Dat, Tmp) of
+		ok ->
+		    Tmp;
+		Error ->
+		    fatal("Cannot copy dets file ~p to ~p: ~p~n",
+			  [Dat, Tmp, Error])
+	    end
+	end.
+
+del_opened_tab(Tab) ->
+    erase({?MODULE, Tab}).
+
+close_files(UpdateInPlace, Outcome, InitBy) -> % Update in place
+    close_files(UpdateInPlace, Outcome, InitBy, get()).
+
+close_files(InPlace, Outcome, InitBy, [{{?MODULE, Tab}, already_dumped} | Tail]) ->
+    erase({?MODULE, Tab}),
+    close_files(InPlace, Outcome, InitBy, Tail);
+close_files(InPlace, Outcome, InitBy, [{{?MODULE, Tab}, {opened_dumper, Type}} | Tail]) ->
+    erase({?MODULE, Tab}),
+    case val({Tab, storage_type}) of
+	disc_only_copies when InitBy /= startup ->
+	    ignore;
+	disc_copies when Tab /= schema ->
+	    mnesia_log:close_log({?MODULE,Tab});
+	Storage ->
+	    do_close(InPlace, Outcome, Tab, Type, Storage)
+    end,
+    close_files(InPlace, Outcome, InitBy, Tail);
+
+close_files(InPlace, Outcome, InitBy, [_ | Tail]) ->
+    close_files(InPlace, Outcome, InitBy, Tail);
+close_files(_, _, _InitBy, []) ->
+    ok.
+
+%% If storage is unknown during close clean up files, this can happen if timing
+%% is right and dirty_write conflicts with schema operations.
+do_close(_, _, Tab, dcl, unknown) ->
+    mnesia_log:close_log({?MODULE,Tab}),
+    file:delete(mnesia_lib:tab2dcl(Tab));
+do_close(_, _, Tab, dcl, _) ->  %% To be safe, can it happen?
+    mnesia_log:close_log({?MODULE,Tab});
+
+do_close(InPlace, Outcome, Tab, dat, Storage) ->
+    mnesia_monitor:close_dets(Tab),
+    if
+	Storage == unknown, InPlace == true  ->
+	    file:delete(mnesia_lib:tab2dat(Tab));
+	InPlace == true ->
+	    %% Update in place
+	    ok;
+	Outcome == ok, Storage /= unknown ->
+	    %% Success: swap tmp files with dat files
+	    TabDat = mnesia_lib:tab2dat(Tab),
+	    ok = file:rename(mnesia_lib:tab2tmp(Tab), TabDat);
+	true ->
+	    file:delete(mnesia_lib:tab2tmp(Tab))
+    end.
+
+
+ensure_rename(From, To) ->
+    case mnesia_lib:exists(From) of
+	true ->
+	    file:rename(From, To);
+	false ->
+	    case mnesia_lib:exists(To) of
+		true ->
+		    ok;
+		false ->
+		    {error, {rename_failed, From, To}}
+	    end
+    end.
+
+insert_cstruct(Tid, Cs, KeepWhereabouts, InPlace, InitBy) ->
+    Val = mnesia_schema:insert_cstruct(Tid, Cs, KeepWhereabouts),
+    {schema, Tab, _} = Val,
+    S = val({schema, storage_type}),
+    disc_insert(Tid, S, schema, Tab, Val, write, InPlace, InitBy),
+    Tab.
+
+delete_cstruct(Tid, Cs, InPlace, InitBy) ->
+    Val = mnesia_schema:delete_cstruct(Tid, Cs),
+    {schema, Tab, _} = Val,
+    S = val({schema, storage_type}),
+    disc_insert(Tid, S, schema, Tab, Val, delete, InPlace, InitBy),
+    Tab.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Raw dump of table. Dumper must have unique access to the ets table.
+
+raw_named_dump_table(Tab, Ftype) ->
+    case mnesia_monitor:use_dir() of
+	true ->
+	    mnesia_lib:lock_table(Tab),
+	    TmpFname = mnesia_lib:tab2tmp(Tab),
+	    Fname =
+		case Ftype of
+		    dat -> mnesia_lib:tab2dat(Tab);
+		    dmp -> mnesia_lib:tab2dmp(Tab)
+		end,
+	    file:delete(TmpFname),
+	    file:delete(Fname),
+	    TabSize = ?ets_info(Tab, size),
+	    TabRef = Tab,
+	    DiskType = mnesia_lib:disk_type(Tab),
+	    Args = [{file, TmpFname},
+		    {keypos, 2},
+		    %%		    {ram_file, true},
+		    {estimated_no_objects, TabSize + 256},
+		    {repair, mnesia_monitor:get_env(auto_repair)},
+		    {type, DiskType}],
+	    case mnesia_lib:dets_sync_open(TabRef, Args) of
+		{ok, TabRef} ->
+		    Storage = ram_copies,
+		    mnesia_lib:db_fixtable(Storage, Tab, true),
+
+		    case catch raw_dump_table(TabRef, Tab) of
+			{'EXIT', Reason} ->
+			    mnesia_lib:db_fixtable(Storage, Tab, false),
+			    mnesia_lib:dets_sync_close(Tab),
+			    file:delete(TmpFname),
+			    mnesia_lib:unlock_table(Tab),
+			    exit({"Dump of table to disc failed", Reason});
+			ok ->
+			    mnesia_lib:db_fixtable(Storage, Tab, false),
+			    mnesia_lib:dets_sync_close(Tab),
+			    mnesia_lib:unlock_table(Tab),
+			    ok = file:rename(TmpFname, Fname)
+		    end;
+		{error, Reason} ->
+		    mnesia_lib:unlock_table(Tab),
+		    exit({"Open of file before dump to disc failed", Reason})
+	    end;
+	false ->
+	    exit({has_no_disc, node()})
+    end.
+
+raw_dump_table(DetsRef, EtsRef) ->
+    dets:from_ets(DetsRef, EtsRef).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Load regulator
+%%
+%% This is a poor mans substitute for a fair scheduler algorithm
+%% in the Erlang emulator. The mnesia_dumper process performs many
+%% costly BIF invokations and must pay for this. But since the
+%% Emulator does not handle this properly we must compensate for
+%% this with some form of load regulation of ourselves in order to
+%% not steal all computation power in the Erlang Emulator ans make
+%% other processes starve. Hopefully this is a temporary solution.
+
+start_regulator() ->
+    case mnesia_monitor:get_env(dump_log_load_regulation) of
+	false ->
+	    nopid;
+	true ->
+	    N = ?REGULATOR_NAME,
+	    case mnesia_monitor:start_proc(N, ?MODULE, regulator_init, [self()]) of
+		{ok, Pid} ->
+		    Pid;
+		{error, Reason} ->
+		    fatal("Failed to start ~n: ~p~n", [N, Reason])
+	    end
+    end.
+
+regulator_init(Parent) ->
+    %% No need for trapping exits.
+    %% Using low priority causes the regulation
+    process_flag(priority, low),
+    register(?REGULATOR_NAME, self()),
+    proc_lib:init_ack(Parent, {ok, self()}),
+    regulator_loop().
+
+regulator_loop() ->
+    receive
+	{regulate, From} ->
+	    From ! {regulated, self()},
+	    regulator_loop();
+	{stop, From} ->
+	    From ! {stopped, self()},
+	    exit(normal)
+    end.
+
+regulate(nopid) ->
+    ok;
+regulate(RegulatorPid) ->
+    RegulatorPid ! {regulate, self()},
+    receive
+	{regulated, RegulatorPid} -> ok
+    end.
+
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason);
+	Value -> Value
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_event.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_event.erl
new file mode 100644
index 0000000000..6053179194
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_event.erl
@@ -0,0 +1,260 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_event.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
+%%
+-module(mnesia_event).
+
+-behaviour(gen_event).
+%-behaviour(mnesia_event).
+
+%% gen_event callback interface
+-export([init/1,
+	 handle_event/2,
+	 handle_call/2,
+	 handle_info/2,
+	 terminate/2,
+	 code_change/3]).
+
+-record(state, {nodes = [],
+		dumped_core = false,  %% only dump fatal core once
+		args}).
+
+%%%----------------------------------------------------------------
+%%% Callback functions from gen_server
+%%%----------------------------------------------------------------
+
+%%-----------------------------------------------------------------
+%% init(Args) ->
+%%     {ok, State} | Error
+%%-----------------------------------------------------------------
+
+init(Args) ->
+    {ok, #state{args = Args}}.
+
+%%-----------------------------------------------------------------
+%% handle_event(Event, State) ->
+%%    {ok, NewState} | remove_handler |
+%%    {swap_handler, Args1, State1, Mod2, Args2}
+%%-----------------------------------------------------------------
+
+handle_event(Event, State) ->
+    handle_any_event(Event, State).
+
+%%-----------------------------------------------------------------
+%% handle_info(Msg, State) ->
+%%    {ok, NewState} | remove_handler |
+%%    {swap_handler, Args1, State1, Mod2, Args2}
+%%-----------------------------------------------------------------
+
+handle_info(Msg, State) ->
+    handle_any_event(Msg, State),
+    {ok, State}.
+
+%%-----------------------------------------------------------------
+%% handle_call(Event, State) ->
+%%    {ok, Reply, NewState} | {remove_handler, Reply} |
+%%    {swap_handler, Reply, Args1, State1, Mod2, Args2}
+%%-----------------------------------------------------------------
+
+handle_call(Msg, State) ->
+    Reply = ok,
+    case handle_any_event(Msg, State) of
+	{ok, NewState} ->
+	    {ok, Reply, NewState};
+	remove_handler ->
+	    {remove_handler, Reply};
+	{swap_handler,Args1, State1, Mod2, Args2} ->
+	    {swap_handler, Reply, Args1, State1, Mod2, Args2}
+    end.
+
+%%-----------------------------------------------------------------
+%% terminate(Reason, State) ->
+%%     AnyVal
+%%-----------------------------------------------------------------
+
+terminate(_Reason, _State) ->
+    ok.
+
+%%----------------------------------------------------------------------
+%% Func: code_change/3
+%% Purpose: Upgrade process when its code is to be changed
+%% Returns: {ok, NewState}
+%%----------------------------------------------------------------------
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%-----------------------------------------------------------------
+%% Internal functions
+%%-----------------------------------------------------------------
+
+handle_any_event({mnesia_system_event, Event}, State) ->
+    handle_system_event(Event, State);
+handle_any_event({mnesia_table_event, Event}, State) ->
+    handle_table_event(Event, State);
+handle_any_event(Msg, State) ->
+    report_error("~p got unexpected event: ~p~n", [?MODULE, Msg]),
+    {ok, State}.
+
+handle_table_event({Oper, Record, TransId}, State) ->
+    report_info("~p performed by ~p on record:~n\t~p~n",
+		[Oper, TransId, Record]),
+    {ok, State}.
+
+handle_system_event({mnesia_checkpoint_activated, _Checkpoint}, State) ->
+    {ok, State};
+
+handle_system_event({mnesia_checkpoint_deactivated, _Checkpoint}, State) ->
+    {ok, State};
+
+handle_system_event({mnesia_up, Node}, State) ->
+    Nodes = [Node | State#state.nodes],
+    {ok, State#state{nodes = Nodes}};
+
+handle_system_event({mnesia_down, Node}, State) ->
+    case mnesia:system_info(fallback_activated) of
+	true ->
+	    case mnesia_monitor:get_env(fallback_error_function) of
+		{mnesia, lkill} ->
+		    Msg = "A fallback is installed and Mnesia "
+			"must be restarted. Forcing shutdown "
+			"after mnesia_down from ~p...~n",
+		    report_fatal(Msg, [Node], nocore, State#state.dumped_core),
+		    mnesia:lkill(),
+		    exit(fatal);
+		{UserMod, UserFunc} ->
+		    Msg = "Warning: A fallback is installed and Mnesia got mnesia_down "
+			"from ~p. ~n",
+		    report_info(Msg, [Node]),
+		    case catch apply(UserMod, UserFunc, [Node]) of
+			{'EXIT', {undef, _Reason}} ->
+			    %% Backward compatibility
+			    apply(UserMod, UserFunc, []);
+			{'EXIT', Reason} ->
+			    exit(Reason);
+			_ ->
+			    ok
+		    end,
+		    Nodes = lists:delete(Node, State#state.nodes),
+		    {ok, State#state{nodes = Nodes}}
+	    end;
+	false ->
+	    Nodes = lists:delete(Node, State#state.nodes),
+	    {ok, State#state{nodes = Nodes}}
+    end;
+
+handle_system_event({mnesia_overload, Details}, State) ->
+    report_warning("Mnesia is overloaded: ~p~n", [Details]),
+    {ok, State};
+
+handle_system_event({mnesia_info, Format, Args}, State) ->
+    report_info(Format, Args),
+    {ok, State};
+
+handle_system_event({mnesia_warning, Format, Args}, State) ->
+    report_warning(Format, Args),
+    {ok, State};
+
+handle_system_event({mnesia_error, Format, Args}, State) ->
+    report_error(Format, Args),
+    {ok, State};
+
+handle_system_event({mnesia_fatal, Format, Args, BinaryCore}, State) ->
+    report_fatal(Format, Args, BinaryCore, State#state.dumped_core),
+    {ok, State#state{dumped_core = true}};
+
+handle_system_event({inconsistent_database, Reason, Node}, State) ->
+    report_error("mnesia_event got {inconsistent_database, ~w, ~w}~n",
+		 [Reason, Node]),
+    {ok, State};
+
+handle_system_event({mnesia_user, Event}, State) ->
+    report_info("User event: ~p~n", [Event]),
+    {ok, State};
+
+handle_system_event(Msg, State) ->
+    report_error("mnesia_event got unexpected system event: ~p~n", [Msg]),
+    {ok, State}.
+
+report_info(Format0, Args0) ->
+    Format = "Mnesia(~p): " ++ Format0,
+    Args = [node() | Args0],
+    case global:whereis_name(mnesia_global_logger) of
+	undefined ->
+	    io:format(Format, Args);
+	Pid ->
+	    io:format(Pid, Format, Args)
+    end.
+
+report_warning(Format0, Args0) ->
+    Format = "Mnesia(~p): ** WARNING ** " ++ Format0,
+    Args = [node() | Args0],
+    case erlang:function_exported(error_logger, warning_msg, 2) of
+	true ->
+	    error_logger:warning_msg(Format, Args);
+	false ->
+	    error_logger:format(Format, Args)
+    end,
+    case global:whereis_name(mnesia_global_logger) of
+	undefined ->
+	    ok;
+	Pid ->
+	    io:format(Pid, Format, Args)
+    end.
+
+report_error(Format0, Args0) ->
+    Format = "Mnesia(~p): ** ERROR ** " ++ Format0,
+    Args = [node() | Args0],
+    error_logger:format(Format, Args),
+    case global:whereis_name(mnesia_global_logger) of
+	undefined ->
+	    ok;
+	Pid ->
+	    io:format(Pid, Format, Args)
+    end.
+
+report_fatal(Format, Args, BinaryCore, CoreDumped) ->
+    UseDir = mnesia_monitor:use_dir(),
+    CoreDir = mnesia_monitor:get_env(core_dir),
+    if
+	list(CoreDir),CoreDumped == false,binary(BinaryCore) ->
+	    core_file(CoreDir,BinaryCore,Format,Args);
+	(UseDir == true),CoreDumped == false,binary(BinaryCore) ->
+	    core_file(CoreDir,BinaryCore,Format,Args);
+	true ->
+	    report_error("(ignoring core) ** FATAL ** " ++ Format, Args)
+    end.
+
+core_file(CoreDir,BinaryCore,Format,Args) ->
+    %% Integers = tuple_to_list(date()) ++ tuple_to_list(time()),
+    Integers = tuple_to_list(now()),
+    Fun = fun(I) when I < 10 -> ["_0",I];
+	     (I) -> ["_",I]
+	  end,
+    List = lists:append([Fun(I) || I <- Integers]),
+    CoreFile = if list(CoreDir) ->
+		       filename:absname(lists:concat(["MnesiaCore.", node()] ++ List),
+					CoreDir);
+		  true ->
+		       filename:absname(lists:concat(["MnesiaCore.", node()] ++ List))
+	       end,
+    case file:write_file(CoreFile, BinaryCore) of
+	ok ->
+	    report_error("(core dumped to file: ~p)~n ** FATAL ** " ++ Format,
+			 [CoreFile] ++ Args);
+	{error, Reason} ->
+	    report_error("(could not write core file: ~p)~n ** FATAL ** " ++ Format,
+			 [Reason] ++ Args)
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_frag.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_frag.erl
new file mode 100644
index 0000000000..92ac51a0dc
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_frag.erl
@@ -0,0 +1,1201 @@
+%%% ``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 via the world wide web 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.
+%%%
+%%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%%% AB. All Rights Reserved.''
+%%%
+%%%     $Id: mnesia_frag.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
+%%%
+%%%----------------------------------------------------------------------
+%%% Purpose : Support tables so large that they need
+%%%           to be divided into several fragments.
+%%%----------------------------------------------------------------------
+
+%header_doc_include
+
+-module(mnesia_frag).
+-behaviour(mnesia_access).
+
+%% Callback functions when accessed within an activity
+-export([
+	 lock/4,
+	 write/5, delete/5, delete_object/5,
+	 read/5, match_object/5, all_keys/4,
+	 select/5,
+	 index_match_object/6, index_read/6,
+	 foldl/6, foldr/6,
+	 table_info/4
+       ]).
+
+%header_doc_include
+
+-export([
+	 change_table_frag/2,
+	 remove_node/2,
+	 expand_cstruct/1,
+	 lookup_frag_hash/1,
+	 lookup_foreigners/1,
+	 frag_names/1,
+	 set_frag_hash/2,
+	 local_select/4,
+	 remote_select/4
+	]).
+
+-include("mnesia.hrl").
+
+-define(OLD_HASH_MOD, mnesia_frag_old_hash).
+-define(DEFAULT_HASH_MOD, mnesia_frag_hash).
+%%-define(DEFAULT_HASH_MOD, ?OLD_HASH_MOD). %%  BUGBUG: New should be default
+
+-record(frag_state,
+	{foreign_key,
+	 n_fragments,
+	 hash_module,
+	 hash_state}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Access functions
+
+%impl_doc_include
+
+%% Callback functions which provides transparent
+%% access of fragmented tables from any activity
+%% access context.
+
+lock(ActivityId, Opaque, {table , Tab}, LockKind) ->
+    case frag_names(Tab) of
+	[Tab] ->
+	    mnesia:lock(ActivityId, Opaque, {table, Tab}, LockKind);
+	Frags ->
+	    DeepNs = [mnesia:lock(ActivityId, Opaque, {table, F}, LockKind) ||
+			 F <- Frags],
+	    mnesia_lib:uniq(lists:append(DeepNs))
+    end;
+
+lock(ActivityId, Opaque, LockItem, LockKind) ->
+    mnesia:lock(ActivityId, Opaque, LockItem, LockKind).
+
+write(ActivityId, Opaque, Tab, Rec, LockKind) ->
+    Frag = record_to_frag_name(Tab, Rec),
+    mnesia:write(ActivityId, Opaque, Frag, Rec, LockKind).
+
+delete(ActivityId, Opaque, Tab, Key, LockKind) ->
+    Frag = key_to_frag_name(Tab, Key),
+    mnesia:delete(ActivityId, Opaque, Frag, Key, LockKind).
+
+delete_object(ActivityId, Opaque, Tab, Rec, LockKind) ->
+    Frag = record_to_frag_name(Tab, Rec),
+    mnesia:delete_object(ActivityId, Opaque, Frag, Rec, LockKind).
+
+read(ActivityId, Opaque, Tab, Key, LockKind) ->
+    Frag = key_to_frag_name(Tab, Key),
+    mnesia:read(ActivityId, Opaque, Frag, Key, LockKind).
+
+match_object(ActivityId, Opaque, Tab, HeadPat, LockKind) ->
+    MatchSpec = [{HeadPat, [], ['$_']}],
+    select(ActivityId, Opaque, Tab, MatchSpec, LockKind).
+
+select(ActivityId, Opaque, Tab, MatchSpec, LockKind) ->
+    do_select(ActivityId, Opaque, Tab, MatchSpec, LockKind).
+
+all_keys(ActivityId, Opaque, Tab, LockKind) ->
+    Match = [mnesia:all_keys(ActivityId, Opaque, Frag, LockKind)
+	     || Frag <- frag_names(Tab)],
+    lists:append(Match).
+
+index_match_object(ActivityId, Opaque, Tab, Pat, Attr, LockKind) ->
+    Match =
+	[mnesia:index_match_object(ActivityId, Opaque, Frag, Pat, Attr, LockKind)
+	 || Frag <- frag_names(Tab)],
+    lists:append(Match).
+
+index_read(ActivityId, Opaque, Tab, Key, Attr, LockKind) ->
+    Match =
+	[mnesia:index_read(ActivityId, Opaque, Frag, Key, Attr, LockKind)
+	     || Frag <- frag_names(Tab)],
+    lists:append(Match).
+
+foldl(ActivityId, Opaque, Fun, Acc, Tab, LockKind) ->
+    Fun2 = fun(Frag, A) ->
+		   mnesia:foldl(ActivityId, Opaque, Fun, A, Frag, LockKind)
+	   end,
+    lists:foldl(Fun2, Acc, frag_names(Tab)).
+
+foldr(ActivityId, Opaque, Fun, Acc, Tab, LockKind) ->
+    Fun2 = fun(Frag, A) ->
+		   mnesia:foldr(ActivityId, Opaque, Fun, A, Frag, LockKind)
+	   end,
+    lists:foldr(Fun2, Acc, frag_names(Tab)).
+
+table_info(ActivityId, Opaque, {Tab, Key}, Item) ->
+    Frag = key_to_frag_name(Tab, Key),
+    table_info2(ActivityId, Opaque, Tab, Frag, Item);
+table_info(ActivityId, Opaque, Tab, Item) ->
+    table_info2(ActivityId, Opaque, Tab, Tab, Item).
+
+table_info2(ActivityId, Opaque, Tab, Frag, Item) ->
+    case Item of
+	size ->
+	    SumFun = fun({_, Size}, Acc) -> Acc + Size end,
+	    lists:foldl(SumFun, 0, frag_size(ActivityId, Opaque, Tab));
+	memory ->
+	    SumFun = fun({_, Size}, Acc) -> Acc + Size end,
+	    lists:foldl(SumFun, 0, frag_memory(ActivityId, Opaque, Tab));
+	base_table ->
+	    lookup_prop(Tab, base_table);
+	node_pool ->
+	    lookup_prop(Tab, node_pool);
+	n_fragments ->
+	    FH = lookup_frag_hash(Tab),
+	    FH#frag_state.n_fragments;
+	foreign_key ->
+	    FH = lookup_frag_hash(Tab),
+	    FH#frag_state.foreign_key;
+	foreigners ->
+	    lookup_foreigners(Tab);
+	n_ram_copies ->
+	    length(val({Tab, ram_copies}));
+	n_disc_copies ->
+	    length(val({Tab, disc_copies}));
+	n_disc_only_copies ->
+	    length(val({Tab, disc_only_copies}));
+
+	frag_names ->
+	    frag_names(Tab);
+	frag_dist ->
+	    frag_dist(Tab);
+	frag_size ->
+	    frag_size(ActivityId, Opaque, Tab);
+	frag_memory ->
+	    frag_memory(ActivityId, Opaque, Tab);
+	_ ->
+	    mnesia:table_info(ActivityId, Opaque, Frag, Item)
+    end.
+%impl_doc_include
+
+frag_size(ActivityId, Opaque, Tab) ->
+    [{F, remote_table_info(ActivityId, Opaque, F, size)} || F <- frag_names(Tab)].
+
+frag_memory(ActivityId, Opaque, Tab) ->
+    [{F, remote_table_info(ActivityId, Opaque, F, memory)} || F <- frag_names(Tab)].
+
+
+
+remote_table_info(ActivityId, Opaque, Tab, Item) ->
+    N = val({Tab, where_to_read}),
+    case rpc:call(N, mnesia, table_info, [ActivityId, Opaque, Tab, Item]) of
+	{badrpc, _} ->
+	    mnesia:abort({no_exists, Tab, Item});
+	Info ->
+	    Info
+    end.
+
+do_select(ActivityId, Opaque, Tab, MatchSpec, LockKind) ->
+    case ?catch_val({Tab, frag_hash}) of
+	{'EXIT', _} ->
+	    mnesia:select(ActivityId, Opaque, Tab, MatchSpec, LockKind);
+	FH ->
+	    HashState = FH#frag_state.hash_state,
+	    FragNumbers =
+		case FH#frag_state.hash_module of
+		    HashMod when HashMod == ?DEFAULT_HASH_MOD ->
+			?DEFAULT_HASH_MOD:match_spec_to_frag_numbers(HashState, MatchSpec);
+		    HashMod ->
+			HashMod:match_spec_to_frag_numbers(HashState, MatchSpec)
+		end,
+	    N = FH#frag_state.n_fragments,
+	    VerifyFun = fun(F) when integer(F), F >= 1, F =< N -> false;
+			   (_F) -> true
+			end,
+	    case catch lists:filter(VerifyFun, FragNumbers) of
+		[] ->
+		    Fun = fun(Num) ->
+				  Name = n_to_frag_name(Tab, Num),
+				  Node = val({Name, where_to_read}),
+				  mnesia:lock(ActivityId, Opaque, {table, Name}, LockKind),
+				  {Name, Node}
+			  end,
+		    NameNodes = lists:map(Fun, FragNumbers),
+		    SelectAllFun =
+			fun(PatchedMatchSpec) ->
+				Match = [mnesia:dirty_select(Name, PatchedMatchSpec)
+					 || {Name, _Node} <- NameNodes],
+				lists:append(Match)
+			end,
+		    case [{Name, Node} || {Name, Node} <- NameNodes, Node /= node()] of
+			[] ->
+			    %% All fragments are local
+			    mnesia:fun_select(ActivityId, Opaque, Tab, MatchSpec, none, '_', SelectAllFun);
+			RemoteNameNodes ->
+			    SelectFun =
+				fun(PatchedMatchSpec) ->
+					Ref = make_ref(),
+					Args = [self(), Ref, RemoteNameNodes, PatchedMatchSpec],
+					Pid = spawn_link(?MODULE, local_select, Args),
+					LocalMatch = [mnesia:dirty_select(Name, PatchedMatchSpec)
+						      || {Name, Node} <- NameNodes, Node == node()],
+					OldSelectFun = fun() -> SelectAllFun(PatchedMatchSpec) end,
+					local_collect(Ref, Pid, lists:append(LocalMatch), OldSelectFun)
+				end,
+			    mnesia:fun_select(ActivityId, Opaque, Tab, MatchSpec, none, '_', SelectFun)
+		    end;
+		BadFrags ->
+		    mnesia:abort({"match_spec_to_frag_numbers: Fragment numbers out of range",
+				  BadFrags, {range, 1, N}})
+	    end
+    end.
+
+local_select(ReplyTo, Ref, RemoteNameNodes, MatchSpec) ->
+    RemoteNodes = mnesia_lib:uniq([Node || {_Name, Node} <- RemoteNameNodes]),
+    Args = [ReplyTo, Ref, RemoteNameNodes, MatchSpec],
+    {Replies, BadNodes} = rpc:multicall(RemoteNodes, ?MODULE, remote_select, Args),
+    case mnesia_lib:uniq(Replies) -- [ok] of
+	[] when BadNodes == [] ->
+	    ReplyTo ! {local_select, Ref, ok};
+	_ when BadNodes /= [] ->
+	    ReplyTo ! {local_select, Ref, {error, {node_not_running, hd(BadNodes)}}};
+	[{badrpc, {'EXIT', Reason}} | _] ->
+	    ReplyTo ! {local_select, Ref, {error, Reason}};
+	[Reason | _] ->
+	    ReplyTo ! {local_select, Ref, {error, Reason}}
+    end,
+    unlink(ReplyTo),
+    exit(normal).
+
+remote_select(ReplyTo, Ref, NameNodes, MatchSpec) ->
+    do_remote_select(ReplyTo, Ref, NameNodes, MatchSpec).
+
+do_remote_select(ReplyTo, Ref, [{Name, Node} | NameNodes], MatchSpec) ->
+    if
+	Node == node() ->
+	    Res = (catch {ok, mnesia:dirty_select(Name, MatchSpec)}),
+	    ReplyTo ! {remote_select, Ref, Node, Res},
+	    do_remote_select(ReplyTo, Ref, NameNodes, MatchSpec);
+	true ->
+	    do_remote_select(ReplyTo, Ref, NameNodes, MatchSpec)
+    end;
+do_remote_select(_ReplyTo, _Ref, [], _MatchSpec) ->
+    ok.
+
+local_collect(Ref, Pid, LocalMatch, OldSelectFun) ->
+    receive
+	{local_select, Ref, LocalRes} ->
+	    remote_collect(Ref, LocalRes, LocalMatch, OldSelectFun);
+	{'EXIT', Pid, Reason} ->
+	    remote_collect(Ref, {error, Reason}, [], OldSelectFun)
+    end.
+
+remote_collect(Ref, LocalRes = ok, Acc, OldSelectFun) ->
+    receive
+	{remote_select, Ref, Node, RemoteRes} ->
+	    case RemoteRes of
+		{ok, RemoteMatch} ->
+		    remote_collect(Ref, LocalRes, RemoteMatch ++ Acc, OldSelectFun);
+		_ ->
+		    remote_collect(Ref, {error, {node_not_running, Node}}, [], OldSelectFun)
+	    end
+    after 0 ->
+	    Acc
+    end;
+remote_collect(Ref, LocalRes = {error, Reason}, _Acc, OldSelectFun) ->
+    receive
+	{remote_select, Ref, _Node, _RemoteRes} ->
+	    remote_collect(Ref, LocalRes, [], OldSelectFun)
+    after 0 ->
+	    mnesia:abort(Reason)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Returns a list of cstructs
+
+expand_cstruct(Cs) ->
+    expand_cstruct(Cs, create).
+
+expand_cstruct(Cs, Mode) ->
+    Tab = Cs#cstruct.name,
+    Props = Cs#cstruct.frag_properties,
+    mnesia_schema:verify({alt, [nil, list]}, mnesia_lib:etype(Props),
+			 {badarg, Tab, Props}),
+    %% Verify keys
+    ValidKeys = [foreign_key, n_fragments, node_pool,
+		 n_ram_copies, n_disc_copies, n_disc_only_copies,
+		 hash_module, hash_state],
+    Keys = mnesia_schema:check_keys(Tab, Props, ValidKeys),
+    mnesia_schema:check_duplicates(Tab, Keys),
+
+    %% Pick fragmentation props
+    ForeignKey = mnesia_schema:pick(Tab, foreign_key, Props, undefined),
+    {ForeignKey2, N, Pool, DefaultNR, DefaultND, DefaultNDO} =
+	pick_props(Tab, Cs, ForeignKey),
+
+    %% Verify node_pool
+    BadPool = {bad_type, Tab, {node_pool, Pool}},
+    mnesia_schema:verify(list, mnesia_lib:etype(Pool), BadPool),
+    NotAtom = fun(A) when atom(A) -> false;
+		 (_A) -> true
+	      end,
+    mnesia_schema:verify([], [P || P <- Pool, NotAtom(P)], BadPool),
+
+    NR  = mnesia_schema:pick(Tab, n_ram_copies, Props, 0),
+    ND  = mnesia_schema:pick(Tab, n_disc_copies, Props, 0),
+    NDO = mnesia_schema:pick(Tab, n_disc_only_copies, Props, 0),
+
+    PosInt = fun(I) when integer(I), I >= 0 -> true;
+		(_I) -> false
+	     end,
+    mnesia_schema:verify(true, PosInt(NR),
+			 {bad_type, Tab, {n_ram_copies, NR}}),
+    mnesia_schema:verify(true, PosInt(ND),
+			 {bad_type, Tab, {n_disc_copies, ND}}),
+    mnesia_schema:verify(true, PosInt(NDO),
+			 {bad_type, Tab, {n_disc_only_copies, NDO}}),
+
+    %% Verify n_fragments
+    Cs2 = verify_n_fragments(N, Cs, Mode),
+
+    %% Verify hash callback
+    HashMod = mnesia_schema:pick(Tab, hash_module, Props, ?DEFAULT_HASH_MOD),
+    HashState = mnesia_schema:pick(Tab, hash_state, Props, undefined),
+    HashState2 = HashMod:init_state(Tab, HashState), %% BUGBUG: Catch?
+
+    FH = #frag_state{foreign_key = ForeignKey2,
+		     n_fragments = 1,
+		     hash_module = HashMod,
+		     hash_state  = HashState2},
+    if
+	NR == 0, ND == 0, NDO == 0 ->
+	    do_expand_cstruct(Cs2, FH, N, Pool, DefaultNR, DefaultND, DefaultNDO, Mode);
+	true ->
+	    do_expand_cstruct(Cs2, FH, N, Pool, NR, ND, NDO, Mode)
+    end.
+
+do_expand_cstruct(Cs, FH, N, Pool, NR, ND, NDO, Mode) ->
+    Tab = Cs#cstruct.name,
+
+    LC = Cs#cstruct.local_content,
+    mnesia_schema:verify(false, LC,
+			 {combine_error, Tab, {local_content, LC}}),
+
+    Snmp = Cs#cstruct.snmp,
+    mnesia_schema:verify([], Snmp,
+			 {combine_error, Tab, {snmp, Snmp}}),
+
+    %% Add empty fragments
+    CommonProps = [{base_table, Tab}],
+    Cs2 = Cs#cstruct{frag_properties = lists:sort(CommonProps)},
+    expand_frag_cstructs(N, NR, ND, NDO, Cs2, Pool, Pool, FH, Mode).
+
+verify_n_fragments(N, Cs, Mode) when integer(N), N >= 1 ->
+    case Mode of
+	create ->
+	    Cs#cstruct{ram_copies = [],
+		       disc_copies = [],
+		       disc_only_copies = []};
+	activate  ->
+	    Reason = {combine_error, Cs#cstruct.name, {n_fragments, N}},
+	    mnesia_schema:verify(1, N, Reason),
+	    Cs
+    end;
+verify_n_fragments(N, Cs, _Mode) ->
+    mnesia:abort({bad_type, Cs#cstruct.name, {n_fragments, N}}).
+
+pick_props(Tab, Cs, {ForeignTab, Attr}) ->
+    mnesia_schema:verify(true, ForeignTab /= Tab,
+			 {combine_error, Tab, {ForeignTab, Attr}}),
+    Props = Cs#cstruct.frag_properties,
+    Attrs = Cs#cstruct.attributes,
+
+    ForeignKey  = lookup_prop(ForeignTab, foreign_key),
+    ForeignN    = lookup_prop(ForeignTab, n_fragments),
+    ForeignPool = lookup_prop(ForeignTab, node_pool),
+    N           = mnesia_schema:pick(Tab, n_fragments, Props,  ForeignN),
+    Pool        = mnesia_schema:pick(Tab, node_pool, Props, ForeignPool),
+
+    mnesia_schema:verify(ForeignN, N,
+			 {combine_error, Tab, {n_fragments, N},
+			  ForeignTab, {n_fragments, ForeignN}}),
+
+    mnesia_schema:verify(ForeignPool, Pool,
+			 {combine_error, Tab, {node_pool, Pool},
+			  ForeignTab, {node_pool, ForeignPool}}),
+
+    mnesia_schema:verify(undefined, ForeignKey,
+			 {combine_error, Tab,
+			  "Multiple levels of foreign_key dependencies",
+			  {ForeignTab, Attr}, ForeignKey}),
+
+    Key = {ForeignTab, mnesia_schema:attr_to_pos(Attr, Attrs)},
+    DefaultNR = length(val({ForeignTab, ram_copies})),
+    DefaultND = length(val({ForeignTab, disc_copies})),
+    DefaultNDO = length(val({ForeignTab, disc_only_copies})),
+    {Key, N, Pool, DefaultNR, DefaultND, DefaultNDO};
+pick_props(Tab, Cs, undefined) ->
+    Props = Cs#cstruct.frag_properties,
+    DefaultN = 1,
+    DefaultPool = mnesia:system_info(db_nodes),
+    N    = mnesia_schema:pick(Tab, n_fragments, Props,  DefaultN),
+    Pool = mnesia_schema:pick(Tab, node_pool, Props, DefaultPool),
+    DefaultNR = 1,
+    DefaultND = 0,
+    DefaultNDO = 0,
+    {undefined, N, Pool, DefaultNR, DefaultND, DefaultNDO};
+pick_props(Tab, _Cs, BadKey) ->
+    mnesia:abort({bad_type, Tab, {foreign_key, BadKey}}).
+
+expand_frag_cstructs(N, NR, ND, NDO, CommonCs, Dist, Pool, FH, Mode)
+  when N > 1, Mode == create ->
+    Frag = n_to_frag_name(CommonCs#cstruct.name, N),
+    Cs = CommonCs#cstruct{name = Frag},
+    {Cs2, RevModDist, RestDist} = set_frag_nodes(NR, ND, NDO, Cs, Dist, []),
+    ModDist = lists:reverse(RevModDist),
+    Dist2 = rearrange_dist(Cs, ModDist, RestDist, Pool),
+    %% Adjusts backwards, but it doesn't matter.
+    {FH2, _FromFrags, _AdditionalWriteFrags} = adjust_before_split(FH),
+    CsList = expand_frag_cstructs(N - 1, NR, ND, NDO, CommonCs, Dist2, Pool, FH2, Mode),
+    [Cs2 | CsList];
+expand_frag_cstructs(1, NR, ND, NDO, CommonCs, Dist, Pool, FH, Mode) ->
+    BaseProps = CommonCs#cstruct.frag_properties ++
+	[{foreign_key, FH#frag_state.foreign_key},
+	 {hash_module, FH#frag_state.hash_module},
+	 {hash_state,  FH#frag_state.hash_state},
+	 {n_fragments, FH#frag_state.n_fragments},
+	 {node_pool, Pool}
+	],
+    BaseCs = CommonCs#cstruct{frag_properties = lists:sort(BaseProps)},
+    case Mode of
+	activate ->
+	    [BaseCs];
+	create ->
+	    {BaseCs2, _, _} = set_frag_nodes(NR, ND, NDO, BaseCs, Dist, []),
+	    [BaseCs2]
+    end.
+
+set_frag_nodes(NR, ND, NDO, Cs, [Head | Tail], Acc) when NR > 0 ->
+    Pos = #cstruct.ram_copies,
+    {Cs2, Head2} = set_frag_node(Cs, Pos, Head),
+    set_frag_nodes(NR - 1, ND, NDO, Cs2, Tail, [Head2 | Acc]);
+set_frag_nodes(NR, ND, NDO, Cs, [Head | Tail], Acc) when ND > 0 ->
+    Pos = #cstruct.disc_copies,
+    {Cs2, Head2} = set_frag_node(Cs, Pos, Head),
+    set_frag_nodes(NR, ND - 1, NDO, Cs2, Tail, [Head2 | Acc]);
+set_frag_nodes(NR, ND, NDO, Cs, [Head | Tail], Acc) when NDO > 0 ->
+    Pos = #cstruct.disc_only_copies,
+    {Cs2, Head2} = set_frag_node(Cs, Pos, Head),
+    set_frag_nodes(NR, ND, NDO - 1, Cs2, Tail, [Head2 | Acc]);
+set_frag_nodes(0, 0, 0, Cs, RestDist, ModDist) ->
+    {Cs, ModDist, RestDist};
+set_frag_nodes(_, _, _, Cs, [], _) ->
+    mnesia:abort({combine_error,  Cs#cstruct.name, "Too few nodes in node_pool"}).
+
+set_frag_node(Cs, Pos, Head) ->
+    Ns = element(Pos, Cs),
+    {Node, Count2} =
+	case Head of
+	    {N, Count} when atom(N), integer(Count), Count >= 0 ->
+		{N, Count + 1};
+	    N when atom(N) ->
+		{N, 1};
+	    BadNode ->
+		mnesia:abort({bad_type, Cs#cstruct.name, BadNode})
+	end,
+    Cs2 = setelement(Pos, Cs, [Node | Ns]),
+    {Cs2, {Node, Count2}}.
+
+rearrange_dist(Cs, [{Node, Count} | ModDist], Dist, Pool) ->
+    Dist2 = insert_dist(Cs, Node, Count, Dist, Pool),
+    rearrange_dist(Cs, ModDist, Dist2, Pool);
+rearrange_dist(_Cs, [], Dist, _) ->
+    Dist.
+
+insert_dist(Cs, Node, Count, [Head | Tail], Pool) ->
+    case Head of
+	{Node2, Count2} when atom(Node2), integer(Count2), Count2 >= 0 ->
+	    case node_diff(Node, Count, Node2, Count2, Pool) of
+		less ->
+		    [{Node, Count}, Head | Tail];
+		greater ->
+		    [Head | insert_dist(Cs, Node, Count, Tail, Pool)]
+	    end;
+	Node2 when atom(Node2) ->
+	    insert_dist(Cs, Node, Count, [{Node2, 0} | Tail], Pool);
+	BadNode ->
+	    mnesia:abort({bad_type, Cs#cstruct.name, BadNode})
+    end;
+insert_dist(_Cs, Node, Count, [], _Pool) ->
+    [{Node, Count}];
+insert_dist(_Cs, _Node, _Count, Dist, _Pool) ->
+    mnesia:abort({bad_type, Dist}).
+
+node_diff(_Node, Count, _Node2, Count2, _Pool) when Count < Count2 ->
+    less;
+node_diff(Node, Count, Node2, Count2, Pool) when Count == Count2 ->
+    Pos = list_pos(Node, Pool, 1),
+    Pos2 = list_pos(Node2, Pool, 1),
+    if
+	Pos < Pos2 ->
+	    less;
+	Pos > Pos2 ->
+	    greater
+    end;
+node_diff(_Node, Count, _Node2, Count2, _Pool) when Count > Count2 ->
+    greater.
+
+%% Returns position of element in list
+list_pos(H,  [H | _T], Pos) ->
+    Pos;
+list_pos(E,  [_H | T], Pos) ->
+    list_pos(E,  T, Pos + 1).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Switch function for changing of table fragmentation
+%%
+%% Returns a list of lists of schema ops
+
+change_table_frag(Tab, {activate, FragProps}) ->
+    make_activate(Tab, FragProps);
+change_table_frag(Tab, deactivate) ->
+    make_deactivate(Tab);
+change_table_frag(Tab,  {add_frag, SortedNodes}) ->
+    make_multi_add_frag(Tab, SortedNodes);
+change_table_frag(Tab,  del_frag) ->
+    make_multi_del_frag(Tab);
+change_table_frag(Tab,  {add_node, Node}) ->
+    make_multi_add_node(Tab, Node);
+change_table_frag(Tab,  {del_node, Node}) ->
+    make_multi_del_node(Tab, Node);
+change_table_frag(Tab,  Change) ->
+    mnesia:abort({bad_type, Tab, Change}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Turn a normal table into a fragmented table
+%%
+%% The storage type must be the same on all nodes
+
+make_activate(Tab, Props) ->
+    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
+    mnesia_schema:ensure_active(Cs),
+    case Cs#cstruct.frag_properties of
+	[] ->
+	    Cs2 = Cs#cstruct{frag_properties = Props},
+	    [Cs3] = expand_cstruct(Cs2, activate),
+	    TabDef = mnesia_schema:cs2list(Cs3),
+	    Op = {op, change_table_frag, activate, TabDef},
+	    [[Op]];
+	BadProps ->
+	    mnesia:abort({already_exists, Tab, {frag_properties, BadProps}})
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Turn a table into a normal defragmented table
+
+make_deactivate(Tab) ->
+    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
+    mnesia_schema:ensure_active(Cs),
+    Foreigners = lookup_foreigners(Tab),
+    BaseTab = lookup_prop(Tab, base_table),
+    FH = lookup_frag_hash(Tab),
+    if
+	BaseTab /= Tab ->
+	    mnesia:abort({combine_error, Tab, "Not a base table"});
+	Foreigners /= [] ->
+	    mnesia:abort({combine_error, Tab, "Too many foreigners", Foreigners});
+	FH#frag_state.n_fragments > 1 ->
+	    mnesia:abort({combine_error, Tab, "Too many fragments"});
+	true ->
+	    Cs2 = Cs#cstruct{frag_properties = []},
+	    TabDef = mnesia_schema:cs2list(Cs2),
+	    Op = {op, change_table_frag, deactivate, TabDef},
+	    [[Op]]
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Add a fragment to a fragmented table  and fill it with half of
+%% the records from one of the old fragments
+
+make_multi_add_frag(Tab, SortedNs) when list(SortedNs) ->
+    verify_multi(Tab),
+    Ops = make_add_frag(Tab, SortedNs),
+
+    %% Propagate to foreigners
+    MoreOps = [make_add_frag(T, SortedNs) || T <- lookup_foreigners(Tab)],
+    [Ops | MoreOps];
+make_multi_add_frag(Tab, SortedNs) ->
+    mnesia:abort({bad_type, Tab, SortedNs}).
+
+verify_multi(Tab) ->
+    FH = lookup_frag_hash(Tab),
+    ForeignKey = FH#frag_state.foreign_key,
+    mnesia_schema:verify(undefined, ForeignKey,
+			 {combine_error, Tab,
+			  "Op only allowed via foreign table",
+			  {foreign_key, ForeignKey}}).
+
+make_frag_names_and_acquire_locks(Tab, N, FragIndecies, DoNotLockN) ->
+    mnesia_schema:get_tid_ts_and_lock(Tab, write),
+    Fun = fun(Index, FN) ->
+		  if
+		      DoNotLockN == true, Index == N ->
+			  Name = n_to_frag_name(Tab, Index),
+			  setelement(Index, FN, Name);
+		      true ->
+			  Name = n_to_frag_name(Tab, Index),
+			  mnesia_schema:get_tid_ts_and_lock(Name, write),
+			  setelement(Index , FN, Name)
+		  end
+	  end,
+    FragNames = erlang:make_tuple(N, undefined),
+    lists:foldl(Fun, FragNames, FragIndecies).
+
+make_add_frag(Tab, SortedNs) ->
+    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
+    mnesia_schema:ensure_active(Cs),
+    FH = lookup_frag_hash(Tab),
+    {FH2, FromIndecies, WriteIndecies} = adjust_before_split(FH),
+    N = FH2#frag_state.n_fragments,
+    FragNames = make_frag_names_and_acquire_locks(Tab, N, WriteIndecies, true),
+    NewFrag = element(N, FragNames),
+
+    NR = length(Cs#cstruct.ram_copies),
+    ND = length(Cs#cstruct.disc_copies),
+    NDO = length(Cs#cstruct.disc_only_copies),
+    NewCs = Cs#cstruct{name = NewFrag,
+		       frag_properties = [{base_table, Tab}],
+		       ram_copies = [],
+		       disc_copies = [],
+		       disc_only_copies = []},
+    {NewCs2, _, _} = set_frag_nodes(NR, ND, NDO, NewCs, SortedNs, []),
+    [NewOp] = mnesia_schema:make_create_table(NewCs2),
+
+    SplitOps = split(Tab, FH2, FromIndecies, FragNames, []),
+
+    Cs2 = replace_frag_hash(Cs, FH2),
+    TabDef = mnesia_schema:cs2list(Cs2),
+    BaseOp = {op, change_table_frag, {add_frag, SortedNs}, TabDef},
+
+    [BaseOp, NewOp | SplitOps].
+
+replace_frag_hash(Cs, FH) when record(FH, frag_state) ->
+    Fun = fun(Prop) ->
+		  case Prop of
+		      {n_fragments, _} ->
+			  {true, {n_fragments, FH#frag_state.n_fragments}};
+		      {hash_module, _} ->
+			  {true, {hash_module, FH#frag_state.hash_module}};
+		      {hash_state, _} ->
+			  {true, {hash_state, FH#frag_state.hash_state}};
+		      {next_n_to_split, _} ->
+			  false;
+		      {n_doubles, _} ->
+			  false;
+		      _ ->
+			  true
+		  end
+	  end,
+    Props = lists:zf(Fun, Cs#cstruct.frag_properties),
+    Cs#cstruct{frag_properties = Props}.
+
+%% Adjust table info before split
+adjust_before_split(FH) ->
+    HashState = FH#frag_state.hash_state,
+    {HashState2, FromFrags, AdditionalWriteFrags} =
+	case FH#frag_state.hash_module of
+	    HashMod when HashMod == ?DEFAULT_HASH_MOD ->
+		?DEFAULT_HASH_MOD:add_frag(HashState);
+	    HashMod ->
+		HashMod:add_frag(HashState)
+	end,
+    N = FH#frag_state.n_fragments + 1,
+    FromFrags2 = (catch lists:sort(FromFrags)),
+    UnionFrags = (catch lists:merge(FromFrags2, lists:sort(AdditionalWriteFrags))),
+    VerifyFun = fun(F) when integer(F), F >= 1, F =< N -> false;
+		   (_F) -> true
+		end,
+    case catch lists:filter(VerifyFun, UnionFrags) of
+	[] ->
+	    FH2 = FH#frag_state{n_fragments = N,
+				hash_state  = HashState2},
+	    {FH2, FromFrags2, UnionFrags};
+	BadFrags ->
+	    mnesia:abort({"add_frag: Fragment numbers out of range",
+			  BadFrags, {range, 1, N}})
+    end.
+
+split(Tab, FH, [SplitN | SplitNs], FragNames, Ops) ->
+    SplitFrag = element(SplitN, FragNames),
+    Pat = mnesia:table_info(SplitFrag, wild_pattern),
+    {_Mod, Tid, Ts} = mnesia_schema:get_tid_ts_and_lock(Tab, none),
+    Recs = mnesia:match_object(Tid, Ts, SplitFrag, Pat, read),
+    Ops2 = do_split(FH, SplitN, FragNames, Recs, Ops),
+    split(Tab, FH, SplitNs, FragNames, Ops2);
+split(_Tab, _FH, [], _FragNames, Ops) ->
+    Ops.
+
+%% Perform the split of the table
+do_split(FH, OldN, FragNames, [Rec | Recs], Ops) ->
+    Pos = key_pos(FH),
+    HashKey = element(Pos, Rec),
+    case key_to_n(FH, HashKey) of
+	NewN when NewN == OldN ->
+	    %% Keep record in the same fragment. No need to move it.
+	    do_split(FH, OldN, FragNames, Recs, Ops);
+	NewN ->
+	    case element(NewN, FragNames) of
+		NewFrag when NewFrag /= undefined ->
+		    OldFrag = element(OldN, FragNames),
+		    Key = element(2, Rec),
+		    NewOid = {NewFrag, Key},
+		    OldOid = {OldFrag, Key},
+		    Ops2 = [{op, rec, unknown, {NewOid, [Rec], write}},
+			    {op, rec, unknown, {OldOid, [OldOid], delete}} | Ops],
+		    do_split(FH, OldN, FragNames, Recs, Ops2);
+		_NewFrag ->
+		    %% Tried to move record to fragment that not is locked
+		    mnesia:abort({"add_frag: Fragment not locked", NewN})
+	    end
+    end;
+do_split(_FH, _OldN, _FragNames, [], Ops) ->
+    Ops.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Delete a fragment from a fragmented table
+%% and merge its records with an other fragment
+
+make_multi_del_frag(Tab) ->
+    verify_multi(Tab),
+    Ops = make_del_frag(Tab),
+
+    %% Propagate to foreigners
+    MoreOps = [make_del_frag(T) || T <- lookup_foreigners(Tab)],
+    [Ops | MoreOps].
+
+make_del_frag(Tab) ->
+    FH = lookup_frag_hash(Tab),
+    case FH#frag_state.n_fragments of
+	N when N > 1 ->
+	    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
+	    mnesia_schema:ensure_active(Cs),
+	    {FH2, FromIndecies, WriteIndecies} = adjust_before_merge(FH),
+	    FragNames = make_frag_names_and_acquire_locks(Tab, N, WriteIndecies, false),
+
+	    MergeOps = merge(Tab, FH2, FromIndecies, FragNames, []),
+	    LastFrag = element(N, FragNames),
+	    [LastOp] = mnesia_schema:make_delete_table(LastFrag, single_frag),
+	    Cs2 = replace_frag_hash(Cs, FH2),
+	    TabDef = mnesia_schema:cs2list(Cs2),
+	    BaseOp = {op, change_table_frag, del_frag, TabDef},
+	    [BaseOp, LastOp | MergeOps];
+	_ ->
+	    %% Cannot remove the last fragment
+	    mnesia:abort({no_exists, Tab})
+    end.
+
+%% Adjust tab info before merge
+adjust_before_merge(FH) ->
+    HashState = FH#frag_state.hash_state,
+    {HashState2, FromFrags, AdditionalWriteFrags} =
+	case FH#frag_state.hash_module of
+	    HashMod when HashMod == ?DEFAULT_HASH_MOD ->
+		?DEFAULT_HASH_MOD:del_frag(HashState);
+	    HashMod ->
+		HashMod:del_frag(HashState)
+	end,
+    N = FH#frag_state.n_fragments,
+    FromFrags2 = (catch lists:sort(FromFrags)),
+    UnionFrags = (catch lists:merge(FromFrags2, lists:sort(AdditionalWriteFrags))),
+    VerifyFun = fun(F) when integer(F), F >= 1, F =< N -> false;
+		   (_F) -> true
+		end,
+    case catch lists:filter(VerifyFun, UnionFrags) of
+	[] ->
+	    case lists:member(N, FromFrags2) of
+		true ->
+		    FH2 = FH#frag_state{n_fragments = N - 1,
+					hash_state  = HashState2},
+		    {FH2, FromFrags2, UnionFrags};
+		false ->
+		    mnesia:abort({"del_frag: Last fragment number not included", N})
+	    end;
+	BadFrags ->
+	    mnesia:abort({"del_frag: Fragment numbers out of range",
+			  BadFrags, {range, 1, N}})
+    end.
+
+merge(Tab, FH, [FromN | FromNs], FragNames, Ops) ->
+    FromFrag = element(FromN, FragNames),
+    Pat = mnesia:table_info(FromFrag, wild_pattern),
+    {_Mod, Tid, Ts} = mnesia_schema:get_tid_ts_and_lock(Tab, none),
+    Recs = mnesia:match_object(Tid, Ts, FromFrag, Pat, read),
+    Ops2 = do_merge(FH, FromN, FragNames, Recs, Ops),
+    merge(Tab, FH, FromNs, FragNames, Ops2);
+merge(_Tab, _FH, [], _FragNames, Ops) ->
+    Ops.
+
+%% Perform the merge of the table
+do_merge(FH, OldN, FragNames, [Rec | Recs], Ops) ->
+    Pos = key_pos(FH),
+    LastN = FH#frag_state.n_fragments + 1,
+    HashKey = element(Pos, Rec),
+    case key_to_n(FH, HashKey) of
+	NewN when NewN == LastN ->
+	    %% Tried to leave a record in the fragment that is to be deleted
+	    mnesia:abort({"del_frag: Fragment number out of range",
+			  NewN, {range, 1, LastN}});
+	NewN when NewN == OldN ->
+	    %% Keep record in the same fragment. No need to move it.
+	    do_merge(FH, OldN, FragNames, Recs, Ops);
+	NewN when OldN == LastN ->
+	    %% Move record from the fragment that is to be deleted
+	    %% No need to create a delete op for each record.
+	    case element(NewN, FragNames) of
+		NewFrag when NewFrag /= undefined ->
+		    Key = element(2, Rec),
+		    NewOid = {NewFrag, Key},
+		    Ops2 = [{op, rec, unknown, {NewOid, [Rec], write}} | Ops],
+		    do_merge(FH, OldN, FragNames, Recs, Ops2);
+		_NewFrag ->
+		    %% Tried to move record to fragment that not is locked
+		    mnesia:abort({"del_frag: Fragment not locked", NewN})
+	    end;
+	NewN ->
+	    case element(NewN, FragNames) of
+		NewFrag when NewFrag /= undefined ->
+		    OldFrag = element(OldN, FragNames),
+		    Key = element(2, Rec),
+		    NewOid = {NewFrag, Key},
+		    OldOid = {OldFrag, Key},
+		    Ops2 = [{op, rec, unknown, {NewOid, [Rec], write}},
+			    {op, rec, unknown, {OldOid, [OldOid], delete}} | Ops],
+		    do_merge(FH, OldN, FragNames, Recs, Ops2);
+		_NewFrag ->
+		    %% Tried to move record to fragment that not is locked
+		    mnesia:abort({"del_frag: Fragment not locked", NewN})
+	    end
+    end;
+ do_merge(_FH, _OldN, _FragNames, [], Ops) ->
+   Ops.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Add a node to the node pool of a fragmented table
+
+make_multi_add_node(Tab, Node)  ->
+    verify_multi(Tab),
+    Ops = make_add_node(Tab, Node),
+
+    %% Propagate to foreigners
+    MoreOps = [make_add_node(T, Node) || T <- lookup_foreigners(Tab)],
+    [Ops | MoreOps].
+
+make_add_node(Tab, Node) when atom(Node)  ->
+    Pool = lookup_prop(Tab, node_pool),
+    case lists:member(Node, Pool) of
+	false ->
+	    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
+	    Pool2 = Pool ++ [Node],
+	    Props = Cs#cstruct.frag_properties,
+	    Props2 = lists:keyreplace(node_pool, 1, Props, {node_pool, Pool2}),
+	    Cs2 = Cs#cstruct{frag_properties = Props2},
+	    TabDef = mnesia_schema:cs2list(Cs2),
+	    Op = {op, change_table_frag, {add_node, Node}, TabDef},
+	    [Op];
+	true ->
+	    mnesia:abort({already_exists, Tab, Node})
+    end;
+make_add_node(Tab, Node) ->
+    mnesia:abort({bad_type, Tab, Node}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Delet a node from the node pool of a fragmented table
+
+make_multi_del_node(Tab, Node)  ->
+    verify_multi(Tab),
+    Ops = make_del_node(Tab, Node),
+
+    %% Propagate to foreigners
+    MoreOps = [make_del_node(T, Node) || T <- lookup_foreigners(Tab)],
+    [Ops | MoreOps].
+
+make_del_node(Tab, Node) when atom(Node) ->
+    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
+    mnesia_schema:ensure_active(Cs),
+    Pool = lookup_prop(Tab, node_pool),
+    case lists:member(Node, Pool) of
+	true ->
+	    Pool2 = Pool -- [Node],
+	    Props = lists:keyreplace(node_pool, 1, Cs#cstruct.frag_properties, {node_pool, Pool2}),
+	    Cs2 = Cs#cstruct{frag_properties = Props},
+	    TabDef = mnesia_schema:cs2list(Cs2),
+	    Op = {op, change_table_frag, {del_node, Node}, TabDef},
+	    [Op];
+	false ->
+	    mnesia:abort({no_exists, Tab, Node})
+    end;
+make_del_node(Tab, Node) ->
+    mnesia:abort({bad_type, Tab, Node}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Special case used to remove all references to a node during
+%% mnesia:del_table_copy(schema, Node)
+
+remove_node(Node, Cs) ->
+    Tab = Cs#cstruct.name,
+    case is_top_frag(Tab) of
+	false ->
+	    {Cs, false};
+	true ->
+	    Pool = lookup_prop(Tab, node_pool),
+	    case lists:member(Node, Pool) of
+		true ->
+		    Pool2 = Pool -- [Node],
+		    Props = lists:keyreplace(node_pool, 1,
+					     Cs#cstruct.frag_properties,
+					     {node_pool, Pool2}),
+		    {Cs#cstruct{frag_properties = Props}, true};
+		false ->
+		    {Cs, false}
+	    end
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Helpers
+
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason);
+	Value -> Value
+    end.
+
+set_frag_hash(Tab, Props) ->
+    case props_to_frag_hash(Tab, Props) of
+	FH when record(FH, frag_state) ->
+	    mnesia_lib:set({Tab, frag_hash}, FH);
+	no_hash ->
+	    mnesia_lib:unset({Tab, frag_hash})
+    end.
+
+props_to_frag_hash(_Tab, []) ->
+    no_hash;
+props_to_frag_hash(Tab, Props) ->
+    case mnesia_schema:pick(Tab, base_table, Props, undefined) of
+	T when T == Tab ->
+	    Foreign = mnesia_schema:pick(Tab, foreign_key, Props, must),
+	    N = mnesia_schema:pick(Tab, n_fragments, Props, must),
+
+	    case mnesia_schema:pick(Tab, hash_module, Props, undefined) of
+		undefined ->
+		    Split = mnesia_schema:pick(Tab, next_n_to_split, Props, must),
+		    Doubles = mnesia_schema:pick(Tab, n_doubles, Props, must),
+		    FH = {frag_hash, Foreign, N, Split, Doubles},
+		    HashState = ?OLD_HASH_MOD:init_state(Tab, FH),
+		    #frag_state{foreign_key = Foreign,
+				n_fragments = N,
+				hash_module = ?OLD_HASH_MOD,
+				hash_state  = HashState};
+		HashMod ->
+		    HashState = mnesia_schema:pick(Tab, hash_state, Props, must),
+		    #frag_state{foreign_key = Foreign,
+				n_fragments = N,
+				hash_module = HashMod,
+				hash_state  = HashState}
+		    %% Old style. Kept for backwards compatibility.
+	    end;
+	_ ->
+	    no_hash
+    end.
+
+lookup_prop(Tab, Prop) ->
+    Props = val({Tab, frag_properties}),
+    case lists:keysearch(Prop, 1,  Props) of
+	{value, {Prop, Val}} ->
+	    Val;
+	false ->
+	    mnesia:abort({no_exists, Tab, Prop, {frag_properties, Props}})
+    end.
+
+lookup_frag_hash(Tab) ->
+    case ?catch_val({Tab, frag_hash}) of
+	FH when record(FH, frag_state) ->
+	    FH;
+	{frag_hash, K, N, _S, _D} = FH ->
+	    %% Old style. Kept for backwards compatibility.
+	    HashState = ?OLD_HASH_MOD:init_state(Tab, FH),
+	    #frag_state{foreign_key = K,
+			n_fragments = N,
+			hash_module = ?OLD_HASH_MOD,
+			hash_state  = HashState};
+	{'EXIT', _} ->
+	    mnesia:abort({no_exists, Tab, frag_properties, frag_hash})
+    end.
+
+is_top_frag(Tab) ->
+    case ?catch_val({Tab, frag_hash}) of
+	{'EXIT', _} ->
+	    false;
+	_ ->
+	    [] == lookup_foreigners(Tab)
+    end.
+
+%% Returns a list of tables
+lookup_foreigners(Tab) ->
+    %% First field in HashPat is either frag_hash or frag_state
+    HashPat = {'_', {Tab, '_'}, '_', '_', '_'},
+    [T || [T] <- ?ets_match(mnesia_gvar, {{'$1', frag_hash}, HashPat})].
+
+%% Returns name of fragment table
+record_to_frag_name(Tab, Rec) ->
+    case ?catch_val({Tab, frag_hash}) of
+	{'EXIT', _} ->
+	    Tab;
+	FH ->
+	    Pos = key_pos(FH),
+	    Key = element(Pos, Rec),
+	    N = key_to_n(FH, Key),
+	    n_to_frag_name(Tab, N)
+    end.
+
+key_pos(FH) ->
+    case FH#frag_state.foreign_key of
+	undefined ->
+	    2;
+	{_ForeignTab, Pos} ->
+	    Pos
+    end.
+
+%% Returns name of fragment table
+key_to_frag_name({BaseTab, _} = Tab, Key) ->
+    N = key_to_frag_number(Tab, Key),
+    n_to_frag_name(BaseTab, N);
+key_to_frag_name(Tab, Key) ->
+    N = key_to_frag_number(Tab, Key),
+    n_to_frag_name(Tab, N).
+
+%% Returns name of fragment table
+n_to_frag_name(Tab, 1) ->
+    Tab;
+n_to_frag_name(Tab, N) when atom(Tab), integer(N) ->
+    list_to_atom(atom_to_list(Tab) ++ "_frag" ++ integer_to_list(N));
+n_to_frag_name(Tab, N) ->
+    mnesia:abort({bad_type, Tab, N}).
+
+%% Returns name of fragment table
+key_to_frag_number({Tab, ForeignKey}, _Key) ->
+    FH = val({Tab, frag_hash}),
+    case FH#frag_state.foreign_key of
+	{_ForeignTab, _Pos} ->
+	    key_to_n(FH, ForeignKey);
+	undefined ->
+	    mnesia:abort({combine_error, Tab, frag_properties,
+			  {foreign_key, undefined}})
+    end;
+key_to_frag_number(Tab, Key) ->
+    case ?catch_val({Tab, frag_hash}) of
+	{'EXIT', _} ->
+	    1;
+	FH ->
+	    key_to_n(FH, Key)
+    end.
+
+%% Returns fragment number
+key_to_n(FH, Key) ->
+    HashState = FH#frag_state.hash_state,
+    N =
+	case FH#frag_state.hash_module of
+	    HashMod when HashMod == ?DEFAULT_HASH_MOD ->
+		?DEFAULT_HASH_MOD:key_to_frag_number(HashState, Key);
+	    HashMod ->
+		HashMod:key_to_frag_number(HashState, Key)
+	end,
+    if
+	integer(N), N >= 1, N =< FH#frag_state.n_fragments ->
+	    N;
+	true ->
+	    mnesia:abort({"key_to_frag_number: Fragment number out of range",
+			  N, {range, 1, FH#frag_state.n_fragments}})
+    end.
+
+%% Returns a list of frament table names
+frag_names(Tab) ->
+    case ?catch_val({Tab, frag_hash}) of
+	{'EXIT', _} ->
+	    [Tab];
+	FH ->
+	    N = FH#frag_state.n_fragments,
+	    frag_names(Tab, N, [])
+    end.
+
+frag_names(Tab, 1, Acc) ->
+    [Tab | Acc];
+frag_names(Tab, N, Acc) ->
+    Frag = n_to_frag_name(Tab, N),
+    frag_names(Tab, N - 1, [Frag | Acc]).
+
+%% Returns a list of {Node, FragCount} tuples
+%% sorted on FragCounts
+frag_dist(Tab) ->
+    Pool = lookup_prop(Tab, node_pool),
+    Dist = [{good, Node, 0} || Node <- Pool],
+    Dist2 = count_frag(frag_names(Tab), Dist),
+    sort_dist(Dist2).
+
+count_frag([Frag | Frags], Dist) ->
+    Dist2 =  incr_nodes(val({Frag, ram_copies}), Dist),
+    Dist3 =  incr_nodes(val({Frag, disc_copies}), Dist2),
+    Dist4 =  incr_nodes(val({Frag, disc_only_copies}), Dist3),
+    count_frag(Frags, Dist4);
+count_frag([], Dist) ->
+    Dist.
+
+incr_nodes([Node | Nodes], Dist) ->
+    Dist2 = incr_node(Node, Dist),
+    incr_nodes(Nodes, Dist2);
+incr_nodes([], Dist) ->
+    Dist.
+
+incr_node(Node, [{Kind, Node, Count} | Tail]) ->
+    [{Kind, Node, Count + 1} | Tail];
+incr_node(Node, [Head | Tail]) ->
+    [Head | incr_node(Node, Tail)];
+incr_node(Node, []) ->
+    [{bad, Node, 1}].
+
+%% Sorts dist according in decreasing count order
+sort_dist(Dist) ->
+    Dist2 = deep_dist(Dist, []),
+    Dist3 = lists:keysort(1, Dist2),
+    shallow_dist(Dist3).
+
+deep_dist([Head | Tail], Deep) ->
+    {Kind, _Node, Count} = Head,
+    {Tag, Same, Other} = pick_count(Kind, Count, [Head | Tail]),
+    deep_dist(Other, [{Tag, Same} | Deep]);
+deep_dist([], Deep) ->
+    Deep.
+
+pick_count(Kind, Count, [{Kind2, Node2, Count2} | Tail]) ->
+    Head = {Node2, Count2},
+    {_, Same, Other} = pick_count(Kind, Count, Tail),
+    if
+	Kind == bad ->
+	    {bad, [Head | Same], Other};
+	Kind2 == bad ->
+	    {Count, Same, [{Kind2, Node2, Count2} | Other]};
+	Count == Count2 ->
+	    {Count, [Head | Same], Other};
+	true ->
+	    {Count, Same, [{Kind2, Node2, Count2} | Other]}
+    end;
+pick_count(_Kind, Count, []) ->
+    {Count, [], []}.
+
+shallow_dist([{_Tag, Shallow} | Deep]) ->
+    Shallow ++ shallow_dist(Deep);
+shallow_dist([]) ->
+    [].
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_frag_hash.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_frag_hash.erl
new file mode 100644
index 0000000000..591f2ce9c8
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_frag_hash.erl
@@ -0,0 +1,118 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_frag_hash.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
+%%
+%%%----------------------------------------------------------------------
+%%% Purpose : Implements hashing functionality for fragmented tables
+%%%----------------------------------------------------------------------
+
+%header_doc_include
+-module(mnesia_frag_hash).
+-behaviour(mnesia_frag_hash).
+
+%% Fragmented Table Hashing callback functions
+-export([
+	 init_state/2,
+	 add_frag/1,
+	 del_frag/1,
+	 key_to_frag_number/2,
+	 match_spec_to_frag_numbers/2
+	]).
+
+%header_doc_include
+
+%impl_doc_include
+-record(hash_state, {n_fragments, next_n_to_split, n_doubles}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init_state(_Tab, State) when State == undefined ->
+    #hash_state{n_fragments = 1,
+		next_n_to_split = 1,
+		n_doubles = 0}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+add_frag(State) when record(State, hash_state) ->
+    SplitN = State#hash_state.next_n_to_split,
+    P = SplitN + 1,
+    L = State#hash_state.n_doubles,
+    NewN = State#hash_state.n_fragments + 1,
+    State2 = case trunc(math:pow(2, L)) + 1 of
+		 P2 when P2 == P ->
+		     State#hash_state{n_fragments = NewN,
+				      n_doubles = L + 1,
+				      next_n_to_split = 1};
+		 _ ->
+		     State#hash_state{n_fragments = NewN,
+				      next_n_to_split = P}
+	     end,
+    {State2, [SplitN], [NewN]}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+del_frag(State) when record(State, hash_state) ->
+    P = State#hash_state.next_n_to_split - 1,
+    L = State#hash_state.n_doubles,
+    N = State#hash_state.n_fragments,
+    if
+	P < 1 ->
+	    L2 = L - 1,
+	    MergeN = trunc(math:pow(2, L2)),
+	    State2 = State#hash_state{n_fragments = N - 1,
+				      next_n_to_split = MergeN,
+				      n_doubles = L2},
+	    {State2, [N], [MergeN]};
+	true ->
+	    MergeN = P,
+	    State2 = State#hash_state{n_fragments = N - 1,
+				      next_n_to_split = MergeN},
+	    {State2, [N], [MergeN]}
+	end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+key_to_frag_number(State, Key) when record(State, hash_state) ->
+    L = State#hash_state.n_doubles,
+    A = erlang:phash(Key, trunc(math:pow(2, L))),
+    P = State#hash_state.next_n_to_split,
+    if
+	A < P ->
+	    erlang:phash(Key, trunc(math:pow(2, L + 1)));
+	true ->
+	    A
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+match_spec_to_frag_numbers(State, MatchSpec) when record(State, hash_state) ->
+    case MatchSpec of
+	[{HeadPat, _, _}] when tuple(HeadPat), size(HeadPat) > 2 ->
+	    KeyPat = element(2, HeadPat),
+	    case has_var(KeyPat) of
+		false ->
+		    [key_to_frag_number(State, KeyPat)];
+		true ->
+		    lists:seq(1, State#hash_state.n_fragments)
+	    end;
+	_ ->
+	    lists:seq(1, State#hash_state.n_fragments)
+    end.
+
+%impl_doc_include
+
+has_var(Pat) ->
+    mnesia:has_var(Pat).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_frag_old_hash.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_frag_old_hash.erl
new file mode 100644
index 0000000000..8dc128a42e
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_frag_old_hash.erl
@@ -0,0 +1,127 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_frag_old_hash.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
+%%
+%%%----------------------------------------------------------------------
+%%% Purpose : Implements hashing functionality for fragmented tables
+%%%----------------------------------------------------------------------
+
+-module(mnesia_frag_old_hash).
+-behaviour(mnesia_frag_hash).
+
+%% Hashing callback functions
+-export([
+	 init_state/2,
+	 add_frag/1,
+	 del_frag/1,
+	 key_to_frag_number/2,
+	 match_spec_to_frag_numbers/2
+	]).
+
+-record(old_hash_state,
+	{n_fragments,
+	 next_n_to_split,
+	 n_doubles}).
+
+%% Old style. Kept for backwards compatibility.
+-record(frag_hash,
+	{foreign_key,
+	 n_fragments,
+	 next_n_to_split,
+	 n_doubles}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init_state(_Tab, InitialState) when InitialState == undefined ->
+    #old_hash_state{n_fragments     = 1,
+		    next_n_to_split = 1,
+		    n_doubles       = 0};
+init_state(_Tab, FH) when record(FH, frag_hash) ->
+    %% Old style. Kept for backwards compatibility.
+    #old_hash_state{n_fragments     = FH#frag_hash.n_fragments,
+		    next_n_to_split = FH#frag_hash.next_n_to_split,
+		    n_doubles       = FH#frag_hash.n_doubles}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+add_frag(State) when record(State, old_hash_state) ->
+    SplitN = State#old_hash_state.next_n_to_split,
+    P = SplitN + 1,
+    L = State#old_hash_state.n_doubles,
+    NewN = State#old_hash_state.n_fragments + 1,
+    State2 = case trunc(math:pow(2, L)) + 1 of
+		 P2 when P2 == P ->
+		     State#old_hash_state{n_fragments = NewN,
+					  next_n_to_split = 1,
+					  n_doubles = L + 1};
+		 _ ->
+		     State#old_hash_state{n_fragments = NewN,
+					  next_n_to_split = P}
+	     end,
+    {State2, [SplitN], [NewN]}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+del_frag(State) when record(State, old_hash_state) ->
+    P = State#old_hash_state.next_n_to_split - 1,
+    L = State#old_hash_state.n_doubles,
+    N = State#old_hash_state.n_fragments,
+    if
+	P < 1 ->
+	    L2 = L - 1,
+	    MergeN = trunc(math:pow(2, L2)),
+	    State2 = State#old_hash_state{n_fragments = N - 1,
+					  next_n_to_split = MergeN,
+					  n_doubles = L2},
+	    {State2, [N], [MergeN]};
+	true ->
+	    MergeN = P,
+	    State2 = State#old_hash_state{n_fragments = N - 1,
+					  next_n_to_split = MergeN},
+	    {State2, [N], [MergeN]}
+	end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+key_to_frag_number(State, Key) when record(State, old_hash_state) ->
+    L = State#old_hash_state.n_doubles,
+    A = erlang:hash(Key, trunc(math:pow(2, L))),
+    P = State#old_hash_state.next_n_to_split,
+    if
+	A < P ->
+	    erlang:hash(Key, trunc(math:pow(2, L + 1)));
+	true ->
+	    A
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+match_spec_to_frag_numbers(State, MatchSpec) when record(State, old_hash_state) ->
+    case MatchSpec of
+	[{HeadPat, _, _}] when tuple(HeadPat), size(HeadPat) > 2 ->
+	    KeyPat = element(2, HeadPat),
+	    case has_var(KeyPat) of
+		false ->
+		    [key_to_frag_number(State, KeyPat)];
+		true ->
+		    lists:seq(1, State#old_hash_state.n_fragments)
+	    end;
+	_ ->
+	    lists:seq(1, State#old_hash_state.n_fragments)
+    end.
+
+has_var(Pat) ->
+    mnesia:has_var(Pat).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_index.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_index.erl
new file mode 100644
index 0000000000..650a2d1d3c
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_index.erl
@@ -0,0 +1,379 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_index.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
+%%
+%% Purpose: Handles index functionality in mnesia
+
+-module(mnesia_index).
+-export([read/5,
+	 add_index/5,
+	 delete_index/3,
+	 del_object_index/5,
+	 clear_index/4,
+	 dirty_match_object/3,
+	 dirty_select/3,
+	 dirty_read/3,
+	 dirty_read2/3,
+
+	 db_put/2,
+	 db_get/2,
+	 db_match_erase/2,
+	 get_index_table/2,
+	 get_index_table/3,
+
+	 tab2filename/2,
+	 tab2tmp_filename/2,
+	 init_index/2,
+	 init_indecies/3,
+	 del_transient/2,
+	 del_transient/3,
+	 del_index_table/3]).
+
+-import(mnesia_lib, [verbose/2]).
+-include("mnesia.hrl").
+
+-record(index, {setorbag, pos_list}).
+
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_);
+	_VaLuE_ -> _VaLuE_
+    end.
+
+%% read an object list throuh its index table
+%% we assume that table Tab has index on attribute number Pos
+
+read(Tid, Store, Tab, IxKey, Pos) ->
+    ResList = mnesia_locker:ixrlock(Tid, Store, Tab, IxKey, Pos),
+    %% Remove all tuples which don't include Ixkey, happens when Tab is a bag
+    case val({Tab, setorbag}) of
+	bag ->
+	    mnesia_lib:key_search_all(IxKey, Pos, ResList);
+	_ ->
+	    ResList
+    end.
+
+add_index(Index, Tab, Key, Obj, Old) ->
+    add_index2(Index#index.pos_list, Index#index.setorbag, Tab, Key, Obj, Old).
+
+add_index2([{Pos, Ixt} |Tail], bag, Tab, K, Obj, OldRecs) ->
+    db_put(Ixt, {element(Pos, Obj), K}),
+    add_index2(Tail, bag, Tab, K, Obj, OldRecs);
+add_index2([{Pos, Ixt} |Tail], Type, Tab, K, Obj, OldRecs) ->
+    %% Remove old tuples in index if Tab is updated
+    case OldRecs of
+	undefined ->
+	    Old = mnesia_lib:db_get(Tab, K),
+	    del_ixes(Ixt, Old, Pos, K);
+	Old ->
+	    del_ixes(Ixt, Old, Pos, K)
+    end,
+    db_put(Ixt, {element(Pos, Obj), K}),
+    add_index2(Tail, Type, Tab, K, Obj, OldRecs);
+add_index2([], _, _Tab, _K, _Obj, _) -> ok.
+
+delete_index(Index, Tab, K) ->
+    delete_index2(Index#index.pos_list, Tab, K).
+
+delete_index2([{Pos, Ixt} | Tail], Tab, K) ->
+    DelObjs = mnesia_lib:db_get(Tab, K),
+    del_ixes(Ixt, DelObjs, Pos, K),
+    delete_index2(Tail, Tab, K);
+delete_index2([], _Tab, _K) -> ok.
+
+
+del_ixes(_Ixt, [], _Pos, _L) -> ok;
+del_ixes(Ixt, [Obj | Tail], Pos, Key) ->
+    db_match_erase(Ixt, {element(Pos, Obj), Key}),
+    del_ixes(Ixt, Tail, Pos, Key).
+
+del_object_index(Index, Tab, K, Obj, Old) ->
+    del_object_index2(Index#index.pos_list, Index#index.setorbag, Tab, K, Obj, Old).
+
+del_object_index2([], _, _Tab, _K, _Obj, _Old) -> ok;
+del_object_index2([{Pos, Ixt} | Tail], SoB, Tab, K, Obj, Old) ->
+    case SoB of
+	bag ->
+	    del_object_bag(Tab, K, Obj, Pos, Ixt, Old);
+	_ -> %% If set remove the tuple in index table
+	    del_ixes(Ixt, [Obj], Pos, K)
+    end,
+    del_object_index2(Tail, SoB, Tab, K, Obj, Old).
+
+del_object_bag(Tab, Key, Obj, Pos, Ixt, undefined) ->
+    Old = mnesia_lib:db_get(Tab, Key),
+    del_object_bag(Tab, Key, Obj, Pos, Ixt, Old);
+%% If Tab type is bag we need remove index identifier if Tab
+%% contains less than 2 elements.
+del_object_bag(_Tab, Key, Obj, Pos, Ixt, Old) when length(Old) < 2 ->
+    del_ixes(Ixt, [Obj], Pos, Key);
+del_object_bag(_Tab, _Key, _Obj, _Pos, _Ixt, _Old) -> ok.
+
+clear_index(Index, Tab, K, Obj) ->
+    clear_index2(Index#index.pos_list, Tab, K, Obj).
+
+clear_index2([], _Tab, _K, _Obj) -> ok;
+clear_index2([{_Pos, Ixt} | Tail], Tab, K, Obj) ->
+    db_match_erase(Ixt, Obj),
+    clear_index2(Tail, Tab, K, Obj).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+dirty_match_object(Tab, Pat, Pos) ->
+    %% Assume that we are on the node where the replica is
+    case element(2, Pat) of
+	'_' ->
+	    IxKey = element(Pos, Pat),
+	    RealKeys = realkeys(Tab, Pos, IxKey),
+	    merge(RealKeys, Tab, Pat, []);
+	_Else ->
+	    mnesia_lib:db_match_object(Tab, Pat)
+    end.
+
+merge([{_IxKey, RealKey} | Tail], Tab, Pat, Ack) ->
+    %% Assume that we are on the node where the replica is
+    Pat2 = setelement(2, Pat, RealKey),
+    Recs = mnesia_lib:db_match_object(Tab, Pat2),
+    merge(Tail, Tab, Pat, Recs ++ Ack);
+merge([], _, _, Ack) ->
+    Ack.
+
+realkeys(Tab, Pos, IxKey) ->
+    Index = get_index_table(Tab, Pos),
+    db_get(Index, IxKey). % a list on the form [{IxKey, RealKey1} , ....
+
+dirty_select(Tab, Spec, Pos) ->
+    %% Assume that we are on the node where the replica is
+    %% Returns the records without applying the match spec
+    %% The actual filtering is handled by the caller
+    IxKey = element(Pos, Spec),
+    RealKeys = realkeys(Tab, Pos, IxKey),
+    StorageType = val({Tab, storage_type}),
+    lists:append([mnesia_lib:db_get(StorageType, Tab, Key) || Key <- RealKeys]).
+
+dirty_read(Tab, IxKey, Pos) ->
+    ResList = mnesia:dirty_rpc(Tab, ?MODULE, dirty_read2,
+			       [Tab, IxKey, Pos]),
+    case val({Tab, setorbag}) of
+	bag ->
+	    %% Remove all tuples which don't include Ixkey
+	    mnesia_lib:key_search_all(IxKey, Pos, ResList);
+	_ ->
+	    ResList
+    end.
+
+dirty_read2(Tab, IxKey, Pos) ->
+    Ix = get_index_table(Tab, Pos),
+    Keys = db_match(Ix, {IxKey, '$1'}),
+    r_keys(Keys, Tab, []).
+
+r_keys([[H]|T],Tab,Ack) ->
+    V = mnesia_lib:db_get(Tab, H),
+    r_keys(T, Tab, V ++ Ack);
+r_keys([], _, Ack) ->
+    Ack.
+
+
+%%%%%%% Creation, Init and deletion routines for index tables
+%% We can have several indexes on the same table
+%% this can be a fairly costly operation if table is *very* large
+
+tab2filename(Tab, Pos) ->
+    mnesia_lib:dir(Tab) ++ "_" ++ integer_to_list(Pos) ++ ".DAT".
+
+tab2tmp_filename(Tab, Pos) ->
+    mnesia_lib:dir(Tab) ++ "_" ++ integer_to_list(Pos) ++ ".TMP".
+
+init_index(Tab, Storage) ->
+    PosList = val({Tab, index}),
+    init_indecies(Tab, Storage, PosList).
+
+init_indecies(Tab, Storage, PosList) ->
+    case Storage of
+	unknown ->
+	    ignore;
+	disc_only_copies ->
+	    init_disc_index(Tab, PosList);
+	ram_copies ->
+	    make_ram_index(Tab, PosList);
+	disc_copies ->
+	    make_ram_index(Tab, PosList)
+    end.
+
+%% works for both ram and disc indexes
+
+del_index_table(_, unknown, _) ->
+    ignore;
+del_index_table(Tab, Storage, Pos) ->
+    delete_transient_index(Tab, Pos, Storage),
+    mnesia_lib:del({Tab, index}, Pos).
+
+del_transient(Tab, Storage) ->
+    PosList = val({Tab, index}),
+    del_transient(Tab, PosList, Storage).
+
+del_transient(_, [], _) -> done;
+del_transient(Tab, [Pos | Tail], Storage) ->
+    delete_transient_index(Tab, Pos, Storage),
+    del_transient(Tab, Tail, Storage).
+
+delete_transient_index(Tab, Pos, disc_only_copies) ->
+    Tag = {Tab, index, Pos},
+    mnesia_monitor:unsafe_close_dets(Tag),
+    file:delete(tab2filename(Tab, Pos)),
+    del_index_info(Tab, Pos), %% Uses val(..)
+    mnesia_lib:unset({Tab, {index, Pos}});
+
+delete_transient_index(Tab, Pos, _Storage) ->
+    Ixt = val({Tab, {index, Pos}}),
+    ?ets_delete_table(Ixt),
+    del_index_info(Tab, Pos),
+    mnesia_lib:unset({Tab, {index, Pos}}).
+
+%%%%% misc functions for the index create/init/delete functions above
+
+%% assuming that the file exists.
+init_disc_index(_Tab, []) ->
+    done;
+init_disc_index(Tab, [Pos | Tail]) when integer(Pos) ->
+    Fn = tab2filename(Tab, Pos),
+    IxTag = {Tab, index, Pos},
+    file:delete(Fn),
+    Args = [{file, Fn}, {keypos, 1}, {type, bag}],
+    mnesia_monitor:open_dets(IxTag, Args),
+    Storage = disc_only_copies,
+    Key = mnesia_lib:db_first(Storage, Tab),
+    Recs = mnesia_lib:db_get(Storage, Tab, Key),
+    BinSize = size(term_to_binary(Recs)),
+    KeysPerChunk = (4000 div BinSize) + 1,
+    Init = {start, KeysPerChunk},
+    mnesia_lib:db_fixtable(Storage, Tab, true),
+    ok = dets:init_table(IxTag, create_fun(Init, Tab, Pos)),
+    mnesia_lib:db_fixtable(Storage, Tab, false),
+    mnesia_lib:set({Tab, {index, Pos}}, IxTag),
+    add_index_info(Tab, val({Tab, setorbag}), {Pos, {dets, IxTag}}),
+    init_disc_index(Tab, Tail).
+
+create_fun(Cont, Tab, Pos) ->
+    fun(read) ->
+	    Data =
+		case Cont of
+		    {start, KeysPerChunk} ->
+			mnesia_lib:db_init_chunk(disc_only_copies, Tab, KeysPerChunk);
+		    '$end_of_table' ->
+			'$end_of_table';
+		    _Else ->
+			mnesia_lib:db_chunk(disc_only_copies, Cont)
+		end,
+	    case Data of
+		'$end_of_table' ->
+		    end_of_input;
+		{Recs, Next} ->
+		    IdxElems = [{element(Pos, Obj), element(2, Obj)} || Obj <- Recs],
+		    {IdxElems, create_fun(Next, Tab, Pos)}
+	    end;
+       (close) ->
+	    ok
+    end.
+
+make_ram_index(_, []) ->
+    done;
+make_ram_index(Tab, [Pos | Tail]) ->
+    add_ram_index(Tab, Pos),
+    make_ram_index(Tab, Tail).
+
+add_ram_index(Tab, Pos) when integer(Pos) ->
+    verbose("Creating index for ~w ~n", [Tab]),
+    Index = mnesia_monitor:mktab(mnesia_index, [bag, public]),
+    Insert = fun(Rec, _Acc) ->
+		     true = ?ets_insert(Index, {element(Pos, Rec), element(2, Rec)})
+	     end,
+    mnesia_lib:db_fixtable(ram_copies, Tab, true),
+    true = ets:foldl(Insert, true, Tab),
+    mnesia_lib:db_fixtable(ram_copies, Tab, false),
+    mnesia_lib:set({Tab, {index, Pos}}, Index),
+    add_index_info(Tab, val({Tab, setorbag}), {Pos, {ram, Index}});
+add_ram_index(_Tab, snmp) ->
+    ok.
+
+add_index_info(Tab, Type, IxElem) ->
+    Commit = val({Tab, commit_work}),
+    case lists:keysearch(index, 1, Commit) of
+	false ->
+	    Index = #index{setorbag = Type,
+			   pos_list = [IxElem]},
+	    %% Check later if mnesia_tm is sensative about the order
+	    mnesia_lib:set({Tab, commit_work},
+			   mnesia_lib:sort_commit([Index | Commit]));
+	{value, Old} ->
+	    %% We could check for consistency here
+	    Index = Old#index{pos_list = [IxElem | Old#index.pos_list]},
+	    NewC = lists:keyreplace(index, 1, Commit, Index),
+	    mnesia_lib:set({Tab, commit_work},
+			   mnesia_lib:sort_commit(NewC))
+    end.
+
+del_index_info(Tab, Pos) ->
+    Commit = val({Tab, commit_work}),
+    case lists:keysearch(index, 1, Commit) of
+	false ->
+	    %% Something is wrong ignore
+	    skip;
+	{value, Old} ->
+	    case lists:keydelete(Pos, 1, Old#index.pos_list) of
+		[] ->
+		    NewC = lists:keydelete(index, 1, Commit),
+		    mnesia_lib:set({Tab, commit_work},
+				   mnesia_lib:sort_commit(NewC));
+		New ->
+		    Index = Old#index{pos_list = New},
+		    NewC = lists:keyreplace(index, 1, Commit, Index),
+		    mnesia_lib:set({Tab, commit_work},
+				   mnesia_lib:sort_commit(NewC))
+	    end
+    end.
+
+db_put({ram, Ixt}, V) ->
+    true = ?ets_insert(Ixt, V);
+db_put({dets, Ixt}, V) ->
+    ok = dets:insert(Ixt, V).
+
+db_get({ram, Ixt}, K) ->
+    ?ets_lookup(Ixt, K);
+db_get({dets, Ixt}, K) ->
+    dets:lookup(Ixt, K).
+
+db_match_erase({ram, Ixt}, Pat) ->
+    true = ?ets_match_delete(Ixt, Pat);
+db_match_erase({dets, Ixt}, Pat) ->
+    ok = dets:match_delete(Ixt, Pat).
+
+db_match({ram, Ixt}, Pat) ->
+    ?ets_match(Ixt, Pat);
+db_match({dets, Ixt}, Pat) ->
+    dets:match(Ixt, Pat).
+
+get_index_table(Tab, Pos) ->
+    get_index_table(Tab,  val({Tab, storage_type}), Pos).
+
+get_index_table(Tab, ram_copies, Pos) ->
+    {ram,  val({Tab, {index, Pos}})};
+get_index_table(Tab, disc_copies, Pos) ->
+    {ram,  val({Tab, {index, Pos}})};
+get_index_table(Tab, disc_only_copies, Pos) ->
+    {dets, val({Tab, {index, Pos}})};
+get_index_table(_Tab, unknown, _Pos) ->
+    unknown.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_kernel_sup.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_kernel_sup.erl
new file mode 100644
index 0000000000..015a42c749
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_kernel_sup.erl
@@ -0,0 +1,60 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_kernel_sup.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
+%%
+-module(mnesia_kernel_sup).
+
+-behaviour(supervisor).
+
+-export([start/0, init/1, supervisor_timeout/1]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% top supervisor callback functions
+
+start() ->
+    supervisor:start_link({local, mnesia_kernel_sup}, ?MODULE, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% sub supervisor callback functions
+
+init([]) ->
+    ProcLib = [mnesia_monitor, proc_lib],
+    Flags = {one_for_all, 0, timer:hours(24)}, % Trust the top supervisor
+    Workers = [worker_spec(mnesia_monitor, timer:seconds(3), [gen_server]),
+	       worker_spec(mnesia_subscr, timer:seconds(3), [gen_server]),
+	       worker_spec(mnesia_locker, timer:seconds(3), ProcLib),
+	       worker_spec(mnesia_recover, timer:minutes(3), [gen_server]),
+	       worker_spec(mnesia_tm, timer:seconds(30), ProcLib),
+	       supervisor_spec(mnesia_checkpoint_sup),
+	       supervisor_spec(mnesia_snmp_sup),
+	       worker_spec(mnesia_controller, timer:seconds(3), [gen_server]),
+	       worker_spec(mnesia_late_loader, timer:seconds(3), ProcLib)
+	      ],
+    {ok, {Flags, Workers}}.
+
+worker_spec(Name, KillAfter, Modules) ->
+    KA = supervisor_timeout(KillAfter),
+    {Name, {Name, start, []}, permanent, KA, worker, [Name] ++ Modules}.
+
+supervisor_spec(Name) ->
+    {Name, {Name, start, []}, permanent, infinity, supervisor,
+     [Name, supervisor]}.
+
+-ifdef(debug_shutdown).
+supervisor_timeout(_KillAfter) -> timer:hours(24).
+-else.
+supervisor_timeout(KillAfter) -> KillAfter.
+-endif.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_late_loader.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_late_loader.erl
new file mode 100644
index 0000000000..b49cf22fd9
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_late_loader.erl
@@ -0,0 +1,95 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_late_loader.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
+%%
+-module(mnesia_late_loader).
+
+-export([
+	 async_late_disc_load/3,
+	 maybe_async_late_disc_load/3,
+	 init/1,
+	 start/0
+	]).
+
+%% sys callback functions
+-export([
+	 system_continue/3,
+	 system_terminate/4,
+	 system_code_change/4
+	]).
+
+-define(SERVER_NAME, ?MODULE).
+
+-record(state, {supervisor}).
+
+async_late_disc_load(Node, Tabs, Reason) ->
+    Msg = {async_late_disc_load, Tabs, Reason},
+    catch ({?SERVER_NAME, Node} ! {self(), Msg}).
+
+maybe_async_late_disc_load(Node, Tabs, Reason) ->
+    Msg = {maybe_async_late_disc_load, Tabs, Reason},
+    catch ({?SERVER_NAME, Node} ! {self(), Msg}).
+
+start() ->
+    mnesia_monitor:start_proc(?SERVER_NAME, ?MODULE, init, [self()]).
+
+init(Parent) ->
+    %% Trap exit omitted intentionally
+    register(?SERVER_NAME, self()),
+    link(whereis(mnesia_controller)),  %% We may not hang
+    mnesia_controller:merge_schema(),
+    unlink(whereis(mnesia_controller)),
+    mnesia_lib:set(mnesia_status, running),
+    proc_lib:init_ack(Parent, {ok, self()}),
+    loop(#state{supervisor = Parent}).
+
+loop(State) ->
+    receive
+	{_From, {async_late_disc_load, Tabs, Reason}} ->
+	    mnesia_controller:schedule_late_disc_load(Tabs, Reason),
+	    loop(State);
+
+	{_From, {maybe_async_late_disc_load, Tabs, Reason}} ->
+	    GoodTabs =
+		[T || T <- Tabs,
+		      lists:member(node(),
+				   mnesia_recover:get_master_nodes(T))],
+	    mnesia_controller:schedule_late_disc_load(GoodTabs, Reason),
+	    loop(State);
+
+	{system, From, Msg} ->
+	    mnesia_lib:dbg_out("~p got {system, ~p, ~p}~n",
+			       [?SERVER_NAME, From, Msg]),
+	    Parent = State#state.supervisor,
+	    sys:handle_system_msg(Msg, From, Parent, ?MODULE, [], State);
+
+	Msg ->
+	    mnesia_lib:error("~p got unexpected message: ~p~n",
+			     [?SERVER_NAME, Msg]),
+	    loop(State)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% System upgrade
+
+system_continue(_Parent, _Debug, State) ->
+    loop(State).
+
+system_terminate(Reason, _Parent, _Debug, _State) ->
+    exit(Reason).
+
+system_code_change(State, _Module, _OldVsn, _Extra) ->
+    {ok, State}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_lib.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_lib.erl
new file mode 100644
index 0000000000..29a54936d4
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_lib.erl
@@ -0,0 +1,1276 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_lib.erl,v 1.3 2009/07/01 15:45:40 kostis Exp $
+%%
+%% This module contains all sorts of various which doesn't fit
+%% anywhere else. Basically everything is exported.
+
+-module(mnesia_lib).
+
+-include("mnesia.hrl").
+-include_lib("kernel/include/file.hrl").
+
+-export([core_file/0]).
+
+-export([
+	 active_tables/0,
+	 add/2,
+	 add_list/2,
+	 all_nodes/0,
+%%	 catch_val/1,
+	 cleanup_tmp_files/1,
+	 copy_file/2,
+	 copy_holders/1,
+	 coredump/0,
+	 coredump/1,
+	 create_counter/1,
+	 cs_to_nodes/1,
+	 cs_to_storage_type/2,
+	 dets_to_ets/6,
+	 db_chunk/2,
+	 db_init_chunk/1,
+	 db_init_chunk/2,
+	 db_init_chunk/3,
+	 db_erase/2,
+	 db_erase/3,
+	 db_erase_tab/1,
+	 db_erase_tab/2,
+	 db_first/1,
+	 db_first/2,
+	 db_last/1,
+	 db_last/2,
+	 db_fixtable/3,
+	 db_get/2,
+	 db_get/3,
+	 db_match_erase/2,
+	 db_match_erase/3,
+	 db_match_object/2,
+	 db_match_object/3,
+	 db_next_key/2,
+	 db_next_key/3,
+	 db_prev_key/2,
+	 db_prev_key/3,
+	 db_put/2,
+	 db_put/3,
+	 db_select/2,
+	 db_select/3,
+	 db_slot/2,
+	 db_slot/3,
+	 db_update_counter/3,
+	 db_update_counter/4,
+	 dbg_out/2,
+	 del/2,
+	 dets_sync_close/1,
+	 dets_sync_open/2,
+	 dets_sync_open/3,
+	 dir/0,
+	 dir/1,
+	 dir_info/0,
+	 dirty_rpc_error_tag/1,
+	 dist_coredump/0,
+	 disk_type/1,
+	 disk_type/2,
+	 elems/2,
+	 ensure_loaded/1,
+	 error/2,
+	 error_desc/1,
+	 etype/1,
+	 exists/1,
+	 fatal/2,
+	 get_node_number/0,
+	 fix_error/1,
+	 important/2,
+	 incr_counter/1,
+	 incr_counter/2,
+	 intersect/2,
+	 is_running/0,
+	 is_running/1,
+	 is_running_remote/0,
+	 is_string/1,
+	 key_search_delete/3,
+	 key_search_all/3,
+	 last_error/0,
+	 local_active_tables/0,
+	 lock_table/1,
+	 mkcore/1,
+	 not_active_here/1,
+	 other_val/2,
+	 pad_name/3,
+	 random_time/2,
+	 read_counter/1,
+	 readable_indecies/1,
+	 remote_copy_holders/1,
+	 report_fatal/2,
+	 report_system_event/1,
+	 running_nodes/0,
+	 running_nodes/1,
+	 schema_cs_to_storage_type/2,
+	 search_delete/2,
+	 set/2,
+	 set_counter/2,
+	 set_local_content_whereabouts/1,
+	 set_remote_where_to_read/1,
+	 set_remote_where_to_read/2,
+	 show/1,
+	 show/2,
+	 sort_commit/1,
+	 storage_type_at_node/2,
+	 swap_tmp_files/1,
+	 tab2dat/1,
+	 tab2dmp/1,
+	 tab2tmp/1,
+	 tab2dcd/1,
+	 tab2dcl/1,
+	 to_list/1,
+	 union/2,
+	 uniq/1,
+	 unlock_table/1,
+	 unset/1,
+	 update_counter/2,
+	 val/1,
+	 vcore/0,
+	 vcore/1,
+	 verbose/2,
+	 view/0,
+	 view/1,
+	 view/2,
+	 warning/2,
+
+	 is_debug_compiled/0,
+	 activate_debug_fun/5,
+	 deactivate_debug_fun/3,
+	 eval_debug_fun/4,
+	 scratch_debug_fun/0
+	]).
+
+
+search_delete(Obj, List) ->
+    search_delete(Obj, List, [], none).
+search_delete(Obj, [Obj|Tail], Ack, _Res) ->
+    search_delete(Obj, Tail, Ack, Obj);
+search_delete(Obj, [H|T], Ack, Res) ->
+    search_delete(Obj, T, [H|Ack], Res);
+search_delete(_, [], Ack, Res) ->
+    {Res, Ack}.
+
+key_search_delete(Key, Pos, TupleList) ->
+    key_search_delete(Key, Pos, TupleList, none, []).
+key_search_delete(Key, Pos, [H|T], _Obj, Ack) when element(Pos, H) == Key ->
+    key_search_delete(Key, Pos, T, H, Ack);
+key_search_delete(Key, Pos, [H|T], Obj, Ack) ->
+    key_search_delete(Key, Pos, T, Obj, [H|Ack]);
+key_search_delete(_, _, [], Obj, Ack) ->
+    {Obj, Ack}.
+
+key_search_all(Key, Pos, TupleList) ->
+    key_search_all(Key, Pos, TupleList, []).
+key_search_all(Key, N, [H|T], Ack) when element(N, H) == Key ->
+    key_search_all(Key, N, T, [H|Ack]);
+key_search_all(Key, N, [_|T], Ack) ->
+    key_search_all(Key, N, T, Ack);
+key_search_all(_, _, [], Ack) -> Ack.
+
+intersect(L1, L2) ->
+    L2 -- (L2 -- L1).
+
+elems(I, [H|T]) ->
+    [element(I, H) | elems(I, T)];
+elems(_, []) ->
+    [].
+
+%%  sort_commit see to that checkpoint info is always first in
+%%  commit_work structure the other info don't need to be sorted.
+sort_commit(List) ->
+    sort_commit2(List, []).
+
+sort_commit2([{checkpoints, ChkpL}| Rest], Acc) ->
+    [{checkpoints, ChkpL}| Rest] ++ Acc;
+sort_commit2([H | R], Acc) ->
+    sort_commit2(R, [H | Acc]);
+sort_commit2([], Acc) -> Acc.
+
+is_string([H|T]) ->
+    if
+	0 =< H, H < 256, integer(H)  -> is_string(T);
+	true -> false
+    end;
+is_string([]) -> true.
+
+%%%
+
+union([H|L1], L2) ->
+    case lists:member(H, L2) of
+	true -> union(L1, L2);
+	false -> [H | union(L1, L2)]
+    end;
+union([], L2) -> L2.
+
+uniq([]) ->
+    [];
+uniq(List) ->
+    [H|T] = lists:sort(List),
+    uniq1(H, T, []).
+
+uniq1(H, [H|R], Ack) ->
+    uniq1(H, R, Ack);
+uniq1(Old, [H|R], Ack) ->
+    uniq1(H, R, [Old|Ack]);
+uniq1(Old, [], Ack) ->
+    [Old| Ack].
+
+to_list(X) when list(X) -> X;
+to_list(X) -> atom_to_list(X).
+
+all_nodes() ->
+    Ns = mnesia:system_info(db_nodes) ++
+	mnesia:system_info(extra_db_nodes),
+    mnesia_lib:uniq(Ns).
+
+running_nodes() ->
+    running_nodes(all_nodes()).
+
+running_nodes(Ns) ->
+    {Replies, _BadNs} = rpc:multicall(Ns, ?MODULE, is_running_remote, []),
+    [N || {GoodState, N} <- Replies, GoodState == true].
+
+is_running_remote() ->
+    IsRunning = is_running(),
+    {IsRunning == yes, node()}.
+
+is_running(Node) when atom(Node) ->
+    case rpc:call(Node, ?MODULE, is_running, []) of
+	{badrpc, _} -> no;
+	X -> X
+    end.
+
+is_running() ->
+    case ?catch_val(mnesia_status) of
+	{'EXIT', _} -> no;
+	running -> yes;
+	starting -> starting;
+	stopping -> stopping
+    end.
+
+show(X) ->
+    show(X, []).
+show(F, A) ->
+    io:format(user, F, A).
+
+
+pad_name([Char | Chars], Len, Tail) ->
+    [Char | pad_name(Chars, Len - 1, Tail)];
+pad_name([], Len, Tail) when Len =< 0 ->
+    Tail;
+pad_name([], Len, Tail) ->
+    [$ | pad_name([], Len - 1, Tail)].
+
+%% Some utility functions .....
+active_here(Tab) ->
+    case val({Tab, where_to_read}) of
+	Node when Node == node() -> true;
+	_ -> false
+    end.
+
+not_active_here(Tab) ->
+    not active_here(Tab).
+
+exists(Fname) ->
+    case file:open(Fname, [raw,read]) of
+	{ok, F} ->file:close(F), true;
+	_ -> false
+    end.
+
+dir() -> mnesia_monitor:get_env(dir).
+
+dir(Fname) ->
+    filename:join([dir(), to_list(Fname)]).
+
+tab2dat(Tab) ->  %% DETS files
+    dir(lists:concat([Tab, ".DAT"])).
+
+tab2tmp(Tab) ->
+    dir(lists:concat([Tab, ".TMP"])).
+
+tab2dmp(Tab) ->  %% Dumped ets tables
+    dir(lists:concat([Tab, ".DMP"])).
+
+tab2dcd(Tab) ->  %% Disc copies data
+    dir(lists:concat([Tab, ".DCD"])).
+
+tab2dcl(Tab) ->  %% Disc copies log
+    dir(lists:concat([Tab, ".DCL"])).
+
+storage_type_at_node(Node, Tab) ->
+    search_key(Node, [{disc_copies, val({Tab, disc_copies})},
+		      {ram_copies, val({Tab, ram_copies})},
+		      {disc_only_copies, val({Tab, disc_only_copies})}]).
+
+cs_to_storage_type(Node, Cs) ->
+    search_key(Node, [{disc_copies, Cs#cstruct.disc_copies},
+		      {ram_copies, Cs#cstruct.ram_copies},
+		      {disc_only_copies, Cs#cstruct.disc_only_copies}]).
+
+schema_cs_to_storage_type(Node, Cs) ->
+    case cs_to_storage_type(Node, Cs) of
+	unknown when Cs#cstruct.name == schema -> ram_copies;
+	Other -> Other
+    end.
+
+
+search_key(Key, [{Val, List} | Tail]) ->
+    case lists:member(Key, List) of
+	true -> Val;
+	false -> search_key(Key, Tail)
+    end;
+search_key(_Key, []) ->
+    unknown.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% ops, we've got some global variables here :-)
+
+%% They are
+%%
+%%   {Tab, setorbag}, -> set | bag
+%%   {Tab, storage_type}       -> disc_copies |ram_copies | unknown (**)
+%%   {Tab, disc_copies}        -> node list  (from schema)
+%%   {Tab, ram_copies}, -> node list  (from schema)
+%%   {Tab, arity}, -> number
+%%   {Tab, attributes}, -> atom list
+%%   {Tab, wild_pattern}, -> record tuple with '_'s
+%%   {Tab, {index, Pos}}       -> ets table
+%%   {Tab, index}              -> integer list
+%%   {Tab, cstruct}            -> cstruct  structure
+%%
+
+%%   The following fields are dynamic according to the
+%%   the current node/table situation
+
+%%   {Tab, where_to_write}      -> node list
+%%   {Tab, where_to_read}       -> node | nowhere
+%%
+%%   {schema, tables}                    -> tab list
+%%   {schema, local_tables}              -> tab list  (**)
+%%
+%%   {current, db_nodes}                  -> node list
+%%
+%%   dir                                  -> directory path (**)
+%%   mnesia_status                        -> status | running | stopping (**)
+%%   (**) ==   (Different on all nodes)
+%%
+
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_);
+	_VaLuE_ -> _VaLuE_
+    end.
+
+set(Var, Val) ->
+    ?ets_insert(mnesia_gvar, {Var, Val}).
+
+unset(Var) ->
+    ?ets_delete(mnesia_gvar, Var).
+
+other_val(Var, Other) ->
+    case Var of
+	{_, where_to_read} -> nowhere;
+	{_, where_to_write} -> [];
+	{_, active_replicas} -> [];
+	_ ->
+	    pr_other(Var, Other)
+    end.
+
+pr_other(Var, Other) ->
+    Why =
+	case is_running() of
+	    no -> {node_not_running, node()};
+	    _ -> {no_exists, Var}
+	end,
+    verbose("~p (~p) val(mnesia_gvar, ~w) -> ~p ~p ~n",
+	    [self(), process_info(self(), registered_name),
+	     Var, Other, Why]),
+    case Other of
+	{badarg, [{ets, lookup_element, _}|_]} ->
+	    exit(Why);
+	_ ->
+	    erlang:error(Why)
+    end.
+
+%% Some functions for list valued variables
+add(Var, Val) ->
+    L = val(Var),
+    set(Var, [Val | lists:delete(Val, L)]).
+
+add_list(Var, List) ->
+    L = val(Var),
+    set(Var, union(L, List)).
+
+del(Var, Val) ->
+    L = val(Var),
+    set(Var, lists:delete(Val, L)).
+
+%% This function is needed due to the fact
+%% that the application_controller enters
+%% a deadlock now and then. ac is implemented
+%% as a rather naive server.
+ensure_loaded(Appl) ->
+    case application_controller:get_loaded(Appl) of
+	{true, _} ->
+	    ok;
+	false ->
+	    case application:load(Appl) of
+		ok ->
+		    ok;
+		{error, {already_loaded, Appl}} ->
+		    ok;
+		{error, Reason} ->
+		    {error, {application_load_error, Reason}}
+	    end
+    end.
+
+local_active_tables() ->
+    Tabs = val({schema, local_tables}),
+    lists:zf(fun(Tab) -> active_here(Tab) end, Tabs).
+
+active_tables() ->
+    Tabs = val({schema, tables}),
+    F = fun(Tab) ->
+		case val({Tab, where_to_read}) of
+		    nowhere -> false;
+		    _ -> {true, Tab}
+		end
+	end,
+    lists:zf(F, Tabs).
+
+etype(X) when integer(X) -> integer;
+etype([]) -> nil;
+etype(X) when list(X) -> list;
+etype(X) when tuple(X) -> tuple;
+etype(X) when atom(X) -> atom;
+etype(_) -> othertype.
+
+remote_copy_holders(Cs) ->
+    copy_holders(Cs) -- [node()].
+
+copy_holders(Cs) when Cs#cstruct.local_content == false ->
+    cs_to_nodes(Cs);
+copy_holders(Cs) when Cs#cstruct.local_content == true ->
+    case lists:member(node(), cs_to_nodes(Cs)) of
+	true -> [node()];
+	false -> []
+    end.
+
+
+set_remote_where_to_read(Tab) ->
+    set_remote_where_to_read(Tab, []).
+
+set_remote_where_to_read(Tab, Ignore) ->
+    Active = val({Tab, active_replicas}),
+    Valid =
+	case mnesia_recover:get_master_nodes(Tab) of
+	    [] ->  Active;
+	    Masters -> mnesia_lib:intersect(Masters, Active)
+	end,
+    Available = mnesia_lib:intersect(val({current, db_nodes}), Valid -- Ignore),
+    DiscOnlyC = val({Tab, disc_only_copies}),
+    Prefered  = Available -- DiscOnlyC,
+    if
+	Prefered /= [] ->
+	    set({Tab, where_to_read}, hd(Prefered));
+	Available /= [] ->
+	    set({Tab, where_to_read}, hd(Available));
+	true ->
+	    set({Tab, where_to_read}, nowhere)
+    end.
+
+%%% Local only
+set_local_content_whereabouts(Tab) ->
+    add({schema, local_tables}, Tab),
+    add({Tab, active_replicas}, node()),
+    set({Tab, where_to_write}, [node()]),
+    set({Tab, where_to_read}, node()).
+
+%%% counter routines
+
+create_counter(Name) ->
+    set_counter(Name, 0).
+
+set_counter(Name, Val) ->
+    ?ets_insert(mnesia_gvar, {Name, Val}).
+
+incr_counter(Name) ->
+    ?ets_update_counter(mnesia_gvar, Name, 1).
+
+incr_counter(Name, I) ->
+    ?ets_update_counter(mnesia_gvar, Name, I).
+
+update_counter(Name, Val) ->
+    ?ets_update_counter(mnesia_gvar, Name, Val).
+
+read_counter(Name) ->
+    ?ets_lookup_element(mnesia_gvar, Name, 2).
+
+cs_to_nodes(Cs) ->
+    Cs#cstruct.disc_only_copies ++
+    Cs#cstruct.disc_copies ++
+    Cs#cstruct.ram_copies.
+
+dist_coredump() ->
+    dist_coredump(all_nodes()).
+dist_coredump(Ns) ->
+    {Replies, _} = rpc:multicall(Ns, ?MODULE, coredump, []),
+    Replies.
+
+coredump() ->
+    coredump({crashinfo, {"user initiated~n", []}}).
+coredump(CrashInfo) ->
+    Core = mkcore(CrashInfo),
+    Out = core_file(),
+    important("Writing Mnesia core to file: ~p...~p~n", [Out, CrashInfo]),
+    file:write_file(Out, Core),
+    Out.
+
+core_file() ->
+    Integers = tuple_to_list(date()) ++ tuple_to_list(time()),
+    Fun = fun(I) when I < 10 -> ["_0", I];
+	     (I) -> ["_", I]
+	  end,
+    List = lists:append([Fun(I) || I <- Integers]),
+    filename:absname(lists:concat(["MnesiaCore.", node()] ++ List)).
+
+mkcore(CrashInfo) ->
+%   dbg_out("Making a Mnesia core dump...~p~n", [CrashInfo]),
+    Nodes = [node() |nodes()],
+    TidLocks = (catch ets:tab2list(mnesia_tid_locks)),
+    Core = [
+	    CrashInfo,
+	    {time, {date(), time()}},
+	    {self, catch process_info(self())},
+	    {nodes, catch rpc:multicall(Nodes, ?MODULE, get_node_number, [])},
+	    {applications, catch lists:sort(application:loaded_applications())},
+	    {flags, catch init:get_arguments()},
+	    {code_path, catch code:get_path()},
+	    {code_loaded, catch lists:sort(code:all_loaded())},
+	    {etsinfo, catch ets_info(ets:all())},
+
+	    {version, catch mnesia:system_info(version)},
+	    {schema, catch ets:tab2list(schema)},
+	    {gvar, catch ets:tab2list(mnesia_gvar)},
+	    {master_nodes, catch mnesia_recover:get_master_node_info()},
+
+	    {processes, catch procs()},
+	    {relatives, catch relatives()},
+	    {workers, catch workers(mnesia_controller:get_workers(2000))},
+	    {locking_procs, catch locking_procs(TidLocks)},
+
+	    {held_locks, catch mnesia:system_info(held_locks)},
+	    {tid_locks, TidLocks},
+	    {lock_queue, catch mnesia:system_info(lock_queue)},
+	    {load_info, catch mnesia_controller:get_info(2000)},
+	    {trans_info, catch mnesia_tm:get_info(2000)},
+
+	    {schema_file, catch file:read_file(tab2dat(schema))},
+	    {dir_info, catch dir_info()},
+	    {logfile, catch {ok, read_log_files()}}
+	   ],
+    term_to_binary(Core).
+
+procs() ->
+    Fun = fun(P) -> {P, (catch lists:zf(fun proc_info/1, process_info(P)))} end,
+    lists:map(Fun, processes()).
+
+proc_info({registered_name, Val}) -> {true, Val};
+proc_info({message_queue_len, Val}) -> {true, Val};
+proc_info({status, Val}) -> {true, Val};
+proc_info({current_function, Val}) -> {true, Val};
+proc_info(_) -> false.
+
+get_node_number() ->
+    {node(), self()}.
+
+read_log_files() ->
+    [{F, catch file:read_file(F)} || F <- mnesia_log:log_files()].
+
+dir_info() ->
+    {ok, Cwd} = file:get_cwd(),
+    Dir = dir(),
+    [{cwd, Cwd, file:read_file_info(Cwd)},
+     {mnesia_dir, Dir, file:read_file_info(Dir)}] ++
+    case file:list_dir(Dir) of
+	{ok, Files} ->
+	    [{mnesia_file, F, catch file:read_file_info(dir(F))} || F <- Files];
+	Other ->
+	    [Other]
+    end.
+
+ets_info([H|T]) ->
+    [{table, H, ets:info(H)} | ets_info(T)];
+ets_info([]) -> [].
+
+relatives() ->
+    Info = fun(Name) ->
+		   case whereis(Name) of
+		       undefined -> false;
+		       Pid -> {true, {Name, Pid, catch process_info(Pid)}}
+		   end
+	   end,
+    lists:zf(Info, mnesia:ms()).
+
+workers({workers, Loader, Sender, Dumper}) ->
+    Info = fun({Name, Pid}) ->
+		   case Pid of
+		       undefined -> false;
+		       Pid -> {true, {Name, Pid, catch process_info(Pid)}}
+		   end
+	   end,
+    lists:zf(Info, [{loader, Loader}, {sender, Sender}, {dumper, Dumper}]).
+
+locking_procs(LockList) when list(LockList) ->
+    Tids = [element(1, Lock) || Lock <- LockList],
+    UT = uniq(Tids),
+    Info = fun(Tid) ->
+		   Pid = Tid#tid.pid,
+		   case node(Pid) == node() of
+		       true ->
+			   {true, {Pid, catch process_info(Pid)}};
+		       _ ->
+			   false
+		   end
+	   end,
+    lists:zf(Info, UT).
+
+view() ->
+    Bin = mkcore({crashinfo, {"view only~n", []}}),
+    vcore(Bin).
+
+%% Displays a Mnesia file on the tty. The file may be repaired.
+view(File) ->
+    case suffix([".DAT", ".RET", ".DMP", ".TMP"], File) of
+	true ->
+	    view(File, dat);
+	false ->
+	    case suffix([".LOG", ".BUP", ".ETS"], File) of
+		true ->
+		    view(File, log);
+		false ->
+		    case lists:prefix("MnesiaCore.", File) of
+			true ->
+			    view(File, core);
+			false ->
+			    {error, "Unknown file name"}
+		    end
+	    end
+    end.
+
+view(File, dat) ->
+    dets:view(File);
+view(File, log) ->
+    mnesia_log:view(File);
+view(File, core) ->
+    vcore(File).
+
+suffix(Suffixes, File) ->
+    Fun = fun(S) -> lists:suffix(S, File) end,
+    lists:any(Fun, Suffixes).
+
+%% View a core file
+
+vcore() ->
+    Prefix = lists:concat(["MnesiaCore.", node()]),
+    Filter = fun(F) -> lists:prefix(Prefix, F) end,
+    {ok, Cwd} = file:get_cwd(),
+    case file:list_dir(Cwd) of
+	{ok, Files}->
+	    CoreFiles = lists:sort(lists:zf(Filter, Files)),
+	    show("Mnesia core files: ~p~n", [CoreFiles]),
+	    vcore(lists:last(CoreFiles));
+	Error ->
+	    Error
+    end.
+
+vcore(Bin) when binary(Bin) ->
+    Core = binary_to_term(Bin),
+    Fun = fun({Item, Info}) ->
+		  show("***** ~p *****~n", [Item]),
+		  case catch vcore_elem({Item, Info}) of
+		      {'EXIT', Reason} ->
+			  show("{'EXIT', ~p}~n", [Reason]);
+		      _ -> ok
+		  end
+	  end,
+    lists:foreach(Fun, Core);
+
+vcore(File) ->
+    show("~n***** Mnesia core: ~p *****~n", [File]),
+    case file:read_file(File) of
+	{ok, Bin} ->
+	    vcore(Bin);
+	_ ->
+	    nocore
+    end.
+
+vcore_elem({schema_file, {ok, B}}) ->
+    Fname = "/tmp/schema.DAT",
+    file:write_file(Fname, B),
+    dets:view(Fname),
+    file:delete(Fname);
+
+vcore_elem({logfile, {ok, BinList}}) ->
+    Fun = fun({F, Info}) ->
+		  show("----- logfile: ~p -----~n", [F]),
+		  case Info of
+		      {ok, B} ->
+			  Fname = "/tmp/mnesia_vcore_elem.TMP",
+			  file:write_file(Fname, B),
+			  mnesia_log:view(Fname),
+			  file:delete(Fname);
+		      _ ->
+			  show("~p~n", [Info])
+		  end
+	  end,
+    lists:foreach(Fun, BinList);
+
+vcore_elem({crashinfo, {Format, Args}}) ->
+    show(Format, Args);
+vcore_elem({gvar, L}) ->
+    show("~p~n", [lists:sort(L)]);
+vcore_elem({transactions, Info}) ->
+    mnesia_tm:display_info(user, Info);
+
+vcore_elem({_Item, Info}) ->
+    show("~p~n", [Info]).
+
+fix_error(X) ->
+    set(last_error, X), %% for debugabililty
+    case X of
+	{aborted, Reason} -> Reason;
+	{abort, Reason} -> Reason;
+	Y when atom(Y) -> Y;
+	{'EXIT', {_Reason, {Mod, _, _}}} when atom(Mod) ->
+	    save(X),
+	    case atom_to_list(Mod) of
+		[$m, $n, $e|_] -> badarg;
+		_ -> X
+	    end;
+	_ -> X
+    end.
+
+last_error() ->
+    val(last_error).
+
+%% The following is a list of possible mnesia errors and what they
+%% actually mean
+
+error_desc(nested_transaction) -> "Nested transactions are not allowed";
+error_desc(badarg) -> "Bad or invalid argument, possibly bad type";
+error_desc(no_transaction) -> "Operation not allowed outside transactions";
+error_desc(combine_error)  -> "Table options were ilegally combined";
+error_desc(bad_index)  -> "Index already exists or was out of bounds";
+error_desc(already_exists) -> "Some schema option we try to set is already on";
+error_desc(index_exists)-> "Some ops can not  be performed on tabs with index";
+error_desc(no_exists)-> "Tried to perform op on non-existing (non alive) item";
+error_desc(system_limit) -> "Some system_limit was exhausted";
+error_desc(mnesia_down) -> "A transaction involving objects at some remote "
+                           "node which died while transaction was executing"
+                           "*and* object(s) are no longer available elsewhere"
+                           "in the network";
+error_desc(not_a_db_node) -> "A node which is non existant in "
+                              "the schema was mentioned";
+error_desc(bad_type)            -> "Bad type on some provided arguments";
+error_desc(node_not_running)    -> "Node not running";
+error_desc(truncated_binary_file) -> "Truncated binary in file";
+error_desc(active)     -> "Some delete ops require that "
+                           "all active objects are removed";
+error_desc(illegal) -> "Operation not supported on object";
+error_desc({'EXIT', Reason}) ->
+    error_desc(Reason);
+error_desc({error, Reason}) ->
+    error_desc(Reason);
+error_desc({aborted, Reason}) ->
+    error_desc(Reason);
+error_desc(Reason) when tuple(Reason), size(Reason) > 0 ->
+    setelement(1, Reason, error_desc(element(1, Reason)));
+error_desc(Reason) ->
+    Reason.
+
+dirty_rpc_error_tag(Reason) ->
+    case Reason of
+	{'EXIT', _} -> badarg;
+	no_variable -> badarg;
+	_           -> no_exists
+    end.
+
+fatal(Format, Args) ->
+    catch set(mnesia_status, stopping),
+    Core = mkcore({crashinfo, {Format, Args}}),
+    report_fatal(Format, Args, Core),
+    timer:sleep(10000), % Enough to write the core dump to disc?
+    mnesia:lkill(),
+    exit(fatal).
+
+report_fatal(Format, Args) ->
+    report_fatal(Format, Args, nocore).
+
+report_fatal(Format, Args, Core) ->
+    report_system_event({mnesia_fatal, Format, Args, Core}),
+    catch exit(whereis(mnesia_monitor), fatal).
+
+%% We sleep longer and longer the more we try
+%% Made some testing and came up with the following constants
+random_time(Retries, _Counter0) ->
+%    UpperLimit = 2000,
+%    MaxIntv = trunc(UpperLimit * (1-(4/((Retries*Retries)+4)))),
+    UpperLimit = 500,
+    Dup = Retries * Retries,
+    MaxIntv = trunc(UpperLimit * (1-(50/((Dup)+50)))),
+
+    case get(random_seed) of
+	undefined ->
+	    {X, Y, Z} = erlang:now(), %% time()
+	    random:seed(X, Y, Z),
+	    Time = Dup + random:uniform(MaxIntv),
+	    %%	    dbg_out("---random_test rs ~w max ~w val ~w---~n", [Retries, MaxIntv, Time]),
+	    Time;
+	_ ->
+	    Time = Dup + random:uniform(MaxIntv),
+	    %%	    dbg_out("---random_test rs ~w max ~w val ~w---~n", [Retries, MaxIntv, Time]),
+	    Time
+    end.
+
+report_system_event(Event0) ->
+    Event = {mnesia_system_event, Event0},
+    report_system_event(catch_notify(Event), Event),
+    case ?catch_val(subscribers) of
+	{'EXIT', _} -> ignore;
+	Pids -> lists:foreach(fun(Pid) -> Pid ! Event end, Pids)
+    end,
+    ok.
+
+catch_notify(Event) ->
+    case whereis(mnesia_event) of
+	undefined ->
+	    {'EXIT', {badarg, {mnesia_event, Event}}};
+	Pid ->
+	    gen_event:notify(Pid, Event)
+    end.
+
+report_system_event({'EXIT', Reason}, Event) ->
+    Mod = mnesia_monitor:get_env(event_module),
+    case mnesia_sup:start_event() of
+	{ok, Pid} ->
+	    link(Pid),
+	    gen_event:call(mnesia_event, Mod, Event, infinity),
+	    unlink(Pid),
+
+            %% We get an exit signal if server dies
+            receive
+                {'EXIT', Pid, _Reason} ->
+                    {error, {node_not_running, node()}}
+            after 0 ->
+		    gen_event:stop(mnesia_event),
+                    ok
+            end;
+
+	Error ->
+	    Msg = "Mnesia(~p): Cannot report event ~p: ~p (~p)~n",
+	    error_logger:format(Msg, [node(), Event, Reason, Error])
+    end;
+report_system_event(_Res, _Event) ->
+    ignore.
+
+%% important messages are reported regardless of debug level
+important(Format, Args) ->
+    save({Format, Args}),
+    report_system_event({mnesia_info, Format, Args}).
+
+%% Warning messages are reported regardless of debug level
+warning(Format, Args) ->
+    save({Format, Args}),
+    report_system_event({mnesia_warning, Format, Args}).
+
+%% error messages are reported regardless of debug level
+error(Format, Args) ->
+    save({Format, Args}),
+    report_system_event({mnesia_error, Format, Args}).
+
+%% verbose messages are reported if debug level == debug or verbose
+verbose(Format, Args) ->
+    case mnesia_monitor:get_env(debug) of
+	none ->    save({Format, Args});
+	verbose -> important(Format, Args);
+	debug ->   important(Format, Args);
+	trace ->   important(Format, Args)
+    end.
+
+%% debug message are display if debug level == 2
+dbg_out(Format, Args) ->
+    case mnesia_monitor:get_env(debug) of
+	none ->    ignore;
+	verbose -> save({Format, Args});
+	_ ->  report_system_event({mnesia_info, Format, Args})
+    end.
+
+%% Keep the last 10 debug print outs
+save(DbgInfo) ->
+    catch save2(DbgInfo).
+
+save2(DbgInfo) ->
+    Key = {'$$$_report', current_pos},
+    P =
+	case ?ets_lookup_element(mnesia_gvar, Key, 2) of
+	    30 -> -1;
+	    I -> I
+	end,
+    set({'$$$_report', current_pos}, P+1),
+    set({'$$$_report', P+1}, {date(), time(), DbgInfo}).
+
+copy_file(From, To) ->
+    case file:open(From, [raw, binary, read]) of
+	{ok, F} ->
+	    case file:open(To, [raw, binary, write]) of
+		{ok, T} ->
+		    Res = copy_file_loop(F, T, 8000),
+		    file:close(F),
+		    file:close(T),
+		    Res;
+		{error, Reason} ->
+		    {error, Reason}
+	    end;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+copy_file_loop(F, T, ChunkSize) ->
+    case file:read(F, ChunkSize) of
+	{ok, {0, _}} ->
+	    ok;
+	{ok, {_, Bin}} ->
+	    file:write(T, Bin),
+	    copy_file_loop(F, T, ChunkSize);
+	{ok, Bin} ->
+	    file:write(T, Bin),
+	    copy_file_loop(F, T, ChunkSize);
+	eof ->
+	    ok;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+
+%%%%%%%%%%%%
+%% versions of all the lowlevel db funcs that determine whether we
+%% shall go to disc or ram to do the actual operation.
+
+db_get(Tab, Key) ->
+    db_get(val({Tab, storage_type}), Tab, Key).
+db_get(ram_copies, Tab, Key) -> ?ets_lookup(Tab, Key);
+db_get(disc_copies, Tab, Key) -> ?ets_lookup(Tab, Key);
+db_get(disc_only_copies, Tab, Key) -> dets:lookup(Tab, Key).
+
+db_init_chunk(Tab) ->
+    db_init_chunk(val({Tab, storage_type}), Tab, 1000).
+db_init_chunk(Tab, N) ->
+    db_init_chunk(val({Tab, storage_type}), Tab, N).
+
+db_init_chunk(disc_only_copies, Tab, N) ->
+    dets:select(Tab, [{'_', [], ['$_']}], N);
+db_init_chunk(_, Tab, N) ->
+    ets:select(Tab, [{'_', [], ['$_']}], N).
+
+db_chunk(disc_only_copies, State) ->
+    dets:select(State);
+db_chunk(_, State) ->
+    ets:select(State).
+
+db_put(Tab, Val) ->
+    db_put(val({Tab, storage_type}), Tab, Val).
+
+db_put(ram_copies, Tab, Val) -> ?ets_insert(Tab, Val), ok;
+db_put(disc_copies, Tab, Val) -> ?ets_insert(Tab, Val), ok;
+db_put(disc_only_copies, Tab, Val) -> dets:insert(Tab, Val).
+
+db_match_object(Tab, Pat) ->
+    db_match_object(val({Tab, storage_type}), Tab, Pat).
+db_match_object(Storage, Tab, Pat) ->
+    db_fixtable(Storage, Tab, true),
+    Res = catch_match_object(Storage, Tab, Pat),
+    db_fixtable(Storage, Tab, false),
+    case Res of
+	{'EXIT', Reason} -> exit(Reason);
+	_ -> Res
+    end.
+
+catch_match_object(disc_only_copies, Tab, Pat) ->
+    catch dets:match_object(Tab, Pat);
+catch_match_object(_, Tab, Pat) ->
+    catch ets:match_object(Tab, Pat).
+
+db_select(Tab, Pat) ->
+    db_select(val({Tab, storage_type}), Tab, Pat).
+
+db_select(Storage, Tab, Pat) ->
+    db_fixtable(Storage, Tab, true),
+    Res = catch_select(Storage, Tab, Pat),
+    db_fixtable(Storage, Tab, false),
+    case Res of
+	{'EXIT', Reason} -> exit(Reason);
+	_ -> Res
+    end.
+
+catch_select(disc_only_copies, Tab, Pat) ->
+    dets:select(Tab, Pat);
+catch_select(_, Tab, Pat) ->
+    ets:select(Tab, Pat).
+
+db_fixtable(ets, Tab, Bool) ->
+    ets:safe_fixtable(Tab, Bool);
+db_fixtable(ram_copies, Tab, Bool) ->
+    ets:safe_fixtable(Tab, Bool);
+db_fixtable(disc_copies, Tab, Bool) ->
+    ets:safe_fixtable(Tab, Bool);
+db_fixtable(dets, Tab, Bool) ->
+    dets:safe_fixtable(Tab, Bool);
+db_fixtable(disc_only_copies, Tab, Bool) ->
+    dets:safe_fixtable(Tab, Bool).
+
+db_erase(Tab, Key) ->
+    db_erase(val({Tab, storage_type}), Tab, Key).
+db_erase(ram_copies, Tab, Key) -> ?ets_delete(Tab, Key), ok;
+db_erase(disc_copies, Tab, Key) -> ?ets_delete(Tab, Key), ok;
+db_erase(disc_only_copies, Tab, Key) -> dets:delete(Tab, Key).
+
+db_match_erase(Tab, Pat) ->
+    db_match_erase(val({Tab, storage_type}), Tab, Pat).
+db_match_erase(ram_copies, Tab, Pat) -> ?ets_match_delete(Tab, Pat), ok;
+db_match_erase(disc_copies, Tab, Pat) -> ?ets_match_delete(Tab, Pat), ok;
+db_match_erase(disc_only_copies, Tab, Pat) -> dets:match_delete(Tab, Pat).
+
+db_first(Tab) ->
+    db_first(val({Tab, storage_type}), Tab).
+db_first(ram_copies, Tab) -> ?ets_first(Tab);
+db_first(disc_copies, Tab) -> ?ets_first(Tab);
+db_first(disc_only_copies, Tab) -> dets:first(Tab).
+
+db_next_key(Tab, Key) ->
+    db_next_key(val({Tab, storage_type}), Tab, Key).
+db_next_key(ram_copies, Tab, Key) -> ?ets_next(Tab, Key);
+db_next_key(disc_copies, Tab, Key) -> ?ets_next(Tab, Key);
+db_next_key(disc_only_copies, Tab, Key) -> dets:next(Tab, Key).
+
+db_last(Tab) ->
+    db_last(val({Tab, storage_type}), Tab).
+db_last(ram_copies, Tab) -> ?ets_last(Tab);
+db_last(disc_copies, Tab) -> ?ets_last(Tab);
+db_last(disc_only_copies, Tab) -> dets:first(Tab). %% Dets don't have order
+
+db_prev_key(Tab, Key) ->
+    db_prev_key(val({Tab, storage_type}), Tab, Key).
+db_prev_key(ram_copies, Tab, Key) -> ?ets_prev(Tab, Key);
+db_prev_key(disc_copies, Tab, Key) -> ?ets_prev(Tab, Key);
+db_prev_key(disc_only_copies, Tab, Key) -> dets:next(Tab, Key). %% Dets don't have order
+
+db_slot(Tab, Pos) ->
+    db_slot(val({Tab, storage_type}), Tab, Pos).
+db_slot(ram_copies, Tab, Pos) -> ?ets_slot(Tab, Pos);
+db_slot(disc_copies, Tab, Pos) -> ?ets_slot(Tab, Pos);
+db_slot(disc_only_copies, Tab, Pos) -> dets:slot(Tab, Pos).
+
+db_update_counter(Tab, C, Val) ->
+    db_update_counter(val({Tab, storage_type}), Tab, C, Val).
+db_update_counter(ram_copies, Tab, C, Val) ->
+    ?ets_update_counter(Tab, C, Val);
+db_update_counter(disc_copies, Tab, C, Val) ->
+    ?ets_update_counter(Tab, C, Val);
+db_update_counter(disc_only_copies, Tab, C, Val) ->
+    dets:update_counter(Tab, C, Val).
+
+db_erase_tab(Tab) ->
+    db_erase_tab(val({Tab, storage_type}), Tab).
+db_erase_tab(ram_copies, Tab) -> ?ets_delete_table(Tab);
+db_erase_tab(disc_copies, Tab) -> ?ets_delete_table(Tab);
+db_erase_tab(disc_only_copies, _Tab) -> ignore.
+
+%% assuming that Tab is a valid ets-table
+dets_to_ets(Tabname, Tab, File, Type, Rep, Lock) ->
+    {Open, Close} = mkfuns(Lock),
+    case Open(Tabname, [{file, File}, {type, disk_type(Tab, Type)},
+			{keypos, 2}, {repair, Rep}]) of
+	{ok, Tabname} ->
+	    Res = dets:to_ets(Tabname, Tab),
+	    Close(Tabname),
+	    trav_ret(Res, Tab);
+	Other ->
+	    Other
+    end.
+
+trav_ret(Tabname, Tabname) -> loaded;
+trav_ret(Other, _Tabname) -> Other.
+
+mkfuns(yes) ->
+    {fun(Tab, Args) -> dets_sync_open(Tab, Args) end,
+     fun(Tab) -> dets_sync_close(Tab) end};
+mkfuns(no) ->
+    {fun(Tab, Args) -> dets:open_file(Tab, Args) end,
+     fun(Tab) -> dets:close(Tab) end}.
+
+disk_type(Tab) ->
+    disk_type(Tab, val({Tab, setorbag})).
+
+disk_type(_Tab, ordered_set) ->
+    set;
+disk_type(_, Type) ->
+    Type.
+
+dets_sync_open(Tab, Ref, File) ->
+    Args = [{file, File},
+	    {keypos, 2},
+	    {repair, mnesia_monitor:get_env(auto_repair)},
+	    {type, disk_type(Tab)}],
+    dets_sync_open(Ref, Args).
+
+lock_table(Tab) ->
+    global:set_lock({{mnesia_table_lock, Tab}, self()}, [node()], infinity).
+%    dbg_out("dets_sync_open: ~p ~p~n", [T, self()]),
+
+unlock_table(Tab) ->
+    global:del_lock({{mnesia_table_lock, Tab}, self()}, [node()]).
+%    dbg_out("unlock_table: ~p ~p~n", [T, self()]),
+
+dets_sync_open(Tab, Args) ->
+    lock_table(Tab),
+    case dets:open_file(Tab, Args) of
+	{ok, Tab} ->
+	    {ok, Tab};
+	Other ->
+	    dets_sync_close(Tab),
+	    Other
+    end.
+
+dets_sync_close(Tab) ->
+    catch dets:close(Tab),
+    unlock_table(Tab),
+    ok.
+
+cleanup_tmp_files([Tab | Tabs]) ->
+    dets_sync_close(Tab),
+    file:delete(tab2tmp(Tab)),
+    cleanup_tmp_files(Tabs);
+cleanup_tmp_files([]) ->
+    ok.
+
+%% Returns a list of bad tables
+swap_tmp_files([Tab | Tabs]) ->
+    dets_sync_close(Tab),
+    Tmp = tab2tmp(Tab),
+    Dat = tab2dat(Tab),
+    case file:rename(Tmp, Dat) of
+	ok ->
+	    swap_tmp_files(Tabs);
+	_ ->
+	    file:delete(Tmp),
+	    [Tab | swap_tmp_files(Tabs)]
+    end;
+swap_tmp_files([]) ->
+    [].
+
+readable_indecies(Tab) ->
+    val({Tab, index}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Managing conditional debug functions
+%%
+%% The main idea with the debug_fun's is to allow test programs
+%% to control the internal behaviour of Mnesia. This is needed
+%% to make the test programs independent of system load, swapping
+%% and other circumstances that may affect the behaviour of Mnesia.
+%%
+%% First should calls to ?eval_debug_fun be inserted at well
+%% defined places in Mnesia's code. E.g. in critical situations
+%% of startup, transaction commit, backups etc.
+%%
+%% Then compile Mnesia with the compiler option 'debug'.
+%%
+%% In test programs ?activate_debug_fun should be called
+%% in order to bind a fun to the debug identifier stated
+%% in the call to ?eval_debug_fun.
+%%
+%% If eval_debug_fun finds that the fun is activated it
+%% invokes the fun as NewContext = Fun(PreviousContext, EvalContext)
+%% and replaces the PreviousContext with the NewContext.
+%% The initial context of a debug_fun is given as argument to
+%% activate_debug_fun.
+
+-define(DEBUG_TAB, mnesia_debug).
+-record(debug_info, {id, function, context, file, line}).
+
+scratch_debug_fun() ->
+    dbg_out("scratch_debug_fun(): ~p~n", [?DEBUG_TAB]),
+    (catch ?ets_delete_table(?DEBUG_TAB)),
+    ?ets_new_table(?DEBUG_TAB, [set, public, named_table, {keypos, 2}]).
+
+activate_debug_fun(FunId, Fun, InitialContext, File, Line) ->
+    Info = #debug_info{id = FunId,
+		       function = Fun,
+		       context = InitialContext,
+		       file = File,
+		       line = Line
+		      },
+    update_debug_info(Info).
+
+update_debug_info(Info) ->
+    case catch ?ets_insert(?DEBUG_TAB, Info) of
+	{'EXIT', _} ->
+	    scratch_debug_fun(),
+	    ?ets_insert(?DEBUG_TAB, Info);
+	_ ->
+	    ok
+    end,
+    dbg_out("update_debug_info(~p)~n", [Info]),
+    ok.
+
+deactivate_debug_fun(FunId, _File, _Line) ->
+    catch ?ets_delete(?DEBUG_TAB, FunId),
+    ok.
+
+eval_debug_fun(FunId, EvalContext, EvalFile, EvalLine) ->
+    case catch ?ets_lookup(?DEBUG_TAB, FunId) of
+	[] ->
+	    ok;
+	[Info] ->
+	    OldContext = Info#debug_info.context,
+	    dbg_out("~s(~p): ~w "
+		    "activated in ~s(~p)~n  "
+		    "eval_debug_fun(~w, ~w)~n",
+		    [filename:basename(EvalFile), EvalLine, Info#debug_info.id,
+		     filename:basename(Info#debug_info.file), Info#debug_info.line,
+		     OldContext, EvalContext]),
+	    Fun = Info#debug_info.function,
+	    NewContext = Fun(OldContext, EvalContext),
+
+	    case catch ?ets_lookup(?DEBUG_TAB, FunId) of
+		[Info] when NewContext /= OldContext ->
+		    NewInfo = Info#debug_info{context = NewContext},
+		    update_debug_info(NewInfo);
+		_ ->
+		    ok
+	    end;
+	{'EXIT', _} -> ok
+    end.
+
+-ifdef(debug).
+    is_debug_compiled() -> true.
+-else.
+    is_debug_compiled() -> false.
+-endif.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_loader.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_loader.erl
new file mode 100644
index 0000000000..f21a8240aa
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_loader.erl
@@ -0,0 +1,805 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_loader.erl,v 1.2 2010/03/04 13:54:19 maria Exp $
+%%
+%%% Purpose : Loads tables from local disc or from remote node
+
+-module(mnesia_loader).
+
+%% Mnesia internal stuff
+-export([disc_load_table/2,
+	 net_load_table/4,
+	 send_table/3]).
+
+-export([old_node_init_table/6]). %% Spawned old node protocol conversion hack
+-export([spawned_receiver/8]).    %% Spawned lock taking process
+
+-import(mnesia_lib, [set/2, fatal/2, verbose/2, dbg_out/2]).
+
+-include("mnesia.hrl").
+
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason);
+	Value -> Value
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Load a table from local disc
+
+disc_load_table(Tab, Reason) ->
+    Storage =  val({Tab, storage_type}),
+    Type = val({Tab, setorbag}),
+    dbg_out("Getting table ~p (~p) from disc: ~p~n",
+	    [Tab, Storage, Reason]),
+    ?eval_debug_fun({?MODULE, do_get_disc_copy},
+		    [{tab, Tab},
+		     {reason, Reason},
+		     {storage, Storage},
+		     {type, Type}]),
+    do_get_disc_copy2(Tab, Reason, Storage, Type).
+
+do_get_disc_copy2(Tab, _Reason, Storage, _Type) when Storage == unknown ->
+    verbose("Local table copy of ~p has recently been deleted, ignored.~n",
+	    [Tab]),
+    {loaded, ok};  %% ?
+do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_copies ->
+    %% NOW we create the actual table
+    Repair = mnesia_monitor:get_env(auto_repair),
+    Args = [{keypos, 2}, public, named_table, Type],
+    case Reason of
+	{dumper, _} -> %% Resources allready allocated
+	    ignore;
+	_ ->
+	    mnesia_monitor:mktab(Tab, Args),
+	    Count = mnesia_log:dcd2ets(Tab, Repair),
+	    case ets:info(Tab, size) of
+		X when X < Count * 4 ->
+		    ok = mnesia_log:ets2dcd(Tab);
+		_ ->
+		    ignore
+	    end
+    end,
+    mnesia_index:init_index(Tab, Storage),
+    snmpify(Tab, Storage),
+    set({Tab, load_node}, node()),
+    set({Tab, load_reason}, Reason),
+    {loaded, ok};
+
+do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == ram_copies ->
+    Args = [{keypos, 2}, public, named_table, Type],
+    case Reason of
+	{dumper, _} -> %% Resources allready allocated
+	    ignore;
+	_ ->
+	    mnesia_monitor:mktab(Tab, Args),
+	    Fname = mnesia_lib:tab2dcd(Tab),
+	    Datname = mnesia_lib:tab2dat(Tab),
+	    Repair = mnesia_monitor:get_env(auto_repair),
+	    case mnesia_monitor:use_dir() of
+		true ->
+		    case mnesia_lib:exists(Fname) of
+			true -> mnesia_log:dcd2ets(Tab, Repair);
+			false ->
+			    case mnesia_lib:exists(Datname) of
+				true ->
+				    mnesia_lib:dets_to_ets(Tab, Tab, Datname,
+							   Type, Repair, no);
+				false ->
+				    false
+			    end
+		    end;
+		false ->
+		    false
+	    end
+    end,
+    mnesia_index:init_index(Tab, Storage),
+    snmpify(Tab, Storage),
+    set({Tab, load_node}, node()),
+    set({Tab, load_reason}, Reason),
+    {loaded, ok};
+
+do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_only_copies ->
+    Args = [{file, mnesia_lib:tab2dat(Tab)},
+	    {type, mnesia_lib:disk_type(Tab, Type)},
+	    {keypos, 2},
+	    {repair, mnesia_monitor:get_env(auto_repair)}],
+    case Reason of
+	{dumper, _} ->
+	    mnesia_index:init_index(Tab, Storage),
+	    snmpify(Tab, Storage),
+	    set({Tab, load_node}, node()),
+	    set({Tab, load_reason}, Reason),
+	    {loaded, ok};
+	_ ->
+	    case mnesia_monitor:open_dets(Tab, Args) of
+		{ok, _} ->
+		    mnesia_index:init_index(Tab, Storage),
+		    snmpify(Tab, Storage),
+		    set({Tab, load_node}, node()),
+		    set({Tab, load_reason}, Reason),
+		    {loaded, ok};
+		{error, Error} ->
+		    {not_loaded, {"Failed to create dets table", Error}}
+	    end
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Load a table from a remote node
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Receiver                             Sender
+%% --------                             ------
+%% Grab schema lock on table
+%%                                      Determine table size
+%% Create empty pre-grown table
+%%                                      Grab read lock on table
+%%                                      Let receiver subscribe on updates done on sender node
+%%                                      Disable rehashing of table
+%%                                      Release read lock on table
+%%                                      Send table to receiver in chunks
+%%
+%%                                      Grab read lock on table
+%% Block dirty updates
+%%                                      Update wherabouts
+%%
+%%                                      Cancel the update subscription
+%% Process the subscription events
+%% Optionally dump to disc
+%% Unblock dirty updates
+%%                                      Release read lock on table
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(MAX_TRANSFER_SIZE, 7500).
+-define(MAX_RAM_FILE_SIZE, 1000000).
+-define(MAX_RAM_TRANSFERS, (?MAX_RAM_FILE_SIZE div ?MAX_TRANSFER_SIZE) + 1).
+-define(MAX_NOPACKETS, 20).
+
+net_load_table(Tab, Reason, Ns, Cs)
+        when Reason == {dumper,add_table_copy} ->
+    try_net_load_table(Tab, Reason, Ns, Cs);
+net_load_table(Tab, Reason, Ns, _Cs) ->
+    try_net_load_table(Tab, Reason, Ns, val({Tab, cstruct})).
+
+try_net_load_table(Tab, _Reason, [], _Cs) ->
+    verbose("Copy failed. No active replicas of ~p are available.~n", [Tab]),
+    {not_loaded, none_active};
+try_net_load_table(Tab, Reason, Ns, Cs) ->
+    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
+    do_get_network_copy(Tab, Reason, Ns, Storage, Cs).
+
+do_get_network_copy(Tab, _Reason, _Ns, unknown, _Cs) ->
+    verbose("Local table copy of ~p has recently been deleted, ignored.~n", [Tab]),
+    {not_loaded, storage_unknown};
+do_get_network_copy(Tab, Reason, Ns, Storage, Cs) ->
+    [Node | Tail] = Ns,
+    dbg_out("Getting table ~p (~p) from node ~p: ~p~n",
+	    [Tab, Storage, Node, Reason]),
+    ?eval_debug_fun({?MODULE, do_get_network_copy},
+		    [{tab, Tab}, {reason, Reason},
+		     {nodes, Ns}, {storage, Storage}]),
+    mnesia_controller:start_remote_sender(Node, Tab, self(), Storage),
+    put(mnesia_table_sender_node, {Tab, Node}),
+    case init_receiver(Node, Tab, Storage, Cs, Reason) of
+	ok ->
+	    set({Tab, load_node}, Node),
+	    set({Tab, load_reason}, Reason),
+	    mnesia_controller:i_have_tab(Tab),
+	    dbg_out("Table ~p copied from ~p to ~p~n", [Tab, Node, node()]),
+	    {loaded, ok};
+	Err = {error, _} when element(1, Reason) == dumper ->
+	    {not_loaded,Err};
+	restart ->
+	    try_net_load_table(Tab, Reason, Tail, Cs);
+	down ->
+	    try_net_load_table(Tab, Reason, Tail, Cs)
+    end.
+
+snmpify(Tab, Storage) ->
+    do_snmpify(Tab, val({Tab, snmp}), Storage).
+
+do_snmpify(_Tab, [], _Storage) ->
+    ignore;
+do_snmpify(Tab, Us, Storage) ->
+    Snmp = mnesia_snmp_hook:create_table(Us, Tab, Storage),
+    set({Tab, {index, snmp}}, Snmp).
+
+%% Start the recieiver
+%% Sender should be started first, so we don't have the schema-read
+%% lock to long (or get stuck in a deadlock)
+init_receiver(Node, Tab, Storage, Cs, Reason) ->
+    receive
+	{SenderPid, {first, TabSize}} ->
+	    spawn_receiver(Tab,Storage,Cs,SenderPid,
+			   TabSize,false,Reason);
+	{SenderPid, {first, TabSize, DetsData}} ->
+	    spawn_receiver(Tab,Storage,Cs,SenderPid,
+			   TabSize,DetsData,Reason);
+	%% Protocol conversion hack
+	{copier_done, Node} ->
+	    dbg_out("Sender of table ~p crashed on node ~p ~n", [Tab, Node]),
+	    down(Tab, Storage)
+    end.
+
+
+table_init_fun(SenderPid) ->
+    PConv = mnesia_monitor:needs_protocol_conversion(node(SenderPid)),
+    MeMyselfAndI = self(),
+    fun(read) ->
+	    Receiver =
+		if
+		    PConv == true ->
+			MeMyselfAndI ! {actual_tabrec, self()},
+			MeMyselfAndI; %% Old mnesia
+		    PConv == false -> self()
+		end,
+	    SenderPid ! {Receiver, more},
+	    get_data(SenderPid, Receiver)
+    end.
+
+
+%% Add_table_copy get's it's own locks.
+spawn_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,{dumper,add_table_copy}) ->
+    Init = table_init_fun(SenderPid),
+    case do_init_table(Tab,Storage,Cs,SenderPid,TabSize,DetsData,self(), Init) of
+	Err = {error, _} ->
+	    SenderPid ! {copier_done, node()},
+	    Err;
+	Else ->
+	    Else
+    end;
+
+spawn_receiver(Tab,Storage,Cs,SenderPid,
+	       TabSize,DetsData,Reason) ->
+    %% Grab a schema lock to avoid deadlock between table_loader and schema_commit dumping.
+    %% Both may grab tables-locks in different order.
+    Load = fun() ->
+		   {_,Tid,Ts} = get(mnesia_activity_state),
+		   mnesia_locker:rlock(Tid, Ts#tidstore.store,
+				       {schema, Tab}),
+		   Init = table_init_fun(SenderPid),
+		   Pid = spawn_link(?MODULE, spawned_receiver,
+				    [self(),Tab,Storage,Cs,
+				     SenderPid,TabSize,DetsData,
+				     Init]),
+		   put(mnesia_real_loader, Pid),
+		   wait_on_load_complete(Pid)
+	   end,
+    Res = case mnesia:transaction(Load, 20) of
+	      {'atomic', {error,Result}} when element(1,Reason) == dumper ->
+		  SenderPid ! {copier_done, node()},
+		  {error,Result};
+	      {'atomic', {error,Result}} ->
+		  SenderPid ! {copier_done, node()},
+		  fatal("Cannot create table ~p: ~p~n",
+			[[Tab, Storage], Result]);
+	      {'atomic', Result} -> Result;
+	      {aborted, nomore} ->
+		  SenderPid ! {copier_done, node()},
+		  restart;
+	      {aborted, _ } ->
+		  SenderPid ! {copier_done, node()},
+		  down  %% either this node or sender is dying
+	  end,
+    unlink(whereis(mnesia_tm)),  %% Avoid late unlink from tm
+    Res.
+
+spawned_receiver(ReplyTo,Tab,Storage,Cs,
+		 SenderPid,TabSize,DetsData, Init) ->
+    process_flag(trap_exit, true),
+    Done = do_init_table(Tab,Storage,Cs,
+			 SenderPid,TabSize,DetsData,
+			 ReplyTo, Init),
+    ReplyTo ! {self(),Done},
+    unlink(ReplyTo),
+    unlink(whereis(mnesia_controller)),
+    exit(normal).
+
+wait_on_load_complete(Pid) ->
+    receive
+	{Pid, Res} ->
+	    Res;
+	{'EXIT', Pid, Reason} ->
+	    exit(Reason);
+	Else ->
+	    Pid ! Else,
+	    wait_on_load_complete(Pid)
+    end.
+
+tab_receiver(Node, Tab, Storage, Cs, PConv, OrigTabRec) ->
+    receive
+	{SenderPid, {no_more, DatBin}} when PConv == false ->
+	    finish_copy(Storage,Tab,Cs,SenderPid,DatBin,OrigTabRec);
+
+	%% Protocol conversion hack
+	{SenderPid, {no_more, DatBin}} when pid(PConv) ->
+	    PConv ! {SenderPid, no_more},
+	    receive
+		{old_init_table_complete, ok} ->
+		    finish_copy(Storage, Tab, Cs, SenderPid, DatBin,OrigTabRec);
+		{old_init_table_complete, Reason} ->
+		    Msg = "OLD: [d]ets:init table failed",
+		    dbg_out("~s: ~p: ~p~n", [Msg, Tab, Reason]),
+		    down(Tab, Storage)
+	    end;
+
+	{actual_tabrec, Pid} ->
+	    tab_receiver(Node, Tab, Storage, Cs, Pid,OrigTabRec);
+
+	{SenderPid, {more, [Recs]}} when pid(PConv) ->
+	    PConv ! {SenderPid, {more, Recs}}, %% Forward Msg to OldNodes
+	    tab_receiver(Node, Tab, Storage, Cs, PConv,OrigTabRec);
+
+	{'EXIT', PConv, Reason} ->  %% [d]ets:init process crashed
+	    Msg = "Receiver crashed",
+	    dbg_out("~s: ~p: ~p~n", [Msg, Tab, Reason]),
+	    down(Tab, Storage);
+
+	%% Protocol conversion hack
+	{copier_done, Node} ->
+	    dbg_out("Sender of table ~p crashed on node ~p ~n", [Tab, Node]),
+	    down(Tab, Storage);
+
+	{'EXIT', Pid, Reason} ->
+	    handle_exit(Pid, Reason),
+	    tab_receiver(Node, Tab, Storage, Cs, PConv,OrigTabRec)
+    end.
+
+create_table(Tab, TabSize, Storage, Cs) ->
+    if
+	Storage == disc_only_copies ->
+	    mnesia_lib:lock_table(Tab),
+	    Tmp = mnesia_lib:tab2tmp(Tab),
+	    Size = lists:max([TabSize, 256]),
+	    Args = [{file, Tmp},
+		    {keypos, 2},
+%%		    {ram_file, true},
+		    {estimated_no_objects, Size},
+		    {repair, mnesia_monitor:get_env(auto_repair)},
+		    {type, mnesia_lib:disk_type(Tab, Cs#cstruct.type)}],
+	    file:delete(Tmp),
+	    case mnesia_lib:dets_sync_open(Tab, Args) of
+		{ok, _} ->
+		    mnesia_lib:unlock_table(Tab),
+		    {Storage, Tab};
+		Else ->
+		    mnesia_lib:unlock_table(Tab),
+		    Else
+	    end;
+	(Storage == ram_copies) or (Storage == disc_copies) ->
+	    Args = [{keypos, 2}, public, named_table, Cs#cstruct.type],
+	    case mnesia_monitor:unsafe_mktab(Tab, Args) of
+		Tab ->
+		    {Storage, Tab};
+		Else ->
+		    Else
+	    end
+    end.
+
+do_init_table(Tab,Storage,Cs,SenderPid,
+	      TabSize,DetsInfo,OrigTabRec,Init) ->
+    case create_table(Tab, TabSize, Storage, Cs) of
+	{Storage,Tab} ->
+	    %% Debug info
+	    Node = node(SenderPid),
+	    put(mnesia_table_receiver, {Tab, Node, SenderPid}),
+	    mnesia_tm:block_tab(Tab),
+	    PConv = mnesia_monitor:needs_protocol_conversion(Node),
+
+	    case init_table(Tab,Storage,Init,PConv,DetsInfo,SenderPid) of
+		ok ->
+		    tab_receiver(Node,Tab,Storage,Cs,PConv,OrigTabRec);
+		Reason ->
+		    Msg = "[d]ets:init table failed",
+		    dbg_out("~s: ~p: ~p~n", [Msg, Tab, Reason]),
+		    down(Tab, Storage)
+	    end;
+	Error ->
+	    Error
+    end.
+
+make_table_fun(Pid, TabRec) ->
+    fun(close) ->
+	    ok;
+       (read) ->
+	    get_data(Pid, TabRec)
+    end.
+
+get_data(Pid, TabRec) ->
+    receive
+	{Pid, {more, Recs}} ->
+	    Pid ! {TabRec, more},
+	    {Recs, make_table_fun(Pid,TabRec)};
+	{Pid, no_more} ->
+	    end_of_input;
+	{copier_done, Node} ->
+	    case node(Pid) of
+		Node ->
+		    {copier_done, Node};
+		_ ->
+		    get_data(Pid, TabRec)
+	    end;
+	{'EXIT', Pid, Reason} ->
+	    handle_exit(Pid, Reason),
+	    get_data(Pid, TabRec)
+    end.
+
+init_table(Tab, disc_only_copies, Fun, false, DetsInfo,Sender) ->
+    ErtsVer = erlang:system_info(version),
+    case DetsInfo of
+	{ErtsVer, DetsData}  ->
+	    Res = (catch dets:is_compatible_bchunk_format(Tab, DetsData)),
+	    case Res of
+		{'EXIT',{undef,[{dets,_,_}|_]}} ->
+		    Sender ! {self(), {old_protocol, Tab}},
+		    dets:init_table(Tab, Fun);  %% Old dets version
+		{'EXIT', What} ->
+		    exit(What);
+		false ->
+		    Sender ! {self(), {old_protocol, Tab}},
+		    dets:init_table(Tab, Fun);  %% Old dets version
+		true ->
+		    dets:init_table(Tab, Fun, [{format, bchunk}])
+	    end;
+	Old when Old /= false ->
+	    Sender ! {self(), {old_protocol, Tab}},
+	    dets:init_table(Tab, Fun);  %% Old dets version
+	_ ->
+	    dets:init_table(Tab, Fun)
+    end;
+init_table(Tab, _, Fun, false, _DetsInfo,_) ->
+    case catch ets:init_table(Tab, Fun) of
+	true ->
+	    ok;
+	{'EXIT', Else} -> Else
+    end;
+init_table(Tab, Storage, Fun, true, _DetsInfo, Sender) ->  %% Old Nodes
+    spawn_link(?MODULE, old_node_init_table,
+	       [Tab, Storage, Fun, self(), false, Sender]),
+    ok.
+
+old_node_init_table(Tab, Storage, Fun, TabReceiver, DetsInfo,Sender) ->
+    Res = init_table(Tab, Storage, Fun, false, DetsInfo,Sender),
+    TabReceiver ! {old_init_table_complete, Res},
+    unlink(TabReceiver),
+    ok.
+
+finish_copy(Storage,Tab,Cs,SenderPid,DatBin,OrigTabRec) ->
+    TabRef = {Storage, Tab},
+    subscr_receiver(TabRef, Cs#cstruct.record_name),
+    case handle_last(TabRef, Cs#cstruct.type, DatBin) of
+	ok ->
+	    mnesia_index:init_index(Tab, Storage),
+	    snmpify(Tab, Storage),
+	    %% OrigTabRec must not be the spawned tab-receiver
+	    %% due to old protocol.
+	    SenderPid ! {OrigTabRec, no_more},
+	    mnesia_tm:unblock_tab(Tab),
+	    ok;
+	{error, Reason} ->
+	    Msg = "Failed to handle last",
+	    dbg_out("~s: ~p: ~p~n", [Msg, Tab, Reason]),
+	    down(Tab, Storage)
+    end.
+
+subscr_receiver(TabRef = {_, Tab}, RecName) ->
+    receive
+	{mnesia_table_event, {Op, Val, _Tid}} ->
+	    if
+		Tab == RecName ->
+		    handle_event(TabRef, Op, Val);
+		true ->
+		    handle_event(TabRef, Op, setelement(1, Val, RecName))
+	    end,
+	    subscr_receiver(TabRef, RecName);
+
+	{'EXIT', Pid, Reason} ->
+	    handle_exit(Pid, Reason),
+	    subscr_receiver(TabRef, RecName)
+    after 0 ->
+	    ok
+    end.
+
+handle_event(TabRef, write, Rec) ->
+    db_put(TabRef, Rec);
+handle_event(TabRef, delete, {_Tab, Key}) ->
+    db_erase(TabRef, Key);
+handle_event(TabRef, delete_object, OldRec) ->
+    db_match_erase(TabRef, OldRec);
+handle_event(TabRef, clear_table, {_Tab, _Key}) ->
+    db_match_erase(TabRef, '_').
+
+handle_last({disc_copies, Tab}, _Type, nobin) ->
+    Ret = mnesia_log:ets2dcd(Tab),
+    Fname = mnesia_lib:tab2dat(Tab),
+    case mnesia_lib:exists(Fname) of
+	true ->  %% Remove old .DAT files.
+	    file:delete(Fname);
+	false ->
+	    ok
+    end,
+    Ret;
+
+handle_last({disc_only_copies, Tab}, Type, nobin) ->
+    case mnesia_lib:swap_tmp_files([Tab]) of
+	[] ->
+	    Args = [{file, mnesia_lib:tab2dat(Tab)},
+		    {type, mnesia_lib:disk_type(Tab, Type)},
+		    {keypos, 2},
+		    {repair, mnesia_monitor:get_env(auto_repair)}],
+	    mnesia_monitor:open_dets(Tab, Args),
+	    ok;
+	L when list(L) ->
+	    {error, {"Cannot swap tmp files", Tab, L}}
+    end;
+
+handle_last({ram_copies, _Tab}, _Type, nobin) ->
+    ok;
+handle_last({ram_copies, Tab}, _Type, DatBin) ->
+    case mnesia_monitor:use_dir() of
+	true ->
+	    mnesia_lib:lock_table(Tab),
+	    Tmp = mnesia_lib:tab2tmp(Tab),
+	    ok = file:write_file(Tmp, DatBin),
+	    ok = file:rename(Tmp, mnesia_lib:tab2dcd(Tab)),
+	    mnesia_lib:unlock_table(Tab),
+	    ok;
+	false ->
+	    ok
+    end.
+
+down(Tab, Storage) ->
+    case Storage of
+	ram_copies ->
+	    catch ?ets_delete_table(Tab);
+	disc_copies ->
+	    catch ?ets_delete_table(Tab);
+	disc_only_copies ->
+	    mnesia_lib:cleanup_tmp_files([Tab])
+    end,
+    mnesia_checkpoint:tm_del_copy(Tab, node()),
+    mnesia_controller:sync_del_table_copy_whereabouts(Tab, node()),
+    mnesia_tm:unblock_tab(Tab),
+    flush_subcrs(),
+    down.
+
+flush_subcrs() ->
+    receive
+	{mnesia_table_event, _} ->
+	    flush_subcrs();
+
+	{'EXIT', Pid, Reason} ->
+	    handle_exit(Pid, Reason),
+	    flush_subcrs()
+    after 0 ->
+	    done
+    end.
+
+db_erase({ram_copies, Tab}, Key) ->
+    true = ?ets_delete(Tab, Key);
+db_erase({disc_copies, Tab}, Key) ->
+    true = ?ets_delete(Tab, Key);
+db_erase({disc_only_copies, Tab}, Key) ->
+    ok = dets:delete(Tab, Key).
+
+db_match_erase({ram_copies, Tab} , Pat) ->
+    true = ?ets_match_delete(Tab, Pat);
+db_match_erase({disc_copies, Tab} , Pat) ->
+    true = ?ets_match_delete(Tab, Pat);
+db_match_erase({disc_only_copies, Tab}, Pat) ->
+    ok = dets:match_delete(Tab, Pat).
+
+db_put({ram_copies, Tab}, Val) ->
+    true = ?ets_insert(Tab, Val);
+db_put({disc_copies, Tab}, Val) ->
+    true = ?ets_insert(Tab, Val);
+db_put({disc_only_copies, Tab}, Val) ->
+    ok = dets:insert(Tab, Val).
+
+%% This code executes at the remote site where the data is
+%% executes in a special copier process.
+
+calc_nokeys(Storage, Tab) ->
+    %% Calculate #keys per transfer
+    Key = mnesia_lib:db_first(Storage, Tab),
+    Recs = mnesia_lib:db_get(Storage, Tab, Key),
+    BinSize = size(term_to_binary(Recs)),
+    (?MAX_TRANSFER_SIZE div BinSize) + 1.
+
+send_table(Pid, Tab, RemoteS) ->
+    case ?catch_val({Tab, storage_type}) of
+	{'EXIT', _} ->
+	    {error, {no_exists, Tab}};
+	unknown ->
+	    {error, {no_exists, Tab}};
+	Storage ->
+	    %% Send first
+	    TabSize = mnesia:table_info(Tab, size),
+	    Pconvert = mnesia_monitor:needs_protocol_conversion(node(Pid)),
+	    KeysPerTransfer = calc_nokeys(Storage, Tab),
+	    ChunkData = dets:info(Tab, bchunk_format),
+
+	    UseDetsChunk =
+		Storage == RemoteS andalso
+		Storage == disc_only_copies andalso
+		ChunkData /= undefined andalso
+		Pconvert == false,
+	    if
+		UseDetsChunk == true ->
+		    DetsInfo = erlang:system_info(version),
+		    Pid ! {self(), {first, TabSize, {DetsInfo, ChunkData}}};
+		true  ->
+		    Pid ! {self(), {first, TabSize}}
+	    end,
+
+	    %% Debug info
+	    put(mnesia_table_sender, {Tab, node(Pid), Pid}),
+	    {Init, Chunk} = reader_funcs(UseDetsChunk, Tab, Storage, KeysPerTransfer),
+
+	    SendIt = fun() ->
+			     prepare_copy(Pid, Tab, Storage),
+			     send_more(Pid, 1, Chunk, Init(), Tab, Pconvert),
+			     finish_copy(Pid, Tab, Storage, RemoteS)
+		     end,
+
+	    case catch SendIt() of
+		receiver_died ->
+		    cleanup_tab_copier(Pid, Storage, Tab),
+		    unlink(whereis(mnesia_tm)),
+		    ok;
+		{_, receiver_died} ->
+		    unlink(whereis(mnesia_tm)),
+		    ok;
+		{'atomic', no_more} ->
+		    unlink(whereis(mnesia_tm)),
+		    ok;
+		Reason ->
+		    cleanup_tab_copier(Pid, Storage, Tab),
+		    unlink(whereis(mnesia_tm)),
+		    {error, Reason}
+	    end
+    end.
+
+prepare_copy(Pid, Tab, Storage) ->
+    Trans =
+	fun() ->
+		mnesia:write_lock_table(Tab),
+		mnesia_subscr:subscribe(Pid, {table, Tab}),
+		update_where_to_write(Tab, node(Pid)),
+		mnesia_lib:db_fixtable(Storage, Tab, true),
+		ok
+	end,
+    case mnesia:transaction(Trans) of
+	{'atomic', ok} ->
+	    ok;
+	{aborted, Reason} ->
+	    exit({tab_copier_prepare, Tab, Reason})
+    end.
+
+update_where_to_write(Tab, Node) ->
+    case val({Tab, access_mode}) of
+	read_only ->
+	    ignore;
+	read_write ->
+	    Current = val({current, db_nodes}),
+	    Ns =
+		case lists:member(Node, Current) of
+		    true -> Current;
+		    false -> [Node | Current]
+		end,
+	    update_where_to_write(Ns, Tab, Node)
+    end.
+
+update_where_to_write([], _, _) ->
+    ok;
+update_where_to_write([H|T], Tab, AddNode) ->
+    rpc:call(H,  mnesia_controller, call,
+	     [{update_where_to_write, [add, Tab, AddNode], self()}]),
+    update_where_to_write(T, Tab, AddNode).
+
+send_more(Pid, N, Chunk, DataState, Tab, OldNode) ->
+    receive
+	{NewPid, more} ->
+	    case send_packet(N - 1, NewPid, Chunk, DataState, OldNode) of
+		New when integer(New) ->
+		    New - 1;
+		NewData ->
+		    send_more(NewPid, ?MAX_NOPACKETS, Chunk, NewData, Tab, OldNode)
+	    end;
+	{_NewPid, {old_protocol, Tab}} ->
+	    Storage =  val({Tab, storage_type}),
+	    {Init, NewChunk} =
+		reader_funcs(false, Tab, Storage, calc_nokeys(Storage, Tab)),
+	    send_more(Pid, 1, NewChunk, Init(), Tab, OldNode);
+
+	{copier_done, Node} when Node == node(Pid)->
+	    verbose("Receiver of table ~p crashed on ~p (more)~n", [Tab, Node]),
+	    throw(receiver_died)
+    end.
+
+reader_funcs(UseDetsChunk, Tab, Storage, KeysPerTransfer) ->
+    case UseDetsChunk of
+	false ->
+	    {fun() -> mnesia_lib:db_init_chunk(Storage, Tab, KeysPerTransfer) end,
+	     fun(Cont) -> mnesia_lib:db_chunk(Storage, Cont) end};
+	true ->
+	    {fun() -> dets_bchunk(Tab, start) end,
+	     fun(Cont) -> dets_bchunk(Tab, Cont) end}
+    end.
+
+dets_bchunk(Tab, Chunk) -> %% Arrg
+    case dets:bchunk(Tab, Chunk) of
+	{Cont, Data} -> {Data, Cont};
+	Else -> Else
+    end.
+
+send_packet(N, Pid, _Chunk, '$end_of_table', OldNode) ->
+    case OldNode of
+	true -> ignore; %% Old nodes can't handle the new no_more
+	false ->  Pid ! {self(), no_more}
+    end,
+    N;
+send_packet(N, Pid, Chunk, {[], Cont}, OldNode) ->
+    send_packet(N, Pid, Chunk, Chunk(Cont), OldNode);
+send_packet(N, Pid, Chunk, {Recs, Cont}, OldNode) when N < ?MAX_NOPACKETS ->
+    case OldNode of
+	true -> Pid ! {self(), {more, [Recs]}}; %% Old need's wrapping list
+	false -> Pid ! {self(), {more, Recs}}
+    end,
+    send_packet(N+1, Pid, Chunk, Chunk(Cont), OldNode);
+send_packet(_N, _Pid, _Chunk, DataState, _OldNode) ->
+    DataState.
+
+finish_copy(Pid, Tab, Storage, RemoteS) ->
+    RecNode = node(Pid),
+    DatBin = dat2bin(Tab, Storage, RemoteS),
+    Trans =
+	fun() ->
+		mnesia:read_lock_table(Tab),
+		A = val({Tab, access_mode}),
+		mnesia_controller:sync_and_block_table_whereabouts(Tab, RecNode, RemoteS, A),
+		cleanup_tab_copier(Pid, Storage, Tab),
+		mnesia_checkpoint:tm_add_copy(Tab, RecNode),
+		Pid ! {self(), {no_more, DatBin}},
+		receive
+		    {Pid, no_more} -> % Dont bother about the spurious 'more' message
+			no_more;
+		    {copier_done, Node} when Node == node(Pid)->
+			verbose("Tab receiver ~p crashed (more): ~p~n", [Tab, Node]),
+			receiver_died
+		end
+	end,
+    mnesia:transaction(Trans).
+
+cleanup_tab_copier(Pid, Storage, Tab) ->
+    mnesia_lib:db_fixtable(Storage, Tab, false),
+    mnesia_subscr:unsubscribe(Pid, {table, Tab}).
+
+dat2bin(Tab, ram_copies, ram_copies) ->
+    mnesia_lib:lock_table(Tab),
+    Res = file:read_file(mnesia_lib:tab2dcd(Tab)),
+    mnesia_lib:unlock_table(Tab),
+    case Res of
+	{ok, DatBin} -> DatBin;
+	_ -> nobin
+    end;
+dat2bin(_Tab, _LocalS, _RemoteS) ->
+    nobin.
+
+handle_exit(Pid, Reason) when node(Pid) == node() ->
+    exit(Reason);
+handle_exit(_Pid, _Reason) ->  %% Not from our node, this will be handled by
+    ignore.                  %% mnesia_down soon.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_locker.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_locker.erl
new file mode 100644
index 0000000000..c24ccc5518
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_locker.erl
@@ -0,0 +1,1021 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_locker.erl,v 1.2 2009/07/01 15:45:40 kostis Exp $
+%%
+-module(mnesia_locker).
+
+-export([
+	 get_held_locks/0,
+	 get_lock_queue/0,
+	 global_lock/5,
+	 ixrlock/5,
+	 init/1,
+	 mnesia_down/2,
+	 release_tid/1,
+	 async_release_tid/2,
+	 send_release_tid/2,
+	 receive_release_tid_acc/2,
+	 rlock/3,
+	 rlock_table/3,
+	 rwlock/3,
+	 sticky_rwlock/3,
+	 start/0,
+	 sticky_wlock/3,
+	 sticky_wlock_table/3,
+	 wlock/3,
+	 wlock_no_exist/4,
+	 wlock_table/3
+	]).
+
+%% sys callback functions
+-export([system_continue/3,
+	 system_terminate/4,
+	 system_code_change/4
+	]).
+
+-include("mnesia.hrl").
+-import(mnesia_lib, [dbg_out/2, error/2, verbose/2]).
+
+-define(dbg(S,V), ok).
+%-define(dbg(S,V), dbg_out("~p:~p: " ++ S, [?MODULE, ?LINE] ++ V)).
+
+-define(ALL, '______WHOLETABLE_____').
+-define(STICK, '______STICK_____').
+-define(GLOBAL, '______GLOBAL_____').
+
+-record(state, {supervisor}).
+
+-record(queue, {oid, tid, op, pid, lucky}).
+
+%% mnesia_held_locks: contain       {Oid, Op, Tid} entries  (bag)
+-define(match_oid_held_locks(Oid),  {Oid, '_', '_'}).
+%% mnesia_tid_locks: contain        {Tid, Oid, Op} entries  (bag)
+-define(match_oid_tid_locks(Tid),   {Tid, '_', '_'}).
+%% mnesia_sticky_locks: contain     {Oid, Node} entries and {Tab, Node} entries (set)
+-define(match_oid_sticky_locks(Oid),{Oid, '_'}).
+%% mnesia_lock_queue: contain       {queue, Oid, Tid, Op, ReplyTo, WaitForTid} entries (ordered_set)
+-define(match_oid_lock_queue(Oid),  #queue{oid=Oid, tid='_', op = '_', pid = '_', lucky = '_'}).
+%% mnesia_lock_counter:             {{write, Tab}, Number} &&
+%%                                  {{read, Tab}, Number} entries  (set)
+
+start() ->
+    mnesia_monitor:start_proc(?MODULE, ?MODULE, init, [self()]).
+
+init(Parent) ->
+    register(?MODULE, self()),
+    process_flag(trap_exit, true),
+    proc_lib:init_ack(Parent, {ok, self()}),
+    loop(#state{supervisor = Parent}).
+
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_);
+	_VaLuE_ -> _VaLuE_
+    end.
+
+reply(From, R) ->
+    From ! {?MODULE, node(), R}.
+
+l_request(Node, X, Store) ->
+    {?MODULE, Node} ! {self(), X},
+    l_req_rec(Node, Store).
+
+l_req_rec(Node, Store) ->
+    ?ets_insert(Store, {nodes, Node}),
+    receive
+	{?MODULE, Node, {switch, Node2, Req}} ->
+	    ?ets_insert(Store, {nodes, Node2}),
+	    {?MODULE, Node2} ! Req,
+	    {switch, Node2, Req};
+	{?MODULE, Node, Reply} ->
+	    Reply;
+	{mnesia_down, Node} ->
+	    {not_granted, {node_not_running, Node}}
+    end.
+
+release_tid(Tid) ->
+    ?MODULE ! {release_tid, Tid}.
+
+async_release_tid(Nodes, Tid) ->
+    rpc:abcast(Nodes, ?MODULE, {release_tid, Tid}).
+
+send_release_tid(Nodes, Tid) ->
+    rpc:abcast(Nodes, ?MODULE, {self(), {sync_release_tid, Tid}}).
+
+receive_release_tid_acc([Node | Nodes], Tid) ->
+    receive
+	{?MODULE, Node, {tid_released, Tid}} ->
+	    receive_release_tid_acc(Nodes, Tid);
+	{mnesia_down, Node} ->
+	    receive_release_tid_acc(Nodes, Tid)
+    end;
+receive_release_tid_acc([], _Tid) ->
+    ok.
+
+loop(State) ->
+    receive
+	{From, {write, Tid, Oid}} ->
+	    try_sticky_lock(Tid, write, From, Oid),
+	    loop(State);
+
+	%% If Key == ?ALL it's a request to lock the entire table
+	%%
+
+	{From, {read, Tid, Oid}} ->
+	    try_sticky_lock(Tid, read, From, Oid),
+	    loop(State);
+
+	%% Really do a  read, but get hold of a write lock
+	%% used by mnesia:wread(Oid).
+
+	{From, {read_write, Tid, Oid}} ->
+	    try_sticky_lock(Tid, read_write, From, Oid),
+	    loop(State);
+
+	%% Tid has somehow terminated, clear up everything
+	%% and pass locks on to queued processes.
+	%% This is the purpose of the mnesia_tid_locks table
+
+	{release_tid, Tid} ->
+	    do_release_tid(Tid),
+	    loop(State);
+
+	%% stick lock, first tries this to the where_to_read Node
+	{From, {test_set_sticky, Tid, {Tab, _} = Oid, Lock}} ->
+	    case ?ets_lookup(mnesia_sticky_locks, Tab) of
+		[] ->
+		    reply(From, not_stuck),
+		    loop(State);
+		[{_,Node}] when Node == node() ->
+		    %% Lock is stuck here, see now if we can just set
+		    %% a regular write lock
+		    try_lock(Tid, Lock, From, Oid),
+		    loop(State);
+		[{_,Node}] ->
+		    reply(From, {stuck_elsewhere, Node}),
+		    loop(State)
+	    end;
+
+	%% If test_set_sticky fails, we send this to all nodes
+	%% after aquiring a real write lock on Oid
+
+	{stick, {Tab, _}, N} ->
+	    ?ets_insert(mnesia_sticky_locks, {Tab, N}),
+	    loop(State);
+
+	%% The caller which sends this message, must have first
+	%% aquired a write lock on the entire table
+	{unstick, Tab} ->
+	    ?ets_delete(mnesia_sticky_locks, Tab),
+	    loop(State);
+
+	{From, {ix_read, Tid, Tab, IxKey, Pos}} ->
+	    case catch mnesia_index:get_index_table(Tab, Pos) of
+		{'EXIT', _} ->
+		    reply(From, {not_granted, {no_exists, Tab, {index, [Pos]}}}),
+		    loop(State);
+		Index ->
+		    Rk = mnesia_lib:elems(2,mnesia_index:db_get(Index, IxKey)),
+		    %% list of real keys
+		    case ?ets_lookup(mnesia_sticky_locks, Tab) of
+			[] ->
+			    set_read_lock_on_all_keys(Tid, From,Tab,Rk,Rk,
+						      []),
+			    loop(State);
+			[{_,N}] when N == node() ->
+			    set_read_lock_on_all_keys(Tid, From,Tab,Rk,Rk,
+						      []),
+			    loop(State);
+			[{_,N}] ->
+			    Req = {From, {ix_read, Tid, Tab, IxKey, Pos}},
+			    From ! {?MODULE, node(), {switch, N, Req}},
+			    loop(State)
+		    end
+	    end;
+
+	{From, {sync_release_tid, Tid}} ->
+	    do_release_tid(Tid),
+	    reply(From, {tid_released, Tid}),
+	    loop(State);
+
+	{release_remote_non_pending, Node, Pending} ->
+	    release_remote_non_pending(Node, Pending),
+	    mnesia_monitor:mnesia_down(?MODULE, Node),
+	    loop(State);
+
+	{'EXIT', Pid, _} when Pid == State#state.supervisor ->
+	    do_stop();
+
+	{system, From, Msg} ->
+	    verbose("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
+	    Parent = State#state.supervisor,
+	    sys:handle_system_msg(Msg, From, Parent, ?MODULE, [], State);
+
+	Msg ->
+	    error("~p got unexpected message: ~p~n", [?MODULE, Msg]),
+	    loop(State)
+    end.
+
+set_lock(Tid, Oid, Op) ->
+    ?dbg("Granted ~p ~p ~p~n", [Tid,Oid,Op]),
+    ?ets_insert(mnesia_held_locks, {Oid, Op, Tid}),
+    ?ets_insert(mnesia_tid_locks, {Tid, Oid, Op}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Acquire locks
+
+try_sticky_lock(Tid, Op, Pid, {Tab, _} = Oid) ->
+    case ?ets_lookup(mnesia_sticky_locks, Tab) of
+	[] ->
+	    try_lock(Tid, Op, Pid, Oid);
+	[{_,N}] when N == node() ->
+	    try_lock(Tid, Op, Pid, Oid);
+	[{_,N}] ->
+	    Req = {Pid, {Op, Tid, Oid}},
+	    Pid ! {?MODULE, node(), {switch, N, Req}}
+    end.
+
+try_lock(Tid, read_write, Pid, Oid) ->
+    try_lock(Tid, read_write, read, write, Pid, Oid);
+try_lock(Tid, Op, Pid, Oid) ->
+    try_lock(Tid, Op, Op, Op, Pid, Oid).
+
+try_lock(Tid, Op, SimpleOp, Lock, Pid, Oid) ->
+    case can_lock(Tid, Lock, Oid, {no, bad_luck}) of
+	yes ->
+	    Reply = grant_lock(Tid, SimpleOp, Lock, Oid),
+	    reply(Pid, Reply);
+	{no, Lucky} ->
+	    C = #cyclic{op = SimpleOp, lock = Lock, oid = Oid, lucky = Lucky},
+	    ?dbg("Rejected ~p ~p ~p ~p ~n", [Tid, Oid, Lock, Lucky]),
+	    reply(Pid, {not_granted, C});
+	{queue, Lucky} ->
+	    ?dbg("Queued ~p ~p ~p ~p ~n", [Tid, Oid, Lock, Lucky]),
+	    %% Append to queue: Nice place for trace output
+	    ?ets_insert(mnesia_lock_queue,
+			#queue{oid = Oid, tid = Tid, op = Op,
+			       pid = Pid, lucky = Lucky}),
+	    ?ets_insert(mnesia_tid_locks, {Tid, Oid, {queued, Op}})
+    end.
+
+grant_lock(Tid, read, Lock, {Tab, Key})
+  when Key /= ?ALL, Tab /= ?GLOBAL ->
+    case node(Tid#tid.pid) == node() of
+	true ->
+	    set_lock(Tid, {Tab, Key}, Lock),
+	    {granted, lookup_in_client};
+	false ->
+	    case catch mnesia_lib:db_get(Tab, Key) of %% lookup as well
+		{'EXIT', _Reason} ->
+		    %% Table has been deleted from this node,
+		    %% restart the transaction.
+		    C = #cyclic{op = read, lock = Lock, oid = {Tab, Key},
+				lucky = nowhere},
+		    {not_granted, C};
+		Val ->
+		    set_lock(Tid, {Tab, Key}, Lock),
+		    {granted, Val}
+	    end
+    end;
+grant_lock(Tid, read, Lock, Oid) ->
+    set_lock(Tid, Oid, Lock),
+    {granted, ok};
+grant_lock(Tid, write, Lock, Oid) ->
+    set_lock(Tid, Oid, Lock),
+    granted.
+
+%% 1) Impose an ordering on all transactions favour old (low tid) transactions
+%%    newer (higher tid) transactions may never wait on older ones,
+%% 2) When releasing the tids from the queue always begin with youngest (high tid)
+%%    because of 1) it will avoid the deadlocks.
+%% 3) TabLocks is the problem :-) They should not starve and not deadlock
+%%    handle tablocks in queue as they had locks on unlocked records.
+
+can_lock(Tid, read, {Tab, Key}, AlreadyQ) when Key /= ?ALL ->
+    %% The key is bound, no need for the other BIF
+    Oid = {Tab, Key},
+    ObjLocks = ?ets_match_object(mnesia_held_locks, {Oid, write, '_'}),
+    TabLocks = ?ets_match_object(mnesia_held_locks, {{Tab, ?ALL}, write, '_'}),
+    check_lock(Tid, Oid, ObjLocks, TabLocks, yes, AlreadyQ, read);
+
+can_lock(Tid, read, Oid, AlreadyQ) -> % Whole tab
+    Tab = element(1, Oid),
+    ObjLocks = ?ets_match_object(mnesia_held_locks, {{Tab, '_'}, write, '_'}),
+    check_lock(Tid, Oid, ObjLocks, [], yes, AlreadyQ, read);
+
+can_lock(Tid, write, {Tab, Key}, AlreadyQ) when Key /= ?ALL ->
+    Oid = {Tab, Key},
+    ObjLocks = ?ets_lookup(mnesia_held_locks, Oid),
+    TabLocks = ?ets_lookup(mnesia_held_locks, {Tab, ?ALL}),
+    check_lock(Tid, Oid, ObjLocks, TabLocks, yes, AlreadyQ, write);
+
+can_lock(Tid, write, Oid, AlreadyQ) -> % Whole tab
+    Tab = element(1, Oid),
+    ObjLocks = ?ets_match_object(mnesia_held_locks, ?match_oid_held_locks({Tab, '_'})),
+    check_lock(Tid, Oid, ObjLocks, [], yes, AlreadyQ, write).
+
+%% Check held locks for conflicting locks
+check_lock(Tid, Oid, [Lock | Locks], TabLocks, X, AlreadyQ, Type) ->
+    case element(3, Lock) of
+	Tid ->
+	    check_lock(Tid, Oid, Locks, TabLocks, X, AlreadyQ, Type);
+	WaitForTid when WaitForTid > Tid -> % Important order
+	    check_lock(Tid, Oid, Locks, TabLocks, {queue, WaitForTid}, AlreadyQ, Type);
+	WaitForTid when Tid#tid.pid == WaitForTid#tid.pid ->
+	    dbg_out("Spurious lock conflict ~w ~w: ~w -> ~w~n",
+		    [Oid, Lock, Tid, WaitForTid]),
+%%	    check_lock(Tid, Oid, Locks, TabLocks, {queue, WaitForTid}, AlreadyQ);
+	    %% BUGBUG Fix this if possible
+	    {no, WaitForTid};
+	WaitForTid ->
+	    {no, WaitForTid}
+    end;
+
+check_lock(_, _, [], [], X, {queue, bad_luck}, _) ->
+    X;  %% The queue should be correct already no need to check it again
+
+check_lock(_, _, [], [], X = {queue, _Tid}, _AlreadyQ, _) ->
+    X;
+
+check_lock(Tid, Oid, [], [], X, AlreadyQ, Type) ->
+    {Tab, Key} = Oid,
+    if
+	Type == write ->
+	    check_queue(Tid, Tab, X, AlreadyQ);
+	Key == ?ALL ->
+	    %% hmm should be solvable by a clever select expr but not today...
+	    check_queue(Tid, Tab, X, AlreadyQ);
+	true ->
+	    %% If there is a queue on that object, read_lock shouldn't be granted
+	    ObjLocks = ets:lookup(mnesia_lock_queue, Oid),
+	    Greatest = max(ObjLocks),
+	    case Greatest of
+		empty ->
+		    check_queue(Tid, Tab, X, AlreadyQ);
+		ObjL when Tid > ObjL ->
+		    {no, ObjL}; %% Starvation Preemption (write waits for read)
+		ObjL ->
+		    check_queue(Tid, Tab, {queue, ObjL}, AlreadyQ)
+	    end
+    end;
+
+check_lock(Tid, Oid, [], TabLocks, X, AlreadyQ, Type) ->
+    check_lock(Tid, Oid, TabLocks, [], X, AlreadyQ, Type).
+
+%% Check queue for conflicting locks
+%% Assume that all queued locks belongs to other tid's
+
+check_queue(Tid, Tab, X, AlreadyQ) ->
+    TabLocks = ets:lookup(mnesia_lock_queue, {Tab,?ALL}),
+    Greatest = max(TabLocks),
+    case Greatest of
+	empty ->
+	    X;
+	Tid ->
+	    X;
+	WaitForTid when WaitForTid#queue.tid > Tid -> % Important order
+	    {queue, WaitForTid};
+	WaitForTid ->
+	    case AlreadyQ of
+		{no, bad_luck} -> {no, WaitForTid};
+		_ ->
+		    erlang:error({mnesia_locker, assert, AlreadyQ})
+	    end
+    end.
+
+max([]) ->
+    empty;
+max([H|R]) ->
+    max(R, H#queue.tid).
+
+max([H|R], Tid) when H#queue.tid > Tid ->
+    max(R, H#queue.tid);
+max([_|R], Tid) ->
+    max(R, Tid);
+max([], Tid) ->
+    Tid.
+
+%% We can't queue the ixlock requests since it
+%% becomes to complivated for little me :-)
+%% If we encounter an object with a wlock we reject the
+%% entire lock request
+%%
+%% BUGBUG: this is actually a bug since we may starve
+
+set_read_lock_on_all_keys(Tid, From, Tab, [RealKey | Tail], Orig, Ack) ->
+    Oid = {Tab, RealKey},
+    case can_lock(Tid, read, Oid, {no, bad_luck}) of
+	yes ->
+	    {granted, Val} = grant_lock(Tid, read, read, Oid),
+	    case opt_lookup_in_client(Val, Oid, read) of  % Ought to be invoked
+		C when record(C, cyclic) ->               % in the client
+		    reply(From, {not_granted, C});
+		Val2 ->
+		    Ack2 = lists:append(Val2, Ack),
+		    set_read_lock_on_all_keys(Tid, From, Tab, Tail, Orig, Ack2)
+	    end;
+	{no, Lucky} ->
+	    C = #cyclic{op = read, lock = read, oid = Oid, lucky = Lucky},
+	    reply(From, {not_granted, C});
+	{queue, Lucky} ->
+	    C = #cyclic{op = read, lock = read, oid = Oid, lucky = Lucky},
+	    reply(From, {not_granted, C})
+    end;
+set_read_lock_on_all_keys(_Tid, From, _Tab, [], Orig, Ack) ->
+    reply(From, {granted, Ack, Orig}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Release of locks
+
+%% Release remote non-pending nodes
+release_remote_non_pending(Node, Pending) ->
+    %% Clear the mnesia_sticky_locks table first, to avoid
+    %% unnecessary requests to the failing node
+    ?ets_match_delete(mnesia_sticky_locks, {'_' , Node}),
+
+    %% Then we have to release all locks held by processes
+    %% running at the failed node and also simply remove all
+    %% queue'd requests back to the failed node
+
+    AllTids = ?ets_match(mnesia_tid_locks, {'$1', '_', '_'}),
+    Tids = [T || [T] <- AllTids, Node == node(T#tid.pid), not lists:member(T, Pending)],
+    do_release_tids(Tids).
+
+do_release_tids([Tid | Tids]) ->
+    do_release_tid(Tid),
+    do_release_tids(Tids);
+do_release_tids([]) ->
+    ok.
+
+do_release_tid(Tid) ->
+    Locks = ?ets_lookup(mnesia_tid_locks, Tid),
+    ?dbg("Release ~p ~p ~n", [Tid, Locks]),
+    ?ets_delete(mnesia_tid_locks, Tid),
+    release_locks(Locks),
+    %% Removed queued locks which has had locks
+    UniqueLocks = keyunique(lists:sort(Locks),[]),
+    rearrange_queue(UniqueLocks).
+
+keyunique([{_Tid, Oid, _Op}|R], Acc = [{_, Oid, _}|_]) ->
+    keyunique(R, Acc);
+keyunique([H|R], Acc) ->
+    keyunique(R, [H|Acc]);
+keyunique([], Acc) ->
+    Acc.
+
+release_locks([Lock | Locks]) ->
+    release_lock(Lock),
+    release_locks(Locks);
+release_locks([]) ->
+    ok.
+
+release_lock({Tid, Oid, {queued, _}}) ->
+    ?ets_match_delete(mnesia_lock_queue,
+		      #queue{oid=Oid, tid = Tid, op = '_',
+			     pid = '_', lucky = '_'});
+release_lock({Tid, Oid, Op}) ->
+    if
+	Op == write ->
+	    ?ets_delete(mnesia_held_locks, Oid);
+	Op == read ->
+	    ?ets_match_delete(mnesia_held_locks, {Oid, Op, Tid})
+    end.
+
+rearrange_queue([{_Tid, {Tab, Key}, _} | Locks]) ->
+    if
+	Key /= ?ALL->
+	    Queue =
+		ets:lookup(mnesia_lock_queue, {Tab, ?ALL}) ++
+		ets:lookup(mnesia_lock_queue, {Tab, Key}),
+	    case Queue of
+		[] ->
+		    ok;
+		_ ->
+		    Sorted = lists:reverse(lists:keysort(#queue.tid, Queue)),
+		    try_waiters_obj(Sorted)
+	    end;
+	true ->
+	    Pat = ?match_oid_lock_queue({Tab, '_'}),
+	    Queue = ?ets_match_object(mnesia_lock_queue, Pat),
+	    Sorted = lists:reverse(lists:keysort(#queue.tid, Queue)),
+	    try_waiters_tab(Sorted)
+    end,
+    ?dbg("RearrQ ~p~n", [Queue]),
+    rearrange_queue(Locks);
+rearrange_queue([]) ->
+    ok.
+
+try_waiters_obj([W | Waiters]) ->
+    case try_waiter(W) of
+	queued ->
+	    no;
+	_ ->
+	    try_waiters_obj(Waiters)
+    end;
+try_waiters_obj([]) ->
+    ok.
+
+try_waiters_tab([W | Waiters]) ->
+    case W#queue.oid of
+	{_Tab, ?ALL} ->
+	    case try_waiter(W) of
+		queued ->
+		    no;
+		_ ->
+		    try_waiters_tab(Waiters)
+	    end;
+	Oid ->
+	    case try_waiter(W) of
+		queued ->
+		    Rest = key_delete_all(Oid, #queue.oid, Waiters),
+		    try_waiters_tab(Rest);
+		_ ->
+		    try_waiters_tab(Waiters)
+	    end
+    end;
+try_waiters_tab([]) ->
+    ok.
+
+try_waiter({queue, Oid, Tid, read_write, ReplyTo, _}) ->
+    try_waiter(Oid, read_write, read, write, ReplyTo, Tid);
+try_waiter({queue, Oid, Tid, Op, ReplyTo, _}) ->
+    try_waiter(Oid, Op, Op, Op, ReplyTo, Tid).
+
+try_waiter(Oid, Op, SimpleOp, Lock, ReplyTo, Tid) ->
+    case can_lock(Tid, Lock, Oid, {queue, bad_luck}) of
+	yes ->
+	    %% Delete from queue: Nice place for trace output
+	    ?ets_match_delete(mnesia_lock_queue,
+			      #queue{oid=Oid, tid = Tid, op = Op,
+				     pid = ReplyTo, lucky = '_'}),
+	    Reply = grant_lock(Tid, SimpleOp, Lock, Oid),
+	    ReplyTo ! {?MODULE, node(), Reply},
+	    locked;
+	{queue, _Why} ->
+	    ?dbg("Keep ~p ~p ~p ~p~n", [Tid, Oid, Lock, _Why]),
+	    queued; % Keep waiter in queue
+	{no, Lucky} ->
+	    C = #cyclic{op = SimpleOp, lock = Lock, oid = Oid, lucky = Lucky},
+	    verbose("** WARNING ** Restarted transaction, possible deadlock in lock queue ~w: cyclic = ~w~n",
+		    [Tid, C]),
+	    ?ets_match_delete(mnesia_lock_queue,
+			      #queue{oid=Oid, tid = Tid, op = Op,
+				     pid = ReplyTo, lucky = '_'}),
+	    Reply = {not_granted, C},
+	    ReplyTo ! {?MODULE, node(), Reply},
+	    removed
+    end.
+
+key_delete_all(Key, Pos, TupleList) ->
+    key_delete_all(Key, Pos, TupleList, []).
+key_delete_all(Key, Pos, [H|T], Ack) when element(Pos, H) == Key ->
+    key_delete_all(Key, Pos, T, Ack);
+key_delete_all(Key, Pos, [H|T], Ack) ->
+    key_delete_all(Key, Pos, T, [H|Ack]);
+key_delete_all(_, _, [], Ack) ->
+    lists:reverse(Ack).
+
+
+%% ********************* end server code ********************
+%% The following code executes at the client side of a transactions
+
+mnesia_down(N, Pending) ->
+    case whereis(?MODULE) of
+	undefined ->
+	    %% Takes care of mnesia_down's in early startup
+	    mnesia_monitor:mnesia_down(?MODULE, N);
+	Pid ->
+	    %% Syncronously call needed in order to avoid
+	    %% race with mnesia_tm's coordinator processes
+	    %% that may restart and acquire new locks.
+	    %% mnesia_monitor ensures the sync.
+	    Pid ! {release_remote_non_pending, N, Pending}
+    end.
+
+%% Aquire a write lock, but do a read, used by
+%% mnesia:wread/1
+
+rwlock(Tid, Store, Oid) ->
+    {Tab, Key} = Oid,
+    case val({Tab, where_to_read}) of
+	nowhere ->
+	    mnesia:abort({no_exists, Tab});
+	Node ->
+	    Lock = write,
+	    case need_lock(Store, Tab, Key, Lock)  of
+		yes ->
+		    Ns = w_nodes(Tab),
+		    Res = get_rwlocks_on_nodes(Ns, Ns, Node, Store, Tid, Oid),
+		    ?ets_insert(Store, {{locks, Tab, Key}, Lock}),
+		    Res;
+		no ->
+		    if
+			Key == ?ALL ->
+			    w_nodes(Tab);
+			Tab == ?GLOBAL ->
+			    w_nodes(Tab);
+			true ->
+			    dirty_rpc(Node, Tab, Key, Lock)
+		    end
+	    end
+    end.
+
+get_rwlocks_on_nodes([Node | Tail], Orig, Node, Store, Tid, Oid) ->
+    Op = {self(), {read_write, Tid, Oid}},
+    {?MODULE, Node} ! Op,
+    ?ets_insert(Store, {nodes, Node}),
+    add_debug(Node),
+    get_rwlocks_on_nodes(Tail, Orig, Node, Store, Tid, Oid);
+get_rwlocks_on_nodes([Node | Tail], Orig, OtherNode, Store, Tid, Oid) ->
+    Op = {self(), {write, Tid, Oid}},
+    {?MODULE, Node} ! Op,
+    add_debug(Node),
+    ?ets_insert(Store, {nodes, Node}),
+    get_rwlocks_on_nodes(Tail, Orig, OtherNode, Store, Tid, Oid);
+get_rwlocks_on_nodes([], Orig, _Node, Store, _Tid, Oid) ->
+    receive_wlocks(Orig, read_write_lock, Store, Oid).
+
+%% Return a list of nodes or abort transaction
+%% WE also insert any additional where_to_write nodes
+%% in the local store under the key == nodes
+
+w_nodes(Tab) ->
+    Nodes = ?catch_val({Tab, where_to_write}),
+    case Nodes of
+	[_ | _] -> Nodes;
+	_ ->  mnesia:abort({no_exists, Tab})
+    end.
+
+%% aquire a sticky wlock, a sticky lock is a lock
+%% which remains at this node after the termination of the
+%% transaction.
+
+sticky_wlock(Tid, Store, Oid) ->
+    sticky_lock(Tid, Store, Oid, write).
+
+sticky_rwlock(Tid, Store, Oid) ->
+    sticky_lock(Tid, Store, Oid, read_write).
+
+sticky_lock(Tid, Store, {Tab, Key} = Oid, Lock) ->
+    N = val({Tab, where_to_read}),
+    if
+	node() == N ->
+	    case need_lock(Store, Tab, Key, write) of
+		yes ->
+		    do_sticky_lock(Tid, Store, Oid, Lock);
+		no ->
+		    dirty_sticky_lock(Tab, Key, [N], Lock)
+	    end;
+	true ->
+	    mnesia:abort({not_local, Tab})
+    end.
+
+do_sticky_lock(Tid, Store, {Tab, Key} = Oid, Lock) ->
+    ?MODULE ! {self(), {test_set_sticky, Tid, Oid, Lock}},
+    receive
+	{?MODULE, _N, granted} ->
+	    ?ets_insert(Store, {{locks, Tab, Key}, write}),
+	    granted;
+	{?MODULE, _N, {granted, Val}} -> %% for rwlocks
+	    case opt_lookup_in_client(Val, Oid, write) of
+		C when record(C, cyclic) ->
+		    exit({aborted, C});
+		Val2 ->
+		    ?ets_insert(Store, {{locks, Tab, Key}, write}),
+		    Val2
+	    end;
+	{?MODULE, _N, {not_granted, Reason}} ->
+	    exit({aborted, Reason});
+	{?MODULE, N, not_stuck} ->
+	    not_stuck(Tid, Store, Tab, Key, Oid, Lock, N),
+	    dirty_sticky_lock(Tab, Key, [N], Lock);
+	{mnesia_down, N} ->
+	    exit({aborted, {node_not_running, N}});
+	{?MODULE, N, {stuck_elsewhere, _N2}} ->
+	    stuck_elsewhere(Tid, Store, Tab, Key, Oid, Lock),
+	    dirty_sticky_lock(Tab, Key, [N], Lock)
+    end.
+
+not_stuck(Tid, Store, Tab, _Key, Oid, _Lock, N) ->
+    rlock(Tid, Store, {Tab, ?ALL}),   %% needed?
+    wlock(Tid, Store, Oid),           %% perfect sync
+    wlock(Tid, Store, {Tab, ?STICK}), %% max one sticker/table
+    Ns = val({Tab, where_to_write}),
+    rpc:abcast(Ns, ?MODULE, {stick, Oid, N}).
+
+stuck_elsewhere(Tid, Store, Tab, _Key, Oid, _Lock) ->
+    rlock(Tid, Store, {Tab, ?ALL}),   %% needed?
+    wlock(Tid, Store, Oid),           %% perfect sync
+    wlock(Tid, Store, {Tab, ?STICK}), %% max one sticker/table
+    Ns = val({Tab, where_to_write}),
+    rpc:abcast(Ns, ?MODULE, {unstick, Tab}).
+
+dirty_sticky_lock(Tab, Key, Nodes, Lock) ->
+    if
+	Lock == read_write ->
+	    mnesia_lib:db_get(Tab, Key);
+	Key == ?ALL ->
+	    Nodes;
+	Tab == ?GLOBAL ->
+	    Nodes;
+	true ->
+	    ok
+    end.
+
+sticky_wlock_table(Tid, Store, Tab) ->
+    sticky_lock(Tid, Store, {Tab, ?ALL}, write).
+
+%% aquire a wlock on Oid
+%% We store a {Tabname, write, Tid} in all locktables
+%% on all nodes containing a copy of Tabname
+%% We also store an item {{locks, Tab, Key}, write} in the
+%% local store when we have aquired the lock.
+%%
+wlock(Tid, Store, Oid) ->
+    {Tab, Key} = Oid,
+    case need_lock(Store, Tab, Key, write) of
+	yes ->
+	    Ns = w_nodes(Tab),
+	    Op = {self(), {write, Tid, Oid}},
+	    ?ets_insert(Store, {{locks, Tab, Key}, write}),
+	    get_wlocks_on_nodes(Ns, Ns, Store, Op, Oid);
+	no when Key /= ?ALL, Tab /= ?GLOBAL ->
+	    [];
+	no ->
+	    w_nodes(Tab)
+    end.
+
+wlock_table(Tid, Store, Tab) ->
+    wlock(Tid, Store, {Tab, ?ALL}).
+
+%% Write lock even if the table does not exist
+
+wlock_no_exist(Tid, Store, Tab, Ns) ->
+    Oid = {Tab, ?ALL},
+    Op = {self(), {write, Tid, Oid}},
+    get_wlocks_on_nodes(Ns, Ns, Store, Op, Oid).
+
+need_lock(Store, Tab, Key, LockPattern) ->
+    TabL = ?ets_match_object(Store, {{locks, Tab, ?ALL}, LockPattern}),
+    if
+	TabL == [] ->
+	    KeyL = ?ets_match_object(Store, {{locks, Tab, Key}, LockPattern}),
+	    if
+		KeyL == [] ->
+		    yes;
+		true  ->
+		    no
+	    end;
+	true ->
+	    no
+    end.
+
+add_debug(Node) ->  % Use process dictionary for debug info
+    case get(mnesia_wlock_nodes) of
+	undefined ->
+	    put(mnesia_wlock_nodes, [Node]);
+	NodeList  ->
+	    put(mnesia_wlock_nodes, [Node|NodeList])
+    end.
+
+del_debug(Node) ->
+    case get(mnesia_wlock_nodes) of
+	undefined ->  % Shouldn't happen
+	    ignore;
+	[Node] ->
+	    erase(mnesia_wlock_nodes);
+	List ->
+	    put(mnesia_wlock_nodes, lists:delete(Node, List))
+    end.
+
+%% We first send lock requests to the lockmanagers on all
+%% nodes holding a copy of the table
+
+get_wlocks_on_nodes([Node | Tail], Orig, Store, Request, Oid) ->
+    {?MODULE, Node} ! Request,
+    ?ets_insert(Store, {nodes, Node}),
+    add_debug(Node),
+    get_wlocks_on_nodes(Tail, Orig, Store, Request, Oid);
+get_wlocks_on_nodes([], Orig, Store, _Request, Oid) ->
+    receive_wlocks(Orig, Orig, Store, Oid).
+
+receive_wlocks([Node | Tail], Res, Store, Oid) ->
+    receive
+	{?MODULE, Node, granted} ->
+	    del_debug(Node),
+	    receive_wlocks(Tail, Res, Store, Oid);
+	{?MODULE, Node, {granted, Val}} -> %% for rwlocks
+	    del_debug(Node),
+	    case opt_lookup_in_client(Val, Oid, write) of
+		C when record(C, cyclic) ->
+		    flush_remaining(Tail, Node, {aborted, C});
+		Val2 ->
+		    receive_wlocks(Tail, Val2, Store, Oid)
+	    end;
+	{?MODULE, Node, {not_granted, Reason}} ->
+	    del_debug(Node),
+	    Reason1 = {aborted, Reason},
+	    flush_remaining(Tail, Node, Reason1);
+	{mnesia_down, Node} ->
+	    del_debug(Node),
+	    Reason1 = {aborted, {node_not_running, Node}},
+	    flush_remaining(Tail, Node, Reason1);
+	{?MODULE, Node, {switch, Node2, Req}} -> %% for rwlocks
+	    del_debug(Node),
+	    add_debug(Node2),
+	    ?ets_insert(Store, {nodes, Node2}),
+	    {?MODULE, Node2} ! Req,
+	    receive_wlocks([Node2 | Tail], Res, Store, Oid)
+    end;
+
+receive_wlocks([], Res, _Store, _Oid) ->
+    Res.
+
+flush_remaining([], _SkipNode, Res) ->
+    exit(Res);
+flush_remaining([SkipNode | Tail ], SkipNode, Res) ->
+    del_debug(SkipNode),
+    flush_remaining(Tail, SkipNode, Res);
+flush_remaining([Node | Tail], SkipNode, Res) ->
+    receive
+	{?MODULE, Node, _} ->
+	    del_debug(Node),
+	    flush_remaining(Tail, SkipNode, Res);
+	{mnesia_down, Node} ->
+	    del_debug(Node),
+	    flush_remaining(Tail, SkipNode, {aborted, {node_not_running, Node}})
+    end.
+
+opt_lookup_in_client(lookup_in_client, Oid, Lock) ->
+    {Tab, Key} = Oid,
+    case catch mnesia_lib:db_get(Tab, Key) of
+	{'EXIT', _} ->
+	    %% Table has been deleted from this node,
+	    %% restart the transaction.
+	    #cyclic{op = read, lock = Lock, oid = Oid, lucky = nowhere};
+	Val ->
+	    Val
+    end;
+opt_lookup_in_client(Val, _Oid, _Lock) ->
+    Val.
+
+return_granted_or_nodes({_, ?ALL}   , Nodes) -> Nodes;
+return_granted_or_nodes({?GLOBAL, _}, Nodes) -> Nodes;
+return_granted_or_nodes(_           , _Nodes) -> granted.
+
+%% We store a {Tab, read, From} item in the
+%% locks table on the node where we actually do pick up the object
+%% and we also store an item {lock, Oid, read} in our local store
+%% so that we can release any locks we hold when we commit.
+%% This function not only aquires a read lock, but also reads the object
+
+%% Oid's are always {Tab, Key} tuples
+rlock(Tid, Store, Oid) ->
+    {Tab, Key} = Oid,
+    case val({Tab, where_to_read}) of
+	nowhere ->
+	    mnesia:abort({no_exists, Tab});
+	Node ->
+	    case need_lock(Store, Tab, Key, '_') of
+		yes ->
+		    R = l_request(Node, {read, Tid, Oid}, Store),
+		    rlock_get_reply(Node, Store, Oid, R);
+		no ->
+		    if
+			Key == ?ALL ->
+			    [Node];
+			Tab == ?GLOBAL ->
+			    [Node];
+			true ->
+			    dirty_rpc(Node, Tab, Key, read)
+		    end
+	    end
+    end.
+
+dirty_rpc(nowhere, Tab, Key, _Lock) ->
+    mnesia:abort({no_exists, {Tab, Key}});
+dirty_rpc(Node, _Tab, ?ALL, _Lock) ->
+    [Node];
+dirty_rpc(Node, ?GLOBAL, _Key, _Lock) ->
+    [Node];
+dirty_rpc(Node, Tab, Key, Lock) ->
+    Args = [Tab, Key],
+    case rpc:call(Node, mnesia_lib, db_get, Args) of
+	{badrpc, Reason} ->
+	    case val({Tab, where_to_read}) of
+		Node ->
+		    ErrorTag = mnesia_lib:dirty_rpc_error_tag(Reason),
+		    mnesia:abort({ErrorTag, Args});
+		_NewNode ->
+		    %% Table has been deleted from the node,
+		    %% restart the transaction.
+		    C = #cyclic{op = read, lock = Lock, oid = {Tab, Key}, lucky = nowhere},
+		    exit({aborted, C})
+	    end;
+	Other ->
+	    Other
+    end.
+
+rlock_get_reply(Node, Store, Oid, {granted, V}) ->
+    {Tab, Key} = Oid,
+    ?ets_insert(Store, {{locks, Tab, Key}, read}),
+    ?ets_insert(Store, {nodes, Node}),
+    case opt_lookup_in_client(V, Oid, read) of
+	C when record(C, cyclic) ->
+	    mnesia:abort(C);
+	Val ->
+	    Val
+    end;
+rlock_get_reply(Node, Store, Oid, granted) ->
+    {Tab, Key} = Oid,
+    ?ets_insert(Store, {{locks, Tab, Key}, read}),
+    ?ets_insert(Store, {nodes, Node}),
+    return_granted_or_nodes(Oid, [Node]);
+rlock_get_reply(Node, Store, Tab, {granted, V, RealKeys}) ->
+    L = fun(K) -> ?ets_insert(Store, {{locks, Tab, K}, read}) end,
+    lists:foreach(L, RealKeys),
+    ?ets_insert(Store, {nodes, Node}),
+    V;
+rlock_get_reply(_Node, _Store, _Oid, {not_granted , Reason}) ->
+    exit({aborted, Reason});
+
+rlock_get_reply(_Node, Store, Oid, {switch, N2, Req}) ->
+    ?ets_insert(Store, {nodes, N2}),
+    {?MODULE, N2} ! Req,
+    rlock_get_reply(N2, Store, Oid, l_req_rec(N2, Store)).
+
+
+rlock_table(Tid, Store, Tab) ->
+    rlock(Tid, Store, {Tab, ?ALL}).
+
+ixrlock(Tid, Store, Tab, IxKey, Pos) ->
+    case val({Tab, where_to_read}) of
+	nowhere ->
+	    mnesia:abort({no_exists, Tab});
+	Node ->
+	    R = l_request(Node, {ix_read, Tid, Tab, IxKey, Pos}, Store),
+	    rlock_get_reply(Node, Store, Tab, R)
+    end.
+
+%% Grabs the locks or exits
+global_lock(Tid, Store, Item, write, Ns) ->
+    Oid = {?GLOBAL, Item},
+    Op = {self(), {write, Tid, Oid}},
+    get_wlocks_on_nodes(Ns, Ns, Store, Op, Oid);
+global_lock(Tid, Store, Item, read, Ns) ->
+    Oid = {?GLOBAL, Item},
+    send_requests(Ns, {read, Tid, Oid}),
+    rec_requests(Ns, Oid, Store),
+    Ns.
+
+send_requests([Node | Nodes], X) ->
+    {?MODULE, Node} ! {self(), X},
+    send_requests(Nodes, X);
+send_requests([], _X) ->
+    ok.
+
+rec_requests([Node | Nodes], Oid, Store) ->
+    Res = l_req_rec(Node, Store),
+    case catch rlock_get_reply(Node, Store, Oid, Res) of
+	{'EXIT', Reason} ->
+	    flush_remaining(Nodes, Node, Reason);
+	_ ->
+	    rec_requests(Nodes, Oid, Store)
+    end;
+rec_requests([], _Oid, _Store) ->
+    ok.
+
+get_held_locks() ->
+    ?ets_match_object(mnesia_held_locks, '_').
+
+get_lock_queue() ->
+    Q = ?ets_match_object(mnesia_lock_queue, '_'),
+    [{Oid, Op, Pid, Tid, WFT} || {queue, Oid, Tid, Op, Pid, WFT} <- Q].
+
+do_stop() ->
+    exit(shutdown).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% System upgrade
+
+system_continue(_Parent, _Debug, State) ->
+    loop(State).
+
+system_terminate(_Reason, _Parent, _Debug, _State) ->
+    do_stop().
+
+system_code_change(State, _Module, _OldVsn, _Extra) ->
+    {ok, State}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_log.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_log.erl
new file mode 100644
index 0000000000..47e8be32c0
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_log.erl
@@ -0,0 +1,1019 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_log.erl,v 1.2 2009/07/01 15:45:40 kostis Exp $
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% This module administers three kinds of log files:
+%%
+%% 1 The transaction log
+%%   mnesia_tm appends to the log (via mnesia_log) at the
+%%   end of each transaction (or dirty write) and
+%%   mnesia_dumper reads the log and performs the ops in
+%%   the dat files. The dump_log is done  at startup and
+%%   at intervals controlled by the user.
+%%
+%% 2 The mnesia_down log
+%%   mnesia_tm appends to the log (via mnesia_log) when it
+%%   realizes that mnesia goes up or down on another node.
+%%   mnesia_init reads the log (via mnesia_log) at startup.
+%%
+%% 3 The backup log
+%%   mnesia_schema produces one tiny log when the schema is
+%%   initially created. mnesia_schema also reads the log
+%%   when the user wants tables (possibly incl the schema)
+%%   to be restored. mnesia_log appends to the log when the
+%%   user wants to produce a real backup.
+%%
+%%   The actual access to the backup media is performed via the
+%%   mnesia_backup module for both read and write. mnesia_backup
+%%   uses the disk_log (*), BUT the user may write an own module
+%%   with the same interface as mnesia_backup and configure
+%%   Mnesia so the alternate module performs the actual accesses
+%%   to the backup media. This means that the user may put the
+%%   backup on medias that Mnesia does not know about possibly on
+%%   hosts where Erlang is not running.
+%%
+%% All these logs have to some extent a common structure.
+%% They are all using the disk_log module (*) for the basic
+%% file structure. The disk_log has a repair feature that
+%% can be used to skip erroneous log records if one comes to
+%% the conclusion that it is more important to reuse some
+%% of the log records than the risque of obtaining inconsistent
+%% data. If the data becomes inconsistent it is solely up to the
+%% application to make it consistent again. The automatic
+%% reparation of the disk_log is very powerful, but use it
+%% with extreme care.
+%%
+%% First in all Mnesia's log file is a mnesia log header.
+%% It contains a list with a log_header record as single
+%% element. The structure of the log_header may never be
+%% changed since it may be written to very old backup files.
+%% By holding this record definition stable we can be
+%% able to comprahend backups from timepoint 0. It also
+%% allows us to use the backup format as an interchange
+%% format between Mnesia releases.
+%%
+%% An op-list is a list of tuples with arity 3. Each tuple
+%% has this structure: {Oid, Recs, Op} where Oid is the tuple
+%% {Tab, Key}, Recs is a (possibly empty) list of records and
+%% Op is an atom.
+%%
+%% The log file structure for the transaction log is as follows.
+%%
+%%    After the mnesia log section follows an extended record section
+%%    containing op-lists. There are several values that Op may
+%%    have, such as write, delete, update_counter, delete_object,
+%%    and replace. There is no special end of section marker.
+%%
+%%    +-----------------+
+%%    | mnesia log head |
+%%    +-----------------+
+%%    | extended record |
+%%    | section         |
+%%    +-----------------+
+%%
+%% The log file structure for the mnesia_down log is as follows.
+%%
+%%    After the mnesia log section follows a mnesia_down section
+%%    containg lists with yoyo records as single element.
+%%
+%%    +-----------------+
+%%    | mnesia log head |
+%%    +-----------------+
+%%    | mnesia_down     |
+%%    | section         |
+%%    +-----------------+
+%%
+%% The log file structure for the backup log is as follows.
+%%
+%%    After the mnesia log section follows a schema section
+%%    containing record lists. A record list is a list of tuples
+%%    where {schema, Tab} is interpreted as a delete_table(Tab) and
+%%    {schema, Tab, CreateList} are interpreted as create_table.
+%%
+%%    The record section also contains record lists. In this section
+%%    {Tab, Key} is interpreted as delete({Tab, Key}) and other tuples
+%%    as write(Tuple). There is no special end of section marker.
+%%
+%%    +-----------------+
+%%    | mnesia log head |
+%%    +-----------------+
+%%    | schema section  |
+%%    +-----------------+
+%%    | record section  |
+%%    +-----------------+
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-module(mnesia_log).
+
+-export([
+	 append/2,
+	 backup/1,
+	 backup/2,
+	 backup_checkpoint/2,
+	 backup_checkpoint/3,
+	 backup_log_header/0,
+	 backup_master/2,
+	 chunk_decision_log/1,
+	 chunk_decision_tab/1,
+	 chunk_log/1,
+	 chunk_log/2,
+	 close_decision_log/0,
+	 close_decision_tab/0,
+	 close_log/1,
+	 unsafe_close_log/1,
+	 confirm_log_dump/1,
+	 confirm_decision_log_dump/0,
+	 previous_log_file/0,
+	 previous_decision_log_file/0,
+	 latest_log_file/0,
+	 decision_log_version/0,
+	 decision_log_file/0,
+	 decision_tab_file/0,
+	 decision_tab_version/0,
+	 dcl_version/0,
+	 dcd_version/0,
+	 ets2dcd/1,
+	 ets2dcd/2,
+	 dcd2ets/1,
+	 dcd2ets/2,
+	 init/0,
+	 init_log_dump/0,
+	 log/1,
+	 slog/1,
+	 log_decision/1,
+	 log_files/0,
+	 open_decision_log/0,
+	 trans_log_header/0,
+	 open_decision_tab/0,
+	 dcl_log_header/0,
+	 dcd_log_header/0,
+	 open_log/4,
+	 open_log/6,
+	 prepare_decision_log_dump/0,
+	 prepare_log_dump/1,
+	 save_decision_tab/1,
+	 purge_all_logs/0,
+	 purge_some_logs/0,
+	 stop/0,
+	 tab_copier/3,
+	 version/0,
+	 view/0,
+	 view/1,
+	 write_trans_log_header/0
+	]).
+
+
+-include("mnesia.hrl").
+-import(mnesia_lib, [val/1, dir/1]).
+-import(mnesia_lib, [exists/1, fatal/2, error/2, dbg_out/2]).
+
+trans_log_header() -> log_header(trans_log, version()).
+backup_log_header() -> log_header(backup_log, "1.2").
+decision_log_header() -> log_header(decision_log, decision_log_version()).
+decision_tab_header() -> log_header(decision_tab, decision_tab_version()).
+dcl_log_header() -> log_header(dcl_log, dcl_version()).
+dcd_log_header() -> log_header(dcd_log, dcd_version()).
+
+log_header(Kind, Version) ->
+    #log_header{log_version=Version,
+		log_kind=Kind,
+		mnesia_version=mnesia:system_info(version),
+		node=node(),
+		now=now()}.
+
+version() -> "4.3".
+
+decision_log_version() -> "3.0".
+
+decision_tab_version() -> "1.0".
+
+dcl_version() -> "1.0".
+dcd_version() -> "1.0".
+
+append(Log, Bin) when binary(Bin) ->
+    disk_log:balog(Log, Bin);
+append(Log, Term) ->
+    disk_log:alog(Log, Term).
+
+%% Synced append
+sappend(Log, Bin) when binary(Bin) ->
+    ok = disk_log:blog(Log, Bin);
+sappend(Log, Term) ->
+    ok = disk_log:log(Log, Term).
+
+%% Write commit records to the latest_log
+log(C) when  C#commit.disc_copies == [],
+             C#commit.disc_only_copies  == [],
+             C#commit.schema_ops == [] ->
+    ignore;
+log(C) ->
+    case mnesia_monitor:use_dir() of
+        true ->
+	    if
+		record(C, commit) ->
+		    C2 =  C#commit{ram_copies = [], snmp = []},
+		    append(latest_log, C2);
+		true ->
+		    %% Either a commit record as binary
+		    %% or some decision related info
+		    append(latest_log, C)
+	    end,
+	    mnesia_dumper:incr_log_writes();
+	false ->
+	    ignore
+    end.
+
+%% Synced
+
+slog(C) when  C#commit.disc_copies == [],
+             C#commit.disc_only_copies  == [],
+             C#commit.schema_ops == [] ->
+    ignore;
+slog(C) ->
+    case mnesia_monitor:use_dir() of
+        true ->
+	    if
+		record(C, commit) ->
+		    C2 =  C#commit{ram_copies = [], snmp = []},
+		    sappend(latest_log, C2);
+		true ->
+		    %% Either a commit record as binary
+		    %% or some decision related info
+		    sappend(latest_log, C)
+	    end,
+	    mnesia_dumper:incr_log_writes();
+	false ->
+	    ignore
+    end.
+
+
+%% Stuff related to the file LOG
+
+%% Returns a list of logfiles. The oldest is first.
+log_files() -> [previous_log_file(),
+		latest_log_file(),
+		decision_tab_file()
+	       ].
+
+latest_log_file() -> dir(latest_log_name()).
+
+previous_log_file() -> dir("PREVIOUS.LOG").
+
+decision_log_file() -> dir(decision_log_name()).
+
+decision_tab_file() -> dir(decision_tab_name()).
+
+previous_decision_log_file() -> dir("PDECISION.LOG").
+
+latest_log_name() -> "LATEST.LOG".
+
+decision_log_name() -> "DECISION.LOG".
+
+decision_tab_name() -> "DECISION_TAB.LOG".
+
+init() ->
+    case mnesia_monitor:use_dir() of
+	true ->
+	    Prev = previous_log_file(),
+	    verify_no_exists(Prev),
+
+	    Latest = latest_log_file(),
+	    verify_no_exists(Latest),
+
+	    Header = trans_log_header(),
+	    open_log(latest_log, Header, Latest);
+	false ->
+	    ok
+    end.
+
+verify_no_exists(Fname) ->
+    case exists(Fname) of
+	false ->
+	    ok;
+	true ->
+	    fatal("Log file exists: ~p~n", [Fname])
+    end.
+
+open_log(Name, Header, Fname) ->
+    Exists = exists(Fname),
+    open_log(Name, Header, Fname, Exists).
+
+open_log(Name, Header, Fname, Exists) ->
+    Repair = mnesia_monitor:get_env(auto_repair),
+    open_log(Name, Header, Fname, Exists, Repair).
+
+open_log(Name, Header, Fname, Exists, Repair) ->
+    case Name == previous_log of
+	true ->
+	    open_log(Name, Header, Fname, Exists, Repair, read_only);
+	false ->
+	    open_log(Name, Header, Fname, Exists, Repair, read_write)
+    end.
+
+open_log(Name, Header, Fname, Exists, Repair, Mode) ->
+    Args = [{file, Fname}, {name, Name}, {repair, Repair}, {mode, Mode}],
+%%    io:format("~p:open_log: ~p ~p~n", [?MODULE, Name, Fname]),
+    case mnesia_monitor:open_log(Args) of
+	{ok, Log} when Exists == true ->
+	    Log;
+	{ok, Log} ->
+	    write_header(Log, Header),
+	    Log;
+	{repaired, Log, _, {badbytes, 0}} when Exists == true ->
+	    Log;
+	{repaired, Log, _, {badbytes, 0}} ->
+	    write_header(Log, Header),
+	    Log;
+	{repaired, Log, _Recover, BadBytes} ->
+	    mnesia_lib:important("Data may be missing, log ~p repaired: Lost ~p bytes~n",
+				 [Fname, BadBytes]),
+	    Log;
+	{error, Reason} when Repair == true ->
+	    file:delete(Fname),
+	    mnesia_lib:important("Data may be missing, Corrupt logfile deleted: ~p, ~p ~n",
+				 [Fname, Reason]),
+	    %% Create a new
+	    open_log(Name, Header, Fname, false, false, read_write);
+	{error, Reason} ->
+	    fatal("Cannot open log file ~p: ~p~n", [Fname, Reason])
+    end.
+
+write_header(Log, Header) ->
+    append(Log, Header).
+
+write_trans_log_header() ->
+    write_header(latest_log, trans_log_header()).
+
+stop() ->
+    case mnesia_monitor:use_dir() of
+        true ->
+	    close_log(latest_log);
+	false ->
+	    ok
+    end.
+
+close_log(Log) ->
+%%    io:format("mnesia_log:close_log ~p~n", [Log]),
+%%    io:format("mnesia_log:close_log ~p~n", [Log]),
+    case disk_log:sync(Log) of
+	ok -> ok;
+	{error, {read_only_mode, Log}} ->
+	    ok;
+	{error, Reason} ->
+	    mnesia_lib:important("Failed syncing ~p to_disk reason ~p ~n",
+				 [Log, Reason])
+    end,
+    mnesia_monitor:close_log(Log).
+
+unsafe_close_log(Log) ->
+%%    io:format("mnesia_log:close_log ~p~n", [Log]),
+    mnesia_monitor:unsafe_close_log(Log).
+
+
+purge_some_logs() ->
+    mnesia_monitor:unsafe_close_log(latest_log),
+    file:delete(latest_log_file()),
+    file:delete(decision_tab_file()).
+
+purge_all_logs() ->
+    file:delete(previous_log_file()),
+    file:delete(latest_log_file()),
+    file:delete(decision_tab_file()).
+
+%% Prepare dump by renaming the open logfile if possible
+%% Returns a tuple on the following format: {Res, OpenLog}
+%% where OpenLog is the file descriptor to log file, ready for append
+%% and Res is one of the following: already_dumped, needs_dump or {error, Reason}
+prepare_log_dump(InitBy) ->
+    Diff = mnesia_dumper:get_log_writes() -
+           mnesia_lib:read_counter(trans_log_writes_prev),
+    if
+	Diff == 0, InitBy /= startup ->
+	    already_dumped;
+	true ->
+	    case mnesia_monitor:use_dir() of
+		true ->
+		    Prev = previous_log_file(),
+		    prepare_prev(Diff, InitBy, Prev, exists(Prev));
+		false ->
+		    already_dumped
+	    end
+    end.
+
+prepare_prev(Diff, _, _, true) ->
+    {needs_dump, Diff};
+prepare_prev(Diff, startup, Prev, false) ->
+    Latest = latest_log_file(),
+    case exists(Latest) of
+	true ->
+	    case file:rename(Latest, Prev) of
+		ok ->
+		    {needs_dump, Diff};
+		{error, Reason} ->
+		    {error, Reason}
+	    end;
+	false ->
+	    already_dumped
+    end;
+prepare_prev(Diff, _InitBy, Prev, false) ->
+    Head = trans_log_header(),
+    case mnesia_monitor:reopen_log(latest_log, Prev, Head) of
+	ok ->
+	    {needs_dump, Diff};
+	{error, Reason} ->
+	    Latest = latest_log_file(),
+	    {error, {"Cannot rename log file",
+		     [Latest, Prev, Reason]}}
+    end.
+
+%% Init dump and return PrevLogFileDesc or exit.
+init_log_dump() ->
+    Fname = previous_log_file(),
+    open_log(previous_log, trans_log_header(), Fname),
+    start.
+
+
+chunk_log(Cont) ->
+    chunk_log(previous_log, Cont).
+
+chunk_log(_Log, eof) ->
+    eof;
+chunk_log(Log, Cont) ->
+    case catch disk_log:chunk(Log, Cont) of
+	{error, Reason} ->
+	    fatal("Possibly truncated ~p file: ~p~n",
+		  [Log, Reason]);
+	{C2, Chunk, _BadBytes} ->
+	    %% Read_only case, should we warn about the bad log file?
+	    %% BUGBUG Should we crash if Repair == false ??
+	    %% We got to check this !!
+	    mnesia_lib:important("~p repaired, lost ~p bad bytes~n", [Log, _BadBytes]),
+	    {C2, Chunk};
+	Other ->
+	    Other
+    end.
+
+%% Confirms the dump by closing prev log and delete the file
+confirm_log_dump(Updates) ->
+    case mnesia_monitor:close_log(previous_log) of
+	ok ->
+	    file:delete(previous_log_file()),
+	    mnesia_lib:incr_counter(trans_log_writes_prev, Updates),
+	    dumped;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Decision log
+
+open_decision_log() ->
+    Latest = decision_log_file(),
+    open_log(decision_log, decision_log_header(), Latest),
+    start.
+
+prepare_decision_log_dump() ->
+    Prev = previous_decision_log_file(),
+    prepare_decision_log_dump(exists(Prev), Prev).
+
+prepare_decision_log_dump(false, Prev) ->
+    Head = decision_log_header(),
+    case mnesia_monitor:reopen_log(decision_log, Prev, Head) of
+	ok ->
+	    prepare_decision_log_dump(true, Prev);
+	{error, Reason} ->
+	    fatal("Cannot rename decision log file ~p -> ~p: ~p~n",
+		     [decision_log_file(), Prev, Reason])
+    end;
+prepare_decision_log_dump(true, Prev) ->
+    open_log(previous_decision_log, decision_log_header(), Prev),
+    start.
+
+chunk_decision_log(Cont) ->
+    %% dbg_out("chunk log ~p~n", [Cont]),
+    chunk_log(previous_decision_log, Cont).
+
+%% Confirms dump of the decision log
+confirm_decision_log_dump() ->
+    case mnesia_monitor:close_log(previous_decision_log) of
+	ok ->
+	    file:delete(previous_decision_log_file());
+	{error, Reason} ->
+	    fatal("Cannot confirm decision log dump: ~p~n",
+		  [Reason])
+    end.
+
+save_decision_tab(Decisions) ->
+    Log = decision_tab,
+    Tmp = mnesia_lib:dir("DECISION_TAB.TMP"),
+    file:delete(Tmp),
+    open_log(Log, decision_tab_header(), Tmp),
+    append(Log, Decisions),
+    close_log(Log),
+    TabFile = decision_tab_file(),
+    ok = file:rename(Tmp, TabFile).
+
+open_decision_tab() ->
+    TabFile = decision_tab_file(),
+    open_log(decision_tab, decision_tab_header(), TabFile),
+    start.
+
+close_decision_tab() ->
+    close_log(decision_tab).
+
+chunk_decision_tab(Cont) ->
+    %% dbg_out("chunk tab ~p~n", [Cont]),
+    chunk_log(decision_tab, Cont).
+
+close_decision_log() ->
+    close_log(decision_log).
+
+log_decision(Decision) ->
+    append(decision_log, Decision).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Debug functions
+
+view() ->
+    lists:foreach(fun(F) -> view(F) end, log_files()).
+
+view(File) ->
+    mnesia_lib:show("*****  ~p ***** ~n", [File]),
+    case exists(File) of
+	false ->
+	    nolog;
+	true ->
+	    N = view_only,
+	    Args = [{file, File}, {name, N}, {mode, read_only}],
+	    case disk_log:open(Args) of
+		{ok, N} ->
+		    view_file(start, N);
+		{repaired, _, _, _} ->
+		    view_file(start, N);
+		{error, Reason} ->
+		    error("Cannot open log ~p: ~p~n", [File, Reason])
+	    end
+    end.
+
+view_file(C, Log) ->
+    case disk_log:chunk(Log, C) of
+	{error, Reason} ->
+	    error("** Possibly truncated FILE ~p~n", [Reason]),
+	    error;
+	eof ->
+	    disk_log:close(Log),
+	    eof;
+	{C2, Terms, _BadBytes} ->
+	    dbg_out("Lost ~p bytes in ~p ~n", [_BadBytes, Log]),
+	    lists:foreach(fun(X) -> mnesia_lib:show("~p~n", [X]) end,
+			  Terms),
+	    view_file(C2, Log);
+	{C2, Terms} ->
+	    lists:foreach(fun(X) -> mnesia_lib:show("~p~n", [X]) end,
+			  Terms),
+	    view_file(C2, Log)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Backup
+
+-record(backup_args, {name, module, opaque, scope, prev_name, tables, cookie}).
+
+backup(Opaque) ->
+    backup(Opaque, []).
+
+backup(Opaque, Mod) when atom(Mod) ->
+    backup(Opaque, [{module, Mod}]);
+backup(Opaque, Args) when list(Args) ->
+    %% Backup all tables with max redundancy
+    CpArgs = [{ram_overrides_dump, false}, {max, val({schema, tables})}],
+    case mnesia_checkpoint:activate(CpArgs) of
+	{ok, Name, _Nodes} ->
+	    Res = backup_checkpoint(Name, Opaque, Args),
+	    mnesia_checkpoint:deactivate(Name),
+	    Res;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+backup_checkpoint(Name, Opaque) ->
+    backup_checkpoint(Name, Opaque, []).
+
+backup_checkpoint(Name, Opaque, Mod) when atom(Mod) ->
+    backup_checkpoint(Name, Opaque, [{module, Mod}]);
+backup_checkpoint(Name, Opaque, Args) when list(Args) ->
+    DefaultMod = mnesia_monitor:get_env(backup_module),
+    B = #backup_args{name = Name,
+		     module = DefaultMod,
+		     opaque = Opaque,
+		     scope = global,
+		     tables = all,
+		     prev_name = Name},
+    case check_backup_args(Args, B) of
+	{ok, B2} ->
+	    %% Decentralized backup
+	    %% Incremental
+
+	    Self = self(),
+	    Pid = spawn_link(?MODULE, backup_master, [Self, B2]),
+	    receive
+		{Pid, Self, Res} -> Res
+	    end;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+check_backup_args([Arg | Tail], B) ->
+    case catch check_backup_arg_type(Arg, B) of
+	{'EXIT', _Reason} ->
+	    {error, {badarg, Arg}};
+	B2 ->
+	    check_backup_args(Tail, B2)
+    end;
+
+check_backup_args([], B) ->
+    {ok, B}.
+
+check_backup_arg_type(Arg, B) ->
+    case Arg of
+	{scope, global} ->
+	    B#backup_args{scope = global};
+	{scope, local} ->
+	    B#backup_args{scope = local};
+	{module, Mod} ->
+	    Mod2 = mnesia_monitor:do_check_type(backup_module, Mod),
+	    B#backup_args{module = Mod2};
+	{incremental, Name} ->
+	    B#backup_args{prev_name = Name};
+	{tables, Tabs} when list(Tabs) ->
+	    B#backup_args{tables = Tabs}
+    end.
+
+backup_master(ClientPid, B) ->
+    process_flag(trap_exit, true),
+    case catch do_backup_master(B) of
+	{'EXIT', Reason} ->
+	    ClientPid ! {self(), ClientPid, {error, {'EXIT', Reason}}};
+	Res ->
+	    ClientPid ! {self(), ClientPid, Res}
+    end,
+    unlink(ClientPid),
+    exit(normal).
+
+do_backup_master(B) ->
+    Name = B#backup_args.name,
+    B2 = safe_apply(B, open_write, [B#backup_args.opaque]),
+    B3 = safe_write(B2, [backup_log_header()]),
+    case mnesia_checkpoint:tables_and_cookie(Name) of
+	{ok, AllTabs, Cookie} ->
+	    Tabs = select_tables(AllTabs, B3),
+	    B4 = B3#backup_args{cookie = Cookie},
+	    %% Always put schema first in backup file
+	    B5 = backup_schema(B4, Tabs),
+	    B6 = lists:foldl(fun backup_tab/2, B5, Tabs -- [schema]),
+	    safe_apply(B6, commit_write, [B6#backup_args.opaque]),
+	    ok;
+	{error, Reason} ->
+	    abort_write(B3, {?MODULE, backup_master}, [B], {error, Reason})
+    end.
+
+select_tables(AllTabs, B) ->
+    Tabs =
+	case B#backup_args.tables of
+	    all -> AllTabs;
+	    SomeTabs when list(SomeTabs) -> SomeTabs
+	end,
+    case B#backup_args.scope of
+	global ->
+	    Tabs;
+	local ->
+	    Name = B#backup_args.name,
+	    [T || T <- Tabs, mnesia_checkpoint:most_local_node(Name, T) == node()]
+    end.
+
+safe_write(B, []) ->
+    B;
+safe_write(B, Recs) ->
+    safe_apply(B, write, [B#backup_args.opaque, Recs]).
+
+backup_schema(B, Tabs) ->
+    case lists:member(schema, Tabs) of
+	true ->
+	    backup_tab(schema, B);
+	false ->
+	    Defs = [{schema, T, mnesia_schema:get_create_list(T)} || T <- Tabs],
+	    safe_write(B, Defs)
+    end.
+
+safe_apply(B, write, [_, Items]) when Items == [] ->
+    B;
+safe_apply(B, What, Args) ->
+    Abort = fun(R) -> abort_write(B, What, Args, R) end,
+    receive
+	{'EXIT', Pid, R} -> Abort({'EXIT', Pid, R})
+    after 0 ->
+	    Mod = B#backup_args.module,
+	    case catch apply(Mod, What, Args) of
+		{ok, Opaque} -> B#backup_args{opaque=Opaque};
+		{error, R} -> Abort(R);
+		R -> Abort(R)
+	    end
+    end.
+
+abort_write(B, What, Args, Reason) ->
+    Mod = B#backup_args.module,
+    Opaque = B#backup_args.opaque,
+    dbg_out("Failed to perform backup. M=~p:F=~p:A=~p -> ~p~n",
+	    [Mod, What, Args, Reason]),
+    case catch apply(Mod, abort_write, [Opaque]) of
+	{ok, _Res} ->
+	    throw({error, Reason});
+	Other ->
+	    error("Failed to abort backup. ~p:~p~p -> ~p~n",
+		  [Mod, abort_write, [Opaque], Other]),
+	    throw({error, Reason})
+    end.
+
+backup_tab(Tab, B) ->
+    Name = B#backup_args.name,
+    case mnesia_checkpoint:most_local_node(Name, Tab) of
+	{ok, Node} when Node == node() ->
+	    tab_copier(self(), B, Tab);
+	{ok, Node} ->
+	    RemoteB = B,
+	    Pid = spawn_link(Node, ?MODULE, tab_copier, [self(), RemoteB, Tab]),
+	    RecName = val({Tab, record_name}),
+	    tab_receiver(Pid, B, Tab, RecName, 0);
+	{error, Reason} ->
+	    abort_write(B, {?MODULE, backup_tab}, [Tab, B], {error, Reason})
+    end.
+
+tab_copier(Pid, B, Tab) when record(B, backup_args) ->
+    %% Intentional crash at exit
+    Name = B#backup_args.name,
+    PrevName = B#backup_args.prev_name,
+    {FirstName, FirstSource} = select_source(Tab, Name, PrevName),
+
+    ?eval_debug_fun({?MODULE, tab_copier, pre}, [{name, Name}, {tab, Tab}]),
+    Res = handle_more(Pid, B, Tab, FirstName, FirstSource, Name),
+    ?eval_debug_fun({?MODULE, tab_copier, post}, [{name, Name}, {tab, Tab}]),
+
+    handle_last(Pid, Res).
+
+select_source(Tab, Name, PrevName) ->
+    if
+	Tab == schema ->
+	    %% Always full backup of schema
+	    {Name, table};
+	Name == PrevName ->
+	    %% Full backup
+	    {Name, table};
+	true ->
+	    %% Wants incremental backup
+	    case mnesia_checkpoint:most_local_node(PrevName, Tab) of
+		{ok, Node} when Node == node() ->
+		    %% Accept incremental backup
+		    {PrevName, retainer};
+		_ ->
+		    %% Do a full backup anyway
+		    dbg_out("Incremental backup escalated to full backup: ~p~n", [Tab]),
+		    {Name, table}
+	    end
+    end.
+
+handle_more(Pid, B, Tab, FirstName, FirstSource, Name) ->
+    Acc = {0, B},
+    case {mnesia_checkpoint:really_retain(Name, Tab),
+	  mnesia_checkpoint:really_retain(FirstName, Tab)} of
+	{true, true} ->
+	    Acc2 = iterate(B, FirstName, Tab, Pid, FirstSource, latest, first, Acc),
+	    iterate(B, Name, Tab, Pid, retainer, checkpoint, last, Acc2);
+	{false, false}->
+	    %% Put the dumped file in the backup
+	    %% instead of the ram table. Does
+	    %% only apply to ram_copies.
+	    iterate(B, Name, Tab, Pid, retainer, checkpoint, last, Acc);
+	Bad ->
+	    Reason = {"Checkpoints for incremental backup must have same "
+		      "setting of ram_overrides_dump",
+		      Tab, Name, FirstName, Bad},
+	    abort_write(B, {?MODULE, backup_tab}, [Tab, B], {error, Reason})
+    end.
+
+handle_last(Pid, {_Count, B}) when Pid == self() ->
+    B;
+handle_last(Pid, _Acc) ->
+    unlink(Pid),
+    Pid ! {self(), {last, {ok, dummy}}},
+    exit(normal).
+
+iterate(B, Name, Tab, Pid, Source, Age, Pass, Acc) ->
+    Fun =
+	if
+	    Pid == self() ->
+		RecName = val({Tab, record_name}),
+		fun(Recs, A) -> copy_records(RecName, Tab, Recs, A) end;
+	    true ->
+		fun(Recs, A) -> send_records(Pid, Tab, Recs, Pass, A) end
+	end,
+    case mnesia_checkpoint:iterate(Name, Tab, Fun, Acc, Source, Age) of
+	{ok, Acc2} ->
+	    Acc2;
+	{error, Reason} ->
+	    R = {error, {"Tab copier iteration failed", Reason}},
+	    abort_write(B, {?MODULE, iterate}, [self(), B, Tab], R)
+    end.
+
+copy_records(_RecName, _Tab, [], Acc) ->
+    Acc;
+copy_records(RecName, Tab, Recs, {Count, B}) ->
+    Recs2 = rec_filter(B, Tab, RecName, Recs),
+    B2 = safe_write(B, Recs2),
+    {Count + 1, B2}.
+
+send_records(Pid, Tab, Recs, Pass, {Count, B}) ->
+    receive
+	{Pid, more, Count} ->
+	    if
+		Pass == last, Recs == [] ->
+		    {Count, B};
+		true ->
+		    Next = Count + 1,
+		    Pid ! {self(), {more, Next, Recs}},
+		    {Next, B}
+	    end;
+	Msg ->
+	    exit({send_records_unexpected_msg, Tab, Msg})
+    end.
+
+tab_receiver(Pid, B, Tab, RecName, Slot) ->
+    Pid ! {self(), more, Slot},
+    receive
+	{Pid, {more, Next, Recs}} ->
+	    Recs2 = rec_filter(B, Tab, RecName, Recs),
+	    B2 = safe_write(B, Recs2),
+	    tab_receiver(Pid, B2, Tab, RecName, Next);
+
+	{Pid, {last, {ok,_}}} ->
+	    B;
+
+	{'EXIT', Pid, {error, R}} ->
+	    Reason = {error, {"Tab copier crashed", R}},
+	    abort_write(B, {?MODULE, remote_tab_sender}, [self(), B, Tab], Reason);
+	{'EXIT', Pid, R} ->
+	    Reason = {error, {"Tab copier crashed", {'EXIT', R}}},
+	    abort_write(B, {?MODULE, remote_tab_sender}, [self(), B, Tab], Reason);
+	Msg ->
+	    R = {error, {"Tab receiver got unexpected msg", Msg}},
+	    abort_write(B, {?MODULE, remote_tab_sender}, [self(), B, Tab], R)
+    end.
+
+rec_filter(B, schema, _RecName, Recs) ->
+    case catch mnesia_bup:refresh_cookie(Recs, B#backup_args.cookie) of
+	Recs2 when list(Recs2) ->
+	    Recs2;
+	{error, _Reason} ->
+	    %% No schema table cookie
+	    Recs
+    end;
+rec_filter(_B, Tab, Tab, Recs) ->
+    Recs;
+rec_filter(_B, Tab, _RecName, Recs) ->
+    [setelement(1, Rec, Tab) || Rec <- Recs].
+
+ets2dcd(Tab) ->
+    ets2dcd(Tab, dcd).
+
+ets2dcd(Tab, Ftype) ->
+    Fname =
+	case Ftype of
+	    dcd -> mnesia_lib:tab2dcd(Tab);
+	    dmp -> mnesia_lib:tab2dmp(Tab)
+	end,
+    TmpF = mnesia_lib:tab2tmp(Tab),
+    file:delete(TmpF),
+    Log  = open_log({Tab, ets2dcd}, dcd_log_header(), TmpF, false),
+    mnesia_lib:db_fixtable(ram_copies, Tab, true),
+    ok   = ets2dcd(mnesia_lib:db_init_chunk(ram_copies, Tab, 1000), Tab, Log),
+    mnesia_lib:db_fixtable(ram_copies, Tab, false),
+    close_log(Log),
+    ok = file:rename(TmpF, Fname),
+    %% Remove old log data which is now in the new dcd.
+    %% No one else should be accessing this file!
+    file:delete(mnesia_lib:tab2dcl(Tab)),
+    ok.
+
+ets2dcd('$end_of_table', _Tab, _Log) ->
+    ok;
+ets2dcd({Recs, Cont}, Tab, Log) ->
+    ok = disk_log:alog_terms(Log, Recs),
+    ets2dcd(mnesia_lib:db_chunk(ram_copies, Cont), Tab, Log).
+
+dcd2ets(Tab) ->
+    dcd2ets(Tab, mnesia_monitor:get_env(auto_repair)).
+
+dcd2ets(Tab, Rep) ->
+    Dcd = mnesia_lib:tab2dcd(Tab),
+    case mnesia_lib:exists(Dcd) of
+	true ->
+	    Log = open_log({Tab, dcd2ets}, dcd_log_header(), Dcd,
+			   true, Rep, read_only),
+	    Data = chunk_log(Log, start),
+	    ok = insert_dcdchunk(Data, Log, Tab),
+	    close_log(Log),
+	    load_dcl(Tab, Rep);
+	false -> %% Handle old dets files, and conversion from disc_only to disc.
+	    Fname = mnesia_lib:tab2dat(Tab),
+	    Type = val({Tab, setorbag}),
+	    case mnesia_lib:dets_to_ets(Tab, Tab, Fname, Type, Rep, yes) of
+		loaded ->
+		    ets2dcd(Tab),
+		    file:delete(Fname),
+		    0;
+		{error, Error} ->
+		    erlang:error({"Failed to load table from disc", [Tab, Error]})
+	    end
+    end.
+
+insert_dcdchunk({Cont, [LogH | Rest]}, Log, Tab)
+  when record(LogH, log_header),
+       LogH#log_header.log_kind == dcd_log,
+       LogH#log_header.log_version >= "1.0" ->
+    insert_dcdchunk({Cont, Rest}, Log, Tab);
+
+insert_dcdchunk({Cont, Recs}, Log, Tab) ->
+    true = ets:insert(Tab, Recs),
+    insert_dcdchunk(chunk_log(Log, Cont), Log, Tab);
+insert_dcdchunk(eof, _Log, _Tab) ->
+    ok.
+
+load_dcl(Tab, Rep) ->
+    FName = mnesia_lib:tab2dcl(Tab),
+    case mnesia_lib:exists(FName) of
+	true ->
+	    Name = {load_dcl,Tab},
+	    open_log(Name,
+		     dcl_log_header(),
+		     FName,
+		     true,
+		     Rep,
+		     read_only),
+	    FirstChunk = chunk_log(Name, start),
+            N = insert_logchunk(FirstChunk, Name, 0),
+	    close_log(Name),
+	    N;
+	false ->
+	    0
+    end.
+
+insert_logchunk({C2, Recs}, Tab, C) ->
+    N = add_recs(Recs, C),
+    insert_logchunk(chunk_log(Tab, C2), Tab, C+N);
+insert_logchunk(eof, _Tab, C) ->
+    C.
+
+add_recs([{{Tab, _Key}, Val, write} | Rest], N) ->
+    true = ets:insert(Tab, Val),
+    add_recs(Rest, N+1);
+add_recs([{{Tab, Key}, _Val, delete} | Rest], N) ->
+    true = ets:delete(Tab, Key),
+    add_recs(Rest, N+1);
+add_recs([{{Tab, _Key}, Val, delete_object} | Rest], N) ->
+    true = ets:match_delete(Tab, Val),
+    add_recs(Rest, N+1);
+add_recs([{{Tab, Key}, Val, update_counter} | Rest], N) ->
+    {RecName, Incr} = Val,
+    case catch ets:update_counter(Tab, Key, Incr) of
+	CounterVal when integer(CounterVal) ->
+	    ok;
+	_ ->
+	    Zero = {RecName, Key, 0},
+	    true = ets:insert(Tab, Zero)
+    end,
+    add_recs(Rest, N+1);
+add_recs([LogH|Rest], N)
+  when record(LogH, log_header),
+       LogH#log_header.log_kind == dcl_log,
+       LogH#log_header.log_version >= "1.0" ->
+    add_recs(Rest, N);
+add_recs([{{Tab, _Key}, _Val, clear_table} | Rest], N) ->
+    true = ets:match_delete(Tab, '_'),
+    add_recs(Rest, N+ets:info(Tab, size));
+add_recs([], N) ->
+    N.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_monitor.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_monitor.erl
new file mode 100644
index 0000000000..b64419d5a8
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_monitor.erl
@@ -0,0 +1,776 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_monitor.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
+%%
+-module(mnesia_monitor).
+
+-behaviour(gen_server).
+
+%% Public exports
+-export([
+	 close_dets/1,
+	 close_log/1,
+	 detect_inconcistency/2,
+	 get_env/1,
+	 init/0,
+	 mktab/2,
+	 unsafe_mktab/2,
+	 mnesia_down/2,
+	 needs_protocol_conversion/1,
+	 negotiate_protocol/1,
+	 disconnect/1,
+	 open_dets/2,
+	 unsafe_open_dets/2,
+	 open_log/1,
+	 patch_env/2,
+	 protocol_version/0,
+	 reopen_log/3,
+	 set_env/2,
+	 start/0,
+	 start_proc/4,
+	 terminate_proc/3,
+	 unsafe_close_dets/1,
+	 unsafe_close_log/1,
+	 use_dir/0,
+	 do_check_type/2
+	]).
+
+%% gen_server callbacks
+-export([
+	 init/1,
+	 handle_call/3,
+	 handle_cast/2,
+	 handle_info/2,
+	 terminate/2,
+	 code_change/3
+	]).
+
+%% Internal exports
+-export([
+	 call/1,
+	 cast/1,
+	 detect_partitioned_network/2,
+	 has_remote_mnesia_down/1
+	]).
+
+-import(mnesia_lib, [dbg_out/2, verbose/2, error/2, fatal/2, set/2]).
+
+-include("mnesia.hrl").
+
+-record(state, {supervisor, pending_negotiators = [],
+		going_down = [], tm_started = false, early_connects = []}).
+
+-define(current_protocol_version, {7,6}).
+
+-define(previous_protocol_version, {7,5}).
+
+start() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE,
+			  [self()], [{timeout, infinity}
+				     %% ,{debug, [trace]}
+				    ]).
+
+init() ->
+    call(init).
+
+mnesia_down(From, Node) ->
+    cast({mnesia_down, From, Node}).
+
+mktab(Tab, Args) ->
+    unsafe_call({mktab, Tab, Args}).
+unsafe_mktab(Tab, Args) ->
+    unsafe_call({unsafe_mktab, Tab, Args}).
+
+open_dets(Tab, Args) ->
+    unsafe_call({open_dets, Tab, Args}).
+unsafe_open_dets(Tab, Args) ->
+    unsafe_call({unsafe_open_dets, Tab, Args}).
+
+close_dets(Tab) ->
+    unsafe_call({close_dets, Tab}).
+
+unsafe_close_dets(Name) ->
+    unsafe_call({unsafe_close_dets, Name}).
+
+open_log(Args) ->
+    unsafe_call({open_log, Args}).
+
+reopen_log(Name, Fname, Head) ->
+    unsafe_call({reopen_log, Name, Fname, Head}).
+
+close_log(Name) ->
+    unsafe_call({close_log, Name}).
+
+unsafe_close_log(Name) ->
+    unsafe_call({unsafe_close_log, Name}).
+
+
+disconnect(Node) ->
+    cast({disconnect, Node}).
+
+%% Returns GoodNoodes
+%% Creates a link to each compatible monitor and
+%% protocol_version to agreed version upon success
+
+negotiate_protocol(Nodes) ->
+    Version = mnesia:system_info(version),
+    Protocols = acceptable_protocol_versions(),
+    MonitorPid = whereis(?MODULE),
+    Msg = {negotiate_protocol, MonitorPid, Version, Protocols},
+    {Replies, _BadNodes} = multicall(Nodes, Msg),
+    check_protocol(Replies, Protocols).
+
+check_protocol([{Node, {accept, Mon, _Version, Protocol}} | Tail], Protocols) ->
+    case lists:member(Protocol, Protocols) of
+	true ->
+	    case Protocol == protocol_version() of
+		true ->
+		    set({protocol, Node}, {Protocol, false});
+		false ->
+		    set({protocol, Node}, {Protocol, true})
+	    end,
+	    [node(Mon) | check_protocol(Tail, Protocols)];
+	false  ->
+	    unlink(Mon), % Get rid of unneccessary link
+	    check_protocol(Tail, Protocols)
+    end;
+check_protocol([{Node, {reject, _Mon, Version, Protocol}} | Tail], Protocols) ->
+    verbose("Failed to connect with ~p. ~p protocols rejected. "
+	    "expected version = ~p, expected protocol = ~p~n",
+	    [Node, Protocols, Version, Protocol]),
+    check_protocol(Tail, Protocols);
+check_protocol([{error, _Reason} | Tail], Protocols) ->
+    check_protocol(Tail, Protocols);
+check_protocol([{badrpc, _Reason} | Tail], Protocols) ->
+    check_protocol(Tail, Protocols);
+check_protocol([], [Protocol | _Protocols]) ->
+    set(protocol_version, Protocol),
+    [];
+check_protocol([], []) ->
+    set(protocol_version, protocol_version()),
+    [].
+
+protocol_version() ->
+    case ?catch_val(protocol_version) of
+	{'EXIT', _} -> ?current_protocol_version;
+	Version -> Version
+    end.
+
+%% A sorted list of acceptable protocols the
+%% preferred protocols are first in the list
+acceptable_protocol_versions() ->
+    [protocol_version(), ?previous_protocol_version].
+
+needs_protocol_conversion(Node) ->
+    case {?catch_val({protocol, Node}), protocol_version()} of
+	{{'EXIT', _}, _} ->
+	    false;
+	{{_, Bool}, ?current_protocol_version} ->
+	    Bool;
+	{{_, Bool}, _} ->
+	    not Bool
+    end.
+
+cast(Msg) ->
+    case whereis(?MODULE) of
+	undefined -> ignore;
+	Pid ->  gen_server:cast(Pid, Msg)
+    end.
+
+unsafe_call(Msg) ->
+    case whereis(?MODULE) of
+	undefined -> {error, {node_not_running, node()}};
+	Pid -> gen_server:call(Pid, Msg, infinity)
+    end.
+
+call(Msg) ->
+    case whereis(?MODULE) of
+	undefined ->
+	    {error, {node_not_running, node()}};
+	Pid ->
+	    link(Pid),
+	    Res = gen_server:call(Pid, Msg, infinity),
+	    unlink(Pid),
+
+            %% We get an exit signal if server dies
+	    receive
+		{'EXIT', Pid, _Reason} ->
+		    {error, {node_not_running, node()}}
+	    after 0 ->
+		    ignore
+	    end,
+	    Res
+    end.
+
+multicall(Nodes, Msg) ->
+    rpc:multicall(Nodes, ?MODULE, call, [Msg]).
+
+start_proc(Who, Mod, Fun, Args) ->
+    Args2 = [Who, Mod, Fun, Args],
+    proc_lib:start_link(mnesia_sp, init_proc, Args2, infinity).
+
+terminate_proc(Who, R, State) when R /= shutdown, R /= killed ->
+    fatal("~p crashed: ~p state: ~p~n", [Who, R, State]);
+
+terminate_proc(Who, Reason, _State) ->
+    mnesia_lib:verbose("~p terminated: ~p~n", [Who, Reason]),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Callback functions from gen_server
+
+%%----------------------------------------------------------------------
+%% Func: init/1
+%% Returns: {ok, State}          |
+%%          {ok, State, Timeout} |
+%%          {stop, Reason}
+%%----------------------------------------------------------------------
+init([Parent]) ->
+    process_flag(trap_exit, true),
+    ?ets_new_table(mnesia_gvar, [set, public, named_table]),
+    set(subscribers, []),
+    mnesia_lib:verbose("~p starting: ~p~n", [?MODULE, self()]),
+    Version = mnesia:system_info(version),
+    set(version, Version),
+    dbg_out("Version: ~p~n", [Version]),
+
+    case catch process_config_args(env()) of
+	ok ->
+	    mnesia_lib:set({'$$$_report', current_pos}, 0),
+	    Level = mnesia_lib:val(debug),
+	    mnesia_lib:verbose("Mnesia debug level set to ~p\n", [Level]),
+	    set(mnesia_status, starting), %%  set start status
+	    set({current, db_nodes}, [node()]),
+	    set(use_dir, use_dir()),
+	    mnesia_lib:create_counter(trans_aborts),
+	    mnesia_lib:create_counter(trans_commits),
+	    mnesia_lib:create_counter(trans_log_writes),
+	    Left = get_env(dump_log_write_threshold),
+	    mnesia_lib:set_counter(trans_log_writes_left, Left),
+	    mnesia_lib:create_counter(trans_log_writes_prev),
+	    mnesia_lib:create_counter(trans_restarts),
+	    mnesia_lib:create_counter(trans_failures),
+	    ?ets_new_table(mnesia_held_locks, [bag, public, named_table]),
+	    ?ets_new_table(mnesia_tid_locks, [bag, public, named_table]),
+	    ?ets_new_table(mnesia_sticky_locks, [set, public, named_table]),
+	    ?ets_new_table(mnesia_lock_queue,
+			   [bag, public, named_table, {keypos, 2}]),
+	    ?ets_new_table(mnesia_lock_counter, [set, public, named_table]),
+	    set(checkpoints, []),
+	    set(pending_checkpoints, []),
+	    set(pending_checkpoint_pids, []),
+
+	    {ok, #state{supervisor = Parent}};
+	{'EXIT', Reason} ->
+	    mnesia_lib:report_fatal("Bad configuration: ~p~n", [Reason]),
+	    {stop, {bad_config, Reason}}
+    end.
+
+use_dir() ->
+    case ?catch_val(use_dir) of
+	{'EXIT', _} ->
+	    case get_env(schema_location) of
+		disc -> true;
+		opt_disc -> non_empty_dir();
+		ram -> false
+	    end;
+	Bool ->
+	    Bool
+    end.
+
+%% Returns true if the Mnesia directory contains
+%% important files
+non_empty_dir() ->
+    mnesia_lib:exists(mnesia_bup:fallback_bup()) or
+    mnesia_lib:exists(mnesia_lib:tab2dmp(schema)) or
+    mnesia_lib:exists(mnesia_lib:tab2dat(schema)).
+
+%%----------------------------------------------------------------------
+%% Func: handle_call/3
+%% Returns: {reply, Reply, State}          |
+%%          {reply, Reply, State, Timeout} |
+%%          {noreply, State}               |
+%%          {noreply, State, Timeout}      |
+%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
+%%----------------------------------------------------------------------
+
+handle_call({mktab, Tab, Args}, _From, State) ->
+    case catch ?ets_new_table(Tab, Args) of
+	{'EXIT', ExitReason} ->
+	    Msg = "Cannot create ets table",
+	    Reason = {system_limit, Msg, Tab, Args, ExitReason},
+	    fatal("~p~n", [Reason]),
+	    {noreply, State};
+	Reply ->
+	    {reply, Reply, State}
+    end;
+
+handle_call({unsafe_mktab, Tab, Args}, _From, State) ->
+    case catch ?ets_new_table(Tab, Args) of
+	{'EXIT', ExitReason} ->
+	    {reply, {error, ExitReason}, State};
+	Reply ->
+	    {reply, Reply, State}
+    end;
+
+
+handle_call({open_dets, Tab, Args}, _From, State) ->
+    case mnesia_lib:dets_sync_open(Tab, Args) of
+	{ok, Tab} ->
+	    {reply, {ok, Tab}, State};
+
+	{error, Reason} ->
+	    Msg = "Cannot open dets table",
+	    Error = {error, {Msg, Tab, Args, Reason}},
+	    fatal("~p~n", [Error]),
+	    {noreply, State}
+    end;
+
+handle_call({unsafe_open_dets, Tab, Args}, _From, State) ->
+    case mnesia_lib:dets_sync_open(Tab, Args) of
+	{ok, Tab} ->
+	    {reply, {ok, Tab}, State};
+	{error, Reason} ->
+	    {reply, {error,Reason}, State}
+    end;
+
+handle_call({close_dets, Tab}, _From, State) ->
+    case mnesia_lib:dets_sync_close(Tab) of
+	ok ->
+	    {reply, ok, State};
+        {error, Reason} ->
+	    Msg = "Cannot close dets table",
+            Error = {error, {Msg, Tab, Reason}},
+	    fatal("~p~n", [Error]),
+	    {noreply, State}
+    end;
+
+handle_call({unsafe_close_dets, Tab}, _From, State) ->
+    mnesia_lib:dets_sync_close(Tab),
+    {reply, ok, State};
+
+handle_call({open_log, Args}, _From, State) ->
+    Res = disk_log:open([{notify, true}|Args]),
+    {reply, Res, State};
+
+handle_call({reopen_log, Name, Fname, Head}, _From, State) ->
+    case disk_log:reopen(Name, Fname, Head) of
+	ok ->
+	    {reply, ok, State};
+
+        {error, Reason} ->
+	    Msg = "Cannot rename disk_log file",
+            Error = {error, {Msg, Name, Fname, Head, Reason}},
+	    fatal("~p~n", [Error]),
+	    {noreply, State}
+    end;
+
+handle_call({close_log, Name}, _From, State) ->
+    case disk_log:close(Name) of
+	ok ->
+	    {reply, ok, State};
+
+        {error, Reason} ->
+	    Msg = "Cannot close disk_log file",
+            Error = {error, {Msg, Name, Reason}},
+	    fatal("~p~n", [Error]),
+	    {noreply, State}
+    end;
+
+handle_call({unsafe_close_log, Name}, _From, State) ->
+    disk_log:close(Name),
+    {reply, ok, State};
+
+handle_call({negotiate_protocol, Mon, _Version, _Protocols}, _From, State)
+  when State#state.tm_started == false ->
+    State2 =  State#state{early_connects = [node(Mon) | State#state.early_connects]},
+    {reply, {node(), {reject, self(), uninitialized, uninitialized}}, State2};
+
+handle_call({negotiate_protocol, Mon, Version, Protocols}, From, State)
+  when node(Mon) /= node() ->
+    Protocol = protocol_version(),
+    MyVersion = mnesia:system_info(version),
+    case lists:member(Protocol, Protocols) of
+	true ->
+	    accept_protocol(Mon, MyVersion, Protocol, From, State);
+	false ->
+	    %% in this release we should be able to handle the previous
+	    %% protocol
+	    case hd(Protocols) of
+		?previous_protocol_version ->
+		    accept_protocol(Mon, MyVersion, ?previous_protocol_version, From, State);
+		_ ->
+		    verbose("Connection with ~p rejected. "
+			    "version = ~p, protocols = ~p, "
+			    "expected version = ~p, expected protocol = ~p~n",
+			    [node(Mon), Version, Protocols, MyVersion, Protocol]),
+		    {reply, {node(), {reject, self(), MyVersion, Protocol}}, State}
+	    end
+    end;
+
+handle_call(init, _From, State) ->
+    net_kernel:monitor_nodes(true),
+    EarlyNodes = State#state.early_connects,
+    State2 = State#state{tm_started = true},
+    {reply, EarlyNodes, State2};
+
+handle_call(Msg, _From, State) ->
+    error("~p got unexpected call: ~p~n", [?MODULE, Msg]),
+    {noreply, State}.
+
+accept_protocol(Mon, Version, Protocol, From, State) ->
+    Reply = {node(), {accept, self(), Version, Protocol}},
+    Node = node(Mon),
+    Pending0 = State#state.pending_negotiators,
+    Pending = lists:keydelete(Node, 1, Pending0),
+    case lists:member(Node, State#state.going_down) of
+	true ->
+	    %% Wait for the mnesia_down to be processed,
+	    %% before we reply
+	    P = Pending ++ [{Node, Mon, From, Reply}],
+	    {noreply, State#state{pending_negotiators = P}};
+	false ->
+	    %% No need for wait
+	    link(Mon),  %% link to remote Monitor
+	    case Protocol == protocol_version() of
+		true ->
+		    set({protocol, Node}, {Protocol, false});
+		false ->
+		    set({protocol, Node}, {Protocol, true})
+	    end,
+	    {reply, Reply, State#state{pending_negotiators = Pending}}
+    end.
+
+%%----------------------------------------------------------------------
+%% Func: handle_cast/2
+%% Returns: {noreply, State}          |
+%%          {noreply, State, Timeout} |
+%%          {stop, Reason, State}            (terminate/2 is called)
+%%----------------------------------------------------------------------
+
+handle_cast({mnesia_down, mnesia_controller, Node}, State) ->
+    mnesia_tm:mnesia_down(Node),
+    {noreply, State};
+
+handle_cast({mnesia_down, mnesia_tm, {Node, Pending}}, State) ->
+    mnesia_locker:mnesia_down(Node, Pending),
+    {noreply, State};
+
+handle_cast({mnesia_down, mnesia_locker, Node}, State) ->
+    Down = {mnesia_down, Node},
+    mnesia_lib:report_system_event(Down),
+    GoingDown = lists:delete(Node, State#state.going_down),
+    State2 = State#state{going_down = GoingDown},
+    Pending = State#state.pending_negotiators,
+    case lists:keysearch(Node, 1, Pending) of
+	{value, {Node, Mon, ReplyTo, Reply}} ->
+	    %% Late reply to remote monitor
+	    link(Mon),  %% link to remote Monitor
+	    gen_server:reply(ReplyTo, Reply),
+	    P2 = lists:keydelete(Node, 1,Pending),
+	    State3 = State2#state{pending_negotiators = P2},
+	    {noreply, State3};
+	false ->
+	    %% No pending remote monitors
+	    {noreply, State2}
+    end;
+
+handle_cast({disconnect, Node}, State) ->
+    case rpc:call(Node, erlang, whereis, [?MODULE]) of
+	{badrpc, _} ->
+	    ignore;
+	RemoteMon when pid(RemoteMon) ->
+	    unlink(RemoteMon)
+    end,
+    {noreply, State};
+
+handle_cast({inconsistent_database, Context, Node}, State) ->
+    Msg = {inconsistent_database, Context, Node},
+    mnesia_lib:report_system_event(Msg),
+    {noreply, State};
+
+handle_cast(Msg, State) ->
+    error("~p got unexpected cast: ~p~n", [?MODULE, Msg]),
+    {noreply, State}.
+
+%%----------------------------------------------------------------------
+%% Func: handle_info/2
+%% Returns: {noreply, State}          |
+%%          {noreply, State, Timeout} |
+%%          {stop, Reason, State}            (terminate/2 is called)
+%%----------------------------------------------------------------------
+
+handle_info({'EXIT', Pid, R}, State) when Pid == State#state.supervisor ->
+    dbg_out("~p was ~p by supervisor~n",[?MODULE, R]),
+    {stop, R, State};
+
+handle_info({'EXIT', Pid, fatal}, State) when node(Pid) == node() ->
+    dbg_out("~p got FATAL ERROR from: ~p~n",[?MODULE, Pid]),
+    exit(State#state.supervisor, shutdown),
+    {noreply, State};
+
+handle_info({'EXIT', Pid, Reason}, State) ->
+    Node = node(Pid),
+    if
+	Node /= node() ->
+	    %% Remotly linked process died, assume that it was a mnesia_monitor
+	    mnesia_recover:mnesia_down(Node),
+	    mnesia_controller:mnesia_down(Node),
+	    {noreply, State#state{going_down = [Node | State#state.going_down]}};
+	true ->
+	    %% We have probably got an exit signal from from
+	    %% disk_log or dets
+	    Hint = "Hint: check that the disk still is writable",
+	    Msg = {'EXIT', Pid, Reason},
+	    fatal("~p got unexpected info: ~p; ~p~n",
+		  [?MODULE, Msg, Hint])
+    end;
+
+handle_info({nodeup, Node}, State) ->
+    %% Ok, we are connected to yet another Erlang node
+    %% Let's check if Mnesia is running there in order
+    %% to detect if the network has been partitioned
+    %% due to communication failure.
+
+    HasDown   = mnesia_recover:has_mnesia_down(Node),
+    ImRunning = mnesia_lib:is_running(),
+
+    if
+	%% If I'm not running the test will be made later.
+	HasDown == true, ImRunning == yes ->
+	    spawn_link(?MODULE, detect_partitioned_network, [self(), Node]);
+	true ->
+	    ignore
+    end,
+    {noreply, State};
+
+handle_info({nodedown, _Node}, State) ->
+    %% Ignore, we are only caring about nodeup's
+    {noreply, State};
+
+handle_info({disk_log, _Node, Log, Info}, State) ->
+    case Info of
+	{truncated, _No} ->
+	    ok;
+	_ ->
+	    mnesia_lib:important("Warning Log file ~p error reason ~s~n",
+				 [Log, disk_log:format_error(Info)])
+    end,
+    {noreply, State};
+
+handle_info(Msg, State) ->
+    error("~p got unexpected info (~p): ~p~n", [?MODULE, State, Msg]).
+
+%%----------------------------------------------------------------------
+%% Func: terminate/2
+%% Purpose: Shutdown the server
+%% Returns: any (ignored by gen_server)
+%%----------------------------------------------------------------------
+terminate(Reason, State) ->
+    terminate_proc(?MODULE, Reason, State).
+
+%%----------------------------------------------------------------------
+%% Func: code_change/3
+%% Purpose: Upgrade process when its code is to be changed
+%% Returns: {ok, NewState}
+%%----------------------------------------------------------------------
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%%----------------------------------------------------------------------
+%%% Internal functions
+%%%----------------------------------------------------------------------
+
+process_config_args([]) ->
+    ok;
+process_config_args([C|T]) ->
+    V = get_env(C),
+    dbg_out("Env ~p: ~p~n", [C, V]),
+    mnesia_lib:set(C, V),
+    process_config_args(T).
+
+set_env(E,Val) ->
+    mnesia_lib:set(E, check_type(E,Val)),
+    ok.
+
+get_env(E) ->
+    case ?catch_val(E) of
+	{'EXIT', _} ->
+	    case application:get_env(mnesia, E) of
+		{ok, Val} ->
+		    check_type(E, Val);
+		undefined ->
+		    check_type(E, default_env(E))
+	    end;
+	Val ->
+	    Val
+    end.
+
+env() ->
+    [
+     access_module,
+     auto_repair,
+     backup_module,
+     debug,
+     dir,
+     dump_log_load_regulation,
+     dump_log_time_threshold,
+     dump_log_update_in_place,
+     dump_log_write_threshold,
+     embedded_mnemosyne,
+     event_module,
+     extra_db_nodes,
+     ignore_fallback_at_startup,
+     fallback_error_function,
+     max_wait_for_decision,
+     schema_location,
+     core_dir
+    ].
+
+default_env(access_module) ->
+    mnesia;
+default_env(auto_repair) ->
+    true;
+default_env(backup_module) ->
+    mnesia_backup;
+default_env(debug) ->
+    none;
+default_env(dir) ->
+    Name = lists:concat(["Mnesia.", node()]),
+    filename:absname(Name);
+default_env(dump_log_load_regulation) ->
+    false;
+default_env(dump_log_time_threshold) ->
+    timer:minutes(3);
+default_env(dump_log_update_in_place) ->
+    true;
+default_env(dump_log_write_threshold) ->
+    1000;
+default_env(embedded_mnemosyne) ->
+    false;
+default_env(event_module) ->
+    mnesia_event;
+default_env(extra_db_nodes) ->
+    [];
+default_env(ignore_fallback_at_startup) ->
+    false;
+default_env(fallback_error_function) ->
+    {mnesia, lkill};
+default_env(max_wait_for_decision) ->
+    infinity;
+default_env(schema_location) ->
+    opt_disc;
+default_env(core_dir) ->
+    false.
+
+check_type(Env, Val) ->
+    case catch do_check_type(Env, Val) of
+	{'EXIT', _Reason} ->
+	    exit({bad_config, Env, Val});
+	NewVal ->
+	    NewVal
+    end.
+
+do_check_type(access_module, A) when atom(A) -> A;
+do_check_type(auto_repair, B) -> bool(B);
+do_check_type(backup_module, B) when atom(B) -> B;
+do_check_type(debug, debug) -> debug;
+do_check_type(debug, false) -> none;
+do_check_type(debug, none) -> none;
+do_check_type(debug, trace) -> trace;
+do_check_type(debug, true) -> debug;
+do_check_type(debug, verbose) -> verbose;
+do_check_type(dir, V) -> filename:absname(V);
+do_check_type(dump_log_load_regulation, B) -> bool(B);
+do_check_type(dump_log_time_threshold, I) when integer(I), I > 0 -> I;
+do_check_type(dump_log_update_in_place, B) -> bool(B);
+do_check_type(dump_log_write_threshold, I) when integer(I), I > 0 -> I;
+do_check_type(event_module, A) when atom(A) -> A;
+do_check_type(ignore_fallback_at_startup, B) -> bool(B);
+do_check_type(fallback_error_function, {Mod, Func})
+  when atom(Mod), atom(Func) -> {Mod, Func};
+do_check_type(embedded_mnemosyne, B) -> bool(B);
+do_check_type(extra_db_nodes, L) when list(L) ->
+    Fun = fun(N) when N == node() -> false;
+	     (A) when atom(A) -> true
+	  end,
+    lists:filter(Fun, L);
+do_check_type(max_wait_for_decision, infinity) -> infinity;
+do_check_type(max_wait_for_decision, I) when integer(I), I > 0 -> I;
+do_check_type(schema_location, M) -> media(M);
+do_check_type(core_dir, "false") -> false;
+do_check_type(core_dir, false) -> false;
+do_check_type(core_dir, Dir) when list(Dir) -> Dir.
+
+
+bool(true) -> true;
+bool(false) -> false.
+
+media(disc) -> disc;
+media(opt_disc) -> opt_disc;
+media(ram) -> ram.
+
+patch_env(Env, Val) ->
+    case catch do_check_type(Env, Val) of
+	{'EXIT', _Reason} ->
+	    {error, {bad_type, Env, Val}};
+	NewVal ->
+	    application_controller:set_env(mnesia, Env, NewVal),
+	    NewVal
+    end.
+
+detect_partitioned_network(Mon, Node) ->
+    GoodNodes = negotiate_protocol([Node]),
+    detect_inconcistency(GoodNodes, running_partitioned_network),
+    unlink(Mon),
+    exit(normal).
+
+detect_inconcistency([], _Context) ->
+    ok;
+detect_inconcistency(Nodes, Context) ->
+    Downs = [N || N <- Nodes, mnesia_recover:has_mnesia_down(N)],
+    {Replies, _BadNodes} =
+	rpc:multicall(Downs, ?MODULE, has_remote_mnesia_down, [node()]),
+    report_inconsistency(Replies, Context, ok).
+
+has_remote_mnesia_down(Node) ->
+    HasDown = mnesia_recover:has_mnesia_down(Node),
+    Master  = mnesia_recover:get_master_nodes(schema),
+    if
+	HasDown == true, Master == [] ->
+	    {true, node()};
+	true ->
+	    {false, node()}
+    end.
+
+report_inconsistency([{true, Node} | Replies], Context, _Status) ->
+    %% Oops, Mnesia is already running on the
+    %% other node AND we both regard each
+    %% other as down. The database is
+    %% potentially inconsistent and we has to
+    %% do tell the applications about it, so
+    %% they may perform some clever recovery
+    %% action.
+    Msg = {inconsistent_database, Context, Node},
+    mnesia_lib:report_system_event(Msg),
+    report_inconsistency(Replies, Context, inconsistent_database);
+report_inconsistency([{false, _Node} | Replies], Context, Status) ->
+    report_inconsistency(Replies, Context, Status);
+report_inconsistency([{badrpc, _Reason} | Replies], Context, Status) ->
+    report_inconsistency(Replies, Context, Status);
+report_inconsistency([], _Context, Status) ->
+    Status.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_recover.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_recover.erl
new file mode 100644
index 0000000000..cbb110fa6c
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_recover.erl
@@ -0,0 +1,1174 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_recover.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
+%%
+-module(mnesia_recover).
+
+-behaviour(gen_server).
+
+-export([
+	 allow_garb/0,
+	 call/1,
+	 connect_nodes/1,
+	 disconnect/1,
+	 dump_decision_tab/0,
+	 get_master_node_info/0,
+	 get_master_node_tables/0,
+	 get_master_nodes/1,
+	 get_mnesia_downs/0,
+	 has_mnesia_down/1,
+	 incr_trans_tid_serial/0,
+	 init/0,
+	 log_decision/1,
+	 log_master_nodes/3,
+	 log_mnesia_down/1,
+	 log_mnesia_up/1,
+	 mnesia_down/1,
+	 note_decision/2,
+	 note_log_decision/2,
+	 outcome/2,
+	 start/0,
+	 start_garb/0,
+	 still_pending/1,
+	 sync_trans_tid_serial/1,
+	 wait_for_decision/2,
+	 what_happened/3
+	]).
+
+%% gen_server callbacks
+-export([init/1,
+	 handle_call/3,
+	 handle_cast/2,
+	 handle_info/2,
+	 terminate/2,
+	 code_change/3
+	]).
+
+
+-include("mnesia.hrl").
+-import(mnesia_lib, [set/2, verbose/2, error/2, fatal/2]).
+
+-record(state, {supervisor,
+		unclear_pid,
+		unclear_decision,
+		unclear_waitfor,
+		tm_queue_len = 0,
+		initiated = false,
+		early_msgs = []
+	       }).
+
+%%-define(DBG(F, A), mnesia:report_event(list_to_atom(lists:flatten(io_lib:format(F, A))))).
+%%-define(DBG(F, A), io:format("DBG: " ++ F, A)).
+
+-record(transient_decision, {tid, outcome}).
+
+start() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [self()],
+			  [{timeout, infinity}
+			   %%, {debug, [trace]}
+			  ]).
+
+init() ->
+    call(init).
+
+start_garb() ->
+    Pid = whereis(mnesia_recover),
+    {ok, _} = timer:send_interval(timer:minutes(2), Pid, garb_decisions),
+    {ok, _} = timer:send_interval(timer:seconds(10), Pid, check_overload).
+
+allow_garb() ->
+    cast(allow_garb).
+
+
+%% The transaction log has either been swiched (latest -> previous) or
+%% there is nothing to be dumped. This means that the previous
+%% transaction log only may contain commit records which refers to
+%% transactions noted in the last two of the 'Prev' tables. All other
+%% tables may now be garbed by 'garb_decisions' (after 2 minutes).
+%% Max 10 tables are kept.
+do_allow_garb() ->
+    %% The order of the following stuff is important!
+    Curr = val(latest_transient_decision),
+    Old = val(previous_transient_decisions),
+    Next = create_transient_decision(),
+    {Prev, ReallyOld} = sublist([Curr | Old], 10, []),
+    [?ets_delete_table(Tab) || Tab <- ReallyOld],
+    set(previous_transient_decisions, Prev),
+    set(latest_transient_decision, Next).
+
+sublist([H|R], N, Acc) when N > 0 ->
+    sublist(R, N-1, [H| Acc]);
+sublist(List, _N, Acc) ->
+    {lists:reverse(Acc), List}.
+
+do_garb_decisions() ->
+    case val(previous_transient_decisions) of
+	[First, Second | Rest] ->
+	    set(previous_transient_decisions, [First, Second]),
+	    [?ets_delete_table(Tab) || Tab <- Rest];
+	_ ->
+	    ignore
+    end.
+
+connect_nodes([]) ->
+    [];
+connect_nodes(Ns) ->
+    %% Determine which nodes we should try to connect
+    AlreadyConnected = val(recover_nodes),
+    {_, Nodes} = mnesia_lib:search_delete(node(), Ns),
+    Check = Nodes -- AlreadyConnected,
+    GoodNodes = mnesia_monitor:negotiate_protocol(Check),
+    if
+	GoodNodes == [] ->
+	    %% No good noodes to connect to
+	    ignore;
+	true ->
+	    %% Now we have agreed upon a protocol with some new nodes
+	    %% and we may use them when we recover transactions
+	    mnesia_lib:add_list(recover_nodes, GoodNodes),
+	    cast({announce_all, GoodNodes}),
+	    case get_master_nodes(schema) of
+		[] ->
+		    Context = starting_partitioned_network,
+		    mnesia_monitor:detect_inconcistency(GoodNodes, Context);
+		_ -> %% If master_nodes is set ignore old inconsistencies
+		    ignore
+	    end
+    end,
+    {GoodNodes, AlreadyConnected}.
+
+disconnect(Node) ->
+    mnesia_monitor:disconnect(Node),
+    mnesia_lib:del(recover_nodes, Node).
+
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason);
+	Value -> Value
+    end.
+
+call(Msg) ->
+    Pid = whereis(?MODULE),
+    case Pid of
+	undefined ->
+	    {error, {node_not_running, node()}};
+	Pid ->
+	    link(Pid),
+	    Res = gen_server:call(Pid, Msg, infinity),
+	    unlink(Pid),
+
+            %% We get an exit signal if server dies
+            receive
+                {'EXIT', Pid, _Reason} ->
+                    {error, {node_not_running, node()}}
+            after 0 ->
+                    ignore
+            end,
+	    Res
+    end.
+
+multicall(Nodes, Msg) ->
+    rpc:multicall(Nodes, ?MODULE, call, [Msg]).
+
+cast(Msg) ->
+    case whereis(?MODULE) of
+	undefined -> ignore;
+	Pid ->  gen_server:cast(Pid, Msg)
+    end.
+
+abcast(Nodes, Msg) ->
+    gen_server:abcast(Nodes, ?MODULE, Msg).
+
+note_decision(Tid, Outcome) ->
+    Tab = val(latest_transient_decision),
+    ?ets_insert(Tab, #transient_decision{tid = Tid, outcome = Outcome}).
+
+note_up(Node, _Date, _Time) ->
+    ?ets_delete(mnesia_decision, Node).
+
+note_down(Node, Date, Time) ->
+    ?ets_insert(mnesia_decision, {mnesia_down, Node, Date, Time}).
+
+note_master_nodes(Tab, []) ->
+    ?ets_delete(mnesia_decision, Tab);
+note_master_nodes(Tab, Nodes) when list(Nodes) ->
+    Master = {master_nodes, Tab, Nodes},
+    ?ets_insert(mnesia_decision, Master).
+
+note_outcome(D) when D#decision.disc_nodes == [] ->
+%%    ?DBG("~w: note_tmp_decision: ~w~n", [node(), D]),
+    note_decision(D#decision.tid, filter_outcome(D#decision.outcome)),
+    ?ets_delete(mnesia_decision, D#decision.tid);
+note_outcome(D) when D#decision.disc_nodes /= [] ->
+%%    ?DBG("~w: note_decision: ~w~n", [node(), D]),
+    ?ets_insert(mnesia_decision, D).
+
+log_decision(D) when D#decision.outcome /= unclear ->
+    OldD = decision(D#decision.tid),
+    MergedD = merge_decisions(node(), OldD, D),
+    do_log_decision(MergedD, true);
+log_decision(D) ->
+    do_log_decision(D, false).
+
+do_log_decision(D, DoTell) ->
+    RamNs = D#decision.ram_nodes,
+    DiscNs = D#decision.disc_nodes -- [node()],
+    Outcome = D#decision.outcome,
+    D2 =
+	case Outcome of
+	    aborted -> D#decision{disc_nodes = DiscNs};
+	    committed -> D#decision{disc_nodes = DiscNs};
+	    _ -> D
+	end,
+    note_outcome(D2),
+    case mnesia_monitor:use_dir() of
+	true ->
+	    mnesia_log:append(latest_log, D2),
+	    if
+		DoTell == true, Outcome /= unclear ->
+		    tell_im_certain(DiscNs, D2),
+		    tell_im_certain(RamNs, D2);
+		true ->
+		    ignore
+	    end;
+	false ->
+	    ignore
+    end.
+
+tell_im_certain([], _D) ->
+    ignore;
+tell_im_certain(Nodes, D) ->
+    Msg = {im_certain, node(), D},
+%%    ?DBG("~w: ~w: tell: ~w~n", [node(), Msg, Nodes]),
+    abcast(Nodes, Msg).
+
+log_mnesia_up(Node) ->
+    call({log_mnesia_up, Node}).
+
+log_mnesia_down(Node) ->
+    call({log_mnesia_down, Node}).
+
+get_mnesia_downs() ->
+    Tab = mnesia_decision,
+    Pat = {mnesia_down, '_', '_', '_'},
+    Downs = ?ets_match_object(Tab, Pat),
+    [Node || {mnesia_down, Node, _Date, _Time} <- Downs].
+
+%% Check if we have got a mnesia_down from Node
+has_mnesia_down(Node) ->
+    case ?ets_lookup(mnesia_decision, Node) of
+	[{mnesia_down, Node, _Date, _Time}] ->
+	    true;
+	[] ->
+	    false
+    end.
+
+mnesia_down(Node) ->
+    case ?catch_val(recover_nodes) of
+	{'EXIT', _} ->
+	    %% Not started yet
+	    ignore;
+	_ ->
+	    mnesia_lib:del(recover_nodes, Node),
+	    cast({mnesia_down, Node})
+    end.
+
+log_master_nodes(Args, UseDir, IsRunning) ->
+    if
+	IsRunning == yes ->
+	    log_master_nodes2(Args, UseDir, IsRunning, ok);
+	UseDir == false ->
+	    ok;
+	true ->
+	    Name = latest_log,
+	    Fname = mnesia_log:latest_log_file(),
+	    Exists = mnesia_lib:exists(Fname),
+	    Repair = mnesia:system_info(auto_repair),
+	    OpenArgs = [{file, Fname}, {name, Name}, {repair, Repair}],
+	    case disk_log:open(OpenArgs) of
+		{ok, Name} ->
+		    log_master_nodes2(Args, UseDir, IsRunning, ok);
+		{repaired, Name, {recovered,  _R}, {badbytes, _B}}
+		  when Exists == true ->
+		    log_master_nodes2(Args, UseDir, IsRunning, ok);
+		{repaired, Name, {recovered,  _R}, {badbytes, _B}}
+		  when Exists == false ->
+		    mnesia_log:write_trans_log_header(),
+		    log_master_nodes2(Args, UseDir, IsRunning, ok);
+		{error, Reason} ->
+		    {error, Reason}
+	    end
+    end.
+
+log_master_nodes2([{Tab, Nodes} | Tail], UseDir, IsRunning, WorstRes) ->
+    Res =
+	case IsRunning of
+	    yes ->
+		R = call({log_master_nodes, Tab, Nodes, UseDir, IsRunning}),
+		mnesia_controller:master_nodes_updated(Tab, Nodes),
+		R;
+	    _ ->
+		do_log_master_nodes(Tab, Nodes, UseDir, IsRunning)
+	end,
+    case Res of
+	ok ->
+	    log_master_nodes2(Tail, UseDir, IsRunning, WorstRes);
+	{error, Reason} ->
+	    log_master_nodes2(Tail, UseDir, IsRunning, {error, Reason})
+    end;
+log_master_nodes2([], _UseDir, IsRunning, WorstRes) ->
+    case IsRunning of
+	yes ->
+	    WorstRes;
+	_ ->
+	    disk_log:close(latest_log),
+	    WorstRes
+    end.
+
+get_master_node_info() ->
+    Tab = mnesia_decision,
+    Pat = {master_nodes, '_', '_'},
+    case catch mnesia_lib:db_match_object(ram_copies,Tab, Pat) of
+	{'EXIT', _} ->
+	    [];
+	Masters ->
+	    Masters
+    end.
+
+get_master_node_tables() ->
+    Masters = get_master_node_info(),
+    [Tab || {master_nodes, Tab, _Nodes} <- Masters].
+
+get_master_nodes(Tab) ->
+    case catch ?ets_lookup_element(mnesia_decision, Tab, 3) of
+	{'EXIT', _} -> [];
+	Nodes  -> Nodes
+    end.
+
+%% Determine what has happened to the transaction
+what_happened(Tid, Protocol, Nodes) ->
+    Default =
+	case Protocol of
+	    asym_trans -> aborted;
+	    _ -> unclear  %% sym_trans and sync_sym_trans
+	end,
+    This = node(),
+    case lists:member(This, Nodes) of
+	true ->
+	    {ok, Outcome} = call({what_happened, Default, Tid}),
+	    Others = Nodes -- [This],
+	    case filter_outcome(Outcome) of
+		unclear -> what_happened_remotely(Tid, Default, Others);
+		aborted -> aborted;
+		committed -> committed
+	    end;
+	false ->
+	    what_happened_remotely(Tid, Default, Nodes)
+    end.
+
+what_happened_remotely(Tid, Default, Nodes) ->
+    {Replies, _} = multicall(Nodes, {what_happened, Default, Tid}),
+    check_what_happened(Replies, 0, 0).
+
+check_what_happened([H | T], Aborts, Commits) ->
+    case H of
+	{ok, R} ->
+	    case filter_outcome(R) of
+		committed ->
+		    check_what_happened(T, Aborts, Commits + 1);
+		aborted ->
+		    check_what_happened(T, Aborts + 1, Commits);
+		unclear ->
+		    check_what_happened(T, Aborts, Commits)
+	    end;
+	{error, _} ->
+	    check_what_happened(T, Aborts, Commits);
+	{badrpc, _} ->
+	    check_what_happened(T, Aborts, Commits)
+    end;
+check_what_happened([], Aborts, Commits) ->
+    if
+	Aborts == 0, Commits == 0 -> aborted;  % None of the active nodes knows
+	Aborts > 0 -> aborted;                 % Someody has aborted
+	Aborts == 0, Commits > 0 -> committed  % All has committed
+    end.
+
+%% Determine what has happened to the transaction
+%% and possibly wait forever for the decision.
+wait_for_decision(presume_commit, _InitBy) ->
+    %% sym_trans
+    {{presume_commit, self()}, committed};
+
+wait_for_decision(D, InitBy) when D#decision.outcome == presume_abort ->
+    %% asym_trans
+    Tid = D#decision.tid,
+    Outcome = filter_outcome(outcome(Tid, D#decision.outcome)),
+    if
+	Outcome /= unclear ->
+	    {Tid, Outcome};
+
+	InitBy /= startup ->
+	    %% Wait a while for active transactions
+	    %% to end and try again
+	    timer:sleep(200),
+	    wait_for_decision(D, InitBy);
+
+	InitBy == startup ->
+	    {ok, Res} = call({wait_for_decision, D}),
+	    {Tid, Res}
+    end.
+
+still_pending([Tid | Pending]) ->
+    case filter_outcome(outcome(Tid, unclear)) of
+	unclear -> [Tid | still_pending(Pending)];
+	_ -> still_pending(Pending)
+    end;
+still_pending([]) ->
+    [].
+
+load_decision_tab() ->
+    Cont = mnesia_log:open_decision_tab(),
+    load_decision_tab(Cont, load_decision_tab),
+    mnesia_log:close_decision_tab().
+
+load_decision_tab(eof, _InitBy) ->
+    ok;
+load_decision_tab(Cont, InitBy) ->
+    case mnesia_log:chunk_decision_tab(Cont) of
+	{Cont2, Decisions} ->
+	    note_log_decisions(Decisions, InitBy),
+	    load_decision_tab(Cont2, InitBy);
+	eof ->
+	    ok
+    end.
+
+%% Dumps DECISION.LOG and PDECISION.LOG and removes them.
+%% From now on all decisions are logged in the transaction log file
+convert_old() ->
+    HasOldStuff =
+	mnesia_lib:exists(mnesia_log:previous_decision_log_file()) or
+	mnesia_lib:exists(mnesia_log:decision_log_file()),
+    case HasOldStuff of
+	true ->
+	    mnesia_log:open_decision_log(),
+	    dump_decision_log(startup),
+	    dump_decision_log(startup),
+	    mnesia_log:close_decision_log(),
+	    Latest = mnesia_log:decision_log_file(),
+	    ok = file:delete(Latest);
+	false ->
+	    ignore
+    end.
+
+dump_decision_log(InitBy) ->
+    %% Assumed to be run in transaction log dumper process
+    Cont = mnesia_log:prepare_decision_log_dump(),
+    perform_dump_decision_log(Cont, InitBy).
+
+perform_dump_decision_log(eof, _InitBy) ->
+    confirm_decision_log_dump();
+perform_dump_decision_log(Cont, InitBy) when InitBy == startup ->
+    case mnesia_log:chunk_decision_log(Cont) of
+	{Cont2, Decisions} ->
+	    note_log_decisions(Decisions, InitBy),
+	    perform_dump_decision_log(Cont2, InitBy);
+	eof ->
+	    confirm_decision_log_dump()
+    end;
+perform_dump_decision_log(_Cont, _InitBy) ->
+    confirm_decision_log_dump().
+
+confirm_decision_log_dump() ->
+    dump_decision_tab(),
+    mnesia_log:confirm_decision_log_dump().
+
+dump_decision_tab() ->
+    Tab = mnesia_decision,
+    All = mnesia_lib:db_match_object(ram_copies,Tab, '_'),
+    mnesia_log:save_decision_tab({decision_list, All}).
+
+note_log_decisions([What | Tail], InitBy) ->
+    note_log_decision(What, InitBy),
+    note_log_decisions(Tail, InitBy);
+note_log_decisions([], _InitBy) ->
+    ok.
+
+note_log_decision(NewD, InitBy) when NewD#decision.outcome == pre_commit ->
+    note_log_decision(NewD#decision{outcome = unclear}, InitBy);
+
+note_log_decision(NewD, _InitBy) when record(NewD, decision) ->
+    Tid = NewD#decision.tid,
+    sync_trans_tid_serial(Tid),
+    OldD = decision(Tid),
+    MergedD = merge_decisions(node(), OldD, NewD),
+    note_outcome(MergedD);
+
+note_log_decision({trans_tid, serial, _Serial}, startup) ->
+    ignore;
+
+note_log_decision({trans_tid, serial, Serial}, _InitBy) ->
+    sync_trans_tid_serial(Serial);
+
+note_log_decision({mnesia_up, Node, Date, Time}, _InitBy) ->
+    note_up(Node, Date, Time);
+
+note_log_decision({mnesia_down, Node, Date, Time}, _InitBy) ->
+    note_down(Node, Date, Time);
+
+note_log_decision({master_nodes, Tab, Nodes}, _InitBy) ->
+    note_master_nodes(Tab, Nodes);
+
+note_log_decision(H, _InitBy) when H#log_header.log_kind == decision_log ->
+    V = mnesia_log:decision_log_version(),
+    if
+	H#log_header.log_version == V->
+	    ok;
+	H#log_header.log_version == "2.0" ->
+	    verbose("Accepting an old version format of decision log: ~p~n",
+		    [V]),
+	    ok;
+	true ->
+	    fatal("Bad version of decision log: ~p~n", [H])
+    end;
+
+note_log_decision(H, _InitBy) when H#log_header.log_kind == decision_tab ->
+    V = mnesia_log:decision_tab_version(),
+    if
+	V == H#log_header.log_version ->
+	    ok;
+	true ->
+	    fatal("Bad version of decision tab: ~p~n", [H])
+    end;
+note_log_decision({decision_list, ItemList}, InitBy) ->
+    note_log_decisions(ItemList, InitBy);
+note_log_decision(BadItem, InitBy) ->
+    exit({"Bad decision log item", BadItem, InitBy}).
+
+trans_tid_serial() ->
+    ?ets_lookup_element(mnesia_decision, serial, 3).
+
+set_trans_tid_serial(Val) ->
+    ?ets_insert(mnesia_decision, {trans_tid, serial, Val}).
+
+incr_trans_tid_serial() ->
+    ?ets_update_counter(mnesia_decision, serial, 1).
+
+sync_trans_tid_serial(ThatCounter) when integer(ThatCounter) ->
+    ThisCounter = trans_tid_serial(),
+    if
+	ThatCounter > ThisCounter ->
+	    set_trans_tid_serial(ThatCounter + 1);
+	true ->
+	    ignore
+    end;
+sync_trans_tid_serial(Tid) ->
+    sync_trans_tid_serial(Tid#tid.counter).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Callback functions from gen_server
+
+%%----------------------------------------------------------------------
+%% Func: init/1
+%% Returns: {ok, State}          |
+%%          {ok, State, Timeout} |
+%%          {stop, Reason}
+%%----------------------------------------------------------------------
+init([Parent]) ->
+    process_flag(trap_exit, true),
+    mnesia_lib:verbose("~p starting: ~p~n", [?MODULE, self()]),
+    set(latest_transient_decision, create_transient_decision()),
+    set(previous_transient_decisions, []),
+    set(recover_nodes, []),
+    State = #state{supervisor = Parent},
+    {ok, State}.
+
+create_transient_decision() ->
+    ?ets_new_table(mnesia_transient_decision, [{keypos, 2}, set, public]).
+
+%%----------------------------------------------------------------------
+%% Func: handle_call/3
+%% Returns: {reply, Reply, State}          |
+%%          {reply, Reply, State, Timeout} |
+%%          {noreply, State}               |
+%%          {noreply, State, Timeout}      |
+%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
+%%----------------------------------------------------------------------
+
+handle_call(init, From, State) when State#state.initiated == false ->
+    Args = [{keypos, 2}, set, public, named_table],
+    case mnesia_monitor:use_dir() of
+	true ->
+	    ?ets_new_table(mnesia_decision, Args),
+	    set_trans_tid_serial(0),
+	    TabFile = mnesia_log:decision_tab_file(),
+	    case mnesia_lib:exists(TabFile) of
+		true ->
+		    load_decision_tab();
+		false ->
+		    ignore
+	    end,
+	    convert_old(),
+	    mnesia_dumper:opt_dump_log(scan_decisions);
+	false ->
+	    ?ets_new_table(mnesia_decision, Args),
+	    set_trans_tid_serial(0)
+    end,
+    handle_early_msgs(State, From);
+
+handle_call(Msg, From, State) when State#state.initiated == false ->
+    %% Buffer early messages
+    Msgs = State#state.early_msgs,
+    {noreply, State#state{early_msgs = [{call, Msg, From} | Msgs]}};
+
+handle_call({what_happened, Default, Tid}, _From, State) ->
+    sync_trans_tid_serial(Tid),
+    Outcome = outcome(Tid, Default),
+    {reply, {ok, Outcome}, State};
+
+handle_call({wait_for_decision, D}, From, State) ->
+    Recov = val(recover_nodes),
+    AliveRam = (mnesia_lib:intersect(D#decision.ram_nodes, Recov) -- [node()]),
+    RemoteDisc = D#decision.disc_nodes -- [node()],
+    if
+	AliveRam == [], RemoteDisc == [] ->
+	    %% No more else to wait for and we may safely abort
+	    {reply, {ok, aborted}, State};
+	true ->
+	    verbose("Transaction ~p is unclear. "
+		    "Wait for disc nodes: ~w ram: ~w~n",
+		    [D#decision.tid, RemoteDisc, AliveRam]),
+	    AliveDisc = mnesia_lib:intersect(RemoteDisc, Recov),
+	    Msg = {what_decision, node(), D},
+	    abcast(AliveRam, Msg),
+	    abcast(AliveDisc, Msg),
+	    case val(max_wait_for_decision) of
+		infinity ->
+		    ignore;
+		MaxWait ->
+		    ForceMsg =  {force_decision, D#decision.tid},
+		    {ok, _} = timer:send_after(MaxWait, ForceMsg)
+	    end,
+	    State2 = State#state{unclear_pid = From,
+				 unclear_decision = D,
+				 unclear_waitfor = (RemoteDisc ++ AliveRam)},
+	    {noreply, State2}
+    end;
+
+handle_call({log_mnesia_up, Node}, _From, State) ->
+    do_log_mnesia_up(Node),
+    {reply, ok, State};
+
+handle_call({log_mnesia_down, Node}, _From, State) ->
+    do_log_mnesia_down(Node),
+    {reply, ok, State};
+
+handle_call({log_master_nodes, Tab, Nodes, UseDir, IsRunning}, _From, State) ->
+    do_log_master_nodes(Tab, Nodes, UseDir, IsRunning),
+    {reply, ok, State};
+
+handle_call(Msg, _From, State) ->
+    error("~p got unexpected call: ~p~n", [?MODULE, Msg]),
+    {noreply, State}.
+
+do_log_mnesia_up(Node) ->
+    Yoyo = {mnesia_up, Node, Date = date(), Time = time()},
+    case mnesia_monitor:use_dir() of
+	true ->
+	    mnesia_log:append(latest_log, Yoyo),
+	    disk_log:sync(latest_log);
+	false  ->
+	    ignore
+    end,
+    note_up(Node, Date, Time).
+
+do_log_mnesia_down(Node) ->
+    Yoyo = {mnesia_down, Node, Date = date(), Time = time()},
+    case mnesia_monitor:use_dir() of
+	true ->
+	    mnesia_log:append(latest_log, Yoyo),
+	    disk_log:sync(latest_log);
+	false  ->
+	    ignore
+    end,
+    note_down(Node, Date, Time).
+
+do_log_master_nodes(Tab, Nodes, UseDir, IsRunning) ->
+    Master = {master_nodes, Tab, Nodes},
+    Res =
+	case UseDir of
+	    true ->
+		LogRes = mnesia_log:append(latest_log, Master),
+		disk_log:sync(latest_log),
+		LogRes;
+	    false  ->
+		ok
+	end,
+    case IsRunning of
+	yes ->
+	    note_master_nodes(Tab, Nodes);
+	_NotRunning ->
+	    ignore
+    end,
+    Res.
+
+%%----------------------------------------------------------------------
+%% Func: handle_cast/2
+%% Returns: {noreply, State}          |
+%%          {noreply, State, Timeout} |
+%%          {stop, Reason, State}            (terminate/2 is called)
+%%----------------------------------------------------------------------
+
+handle_cast(Msg, State) when State#state.initiated == false ->
+    %% Buffer early messages
+    Msgs = State#state.early_msgs,
+    {noreply, State#state{early_msgs = [{cast, Msg} | Msgs]}};
+
+handle_cast({im_certain, Node, NewD}, State) ->
+    OldD = decision(NewD#decision.tid),
+    MergedD = merge_decisions(Node, OldD, NewD),
+    do_log_decision(MergedD, false),
+    {noreply, State};
+
+handle_cast(allow_garb, State) ->
+    do_allow_garb(),
+    {noreply, State};
+
+handle_cast({decisions, Node, Decisions}, State) ->
+    mnesia_lib:add(recover_nodes, Node),
+    State2 = add_remote_decisions(Node, Decisions, State),
+    {noreply, State2};
+
+handle_cast({what_decision, Node, OtherD}, State) ->
+    Tid = OtherD#decision.tid,
+    sync_trans_tid_serial(Tid),
+    Decision =
+	case decision(Tid) of
+	    no_decision -> OtherD;
+	    MyD when record(MyD, decision) -> MyD
+	end,
+    announce([Node], [Decision], [], true),
+    {noreply, State};
+
+handle_cast({mnesia_down, Node}, State) ->
+    case State#state.unclear_decision of
+	undefined ->
+	    {noreply, State};
+	D ->
+	    case lists:member(Node, D#decision.ram_nodes) of
+		false ->
+		    {noreply, State};
+		true ->
+		    State2 = add_remote_decision(Node, D, State),
+		    {noreply, State2}
+		end
+    end;
+
+handle_cast({announce_all, Nodes}, State) ->
+    announce_all(Nodes, tabs()),
+    {noreply, State};
+
+handle_cast(Msg, State) ->
+    error("~p got unexpected cast: ~p~n", [?MODULE, Msg]),
+    {noreply, State}.
+
+%%----------------------------------------------------------------------
+%% Func: handle_info/2
+%% Returns: {noreply, State}          |
+%%          {noreply, State, Timeout} |
+%%          {stop, Reason, State}            (terminate/2 is called)
+%%----------------------------------------------------------------------
+
+%% No need for buffering
+%% handle_info(Msg, State) when State#state.initiated == false ->
+%%     %% Buffer early messages
+%%     Msgs = State#state.early_msgs,
+%%     {noreply, State#state{early_msgs = [{info, Msg} | Msgs]}};
+
+handle_info(check_overload, S) ->
+    %% Time to check if mnesia_tm is overloaded
+    case whereis(mnesia_tm) of
+	Pid when pid(Pid) ->
+
+	    Threshold = 100,
+	    Prev = S#state.tm_queue_len,
+	    {message_queue_len, Len} =
+		process_info(Pid, message_queue_len),
+	    if
+		Len > Threshold, Prev > Threshold ->
+		    What = {mnesia_tm, message_queue_len, [Prev, Len]},
+		    mnesia_lib:report_system_event({mnesia_overload, What}),
+		    {noreply, S#state{tm_queue_len = 0}};
+
+		Len > Threshold ->
+		    {noreply, S#state{tm_queue_len = Len}};
+
+		true ->
+		    {noreply, S#state{tm_queue_len = 0}}
+	    end;
+	undefined ->
+	    {noreply, S}
+    end;
+
+handle_info(garb_decisions, State) ->
+    do_garb_decisions(),
+    {noreply, State};
+
+handle_info({force_decision, Tid}, State) ->
+    %% Enforce a transaction recovery decision,
+    %% if we still are waiting for the outcome
+
+    case State#state.unclear_decision of
+	U when U#decision.tid == Tid ->
+	    verbose("Decided to abort transaction ~p since "
+		    "max_wait_for_decision has been exceeded~n",
+		    [Tid]),
+	    D = U#decision{outcome = aborted},
+	    State2 = add_remote_decision(node(), D, State),
+	    {noreply, State2};
+	_ ->
+	    {noreply, State}
+    end;
+
+handle_info({'EXIT', Pid, R}, State) when Pid == State#state.supervisor ->
+    mnesia_lib:dbg_out("~p was ~p~n",[?MODULE, R]),
+    {stop, shutdown, State};
+
+handle_info(Msg, State) ->
+    error("~p got unexpected info: ~p~n", [?MODULE, Msg]),
+    {noreply, State}.
+
+%%----------------------------------------------------------------------
+%% Func: terminate/2
+%% Purpose: Shutdown the server
+%% Returns: any (ignored by gen_server)
+%%----------------------------------------------------------------------
+
+terminate(Reason, State) ->
+    mnesia_monitor:terminate_proc(?MODULE, Reason, State).
+
+%%----------------------------------------------------------------------
+%% Func: code_change/3
+%% Purpose: Upgrade process when its code is to be changed
+%% Returns: {ok, NewState}
+%%----------------------------------------------------------------------
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%%----------------------------------------------------------------------
+%%% Internal functions
+%%%----------------------------------------------------------------------
+
+handle_early_msgs(State, From) ->
+    Res = do_handle_early_msgs(State#state.early_msgs,
+			       State#state{early_msgs = [],
+					   initiated = true}),
+    gen_server:reply(From, ok),
+    Res.
+
+do_handle_early_msgs([Msg | Msgs], State) ->
+    %% The messages are in reverted order
+    case do_handle_early_msgs(Msgs, State) of
+        {stop, Reason, Reply, State2} ->
+	    {stop, Reason, Reply, State2};
+        {stop, Reason, State2} ->
+	    {stop, Reason, State2};
+	{noreply, State2} ->
+	    handle_early_msg(Msg, State2)
+    end;
+
+do_handle_early_msgs([], State) ->
+    {noreply, State}.
+
+handle_early_msg({call, Msg, From}, State) ->
+    case handle_call(Msg, From, State) of
+	{reply, R, S} ->
+	    gen_server:reply(From, R),
+	    {noreply, S};
+	Other ->
+	    Other
+    end;
+handle_early_msg({cast, Msg}, State) ->
+    handle_cast(Msg, State);
+handle_early_msg({info, Msg}, State) ->
+    handle_info(Msg, State).
+
+tabs() ->
+    Curr = val(latest_transient_decision),    % Do not miss any trans even
+    Prev = val(previous_transient_decisions), % if the tabs are switched
+    [Curr, mnesia_decision | Prev].           % Ordered by hit probability
+
+decision(Tid) ->
+    decision(Tid, tabs()).
+
+decision(Tid, [Tab | Tabs]) ->
+    case catch ?ets_lookup(Tab, Tid) of
+	[D] when record(D, decision) ->
+	    D;
+	[C] when record(C, transient_decision) ->
+	    #decision{tid = C#transient_decision.tid,
+		      outcome =  C#transient_decision.outcome,
+		      disc_nodes = [],
+		      ram_nodes = []
+		     };
+	[] ->
+	    decision(Tid, Tabs);
+	{'EXIT', _} ->
+	    %% Recently switched transient decision table
+	    decision(Tid, Tabs)
+    end;
+decision(_Tid, []) ->
+    no_decision.
+
+outcome(Tid, Default) ->
+    outcome(Tid, Default, tabs()).
+
+outcome(Tid, Default, [Tab | Tabs]) ->
+    case catch ?ets_lookup_element(Tab, Tid, 3) of
+	{'EXIT', _} ->
+	    outcome(Tid, Default, Tabs);
+	Val ->
+	    Val
+    end;
+outcome(_Tid, Default, []) ->
+    Default.
+
+filter_outcome(Val) ->
+    case Val of
+	unclear -> unclear;
+	aborted -> aborted;
+	presume_abort -> aborted;
+	committed -> committed;
+	pre_commit -> unclear
+    end.
+
+filter_aborted(D) when D#decision.outcome == presume_abort ->
+    D#decision{outcome = aborted};
+filter_aborted(D) ->
+    D.
+
+%% Merge old decision D with new (probably remote) decision
+merge_decisions(Node, D, NewD0) ->
+    NewD = filter_aborted(NewD0),
+    if
+	D == no_decision, node() /= Node ->
+	    %% We did not know anything about this txn
+	    NewD#decision{disc_nodes = []};
+	D == no_decision ->
+	    NewD;
+	record(D, decision) ->
+	    DiscNs = D#decision.disc_nodes -- ([node(), Node]),
+	    OldD = filter_aborted(D#decision{disc_nodes = DiscNs}),
+%%	    mnesia_lib:dbg_out("merge ~w: NewD = ~w~n D = ~w~n OldD = ~w~n",
+%%			       [Node, NewD, D, OldD]),
+	    if
+		OldD#decision.outcome == unclear,
+		NewD#decision.outcome == unclear ->
+		    D;
+
+		OldD#decision.outcome == NewD#decision.outcome ->
+		    %% We have come to the same decision
+		    OldD;
+
+		OldD#decision.outcome == committed,
+		NewD#decision.outcome == aborted ->
+		    %% Interesting! We have already committed,
+		    %% but someone else has aborted. Now we
+		    %% have a nice little inconcistency. The
+		    %% other guy (or some one else) has
+		    %% enforced a recovery decision when
+		    %% max_wait_for_decision was exceeded.
+		    %% We will pretend that we have obeyed
+		    %% the forced recovery decision, but we
+		    %% will also generate an event in case the
+		    %% application wants to do something clever.
+		    Msg = {inconsistent_database, bad_decision, Node},
+		    mnesia_lib:report_system_event(Msg),
+		    OldD#decision{outcome = aborted};
+
+		OldD#decision.outcome == aborted ->
+		    %% aborted overrrides anything
+		    OldD#decision{outcome = aborted};
+
+		NewD#decision.outcome == aborted ->
+		    %% aborted overrrides anything
+		    OldD#decision{outcome = aborted};
+
+		OldD#decision.outcome == committed,
+		NewD#decision.outcome == unclear ->
+		    %% committed overrides unclear
+		    OldD#decision{outcome = committed};
+
+		OldD#decision.outcome == unclear,
+		NewD#decision.outcome == committed ->
+		    %% committed overrides unclear
+		    OldD#decision{outcome = committed}
+	    end
+    end.
+
+add_remote_decisions(Node, [D | Tail], State) when record(D, decision) ->
+    State2 = add_remote_decision(Node, D, State),
+    add_remote_decisions(Node, Tail, State2);
+
+add_remote_decisions(Node, [C | Tail], State)
+        when record(C, transient_decision) ->
+    D = #decision{tid = C#transient_decision.tid,
+		  outcome = C#transient_decision.outcome,
+		  disc_nodes = [],
+		  ram_nodes = []},
+    State2 = add_remote_decision(Node, D, State),
+    add_remote_decisions(Node, Tail, State2);
+
+add_remote_decisions(Node, [{mnesia_down, _, _, _} | Tail], State) ->
+    add_remote_decisions(Node, Tail, State);
+
+add_remote_decisions(Node, [{trans_tid, serial, Serial} | Tail], State) ->
+    sync_trans_tid_serial(Serial),
+    case State#state.unclear_decision of
+	undefined ->
+	    ignored;
+	D ->
+	    case lists:member(Node, D#decision.ram_nodes) of
+		true ->
+		    ignore;
+		false ->
+		    abcast([Node], {what_decision, node(), D})
+	    end
+    end,
+    add_remote_decisions(Node, Tail, State);
+
+add_remote_decisions(_Node, [], State) ->
+    State.
+
+add_remote_decision(Node, NewD, State) ->
+    Tid = NewD#decision.tid,
+    OldD = decision(Tid),
+    D = merge_decisions(Node, OldD, NewD),
+    do_log_decision(D, false),
+    Outcome = D#decision.outcome,
+    if
+	OldD == no_decision ->
+	    ignore;
+	Outcome == unclear ->
+	    ignore;
+	true ->
+	    case lists:member(node(), NewD#decision.disc_nodes) or
+		 lists:member(node(), NewD#decision.ram_nodes) of
+		true ->
+		    tell_im_certain([Node], D);
+		false ->
+		    ignore
+	    end
+    end,
+    case State#state.unclear_decision of
+	U when U#decision.tid == Tid ->
+	    WaitFor = State#state.unclear_waitfor -- [Node],
+	    if
+		Outcome == unclear, WaitFor == [] ->
+		    %% Everybody are uncertain, lets abort
+		    NewOutcome = aborted,
+		    CertainD = D#decision{outcome = NewOutcome,
+					  disc_nodes = [],
+					  ram_nodes = []},
+		    tell_im_certain(D#decision.disc_nodes, CertainD),
+		    tell_im_certain(D#decision.ram_nodes, CertainD),
+		    do_log_decision(CertainD, false),
+		    verbose("Decided to abort transaction ~p "
+			    "since everybody are uncertain ~p~n",
+			    [Tid, CertainD]),
+		    gen_server:reply(State#state.unclear_pid, {ok, NewOutcome}),
+		    State#state{unclear_pid = undefined,
+				unclear_decision = undefined,
+				unclear_waitfor = undefined};
+		Outcome /= unclear ->
+		    verbose("~p told us that transaction ~p was ~p~n",
+			    [Node, Tid, Outcome]),
+		    gen_server:reply(State#state.unclear_pid, {ok, Outcome}),
+		    State#state{unclear_pid = undefined,
+				unclear_decision = undefined,
+				unclear_waitfor = undefined};
+		Outcome == unclear ->
+		    State#state{unclear_waitfor = WaitFor}
+	    end;
+	_ ->
+	    State
+    end.
+
+announce_all([], _Tabs) ->
+    ok;
+announce_all(ToNodes, [Tab | Tabs]) ->
+    case catch mnesia_lib:db_match_object(ram_copies, Tab, '_') of
+	{'EXIT', _} ->
+	    %% Oops, we are in the middle of a 'garb_decisions'
+	    announce_all(ToNodes, Tabs);
+	List ->
+	    announce(ToNodes, List, [], false),
+	    announce_all(ToNodes, Tabs)
+    end;
+announce_all(_ToNodes, []) ->
+    ok.
+
+announce(ToNodes, [Head | Tail], Acc, ForceSend) ->
+    Acc2 = arrange(ToNodes, Head, Acc, ForceSend),
+    announce(ToNodes, Tail, Acc2, ForceSend);
+
+announce(_ToNodes, [], Acc, _ForceSend) ->
+    send_decisions(Acc).
+
+send_decisions([{Node, Decisions} | Tail]) ->
+    abcast([Node], {decisions, node(), Decisions}),
+    send_decisions(Tail);
+send_decisions([]) ->
+    ok.
+
+arrange([To | ToNodes], D, Acc, ForceSend) when record(D, decision) ->
+    NeedsAdd = (ForceSend or
+		lists:member(To, D#decision.disc_nodes) or
+		lists:member(To, D#decision.ram_nodes)),
+    case NeedsAdd of
+	true ->
+	    Acc2 = add_decision(To, D, Acc),
+	    arrange(ToNodes, D, Acc2, ForceSend);
+	false ->
+	    arrange(ToNodes, D, Acc, ForceSend)
+    end;
+
+arrange([To | ToNodes], C, Acc, ForceSend) when record(C, transient_decision) ->
+    Acc2 = add_decision(To, C, Acc),
+    arrange(ToNodes, C, Acc2, ForceSend);
+
+arrange([_To | _ToNodes], {mnesia_down, _Node, _Date, _Time}, Acc, _ForceSend) ->
+    %% The others have their own info about this
+    Acc;
+
+arrange([_To | _ToNodes], {master_nodes, _Tab, _Nodes}, Acc, _ForceSend) ->
+    %% The others have their own info about this
+    Acc;
+
+arrange([To | ToNodes], {trans_tid, serial, Serial}, Acc, ForceSend) ->
+    %% Do the lamport thing plus release the others
+    %% from uncertainity.
+    Acc2 = add_decision(To, {trans_tid, serial, Serial}, Acc),
+    arrange(ToNodes, {trans_tid, serial, Serial}, Acc2, ForceSend);
+
+arrange([], _Decision, Acc, _ForceSend) ->
+    Acc.
+
+add_decision(Node, Decision, [{Node, Decisions} | Tail]) ->
+    [{Node, [Decision | Decisions]} | Tail];
+add_decision(Node, Decision, [Head | Tail]) ->
+    [Head | add_decision(Node, Decision, Tail)];
+add_decision(Node, Decision, []) ->
+    [{Node, [Decision]}].
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_registry.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_registry.erl
new file mode 100644
index 0000000000..a7e65506fa
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_registry.erl
@@ -0,0 +1,276 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_registry.erl,v 1.2 2010/03/04 13:54:19 maria Exp $
+%%
+-module(mnesia_registry).
+
+%%%----------------------------------------------------------------------
+%%% File    : mnesia_registry.erl
+%%% Purpose : Support dump and restore of a registry on a C-node
+%%%           This is an OTP internal module and is not public available.
+%%%
+%%% Example : Dump some hardcoded records into the Mnesia table Tab
+%%%
+%%% 	  case rpc:call(Node, mnesia_registry, start_dump, [Tab, self()]) of
+%%% 	     Pid when pid(Pid) ->
+%%% 		 Pid ! {write, key1, key_size1, val_type1, val_size1, val1},
+%%% 		 Pid ! {delete, key3},
+%%% 		 Pid ! {write, key2, key_size2, val_type2, val_size2, val2},
+%%% 		 Pid ! {write, key4, key_size4, val_type4, val_size4, val4},
+%%% 		 Pid ! {commit, self()},
+%%% 		 receive
+%%% 		     {ok, Pid} ->
+%%% 			 ok;
+%%% 		     {'EXIT', Pid, Reason} ->
+%%% 			 exit(Reason)
+%%% 		 end;
+%%% 	     {badrpc, Reason} ->
+%%% 		 exit(Reason)
+%%% 	 end.
+%%%
+%%% Example : Restore the corresponding Mnesia table Tab
+%%%
+%%% 	  case rpc:call(Node, mnesia_registry, start_restore, [Tab, self()]) of
+%%% 	     {size, Pid, N, LargestKey, LargestVal} ->
+%%% 		 Pid ! {send_records, self()},
+%%%              Fun = fun() ->
+%%%                        receive
+%%%                            {restore, KeySize, ValSize, ValType, Key, Val} ->
+%%%                                {Key, Val};
+%%% 		               {'EXIT', Pid, Reason} ->
+%%% 			           exit(Reason)
+%%%                        end
+%%% 		       end,
+%%%              lists:map(Fun, lists:seq(1, N));
+%%% 	     {badrpc, Reason} ->
+%%% 		 exit(Reason)
+%%% 	 end.
+%%%
+%%%----------------------------------------------------------------------
+
+%% External exports
+-export([start_dump/2, start_restore/2]).
+-export([create_table/1, create_table/2]).
+
+%% Internal exports
+-export([init/4]).
+
+-record(state, {table, ops = [], link_to}).
+
+-record(registry_entry, {key, key_size, val_type, val_size, val}).
+
+-record(size, {pid = self(), n_values = 0, largest_key = 0, largest_val = 0}).
+
+%%%----------------------------------------------------------------------
+%%% Client
+%%%----------------------------------------------------------------------
+
+start(Type, Tab, LinkTo) ->
+    Starter = self(),
+    Args = [Type, Starter, LinkTo, Tab],
+    Pid = spawn_link(?MODULE, init, Args),
+    %% The receiver process may unlink the current process
+    receive
+	{ok, Res} ->
+	    Res;
+	{'EXIT', Pid, Reason} when LinkTo == Starter ->
+	    exit(Reason)
+    end.
+
+%% Starts a receiver process and optionally creates a Mnesia table
+%% with suitable default values. Returns the Pid of the receiver process
+%%
+%% The receiver process accumulates Mnesia operations and performs
+%% all operations or none at commit. The understood messages are:
+%%
+%%    {write, Key, KeySize, ValType, ValSize, Val} ->
+%%        accumulates mnesia:write({Tab, Key, KeySize, ValType, ValSize, Val})
+%%                                                    (no reply)
+%%    {delete, Key}     ->
+%%        accumulates mnesia:delete({Tab, Key})       (no reply)
+%%    {commit, ReplyTo} ->
+%%        commits all accumulated operations
+%%        and stops the process                       (replies {ok, Pid})
+%%    abort             ->
+%%        stops the process                           (no reply)
+%%
+%% The receiver process is linked to the process with the process identifier
+%% LinkTo. If some error occurs the receiver process will invoke exit(Reason)
+%% and it is up to he LinkTo process to act properly when it receives an exit
+%% signal.
+
+start_dump(Tab, LinkTo) ->
+    start(dump, Tab, LinkTo).
+
+%% Starts a sender process which sends restore messages back to the
+%% LinkTo process. But first are some statistics about the table
+%% determined and returned as a 5-tuple:
+%%
+%%    {size, SenderPid, N, LargestKeySize, LargestValSize}
+%%
+%% where N is the number of records in the table. Then the sender process
+%% waits for a 2-tuple message:
+%%
+%%    {send_records, ReplyTo}
+%%
+%% At last N 6-tuple messages is sent to the ReplyTo process:
+%%
+%%    ReplyTo !  {restore, KeySize, ValSize, ValType, Key, Val}
+%%
+%% If some error occurs the receiver process will invoke exit(Reason)
+%% and it is up to he LinkTo process to act properly when it receives an
+%% exit signal.
+
+start_restore(Tab, LinkTo) ->
+    start(restore, Tab, LinkTo).
+
+
+%% Optionally creates the Mnesia table Tab with suitable default values.
+%% Returns ok or EXIT's
+create_table(Tab) ->
+    Storage = mnesia:table_info(schema, storage_type),
+    create_table(Tab, [{Storage, [node()]}]).
+
+create_table(Tab, TabDef) ->
+    Attrs = record_info(fields, registry_entry),
+    case mnesia:create_table(Tab, [{attributes, Attrs} | TabDef]) of
+	{'atomic', ok} ->
+	    ok;
+	{aborted, {already_exists, Tab}} ->
+	    ok;
+	{aborted, Reason} ->
+	    exit(Reason)
+    end.
+
+%%%----------------------------------------------------------------------
+%%% Server
+%%%----------------------------------------------------------------------
+
+init(Type, Starter, LinkTo, Tab) ->
+    if
+	LinkTo /= Starter ->
+	    link(LinkTo),
+	    unlink(Starter);
+	true ->
+	    ignore
+    end,
+    case Type of
+	dump ->
+	    Starter ! {ok, self()},
+	    dump_loop(#state{table = Tab, link_to = LinkTo});
+	restore ->
+	    restore_table(Tab, Starter, LinkTo)
+    end.
+
+%%%----------------------------------------------------------------------
+%%% Dump loop
+%%%----------------------------------------------------------------------
+
+dump_loop(S) ->
+    Tab = S#state.table,
+    Ops = S#state.ops,
+    receive
+	{write, Key, KeySize, ValType, ValSize, Val} ->
+	    RE = #registry_entry{key = Key,
+				 key_size = KeySize,
+				 val_type = ValType,
+				 val_size = ValSize,
+				 val = Val},
+	    dump_loop(S#state{ops = [{write, RE} | Ops]});
+	{delete, Key} ->
+	    dump_loop(S#state{ops = [{delete, Key} | Ops]});
+	{commit, ReplyTo} ->
+	    create_table(Tab),
+	    RecName = mnesia:table_info(Tab, record_name),
+	    %% The Ops are in reverse order, but there is no need
+	    %% for reversing the list of accumulated operations
+	    case mnesia:transaction(fun handle_ops/3, [Tab, RecName, Ops]) of
+                {'atomic', ok} ->
+                    ReplyTo ! {ok, self()},
+                    stop(S#state.link_to);
+                {aborted, Reason} ->
+                    exit({aborted, Reason})
+            end;
+	abort ->
+	    stop(S#state.link_to);
+        BadMsg ->
+            exit({bad_message, BadMsg})
+    end.
+
+stop(LinkTo) ->
+    unlink(LinkTo),
+    exit(normal).
+
+%% Grab a write lock for the entire table
+%% and iterate over all accumulated operations
+handle_ops(Tab, RecName, Ops) ->
+    mnesia:write_lock_table(Tab),
+    do_handle_ops(Tab, RecName, Ops).
+
+do_handle_ops(Tab, RecName, [{write, RegEntry} | Ops]) ->
+    Record = setelement(1, RegEntry, RecName),
+    mnesia:write(Tab, Record, write),
+    do_handle_ops(Tab, RecName, Ops);
+do_handle_ops(Tab, RecName, [{delete, Key} | Ops]) ->
+    mnesia:delete(Tab, Key, write),
+    do_handle_ops(Tab, RecName, Ops);
+do_handle_ops(_Tab, _RecName, []) ->
+    ok.
+
+%%%----------------------------------------------------------------------
+%%% Restore table
+%%%----------------------------------------------------------------------
+
+restore_table(Tab, Starter, LinkTo) ->
+    Pat = mnesia:table_info(Tab, wild_pattern),
+    Fun = fun() -> mnesia:match_object(Tab, Pat, read) end,
+    case mnesia:transaction(Fun) of
+	{'atomic', AllRecords} ->
+	    Size = calc_size(AllRecords, #size{}),
+	    Starter ! {ok, Size},
+	    receive
+		{send_records, ReplyTo} ->
+		    send_records(AllRecords, ReplyTo),
+		    unlink(LinkTo),
+		    exit(normal);
+		BadMsg ->
+		    exit({bad_message, BadMsg})
+	    end;
+	{aborted, Reason} ->
+            exit(Reason)
+    end.
+
+calc_size([H | T], S) ->
+    KeySize = max(element(#registry_entry.key_size, H), S#size.largest_key),
+    ValSize = max(element(#registry_entry.val_size, H), S#size.largest_val),
+    N = S#size.n_values + 1,
+    calc_size(T, S#size{n_values = N, largest_key = KeySize, largest_val = ValSize});
+calc_size([], Size) ->
+    Size.
+
+max(New, Old) when New > Old -> New;
+max(_New, Old) -> Old.
+
+send_records([H | T], ReplyTo) ->
+    KeySize = element(#registry_entry.key_size, H),
+    ValSize = element(#registry_entry.val_size, H),
+    ValType = element(#registry_entry.val_type, H),
+    Key = element(#registry_entry.key, H),
+    Val = element(#registry_entry.val, H),
+    ReplyTo ! {restore, KeySize, ValSize, ValType, Key, Val},
+    send_records(T, ReplyTo);
+send_records([], _ReplyTo) ->
+    ok.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_schema.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_schema.erl
new file mode 100644
index 0000000000..395532e91b
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_schema.erl
@@ -0,0 +1,2898 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_schema.erl,v 1.2 2010/03/04 13:54:20 maria Exp $
+%%
+%% In this module we provide a number of explicit functions
+%% to maninpulate the schema. All these functions are called
+%% within a special schema transaction.
+%%
+%% We also have an init/1 function defined here, this func is
+%% used by mnesia:start() to initialize the entire schema.
+
+-module(mnesia_schema).
+
+-export([
+         add_snmp/2,
+         add_table_copy/3,
+         add_table_index/2,
+	 arrange_restore/3,
+         attr_tab_to_pos/2,
+         attr_to_pos/2,
+         change_table_copy_type/3,
+         change_table_access_mode/2,
+         change_table_load_order/2,
+	 change_table_frag/2,
+	 clear_table/1,
+         create_table/1,
+	 cs2list/1,
+         del_snmp/1,
+         del_table_copy/2,
+         del_table_index/2,
+         delete_cstruct/2,
+         delete_schema/1,
+         delete_schema2/0,
+         delete_table/1,
+         delete_table_property/2,
+         dump_tables/1,
+         ensure_no_schema/1,
+	 get_create_list/1,
+         get_initial_schema/2,
+	 get_table_properties/1,
+         info/0,
+         info/1,
+         init/1,
+         insert_cstruct/3,
+	 is_remote_member/1,
+         list2cs/1,
+         lock_schema/0,
+	 lock_del_table/4, % Spawned
+         merge_schema/0,
+         move_table/3,
+         opt_create_dir/2,
+         prepare_commit/3,
+         purge_dir/2,
+         purge_tmp_files/0,
+         ram_delete_table/2,
+%         ram_delete_table/3,
+	 read_cstructs_from_disc/0,
+         read_nodes/0,
+         remote_read_schema/0,
+	 restore/1,
+         restore/2,
+         restore/3,
+	 schema_coordinator/3,
+	 set_where_to_read/3,
+         transform_table/4,
+         undo_prepare_commit/2,
+         unlock_schema/0,
+         version/0,
+         write_table_property/2
+        ]).
+
+%% Exports for mnesia_frag
+-export([
+	 get_tid_ts_and_lock/2,
+	 make_create_table/1,
+         ensure_active/1,
+	 pick/4,
+	 verify/3,
+	 incr_version/1,
+	 check_keys/3,
+	 check_duplicates/2,
+	 make_delete_table/2
+	]).
+
+%% Needed outside to be able to use/set table_properties
+%% from user (not supported)
+-export([schema_transaction/1,
+	 insert_schema_ops/2,
+	 do_create_table/1,
+	 do_delete_table/1,
+	 do_delete_table_property/2,
+	 do_write_table_property/2]).
+
+-include("mnesia.hrl").
+-include_lib("kernel/include/file.hrl").
+
+-import(mnesia_lib, [set/2, del/2, verbose/2, dbg_out/2]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Here comes the init function which also resides in
+%% this module, it is called upon by the trans server
+%% at startup of the system
+%%
+%% We have a meta table which looks like
+%% {table, schema,
+%%    {type, set},
+%%    {disc_copies, all},
+%%    {arity, 2}
+%%    {attributes, [key, val]}
+%%
+%% This means that we have a series of {schema, Name, Cs} tuples
+%% in a table called schema !!
+
+init(IgnoreFallback) ->
+    Res = read_schema(true, false, IgnoreFallback),
+    {ok, Source, _CreateList} = exit_on_error(Res),
+    verbose("Schema initiated from: ~p~n", [Source]),
+    set({schema, tables}, []),
+    set({schema, local_tables}, []),
+    Tabs = set_schema(?ets_first(schema)),
+    lists:foreach(fun(Tab) -> clear_whereabouts(Tab) end, Tabs),
+    set({schema, where_to_read}, node()),
+    set({schema, load_node}, node()),
+    set({schema, load_reason}, initial),
+    mnesia_controller:add_active_replica(schema, node()).
+
+exit_on_error({error, Reason}) ->
+    exit(Reason);
+exit_on_error(GoodRes) ->
+    GoodRes.
+
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason);
+	Value -> Value
+    end.
+
+%% This function traverses all cstructs in the schema and
+%% sets all values in mnesia_gvar accordingly for each table/cstruct
+
+set_schema('$end_of_table') ->
+    [];
+set_schema(Tab) ->
+    do_set_schema(Tab),
+    [Tab | set_schema(?ets_next(schema, Tab))].
+
+get_create_list(Tab) ->
+    ?ets_lookup_element(schema, Tab, 3).
+
+do_set_schema(Tab) ->
+    List = get_create_list(Tab),
+    Cs = list2cs(List),
+    do_set_schema(Tab, Cs).
+
+do_set_schema(Tab, Cs) ->
+    Type = Cs#cstruct.type,
+    set({Tab, setorbag}, Type),
+    set({Tab, local_content}, Cs#cstruct.local_content),
+    set({Tab, ram_copies}, Cs#cstruct.ram_copies),
+    set({Tab, disc_copies}, Cs#cstruct.disc_copies),
+    set({Tab, disc_only_copies}, Cs#cstruct.disc_only_copies),
+    set({Tab, load_order}, Cs#cstruct.load_order),
+    set({Tab, access_mode}, Cs#cstruct.access_mode),
+    set({Tab, snmp}, Cs#cstruct.snmp),
+    set({Tab, user_properties}, Cs#cstruct.user_properties),
+    [set({Tab, user_property, element(1, P)}, P) || P <- Cs#cstruct.user_properties],
+    set({Tab, frag_properties}, Cs#cstruct.frag_properties),
+    mnesia_frag:set_frag_hash(Tab, Cs#cstruct.frag_properties),
+    set({Tab, attributes}, Cs#cstruct.attributes),
+    Arity = length(Cs#cstruct.attributes) + 1,
+    set({Tab, arity}, Arity),
+    RecName =  Cs#cstruct.record_name,
+    set({Tab, record_name}, RecName),
+    set({Tab, record_validation}, {RecName, Arity, Type}),
+    set({Tab, wild_pattern}, wild(RecName, Arity)),
+    set({Tab, index}, Cs#cstruct.index),
+    %% create actual index tabs later
+    set({Tab, cookie}, Cs#cstruct.cookie),
+    set({Tab, version}, Cs#cstruct.version),
+    set({Tab, cstruct}, Cs),
+    Storage = mnesia_lib:schema_cs_to_storage_type(node(), Cs),
+    set({Tab, storage_type}, Storage),
+    mnesia_lib:add({schema, tables}, Tab),
+    Ns = mnesia_lib:cs_to_nodes(Cs),
+    case lists:member(node(), Ns) of
+        true ->
+            mnesia_lib:add({schema, local_tables}, Tab);
+        false when Tab == schema ->
+            mnesia_lib:add({schema, local_tables}, Tab);
+        false ->
+            ignore
+    end.
+
+wild(RecName, Arity) ->
+    Wp0 = list_to_tuple(lists:duplicate(Arity, '_')),
+    setelement(1, Wp0, RecName).
+
+%% Temporarily read the local schema and return a list
+%% of all nodes mentioned in the schema.DAT file
+read_nodes() ->
+    %% Ensure that we access the intended Mnesia
+    %% directory. This function may not be called
+    %% during startup since it will cause the
+    %% application_controller to get into deadlock
+    case mnesia_lib:ensure_loaded(?APPLICATION) of
+	ok ->
+	    case read_schema(false, false) of
+		{ok, _Source, CreateList} ->
+		    Cs = list2cs(CreateList),
+		    {ok, Cs#cstruct.disc_copies ++ Cs#cstruct.ram_copies};
+		{error, Reason} ->
+		    {error, Reason}
+	    end;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+%% Returns Version from the tuple {Version,MasterNodes}
+version() ->
+    case read_schema(false, false) of
+        {ok, Source, CreateList} when Source /= default ->
+	    Cs = list2cs(CreateList),
+            {Version, _Details} = Cs#cstruct.version,
+            Version;
+        _ ->
+            case dir_exists(mnesia_lib:dir()) of
+                true -> {1,0};
+                false -> {0,0}
+            end
+    end.
+
+%% Calculate next table version from old cstruct
+incr_version(Cs) ->
+    {{Major, Minor}, _} = Cs#cstruct.version,
+    Nodes = mnesia_lib:intersect(val({schema, disc_copies}),
+                                 mnesia_lib:cs_to_nodes(Cs)),
+    V =
+        case Nodes -- val({Cs#cstruct.name, active_replicas}) of
+            [] -> {Major + 1, 0};    % All replicas are active
+            _ -> {Major, Minor + 1}  % Some replicas are inactive
+        end,
+    Cs#cstruct{version = {V, {node(), now()}}}.
+
+%% Returns table name
+insert_cstruct(Tid, Cs, KeepWhereabouts) ->
+    Tab = Cs#cstruct.name,
+    TabDef = cs2list(Cs),
+    Val = {schema, Tab, TabDef},
+    mnesia_checkpoint:tm_retain(Tid, schema, Tab, write),
+    mnesia_subscr:report_table_event(schema, Tid, Val, write),
+    Active = val({Tab, active_replicas}),
+
+    case KeepWhereabouts of
+        true ->
+            ignore;
+        false when Active == [] ->
+            clear_whereabouts(Tab);
+        false ->
+            %% Someone else has initiated table
+            ignore
+    end,
+    set({Tab, cstruct}, Cs),
+    ?ets_insert(schema, Val),
+    do_set_schema(Tab, Cs),
+    Val.
+
+clear_whereabouts(Tab) ->
+    set({Tab, checkpoints}, []),
+    set({Tab, subscribers}, []),
+    set({Tab, where_to_read}, nowhere),
+    set({Tab, active_replicas}, []),
+    set({Tab, commit_work}, []),
+    set({Tab, where_to_write}, []),
+    set({Tab, where_to_commit}, []),
+    set({Tab, load_by_force}, false),
+    set({Tab, load_node}, unknown),
+    set({Tab, load_reason}, unknown).
+
+%% Returns table name
+delete_cstruct(Tid, Cs) ->
+    Tab = Cs#cstruct.name,
+    TabDef = cs2list(Cs),
+    Val = {schema, Tab, TabDef},
+    mnesia_checkpoint:tm_retain(Tid, schema, Tab, delete),
+    mnesia_subscr:report_table_event(schema, Tid, Val, delete),
+    ?ets_match_delete(mnesia_gvar, {{Tab, '_'}, '_'}),
+    ?ets_match_delete(mnesia_gvar, {{Tab, '_', '_'}, '_'}),
+    del({schema, local_tables}, Tab),
+    del({schema, tables}, Tab),
+    ?ets_delete(schema, Tab),
+    Val.
+
+%% Delete the Mnesia directory on all given nodes
+%% Requires that Mnesia is not running anywhere
+%% Returns ok | {error,Reason}
+delete_schema(Ns) when list(Ns), Ns /= [] ->
+    RunningNs = mnesia_lib:running_nodes(Ns),
+    Reason = "Cannot delete schema on all nodes",
+    if
+        RunningNs == [] ->
+	    case rpc:multicall(Ns, ?MODULE, delete_schema2, []) of
+		{Replies, []} ->
+		    case [R || R <- Replies, R /= ok]  of
+			[] ->
+			    ok;
+			BadReplies ->
+			    verbose("~s: ~p~n", [Reason, BadReplies]),
+			    {error, {"All nodes not running", BadReplies}}
+		    end;
+		{_Replies, BadNs} ->
+                    verbose("~s: ~p~n", [Reason, BadNs]),
+                    {error, {"All nodes not running", BadNs}}
+            end;
+        true ->
+            verbose("~s: ~p~n", [Reason, RunningNs]),
+            {error, {"Mnesia is not stopped everywhere", RunningNs}}
+    end;
+delete_schema(Ns) ->
+    {error, {badarg, Ns}}.
+
+delete_schema2() ->
+    %% Ensure that we access the intended Mnesia
+    %% directory. This function may not be called
+    %% during startup since it will cause the
+    %% application_controller to get into deadlock
+    case mnesia_lib:ensure_loaded(?APPLICATION) of
+	ok ->
+	    case mnesia_lib:is_running() of
+		no ->
+		    Dir = mnesia_lib:dir(),
+		    purge_dir(Dir, []),
+		    ok;
+		_ ->
+		    {error, {"Mnesia still running", node()}}
+	    end;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+ensure_no_schema([H|T]) when atom(H) ->
+    case rpc:call(H, ?MODULE, remote_read_schema, []) of
+        {badrpc, Reason} ->
+            {H, {"All nodes not running", H, Reason}};
+        {ok,Source, _} when Source /= default ->
+            {H, {already_exists, H}};
+        _ ->
+            ensure_no_schema(T)
+    end;
+ensure_no_schema([H|_]) ->
+    {error,{badarg, H}};
+ensure_no_schema([]) ->
+    ok.
+
+remote_read_schema() ->
+    %% Ensure that we access the intended Mnesia
+    %% directory. This function may not be called
+    %% during startup since it will cause the
+    %% application_controller to get into deadlock
+    case mnesia_lib:ensure_loaded(?APPLICATION) of
+	ok ->
+	    case mnesia_monitor:get_env(schema_location) of
+		opt_disc ->
+		    read_schema(false, true);
+		_ ->
+		    read_schema(false, false)
+	    end;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+dir_exists(Dir) ->
+    dir_exists(Dir, mnesia_monitor:use_dir()).
+dir_exists(Dir, true) ->
+    case file:read_file_info(Dir) of
+        {ok, _} -> true;
+        _ -> false
+    end;
+dir_exists(_Dir, false) ->
+    false.
+
+opt_create_dir(UseDir, Dir) when UseDir == true->
+    case dir_exists(Dir, UseDir) of
+        true ->
+            check_can_write(Dir);
+        false ->
+            case file:make_dir(Dir) of
+                ok ->
+                    verbose("Create Directory ~p~n", [Dir]),
+                    ok;
+                {error, Reason} ->
+                    verbose("Cannot create mnesia dir ~p~n", [Reason]),
+                    {error, {"Cannot create Mnesia dir", Dir, Reason}}
+            end
+    end;
+opt_create_dir(false, _) ->
+    {error, {has_no_disc, node()}}.
+
+check_can_write(Dir) ->
+    case file:read_file_info(Dir) of
+        {ok, FI} when FI#file_info.type == directory,
+		      FI#file_info.access == read_write ->
+            ok;
+        {ok, _} ->
+            {error, "Not allowed to write in Mnesia dir", Dir};
+        _ ->
+            {error, "Non existent Mnesia dir", Dir}
+    end.
+
+lock_schema() ->
+    mnesia_lib:lock_table(schema).
+
+unlock_schema() ->
+    mnesia_lib:unlock_table(schema).
+
+read_schema(Keep, _UseDirAnyway) ->
+    read_schema(Keep, false, false).
+
+%% The schema may be read for several reasons.
+%% If Mnesia is not already started the read intention
+%% we normally do not want the ets table named schema
+%% be left around.
+%% If Keep == true, the ets table schema is kept
+%% If Keep == false, the ets table schema is removed
+%%
+%% Returns {ok, Source, SchemaCstruct} or {error, Reason}
+%% Source may be: default | ram | disc | fallback
+
+read_schema(Keep, UseDirAnyway, IgnoreFallback) ->
+    lock_schema(),
+    Res =
+        case mnesia:system_info(is_running) of
+            yes ->
+                {ok, ram, get_create_list(schema)};
+            _IsRunning ->
+                    case mnesia_monitor:use_dir() of
+                        true ->
+                            read_disc_schema(Keep, IgnoreFallback);
+                        false when UseDirAnyway == true ->
+                            read_disc_schema(Keep, IgnoreFallback);
+                        false when Keep == true ->
+                            Args = [{keypos, 2}, public, named_table, set],
+                            mnesia_monitor:mktab(schema, Args),
+                            CreateList = get_initial_schema(ram_copies, []),
+                            ?ets_insert(schema,{schema, schema, CreateList}),
+                            {ok, default, CreateList};
+                        false when Keep == false ->
+			    CreateList = get_initial_schema(ram_copies, []),
+                            {ok, default, CreateList}
+                    end
+        end,
+    unlock_schema(),
+    Res.
+
+read_disc_schema(Keep, IgnoreFallback) ->
+    Running = mnesia:system_info(is_running),
+    case mnesia_bup:fallback_exists() of
+        true when IgnoreFallback == false, Running /= yes ->
+             mnesia_bup:fallback_to_schema();
+        _ ->
+            %% If we're running, we read the schema file even
+            %% if fallback exists
+            Dat = mnesia_lib:tab2dat(schema),
+            case mnesia_lib:exists(Dat) of
+                true ->
+                    do_read_disc_schema(Dat, Keep);
+                false ->
+		    Dmp = mnesia_lib:tab2dmp(schema),
+		    case mnesia_lib:exists(Dmp) of
+			true ->
+			    %% May only happen when toggling of
+			    %% schema storage type has been
+			    %% interrupted
+			    do_read_disc_schema(Dmp, Keep);
+			false ->
+			    {error, "No schema file exists"}
+		    end
+            end
+    end.
+
+do_read_disc_schema(Fname, Keep) ->
+    T =
+        case Keep of
+            false ->
+                Args = [{keypos, 2}, public, set],
+                ?ets_new_table(schema, Args);
+            true ->
+                Args = [{keypos, 2}, public, named_table, set],
+                mnesia_monitor:mktab(schema, Args)
+        end,
+    Repair = mnesia_monitor:get_env(auto_repair),
+    Res =  % BUGBUG Fixa till dcl!
+        case mnesia_lib:dets_to_ets(schema, T, Fname, set, Repair, no) of
+            loaded -> {ok, disc, ?ets_lookup_element(T, schema, 3)};
+            Other -> {error, {"Cannot read schema", Fname, Other}}
+        end,
+    case Keep of
+        true -> ignore;
+        false -> ?ets_delete_table(T)
+    end,
+    Res.
+
+get_initial_schema(SchemaStorage, Nodes) ->
+    Cs = #cstruct{name = schema,
+		  record_name = schema,
+		  attributes = [table, cstruct]},
+    Cs2 =
+	case SchemaStorage of
+        ram_copies -> Cs#cstruct{ram_copies = Nodes};
+        disc_copies -> Cs#cstruct{disc_copies = Nodes}
+    end,
+    cs2list(Cs2).
+
+read_cstructs_from_disc() ->
+    %% Assumptions:
+    %% - local schema lock in global
+    %% - use_dir is true
+    %% - Mnesia is not running
+    %% - Ignore fallback
+
+    Fname = mnesia_lib:tab2dat(schema),
+    case mnesia_lib:exists(Fname) of
+	true ->
+	    Args = [{file, Fname},
+		    {keypos, 2},
+		    {repair, mnesia_monitor:get_env(auto_repair)},
+		    {type, set}],
+	    case dets:open_file(make_ref(), Args) of
+		{ok, Tab} ->
+		    Fun = fun({_, _, List}) ->
+				  {continue, list2cs(List)}
+			  end,
+		    Cstructs = dets:traverse(Tab, Fun),
+		    dets:close(Tab),
+		    {ok, Cstructs};
+		{error, Reason} ->
+		    {error, Reason}
+	    end;
+	false ->
+	    {error, "No schema file exists"}
+    end.
+
+%% We run a very special type of transactions when we
+%% we want to manipulate the schema.
+
+get_tid_ts_and_lock(Tab, Intent) ->
+    TidTs = get(mnesia_activity_state),
+    case TidTs of
+	{_Mod, Tid, Ts} when record(Ts, tidstore)->
+	    Store = Ts#tidstore.store,
+	    case Intent of
+		read -> mnesia_locker:rlock_table(Tid, Store, Tab);
+		write -> mnesia_locker:wlock_table(Tid, Store, Tab);
+		none -> ignore
+	    end,
+	    TidTs;
+	_ ->
+	    mnesia:abort(no_transaction)
+    end.
+
+schema_transaction(Fun) ->
+    case get(mnesia_activity_state) of
+	undefined ->
+	    Args = [self(), Fun, whereis(mnesia_controller)],
+	    Pid = spawn_link(?MODULE, schema_coordinator, Args),
+	    receive
+		{transaction_done, Res, Pid} -> Res;
+		{'EXIT', Pid, R} -> {aborted, {transaction_crashed, R}}
+	    end;
+	_ ->
+            {aborted, nested_transaction}
+    end.
+
+%% This process may dump the transaction log, and should
+%% therefore not be run in an application process
+%%
+schema_coordinator(Client, _Fun, undefined) ->
+    Res = {aborted, {node_not_running, node()}},
+    Client ! {transaction_done, Res, self()},
+    unlink(Client);
+
+schema_coordinator(Client, Fun, Controller) when pid(Controller) ->
+    %% Do not trap exit in order to automatically die
+    %% when the controller dies
+
+    link(Controller),
+    unlink(Client),
+
+    %% Fulfull the transaction even if the client dies
+    Res = mnesia:transaction(Fun),
+    Client ! {transaction_done, Res, self()},
+    unlink(Controller),         % Avoids spurious exit message
+    unlink(whereis(mnesia_tm)), % Avoids spurious exit message
+    exit(normal).
+
+%% The make* rotines return a list of ops, this function
+%% inserts em all in the Store and maintains the local order
+%% of ops.
+
+insert_schema_ops({_Mod, _Tid, Ts}, SchemaIOps) ->
+    do_insert_schema_ops(Ts#tidstore.store, SchemaIOps).
+
+do_insert_schema_ops(Store, [Head | Tail]) ->
+    ?ets_insert(Store, Head),
+    do_insert_schema_ops(Store, Tail);
+do_insert_schema_ops(_Store, []) ->
+    ok.
+
+cs2list(Cs) when record(Cs, cstruct) ->
+    Tags = record_info(fields, cstruct),
+    rec2list(Tags, 2, Cs);
+cs2list(CreateList) when list(CreateList) ->
+    CreateList.
+
+rec2list([Tag | Tags], Pos, Rec) ->
+    Val = element(Pos, Rec),
+    [{Tag, Val} | rec2list(Tags, Pos + 1, Rec)];
+rec2list([], _Pos, _Rec) ->
+    [].
+
+list2cs(List) when list(List) ->
+    Name = pick(unknown, name, List, must),
+    Type = pick(Name, type, List, set),
+    Rc0 = pick(Name, ram_copies, List, []),
+    Dc = pick(Name, disc_copies, List, []),
+    Doc = pick(Name, disc_only_copies, List, []),
+    Rc = case {Rc0, Dc, Doc} of
+             {[], [], []} -> [node()];
+             _ -> Rc0
+         end,
+    LC = pick(Name, local_content, List, false),
+    RecName = pick(Name, record_name, List, Name),
+    Attrs = pick(Name, attributes, List, [key, val]),
+    Snmp = pick(Name, snmp, List, []),
+    LoadOrder = pick(Name, load_order, List, 0),
+    AccessMode = pick(Name, access_mode, List, read_write),
+    UserProps = pick(Name, user_properties, List, []),
+    verify({alt, [nil, list]}, mnesia_lib:etype(UserProps),
+	   {bad_type, Name, {user_properties, UserProps}}),
+    Cookie = pick(Name, cookie, List, ?unique_cookie),
+    Version = pick(Name, version, List, {{2, 0}, []}),
+    Ix = pick(Name, index, List, []),
+    verify({alt, [nil, list]}, mnesia_lib:etype(Ix),
+	   {bad_type, Name, {index, [Ix]}}),
+    Ix2 = [attr_to_pos(I, Attrs) || I <- Ix],
+
+    Frag = pick(Name, frag_properties, List, []),
+    verify({alt, [nil, list]}, mnesia_lib:etype(Frag),
+	   {badarg, Name, {frag_properties, Frag}}),
+
+    Keys = check_keys(Name, List, record_info(fields, cstruct)),
+    check_duplicates(Name, Keys),
+    #cstruct{name = Name,
+             ram_copies = Rc,
+             disc_copies = Dc,
+             disc_only_copies = Doc,
+             type = Type,
+             index = Ix2,
+             snmp = Snmp,
+             load_order = LoadOrder,
+             access_mode = AccessMode,
+             local_content = LC,
+	     record_name = RecName,
+             attributes = Attrs,
+             user_properties = lists:sort(UserProps),
+	     frag_properties = lists:sort(Frag),
+             cookie = Cookie,
+             version = Version};
+list2cs(Other) ->
+    mnesia:abort({badarg, Other}).
+
+pick(Tab, Key, List, Default) ->
+    case lists:keysearch(Key, 1, List) of
+        false  when Default == must ->
+            mnesia:abort({badarg, Tab, "Missing key", Key, List});
+        false ->
+            Default;
+        {value, {Key, Value}} ->
+            Value;
+	{value, BadArg} ->
+	    mnesia:abort({bad_type, Tab, BadArg})
+    end.
+
+%% Convert attribute name to integer if neccessary
+attr_tab_to_pos(_Tab, Pos) when integer(Pos) ->
+    Pos;
+attr_tab_to_pos(Tab, Attr) ->
+    attr_to_pos(Attr, val({Tab, attributes})).
+
+%% Convert attribute name to integer if neccessary
+attr_to_pos(Pos, _Attrs) when integer(Pos) ->
+    Pos;
+attr_to_pos(Attr, Attrs) when atom(Attr) ->
+    attr_to_pos(Attr, Attrs, 2);
+attr_to_pos(Attr, _) ->
+    mnesia:abort({bad_type, Attr}).
+
+attr_to_pos(Attr, [Attr | _Attrs], Pos) ->
+    Pos;
+attr_to_pos(Attr, [_ | Attrs], Pos) ->
+    attr_to_pos(Attr, Attrs, Pos + 1);
+attr_to_pos(Attr, _, _) ->
+    mnesia:abort({bad_type, Attr}).
+
+check_keys(Tab, [{Key, _Val} | Tail], Items) ->
+    case lists:member(Key, Items) of
+        true ->  [Key | check_keys(Tab, Tail, Items)];
+        false -> mnesia:abort({badarg, Tab, Key})
+    end;
+check_keys(_, [], _) ->
+    [];
+check_keys(Tab, Arg, _) ->
+    mnesia:abort({badarg, Tab, Arg}).
+
+check_duplicates(Tab, Keys) ->
+    case has_duplicates(Keys) of
+        false -> ok;
+        true -> mnesia:abort({badarg, Tab, "Duplicate keys", Keys})
+    end.
+
+has_duplicates([H | T]) ->
+    case lists:member(H, T) of
+        true -> true;
+        false -> has_duplicates(T)
+    end;
+has_duplicates([]) ->
+    false.
+
+%% This is the only place where we check the validity of data
+verify_cstruct(Cs) when record(Cs, cstruct) ->
+    verify_nodes(Cs),
+
+    Tab = Cs#cstruct.name,
+    verify(atom, mnesia_lib:etype(Tab), {bad_type, Tab}),
+    Type = Cs#cstruct.type,
+    verify(true, lists:member(Type, [set, bag, ordered_set]),
+	   {bad_type, Tab, {type, Type}}),
+
+    %% Currently ordered_set is not supported for disk_only_copies.
+    if
+	Type == ordered_set, Cs#cstruct.disc_only_copies /= [] ->
+	    mnesia:abort({bad_type, Tab, {not_supported, Type, disc_only_copies}});
+	true ->
+	    ok
+    end,
+
+    RecName = Cs#cstruct.record_name,
+    verify(atom, mnesia_lib:etype(RecName),
+	   {bad_type, Tab, {record_name, RecName}}),
+
+    Attrs = Cs#cstruct.attributes,
+    verify(list, mnesia_lib:etype(Attrs),
+	   {bad_type, Tab, {attributes, Attrs}}),
+
+    Arity = length(Attrs) + 1,
+    verify(true, Arity > 2, {bad_type, Tab, {attributes, Attrs}}),
+
+    lists:foldl(fun(Attr,_Other) when Attr == snmp ->
+                        mnesia:abort({bad_type, Tab, {attributes, [Attr]}});
+                   (Attr,Other) ->
+                        verify(atom, mnesia_lib:etype(Attr),
+                               {bad_type, Tab, {attributes, [Attr]}}),
+                        verify(false, lists:member(Attr, Other),
+                               {combine_error, Tab, {attributes, [Attr | Other]}}),
+                        [Attr | Other]
+                end,
+                [],
+                Attrs),
+
+    Index = Cs#cstruct.index,
+    verify({alt, [nil, list]}, mnesia_lib:etype(Index),
+	   {bad_type, Tab, {index, Index}}),
+
+    IxFun =
+        fun(Pos) ->
+                verify(true, fun() ->
+                                     if
+					 integer(Pos),
+                                         Pos > 2,
+                                         Pos =< Arity ->
+                                             true;
+                                         true -> false
+                                     end
+                             end,
+                       {bad_type, Tab, {index, [Pos]}})
+        end,
+    lists:foreach(IxFun, Index),
+
+    LC = Cs#cstruct.local_content,
+    verify({alt, [true, false]}, LC,
+	   {bad_type, Tab, {local_content, LC}}),
+    Access = Cs#cstruct.access_mode,
+    verify({alt, [read_write, read_only]}, Access,
+	   {bad_type, Tab, {access_mode, Access}}),
+
+    Snmp = Cs#cstruct.snmp,
+    verify(true, mnesia_snmp_hook:check_ustruct(Snmp),
+	   {badarg, Tab, {snmp, Snmp}}),
+
+    CheckProp = fun(Prop) when tuple(Prop), size(Prop) >= 1 -> ok;
+		   (Prop) -> mnesia:abort({bad_type, Tab, {user_properties, [Prop]}})
+		end,
+    lists:foreach(CheckProp, Cs#cstruct.user_properties),
+
+    case Cs#cstruct.cookie of
+	{{MegaSecs, Secs, MicroSecs}, _Node}
+	when integer(MegaSecs), integer(Secs),
+	     integer(MicroSecs), atom(node) ->
+            ok;
+        Cookie ->
+            mnesia:abort({bad_type, Tab, {cookie, Cookie}})
+    end,
+    case Cs#cstruct.version of
+        {{Major, Minor}, _Detail}
+                when integer(Major), integer(Minor) ->
+            ok;
+        Version ->
+            mnesia:abort({bad_type, Tab, {version, Version}})
+    end.
+
+verify_nodes(Cs) ->
+    Tab = Cs#cstruct.name,
+    Ram = Cs#cstruct.ram_copies,
+    Disc = Cs#cstruct.disc_copies,
+    DiscOnly = Cs#cstruct.disc_only_copies,
+    LoadOrder = Cs#cstruct.load_order,
+
+    verify({alt, [nil, list]}, mnesia_lib:etype(Ram),
+	   {bad_type, Tab, {ram_copies, Ram}}),
+    verify({alt, [nil, list]}, mnesia_lib:etype(Disc),
+	   {bad_type, Tab, {disc_copies, Disc}}),
+    case Tab of
+	schema ->
+	    verify([], DiscOnly, {bad_type, Tab, {disc_only_copies, DiscOnly}});
+	_ ->
+	    verify({alt, [nil, list]},
+		   mnesia_lib:etype(DiscOnly),
+		   {bad_type, Tab, {disc_only_copies, DiscOnly}})
+    end,
+    verify(integer, mnesia_lib:etype(LoadOrder),
+	   {bad_type, Tab, {load_order, LoadOrder}}),
+
+    Nodes = Ram ++ Disc ++ DiscOnly,
+    verify(list, mnesia_lib:etype(Nodes),
+	   {combine_error, Tab,
+	    [{ram_copies, []}, {disc_copies, []}, {disc_only_copies, []}]}),
+    verify(false, has_duplicates(Nodes), {combine_error, Tab, Nodes}),
+    AtomCheck = fun(N) -> verify(atom, mnesia_lib:etype(N), {bad_type, Tab, N}) end,
+    lists:foreach(AtomCheck, Nodes).
+
+verify(Expected, Fun, Error) when function(Fun) ->
+    do_verify(Expected, catch Fun(), Error);
+verify(Expected, Actual, Error) ->
+    do_verify(Expected, Actual, Error).
+
+do_verify({alt, Values}, Value, Error) ->
+    case lists:member(Value, Values) of
+        true -> ok;
+        false -> mnesia:abort(Error)
+    end;
+do_verify(Value, Value, _) ->
+    ok;
+do_verify(_Value, _, Error) ->
+     mnesia:abort(Error).
+
+ensure_writable(Tab) ->
+    case val({Tab, where_to_write}) of
+        [] -> mnesia:abort({read_only, Tab});
+        _ -> ok
+    end.
+
+%% Ensure that all replicas on disk full nodes are active
+ensure_active(Cs) ->
+    ensure_active(Cs, active_replicas).
+
+ensure_active(Cs, What) ->
+    Tab = Cs#cstruct.name,
+    case val({Tab, What}) of
+        [] -> mnesia:abort({no_exists, Tab});
+        _ -> ok
+    end,
+    Nodes = mnesia_lib:intersect(val({schema, disc_copies}),
+                                 mnesia_lib:cs_to_nodes(Cs)),
+    W = {Tab, What},
+    case Nodes -- val(W) of
+        [] ->
+            ok;
+        Ns ->
+            Expl = "All replicas on diskfull nodes are not active yet",
+            case val({Tab, local_content}) of
+                true ->
+		    case rpc:multicall(Ns, ?MODULE, is_remote_member, [W]) of
+			{Replies, []} ->
+			    check_active(Replies, Expl, Tab);
+			{_Replies, BadNs} ->
+			    mnesia:abort({not_active, Expl, Tab, BadNs})
+                    end;
+                false ->
+                    mnesia:abort({not_active, Expl, Tab, Ns})
+            end
+    end.
+
+ensure_not_active(schema, Node) ->
+    case lists:member(Node, val({schema, active_replicas})) of
+	false ->
+	    ok;
+	true ->
+	    Expl = "Mnesia is running",
+	    mnesia:abort({active, Expl, Node})
+    end.
+
+is_remote_member(Key) ->
+    IsActive = lists:member(node(), val(Key)),
+    {IsActive, node()}.
+
+check_active([{true, _Node} | Replies], Expl, Tab) ->
+    check_active(Replies, Expl, Tab);
+check_active([{false, Node} | _Replies], Expl, Tab) ->
+    mnesia:abort({not_active, Expl, Tab, [Node]});
+check_active([{badrpc, Reason} | _Replies], Expl, Tab) ->
+    mnesia:abort({not_active, Expl, Tab, Reason});
+check_active([], _Expl, _Tab) ->
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Here's the real interface function to create a table
+
+create_table(TabDef) ->
+    schema_transaction(fun() -> do_multi_create_table(TabDef) end).
+
+%% And the corresponding do routines ....
+
+do_multi_create_table(TabDef) ->
+    get_tid_ts_and_lock(schema, write),
+    ensure_writable(schema),
+    Cs = list2cs(TabDef),
+    case Cs#cstruct.frag_properties of
+	[] ->
+	    do_create_table(Cs);
+	_Props ->
+	    CsList = mnesia_frag:expand_cstruct(Cs),
+	    lists:foreach(fun do_create_table/1, CsList)
+    end,
+    ok.
+
+do_create_table(Cs) ->
+    {_Mod, _Tid, Ts} =  get_tid_ts_and_lock(schema, none),
+    Store = Ts#tidstore.store,
+    do_insert_schema_ops(Store, make_create_table(Cs)).
+
+make_create_table(Cs) ->
+    Tab = Cs#cstruct.name,
+    verify('EXIT', element(1, ?catch_val({Tab, cstruct})),
+	   {already_exists, Tab}),
+    unsafe_make_create_table(Cs).
+
+% unsafe_do_create_table(Cs) ->
+%     {_Mod, Tid, Ts} =  get_tid_ts_and_lock(schema, none),
+%     Store = Ts#tidstore.store,
+%     do_insert_schema_ops(Store, unsafe_make_create_table(Cs)).
+
+unsafe_make_create_table(Cs) ->
+    {_Mod, Tid, Ts} =  get_tid_ts_and_lock(schema, none),
+    verify_cstruct(Cs),
+    Tab = Cs#cstruct.name,
+
+    %% Check that we have all disc replica nodes running
+    DiscNodes = Cs#cstruct.disc_copies ++ Cs#cstruct.disc_only_copies,
+    RunningNodes = val({current, db_nodes}),
+    CheckDisc = fun(N) ->
+			verify(true, lists:member(N, RunningNodes),
+			       {not_active, Tab, N})
+		end,
+    lists:foreach(CheckDisc, DiscNodes),
+
+    Nodes = mnesia_lib:intersect(mnesia_lib:cs_to_nodes(Cs), RunningNodes),
+    Store = Ts#tidstore.store,
+    mnesia_locker:wlock_no_exist(Tid, Store, Tab, Nodes),
+    [{op, create_table, cs2list(Cs)}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Delete a table entirely on all nodes.
+
+delete_table(Tab) ->
+    schema_transaction(fun() -> do_delete_table(Tab) end).
+
+do_delete_table(schema) ->
+    mnesia:abort({bad_type, schema});
+do_delete_table(Tab) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    ensure_writable(schema),
+    insert_schema_ops(TidTs, make_delete_table(Tab, whole_table)).
+
+make_delete_table(Tab, Mode) ->
+    case Mode of
+	whole_table ->
+	    case val({Tab, frag_properties}) of
+		[] ->
+		    [make_delete_table2(Tab)];
+		_Props ->
+		    %% Check if it is a base table
+		    mnesia_frag:lookup_frag_hash(Tab),
+
+		    %% Check for foreigners
+		    F = mnesia_frag:lookup_foreigners(Tab),
+		    verify([], F, {combine_error, Tab, "Too many foreigners", F}),
+		    [make_delete_table2(T) || T <- mnesia_frag:frag_names(Tab)]
+	    end;
+	single_frag ->
+	    [make_delete_table2(Tab)]
+    end.
+
+make_delete_table2(Tab) ->
+    get_tid_ts_and_lock(Tab, write),
+    Cs = val({Tab, cstruct}),
+    ensure_active(Cs),
+    ensure_writable(Tab),
+    {op, delete_table, cs2list(Cs)}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Change fragmentation of a table
+
+change_table_frag(Tab, Change) ->
+    schema_transaction(fun() -> do_change_table_frag(Tab, Change) end).
+
+do_change_table_frag(Tab, Change) when atom(Tab), Tab /= schema ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    Ops = mnesia_frag:change_table_frag(Tab, Change),
+    [insert_schema_ops(TidTs, Op) || Op <- Ops],
+    ok;
+do_change_table_frag(Tab, _Change) ->
+    mnesia:abort({bad_type, Tab}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Clear a table
+
+clear_table(Tab) ->
+    schema_transaction(fun() -> do_clear_table(Tab) end).
+
+do_clear_table(schema) ->
+    mnesia:abort({bad_type, schema});
+do_clear_table(Tab) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    get_tid_ts_and_lock(Tab, write),
+    insert_schema_ops(TidTs, make_clear_table(Tab)).
+
+make_clear_table(Tab) ->
+    ensure_writable(schema),
+    Cs = val({Tab, cstruct}),
+    ensure_active(Cs),
+    ensure_writable(Tab),
+    [{op, clear_table, cs2list(Cs)}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+add_table_copy(Tab, Node, Storage) ->
+    schema_transaction(fun() -> do_add_table_copy(Tab, Node, Storage) end).
+
+do_add_table_copy(Tab, Node, Storage) when atom(Tab), atom(Node) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    insert_schema_ops(TidTs, make_add_table_copy(Tab, Node, Storage));
+do_add_table_copy(Tab,Node,_) ->
+    mnesia:abort({badarg, Tab, Node}).
+
+make_add_table_copy(Tab, Node, Storage) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    Ns = mnesia_lib:cs_to_nodes(Cs),
+    verify(false, lists:member(Node, Ns), {already_exists, Tab, Node}),
+    Cs2 = new_cs(Cs, Node, Storage, add),
+    verify_cstruct(Cs2),
+
+    %% Check storage and if node is running
+    IsRunning = lists:member(Node, val({current, db_nodes})),
+    if
+	Storage == unknown ->
+	    mnesia:abort({badarg, Tab, Storage});
+	Tab == schema ->
+	    if
+		Storage /= ram_copies ->
+		    mnesia:abort({badarg, Tab, Storage});
+		IsRunning == true ->
+		    mnesia:abort({already_exists, Tab, Node});
+		true ->
+		    ignore
+	    end;
+	Storage == ram_copies ->
+	    ignore;
+	IsRunning == true ->
+	    ignore;
+	IsRunning == false ->
+	    mnesia:abort({not_active, schema, Node})
+    end,
+    [{op, add_table_copy, Storage, Node, cs2list(Cs2)}].
+
+del_table_copy(Tab, Node) ->
+    schema_transaction(fun() -> do_del_table_copy(Tab, Node) end).
+
+do_del_table_copy(Tab, Node) when atom(Node)  ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+%%    get_tid_ts_and_lock(Tab, write),
+    insert_schema_ops(TidTs, make_del_table_copy(Tab, Node));
+do_del_table_copy(Tab, Node) ->
+    mnesia:abort({badarg, Tab, Node}).
+
+make_del_table_copy(Tab, Node) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    Storage = mnesia_lib:schema_cs_to_storage_type(Node, Cs),
+    Cs2 = new_cs(Cs, Node, Storage, del),
+    case mnesia_lib:cs_to_nodes(Cs2) of
+        [] when Tab == schema ->
+            mnesia:abort({combine_error, Tab, "Last replica"});
+        [] ->
+	    ensure_active(Cs),
+            dbg_out("Last replica deleted in table ~p~n",  [Tab]),
+            make_delete_table(Tab,  whole_table);
+        _ when Tab == schema ->
+	    ensure_active(Cs2),
+	    ensure_not_active(Tab, Node),
+            verify_cstruct(Cs2),
+	    Ops = remove_node_from_tabs(val({schema, tables}), Node),
+	    [{op, del_table_copy, ram_copies, Node, cs2list(Cs2)} | Ops];
+        _ ->
+	    ensure_active(Cs),
+            verify_cstruct(Cs2),
+            [{op, del_table_copy, Storage, Node, cs2list(Cs2)}]
+    end.
+
+remove_node_from_tabs([], _Node) ->
+    [];
+remove_node_from_tabs([schema|Rest], Node) ->
+    remove_node_from_tabs(Rest, Node);
+remove_node_from_tabs([Tab|Rest], Node) ->
+    {Cs, IsFragModified} =
+	mnesia_frag:remove_node(Node, incr_version(val({Tab, cstruct}))),
+    case mnesia_lib:schema_cs_to_storage_type(Node, Cs)  of
+	unknown ->
+	    case IsFragModified of
+		true ->
+		    [{op, change_table_frag, {del_node, Node}, cs2list(Cs)} |
+		     remove_node_from_tabs(Rest, Node)];
+		false ->
+		    remove_node_from_tabs(Rest, Node)
+	    end;
+	Storage ->
+	    Cs2 = new_cs(Cs, Node, Storage, del),
+	    case mnesia_lib:cs_to_nodes(Cs2) of
+		[] ->
+		    [{op, delete_table, cs2list(Cs)} |
+		     remove_node_from_tabs(Rest, Node)];
+		_Ns ->
+		    verify_cstruct(Cs2),
+		    [{op, del_table_copy, ram_copies, Node, cs2list(Cs2)}|
+		     remove_node_from_tabs(Rest, Node)]
+	    end
+    end.
+
+new_cs(Cs, Node, ram_copies, add) ->
+    Cs#cstruct{ram_copies = opt_add(Node, Cs#cstruct.ram_copies)};
+new_cs(Cs, Node, disc_copies, add) ->
+    Cs#cstruct{disc_copies = opt_add(Node, Cs#cstruct.disc_copies)};
+new_cs(Cs, Node, disc_only_copies, add) ->
+    Cs#cstruct{disc_only_copies = opt_add(Node, Cs#cstruct.disc_only_copies)};
+new_cs(Cs, Node, ram_copies, del) ->
+    Cs#cstruct{ram_copies = lists:delete(Node , Cs#cstruct.ram_copies)};
+new_cs(Cs, Node, disc_copies, del) ->
+    Cs#cstruct{disc_copies = lists:delete(Node , Cs#cstruct.disc_copies)};
+new_cs(Cs, Node, disc_only_copies, del) ->
+    Cs#cstruct{disc_only_copies =
+               lists:delete(Node , Cs#cstruct.disc_only_copies)};
+new_cs(Cs, _Node, Storage, _Op) ->
+    mnesia:abort({badarg, Cs#cstruct.name, Storage}).
+
+
+opt_add(N, L) -> [N | lists:delete(N, L)].
+
+move_table(Tab, FromNode, ToNode) ->
+    schema_transaction(fun() -> do_move_table(Tab, FromNode, ToNode) end).
+
+do_move_table(schema, _FromNode, _ToNode) ->
+    mnesia:abort({bad_type, schema});
+do_move_table(Tab, FromNode, ToNode) when atom(FromNode), atom(ToNode) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    insert_schema_ops(TidTs, make_move_table(Tab, FromNode, ToNode));
+do_move_table(Tab, FromNode, ToNode) ->
+    mnesia:abort({badarg, Tab, FromNode, ToNode}).
+
+make_move_table(Tab, FromNode, ToNode) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    Ns = mnesia_lib:cs_to_nodes(Cs),
+    verify(false, lists:member(ToNode, Ns), {already_exists, Tab, ToNode}),
+    verify(true, lists:member(FromNode, val({Tab, where_to_write})),
+           {not_active, Tab, FromNode}),
+    verify(false, val({Tab,local_content}),
+           {"Cannot move table with local content", Tab}),
+    ensure_active(Cs),
+    Running = val({current, db_nodes}),
+    Storage = mnesia_lib:schema_cs_to_storage_type(FromNode, Cs),
+    verify(true, lists:member(ToNode, Running), {not_active, schema, ToNode}),
+
+    Cs2 = new_cs(Cs, ToNode, Storage, add),
+    Cs3 = new_cs(Cs2, FromNode, Storage, del),
+    verify_cstruct(Cs3),
+    [{op, add_table_copy, Storage, ToNode, cs2list(Cs2)},
+     {op, sync_trans},
+     {op, del_table_copy, Storage, FromNode, cs2list(Cs3)}].
+
+%% end of functions to add and delete nodes to tables
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+
+change_table_copy_type(Tab, Node, ToS) ->
+    schema_transaction(fun() -> do_change_table_copy_type(Tab, Node, ToS) end).
+
+do_change_table_copy_type(Tab, Node, ToS) when atom(Node) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    get_tid_ts_and_lock(Tab, write), % ensure global sync
+    %% get_tid_ts_and_lock(Tab, read),
+    insert_schema_ops(TidTs, make_change_table_copy_type(Tab, Node, ToS));
+do_change_table_copy_type(Tab, Node, _ToS) ->
+    mnesia:abort({badarg, Tab, Node}).
+
+make_change_table_copy_type(Tab, Node, unknown) ->
+    make_del_table_copy(Tab, Node);
+make_change_table_copy_type(Tab, Node, ToS) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    FromS = mnesia_lib:storage_type_at_node(Node, Tab),
+
+    case compare_storage_type(false, FromS, ToS) of
+	{same, _} ->
+	    mnesia:abort({already_exists, Tab, Node, ToS});
+	{diff, _} ->
+	    ignore;
+	incompatible ->
+	    ensure_active(Cs)
+    end,
+
+    Cs2 = new_cs(Cs, Node, FromS, del),
+    Cs3 = new_cs(Cs2, Node, ToS, add),
+    verify_cstruct(Cs3),
+
+    if
+	FromS == unknown ->
+	    make_add_table_copy(Tab, Node, ToS);
+	true ->
+	    ignore
+    end,
+
+    [{op, change_table_copy_type, Node, FromS, ToS, cs2list(Cs3)}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% change index functions ....
+%% Pos is allready added by 1 in both of these functions
+
+add_table_index(Tab, Pos) ->
+    schema_transaction(fun() -> do_add_table_index(Tab, Pos) end).
+
+do_add_table_index(schema, _Attr) ->
+    mnesia:abort({bad_type, schema});
+do_add_table_index(Tab, Attr) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    get_tid_ts_and_lock(Tab, read),
+    Pos = attr_tab_to_pos(Tab, Attr),
+    insert_schema_ops(TidTs, make_add_table_index(Tab, Pos)).
+
+make_add_table_index(Tab, Pos) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    ensure_active(Cs),
+    Ix = Cs#cstruct.index,
+    verify(false, lists:member(Pos, Ix), {already_exists, Tab, Pos}),
+    Ix2 = lists:sort([Pos | Ix]),
+    Cs2 = Cs#cstruct{index = Ix2},
+    verify_cstruct(Cs2),
+    [{op, add_index, Pos, cs2list(Cs2)}].
+
+del_table_index(Tab, Pos) ->
+    schema_transaction(fun() -> do_del_table_index(Tab, Pos) end).
+
+do_del_table_index(schema, _Attr) ->
+    mnesia:abort({bad_type, schema});
+do_del_table_index(Tab, Attr) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    get_tid_ts_and_lock(Tab, read),
+    Pos = attr_tab_to_pos(Tab, Attr),
+    insert_schema_ops(TidTs, make_del_table_index(Tab, Pos)).
+
+make_del_table_index(Tab, Pos) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    ensure_active(Cs),
+    Ix = Cs#cstruct.index,
+    verify(true, lists:member(Pos, Ix), {no_exists, Tab, Pos}),
+    Cs2 = Cs#cstruct{index = lists:delete(Pos, Ix)},
+    verify_cstruct(Cs2),
+    [{op, del_index, Pos, cs2list(Cs2)}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+add_snmp(Tab, Ustruct) ->
+    schema_transaction(fun() -> do_add_snmp(Tab, Ustruct) end).
+
+do_add_snmp(schema, _Ustruct) ->
+    mnesia:abort({bad_type, schema});
+do_add_snmp(Tab, Ustruct) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    get_tid_ts_and_lock(Tab, read),
+    insert_schema_ops(TidTs, make_add_snmp(Tab, Ustruct)).
+
+make_add_snmp(Tab, Ustruct) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    ensure_active(Cs),
+    verify([], Cs#cstruct.snmp, {already_exists, Tab, snmp}),
+    Error = {badarg, Tab, snmp, Ustruct},
+    verify(true, mnesia_snmp_hook:check_ustruct(Ustruct), Error),
+    Cs2 = Cs#cstruct{snmp = Ustruct},
+    verify_cstruct(Cs2),
+    [{op, add_snmp, Ustruct, cs2list(Cs2)}].
+
+del_snmp(Tab) ->
+    schema_transaction(fun() -> do_del_snmp(Tab) end).
+
+do_del_snmp(schema) ->
+    mnesia:abort({bad_type, schema});
+do_del_snmp(Tab) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    get_tid_ts_and_lock(Tab, read),
+    insert_schema_ops(TidTs, make_del_snmp(Tab)).
+
+make_del_snmp(Tab) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    ensure_active(Cs),
+    Cs2 = Cs#cstruct{snmp = []},
+    verify_cstruct(Cs2),
+    [{op, del_snmp, cs2list(Cs2)}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+
+transform_table(Tab, Fun, NewAttrs, NewRecName)
+  when function(Fun), list(NewAttrs), atom(NewRecName) ->
+    schema_transaction(fun() -> do_transform_table(Tab, Fun, NewAttrs, NewRecName) end);
+
+transform_table(Tab, ignore, NewAttrs, NewRecName)
+  when list(NewAttrs), atom(NewRecName) ->
+    schema_transaction(fun() -> do_transform_table(Tab, ignore, NewAttrs, NewRecName) end);
+
+transform_table(Tab, Fun, NewAttrs, NewRecName) ->
+    {aborted,{bad_type, Tab, Fun, NewAttrs, NewRecName}}.
+
+do_transform_table(schema, _Fun, _NewAttrs, _NewRecName) ->
+    mnesia:abort({bad_type, schema});
+do_transform_table(Tab, Fun, NewAttrs, NewRecName) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    get_tid_ts_and_lock(Tab, write),
+    insert_schema_ops(TidTs, make_transform(Tab, Fun, NewAttrs, NewRecName)).
+
+make_transform(Tab, Fun, NewAttrs, NewRecName) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    ensure_active(Cs),
+    ensure_writable(Tab),
+    case mnesia_lib:val({Tab, index}) of
+	[] ->
+	    Cs2 = Cs#cstruct{attributes = NewAttrs, record_name = NewRecName},
+	    verify_cstruct(Cs2),
+	    [{op, transform, Fun, cs2list(Cs2)}];
+	PosList ->
+	    DelIdx = fun(Pos, Ncs) ->
+			     Ix = Ncs#cstruct.index,
+			     Ncs1 = Ncs#cstruct{index = lists:delete(Pos, Ix)},
+			     Op = {op, del_index, Pos, cs2list(Ncs1)},
+			     {Op, Ncs1}
+		     end,
+	    AddIdx = fun(Pos, Ncs) ->
+			     Ix = Ncs#cstruct.index,
+			     Ix2 = lists:sort([Pos | Ix]),
+			     Ncs1 = Ncs#cstruct{index = Ix2},
+			     Op = {op, add_index, Pos, cs2list(Ncs1)},
+			     {Op, Ncs1}
+		     end,
+            {DelOps, Cs1} = lists:mapfoldl(DelIdx, Cs, PosList),
+	    Cs2 = Cs1#cstruct{attributes = NewAttrs, record_name = NewRecName},
+            {AddOps, Cs3} = lists:mapfoldl(AddIdx, Cs2, PosList),
+	    verify_cstruct(Cs3),
+	    lists:flatten([DelOps, {op, transform, Fun, cs2list(Cs2)}, AddOps])
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+
+change_table_access_mode(Tab, Mode) ->
+    schema_transaction(fun() -> do_change_table_access_mode(Tab, Mode) end).
+
+do_change_table_access_mode(Tab, Mode) ->
+    {_Mod, Tid, Ts} = get_tid_ts_and_lock(schema, write),
+    Store = Ts#tidstore.store,
+    mnesia_locker:wlock_no_exist(Tid, Store, schema, val({schema, active_replicas})),
+    mnesia_locker:wlock_no_exist(Tid, Store, Tab, val({Tab, active_replicas})),
+    do_insert_schema_ops(Store, make_change_table_access_mode(Tab, Mode)).
+
+make_change_table_access_mode(Tab, Mode) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    ensure_active(Cs),
+    OldMode = Cs#cstruct.access_mode,
+    verify(false, OldMode ==  Mode, {already_exists, Tab, Mode}),
+    Cs2 = Cs#cstruct{access_mode = Mode},
+    verify_cstruct(Cs2),
+    [{op, change_table_access_mode, cs2list(Cs2), OldMode, Mode}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+change_table_load_order(Tab, LoadOrder) ->
+    schema_transaction(fun() -> do_change_table_load_order(Tab, LoadOrder) end).
+
+do_change_table_load_order(schema, _LoadOrder) ->
+    mnesia:abort({bad_type, schema});
+do_change_table_load_order(Tab, LoadOrder) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    get_tid_ts_and_lock(Tab, none),
+    insert_schema_ops(TidTs, make_change_table_load_order(Tab, LoadOrder)).
+
+make_change_table_load_order(Tab, LoadOrder) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    ensure_active(Cs),
+    OldLoadOrder = Cs#cstruct.load_order,
+    Cs2 = Cs#cstruct{load_order = LoadOrder},
+    verify_cstruct(Cs2),
+    [{op, change_table_load_order, cs2list(Cs2), OldLoadOrder, LoadOrder}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+write_table_property(Tab, Prop) when tuple(Prop), size(Prop) >= 1 ->
+    schema_transaction(fun() -> do_write_table_property(Tab, Prop) end);
+write_table_property(Tab, Prop) ->
+    {aborted, {bad_type, Tab, Prop}}.
+do_write_table_property(Tab, Prop) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    {_, _, Ts} = TidTs,
+    Store = Ts#tidstore.store,
+    case change_prop_in_existing_op(Tab, Prop, write_property, Store) of
+	true ->
+	    dbg_out("change_prop_in_existing_op"
+		    "(~p,~p,write_property,Store) -> true~n",
+		    [Tab,Prop]),
+	    %% we have merged the table prop into the create_table op
+	    ok;
+	false ->
+	    dbg_out("change_prop_in_existing_op"
+		    "(~p,~p,write_property,Store) -> false~n",
+		    [Tab,Prop]),
+	    %% this must be an existing table
+	    get_tid_ts_and_lock(Tab, none),
+	    insert_schema_ops(TidTs, make_write_table_properties(Tab, [Prop]))
+    end.
+
+make_write_table_properties(Tab, Props) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    ensure_active(Cs),
+    make_write_table_properties(Tab, Props, Cs).
+
+make_write_table_properties(Tab, [Prop | Props], Cs) ->
+    OldProps = Cs#cstruct.user_properties,
+    PropKey = element(1, Prop),
+    DelProps = lists:keydelete(PropKey, 1, OldProps),
+    MergedProps = lists:merge(DelProps, [Prop]),
+    Cs2 = Cs#cstruct{user_properties = MergedProps},
+    verify_cstruct(Cs2),
+    [{op, write_property, cs2list(Cs2), Prop} |
+     make_write_table_properties(Tab, Props, Cs2)];
+make_write_table_properties(_Tab, [], _Cs) ->
+    [].
+
+change_prop_in_existing_op(Tab, Prop, How, Store) ->
+    Ops = ets:match_object(Store, '_'),
+    case update_existing_op(Ops, Tab, Prop, How, []) of
+	{true, Ops1} ->
+	    ets:match_delete(Store, '_'),
+	    [ets:insert(Store, Op) || Op <- Ops1],
+	    true;
+	false ->
+	    false
+    end.
+
+update_existing_op([{op, Op, L = [{name,Tab}|_], _OldProp}|Ops],
+		   Tab, Prop, How, Acc) when Op == write_property;
+					     Op == delete_property ->
+    %% Apparently, mnesia_dumper doesn't care about OldProp here -- just L,
+    %% so we will throw away OldProp (not that it matters...) and insert Prop.
+    %% as element 3.
+    L1 = insert_prop(Prop, L, How),
+    NewOp = {op, How, L1, Prop},
+    {true, lists:reverse(Acc) ++ [NewOp|Ops]};
+update_existing_op([Op = {op, create_table, L}|Ops], Tab, Prop, How, Acc) ->
+    case lists:keysearch(name, 1, L) of
+	{value, {_, Tab}} ->
+	    %% Tab is being created here -- insert Prop into L
+	    L1 = insert_prop(Prop, L, How),
+	    {true, lists:reverse(Acc) ++ [{op, create_table, L1}|Ops]};
+	_ ->
+	    update_existing_op(Ops, Tab, Prop, How, [Op|Acc])
+    end;
+update_existing_op([Op|Ops], Tab, Prop, How, Acc) ->
+    update_existing_op(Ops, Tab, Prop, How, [Op|Acc]);
+update_existing_op([], _, _, _, _) ->
+    false.
+
+%% perhaps a misnomer. How could also be delete_property... never mind.
+%% Returns the modified L.
+insert_prop(Prop, L, How) ->
+    Prev = find_props(L),
+    MergedProps = merge_with_previous(How, Prop, Prev),
+    replace_props(L, MergedProps).
+
+
+find_props([{user_properties, P}|_]) -> P;
+find_props([_H|T]) -> find_props(T).
+%% we shouldn't reach []
+
+replace_props([{user_properties, _}|T], P) -> [{user_properties, P}|T];
+replace_props([H|T], P) -> [H|replace_props(T, P)].
+%% again, we shouldn't reach []
+
+merge_with_previous(write_property, Prop, Prev) ->
+    Key = element(1, Prop),
+    Prev1 = lists:keydelete(Key, 1, Prev),
+    lists:sort([Prop|Prev1]);
+merge_with_previous(delete_property, PropKey, Prev) ->
+    lists:keydelete(PropKey, 1, Prev).
+
+delete_table_property(Tab, PropKey) ->
+    schema_transaction(fun() -> do_delete_table_property(Tab, PropKey) end).
+
+do_delete_table_property(Tab, PropKey) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    {_, _, Ts} = TidTs,
+    Store = Ts#tidstore.store,
+    case change_prop_in_existing_op(Tab, PropKey, delete_property, Store) of
+	true ->
+	    dbg_out("change_prop_in_existing_op"
+		    "(~p,~p,delete_property,Store) -> true~n",
+		    [Tab,PropKey]),
+	    %% we have merged the table prop into the create_table op
+	    ok;
+	false ->
+	    dbg_out("change_prop_in_existing_op"
+		    "(~p,~p,delete_property,Store) -> false~n",
+		    [Tab,PropKey]),
+	    %% this must be an existing table
+	    get_tid_ts_and_lock(Tab, none),
+	    insert_schema_ops(TidTs,
+			      make_delete_table_properties(Tab, [PropKey]))
+    end.
+
+make_delete_table_properties(Tab, PropKeys) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    ensure_active(Cs),
+    make_delete_table_properties(Tab, PropKeys, Cs).
+
+make_delete_table_properties(Tab, [PropKey | PropKeys], Cs) ->
+    OldProps = Cs#cstruct.user_properties,
+    Props = lists:keydelete(PropKey, 1, OldProps),
+    Cs2 = Cs#cstruct{user_properties = Props},
+    verify_cstruct(Cs2),
+    [{op, delete_property, cs2list(Cs2), PropKey} |
+     make_delete_table_properties(Tab, PropKeys, Cs2)];
+make_delete_table_properties(_Tab, [], _Cs) ->
+    [].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Ensure that the transaction can be committed even
+%% if the node crashes and Mnesia is restarted
+prepare_commit(Tid, Commit, WaitFor) ->
+    case Commit#commit.schema_ops of
+	[] ->
+	    {false, Commit, optional};
+	OrigOps ->
+	    {Modified, Ops, DumperMode} =
+		prepare_ops(Tid, OrigOps, WaitFor, false, [], optional),
+	    InitBy = schema_prepare,
+	    GoodRes = {Modified,
+		       Commit#commit{schema_ops = lists:reverse(Ops)},
+		       DumperMode},
+	    case DumperMode of
+		optional ->
+		    dbg_out("Transaction log dump skipped (~p): ~w~n",
+			    [DumperMode, InitBy]);
+		mandatory ->
+		    case mnesia_controller:sync_dump_log(InitBy) of
+			dumped ->
+			    GoodRes;
+			{error, Reason} ->
+			    mnesia:abort(Reason)
+		    end
+	    end,
+	    case Ops of
+		[] ->
+		    ignore;
+		_ ->
+		    %% We need to grab a dumper lock here, the log may not
+		    %% be dumped by others, during the schema commit phase.
+		    mnesia_controller:wait_for_schema_commit_lock()
+	    end,
+	    GoodRes
+    end.
+
+prepare_ops(Tid, [Op | Ops], WaitFor, Changed, Acc, DumperMode) ->
+    case prepare_op(Tid, Op, WaitFor) of
+        {true, mandatory} ->
+	    prepare_ops(Tid, Ops, WaitFor, Changed, [Op | Acc], mandatory);
+        {true, optional} ->
+	    prepare_ops(Tid, Ops, WaitFor, Changed, [Op | Acc], DumperMode);
+        {true, Ops2, mandatory} ->
+	    prepare_ops(Tid, Ops, WaitFor, true, Ops2 ++ Acc, mandatory);
+        {true, Ops2, optional} ->
+	    prepare_ops(Tid, Ops, WaitFor, true, Ops2 ++ Acc, DumperMode);
+	{false, mandatory} ->
+	    prepare_ops(Tid, Ops, WaitFor, true, Acc, mandatory);
+	{false, optional} ->
+	    prepare_ops(Tid, Ops, WaitFor, true, Acc, DumperMode)
+    end;
+prepare_ops(_Tid, [], _WaitFor, Changed, Acc, DumperMode) ->
+    {Changed, Acc, DumperMode}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Prepare for commit
+%% returns true if Op should be included, i.e. unmodified
+%%         {true, Operation} if NewRecs should be included, i.e. modified
+%%         false if Op should NOT be included, i.e. modified
+%%
+prepare_op(_Tid, {op, rec, unknown, Rec}, _WaitFor) ->
+    {{Tab, Key}, Items, _Op} = Rec,
+    case val({Tab, storage_type}) of
+        unknown ->
+            {false, optional};
+        Storage ->
+            mnesia_tm:prepare_snmp(Tab, Key, Items), % May exit
+            {true, [{op, rec, Storage, Rec}], optional}
+    end;
+
+prepare_op(_Tid, {op, announce_im_running, _Node, SchemaDef, Running, RemoteRunning}, _WaitFor) ->
+    SchemaCs = list2cs(SchemaDef),
+    case lists:member(node(), Running) of
+        true ->
+            announce_im_running(RemoteRunning -- Running, SchemaCs);
+        false ->
+            announce_im_running(Running -- RemoteRunning, SchemaCs)
+    end,
+    {false, optional};
+
+prepare_op(_Tid, {op, sync_trans}, {part, CoordPid}) ->
+    CoordPid ! {sync_trans, self()},
+    receive
+	{sync_trans, CoordPid} ->
+	    {false, optional};
+	Else ->
+	    mnesia_lib:verbose("sync_op terminated due to ~p~n", [Else]),
+	    mnesia:abort(Else)
+    end;
+
+prepare_op(_Tid, {op, sync_trans}, {coord, Nodes}) ->
+    case receive_sync(Nodes, []) of
+	{abort, Reason} ->
+	    mnesia_lib:verbose("sync_op terminated due to ~p~n", [Reason]),
+	    mnesia:abort(Reason);
+	Pids ->
+	    [Pid ! {sync_trans, self()} || Pid <- Pids],
+	    {false, optional}
+    end;
+prepare_op(Tid, {op, create_table, TabDef}, _WaitFor) ->
+    Cs = list2cs(TabDef),
+    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
+    UseDir = mnesia_monitor:use_dir(),
+    Tab = Cs#cstruct.name,
+    case Storage of
+        disc_copies when UseDir == false ->
+	    UseDirReason = {bad_type, Tab, Storage, node()},
+            mnesia:abort(UseDirReason);
+        disc_only_copies when UseDir == false ->
+	    UseDirReason = {bad_type, Tab, Storage, node()},
+            mnesia:abort(UseDirReason);
+	ram_copies ->
+	    create_ram_table(Tab, Cs#cstruct.type),
+	    insert_cstruct(Tid, Cs, false),
+	    {true, optional};
+	disc_copies ->
+	    create_ram_table(Tab, Cs#cstruct.type),
+	    create_disc_table(Tab),
+	    insert_cstruct(Tid, Cs, false),
+	    {true, optional};
+	disc_only_copies ->
+	    create_disc_only_table(Tab,Cs#cstruct.type),
+	    insert_cstruct(Tid, Cs, false),
+	    {true, optional};
+        unknown -> %% No replica on this node
+	    insert_cstruct(Tid, Cs, false),
+            {true, optional}
+    end;
+
+prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}, _WaitFor) ->
+    Cs = list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+
+    if
+	Tab == schema ->
+	    {true, optional}; % Nothing to prepare
+	Node == node() ->
+	    case mnesia_lib:val({schema, storage_type}) of
+		ram_copies when Storage /= ram_copies ->
+		    Error = {combine_error, Tab, "has no disc", Node},
+		    mnesia:abort(Error);
+		_  ->
+		    ok
+	    end,
+	    %% Tables are created by mnesia_loader get_network code
+	    insert_cstruct(Tid, Cs, true),
+	    case mnesia_controller:get_network_copy(Tab, Cs) of
+		{loaded, ok} ->
+		    {true, optional};
+		{not_loaded, ErrReason} ->
+		    Reason = {system_limit, Tab, {Node, ErrReason}},
+		    mnesia:abort(Reason)
+	    end;
+	Node /= node() ->
+	    %% Verify that ram table not has been dumped to disc
+	    if
+		Storage /= ram_copies ->
+		    case mnesia_lib:schema_cs_to_storage_type(node(), Cs) of
+			ram_copies ->
+			    Dat = mnesia_lib:tab2dcd(Tab),
+			    case mnesia_lib:exists(Dat) of
+				true ->
+				    mnesia:abort({combine_error, Tab, Storage,
+						  "Table dumped to disc", node()});
+				false ->
+				    ok
+			    end;
+			_ ->
+			    ok
+		    end;
+		true ->
+		    ok
+	    end,
+	    insert_cstruct(Tid, Cs, true),
+	    {true, optional}
+    end;
+
+prepare_op(Tid, {op, del_table_copy, _Storage, Node, TabDef}, _WaitFor) ->
+    Cs = list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+
+    if
+	%% Schema table lock is always required to run a schema op.
+	%% No need to look it.
+	node(Tid#tid.pid) == node(), Tab /= schema ->
+	    Pid = spawn_link(?MODULE, lock_del_table, [Tab, Node, Cs, self()]),
+	    receive
+		{Pid, updated} ->
+		    {true, optional};
+		{Pid, FailReason} ->
+		    mnesia:abort(FailReason);
+		{'EXIT', Pid, Reason} ->
+		    mnesia:abort(Reason)
+	    end;
+	true ->
+	    {true, optional}
+    end;
+
+prepare_op(_Tid, {op, change_table_copy_type,  N, FromS, ToS, TabDef}, _WaitFor)
+  when N == node() ->
+    Cs = list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+
+    NotActive = mnesia_lib:not_active_here(Tab),
+
+    if
+	NotActive == true ->
+	    mnesia:abort({not_active, Tab, node()});
+
+	Tab == schema ->
+	    case {FromS, ToS} of
+		{ram_copies, disc_copies} ->
+		    case mnesia:system_info(schema_location) of
+			opt_disc ->
+			    ignore;
+			_ ->
+			    mnesia:abort({combine_error,  Tab, node(),
+					  "schema_location must be opt_disc"})
+		    end,
+		    Dir = mnesia_lib:dir(),
+		    case opt_create_dir(true, Dir) of
+			ok ->
+			    purge_dir(Dir, []),
+			    mnesia_log:purge_all_logs(),
+			    set(use_dir, true),
+			    mnesia_log:init(),
+			    Ns = val({current, db_nodes}), %mnesia_lib:running_nodes(),
+			    F = fun(U) -> mnesia_recover:log_mnesia_up(U) end,
+			    lists:foreach(F, Ns),
+
+			    mnesia_dumper:raw_named_dump_table(Tab, dmp),
+			    mnesia_checkpoint:tm_change_table_copy_type(Tab, FromS, ToS);
+			{error, Reason} ->
+			    mnesia:abort(Reason)
+		    end;
+		{disc_copies, ram_copies} ->
+		    Ltabs = val({schema, local_tables}) -- [schema],
+		    Dtabs = [L || L <- Ltabs,
+				  val({L, storage_type}) /= ram_copies],
+		    verify([], Dtabs, {"Disc resident tables", Dtabs, N});
+		_ ->
+		    mnesia:abort({combine_error, Tab, ToS})
+	    end;
+
+	FromS == ram_copies ->
+	    case mnesia_monitor:use_dir() of
+		true ->
+		    Dat = mnesia_lib:tab2dcd(Tab),
+		    case mnesia_lib:exists(Dat) of
+			true ->
+			    mnesia:abort({combine_error, Tab, node(),
+					  "Table dump exists"});
+			false ->
+			    case ToS of
+				disc_copies ->
+				    mnesia_log:ets2dcd(Tab, dmp);
+				disc_only_copies ->
+				    mnesia_dumper:raw_named_dump_table(Tab, dmp)
+			    end,
+			    mnesia_checkpoint:tm_change_table_copy_type(Tab, FromS, ToS)
+		    end;
+		false ->
+		    mnesia:abort({has_no_disc, node()})
+	    end;
+
+	FromS == disc_copies, ToS == disc_only_copies ->
+	    mnesia_dumper:raw_named_dump_table(Tab, dmp);
+	FromS == disc_only_copies ->
+	    Type = Cs#cstruct.type,
+	    create_ram_table(Tab, Type),
+	    Datname = mnesia_lib:tab2dat(Tab),
+	    Repair = mnesia_monitor:get_env(auto_repair),
+	    case mnesia_lib:dets_to_ets(Tab, Tab, Datname, Type, Repair, no) of
+		loaded -> ok;
+		Reason ->
+		    Err = "Failed to copy disc data to ram",
+		    mnesia:abort({system_limit, Tab, {Err,Reason}})
+	    end;
+	true ->
+	    ignore
+    end,
+    {true, mandatory};
+
+prepare_op(_Tid, {op, change_table_copy_type,  N, _FromS, _ToS, _TabDef}, _WaitFor)
+  when N /= node() ->
+    {true, mandatory};
+
+prepare_op(_Tid, {op, delete_table, _TabDef}, _WaitFor) ->
+    {true, mandatory};
+
+prepare_op(_Tid, {op, dump_table, unknown, TabDef}, _WaitFor) ->
+    Cs = list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    case lists:member(node(), Cs#cstruct.ram_copies) of
+        true ->
+	    case mnesia_monitor:use_dir() of
+		true ->
+		    mnesia_log:ets2dcd(Tab, dmp),
+		    Size = mnesia:table_info(Tab, size),
+		    {true, [{op, dump_table, Size, TabDef}], optional};
+		false ->
+		    mnesia:abort({has_no_disc, node()})
+	    end;
+        false ->
+            {false, optional}
+    end;
+
+prepare_op(_Tid, {op, add_snmp, Ustruct, TabDef}, _WaitFor) ->
+    Cs = list2cs(TabDef),
+    case mnesia_lib:cs_to_storage_type(node(), Cs) of
+        unknown ->
+            {true, optional};
+        Storage ->
+            Tab = Cs#cstruct.name,
+            Stab = mnesia_snmp_hook:create_table(Ustruct, Tab, Storage),
+            mnesia_lib:set({Tab, {index, snmp}}, Stab),
+            {true, optional}
+    end;
+
+prepare_op(_Tid, {op, transform, ignore, _TabDef}, _WaitFor) ->
+    {true, mandatory};   %% Apply schema changes only.
+prepare_op(_Tid, {op, transform, Fun, TabDef}, _WaitFor) ->
+    Cs = list2cs(TabDef),
+    case mnesia_lib:cs_to_storage_type(node(), Cs) of
+        unknown ->
+            {true, mandatory};
+        Storage ->
+            Tab = Cs#cstruct.name,
+            RecName = Cs#cstruct.record_name,
+	    Type = Cs#cstruct.type,
+            NewArity = length(Cs#cstruct.attributes) + 1,
+	    mnesia_lib:db_fixtable(Storage, Tab, true),
+            Key = mnesia_lib:db_first(Tab),
+	    Op = {op, transform, Fun, TabDef},
+            case catch transform_objs(Fun, Tab, RecName,
+				      Key, NewArity, Storage, Type, [Op]) of
+                {'EXIT', Reason} ->
+		    mnesia_lib:db_fixtable(Storage, Tab, false),
+                    exit({"Bad transform function", Tab, Fun, node(), Reason});
+                Objs ->
+		    mnesia_lib:db_fixtable(Storage, Tab, false),
+                    {true, Objs, mandatory}
+            end
+    end;
+
+prepare_op(_Tid, _Op, _WaitFor) ->
+    {true, optional}.
+
+
+create_ram_table(Tab, Type) ->
+    Args = [{keypos, 2}, public, named_table, Type],
+    case mnesia_monitor:unsafe_mktab(Tab, Args) of
+	Tab ->
+	    ok;
+	{error,Reason} ->
+	    Err = "Failed to create ets table",
+	    mnesia:abort({system_limit, Tab, {Err,Reason}})
+    end.
+create_disc_table(Tab) ->
+    File = mnesia_lib:tab2dcd(Tab),
+    file:delete(File),
+    FArg = [{file, File}, {name, {mnesia,create}},
+	    {repair, false}, {mode, read_write}],
+    case mnesia_monitor:open_log(FArg) of
+	{ok,Log} ->
+	    mnesia_monitor:unsafe_close_log(Log),
+	    ok;
+	{error,Reason} ->
+	    Err = "Failed to create disc table",
+	    mnesia:abort({system_limit, Tab, {Err,Reason}})
+    end.
+create_disc_only_table(Tab,Type) ->
+    File = mnesia_lib:tab2dat(Tab),
+    file:delete(File),
+    Args = [{file, mnesia_lib:tab2dat(Tab)},
+	    {type, mnesia_lib:disk_type(Tab, Type)},
+	    {keypos, 2},
+	    {repair, mnesia_monitor:get_env(auto_repair)}],
+    case mnesia_monitor:unsafe_open_dets(Tab, Args) of
+	{ok, _} ->
+	    ok;
+	{error,Reason} ->
+	    Err = "Failed to create disc table",
+	    mnesia:abort({system_limit, Tab, {Err,Reason}})
+    end.
+
+
+receive_sync([], Pids) ->
+    Pids;
+receive_sync(Nodes, Pids) ->
+    receive
+	{sync_trans, Pid} ->
+	    Node = node(Pid),
+	    receive_sync(lists:delete(Node, Nodes), [Pid | Pids]);
+	Else ->
+	    {abort, Else}
+    end.
+
+lock_del_table(Tab, Node, Cs, Father) ->
+    Ns = val({schema, active_replicas}),
+    Lock = fun() ->
+		   mnesia:write_lock_table(Tab),
+		   {Res, []} = rpc:multicall(Ns, ?MODULE, set_where_to_read, [Tab, Node, Cs]),
+		   Filter = fun(ok) ->
+				    false;
+			       ({badrpc, {'EXIT', {undef, _}}}) ->
+				    %% This will be the case we talks with elder nodes
+				    %% than 3.8.2, they will set where_to_read without
+				    %% getting a lock.
+				    false;
+			       (_) ->
+				    true
+			    end,
+		   [] = lists:filter(Filter, Res),
+		   ok
+	   end,
+    case mnesia:transaction(Lock) of
+	{'atomic', ok} ->
+	    Father ! {self(), updated};
+	{aborted, R} ->
+	    Father ! {self(), R}
+    end,
+    unlink(Father),
+    exit(normal).
+
+set_where_to_read(Tab, Node, Cs) ->
+    case mnesia_lib:val({Tab, where_to_read}) of
+	Node ->
+	    case Cs#cstruct.local_content of
+		true ->
+		    ok;
+		false ->
+		    mnesia_lib:set_remote_where_to_read(Tab, [Node]),
+		    ok
+	    end;
+	_ ->
+	    ok
+    end.
+
+%% Build up the list in reverse order.
+transform_objs(_Fun, _Tab, _RT, '$end_of_table', _NewArity, _Storage, _Type, Acc) ->
+    Acc;
+transform_objs(Fun, Tab, RecName, Key, A, Storage, Type, Acc) ->
+    Objs = mnesia_lib:db_get(Tab, Key),
+    NextKey = mnesia_lib:db_next_key(Tab, Key),
+    Oid = {Tab, Key},
+    NewObjs = {Ws, Ds} = transform_obj(Tab, RecName, Key, Fun, Objs, A, Type, [], []),
+    if
+	NewObjs == {[], []} ->
+	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type, Acc);
+	Type == bag ->
+	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
+			   [{op, rec, Storage, {Oid, Ws, write}},
+			    {op, rec, Storage, {Oid, [Oid], delete}} | Acc]);
+	Ds == [] ->
+	    %% Type is set or ordered_set, no need to delete the record first
+	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
+			   [{op, rec, Storage, {Oid, Ws, write}} | Acc]);
+	Ws == [] ->
+	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
+			   [{op, rec, Storage, {Oid, Ds, write}} | Acc]);
+	true ->
+	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
+			   [{op, rec, Storage, {Oid, Ws, write}},
+			    {op, rec, Storage, {Oid, Ds, delete}} | Acc])
+    end.
+
+transform_obj(Tab, RecName, Key, Fun, [Obj|Rest], NewArity, Type, Ws, Ds) ->
+    NewObj = Fun(Obj),
+    if
+        size(NewObj) /= NewArity ->
+            exit({"Bad arity", Obj, NewObj});
+	NewObj == Obj ->
+	    transform_obj(Tab, RecName, Key, Fun, Rest, NewArity, Type, Ws, Ds);
+        RecName == element(1, NewObj), Key == element(2, NewObj) ->
+            transform_obj(Tab, RecName, Key, Fun, Rest, NewArity,
+			  Type, [NewObj | Ws], Ds);
+	NewObj == delete ->
+	    case Type of
+		bag -> %% Just don't write that object
+		   transform_obj(Tab, RecName, Key, Fun, Rest,
+				 NewArity, Type, Ws, Ds);
+		_ ->
+		    transform_obj(Tab, RecName, Key, Fun, Rest, NewArity,
+				  Type, Ws, [NewObj | Ds])
+	    end;
+        true ->
+            exit({"Bad key or Record Name", Obj, NewObj})
+    end;
+transform_obj(_Tab, _RecName, _Key, _Fun, [], _NewArity, _Type, Ws, Ds) ->
+    {lists:reverse(Ws), lists:reverse(Ds)}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Undo prepare of commit
+undo_prepare_commit(Tid, Commit) ->
+    case Commit#commit.schema_ops of
+	[] ->
+	    ignore;
+	Ops ->
+	    %% Catch to allow failure mnesia_controller may not be started
+	    catch mnesia_controller:release_schema_commit_lock(),
+	    undo_prepare_ops(Tid, Ops)
+    end,
+    Commit.
+
+%% Undo in reverse order
+undo_prepare_ops(Tid, [Op | Ops]) ->
+    case element(1, Op) of
+	TheOp when TheOp /= op, TheOp /= restore_op ->
+	    undo_prepare_ops(Tid, Ops);
+	_ ->
+	    undo_prepare_ops(Tid, Ops),
+	    undo_prepare_op(Tid, Op)
+    end;
+undo_prepare_ops(_Tid, []) ->
+    [].
+
+undo_prepare_op(_Tid, {op, announce_im_running, _, _, Running, RemoteRunning}) ->
+    case lists:member(node(), Running) of
+        true ->
+            unannounce_im_running(RemoteRunning -- Running);
+        false ->
+            unannounce_im_running(Running -- RemoteRunning)
+    end;
+
+undo_prepare_op(_Tid, {op, sync_trans}) ->
+    ok;
+
+undo_prepare_op(Tid, {op, create_table, TabDef}) ->
+    Cs = list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    mnesia_lib:unset({Tab, create_table}),
+    delete_cstruct(Tid, Cs),
+    case mnesia_lib:cs_to_storage_type(node(), Cs) of
+	unknown ->
+	    ok;
+	ram_copies ->
+	    ram_delete_table(Tab, ram_copies);
+	disc_copies ->
+	    ram_delete_table(Tab, disc_copies),
+	    DcdFile = mnesia_lib:tab2dcd(Tab),
+	    %%	    disc_delete_table(Tab, Storage),
+	    file:delete(DcdFile);
+	disc_only_copies ->
+	    mnesia_monitor:unsafe_close_dets(Tab),
+	    Dat = mnesia_lib:tab2dat(Tab),
+	    %%	    disc_delete_table(Tab, Storage),
+	    file:delete(Dat)
+    end;
+
+undo_prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}) ->
+    Cs = list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    if
+	Tab == schema ->
+	    true; % Nothing to prepare
+	Node == node() ->
+	    mnesia_checkpoint:tm_del_copy(Tab, Node),
+	    mnesia_controller:unannounce_add_table_copy(Tab, Node),
+	    if
+		Storage == disc_only_copies; Tab == schema ->
+		    mnesia_monitor:close_dets(Tab),
+		    file:delete(mnesia_lib:tab2dat(Tab));
+		true ->
+		    file:delete(mnesia_lib:tab2dcd(Tab))
+	    end,
+	    ram_delete_table(Tab, Storage),
+	    Cs2 = new_cs(Cs, Node, Storage, del),
+	    insert_cstruct(Tid, Cs2, true); % Don't care about the version
+	Node /= node() ->
+	    mnesia_controller:unannounce_add_table_copy(Tab, Node),
+	    Cs2 = new_cs(Cs, Node, Storage, del),
+	    insert_cstruct(Tid, Cs2, true) % Don't care about the version
+    end;
+
+undo_prepare_op(_Tid, {op, del_table_copy, _, Node, TabDef})
+  when Node == node() ->
+    Cs = list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    mnesia_lib:set({Tab, where_to_read}, Node);
+
+
+undo_prepare_op(_Tid, {op, change_table_copy_type, N, FromS, ToS, TabDef})
+        when N == node() ->
+    Cs = list2cs(TabDef),
+    Tab = Cs#cstruct.name,
+    mnesia_checkpoint:tm_change_table_copy_type(Tab, ToS, FromS),
+    Dmp = mnesia_lib:tab2dmp(Tab),
+
+    case {FromS, ToS} of
+        {ram_copies, disc_copies} when Tab == schema ->
+            file:delete(Dmp),
+            mnesia_log:purge_some_logs(),
+	    set(use_dir, false);
+	{ram_copies, disc_copies} ->
+	    file:delete(Dmp);
+	{ram_copies, disc_only_copies} ->
+	    file:delete(Dmp);
+	{disc_only_copies, _} ->
+	    ram_delete_table(Tab, ram_copies);
+	_ ->
+	    ignore
+    end;
+
+undo_prepare_op(_Tid, {op, dump_table, _Size, TabDef}) ->
+    Cs = list2cs(TabDef),
+    case lists:member(node(), Cs#cstruct.ram_copies) of
+	true ->
+	    Tab = Cs#cstruct.name,
+	    Dmp = mnesia_lib:tab2dmp(Tab),
+	    file:delete(Dmp);
+	false ->
+	    ignore
+    end;
+
+undo_prepare_op(_Tid, {op, add_snmp, _Ustruct, TabDef}) ->
+    Cs = list2cs(TabDef),
+    case mnesia_lib:cs_to_storage_type(node(), Cs) of
+	unknown ->
+	    true;
+	_Storage ->
+	    Tab = Cs#cstruct.name,
+	    case ?catch_val({Tab, {index, snmp}}) of
+		{'EXIT',_} ->
+		    ignore;
+		Stab ->
+		    mnesia_snmp_hook:delete_table(Tab, Stab),
+		    mnesia_lib:unset({Tab, {index, snmp}})
+	    end
+    end;
+
+undo_prepare_op(_Tid, _Op) ->
+    ignore.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+ram_delete_table(Tab, Storage) ->
+    case Storage of
+	unknown ->
+	    ignore;
+	disc_only_copies ->
+	    ignore;
+	_Else ->
+	    %% delete possible index files and data .....
+	    %% Got to catch this since if no info has been set in the
+	    %% mnesia_gvar it will crash
+	    catch mnesia_index:del_transient(Tab, Storage),
+	    case ?catch_val({Tab, {index, snmp}}) of
+		{'EXIT', _} ->
+		    ignore;
+		Etab ->
+		    catch mnesia_snmp_hook:delete_table(Tab, Etab)
+	    end,
+	    catch ?ets_delete_table(Tab)
+    end.
+
+purge_dir(Dir, KeepFiles) ->
+    Suffixes = known_suffixes(),
+    purge_dir(Dir, KeepFiles, Suffixes).
+
+purge_dir(Dir, KeepFiles, Suffixes) ->
+    case dir_exists(Dir) of
+	true ->
+	    {ok, AllFiles} = file:list_dir(Dir),
+	    purge_known_files(AllFiles, KeepFiles, Dir, Suffixes);
+	false ->
+	    ok
+    end.
+
+purge_tmp_files() ->
+    case mnesia_monitor:use_dir() of
+	true ->
+	    Dir = mnesia_lib:dir(),
+	    KeepFiles = [],
+	    Exists = mnesia_lib:exists(mnesia_lib:tab2dat(schema)),
+	    case Exists of
+		true ->
+		    Suffixes = tmp_suffixes(),
+		    purge_dir(Dir, KeepFiles, Suffixes);
+		false ->
+		    %% Interrupted change of storage type
+		    %% for schema table
+		    Suffixes = known_suffixes(),
+		    purge_dir(Dir, KeepFiles, Suffixes),
+		    mnesia_lib:set(use_dir, false)
+		end;
+
+	false ->
+	    ok
+    end.
+
+purge_known_files([File | Tail], KeepFiles, Dir, Suffixes) ->
+    case lists:member(File, KeepFiles) of
+	true ->
+	    ignore;
+	false ->
+	    case has_known_suffix(File, Suffixes, false) of
+		false ->
+		    ignore;
+		true ->
+		    AbsFile = filename:join([Dir, File]),
+		    file:delete(AbsFile)
+	    end
+    end,
+    purge_known_files(Tail, KeepFiles, Dir, Suffixes);
+purge_known_files([], _KeepFiles, _Dir, _Suffixes) ->
+    ok.
+
+has_known_suffix(_File, _Suffixes, true) ->
+    true;
+has_known_suffix(File, [Suffix | Tail], false) ->
+    has_known_suffix(File, Tail, lists:suffix(Suffix, File));
+has_known_suffix(_File, [], Bool) ->
+    Bool.
+
+known_suffixes() -> real_suffixes() ++ tmp_suffixes().
+
+real_suffixes() ->  [".DAT", ".LOG", ".BUP", ".DCL", ".DCD"].
+
+tmp_suffixes() -> [".TMP", ".BUPTMP", ".RET", ".DMP"].
+
+info() ->
+    Tabs = lists:sort(val({schema, tables})),
+    lists:foreach(fun(T) -> info(T) end, Tabs),
+    ok.
+
+info(Tab) ->
+    Props = get_table_properties(Tab),
+    io:format("-- Properties for ~w table --- ~n",[Tab]),
+    info2(Tab, Props).
+info2(Tab, [{cstruct, _V} | Tail]) -> % Ignore cstruct
+    info2(Tab, Tail);
+info2(Tab, [{frag_hash, _V} | Tail]) -> % Ignore frag_hash
+    info2(Tab, Tail);
+info2(Tab, [{P, V} | Tail]) ->
+    io:format("~-20w -> ~p~n",[P,V]),
+    info2(Tab, Tail);
+info2(_, []) ->
+    io:format("~n", []).
+
+get_table_properties(Tab) ->
+    case catch mnesia_lib:db_match_object(ram_copies,
+					  mnesia_gvar, {{Tab, '_'}, '_'}) of
+	{'EXIT', _} ->
+	    mnesia:abort({no_exists, Tab, all});
+	RawGvar ->
+	    case [{Item, Val} || {{_Tab, Item}, Val} <- RawGvar] of
+		[] ->
+		    [];
+		Gvar ->
+		    Size = {size, mnesia:table_info(Tab, size)},
+		    Memory = {memory, mnesia:table_info(Tab, memory)},
+		    Master = {master_nodes, mnesia:table_info(Tab, master_nodes)},
+		    lists:sort([Size, Memory, Master | Gvar])
+	    end
+    end.
+
+%%%%%%%%%%% RESTORE %%%%%%%%%%%
+
+-record(r, {iter = schema,
+	    module,
+	    table_options = [],
+	    default_op = clear_tables,
+	    tables = [],
+	    opaque,
+	    insert_op = error_fun,
+	    recs = error_recs
+	   }).
+
+restore(Opaque) ->
+    restore(Opaque, [], mnesia_monitor:get_env(backup_module)).
+restore(Opaque, Args) when list(Args) ->
+    restore(Opaque, Args, mnesia_monitor:get_env(backup_module));
+restore(_Opaque, BadArg) ->
+    {aborted, {badarg, BadArg}}.
+restore(Opaque, Args, Module) when list(Args), atom(Module) ->
+    InitR = #r{opaque = Opaque, module = Module},
+    case catch lists:foldl(fun check_restore_arg/2, InitR, Args) of
+	R when record(R, r) ->
+	    case mnesia_bup:read_schema(Module, Opaque) of
+		{error, Reason} ->
+		    {aborted, Reason};
+		BupSchema ->
+		    schema_transaction(fun() -> do_restore(R, BupSchema) end)
+	    end;
+	{'EXIT', Reason} ->
+	    {aborted, Reason}
+    end;
+restore(_Opaque, Args, Module) ->
+    {aborted, {badarg, Args, Module}}.
+
+check_restore_arg({module, Mod}, R) when atom(Mod) ->
+    R#r{module = Mod};
+
+check_restore_arg({clear_tables, List}, R) when list(List) ->
+    case lists:member(schema, List) of
+	false ->
+	    TableList = [{Tab, clear_tables} || Tab <- List],
+	    R#r{table_options = R#r.table_options ++ TableList};
+	true ->
+	    exit({badarg, {clear_tables, schema}})
+    end;
+check_restore_arg({recreate_tables, List}, R) when list(List) ->
+    case lists:member(schema, List) of
+	false ->
+	    TableList = [{Tab, recreate_tables} || Tab <- List],
+	    R#r{table_options = R#r.table_options ++ TableList};
+	true ->
+	    exit({badarg, {recreate_tables, schema}})
+    end;
+check_restore_arg({keep_tables, List}, R) when list(List) ->
+    TableList = [{Tab, keep_tables} || Tab <- List],
+    R#r{table_options = R#r.table_options ++ TableList};
+check_restore_arg({skip_tables, List}, R) when list(List) ->
+    TableList = [{Tab, skip_tables} || Tab <- List],
+    R#r{table_options = R#r.table_options ++ TableList};
+check_restore_arg({default_op, Op}, R) ->
+    case Op of
+	clear_tables -> ok;
+	recreate_tables -> ok;
+	keep_tables -> ok;
+	skip_tables -> ok;
+	Else ->
+	    exit({badarg, {bad_default_op, Else}})
+    end,
+    R#r{default_op = Op};
+
+check_restore_arg(BadArg,_) ->
+    exit({badarg, BadArg}).
+
+do_restore(R, BupSchema) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    R2 = restore_schema(BupSchema, R),
+    insert_schema_ops(TidTs, [{restore_op, R2}]),
+    [element(1, TabStruct) || TabStruct <- R2#r.tables].
+
+arrange_restore(R, Fun, Recs) ->
+    R2 = R#r{insert_op = Fun, recs = Recs},
+    case mnesia_bup:iterate(R#r.module, fun restore_items/4, R#r.opaque, R2) of
+	{ok, R3} -> R3#r.recs;
+	{error, Reason} -> mnesia:abort(Reason);
+	Reason -> mnesia:abort(Reason)
+    end.
+
+restore_items([Rec | Recs], Header, Schema, R) ->
+    Tab = element(1, Rec),
+    case lists:keysearch(Tab, 1, R#r.tables) of
+	{value, {Tab, Where, Snmp, RecName}} ->
+	    {Rest, NRecs} =
+		restore_tab_items([Rec | Recs], Tab, RecName, Where, Snmp,
+				  R#r.recs, R#r.insert_op),
+	    restore_items(Rest, Header, Schema, R#r{recs = NRecs});
+	false ->
+	    Rest = skip_tab_items(Recs, Tab),
+	    restore_items(Rest, Header, Schema, R)
+    end;
+
+restore_items([], _Header, _Schema, R) ->
+    R.
+
+restore_func(Tab, R) ->
+    case lists:keysearch(Tab, 1, R#r.table_options) of
+	{value, {Tab, OP}} ->
+	    OP;
+	false ->
+	    R#r.default_op
+    end.
+
+where_to_commit(Tab, CsList) ->
+    Ram =   [{N, ram_copies} || N <- pick(Tab, ram_copies, CsList, [])],
+    Disc =  [{N, disc_copies} || N <- pick(Tab, disc_copies, CsList, [])],
+    DiscO = [{N, disc_only_copies} || N <- pick(Tab, disc_only_copies, CsList, [])],
+    Ram ++ Disc ++ DiscO.
+
+%% Changes of the Meta info of schema itself is not allowed
+restore_schema([{schema, schema, _List} | Schema], R) ->
+    restore_schema(Schema, R);
+restore_schema([{schema, Tab, List} | Schema], R) ->
+    case restore_func(Tab, R) of
+	clear_tables ->
+	    do_clear_table(Tab),
+	    Where = val({Tab, where_to_commit}),
+	    Snmp = val({Tab, snmp}),
+	    RecName = val({Tab, record_name}),
+	    R2 = R#r{tables = [{Tab, Where, Snmp, RecName} | R#r.tables]},
+	    restore_schema(Schema, R2);
+	recreate_tables ->
+	    TidTs = get_tid_ts_and_lock(Tab, write),
+	    NC    = {cookie, ?unique_cookie},
+	    List2 = lists:keyreplace(cookie, 1, List, NC),
+	    Where = where_to_commit(Tab, List2),
+	    Snmp  = pick(Tab, snmp, List2, []),
+	    RecName = pick(Tab, record_name, List2, Tab),
+% 	    case ?catch_val({Tab, cstruct}) of
+% 		{'EXIT', _} ->
+% 		    ignore;
+% 		OldCs when record(OldCs, cstruct) ->
+% 		    do_delete_table(Tab)
+% 	    end,
+% 	    unsafe_do_create_table(list2cs(List2)),
+	    insert_schema_ops(TidTs, [{op, restore_recreate, List2}]),
+	    R2 = R#r{tables = [{Tab, Where, Snmp, RecName} | R#r.tables]},
+	    restore_schema(Schema, R2);
+	keep_tables ->
+	    get_tid_ts_and_lock(Tab, write),
+	    Where = val({Tab, where_to_commit}),
+	    Snmp = val({Tab, snmp}),
+	    RecName = val({Tab, record_name}),
+	    R2 = R#r{tables = [{Tab, Where, Snmp, RecName} | R#r.tables]},
+	    restore_schema(Schema, R2);
+	skip_tables ->
+	    restore_schema(Schema, R)
+    end;
+
+restore_schema([{schema, Tab} | Schema], R) ->
+    do_delete_table(Tab),
+    Tabs = lists:delete(Tab,R#r.tables),
+    restore_schema(Schema, R#r{tables = Tabs});
+restore_schema([], R) ->
+    R.
+
+restore_tab_items([Rec | Rest], Tab, RecName, Where, Snmp, Recs, Op)
+  when element(1, Rec) == Tab ->
+    NewRecs = Op(Rec, Recs, RecName, Where, Snmp),
+    restore_tab_items(Rest, Tab, RecName, Where, Snmp, NewRecs, Op);
+
+restore_tab_items(Rest, _Tab, _RecName, _Where, _Snmp, Recs, _Op) ->
+    {Rest, Recs}.
+
+skip_tab_items([Rec| Rest], Tab)
+  when element(1, Rec) == Tab ->
+    skip_tab_items(Rest, Tab);
+skip_tab_items(Recs, _) ->
+    Recs.
+
+%%%%%%%%% Dump tables %%%%%%%%%%%%%
+dump_tables(Tabs) when list(Tabs) ->
+    schema_transaction(fun() -> do_dump_tables(Tabs) end);
+dump_tables(Tabs) ->
+    {aborted, {bad_type, Tabs}}.
+
+do_dump_tables(Tabs) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    insert_schema_ops(TidTs, make_dump_tables(Tabs)).
+
+make_dump_tables([schema | _Tabs]) ->
+    mnesia:abort({bad_type, schema});
+make_dump_tables([Tab | Tabs]) ->
+    get_tid_ts_and_lock(Tab, read),
+    TabDef = get_create_list(Tab),
+    DiscResident =  val({Tab, disc_copies}) ++ val({Tab, disc_only_copies}),
+    verify([], DiscResident,
+	   {"Only allowed on ram_copies", Tab, DiscResident}),
+    [{op, dump_table, unknown, TabDef} | make_dump_tables(Tabs)];
+make_dump_tables([]) ->
+    [].
+
+%% Merge the local schema with the schema on other nodes
+merge_schema() ->
+    schema_transaction(fun() -> do_merge_schema() end).
+
+do_merge_schema() ->
+    {_Mod, Tid, Ts} = get_tid_ts_and_lock(schema, write),
+    Connected = val(recover_nodes),
+    Running = val({current, db_nodes}),
+    Store = Ts#tidstore.store,
+    case Connected -- Running of
+	[Node | _] ->
+	    %% Time for a schema merging party!
+	    mnesia_locker:wlock_no_exist(Tid, Store, schema, [Node]),
+
+	    case rpc:call(Node, mnesia_controller, get_cstructs, []) of
+		{cstructs, Cstructs, RemoteRunning1} ->
+		    LockedAlready = Running ++ [Node],
+		    {New, Old} = mnesia_recover:connect_nodes(RemoteRunning1),
+		    RemoteRunning = mnesia_lib:intersect(New ++ Old, RemoteRunning1),
+		    if
+			RemoteRunning /= RemoteRunning1 ->
+			    mnesia_lib:error("Mnesia on ~p could not connect to node(s) ~p~n",
+					     [node(), RemoteRunning1 -- RemoteRunning]);
+			true -> ok
+		    end,
+		    NeedsLock = RemoteRunning -- LockedAlready,
+		    mnesia_locker:wlock_no_exist(Tid, Store, schema, NeedsLock),
+
+		    {value, SchemaCs} =
+			lists:keysearch(schema, #cstruct.name, Cstructs),
+
+		    %% Announce that Node is running
+		    A = [{op, announce_im_running, node(),
+			  cs2list(SchemaCs), Running, RemoteRunning}],
+		    do_insert_schema_ops(Store, A),
+
+		    %% Introduce remote tables to local node
+		    do_insert_schema_ops(Store, make_merge_schema(Node, Cstructs)),
+
+		    %% Introduce local tables to remote nodes
+		    Tabs = val({schema, tables}),
+		    Ops = [{op, merge_schema, get_create_list(T)}
+			   || T <- Tabs,
+			      not lists:keymember(T, #cstruct.name, Cstructs)],
+		    do_insert_schema_ops(Store, Ops),
+
+		    %% Ensure that the txn will be committed on all nodes
+		    announce_im_running(RemoteRunning, SchemaCs),
+		    {merged, Running, RemoteRunning};
+		{error, Reason} ->
+		    {"Cannot get cstructs", Node, Reason};
+		{badrpc, Reason} ->
+		    {"Cannot get cstructs", Node, {badrpc, Reason}}
+	    end;
+	[] ->
+	    %% No more nodes to merge schema with
+	    not_merged
+    end.
+
+make_merge_schema(Node, [Cs | Cstructs]) ->
+    Ops = do_make_merge_schema(Node, Cs),
+    Ops ++ make_merge_schema(Node, Cstructs);
+make_merge_schema(_Node, []) ->
+    [].
+
+%% Merge definitions of schema table
+do_make_merge_schema(Node, RemoteCs)
+        when RemoteCs#cstruct.name == schema ->
+    Cs = val({schema, cstruct}),
+    Masters = mnesia_recover:get_master_nodes(schema),
+    HasRemoteMaster = lists:member(Node, Masters),
+    HasLocalMaster = lists:member(node(), Masters),
+    Force = HasLocalMaster or HasRemoteMaster,
+    %% What is the storage types opinions?
+    StCsLocal   = mnesia_lib:cs_to_storage_type(node(), Cs),
+    StRcsLocal  = mnesia_lib:cs_to_storage_type(node(), RemoteCs),
+    StCsRemote  = mnesia_lib:cs_to_storage_type(Node, Cs),
+    StRcsRemote = mnesia_lib:cs_to_storage_type(Node, RemoteCs),
+
+    if
+	Cs#cstruct.cookie == RemoteCs#cstruct.cookie,
+	Cs#cstruct.version == RemoteCs#cstruct.version ->
+	    %% Great, we have the same cookie and version
+	    %% and do not need to merge cstructs
+	    [];
+
+	Cs#cstruct.cookie /= RemoteCs#cstruct.cookie,
+	Cs#cstruct.disc_copies /= [],
+	RemoteCs#cstruct.disc_copies /= [] ->
+	    %% Both cstructs involves disc nodes
+	    %% and we cannot merge them
+	    if
+		HasLocalMaster == true,
+		HasRemoteMaster == false ->
+		    %% Choose local cstruct,
+		    %% since it's the master
+		    [{op, merge_schema, cs2list(Cs)}];
+
+		HasRemoteMaster == true,
+		HasLocalMaster == false ->
+		    %% Choose remote cstruct,
+		    %% since it's the master
+		    [{op, merge_schema, cs2list(RemoteCs)}];
+
+		true ->
+		    Str = io_lib:format("Incompatible schema cookies. "
+					"Please, restart from old backup."
+					"~w = ~w, ~w = ~w~n",
+					[Node, cs2list(RemoteCs), node(), cs2list(Cs)]),
+		    throw(Str)
+	    end;
+
+	StCsLocal /= StRcsLocal, StRcsLocal /= unknown ->
+	    Str = io_lib:format("Incompatible schema storage types. "
+				"on ~w storage ~w, on ~w storage ~w~n",
+				[node(), StCsLocal, Node, StRcsLocal]),
+	    throw(Str);
+	StCsRemote /= StRcsRemote, StCsRemote /= unknown ->
+	    Str = io_lib:format("Incompatible schema storage types. "
+				"on ~w storage ~w, on ~w storage ~w~n",
+				[node(), StCsRemote, Node, StRcsRemote]),
+	    throw(Str);
+
+	Cs#cstruct.disc_copies /= [] ->
+	    %% Choose local cstruct,
+	    %% since it involves disc nodes
+	    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
+	    [{op, merge_schema, cs2list(MergedCs)}];
+
+	RemoteCs#cstruct.disc_copies /= [] ->
+	    %% Choose remote cstruct,
+	    %% since it involves disc nodes
+	    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
+	    [{op, merge_schema, cs2list(MergedCs)}];
+
+	Cs > RemoteCs ->
+	    %% Choose remote cstruct
+	    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
+	    [{op, merge_schema, cs2list(MergedCs)}];
+
+	true ->
+	    %% Choose local cstruct
+	    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
+	    [{op, merge_schema, cs2list(MergedCs)}]
+    end;
+
+%% Merge definitions of normal table
+do_make_merge_schema(Node, RemoteCs) ->
+    Tab = RemoteCs#cstruct.name,
+    Masters = mnesia_recover:get_master_nodes(schema),
+    HasRemoteMaster = lists:member(Node, Masters),
+    HasLocalMaster = lists:member(node(), Masters),
+    Force = HasLocalMaster or HasRemoteMaster,
+    case ?catch_val({Tab, cstruct}) of
+	{'EXIT', _} ->
+	    %% A completely new table, created while Node was down
+	    [{op, merge_schema, cs2list(RemoteCs)}];
+	Cs when Cs#cstruct.cookie == RemoteCs#cstruct.cookie ->
+	    if
+		Cs#cstruct.version == RemoteCs#cstruct.version ->
+		    %% We have exactly the same version of the
+		    %% table def
+		    [];
+
+		Cs#cstruct.version > RemoteCs#cstruct.version ->
+		    %% Oops, we have different versions
+		    %% of the table def, lets merge them.
+		    %% The only changes that may have occurred
+		    %% is that new replicas may have been added.
+		    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
+		    [{op, merge_schema, cs2list(MergedCs)}];
+
+		Cs#cstruct.version < RemoteCs#cstruct.version ->
+		    %% Oops, we have different versions
+		    %% of the table def, lets merge them
+		    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
+		    [{op, merge_schema, cs2list(MergedCs)}]
+	    end;
+	Cs ->
+	    %% Different cookies, not possible to merge
+	    if
+		HasLocalMaster == true,
+		HasRemoteMaster == false ->
+		    %% Choose local cstruct,
+		    %% since it's the master
+		    [{op, merge_schema, cs2list(Cs)}];
+
+		HasRemoteMaster == true,
+		HasLocalMaster == false ->
+		    %% Choose remote cstruct,
+		    %% since it's the master
+		    [{op, merge_schema, cs2list(RemoteCs)}];
+
+		true ->
+		    Str = io_lib:format("Bad cookie in table definition"
+					" ~w: ~w = ~w, ~w = ~w~n",
+					[Tab, node(), Cs, Node, RemoteCs]),
+		    throw(Str)
+	    end
+    end.
+
+%% Change of table definitions (cstructs) requires all replicas
+%% of the table to be active. New replicas, db_nodes and tables
+%% may however be added even if some replica is inactive. These
+%% invariants must be enforced in order to allow merge of cstructs.
+%%
+%% Returns a new cstruct or issues a fatal error
+merge_cstructs(Cs, RemoteCs, Force) ->
+    verify_cstruct(Cs),
+    case catch do_merge_cstructs(Cs, RemoteCs, Force) of
+	{'EXIT', {aborted, _Reason}} when Force == true ->
+	    Cs;
+	{'EXIT', Reason} ->
+	    exit(Reason);
+	MergedCs when record(MergedCs, cstruct) ->
+	    MergedCs;
+	Other ->
+	    throw(Other)
+    end.
+
+do_merge_cstructs(Cs, RemoteCs, Force) ->
+    verify_cstruct(RemoteCs),
+    Ns = mnesia_lib:uniq(mnesia_lib:cs_to_nodes(Cs) ++
+			 mnesia_lib:cs_to_nodes(RemoteCs)),
+    {AnythingNew, MergedCs} =
+	merge_storage_type(Ns, false, Cs, RemoteCs, Force),
+    MergedCs2 = merge_versions(AnythingNew, MergedCs, RemoteCs, Force),
+    verify_cstruct(MergedCs2),
+    MergedCs2.
+
+merge_storage_type([N | Ns], AnythingNew, Cs, RemoteCs, Force) ->
+    Local = mnesia_lib:cs_to_storage_type(N, Cs),
+    Remote = mnesia_lib:cs_to_storage_type(N, RemoteCs),
+    case compare_storage_type(true, Local, Remote) of
+	{same, _Storage} ->
+	    merge_storage_type(Ns, AnythingNew, Cs, RemoteCs, Force);
+	{diff, Storage} ->
+	    Cs2 = change_storage_type(N, Storage, Cs),
+	    merge_storage_type(Ns, true, Cs2, RemoteCs, Force);
+	incompatible when Force == true ->
+	    merge_storage_type(Ns, AnythingNew, Cs, RemoteCs, Force);
+	Other ->
+	    Str = io_lib:format("Cannot merge storage type for node ~w "
+				"in cstruct ~w with remote cstruct ~w (~w)~n",
+				[N, Cs, RemoteCs, Other]),
+	    throw(Str)
+    end;
+merge_storage_type([], AnythingNew, MergedCs, _RemoteCs, _Force) ->
+    {AnythingNew, MergedCs}.
+
+compare_storage_type(_Retry, Any, Any) ->
+    {same, Any};
+compare_storage_type(_Retry, unknown, Any) ->
+    {diff, Any};
+compare_storage_type(_Retry, ram_copies, disc_copies) ->
+    {diff, disc_copies};
+compare_storage_type(_Retry, disc_copies, disc_only_copies) ->
+    {diff, disc_only_copies};
+compare_storage_type(true, One, Another) ->
+    compare_storage_type(false, Another, One);
+compare_storage_type(false, _One, _Another) ->
+    incompatible.
+
+change_storage_type(N, ram_copies, Cs) ->
+    Nodes = [N | Cs#cstruct.ram_copies],
+    Cs#cstruct{ram_copies = mnesia_lib:uniq(Nodes)};
+change_storage_type(N, disc_copies, Cs) ->
+    Nodes = [N | Cs#cstruct.disc_copies],
+    Cs#cstruct{disc_copies = mnesia_lib:uniq(Nodes)};
+change_storage_type(N, disc_only_copies, Cs) ->
+    Nodes = [N | Cs#cstruct.disc_only_copies],
+    Cs#cstruct{disc_only_copies = mnesia_lib:uniq(Nodes)}.
+
+%% BUGBUG: Verify match of frag info; equalit demanded for all but add_node
+
+merge_versions(AnythingNew, Cs, RemoteCs, Force) ->
+    if
+	Cs#cstruct.name == schema ->
+	    ok;
+	Cs#cstruct.name /= schema,
+	Cs#cstruct.cookie == RemoteCs#cstruct.cookie ->
+	    ok;
+	Force == true ->
+	    ok;
+	true ->
+	    Str = io_lib:format("Bad cookies. Cannot merge definitions of "
+				"table ~w. Local = ~w, Remote = ~w~n",
+				[Cs#cstruct.name, Cs, RemoteCs]),
+	    throw(Str)
+    end,
+    if
+	Cs#cstruct.name == RemoteCs#cstruct.name,
+	Cs#cstruct.type == RemoteCs#cstruct.type,
+	Cs#cstruct.local_content == RemoteCs#cstruct.local_content,
+	Cs#cstruct.attributes == RemoteCs#cstruct.attributes,
+	Cs#cstruct.index == RemoteCs#cstruct.index,
+	Cs#cstruct.snmp == RemoteCs#cstruct.snmp,
+	Cs#cstruct.access_mode == RemoteCs#cstruct.access_mode,
+	Cs#cstruct.load_order == RemoteCs#cstruct.load_order,
+	Cs#cstruct.user_properties == RemoteCs#cstruct.user_properties ->
+	    do_merge_versions(AnythingNew, Cs, RemoteCs);
+	Force == true ->
+	    do_merge_versions(AnythingNew, Cs, RemoteCs);
+	true ->
+	    Str1 = io_lib:format("Cannot merge definitions of "
+				"table ~w. Local = ~w, Remote = ~w~n",
+				[Cs#cstruct.name, Cs, RemoteCs]),
+	    throw(Str1)
+    end.
+
+do_merge_versions(AnythingNew, MergedCs, RemoteCs) ->
+    {{Major1, Minor1}, _Detail1} = MergedCs#cstruct.version,
+    {{Major2, Minor2}, _Detail2} = RemoteCs#cstruct.version,
+    if
+	MergedCs#cstruct.version == RemoteCs#cstruct.version ->
+	    MergedCs;
+	AnythingNew == false ->
+	    MergedCs;
+	Major1 == Major2 ->
+	    Minor = lists:max([Minor1, Minor2]),
+	    V = {{Major1, Minor}, dummy},
+	    incr_version(MergedCs#cstruct{version = V});
+	Major1 /= Major2 ->
+	    Major = lists:max([Major1, Major2]),
+	    V = {{Major, 0}, dummy},
+	    incr_version(MergedCs#cstruct{version = V})
+    end.
+
+announce_im_running([N | Ns], SchemaCs) ->
+    {L1, L2} = mnesia_recover:connect_nodes([N]),
+    case lists:member(N, L1) or lists:member(N, L2) of
+	true ->
+%%	    dbg_out("Adding ~p to {current db_nodes} ~n", [N]),  %% qqqq
+	    mnesia_lib:add({current, db_nodes}, N),
+	    mnesia_controller:add_active_replica(schema, N, SchemaCs);
+	false ->
+	    ignore
+    end,
+    announce_im_running(Ns, SchemaCs);
+announce_im_running([], _) ->
+    [].
+
+unannounce_im_running([N | Ns]) ->
+    mnesia_lib:del({current, db_nodes}, N),
+    mnesia_controller:del_active_replica(schema, N),
+    mnesia_recover:disconnect(N),
+    unannounce_im_running(Ns);
+unannounce_im_running([]) ->
+    [].
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_snmp_hook.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_snmp_hook.erl
new file mode 100644
index 0000000000..ad88bc6e6a
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_snmp_hook.erl
@@ -0,0 +1,271 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_snmp_hook.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
+%%
+-module(mnesia_snmp_hook).
+
+%% Hooks (called from mnesia)
+-export([check_ustruct/1, create_table/3, delete_table/2,
+	 key_to_oid/3, update/1, start/2,
+	 get_row/2, get_next_index/2, get_mnesia_key/2]).
+
+%% sys callback functions
+-export([system_continue/3,
+	 system_terminate/4,
+	 system_code_change/4
+	]).
+
+%% Internal exports
+-export([b_init/2]).
+
+check_ustruct([]) ->
+    true;  %% default value, not SNMP'ified
+check_ustruct([{key, Types}]) ->
+    is_snmp_type(to_list(Types));
+check_ustruct(_) -> false.
+
+to_list(Tuple) when tuple(Tuple) -> tuple_to_list(Tuple);
+to_list(X) -> [X].
+
+is_snmp_type([integer | T]) -> is_snmp_type(T);
+is_snmp_type([string | T]) -> is_snmp_type(T);
+is_snmp_type([fix_string | T]) -> is_snmp_type(T);
+is_snmp_type([]) -> true;
+is_snmp_type(_) -> false.
+
+create_table([], MnesiaTab, _Storage) ->
+    mnesia:abort({badarg, MnesiaTab, {snmp, empty_snmpstruct}});
+
+create_table([{key, Us}], MnesiaTab, Storage) ->
+    Tree = b_new(MnesiaTab, Us),
+    mnesia_lib:db_fixtable(Storage, MnesiaTab, true),
+    First = mnesia_lib:db_first(Storage, MnesiaTab),
+    build_table(First, MnesiaTab, Tree, Us, Storage),
+    mnesia_lib:db_fixtable(Storage, MnesiaTab, false),
+    Tree.
+
+build_table(MnesiaKey, MnesiaTab, Tree, Us, Storage)
+  when MnesiaKey /= '$end_of_table' ->
+%%    SnmpKey = key_to_oid(MnesiaTab, MnesiaKey, Us),
+%%    update(write, Tree, MnesiaKey, SnmpKey),
+    update(write, Tree, MnesiaKey, MnesiaKey),
+    Next = mnesia_lib:db_next_key(Storage, MnesiaTab, MnesiaKey),
+    build_table(Next, MnesiaTab, Tree, Us, Storage);
+build_table('$end_of_table', _MnesiaTab, _Tree, _Us, _Storage) ->
+    ok.
+
+delete_table(_MnesiaTab, Tree) ->
+    exit(Tree, shutdown),
+    ok.
+
+%%-----------------------------------------------------------------
+%% update({Op, MnesiaTab, MnesiaKey, SnmpKey})
+%%-----------------------------------------------------------------
+
+update({clear_table, MnesiaTab}) ->
+    Tree = mnesia_lib:val({MnesiaTab, {index, snmp}}),
+    b_clear(Tree);
+
+update({Op, MnesiaTab, MnesiaKey, SnmpKey}) ->
+    Tree = mnesia_lib:val({MnesiaTab, {index, snmp}}),
+    update(Op, Tree, MnesiaKey, SnmpKey).
+
+update(Op, Tree, MnesiaKey, _) ->
+    case Op of
+	write ->
+	    b_insert(Tree, MnesiaKey, MnesiaKey);
+	update_counter ->
+	    ignore;
+	delete ->
+	    b_delete(Tree, MnesiaKey);
+	delete_object ->
+	    b_delete(Tree, MnesiaKey)
+    end,
+    ok.
+
+%%-----------------------------------------------------------------
+%% Func: key_to_oid(Tab, Key, Ustruct)
+%% Args: Key ::= key()
+%%         key() ::= int() | string() | {int() | string()}
+%%       Type ::= {fix_string | term()}
+%% Make an OBJECT IDENTIFIER out of it.
+%% Variable length objects are prepended by their length.
+%% Ex. Key = {"pelle", 42} AND Type = {string, integer} =>
+%%        OID [5, $p, $e, $l, $l, $e, 42]
+%%     Key = {"pelle", 42} AND Type = {fix_string, integer} =>
+%%        OID [$p, $e, $l, $l, $e, 42]
+%%-----------------------------------------------------------------
+key_to_oid(Tab, Key, [{key, Types}]) ->
+    MnesiaOid = {Tab, Key},
+    if
+	tuple(Key), tuple(Types) ->
+	    case {size(Key), size(Types)} of
+		{Size, Size} ->
+		    keys_to_oid(MnesiaOid, Size, Key, [], Types);
+		_ ->
+		    exit({bad_snmp_key, MnesiaOid})
+	    end;
+	true ->
+	    key_to_oid_i(MnesiaOid, Key, Types)
+    end.
+
+key_to_oid_i(_MnesiaOid, Key, integer) when integer(Key) -> [Key];
+key_to_oid_i(_MnesiaOid, Key, fix_string) when list(Key) -> Key;
+key_to_oid_i(_MnesiaOid, Key, string) when list(Key) -> [length(Key) | Key];
+key_to_oid_i(MnesiaOid, Key, Type) ->
+    exit({bad_snmp_key, [MnesiaOid, Key, Type]}).
+
+keys_to_oid(_MnesiaOid, 0, _Key, Oid, _Types) -> Oid;
+keys_to_oid(MnesiaOid, N, Key, Oid, Types) ->
+    Type = element(N, Types),
+    KeyPart = element(N, Key),
+    Oid2 = key_to_oid_i(MnesiaOid, KeyPart, Type) ++ Oid,
+    keys_to_oid(MnesiaOid, N-1, Key, Oid2, Types).
+
+%%-----------------------------------------------------------------
+%% Func: get_row/2
+%% Args: Name is the name of the table (atom)
+%%       RowIndex is an Oid
+%% Returns: {ok, Row} | undefined
+%%          Note that the Row returned might contain columns that
+%%          are not visible via SNMP. e.g. the first column may be
+%%          ifIndex, and the last MFA ({ifIndex, col1, col2, MFA}).
+%%          where ifIndex is used only as index (not as a real col),
+%%          and MFA as extra info, used by the application.
+%%-----------------------------------------------------------------
+get_row(Name, RowIndex) ->
+    Tree = mnesia_lib:val({Name, {index, snmp}}),
+    case b_lookup(Tree, RowIndex) of
+	{ok, {_RowIndex, Key}} ->
+	    [Row] = mnesia:dirty_read({Name, Key}),
+	    {ok, Row};
+	_ ->
+	    undefined
+    end.
+
+%%-----------------------------------------------------------------
+%% Func: get_next_index/2
+%% Args: Name is the name of the table (atom)
+%%       RowIndex is an Oid
+%% Returns: {ok, NextIndex} | endOfTable
+%%-----------------------------------------------------------------
+get_next_index(Name, RowIndex) ->
+    Tree = mnesia_lib:val({Name, {index, snmp}}),
+    case b_lookup_next(Tree, RowIndex) of
+	{ok, {NextIndex, _Key}} ->
+	    {ok, NextIndex};
+	_ ->
+	    endOfTable
+    end.
+
+%%-----------------------------------------------------------------
+%% Func: get_mnesia_key/2
+%% Purpose: Get the mnesia key corresponding to the RowIndex.
+%% Args: Name is the name of the table (atom)
+%%       RowIndex is an Oid
+%% Returns: {ok, Key} | undefiend
+%%-----------------------------------------------------------------
+get_mnesia_key(Name, RowIndex) ->
+    Tree = mnesia_lib:val({Name, {index, snmp}}),
+    case b_lookup(Tree, RowIndex) of
+	{ok, {_RowIndex, Key}} ->
+	    {ok, Key};
+	_ ->
+	    undefined
+    end.
+
+%%-----------------------------------------------------------------
+%% Encapsulate a bplus_tree in a process.
+%%-----------------------------------------------------------------
+
+b_new(MnesiaTab, Us) ->
+    case supervisor:start_child(mnesia_snmp_sup, [MnesiaTab, Us]) of
+	{ok, Tree} ->
+	    Tree;
+	{error, Reason} ->
+	    exit({badsnmp, MnesiaTab, Reason})
+    end.
+
+start(MnesiaTab, Us) ->
+    Name = {mnesia_snmp, MnesiaTab},
+    mnesia_monitor:start_proc(Name, ?MODULE, b_init, [self(), Us]).
+
+b_insert(Tree, Key, Val) -> Tree ! {insert, Key, Val}.
+b_delete(Tree, Key) -> Tree ! {delete, Key}.
+b_lookup(Tree, Key) ->
+    Tree ! {lookup, self(), Key},
+    receive
+	{bplus_res, Res} ->
+	    Res
+    end.
+b_lookup_next(Tree, Key) ->
+    Tree ! {lookup_next, self(), Key},
+    receive
+	{bplus_res, Res} ->
+	    Res
+    end.
+
+b_clear(Tree) ->
+    Tree ! clear,
+    ok.
+
+b_init(Parent, Us) ->
+    %% Do not trap exit
+    Tree = snmp_index:new(Us),
+    proc_lib:init_ack(Parent, {ok, self()}),
+    b_loop(Parent, Tree, Us).
+
+b_loop(Parent, Tree, Us) ->
+    receive
+	{insert, Key, Val} ->
+	    NTree = snmp_index:insert(Tree, Key, Val),
+	    b_loop(Parent, NTree, Us);
+	{delete, Key} ->
+	    NTree = snmp_index:delete(Tree, Key),
+	    b_loop(Parent, NTree, Us);
+	{lookup, From, Key} ->
+	    Res = snmp_index:get(Tree, Key),
+	    From ! {bplus_res, Res},
+	    b_loop(Parent, Tree, Us);
+	{lookup_next, From, Key} ->
+	    Res = snmp_index:get_next(Tree, Key),
+	    From ! {bplus_res, Res},
+	    b_loop(Parent, Tree, Us);
+	clear ->
+	    catch snmp_index:delete(Tree), %% Catch because delete/1 is not
+	    NewTree = snmp_index:new(Us),  %% available in old snmp (before R5)
+	    b_loop(Parent, NewTree, Us);
+
+	{'EXIT', Parent, Reason} ->
+	    exit(Reason);
+
+	{system, From, Msg} ->
+	    mnesia_lib:dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
+	    sys:handle_system_msg(Msg, From, Parent, ?MODULE, [], {Tree, Us})
+
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% System upgrade
+
+system_continue(Parent, _Debug, {Tree, Us}) ->
+    b_loop(Parent, Tree, Us).
+
+system_terminate(Reason, _Parent, _Debug, _Tree) ->
+    exit(Reason).
+
+system_code_change(State, _Module, _OldVsn, _Extra) ->
+    {ok, State}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_snmp_sup.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_snmp_sup.erl
new file mode 100644
index 0000000000..227eec060f
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_snmp_sup.erl
@@ -0,0 +1,39 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_snmp_sup.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
+%%
+-module(mnesia_snmp_sup).
+
+-behaviour(supervisor).
+
+-export([start/0, init/1]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% top supervisor callback functions
+
+start() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% sub supervisor callback functions
+
+init([]) ->
+    Flags = {simple_one_for_one, 0, timer:hours(24)}, % Trust the top supervisor
+    MFA = {mnesia_snmp_hook, start, []},
+    Modules = [?MODULE, mnesia_snmp_hook, supervisor],
+    KillAfter = mnesia_kernel_sup:supervisor_timeout(timer:seconds(3)),
+    Workers = [{?MODULE, MFA, transient, KillAfter, worker, Modules}],
+    {ok, {Flags, Workers}}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_sp.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_sp.erl
new file mode 100644
index 0000000000..bc52ad7f84
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_sp.erl
@@ -0,0 +1,35 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_sp.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
+%%
+
+%% To able to generate nice crash reports we need a catch on the highest level.
+%% This code can't be purged so a code change is not possible.
+%% And hence this a simple module.
+
+-module(mnesia_sp).
+
+-export([init_proc/4]).
+
+init_proc(Who, Mod, Fun, Args) ->
+    mnesia_lib:verbose("~p starting: ~p~n", [Who, self()]),
+    case catch apply(Mod, Fun, Args) of
+	{'EXIT', Reason} ->
+	    mnesia_monitor:terminate_proc(Who, Reason, Args),
+	    exit(Reason);
+	Other ->
+	    Other
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_subscr.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_subscr.erl
new file mode 100644
index 0000000000..dc66451206
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_subscr.erl
@@ -0,0 +1,491 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_subscr.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
+%%
+-module(mnesia_subscr).
+
+-behaviour(gen_server).
+
+-export([start/0,
+	 set_debug_level/1,
+	 subscribe/2,
+	 unsubscribe/2,
+	 unsubscribe_table/1,
+	 subscribers/0,
+	 report_table_event/4,
+	 report_table_event/5,
+	 report_table_event/6
+	]).
+
+%% gen_server callbacks
+-export([init/1,
+	 handle_call/3,
+	 handle_cast/2,
+	 handle_info/2,
+	 terminate/2,
+	 code_change/3
+	]).
+
+-include("mnesia.hrl").
+
+-import(mnesia_lib, [error/2]).
+-record(state, {supervisor, pid_tab}).
+
+start() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [self()],
+			  [{timeout, infinity}]).
+
+set_debug_level(Level) ->
+    OldEnv = application:get_env(mnesia, debug),
+    case mnesia_monitor:patch_env(debug, Level) of
+	{error, Reason} ->
+	    {error, Reason};
+	NewLevel ->
+	    set_debug_level(NewLevel, OldEnv)
+    end.
+
+set_debug_level(Level, OldEnv) ->
+    case mnesia:system_info(is_running) of
+	no when OldEnv == undefined ->
+	    none;
+	no ->
+	    {ok, E} = OldEnv,
+	    E;
+	_ ->
+	    Old = mnesia_lib:val(debug),
+	    Local = mnesia:system_info(local_tables),
+	    E = whereis(mnesia_event),
+	    Sub = fun(Tab) -> subscribe(E, {table, Tab}) end,
+	    UnSub = fun(Tab) -> unsubscribe(E, {table, Tab}) end,
+
+	    case Level of
+		none ->
+		    lists:foreach(UnSub, Local);
+		verbose ->
+		    lists:foreach(UnSub, Local);
+		debug ->
+		    lists:foreach(UnSub, Local -- [schema]),
+		    Sub(schema);
+		trace ->
+		    lists:foreach(Sub, Local)
+	    end,
+	    mnesia_lib:set(debug, Level),
+	    Old
+    end.
+
+subscribe(ClientPid, system) ->
+    change_subscr(activate, ClientPid, system);
+subscribe(ClientPid, {table, Tab}) ->
+    change_subscr(activate, ClientPid, {table, Tab, simple});
+subscribe(ClientPid, {table, Tab, simple}) ->
+    change_subscr(activate, ClientPid, {table, Tab, simple});
+subscribe(ClientPid, {table, Tab, detailed}) ->
+    change_subscr(activate, ClientPid, {table, Tab, detailed});
+subscribe(_ClientPid, What) ->
+    {error, {badarg, What}}.
+
+unsubscribe(ClientPid, system) ->
+    change_subscr(deactivate, ClientPid, system);
+unsubscribe(ClientPid, {table, Tab}) ->
+    change_subscr(deactivate, ClientPid, {table, Tab, simple});
+unsubscribe(ClientPid, {table, Tab, simple}) ->
+    change_subscr(deactivate, ClientPid, {table, Tab, simple});
+unsubscribe(ClientPid, {table, Tab, detailed}) ->
+    change_subscr(deactivate, ClientPid, {table, Tab, detailed});
+unsubscribe(_ClientPid, What) ->
+    {error, {badarg, What}}.
+
+unsubscribe_table(Tab) ->
+    call({change, {deactivate_table, Tab}}).
+
+change_subscr(Kind, ClientPid, What) ->
+    call({change, {Kind, ClientPid, What}}).
+
+subscribers() ->
+    [whereis(mnesia_event) | mnesia_lib:val(subscribers)].
+
+report_table_event(Tab, Tid, Obj, Op) ->
+    case ?catch_val({Tab, commit_work}) of
+	{'EXIT', _} -> ok;
+	Commit ->
+	    case lists:keysearch(subscribers, 1, Commit) of
+		false -> ok;
+		{value, Subs} ->
+		    report_table_event(Subs, Tab, Tid, Obj, Op, undefined)
+	    end
+    end.
+
+%% Backwards compatible for the moment when mnesia_tm get's updated!
+report_table_event(Subscr, Tab, Tid, Obj, Op) ->
+    report_table_event(Subscr, Tab, Tid, Obj, Op, undefined).
+
+report_table_event({subscribers, S1, S2}, Tab, Tid, _Obj, clear_table, _Old) ->
+    What   = {delete, {schema, Tab}, Tid},
+    deliver(S1, {mnesia_table_event, What}),
+    TabDef = mnesia_schema:cs2list(?catch_val({Tab, cstruct})),
+    What2  = {write, {schema, Tab, TabDef}, Tid},
+    deliver(S1, {mnesia_table_event, What2}),
+    What3  = {delete, schema, {schema, Tab}, [{schema, Tab, TabDef}], Tid},
+    deliver(S2, {mnesia_table_event, What3}),
+    What4  = {write, schema,  {schema, Tab, TabDef}, [], Tid},
+    deliver(S2, {mnesia_table_event, What4});
+
+report_table_event({subscribers, Subscr, []}, Tab, Tid, Obj, Op, _Old) ->
+    What = {Op, patch_record(Tab, Obj), Tid},
+    deliver(Subscr, {mnesia_table_event, What});
+
+report_table_event({subscribers, S1, S2}, Tab, Tid, Obj, Op, Old) ->
+    Standard = {Op, patch_record(Tab, Obj), Tid},
+    deliver(S1, {mnesia_table_event, Standard}),
+    Extended = what(Tab, Tid, Obj, Op, Old),
+    deliver(S2, Extended);
+
+%% Backwards compatible for the moment when mnesia_tm get's updated!
+report_table_event({subscribers, Subscr}, Tab, Tid, Obj, Op, Old) ->
+    report_table_event({subscribers, Subscr, []}, Tab, Tid, Obj, Op, Old).
+
+
+patch_record(Tab, Obj) ->
+    case Tab == element(1, Obj) of
+	true ->
+	    Obj;
+	false ->
+	    setelement(1, Obj, Tab)
+    end.
+
+what(Tab, Tid, {RecName, Key}, delete, undefined) ->
+    case catch mnesia_lib:db_get(Tab, Key) of
+	Old when list(Old) -> %% Op only allowed for set table.
+	    {mnesia_table_event, {delete, Tab, {RecName, Key}, Old, Tid}};
+	_ ->
+	    %% Record just deleted by a dirty_op or
+	    %% the whole table has been deleted
+	    ignore
+    end;
+what(Tab, Tid, Obj, delete, Old) ->
+    {mnesia_table_event, {delete, Tab, Obj, Old, Tid}};
+what(Tab, Tid, Obj, delete_object, _Old) ->
+    {mnesia_table_event, {delete, Tab, Obj, [Obj], Tid}};
+what(Tab, Tid, Obj, write, undefined) ->
+    case catch mnesia_lib:db_get(Tab, element(2, Obj)) of
+	Old when list(Old) ->
+	    {mnesia_table_event, {write, Tab, Obj, Old, Tid}};
+	{'EXIT', _} ->
+	    ignore
+    end.
+
+deliver(_, ignore) ->
+    ok;
+deliver([Pid | Pids], Msg) ->
+    Pid ! Msg,
+    deliver(Pids, Msg);
+deliver([], _Msg) ->
+    ok.
+
+call(Msg) ->
+    Pid = whereis(?MODULE),
+    case Pid of
+	undefined ->
+	    {error, {node_not_running, node()}};
+	Pid ->
+	    Res = gen_server:call(Pid, Msg, infinity),
+            %% We get an exit signal if server dies
+            receive
+                {'EXIT', _Pid, _Reason} ->
+                    {error, {node_not_running, node()}}
+            after 0 ->
+                    ignore
+            end,
+	    Res
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Callback functions from gen_server
+
+%%----------------------------------------------------------------------
+%% Func: init/1
+%% Returns: {ok, State}          |
+%%          {ok, State, Timeout} |
+%%          {stop, Reason}
+%%----------------------------------------------------------------------
+init([Parent]) ->
+    process_flag(trap_exit, true),
+    ClientPid = whereis(mnesia_event),
+    link(ClientPid),
+    mnesia_lib:verbose("~p starting: ~p~n", [?MODULE, self()]),
+    Tab = ?ets_new_table(mnesia_subscr, [duplicate_bag, private]),
+    ?ets_insert(Tab, {ClientPid, system}),
+    {ok, #state{supervisor = Parent, pid_tab = Tab}}.
+
+%%----------------------------------------------------------------------
+%% Func: handle_call/3
+%% Returns: {reply, Reply, State}          |
+%%          {reply, Reply, State, Timeout} |
+%%          {noreply, State}               |
+%%          {noreply, State, Timeout}      |
+%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
+%%----------------------------------------------------------------------
+handle_call({change, How}, _From, State) ->
+    Reply = do_change(How, State#state.pid_tab),
+    {reply, Reply, State};
+
+handle_call(Msg, _From, State) ->
+    error("~p got unexpected call: ~p~n", [?MODULE, Msg]),
+    {noreply, State}.
+
+%%----------------------------------------------------------------------
+%% Func: handle_cast/2
+%% Returns: {noreply, State}          |
+%%          {noreply, State, Timeout} |
+%%          {stop, Reason, State}            (terminate/2 is called)
+%%----------------------------------------------------------------------
+handle_cast(Msg, State) ->
+    error("~p got unexpected cast: ~p~n", [?MODULE, Msg]),
+    {noreply, State}.
+
+%%----------------------------------------------------------------------
+%% Func: handle_info/2
+%% Returns: {noreply, State}          |
+%%          {noreply, State, Timeout} |
+%%          {stop, Reason, State}            (terminate/2 is called)
+%%----------------------------------------------------------------------
+
+handle_info({'EXIT', Pid, _R}, State) when Pid == State#state.supervisor ->
+    {stop, shutdown, State};
+
+handle_info({'EXIT', Pid, _Reason}, State) ->
+    handle_exit(Pid, State#state.pid_tab),
+    {noreply, State};
+
+handle_info(Msg, State) ->
+    error("~p got unexpected info: ~p~n", [?MODULE, Msg]),
+    {noreply, State}.
+
+%%----------------------------------------------------------------------
+%% Func: terminate/2
+%% Purpose: Shutdown the server
+%% Returns: any (ignored by gen_server)
+%%----------------------------------------------------------------------
+terminate(Reason, State) ->
+    prepare_stop(State#state.pid_tab),
+    mnesia_monitor:terminate_proc(?MODULE, Reason, State).
+
+%%----------------------------------------------------------------------
+%% Func: code_change/3
+%% Purpose: Upgrade process when its code is to be changed
+%% Returns: {ok, NewState}
+%%----------------------------------------------------------------------
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%%----------------------------------------------------------------------
+%%% Internal functions
+%%%----------------------------------------------------------------------
+
+do_change({activate, ClientPid, system}, SubscrTab) when pid(ClientPid) ->
+    Var = subscribers,
+    activate(ClientPid, system, Var, subscribers(), SubscrTab);
+do_change({activate, ClientPid, {table, Tab, How}}, SubscrTab) when pid(ClientPid) ->
+    case ?catch_val({Tab, where_to_read}) of
+	Node when Node == node() ->
+	    Var = {Tab, commit_work},
+	    activate(ClientPid, {table, Tab, How}, Var, mnesia_lib:val(Var), SubscrTab);
+	{'EXIT', _} ->
+	    {error, {no_exists, Tab}};
+	_Node ->
+	    {error, {not_active_local, Tab}}
+    end;
+do_change({deactivate, ClientPid, system}, SubscrTab) ->
+    Var = subscribers,
+    deactivate(ClientPid, system, Var, SubscrTab);
+do_change({deactivate, ClientPid, {table, Tab, How}}, SubscrTab) ->
+    Var = {Tab, commit_work},
+    deactivate(ClientPid, {table, Tab, How}, Var, SubscrTab);
+do_change({deactivate_table, Tab}, SubscrTab) ->
+    Var = {Tab, commit_work},
+    case ?catch_val(Var) of
+	{'EXIT', _} ->
+	    {error, {no_exists, Tab}};
+	CommitWork ->
+	    case lists:keysearch(subscribers, 1, CommitWork) of
+		false ->
+		    ok;
+		{value, Subs} ->
+		    Simple   = {table, Tab, simple},
+		    Detailed = {table, Tab, detailed},
+		    Fs = fun(C) -> deactivate(C, Simple, Var, SubscrTab) end,
+		    Fd = fun(C) -> deactivate(C, Detailed, Var, SubscrTab) end,
+		    case Subs of
+			{subscribers, L1, L2} ->
+			    lists:foreach(Fs, L1),
+			    lists:foreach(Fd, L2);
+			{subscribers, L1} ->
+			    lists:foreach(Fs, L1)
+		    end
+	    end,
+	    {ok, node()}
+    end;
+do_change(_, _) ->
+    {error, badarg}.
+
+activate(ClientPid, What, Var, OldSubscribers, SubscrTab) ->
+    Old =
+	if Var == subscribers ->
+		OldSubscribers;
+	   true ->
+		case lists:keysearch(subscribers, 1, OldSubscribers) of
+		    false -> [];
+		{value, Subs} ->
+			case Subs of
+			    {subscribers, L1, L2} ->
+				L1 ++ L2;
+			    {subscribers, L1} ->
+				L1
+			end
+		end
+	end,
+    case lists:member(ClientPid, Old) of
+	false ->
+	    %% Don't care about checking old links
+	    case catch link(ClientPid) of
+		true ->
+		    ?ets_insert(SubscrTab, {ClientPid, What}),
+		    add_subscr(Var, What, ClientPid),
+		    {ok, node()};
+		{'EXIT', _Reason} ->
+		    {error, {no_exists, ClientPid}}
+	    end;
+	true ->
+	    {error, {already_exists, What}}
+    end.
+
+%%-record(subscribers, {pids = []}).  Old subscriber record removed
+%% To solve backward compatibility, this code is a cludge..
+add_subscr(subscribers, _What, Pid) ->
+    mnesia_lib:add(subscribers, Pid),
+    {ok, node()};
+add_subscr({Tab, commit_work}, What, Pid) ->
+    Commit = mnesia_lib:val({Tab, commit_work}),
+    case lists:keysearch(subscribers, 1, Commit) of
+	false ->
+	    Subscr =
+		case What of
+		    {table, _, simple} ->
+			{subscribers, [Pid], []};
+		    {table, _, detailed} ->
+			{subscribers, [], [Pid]}
+		end,
+	    mnesia_lib:add({Tab, subscribers}, Pid),
+	    mnesia_lib:set({Tab, commit_work},
+			   mnesia_lib:sort_commit([Subscr | Commit]));
+	{value, Old} ->
+	    {L1, L2} =
+		case Old of
+		    {subscribers, L} ->  %% Old Way
+			{L, []};
+		    {subscribers, SL1, SL2} ->
+			{SL1, SL2}
+		end,
+	    Subscr =
+		case What of
+		    {table, _, simple} ->
+			{subscribers, [Pid | L1], L2};
+		    {table, _, detailed} ->
+			{subscribers, L1, [Pid | L2]}
+		end,
+	    NewC  = lists:keyreplace(subscribers, 1, Commit, Subscr),
+	    mnesia_lib:set({Tab, commit_work},
+			   mnesia_lib:sort_commit(NewC)),
+	    mnesia_lib:add({Tab, subscribers}, Pid)
+    end.
+
+deactivate(ClientPid, What, Var, SubscrTab) ->
+    ?ets_match_delete(SubscrTab, {ClientPid, What}),
+    case catch ?ets_lookup_element(SubscrTab, ClientPid, 1) of
+	List when list(List) ->
+	    ignore;
+	{'EXIT', _} ->
+	    unlink(ClientPid)
+    end,
+    del_subscr(Var, What, ClientPid),
+    {ok, node()}.
+
+del_subscr(subscribers, _What, Pid) ->
+    mnesia_lib:del(subscribers, Pid);
+del_subscr({Tab, commit_work}, What, Pid) ->
+    Commit = mnesia_lib:val({Tab, commit_work}),
+    case lists:keysearch(subscribers, 1, Commit) of
+	false ->
+	    false;
+	{value, Old} ->
+	    {L1, L2} =
+		case Old of
+		    {subscribers, L} ->  %% Old Way
+			{L, []};
+		    {subscribers, SL1, SL2} ->
+			{SL1, SL2}
+		end,
+	    Subscr =
+		case What of %% Ignore user error delete subscr from any list
+		    {table, _, simple} ->
+			NewL1 = lists:delete(Pid, L1),
+			NewL2 = lists:delete(Pid, L2),
+			{subscribers, NewL1, NewL2};
+		    {table, _, detailed} ->
+			NewL1 = lists:delete(Pid, L1),
+			NewL2 = lists:delete(Pid, L2),
+			{subscribers, NewL1, NewL2}
+		end,
+	    case Subscr of
+		{subscribers, [], []} ->
+		    NewC = lists:keydelete(subscribers, 1, Commit),
+		    mnesia_lib:del({Tab, subscribers}, Pid),
+		    mnesia_lib:set({Tab, commit_work},
+				   mnesia_lib:sort_commit(NewC));
+		_ ->
+		    NewC = lists:keyreplace(subscribers, 1, Commit, Subscr),
+		    mnesia_lib:del({Tab, subscribers}, Pid),
+		    mnesia_lib:set({Tab, commit_work},
+				   mnesia_lib:sort_commit(NewC))
+	    end
+    end.
+
+handle_exit(ClientPid, SubscrTab) ->
+    do_handle_exit(?ets_lookup(SubscrTab, ClientPid)),
+    ?ets_delete(SubscrTab, ClientPid).
+
+do_handle_exit([{ClientPid, What} | Tail]) ->
+    case What of
+	system ->
+	    del_subscr(subscribers, What, ClientPid);
+	{_, Tab, _Level} ->
+	    del_subscr({Tab, commit_work}, What, ClientPid)
+    end,
+    do_handle_exit(Tail);
+do_handle_exit([]) ->
+    ok.
+
+prepare_stop(SubscrTab) ->
+    mnesia_lib:report_system_event({mnesia_down, node()}),
+    do_prepare_stop(?ets_first(SubscrTab), SubscrTab).
+
+do_prepare_stop('$end_of_table', _SubscrTab) ->
+    ok;
+do_prepare_stop(ClientPid, SubscrTab) ->
+    Next = ?ets_next(SubscrTab, ClientPid),
+    handle_exit(ClientPid, SubscrTab),
+    unlink(ClientPid),
+    do_prepare_stop(Next, SubscrTab).
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_sup.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_sup.erl
new file mode 100644
index 0000000000..78609ffdde
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_sup.erl
@@ -0,0 +1,136 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_sup.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
+%%
+%% Supervisor for the entire Mnesia application
+
+-module(mnesia_sup).
+
+-behaviour(application).
+-behaviour(supervisor).
+
+-export([start/0, start/2, init/1, stop/1, start_event/0, kill/0]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% application and suprvisor callback functions
+
+start(normal, Args) ->
+    SupName = {local,?MODULE},
+    case supervisor:start_link(SupName, ?MODULE, [Args]) of
+	{ok, Pid} ->
+	    {ok, Pid, {normal, Args}};
+	Error ->
+	    Error
+    end;
+start(_, _) ->
+    {error, badarg}.
+
+start() ->
+    SupName = {local,?MODULE},
+    supervisor:start_link(SupName, ?MODULE, []).
+
+stop(_StartArgs) ->
+    ok.
+
+init([]) -> % Supervisor
+    init();
+init([[]]) -> % Application
+    init();
+init(BadArg) ->
+    {error, {badarg, BadArg}}.
+
+init() ->
+    Flags = {one_for_all, 0, 3600}, % Should be rest_for_one policy
+
+    Event = event_procs(),
+    Kernel = kernel_procs(),
+    Mnemosyne = mnemosyne_procs(),
+
+    {ok, {Flags, Event ++ Kernel ++ Mnemosyne}}.
+
+event_procs() ->
+    KillAfter = timer:seconds(30),
+    KA = mnesia_kernel_sup:supervisor_timeout(KillAfter),
+    E = mnesia_event,
+    [{E, {?MODULE, start_event, []}, permanent, KA, worker, [E, gen_event]}].
+
+kernel_procs() ->
+    K = mnesia_kernel_sup,
+    KA = infinity,
+    [{K, {K, start, []}, permanent, KA, supervisor, [K, supervisor]}].
+
+mnemosyne_procs() ->
+    case mnesia_monitor:get_env(embedded_mnemosyne) of
+	true ->
+	    Q = mnemosyne_sup,
+	    KA = infinity,
+	    [{Q, {Q, start, []}, permanent, KA, supervisor, [Q, supervisor]}];
+	false ->
+	    []
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% event handler
+
+start_event() ->
+    case gen_event:start_link({local, mnesia_event}) of
+	{ok, Pid} ->
+	    case add_event_handler() of
+		ok ->
+		    {ok, Pid};
+		Error ->
+		    Error
+	    end;
+	Error  ->
+	    Error
+    end.
+
+add_event_handler() ->
+    Handler = mnesia_monitor:get_env(event_module),
+    gen_event:add_handler(mnesia_event, Handler, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% debug functions
+
+kill() ->
+    Mnesia = [mnesia_fallback | mnesia:ms()],
+    Mnemosyne = mnemosyne_ms(),
+    Kill = fun(Name) -> catch exit(whereis(Name), kill) end,
+    lists:foreach(Kill, Mnemosyne),
+    lists:foreach(Kill, Mnesia),
+    lists:foreach(fun ensure_dead/1, Mnemosyne),
+    lists:foreach(fun ensure_dead/1, Mnesia),
+    timer:sleep(10),
+    case lists:keymember(mnesia, 1, application:which_applications()) of
+	true -> kill();
+	false -> ok
+    end.
+
+ensure_dead(Name) ->
+    case whereis(Name) of
+	undefined ->
+	    ok;
+	Pid when pid(Pid) ->
+	    exit(Pid, kill),
+	    timer:sleep(10),
+	    ensure_dead(Name)
+    end.
+
+mnemosyne_ms() ->
+    case mnesia_monitor:get_env(embedded_mnemosyne) of
+	true -> mnemosyne:ms();
+	false -> []
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_text.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_text.erl
new file mode 100644
index 0000000000..d74f3bf07b
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_text.erl
@@ -0,0 +1,189 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_text.erl,v 1.2 2010/03/04 13:54:20 maria Exp $
+%%
+-module(mnesia_text).
+
+-export([parse/1, file/1, load_textfile/1, dump_to_textfile/1]).
+
+load_textfile(File) ->
+    ensure_started(),
+    case parse(File) of
+	{ok, {Tabs, Data}} ->
+	    Badtabs = make_tabs(lists:map(fun validate_tab/1, Tabs)),
+	    load_data(del_data(Badtabs, Data, []));
+	Other ->
+	    Other
+    end.
+
+dump_to_textfile(File) ->
+    dump_to_textfile(mnesia_lib:is_running(), file:open(File, [write])).
+dump_to_textfile(yes, {ok, F}) ->
+    Tabs = lists:delete(schema, mnesia_lib:local_active_tables()),
+    Defs = lists:map(fun(T) -> {T, [{record_name, mnesia_lib:val({T, record_name})},
+				    {attributes, mnesia_lib:val({T, attributes})}]}
+		     end,
+		     Tabs),
+    io:format(F, "~p.~n", [{tables, Defs}]),
+    lists:foreach(fun(T) -> dump_tab(F, T) end, Tabs),
+    file:close(F);
+dump_to_textfile(_,_) -> error.
+
+
+dump_tab(F, T) ->
+    W = mnesia_lib:val({T, wild_pattern}),
+    {'atomic',All} = mnesia:transaction(fun() -> mnesia:match_object(T, W, read) end),
+    lists:foreach(fun(Term) -> io:format(F,"~p.~n", [setelement(1, Term, T)]) end, All).
+
+
+ensure_started() ->
+    case mnesia_lib:is_running() of
+	yes ->
+	    yes;
+	no ->
+	    case mnesia_lib:exists(mnesia_lib:dir("schema.DAT")) of
+		true ->
+		    mnesia:start();
+		false ->
+		    mnesia:create_schema([node()]),
+		    mnesia:start()
+	    end
+    end.
+
+del_data(Bad, [H|T], Ack) ->
+    case lists:member(element(1, H), Bad) of
+	true -> del_data(Bad, T, Ack);
+	false -> del_data(Bad, T, [H|Ack])
+    end;
+del_data(_Bad, [], Ack) ->
+    lists:reverse(Ack).
+
+%% Tis the place to call the validate func in mnesia_schema
+validate_tab({Tabname, List}) ->
+    {Tabname, List};
+validate_tab({Tabname, RecName, List}) ->
+    {Tabname, RecName, List};
+validate_tab(_) -> error(badtab).
+
+make_tabs([{Tab, Def} | Tail]) ->
+    case catch mnesia:table_info(Tab, where_to_read) of
+	{'EXIT', _} -> %% non-existing table
+	    case mnesia:create_table(Tab, Def) of
+		{aborted, Reason} ->
+		    io:format("** Failed to create table ~w ~n"
+			      "** Reason = ~w, Args = ~p~n",
+			      [Tab, Reason, Def]),
+		    [Tab | make_tabs(Tail)];
+		_ ->
+		    io:format("New table ~w~n", [Tab]),
+		    make_tabs(Tail)
+	    end;
+	Node ->
+	    io:format("** Table ~w already exists on ~p, just entering data~n",
+		      [Tab, Node]),
+	    make_tabs(Tail)
+    end;
+
+make_tabs([]) ->
+    [].
+
+load_data(L) ->
+    mnesia:transaction(fun() ->
+			       F = fun(X) ->
+					   Tab = element(1, X),
+					   RN = mnesia:table_info(Tab, record_name),
+					   Rec = setelement(1, X, RN),
+					   mnesia:write(Tab, Rec, write) end,
+			       lists:foreach(F, L)
+		       end).
+
+parse(File) ->
+    case file(File) of
+	{ok, Terms} ->
+	    case catch collect(Terms) of
+		{error, X} ->
+		    {error, X};
+		Other ->
+		    {ok, Other}
+	    end;
+	Other ->
+	    Other
+    end.
+
+collect([{_, {tables, Tabs}}|L]) ->
+    {Tabs, collect_data(Tabs, L)};
+
+collect(_) ->
+    io:format("No tables found\n", []),
+    error(bad_header).
+
+collect_data(Tabs, [{Line, Term} | Tail]) when tuple(Term) ->
+    case lists:keysearch(element(1, Term), 1, Tabs) of
+	{value, _} ->
+	    [Term | collect_data(Tabs, Tail)];
+	_Other ->
+	    io:format("Object:~p at line ~w unknown\n", [Term,Line]),
+	    error(undefined_object)
+    end;
+collect_data(_Tabs, []) -> [];
+collect_data(_Tabs, [H|_T]) ->
+    io:format("Object:~p unknown\n", [H]),
+    error(undefined_object).
+
+error(What) -> throw({error, What}).
+
+file(File) ->
+    case file:open(File, [read]) of
+	{ok, Stream} ->
+	    Res = read_terms(Stream, File, 1, []),
+	    file:close(Stream),
+	    Res;
+	_Other ->
+	    {error, open}
+    end.
+
+read_terms(Stream, File, Line, L) ->
+    case read_term_from_stream(Stream, File, Line) of
+	{ok, Term, NextLine} ->
+	    read_terms(Stream, File, NextLine, [Term|L]);
+	error ->
+	    {error, read};
+	eof ->
+	    {ok, lists:reverse(L)}
+    end.
+
+read_term_from_stream(Stream, File, Line) ->
+    R = io:request(Stream, {get_until,'',erl_scan,tokens,[Line]}),
+    case R of
+	{ok,Toks,EndLine} ->
+	    case erl_parse:parse_term(Toks) of
+		{ok, Term} ->
+		    {ok, {Line, Term}, EndLine};
+		{error, {NewLine,Mod,What}} ->
+		    Str = Mod:format_error(What),
+		    io:format("Error in line:~p of:~p ~s\n",
+			      [NewLine, File, Str]),
+		    error;
+		T ->
+		    io:format("Error2 **~p~n",[T]),
+		    error
+	    end;
+	{eof,_EndLine} ->
+	    eof;
+	Other ->
+	    io:format("Error1 **~p~n",[Other]),
+	    error
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_tm.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_tm.erl
new file mode 100644
index 0000000000..ac11087fa0
--- /dev/null
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_tm.erl
@@ -0,0 +1,2173 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: mnesia_tm.erl,v 1.2 2010/03/04 13:54:20 maria Exp $
+%%
+-module(mnesia_tm).
+
+-export([
+	 start/0,
+	 init/1,
+	 non_transaction/5,
+	 transaction/6,
+	 commit_participant/5,
+	 dirty/2,
+	 display_info/2,
+	 do_update_op/3,
+	 get_info/1,
+	 get_transactions/0,
+	 info/1,
+	 mnesia_down/1,
+	 prepare_checkpoint/2,
+	 prepare_checkpoint/1, % Internal
+	 prepare_snmp/3,
+	 do_snmp/2,
+	 put_activity_id/1,
+	 block_tab/1,
+	 unblock_tab/1
+	]).
+
+%% sys callback functions
+-export([system_continue/3,
+	 system_terminate/4,
+	 system_code_change/4
+	]).
+
+-include("mnesia.hrl").
+-import(mnesia_lib, [set/2]).
+-import(mnesia_lib, [fatal/2, verbose/2, dbg_out/2]).
+
+-record(state, {coordinators = [], participants = [], supervisor,
+		blocked_tabs = [], dirty_queue = []}).
+%% Format on coordinators is [{Tid, EtsTabList} .....
+
+-record(prep, {protocol = sym_trans,
+	       %% async_dirty | sync_dirty | sym_trans | sync_sym_trans | asym_trans
+	       records = [],
+	       prev_tab = [], % initiate to a non valid table name
+	       prev_types,
+	       prev_snmp,
+	       types
+	      }).
+
+-record(participant, {tid, pid, commit, disc_nodes = [],
+		      ram_nodes = [], protocol = sym_trans}).
+
+start() ->
+    mnesia_monitor:start_proc(?MODULE, ?MODULE, init, [self()]).
+
+init(Parent) ->
+    register(?MODULE, self()),
+    process_flag(trap_exit, true),
+
+    %% Initialize the schema
+    IgnoreFallback = mnesia_monitor:get_env(ignore_fallback_at_startup),
+    mnesia_bup:tm_fallback_start(IgnoreFallback),
+    mnesia_schema:init(IgnoreFallback),
+
+    %% Handshake and initialize transaction recovery
+    mnesia_recover:init(),
+    Early = mnesia_monitor:init(),
+    AllOthers = mnesia_lib:uniq(Early ++ mnesia_lib:all_nodes()) -- [node()],
+    set(original_nodes, AllOthers),
+    mnesia_recover:connect_nodes(AllOthers),
+
+    %% Recover transactions, may wait for decision
+    case mnesia_monitor:use_dir() of
+	true ->
+	    P = mnesia_dumper:opt_dump_log(startup), % previous log
+	    L = mnesia_dumper:opt_dump_log(startup), % latest log
+	    Msg = "Initial dump of log during startup: ~p~n",
+	    mnesia_lib:verbose(Msg, [[P, L]]),
+	    mnesia_log:init();
+	false ->
+	    ignore
+    end,
+
+    mnesia_schema:purge_tmp_files(),
+    mnesia_recover:start_garb(),
+
+    ?eval_debug_fun({?MODULE, init},  [{nodes, AllOthers}]),
+
+    case val(debug) of
+	Debug when Debug /= debug, Debug /= trace ->
+	    ignore;
+	_ ->
+	    mnesia_subscr:subscribe(whereis(mnesia_event), {table, schema})
+    end,
+    proc_lib:init_ack(Parent, {ok, self()}),
+    doit_loop(#state{supervisor = Parent}).
+
+val(Var) ->
+    case ?catch_val(Var) of
+	{'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_);
+	_VaLuE_ -> _VaLuE_
+    end.
+
+reply({From,Ref}, R) ->
+    From ! {?MODULE, Ref, R};
+reply(From, R) ->
+    From ! {?MODULE, node(), R}.
+
+reply(From, R, State) ->
+    reply(From, R),
+    doit_loop(State).
+
+req(R) ->
+    case whereis(?MODULE) of
+	undefined ->
+	    {error, {node_not_running, node()}};
+	Pid ->
+	    Ref = make_ref(),
+	    Pid ! {{self(), Ref}, R},
+	    rec(Pid, Ref)
+    end.
+
+rec() ->
+    rec(whereis(?MODULE)).
+
+rec(Pid) when pid(Pid) ->
+    receive
+	{?MODULE, _, Reply} ->
+	    Reply;
+
+	{'EXIT', Pid, _} ->
+	    {error, {node_not_running, node()}}
+    end;
+rec(undefined) ->
+    {error, {node_not_running, node()}}.
+
+rec(Pid, Ref) ->
+    receive
+	{?MODULE, Ref, Reply} ->
+	    Reply;
+	{'EXIT', Pid, _} ->
+	    {error, {node_not_running, node()}}
+    end.
+
+tmlink({From, Ref}) when reference(Ref) ->
+    link(From);
+tmlink(From) ->
+    link(From).
+tmpid({Pid, _Ref}) when pid(Pid) ->
+    Pid;
+tmpid(Pid) ->
+    Pid.
+
+%% Returns a list of participant transaction Tid's
+mnesia_down(Node) ->
+    %% Syncronously call needed in order to avoid
+    %% race with mnesia_tm's coordinator processes
+    %% that may restart and acquire new locks.
+    %% mnesia_monitor takes care of the sync
+    case whereis(?MODULE) of
+	undefined ->
+	    mnesia_monitor:mnesia_down(?MODULE, {Node, []});
+	Pid ->
+	    Pid ! {mnesia_down, Node}
+    end.
+
+prepare_checkpoint(Nodes, Cp) ->
+    rpc:multicall(Nodes, ?MODULE, prepare_checkpoint, [Cp]).
+
+prepare_checkpoint(Cp) ->
+    req({prepare_checkpoint,Cp}).
+
+block_tab(Tab) ->
+    req({block_tab, Tab}).
+
+unblock_tab(Tab) ->
+    req({unblock_tab, Tab}).
+
+doit_loop(#state{coordinators = Coordinators, participants = Participants, supervisor = Sup}
+	  = State) ->
+    receive
+	{_From, {async_dirty, Tid, Commit, Tab}} ->
+	    case lists:member(Tab, State#state.blocked_tabs) of
+		false ->
+		    do_async_dirty(Tid, Commit, Tab),
+		    doit_loop(State);
+		true ->
+		    Item = {async_dirty, Tid, Commit, Tab},
+		    State2 = State#state{dirty_queue = [Item | State#state.dirty_queue]},
+		    doit_loop(State2)
+	    end;
+
+	{From, {sync_dirty, Tid, Commit, Tab}} ->
+	    case lists:member(Tab, State#state.blocked_tabs) of
+		false ->
+		    do_sync_dirty(From, Tid, Commit, Tab),
+		    doit_loop(State);
+		true ->
+		    Item = {sync_dirty, From, Tid, Commit, Tab},
+		    State2 = State#state{dirty_queue = [Item | State#state.dirty_queue]},
+		    doit_loop(State2)
+	    end;
+
+	{From, start_outer} -> %% Create and associate ets_tab with Tid
+	    case catch ?ets_new_table(mnesia_trans_store, [bag, public]) of
+		{'EXIT', Reason} -> %% system limit
+		    Msg = "Cannot create an ets table for the "
+	                  "local transaction store",
+		    reply(From, {error, {system_limit, Msg, Reason}}, State);
+		Etab ->
+		    tmlink(From),
+		    C = mnesia_recover:incr_trans_tid_serial(),
+		    ?ets_insert(Etab, {nodes, node()}),
+		    Tid = #tid{pid = tmpid(From), counter = C},
+		    A2 = [{Tid , [Etab]} | Coordinators],
+		    S2 = State#state{coordinators = A2},
+		    reply(From, {new_tid, Tid, Etab}, S2)
+	    end;
+
+	{From, {ask_commit, Protocol, Tid, Commit, DiscNs, RamNs}} ->
+	    ?eval_debug_fun({?MODULE, doit_ask_commit},
+			    [{tid, Tid}, {prot, Protocol}]),
+	    mnesia_checkpoint:tm_enter_pending(Tid, DiscNs, RamNs),
+	    Pid =
+		case Protocol of
+		    asym_trans when node(Tid#tid.pid) /= node() ->
+			Args = [tmpid(From), Tid, Commit, DiscNs, RamNs],
+			spawn_link(?MODULE, commit_participant, Args);
+		    _ when node(Tid#tid.pid) /= node() -> %% *_sym_trans
+			reply(From, {vote_yes, Tid}),
+			nopid
+		end,
+	    P = #participant{tid = Tid,
+			     pid = Pid,
+			     commit = Commit,
+			     disc_nodes = DiscNs,
+			     ram_nodes = RamNs,
+			     protocol = Protocol},
+	    State2 = State#state{participants = [P | Participants]},
+	    doit_loop(State2);
+
+	{Tid, do_commit} ->
+	    case mnesia_lib:key_search_delete(Tid, #participant.tid, Participants) of
+		{none, _} ->
+		    verbose("Tried to commit a non participant transaction ~p~n",
+			    [Tid]),
+		    doit_loop(State);
+		{P, Participants2} ->
+		    ?eval_debug_fun({?MODULE, do_commit, pre},
+				    [{tid, Tid}, {participant, P}]),
+		    case P#participant.pid of
+			nopid ->
+			    Commit = P#participant.commit,
+			    Member = lists:member(node(), P#participant.disc_nodes),
+			    if Member == false ->
+				    ignore;
+			       P#participant.protocol == sym_trans ->
+				    mnesia_log:log(Commit);
+			       P#participant.protocol == sync_sym_trans ->
+				    mnesia_log:slog(Commit)
+			    end,
+			    mnesia_recover:note_decision(Tid, committed),
+			    do_commit(Tid, Commit),
+			    if
+				P#participant.protocol == sync_sym_trans ->
+				    Tid#tid.pid ! {?MODULE, node(), {committed, Tid}};
+				true ->
+				    ignore
+			    end,
+			    mnesia_locker:release_tid(Tid),
+			    transaction_terminated(Tid),
+			    ?eval_debug_fun({?MODULE, do_commit, post}, [{tid, Tid}, {pid, nopid}]),
+			    doit_loop(State#state{participants = Participants2});
+			Pid when pid(Pid) ->
+			    Pid ! {Tid, committed},
+			    ?eval_debug_fun({?MODULE, do_commit, post}, [{tid, Tid}, {pid, Pid}]),
+			    doit_loop(State)
+		    end
+	    end;
+
+	{Tid, simple_commit} ->
+	    mnesia_recover:note_decision(Tid, committed),
+	    mnesia_locker:release_tid(Tid),
+	    transaction_terminated(Tid),
+	    doit_loop(State);
+
+	{Tid, {do_abort, Reason}} ->
+	    ?eval_debug_fun({?MODULE, do_abort, pre}, [{tid, Tid}]),
+	    mnesia_locker:release_tid(Tid),
+	    case mnesia_lib:key_search_delete(Tid, #participant.tid, Participants) of
+		{none, _} ->
+		    verbose("Tried to abort a non participant transaction ~p: ~p~n",
+			    [Tid, Reason]),
+		    doit_loop(State);
+		{P, Participants2} ->
+		    case P#participant.pid of
+			nopid ->
+			    Commit = P#participant.commit,
+			    mnesia_recover:note_decision(Tid, aborted),
+			    do_abort(Tid, Commit),
+			    if
+				P#participant.protocol == sync_sym_trans ->
+				    Tid#tid.pid ! {?MODULE, node(), {aborted, Tid}};
+				true ->
+				    ignore
+			    end,
+			    transaction_terminated(Tid),
+			    ?eval_debug_fun({?MODULE, do_abort, post}, [{tid, Tid}, {pid, nopid}]),
+			    doit_loop(State#state{participants = Participants2});
+			Pid when pid(Pid) ->
+			    Pid ! {Tid, {do_abort, Reason}},
+			    ?eval_debug_fun({?MODULE, do_abort, post},
+					    [{tid, Tid}, {pid, Pid}]),
+			    doit_loop(State)
+		    end
+	    end;
+
+	{From, {add_store, Tid}} -> %% new store for nested  transaction
+	    case catch ?ets_new_table(mnesia_trans_store, [bag, public]) of
+		{'EXIT', Reason} -> %% system limit
+		    Msg = "Cannot create an ets table for a nested "
+                          "local transaction store",
+		    reply(From, {error, {system_limit, Msg, Reason}}, State);
+		Etab ->
+		    A2 = add_coord_store(Coordinators, Tid, Etab),
+		    reply(From, {new_store, Etab},
+			  State#state{coordinators = A2})
+	    end;
+
+	{From, {del_store, Tid, Current, Obsolete, PropagateStore}} ->
+	    opt_propagate_store(Current, Obsolete, PropagateStore),
+	    A2 = del_coord_store(Coordinators, Tid, Current, Obsolete),
+	    reply(From, store_erased, State#state{coordinators = A2});
+
+	{'EXIT', Pid, Reason} ->
+	    handle_exit(Pid, Reason, State);
+
+	{From, {restart, Tid, Store}} ->
+	    A2 = restore_stores(Coordinators, Tid, Store),
+	    ?ets_match_delete(Store, '_'),
+	    ?ets_insert(Store, {nodes, node()}),
+	    reply(From, {restarted, Tid}, State#state{coordinators = A2});
+
+	{delete_transaction, Tid} ->
+	    %% used to clear transactions which are committed
+	    %% in coordinator or participant processes
+	    case mnesia_lib:key_search_delete(Tid, #participant.tid, Participants) of
+		{none, _} ->
+		    case mnesia_lib:key_search_delete(Tid, 1, Coordinators) of
+			{none, _} ->
+			    verbose("** ERROR ** Tried to delete a non transaction ~p~n",
+				  [Tid]),
+			    doit_loop(State);
+			{{_Tid, Etabs}, A2} ->
+			    erase_ets_tabs(Etabs),
+			    transaction_terminated(Tid),
+			    doit_loop(State#state{coordinators = A2})
+		    end;
+		{_P, Participants2} ->
+		    transaction_terminated(Tid),
+		    State2 = State#state{participants = Participants2},
+		    doit_loop(State2)
+	    end;
+
+	{sync_trans_serial, Tid} ->
+	    %% Do the Lamport thing here
+	    mnesia_recover:sync_trans_tid_serial(Tid),
+	    doit_loop(State);
+
+	{From, info} ->
+	    reply(From, {info, Participants, Coordinators}, State);
+
+	{mnesia_down, N} ->
+	    verbose("Got mnesia_down from ~p, reconfiguring...~n", [N]),
+	    reconfigure_coordinators(N, Coordinators),
+
+	    Tids = [P#participant.tid || P <- Participants],
+	    reconfigure_participants(N, Participants),
+	    mnesia_monitor:mnesia_down(?MODULE, {N, Tids}),
+	    doit_loop(State);
+
+	{From, {unblock_me, Tab}} ->
+	    case lists:member(Tab, State#state.blocked_tabs) of
+		false ->
+		    verbose("Wrong dirty Op blocked on ~p ~p ~p",
+			    [node(), Tab, From]),
+		    reply(From, unblocked),
+		    doit_loop(State);
+		true ->
+		    Item = {Tab, unblock_me, From},
+		    State2 = State#state{dirty_queue = [Item | State#state.dirty_queue]},
+		    doit_loop(State2)
+	    end;
+
+	{From, {block_tab, Tab}} ->
+	    State2 = State#state{blocked_tabs = [Tab | State#state.blocked_tabs]},
+	    reply(From, ok, State2);
+
+	{From, {unblock_tab, Tab}} ->
+	    BlockedTabs2 = State#state.blocked_tabs -- [Tab],
+	    case lists:member(Tab, BlockedTabs2) of
+		false ->
+		    mnesia_controller:unblock_table(Tab),
+		    Queue = process_dirty_queue(Tab, State#state.dirty_queue),
+		    State2 = State#state{blocked_tabs = BlockedTabs2,
+					 dirty_queue = Queue},
+		    reply(From, ok, State2);
+		true ->
+		    State2 = State#state{blocked_tabs = BlockedTabs2},
+		    reply(From, ok, State2)
+	    end;
+
+	{From, {prepare_checkpoint, Cp}} ->
+	    Res = mnesia_checkpoint:tm_prepare(Cp),
+	    case Res of
+		{ok, _Name, IgnoreNew, _Node} ->
+		    prepare_pending_coordinators(Coordinators, IgnoreNew),
+		    prepare_pending_participants(Participants, IgnoreNew);
+		{error, _Reason} ->
+		    ignore
+	    end,
+	    reply(From, Res, State);
+
+	{system, From, Msg} ->
+	    dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
+	    sys:handle_system_msg(Msg, From, Sup, ?MODULE, [], State);
+
+	Msg ->
+	    verbose("** ERROR ** ~p got unexpected message: ~p~n", [?MODULE, Msg]),
+	    doit_loop(State)
+    end.
+
+do_sync_dirty(From, Tid, Commit, _Tab) ->
+    ?eval_debug_fun({?MODULE, sync_dirty, pre}, [{tid, Tid}]),
+    Res = (catch do_dirty(Tid, Commit)),
+    ?eval_debug_fun({?MODULE, sync_dirty, post}, [{tid, Tid}]),
+    From ! {?MODULE, node(), {dirty_res, Res}}.
+
+do_async_dirty(Tid, Commit, _Tab) ->
+    ?eval_debug_fun({?MODULE, async_dirty, pre}, [{tid, Tid}]),
+    catch do_dirty(Tid, Commit),
+    ?eval_debug_fun({?MODULE, async_dirty, post}, [{tid, Tid}]).
+
+%% Process items in fifo order
+process_dirty_queue(Tab, [Item | Queue]) ->
+    Queue2 = process_dirty_queue(Tab, Queue),
+    case Item of
+	{async_dirty, Tid, Commit, Tab} ->
+	    do_async_dirty(Tid, Commit, Tab),
+	    Queue2;
+	{sync_dirty, From, Tid, Commit, Tab} ->
+	    do_sync_dirty(From, Tid, Commit, Tab),
+	    Queue2;
+	{Tab, unblock_me, From} ->
+	    reply(From, unblocked),
+	    Queue2;
+	_ ->
+	    [Item | Queue2]
+    end;
+process_dirty_queue(_Tab, []) ->
+    [].
+
+prepare_pending_coordinators([{Tid, [Store | _Etabs]} | Coords], IgnoreNew) ->
+    case catch ?ets_lookup(Store, pending) of
+	[] ->
+	    prepare_pending_coordinators(Coords, IgnoreNew);
+	[Pending] ->
+	    case lists:member(Tid, IgnoreNew) of
+		false ->
+		    mnesia_checkpoint:tm_enter_pending(Pending);
+		true ->
+		    ignore
+	    end,
+	    prepare_pending_coordinators(Coords, IgnoreNew);
+	{'EXIT', _} ->
+	    prepare_pending_coordinators(Coords, IgnoreNew)
+    end;
+prepare_pending_coordinators([], _IgnoreNew) ->
+    ok.
+
+prepare_pending_participants([Part | Parts], IgnoreNew) ->
+    Tid = Part#participant.tid,
+    D = Part#participant.disc_nodes,
+    R = Part#participant.ram_nodes,
+    case lists:member(Tid, IgnoreNew) of
+	false ->
+	    mnesia_checkpoint:tm_enter_pending(Tid, D, R);
+	true ->
+	    ignore
+    end,
+    prepare_pending_participants(Parts, IgnoreNew);
+prepare_pending_participants([], _IgnoreNew) ->
+    ok.
+
+handle_exit(Pid, Reason, State) when node(Pid) /= node() ->
+    %% We got exit from a remote fool
+    dbg_out("~p got remote EXIT from unknown ~p~n",
+	    [?MODULE, {Pid, Reason}]),
+    doit_loop(State);
+
+handle_exit(Pid, _Reason, State) when Pid == State#state.supervisor ->
+    %% Our supervisor has died, time to stop
+    do_stop(State);
+
+handle_exit(Pid, Reason, State) ->
+    %% Check if it is a coordinator
+    case pid_search_delete(Pid, State#state.coordinators) of
+	{none, _} ->
+	    %% Check if it is a participant
+	    case mnesia_lib:key_search_delete(Pid, #participant.pid, State#state.participants) of
+		{none, _} ->
+		    %% We got exit from a local fool
+		    verbose("** ERROR ** ~p got local EXIT from unknown process: ~p~n",
+			    [?MODULE, {Pid, Reason}]),
+		    doit_loop(State);
+
+		{P, RestP} when record(P, participant) ->
+		    fatal("Participant ~p in transaction ~p died ~p~n",
+			  [P#participant.pid, P#participant.tid, Reason]),
+		    doit_loop(State#state{participants = RestP})
+	    end;
+
+	{{Tid, Etabs}, RestC} ->
+	    %% A local coordinator has died and
+	    %% we must determine the outcome of the
+	    %% transaction and tell mnesia_tm on the
+	    %% other nodes about it and then recover
+	    %% locally.
+	    recover_coordinator(Tid, Etabs),
+	    doit_loop(State#state{coordinators = RestC})
+    end.
+
+recover_coordinator(Tid, Etabs) ->
+    verbose("Coordinator ~p in transaction ~p died.~n", [Tid#tid.pid, Tid]),
+
+    Store = hd(Etabs),
+    CheckNodes = get_nodes(Store),
+    TellNodes = CheckNodes -- [node()],
+    case catch arrange(Tid, Store, async) of
+	{'EXIT', Reason} ->
+	    dbg_out("Recovery of coordinator ~p failed:~n", [Tid, Reason]),
+	    Protocol = asym_trans,
+	    tell_outcome(Tid, Protocol, node(), CheckNodes, TellNodes);
+	{_N, Prep} ->
+	    %% Tell the participants about the outcome
+	    Protocol = Prep#prep.protocol,
+	    Outcome = tell_outcome(Tid, Protocol, node(), CheckNodes, TellNodes),
+
+	    %% Recover locally
+	    CR = Prep#prep.records,
+	    {DiscNs, RamNs} = commit_nodes(CR, [], []),
+	    {value, Local} = lists:keysearch(node(), #commit.node, CR),
+
+	    ?eval_debug_fun({?MODULE, recover_coordinator, pre},
+			    [{tid, Tid}, {outcome, Outcome}, {prot, Protocol}]),
+	    recover_coordinator(Tid, Protocol, Outcome, Local, DiscNs, RamNs),
+	    ?eval_debug_fun({?MODULE, recover_coordinator, post},
+			    [{tid, Tid}, {outcome, Outcome}, {prot, Protocol}])
+
+    end,
+    erase_ets_tabs(Etabs),
+    transaction_terminated(Tid),
+    mnesia_locker:release_tid(Tid).
+
+recover_coordinator(Tid, sym_trans, committed, Local, _, _) ->
+    mnesia_recover:note_decision(Tid, committed),
+    do_dirty(Tid, Local);
+recover_coordinator(Tid, sym_trans, aborted, _Local, _, _) ->
+    mnesia_recover:note_decision(Tid, aborted);
+recover_coordinator(Tid, sync_sym_trans, committed, Local, _, _) ->
+    mnesia_recover:note_decision(Tid, committed),
+    do_dirty(Tid, Local);
+recover_coordinator(Tid, sync_sym_trans, aborted, _Local, _, _) ->
+    mnesia_recover:note_decision(Tid, aborted);
+
+recover_coordinator(Tid, asym_trans, committed, Local, DiscNs, RamNs) ->
+    D = #decision{tid = Tid, outcome = committed,
+		  disc_nodes = DiscNs, ram_nodes = RamNs},
+    mnesia_recover:log_decision(D),
+    do_commit(Tid, Local);
+recover_coordinator(Tid, asym_trans, aborted, Local, DiscNs, RamNs) ->
+    D = #decision{tid = Tid, outcome = aborted,
+		  disc_nodes = DiscNs, ram_nodes = RamNs},
+    mnesia_recover:log_decision(D),
+    do_abort(Tid, Local).
+
+restore_stores([{Tid, Etstabs} | Tail], Tid, Store) ->
+    Remaining  = lists:delete(Store, Etstabs),
+    erase_ets_tabs(Remaining),
+    [{Tid, [Store]} | Tail];
+restore_stores([H | T], Tid, Store) ->
+    [H | restore_stores(T, Tid, Store)].
+%% No NIL case on purpose
+
+add_coord_store([{Tid, Stores} | Coordinators], Tid, Etab) ->
+    [{Tid, [Etab | Stores]} | Coordinators];
+add_coord_store([H | T], Tid, Etab) ->
+    [H | add_coord_store(T, Tid, Etab)].
+%% no NIL case on purpose
+
+del_coord_store([{Tid, Stores} | Coordinators], Tid, Current, Obsolete) ->
+    Rest =
+	case Stores of
+	    [Obsolete, Current | Tail] -> Tail;
+	    [Current, Obsolete | Tail] -> Tail
+	end,
+    ?ets_delete_table(Obsolete),
+    [{Tid, [Current | Rest]} | Coordinators];
+del_coord_store([H | T], Tid, Current, Obsolete) ->
+    [H | del_coord_store(T, Tid, Current, Obsolete)].
+%% no NIL case on purpose
+
+erase_ets_tabs([H | T]) ->
+    ?ets_delete_table(H),
+    erase_ets_tabs(T);
+erase_ets_tabs([]) ->
+    ok.
+
+%% Deletes a pid from a list of participants
+%% or from a list of coordinators and returns
+%% {none, All} or {Tr, Rest}
+pid_search_delete(Pid, Trs) ->
+    pid_search_delete(Pid, Trs, none, []).
+pid_search_delete(Pid, [Tr = {Tid, _Ts} | Trs], _Val, Ack) when Tid#tid.pid == Pid ->
+    pid_search_delete(Pid, Trs, Tr, Ack);
+pid_search_delete(Pid, [Tr | Trs], Val, Ack) ->
+    pid_search_delete(Pid, Trs, Val, [Tr | Ack]);
+
+pid_search_delete(_Pid, [], Val, Ack) ->
+    {Val, Ack}.
+
+%% When TM gets an EXIT sig, we must also check to see
+%% if the crashing transaction is in the Participant list
+%%
+%% search_participant_for_pid([Participant | Tail], Pid) ->
+%%     Tid = Participant#participant.tid,
+%%     if
+%% 	   Tid#tid.pid == Pid  ->
+%% 	       {coordinator, Participant};
+%% 	   Participant#participant.pid == Pid  ->
+%% 	       {participant, Participant};
+%% 	   true ->
+%% 	       search_participant_for_pid(Tail, Pid)
+%%     end;
+%% search_participant_for_pid([], _) ->
+%%     fool.
+
+transaction_terminated(Tid)  ->
+    mnesia_checkpoint:tm_exit_pending(Tid),
+    Pid = Tid#tid.pid,
+    if
+	node(Pid) == node() ->
+	    unlink(Pid);
+	true ->  %% Do the Lamport thing here
+	    mnesia_recover:sync_trans_tid_serial(Tid)
+    end.
+
+non_transaction(OldState, Fun, Args, ActivityKind, Mod) ->
+    Id = {ActivityKind, self()},
+    NewState = {Mod, Id, non_transaction},
+    put(mnesia_activity_state, NewState),
+    %% I Want something uniqe here, references are expensive
+    Ref = mNeSia_nOn_TrAnSacTioN,
+    RefRes = (catch {Ref, apply(Fun, Args)}),
+    case OldState of
+	undefined -> erase(mnesia_activity_state);
+	_ -> put(mnesia_activity_state, OldState)
+    end,
+    case RefRes of
+	{Ref, Res} ->
+	    case Res of
+		{'EXIT', Reason} -> exit(Reason);
+		{aborted, Reason} -> mnesia:abort(Reason);
+		_ -> Res
+	    end;
+	{'EXIT', Reason} ->
+	    exit(Reason);
+	Throw ->
+	    throw(Throw)
+    end.
+
+transaction(OldTidTs, Fun, Args, Retries, Mod, Type) ->
+    Factor = 1,
+    case OldTidTs of
+	undefined -> % Outer
+	    execute_outer(Mod, Fun, Args, Factor, Retries, Type);
+	{_OldMod, Tid, Ts} ->  % Nested
+	    execute_inner(Mod, Tid, Ts, Fun, Args, Factor, Retries, Type);
+	_ -> % Bad nesting
+	    {aborted, nested_transaction}
+    end.
+
+execute_outer(Mod, Fun, Args, Factor, Retries, Type) ->
+    case req(start_outer) of
+	{error, Reason} ->
+	    {aborted, Reason};
+	{new_tid, Tid, Store} ->
+	    Ts = #tidstore{store = Store},
+	    NewTidTs = {Mod, Tid, Ts},
+	    put(mnesia_activity_state, NewTidTs),
+	    execute_transaction(Fun, Args, Factor, Retries, Type)
+    end.
+
+execute_inner(Mod, Tid, Ts, Fun, Args, Factor, Retries, Type) ->
+    case req({add_store, Tid}) of
+	{error, Reason} ->
+	    {aborted, Reason};
+	{new_store, Ets} ->
+	    copy_ets(Ts#tidstore.store, Ets),
+	    Up = [Ts#tidstore.store | Ts#tidstore.up_stores],
+	    NewTs = Ts#tidstore{level = 1 + Ts#tidstore.level,
+				store = Ets,
+				up_stores = Up},
+	    NewTidTs = {Mod, Tid, NewTs},
+	    put(mnesia_activity_state, NewTidTs),
+	    execute_transaction(Fun, Args, Factor, Retries, Type)
+    end.
+
+copy_ets(From, To) ->
+    do_copy_ets(?ets_first(From), From, To).
+do_copy_ets('$end_of_table', _,_) ->
+    ok;
+do_copy_ets(K, From, To) ->
+    Objs = ?ets_lookup(From, K),
+    insert_objs(Objs, To),
+    do_copy_ets(?ets_next(From, K), From, To).
+
+insert_objs([H|T], Tab) ->
+    ?ets_insert(Tab, H),
+    insert_objs(T, Tab);
+insert_objs([], _Tab) ->
+    ok.
+
+execute_transaction(Fun, Args, Factor, Retries, Type) ->
+    case catch apply_fun(Fun, Args, Type) of
+	{'EXIT', Reason} ->
+	    check_exit(Fun, Args, Factor, Retries, Reason, Type);
+	{'atomic', Value} ->
+	    mnesia_lib:incr_counter(trans_commits),
+	    erase(mnesia_activity_state),
+	    %% no need to clear locks, already done by commit ...
+	    %% Flush any un processed mnesia_down messages we might have
+	    flush_downs(),
+	    {'atomic', Value};
+	{nested_atomic, Value} ->
+	    mnesia_lib:incr_counter(trans_commits),
+	    {'atomic', Value};
+	Value -> %% User called throw
+	    Reason = {aborted, {throw, Value}},
+	    return_abort(Fun, Args, Reason)
+    end.
+
+apply_fun(Fun, Args, Type) ->
+    Result = apply(Fun, Args),
+    case t_commit(Type) of
+	do_commit ->
+            {'atomic', Result};
+        do_commit_nested ->
+            {nested_atomic, Result};
+        {do_abort, {aborted, Reason}} ->
+            {'EXIT', {aborted, Reason}};
+        {do_abort, Reason} ->
+            {'EXIT', {aborted, Reason}}
+    end.
+
+check_exit(Fun, Args, Factor, Retries, Reason, Type) ->
+    case Reason of
+	{aborted, C} when record(C, cyclic) ->
+	    maybe_restart(Fun, Args, Factor, Retries, Type, C);
+	{aborted, {node_not_running, N}} ->
+	    maybe_restart(Fun, Args, Factor, Retries, Type, {node_not_running, N});
+	{aborted, {bad_commit, N}} ->
+	    maybe_restart(Fun, Args, Factor, Retries, Type, {bad_commit, N});
+	_ ->
+	    return_abort(Fun, Args, Reason)
+    end.
+
+maybe_restart(Fun, Args, Factor, Retries, Type, Why) ->
+    {Mod, Tid, Ts} = get(mnesia_activity_state),
+    case try_again(Retries) of
+	yes when Ts#tidstore.level == 1 ->
+	    restart(Mod, Tid, Ts, Fun, Args, Factor, Retries, Type, Why);
+	yes ->
+	    return_abort(Fun, Args, Why);
+	no ->
+	    return_abort(Fun, Args, {aborted, nomore})
+    end.
+
+try_again(infinity) -> yes;
+try_again(X) when number(X) , X > 1 -> yes;
+try_again(_) -> no.
+
+%% We can only restart toplevel transactions.
+%% If a deadlock situation occurs in a nested transaction
+%% The whole thing including all nested transactions need to be
+%% restarted. The stack is thus popped by a consequtive series of
+%% exit({aborted, #cyclic{}}) calls
+
+restart(Mod, Tid, Ts, Fun, Args, Factor0, Retries0, Type, Why) ->
+    mnesia_lib:incr_counter(trans_restarts),
+    Retries = decr(Retries0),
+    case Why of
+	{bad_commit, _N} ->
+	    return_abort(Fun, Args, Why),
+	    Factor = 1,
+	    SleepTime = mnesia_lib:random_time(Factor, Tid#tid.counter),
+	    dbg_out("Restarting transaction ~w: in ~wms ~w~n", [Tid, SleepTime, Why]),
+	    timer:sleep(SleepTime),
+	    execute_outer(Mod, Fun, Args, Factor, Retries, Type);
+	{node_not_running, _N} ->   %% Avoids hanging in receive_release_tid_ack
+	    return_abort(Fun, Args, Why),
+	    Factor = 1,
+	    SleepTime = mnesia_lib:random_time(Factor, Tid#tid.counter),
+	    dbg_out("Restarting transaction ~w: in ~wms ~w~n", [Tid, SleepTime, Why]),
+	    timer:sleep(SleepTime),
+	    execute_outer(Mod, Fun, Args, Factor, Retries, Type);
+	_ ->
+	    SleepTime = mnesia_lib:random_time(Factor0, Tid#tid.counter),
+	    dbg_out("Restarting transaction ~w: in ~wms ~w~n", [Tid, SleepTime, Why]),
+
+	    if
+		Factor0 /= 10 ->
+		    ignore;
+		true ->
+		    %% Our serial may be much larger than other nodes ditto
+		    AllNodes = val({current, db_nodes}),
+		    verbose("Sync serial ~p~n", [Tid]),
+		    rpc:abcast(AllNodes, ?MODULE, {sync_trans_serial, Tid})
+	    end,
+	    intercept_friends(Tid, Ts),
+	    Store = Ts#tidstore.store,
+	    Nodes = get_nodes(Store),
+	    ?MODULE ! {self(), {restart, Tid, Store}},
+	    mnesia_locker:send_release_tid(Nodes, Tid),
+	    timer:sleep(SleepTime),
+	    mnesia_locker:receive_release_tid_acc(Nodes, Tid),
+	    case rec() of
+		{restarted, Tid} ->
+		    execute_transaction(Fun, Args, Factor0 + 1,
+					Retries, Type);
+		{error, Reason} ->
+		    mnesia:abort(Reason)
+	    end
+    end.
+
+decr(infinity) -> infinity;
+decr(X) when integer(X), X > 1 -> X - 1;
+decr(_X) -> 0.
+
+return_abort(Fun, Args, Reason)  ->
+    {Mod, Tid, Ts} = get(mnesia_activity_state),
+    OldStore = Ts#tidstore.store,
+    Nodes = get_nodes(OldStore),
+    intercept_friends(Tid, Ts),
+    catch mnesia_lib:incr_counter(trans_failures),
+    Level = Ts#tidstore.level,
+    if
+	Level == 1 ->
+	    mnesia_locker:async_release_tid(Nodes, Tid),
+	    ?MODULE ! {delete_transaction, Tid},
+	    erase(mnesia_activity_state),
+	    dbg_out("Transaction ~p calling ~p with ~p, failed ~p~n",
+		    [Tid, Fun, Args, Reason]),
+	    flush_downs(),
+	    {aborted, mnesia_lib:fix_error(Reason)};
+	true ->
+	    %% Nested transaction
+	    [NewStore | Tail] = Ts#tidstore.up_stores,
+	    req({del_store, Tid, NewStore, OldStore, true}),
+	    Ts2 = Ts#tidstore{store = NewStore,
+			      up_stores = Tail,
+			      level = Level - 1},
+	    NewTidTs = {Mod, Tid, Ts2},
+	    put(mnesia_activity_state, NewTidTs),
+	    case Reason of
+		#cyclic{} ->
+		    exit({aborted, Reason});
+		{node_not_running, _N} ->
+		    exit({aborted, Reason});
+		{bad_commit, _N}->
+		    exit({aborted, Reason});
+		_ ->
+		    {aborted, mnesia_lib:fix_error(Reason)}
+	    end
+    end.
+
+flush_downs() ->
+    receive
+	{?MODULE, _, _} -> flush_downs(); % Votes
+	{mnesia_down, _} -> flush_downs()
+    after 0 -> flushed
+    end.
+
+put_activity_id(undefined) ->
+    erase_activity_id();
+put_activity_id({Mod, Tid, Ts}) when record(Tid, tid), record(Ts, tidstore) ->
+    flush_downs(),
+    Store = Ts#tidstore.store,
+    ?ets_insert(Store, {friends, self()}),
+    NewTidTs = {Mod, Tid, Ts},
+    put(mnesia_activity_state, NewTidTs);
+put_activity_id(SimpleState) ->
+    put(mnesia_activity_state, SimpleState).
+
+erase_activity_id() ->
+    flush_downs(),
+    erase(mnesia_activity_state).
+
+get_nodes(Store) ->
+    case catch ?ets_lookup_element(Store, nodes, 2) of
+	{'EXIT', _} -> [node()];
+	Nodes -> Nodes
+    end.
+
+get_friends(Store) ->
+    case catch ?ets_lookup_element(Store, friends, 2) of
+	{'EXIT', _} -> [];
+	Friends -> Friends
+    end.
+
+opt_propagate_store(_Current, _Obsolete, false) ->
+    ok;
+opt_propagate_store(Current, Obsolete, true) ->
+    propagate_store(Current, nodes, get_nodes(Obsolete)),
+    propagate_store(Current, friends, get_friends(Obsolete)).
+
+propagate_store(Store, Var, [Val | Vals]) ->
+    ?ets_insert(Store, {Var, Val}),
+    propagate_store(Store, Var, Vals);
+propagate_store(_Store, _Var, []) ->
+    ok.
+
+%% Tell all processes that are cooperating with the current transaction
+intercept_friends(_Tid, Ts) ->
+    Friends = get_friends(Ts#tidstore.store),
+    Message = {activity_ended, undefined, self()},
+    intercept_best_friend(Friends, Message).
+
+intercept_best_friend([], _Message) ->
+    ok;
+intercept_best_friend([Pid | _], Message) ->
+    Pid ! Message,
+    wait_for_best_friend(Pid, 0).
+
+wait_for_best_friend(Pid, Timeout) ->
+    receive
+	{'EXIT', Pid, _} -> ok;
+	{activity_ended, _, Pid} -> ok
+    after Timeout ->
+	    case my_process_is_alive(Pid) of
+		true -> wait_for_best_friend(Pid, 1000);
+		false -> ok
+	    end
+    end.
+
+my_process_is_alive(Pid) ->
+    case catch erlang:is_process_alive(Pid) of % New BIF in R5
+	true ->
+	    true;
+	false ->
+	    false;
+	{'EXIT', _} -> % Pre R5 backward compatibility
+	    case process_info(Pid, message_queue_len) of
+		undefined -> false;
+		_ -> true
+	    end
+    end.
+
+dirty(Protocol, Item) ->
+    {{Tab, Key}, _Val, _Op} = Item,
+    Tid = {dirty, self()},
+    Prep = prepare_items(Tid, Tab, Key, [Item], #prep{protocol= Protocol}),
+    CR =  Prep#prep.records,
+    case Protocol of
+	async_dirty ->
+	    %% Send commit records to the other involved nodes,
+	    %% but do only wait for one node to complete.
+	    %% Preferrably, the local node if possible.
+
+	    ReadNode = val({Tab, where_to_read}),
+	    {WaitFor, FirstRes} = async_send_dirty(Tid, CR, Tab, ReadNode),
+	    rec_dirty(WaitFor, FirstRes);
+
+	sync_dirty ->
+	    %% Send commit records to the other involved nodes,
+	    %% and wait for all nodes to complete
+	    {WaitFor, FirstRes} = sync_send_dirty(Tid, CR, Tab, []),
+	    rec_dirty(WaitFor, FirstRes);
+	_ ->
+	    mnesia:abort({bad_activity, Protocol})
+    end.
+
+%% This is the commit function, The first thing it does,
+%% is to find out which nodes that have been participating
+%% in this particular transaction, all of the mnesia_locker:lock*
+%% functions insert the names of the nodes where it aquires locks
+%% into the local shadow Store
+%% This function exacutes in the context of the user process
+t_commit(Type) ->
+    {Mod, Tid, Ts} = get(mnesia_activity_state),
+    Store = Ts#tidstore.store,
+    if
+	Ts#tidstore.level == 1 ->
+	    intercept_friends(Tid, Ts),
+	    %% N is number of updates
+	    case arrange(Tid, Store, Type) of
+		{N, Prep} when N > 0 ->
+		    multi_commit(Prep#prep.protocol,
+				 Tid, Prep#prep.records, Store);
+		{0, Prep} ->
+		    multi_commit(read_only, Tid, Prep#prep.records, Store)
+	    end;
+	true ->
+	    %% nested commit
+	    Level = Ts#tidstore.level,
+	    [Obsolete | Tail] = Ts#tidstore.up_stores,
+	    req({del_store, Tid, Store, Obsolete, false}),
+	    NewTs = Ts#tidstore{store = Store,
+				up_stores = Tail,
+				level = Level - 1},
+	    NewTidTs = {Mod, Tid, NewTs},
+	    put(mnesia_activity_state, NewTidTs),
+	    do_commit_nested
+    end.
+
+%% This function arranges for all objects we shall write in S to be
+%% in a list of {Node, CommitRecord}
+%% Important function for the performance of mnesia.
+
+arrange(Tid, Store, Type) ->
+    %% The local node is always included
+    Nodes = get_nodes(Store),
+    Recs = prep_recs(Nodes, []),
+    Key = ?ets_first(Store),
+    N = 0,
+    Prep =
+	case Type of
+	    async -> #prep{protocol = sym_trans, records = Recs};
+	    sync -> #prep{protocol = sync_sym_trans, records = Recs}
+	end,
+    case catch do_arrange(Tid, Store, Key, Prep, N) of
+	{'EXIT', Reason} ->
+	    dbg_out("do_arrange failed ~p ~p~n", [Reason, Tid]),
+	    case Reason of
+		{aborted, R} ->
+		    mnesia:abort(R);
+		_ ->
+		    mnesia:abort(Reason)
+	    end;
+	{New, Prepared} ->
+	    {New, Prepared#prep{records = reverse(Prepared#prep.records)}}
+    end.
+
+reverse([]) ->
+    [];
+reverse([H|R]) when record(H, commit) ->
+    [
+     H#commit{
+       ram_copies       =  lists:reverse(H#commit.ram_copies),
+       disc_copies      =  lists:reverse(H#commit.disc_copies),
+       disc_only_copies =  lists:reverse(H#commit.disc_only_copies),
+       snmp             = lists:reverse(H#commit.snmp)
+      }
+     | reverse(R)].
+
+prep_recs([N | Nodes], Recs) ->
+    prep_recs(Nodes, [#commit{decision = presume_commit, node = N} | Recs]);
+prep_recs([], Recs) ->
+    Recs.
+
+%% storage_types is a list of {Node, Storage} tuples
+%% where each tuple represents an active replica
+do_arrange(Tid, Store, {Tab, Key}, Prep, N) ->
+    Oid = {Tab, Key},
+    Items = ?ets_lookup(Store, Oid), %% Store is a bag
+    P2 = prepare_items(Tid, Tab, Key, Items, Prep),
+    do_arrange(Tid, Store, ?ets_next(Store, Oid), P2, N + 1);
+do_arrange(Tid, Store, SchemaKey, Prep, N) when SchemaKey == op ->
+    Items = ?ets_lookup(Store, SchemaKey), %% Store is a bag
+    P2 = prepare_schema_items(Tid, Items, Prep),
+    do_arrange(Tid, Store, ?ets_next(Store, SchemaKey), P2, N + 1);
+do_arrange(Tid, Store, RestoreKey, Prep, N) when RestoreKey == restore_op ->
+    [{restore_op, R}] = ?ets_lookup(Store, RestoreKey),
+    Fun = fun({Tab, Key}, CommitRecs, _RecName, Where, Snmp) ->
+		  Item = [{{Tab, Key}, {Tab, Key}, delete}],
+		  do_prepare_items(Tid, Tab, Key, Where, Snmp, Item, CommitRecs);
+	     (BupRec, CommitRecs, RecName, Where, Snmp) ->
+		  Tab = element(1, BupRec),
+		  Key = element(2, BupRec),
+		  Item =
+		      if
+			  Tab == RecName ->
+			      [{{Tab, Key}, BupRec, write}];
+			  true ->
+			      BupRec2 = setelement(1, BupRec, RecName),
+			      [{{Tab, Key}, BupRec2, write}]
+		      end,
+		  do_prepare_items(Tid, Tab, Key, Where, Snmp, Item, CommitRecs)
+	  end,
+    Recs2 = mnesia_schema:arrange_restore(R, Fun, Prep#prep.records),
+    P2 = Prep#prep{protocol = asym_trans, records = Recs2},
+    do_arrange(Tid, Store, ?ets_next(Store, RestoreKey), P2, N + 1);
+do_arrange(_Tid, _Store, '$end_of_table', Prep, N) ->
+    {N, Prep};
+do_arrange(Tid, Store, IgnoredKey, Prep, N) -> %% locks, nodes ... local atoms...
+    do_arrange(Tid, Store, ?ets_next(Store, IgnoredKey), Prep, N).
+
+%% Returns a prep record  with all items in reverse order
+prepare_schema_items(Tid, Items, Prep) ->
+    Types = [{N, schema_ops} || N <- val({current, db_nodes})],
+    Recs = prepare_nodes(Tid, Types, Items, Prep#prep.records, schema),
+    Prep#prep{protocol = asym_trans, records = Recs}.
+
+%% Returns a prep record with all items in reverse order
+prepare_items(Tid, Tab, Key, Items, Prep) when Prep#prep.prev_tab == Tab ->
+    Types = Prep#prep.prev_types,
+    Snmp = Prep#prep.prev_snmp,
+    Recs = Prep#prep.records,
+    Recs2 = do_prepare_items(Tid, Tab, Key, Types, Snmp, Items, Recs),
+    Prep#prep{records = Recs2};
+
+prepare_items(Tid, Tab, Key, Items, Prep) ->
+    Types = val({Tab, where_to_commit}),
+    case Types of
+	[] -> mnesia:abort({no_exists, Tab});
+	{blocked, _} ->
+	    unblocked = req({unblock_me, Tab}),
+	    prepare_items(Tid, Tab, Key, Items, Prep);
+	_ ->
+	    Snmp = val({Tab, snmp}),
+	    Recs2 = do_prepare_items(Tid, Tab, Key, Types,
+				     Snmp, Items, Prep#prep.records),
+	    Prep2 = Prep#prep{records = Recs2, prev_tab = Tab,
+			      prev_types = Types, prev_snmp = Snmp},
+	    check_prep(Prep2, Types)
+    end.
+
+do_prepare_items(Tid, Tab, Key, Types, Snmp, Items, Recs) ->
+    Recs2 = prepare_snmp(Tid, Tab, Key, Types, Snmp, Items, Recs), % May exit
+    prepare_nodes(Tid, Types, Items, Recs2, normal).
+
+prepare_snmp(Tab, Key, Items) ->
+    case val({Tab, snmp}) of
+	[] ->
+	    [];
+	Ustruct when Key /= '_' ->
+	    {_Oid, _Val, Op} = hd(Items),
+	    %% Still making snmp oid (not used) because we want to catch errors here
+	    %% And also it keeps backwards comp. with old nodes.
+	    SnmpOid = mnesia_snmp_hook:key_to_oid(Tab, Key, Ustruct), % May exit
+	    [{Op, Tab, Key, SnmpOid}];
+	_ ->
+	    [{clear_table, Tab}]
+    end.
+
+prepare_snmp(_Tid, _Tab, _Key, _Types, [], _Items, Recs) ->
+    Recs;
+
+prepare_snmp(Tid, Tab, Key, Types, Us, Items, Recs) ->
+    if Key /= '_' ->
+	    {_Oid, _Val, Op} = hd(Items),
+	    SnmpOid = mnesia_snmp_hook:key_to_oid(Tab, Key, Us), % May exit
+	    prepare_nodes(Tid, Types, [{Op, Tab, Key, SnmpOid}], Recs, snmp);
+       Key == '_' ->
+	    prepare_nodes(Tid, Types, [{clear_table, Tab}], Recs, snmp)
+    end.
+
+check_prep(Prep, Types) when Prep#prep.types == Types ->
+    Prep;
+check_prep(Prep, Types) when Prep#prep.types == undefined ->
+    Prep#prep{types = Types};
+check_prep(Prep, _Types) ->
+    Prep#prep{protocol = asym_trans}.
+
+%% Returns a list of commit records
+prepare_nodes(Tid, [{Node, Storage} | Rest], Items, C, Kind) ->
+    {Rec, C2} = pick_node(Tid, Node, C, []),
+    Rec2 = prepare_node(Node, Storage, Items, Rec, Kind),
+    [Rec2 | prepare_nodes(Tid, Rest, Items, C2, Kind)];
+prepare_nodes(_Tid, [], _Items, CommitRecords, _Kind) ->
+    CommitRecords.
+
+pick_node(Tid, Node, [Rec | Rest], Done) ->
+    if
+	Rec#commit.node == Node ->
+	    {Rec, Done ++ Rest};
+	true ->
+	    pick_node(Tid, Node, Rest, [Rec | Done])
+    end;
+pick_node(_Tid, Node, [], Done) ->
+    {#commit{decision = presume_commit, node = Node}, Done}.
+
+prepare_node(Node, Storage, [Item | Items], Rec, Kind) when Kind == snmp ->
+    Rec2 = Rec#commit{snmp = [Item | Rec#commit.snmp]},
+    prepare_node(Node, Storage, Items, Rec2, Kind);
+prepare_node(Node, Storage, [Item | Items], Rec, Kind) when Kind /= schema ->
+    Rec2 =
+	case Storage of
+	    ram_copies ->
+		Rec#commit{ram_copies = [Item | Rec#commit.ram_copies]};
+	    disc_copies ->
+		Rec#commit{disc_copies = [Item | Rec#commit.disc_copies]};
+	    disc_only_copies ->
+		Rec#commit{disc_only_copies =
+			   [Item | Rec#commit.disc_only_copies]}
+	end,
+    prepare_node(Node, Storage, Items, Rec2, Kind);
+prepare_node(_Node, _Storage, Items, Rec, Kind)
+  when Kind == schema, Rec#commit.schema_ops == []  ->
+    Rec#commit{schema_ops = Items};
+prepare_node(_Node, _Storage, [], Rec, _Kind) ->
+    Rec.
+
+%% multi_commit((Protocol, Tid, CommitRecords, Store)
+%% Local work is always performed in users process
+multi_commit(read_only, Tid, CR, _Store) ->
+    %% This featherweight commit protocol is used when no
+    %% updates has been performed in the transaction.
+
+    {DiscNs, RamNs} = commit_nodes(CR, [], []),
+    Msg = {Tid, simple_commit},
+    rpc:abcast(DiscNs -- [node()], ?MODULE, Msg),
+    rpc:abcast(RamNs -- [node()], ?MODULE, Msg),
+    mnesia_recover:note_decision(Tid, committed),
+    mnesia_locker:release_tid(Tid),
+    ?MODULE ! {delete_transaction, Tid},
+    do_commit;
+
+multi_commit(sym_trans, Tid, CR, Store) ->
+    %% This lightweight commit protocol is used when all
+    %% the involved tables are replicated symetrically.
+    %% Their storage types must match on each node.
+    %%
+    %% 1  Ask the other involved nodes if they want to commit
+    %%    All involved nodes votes yes if they are up
+    %% 2a Somebody has voted no
+    %%    Tell all yes voters to do_abort
+    %% 2b Everybody has voted yes
+    %%    Tell everybody to do_commit. I.e. that they should
+    %%    prepare the commit, log the commit record and
+    %%    perform the updates.
+    %%
+    %%    The outcome is kept 3 minutes in the transient decision table.
+    %%
+    %% Recovery:
+    %%    If somebody dies before the coordinator has
+    %%    broadcasted do_commit, the transaction is aborted.
+    %%
+    %%    If a participant dies, the table load algorithm
+    %%    ensures that the contents of the involved tables
+    %%    are picked from another node.
+    %%
+    %%    If the coordinator dies, each participants checks
+    %%    the outcome with all the others. If all are uncertain
+    %%    about the outcome, the transaction is aborted. If
+    %%    somebody knows the outcome the others will follow.
+
+    {DiscNs, RamNs} = commit_nodes(CR, [], []),
+    Pending = mnesia_checkpoint:tm_enter_pending(Tid, DiscNs, RamNs),
+    ?ets_insert(Store, Pending),
+
+    {WaitFor, Local} = ask_commit(sym_trans, Tid, CR, DiscNs, RamNs),
+    {Outcome, []} = rec_all(WaitFor, Tid, do_commit, []),
+    ?eval_debug_fun({?MODULE, multi_commit_sym},
+		    [{tid, Tid}, {outcome, Outcome}]),
+    rpc:abcast(DiscNs -- [node()], ?MODULE, {Tid, Outcome}),
+    rpc:abcast(RamNs -- [node()], ?MODULE, {Tid, Outcome}),
+    case Outcome of
+	do_commit ->
+	    mnesia_recover:note_decision(Tid, committed),
+	    do_dirty(Tid, Local),
+	    mnesia_locker:release_tid(Tid),
+	    ?MODULE ! {delete_transaction, Tid};
+	{do_abort, _Reason} ->
+	    mnesia_recover:note_decision(Tid, aborted)
+    end,
+    ?eval_debug_fun({?MODULE, multi_commit_sym, post},
+		    [{tid, Tid}, {outcome, Outcome}]),
+    Outcome;
+
+multi_commit(sync_sym_trans, Tid, CR, Store) ->
+    %%   This protocol is the same as sym_trans except that it
+    %%   uses syncronized calls to disk_log and syncronized commits
+    %%   when several nodes are involved.
+
+    {DiscNs, RamNs} = commit_nodes(CR, [], []),
+    Pending = mnesia_checkpoint:tm_enter_pending(Tid, DiscNs, RamNs),
+    ?ets_insert(Store, Pending),
+
+    {WaitFor, Local} = ask_commit(sync_sym_trans, Tid, CR, DiscNs, RamNs),
+    {Outcome, []} = rec_all(WaitFor, Tid, do_commit, []),
+    ?eval_debug_fun({?MODULE, multi_commit_sym_sync},
+		    [{tid, Tid}, {outcome, Outcome}]),
+    rpc:abcast(DiscNs -- [node()], ?MODULE, {Tid, Outcome}),
+    rpc:abcast(RamNs -- [node()], ?MODULE, {Tid, Outcome}),
+    case Outcome of
+	do_commit ->
+	    mnesia_recover:note_decision(Tid, committed),
+	    mnesia_log:slog(Local),
+	    do_commit(Tid, Local),
+	    %% Just wait for completion result is ignore.
+	    rec_all(WaitFor, Tid, ignore, []),
+	    mnesia_locker:release_tid(Tid),
+	    ?MODULE ! {delete_transaction, Tid};
+	{do_abort, _Reason} ->
+	    mnesia_recover:note_decision(Tid, aborted)
+    end,
+    ?eval_debug_fun({?MODULE, multi_commit_sym, post},
+		    [{tid, Tid}, {outcome, Outcome}]),
+    Outcome;
+
+multi_commit(asym_trans, Tid, CR, Store) ->
+    %% This more expensive commit protocol is used when
+    %% table definitions are changed (schema transactions).
+    %% It is also used when the involved tables are
+    %% replicated asymetrically. If the storage type differs
+    %% on at least one node this protocol is used.
+    %%
+    %% 1 Ask the other involved nodes if they want to commit.
+    %%   All involved nodes prepares the commit, logs a presume_abort
+    %%   commit record and votes yes or no depending of the
+    %%   outcome of the prepare. The preparation is also performed
+    %%   by the coordinator.
+    %%
+    %% 2a Somebody has died or voted no
+    %%    Tell all yes voters to do_abort
+    %% 2b Everybody has voted yes
+    %%    Put a unclear marker in the log.
+    %%    Tell the others to pre_commit. I.e. that they should
+    %%    put a unclear marker in the log and reply
+    %%    acc_pre_commit when they are done.
+    %%
+    %% 3a Somebody died
+    %%    Tell the remaining participants to do_abort
+    %% 3b Everybody has replied acc_pre_commit
+    %%    Tell everybody to committed. I.e that they should
+    %%    put a committed marker in the log, perform the updates
+    %%    and reply done_commit when they are done. The coordinator
+    %%    must wait with putting his committed marker inte the log
+    %%    until the committed has been sent to all the others.
+    %%    Then he performs local commit before collecting replies.
+    %%
+    %% 4  Everybody has either died or replied done_commit
+    %%    Return to the caller.
+    %%
+    %% Recovery:
+    %%    If the coordinator dies, the participants (and
+    %%    the coordinator when he starts again) must do
+    %%    the following:
+    %%
+    %%    If we have no unclear marker in the log we may
+    %%    safely abort, since we know that nobody may have
+    %%    decided to commit yet.
+    %%
+    %%    If we have a committed marker in the log we may
+    %%    safely commit since we know that everybody else
+    %%    also will come to this conclusion.
+    %%
+    %%    If we have a unclear marker but no committed
+    %%    in the log we are uncertain about the real outcome
+    %%    of the transaction and must ask the others before
+    %%    we can decide what to do. If someone knows the
+    %%    outcome we will do the same. If nobody knows, we
+    %%    will wait for the remaining involved nodes to come
+    %%    up. When all involved nodes are up and uncertain,
+    %%    we decide to commit (first put a committed marker
+    %%    in the log, then do the updates).
+
+    D = #decision{tid = Tid, outcome = presume_abort},
+    {D2, CR2} = commit_decision(D, CR, [], []),
+    DiscNs = D2#decision.disc_nodes,
+    RamNs = D2#decision.ram_nodes,
+    Pending = mnesia_checkpoint:tm_enter_pending(Tid, DiscNs, RamNs),
+    ?ets_insert(Store, Pending),
+    {WaitFor, Local} = ask_commit(asym_trans, Tid, CR2, DiscNs, RamNs),
+    SchemaPrep = (catch mnesia_schema:prepare_commit(Tid, Local, {coord, WaitFor})),
+    {Votes, Pids} = rec_all(WaitFor, Tid, do_commit, []),
+
+    ?eval_debug_fun({?MODULE, multi_commit_asym_got_votes},
+		    [{tid, Tid}, {votes, Votes}]),
+    case Votes of
+	do_commit ->
+	    case SchemaPrep of
+		{_Modified, C, DumperMode} when record(C, commit) ->
+		    mnesia_log:log(C), % C is not a binary
+		    ?eval_debug_fun({?MODULE, multi_commit_asym_log_commit_rec},
+				    [{tid, Tid}]),
+
+		    D3 = C#commit.decision,
+		    D4 = D3#decision{outcome = unclear},
+		    mnesia_recover:log_decision(D4),
+		    ?eval_debug_fun({?MODULE, multi_commit_asym_log_commit_dec},
+				    [{tid, Tid}]),
+		    tell_participants(Pids, {Tid, pre_commit}),
+		    %% Now we are uncertain and we do not know
+		    %% if all participants have logged that
+		    %% they are uncertain or not
+		    rec_acc_pre_commit(Pids, Tid, Store, C,
+				       do_commit, DumperMode, [], []);
+		{'EXIT', Reason} ->
+		    %% The others have logged the commit
+		    %% record but they are not uncertain
+		    mnesia_recover:note_decision(Tid, aborted),
+		    ?eval_debug_fun({?MODULE, multi_commit_asym_prepare_exit},
+				    [{tid, Tid}]),
+		    tell_participants(Pids, {Tid, {do_abort, Reason}}),
+		    do_abort(Tid, Local),
+		    {do_abort, Reason}
+	    end;
+
+	{do_abort, Reason} ->
+	    %% The others have logged the commit
+	    %% record but they are not uncertain
+	    mnesia_recover:note_decision(Tid, aborted),
+	    ?eval_debug_fun({?MODULE, multi_commit_asym_do_abort}, [{tid, Tid}]),
+	    tell_participants(Pids, {Tid, {do_abort, Reason}}),
+	    do_abort(Tid, Local),
+	    {do_abort, Reason}
+    end.
+
+%% Returns do_commit or {do_abort, Reason}
+rec_acc_pre_commit([Pid | Tail], Tid, Store, Commit, Res, DumperMode,
+		   GoodPids, SchemaAckPids) ->
+    receive
+	{?MODULE, _, {acc_pre_commit, Tid, Pid, true}} ->
+	    rec_acc_pre_commit(Tail, Tid, Store, Commit, Res, DumperMode,
+			       [Pid | GoodPids], [Pid | SchemaAckPids]);
+
+	{?MODULE, _, {acc_pre_commit, Tid, Pid, false}} ->
+	    rec_acc_pre_commit(Tail, Tid, Store, Commit, Res, DumperMode,
+			       [Pid | GoodPids], SchemaAckPids);
+
+	{?MODULE, _, {acc_pre_commit, Tid, Pid}} ->
+	    %% Kept for backwards compatibility. Remove after Mnesia 4.x
+	    rec_acc_pre_commit(Tail, Tid, Store, Commit, Res, DumperMode,
+			       [Pid | GoodPids], [Pid | SchemaAckPids]);
+
+	{mnesia_down, Node} when Node == node(Pid) ->
+	    AbortRes = {do_abort, {bad_commit, Node}},
+	    rec_acc_pre_commit(Tail, Tid, Store, Commit, AbortRes, DumperMode,
+			       GoodPids, SchemaAckPids)
+    end;
+rec_acc_pre_commit([], Tid, Store, Commit, Res, DumperMode, GoodPids, SchemaAckPids) ->
+    D = Commit#commit.decision,
+    case Res of
+	do_commit ->
+	    %% Now everybody knows that the others
+	    %% has voted yes. We also know that
+	    %% everybody are uncertain.
+	    prepare_sync_schema_commit(Store, SchemaAckPids),
+	    tell_participants(GoodPids, {Tid, committed}),
+	    D2 = D#decision{outcome = committed},
+	    mnesia_recover:log_decision(D2),
+            ?eval_debug_fun({?MODULE, rec_acc_pre_commit_log_commit},
+			    [{tid, Tid}]),
+
+	    %% Now we have safely logged committed
+	    %% and we can recover without asking others
+	    do_commit(Tid, Commit, DumperMode),
+            ?eval_debug_fun({?MODULE, rec_acc_pre_commit_done_commit},
+			    [{tid, Tid}]),
+	    sync_schema_commit(Tid, Store, SchemaAckPids),
+	    mnesia_locker:release_tid(Tid),
+	    ?MODULE ! {delete_transaction, Tid};
+
+	{do_abort, Reason} ->
+	    tell_participants(GoodPids, {Tid, {do_abort, Reason}}),
+	    D2 = D#decision{outcome = aborted},
+	    mnesia_recover:log_decision(D2),
+            ?eval_debug_fun({?MODULE, rec_acc_pre_commit_log_abort},
+			    [{tid, Tid}]),
+	    do_abort(Tid, Commit),
+	    ?eval_debug_fun({?MODULE, rec_acc_pre_commit_done_abort},
+			    [{tid, Tid}])
+    end,
+    Res.
+
+%% Note all nodes in case of mnesia_down mgt
+prepare_sync_schema_commit(_Store, []) ->
+    ok;
+prepare_sync_schema_commit(Store, [Pid | Pids]) ->
+    ?ets_insert(Store, {waiting_for_commit_ack, node(Pid)}),
+    prepare_sync_schema_commit(Store, Pids).
+
+sync_schema_commit(_Tid, _Store, []) ->
+    ok;
+sync_schema_commit(Tid, Store, [Pid | Tail]) ->
+    receive
+	{?MODULE, _, {schema_commit, Tid, Pid}} ->
+	    ?ets_match_delete(Store, {waiting_for_commit_ack, node(Pid)}),
+	    sync_schema_commit(Tid, Store, Tail);
+
+	{mnesia_down, Node} when Node == node(Pid) ->
+	    ?ets_match_delete(Store, {waiting_for_commit_ack, Node}),
+	    sync_schema_commit(Tid, Store, Tail)
+    end.
+
+tell_participants([Pid | Pids], Msg) ->
+    Pid ! Msg,
+    tell_participants(Pids, Msg);
+tell_participants([], _Msg) ->
+    ok.
+
+%% No need for trapping exits. We are only linked
+%% to mnesia_tm and if it dies we should also die.
+%% The same goes for disk_log and dets.
+commit_participant(Coord, Tid, Bin, DiscNs, RamNs) when binary(Bin) ->
+    Commit = binary_to_term(Bin),
+    commit_participant(Coord, Tid, Bin, Commit, DiscNs, RamNs);
+commit_participant(Coord, Tid, C, DiscNs, RamNs) when record(C, commit) ->
+    commit_participant(Coord, Tid, C, C, DiscNs, RamNs).
+
+commit_participant(Coord, Tid, Bin, C0, DiscNs, _RamNs) ->
+    ?eval_debug_fun({?MODULE, commit_participant, pre}, [{tid, Tid}]),
+    case catch mnesia_schema:prepare_commit(Tid, C0, {part, Coord}) of
+	{Modified, C, DumperMode} when record(C, commit) ->
+	    %% If we can not find any local unclear decision
+	    %% we should presume abort at startup recovery
+	    case lists:member(node(), DiscNs) of
+		false ->
+		    ignore;
+		true ->
+		    case Modified of
+			false -> mnesia_log:log(Bin);
+			true  -> mnesia_log:log(C)
+		    end
+	    end,
+	    ?eval_debug_fun({?MODULE, commit_participant, vote_yes},
+			    [{tid, Tid}]),
+	    reply(Coord, {vote_yes, Tid, self()}),
+
+	    receive
+		{Tid, pre_commit} ->
+		    D = C#commit.decision,
+		    mnesia_recover:log_decision(D#decision{outcome = unclear}),
+		    ?eval_debug_fun({?MODULE, commit_participant, pre_commit},
+				    [{tid, Tid}]),
+		    Expect_schema_ack = C#commit.schema_ops /= [],
+		    reply(Coord, {acc_pre_commit, Tid, self(), Expect_schema_ack}),
+
+		    %% Now we are vulnerable for failures, since
+		    %% we cannot decide without asking others
+		    receive
+			{Tid, committed} ->
+			    mnesia_recover:log_decision(D#decision{outcome = committed}),
+			    ?eval_debug_fun({?MODULE, commit_participant, log_commit},
+					    [{tid, Tid}]),
+			    do_commit(Tid, C, DumperMode),
+			    case Expect_schema_ack of
+				false -> ignore;
+				true -> reply(Coord, {schema_commit, Tid, self()})
+			    end,
+			    ?eval_debug_fun({?MODULE, commit_participant, do_commit},
+					    [{tid, Tid}]);
+
+			{Tid, {do_abort, _Reason}} ->
+			    mnesia_recover:log_decision(D#decision{outcome = aborted}),
+			    ?eval_debug_fun({?MODULE, commit_participant, log_abort},
+					    [{tid, Tid}]),
+			    mnesia_schema:undo_prepare_commit(Tid, C),
+			    ?eval_debug_fun({?MODULE, commit_participant, undo_prepare},
+					    [{tid, Tid}]);
+
+			{'EXIT', _, _} ->
+			    mnesia_recover:log_decision(D#decision{outcome = aborted}),
+			    ?eval_debug_fun({?MODULE, commit_participant, exit_log_abort},
+					    [{tid, Tid}]),
+			    mnesia_schema:undo_prepare_commit(Tid, C),
+			    ?eval_debug_fun({?MODULE, commit_participant, exit_undo_prepare},
+					    [{tid, Tid}]);
+
+			Msg ->
+			    verbose("** ERROR ** commit_participant ~p, got unexpected msg: ~p~n",
+				  [Tid, Msg])
+		    end;
+		{Tid, {do_abort, _Reason}} ->
+		    mnesia_schema:undo_prepare_commit(Tid, C),
+		    ?eval_debug_fun({?MODULE, commit_participant, pre_commit_undo_prepare},
+				    [{tid, Tid}]);
+
+		{'EXIT', _, _} ->
+		    mnesia_schema:undo_prepare_commit(Tid, C),
+		    ?eval_debug_fun({?MODULE, commit_participant, pre_commit_undo_prepare}, [{tid, Tid}]);
+
+		Msg ->
+		    verbose("** ERROR ** commit_participant ~p, got unexpected msg: ~p~n",
+			  [Tid, Msg])
+	    end;
+
+	{'EXIT', Reason} ->
+	    ?eval_debug_fun({?MODULE, commit_participant, vote_no},
+			    [{tid, Tid}]),
+	    reply(Coord, {vote_no, Tid, Reason}),
+	    mnesia_schema:undo_prepare_commit(Tid, C0)
+    end,
+    mnesia_locker:release_tid(Tid),
+    ?MODULE ! {delete_transaction, Tid},
+    unlink(whereis(?MODULE)),
+    exit(normal).
+
+do_abort(Tid, Bin) when binary(Bin) ->
+    %% Possible optimization:
+    %% If we want we could pass arround a flag
+    %% that tells us whether the binary contains
+    %% schema ops or not. Only if the binary
+    %% contains schema ops there are meningful
+    %% unpack the binary and perform
+    %% mnesia_schema:undo_prepare_commit/1.
+    do_abort(Tid, binary_to_term(Bin));
+do_abort(Tid, Commit) ->
+    mnesia_schema:undo_prepare_commit(Tid, Commit),
+    Commit.
+
+do_dirty(Tid, Commit) when Commit#commit.schema_ops == [] ->
+    mnesia_log:log(Commit),
+    do_commit(Tid, Commit).
+
+%% do_commit(Tid, CommitRecord)
+do_commit(Tid, Bin) when binary(Bin) ->
+    do_commit(Tid, binary_to_term(Bin));
+do_commit(Tid, C) ->
+    do_commit(Tid, C, optional).
+do_commit(Tid, Bin, DumperMode) when binary(Bin) ->
+    do_commit(Tid, binary_to_term(Bin), DumperMode);
+do_commit(Tid, C, DumperMode) ->
+    mnesia_dumper:update(Tid, C#commit.schema_ops, DumperMode),
+    R  = do_snmp(Tid, C#commit.snmp),
+    R2 = do_update(Tid, ram_copies, C#commit.ram_copies, R),
+    R3 = do_update(Tid, disc_copies, C#commit.disc_copies, R2),
+    do_update(Tid, disc_only_copies, C#commit.disc_only_copies, R3).
+
+%% Update the items
+do_update(Tid, Storage, [Op | Ops], OldRes) ->
+    case catch do_update_op(Tid, Storage, Op) of
+	ok ->
+	    do_update(Tid, Storage, Ops, OldRes);
+	{'EXIT', Reason} ->
+	    %% This may only happen when we recently have
+	    %% deleted our local replica, changed storage_type
+	    %% or transformed table
+	    %% BUGBUG: Updates may be lost if storage_type is changed.
+	    %%         Determine actual storage type and try again.
+	    %% BUGBUG: Updates may be lost if table is transformed.
+
+	    verbose("do_update in ~w failed: ~p -> {'EXIT', ~p}~n",
+		    [Tid, Op, Reason]),
+	    do_update(Tid, Storage, Ops, OldRes);
+	NewRes ->
+	    do_update(Tid, Storage, Ops, NewRes)
+    end;
+do_update(_Tid, _Storage, [], Res) ->
+    Res.
+
+do_update_op(Tid, Storage, {{Tab, K}, Obj, write}) ->
+    commit_write(?catch_val({Tab, commit_work}), Tid,
+		 Tab, K, Obj, undefined),
+    mnesia_lib:db_put(Storage, Tab, Obj);
+
+do_update_op(Tid, Storage, {{Tab, K}, Val, delete}) ->
+    commit_delete(?catch_val({Tab, commit_work}), Tid, Tab, K, Val, undefined),
+    mnesia_lib:db_erase(Storage, Tab, K);
+
+do_update_op(Tid, Storage, {{Tab, K}, {RecName, Incr}, update_counter}) ->
+    {NewObj, OldObjs} =
+        case catch mnesia_lib:db_update_counter(Storage, Tab, K, Incr) of
+            NewVal when integer(NewVal), NewVal >= 0 ->
+                {{RecName, K, NewVal}, [{RecName, K, NewVal - Incr}]};
+            _ ->
+                Zero = {RecName, K, 0},
+                mnesia_lib:db_put(Storage, Tab, Zero),
+                {Zero, []}
+        end,
+    commit_update(?catch_val({Tab, commit_work}), Tid, Tab,
+		  K, NewObj, OldObjs),
+    element(3, NewObj);
+
+do_update_op(Tid, Storage, {{Tab, Key}, Obj, delete_object}) ->
+    commit_del_object(?catch_val({Tab, commit_work}),
+		      Tid, Tab, Key, Obj, undefined),
+    mnesia_lib:db_match_erase(Storage, Tab, Obj);
+
+do_update_op(Tid, Storage, {{Tab, Key}, Obj, clear_table}) ->
+    commit_clear(?catch_val({Tab, commit_work}), Tid, Tab, Key, Obj),
+    mnesia_lib:db_match_erase(Storage, Tab, Obj).
+
+commit_write([], _, _, _, _, _) -> ok;
+commit_write([{checkpoints, CpList}|R], Tid, Tab, K, Obj, Old) ->
+    mnesia_checkpoint:tm_retain(Tid, Tab, K, write, CpList),
+    commit_write(R, Tid, Tab, K, Obj, Old);
+commit_write([H|R], Tid, Tab, K, Obj, Old)
+  when element(1, H) == subscribers ->
+    mnesia_subscr:report_table_event(H, Tab, Tid, Obj, write, Old),
+    commit_write(R, Tid, Tab, K, Obj, Old);
+commit_write([H|R], Tid, Tab, K, Obj, Old)
+  when element(1, H) == index ->
+    mnesia_index:add_index(H, Tab, K, Obj, Old),
+    commit_write(R, Tid, Tab, K, Obj, Old).
+
+commit_update([], _, _, _, _, _) -> ok;
+commit_update([{checkpoints, CpList}|R], Tid, Tab, K, Obj, _) ->
+    Old = mnesia_checkpoint:tm_retain(Tid, Tab, K, write, CpList),
+    commit_update(R, Tid, Tab, K, Obj, Old);
+commit_update([H|R], Tid, Tab, K, Obj, Old)
+  when element(1, H) == subscribers ->
+    mnesia_subscr:report_table_event(H, Tab, Tid, Obj, write, Old),
+    commit_update(R, Tid, Tab, K, Obj, Old);
+commit_update([H|R], Tid, Tab, K, Obj, Old)
+  when element(1, H) == index ->
+    mnesia_index:add_index(H, Tab, K, Obj, Old),
+    commit_update(R, Tid, Tab, K, Obj, Old).
+
+commit_delete([], _, _, _, _, _) ->  ok;
+commit_delete([{checkpoints, CpList}|R], Tid, Tab, K, Obj, _) ->
+    Old = mnesia_checkpoint:tm_retain(Tid, Tab, K, delete, CpList),
+    commit_delete(R, Tid, Tab, K, Obj, Old);
+commit_delete([H|R], Tid, Tab, K, Obj, Old)
+  when element(1, H) == subscribers ->
+    mnesia_subscr:report_table_event(H, Tab, Tid, Obj, delete, Old),
+    commit_delete(R, Tid, Tab, K, Obj, Old);
+commit_delete([H|R], Tid, Tab, K, Obj, Old)
+  when element(1, H) == index ->
+    mnesia_index:delete_index(H, Tab, K),
+    commit_delete(R, Tid, Tab, K, Obj, Old).
+
+commit_del_object([], _, _, _, _, _) -> ok;
+commit_del_object([{checkpoints, CpList}|R], Tid, Tab, K, Obj, _) ->
+    Old = mnesia_checkpoint:tm_retain(Tid, Tab, K, delete_object, CpList),
+    commit_del_object(R, Tid, Tab, K, Obj, Old);
+commit_del_object([H|R], Tid, Tab, K, Obj, Old)
+  when element(1, H) == subscribers ->
+    mnesia_subscr:report_table_event(H, Tab, Tid, Obj, delete_object, Old),
+    commit_del_object(R, Tid, Tab, K, Obj, Old);
+commit_del_object([H|R], Tid, Tab, K, Obj, Old)
+  when element(1, H) == index ->
+    mnesia_index:del_object_index(H, Tab, K, Obj, Old),
+    commit_del_object(R, Tid, Tab, K, Obj, Old).
+
+commit_clear([], _, _, _, _) ->  ok;
+commit_clear([{checkpoints, CpList}|R], Tid, Tab, K, Obj) ->
+    mnesia_checkpoint:tm_retain(Tid, Tab, K, clear_table, CpList),
+    commit_clear(R, Tid, Tab, K, Obj);
+commit_clear([H|R], Tid, Tab, K, Obj)
+  when element(1, H) == subscribers ->
+    mnesia_subscr:report_table_event(H, Tab, Tid, Obj, clear_table, undefined),
+    commit_clear(R, Tid, Tab, K, Obj);
+commit_clear([H|R], Tid, Tab, K, Obj)
+  when element(1, H) == index ->
+    mnesia_index:clear_index(H, Tab, K, Obj),
+    commit_clear(R, Tid, Tab, K, Obj).
+
+do_snmp(_, []) ->   ok;
+do_snmp(Tid, [Head | Tail]) ->
+    case catch mnesia_snmp_hook:update(Head) of
+	{'EXIT', Reason} ->
+	    %% This should only happen when we recently have
+	    %% deleted our local replica or recently deattached
+	    %% the snmp table
+
+	    verbose("do_snmp in ~w failed: ~p -> {'EXIT', ~p}~n",
+		    [Tid, Head, Reason]);
+	ok ->
+	    ignore
+    end,
+    do_snmp(Tid, Tail).
+
+commit_nodes([C | Tail], AccD, AccR)
+        when C#commit.disc_copies == [],
+             C#commit.disc_only_copies  == [],
+             C#commit.schema_ops == [] ->
+    commit_nodes(Tail, AccD, [C#commit.node | AccR]);
+commit_nodes([C | Tail], AccD, AccR) ->
+    commit_nodes(Tail, [C#commit.node | AccD], AccR);
+commit_nodes([], AccD, AccR) ->
+    {AccD, AccR}.
+
+commit_decision(D, [C | Tail], AccD, AccR) ->
+    N = C#commit.node,
+    {D2, Tail2} =
+	case C#commit.schema_ops of
+	    [] when C#commit.disc_copies == [],
+		    C#commit.disc_only_copies  == [] ->
+		commit_decision(D, Tail, AccD, [N | AccR]);
+	    [] ->
+		commit_decision(D, Tail, [N | AccD], AccR);
+	    Ops ->
+		case ram_only_ops(N, Ops) of
+		    true ->
+			commit_decision(D, Tail, AccD, [N | AccR]);
+		    false ->
+			commit_decision(D, Tail, [N | AccD], AccR)
+		end
+	end,
+    {D2, [C#commit{decision = D2} | Tail2]};
+commit_decision(D, [], AccD, AccR) ->
+    {D#decision{disc_nodes = AccD, ram_nodes = AccR}, []}.
+
+ram_only_ops(N, [{op, change_table_copy_type, N, _FromS, _ToS, Cs} | _Ops ]) ->
+    case lists:member({name, schema}, Cs) of
+	true ->
+	    %% We always use disk if change type of the schema
+	    false;
+	false ->
+	    not lists:member(N, val({schema, disc_copies}))
+    end;
+
+ram_only_ops(N, _Ops) ->
+    not lists:member(N, val({schema, disc_copies})).
+
+%% Returns {WaitFor, Res}
+sync_send_dirty(Tid, [Head | Tail], Tab, WaitFor) ->
+    Node = Head#commit.node,
+    if
+	Node == node() ->
+	    {WF, _} = sync_send_dirty(Tid, Tail, Tab, WaitFor),
+	    Res =  do_dirty(Tid, Head),
+	    {WF, Res};
+	true ->
+	    {?MODULE, Node} ! {self(), {sync_dirty, Tid, Head, Tab}},
+	    sync_send_dirty(Tid, Tail, Tab, [Node | WaitFor])
+    end;
+sync_send_dirty(_Tid, [], _Tab, WaitFor) ->
+    {WaitFor, {'EXIT', {aborted, {node_not_running, WaitFor}}}}.
+
+%% Returns {WaitFor, Res}
+async_send_dirty(_Tid, _Nodes, Tab, nowhere) ->
+    {[], {'EXIT', {aborted, {no_exists, Tab}}}};
+async_send_dirty(Tid, Nodes, Tab, ReadNode) ->
+    async_send_dirty(Tid, Nodes, Tab, ReadNode, [], ok).
+
+async_send_dirty(Tid, [Head | Tail], Tab, ReadNode, WaitFor, Res) ->
+    Node = Head#commit.node,
+    if
+	ReadNode == Node, Node == node() ->
+	    NewRes =  do_dirty(Tid, Head),
+	    async_send_dirty(Tid, Tail, Tab, ReadNode, WaitFor, NewRes);
+	ReadNode == Node ->
+	    {?MODULE, Node} ! {self(), {sync_dirty, Tid, Head, Tab}},
+	    NewRes = {'EXIT', {aborted, {node_not_running, Node}}},
+	    async_send_dirty(Tid, Tail, Tab, ReadNode, [Node | WaitFor], NewRes);
+	true ->
+	    {?MODULE, Node} ! {self(), {async_dirty, Tid, Head, Tab}},
+	    async_send_dirty(Tid, Tail, Tab, ReadNode, WaitFor, Res)
+    end;
+async_send_dirty(_Tid, [], _Tab, _ReadNode, WaitFor, Res) ->
+    {WaitFor, Res}.
+
+rec_dirty([Node | Tail], Res) when Node /= node() ->
+    NewRes = get_dirty_reply(Node, Res),
+    rec_dirty(Tail, NewRes);
+rec_dirty([], Res) ->
+    Res.
+
+get_dirty_reply(Node, Res) ->
+    receive
+	{?MODULE, Node, {'EXIT', Reason}} ->
+	    {'EXIT', {aborted, {badarg, Reason}}};
+	{?MODULE, Node, {dirty_res, ok}} ->
+	    case Res of
+		{'EXIT', {aborted, {node_not_running, _Node}}} ->
+		    ok;
+		_ ->
+		    %% Prioritize bad results, but node_not_running
+		    Res
+	    end;
+	{?MODULE, Node, {dirty_res, Reply}} ->
+	    Reply;
+	{mnesia_down, Node} ->
+	    %% It's ok to ignore mnesia_down's
+	    %% since we will make the replicas
+	    %% consistent again when Node is started
+	    Res
+    after 1000 ->
+	    case lists:member(Node, val({current, db_nodes})) of
+		true ->
+		    get_dirty_reply(Node, Res);
+		false ->
+		    Res
+	    end
+    end.
+
+%% Assume that CommitRecord is no binary
+%% Return {Res, Pids}
+ask_commit(Protocol, Tid, CR, DiscNs, RamNs) ->
+    ask_commit(Protocol, Tid, CR, DiscNs, RamNs, [], no_local).
+
+ask_commit(Protocol, Tid, [Head | Tail], DiscNs, RamNs, WaitFor, Local) ->
+    Node = Head#commit.node,
+    if
+	Node == node() ->
+	    ask_commit(Protocol, Tid, Tail, DiscNs, RamNs, WaitFor, Head);
+	true ->
+	    Bin = opt_term_to_binary(Protocol, Head, DiscNs++RamNs),
+	    Msg = {ask_commit, Protocol, Tid, Bin, DiscNs, RamNs},
+	    {?MODULE, Node} ! {self(), Msg},
+	    ask_commit(Protocol, Tid, Tail, DiscNs, RamNs, [Node | WaitFor], Local)
+    end;
+ask_commit(_Protocol, _Tid, [], _DiscNs, _RamNs, WaitFor, Local) ->
+    {WaitFor, Local}.
+
+opt_term_to_binary(asym_trans, Head, Nodes) ->
+    opt_term_to_binary(Nodes, Head);
+opt_term_to_binary(_Protocol, Head, _Nodes) ->
+    Head.
+
+opt_term_to_binary([], Head) ->
+    term_to_binary(Head);
+opt_term_to_binary([H|R], Head) ->
+    case mnesia_monitor:needs_protocol_conversion(H) of
+	true -> Head;
+	false ->
+	    opt_term_to_binary(R, Head)
+    end.
+
+rec_all([Node | Tail], Tid, Res, Pids) ->
+    receive
+	{?MODULE, Node, {vote_yes, Tid}} ->
+	    rec_all(Tail, Tid, Res, Pids);
+	{?MODULE, Node, {vote_yes, Tid, Pid}} ->
+	    rec_all(Tail, Tid, Res, [Pid | Pids]);
+	{?MODULE, Node, {vote_no, Tid, Reason}} ->
+	    rec_all(Tail, Tid, {do_abort, Reason}, Pids);
+	{?MODULE, Node, {committed, Tid}} ->
+	    rec_all(Tail, Tid, Res, Pids);
+	{?MODULE, Node, {aborted, Tid}} ->
+	    rec_all(Tail, Tid, Res, Pids);
+
+	{mnesia_down, Node} ->
+	    rec_all(Tail, Tid, {do_abort, {bad_commit, Node}}, Pids)
+    end;
+rec_all([], _Tid, Res, Pids) ->
+    {Res, Pids}.
+
+get_transactions() ->
+    {info, Participant, Coordinator} = req(info),
+    lists:map(fun({Tid, _Tabs}) ->
+		      Status = tr_status(Tid,Participant),
+		      {Tid#tid.counter, Tid#tid.pid, Status}
+	      end,Coordinator).
+
+tr_status(Tid,Participant) ->
+    case lists:keymember(Tid, 1, Participant) of
+	true -> participant;
+	false  -> coordinator
+    end.
+
+get_info(Timeout) ->
+    case whereis(?MODULE) of
+	undefined ->
+	    {timeout, Timeout};
+	Pid ->
+	    Pid ! {self(), info},
+	    receive
+		{?MODULE, _, {info, Part, Coord}} ->
+		    {info, Part, Coord}
+	    after Timeout ->
+		    {timeout, Timeout}
+	    end
+    end.
+
+display_info(Stream, {timeout, T}) ->
+    io:format(Stream, "---> No info about coordinator and participant transactions, "
+	      "timeout ~p <--- ~n", [T]);
+
+display_info(Stream, {info, Part, Coord}) ->
+    io:format(Stream, "---> Participant transactions <--- ~n", []),
+    lists:foreach(fun(P) -> pr_participant(Stream, P) end, Part),
+    io:format(Stream, "---> Coordinator transactions <---~n", []),
+    lists:foreach(fun({Tid, _Tabs}) -> pr_tid(Stream, Tid) end, Coord).
+
+pr_participant(Stream, P) ->
+    Commit0 = P#participant.commit,
+    Commit =
+	if
+	    binary(Commit0) -> binary_to_term(Commit0);
+	    true -> Commit0
+	end,
+    pr_tid(Stream, P#participant.tid),
+    io:format(Stream, "with participant objects ~p~n", [Commit]).
+
+
+pr_tid(Stream, Tid) ->
+    io:format(Stream, "Tid: ~p (owned by ~p) ~n",
+	      [Tid#tid.counter, Tid#tid.pid]).
+
+info(Serial) ->
+    io:format( "Info about transaction with serial == ~p~n", [Serial]),
+    {info, Participant, Trs} = req(info),
+    search_pr_participant(Serial, Participant),
+    search_pr_coordinator(Serial, Trs).
+
+
+search_pr_coordinator(_S, []) -> no;
+search_pr_coordinator(S, [{Tid, _Ts}|Tail]) ->
+    case Tid#tid.counter of
+	S ->
+	    io:format( "Tid is coordinator, owner == \n", []),
+	    display_pid_info(Tid#tid.pid),
+	    search_pr_coordinator(S, Tail);
+	_ ->
+	    search_pr_coordinator(S, Tail)
+    end.
+
+search_pr_participant(_S, []) ->
+    false;
+search_pr_participant(S, [ P | Tail]) ->
+    Tid = P#participant.tid,
+    Commit0 = P#participant.commit,
+    if
+	Tid#tid.counter == S ->
+	    io:format( "Tid is participant to commit, owner == \n", []),
+	    Pid = Tid#tid.pid,
+	    display_pid_info(Pid),
+	    io:format( "Tid wants to write objects \n",[]),
+	    Commit =
+		if
+		    binary(Commit0) -> binary_to_term(Commit0);
+		    true -> Commit0
+		end,
+
+	    io:format("~p~n", [Commit]),
+	    search_pr_participant(S,Tail);  %% !!!!!
+	true ->
+	    search_pr_participant(S, Tail)
+    end.
+
+display_pid_info(Pid) ->
+    case rpc:pinfo(Pid) of
+	undefined ->
+	    io:format( "Dead process \n");
+	Info ->
+	    Call = fetch(initial_call, Info),
+	    Curr = case fetch(current_function, Info) of
+		       {Mod,F,Args} when list(Args) ->
+			   {Mod,F,length(Args)};
+		       Other ->
+			   Other
+		   end,
+	    Reds  = fetch(reductions, Info),
+	    LM = length(fetch(messages, Info)),
+	    pformat(io_lib:format("~p", [Pid]),
+		    io_lib:format("~p", [Call]),
+		    io_lib:format("~p", [Curr]), Reds, LM)
+    end.
+
+pformat(A1, A2, A3, A4, A5) ->
+    io:format( "~-12s ~-21s ~-21s ~9w ~4w~n", [A1,A2,A3,A4,A5]).
+
+fetch(Key, Info) ->
+    case lists:keysearch(Key, 1, Info) of
+	{value, {_, Val}} ->
+	    Val;
+	_ ->
+	    0
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%  reconfigure stuff comes here ......
+%%%%%%%%%%%%%%%%%%%%%
+
+reconfigure_coordinators(N, [{Tid, [Store | _]} | Coordinators]) ->
+    case mnesia_recover:outcome(Tid, unknown) of
+	committed ->
+	    WaitingNodes = ?ets_lookup(Store, waiting_for_commit_ack),
+	    case lists:keymember(N, 2, WaitingNodes) of
+		false ->
+		    ignore; % avoid spurious mnesia_down messages
+		true ->
+		    send_mnesia_down(Tid, Store, N)
+	    end;
+	aborted ->
+	    ignore; % avoid spurious mnesia_down messages
+	_ ->
+	    %% Tell the coordinator about the mnesia_down
+	    send_mnesia_down(Tid, Store, N)
+    end,
+    reconfigure_coordinators(N, Coordinators);
+reconfigure_coordinators(_N, []) ->
+    ok.
+
+send_mnesia_down(Tid, Store, Node) ->
+    Msg = {mnesia_down, Node},
+    send_to_pids([Tid#tid.pid | get_friends(Store)], Msg).
+
+send_to_pids([Pid | Pids], Msg) ->
+    Pid ! Msg,
+    send_to_pids(Pids, Msg);
+send_to_pids([], _Msg) ->
+    ok.
+
+reconfigure_participants(N, [P | Tail]) ->
+    case lists:member(N, P#participant.disc_nodes) or
+	 lists:member(N, P#participant.ram_nodes) of
+	false ->
+	    %% Ignore, since we are not a participant
+	    %% in the transaction.
+	    reconfigure_participants(N, Tail);
+
+	true ->
+	    %% We are on a participant node, lets
+	    %% check if the dead one was a
+	    %% participant or a coordinator.
+	    Tid  = P#participant.tid,
+	    if
+		node(Tid#tid.pid) /= N ->
+		    %% Another participant node died. Ignore.
+		    reconfigure_participants(N, Tail);
+
+		true ->
+		    %% The coordinator node has died and
+		    %% we must determine the outcome of the
+		    %% transaction and tell mnesia_tm on all
+		    %% nodes (including the local node) about it
+		    verbose("Coordinator ~p in transaction ~p died~n",
+			    [Tid#tid.pid, Tid]),
+
+		    Nodes = P#participant.disc_nodes ++
+			    P#participant.ram_nodes,
+		    AliveNodes = Nodes  -- [N],
+		    Protocol =  P#participant.protocol,
+		    tell_outcome(Tid, Protocol, N, AliveNodes, AliveNodes),
+		    reconfigure_participants(N, Tail)
+	    end
+    end;
+reconfigure_participants(_, []) ->
+    [].
+
+%% We need to determine the outcome of the transaction and
+%% tell mnesia_tm on all involved nodes (including the local node)
+%% about the outcome.
+tell_outcome(Tid, Protocol, Node, CheckNodes, TellNodes) ->
+    Outcome = mnesia_recover:what_happened(Tid, Protocol, CheckNodes),
+    case Outcome of
+	aborted ->
+	    rpc:abcast(TellNodes, ?MODULE, {Tid,{do_abort, {mnesia_down, Node}}});
+	committed ->
+	    rpc:abcast(TellNodes, ?MODULE, {Tid, do_commit})
+    end,
+    Outcome.
+
+do_stop(#state{coordinators = Coordinators}) ->
+    Msg = {mnesia_down, node()},
+    lists:foreach(fun({Tid, _}) -> Tid#tid.pid ! Msg end, Coordinators),
+    mnesia_checkpoint:stop(),
+    mnesia_log:stop(),
+    exit(shutdown).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% System upgrade
+
+system_continue(_Parent, _Debug, State) ->
+    doit_loop(State).
+
+system_terminate(_Reason, _Parent, _Debug, State) ->
+    do_stop(State).
+
+system_code_change(State, _Module, _OldVsn, _Extra) ->
+    {ok, State}.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE.erl b/lib/dialyzer/test/r9c_tests_SUITE.erl
deleted file mode 100644
index cd5bd5ec61..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE.erl
+++ /dev/null
@@ -1,64 +0,0 @@
-%% ATTENTION!
-%% This is an automatically generated file. Do not edit.
-%% Use './remake' script to refresh it if needed.
-%% All Dialyzer options should be defined in dialyzer_options
-%% file.
-
--module(r9c_tests_SUITE).
-
--include("ct.hrl").
--include("dialyzer_test_constants.hrl").
-
--export([suite/0, init_per_suite/0, init_per_suite/1,
-         end_per_suite/1, all/0]).
--export([r9c_tests_SUITE_consistency/1, asn1/1, inets/1, mnesia/1]).
-
-suite() ->
-  [{timetrap, {minutes, 20}}].
-
-init_per_suite() ->
-  [{timetrap, ?plt_timeout}].
-init_per_suite(Config) ->
-  OutDir = ?config(priv_dir, Config),
-  case dialyzer_common:check_plt(OutDir) of
-    fail -> {skip, "Plt creation/check failed."};
-    ok -> [{dialyzer_options, [{defines,[{vsn,42}]}]}|Config]
-  end.
-
-end_per_suite(_Config) ->
-  ok.
-
-all() ->
-  [r9c_tests_SUITE_consistency,asn1,inets,mnesia].
-
-dialyze(Config, TestCase) ->
-  Opts = ?config(dialyzer_options, Config),
-  Dir = ?config(data_dir, Config),
-  OutDir = ?config(priv_dir, Config),
-  dialyzer_common:check(TestCase, Opts, Dir, OutDir).
-
-r9c_tests_SUITE_consistency(Config) ->
-  Dir = ?config(data_dir, Config),
-  case dialyzer_common:new_tests(Dir, all()) of
-    []  -> ok;
-    New -> ct:fail({missing_tests,New})
-  end.
-
-asn1(Config) ->
-  case dialyze(Config, asn1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-inets(Config) ->
-  case dialyze(Config, inets) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mnesia(Config) ->
-  case dialyze(Config, mnesia) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/Makefile b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/Makefile
deleted file mode 100644
index b539e88108..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/Makefile
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-# Copyright (C) 1997, Ericsson Telecommunications
-# Author: Kenneth Lundin 
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
- 
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(ASN1_VSN)
- 
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/asn1-$(VSN)
- 
-
-
-
-#
-# Common Macros
-#
-# PARSER_SRC = \
-#	asn1ct_parser.yrl
-
-# PARSER_MODULE=$(PARSER_SRC:%.yrl=%)
-
-EBIN = ../ebin
-CT_MODULES= \
-	asn1ct \
-	asn1ct_check \
-	asn1_db \
-	asn1ct_pretty_format \
-	asn1ct_gen \
-	asn1ct_gen_per \
-	asn1ct_gen_per_rt2ct \
-	asn1ct_name \
-	asn1ct_constructed_per \
-	asn1ct_constructed_ber \
-	asn1ct_gen_ber \
-	asn1ct_constructed_ber_bin_v2 \
-	asn1ct_gen_ber_bin_v2 \
-	asn1ct_value \
-	asn1ct_tok \
-	asn1ct_parser2
-
-RT_MODULES= \
-	asn1rt \
-	asn1rt_per \
-	asn1rt_per_bin \
-	asn1rt_per_v1 \
-	asn1rt_ber_bin \
-	asn1rt_ber_bin_v2 \
-	asn1rt_per_bin_rt2ct \
-	asn1rt_driver_handler \
-	asn1rt_check
-
-#	asn1rt_ber_v1 \
-#	asn1rt_ber \
-# the rt module to use is defined in asn1_records.hrl
-# and must be updated when an incompatible change is done in the rt modules
-
-
-MODULES= $(CT_MODULES) $(RT_MODULES) 
-
-ERL_FILES = $(MODULES:%=%.erl)
- 
-TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
- 
-GENERATED_PARSER = $(PARSER_MODULE:%=%.erl)
- 
-# internal hrl file
-HRL_FILES = asn1_records.hrl
- 
-APP_FILE = asn1.app
-APPUP_FILE = asn1.appup
- 
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-EXAMPLES = \
-	../examples/P-Record.asn
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_FLAGS +=
-ERL_COMPILE_FLAGS += \
-	-I$(ERL_TOP)/lib/stdlib \
-	+warn_unused_vars
-YRL_FLAGS = 
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
- 
-debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
- 
- 
-clean:
-	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(GENERATED_PARSER)
-	rm -f core *~
- 
-docs:
- 
- 
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(EBIN)/asn1ct.$(EMULATOR):asn1ct.erl
-	 $(ERLC) -b$(EMULATOR) -o$(EBIN) $(ERL_COMPILE_FLAGS) -Dvsn=\"$(VSN)\" $<
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
-
- 
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
- 
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(PARSER_SRC) $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)/examples
-
-# there are no include files to be used by the user
-#$(INSTALL_DIR) $(RELSYSDIR)/include
-#$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-
-release_docs_spec:
-
-
-
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/Restrictions.txt b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/Restrictions.txt
deleted file mode 100644
index 73b725245d..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/Restrictions.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-The following restrictions apply to this implementation of the ASN.1 compiler:
-
-Supported encoding rules are: 
-BER
-PER (aligned)
-
-PER (unaligned) IS NOT SUPPORTED
-
-Supported types are:
-
-INTEGER
-BOOLEAN
-ENUMERATION
-SEQUENCE
-SEQUENCE OF
-SET
-SET OF
-CHOICE
-OBJECT IDENTIFIER
-RestrictedCharacterStringTypes
-UnrestrictedCharacterStringTypes
-
-
-NOT SUPPORTED types are:
-ANY IS (IS NOT IN THE STANDARD ANY MORE)
-ANY DEFINED BY (IS NOT IN THE STANDARD ANY MORE)
-EXTERNAL
-EMBEDDED-PDV
-REAL
-
-The support for value definitions in the ASN.1 notation is very limited.
-
-The support for constraints is limited to:
-SizeConstraint	SIZE(X)
-SingleValue	(1)
-ValueRange	(X..Y)
-PermittedAlpabet FROM
-
-The only supported value-notation for SEQUENCE and SET in Erlang is 
-the record variant.
-The list notation with named components used by the old ASN.1 compiler 
-was supported in the first versions of this compiler both are no longer
-supported.
-
-The decode functions always return a symbolic value if they can.
-
-
-Files with ASN.1 source must have a suffix .asn1 the suffix .py used by the
-old ASN.1 compiler is supported in this version but will not be supported in the future.
-
-Generated files:
-X.asn1db	% the intermediate format of a compiled ASN.1 module 
-X.hrl		% generated Erlang include file for module X
-X.erl		% generated Erlang module with encode decode functions for
-		% ASN.1 module X
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1.appup.src b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1.appup.src
deleted file mode 100644
index 255dec709e..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1.appup.src
+++ /dev/null
@@ -1,166 +0,0 @@
-{"%VSN%",
- [
-  {"1.3", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {add_module, asn1rt_per_bin},
-     {add_module, asn1rt_check}
-     {add_module, asn1rt_per_bin_rt2ct},
-     {add_module, asn1rt_ber_bin_v2},
-     {add_module, asn1rt_driver_handler}
-     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
-   ] 
-  }, 
-  {"1.3.1", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {add_module, asn1rt_per_bin},
-     {add_module, asn1rt_check}
-     {add_module, asn1rt_per_bin_rt2ct},
-     {add_module, asn1rt_ber_bin_v2},
-     {add_module, asn1rt_driver_handler}
-     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
-   ] 
-  }, 
-  {"1.3.1.1", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {add_module, asn1rt_per_bin},
-     {add_module, asn1rt_check}
-     {add_module, asn1rt_per_bin_rt2ct},
-     {add_module, asn1rt_ber_bin_v2},
-     {add_module, asn1rt_driver_handler}
-     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
-   ] 
-  },
-  {"1.3.2", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt_check, soft_purge, soft_purge, []},
-     {add_module, asn1rt_per_bin_rt2ct},
-     {add_module, asn1rt_ber_bin_v2},
-     {add_module, asn1rt_driver_handler}
-     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
-   ] 
-  },
-  {"1.3.3", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt_check, soft_purge, soft_purge, []},
-     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-     {add_module, asn1rt_ber_bin_v2},
-     {add_module, asn1rt_driver_handler}
-     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
-   ] 
-  },
-  {"1.3.3.1", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt_check, soft_purge, soft_purge, []},
-     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-     {add_module, asn1rt_ber_bin_v2},
-     {add_module, asn1rt_driver_handler}
-     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}},
-   ] 
-  }
- ],
- [ 
-  {"1.3", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {add_module, asn1rt_ber_v1},
-     {remove, {asn1rt_per_bin, soft_purge, soft_purge}},
-     {remove, {asn1rt_check, soft_purge, soft_purge}}
-     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
-     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
-     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
-   ] 
-  }, 
-  {"1.3.1", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {add_module, asn1rt_ber_v1},
-     {remove, {asn1rt_per_bin, soft_purge, soft_purge}},
-     {remove, {asn1rt_check, soft_purge, soft_purge}}
-     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
-     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
-     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
-   ] 
-  }, 
-  {"1.3.1.1", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {add_module, asn1rt_ber_v1},
-     {remove, {asn1rt_per_bin, soft_purge, soft_purge}},
-     {remove, {asn1rt_check, soft_purge, soft_purge}}
-     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
-     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
-     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
-   ] 
-  },
-  {"1.3.2", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt_check, soft_purge, soft_purge, []},
-     {add_module, asn1rt_ber_v1},
-     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
-     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
-     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
-   ] 
-  },
-  {"1.3.3", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt_check, soft_purge, soft_purge, []},
-     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-     {add_module, asn1rt_ber_v1},
-     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
-     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
-   ] 
-  },
-  {"1.3.3.1", 
-   [ 
-     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
-     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt, soft_purge, soft_purge, []},
-     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-     {load_module, asn1rt_check, soft_purge, soft_purge, []},
-     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-     {add_module, asn1rt_ber_v1},
-     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
-     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
-   ] 
-  }
- 
- ]}.
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1_db.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1_db.erl
deleted file mode 100644
index cf01e39fed..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1_db.erl
+++ /dev/null
@@ -1,162 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1_db.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
-%%
--module(asn1_db).
-%-compile(export_all).
--export([dbnew/1,dbsave/2,dbload/1,dbput/3,dbget/2,dbget_all/1]).
--export([dbget_all_mod/1,dbstop/0,dbclear/0,dberase_module/1,dbstart/1,stop_server/1]).
-%% internal exports
--export([dbloop0/1,dbloop/2]).
-
-%% Db stuff
-dbstart(Includes) ->    
-    start_server(asn1db, asn1_db, dbloop0, [Includes]).
-
-dbloop0(Includes) ->
-    dbloop(Includes, ets:new(asn1, [set,named_table])).
-	
-opentab(Tab,Mod,[]) ->
-    opentab(Tab,Mod,["."]);
-opentab(Tab,Mod,Includes) ->
-    Base = lists:concat([Mod,".asn1db"]),
-    opentab2(Tab,Base,Mod,Includes,ok).
-
-opentab2(_Tab,_Base,_Mod,[],Error) ->
-    Error;
-opentab2(Tab,Base,Mod,[Ih|It],_Error) ->
-    File = filename:join(Ih,Base),
-    case ets:file2tab(File) of
-	{ok,Modtab} ->
-	    ets:insert(Tab,{Mod, Modtab}),
-	    {ok,Modtab};
-	NewErr -> 
-	    opentab2(Tab,Base,Mod,It,NewErr)
-    end.
-
-
-dbloop(Includes, Tab) ->
-    receive
-	{From,{set, Mod, K2, V}} ->
-	    [{_,Modtab}] = ets:lookup(Tab,Mod),
-	    ets:insert(Modtab,{K2, V}),
-	    From ! {asn1db, ok},
-	    dbloop(Includes, Tab);
-	{From, {get, Mod, K2}} ->
-	    Result = case ets:lookup(Tab,Mod) of
-			 [] -> 
-			     opentab(Tab,Mod,Includes);
-			 [{_,Modtab}] -> {ok,Modtab}
-		     end,
-	    case Result of
-		{ok,Newtab} ->
-		    From ! {asn1db, lookup(Newtab, K2)};
-		_Error ->
-		    From ! {asn1db, undefined}
-	    end,
-	    dbloop(Includes, Tab);
-	{From, {all_mod, Mod}} ->
-	    [{_,Modtab}] = ets:lookup(Tab,Mod),
-	    From ! {asn1db, ets:tab2list(Modtab)},
-	    dbloop(Includes, Tab);
-	{From, {delete_mod, Mod}} ->
-	    [{_,Modtab}] = ets:lookup(Tab,Mod),
-	    ets:delete(Modtab),
-	    ets:delete(Tab,Mod),
-	    From ! {asn1db, ok},
-	    dbloop(Includes, Tab);
-	{From, {save, OutFile,Mod}} ->
-	    [{_,Mtab}] = ets:lookup(Tab,Mod),
-	    {From ! {asn1db, ets:tab2file(Mtab,OutFile)}},
-	    dbloop(Includes,Tab);
-	{From, {load, Mod}} ->
-	    Result = case ets:lookup(Tab,Mod) of
-			 [] -> 
-			     opentab(Tab,Mod,Includes);
-			 [{_,Modtab}] -> {ok,Modtab}
-		     end,
-	    {From, {asn1db,Result}},
-	    dbloop(Includes,Tab);
-	{From, {new, Mod}} ->
-	    case ets:lookup(Tab,Mod) of
-		[{_,Modtab}] -> 
-		    ets:delete(Modtab);
-		_  ->
-		    true
-	    end,
-	    Tabname = list_to_atom(lists:concat(["asn1_",Mod])),
-	    ets:new(Tabname, [set,named_table]),
-	    ets:insert(Tab,{Mod,Tabname}),
-	    From ! {asn1db, ok},
-	    dbloop(Includes,Tab);
-	{From, stop} ->
-		    From ! {asn1db, ok};  %% nothing to store
-	{From, clear} ->
-	    ModTabList = [Mt||{_,Mt} <- ets:tab2list(Tab)],
-	    lists:foreach(fun(T) -> ets:delete(T) end,ModTabList),
-	    ets:delete(Tab),
-	    From ! {asn1db, cleared},
-	    dbloop(Includes, ets:new(asn1, [set]))
-    end.
-
-
-%%all(Tab, K) ->
-%%    pickup(K, ets:match(Tab, {{K, '$1'}, '$2'})).
-%%pickup(K, []) -> [];
-%%pickup(K, [[V1,V2] |T]) ->
-%%    [{{K,V1},V2} | pickup(K, T)].
-
-lookup(Tab, K) ->
-    case ets:lookup(Tab, K) of
-	[] -> undefined;
-	[{K,V}] -> V
-    end.
-
-
-dbnew(Module) -> req({new,Module}).
-dbsave(OutFile,Module) -> req({save,OutFile,Module}).
-dbload(Module) -> req({load,Module}).
-    
-dbput(Module,K,V) -> req({set, Module, K, V}).
-dbget(Module,K) ->   req({get, Module, K}).
-dbget_all(K) ->   req({get_all, K}).
-dbget_all_mod(Mod) -> req({all_mod,Mod}).
-dbstop() ->       stop_server(asn1db).
-dbclear() ->      req(clear).
-dberase_module({module,M})->  
-    req({delete_mod, M}).
-
-req(R) ->
-    asn1db ! {self(), R},
-    receive {asn1db, Reply} -> Reply end.
-
-stop_server(Name) ->
-    stop_server(Name, whereis(Name)).
-stop_server(_, undefined) -> stopped;
-stop_server(Name, _Pid) ->
-    Name  ! {self(), stop},
-    receive {Name, _} -> stopped end.
-
-
-start_server(Name,Mod,Fun,Args) ->	
-    case whereis(Name) of
-	undefined ->
-	    register(Name, spawn(Mod,Fun, Args));
-	_Pid ->
-	    already_started
-    end.
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1_records.hrl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1_records.hrl
deleted file mode 100644
index 07ca8cccf3..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1_records.hrl
+++ /dev/null
@@ -1,96 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1_records.hrl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
-%%
--define('RT_BER',"asn1rt_ber_v1").
--define('RT_BER_BIN',"asn1rt_ber_bin").
--define('RT_PER',"asn1rt_per_v1").
-%% change to this when we have this module -define('RT_PER_BIN',"asn1rt_per_bin").
--define('RT_PER_BIN',"asn1rt_per_bin").
-
--record(module,{pos,name,defid,tagdefault='EXPLICIT',exports={exports,[]},imports={imports,[]}, extensiondefault=empty,typeorval}).
-
--record('SEQUENCE',{pname=false,tablecinf=false,components=[]}).
--record('SET',{pname=false,sorted=false,tablecinf=false,components=[]}).
--record('ComponentType',{pos,name,typespec,prop,tags}).
--record('ObjectClassFieldType',{classname,class,fieldname,type}).
-
--record(typedef,{checked=false,pos,name,typespec}).
--record(classdef,{checked=false,pos,name,typespec}).
--record(valuedef,{checked=false,pos,name,type,value}).
--record(ptypedef,{checked=false,pos,name,args,typespec}).
--record(pvaluedef,{checked=false,pos,name,args,type,value}).
--record(pvaluesetdef,{checked=false,pos,name,args,type,valueset}).
--record(pobjectdef,{checked=false,pos,name,args,class,def}).
--record(pobjectsetdef,{checked=false,pos,name,args,class,def}).
-
--record(typereference,{pos,val}).
--record(identifier,{pos,val}).
--record(constraint,{c,e}).
--record('Constraint',{'SingleValue'=no,'SizeConstraint'=no,'ValueRange'=no,'PermittedAlphabet'=no,
-		      'ContainedSubtype'=no, 'TypeConstraint'=no,'InnerSubtyping'=no,e=no,'Other'=no}).
--record(simpletableattributes,{objectsetname,c_name,c_index,usedclassfield,
-			       uniqueclassfield,valueindex}).
--record(type,{tag=[],def,constraint=[],tablecinf=[],inlined=no}).
-
--record(objectclass,{fields=[],syntax}).
--record('Object',{classname,gen=true,def}).
--record('ObjectSet',{class,gen=true,uniquefname,set}).
-
--record(tag,{class,number,type,form=32}). % form = ?CONSTRUCTED
-% This record holds information about allowed constraint types per type
--record(cmap,{single_value=no,contained_subtype=no,value_range=no,
-		size=no,permitted_alphabet=no,type_constraint=no,
-		inner_subtyping=no}).
-
-
--record('EXTENSIONMARK',{pos,val}).
-
-% each IMPORT contains a list of 'SymbolsFromModule'
--record('SymbolsFromModule',{symbols,module,objid}).
-
-% Externaltypereference -> modulename '.' typename
--record('Externaltypereference',{pos,module,type}).
-% Externalvaluereference -> modulename '.' typename
--record('Externalvaluereference',{pos,module,value}).
-
--record(state,{module,mname,type,tname,value,vname,erule,parameters=[],
-	       inputmodules,abscomppath=[],recordtopname=[],options}).
-
-%% state record used by backend at partial decode
-%% active is set to 'yes' when a partial decode function is generated.
-%% prefix is set to 'dec-inc-' or 'dec-partial-' is for
-%% incomplete partial decode or partial decode respectively
-%% inc_tag_pattern holds the tags of the significant types/components
-%% for incomplete partial decode.
-%% tag_pattern holds the tags for partial decode.
-%% inc_type_pattern and type_pattern holds the names of the 
-%% significant types/components.
-%% func_name holds the name of the function for the toptype.
-%% namelist holds the list of names of types/components that still
-%% haven't been generated.
-%% tobe_refed_funcs is a list of tuples {function names
-%% (Types),namelist of incomplete decode spec}, with function names
-%% that are referenced within other generated partial incomplete
-%% decode functions. They shall be generated as partial incomplete
-%% decode functions.
-
-%% gen_refed_funcs is as list of function names. Unlike
-%% tobe_refed_funcs these have been generated.
--record(gen_state,{active=false,prefix,inc_tag_pattern,
-		  tag_pattern,inc_type_pattern,
-		  type_pattern,func_name,namelist,
-		  tobe_refed_funcs=[],gen_refed_funcs=[]}).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct.erl
deleted file mode 100644
index 37189e3780..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct.erl
+++ /dev/null
@@ -1,1904 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
-%%
--module(asn1ct).
-
-%% Compile Time functions for ASN.1 (e.g ASN.1 compiler).
-
-%%-compile(export_all).
-%% Public exports
--export([compile/1, compile/2]).
--export([start/0, start/1, stop/0]).
--export([encode/2, encode/3, decode/3]).
--export([test/1, test/2, test/3, value/2]).
-%% Application internal exports
--export([compile_asn/3,compile_asn1/3,compile_py/3,compile/3,value/1,vsn/0,
-	 create_ets_table/2,get_name_of_def/1,get_pos_of_def/1]).
--export([read_config_data/1,get_gen_state_field/1,get_gen_state/0,
-	 partial_inc_dec_toptype/1,save_gen_state/1,update_gen_state/2,
-	 get_tobe_refed_func/1,reset_gen_state/0,is_function_generated/1,
-	 generated_refed_func/1,next_refed_func/0,pop_namelist/0,
-	 next_namelist_el/0,update_namelist/1,step_in_constructed/0,
-	 add_tobe_refed_func/1,add_generated_refed_func/1]).
-
--include("asn1_records.hrl").
--include_lib("stdlib/include/erl_compile.hrl").
-
--import(asn1ct_gen_ber_bin_v2,[encode_tag_val/3,decode_class/1]).
-
--define(unique_names,0).
--define(dupl_uniquedefs,1).
--define(dupl_equaldefs,2).
--define(dupl_eqdefs_uniquedefs,?dupl_equaldefs bor ?dupl_uniquedefs).
-
--define(CONSTRUCTED, 2#00100000). 
-
-%% macros used for partial decode commands
--define(CHOOSEN,choosen).
--define(SKIP,skip).
--define(SKIP_OPTIONAL,skip_optional).
-
-%% macros used for partial incomplete decode commands
--define(MANDATORY,mandatory).
--define(DEFAULT,default).
--define(OPTIONAL,opt).
--define(PARTS,parts).
--define(UNDECODED,undec).
--define(ALTERNATIVE,alt).
--define(ALTERNATIVE_UNDECODED,alt_undec).
--define(ALTERNATIVE_PARTS,alt_parts).
-%-define(BINARY,bin).
-
-%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% This is the interface to the compiler
-%% 
-%% 
-
-
-compile(File) ->
-    compile(File,[]).
-
-compile(File,Options) when list(Options) ->
-    Options1 =
-	case {lists:member(optimize,Options),lists:member(ber_bin,Options)} of
-	    {true,true} -> 
-		[ber_bin_v2|Options--[ber_bin]];
-	    _ -> Options
-	end,
-    case (catch input_file_type(File)) of
-	{single_file,PrefixedFile} ->
-	    (catch compile1(PrefixedFile,Options1));
-	{multiple_files_file,SetBase,FileName} ->
-	    FileList = get_file_list(FileName),
-	    (catch compile_set(SetBase,filename:dirname(FileName),
-			       FileList,Options1));
-	Err = {input_file_error,_Reason} ->
-	    {error,Err}
-    end.
-
-
-compile1(File,Options) when list(Options) ->
-    io:format("Erlang ASN.1 version ~p compiling ~p ~n",[?vsn,File]),
-    io:format("Compiler Options: ~p~n",[Options]),
-    Ext = filename:extension(File),
-    Base = filename:basename(File,Ext),
-    OutFile = outfile(Base,"",Options),
-    DbFile = outfile(Base,"asn1db",Options),
-    Includes = [I || {i,I} <- Options],
-    EncodingRule = get_rule(Options),
-    create_ets_table(asn1_functab,[named_table]),
-    Continue1 = scan({true,true},File,Options),
-    Continue2 = parse(Continue1,File,Options),
-    Continue3 = check(Continue2,File,OutFile,Includes,EncodingRule,
-		      DbFile,Options,[]),
-    Continue4 = generate(Continue3,OutFile,EncodingRule,Options),
-    delete_tables([asn1_functab]),
-    compile_erl(Continue4,OutFile,Options).
-
-%%****************************************************************************%%
-%% functions dealing with compiling of several input files to one output file %%
-%%****************************************************************************%%
-compile_set(SetBase,DirName,Files,Options) when list(hd(Files)),list(Options) ->
-    %% case when there are several input files in a list
-    io:format("Erlang ASN.1 version ~p compiling ~p ~n",[?vsn,Files]),    
-    io:format("Compiler Options: ~p~n",[Options]),
-    OutFile = outfile(SetBase,"",Options),
-    DbFile = outfile(SetBase,"asn1db",Options),
-    Includes = [I || {i,I} <- Options],
-    EncodingRule = get_rule(Options),
-    create_ets_table(asn1_functab,[named_table]),
-    ScanRes = scan_set(DirName,Files,Options),
-    ParseRes = parse_set(ScanRes,Options),
-    Result = 
-	case [X||X <- ParseRes,element(1,X)==true] of
-	    [] -> %% all were false, time to quit
-		lists:map(fun(X)->element(2,X) end,ParseRes);
-	    ParseRes -> %% all were true, continue with check
-		InputModules = 
-		    lists:map(
-		      fun(F)->
-			      E = filename:extension(F),
-			      B = filename:basename(F,E),
-			      if
-				  list(B) -> list_to_atom(B);
-				  true -> B
-			      end
-		      end,
-		      Files),
-		check_set(ParseRes,SetBase,OutFile,Includes,
-			  EncodingRule,DbFile,Options,InputModules);
-	    Other ->
-		{error,{'unexpected error in scan/parse phase',
-			lists:map(fun(X)->element(3,X) end,Other)}}
-	end,
-    delete_tables([asn1_functab]),
-    Result.
-
-check_set(ParseRes,SetBase,OutFile,Includes,EncRule,DbFile,
-	  Options,InputModules) ->
-    lists:foreach(fun({_T,M,File})->
-			  cmp(M#module.name,File)
-		  end,
-		  ParseRes),
-    MergedModule = merge_modules(ParseRes,SetBase),
-    SetM = MergedModule#module{name=SetBase},
-    Continue1 = check({true,SetM},SetBase,OutFile,Includes,EncRule,DbFile,
-		      Options,InputModules),
-    Continue2 = generate(Continue1,OutFile,EncRule,Options),
-
-    delete_tables([renamed_defs,original_imports,automatic_tags]),
-
-    compile_erl(Continue2,OutFile,Options).
-
-%% merge_modules/2 -> returns a module record where the typeorval lists are merged,
-%% the exports lists are merged, the imports lists are merged when the 
-%% elements come from other modules than the merge set, the tagdefault 
-%% field gets the shared value if all modules have same tagging scheme,
-%% otherwise a tagging_error exception is thrown, 
-%% the extensiondefault ...(not handled yet).
-merge_modules(ParseRes,CommonName) ->
-    ModuleList = lists:map(fun(X)->element(2,X) end,ParseRes),
-    NewModuleList = remove_name_collisions(ModuleList),
-    case ets:info(renamed_defs,size) of
-	0 -> ets:delete(renamed_defs);
-	_ -> ok
-    end,
-    save_imports(NewModuleList),
-%    io:format("~p~n~p~n~p~n~n",[ets:lookup(original_imports,'M1'),ets:lookup(original_imports,'M2'),ets:tab2list(original_imports)]),
-    TypeOrVal = lists:append(lists:map(fun(X)->X#module.typeorval end,
-				       NewModuleList)),
-    InputMNameList = lists:map(fun(X)->X#module.name end,
-			       NewModuleList),
-    CExports = common_exports(NewModuleList),
-   
-    ImportsModuleNameList = lists:map(fun(X)->
-					      {X#module.imports,
-					       X#module.name} end,
-				      NewModuleList),
-    %% ImportsModuleNameList: [{Imports,ModuleName},...]
-    %% Imports is a tuple {imports,[#'SymbolsFromModule'{},...]}
-    CImports = common_imports(ImportsModuleNameList,InputMNameList),
-    TagDefault = check_tagdefault(NewModuleList),
-    #module{name=CommonName,tagdefault=TagDefault,exports=CExports,
-	    imports=CImports,typeorval=TypeOrVal}.
-
-%% causes an exit if duplicate definition names exist in a module
-remove_name_collisions(Modules) ->
-    create_ets_table(renamed_defs,[named_table]),
-    %% Name duplicates in the same module is not allowed.
-    lists:foreach(fun exit_if_nameduplicate/1,Modules),
-    %% Then remove duplicates in different modules and return the
-    %% new list of modules.
-    remove_name_collisions2(Modules,[]).
-
-%% For each definition in the first module in module list, find
-%% all definitons with same name and rename both definitions in
-%% the first module and in rest of modules
-remove_name_collisions2([M|Ms],Acc) ->
-    TypeOrVal = M#module.typeorval,
-    MName = M#module.name,
-    %% Test each name in TypeOrVal on all modules in Ms
-    {NewM,NewMs} = remove_name_collisions2(MName,TypeOrVal,Ms,[]),
-    remove_name_collisions2(NewMs,[M#module{typeorval=NewM}|Acc]);
-remove_name_collisions2([],Acc) ->
-    finished_warn_prints(),
-    Acc.
-
-%% For each definition in list of defs find definitions in (rest of)
-%% modules that have same name. If duplicate was found rename def.
-%% Test each name in [T|Ts] on all modules in Ms
-remove_name_collisions2(ModName,[T|Ts],Ms,Acc) ->
-    Name = get_name_of_def(T),
-    case discover_dupl_in_mods(Name,T,Ms,[],?unique_names) of
-	{_,?unique_names} -> % there was no name collision
-	    remove_name_collisions2(ModName,Ts,Ms,[T|Acc]);
-	{NewMs,?dupl_uniquedefs} -> % renamed defs in NewMs
-	    %% rename T
-	    NewT = set_name_of_def(ModName,Name,T), %rename def
-	    warn_renamed_def(ModName,get_name_of_def(NewT),Name),
-	    ets:insert(renamed_defs,{get_name_of_def(NewT),Name,ModName}),
-	    remove_name_collisions2(ModName,Ts,NewMs,[NewT|Acc]);
-	{NewMs,?dupl_equaldefs} -> % name duplicates, but identical defs
-	    %% keep name of T
-	    warn_kept_def(ModName,Name),
-	    remove_name_collisions2(ModName,Ts,NewMs,[T|Acc]);
-	{NewMs,?dupl_eqdefs_uniquedefs} ->
-	    %% keep name of T, renamed defs in NewMs
-	    warn_kept_def(ModName,Name),
-	    remove_name_collisions2(ModName,Ts,NewMs,[T|Acc])
-    end;
-remove_name_collisions2(_,[],Ms,Acc) ->
-    {Acc,Ms}.
-
-%% Name is the name of a definition. If a definition with the same name
-%% is found in the modules Ms the definition will be renamed and returned.
-discover_dupl_in_mods(Name,Def,[M=#module{name=N,typeorval=TorV}|Ms],
-			      Acc,AnyRenamed) ->
-    Fun = fun(T,RenamedOrDupl)->
-		  case {get_name_of_def(T),compare_defs(Def,T)} of
-		      {Name,not_equal} ->
-			  %% rename def
-			  NewT=set_name_of_def(N,Name,T),
-			  warn_renamed_def(N,get_name_of_def(NewT),Name),
-			  ets:insert(renamed_defs,{get_name_of_def(NewT),
-						   Name,N}),
-			  {NewT,?dupl_uniquedefs bor RenamedOrDupl};
-		      {Name,equal} ->
-			  %% delete def
-			  warn_deleted_def(N,Name),
-			  {[],?dupl_equaldefs bor RenamedOrDupl};
-		      _ ->
-			  {T,RenamedOrDupl}
-		  end
-	  end,
-    {NewTorV,NewAnyRenamed} = lists:mapfoldl(Fun,AnyRenamed,TorV),
-    %% have to flatten the NewTorV to remove any empty list elements
-    discover_dupl_in_mods(Name,Def,Ms,
-			  [M#module{typeorval=lists:flatten(NewTorV)}|Acc],
-			  NewAnyRenamed);
-discover_dupl_in_mods(_,_,[],Acc,AnyRenamed) ->
-    {Acc,AnyRenamed}.
-
-warn_renamed_def(ModName,NewName,OldName) ->
-    maybe_first_warn_print(),
-    io:format("NOTICE: The ASN.1 definition in module ~p with name ~p has been renamed in generated module. New name is ~p.~n",[ModName,OldName,NewName]).
-
-warn_deleted_def(ModName,DefName) ->
-    maybe_first_warn_print(),
-    io:format("NOTICE: The ASN.1 definition in module ~p with name ~p has been deleted in generated module.~n",[ModName,DefName]).
-
-warn_kept_def(ModName,DefName) ->
-    maybe_first_warn_print(),
-    io:format("NOTICE: The ASN.1 definition in module ~p with name ~p has kept its name due to equal definition as duplicate.~n",[ModName,DefName]).
-
-maybe_first_warn_print() ->
-    case get(warn_duplicate_defs) of
-	undefined ->
-	    put(warn_duplicate_defs,true),
-	    io:format("~nDue to multiple occurrences of a definition name in "
-		      "multi-file compiled files:~n");
-	_ ->
-	    ok
-    end.
-finished_warn_prints() ->
-    put(warn_duplicate_defs,undefined).
-
-
-exit_if_nameduplicate(#module{typeorval=TorV}) ->
-    exit_if_nameduplicate(TorV);
-exit_if_nameduplicate([]) ->
-    ok;
-exit_if_nameduplicate([Def|Rest]) ->
-    Name=get_name_of_def(Def),
-    exit_if_nameduplicate2(Name,Rest),
-    exit_if_nameduplicate(Rest).
-
-exit_if_nameduplicate2(Name,Rest) ->
-    Pred=fun(Def)->
-		 case get_name_of_def(Def) of
-		     Name -> true;
-		     _ -> false
-		 end
-	 end,
-        case lists:any(Pred,Rest) of
-	true ->
-	    throw({error,{"more than one definition with same name",Name}});
-	_ ->
-	    ok
-    end.
-
-compare_defs(D1,D2) ->
-    compare_defs2(unset_pos(D1),unset_pos(D2)).
-compare_defs2(D,D) ->
-    equal;
-compare_defs2(_,_) ->
-    not_equal.
-
-unset_pos(Def) when record(Def,typedef) ->
-    Def#typedef{pos=undefined};
-unset_pos(Def) when record(Def,classdef) ->
-    Def#classdef{pos=undefined};
-unset_pos(Def) when record(Def,valuedef) ->
-    Def#valuedef{pos=undefined};
-unset_pos(Def) when record(Def,ptypedef) ->
-    Def#ptypedef{pos=undefined};
-unset_pos(Def) when record(Def,pvaluedef) ->
-    Def#pvaluedef{pos=undefined};
-unset_pos(Def) when record(Def,pvaluesetdef) ->
-    Def#pvaluesetdef{pos=undefined};
-unset_pos(Def) when record(Def,pobjectdef) ->
-    Def#pobjectdef{pos=undefined};
-unset_pos(Def) when record(Def,pobjectsetdef) ->
-    Def#pobjectsetdef{pos=undefined}.
-
-get_pos_of_def(#typedef{pos=Pos}) ->
-    Pos;
-get_pos_of_def(#classdef{pos=Pos}) ->
-    Pos;
-get_pos_of_def(#valuedef{pos=Pos}) ->
-    Pos;
-get_pos_of_def(#ptypedef{pos=Pos}) ->
-    Pos;
-get_pos_of_def(#pvaluedef{pos=Pos}) ->
-    Pos;
-get_pos_of_def(#pvaluesetdef{pos=Pos}) ->
-    Pos;
-get_pos_of_def(#pobjectdef{pos=Pos}) ->
-    Pos;
-get_pos_of_def(#pobjectsetdef{pos=Pos}) ->
-    Pos.
-    
-    
-get_name_of_def(#typedef{name=Name}) ->
-    Name;
-get_name_of_def(#classdef{name=Name}) ->
-    Name;
-get_name_of_def(#valuedef{name=Name}) ->
-    Name;
-get_name_of_def(#ptypedef{name=Name}) ->
-    Name;
-get_name_of_def(#pvaluedef{name=Name}) ->
-    Name;
-get_name_of_def(#pvaluesetdef{name=Name}) ->
-    Name;
-get_name_of_def(#pobjectdef{name=Name}) ->
-    Name;
-get_name_of_def(#pobjectsetdef{name=Name}) ->
-    Name.
-
-set_name_of_def(ModName,Name,OldDef) ->
-    NewName = list_to_atom(lists:concat([Name,ModName])),
-    case OldDef of
-	#typedef{} -> OldDef#typedef{name=NewName};
-	#classdef{} -> OldDef#classdef{name=NewName};
-	#valuedef{} -> OldDef#valuedef{name=NewName};
-	#ptypedef{} -> OldDef#ptypedef{name=NewName};
-	#pvaluedef{} -> OldDef#pvaluedef{name=NewName};
-	#pvaluesetdef{} -> OldDef#pvaluesetdef{name=NewName};
-	#pobjectdef{} -> OldDef#pobjectdef{name=NewName};
-	#pobjectsetdef{} -> OldDef#pobjectsetdef{name=NewName}
-    end.
-
-save_imports(ModuleList)->
-    Fun = fun(M) ->
-		  case M#module.imports of
-		      {_,[]} -> [];
-		      {_,I} -> 
-			  {M#module.name,I}
-		  end
-	  end,
-    ImportsList = lists:map(Fun,ModuleList),
-    case lists:flatten(ImportsList) of
-	[] ->
-	    ok;
-	ImportsList2 ->
-	    create_ets_table(original_imports,[named_table]),
-	    ets:insert(original_imports,ImportsList2)
-    end.
-				    
-	    
-common_exports(ModuleList) ->
-    %% if all modules exports 'all' then export 'all', 
-    %% otherwise export each typeorval name
-    case lists:filter(fun(X)->
-			      element(2,X#module.exports) /= all
-		      end,
-		      ModuleList) of
-	[]->
-	    {exports,all};
-	ModsWithExpList ->
-	    CExports1 = 
-		lists:append(lists:map(fun(X)->element(2,X#module.exports) end,
-				       ModsWithExpList)),
-	    CExports2 = export_all(lists:subtract(ModuleList,ModsWithExpList)),
-	    {exports,CExports1++CExports2}
-    end.
-
-export_all([])->[];
-export_all(ModuleList) ->
-    ExpList =
-	lists:map(
-	  fun(M)->
-		  TorVL=M#module.typeorval,
-		  MName = M#module.name,
-		  lists:map(
-		    fun(Def)->
-			    case Def of
-				T when record(T,typedef)->
-				    #'Externaltypereference'{pos=0,
-							     module=MName,
-							     type=T#typedef.name};
-				V when record(V,valuedef) ->
-				    #'Externalvaluereference'{pos=0,
-							      module=MName,
-							      value=V#valuedef.name};
-				C when record(C,classdef) ->
-				    #'Externaltypereference'{pos=0,
-							     module=MName,
-							     type=C#classdef.name};
-				P when record(P,ptypedef) ->
-				    #'Externaltypereference'{pos=0,
-							     module=MName,
-							     type=P#ptypedef.name};
-				PV when record(PV,pvaluesetdef) ->
-				    #'Externaltypereference'{pos=0,
-							     module=MName,
-							     type=PV#pvaluesetdef.name};
-				PO when record(PO,pobjectdef) ->
-				    #'Externalvaluereference'{pos=0,
-							      module=MName,
-							      value=PO#pobjectdef.name}
-			    end
-		    end,
-		    TorVL)
-	  end,
-	  ModuleList),
-    lists:append(ExpList).
-
-%% common_imports/2
-%% IList is a list of tuples, {Imports,MName}, where Imports is the imports of
-%% the module with name MName.
-%% InputMNameL holds the names of all merged modules.
-%% Returns an import tuple with a list of imports that are external the merged
-%% set of modules.
-common_imports(IList,InputMNameL) ->
-    SetExternalImportsList = remove_in_set_imports(IList,InputMNameL,[]),
-    {imports,remove_import_doubles(SetExternalImportsList)}.
-
-check_tagdefault(ModList) ->
-    case have_same_tagdefault(ModList) of
-	{true,TagDefault}  -> TagDefault;
-	{false,TagDefault} ->
-	    create_ets_table(automatic_tags,[named_table]),
-	    save_automatic_tagged_types(ModList),
-	    TagDefault
-    end.
-
-have_same_tagdefault([#module{tagdefault=T}|Ms]) ->
-    have_same_tagdefault(Ms,{true,T}).
-
-have_same_tagdefault([],TagDefault) ->
-    TagDefault;
-have_same_tagdefault([#module{tagdefault=T}|Ms],TDefault={_,T}) ->
-    have_same_tagdefault(Ms,TDefault);
-have_same_tagdefault([#module{tagdefault=T1}|Ms],{_,T2}) ->
-    have_same_tagdefault(Ms,{false,rank_tagdef([T1,T2])}).
-
-rank_tagdef(L) ->
-    case lists:member('EXPLICIT',L) of
-	true -> 'EXPLICIT';
-	_ -> 'IMPLICIT'
-    end.
-
-save_automatic_tagged_types([])->
-    done;
-save_automatic_tagged_types([#module{tagdefault='AUTOMATIC',
-				     typeorval=TorV}|Ms]) ->
-    Fun =
-	fun(T) ->
-		ets:insert(automatic_tags,{get_name_of_def(T)})
-	end,
-    lists:foreach(Fun,TorV),
-    save_automatic_tagged_types(Ms);
-save_automatic_tagged_types([_M|Ms]) ->
-    save_automatic_tagged_types(Ms).
-
-%% remove_in_set_imports/3 :
-%% input: list with tuples of each module's imports and module name 
-%% respectively.
-%% output: one list with same format but each occured import from a
-%% module in the input set (IMNameL) is removed.
-remove_in_set_imports([{{imports,ImpL},_ModName}|Rest],InputMNameL,Acc) ->
-    NewImpL = remove_in_set_imports1(ImpL,InputMNameL,[]),
-    remove_in_set_imports(Rest,InputMNameL,NewImpL++Acc);
-remove_in_set_imports([],_,Acc) ->
-    lists:reverse(Acc).
-
-remove_in_set_imports1([I|Is],InputMNameL,Acc) ->
-    case I#'SymbolsFromModule'.module of
-	#'Externaltypereference'{type=MName} ->
-	    case lists:member(MName,InputMNameL) of
-		true ->
-		    remove_in_set_imports1(Is,InputMNameL,Acc);
-		false ->
-		    remove_in_set_imports1(Is,InputMNameL,[I|Acc])
-	    end;
-	_ ->
-	    remove_in_set_imports1(Is,InputMNameL,[I|Acc])
-    end;
-remove_in_set_imports1([],_,Acc) ->
-    lists:reverse(Acc).
-
-remove_import_doubles([]) ->
-    [];
-%% If several modules in the merge set imports symbols from
-%% the same external module it might be doubled.
-%% ImportList has #'SymbolsFromModule' elements
-remove_import_doubles(ImportList) ->
-    MergedImportList = 
-	merge_symbols_from_module(ImportList,[]),
-%%    io:format("MergedImportList: ~p~n",[MergedImportList]),
-    delete_double_of_symbol(MergedImportList,[]).
-
-merge_symbols_from_module([Imp|Imps],Acc) ->
-    #'Externaltypereference'{type=ModName} = Imp#'SymbolsFromModule'.module,
-    IfromModName = 
-	lists:filter(
-	  fun(I)->
-		  case I#'SymbolsFromModule'.module of
-		      #'Externaltypereference'{type=ModName} ->
-			  true;
-		      #'Externalvaluereference'{value=ModName} ->
-			  true;
-		      _ -> false
-		  end
-	  end,
-	  Imps),
-    NewImps = lists:subtract(Imps,IfromModName),
-%%    io:format("Imp: ~p~nIfromModName: ~p~n",[Imp,IfromModName]),
-    NewImp =
-	Imp#'SymbolsFromModule'{
-	  symbols = lists:append(
-		      lists:map(fun(SL)->
-					SL#'SymbolsFromModule'.symbols 
-				end,[Imp|IfromModName]))},
-    merge_symbols_from_module(NewImps,[NewImp|Acc]);
-merge_symbols_from_module([],Acc) ->
-    lists:reverse(Acc).
-
-delete_double_of_symbol([I|Is],Acc) ->
-    SymL=I#'SymbolsFromModule'.symbols,
-    NewSymL = delete_double_of_symbol1(SymL,[]),
-    delete_double_of_symbol(Is,[I#'SymbolsFromModule'{symbols=NewSymL}|Acc]);
-delete_double_of_symbol([],Acc) ->
-    Acc.
-
-delete_double_of_symbol1([TRef=#'Externaltypereference'{type=TrefName}|Rest],Acc)->
-    NewRest = 
-	lists:filter(fun(S)->
-			     case S of
-				 #'Externaltypereference'{type=TrefName}->
-				     false;
-				 _ -> true
-			     end
-		     end,
-		     Rest),
-    delete_double_of_symbol1(NewRest,[TRef|Acc]);
-delete_double_of_symbol1([VRef=#'Externalvaluereference'{value=VName}|Rest],Acc) ->
-    NewRest = 
-	lists:filter(fun(S)->
-			     case S of
-				 #'Externalvaluereference'{value=VName}->
-				     false;
-				 _ -> true
-			     end
-		     end,
-		     Rest),
-    delete_double_of_symbol1(NewRest,[VRef|Acc]);
-delete_double_of_symbol1([TRef={#'Externaltypereference'{type=MRef},
-				#'Externaltypereference'{type=TRef}}|Rest],
-			 Acc)->
-    NewRest = 
-	lists:filter(
-	  fun(S)->
-		  case S of
-		      {#'Externaltypereference'{type=MRef},
-		       #'Externaltypereference'{type=TRef}}->
-			  false;
-		      _ -> true
-		  end
-	  end,
-	  Rest),
-    delete_double_of_symbol1(NewRest,[TRef|Acc]);
-delete_double_of_symbol1([],Acc) ->
-    Acc.
-
-
-scan_set(DirName,Files,Options) ->
-    lists:map(
-      fun(F)->
-	      case scan({true,true},filename:join([DirName,F]),Options) of
-		  {false,{error,Reason}} ->
-		      throw({error,{'scan error in file:',F,Reason}});
-		  {TrueOrFalse,Res} ->
-		      {TrueOrFalse,Res,F}
-	      end
-      end,
-      Files).
-
-parse_set(ScanRes,Options) ->
-    lists:map(
-      fun({TorF,Toks,F})->
-	      case parse({TorF,Toks},F,Options) of
-		  {false,{error,Reason}} ->
-		      throw({error,{'parse error in file:',F,Reason}});
-		  {TrueOrFalse,Res} ->
-		      {TrueOrFalse,Res,F}
-	      end
-      end,
-      ScanRes).
-
-
-%%***********************************
-
-
-scan({true,_}, File,Options) ->
-    case asn1ct_tok:file(File) of
-	{error,Reason} ->
-	    io:format("~p~n",[Reason]),
-	    {false,{error,Reason}};
-        Tokens ->
-	    case lists:member(ss,Options) of
-		true -> % we terminate after scan
-		    {false,Tokens};
-		false -> % continue with next pass
-		    {true,Tokens}
-	    end
-    end;
-scan({false,Result},_,_) ->
-    Result.
-
-
-parse({true,Tokens},File,Options) ->
-    %Presult = asn1ct_parser2:parse(Tokens),
-    %%case lists:member(p1,Options) of
-    %%		  true ->
-    %%		      asn1ct_parser:parse(Tokens);
-    %%		  _ ->
-    %%		      asn1ct_parser2:parse(Tokens)
-    %%	      end,
-    case catch asn1ct_parser2:parse(Tokens) of
-	{error,{{Line,_Mod,Message},_TokTup}} ->
-	    if 
-		integer(Line) ->
-		    BaseName = filename:basename(File),
-		    io:format("syntax error at line ~p in module ~s:~n",
-			      [Line,BaseName]);
-		true ->
-		    io:format("syntax error in module ~p:~n",[File])
-	    end,
-	    print_error_message(Message),
-	    {false,{error,Message}};
-	{error,{Line,_Mod,[Message,Token]}} ->
-	    io:format("syntax error: ~p ~p at line ~p~n",
-		      [Message,Token,Line]),
-	    {false,{error,{Line,[Message,Token]}}};
-	{ok,M} ->
-	    case lists:member(sp,Options) of
-		true -> % terminate after parse
-		    {false,M};
-		false -> % continue with next pass
-		    {true,M}
-	    end;
-	OtherError ->
-	    io:format("~p~n",[OtherError])
-    end;
-parse({false,Tokens},_,_) ->
-    {false,Tokens}.
-
-check({true,M},File,OutFile,Includes,EncodingRule,DbFile,Options,InputMods) ->
-    cmp(M#module.name,File),
-    start(["."|Includes]),
-    case asn1ct_check:storeindb(M) of 
-	ok   ->
-	    Module = asn1_db:dbget(M#module.name,'MODULE'),
-	    State = #state{mname=Module#module.name,
-			   module=Module#module{typeorval=[]},
-			   erule=EncodingRule,
-			   inputmodules=InputMods,
-			   options=Options},
-	    Check = asn1ct_check:check(State,Module#module.typeorval),
-	    case {Check,lists:member(abs,Options)} of
-		{{error,Reason},_} ->
-		    {false,{error,Reason}};
-		{{ok,NewTypeOrVal,_},true} ->
-		    NewM = Module#module{typeorval=NewTypeOrVal},
-		    asn1_db:dbput(NewM#module.name,'MODULE',NewM),
-		    pretty2(M#module.name,lists:concat([OutFile,".abs"])),
-		    {false,ok};
-		{{ok,NewTypeOrVal,GenTypeOrVal},_} ->
-		    NewM = Module#module{typeorval=NewTypeOrVal},
-		    asn1_db:dbput(NewM#module.name,'MODULE',NewM),
-		    asn1_db:dbsave(DbFile,M#module.name),
-		    io:format("--~p--~n",[{generated,DbFile}]),
-		    {true,{M,NewM,GenTypeOrVal}}
-	    end
-    end;
-check({false,M},_,_,_,_,_,_,_) ->
-    {false,M}.
-
-generate({true,{M,_Module,GenTOrV}},OutFile,EncodingRule,Options) ->
-    debug_on(Options),
-    case lists:member(compact_bit_string,Options) of
-	true -> put(compact_bit_string,true);
-	_ -> ok
-    end,
-    put(encoding_options,Options),
-    create_ets_table(check_functions,[named_table]),
-
-    %% create decoding function names and taglists for partial decode
-    %% For the time being leave errors unnoticed !!!!!!!!!
-%    io:format("Options: ~p~n",[Options]),
-    case catch specialized_decode_prepare(EncodingRule,M,GenTOrV,Options) of
-	{error, enoent} -> ok;
-	{error, Reason} -> io:format("WARNING: Error in configuration"
-				     "file: ~n~p~n",[Reason]);
-	{'EXIT',Reason} -> io:format("WARNING: Internal error when "
-				     "analyzing configuration"
-				     "file: ~n~p~n",[Reason]);
-	_ -> ok
-    end,
-
-    asn1ct_gen:pgen(OutFile,EncodingRule,M#module.name,GenTOrV),
-    debug_off(Options),
-    put(compact_bit_string,false),
-    erase(encoding_options),
-    erase(tlv_format), % used in ber_bin, optimize
-    erase(class_default_type),% used in ber_bin, optimize
-    ets:delete(check_functions),
-    case lists:member(sg,Options) of
-	true -> % terminate here , with .erl file generated
-	    {false,true};
-	false ->
-	    {true,true}
-    end;
-generate({false,M},_,_,_) ->
-    {false,M}.
-
-compile_erl({true,_},OutFile,Options) ->
-    erl_compile(OutFile,Options);
-compile_erl({false,true},_,_) ->
-    ok;
-compile_erl({false,Result},_,_) ->
-    Result.
-
-input_file_type([]) ->
-    {empty_name,[]};
-input_file_type(File) ->
-    case filename:extension(File) of
-	[] ->
-	    case file:read_file_info(lists:concat([File,".asn1"])) of
-		{ok,_FileInfo} ->
-		    {single_file, lists:concat([File,".asn1"])};
-		_Error ->
-		    case file:read_file_info(lists:concat([File,".asn"])) of
-			{ok,_FileInfo} ->
-			    {single_file, lists:concat([File,".asn"])};
-			_Error ->
-			    {single_file, lists:concat([File,".py"])}
-		    end
-	    end;
-	".asn1config" ->
-	    case read_config_file(File,asn1_module) of
-		{ok,Asn1Module} -> 
-		    put(asn1_config_file,File),
-		    input_file_type(Asn1Module);
-		Error ->
-		    Error
-	    end;
-	Asn1PFix ->
-	    Base = filename:basename(File,Asn1PFix),
-	    case filename:extension(Base) of
-		[] ->
-		    {single_file,File};
-		SetPFix when (SetPFix == ".set") ->
-		    {multiple_files_file,
-		     filename:basename(Base,SetPFix),
-		     File};
-		_Error ->
-		    throw({input_file_error,{'Bad input file',File}})
-	    end
-    end.
-
-get_file_list(File) ->
-    case file:open(File, [read]) of
-	{error,Reason} ->
-	    {error,{File,file:format_error(Reason)}};
-	{ok,Stream} ->
-	    get_file_list1(Stream,[])
-    end.
-
-get_file_list1(Stream,Acc) ->
-    Ret = io:get_line(Stream,''),
-    case Ret of
-	eof ->
-	    file:close(Stream),
-	    lists:reverse(Acc);
-	FileName ->
-	    PrefixedNameList =
-		case (catch input_file_type(lists:delete($\n,FileName))) of
-		    {empty_name,[]} -> [];
-		    {single_file,Name} -> [Name];
-		    {multiple_files_file,Name} ->
-			get_file_list(Name);
-		    Err = {input_file_error,_Reason} ->
-			throw(Err)
-		end,
-	    get_file_list1(Stream,PrefixedNameList++Acc)
-    end.
-
-get_rule(Options) ->
-    case [Rule ||Rule <-[per,ber,ber_bin,ber_bin_v2,per_bin],
-		 Opt <- Options,
-		 Rule==Opt] of
-	[Rule] ->
-	    Rule;
-	[Rule|_] ->
-	    Rule;
-	[] ->
-	    ber
-    end.
-
-erl_compile(OutFile,Options) ->
-%    io:format("Options:~n~p~n",[Options]),
-    case lists:member(noobj,Options) of
-	true ->
-	    ok;
-	_ ->
-	    ErlOptions = remove_asn_flags(Options),
-	    case c:c(OutFile,ErlOptions) of
-		{ok,_Module} ->
-		    ok;
-		_ ->
-		    {error,'no_compilation'}
-	    end
-    end.
-
-remove_asn_flags(Options) ->
-    [X || X <- Options,
-	  X /= get_rule(Options),
-	  X /= optimize,
-	  X /= compact_bit_string,
-	  X /= debug,
-	  X /= keyed_list].
-	  
-debug_on(Options) ->
-    case lists:member(debug,Options) of
-	true ->
-	    put(asndebug,true);
-	_ ->
-	    true
-    end,
-    case lists:member(keyed_list,Options) of
-	true ->
-	    put(asn_keyed_list,true);
-	_ ->
-	    true
-    end.
-
-
-debug_off(_Options) ->
-    erase(asndebug),
-    erase(asn_keyed_list).
-
-
-outfile(Base, Ext, Opts) when atom(Ext) ->
-    outfile(Base, atom_to_list(Ext), Opts);
-outfile(Base, Ext, Opts) ->
-    Obase = case lists:keysearch(outdir, 1, Opts) of
-		{value, {outdir, Odir}} -> filename:join(Odir, Base);
-		_NotFound -> Base % Not found or bad format
-	    end,
-    case Ext of
-	[] ->
-	    Obase;
-	_ ->
-	    Obase++"."++Ext
-    end.
-
-%% compile(AbsFileName, Options)
-%%   Compile entry point for erl_compile.
-
-compile_asn(File,OutFile,Options) ->
-    compile(lists:concat([File,".asn"]),OutFile,Options).
-
-compile_asn1(File,OutFile,Options) ->
-    compile(lists:concat([File,".asn1"]),OutFile,Options).
-
-compile_py(File,OutFile,Options) ->
-    compile(lists:concat([File,".py"]),OutFile,Options).
-
-compile(File, _OutFile, Options) ->
-    case catch compile(File, make_erl_options(Options)) of
-	Exit = {'EXIT',_Reason} ->
-	    io:format("~p~n~s~n",[Exit,"error"]),
-	    error;
-	{error,_Reason} ->
-	    %% case occurs due to error in asn1ct_parser2,asn1ct_check
-%%	    io:format("~p~n",[_Reason]),
-%%	    io:format("~p~n~s~n",[_Reason,"error"]),
-	    error;
-	ok -> 
-	    io:format("ok~n"),
-	    ok;
-	ParseRes when tuple(ParseRes) ->
-	    io:format("~p~n",[ParseRes]),
-	    ok;
-	ScanRes when list(ScanRes) ->
-	    io:format("~p~n",[ScanRes]),
-	    ok;
-	Unknown -> 
-	    io:format("~p~n~s~n",[Unknown,"error"]),
-	    error
-    end.
-
-%% Converts generic compiler options to specific options.
-
-make_erl_options(Opts) ->
-
-    %% This way of extracting will work even if the record passed
-    %% has more fields than known during compilation.
-
-    Includes = Opts#options.includes,
-    Defines = Opts#options.defines,
-    Outdir = Opts#options.outdir,
-%%    Warning = Opts#options.warning,
-    Verbose = Opts#options.verbose,
-    Specific = Opts#options.specific,
-    Optimize = Opts#options.optimize,
-    OutputType = Opts#options.output_type,
-    Cwd = Opts#options.cwd,
-
-    Options =
-	case Verbose of
-	    true ->  [verbose];
-	    false -> []
-	end ++
-%%%	case Warning of
-%%%	    0 -> [];
-%%%	    _ -> [report_warnings]
-%%%	end ++
-	[] ++
-	case Optimize of
-	    1 -> [optimize];
-	    999 -> [];
-	    _ -> [{optimize,Optimize}]
-	end ++
-	lists:map(
-	  fun ({Name, Value}) ->
-		  {d, Name, Value};
-	      (Name) ->
-		  {d, Name}
-	  end,
-	  Defines) ++
-	case OutputType of
-	    undefined -> [ber]; % temporary default (ber when it's ready)
-	    ber -> [ber];
-	    ber_bin -> [ber_bin];
-	    ber_bin_v2 -> [ber_bin_v2];
-	    per -> [per];
-	    per_bin -> [per_bin]
-	end,
-
-    Options++[report_errors, {cwd, Cwd}, {outdir, Outdir}|
-	      lists:map(fun(Dir) -> {i, Dir} end, Includes)]++Specific.
-
-pretty2(Module,AbsFile) ->
-    start(),
-    {ok,F} = file:open(AbsFile, [write]),
-    M = asn1_db:dbget(Module,'MODULE'),
-    io:format(F,"%%%%%%%%%%%%%%%%%%%   ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.defid)]),
-    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.tagdefault)]),
-    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.exports)]),
-    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.imports)]),
-    io:format(F,"~s\n\n",[asn1ct_pretty_format:term(M#module.extensiondefault)]),
-
-    {Types,Values,ParameterizedTypes,Classes,Objects,ObjectSets} = M#module.typeorval,
-    io:format(F,"%%%%%%%%%%%%%%%%%%% TYPES in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
-				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])
-		  end,Types),
-    io:format(F,"%%%%%%%%%%%%%%%%%%% VALUES in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
-				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])
-		  end,Values),
-    io:format(F,"%%%%%%%%%%%%%%%%%%% Parameterized Types in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
-				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])			   
-		  end,ParameterizedTypes),
-    io:format(F,"%%%%%%%%%%%%%%%%%%% Classes in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
-				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])			   
-		  end,Classes),
-    io:format(F,"%%%%%%%%%%%%%%%%%%% Objects in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
-				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])			   
-		  end,Objects),
-    io:format(F,"%%%%%%%%%%%%%%%%%%% Object Sets in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
-				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])			   
-		  end,ObjectSets).
-start() ->
-    Includes = ["."],
-    start(Includes).
-
-
-start(Includes) when list(Includes) ->
-    asn1_db:dbstart(Includes).
-
-stop() ->
-    save(),
-    asn1_db:stop_server(ns),
-    asn1_db:stop_server(rand),
-    stopped.
-
-save() ->
-    asn1_db:dbstop().
-
-%%clear() ->
-%%    asn1_db:dbclear().
-
-encode(Module,Term) ->
-    asn1rt:encode(Module,Term).
-
-encode(Module,Type,Term) when list(Module) ->
-    asn1rt:encode(list_to_atom(Module),Type,Term);
-encode(Module,Type,Term) ->
-    asn1rt:encode(Module,Type,Term).
-
-decode(Module,Type,Bytes) when list(Module) ->
-    asn1rt:decode(list_to_atom(Module),Type,Bytes);
-decode(Module,Type,Bytes) ->
-    asn1rt:decode(Module,Type,Bytes).
-
-
-test(Module) ->
-    start(),
-    M = asn1_db:dbget(Module,'MODULE'),
-    {Types,_Values,_Ptypes,_Classes,_Objects,_ObjectSets} = M#module.typeorval,
-    test_each(Module,Types).
-
-test_each(Module,[Type | Rest]) ->
-    case test(Module,Type) of
-	{ok,_Result} ->
-	    test_each(Module,Rest);
-	Error ->
-	    Error
-    end;
-test_each(_,[]) ->
-    ok.
-
-test(Module,Type) ->
-    io:format("~p:~p~n",[Module,Type]),
-    case (catch value(Module,Type)) of 
-	{ok,Val} -> 
-	    %%	    io:format("asn1ct:test/2: ~w~n",[Val]),
-	    test(Module,Type,Val);
-	{'EXIT',Reason} -> 
-	    {error,{asn1,{value,Reason}}}
-    end.
-
-
-test(Module,Type,Value) ->
-    case catch encode(Module,Type,Value) of
-	{ok,Bytes} ->
-	    %%	    io:format("test 1: ~p~n",[{Bytes}]),
-	    M = if 
-		    list(Module) ->
-			list_to_atom(Module);
-		    true ->
-			Module
-		end,
-	    NewBytes = 
-		case M:encoding_rule() of
-		    ber ->
-			lists:flatten(Bytes);
-		    ber_bin when binary(Bytes) ->
-			Bytes;
-		    ber_bin ->
-			list_to_binary(Bytes);
-		    ber_bin_v2 when binary(Bytes) ->
-			Bytes;
-		    ber_bin_v2 ->
-			list_to_binary(Bytes);
-		    per ->
-			lists:flatten(Bytes);
-		    per_bin when binary(Bytes) ->
-			Bytes;
-		    per_bin ->
-			list_to_binary(Bytes)
-		end,
-	    case decode(Module,Type,NewBytes) of
-		{ok,Value} -> 
-		    {ok,{Module,Type,Value}};
-		{ok,Res} -> 
-		    {error,{asn1,{encode_decode_mismatch,
-				  {{Module,Type,Value},Res}}}};
-		Error -> 
-		    {error,{asn1,{{decode,
-				   {Module,Type,Value},Error}}}}
-	    end;
-	Error ->
-	    {error,{asn1,{encode,{{Module,Type,Value},Error}}}}
-    end.
-
-value(Module) ->
-    start(),
-    M = asn1_db:dbget(Module,'MODULE'),
-    {Types,_Values,_Ptypes,_Classes,_Objects,_ObjectSets} = M#module.typeorval,
-    lists:map(fun(A) ->value(Module,A) end,Types).
-
-value(Module,Type) ->
-    start(),
-    case catch asn1ct_value:get_type(Module,Type,no) of
-	{error,Reason} ->
-	    {error,Reason};
-	{'EXIT',Reason} ->
-	    {error,Reason};
-	Result ->
-	    {ok,Result}
-    end.
-
-cmp(Module,InFile) ->
-    Base = filename:basename(InFile),
-    Dir = filename:dirname(InFile),
-    Ext = filename:extension(Base),
-    Finfo = file:read_file_info(InFile),
-    Minfo = file:read_file_info(filename:join(Dir,lists:concat([Module,Ext]))),
-    case Finfo of
-	Minfo ->
-	    ok;
-	_ ->
-	    io:format("asn1error: Modulename and filename must be equal~n",[]),
-	    throw(error)
-    end.
-
-vsn() ->
-    ?vsn.
-
-print_error_message([got,H|T]) when list(H) ->
-    io:format(" got:"),
-    print_listing(H,"and"),
-    print_error_message(T);
-print_error_message([expected,H|T]) when list(H) ->
-    io:format(" expected one of:"),
-    print_listing(H,"or"),
-    print_error_message(T);
-print_error_message([H|T])  ->
-    io:format(" ~p",[H]),
-    print_error_message(T);
-print_error_message([]) ->
-    io:format("~n").
-
-print_listing([H1,H2|[]],AndOr) ->
-    io:format(" ~p ~s ~p",[H1,AndOr,H2]);
-print_listing([H1,H2|T],AndOr) ->
-    io:format(" ~p,",[H1]),
-    print_listing([H2|T],AndOr);
-print_listing([H],_AndOr) ->
-    io:format(" ~p",[H]);
-print_listing([],_) ->
-    ok.
-
-
-%% functions to administer ets tables
-
-%% Always creates a new table
-create_ets_table(Name,Options) when atom(Name) ->
-    case ets:info(Name) of
-	undefined ->
-	    ets:new(Name,Options);
-	_  ->
-	    ets:delete(Name),
-	    ets:new(Name,Options)
-    end.
-
-%% Creates a new ets table only if no table exists
-create_if_no_table(Name,Options) ->
-    case ets:info(Name) of
-	undefined ->
-	    %% create a new table
-	    create_ets_table(Name,Options);
-	_ -> ok
-    end.
-    
-
-delete_tables([Table|Ts]) ->
-    case ets:info(Table) of
-	undefined -> ok;
-	_ -> ets:delete(Table)
-    end,
-    delete_tables(Ts);
-delete_tables([]) ->
-    ok.
-
-
-specialized_decode_prepare(Erule,M,TsAndVs,Options) ->
-%     Asn1confMember = 
-% 	fun([{asn1config,File}|_],_) ->
-% 		{true,File};
-% 	   ([],_) -> false;
-% 	   ([_H|T],Fun) ->
-% 		Fun(T,Fun)
-% 	end,
-%     case Asn1confMember(Options,Asn1confMember) of
-%	{true,File} ->
-    case lists:member(asn1config,Options) of
-	true ->
-	    partial_decode_prepare(Erule,M,TsAndVs,Options);
-	_ ->
-	    ok
-    end.
-%% Reads the configuration file if it exists and stores information
-%% about partial decode and incomplete decode
-partial_decode_prepare(ber_bin_v2,M,TsAndVs,Options) when tuple(TsAndVs) ->
-    %% read configure file
-%    Types = element(1,TsAndVs),
-    CfgList = read_config_file(M#module.name),
-    SelectedDecode = get_config_info(CfgList,partial_decode),
-    ExclusiveDecode = get_config_info(CfgList,exclusive_decode),
-    CommandList = 
-	create_partial_decode_gen_info(M#module.name,SelectedDecode),
-%    io:format("partial_decode = ~p~n",[CommandList]),
-    
-    save_config(partial_decode,CommandList),
-    CommandList2 = 
-	create_partial_inc_decode_gen_info(M#module.name,ExclusiveDecode),
-%    io:format("partial_incomplete_decode = ~p~n",[CommandList2]),
-    Part_inc_tlv_tags = tag_format(ber_bin_v2,Options,CommandList2),
-%    io:format("partial_incomplete_decode: tlv_tags = ~p~n",[Part_inc_tlv_tags]),
-    save_config(partial_incomplete_decode,Part_inc_tlv_tags),
-    save_gen_state(ExclusiveDecode,Part_inc_tlv_tags);
-partial_decode_prepare(_,_,_,_) ->
-    ok.
-
-
-
-%% create_partial_inc_decode_gen_info/2
-%%
-%% Creats a list of tags out of the information in TypeNameList that
-%% tells which value will be incomplete decoded, i.e. each end
-%% component/type in TypeNameList. The significant types/components in
-%% the path from the toptype must be specified in the
-%% TypeNameList. Significant elements are all constructed types that
-%% branches the path to the leaf and the leaf it selfs.
-%%
-%% Returns a list of elements, where an element may be one of
-%% mandatory|[opt,Tag]|[bin,Tag]. mandatory correspond to a mandatory
-%% element that shall be decoded as usual. [opt,Tag] matches an
-%% OPTIONAL or DEFAULT element that shall be decoded as
-%% usual. [bin,Tag] corresponds to an element, mandatory, OPTIONAL or
-%% DEFAULT, that shall be left encoded (incomplete decoded).
-create_partial_inc_decode_gen_info(ModName,{Mod,[{Name,L}|Ls]}) when list(L) ->
-    TopTypeName = partial_inc_dec_toptype(L),
-    [{Name,TopTypeName,
-      create_partial_inc_decode_gen_info1(ModName,TopTypeName,{Mod,L})}|
-     create_partial_inc_decode_gen_info(ModName,{Mod,Ls})];
-create_partial_inc_decode_gen_info(_,{_,[]}) ->
-    [];
-create_partial_inc_decode_gen_info(_,[]) ->
-    [].
-
-create_partial_inc_decode_gen_info1(ModName,TopTypeName,{ModName,
-					    [_TopType|Rest]}) ->
-    case asn1_db:dbget(ModName,TopTypeName) of
-	#typedef{typespec=TS} ->
-	    TagCommand = get_tag_command(TS,?MANDATORY,mandatory),
-	    create_pdec_inc_command(ModName,get_components(TS#type.def),
-				    Rest,[TagCommand]);
-	_ ->
-	    throw({error,{"wrong type list in asn1 config file",
-			  TopTypeName}})
-    end;
-create_partial_inc_decode_gen_info1(M1,_,{M2,_}) when M1 /= M2 ->
-    throw({error,{"wrong module name in asn1 config file",
-		  M2}});
-create_partial_inc_decode_gen_info1(_,_,TNL) ->
-    throw({error,{"wrong type list in asn1 config file",
-		  TNL}}).
-
-%%
-%% Only when there is a 'ComponentType' the config data C1 may be a
-%% list, where the incomplete decode is branched. So, C1 may be a
-%% list, a "binary tuple", a "parts tuple" or an atom. The second
-%% element of a binary tuple and a parts tuple is an atom.
-create_pdec_inc_command(_ModName,_,[],Acc) ->
-    lists:reverse(Acc);
-create_pdec_inc_command(ModName,{Comps1,Comps2},TNL,Acc) 
-  when list(Comps1),list(Comps2) ->
-    create_pdec_inc_command(ModName,Comps1 ++ Comps2,TNL,Acc);
-create_pdec_inc_command(ModN,Clist,[CL|_Rest],Acc) when list(CL) ->
-    create_pdec_inc_command(ModN,Clist,CL,Acc);
-create_pdec_inc_command(ModName,
-			CList=[#'ComponentType'{name=Name,typespec=TS,
-						prop=Prop}|Comps],
-			TNL=[C1|Cs],Acc)  ->
-    case C1 of
-% 	Name ->
-% 	    %% In this case C1 is an atom
-% 	    TagCommand = get_tag_command(TS,?MANDATORY,Prop),
-% 	    create_pdec_inc_command(ModName,get_components(TS#type.def),Cs,[TagCommand|Acc]);
-	{Name,undecoded} ->
-	    TagCommand = get_tag_command(TS,?UNDECODED,Prop),
-	    create_pdec_inc_command(ModName,Comps,Cs,[TagCommand|Acc]);
-	{Name,parts} ->
-	    TagCommand = get_tag_command(TS,?PARTS,Prop),
-	    create_pdec_inc_command(ModName,Comps,Cs,[TagCommand|Acc]);
-	L when list(L) ->
-	    %% This case is only possible as the first element after
-	    %% the top type element, when top type is SEGUENCE or SET.
-	    %% Follow each element in L. Must note every tag on the
-	    %% way until the last command is reached, but it ought to
-	    %% be enough to have a "complete" or "complete optional"
-	    %% command for each component that is not specified in the
-	    %% config file. Then in the TLV decode the components with
-	    %% a "complete" command will be decoded by an ordinary TLV
-	    %% decode.
-	    create_pdec_inc_command(ModName,CList,L,Acc);
-	{Name,RestPartsList} when list(RestPartsList) ->
-	    %% Same as previous, but this may occur at any place in
-	    %% the structure. The previous is only possible as the
-	    %% second element.
-	    case get_tag_command(TS,?MANDATORY,Prop) of
-		?MANDATORY ->
-		    InnerDirectives=
-			create_pdec_inc_command(ModName,TS#type.def,
-						RestPartsList,[]),
-		    create_pdec_inc_command(ModName,Comps,Cs,
-					    [[?MANDATORY,InnerDirectives]|Acc]);
-%		    create_pdec_inc_command(ModName,Comps,Cs,
-%					    [InnerDirectives,?MANDATORY|Acc]);
-		[Opt,EncTag] ->
-		    InnerDirectives = 
-			create_pdec_inc_command(ModName,TS#type.def,
-						RestPartsList,[]),
-		    create_pdec_inc_command(ModName,Comps,Cs,
-					    [[Opt,EncTag,InnerDirectives]|Acc])
-	    end;
-%	    create_pdec_inc_command(ModName,CList,RestPartsList,Acc);
-%%	    create_pdec_inc_command(ModName,TS#type.def,RestPartsList,Acc);
-	_ -> %% this component may not be in the config list
-	    TagCommand = get_tag_command(TS,?MANDATORY,Prop),
-	    create_pdec_inc_command(ModName,Comps,TNL,[TagCommand|Acc])
-    end;
-create_pdec_inc_command(ModName,
-			{'CHOICE',[#'ComponentType'{name=C1,
-						    typespec=TS,
-						    prop=Prop}|Comps]},
-			[{C1,Directive}|Rest],Acc) ->
-    case Directive of
-	List when list(List) ->
-	    [Command,Tag] = get_tag_command(TS,?ALTERNATIVE,Prop),
-	    CompAcc = create_pdec_inc_command(ModName,TS#type.def,List,[]),
-	    create_pdec_inc_command(ModName,{'CHOICE',Comps},Rest,
-				    [[Command,Tag,CompAcc]|Acc]);
-	undecoded ->
-	    TagCommand = get_tag_command(TS,?ALTERNATIVE_UNDECODED,Prop),
-	    create_pdec_inc_command(ModName,{'CHOICE',Comps},Rest,
-				    [TagCommand|Acc]);
-	parts ->
-	    TagCommand = get_tag_command(TS,?ALTERNATIVE_PARTS,Prop),
-	    create_pdec_inc_command(ModName,{'CHOICE',Comps},Rest,
-				    [TagCommand|Acc])
-    end;
-create_pdec_inc_command(ModName,
-			{'CHOICE',[#'ComponentType'{typespec=TS,
-						    prop=Prop}|Comps]},
-			TNL,Acc) ->
-    TagCommand = get_tag_command(TS,?ALTERNATIVE,Prop),
-    create_pdec_inc_command(ModName,{'CHOICE',Comps},TNL,[TagCommand|Acc]);
-create_pdec_inc_command(M,{'CHOICE',{Cs1,Cs2}},TNL,Acc) 
-  when list(Cs1),list(Cs2) ->
-    create_pdec_inc_command(M,{'CHOICE',Cs1 ++ Cs2},TNL,Acc);
-create_pdec_inc_command(ModName,#'Externaltypereference'{module=M,type=Name},
-			TNL,Acc) ->
-    #type{def=Def} = get_referenced_type(M,Name),
-    create_pdec_inc_command(ModName,get_components(Def),TNL,Acc);
-create_pdec_inc_command(_,_,TNL,_) ->
-    throw({error,{"unexpected error when creating partial "
-		  "decode command",TNL}}).
-
-partial_inc_dec_toptype([T|_]) when atom(T) ->
-    T;
-partial_inc_dec_toptype([{T,_}|_]) when atom(T) ->
-    T;
-partial_inc_dec_toptype([L|_]) when list(L) ->
-    partial_inc_dec_toptype(L);
-partial_inc_dec_toptype(_) ->
-    throw({error,{"no top type found for partial incomplete decode"}}).
-
-
-%% Creats a list of tags out of the information in TypeList and Types
-%% that tells which value will be decoded.  Each constructed type that
-%% is in the TypeList will get a "choosen" command. Only the last
-%% type/component in the TypeList may be a primitive type. Components
-%% "on the way" to the final element may get the "skip" or the
-%% "skip_optional" command.
-%% CommandList = [Elements]
-%% Elements = {choosen,Tag}|{skip_optional,Tag}|skip
-%% Tag is a binary with the tag BER encoded.
-create_partial_decode_gen_info(ModName,{{_,ModName},TypeList}) ->
-    case TypeList of
-	[TopType|Rest] ->
-	    case asn1_db:dbget(ModName,TopType) of
-		#typedef{typespec=TS} ->
-		    TagCommand = get_tag_command(TS,?CHOOSEN),
-		    create_pdec_command(ModName,get_components(TS#type.def),
-					Rest,[TagCommand]);
-		_ ->
-		    throw({error,{"wrong type list in asn1 config file",
-				  TypeList}})
-	    end;
-	_ ->
-	    []
-    end;
-create_partial_decode_gen_info(_,[]) ->
-    [];
-create_partial_decode_gen_info(_M1,{{_,M2},_}) ->
-    throw({error,{"wrong module name in asn1 config file",
-				  M2}}).
-
-%% create_pdec_command/4 for each name (type or component) in the
-%% third argument, TypeNameList, a command is created. The command has
-%% information whether the component/type shall be skipped, looked
-%% into or returned. The list of commands is returned.
-create_pdec_command(_ModName,_,[],Acc) ->
-    lists:reverse(Acc);
-create_pdec_command(ModName,[#'ComponentType'{name=C1,typespec=TS}|_Comps],
-		    [C1|Cs],Acc) ->
-    %% this component is a constructed type or the last in the
-    %% TypeNameList otherwise the config spec is wrong
-    TagCommand = get_tag_command(TS,?CHOOSEN),
-    create_pdec_command(ModName,get_components(TS#type.def),
-			Cs,[TagCommand|Acc]);
-create_pdec_command(ModName,[#'ComponentType'{typespec=TS,
-					      prop=Prop}|Comps],
-		    [C2|Cs],Acc) ->
-    TagCommand = 
-	case Prop of
-	    mandatory ->
-		get_tag_command(TS,?SKIP);
-	    _ ->
-		get_tag_command(TS,?SKIP_OPTIONAL)
-	end,
-    create_pdec_command(ModName,Comps,[C2|Cs],[TagCommand|Acc]);
-create_pdec_command(ModName,{'CHOICE',[Comp=#'ComponentType'{name=C1}|_]},TNL=[C1|_Cs],Acc) ->
-    create_pdec_command(ModName,[Comp],TNL,Acc);
-create_pdec_command(ModName,{'CHOICE',[#'ComponentType'{}|Comps]},TNL,Acc) ->
-    create_pdec_command(ModName,{'CHOICE',Comps},TNL,Acc);
-create_pdec_command(ModName,#'Externaltypereference'{module=M,type=C1},
-		    TypeNameList,Acc) ->
-    case get_referenced_type(M,C1) of
-	#type{def=Def} ->
-	    create_pdec_command(ModName,get_components(Def),TypeNameList,
-				Acc);
-	Err ->
-	    throw({error,{"unexpected result when fetching "
-			  "referenced element",Err}})
-    end;
-create_pdec_command(ModName,TS=#type{def=Def},[C1|Cs],Acc) ->
-    %% This case when we got the "components" of a SEQUENCE/SET OF
-    case C1 of
-	[1] ->
-	    %% A list with an integer is the only valid option in a 'S
-	    %% OF', the other valid option would be an empty
-	    %% TypeNameList saying that the entire 'S OF' will be
-	    %% decoded.
-	    TagCommand = get_tag_command(TS,?CHOOSEN),
-	    create_pdec_command(ModName,Def,Cs,[TagCommand|Acc]);
-	[N] when integer(N) ->
-	    TagCommand = get_tag_command(TS,?SKIP),
-	    create_pdec_command(ModName,Def,[[N-1]|Cs],[TagCommand|Acc]);
-	Err ->
-	    throw({error,{"unexpected error when creating partial "
-			  "decode command",Err}})
-    end;
-create_pdec_command(_,_,TNL,_) ->
-    throw({error,{"unexpected error when creating partial "
-		  "decode command",TNL}}).
-	    
-% get_components({'CHOICE',Components}) ->
-%     Components;
-get_components(#'SEQUENCE'{components=Components}) ->
-    Components;
-get_components(#'SET'{components=Components}) ->
-    Components;
-get_components({'SEQUENCE OF',Components}) ->
-    Components;
-get_components({'SET OF',Components}) ->
-    Components;
-get_components(Def) ->
-    Def.
-			   
-%% get_tag_command(Type,Command)
-
-%% Type is the type that has information about the tag Command tells
-%% what to do with the encoded value with the tag of Type when
-%% decoding. 
-get_tag_command(#type{tag=[]},_) ->
-    [];
-get_tag_command(#type{tag=[_Tag]},?SKIP) ->
-    ?SKIP;
-get_tag_command(#type{tag=[Tag]},Command) ->
-    %% encode the tag according to BER
-    [Command,encode_tag_val(decode_class(Tag#tag.class),Tag#tag.form, 
-			    Tag#tag.number)];
-get_tag_command(T=#type{tag=[Tag|Tags]},Command) ->
-    [get_tag_command(T#type{tag=Tag},Command)|
-     get_tag_command(T#type{tag=Tags},Command)].
-
-%% get_tag_command/3 used by create_pdec_inc_command
-get_tag_command(#type{tag=[]},_,_) ->
-    [];
-get_tag_command(#type{tag=[Tag]},?MANDATORY,Prop) ->
-    case Prop of
-	mandatory ->
-	    ?MANDATORY;
-	{'DEFAULT',_} ->
-	    [?DEFAULT,encode_tag_val(decode_class(Tag#tag.class),
-				     Tag#tag.form,Tag#tag.number)];
-	_ -> [?OPTIONAL,encode_tag_val(decode_class(Tag#tag.class),
-				       Tag#tag.form,Tag#tag.number)]
-    end;
-get_tag_command(#type{tag=[Tag]},Command,_) ->
-    [Command,encode_tag_val(decode_class(Tag#tag.class),Tag#tag.form, 
-			    Tag#tag.number)].
-
-
-get_referenced_type(M,Name) ->
-    case asn1_db:dbget(M,Name) of
-	#typedef{typespec=TS} ->
-	    case TS of
-		#type{def=#'Externaltypereference'{module=M2,type=Name2}} ->
-		    %% The tags have already been taken care of in the
-		    %% first reference where they were gathered in a
-		    %% list of tags.
-		    get_referenced_type(M2,Name2);
-		#type{} -> TS;
-		_  ->
-		    throw({error,{"unexpected element when"
-				  " fetching referenced type",TS}})
-	    end;
-	T ->
-	    throw({error,{"unexpected element when fetching "
-			  "referenced type",T}})
-    end.
-
-tag_format(EncRule,_Options,CommandList) ->
-    case EncRule of
-	ber_bin_v2 ->
-	    tlv_tags(CommandList);
-	_ ->
-	    CommandList
-    end.
-
-tlv_tags([]) ->
-    [];
-tlv_tags([mandatory|Rest]) ->
-    [mandatory|tlv_tags(Rest)];
-tlv_tags([[Command,Tag]|Rest]) when atom(Command),binary(Tag) ->
-    [[Command,tlv_tag(Tag)]|tlv_tags(Rest)];
-tlv_tags([[Command,Directives]|Rest]) when atom(Command),list(Directives) ->
-    [[Command,tlv_tags(Directives)]|tlv_tags(Rest)];
-%% remove all empty lists
-tlv_tags([[]|Rest]) ->
-    tlv_tags(Rest);
-tlv_tags([{Name,TopType,L1}|Rest]) when list(L1),atom(TopType) ->
-    [{Name,TopType,tlv_tags(L1)}|tlv_tags(Rest)];
-tlv_tags([[Command,Tag,L1]|Rest]) when list(L1),binary(Tag) ->
-    [[Command,tlv_tag(Tag),tlv_tags(L1)]|tlv_tags(Rest)];
-tlv_tags([L=[L1|_]|Rest]) when list(L1) ->
-    [tlv_tags(L)|tlv_tags(Rest)].
-
-tlv_tag(<<Cl:2,_:1,TagNo:5>>) when TagNo < 31 ->
-    (Cl bsl 16) + TagNo;
-tlv_tag(<<Cl:2,_:1,31:5,0:1,TagNo:7>>) ->
-    (Cl bsl 16) + TagNo;
-tlv_tag(<<Cl:2,_:1,31:5,Buffer/binary>>) ->
-    TagNo = tlv_tag1(Buffer,0),
-    (Cl bsl 16) + TagNo.
-tlv_tag1(<<0:1,PartialTag:7>>,Acc) ->
-    (Acc bsl 7) bor PartialTag;
-tlv_tag1(<<1:1,PartialTag:7,Buffer/binary>>,Acc) ->
-    tlv_tag1(Buffer,(Acc bsl 7) bor PartialTag).
-    
-%% reads the content from the configuration file and returns the
-%% selected part choosen by InfoType. Assumes that the config file
-%% content is an Erlang term.
-read_config_file(ModuleName,InfoType) when atom(InfoType) ->
-    CfgList = read_config_file(ModuleName),
-    get_config_info(CfgList,InfoType).
-
-
-read_config_file(ModuleName) ->
-    case file:consult(lists:concat([ModuleName,'.asn1config'])) of
-%    case file:consult(ModuleName) of
-	{ok,CfgList} ->
-	    CfgList;
-	{error,enoent} ->
-	    Options = get(encoding_options),
-	    Includes = [I || {i,I} <- Options],
-	    read_config_file1(ModuleName,Includes);
-	{error,Reason} ->
-	    file:format_error(Reason),
-	    throw({error,{"error reading asn1 config file",Reason}})
-    end.
-read_config_file1(ModuleName,[]) ->
-    case filename:extension(ModuleName) of
-	".asn1config" ->
-	    throw({error,enoent});
-	_ ->
-	    read_config_file(lists:concat([ModuleName,".asn1config"]))
-    end;
-read_config_file1(ModuleName,[H|T]) ->
-%    File = filename:join([H,lists:concat([ModuleName,'.asn1config'])]),
-    File = filename:join([H,ModuleName]),
-    case file:consult(File) of
-	{ok,CfgList} ->
-	    CfgList;
-	{error,enoent} ->
-	    read_config_file1(ModuleName,T);
-	{error,Reason} ->
-	    file:format_error(Reason),
-	    throw({error,{"error reading asn1 config file",Reason}})
-    end.
-    
-get_config_info(CfgList,InfoType) ->
-    case InfoType of
-	all ->
-	    CfgList;
-	_ ->
-	    case lists:keysearch(InfoType,1,CfgList) of
-		{value,{InfoType,Value}} ->
-		    Value;
-		false ->
-		    []
-	    end
-    end.
-
-%% save_config/2 saves the Info with the key Key
-%% Before saving anything check if a table exists
-save_config(Key,Info) ->
-    create_if_no_table(asn1_general,[named_table]),
-    ets:insert(asn1_general,{{asn1_config,Key},Info}).
-
-read_config_data(Key) ->
-    case ets:info(asn1_general) of
-	undefined -> undefined;
-	_ ->
-	    case ets:lookup(asn1_general,{asn1_config,Key}) of
-		[{_,Data}] -> Data;
-		Err -> 
-		    io:format("strange data from config file ~w~n",[Err]),
-		    Err
-	    end
-    end.
-
-
-%%
-%% Functions to manipulate the gen_state record saved in the
-%% asn1_general ets table.
-%%
-
-%% saves input data in a new gen_state record
-save_gen_state({_,ConfList},PartIncTlvTagList) ->
-    %ConfList=[{FunctionName,PatternList}|Rest]
-    StateRec = #gen_state{inc_tag_pattern=PartIncTlvTagList,
-			  inc_type_pattern=ConfList},
-    save_config(gen_state,StateRec);
-save_gen_state(_,_) ->
-%%    ok.
-    save_config(gen_state,#gen_state{}).
-
-save_gen_state(GenState) when record(GenState,gen_state) ->
-    save_config(gen_state,GenState).
-
-
-%% get_gen_state_field returns undefined if no gen_state exists or if
-%% Field is undefined or the data at the field.
-get_gen_state_field(Field) ->
-    case read_config_data(gen_state) of
-	undefined ->
-	    undefined;
-	GenState -> 
-	    get_gen_state_field(GenState,Field)
-    end.
-get_gen_state_field(#gen_state{active=Active},active) ->
-    Active;
-get_gen_state_field(_,active) ->
-    false;
-get_gen_state_field(GS,prefix) ->
-    GS#gen_state.prefix;
-get_gen_state_field(GS,inc_tag_pattern) ->
-    GS#gen_state.inc_tag_pattern;
-get_gen_state_field(GS,tag_pattern) ->
-    GS#gen_state.tag_pattern;
-get_gen_state_field(GS,inc_type_pattern) ->
-    GS#gen_state.inc_type_pattern;
-get_gen_state_field(GS,type_pattern) ->
-    GS#gen_state.type_pattern;
-get_gen_state_field(GS,func_name) ->
-    GS#gen_state.func_name;
-get_gen_state_field(GS,namelist) ->
-    GS#gen_state.namelist;
-get_gen_state_field(GS,tobe_refed_funcs) ->
-    GS#gen_state.tobe_refed_funcs;
-get_gen_state_field(GS,gen_refed_funcs) ->
-    GS#gen_state.gen_refed_funcs.
-    
-
-get_gen_state() ->
-    read_config_data(gen_state).
-
-
-update_gen_state(Field,Data) ->
-    case get_gen_state() of
-	State when record(State,gen_state) ->
-	    update_gen_state(Field,State,Data);
-	_ ->
-	    exit({error,{asn1,{internal,
-			       "tried to update nonexistent gen_state",Field,Data}}})
-    end.
-update_gen_state(active,State,Data) ->
-    save_gen_state(State#gen_state{active=Data});
-update_gen_state(prefix,State,Data) ->
-    save_gen_state(State#gen_state{prefix=Data});
-update_gen_state(inc_tag_pattern,State,Data) ->
-    save_gen_state(State#gen_state{inc_tag_pattern=Data});
-update_gen_state(tag_pattern,State,Data) ->
-    save_gen_state(State#gen_state{tag_pattern=Data});
-update_gen_state(inc_type_pattern,State,Data) ->
-    save_gen_state(State#gen_state{inc_type_pattern=Data});
-update_gen_state(type_pattern,State,Data) ->
-    save_gen_state(State#gen_state{type_pattern=Data});
-update_gen_state(func_name,State,Data) ->
-    save_gen_state(State#gen_state{func_name=Data});
-update_gen_state(namelist,State,Data) ->
-%     SData =
-% 	case Data of
-% 	    [D] when list(D) -> D;
-% 	    _ -> Data
-% 	end,
-    save_gen_state(State#gen_state{namelist=Data});
-update_gen_state(tobe_refed_funcs,State,Data) ->
-    save_gen_state(State#gen_state{tobe_refed_funcs=Data});
-update_gen_state(gen_refed_funcs,State,Data) ->
-    save_gen_state(State#gen_state{gen_refed_funcs=Data}).
-
-update_namelist(Name) ->
-    case get_gen_state_field(namelist) of
-	[Name,Rest] -> update_gen_state(namelist,Rest);
-	[Name|Rest] -> update_gen_state(namelist,Rest);
-	[{Name,List}] when list(List) -> update_gen_state(namelist,List);
-	[{Name,Atom}|Rest] when atom(Atom) -> update_gen_state(namelist,Rest);
-	Other -> Other
-    end.
-
-pop_namelist() ->
-    DeepTail = %% removes next element in order
-	fun([[{_,A}]|T],_Fun) when atom(A) -> T;
-	   ([{_N,L}|T],_Fun) when list(L) -> [L|T];
-	   ([[]|T],Fun) -> Fun(T,Fun);
-	   ([L1|L2],Fun) when list(L1) ->
-		case lists:flatten(L1) of
-		    [] -> Fun([L2],Fun);
-		    _ -> [Fun(L1,Fun)|L2]
-		end;
-	   ([_H|T],_Fun) -> T
-	end,
-    {Pop,NewNL} =
-	case get_gen_state_field(namelist) of
-	    [] -> {[],[]};
-	    L ->
-		{next_namelist_el(L),
-		 DeepTail(L,DeepTail)}
-	end,
-    update_gen_state(namelist,NewNL),
-    Pop.
-
-%% next_namelist_el fetches the next type/component name in turn in
-%% the namelist, without changing the namelist.
-next_namelist_el() ->
-    case get_gen_state_field(namelist) of
-	undefined -> undefined;
-	L when list(L) -> next_namelist_el(L)
-    end.
-
-next_namelist_el([]) ->
-    [];
-next_namelist_el([L]) when list(L) ->
-    next_namelist_el(L);
-next_namelist_el([H|_]) when atom(H) ->
-    H;
-next_namelist_el([L|T]) when list(L) ->
-    case next_namelist_el(L) of
-	[] ->
-	    next_namelist_el([T]);
-	R ->
-	    R
-    end;
-next_namelist_el([H={_,A}|_]) when atom(A) ->
-    H.
-
-%% removes a bracket from the namelist
-step_in_constructed() ->
-    case get_gen_state_field(namelist) of
-	[L] when list(L) ->
-	    update_gen_state(namelist,L);
-	_ -> ok
-    end.
-			
-is_function_generated(Name) ->
-    case get_gen_state_field(gen_refed_funcs) of
-	L when list(L) ->
-	    lists:member(Name,L);
-	_ ->
-	    false
-    end.
-			       
-get_tobe_refed_func(Name) ->
-    case get_gen_state_field(tobe_refed_funcs) of
-	L when list(L) ->
-	    case lists:keysearch(Name,1,L) of
-		{_,Element} ->
-		    Element;
-		_ ->
-		    undefined
-	    end;
-	_ ->
-	    undefined
-    end.
-
-add_tobe_refed_func(Data) ->
-    L = get_gen_state_field(tobe_refed_funcs),
-    update_gen_state(tobe_refed_funcs,[Data|L]).
-
-%% moves Name from the to be list to the generated list.
-generated_refed_func(Name) ->
-    L = get_gen_state_field(tobe_refed_funcs),
-    NewL = lists:keydelete(Name,1,L),
-    update_gen_state(tobe_refed_funcs,NewL),
-    L2 = get_gen_state_field(gen_refed_funcs),
-    update_gen_state(gen_refed_funcs,[Name|L2]).
-
-add_generated_refed_func(Data) ->
-    L = get_gen_state_field(gen_refed_funcs),
-    update_gen_state(gen_refed_funcs,[Data|L]).
-
-
-next_refed_func() ->
-    case get_gen_state_field(tobe_refed_funcs) of
-	[] ->
-	    [];
-	[H|T] ->
-	    update_gen_state(tobe_refed_funcs,T),
-	    H
-    end.
-
-reset_gen_state() ->
-    save_gen_state(#gen_state{}).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_check.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_check.erl
deleted file mode 100644
index 9da6611dba..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_check.erl
+++ /dev/null
@@ -1,5567 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_check.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
-%%
--module(asn1ct_check).
-
-%% Main Module for ASN.1 compile time functions
-
-%-compile(export_all).
--export([check/2,storeindb/1]).
--include("asn1_records.hrl").
-%%% The tag-number for universal types
--define(N_BOOLEAN, 1). 
--define(N_INTEGER, 2). 
--define(N_BIT_STRING, 3).
--define(N_OCTET_STRING, 4).
--define(N_NULL, 5). 
--define(N_OBJECT_IDENTIFIER, 6). 
--define(N_OBJECT_DESCRIPTOR, 7). 
--define(N_EXTERNAL, 8). % constructed
--define(N_INSTANCE_OF,8).
--define(N_REAL, 9). 
--define(N_ENUMERATED, 10).   
--define(N_EMBEDDED_PDV, 11). % constructed
--define(N_SEQUENCE, 16). 
--define(N_SET, 17). 
--define(N_NumericString, 18).
--define(N_PrintableString, 19).
--define(N_TeletexString, 20).
--define(N_VideotexString, 21).
--define(N_IA5String, 22).
--define(N_UTCTime, 23). 
--define(N_GeneralizedTime, 24). 
--define(N_GraphicString, 25).
--define(N_VisibleString, 26).
--define(N_GeneralString, 27).
--define(N_UniversalString, 28).
--define(N_CHARACTER_STRING, 29). % constructed
--define(N_BMPString, 30).
-
--define(TAG_PRIMITIVE(Num),
-	case S#state.erule of
-	    ber_bin_v2 ->
-		#tag{class='UNIVERSAL',number=Num,type='IMPLICIT',form=0};
-	    _ -> []
-	end).
--define(TAG_CONSTRUCTED(Num),
-	case S#state.erule of
-	    ber_bin_v2 ->
-		#tag{class='UNIVERSAL',number=Num,type='IMPLICIT',form=32};
-	    _ -> []
-	end).
-
--record(newt,{type=unchanged,tag=unchanged,constraint=unchanged,inlined=no}). % used in check_type to update type and tag
--record(newv,{type=unchanged,value=unchanged}). % used in check_value to update type and value
- 
-check(S,{Types,Values,ParameterizedTypes,Classes,Objects,ObjectSets}) ->
-    %%Predicates used to filter errors
-    TupleIs = fun({T,_},T) -> true;
-		 (_,_) -> false
-	      end,
-    IsClass = fun(X) -> TupleIs(X,asn1_class) end,
-    IsObjSet = fun(X) -> TupleIs(X,objectsetdef) end,
-    IsPObjSet = fun(X) -> TupleIs(X,pobjectsetdef) end,
-    IsObject = fun(X) -> TupleIs(X,objectdef) end,
-    IsValueSet = fun(X) -> TupleIs(X,valueset) end,
-    Element2 = fun(X) -> element(2,X) end,
-
-    _Perror = checkp(S,ParameterizedTypes,[]), % must do this before the templates are used
-    Terror = checkt(S,Types,[]),
-
-    %% get parameterized object sets sent to checkt/3
-    %% and update Terror
-
-    {PObjSetNames1,Terror2} = filter_errors(IsPObjSet,Terror),
-
-    Verror = checkv(S,Values ++ ObjectSets,[]), %value sets may be parsed as object sets
-    
-     %% get information object classes wrongly sent to checkt/3
-     %% and update Terror2
-
-    {AddClasses,Terror3} = filter_errors(IsClass,Terror2),
-
-    NewClasses = Classes++AddClasses,
-
-    Cerror = checkc(S,NewClasses,[]),
-
-     %% get object sets incorrectly sent to checkv/3
-     %% and update Verror
-
-    {ObjSetNames,Verror2} = filter_errors(IsObjSet,Verror),
-
-     %% get parameterized object sets incorrectly sent to checkv/3
-     %% and update Verror2
-
-    {PObjSetNames,Verror3} = filter_errors(IsPObjSet,Verror2),
-
-     %% get objects incorrectly sent to checkv/3
-     %% and update Verror3
-
-    {ObjectNames,Verror4} = filter_errors(IsObject,Verror3),
-
-    NewObjects = Objects++ObjectNames,
-    NewObjectSets = ObjSetNames ++ PObjSetNames ++ PObjSetNames1,
-
-     %% get value sets
-     %% and update Verror4
-
-    {ValueSetNames,Verror5} = filter_errors(IsValueSet,Verror4),
-
-    asn1ct:create_ets_table(inlined_objects,[named_table]),
-    {Oerror,ExclO,ExclOS} = checko(S,NewObjects ++
-				   NewObjectSets,
-				   [],[],[]),
-    InlinedObjTuples = ets:tab2list(inlined_objects),
-    InlinedObjects = lists:map(Element2,InlinedObjTuples),
-    ets:delete(inlined_objects),
-
-    Exporterror = check_exports(S,S#state.module),
-    case {Terror3,Verror5,Cerror,Oerror,Exporterror} of
-	{[],[],[],[],[]} -> 
-	    ContextSwitchTs = context_switch_in_spec(),
-	    InstanceOf = instance_of_in_spec(),
-	    NewTypes = lists:subtract(Types,AddClasses) ++ ContextSwitchTs
-		++ InstanceOf,
-	    NewValues = lists:subtract(Values,PObjSetNames++ObjectNames++
-				       ValueSetNames),
-	    {ok,
-	     {NewTypes,NewValues,ParameterizedTypes,
-	      NewClasses,NewObjects,NewObjectSets},
-	     {NewTypes,NewValues,ParameterizedTypes,NewClasses,
-	      lists:subtract(NewObjects,ExclO)++InlinedObjects,
-	      lists:subtract(NewObjectSets,ExclOS)}};
-	_ ->{error,{asn1,lists:flatten([Terror3,Verror5,Cerror,
-					Oerror,Exporterror])}}
-    end.
-
-context_switch_in_spec() ->
-    L = [{external,'EXTERNAL'},
-	 {embedded_pdv,'EMBEDDED PDV'},
-	 {character_string,'CHARACTER STRING'}],
-    F = fun({T,TName},Acc) ->
-		case get(T) of
-		    generate -> erase(T),
-				[TName|Acc];
-		    _ -> Acc
-		end
-	end,
-    lists:foldl(F,[],L).
-
-instance_of_in_spec() ->
-    case get(instance_of) of
-	generate ->
-	    erase(instance_of),
-	    ['INSTANCE OF'];
-	_ ->
-	    []
-    end.
-
-filter_errors(Pred,ErrorList) ->
-    Element2 = fun(X) -> element(2,X) end,
-    RemovedTupleElements = lists:filter(Pred,ErrorList),
-    RemovedNames = lists:map(Element2,RemovedTupleElements),
-    %% remove value set name tuples from Verror
-    RestErrors = lists:subtract(ErrorList,RemovedTupleElements),
-    {RemovedNames,RestErrors}.
-
-    
-check_exports(S,Module = #module{}) ->
-    case Module#module.exports of
-	{exports,[]} ->
-	    [];
-	{exports,all} ->
-	    [];
-	{exports,ExportList} when list(ExportList) ->
-	    IsNotDefined = 
-		fun(X) ->
-			case catch get_referenced_type(S,X) of
-			    {error,{asn1,_}} ->
-				true;
-			    _ -> false
-			end
-		end,
-	    case lists:filter(IsNotDefined,ExportList) of
-		[] ->
-		    [];
-		NoDefExp ->
-		    GetName =
-			fun(T = #'Externaltypereference'{type=N})-> 
-				%%{exported,undefined,entity,N} 
-				NewS=S#state{type=T,tname=N},
-				error({export,"exported undefined entity",NewS})
-			end,
-		    lists:map(GetName,NoDefExp)
-	    end
-    end.
-			  
-checkt(S,[Name|T],Acc) ->
-    %%io:format("check_typedef:~p~n",[Name]),
-    Result = 
-	case asn1_db:dbget(S#state.mname,Name) of
-	    undefined ->
-		error({type,{internal_error,'???'},S});
-	    Type when record(Type,typedef) ->
-		NewS = S#state{type=Type,tname=Name},
-		case catch(check_type(NewS,Type,Type#typedef.typespec)) of
-		    {error,Reason} ->
-			error({type,Reason,NewS});
-		    {'EXIT',Reason} ->
-			error({type,{internal_error,Reason},NewS});
-		    {asn1_class,_ClassDef} ->
-			{asn1_class,Name};
-		    pobjectsetdef ->
-			{pobjectsetdef,Name};
-		    pvalueset ->
-			{pvalueset,Name};
-		    Ts ->
-			case Type#typedef.checked of
-			    true -> % already checked and updated
-				ok;
-			    _ ->
-				NewTypeDef = Type#typedef{checked=true,typespec = Ts},
-				%io:format("checkt:dbput:~p, ~p~n",[S#state.mname,NewTypeDef#typedef.name]),
-				asn1_db:dbput(NewS#state.mname,Name,NewTypeDef), % update the type
-				ok
-			end
-		end
-	end,
-    case Result of
-	ok ->
-	    checkt(S,T,Acc);
-	_ ->
-	    checkt(S,T,[Result|Acc])
-    end;
-checkt(S,[],Acc) ->
-    case check_contextswitchingtypes(S,[]) of
-	[] ->
-	    lists:reverse(Acc);
-	L ->
-	    checkt(S,L,Acc)
-    end.
-
-check_contextswitchingtypes(S,Acc) ->
-    CSTList=[{external,'EXTERNAL'},
-	     {embedded_pdv,'EMBEDDED PDV'},
-	     {character_string,'CHARACTER STRING'}],
-    check_contextswitchingtypes(S,CSTList,Acc).
-
-check_contextswitchingtypes(S,[{T,TName}|Ts],Acc) ->
-     case get(T) of
-	unchecked ->
-	    put(T,generate),
-	    check_contextswitchingtypes(S,Ts,[TName|Acc]);
-	_ ->
-	    check_contextswitchingtypes(S,Ts,Acc)
-     end;
-check_contextswitchingtypes(_,[],Acc) ->
-    Acc.
-
-checkv(S,[Name|T],Acc) ->
-    %%io:format("check_valuedef:~p~n",[Name]),
-    Result = case asn1_db:dbget(S#state.mname,Name) of
-		 undefined -> error({value,{internal_error,'???'},S});
-		 Value when record(Value,valuedef);
-			    record(Value,typedef); %Value set may be parsed as object set.
-			    record(Value,pvaluedef);
-			    record(Value,pvaluesetdef) ->
-		     NewS = S#state{value=Value},
-		     case catch(check_value(NewS,Value)) of
-			 {error,Reason} ->
-			     error({value,Reason,NewS});
-			 {'EXIT',Reason} ->
-			     error({value,{internal_error,Reason},NewS});
-			 {pobjectsetdef} ->
-			     {pobjectsetdef,Name};
-			 {objectsetdef} ->
-			     {objectsetdef,Name};
-			 {objectdef} ->
-			     %% this is an object, save as typedef
-			     #valuedef{checked=C,pos=Pos,name=N,type=Type,
-				       value=Def}=Value,
-%			     Currmod = S#state.mname,
-%			     #type{def=
-%				   #'Externaltypereference'{module=Mod,
-%							    type=CName}} = Type,
-			     ClassName =
-				 Type#type.def,
-% 				 case Mod of
-% 				     Currmod ->
-% 					 {objectclassname,CName};
-% 				     _ ->
-% 					 {objectclassname,Mod,CName}
-% 				 end,
-			     NewSpec = #'Object'{classname=ClassName,
-						 def=Def},
-			     NewDef = #typedef{checked=C,pos=Pos,name=N,
-					       typespec=NewSpec},
-			     asn1_db:dbput(NewS#state.mname,Name,NewDef),
-			     {objectdef,Name};
-			 {valueset,VSet} ->
-			     Pos = asn1ct:get_pos_of_def(Value),
-			     CheckedVSDef = #typedef{checked=true,pos=Pos,
-						     name=Name,typespec=VSet},
-			     asn1_db:dbput(NewS#state.mname,Name,CheckedVSDef),
-			     {valueset,Name};
-			 V ->
-			     %% update the valuedef
-			     asn1_db:dbput(NewS#state.mname,Name,V), 
-			     ok
-		     end
-	     end,
-    case Result of
-	ok ->
-	    checkv(S,T,Acc);
-	_ ->
-	    checkv(S,T,[Result|Acc])
-    end;
-checkv(_S,[],Acc) ->
-    lists:reverse(Acc).
-
-
-checkp(S,[Name|T],Acc) ->
-    %io:format("check_ptypedef:~p~n",[Name]),
-    Result = case asn1_db:dbget(S#state.mname,Name) of
-	undefined ->
-	    error({type,{internal_error,'???'},S});
-	Type when record(Type,ptypedef) ->
-	    NewS = S#state{type=Type,tname=Name},
-	    case catch(check_ptype(NewS,Type,Type#ptypedef.typespec)) of
-		{error,Reason} ->
-		    error({type,Reason,NewS});
-		{'EXIT',Reason} ->
-		    error({type,{internal_error,Reason},NewS});
-		{asn1_class,_ClassDef} ->
-		    {asn1_class,Name};
-		Ts ->
-		    NewType = Type#ptypedef{checked=true,typespec = Ts},
-		    asn1_db:dbput(NewS#state.mname,Name,NewType), % update the type
-		    ok
-	    end
-	     end,
-    case Result of
-	ok ->
-	    checkp(S,T,Acc);
-	_ ->
-	    checkp(S,T,[Result|Acc])
-    end;
-checkp(_S,[],Acc) ->
-    lists:reverse(Acc).
-
-
-
-
-checkc(S,[Name|Cs],Acc) ->
-    Result = 
-	case asn1_db:dbget(S#state.mname,Name) of
-	    undefined ->
-		error({class,{internal_error,'???'},S});
-	    Class  ->
-		ClassSpec = if
-			       record(Class,classdef) ->
-				   Class#classdef.typespec;
-			       record(Class,typedef) ->
-				   Class#typedef.typespec
-			   end,
-		NewS = S#state{type=Class,tname=Name},
-		case catch(check_class(NewS,ClassSpec)) of
-		    {error,Reason} ->
-			error({class,Reason,NewS});
-		    {'EXIT',Reason} ->
-			error({class,{internal_error,Reason},NewS});
-		    C ->
-			%% update the classdef
-			NewClass = 
-			    if
-				record(Class,classdef) ->
-				    Class#classdef{checked=true,typespec=C};
-				record(Class,typedef) ->
-				    #classdef{checked=true,name=Name,typespec=C}
-			    end,
-			asn1_db:dbput(NewS#state.mname,Name,NewClass),
-			ok
-		end
-	end,
-    case Result of
-	ok ->
-	    checkc(S,Cs,Acc);
-	_ ->
-	    checkc(S,Cs,[Result|Acc])
-    end;
-checkc(_S,[],Acc) ->
-%%    include_default_class(S#state.mname),
-    lists:reverse(Acc).
-    
-checko(S,[Name|Os],Acc,ExclO,ExclOS) ->
-    Result = 
-	case asn1_db:dbget(S#state.mname,Name) of
-	    undefined ->
-		error({type,{internal_error,'???'},S});
-	    Object when record(Object,typedef) ->
-		NewS = S#state{type=Object,tname=Name},
-		case catch(check_object(NewS,Object,Object#typedef.typespec)) of
-		    {error,Reason} ->
-			error({type,Reason,NewS});
-		    {'EXIT',Reason} ->
-			error({type,{internal_error,Reason},NewS});
-		    {asn1,Reason} ->
-			error({type,Reason,NewS});
-		    O ->
-			NewObj = Object#typedef{checked=true,typespec=O},
-			asn1_db:dbput(NewS#state.mname,Name,NewObj),
-			if
-			    record(O,'Object') ->
-				case O#'Object'.gen of
-				    true ->
-					{ok,ExclO,ExclOS};
-				    false ->
-					{ok,[Name|ExclO],ExclOS}
-				end;
-			    record(O,'ObjectSet') ->
-				case O#'ObjectSet'.gen of
-				    true ->
-					{ok,ExclO,ExclOS};
-				    false ->
-					{ok,ExclO,[Name|ExclOS]}
-				end
-			end
-		end;
-	    PObject when record(PObject,pobjectdef) ->
-		NewS = S#state{type=PObject,tname=Name},
-		case (catch check_pobject(NewS,PObject)) of
-		    {error,Reason} ->
-			error({type,Reason,NewS});
-		    {'EXIT',Reason} ->
-			error({type,{internal_error,Reason},NewS});
-		    {asn1,Reason} ->
-			error({type,Reason,NewS});
-		    PO ->
-			NewPObj = PObject#pobjectdef{def=PO},
-			asn1_db:dbput(NewS#state.mname,Name,NewPObj),
-			{ok,[Name|ExclO],ExclOS}
-		end;
-	    PObjSet when record(PObjSet,pvaluesetdef) ->
-		%% this is a parameterized object set. Might be a parameterized
-		%% value set, couldn't it?
-		NewS = S#state{type=PObjSet,tname=Name},
-		case (catch check_pobjectset(NewS,PObjSet)) of
-		    {error,Reason} ->
-			error({type,Reason,NewS});
-		    {'EXIT',Reason} ->
-			error({type,{internal_error,Reason},NewS});
-		    {asn1,Reason} ->
-			error({type,Reason,NewS});
-		    POS ->
-			%%NewPObjSet = PObjSet#pvaluesetdef{valueset=POS},
-			asn1_db:dbput(NewS#state.mname,Name,POS),
-			{ok,ExclO,[Name|ExclOS]}
-		end
-	end,
-    case Result of
-	{ok,NewExclO,NewExclOS} ->
-	    checko(S,Os,Acc,NewExclO,NewExclOS);
-	_ ->
-	    checko(S,Os,[Result|Acc],ExclO,ExclOS)
-    end;
-checko(_S,[],Acc,ExclO,ExclOS) ->
-    {lists:reverse(Acc),lists:reverse(ExclO),lists:reverse(ExclOS)}.
-
-check_class(S,CDef=#classdef{checked=Ch,name=Name,typespec=TS}) ->
-    case Ch of
-	true -> TS;
-	idle -> TS;
-	_ ->
-	    NewCDef = CDef#classdef{checked=idle},
-	    asn1_db:dbput(S#state.mname,Name,NewCDef),
-	    CheckedTS = check_class(S,TS),
-	    asn1_db:dbput(S#state.mname,Name,
-			  NewCDef#classdef{checked=true,
-					   typespec=CheckedTS}),
-	    CheckedTS
-    end;
-check_class(S = #state{mname=M,tname=T},ClassSpec) 
-  when record(ClassSpec,type) ->
-    Def = ClassSpec#type.def,
-    case Def of
-	#'Externaltypereference'{module=M,type=T} ->
-	    #objectclass{fields=Def}; % in case of recursive definitions
-	Tref when record(Tref,'Externaltypereference') ->
-	    {_,RefType} = get_referenced_type(S,Tref),
-% 	    case RefType of
-% 		RefClass when record(RefClass,classdef) ->
-% 		    check_class(S,RefClass#classdef.typespec)
-% 	    end
-	    case is_class(S,RefType) of
-		true ->
-		    check_class(S,get_class_def(S,RefType));
-		_ ->
-		    error({class,{internal_error,RefType},S})
-	    end
-    end;
-% check_class(S,{objectclassname,ModuleName,ClassName}) when atom(ModuleName),atom(ClassName) ->
-%     'fix this';
-check_class(S,C) when record(C,objectclass) ->
-    NewFieldSpec = check_class_fields(S,C#objectclass.fields),
-    C#objectclass{fields=NewFieldSpec};
-%check_class(S,{objectclassname,ClassName}) ->
-check_class(S,ClassName) ->
-    {_,Def} = get_referenced_type(S,ClassName),
-    case Def of
-	ClassDef when record(ClassDef,classdef) ->
-	    case ClassDef#classdef.checked of
-		true ->
-		    ClassDef#classdef.typespec;
-		idle ->
-		    ClassDef#classdef.typespec;
-		false ->
-		    check_class(S,ClassDef#classdef.typespec)
-	    end;
-	TypeDef when record(TypeDef,typedef) ->
-	    %% this case may occur when a definition is a reference 
-	    %% to a class definition.
-	    case TypeDef#typedef.typespec of
-		#type{def=Ext} when record(Ext,'Externaltypereference') ->
-		    check_class(S,Ext)
-	    end
-    end;
-check_class(_S,{poc,_ObjSet,_Params}) ->
-    'fix this later'.
-
-check_class_fields(S,Fields) ->
-    check_class_fields(S,Fields,[]).
-
-check_class_fields(S,[F|Fields],Acc) ->
-    NewField = 
-	case element(1,F) of
-	    fixedtypevaluefield ->
-		{_,Name,Type,Unique,OSpec} = F,
-		RefType = check_type(S,#typedef{typespec=Type},Type),
-		{fixedtypevaluefield,Name,RefType,Unique,OSpec};
-	    object_or_fixedtypevalue_field ->
-		{_,Name,Type,Unique,OSpec} = F,
-		Cat = 
-		    case asn1ct_gen:type(asn1ct_gen:get_inner(Type#type.def)) of
-			Def when record(Def,typereference);
-				 record(Def,'Externaltypereference') ->
-			    {_,D} = get_referenced_type(S,Def),
-			    D;
-			{undefined,user} -> 
-			    %% neither of {primitive,bif} or {constructed,bif}
-%%			    {_,D} = get_referenced_type(S,#typereference{val=Type#type.def}),
-			    {_,D} = get_referenced_type(S,#'Externaltypereference'{module=S#state.mname,type=Type#type.def}),
-			    D;
-			_ ->
-			    Type
-		    end,
-		case Cat of
-		    Class when record(Class,classdef) ->
-			{objectfield,Name,Type,Unique,OSpec};
-		    _ ->
-			RefType = check_type(S,#typedef{typespec=Type},Type),	
-			{fixedtypevaluefield,Name,RefType,Unique,OSpec}
-		end;
-	    objectset_or_fixedtypevalueset_field ->
-		{_,Name,Type,OSpec} = F,
-%%		RefType = check_type(S,#typedef{typespec=Type},Type),
-		RefType =
-		    case (catch check_type(S,#typedef{typespec=Type},Type)) of
-			{asn1_class,_ClassDef} ->
-			    case if_current_checked_type(S,Type) of
-				true ->
-				    Type#type.def;
-				_ ->
-				    check_class(S,Type)
-			    end;
-			CheckedType when record(CheckedType,type) ->
-			    CheckedType;
-			_ ->
-			    error({class,"internal error, check_class_fields",S})
-		    end,
-		if
-		    record(RefType,'Externaltypereference') ->
-			{objectsetfield,Name,Type,OSpec};
-		    record(RefType,classdef) ->
-			{objectsetfield,Name,Type,OSpec};
-		    record(RefType,objectclass) ->
-			{objectsetfield,Name,Type,OSpec};
-		    true ->
-			{fixedtypevaluesetfield,Name,RefType,OSpec}
-		end;
-	    typefield ->
-		case F of
-		    {TF,Name,{'DEFAULT',Type}} ->
-			{TF,Name,{'DEFAULT',check_type(S,#typedef{typespec=Type},Type)}};
-		    _ -> F
-		end;
-	    _ -> F
-	end,
-    check_class_fields(S,Fields,[NewField|Acc]);
-check_class_fields(_S,[],Acc) ->
-    lists:reverse(Acc).
-
-if_current_checked_type(S,#type{def=Def}) ->
-    CurrentCheckedName = S#state.tname,
-    MergedModules = S#state.inputmodules,
- %   CurrentCheckedModule = S#state.mname,
-    case Def of
-	#'Externaltypereference'{module=CurrentCheckedName,
-				 type=CurrentCheckedName} ->
-	    true;
-	#'Externaltypereference'{module=ModuleName,
-				 type=CurrentCheckedName} ->
-	    case MergedModules of
-		undefined ->
-		    false;
-		_ ->
-		    lists:member(ModuleName,MergedModules)
-	    end;
-	_ ->
-	    false
-    end.
-
-			  
-
-check_pobject(_S,PObject) when record(PObject,pobjectdef) ->
-    Def = PObject#pobjectdef.def,
-    Def.
-    
-
-check_pobjectset(S,PObjSet) ->
-    #pvaluesetdef{pos=Pos,name=Name,args=Args,type=Type,
-		  valueset=ValueSet}=PObjSet,
-    {Mod,Def} = get_referenced_type(S,Type#type.def),
-    case Def of
-	#classdef{} ->
-	    ClassName = #'Externaltypereference'{module=Mod,
-						 type=Def#classdef.name},
-	    {valueset,Set} = ValueSet,
-%	    ObjectSet = #'ObjectSet'{class={objectclassname,ClassName},
-	    ObjectSet = #'ObjectSet'{class=ClassName,
-				     set=Set},
-	    #pobjectsetdef{pos=Pos,name=Name,args=Args,class=Type#type.def,
-			   def=ObjectSet};
-	_ ->
-	    PObjSet
-    end.
-
-check_object(_S,ObjDef,ObjSpec) when (ObjDef#typedef.checked == true) ->
-    ObjSpec;
-check_object(S,_ObjDef,#'Object'{classname=ClassRef,def=ObjectDef}) ->
-    {_,_ClassDef} = get_referenced_type(S,ClassRef),
-    NewClassRef = check_externaltypereference(S,ClassRef),
-    ClassDef =
-	case _ClassDef#classdef.checked of
-	    false ->
-		#classdef{checked=true,
-			  typespec=check_class(S,_ClassDef#classdef.typespec)};
-	    _ ->
-		_ClassDef
-	end,
-    NewObj =
-	case ObjectDef of
-	    Def when tuple(Def), (element(1,Def)==object) ->
-		NewSettingList = check_objectdefn(S,Def,ClassDef),
-		#'Object'{def=NewSettingList};
-%	    Def when tuple(Def), (element(1,Def)=='ObjectFromObject') ->
-%		fixa;
-	    {po,{object,DefObj},ArgsList} ->
-		{_,Object} = get_referenced_type(S,DefObj),%DefObj is a 
-		%%#'Externalvaluereference' or a #'Externaltypereference'
-		%% Maybe this call should be catched and in case of an exception
-		%% an nonallocated parameterized object should be returned.
-		instantiate_po(S,ClassDef,Object,ArgsList);
-	    #'Externalvaluereference'{} ->
-		{_,Object} = get_referenced_type(S,ObjectDef),
-		check_object(S,Object,Object#typedef.typespec);
-	    _  ->
-		exit({error,{no_object,ObjectDef},S})
-	end,
-    Gen = gen_incl(S,NewObj#'Object'.def,
-		   (ClassDef#classdef.typespec)#objectclass.fields),
-    NewObj#'Object'{classname=NewClassRef,gen=Gen};
-
-%%check_object(S,ObjSetDef,ObjSet=#type{def={pt,ObjSetRef,Args}}) ->
-    %% A parameterized 
-	     
-check_object(S,
-	     _ObjSetDef,
-	     ObjSet=#'ObjectSet'{class=ClassRef}) ->
-    {_,ClassDef} = get_referenced_type(S,ClassRef),
-    NewClassRef = check_externaltypereference(S,ClassRef),
-    UniqueFieldName = 
-	case (catch get_unique_fieldname(ClassDef)) of
-	    {error,'__undefined_'} -> {unique,undefined};
-	    {asn1,Msg,_} -> error({class,Msg,S});
-	    Other -> Other
-	end,
-    NewObjSet=
-	case ObjSet#'ObjectSet'.set of
-	    {'SingleValue',Set} when list(Set) ->
-		CheckedSet = check_object_list(S,NewClassRef,Set),
-		NewSet = get_unique_valuelist(S,CheckedSet,UniqueFieldName),
-		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
-				   set=NewSet};
-	    {'SingleValue',{definedvalue,ObjName}} ->
-		{_,ObjDef} = get_referenced_type(S,#identifier{val=ObjName}),
-		#'Object'{def=CheckedObj} = 
-		    check_object(S,ObjDef,ObjDef#typedef.typespec),
-		NewSet = get_unique_valuelist(S,[{ObjDef#typedef.name,
-						  CheckedObj}],
-					      UniqueFieldName),
-		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
-				   set=NewSet};
-	    {'SingleValue',#'Externalvaluereference'{value=ObjName}} ->
-		{_,ObjDef} = get_referenced_type(S,#identifier{val=ObjName}),
-		#'Object'{def=CheckedObj} = 
-		    check_object(S,ObjDef,ObjDef#typedef.typespec),
-		NewSet = get_unique_valuelist(S,[{ObjDef#typedef.name,
-						  CheckedObj}],
-					      UniqueFieldName),
-		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
-				   set=NewSet};
-	    ['EXTENSIONMARK'] ->
-		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
-				   set=['EXTENSIONMARK']};
-	    Set when list(Set) ->
-		CheckedSet = check_object_list(S,NewClassRef,Set),
-		NewSet = get_unique_valuelist(S,CheckedSet,UniqueFieldName),
-		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
-				   set=NewSet};
-	    {Set,Ext} when list(Set) ->
-		CheckedSet = check_object_list(S,NewClassRef,Set++Ext),
-		NewSet = get_unique_valuelist(S,CheckedSet,UniqueFieldName),
-		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
-				   set=NewSet++['EXTENSIONMARK']};
-	    {{'SingleValue',Set},Ext} ->
-		CheckedSet = check_object_list(S,NewClassRef,
-					       merge_sets(Set,Ext)),
-		NewSet = get_unique_valuelist(S,CheckedSet,UniqueFieldName),
-		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
-				   set=NewSet++['EXTENSIONMARK']};
-	    {Type,{'EXCEPT',Exclusion}} when record(Type,type) ->
-		{_,TDef} = get_referenced_type(S,Type#type.def),
-		OS = TDef#typedef.typespec,
-		NewSet = reduce_objectset(OS#'ObjectSet'.set,Exclusion),
-		NewOS = OS#'ObjectSet'{set=NewSet},
-		check_object(S,TDef#typedef{typespec=NewOS},
-			     NewOS);
-	    #type{def={pt,DefinedObjSet,ParamList}} ->
-		{_,PObjSetDef} = get_referenced_type(S,DefinedObjSet),
-		instantiate_pos(S,ClassDef,PObjSetDef,ParamList);
-	    {ObjDef={object,definedsyntax,_ObjFields},_Ext} ->
-		CheckedSet = check_object_list(S,NewClassRef,[ObjDef]),
-		NewSet = get_unique_valuelist(S,CheckedSet,UniqueFieldName),
-		ObjSet#'ObjectSet'{uniquefname=UniqueFieldName,
-				   set=NewSet++['EXTENSIONMARK']}
-	end,
-    Gen = gen_incl_set(S,NewObjSet#'ObjectSet'.set,
-		       ClassDef),
-    NewObjSet#'ObjectSet'{class=NewClassRef,gen=Gen}.
-
-
-merge_sets(Set,Ext) when list(Set),list(Ext) ->
-    Set ++ Ext;
-merge_sets(Set,Ext) when list(Ext) ->
-    [Set|Ext];
-merge_sets(Set,{'SingleValue',Ext}) when list(Set) ->
-    Set ++ [Ext];
-merge_sets(Set,{'SingleValue',Ext}) ->
-    [Set] ++ [Ext].
-
-reduce_objectset(ObjectSet,Exclusion) ->
-    case Exclusion of
-	{'SingleValue',#'Externalvaluereference'{value=Name}} ->
-	    case lists:keysearch(Name,1,ObjectSet) of
-		{value,El} ->
-		    lists:subtract(ObjectSet,[El]);
-		_ ->
-		    ObjectSet
-	    end
-    end.
-	    
-%% Checks a list of objects or object sets and returns a list of selected
-%% information for the code generation.
-check_object_list(S,ClassRef,ObjectList) ->
-    check_object_list(S,ClassRef,ObjectList,[]).
-
-check_object_list(S,ClassRef,[ObjOrSet|Objs],Acc) ->
-    case ObjOrSet of
-	ObjDef when tuple(ObjDef),(element(1,ObjDef)==object) ->
-	    Def = 
-		check_object(S,#typedef{typespec=ObjDef},
-%			     #'Object'{classname={objectclassname,ClassRef},
-			     #'Object'{classname=ClassRef,
-				       def=ObjDef}),
-	    check_object_list(S,ClassRef,Objs,[{no_name,Def#'Object'.def}|Acc]);
-	{'SingleValue',{definedvalue,ObjName}} ->
-	    {_,ObjectDef} = get_referenced_type(S,#identifier{val=ObjName}),
-	    #'Object'{def=Def} = check_object(S,ObjectDef,ObjectDef#typedef.typespec),
-	    check_object_list(S,ClassRef,Objs,[{ObjectDef#typedef.name,Def}|Acc]);
-	{'SingleValue',Ref = #'Externalvaluereference'{}} ->
-	    {_,ObjectDef} = get_referenced_type(S,Ref),
-	    #'Object'{def=Def} = check_object(S,ObjectDef,ObjectDef#typedef.typespec),
-	    check_object_list(S,ClassRef,Objs,[{ObjectDef#typedef.name,Def}|Acc]);
-	ObjRef when record(ObjRef,'Externalvaluereference') ->
-	    {_,ObjectDef} = get_referenced_type(S,ObjRef),
-	    #'Object'{def=Def} = check_object(S,ObjectDef,ObjectDef#typedef.typespec),
-	    check_object_list(S,ClassRef,Objs,
-%%			      [{ObjRef#'Externalvaluereference'.value,Def}|Acc]);
-			      [{ObjectDef#typedef.name,Def}|Acc]);
-	{'ValueFromObject',{_,Object},FieldName} ->
-	    {_,Def} = get_referenced_type(S,Object),
-%%	    TypeOrVal = get_fieldname_element(S,Def,FieldName);%% this must result in an object set
-	    TypeDef = get_fieldname_element(S,Def,FieldName),
-	    (TypeDef#typedef.typespec)#'ObjectSet'.set;
-	ObjSet when record(ObjSet,type) ->
-	    ObjSetDef = 
-		case ObjSet#type.def of
-		    Ref when record(Ref,typereference);
-			     record(Ref,'Externaltypereference') ->
-			{_,D} = get_referenced_type(S,ObjSet#type.def),
-			D;
-		    Other ->
-			throw({asn1_error,{'unknown objecset',Other,S}})
-		end,
-	    #'ObjectSet'{set=ObjectsInSet} = 
-		check_object(S,ObjSetDef,ObjSetDef#typedef.typespec),
-	    AccList = transform_set_to_object_list(ObjectsInSet,[]),
-	    check_object_list(S,ClassRef,Objs,AccList++Acc);
-	union ->
-	    check_object_list(S,ClassRef,Objs,Acc);
-	Other ->
-	    exit({error,{'unknown object',Other},S})
-    end;
-%% Finally reverse the accumulated list and if there are any extension
-%% marks in the object set put one indicator of that in the end of the
-%% list.
-check_object_list(_,_,[],Acc) ->
-    lists:reverse(Acc).
-%%    case lists:member('EXTENSIONMARK',RevAcc) of
-%%	true ->
-%%	    ExclRevAcc = lists:filter(fun(X)->X /= 'EXTENSIONMARK' end,
-%%				      RevAcc),
-%%	    ExclRevAcc ++ ['EXTENSIONMARK'];
-%%	false ->
-%%	    RevAcc
-%%    end.
-	
-
-%%  get_fieldname_element/3
-%%  gets the type/value/object/... of the referenced element in FieldName
-%%  FieldName is a list and may have more than one element.
-%%  Each element in FieldName can be either {typefieldreference,AnyFieldName}
-%%  or {valuefieldreference,AnyFieldName}
-%%  Def is the def of the first object referenced by FieldName
-get_fieldname_element(S,Def,[{_RefType,FieldName}]) when record(Def,typedef) ->
-    {_,_,ObjComps} = (Def#typedef.typespec)#'Object'.def,
-    case lists:keysearch(FieldName,1,ObjComps) of
-	{value,{_,TDef}} when record(TDef,typedef) ->
-	    %%    ORec = TDef#typedef.typespec, %% XXX This must be made general
-% 	    case TDef#typedef.typespec of
-% 		ObjSetRec when record(ObjSetRec,'ObjectSet') ->
-% 		    ObjSet = ObjSetRec#'ObjectSet'.set;
-% 		ObjRec when record(ObjRec,'Object') ->
-% 		    %% now get the field in ObjRec that RestFName points out
-% 		    %ObjRec
-% 		    TDef
-% 	    end;
-	    TDef;
-	{value,{_,VDef}} when record(VDef,valuedef) ->
-	    check_value(S,VDef);
-	_ ->
-	    throw({assigned_object_error,"not_assigned_object",S})
-    end;
-get_fieldname_element(_S,Def,[{_RefType,_FieldName}|_RestFName]) 
-  when record(Def,typedef) ->
-    ok.
-    
-transform_set_to_object_list([{Name,_UVal,Fields}|Objs],Acc) ->
-    transform_set_to_object_list(Objs,[{Name,{object,generatesyntax,Fields}}|Acc]);
-transform_set_to_object_list(['EXTENSIONMARK'|Objs],Acc) ->
-%%    transform_set_to_object_list(Objs,['EXTENSIONMARK'|Acc]);
-    transform_set_to_object_list(Objs,Acc);
-transform_set_to_object_list([],Acc) ->
-    Acc.
-
-get_unique_valuelist(_S,ObjSet,{unique,undefined}) -> % no unique field in object
-    lists:map(fun({N,{_,_,F}})->{N,F};
-		 (V={_,_,_}) ->V end, ObjSet);
-get_unique_valuelist(S,ObjSet,UFN) ->
-    get_unique_vlist(S,ObjSet,UFN,[]).
-
-get_unique_vlist(S,[],_,Acc) ->
-    case catch check_uniqueness(Acc) of
-	{asn1_error,_} ->
-%	    exit({error,Reason,S});
-	    error({'ObjectSet',"not unique objects in object set",S});
-	true ->
-	    lists:reverse(Acc)
-    end;
-get_unique_vlist(S,[{ObjName,Obj}|Rest],UniqueFieldName,Acc) ->
-    {_,_,Fields} = Obj,
-    VDef = get_unique_value(S,Fields,UniqueFieldName),
-    get_unique_vlist(S,Rest,UniqueFieldName,
-		     [{ObjName,VDef#valuedef.value,Fields}|Acc]);
-get_unique_vlist(S,[V={_,_,_}|Rest],UniqueFieldName,Acc) ->
-    get_unique_vlist(S,Rest,UniqueFieldName,[V|Acc]).
-
-get_unique_value(S,Fields,UniqueFieldName) ->
-    Module = S#state.mname,
-    case lists:keysearch(UniqueFieldName,1,Fields) of
-	{value,Field} ->
-	    case element(2,Field) of
-		VDef when record(VDef,valuedef) ->
-		    VDef;
-		{definedvalue,ValName} ->
-		    ValueDef = asn1_db:dbget(Module,ValName),
-		    case ValueDef of
-			VDef when record(VDef,valuedef) ->
-			    ValueDef;
-			undefined -> 
-			    #valuedef{value=ValName}
-		    end;
-		{'ValueFromObject',Object,Name} ->
-		    case Object of
-			{object,Ext} when record(Ext,'Externaltypereference') ->
-			    OtherModule = Ext#'Externaltypereference'.module,
-			    ExtObjName = Ext#'Externaltypereference'.type,
-			    ObjDef = asn1_db:dbget(OtherModule,ExtObjName),
-			    ObjSpec = ObjDef#typedef.typespec,
-			    get_unique_value(OtherModule,element(3,ObjSpec),Name);
-			{object,{_,_,ObjName}} ->
-			    ObjDef = asn1_db:dbget(Module,ObjName),
-			    ObjSpec = ObjDef#typedef.typespec,
-			    get_unique_value(Module,element(3,ObjSpec),Name);
-			{po,Object,_Params} ->
-			    exit({error,{'parameterized object not implemented yet',
-					 Object},S})
-		    end;
-		Value when atom(Value);number(Value) ->
-		    #valuedef{value=Value};
-		{'CHOICE',{_,Value}} when atom(Value);number(Value) ->
-		    #valuedef{value=Value}
-	    end;
-	false ->
-	    exit({error,{'no unique value',Fields,UniqueFieldName},S})
-%%	    io:format("WARNING: no unique value in object"),
-%%	    exit(uniqueFieldName)
-    end.
-
-check_uniqueness(NameValueList) ->
-    check_uniqueness1(lists:keysort(2,NameValueList)).
-
-check_uniqueness1([]) ->
-    true;
-check_uniqueness1([_]) ->
-    true;
-check_uniqueness1([{_,N,_},{_,N,_}|_Rest]) ->
-    throw({asn1_error,{'objects in set must have unique values in UNIQUE fields',N}});
-check_uniqueness1([_|Rest]) ->
-    check_uniqueness1(Rest).
-
-%% instantiate_po/4
-%% ClassDef is the class of Object,
-%% Object is the Parameterized object, which is referenced,
-%% ArgsList is the list of actual parameters
-%% returns an #'Object' record.
-instantiate_po(S,_ClassDef,Object,ArgsList) when record(Object,pobjectdef) ->
-    FormalParams = get_pt_args(Object),
-    MatchedArgs = match_args(FormalParams,ArgsList,[]),
-    NewS = S#state{type=Object,parameters=MatchedArgs},
-    check_object(NewS,Object,#'Object'{classname=Object#pobjectdef.class,
-				    def=Object#pobjectdef.def}).
-
-%% instantiate_pos/4
-%% ClassDef is the class of ObjectSetDef,
-%% ObjectSetDef is the Parameterized object set, which is referenced 
-%% on the right side of the assignment,
-%% ArgsList is the list of actual parameters, i.e. real objects
-instantiate_pos(S,ClassDef,ObjectSetDef,ArgsList) ->
-    ClassName = ClassDef#classdef.name,
-    FormalParams = get_pt_args(ObjectSetDef),
-    Set = case get_pt_spec(ObjectSetDef) of
-	      {valueset,_Set} -> _Set;
-	      _Set -> _Set
-	  end,
-    MatchedArgs = match_args(FormalParams,ArgsList,[]),
-    NewS = S#state{type=ObjectSetDef,parameters=MatchedArgs},
-    check_object(NewS,ObjectSetDef,
-		 #'ObjectSet'{class=name2Extref(S#state.mname,ClassName),
-			      set=Set}).
-
-    
-%% gen_incl -> boolean()
-%% If object with Fields has any of the corresponding class' typefields
-%% then return value is true otherwise it is false.
-%% If an object lacks a typefield but the class has a type field that
-%% is OPTIONAL then we want gen to be true
-gen_incl(S,{_,_,Fields},CFields)->
-    gen_incl1(S,Fields,CFields).
-
-gen_incl1(_,_,[]) ->
-    false;
-gen_incl1(S,Fields,[C|CFields]) ->
-    case element(1,C) of
-	typefield ->
-% 	    case lists:keymember(element(2,C),1,Fields) of
-% 		true ->
-% 		    true;
-% 		false ->
-% 		    gen_incl1(S,Fields,CFields)
-% 	    end;
-	    true; %% should check that field is OPTIONAL or DEFUALT if
-                  %% the object lacks this field
-	objectfield ->
-	    case lists:keysearch(element(2,C),1,Fields) of
-		{value,Field} ->
-		    Type = element(3,C),
-		    {_,ClassDef} = get_referenced_type(S,Type#type.def),
-%		    {_,ClassFields,_} = ClassDef#classdef.typespec,
-		    #objectclass{fields=ClassFields} = 
-			ClassDef#classdef.typespec,
-		    ObjTDef = element(2,Field),
-		    case gen_incl(S,(ObjTDef#typedef.typespec)#'Object'.def,
-				  ClassFields) of
-			true ->
-			    true;
-			_ ->
-			    gen_incl1(S,Fields,CFields)
-		    end;
-		_ ->
-		    gen_incl1(S,Fields,CFields)
-	    end;
-	_ -> 
-	    gen_incl1(S,Fields,CFields)
-    end.
-
-%% first if no unique field in the class return false.(don't generate code)
-gen_incl_set(S,Fields,ClassDef) ->
-    case catch get_unique_fieldname(ClassDef) of
-	Tuple when tuple(Tuple) ->
-	    false;
-	_ ->
-	    gen_incl_set1(S,Fields,
-			  (ClassDef#classdef.typespec)#objectclass.fields)
-    end.
-
-%% if any of the existing or potentially existing objects has a typefield
-%% then return true.
-gen_incl_set1(_,[],_CFields)->
-    false;
-gen_incl_set1(_,['EXTENSIONMARK'],_) ->
-    true;
-%% Fields are the fields of an object in the object set.
-%% CFields are the fields of the class of the object set.
-gen_incl_set1(S,[Object|Rest],CFields)->
-    Fields = element(size(Object),Object),
-    case gen_incl1(S,Fields,CFields) of
-	true ->
-	    true;
-	false ->
-	    gen_incl_set1(S,Rest,CFields)
-    end.
-
-check_objectdefn(S,Def,CDef) when record(CDef,classdef) ->
-    WithSyntax = (CDef#classdef.typespec)#objectclass.syntax,
-    ClassFields = (CDef#classdef.typespec)#objectclass.fields,
-    case Def of
-	{object,defaultsyntax,Fields} ->
-	    check_defaultfields(S,Fields,ClassFields);
-	{object,definedsyntax,Fields} ->
-	    {_,WSSpec} = WithSyntax,
-	    NewFields = 
-		case catch( convert_definedsyntax(S,Fields,WSSpec,
-						  ClassFields,[])) of
-		    {asn1,{_ErrorType,ObjToken,ClassToken}} ->
-			throw({asn1,{'match error in object',ObjToken,
-				     'found in object',ClassToken,'found in class'}});
-		    Err={asn1,_} -> throw(Err);
-		    Err={'EXIT',_} -> throw(Err);
-		    DefaultFields when list(DefaultFields) ->
-			DefaultFields
-		end,
-	    {object,defaultsyntax,NewFields};
-	{object,_ObjectId} -> % This is a DefinedObject
-	    fixa;
-	Other ->
-	    exit({error,{objectdefn,Other}})
-    end.
-
-check_defaultfields(S,Fields,ClassFields) ->
-    check_defaultfields(S,Fields,ClassFields,[]).
-
-check_defaultfields(_S,[],_ClassFields,Acc) ->
-    {object,defaultsyntax,lists:reverse(Acc)};
-check_defaultfields(S,[{FName,Spec}|Fields],ClassFields,Acc) ->
-    case lists:keysearch(FName,2,ClassFields) of
-	{value,CField} ->
-	    NewField = convert_to_defaultfield(S,FName,Spec,CField),
-	    check_defaultfields(S,Fields,ClassFields,[NewField|Acc]);
-	_ ->
-	    throw({error,{asn1,{'unvalid field in object',FName}}})
-    end.
-%%    {object,defaultsyntax,Fields}.
-
-convert_definedsyntax(_S,[],[],_ClassFields,Acc) ->
-    lists:reverse(Acc);
-convert_definedsyntax(S,Fields,WithSyntax,ClassFields,Acc) ->
-    case match_field(S,Fields,WithSyntax,ClassFields) of
-	{MatchedField,RestFields,RestWS} ->
-	    if
-		list(MatchedField) ->
-		    convert_definedsyntax(S,RestFields,RestWS,ClassFields,
-					  lists:append(MatchedField,Acc));
-		true ->
-		    convert_definedsyntax(S,RestFields,RestWS,ClassFields,
-					  [MatchedField|Acc])
-	    end
-%%	    throw({error,{asn1,{'unvalid syntax in object',WorS}}})
-    end.
-
-match_field(S,Fields,WithSyntax,ClassFields) ->
-    match_field(S,Fields,WithSyntax,ClassFields,[]).
-
-match_field(S,Fields,[W|Ws],ClassFields,Acc) when list(W) ->
-    case catch(match_optional_field(S,Fields,W,ClassFields,[])) of
-	{'EXIT',_} ->
-	    match_field(Fields,Ws,ClassFields,Acc); %% add S
-%%	{[Result],RestFields} ->
-%%	    {Result,RestFields,Ws};
-	{Result,RestFields} when list(Result) ->
-	    {Result,RestFields,Ws};
-	_ ->
-	    match_field(S,Fields,Ws,ClassFields,Acc)
-    end;
-match_field(S,Fields,WithSyntax,ClassFields,_Acc) ->
-    match_mandatory_field(S,Fields,WithSyntax,ClassFields,[]).
-
-match_optional_field(_S,RestFields,[],_,Ret) ->
-    {Ret,RestFields};
-%% An additional optional field within an optional field
-match_optional_field(S,Fields,[W|Ws],ClassFields,Ret) when list(W) ->
-    case catch match_optional_field(S,Fields,W,ClassFields,[]) of
-	{'EXIT',_} ->
-	    {Ret,Fields};
-	{asn1,{optional_matcherror,_,_}} ->
-	    {Ret,Fields};
-	{OptionalField,RestFields} ->
-	    match_optional_field(S,RestFields,Ws,ClassFields,
-				 lists:append(OptionalField,Ret))
-    end;
-%% identify and skip word
-%match_optional_field(S,[#'Externaltypereference'{type=WorS}|Rest],
-match_optional_field(S,[{_,_,WorS}|Rest],
-		     [WorS|Ws],ClassFields,Ret) ->
-    match_optional_field(S,Rest,Ws,ClassFields,Ret);
-match_optional_field(S,[],_,ClassFields,Ret) ->
-    match_optional_field(S,[],[],ClassFields,Ret);
-%% identify and skip comma
-match_optional_field(S,[{WorS,_}|Rest],[{WorS,_}|Ws],ClassFields,Ret) ->
-    match_optional_field(S,Rest,Ws,ClassFields,Ret);
-%% identify and save field data
-match_optional_field(S,[Setting|Rest],[{_,W}|Ws],ClassFields,Ret) ->
-    WorS =
-	case Setting of
-	    Type when record(Type,type) -> Type;
-%%	    #'Externalvaluereference'{value=WordOrSetting} -> WordOrSetting;
-	    {'ValueFromObject',_,_} -> Setting;
-	    {object,_,_} -> Setting;
-	    {_,_,WordOrSetting} -> WordOrSetting;
-%%	    Atom when atom(Atom) -> Atom
-	    Other -> Other
-	end,
-    case lists:keysearch(W,2,ClassFields) of
-	false ->
-	    throw({asn1,{optional_matcherror,WorS,W}});
-	{value,CField} ->
-	    NewField = convert_to_defaultfield(S,W,WorS,CField),
-	    match_optional_field(S,Rest,Ws,ClassFields,[NewField|Ret])
-    end;
-match_optional_field(_S,[WorS|_Rest],[W|_Ws],_ClassFields,_Ret) ->
-    throw({asn1,{optional_matcherror,WorS,W}}).
-
-match_mandatory_field(_S,[],[],_,[Acc]) ->
-    {Acc,[],[]};
-match_mandatory_field(_S,[],[],_,Acc) ->
-    {Acc,[],[]};
-match_mandatory_field(S,[],[H|T],CF,Acc) when list(H) ->
-    match_mandatory_field(S,[],T,CF,Acc);
-match_mandatory_field(_S,[],WithSyntax,_,_Acc) ->
-    throw({asn1,{mandatory_matcherror,[],WithSyntax}});
-%match_mandatory_field(_S,Fields,WithSyntax=[W|_Ws],_ClassFields,[Acc]) when list(W) ->
-match_mandatory_field(_S,Fields,WithSyntax=[W|_Ws],_ClassFields,Acc) when list(W), length(Acc) >= 1 ->
-    {Acc,Fields,WithSyntax};
-%% identify and skip word
-match_mandatory_field(S,[{_,_,WorS}|Rest],
-		      [WorS|Ws],ClassFields,Acc) ->
-    match_mandatory_field(S,Rest,Ws,ClassFields,Acc);
-%% identify and skip comma
-match_mandatory_field(S,[{WorS,_}|Rest],[{WorS,_}|Ws],ClassFields,Ret) ->
-    match_mandatory_field(S,Rest,Ws,ClassFields,Ret);
-%% identify and save field data
-match_mandatory_field(S,[Setting|Rest],[{_,W}|Ws],ClassFields,Acc) ->
-    WorS = 
-	case Setting of
-%%	    Atom when atom(Atom) -> Atom;
-%%	    #'Externalvaluereference'{value=WordOrSetting} -> WordOrSetting;
-	    {object,_,_} -> Setting;
-	    {_,_,WordOrSetting} -> WordOrSetting;
-	    Type when record(Type,type) -> Type;
-	    Other -> Other
-	end,
-    case lists:keysearch(W,2,ClassFields) of
-	false ->
-	    throw({asn1,{mandatory_matcherror,WorS,W}});
-	{value,CField} ->
-	    NewField = convert_to_defaultfield(S,W,WorS,CField),
-	    match_mandatory_field(S,Rest,Ws,ClassFields,[NewField|Acc])
-    end;
- 	    
-match_mandatory_field(_S,[WorS|_Rest],[W|_Ws],_ClassFields,_Acc) ->
-    throw({asn1,{mandatory_matcherror,WorS,W}}).
-
-%% Converts a field of an object from defined syntax to default syntax
-convert_to_defaultfield(S,ObjFieldName,ObjFieldSetting,CField)->
-    CurrMod = S#state.mname,
-    case element(1,CField) of
-	typefield ->
-	    TypeDef=
-		case ObjFieldSetting of
-		    TypeRec when record(TypeRec,type) -> TypeRec#type.def;
-		    TDef when record(TDef,typedef) -> 
-			TDef#typedef{typespec=check_type(S,TDef,
-							 TDef#typedef.typespec)};
-		    _ -> ObjFieldSetting
-		end,
-	    Type = 
-		if
-		    record(TypeDef,typedef) -> TypeDef;
-		    true ->
-			case asn1ct_gen:type(asn1ct_gen:get_inner(TypeDef)) of
-			    ERef = #'Externaltypereference'{module=CurrMod} ->
-				{_,T} = get_referenced_type(S,ERef),
-				T#typedef{checked=true,
-					  typespec=check_type(S,T,
-							      T#typedef.typespec)};
-			    ERef = #'Externaltypereference'{module=ExtMod} ->
-				{_,T} = get_referenced_type(S,ERef),
-				#typedef{name=Name} = T,
-				check_type(S,T,T#typedef.typespec),
-				#typedef{checked=true,
-					 name={ExtMod,Name},
-					 typespec=ERef};
-			    Bif when Bif=={primitive,bif};Bif=={constructed,bif} ->
-				T = check_type(S,#typedef{typespec=ObjFieldSetting},
-					       ObjFieldSetting),
-				#typedef{checked=true,name=Bif,typespec=T};
-			    _ ->
-				{Mod,T} = 
-				    %% get_referenced_type(S,#typereference{val=ObjFieldSetting}),
-				    get_referenced_type(S,#'Externaltypereference'{module=S#state.mname,type=ObjFieldSetting}),
-				case Mod of
-				    CurrMod ->
-					T;
-				    ExtMod ->
-					#typedef{name=Name} = T,
-					T#typedef{name={ExtMod,Name}}
-				end
-			end
-		end,
-	    {ObjFieldName,Type};
-	fixedtypevaluefield ->
-	    case ObjFieldName of
-		Val when atom(Val) ->
-		    %% ObjFieldSetting can be a value,an objectidentifiervalue,
-		    %% an element in an enumeration or namednumberlist etc.
-		    ValRef =
-			case ObjFieldSetting of
-			    #'Externalvaluereference'{} -> ObjFieldSetting;
-			    {'ValueFromObject',{_,ObjRef},FieldName} ->
-				{_,Object} = get_referenced_type(S,ObjRef),
-				ChObject = check_object(S,Object,
-							Object#typedef.typespec),
-				get_fieldname_element(S,Object#typedef{typespec=ChObject},
-						      FieldName);
-			    #valuedef{} ->
-				ObjFieldSetting;
-			    _ ->
-				#identifier{val=ObjFieldSetting}
-			end,
-		    case ValRef of
-			#valuedef{} ->
-			    {ObjFieldName,check_value(S,ValRef)};
-			_ ->
-			    ValDef =
-				case catch get_referenced_type(S,ValRef) of
-				    {error,_} ->
-					check_value(S,#valuedef{name=Val,
-								type=element(3,CField),
-								value=ObjFieldSetting});
-				    {_,VDef} when record(VDef,valuedef) ->
-					check_value(S,VDef);%% XXX
-				    {_,VDef} ->
-					check_value(S,#valuedef{name=Val,
-								type=element(3,CField),
-								value=VDef})
-				end,
-			    {ObjFieldName,ValDef}
-		    end;
-		Val ->
-		    {ObjFieldName,Val}
-	    end;
-	fixedtypevaluesetfield ->
-	    {ObjFieldName,ObjFieldSetting};
-	objectfield ->
-	    ObjectSpec = 
-		case ObjFieldSetting of
-		    Ref when record(Ref,typereference);record(Ref,identifier);
-			     record(Ref,'Externaltypereference');
-			     record(Ref,'Externalvaluereference') ->
-			{_,R} = get_referenced_type(S,ObjFieldSetting),
-			R;
-		    {'ValueFromObject',{_,ObjRef},FieldName} ->
-			%% This is an ObjectFromObject
-			{_,Object} = get_referenced_type(S,ObjRef),
-			ChObject = check_object(S,Object,
-						Object#typedef.typespec),
-			_ObjFromObj=
-			    get_fieldname_element(S,Object#typedef{
-						      typespec=ChObject},
-						  FieldName);
-			%%ClassName = ObjFromObj#'Object'.classname,
-			%%#typedef{name=,
-			%%	 typespec=
-			%%	 ObjFromObj#'Object'{classname=
-			%%			     {objectclassname,ClassName}}};
-		    {object,_,_} ->
-			%% An object defined inlined in another object
-			#type{def=Ref} = element(3,CField),
-% 			CRef = case Ref of
-% 				   #'Externaltypereference'{module=CurrMod,
-% 							    type=CName} ->
-% 				       CName;
-% 				    #'Externaltypereference'{module=ExtMod,
-% 							    type=CName} ->
-% 				       {ExtMod,CName}
-% 			       end,
-			InlinedObjName=
-			    list_to_atom(lists:concat([S#state.tname]++
-						      ['_',ObjFieldName])),
-%			ObjSpec = #'Object'{classname={objectclassname,CRef},
-			ObjSpec = #'Object'{classname=Ref,
-					    def=ObjFieldSetting},
-			CheckedObj=
-			    check_object(S,#typedef{typespec=ObjSpec},ObjSpec),
-			InlObj = #typedef{checked=true,name=InlinedObjName,
-					  typespec=CheckedObj},
-			asn1ct_gen:insert_once(inlined_objects,{InlinedObjName,
-								InlinedObjName}),
-			asn1_db:dbput(S#state.mname,InlinedObjName,InlObj),
-			InlObj;
-		    #type{def=Eref} when record(Eref,'Externaltypereference') ->
-			{_,R} = get_referenced_type(S,Eref),
-			R;
-		    _ ->
-%%			{_,R} = get_referenced_type(S,#typereference{val=ObjFieldSetting}),
-			{_,R} = get_referenced_type(S,#'Externaltypereference'{module=S#state.mname,type=ObjFieldSetting}),
-			R
-		end,
-	    {ObjFieldName,
-	     ObjectSpec#typedef{checked=true,
-		      typespec=check_object(S,ObjectSpec,
-					    ObjectSpec#typedef.typespec)}};
-	variabletypevaluefield ->
-	    {ObjFieldName,ObjFieldSetting};
-	variabletypevaluesetfield ->
-	    {ObjFieldName,ObjFieldSetting};
-	objectsetfield ->
-	    {_,ObjSetSpec} = 
-		case ObjFieldSetting of
-		    Ref when record(Ref,'Externaltypereference');
-			     record(Ref,'Externalvaluereference') ->
-			get_referenced_type(S,ObjFieldSetting);
-		    ObjectList when list(ObjectList) ->
-			%% an objctset defined in the object,though maybe
-			%% parsed as a SequenceOfValue 
-			%% The ObjectList may be a list of references to
-			%% objects, a ValueFromObject
-			{_,_,Type,_} = CField,
-			ClassDef = Type#type.def,
-			case ClassDef#'Externaltypereference'.module of
-			    CurrMod -> 
-				ClassDef#'Externaltypereference'.type;
-			    ExtMod ->
-				{ExtMod,
-				 ClassDef#'Externaltypereference'.type}
-			end,
-			{no_name,
-			 #typedef{typespec=
-				  #'ObjectSet'{class=
-%					       {objectclassname,ClassRef},
-					       ClassDef,
-					       set=ObjectList}}};
-		    ObjectSet={'SingleValue',_} ->
-			%% a Union of defined objects
-			{_,_,Type,_} = CField,
-			ClassDef = Type#type.def,
-% 			ClassRef = 
-% 			    case ClassDef#'Externaltypereference'.module of
-% 				CurrMod -> 
-% 				    ClassDef#'Externaltypereference'.type;
-% 				ExtMod ->
-% 				    {ExtMod,
-% 				     ClassDef#'Externaltypereference'.type}
-% 			    end,
-			{no_name,
-%			 #typedef{typespec=#'ObjectSet'{class={objectclassname,ClassRef},
-			 #typedef{typespec=#'ObjectSet'{class=ClassDef,
-							set=ObjectSet}}};
-		    {object,_,[#type{def={'TypeFromObject',
-					 {object,RefedObj},
-					 FieldName}}]} ->
-			%% This case occurs when an ObjectSetFromObjects 
-			%% production is used
-			{M,Def} = get_referenced_type(S,RefedObj),
-			{M,get_fieldname_element(S,Def,FieldName)};
-		    #type{def=Eref} when 
-			  record(Eref,'Externaltypereference') ->
-			get_referenced_type(S,Eref);
-		    _ ->
-%%			get_referenced_type(S,#typereference{val=ObjFieldSetting})
-			get_referenced_type(S,#'Externaltypereference'{module=S#state.mname,type=ObjFieldSetting})
-		end,
-	    {ObjFieldName,
-	     ObjSetSpec#typedef{checked=true,
-				typespec=check_object(S,ObjSetSpec,
-						      ObjSetSpec#typedef.typespec)}}
-    end.
-
-check_value(OldS,V) when record(V,pvaluesetdef) ->
-    #pvaluesetdef{checked=Checked,type=Type} = V,
-    case Checked of
-	true -> V;
-	{error,_} -> V;
-	false ->
-	    case get_referenced_type(OldS,Type#type.def) of
-		{_,Class} when record(Class,classdef) ->
-		    throw({pobjectsetdef});
-		_ -> continue
-	    end
-    end;
-check_value(_OldS,V) when record(V,pvaluedef) ->
-    %% Fix this case later
-    V;
-check_value(OldS,V) when record(V,typedef) ->
-    %% This case when a value set has been parsed as an object set.
-    %% It may be a value set
-    #typedef{typespec=TS} = V,
-    case TS of 
-	#'ObjectSet'{class=ClassRef} ->
-	    {_,TSDef} = get_referenced_type(OldS,ClassRef),
-	    %%IsObjectSet(TSDef);
-	    case TSDef of
-		#classdef{} -> throw({objectsetdef});
-		#typedef{typespec=#type{def=Eref}} when 
-		      record(Eref,'Externaltypereference') ->
-		    %% This case if the class reference is a defined
-		    %% reference to class
-		    check_value(OldS,V#typedef{typespec=TS#'ObjectSet'{class=Eref}});
-		#typedef{} ->
-		    % an ordinary value set with a type in #typedef.typespec
-		    ValueSet = TS#'ObjectSet'.set,
-		    Type=check_type(OldS,TSDef,TSDef#typedef.typespec),
-		    Value = check_value(OldS,#valuedef{type=Type,
-						       value=ValueSet}),
-		    {valueset,Type#type{constraint=Value#valuedef.value}}
-	    end;
-	_ ->
-	    throw({objectsetdef})
-    end;
-check_value(S,#valuedef{pos=Pos,name=Name,type=Type,
-			  value={valueset,Constr}}) ->
-    NewType = Type#type{constraint=[Constr]},
-    {valueset,
-     check_type(S,#typedef{pos=Pos,name=Name,typespec=NewType},NewType)};
-check_value(OldS=#state{recordtopname=TopName},V) when record(V,valuedef) ->
-    #valuedef{name=Name,checked=Checked,type=Vtype,value=Value} = V,
-    case Checked of
-	true -> 
-	    V;
-	{error,_} ->
-	    V;
-	false ->
-	    Def = Vtype#type.def,
-	    Constr = Vtype#type.constraint,
-	    S = OldS#state{type=Vtype,tname=Def,value=V,vname=Name},
-	    NewDef = 
-		case Def of
-		    Ext when record(Ext,'Externaltypereference') ->
-			RecName = Ext#'Externaltypereference'.type,
-			{_,Type} = get_referenced_type(S,Ext),
-			%% If V isn't a value but an object Type is a #classdef{}
-			case Type of
-			    #classdef{} ->
-				throw({objectdef});
-			    #typedef{} ->
-				case is_contextswitchtype(Type) of
-				    true ->
-					#valuedef{value=CheckedVal}=
-					    check_value(S,V#valuedef{type=Type#typedef.typespec}),
-					#newv{value=CheckedVal};
-				    _ ->
-					#valuedef{value=CheckedVal}=
-					    check_value(S#state{recordtopname=[RecName|TopName]},
-							V#valuedef{type=Type#typedef.typespec}),
-					#newv{value=CheckedVal}
-				end
-			end;
-		    'ANY' ->
-			throw({error,{asn1,{'cant check value of type',Def}}});
-		    'INTEGER' ->
-			validate_integer(S,Value,[],Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    {'INTEGER',NamedNumberList} ->
-			validate_integer(S,Value,NamedNumberList,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    {'BIT STRING',NamedNumberList} ->
-			validate_bitstring(S,Value,NamedNumberList,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'NULL' ->
-			validate_null(S,Value,Constr),
-			#newv{};
-		    'OBJECT IDENTIFIER' ->
-			validate_objectidentifier(S,Value,Constr),
-			#newv{value = normalize_value(S,Vtype,Value,[])};
-		    'ObjectDescriptor' ->
-			validate_objectdescriptor(S,Value,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    {'ENUMERATED',NamedNumberList} ->
-			validate_enumerated(S,Value,NamedNumberList,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'BOOLEAN'->
-			validate_boolean(S,Value,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'OCTET STRING' ->
-			validate_octetstring(S,Value,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'NumericString' ->
-			validate_restrictedstring(S,Value,Def,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'TeletexString' ->
-			validate_restrictedstring(S,Value,Def,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'VideotexString' ->
-			validate_restrictedstring(S,Value,Def,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'UTCTime' ->
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-%			exit({'cant check value of type' ,Def});
-		    'GeneralizedTime' ->
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-%			exit({'cant check value of type' ,Def});
-		    'GraphicString' ->
-			validate_restrictedstring(S,Value,Def,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'VisibleString' ->
-			validate_restrictedstring(S,Value,Def,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'GeneralString' ->
-			validate_restrictedstring(S,Value,Def,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'PrintableString' ->
-			validate_restrictedstring(S,Value,Def,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'IA5String' ->
-			validate_restrictedstring(S,Value,Def,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-		    'BMPString' ->
-			validate_restrictedstring(S,Value,Def,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,[])};
-%%		    'UniversalString' -> %added 6/12 -00
-%%			#newv{value=validate_restrictedstring(S,Value,Def,Constr)};
-		    Seq when record(Seq,'SEQUENCE') ->
-			SeqVal = validate_sequence(S,Value,
-						   Seq#'SEQUENCE'.components,
-						   Constr),
-			#newv{value=normalize_value(S,Vtype,SeqVal,TopName)};
-		    {'SEQUENCE OF',Components} ->
-			validate_sequenceof(S,Value,Components,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,TopName)};
-		    {'CHOICE',Components} ->
-			validate_choice(S,Value,Components,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,TopName)};
-		    Set when record(Set,'SET') ->
-			validate_set(S,Value,Set#'SET'.components,
-					      Constr),
-			#newv{value=normalize_value(S,Vtype,Value,TopName)};
-		    {'SET OF',Components} ->
-			validate_setof(S,Value,Components,Constr),
-			#newv{value=normalize_value(S,Vtype,Value,TopName)};
-		    Other ->
-			exit({'cant check value of type' ,Other})
-		end,
-	    case NewDef#newv.value of
-		unchanged ->
-		    V#valuedef{checked=true,value=Value};
-		ok ->
-		    V#valuedef{checked=true,value=Value};
-		{error,Reason} ->
-		    V#valuedef{checked={error,Reason},value=Value};
-		_V ->
-		    V#valuedef{checked=true,value=_V}
-	    end
-    end.
-
-is_contextswitchtype(#typedef{name='EXTERNAL'})->
-    true;
-is_contextswitchtype(#typedef{name='EMBEDDED PDV'}) ->
-    true;
-is_contextswitchtype(#typedef{name='CHARACTER STRING'}) ->
-    true;
-is_contextswitchtype(_) ->
-    false.
-
-% validate_integer(S,{identifier,Pos,Id},NamedNumberList,Constr) ->
-%     case lists:keysearch(Id,1,NamedNumberList) of
-% 	{value,_} -> ok;
-% 	false -> error({value,"unknown NamedNumber",S})
-%     end;
-%% This case occurs when there is a valuereference
-validate_integer(S=#state{mname=M},
-		 #'Externalvaluereference'{module=M,value=Id},
-		 NamedNumberList,_Constr) ->
-    case lists:keysearch(Id,1,NamedNumberList) of
-	{value,_} -> ok;
-	false -> error({value,"unknown NamedNumber",S})
-    end;
-validate_integer(S,Id,NamedNumberList,_Constr) when atom(Id) ->
-    case lists:keysearch(Id,1,NamedNumberList) of
-	{value,_} -> ok;
-	false -> error({value,"unknown NamedNumber",S})
-    end;
-validate_integer(_S,Value,_NamedNumberList,Constr) when integer(Value) ->
-    check_integer_range(Value,Constr).
-
-check_integer_range(Int,Constr) when list(Constr) ->
-    NewConstr = [X || #constraint{c=X} <- Constr],
-    check_constr(Int,NewConstr);
-
-check_integer_range(_Int,_Constr) ->
-    %%io:format("~p~n",[Constr]),
-    ok.
-
-check_constr(Int,[{'ValueRange',Lb,Ub}|T]) when Int >= Lb, Int =< Ub ->
-    check_constr(Int,T);
-check_constr(_Int,[]) ->
-    ok.
-
-validate_bitstring(_S,_Value,_NamedNumberList,_Constr) ->
-    ok.
-
-validate_null(_S,'NULL',_Constr) ->
-    ok.
-
-%%------------
-%% This can be removed when the old parser is removed
-%% The function removes 'space' atoms from the list
-
-is_space_list([H],Acc) ->
-    lists:reverse([H|Acc]);
-is_space_list([H,space|T],Acc) ->
-    is_space_list(T,[H|Acc]);
-is_space_list([],Acc) ->
-    lists:reverse(Acc);
-is_space_list([H|T],Acc) ->
-    is_space_list(T,[H|Acc]).
-
-validate_objectidentifier(S,L,_) ->
-    case is_space_list(L,[]) of
-	NewL when list(NewL) ->
-	    case validate_objectidentifier1(S,NewL) of
-		NewL2 when list(NewL2) ->
-		    list_to_tuple(NewL2);
-		Other -> Other
-	    end;
-	{error,_} ->
-	    error({value, "illegal OBJECT IDENTIFIER", S})
-    end.
-
-validate_objectidentifier1(S, [Id|T]) when record(Id,'Externalvaluereference') ->
-    case catch get_referenced_type(S,Id) of
-	{_,V} when record(V,valuedef) -> 
-	    case check_value(S,V) of
-		#valuedef{type=#type{def='OBJECT IDENTIFIER'},
-			  checked=true,value=Value} when tuple(Value) ->
-		    validate_objectid(S, T, lists:reverse(tuple_to_list(Value)));
-		_ -> 
-		    error({value, "illegal OBJECT IDENTIFIER", S})
-	    end;
-	_ ->
-	    validate_objectid(S, [Id|T], [])
-    end;
-validate_objectidentifier1(S,V) ->
-    validate_objectid(S,V,[]).
-
-validate_objectid(_, [], Acc) ->
-    lists:reverse(Acc);
-validate_objectid(S, [Value|Vrest], Acc) when integer(Value) ->
-    validate_objectid(S, Vrest, [Value|Acc]);
-validate_objectid(S, [{'NamedNumber',_Name,Value}|Vrest], Acc) 
-  when integer(Value) ->
-    validate_objectid(S, Vrest, [Value|Acc]);
-validate_objectid(S, [Id|Vrest], Acc) 
-  when record(Id,'Externalvaluereference') ->
-    case catch get_referenced_type(S, Id) of
-	{_,V} when record(V,valuedef) -> 
-	    case check_value(S, V) of
-		#valuedef{checked=true,value=Value} when integer(Value) ->
-		    validate_objectid(S, Vrest, [Value|Acc]);
-		_ -> 
-		    error({value, "illegal OBJECT IDENTIFIER", S})
-	    end;
-	_ ->
-	    case reserved_objectid(Id#'Externalvaluereference'.value, Acc) of
-		Value when integer(Value) ->
-		    validate_objectid(S, Vrest, [Value|Acc]);
-		false ->
-		    error({value, "illegal OBJECT IDENTIFIER", S})
-	    end
-    end;
-validate_objectid(S, [{Atom,Value}],[]) when atom(Atom),integer(Value) ->
-    %% this case when an OBJECT IDENTIFIER value has been parsed as a 
-    %% SEQUENCE value
-    Rec = #'Externalvaluereference'{module=S#state.mname,
-				    value=Atom},
-    validate_objectidentifier1(S,[Rec,Value]);
-validate_objectid(S, [{Atom,EVRef}],[]) 
-  when atom(Atom),record(EVRef,'Externalvaluereference') ->
-    %% this case when an OBJECT IDENTIFIER value has been parsed as a 
-    %% SEQUENCE value OTP-4354
-    Rec = #'Externalvaluereference'{module=S#state.mname,
-				    value=Atom},
-    validate_objectidentifier1(S,[Rec,EVRef]);
-validate_objectid(S, _V, _Acc) ->
-    error({value, "illegal OBJECT IDENTIFIER",S}).
-
-
-%% ITU-T Rec. X.680 Annex B - D
-reserved_objectid('itu-t',[]) -> 0;
-reserved_objectid('ccitt',[]) -> 0;
-%% arcs below "itu-t" 
-reserved_objectid('recommendation',[0]) -> 0;
-reserved_objectid('question',[0]) -> 1;
-reserved_objectid('administration',[0]) -> 2;
-reserved_objectid('network-operator',[0]) -> 3;
-reserved_objectid('identified-organization',[0]) -> 4;
-%% arcs below "recommendation"
-reserved_objectid('a',[0,0]) -> 1;
-reserved_objectid('b',[0,0]) -> 2;
-reserved_objectid('c',[0,0]) -> 3;
-reserved_objectid('d',[0,0]) -> 4;
-reserved_objectid('e',[0,0]) -> 5;
-reserved_objectid('f',[0,0]) -> 6;
-reserved_objectid('g',[0,0]) -> 7;
-reserved_objectid('h',[0,0]) -> 8;
-reserved_objectid('i',[0,0]) -> 9;
-reserved_objectid('j',[0,0]) -> 10;
-reserved_objectid('k',[0,0]) -> 11;
-reserved_objectid('l',[0,0]) -> 12;
-reserved_objectid('m',[0,0]) -> 13;
-reserved_objectid('n',[0,0]) -> 14;
-reserved_objectid('o',[0,0]) -> 15;
-reserved_objectid('p',[0,0]) -> 16;
-reserved_objectid('q',[0,0]) -> 17;
-reserved_objectid('r',[0,0]) -> 18;
-reserved_objectid('s',[0,0]) -> 19;
-reserved_objectid('t',[0,0]) -> 20;
-reserved_objectid('u',[0,0]) -> 21;
-reserved_objectid('v',[0,0]) -> 22;
-reserved_objectid('w',[0,0]) -> 23;
-reserved_objectid('x',[0,0]) -> 24;
-reserved_objectid('y',[0,0]) -> 25;
-reserved_objectid('z',[0,0]) -> 26;
-
-
-reserved_objectid(iso,[]) -> 1;
-%% arcs below "iso", note that number 1 is not used
-reserved_objectid('standard',[1]) -> 0;
-reserved_objectid('member-body',[1]) -> 2;
-reserved_objectid('identified-organization',[1]) -> 3;
-
-reserved_objectid('joint-iso-itu-t',[]) -> 2;
-reserved_objectid('joint-iso-ccitt',[]) -> 2;
-
-reserved_objectid(_,_) -> false.
-
-
-		 
-	    
-
-validate_objectdescriptor(_S,_Value,_Constr) ->
-    ok.
-
-validate_enumerated(S,Id,NamedNumberList,_Constr) when atom(Id) ->
-    case lists:keysearch(Id,1,NamedNumberList) of
-	{value,_} -> ok;
-	false -> error({value,"unknown ENUMERATED",S})
-    end;
-validate_enumerated(S,{identifier,_Pos,Id},NamedNumberList,_Constr) ->
-    case lists:keysearch(Id,1,NamedNumberList) of
-	{value,_} -> ok;
-	false -> error({value,"unknown ENUMERATED",S})
-    end;
-validate_enumerated(S,#'Externalvaluereference'{value=Id},
-		    NamedNumberList,_Constr) ->
-    case lists:keysearch(Id,1,NamedNumberList) of
-	{value,_} -> ok;
-	false -> error({value,"unknown ENUMERATED",S})
-    end.
-
-validate_boolean(_S,_Value,_Constr) ->
-    ok.
-
-validate_octetstring(_S,_Value,_Constr) ->
-    ok.
-
-validate_restrictedstring(_S,_Value,_Def,_Constr) ->
-    ok.
-
-validate_sequence(S=#state{type=Vtype},Value,_Components,_Constr) ->
-    case Vtype of
-	#type{tag=[{tag,'UNIVERSAL',8,'IMPLICIT',32}]} ->
-	    %% this is an 'EXTERNAL' (or INSTANCE OF)
-	    case Value of
-		[{identification,_}|_RestVal] ->
-		    to_EXTERNAL1990(S,Value);
-		_ ->
-		    Value
-	    end;
-	_ ->
-	    Value
-    end.
-
-validate_sequenceof(_S,_Value,_Components,_Constr) ->
-    ok.
-
-validate_choice(_S,_Value,_Components,_Constr) ->
-    ok.
-
-validate_set(_S,_Value,_Components,_Constr) ->
-    ok.
-
-validate_setof(_S,_Value,_Components,_Constr) ->
-    ok.
-
-to_EXTERNAL1990(S,[{identification,{'CHOICE',{syntax,Stx}}}|Rest]) ->
-    to_EXTERNAL1990(S,Rest,[{'direct-reference',Stx}]);
-to_EXTERNAL1990(S,[{identification,{'CHOICE',{'presentation-context-id',I}}}|Rest]) ->
-    to_EXTERNAL1990(S,Rest,[{'indirect-reference',I}]);
-to_EXTERNAL1990(S,[{identification,{'CHOICE',{'context-negotiation',[{_,PCid},{_,TrStx}]}}}|Rest]) ->
-    to_EXTERNAL1990(S,Rest,[{'indirect-reference',PCid},{'direct-reference',TrStx}]);
-to_EXTERNAL1990(S,_) ->
-    error({value,"illegal value in EXTERNAL type",S}).
-
-to_EXTERNAL1990(S,[V={'data-value-descriptor',_}|Rest],Acc) ->
-    to_EXTERNAL1990(S,Rest,[V|Acc]);
-to_EXTERNAL1990(_S,[{'data-value',Val}],Acc) ->
-    Encoding = {encoding,{'CHOICE',{'octet-aligned',Val}}},
-    lists:reverse([Encoding|Acc]);
-to_EXTERNAL1990(S,_,_) ->
-    error({value,"illegal value in EXTERNAL type",S}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Functions to normalize the default values of SEQUENCE 
-%% and SET components into Erlang valid format
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-normalize_value(_,_,mandatory,_) ->
-    mandatory;
-normalize_value(_,_,'OPTIONAL',_) ->
-    'OPTIONAL';
-normalize_value(S,Type,{'DEFAULT',Value},NameList) ->
-    case catch get_canonic_type(S,Type,NameList) of
-	{'BOOLEAN',CType,_} ->
-	    normalize_boolean(S,Value,CType);
-	{'INTEGER',CType,_} ->
-	    normalize_integer(S,Value,CType);
-	{'BIT STRING',CType,_} ->
-	    normalize_bitstring(S,Value,CType);
-	{'OCTET STRING',CType,_} ->
-	    normalize_octetstring(S,Value,CType);
-	{'NULL',_CType,_} ->
-	    %%normalize_null(Value);
-	    'NULL';
-	{'OBJECT IDENTIFIER',_,_} ->
-	    normalize_objectidentifier(S,Value);
-	{'ObjectDescriptor',_,_} ->
-	    normalize_objectdescriptor(Value);
-	{'REAL',_,_} ->
-	    normalize_real(Value);
-	{'ENUMERATED',CType,_} ->
-	    normalize_enumerated(Value,CType);
-	{'CHOICE',CType,NewNameList} ->
-	    normalize_choice(S,Value,CType,NewNameList);
-	{'SEQUENCE',CType,NewNameList} ->
-	    normalize_sequence(S,Value,CType,NewNameList);
-	{'SEQUENCE OF',CType,NewNameList} ->
-	    normalize_seqof(S,Value,CType,NewNameList);
-	{'SET',CType,NewNameList} ->
-	    normalize_set(S,Value,CType,NewNameList);
-	{'SET OF',CType,NewNameList} ->
-	    normalize_setof(S,Value,CType,NewNameList);
-	{restrictedstring,CType,_} ->
-	    normalize_restrictedstring(S,Value,CType);
-	_ ->
-	    io:format("WARNING: could not check default value ~p~n",[Value]),
-	    Value
-    end;
-normalize_value(S,Type,Val,NameList) ->
-    normalize_value(S,Type,{'DEFAULT',Val},NameList).
-
-normalize_boolean(S,{Name,Bool},CType) when atom(Name) ->
-    normalize_boolean(S,Bool,CType);
-normalize_boolean(_,true,_) ->
-    true;
-normalize_boolean(_,false,_) ->
-    false;
-normalize_boolean(S,Bool=#'Externalvaluereference'{},CType) ->
-    get_normalized_value(S,Bool,CType,fun normalize_boolean/3,[]);
-normalize_boolean(_,Other,_) ->
-    throw({error,{asn1,{'invalid default value',Other}}}).
-
-normalize_integer(_S,Int,_) when integer(Int) ->
-    Int;
-normalize_integer(_S,{Name,Int},_) when atom(Name),integer(Int) ->
-    Int;
-normalize_integer(S,{Name,Int=#'Externalvaluereference'{}},
-		  Type) when atom(Name) ->
-    normalize_integer(S,Int,Type);
-normalize_integer(S,Int=#'Externalvaluereference'{value=Name},Type) ->
-    case Type of
-	NNL when list(NNL) ->
-	    case lists:keysearch(Name,1,NNL) of
-		{value,{Name,Val}} ->
-		    Val;
-		false ->
-		    get_normalized_value(S,Int,Type,
-					 fun normalize_integer/3,[])
-	    end;
-	_ ->
-	    get_normalized_value(S,Int,Type,fun normalize_integer/3,[])
-    end;
-normalize_integer(_,Int,_) ->
-    exit({'Unknown INTEGER value',Int}).
-
-normalize_bitstring(S,Value,Type)->
-    %% There are four different Erlang formats of BIT STRING:
-    %% 1 - a list of ones and zeros.
-    %% 2 - a list of atoms.
-    %% 3 - as an integer, for instance in hexadecimal form.
-    %% 4 - as a tuple {Unused, Binary} where Unused is an integer
-    %%   and tells how many bits of Binary are unused.
-    %% 
-    %% normalize_bitstring/3 transforms Value according to:
-    %% A to 3,
-    %% B to 1,
-    %% C to 1 or 3
-    %% D to 2,
-    %% Value can be on format:
-    %% A - {hstring, String}, where String is a hexadecimal string.
-    %% B - {bstring, String}, where String is a string on bit format
-    %% C - #'Externalvaluereference'{value=V}, where V is a defined value
-    %% D - list of #'Externalvaluereference', where each value component
-    %%     is an identifier corresponing to NamedBits in Type.
-    case Value of
-	{hstring,String} when list(String) ->
-	    hstring_to_int(String);
-	{bstring,String} when list(String) ->
-	    bstring_to_bitlist(String);
-	Rec when record(Rec,'Externalvaluereference') ->
-	    get_normalized_value(S,Value,Type,
-				 fun normalize_bitstring/3,[]);
-	RecList when list(RecList) ->
-	    case Type of
-		NBL when list(NBL) ->
-		    F = fun(#'Externalvaluereference'{value=Name}) ->
-				case lists:keysearch(Name,1,NBL) of
-				    {value,{Name,_}} ->
-					Name;
-				    Other ->
-					throw({error,Other})
-				end;
-			   (Other) ->
-				throw({error,Other})
-			end,
-		    case catch lists:map(F,RecList) of
-			{error,Reason} ->
-			    io:format("WARNING: default value not "
-				      "compatible with type definition ~p~n",
-				      [Reason]),
-			    Value;
-			NewList ->
-			    NewList
-		    end;
-		_ ->
-		    io:format("WARNING: default value not "
-			      "compatible with type definition ~p~n",
-			      [RecList]),
-		    Value
-	    end;
-	{Name,String} when atom(Name) ->
-	    normalize_bitstring(S,String,Type);
-	Other ->
-	    io:format("WARNING: illegal default value ~p~n",[Other]),
-	    Value
-    end.
-
-hstring_to_int(L) when list(L) ->
-    hstring_to_int(L,0).
-hstring_to_int([H|T],Acc) when H >= $A, H =< $F ->
-    hstring_to_int(T,(Acc bsl 4) + (H - $A + 10) ) ;
-hstring_to_int([H|T],Acc) when H >= $0, H =< $9 ->
-    hstring_to_int(T,(Acc bsl 4) + (H - $0));
-hstring_to_int([],Acc) ->
-    Acc.
-
-bstring_to_bitlist([H|T]) when H == $0; H == $1 ->
-    [H - $0 | bstring_to_bitlist(T)];
-bstring_to_bitlist([]) ->
-    [].
-
-%% normalize_octetstring/1 changes representation of input Value to a 
-%% list of octets.
-%% Format of Value is one of:
-%% {bstring,String} each element in String corresponds to one bit in an octet
-%% {hstring,String} each element in String corresponds to one byte in an octet
-%% #'Externalvaluereference'
-normalize_octetstring(S,Value,CType) ->
-    case Value of
-	{bstring,String} ->
-	    bstring_to_octetlist(String);
-	{hstring,String} ->
-	    hstring_to_octetlist(String);
-	Rec when record(Rec,'Externalvaluereference') ->
-	    get_normalized_value(S,Value,CType,
-				 fun normalize_octetstring/3,[]);
-	{Name,String} when atom(Name) ->
-	    normalize_octetstring(S,String,CType);
-	List when list(List) ->
-	    %% check if list elements are valid octet values
-	    lists:map(fun([])-> ok;
-			 (H)when H > 255->
-			      io:format("WARNING: not legal octet value ~p in OCTET STRING, ~p~n",[H,List]);
-			 (_)-> ok
-		      end, List),
-	    List;
-	Other ->
-	    io:format("WARNING: unknown default value ~p~n",[Other]),
-	    Value
-    end.
-
-
-bstring_to_octetlist([]) ->
-    [];
-bstring_to_octetlist([H|T]) when H == $0 ; H == $1 ->
-    bstring_to_octetlist(T,6,[(H - $0) bsl 7]).
-bstring_to_octetlist([H|T],0,[Hacc|Tacc]) when H == $0; H == $1 ->
-    bstring_to_octetlist(T, 7, [0,Hacc + (H -$0)| Tacc]);
-bstring_to_octetlist([H|T],BSL,[Hacc|Tacc]) when H == $0; H == $1 ->
-    bstring_to_octetlist(T, BSL-1, [Hacc + ((H - $0) bsl BSL)| Tacc]);
-bstring_to_octetlist([],7,[0|Acc]) ->
-    lists:reverse(Acc);
-bstring_to_octetlist([],_,Acc) ->
-    lists:reverse(Acc).
-
-hstring_to_octetlist([]) ->
-    [];
-hstring_to_octetlist(L) ->
-    hstring_to_octetlist(L,4,[]).
-hstring_to_octetlist([H|T],0,[Hacc|Tacc]) when H >= $A, H =< $F ->
-    hstring_to_octetlist(T,4,[Hacc + (H - $A + 10)|Tacc]);
-hstring_to_octetlist([H|T],BSL,Acc) when H >= $A, H =< $F ->
-    hstring_to_octetlist(T,0,[(H - $A + 10) bsl BSL|Acc]);
-hstring_to_octetlist([H|T],0,[Hacc|Tacc]) when H >= $0; H =< $9 ->
-    hstring_to_octetlist(T,4,[Hacc + (H - $0)|Tacc]);
-hstring_to_octetlist([H|T],BSL,Acc) when H >= $0; H =< $9 ->
-    hstring_to_octetlist(T,0,[(H - $0) bsl BSL|Acc]);
-hstring_to_octetlist([],_,Acc) ->
-    lists:reverse(Acc).
-
-normalize_objectidentifier(S,Value) ->
-    validate_objectidentifier(S,Value,[]).
-
-normalize_objectdescriptor(Value) ->
-    Value.
-
-normalize_real(Value) ->
-    Value.
-
-normalize_enumerated(#'Externalvaluereference'{value=V},CType) 
-  when list(CType) ->
-    normalize_enumerated2(V,CType);
-normalize_enumerated(Value,CType) when atom(Value),list(CType) ->
-    normalize_enumerated2(Value,CType);
-normalize_enumerated({Name,EnumV},CType) when atom(Name) ->
-    normalize_enumerated(EnumV,CType);
-normalize_enumerated(Value,{CType1,CType2}) when list(CType1), list(CType2)->
-    normalize_enumerated(Value,CType1++CType2);
-normalize_enumerated(V,CType) ->
-    io:format("WARNING: Enumerated unknown type ~p~n",[CType]),
-    V.
-normalize_enumerated2(V,Enum) ->
-    case lists:keysearch(V,1,Enum) of
-	{value,{Val,_}} -> Val;
-	_ -> 
-	    io:format("WARNING: Enumerated value is not correct ~p~n",[V]),
-	    V
-    end.
-		      
-normalize_choice(S,{'CHOICE',{C,V}},CType,NameList) when atom(C) ->
-    Value =
-	case V of
-	    Rec when record(Rec,'Externalvaluereference') ->
-		get_normalized_value(S,V,CType,
-				     fun normalize_choice/4,
-				     [NameList]);
-	    _ -> V
-	end,
-    case catch lists:keysearch(C,#'ComponentType'.name,CType) of
-	{value,#'ComponentType'{typespec=CT,name=Name}} ->
-	    {C,normalize_value(S,CT,{'DEFAULT',Value},
-			       [Name|NameList])};
-	Other ->
-	    io:format("WARNING: Wrong format of type/value ~p/~p~n",
-		      [Other,Value]),
-	    {C,Value}
-    end;
-normalize_choice(S,{'DEFAULT',ValueList},CType,NameList) ->
-    lists:map(fun(X)-> normalize_choice(S,X,CType,NameList) end, ValueList);
-normalize_choice(S,Val=#'Externalvaluereference'{},CType,NameList) ->
-    {_,#valuedef{value=V}}=get_referenced_type(S,Val),
-    normalize_choice(S,{'CHOICE',V},CType,NameList);
-%    get_normalized_value(S,Val,CType,fun normalize_choice/4,[NameList]);
-normalize_choice(S,{Name,ChoiceVal},CType,NameList) 
-  when atom(Name) ->
-    normalize_choice(S,ChoiceVal,CType,NameList).
-	    
-normalize_sequence(S,{Name,Value},Components,NameList) 
-  when atom(Name),list(Value) ->
-    normalize_sequence(S,Value,Components,NameList);
-normalize_sequence(S,Value,Components,NameList) ->
-    normalized_record('SEQUENCE',S,Value,Components,NameList).
-
-normalize_set(S,{Name,Value},Components,NameList) 
-  when atom(Name),list(Value) ->
-    normalized_record('SET',S,Value,Components,NameList);
-normalize_set(S,Value,Components,NameList) ->
-    normalized_record('SET',S,Value,Components,NameList).
-
-normalized_record(SorS,S,Value,Components,NameList) ->
-    NewName = list_to_atom(asn1ct_gen:list2name(NameList)),
-    NoComps = length(Components),
-    case normalize_seq_or_set(SorS,S,Value,Components,NameList,[]) of
-	ListOfVals when length(ListOfVals) == NoComps ->
-	    list_to_tuple([NewName|ListOfVals]);
-	_ ->
-	    error({type,{illegal,default,value,Value},S})
-    end.
-    
-normalize_seq_or_set(SorS,S,[{Cname,V}|Vs],
-		     [#'ComponentType'{name=Cname,typespec=TS}|Cs],
-		     NameList,Acc) ->
-    NewNameList = 
-	case TS#type.def of
-	    #'Externaltypereference'{type=TName} ->
-		[TName];
-	    _ -> [Cname|NameList]
-	end,
-    NVal = normalize_value(S,TS,{'DEFAULT',V},NewNameList),
-    normalize_seq_or_set(SorS,S,Vs,Cs,NameList,[NVal|Acc]);
-normalize_seq_or_set(SorS,S,Values=[{_Cname1,_V}|_Vs],
-		     [#'ComponentType'{prop='OPTIONAL'}|Cs],
-		     NameList,Acc) ->
-    normalize_seq_or_set(SorS,S,Values,Cs,NameList,[asn1_NOVALUE|Acc]);
-normalize_seq_or_set(SorS,S,Values=[{_Cname1,_V}|_Vs],
-		    [#'ComponentType'{name=Cname2,typespec=TS,
-				      prop={'DEFAULT',Value}}|Cs],
-		    NameList,Acc) ->
-    NewNameList = 
-	case TS#type.def of
-	    #'Externaltypereference'{type=TName} ->
-		[TName];
-	    _ -> [Cname2|NameList]
-	end,
-    NVal =  normalize_value(S,TS,{'DEFAULT',Value},NewNameList),
-    normalize_seq_or_set(SorS,S,Values,Cs,NameList,[NVal|Acc]);
-normalize_seq_or_set(_SorS,_S,[],[],_,Acc) ->
-    lists:reverse(Acc);
-%% If default value is {} ComponentTypes in SEQUENCE are marked DEFAULT 
-%% or OPTIONAL (or the type is defined SEQUENCE{}, which is handled by
-%% the previous case).
-normalize_seq_or_set(SorS,S,[],
-		     [#'ComponentType'{name=Name,typespec=TS,
-				       prop={'DEFAULT',Value}}|Cs],
-		     NameList,Acc) ->
-    NewNameList =
-	case TS#type.def of
-	    #'Externaltypereference'{type=TName} ->
-		[TName];
-	    _ -> [Name|NameList]
-	end,
-    NVal =  normalize_value(S,TS,{'DEFAULT',Value},NewNameList),
-    normalize_seq_or_set(SorS,S,[],Cs,NameList,[NVal|Acc]);
-normalize_seq_or_set(SorS,S,[],[#'ComponentType'{prop='OPTIONAL'}|Cs],
-		     NameList,Acc) ->
-    normalize_seq_or_set(SorS,S,[],Cs,NameList,[asn1_NOVALUE|Acc]);
-normalize_seq_or_set(SorS,S,Value=#'Externalvaluereference'{},
-		     Cs,NameList,Acc) ->
-    get_normalized_value(S,Value,Cs,fun normalize_seq_or_set/6,
-			 [SorS,NameList,Acc]);
-normalize_seq_or_set(_SorS,S,V,_,_,_) ->
-    error({type,{illegal,default,value,V},S}).
-	
-normalize_seqof(S,Value,Type,NameList) ->
-    normalize_s_of('SEQUENCE OF',S,Value,Type,NameList).
-
-normalize_setof(S,Value,Type,NameList) ->
-    normalize_s_of('SET OF',S,Value,Type,NameList).
-
-normalize_s_of(SorS,S,Value,Type,NameList) when list(Value) ->
-    DefValueList = lists:map(fun(X) -> {'DEFAULT',X} end,Value),
-    Suffix = asn1ct_gen:constructed_suffix(SorS,Type),
-    Def = Type#type.def,
-    InnerType = asn1ct_gen:get_inner(Def),
-    WhatKind = asn1ct_gen:type(InnerType),
-    NewNameList =
-	case WhatKind of
-	    {constructed,bif} ->
-		[Suffix|NameList];
-	    #'Externaltypereference'{type=Name} ->
-		[Name];
-	    _ -> []
-	end,
-    NormFun = 	fun (X) -> normalize_value(S,Type,X,
-					   NewNameList) end,
-    case catch lists:map(NormFun, DefValueList) of
-	List when list(List) ->
-	    List;
-	_ ->
-	    io:format("WARNING: ~p could not handle value ~p~n",
-		      [SorS,Value]),
-	    Value
-    end;
-normalize_s_of(SorS,S,Value,Type,NameList) 
-  when record(Value,'Externalvaluereference') ->
-    get_normalized_value(S,Value,Type,fun normalize_s_of/5,
-			 [SorS,NameList]).
-%     case catch get_referenced_type(S,Value) of
-% 	{_,#valuedef{value=V}} ->
-% 	    normalize_s_of(SorS,S,V,Type);
-% 	{error,Reason} ->
-% 	    io:format("WARNING: ~p could not handle value ~p~n",
-% 		      [SorS,Value]),
-% 	    Value;
-% 	{_,NewVal} ->
-% 	    normalize_s_of(SorS,S,NewVal,Type);
-% 	_ ->
-% 	    io:format("WARNING: ~p could not handle value ~p~n",
-% 		      [SorS,Value]),
-% 	    Value
-%     end.
-
-
-%% normalize_restrictedstring handles all format of restricted strings.
-%% tuple case
-normalize_restrictedstring(_S,[Int1,Int2],_) when integer(Int1),integer(Int2) ->
-    {Int1,Int2};
-%% quadruple case
-normalize_restrictedstring(_S,[Int1,Int2,Int3,Int4],_) when integer(Int1),
-							   integer(Int2),
-							   integer(Int3),
-							   integer(Int4) ->
-    {Int1,Int2,Int3,Int4};
-%% character string list case
-normalize_restrictedstring(S,[H|T],CType) when list(H);tuple(H) ->
-    [normalize_restrictedstring(S,H,CType)|normalize_restrictedstring(S,T,CType)];
-%% character sting case
-normalize_restrictedstring(_S,CString,_) when list(CString) ->
-    Fun = 
-	fun(X) ->
-		if 
-		    $X =< 255, $X >= 0 ->
-			ok;
-		    true ->
-			io:format("WARNING: illegal character in string"
-				  " ~p~n",[X])
-		end
-	end,
-    lists:foreach(Fun,CString),
-    CString;
-%% definedvalue case or argument in a parameterized type
-normalize_restrictedstring(S,ERef,CType) when record(ERef,'Externalvaluereference') ->
-    get_normalized_value(S,ERef,CType,
-			 fun normalize_restrictedstring/3,[]);
-%% 
-normalize_restrictedstring(S,{Name,Val},CType) when atom(Name) ->
-    normalize_restrictedstring(S,Val,CType).
-
-
-get_normalized_value(S,Val,Type,Func,AddArg) ->
-    case catch get_referenced_type(S,Val) of
-	{_,#valuedef{type=_T,value=V}} -> 
-	    %% should check that Type and T equals
-	    call_Func(S,V,Type,Func,AddArg);
-	{error,_} ->
-	    io:format("WARNING: default value not "
-		      "comparable ~p~n",[Val]),
-	    Val;
-	{_,NewVal} ->
-	    call_Func(S,NewVal,Type,Func,AddArg);
-	_ ->
-	    io:format("WARNING: default value not "
-		      "comparable ~p~n",[Val]),
-	    Val
-    end.
-
-call_Func(S,Val,Type,Func,ArgList) ->	    
-    case ArgList of
-	[] ->
-	    Func(S,Val,Type);
-	[LastArg] ->
-	    Func(S,Val,Type,LastArg);
-	[Arg1,LastArg1] ->
-	    Func(Arg1,S,Val,Type,LastArg1);
-	[Arg1,LastArg1,LastArg2] ->
-	    Func(Arg1,S,Val,Type,LastArg1,LastArg2)
-    end.
-
-    
-get_canonic_type(S,Type,NameList) ->
-    {InnerType,NewType,NewNameList} =
-	case Type#type.def of
-	    Name when atom(Name) ->
-		{Name,Type,NameList};
-	    Ref when record(Ref,'Externaltypereference') ->
-		{_,#typedef{name=Name,typespec=RefedType}} =
-		    get_referenced_type(S,Ref),
-		get_canonic_type(S,RefedType,[Name]);
-	    {Name,T} when atom(Name) -> 
-		{Name,T,NameList};
-	    Seq when record(Seq,'SEQUENCE') -> 
-		{'SEQUENCE',Seq#'SEQUENCE'.components,NameList};
-	    Set when record(Set,'SET') -> 
-		{'SET',Set#'SET'.components,NameList}
-	end,
-    {asn1ct_gen:unify_if_string(InnerType),NewType,NewNameList}.
-
-
-
-check_ptype(_S,Type,Ts) when record(Ts,type) ->
-    %Tag = Ts#type.tag,
-    %Constr = Ts#type.constraint,
-    Def = Ts#type.def,
-    NewDef= 
-	case Def of 
-	    Seq when record(Seq,'SEQUENCE') ->
-		#newt{type=Seq#'SEQUENCE'{pname=Type#ptypedef.name}};
-	    Set when record(Set,'SET') ->
-		#newt{type=Set#'SET'{pname=Type#ptypedef.name}};
-	    _Other ->
-		#newt{}
-	end,
-    Ts2 = case NewDef of
-	      #newt{type=unchanged} ->
-		  Ts;
-	      #newt{type=TDef}->
-		  Ts#type{def=TDef}
-	  end,
-    Ts2.
-
-
-% check_type(S,Type,ObjSpec={{objectclassname,_},_}) ->
-%     check_class(S,ObjSpec);
-check_type(_S,Type,Ts) when record(Type,typedef),
-			   (Type#typedef.checked==true) ->
-    Ts;
-check_type(_S,Type,Ts) when record(Type,typedef),
-			   (Type#typedef.checked==idle) -> % the check is going on
-    Ts;
-check_type(S=#state{recordtopname=TopName},Type,Ts) when record(Ts,type) ->
-    {Def,Tag,Constr} = 
-	case match_parameters(Ts#type.def,S#state.parameters) of
-	    #type{constraint=_Ctmp,def=Dtmp} ->
-		{Dtmp,Ts#type.tag,Ts#type.constraint};
-	    Dtmp ->
-		{Dtmp,Ts#type.tag,Ts#type.constraint}
-	end,
-    TempNewDef = #newt{type=Def,tag=Tag,constraint=Constr},
-    TestFun = 
-	fun(Tref) ->
-		{_,MaybeChoice} = get_referenced_type(S,Tref),
-		case catch((MaybeChoice#typedef.typespec)#type.def) of
-		    {'CHOICE',_} ->
-			maybe_illicit_implicit_tag(choice,Tag);
-		    'ANY' ->
-			maybe_illicit_implicit_tag(open_type,Tag);
-		    'ANY DEFINED BY' ->
-			maybe_illicit_implicit_tag(open_type,Tag);
-		    'ASN1_OPEN_TYPE' ->
-			maybe_illicit_implicit_tag(open_type,Tag);
-		    _ ->
-			Tag
-		end
-	end,
-    NewDef= 
-	case Def of 
-	    Ext when record(Ext,'Externaltypereference') ->
-		{_,RefTypeDef} = get_referenced_type(S,Ext),
-% 		case RefTypeDef of
-% 		    Class when record(Class,classdef) ->
-% 			throw({asn1_class,Class});
-% 		    _ -> ok
-% 		end,
-		case is_class(S,RefTypeDef) of
-		    true -> throw({asn1_class,RefTypeDef});
-		    _ -> ok
-		end,
-		Ct = TestFun(Ext),
-		RefType = 
-%case  S#state.erule of
-%			      ber_bin_v2 ->
-		    case RefTypeDef#typedef.checked of
-			true ->
-			    RefTypeDef#typedef.typespec;
-			_ ->  
-			    NewRefTypeDef1 = RefTypeDef#typedef{checked=idle},
-			    asn1_db:dbput(S#state.mname,
-					  NewRefTypeDef1#typedef.name,NewRefTypeDef1), 
-			    RefType1 = 
-				check_type(S,RefTypeDef,RefTypeDef#typedef.typespec),
-			    NewRefTypeDef2 = 
-				RefTypeDef#typedef{checked=true,typespec = RefType1},
-			    asn1_db:dbput(S#state.mname,
-					  NewRefTypeDef2#typedef.name,NewRefTypeDef2), 
-			    %% update the type and mark as checked
-			    RefType1
-		    end,
-%			      _ -> RefTypeDef#typedef.typespec
-%			  end,
-
-		case asn1ct_gen:prim_bif(asn1ct_gen:get_inner(RefType#type.def)) of
-		    true ->
-			%% Here we expand to a built in type and inline it
-			TempNewDef#newt{
-			  type=
-			  RefType#type.def, 
-			  tag=
-			  merge_tags(Ct,RefType#type.tag),
-			  constraint=
-			  merge_constraints(check_constraints(S,Constr),
-					    RefType#type.constraint)};
-		    _ ->
-			%% Here we only expand the tags and keep the ext ref
-
-			TempNewDef#newt{
-			  type=
-			  check_externaltypereference(S,Ext),
-			  tag = 
-			  case S#state.erule of
-			      ber_bin_v2 ->
-				  merge_tags(Ct,RefType#type.tag);
-			      _ ->
-				  Ct
-			  end
-			 }
-		end;
-	    'ANY' ->
-		Ct=maybe_illicit_implicit_tag(open_type,Tag),
-		TempNewDef#newt{type='ASN1_OPEN_TYPE',tag=Ct};
-	    {'ANY_DEFINED_BY',_} ->
-		Ct=maybe_illicit_implicit_tag(open_type,Tag),
-		TempNewDef#newt{type='ASN1_OPEN_TYPE',tag=Ct};
-	    'INTEGER' ->
-		check_integer(S,[],Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_INTEGER))};
-
-	    {'INTEGER',NamedNumberList} ->
-		TempNewDef#newt{type={'INTEGER',check_integer(S,NamedNumberList,Constr)},
-				tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_INTEGER))};
-	    {'BIT STRING',NamedNumberList} ->
-		NewL = check_bitstring(S,NamedNumberList,Constr),
-%%		erlang:display({asn1ct_check,NamedNumberList,NewL}),
-		TempNewDef#newt{type={'BIT STRING',NewL},
-				tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_BIT_STRING))};
-	    'NULL' ->
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_NULL))};
-	    'OBJECT IDENTIFIER' ->
-		check_objectidentifier(S,Constr),
-		TempNewDef#newt{tag=
-			       merge_tags(Tag,?TAG_PRIMITIVE(?N_OBJECT_IDENTIFIER))};
-	    'ObjectDescriptor' ->
-		TempNewDef#newt{tag=
-			       merge_tags(Tag,?TAG_PRIMITIVE(?N_OBJECT_DESCRIPTOR))};
-	    'EXTERNAL' ->
-%%		AssociatedType = asn1_db:dbget(S#state.mname,'EXTERNAL'),
-%%		#newt{type=check_type(S,Type,AssociatedType)};
-		put(external,unchecked),
-		TempNewDef#newt{type=
-				#'Externaltypereference'{module=S#state.mname,
-							 type='EXTERNAL'},
-				tag=
-				merge_tags(Tag,?TAG_CONSTRUCTED(?N_EXTERNAL))};
-	    {'INSTANCE OF',DefinedObjectClass,Constraint} ->
-		%% check that DefinedObjectClass is of TYPE-IDENTIFIER class
-		%% If Constraint is empty make it the general INSTANCE OF type
-		%% If Constraint is not empty make an inlined type
-		%% convert INSTANCE OF to the associated type
-		IOFDef=check_instance_of(S,DefinedObjectClass,Constraint),
-		TempNewDef#newt{type=IOFDef,
-				tag=merge_tags(Tag,?TAG_CONSTRUCTED(?N_INSTANCE_OF))};
-	    {'ENUMERATED',NamedNumberList} ->
-		TempNewDef#newt{type=
-				{'ENUMERATED',
-				 check_enumerated(S,NamedNumberList,Constr)},
-				tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_ENUMERATED))};
-	    'EMBEDDED PDV' ->
-%		AssociatedType = asn1_db:dbget(S#state.mname,'EMBEDDED PDV'),
-%		CheckedType = check_type(S,Type,
-%					 AssociatedType#typedef.typespec),
-		put(embedded_pdv,unchecked),
-		TempNewDef#newt{type=
-				#'Externaltypereference'{module=S#state.mname,
-							 type='EMBEDDED PDV'},
-				tag= 
-				merge_tags(Tag,?TAG_CONSTRUCTED(?N_EMBEDDED_PDV))};
-	    'BOOLEAN'->
-		check_boolean(S,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_BOOLEAN))};
-	    'OCTET STRING' ->
-		check_octetstring(S,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_OCTET_STRING))};
-	    'NumericString' ->
-		check_restrictedstring(S,Def,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_NumericString))};
-	    'TeletexString' ->
-		check_restrictedstring(S,Def,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_TeletexString))};
-	    'VideotexString' ->
-		check_restrictedstring(S,Def,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_VideotexString))};
-	    'UTCTime' ->
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_UTCTime))};
-	    'GeneralizedTime' ->
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_GeneralizedTime))};
-	    'GraphicString' ->
-		check_restrictedstring(S,Def,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_GraphicString))};
-	    'VisibleString' ->
-		check_restrictedstring(S,Def,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_VisibleString))};
-	    'GeneralString' ->
-		check_restrictedstring(S,Def,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_GeneralString))};
-	    'PrintableString' ->
-		check_restrictedstring(S,Def,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_PrintableString))};
-	    'IA5String' ->
-		check_restrictedstring(S,Def,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_IA5String))};
-	    'BMPString' ->
-		check_restrictedstring(S,Def,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_BMPString))};
-	    'UniversalString' ->
-		check_restrictedstring(S,Def,Constr),
-		TempNewDef#newt{tag=
-				merge_tags(Tag,?TAG_PRIMITIVE(?N_UniversalString))};
-	    'CHARACTER STRING' ->
-%		AssociatedType = asn1_db:dbget(S#state.mname,
-%					       'CHARACTER STRING'),
-%		CheckedType = check_type(S,Type,
-%					 AssociatedType#typedef.typespec),
-		put(character_string,unchecked),
-		TempNewDef#newt{type=
-				#'Externaltypereference'{module=S#state.mname,
-							 type='CHARACTER STRING'},
-				tag=
-				merge_tags(Tag,?TAG_CONSTRUCTED(?N_CHARACTER_STRING))};
-	    Seq when record(Seq,'SEQUENCE') ->
-		RecordName = 
-		    case TopName of
-			[] ->
-			    [Type#typedef.name];
-			_ -> 
-			    TopName
-		    end,
-		{TableCInf,Components} =
-		    check_sequence(S#state{recordtopname=
-					   RecordName},
-					   Type,Seq#'SEQUENCE'.components),
-		TempNewDef#newt{type=Seq#'SEQUENCE'{tablecinf=TableCInf,
-					  components=Components},
-				tag=
-				merge_tags(Tag,?TAG_CONSTRUCTED(?N_SEQUENCE))};
-	    {'SEQUENCE OF',Components} ->
-		TempNewDef#newt{type={'SEQUENCE OF',check_sequenceof(S,Type,Components)},
-				tag=
-				merge_tags(Tag,?TAG_CONSTRUCTED(?N_SEQUENCE))};
-	    {'CHOICE',Components} ->
-		Ct = maybe_illicit_implicit_tag(choice,Tag),
-		TempNewDef#newt{type={'CHOICE',check_choice(S,Type,Components)},tag=Ct};
-	    Set when record(Set,'SET') ->
-		RecordName=
-		    case TopName of
-			[] ->
-			    [Type#typedef.name];
-			_ -> 
-			    TopName
-		    end,
-		{Sorted,TableCInf,Components} =
-		    check_set(S#state{recordtopname=RecordName},
-			      Type,Set#'SET'.components),
-		TempNewDef#newt{type=Set#'SET'{sorted=Sorted,
-				     tablecinf=TableCInf,
-				     components=Components},
-				tag=
-				merge_tags(Tag,?TAG_CONSTRUCTED(?N_SET))};
-	    {'SET OF',Components} ->
-		TempNewDef#newt{type={'SET OF',check_setof(S,Type,Components)},
-				tag=
-				merge_tags(Tag,?TAG_CONSTRUCTED(?N_SET))};
-	    %% This is a temporary hack until the full Information Obj Spec
-	    %% in X.681 is supported
-	    {{typereference,_,'TYPE-IDENTIFIER'},[{typefieldreference,_,'Type'}]} ->
-		Ct=maybe_illicit_implicit_tag(open_type,Tag),
-		TempNewDef#newt{type='ASN1_OPEN_TYPE',tag=Ct};
-
-	    {#'Externaltypereference'{type='TYPE-IDENTIFIER'},
-	     [{typefieldreference,_,'Type'}]} ->
-		Ct=maybe_illicit_implicit_tag(open_type,Tag),
-		TempNewDef#newt{type='ASN1_OPEN_TYPE',tag=Ct};
-
-	    {pt,Ptype,ParaList} ->
-		%% Ptype might be a parameterized - type, object set or
-		%% value set. If it isn't a parameterized type notify the
-		%% calling function.
-		{_,Ptypedef} = get_referenced_type(S,Ptype),
-		notify_if_not_ptype(S,Ptypedef),
-		NewParaList = [match_parameters(TmpParam,S#state.parameters)|| 
-				  TmpParam <- ParaList],
-		Instance = instantiate_ptype(S,Ptypedef,NewParaList),
-		TempNewDef#newt{type=Instance#type.def,
-				tag=merge_tags(Tag,Instance#type.tag),
-				constraint=Instance#type.constraint,
-				inlined=yes};
-
-%	    {ClRef,FieldRefList} when record(ClRef,'Externaltypereference') ->
-	    OCFT=#'ObjectClassFieldType'{class=ClRef} ->
-		%% this case occures in a SEQUENCE when 
-		%% the type of the component is a ObjectClassFieldType
-		ClassSpec = check_class(S,ClRef),
-		NewTypeDef = maybe_open_type(S,ClassSpec,OCFT,Constr),
-		InnerTag = get_innertag(S,NewTypeDef),
-		MergedTag = merge_tags(Tag,InnerTag),
-		Ct =
-		    case is_open_type(NewTypeDef) of
-			true ->
-			    maybe_illicit_implicit_tag(open_type,MergedTag);
-			_ ->
-			    MergedTag
-		    end,
-		TempNewDef#newt{type=NewTypeDef,tag=Ct};
-	    {valueset,Vtype} ->
-		TempNewDef#newt{type={valueset,check_type(S,Type,Vtype)}};
-	    Other ->
-		exit({'cant check' ,Other})
-	end,
-    Ts2 = case NewDef of
-	      #newt{type=unchanged} ->
-		  Ts#type{def=Def};
-	      #newt{type=TDef}->
-		  Ts#type{def=TDef}
-	  end,
-    NewTag = case NewDef of
-		 #newt{tag=unchanged} ->
-		     Tag;
-		 #newt{tag=TT} ->
-		     TT
-	     end,
-    T3 = Ts2#type{tag = lists:map(fun(TempTag = #tag{type={default,TTx}}) ->
-					  TempTag#tag{type=TTx};
-				     (Else) -> Else end, NewTag)},
-    T4 = case NewDef of
-	     #newt{constraint=unchanged} ->
-		 T3#type{constraint=Constr};
-	     #newt{constraint=NewConstr} -> 
-		 T3#type{constraint=NewConstr}
-	 end,
-    T5 = T4#type{inlined=NewDef#newt.inlined},
-    T5#type{constraint=check_constraints(S,T5#type.constraint)}.
-
-
-get_innertag(_S,#'ObjectClassFieldType'{type=Type}) ->
-    case Type of
-	#type{tag=Tag} -> Tag;
-	{fixedtypevaluefield,_,#type{tag=Tag}} -> Tag;
-	{TypeFieldName,_} when atom(TypeFieldName) -> [];
-	_ -> []
-    end;
-get_innertag(_S,_) ->
-    [].
-    
-is_class(_S,#classdef{}) ->
-    true;
-is_class(S,#typedef{typespec=#type{def=Eref}}) 
-  when record(Eref,'Externaltypereference')->
-    {_,NextDef} = get_referenced_type(S,Eref),
-    is_class(S,NextDef);
-is_class(_,_) ->
-    false.
-
-get_class_def(_S,CD=#classdef{}) ->
-    CD;
-get_class_def(S,#typedef{typespec=#type{def=Eref}})
-  when record(Eref,'Externaltypereference') ->
-    {_,NextDef} = get_referenced_type(S,Eref),
-    get_class_def(S,NextDef).
-    
-maybe_illicit_implicit_tag(Kind,Tag) ->
-    case Tag of
-	[#tag{type='IMPLICIT'}|_T] ->
-	    throw({error,{asn1,{implicit_tag_before,Kind}}});
-	[ChTag = #tag{type={default,_}}|T] -> 
-	    case Kind of
-		open_type ->
-		    [ChTag#tag{type='EXPLICIT',form=32}|T]; %X.680 30.6c, X.690 8.14.2
-		choice ->
-		    [ChTag#tag{type='EXPLICIT',form=32}|T] % X.680 28.6 c, 30.6c
-	    end;
-	_ -> 
-	    Tag % unchanged
-    end.
-
-%% maybe_open_type/2 -> {ClassSpec,FieldRefList} | 'ASN1_OPEN_TYPE'
-%% if the FieldRefList points out a typefield and the class don't have
-%% any UNIQUE field, so that a component relation constraint cannot specify
-%% the type of a typefield, return 'ASN1_OPEN_TYPE', otherwise return
-%% {ClassSpec,FieldRefList}.
-maybe_open_type(S,ClassSpec=#objectclass{fields=Fs},
-		OCFT=#'ObjectClassFieldType'{fieldname=FieldRefList},
-		Constr) ->
-    Type = get_ObjectClassFieldType(S,Fs,FieldRefList),
-    FieldNames=get_referenced_fieldname(FieldRefList),
-    case lists:last(FieldRefList) of
-	{valuefieldreference,_} ->
-	    OCFT#'ObjectClassFieldType'{class=ClassSpec,
-					fieldname=FieldNames,
-					type=Type};
-	{typefieldreference,_} ->
-	    case {catch get_unique_fieldname(#classdef{typespec=ClassSpec}),
-		  asn1ct_gen:get_constraint(Constr,componentrelation)}of
-		{Tuple,_} when tuple(Tuple) ->
-		    OCFT#'ObjectClassFieldType'{class=ClassSpec,
-						fieldname=FieldNames,
-						type='ASN1_OPEN_TYPE'};
-		{_,no} ->
-		    OCFT#'ObjectClassFieldType'{class=ClassSpec,
-						fieldname=FieldNames,
-						type='ASN1_OPEN_TYPE'};
-		_ ->
-		    OCFT#'ObjectClassFieldType'{class=ClassSpec,
-						fieldname=FieldNames,
-						type=Type}
-	    end
-    end.
-
-is_open_type(#'ObjectClassFieldType'{type='ASN1_OPEN_TYPE'}) ->
-    true;
-is_open_type(#'ObjectClassFieldType'{}) ->
-    false.
-
-
-notify_if_not_ptype(S,#pvaluesetdef{type=Type}) ->
-    case Type#type.def of
-	Ref when record(Ref,'Externaltypereference') ->
-	    case get_referenced_type(S,Ref) of
-		{_,#classdef{}} ->
-		    throw(pobjectsetdef);
-		{_,#typedef{}} ->
-		    throw(pvalueset)
-	    end;
-	T when record(T,type) -> % this must be a value set
-	    throw(pvalueset)
-    end;
-notify_if_not_ptype(_S,#ptypedef{}) ->
-    ok.
-
-% fix me
-instantiate_ptype(S,Ptypedef,ParaList) ->
-    #ptypedef{args=Args,typespec=Type} = Ptypedef,
-%    Args = get_pt_args(Ptypedef),
-%    Type = get_pt_spec(Ptypedef),
-    MatchedArgs = match_args(Args, ParaList, []),
-    NewS = S#state{type=Type,parameters=MatchedArgs,abscomppath=[]},
-    %The abscomppath must be empty since a table constraint in a
-    %parameterized type only can refer to components within the type
-    check_type(NewS, Ptypedef, Type).
-
-get_pt_args(#ptypedef{args=Args}) ->
-    Args;
-get_pt_args(#pvaluesetdef{args=Args}) ->
-    Args;
-get_pt_args(#pvaluedef{args=Args}) ->
-    Args;
-get_pt_args(#pobjectdef{args=Args}) ->
-    Args;
-get_pt_args(#pobjectsetdef{args=Args}) ->
-    Args.
-
-get_pt_spec(#ptypedef{typespec=Type}) ->
-    Type;
-get_pt_spec(#pvaluedef{value=Value}) ->
-    Value;
-get_pt_spec(#pvaluesetdef{valueset=VS}) ->
-    VS;
-get_pt_spec(#pobjectdef{def=Def}) ->
-    Def;
-get_pt_spec(#pobjectsetdef{def=Def}) ->
-    Def.
-
-
-	       
-match_args([FormArg|Ft], [ActArg|At], Acc) ->
-    match_args(Ft, At, [{FormArg,ActArg}|Acc]);
-match_args([], [], Acc) ->
-    lists:reverse(Acc);
-match_args(_, _, _) ->
-    throw({error,{asn1,{wrong_number_of_arguments}}}).
-    
-check_constraints(S,C) when list(C) -> 
-    check_constraints(S, C, []);
-check_constraints(S,C) when record(C,constraint) -> 
-    check_constraints(S, C#constraint.c, []).
-
-
-resolv_tuple_or_list(S,List) when list(List) ->
-    lists:map(fun(X)->resolv_value(S,X) end, List);
-resolv_tuple_or_list(S,{Lb,Ub}) ->
-    {resolv_value(S,Lb),resolv_value(S,Ub)}.
-
-%%%-----------------------------------------
-%% If the constraint value is a defined value the valuename
-%% is replaced by the actual value
-%%
-resolv_value(S,Val) ->
-    case match_parameters(Val, S#state.parameters) of
-	Id -> % unchanged 
-	    resolv_value1(S,Id);
-	Other ->
-	    resolv_value(S,Other)
-    end.
-
-resolv_value1(S = #state{mname=M,inputmodules=InpMods},
-	      V=#'Externalvaluereference'{pos=Pos,module=ExtM,value=Name}) ->
-    case ExtM of
-	M -> resolv_value2(S,M,Name,Pos);
-	_ ->
-	    case lists:member(ExtM,InpMods) of
-		true ->
-		    resolv_value2(S,M,Name,Pos);
-		false ->
-		    V
-	    end
-    end;    
-resolv_value1(S,{gt,V}) ->
-    case V of
-	Int when integer(Int) ->
-	    V + 1;
-	#valuedef{value=Int} ->
-	    1 + resolv_value(S,Int);
-	Other ->
-	    throw({error,{asn1,{undefined_type_or_value,Other}}})
-    end;
-resolv_value1(S,{lt,V}) ->
-    case V of
-	Int when integer(Int) ->
-	    V - 1;
-	#valuedef{value=Int} ->
-	    resolv_value(S,Int) - 1;
-	Other ->
-	    throw({error,{asn1,{undefined_type_or_value,Other}}})
-    end;
-resolv_value1(S,{'ValueFromObject',{object,Object},[{valuefieldreference,
-						     FieldName}]}) ->
-    %% FieldName can hold either a fixed-type value or a variable-type value
-    %% Object is a DefinedObject, i.e. a #'Externaltypereference'
-    {_,ObjTDef} = get_referenced_type(S,Object),
-    TS = check_object(S,ObjTDef,ObjTDef#typedef.typespec),
-    {_,_,Components} = TS#'Object'.def,
-    case lists:keysearch(FieldName,1,Components) of
-	{value,{_,#valuedef{value=Val}}} ->
-	    Val;
-	_ ->
-	    error({value,"illegal value in constraint",S})
-    end;
-% resolv_value1(S,{'ValueFromObject',{po,Object,Params},FieldName}) ->
-%     %% FieldName can hold either a fixed-type value or a variable-type value
-%     %% Object is a ParameterizedObject
-resolv_value1(_,V) ->
-    V.
-
-resolv_value2(S,ModuleName,Name,Pos) ->
-    case asn1_db:dbget(ModuleName,Name) of
-	undefined ->
-	    case imported(S,Name) of 
-		{ok,Imodule} ->
-		    {_,V2} = get_referenced(S,Imodule,Name,Pos),
-		    V2#valuedef.value;
-		_  ->
-		    throw({error,{asn1,{undefined_type_or_value,Name}}})
-	    end;
-	Val ->
-	    Val#valuedef.value
-    end.
-
-check_constraints(S,[{'ContainedSubtype',Type} | Rest], Acc) ->
-    {_,CTDef} = get_referenced_type(S,Type#type.def),
-    CType = check_type(S,S#state.tname,CTDef#typedef.typespec),    
-    check_constraints(S,Rest,CType#type.constraint ++ Acc);
-check_constraints(S,[C | Rest], Acc) ->
-    check_constraints(S,Rest,[check_constraint(S,C) | Acc]);
-check_constraints(S,[],Acc) ->
-%    io:format("Acc: ~p~n",[Acc]),
-    C = constraint_merge(S,lists:reverse(Acc)),
-%    io:format("C: ~p~n",[C]),
-    lists:flatten(C).
-
-
-range_check(F={FixV,FixV}) ->
-%    FixV;
-    F;
-range_check(VR={Lb,Ub}) when Lb < Ub ->
-    VR;
-range_check(Err={_,_}) ->
-    throw({error,{asn1,{illegal_size_constraint,Err}}});
-range_check(Value) ->
-    Value.
-
-check_constraint(S,Ext) when record(Ext,'Externaltypereference') ->
-    check_externaltypereference(S,Ext);
-
-
-check_constraint(S,{'SizeConstraint',{Lb,Ub}}) 
-  when list(Lb);tuple(Lb),size(Lb)==2 ->
-    case Lb of
-	#'Externalvaluereference'{} ->
-	    check_constraint(S,{'SizeConstraint',{resolv_value(S,Lb),Ub}});
-	_ ->
-	    NewLb = range_check(resolv_tuple_or_list(S,Lb)),
-	    NewUb = range_check(resolv_tuple_or_list(S,Ub)),
-	    {'SizeConstraint',{NewLb,NewUb}}
-    end;
-check_constraint(S,{'SizeConstraint',{Lb,Ub}}) ->
-    case {resolv_value(S,Lb),resolv_value(S,Ub)} of
-	{FixV,FixV} ->
-	    {'SizeConstraint',FixV};
-	{Low,High} when Low < High ->
-	    {'SizeConstraint',{Low,High}};
-	Err ->
-	    throw({error,{asn1,{illegal_size_constraint,Err}}})
-    end;
-check_constraint(S,{'SizeConstraint',Lb}) ->
-    {'SizeConstraint',resolv_value(S,Lb)};
-
-check_constraint(S,{'SingleValue', L}) when list(L) ->
-    F = fun(A) -> resolv_value(S,A) end,
-    {'SingleValue',lists:map(F,L)};
-    
-check_constraint(S,{'SingleValue', V}) when integer(V) ->
-    Val = resolv_value(S,V),
-%%    [{'SingleValue',Val},{'ValueRange',{Val,Val}}]; % Why adding value range?
-    {'SingleValue',Val};
-check_constraint(S,{'SingleValue', V}) ->
-    {'SingleValue',resolv_value(S,V)};
-
-check_constraint(S,{'ValueRange', {Lb, Ub}}) ->
-    {'ValueRange',{resolv_value(S,Lb),resolv_value(S,Ub)}};
-
-%%check_constraint(S,{'ContainedSubtype',Type}) ->
-%%    #typedef{typespec=TSpec} = 
-%%	check_type(S,S#state.tname,get_referenced_type(S,Type#type.def)),
-%%    [C] = TSpec#type.constraint,
-%%    C;
-
-check_constraint(S,{valueset,Type}) ->
-    {valueset,check_type(S,S#state.tname,Type)};
-
-check_constraint(S,{simpletable,Type}) ->
-    OSName = (Type#type.def)#'Externaltypereference'.type,
-    C = match_parameters(Type#type.def,S#state.parameters),
-    case C of
-	#'Externaltypereference'{} ->
-	     Type#type{def=check_externaltypereference(S,C)},
-	    {simpletable,OSName};
-	_ ->
-	    check_type(S,S#state.tname,Type),
-	    {simpletable,OSName}
-    end;
-
-check_constraint(S,{componentrelation,{objectset,Opos,Objset},Id}) ->
-    %% Objset is an 'Externaltypereference' record, since Objset is
-    %% a DefinedObjectSet.
-    RealObjset = match_parameters(Objset,S#state.parameters),
-    Ext = check_externaltypereference(S,RealObjset),
-    {componentrelation,{objectset,Opos,Ext},Id};
-
-check_constraint(S,Type) when record(Type,type) ->
-    #type{def=Def} = check_type(S,S#state.tname,Type),
-    Def;
-
-check_constraint(S,C) when list(C) ->
-    lists:map(fun(X)->check_constraint(S,X) end,C);
-% else keep the constraint unchanged
-check_constraint(_S,Any) ->
-%    io:format("Constraint = ~p~n",[Any]),
-    Any.
-
-%% constraint_merge/2
-%% Compute the intersection of the outermost level of the constraint list.
-%% See Dubuisson second paragraph and fotnote on page 285.
-%% If constraints with extension are included in combined constraints. The 
-%% resulting combination will have the extension of the last constraint. Thus,
-%% there will be no extension if the last constraint is without extension.
-%% The rootset of all constraints are considered in the "outermoust 
-%% intersection". See section 13.1.2 in Dubuisson.
-constraint_merge(_S,C=[H])when tuple(H) ->
-    C;
-constraint_merge(_S,[]) ->
-    [];
-constraint_merge(S,C) ->
-    %% skip all extension but the last
-    C1 = filter_extensions(C),
-    %% perform all internal level intersections, intersections first
-    %% since they have precedence over unions
-    C2 = lists:map(fun(X)when list(X)->constraint_intersection(S,X);
-		      (X) -> X end,
-		   C1),
-    %% perform all internal level unions
-    C3 = lists:map(fun(X)when list(X)->constraint_union(S,X);
-		      (X) -> X end,
-		   C2),
-
-    %% now get intersection of the outermost level
-    %% get the least common single value constraint
-    SVs = get_constraints(C3,'SingleValue'),
-    CombSV = intersection_of_sv(S,SVs),
-    %% get the least common value range constraint
-    VRs = get_constraints(C3,'ValueRange'),
-    CombVR = intersection_of_vr(S,VRs),
-    %% get the least common size constraint
-    SZs = get_constraints(C3,'SizeConstraint'),
-    CombSZ = intersection_of_size(S,SZs),
-    CminusSVs=ordsets:subtract(ordsets:from_list(C3),ordsets:from_list(SVs)),
-    % CminusSVsVRs = ordsets:subtract(ordsets:from_list(CminusSVs),
-% 				    ordsets:from_list(VRs)),
-    RestC = ordsets:subtract(ordsets:from_list(CminusSVs),
-			     ordsets:from_list(SZs)),
-    %% get the least common combined constraint. That is the union of each
-    %% deep costraint and merge of single value and value range constraints
-    combine_constraints(S,CombSV,CombVR,CombSZ++RestC).
-
-%% constraint_union(S,C) takes a list of constraints as input and
-%% merge them to a union. Unions are performed when two
-%% constraints is found with an atom union between. 
-%% The list may be nested. Fix that later !!!
-constraint_union(_S,[]) ->
-    [];
-constraint_union(_S,C=[_E]) ->
-    C;
-constraint_union(S,C) when list(C) ->
-    case lists:member(union,C) of
-	true ->
-	    constraint_union1(S,C,[]);
-	_ ->
-	    C
-    end;
-%     SV = get_constraints(C,'SingleValue'),
-%     SV1 = constraint_union_sv(S,SV),
-%     VR = get_constraints(C,'ValueRange'),
-%     VR1 = constraint_union_vr(VR),
-%     RestC = ordsets:filter(fun({'SingleValue',_})->false;
-% 			      ({'ValueRange',_})->false;
-% 			      (_) -> true end,ordsets:from_list(C)),
-%     SV1++VR1++RestC;
-constraint_union(_S,C) ->
-    [C].
-
-constraint_union1(S,[A={'ValueRange',_},union,B={'ValueRange',_}|Rest],Acc) ->
-    AunionB = constraint_union_vr([A,B]),
-    constraint_union1(S,Rest,AunionB++Acc);
-constraint_union1(S,[A={'SingleValue',_},union,B={'SingleValue',_}|Rest],Acc) ->
-    AunionB = constraint_union_sv(S,[A,B]),
-    constraint_union1(S,Rest,AunionB++Acc);
-constraint_union1(S,[A={'SingleValue',_},union,B={'ValueRange',_}|Rest],Acc) ->
-    AunionB = union_sv_vr(S,A,B),
-    constraint_union1(S,Rest,AunionB++Acc);
-constraint_union1(S,[A={'ValueRange',_},union,B={'SingleValue',_}|Rest],Acc) ->
-    AunionB = union_sv_vr(S,B,A),
-    constraint_union1(S,Rest,AunionB++Acc);
-constraint_union1(S,[union|Rest],Acc) -> %skip when unsupported constraints
-    constraint_union1(S,Rest,Acc);
-constraint_union1(S,[A|Rest],Acc) ->
-    constraint_union1(S,Rest,[A|Acc]);
-constraint_union1(_S,[],Acc) ->
-    lists:reverse(Acc).
-
-constraint_union_sv(_S,SV) ->
-    Values=lists:map(fun({_,V})->V end,SV),
-    case ordsets:from_list(Values) of
-	[] -> [];
-	[N] -> [{'SingleValue',N}];
-	L -> [{'SingleValue',L}]
-    end.
-
-%% REMOVE????
-%%constraint_union(S,VR,'ValueRange') ->
-%%    constraint_union_vr(VR).
-
-%% constraint_union_vr(VR)
-%% VR = [{'ValueRange',{Lb,Ub}},...]
-%% Lb = 'MIN' | integer()
-%% Ub = 'MAX' | integer()
-%% Returns if possible only one ValueRange tuple with a range that
-%% is a union of all ranges in VR.
-constraint_union_vr(VR) ->
-    %% Sort VR by Lb in first hand and by Ub in second hand
-    Fun=fun({_,{'MIN',_B1}},{_,{A2,_B2}}) when integer(A2)->true;
-	   ({_,{A1,_B1}},{_,{'MAX',_B2}}) when integer(A1) -> true;
-	   ({_,{A1,_B1}},{_,{A2,_B2}}) when integer(A1),integer(A2),A1<A2 -> true;
-	   ({_,{A,B1}},{_,{A,B2}}) when B1=<B2->true;
-	   (_,_)->false end,
-    constraint_union_vr(lists:usort(Fun,VR),[]).
-
-constraint_union_vr([],Acc) ->
-    lists:reverse(Acc);
-constraint_union_vr([C|Rest],[]) ->
-    constraint_union_vr(Rest,[C]);
-constraint_union_vr([{_,{Lb,Ub2}}|Rest],[{_,{Lb,_Ub1}}|Acc]) -> %Ub2 > Ub1
-    constraint_union_vr(Rest,[{'ValueRange',{Lb,Ub2}}|Acc]);
-constraint_union_vr([{_,{_,Ub}}|Rest],A=[{_,{_,Ub}}|_Acc]) ->
-    constraint_union_vr(Rest,A);
-constraint_union_vr([{_,{Lb2,Ub2}}|Rest],[{_,{Lb1,Ub1}}|Acc]) when Lb2=<Ub1,
-								   Ub2>Ub1->
-    constraint_union_vr(Rest,[{'ValueRange',{Lb1,Ub2}}|Acc]);
-constraint_union_vr([{_,{_,Ub2}}|Rest],A=[{_,{_,Ub1}}|_Acc]) when Ub2=<Ub1->
-    constraint_union_vr(Rest,A);
-constraint_union_vr([VR|Rest],Acc) ->
-    constraint_union_vr(Rest,[VR|Acc]).
-
-union_sv_vr(_S,[],B) ->
-    [B];
-union_sv_vr(_S,A,[]) ->
-    [A];
-union_sv_vr(_S,C1={'SingleValue',SV},C2={'ValueRange',VR={Lb,Ub}}) 
-  when integer(SV) ->
-    case is_int_in_vr(SV,C2) of
-	true -> [C2];
-	_ ->
-	    case VR of
-		{'MIN',Ub} when SV==Ub+1 -> [{'ValueRange',{'MIN',SV}}];
-		{Lb,'MAX'} when SV==Lb-1 -> [{'ValueRange',{SV,'MAX'}}];
-		{Lb,Ub} when SV==Ub+1 -> [{'ValueRange',{Lb,SV}}];
-		{Lb,Ub} when SV==Lb-1 -> [{'ValueRange',{SV,Ub}}];
-		_ ->
-		    [C1,C2]
-	    end
-    end;
-union_sv_vr(_S,C1={'SingleValue',SV},C2={'ValueRange',{_Lb,_Ub}}) 
-  when list(SV) ->
-    case lists:filter(fun(X)->is_int_in_vr(X,C2) end,SV) of
-	[] -> [C2];
-	L -> 
-	    case expand_vr(L,C2) of
-		{[],C3} -> [C3];
-		{L,C2} -> [C1,C2];
-		{[Val],C3} -> [{'SingleValue',Val},C3];
-		{L2,C3} -> [{'SingleValue',L2},C3]
-	    end
-    end.
-
-expand_vr(L,VR={_,{Lb,Ub}}) ->
-    case lower_Lb(L,Lb) of
-	false ->
-	    case higher_Ub(L,Ub) of
-		false ->
-		    {L,VR};
-		{L1,UbNew} ->
-		    expand_vr(L1,{'ValueRange',{Lb,UbNew}})
-	    end;
-	{L1,LbNew} ->
-	    expand_vr(L1,{'ValueRange',{LbNew,Ub}})
-    end.
-
-lower_Lb(_,'MIN') ->
-    false;
-lower_Lb(L,Lb) ->
-    remove_val_from_list(Lb - 1,L).
-
-higher_Ub(_,'MAX') ->
-    false;
-higher_Ub(L,Ub) ->
-    remove_val_from_list(Ub + 1,L).
-
-remove_val_from_list(List,Val) ->
-    case lists:member(Val,List) of
-	true ->
-	    {lists:delete(Val,List),Val};
-	false ->
-	    false
-    end.
-		    
-%% get_constraints/2  
-%% Arguments are a list of constraints, which has the format {key,value},
-%% and a constraint type
-%% Returns a list of constraints only of the requested type or the atom
-%% 'no' if no such constraints were found
-get_constraints(L=[{CType,_}],CType) ->
-    L;
-get_constraints(C,CType) ->
-   keysearch_allwithkey(CType,1,C).
-
-%% keysearch_allwithkey(Key,Ix,L)
-%% Types:
-%% Key = atom()
-%% Ix = integer()
-%% L  = [TwoTuple]
-%% TwoTuple = [{atom(),term()}|...]
-%% Returns a List that contains all 
-%% elements from L that has a key Key as element Ix
-keysearch_allwithkey(Key,Ix,L) ->
-    lists:filter(fun(X) when tuple(X) ->
-			 case element(Ix,X) of
-			     Key -> true;
-			     _ -> false
-			 end;
-		    (_) -> false
-		 end, L).
-
-
-%% filter_extensions(C)
-%% takes a list of constraints as input and
-%% returns a list with the intersection of all extension roots
-%% and only the extension of the last constraint kept if any 
-%% extension in the last constraint
-filter_extensions([]) ->
-    [];
-filter_extensions(C=[_H]) ->
-    C;
-filter_extensions(C) when list(C) ->
-    filter_extensions(C,[]).
-
-filter_extensions([C],Acc) ->
-    lists:reverse([C|Acc]);
-filter_extensions([{C,_E},H2|T],Acc) when tuple(C) ->
-    filter_extensions([H2|T],[C|Acc]);
-filter_extensions([{'SizeConstraint',{A,_B}},H2|T],Acc) 
-  when list(A);tuple(A) ->
-    filter_extensions([H2|T],[{'SizeConstraint',A}|Acc]);
-filter_extensions([H1,H2|T],Acc) ->
-    filter_extensions([H2|T],[H1|Acc]).
-
-%% constraint_intersection(S,C) takes a list of constraints as input and
-%% performs intersections. Intersecions are performed when an 
-%% atom intersection is found between two constraints. 
-%% The list may be nested. Fix that later !!!
-constraint_intersection(_S,[]) ->
-    [];
-constraint_intersection(_S,C=[_E]) ->
-    C;
-constraint_intersection(S,C) when list(C) ->
-%    io:format("constraint_intersection: ~p~n",[C]),
-    case lists:member(intersection,C) of
-	true ->
-	    constraint_intersection1(S,C,[]);
-	_ ->
-	    C
-    end;
-constraint_intersection(_S,C) ->
-    [C].
-
-constraint_intersection1(S,[A,intersection,B|Rest],Acc) ->
-    AisecB = c_intersect(S,A,B),
-    constraint_intersection1(S,Rest,AisecB++Acc);
-constraint_intersection1(S,[A|Rest],Acc) ->
-    constraint_intersection1(S,Rest,[A|Acc]);
-constraint_intersection1(_,[],Acc) ->
-    lists:reverse(Acc).
-
-c_intersect(S,C1={'SingleValue',_},C2={'SingleValue',_}) ->
-    intersection_of_sv(S,[C1,C2]);
-c_intersect(S,C1={'ValueRange',_},C2={'ValueRange',_}) ->
-    intersection_of_vr(S,[C1,C2]);
-c_intersect(S,C1={'ValueRange',_},C2={'SingleValue',_}) ->
-    intersection_sv_vr(S,[C2],[C1]);
-c_intersect(S,C1={'SingleValue',_},C2={'ValueRange',_}) ->
-    intersection_sv_vr(S,[C1],[C2]);
-c_intersect(_S,C1,C2) ->
-    [C1,C2].
-
-%% combine_constraints(S,SV,VR,CComb)
-%% Types:
-%% S = record(state,S)
-%% SV = [] | [SVC]
-%% VR = [] | [VRC]
-%% CComb = [] | [Lists]
-%% SVC = {'SingleValue',integer()} | {'SingleValue',[integer(),...]}
-%% VRC = {'ValueRange',{Lb,Ub}}
-%% Lists = List of lists containing any constraint combination
-%% Lb = 'MIN' | integer()
-%% Ub = 'MAX' | integer()
-%% Returns a combination of the least common constraint among SV,VR and all
-%% elements in CComb
-combine_constraints(_S,[],VR,CComb) ->
-    VR ++ CComb;
-%    combine_combined_cnstr(S,VR,CComb);
-combine_constraints(_S,SV,[],CComb) ->
-    SV ++ CComb;
-%    combine_combined_cnstr(S,SV,CComb);
-combine_constraints(S,SV,VR,CComb) ->
-    C=intersection_sv_vr(S,SV,VR),
-    C ++ CComb.
-%    combine_combined_cnstr(S,C,CComb).
-
-intersection_sv_vr(_,[],_VR) ->
-    [];
-intersection_sv_vr(_,_SV,[]) ->
-    [];
-intersection_sv_vr(_S,[C1={'SingleValue',SV}],[C2={'ValueRange',{_Lb,_Ub}}]) 
-  when integer(SV) ->
-    case is_int_in_vr(SV,C2) of
-	true -> [C1];
-	_ -> %%error({type,{"asn1 illegal constraint",C1,C2},S})
-	    throw({error,{"asn1 illegal constraint",C1,C2}})
-    end;
-intersection_sv_vr(_S,[C1={'SingleValue',SV}],[C2]) 
-  when list(SV) ->
-    case lists:filter(fun(X)->is_int_in_vr(X,C2) end,SV) of
-	[] ->
-	    %%error({type,{"asn1 illegal constraint",C1,C2},S});
-	    throw({error,{"asn1 illegal constraint",C1,C2}});
-	[V] -> [{'SingleValue',V}];
-	L -> [{'SingleValue',L}]
-    end.
-
-
-
-intersection_of_size(_,[]) ->
-    [];
-intersection_of_size(_,C=[_SZ]) ->
-    C;
-intersection_of_size(S,[SZ,SZ|Rest]) ->
-    intersection_of_size(S,[SZ|Rest]);
-intersection_of_size(S,C=[C1={_,Int},{_,Range}|Rest]) 
-  when integer(Int),tuple(Range) ->
-    case Range of
-	{Lb,Ub} when Int >= Lb,
-		     Int =< Ub ->
-	    intersection_of_size(S,[C1|Rest]);
-	_ ->
-	    throw({error,{asn1,{illegal_size_constraint,C}}})
-    end;
-intersection_of_size(S,[C1={_,Range},C2={_,Int}|Rest]) 
-  when integer(Int),tuple(Range) ->
-    intersection_of_size(S,[C2,C1|Rest]);
-intersection_of_size(S,[{_,{Lb1,Ub1}},{_,{Lb2,Ub2}}|Rest]) ->
-    Lb=greatest_LB(ordsets:from_list([Lb1,Lb2])),
-    Ub=smallest_UB(ordsets:from_list([Ub1,Ub2])),
-    intersection_of_size(S,[{'SizeConstraint',{Lb,Ub}}|Rest]);
-intersection_of_size(_,SZ) ->
-    throw({error,{asn1,{illegal_size_constraint,SZ}}}).
-
-intersection_of_vr(_,[]) ->
-    [];
-intersection_of_vr(_,VR=[_C]) ->
-    VR;
-intersection_of_vr(S,[{_,{Lb1,Ub1}},{_,{Lb2,Ub2}}|Rest]) ->
-    Lb=greatest_LB(ordsets:from_list([Lb1,Lb2])),
-    Ub=smallest_UB(ordsets:from_list([Ub1,Ub2])),
-    intersection_of_vr(S,[{'ValueRange',{Lb,Ub}}|Rest]);
-intersection_of_vr(_S,VR) ->
-    %%error({type,{asn1,{illegal_value_range_constraint,VR}},S});
-    throw({error,{asn1,{illegal_value_range_constraint,VR}}}).
-
-intersection_of_sv(_,[]) ->
-    [];
-intersection_of_sv(_,SV=[_C]) ->
-    SV;
-intersection_of_sv(S,[SV,SV|Rest]) ->
-    intersection_of_sv(S,[SV|Rest]);
-intersection_of_sv(S,[{_,Int},{_,SV}|Rest]) when integer(Int),
-						 list(SV) ->
-    SV2=intersection_of_sv1(S,Int,SV),
-    intersection_of_sv(S,[SV2|Rest]);
-intersection_of_sv(S,[{_,SV},{_,Int}|Rest]) when integer(Int),
-						 list(SV) ->
-    SV2=intersection_of_sv1(S,Int,SV),
-    intersection_of_sv(S,[SV2|Rest]);
-intersection_of_sv(S,[{_,SV1},{_,SV2}|Rest]) when list(SV1),
-						  list(SV2) ->
-    SV3=common_set(SV1,SV2),
-    intersection_of_sv(S,[SV3|Rest]);
-intersection_of_sv(_S,SV) ->
-    %%error({type,{asn1,{illegal_single_value_constraint,SV}},S}).
-    throw({error,{asn1,{illegal_single_value_constraint,SV}}}).
-
-intersection_of_sv1(_S,Int,SV) when integer(Int),list(SV) ->
-    case lists:member(Int,SV) of
-	true -> {'SingleValue',Int};
-	_ ->
-	    %%error({type,{asn1,{illegal_single_value_constraint,Int,SV}},S})
-	    throw({error,{asn1,{illegal_single_value_constraint,Int,SV}}})
-    end;
-intersection_of_sv1(_S,SV1,SV2) ->
-    %%error({type,{asn1,{illegal_single_value_constraint,SV1,SV2}},S}).
-    throw({error,{asn1,{illegal_single_value_constraint,SV1,SV2}}}).
-
-greatest_LB([H]) ->
-    H;
-greatest_LB(L) ->
-    greatest_LB1(lists:reverse(L)).
-greatest_LB1(['MIN',H2|_T])->
-    H2;
-greatest_LB1([H|_T]) ->
-    H.
-smallest_UB(L) ->
-    hd(L).
-
-common_set(SV1,SV2) ->
-    lists:filter(fun(X)->lists:member(X,SV1) end,SV2).
-
-is_int_in_vr(Int,{_,{'MIN','MAX'}}) when integer(Int) ->
-    true;
-is_int_in_vr(Int,{_,{'MIN',Ub}}) when integer(Int),Int =< Ub ->
-    true;
-is_int_in_vr(Int,{_,{Lb,'MAX'}}) when integer(Int),Int >= Lb ->
-    true;
-is_int_in_vr(Int,{_,{Lb,Ub}}) when integer(Int),Int >= Lb,Int =< Ub ->
-    true;
-is_int_in_vr(_,_) ->
-    false.
-    
-
-
-check_imported(_S,Imodule,Name) ->
-    case asn1_db:dbget(Imodule,'MODULE') of
-	undefined ->
-	    io:format("~s.asn1db not found~n",[Imodule]),
-	    io:format("Type ~s imported from non existing module ~s~n",[Name,Imodule]);
-	Im when record(Im,module) ->
-	    case is_exported(Im,Name) of
-		false ->
-		    io:format("Imported type ~s not exported from module ~s~n",[Name,Imodule]);
-		_ ->
-		    ok
-	    end
-    end,
-    ok.
-
-is_exported(Module,Name) when record(Module,module) ->
-    {exports,Exports} = Module#module.exports,
-    case Exports of
-	all ->
-	    true;
-	[] ->
-	    false;
-	L when list(L) -> 
-	    case lists:keysearch(Name,#'Externaltypereference'.type,Exports) of
-		false -> false;
-		_ -> true
-	    end
-    end.
-    
-
-
-check_externaltypereference(S,Etref=#'Externaltypereference'{module=Emod})->
-    Currmod = S#state.mname,
-    MergedMods = S#state.inputmodules,
-    case Emod of
-	Currmod ->
-	    %% reference to current module or to imported reference
-		check_reference(S,Etref);
-	 _ ->
-	    %% io:format("Type ~s IMPORTED FROM ~s~n",[Etype,Emod]),
-	    case lists:member(Emod,MergedMods) of
-		true ->
-		    check_reference(S,Etref);
-		false ->
-		    Etref
-	    end
-    end.
-
-check_reference(S,#'Externaltypereference'{pos=Pos,module=Emod,type=Name}) ->
-    ModName = S#state.mname,
-    case asn1_db:dbget(ModName,Name) of
-	undefined ->
-	    case imported(S,Name) of
-		{ok,Imodule} ->
-		    check_imported(S,Imodule,Name),
-		    #'Externaltypereference'{module=Imodule,type=Name};
-		_ ->
-		    %may be a renamed type in multi file compiling!
-		    {_,T}=renamed_reference(S,Name,Emod),
-		    NewName = asn1ct:get_name_of_def(T),
-		    NewPos = asn1ct:get_pos_of_def(T),
-		    #'Externaltypereference'{pos=NewPos,
-					     module=ModName,
-					     type=NewName}
-	    end;
-	_ ->
-	    %% cannot do check_type here due to recursive definitions, like
-	    %% S ::= SEQUENCE {a INTEGER, b S}. This implies that references
-	    %% that appear before the definition will be an 
-	    %% Externaltypereference in the abstract syntax tree
-	    #'Externaltypereference'{pos=Pos,module=ModName,type=Name}
-    end.
-
-
-name2Extref(_Mod,Name) when record(Name,'Externaltypereference') ->
-    Name;
-name2Extref(Mod,Name) ->
-    #'Externaltypereference'{module=Mod,type=Name}.
-
-get_referenced_type(S,Ext) when record(Ext,'Externaltypereference') ->
-    case match_parameters(Ext, S#state.parameters) of
-	Ext -> 
-	    #'Externaltypereference'{pos=Pos,module=Emod,type=Etype} = Ext,
-	    case S#state.mname of
-		Emod -> % a local reference in this module
-		    get_referenced1(S,Emod,Etype,Pos);
-		_ ->% always when multi file compiling
-		    case lists:member(Emod,S#state.inputmodules) of
-			true ->
-			    get_referenced1(S,Emod,Etype,Pos);
-			false ->
-			    get_referenced(S,Emod,Etype,Pos)
-		    end
-	    end;
-	Other ->
-	    {undefined,Other}
-    end;
-get_referenced_type(S=#state{mname=Emod},
-		    ERef=#'Externalvaluereference'{pos=P,module=Emod,
-						   value=Eval}) ->
-    case match_parameters(ERef,S#state.parameters) of
-	ERef ->
-	    get_referenced1(S,Emod,Eval,P);
-	OtherERef when record(OtherERef,'Externalvaluereference') ->
-	    get_referenced_type(S,OtherERef);
-	Value ->
-	    {Emod,Value}
-    end;
-get_referenced_type(S,ERef=#'Externalvaluereference'{pos=Pos,module=Emod,
-						value=Eval}) ->
-    case match_parameters(ERef,S#state.parameters) of
-	ERef ->
-	    case lists:member(Emod,S#state.inputmodules) of
-		true ->
-		    get_referenced1(S,Emod,Eval,Pos);
-		false ->
-		    get_referenced(S,Emod,Eval,Pos)
-	    end;
-	OtherERef  ->
-	    get_referenced_type(S,OtherERef)
-    end;
-get_referenced_type(S,#identifier{val=Name,pos=Pos}) ->
-    get_referenced1(S,undefined,Name,Pos);
-get_referenced_type(_S,Type) ->
-    {undefined,Type}.
-
-%% get_referenced/3
-%% The referenced entity Ename may in case of an imported parameterized
-%% type reference imported entities in the other module, which implies that
-%% asn1_db:dbget will fail even though the referenced entity exists. Thus
-%% Emod may be the module that imports the entity Ename and not holds the
-%% data about Ename. 
-get_referenced(S,Emod,Ename,Pos) ->
-    case asn1_db:dbget(Emod,Ename) of
-	undefined ->
-	    %% May be an imported entity in module Emod
-%	    throw({error,{asn1,{undefined_type_or_value,{Emod,Ename}}}});
-	    NewS = S#state{module=asn1_db:dbget(Emod,'MODULE')},
-	    get_imported(NewS,Ename,Emod,Pos);
-	T when record(T,typedef) ->
-	    Spec = T#typedef.typespec,
-	    case Spec#type.def of
-		Tref when record(Tref,typereference) ->
-		    Def = #'Externaltypereference'{module=Emod,
-					     type=Tref#typereference.val,
-					     pos=Tref#typereference.pos},
-		    
-		    
-		    {Emod,T#typedef{typespec=Spec#type{def=Def}}};
-		_ ->
-		    {Emod,T} % should add check that T is exported here
-	    end;
-	V -> {Emod,V}
-    end.
-
-get_referenced1(S,ModuleName,Name,Pos) ->
-    case asn1_db:dbget(S#state.mname,Name) of
-	undefined ->
-	    %% ModuleName may be other than S#state.mname when 
-	    %% multi file compiling is used.
-	    get_imported(S,Name,ModuleName,Pos);
-	T ->
-	    {S#state.mname,T}
-    end.
-
-get_imported(S,Name,Module,Pos) ->
-    case imported(S,Name) of
-	{ok,Imodule} ->
-	    case asn1_db:dbget(Imodule,'MODULE') of
-		undefined ->
-		    throw({error,{asn1,{module_not_found,Imodule}}});
-		Im when record(Im,module) ->
-		    case is_exported(Im,Name) of
-			false ->
-			    throw({error,
-				   {asn1,{not_exported,{Im,Name}}}});
-			_ ->
-			    get_referenced_type(S,
-						#'Externaltypereference'
-						{module=Imodule,
-						 type=Name,pos=Pos})
-		    end
-	    end;
-	_ ->
-	    renamed_reference(S,Name,Module)
-    end.
-
-renamed_reference(S,Name,Module) ->
-    %% first check if there is a renamed type in this module
-    %% second check if any type was imported with this name
-    case ets:info(renamed_defs) of
-	undefined -> throw({error,{asn1,{undefined_type,Name}}});
-	_ ->
-	    case ets:match(renamed_defs,{'$1',Name,Module}) of
-		[] -> 
-		    case ets:info(original_imports) of
-			undefined ->
-			    throw({error,{asn1,{undefined_type,Name}}});
-			_  ->
-			    case ets:match(original_imports,{Module,'$1'}) of
-				[] ->
-				    throw({error,{asn1,{undefined_type,Name}}});
-				[[ImportsList]] ->
-				    case get_importmoduleoftype(ImportsList,Name) of
-					undefined ->
-					    throw({error,{asn1,{undefined_type,Name}}});
-					NextMod ->
-					    renamed_reference(S,Name,NextMod)
-				    end
-			    end
-		    end;
-		[[NewTypeName]] ->
-		    get_referenced1(S,Module,NewTypeName,undefined)
-	    end
-    end.
-
-get_importmoduleoftype([I|Is],Name) ->
-    Index = #'Externaltypereference'.type,
-    case lists:keysearch(Name,Index,I#'SymbolsFromModule'.symbols) of
-	{value,_Ref} ->
-	    (I#'SymbolsFromModule'.module)#'Externaltypereference'.type;
-	_ ->
-	    get_importmoduleoftype(Is,Name)
-    end;
-get_importmoduleoftype([],_) ->
-    undefined.
-		     
-
-match_parameters(Name,[]) ->
-    Name;
-
-match_parameters(#'Externaltypereference'{type=Name},[{#'Externaltypereference'{type=Name},NewName}|_T]) ->
-    NewName;
-match_parameters(#'Externaltypereference'{type=Name},[{{_,#'Externaltypereference'{type=Name}},NewName}|_T]) ->
-    NewName;
-% match_parameters(#'Externaltypereference'{type=Name},[{#typereference{val=Name},NewName}|T]) ->
-%     NewName;
-% match_parameters(#'Externaltypereference'{type=Name},[{{_,#typereference{val=Name}},NewName}|T]) ->
-%     NewName;
-%match_parameters(#typereference{val=Name},[{#typereference{val=Name},NewName}|T]) ->
-%    NewName;
-match_parameters(#'Externalvaluereference'{value=Name},[{#'Externalvaluereference'{value=Name},NewName}|_T]) ->
-    NewName;
-match_parameters(#'Externalvaluereference'{value=Name},[{{_,#'Externalvaluereference'{value=Name}},NewName}|_T]) ->
-    NewName;
-% match_parameters(#identifier{val=Name},[{#identifier{val=Name},NewName}|T]) ->
-%     NewName;
-% match_parameters(#identifier{val=Name},[{{_,#identifier{val=Name}},NewName}|T]) ->
-%     NewName;
-match_parameters({valueset,#type{def=#'Externaltypereference'{type=Name}}},
-		 [{{_,#'Externaltypereference'{type=Name}},{valueset,#type{def=NewName}}}|_T]) ->
-    NewName;
-match_parameters({valueset,#type{def=#'Externaltypereference'{type=Name}}},
-		 [{{_,#'Externaltypereference'{type=Name}},NewName}|_T]) ->
-    NewName;
-% match_parameters({valueset,#type{def=#'Externaltypereference'{type=Name}}},
-% 		 [{{_,#typereference{val=Name}},{valueset,#type{def=NewName}}}|T]) ->
-%     NewName;
-% match_parameters({valueset,#type{def=#'Externaltypereference'{type=Name}}},
-% 		 [{{_,#typereference{val=Name}},NewName}|T]) ->
-%     NewName;
-
-match_parameters(Name, [_H|T]) ->
-    %%io:format("match_parameters(~p,~p)~n",[Name,[H|T]]),
-    match_parameters(Name,T).
-
-imported(S,Name) ->
-    {imports,Ilist} = (S#state.module)#module.imports,
-    imported1(Name,Ilist).
-
-imported1(Name,
-	  [#'SymbolsFromModule'{symbols=Symlist,
-				module=#'Externaltypereference'{type=ModuleName}}|T]) ->
-    case lists:keysearch(Name,#'Externaltypereference'.type,Symlist) of
-	{value,_V} ->
-	    {ok,ModuleName};
-	_ ->
-	    imported1(Name,T)
-    end;
-imported1(_Name,[]) ->
-    false.
-	
-
-check_integer(_S,[],_C) ->
-    ok;
-check_integer(S,NamedNumberList,_C) ->
-    case check_unique(NamedNumberList,2) of
-	[] -> 
-	    check_int(S,NamedNumberList,[]);
-	L when list(L) ->
-	    error({type,{duplicates,L},S}),
-	    unchanged
-		   
-    end.
-
-check_int(S,[{'NamedNumber',Id,Num}|T],Acc) when integer(Num) ->
-    check_int(S,T,[{Id,Num}|Acc]);
-check_int(S,[{'NamedNumber',Id,{identifier,_,Name}}|T],Acc) ->
-    Val = dbget_ex(S,S#state.mname,Name),
-    check_int(S,[{'NamedNumber',Id,Val#valuedef.value}|T],Acc);
-check_int(_S,[],Acc) ->
-    lists:keysort(2,Acc).
-
-
-
-check_bitstring(_S,[],_Constr) ->
-    [];
-check_bitstring(S,NamedNumberList,_Constr) ->
-    case check_unique(NamedNumberList,2) of
-	[] ->
-	    check_bitstr(S,NamedNumberList,[]);
-	L when list(L) ->
-	    error({type,{duplicates,L},S}),
-	    unchanged
-    end.
-
-check_bitstr(S,[{'NamedNumber',Id,Num}|T],Acc)when integer(Num) ->
-    check_bitstr(S,T,[{Id,Num}|Acc]);
-check_bitstr(S,[{'NamedNumber',Id,Name}|T],Acc) when atom(Name) ->
-%%check_bitstr(S,[{'NamedNumber',Id,{identifier,_,Name}}|T],Acc) -> 
-%%    io:format("asn1ct_check:check_bitstr/3 hej hop ~w~n",[Name]),
-    Val = dbget_ex(S,S#state.mname,Name),
-%%    io:format("asn1ct_check:check_bitstr/3: ~w~n",[Val]),
-    check_bitstr(S,[{'NamedNumber',Id,Val#valuedef.value}|T],Acc);
-check_bitstr(S,[],Acc) ->
-    case check_unique(Acc,2) of
-	[] ->
-	    lists:keysort(2,Acc);
-	L when list(L) ->
-	    error({type,{duplicate_values,L},S}),
-	    unchanged
-    end.
-    
-%%check_bitstring(S,NamedNumberList,Constr) ->
-%%    NamedNumberList.
-    
-%% Check INSTANCE OF
-%% check that DefinedObjectClass is of TYPE-IDENTIFIER class
-%% If Constraint is empty make it the general INSTANCE OF type
-%% If Constraint is not empty make an inlined type
-%% convert INSTANCE OF to the associated type
-check_instance_of(S,DefinedObjectClass,Constraint) ->
-    check_type_identifier(S,DefinedObjectClass),
-    iof_associated_type(S,Constraint).
-    
-
-check_type_identifier(_S,'TYPE-IDENTIFIER') ->
-    ok;
-check_type_identifier(S,Eref=#'Externaltypereference'{}) ->
-    case get_referenced_type(S,Eref) of
-	{_,#classdef{name='TYPE-IDENTIFIER'}} -> ok;
-	{_,TD=#typedef{typespec=#type{def=#'Externaltypereference'{}}}} ->
-	    check_type_identifier(S,(TD#typedef.typespec)#type.def);
-	_ ->
-	    error({type,{"object set in type INSTANCE OF "
-			 "not of class TYPE-IDENTIFIER",Eref},S})
-    end.
-
-iof_associated_type(S,[]) ->
-    %% in this case encode/decode functions for INSTANCE OF must be
-    %% generated
-    case get(instance_of) of
-	undefined ->
-	    AssociateSeq = iof_associated_type1(S,[]),
-	    Tag =
-		case S#state.erule of
-		    ber_bin_v2 ->
-			[?TAG_CONSTRUCTED(?N_INSTANCE_OF)];
-		    _ -> []
-		end,
-	    TypeDef=#typedef{checked=true,
-			     name='INSTANCE OF',
-			     typespec=#type{tag=Tag,
-					    def=AssociateSeq}},
-	    asn1_db:dbput(S#state.mname,'INSTANCE OF',TypeDef),
-	    put(instance_of,generate);
-	_ ->
-	    ok
-    end,
-    #'Externaltypereference'{module=S#state.mname,type='INSTANCE OF'};
-iof_associated_type(S,C) ->
-    iof_associated_type1(S,C).
-
-iof_associated_type1(S,C) ->
-    {TableCInf,Comp1Cnstr,Comp2Cnstr,Comp2tablecinf}=
-	instance_of_constraints(S,C),
-
-    ModuleName = S#state.mname,
-    Typefield_type=
-	case C of
-	    [] -> 'ASN1_OPEN_TYPE';
-	    _ -> {typefield,'Type'}
-	end,
-    {ObjIdTag,C1TypeTag}=
-	case S#state.erule of
-	    ber_bin_v2 -> 
-		{[{'UNIVERSAL',8}],
-		 [#tag{class='UNIVERSAL',
-		       number=6,
-		       type='IMPLICIT',
-		       form=0}]};
-	    _ -> {[{'UNIVERSAL','INTEGER'}],[]}
-	end,
-    TypeIdentifierRef=#'Externaltypereference'{module=ModuleName,
-					       type='TYPE-IDENTIFIER'},
-    ObjectIdentifier =
-	#'ObjectClassFieldType'{classname=TypeIdentifierRef,
-				class=[],
-				fieldname={id,[]},
-				type={fixedtypevaluefield,id,
-				      #type{def='OBJECT IDENTIFIER'}}},
-    Typefield =
-	#'ObjectClassFieldType'{classname=TypeIdentifierRef,
-				class=[],
-				fieldname={'Type',[]},
-				type=Typefield_type},
-    IOFComponents =
-	[#'ComponentType'{name='type-id',
-			  typespec=#type{tag=C1TypeTag,
-					 def=ObjectIdentifier,
-					 constraint=Comp1Cnstr},
-			  prop=mandatory,
-			  tags=ObjIdTag},
-	 #'ComponentType'{name=value,
-			  typespec=#type{tag=[#tag{class='CONTEXT',
-						   number=0,
-						   type='EXPLICIT',
-						   form=32}],
-					 def=Typefield,
-					 constraint=Comp2Cnstr,
-					 tablecinf=Comp2tablecinf},
-			  prop=mandatory,
-			  tags=[{'CONTEXT',0}]}],
-    #'SEQUENCE'{tablecinf=TableCInf,
-		components=IOFComponents}.
-	   
-
-%% returns the leading attribute, the constraint of the components and
-%% the tablecinf value for the second component.
-instance_of_constraints(_,[]) ->
-    {false,[],[],[]};
-instance_of_constraints(S,#constraint{c={simpletable,Type}}) ->
-    #type{def=#'Externaltypereference'{type=Name}} = Type,
-    ModuleName = S#state.mname,
-    ObjectSetRef=#'Externaltypereference'{module=ModuleName,
-					  type=Name},
-    CRel=[{componentrelation,{objectset,
-			      undefined, %% pos
-			      ObjectSetRef},
-			      [{innermost,
-				[#'Externalvaluereference'{module=ModuleName,
-							   value=type}]}]}],
-    TableCInf=#simpletableattributes{objectsetname=Name,
-				     c_name='type-id',
-				     c_index=1,
-				     usedclassfield=id,
-				     uniqueclassfield=id,
-				     valueindex=[]},
-    {TableCInf,[{simpletable,Name}],CRel,[{objfun,ObjectSetRef}]}.
-
-%% Check ENUMERATED
-%% ****************************************
-%% Check that all values are unique
-%% assign values to un-numbered identifiers
-%% check that the constraints are allowed and correct
-%% put the updated info back into database
-check_enumerated(_S,[{Name,Number}|Rest],_Constr) when atom(Name), integer(Number)->
-    %% already checked , just return the same list
-    [{Name,Number}|Rest]; 
-check_enumerated(S,NamedNumberList,_Constr) ->
-    check_enum(S,NamedNumberList,[],[]).
-
-%% identifiers are put in Acc2
-%% returns either [{Name,Number}] or {[{Name,Number}],[{ExtName,ExtNumber}]}
-%% the latter is returned if the ENUMERATION contains EXTENSIONMARK
-check_enum(S,[{'NamedNumber',Id,Num}|T],Acc1,Acc2) when integer(Num) ->
-    check_enum(S,T,[{Id,Num}|Acc1],Acc2);
-check_enum(S,[{'NamedNumber',Id,{identifier,_,Name}}|T],Acc1,Acc2) ->
-    Val = dbget_ex(S,S#state.mname,Name),
-    check_enum(S,[{'NamedNumber',Id,Val#valuedef.value}|T],Acc1,Acc2);
-check_enum(S,['EXTENSIONMARK'|T],Acc1,Acc2) ->
-    NewAcc2 = lists:keysort(2,Acc1),
-    NewList = enum_number(lists:reverse(Acc2),NewAcc2,0,[]),
-    { NewList, check_enum(S,T,[],[])};
-check_enum(S,[Id|T],Acc1,Acc2) when atom(Id) ->
-    check_enum(S,T,Acc1,[Id|Acc2]);
-check_enum(_S,[],Acc1,Acc2) ->
-    NewAcc2 = lists:keysort(2,Acc1),
-    enum_number(lists:reverse(Acc2),NewAcc2,0,[]).
-
-
-% assign numbers to identifiers , numbers from 0 ... but must not
-% be the same as already assigned to NamedNumbers
-enum_number([H|T],[{Id,Num}|T2],Cnt,Acc) when Num > Cnt ->
-    enum_number(T,[{Id,Num}|T2],Cnt+1,[{H,Cnt}|Acc]);
-enum_number([H|T],[{Id,Num}|T2],Cnt,Acc) when Num < Cnt -> % negative Num
-    enum_number(T,T2,Cnt+1,[{H,Cnt},{Id,Num}|Acc]);
-enum_number([],L2,_Cnt,Acc) ->
-    lists:concat([lists:reverse(Acc),L2]);
-enum_number(L,[{Id,Num}|T2],Cnt,Acc) -> % Num == Cnt
-    enum_number(L,T2,Cnt+1,[{Id,Num}|Acc]);
-enum_number([H|T],[],Cnt,Acc) ->
-    enum_number(T,[],Cnt+1,[{H,Cnt}|Acc]).
-    
-
-check_boolean(_S,_Constr) ->
-    ok.
-
-check_octetstring(_S,_Constr) ->
-    ok.
-
-% check all aspects of a SEQUENCE
-% - that all component names are unique
-% - that all TAGS are ok (when TAG default is applied)
-% - that each component is of a valid type
-% - that the extension marks are valid
-
-check_sequence(S,Type,Comps)  ->
-    Components = expand_components(S,Comps),    
-    case check_unique([C||C <- Components ,record(C,'ComponentType')]
-		      ,#'ComponentType'.name) of
-	[] ->
-	    %% sort_canonical(Components),
-	    Components2 = maybe_automatic_tags(S,Components),
-	    %% check the table constraints from here. The outermost type
-	    %% is Type, the innermost is Comps (the list of components)
-	    NewComps = 
-		case check_each_component(S,Type,Components2) of
-		    NewComponents when list(NewComponents) ->
-			check_unique_sequence_tags(S,NewComponents),
-			NewComponents;
-		    Ret = {NewComponents,NewEcomps} ->
-			TagComps = NewComponents ++ 
-			    [Comp#'ComponentType'{prop='OPTIONAL'}|| Comp <- NewEcomps], 
-			%% extension components are like optionals when it comes to tagging
-			check_unique_sequence_tags(S,TagComps),
-			Ret
-		end,
-	    %% CRelInf is the "leading attribute" information
-	    %% necessary for code generating of the look up in the
-	    %% object set table,
-	    %% i.e. getenc_ObjectSet/getdec_ObjectSet.
-	    %% {objfun,ERef} tuple added in NewComps2 in tablecinf
-	    %% field in type record of component relation constrained
-	    %% type
-%	    io:format("NewComps: ~p~n",[NewComps]),
-	    {CRelInf,NewComps2} = componentrelation_leadingattr(S,NewComps),
-%	    io:format("CRelInf: ~p~n",[CRelInf]),
-%	    io:format("NewComps2: ~p~n",[NewComps2]),
-	    %% CompListWithTblInf has got a lot unecessary info about
-	    %% the involved class removed, as the class of the object
-	    %% set.
-	    CompListWithTblInf = get_tableconstraint_info(S,Type,NewComps2),
-%	    io:format("CompListWithTblInf: ~p~n",[CompListWithTblInf]),
-	    {CRelInf,CompListWithTblInf};
-	Dupl ->
-		throw({error,{asn1,{duplicate_components,Dupl}}})
-    end.
-
-expand_components(S, [{'COMPONENTS OF',Type}|T]) ->
-    CompList = 
-	case get_referenced_type(S,Type#type.def) of
-	    {_,#typedef{typespec=#type{def=Seq}}} when record(Seq,'SEQUENCE') -> 
-		case Seq#'SEQUENCE'.components of
-		    {Root,_Ext} -> Root;
-		    Root -> Root
-		end;
-	    Err -> throw({error,{asn1,{illegal_COMPONENTS_OF,Err}}})
-	end,
-    expand_components(S,CompList) ++ expand_components(S,T);
-expand_components(S,[H|T]) ->
-    [H|expand_components(S,T)];
-expand_components(_,[]) ->
-    [].
-    
-check_unique_sequence_tags(S,[#'ComponentType'{prop=mandatory}|Rest]) ->
-    check_unique_sequence_tags(S,Rest);
-check_unique_sequence_tags(S,[C|Rest]) when record(C,'ComponentType') ->
-    check_unique_sequence_tags1(S,Rest,[C]);% optional or default
-check_unique_sequence_tags(S,[_ExtensionMarker|Rest]) ->
-    check_unique_sequence_tags(S,Rest);
-check_unique_sequence_tags(_S,[]) ->
-    true.
-
-check_unique_sequence_tags1(S,[C|Rest],Acc) when record(C,'ComponentType') ->
-    case C#'ComponentType'.prop of
-	mandatory ->
-	    check_unique_tags(S,lists:reverse([C|Acc])),
-	    check_unique_sequence_tags(S,Rest);
-	_  ->
-	    check_unique_sequence_tags1(S,Rest,[C|Acc]) % default or optional
-    end;
-check_unique_sequence_tags1(S,[H|Rest],Acc) ->
-    check_unique_sequence_tags1(S,Rest,[H|Acc]);
-check_unique_sequence_tags1(S,[],Acc) ->
-    check_unique_tags(S,lists:reverse(Acc)).
-
-check_sequenceof(S,Type,Component) when record(Component,type) ->
-    check_type(S,Type,Component).
-
-check_set(S,Type,Components) ->
-    {TableCInf,NewComponents} = check_sequence(S,Type,Components),
-    case lists:member(der,S#state.options) of
-	true when S#state.erule == ber;
-		  S#state.erule == ber_bin ->
-	    {Sorted,SortedComponents} = 
-		sort_components(S#state.tname,
-				(S#state.module)#module.tagdefault,
-				NewComponents),
-	    {Sorted,TableCInf,SortedComponents};
-	_ ->
-	    {false,TableCInf,NewComponents}
-    end.
-
-sort_components(_TypeName,'AUTOMATIC',Components) ->
-    {true,Components};
-sort_components(TypeName,_TagDefault,Components) ->
-    case untagged_choice(Components) of
-	false ->
-	    {true,sort_components1(TypeName,Components,[],[],[],[])};
-	true ->
-	    {dynamic,Components} % sort in run-time
-    end.
-
-sort_components1(TypeName,[C=#'ComponentType'{tags=[{'UNIVERSAL',_}|_R]}|Cs],
-		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
-    sort_components1(TypeName,Cs,[C|UnivAcc],ApplAcc,ContAcc,PrivAcc);
-sort_components1(TypeName,[C=#'ComponentType'{tags=[{'APPLICATION',_}|_R]}|Cs],
-		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
-    sort_components1(TypeName,Cs,UnivAcc,[C|ApplAcc],ContAcc,PrivAcc);
-sort_components1(TypeName,[C=#'ComponentType'{tags=[{'CONTEXT',_}|_R]}|Cs],
-		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
-    sort_components1(TypeName,Cs,UnivAcc,ApplAcc,[C|ContAcc],PrivAcc);
-sort_components1(TypeName,[C=#'ComponentType'{tags=[{'PRIVATE',_}|_R]}|Cs],
-		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
-    sort_components1(TypeName,Cs,UnivAcc,ApplAcc,ContAcc,[C|PrivAcc]);
-sort_components1(TypeName,[],UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
-    I = #'ComponentType'.tags,
-    ascending_order_check(TypeName,sort_universal_type(UnivAcc)) ++ 
-	ascending_order_check(TypeName,lists:keysort(I,ApplAcc)) ++
-	ascending_order_check(TypeName,lists:keysort(I,ContAcc)) ++ 
-	ascending_order_check(TypeName,lists:keysort(I,PrivAcc)).
-
-ascending_order_check(TypeName,Components) ->
-    ascending_order_check1(TypeName,Components),
-    Components.
-
-ascending_order_check1(TypeName,
-		       [C1 = #'ComponentType'{tags=[{_,T}|_]},
-			C2 = #'ComponentType'{tags=[{_,T}|_]}|Rest]) ->
-    io:format("WARNING: Indistinct tag ~p in SET ~p, components ~p and ~p~n",
-	      [T,TypeName,C1#'ComponentType'.name,C2#'ComponentType'.name]),
-    ascending_order_check1(TypeName,[C2|Rest]);
-ascending_order_check1(TypeName,
-		       [C1 = #'ComponentType'{tags=[{'UNIVERSAL',T1}|_]},
-			C2 = #'ComponentType'{tags=[{'UNIVERSAL',T2}|_]}|Rest]) ->
-    case (asn1ct_gen_ber:decode_type(T1) == asn1ct_gen_ber:decode_type(T2)) of
-	true ->
-	    io:format("WARNING: Indistinct tags ~p and ~p in"
-		      " SET ~p, components ~p and ~p~n",
-		      [T1,T2,TypeName,C1#'ComponentType'.name,
-		       C2#'ComponentType'.name]),
-	    ascending_order_check1(TypeName,[C2|Rest]);
-	_ ->
-	    ascending_order_check1(TypeName,[C2|Rest])
-    end;
-ascending_order_check1(N,[_|Rest]) ->
-    ascending_order_check1(N,Rest);
-ascending_order_check1(_,[_]) ->
-    ok;
-ascending_order_check1(_,[]) ->
-    ok.
-    
-sort_universal_type(Components) ->
-    List = lists:map(fun(C) ->
-			     #'ComponentType'{tags=[{_,T}|_]} = C,
-			     {asn1ct_gen_ber:decode_type(T),C}
-		     end,
-		     Components),
-    SortedList = lists:keysort(1,List),
-    lists:map(fun(X)->element(2,X) end,SortedList).
-
-untagged_choice([#'ComponentType'{typespec=#type{tag=[],def={'CHOICE',_}}}|_Rest]) ->
-    true;
-untagged_choice([_|Rest]) ->
-    untagged_choice(Rest);
-untagged_choice([]) ->
-    false.
-    
-check_setof(S,Type,Component) when record(Component,type) ->
-    check_type(S,Type,Component).
-
-check_restrictedstring(_S,_Def,_Constr) ->
-    ok.
-
-check_objectidentifier(_S,_Constr) ->
-    ok.
-
-% check all aspects of a CHOICE
-% - that all alternative names are unique
-% - that all TAGS are ok (when TAG default is applied)
-% - that each alternative is of a valid type
-% - that the extension marks are valid
-check_choice(S,Type,Components) when list(Components) ->
-    case check_unique([C||C <- Components,
-			  record(C,'ComponentType')],#'ComponentType'.name) of
-	[] -> 
-    %%    sort_canonical(Components),
-	    Components2 = maybe_automatic_tags(S,Components),
-	    %NewComps =
-	    case check_each_alternative(S,Type,Components2) of
-		{NewComponents,NewEcomps} ->		    
-		    check_unique_tags(S,NewComponents ++ NewEcomps),
-		    {NewComponents,NewEcomps};
-		NewComponents ->
-		    check_unique_tags(S,NewComponents),
-		    NewComponents
-	    end;
-%%	    CompListWithTblInf = get_tableconstraint_info(S,Type,NewComps);
-	Dupl ->
-	    throw({error,{asn1,{duplicate_choice_alternatives,Dupl}}})
-    end;
-check_choice(_S,_,[]) -> 
-    [].
-
-%% probably dead code that should be removed
-%%maybe_automatic_tags(S,{Rc,Ec}) ->
-%%    {maybe_automatic_tags1(S,Rc,0),maybe_automatic_tags1(S,Ec,length(Rc))};
-maybe_automatic_tags(#state{erule=per},C) ->
-    C;
-maybe_automatic_tags(#state{erule=per_bin},C) ->
-    C;
-maybe_automatic_tags(S,C) ->
-    maybe_automatic_tags1(S,C,0).
-
-maybe_automatic_tags1(S,C,TagNo) ->
-    case (S#state.module)#module.tagdefault of
-	'AUTOMATIC' ->
-	    generate_automatic_tags(S,C,TagNo);
-	_ ->
-	    %% maybe is the module a multi file module were only some of
-	    %% the modules have defaulttag AUTOMATIC TAGS then the names
-	    %% of those types are saved in the table automatic_tags
-	    Name= S#state.tname,
-	    case is_automatic_tagged_in_multi_file(Name) of
-		true ->
-		    generate_automatic_tags(S,C,TagNo);
-		false ->
-		    C
-	    end
-    end.
-
-is_automatic_tagged_in_multi_file(Name) ->
-    case ets:info(automatic_tags) of
-	undefined ->
-	    %% this case when not multifile compilation
-	    false;
-	_ ->
-	    case ets:member(automatic_tags,Name) of
-		true ->
-		     true;
-		_ ->
-		    false
-	    end
-    end.
-
-generate_automatic_tags(_S,C,TagNo) ->
-    case any_manual_tag(C) of
-	true ->
-	    C;
-	false ->
-	    generate_automatic_tags1(C,TagNo)
-    end.
-
-generate_automatic_tags1([H|T],TagNo) when record(H,'ComponentType') ->
-    #'ComponentType'{typespec=Ts} = H,
-    NewTs = Ts#type{tag=[#tag{class='CONTEXT',
-			     number=TagNo,
-			     type={default,'IMPLICIT'},
-			     form= 0 }]}, % PRIMITIVE
-    [H#'ComponentType'{typespec=NewTs}|generate_automatic_tags1(T,TagNo+1)];
-generate_automatic_tags1([ExtMark|T],TagNo) -> % EXTENSIONMARK
-    [ExtMark | generate_automatic_tags1(T,TagNo)];
-generate_automatic_tags1([],_) ->
-    [].
-
-any_manual_tag([#'ComponentType'{typespec=#type{tag=[]}}|Rest]) ->
-    any_manual_tag(Rest);
-any_manual_tag([{'EXTENSIONMARK',_,_}|Rest]) ->
-    any_manual_tag(Rest);
-any_manual_tag([_|_Rest]) ->
-    true;
-any_manual_tag([]) ->
-    false.
-
-
-check_unique_tags(S,C) ->
-    case (S#state.module)#module.tagdefault of
-	'AUTOMATIC' ->
-	    case any_manual_tag(C) of
-		false -> true;
-		_ -> collect_and_sort_tags(C,[])
-	    end;
-	_ ->
-    	    collect_and_sort_tags(C,[])
-    end.
-
-collect_and_sort_tags([C|Rest],Acc) when record(C,'ComponentType') ->
-    collect_and_sort_tags(Rest,C#'ComponentType'.tags ++ Acc);
-collect_and_sort_tags([_|Rest],Acc) ->
-    collect_and_sort_tags(Rest,Acc);
-collect_and_sort_tags([],Acc) ->
-    {Dupl,_}= lists:mapfoldl(fun(El,El)->{{dup,El},El};(El,_Prev)-> {El,El} end,notag,lists:sort(Acc)),
-    Dupl2 = [Dup|| {dup,Dup} <- Dupl],
-    if 
-	length(Dupl2) > 0 ->
-	    throw({error,{asn1,{duplicates_of_the_tags,Dupl2}}});
-	true ->
-	    true
-    end.
-
-check_unique(L,Pos) ->
-    Slist = lists:keysort(Pos,L),
-    check_unique2(Slist,Pos,[]).
-
-check_unique2([A,B|T],Pos,Acc) when element(Pos,A) == element(Pos,B) ->
-    check_unique2([B|T],Pos,[element(Pos,B)|Acc]);
-check_unique2([_|T],Pos,Acc) ->
-    check_unique2(T,Pos,Acc);
-check_unique2([],_,Acc) ->
-    lists:reverse(Acc).
-
-check_each_component(S,Type,{Rlist,ExtList}) ->
-    {check_each_component(S,Type,Rlist),
-     check_each_component(S,Type,ExtList)};
-check_each_component(S,Type,Components) ->
-    check_each_component(S,Type,Components,[],[],noext).
-
-check_each_component(S = #state{abscomppath=Path,recordtopname=TopName},Type,
-		     [C|Ct],Acc,Extacc,Ext) when record(C,'ComponentType') ->
-    #'ComponentType'{name=Cname,typespec=Ts,prop=Prop} = C,
-    NewAbsCPath = 
-	case Ts#type.def of
-	    #'Externaltypereference'{} -> [];
-	    _ -> [Cname|Path]
-	end,
-    CheckedTs = check_type(S#state{abscomppath=NewAbsCPath,
-				   recordtopname=[Cname|TopName]},Type,Ts),
-    NewTags = get_taglist(S,CheckedTs),
-
-    NewProp =
-%	case lists:member(der,S#state.options) of
-%	    true ->
-%	    True -> 
-	case normalize_value(S,CheckedTs,Prop,[Cname|TopName]) of
-	    mandatory -> mandatory;
-	    'OPTIONAL' -> 'OPTIONAL';
-	    DefaultValue -> {'DEFAULT',DefaultValue}
-	end,
-%	    _ ->
-%		Prop
-%	end,
-    NewC = C#'ComponentType'{typespec=CheckedTs,prop=NewProp,tags=NewTags},
-    case Ext of
-	noext ->
-	    check_each_component(S,Type,Ct,[NewC|Acc],Extacc,Ext);
-	ext ->
-	    check_each_component(S,Type,Ct,Acc,[NewC|Extacc],Ext)
-    end;
-check_each_component(S,Type,[_|Ct],Acc,Extacc,noext) -> % skip 'EXTENSIONMARK'
-    check_each_component(S,Type,Ct,Acc,Extacc,ext);
-check_each_component(_S,_,[_C|_Ct],_,_,ext) -> % skip 'EXTENSIONMARK'
-    throw({error,{asn1,{too_many_extension_marks}}});
-check_each_component(_S,_,[],Acc,Extacc,ext) ->
-    {lists:reverse(Acc),lists:reverse(Extacc)};
-check_each_component(_S,_,[],Acc,_,noext) ->
-    lists:reverse(Acc).
-
-check_each_alternative(S,Type,{Rlist,ExtList}) ->
-    {check_each_alternative(S,Type,Rlist),
-     check_each_alternative(S,Type,ExtList)};
-check_each_alternative(S,Type,[C|Ct]) ->
-    check_each_alternative(S,Type,[C|Ct],[],[],noext).
-
-check_each_alternative(S=#state{abscomppath=Path,recordtopname=TopName},Type,[C|Ct],
-		       Acc,Extacc,Ext) when record(C,'ComponentType') ->
-    #'ComponentType'{name=Cname,typespec=Ts,prop=_Prop} = C,
-    NewAbsCPath = 
-	case Ts#type.def of
-	    #'Externaltypereference'{} -> [];
-	    _ -> [Cname|Path]
-	end,
-    NewState =
-	S#state{abscomppath=NewAbsCPath,recordtopname=[Cname|TopName]},
-    CheckedTs = check_type(NewState,Type,Ts),
-    NewTags = get_taglist(S,CheckedTs),
-    NewC = C#'ComponentType'{typespec=CheckedTs,tags=NewTags},
-    case Ext of
-	noext ->
-	    check_each_alternative(S,Type,Ct,[NewC|Acc],Extacc,Ext);
-	ext ->
-	    check_each_alternative(S,Type,Ct,Acc,[NewC|Extacc],Ext)
-    end;
-	    
-check_each_alternative(S,Type,[_|Ct],Acc,Extacc,noext) -> % skip 'EXTENSIONMARK'
-    check_each_alternative(S,Type,Ct,Acc,Extacc,ext);
-check_each_alternative(_S,_,[_C|_Ct],_,_,ext) -> % skip 'EXTENSIONMARK'
-    throw({error,{asn1,{too_many_extension_marks}}});
-check_each_alternative(_S,_,[],Acc,Extacc,ext) ->
-    {lists:reverse(Acc),lists:reverse(Extacc)};
-check_each_alternative(_S,_,[],Acc,_,noext) ->
-    lists:reverse(Acc).
-
-%% componentrelation_leadingattr/2 searches the structure for table
-%% constraints, if any is found componentrelation_leadingattr/5 is
-%% called.
-componentrelation_leadingattr(S,CompList) ->
-%    {Cs1,Cs2} =
-    Cs =
-	case CompList of
-	    {Components,EComponents} when list(Components) ->
-%		{Components,Components};
-		Components ++ EComponents;
-	    CompList when list(CompList) ->
-%		{CompList,CompList}
-		CompList
-	end,
-%    case any_simple_table(S,Cs1,[]) of
-
-    %% get_simple_table_if_used/2 should find out whether there are any
-    %% component relation constraints in the entire tree of Cs1 that
-    %% relates to this level. It returns information about the simple
-    %% table constraint necessary for the the call to
-    %% componentrelation_leadingattr/6. The step when the leading
-    %% attribute and the syntax tree is modified to support the code
-    %% generating.
-    case get_simple_table_if_used(S,Cs) of
-	[] -> {false,CompList};
-	STList ->
-%	    componentrelation_leadingattr(S,Cs1,Cs2,STList,[],[])
-	    componentrelation_leadingattr(S,Cs,Cs,STList,[],[])
-    end.
-
-%% componentrelation_leadingattr/6 when all components are searched
-%% the new modified components are returned together with the "leading
-%% attribute" information, which later is stored in the tablecinf
-%% field in the SEQUENCE/SET record. The "leading attribute"
-%% information is used to generate the lookup in the object set
-%% table. The other information gathered in the #type.tablecinf field
-%% is used in code generating phase too, to recognice the proper
-%% components for "open type" encoding and to propagate the result of
-%% the object set lookup when needed.
-componentrelation_leadingattr(_,[],_CompList,_,[],NewCompList) ->
-    {false,lists:reverse(NewCompList)};
-componentrelation_leadingattr(_,[],_CompList,_,LeadingAttr,NewCompList) ->
-    {lists:last(LeadingAttr),lists:reverse(NewCompList)}; %send all info in Ts later
-componentrelation_leadingattr(S,[C|Cs],CompList,STList,Acc,CompAcc) ->
-    {LAAcc,NewC} =
-	case catch componentrelation1(S,C#'ComponentType'.typespec,
-				      [C#'ComponentType'.name]) of
-	    {'EXIT',_} ->
-		{[],C};
-	    {CRI=[{_A1,_B1,_C1,_D1}|_Rest],NewTSpec} ->
-		%% {ObjectSet,AtPath,ClassDef,Path}
-		%% _A1 is a reference to the object set of the
-		%% component relation constraint.
-		%% _B1 is the path of names in the at-list of the
-		%% component relation constraint.
-		%% _C1 is the class definition of the
-		%% ObjectClassFieldType.
-		%% _D1 is the path of components that was traversed to
-		%% find this constraint.
-		case leading_attr_index(S,CompList,CRI,
-					lists:reverse(S#state.abscomppath),[]) of
-		    [] ->
-			{[],C};
-		    [{ObjSet,Attr,N,ClassDef,_Path,ValueIndex}|_NewRest] ->
-			OS = object_set_mod_name(S,ObjSet),
-			UniqueFieldName = 
-			    case (catch get_unique_fieldname(#classdef{typespec=ClassDef})) of
-				{error,'__undefined_'} ->
-				    no_unique;
-				{asn1,Msg,_} ->
-				    error({type,Msg,S});
-				Other -> Other
-			    end,
-%			UsedFieldName = get_used_fieldname(S,Attr,STList),
-			%% Res should be done differently: even though
-			%% a unique field name exists it is not
-			%% certain that the ObjectClassFieldType of
-			%% the simple table constraint picks that
-			%% class field.
-			Res = #simpletableattributes{objectsetname=OS,
-%%						     c_name=asn1ct_gen:un_hyphen_var(Attr),
-						     c_name=Attr,
-						     c_index=N,
-						     usedclassfield=UniqueFieldName,
-						     uniqueclassfield=UniqueFieldName,
-						     valueindex=ValueIndex},
-			{[Res],C#'ComponentType'{typespec=NewTSpec}}
-		end;
-	    _ ->
-		%% no constraint was found
-		{[],C}
-	end,
-    componentrelation_leadingattr(S,Cs,CompList,STList,LAAcc++Acc,
-				  [NewC|CompAcc]).
-
-object_set_mod_name(_S,ObjSet) when atom(ObjSet) ->
-    ObjSet;
-object_set_mod_name(#state{mname=M},
-		    #'Externaltypereference'{module=M,type=T}) ->
-    T;
-object_set_mod_name(S,#'Externaltypereference'{module=M,type=T}) ->
-    case lists:member(M,S#state.inputmodules) of
-	true -> 
-	    T;
-	false ->
-	    {M,T}
-    end.
-
-%% get_used_fieldname gets the used field of the class referenced by
-%% the ObjectClassFieldType construct in the simple table constraint
-%% corresponding to the component relation constraint that depends on
-%% it.
-% get_used_fieldname(_S,CName,[{[CName|_Rest],_,ClFieldName}|_RestSimpleT]) ->
-%     ClFieldName;
-% get_used_fieldname(S,CName,[_SimpleTC|Rest]) ->
-%     get_used_fieldname(S,CName,Rest);
-% get_used_fieldname(S,_,[]) ->
-%     error({type,"Error in Simple table constraint",S}).
-    
-%% any_simple_table/3 checks if any of the components on this level is
-%% constrained by a simple table constraint. It returns a list of
-%% tuples with three elements. It is a name path to the place in the
-%% type structure where the constraint is, and the name of the object
-%% set and the referenced field in the class.
-% any_simple_table(S = #state{mname=M,abscomppath=Path},
-% 		 [#'ComponentType'{name=Name,typespec=Type}|Cs],Acc) ->
-%     Constraint = Type#type.constraint,
-%     case lists:keysearch(simpletable,1,Constraint) of
-% 	{value,{_,#type{def=Ref}}} ->
-% 	    %% This ObjectClassFieldType, which has a simple table
-% 	    %% constraint, must pick a fixed type value, mustn't it ?
-% 	    {ClassDef,[{_,ClassFieldName}]} = Type#type.def,
-% 	    ST = 
-% 		case Ref of
-% 		    #'Externaltypereference'{module=M,type=ObjSetName} ->
-% 			{[Name|Path],ObjSetName,ClassFieldName};
-% 		    _ ->
-% 			{[Name|Path],Ref,ClassFieldName}
-% 		end,
-% 	    any_simple_table(S,Cs,[ST|Acc]);
-% 	false ->
-% 	    any_simple_table(S,Cs,Acc)
-%     end;
-% any_simple_table(_,[],Acc) ->
-%     lists:reverse(Acc);
-% any_simple_table(S,[_|Cs],Acc) ->
-%     any_simple_table(S,Cs,Acc).
-
-%% get_simple_table_if_used/2 searches the structure of Cs for any
-%% component relation constraints due to the present level of the
-%% structure. If there are any, the necessary information for code
-%% generation of the look up functionality in the object set table are
-%% returned.
-get_simple_table_if_used(S,Cs) ->
-    CNames = lists:map(fun(#'ComponentType'{name=Name}) -> Name;
-			  (_) -> [] %% in case of extension marks
-		       end,
-		       Cs),
-    RefedSimpleTable=any_component_relation(S,Cs,CNames,[],[]),
-    get_simple_table_info(S,Cs,remove_doubles(RefedSimpleTable)).
-
-remove_doubles(L) ->
-    remove_doubles(L,[]).
-remove_doubles([H|T],Acc) ->
-    NewT = remove_doubles1(H,T),
-    remove_doubles(NewT,[H|Acc]);
-remove_doubles([],Acc) ->
-    Acc.
-
-remove_doubles1(El,L) ->
-    case lists:delete(El,L) of
-	L -> L;
-	NewL -> remove_doubles1(El,NewL)
-    end.
-
-%% get_simple_table_info searches the commponents Cs by the path from
-%% an at-list (third argument), and follows into a component of it if
-%% necessary, to get information needed for code generating.
-%%
-%% Returns a list of tuples with three elements. It holds a list of
-%% atoms that is the path, the name of the field of the class that are
-%% referred to in the ObjectClassFieldType, and the name of the unique
-%% field of the class of the ObjectClassFieldType. 
-%%
-% %% The level information outermost/innermost must be kept. There are
-% %% at least two possibilities to cover here for an outermost case: 1)
-% %% Both the simple table and the component relation have a common path
-% %% at least one step below the outermost level, i.e. the leading
-% %% information shall be on a sub level. 2) They don't have any common
-% %% path.
-get_simple_table_info(S,Cs,[AtList|Rest]) ->
-%%    [get_simple_table_info1(S,Cs,AtList,S#state.abscomppath)|get_simple_table_info(S,Cs,Rest)];
-    [get_simple_table_info1(S,Cs,AtList,[])|get_simple_table_info(S,Cs,Rest)];
-get_simple_table_info(_,_,[]) ->
-    [].
-get_simple_table_info1(S,Cs,[Cname|Cnames],Path) when list(Cs) ->
-    case lists:keysearch(Cname,#'ComponentType'.name,Cs) of
-	{value,C} ->
-	    get_simple_table_info1(S,C,Cnames,[Cname|Path]);
-        _ ->
-	    error({type,"Missing expected simple table constraint",S})
-    end;
-get_simple_table_info1(S,#'ComponentType'{typespec=TS},[],Path) ->
-    %% In this component there must be a simple table constraint
-    %% o.w. the asn1 code is wrong.
-    #type{def=OCFT,constraint=Cnstr} = TS,
-    case Cnstr of
-	[{simpletable,_OSRef}]�->
-	    #'ObjectClassFieldType'{classname=ClRef,
-				    class=ObjectClass,
-				    fieldname=FieldName} = OCFT,
-%	    #'ObjectClassFieldType'{ObjectClass,FieldType} = ObjectClassFieldType,
-	    ObjectClassFieldName =
-		case FieldName of
-		    {LastFieldName,[]} -> LastFieldName;
-		    {_FirstFieldName,FieldNames} ->
-			lists:last(FieldNames)
-		end,
-	    %%ObjectClassFieldName is the last element in the dotted
-	    %%list of the ObjectClassFieldType. The last element may
-	    %%be of another class, that is referenced from the class
-	    %%of the ObjectClassFieldType
-	    ClassDef =
-		case ObjectClass of
-		    [] ->
-			{_,CDef}=get_referenced_type(S,ClRef),
-			CDef;
-		    _ -> #classdef{typespec=ObjectClass}
-		end,
-	    UniqueName =
-		case (catch get_unique_fieldname(ClassDef)) of
-		    {error,'__undefined_'} -> no_unique;
-		    {asn1,Msg,_} ->
-			error({type,Msg,S});
-		    Other -> Other
-		end,
-	    {lists:reverse(Path),ObjectClassFieldName,UniqueName};
-	_ ->
-	    error({type,{asn1,"missing expected simple table constraint",
-			 Cnstr},S})
-    end;
-get_simple_table_info1(S,#'ComponentType'{typespec=TS},Cnames,Path) ->
-    Components = get_atlist_components(TS#type.def),
-    get_simple_table_info1(S,Components,Cnames,Path).
-
-%% any_component_relation searches for all component relation
-%% constraints that refers to the actual level and returns a list of
-%% the "name path" in the at-list to the component relation constraint
-%% that must refer to a simple table constraint. The list is empty if
-%% no component relation constraints were found.
-%% 
-%% NamePath has the names of all components that are followed from the
-%% beginning of the search. CNames holds the names of all components
-%% of the start level, this info is used if an outermost at-notation
-%% is found to check the validity of the at-list.
-any_component_relation(S,[C|Cs],CNames,NamePath,Acc) ->
-    CName = C#'ComponentType'.name,
-    Type = C#'ComponentType'.typespec,
-    CRelPath =
-	case Type#type.constraint of
-	    [{componentrelation,_,AtNotation}] ->
-		%% Found component relation constraint, now check
-		%% whether this constraint is relevant for the level
-		%% where the search started
-		AtNot = extract_at_notation(AtNotation),
-		%% evaluate_atpath returns the relative path to the
-		%% simple table constraint from where the component
-		%% relation is found.
-		evaluate_atpath(S#state.abscomppath,NamePath,CNames,AtNot);
-	    _ ->
-		[]
-	end,
-    InnerAcc =
-	case {Type#type.inlined,
-	      asn1ct_gen:type(asn1ct_gen:get_inner(Type#type.def))} of
-	    {no,{constructed,bif}} ->
-		InnerCs = 
-		    case get_components(Type#type.def) of
-			{IC1,_IC2} -> IC1 ++ IC1;
-			IC -> IC
-		    end,
-		%% here we are interested in components of an
-		%% SEQUENCE/SET OF as well as SEQUENCE, SET and CHOICE
-		any_component_relation(S,InnerCs,CNames,[CName|NamePath],[]);
-	    _ ->
-		[]
-	end,
-    any_component_relation(S,Cs,CNames,NamePath,InnerAcc++CRelPath++Acc);
-any_component_relation(_,[],_,_,Acc) ->
-    Acc.
-
-%% evaluate_atpath/4 finds out whether the at notation refers to the
-%% search level. The list of referenced names in the AtNot list shall
-%% begin with a name that exists on the level it refers to. If the
-%% found AtPath is refering to the same sub-branch as the simple table
-%% has, then there shall not be any leading attribute info on this
-%% level.
-evaluate_atpath(_,[],Cnames,{innermost,AtPath=[Ref|_Refs]}) ->
-    %% any innermost constraint found deeper in the structure is
-    %% ignored.
-    case lists:member(Ref,Cnames) of
-	true -> [AtPath];
-	false -> []
-    end;
-%% In this case must check that the AtPath doesn't step any step of
-%% the NamePath, in that case the constraint will be handled in an
-%% inner level.
-evaluate_atpath(TopPath,NamePath,Cnames,{outermost,AtPath=[_Ref|_Refs]}) ->
-    AtPathBelowTop =
-	case TopPath of
-	    [] -> AtPath;
-	    _ ->
-		case lists:prefix(TopPath,AtPath) of
-		    true ->
-			lists:subtract(AtPath,TopPath);
-		    _ -> []
-		end
-	end,
-    case {NamePath,AtPathBelowTop} of
-	{[H|_T1],[H|_T2]} -> []; % this must be handled in lower level
-	{_,[]} -> [];% this must be handled in an above level
-	{_,[H|_T]} ->
-	    case lists:member(H,Cnames) of
-		true -> [AtPathBelowTop];
-		_ -> error({type,{asn1,"failed to analyze at-path",AtPath}})
-	    end
-    end;
-evaluate_atpath(_,_,_,_) ->
-    [].
-    
-%% Type may be any of SEQUENCE, SET, CHOICE, SEQUENCE OF, SET OF but
-%% only the three first have valid components.
-get_atlist_components(Def) ->
-    get_components(atlist,Def).
-
-get_components(Def) ->
-    get_components(any,Def).
-
-get_components(_,#'SEQUENCE'{components=Cs}) ->
-    Cs;
-get_components(_,#'SET'{components=Cs}) ->
-    Cs;
-get_components(_,{'CHOICE',Cs}) ->
-    Cs;
-get_components(any,{'SEQUENCE OF',#type{def=Def}}) ->
-    get_components(any,Def);
-get_components(any,{'SET OF',#type{def=Def}}) ->
-    get_components(any,Def);
-get_components(_,_) ->
-    [].
-
-
-extract_at_notation([{Level,[#'Externalvaluereference'{value=Name}|Rest]}]) ->
-    {Level,[Name|extract_at_notation1(Rest)]};
-extract_at_notation(At) ->
-    exit({error,{asn1,{at_notation,At}}}).
-extract_at_notation1([#'Externalvaluereference'{value=Name}|Rest]) ->
-    [Name|extract_at_notation1(Rest)];
-extract_at_notation1([]) ->
-    [].
-    
-%% componentrelation1/1 identifies all componentrelation constraints
-%% that exist in C or in the substructure of C. Info about the found
-%% constraints are returned in a list. It is ObjectSet, the reference
-%% to the object set, AttrPath, the name atoms extracted from the
-%% at-list in the component relation constraint, ClassDef, the
-%% objectclass record of the class of the ObjectClassFieldType, Path,
-%% that is the component name "path" from the searched level to this
-%% constraint.
-%%
-%% The function is called with one component of the type in turn and
-%% with the component name in Path at the first call. When called from
-%% within, the name of the inner component is added to Path.
-componentrelation1(S,C = #type{def=Def,constraint=Constraint,tablecinf=TCI},
-		   Path) ->
-    Ret =
-	case Constraint of
-	    [{componentrelation,{_,_,ObjectSet},AtList}|_Rest] ->
-		[{_,AL=[#'Externalvaluereference'{}|_R1]}|_R2] = AtList,
-		%% Note: if Path is longer than one,i.e. it is within
-		%% an inner type of the actual level, then the only
-		%% relevant at-list is of "outermost" type.
-%%		#'ObjectClassFieldType'{class=ClassDef} = Def,
-		ClassDef = get_ObjectClassFieldType_classdef(S,Def),
-		AtPath = 
-		    lists:map(fun(#'Externalvaluereference'{value=V})->V end,
-			      AL),
-		{[{ObjectSet,AtPath,ClassDef,Path}],Def};
-	    _Other ->
-		%% check the inner type of component
-		innertype_comprel(S,Def,Path)
-	end,
-    case Ret of
-	nofunobj ->
-	    nofunobj; %% ignored by caller
-	{CRelI=[{ObjSet,_,_,_}],NewDef} -> %%
-	    TCItmp = lists:subtract(TCI,[{objfun,ObjSet}]),
-	    {CRelI,C#type{tablecinf=[{objfun,ObjSet}|TCItmp],def=NewDef}};
-	{CompRelInf,NewDef} -> %% more than one tuple in CompRelInf
-	    TCItmp = lists:subtract(TCI,[{objfun,anyset}]),
-	    {CompRelInf,C#type{tablecinf=[{objfun,anyset}|TCItmp],def=NewDef}}
-    end.
-
-innertype_comprel(S,{'SEQUENCE OF',Type},Path) ->
-    case innertype_comprel1(S,Type,Path) of
-	nofunobj ->
-	    nofunobj;
-	{CompRelInf,NewType} ->
-	    {CompRelInf,{'SEQUENCE OF',NewType}}
-    end;
-innertype_comprel(S,{'SET OF',Type},Path) ->
-    case innertype_comprel1(S,Type,Path) of
-	nofunobj ->
-	    nofunobj;
-	{CompRelInf,NewType} ->
-	    {CompRelInf,{'SET OF',NewType}}
-    end;
-innertype_comprel(S,{'CHOICE',CTypeList},Path) ->
-    case componentlist_comprel(S,CTypeList,[],Path,[]) of
-	nofunobj ->
-	    nofunobj;
-	{CompRelInf,NewCs} ->
-	    {CompRelInf,{'CHOICE',NewCs}}
-    end;
-innertype_comprel(S,Seq = #'SEQUENCE'{components=Cs},Path) ->
-    case componentlist_comprel(S,Cs,[],Path,[]) of
-	nofunobj ->
-	    nofunobj;
-	{CompRelInf,NewCs} ->
-	    {CompRelInf,Seq#'SEQUENCE'{components=NewCs}}
-    end;
-innertype_comprel(S,Set = #'SET'{components=Cs},Path) ->
-    case componentlist_comprel(S,Cs,[],Path,[]) of
-	nofunobj ->
-	    nofunobj;
-	{CompRelInf,NewCs} ->
-	    {CompRelInf,Set#'SET'{components=NewCs}}
-    end;
-innertype_comprel(_,_,_) ->
-    nofunobj.
-
-componentlist_comprel(S,[C = #'ComponentType'{name=Name,typespec=Type}|Cs],
-		      Acc,Path,NewCL) ->
-    case catch componentrelation1(S,Type,Path++[Name]) of
-	{'EXIT',_} ->
-	    componentlist_comprel(S,Cs,Acc,Path,[C|NewCL]);
-	nofunobj ->
-	    componentlist_comprel(S,Cs,Acc,Path,[C|NewCL]);
-	{CRelInf,NewType} ->
-	    componentlist_comprel(S,Cs,CRelInf++Acc,Path,
-				  [C#'ComponentType'{typespec=NewType}|NewCL])
-    end;
-componentlist_comprel(_,[],Acc,_,NewCL) ->
-    case Acc of
-	[] ->
-	    nofunobj;
-	_ ->
-	    {Acc,lists:reverse(NewCL)}
-    end.
-
-innertype_comprel1(S,T = #type{def=Def,constraint=Cons,tablecinf=TCI},Path) ->
-    Ret =
-	case Cons of
-	    [{componentrelation,{_,_,ObjectSet},AtList}|_Rest] ->
-		%% This AtList must have an "outermost" at sign to be
-		%% relevent here.
-		[{_,AL=[#'Externalvaluereference'{value=_Attr}|_R1]}|_R2] 
-		    = AtList,
-%%		#'ObjectClassFieldType'{class=ClassDef} = Def,
-		ClassDef = get_ObjectClassFieldType_classdef(S,Def),
-		AtPath = 
-		    lists:map(fun(#'Externalvaluereference'{value=V})->V end,
-			      AL),
-		[{ObjectSet,AtPath,ClassDef,Path}];
-	    _ ->
-		innertype_comprel(S,Def,Path)
-	end,
-    case Ret of
-	nofunobj -> nofunobj;
-	L = [{ObjSet,_,_,_}] ->
-	    TCItmp = lists:subtract(TCI,[{objfun,ObjSet}]),
-	    {L,T#type{tablecinf=[{objfun,ObjSet}|TCItmp]}};
-	{CRelInf,NewDef} ->
-	    TCItmp = lists:subtract(TCI,[{objfun,anyset}]),
-	    {CRelInf,T#type{def=NewDef,tablecinf=[{objfun,anyset}|TCItmp]}}
-    end.
-
-
-%% leading_attr_index counts the index and picks the name of the
-%% component that is at the actual level in the at-list of the
-%% component relation constraint (AttrP).  AbsP is the path of
-%% component names from the top type level to the actual level. AttrP
-%% is a list with the atoms from the at-list.
-leading_attr_index(S,Cs,[H={_,AttrP,_,_}|T],AbsP,Acc) ->
-    AttrInfo = 
-	case lists:prefix(AbsP,AttrP) of
-	    %% why this ?? It is necessary when in same situation as
-	    %% TConstrChoice, there is an inner structure with an
-	    %% outermost at-list and the "leading attribute" code gen
-	    %% may be at a level some steps below the outermost level.
-	    true ->
-		RelativAttrP = lists:subtract(AttrP,AbsP),
-		%% The header is used to calculate the index of the
-		%% component and to give the fun, received from the
-		%% object set look up, an unique name. The tail is
-		%% used to match the proper value input to the fun.
-		{hd(RelativAttrP),tl(RelativAttrP)};
-	    false ->
-		{hd(AttrP),tl(AttrP)}
-	end,
-    case leading_attr_index1(S,Cs,H,AttrInfo,1) of
-	0 ->
-	    leading_attr_index(S,Cs,T,AbsP,Acc);
-	Res ->
-	    leading_attr_index(S,Cs,T,AbsP,[Res|Acc])
-    end;
-leading_attr_index(_,_Cs,[],_,Acc) ->
-    lists:reverse(Acc).
-
-leading_attr_index1(_,[],_,_,_) ->
-    0;
-leading_attr_index1(S,[C|Cs],Arg={ObjectSet,_,CDef,P},
-		    AttrInfo={Attr,SubAttr},N) ->
-    case C#'ComponentType'.name of
-	Attr ->
-	    ValueMatch = value_match(S,C,Attr,SubAttr),
-	    {ObjectSet,Attr,N,CDef,P,ValueMatch};
-	_ ->
-	    leading_attr_index1(S,Cs,Arg,AttrInfo,N+1)
-    end.
-
-%% value_math gathers information for a proper value match in the
-%% generated encode function. For a SEQUENCE or a SET the index of the
-%% component is counted. For a CHOICE the index is 2.
-value_match(S,C,Name,SubAttr) ->
-    value_match(S,C,Name,SubAttr,[]). % C has name Name
-value_match(_S,#'ComponentType'{},_Name,[],Acc) ->
-    Acc;% do not reverse, indexes in reverse order
-value_match(S,#'ComponentType'{typespec=Type},Name,[At|Ats],Acc) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    Components =
-	case get_atlist_components(Type#type.def) of
-	    [] -> error({type,{asn1,"element in at list must be a "
-			       "SEQUENCE, SET or CHOICE.",Name},S});
-	    Comps -> Comps
-	end,
-    {Index,ValueIndex} = component_value_index(S,InnerType,At,Components),
-    value_match(S,lists:nth(Index,Components),At,Ats,[ValueIndex|Acc]).
-
-component_value_index(S,'CHOICE',At,Components) ->
-    {component_index(S,At,Components),2};
-component_value_index(S,_,At,Components) ->
-    %% SEQUENCE or SET
-    Index = component_index(S,At,Components),
-    {Index,{Index+1,At}}.
-
-component_index(S,Name,Components) ->
-    component_index1(S,Name,Components,1).
-component_index1(_S,Name,[#'ComponentType'{name=Name}|_Cs],N) ->
-    N;
-component_index1(S,Name,[_C|Cs],N) ->
-    component_index1(S,Name,Cs,N+1);
-component_index1(S,Name,[],_) ->
-    error({type,{asn1,"component of at-list was not"
-		 " found in substructure",Name},S}).
-
-get_unique_fieldname(ClassDef) ->
-%%    {_,Fields,_} = ClassDef#classdef.typespec,
-    Fields = (ClassDef#classdef.typespec)#objectclass.fields,
-    get_unique_fieldname(Fields,[]).
-
-get_unique_fieldname([],[]) ->
-    throw({error,'__undefined_'});
-get_unique_fieldname([],[Name]) ->
-    Name;
-get_unique_fieldname([],Acc) ->
-    throw({asn1,'only one UNIQUE field is allowed in CLASS',Acc});
-get_unique_fieldname([{fixedtypevaluefield,Name,_,'UNIQUE',_}|Rest],Acc) ->
-    get_unique_fieldname(Rest,[Name|Acc]);
-get_unique_fieldname([_H|T],Acc) ->
-    get_unique_fieldname(T,Acc).
-
-get_tableconstraint_info(S,Type,{CheckedTs,EComps}) ->
-    {get_tableconstraint_info(S,Type,CheckedTs,[]),
-     get_tableconstraint_info(S,Type,EComps,[])};
-get_tableconstraint_info(S,Type,CheckedTs) ->
-    get_tableconstraint_info(S,Type,CheckedTs,[]).
-
-get_tableconstraint_info(_S,_Type,[],Acc) ->
-    lists:reverse(Acc);
-get_tableconstraint_info(S,Type,[C|Cs],Acc) ->
-    CheckedTs = C#'ComponentType'.typespec,
-    AccComp = 
-	case CheckedTs#type.def of 
-	    %% ObjectClassFieldType
-	    OCFT=#'ObjectClassFieldType'{class=#objectclass{},
-					 type=_AType} ->
-%		AType = get_ObjectClassFieldType(S,Fields,FieldRef),
-%		RefedFieldName = 
-%		    get_referencedclassfield(CheckedTs#type.def),%is probably obsolete
-		NewOCFT =
-		    OCFT#'ObjectClassFieldType'{class=[]},
-		C#'ComponentType'{typespec=
-				  CheckedTs#type{
-%				    def=AType,
-				    def=NewOCFT
-				    }};
-%				    constraint=[{tableconstraint_info,
-%						 FieldRef}]}};
-	    {'SEQUENCE OF',SOType} when record(SOType,type),
-					(element(1,SOType#type.def)=='CHOICE') ->
-		CTypeList = element(2,SOType#type.def),
-		NewInnerCList = 
-		    get_tableconstraint_info(S,Type,CTypeList,[]),
-		C#'ComponentType'{typespec=
-				  CheckedTs#type{
-				    def={'SEQUENCE OF',
-					 SOType#type{def={'CHOICE',
-							  NewInnerCList}}}}};
-	    {'SET OF',SOType} when record(SOType,type),
-				   (element(1,SOType#type.def)=='CHOICE') ->
-		CTypeList = element(2,SOType#type.def),
-		NewInnerCList = 
-		    get_tableconstraint_info(S,Type,CTypeList,[]),
-		C#'ComponentType'{typespec=
-				  CheckedTs#type{
-				    def={'SET OF',
-					 SOType#type{def={'CHOICE',
-							  NewInnerCList}}}}};
-	    _ ->
-		C
-	end,
-    get_tableconstraint_info(S,Type,Cs,[AccComp|Acc]).
-
-get_referenced_fieldname([{_,FirstFieldname}]) ->
-    {FirstFieldname,[]};
-get_referenced_fieldname([{_,FirstFieldname}|Rest]) ->
-    {FirstFieldname,lists:map(fun(X)->element(2,X) end,Rest)};
-get_referenced_fieldname(Def) ->
-    {no_type,Def}.
-
-%% get_ObjectClassFieldType extracts the type from the chain of
-%% objects that leads to a final type.
-get_ObjectClassFieldType(S,ERef,PrimFieldNameList) when
-  record(ERef,'Externaltypereference') ->
-    {_,Type} = get_referenced_type(S,ERef),
-    ClassSpec = check_class(S,Type),
-    Fields = ClassSpec#objectclass.fields,
-    get_ObjectClassFieldType(S,Fields,PrimFieldNameList);
-get_ObjectClassFieldType(S,Fields,L=[_PrimFieldName1|_Rest]) ->
-    check_PrimitiveFieldNames(S,Fields,L),
-    get_OCFType(S,Fields,L).
-
-check_PrimitiveFieldNames(_S,_Fields,_) ->
-    ok.
-
-%% get_ObjectClassFieldType_classdef gets the def of the class of the
-%% ObjectClassFieldType, i.e. the objectclass record. If the type has
-%% been checked (it may be a field type of an internal SEQUENCE) the
-%% class field = [], then the classdef has to be fetched by help of
-%% the class reference in the classname field.
-get_ObjectClassFieldType_classdef(S,#'ObjectClassFieldType'{classname=Name,
-							  class=[]}) ->
-    {_,#classdef{typespec=TS}} = get_referenced_type(S,Name),
-    TS;
-get_ObjectClassFieldType_classdef(_,#'ObjectClassFieldType'{class=Cl}) ->
-    Cl.
-
-get_OCFType(S,Fields,[{_FieldType,PrimFieldName}|Rest]) ->
-    case lists:keysearch(PrimFieldName,2,Fields) of
-	{value,{fixedtypevaluefield,_,Type,_Unique,_OptSpec}} ->
-	    {fixedtypevaluefield,PrimFieldName,Type};
-	{value,{objectfield,_,Type,_Unique,_OptSpec}} ->
-	    {_,ClassDef} = get_referenced_type(S,Type#type.def),
-	    CheckedCDef = check_class(S#state{type=ClassDef,
-					      tname=ClassDef#classdef.name},
-				      ClassDef#classdef.typespec),
-	    get_OCFType(S,CheckedCDef#objectclass.fields,Rest);
-	{value,{objectsetfield,_,Type,_OptSpec}} ->
-	    {_,ClassDef} = get_referenced_type(S,Type#type.def),
-	    CheckedCDef = check_class(S#state{type=ClassDef,
-					      tname=ClassDef#classdef.name},
-				      ClassDef#classdef.typespec),
-	    get_OCFType(S,CheckedCDef#objectclass.fields,Rest);
-
-	{value,Other} ->
-	    {element(1,Other),PrimFieldName};
-	_  ->
-	    error({type,"undefined FieldName in ObjectClassFieldType",S})
-    end.
-
-get_taglist(#state{erule=per},_) ->
-    [];
-get_taglist(#state{erule=per_bin},_) ->
-    [];
-get_taglist(S,Ext) when record(Ext,'Externaltypereference') ->
-    {_,T} = get_referenced_type(S,Ext),
-    get_taglist(S,T#typedef.typespec);
-get_taglist(S,Tref) when record(Tref,typereference) ->
-    {_,T} = get_referenced_type(S,Tref),
-    get_taglist(S,T#typedef.typespec);
-get_taglist(S,Type) when record(Type,type) ->
-    case Type#type.tag of
-	[] ->
-	    get_taglist(S,Type#type.def);
-	[Tag|_]  ->
-% 	    case lists:member(S#state.erule,[ber,ber_bin]) of
-% 		true ->
-% 		   lists:map(fun(Tx) -> asn1ct_gen:def_to_tag(Tx) end,Type#type.tag);
-% 		_ ->
-	    [asn1ct_gen:def_to_tag(Tag)]
-%	    end
-    end;
-get_taglist(S,{'CHOICE',{Rc,Ec}}) ->
-    get_taglist(S,{'CHOICE',Rc ++ Ec});
-get_taglist(S,{'CHOICE',Components}) ->
-    get_taglist1(S,Components);
-%% ObjectClassFieldType OTP-4390
-get_taglist(_S,#'ObjectClassFieldType'{type={typefield,_}}) ->
-    [];
-get_taglist(S,#'ObjectClassFieldType'{type={fixedtypevaluefield,_,Type}}) ->
-    get_taglist(S,Type);
-get_taglist(S,{ERef=#'Externaltypereference'{},FieldNameList})
-  when list(FieldNameList) ->
-    case get_ObjectClassFieldType(S,ERef,FieldNameList) of
-	Type when record(Type,type) ->
-	    get_taglist(S,Type);
-	{fixedtypevaluefield,_,Type} -> get_taglist(S,Type);
-	{TypeFieldName,_} when atom(TypeFieldName) -> []%should check if allowed
-    end;
-get_taglist(S,{ObjCl,FieldNameList}) when record(ObjCl,objectclass),
-					  list(FieldNameList) ->
-    case get_ObjectClassFieldType(S,ObjCl#objectclass.fields,FieldNameList) of
-	Type when record(Type,type) ->
-	    get_taglist(S,Type);
-	{fixedtypevaluefield,_,Type} -> get_taglist(S,Type);
-	{TypeFieldName,_} when atom(TypeFieldName) -> []%should check if allowed
-    end;
-get_taglist(S,Def) ->
-    case lists:member(S#state.erule,[ber_bin_v2]) of
-	false ->
-	    case Def of
-		'ASN1_OPEN_TYPE' -> % open_type has no UNIVERSAL tag as such
-		    [];
-		_ ->
-		    [asn1ct_gen:def_to_tag(Def)]
-	    end;
-	_ -> 
-	    []
-    end.
-
-get_taglist1(S,[#'ComponentType'{name=_Cname,tags=TagL}|Rest]) when list(TagL) -> 
-    %% tag_list has been here , just return TagL and continue with next alternative
-    TagL ++ get_taglist1(S,Rest);
-get_taglist1(S,[#'ComponentType'{typespec=Ts,tags=undefined}|Rest]) ->
-    get_taglist(S,Ts) ++ get_taglist1(S,Rest);
-get_taglist1(S,[_H|Rest]) -> % skip EXTENSIONMARK
-    get_taglist1(S,Rest);
-get_taglist1(_S,[]) ->
-    [].
-
-dbget_ex(_S,Module,Key) ->
-    case asn1_db:dbget(Module,Key) of
-	undefined ->
-	    
-	    throw({error,{asn1,{undefined,{Module,Key}}}}); % this is catched on toplevel type or value
-	T -> T
-    end.
-
-merge_tags(T1, T2) when list(T2) ->
-    merge_tags2(T1 ++ T2, []);
-merge_tags(T1, T2) ->
-    merge_tags2(T1 ++ [T2], []).
-
-merge_tags2([T1= #tag{type='IMPLICIT'}, T2 |Rest], Acc) ->
-    merge_tags2([T1#tag{type=T2#tag.type, form=T2#tag.form}|Rest],Acc);
-merge_tags2([T1= #tag{type={default,'IMPLICIT'}}, T2 |Rest], Acc) ->
-    merge_tags2([T1#tag{type=T2#tag.type, form=T2#tag.form}|Rest],Acc);
-merge_tags2([H|T],Acc) ->
-    merge_tags2(T, [H|Acc]);
-merge_tags2([], Acc) ->
-    lists:reverse(Acc).
-
-merge_constraints(C1, []) ->
-    C1;
-merge_constraints([], C2) ->
-    C2;
-merge_constraints(C1, C2) ->
-    {SList,VList,PAList,Rest} = splitlist(C1++C2,[],[],[],[]),
-    SizeC = merge_constraints(SList),
-    ValueC = merge_constraints(VList),
-    PermAlphaC = merge_constraints(PAList),
-    case Rest of
-        [] ->
-            SizeC ++ ValueC ++ PermAlphaC;
-        _ ->
-            throw({error,{asn1,{not_implemented,{merge_constraints,Rest}}}})
-    end.
-    
-merge_constraints([]) -> [];
-merge_constraints([C1 = {_,{Low1,High1}},{_,{Low2,High2}}|Rest]) when Low1 >= Low2,
-                                                                      High1 =< High2 ->
-    merge_constraints([C1|Rest]);
-merge_constraints([C1={'PermittedAlphabet',_},C2|Rest]) ->
-    [C1|merge_constraints([C2|Rest])];
-merge_constraints([C1 = {_,{_Low1,_High1}},C2 = {_,{_Low2,_High2}}|_Rest]) ->
-    throw({error,asn1,{conflicting_constraints,{C1,C2}}});
-merge_constraints([C]) ->
-    [C].
-
-splitlist([C={'SizeConstraint',_}|Rest],Sacc,Vacc,PAacc,Restacc) ->
-    splitlist(Rest,[C|Sacc],Vacc,PAacc,Restacc);
-splitlist([C={'ValueRange',_}|Rest],Sacc,Vacc,PAacc,Restacc) ->
-    splitlist(Rest,Sacc,[C|Vacc],PAacc,Restacc);
-splitlist([C={'PermittedAlphabet',_}|Rest],Sacc,Vacc,PAacc,Restacc) ->
-    splitlist(Rest,Sacc,Vacc,[C|PAacc],Restacc);
-splitlist([C|Rest],Sacc,Vacc,PAacc,Restacc) ->
-    splitlist(Rest,Sacc,Vacc,PAacc,[C|Restacc]);
-splitlist([],Sacc,Vacc,PAacc,Restacc) ->
-    {lists:reverse(Sacc),
-     lists:reverse(Vacc),
-     lists:reverse(PAacc),
-     lists:reverse(Restacc)}.
-
-
-
-storeindb(M) when record(M,module) ->
-    TVlist = M#module.typeorval,
-    NewM = M#module{typeorval=findtypes_and_values(TVlist)},
-    asn1_db:dbnew(NewM#module.name),
-    asn1_db:dbput(NewM#module.name,'MODULE',  NewM),
-    Res = storeindb(NewM#module.name,TVlist,[]),
-    include_default_class(NewM#module.name),
-    include_default_type(NewM#module.name),
-    Res.
-
-storeindb(Module,[H|T],ErrAcc) when record(H,typedef) ->
-    storeindb(Module,H#typedef.name,H,T,ErrAcc);
-storeindb(Module,[H|T],ErrAcc) when record(H,valuedef) ->
-    storeindb(Module,H#valuedef.name,H,T,ErrAcc);
-storeindb(Module,[H|T],ErrAcc) when record(H,ptypedef) ->
-    storeindb(Module,H#ptypedef.name,H,T,ErrAcc);
-storeindb(Module,[H|T],ErrAcc) when record(H,classdef) ->
-    storeindb(Module,H#classdef.name,H,T,ErrAcc);
-storeindb(Module,[H|T],ErrAcc) when record(H,pvaluesetdef) ->
-    storeindb(Module,H#pvaluesetdef.name,H,T,ErrAcc);
-storeindb(Module,[H|T],ErrAcc) when record(H,pobjectdef) ->
-    storeindb(Module,H#pobjectdef.name,H,T,ErrAcc);
-storeindb(Module,[H|T],ErrAcc) when record(H,pvaluedef) ->
-    storeindb(Module,H#pvaluedef.name,H,T,ErrAcc);
-storeindb(_,[],[]) -> ok;
-storeindb(_,[],ErrAcc) -> 
-    {error,ErrAcc}.
-
-storeindb(Module,Name,H,T,ErrAcc) ->
-    case asn1_db:dbget(Module,Name) of
-	undefined ->
-	    asn1_db:dbput(Module,Name,H),
-	    storeindb(Module,T,ErrAcc);
-	_ -> 
-	    case H of 
-		_Type when record(H,typedef) ->
-		    error({type,"already defined",
-			   #state{mname=Module,type=H,tname=Name}});
-		_Type when record(H,valuedef) ->
-		    error({value,"already defined",
-			   #state{mname=Module,value=H,vname=Name}});
-		_Type when record(H,ptypedef) ->
-		    error({ptype,"already defined",
-			   #state{mname=Module,type=H,tname=Name}});
-		_Type when record(H,pobjectdef) ->
-		    error({ptype,"already defined",
-			   #state{mname=Module,type=H,tname=Name}});
-		_Type when record(H,pvaluesetdef) ->
-		    error({ptype,"already defined",
-			   #state{mname=Module,type=H,tname=Name}});
-		_Type when record(H,pvaluedef) ->
-		    error({ptype,"already defined",
-			   #state{mname=Module,type=H,tname=Name}});
-		_Type when record(H,classdef) ->
-		    error({class,"already defined",
-			   #state{mname=Module,value=H,vname=Name}})
-	    end,
-	    storeindb(Module,T,[H|ErrAcc])
-    end.
-
-findtypes_and_values(TVList) ->
-    findtypes_and_values(TVList,[],[],[],[],[],[]).%% Types,Values,
-%% Parameterizedtypes,Classes,Objects and ObjectSets
-
-findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc) 
-  when record(H,typedef),record(H#typedef.typespec,'Object') ->
-    findtypes_and_values(T,Tacc,Vacc,Pacc,Cacc,[H#typedef.name|Oacc],OSacc);
-findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc) 
-  when record(H,typedef),record(H#typedef.typespec,'ObjectSet') ->
-    findtypes_and_values(T,Tacc,Vacc,Pacc,Cacc,Oacc,[H#typedef.name|OSacc]);
-findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc) 
-  when record(H,typedef) ->
-    findtypes_and_values(T,[H#typedef.name|Tacc],Vacc,Pacc,Cacc,Oacc,OSacc);
-findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc) 
-  when record(H,valuedef) ->
-    findtypes_and_values(T,Tacc,[H#valuedef.name|Vacc],Pacc,Cacc,Oacc,OSacc);
-findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc) 
-  when record(H,ptypedef) ->
-    findtypes_and_values(T,Tacc,Vacc,[H#ptypedef.name|Pacc],Cacc,Oacc,OSacc);
-findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc) 
-  when record(H,classdef) ->
-    findtypes_and_values(T,Tacc,Vacc,Pacc,[H#classdef.name|Cacc],Oacc,OSacc);
-findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
-  when record(H,pvaluedef) ->
-    findtypes_and_values(T,Tacc,[H#pvaluedef.name|Vacc],Pacc,Cacc,Oacc,OSacc);
-findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
-  when record(H,pvaluesetdef) ->
-    findtypes_and_values(T,Tacc,[H#pvaluesetdef.name|Vacc],Pacc,Cacc,Oacc,OSacc);
-findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
-  when record(H,pobjectdef) ->
-    findtypes_and_values(T,Tacc,Vacc,Pacc,Cacc,[H#pobjectdef.name|Oacc],OSacc);
-findtypes_and_values([H|T],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc)
-  when record(H,pobjectsetdef) ->
-    findtypes_and_values(T,Tacc,Vacc,Pacc,Cacc,Oacc,[H#pobjectsetdef.name|OSacc]);
-findtypes_and_values([],Tacc,Vacc,Pacc,Cacc,Oacc,OSacc) ->
-    {lists:reverse(Tacc),lists:reverse(Vacc),lists:reverse(Pacc),
-     lists:reverse(Cacc),lists:reverse(Oacc),lists:reverse(OSacc)}.
-    
-
-
-error({export,Msg,#state{mname=Mname,type=Ref,tname=Typename}}) ->
-    Pos = Ref#'Externaltypereference'.pos,
-    io:format("asn1error:~p:~p:~p ~p~n",[Pos,Mname,Typename,Msg]),
-    {error,{export,Pos,Mname,Typename,Msg}};
-error({type,Msg,#state{mname=Mname,type=Type,tname=Typename}}) 
-  when record(Type,typedef) ->
-    io:format("asn1error:~p:~p:~p ~p~n",
-	      [Type#typedef.pos,Mname,Typename,Msg]),
-    {error,{type,Type#typedef.pos,Mname,Typename,Msg}};
-error({type,Msg,#state{mname=Mname,type=Type,tname=Typename}}) 
-  when record(Type,ptypedef) ->
-    io:format("asn1error:~p:~p:~p ~p~n",
-	      [Type#ptypedef.pos,Mname,Typename,Msg]),
-    {error,{type,Type#ptypedef.pos,Mname,Typename,Msg}};
-error({type,Msg,#state{mname=Mname,value=Value,vname=Valuename}})
-  when record(Value,valuedef) ->
-    io:format("asn1error:~p:~p:~p ~p~n",[Value#valuedef.pos,Mname,Valuename,Msg]),
-    {error,{type,Value#valuedef.pos,Mname,Valuename,Msg}};
-error({type,Msg,#state{mname=Mname,type=Type,tname=Typename}}) 
-  when record(Type,pobjectdef) ->
-    io:format("asn1error:~p:~p:~p ~p~n",
-	      [Type#pobjectdef.pos,Mname,Typename,Msg]),
-    {error,{type,Type#pobjectdef.pos,Mname,Typename,Msg}};
-error({value,Msg,#state{mname=Mname,value=Value,vname=Valuename}}) ->
-    io:format("asn1error:~p:~p:~p ~p~n",[Value#valuedef.pos,Mname,Valuename,Msg]),
-    {error,{value,Value#valuedef.pos,Mname,Valuename,Msg}};
-error({Other,Msg,#state{mname=Mname,value=#valuedef{pos=Pos},vname=Valuename}}) ->
-    io:format("asn1error:~p:~p:~p ~p~n",[Pos,Mname,Valuename,Msg]),
-    {error,{Other,Pos,Mname,Valuename,Msg}};
-error({Other,Msg,#state{mname=Mname,type=#typedef{pos=Pos},tname=Typename}}) ->
-    io:format("asn1error:~p:~p:~p ~p~n",[Pos,Mname,Typename,Msg]),
-    {error,{Other,Pos,Mname,Typename,Msg}};
-error({Other,Msg,#state{mname=Mname,type=#classdef{pos=Pos},tname=Typename}}) ->
-    io:format("asn1error:~p:~p:~p ~p~n",[Pos,Mname,Typename,Msg]),
-    {error,{Other,Pos,Mname,Typename,Msg}}.
-
-include_default_type(Module) ->
-    NameAbsList = default_type_list(),
-    include_default_type1(Module,NameAbsList).
-
-include_default_type1(_,[]) ->
-    ok;
-include_default_type1(Module,[{Name,TS}|Rest]) ->
-    case asn1_db:dbget(Module,Name) of
-	undefined ->
-	    T = #typedef{name=Name,
-			 typespec=TS},
-		asn1_db:dbput(Module,Name,T);
-	_ -> ok
-    end,
-    include_default_type1(Module,Rest).
-
-default_type_list() ->
-    %% The EXTERNAL type is represented, according to ASN.1 1997, 
-    %% as a SEQUENCE with components: identification, data-value-descriptor
-    %% and data-value.
-    Syntax = 
-	#'ComponentType'{name=syntax,
-			 typespec=#type{def='OBJECT IDENTIFIER'},
-			 prop=mandatory},
-    Presentation_Cid =
-	#'ComponentType'{name='presentation-context-id',
-			 typespec=#type{def='INTEGER'},
-			 prop=mandatory},
-    Transfer_syntax =
-	#'ComponentType'{name='transfer-syntax',
-			 typespec=#type{def='OBJECT IDENTIFIER'},
-			 prop=mandatory},
-    Negotiation_items = 
-	#type{def=
-	      #'SEQUENCE'{components=
-			  [Presentation_Cid,
-			   Transfer_syntax#'ComponentType'{prop=mandatory}]}},
-    Context_negot = 
-	#'ComponentType'{name='context-negotiation',
-			 typespec=Negotiation_items,
-			 prop=mandatory},
-
-    Data_value_descriptor =
-	#'ComponentType'{name='data-value-descriptor',
-			 typespec=#type{def='ObjectDescriptor'},
-			 prop='OPTIONAL'},
-    Data_value =
-	#'ComponentType'{name='data-value',
-			 typespec=#type{def='OCTET STRING'},
-			 prop=mandatory},
-
-    %% The EXTERNAL type is represented, according to ASN.1 1990, 
-    %% as a SEQUENCE with components: direct-reference, indirect-reference,
-    %% data-value-descriptor and encoding.
-
-    Direct_reference = 
-	#'ComponentType'{name='direct-reference',
-			 typespec=#type{def='OBJECT IDENTIFIER'},
-			 prop='OPTIONAL'},
-
-    Indirect_reference = 
-	#'ComponentType'{name='indirect-reference',
-			 typespec=#type{def='INTEGER'},
-			 prop='OPTIONAL'},
-
-    Single_ASN1_type =
-	#'ComponentType'{name='single-ASN1-type',
-			 typespec=#type{tag=[{tag,'CONTEXT',0,
-					      'EXPLICIT',32}],
-					def='ANY'},
-			 prop=mandatory},
-
-    Octet_aligned =
-	#'ComponentType'{name='octet-aligned',
-			 typespec=#type{tag=[{tag,'CONTEXT',1,
-					      'IMPLICIT',32}],
-					def='OCTET STRING'},
-			 prop=mandatory},
-
-    Arbitrary =
-	#'ComponentType'{name=arbitrary,
-			 typespec=#type{tag=[{tag,'CONTEXT',2,
-					      'IMPLICIT',32}],
-					def={'BIT STRING',[]}},
-			 prop=mandatory},
-
-    Encoding =
-	#'ComponentType'{name=encoding,
-			 typespec=#type{def={'CHOICE',
-					     [Single_ASN1_type,Octet_aligned,
-					      Arbitrary]}},
-			 prop=mandatory},
-
-    EXTERNAL_components1990 =
-	[Direct_reference,Indirect_reference,Data_value_descriptor,Encoding],
-    
-    %% The EMBEDDED PDV type is represented by a SEQUENCE type
-    %% with components: identification and data-value
-    Abstract = 
-	#'ComponentType'{name=abstract,
-			 typespec=#type{def='OBJECT IDENTIFIER'},
-			 prop=mandatory},
-    Transfer =
-	#'ComponentType'{name=transfer,
-			 typespec=#type{def='OBJECT IDENTIFIER'},
-			 prop=mandatory},
-    AbstractTrSeq =
-	#'SEQUENCE'{components=[Abstract,Transfer]},
-    Syntaxes =
-	#'ComponentType'{name=syntaxes,
-			 typespec=#type{def=AbstractTrSeq},
-			 prop=mandatory},
-    Fixed = #'ComponentType'{name=fixed,
-			     typespec=#type{def='NULL'},
-			     prop=mandatory},
-    Negotiations =
-	[Syntaxes,Syntax,Presentation_Cid,Context_negot,
-	 Transfer_syntax,Fixed],
-    Identification2 =
-	#'ComponentType'{name=identification,
-			 typespec=#type{def={'CHOICE',Negotiations}},
-			 prop=mandatory},
-    EmbeddedPdv_components =
-	[Identification2,Data_value],
-    
-    %% The CHARACTER STRING type is represented by a SEQUENCE type
-    %% with components: identification and string-value
-    String_value = 
-	#'ComponentType'{name='string-value',
-			 typespec=#type{def='OCTET STRING'},
-			 prop=mandatory},
-    CharacterString_components =
-	[Identification2,String_value],
-
-    [{'EXTERNAL',
-      #type{tag=[#tag{class='UNIVERSAL',
-		      number=8,
-		      type='IMPLICIT',
-		      form=32}],
-	    def=#'SEQUENCE'{components=
-			    EXTERNAL_components1990}}},
-     {'EMBEDDED PDV',
-      #type{tag=[#tag{class='UNIVERSAL',
-		      number=11,
-		      type='IMPLICIT',
-		      form=32}],
-	    def=#'SEQUENCE'{components=EmbeddedPdv_components}}},
-     {'CHARACTER STRING',
-      #type{tag=[#tag{class='UNIVERSAL',
-		      number=29,
-		      type='IMPLICIT',
-		      form=32}],
-	    def=#'SEQUENCE'{components=CharacterString_components}}}
-     ].
-
-
-include_default_class(Module) ->
-    NameAbsList = default_class_list(),
-    include_default_class1(Module,NameAbsList).
-
-include_default_class1(_,[]) ->
-    ok;
-include_default_class1(Module,[{Name,TS}|_Rest]) ->
-    case asn1_db:dbget(Module,Name) of
-	undefined ->
-	    C = #classdef{checked=true,name=Name,
-			  typespec=TS},
-	    asn1_db:dbput(Module,Name,C);
-	_ -> ok
-    end.
-
-default_class_list() ->
-    [{'TYPE-IDENTIFIER',
-      {objectclass,
-       [{fixedtypevaluefield,
-	 id,
-	 {type,[],'OBJECT IDENTIFIER',[]},
-	 'UNIQUE',
-	 'MANDATORY'},
-	{typefield,'Type','MANDATORY'}],
-       {'WITH SYNTAX',
-	[{typefieldreference,'Type'},
-	 'IDENTIFIED',
-	 'BY',
-	 {valuefieldreference,id}]}}},
-     {'ABSTRACT-SYNTAX',
-      {objectclass,
-       [{fixedtypevaluefield,
-	 id,
-	 {type,[],'OBJECT IDENTIFIER',[]},
-	 'UNIQUE',
-	 'MANDATORY'},
-	{typefield,'Type','MANDATORY'},
-	{fixedtypevaluefield,
-	 property,
-	 {type,
-	  [],
-	  {'BIT STRING',[]},
-	  []},
-	 undefined,
-	 {'DEFAULT',
-	  [0,1,0]}}],
-       {'WITH SYNTAX',
-	[{typefieldreference,'Type'},
-	 'IDENTIFIED',
-	 'BY',
-	 {valuefieldreference,id},
-	 ['HAS',
-	  'PROPERTY',
-	  {valuefieldreference,property}]]}}}].
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_constructed_ber.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_constructed_ber.erl
deleted file mode 100644
index 8a639de5bb..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_constructed_ber.erl
+++ /dev/null
@@ -1,1468 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_constructed_ber.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
-%%
--module(asn1ct_constructed_ber).
-
--export([gen_encode_sequence/3]).
--export([gen_decode_sequence/3]).
--export([gen_encode_set/3]).
--export([gen_decode_set/3]).
--export([gen_encode_sof/4]).
--export([gen_decode_sof/4]).
--export([gen_encode_choice/3]).
--export([gen_decode_choice/3]).
-
-%%%% Application internal exports 
--export([match_tag/2]).
-
--include("asn1_records.hrl").
-
--import(asn1ct_gen, [emit/1,demit/1]).
-
-% the encoding of class of tag bits 8 and 7
--define(UNIVERSAL,   0).
--define(APPLICATION, 16#40).
--define(CONTEXT,     16#80).
--define(PRIVATE,     16#C0).
-
-% primitive or constructed encoding % bit 6
--define(PRIMITIVE,   0).
--define(CONSTRUCTED, 2#00100000).
-
-
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%%  Encode/decode SEQUENCE
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-gen_encode_sequence(Erules,Typename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(term),
-    asn1ct_name:new(bytes),
-    
-    %% if EXTERNAL type the input value must be transformed to 
-    %% ASN1 1990 format
-    case Typename of
-	['EXTERNAL'] ->
-	    emit(["   NewVal = asn1rt_check:transform_to_EXTERNAL1990(Val),",
-		  nl]);
-	_ ->
-	    ok
-    end,
-
-    {SeqOrSet,TableConsInfo,CompList} = 
-	case D#type.def of
-	    #'SEQUENCE'{tablecinf=TCI,components=CL} -> 
-		{'SEQUENCE',TCI,CL};
-	    #'SET'{tablecinf=TCI,components=CL} -> 
-		{'SET',TCI,CL}
-	end,
-    Ext = extensible(CompList),
-    CompList1 = case CompList of
-		    {Rl,El} -> Rl ++ El;
-		    _ -> CompList
-		end,
-    EncObj =
-	case TableConsInfo of
-	    #simpletableattributes{usedclassfield=Used,
-				   uniqueclassfield=Unique} when Used /= Unique ->
-		false;
-	    %% ObjectSet, name of the object set in constraints
-	    %% 
-	    %%{ObjectSet,AttrN,N,UniqueFieldName}
-	    #simpletableattributes{objectsetname=ObjectSet,
-				   c_name=AttrN,
-				   c_index=N,
-				   usedclassfield=UniqueFieldName,
-				   uniqueclassfield=UniqueFieldName,
-				   valueindex=ValueIndex
-				  } ->
-		OSDef =
-		    case ObjectSet of
-			{Module,OSName} ->
-			    asn1_db:dbget(Module,OSName);
-			OSName ->
-			    asn1_db:dbget(get(currmod),OSName)
-		    end,
-%		io:format("currmod: ~p~nOSName: ~p~nAttrN: ~p~nN: ~p~nUniqueFieldName: ~p~n",
-%			  [get(currmod),OSName,AttrN,N,UniqueFieldName]),
-		case (OSDef#typedef.typespec)#'ObjectSet'.gen of
-		    true ->
-% 			Val = lists:concat(["?RT_BER:cindex(",
-% 					    N+1,",Val,"]),
-			ObjectEncode = 
-			    asn1ct_gen:un_hyphen_var(lists:concat(['Obj',
-								   AttrN])),
-			emit({ObjectEncode," = ",nl}),
-			emit({"  'getenc_",ObjectSet,"'(",{asis,UniqueFieldName},
-			      ", ",nl}),
-%			emit({indent(35),"?RT_BER:cindex(",N+1,", Val,",
-%			      {asis,AttrN},")),",nl}),
-			emit([indent(10+length(atom_to_list(ObjectSet))),
-			      "value_match(",{asis,ValueIndex},",",
-			      "?RT_BER:cindex(",N+1,",Val,",
-			      {asis,AttrN},"))),",nl]),
-			notice_value_match(),
-			{AttrN,ObjectEncode};
-		    _ ->
-			false
-		end;
-	    _ ->
-		case D#type.tablecinf of
-		    [{objfun,_}|_] ->
-			%% when the simpletableattributes was at an
-			%% outer level and the objfun has been passed
-			%% through the function call
-			{"got objfun through args","ObjFun"};
-		    _ ->
-			false
-		end
-	end,
-
-    gen_enc_sequence_call(Erules,Typename,CompList1,1,Ext,EncObj),
-
-    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
-	++ 
-	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
-	      number = asn1ct_gen_ber:decode_type(SeqOrSet),
-	      form = ?CONSTRUCTED,
-	      type = 'IMPLICIT'}],
-    emit([nl,"   BytesSoFar = "]),
-    case SeqOrSet of
-	'SET' when (D#type.def)#'SET'.sorted == dynamic ->
-	    emit("?RT_BER:dynamicsort_SET_components(["),
-	    mkvlist(asn1ct_name:all(encBytes)),
-	    emit(["]),",nl]);
-	_ ->
-	    emit("["),
-	    mkvlist(asn1ct_name:all(encBytes)),
-	    emit(["],",nl])
-    end,
-    emit("  LenSoFar = "),
-    case asn1ct_name:all(encLen) of
-	[] -> emit("0");
-	AllLengths -> 
-	    mkvplus(AllLengths)
-    end,
-    emit([",",nl]),
-% emit(["{TagBytes,Len} = ?RT_BER:encode_tags(TagIn ++ ",
- emit(["  ?RT_BER:encode_tags(TagIn ++ ",
- 		  {asis,MyTag},", BytesSoFar, LenSoFar).",nl]).
-
-
-gen_decode_sequence(Erules,Typename,D) when record(D,type) ->
-    asn1ct_name:start(),
-%    asn1ct_name:new(term),
-    asn1ct_name:new(tag),
-    #'SEQUENCE'{tablecinf=TableConsInfo,components=CList} = D#type.def,
-    Ext = extensible(CList),
-    CompList = case CList of
-		   {Rl,El}  -> Rl ++ El;
-		   _ -> CList
-	       end,
-
-    emit({"   %%-------------------------------------------------",nl}),
-    emit({"   %% decode tag and length ",nl}),
-    emit({"   %%-------------------------------------------------",nl}),
-
-    asn1ct_name:new(rb),
-    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
-	++ 
-	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
-	      number = asn1ct_gen_ber:decode_type('SEQUENCE'),
-	      form = ?CONSTRUCTED,
-	      type = 'IMPLICIT'}],
-    emit(["   {{_,",asn1ct_gen_ber:unused_var("Len",D#type.def),"},",{next,bytes},",",{curr,rb},
-	  "} = ?RT_BER:check_tags(TagIn ++ ",{asis,MyTag},", ",
-	  {curr,bytes},", OptOrMand), ",nl]),
-    asn1ct_name:new(bytes),
-    asn1ct_name:new(len),
-
-    case CompList of
-	[] -> true;
-	_ ->
-	    emit({"{",{next,bytes},
-		  ",RemBytes} = ?RT_BER:split_list(",
-		  {curr,bytes},
-		  ",", {prev,len},"),",nl}),
-	    asn1ct_name:new(bytes)
-    end,
-    
-    {DecObjInf,UniqueFName,ValueIndex} =
-	case TableConsInfo of
-	    #simpletableattributes{objectsetname=ObjectSet,
-				   c_name=AttrN,
-				   usedclassfield=UniqueFieldName,
-				   uniqueclassfield=UniqueFieldName,
-				   valueindex=ValIndex
-				  } ->
-		F = fun(#'ComponentType'{typespec=CT})->
-			    case {CT#type.constraint,CT#type.tablecinf} of
-				{[],[{objfun,_}|_R]} -> true;
-				_ -> false
-			    end
-		    end,
-		case lists:any(F,CompList) of
-		    %%AttributeName = asn1ct_gen:un_hyphen_var(AttrN),
-		    true -> % when component relation constraint establish
-			%% relation from a component to another components
-			%% subtype component
-			{{AttrN,{deep,ObjectSet,UniqueFieldName,
-					 ValIndex}},
-			 UniqueFieldName,ValIndex};
-		    false ->
-			{{AttrN,ObjectSet},UniqueFieldName,ValIndex}
-		end;
-	    _ ->
-		{false,false,false}
-	end,
-    case gen_dec_sequence_call(Erules,Typename,CompList,Ext,DecObjInf) of
-	no_terms -> % an empty sequence	    
-	    emit([nl,nl]),
-	    demit({"Result = "}), %dbg
-	    %% return value as record
-	    asn1ct_name:new(rb),
-	    emit(["   {{'",asn1ct_gen:list2rname(Typename),"'}, ",{curr,bytes},",",nl,"    "]),
-	    asn1ct_gen_ber:add_removed_bytes(),
-	    emit(["}.",nl]);
-	{LeadingAttrTerm,PostponedDecArgs} ->
-	    emit([com,nl,nl]),
-	    case {LeadingAttrTerm,PostponedDecArgs} of
-		{[],[]} ->
-		    ok;
-		{_,[]} ->
-		    ok;
-		{[{ObjSet,LeadingAttr,Term}],PostponedDecArgs} ->
-		    DecObj = asn1ct_gen:un_hyphen_var(lists:concat(['DecObj',LeadingAttr,Term])),
-		    ValueMatch = value_match(ValueIndex,Term),
-		    emit([DecObj," =",nl,"   'getdec_",ObjSet,"'(",
-%			  {asis,UniqueFName},", ",Term,"),",nl}),
-			  {asis,UniqueFName},", ",ValueMatch,"),",nl]),
-		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
-	    end,
-	    demit({"Result = "}), %dbg
-	    %% return value as record
-	    asn1ct_name:new(rb),
-	    asn1ct_name:new(bytes),
-	    ExtStatus = case Ext of
-			    {ext,_,_} -> ext;
-			    noext -> noext
-			end,
-	    emit(["   {",{next,bytes},",",{curr,rb},"} = ?RT_BER:restbytes2(RemBytes, ",
-		  {curr,bytes},",",ExtStatus,"),",nl]),
-	    asn1ct_name:new(rb),
-	    case Typename of
-		['EXTERNAL'] ->
-		    emit(["   OldFormat={'",asn1ct_gen:list2rname(Typename),
-			  "', "]),
-		    mkvlist(asn1ct_name:all(term)),
-		    emit(["},",nl]),
-		    emit(["   ASN11994Format =",nl,
-			  "      asn1rt_check:transform_to_EXTERNAL1994",
-			  "(OldFormat),",nl]),
-		    emit(["   {ASN11994Format,",{next,bytes},", "]);
-		_ ->
-		    emit(["   {{'",asn1ct_gen:list2rname(Typename),"', "]),
-		    mkvlist(asn1ct_name:all(term)),
-		    emit(["}, ",{next,bytes},", "])
-	    end,
-	    asn1ct_gen_ber:add_removed_bytes(),
-	    emit(["}.",nl])
-    end.
-
-gen_dec_postponed_decs(_,[]) ->
-    emit(nl);
-gen_dec_postponed_decs(DecObj,[{_Cname,{FirstPFN,PFNList},Term,TmpTerm,_Tag,OptOrMand}|Rest]) ->
-%    asn1ct_name:new(term),
-    asn1ct_name:new(tmpterm),
-    asn1ct_name:new(reason),
-
-    emit({"{",Term,", _, _} = ",nl}),
-    N = case OptOrMand of
-	    mandatory -> 0;
-	    'OPTIONAL' -> 
-		emit_opt_or_mand_check(asn1_NOVALUE,TmpTerm),
-		6;
-	    {'DEFAULT',Val} ->
-		emit_opt_or_mand_check(Val,TmpTerm),
-		6
-	end,
-    emit({indent(N+3),"case (catch ",DecObj,"(",{asis,FirstPFN},
-%	  ", ",TmpTerm,", ", {asis,Tag},", ",{asis,PFNList},")) of",nl}),
-	  ", ",TmpTerm,", [], ",{asis,PFNList},")) of",nl}),
-    emit({indent(N+6),"{'EXIT', ",{curr,reason},"} ->",nl}),
-    emit({indent(N+9),"exit({'Type not compatible with table constraint',",
-	  {curr,reason},"});",nl}),
-    emit({indent(N+6),{curr,tmpterm}," ->",nl}),
-    emit({indent(N+9),{curr,tmpterm},nl}),
-
-    case OptOrMand of 
-	mandatory -> emit([indent(N+3),"end,",nl]);
-	_ ->
-	    emit([indent(N+3),"end",nl,
-		  indent(3),"end,",nl])
-    end,
-%    emit({indent(3),"end,",nl}),
-    gen_dec_postponed_decs(DecObj,Rest).
-
-
-emit_opt_or_mand_check(Value,TmpTerm) ->
-    emit([indent(3),"case ",TmpTerm," of",nl,
-	  indent(6),{asis,Value}," -> {",{asis,Value},",[],[]};",nl,
-	  indent(6),"_ ->",nl]).
-
-%%============================================================================
-%%  Encode/decode SET
-%%
-%%============================================================================
-
-gen_encode_set(Erules,Typename,D) when record(D,type) ->
-    gen_encode_sequence(Erules,Typename,D).
-
-gen_decode_set(Erules,Typename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(term),
-    asn1ct_name:new(tag),
-    #'SET'{components=TCompList} = D#type.def,
-    Ext = extensible(TCompList),
-    CompList = case TCompList of
-		   {Rl,El} -> Rl ++ El;
-		   _ -> TCompList
-	       end,
-
-    emit(["   %%-------------------------------------------------",nl]),
-    emit(["   %% decode tag and length ",nl]),
-    emit(["   %%-------------------------------------------------",nl]),
-
-    asn1ct_name:new(rb),
-    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
-	++ 
-	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
-	      number = asn1ct_gen_ber:decode_type('SET'),
-	      form = ?CONSTRUCTED,
-	      type = 'IMPLICIT'}],
-    emit(["   {{_,Len},",{next,bytes},",",{curr,rb},
-	  "} = ?RT_BER:check_tags(TagIn ++ ",{asis,MyTag},", ",
-	  {curr,bytes},", OptOrMand), ",nl]),
-    asn1ct_name:new(bytes),
-    asn1ct_name:new(len),
-    asn1ct_name:new(rb),
-
-    emit(["   {SetTerm, SetBytes, ",{curr,rb},"} = ?RT_BER:decode_set(0, Len, ",
-	  {curr,bytes},", OptOrMand, ",
-	  "fun 'dec_",asn1ct_gen:list2name(Typename),"_fun'/2, []),",nl]),
-    
-    asn1ct_name:new(rb),
-    emit(["   'dec_",asn1ct_gen:list2name(Typename),"_result'(lists:sort(SetTerm), SetBytes, "]),
-    asn1ct_gen_ber:add_removed_bytes(),
-    emit([").",nl,nl,nl]),
-
-    emit({"%%-------------------------------------------------",nl}),
-    emit({"%% Set loop fun for ",asn1ct_gen:list2name(Typename),nl}),
-    emit({"%%-------------------------------------------------",nl}),
-
-    asn1ct_name:clear(),
-    asn1ct_name:new(term),
-    emit(["'dec_",asn1ct_gen:list2name(Typename),"_fun'(",{curr,bytes},
-	  ", OptOrMand) ->",nl]),
-    
-    asn1ct_name:new(bytes),
-    gen_dec_set(Erules,Typename,CompList,1,Ext),
-
-    emit(["      %% tag not found, if extensionmark we should skip bytes here",nl]),
-    emit([indent(6),"_ -> {[], Bytes,0}",nl]),
-    emit([indent(3),"end.",nl,nl,nl]),
-
-
-    emit({"%%-------------------------------------------------",nl}),
-    emit({"%% Result ",asn1ct_gen:list2name(Typename),nl}),
-    emit({"%%-------------------------------------------------",nl}),
-
-    asn1ct_name:clear(),
-    emit({"'dec_",asn1ct_gen:list2name(Typename),"_result'(",
-	  asn1ct_gen_ber:unused_var("TermList",D#type.def),", Bytes, Rb) ->",nl}),
-    
-    case gen_dec_set_result(Erules,Typename,CompList) of
-	no_terms -> 	    
-	    %% return value as record
-	    asn1ct_name:new(rb),
-	    emit({"   {{'",asn1ct_gen:list2rname(Typename),"'}, Bytes, Rb}.",nl});
-	_ ->
-	    emit({nl,"   case ",{curr,termList}," of",nl}),
-	    emit({"      [] -> {{'",asn1ct_gen:list2rname(Typename),"', "}),
-	    mkvlist(asn1ct_name:all(term)),
-	    emit({"}, Bytes, Rb};",nl}),    
-	    emit({"      ExtraAtt -> exit({error,{asn1,{too_many_attributes, ExtraAtt}}})",nl}),
-	    emit({"   end.",nl}),
-	    emit({nl,nl,nl})
-    end.
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%%  Encode/decode SEQUENCE OF and SET OF
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-gen_encode_sof(Erules,Typename,_InnerTypename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    {SeqOrSetOf, Cont} = D#type.def,
-
-    Objfun = case D#type.tablecinf of
-		 [{objfun,_}|_R] ->
-		     ", ObjFun";
-		 _ ->
-		     ""
-	     end,
-
-    emit({"   {EncBytes,EncLen} = 'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'(Val",Objfun,",[],0),",nl}),
-
-    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
-	++ 
-	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
-	      number = asn1ct_gen_ber:decode_type(SeqOrSetOf),
-	      form = ?CONSTRUCTED,
-	      type = 'IMPLICIT'}],
-%    gen_encode_tags(Erules,MyTag,"EncLen","EncBytes"),
- 	    emit(["   ?RT_BER:encode_tags(TagIn ++ ",
- 		  {asis,MyTag},", EncBytes, EncLen).",nl,nl]),
-
-    gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont).
-%     gen_enc_line(Erules,Typename,TypeNameSuffix,Cont,"H",0,
-% 		 mandatory,"{EncBytes,EncLen} = "),
-    
-
-gen_decode_sof(Erules,Typename,_InnerTypename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    {SeqOrSetOf, TypeTag, Cont} = 
-	case D#type.def of
-	    {'SET OF',_Cont} -> {'SET OF','SET',_Cont};
-	    {'SEQUENCE OF',_Cont} -> {'SEQUENCE OF','SEQUENCE',_Cont}
-	end,
-    TypeNameSuffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,Cont#type.def),
-    
-    emit({"   %%-------------------------------------------------",nl}),
-    emit({"   %% decode tag and length ",nl}),
-    emit({"   %%-------------------------------------------------",nl}),
-    
-    asn1ct_name:new(rb),
-    MyTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- D#type.tag]
-	++ 
-	[#tag{class = asn1ct_gen_ber:decode_class('UNIVERSAL'),
-	      number = asn1ct_gen_ber:decode_type(TypeTag),
-	      form = ?CONSTRUCTED,
-	      type = 'IMPLICIT'}],
-    emit(["   {{_,Len},",{next,bytes},",",{curr,rb},
-	  "} = ?RT_BER:check_tags(TagIn ++ ",{asis,MyTag},", ",
-	  {curr,bytes},", OptOrMand), ",nl]),
-
-    emit(["   ?RT_BER:decode_components(",{curr,rb}]),
-    InnerType = asn1ct_gen:get_inner(Cont#type.def),
-    ContName = case asn1ct_gen:type(InnerType) of
-		   Atom when atom(Atom) -> Atom;
-		   _ -> TypeNameSuffix
-	       end,
-    emit([", Len, ",{next,bytes},", "]),
-%    NewCont = 
-%	case Cont#type.def of
-%	    {'ENUMERATED',_,Components}-> 
-%		Cont#type{def={'ENUMERATED',Components}};
-%	    _ -> Cont
-%	end,
-     ObjFun =
-	case D#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		", ObjFun";
-	    _ ->
-		[]
-	end,
-    gen_dec_line_sof(Erules,Typename,ContName,Cont,ObjFun),
-    emit([", []).",nl,nl,nl]).
-    
-
-gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont) 
-  when record(Cont,type)->
-
-    {Objfun,ObjFun_novar,EncObj} = 
-	case Cont#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		{", ObjFun",", _",{no_attr,"ObjFun"}};
-	    _ ->
-		{"","",false}
-	end,
-    emit(["'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'([]",ObjFun_novar,", AccBytes, AccLen) -> ",nl]),
-
-    case catch lists:member(der,get(encoding_options)) of
-	true ->
-	    emit([indent(3),
-		  "{?RT_BER:dynamicsort_SETOF(AccBytes),AccLen};",nl,nl]);
-	_ ->
-	    emit([indent(3),"{lists:reverse(AccBytes),AccLen};",nl,nl])
-    end,
-    emit(["'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'([H|T]",Objfun,",AccBytes, AccLen) ->",nl]),
-    TypeNameSuffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,Cont#type.def),
-    gen_enc_line(Erules,Typename,TypeNameSuffix,Cont,"H",3,
-		 mandatory,"{EncBytes,EncLen} = ",EncObj),
-    emit([",",nl]),
-    emit([indent(3),"'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'(T",Objfun,","]), 
-    emit(["[EncBytes|AccBytes], AccLen + EncLen).",nl,nl]).
-
-%%============================================================================
-%%  Encode/decode CHOICE
-%%
-%%============================================================================
-
-gen_encode_choice(Erules,Typename,D) when record(D,type) ->
-    ChoiceTag = D#type.tag,
-    {'CHOICE',CompList} = D#type.def,
-    Ext = extensible(CompList),
-    CompList1 = case CompList of
-		    {Rl,El} -> Rl ++ El;
-		    _ -> CompList
-		end,
-    gen_enc_choice(Erules,Typename,ChoiceTag,CompList1,Ext),
-    emit({nl,nl}).
-
-gen_decode_choice(Erules,Typename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(bytes),
-    ChoiceTag = D#type.tag,
-    {'CHOICE',CompList} = D#type.def,
-    Ext = extensible(CompList),
-    CompList1 = case CompList of
-		    {Rl,El} -> Rl ++ El;
-		    _ -> CompList
-		end,
-    gen_dec_choice(Erules,Typename,ChoiceTag,CompList1,Ext),
-    emit({".",nl}).
-
-
-%%============================================================================
-%%  Encode SEQUENCE
-%%
-%%============================================================================
-
-gen_enc_sequence_call(Erules,TopType,[#'ComponentType'{name=Cname,typespec=Type,prop=Prop}|Rest],Pos,Ext,EncObj) ->
-    asn1ct_name:new(encBytes),
-    asn1ct_name:new(encLen),
-    Element = 
-	case TopType of
-	    ['EXTERNAL'] ->
-		io_lib:format("?RT_BER:cindex(~w,NewVal,~w)",[Pos+1,Cname]);
-	    _ ->
-		io_lib:format("?RT_BER:cindex(~w,Val,~w)",[Pos+1,Cname])
-	end,
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    print_attribute_comment(InnerType,Pos,Prop),
-    gen_enc_line(Erules,TopType,Cname,Type,Element,3,Prop,EncObj),
-    case Rest of
-	[] ->
-	    emit({com,nl});
-	_ ->
-	    emit({com,nl}),
-	    gen_enc_sequence_call(Erules,TopType,Rest,Pos+1,Ext,EncObj)
-    end;
-
-gen_enc_sequence_call(_Erules,_TopType,[],_Num,_,_) ->
-	true.
-
-%%============================================================================
-%%  Decode SEQUENCE
-%%
-%%============================================================================
-
-gen_dec_sequence_call(Erules,TopType,CompList,Ext,DecObjInf) ->
-    gen_dec_sequence_call1(Erules,TopType, CompList, 1, Ext,DecObjInf,[],[]).
-
-
-gen_dec_sequence_call1(Erules,TopType,[#'ComponentType'{name=Cname,typespec=Type,prop=Prop,tags=Tags}|Rest],Num,Ext,DecObjInf,LeadingAttrAcc,ArgsAcc) ->
-    {LA,PostponedDec} = 
-	gen_dec_component(Erules,TopType,Cname,Tags,Type,Num,Prop,
-			  Ext,DecObjInf),
-    case Rest of
-	[] ->
-	    {LA ++ LeadingAttrAcc,PostponedDec ++ ArgsAcc};
-	_ ->
-	    emit({com,nl}),
-%	    asn1ct_name:new(term),
-	    asn1ct_name:new(bytes),
-	    gen_dec_sequence_call1(Erules,TopType,Rest,Num+1,Ext,DecObjInf,
-				   LA++LeadingAttrAcc,PostponedDec++ArgsAcc)
-    end;
-
-gen_dec_sequence_call1(_Erules,_TopType,[],1,_,_,_,_) ->
-    no_terms.
-%%gen_dec_sequence_call1(Erules,_TopType,[],Num,_) ->
-%%    true.
-
-
-
-%%----------------------------
-%%SEQUENCE mandatory
-%%----------------------------
-
-gen_dec_component(Erules,TopType,Cname,CTags,Type,Pos,Prop,Ext,DecObjInf) ->
-    InnerType = 
-	case Type#type.def of
-	    #'ObjectClassFieldType'{type=OCFTType} -> OCFTType;
-	    _ -> asn1ct_gen:get_inner(Type#type.def)
-	end,
-% 	case asn1ct_gen:get_constraint(Type#type.constraint,
-% 				       tableconstraint_info) of
-% 	    no ->
-% 		asn1ct_gen:get_inner(Type#type.def);
-% 	    _ ->
-% 		Type#type.def
-% 	end,
-    Prop1 = case {Prop,Ext} of
-		{mandatory,{ext,Epos,_}} when Pos >= Epos ->
-		    'OPTIONAL';
-		_ ->
-		    Prop
-	    end,
-    print_attribute_comment(InnerType,Pos,Prop1),
-    emit("   "),
-    
-    case {InnerType,DecObjInf} of
-	{{typefield,_},NotFalse} when NotFalse /= false ->
-	    asn1ct_name:new(term),
-	    asn1ct_name:new(tmpterm),
-	    emit({"{",{curr,tmpterm},", ",{next,bytes},",",{next,rb},"} = "});
-	{{objectfield,_,_},_} ->
-	    asn1ct_name:new(term),
-	    asn1ct_name:new(tmpterm),
-	    emit({"{",{curr,tmpterm},", ",{next,bytes},",",{next,rb},"} = "});
-	_ ->
-	    asn1ct_name:new(term),
-	    emit({"{",{curr,term},",",{next,bytes},",",{next,rb},"} = "})
-    end,
-    asn1ct_name:new(rb),
-    PostponedDec = 
-	gen_dec_line(Erules,TopType,Cname,CTags,Type,Prop1,DecObjInf),
-    asn1ct_name:new(form),
-    PostponedDec.
-
-
-%%-------------------------------------
-%%  Decode SET
-%%-------------------------------------
-
-gen_dec_set(Erules,TopType,CompList,Pos,_Ext) ->
-    TagList = get_all_choice_tags(CompList),
-    emit({indent(3),
-	  {curr,tagList}," = ",{asis,TagList},",",nl}),
-    emit({indent(3),
-	  "case ?RT_BER:check_if_valid_tag(Bytes, ",
-	  {curr,tagList},", OptOrMand) of",nl}),
-    asn1ct_name:new(tagList),
-    asn1ct_name:new(rbCho),
-    asn1ct_name:new(choTags),
-    gen_dec_set_cases(Erules,TopType,CompList,TagList,Pos),
-    asn1ct_name:new(tag),
-    asn1ct_name:new(bytes).
-
-
-
-gen_dec_set_cases(_,_,[],_,_) ->
-    ok;
-gen_dec_set_cases(Erules,TopType,[H|T],List,Pos) ->
-    case H of
-	{'EXTENSIONMARK', _, _} ->
-	    gen_dec_set_cases(Erules,TopType,T,List,Pos);
-	_ ->
-	    Name = H#'ComponentType'.name,
-	    Type = H#'ComponentType'.typespec,
-
-	    emit({indent(6),"'",Name,"' ->",nl}),
-	    case Type#type.def of
-		{'CHOICE',_NewCompList} -> 
-		    gen_dec_set_cases_choice(Erules,TopType,H,Pos);
-		_ ->
-		    gen_dec_set_cases_type(Erules,TopType,H,Pos)
-	    end,
-	    gen_dec_set_cases(Erules,TopType,T,List,Pos+1)
-    end.
-
-
-
-
-gen_dec_set_cases_choice(_Erules,TopType,H,Pos) ->
-    Cname = H#'ComponentType'.name,
-    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
-	   || X <- (H#'ComponentType'.typespec)#type.tag],
-    asn1ct_name:new(rbCho),
-    emit({indent(9),"{Dec, Rest, ",{curr,rbCho},"} = "}),
-    emit({"'dec_",asn1ct_gen:list2name([Cname|TopType]),
-	  "'(Bytes,OptOrMand,",{asis,Tag},"),",nl}),
-    emit(["      {{",Pos,",Dec}, Rest, ",{curr,rbCho},"}"]),
-    emit([";",nl,nl]).
-
-
-gen_dec_set_cases_type(Erules,TopType,H,Pos) ->
-    Cname = H#'ComponentType'.name,
-    Type = H#'ComponentType'.typespec,
-    %% always use Prop = mandatory here    Prop = H#'ComponentType'.prop,
-
-    asn1ct_name:new(rbCho),
-    emit({indent(9),"{Dec, Rest, ",{curr,rbCho},"} = "}),
-    asn1ct_name:delete(bytes),
-    %% we have already seen the tag so now we must find the value 
-    %% that why we always use 'mandatory' here
-    gen_dec_line(Erules,TopType,Cname,[],Type,mandatory,decObjInf), 
-    asn1ct_name:new(bytes),
-    
-    emit([",",nl]),
-    emit(["{{",Pos,",Dec}, Rest, ",{curr,rbCho},"}"]),
-    emit([";",nl,nl]).
-
-
-%%---------------------------------
-%%  Decode SET result
-%%---------------------------------
-
-gen_dec_set_result(Erules,TopType,{CompList,_ExtList}) ->
-    gen_dec_set_result1(Erules,TopType, CompList, 1);
-gen_dec_set_result(Erules,TopType,CompList) ->
-    gen_dec_set_result1(Erules,TopType, CompList, 1).
-
-gen_dec_set_result1(Erules,TopType,
-		   [#'ComponentType'{name=Cname,
-				     typespec=Type,
-				     prop=Prop}|Rest],Num) ->
-    gen_dec_set_component(Erules,TopType,Cname,Type,Num,Prop),
-    case Rest of
-	[] ->
-	    true;
-	_ ->
-	    gen_dec_set_result1(Erules,TopType,Rest,Num+1)
-    end;
-
-gen_dec_set_result1(_Erules,_TopType,[],1) ->
-    no_terms;
-gen_dec_set_result1(_Erules,_TopType,[],_Num) ->
-    true.
-
-
-gen_dec_set_component(_Erules,_TopType,_Cname,Type,Pos,Prop) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    print_attribute_comment(InnerType,Pos,Prop),
-    emit({"   {",{next,term},com,{next,termList},"} =",nl}),
-    emit({"      case ",{curr,termList}," of",nl}),
-    emit({"          [{",Pos,com,{curr,termTmp},"}|",
-	  {curr,rest},"] -> "}),
-    emit({"{",{curr,termTmp},com,
-	  {curr,rest},"};",nl}),
-    case Prop of
-	'OPTIONAL' ->
-	    emit([indent(10),"_ -> {asn1_NOVALUE, ",{curr,termList},"}",nl]);
-	{'DEFAULT', DefVal} ->
-	    emit([indent(10),
-		  "_ -> {",{asis,DefVal},", ",{curr,termList},"}",nl]);
-	mandatory ->
-	    emit([indent(10),
-		  "_ -> exit({error,{asn1,{mandatory_attribute_no, ",
-		  Pos,", missing}}})",nl])
-    end,
-    emit([indent(6),"end,",nl]),
-    asn1ct_name:new(rest),
-    asn1ct_name:new(term),
-    asn1ct_name:new(termList),    
-    asn1ct_name:new(termTmp).    
-    
-
-%%---------------------------------------------
-%%  Encode CHOICE
-%%---------------------------------------------
-%% for BER we currently do care (a little) if the choice has an EXTENSIONMARKER
-
-
-gen_enc_choice(Erules,TopType,Tag,CompList,_Ext) ->
-    gen_enc_choice1(Erules,TopType,Tag,CompList,_Ext).
-
-gen_enc_choice1(Erules,TopType,Tag,CompList,_Ext) ->
-    asn1ct_name:clear(),
-    emit({"   {EncBytes,EncLen} = case element(1,Val) of",nl}),
-    gen_enc_choice2(Erules,TopType,CompList),
-    emit([nl,"   end,",nl,nl]),
-    NewTag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- Tag],
-%    gen_encode_tags(Erules,NewTag,"EncLen","EncBytes").
-   emit(["?RT_BER:encode_tags(TagIn ++",{asis,NewTag},", EncBytes, EncLen).",nl]).
-
-
-
-gen_enc_choice2(Erules,TopType,[H1|T]) when record(H1,'ComponentType') ->
-    Cname = H1#'ComponentType'.name,
-    Type = H1#'ComponentType'.typespec,
-    emit({"      ",{asis,Cname}," ->",nl}),
-    {Encobj,Assign} =
-% 	case asn1ct_gen:get_constraint(Type#type.constraint,
-% 				       tableconstraint_info) of
-	case {Type#type.def,asn1ct_gen:get_constraint(Type#type.constraint,
-						      componentrelation)} of
-	    {#'ObjectClassFieldType'{},{componentrelation,_,_}} ->
-		asn1ct_name:new(tmpBytes),
-		asn1ct_name:new(encBytes),
-		asn1ct_name:new(encLen),
-		Emit = ["{",{curr,tmpBytes},", _} = "],
-		{{no_attr,"ObjFun"},Emit};
-	    _ ->
-		{false,[]}
-	end,
-    gen_enc_line(Erules,TopType,Cname,Type,"element(2,Val)",9,
-		 mandatory,Assign,Encobj),
-    case Encobj of
-	false -> ok;
-	_ ->
-	    emit({",",nl,indent(9),"{",{curr,encBytes},", ",
-		  {curr,encLen},"}"})
-    end,
-    emit({";",nl}),
-    case T of 
-	[] ->
-	    emit([indent(6), "Else -> ",nl,
-		  indent(9),"exit({error,{asn1,{invalid_choice_type,Else}}})"]);
-	_ ->
-	    true
-    end,
-    gen_enc_choice2(Erules,TopType,T);
-
-gen_enc_choice2(_,_,[])  ->
-    true.
-
-
-
-
-%%--------------------------------------------
-%%  Decode CHOICE
-%%--------------------------------------------
-
-gen_dec_choice(Erules,TopType, ChTag, CompList, Ext) ->
-    asn1ct_name:delete(bytes),
-    Tags = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}|| X <- ChTag],
-    
-    emit(["   {{_,Len},",{next,bytes},
-	  ", RbExp} = ?RT_BER:check_tags(TagIn++",
-	  {asis,Tags},", ",
-	  {curr,bytes},", OptOrMand),",nl]),
-    asn1ct_name:new(bytes),
-    asn1ct_name:new(len),
-    gen_dec_choice_indef_funs(Erules),
-    case Erules of
-	ber_bin ->
-	    emit([indent(3),"case ",{curr,bytes}," of",nl]);
-	ber ->
-	    emit([indent(3),
-		  "case (catch ?RT_BER:peek_tag(",{curr,bytes},")) of",nl])
-    end,
-    asn1ct_name:new(tagList),
-    asn1ct_name:new(choTags),
-    gen_dec_choice_cases(Erules,TopType,CompList),
-    case Ext of
-	noext ->
-	    emit([indent(6), {curr,else}," -> ",nl]),
-	    emit([indent(9),"case OptOrMand of",nl,
-		  indent(12),"mandatory ->","exit({error,{asn1,",
-		  "{invalid_choice_tag,",{curr,else},"}}});",nl,
-		  indent(12),"_ ->","exit({error,{asn1,{no_optional_tag,",
-		  {curr,else},"}}})",nl,
-		  indent(9),"end",nl]);
-	_ ->
-	    emit([indent(6),"_ -> ",nl]),
-	    emit([indent(9),"{{asn1_ExtAlt,",{curr,bytes},"},",
-		  empty_lb(Erules),", RbExp}",nl])
-    end,
-    emit([indent(3),"end"]),
-    asn1ct_name:new(tag),
-    asn1ct_name:new(else).
-
-gen_dec_choice_indef_funs(Erules) ->
-    emit({indent(3),"IndefEndBytes = fun(indefinite,",indefend_match(Erules,used_var),
-	  ")-> R; (_,B)-> B end,",nl}),
-    emit({indent(3),"IndefEndRb = fun(indefinite,",indefend_match(Erules,unused_var),
-	  ")-> 2; (_,_)-> 0 end,",nl}).
-
-
-gen_dec_choice_cases(_,_, []) ->
-    ok;
-gen_dec_choice_cases(Erules,TopType, [H|T]) ->
-    asn1ct_name:push(rbCho),
-    Name = H#'ComponentType'.name,
-    emit([nl,"%% '",Name,"'",nl]),
-    Fcases  = fun([T1,T2|Tail],Fun) ->		      
-		      emit([indent(6),match_tag(Erules,T1)," ->",nl]),
-		      gen_dec_choice_cases_type(Erules,TopType, H),
-		      Fun([T2|Tail],Fun);
-		 ([T1],_) ->
-		      emit([indent(6),match_tag(Erules,T1)," ->",nl]),
-		      gen_dec_choice_cases_type(Erules,TopType, H)
-	      end,
-    Fcases(H#'ComponentType'.tags,Fcases),
-    asn1ct_name:pop(rbCho),
-    gen_dec_choice_cases(Erules,TopType, T).
-
-
-
-gen_dec_choice_cases_type(Erules,TopType,H) ->
-    Cname = H#'ComponentType'.name,
-    Type = H#'ComponentType'.typespec,
-    Prop = H#'ComponentType'.prop,
-    emit({indent(9),"{Dec, Rest, ",{curr,rbCho},"} = "}),
-    gen_dec_line(Erules,TopType,Cname,[],Type,Prop,false),
-    emit([",",nl,indent(9),"{{",{asis,Cname},
-	  ", Dec}, IndefEndBytes(Len,Rest), RbExp + ",
-	  {curr,rbCho}," + IndefEndRb(Len,Rest)};",nl,nl]).
-
-encode_tag_val(Erules,{Class,TagNo}) when integer(TagNo) ->
-    Rtmod = rtmod(Erules),
-    Rtmod:encode_tag_val({asn1ct_gen_ber:decode_class(Class),
-				  0,TagNo});
-encode_tag_val(Erules,{Class,TypeName}) ->
-    Rtmod = rtmod(Erules),
-    Rtmod:encode_tag_val({asn1ct_gen_ber:decode_class(Class),
-				  0,asn1ct_gen_ber:decode_type(TypeName)}).
-
-
-match_tag(ber_bin,Arg) ->
-    match_tag_with_bitsyntax(Arg);
-match_tag(Erules,Arg) ->
-    io_lib:format("~p",[encode_tag_val(Erules,Arg)]).
-
-match_tag_with_bitsyntax({Class,TagNo}) when integer(TagNo) ->
-    match_tag_with_bitsyntax1({asn1ct_gen_ber:decode_class(Class),
-				  0,TagNo});
-match_tag_with_bitsyntax({Class,TypeName}) ->
-    match_tag_with_bitsyntax1({asn1ct_gen_ber:decode_class(Class),
-				  0,asn1ct_gen_ber:decode_type(TypeName)}).
-
-match_tag_with_bitsyntax1({Class, _Form, TagNo}) when (TagNo =< 30) -> 
-    io_lib:format("<<~p:2,_:1,~p:5,_/binary>>",[Class bsr 6,TagNo]);
-
-match_tag_with_bitsyntax1({Class, _Form, TagNo}) -> 
-    {Octets,Len} = mk_object_val(TagNo),
-    OctForm = case Len of
-		 1 -> "~p";
-		 2 -> "~p,~p";
-		 3 -> "~p,~p,~p";
-		 4 -> "~p,~p,~p,~p"
-	     end,
-    io_lib:format("<<~p:2,_:1,31:5," ++ OctForm ++ ",_/binary>>",
-		  [Class bsr 6] ++ Octets). 
-
-%%%%%%%%%%% 
-%% mk_object_val(Value) -> {OctetList, Len} 
-%% returns a Val as a list of octets, the 8 bit is allways set to one except 
-%% for the last octet, where its 0 
-%% 
-
- 
-mk_object_val(Val) when Val =< 127 -> 
-    {[255 band Val], 1}; 
-mk_object_val(Val) -> 
-    mk_object_val(Val bsr 7, [Val band 127], 1).  
-mk_object_val(0, Ack, Len) -> 
-    {Ack, Len}; 
-mk_object_val(Val, Ack, Len) -> 
-    mk_object_val(Val bsr 7, [((Val band 127) bor 128) | Ack], Len + 1). 
- 
- 
-get_all_choice_tags(ComponentTypeList) ->
-    get_all_choice_tags(ComponentTypeList,[]).
-
-get_all_choice_tags([],TagList) ->
-    TagList;
-get_all_choice_tags([H|T],TagList)  ->
-    Tags = H#'ComponentType'.tags,
-    get_all_choice_tags(T, TagList ++ [{H#'ComponentType'.name, Tags}]).
-
-
-
-%%---------------------------------------
-%% Generate the encode/decode code 
-%%---------------------------------------
-
-gen_enc_line(Erules,TopType,Cname,
-	     Type=#type{constraint=[{componentrelation,_,_}],
-			def=#'ObjectClassFieldType'{type={typefield,_}}},
-	     Element,Indent,OptOrMand=mandatory,EncObj) 
-  when list(Element) ->
-    asn1ct_name:new(tmpBytes),
-    gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,
-		 ["{",{curr,tmpBytes},",_} = "],EncObj);
-gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,EncObj) 
-  when list(Element) ->
-    gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,
-		 ["{",{curr,encBytes},",",{curr,encLen},"} = "],EncObj).
-
-gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,Assign,EncObj)
-  when list(Element) ->
-    IndDeep = indent(Indent),
-
-    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
-	   || X <- Type#type.tag],
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    WhatKind = asn1ct_gen:type(InnerType),
-    emit(IndDeep),
-    emit(Assign),
-    gen_optormand_case(OptOrMand,Erules,TopType,Cname,Type,InnerType,WhatKind,
-		       Element),
-    case {Type,asn1ct_gen:get_constraint(Type#type.constraint,
-					 componentrelation)} of
-% 	#type{constraint=[{tableconstraint_info,RefedFieldName}],
-% 	      def={typefield,_}} ->
-	{#type{def=#'ObjectClassFieldType'{type={typefield,_},
-					   fieldname=RefedFieldName}},
-	 {componentrelation,_,_}} ->
-	    {_LeadingAttrName,Fun} = EncObj,
-	    case RefedFieldName of
-		{notype,T} ->
-		    throw({error,{notype,type_from_object,T}});
-		{Name,RestFieldNames} when atom(Name) ->
-		    case OptOrMand of
-			mandatory -> ok;
-			_ ->
-%			    emit(["{",{curr,tmpBytes},",",{curr,tmpLen},
-			    emit(["{",{curr,tmpBytes},", _} = "])
-%%			    asn1ct_name:new(tmpBytes),
-%%			    asn1ct_name:new(tmpLen)
-		    end,
-		    emit({Fun,"(",{asis,Name},", ",Element,", [], ",
-			  {asis,RestFieldNames},"),",nl}),
-		    emit(IndDeep),
-		    case OptOrMand of
-			mandatory ->
-			    emit({"{",{curr,encBytes},", ",{curr,encLen},"} = "}),
-			    emit({"?RT_BER:encode_open_type(",{curr,tmpBytes},
-				  ",",{asis,Tag},")"});
-			_ ->
-%			    emit({"{",{next,tmpBytes},", _} = "}),
-			    emit({"{",{next,tmpBytes},", ",{curr,tmpLen},
-				  "} = "}),
-			    emit({"?RT_BER:encode_open_type(",{curr,tmpBytes},
-				  ",",{asis,Tag},"),",nl}),
-			    emit(IndDeep),
-			    emit({"{",{next,tmpBytes},", ",{curr,tmpLen},"}"})
-		    end;
-		_ ->
-		    throw({asn1,{'internal error'}})
-	    end;
-% 	#type{constraint=[{tableconstraint_info,_}],
-% 	      def={objectfield,PrimFieldName1,PFNList}} ->
-	{{#'ObjectClassFieldType'{type={objectfield,PrimFieldName1,
-					PFNList}},_},
-	 {componentrelation,_,_}} ->
-	    %% this is when the dotted list in the FieldName has more
-	    %% than one element
-	    {_LeadingAttrName,Fun} = EncObj,
-	    emit({"?RT_BER:encode_open_type(",Fun,"(",{asis,PrimFieldName1},
-		  ", ",Element,", ",{asis,PFNList},"),",{asis,Tag},")"});
-	_ ->
-	    case WhatKind of
-		{primitive,bif} ->
-		    EncType =
-			case Type#type.def of
-			    #'ObjectClassFieldType'{
-					     type={fixedtypevaluefield,
-						   _,Btype}} ->
-				Btype;
-			    _ ->
-				Type
-			end,
-		    asn1ct_gen_ber:gen_encode_prim(ber,EncType,{asis,Tag},
-						   Element);
-		{notype,_} ->
-		    emit({"'enc_",InnerType,"'(",Element,", ",{asis,Tag},")"});
-		'ASN1_OPEN_TYPE' ->
-		    asn1ct_gen_ber:gen_encode_prim(ber,Type#type{def='ASN1_OPEN_TYPE'},{asis,Tag},Element);
-		_ ->
-		    {EncFunName, _, _} = 
-			mkfuncname(TopType,Cname,WhatKind,enc),
-		    case {WhatKind,Type#type.tablecinf,EncObj} of
-			{{constructed,bif},[{objfun,_}|_R],{_,Fun}} ->
-			    emit([EncFunName,"(",Element,", ",{asis,Tag},
-				  ", ",Fun,")"]);
-			_ ->
-			    emit([EncFunName,"(",Element,", ",{asis,Tag},")"])
-		    end
-	    end
-    end,
-    case OptOrMand of
-	mandatory -> true;
-	_ ->
-	    emit({nl,indent(7),"end"})
-    end.
-
-
-
-gen_optormand_case(mandatory,_,_,_,_,_,_, _) ->
-    ok;
-gen_optormand_case('OPTIONAL',Erules,_,_,_,_,_,Element) ->
-    emit({" case ",Element," of",nl}),
-    emit({indent(9),"asn1_NOVALUE -> {",
-	  empty_lb(Erules),",0};",nl}),
-    emit({indent(9),"_ ->",nl,indent(12)});
-gen_optormand_case({'DEFAULT',DefaultValue},Erules,TopType,Cname,Type,
-		   InnerType,WhatKind,Element) ->
-    CurrMod = get(currmod),
-    case catch lists:member(der,get(encoding_options)) of
-	true ->
-	    emit(" case catch "),
-	    asn1ct_gen:gen_check_call(TopType,Cname,Type,InnerType,
-				      WhatKind,{asis,DefaultValue},
-				      Element),
-	    emit({" of",nl}),
-	    emit({indent(12),"true -> {[],0};",nl});
-	_ ->
-	    emit({" case ",Element," of",nl}),
-	    emit({indent(9),"asn1_DEFAULT -> {",
-		  empty_lb(Erules),
-		  ",0};",nl}),
-	    case DefaultValue of 
-		#'Externalvaluereference'{module=CurrMod,
-					  value=V} ->
-		    emit({indent(9),"?",{asis,V}," -> {",
-			  empty_lb(Erules),",0};",nl});
-		_ ->
-		    emit({indent(9),{asis,
-				     DefaultValue}," -> {",
-			  empty_lb(Erules),",0};",nl})
-	    end
-    end,
-    emit({indent(9),"_ ->",nl,indent(12)}).
-
-    
-
-
-gen_dec_line_sof(_Erules,TopType,Cname,Type,ObjFun) ->
-
-    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
-	   || X <- Type#type.tag],    
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    WhatKind = asn1ct_gen:type(InnerType),
-    case WhatKind of
-	{primitive,bif} ->
-	    asn1ct_name:delete(len),
-
-	    asn1ct_name:new(len),
-	    emit(["fun(FBytes,_,_)->",nl]),
-	    EncType = case Type#type.def of
-			    #'ObjectClassFieldType'{
-					     type={fixedtypevaluefield,
-						   _,Btype}} ->
-				Btype;
-			    _ ->
-				Type
-		      end,
-	    asn1ct_gen_ber:gen_dec_prim(ber,EncType,"FBytes",Tag,
-					[],no_length,?PRIMITIVE,
-					mandatory),
-	    emit([nl,"end, []"]);
-	_ ->
-	    case ObjFun of
-		[] ->
-		    {DecFunName, _, _} = 
-			mkfunname(TopType,Cname,WhatKind,dec,3),
-		    emit([DecFunName,", ",{asis,Tag}]);
-		_ ->
-		    {DecFunName, _, _} = 
-			mkfunname(TopType,Cname,WhatKind,dec,4),
-		    emit([DecFunName,", ",{asis,Tag},", ObjFun"])
-	    end
-    end.
-    
-
-gen_dec_line(Erules,TopType,Cname,CTags,Type,OptOrMand,DecObjInf)  ->
-    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
-    Tag = [X#tag{class=asn1ct_gen_ber:decode_class(X#tag.class)}
-	   || X <- Type#type.tag],
-    InnerType = 
-	case Type#type.def of
-	    #'ObjectClassFieldType'{type=OCFTType} ->
-		OCFTType;
-	    _ ->
-		asn1ct_gen:get_inner(Type#type.def)
-	end,
-    PostpDec = 
-	case OptOrMand of
-	    mandatory ->
-		gen_dec_call(InnerType,Erules,TopType,Cname,Type,
-			     BytesVar,Tag,mandatory,", mandatory, ",
-			     DecObjInf,OptOrMand);
-	    _ -> %optional or default
-		case {CTags,Erules} of
-		    {[CTag],ber_bin} ->
-			emit(["case ",{curr,bytes}," of",nl]),
-			emit([match_tag(Erules,CTag)," ->",nl]),
-			PostponedDec = 
-			    gen_dec_call(InnerType,Erules,TopType,Cname,Type,
-					 BytesVar,Tag,mandatory,
-					 ", opt_or_default, ",DecObjInf,
-					 OptOrMand),
-			emit([";",nl]),
-			emit(["_ ->",nl]),
-			case OptOrMand of
-			    {'DEFAULT', Def} ->
-				emit(["{",{asis,Def},",",
-				      BytesVar,", 0 }",nl]);
-			    'OPTIONAL' ->
-				emit(["{ asn1_NOVALUE, ",
-				      BytesVar,", 0 }",nl])
-			end,
-			emit("end"),
-			PostponedDec;
-		    _ ->
-			emit("case (catch "),
-			PostponedDec = 
-			    gen_dec_call(InnerType,Erules,TopType,Cname,Type,
-					 BytesVar,Tag,OptOrMand,
-					 ", opt_or_default, ",DecObjInf,
-					 OptOrMand),
-			emit([") of",nl]),
-			case OptOrMand of
-			    {'DEFAULT', Def} ->
-				emit(["{'EXIT',{error,{asn1,{no_optional_tag,_}}}}",
-				      " -> {",{asis,Def},",",
-				      BytesVar,", 0 };",nl]);
-			    'OPTIONAL' ->
-				emit(["{'EXIT',{error,{asn1,{no_optional_tag,_}}}}",
-				      " -> { asn1_NOVALUE, ",
-				      BytesVar,", 0 };",nl])
-			end,
-			asn1ct_name:new(casetmp),
-			emit([{curr,casetmp},"-> ",{curr,casetmp},nl,"end"]),
-			PostponedDec
-		end
-	end,
-    case DecObjInf of
-	{Cname,ObjSet} -> % this must be the component were an object is 
-	    %% choosen from the object set according to the table 
-	    %% constraint.
-	    {[{ObjSet,Cname,asn1ct_gen:mk_var(asn1ct_name:curr(term))}],
-	     PostpDec};
-	_  -> {[],PostpDec}
-    end.
-
-
-gen_dec_call({typefield,_},Erules,_,_,Type,_,Tag,_,_,false,_) ->
-    %%  this in case of a choice with typefield components
-    asn1ct_name:new(reason),
-    {FirstPFName,RestPFName} = 
-% 	asn1ct_gen:get_constraint(Type#type.constraint,
-% 				  tableconstraint_info),
-	(Type#type.def)#'ObjectClassFieldType'.fieldname,
-    emit([nl,indent(6),"begin",nl]),
-    emit([indent(9),"{OpenDec,TmpRest,TmpRbCho} =",nl,indent(12),
-	  "?RT_BER:decode_open_type(",Erules,",",{curr,bytes},",",
-	  {asis,Tag},"),",nl]),
-    emit([indent(9),"case (catch ObjFun(",{asis,FirstPFName},
-	  ", OpenDec, [], ",{asis,RestPFName},
-	  ")) of", nl]),%% ??? What about Tag 
-    emit([indent(12),"{'EXIT',",{curr,reason},"} ->",nl]),
-%%    emit({indent(15),"throw({runtime_error,{'Type not ",
-%%	  "compatible with tableconstraint', OpenDec}});",nl}),
-    emit([indent(15),"exit({'Type not ",
-	  "compatible with table constraint', ",{curr,reason},"});",nl]),
-    emit([indent(12),"{TmpDec,_ ,_} ->",nl]),
-    emit([indent(15),"{TmpDec, TmpRest, TmpRbCho}",nl]),
-    emit([indent(9),"end",nl,indent(6),"end",nl]),
-    [];
-gen_dec_call({typefield,_},_Erules,_,Cname,Type,_BytesVar,Tag,_,_,
-	     _DecObjInf,OptOrMandComp) ->
-    emit(["?RT_BER:decode_open_type(",{curr,bytes},",",{asis,Tag},")"]),
-    RefedFieldName = 
-	(Type#type.def)#'ObjectClassFieldType'.fieldname,
-% 	asn1ct_gen:get_constraint(Type#type.constraint,
-% 				  tableconstraint_info),
-    [{Cname,RefedFieldName,
-      asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-%      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),[],OptOrMandComp}];
-      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
-gen_dec_call({objectfield,PrimFieldName,PFNList},_Erules,_,Cname,_,_,Tag,_,_,_,
-	     OptOrMandComp) ->
-    emit(["?RT_BER:decode_open_type(",{curr,bytes},",",{asis,Tag},")"]),
-    [{Cname,{PrimFieldName,PFNList},
-      asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-%      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),[],OptOrMandComp}];
-      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
-gen_dec_call(InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,PrimOptOrMand,
-	     OptOrMand,DecObjInf,_) ->
-    WhatKind = asn1ct_gen:type(InnerType),
-    gen_dec_call1(WhatKind,InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,
-		  PrimOptOrMand,OptOrMand),
-    case DecObjInf of
-	{Cname,{_,OSet,UniqueFName,ValIndex}} ->
-	    Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-	    ValueMatch = value_match(ValIndex,Term),
-	    emit({",",nl,"ObjFun = 'getdec_",OSet,"'(",
-%		  {asis,UniqueFName},", ",{curr,term},")"});
-		  {asis,UniqueFName},", ",ValueMatch,")"});
-	_ ->
-	    ok
-    end,
-    [].
-gen_dec_call1({primitive,bif},InnerType,Erules,_,_,Type,BytesVar,
-	      Tag,OptOrMand,_) ->
-    case InnerType of
-	{fixedtypevaluefield,_,Btype} ->
-	    asn1ct_gen_ber:gen_dec_prim(Erules,Btype,BytesVar,Tag,[],no_length,
-					?PRIMITIVE,OptOrMand);
-	_ ->
-	    asn1ct_gen_ber:gen_dec_prim(Erules,Type,BytesVar,Tag,[],no_length,
-					?PRIMITIVE,OptOrMand)
-    end;
-gen_dec_call1('ASN1_OPEN_TYPE',_InnerType,Erules,_,_,Type,BytesVar,
-	      Tag,OptOrMand,_) ->
-    asn1ct_gen_ber:gen_dec_prim(Erules,Type#type{def='ASN1_OPEN_TYPE'},
-				BytesVar,Tag,[],no_length,
-				?PRIMITIVE,OptOrMand);
-gen_dec_call1(WhatKind,_,_Erules,TopType,Cname,Type,_,Tag,_,OptOrMand) ->
-    {DecFunName,_,_} = 
-	mkfuncname(TopType,Cname,WhatKind,dec),
-    case {WhatKind,Type#type.tablecinf} of
-	{{constructed,bif},[{objfun,_}|_R]} ->
-	    emit({DecFunName,"(",{curr,bytes},OptOrMand,{asis,Tag},", ObjFun)"});
-	_ ->
-	    emit({DecFunName,"(",{curr,bytes},OptOrMand,{asis,Tag},")"})
-    end.
-
-
-%%------------------------------------------------------
-%% General and special help functions (not exported)
-%%------------------------------------------------------
-
-
-indent(N) ->
-    lists:duplicate(N,32). % 32 = space
-
-
-mkvlist([H,T1|T], Sep) -> % Sep is a string e.g ", " or "+ "
-    emit([{var,H},Sep]),
-    mkvlist([T1|T], Sep);
-mkvlist([H|T], Sep) ->
-    emit([{var,H}]),
-    mkvlist(T, Sep);
-mkvlist([], _) ->
-    true.
-
-mkvlist(L) ->
-    mkvlist(L,", ").
-
-mkvplus(L) ->
-    mkvlist(L," + ").
-
-extensible(CompList) when list(CompList) ->
-    noext;
-extensible({RootList,ExtList}) ->
-    {ext,length(RootList)+1,length(ExtList)}.
-
-
-print_attribute_comment(InnerType,Pos,Prop) ->
-    CommentLine = "%%-------------------------------------------------",
-    emit([nl,CommentLine]),
-    case InnerType of
-	{typereference,_,Name} -> 
-	    emit([nl,"%% attribute number ",Pos," with type ",Name]);
-	{'Externaltypereference',_,XModule,Name} -> 
-	    emit([nl,"%% attribute number ",Pos,"   External ",XModule,":",Name]);
-	_ ->
-	    emit([nl,"%% attribute number ",Pos," with type ",InnerType])
-    end,
-    case Prop of
-	mandatory ->
-	    continue;
-	{'DEFAULT', Def} ->
-	    emit([" DEFAULT = ",{asis,Def}]);
-	'OPTIONAL' ->
-	    emit([" OPTIONAL"])
-    end,
-    emit([nl,CommentLine,nl]).
-
-
-mkfuncname(TopType,Cname,WhatKind,DecOrEnc) ->
-    CurrMod = get(currmod),
-    case WhatKind of
-	#'Externaltypereference'{module=CurrMod,type=EType} ->
-	    F = lists:concat(["'",DecOrEnc,"_",EType,"'"]),
-	    {F, "?MODULE", F};
-	#'Externaltypereference'{module=Mod,type=EType} ->
-	    {lists:concat(["'",Mod,"':'",DecOrEnc,"_",EType,"'"]),Mod,
-	     lists:concat(["'",DecOrEnc,"_",EType,"'"])};
-	{constructed,bif} ->
-	    F = lists:concat(["'",DecOrEnc,"_",asn1ct_gen:list2name([Cname|TopType]),"'"]),
-	    {F, "?MODULE", F}
-    end.
-
-mkfunname(TopType,Cname,WhatKind,DecOrEnc,Arity) ->
-    CurrMod = get(currmod),
-    case WhatKind of
-	#'Externaltypereference'{module=CurrMod,type=EType} ->
-	    F = lists:concat(["fun '",DecOrEnc,"_",EType,"'/",Arity]),
-	    {F, "?MODULE", F};
-	#'Externaltypereference'{module=Mod,type=EType} ->
-	    {lists:concat(["{'",Mod,"','",DecOrEnc,"_",EType,"'}"]),Mod,
-	     lists:concat(["'",DecOrEnc,"_",EType,"'"])};
-	{constructed,bif} ->
-	    F =
-		lists:concat(["fun '",DecOrEnc,"_",
-			      asn1ct_gen:list2name([Cname|TopType]),"'/",
-			      Arity]),
-	    {F, "?MODULE", F}
-    end.
-
-empty_lb(ber) ->
-    "[]";
-empty_lb(ber_bin) ->
-    "<<>>".
-
-rtmod(ber) ->
-    list_to_atom(?RT_BER);
-rtmod(ber_bin) ->
-    list_to_atom(?RT_BER_BIN).
-
-indefend_match(ber,used_var) ->
-    "[0,0|R]";
-indefend_match(ber,unused_var) ->
-    "[0,0|_R]";
-indefend_match(ber_bin,used_var) ->
-    "<<0,0,R/binary>>";
-indefend_match(ber_bin,unused_var) ->
-    "<<0,0,_R/binary>>".
-
-notice_value_match() ->
-    Module = get(currmod),
-    put(value_match,{true,Module}).
-    
-value_match(Index,Value) when atom(Value) ->
-    value_match(Index,atom_to_list(Value));
-value_match([],Value) ->
-    Value;
-value_match([{VI,_Cname}|VIs],Value) ->
-    value_match1(Value,VIs,lists:concat(["element(",VI,","]),1).
-value_match1(Value,[],Acc,Depth) ->
-    Acc ++ Value ++ lists:concat(lists:duplicate(Depth,")"));
-value_match1(Value,[{VI,_Cname}|VIs],Acc,Depth) ->
-    value_match1(Value,VIs,Acc++lists:concat(["element(",VI,","]),Depth+1).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_constructed_ber_bin_v2.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_constructed_ber_bin_v2.erl
deleted file mode 100644
index 0684ffa084..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_constructed_ber_bin_v2.erl
+++ /dev/null
@@ -1,1357 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_constructed_ber_bin_v2.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
-%%
--module(asn1ct_constructed_ber_bin_v2).
-
--export([gen_encode_sequence/3]).
--export([gen_decode_sequence/3]).
--export([gen_encode_set/3]).
--export([gen_decode_set/3]).
--export([gen_encode_sof/4]).
--export([gen_decode_sof/4]).
--export([gen_encode_choice/3]).
--export([gen_decode_choice/3]).
-
-
--include("asn1_records.hrl").
-
--import(asn1ct_gen, [emit/1,demit/1]).
--import(asn1ct_constructed_ber,[match_tag/2]).
-
--define(ASN1CT_GEN_BER,asn1ct_gen_ber_bin_v2).
-
-% the encoding of class of tag bits 8 and 7
--define(UNIVERSAL,   0).
--define(APPLICATION, 16#40).
--define(CONTEXT,     16#80).
--define(PRIVATE,     16#C0).
-
-% primitive or constructed encoding % bit 6
--define(PRIMITIVE,   0).
--define(CONSTRUCTED, 2#00100000).
-
-
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%%  Encode/decode SEQUENCE (and SET)
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-gen_encode_sequence(Erules,Typename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(term),
-    asn1ct_name:new(bytes),
-    
-    %% if EXTERNAL type the input value must be transformed to 
-    %% ASN1 1990 format
-    ValName = 
-	case Typename of
-	    ['EXTERNAL'] ->
-		emit([indent(4),
-		      "NewVal = asn1rt_check:transform_to_EXTERNAL1990(Val),",
-		      nl]),
-		"NewVal";
-	    _ ->
-	    "Val"
-	end,
-
-    {SeqOrSet,TableConsInfo,CompList} = 
-	case D#type.def of
-	    #'SEQUENCE'{tablecinf=TCI,components=CL} -> 
-		{'SEQUENCE',TCI,CL};
-	    #'SET'{tablecinf=TCI,components=CL} -> 
-		{'SET',TCI,CL}
-	end,
-    Ext = extensible(CompList),
-    CompList1 = case CompList of
-		    {Rl,El} -> Rl ++ El;
-		    _ -> CompList
-		end,
-    
-%% don't match recordname for now, because of compatibility reasons
-%%    emit(["{'",asn1ct_gen:list2rname(Typename),"'"]),
-    emit(["{_"]),
-    case length(CompList1) of
-	0 -> 
-	    true;
-	CompListLen ->
-	    emit([","]),
-	    mkcindexlist([Tc || Tc <- lists:seq(1,CompListLen)])
-    end,
-    emit(["} = ",ValName,",",nl]),
-    EncObj =
-	case TableConsInfo of
-	    #simpletableattributes{usedclassfield=Used,
-				   uniqueclassfield=Unique} when Used /= Unique ->
-		false;
-	    %% ObjectSet, name of the object set in constraints
-	    %% 
-	    #simpletableattributes{objectsetname=ObjectSet,
-				   c_name=AttrN,
-				   c_index=N,
-				   usedclassfield=UniqueFieldName,
-				   uniqueclassfield=UniqueFieldName,
-				   valueindex=ValueIndex} -> %% N is index of attribute that determines constraint
-		OSDef =
-		    case ObjectSet of
-			{Module,OSName} ->
-			    asn1_db:dbget(Module,OSName);
-			OSName ->
-			    asn1_db:dbget(get(currmod),OSName)
-		    end,
-%		io:format("currmod: ~p~nOSName: ~p~nAttrN: ~p~nN: ~p~nUniqueFieldName: ~p~n",
-%			  [get(currmod),OSName,AttrN,N,UniqueFieldName]),
-		case (OSDef#typedef.typespec)#'ObjectSet'.gen of
-		    true ->
-			ObjectEncode = 
-			    asn1ct_gen:un_hyphen_var(lists:concat(['Obj',
-								   AttrN])),
-			emit([ObjectEncode," = ",nl]),
-			emit(["   'getenc_",ObjectSet,"'(",{asis,UniqueFieldName},
-			      ", ",nl]),
-			ValueMatch = value_match(ValueIndex,
-						 lists:concat(["Cindex",N])),
-			emit([indent(35),ValueMatch,"),",nl]),
-			{AttrN,ObjectEncode};
-		    _ ->
-			false
-		end;
-	    _ ->
-		case D#type.tablecinf of
-		    [{objfun,_}|_] ->
-			%% when the simpletableattributes was at an outer
-			%% level and the objfun has been passed through the
-			%% function call
-			{"got objfun through args","ObjFun"};
-		    _ ->
-			false
-		end
-	end,
-
-    gen_enc_sequence_call(Erules,Typename,CompList1,1,Ext,EncObj),
-
-    emit([nl,"   BytesSoFar = "]),
-    case SeqOrSet of
-	'SET' when (D#type.def)#'SET'.sorted == dynamic ->
-	    emit("?RT_BER:dynamicsort_SET_components(["),
-	    mkvlist(asn1ct_name:all(encBytes)),
-	    emit(["]),",nl]);
-	_ ->
-	    emit("["),
-	    mkvlist(asn1ct_name:all(encBytes)),
-	    emit(["],",nl])
-    end,
-    emit("LenSoFar = "),
-    case asn1ct_name:all(encLen) of
-	[] -> emit("0");
-	AllLengths -> 
-	    mkvplus(AllLengths)
-    end,
-    emit([",",nl]),
-    emit(["?RT_BER:encode_tags(TagIn, BytesSoFar, LenSoFar)."
-	  ,nl]).
-
-gen_decode_sequence(Erules,Typename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(tag),
-    #'SEQUENCE'{tablecinf=TableConsInfo,components=CList} = D#type.def,
-    Ext = extensible(CList),
-    CompList = case CList of
-		   {Rl,El}  -> Rl ++ El;
-		   _ -> CList
-	       end,
-
-    emit(["   %%-------------------------------------------------",nl]),
-    emit(["   %% decode tag and length ",nl]),
-    emit(["   %%-------------------------------------------------",nl]),
-
-    asn1ct_name:new(tlv),
-    case CompList of
-	EmptyCL when EmptyCL == [];EmptyCL == {[],[]}-> % empty sequence
-	    true;
-	_ ->
-	    emit([{curr,tlv}," = "])
-    end,
-    emit(["?RT_BER:match_tags(",{prev,tlv},",TagIn), ",nl]),
-    asn1ct_name:new(tlv),
-    asn1ct_name:new(v),
-
-    {DecObjInf,UniqueFName,ValueIndex} =
-	case TableConsInfo of
-	    #simpletableattributes{objectsetname=ObjectSet,
-				   c_name=AttrN,
-				   usedclassfield=UniqueFieldName,
-				   uniqueclassfield=UniqueFieldName,
-				   valueindex=ValIndex} ->
-%	    {ObjectSet,AttrN,_N,UniqueFieldName} ->%% N is index of attribute that determines constraint
-		F = fun(#'ComponentType'{typespec=CT})->
-			    case {CT#type.constraint,CT#type.tablecinf} of
-				{[],[{objfun,_}|_]} -> true;
-				_ -> false
-			    end
-		    end,
-		case lists:any(F,CompList) of
-		    true -> % when component relation constraint establish
-			%% relation from a component to another components
-			%% subtype component
-			{{AttrN,{deep,ObjectSet,UniqueFieldName,ValIndex}},
-			 UniqueFieldName,ValIndex};
-		    false ->
-			{{AttrN,ObjectSet},UniqueFieldName,ValIndex}
-		end;
-	    _ ->
-% 		case D#type.tablecinf of
-% 		    [{objfun,_}|_] ->
-% 			{{"got objfun through args","ObjFun"},false,false};
-% 		    _ ->
-		{false,false,false}
-%	end
-	end,
-    case gen_dec_sequence_call(Erules,Typename,CompList,Ext,DecObjInf) of
-	no_terms -> % an empty sequence	    
-	    emit([nl,nl]),
-	    demit(["Result = "]), %dbg
-	    %% return value as record
-	    asn1ct_name:new(rb),
-	    emit(["   {'",asn1ct_gen:list2rname(Typename),"'}.",nl,nl]);
-	{LeadingAttrTerm,PostponedDecArgs} ->
-	    emit([com,nl,nl]),
-	    case {LeadingAttrTerm,PostponedDecArgs} of
-		{[],[]} ->
-		    ok;
-		{_,[]} ->
-		    ok;
-		{[{ObjSet,LeadingAttr,Term}],PostponedDecArgs} ->
-		    DecObj = asn1ct_gen:un_hyphen_var(lists:concat(['DecObj',LeadingAttr,Term])),
-		    ValueMatch = value_match(ValueIndex,Term),
-		    emit([DecObj," =",nl,"   'getdec_",ObjSet,"'(",
-			  {asis,UniqueFName},", ",ValueMatch,"),",nl]),
-		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
-	    end,
-	    demit(["Result = "]), %dbg
-	    %% return value as record
-	    case Ext of
-		{ext,_,_} -> 
-		    emit(["case ",{prev,tlv}," of [] -> true; _ -> true end, % ... extra fields skipped",nl]);
-		noext -> 
-		    emit(["case ",{prev,tlv}," of",nl,
-			  "[] -> true;",
-			  "_ -> exit({error,{asn1, {unexpected,",{prev,tlv},
-			  "}}}) % extra fields not allowed",nl,
-			  "end,",nl])
-	    end,
-	    asn1ct_name:new(rb),
-	    case Typename of
-		['EXTERNAL'] ->
-		    emit(["   OldFormat={'",asn1ct_gen:list2rname(Typename),
-			  "', "]),
-		    mkvlist(asn1ct_name:all(term)),
-		    emit(["},",nl]),
-		    emit(["    asn1rt_check:transform_to_EXTERNAL1994",
-			  "(OldFormat).",nl]);
-		_ ->
-		    emit(["   {'",asn1ct_gen:list2rname(Typename),"', "]),
-		    mkvlist(asn1ct_name:all(term)),
-		    emit(["}.",nl,nl])
-	    end
-    end.
-
-gen_dec_postponed_decs(_,[]) ->
-    emit(nl);
-gen_dec_postponed_decs(DecObj,[{_Cname,{FirstPFN,PFNList},Term,
-				TmpTerm,_Tag,OptOrMand}|Rest]) ->
-
-    asn1ct_name:new(tmpterm),
-    asn1ct_name:new(reason),
-    asn1ct_name:new(tmptlv),
-
-    emit([Term," = ",nl]),
-    N = case OptOrMand of
-	    mandatory -> 0;
-	    'OPTIONAL' -> 
-		emit_opt_or_mand_check(asn1_NOVALUE,TmpTerm),
-		6;
-	    {'DEFAULT',Val} ->
-		emit_opt_or_mand_check(Val,TmpTerm),
-		6
-	end,
-    emit([indent(N+3),"case (catch ",DecObj,"(",{asis,FirstPFN},
-	  ", ",TmpTerm,", ",{asis,PFNList},")) of",nl]),
-    emit([indent(N+6),"{'EXIT', ",{curr,reason},"} ->",nl]),
-    emit([indent(N+9),"exit({'Type not compatible with table constraint',",
-	  {curr,reason},"});",nl]),
-    emit([indent(N+6),{curr,tmpterm}," ->",nl]),
-    emit([indent(N+9),{curr,tmpterm},nl]),
-    
-    case OptOrMand of 
-	mandatory -> emit([indent(N+3),"end,",nl]);
-	_ ->
-	    emit([indent(N+3),"end",nl,
-		  indent(3),"end,",nl])
-    end,
-    gen_dec_postponed_decs(DecObj,Rest).
-
-emit_opt_or_mand_check(Value,TmpTerm) ->
-    emit([indent(3),"case ",TmpTerm," of",nl,
-	  indent(6),{asis,Value}," ->",{asis,Value},";",nl,
-	  indent(6),"_ ->",nl]).
-
-%%============================================================================
-%%  Encode/decode SET
-%%
-%%============================================================================
-
-gen_encode_set(Erules,Typename,D) when record(D,type) ->
-    gen_encode_sequence(Erules,Typename,D).
-
-gen_decode_set(Erules,Typename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(term),
-    asn1ct_name:new(tag),
-    #'SET'{tablecinf=TableConsInfo,components=TCompList} = D#type.def,
-    Ext = extensible(TCompList),
-    CompList = case TCompList of
-		   {Rl,El} -> Rl ++ El;
-		   _ -> TCompList
-	       end,
-
-    asn1ct_name:clear(),
-    asn1ct_name:new(tlv),
-    case CompList of
-	EmptyCL when EmptyCL == [];EmptyCL == {[],[]}-> % empty sequence
-	    true;
-	_ ->
-	    emit([{curr,tlv}," = "])
-    end,
-    emit(["?RT_BER:match_tags(",{prev,tlv},",TagIn), ",nl]),
-    asn1ct_name:new(v),
-
-
-    {DecObjInf,UniqueFName} =
-	case TableConsInfo of
-	    {ObjectSet,AttrN,_N,UniqueFieldName} ->%% N is index of attribute that determines constraint
-		F = fun(#'ComponentType'{typespec=CT})->
-			    case {CT#type.constraint,CT#type.tablecinf} of
-				{[],[{objfun,_}|_]} -> true;
-				_ -> false
-			    end
-		    end,
-		case lists:any(F,CompList) of
-		    true -> % when component relation constraint establish
-			%% relation from a component to another components
-			%% subtype component
-			{{AttrN,{deep,ObjectSet,UniqueFieldName}},
-			 UniqueFieldName};
-		    false ->
-			{{AttrN,ObjectSet},UniqueFieldName}
-		end;
-	    _ ->
-		{false,false}
-	end,
-
-    case CompList of
-	[] -> % empty set
-	    true;
-	_ ->
-	    emit(["SetFun = fun(FunTlv) ->", nl]),
-	    emit(["case FunTlv of ",nl]),
-	    NextNum = gen_dec_set_cases(Erules,Typename,CompList,1),
-	    emit([indent(6), {curr,else}," -> ",nl,
-		  indent(9),"{",NextNum,", ",{curr,else},"}",nl]),
-	    emit([indent(3),"end",nl]),
-	    emit([indent(3),"end,",nl]),
-
-	    emit(["PositionList = [SetFun(TempTlv)|| TempTlv <- ",{curr,tlv},"],",nl]),
-	    asn1ct_name:new(tlv),
-	    emit([{curr,tlv}," = [Stlv || {_,Stlv} <- lists:sort(PositionList)],",nl]),
-	    asn1ct_name:new(tlv)
-
-    end,
-    case gen_dec_sequence_call(Erules,Typename,CompList,Ext,DecObjInf) of
-	no_terms -> % an empty sequence	    
-	    emit([nl,nl]),
-	    demit(["Result = "]), %dbg
-	    %% return value as record
-	    emit(["   {'",asn1ct_gen:list2rname(Typename),"'}.",nl]);
-	{LeadingAttrTerm,PostponedDecArgs} ->
-	    emit([com,nl,nl]),
-	    case {LeadingAttrTerm,PostponedDecArgs} of
-		{[],[]} ->
-		    ok;
-		{_,[]} ->
-		    ok;
-		{[{ObjSet,LeadingAttr,Term}],PostponedDecArgs} ->
-		    DecObj = lists:concat(['DecObj',LeadingAttr,Term]),
-		    emit([DecObj," =",nl,"   'getdec_",ObjSet,"'(",
-			  {asis,UniqueFName},", ",Term,"),",nl]),
-		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
-	    end,
-	    demit(["Result = "]), %dbg
-	    %% return value as record
-	    case Ext of
-		{ext,_,_} -> 
-		    emit(["case ",{prev,tlv}," of [] -> true; _ -> true end, % ... extra fields skipped",nl]);
-		noext -> 
-		    emit(["case ",{prev,tlv}," of",nl,
-			  "[] -> true;",
-			  "_ -> exit({error,{asn1, {unexpected,",{prev,tlv},
-			  "}}}) % extra fields not allowed",nl,
-			  "end,",nl])
-	    end,
-	    emit(["   {'",asn1ct_gen:list2rname(Typename),"', "]),
-	    mkvlist(asn1ct_name:all(term)),
-	    emit(["}.",nl])
-    end.
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%%  Encode/decode SEQUENCE OF and SET OF
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-gen_encode_sof(Erules,Typename,_InnerTypename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    {SeqOrSetOf, Cont} = D#type.def,
-
-    Objfun = case D#type.tablecinf of
-		 [{objfun,_}|_R] ->
-		     ", ObjFun";
-		 _ ->
-		     ""
-	     end,
-
-    emit(["   {EncBytes,EncLen} = 'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'(Val",Objfun,",[],0),",nl]),
-
-    emit(["   ?RT_BER:encode_tags(TagIn, EncBytes, EncLen).",nl,nl]),
-
-    gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont).
-    
-
-gen_decode_sof(Erules,TypeName,_InnerTypeName,D) when record(D,type) ->
-    asn1ct_name:start(),
-    {SeqOrSetOf, _TypeTag, Cont} = 
-	case D#type.def of
-	    {'SET OF',_Cont} -> {'SET OF','SET',_Cont};
-	    {'SEQUENCE OF',_Cont} -> {'SEQUENCE OF','SEQUENCE',_Cont}
-	end,
-    TypeNameSuffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,Cont#type.def),
-    
-    emit(["   %%-------------------------------------------------",nl]),
-    emit(["   %% decode tag and length ",nl]),
-    emit(["   %%-------------------------------------------------",nl]),
-    
-    asn1ct_name:new(tlv),
-    emit([{curr,tlv},
-	  " = ?RT_BER:match_tags(",{prev,tlv},",TagIn), ",nl]),
-    asn1ct_name:new(v),
-
-    emit(["["]),
-
-    InnerType = asn1ct_gen:get_inner(Cont#type.def),
-    ContName = case asn1ct_gen:type(InnerType) of
-		   Atom when atom(Atom) -> Atom;
-		   _ -> TypeNameSuffix
-	       end,
-%% fix me
-    ObjFun =
-	case D#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		", ObjFun";
-	    _ ->
-		[]
-	end,
-    gen_dec_line(Erules,TypeName,ContName,[],Cont,mandatory,ObjFun),
-    %%    gen_dec_line_sof(Erules,Typename,ContName,Cont,ObjFun),
-    emit([" || ",{curr,v}," <- ",{curr,tlv},"].",nl,nl,nl]).
-    
-
-gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont) 
-  when record(Cont,type)->
-
-    {Objfun,Objfun_novar,EncObj} = 
-	case Cont#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		{", ObjFun",", _",{no_attr,"ObjFun"}};
-	    _ ->
-		{"","",false}
-	end,
-    emit(["'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'([]",Objfun_novar,", AccBytes, AccLen) -> ",nl]),
-
-    case catch lists:member(der,get(encoding_options)) of
-	true ->
-	    emit([indent(3),
-		  "{?RT_BER:dynamicsort_SETOF(AccBytes),AccLen};",nl,nl]);
-	_ ->
-	    emit([indent(3),"{lists:reverse(AccBytes),AccLen};",nl,nl])
-    end,
-    emit(["'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'([H|T]",Objfun,",AccBytes, AccLen) ->",nl]),
-    TypeNameSuffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,Cont#type.def),
-    gen_enc_line(Erules,Typename,TypeNameSuffix,Cont,"H",3,
-		 mandatory,"{EncBytes,EncLen} = ",EncObj),
-    emit([",",nl]),
-    emit([indent(3),"'enc_",asn1ct_gen:list2name(Typename),
-	  "_components'(T",Objfun,","]), 
-    emit(["[EncBytes|AccBytes], AccLen + EncLen).",nl,nl]).
-
-%%============================================================================
-%%  Encode/decode CHOICE
-%%
-%%============================================================================
-
-gen_encode_choice(Erules,Typename,D) when record(D,type) ->
-    ChoiceTag = D#type.tag,
-    {'CHOICE',CompList} = D#type.def,
-    Ext = extensible(CompList),
-    CompList1 = case CompList of
-		    {Rl,El} -> Rl ++ El;
-		    _ -> CompList
-		end,
-    gen_enc_choice(Erules,Typename,ChoiceTag,CompList1,Ext),
-    emit([nl,nl]).
-
-gen_decode_choice(Erules,Typename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(bytes),
-    ChoiceTag = D#type.tag,
-    {'CHOICE',CompList} = D#type.def,
-    Ext = extensible(CompList),
-    CompList1 = case CompList of
-		    {Rl,El} -> Rl ++ El;
-		    _ -> CompList
-		end,
-    gen_dec_choice(Erules,Typename,ChoiceTag,CompList1,Ext),
-    emit([".",nl]).
-
-
-%%============================================================================
-%%  Encode SEQUENCE
-%%
-%%============================================================================
-
-gen_enc_sequence_call(Erules,TopType,[#'ComponentType'{name=Cname,typespec=Type,prop=Prop}|Rest],Pos,Ext,EncObj) ->
-    asn1ct_name:new(encBytes),
-    asn1ct_name:new(encLen),
-    Element = 
-	case TopType of
-	    ['EXTERNAL'] ->
-		io_lib:format("Cindex~w",[Pos]);
-	    _ ->
-		io_lib:format("Cindex~w",[Pos])
-	end,
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    print_attribute_comment(InnerType,Pos,Cname,Prop),
-    gen_enc_line(Erules,TopType,Cname,Type,Element,3,Prop,EncObj),
-    emit([com,nl]),
-    gen_enc_sequence_call(Erules,TopType,Rest,Pos+1,Ext,EncObj);
-
-gen_enc_sequence_call(_Erules,_TopType,[],_Num,_,_) ->
-	true.
-
-%%============================================================================
-%%  Decode SEQUENCE
-%%
-%%============================================================================
-
-gen_dec_sequence_call(Erules,TopType,CompList,Ext,DecObjInf) ->
-    gen_dec_sequence_call1(Erules,TopType, CompList, 1, Ext,DecObjInf,[],[]).
-
-
-gen_dec_sequence_call1(Erules,TopType,[#'ComponentType'{name=Cname,typespec=Type,prop=Prop,tags=Tags}|Rest],Num,Ext,DecObjInf,LeadingAttrAcc,ArgsAcc) ->
-    {LA,PostponedDec} = 
-	gen_dec_component(Erules,TopType,Cname,Tags,Type,Num,Prop,
-			  Ext,DecObjInf),
-    case Rest of
-	[] ->
-	    {LA ++ LeadingAttrAcc,PostponedDec ++ ArgsAcc};
-	_ ->
-	    emit([com,nl]),
-	    asn1ct_name:new(bytes),
-	    gen_dec_sequence_call1(Erules,TopType,Rest,Num+1,Ext,DecObjInf,
-				   LA++LeadingAttrAcc,PostponedDec++ArgsAcc)
-    end;
-
-gen_dec_sequence_call1(_Erules,_TopType,[],1,_,_,_,_) ->
-    no_terms.
-
-
-%%----------------------------
-%%SEQUENCE mandatory
-%%----------------------------
-
-gen_dec_component(Erules,TopType,Cname,CTags,Type,Pos,Prop,Ext,DecObjInf) ->
-    InnerType = 
-	case Type#type.def of
-	    #'ObjectClassFieldType'{type=OCFTType} -> OCFTType;
-	    _ -> asn1ct_gen:get_inner(Type#type.def)
-	end,
-% 	case asn1ct_gen:get_constraint(Type#type.constraint,
-% 				       tableconstraint_info) of
-% 	    no ->
-% 		asn1ct_gen:get_inner(Type#type.def);
-% 	    _ ->
-% 		Type#type.def
-% 	end,
-    Prop1 = case {Prop,Ext} of
-		{mandatory,{ext,Epos,_}} when Pos >= Epos ->
-		    'OPTIONAL';
-		_ ->
-		    Prop
-	    end,
-    print_attribute_comment(InnerType,Pos,Cname,Prop1),
-    asn1ct_name:new(term),
-    emit_term_tlv(Prop1,InnerType,DecObjInf),
-    asn1ct_name:new(rb),
-    PostponedDec = 
-	gen_dec_line(Erules,TopType,Cname,CTags,Type,Prop1,DecObjInf),
-    asn1ct_name:new(v),
-    asn1ct_name:new(tlv),
-    asn1ct_name:new(form),
-    PostponedDec.
-
-
-emit_term_tlv({'DEFAULT',_},InnerType,DecObjInf) ->
-    emit_term_tlv(opt_or_def,InnerType,DecObjInf);
-emit_term_tlv('OPTIONAL',InnerType,DecObjInf) ->
-    emit_term_tlv(opt_or_def,InnerType,DecObjInf);
-emit_term_tlv(Prop,{typefield,_},DecObjInf) ->
-    emit_term_tlv(Prop,type_or_object_field,DecObjInf);
-emit_term_tlv(Prop,{objectfield,_,_},DecObjInf) ->
-    emit_term_tlv(Prop,type_or_object_field,DecObjInf);
-emit_term_tlv(opt_or_def,type_or_object_field,_) ->
-    asn1ct_name:new(tmpterm),
-    emit(["{",{curr,tmpterm},",",{curr,tlv},"} = "]);
-emit_term_tlv(opt_or_def,_,_) ->
-    emit(["{",{curr,term},",",{curr,tlv},"} = "]);
-emit_term_tlv(_,type_or_object_field,false) ->
-     emit(["[",{curr,v},"|",{curr,tlv},"] = ",{prev,tlv},", ",nl,
-	  {curr,term}," = "]);
-emit_term_tlv(_,type_or_object_field,_) ->
-    asn1ct_name:new(tmpterm),
-    emit(["[",{curr,v},"|",{curr,tlv},"] = ",{prev,tlv},", ",nl]),
-    emit([nl,"  ",{curr,tmpterm}," = "]);
-emit_term_tlv(mandatory,_,_) ->
-    emit(["[",{curr,v},"|",{curr,tlv},"] = ",{prev,tlv},", ",nl,
-	  {curr,term}," = "]).
-
-
-gen_dec_set_cases(_Erules,_TopType,[],Pos) ->
-    Pos;
-gen_dec_set_cases(Erules,TopType,[Comp|RestComps],Pos) ->
-    Name = Comp#'ComponentType'.name,
-    Type = Comp#'ComponentType'.typespec,
-    CTags = Comp#'ComponentType'.tags,
-    
-    emit([indent(6),"%",Name,nl]),
-    Tags = case Type#type.tag of
-	       [] -> % this is a choice without explicit tag
-		   [(?ASN1CT_GEN_BER:decode_class(T1class) bsl 10) + T1number|| 
-		       {T1class,T1number} <- CTags];
-               [FirstTag|_] ->
-		   [(?ASN1CT_GEN_BER:decode_class(FirstTag#tag.class) bsl 10) + FirstTag#tag.number]
-	   end,
-%    emit([indent(6),"%Tags: ",Tags,nl]),
-%    emit([indent(6),"%Type#type.tag: ",Type#type.tag,nl]),
-    CaseFun = fun(TagList=[H|T],Fun,N) ->
-		      Semicolon = case TagList of
-				      [_Tag1,_|_] -> [";",nl];
-				      _ -> ""
-				  end,
-		      emit(["TTlv = {",H,",_} ->",nl]),
-		      emit([indent(4),"{",Pos,", TTlv}",Semicolon]),
-		      Fun(T,Fun,N+1);
-		 ([],_,0) ->
-		      true;
-		 ([],_,_) ->
-		      emit([";",nl])
-	      end,
-    CaseFun(Tags,CaseFun,0),
-%%    emit([";",nl]),
-    gen_dec_set_cases(Erules,TopType,RestComps,Pos+1).
-
-
-
-%%---------------------------------------------
-%%  Encode CHOICE
-%%---------------------------------------------
-%% for BER we currently do care (a little) if the choice has an EXTENSIONMARKER
-
-
-gen_enc_choice(Erules,TopType,Tag,CompList,_Ext) ->
-    gen_enc_choice1(Erules,TopType,Tag,CompList,_Ext).
-
-gen_enc_choice1(Erules,TopType,_Tag,CompList,_Ext) ->
-    asn1ct_name:clear(),
-    emit(["   {EncBytes,EncLen} = case element(1,Val) of",nl]),
-    gen_enc_choice2(Erules,TopType,CompList),
-    emit([nl,"   end,",nl,nl]),
-    
-    emit(["?RT_BER:encode_tags(TagIn, EncBytes, EncLen).",nl]).
-
-
-gen_enc_choice2(Erules,TopType,[H1|T]) when record(H1,'ComponentType') ->
-    Cname = H1#'ComponentType'.name,
-    Type = H1#'ComponentType'.typespec,
-    emit(["      ",{asis,Cname}," ->",nl]),
-    {Encobj,Assign} =
-	case {Type#type.def,asn1ct_gen:get_constraint(Type#type.constraint,
-						      componentrelation)} of
-	    {#'ObjectClassFieldType'{},{componentrelation,_,_}} ->
-		asn1ct_name:new(tmpBytes),
-		asn1ct_name:new(encBytes),
-		asn1ct_name:new(encLen),
-		Emit = ["{",{curr,tmpBytes},", _} = "],
-		{{no_attr,"ObjFun"},Emit};
-	    _ ->
-		{false,[]}
-	end,
-% 	case asn1ct_gen:get_constraint(Type#type.constraint,
-% 				       tableconstraint_info) of
-% 	    no ->
-% 		{false,[]};
-% 	    _ ->
-% 		asn1ct_name:new(tmpBytes),
-% 		asn1ct_name:new(encBytes),
-% 		asn1ct_name:new(encLen),
-% 		Emit = ["{",{curr,tmpBytes},", _} = "],
-% 		{{no_attr,"ObjFun"},Emit}
-% 	end,
-    gen_enc_line(Erules,TopType,Cname,Type,"element(2,Val)",9,
-		 mandatory,Assign,Encobj),
-    case Encobj of
-	false -> ok;
-	_ ->
-	    emit([",",nl,indent(9),"{",{curr,encBytes},", ",
-		  {curr,encLen},"}"])
-    end,
-    emit([";",nl]),
-    case T of 
-	[] ->
-	    emit([indent(6), "Else -> ",nl,
-		  indent(9),"exit({error,{asn1,{invalid_choice_type,Else}}})"]);
-	_ ->
-	    true
-    end,
-    gen_enc_choice2(Erules,TopType,T);
-
-gen_enc_choice2(_Erules,_TopType,[])  ->
-    true.
-
-
-
-
-%%--------------------------------------------
-%%  Decode CHOICE
-%%--------------------------------------------
-
-gen_dec_choice(Erules,TopType, _ChTag, CompList, Ext) ->
-    asn1ct_name:clear(),
-    asn1ct_name:new(tlv),
-    emit([{curr,tlv},
-	  " = ?RT_BER:match_tags(",{prev,tlv},",TagIn), ",nl]),
-    asn1ct_name:new(tlv),
-    asn1ct_name:new(v),
-    emit(["case (case ",{prev,tlv},
-	  " of [Ctemp",{prev,tlv},"] -> Ctemp",{prev,tlv},
-	  "; _ -> ",{prev,tlv}," end)"," of",nl]),
-    asn1ct_name:new(tagList),
-    asn1ct_name:new(choTags),
-    asn1ct_name:new(res),
-    gen_dec_choice_cases(Erules,TopType,CompList),
-    emit([indent(6), {curr,else}," -> ",nl]),
-    case Ext of
-	noext ->
-	    emit([indent(9),"exit({error,{asn1,{invalid_choice_tag,",
-		  {curr,else},"}}})",nl]);
-	_ ->
-	    emit([indent(9),"{asn1_ExtAlt, ?RT_BER:encode(",{curr,else},")}",nl])
-    end,
-    emit([indent(3),"end",nl]),
-    asn1ct_name:new(tag),
-    asn1ct_name:new(else).
-
-
-gen_dec_choice_cases(_Erules,_TopType, []) ->
-    ok;
-gen_dec_choice_cases(Erules,TopType, [H|T]) ->
-    Cname = H#'ComponentType'.name,
-    Type = H#'ComponentType'.typespec,
-    Prop = H#'ComponentType'.prop,
-    Tags = Type#type.tag,
-    Fcases  = fun([{T1class,T1number}|Tail],Fun) ->		      
-		      emit([indent(4),{curr,v}," = {",
-			    (?ASN1CT_GEN_BER:decode_class(T1class) bsl 10) +
-			    T1number,",_} -> ",nl]),
-		      emit([indent(8),"{",{asis,Cname},", "]),
-		      gen_dec_line(Erules,TopType,Cname,[],Type,Prop,false),
-		      emit(["};",nl,nl]),
-		      Fun(Tail,Fun);
-		 ([],_) ->
-		      ok
-	      end,
-    emit([nl,"%% '",Cname,"'",nl]),
-    case {Tags,asn1ct:get_gen_state_field(namelist)} of
-	{[],_} -> % choice without explicit tags
-	    Fcases(H#'ComponentType'.tags,Fcases);
-	{[FirstT|_RestT],[{Cname,undecoded}|Names]} ->
-	    DecTag=(?ASN1CT_GEN_BER:decode_class(FirstT#tag.class) bsl 10) +
-		FirstT#tag.number,
-	    asn1ct:add_generated_refed_func({[Cname|TopType],undecoded,
-					     [DecTag],Type}),
-	    asn1ct:update_gen_state(namelist,Names),
-	    emit([indent(4),{curr,res}," = ",
-		  match_tag(ber_bin,{FirstT#tag.class,FirstT#tag.number}),
-		  " -> ",nl]),
-	    emit([indent(8),"{",{asis,Cname},", {'",
-		  asn1ct_gen:list2name([Cname|TopType]),"',",
-		  {curr,res},"}};",nl,nl]);
-	{[FirstT|RestT],_} ->
-	    emit([indent(4),"{",
-		  (?ASN1CT_GEN_BER:decode_class(FirstT#tag.class) bsl 10) +
-		  FirstT#tag.number,", ",{curr,v},"} -> ",nl]),
-	    emit([indent(8),"{",{asis,Cname},", "]),
-	    gen_dec_line(Erules,TopType,Cname,[],Type#type{tag=RestT},Prop,false),
-	    emit(["};",nl,nl])
-    end,
-    gen_dec_choice_cases(Erules,TopType, T).
-
-
-
-%%---------------------------------------
-%% Generate the encode/decode code 
-%%---------------------------------------
-
-gen_enc_line(Erules,TopType,Cname,
-	     Type=#type{constraint=[{componentrelation,_,_}],
-			def=#'ObjectClassFieldType'{type={typefield,_}}},
-	     Element,Indent,OptOrMand=mandatory,EncObj) 
-  when list(Element) ->
-    asn1ct_name:new(tmpBytes),
-    gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,
-		 ["{",{curr,tmpBytes},",_} = "],EncObj);
-gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,EncObj) 
-  when list(Element) ->
-    gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,
-		 ["{",{curr,encBytes},",",{curr,encLen},"} = "],EncObj).
-
-gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,Assign,EncObj)
-  when list(Element) ->
-    IndDeep = indent(Indent),
-    Tag = lists:reverse([?ASN1CT_GEN_BER:encode_tag_val(
-			    ?ASN1CT_GEN_BER:decode_class(X#tag.class),
-			    X#tag.form,
-			    X#tag.number)
-			 || X <- Type#type.tag]),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    WhatKind = asn1ct_gen:type(InnerType),
-    emit(IndDeep),
-    emit(Assign),
-    gen_optormand_case(OptOrMand,Erules,TopType,Cname,Type,InnerType,WhatKind,
-		       Element),
-    case {Type,asn1ct_gen:get_constraint(Type#type.constraint,
-					 componentrelation)} of
-% 	#type{constraint=[{tableconstraint_info,RefedFieldName}],
-% 	      def={typefield,_}} ->
-	{#type{def=#'ObjectClassFieldType'{type={typefield,_},
-					   fieldname=RefedFieldName}},
-	 {componentrelation,_,_}} ->
-	    {_LeadingAttrName,Fun} = EncObj,
-	    case RefedFieldName of
-		{notype,T} ->
-		    throw({error,{notype,type_from_object,T}});
-		{Name,RestFieldNames} when atom(Name) ->
-		    case OptOrMand of
-			mandatory -> ok;
-			_ ->
-%			    emit(["{",{curr,tmpBytes},",",{curr,tmpLen},
-			    emit(["{",{curr,tmpBytes},",_ } = "])
-%				  "} = "])
-		    end,
-		    emit([Fun,"(",{asis,Name},", ",Element,", ",
-			  {asis,RestFieldNames},"),",nl]),
-		    emit(IndDeep),
-		    case OptOrMand of
-			mandatory ->
-			    emit(["{",{curr,encBytes},",",{curr,encLen},
-				  "} = "]),
-			    emit(["?RT_BER:encode_open_type(",{curr,tmpBytes},
-				  ",",{asis,Tag},")"]);
-			_ ->
-%			    emit(["{",{next,tmpBytes},", _} = "]),
-			    emit(["{",{next,tmpBytes},",",{curr,tmpLen},
-				  "} = "]),
-			    emit(["?RT_BER:encode_open_type(",{curr,tmpBytes},
-				  ",",{asis,Tag},"),",nl]),
-			    emit(IndDeep),
-			    emit(["{",{next,tmpBytes},", ",{curr,tmpLen},"}"])
-		    end;
-		_ ->
-		    throw({asn1,{'internal error'}})
-	    end;
-	{{#'ObjectClassFieldType'{type={objectfield,PrimFieldName1,
-					PFNList}},_},
-	 {componentrelation,_,_}} ->
-	    %% this is when the dotted list in the FieldName has more
-	    %% than one element
-	    {_LeadingAttrName,Fun} = EncObj,
-	    emit(["?RT_BER:encode_open_type(",Fun,"(",{asis,PrimFieldName1},
-		  ", ",Element,", ",{asis,PFNList},"))"]);
-	_ ->
-	    case WhatKind of
-		{primitive,bif} ->
-		    EncType =
-			case Type#type.def of
-			    #'ObjectClassFieldType'{type={fixedtypevaluefield,_,Btype}} ->
-				Btype;
-			    _ ->
-				Type
-			end,
-		    ?ASN1CT_GEN_BER:gen_encode_prim(ber,EncType,{asis,Tag},
-						   Element);
-		{notype,_} ->
-		    emit(["'enc_",InnerType,"'(",Element,", ",{asis,Tag},")"]);
-		'ASN1_OPEN_TYPE' ->
-		    case Type#type.def of
-			#'ObjectClassFieldType'{} -> %Open Type
-			    ?ASN1CT_GEN_BER:gen_encode_prim(ber,#type{def='ASN1_OPEN_TYPE'},{asis,Tag},Element);
-			_ ->
-			    ?ASN1CT_GEN_BER:gen_encode_prim(ber,Type,
-							    {asis,Tag},
-							    Element)
-		    end;
-		_ ->
-		    {EncFunName, _EncMod, _EncFun} = 
-			mkfuncname(TopType,Cname,WhatKind,"enc_"),
-		    case {WhatKind,Type#type.tablecinf,EncObj} of
-			{{constructed,bif},[{objfun,_}|_R],{_,Fun}} ->
-			    emit([EncFunName,"(",Element,", ",{asis,Tag},
-				  ", ",Fun,")"]);
-			_ ->
-			    emit([EncFunName,"(",Element,", ",{asis,Tag},")"])
-		    end
-	    end
-    end,
-    case OptOrMand of
-	mandatory -> true;
-	_ ->
-	    emit([nl,indent(7),"end"])
-    end.
-
-gen_optormand_case(mandatory,_Erules,_TopType,_Cname,_Type,_InnerType,_WhatKind,
-		   _Element) ->
-    ok;
-gen_optormand_case('OPTIONAL',Erules,_TopType,_Cname,_Type,_InnerType,_WhatKind,
-		   Element) ->
-    emit([" case ",Element," of",nl]),
-    emit([indent(9),"asn1_NOVALUE -> {",
-	  empty_lb(Erules),",0};",nl]),
-    emit([indent(9),"_ ->",nl,indent(12)]);
-gen_optormand_case({'DEFAULT',DefaultValue},Erules,TopType,Cname,Type,
-		   InnerType,WhatKind,Element) ->
-    CurrMod = get(currmod),
-    case catch lists:member(der,get(encoding_options)) of
-	true ->
-	    emit(" case catch "),
-	    asn1ct_gen:gen_check_call(TopType,Cname,Type,InnerType,
-				      WhatKind,{asis,DefaultValue},
-				      Element),
-	    emit([" of",nl]),
-	    emit([indent(12),"true -> {[],0};",nl]);
-	_ ->
-	    emit([" case ",Element," of",nl]),
-	    emit([indent(9),"asn1_DEFAULT -> {",
-		  empty_lb(Erules),
-		  ",0};",nl]),
-	    case DefaultValue of 
-		#'Externalvaluereference'{module=CurrMod,
-					  value=V} ->
-		    emit([indent(9),"?",{asis,V}," -> {",
-			  empty_lb(Erules),",0};",nl]);
-		_ ->
-		    emit([indent(9),{asis,
-				     DefaultValue}," -> {",
-			  empty_lb(Erules),",0};",nl])
-	    end
-    end,
-    emit([indent(9),"_ ->",nl,indent(12)]).
-
-    
-
-gen_dec_line(Erules,TopType,Cname,CTags,Type,OptOrMand,DecObjInf)  ->
-    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(v)),
-    Tag = 
-	[(?ASN1CT_GEN_BER:decode_class(X#tag.class) bsl 10) + X#tag.number ||
-	    X <- Type#type.tag],
-    ChoiceTags = 
-	[(?ASN1CT_GEN_BER:decode_class(Class) bsl 10) + Number|| 
-	    {Class,Number} <- CTags], 
-    InnerType = 
-	case Type#type.def of
-	    #'ObjectClassFieldType'{type=OCFTType} ->
-		OCFTType;
-	    _ ->
-		asn1ct_gen:get_inner(Type#type.def)
-	end,
-    PostpDec = 
-	case OptOrMand of
-	    mandatory ->
-		gen_dec_call(InnerType,Erules,TopType,Cname,Type,
-			     BytesVar,Tag,
-			     mandatory,", mandatory, ",DecObjInf,OptOrMand);
-	    _ -> %optional or default or a mandatory component after an extensionmark
-		{FirstTag,RestTag} = 
-		    case Tag of 
-			[] -> 
-			    {ChoiceTags,[]};
-			[Ft|Rt] -> 
-			    {Ft,Rt}
-		    end,
-		emit(["case ",{prev,tlv}," of",nl]),
-		PostponedDec = 
-		    case Tag of
-			[] when length(ChoiceTags) > 0 -> % a choice without explicit tag
-			    Fcases = 
-				fun(FirstTag1) ->
-					emit(["[",{curr,v}," = {",{asis,FirstTag1},
-					      ",_}|Temp",
-					      {curr,tlv},
-					      "] ->",nl]),
-					emit([indent(4),"{"]),
-					Pdec= 
-					    gen_dec_call(InnerType,Erules,
-							 TopType,Cname,Type,
-							 BytesVar,RestTag,
-							 mandatory,
-							 ", mandatory, ",
-							 DecObjInf,OptOrMand),
-					
-					emit([", Temp",{curr,tlv},"}"]),
-					emit([";",nl]),
-					Pdec
-				end,
-			    hd([Fcases(TmpTag)|| TmpTag <- FirstTag]);
-
-			[] -> % an open type without explicit tag
-			    emit(["[",{curr,v},"|Temp",{curr,tlv},"] ->",nl]),
-			    emit([indent(4),"{"]),
-			    Pdec= 
-				gen_dec_call(InnerType,Erules,TopType,Cname,
-					     Type,BytesVar,RestTag,mandatory,
-					     ", mandatory, ",DecObjInf,
-					     OptOrMand),
-			    
-			    emit([", Temp",{curr,tlv},"}"]),
-			    emit([";",nl]),
-			    Pdec;
-
-			_ ->
-			    emit(["[{",{asis,FirstTag},
-				  ",",{curr,v},"}|Temp",
-				  {curr,tlv},
-				  "] ->",nl]),
-			    emit([indent(4),"{"]),
-			    Pdec= 
-				gen_dec_call(InnerType,Erules,TopType,Cname,
-					     Type,BytesVar,RestTag,mandatory,
-					     ", mandatory, ",DecObjInf,
-					     OptOrMand),
-			    
-			    emit([", Temp",{curr,tlv},"}"]),
-			    emit([";",nl]),
-			    Pdec
-		    end,
-		
-		emit([indent(4),"_ ->",nl]),
-		case OptOrMand of
-		    {'DEFAULT', Def} ->
-			emit([indent(8),"{",{asis,Def},",",{prev,tlv},"}",nl]);
-		    'OPTIONAL' ->
-			emit([indent(8),"{ asn1_NOVALUE, ",{prev,tlv},"}",nl])
-		end,
-		emit(["end"]),
-		PostponedDec
-	end,
-    case DecObjInf of
-	{Cname,ObjSet} -> % this must be the component were an object is 
-	    %% choosen from the object set according to the table 
-	    %% constraint.
-	    {[{ObjSet,Cname,asn1ct_gen:mk_var(asn1ct_name:curr(term))}],
-	     PostpDec};
-	_  -> {[],PostpDec}
-    end.
-
-gen_dec_call({typefield,_},_,_,_Cname,Type,BytesVar,Tag,_,_,false,_) ->
-    %%  this in case of a choice with typefield components
-    asn1ct_name:new(reason),
-    asn1ct_name:new(opendec),
-    asn1ct_name:new(tmpterm),
-    asn1ct_name:new(tmptlv),
-
-    {FirstPFName,RestPFName} = 
-% 	asn1ct_gen:get_constraint(Type#type.constraint,
-% 				  tableconstraint_info),
-	(Type#type.def)#'ObjectClassFieldType'.fieldname,
-    emit([nl,indent(6),"begin",nl]),
-%    emit([indent(9),{curr,opendec}," = ?RT_BER:decode_open_type(",
-    emit([indent(9),{curr,tmptlv}," = ?RT_BER:decode_open_type(",
-	  BytesVar,",",{asis,Tag},"),",nl]),
-%     emit([indent(9),"{",{curr,tmptlv},",_} = ?RT_BER:decode(",
-% 	  {curr,opendec},"),",nl]),
-
-    emit([indent(9),"case (catch ObjFun(",{asis,FirstPFName},
-	  ", ",{curr,tmptlv},", ",{asis,RestPFName},
-	  ")) of", nl]),%% ??? What about Tag 
-    emit([indent(12),"{'EXIT',",{curr,reason},"} ->",nl]),
-    emit([indent(15),"exit({'Type not ",
-	  "compatible with table constraint', ",{curr,reason},"});",nl]),
-    emit([indent(12),{curr,tmpterm}," ->",nl]),
-    emit([indent(15),{curr,tmpterm},nl]),
-    emit([indent(9),"end",nl,indent(6),"end",nl]),
-    [];
-gen_dec_call({typefield,_},_,_,Cname,Type,BytesVar,Tag,_,_,_DecObjInf,OptOrMandComp) ->
-    emit(["?RT_BER:decode_open_type(",BytesVar,",",{asis,Tag},")"]),
-    RefedFieldName = 
-% 	asn1ct_gen:get_constraint(Type#type.constraint,
-% 				  tableconstraint_info),
-	(Type#type.def)#'ObjectClassFieldType'.fieldname,
-    [{Cname,RefedFieldName,asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
-gen_dec_call({objectfield,PrimFieldName,PFNList},_,_,Cname,_,BytesVar,Tag,_,_,_,OptOrMandComp) ->
-    emit(["?RT_BER:decode_open_type(",BytesVar,",",{asis,Tag},")"]),
-    [{Cname,{PrimFieldName,PFNList},asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-      asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
-gen_dec_call(InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,PrimOptOrMand,
-	     OptOrMand,DecObjInf,_) ->
-    WhatKind = asn1ct_gen:type(InnerType),
-    gen_dec_call1(WhatKind,InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,
-		  PrimOptOrMand,OptOrMand),
-    case DecObjInf of
-	{Cname,{_,OSet,UniqueFName,ValIndex}} ->
-	    Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-	    ValueMatch = value_match(ValIndex,Term),
-	    emit([",",nl,"ObjFun = 'getdec_",OSet,"'(",
-%		  {asis,UniqueFName},", ",{curr,term},")"]);
-		  {asis,UniqueFName},", ",ValueMatch,")"]);
-	_ ->
-	    ok
-    end,
-    [].
-gen_dec_call1({primitive,bif},InnerType,Erules,TopType,Cname,Type,BytesVar,
-	      Tag,OptOrMand,_) ->
-    case {asn1ct:get_gen_state_field(namelist),InnerType} of
-	{[{Cname,undecoded}|Rest],_} ->
-	    asn1ct:add_generated_refed_func({[Cname|TopType],undecoded,
-					     Tag,Type}),
-	    asn1ct:update_gen_state(namelist,Rest),
-%	    emit(["?RT_BER:match_tags(",BytesVar,",",{asis,Tag},")"]);
-	    emit(["{'",asn1ct_gen:list2name([Cname|TopType]),"',",
-		  BytesVar,"}"]);
-	{_,{fixedtypevaluefield,_,Btype}} ->
-	    ?ASN1CT_GEN_BER:gen_dec_prim(Erules,Btype,BytesVar,Tag,[],
-					?PRIMITIVE,OptOrMand);
-	_ ->
-	    ?ASN1CT_GEN_BER:gen_dec_prim(Erules,Type,BytesVar,Tag,[],
-					?PRIMITIVE,OptOrMand)
-    end;
-gen_dec_call1('ASN1_OPEN_TYPE',_InnerType,Erules,TopType,Cname,Type,BytesVar,
-	      Tag,OptOrMand,_) ->
-    case {asn1ct:get_gen_state_field(namelist),Type#type.def} of
-	{[{Cname,undecoded}|Rest],_} ->
-	    asn1ct:add_generated_refed_func({[Cname|TopType],undecoded,
-					     Tag,Type}),
-	    asn1ct:update_gen_state(namelist,Rest),
-	    emit(["{'",asn1ct_gen:list2name([Cname|TopType]),"',",
-		  BytesVar,"}"]);
-%	    emit(["?RT_BER:match_tags(",BytesVar,",",{asis,Tag},")"]);
-	{_,#'ObjectClassFieldType'{type=OpenType}} ->
-	    ?ASN1CT_GEN_BER:gen_dec_prim(Erules,#type{def=OpenType},
-					 BytesVar,Tag,[],
-					 ?PRIMITIVE,OptOrMand);
-	_ ->
-	    ?ASN1CT_GEN_BER:gen_dec_prim(Erules,Type,BytesVar,Tag,[],
-					 ?PRIMITIVE,OptOrMand)
-    end;
-gen_dec_call1(WhatKind,_,_Erules,TopType,Cname,Type,BytesVar,
-	      Tag,_,_OptOrMand) ->
-    case asn1ct:get_gen_state_field(namelist) of
-	[{Cname,undecoded}|Rest] ->
-	    asn1ct:add_generated_refed_func({[Cname|TopType],undecoded,
-					     Tag,Type}),
-	    asn1ct:update_gen_state(namelist,Rest),
-	    emit(["{'",asn1ct_gen:list2name([Cname|TopType]),"',",
-		  BytesVar,"}"]);
-	_ ->
-%	    {DecFunName, _DecMod, _DecFun} = 
-%		case {asn1ct:get_gen_state_field(namelist),WhatKind} of
-	    EmitDecFunCall = 
-		fun(FuncName) ->
-			case {WhatKind,Type#type.tablecinf} of
-			    {{constructed,bif},[{objfun,_}|_Rest]} ->
-				emit([FuncName,"(",BytesVar,", ",{asis,Tag},
-				      ", ObjFun)"]);
-			    _ ->
-				emit([FuncName,"(",BytesVar,", ",{asis,Tag},")"])
-			end
-		end,
-	    case asn1ct:get_gen_state_field(namelist) of
-		[{Cname,List}|Rest] when list(List) ->
-		    case WhatKind of
-			#'Externaltypereference'{} ->
-			    %%io:format("gen_dec_call1 1:~n~p~n~n",[WhatKind]),
-			    asn1ct:add_tobe_refed_func({WhatKind,List});
-			_ ->
-			    %%io:format("gen_dec_call1 2:~n~p~n~n",[[Cname|TopType]]),
-			    asn1ct:add_tobe_refed_func({[Cname|TopType],
-							List})
-		    end,
-		    asn1ct:update_gen_state(namelist,Rest),
-		    Prefix=asn1ct:get_gen_state_field(prefix),
-		    {DecFunName,_,_}=
-			mkfuncname(TopType,Cname,WhatKind,Prefix),
-		    EmitDecFunCall(DecFunName);
-		[{Cname,parts}|Rest] ->
-		    asn1ct:update_gen_state(namelist,Rest),
-		    asn1ct:get_gen_state_field(prefix),
-		    %% This is to prepare SEQUENCE OF value in
-		    %% partial incomplete decode for a later
-		    %% part-decode, i.e. skip %% the tag.
-		    asn1ct:add_generated_refed_func({[Cname|TopType],
-						     parts,
-						     [],Type}),
-		    emit(["{'",asn1ct_gen:list2name([Cname|TopType]),"',"]),
-		    EmitDecFunCall("?RT_BER:match_tags"),
-		    emit("}");
-		_ ->
-		    {DecFunName,_,_}=
-			mkfuncname(TopType,Cname,WhatKind,"dec_"),
-		    EmitDecFunCall(DecFunName)
-	    end
-% 	    case {WhatKind,Type#type.tablecinf} of
-% 		{{constructed,bif},[{objfun,_}|_Rest]} ->
-% 		    emit([DecFunName,"(",BytesVar,", ",{asis,Tag},
-% 			  ", ObjFun)"]);
-% 		_ ->
-% 		    emit([DecFunName,"(",BytesVar,", ",{asis,Tag},")"])
-% 	    end
-    end.
-
-
-%%------------------------------------------------------
-%% General and special help functions (not exported)
-%%------------------------------------------------------
-
-
-indent(N) ->
-    lists:duplicate(N,32). % 32 = space
-
-mkcindexlist([H,T1|T], Sep) -> % Sep is a string e.g ", " or "+ "
-    emit(["Cindex",H,Sep]),
-    mkcindexlist([T1|T], Sep);
-mkcindexlist([H|T], Sep) ->
-    emit(["Cindex",H]),
-    mkcindexlist(T, Sep);
-mkcindexlist([], _) ->
-    true.
-
-mkcindexlist(L) ->
-    mkcindexlist(L,", ").
-
-
-mkvlist([H,T1|T], Sep) -> % Sep is a string e.g ", " or "+ "
-    emit([{var,H},Sep]),
-    mkvlist([T1|T], Sep);
-mkvlist([H|T], Sep) ->
-    emit([{var,H}]),
-    mkvlist(T, Sep);
-mkvlist([], _) ->
-    true.
-
-mkvlist(L) ->
-    mkvlist(L,", ").
-
-mkvplus(L) ->
-    mkvlist(L," + ").
-
-extensible(CompList) when list(CompList) ->
-    noext;
-extensible({RootList,ExtList}) ->
-    {ext,length(RootList)+1,length(ExtList)}.
-
-
-print_attribute_comment(InnerType,Pos,Cname,Prop) ->
-    CommentLine = "%%-------------------------------------------------",
-    emit([nl,CommentLine]),
-    case InnerType of
-	{typereference,_,Name} -> 
-	    emit([nl,"%% attribute ",Cname,"(",Pos,") with type ",Name]);
-	{'Externaltypereference',_,XModule,Name} -> 
-	    emit([nl,"%% attribute ",Cname,"(",Pos,")   External ",XModule,":",Name]);
-	_ ->
-	    emit([nl,"%% attribute ",Cname,"(",Pos,") with type ",InnerType])
-    end,
-    case Prop of
-	mandatory ->
-	    continue;
-	{'DEFAULT', Def} ->
-	    emit([" DEFAULT = ",{asis,Def}]);
-	'OPTIONAL' ->
-	    emit([" OPTIONAL"])
-    end,
-    emit([nl,CommentLine,nl]).
-
-
-    
-mkfuncname(TopType,Cname,WhatKind,Prefix) ->
-    CurrMod = get(currmod),
-    case WhatKind of
-	#'Externaltypereference'{module=CurrMod,type=EType} ->
-	    F = lists:concat(["'",Prefix,EType,"'"]),
-	    {F, "?MODULE", F};
-	#'Externaltypereference'{module=Mod,type=EType} ->
-	    {lists:concat(["'",Mod,"':'",Prefix,EType,"'"]),Mod,
-	     lists:concat(["'",Prefix,EType,"'"])};
-	{constructed,bif} ->
-	    F = lists:concat(["'",Prefix,asn1ct_gen:list2name([Cname|TopType]),"'"]),
-	    {F, "?MODULE", F}
-    end.
-
-empty_lb(ber) ->
-    "[]";
-empty_lb(ber_bin) ->
-    "<<>>";
-empty_lb(ber_bin_v2) ->
-    "<<>>".
-
-value_match(Index,Value) when atom(Value) ->
-    value_match(Index,atom_to_list(Value));
-value_match([],Value) ->
-    Value;
-value_match([{VI,_}|VIs],Value) ->
-    value_match1(Value,VIs,lists:concat(["element(",VI,","]),1).
-value_match1(Value,[],Acc,Depth) ->
-    Acc ++ Value ++ lists:concat(lists:duplicate(Depth,")"));
-value_match1(Value,[{VI,_}|VIs],Acc,Depth) ->
-    value_match1(Value,VIs,Acc++lists:concat(["element(",VI,","]),Depth+1).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_constructed_per.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_constructed_per.erl
deleted file mode 100644
index 9b4e0063bb..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_constructed_per.erl
+++ /dev/null
@@ -1,1235 +0,0 @@
-% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_constructed_per.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
-%%
--module(asn1ct_constructed_per).
-
--export([gen_encode_sequence/3]).
--export([gen_decode_sequence/3]).
--export([gen_encode_set/3]).
--export([gen_decode_set/3]).
--export([gen_encode_sof/4]).
--export([gen_decode_sof/4]).
--export([gen_encode_choice/3]).
--export([gen_decode_choice/3]).
-
--include("asn1_records.hrl").
-%-compile(export_all).
-
--import(asn1ct_gen, [emit/1,demit/1]).
-
-
-%% ENCODE GENERATOR FOR SEQUENCE TYPE  ** **********
-
-
-gen_encode_set(Erules,TypeName,D) ->
-    gen_encode_constructed(Erules,TypeName,D).
-
-gen_encode_sequence(Erules,TypeName,D) ->
-    gen_encode_constructed(Erules,TypeName,D).
-
-gen_encode_constructed(Erules,Typename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(term),
-    asn1ct_name:new(bytes),
-    {CompList,TableConsInfo} = 
-	case D#type.def of
-	    #'SEQUENCE'{tablecinf=TCI,components=CL} ->
-		{CL,TCI};
-	    #'SET'{tablecinf=TCI,components=CL} ->
-		{CL,TCI}
-	end,
-    case Typename of
-	['EXTERNAL'] ->
-	    emit({{var,asn1ct_name:next(val)},
-		  " = asn1rt_check:transform_to_EXTERNAL1990(",
-		  {var,asn1ct_name:curr(val)},"),",nl}),
-	    asn1ct_name:new(val);
-	_ ->
-	    ok
-    end,
-    case {Optionals = optionals(CompList),CompList} of
-	{[],EmptyCL} when EmptyCL == {[],[]};EmptyCL == [] -> 
-	    emit(["%%Variable setting just to eliminate ",
-		  "compiler warning for unused vars!",nl,
-		  "_Val = ",{var,asn1ct_name:curr(val)},",",nl]);
-	{[],_} ->
-	    emit([{var,asn1ct_name:next(val)}," = ?RT_PER:list_to_record("]),
-	    emit(["'",asn1ct_gen:list2rname(Typename),"'"]),
-	    emit([", ",{var,asn1ct_name:curr(val)},"),",nl]);
-	_ ->
-	    Fixoptcall = 
-		case Erules of
-		    per -> ",Opt} = ?RT_PER:fixoptionals2(";
-		    _ -> ",Opt} = ?RT_PER:fixoptionals("
-		end,
-	    emit({"{",{var,asn1ct_name:next(val)},Fixoptcall,
-		  {asis,Optionals},",",length(Optionals),
-		  ",",{var,asn1ct_name:curr(val)},"),",nl})
-    end,
-    asn1ct_name:new(val),
-    Ext = extensible(CompList),
-    case Ext of
-	{ext,_,NumExt} when NumExt > 0 ->
-	    emit(["Extensions = ?RT_PER:fixextensions(",{asis,Ext},
-		  ", ",{curr,val},"),",nl]);
-	_ -> true
-    end,
-    EncObj =
-	case TableConsInfo of
-	    #simpletableattributes{usedclassfield=Used,
-				   uniqueclassfield=Unique} when Used /= Unique ->
-		false;
-	    %% ObjectSet, name of the object set in constraints
-	    %% 
-	    %%{ObjectSet,AttrN,N,UniqueFieldName} -> %% N is index of attribute that determines constraint
-	    #simpletableattributes{objectsetname=ObjectSet,
-				   c_name=AttrN,
-				   c_index=N,
-				   usedclassfield=UniqueFieldName,
-				   uniqueclassfield=UniqueFieldName,
-				   valueindex=ValueIndex
-				  } -> %% N is index of attribute that determines constraint
-		OSDef =
-		    case ObjectSet of
-			{Module,OSName} ->
-			    asn1_db:dbget(Module,OSName);
-			OSName ->
-			    asn1_db:dbget(get(currmod),OSName)
-		    end,
-		case (OSDef#typedef.typespec)#'ObjectSet'.gen of
-		    true ->
-			ObjectEncode = 
-			    asn1ct_gen:un_hyphen_var(lists:concat(['Obj',AttrN])),
-			emit([ObjectEncode," = ",nl]),
-			emit(["  'getenc_",ObjectSet,"'(",
-			      {asis,UniqueFieldName},", ",nl]),
-			El = make_element(N+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),AttrN),
-			Indent = 12 + length(atom_to_list(ObjectSet)), 
-			case ValueIndex of
-			    [] ->
-				emit([indent(Indent),El,"),",nl]);
-			    _ ->
-				emit([indent(Indent),"value_match(",
-				      {asis,ValueIndex},",",El,")),",nl]),
-				notice_value_match()
-			end,
-			{AttrN,ObjectEncode};
-		    _ ->
-			false
-		end;
-	    _  ->
-		case D#type.tablecinf of
-		    [{objfun,_}|_] ->
-			%% when the simpletableattributes was at an outer
-			%% level and the objfun has been passed through the
-			%% function call
-			{"got objfun through args","ObjFun"};
-		    _ ->
-			false
-		end
-	end,
-    emit({"[",nl}),
-    MaybeComma1 = 
-	case Ext of
-	    {ext,_Pos,NumExt2} when NumExt2 > 0 -> 
-		emit({"?RT_PER:setext(Extensions =/= [])"}),
-		", ";
-	    {ext,_Pos,_} -> 
-		emit({"?RT_PER:setext(false)"}),
-		", ";
-	    _ -> 
-		""
-	end,
-    MaybeComma2 = 
-	case optionals(CompList) of
-	    [] -> MaybeComma1;
-	    _ -> 
-		emit(MaybeComma1),
-		emit("Opt"),
-		{",",nl}
-	end,
-    gen_enc_components_call(Typename,CompList,MaybeComma2,EncObj,Ext),
-    emit({"].",nl}).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% generate decode function for SEQUENCE and SET
-%%
-gen_decode_set(Erules,Typename,D) ->
-    gen_decode_constructed(Erules,Typename,D).
-
-gen_decode_sequence(Erules,Typename,D) ->
-    gen_decode_constructed(Erules,Typename,D).
-
-gen_decode_constructed(_Erules,Typename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    {CompList,TableConsInfo} = 
-	case D#type.def of
-	    #'SEQUENCE'{tablecinf=TCI,components=CL} ->
-		{CL,TCI};
-	    #'SET'{tablecinf=TCI,components=CL} ->
-		{CL,TCI}
-	end,
-    Ext = extensible(CompList),
-    MaybeComma1 = case Ext of
-		      {ext,_Pos,_NumExt} -> 
-			  gen_dec_extension_value("Bytes"),
-			  {",",nl};
-		      _ -> 
-			  ""
-		  end,
-    Optionals = optionals(CompList),
-    MaybeComma2 = case Optionals of
-		      [] -> MaybeComma1;
-		      _ -> 
-			  Bcurr = asn1ct_name:curr(bytes),
-			  Bnext = asn1ct_name:next(bytes),
-			  emit(MaybeComma1),
-			  GetoptCall = "} = ?RT_PER:getoptionals2(",
-			  emit({"{Opt,",{var,Bnext},GetoptCall,
-				{var,Bcurr},",",{asis,length(Optionals)},")"}),
-			  asn1ct_name:new(bytes),
-			  ", "    
-		  end,
-    {DecObjInf,UniqueFName,ValueIndex} = 
-	case TableConsInfo of
-%%	    {ObjectSet,AttrN,N,UniqueFieldName} ->%% N is index of attribute that determines constraint
-	    #simpletableattributes{objectsetname=ObjectSet,
-				   c_name=AttrN,
-				   usedclassfield=UniqueFieldName,
-				   uniqueclassfield=UniqueFieldName,
-				   valueindex=ValIndex} ->
-%%		{AttrN,ObjectSet};
-		F = fun(#'ComponentType'{typespec=CT})->
-			    case {CT#type.constraint,CT#type.tablecinf} of
-				{[],[{objfun,_}|_R]} -> true;
-				_ -> false
-			    end
-		    end,
-		case lists:any(F,CompList) of
-		    true -> % when component relation constraint establish
-			%% relation from a component to another components
-			%% subtype component
-			{{AttrN,{deep,ObjectSet,UniqueFieldName,ValIndex}},
-			 UniqueFieldName,ValIndex};
-		    false ->
-			{{AttrN,ObjectSet},UniqueFieldName,ValIndex}
-		end;
-	    _ ->
-		case D#type.tablecinf of
-		    [{objfun,_}|_] ->
-			{{"got objfun through args","ObjFun"},false,false};
-		    _ ->
-			{false,false,false}
-		end
-	end,
-    {AccTerm,AccBytes} =
-	gen_dec_components_call(Typename,CompList,MaybeComma2,DecObjInf,Ext,length(Optionals)),
-    case asn1ct_name:all(term) of
-	[] -> emit(MaybeComma2); % no components at all
-	_ -> emit({com,nl})
-    end,
-    case {AccTerm,AccBytes} of
-	{[],[]} ->
-	    ok;
-	{_,[]} ->
-	    ok;
-	{[{ObjSet,LeadingAttr,Term}],ListOfOpenTypes} ->
-	    DecObj = asn1ct_gen:un_hyphen_var(lists:concat(['DecObj',LeadingAttr,Term])),
-	    ValueMatch = value_match(ValueIndex,Term),
-	    emit({DecObj," =",nl,"   'getdec_",ObjSet,"'(",
-%		  {asis,UniqueFName},", ",Term,"),",nl}),
-		  {asis,UniqueFName},", ",ValueMatch,"),",nl}),
-	    gen_dec_listofopentypes(DecObj,ListOfOpenTypes,false)
-    end,
-    %% we don't return named lists any more   Cnames = mkcnamelist(CompList), 
-    demit({"Result = "}), %dbg
-    %% return value as record
-    case Typename of
-	['EXTERNAL'] ->
-	    emit({"   OldFormat={'",asn1ct_gen:list2rname(Typename),
-		  "'"}),
-	    mkvlist(asn1ct_name:all(term)),
-	    emit({"},",nl}),
-	    emit({"   ASN11994Format =",nl,
-		  "      asn1rt_check:transform_to_EXTERNAL1994",
-		  "(OldFormat),",nl}),
-	    emit("   {ASN11994Format,");
-	_ ->
-	    emit(["{{'",asn1ct_gen:list2rname(Typename),"'"]),
-	    mkvlist(asn1ct_name:all(term)),
-	    emit("},")
-    end,
-    emit({{var,asn1ct_name:curr(bytes)},"}"}),
-    emit({".",nl,nl}).
-
-gen_dec_listofopentypes(_,[],_) ->
-    emit(nl);
-gen_dec_listofopentypes(DecObj,[{_Cname,{FirstPFN,PFNList},Term,TmpTerm,Prop}|Rest],_Update) ->
-
-%    asn1ct_name:new(term),
-    asn1ct_name:new(tmpterm),
-    asn1ct_name:new(reason),
-
-    emit([Term," = ",nl]),
-
-    N = case Prop of
-	    mandatory -> 0;
-	    'OPTIONAL' ->
-		emit_opt_or_mand_check(asn1_NOVALUE,TmpTerm),
-		6;
-	    {'DEFAULT',Val} ->
-		emit_opt_or_mand_check(Val,TmpTerm),
-		6
-	end,
-
-    emit([indent(N+3),"case (catch ",DecObj,"(",
-	  {asis,FirstPFN},", ",TmpTerm,", telltype,",{asis,PFNList},")) of",nl]),
-    emit([indent(N+6),"{'EXIT', ",{curr,reason},"} ->",nl]),
-%%    emit({indent(9),"throw({runtime_error,{","'Type not compatible with table constraint'",",",Term,"}});",nl}),
-    emit([indent(N+9),"exit({'Type not compatible with table constraint',",
-	  {curr,reason},"});",nl]),
-    emit([indent(N+6),"{",{curr,tmpterm},",_} ->",nl]),
-    emit([indent(N+9),{curr,tmpterm},nl]),
-
-    case Prop of
-	mandatory ->
-	    emit([indent(N+3),"end,",nl]);
-	_ ->
-	    emit([indent(N+3),"end",nl,
-		  indent(3),"end,",nl])
-    end,
-    gen_dec_listofopentypes(DecObj,Rest,true).
-
-
-emit_opt_or_mand_check(Val,Term) ->
-    emit([indent(3),"case ",Term," of",nl,
-	  indent(6),{asis,Val}," ->",{asis,Val},";",nl,
-	  indent(6),"_ ->",nl]).
-
-%% ENCODE GENERATOR FOR THE CHOICE TYPE *******
-%% assume Val = {Alternative,AltType}
-%% generate
-%%[
-%% ?RT_PER:set_choice(element(1,Val),Altnum,Altlist,ext),
-%%case element(1,Val) of
-%%    alt1 ->
-%%	encode_alt1(element(2,Val));
-%%    alt2 ->
-%%	encode_alt2(element(2,Val))
-%%end
-%%].
-
-gen_encode_choice(_Erules,Typename,D) when record(D,type) ->
-    {'CHOICE',CompList} = D#type.def,
-    emit({"[",nl}),
-    Ext = extensible(CompList),
-    gen_enc_choice(Typename,CompList,Ext),
-    emit({nl,"].",nl}).
-
-gen_decode_choice(_Erules,Typename,D) when record(D,type) ->
-    asn1ct_name:start(),
-    asn1ct_name:new(bytes),
-    {'CHOICE',CompList} = D#type.def,
-    Ext = extensible(CompList),
-    gen_dec_choice(Typename,CompList,Ext),
-    emit({".",nl}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Encode generator for SEQUENCE OF type
-
-
-gen_encode_sof(_Erules,Typename,SeqOrSetOf,D) when record(D,type) ->
-    asn1ct_name:start(),
-% Val = [Component]
-% ?RT_PER:encode_length(length(Val)),
-% lists:
-    {_SeqOrSetOf,ComponentType} = D#type.def,
-    emit({"[",nl}),
-    SizeConstraint =
-	case asn1ct_gen:get_constraint(D#type.constraint,
-				       'SizeConstraint') of
-	    no -> undefined;
-	    Range -> Range
-	end,
-    ObjFun =
-	case D#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		", ObjFun";
-	    _->
-		""
-	end,
-    emit({nl,indent(3),"?RT_PER:encode_length(",
-	  {asis,SizeConstraint},
-	  ",length(Val)),",nl}),
-    emit({indent(3),"'enc_",asn1ct_gen:list2name(Typename),
-	      "_components'(Val",ObjFun,", [])"}),
-    emit({nl,"].",nl}),
-    NewComponentType =
-	case ComponentType#type.def of
-	    {'ENUMERATED',_,Component}->
-		ComponentType#type{def={'ENUMERATED',Component}};
-	    _ -> ComponentType
-	end,
-    gen_encode_sof_components(Typename,SeqOrSetOf,NewComponentType).
-
-gen_decode_sof(_Erules,Typename,SeqOrSetOf,D) when record(D,type) ->
-    asn1ct_name:start(),
-% Val = [Component]
-% ?RT_PER:encode_length(length(Val)),
-% lists:
-    {_SeqOrSetOf,ComponentType} = D#type.def,
-    SizeConstraint =
-	case asn1ct_gen:get_constraint(D#type.constraint,
-				       'SizeConstraint') of
-	    no -> undefined;
-	    Range -> Range
-	end,
-    ObjFun =
-	case D#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		", ObjFun";
-	    _ ->
-		""
-	end,
-    emit({nl,"{Num,Bytes1} = ?RT_PER:decode_length(Bytes,",{asis,SizeConstraint},"),",nl}),
-    emit({"'dec_",asn1ct_gen:list2name(Typename),
-	      "_components'(Num, Bytes1, telltype",ObjFun,", []).",nl}),
-    NewComponentType =
-	case ComponentType#type.def of
-	    {'ENUMERATED',_,Component}->
-		ComponentType#type{def={'ENUMERATED',Component}};
-	    _ -> ComponentType
-	end,
-    gen_decode_sof_components(Typename,SeqOrSetOf,NewComponentType).
-
-gen_encode_sof_components(Typename,SeqOrSetOf,Cont) ->
-    {ObjFun,ObjFun_Var} =
-	case Cont#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		{", ObjFun",", _"};
-	    _ ->
-		{"",""}
-	end,
-    emit({"'enc_",asn1ct_gen:list2name(Typename),"_components'([]",
-	  ObjFun_Var,", Acc) -> lists:reverse(Acc);",nl,nl}),
-    emit({"'enc_",asn1ct_gen:list2name(Typename),"_components'([H|T]",
-	  ObjFun,", Acc) ->",nl}),
-    emit({"'enc_",asn1ct_gen:list2name(Typename),"_components'(T"}), 
-    emit({ObjFun,", ["}),
-    %% the component encoder
-    Constructed_Suffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,
-						       Cont#type.def),
-    
-    Conttype = asn1ct_gen:get_inner(Cont#type.def),
-    Currmod = get(currmod),
-    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
-					  asn1ct_gen:rt2ct_suffix()])),
-    case asn1ct_gen:type(Conttype) of
-	{primitive,bif} ->
-	    gen_encode_prim_wrapper(Ctgenmod,per,Cont,false,"H");
-% 	    Ctgenmod:gen_encode_prim(per,Cont,false,"H");
-	{constructed,bif} ->
-	    NewTypename = [Constructed_Suffix|Typename],
-	    emit({"'enc_",asn1ct_gen:list2name(NewTypename),"'(H",
-		  ObjFun,")",nl,nl});
-	#'Externaltypereference'{module=Currmod,type=Ename} ->
-	    emit({"'enc_",Ename,"'(H)",nl,nl});
-	#'Externaltypereference'{module=EMod,type=EType} ->
-	    emit({"'",EMod,"':'enc_",EType,"'(H)",nl,nl});
-	_ ->
-	    emit({"'enc_",Conttype,"'(H)",nl,nl})
-    end,
-    emit({" | Acc]).",nl}).
-
-gen_decode_sof_components(Typename,SeqOrSetOf,Cont) ->
-    {ObjFun,ObjFun_Var} =
-	case Cont#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		{", ObjFun",", _"};
-	    _ ->
-		{"",""}
-	end,
-    emit({"'dec_",asn1ct_gen:list2name(Typename),
-	  "_components'(0, Bytes, _",ObjFun_Var,", Acc) ->",nl,
-	  indent(3),"{lists:reverse(Acc), Bytes};",nl}),
-    emit({"'dec_",asn1ct_gen:list2name(Typename),
-	  "_components'(Num, Bytes, _",ObjFun,", Acc) ->",nl}),
-    emit({indent(3),"{Term,Remain} = "}),
-    Constructed_Suffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,
-						       Cont#type.def),
-    Conttype = asn1ct_gen:get_inner(Cont#type.def),
-    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
-					  asn1ct_gen:rt2ct_suffix()])),
-    case asn1ct_gen:type(Conttype) of
-	{primitive,bif} ->
-	    Ctgenmod:gen_dec_prim(per,Cont,"Bytes"),
-	    emit({com,nl});
-	{constructed,bif} ->
-	    NewTypename = [Constructed_Suffix|Typename],
-	    emit({"'dec_",asn1ct_gen:list2name(NewTypename),
-		  "'(Bytes, telltype",ObjFun,"),",nl});
-	#typereference{val=Dname} ->
-	    emit({"'dec_",Dname,"'(Bytes,telltype),",nl});
-	#'Externaltypereference'{module=EMod,type=EType} ->
-	    emit({"'",EMod,"':'dec_",EType,"'(Bytes,telltype),",nl});
-	_ ->
-	    emit({"'dec_",Conttype,"'(Bytes,telltype),",nl})
-    end,
-    emit({indent(3),"'dec_",asn1ct_gen:list2name(Typename),
-	  "_components'(Num-1, Remain, telltype",ObjFun,", [Term|Acc]).",nl}). 
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% General and special help functions (not exported)
-
-mkvlist([H|T]) ->
-    emit(","),
-    mkvlist2([H|T]);
-mkvlist([]) ->
-    true.
-mkvlist2([H,T1|T]) ->
-    emit({{var,H},","}),
-    mkvlist2([T1|T]);
-mkvlist2([H|T]) ->
-    emit({{var,H}}),
-    mkvlist2(T);
-mkvlist2([]) ->
-    true.
-
-extensible(CompList) when list(CompList) ->
-    noext;
-extensible({RootList,ExtList}) ->
-    {ext,length(RootList)+1,length(ExtList)}.
-
-gen_dec_extension_value(_) ->
-    emit({"{Ext,",{next,bytes},"} = ?RT_PER:getext(",{curr,bytes},")"}),
-    asn1ct_name:new(bytes).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Produce a list with positions (in the Value record) where
-%% there are optional components, start with 2 because first element
-%% is the record name
-
-optionals({L,_Ext}) -> optionals(L,[],2); 
-optionals(L) -> optionals(L,[],2).
-
-optionals([{'EXTENSIONMARK',_,_}|Rest],Acc,Pos) ->
-    optionals(Rest,Acc,Pos); % optionals in extension are currently not handled
-optionals([#'ComponentType'{prop='OPTIONAL'}|Rest],Acc,Pos) ->
-		 optionals(Rest,[Pos|Acc],Pos+1);
-optionals([#'ComponentType'{prop={'DEFAULT',_}}|Rest],Acc,Pos) ->
-		 optionals(Rest,[Pos|Acc],Pos+1);
-optionals([#'ComponentType'{}|Rest],Acc,Pos) ->
-		 optionals(Rest,Acc,Pos+1);
-optionals([],Acc,_) ->
-    lists:reverse(Acc).
-
-
-gen_enc_components_call(TopType,{CompList,ExtList},MaybeComma,DynamicEnc,Ext) ->
-    %% The type has extensionmarker
-    Rpos = gen_enc_components_call1(TopType,CompList,1,MaybeComma,DynamicEnc,noext),
-    case Ext of
-	{ext,_,ExtNum} when ExtNum > 0 ->
-	    emit([nl,
-		  ",Extensions",nl]);
-	_ -> true
-    end,
-    %handle extensions
-    gen_enc_components_call1(TopType,ExtList,Rpos,MaybeComma,DynamicEnc,Ext);
-gen_enc_components_call(TopType, CompList, MaybeComma, DynamicEnc, Ext) ->
-    %% The type has no extensionmarker
-    gen_enc_components_call1(TopType,CompList,1,MaybeComma,DynamicEnc,Ext).
-
-gen_enc_components_call1(TopType,
-			 [C=#'ComponentType'{name=Cname,typespec=Type,prop=Prop}|Rest],
-			 Tpos,
-			 MaybeComma, DynamicEnc, Ext) ->
-
-    put(component_type,{true,C}), 
-    %% information necessary in asn1ct_gen_per_rt2ct:gen_encode_prim
-
-    Pos = case Ext of
-	      noext -> Tpos;
-	      {ext,Epos,_Enum} -> Tpos - Epos + 1
-	  end,
-    emit(MaybeComma),
-    case Prop of
-	'OPTIONAL' ->
-	    gen_enc_component_optional(TopType,Cname,Type,Tpos,DynamicEnc,Ext);
-	{'DEFAULT',_DefVal} ->
-	    gen_enc_component_default(TopType,Cname,Type,Tpos,DynamicEnc,Ext);
-	_ ->
-	    case Ext of
-		{ext,ExtPos,_} when Tpos >= ExtPos ->
-		    gen_enc_component_optional(TopType,Cname,Type,Tpos,DynamicEnc,Ext);
-		_ ->
-		    gen_enc_component_mandatory(TopType,Cname,Type,Tpos,DynamicEnc,Ext)
-	    end
-    end,
-
-    erase(component_type),
-
-    case Rest of
-	[] ->
-	    Pos+1;
-	_ ->
-	    emit({com,nl}),
-	    gen_enc_components_call1(TopType,Rest,Tpos+1,"",DynamicEnc,Ext)
-    end;
-gen_enc_components_call1(_TopType,[],Pos,_,_,_) ->
-	Pos.
-
-gen_enc_component_default(TopType,Cname,Type,Pos,DynamicEnc,Ext) ->
-%    Element = io_lib:format("?RT_PER:cindex(~w,Val1,~w)",[Pos+1,Cname]),
-    Element = make_element(Pos+1,"Val1",Cname),
-    emit({"case ",Element," of",nl}),
-%    case Ext of
-%	{ext,ExtPos,_} when Pos >= ExtPos ->
-%	    emit({"asn1_NOEXTVALUE -> [];",nl});
-%	_ ->
-    emit({"asn1_DEFAULT -> [];",nl}),
-%    end,
-    asn1ct_name:new(tmpval),
-    emit({{curr,tmpval}," ->",nl}),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    emit({nl,"%% attribute number ",Pos," with type ",
-	      InnerType,nl}),
-    NextElement = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
-    gen_enc_line(TopType,Cname,Type,NextElement, Pos,DynamicEnc,Ext),
-    emit({nl,"end"}).
-
-gen_enc_component_optional(TopType,Cname,Type,Pos,DynamicEnc,Ext) ->
-%    Element = io_lib:format("?RT_PER:cindex(~w,Val1,~w)",[Pos+1,Cname]),
-    Element = make_element(Pos+1,"Val1",Cname),
-    emit({"case ",Element," of",nl}),
-%    case Ext of
-%	{ext,ExtPos,_} when Pos >= ExtPos ->
-%	    emit({"asn1_NOEXTVALUE -> [];",nl});
-%	_ ->
-    emit({"asn1_NOVALUE -> [];",nl}),
-%    end,
-    asn1ct_name:new(tmpval),
-    emit({{curr,tmpval}," ->",nl}),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    emit({nl,"%% attribute number ",Pos," with type ",
-	      InnerType,nl}),
-    NextElement = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
-    gen_enc_line(TopType,Cname,Type,NextElement, Pos,DynamicEnc,Ext),
-    emit({nl,"end"}).
-
-gen_enc_component_mandatory(TopType,Cname,Type,Pos,DynamicEnc,Ext) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    emit({nl,"%% attribute number ",Pos," with type ",
-	      InnerType,nl}),
-    gen_enc_line(TopType,Cname,Type,[],Pos,DynamicEnc,Ext).
-
-gen_enc_line(TopType, Cname, Type, [], Pos,DynamicEnc,Ext) ->
-%    Element = io_lib:format("?RT_PER:cindex(~w,~s,~w)",[Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),Cname]),
-    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),Cname),
-    gen_enc_line(TopType,Cname,Type,Element, Pos,DynamicEnc,Ext);
-gen_enc_line(TopType,Cname,Type,Element, Pos,DynamicEnc,Ext) ->
-    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
-					  asn1ct_gen:rt2ct_suffix()])),
-    Atype = 
-	case Type of
-	    #type{def=#'ObjectClassFieldType'{type=InnerType}} ->
-		InnerType;
-	    _  ->
-		asn1ct_gen:get_inner(Type#type.def)
-	end,
-% 	case asn1ct_gen:get_constraint(Type#type.constraint,
-% 				       tableconstraint_info) of
-% 	    no ->
-% 		asn1ct_gen:get_inner(Type#type.def);
-% 	    _ ->
-% 		Type#type.def
-% 	end,
-    case Ext of
-	{ext,Ep1,_} when  Pos >= Ep1 ->
-	    emit(["?RT_PER:encode_open_type(dummy,?RT_PER:complete("]);
-	_ -> true
-    end,
-    case Atype of
-	{typefield,_} ->
-	    case DynamicEnc of
-		{_LeadingAttrName,Fun} ->
-% 		    case asn1ct_gen:get_constraint(Type#type.constraint,
-% 						   componentrelation) of
-		    case (Type#type.def)#'ObjectClassFieldType'.fieldname of
-			{notype,T} ->
-			    throw({error,{notype,type_from_object,T}});
-			{Name,RestFieldNames} when atom(Name) ->
-			    emit({"?RT_PER:encode_open_type([],?RT_PER:complete(",nl}),
-			    emit({"   ",Fun,"(",{asis,Name},", ",
-				  Element,", ",{asis,RestFieldNames},")))"});
-			Other ->
-			    throw({asn1,{'internal error',Other}})
-		    end
-	    end;
-	{objectfield,PrimFieldName1,PFNList} ->
-	    case DynamicEnc of
-		{_LeadingAttrName,Fun} ->
-		    emit({"?RT_PER:encode_open_type([],"
-			  "?RT_PER:complete(",nl}),
-		    emit({"   ",Fun,"(",{asis,PrimFieldName1},
-			  ", ",Element,", ",{asis,PFNList},")))"})
-	    end;
-	_ ->
-	    CurrMod = get(currmod),
-	    case asn1ct_gen:type(Atype) of
-		#'Externaltypereference'{module=Mod,type=EType} when 
-		      (CurrMod==Mod) ->
-		    emit({"'enc_",EType,"'(",Element,")"});
-		#'Externaltypereference'{module=Mod,type=EType} ->
-		    emit({"'",Mod,"':'enc_",
-			  EType,"'(",Element,")"});
-		#typereference{val=Ename} ->
-		    emit({"'enc_",Ename,"'(",Element,")"});
-		{notype,_} ->
-		    emit({"'enc_",Atype,"'(",Element,")"});
-		{primitive,bif} ->
-		    EncType =
-			case Atype of
-			    {fixedtypevaluefield,_,Btype} ->
-				Btype;
-			    _ ->
-				Type
-			end,
-		    gen_encode_prim_wrapper(Ctgenmod,per,EncType,
-					    false,Element);
-% 		    Ctgenmod:gen_encode_prim(per,EncType,
-% 					     false,Element);
-		'ASN1_OPEN_TYPE' ->
-		    case Type#type.def of
-			#'ObjectClassFieldType'{type=OpenType} ->
-			    gen_encode_prim_wrapper(Ctgenmod,per,
-						    #type{def=OpenType},
-						    false,Element);
-			_ ->
-			    gen_encode_prim_wrapper(Ctgenmod,per,Type,
-						    false,Element)
-		    end;
-% 		    Ctgenmod:gen_encode_prim(per,Type,
-% 					     false,Element);
-		{constructed,bif} ->
-		    NewTypename = [Cname|TopType],
-		    case {Type#type.tablecinf,DynamicEnc} of
-			{[{objfun,_}|_R],{_,EncFun}} ->
-%%			    emit({"?RT_PER:encode_open_type([],",
-%%				  "?RT_PER:complete(",nl}),
-			    emit({"'enc_",
-				  asn1ct_gen:list2name(NewTypename),
-				  "'(",Element,", ",EncFun,")"});
-			_ ->
-			    emit({"'enc_",
-				  asn1ct_gen:list2name(NewTypename),
-				  "'(",Element,")"})
-		    end
-	    end
-    end,
-    case Ext of 
-	{ext,Ep2,_} when Pos >= Ep2 ->
-	    emit(["))"]);
-	_ -> true
-    end.
-
-gen_dec_components_call(TopType,{CompList,ExtList},MaybeComma,DecInfObj,Ext,NumberOfOptionals) ->
-    %% The type has extensionmarker
-    {Rpos,AccTerm,AccBytes} = 
-	gen_dec_components_call1(TopType, CompList, 1, 1, MaybeComma,DecInfObj,
-				 noext,[],[],NumberOfOptionals),
-    emit([",",nl,"{Extensions,",{next,bytes},"} = "]),
-    emit(["?RT_PER:getextension(Ext,",{curr,bytes},"),",nl]),
-    asn1ct_name:new(bytes),
-    {_Epos,AccTermE,AccBytesE} = 
-	gen_dec_components_call1(TopType,ExtList,Rpos, 1, "",DecInfObj,Ext,[],[],NumberOfOptionals),
-    case ExtList of
-	[] -> true;
-	_ -> emit([",",nl])
-    end,
-    emit([{next,bytes},"= ?RT_PER:skipextensions(",{curr,bytes},",",
-	  length(ExtList)+1,",Extensions)",nl]),
-    asn1ct_name:new(bytes),
-    {AccTerm++AccTermE,AccBytes++AccBytesE};
-
-gen_dec_components_call(TopType,CompList,MaybeComma,DecInfObj,Ext,NumberOfOptionals) ->
-    %% The type has no extensionmarker
-    {_,AccTerm,AccBytes} =
-	gen_dec_components_call1(TopType, CompList, 1, 1,MaybeComma,DecInfObj,Ext,[],[],NumberOfOptionals),
-    {AccTerm,AccBytes}.
-
-
-gen_dec_components_call1(TopType,
-			 [C=#'ComponentType'{name=Cname,typespec=Type,prop=Prop}|Rest],
-			 Tpos,OptPos,MaybeComma,DecInfObj,Ext,AccTerm,AccBytes,NumberOfOptionals) ->
-    Pos = case Ext of
-	      noext -> Tpos;
-	      {ext,Epos,_Enum} -> Tpos - Epos + 1
-	  end,
-    emit(MaybeComma),
-%%    asn1ct_name:new(term),
-    InnerType = 
-	case Type#type.def of
-	    #'ObjectClassFieldType'{type=InType} ->
-		InType;
-	    Def ->
-		asn1ct_gen:get_inner(Def)
-	end,
-% 	case asn1ct_gen:get_constraint(Type#type.constraint,
-% 				       tableconstraint_info) of
-% 	    no ->
-% 		asn1ct_gen:get_inner(Type#type.def);
-% 	    _ ->
-% 		Type#type.def
-% 	end,
-    case InnerType of
-	#'Externaltypereference'{type=T} ->
-	    emit({nl,"%%  attribute number ",Tpos," with type ",
-		  T,nl});
-	IT when tuple(IT) ->
-	    emit({nl,"%%  attribute number ",Tpos," with type ",
-		  element(2,IT),nl});
-	_ ->
-	    emit({nl,"%% attribute number ",Tpos," with type ",
-		  InnerType,nl})
-    end,
-
-    case InnerType of
-	{typefield,_} ->
-	    asn1ct_name:new(term),
-	    asn1ct_name:new(tmpterm),
-	    emit({"{",{curr,tmpterm},", ",{next,bytes},"} = "});
-	{objectfield,_,_} ->
-	    asn1ct_name:new(term),
-	    asn1ct_name:new(tmpterm),
-	    emit({"{",{curr,tmpterm},", ",{next,bytes},"} = "});
-	_ ->
-	    asn1ct_name:new(term),
-	    emit({"{",{curr,term},",",{next,bytes},"} = "})
-    end,
-
-    NewOptPos = 
-	case {Ext,Prop} of
-	    {noext,mandatory} -> OptPos; % generate nothing
-	    {noext,_} ->
-		Element = io_lib:format("Opt band (1 bsl ~w)",[NumberOfOptionals - OptPos]),
-		emit({"case ",Element," of",nl}),
-		emit({"_Opt",OptPos," when _Opt",OptPos," > 0 ->"}),
-		OptPos+1;
-	    _ ->
-		emit(["case Extensions of",nl]),
-		emit(["_ when size(Extensions) >= ",Pos,",element(",Pos,",Extensions) == 1 ->",nl])
-	end,
-    put(component_type,{true,C}),
-    {TermVar,BytesVar} = gen_dec_line(TopType,Cname,Type,Tpos,DecInfObj,Ext),
-    erase(component_type),
-    case {Ext,Prop} of
-	{noext,mandatory} -> true; % generate nothing
-	{noext,_} ->
-	    emit([";",nl,"0 ->"]),
-	    gen_dec_component_no_val(TopType,Cname,Type,Prop,Tpos,Ext);
-	_ ->
-	    emit([";",nl,"_  ->",nl]),
-	    gen_dec_component_no_val(TopType,Cname,Type,Prop,Tpos,Ext)
-    end,    
-    case {Ext,Prop} of
-	{noext,mandatory} -> true; % generate nothing
-	{noext,_} ->
-	    emit([nl,"end"]);
-	_ ->
-	    emit([nl,"end"])
-	    
-    end,
-    asn1ct_name:new(bytes),
-    case Rest of
-	[] ->
-	    {Pos+1,AccTerm++TermVar,AccBytes++BytesVar};
-	_ ->
-	    emit({com,nl}),
-	    gen_dec_components_call1(TopType,Rest,Tpos+1,NewOptPos,"",DecInfObj,Ext,
-				     AccTerm++TermVar,AccBytes++BytesVar,NumberOfOptionals)
-    end;
-
-gen_dec_components_call1(_TopType,[],Pos,_OptPos,_,_,_,AccTerm,AccBytes,_NumberOfOptionals) ->
-    {Pos,AccTerm,AccBytes}.
-
-
-%%gen_dec_component_no_val(TopType,Cname,Type,_,Pos,{ext,Ep,Enum}) when Pos >= Ep ->
-%%    emit({"{asn1_NOEXTVALUE,",{curr,bytes},"}",nl});
-gen_dec_component_no_val(_,_,_,{'DEFAULT',DefVal},_,_) ->
-    emit(["{",{asis,DefVal},",",{curr,bytes},"}",nl]);
-gen_dec_component_no_val(_,_,_,'OPTIONAL',_,_) ->
-    emit({"{asn1_NOVALUE,",{curr,bytes},"}",nl});
-gen_dec_component_no_val(_,_,_,mandatory,_,{ext,_,_}) ->
-    emit({"{asn1_NOVALUE,",{curr,bytes},"}",nl}).
-    
-
-gen_dec_line(TopType,Cname,Type,Pos,DecInfObj,Ext)  ->
-    Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per,
-					  asn1ct_gen:rt2ct_suffix()])),
-    Atype = 
-	case Type of
-	    #type{def=#'ObjectClassFieldType'{type=InnerType}} ->
-		InnerType;
-	    _  ->
-		asn1ct_gen:get_inner(Type#type.def)
-	end,
-% 	case asn1ct_gen:get_constraint(Type#type.constraint,
-% 				       tableconstraint_info) of
-% 	    no ->
-% 		asn1ct_gen:get_inner(Type#type.def);
-% 	    _ ->
-% 		Type#type.def
-% 	end,
-    BytesVar0 = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
-    BytesVar = case Ext of
-		   {ext,Ep,_} when Pos >= Ep ->
-		       emit(["begin",nl,"{TmpVal",Pos,",Trem",Pos,
-			     "}=?RT_PER:decode_open_type(",
-			     {curr,bytes},",[]),",nl,
-			     "{TmpValx",Pos,",_}="]),
-		       io_lib:format("TmpVal~p",[Pos]);
-		   _ -> BytesVar0
-	       end,
-    SaveBytes = 
-	case Atype of
-	    {typefield,_} ->
-		case DecInfObj of
-		    false -> % This is in a choice with typefield components
-			{Name,RestFieldNames} = 
-			    (Type#type.def)#'ObjectClassFieldType'.fieldname,
-% 			    asn1ct_gen:get_constraint(Type#type.constraint,
-% 						      tableconstraint_info),
-			asn1ct_name:new(tmpterm),
-			asn1ct_name:new(reason),
-			emit([indent(2),"{",{curr,tmpterm},", ",{next,bytes},
-			      "} = ?RT_PER:decode_open_type(",{curr,bytes},
-			      ", []),",nl]),
-			emit([indent(2),"case (catch ObjFun(",
-			      {asis,Name},
-			      ",",{curr,tmpterm},",telltype,",
-			      {asis,RestFieldNames},")) of", nl]),
-			emit([indent(4),"{'EXIT',",{curr,reason},"} ->",nl]),
-			emit([indent(6),"exit({'Type not ",
-			      "compatible with table constraint', ",
-			      {curr,reason},"});",nl]),
-			asn1ct_name:new(tmpterm),
-			emit([indent(4),"{",{curr,tmpterm},", _} ->",nl]),
-			emit([indent(6),"{",Cname,", {",{curr,tmpterm},", ",
-			      {next,bytes},"}}",nl]),
-			emit([indent(2),"end"]),
-			[];
-		    {"got objfun through args","ObjFun"} ->
-			%% this is when the generated code gots the
-			%% objfun though arguments on function
-			%% invocation.
-			{Name,RestFieldNames} = 
-			    (Type#type.def)#'ObjectClassFieldType'.fieldname,
-			emit(["?RT_PER:decode_open_type(",{curr,bytes},
-			      ", []),",nl]),
-			emit([{curr,term}," =",nl,
-			      "  case (catch ObjFun(",{asis,Name},",",
-			      {curr,tmpterm},",telltype,",
-			      {asis,RestFieldNames},")) of", nl]),
-			emit(["    {'EXIT',",{curr,reason},"} ->",nl]),
-			emit([indent(6),"exit({'Type not ",
-			      "compatible with table constraint', ",
-			      {curr,reason},"});",nl]),
-			asn1ct_name:new(tmpterm),
-			emit([indent(4),"{",{curr,tmpterm},", _} ->",nl]),
-			emit([indent(6),{curr,tmpterm},nl]),
-			emit([indent(2),"end"]),
-			[];
-		    _ ->
-			emit({"?RT_PER:decode_open_type(",{curr,bytes},
-			      ", [])"}),
-			RefedFieldName = 
-			    (Type#type.def)#'ObjectClassFieldType'.fieldname,
-% 			    asn1ct_gen:get_constraint(Type#type.constraint,
-% 						      tableconstraint_info),
-			[{Cname,RefedFieldName,
-			  asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-			  asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
-			  get_components_prop()}]
-		end;
-	    {objectfield,PrimFieldName1,PFNList} ->
-		emit({"?RT_PER:decode_open_type(",{curr,bytes},", [])"}),
-		[{Cname,{PrimFieldName1,PFNList},
-		  asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-		  asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
-		  get_components_prop()}];
-	    _ ->
-		CurrMod = get(currmod),
-		case asn1ct_gen:type(Atype) of
-		    #'Externaltypereference'{module=CurrMod,type=EType} ->
-			emit({"'dec_",EType,"'(",BytesVar,",telltype)"});
-		    #'Externaltypereference'{module=Mod,type=EType} ->
-			emit({"'",Mod,"':'dec_",EType,"'(",BytesVar,
-			      ",telltype)"});
-		    {primitive,bif} ->
-			case Atype of
-			   {fixedtypevaluefield,_,Btype} ->
-				Ctgenmod:gen_dec_prim(per,Btype,
-						      BytesVar);
-			    _ ->
-				Ctgenmod:gen_dec_prim(per,Type,
-						      BytesVar)
-			end;
-		    'ASN1_OPEN_TYPE' ->
-			case Type#type.def of
-			    #'ObjectClassFieldType'{type=OpenType} ->
-				Ctgenmod:gen_dec_prim(per,#type{def=OpenType},
-						      BytesVar);
-			    _ ->
-				Ctgenmod:gen_dec_prim(per,Type,
-						      BytesVar)
-			end;
-		    #typereference{val=Dname} ->
-			emit({"'dec_",Dname,"'(",BytesVar,",telltype)"});
-		    {notype,_} ->
-			emit({"'dec_",Atype,"'(",BytesVar,",telltype)"});
-		    {constructed,bif} ->
-			NewTypename = [Cname|TopType],
-			case Type#type.tablecinf of
-			    [{objfun,_}|_R] ->
-				emit({"'dec_",asn1ct_gen:list2name(NewTypename),
-				      "'(",BytesVar,", telltype, ObjFun)"});
-			    _ ->
-				emit({"'dec_",asn1ct_gen:list2name(NewTypename),
-				      "'(",BytesVar,", telltype)"})
-			end
-		end,
-		case DecInfObj of
-		    {Cname,{_,OSet,UniqueFName,ValIndex}} ->
-			Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-			ValueMatch = value_match(ValIndex,Term),
-			emit({",",nl,"ObjFun = 'getdec_",OSet,"'(",
-			      {asis,UniqueFName},", ",ValueMatch,")"});
-		    _ ->
-			ok
-		end,
-		[]
-	end,
-    case Ext of 
-	{ext,Ep2,_} when Pos >= Ep2 ->
-	    emit([", {TmpValx",Pos,",Trem",Pos,"}",nl,"end"]);
-	_ -> true
-    end,
-    %% Prepare return value
-    case DecInfObj of
-	{Cname,ObjSet} ->
-	    {[{ObjSet,Cname,asn1ct_gen:mk_var(asn1ct_name:curr(term))}],
-	     SaveBytes};
-	_ ->
-	    {[],SaveBytes}
-    end.
-
-gen_enc_choice(TopType,CompList,Ext) ->
-    gen_enc_choice_tag(CompList, [], Ext),
-    emit({com,nl}),
-    emit({"case element(1,Val) of",nl}),
-    gen_enc_choice2(TopType, CompList, Ext),
-    emit({nl,"end"}).
-
-gen_enc_choice_tag({C1,C2},_,_) ->
-    N1 = get_name_list(C1),
-    N2 = get_name_list(C2),
-    emit(["?RT_PER:set_choice(element(1,Val),",
-	  {asis,{N1,N2}},", ",{asis,{length(N1),length(N2)}},")"]);
-gen_enc_choice_tag(C,_,_) ->
-    N = get_name_list(C),
-    emit(["?RT_PER:set_choice(element(1,Val),",
-	  {asis,N},", ",{asis,length(N)},")"]).
-
-get_name_list(L) ->
-    get_name_list(L,[]).
-
-get_name_list([#'ComponentType'{name=Name}|T], Acc) ->
-    get_name_list(T,[Name|Acc]);
-get_name_list([], Acc) ->
-    lists:reverse(Acc).
-
-%gen_enc_choice_tag([H|T],Acc,Ext) when record(H,'ComponentType') ->
-%    gen_enc_choice_tag(T,[H#'ComponentType'.name|Acc],Ext);
-%gen_enc_choice_tag([H|T],Acc,Ext) -> % skip EXTENSIONMARK
-%    gen_enc_choice_tag(T,Acc,Ext);
-%gen_enc_choice_tag([],Acc,Ext) ->
-%    Length = length(Acc),
-%    emit({"?RT_PER:set_choice(element(1,Val),",{asis,Length},",",
-%	  {asis,lists:reverse(Acc)},",",{asis,Ext},")"}),
-%    Length.
-
-gen_enc_choice2(TopType, {L1,L2}, Ext) ->
-    gen_enc_choice2(TopType, L1 ++ L2, 0, Ext);
-gen_enc_choice2(TopType, L, Ext) ->
-    gen_enc_choice2(TopType, L, 0, Ext).
-
-gen_enc_choice2(TopType,[H1,H2|T], Pos, Ext) 
-when record(H1,'ComponentType'), record(H2,'ComponentType') ->
-    Cname = H1#'ComponentType'.name,
-    Type = H1#'ComponentType'.typespec,
-    EncObj =
-% 	case asn1ct_gen:get_constraint(Type#type.constraint,
-% 				       tableconstraint_info) of
-% 	    no ->
-% 		false;
-% 	    _ ->
-% 		{no_attr,"ObjFun"}
-% 	end,
-	case asn1ct_gen:get_constraint(Type#type.constraint,
-				       componentrelation) of
-	    no -> false;
-	    _ -> {no_attr,"ObjFun"}
-	end,
-    emit({{asis,Cname}," ->",nl}),
-    gen_enc_line(TopType,Cname,Type,"element(2,Val)", Pos+1,EncObj,Ext),
-    emit({";",nl}),
-    gen_enc_choice2(TopType,[H2|T], Pos+1, Ext);
-gen_enc_choice2(TopType,[H1|T], Pos, Ext) when record(H1,'ComponentType') ->
-    Cname = H1#'ComponentType'.name,
-    Type = H1#'ComponentType'.typespec,
-    EncObj =
-% 	case asn1ct_gen:get_constraint(Type#type.constraint,
-% 				       tableconstraint_info) of
-% 	    no ->
-% 		false;
-% 	    _ ->
-% 		{no_attr,"ObjFun"}
-% 	end,
-	case asn1ct_gen:get_constraint(Type#type.constraint,
-				       componentrelation) of
-	    no -> false;
-	    _ -> {no_attr,"ObjFun"}
-	end,
-    emit({{asis,H1#'ComponentType'.name}," ->",nl}),
-    gen_enc_line(TopType,Cname,Type,"element(2,Val)", Pos+1,EncObj,Ext),
-    gen_enc_choice2(TopType,T, Pos+1, Ext);
-gen_enc_choice2(_,[], _, _)  ->
-    true.
-
-gen_dec_choice(TopType,CompList,{ext,Pos,NumExt}) ->
-    emit({"{Ext,",{curr,bytes},"} = ?RT_PER:getbit(Bytes),",nl}),
-    asn1ct_name:new(bytes),
-    gen_dec_choice1(TopType,CompList,{ext,Pos,NumExt});
-gen_dec_choice(TopType,CompList,noext) ->
-    gen_dec_choice1(TopType,CompList,noext).
-
-gen_dec_choice1(TopType,CompList,noext) ->
-    emit({"{Choice,",{curr,bytes},
-	  "} = ?RT_PER:getchoice(",{prev,bytes},",",
-	  length(CompList),", 0),",nl}),
-    emit({"{Cname,{Val,NewBytes}} = case Choice of",nl}),
-    gen_dec_choice2(TopType,CompList,noext),
-    emit({nl,"end,",nl}),
-    emit({nl,"{{Cname,Val},NewBytes}"});
-gen_dec_choice1(TopType,{RootList,ExtList},Ext) ->
-    NewList = RootList ++ ExtList,
-    gen_dec_choice1(TopType, NewList, Ext);
-gen_dec_choice1(TopType,CompList,{ext,ExtPos,ExtNum}) ->
-    emit({"{Choice,",{curr,bytes},
-	  "} = ?RT_PER:getchoice(",{prev,bytes},",",
-	  length(CompList)-ExtNum,",Ext ),",nl}),
-    emit({"{Cname,{Val,NewBytes}} = case Choice + Ext*",ExtPos-1," of",nl}),
-    gen_dec_choice2(TopType,CompList,{ext,ExtPos,ExtNum}),
-    emit([";",nl,"_ -> {asn1_ExtAlt, ?RT_PER:decode_open_type(",{curr,bytes},",[])}"]),
-    emit({nl,"end,",nl}),
-    emit({nl,"{{Cname,Val},NewBytes}"}).
-
-
-gen_dec_choice2(TopType,L,Ext) ->
-    gen_dec_choice2(TopType,L,0,Ext).
-
-gen_dec_choice2(TopType,[H1,H2|T],Pos,Ext) 
-when record(H1,'ComponentType'), record(H2,'ComponentType') ->
-    Cname = H1#'ComponentType'.name,
-    Type = H1#'ComponentType'.typespec,
-    case Type#type.def of
-	#'ObjectClassFieldType'{type={typefield,_}} ->
-	    emit({Pos," -> ",nl}),
-	    wrap_gen_dec_line(H1,TopType,Cname,Type,Pos+1,false,Ext),
-	    emit({";",nl});
-	_ ->
-	    emit({Pos," -> {",{asis,Cname},",",nl}),
-	    wrap_gen_dec_line(H1,TopType,Cname,Type,Pos+1,false,Ext),
-	    emit({"};",nl})
-    end,
-    gen_dec_choice2(TopType,[H2|T],Pos+1,Ext);
-gen_dec_choice2(TopType,[H1,_H2|T],Pos,Ext) when record(H1,'ComponentType') ->
-    gen_dec_choice2(TopType,[H1|T],Pos,Ext); % skip extensionmark
-gen_dec_choice2(TopType,[H1|T],Pos,Ext) when record(H1,'ComponentType') ->
-    Cname = H1#'ComponentType'.name,
-    Type = H1#'ComponentType'.typespec,
-    case Type#type.def of
-	#'ObjectClassFieldType'{type={typefield,_}} ->
-	    emit({Pos," -> ",nl}),
-	    wrap_gen_dec_line(H1,TopType,Cname,Type,Pos+1,false,Ext);
-	_ ->
-	    emit({Pos," -> {",{asis,Cname},",",nl}),
-	    wrap_gen_dec_line(H1,TopType,Cname,Type,Pos+1,false,Ext),
-	    emit("}")
-    end,
-    gen_dec_choice2(TopType,[T],Pos+1);
-gen_dec_choice2(TopType,[_|T],Pos,Ext) ->
-    gen_dec_choice2(TopType,T,Pos,Ext);% skip extensionmark
-gen_dec_choice2(_,[],Pos,_)  ->
-    Pos.
-
-indent(N) ->
-    lists:duplicate(N,32). % 32 = space
-
-gen_encode_prim_wrapper(CtgenMod,Erule,Cont,DoTag,Value) ->    
-%    put(component_type,true), % add more info in component_type
-    CtgenMod:gen_encode_prim(Erule,Cont,DoTag,Value).
-%    erase(component_type).
-
-make_element(I,Val,Cname) ->
-    case lists:member(optimize,get(encoding_options)) of
-	false ->
-	    io_lib:format("?RT_PER:cindex(~w,~s,~w)",[I,Val,Cname]);
-	_ ->
-	    io_lib:format("element(~w,~s)",[I,Val])
-    end.
-
-wrap_gen_dec_line(C,TopType,Cname,Type,Pos,DIO,Ext) ->
-    put(component_type,{true,C}),
-    gen_dec_line(TopType,Cname,Type,Pos,DIO,Ext),
-    erase(component_type).
-
-get_components_prop() ->
-    case get(component_type) of
-	undefined ->
-	    mandatory;
-	{true,#'ComponentType'{prop=Prop}} -> Prop
-    end.
-
-			  
-value_match(Index,Value) when atom(Value) ->
-    value_match(Index,atom_to_list(Value));
-value_match([],Value) ->
-    Value;
-value_match([{VI,_}|VIs],Value) ->
-    value_match1(Value,VIs,lists:concat(["element(",VI,","]),1).
-value_match1(Value,[],Acc,Depth) ->
-    Acc ++ Value ++ lists:concat(lists:duplicate(Depth,")"));
-value_match1(Value,[{VI,_}|VIs],Acc,Depth) ->
-    value_match1(Value,VIs,Acc++lists:concat(["element(",VI,","]),Depth+1).
-
-notice_value_match() ->
-    Module = get(currmod),
-    put(value_match,{true,Module}).
-    
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen.erl
deleted file mode 100644
index e4a0b1fd9a..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen.erl
+++ /dev/null
@@ -1,1664 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_gen.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
-%%
--module(asn1ct_gen).
-
--include("asn1_records.hrl").
-%%-compile(export_all).
--export([pgen_exports/3,
-	 pgen_hrl/4,
-	 gen_head/3,
-	 demit/1,
-	 emit/1,
-	 fopen/2,
-	 get_inner/1,type/1,def_to_tag/1,prim_bif/1,
-	 type_from_object/1,
-	 get_typefromobject/1,get_fieldcategory/2,
-	 get_classfieldcategory/2,
-	 list2name/1,
-	 list2rname/1,
-	 constructed_suffix/2,
-	 unify_if_string/1,
-	 gen_check_call/7,
-	 get_constraint/2,
-	 insert_once/2,
-	 rt2ct_suffix/1,rt2ct_suffix/0]).
--export([pgen/4,pgen_module/5,mk_var/1, un_hyphen_var/1]).
--export([gen_encode_constructed/4,gen_decode_constructed/4]).
-
-%% pgen(Erules, Module, TypeOrVal)
-%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
-%% .hrl file is only generated if necessary
-%% Erules = per | ber | ber_bin | per_bin
-%% Module = atom()
-%% TypeOrVal = {TypeList,ValueList}
-%% TypeList = ValueList = [atom()]
-
-pgen(OutFile,Erules,Module,TypeOrVal) ->
-    pgen_module(OutFile,Erules,Module,TypeOrVal,true).
-
-
-pgen_module(OutFile,Erules,Module,TypeOrVal,Indent) ->
-    put(outfile,OutFile),
-    HrlGenerated = asn1ct_gen:pgen_hrl(Erules,Module,TypeOrVal,Indent),
-    asn1ct_name:start(),
-    ErlFile = lists:concat([OutFile,".erl"]),
-    Fid = asn1ct_gen:fopen(ErlFile,write),
-    put(gen_file_out,Fid),
-    asn1ct_gen:gen_head(Erules,Module,HrlGenerated),
-    pgen_exports(Erules,Module,TypeOrVal),
-    pgen_dispatcher(Erules,Module,TypeOrVal),
-    pgen_info(Erules,Module),
-    pgen_typeorval(wrap_ber(Erules),Module,TypeOrVal),
-    pgen_partial_incomplete_decode(Erules),
-% gen_vars(asn1_db:mod_to_vars(Module)),
-% gen_tag_table(AllTypes),
-    file:close(Fid),
-    io:format("--~p--~n",[{generated,ErlFile}]).
-
-
-pgen_typeorval(Erules,Module,{Types,Values,_Ptypes,_Classes,Objects,ObjectSets}) ->
-    pgen_types(Erules,Module,Types),
-    pgen_values(Erules,Module,Values),
-    pgen_objects(Erules,Module,Objects),
-    pgen_objectsets(Erules,Module,ObjectSets),
-    case catch lists:member(der,get(encoding_options)) of
-	true ->
-	    pgen_check_defaultval(Erules,Module);
-	_ -> ok
-    end,
-    pgen_partial_decode(Erules,Module).
-
-pgen_values(_,_,[]) ->
-    true;
-pgen_values(Erules,Module,[H|T]) ->
-    Valuedef = asn1_db:dbget(Module,H),
-    gen_value(Valuedef),
-    pgen_values(Erules,Module,T).
-
-pgen_types(_,Module,[]) ->
-    gen_value_match(Module),
-    true;
-pgen_types(Erules,Module,[H|T]) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
-    asn1ct_name:clear(),
-    Typedef = asn1_db:dbget(Module,H),
-    Rtmod:gen_encode(Erules,Typedef),
-    asn1ct_name:clear(),
-    Rtmod:gen_decode(Erules,Typedef),
-    pgen_types(Erules,Module,T).
-
-pgen_objects(_,_,[]) ->
-    true;
-pgen_objects(Erules,Module,[H|T]) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
-    asn1ct_name:clear(),
-    Typedef = asn1_db:dbget(Module,H),
-    Rtmod:gen_obj_code(Erules,Module,Typedef),
-    pgen_objects(Erules,Module,T).
-
-pgen_objectsets(_,_,[]) ->
-    true;
-pgen_objectsets(Erules,Module,[H|T]) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
-    asn1ct_name:clear(),
-    TypeDef = asn1_db:dbget(Module,H),
-    Rtmod:gen_objectset_code(Erules,TypeDef),
-    pgen_objectsets(Erules,Module,T).
-
-pgen_check_defaultval(Erules,Module) ->
-    CheckObjects = ets:tab2list(check_functions),
-    case get(asndebug) of
-	true ->
-	    FileName = lists:concat([Module,'.table']),
-	    {ok,IoDevice} = file:open(FileName,[write]),
-	    Fun =
-		fun(X)->
-			io:format(IoDevice,"~n~n************~n~n~p~n~n*****"
-				  "********~n~n",[X]) 
-		end,
-	    lists:foreach(Fun,CheckObjects),
-	    file:close(IoDevice);
-	_ -> ok
-    end,
-    gen_check_defaultval(Erules,Module,CheckObjects).
-
-pgen_partial_decode(Erules,Module) ->
-    pgen_partial_inc_dec(Erules,Module),
-    pgen_partial_dec(Erules,Module).
-
-pgen_partial_inc_dec(Erules,Module) ->
-%    io:format("Start partial incomplete decode gen?~n"),
-    case asn1ct:get_gen_state_field(inc_type_pattern) of
-	undefined ->
-%	    io:format("Partial incomplete decode gen not started:�~w~n",[asn1ct:get_gen_state_field(active)]),
-	    ok;
-%	[] ->
-%	    ok;
-	ConfList -> 
-	    PatternLists=lists:map(fun({_,P}) -> P end,ConfList),
-	    pgen_partial_inc_dec1(Erules,Module,PatternLists),
-	    gen_partial_inc_dec_refed_funcs(Erules)
-    end.
-    
-%% pgen_partial_inc_dec1 generates a function of the toptype in each
-%% of the partial incomplete decoded types.
-pgen_partial_inc_dec1(Erules,Module,[P|Ps]) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
-    TopTypeName = asn1ct:partial_inc_dec_toptype(P),
-    TypeDef=asn1_db:dbget(Module,TopTypeName),
-    asn1ct_name:clear(),
-    asn1ct:update_gen_state(namelist,P),
-    asn1ct:update_gen_state(active,true),
-    asn1ct:update_gen_state(prefix,"dec-inc-"),
-    Rtmod:gen_decode(Erules,TypeDef),
-%%    asn1ct:update_gen_state(namelist,tl(P)), %% 
-    gen_dec_part_inner_constr(Erules,TypeDef,[TopTypeName]),
-    pgen_partial_inc_dec1(Erules,Module,Ps);
-pgen_partial_inc_dec1(_,_,[]) ->
-    ok.
-
-gen_partial_inc_dec_refed_funcs(Erule) when Erule == ber_bin_v2 ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erule),
-				       rt2ct_suffix(Erule)])),
-    case asn1ct:next_refed_func() of
-	[] ->
-	    ok;
-	{#'Externaltypereference'{module=M,type=Name},Pattern} ->
-	    TypeDef = asn1_db:dbget(M,Name),
-	    asn1ct:update_gen_state(namelist,Pattern),
-	    Rtmod:gen_inc_decode(Erule,TypeDef),
-	    gen_dec_part_inner_constr(Erule,TypeDef,[Name]),
-	    gen_partial_inc_dec_refed_funcs(Erule);
-	_ ->
-	    gen_partial_inc_dec_refed_funcs(Erule)
-    end;
-gen_partial_inc_dec_refed_funcs(_) ->
-    ok.
-
-pgen_partial_dec(_Erules,_Module) ->
-    ok. %%%% implement later
-
-%% generate code for all inner types that are called from the top type
-%% of the partial incomplete decode
-gen_dec_part_inner_constr(Erules,TypeDef,TypeName) ->
-    Def = TypeDef#typedef.typespec,
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    case InnerType of
-	'SET' ->
-	    #'SET'{components=Components} = Def#type.def,
-	    gen_dec_part_inner_types(Erules,Components,TypeName);
-	%%  Continue generate the inner of each component
-	'SEQUENCE' ->
-	    #'SEQUENCE'{components=Components} = Def#type.def,
-	    gen_dec_part_inner_types(Erules,Components,TypeName);
-	'CHOICE' ->
-	    {_,Components} = Def#type.def,
-	    gen_dec_part_inner_types(Erules,Components,TypeName);
-	'SEQUENCE OF' ->
-	    %% this and next case must be the last component in the
-	    %% partial decode chain here. Not likely that this occur.
-	    {_,Type} = Def#type.def,
-	    NameSuffix = constructed_suffix(InnerType,Type#type.def),
-	    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-					       rt2ct_suffix(Erules)])),
-	    asn1ct_name:clear(),
-	    Rtmod:gen_decode(Erules,[NameSuffix|TypeName],Type);
-%%	    gen_types(Erules,[NameSuffix|Typename],Type);
-	'SET OF' ->
-	    {_,Type} = Def#type.def,
-	    NameSuffix = constructed_suffix(InnerType,Type#type.def),
-	    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-					       rt2ct_suffix(Erules)])),
-	    asn1ct_name:clear(),
-	    Rtmod:gen_decode(Erules,[NameSuffix|TypeName],Type);
-	_ ->
-	    ok
-    end.
-
-gen_dec_part_inner_types(Erules,[ComponentType|Rest],TypeName) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
-    asn1ct_name:clear(),
-    Rtmod:gen_decode(Erules,TypeName,ComponentType),
-    gen_dec_part_inner_types(Erules,Rest,TypeName);
-gen_dec_part_inner_types(Erules,{Comps1,Comps2},TypeName)
-  when list(Comps1),list(Comps2) ->
-    gen_dec_part_inner_types(Erules,Comps1 ++ Comps2,TypeName);
-gen_dec_part_inner_types(_,[],_) ->
-    ok.
-
-
-pgen_partial_incomplete_decode(Erule) ->
-    case asn1ct:get_gen_state_field(active) of
-	true ->
-	    pgen_partial_incomplete_decode1(Erule),
-	    asn1ct:reset_gen_state();
-	_ ->
-	    ok
-    end.
-pgen_partial_incomplete_decode1(ber_bin_v2) ->
-    case asn1ct:read_config_data(partial_incomplete_decode) of
-	undefined ->
-	    ok;
-	Data ->
-	    lists:foreach(fun emit_partial_incomplete_decode/1,Data)
-    end,
-    GeneratedFs= asn1ct:get_gen_state_field(gen_refed_funcs),
-%    io:format("GeneratedFs :~n~p~n",[GeneratedFs]),
-    gen_part_decode_funcs(GeneratedFs,0);
-pgen_partial_incomplete_decode1(_) -> ok.
-
-emit_partial_incomplete_decode({FuncName,TopTypeName,Pattern}) ->
-    emit([{asis,FuncName},"(Bytes) ->",nl,
-	  "  decode_partial_incomplete(",{asis,TopTypeName},",Bytes,",{asis,Pattern},").",nl]);
-emit_partial_incomplete_decode(D) ->
-    throw({error,{asn1,{"bad data in asn1config file",D}}}).
-
-gen_part_decode_funcs([Data={Name,_,_,Type}|GeneratedFs],N) ->
-    InnerType = 
-	case Type#type.def of
-	    #'ObjectClassFieldType'{type=OCFTType} ->
-		OCFTType;
-	    _ ->
-		get_inner(Type#type.def)
-	end,
-    WhatKind = type(InnerType),
-    TypeName=list2name(Name),
-    if
-	N > 0 -> emit([";",nl]);
-	true -> ok
-    end,
-    emit(["decode_inc_disp('",TypeName,"',Data) ->",nl]),
-    gen_part_decode_funcs(WhatKind,TypeName,Data),
-    gen_part_decode_funcs(GeneratedFs,N+1);
-gen_part_decode_funcs([_H|T],N) ->
-    gen_part_decode_funcs(T,N);
-gen_part_decode_funcs([],N) ->
-    if
-	N > 0 ->
-	    .emit([".",nl]);
-	true ->
-	    ok
-    end.
-
-gen_part_decode_funcs(#'Externaltypereference'{module=M,type=T},
-		      _TypeName,Data) ->
-    #typedef{typespec=TS} = asn1_db:dbget(M,T),
-    InnerType = 
-	case TS#type.def of
-	    #'ObjectClassFieldType'{type=OCFTType} ->
-		OCFTType;
-	    _ ->
-		get_inner(TS#type.def)
-	end,
-    WhatKind = type(InnerType),
-    gen_part_decode_funcs(WhatKind,[T],Data);
-gen_part_decode_funcs({constructed,bif},TypeName,
-		      {_Name,parts,Tag,_Type}) ->
-    emit(["  case Data of",nl,
-	  "    L when list(L) ->",nl,
-	  "      'dec_",TypeName,"'(lists:map(fun(X)->element(1,?RT_BER:decode(X)) end,L),",{asis,Tag},");",nl,
-	  "    _ ->",nl,
-	  "      [Res] = 'dec_",TypeName,"'([Data],",{asis,Tag},"),",nl,
-	  "      Res",nl,
-	  "  end"]);
-gen_part_decode_funcs(WhatKind,_TypeName,{_Name,parts,_Tag,_Type}) ->
-    throw({error,{asn1,{"only SEQUENCE OF/SET OF may have the partial incomplete directive 'parts'.",WhatKind}}});
-gen_part_decode_funcs({constructed,bif},TypeName,
-		      {_Name,undecoded,Tag,_Type}) ->
-    emit(["  'dec_",TypeName,"'(Data,",{asis,Tag},")"]);
-gen_part_decode_funcs({primitive,bif},_TypeName,
-		      {_Name,undecoded,Tag,Type}) ->
-    % Argument no 6 is 0, i.e. bit 6 for primitive encoding.
-    asn1ct_gen_ber_bin_v2:gen_dec_prim(ber_bin_v2,Type,"Data",Tag,[],0,", mandatory, ");
-gen_part_decode_funcs(WhatKind,_TypeName,{_,Directive,_,_}) ->
-    throw({error,{asn1,{"Not implemented yet",WhatKind," partial incomplete directive:",Directive}}}).
-    
-gen_types(Erules,Tname,{RootList,ExtList}) when list(RootList) ->
-    gen_types(Erules,Tname,RootList),
-    gen_types(Erules,Tname,ExtList);
-gen_types(Erules,Tname,[{'EXTENSIONMARK',_,_}|Rest]) ->
-    gen_types(Erules,Tname,Rest);
-gen_types(Erules,Tname,[ComponentType|Rest]) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
-    asn1ct_name:clear(),
-    Rtmod:gen_encode(Erules,Tname,ComponentType),
-    asn1ct_name:clear(),
-    Rtmod:gen_decode(Erules,Tname,ComponentType),
-    gen_types(Erules,Tname,Rest);
-gen_types(_,_,[]) ->
-    true;
-gen_types(Erules,Tname,Type) when record(Type,type) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
-				       rt2ct_suffix(Erules)])),
-    asn1ct_name:clear(),
-    Rtmod:gen_encode(Erules,Tname,Type),
-    asn1ct_name:clear(),
-    Rtmod:gen_decode(Erules,Tname,Type).
-
-gen_value_match(Module) ->
-    case get(value_match) of
-	{true,Module} ->
-	    emit(["value_match([{Index,Cname}|Rest],Value) ->",nl,
-		  "  Value2 =",nl,
-		  "    case element(Index,Value) of",nl,
-		  "      {Cname,Val2} -> Val2;",nl,
-		  "      X -> X",nl,
-		  "    end,",nl,
-		  "  value_match(Rest,Value2);",nl,
-		  "value_match([],Value) ->",nl,
-		  "  Value.",nl]);
-	_  -> ok
-    end,
-    put(value_match,undefined).
-
-gen_check_defaultval(Erules,Module,[{Name,Type}|Rest]) ->
-    gen_check_func(Name,Type),
-    gen_check_defaultval(Erules,Module,Rest);
-gen_check_defaultval(_,_,[]) ->
-    ok.
-
-gen_check_func(Name,FType = #type{def=Def}) ->
-    emit({Name,"(V,asn1_DEFAULT) ->",nl,"   true;",nl}),
-    emit({Name,"(V,V) ->",nl,"   true;",nl}),
-    emit({Name,"(V,{_,V}) ->",nl,"   true;",nl}),
-    case Def of
-	{'SEQUENCE OF',Type} ->
-	    gen_check_sof(Name,'SEQOF',Type);
-	{'SET OF',Type} ->
-	    gen_check_sof(Name,'SETOF',Type);
-	#'SEQUENCE'{components=Components} ->
-	    gen_check_sequence(Name,Components);
-	#'SET'{components=Components} ->
-	    gen_check_sequence(Name,Components);
-	{'CHOICE',Components} ->
-	    gen_check_choice(Name,Components);
-	#'Externaltypereference'{type=T} ->
-	    emit({Name,"(DefaultValue,Value) ->",nl}),
-	    emit({"   ",list2name([T,check]),"(DefaultValue,Value).",nl});
-	MaybePrim ->
-	    InnerType = get_inner(MaybePrim),
-	    case type(InnerType) of
-		{primitive,bif} ->
-		    emit({Name,"(DefaultValue,Value) ->",nl,"   "}),
-		    gen_prim_check_call(InnerType,"DefaultValue","Value",
-					FType),
-		    emit({".",nl,nl});
-		_ ->
-		    throw({asn1_error,{unknown,type,MaybePrim}})
-	    end
-    end.
-
-gen_check_sof(Name,SOF,Type) ->
-    NewName = list2name([sorted,Name]),
-    emit({Name,"(V1,V2) ->",nl}),
-    emit({"   ",NewName,"(lists:sort(V1),lists:sort(V2)).",nl,nl}),
-    emit({NewName,"([],[]) ->",nl,"   true;",nl}),
-    emit({NewName,"([DV|DVs],[V|Vs]) ->",nl,"   "}),
-    InnerType = get_inner(Type#type.def),
-    case type(InnerType) of
-	{primitive,bif} ->
-	    gen_prim_check_call(InnerType,"DV","V",Type),
-	    emit({",",nl});
-	{constructed,bif} ->
-	    emit({list2name([SOF,Name]),"(DV, V),",nl});
-	#'Externaltypereference'{type=T} ->
-	    emit({list2name([T,check]),"(DV,V),",nl})
-    end,
-    emit({"   ",NewName,"(DVs,Vs).",nl,nl}).
-
-gen_check_sequence(Name,Components) ->
-    emit({Name,"(DefaultValue,Value) ->",nl}),
-    gen_check_sequence(Name,Components,1).
-gen_check_sequence(Name,[#'ComponentType'{name=N,typespec=Type}|Cs],Num) ->
-    InnerType = get_inner(Type#type.def),
-%    NthDefV = lists:concat(["lists:nth(",Num,",DefaultValue)"]),
-    NthDefV = ["element(",Num+1,",DefaultValue)"],
-%    NthV = lists:concat(["lists:nth(",Num,",Value)"]),
-    NthV = ["element(",Num+1,",Value)"],
-    gen_check_func_call(Name,Type,InnerType,NthDefV,NthV,N),
-    case Cs of
-	[] ->
-	    emit({".",nl,nl});
-	_ ->
-	    emit({",",nl}),
-	    gen_check_sequence(Name,Cs,Num+1)
-    end;
-gen_check_sequence(_,[],_) ->
-    ok.
-
-gen_check_choice(Name,CList=[#'ComponentType'{}|_Cs]) ->
-    emit({Name,"({Id,DefaultValue},{Id,Value}) ->",nl}),
-    emit({"   case Id of",nl}),
-    gen_check_choice_components(Name,CList,1).
-
-gen_check_choice_components(_,[],_)->
-    ok;
-gen_check_choice_components(Name,[#'ComponentType'{name=N,typespec=Type}|
-				  Cs],Num) ->
-    Ind6 = "      ",
-    InnerType = get_inner(Type#type.def),
-%    DefVal = ["element(2,lists:nth(",Num,",DefaultValue))"],
-    emit({Ind6,N," ->",nl,Ind6}),
-    gen_check_func_call(Name,Type,InnerType,{var,"defaultValue"},
-			{var,"value"},N),
-    case Cs of
-	[] ->
-	    emit({nl,"   end.",nl,nl});
-	_ ->
-	    emit({";",nl}),
-	    gen_check_choice_components(Name,Cs,Num+1)
-    end.
-
-gen_check_func_call(Name,Type,InnerType,DefVal,Val,N) ->
-    case type(InnerType) of
-	{primitive,bif} ->
-	    emit("   "),
-	    gen_prim_check_call(InnerType,DefVal,Val,Type);
-	#'Externaltypereference'{type=T} ->
-	    emit({"   ",list2name([T,check]),"(",DefVal,",",Val,")"});
-	_ ->
-	    emit({"   ",list2name([N,Name]),"(",DefVal,",",Val,")"})
-    end.
-		  
-    
-%% VARIOUS GENERATOR STUFF 
-%% *************************************************
-%%**************************************************
-
-mk_var(X) when atom(X) ->
-    list_to_atom(mk_var(atom_to_list(X)));
-
-mk_var([H|T]) ->
-    [H-32|T].
-
-%% Since hyphens are allowed in ASN.1 names, it may occur in a
-%% variable to. Turn a hyphen into a under-score sign.
-un_hyphen_var(X) when atom(X) ->
-    list_to_atom(un_hyphen_var(atom_to_list(X)));
-un_hyphen_var([45|T]) ->
-    [95|un_hyphen_var(T)];
-un_hyphen_var([H|T]) ->
-    [H|un_hyphen_var(T)];
-un_hyphen_var([]) ->
-    [].
-
-%% Generate value functions ***************
-%% ****************************************
-%% Generates a function 'V'/0 for each Value V defined in the ASN.1 module
-%% the function returns the value in an Erlang representation which can be
-%% used as  input to the runtime encode functions
-
-gen_value(Value) when record(Value,valuedef) ->
-%%    io:format(" ~w ",[Value#valuedef.name]),
-    emit({"'",Value#valuedef.name,"'() ->",nl}),
-    V = Value#valuedef.value,
-    emit([{asis,V},".",nl,nl]).
-
-gen_encode_constructed(Erules,Typename,InnerType,D) when record(D,type) ->
-
-    Rtmod = list_to_atom(lists:concat(["asn1ct_constructed_",erule(Erules)])),
-    case InnerType of
-	'SET' ->
-	    Rtmod:gen_encode_set(Erules,Typename,D),
-	    #'SET'{components=Components} = D#type.def,
-	    gen_types(Erules,Typename,Components);
-	'SEQUENCE' ->
-	    Rtmod:gen_encode_sequence(Erules,Typename,D),
-	    #'SEQUENCE'{components=Components} = D#type.def,
-	    gen_types(Erules,Typename,Components);
-	'CHOICE' ->
-	    Rtmod:gen_encode_choice(Erules,Typename,D),
-	    {_,Components} = D#type.def,
-	    gen_types(Erules,Typename,Components);
-	'SEQUENCE OF' ->
-	    Rtmod:gen_encode_sof(Erules,Typename,InnerType,D),
-	    {_,Type} = D#type.def,
-	    NameSuffix = asn1ct_gen:constructed_suffix(InnerType,Type#type.def),
-	    gen_types(Erules,[NameSuffix|Typename],Type);
-	'SET OF' ->
-	    Rtmod:gen_encode_sof(Erules,Typename,InnerType,D),
-	    {_,Type} = D#type.def,
-	    NameSuffix = asn1ct_gen:constructed_suffix(InnerType,Type#type.def),
-	    gen_types(Erules,[NameSuffix|Typename],Type);
-	_ ->
-	    exit({nyi,InnerType})
-    end;
-gen_encode_constructed(Erules,Typename,InnerType,D) 
-  when record(D,typedef) ->
-    gen_encode_constructed(Erules,Typename,InnerType,D#typedef.typespec).
-
-gen_decode_constructed(Erules,Typename,InnerType,D) when record(D,type) ->
-    Rtmod = list_to_atom(lists:concat(["asn1ct_constructed_",erule(Erules)])),
-    asn1ct:step_in_constructed(), %% updates namelist for incomplete
-                                  %% partial decode
-    case InnerType of
-	'SET' ->
-	    Rtmod:gen_decode_set(Erules,Typename,D);
-	'SEQUENCE' ->
-	    Rtmod:gen_decode_sequence(Erules,Typename,D);
-	'CHOICE' ->
-	    Rtmod:gen_decode_choice(Erules,Typename,D);
-	'SEQUENCE OF' ->
-	    Rtmod:gen_decode_sof(Erules,Typename,InnerType,D);
-	'SET OF' ->
-	    Rtmod:gen_decode_sof(Erules,Typename,InnerType,D);
-	_ ->
-	    exit({nyi,InnerType})
-    end;
-
-
-gen_decode_constructed(Erules,Typename,InnerType,D) when record(D,typedef) ->
-    gen_decode_constructed(Erules,Typename,InnerType,D#typedef.typespec).
-
-
-pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
-    emit({"-export([encoding_rule/0]).",nl}),
-    case Types of
-	[] -> ok;
-	_ ->
-	    emit({"-export([",nl}),
-	    case Erules of
-		ber ->
-		    gen_exports1(Types,"enc_",2);
-		ber_bin ->
-		    gen_exports1(Types,"enc_",2);
-		ber_bin_v2 ->
-		    gen_exports1(Types,"enc_",2);
-		_ ->
-		    gen_exports1(Types,"enc_",1)
-	    end,
-	    emit({"-export([",nl}),
-	    gen_exports1(Types,"dec_",2),
-	    case Erules of
-		ber ->
-		    emit({"-export([",nl}),
-		    gen_exports1(Types,"dec_",3);
-		ber_bin ->
-		    emit({"-export([",nl}),
-		    gen_exports1(Types,"dec_",3);
-		ber_bin_v2 ->
-		    emit({"-export([",nl}),
-		    gen_exports1(Types,"dec_",2);
-		_ -> ok
-	    end
-    end,
-    case Values of
-	[] -> ok;
-	_ ->
-	    emit({"-export([",nl}),
-	    gen_exports1(Values,"",0)
-    end,
-    case Objects of
-	[] -> ok;
-	_ ->
-	    case erule(Erules) of
-		per ->
-		    emit({"-export([",nl}),
-		    gen_exports1(Objects,"enc_",3),
-		    emit({"-export([",nl}),
-		    gen_exports1(Objects,"dec_",4);
-		ber_bin_v2 ->
-		    emit({"-export([",nl}),
-		    gen_exports1(Objects,"enc_",3),
-		    emit({"-export([",nl}),
-		    gen_exports1(Objects,"dec_",3);
-		_ -> 
-		    emit({"-export([",nl}),
-		    gen_exports1(Objects,"enc_",4),
-		    emit({"-export([",nl}),
-		    gen_exports1(Objects,"dec_",4)
-	    end
-    end,
-    case ObjectSets of
-	[] -> ok;
-	_ ->
-	    emit({"-export([",nl}),
-	    gen_exports1(ObjectSets,"getenc_",2),
-	    emit({"-export([",nl}),
-	    gen_exports1(ObjectSets,"getdec_",2)
-    end,
-    emit({"-export([info/0]).",nl}),
-    gen_partial_inc_decode_exports(),
-    emit({nl,nl}).
-
-gen_exports1([F1,F2|T],Prefix,Arity) ->
-	emit({"'",Prefix,F1,"'/",Arity,com,nl}),
-	gen_exports1([F2|T],Prefix,Arity);
-gen_exports1([Flast|_T],Prefix,Arity) ->
-	emit({"'",Prefix,Flast,"'/",Arity,nl,"]).",nl,nl}).
-
-gen_partial_inc_decode_exports() ->
-    case {asn1ct:read_config_data(partial_incomplete_decode),
-	  asn1ct:get_gen_state_field(inc_type_pattern)}  of
-	{undefined,_} ->
-	    ok;
-	{_,undefined} ->
-	    ok;
-	{Data,_} ->
-	    gen_partial_inc_decode_exports(Data),
-	    emit("-export([decode_part/2]).")
-    end.
-gen_partial_inc_decode_exports([]) ->
-    ok;
-gen_partial_inc_decode_exports([{Name,_,_}|Rest]) ->
-    emit(["-export([",Name,"/1"]),
-    gen_partial_inc_decode_exports1(Rest);
-gen_partial_inc_decode_exports([_|Rest]) ->
-    gen_partial_inc_decode_exports(Rest).
-
-gen_partial_inc_decode_exports1([]) ->
-    emit(["]).",nl]);
-gen_partial_inc_decode_exports1([{Name,_,_}|Rest]) ->
-    emit([", ",Name,"/1"]),
-    gen_partial_inc_decode_exports1(Rest);
-gen_partial_inc_decode_exports1([_|Rest]) ->
-    gen_partial_inc_decode_exports1(Rest).
-
-pgen_dispatcher(Erules,_Module,{[],_Values,_,_,_Objects,_ObjectSets}) ->
-    emit(["encoding_rule() ->",nl]),
-    emit([{asis,Erules},".",nl,nl]);
-pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
-    emit(["-export([encode/2,decode/2,encode_disp/2,decode_disp/2]).",nl,nl]),
-    emit(["encoding_rule() ->",nl]),
-    emit(["   ",{asis,Erules},".",nl,nl]),
-    Call = case Erules of
-	       per -> "?RT_PER:complete(encode_disp(Type,Data))";
-	       per_bin -> "?RT_PER:complete(encode_disp(Type,Data))";
-	       ber -> "encode_disp(Type,Data)";
-	       ber_bin -> "encode_disp(Type,Data)";
-	       ber_bin_v2 -> "encode_disp(Type,Data)"
-	   end,
-    EncWrap = case Erules of
-	       ber -> "wrap_encode(Bytes)";
-	       _ -> "Bytes"
-	   end,
-    emit(["encode(Type,Data) ->",nl,
-	  "case catch ",Call," of",nl,
-	  "  {'EXIT',{error,Reason}} ->",nl,
-	  "    {error,Reason};",nl,
-	  "  {'EXIT',Reason} ->",nl,
-	  "    {error,{asn1,Reason}};",nl,
-	  "  {Bytes,_Len} ->",nl,
-	  "    {ok,",EncWrap,"};",nl,
-	  "  Bytes ->",nl,
-	  "    {ok,",EncWrap,"}",nl,
-	  "end.",nl,nl]),
-
-    case Erules of
-	ber_bin_v2 ->
-	    emit(["decode(Type,Data0) ->",nl]),
-	    emit(["{Data,_RestBin} = ?RT_BER:decode(Data0",driver_parameter(),"),",nl]);
-	_ ->
-	    emit(["decode(Type,Data) ->",nl])
-    end,
-    DecWrap = case Erules of
-		  ber -> "wrap_decode(Data)";
-		  _ -> "Data"
-	      end,
-	
-    emit(["case catch decode_disp(Type,",DecWrap,") of",nl,
-	  "  {'EXIT',{error,Reason}} ->",nl,
-	  "    {error,Reason};",nl,
-	  "  {'EXIT',Reason} ->",nl,
-	  "    {error,{asn1,Reason}};",nl]),
-    case Erules of 
-	ber_bin_v2 ->
-	    emit(["  Result ->",nl,
-		  "    {ok,Result}",nl]);
-	_ ->
-	    emit(["  {X,_Rest} ->",nl,
-		  "    {ok,X};",nl,
-		  "  {X,_Rest,_Len} ->",nl,
-		  "    {ok,X}",nl])
-    end,
-    emit(["end.",nl,nl]),
-
-    gen_decode_partial_incomplete(Erules),
-
-    case Types of
-	[] -> ok;
-	_ ->
-	    case Erules of
-		ber ->
-		    gen_dispatcher(Types,"encode_disp","enc_",",[]"),
-		    gen_dispatcher(Types,"decode_disp","dec_",",mandatory");
-		ber_bin ->
-		    gen_dispatcher(Types,"encode_disp","enc_",",[]"),
-		    gen_dispatcher(Types,"decode_disp","dec_",",mandatory");
-		ber_bin_v2 ->
-		    gen_dispatcher(Types,"encode_disp","enc_",""),
-		    gen_dispatcher(Types,"decode_disp","dec_",""),
-		    gen_partial_inc_dispatcher();
-		_PerOrPer_bin -> 
-		    gen_dispatcher(Types,"encode_disp","enc_",""),
-		    gen_dispatcher(Types,"decode_disp","dec_",",mandatory")
-	    end,
-	    emit([nl])
-    end,
-    case Erules of
-	ber ->
-	    gen_wrapper();
-	_ -> ok
-    end,
-    emit({nl,nl}).
-
-
-gen_decode_partial_incomplete(Erule) when Erule == ber;Erule==ber_bin;
-					   Erule==ber_bin_v2 ->
-    case {asn1ct:read_config_data(partial_incomplete_decode),
-	  asn1ct:get_gen_state_field(inc_type_pattern)} of
-	{undefined,_} ->
-	    ok;
-	{_,undefined} ->
-	    ok;
-	_ ->
-	    case Erule of
-		ber_bin_v2 ->
-		    EmitCaseClauses =
-			fun() ->
-				emit(["   {'EXIT',{error,Reason}} ->",nl,
-				      "      {error,Reason};",nl,
-				      "    {'EXIT',Reason} ->",nl,
-				      "      {error,{asn1,Reason}};",nl,
-				      "    Result ->",nl,
-				      "      {ok,Result}",nl,
-				      "  end.",nl,nl])
-			end,
-		    emit(["decode_partial_incomplete(Type,Data0,",
-			  "Pattern) ->",nl]),
-		    emit(["  {Data,_RestBin} =",nl,
-			  "    ?RT_BER:decode_primitive_",
-			  "incomplete(Pattern,Data0),",nl,
-			  "  case catch decode_partial_inc_disp(Type,",
-			  "Data) of",nl]),
-		    EmitCaseClauses(),
-		    emit(["decode_part(Type,Data0) ->",nl,
-			  "  {Data,_RestBin} = ?RT_BER:decode(Data0),",nl,
-			  "  case catch decode_inc_disp(Type,Data) of",nl]),
-		    EmitCaseClauses();
-		_ -> ok % add later
-	    end
-    end;
-gen_decode_partial_incomplete(_Erule) ->
-    ok.
-
-gen_partial_inc_dispatcher() ->
-    case {asn1ct:read_config_data(partial_incomplete_decode),
-	  asn1ct:get_gen_state_field(inc_type_pattern)} of
-	{undefined,_} ->
-	    ok;
-	{_,undefined} ->
-	    ok;
-	{Data,_} ->
-	    gen_partial_inc_dispatcher(Data)
-    end.
-gen_partial_inc_dispatcher([{_FuncName,TopType,_Pattern}|Rest]) ->
-    emit(["decode_partial_inc_disp(",{asis,TopType},",Data) ->",nl,
-	  "  ",{asis,list_to_atom(lists:concat([dec,"-inc-",TopType]))},
-	  "(Data);",nl]),
-    gen_partial_inc_dispatcher(Rest);
-gen_partial_inc_dispatcher([]) ->
-    emit(["decode_partial_inc_disp(Type,_Data) ->",nl,
-	  "  exit({error,{asn1,{undefined_type,Type}}}).",nl]).
-
-driver_parameter() ->
-    Options = get(encoding_options),
-    case lists:member(driver,Options) of
-	true ->
-	    ",driver";
-	_ -> ""
-    end.
-
-gen_wrapper() ->
-    emit(["wrap_encode(Bytes) when list(Bytes) ->",nl,
-	  "   binary_to_list(list_to_binary(Bytes));",nl,
-	  "wrap_encode(Bytes) when binary(Bytes) ->",nl,
-	  "   binary_to_list(Bytes);",nl,
-	  "wrap_encode(Bytes) -> Bytes.",nl,nl]),
-    emit(["wrap_decode(Bytes) when list(Bytes) ->",nl,
-	  "   list_to_binary(Bytes);",nl,
-	  "wrap_decode(Bytes) -> Bytes.",nl]).
-    
-gen_dispatcher([F1,F2|T],FuncName,Prefix,ExtraArg) ->
-	emit([FuncName,"('",F1,"',Data) -> '",Prefix,F1,"'(Data",ExtraArg,")",";",nl]),
-	gen_dispatcher([F2|T],FuncName,Prefix,ExtraArg);
-gen_dispatcher([Flast|_T],FuncName,Prefix,ExtraArg) ->
-	emit([FuncName,"('",Flast,"',Data) -> '",Prefix,Flast,"'(Data",ExtraArg,")",";",nl]),
-	emit([FuncName,"(","Type",",_Data) -> exit({error,{asn1,{undefined_type,Type}}}).",nl,nl,nl]).
-
-pgen_info(_Erules,Module) ->
-    Options = get(encoding_options),
-    emit({"info() ->",nl,
-	  "  [{vsn,'",asn1ct:vsn(),"'},",
-	  "   {module,'",Module,"'},",
-	  "   {options,",io_lib:format("~p",[Options]),"}].",nl}).
-
-open_hrl(OutFile,Module) ->
-    File = lists:concat([OutFile,".hrl"]),
-    Fid = fopen(File,write),
-    put(gen_file_out,Fid),
-    gen_hrlhead(Module).
-
-%% EMIT functions ************************
-%% ***************************************
-
-						% debug generation
-demit(Term) ->
-    case get(asndebug) of
-	true -> emit(Term);
-	_ ->true
-    end.
-
-						% always generation
-
-emit({external,_M,T}) ->
-    emit(T);
-
-emit({prev,Variable}) when atom(Variable) ->
-    emit({var,asn1ct_name:prev(Variable)});
-
-emit({next,Variable}) when atom(Variable) ->
-    emit({var,asn1ct_name:next(Variable)});
-
-emit({curr,Variable}) when atom(Variable) ->
-    emit({var,asn1ct_name:curr(Variable)});
-    
-emit({var,Variable}) when atom(Variable) ->
-    [Head|V] = atom_to_list(Variable),
-    emit([Head-32|V]);
-
-emit({var,Variable}) ->
-    [Head|V] = Variable,
-    emit([Head-32|V]);
-
-emit({asis,What}) ->
-    format(get(gen_file_out),"~w",[What]);
-
-emit(nl) ->
-    nl(get(gen_file_out));
-
-emit(com) ->
-    emit(",");
-
-emit(tab) ->
-    put_chars(get(gen_file_out),"     ");
-
-emit(What) when integer(What) ->
-    put_chars(get(gen_file_out),integer_to_list(What));
-
-emit(What) when list(What), integer(hd(What)) ->
-    put_chars(get(gen_file_out),What);
-
-emit(What) when atom(What) ->
-    put_chars(get(gen_file_out),atom_to_list(What));
-
-emit(What) when tuple(What) ->
-    emit_parts(tuple_to_list(What));
-
-emit(What) when list(What) ->
-    emit_parts(What);
-
-emit(X) ->
-    exit({'cant emit ',X}).
-
-emit_parts([]) -> true;
-emit_parts([H|T]) ->
-    emit(H),
-    emit_parts(T).
-
-format(undefined,X,Y) ->
-    io:format(X,Y);
-format(X,Y,Z) ->
-    io:format(X,Y,Z).
-
-nl(undefined) -> io:nl();
-nl(X) -> io:nl(X).
-
-put_chars(undefined,X) ->
-    io:put_chars(X);
-put_chars(Y,X) ->
-    io:put_chars(Y,X).
-
-fopen(F, Mode) ->
-    case file:open(F, [Mode]) of
-	{ok, Fd} -> 
-	    Fd;
-	{error, Reason} ->
-	    io:format("** Can't open file ~p ~n", [F]),
-	    exit({error,Reason})
-    end.
-
-pgen_hrl(Erules,Module,TypeOrVal,_Indent) ->
-    put(currmod,Module),
-    {Types,Values,Ptypes,_,_,_} = TypeOrVal,
-    Ret =
-	case pgen_hrltypes(Erules,Module,Ptypes++Types,0) of
-	    0 -> 
-		case Values of
-		    [] ->
-			0;
-		    _ ->
-			open_hrl(get(outfile),get(currmod)),
-			pgen_macros(Erules,Module,Values),
-			1
-		end;
-	    X ->
-		pgen_macros(Erules,Module,Values),
-		X
-	end,
-    case Ret of
-	0 ->
-	    0;
-	Y ->
-	    Fid = get(gen_file_out),
-	    file:close(Fid),
-	    io:format("--~p--~n",
-		      [{generated,lists:concat([get(outfile),".hrl"])}]),
-	    Y
-    end.
-
-pgen_macros(_,_,[]) ->
-    true;
-pgen_macros(Erules,Module,[H|T]) ->
-    Valuedef = asn1_db:dbget(Module,H),
-    gen_macro(Valuedef),
-    pgen_macros(Erules,Module,T).
-
-pgen_hrltypes(_,_,[],NumRecords) ->
-    NumRecords;
-pgen_hrltypes(Erules,Module,[H|T],NumRecords) ->
-%    io:format("records = ~p~n",NumRecords),
-    Typedef = asn1_db:dbget(Module,H),
-    AddNumRecords = gen_record(Typedef,NumRecords),
-    pgen_hrltypes(Erules,Module,T,NumRecords+AddNumRecords).
-
-
-%% Generates a macro for value Value defined in the ASN.1 module
-gen_macro(Value) when record(Value,valuedef) ->
-    emit({"-define('",Value#valuedef.name,"', ",
-	  {asis,Value#valuedef.value},").",nl}).
-
-%% Generate record functions **************
-%% Generates an Erlang record for each named and unnamed SEQUENCE and SET in the ASN.1 
-%% module. If no SEQUENCE or SET is found there is no .hrl file generated
-
-
-gen_record(Tdef,NumRecords) when record(Tdef,typedef) ->
-    Name = [Tdef#typedef.name],
-    Type = Tdef#typedef.typespec,
-    gen_record(type,Name,Type,NumRecords);
-
-gen_record(Tdef,NumRecords) when record(Tdef,ptypedef) ->
-    Name = [Tdef#ptypedef.name],
-    Type = Tdef#ptypedef.typespec,
-    gen_record(ptype,Name,Type,NumRecords).
-    
-gen_record(TorPtype,Name,[#'ComponentType'{name=Cname,typespec=Type}|T],Num) ->
-    Num2 = gen_record(TorPtype,[Cname|Name],Type,Num),
-    gen_record(TorPtype,Name,T,Num2);
-gen_record(TorPtype,Name,{Clist1,Clist2},Num) when list(Clist1), list(Clist2) ->
-    gen_record(TorPtype,Name,Clist1++Clist2,Num);
-gen_record(TorPtype,Name,[_|T],Num) -> % skip EXTENSIONMARK
-    gen_record(TorPtype,Name,T,Num);
-gen_record(_TorPtype,_Name,[],Num) ->
-    Num;
-
-gen_record(TorPtype,Name,Type,Num) when record(Type,type) ->    
-    Def = Type#type.def,
-    Rec = case Def of
-	      Seq when record(Seq,'SEQUENCE') ->
-		  case Seq#'SEQUENCE'.pname of
-		      false ->
-			  {record,Seq#'SEQUENCE'.components};
-		      _Pname when TorPtype == type ->
-			  false;
-		      _ ->
-			  {record,Seq#'SEQUENCE'.components}
-		  end;
-	      Set when record(Set,'SET') ->
-		  case Set#'SET'.pname of
-		      false ->
-			  {record,Set#'SET'.components};
-		      _Pname when TorPtype == type ->
-			  false;
-		      _ ->
-			  {record,Set#'SET'.components}
-		  end;
-%	      {'SET',{_,_CompList}} -> 
-%		  {record,_CompList}; 
-	      {'CHOICE',_CompList} -> {inner,Def};
-	      {'SEQUENCE OF',_CompList} -> {['SEQOF'|Name],Def};
-	      {'SET OF',_CompList} -> {['SETOF'|Name],Def};
-	      _ -> false
-    end,
-    case Rec of
-	false -> Num;
-	{record,CompList} ->
-	    case Num of
-		0 -> open_hrl(get(outfile),get(currmod));
-		_ -> true
-	    end,
-	    emit({"-record('",list2name(Name),"',{",nl}),
-	    RootList = case CompList of
-			   _ when list(CompList) ->
-			       CompList;
-			   {_Rl,_} -> _Rl
-		       end,
-	    gen_record2(Name,'SEQUENCE',RootList),
-	    NewCompList = 
-		case CompList of
-		    {CompList1,[]} ->
-			emit({"}). % with extension mark",nl,nl}),
-			CompList1;
-		    {Tr,ExtensionList2} ->
-			case Tr of
-			    [] -> true;
-			    _ -> emit({",",nl})
-			end,
-			emit({"%% with extensions",nl}),
-			gen_record2(Name, 'SEQUENCE', ExtensionList2,
-				    "", ext),
-			emit({"}).",nl,nl}),
-			Tr ++ ExtensionList2;
-		    _ -> 
-			emit({"}).",nl,nl}),
-			CompList
-		end,
-	    gen_record(TorPtype,Name,NewCompList,Num+1);
-	{inner,{'CHOICE', CompList}} ->
-	    gen_record(TorPtype,Name,CompList,Num);
-	{NewName,{_, CompList}} ->
-	    gen_record(TorPtype,NewName,CompList,Num)
-    end;
-gen_record(_,_,_,NumRecords) -> % skip CLASS etc for now.
-     NumRecords.
-		    
-gen_head(Erules,Mod,Hrl) ->
-    {Rtmac,Rtmod} = case Erules of
-			per ->
-			    emit({"%% Generated by the Erlang ASN.1 PER-"
-				  "compiler version:",asn1ct:vsn(),nl}),
-			    {"RT_PER",?RT_PER};
-			ber ->
-			    emit({"%% Generated by the Erlang ASN.1 BER-"
-				  "compiler version:",asn1ct:vsn(),nl}),
-			    {"RT_BER",?RT_BER_BIN};
-			per_bin ->
-			    emit({"%% Generated by the Erlang ASN.1 BER-"
-				  "compiler version, utilizing bit-syntax:",
-				  asn1ct:vsn(),nl}),
-			    %% temporary code to enable rt2ct optimization
-			    Options = get(encoding_options),
-			    case lists:member(optimize,Options) of
-				true -> {"RT_PER","asn1rt_per_bin_rt2ct"};
-				_ ->
-				    {"RT_PER",?RT_PER_BIN}
-			    end;
-			ber_bin ->
-			    emit({"%% Generated by the Erlang ASN.1 BER-"
-				  "compiler version, utilizing bit-syntax:",
-				  asn1ct:vsn(),nl}),
-			    {"RT_BER",?RT_BER_BIN};
-			ber_bin_v2 ->
-			    emit({"%% Generated by the Erlang ASN.1 BER_V2-"
-				  "compiler version, utilizing bit-syntax:",
-				  asn1ct:vsn(),nl}),
-			    {"RT_BER","asn1rt_ber_bin_v2"}
-    end,
-    emit({"%% Purpose: encoder and decoder to the types in mod ",Mod,nl,nl}),
-    emit({"-module('",Mod,"').",nl}),
-    put(currmod,Mod),
-    %emit({"-compile(export_all).",nl}),
-    case Hrl of
-	0 -> true;
-	_ -> 
-	    emit({"-include(\"",Mod,".hrl\").",nl})
-    end,
-    emit(["-define('",Rtmac,"',",Rtmod,").",nl]).
-			
-
-gen_hrlhead(Mod) ->
-    emit({"%% Generated by the Erlang ASN.1 compiler version:",asn1ct:vsn(),nl}),
-    emit({"%% Purpose: Erlang record definitions for each named and unnamed",nl}),
-    emit({"%% SEQUENCE and SET, and macro definitions for each value",nl}),
-    emit({"%% definition,in module ",Mod,nl,nl}),
-    emit({nl,nl}).
-
-gen_record2(Name,SeqOrSet,Comps) ->
-    gen_record2(Name,SeqOrSet,Comps,"",noext).
-
-gen_record2(_Name,_SeqOrSet,[],_Com,_Extension) ->
-    true;
-gen_record2(Name,SeqOrSet,[{'EXTENSIONMARK',_,_}|T],Com,Extension) ->
-    gen_record2(Name,SeqOrSet,T,Com,Extension);
-gen_record2(_Name,_SeqOrSet,[H],Com,Extension) ->
-    #'ComponentType'{name=Cname} = H,
-    emit(Com),
-    emit({asis,Cname}),
-    gen_record_default(H, Extension);
-gen_record2(Name,SeqOrSet,[H|T],Com, Extension) ->
-    #'ComponentType'{name=Cname} = H,
-    emit(Com),
-    emit({asis,Cname}),
-    gen_record_default(H, Extension),
-%    emit(", "),
-    gen_record2(Name,SeqOrSet,T,", ", Extension).
-
-%gen_record_default(C, ext) ->
-%    emit(" = asn1_NOEXTVALUE");
-gen_record_default(#'ComponentType'{prop='OPTIONAL'}, _)->
-    emit(" = asn1_NOVALUE"); 
-gen_record_default(#'ComponentType'{prop={'DEFAULT',_}}, _)->
-    emit(" = asn1_DEFAULT"); 
-gen_record_default(_, _) ->
-    true.
-
-gen_check_call(TopType,Cname,Type,InnerType,WhatKind,DefaultValue,Element) ->
-    case WhatKind of
-	{primitive,bif} ->
-	    gen_prim_check_call(InnerType,DefaultValue,Element,Type);
-	#'Externaltypereference'{module=M,type=T} ->
-	    %% generate function call
-	    Name = list2name([T,check]),
-	    emit({"'",Name,"'(",DefaultValue,", ",Element,")"}),
-	    %% insert in ets table and do look ahead check
-	    Typedef = asn1_db:dbget(M,T),
-	    RefType = Typedef#typedef.typespec,
-	    InType = asn1ct_gen:get_inner(RefType#type.def),
-	    case insert_once(check_functions,{Name,RefType}) of
-		true ->
-		    lookahead_innertype([T],InType,RefType);
-%		    case asn1ct_gen:type(InType) of
-%			{constructed,bif} ->
-%			    lookahead_innertype([T],InType,RefType);
-%			#'Externaltypereference'{type=TNew} ->
-%			    lookahead_innertype([TNew],InType,RefType);
-%			_ ->
-%			    ok
-%		    end;
-		_ ->
-		    ok
-	    end;
-	{constructed,bif} ->
-	    NameList = [Cname|TopType],
-	    Name = list2name(NameList ++ [check]),
-	    emit({"'",Name,"'(",DefaultValue,", ",Element,")"}),
-	    ets:insert(check_functions,{Name,Type}),
-	    %% Must look for check functions in InnerType,
-	    %% that may be referenced  or internal defined 
-	    %% constructed types not used elsewhere.
-	    lookahead_innertype(NameList,InnerType,Type)
-    end.
-
-gen_prim_check_call(PrimType,DefaultValue,Element,Type) ->
-    case unify_if_string(PrimType) of
-	'BOOLEAN' ->
-	    emit({"asn1rt_check:check_bool(",DefaultValue,", ",
-		  Element,")"});
-	'INTEGER' ->
-	    NNL =
-		case Type#type.def of
-		    {_,NamedNumberList} -> NamedNumberList;
-		    _ -> []
-		end,
-	    emit({"asn1rt_check:check_int(",DefaultValue,", ",
-		  Element,", ",{asis,NNL},")"});
-	'BIT STRING' ->
-	    {_,NBL} = Type#type.def,
-	    emit({"asn1rt_check:check_bitstring(",DefaultValue,", ",
-		  Element,", ",{asis,NBL},")"});
-	'OCTET STRING' ->
-	    emit({"asn1rt_check:check_octetstring(",DefaultValue,", ",
-		  Element,")"});
-	'NULL' ->
-	    emit({"asn1rt_check:check_null(",DefaultValue,", ",
-		  Element,")"});
-	'OBJECT IDENTIFIER' ->
-	    emit({"asn1rt_check:check_objectidentifier(",DefaultValue,
-		  ", ",Element,")"});
-	'ObjectDescriptor' ->
-	    emit({"asn1rt_check:check_objectdescriptor(",DefaultValue,
-		  ", ",Element,")"});
-	'REAL' ->
-	    emit({"asn1rt_check:check_real(",DefaultValue,
-		  ", ",Element,")"});
-	'ENUMERATED' ->
-	    {_,Enumerations} = Type#type.def,
-	    emit({"asn1rt_check:check_enum(",DefaultValue,
-		  ", ",Element,", ",{asis,Enumerations},")"});
-	restrictedstring ->
-	    emit({"asn1rt_check:check_restrictedstring(",DefaultValue,
-		  ", ",Element,")"})
-    end.
-
-%% lokahead_innertype/3 traverses Type and checks if check functions
-%% have to be generated, i.e. for all constructed or referenced types.
-lookahead_innertype(Name,'SEQUENCE',Type) ->
-    Components = (Type#type.def)#'SEQUENCE'.components,
-    lookahead_components(Name,Components);
-lookahead_innertype(Name,'SET',Type) ->
-    Components = (Type#type.def)#'SET'.components,
-    lookahead_components(Name,Components);
-lookahead_innertype(Name,'CHOICE',Type) ->
-    {_,Components} = Type#type.def,
-    lookahead_components(Name,Components);
-lookahead_innertype(Name,'SEQUENCE OF',SeqOf) ->
-    lookahead_sof(Name,'SEQOF',SeqOf);
-lookahead_innertype(Name,'SET OF',SeqOf) ->
-    lookahead_sof(Name,'SETOF',SeqOf);
-lookahead_innertype(_Name,#'Externaltypereference'{module=M,type=T},_) ->
-    Typedef = asn1_db:dbget(M,T),
-    RefType = Typedef#typedef.typespec,
-    InType = asn1ct_gen:get_inner(RefType#type.def),
-    case type(InType) of
-	{constructed,bif} ->
-	    NewName = list2name([T,check]),
-	    case insert_once(check_functions,{NewName,RefType}) of
-		true ->
-		    lookahead_innertype([T],InType,RefType);
-		_ ->
-		    ok
-	    end;
-	#'Externaltypereference'{} ->
-	    NewName = list2name([T,check]),
-	    case insert_once(check_functions,{NewName,RefType}) of
-		true ->
-		    lookahead_innertype([T],InType,RefType);
-		_ ->
-		    ok
-	    end;
-	_ ->
-	    ok
-    end;
-%    case insert_once(check_functions,{list2name(Name++[check]),Type}) of
-%	true ->
-%	    InnerType = asn1ct_gen:get_inner(Type#type.def),
-%	    case asn1ct_gen:type(InnerType) of
-%		{constructed,bif} ->
-%		    lookahead_innertype([T],InnerType,Type);
-%		#'Externaltypereference'{type=TNew} ->
-%		    lookahead_innertype([TNew],InnerType,Type);
-%		_ ->
-%		    ok
-%	    end;
-%	_ ->
-%	    ok
-%    end;
-lookahead_innertype(_,_,_) ->
-    ok.
-
-lookahead_components(_,[]) -> ok;
-lookahead_components(Name,[C|Cs]) ->
-    #'ComponentType'{name=Cname,typespec=Type} = C,
-    InType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InType) of
-	{constructed,bif} ->
-	    case insert_once(check_functions,
-			     {list2name([Cname|Name] ++ [check]),Type}) of
-		true ->
-		    lookahead_innertype([Cname|Name],InType,Type);
-		_ ->
-		    ok
-	    end;
-	#'Externaltypereference'{module=RefMod,type=RefName} ->
-	    Typedef = asn1_db:dbget(RefMod,RefName),
-	    RefType = Typedef#typedef.typespec,
-	    case insert_once(check_functions,{list2name([RefName,check]),
-					      RefType}) of
-		true ->
-		    lookahead_innertype([RefName],InType,RefType);
-		_ ->
-		    ok
-	    end;
-	_ ->
-	    ok
-    end,
-    lookahead_components(Name,Cs).
-
-lookahead_sof(Name,SOF,SOFType) ->
-    Type = case SOFType#type.def of
-	       {_,_Type} -> _Type;
-	       _Type -> _Type
-	   end,
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    %% this is if a constructed type is defined in
-	    %% the SEQUENCE OF type
-	    NameList = [SOF|Name],
-	    insert_once(check_functions,
-			{list2name(NameList ++ [check]),Type}),
-	    lookahead_innertype(NameList,InnerType,Type);
-	#'Externaltypereference'{module=M,type=T} ->
-	    Typedef = asn1_db:dbget(M,T),
-	    RefType = Typedef#typedef.typespec,
-	    InType = get_inner(RefType#type.def),
-	    case insert_once(check_functions,
-			     {list2name([T,check]),RefType}) of
-		true ->
-		    lookahead_innertype([T],InType,RefType);
-		_ ->
-		    ok
-	    end;
-	_ ->
-	    ok
-    end.
-
-
-insert_once(Table,Object) ->
-    case ets:lookup(Table,element(1,Object)) of
-	[] ->
-	    ets:insert(Table,Object); %returns true
-	_ -> false
-    end.
-
-unify_if_string(PrimType) ->
-    case PrimType of
-	'NumericString' ->
-	    restrictedstring;
-	'PrintableString' ->
-	    restrictedstring;
-	'TeletexString' ->
-	    restrictedstring;
-	'VideotexString' ->
-	    restrictedstring;
-	'IA5String' ->
-	    restrictedstring;
-	'UTCTime' ->
-	    restrictedstring;
-	'GeneralizedTime' ->
-	    restrictedstring;
-	'GraphicString' ->
-	    restrictedstring;
-	'VisibleString' ->
-	    restrictedstring;
-	'GeneralString' ->
-	    restrictedstring;
-	'UniversalString' ->
-	    restrictedstring;
-	'BMPString' ->
-	    restrictedstring;
-	Other -> Other
-    end.
-
-
-	
-	
-
-get_inner(A) when atom(A) -> A;    
-get_inner(Ext) when record(Ext,'Externaltypereference') -> Ext;    
-get_inner(Tref) when record(Tref,typereference) -> Tref;
-get_inner({fixedtypevaluefield,_,Type}) ->
-    if 
-	record(Type,type) ->
-	    get_inner(Type#type.def);
-	true ->
-	    get_inner(Type)
-    end;
-get_inner({typefield,TypeName}) ->
-    TypeName;
-get_inner(#'ObjectClassFieldType'{type=Type}) ->
-%    get_inner(Type);
-    Type;
-get_inner(T) when tuple(T) -> 
-    case element(1,T) of
-	Tuple when tuple(Tuple),element(1,Tuple) == objectclass ->
-	    case catch(lists:last(element(2,T))) of
-		{valuefieldreference,FieldName} ->
-		    get_fieldtype(element(2,Tuple),FieldName);
-		{typefieldreference,FieldName} ->
-		    get_fieldtype(element(2,Tuple),FieldName);
-		{'EXIT',Reason} ->
-		    throw({asn1,{'internal error in get_inner/1',Reason}})
-	    end;
-	_ -> element(1,T)
-    end.
-
-
-
-
-
-type(X) when record(X,'Externaltypereference') ->
-    X;
-type(X) when record(X,typereference) ->
-    X;
-type('ASN1_OPEN_TYPE') ->
-    'ASN1_OPEN_TYPE';
-type({fixedtypevaluefield,_Name,Type}) when record(Type,type) ->
-    type(get_inner(Type#type.def));
-type({typefield,_}) ->
-    'ASN1_OPEN_TYPE';
-type(X) ->
-    %%    io:format("asn1_types:type(~p)~n",[X]),
-    case catch type2(X) of
-	{'EXIT',_} ->
-	    {notype,X};
-	Normal ->
-	    Normal
-    end.
-
-type2(X) ->
-    case prim_bif(X) of
-	true ->
-	    {primitive,bif};
-	false ->
-	    case construct_bif(X) of
-		true ->
-		    {constructed,bif};
-		false ->
-		    {undefined,user}
-	    end
-    end.
-
-prim_bif(X) ->
-    lists:member(X,['INTEGER' ,
-		    'ENUMERATED',
-		    'OBJECT IDENTIFIER',
-		    'ANY',
-		    'NULL',
-		    'BIT STRING' ,
-		    'OCTET STRING' ,
-		    'ObjectDescriptor',
-		    'NumericString',
-		    'TeletexString',
-		    'VideotexString',
-		    'UTCTime',
-		    'GeneralizedTime',
-		    'GraphicString',
-		    'VisibleString',
-		    'GeneralString',
-		    'PrintableString',
-		    'IA5String',
-		    'UniversalString',
-		    'BMPString',
-		    'ENUMERATED',
-		    'BOOLEAN']).
-
-construct_bif(T) ->
-    lists:member(T,['SEQUENCE' ,
-		    'SEQUENCE OF' ,
-		    'CHOICE' ,
-		    'SET' ,
-		    'SET OF']).
-
-def_to_tag(#tag{class=Class,number=Number}) ->
-    {Class,Number};
-def_to_tag(#'ObjectClassFieldType'{type=Type}) -> 
-   case Type of
-       T when tuple(T),element(1,T)==fixedtypevaluefield ->
-	   {'UNIVERSAL',get_inner(Type)};
-       _ ->
-	   []
-   end;
-def_to_tag(Def) ->
-    {'UNIVERSAL',get_inner(Def)}.
-    
-
-%% Information Object Class
-
-type_from_object(X) ->
-    case (catch lists:last(element(2,X))) of
-	{'EXIT',_} ->
-	    {notype,X};
-	Normal ->
-	    Normal
-    end.
-
-
-get_fieldtype([],_FieldName)->
-    {no_type,no_name};
-get_fieldtype([Field|Rest],FieldName) ->
-    case element(2,Field) of
-	FieldName ->
-	    case element(1,Field) of
-		fixedtypevaluefield ->
-		    {element(1,Field),FieldName,element(3,Field)};
-		_ ->
-		    {element(1,Field),FieldName}
-	    end;
-	_  ->
-	    get_fieldtype(Rest,FieldName)
-    end.
-
-get_fieldcategory([],_FieldName) ->
-    no_cat;
-get_fieldcategory([Field|Rest],FieldName) ->
-    case element(2,Field) of
-	FieldName ->
-	    element(1,Field);
-	_ ->
-	    get_fieldcategory(Rest,FieldName)
-    end.
-
-get_typefromobject(Type) when record(Type,type) ->
-    case Type#type.def of
-	{{objectclass,_,_},TypeFrObj} when list(TypeFrObj) ->
-	    {_,FieldName} = lists:last(TypeFrObj),
-	    FieldName;
-	_ ->
-	    {no_field}
-    end.
-
-get_classfieldcategory(Type,FieldName) ->
-    case (catch Type#type.def) of
-	{{obejctclass,Fields,_},_} ->
-	    get_fieldcategory(Fields,FieldName);
-	{'EXIT',_} ->
-	    no_cat;
-	_ ->
-	    no_cat
-    end.
-%% Information Object Class
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Convert a list of name parts to something that can be output by emit
-%% 
-%% used to output function names in generated code.
-
-list2name(L) ->
-    NewL = list2name1(L),
-    lists:concat(lists:reverse(NewL)).
-
-list2name1([{ptype,H1},H2|T]) ->
-    [H1,"_",list2name([H2|T])];
-list2name1([H1,H2|T]) ->
-    [H1,"_",list2name([H2|T])];
-list2name1([{ptype,H}|_T]) ->
-    [H];
-list2name1([H|_T]) ->
-    [H];
-list2name1([]) ->
-    [].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Convert a list of name parts to something that can be output by emit
-%% stops at {ptype,Pname} i.e Pname whill be the first part of the name
-%% used to output record names in generated code.
-
-list2rname(L) ->
-    NewL = list2rname1(L),
-    lists:concat(lists:reverse(NewL)).
-
-list2rname1([{ptype,H1},_H2|_T]) ->
-    [H1];
-list2rname1([H1,H2|T]) ->
-    [H1,"_",list2name([H2|T])];
-list2rname1([{ptype,H}|_T]) ->
-    [H];
-list2rname1([H|_T]) ->
-    [H];
-list2rname1([]) ->
-    [].
-
-
-
-constructed_suffix(_,#'SEQUENCE'{pname=Ptypename}) when Ptypename =/= false ->
-    {ptype, Ptypename};
-constructed_suffix(_,#'SET'{pname=Ptypename}) when Ptypename =/= false ->
-    {ptype,Ptypename};
-constructed_suffix('SEQUENCE OF',_) -> 
-    'SEQOF';
-constructed_suffix('SET OF',_) -> 
-    'SETOF'.
-
-erule(ber) ->
-    ber;
-erule(ber_bin) ->
-    ber;
-erule(ber_bin_v2) ->
-    ber_bin_v2;
-erule(per) ->
-    per;
-erule(per_bin) ->
-    per.
-
-wrap_ber(ber) ->
-    ber_bin;
-wrap_ber(Erule) ->
-    Erule.
-
-rt2ct_suffix() ->
-    Options = get(encoding_options),
-    case {lists:member(optimize,Options),lists:member(per_bin,Options)} of
-	{true,true} -> "_rt2ct";
-	_ -> ""
-    end.
-rt2ct_suffix(per_bin) ->
-    Options = get(encoding_options),
-    case lists:member(optimize,Options) of
-	true -> "_rt2ct";
-	_ -> ""
-    end;
-rt2ct_suffix(_) -> "".
-
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	     no;
-	{value,{_,V}} -> 
-	    V;
-	{value,Cnstr} ->
-	    Cnstr
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_ber.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_ber.erl
deleted file mode 100644
index f063dff765..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_ber.erl
+++ /dev/null
@@ -1,1525 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_gen_ber.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
-%%
--module(asn1ct_gen_ber).
-
-%% Generate erlang module which handles (PER) encode and decode for
-%% all types in an ASN.1 module
-
--include("asn1_records.hrl").
-
--export([pgen/4]).
--export([decode_class/1, decode_type/1]).
--export([add_removed_bytes/0]).
--export([gen_encode/2,gen_encode/3,gen_decode/2,gen_decode/3]).
--export([gen_encode_prim/4]).
--export([gen_dec_prim/8]).
--export([gen_objectset_code/2, gen_obj_code/3]).
--export([re_wrap_erule/1]).
--export([unused_var/2]).
-
--import(asn1ct_gen, [emit/1,demit/1]).
-
-						% the encoding of class of tag bits 8 and 7
--define(UNIVERSAL,   0).
--define(APPLICATION, 16#40).
--define(CONTEXT,     16#80).
--define(PRIVATE,     16#C0).
-
-						% primitive or constructed encoding % bit 6
--define(PRIMITIVE,   0).
--define(CONSTRUCTED, 2#00100000).
-
-
--define(T_ObjectDescriptor, ?UNIVERSAL bor ?PRIMITIVE bor 7).
-						% restricted character string types
--define(T_NumericString,    ?UNIVERSAL bor ?PRIMITIVE bor 18). %can be constructed
--define(T_PrintableString,  ?UNIVERSAL bor ?PRIMITIVE bor 19). %can be constructed
--define(T_TeletexString,    ?UNIVERSAL bor ?PRIMITIVE bor 20). %can be constructed
--define(T_VideotexString,   ?UNIVERSAL bor ?PRIMITIVE bor 21). %can be constructed
--define(T_IA5String,        ?UNIVERSAL bor ?PRIMITIVE bor 22). %can be constructed
--define(T_GraphicString,    ?UNIVERSAL bor ?PRIMITIVE bor 25). %can be constructed
--define(T_VisibleString,    ?UNIVERSAL bor ?PRIMITIVE bor 26). %can be constructed
--define(T_GeneralString,    ?UNIVERSAL bor ?PRIMITIVE bor 27). %can be constructed
-
-%% pgen(Erules, Module, TypeOrVal)
-%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
-%% .hrl file is only generated if necessary
-%% Erules = per | ber
-%% Module = atom()
-%% TypeOrVal = {TypeList,ValueList,PTypeList}
-%% TypeList = ValueList = [atom()]
-
-pgen(OutFile,Erules,Module,TypeOrVal) ->
-    asn1ct_gen:pgen_module(OutFile,Erules,Module,TypeOrVal,true).
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Generate ENCODING
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% encode #{typedef, {pos, name, typespec}}
-%%===============================================================================
-
-gen_encode(Erules,Type) when record(Type,typedef) ->
-    gen_encode_user(Erules,Type).
-
-%%===============================================================================
-%% encode #{type, {tag, def, constraint}}
-%%===============================================================================
-
-gen_encode(Erules,Typename,Type) when record(Type,type) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    ObjFun =
-	case lists:keysearch(objfun,1,Type#type.tablecinf) of
-	    {value,{_,_Name}} ->
-		", ObjFun";
-	    false ->
-		""
-	end,
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    emit([nl,nl,nl,"%%================================"]),
-	    emit([nl,"%%  ",asn1ct_gen:list2name(Typename)]),
-	    emit([nl,"%%================================",nl]),
-	    case lists:member(InnerType,['SET','SEQUENCE']) of
-		true -> 
-		    case get(asn_keyed_list) of
-			true ->
-			    CompList = 
-				case Type#type.def of
-				    #'SEQUENCE'{components=Cl} -> Cl;
-				    #'SET'{components=Cl} -> Cl
-				end,
-			    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-				  "'(Val, TagIn",ObjFun,
-				  ") when list(Val) ->",nl]),
-			    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-				  "'(?RT_BER:fixoptionals(",
-				  {asis,optionals(CompList)},
-				  ",Val), TagIn",ObjFun,");",nl,nl]);
-			_ -> true
-		    end;
-		_ ->
-		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'({'",asn1ct_gen:list2name(Typename),
-			  "',Val}, TagIn",ObjFun,") ->",nl]),
-		    emit(["   'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val, TagIn",ObjFun,");",nl,nl])
-	    end,
-	    emit(["'enc_",asn1ct_gen:list2name(Typename),
-		  "'(Val, TagIn",ObjFun,") ->",nl,"   "]),
-	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
-	_ ->
-	    true
-    end;
-
-%%===============================================================================
-%% encode ComponentType
-%%===============================================================================
-
-gen_encode(Erules,Tname,{'ComponentType',_Pos,Cname,Type,_,_}) ->
-    NewTname = [Cname|Tname],
-    %% The tag is set to [] to avoid that it is
-    %% taken into account twice, both as a component/alternative (passed as
-    %% argument to the encode decode function and within the encode decode
-    %% function it self.
-    NewType = Type#type{tag=[]},
-    gen_encode(Erules,NewTname,NewType).
-
-gen_encode_user(Erules,D) when record(D,typedef) ->
-    Typename = [D#typedef.name],
-    Type = D#typedef.typespec,
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    emit([nl,nl,"%%================================"]),
-    emit([nl,"%%  ",Typename]),
-    emit([nl,"%%================================",nl]),
-    case lists:member(InnerType,['SET','SEQUENCE']) of
-	true -> 
-	    case get(asn_keyed_list) of
-		true ->
-		    CompList = 
-			case Type#type.def of
-			    #'SEQUENCE'{components=Cl} -> Cl;
-			    #'SET'{components=Cl} -> Cl
-			end,
-
-		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val, TagIn) when list(Val) ->",nl]),
-		    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-			  "'(?RT_BER:fixoptionals(",
-			  {asis,optionals(CompList)},
-			  ",Val), TagIn);",nl,nl]);
-		_ -> true
-	    end;
-	_ ->
-	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
-		  "'({'",asn1ct_gen:list2name(Typename),"',Val}, TagIn) ->",nl}),
-	    emit({"   'enc_",asn1ct_gen:list2name(Typename),"'(Val, TagIn);",nl,nl})
-    end,
-    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(",
-	  unused_var("Val",Type#type.def),", TagIn) ->",nl}),
-    CurrentMod = get(currmod),
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,D);
-	{primitive,bif} ->
-	    asn1ct_gen_ber:gen_encode_prim(ber,Type,["TagIn ++ ",
-						     {asis,Tag}],"Val"),
-	    emit([".",nl]);
-	#typereference{val=Ename} ->
-	    emit(["   'enc_",Ename,"'(Val, TagIn ++ ",{asis,Tag},").",nl]);
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'enc_",Etype,"'(Val, TagIn ++ ",
-		  {asis,Tag},").",nl]);
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'enc_",Etype,"'(Val, TagIn ++ ",
-		  {asis,Tag},").",nl]);
-	'ASN1_OPEN_TYPE' ->
-	    emit(["%% OPEN TYPE",nl]),
-	    asn1ct_gen_ber:gen_encode_prim(ber,
-					   Type#type{def='ASN1_OPEN_TYPE'},
-					   ["TagIn ++ ",
-					    {asis,Tag}],"Val"),
-	    emit([".",nl])
-    end.
-
-unused_var(Var,#'SEQUENCE'{components=Cl}) ->
-    unused_var1(Var,Cl);
-unused_var(Var,#'SET'{components=Cl}) ->
-    unused_var1(Var,Cl);
-unused_var(Var,_) ->
-    Var.
-unused_var1(Var,Cs) when Cs == []; Cs == {[],[]} ->
-    lists:concat(["_",Var]);
-unused_var1(Var,_) ->
-    Var.
-
-unused_optormand_var(Var,Def) ->
-    case asn1ct_gen:type(asn1ct_gen:get_inner(Def)) of
-	'ASN1_OPEN_TYPE' ->
-	    lists:concat(["_",Var]);
-	_ ->
-	    Var
-    end.
-    
-
-gen_encode_prim(_Erules,D,DoTag,Value) when record(D,type) ->
-    
-%%% Currently not used for BER (except for BitString) and therefore replaced
-%%% with [] as a placeholder
-    BitStringConstraint = D#type.constraint,
-    Constraint = [],
-    asn1ct_name:new(enumval),
-    case D#type.def of
-	'BOOLEAN' ->
-	    emit_encode_func('boolean',Value,DoTag);
-	'INTEGER' ->
-	    emit_encode_func('integer',Constraint,Value,DoTag);
-	{'INTEGER',NamedNumberList} ->
-	    emit_encode_func('integer',Constraint,Value,
-			     NamedNumberList,DoTag);
-	{'ENUMERATED',NamedNumberList={_,_}} ->
-	    
-	    emit(["case (case ",Value," of {asn1_enum,_}->",Value,";{_,_}->element(2,",Value,");_->",
-		  Value," end) of",nl]),
-	    emit_enc_enumerated_cases(NamedNumberList,DoTag);
-	{'ENUMERATED',NamedNumberList} ->
-	    
-	    emit(["case (case ",Value," of {_,_}->element(2,",Value,");_->",
-		  Value," end) of",nl]),
-	    emit_enc_enumerated_cases(NamedNumberList,DoTag);
-
-	{'BIT STRING',NamedNumberList} ->
-	    emit_encode_func('bit_string',BitStringConstraint,Value,
-			     NamedNumberList,DoTag);
-	'ANY' ->
-	    emit_encode_func('open_type', Value,DoTag);
-	'NULL' ->
-	    emit_encode_func('null',Value,DoTag);
-	'OBJECT IDENTIFIER' ->
-	    emit_encode_func("object_identifier",Value,DoTag);
-	'ObjectDescriptor' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_ObjectDescriptor,DoTag);
-	'OCTET STRING' ->
-	    emit_encode_func('octet_string',Constraint,Value,DoTag);
-	'NumericString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_NumericString,DoTag);
-	'TeletexString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_TeletexString,DoTag);
-	'VideotexString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_VideotexString,DoTag);
-	'GraphicString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_GraphicString,DoTag);
-	'VisibleString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_VisibleString,DoTag);
-	'GeneralString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_GeneralString,DoTag);
-	'PrintableString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_PrintableString,DoTag);
-	'IA5String' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_IA5String,DoTag);
-	'UniversalString' ->
-	    emit_encode_func('universal_string',Constraint,Value,DoTag);
-	'BMPString' ->
-	    emit_encode_func('BMP_string',Constraint,Value,DoTag);
-	'UTCTime' ->
-	    emit_encode_func('utc_time',Constraint,Value,DoTag);
-	'GeneralizedTime' ->
-	    emit_encode_func('generalized_time',Constraint,Value,DoTag);
-	'ASN1_OPEN_TYPE' ->
-	    emit_encode_func('open_type', Value,DoTag);
-	XX ->
-	    exit({'can not encode' ,XX})
-    end.
-
-
-emit_encode_func(Name,Value,Tags) when atom(Name) ->
-    emit_encode_func(atom_to_list(Name),Value,Tags);
-emit_encode_func(Name,Value,Tags) ->
-    Fname = "?RT_BER:encode_" ++ Name,
-    emit([Fname,"(",Value,", ",Tags,")"]).
-
-emit_encode_func(Name,Constraint,Value,Tags) when atom(Name) ->
-    emit_encode_func(atom_to_list(Name),Constraint,Value,Tags);
-emit_encode_func(Name,Constraint,Value,Tags) ->
-    Fname = "?RT_BER:encode_" ++ Name,
-    emit([Fname,"(",{asis,Constraint},", ",Value,", ",Tags,")"]).
-
-emit_encode_func(Name,Constraint,Value,Asis,Tags) when atom(Name) ->
-    emit_encode_func(atom_to_list(Name),Constraint,Value,Asis,Tags);
-emit_encode_func(Name,Constraint,Value,Asis,Tags) ->
-    Fname = "?RT_BER:encode_" ++ Name,
-    emit([Fname,"(",{asis,Constraint},", ",Value,
-	  ", ",{asis,Asis},
-	  ", ",Tags,")"]).
-    
-emit_enc_enumerated_cases({L1,L2}, Tags) ->
-    emit_enc_enumerated_cases(L1++L2, Tags, ext);
-emit_enc_enumerated_cases(L, Tags) ->
-    emit_enc_enumerated_cases(L, Tags, noext).
-
-emit_enc_enumerated_cases([{EnumName,EnumVal},H2|T], Tags, Ext) ->
-    emit([{asis,EnumName}," -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,");",nl]),
-%%    emit(["'",{asis,EnumName},"' -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,");",nl]),
-    emit_enc_enumerated_cases([H2|T], Tags, Ext);
-emit_enc_enumerated_cases([{EnumName,EnumVal}], Tags, Ext) ->
-    emit([{asis,EnumName}," -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,")"]),
-%%    emit(["'",{asis,EnumName},"' -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,")"]),
-    case Ext of
-	noext -> emit([";",nl]);
-	ext -> 
-	    emit([";",nl,"{asn1_enum,",{curr,enumval},"} -> ",
-		     "?RT_BER:encode_enumerated(",{curr,enumval},",",Tags,");",nl]),
-	    asn1ct_name:new(enumval)
-    end,
-    emit([{curr,enumval}," -> exit({error,{asn1, {enumerated_not_in_range,",{curr, enumval},"}}})"]),
-    emit([nl,"end"]).
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Generate DECODING
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% decode #{typedef, {pos, name, typespec}}
-%%===============================================================================
-
-gen_decode(Erules,Type) when record(Type,typedef) ->
-    D = Type,
-    emit({nl,nl}),
-    emit({"'dec_",Type#typedef.name,"'(Bytes, OptOrMand) ->",nl}),
-    emit({"   'dec_",Type#typedef.name,"'(Bytes, OptOrMand, []).",nl,nl}),
-    emit({"'dec_",Type#typedef.name,"'(Bytes, ",
-	  unused_optormand_var("OptOrMand",(Type#typedef.typespec)#type.def),", TagIn) ->",nl}),
-    dbdec(Type#typedef.name),
-    gen_decode_user(Erules,D).
-
-
-%%===============================================================================
-%% decode #{type, {tag, def, constraint}}
-%%===============================================================================
-
-gen_decode(Erules,Tname,Type) when record(Type,type) ->
-    Typename = Tname,
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    ObjFun =
-		case Type#type.tablecinf of
-		    [{objfun,_}|_R] ->
-			", ObjFun";
-		    _ ->
-			""
-		end,
-	    emit({"'dec_",asn1ct_gen:list2name(Typename),"'(Bytes, OptOrMand, TagIn",ObjFun,") ->",nl}),
-	    dbdec(Typename),
-	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
-	_ ->
-	    true
-    end;
-
-
-%%===============================================================================
-%% decode ComponentType
-%%===============================================================================
-
-gen_decode(Erules,Tname,{'ComponentType',_Pos,Cname,Type,_,_}) ->
-    NewTname = [Cname|Tname],
-    %% The tag is set to [] to avoid that it is
-    %% taken into account twice, both as a component/alternative (passed as
-    %% argument to the encode decode function and within the encode decode
-    %% function it self.
-    NewType = Type#type{tag=[]},
-    gen_decode(Erules,NewTname,NewType).
-
-
-gen_decode_user(Erules,D) when record(D,typedef) ->
-    Typename = [D#typedef.name],
-    Def = D#typedef.typespec,
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    InnerTag = Def#type.tag ,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- InnerTag],
-    case asn1ct_gen:type(InnerType) of
-	'ASN1_OPEN_TYPE' ->
-	    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
-	    asn1ct_name:new(len),
-	    gen_dec_prim(Erules, Def#type{def='ASN1_OPEN_TYPE'}, 
-			 BytesVar, Tag, "TagIn",no_length, 
-			 ?PRIMITIVE,"OptOrMand"),
-	    emit({".",nl,nl});
-	{primitive,bif} ->
-	    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
-	    asn1ct_name:new(len),
-	    gen_dec_prim(Erules, Def, BytesVar, Tag, "TagIn",no_length, 
-			 ?PRIMITIVE,"OptOrMand"),
-	    emit({".",nl,nl});
-	{constructed,bif} ->
-	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,D);
-	TheType ->
-	    DecFunName = mkfuncname(TheType,dec),
-	    emit({DecFunName,"(",{curr,bytes},
-		  ", OptOrMand, TagIn++",{asis,Tag},")"}),
-	    emit({".",nl,nl})
-    end.
-
-
-gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Length,_Form,OptOrMand) ->
-    Typename = Att#type.def,
-%% Currently not used for BER replaced with [] as place holder
-%%    Constraint = Att#type.constraint,
-%% Constraint = [],
-    Constraint = 
-	case get_constraint(Att#type.constraint,'SizeConstraint') of
-	    no -> [];
-	    Tc -> Tc
-	end,
-    ValueRange = 
-	case get_constraint(Att#type.constraint,'ValueRange') of
-	    no -> [];
-	    Tv -> Tv
-	end,
-    SingleValue = 
-	case get_constraint(Att#type.constraint,'SingleValue') of
-	    no -> [];
-	    Sv -> Sv
-	end,
-    AsBin = case get(binary_strings) of
-		true -> "_as_bin";
-		_ -> ""
-	    end,
-    NewTypeName = case Typename of
-		      'ANY' -> 'ASN1_OPEN_TYPE';
-		      _ -> Typename
-		  end,
-    DoLength = 
-	case NewTypeName of
-	    'BOOLEAN'->
-		emit({"?RT_BER:decode_boolean(",BytesVar,","}),
-		false;
-	    'INTEGER' ->
-		emit({"?RT_BER:decode_integer(",BytesVar,",",
-		      {asis,int_constr(SingleValue,ValueRange)},","}),
-		false;
-	    {'INTEGER',NamedNumberList} ->
-		emit({"?RT_BER:decode_integer(",BytesVar,",",
-		      {asis,int_constr(SingleValue,ValueRange)},",",
-		      {asis,NamedNumberList},","}),
-		false;
-	    {'ENUMERATED',NamedNumberList} ->
-		emit({"?RT_BER:decode_enumerated(",BytesVar,",",
-		      {asis,Constraint},",",
-		      {asis,NamedNumberList},","}),
-		false;
-	    {'BIT STRING',NamedNumberList} ->
-		case get(compact_bit_string) of
-		    true ->
-			emit({"?RT_BER:decode_compact_bit_string(",
-			      BytesVar,",",{asis,Constraint},",",
-			      {asis,NamedNumberList},","});
-		    _ ->
-			emit({"?RT_BER:decode_bit_string(",BytesVar,",",
-			      {asis,Constraint},",",
-			      {asis,NamedNumberList},","})
-		end,
-		true;
-	    'NULL' ->
-		emit({"?RT_BER:decode_null(",BytesVar,","}),
-		false;
-	    'OBJECT IDENTIFIER' ->
-		emit({"?RT_BER:decode_object_identifier(",BytesVar,","}),
-		false;
-	    'ObjectDescriptor' ->
-		emit({"?RT_BER:decode_restricted_string(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_ObjectDescriptor},","}),
-		true;
-	    'OCTET STRING' ->
-		emit({"?RT_BER:decode_octet_string",AsBin,"(",BytesVar,",",{asis,Constraint},","}),
-		true;
-	    'NumericString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_NumericString},","}),true;
-	    'TeletexString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_TeletexString},","}),
-		true;
-	    'VideotexString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_VideotexString},","}),
-		true;
-	    'GraphicString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_GraphicString},","})
-		    ,true;
-	    'VisibleString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_VisibleString},","}),
-		true;
-	    'GeneralString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_GeneralString},","}),
-		true;
-	    'PrintableString' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_PrintableString},","}),
-		true;
-	    'IA5String' ->
-		emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},",",{asis,?T_IA5String},","}),
-		true;
-	    'UniversalString' ->
-		emit({"?RT_BER:decode_universal_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},","}),
-		true;
-	    'BMPString' ->
-		emit({"?RT_BER:decode_BMP_string",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},","}),
-		true;
-	    'UTCTime' ->
-		emit({"?RT_BER:decode_utc_time",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},","}),
-		true;
-	    'GeneralizedTime' ->
-		emit({"?RT_BER:decode_generalized_time",AsBin,"(",
-		      BytesVar,",",{asis,Constraint},","}),
-		true;
-	    'ASN1_OPEN_TYPE' ->
-		emit(["?RT_BER:decode_open_type(",re_wrap_erule(Erules),",",
-		      BytesVar,","]),
-		false;
-	    Other ->
-		exit({'can not decode' ,Other})
-	end,
-    
-    NewLength = case DoLength of
-		    true -> [", ", Length];
-		    false -> ""
-		end,
-    NewOptOrMand = case OptOrMand of
-		       _ when list(OptOrMand) -> OptOrMand;
-		       mandatory -> {asis,mandatory};
-		       _ -> {asis,opt_or_default}
-		   end,
-    case {TagIn,NewTypeName} of
-	{[],'ASN1_OPEN_TYPE'} ->
-	    emit([{asis,DoTag},")"]);
-	{_,'ASN1_OPEN_TYPE'} ->
-	    emit([TagIn,"++",{asis,DoTag},")"]);
-	{[],_} ->
-	    emit([{asis,DoTag},NewLength,", ",NewOptOrMand,")"]);
-	_ when list(TagIn) ->
-	    emit([TagIn,"++",{asis,DoTag},NewLength,", ",NewOptOrMand,")"])
-    end.
-
-
-int_constr([],[]) ->
-    [];
-int_constr([],ValueRange) ->
-    ValueRange;
-int_constr(SingleValue,[]) ->
-    SingleValue;
-int_constr(SV,VR) ->
-    [SV,VR].
-    
-%% Object code generating for encoding and decoding
-%% ------------------------------------------------
-
-gen_obj_code(Erules,_Module,Obj) when record(Obj,typedef) ->
-    ObjName = Obj#typedef.name,
-    Def = Obj#typedef.typespec,
-    #'Externaltypereference'{module=M,type=ClName} = Def#'Object'.classname,
-    Class = asn1_db:dbget(M,ClName),
-
-    {object,_,Fields} = Def#'Object'.def,
-    emit({nl,nl,nl,"%%================================"}),
-    emit({nl,"%%  ",ObjName}),
-    emit({nl,"%%================================",nl}),
-    EncConstructed =
-	gen_encode_objectfields(ClName,get_class_fields(Class),
-				ObjName,Fields,[]),
-    emit(nl),
-    gen_encode_constr_type(Erules,EncConstructed),
-    emit(nl),
-    DecConstructed =
-	gen_decode_objectfields(ClName,get_class_fields(Class),
-				ObjName,Fields,[]),
-    emit(nl),
-    gen_decode_constr_type(Erules,DecConstructed);
-gen_obj_code(_Erules,_Module,Obj) when record(Obj,pobjectdef) ->
-    ok.
-
-
-gen_encode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Args) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ", ",Args,", _RestPrimFieldName) ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val, TagIn, _RestPrimFieldName) ->",nl]),
-    MaybeConstr=
-	case {get_object_field(Name,ObjectFields),OptOrMand} of
-	    {false,'MANDATORY'} -> %% this case is illegal
-		exit({error,{asn1,{"missing mandatory field in object",
-				   ObjName}}});
-	    {false,'OPTIONAL'} ->
-		EmitFuncClause("_, _"),
-		emit(["   {[],0}"]),
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Val, TagIn"),
-		gen_encode_default_call(ClassName,Name,DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Val, TagIn"),
-		gen_encode_field_call(ObjName,Name,TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,
-			    MaybeConstr++ConstrAcc);
-gen_encode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Args) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ", ",Args,") ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val, TagIn, [H|T]) ->",nl]),
-    case {get_object_field(Name,ObjectFields),OptOrMand} of
-	{false,'MANDATORY'} ->
-	    exit({error,{asn1,{"missing mandatory field in object",
-			       ObjName}}});
-	{false,'OPTIONAL'} ->
-	    EmitFuncClause("_,_,_"),
-	    emit(["  exit({error,{'use of missing field in object', ",Name,
-		  "}})"]);
-	{false,{'DEFAULT',_DefaultObject}} ->
-	    exit({error,{asn1,{"not implemented yet",Name}}});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause(" Val, TagIn, [H|T]"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
-			  "'(H, Val, TagIn, T)"});
-		TypeName ->
-		    emit({indent(3),"'enc_",TypeName,"'(H, Val, TagIn, T)"})
-	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
-gen_encode_objectfields(ClassName,[_|Cs],O,OF,Acc) ->
-    gen_encode_objectfields(ClassName,Cs,O,OF,Acc);
-gen_encode_objectfields(_,[],_,_,Acc) ->
-    Acc.
-
-
-% gen_encode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
-%     Fields = Class#objectclass.fields,
-%     MaybeConstr=
-% 	case is_typefield(Fields,FieldName) of
-% 	    true ->
-% 		Def = Type#typedef.typespec,
-% 		OTag = Def#type.tag,
-% 		Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-% 		emit({"'enc_",ObjName,"'(",{asis,FieldName},
-% 		      ", Val, TagIn, RestPrimFieldName) ->",nl}),
-% 		CAcc=
-% 		case Type#typedef.name of
-% 		    {primitive,bif} ->
-% 			gen_encode_prim(ber,Def,["TagIn ++ ",{asis,Tag}],
-% 					"Val"),
-% 			[];
-% 		    {constructed,bif} ->
-% 			%%InnerType = asn1ct_gen:get_inner(Def#type.def),
-% 			%%asn1ct_gen:gen_encode_constructed(ber,[ObjName],
-% 			%%                            InnerType,Def);
-% 			emit({"   'enc_",ObjName,'_',FieldName,
-% 			      "'(Val, TagIn ++ ",{asis,Tag},")"}),
-% 			[{['enc_',ObjName,'_',FieldName],Def}];
-% 		    {ExtMod,TypeName} ->
-% 			emit({"   '",ExtMod,"':'enc_",TypeName,
-% 			      "'(Val, TagIn ++ ",{asis,Tag},")"}),
-% 			[];
-% 		    TypeName ->
-% 			emit({"   'enc_",TypeName,"'(Val, TagIn ++ ",
-% 			      {asis,Tag},")"}),
-% 			[]
-% 		end,
-% 		case more_genfields(Fields,Rest) of
-% 		    true ->
-% 			emit({";",nl});
-% 		    false ->
-% 			emit({".",nl})
-% 		end,
-% 		CAcc;
-% 	{false,objectfield} ->
-% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
-% 		  ", Val, TagIn, [H|T]) ->",nl}),
-% 	    case Type#typedef.name of
-% 		{ExtMod,TypeName} ->
-% 		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
-% 			  "'(H, Val, TagIn, T)"});
-% 		TypeName ->
-% 		    emit({indent(3),"'enc_",TypeName,"'(H, Val, TagIn, T)"})
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    [];
-% 	{false,_} -> []
-%     end,
-%     gen_encode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
-% gen_encode_objectfields(C,O,[H|T],Acc) ->
-%     gen_encode_objectfields(C,O,T,Acc);
-% gen_encode_objectfields(_,_,[],Acc) ->
-%     Acc.
-
-% gen_encode_constr_type([{Name,Def}|Rest]) ->
-%     emit({Name,"(Val,TagIn) ->",nl}),
-%     InnerType = asn1ct_gen:get_inner(Def#type.def),
-%     asn1ct_gen:gen_encode_constructed(ber,Name,InnerType,Def),
-%     gen_encode_constr_type(Rest);
-gen_encode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
-    case is_already_generated(enc,TypeDef#typedef.name) of
-	true -> ok;
-	_ -> gen_encode_user(Erules,TypeDef)
-    end,
-    gen_encode_constr_type(Erules,Rest);
-gen_encode_constr_type(_,[]) ->
-    ok.
-
-gen_encode_field_call(ObjName,FieldName,Type) ->
-    Def = Type#typedef.typespec,
-    OTag = Def#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case Type#typedef.name of
-	{primitive,bif} -> %%tag should be the primitive tag
-	    gen_encode_prim(ber,Def,["TagIn ++ ",{asis,Tag}],
-			    "Val"),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'enc_",ObjName,'_',FieldName,
-		  "'(Val, TagIn ++",{asis,Tag},")"}),
-	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'enc_",TypeName,
-		  "'(Val, TagIn ++ ",{asis,Tag},")"}),
-	    [];
-	TypeName ->
-	    emit({"   'enc_",TypeName,"'(Val, TagIn ++ ",{asis,Tag},")"}),
-	    []
-    end.
-
-gen_encode_default_call(ClassName,FieldName,Type) ->
-    CurrentMod = get(currmod),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-%%	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
-	    emit(["   'enc_",ClassName,'_',FieldName,"'(Bytes, TagIn ++ ",
-		  {asis,Tag},")"]),
-	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_encode_prim(ber,Type,["TagIn ++ ",{asis,Tag}],"Val"),
-	    [];
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'enc_",Etype,"'(Val, TagIn ++ ",{asis,Tag},")",nl]),
-	    [];
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'enc_",Etype,"'(Val, TagIn ++ ",{asis,Tag},")",nl]),
-	    []
-    end.
-    
-
-
-gen_decode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Args) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},
-		      ", ",Args,"_) ->",nl])
-	end,
-%     emit(["'dec_",ObjName,"'(",{asis,Name},
-% 	  ", Bytes, TagIn, RestPrimFieldName) ->",nl]),
-    MaybeConstr=
-	case {get_object_field(Name,ObjectFields),OptOrMand} of
-	    {false,'MANDATORY'} -> %% this case is illegal
-		exit({error,{asn1,{"missing mandatory field in object",
-				   ObjName}}});
-	    {false,'OPTIONAL'} ->
-		EmitFuncClause("_, _,"),
-		emit(["   asn1_NOVALUE"]),
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Bytes, TagIn,"),
-		gen_decode_default_call(ClassName,Name,"Bytes",DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Bytes, TagIn,"),
-		gen_decode_field_call(ObjName,Name,"Bytes",TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,MaybeConstr++ConstrAcc);
-gen_decode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Args) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},
-		      ", ",Args,") ->",nl])
-	end,
-%     emit(["'dec_",ObjName,"'(",{asis,Name},
-% 	  ", Bytes,TagIn,[H|T]) ->",nl]),
-    case {get_object_field(Name,ObjectFields),OptOrMand} of
-	{false,'MANDATORY'} ->
-	    exit({error,{asn1,{"missing mandatory field in object",
-			       ObjName}}});
-	{false,'OPTIONAL'} ->
-	    EmitFuncClause("_,_,_"),
-	    emit(["  exit({error,{'illegal use of missing field in object', ",Name,
-		  "}})"]);
-	{false,{'DEFAULT',_DefaultObject}} ->
-	    exit({error,{asn1,{"not implemented yet",Name}}});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause("Bytes,TagIn,[H|T]"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
-			  "'(H, Bytes, TagIn, T)"});
-		TypeName ->
-		    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, TagIn, T)"})
-	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
-gen_decode_objectfields(CN,[_|Cs],O,OF,CAcc) ->
-    gen_decode_objectfields(CN,Cs,O,OF,CAcc);
-gen_decode_objectfields(_,[],_,_,CAcc) ->
-    CAcc.
-
-
-
-% gen_decode_objectfields(Erules,Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
-%     Fields = Class#objectclass.fields,
-%     MaybeConstr =
-%     case is_typefield(Fields,FieldName) of
-% 	true ->
-% 	    Def = Type#typedef.typespec,
-% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
-% 		  ", Bytes, TagIn, RestPrimFieldName) ->",nl}),
-% 	    OTag = Def#type.tag,
-% 	    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-% 	    Prop = 
-% 		case get_optionalityspec(Fields,FieldName) of
-% 		    'OPTIONAL' -> opt_or_default;
-% 		    {'DEFAULT',_} -> opt_or_default;
-% 		    _ -> mandatory
-% 		end,
-% 	    CAcc =
-% 	    case Type#typedef.name of
-% 		{primitive,bif} ->
-% 		    gen_dec_prim(Erules,Def,"Bytes",Tag,"TagIn",no_length,
-% 				 ?PRIMITIVE,Prop),
-% 		    [];
-% 		{constructed,bif} ->
-% 		    emit({"   'dec_",ObjName,'_',FieldName,"'(Bytes,",
-% 			  {asis,Prop},", TagIn ++ ",{asis,Tag},")"}),
-% 		    [{['dec_',ObjName,'_',FieldName],Def}];
-% 		{ExtMod,TypeName} ->
-% 		    emit({"   '",ExtMod,"':'dec_",TypeName,"'(Bytes, ",
-% 			  {asis,Prop},", TagIn ++ ",{asis,Tag},")"}),
-% 		    [];
-% 		TypeName ->
-% 		    emit({"   'dec_",TypeName,"'(Bytes, ",{asis,Prop},
-% 			  ", TagIn ++ ",{asis,Tag},")"}),
-% 		    []
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    CAcc;
-% 	{false,objectfield} ->
-% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
-% 		  ", Bytes, TagIn, [H|T]) ->",nl}),
-% 	    case Type#typedef.name of
-% 		{ExtMod,TypeName} ->
-% 		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
-% 			  "'(H, Bytes, TagIn, T)"});
-% 		TypeName ->
-% 		    emit({indent(3),"'dec_",TypeName,
-% 			  "'(H, Bytes, TagIn, T)"})
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    [];
-% 	{false,_} ->
-% 	    []
-%     end,
-%     gen_decode_objectfields(Erules,Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
-% gen_decode_objectfields(Erules,C,O,[H|T],CAcc) ->
-%     gen_decode_objectfields(Erules,C,O,T,CAcc);
-% gen_decode_objectfields(_,_,_,[],CAcc) ->
-%     CAcc.
-
-gen_decode_constr_type(Erules,[{Name,Def}|Rest]) ->
-%%    emit({Name,"(Bytes, OptOrMand) ->",nl}),
-%%    emit({"   ",Name,"(Bytes, OptOrMand, []).",nl,nl}),
-    emit({Name,"(Bytes, OptOrMand, TagIn) ->",nl}),
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    asn1ct_gen:gen_decode_constructed(ber,Name,InnerType,Def),
-    gen_decode_constr_type(Erules,Rest);
-gen_decode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
-    case is_already_generated(dec,TypeDef#typedef.name) of
-	true -> ok;
-	_ ->
-	    gen_decode(Erules,TypeDef)
-    end,
-    gen_decode_constr_type(Erules,Rest);
-gen_decode_constr_type(_,[]) ->
-    ok.
-
-gen_decode_field_call(ObjName,FieldName,Bytes,Type) ->
-    Def = Type#typedef.typespec,
-    OTag = Def#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case Type#typedef.name of
-	{primitive,bif} -> %%tag should be the primitive tag
-	    gen_dec_prim(ber,Def,Bytes,Tag,"TagIn",no_length,
-			 ?PRIMITIVE,opt_or_default),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'dec_",ObjName,'_',FieldName,
-		  "'(",Bytes,",opt_or_default, TagIn ++ ",{asis,Tag},")"}),
-	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'dec_",TypeName,
-		  "'(",Bytes,", opt_or_default,TagIn ++ ",{asis,Tag},")"}),
-	    [];
-	TypeName ->
-	    emit({"   'dec_",TypeName,"'(",Bytes,
-		  ", opt_or_default,TagIn ++ ",{asis,Tag},")"}),
-	    []
-    end.
-
-gen_decode_default_call(ClassName,FieldName,Bytes,Type) ->
-    CurrentMod = get(currmod),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-	    emit(["   'dec_",ClassName,'_',FieldName,"'(",Bytes,
-		  ",opt_or_default, TagIn ++ ",{asis,Tag},")"]),
-	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_dec_prim(ber,Type,Bytes,Tag,"TagIn",no_length,
-			 ?PRIMITIVE,opt_or_default),
-	    [];
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'dec_",Etype,"'(",Bytes,
-		  " ,opt_or_default, TagIn ++ ",{asis,Tag},")",nl]),
-	    [];
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'dec_",Etype,"'(",Bytes,
-		  ", opt_or_defualt, TagIn ++ ",{asis,Tag},")",nl]),
-	    []
-    end.
-
-    
-more_genfields([]) ->
-    false;
-more_genfields([Field|Fields]) ->
-    case element(1,Field) of
-	typefield ->
-	    true;
-	objectfield ->
-	    true;
-	_ ->
-	    more_genfields(Fields)
-    end.
-
-
-
-%% Object Set code generating for encoding and decoding
-%% ----------------------------------------------------
-gen_objectset_code(Erules,ObjSet) ->
-    ObjSetName = ObjSet#typedef.name,
-    Def = ObjSet#typedef.typespec,
-%    {ClassName,ClassDef} = Def#'ObjectSet'.class,
-    #'Externaltypereference'{module=ClassModule,
-			     type=ClassName} = Def#'ObjectSet'.class,
-    ClassDef = asn1_db:dbget(ClassModule,ClassName),
-    UniqueFName = Def#'ObjectSet'.uniquefname,
-    Set = Def#'ObjectSet'.set,
-    emit({nl,nl,nl,"%%================================"}),
-    emit({nl,"%%  ",ObjSetName}),
-    emit({nl,"%%================================",nl}),
-    case ClassName of
-	{_Module,ExtClassName} ->
-	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
-			    ExtClassName,ClassDef);
-	_ ->
-	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
-			    ClassName,ClassDef)
-    end,
-    emit(nl).
-
-gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassDef)->
-    ClassFields = (ClassDef#classdef.typespec)#objectclass.fields,
-    InternalFuncs=gen_objset_enc(ObjSetName,UniqueFName,Set,ClassName,ClassFields,1,[]),
-    gen_objset_dec(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassFields,1),
-    gen_internal_funcs(Erules,InternalFuncs).
-
-%% gen_objset_enc iterates over the objects of the object set
-gen_objset_enc(_,{unique,undefined},_,_,_,_,_) ->
-    %% There is no unique field in the class of this object set
-    %% don't bother about the constraint
-    [];
-gen_objset_enc(ObjSName,UniqueName,
-	       [{ObjName,Val,Fields},T|Rest],ClName,ClFields,NthObj,Acc)->
-    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},") ->",nl}),
-    {InternalFunc,NewNthObj}=
-	case ObjName of
-	    no_name ->
-		gen_inlined_enc_funs(Fields,ClFields,ObjSName,NthObj);
-	    _Other ->
-		emit({"    fun 'enc_",ObjName,"'/4"}),
-		{[],NthObj}
-	end,
-    emit({";",nl}),
-    gen_objset_enc(ObjSName,UniqueName,[T|Rest],ClName,ClFields,
-		   NewNthObj,InternalFunc ++ Acc);
-gen_objset_enc(ObjSetName,UniqueName,
-	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
-    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},") ->",nl}),
-    {InternalFunc,_}=
-	case ObjName of
-	    no_name ->
-		gen_inlined_enc_funs(Fields,ClFields,ObjSetName,NthObj);
-	    _Other ->
-		emit({"    fun 'enc_",ObjName,"'/4"}),
-		{[],NthObj}
-	end,
-    emit({".",nl,nl}),
-    InternalFunc ++ Acc;
-%% See X.681 Annex E for the following case
-gen_objset_enc(ObjSetName,_UniqueName,['EXTENSIONMARK'],
-	       _ClName,_ClFields,_NthObj,Acc) ->
-    emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
-    emit({indent(3),"fun(_Attr, Val, _TagIn, _RestPrimFieldName) ->",nl}),
-    emit({indent(6),"Len = case Val of",nl,indent(9),
- 	  "Bin when binary(Bin) -> size(Bin);",nl,indent(9),
- 	  "_ -> length(Val)",nl,indent(6),"end,"}),
-    emit({indent(6),"{Val,Len}",nl}),
-    emit({indent(3),"end.",nl,nl}),
-    Acc;
-gen_objset_enc(_,_,[],_,_,_,Acc) ->
-    Acc.
-
-%% gen_inlined_enc_funs for each object iterates over all fields of a
-%% class, and for each typefield it checks if the object has that
-%% field and emits the proper code.
-gen_inlined_enc_funs(Fields,[{typefield,Name,_}|Rest],ObjSetName,
-		     NthObj) ->
-    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when record(Type,type) ->
-	    emit({indent(3),"fun(Type, Val, TagIn, _RestPrimFieldName) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    {Ret,N} = emit_inner_of_fun(Type,InternalDefFunName),
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
-	{value,{_,Type}} when record(Type,typedef) ->
-	    emit({indent(3),"fun(Type, Val, TagIn, _RestPrimFieldName) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    {Ret,N} = emit_inner_of_fun(Type,InternalDefFunName),
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
-	false ->
-	    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj)
-    end;
-gen_inlined_enc_funs(Fields,[_H|Rest],ObjSetName,NthObj) ->
-    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_enc_funs(_,[],_,NthObj) ->
-    {[],NthObj}.
-
-gen_inlined_enc_funs1(Fields,[{typefield,Name,_}|Rest],ObjSetName,
-		      NthObj,Acc) ->
-    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
-    {Acc2,NAdd}=
-	case lists:keysearch(Name,1,Fields) of
-	    {value,{_,Type}} when record(Type,type) ->
-		emit({";",nl}),
-		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-		{Ret++Acc,N};
-	    {value,{_,Type}} when record(Type,typedef) ->
-		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-		{Ret++Acc,N};
-	    false ->
-		{Acc,0}
-	end,
-    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+NAdd,Acc2);
-gen_inlined_enc_funs1(Fields,[_H|Rest],ObjSetName,NthObj,Acc)->
-    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj,Acc);
-gen_inlined_enc_funs1(_,[],_,NthObj,Acc) ->
-    emit({nl,indent(6),"end",nl}),
-    emit({indent(3),"end"}),
-    {Acc,NthObj}.
-
-
-emit_inner_of_fun(TDef = #typedef{name={ExtMod,Name},typespec=Type},
-		  InternalDefFunName) ->
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case {ExtMod,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_encode_prim(ber,Type,["TagIn ++ ",{asis,Tag}],"Val"),
-	    {[],0};
-	{constructed,bif} ->
-	    emit([indent(12),"'enc_",
-		  InternalDefFunName,"'(Val,TagIn ++ ",
-		  {asis,Tag},")"]),
-	    {[TDef#typedef{name=InternalDefFunName}],1};
-	_ ->
-	    emit({indent(12),"'",ExtMod,"':'enc_",Name,"'(Val, TagIn ++ ",
-		  {asis,Tag},")"}),
-	    {[],0}
-    end;
-emit_inner_of_fun(#typedef{name=Name,typespec=Type},_) ->
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    emit({indent(12),"'enc_",Name,"'(Val, TagIn ++ ",{asis,Tag},")"}),
-    {[],0};
-emit_inner_of_fun(Type,_) when record(Type,type) ->
-    CurrMod = get(currmod),
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case Type#type.def of
-	Def when atom(Def) ->
-	    emit({indent(9),Def," ->",nl,indent(12)}),
-	    gen_encode_prim(ber,Type,["TagIn ++ ",{asis,Tag}],"Val");
-	TRef when record(TRef,typereference) ->
-	    T = TRef#typereference.val,
-	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,
-		  "'(Val, TagIn ++ ",{asis,Tag},")"});
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,
-		  "'(Val, TagIn ++ ",{asis,Tag},")"});
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'enc_",
-		  T,"'(Val, TagIn ++ ",{asis,Tag},")"})
-    end,
-    {[],0}.
-
-indent(N) ->
-    lists:duplicate(N,32). % 32 = space
-
-
-gen_objset_dec(_,_,{unique,undefined},_,_,_,_) ->
-    %% There is no unique field in the class of this object set
-    %% don't bother about the constraint
-    ok;
-gen_objset_dec(Erules,ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
-	       ClName,ClFields,NthObj)->
-    emit({"'getdec_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
-	  ") ->",nl}),
-    NewNthObj=
-	case ObjName of
-	    no_name ->
-		gen_inlined_dec_funs(Erules,Fields,ClFields,ObjSName,
-				     NthObj);
-	    _Other ->
-		emit({"    fun 'dec_",ObjName,"'/4"}),
-		NthObj
-	end,
-    emit({";",nl}),
-    gen_objset_dec(Erules,ObjSName,UniqueName,[T|Rest],ClName,ClFields,
-		   NewNthObj);
-gen_objset_dec(Erules,ObjSetName,UniqueName,[{ObjName,Val,Fields}],_ClName,
-	       ClFields,NthObj) ->
-    emit({"'getdec_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},") ->",nl}),
-    case ObjName of
-	no_name ->
-	    gen_inlined_dec_funs(Erules,Fields,ClFields,ObjSetName,
-				 NthObj);
-	_Other ->
-	    emit({"    fun 'dec_",ObjName,"'/4"})
-    end,
-    emit({".",nl,nl});
-gen_objset_dec(_,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,_ClFields,
-	      _NthObj) ->
-    emit({"'getdec_",ObjSetName,"'(_, _) ->",nl}),
-    emit({indent(3),"fun(_, Bytes, _, _) ->",nl}),
-    emit({indent(6),"Len = case Bytes of",nl,indent(9),
- 	  "Bin when binary(Bin) -> size(Bin);",nl,indent(9),
- 	  "_ -> length(Bytes)",nl,indent(6),"end,"}),
-    emit({indent(6),"{Bytes,[],Len}",nl}),
-    emit({indent(3),"end.",nl,nl}),
-    ok;
-gen_objset_dec(_,_,_,[],_,_,_) ->
-    ok.
-
-gen_inlined_dec_funs(Erules,Fields,[{typefield,Name,Prop}|Rest],
-		     ObjSetName,NthObj) ->
-    DecProp = case Prop of
-		  'OPTIONAL' -> opt_or_default;
-		  {'DEFAULT',_} -> opt_or_default;
-		  _ -> mandatory
-	      end,
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when record(Type,type) ->
-	    emit({indent(3),"fun(Type, Bytes, TagIn, _RestPrimFieldName) ->",
-		  nl,indent(6),"case Type of",nl}),
-	    N=emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName),
-	    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj+N);
-	{value,{_,Type}} when record(Type,typedef) ->
-	    emit({indent(3),"fun(Type, Bytes, TagIn, _RestPrimFieldName) ->",
-		  nl,indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    N=emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName),
-	    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj+N);
-	false ->
-	    gen_inlined_dec_funs(Erules,Fields,Rest,ObjSetName,NthObj)
-    end;
-gen_inlined_dec_funs(Erules,Fields,[_H|Rest],ObjSetName,NthObj) ->
-    gen_inlined_dec_funs(Erules,Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs(_,_,[],_,NthObj) ->
-    NthObj.
-
-gen_inlined_dec_funs1(Erules,Fields,[{typefield,Name,Prop}|Rest],
-		      ObjSetName,NthObj) ->
-    DecProp = case Prop of
-		  'OPTIONAL' -> opt_or_default;
-		  {'DEFAULT',_} -> opt_or_default;
-		  _ -> mandatory
-	      end,
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    N=
-	case lists:keysearch(Name,1,Fields) of
-	    {value,{_,Type}} when record(Type,type) ->
-		emit({";",nl}),
-		emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName);
-	    {value,{_,Type}} when record(Type,typedef) ->
-		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-		emit_inner_of_decfun(Erules,Type,DecProp,InternalDefFunName);
-	false ->
-		0
-	end,
-    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj+N);
-gen_inlined_dec_funs1(Erules,Fields,[_H|Rest],ObjSetName,NthObj)->
-    gen_inlined_dec_funs1(Erules,Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs1(_,_,[],_,NthObj) ->
-    emit({nl,indent(6),"end",nl}),
-    emit({indent(3),"end"}),
-    NthObj.
-
-emit_inner_of_decfun(Erules,#typedef{name={ExtName,Name},typespec=Type},
-		     Prop,InternalDefFunName) ->
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case {ExtName,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_dec_prim(Erules,Type,"Bytes",Tag,"TagIn",no_length,
-			 ?PRIMITIVE,Prop),
-	    0;
-	{constructed,bif} ->
-	    emit({indent(12),"'dec_",
-		  asn1ct_gen:list2name(InternalDefFunName),"'(Bytes, ",Prop,
-		  ", TagIn ++ ",{asis,Tag},")"}),
-	    1;
-	_ ->
-	    emit({indent(12),"'",ExtName,"':'dec_",Name,"'(Bytes, ",Prop,
-		  ", TagIn ++ ",{asis,Tag},")"}),
-	    0
-    end;
-emit_inner_of_decfun(_,#typedef{name=Name,typespec=Type},Prop,_) ->
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    emit({indent(12),"'dec_",Name,"'(Bytes, ",Prop,", TagIn ++ ",
-	  {asis,Tag},")"}),
-    0;
-emit_inner_of_decfun(Erules,Type,Prop,_) when record(Type,type) ->
-    OTag = Type#type.tag,
-    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    CurrMod = get(currmod),
-    Def = Type#type.def,
-    InnerType = asn1ct_gen:get_inner(Def),
-    WhatKind = asn1ct_gen:type(InnerType),
-    case WhatKind of
-	{primitive,bif} -> 
-	    emit({indent(9),Def," ->",nl,indent(12)}),
-	    gen_dec_prim(Erules,Type,"Bytes",Tag,"TagIn",no_length,
-			 ?PRIMITIVE,Prop);
-%	TRef when record(TRef,typereference) ->
-%	    T = TRef#typereference.val,
-%	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,
-		  "'(Bytes, ",Prop,", TagIn ++ ",{asis,Tag},")"});
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'dec_",
-		  T,"'(Bytes, ",Prop,", TagIn ++ ",{asis,Tag},")"})
-    end,
-    0.
-
-
-gen_internal_funcs(_,[]) ->
-    ok;
-gen_internal_funcs(Erules,[TypeDef|Rest]) ->
-    gen_encode_user(Erules,TypeDef),
-    emit({"'dec_",TypeDef#typedef.name,"'(Bytes, ",
-	  unused_optormand_var("OptOrMand",(TypeDef#typedef.typespec)#type.def),", TagIn) ->",nl}),
-    gen_decode_user(Erules,TypeDef),
-    gen_internal_funcs(Erules,Rest).
-
-
-dbdec(Type) ->
-    demit({"io:format(\"decoding: ",{asis,Type},"~w~n\",[Bytes]),",nl}).
-
-
-decode_class('UNIVERSAL') ->
-    ?UNIVERSAL;
-decode_class('APPLICATION') ->
-    ?APPLICATION;
-decode_class('CONTEXT') ->
-    ?CONTEXT;
-decode_class('PRIVATE') ->
-    ?PRIVATE.
-
-decode_type('BOOLEAN') -> 1;
-decode_type('INTEGER') -> 2;
-decode_type('BIT STRING') -> 3; 
-decode_type('OCTET STRING') -> 4; 
-decode_type('NULL') -> 5;
-decode_type('OBJECT IDENTIFIER') -> 6;
-decode_type('OBJECT DESCRIPTOR') -> 7;
-decode_type('EXTERNAL') -> 8;
-decode_type('REAL') -> 9;
-decode_type('ENUMERATED') -> 10;
-decode_type('EMBEDDED_PDV') -> 11;
-decode_type('SEQUENCE') -> 16;
-decode_type('SEQUENCE OF') -> 16;
-decode_type('SET') -> 17;
-decode_type('SET OF') -> 17;
-decode_type('NumericString') -> 18;  
-decode_type('PrintableString') -> 19;  
-decode_type('TeletexString') -> 20;  
-decode_type('VideotexString') -> 21;  
-decode_type('IA5String') -> 22;  
-decode_type('UTCTime') -> 23;  
-decode_type('GeneralizedTime') -> 24;  
-decode_type('GraphicString') -> 25;  
-decode_type('VisibleString') -> 26;  
-decode_type('GeneralString') -> 27;  
-decode_type('UniversalString') -> 28;  
-decode_type('BMPString') -> 30;
-decode_type('CHOICE') -> 'CHOICE'; % choice gets the tag from the actual alternative  
-decode_type(Else) -> exit({error,{asn1,{unrecognized_type,Else}}}).
-
-add_removed_bytes() ->
-    asn1ct_name:delete(rb),
-    add_removed_bytes(asn1ct_name:all(rb)).
-
-add_removed_bytes([H,T1|T]) ->
-    emit({{var,H},"+"}),
-    add_removed_bytes([T1|T]);
-add_removed_bytes([H|T]) ->
-    emit({{var,H}}),
-    add_removed_bytes(T);
-add_removed_bytes([]) ->
-    true.
-
-mkfuncname(WhatKind,DecOrEnc) ->
-    case WhatKind of
-	#'Externaltypereference'{module=Mod,type=EType} ->
-	    CurrMod = get(currmod),
-	    case CurrMod of
-		Mod ->
-		    lists:concat(["'",DecOrEnc,"_",EType,"'"]);
-		_ ->
-% 		    io:format("CurrMod: ~p, Mod: ~p~n",[CurrMod,Mod]),
-		    lists:concat(["'",Mod,"':'",DecOrEnc,"_",EType,"'"])
-	    end;
-	#'typereference'{val=EType} ->
-	    lists:concat(["'",DecOrEnc,"_",EType,"'"]);
-	'ASN1_OPEN_TYPE' ->
-	    lists:concat(["'",DecOrEnc,"_",WhatKind,"'"])
-	    
-    end.
-
-optionals(L) -> optionals(L,[],1).
-
-optionals([{'EXTENSIONMARK',_,_}|Rest],Acc,Pos) ->
-    optionals(Rest,Acc,Pos); % optionals in extension are currently not handled
-optionals([#'ComponentType'{name=Name,prop='OPTIONAL'}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{name=Name,prop={'DEFAULT',_}}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{}|Rest],Acc,Pos) ->
-		 optionals(Rest,Acc,Pos+1);
-optionals([],Acc,_) ->
-    lists:reverse(Acc).
-
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	     no;
-	{value,{_,V}} -> 
-	    V
-    end.
-
-%% if the original option was ber and it has been wrapped to ber_bin
-%% turn it back to ber
-re_wrap_erule(ber_bin) ->
-    case get(encoding_options) of
-	Options when list(Options) ->
-	    case lists:member(ber,Options) of
-		true -> ber;
-		_ -> ber_bin
-	    end;
-	_ -> ber_bin
-    end;
-re_wrap_erule(Erule) ->
-    Erule.
-
-is_already_generated(Operation,Name) ->
-    case get(class_default_type) of
-	undefined ->
-	    put(class_default_type,[{Operation,Name}]),
-	    false;
-	GeneratedList ->
-	    case lists:member({Operation,Name},GeneratedList) of
-		true ->
-		    true;
-		false ->
-		    put(class_default_type,[{Operation,Name}|GeneratedList]),
-		    false
-	    end
-    end.
-
-get_class_fields(#classdef{typespec=ObjClass}) ->
-    ObjClass#objectclass.fields;
-get_class_fields(#objectclass{fields=Fields}) ->
-    Fields;
-get_class_fields(_) ->
-    [].
-
-get_object_field(Name,ObjectFields) ->
-    case lists:keysearch(Name,1,ObjectFields) of
-	{value,Field} -> Field;
-	false -> false
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_ber_bin_v2.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_ber_bin_v2.erl
deleted file mode 100644
index be8ae6f8a5..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_ber_bin_v2.erl
+++ /dev/null
@@ -1,1568 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_gen_ber_bin_v2.erl,v 1.1 2008/12/17 09:53:29 mikpe Exp $
-%%
--module(asn1ct_gen_ber_bin_v2).
-
-%% Generate erlang module which handles (PER) encode and decode for
-%% all types in an ASN.1 module
-
--include("asn1_records.hrl").
-
--export([pgen/4]).
--export([decode_class/1, decode_type/1]).
--export([add_removed_bytes/0]).
--export([gen_encode/2,gen_encode/3,gen_decode/2,gen_decode/3]).
--export([gen_encode_prim/4]).
--export([gen_dec_prim/7]).
--export([gen_objectset_code/2, gen_obj_code/3]).
--export([encode_tag_val/3]).
--export([gen_inc_decode/2]).
-
--import(asn1ct_gen, [emit/1,demit/1]).
-
-						% the encoding of class of tag bits 8 and 7
--define(UNIVERSAL,   0).
--define(APPLICATION, 16#40).
--define(CONTEXT,     16#80).
--define(PRIVATE,     16#C0).
-
-						% primitive or constructed encoding % bit 6
--define(PRIMITIVE,   0).
--define(CONSTRUCTED, 2#00100000).
-
-
--define(T_ObjectDescriptor, ?UNIVERSAL bor ?PRIMITIVE bor 7).
-						% restricted character string types
--define(T_NumericString,    ?UNIVERSAL bor ?PRIMITIVE bor 18). %can be constructed
--define(T_PrintableString,  ?UNIVERSAL bor ?PRIMITIVE bor 19). %can be constructed
--define(T_TeletexString,    ?UNIVERSAL bor ?PRIMITIVE bor 20). %can be constructed
--define(T_VideotexString,   ?UNIVERSAL bor ?PRIMITIVE bor 21). %can be constructed
--define(T_IA5String,        ?UNIVERSAL bor ?PRIMITIVE bor 22). %can be constructed
--define(T_GraphicString,    ?UNIVERSAL bor ?PRIMITIVE bor 25). %can be constructed
--define(T_VisibleString,    ?UNIVERSAL bor ?PRIMITIVE bor 26). %can be constructed
--define(T_GeneralString,    ?UNIVERSAL bor ?PRIMITIVE bor 27). %can be constructed
-
-%% pgen(Erules, Module, TypeOrVal)
-%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
-%% .hrl file is only generated if necessary
-%% Erules = per | ber
-%% Module = atom()
-%% TypeOrVal = {TypeList,ValueList,PTypeList}
-%% TypeList = ValueList = [atom()]
-
-pgen(OutFile,Erules,Module,TypeOrVal) ->
-    asn1ct_gen:pgen_module(OutFile,Erules,Module,TypeOrVal,true).
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Generate ENCODING
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% encode #{typedef, {pos, name, typespec}}
-%%===============================================================================
-
-gen_encode(Erules,Type) when record(Type,typedef) ->
-    gen_encode_user(Erules,Type).
-
-%%===============================================================================
-%% encode #{type, {tag, def, constraint}}
-%%===============================================================================
-
-gen_encode(Erules,Typename,Type) when record(Type,type) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    ObjFun =
-	case lists:keysearch(objfun,1,Type#type.tablecinf) of
-	    {value,{_,_Name}} ->
-		", ObjFun";
-	    false ->
-		""
-	end,
-
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    emit([nl,nl,nl,"%%================================"]),
-	    emit([nl,"%%  ",asn1ct_gen:list2name(Typename)]),
-	    emit([nl,"%%================================",nl]),
-	    case length(Typename) of
-		1 -> % top level type
-		    emit(["'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val",ObjFun,") ->",nl]),
-		    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val, ", {asis,lists:reverse(Type#type.tag)},ObjFun,").",nl,nl]);
-		_ -> % embedded type with constructed name
-		    true
-	    end,
-	    case lists:member(InnerType,['SET','SEQUENCE']) of
-		true -> 
-		    case get(asn_keyed_list) of
-			true ->
-			    CompList = 
-				case Type#type.def of
-				    #'SEQUENCE'{components=Cl} -> Cl;
-				    #'SET'{components=Cl} -> Cl
-				end,
-			    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-				  "'(Val, TagIn",ObjFun,
-				  ") when list(Val) ->",nl]),
-			    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-				  "'(?RT_BER:fixoptionals(",
-				  {asis,optionals(CompList)},
-				  ",Val), TagIn",ObjFun,");",nl,nl]);
-			_ -> true
-		    end;
-		_ ->
-		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'({'",asn1ct_gen:list2name(Typename),
-			  "',Val}, TagIn",ObjFun,") ->",nl]),
-		    emit(["   'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val, TagIn",ObjFun,");",nl,nl])
-	    end,
-	    emit(["'enc_",asn1ct_gen:list2name(Typename),
-		  "'(Val, TagIn",ObjFun,") ->",nl,"   "]),
-	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
-	_ ->
-	    true
-    end;
-
-%%===============================================================================
-%% encode ComponentType
-%%===============================================================================
-
-gen_encode(Erules,Tname,{'ComponentType',_Pos,Cname,Type,_Prop,_Tags}) ->
-    NewTname = [Cname|Tname],
-    %% The tag is set to [] to avoid that it is
-    %% taken into account twice, both as a component/alternative (passed as
-    %% argument to the encode decode function and within the encode decode
-    %% function it self.
-    NewType = Type#type{tag=[]},
-    gen_encode(Erules,NewTname,NewType).
-
-gen_encode_user(Erules,D) when record(D,typedef) ->
-    Typename = [D#typedef.name],
-    Type = D#typedef.typespec,
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    OTag = Type#type.tag,
-    Tag = [encode_tag_val(decode_class(X#tag.class),X#tag.form,X#tag.number)|| X <- OTag],
-    emit([nl,nl,"%%================================"]),
-    emit([nl,"%%  ",Typename]),
-    emit([nl,"%%================================",nl]),
-    emit(["'enc_",asn1ct_gen:list2name(Typename),
-	  "'(Val",") ->",nl]),
-    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-	  "'(Val, ", {asis,lists:reverse(Tag)},").",nl,nl]),
-
-    case lists:member(InnerType,['SET','SEQUENCE']) of
-	true -> 
-	    case get(asn_keyed_list) of
-		true ->
-		    CompList = 
-			case Type#type.def of
-			    #'SEQUENCE'{components=Cl} -> Cl;
-			    #'SET'{components=Cl} -> Cl
-			end,
-
-		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val, TagIn) when list(Val) ->",nl]),
-		    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-			  "'(?RT_BER:fixoptionals(",
-			  {asis,optionals(CompList)},
-			  ",Val), TagIn);",nl,nl]);
-		_ -> true
-	    end;
-	_ ->
-	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
-		  "'({'",asn1ct_gen:list2name(Typename),"',Val}, TagIn) ->",nl}),
-	    emit({"   'enc_",asn1ct_gen:list2name(Typename),"'(Val, TagIn);",nl,nl})
-    end,
-    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val, TagIn) ->",nl}),
-    CurrentMod = get(currmod),
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,D);
-	{primitive,bif} ->
-	    gen_encode_prim(ber,Type,"TagIn","Val"),
-	    emit([".",nl]);
-	#typereference{val=Ename} ->
-	    emit(["   'enc_",Ename,"'(Val, TagIn).",nl]);
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'enc_",Etype,"'(Val, TagIn).",nl]);
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'enc_",Etype,"'(Val, TagIn).",nl]);
-	'ASN1_OPEN_TYPE' ->
-	    emit(["%% OPEN TYPE",nl]),
-	    gen_encode_prim(ber,
-			    Type#type{def='ASN1_OPEN_TYPE'},
-			    "TagIn","Val"),
-	    emit([".",nl])
-    end.
-
-gen_encode_prim(_Erules,D,DoTag,Value) when record(D,type) ->
-    
-%%% Constraint is currently not used for BER (except for BitString) and therefore replaced
-%%% with [] as a placeholder
-    BitStringConstraint = D#type.constraint,
-    Constraint = [],
-    asn1ct_name:new(enumval),
-    case D#type.def of
-	'BOOLEAN' ->
-	    emit_encode_func('boolean',Value,DoTag);
-	'INTEGER' ->
-	    emit_encode_func('integer',Constraint,Value,DoTag);
-	{'INTEGER',NamedNumberList} ->
-	    emit_encode_func('integer',Constraint,Value,
-			     NamedNumberList,DoTag);
-	{'ENUMERATED',NamedNumberList={_,_}} ->
-	    
-	    emit(["case (case ",Value," of {asn1_enum,_}->",Value,";{_,_}->element(2,",Value,");_->",
-		  Value," end) of",nl]),
-	    emit_enc_enumerated_cases(NamedNumberList,DoTag);
-	{'ENUMERATED',NamedNumberList} ->
-	    
-	    emit(["case (case ",Value," of {_,_}->element(2,",Value,");_->",
-		  Value," end) of",nl]),
-	    emit_enc_enumerated_cases(NamedNumberList,DoTag);
-
-	{'BIT STRING',NamedNumberList} ->
-	    emit_encode_func('bit_string',BitStringConstraint,Value,
-			     NamedNumberList,DoTag);
-	'ANY' ->
-	    emit_encode_func('open_type', Value,DoTag);
-	'NULL' ->
-	    emit_encode_func('null',Value,DoTag);
-	'OBJECT IDENTIFIER' ->
-	    emit_encode_func("object_identifier",Value,DoTag);
-	'ObjectDescriptor' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_ObjectDescriptor,DoTag);
-	'OCTET STRING' ->
-	    emit_encode_func('octet_string',Constraint,Value,DoTag);
-	'NumericString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_NumericString,DoTag);
-	'TeletexString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_TeletexString,DoTag);
-	'VideotexString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_VideotexString,DoTag);
-	'GraphicString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_GraphicString,DoTag);
-	'VisibleString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_VisibleString,DoTag);
-	'GeneralString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_GeneralString,DoTag);
-	'PrintableString' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_PrintableString,DoTag);
-	'IA5String' ->
-	    emit_encode_func('restricted_string',Constraint,Value,
-			     ?T_IA5String,DoTag);
-	'UniversalString' ->
-	    emit_encode_func('universal_string',Constraint,Value,DoTag);
-	'BMPString' ->
-	    emit_encode_func('BMP_string',Constraint,Value,DoTag);
-	'UTCTime' ->
-	    emit_encode_func('utc_time',Constraint,Value,DoTag);
-	'GeneralizedTime' ->
-	    emit_encode_func('generalized_time',Constraint,Value,DoTag);
-	'ASN1_OPEN_TYPE' ->
-	    emit_encode_func('open_type', Value,DoTag);
-	XX ->
-	    exit({'can not encode' ,XX})
-    end.
-
-
-emit_encode_func(Name,Value,Tags) when atom(Name) ->
-    emit_encode_func(atom_to_list(Name),Value,Tags);
-emit_encode_func(Name,Value,Tags) ->
-    Fname = "?RT_BER:encode_" ++ Name,
-    emit([Fname,"(",Value,", ",Tags,")"]).
-
-emit_encode_func(Name,Constraint,Value,Tags) when atom(Name) ->
-    emit_encode_func(atom_to_list(Name),Constraint,Value,Tags);
-emit_encode_func(Name,Constraint,Value,Tags) ->
-    Fname = "?RT_BER:encode_" ++ Name,
-    emit([Fname,"(",{asis,Constraint},", ",Value,", ",Tags,")"]).
-
-emit_encode_func(Name,Constraint,Value,Asis,Tags) when atom(Name) ->
-    emit_encode_func(atom_to_list(Name),Constraint,Value,Asis,Tags);
-emit_encode_func(Name,Constraint,Value,Asis,Tags) ->
-    Fname = "?RT_BER:encode_" ++ Name,
-    emit([Fname,"(",{asis,Constraint},", ",Value,
-	  ", ",{asis,Asis},
-	  ", ",Tags,")"]).
-    
-emit_enc_enumerated_cases({L1,L2}, Tags) ->
-    emit_enc_enumerated_cases(L1++L2, Tags, ext);
-emit_enc_enumerated_cases(L, Tags) ->
-    emit_enc_enumerated_cases(L, Tags, noext).
-
-emit_enc_enumerated_cases([{EnumName,EnumVal},H2|T], Tags, Ext) ->
-    emit([{asis,EnumName}," -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,");",nl]),
-%%    emit(["'",{asis,EnumName},"' -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,");",nl]),
-    emit_enc_enumerated_cases([H2|T], Tags, Ext);
-emit_enc_enumerated_cases([{EnumName,EnumVal}], Tags, Ext) ->
-    emit([{asis,EnumName}," -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,")"]),
-%%    emit(["'",{asis,EnumName},"' -> ?RT_BER:encode_enumerated(",EnumVal,",",Tags,")"]),
-    case Ext of
-	noext -> emit([";",nl]);
-	ext -> 
-	    emit([";",nl,"{asn1_enum,",{curr,enumval},"} -> ",
-		     "?RT_BER:encode_enumerated(",{curr,enumval},",",Tags,");",nl]),
-	    asn1ct_name:new(enumval)
-    end,
-    emit([{curr,enumval}," -> exit({error,{asn1, {enumerated_not_in_range,",{curr, enumval},"}}})"]),
-    emit([nl,"end"]).
-
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Generate DECODING
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% decode #{typedef, {pos, name, typespec}}
-%%===============================================================================
-
-gen_decode(Erules,Type) when record(Type,typedef) ->
-    Def = Type#typedef.typespec,
-    InnerTag = Def#type.tag ,
-
-    Tag = [(decode_class(X#tag.class) bsl 10) + X#tag.number || X <- InnerTag],
-
-    Prefix =
-	case {asn1ct:get_gen_state_field(active),
-	      asn1ct:get_gen_state_field(prefix)} of
-	    {true,Pref} -> Pref;
-	    _ -> "dec_"
-	end,
-    emit({nl,nl}),
-    emit(["'",Prefix,Type#typedef.name,"'(Tlv) ->",nl]),
-    emit(["   '",Prefix,Type#typedef.name,"'(Tlv, ",{asis,Tag},").",nl,nl]),
-    emit(["'",Prefix,Type#typedef.name,"'(Tlv, TagIn) ->",nl]),
-    dbdec(Type#typedef.name),
-    gen_decode_user(Erules,Type).
-
-gen_inc_decode(Erules,Type) when record(Type,typedef) ->
-    Prefix = asn1ct:get_gen_state_field(prefix),
-    emit({nl,nl}),
-    emit(["'",Prefix,Type#typedef.name,"'(Tlv, TagIn) ->",nl]),
-    gen_decode_user(Erules,Type).
-
-%%===============================================================================
-%% decode #{type, {tag, def, constraint}}
-%%===============================================================================
-
-%% This gen_decode is called by the gen_decode/3 that decodes
-%% ComponentType and the type of a SEQUENCE OF/SET OF.
-gen_decode(Erules,Tname,Type) when record(Type,type) ->
-    Typename = Tname,
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    Prefix =
-	case asn1ct:get_gen_state_field(active) of
-	    true -> "'dec-inc-";
-	    _ -> "'dec_"
-	end,
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    ObjFun =
-		case Type#type.tablecinf of
-		    [{objfun,_}|_R] ->
-			", ObjFun";
-		    _ ->
-			""
-		end,
-	    emit([Prefix,asn1ct_gen:list2name(Typename),"'(Tlv, TagIn",ObjFun,") ->",nl]),
-	    dbdec(Typename),
-	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
-	Rec when record(Rec,'Externaltypereference') ->
-	    case {Typename,asn1ct:get_gen_state_field(namelist)} of
-		{[Cname|_],[{Cname,_}|_]} -> %% 
-		    %% This referenced type must only be generated
-		    %% once as incomplete partial decode. Therefore we
-		    %% have to check whether this function already is
-		    %% generated.
-		    case asn1ct:is_function_generated(Typename) of
-			true ->
-			    ok;
-			_ ->
-			    asn1ct:generated_refed_func(Typename),
-			    #'Externaltypereference'{module=M,type=Name}=Rec,
-			    TypeDef = asn1_db:dbget(M,Name),
-			    gen_decode(Erules,TypeDef)
-		    end;
-		_ ->
-		    true
-	    end;
-	_ ->
-	    true
-    end;
-
-
-%%===============================================================================
-%% decode ComponentType
-%%===============================================================================
-
-gen_decode(Erules,Tname,{'ComponentType',_Pos,Cname,Type,_Prop,_Tags}) ->
-    NewTname = [Cname|Tname],
-    %% The tag is set to [] to avoid that it is
-    %% taken into account twice, both as a component/alternative (passed as
-    %% argument to the encode decode function and within the encode decode
-    %% function it self.
-    NewType = Type#type{tag=[]},
-    case {asn1ct:get_gen_state_field(active),
-	  asn1ct:get_tobe_refed_func(NewTname)} of
-	{true,{_,NameList}} ->
-	    asn1ct:update_gen_state(namelist,NameList),
-	    %% remove to gen_refed_funcs list from tobe_refed_funcs later
-	    gen_decode(Erules,NewTname,NewType);
-	{No,_} when No == false; No == undefined ->
-	    gen_decode(Erules,NewTname,NewType);
-	_ ->
-	    ok
-    end.
-
-
-gen_decode_user(Erules,D) when record(D,typedef) ->
-    Typename = [D#typedef.name],
-    Def = D#typedef.typespec,
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    BytesVar = "Tlv",
-    case asn1ct_gen:type(InnerType) of
-	'ASN1_OPEN_TYPE' ->
-	    asn1ct_name:new(len),
-	    gen_dec_prim(ber, Def#type{def='ASN1_OPEN_TYPE'}, 
-			 BytesVar,{string,"TagIn"}, [] , 
-			 ?PRIMITIVE,"OptOrMand"),
-	    emit({".",nl,nl});
-	{primitive,bif} ->
-	    asn1ct_name:new(len),
-	    gen_dec_prim(ber, Def, BytesVar,{string,"TagIn"},[] , 
-			 ?PRIMITIVE,"OptOrMand"),
-	    emit([".",nl,nl]);
-	{constructed,bif} ->
-	    asn1ct:update_namelist(D#typedef.name),
-	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,D);
-	TheType ->
-	    DecFunName = mkfuncname(TheType,dec),
-	    emit([DecFunName,"(",BytesVar,
-		  ", TagIn)"]),
-	    emit([".",nl,nl])
-    end.
-
-
-gen_dec_prim(_Erules,Att,BytesVar,DoTag,_TagIn,_Form,_OptOrMand) ->
-    Typename = Att#type.def,
-%% Currently not used for BER replaced with [] as place holder
-%%    Constraint = Att#type.constraint,
-%% Constraint = [],
-    Constraint = 
-	case get_constraint(Att#type.constraint,'SizeConstraint') of
-	    no -> [];
-	    Tc -> Tc
-	end,
-    ValueRange = 
-	case get_constraint(Att#type.constraint,'ValueRange') of
-	    no -> [];
-	    Tv -> Tv
-	end,
-    SingleValue = 
-	case get_constraint(Att#type.constraint,'SingleValue') of
-	    no -> [];
-	    Sv -> Sv
-	end,
-    AsBin = case get(binary_strings) of
-		true -> "_as_bin";
-		_ -> ""
-	    end,
-    NewTypeName = case Typename of
-		      'ANY' -> 'ASN1_OPEN_TYPE';
-		      _ -> Typename
-		  end,
-%    DoLength = 
-    case NewTypeName of
-	'BOOLEAN'->
-	    emit({"?RT_BER:decode_boolean(",BytesVar,","}),
-	    add_func({decode_boolean,2});
-	'INTEGER' ->
-	    emit({"?RT_BER:decode_integer(",BytesVar,",",
-		  {asis,int_constr(SingleValue,ValueRange)},","}),
-	    add_func({decode_integer,3});
-	{'INTEGER',NamedNumberList} ->
-	    emit({"?RT_BER:decode_integer(",BytesVar,",",
-		  {asis,int_constr(SingleValue,ValueRange)},",",
-		  {asis,NamedNumberList},","}),
-	    add_func({decode_integer,4});
-	{'ENUMERATED',NamedNumberList} ->
-	    emit({"?RT_BER:decode_enumerated(",BytesVar,",",
-		  {asis,Constraint},",",
-		  {asis,NamedNumberList},","}),
-	    add_func({decode_enumerated,4});
-	{'BIT STRING',NamedNumberList} ->
-	    case get(compact_bit_string) of
-		true ->
-		    emit({"?RT_BER:decode_compact_bit_string(",
-			  BytesVar,",",{asis,Constraint},",",
-			  {asis,NamedNumberList},","}),
-		    add_func({decode_compact_bit_string,4});
-		_ ->
-		    emit({"?RT_BER:decode_bit_string(",BytesVar,",",
-			  {asis,Constraint},",",
-			  {asis,NamedNumberList},","}),
-		    add_func({decode_bit_string,4})
-	    end;
-	'NULL' ->
-	    emit({"?RT_BER:decode_null(",BytesVar,","}),
-	    add_func({decode_null,2});
-	'OBJECT IDENTIFIER' ->
-	    emit({"?RT_BER:decode_object_identifier(",BytesVar,","}),
-	    add_func({decode_object_identifier,2});
-	'ObjectDescriptor' ->
-	    emit({"?RT_BER:decode_restricted_string(",
-		  BytesVar,",",{asis,Constraint},",",{asis,?T_ObjectDescriptor},","}),
-	    add_func({decode_restricted_string,4});
-	'OCTET STRING' ->
-	    emit({"?RT_BER:decode_octet_string",AsBin,"(",BytesVar,",",{asis,Constraint},","}),
-	    add_func({decode_octet_string,3});
-	'NumericString' ->
-	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},",",{asis,?T_NumericString},","}),
-	    add_func({decode_restricted_string,4});
-	'TeletexString' ->
-	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},",",{asis,?T_TeletexString},","}),
-	    add_func({decode_restricted_string,4});
-	'VideotexString' ->
-	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},",",{asis,?T_VideotexString},","}),
-	    add_func({decode_restricted_string,4});
-	'GraphicString' ->
-	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},",",{asis,?T_GraphicString},","}),
-	    add_func({decode_restricted_string,4});
-	'VisibleString' ->
-	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},",",{asis,?T_VisibleString},","}),
-	    add_func({decode_restricted_string,4});
-	'GeneralString' ->
-	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},",",{asis,?T_GeneralString},","}),
-	    add_func({decode_restricted_string,4});
-	'PrintableString' ->
-	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},",",{asis,?T_PrintableString},","}),
-	    add_func({decode_restricted_string,4});
-	'IA5String' ->
-	    emit({"?RT_BER:decode_restricted_string",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},",",{asis,?T_IA5String},","}),
-	    add_func({decode_restricted_string,4}) ;
-	'UniversalString' ->
-	    emit({"?RT_BER:decode_universal_string",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},","}),
-	    add_func({decode_universal_string,3});
-	'BMPString' ->
-	    emit({"?RT_BER:decode_BMP_string",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},","}),
-	    add_func({decode_BMP_string,3});
-	'UTCTime' ->
-	    emit({"?RT_BER:decode_utc_time",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},","}),
-	    add_func({decode_utc_time,3});
-	'GeneralizedTime' ->
-	    emit({"?RT_BER:decode_generalized_time",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},","}),
-	    add_func({decode_generalized_time,3});
-	'ASN1_OPEN_TYPE' ->
-	    emit(["?RT_BER:decode_open_type_as_binary(",
-		  BytesVar,","]),
-	    add_func({decode_open_type_as_binary,2});
-	Other ->
-	    exit({'can not decode' ,Other})
-    end,
-
-    case {DoTag,NewTypeName} of
-	{{string,TagStr},'ASN1_OPEN_TYPE'} ->
-	    emit([TagStr,")"]);
-	{_,'ASN1_OPEN_TYPE'} ->
-	    emit([{asis,DoTag},")"]);
-	{{string,TagStr},_} ->
-	    emit([TagStr,")"]);
-	_ when list(DoTag) ->
-	    emit([{asis,DoTag},")"])
-    end.
-
-
-int_constr([],[]) ->
-    [];
-int_constr([],ValueRange) ->
-    ValueRange;
-int_constr(SingleValue,[]) ->
-    SingleValue;
-int_constr(SV,VR) ->
-    [SV,VR].
-    
-%% Object code generating for encoding and decoding
-%% ------------------------------------------------
-
-gen_obj_code(Erules,_Module,Obj) when record(Obj,typedef) ->
-    ObjName = Obj#typedef.name,
-    Def = Obj#typedef.typespec,
-    #'Externaltypereference'{module=M,type=ClName} = Def#'Object'.classname,
-    Class = asn1_db:dbget(M,ClName),
-    {object,_,Fields} = Def#'Object'.def,
-    emit({nl,nl,nl,"%%================================"}),
-    emit({nl,"%%  ",ObjName}),
-    emit({nl,"%%================================",nl}),
-    EncConstructed =
-	gen_encode_objectfields(ClName,get_class_fields(Class),
-				ObjName,Fields,[]),
-    emit(nl),
-    gen_encode_constr_type(Erules,EncConstructed),
-    emit(nl),
-    DecConstructed =
-	gen_decode_objectfields(ClName,get_class_fields(Class),
-				ObjName,Fields,[]),
-    emit(nl),
-    gen_decode_constr_type(Erules,DecConstructed),
-    emit_tlv_format_function();
-gen_obj_code(_Erules,_Module,Obj) when record(Obj,pobjectdef) ->
-    ok.
-
-gen_encode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Arg) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ", ",Arg,", _RestPrimFieldName) ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val, RestPrimFieldName) ->",nl]),
-    MaybeConstr=
-	case {get_object_field(Name,ObjectFields),OptOrMand} of
-	    {false,'MANDATORY'} -> %% this case is illegal
-		exit({error,{asn1,{"missing mandatory field in object",
-				   ObjName}}});
-	    {false,'OPTIONAL'} ->
-		EmitFuncClause("_"),
-		emit(["   {<<>>,0}"]),
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Val"),
-		gen_encode_default_call(ClassName,Name,DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Val"),
-		gen_encode_field_call(ObjName,Name,TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,
-			    MaybeConstr++ConstrAcc);
-gen_encode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Args) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ", ",Args,") ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val,[H|T]) ->",nl]),
-    case {get_object_field(Name,ObjectFields),OptOrMand} of
-	{false,'MANDATORY'} ->
-	    exit({error,{asn1,{"missing mandatory field in object",
-			       ObjName}}});
-	{false,'OPTIONAL'} ->
-	    EmitFuncClause("_,_"),
-	    emit(["  exit({error,{'use of missing field in object', ",Name,
-		  "}})"]);
-	{false,{'DEFAULT',_DefaultObject}} ->
-	    exit({error,{asn1,{"not implemented yet",Name}}});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause(" Val, [H|T]"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
-			  "'(H, Val, T)"});
-		TypeName ->
-		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
-	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
-    
-% gen_encode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
-%     Fields = Class#objectclass.fields,
-%     MaybeConstr=
-% 	case is_typefield(Fields,FieldName) of
-% 	    true ->
-% 		Def = Type#typedef.typespec,
-% 		emit({"'enc_",ObjName,"'(",{asis,FieldName},
-% 		      ", Val, RestPrimFieldName) ->",nl}),
-% 		CAcc=
-% 		case Type#typedef.name of
-% 		    {primitive,bif} -> %%tag should be the primitive tag
-% 			OTag = Def#type.tag,
-% 			Tag = [encode_tag_val(decode_class(X#tag.class),
-% 					      X#tag.form,X#tag.number)||
-% 				  X <- OTag],
-% 			gen_encode_prim(ber,Def,{asis,lists:reverse(Tag)},
-% 					"Val"),
-% 			[];
-% 		    {constructed,bif} ->
-% 			emit({"   'enc_",ObjName,'_',FieldName,
-% 			      "'(Val)"}),
-% 			[Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-% 		    {ExtMod,TypeName} ->
-% 			emit({"   '",ExtMod,"':'enc_",TypeName,
-% 			      "'(Val)"}),
-% 			[];
-% 		    TypeName ->
-% 			emit({"   'enc_",TypeName,"'(Val)"}),
-% 			[]
-% 		end,
-% 		case more_genfields(Fields,Rest) of
-% 		    true ->
-% 			emit({";",nl});
-% 		    false ->
-% 			emit({".",nl})
-% 		end,
-% 		CAcc;
-% 	{false,objectfield} ->
-% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
-% 		  ", Val,[H|T]) ->",nl}),
-% 	    case Type#typedef.name of
-% 		{ExtMod,TypeName} ->
-% 		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
-% 			  "'(H, Val, T)"});
-% 		TypeName ->
-% 		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    [];
-% 	{false,_} -> []
-%     end,
-%     gen_encode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
-gen_encode_objectfields(ClassName,[_C|Cs],O,OF,Acc) ->
-    gen_encode_objectfields(ClassName,Cs,O,OF,Acc);
-gen_encode_objectfields(_,[],_,_,Acc) ->
-    Acc.
-
-% gen_encode_constr_type(Erules,[{Name,Def}|Rest]) ->
-%     emit({Name,"(Val,TagIn) ->",nl}),
-%     InnerType = asn1ct_gen:get_inner(Def#type.def),
-%     asn1ct_gen:gen_encode_constructed(Erules,Name,InnerType,Def),
-%     gen_encode_constr_type(Erules,Rest);
-gen_encode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
-    case is_already_generated(enc,TypeDef#typedef.name) of
-	true -> ok;
-	_ -> gen_encode_user(Erules,TypeDef)
-    end,
-    gen_encode_constr_type(Erules,Rest);
-gen_encode_constr_type(_,[]) ->
-    ok.
-
-gen_encode_field_call(ObjName,FieldName,Type) ->
-    Def = Type#typedef.typespec,
-    OTag = Def#type.tag,
-    Tag = [encode_tag_val(decode_class(X#tag.class),
-			  X#tag.form,X#tag.number)||
-	      X <- OTag],
-    case Type#typedef.name of
-	{primitive,bif} -> %%tag should be the primitive tag
-% 	    OTag = Def#type.tag,
-% 	    Tag = [encode_tag_val(decode_class(X#tag.class),
-% 				  X#tag.form,X#tag.number)||
-% 		      X <- OTag],
-	    gen_encode_prim(ber,Def,{asis,lists:reverse(Tag)},
-			    "Val"),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'enc_",ObjName,'_',FieldName,
-		  "'(Val,",{asis,Tag},")"}),
-	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'enc_",TypeName,
-		  "'(Val,",{asis,Tag},")"}),
-	    [];
-	TypeName ->
-	    emit({"   'enc_",TypeName,"'(Val,",{asis,Tag},")"}),
-	    []
-    end.
-
-gen_encode_default_call(ClassName,FieldName,Type) ->
-    CurrentMod = get(currmod),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    OTag = Type#type.tag,
-    Tag = [encode_tag_val(decode_class(X#tag.class),X#tag.form,X#tag.number)|| X <- OTag],
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-%%	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
-	    emit(["   'enc_",ClassName,'_',FieldName,"'(Bytes)"]),
-	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_encode_prim(ber,Type,{asis,lists:reverse(Tag)},"Val"),
-	    [];
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'enc_",Etype,"'(Val, ",{asis,Tag},")",nl]),
-	    [];
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'enc_",Etype,"'(Val, ",{asis,Tag},")",nl]),
-	    []
-% 	'ASN1_OPEN_TYPE' ->
-% 	    emit(["%% OPEN TYPE",nl]),
-% 	    gen_encode_prim(ber,
-% 			    Type#type{def='ASN1_OPEN_TYPE'},
-% 			    "TagIn","Val"),
-% 	    emit([".",nl])
-    end.
-    
-%%%%%%%%%%%%%%%%
-
-gen_decode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Arg) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},
-		      ", ",Arg,",_) ->",nl])
-	end,
-%     emit(["'dec_",ObjName,"'(",{asis,Name},
-% 	  ", Bytes, RestPrimFieldName) ->",nl]),
-    MaybeConstr=
-	case {get_object_field(Name,ObjectFields),OptOrMand} of
-	    {false,'MANDATORY'} -> %% this case is illegal
-		exit({error,{asn1,{"missing mandatory field in object",
-				   ObjName}}});
-	    {false,'OPTIONAL'} ->
-		EmitFuncClause(" _"),
-		emit(["   asn1_NOVALUE"]),
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Bytes"),
-		emit_tlv_format("Bytes"),
-		gen_decode_default_call(ClassName,Name,"Tlv",DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Bytes"),
-		emit_tlv_format("Bytes"),
-		gen_decode_field_call(ObjName,Name,"Tlv",TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,MaybeConstr++ConstrAcc);
-gen_decode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Args) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},
-		      ", ",Args,") ->",nl])
-	end,
-%     emit(["'dec_",ObjName,"'(",{asis,Name},
-% 	  ", Bytes,[H|T]) ->",nl]),
-%     emit_tlv_format("Bytes"),
-    case {get_object_field(Name,ObjectFields),OptOrMand} of
-	{false,'MANDATORY'} ->
-	    exit({error,{asn1,{"missing mandatory field in object",
-			       ObjName}}});
-	{false,'OPTIONAL'} ->
-	    EmitFuncClause("_,_"),
-	    emit(["  exit({error,{'illegal use of missing field in object', ",Name,
-		  "}})"]);
-	{false,{'DEFAULT',_DefaultObject}} ->
-	    exit({error,{asn1,{"not implemented yet",Name}}});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause("Bytes,[H|T]"),
-%	    emit_tlv_format("Bytes"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
-			  "'(H, Bytes, T)"});
-		TypeName ->
-		    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, T)"})
-	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
-gen_decode_objectfields(CN,[_C|Cs],O,OF,CAcc) ->
-    gen_decode_objectfields(CN,Cs,O,OF,CAcc);
-gen_decode_objectfields(_,[],_,_,CAcc) ->
-    CAcc.
-
-emit_tlv_format(Bytes) ->
-    notice_tlv_format_gen(), % notice for generating of tlv_format/1
-    emit(["  Tlv = tlv_format(",Bytes,"),",nl]).
-
-notice_tlv_format_gen() ->
-    Module = get(currmod),
-%    io:format("Noticed: ~p~n",[Module]),
-    case get(tlv_format) of
-	{done,Module} ->
-	    ok;
-	_ -> % true or undefined
-	    put(tlv_format,true)
-    end.
-
-emit_tlv_format_function() ->
-    Module = get(currmod),
-%    io:format("Tlv formated: ~p",[Module]),
-    case get(tlv_format) of
-	true ->
-%	    io:format(" YES!~n"),
-	    emit_tlv_format_function1(),
-	    put(tlv_format,{done,Module});
-	_ ->
-%	    io:format(" NO!~n"),
-	    ok
-    end.
-emit_tlv_format_function1() ->
-    emit(["tlv_format(Bytes) when binary(Bytes) ->",nl,
-	  "  {Tlv,_}=?RT_BER:decode(Bytes),",nl,
-	  "  Tlv;",nl,
-	  "tlv_format(Bytes) ->",nl,
-	  "  Bytes.",nl]).
-
-
-gen_decode_constr_type(Erules,[{Name,Def}|Rest]) ->
-    emit([Name,"(Tlv, TagIn) ->",nl]),
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    asn1ct_gen:gen_decode_constructed(Erules,Name,InnerType,Def),
-    gen_decode_constr_type(Erules,Rest);
-gen_decode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
-    case is_already_generated(dec,TypeDef#typedef.name) of
-	true -> ok;
-	_ ->
-	    gen_decode(Erules,TypeDef)
-    end,
-    gen_decode_constr_type(Erules,Rest);
-gen_decode_constr_type(_,[]) ->
-    ok.
-
-%%%%%%%%%%%
-gen_decode_field_call(ObjName,FieldName,Bytes,Type) ->
-    Def = Type#typedef.typespec,
-    OTag = Def#type.tag,
-    Tag = [(decode_class(X#tag.class) bsl 10) + X#tag.number || 
-	      X <- OTag],
-    case Type#typedef.name of
-	{primitive,bif} -> %%tag should be the primitive tag
-	    gen_dec_prim(ber,Def,Bytes,Tag,"TagIn",?PRIMITIVE,
-			 opt_or_default),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'dec_",ObjName,'_',FieldName,
-		  "'(",Bytes,",",{asis,Tag},")"}),
-	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'dec_",TypeName,
-		  "'(",Bytes,",",{asis,Tag},")"}),
-	    [];
-	TypeName ->
-	    emit({"   'dec_",TypeName,"'(",Bytes,",",{asis,Tag},")"}),
-	    []
-    end.
-
-gen_decode_default_call(ClassName,FieldName,Bytes,Type) ->
-    CurrentMod = get(currmod),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    OTag = Type#type.tag,
-    Tag = [(decode_class(X#tag.class) bsl 10) + X#tag.number || X <- OTag],
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-	    emit(["   'dec_",ClassName,'_',FieldName,"'(",Bytes,",",
-		  {asis,Tag},")"]),
-	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',
-						      FieldName])),
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_dec_prim(ber,Type,Bytes,Tag,"TagIn",
-			 ?PRIMITIVE,opt_or_default),
-	    [];
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'dec_",Etype,"'(",Bytes, " ,",{asis,Tag},")",nl]),
-	    [];
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'dec_",Etype,"'(",Bytes,", ",
-		  {asis,Tag},")",nl]),
-	    []
-% 	'ASN1_OPEN_TYPE' ->
-% 	    emit(["%% OPEN TYPE",nl]),
-% 	    gen_encode_prim(ber,
-% 			    Type#type{def='ASN1_OPEN_TYPE'},
-% 			    "TagIn","Val"),
-% 	    emit([".",nl])
-    end.
-%%%%%%%%%%%
-
-is_already_generated(Operation,Name) ->
-    case get(class_default_type) of
-	undefined ->
-	    put(class_default_type,[{Operation,Name}]),
-	    false;
-	GeneratedList ->
-	    case lists:member({Operation,Name},GeneratedList) of
-		true ->
-		    true;
-		false ->
-		    put(class_default_type,[{Operation,Name}|GeneratedList]),
-		    false
-	    end
-    end.
-
-more_genfields([]) ->
-    false;
-more_genfields([Field|Fields]) ->
-    case element(1,Field) of
-	typefield ->
-	    true;
-	objectfield ->
-	    true;
-	_ ->
-	    more_genfields(Fields)
-    end.
-
-
-
-
-%% Object Set code generating for encoding and decoding
-%% ----------------------------------------------------
-gen_objectset_code(Erules,ObjSet) ->
-    ObjSetName = ObjSet#typedef.name,
-    Def = ObjSet#typedef.typespec,
-%    {ClassName,ClassDef} = Def#'ObjectSet'.class,
-    #'Externaltypereference'{module=ClassModule,
-			     type=ClassName} = Def#'ObjectSet'.class,
-    ClassDef = asn1_db:dbget(ClassModule,ClassName),
-    UniqueFName = Def#'ObjectSet'.uniquefname,
-    Set = Def#'ObjectSet'.set,
-    emit({nl,nl,nl,"%%================================"}),
-    emit({nl,"%%  ",ObjSetName}),
-    emit({nl,"%%================================",nl}),
-    case ClassName of
-	{_Module,ExtClassName} ->
-	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ExtClassName,ClassDef);
-	_ ->
-	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassDef)
-    end,
-    emit(nl).
-
-gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassDef)->
-    ClassFields = get_class_fields(ClassDef),
-    InternalFuncs=gen_objset_enc(Erules,ObjSetName,UniqueFName,Set,
-				 ClassName,ClassFields,1,[]),
-    gen_objset_dec(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassFields,1),
-    gen_internal_funcs(Erules,InternalFuncs).
-
-%% gen_objset_enc iterates over the objects of the object set
-gen_objset_enc(_,_,{unique,undefined},_,_,_,_,_) ->
-    %% There is no unique field in the class of this object set
-    %% don't bother about the constraint
-    [];
-gen_objset_enc(Erules,ObjSName,UniqueName,
-	       [{ObjName,Val,Fields},T|Rest],ClName,ClFields,
-	       NthObj,Acc)->
-    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
-	  ") ->",nl}),
-    {InternalFunc,NewNthObj}=
-	case ObjName of
-	    no_name ->
-		gen_inlined_enc_funs(Fields,ClFields,ObjSName,NthObj);
-	    _ ->
-		emit({"    fun 'enc_",ObjName,"'/3"}),
-		{[],NthObj}
-	end,
-    emit({";",nl}),
-    gen_objset_enc(Erules,ObjSName,UniqueName,[T|Rest],ClName,ClFields,
-		   NewNthObj,InternalFunc ++ Acc);
-gen_objset_enc(_,ObjSetName,UniqueName,
-	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
-    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl}),
-    {InternalFunc,_} =
-	case ObjName of
-	    no_name ->
-		gen_inlined_enc_funs(Fields,ClFields,ObjSetName,NthObj);
-	    _ ->
-		emit({"    fun 'enc_",ObjName,"'/3"}),
-		{[],NthObj}
-	end,
-    emit({".",nl,nl}),
-    InternalFunc ++ Acc;
-%% See X.681 Annex E for the following case
-gen_objset_enc(_,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
-	       _ClFields,_NthObj,Acc) ->
-    emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
-    emit({indent(3),"fun(_, Val, _RestPrimFieldName) ->",nl}),
-    emit({indent(6),"Len = case Val of",nl,indent(9),
- 	  "Bin when binary(Bin) -> size(Bin);",nl,indent(9),
- 	  "_ -> length(Val)",nl,indent(6),"end,"}),
-    emit({indent(6),"{Val,Len}",nl}),
-    emit({indent(3),"end.",nl,nl}),
-    Acc;
-gen_objset_enc(_,_,_,[],_,_,_,Acc) ->
-    Acc.
-
-%% gen_inlined_enc_funs for each object iterates over all fields of a
-%% class, and for each typefield it checks if the object has that
-%% field and emits the proper code.
-gen_inlined_enc_funs(Fields,[{typefield,Name,_}|Rest],
-		     ObjSetName,NthObj) ->
-    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when record(Type,type) ->
-	    emit({indent(3),"fun(Type, Val, _RestPrimFieldName) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    {Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
-	{value,{_,Type}} when record(Type,typedef) ->
-	    emit({indent(3),"fun(Type, Val, _RestPrimFieldName) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    {Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
-	false ->
-	    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj)
-    end;
-gen_inlined_enc_funs(Fields,[_|Rest],ObjSetName,NthObj) ->
-    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_enc_funs(_,[],_,NthObj) ->
-    {[],NthObj}.
-
-gen_inlined_enc_funs1(Fields,[{typefield,Name,_}|Rest],ObjSetName,
-		      NthObj,Acc) ->
-    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
-    {Acc2,NAdd}=
-	case lists:keysearch(Name,1,Fields) of
-	    {value,{_,Type}} when record(Type,type) ->
-		emit({";",nl}),
-		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-		{Ret++Acc,N};
-	    {value,{_,Type}} when record(Type,typedef) ->
-		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-		{Ret++Acc,N};
-	    false ->
-		{Acc,0}
-	end,
-    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+NAdd,Acc2);
-gen_inlined_enc_funs1(Fields,[_|Rest],ObjSetName,NthObj,Acc)->
-    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj,Acc);
-gen_inlined_enc_funs1(_,[],_,NthObj,Acc) ->
-    emit({nl,indent(6),"end",nl}),
-    emit({indent(3),"end"}),
-    {Acc,NthObj}.
-
-emit_inner_of_fun(TDef=#typedef{name={ExtMod,Name},typespec=Type},
-		  InternalDefFunName) ->
-    OTag = Type#type.tag,
-    Tag = [encode_tag_val(decode_class(X#tag.class),X#tag.form,X#tag.number)|| X <- OTag],
-% remove    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    case {ExtMod,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_encode_prim(ber,Type,[{asis,lists:reverse(Tag)}],"Val"),
-	    {[],0};
-	{constructed,bif} ->
-	    emit([indent(12),"'enc_",
-		  InternalDefFunName,"'(Val)"]),
-	    {[TDef#typedef{name=InternalDefFunName}],1};
-	_ ->
-	    emit({indent(12),"'",ExtMod,"':'enc_",Name,"'(Val)"}),
-	    {[],0}
-    end;
-emit_inner_of_fun(#typedef{name=Name},_) ->
-%    OTag = Type#type.tag,
-% remove    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-%    Tag = [encode_tag_val(decode_class(X#tag.class),X#tag.form,X#tag.number)|| X <- OTag],
-    emit({indent(12),"'enc_",Name,"'(Val)"}),
-    {[],0};
-emit_inner_of_fun(Type,_) when record(Type,type) ->
-    CurrMod = get(currmod),
-%    OTag = Type#type.tag,
-% remove    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-%    Tag = [encode_tag_val(decode_class(X#tag.class),X#tag.form,X#tag.number)|| X <- OTag],
-    case Type#type.def of
-	Def when atom(Def) ->
-	    OTag = Type#type.tag,
-	    Tag = [encode_tag_val(decode_class(X#tag.class),
-				  X#tag.form,X#tag.number)||X <- OTag],
-	    emit([indent(9),Def," ->",nl,indent(12)]),
-	    gen_encode_prim(ber,Type,{asis,lists:reverse(Tag)},"Val");
-	TRef when record(TRef,typereference) ->
-	    T = TRef#typereference.val,
-	    emit([indent(9),T," ->",nl,indent(12),"'enc_",T,
-		  "'(Val)"]);
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit([indent(9),T," ->",nl,indent(12),"'enc_",T,
-		  "'(Val)"]);
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit([indent(9),T," ->",nl,indent(12),ExtMod,":'enc_",
-		  T,"'(Val)"])
-    end,
-    {[],0}.
-
-indent(N) ->
-    lists:duplicate(N,32). % 32 = space
-
-
-gen_objset_dec(_,_,{unique,undefined},_,_,_,_) ->
-    %% There is no unique field in the class of this object set
-    %% don't bother about the constraint
-    ok;
-gen_objset_dec(Erules,ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
-	       ClName,ClFields,NthObj)->
-    emit(["'getdec_",ObjSName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl]),
-    NewNthObj=
-	case ObjName of
-	    no_name ->
-		gen_inlined_dec_funs(Fields,ClFields,ObjSName,NthObj);
-	    _ ->
-		emit(["    fun 'dec_",ObjName,"'/3"]),
-		NthObj
-	end,
-    emit([";",nl]),
-    gen_objset_dec(Erules,ObjSName,UniqueName,[T|Rest],ClName,
-		   ClFields,NewNthObj);
-gen_objset_dec(_,ObjSetName,UniqueName,[{ObjName,Val,Fields}],
-	       _ClName,ClFields,NthObj) ->
-    emit(["'getdec_",ObjSetName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl]),
-    case ObjName of
-	no_name ->
-	    gen_inlined_dec_funs(Fields,ClFields,ObjSetName,NthObj);
-	_ ->
-	    emit(["    fun 'dec_",ObjName,"'/3"])
-    end,
-    emit([".",nl,nl]),
-    ok;
-gen_objset_dec(Erules,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
-	       _ClFields,_NthObj) ->
-    emit(["'getdec_",ObjSetName,"'(_, _) ->",nl]),
-    emit([indent(2),"fun(_,Bytes, _RestPrimFieldName) ->",nl]),
-    case Erules of
-	ber_bin_v2 ->
-	    emit([indent(4),"case Bytes of",nl,
-		  indent(6),"Bin when binary(Bin) -> ",nl,
-		  indent(8),"Bin;",nl,
-		  indent(6),"_ ->",nl,
-		  indent(8),"?RT_BER:encode(Bytes)",nl,
-		  indent(4),"end",nl]);
-	_ ->
-	    emit([indent(6),"Len = case Bytes of",nl,indent(9),
-		  "Bin when binary(Bin) -> size(Bin);",nl,indent(9),
-		  "_ -> length(Bytes)",nl,indent(6),"end,"]),
-	    emit([indent(4),"{Bytes,[],Len}",nl])
-    end,
-    emit([indent(2),"end.",nl,nl]),
-    ok;
-gen_objset_dec(_,_,_,[],_,_,_) ->
-    ok.
-
-gen_inlined_dec_funs(Fields,[{typefield,Name,Prop}|Rest],
-		     ObjSetName,NthObj) ->
-    DecProp = case Prop of
-		  'OPTIONAL' -> opt_or_default;
-		  {'DEFAULT',_} -> opt_or_default;
-		  _ -> mandatory
-	      end,
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when record(Type,type) ->
-	    emit([indent(3),"fun(Type, Bytes, _RestPrimFieldName) ->",
-		  nl,indent(6),"case Type of",nl]),
-	    N=emit_inner_of_decfun(Type,DecProp,InternalDefFunName),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-	{value,{_,Type}} when record(Type,typedef) ->
-	    emit([indent(3),"fun(Type, Bytes, _RestPrimFieldName) ->",
-		  nl,indent(6),"case Type of",nl]),
-	    emit([indent(9),{asis,Name}," ->",nl]),
-	    N=emit_inner_of_decfun(Type,DecProp,InternalDefFunName),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-	false ->
-	    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj)
-    end;
-gen_inlined_dec_funs(Fields,[_H|Rest],ObjSetName,NthObj) ->
-    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs(_,[],_,NthObj) ->
-    NthObj.
-
-gen_inlined_dec_funs1(Fields,[{typefield,Name,Prop}|Rest],
-		      ObjSetName,NthObj) ->
-    DecProp = case Prop of
-		  'OPTIONAL' -> opt_or_default;
-		  {'DEFAULT',_} -> opt_or_default;
-		  _ -> mandatory
-	      end,
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    N=
-	case lists:keysearch(Name,1,Fields) of
-	    {value,{_,Type}} when record(Type,type) ->
-		emit([";",nl]),
-		emit_inner_of_decfun(Type,DecProp,InternalDefFunName);
-	    {value,{_,Type}} when record(Type,typedef) ->
-		emit([";",nl,indent(9),{asis,Name}," ->",nl]),
-		emit_inner_of_decfun(Type,DecProp,InternalDefFunName);
-	    false ->
-		0
-    end,
-    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-gen_inlined_dec_funs1(Fields,[_|Rest],ObjSetName,NthObj)->
-    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs1(_,[],_,NthObj) ->
-    emit([nl,indent(6),"end",nl]),
-    emit([indent(3),"end"]),
-    NthObj.
-
-emit_inner_of_decfun(#typedef{name={ExtName,Name},typespec=Type},Prop,
-		     InternalDefFunName) ->
-    OTag = Type#type.tag,
-%%    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    Tag = [(decode_class(X#tag.class) bsl 10) + X#tag.number || X <- OTag],
-    case {ExtName,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_dec_prim(ber,Type,"Bytes",Tag,"TagIn",
-			 ?PRIMITIVE,Prop),
-	    0;
-	{constructed,bif} ->
-	    emit([indent(12),"'dec_",
-% 		  asn1ct_gen:list2name(InternalDefFunName),"'(Bytes, ",Prop,
-% 		  ", ",{asis,Tag},")"]),
- 		  asn1ct_gen:list2name(InternalDefFunName),"'(Bytes, ",
-		  {asis,Tag},")"]),
-	    1;
-	_ ->
-	    emit([indent(12),"'",ExtName,"':'dec_",Name,"'(Bytes)"]),
-	    0
-    end;
-emit_inner_of_decfun(#typedef{name=Name},_Prop,_) ->
-    emit([indent(12),"'dec_",Name,"'(Bytes)"]),
-    0;
-emit_inner_of_decfun(Type,Prop,_) when record(Type,type) ->
-    OTag = Type#type.tag,
-%%    Tag = [X#tag{class=decode_class(X#tag.class)}|| X <- OTag],
-    Tag = [(decode_class(X#tag.class) bsl 10) + X#tag.number || X <- OTag],
-    CurrMod = get(currmod),
-    Def = Type#type.def,
-    InnerType = asn1ct_gen:get_inner(Def),
-    WhatKind = asn1ct_gen:type(InnerType),
-    case WhatKind of
-	{primitive,bif} -> 
-	    emit([indent(9),Def," ->",nl,indent(12)]),
-	    gen_dec_prim(ber,Type,"Bytes",Tag,"TagIn",
-			 ?PRIMITIVE,Prop);
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit([indent(9),T," ->",nl,indent(12),"'dec_",T,
-%		  "'(Bytes, ",Prop,")"]);
-		  "'(Bytes)"]);
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit([indent(9),T," ->",nl,indent(12),ExtMod,":'dec_",
-%		  T,"'(Bytes, ",Prop,")"])
-		  T,"'(Bytes)"])
-    end,
-    0.
-
-gen_internal_funcs(_,[]) ->
-    ok;
-gen_internal_funcs(Erules,[TypeDef|Rest]) ->
-    gen_encode_user(Erules,TypeDef),
-    emit([nl,nl,"'dec_",TypeDef#typedef.name,
-%	  "'(Tlv, OptOrMand, TagIn) ->",nl]),
-	  "'(Tlv, TagIn) ->",nl]),
-    gen_decode_user(Erules,TypeDef),
-    gen_internal_funcs(Erules,Rest).
-
-
-dbdec(Type) ->
-    demit({"io:format(\"decoding: ",{asis,Type},"~w~n\",[Bytes]),",nl}).
-
-
-decode_class('UNIVERSAL') ->
-    ?UNIVERSAL;
-decode_class('APPLICATION') ->
-    ?APPLICATION;
-decode_class('CONTEXT') ->
-    ?CONTEXT;
-decode_class('PRIVATE') ->
-    ?PRIVATE.
-
-decode_type('BOOLEAN') -> 1;
-decode_type('INTEGER') -> 2;
-decode_type('BIT STRING') -> 3; 
-decode_type('OCTET STRING') -> 4; 
-decode_type('NULL') -> 5;
-decode_type('OBJECT IDENTIFIER') -> 6;
-decode_type('OBJECT DESCRIPTOR') -> 7;
-decode_type('EXTERNAL') -> 8;
-decode_type('REAL') -> 9;
-decode_type('ENUMERATED') -> 10;
-decode_type('EMBEDDED_PDV') -> 11;
-decode_type('SEQUENCE') -> 16;
-decode_type('SEQUENCE OF') -> 16;
-decode_type('SET') -> 17;
-decode_type('SET OF') -> 17;
-decode_type('NumericString') -> 18;  
-decode_type('PrintableString') -> 19;  
-decode_type('TeletexString') -> 20;  
-decode_type('VideotexString') -> 21;  
-decode_type('IA5String') -> 22;  
-decode_type('UTCTime') -> 23;  
-decode_type('GeneralizedTime') -> 24;  
-decode_type('GraphicString') -> 25;  
-decode_type('VisibleString') -> 26;  
-decode_type('GeneralString') -> 27;  
-decode_type('UniversalString') -> 28;  
-decode_type('BMPString') -> 30;
-decode_type('CHOICE') -> 'CHOICE'; % choice gets the tag from the actual alternative  
-decode_type(Else) -> exit({error,{asn1,{unrecognized_type,Else}}}).
-
-add_removed_bytes() ->
-    asn1ct_name:delete(rb),
-    add_removed_bytes(asn1ct_name:all(rb)).
-
-add_removed_bytes([H,T1|T]) ->
-    emit({{var,H},"+"}),
-    add_removed_bytes([T1|T]);
-add_removed_bytes([H|T]) ->
-    emit({{var,H}}),
-    add_removed_bytes(T);
-add_removed_bytes([]) ->
-    true.
-
-mkfuncname(WhatKind,DecOrEnc) ->
-    case WhatKind of
-	#'Externaltypereference'{module=Mod,type=EType} ->
-	    CurrMod = get(currmod),
-	    case CurrMod of
-		Mod ->
-		    lists:concat(["'",DecOrEnc,"_",EType,"'"]);
-		_ ->
-% 		    io:format("CurrMod: ~p, Mod: ~p~n",[CurrMod,Mod]),
-		    lists:concat(["'",Mod,"':'",DecOrEnc,"_",EType,"'"])
-	    end;
-	#'typereference'{val=EType} ->
-	    lists:concat(["'",DecOrEnc,"_",EType,"'"]);
-	'ASN1_OPEN_TYPE' ->
-	    lists:concat(["'",DecOrEnc,"_",WhatKind,"'"])
-	    
-    end.
-
-optionals(L) -> optionals(L,[],1).
-
-optionals([{'EXTENSIONMARK',_,_}|Rest],Acc,Pos) ->
-    optionals(Rest,Acc,Pos); % optionals in extension are currently not handled
-optionals([#'ComponentType'{name=Name,prop='OPTIONAL'}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{name=Name,prop={'DEFAULT',_}}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{}|Rest],Acc,Pos) ->
-		 optionals(Rest,Acc,Pos+1);
-optionals([],Acc,_) ->
-    lists:reverse(Acc).
-
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	     no;
-	{value,{_,V}} -> 
-	    V
-    end.
-
-
-get_class_fields(#classdef{typespec=ObjClass}) ->
-    ObjClass#objectclass.fields;
-get_class_fields(#objectclass{fields=Fields}) ->
-    Fields;
-get_class_fields(_) ->
-    [].
-
-get_object_field(Name,ObjectFields) ->
-    case lists:keysearch(Name,1,ObjectFields) of
-	{value,Field} -> Field;
-	false -> false
-    end.
-
-%%encode_tag(TagClass(?UNI, APP etc), Form (?PRIM etx), TagInteger) ->  
-%%     8bit Int | binary 
-encode_tag_val(Class, Form, TagNo) when (TagNo =< 30) -> 
-    <<(Class bsr 6):2,(Form bsr 5):1,TagNo:5>>;
-
-encode_tag_val(Class, Form, TagNo) -> 
-    {Octets,_Len} = mk_object_val(TagNo),
-    BinOct = list_to_binary(Octets),
-    <<(Class bsr 6):2, (Form bsr 5):1, 31:5,BinOct/binary>>.
-
-%%%%%%%%%%% 
-%% mk_object_val(Value) -> {OctetList, Len} 
-%% returns a Val as a list of octets, the 8 bit is allways set to one except 
-%% for the last octet, where its 0 
-%% 
-
- 
-mk_object_val(Val) when Val =< 127 -> 
-    {[255 band Val], 1}; 
-mk_object_val(Val) -> 
-    mk_object_val(Val bsr 7, [Val band 127], 1).  
-mk_object_val(0, Ack, Len) -> 
-    {Ack, Len}; 
-mk_object_val(Val, Ack, Len) -> 
-    mk_object_val(Val bsr 7, [((Val band 127) bor 128) | Ack], Len + 1). 
-
-add_func(F={_Func,_Arity}) ->
-    ets:insert(asn1_functab,{F}).
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_per.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_per.erl
deleted file mode 100644
index 8cd8d34918..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_per.erl
+++ /dev/null
@@ -1,1190 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_gen_per.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
--module(asn1ct_gen_per).
-
-%% Generate erlang module which handles (PER) encode and decode for
-%% all types in an ASN.1 module
-
--include("asn1_records.hrl").
-%-compile(export_all).
-
--export([pgen/4,gen_dec_prim/3,gen_encode_prim/4]).
--export([gen_obj_code/3,gen_objectset_code/2]).
--export([gen_decode/2, gen_decode/3]).
--export([gen_encode/2, gen_encode/3]).
--export([is_already_generated/2,more_genfields/1,get_class_fields/1,
-	 get_object_field/2]).
-
--import(asn1ct_gen, [emit/1,demit/1]).
-
-%% pgen(Erules, Module, TypeOrVal)
-%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
-%% .hrl file is only generated if necessary
-%% Erules = per | ber
-%% Module = atom()
-%% TypeOrVal = {TypeList,ValueList}
-%% TypeList = ValueList = [atom()]
-
-pgen(OutFile,Erules,Module,TypeOrVal) ->
-    asn1ct_gen:pgen_module(OutFile,Erules,Module,TypeOrVal,true).
-
-
-%% Generate ENCODING ******************************
-%%****************************************x
-
-
-gen_encode(Erules,Type) when record(Type,typedef) ->
-    gen_encode_user(Erules,Type).
-%%    case Type#typedef.typespec of
-%%	Def when record(Def,type) ->	    
-%%	    gen_encode_user(Erules,Type);
-%%	Def when tuple(Def),(element(1,Def) == 'Object') ->
-%%	    gen_encode_object(Erules,Type);
-%%	Other ->
-%%	    exit({error,{asn1,{unknown,Other}}})
-%%    end.
-
-gen_encode(Erules,Typename,#'ComponentType'{name=Cname,typespec=Type}) ->
-    NewTypename = [Cname|Typename],
-    gen_encode(Erules,NewTypename,Type);
-
-gen_encode(Erules,Typename,Type) when record(Type,type) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    ObjFun =
-	case lists:keysearch(objfun,1,Type#type.tablecinf) of
-	    {value,{_,_Name}} ->
-%%		lists:concat([", ObjFun",Name]);
-		", ObjFun";
-	    false ->
-		""
-	end,
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    case InnerType of
-		'SET' ->
-		    true;
-		'SEQUENCE' ->
-		    true;
-		_ ->
-		    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'({'",asn1ct_gen:list2name(Typename),
-			  "',Val}",ObjFun,") ->",nl}),
-		    emit({"'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val",ObjFun,");",nl,nl})
-	    end,
-	    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val",ObjFun,
-		  ") ->",nl}),
-	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
-	_ ->
-	    true
-    end.
-
-
-gen_encode_user(Erules,D) when record(D,typedef) ->
-    CurrMod = get(currmod),
-    Typename = [D#typedef.name],
-    Def = D#typedef.typespec,
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    case InnerType of
-	'SET' -> true;
-	'SEQUENCE' -> true;
-	_ ->
-	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),"'({'",asn1ct_gen:list2name(Typename),"',Val}) ->",nl}),
-	    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val);",nl,nl})
-    end,
-    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val) ->",nl}),
-    case asn1ct_gen:type(InnerType) of
-	{primitive,bif} ->
-	    gen_encode_prim(Erules,Def,"false"),
-	    emit({".",nl});
-	'ASN1_OPEN_TYPE' ->
-	    gen_encode_prim(Erules,Def#type{def='ASN1_OPEN_TYPE'},"false"),
-	    emit({".",nl});
-	{constructed,bif} ->
-	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,D);
-	#'Externaltypereference'{module=CurrMod,type=Etype} ->
-	    emit({"'enc_",Etype,"'(Val).",nl,nl});
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit({"'",Emod,"':'enc_",Etype,"'(Val).",nl,nl});
-	#typereference{val=Ename} ->
-	    emit({"'enc_",Ename,"'(Val).",nl,nl});
-	{notype,_} ->
-	    emit({"'enc_",InnerType,"'(Val).",nl,nl})
-    end.
-
-
-gen_encode_prim(Erules,D,DoTag) ->
-    Value = case asn1ct_name:active(val) of
-		true ->
-		    asn1ct_gen:mk_var(asn1ct_name:curr(val));
-		false ->
-		    "Val"
-	    end,
-    gen_encode_prim(Erules,D,DoTag,Value).
-
-gen_encode_prim(_Erules,D,_DoTag,Value) when record(D,type) ->
-    Constraint = D#type.constraint,
-    case D#type.def of
-	'INTEGER' ->
-	    emit({"?RT_PER:encode_integer(", %fel
-		  {asis,Constraint},",",Value,")"});
-	{'INTEGER',NamedNumberList} ->
-	    emit({"?RT_PER:encode_integer(",
-		  {asis,Constraint},",",Value,",",
-		  {asis,NamedNumberList},")"});
-	{'ENUMERATED',{Nlist1,Nlist2}} ->
-	    NewList = lists:concat([[{0,X}||{X,_} <- Nlist1],['EXT_MARK'],[{1,X}||{X,_} <- Nlist2]]),
-	    NewC = [{'ValueRange',{0,length(Nlist1)-1}}],
-	    emit(["case (case ",Value," of {_,_}->element(2,",Value,");_->",
-		  Value," end) of",nl]),
-	    emit_enc_enumerated_cases(NewC, NewList++[{asn1_enum,length(Nlist1)-1}], 0);
-	{'ENUMERATED',NamedNumberList} ->
-	    NewList = [X||{X,_} <- NamedNumberList],
-	    NewC = [{'ValueRange',{0,length(NewList)-1}}],
-	    emit(["case (case ",Value," of {_,_}->element(2,",Value,");_->",
-		  Value," end) of",nl]),
-	    emit_enc_enumerated_cases(NewC, NewList, 0);
-	{'BIT STRING',NamedNumberList} ->
-	    emit({"?RT_PER:encode_bit_string(",
-		  {asis,Constraint},",",Value,",",
-		  {asis,NamedNumberList},")"});
-	'NULL' ->
-	    emit({"?RT_PER:encode_null(",Value,")"});
-	'OBJECT IDENTIFIER' ->
-	    emit({"?RT_PER:encode_object_identifier(",Value,")"});
-	'ObjectDescriptor' ->
-	    emit({"?RT_PER:encode_ObjectDescriptor(",{asis,Constraint},
-		  ",",Value,")"});
-	'BOOLEAN' ->
-	    emit({"?RT_PER:encode_boolean(",Value,")"});
-	'OCTET STRING' ->
-	    emit({"?RT_PER:encode_octet_string(",{asis,Constraint},",",Value,")"});
-	'NumericString' ->
-	    emit({"?RT_PER:encode_NumericString(",{asis,Constraint},",",Value,")"});
-	'TeletexString' ->
-	    emit({"?RT_PER:encode_TeletexString(",{asis,Constraint},",",Value,")"});
-	'VideotexString' ->
-	    emit({"?RT_PER:encode_VideotexString(",{asis,Constraint},",",Value,")"});
-	'UTCTime' ->
-	    emit({"?RT_PER:encode_VisibleString(",{asis,Constraint},",",Value,")"});
-	'GeneralizedTime' ->
-	    emit({"?RT_PER:encode_VisibleString(",{asis,Constraint},",",Value,")"});
-	'GraphicString' ->
-	    emit({"?RT_PER:encode_GraphicString(",{asis,Constraint},",",Value,")"});
-	'VisibleString' ->
-	    emit({"?RT_PER:encode_VisibleString(",{asis,Constraint},",",Value,")"});
-	'GeneralString' ->
-	    emit({"?RT_PER:encode_GeneralString(",{asis,Constraint},",",Value,")"});
-	'PrintableString' ->
-	    emit({"?RT_PER:encode_PrintableString(",{asis,Constraint},",",Value,")"});
-	'IA5String' ->
-	    emit({"?RT_PER:encode_IA5String(",{asis,Constraint},",",Value,")"});
-	'BMPString' ->
-	    emit({"?RT_PER:encode_BMPString(",{asis,Constraint},",",Value,")"});
-	'UniversalString' ->
-	    emit({"?RT_PER:encode_UniversalString(",{asis,Constraint},",",Value,")"});
-	'ANY' ->
-	    emit(["?RT_PER:encode_open_type(", {asis,Constraint}, ",", 
-		  Value, ")"]);
-	'ASN1_OPEN_TYPE' ->
-	    NewValue = case Constraint of
-			   [#'Externaltypereference'{type=Tname}] ->
-			     io_lib:format(
-			       "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
-			   [#type{def=#'Externaltypereference'{type=Tname}}] ->
-			       io_lib:format(
-				 "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
-			 _ -> Value
-		     end,
-	    emit(["?RT_PER:encode_open_type(", {asis,Constraint}, ",", 
-		  NewValue, ")"]);
-	XX ->
-	    exit({asn1_error,nyi,XX})
-    end.
-
-emit_enc_enumerated_cases(C, [H], Count) ->
-    emit_enc_enumerated_case(C, H, Count),
-    emit([";",nl,"EnumVal -> exit({error,{asn1, {enumerated_not_in_range, EnumVal}}})"]),
-    emit([nl,"end"]);
-emit_enc_enumerated_cases(C, ['EXT_MARK'|T], _Count) ->
-    emit_enc_enumerated_cases(C, T, 0);
-emit_enc_enumerated_cases(C, [H1,H2|T], Count) ->
-    emit_enc_enumerated_case(C, H1, Count),
-    emit([";",nl]),
-    emit_enc_enumerated_cases(C, [H2|T], Count+1).
-    
-
-
-emit_enc_enumerated_case(_C, {asn1_enum,High}, _) ->
-    emit([
-	  "{asn1_enum,EnumV} when integer(EnumV), EnumV > ",High," -> ",
-	  "[{bit,1},?RT_PER:encode_small_number(EnumV)]"]);
-emit_enc_enumerated_case(_C, 'EXT_MARK', _Count) ->
-    true;
-emit_enc_enumerated_case(_C, {1,EnumName}, Count) ->
-    emit(["'",EnumName,"' -> [{bit,1},?RT_PER:encode_small_number(",Count,")]"]);
-emit_enc_enumerated_case(C, {0,EnumName}, Count) ->
-    emit(["'",EnumName,"' -> [{bit,0},?RT_PER:encode_integer(",{asis,C},", ",Count,")]"]);
-emit_enc_enumerated_case(C, EnumName, Count) ->
-    emit(["'",EnumName,"' -> ?RT_PER:encode_integer(",{asis,C},", ",Count,")"]).
-
-
-%% Object code generating for encoding and decoding
-%% ------------------------------------------------
-
-gen_obj_code(Erules,_Module,Obj) when record(Obj,typedef) ->
-    ObjName = Obj#typedef.name,
-    Def = Obj#typedef.typespec,
-    #'Externaltypereference'{module=Mod,type=ClassName} = 
-	Def#'Object'.classname,
-    Class = asn1_db:dbget(Mod,ClassName),
-    {object,_,Fields} = Def#'Object'.def,
-    emit({nl,nl,nl,"%%================================"}),
-    emit({nl,"%%  ",ObjName}),
-    emit({nl,"%%================================",nl}),
-    EncConstructed =
-	gen_encode_objectfields(ClassName,get_class_fields(Class),
-				ObjName,Fields,[]),
-    emit(nl),
-    gen_encode_constr_type(Erules,EncConstructed),
-    emit(nl),
-    DecConstructed =
-	gen_decode_objectfields(ClassName,get_class_fields(Class),
-				ObjName,Fields,[]),
-    emit(nl),
-    gen_decode_constr_type(Erules,DecConstructed),
-    emit(nl);
-gen_obj_code(_,_,Obj) when record(Obj,pobjectdef) ->
-    ok.
-
-
-gen_encode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause = 
-	fun(V) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ",",V,",_RestPrimFieldName) ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val, _RestPrimFieldName) ->",nl]),
-    MaybeConstr =
-	case {get_object_field(Name,ObjectFields),OptOrMand} of
-	    {false,'MANDATORY'} -> %% this case is illegal
-		exit({error,{asn1,{"missing mandatory field in object",
-				   ObjName}}});
-	    {false,'OPTIONAL'} ->
-		EmitFuncClause("_"),
-		emit("   []"),
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Val"),
-		gen_encode_default_call(ClassName,Name,DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Val"),
-		gen_encode_field_call(ObjName,Name,TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,
-			    MaybeConstr++ConstrAcc);
-gen_encode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Attrs) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ",",Attrs,") ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val,[H|T]) ->",nl]),
-    case {get_object_field(Name,ObjectFields),OptOrMand} of
-	{false,'MANDATORY'} ->
-	    exit({error,{asn1,{"missing mandatory field in object",
-			       ObjName}}});
-	{false,'OPTIONAL'} ->
-	    EmitFuncClause("_,_"),
-	    emit(["  exit({error,{'use of missing field in object', ",Name,
-		  "}})"]);
-	{false,{'DEFAULT',_DefaultObject}} ->
-	    exit({error,{asn1,{"not implemented yet",Name}}});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause("Val,[H|T]"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
-			  "'(H, Val, T)"});
-		TypeName ->
-		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
-	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
-gen_encode_objectfields(ClassName,[_C|Cs],O,OF,Acc) ->
-    gen_encode_objectfields(ClassName,Cs,O,OF,Acc);
-gen_encode_objectfields(_,[],_,_,Acc) ->
-    Acc.
-
-
-% gen_encode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
-%     Fields = Class#objectclass.fields,
-
-%     MaybeConstr =
-%     case is_typefield(Fields,FieldName) of
-% 	true ->
-% 	    Def = Type#typedef.typespec,
-% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
-% 		  ", Val, Dummy) ->",nl}),
-
-% 	    CAcc =
-% 	    case Type#typedef.name of
-% 		{primitive,bif} ->
-% 		    gen_encode_prim(per,Def,"false","Val"),
-% 		    [];
-% 		{constructed,bif} ->
-% 		    emit({"   'enc_",ObjName,'_',FieldName,
-% 			  "'(Val)"}),
-% 			[{['enc_',ObjName,'_',FieldName],Def}];
-% 		{ExtMod,TypeName} ->
-% 		    emit({"   '",ExtMod,"':'enc_",TypeName,"'(Val)"}),
-% 		    [];
-% 		TypeName ->
-% 		    emit({"   'enc_",TypeName,"'(Val)"}),
-% 		    []
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    CAcc;
-% 	{false,objectfield} ->
-% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
-% 		  ", Val, [H|T]) ->",nl}),
-% 	    case Type#typedef.name of
-% 		{ExtMod,TypeName} ->
-% 		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
-% 			  "'(H, Val, T)"});
-% 		TypeName ->
-% 		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    [];
-% 	{false,_} -> []
-%     end,
-%     gen_encode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
-% gen_encode_objectfields(C,O,[H|T],Acc) ->
-%     gen_encode_objectfields(C,O,T,Acc);
-% gen_encode_objectfields(_,_,[],Acc) ->
-%     Acc.
-
-% gen_encode_constr_type(Erules,[{Name,Def}|Rest]) ->
-%     emit({Name,"(Val) ->",nl}),
-%     InnerType = asn1ct_gen:get_inner(Def#type.def),
-%     asn1ct_gen:gen_encode_constructed(Erules,Name,InnerType,Def),
-%     gen_encode_constr_type(Erules,Rest);
-gen_encode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
-    case is_already_generated(enc,TypeDef#typedef.name) of
-	true -> ok;
-	_ ->
-	    Name = lists:concat(["enc_",TypeDef#typedef.name]),
-	    emit({Name,"(Val) ->",nl}),
-	    Def = TypeDef#typedef.typespec,
-	    InnerType = asn1ct_gen:get_inner(Def#type.def),
-	    asn1ct_gen:gen_encode_constructed(Erules,Name,InnerType,Def),
-	    gen_encode_constr_type(Erules,Rest)
-    end;
-gen_encode_constr_type(_,[]) ->
-    ok.
-
-gen_encode_field_call(ObjName,FieldName,Type) ->
-    Def = Type#typedef.typespec,
-    case Type#typedef.name of
-	{primitive,bif} -> 
-	    gen_encode_prim(per,Def,"false",
-			    "Val"),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'enc_",ObjName,'_',FieldName,
-		  "'(Val)"}),
-	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'enc_",TypeName,
-		  "'(Val)"}),
-	    [];
-	TypeName ->
-	    emit({"   'enc_",TypeName,"'(Val)"}),
-	    []
-    end.
-
-gen_encode_default_call(ClassName,FieldName,Type) ->
-    CurrentMod = get(currmod),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-%%	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
-	    emit(["   'enc_",ClassName,'_',FieldName,"'(Val)"]),
-	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_encode_prim(per,Type,"false","Val"),
-	    [];
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'enc_",Etype,"'(Val)",nl]),
-	    [];
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'enc_",Etype,"'(Val)",nl]),
-	    []
-    end.
-    
-
-gen_decode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause = 
-	fun(Bytes) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},",",Bytes,
-		      ",_,_RestPrimFieldName) ->",nl])
-	end,
-    MaybeConstr=
-	case {get_object_field(Name,ObjectFields),OptOrMand} of
-	    {false,'MANDATORY'} -> %% this case is illegal
-		exit({error,{asn1,{"missing mandatory field in object",
-				   ObjName}}});
-	    {false,'OPTIONAL'} ->
-		EmitFuncClause("_"),
-		emit(["   asn1_NOVALUE"]),
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Bytes"),
-		gen_decode_default_call(ClassName,Name,"Bytes",DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Bytes"),
-		gen_decode_field_call(ObjName,Name,"Bytes",TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,MaybeConstr++ConstrAcc);
-gen_decode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Attrs) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},
-		      ",",Attrs,") ->",nl])
-	end,
-%     emit(["'dec_",ObjName,"'(",{asis,Name},
-% 	  ", Bytes,_,[H|T]) ->",nl]),
-    case {get_object_field(Name,ObjectFields),OptOrMand} of
-	{false,'MANDATORY'} ->
-	    exit({error,{asn1,{"missing mandatory field in object",
-			       ObjName}}});
-	{false,'OPTIONAL'} ->
-	    EmitFuncClause("_,_,_"),
-	    emit(["  exit({error,{'illegal use of missing field in object', ",Name,
-		  "}})"]);
-	{false,{'DEFAULT',_DefaultObject}} ->
-	    exit({error,{asn1,{"not implemented yet",Name}}});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause("Bytes,_,[H|T]"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
-			  "'(H, Bytes, telltype, T)"});
-		TypeName ->
-		    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, telltype, T)"})
-	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
-gen_decode_objectfields(CN,[_C|Cs],O,OF,CAcc) ->
-    gen_decode_objectfields(CN,Cs,O,OF,CAcc);
-gen_decode_objectfields(_,[],_,_,CAcc) ->
-    CAcc.
-
-
-% gen_decode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
-%     Fields = Class#objectclass.fields,
-
-%     MaybeConstr =
-%     case is_typefield(Fields,FieldName) of
-% 	true ->
-% 	    Def = Type#typedef.typespec,
-% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
-% 		  ", Val, Telltype, RestPrimFieldName) ->",nl}),
-
-% 	    CAcc =
-% 	    case Type#typedef.name of
-% 		{primitive,bif} ->
-% 		    gen_dec_prim(per,Def,"Val"),
-% 		    [];
-% 		{constructed,bif} ->
-% 		    emit({"   'dec_",ObjName,'_',FieldName,
-% 			  "'(Val, Telltype)"}),
-% 		    [{['dec_',ObjName,'_',FieldName],Def}];
-% 		{ExtMod,TypeName} ->
-% 		    emit({"   '",ExtMod,"':'dec_",TypeName,
-% 			  "'(Val, Telltype)"}),
-% 		    [];
-% 		TypeName ->
-% 		    emit({"   'dec_",TypeName,"'(Val, Telltype)"}),
-% 		    []
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    CAcc;
-% 	{false,objectfield} ->
-% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
-% 		  ", Val, Telltype, [H|T]) ->",nl}),
-% 	    case Type#typedef.name of
-% 		{ExtMod,TypeName} ->
-% 		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
-% 			  "'(H, Val, Telltype, T)"});
-% 		TypeName ->
-% 		    emit({indent(3),"'dec_",TypeName,
-% 			  "'(H, Val, Telltype, T)"})
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    [];
-% 	{false,_} ->
-% 	    []
-%     end,
-%     gen_decode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
-% gen_decode_objectfields(C,O,[H|T],CAcc) ->
-%     gen_decode_objectfields(C,O,T,CAcc);
-% gen_decode_objectfields(_,_,[],CAcc) ->
-%     CAcc.
-
-
-gen_decode_field_call(ObjName,FieldName,Bytes,Type) ->
-    Def = Type#typedef.typespec,
-    case Type#typedef.name of
-	{primitive,bif} -> 
-	    gen_dec_prim(per,Def,Bytes),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'dec_",ObjName,'_',FieldName,
-		  "'(",Bytes,",telltype)"}),
-	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'dec_",TypeName,
-		  "'(",Bytes,", telltype)"}),
-	    [];
-	TypeName ->
-	    emit({"   'dec_",TypeName,"'(",Bytes,", telltype)"}),
-	    []
-    end.
-
-gen_decode_default_call(ClassName,FieldName,Bytes,Type) ->
-    CurrentMod = get(currmod),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-	    emit(["   'dec_",ClassName,'_',FieldName,"'(",Bytes,", telltype)"]),
-	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_dec_prim(per,Type,Bytes),
-	    [];
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'dec_",Etype,"'(",Bytes,", telltype)",nl]),
-	    [];
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'dec_",Etype,"'(",Bytes,", telltype)",nl]),
-	    []
-    end.
-
-
-gen_decode_constr_type(Erules,[{Name,Def}|Rest]) ->
-    emit({Name,"(Bytes,_) ->",nl}),
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    asn1ct_gen:gen_decode_constructed(Erules,Name,InnerType,Def),
-    gen_decode_constr_type(Erules,Rest);
-gen_decode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
-    case is_already_generated(dec,TypeDef#typedef.name) of
-	true -> ok;
-	_ ->
-	    gen_decode(Erules,TypeDef)
-    end,
-    gen_decode_constr_type(Erules,Rest);
-gen_decode_constr_type(_,[]) ->
-    ok.
-
-% more_genfields(Fields,[]) ->
-%     false;
-% more_genfields(Fields,[{FieldName,_}|T]) ->
-%     case is_typefield(Fields,FieldName) of
-% 	true -> true;
-% 	{false,objectfield} -> true;
-% 	{false,_} -> more_genfields(Fields,T)
-%     end.
-
-more_genfields([]) ->
-    false;
-more_genfields([Field|Fields]) ->
-    case element(1,Field) of
-	typefield ->
-	    true;
-	objectfield ->
-	    true;
-	_ ->
-	    more_genfields(Fields)
-    end.
-
-% is_typefield(Fields,FieldName) ->
-%     case lists:keysearch(FieldName,2,Fields) of
-% 	{value,Field} ->
-% 	    case element(1,Field) of
-% 		typefield ->
-% 		    true;
-% 		Other ->
-% 		    {false,Other}
-% 	    end;
-% 	_ ->
-% 	    false
-%     end.
-%% Object Set code generating for encoding and decoding
-%% ----------------------------------------------------
-gen_objectset_code(Erules,ObjSet) ->
-    ObjSetName = ObjSet#typedef.name,
-    Def = ObjSet#typedef.typespec,
-%%    {ClassName,ClassDef} = Def#'ObjectSet'.class,
-    #'Externaltypereference'{module=ClassModule,
-			     type=ClassName} = Def#'ObjectSet'.class,
-    ClassDef = asn1_db:dbget(ClassModule,ClassName),
-    UniqueFName = Def#'ObjectSet'.uniquefname,
-    Set = Def#'ObjectSet'.set,
-    emit({nl,nl,nl,"%%================================"}),
-    emit({nl,"%%  ",ObjSetName}),
-    emit({nl,"%%================================",nl}),
-    case ClassName of
-	{_Module,ExtClassName} ->
-	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
-			    ExtClassName,ClassDef);
-	_ ->
-	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
-			    ClassName,ClassDef)
-    end,
-    emit(nl).
-
-gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassDef)->
-    ClassFields = (ClassDef#classdef.typespec)#objectclass.fields,
-    InternalFuncs=
-	gen_objset_enc(ObjSetName,UniqueFName,Set,ClassName,ClassFields,1,[]),
-    gen_objset_dec(ObjSetName,UniqueFName,Set,ClassName,ClassFields,1),
-    gen_internal_funcs(Erules,InternalFuncs).
-
-%% gen_objset_enc iterates over the objects of the object set
-gen_objset_enc(_,{unique,undefined},_,_,_,_,_) ->
-    %% There is no unique field in the class of this object set
-    %% don't bother about the constraint
-    [];
-gen_objset_enc(ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
-	       ClName,ClFields,NthObj,Acc)->
-    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
-	  ") ->",nl}),
-    {InternalFunc,NewNthObj}=
-	case ObjName of
-	    no_name ->
-		gen_inlined_enc_funs(Fields,ClFields,ObjSName,NthObj);
-	    _Other ->
-		emit({"    fun 'enc_",ObjName,"'/3"}),
-		{[],0}
-	end,
-    emit({";",nl}),
-    gen_objset_enc(ObjSName,UniqueName,[T|Rest],ClName,ClFields,
-		   NewNthObj,InternalFunc ++ Acc);
-gen_objset_enc(ObjSetName,UniqueName,
-	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
-
-    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl}),
-    {InternalFunc,_}=
-	case ObjName of
-	    no_name ->
-		gen_inlined_enc_funs(Fields,ClFields,ObjSetName,NthObj);
-	    _Other ->
-		emit({"    fun 'enc_",ObjName,"'/3"}),
-		{[],NthObj}
-	end,
-    emit({".",nl,nl}),
-    InternalFunc++Acc;
-gen_objset_enc(ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
-	       _ClFields,_NthObj,Acc) ->
-    emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
-    emit({indent(3),"fun(_, Val, _) ->",nl}),
-    emit({indent(6),"[{octets,Val}]",nl}),
-    emit({indent(3),"end.",nl,nl}),
-    Acc;
-gen_objset_enc(_,_,[],_,_,_,Acc) ->
-    Acc.
-
-%% gen_inlined_enc_funs for each object iterates over all fields of a
-%% class, and for each typefield it checks if the object has that
-%% field and emits the proper code.
-gen_inlined_enc_funs(Fields,[{typefield,Name,_}|Rest],ObjSetName,NthObj) ->
-    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when record(Type,type) ->
-	    emit({indent(3),"fun(Type, Val, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    {Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
-	{value,{_,Type}} when record(Type,typedef) ->
-	    emit({indent(3),"fun(Type, Val, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    {Ret,N} = emit_inner_of_fun(Type,InternalDefFunName),
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
-	false ->
-	    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj)
-    end;
-gen_inlined_enc_funs(Fields,[_H|Rest],ObjSetName,NthObj) ->
-    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_enc_funs(_,[],_,NthObj) ->
-    {[],NthObj}.
-
-gen_inlined_enc_funs1(Fields,[{typefield,Name,_}|Rest],ObjSetName,
-		     NthObj,Acc) ->
-    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
-    {Acc2,NAdd}=
-	case lists:keysearch(Name,1,Fields) of
-	    {value,{_,Type}} when record(Type,type) ->
-		emit({";",nl}),
-		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-		{Ret++Acc,N};
-	    {value,{_,Type}} when record(Type,typedef) ->
-		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-		{Ret++Acc,N};
-	    false ->
-		{Acc,0}
-	end,
-    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+NAdd,Acc2);
-gen_inlined_enc_funs1(Fields,[_H|Rest],ObjSetName,NthObj,Acc)->
-    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj,Acc);
-gen_inlined_enc_funs1(_,[],_,NthObj,Acc) ->
-    emit({nl,indent(6),"end",nl}),
-    emit({indent(3),"end"}),
-    {Acc,NthObj}.
-
-emit_inner_of_fun(TDef=#typedef{name={ExtMod,Name},typespec=Type},
-		  InternalDefFunName) ->
-    case {ExtMod,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_encode_prim(per,Type,dotag,"Val"),
-	    {[],0};
-	{constructed,bif} ->
-	    emit([indent(12),"'enc_",
-		  InternalDefFunName,"'(Val)"]),
-	    {[TDef#typedef{name=InternalDefFunName}],1};
-	_ ->
-	    emit({indent(12),"'",ExtMod,"':'enc_",Name,"'(Val)"}),
-	    {[],0}
-    end;
-emit_inner_of_fun(#typedef{name=Name},_) ->
-    emit({indent(12),"'enc_",Name,"'(Val)"}),
-    {[],0};
-emit_inner_of_fun(Type,_) when record(Type,type) ->
-    CurrMod = get(currmod),
-    case Type#type.def of
-	Def when atom(Def) ->
-	    emit({indent(9),Def," ->",nl,indent(12)}),
-	    gen_encode_prim(erules,Type,dotag,"Val");
-	TRef when record(TRef,typereference) ->
-	    T = TRef#typereference.val,
-	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,"'(Val)"});
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,"'(Val)"});
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'enc_",
-		  T,"'(Val)"})
-    end,
-    {[],0}.
-
-indent(N) ->
-    lists:duplicate(N,32). % 32 = space
-
-
-gen_objset_dec(_,{unique,undefined},_,_,_,_) ->
-    %% There is no unique field in the class of this object set
-    %% don't bother about the constraint
-    ok;
-gen_objset_dec(ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],ClName,
-	       ClFields,NthObj)->
-
-    emit({"'getdec_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
-	  ") ->",nl}),
-    NewNthObj=
-	case ObjName of
-	    no_name ->
-		gen_inlined_dec_funs(Fields,ClFields,ObjSName,NthObj);
-	    _Other ->
-		emit({"    fun 'dec_",ObjName,"'/4"}),
-		NthObj
-    end,
-    emit({";",nl}),
-    gen_objset_dec(ObjSName,UniqueName,[T|Rest],ClName,ClFields,NewNthObj);
-gen_objset_dec(ObjSetName,UniqueName,[{ObjName,Val,Fields}],_ClName,
-	       ClFields,NthObj) ->
-
-    emit({"'getdec_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},
-	  ") ->",nl}),
-    case ObjName of
-	no_name ->
-	    gen_inlined_dec_funs(Fields,ClFields,ObjSetName,NthObj);
-	_Other ->
-	    emit({"    fun 'dec_",ObjName,"'/4"})
-    end,
-    emit({".",nl,nl}),
-    ok;
-gen_objset_dec(ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,_ClFields,
-	      _NthObj) ->
-    emit({"'getdec_",ObjSetName,"'(_, _) ->",nl}),
-    emit({indent(3),"fun(Attr1, Bytes, _,_) ->",nl}),
-%%    emit({indent(6),"?RT_PER:decode_open_type(Bytes,[])",nl}),
-    emit({indent(6),"{Bytes,Attr1}",nl}),
-    emit({indent(3),"end.",nl,nl}),
-    ok;
-gen_objset_dec(_,_,[],_,_,_) ->
-    ok.
-
-gen_inlined_dec_funs(Fields,[{typefield,Name,_}|Rest],
-		    ObjSetName,NthObj) ->
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when record(Type,type) ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    N=emit_inner_of_decfun(Type,InternalDefFunName),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-	{value,{_,Type}} when record(Type,typedef) ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    N=emit_inner_of_decfun(Type,InternalDefFunName),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-	false ->
-	    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj)
-    end;
-gen_inlined_dec_funs(Fields,[_|Rest],ObjSetName,NthObj) ->
-    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs(_,[],_,NthObj) ->
-    NthObj.
-
-gen_inlined_dec_funs1(Fields,[{typefield,Name,_}|Rest],
-		      ObjSetName,NthObj) ->
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    N=case lists:keysearch(Name,1,Fields) of
-	  {value,{_,Type}} when record(Type,type) ->
-	      emit({";",nl}),
-	      emit_inner_of_decfun(Type,InternalDefFunName);
-	  {value,{_,Type}} when record(Type,typedef) ->
-	      emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-	      emit_inner_of_decfun(Type,InternalDefFunName);
-	  false ->
-	      0
-      end,
-    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-gen_inlined_dec_funs1(Fields,[_|Rest],ObjSetName,NthObj)->
-    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs1(_,[],_,NthObj) ->
-    emit({nl,indent(6),"end",nl}),
-    emit({indent(3),"end"}),
-    NthObj.
-
-emit_inner_of_decfun(#typedef{name={ExtName,Name},typespec=Type},
-		     InternalDefFunName) ->
-    case {ExtName,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_dec_prim(per,Type,"Val"),
-	    0;
-	{constructed,bif} ->
-	    emit({indent(12),"'dec_",
-		  asn1ct_gen:list2name(InternalDefFunName),"'(Val)"}),
-	    1;
-	_ ->
-	    emit({indent(12),"'",ExtName,"':'dec_",Name,"'(Val, telltype)"}),
-	    0
-    end;
-emit_inner_of_decfun(#typedef{name=Name},_) ->
-    emit({indent(12),"'dec_",Name,"'(Val, telltype)"}),
-    0;
-emit_inner_of_decfun(Type,_) when record(Type,type) ->
-    CurrMod = get(currmod),
-    case Type#type.def of
-	Def when atom(Def) ->
-	    emit({indent(9),Def," ->",nl,indent(12)}),
-	    gen_dec_prim(erules,Type,"Val");
-	TRef when record(TRef,typereference) ->
-	    T = TRef#typereference.val,
-	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'dec_",
-		  T,"'(Val)"})
-    end,
-    0.
-
-
-gen_internal_funcs(_,[]) ->
-    ok;
-gen_internal_funcs(Erules,[TypeDef|Rest]) ->
-    gen_encode_user(Erules,TypeDef),
-    emit([nl,nl,"'dec_",TypeDef#typedef.name,"'(Bytes) ->",nl]),
-    gen_decode_user(Erules,TypeDef),
-    gen_internal_funcs(Erules,Rest).
-
-
-
-%% DECODING *****************************
-%%***************************************
-
-
-gen_decode(Erules,Type) when record(Type,typedef) ->
-    D = Type,
-    emit({nl,nl}),
-    emit({"'dec_",Type#typedef.name,"'(Bytes,_) ->",nl}),
-    dbdec(Type#typedef.name),
-    gen_decode_user(Erules,D).
-
-gen_decode(Erules,Tname,#'ComponentType'{name=Cname,typespec=Type}) ->
-    NewTname = [Cname|Tname],
-    gen_decode(Erules,NewTname,Type);
-
-gen_decode(Erules,Typename,Type) when record(Type,type) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    ObjFun =
-		case Type#type.tablecinf of
-		    [{objfun,_}|_R] ->
-			", ObjFun";
-		    _ ->
-			""
-		end,
-	    emit({nl,"'dec_",asn1ct_gen:list2name(Typename),
-		  "'(Bytes,_",ObjFun,") ->",nl}),
-	    dbdec(Typename),
-	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
-	_ ->
-	    true
-    end.
-
-dbdec(Type) when list(Type)->
-    demit({"io:format(\"decoding: ",asn1ct_gen:list2name(Type),"~w~n\",[Bytes]),",nl});
-dbdec(Type) ->
-    demit({"io:format(\"decoding: ",{asis,Type},"~w~n\",[Bytes]),",nl}).
-
-gen_decode_user(Erules,D) when record(D,typedef) ->
-    CurrMod = get(currmod),
-    Typename = [D#typedef.name],
-    Def = D#typedef.typespec,
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    case asn1ct_gen:type(InnerType) of
-	{primitive,bif} ->
-	    gen_dec_prim(Erules,Def,"Bytes"),
-	    emit({".",nl,nl});
-	'ASN1_OPEN_TYPE' ->
-	    gen_dec_prim(Erules,Def#type{def='ASN1_OPEN_TYPE'},"Bytes"),
-	    emit({".",nl,nl});
-	{constructed,bif} ->
-	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,D);
-	#typereference{val=Dname} ->
-	    emit({"'dec_",Dname,"'(Bytes,telltype)"}),
-	    emit({".",nl,nl});
-	#'Externaltypereference'{module=CurrMod,type=Etype} ->
-	    emit({"'dec_",Etype,"'(Bytes,telltype).",nl,nl});
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit({"'",Emod,"':'dec_",Etype,"'(Bytes,telltype).",nl,nl});
-	Other ->
-	    exit({error,{asn1,{unknown,Other}}})
-    end.
-
-
-gen_dec_prim(_Erules,Att,BytesVar) ->
-    Typename = Att#type.def,
-    Constraint = Att#type.constraint,
-    case Typename of
-	'INTEGER' ->
-	    emit({"?RT_PER:decode_integer(",BytesVar,",",
-		  {asis,Constraint},")"});
-	{'INTEGER',NamedNumberList} ->
-	    emit({"?RT_PER:decode_integer(",BytesVar,",",
-		  {asis,Constraint},",",
-		  {asis,NamedNumberList},")"});
-	{'BIT STRING',NamedNumberList} ->
-	    case get(compact_bit_string) of
-		true ->
-		    emit({"?RT_PER:decode_compact_bit_string(",
-			  BytesVar,",",{asis,Constraint},",",
-			  {asis,NamedNumberList},")"});
-		_ ->
-		    emit({"?RT_PER:decode_bit_string(",BytesVar,",",
-			  {asis,Constraint},",",
-			  {asis,NamedNumberList},")"})
-	    end;
-	'NULL' ->
-	    emit({"?RT_PER:decode_null(",
-		  BytesVar,")"});
-	'OBJECT IDENTIFIER' ->
-	    emit({"?RT_PER:decode_object_identifier(",
-		  BytesVar,")"});
-	'ObjectDescriptor' ->
-	    emit({"?RT_PER:decode_ObjectDescriptor(",
-		  BytesVar,")"});
-	{'ENUMERATED',{NamedNumberList1,NamedNumberList2}} ->
-	    NewTup = {list_to_tuple([X||{X,_} <- NamedNumberList1]),
-		      list_to_tuple([X||{X,_} <- NamedNumberList2])},
-	    NewC = [{'ValueRange',{0,size(element(1,NewTup))-1}}],
-	    emit({"?RT_PER:decode_enumerated(",BytesVar,",",
-		  {asis,NewC},",",
-		  {asis,NewTup},")"});
-	{'ENUMERATED',NamedNumberList} ->
-	    NewTup = list_to_tuple([X||{X,_} <- NamedNumberList]),
-	    NewC = [{'ValueRange',{0,size(NewTup)-1}}],
-	    emit({"?RT_PER:decode_enumerated(",BytesVar,",",
-		  {asis,NewC},",",
-		  {asis,NewTup},")"});
-	'BOOLEAN'->
-	    emit({"?RT_PER:decode_boolean(",BytesVar,")"});
-	'OCTET STRING' ->
-	    emit({"?RT_PER:decode_octet_string(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'NumericString' ->
-	    emit({"?RT_PER:decode_NumericString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'TeletexString' ->
-	    emit({"?RT_PER:decode_TeletexString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'VideotexString' ->
-	    emit({"?RT_PER:decode_VideotexString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'UTCTime' ->
-	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'GeneralizedTime' ->
-	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'GraphicString' ->
-	    emit({"?RT_PER:decode_GraphicString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'VisibleString' ->
-	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'GeneralString' ->
-	    emit({"?RT_PER:decode_GeneralString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'PrintableString' ->
-	    emit({"?RT_PER:decode_PrintableString(",BytesVar,",",{asis,Constraint},")"});
-	'IA5String' ->
-	    emit({"?RT_PER:decode_IA5String(",BytesVar,",",{asis,Constraint},")"});
-	'BMPString' ->
-	    emit({"?RT_PER:decode_BMPString(",BytesVar,",",{asis,Constraint},")"});
-	'UniversalString' ->
-	    emit({"?RT_PER:decode_UniversalString(",BytesVar,",",{asis,Constraint},")"});
-	'ANY' ->
-	    emit(["?RT_PER:decode_open_type(",BytesVar,",", 
-		  {asis,Constraint}, ")"]); 
-	'ASN1_OPEN_TYPE' ->
-	    case Constraint of
-		[#'Externaltypereference'{type=Tname}] ->
-		    emit(["fun(FBytes) ->",nl,
-			  "   {XTerm,XBytes} = "]),
-		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
-		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
-		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
-		[#type{def=#'Externaltypereference'{type=Tname}}] ->
-		    emit(["fun(FBytes) ->",nl,
-			  "   {XTerm,XBytes} = "]),
-		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
-		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
-		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
-		_ ->
-		    emit(["?RT_PER:decode_open_type(",BytesVar,",[])"])
-	    end;
-	Other ->
-	    exit({'cant decode' ,Other})
-    end.
-
-
-is_already_generated(Operation,Name) ->
-    case get(class_default_type) of
-	undefined ->
-	    put(class_default_type,[{Operation,Name}]),
-	    false;
-	GeneratedList ->
-	    case lists:member({Operation,Name},GeneratedList) of
-		true ->
-		    true;
-		false ->
-		    put(class_default_type,[{Operation,Name}|GeneratedList]),
-		    false
-	    end
-    end.
-
-get_class_fields(#classdef{typespec=ObjClass}) ->
-    ObjClass#objectclass.fields;
-get_class_fields(#objectclass{fields=Fields}) ->
-    Fields;
-get_class_fields(_) ->
-    [].
-
-
-get_object_field(Name,ObjectFields) ->
-    case lists:keysearch(Name,1,ObjectFields) of
-	{value,Field} -> Field;
-	false -> false
-    end.
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_per_rt2ct.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_per_rt2ct.erl
deleted file mode 100644
index 70a017ac6a..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_gen_per_rt2ct.erl
+++ /dev/null
@@ -1,1811 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_gen_per_rt2ct.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
--module(asn1ct_gen_per_rt2ct).
-
-%% Generate erlang module which handles (PER) encode and decode for
-%% all types in an ASN.1 module
-
--include("asn1_records.hrl").
-%-compile(export_all).
-
--export([pgen/4,gen_dec_prim/3,gen_encode_prim/4]).
--export([gen_obj_code/3,gen_objectset_code/2]).
--export([gen_decode/2, gen_decode/3]).
--export([gen_encode/2, gen_encode/3]).
-
--import(asn1ct_gen, [emit/1,demit/1]).
--import(asn1ct_gen_per, [is_already_generated/2,more_genfields/1,
-			 get_class_fields/1,get_object_field/2]).
-
-%% pgen(Erules, Module, TypeOrVal)
-%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
-%% .hrl file is only generated if necessary
-%% Erules = per | ber
-%% Module = atom()
-%% TypeOrVal = {TypeList,ValueList}
-%% TypeList = ValueList = [atom()]
-
-pgen(OutFile,Erules,Module,TypeOrVal) ->
-    asn1ct_gen:pgen_module(OutFile,Erules,Module,TypeOrVal,true).
-
-
-%% Generate ENCODING ******************************
-%%****************************************x
-
-
-gen_encode(Erules,Type) when record(Type,typedef) ->
-    gen_encode_user(Erules,Type).
-
-gen_encode(Erules,Typename,#'ComponentType'{name=Cname,typespec=Type}) ->
-    NewTypename = [Cname|Typename],
-    gen_encode(Erules,NewTypename,Type);
-
-gen_encode(Erules,Typename,Type) when record(Type,type) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    ObjFun =
-	case lists:keysearch(objfun,1,Type#type.tablecinf) of
-	    {value,{_,_Name}} ->
-		", ObjFun";
-	    false ->
-		""
-	end,
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    case InnerType of
-		'SET' ->
-		    true;
-		'SEQUENCE' ->
-		    true;
-		_ ->
-		    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'({'",asn1ct_gen:list2name(Typename),
-			  "',Val}",ObjFun,") ->",nl}),
-		    emit({"'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val",ObjFun,");",nl,nl})
-	    end,
-	    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val",ObjFun,
-		  ") ->",nl}),
-	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
-	_ ->
-	    true
-    end.
-
-
-gen_encode_user(Erules,D) when record(D,typedef) ->
-    CurrMod = get(currmod),
-    Typename = [D#typedef.name],
-    Def = D#typedef.typespec,
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    case InnerType of
-	'SET' -> true;
-	'SEQUENCE' -> true;
-	_ ->
-	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),"'({'",asn1ct_gen:list2name(Typename),"',Val}) ->",nl}),
-	    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val);",nl,nl})
-    end,
-    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val) ->",nl}),
-    case asn1ct_gen:type(InnerType) of
-	{primitive,bif} ->
-	    gen_encode_prim(Erules,Def,"false"),
-	    emit({".",nl});
-	'ASN1_OPEN_TYPE' ->
-	    gen_encode_prim(Erules,Def#type{def='ASN1_OPEN_TYPE'},"false"),
-	    emit({".",nl});
-	{constructed,bif} ->
-	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,D);
-	#'Externaltypereference'{module=CurrMod,type=Etype} ->
-	    emit({"'enc_",Etype,"'(Val).",nl,nl});
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit({"'",Emod,"':'enc_",Etype,"'(Val).",nl,nl});
-	#typereference{val=Ename} ->
-	    emit({"'enc_",Ename,"'(Val).",nl,nl});
-	{notype,_} ->
-	    emit({"'enc_",InnerType,"'(Val).",nl,nl})
-    end.
-
-
-gen_encode_prim(Erules,D,DoTag) ->
-    Value = case asn1ct_name:active(val) of
-		true ->
-		    asn1ct_gen:mk_var(asn1ct_name:curr(val));
-		false ->
-		    "Val"
-	    end,
-    gen_encode_prim(Erules,D,DoTag,Value).
-
-
-
-
-
-gen_encode_prim(_Erules,D,_DoTag,Value) when record(D,type) ->
-    Constraint = D#type.constraint,
-    case D#type.def of
-	'INTEGER' ->
-	    EffectiveConstr = effective_constraint(integer,Constraint),
-	    emit(["  %%INTEGER with effective constraint: ",
-		  {asis,EffectiveConstr},nl]),
-	    emit_enc_integer(EffectiveConstr,Value);
-	{'INTEGER',NamedNumberList} ->
-	    EffectiveConstr = effective_constraint(integer,Constraint),
-	    %% maybe an emit_enc_NNL_integer
-	    emit(["  %%INTEGER with effective constraint: ",
-		  {asis,EffectiveConstr},nl]),
-	    emit_enc_integer_NNL(EffectiveConstr,Value,NamedNumberList);
-	{'ENUMERATED',{Nlist1,Nlist2}} ->
-	    NewList = lists:concat([[{0,X}||{X,_} <- Nlist1],['EXT_MARK'],[{1,X}||{X,_} <- Nlist2]]),
-	    NewC = [{'ValueRange',{0,length(Nlist1)-1}}],
-	    emit(["case (case ",Value," of {_,_}->element(2,",Value,");_->",
-		  Value," end) of",nl]),
-	    emit_enc_enumerated_cases(NewC, NewList++[{asn1_enum,length(Nlist1)-1}], 0);
-	{'ENUMERATED',NamedNumberList} ->
-	    NewList = [X||{X,_} <- NamedNumberList],
-	    NewC = effective_constraint(integer,
-					[{'ValueRange',
-					  {0,length(NewList)-1}}]),
-	    NewVal = enc_enum_cases(Value,NewList),
-	    emit_enc_integer(NewC,NewVal);
-	{'BIT STRING',NamedNumberList} ->
-	    EffectiveC = effective_constraint(bitstring,Constraint),
-	    case EffectiveC of
-		0 -> emit({"[]"});
-		_ ->
-		    emit({"?RT_PER:encode_bit_string(",
-			  {asis,EffectiveC},",",Value,",",
-			  {asis,NamedNumberList},")"})
-	    end;
-	'NULL' ->
-	    emit({"?RT_PER:encode_null(",Value,")"});
-	'OBJECT IDENTIFIER' ->
-	    emit({"?RT_PER:encode_object_identifier(",Value,")"});
-	'ObjectDescriptor' ->
-	    emit({"?RT_PER:encode_ObjectDescriptor(",{asis,Constraint},
-		  ",",Value,")"});
-	'BOOLEAN' ->
-%	    emit({"?RT_PER:encode_boolean(",Value,")"});
-	    emit({"case ",Value," of",nl,
-%		  "  true -> {bits,1,1};",nl,
-		  "  true -> [1];",nl,
-%		  "  false -> {bits,1,0};",nl,
-		  "  false -> [0];",nl,
-		  "  _ -> exit({error,{asn1,{encode_boolean,",Value,"}}})",nl,
-		  "end"});
-	'OCTET STRING' ->
-	    emit_enc_octet_string(Constraint,Value);
-
-	'NumericString' ->
-	    emit_enc_known_multiplier_string('NumericString',Constraint,Value);
-	'TeletexString' ->
-	    emit({"?RT_PER:encode_TeletexString(",{asis,Constraint},",",Value,")"});
-	'VideotexString' ->
-	    emit({"?RT_PER:encode_VideotexString(",{asis,Constraint},",",Value,")"});
-	'UTCTime' ->
-	    emit_enc_known_multiplier_string('VisibleString',Constraint,Value);
-	'GeneralizedTime' ->
-	    emit_enc_known_multiplier_string('VisibleString',Constraint,Value);
-	'GraphicString' ->
-	    emit({"?RT_PER:encode_GraphicString(",{asis,Constraint},",",Value,")"});
-	'VisibleString' ->
-	    emit_enc_known_multiplier_string('VisibleString',Constraint,Value);
-	'GeneralString' ->
-	    emit({"?RT_PER:encode_GeneralString(",{asis,Constraint},",",Value,")"});
-	'PrintableString' ->
-	    emit_enc_known_multiplier_string('PrintableString',Constraint,Value);
-	'IA5String' ->
-	    emit_enc_known_multiplier_string('IA5String',Constraint,Value);
-	'BMPString' ->
-	    emit_enc_known_multiplier_string('BMPString',Constraint,Value);
-	'UniversalString' ->
-	    emit_enc_known_multiplier_string('UniversalString',Constraint,Value);
-	'ANY' ->
-	    emit(["?RT_PER:encode_open_type(", {asis,Constraint}, ",", 
-		  Value, ")"]);
-	'ASN1_OPEN_TYPE' ->
-	    NewValue = case Constraint of
-			   [#'Externaltypereference'{type=Tname}] ->
-			     io_lib:format(
-			       "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
-			   [#type{def=#'Externaltypereference'{type=Tname}}] ->
-			       io_lib:format(
-				 "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
-			 _ -> Value
-		     end,
-	    emit(["?RT_PER:encode_open_type(", {asis,Constraint}, ",", 
-		  NewValue, ")"]);
-	XX ->
-	    exit({asn1_error,nyi,XX})
-    end.
-
-emit_enc_known_multiplier_string(StringType,C,Value) ->
-    SizeC = 
-	case get_constraint(C,'SizeConstraint') of
-	    L when list(L) -> {lists:min(L),lists:max(L)};
-	    L -> L
-	end,
-    PAlphabC = get_constraint(C,'PermittedAlphabet'),
-    case {StringType,PAlphabC} of
-	{'UniversalString',{_,_}} ->
-	    exit({error,{asn1,{'not implemented',"UniversalString with "
-			       "PermittedAlphabet constraint"}}});
-	{'BMPString',{_,_}} ->
-	    exit({error,{asn1,{'not implemented',"BMPString with "
-			       "PermittedAlphabet constraint"}}});
-	_ -> ok
-    end,
-    NumBits = get_NumBits(C,StringType),
-    CharOutTab = get_CharOutTab(C,StringType),
-    %% NunBits and CharOutTab for chars_encode
-    emit_enc_k_m_string(StringType,SizeC,NumBits,CharOutTab,Value).
-
-emit_enc_k_m_string(_StringType,0,_NumBits,_CharOutTab,_Value) ->
-    emit({"[]"});
-emit_enc_k_m_string(StringType,SizeC,NumBits,CharOutTab,Value) ->
-    emit({"?RT_PER:encode_known_multiplier_string(",{asis,StringType},",",
-	  {asis,SizeC},",",NumBits,",",{asis,CharOutTab},",",Value,")"}).
-
-emit_dec_known_multiplier_string(StringType,C,BytesVar) ->
-    SizeC = get_constraint(C,'SizeConstraint'),
-    PAlphabC = get_constraint(C,'PermittedAlphabet'),
-    case {StringType,PAlphabC} of
-	{'BMPString',{_,_}} ->
-	    exit({error,{asn1,
-			 {'not implemented',
-			  "BMPString with PermittedAlphabet "
-			  "constraint"}}});
-	_ ->
-	    ok
-    end,
-    NumBits = get_NumBits(C,StringType),
-    CharInTab = get_CharInTab(C,StringType),
-    case SizeC of
-	0 ->
-	    emit({"{[],",BytesVar,"}"});
-	_ ->
-	    emit({"?RT_PER:decode_known_multiplier_string(",
-		  {asis,StringType},",",{asis,SizeC},",",NumBits,
-		  ",",{asis,CharInTab},",",BytesVar,")"})
-    end.
-
-
-%% copied from run time module
-
-get_CharOutTab(C,StringType) ->
-    get_CharTab(C,StringType,out).
-
-get_CharInTab(C,StringType) ->
-    get_CharTab(C,StringType,in).
-
-get_CharTab(C,StringType,InOut) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} ->
-	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv,InOut);
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    {0,16#7F,notab};
-		'VisibleString' ->
-		    get_CharTab2(C,StringType,16#20,16#7F,notab,InOut);
-		'PrintableString' ->
-		    Chars = lists:sort(
-			      " '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
-		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars,InOut);
-		'NumericString' ->
-		    get_CharTab2(C,StringType,16#20,$9," 0123456789",InOut);
-		'UniversalString' ->
-		    {0,16#FFFFFFFF,notab};
-		'BMPString' ->
-		    {0,16#FFFF,notab}
-	    end
-    end.
-
-get_CharTab2(C,StringType,Min,Max,Chars,InOut) ->
-    BitValMax = (1 bsl get_NumBits(C,StringType))-1,
-    if
-	Max =< BitValMax ->
-	    {0,Max,notab};
-	true ->
-	    case InOut of
-		out ->
-		    {Min,Max,create_char_tab(Min,Chars)};
-		in  ->
-		    {Min,Max,list_to_tuple(Chars)}
-	    end
-    end.
-
-create_char_tab(Min,L) ->
-    list_to_tuple(create_char_tab(Min,L,0)).
-create_char_tab(Min,[Min|T],V) ->
-    [V|create_char_tab(Min+1,T,V+1)];
-create_char_tab(_Min,[],_V) ->
-    [];
-create_char_tab(Min,L,V) ->
-    [false|create_char_tab(Min+1,L,V)].
-
-get_NumBits(C,StringType) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} ->
-	    charbits(length(Sv),aligned);
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    charbits(128,aligned); % 16#00..16#7F
-		'VisibleString' ->
-		    charbits(95,aligned); % 16#20..16#7E
-		'PrintableString' ->
-		    charbits(74,aligned); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-		'NumericString' ->
-		    charbits(11,aligned); % $ ,"0123456789"
-		'UniversalString' ->
-		    32;
-		'BMPString' ->
-		    16
-	    end
-    end.
-
-charbits(NumOfChars,aligned) ->
-    case charbits(NumOfChars) of
-	1 -> 1;
-	2 -> 2;
-	B when B =< 4 -> 4;
-	B when B =< 8 -> 8;
-	B when B =< 16 -> 16; 
-	B when B =< 32 -> 32
-    end.
-
-charbits(NumOfChars) when NumOfChars =< 2 -> 1;
-charbits(NumOfChars) when NumOfChars =< 4 -> 2;
-charbits(NumOfChars) when NumOfChars =< 8 -> 3;
-charbits(NumOfChars) when NumOfChars =< 16 -> 4;
-charbits(NumOfChars) when NumOfChars =< 32 -> 5;
-charbits(NumOfChars) when NumOfChars =< 64 -> 6;
-charbits(NumOfChars) when NumOfChars =< 128 -> 7;
-charbits(NumOfChars) when NumOfChars =< 256 -> 8;
-charbits(NumOfChars) when NumOfChars =< 512 -> 9;
-charbits(NumOfChars) when NumOfChars =< 1024 -> 10;
-charbits(NumOfChars) when NumOfChars =< 2048 -> 11;
-charbits(NumOfChars) when NumOfChars =< 4096 -> 12;
-charbits(NumOfChars) when NumOfChars =< 8192 -> 13;
-charbits(NumOfChars) when NumOfChars =< 16384 -> 14;
-charbits(NumOfChars) when NumOfChars =< 32768 -> 15;
-charbits(NumOfChars) when NumOfChars =< 65536 -> 16;
-charbits(NumOfChars) when integer(NumOfChars) ->
-    16 + charbits1(NumOfChars bsr 16).
-
-charbits1(0) ->
-    0;
-charbits1(NumOfChars) ->
-    1 + charbits1(NumOfChars bsr 1).
-
-%% copied from run time module
-
-emit_enc_octet_string(Constraint,Value) ->
-    case get_constraint(Constraint,'SizeConstraint') of
-	0 ->
-	    emit({"  []"});
-	1 ->
-	    asn1ct_name:new(tmpval),
-	    emit({"  begin",nl}),
-	    emit({"    [",{curr,tmpval},"] = ",Value,",",nl}),
-%	    emit({"    {bits,8,",{curr,tmpval},"}",nl}),
-	    emit({"    [10,8,",{curr,tmpval},"]",nl}),
-	    emit("  end");
-	2 ->
-	    asn1ct_name:new(tmpval),
-	    emit({"  begin",nl}),
-	    emit({"    [",{curr,tmpval},",",{next,tmpval},"] = ",
-		  Value,",",nl}),
-%	    emit({"    [{bits,8,",{curr,tmpval},"},{bits,8,",
-%		  {next,tmpval},"}]",nl}),
-	    emit({"    [[10,8,",{curr,tmpval},"],[10,8,",
-		  {next,tmpval},"]]",nl}),
-	    emit("  end"),
-	    asn1ct_name:new(tmpval);
-	Sv when integer(Sv),Sv =< 256  ->
-	    asn1ct_name:new(tmpval),
-	    emit({"  begin",nl}),
-%	    emit({"    case length(",Value,") == ",Sv," of",nl}),
-	    emit({"    case length(",Value,") of",nl}),
-	    emit({"      ",{curr,tmpval}," when ",{curr,tmpval}," == ",Sv," -> [2,20,",{curr,tmpval},",",Value,"];",nl}),
-	    emit({"      _ -> exit({error,{value_out_of_bounds,",Value,"}})",
-		  nl,"    end",nl}),
-	    emit("  end");
-	Sv when integer(Sv),Sv =< 65535  ->
-	    asn1ct_name:new(tmpval),
-	    emit({"  begin",nl}),
-%	    emit({"    case length(",Value,") == ",Sv," of",nl}),
-	    emit({"    case length(",Value,") of",nl}),
-%	    emit({"      true -> [align,{octets,",Value,"}];",nl}),
-	    emit({"      ",{curr,tmpval}," when ",{curr,tmpval}," == ",Sv," -> [2,21,",{curr,tmpval},",",Value,"];",nl}),
-	    emit({"      _ -> exit({error,{value_out_of_bounds,",Value,"}})",
-		  nl,"    end",nl}),
-	    emit("  end");
-	C ->
-	    emit({"  ?RT_PER:encode_octet_string(",{asis,C},",false,",Value,")",nl})
-    end.
-
-emit_dec_octet_string(Constraint,BytesVar) ->
-    case get_constraint(Constraint,'SizeConstraint') of
-	0 ->
-	    emit({"  {[],",BytesVar,"}",nl});
-	{_,0} ->
-	    emit({"  {[],",BytesVar,"}",nl});
-	C ->
-	    emit({"  ?RT_PER:decode_octet_string(",BytesVar,",",
-		  {asis,C},",false)",nl})
-    end.
-
-emit_enc_integer_case(Value) ->
-    case get(component_type) of
-	{true,#'ComponentType'{prop=Prop}} ->
-	    emit({"  begin",nl}),
-	    case Prop of
-		Opt when Opt=='OPTIONAL';
-			 tuple(Opt),element(1,Opt)=='DEFAULT' ->
-		    emit({"  case ",Value," of",nl}),
-		    ok;
-		_ ->
-		    emit({"  ",{curr,tmpval},"=",Value,",",nl}),
-		    emit({"  case ",{curr,tmpval}," of",nl}),
-		    asn1ct_name:new(tmpval)
-	    end;
-%	    asn1ct_name:new(tmpval);
-	_ ->
-	    emit({" case ",Value," of ",nl})
-    end.
-emit_enc_integer_end_case() ->    
-    case get(component_type) of
-	{true,_} ->
-	    emit({nl,"  end"}); % end of begin ... end
-	_ -> ok
-    end.
-
-
-emit_enc_integer_NNL(C,Value,NNL) ->
-    EncVal = enc_integer_NNL_cases(Value,NNL),
-    emit_enc_integer(C,EncVal).
-    
-enc_integer_NNL_cases(Value,NNL) ->
-    asn1ct_name:new(tmpval),
-    TmpVal = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
-    Cases=enc_integer_NNL_cases1(NNL),
-    lists:flatten(io_lib:format("(case ~s of "++Cases++
-		  "~s when atom(~s)->exit({error,{asn1,{namednumber,~s}}});_->~s end)",[Value,TmpVal,TmpVal,TmpVal,Value])).
-
-enc_integer_NNL_cases1([{NNo,No}|Rest]) ->
-    io_lib:format("~w->~w;",[NNo,No])++enc_integer_NNL_cases1(Rest);
-enc_integer_NNL_cases1([]) ->
-    "".
-
-emit_enc_integer([{'SingleValue',Int}],Value) ->
-    asn1ct_name:new(tmpval),
-    emit_enc_integer_case(Value),%    emit(["  case ",Value," of",nl]),
-    emit(["    ",Int," -> [];",nl]),
-    emit(["    ",{curr,tmpval}," ->",nl]),
-    emit(["      exit({error,{value_out_of_bounds,",{curr,tmpval},"}})",
-	  nl," end",nl]),
-    emit_enc_integer_end_case();
-
-emit_enc_integer([{_,{Lb,Ub},_Range,{bits,NoBs}}],Value) -> % Range =< 255
-    asn1ct_name:new(tmpval),
-    emit_enc_integer_case(Value),
-    emit(["    ",{curr,tmpval}," when ",{curr,tmpval},"=<",Ub,",",
-	  {curr,tmpval},">=",Lb," ->",nl]),
-    emit(["      [10,",NoBs,",",{curr,tmpval},"-",Lb,"];",nl]),
-    emit(["    ",{curr,tmpval}," ->",nl]),
-    emit(["      exit({error,{value_out_of_bounds,",{curr,tmpval},"}})",
-	  nl,"  end",nl]),
-    emit_enc_integer_end_case();
-
-emit_enc_integer([{_,{Lb,Ub},Range,_}],Value) when Range =< 256 ->
-    asn1ct_name:new(tmpval),
-    emit_enc_integer_case(Value),
-    emit(["    ",{curr,tmpval}," when ",{curr,tmpval},"=<",Ub,",",
-	  {curr,tmpval},">=",Lb," ->",nl]),
-    emit(["      [20,1,",{curr,tmpval},"-",Lb,"];",nl]),
-    emit(["    ",{curr,tmpval}," ->",nl]),
-    emit(["      exit({error,{value_out_of_bounds,",{curr,tmpval},"}})",
-	  nl,"  end",nl]),
-    emit_enc_integer_end_case();
-
-emit_enc_integer([{_,{Lb,Ub},Range,_}],Value) when Range =< 65536 ->
-    asn1ct_name:new(tmpval),
-    emit_enc_integer_case(Value),
-    emit(["    ",{curr,tmpval}," when ",{curr,tmpval},"=<",Ub,",",
-	  {curr,tmpval},">=",Lb," ->",nl]),
-    emit(["      [20,2,<<(",{curr,tmpval},"-",Lb,"):16>>];",nl]),
-    emit(["    ",{curr,tmpval}," ->",nl]),
-    emit(["      exit({error,{value_out_of_bounds,",{curr,tmpval},"}})",
-	  nl,"  end",nl]),
-    emit_enc_integer_end_case();
-
-
-emit_enc_integer(C,Value) ->
-    emit({"  ?RT_PER:encode_integer(",{asis,C},",",Value,")"}).
-
-
-
-
-enc_enum_cases(Value,NewList) ->
-    asn1ct_name:new(tmpval),
-    TmpVal = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
-    Cases=enc_enum_cases1(NewList),
-    lists:flatten(io_lib:format("(case ~s of "++Cases++
-				"~s ->exit({error,"
-				"{asn1,{enumerated,~s}}})"
-				" end)",
-				[Value,TmpVal,TmpVal])).
-enc_enum_cases1(NNL) ->
-    enc_enum_cases1(NNL,0).
-enc_enum_cases1([H|T],Index) ->
-    io_lib:format("~w->~w;",[H,Index])++enc_enum_cases1(T,Index+1);
-enc_enum_cases1([],_) ->
-    "".
-
-
-emit_enc_enumerated_cases(C, [H], Count) ->
-    emit_enc_enumerated_case(C, H, Count),
-    emit([";",nl,"EnumVal -> exit({error,{asn1, {enumerated_not_in_range, EnumVal}}})"]),
-    emit([nl,"end"]);
-emit_enc_enumerated_cases(C, ['EXT_MARK'|T], _Count) ->
-    emit_enc_enumerated_cases(C, T, 0);
-emit_enc_enumerated_cases(C, [H1,H2|T], Count) ->
-    emit_enc_enumerated_case(C, H1, Count),
-    emit([";",nl]),
-    emit_enc_enumerated_cases(C, [H2|T], Count+1).
-
-
-%% The function clauses matching on tuples with first element 
-%% asn1_enum, 1 or 0 and the atom 'EXT_MARK' are for ENUMERATED
-%% with extension mark.
-emit_enc_enumerated_case(_C, {asn1_enum,High}, _) -> 
-    %% ENUMERATED with extensionmark
-    %% value higher than the extension base and not 
-    %% present in the extension range.
-    emit(["{asn1_enum,EnumV} when integer(EnumV), EnumV > ",High," -> ",
-	  "[1,?RT_PER:encode_small_number(EnumV)]"]);
-emit_enc_enumerated_case(_C, 'EXT_MARK', _Count) -> 
-    %% ENUMERATED with extensionmark
-    true;
-emit_enc_enumerated_case(_C, {1,EnumName}, Count) ->
-    %% ENUMERATED with extensionmark
-    %% values higher than extension root
-    emit(["'",EnumName,"' -> [1,?RT_PER:encode_small_number(",Count,")]"]);
-emit_enc_enumerated_case(C, {0,EnumName}, Count) ->
-    %% ENUMERATED with extensionmark
-    %% values within extension root
-    emit(["'",EnumName,"' -> [0,?RT_PER:encode_integer(",{asis,C},", ",Count,")]"]);
-
-%% This clause is invoked in case of an ENUMERATED without extension mark
-emit_enc_enumerated_case(_C, EnumName, Count) ->
-    emit(["'",EnumName,"' -> ",Count]).
-
-
-get_constraint([{Key,V}],Key) ->
-    V;
-get_constraint([],_) ->
-    no;
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	    no;
-	{value,{_,V}} -> 
-	    V
-    end.
-
-get_constraints(L=[{Key,_}],Key) ->
-    L;
-get_constraints([],_) ->
-    [];
-get_constraints(C,Key) ->
-    {value,L} = keysearch_allwithkey(Key,1,C,[]),
-    L.
-
-keysearch_allwithkey(Key,Ix,C,Acc) ->
-    case lists:keysearch(Key,Ix,C) of
-	false ->
-	    {value,Acc};
-	{value,T} ->
-	    RestC = lists:delete(T,C),
-	    keysearch_allwithkey(Key,Ix,RestC,[T|Acc])
-    end.
-
-%% effective_constraint(Type,C)
-%% Type = atom()
-%% C = [C1,...]
-%% C1 = {'SingleValue',SV} | {'ValueRange',VR} | {atom(),term()}
-%% SV = integer() | [integer(),...]
-%% VR = {Lb,Ub}
-%% Lb = 'MIN' | integer()
-%% Ub = 'MAX' | integer()
-%% Returns a single value if C only has a single value constraint, and no
-%% value range constraints, that constrains to a single value, otherwise 
-%% returns a value range that has the lower bound set to the lowest value 
-%% of all single values and lower bound values in C and the upper bound to
-%% the greatest value.
-effective_constraint(integer,[C={{_,_},_}|_Rest]) -> % extension
-    [C]; %% [C|effective_constraint(integer,Rest)]; XXX what is possible ???
-effective_constraint(integer,C) ->
-    SVs = get_constraints(C,'SingleValue'),
-    SV = effective_constr('SingleValue',SVs),
-    VRs = get_constraints(C,'ValueRange'),
-    VR = effective_constr('ValueRange',VRs),
-    CRange = greatest_common_range(SV,VR),
-    pre_encode(integer,CRange);
-effective_constraint(bitstring,C) ->
-%     Constr=get_constraints(C,'SizeConstraint'),
-%     case Constr of
-% 	[] -> no;
-% 	[{'SizeConstraint',Val}] -> Val;
-% 	Other -> Other
-%     end;
-    get_constraint(C,'SizeConstraint');
-effective_constraint(Type,C) ->
-    io:format("Effective constraint for ~p, not implemented yet.~n",[Type]),
-    C.
-
-effective_constr(_,[]) ->
-    [];
-effective_constr('SingleValue',List) ->
-    SVList = lists:flatten(lists:map(fun(X)->element(2,X)end,List)),
-    case lists:usort(SVList) of
-	[N] ->
-	    [{'SingleValue',N}];
-	L when list(L) -> 
-	    [{'ValueRange',{hd(L),lists:last(L)}}]
-    end;
-effective_constr('ValueRange',List) ->
-    LBs = lists:map(fun({_,{Lb,_}})-> Lb end,List),
-    UBs = lists:map(fun({_,{_,Ub}})-> Ub end,List),
-    Lb = least_Lb(LBs),
-    [{'ValueRange',{Lb,lists:max(UBs)}}].
-
-greatest_common_range([],VR) ->
-    VR;
-greatest_common_range(SV,[]) ->
-    SV;
-greatest_common_range([{_,Int}],[{_,{'MIN',Ub}}]) when integer(Int),
-						       Int > Ub ->
-    [{'ValueRange',{'MIN',Int}}];
-greatest_common_range([{_,Int}],[{_,{Lb,Ub}}]) when integer(Int),
-						    Int < Lb ->
-    [{'ValueRange',{Int,Ub}}];
-greatest_common_range([{_,Int}],VR=[{_,{_Lb,_Ub}}]) when integer(Int) ->
-    VR;
-greatest_common_range([{_,L}],[{_,{Lb,Ub}}]) when list(L) ->
-    Min = least_Lb([Lb|L]),
-    Max = greatest_Ub([Ub|L]),
-    [{'ValueRange',{Min,Max}}].
-    
-
-least_Lb(L) ->
-    case lists:member('MIN',L) of
-	true -> 'MIN';
-	_ -> lists:min(L)
-    end.
-
-greatest_Ub(L) ->
-    case lists:member('MAX',L) of
-	true -> 'MAX';
-	_ -> lists:max(L)
-    end.
-
-% effective_constraint1('SingleValue',List) ->
-%     SVList = lists:map(fun(X)->element(2,X)end,List),
-%     sv_effective_constraint(hd(SVList),tl(SVList));
-% effective_constraint1('ValueRange',List) ->
-%     VRList = lists:map(fun(X)->element(2,X)end,List),
-%     vr_effective_constraint(lists:map(fun(X)->element(1,X)end,VRList),
-% 			    lists:map(fun(X)->element(2,X)end,VRList)).
-
-%% vr_effective_constraint/2
-%% Gets all LowerEndPoints and UpperEndPoints as arguments
-%% Returns {'ValueRange',{Lb,Ub}} where Lb is the highest value of
-%% the LowerEndPoints and Ub is the lowest value of the UpperEndPoints,
-%% i.e. the intersection of all value ranges.
-% vr_effective_constraint(Mins,Maxs) ->
-%     Lb=lists:foldl(fun(X,'MIN') when integer(X) -> X;
-% 		      (X,'MIN') -> 'MIN';
-% 		      (X,AccIn) when integer(X),X >= AccIn -> X;
-% 		      (X,AccIn) -> AccIn
-% 		   end,hd(Mins),tl(Mins)),
-%     Ub = lists:min(Maxs),
-%     {'ValueRange',{Lb,Ub}}.
-			   
-
-% sv_effective_constraint(SV,[]) ->
-%     {'SingleValue',SV};
-% sv_effective_constraint([],_) ->
-%     exit({error,{asn1,{illegal_single_value_constraint}}});
-% sv_effective_constraint(SV,[SV|Rest]) ->
-%     sv_effective_constraint(SV,Rest);
-% sv_effective_constraint(Int,[SV|Rest]) when integer(Int),list(SV) ->
-%     case lists:member(Int,SV) of
-% 	true ->
-% 	    sv_effective_constraint(Int,Rest);
-% 	_ ->
-% 	    exit({error,{asn1,{illegal_single_value_constraint}}})
-%     end;
-% sv_effective_constraint(SV,[Int|Rest]) when integer(Int),list(SV) ->
-%     case lists:member(Int,SV) of
-% 	true ->
-% 	    sv_effective_constraint(Int,Rest);
-% 	_ ->
-% 	    exit({error,{asn1,{illegal_single_value_constraint}}})
-%     end;
-% sv_effective_constraint(SV1,[SV2|Rest]) when list(SV1),list(SV2) ->
-%     sv_effective_constraint(common_set(SV1,SV2),Rest);
-% sv_effective_constraint(_,_) ->
-%     exit({error,{asn1,{illegal_single_value_constraint}}}).
-
-%% common_set/2
-%% Two lists as input
-%% Returns the list with all elements that are common for both
-%% input lists
-% common_set(SV1,SV2) ->
-%     lists:filter(fun(X)->lists:member(X,SV1) end,SV2).
-
-
-
-pre_encode(integer,[]) ->
-    [];
-pre_encode(integer,C=[{'SingleValue',_}]) ->
-    C;
-pre_encode(integer,C=[{'ValueRange',VR={Lb,Ub}}]) when integer(Lb),integer(Ub)->
-    Range = Ub-Lb+1,
-    if
-	Range =< 255 ->
-	    NoBits = no_bits(Range),
-	    [{'ValueRange',VR,Range,{bits,NoBits}}];
-	Range =< 256 ->
-	    [{'ValueRange',VR,Range,{octets,1}}];
-	Range =< 65536 ->
-	    [{'ValueRange',VR,Range,{octets,2}}];
-	true ->
-	    C
-    end;
-pre_encode(integer,C) ->
-    C.
-
-no_bits(2) -> 1;
-no_bits(N) when N=<4 -> 2;
-no_bits(N) when N=<8 -> 3;
-no_bits(N) when N=<16 -> 4;
-no_bits(N) when N=<32 -> 5;
-no_bits(N) when N=<64 -> 6;
-no_bits(N) when N=<128 -> 7;
-no_bits(N) when N=<255 -> 8.
-
-%% Object code generating for encoding and decoding
-%% ------------------------------------------------
-
-gen_obj_code(Erules,_Module,Obj) when record(Obj,typedef) ->
-    ObjName = Obj#typedef.name,
-    Def = Obj#typedef.typespec,
-    #'Externaltypereference'{module=Mod,type=ClassName} = 
-	Def#'Object'.classname,
-    Class = asn1_db:dbget(Mod,ClassName),
-    {object,_,Fields} = Def#'Object'.def,
-    emit({nl,nl,nl,"%%================================"}),
-    emit({nl,"%%  ",ObjName}),
-    emit({nl,"%%================================",nl}),
-    EncConstructed =
-%	gen_encode_objectfields(Class#classdef.typespec,ObjName,Fields,[]),
-	gen_encode_objectfields(ClassName,get_class_fields(Class),
-				ObjName,Fields,[]),
-    emit(nl),
-    gen_encode_constr_type(Erules,EncConstructed),
-    emit(nl),
-    DecConstructed =
-%	gen_decode_objectfields(Class#classdef.typespec,ObjName,Fields,[]),
-	gen_decode_objectfields(ClassName,get_class_fields(Class),
-				ObjName,Fields,[]),
-    emit(nl),
-    gen_decode_constr_type(Erules,DecConstructed),
-    emit(nl);
-gen_obj_code(_Erules,_Module,Obj) when record(Obj,pobjectdef) ->
-    ok.
-
-gen_encode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause = 
-	fun(V) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ",",V,",_RestPrimFieldName) ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val, RestPrimFieldName) ->",nl]),
-    MaybeConstr =
-	case {get_object_field(Name,ObjectFields),OptOrMand} of
-	    {false,'MANDATORY'} -> %% this case is illegal
-		exit({error,{asn1,{"missing mandatory field in object",
-				   ObjName}}});
-	    {false,'OPTIONAL'} ->
-		EmitFuncClause("_"),
-		emit("   <<>>"),
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Val"),
-		gen_encode_default_call(ClassName,Name,DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Val"),
-		gen_encode_field_call(ObjName,Name,TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,
-			    MaybeConstr++ConstrAcc);
-gen_encode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause =
-	fun(Attrs) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ",",Attrs,") ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val,[H|T]) ->",nl]),
-    case {get_object_field(Name,ObjectFields),OptOrMand} of
-	{false,'MANDATORY'} ->
-	    exit({error,{asn1,{"missing mandatory field in object",
-			       ObjName}}});
-	{false,'OPTIONAL'} ->
-	    EmitFuncClause("_,_"),
-	    emit(["  exit({error,{'use of missing field in object', ",Name,
-		  "}})"]);
-	{false,{'DEFAULT',_DefaultObject}} ->
-	    exit({error,{asn1,{"not implemented yet",Name}}});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause("Val,[H|T]"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
-			  "'(H, Val, T)"});
-		TypeName ->
-		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
-	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
-gen_encode_objectfields(ClassName,[_C|Cs],O,OF,Acc) ->
-    gen_encode_objectfields(ClassName,Cs,O,OF,Acc);
-gen_encode_objectfields(_,[],_,_,Acc) ->
-    Acc.
-
-% gen_encode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
-%     Fields = Class#objectclass.fields,
-
-%     MaybeConstr =
-%     case is_typefield(Fields,FieldName) of
-% 	true ->
-% 	    Def = Type#typedef.typespec,
-% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
-% 		  ", Val, Dummy) ->",nl}),
-
-% 	    CAcc =
-% 	    case Type#typedef.name of
-% 		{primitive,bif} ->
-% 		    gen_encode_prim(per,Def,"false","Val"),
-% 		    [];
-% 		{constructed,bif} ->
-% 		    emit({"   'enc_",ObjName,'_',FieldName,
-% 			  "'(Val)"}),
-% 			[{['enc_',ObjName,'_',FieldName],Def}];
-% 		{ExtMod,TypeName} ->
-% 		    emit({"   '",ExtMod,"':'enc_",TypeName,"'(Val)"}),
-% 		    [];
-% 		TypeName ->
-% 		    emit({"   'enc_",TypeName,"'(Val)"}),
-% 		    []
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    CAcc;
-% 	{false,objectfield} ->
-% 	    emit({"'enc_",ObjName,"'(",{asis,FieldName},
-% 		  ", Val, [H|T]) ->",nl}),
-% 	    case Type#typedef.name of
-% 		{ExtMod,TypeName} ->
-% 		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
-% 			  "'(H, Val, T)"});
-% 		TypeName ->
-% 		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    [];
-% 	{false,_} -> []
-%     end,
-%     gen_encode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
-% gen_encode_objectfields(C,O,[_|T],Acc) ->
-%     gen_encode_objectfields(C,O,T,Acc);
-% gen_encode_objectfields(_,_,[],Acc) ->
-%     Acc.
-
-gen_encode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
-    case is_already_generated(enc,TypeDef#typedef.name) of
-	true -> ok;
-	_ ->
-	    Name = lists:concat(["enc_",TypeDef#typedef.name]),
-	    emit({Name,"(Val) ->",nl}),
-	    Def = TypeDef#typedef.typespec,
-	    InnerType = asn1ct_gen:get_inner(Def#type.def),
-	    asn1ct_gen:gen_encode_constructed(Erules,Name,InnerType,Def),
-	    gen_encode_constr_type(Erules,Rest)
-    end;
-gen_encode_constr_type(_,[]) ->
-    ok.
-
-gen_encode_field_call(ObjName,FieldName,Type) ->
-    Def = Type#typedef.typespec,
-    case Type#typedef.name of
-	{primitive,bif} -> 
-	    gen_encode_prim(per,Def,"false",
-			    "Val"),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'enc_",ObjName,'_',FieldName,
-		  "'(Val)"}),
-	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'enc_",TypeName,
-		  "'(Val)"}),
-	    [];
-	TypeName ->
-	    emit({"   'enc_",TypeName,"'(Val)"}),
-	    []
-    end.
-
-gen_encode_default_call(ClassName,FieldName,Type) ->
-    CurrentMod = get(currmod),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-%%	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
-	    emit(["   'enc_",ClassName,'_',FieldName,"'(Val)"]),
-	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_encode_prim(per,Type,"false","Val"),
-	    [];
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'enc_",Etype,"'(Val)",nl]),
-	    [];
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'enc_",Etype,"'(Val)",nl]),
-	    []
-    end.
-    
-
-
-gen_decode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    EmitFuncClause = 
-	fun(Bytes) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},",",Bytes,
-		      ",_,_RestPrimFieldName) ->",nl])
-	end,
-%     emit(["'dec_",ObjName,"'(",{asis,Name},
-% 	  ", Bytes, _, RestPrimFieldName) ->",nl]),
-    MaybeConstr=
-	case {get_object_field(Name,ObjectFields),OptOrMand} of
-	    {false,'MANDATORY'} -> %% this case is illegal
-		exit({error,{asn1,{"missing mandatory field in object",
-				   ObjName}}});
-	    {false,'OPTIONAL'} ->
-		EmitFuncClause("_"),
-		emit(["   asn1_NOVALUE"]),
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Bytes"),
-		gen_decode_default_call(ClassName,Name,"Bytes",DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Bytes"),
-		gen_decode_field_call(ObjName,Name,"Bytes",TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,MaybeConstr++ConstrAcc);
-gen_decode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-     EmitFuncClause =
-	fun(Attrs) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},
-		      ",",Attrs,") ->",nl])
-	end,
-%     emit(["'dec_",ObjName,"'(",{asis,Name},
-% 	  ", Bytes,_,[H|T]) ->",nl]),
-    case {get_object_field(Name,ObjectFields),OptOrMand} of
-	{false,'MANDATORY'} ->
-	    exit({error,{asn1,{"missing mandatory field in object",
-			       ObjName}}});
-	{false,'OPTIONAL'} ->
-	    EmitFuncClause("_,_,_"),
-	    emit(["  exit({error,{'illegal use of missing field in object', ",Name,
-		  "}})"]);
-	{false,{'DEFAULT',_DefaultObject}} ->
-	    exit({error,{asn1,{"not implemented yet",Name}}});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause("Bytes,_,[H|T]"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
-			  "'(H, Bytes, telltype, T)"});
-		TypeName ->
-		    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, telltype, T)"})
-	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
-gen_decode_objectfields(CN,[_C|Cs],O,OF,CAcc) ->
-    gen_decode_objectfields(CN,Cs,O,OF,CAcc);
-gen_decode_objectfields(_,[],_,_,CAcc) ->
-    CAcc.
-
-
-gen_decode_field_call(ObjName,FieldName,Bytes,Type) ->
-    Def = Type#typedef.typespec,
-    case Type#typedef.name of
-	{primitive,bif} -> 
-	    gen_dec_prim(per,Def,Bytes),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'dec_",ObjName,'_',FieldName,
-		  "'(",Bytes,",telltype)"}),
-	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'dec_",TypeName,
-		  "'(",Bytes,", telltype)"}),
-	    [];
-	TypeName ->
-	    emit({"   'dec_",TypeName,"'(",Bytes,", telltype)"}),
-	    []
-    end.
-
-gen_decode_default_call(ClassName,FieldName,Bytes,Type) ->
-    CurrentMod = get(currmod),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-	    emit(["   'dec_",ClassName,'_',FieldName,"'(",Bytes,", telltype)"]),
-	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_dec_prim(per,Type,Bytes),
-	    [];
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'dec_",Etype,"'(",Bytes,", telltype)",nl]),
-	    [];
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'dec_",Etype,"'(",Bytes,", telltype)",nl]),
-	    []
-    end.
-
-%%%%%%%%%%%%%%%
-
-% gen_decode_objectfields(Class,ObjName,[{FieldName,Type}|Rest],ConstrAcc) ->
-%     Fields = Class#objectclass.fields,
-
-%     MaybeConstr =
-%     case is_typefield(Fields,FieldName) of
-% 	true ->
-% 	    Def = Type#typedef.typespec,
-% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
-% 		  ", Val, Telltype, RestPrimFieldName) ->",nl}),
-
-% 	    CAcc =
-% 	    case Type#typedef.name of
-% 		{primitive,bif} ->
-% 		    gen_dec_prim(per,Def,"Val"),
-% 		    [];
-% 		{constructed,bif} ->
-% 		    emit({"   'dec_",ObjName,'_',FieldName,
-% 			  "'(Val, Telltype)"}),
-% 		    [{['dec_',ObjName,'_',FieldName],Def}];
-% 		{ExtMod,TypeName} ->
-% 		    emit({"   '",ExtMod,"':'dec_",TypeName,
-% 			  "'(Val, Telltype)"}),
-% 		    [];
-% 		TypeName ->
-% 		    emit({"   'dec_",TypeName,"'(Val, Telltype)"}),
-% 		    []
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    CAcc;
-% 	{false,objectfield} ->
-% 	    emit({"'dec_",ObjName,"'(",{asis,FieldName},
-% 		  ", Val, Telltype, [H|T]) ->",nl}),
-% 	    case Type#typedef.name of
-% 		{ExtMod,TypeName} ->
-% 		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
-% 			  "'(H, Val, Telltype, T)"});
-% 		TypeName ->
-% 		    emit({indent(3),"'dec_",TypeName,
-% 			  "'(H, Val, Telltype, T)"})
-% 	    end,
-% 	    case more_genfields(Fields,Rest) of
-% 		true ->
-% 		    emit({";",nl});
-% 		false ->
-% 		    emit({".",nl})
-% 	    end,
-% 	    [];
-% 	{false,_} ->
-% 	    []
-%     end,
-%     gen_decode_objectfields(Class,ObjName,Rest,MaybeConstr ++ ConstrAcc);
-% gen_decode_objectfields(C,O,[_|T],CAcc) ->
-%     gen_decode_objectfields(C,O,T,CAcc);
-% gen_decode_objectfields(_,_,[],CAcc) ->
-%     CAcc.
-
-gen_decode_constr_type(Erules,[{Name,Def}|Rest]) ->
-    emit({Name,"(Bytes,_) ->",nl}),
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    asn1ct_gen:gen_decode_constructed(Erules,Name,InnerType,Def),
-    gen_decode_constr_type(Erules,Rest);
-gen_decode_constr_type(Erules,[TypeDef|Rest]) when record(TypeDef,typedef) ->
-    case is_already_generated(dec,TypeDef#typedef.name) of
-	true -> ok;
-	_ ->
-	    gen_decode(Erules,TypeDef)
-    end,
-    gen_decode_constr_type(Erules,Rest);
-gen_decode_constr_type(_,[]) ->
-    ok.
-
-% is_typefield(Fields,FieldName) ->
-%     case lists:keysearch(FieldName,2,Fields) of
-% 	{value,Field} ->
-% 	    case element(1,Field) of
-% 		typefield ->
-% 		    true;
-% 		Other ->
-% 		    {false,Other}
-% 	    end;
-% 	_ ->
-% 	    false
-%     end.
-%% Object Set code generating for encoding and decoding
-%% ----------------------------------------------------
-gen_objectset_code(Erules,ObjSet) ->
-    ObjSetName = ObjSet#typedef.name,
-    Def = ObjSet#typedef.typespec,
-%%    {ClassName,ClassDef} = Def#'ObjectSet'.class,
-    #'Externaltypereference'{module=ClassModule,
-			     type=ClassName} = Def#'ObjectSet'.class,
-    ClassDef = asn1_db:dbget(ClassModule,ClassName),
-    UniqueFName = Def#'ObjectSet'.uniquefname,
-    Set = Def#'ObjectSet'.set,
-    emit({nl,nl,nl,"%%================================"}),
-    emit({nl,"%%  ",ObjSetName}),
-    emit({nl,"%%================================",nl}),
-    case ClassName of
-	{_Module,ExtClassName} ->
-	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
-			    ExtClassName,ClassDef);
-	_ ->
-	    gen_objset_code(Erules,ObjSetName,UniqueFName,Set,
-			    ClassName,ClassDef)
-    end,
-    emit(nl).
-
-gen_objset_code(Erules,ObjSetName,UniqueFName,Set,ClassName,ClassDef)->
-    ClassFields = (ClassDef#classdef.typespec)#objectclass.fields,
-    InternalFuncs=
-	gen_objset_enc(ObjSetName,UniqueFName,Set,ClassName,
-		       ClassFields,1,[]),
-    gen_objset_dec(ObjSetName,UniqueFName,Set,ClassName,ClassFields,1),
-    gen_internal_funcs(Erules,InternalFuncs).
-
-gen_objset_enc(_,{unique,undefined},_,_,_,_,_) ->
-    %% There is no unique field in the class of this object set
-    %% don't bother about the constraint
-    [];
-gen_objset_enc(ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
-	       ClName,ClFields,NthObj,Acc)->
-    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl}),
-    {InternalFunc,NewNthObj}=
-	case ObjName of
-	    no_name ->
-		gen_inlined_enc_funs(Fields,ClFields,ObjSName,NthObj);
-	    _ ->
-		emit({"    fun 'enc_",ObjName,"'/3"}),
-		{[],NthObj}
-	end,
-    emit({";",nl}),
-    gen_objset_enc(ObjSName,UniqueName,[T|Rest],ClName,ClFields,
-		  NewNthObj,InternalFunc++Acc);
-gen_objset_enc(ObjSetName,UniqueName,
-	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
-
-    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl}),
-    {InternalFunc,_}=
-	case ObjName of
-	    no_name ->
-		gen_inlined_enc_funs(Fields,ClFields,ObjSetName,NthObj);
-	    _ ->
-		emit({"    fun 'enc_",ObjName,"'/3"}),
-		{[],NthObj}
-	end,
-    emit({".",nl,nl}),
-    InternalFunc++Acc;
-gen_objset_enc(ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
-	       _ClFields,_NthObj,Acc) ->
-    emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
-    emit({indent(3),"fun(_, Val, _) ->",nl}),
-    emit({indent(6),"Size = if",nl}),
-    emit({indent(9),"list(Val) -> length(Val);",nl}),
-    emit({indent(9),"true -> size(Val)",nl}),
-    emit({indent(6),"end,",nl}),
-    emit({indent(6),"if",nl}),
-    emit({indent(9),"Size < 256 ->",nl}),
-    emit({indent(12),"[20,Size,Val];",nl}),
-    emit({indent(9),"true ->",nl}),
-    emit({indent(12),"[21,<<Size:16>>,Val]",nl}),
-    emit({indent(6),"end",nl}),
-    emit({indent(3),"end.",nl,nl}),
-    Acc;
-gen_objset_enc(_,_,[],_,_,_,Acc) ->
-    Acc.
-
-%% gen_inlined_enc_funs for each object iterates over all fields of a
-%% class, and for each typefield it checks if the object has that
-%% field and emits the proper code.
-gen_inlined_enc_funs(Fields,[{typefield,Name,_}|Rest],ObjSetName,NthObj) ->
-    InternalDefFunName=asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when record(Type,type) ->
-	    emit({indent(3),"fun(Type, Val, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    {Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
-	{value,{_,Type}} when record(Type,typedef) ->
-	    emit({indent(3),"fun(Type, Val, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    {Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-	    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+N,Ret);
-	false ->
-	    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj)
-    end;
-gen_inlined_enc_funs(Fields,[_|Rest],ObjSetName,NthObj) ->
-    gen_inlined_enc_funs(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_enc_funs(_,[],_,NthObj) ->
-    {[],NthObj}.
-
-gen_inlined_enc_funs1(Fields,[{typefield,Name,_}|Rest],ObjSetName,
-		      NthObj,Acc) ->
-    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
-    {Acc2,NAdd}=
-	case lists:keysearch(Name,1,Fields) of
-	    {value,{_,Type}} when record(Type,type) ->
-		emit({";",nl}),
-		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-		{Ret++Acc,N};
-	    {value,{_,Type}} when record(Type,typedef) ->
-		emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-		{Ret,N}=emit_inner_of_fun(Type,InternalDefFunName),
-		{Ret++Acc,N};
-	    false ->
-		{Acc,0}
-	end,
-    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj+NAdd,Acc2);
-gen_inlined_enc_funs1(Fields,[_|Rest],ObjSetName,NthObj,Acc)->
-    gen_inlined_enc_funs1(Fields,Rest,ObjSetName,NthObj,Acc);
-gen_inlined_enc_funs1(_,[],_,NthObj,Acc) ->
-    emit({nl,indent(6),"end",nl}),
-    emit({indent(3),"end"}),
-    {Acc,NthObj}.
-
-emit_inner_of_fun(TDef=#typedef{name={ExtMod,Name},typespec=Type},
-		  InternalDefFunName) ->
-    case {ExtMod,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_encode_prim(per,Type,dotag,"Val"),
-	    {[],0};
-	{constructed,bif} ->
-	    emit([indent(12),"'enc_",
-		  InternalDefFunName,"'(Val)"]),
-	    {[TDef#typedef{name=InternalDefFunName}],1};
-	_ ->
-	    emit({indent(12),"'",ExtMod,"':'enc_",Name,"'(Val)"}),
-	    {[],0}
-    end;
-emit_inner_of_fun(#typedef{name=Name},_) ->
-    emit({indent(12),"'enc_",Name,"'(Val)"}),
-    {[],0};
-emit_inner_of_fun(Type,_) when record(Type,type) ->
-    CurrMod = get(currmod),
-    case Type#type.def of
-	Def when atom(Def) ->
-	    emit({indent(9),Def," ->",nl,indent(12)}),
-	    gen_encode_prim(erules,Type,dotag,"Val");
-	TRef when record(TRef,typereference) ->
-	    T = TRef#typereference.val,
-	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,"'(Val)"});
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,"'(Val)"});
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'enc_",
-		  T,"'(Val)"})
-    end,
-    {[],0}.
-
-indent(N) ->
-    lists:duplicate(N,32). % 32 = space
-
-
-gen_objset_dec(_,{unique,undefined},_,_,_,_) ->
-    %% There is no unique field in the class of this object set
-    %% don't bother about the constraint
-    ok;
-gen_objset_dec(ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],ClName,
-	       ClFields,NthObj)->
-
-    emit({"'getdec_",ObjSName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl}),
-    NewNthObj=
-	case ObjName of
-	    no_name ->
-		gen_inlined_dec_funs(Fields,ClFields,ObjSName,NthObj);
-	    _ ->
-		emit({"    fun 'dec_",ObjName,"'/4"}),
-		NthObj
-	end,
-    emit({";",nl}),
-    gen_objset_dec(ObjSName,UniqueName,[T|Rest],ClName,ClFields,NewNthObj);
-gen_objset_dec(ObjSetName,UniqueName,[{ObjName,Val,Fields}],_ClName,
-	       ClFields,NthObj) ->
-
-    emit({"'getdec_",ObjSetName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl}),
-    case ObjName of
-	no_name ->
-	    gen_inlined_dec_funs(Fields,ClFields,ObjSetName,NthObj);
-	_ ->
-	    emit({"    fun 'dec_",ObjName,"'/4"})
-    end,
-    emit({".",nl,nl}),
-    ok;
-gen_objset_dec(ObjSetName,_,['EXTENSIONMARK'],_ClName,_ClFields,
-	       _NthObj) ->
-    emit({"'getdec_",ObjSetName,"'(_, _) ->",nl}),
-    emit({indent(3),"fun(Attr1, Bytes, _, _) ->",nl}),
-    %%    emit({indent(6),"?RT_PER:decode_open_type(Bytes,[])",nl}),
-    emit({indent(6),"{Bytes,Attr1}",nl}),
-    emit({indent(3),"end.",nl,nl}),
-    ok;
-gen_objset_dec(_,_,[],_,_,_) ->
-    ok.
-
-gen_inlined_dec_funs(Fields,[{typefield,Name,_}|Rest],
-		     ObjSetName,NthObj) ->
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when record(Type,type) ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    N=emit_inner_of_decfun(Type,InternalDefFunName),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-	{value,{_,Type}} when record(Type,typedef) ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    N=emit_inner_of_decfun(Type,InternalDefFunName),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-	false ->
-	    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj)
-    end;
-gen_inlined_dec_funs(Fields,[_|Rest],ObjSetName,NthObj) ->
-    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs(_,[],_,NthObj) ->
-    NthObj.
-
-gen_inlined_dec_funs1(Fields,[{typefield,Name,_}|Rest],
-		     ObjSetName,NthObj) ->
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    N=
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when record(Type,type) ->
-	    emit({";",nl}),
-	    emit_inner_of_decfun(Type,InternalDefFunName);
-	{value,{_,Type}} when record(Type,typedef) ->
-	    emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-	    emit_inner_of_decfun(Type,InternalDefFunName);
-	false ->
-	    0
-    end,
-    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-gen_inlined_dec_funs1(Fields,[_|Rest],ObjSetName,NthObj)->
-    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs1(_,[],_,NthObj) ->
-    emit({nl,indent(6),"end",nl}),
-    emit({indent(3),"end"}),
-    NthObj.
-
-emit_inner_of_decfun(#typedef{name={ExtName,Name},typespec=Type},
-		     InternalDefFunName) ->
-    case {ExtName,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_dec_prim(per,Type,"Val"),
-	    0;
-	{constructed,bif} ->
-	    emit({indent(12),"'dec_",
-		  asn1ct_gen:list2name(InternalDefFunName),"'(Val)"}),
-	    1;
-	_ ->
-	    emit({indent(12),"'",ExtName,"':'dec_",Name,
-		  "'(Val, telltype)"}),
-	    0
-    end;
-emit_inner_of_decfun(#typedef{name=Name},_) ->
-    emit({indent(12),"'dec_",Name,"'(Val, telltype)"}),
-    0;
-emit_inner_of_decfun(Type,_) when record(Type,type) ->
-    CurrMod = get(currmod),
-    case Type#type.def of
-	Def when atom(Def) ->
-	    emit({indent(9),Def," ->",nl,indent(12)}),
-	    gen_dec_prim(erules,Type,"Val");
-	TRef when record(TRef,typereference) ->
-	    T = TRef#typereference.val,
-	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'dec_",
-		  T,"'(Val)"})
-    end,
-    0.
-
-
-gen_internal_funcs(_Erules,[]) ->
-    ok;
-gen_internal_funcs(Erules,[TypeDef|Rest]) ->
-    gen_encode_user(Erules,TypeDef),
-    emit([nl,nl,"'dec_",TypeDef#typedef.name,"'(Bytes) ->",nl]),
-    gen_decode_user(Erules,TypeDef),
-    gen_internal_funcs(Erules,Rest).
-
-
-
-%% DECODING *****************************
-%%***************************************
-
-
-gen_decode(Erules,Type) when record(Type,typedef) ->
-    D = Type,
-    emit({nl,nl}),
-    emit({"'dec_",Type#typedef.name,"'(Bytes,_) ->",nl}),
-    dbdec(Type#typedef.name),
-    gen_decode_user(Erules,D).
-
-gen_decode(Erules,Tname,#'ComponentType'{name=Cname,typespec=Type}) ->
-    NewTname = [Cname|Tname],
-    gen_decode(Erules,NewTname,Type);
-
-gen_decode(Erules,Typename,Type) when record(Type,type) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-	{constructed,bif} ->
-	    ObjFun =
-		case Type#type.tablecinf of
-		    [{objfun,_}|_R] ->
-			", ObjFun";
-		    _ ->
-			""
-		end,
-	    emit({nl,"'dec_",asn1ct_gen:list2name(Typename),
-		  "'(Bytes,_",ObjFun,") ->",nl}),
-	    dbdec(Typename),
-	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
-	_ ->
-	    true
-    end.
-
-dbdec(Type) when list(Type)->
-    demit({"io:format(\"decoding: ",asn1ct_gen:list2name(Type),"~w~n\",[Bytes]),",nl});
-dbdec(Type) ->
-    demit({"io:format(\"decoding: ",{asis,Type},"~w~n\",[Bytes]),",nl}).
-
-gen_decode_user(Erules,D) when record(D,typedef) ->
-    CurrMod = get(currmod),
-    Typename = [D#typedef.name],
-    Def = D#typedef.typespec,
-    InnerType = asn1ct_gen:get_inner(Def#type.def),
-    case asn1ct_gen:type(InnerType) of
-	{primitive,bif} ->
-	    gen_dec_prim(Erules,Def,"Bytes"),
-	    emit({".",nl,nl});
-	'ASN1_OPEN_TYPE' ->
-	    gen_dec_prim(Erules,Def#type{def='ASN1_OPEN_TYPE'},"Bytes"),
-	    emit({".",nl,nl});
-	{constructed,bif} ->
-	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,D);
-	#typereference{val=Dname} ->
-	    emit({"'dec_",Dname,"'(Bytes,telltype)"}),
-	    emit({".",nl,nl});
-	#'Externaltypereference'{module=CurrMod,type=Etype} ->
-	    emit({"'dec_",Etype,"'(Bytes,telltype).",nl,nl});
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit({"'",Emod,"':'dec_",Etype,"'(Bytes,telltype).",nl,nl});
-	Other ->
-	    exit({error,{asn1,{unknown,Other}}})
-    end.
-
-
-
-gen_dec_prim(_Erules,Att,BytesVar) ->
-    Typename = Att#type.def,
-    Constraint = Att#type.constraint,
-    case Typename of
-	'INTEGER' ->
-	    EffectiveConstr = effective_constraint(integer,Constraint),
-	    emit_dec_integer(EffectiveConstr,BytesVar);
-% 	    emit({"?RT_PER:decode_integer(",BytesVar,",",
-% 		  {asis,EffectiveConstr},")"});
-	{'INTEGER',NamedNumberList} ->
-	    EffectiveConstr = effective_constraint(integer,Constraint),
-	    emit_dec_integer(EffectiveConstr,BytesVar,NamedNumberList);
-% 	    emit({"?RT_PER:decode_integer(",BytesVar,",",
-% 		  {asis,EffectiveConstr},",",
-% 		  {asis,NamedNumberList},")"});
-	{'BIT STRING',NamedNumberList} ->
-	    case get(compact_bit_string) of
-		true ->
-		    emit({"?RT_PER:decode_compact_bit_string(",
-			  BytesVar,",",{asis,Constraint},",",
-			  {asis,NamedNumberList},")"});
-		_ ->
-		    emit({"?RT_PER:decode_bit_string(",BytesVar,",",
-			  {asis,Constraint},",",
-			  {asis,NamedNumberList},")"})
-	    end;
-	'NULL' ->
-	    emit({"?RT_PER:decode_null(",
-		  BytesVar,")"});
-	'OBJECT IDENTIFIER' ->
-	    emit({"?RT_PER:decode_object_identifier(",
-		  BytesVar,")"});
-	'ObjectDescriptor' ->
-	    emit({"?RT_PER:decode_ObjectDescriptor(",
-		  BytesVar,")"});
-	{'ENUMERATED',{NamedNumberList1,NamedNumberList2}} ->
-	    NewTup = {list_to_tuple([X||{X,_} <- NamedNumberList1]),
-		      list_to_tuple([X||{X,_} <- NamedNumberList2])},
-	    NewC = [{'ValueRange',{0,size(element(1,NewTup))-1}}],
-	    emit({"?RT_PER:decode_enumerated(",BytesVar,",",
-		  {asis,NewC},",",
-		  {asis,NewTup},")"});
-	{'ENUMERATED',NamedNumberList} ->
-	    %NewTup = list_to_tuple([X||{X,Y} <- NamedNumberList]),
-	    NewNNL = [X||{X,_} <- NamedNumberList],
-	    NewC = effective_constraint(integer,
-					[{'ValueRange',{0,length(NewNNL)-1}}]),
-	    emit_dec_enumerated(BytesVar,NewC,NewNNL);
-% 	    emit({"?RT_PER:decode_enumerated(",BytesVar,",",
-% 		  {asis,NewC},",",
-% 		  {asis,NewTup},")"});
-	'BOOLEAN'->
-	    emit({"?RT_PER:decode_boolean(",BytesVar,")"});
-	'OCTET STRING' ->
-	    emit_dec_octet_string(Constraint,BytesVar);
-% 	    emit({"?RT_PER:decode_octet_string(",BytesVar,",",
-% 		  {asis,Constraint},")"});
-	'NumericString' ->
-	    emit_dec_known_multiplier_string('NumericString',
-					     Constraint,BytesVar);
-%	    emit({"?RT_PER:decode_NumericString(",BytesVar,",",
-%		  {asis,Constraint},")"});
-	'TeletexString' ->
-	    emit({"?RT_PER:decode_TeletexString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'VideotexString' ->
-	    emit({"?RT_PER:decode_VideotexString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'UTCTime' ->
-	    emit_dec_known_multiplier_string('VisibleString',
-					     Constraint,BytesVar);
-% 	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
-% 		  {asis,Constraint},")"});
-	'GeneralizedTime' ->
-	    emit_dec_known_multiplier_string('VisibleString',
-					     Constraint,BytesVar);
-% 	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
-% 		  {asis,Constraint},")"});
-	'GraphicString' ->
-	    emit({"?RT_PER:decode_GraphicString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'VisibleString' ->
-	    emit_dec_known_multiplier_string('VisibleString',
-					     Constraint,BytesVar);
-%	    emit({"?RT_PER:decode_VisibleString(",BytesVar,",",
-%		  {asis,Constraint},")"});
-	'GeneralString' ->
-	    emit({"?RT_PER:decode_GeneralString(",BytesVar,",",
-		  {asis,Constraint},")"});
-	'PrintableString' ->
-	    emit_dec_known_multiplier_string('PrintableString',
-					     Constraint,BytesVar);
-%	    emit({"?RT_PER:decode_PrintableString(",BytesVar,",",{asis,Constraint},")"});
-	'IA5String' ->
-	    emit_dec_known_multiplier_string('IA5String',Constraint,BytesVar);
-%	    emit({"?RT_PER:decode_IA5String(",BytesVar,",",{asis,Constraint},")"});
-	'BMPString' ->
-	    emit_dec_known_multiplier_string('BMPString',Constraint,BytesVar);
-%	    emit({"?RT_PER:decode_BMPString(",BytesVar,",",{asis,Constraint},")"});
-	'UniversalString' ->
-	    emit_dec_known_multiplier_string('UniversalString',
-					     Constraint,BytesVar);
-%	    emit({"?RT_PER:decode_UniversalString(",BytesVar,",",{asis,Constraint},")"});
-	'ANY' ->
-	    emit(["?RT_PER:decode_open_type(",BytesVar,",", 
-		  {asis,Constraint}, ")"]); 
-	'ASN1_OPEN_TYPE' ->
-	    case Constraint of
-		[#'Externaltypereference'{type=Tname}] ->
-		    emit(["fun(FBytes) ->",nl,
-			  "   {XTerm,XBytes} = "]),
-		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
-		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
-		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
-		[#type{def=#'Externaltypereference'{type=Tname}}] ->
-		    emit(["fun(FBytes) ->",nl,
-			  "   {XTerm,XBytes} = "]),
-		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
-		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
-		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
-		_ ->
-		    emit(["?RT_PER:decode_open_type(",BytesVar,",[])"])
-	    end;
-	Other ->
-	    exit({'cant decode' ,Other})
-    end.
-
-
-emit_dec_integer(C,BytesVar,NNL) ->
-    asn1ct_name:new(tmpterm),
-    asn1ct_name:new(buffer),
-    Tmpterm = asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
-    Buffer = asn1ct_gen:mk_var(asn1ct_name:curr(buffer)),
-    emit({" begin {",{curr,tmpterm},",",{curr,buffer},"} = ",nl}),
-    emit_dec_integer(C,BytesVar),
-    emit({",",nl," case ",Tmpterm," of",nl}),
-    lists:map(fun({Name,Int})->emit({"   ",Int," -> {",{asis,Name},",",
-				     Buffer,"};",nl});
-		 (_)-> exit({error,{asn1,{"error in named number list",NNL}}})
-	      end,
-	      NNL),
-    emit({"   _ -> {",Tmpterm,",",Buffer,"}",nl}),
-    emit({" end",nl}), % end of case
-    emit(" end"). % end of begin
-
-emit_dec_integer([{'SingleValue',Int}],BytesVar) when integer(Int) -> 
-    emit(["{",Int,",",BytesVar,"}"]);
-emit_dec_integer([{_,{Lb,_Ub},_Range,{BitsOrOctets,N}}],BytesVar) ->
-    GetBorO = 
-	case BitsOrOctets of
-	    bits -> "getbits";
-	    _ -> "getoctets"
-	end,
-    asn1ct_name:new(tmpterm),
-    asn1ct_name:new(tmpremain),
-    emit({"  begin",nl,"    {",{curr,tmpterm},",",{curr,tmpremain},"}=",
-	  "?RT_PER:",GetBorO,"(",BytesVar,",",N,"),",nl}),
-    emit({"    {",{curr,tmpterm},"+",Lb,",",{curr,tmpremain},"}",nl,
-	  "  end"});
-emit_dec_integer([{_,{'MIN',_}}],BytesVar) ->
-    emit({"?RT_PER:decode_unconstrained_number(",BytesVar,")"});
-emit_dec_integer([{_,{Lb,'MAX'}}],BytesVar) ->
-    emit({"?RT_PER:decode_semi_constrained_number(",BytesVar,",",Lb,")"});
-emit_dec_integer([{'ValueRange',VR={Lb,Ub}}],BytesVar) ->
-    Range = Ub-Lb+1,
-     emit({"?RT_PER:decode_constrained_number(",BytesVar,",",
-	   {asis,VR},",",Range,")"});
-emit_dec_integer(C=[{Rc,_}],BytesVar) when tuple(Rc) ->
-    emit({"?RT_PER:decode_integer(",BytesVar,",",{asis,C},")"});
-emit_dec_integer(_,BytesVar) ->
-    emit({"?RT_PER:decode_unconstrained_number(",BytesVar,")"}).
-    
-
-emit_dec_enumerated(BytesVar,C,NamedNumberList) ->
-    emit_dec_enumerated_begin(),% emits a begin if component
-    asn1ct_name:new(tmpterm),
-    Tmpterm = asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
-    asn1ct_name:new(tmpremain),
-    Tmpremain = asn1ct_gen:mk_var(asn1ct_name:curr(tmpremain)),
-    emit({"    {",{curr,tmpterm},",",{curr,tmpremain},"} =",nl}),
-    emit_dec_integer(C,BytesVar),
-    emit({",",nl,"    case ",Tmpterm," of "}),
-%    Cases=lists:flatten(dec_enumerated_cases(NamedNumberList,asn1ct_gen:mk_var(asn1ct_name:curr(tmpremain)),0)),
-    Cases=lists:flatten(dec_enumerated_cases(NamedNumberList,Tmpremain,0)),
-    emit({Cases++"_->exit({error,{asn1,{decode_enumerated,{",Tmpterm,
-	  ",",{asis,NamedNumberList},"}}}}) end",nl}),
-    emit_dec_enumerated_end().
-	     
-emit_dec_enumerated_begin() ->
-    case get(component_type) of
-	{true,_} ->
-	    emit({"  begin",nl});
-	_ -> ok
-    end.
-
-emit_dec_enumerated_end() ->
-    case get(component_type) of
-	{true,_} ->
-	    emit("  end");
-	_ -> ok
-    end.
-
-% dec_enumerated_cases(NNL,Tmpremain,No) ->
-%     Cases=dec_enumerated_cases1(NNL,Tmpremain,0),
-%     lists:flatten(io_lib:format("(case ~s "++Cases++
-% 		  "~s when atom(~s)->exit({error,{asn1,{namednumber,~s}}});_->~s end)",[Value,"TmpVal","TmpVal","TmpVal",Value])).
-
-dec_enumerated_cases([Name|Rest],Tmpremain,No) ->
-    io_lib:format("~w->{~w,~s};",[No,Name,Tmpremain])++
-	dec_enumerated_cases(Rest,Tmpremain,No+1);
-dec_enumerated_cases([],_,_) ->
-    "".
-
-
-% more_genfields(_Fields,[]) ->
-%     false;
-% more_genfields(Fields,[{FieldName,_}|T]) ->
-%     case is_typefield(Fields,FieldName) of
-% 	true -> true;
-% 	{false,objectfield} -> true;
-% 	{false,_} -> more_genfields(Fields,T)
-%     end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_name.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_name.erl
deleted file mode 100644
index 03252bd7d9..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_name.erl
+++ /dev/null
@@ -1,225 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_name.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
--module(asn1ct_name).
-
-%%-compile(export_all).
--export([name_server_loop/1,
-	 start/0,
-	 stop/0,
-	 push/1,
-	 pop/1,
-	 curr/1,
-	 clear/0,
-	 delete/1,
-	 active/1,
-	 prev/1,
-	 next/1,
-	 all/1,
-	 new/1]).
-
-start() ->
-    start_server(asn1_ns, asn1ct_name,name_server_loop,[[]]).
-
-stop() -> stop_server(asn1_ns).
-
-name_server_loop(Vars) ->
-%%    io:format("name -- ~w~n",[Vars]),
-    receive
-	{From,{current,Variable}} ->
-	    From ! {asn1_ns,get_curr(Vars,Variable)},
-	    name_server_loop(Vars);
-	{From,{pop,Variable}} ->
-	    From ! {asn1_ns,done},
-	    name_server_loop(pop_var(Vars,Variable));
-	{From,{push,Variable}} ->
-	    From ! {asn1_ns,done},
-	    name_server_loop(push_var(Vars,Variable));
-	{From,{delete,Variable}} ->
-	    From ! {asn1_ns,done},
-	    name_server_loop(delete_var(Vars,Variable));
-	{From,{new,Variable}} ->
-	    From ! {asn1_ns,done},
-	    name_server_loop(new_var(Vars,Variable));
-	{From,{prev,Variable}} ->
-	    From ! {asn1_ns,get_prev(Vars,Variable)},
-	    name_server_loop(Vars);
-	{From,{next,Variable}} ->
-	    From ! {asn1_ns,get_next(Vars,Variable)},
-	    name_server_loop(Vars);
-	{From,stop} ->
-	    From ! {asn1_ns,stopped},
-	    exit(normal)
-    end.
-
-active(V) ->
-    case curr(V) of
-	nil -> false;
-	_ -> true
-    end.
-
-req(Req) ->
-    asn1_ns ! {self(), Req},
-    receive {asn1_ns, Reply} -> Reply end.
-
-pop(V) ->     req({pop,V}).
-push(V) ->         req({push,V}).
-clear() ->     req(stop), start().
-curr(V) ->     req({current,V}).
-new(V) ->      req({new,V}).
-delete(V) ->   req({delete,V}).
-prev(V) ->
-    case req({prev,V}) of
-	none ->
-	    exit('cant get prev of none');
-	Rep -> Rep
-    end.
-
-next(V) ->
-    case req({next,V}) of
-	none ->
-	    exit('cant get next of none');
-	Rep -> Rep
-    end.
-    
-all(V) ->
-    Curr = curr(V),
-    if Curr == V -> [];
-	true ->
-	    lists:reverse(generate(V,last(Curr),[],0))
-    end.
-
-generate(V,Number,Res,Pos) ->
-    Ell = Pos+1,
-    if
-	Ell > Number ->
-	    Res;
-	true ->
-	    generate(V,Number,[list_to_atom(lists:concat([V,Ell]))|Res],Ell)
-    end.
-		
-last(V) ->
-    last2(lists:reverse(atom_to_list(V))).
-
-last2(RevL) ->
-    list_to_integer(lists:reverse(get_digs(RevL))).
-    
-    
-get_digs([H|T]) ->
-    if
-	H < $9+1,
-	H > $0-1 ->
-	    [H|get_digs(T)];
-	true ->
-	    []
-    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) ->
-    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.
-
-delete_var(Vars,Variable) ->
-    case lists:keysearch(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
-    end.
-
-get_prev(Vars,Variable) ->
-    case lists:keysearch(Variable,1,Vars) of
-	false ->
-	    none;
-	{value,{Variable,[Digit|_]}} when Digit =< 1 ->
-	    Variable;
-	{value,{Variable,[Digit|_]}} when Digit > 1 ->
-	    list_to_atom(lists:concat([Variable,
-				       integer_to_list(Digit-1)]));
-	_ ->
-	    none
-    end.
-
-get_next(Vars,Variable) ->
-    case lists:keysearch(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
-    end.
-
-
-stop_server(Name) ->
-    stop_server(Name, whereis(Name)).
-stop_server(_Name, undefined) -> stopped;
-stop_server(Name, _Pid) ->
-    Name  ! {self(), stop},
-    receive {Name, _} -> stopped end.
-
-
-start_server(Name,Mod,Fun,Args) ->	
-    case whereis(Name) of
-	undefined ->
-	    register(Name, spawn(Mod,Fun, Args));
-	_Pid ->
-	    already_started
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_parser.yrl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_parser.yrl
deleted file mode 100644
index df74685cb7..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_parser.yrl
+++ /dev/null
@@ -1,1175 +0,0 @@
-%% ``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 via the world wide web 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.

-%% 

-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.

-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings

-%% AB. All Rights Reserved.''

-%% 

-%%     $Id: asn1ct_parser.yrl,v 1.1 2008/12/17 09:53:30 mikpe Exp $

-%%

-Nonterminals

-ModuleDefinition ModuleIdentifier DefinitiveIdentifier DefinitiveObjIdComponentList

-DefinitiveObjIdComponent TagDefault ExtensionDefault 

-ModuleBody Exports SymbolsExported Imports SymbolsImported

-SymbolsFromModuleList SymbolsFromModule GlobalModuleReference AssignedIdentifier SymbolList

-Symbol Reference AssignmentList Assignment 

-ExtensionAndException

-ComponentTypeLists

-Externaltypereference Externalvaluereference DefinedType DefinedValue 

-AbsoluteReference ItemSpec ItemId ComponentId TypeAssignment

-ValueAssignment 

-% ValueSetTypeAssignment 

-ValueSet 

-Type BuiltinType NamedType ReferencedType

-Value ValueNotNull BuiltinValue ReferencedValue NamedValue 

-% BooleanType

-BooleanValue IntegerType NamedNumberList NamedNumber SignedNumber 

-% inlined IntegerValue 

-EnumeratedType

-% inlined Enumerations 

-Enumeration EnumerationItem 

-% inlined EnumeratedValue

-% RealType

-RealValue NumericRealValue SpecialRealValue BitStringType 

-% inlined BitStringValue

-IdentifierList 

-% OctetStringType 

-% inlined OctetStringValue 

-% NullType NullValue

-SequenceType ComponentTypeList ComponentType 

-% SequenceValue SequenceOfValue

-ComponentValueList SequenceOfType

-SAndSOfValue ValueList SetType 

-% SetValue SetOfValue 

-SetOfType 

-ChoiceType 

-% AlternativeTypeList made common with ComponentTypeList

-ChoiceValue

-AnyValue

-AnyDefBy

-SelectionType 

-TaggedType Tag ClassNumber Class 

-% redundant TaggedValue

-% EmbeddedPDVType EmbeddedPDVValue ExternalType ExternalValue ObjectIdentifierType

-ObjectIdentifierValue ObjIdComponentList ObjIdComponent 

-% NameForm NumberForm NameAndNumberForm 

-CharacterStringType

-RestrictedCharacterStringValue CharacterStringList 

-% CharSyms CharsDefn 

-Quadruple

-% Group Plane Row Cell

-Tuple

-% TableColumn TableRow

-% UnrestrictedCharacterString

-CharacterStringValue 

-% UnrestrictedCharacterStringValue

-ConstrainedType Constraint ConstraintSpec TypeWithConstraint

-ElementSetSpecs ElementSetSpec 

-%GeneralConstraint

-UserDefinedConstraint UserDefinedConstraintParameter 

-UserDefinedConstraintParameters

-ExceptionSpec

-ExceptionIdentification

-Unions

-UnionMark

-UElems

-Intersections

-IntersectionElements

-IntersectionMark

-IElems

-Elements

-Elems

-SubTypeElements

-Exclusions

-LowerEndpoint

-UpperEndpoint

-LowerEndValue

-UpperEndValue

-TypeConstraints NamedConstraint PresenceConstraint

-

-ParameterizedTypeAssignment

-ParameterList

-Parameters

-Parameter

-ParameterizedType

-

-% X.681

-ObjectClassAssignment ObjectClass ObjectClassDefn 

-FieldSpecs FieldSpec OptionalitySpec WithSyntaxSpec

-TokenOrGroupSpecs TokenOrGroupSpec

-SyntaxList OptionalGroup RequiredToken Word

-TypeOptionalitySpec

-ValueOrObjectOptSpec

-VSetOrOSetOptSpec

-ValueOptionalitySpec

-ObjectOptionalitySpec

-ValueSetOptionalitySpec

-ObjectSetOptionalitySpec

-% X.681 chapter 15

-InformationFromObjects

-ValueFromObject

-%ValueSetFromObjects

-TypeFromObject

-%ObjectFromObject

-%ObjectSetFromObjects

-ReferencedObjects

-FieldName

-PrimitiveFieldName

-

-ObjectAssignment

-ObjectSetAssignment

-ObjectSet

-ObjectSetElements

-Object

-ObjectDefn

-DefaultSyntax

-DefinedSyntax

-FieldSettings

-FieldSetting

-DefinedSyntaxTokens

-DefinedSyntaxToken

-Setting

-DefinedObject

-ObjectFromObject

-ObjectSetFromObjects

-ParameterizedObject

-ExternalObjectReference

-DefinedObjectSet

-DefinedObjectClass

-ExternalObjectClassReference

-

-% X.682

-TableConstraint

-ComponentRelationConstraint

-ComponentIdList

-

-% X.683

-ActualParameter

-.

-

-%UsefulType. 

-

-Terminals

-'ABSENT' 'ABSTRACT-SYNTAX' 'ALL' 'ANY'

-'APPLICATION' 'AUTOMATIC' 'BEGIN' 'BIT'

-'BOOLEAN' 'BY' 'CHARACTER' 'CHOICE' 'CLASS' 'COMPONENT'

-'COMPONENTS' 'CONSTRAINED' 'DEFAULT' 'DEFINED' 'DEFINITIONS'

-'EMBEDDED' 'END' 'ENUMERATED' 'EXCEPT' 'EXPLICIT'

-'EXPORTS' 'EXTENSIBILITY' 'EXTERNAL' 'FALSE' 'FROM' 'GeneralizedTime' 

-'TYPE-IDENTIFIER' 

-'IDENTIFIER' 'IMPLICIT' 'IMPLIED' 'IMPORTS'

-'INCLUDES' 'INSTANCE' 'INTEGER' 'INTERSECTION'

-'MAX' 'MIN' 'MINUS-INFINITY' 'NULL'

-'OBJECT' 'ObjectDescriptor' 'OCTET' 'OF' 'OPTIONAL' 'PDV' 'PLUS-INFINITY'

-'PRESENT' 'PRIVATE' 'REAL' 'SEQUENCE' 'SET' 'SIZE'

-'STRING' 'SYNTAX' 'TAGS' 'TRUE' 'UNION'

-'UNIQUE' 'UNIVERSAL' 'UTCTime' 'WITH'

-'{' '}' '(' ')' '.' '::=' ';' ',' '@' '*' '-' '[' ']'

-'!' '..' '...' '|' '<' ':' '^'

-number identifier typereference restrictedcharacterstringtype 

-bstring hstring cstring typefieldreference valuefieldreference

-objectclassreference word.

-

-Rootsymbol ModuleDefinition.

-Endsymbol '$end'.

-

-Left 300 'EXCEPT'.

-Left 200 '^'.

-Left 200 'INTERSECTION'.

-Left 100 '|'.

-Left 100 'UNION'.

-

-

-ModuleDefinition -> ModuleIdentifier

-	'DEFINITIONS'

-	TagDefault

-	ExtensionDefault

-	'::='

-	'BEGIN'

-	ModuleBody

-	'END' : 

-		{'ModuleBody',Ex,Im,Types} = '$7',

-		{{typereference,Pos,Name},Defid} = '$1',

-		#module{

-			pos= Pos,

-			name= Name,

-			defid= Defid,

-			tagdefault='$3',

-			extensiondefault='$4',

-			exports=Ex,

-			imports=Im,

-			typeorval=Types}.

-%	{module, '$1','$3','$6'}.

-% Results always in a record of type module defined in asn_records.hlr

-

-ModuleIdentifier -> typereference DefinitiveIdentifier : 

-	put(asn1_module,'$1'#typereference.val),

-	{'$1','$2'}.

-

-DefinitiveIdentifier -> '{' DefinitiveObjIdComponentList '}' : '$2' .

-DefinitiveIdentifier -> '$empty': [].

-

-DefinitiveObjIdComponentList -> DefinitiveObjIdComponent : ['$1'].

-DefinitiveObjIdComponentList -> DefinitiveObjIdComponent DefinitiveObjIdComponentList : ['$1'|'$2'].

-

-DefinitiveObjIdComponent -> identifier : '$1' . %expanded->

-% DefinitiveObjIdComponent -> NameForm : '$1' . 

-DefinitiveObjIdComponent -> number : '$1' . %expanded->

-% DefinitiveObjIdComponent -> DefinitiveNumberForm : 'fix' . 

-DefinitiveObjIdComponent -> identifier '(' number ')' : {'$1','$3'} . %expanded->

-% DefinitiveObjIdComponent -> DefinitiveNameAndNumberForm  : {'$1','$3'} .

-

-% DefinitiveNumberForm -> number : 'fix' .

- 

-% DefinitiveNameAndNumberForm -> identifier '(' DefinitiveNumberForm ')' : 'fix' .

- 

-TagDefault -> 'EXPLICIT' 'TAGS' : put(tagdefault,'EXPLICIT'),'EXPLICIT' .

-TagDefault -> 'IMPLICIT' 'TAGS' : put(tagdefault,'IMPLICIT'),'IMPLICIT' .

-TagDefault -> 'AUTOMATIC' 'TAGS' : put(tagdefault,'AUTOMATIC'),'AUTOMATIC' .

-TagDefault -> '$empty': put(tagdefault,'EXPLICIT'),'EXPLICIT'. % because this is the default

-

-ExtensionDefault -> 'EXTENSIBILITY' 'IMPLIED' : 'IMPLIED'.

-ExtensionDefault -> '$empty' : 'false'. % because this is the default

-

-ModuleBody -> Exports Imports AssignmentList : {'ModuleBody','$1','$2','$3'}.

-ModuleBody -> '$empty' : {'ModuleBody',nil,nil,[]}.

-

-Exports -> 'EXPORTS' SymbolList ';' : {exports,'$2'}.

-Exports -> 'EXPORTS'  ';' : {exports,[]}.

-Exports -> '$empty' : {exports,all} .

-

-% inlined above SymbolsExported -> SymbolList : '$1'.

-% inlined above SymbolsExported -> '$empty' : [].

-

-Imports -> 'IMPORTS' SymbolsFromModuleList ';' : {imports,'$2'}.

-Imports -> 'IMPORTS'  ';' : {imports,[]}.

-Imports -> '$empty' : {imports,[]} .

-

-% inlined above SymbolsImported -> SymbolsFromModuleList : '$1'.

-% inlined above SymbolsImported -> '$empty' : [].

-

-SymbolsFromModuleList -> SymbolsFromModule :['$1'].

-% SymbolsFromModuleList -> SymbolsFromModuleList SymbolsFromModule :$1.%changed

-SymbolsFromModuleList -> SymbolsFromModule SymbolsFromModuleList :['$1'|'$2'].

-

-% expanded SymbolsFromModule -> SymbolList 'FROM' GlobalModuleReference : #'SymbolsFromModule'{symbols = '$1',module='$3'}.

-SymbolsFromModule -> SymbolList 'FROM' typereference : #'SymbolsFromModule'{symbols = '$1',module='$3'}.

-SymbolsFromModule -> SymbolList 'FROM' typereference '{' ValueList '}': #'SymbolsFromModule'{symbols = '$1',module='$3'}.

-%SymbolsFromModule -> SymbolList 'FROM' typereference identifier: #'SymbolsFromModule'{symbols = '$1',module='$3'}.

-%SymbolsFromModule -> SymbolList 'FROM' typereference Externalvaluereference: #'SymbolsFromModule'{symbols = '$1',module='$3'}.

-%SymbolsFromModule -> SymbolList 'FROM' typereference DefinedValue: #'SymbolsFromModule'{symbols = '$1',module='$3'}.

-

-% inlined GlobalModuleReference -> typereference AssignedIdentifier : {'$1','$2'} .

-

-% inlined above AssignedIdentifier -> '{' ValueList '}' : '$2'.

-% replaced AssignedIdentifier -> '{' DefinedValue ObjIdComponentList '}' :{'$2','$3'}.

-% not necessary , replaced by SAndSOfValue AssignedIdentifier -> ObjectIdentifierValue :'$1'.

-% AssignedIdentifier -> DefinedValue : '$1'. 

-% inlined AssignedIdentifier -> '$empty' : undefined.

-

-SymbolList -> Symbol : ['$1'].

-SymbolList -> Symbol ',' SymbolList :['$1'|'$3'].

-

-Symbol -> Reference :'$1'.

-% later Symbol -> ParameterizedReference :'$1'.

-

-Reference -> typereference :'$1'.

-Reference -> identifier:'$1'.

-Reference -> typereference '{' '}':'$1'.

-Reference -> Externaltypereference '{' '}':'$1'.

-

-% later Reference -> objectclassreference :'$1'.

-% later Reference -> objectreference :'$1'.

-% later Reference -> objectsetreference :'$1'.

-

-AssignmentList -> Assignment : ['$1'].

-% modified AssignmentList -> AssignmentList Assignment : '$1'.

-AssignmentList -> Assignment AssignmentList : ['$1'|'$2'].

-

-Assignment -> TypeAssignment : '$1'.

-Assignment -> ValueAssignment : '$1'.

-% later Assignment -> ValueSetTypeAssignment : '$1'.

-Assignment -> ObjectClassAssignment : '$1'.

-% later Assignment -> ObjectAssignment : '$1'.

-% combined with ValueAssignment Assignment -> ObjectAssignment : '$1'.

-Assignment -> ObjectSetAssignment : '$1'.

-Assignment -> ParameterizedTypeAssignment : '$1'.

-%Assignment -> ParameterizedValueAssignment : '$1'.

-%Assignment -> ParameterizedValueSetTypeAssignment : '$1'.

-%Assignment -> ParameterizedObjectClassAssignment : '$1'.

-

-ObjectClassAssignment -> typereference '::=' 'CLASS' '{' FieldSpecs '}' :

-%ObjectClassAssignment -> objectclassreference '::=' 'CLASS' '{' FieldSpecs '}' :

-	#typedef{pos=element(2,'$1'),name=element(3,'$1'),typespec={'CLASS','$5',[]}}.

-ObjectClassAssignment -> typereference '::=' 'CLASS' '{' FieldSpecs '}' WithSyntaxSpec :

-%ObjectClassAssignment -> objectclassreference '::=' 'CLASS' '{' FieldSpecs '}' WithSyntaxSpec :

-	#typedef{pos=element(2,'$1'),name=element(3,'$1'),typespec={'CLASS','$5','$7'}}.

-

-FieldSpecs -> FieldSpec : ['$1'].

-FieldSpecs -> FieldSpec ',' FieldSpecs : ['$1'|'$3'].

-

-FieldSpec -> typefieldreference TypeOptionalitySpec : {typefield,'$1','$2'}.

-

-FieldSpec -> valuefieldreference Type 'UNIQUE' ValueOrObjectOptSpec : 

-	{fixedtypevaluefield,'$1','$2','UNIQUE','$4'}.

-FieldSpec -> valuefieldreference Type ValueOrObjectOptSpec : 

-	{fixedtypevaluefield,'$1','$2',undefined,'$3'}.

-

-FieldSpec -> valuefieldreference typefieldreference ValueOrObjectOptSpec :

-        {variabletypevaluefield, '$1','$2','$3'}.

-

-FieldSpec -> typefieldreference typefieldreference VSetOrOSetOptSpec : 

-        {variabletypevaluesetfield, '$1','$2','$3'}.

-

-FieldSpec -> typefieldreference Type VSetOrOSetOptSpec :

-        {fixedtypevaluesetfield, '$1','$2','$3'}.

-

-TypeOptionalitySpec -> 'DEFAULT' Type : {'DEFAULT','$2'}.

-TypeOptionalitySpec -> 'OPTIONAL' : 'OPTIONAL'.

-TypeOptionalitySpec -> '$empty' : 'MANDATORY'.

-

-ValueOrObjectOptSpec -> ValueOptionalitySpec : '$1'.

-ValueOrObjectOptSpec -> ObjectOptionalitySpec : '$1'.

-ValueOrObjectOptSpec -> 'OPTIONAL' : 'OPTIONAL'.

-ValueOrObjectOptSpec -> '$empty' : 'MANDATORY'.

-

-ValueOptionalitySpec -> 'DEFAULT' Value :

-	case '$2' of

-	{identifier,_,Id} -> {'DEFAULT',Id};

-	_ -> {'DEFAULT','$2'}

-	end.

-

-%ObjectOptionalitySpec -> 'DEFAULT' Object :{'DEFAULT','$1'}.

-ObjectOptionalitySpec -> 'DEFAULT'  '{' FieldSetting ',' FieldSettings '}' : 

-        {'DEFAULT',{object,['$2'|'$4']}}.

-ObjectOptionalitySpec -> 'DEFAULT'  '{' FieldSetting '}' :

-        {'DEFAULT',{object, ['$2']}}.

-%ObjectOptionalitySpec -> 'DEFAULT'  '{' DefinedSyntaxTokens '}' :

-%        {'DEFAULT',{object, '$2'}}.

-ObjectOptionalitySpec -> 'DEFAULT'  ObjectFromObject :

-        {'DEFAULT',{object, '$2'}}.

-

-

-VSetOrOSetOptSpec -> ValueSetOptionalitySpec : '$1'.

-%VSetOrOSetOptSpec -> ObjectSetOptionalitySpec : '$1'.

-VSetOrOSetOptSpec -> 'OPTIONAL' : 'OPTIONAL'.

-VSetOrOSetOptSpec -> '$empty' : 'MANDATORY'.

-

-ValueSetOptionalitySpec -> 'DEFAULT' ValueSet : {'DEFAULT','$1'}.

-

-%ObjectSetOptionalitySpec -> 'DEFAULT' ObjectSet : {'DEFAULT','$1'}.

-

-OptionalitySpec -> 'DEFAULT' Type : {'DEFAULT','$2'}.

-OptionalitySpec -> 'DEFAULT' ValueNotNull : 

-	case '$2' of

-	{identifier,_,Id} -> {'DEFAULT',Id};

-	_ -> {'DEFAULT','$2'}

-	end.

-OptionalitySpec -> 'OPTIONAL' : 'OPTIONAL'.

-OptionalitySpec -> '$empty' : 'MANDATORY'.

-

-WithSyntaxSpec -> 'WITH' 'SYNTAX' SyntaxList : {'WITH SYNTAX','$3'}.

-

-SyntaxList -> '{' TokenOrGroupSpecs '}' : '$2'.

-SyntaxList -> '{' '}' : [].

-

-TokenOrGroupSpecs -> TokenOrGroupSpec : ['$1'].

-TokenOrGroupSpecs -> TokenOrGroupSpec TokenOrGroupSpecs : ['$1'|'$2'].

-

-TokenOrGroupSpec -> RequiredToken : '$1'.

-TokenOrGroupSpec -> OptionalGroup : '$1'.

-

-OptionalGroup -> '[' TokenOrGroupSpecs ']' : '$2'.

-

-RequiredToken -> typereference : '$1'.

-RequiredToken -> Word : '$1'.

-RequiredToken -> ',' : '$1'.

-RequiredToken -> PrimitiveFieldName : '$1'.

-

-Word -> 'BY' : 'BY'.

- 

-ParameterizedTypeAssignment -> typereference ParameterList '::=' Type : 

-	#ptypedef{pos=element(2,'$1'),name=element(3,'$1'),

-	args='$2', typespec='$4'}.

-

-ParameterList -> '{' Parameters '}':'$2'.

-

-Parameters -> Parameter: ['$1'].

-Parameters -> Parameter ',' Parameters: ['$1'|'$3'].

-

-Parameter -> typereference: '$1'.

-Parameter -> Value: '$1'.

-Parameter -> Type ':' typereference: {'$1','$3'}.

-Parameter -> Type ':' Value: {'$1','$3'}.

-Parameter -> '{' typereference '}': {objectset,'$2'}.

-

-

-% Externaltypereference -> modulereference '.' typereference : {'$1','$3'} .

-Externaltypereference -> typereference '.' typereference : #'Externaltypereference'{pos=element(2,'$1'),module=element(3,'$1'),type=element(3,'$3')}.

-

-% Externalvaluereference -> modulereference '.' valuereference : {'$1','$3'} .

-% inlined Externalvaluereference -> typereference '.' identifier : #'Externalvaluereference'{pos=element(2,'$1'),module=element(3,'$1'),value=element(3,'$3')}.

-

-

-DefinedType -> Externaltypereference : '$1' .

-DefinedType -> typereference : 

-	#'Externaltypereference'{pos='$1'#typereference.pos,

-				module= get(asn1_module), 

-				type= '$1'#typereference.val} .

-DefinedType -> typereference ParameterList : {pt,'$1','$2'}.

-DefinedType -> Externaltypereference ParameterList : {pt,'$1','$2'}.

-

-% ActualParameterList -> '{' ActualParameters '}' : '$1'.

-

-% ActualParameters -> ActualParameter : ['$1']. 

-% ActualParameters -> ActualParameter ',' ActualParameters : ['$1'|'$3'].

-

-ActualParameter -> Type : '$1'. 

-ActualParameter -> ValueNotNull : '$1'. 

-ActualParameter -> ValueSet : '$1'. 

-% later DefinedType -> ParameterizedType : '$1' .

-% later DefinedType -> ParameterizedValueSetType : '$1' .

-

-% inlined DefinedValue -> Externalvaluereference :'$1'.

-% inlined DefinedValue -> identifier :'$1'.

-% later DefinedValue -> ParameterizedValue :'$1'.

-

-% not referenced yet AbsoluteReference -> '@' GlobalModuleReference '.' ItemSpec :{'$2','$4'}.

-

-% not referenced yet ItemSpec -> typereference :'$1'.

-% not referenced yet ItemSpec -> ItemId '.' ComponentId : {'$1','$3'}.

-

-% not referenced yet ItemId -> ItemSpec : '$1'.

-

-% not referenced yet ComponentId -> identifier :'$1'.

-% not referenced yet ComponentId -> number :'$1'.

-% not referenced yet ComponentId -> '*' :'$1'.

-

-TypeAssignment -> typereference '::=' Type :

-	#typedef{pos=element(2,'$1'),name=element(3,'$1'),typespec='$3'}.

-

-ValueAssignment -> identifier Type '::=' Value :

-	#valuedef{pos=element(2,'$1'),name=element(3,'$1'),type='$2',value='$4'}.

-

-% later ValueSetTypeAssignment -> typereference Type '::=' ValueSet :{'ValueSetTypeAssignment','$1','$2','$4'}.

-

-

-ValueSet -> '{' ElementSetSpec '}' : {valueset,'$2'}.

-

-% record(type,{tag,def,constraint}).

-Type -> BuiltinType :#type{def='$1'}.

-Type -> 'NULL' :#type{def='NULL'}.

-Type -> TaggedType:'$1'.

-Type -> ReferencedType:#type{def='$1'}. % change notag later

-Type -> ConstrainedType:'$1'.

-

-%ANY is here for compatibility with the old ASN.1 standard from 1988

-BuiltinType -> 'ANY' AnyDefBy: 

-	case '$2' of

-		[] -> 'ANY';

-	        _ -> {'ANY DEFINED BY','$2'}

-        end.	

-BuiltinType -> BitStringType :'$1'.

-BuiltinType -> 'BOOLEAN' :element(1,'$1').

-BuiltinType -> CharacterStringType :'$1'.

-BuiltinType -> ChoiceType :'$1'.

-BuiltinType -> 'EMBEDDED' 'PDV' :'EMBEDDED PDV'.

-BuiltinType -> EnumeratedType :'$1'.

-BuiltinType -> 'EXTERNAL' :element(1,'$1').

-% later BuiltinType -> InstanceOfType :'$1'.

-BuiltinType -> IntegerType :'$1'.

-% BuiltinType -> 'NULL' :element(1,'$1').

-% later BuiltinType -> ObjectClassFieldType :'$1'.

-BuiltinType -> 'OBJECT' 'IDENTIFIER' :'OBJECT IDENTIFIER'.

-BuiltinType -> 'OCTET' 'STRING' :'OCTET STRING'.

-BuiltinType -> 'REAL' :element(1,'$1').

-BuiltinType -> SequenceType :'$1'.

-BuiltinType -> SequenceOfType :'$1'.

-BuiltinType -> SetType :'$1'.

-BuiltinType -> SetOfType :'$1'.

-% The so called Useful types

-BuiltinType -> 'GeneralizedTime': 'GeneralizedTime'.

-BuiltinType -> 'UTCTime' :'UTCTime'.

-BuiltinType -> 'ObjectDescriptor' : 'ObjectDescriptor'.

-

-% moved BuiltinType -> TaggedType :'$1'.

-

-

-AnyDefBy -> 'DEFINED' 'BY' identifier: '$3'.

-AnyDefBy -> '$empty': [].

-

-NamedType -> identifier Type :

-%{_,Pos,Val} = '$1',

-%{'NamedType',Pos,{Val,'$2'}}.

-V1 = '$1', 

-{'NamedType',V1#identifier.pos,{V1#identifier.val,'$2'}}.

-NamedType -> SelectionType :'$1'.

-

-ReferencedType -> DefinedType : '$1'.

-% redundant ReferencedType -> UsefulType : 'fix'.

-ReferencedType -> SelectionType : '$1'.

-ReferencedType -> TypeFromObject : '$1'.

-% later ReferencedType -> ValueSetFromObjects : 'fix'.

-

-% to much conflicts Value -> AnyValue :'$1'.

-Value -> ValueNotNull : '$1'.

-Value -> 'NULL' :element(1,'$1').

-

-ValueNotNull -> BuiltinValue :'$1'.

-% inlined Value -> DefinedValue :'$1'. % DefinedValue , identifier

-% inlined Externalvaluereference -> Externalvaluereference :'$1'.

-ValueNotNull -> typereference '.' identifier : 

-	#'Externalvaluereference'{pos=element(2,'$1'),module=element(3,'$1'),

-	value=element(3,'$3')}.

-ValueNotNull -> identifier :'$1'.

-

-

-%tmp Value -> NamedNumber: '$1'. % not a value but part of ObjIdC

-% redundant BuiltinValue -> BitStringValue :'$1'.

-BuiltinValue -> BooleanValue :'$1'.

-BuiltinValue -> CharacterStringValue :'$1'.

-BuiltinValue -> ChoiceValue :'$1'.

-% BuiltinValue -> EmbeddedPDVValue :'$1'. ==SequenceValue

-% BuiltinValue -> EnumeratedValue :'$1'. identifier

-% BuiltinValue -> ExternalValue :'$1'. ==SequenceValue

-% later BuiltinValue -> InstanceOfValue :'$1'.

-BuiltinValue -> SignedNumber :'$1'.

-% BuiltinValue -> 'NULL' :'$1'.

-% later BuiltinValue -> ObjectClassFieldValue :'$1'.

-% replaced by SAndSOfValue BuiltinValue -> ObjectIdentifierValue :'$1'.

-BuiltinValue -> bstring :element(3,'$1').

-BuiltinValue -> hstring :element(3,'$1').

-% conflict BuiltinValue -> RealValue :'$1'.

-BuiltinValue -> SAndSOfValue :'$1'.

-% replaced BuiltinValue -> SequenceOfValue :'$1'.

-% replaced BuiltinValue -> SequenceValue :'$1'.

-% replaced BuiltinValue -> SetValue :'$1'.

-% replaced BuiltinValue -> SetOfValue :'$1'.

-% conflict redundant BuiltinValue -> TaggedValue :'$1'.

-

-% inlined ReferencedValue -> DefinedValue:'$1'.

-% ReferencedValue -> Externalvaluereference:'$1'.

-% ReferencedValue -> identifier :'$1'. 

-% later ReferencedValue -> ValueFromObject:'$1'.

-

-% inlined BooleanType -> BOOLEAN :'BOOLEAN'.

-

-% to much conflicts AnyValue -> Type ':' Value : {'ANYVALUE',{'$1','$3'}}.

-

-BooleanValue -> TRUE :true.

-BooleanValue -> FALSE :false.

-

-IntegerType -> 'INTEGER' : 'INTEGER'.

-IntegerType -> 'INTEGER' '{' NamedNumberList '}' : {'INTEGER','$3'}.

-

-NamedNumberList -> NamedNumber :['$1'].

-% modified NamedNumberList -> NamedNumberList ',' NamedNumber :'fix'.

-NamedNumberList -> NamedNumber ',' NamedNumberList :['$1'|'$3'].

-

-NamedNumber -> identifier '(' SignedNumber ')' : {'NamedNumber',element(3,'$1'),'$3'}.

-NamedNumber -> identifier '(' typereference '.' identifier ')' : {'NamedNumber',element(3,'$1'),{'ExternalValue',element(3,'$3'),element(3,'$5')}}.

-NamedNumber -> identifier '(' identifier ')' : {'NamedNumber',element(3,'$1'),element(3,'$3')}.

-

-%NamedValue -> identifier Value : 

-%	{'NamedValue',element(2,'$1'),element(3,'$1'),'$2'}.

-

-

-SignedNumber -> number : element(3,'$1').

-SignedNumber -> '-' number : - element(3,'$1').

-

-% inlined IntegerValue -> SignedNumber :'$1'.

-% conflict moved to Value IntegerValue -> identifier:'$1'.

-

-EnumeratedType -> ENUMERATED '{' Enumeration '}' :{'ENUMERATED','$3'}.

-

-% inlined Enumerations -> Enumeration :{'$1','false',[]}.

-% inlined Enumerations -> Enumeration ',' '...' : {'$1','true',[]}.

-% inlined Enumerations -> Enumeration ',' '...' ',' Enumeration : {'$1','true','$5'}.

-

-Enumeration -> EnumerationItem :['$1'].

-% modified Enumeration -> EnumerationItem ',' Enumeration :'fix'.

-Enumeration -> EnumerationItem ',' Enumeration :['$1'|'$3'].

-

-EnumerationItem -> identifier:element(3,'$1').

-EnumerationItem -> NamedNumber :'$1'.

-EnumerationItem -> '...' :'EXTENSIONMARK'.

-

-% conflict moved to Value EnumeratedValue -> identifier:'$1'.

-

-% inlined RealType -> REAL:'REAL'.

-

-RealValue -> NumericRealValue :'$1'.

-RealValue -> SpecialRealValue:'$1'.

-

-% ?? NumericRealValue -> number:'$1'. % number MUST BE '0'

-NumericRealValue -> SAndSOfValue : '$1'. % Value of the associated sequence type

-

-SpecialRealValue -> 'PLUS-INFINITY' :'$1'.

-SpecialRealValue -> 'MINUS-INFINITY' :'$1'.

-

-BitStringType -> 'BIT' 'STRING' :{'BIT STRING',[]}.

-BitStringType -> 'BIT' 'STRING' '{' NamedNumberList '}' :{'BIT STRING','$4'}.

-% NamedBitList replaced by NamedNumberList to reduce the grammar

-% Must check later that all "numbers" are positive

-

-% inlined BitStringValue -> bstring:'$1'.

-% inlined BitStringValue -> hstring:'$1'.

-% redundant use SequenceValue BitStringValue -> '{' IdentifierList '}' :$2.

-% redundant use SequenceValue BitStringValue -> '{' '}' :'fix'.

-

-IdentifierList -> identifier :[element(3,'$1')].

-% modified IdentifierList -> IdentifierList ',' identifier :'$1'.

-IdentifierList -> identifier ',' IdentifierList :[element(3,'$1')|'$3'].

-

-% inlined OctetStringType -> 'OCTET' 'STRING' :'OCTET STRING'.

-

-% inlined OctetStringValue -> bstring:'$1'.

-% inlined OctetStringValue -> hstring:'$1'.

-

-% inlined NullType -> 'NULL':'NULL'.

-

-% inlined NullValue -> NULL:'NULL'.

-

-% result is {'SEQUENCE',Optionals,Extensionmark,Componenttypelist}.

-SequenceType -> SEQUENCE '{' ComponentTypeList '}' :{'SEQUENCE','$3'}.

-% SequenceType -> SEQUENCE '{' ComponentTypeLists '}' :{'SEQUENCE','$3'}.

-% SequenceType -> SEQUENCE '{' ExtensionAndException '}' :{'SEQUENCE','$3'}.

-SequenceType -> SEQUENCE '{' '}' :{'SEQUENCE',[]}.

-

-% result is {RootComponentList,ExtensionAndException,AdditionalComponentTypeList}.

-%ComponentTypeLists -> ComponentTypeList ',' ExtensionAndException :{'$1','$3',[]}.

-%ComponentTypeLists -> ComponentTypeList :{'$1','false',[]}.

-%ComponentTypeLists -> ComponentTypeList ',' ExtensionAndException 

-%	',' ComponentTypeList :{'$1','$3', '$5'}.

-%ComponentTypeLists -> ExtensionAndException ',' ComponentTypeList :{[],'$1','$3'}.

-

-ComponentTypeList -> ComponentType :['$1'].

-% modified below ComponentTypeList -> ComponentTypeList ',' ComponentType :'$1'.

-ComponentTypeList -> ComponentType ',' ComponentTypeList  :['$1'|'$3'].

-

-% -record('ComponentType',{pos,name,type,attrib}).

-ComponentType -> '...' ExceptionSpec :{'EXTENSIONMARK',element(2,'$1'),'$2'}.

-ComponentType -> NamedType :

-	{'NamedType',Pos,{Name,Type}} = '$1',

-	#'ComponentType'{pos=Pos,name=Name,typespec=Type,prop=mandatory}.

-ComponentType -> NamedType 'OPTIONAL' : 

-	{'NamedType',Pos,{Name,Type}} = '$1',

-	#'ComponentType'{pos=Pos,name=Name,typespec=Type,prop='OPTIONAL'}.

-ComponentType -> NamedType 'DEFAULT' Value:

-	{'NamedType',Pos,{Name,Type}} = '$1',

-	#'ComponentType'{pos=Pos,name=Name,typespec=Type,prop={'DEFAULT','$3'}}.

-ComponentType -> 'COMPONENTS' 'OF' Type :{'COMPONENTS OF','$3'}.

-

-% redundant ExtensionAndException -> '...' : extensionmark.

-% ExtensionAndException -> '...' ExceptionSpec : {extensionmark,'$2'}.

-

-% replaced SequenceValue -> '{' ComponentValueList '}':'$2'.

-% replaced SequenceValue -> '{'  '}':[].

-

-ValueList -> Value :['$1'].

-ValueList -> NamedNumber :['$1'].

-% modified ValueList -> ValueList ',' Value :'$1'.

-ValueList -> Value ',' ValueList :['$1'|'$3'].

-ValueList -> Value ',' '...' :['$1' |[]].

-ValueList -> Value ValueList : ['$1',space|'$2'].

-ValueList -> NamedNumber ValueList: ['$1',space|'$2'].

-

-%ComponentValueList -> identifier ObjIdComponent:[{'NamedValue','$1','$2'}].

-%ComponentValueList -> NamedValue :['$1'].

-%ComponentValueList -> NamedValue ',' ComponentValueList:['$1'|'$3'].

-%ComponentValueList -> identifier ObjIdComponent ',' ComponentValueList :[{'NamedValue', '$1','$2'}|'$4'].

-

-SequenceOfType -> SEQUENCE OF Type : {'SEQUENCE OF','$3'}.

-

-% replaced SequenceOfValue with SAndSOfValue

-

-SAndSOfValue -> '{' ValueList '}' :'$2'.

-%SAndSOfValue -> '{' ComponentValueList '}' :'$2'.

-SAndSOfValue -> '{'  '}' :[].

-

-% save for later SetType ->

-% result is {'SET',Optionals,Extensionmark,Componenttypelist}.

-SetType -> SET '{' ComponentTypeList '}' :{'SET','$3'}.

-% SetType -> SET '{' ExtensionAndException '}' :{'SET','$3'}.

-SetType -> SET '{' '}' :{'SET',[]}.

-

-% replaced SetValue with SAndSOfValue

-

-SetOfType -> SET OF Type : {'SET OF','$3'}.

-

-% replaced SetOfValue with SAndSOfValue

-

-ChoiceType -> 'CHOICE' '{' ComponentTypeList '}' :{'CHOICE','$3'}.

-%  AlternativeTypeList is replaced by ComponentTypeList

-ChoiceValue -> identifier ':' Value : {'ChoiceValue',element(3,'$1'),'$3'}.

-% save for later SelectionType ->

-

-TaggedType -> Tag Type : '$2'#type{tag=['$1'#tag{type={default,get(tagdefault)}}]}.

-TaggedType -> Tag IMPLICIT Type :'$3'#type{tag=['$1'#tag{type='IMPLICIT'}]}.

-TaggedType -> Tag EXPLICIT Type :'$3'#type{tag=['$1'#tag{type='EXPLICIT'}]}.

-

-Tag -> '[' Class ClassNumber ']': #tag{class='$2',number='$3'}.

-Tag -> '[' Class typereference '.' identifier ']': 

-	#tag{class='$2',number=#'Externalvaluereference'{pos=element(2,'$3'),module=element(3,'$3'),

-	value=element(3,'$5')}}.

-Tag -> '[' Class number ']': #tag{class='$2',number=element(3,'$3')}.

-Tag -> '[' Class identifier ']': #tag{class='$2',number=element(3,'$3')}.

-

-ClassNumber -> number :element(3,'$1').

-% inlined above ClassNumber -> typereference '.' identifier :{'Externalvaluereference',element(3,'$1'),element(3,'$3')}.

-ClassNumber -> identifier :element(3,'$1').

-

-Class -> 'UNIVERSAL' :element(1,'$1').

-Class -> 'APPLICATION' :element(1,'$1').

-Class -> 'PRIVATE' :element(1,'$1').

-Class -> '$empty' :'CONTEXT'.

-

-% conflict redundant TaggedValue -> Value:'$1'.

-

-% inlined EmbeddedPDVType -> 'EMBEDDED' 'PDV' :'EMBEDDED PDV'.

-

-% inlined EmbeddedPDVValue -> SequenceValue:'$1'.

-

-% inlined ExternalType -> 'EXTERNAL' :'EXTERNAL'.

-

-% inlined ExternalValue -> SequenceValue :'$1'.

-

-% inlined ObjectIdentifierType -> 'OBJECT' 'IDENTIFIER' :'OBJECT IDENTIFIER'.

-

-ObjectIdentifierValue -> '{' ObjIdComponentList '}' :'$2'.

-%  inlined ObjectIdentifierValue -> SequenceAndSequenceOfValue :'$1'.

-% ObjectIdentifierValue -> '{' identifier ObjIdComponentList '}' :{'ObjectIdentifierValue','$2','$3'}.

-% ObjectIdentifierValue -> '{' typereference '.' identifier ObjIdComponentList '}' :{'ObjectIdentifierValue',{'$2','$4'},'$5'}.

-

-ObjIdComponentList -> Value:'$1'.

-ObjIdComponentList -> Value ObjIdComponentList :['$1'|'$2'].

-%ObjIdComponentList -> DefinedValue:'$1'.

-%ObjIdComponentList -> number:'$1'.

-%ObjIdComponentList -> DefinedValue ObjIdComponentList :['$1'|'$2'].

-%ObjIdComponentList -> number ObjIdComponentList :['$1'|'$2'].

-%ObjIdComponentList -> ObjIdComponent ObjIdComponentList :['$1'|'$2'].

-%ObjIdComponentList -> ObjIdComponent ObjIdComponentList :['$1'|'$2'].

-

-% redundant ObjIdComponent -> NameForm :'$1'. % expanded

-% replaced by 2 ObjIdComponent -> NumberForm :'$1'.

-% ObjIdComponent -> number :'$1'.

-% ObjIdComponent -> DefinedValue :'$1'. % means DefinedValue

-% ObjIdComponent -> NameAndNumberForm :'$1'.

-% ObjIdComponent -> NamedNumber :'$1'.

-% NamedBit replaced by NamedNumber to reduce grammar

-% must check later that "number" is positive

-

-% NameForm -> identifier:'$1'.

-

-% inlined NumberForm -> number :'$1'.

-% inlined NumberForm -> DefinedValue :'$1'.

-

-% replaced by NamedBit  NameAndNumberForm -> identifier '(' NumberForm ')'.

-% NameAndNumberForm -> NamedBit:'$1'.

-

-

-CharacterStringType -> restrictedcharacterstringtype :element(3,'$1').

-CharacterStringType -> 'CHARACTER' 'STRING' :'CHARACTER STRING'.

-

-RestrictedCharacterStringValue -> cstring :element(3, '$1').

-% modified below RestrictedCharacterStringValue -> CharacterStringList :'$1'.

-% conflict vs BuiltinValue RestrictedCharacterStringValue -> SequenceAndSequenceOfValue :'$1'.

-RestrictedCharacterStringValue -> Quadruple :'$1'.

-RestrictedCharacterStringValue -> Tuple :'$1'.

-

-% redundant CharacterStringList -> '{' ValueList '}' :'$2'. % modified

-

-% redundant CharSyms -> CharsDefn :'$1'.

-% redundant CharSyms -> CharSyms ',' CharsDefn :['$1'|'$3'].

-

-% redundant CharsDefn -> cstring :'$1'.

-% temporary replaced see below CharsDefn -> DefinedValue :'$1'.

-% redundant CharsDefn -> Value :'$1'.

-

-Quadruple -> '{' number ',' number ',' number ',' number '}' :{'Quadruple','$2','$4','$6','$8'}.

-% {Group,Plane,Row,Cell}

-

-Tuple -> '{' number ',' number '}' :{'Tuple', '$2','$4'}.

-% {TableColumn,TableRow}

-

-% inlined UnrestrictedCharacterString -> 'CHARACTER' 'STRING' :'CHARACTER STRING'.

-

-CharacterStringValue -> RestrictedCharacterStringValue :'$1'.

-% conflict vs BuiltinValue CharacterStringValue -> SequenceValue :'$1'. % UnrestrictedCharacterStringValue

-

-% inlined UsefulType -> typereference :'$1'.

-

-SelectionType -> identifier '<' Type : {'SelectionType',element(3,'$1'),'$3'}.

-

-ConstrainedType -> Type Constraint :

-	'$1'#type{constraint=merge_constraints(['$2'])}.

-ConstrainedType -> Type Constraint Constraint :

-	'$1'#type{constraint=merge_constraints(['$2','$3'])}.

-ConstrainedType -> Type Constraint Constraint Constraint:

-	'$1'#type{constraint=merge_constraints(['$2','$3','$4'])}.

-ConstrainedType -> Type Constraint Constraint Constraint Constraint:

-	'$1'#type{constraint=merge_constraints(['$2','$3','$4','$5'])}.

-%ConstrainedType -> Type Constraint :'$1'#type{constraint='$2'}.

-%ConstrainedType -> Type Constraint :'$1'#type{constraint='$2'}.

-ConstrainedType -> TypeWithConstraint :'$1'.

-

-TypeWithConstraint -> 'SET' Constraint 'OF' Type : 

-	#type{def = {'SET OF','$4'},constraint=merge_constraints(['$2'])}.		

-TypeWithConstraint -> 'SET' 'SIZE' Constraint 'OF' Type : 

-	#type{def = {'SET OF','$5'},constraint = merge_constraints([#constraint{c={'SizeConstraint','$3'#constraint.c}}])}.

-TypeWithConstraint -> 'SEQUENCE' Constraint 'OF' Type : 

-	#type{def = {'SEQUENCE OF','$4'},constraint = 

-	merge_constraints(['$2'])}.

-TypeWithConstraint -> 'SEQUENCE' 'SIZE' Constraint 'OF' Type : 

-	#type{def = {'SEQUENCE OF','$5'},constraint = merge_constraints([#constraint{c={'SizeConstraint','$3'#constraint.c}}])}.

-

-

-Constraint -> '(' ConstraintSpec ExceptionSpec ')' :

-		#constraint{c='$2',e='$3'}.

-

-% inlined Constraint -> SubTypeConstraint :'$1'.

-ConstraintSpec -> ElementSetSpecs :'$1'.

-ConstraintSpec -> UserDefinedConstraint :'$1'.

-ConstraintSpec -> TableConstraint :'$1'.

-

-TableConstraint -> ComponentRelationConstraint : '$1'.

-TableConstraint -> ObjectSet : '$1'.

-%TableConstraint -> '{' typereference '}' :tableconstraint.

-

-ComponentRelationConstraint -> '{' typereference '}' '{' '@' ComponentIdList '}' : componentrelation.

-ComponentRelationConstraint -> '{' typereference '}' '{' '@' '.' ComponentIdList '}' : componentrelation.

-

-ComponentIdList -> identifier: ['$1'].

-ComponentIdList -> identifier '.' ComponentIdList: ['$1'| '$3'].

-

-

-% later ConstraintSpec -> GeneralConstraint :'$1'.

-

-% from X.682

-UserDefinedConstraint -> 'CONSTRAINED' 'BY' '{' '}' : {constrained_by,[]}.

-UserDefinedConstraint -> 'CONSTRAINED' 'BY' 

-	'{' UserDefinedConstraintParameters '}' : {constrained_by,'$4'}.

-

-UserDefinedConstraintParameters -> UserDefinedConstraintParameter : ['$1'].

-UserDefinedConstraintParameters -> 

-	UserDefinedConstraintParameter ',' 

-	UserDefinedConstraintParameters: ['$1'|'$3'].

-

-UserDefinedConstraintParameter -> Type '.' ActualParameter : {'$1','$3'}.

-UserDefinedConstraintParameter -> ActualParameter : '$1'.

-

-

-

-ExceptionSpec -> '!' ExceptionIdentification : '$1'.

-ExceptionSpec -> '$empty' : undefined.

-

-ExceptionIdentification -> SignedNumber : '$1'.

-% inlined ExceptionIdentification -> DefinedValue : '$1'.

-ExceptionIdentification -> typereference '.' identifier : 

-	#'Externalvaluereference'{pos=element(2,'$1'),module=element(3,'$1'),

-	value=element(3,'$1')}.

-ExceptionIdentification -> identifier :'$1'.

-ExceptionIdentification -> Type ':' Value : {'$1','$3'}.

-

-% inlined SubTypeConstraint -> ElementSetSpec

-

-ElementSetSpecs -> ElementSetSpec : '$1'.

-ElementSetSpecs -> ElementSetSpec ',' '...': {'$1',[]}.

-ElementSetSpecs -> '...' ',' ElementSetSpec : {[],'$3'}.

-ElementSetSpecs -> ElementSetSpec ',' '...' ',' ElementSetSpec : {'$1','$5'}.

-

-ElementSetSpec -> Unions : '$1'.

-ElementSetSpec -> 'ALL' Exclusions : {'ALL','$2'}.

-

-Unions -> Intersections : '$1'.

-Unions -> UElems UnionMark IntersectionElements :

-	case {'$1','$3'} of	

-	{{'SingleValue',V1},{'SingleValue',V2}} -> 

-		{'SingleValue',ordsets:union(to_set(V1),to_set(V2))} 

-	end.

-

-UElems -> Unions :'$1'.

-

-Intersections -> IntersectionElements :'$1'.

-Intersections -> IElems IntersectionMark IntersectionElements :

-	case {'$1','$3'} of 

-	{{'SingleValue',V1},{'SingleValue',V2}} ->

-		{'SingleValue',ordsets:intersection(to_set(V1),to_set(V2))};

-	{V1,V2} when list(V1) ->

-	        V1 ++ [V2];

-	{V1,V2} ->

-	        [V1,V2]  

-	end.

-%Intersections -> IElems '^' IntersectionElements :{'INTERSECTION','$1','$3'}.

-%Intersections -> IElems 'INTERSECTION' IntersectionElements :{'INTERSECTION','$1','$3'}.

-

-IElems -> Intersections :'$1'.

-

-IntersectionElements -> Elements :'$1'.

-IntersectionElements -> Elems Exclusions :{'$1','$2'}.

-

-Elems -> Elements :'$1'.

-

-Exclusions -> 'EXCEPT' Elements :{'EXCEPT','$2'}.

-

-IntersectionMark -> 'INTERSECTION':'$1'.

-IntersectionMark -> '^':'$1'.

-UnionMark -> 'UNION':'$1'.

-UnionMark -> '|':'$1'.

-

-

-Elements -> SubTypeElements : '$1'.

-%Elements -> ObjectSetElements : '$1'.

-Elements -> '(' ElementSetSpec ')' : '$2'.

-Elements -> ReferencedType : '$1'.

-

-SubTypeElements -> ValueList : {'SingleValue','$1'}. % NOTE it must be a Value

-% The rule above modifyed only because of conflicts

-SubTypeElements -> 'INCLUDES' Type : {'ContainedSubType','$2'}.

-%not lalr1 if this is activated SubTypeElements -> Type : {'TypeConstraint','$1'}.

-SubTypeElements -> LowerEndpoint '..' UpperEndpoint : {'ValueRange',{'$1','$3'}}.

-SubTypeElements -> 'FROM' Constraint : {'PermittedAlphabet','$2'#constraint.c}.

-SubTypeElements -> 'SIZE' Constraint: {'SizeConstraint','$2'#constraint.c}.

-% later will introduce conflicts related to NULL SubTypeElements -> Type : {'TypeConstraint','$1'}.

-SubTypeElements -> 'WITH' 'COMPONENT' Constraint:{'WITH COMPONENT','$3'}.

-SubTypeElements -> 'WITH' 'COMPONENTS' '{' TypeConstraints '}':{'WITH COMPONENTS',{'FullSpecification','$4'}}.

-SubTypeElements -> 'WITH' 'COMPONENTS' '{' '...' ',' TypeConstraints '}' :{'WITH COMPONENTS',{'PartialSpecification','$3'}}.

-

-% inlined above InnerTypeConstraints ::= 

-% inlined above	SingleTypeConstraint::= Constraint

-% inlined above MultipleTypeConstraints ::= FullSpecification | PartialSpecification

-% inlined above FullSpecification   ::= "{" TypeConstraints "}"

-% inlined above PartialSpecification ::= "{"  "..."   ","   TypeConstraints "}"

-% TypeConstraints -> identifier : [{'NamedConstraint',element(3,'$1'),undefined,undefined}]. % is this really meaningful or allowed

-TypeConstraints -> NamedConstraint : ['$1'].

-TypeConstraints -> NamedConstraint ',' TypeConstraints : ['$1'|'$3'].

-TypeConstraints -> identifier : ['$1'].

-TypeConstraints -> identifier ',' TypeConstraints : ['$1'|'$3'].

-

-NamedConstraint -> identifier Constraint PresenceConstraint :{'NamedConstraint',element(3,'$1'),'$2','$3'}.

-NamedConstraint -> identifier Constraint  :{'NamedConstraint',element(3,'$1'),'$2',undefined}.

-NamedConstraint -> identifier PresenceConstraint :{'NamedConstraint',element(3,'$1'),undefined,'$2'}.

-

-PresenceConstraint -> 'PRESENT' : 'PRESENT'.

-PresenceConstraint -> 'ABSENT' : 'ABSENT'.

-PresenceConstraint -> 'OPTIONAL' : 'OPTIONAL'.

-

-

-

-LowerEndpoint -> LowerEndValue :'$1'.

-%LowerEndpoint -> LowerEndValue '<':{gt,'$1'}.

-LowerEndpoint -> LowerEndValue '<':('$1'+1).

-

-UpperEndpoint -> UpperEndValue :'$1'.

-%UpperEndpoint -> '<' UpperEndValue :{lt,'$2'}.

-UpperEndpoint -> '<' UpperEndValue :('$2'-1).

-

-LowerEndValue -> Value :'$1'.

-LowerEndValue -> 'MIN' :'MIN'.

-

-UpperEndValue -> Value :'$1'.

-UpperEndValue -> 'MAX' :'MAX'.

-

-

-% X.681 

-

-

-% X.681 chap 15

-

-%TypeFromObject -> ReferencedObjects '.' FieldName : {'$1','$3'}.

-TypeFromObject -> typereference '.' FieldName : {'$1','$3'}.

-

-ReferencedObjects -> typereference : '$1'.

-%ReferencedObjects -> ParameterizedObject

-%ReferencedObjects -> DefinedObjectSet

-%ReferencedObjects -> ParameterizedObjectSet

-

-FieldName -> typefieldreference : ['$1'].

-FieldName -> valuefieldreference : ['$1'].

-FieldName -> FieldName '.' FieldName : ['$1' | '$3'].

-

-PrimitiveFieldName -> typefieldreference : '$1'.

-PrimitiveFieldName -> valuefieldreference : '$1'.

-

-%ObjectSetAssignment -> typereference DefinedObjectClass '::=' ObjectSet: null.

-ObjectSetAssignment -> typereference typereference '::=' ObjectSet :

-	#typedef{pos=element(2,'$1'),name=element(3,'$1'),typespec={'ObjectSet',element(3,'$2'), '$4'}}.	

-ObjectSetAssignment -> typereference typereference '.' typereference '::=' ObjectSet.

-

-ObjectSet -> '{' ElementSetSpecs '}' : '$2'.

-ObjectSet -> '{' '...' '}' : ['EXTENSIONMARK'].

-

-%ObjectSetElements -> Object.

-% ObjectSetElements -> identifier : '$1'.

-%ObjectSetElements -> DefinedObjectSet.

-%ObjectSetElements -> ObjectSetFromObjects.

-%ObjectSetElements -> ParameterizedObjectSet.

-

-%ObjectAssignment -> identifier DefinedObjectClass '::=' Object.

-ObjectAssignment -> ValueAssignment.

-%ObjectAssignment -> identifier typereference '::=' Object.

-%ObjectAssignment -> identifier typereference '.' typereference '::=' Object.

-

-%Object -> DefinedObject: '$1'.

-%Object -> ExternalObjectReference: '$1'.%Object -> DefinedObject: '$1'.

-Object -> typereference '.' identifier: '$1'.%Object -> DefinedObject: '$1'.

-Object -> identifier: '$1'.%Object -> DefinedObject: '$1'.

-

-%Object -> ObjectDefn -> DefaultSyntax: '$1'.

-Object -> '{' FieldSetting ',' FieldSettings '}' : ['$2'|'$4'].

-Object -> '{' FieldSetting '}' :['$2'].

-

-%% For User-friendly notation

-%% Object -> ObjectDefn -> DefinedSyntax

-Object -> '{' '}'. 

-Object -> '{' DefinedSyntaxTokens '}'.

-

-% later Object -> ParameterizedObject: '$1'. look in x.683

-

-%DefinedObject -> ExternalObjectReference: '$1'.

-%DefinedObject -> identifier: '$1'.

-

-DefinedObjectClass -> typereference.

-%DefinedObjectClass -> objectclassreference.

-DefinedObjectClass -> ExternalObjectClassReference.

-%DefinedObjectClass -> typereference '.' objectclassreference.

-%%DefinedObjectClass -> UsefulObjectClassReference.

-

-ExternalObjectReference -> typereference '.' identifier.

-ExternalObjectClassReference -> typereference '.' typereference.

-%%ExternalObjectClassReference -> typereference '.' objectclassreference.

-

-ObjectDefn -> DefaultSyntax: '$1'.

-%ObjectDefn -> DefinedSyntax: '$1'.

-

-ObjectFromObject -> ReferencedObjects '.' FieldName : {'ObjectFromObject','$1','$3'}.

-

-% later look in x.683 ParameterizedObject ->

-

-%DefaultSyntax -> '{' '}'. 

-%DefaultSyntax -> '{' FieldSettings '}': '$2'.

-DefaultSyntax -> '{' FieldSetting ',' FieldSettings '}': '$2'.

-DefaultSyntax -> '{' FieldSetting '}': '$2'.

-

-FieldSetting -> PrimitiveFieldName Setting: {'$1','$2'}.

-

-FieldSettings -> FieldSetting ',' FieldSettings: ['$1'|'$3'].

-FieldSettings -> FieldSetting ',' FieldSettings: ['$1'|'$3'].

-FieldSettings -> FieldSetting: '$1'.

-

-%DefinedSyntax -> '{' '}'.

-DefinedSyntax -> '{' DefinedSyntaxTokens '}': '$2'.

-

-DefinedSyntaxTokens -> DefinedSyntaxToken: '$1'.

-DefinedSyntaxTokens -> DefinedSyntaxToken DefinedSyntaxTokens: ['$1'|'$2'].

-

-% expanded DefinedSyntaxToken -> Literal: '$1'.

-%DefinedSyntaxToken -> typereference: '$1'.

-DefinedSyntaxToken -> word: '$1'.

-DefinedSyntaxToken -> ',': '$1'.

-DefinedSyntaxToken -> Setting: '$1'.

-%DefinedSyntaxToken -> '$empty': nil .

-

-% Setting ::= Type|Value|ValueSet|Object|ObjectSet

-Setting -> Type: '$1'.

-%Setting -> Value: '$1'.

-%Setting -> ValueNotNull: '$1'.

-Setting -> BuiltinValue: '$1'.

-Setting -> ValueSet: '$1'.

-%Setting -> Object: '$1'.

-%Setting -> ExternalObjectReference.

-Setting -> typereference '.' identifier. 

-Setting -> identifier. 

-Setting -> ObjectDefn.

-

-Setting -> ObjectSet: '$1'.

-

-

-Erlang code.

-%%-author('[email protected]').

--copyright('Copyright (c) 1991-99 Ericsson Telecom AB').

--vsn('$Revision: 1.1 $').

--include("asn1_records.hrl").

-

-to_set(V) when list(V) ->

-	ordsets:list_to_set(V);

-to_set(V) ->

-	ordsets:list_to_set([V]).

-

-merge_constraints({Rlist,ExtList}) -> % extensionmarker in constraint

-	{merge_constraints(Rlist,[],[]),

-	 merge_constraints(ExtList,[],[])};

-	

-merge_constraints(Clist) ->

-	merge_constraints(Clist, [], []).

-

-merge_constraints([Ch|Ct],Cacc, Eacc) ->

-	NewEacc = case Ch#constraint.e of

-			undefined -> Eacc;

-			E -> [E|Eacc]

-		  end,

-	merge_constraints(Ct,[fixup_constraint(Ch#constraint.c)|Cacc],NewEacc);

-

-merge_constraints([],Cacc,[]) ->

-	lists:flatten(Cacc);

-merge_constraints([],Cacc,Eacc) ->

-	lists:flatten(Cacc) ++ [{'Errors',Eacc}].

-

-fixup_constraint(C) ->

-	case C of	

-		{'SingleValue',V} when list(V) ->

-			[C, 

-			{'ValueRange',{lists:min(V),lists:max(V)}}]; 

-		{'PermittedAlphabet',{'SingleValue',V}} when list(V) ->

-			V2 = {'SingleValue',

-			       ordsets:list_to_set(lists:flatten(V))},

-			{'PermittedAlphabet',V2};

-		{'PermittedAlphabet',{'SingleValue',V}} ->

-			V2 = {'SingleValue',[V]},

-			{'PermittedAlphabet',V2};

-		{'SizeConstraint',Sc} ->

-			{'SizeConstraint',fixup_size_constraint(Sc)};

-

-		List when list(List) ->

-			[fixup_constraint(Xc)||Xc <- List]; 	

-		Other ->

-			Other

-	end.

-

-fixup_size_constraint({'ValueRange',{Lb,Ub}}) ->

-	{Lb,Ub};

-fixup_size_constraint({{'ValueRange',R},[]}) ->

-	{R,[]};

-fixup_size_constraint({[],{'ValueRange',R}}) ->

-	{[],R};

-fixup_size_constraint({{'ValueRange',R1},{'ValueRange',R2}}) ->

-	{R1,R2};

-fixup_size_constraint({'SingleValue',[Sv]}) ->

-	fixup_size_constraint({'SingleValue',Sv});

-fixup_size_constraint({'SingleValue',L}) when list(L) ->

-	ordsets:list_to_set(L);

-fixup_size_constraint({'SingleValue',L}) ->

-	{L,L};

-fixup_size_constraint({C1,C2}) ->

-	{fixup_size_constraint(C1), fixup_size_constraint(C2)}.

-

-

-

-

-

-

-

-

-

-

-

-

-

diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_parser2.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_parser2.erl
deleted file mode 100644
index 639dcc6622..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_parser2.erl
+++ /dev/null
@@ -1,2764 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 2000, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_parser2.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
--module(asn1ct_parser2).
-
--export([parse/1]).
--include("asn1_records.hrl").
-
-%% parse all types in module
-parse(Tokens) ->
-    case catch parse_ModuleDefinition(Tokens) of
-	{'EXIT',Reason} ->
-	    {error,{{undefined,get(asn1_module),
-		    [internal,error,'when',parsing,module,definition,Reason]},
-		    hd(Tokens)}};
-	{asn1_error,Reason} ->
-	    {error,{Reason,hd(Tokens)}};
-	{ModuleDefinition,Rest1} ->
-	    {Types,Rest2} = parse_AssignmentList(Rest1),
-	    case Rest2 of
-		[{'END',_}|_Rest3] ->
-		    {ok,ModuleDefinition#module{typeorval = Types}};
-		_  ->
-		    {error,{{get_line(hd(Rest2)),get(asn1_module),
-			     [got,get_token(hd(Rest2)),expected,'END']},
-			    hd(Rest2)}}
-	    end
-    end.
-
-parse_ModuleDefinition([{typereference,L1,ModuleIdentifier}|Rest0]) ->
-    put(asn1_module,ModuleIdentifier),
-    {_DefinitiveIdentifier,Rest02} = 
-	case Rest0 of
-	    [{'{',_}|_Rest01] ->
-		parse_ObjectIdentifierValue(Rest0);
-	    _ ->
-		{[],Rest0}
-	end,
-    Rest = case Rest02 of
-	       [{'DEFINITIONS',_}|Rest03] ->
-		   Rest03;
-	       _ ->
-		   throw({asn1_error,{get_line(hd(Rest02)),get(asn1_module),
-				      [got,get_token(hd(Rest02)),
-				       expected,'DEFINITIONS']}})
-	   end,
-    {TagDefault,Rest2} = 
-	case Rest of
-	    [{'EXPLICIT',_L3},{'TAGS',_L4}|Rest1] ->
-		put(tagdefault,'EXPLICIT'), {'EXPLICIT',Rest1};
-	    [{'IMPLICIT',_L3},{'TAGS',_L4}|Rest1] ->
-		put(tagdefault,'IMPLICIT'), {'IMPLICIT',Rest1};
-	    [{'AUTOMATIC',_L3},{'TAGS',_L4}|Rest1] ->
-		put(tagdefault,'AUTOMATIC'), {'AUTOMATIC',Rest1};
-	    Rest1 ->
-		put(tagdefault,'EXPLICIT'), {'EXPLICIT',Rest1} % The default
-	end,
-    {ExtensionDefault,Rest3} = 
-	case Rest2 of
-	    [{'EXTENSIBILITY',_L5}, {'IMPLIED',_L6}|Rest21] -> 
-		{'IMPLIED',Rest21};
-	    _  -> {false,Rest2}
-	end,
-    case Rest3 of
-	[{'::=',_L7}, {'BEGIN',_L8}|Rest4] ->
-	    {Exports, Rest5} = parse_Exports(Rest4),
-	    {Imports, Rest6} = parse_Imports(Rest5),
-	    {#module{ pos = L1,
-		     name = ModuleIdentifier,
-		     defid = [], % fix this
-		     tagdefault = TagDefault,
-		     extensiondefault = ExtensionDefault,
-		     exports = Exports,
-		     imports = Imports},Rest6};
-	_ -> throw({asn1_error,{get_line(hd(Rest3)),get(asn1_module),
-				[got,get_token(hd(Rest3)),expected,"::= BEGIN"]}})
-    end;
-parse_ModuleDefinition(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,typereference]}}).
-    
-parse_Exports([{'EXPORTS',_L1},{';',_L2}|Rest]) ->
-    {{exports,[]},Rest};
-parse_Exports([{'EXPORTS',_L1}|Rest]) ->
-    {SymbolList,Rest2} = parse_SymbolList(Rest),
-    case Rest2 of
-	[{';',_}|Rest3] ->    
-	    {{exports,SymbolList},Rest3};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,';']}})
-    end;
-parse_Exports(Rest) ->
-    {{exports,all},Rest}.
-
-parse_SymbolList(Tokens) ->
-    parse_SymbolList(Tokens,[]).
-
-parse_SymbolList(Tokens,Acc) ->
-    {Symbol,Rest} = parse_Symbol(Tokens),
-    case Rest of 
-	[{',',_L1}|Rest2] ->
-	    parse_SymbolList(Rest2,[Symbol|Acc]);
-	Rest2  ->
-	    {lists:reverse([Symbol|Acc]),Rest2}
-    end.
-
-parse_Symbol(Tokens) ->
-    parse_Reference(Tokens).
-
-parse_Reference([{typereference,L1,TrefName},{'{',_L2},{'}',_L3}|Rest]) ->
-%    {Tref,Rest};
-    {tref2Exttref(L1,TrefName),Rest};
-parse_Reference([Tref1 = {typereference,_,_},{'.',_},Tref2 = {typereference,_,_},
-		 {'{',_L2},{'}',_L3}|Rest]) ->
-%    {{Tref1,Tref2},Rest};
-    {{tref2Exttref(Tref1),tref2Exttref(Tref2)},Rest};
-parse_Reference([Tref = {typereference,_L1,_TrefName}|Rest]) ->
-    {tref2Exttref(Tref),Rest};
-parse_Reference([Vref = {identifier,_L1,_VName}|Rest]) ->
-    {identifier2Extvalueref(Vref),Rest};
-parse_Reference(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-			[typereference,identifier]]}}).
-
-parse_Imports([{'IMPORTS',_L1},{';',_L2}|Rest]) ->
-    {{imports,[]},Rest};
-parse_Imports([{'IMPORTS',_L1}|Rest]) ->
-    {SymbolsFromModuleList,Rest2} = parse_SymbolsFromModuleList(Rest),
-    case Rest2 of
-	[{';',_L2}|Rest3] ->
-	    {{imports,SymbolsFromModuleList},Rest3};
-	Rest3 ->
-	    throw({asn1_error,{get_line(hd(Rest3)),get(asn1_module),
-			       [got,get_token(hd(Rest3)),expected,';']}})
-    end;
-parse_Imports(Tokens) ->
-    {{imports,[]},Tokens}.
-
-parse_SymbolsFromModuleList(Tokens) ->
-    parse_SymbolsFromModuleList(Tokens,[]).
-
-parse_SymbolsFromModuleList(Tokens,Acc) ->
-    {SymbolsFromModule,Rest} = parse_SymbolsFromModule(Tokens),
-    case (catch parse_SymbolsFromModule(Rest)) of 
-	{Sl,_Rest2} when record(Sl,'SymbolsFromModule') ->
-	    parse_SymbolsFromModuleList(Rest,[SymbolsFromModule|Acc]);
-	_  ->
-	    {lists:reverse([SymbolsFromModule|Acc]),Rest}
-    end.
-    
-parse_SymbolsFromModule(Tokens) ->
-    SetRefModuleName =
-	fun(N) ->
-		fun(X) when record(X,'Externaltypereference')->
-			X#'Externaltypereference'{module=N};
-		   (X) when record(X,'Externalvaluereference')->
-			X#'Externalvaluereference'{module=N} 
-		end
-	end,
-    {SymbolList,Rest} = parse_SymbolList(Tokens),
-    case Rest of
-	%%How does this case correspond to x.680 ?
-	[{'FROM',_L1},Tref = {typereference,_,_},Ref={identifier,_L2,_Id},C={',',_}|Rest2] ->
-	    {#'SymbolsFromModule'{symbols=SymbolList,
-				  module=tref2Exttref(Tref)},[Ref,C|Rest2]};
-	%%How does this case correspond to x.680 ?
-	[{'FROM',_L1},Tref = {typereference,_,_},{identifier,_L2,_Id}|Rest2] ->
-	    {#'SymbolsFromModule'{symbols=SymbolList,
-				  module=tref2Exttref(Tref)},Rest2}; 
-	[{'FROM',_L1},Tref = {typereference,_,Name},Brace = {'{',_}|Rest2] ->
-	    {_ObjIdVal,Rest3} = parse_ObjectIdentifierValue([Brace|Rest2]), % value not used yet, fix me
-	    NewSymbolList = lists:map(SetRefModuleName(Name),SymbolList),
-	    {#'SymbolsFromModule'{symbols=NewSymbolList,
-				  module=tref2Exttref(Tref)},Rest3}; 
-	[{'FROM',_L1},Tref = {typereference,_,Name}|Rest2] ->
-	    NewSymbolList = lists:map(SetRefModuleName(Name),SymbolList),
-	    {#'SymbolsFromModule'{symbols=NewSymbolList,
-				  module=tref2Exttref(Tref)},Rest2};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
-			       [got,get_token(hd(Rest)),expected,
-				['FROM typerefernece identifier ,',
-				 'FROM typereference identifier',
-				 'FROM typereference {',
-				 'FROM typereference']]}})
-    end.
-
-parse_ObjectIdentifierValue([{'{',_}|Rest]) ->
-    parse_ObjectIdentifierValue(Rest,[]).
-
-parse_ObjectIdentifierValue([{number,_,Num}|Rest],Acc) ->
-    parse_ObjectIdentifierValue(Rest,[Num|Acc]);
-parse_ObjectIdentifierValue([{identifier,_,Id},{'(',_}, {number,_,Num}, {')',_}|Rest],Acc) ->
-    parse_ObjectIdentifierValue(Rest,[{'NamedNumber',Id,Num}|Acc]);
-parse_ObjectIdentifierValue([{identifier,_,Id},{'(',_}, {identifier,_,Id2}, {')',_}|Rest],Acc) ->
-    parse_ObjectIdentifierValue(Rest,[{'NamedNumber',Id,Id2}|Acc]);
-parse_ObjectIdentifierValue([{identifier,_,Id},{'(',_}, {typereference,_,Tref},{'.',_},{identifier,_,Id2}, {')',_}|Rest],Acc) ->
-    parse_ObjectIdentifierValue(Rest,[{'NamedNumber',Id,{'ExternalValue',Tref,Id2}}|Acc]);
-parse_ObjectIdentifierValue([Id = {identifier,_,_}|Rest],Acc) ->
-    parse_ObjectIdentifierValue(Rest,[identifier2Extvalueref(Id)|Acc]);
-parse_ObjectIdentifierValue([{'}',_}|Rest],Acc) ->
-    {lists:reverse(Acc),Rest};
-parse_ObjectIdentifierValue([H|_T],_Acc) ->
-    throw({asn1_error,{get_line(H),get(asn1_module),
-		       [got,get_token(H),expected,
-			['{ some of the following }',number,'identifier ( number )',
-			 'identifier ( identifier )',
-			 'identifier ( typereference.identifier)',identifier]]}}).
-    
-parse_AssignmentList(Tokens = [{'END',_}|_Rest]) ->
-    {[],Tokens};
-parse_AssignmentList(Tokens = [{'$end',_}|_Rest]) ->
-    {[],Tokens};
-parse_AssignmentList(Tokens) ->
-    parse_AssignmentList(Tokens,[]).
-
-parse_AssignmentList(Tokens= [{'END',_}|_Rest],Acc) ->
-    {lists:reverse(Acc),Tokens};
-parse_AssignmentList(Tokens= [{'$end',_}|_Rest],Acc) ->
-    {lists:reverse(Acc),Tokens};
-parse_AssignmentList(Tokens,Acc) ->
-    case (catch parse_Assignment(Tokens)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	{asn1_error,R} ->
-%	    [H|T] = Tokens,
-	    throw({error,{R,hd(Tokens)}});
-	{Assignment,Rest} ->
-	    parse_AssignmentList(Rest,[Assignment|Acc])
-    end.
-
-parse_Assignment(Tokens) ->
-    Flist = [fun parse_TypeAssignment/1,
-	     fun parse_ValueAssignment/1,
-	     fun parse_ObjectClassAssignment/1,
-	     fun parse_ObjectAssignment/1,
-	     fun parse_ObjectSetAssignment/1,
-	     fun parse_ParameterizedAssignment/1,
-	     fun parse_ValueSetTypeAssignment/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	{asn1_assignment_error,Reason} ->
-	    throw({asn1_error,Reason});
-	Result ->
-	    Result
-    end.
-
-
-parse_or(Tokens,Flist) ->
-	parse_or(Tokens,Flist,[]).
-
-parse_or(_Tokens,[],ErrList) ->
-    case ErrList of
-	[] ->
-	    throw({asn1_error,{parse_or,ErrList}});
-	L when list(L) ->
-%%%	    throw({asn1_error,{parse_or,hd(lists:reverse(ErrList))}});
-	    %% chose to throw 1) the error with the highest line no,
-	    %% 2) the last error which is not a asn1_assignment_error or
-	    %% 3) the last error.
-	    throw(prioritize_error(ErrList));
-	Other ->
-	    throw({asn1_error,{parse_or,Other}})
-    end;
-parse_or(Tokens,[Fun|Frest],ErrList) ->
-    case (catch Fun(Tokens)) of
-	Exit = {'EXIT',_Reason} ->
-	    parse_or(Tokens,Frest,[Exit|ErrList]);
-	AsnErr = {asn1_error,_} ->
-	    parse_or(Tokens,Frest,[AsnErr|ErrList]);
-	AsnAssErr = {asn1_assignment_error,_} ->
-	    parse_or(Tokens,Frest,[AsnAssErr|ErrList]);
-	Result = {_,L} when list(L) ->
-	    Result;
-%	Result ->
-%	    Result
-	Error  ->
-	    parse_or(Tokens,Frest,[Error|ErrList])
-    end.
-
-parse_TypeAssignment([{typereference,L1,Tref},{'::=',_}|Rest]) ->	
-    {Type,Rest2} = parse_Type(Rest),
-    {#typedef{pos=L1,name=Tref,typespec=Type},Rest2};
-parse_TypeAssignment([H1,H2|_Rest]) ->
-    throw({asn1_assignment_error,{get_line(H1),get(asn1_module),
-				  [got,[get_token(H1),get_token(H2)], expected,
-				   typereference,'::=']}});
-parse_TypeAssignment([H|_T]) ->
-    throw({asn1_assignment_error,{get_line(H),get(asn1_module),
-				  [got,get_token(H),expected,
-				   typereference]}}).
-
-parse_Type(Tokens) ->
-    {Tag,Rest3} = case Tokens of
-		      [Lbr= {'[',_}|Rest] ->
-			  parse_Tag([Lbr|Rest]);
-		      Rest-> {[],Rest}
-		  end,
-    {Tag2,Rest4} = case Rest3 of
-		       [{'IMPLICIT',_}|Rest31] when record(Tag,tag)->
-			   {[Tag#tag{type='IMPLICIT'}],Rest31};
-		       [{'EXPLICIT',_}|Rest31] when record(Tag,tag)->
-			   {[Tag#tag{type='EXPLICIT'}],Rest31};
-		       Rest31 when record(Tag,tag) ->
-			   {[Tag#tag{type={default,get(tagdefault)}}],Rest31};
-		       Rest31 ->
-			   {Tag,Rest31}
-		   end,
-    Flist = [fun parse_BuiltinType/1,fun parse_ReferencedType/1,fun parse_TypeWithConstraint/1],
-    {Type,Rest5} = case (catch parse_or(Rest4,Flist)) of
-		      {'EXIT',Reason} ->
-			  exit(Reason);
-			AsnErr = {asn1_error,_Reason} ->
-			 throw(AsnErr);
-		      Result ->
-			  Result
-		  end,
-    case hd(Rest5) of
-	{'(',_} ->
-	    {Constraints,Rest6} = parse_Constraints(Rest5),
-	    if record(Type,type) ->
-		    {Type#type{constraint=merge_constraints(Constraints),
-			       tag=Tag2},Rest6};
-	       true ->
-		    {#type{def=Type,constraint=merge_constraints(Constraints),
-			   tag=Tag2},Rest6}
-	    end;
-	_ ->
-	    if record(Type,type) ->
-		    {Type#type{tag=Tag2},Rest5};
-	       true ->
-		    {#type{def=Type,tag=Tag2},Rest5}
-	    end
-    end.
-
-parse_BuiltinType([{'BIT',_},{'STRING',_}|Rest]) ->
-    case Rest of 
-	[{'{',_}|Rest2] ->
-	    {NamedNumberList,Rest3} = parse_NamedNumberList(Rest2),
-	    case Rest3 of
-		[{'}',_}|Rest4] ->
-		    {#type{def={'BIT STRING',NamedNumberList}},Rest4};
-		_ ->
-		    throw({asn1_error,{get_line(hd(Rest3)),get(asn1_module),
-				       [got,get_token(hd(Rest3)),expected,'}']}})
-	    end;
-	 _ ->
-	    {{'BIT STRING',[]},Rest}
-    end;
-parse_BuiltinType([{'BOOLEAN',_}|Rest]) ->
-    {#type{def='BOOLEAN'},Rest};
-%% CharacterStringType ::= RestrictedCharacterStringType | 
-%%                         UnrestrictedCharacterStringType
-parse_BuiltinType([{restrictedcharacterstringtype,_,StringName}|Rest]) ->
-    {#type{def=StringName},Rest};
-parse_BuiltinType([{'CHARACTER',_},{'STRING',_}|Rest]) ->
-    {#type{def='CHARACTER STRING'},Rest};
-
-parse_BuiltinType([{'CHOICE',_},{'{',_}|Rest]) ->
-    {AlternativeTypeLists,Rest2} = parse_AlternativeTypeLists(Rest),
-    case Rest2 of
-	[{'}',_}|Rest3] ->
-	    {#type{def={'CHOICE',AlternativeTypeLists}},Rest3};
-	_  ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'}']}})
-    end;
-parse_BuiltinType([{'EMBEDDED',_},{'PDV',_}|Rest]) ->
-    {#type{def='EMBEDDED PDV'},Rest};
-parse_BuiltinType([{'ENUMERATED',_},{'{',_}|Rest]) ->
-    {Enumerations,Rest2} = parse_Enumerations(Rest),
-    case Rest2 of
-	[{'}',_}|Rest3] ->
-	    {#type{def={'ENUMERATED',Enumerations}},Rest3};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'}']}})
-    end;
-parse_BuiltinType([{'EXTERNAL',_}|Rest]) ->
-    {#type{def='EXTERNAL'},Rest};
-
-% InstanceOfType
-parse_BuiltinType([{'INSTANCE',_},{'OF',_}|Rest]) ->
-    {DefinedObjectClass,Rest2} = parse_DefinedObjectClass(Rest),
-    case Rest2 of
-	[{'(',_}|_] ->
-	    {Constraint,Rest3} = parse_Constraint(Rest2),
-	    {#type{def={'INSTANCE OF',DefinedObjectClass,Constraint}},Rest3};
-	_ ->
-	    {#type{def={'INSTANCE OF',DefinedObjectClass,[]}},Rest2}
-    end;
-
-% parse_BuiltinType(Tokens) ->
-    
-parse_BuiltinType([{'INTEGER',_}|Rest]) ->
-    case Rest of 
-	[{'{',_}|Rest2] ->
-	    {NamedNumberList,Rest3} = parse_NamedNumberList(Rest2),
-	    case Rest3 of
-		[{'}',_}|Rest4] ->
-		    {#type{def={'INTEGER',NamedNumberList}},Rest4};
-		_ ->
-		    throw({asn1_error,{get_line(hd(Rest3)),get(asn1_module),
-				       [got,get_token(hd(Rest3)),expected,'}']}})
-	    end;
-	 _ ->
-	    {#type{def='INTEGER'},Rest}
-    end;
-parse_BuiltinType([{'NULL',_}|Rest]) ->
-    {#type{def='NULL'},Rest};
-
-% ObjectClassFieldType fix me later
-
-parse_BuiltinType([{'OBJECT',_},{'IDENTIFIER',_}|Rest]) ->
-    {#type{def='OBJECT IDENTIFIER'},Rest};
-parse_BuiltinType([{'OCTET',_},{'STRING',_}|Rest]) ->
-    {#type{def='OCTET STRING'},Rest};
-parse_BuiltinType([{'REAL',_}|Rest]) ->
-    {#type{def='REAL'},Rest};
-parse_BuiltinType([{'SEQUENCE',_},{'{',_},{'...',Line},{'}',_}|Rest]) ->
-    {#type{def=#'SEQUENCE'{components=[{'EXTENSIONMARK',Line,undefined}]}},
-     Rest};
-parse_BuiltinType([{'SEQUENCE',_},{'{',_},{'...',Line},{'!',_}|Rest]) ->
-    {ExceptionIdentification,Rest2} = parse_ExceptionIdentification(Rest),
-    case Rest2 of
-	[{'}',_}|Rest3] ->
-	    {#type{def=#'SEQUENCE'{components=[{'EXTENSIONMARK',
-						Line,
-						ExceptionIdentification}]}},
-	     Rest3};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'}']}})
-    end;
-parse_BuiltinType([{'SEQUENCE',_},{'{',_}|Rest]) ->
-    {ComponentTypeLists,Rest2} = parse_ComponentTypeLists(Rest),
-    case Rest2  of
-	[{'}',_}|Rest3] ->
-	    {#type{def=#'SEQUENCE'{components=ComponentTypeLists}},Rest3};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'}']}})
-    end;
-parse_BuiltinType([{'SEQUENCE',_},{'OF',_}|Rest]) ->
-    {Type,Rest2} = parse_Type(Rest),
-    {#type{def={'SEQUENCE OF',Type}},Rest2};
-
-
-parse_BuiltinType([{'SET',_},{'{',_},{'...',Line},{'}',_}|Rest]) ->
-    {#type{def=#'SET'{components=[{'EXTENSIONMARK',Line,undefined}]}},Rest};
-parse_BuiltinType([{'SET',_},{'{',_},{'...',Line},{'!',_}|Rest]) ->
-    {ExceptionIdentification,Rest2} = parse_ExceptionIdentification(Rest),
-    case Rest2 of
-	[{'}',_}|Rest3] ->
-	    {#type{def=#'SET'{components=
-			      [{'EXTENSIONMARK',Line,ExceptionIdentification}]}},
-	     Rest3};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'}']}})
-    end;
-parse_BuiltinType([{'SET',_},{'{',_}|Rest]) ->
-    {ComponentTypeLists,Rest2} = parse_ComponentTypeLists(Rest),
-    case Rest2  of
-	[{'}',_}|Rest3] ->
-	    {#type{def=#'SET'{components=ComponentTypeLists}},Rest3};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'}']}})
-    end;
-parse_BuiltinType([{'SET',_},{'OF',_}|Rest]) ->
-    {Type,Rest2} = parse_Type(Rest),
-    {#type{def={'SET OF',Type}},Rest2};
-
-%% The so called Useful types
-parse_BuiltinType([{'GeneralizedTime',_}|Rest]) ->
-    {#type{def='GeneralizedTime'},Rest};
-parse_BuiltinType([{'UTCTime',_}|Rest]) ->
-    {#type{def='UTCTime'},Rest};
-parse_BuiltinType([{'ObjectDescriptor',_}|Rest]) ->
-    {#type{def='ObjectDescriptor'},Rest};
-
-%% For compatibility with old standard
-parse_BuiltinType([{'ANY',_},{'DEFINED',_},{'BY',_},{identifier,_,Id}|Rest]) ->
-    {#type{def={'ANY_DEFINED_BY',Id}},Rest};
-parse_BuiltinType([{'ANY',_}|Rest]) ->
-    {#type{def='ANY'},Rest};
-
-parse_BuiltinType(Tokens) ->
-    parse_ObjectClassFieldType(Tokens).
-%    throw({asn1_error,unhandled_type}).
-
-
-parse_TypeWithConstraint([{'SEQUENCE',_},Lpar = {'(',_}|Rest]) ->
-    {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
-    case Rest2 of
-	[{'OF',_}|Rest3] ->
-	    {Type,Rest4} = parse_Type(Rest3),
-	    {#type{def = {'SEQUENCE OF',Type}, constraint = merge_constraints([Constraint])},Rest4};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'OF']}})
-    end;
-parse_TypeWithConstraint([{'SEQUENCE',_},{'SIZE',_},Lpar = {'(',_}|Rest]) ->
-    {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
-    Constraint2 =
-	case Constraint of
-	    #constraint{c=C} ->
-		Constraint#constraint{c={'SizeConstraint',C}};
-	    _ -> Constraint
-	end,
-    case Rest2 of
-	[{'OF',_}|Rest3] ->
-	    {Type,Rest4} = parse_Type(Rest3),
-	    {#type{def = {'SEQUENCE OF',Type}, constraint = merge_constraints([Constraint2])},Rest4};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'OF']}})
-    end;
-parse_TypeWithConstraint([{'SET',_},Lpar = {'(',_}|Rest]) ->
-    {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
-    case Rest2 of
-	[{'OF',_}|Rest3] ->
-	    {Type,Rest4} = parse_Type(Rest3),
-	    {#type{def = {'SET OF',Type}, constraint = merge_constraints([Constraint])},Rest4};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'OF']}})
-    end;
-parse_TypeWithConstraint([{'SET',_},{'SIZE',_},Lpar = {'(',_}|Rest]) ->
-    {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
-    Constraint2 =
-	case Constraint of
-	    #constraint{c=C} ->
-		Constraint#constraint{c={'SizeConstraint',C}};
-	    _ -> Constraint
-	end,
-    case Rest2 of
-	[{'OF',_}|Rest3] ->
-	    {Type,Rest4} = parse_Type(Rest3),
-	    {#type{def = {'SET OF',Type}, constraint = merge_constraints([Constraint2])},Rest4};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'OF']}})
-    end;
-parse_TypeWithConstraint(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-		       ['SEQUENCE','SEQUENCE SIZE','SET','SET SIZE'],
-		       followed,by,a,constraint]}}).
-
-
-%% --------------------------
-
-parse_ReferencedType(Tokens) ->
-    Flist = [fun parse_DefinedType/1,
-	     fun parse_SelectionType/1,
-	     fun parse_TypeFromObject/1,
-	     fun parse_ValueSetFromObjects/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-    
-parse_DefinedType(Tokens=[{typereference,_,_},{'{',_}|_Rest]) ->
-    parse_ParameterizedType(Tokens);
-parse_DefinedType(Tokens=[{typereference,L1,TypeName},
-			  T2={typereference,_,_},T3={'{',_}|Rest]) ->
-    case (catch parse_ParameterizedType(Tokens)) of
-	{'EXIT',_Reason} ->
-	    Rest2 = [T2,T3|Rest],
-	    {#type{def = #'Externaltypereference'{pos=L1,
-						  module=get(asn1_module),
-						  type=TypeName}},Rest2};
-	{asn1_error,_} ->
-	    Rest2 = [T2,T3|Rest],
-	    {#type{def = #'Externaltypereference'{pos=L1,
-						  module=get(asn1_module),
-						  type=TypeName}},Rest2};
-	Result ->
-	    Result
-    end;
-parse_DefinedType([{typereference,L1,Module},{'.',_},{typereference,_,TypeName}|Rest]) ->
-    {#type{def = #'Externaltypereference'{pos=L1,module=Module,type=TypeName}},Rest};
-parse_DefinedType([{typereference,L1,TypeName}|Rest]) ->
-    {#type{def = #'Externaltypereference'{pos=L1,module=get(asn1_module),
-					  type=TypeName}},Rest};
-parse_DefinedType(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-			[typereference,'typereference.typereference',
-			 'typereference typereference']]}}).
-
-parse_SelectionType([{identifier,_,Name},{'<',_}|Rest]) ->    
-    {Type,Rest2} = parse_Type(Rest),
-    {{'SelectionType',Name,Type},Rest2};
-parse_SelectionType(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'identifier <']}}).
-    
-
-%% --------------------------
-
-
-%% This should probably be removed very soon 
-% parse_ConstrainedType(Tokens) ->
-%     case (catch parse_TypeWithConstraint(Tokens)) of
-% 	{'EXIT',Reason} ->
-% 	    {Type,Rest} = parse_Type(Tokens),
-% 	    {Constraint,Rest2} = parse_Constraint(Rest),
-% 	    {Type#type{constraint=Constraint},Rest2};
-% 	{asn1_error,Reason2} ->
-% 	    {Type,Rest} = parse_Type(Tokens),
-% 	    {Constraint,Rest2} = parse_Constraint(Rest),
-% 	    {Type#type{constraint=Constraint},Rest2};
-% 	Result ->
-% 	    Result
-%     end.
-
-parse_Constraints(Tokens) ->
-    parse_Constraints(Tokens,[]).
-
-parse_Constraints(Tokens,Acc) ->
-    {Constraint,Rest} = parse_Constraint(Tokens),
-    case Rest of
-	[{'(',_}|_Rest2] ->
-	    parse_Constraints(Rest,[Constraint|Acc]);
-	_ ->
-	    {lists:reverse([Constraint|Acc]),Rest}
-    end.
-
-parse_Constraint([{'(',_}|Rest]) ->
-    {Constraint,Rest2} = parse_ConstraintSpec(Rest),
-    {Exception,Rest3} = parse_ExceptionSpec(Rest2),
-    case Rest3 of
-	[{')',_}|Rest4] ->
-	    {#constraint{c=Constraint,e=Exception},Rest4};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,')']}})
-    end;
-parse_Constraint(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'(']}}).
-
-parse_ConstraintSpec(Tokens) ->
-    Flist = [fun parse_GeneralConstraint/1,
-	     fun parse_SubtypeConstraint/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	{asn1_error,Reason2} ->
-	    throw({asn1_error,Reason2});
-	Result ->
-	    Result
-    end.
-
-parse_ExceptionSpec([LPar={')',_}|Rest]) ->
-    {undefined,[LPar|Rest]};
-parse_ExceptionSpec([{'!',_}|Rest]) ->
-    parse_ExceptionIdentification(Rest);
-parse_ExceptionSpec(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,[')','!']]}}).
-
-parse_ExceptionIdentification(Tokens) ->
-    Flist = [fun parse_SignedNumber/1,
-	     fun parse_DefinedValue/1,
-	     fun parse_TypeColonValue/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	{asn1_error,Reason2} ->
-	    throw({asn1_error,Reason2});
-	Result ->
-	    Result
-    end.
-
-parse_TypeColonValue(Tokens) ->
-    {Type,Rest} = parse_Type(Tokens),
-    case Rest of
-	[{':',_}|Rest2] ->
-	    {Value,Rest3} = parse_Value(Rest2),
-	    {{Type,Value},Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,':']}})
-    end.
-
-parse_SubtypeConstraint(Tokens) ->
-    parse_ElementSetSpecs(Tokens).
-
-parse_ElementSetSpecs([{'...',_}|Rest]) ->
-    {Elements,Rest2} = parse_ElementSetSpec(Rest),
-    {{[],Elements},Rest2};
-parse_ElementSetSpecs(Tokens) ->
-    {RootElems,Rest} = parse_ElementSetSpec(Tokens),
-    case Rest of
-	[{',',_},{'...',_},{',',_}|Rest2] ->
-	    {AdditionalElems,Rest3} = parse_ElementSetSpec(Rest2),
-	    {{RootElems,AdditionalElems},Rest3};
-	[{',',_},{'...',_}|Rest2] ->
-	    {{RootElems,[]},Rest2};
-	_ ->
-	    {RootElems,Rest}
-    end.
-
-parse_ElementSetSpec([{'ALL',_},{'EXCEPT',_}|Rest]) ->
-    {Exclusions,Rest2} = parse_Elements(Rest),
-    {{'ALL',{'EXCEPT',Exclusions}},Rest2};
-parse_ElementSetSpec(Tokens) ->
-    parse_Unions(Tokens).
-
-
-parse_Unions(Tokens) ->
-    {InterSec,Rest} = parse_Intersections(Tokens),
-    {Unions,Rest2} = parse_UnionsRec(Rest),
-    case {InterSec,Unions} of
-	{InterSec,[]} ->
-	    {InterSec,Rest2};
-	{{'SingleValue',V1},{'SingleValue',V2}} ->
-	    {{'SingleValue',ordsets:union(to_set(V1),to_set(V2))},Rest2};
-	{V1,V2} when list(V2) ->
-	    {[V1] ++ [union|V2],Rest2};
-	{V1,V2} ->
-	    {[V1,union,V2],Rest2}
-%	Other ->
-%	    throw(Other)
-    end.
-
-parse_UnionsRec([{'|',_}|Rest]) ->
-    {InterSec,Rest2} = parse_Intersections(Rest),
-    {URec,Rest3} = parse_UnionsRec(Rest2),
-    case {InterSec,URec} of
-	{V1,[]} ->
-	    {V1,Rest3};
-	{{'SingleValue',V1},{'SingleValue',V2}} ->
-	    {{'SingleValue',ordsets:union(to_set(V1),to_set(V2))},Rest3};
-	{V1,V2} when list(V2) ->
-	    {[V1] ++ V2,Rest3};
-	{V1,V2} ->
-	    {[V1,V2],Rest3}
-	end;
-parse_UnionsRec([{'UNION',_}|Rest]) ->
-    {InterSec,Rest2} = parse_Intersections(Rest),
-    {URec,Rest3} = parse_UnionsRec(Rest2),
-    case {InterSec,URec} of
-	{V1,[]} ->
-	    {V1,Rest3};
-	{{'SingleValue',V1},{'SingleValue',V2}} ->
-	    {{'SingleValue',ordsets:union(to_set(V1),to_set(V2))},Rest3};
-	{V1,V2} when list(V2) ->
-	    {[V1] ++ V2,Rest3};
-	{V1,V2} ->
-	    {[V1,V2],Rest3}
-	end;
-parse_UnionsRec(Tokens) ->
-    {[],Tokens}.
-
-parse_Intersections(Tokens) ->
-    {InterSec,Rest} = parse_IntersectionElements(Tokens),
-    {IRec,Rest2} = parse_IElemsRec(Rest),
-    case {InterSec,IRec} of
-	{V1,[]} ->
-	    {V1,Rest2};
-	{{'SingleValue',V1},{'SingleValue',V2}} ->
-	    {{'SingleValue',
-	      ordsets:intersection(to_set(V1),to_set(V2))},Rest2};
-	{V1,V2} when list(V2) ->
-	    {[V1] ++ [intersection|V2],Rest2};
-	{V1,V2} ->
-	    {[V1,intersection,V2],Rest2};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-			       [got,get_token(hd(Tokens)),expected,'a Union']}})
-    end.
-
-parse_IElemsRec([{'^',_}|Rest]) ->
-    {InterSec,Rest2} = parse_IntersectionElements(Rest),
-    {IRec,Rest3} = parse_IElemsRec(Rest2),
-    case {InterSec,IRec} of
-	{{'SingleValue',V1},{'SingleValue',V2}} ->
-	    {{'SingleValue',
-	      ordsets:intersection(to_set(V1),to_set(V2))},Rest3};
-	{V1,[]} ->
-	    {V1,Rest3};
-	{V1,V2} when list(V2) ->
-	    {[V1] ++ V2,Rest3};
-	{V1,V2} ->
-	    {[V1,V2],Rest3};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
-			       [got,get_token(hd(Rest)),expected,'an Intersection']}})
-    end;
-parse_IElemsRec([{'INTERSECTION',_}|Rest]) ->
-    {InterSec,Rest2} = parse_IntersectionElements(Rest),
-    {IRec,Rest3} = parse_IElemsRec(Rest2),
-    case {InterSec,IRec} of
-	{{'SingleValue',V1},{'SingleValue',V2}} ->
-	    {{'SingleValue',
-	      ordsets:intersection(to_set(V1),to_set(V2))},Rest3};
-	{V1,[]} ->
-	    {V1,Rest3};
-	{V1,V2} when list(V2) ->
-	    {[V1] ++ V2,Rest3};
-	{V1,V2} ->
-	    {[V1,V2],Rest3};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
-			       [got,get_token(hd(Rest)),expected,'an Intersection']}})
-    end;
-parse_IElemsRec(Tokens) ->
-    {[],Tokens}.
-
-parse_IntersectionElements(Tokens) ->
-    {InterSec,Rest} = parse_Elements(Tokens),
-    case Rest of
-	[{'EXCEPT',_}|Rest2] ->
-	    {Exclusion,Rest3} = parse_Elements(Rest2),
-	    {{InterSec,{'EXCEPT',Exclusion}},Rest3};
-	Rest ->
-	    {InterSec,Rest}
-    end.
-
-parse_Elements([{'(',_}|Rest]) ->
-    {Elems,Rest2} = parse_ElementSetSpec(Rest),
-    case Rest2 of
-	[{')',_}|Rest3] ->
-	    {Elems,Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,')']}})
-    end;
-parse_Elements(Tokens) ->
-    Flist = [fun parse_SubtypeElements/1,
-	     fun parse_ObjectSetElements/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	Err = {asn1_error,_} ->
-	    throw(Err);
-	Result ->
-	    Result
-    end.
-    
-
-    
-
-%% --------------------------
-
-parse_DefinedObjectClass([{typereference,_,_ModName},{'.',_},Tr={typereference,_,_ObjClName}|Rest]) ->
-%%    {{objectclassname,ModName,ObjClName},Rest};
-%    {{objectclassname,tref2Exttref(Tr)},Rest};
-    {tref2Exttref(Tr),Rest};
-parse_DefinedObjectClass([Tr={typereference,_,_ObjClName}|Rest]) ->
-%    {{objectclassname,tref2Exttref(Tr)},Rest};
-    {tref2Exttref(Tr),Rest};
-parse_DefinedObjectClass([{'TYPE-IDENTIFIER',_}|Rest]) ->
-    {'TYPE-IDENTIFIER',Rest};
-parse_DefinedObjectClass([{'ABSTRACT-SYNTAX',_}|Rest]) ->
-    {'ABSTRACT-SYNTAX',Rest};
-parse_DefinedObjectClass(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-			['typereference . typereference',
-			 typereference,
-			 'TYPE-IDENTIFIER',
-			 'ABSTRACT-SYNTAX']]}}).
-
-parse_ObjectClassAssignment([{typereference,L1,ObjClName},{'::=',_}|Rest]) ->
-    {Type,Rest2} = parse_ObjectClass(Rest),
-    {#classdef{pos=L1,name=ObjClName,typespec=Type},Rest2};
-parse_ObjectClassAssignment(Tokens) ->
-    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
-				  [got,get_token(hd(Tokens)),expected,
-				   'typereference ::=']}}).
-
-parse_ObjectClass(Tokens) ->
-    Flist = [fun parse_DefinedObjectClass/1,
-	     fun parse_ObjectClassDefn/1,
-	     fun parse_ParameterizedObjectClass/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	{asn1_error,Reason2} ->
-	    throw({asn1_error,Reason2});
-	Result ->
-	    Result
-    end.
-
-parse_ObjectClassDefn([{'CLASS',_},{'{',_}|Rest]) ->
-    {Type,Rest2} = parse_FieldSpec(Rest),
-    {WithSyntaxSpec,Rest3} = parse_WithSyntaxSpec(Rest2),
-    {#objectclass{fields=Type,syntax=WithSyntaxSpec},Rest3};
-parse_ObjectClassDefn(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'CLASS {']}}).
-
-parse_FieldSpec(Tokens) ->
-    parse_FieldSpec(Tokens,[]).
-
-parse_FieldSpec(Tokens,Acc) ->
-    Flist = [fun parse_FixedTypeValueFieldSpec/1,
-	     fun parse_VariableTypeValueFieldSpec/1,
-	     fun parse_ObjectFieldSpec/1,
-	     fun parse_FixedTypeValueSetFieldSpec/1,
-	     fun parse_VariableTypeValueSetFieldSpec/1,
-	     fun parse_TypeFieldSpec/1,
-	     fun parse_ObjectSetFieldSpec/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	{Type,[{'}',_}|Rest]} ->
-	    {lists:reverse([Type|Acc]),Rest};
-	{Type,[{',',_}|Rest2]} ->
-	    parse_FieldSpec(Rest2,[Type|Acc]);
-	{_,[H|_T]}  ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'}']}})
-    end.
-
-parse_PrimitiveFieldName([{typefieldreference,_,FieldName}|Rest]) ->
-    {{typefieldreference,FieldName},Rest};
-parse_PrimitiveFieldName([{valuefieldreference,_,FieldName}|Rest]) ->
-    {{valuefieldreference,FieldName},Rest};
-parse_PrimitiveFieldName(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-			[typefieldreference,valuefieldreference]]}}).
-
-parse_FieldName(Tokens) ->
-    {Field,Rest} = parse_PrimitiveFieldName(Tokens),
-    parse_FieldName(Rest,[Field]).
-
-parse_FieldName([{'.',_}|Rest],Acc) ->
-    case (catch parse_PrimitiveFieldName(Rest)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	{FieldName,Rest2} ->
-	    parse_FieldName(Rest2,[FieldName|Acc])
-    end;
-parse_FieldName(Tokens,Acc) ->
-    {lists:reverse(Acc),Tokens}.
-    
-parse_FixedTypeValueFieldSpec([{valuefieldreference,L1,VFieldName}|Rest]) ->
-    {Type,Rest2} = parse_Type(Rest),
-    {Unique,Rest3} = 
-	case Rest2 of
-	    [{'UNIQUE',_}|Rest4] ->
-		{'UNIQUE',Rest4};
-	    _  ->
-		{undefined,Rest2}
-	end,
-    {OptionalitySpec,Rest5} = parse_ValueOptionalitySpec(Rest3),
-    case Unique of
-	'UNIQUE' ->
-	    case OptionalitySpec of 
-		{'DEFAULT',_} ->
-		    throw({asn1_error,
-			   {L1,get(asn1_module),
-			    ['UNIQUE and DEFAULT in same field',VFieldName]}});
-		_ ->
-		    {{fixedtypevaluefield,VFieldName,Type,Unique,OptionalitySpec},Rest5}
-	    end;
-	_ ->
-	    {{object_or_fixedtypevalue_field,VFieldName,Type,Unique,OptionalitySpec},Rest5}
-    end;
-parse_FixedTypeValueFieldSpec(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,valuefieldreference]}}).
-
-parse_VariableTypeValueFieldSpec([{valuefieldreference,_,VFieldName}|Rest]) ->
-    {FieldRef,Rest2} = parse_FieldName(Rest),
-    {OptionalitySpec,Rest3} = parse_ValueOptionalitySpec(Rest2),
-    {{variabletypevaluefield,VFieldName,FieldRef,OptionalitySpec},Rest3};
-parse_VariableTypeValueFieldSpec(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,valuefieldreference]}}).
-
-parse_ObjectFieldSpec([{valuefieldreference,_,VFieldName}|Rest]) ->
-    {Class,Rest2} = parse_DefinedObjectClass(Rest),
-    {OptionalitySpec,Rest3} = parse_ObjectOptionalitySpec(Rest2),
-    {{objectfield,VFieldName,Class,OptionalitySpec},Rest3};
-parse_ObjectFieldSpec(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,valuefieldreference]}}).
-
-parse_TypeFieldSpec([{typefieldreference,_,TFieldName}|Rest]) ->
-    {OptionalitySpec,Rest2} = parse_TypeOptionalitySpec(Rest),
-    {{typefield,TFieldName,OptionalitySpec},Rest2};
-parse_TypeFieldSpec(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,typefieldreference]}}).
-
-parse_FixedTypeValueSetFieldSpec([{typefieldreference,_,TFieldName}|Rest]) ->
-    {Type,Rest2} = parse_Type(Rest),
-    {OptionalitySpec,Rest3} = parse_ValueSetOptionalitySpec(Rest2),
-    {{objectset_or_fixedtypevalueset_field,TFieldName,Type,
-      OptionalitySpec},Rest3};
-parse_FixedTypeValueSetFieldSpec(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,typefieldreference]}}).
-
-parse_VariableTypeValueSetFieldSpec([{typefieldreference,_,TFieldName}|Rest]) ->
-    {FieldRef,Rest2} = parse_FieldName(Rest),
-    {OptionalitySpec,Rest3} = parse_ValueSetOptionalitySpec(Rest2),
-    {{variabletypevaluesetfield,TFieldName,FieldRef,OptionalitySpec},Rest3};
-parse_VariableTypeValueSetFieldSpec(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,typefieldreference]}}).
-
-parse_ObjectSetFieldSpec([{typefieldreference,_,TFieldName}|Rest]) ->
-    {Class,Rest2} = parse_DefinedObjectClass(Rest),
-    {OptionalitySpec,Rest3} = parse_ObjectSetOptionalitySpec(Rest2),
-    {{objectsetfield,TFieldName,Class,OptionalitySpec},Rest3};
-parse_ObjectSetFieldSpec(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,typefieldreference]}}).
-
-parse_ValueOptionalitySpec(Tokens)->
-    case Tokens of
-	[{'OPTIONAL',_}|Rest] -> {'OPTIONAL',Rest};
-	[{'DEFAULT',_}|Rest] ->
-	    {Value,Rest2} = parse_Value(Rest),
-	    {{'DEFAULT',Value},Rest2};
-	_  -> {'MANDATORY',Tokens}
-    end.
-
-parse_ObjectOptionalitySpec(Tokens) ->
-    case Tokens of
-	[{'OPTIONAL',_}|Rest] -> {'OPTIONAL',Rest};
-	[{'DEFAULT',_}|Rest] ->
-	    {Object,Rest2} = parse_Object(Rest),
-	    {{'DEFAULT',Object},Rest2};
-	_  -> {'MANDATORY',Tokens}
-    end.
-
-parse_TypeOptionalitySpec(Tokens) ->
-    case Tokens of
-	[{'OPTIONAL',_}|Rest] -> {'OPTIONAL',Rest};
-	[{'DEFAULT',_}|Rest] ->
-	    {Type,Rest2} = parse_Type(Rest),
-	    {{'DEFAULT',Type},Rest2};
-	_  -> {'MANDATORY',Tokens}
-    end.
-
-parse_ValueSetOptionalitySpec(Tokens) ->
-    case Tokens of
-	[{'OPTIONAL',_}|Rest] -> {'OPTIONAL',Rest};
-	[{'DEFAULT',_}|Rest] ->
-	    {ValueSet,Rest2} = parse_ValueSet(Rest),
-	    {{'DEFAULT',ValueSet},Rest2};
-	_  -> {'MANDATORY',Tokens}
-    end.
-
-parse_ObjectSetOptionalitySpec(Tokens) ->
-        case Tokens of
-	[{'OPTIONAL',_}|Rest] -> {'OPTIONAL',Rest};
-	[{'DEFAULT',_}|Rest] ->
-	    {ObjectSet,Rest2} = parse_ObjectSet(Rest),
-	    {{'DEFAULT',ObjectSet},Rest2};
-	_  -> {'MANDATORY',Tokens}
-    end.
-
-parse_WithSyntaxSpec([{'WITH',_},{'SYNTAX',_}|Rest]) ->
-    {SyntaxList,Rest2} = parse_SyntaxList(Rest),
-    {{'WITH SYNTAX',SyntaxList},Rest2};
-parse_WithSyntaxSpec(Tokens) ->
-    {[],Tokens}.
-
-parse_SyntaxList([{'{',_},{'}',_}|Rest]) ->
-    {[],Rest};
-parse_SyntaxList([{'{',_}|Rest]) ->
-    parse_SyntaxList(Rest,[]);
-parse_SyntaxList(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,['{}','{']]}}).
-
-parse_SyntaxList(Tokens,Acc) ->
-    {SyntaxList,Rest} = parse_TokenOrGroupSpec(Tokens),
-    case Rest of
-	[{'}',_}|Rest2] -> 
-	    {lists:reverse([SyntaxList|Acc]),Rest2};
-	_ ->
-	    parse_SyntaxList(Rest,[SyntaxList|Acc])
-    end.
-
-parse_TokenOrGroupSpec(Tokens) ->
-    Flist = [fun parse_RequiredToken/1,
-	     fun parse_OptionalGroup/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_RequiredToken([{typereference,L1,WordName}|Rest]) ->
-    case is_word(WordName) of
-	false ->
-	    throw({asn1_error,{L1,get(asn1_module),
-			       [got,WordName,expected,a,'Word']}});
-	true ->
-	    {WordName,Rest}
-    end;
-parse_RequiredToken([{',',L1}|Rest]) ->
-    {{',',L1},Rest};
-parse_RequiredToken([{WordName,L1}|Rest]) ->
-    case is_word(WordName) of
-	false ->
-	    throw({asn1_error,{L1,get(asn1_module),
-			       [got,WordName,expected,a,'Word']}});
-	true ->
-	    {WordName,Rest}
-    end;
-parse_RequiredToken(Tokens) ->
-    parse_PrimitiveFieldName(Tokens).
-
-parse_OptionalGroup([{'[',_}|Rest]) ->
-    {Spec,Rest2} = parse_TokenOrGroupSpec(Rest),
-    {SpecList,Rest3} = parse_OptionalGroup(Rest2,[Spec]),
-    {SpecList,Rest3}.
-
-parse_OptionalGroup([{']',_}|Rest],Acc) ->
-    {lists:reverse(Acc),Rest};
-parse_OptionalGroup(Tokens,Acc) ->
-    {Spec,Rest} = parse_TokenOrGroupSpec(Tokens),
-    parse_OptionalGroup(Rest,[Spec|Acc]).
-
-parse_DefinedObject([Id={identifier,_,_ObjName}|Rest]) ->
-    {{object,identifier2Extvalueref(Id)},Rest};
-parse_DefinedObject([{typereference,L1,ModName},{'.',_},{identifier,_,ObjName}|Rest]) ->
-    {{object, #'Externaltypereference'{pos=L1,module=ModName,type=ObjName}},Rest};
-parse_DefinedObject(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-		       [identifier,'typereference.identifier']]}}).
-
-parse_ObjectAssignment([{identifier,L1,ObjName}|Rest]) ->
-    {Class,Rest2} = parse_DefinedObjectClass(Rest),
-    case Rest2 of
-	[{'::=',_}|Rest3] ->
-	    {Object,Rest4} = parse_Object(Rest3),
-	    {#typedef{pos=L1,name=ObjName,
-		      typespec=#'Object'{classname=Class,def=Object}},Rest4};
-	[H|_T]  -> 
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'::=']}});
-	Other ->
-	    throw({asn1_error,{L1,get(asn1_module),
-			       [got,Other,expected,'::=']}})
-    end;
-parse_ObjectAssignment(Tokens) ->
-    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
-				  [got,get_token(hd(Tokens)),expected,identifier]}}).
-
-parse_Object(Tokens) ->
-    Flist=[fun parse_ObjectDefn/1,
-	   fun parse_ObjectFromObject/1,
-	   fun parse_ParameterizedObject/1,
-	   fun parse_DefinedObject/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_ObjectDefn(Tokens) ->
-    Flist=[fun parse_DefaultSyntax/1,
-	   fun parse_DefinedSyntax/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_DefaultSyntax([{'{',_},{'}',_}|Rest]) ->
-    {{object,defaultsyntax,[]},Rest};
-parse_DefaultSyntax([{'{',_}|Rest]) ->
-    parse_DefaultSyntax(Rest,[]);
-parse_DefaultSyntax(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,['{}','{']]}}).
-
-parse_DefaultSyntax(Tokens,Acc) ->
-    {Setting,Rest} = parse_FieldSetting(Tokens),
-    case Rest of
-	[{',',_}|Rest2] ->
-	    parse_DefaultSyntax(Rest2,[Setting|Acc]);
-	[{'}',_}|Rest3] ->
-	    {{object,defaultsyntax,lists:reverse([Setting|Acc])},Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,[',','}']]}})
-    end.
-
-parse_FieldSetting(Tokens) ->
-    {{_,PrimFieldName},Rest} = parse_PrimitiveFieldName(Tokens),
-    {Setting,Rest2} = parse_Setting(Rest),
-    {{PrimFieldName,Setting},Rest2}.
-
-parse_DefinedSyntax([{'{',_}|Rest]) ->
-    parse_DefinedSyntax(Rest,[]).
-
-parse_DefinedSyntax(Tokens,Acc) ->
-    case Tokens of
-	[{'}',_}|Rest2] ->
-	    {{object,definedsyntax,lists:reverse(Acc)},Rest2};
-	_ ->
-	    {DefSynTok,Rest3} = parse_DefinedSyntaxToken(Tokens),
-	    parse_DefinedSyntax(Rest3,[DefSynTok|Acc])
-    end.
-
-parse_DefinedSyntaxToken([{',',L1}|Rest]) ->
-    {{',',L1},Rest};
-parse_DefinedSyntaxToken([{typereference,L1,Name}|Rest]) ->
-    case is_word(Name) of
-	false ->
-	    {{setting,L1,Name},Rest};
-	true ->
-	    {{word_or_setting,L1,Name},Rest}
-    end;
-parse_DefinedSyntaxToken(Tokens) ->
-    case catch parse_Setting(Tokens) of
-	{asn1_error,_} ->
-	    parse_Word(Tokens);
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	Result ->
-	    Result
-    end.
-
-parse_Word([{Name,Pos}|Rest]) ->
-    case is_word(Name) of
-	false ->
-	    throw({asn1_error,{Pos,get(asn1_module),
-			       [got,Name, expected,a,'Word']}});
-	true ->
-	    {{word_or_setting,Pos,Name},Rest}
-    end.
-
-parse_Setting(Tokens) ->
-    Flist = [fun parse_Type/1,
-	     fun parse_Value/1,
-	     fun parse_Object/1,
-	     fun parse_ObjectSet/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_DefinedObjectSet([{typereference,L1,ModuleName},{'.',_},
-			{typereference,L2,ObjSetName}|Rest]) ->
-    {{objectset,L1,#'Externaltypereference'{pos=L2,module=ModuleName,
-					    type=ObjSetName}},Rest};
-parse_DefinedObjectSet([{typereference,L1,ObjSetName}|Rest]) ->
-    {{objectset,L1,#'Externaltypereference'{pos=L1,module=get(asn1_module),
-					    type=ObjSetName}},Rest};
-parse_DefinedObjectSet(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-			[typereference,'typereference.typereference']]}}).
-
-parse_ObjectSetAssignment([{typereference,L1,ObjSetName}|Rest]) ->
-    {Class,Rest2} = parse_DefinedObjectClass(Rest),
-    case Rest2 of
-	[{'::=',_}|Rest3] ->
-	    {ObjectSet,Rest4} = parse_ObjectSet(Rest3),
-	    {#typedef{pos=L1,name=ObjSetName,
-		      typespec=#'ObjectSet'{class=Class,
-					    set=ObjectSet}},Rest4};
-	[H|_T]  -> 
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'::=']}})
-%%%	Other ->
-%%%	    throw(Other)
-    end;
-parse_ObjectSetAssignment(Tokens) ->
-    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
-				  [got,get_token(hd(Tokens)),expected,
-				   typereference]}}).
-
-parse_ObjectSet([{'{',_}|Rest]) ->
-    {ObjSetSpec,Rest2} = parse_ObjectSetSpec(Rest),
-    case Rest2 of
-	[{'}',_}|Rest3] ->
-	    {ObjSetSpec,Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'}']}})
-    end;
-parse_ObjectSet(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'{']}}).
-
-parse_ObjectSetSpec([{'...',_}|Rest]) ->
-    {['EXTENSIONMARK'],Rest};
-parse_ObjectSetSpec(Tokens) ->
-    parse_ElementSetSpecs(Tokens).
-
-parse_ObjectSetElements(Tokens) ->
-    Flist = [fun parse_Object/1,
-	     fun parse_DefinedObjectSet/1,
-	     fun parse_ObjectSetFromObjects/1,
-	     fun parse_ParameterizedObjectSet/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_ObjectClassFieldType(Tokens) ->
-    {Class,Rest} = parse_DefinedObjectClass(Tokens),
-    case Rest of
-	[{'.',_}|Rest2] ->
-	    {FieldName,Rest3} = parse_FieldName(Rest2),
-	    OCFT = #'ObjectClassFieldType'{
-	      classname=Class,
-	      class=Class,fieldname=FieldName},
-	    {#type{def=OCFT},Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'.']}})
-%%%	Other ->
-%%%	    throw(Other)
-    end.
-
-%parse_ObjectClassFieldValue(Tokens) ->
-%    Flist = [fun parse_OpenTypeFieldVal/1,
-%	     fun parse_FixedTypeFieldVal/1],
-%    case (catch parse_or(Tokens,Flist)) of
-%	{'EXIT',Reason} ->
-%	    throw(Reason);
-%	AsnErr = {asn1_error,_} ->
-%	    throw(AsnErr);
-%	Result ->
-%	    Result
-%    end.
-
-parse_ObjectClassFieldValue(Tokens) ->
-    parse_OpenTypeFieldVal(Tokens).
-
-parse_OpenTypeFieldVal(Tokens) ->
-    {Type,Rest} = parse_Type(Tokens),
-    case Rest of
-	[{':',_}|Rest2] ->
-	    {Value,Rest3} = parse_Value(Rest2),
-	    {{opentypefieldvalue,Type,Value},Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,':']}})
-    end.
-
-% parse_FixedTypeFieldVal(Tokens) ->
-%     parse_Value(Tokens).
-
-% parse_InformationFromObjects(Tokens) ->
-%     Flist = [fun parse_ValueFromObject/1,
-% 	     fun parse_ValueSetFromObjects/1,
-% 	     fun parse_TypeFromObject/1,
-% 	     fun parse_ObjectFromObject/1],
-%     case (catch parse_or(Tokens,Flist)) of
-% 	{'EXIT',Reason} ->
-% 	    throw(Reason);
-% 	AsnErr = {asn1_error,_} ->
-% 	    throw(AsnErr);
-% 	Result ->
-% 	    Result
-%     end.
-
-parse_ReferencedObjects(Tokens) ->
-    Flist = [fun parse_DefinedObject/1,
-	     fun parse_DefinedObjectSet/1,
-	     fun parse_ParameterizedObject/1,
-	     fun parse_ParameterizedObjectSet/1],
-        case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_ValueFromObject(Tokens) ->
-    {Objects,Rest} = parse_ReferencedObjects(Tokens),
-    case Rest of
-	[{'.',_}|Rest2] ->
-	    {Name,Rest3} = parse_FieldName(Rest2),
-	    case lists:last(Name) of
-		{valuefieldreference,_} ->
-		    {{'ValueFromObject',Objects,Name},Rest3};
-		_ ->
-		    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-				       [got,typefieldreference,expected,
-					valuefieldreference]}})
-	    end;
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'.']}})
-%%%	Other ->
-%%%	    throw({asn1_error,{got,Other,expected,'.'}})
-    end.
-
-parse_ValueSetFromObjects(Tokens) ->
-    {Objects,Rest} = parse_ReferencedObjects(Tokens),
-    case Rest of
-	[{'.',_}|Rest2] ->
-	    {Name,Rest3} = parse_FieldName(Rest2),
-	    case lists:last(Name) of
-		{typefieldreference,_FieldName} ->
-		    {{'ValueSetFromObjects',Objects,Name},Rest3};
-		_ ->
-		    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-				       [got,get_token(hd(Rest2)),expected,
-					typefieldreference]}})
-	    end;
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'.']}})
-%%%	Other ->
-%%%	    throw({asn1_error,{got,Other,expected,'.'}})
-    end.
-
-parse_TypeFromObject(Tokens) ->
-    {Objects,Rest} = parse_ReferencedObjects(Tokens),
-    case Rest of
-	[{'.',_}|Rest2] ->
-	    {Name,Rest3} = parse_FieldName(Rest2),
-	    case lists:last(Name) of
-		{typefieldreference,_FieldName} ->
-		    {{'TypeFromObject',Objects,Name},Rest3};
-		_ ->
-		    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-				       [got,get_token(hd(Rest2)),expected,
-					typefieldreference]}})
-	    end;
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'.']}})
-%%%	Other ->
-%%%	    throw({asn1_error,{got,Other,expected,'.'}})
-    end.
-
-parse_ObjectFromObject(Tokens) ->
-    {Objects,Rest} = parse_ReferencedObjects(Tokens),
-    case Rest of
-	[{'.',_}|Rest2] ->
-	    {Name,Rest3} = parse_FieldName(Rest2),
-	    {{'ObjectFromObject',Objects,Name},Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'.']}})
-%%%	Other ->
-%%%	    throw({asn1_error,{got,Other,expected,'.'}})
-    end.
-
-parse_ObjectSetFromObjects(Tokens) ->
-    {Objects,Rest} = parse_ReferencedObjects(Tokens),
-    case Rest of
-	[{'.',_}|Rest2] ->
-	    {Name,Rest3} = parse_FieldName(Rest2),
-	    {{'ObjectSetFromObjects',Objects,Name},Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'.']}})
-%%%	Other ->
-%%%	    throw({asn1_error,{got,Other,expected,'.'}})
-    end.
-
-% parse_InstanceOfType([{'INSTANCE',_},{'OF',_}|Rest]) ->
-%     {Class,Rest2} = parse_DefinedObjectClass(Rest),
-%     {{'InstanceOfType',Class},Rest2}.
-
-% parse_InstanceOfValue(Tokens) ->
-%     parse_Value(Tokens).
-
-
-
-%% X.682 constraint specification
-
-parse_GeneralConstraint(Tokens) ->
-    Flist = [fun parse_UserDefinedConstraint/1,
-	     fun parse_TableConstraint/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_UserDefinedConstraint([{'CONSTRAINED',_},{'BY',_},{'{',_},{'}',_}|Rest])->
-    {{constrained_by,[]},Rest};
-parse_UserDefinedConstraint([{'CONSTRAINED',_},
-			     {'BY',_},
-			     {'{',_}|Rest]) ->
-    {Param,Rest2} = parse_UserDefinedConstraintParameter(Rest),
-    case Rest2 of
-	[{'}',_}|Rest3] ->
-	    {{constrained_by,Param},Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'}']}})
-    end;
-parse_UserDefinedConstraint(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-			['CONSTRAINED BY {}','CONSTRAINED BY {']]}}).
-
-parse_UserDefinedConstraintParameter(Tokens) ->
-    parse_UserDefinedConstraintParameter(Tokens,[]).
-parse_UserDefinedConstraintParameter(Tokens,Acc) ->
-    Flist = [fun parse_GovernorAndActualParameter/1,
-	     fun parse_ActualParameter/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	{Result,Rest} ->
-	    case Rest of
-		[{',',_}|_Rest2] ->
-		    parse_UserDefinedConstraintParameter(Tokens,[Result|Acc]);
-		_  ->
-		    {lists:reverse([Result|Acc]),Rest}
-	    end
-    end.
-
-parse_GovernorAndActualParameter(Tokens) ->
-    {Governor,Rest} = parse_Governor(Tokens),
-    case Rest of
-	[{':',_}|Rest2] ->
-	    {Params,Rest3} = parse_ActualParameter(Rest2),
-	    {{'Governor_Params',Governor,Params},Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,':']}})
-    end.
-
-parse_TableConstraint(Tokens) ->
-    Flist = [fun parse_ComponentRelationConstraint/1,
-	     fun parse_SimpleTableConstraint/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_SimpleTableConstraint(Tokens) ->
-    {ObjectSet,Rest} = parse_ObjectSet(Tokens),
-    {{simpletable,ObjectSet},Rest}.
-
-parse_ComponentRelationConstraint([{'{',_}|Rest]) ->
-    {ObjectSet,Rest2} = parse_DefinedObjectSet(Rest),
-    case Rest2 of
-	[{'}',_},{'{',_}|Rest3] ->
-	    {AtNot,Rest4} = parse_AtNotationList(Rest3,[]),
-	    case Rest4 of
-		[{'}',_}|Rest5] ->
-		    {{componentrelation,ObjectSet,AtNot},Rest5};
-		[H|_T]  ->
-		    throw({asn1_error,{get_line(H),get(asn1_module),
-				       [got,get_token(H),expected,'}']}})
-	    end;
-	[H|_T]  ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,
-				'ComponentRelationConstraint',ended,with,'}']}})
-%%%	Other ->
-%%%	    throw(Other)
-    end;
-parse_ComponentRelationConstraint(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'{']}}).
-
-parse_AtNotationList(Tokens,Acc) ->
-    {AtNot,Rest} = parse_AtNotation(Tokens),
-    case Rest of
-	[{',',_}|Rest2] ->
-	    parse_AtNotationList(Rest2,[AtNot|Acc]);
-	_  ->
-	    {lists:reverse([AtNot|Acc]),Rest}
-    end.
-
-parse_AtNotation([{'@',_},{'.',_}|Rest]) ->
-    {CIdList,Rest2} = parse_ComponentIdList(Rest),
-    {{innermost,CIdList},Rest2};
-parse_AtNotation([{'@',_}|Rest]) ->
-    {CIdList,Rest2} = parse_ComponentIdList(Rest),
-    {{outermost,CIdList},Rest2};
-parse_AtNotation(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,['@','@.']]}}).
-
-parse_ComponentIdList(Tokens) ->
-    parse_ComponentIdList(Tokens,[]).
-
-parse_ComponentIdList([Id = {identifier,_,_},{'.',_}|Rest],Acc) ->
-    parse_ComponentIdList(Rest,[identifier2Extvalueref(Id)|Acc]);
-parse_ComponentIdList([Id = {identifier,_,_}|Rest],Acc) ->
-    {lists:reverse([identifier2Extvalueref(Id)|Acc]),Rest};
-parse_ComponentIdList(Tokens,_) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-			[identifier,'identifier.']]}}).
-
-    
-
-
-
-% X.683 Parameterization of ASN.1 specifications
-
-parse_Governor(Tokens) ->
-    Flist = [fun parse_Type/1,
-	     fun parse_DefinedObjectClass/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_ActualParameter(Tokens) ->
-    Flist = [fun parse_Type/1,
-	     fun parse_Value/1,
-	     fun parse_ValueSet/1,
-	     fun parse_DefinedObjectClass/1,
-	     fun parse_Object/1,
-	     fun parse_ObjectSet/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_ParameterizedAssignment(Tokens) ->
-    Flist = [fun parse_ParameterizedTypeAssignment/1,
-	     fun parse_ParameterizedValueAssignment/1,
-	     fun parse_ParameterizedValueSetTypeAssignment/1,
-	     fun parse_ParameterizedObjectClassAssignment/1,
-	     fun parse_ParameterizedObjectAssignment/1,
-	     fun parse_ParameterizedObjectSetAssignment/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	AsnAssErr = {asn1_assignment_error,_} ->
-	    throw(AsnAssErr);
-	Result ->
-	    Result
-    end.
-
-parse_ParameterizedTypeAssignment([{typereference,L1,Name}|Rest]) ->
-    {ParameterList,Rest2} = parse_ParameterList(Rest),
-    case Rest2 of
-	[{'::=',_}|Rest3] ->
-	    {Type,Rest4} = parse_Type(Rest3),
-	    {#ptypedef{pos=L1,name=Name,args=ParameterList,typespec=Type},
-	     Rest4};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'::=']}})
-    end;
-parse_ParameterizedTypeAssignment(Tokens) ->
-    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
-				  [got,get_token(hd(Tokens)),expected,
-				   typereference]}}).
-
-parse_ParameterizedValueAssignment([{identifier,L1,Name}|Rest]) ->
-    {ParameterList,Rest2} = parse_ParameterList(Rest),
-    {Type,Rest3} = parse_Type(Rest2),
-    case Rest3 of
-	[{'::=',_}|Rest4] ->
-	    {Value,Rest5} = parse_Value(Rest4),
-	    {#pvaluedef{pos=L1,name=Name,args=ParameterList,type=Type,
-			 value=Value},Rest5};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'::=']}})
-    end;
-parse_ParameterizedValueAssignment(Tokens) ->
-    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
-				  [got,get_token(hd(Tokens)),expected,identifier]}}).
-
-parse_ParameterizedValueSetTypeAssignment([{typereference,L1,Name}|Rest]) ->
-    {ParameterList,Rest2} = parse_ParameterList(Rest),
-    {Type,Rest3} = parse_Type(Rest2),
-    case Rest3 of
-	[{'::=',_}|Rest4] ->
-	    {ValueSet,Rest5} = parse_ValueSet(Rest4),
-	    {#pvaluesetdef{pos=L1,name=Name,args=ParameterList,
-			   type=Type,valueset=ValueSet},Rest5};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'::=']}})
-    end;
-parse_ParameterizedValueSetTypeAssignment(Tokens) ->
-    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
-				  [got,get_token(hd(Tokens)),expected,
-				   typereference]}}).
-
-parse_ParameterizedObjectClassAssignment([{typereference,L1,Name}|Rest]) ->
-    {ParameterList,Rest2} = parse_ParameterList(Rest),
-    case Rest2 of
-	[{'::=',_}|Rest3] ->
-	    {Class,Rest4} = parse_ObjectClass(Rest3),
-	    {#ptypedef{pos=L1,name=Name,args=ParameterList,typespec=Class},
-	     Rest4};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'::=']}})
-    end;
-parse_ParameterizedObjectClassAssignment(Tokens) ->
-    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
-				  [got,get_token(hd(Tokens)),expected,
-				   typereference]}}).
-
-parse_ParameterizedObjectAssignment([{identifier,L1,Name}|Rest]) ->
-    {ParameterList,Rest2} = parse_ParameterList(Rest),
-    {Class,Rest3} = parse_DefinedObjectClass(Rest2),
-    case Rest3 of
-	[{'::=',_}|Rest4] ->
-	    {Object,Rest5} = parse_Object(Rest4),
-	    {#pobjectdef{pos=L1,name=Name,args=ParameterList,
-			 class=Class,def=Object},Rest5};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'::=']}})
-%%%	Other ->
-%%%	    throw(Other)
-    end;
-parse_ParameterizedObjectAssignment(Tokens) ->
-    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
-				  [got,get_token(hd(Tokens)),expected,identifier]}}).
-
-parse_ParameterizedObjectSetAssignment([{typereference,L1,Name}|Rest]) ->
-    {ParameterList,Rest2} = parse_ParameterList(Rest),
-    {Class,Rest3} = parse_DefinedObjectClass(Rest2),
-    case Rest3 of
-	[{'::=',_}|Rest4] ->
-	    {ObjectSet,Rest5} = parse_ObjectSet(Rest4),
-	    {#pobjectsetdef{pos=L1,name=Name,args=ParameterList,
-			    class=Class,def=ObjectSet},Rest5};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'::=']}})
-%%%	Other ->
-%%%	    throw(Other)
-    end;
-parse_ParameterizedObjectSetAssignment(Tokens) ->
-    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
-				  [got,get_token(hd(Tokens)),expected,
-				   typereference]}}).
-
-parse_ParameterList([{'{',_}|Rest]) ->
-    parse_ParameterList(Rest,[]);
-parse_ParameterList(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'{']}}).
-
-parse_ParameterList(Tokens,Acc) ->
-    {Parameter,Rest} = parse_Parameter(Tokens),
-    case Rest of
-	[{',',_}|Rest2] ->
-	    parse_ParameterList(Rest2,[Parameter|Acc]);
-	[{'}',_}|Rest3] ->
-	    {lists:reverse([Parameter|Acc]),Rest3};
-	[H|_T]  ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,[',','}']]}})
-    end.
-
-parse_Parameter(Tokens) ->
-    Flist = [fun parse_ParamGovAndRef/1,
-	     fun parse_Reference/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_ParamGovAndRef(Tokens) ->
-    {ParamGov,Rest} = parse_ParamGovernor(Tokens),
-    case Rest of
-	[{':',_}|Rest2] ->
-	    {Ref,Rest3} = parse_Reference(Rest2),
-	    {{ParamGov,Ref},Rest3};
-	[H|_T] ->
-	   throw({asn1_error,{get_line(H),get(asn1_module),
-			      [got,get_token(H),expected,':']}})
-    end.
-
-parse_ParamGovernor(Tokens) ->
-    Flist = [fun parse_Governor/1,
-	     fun parse_Reference/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-% parse_ParameterizedReference(Tokens) ->
-%     {Ref,Rest} = parse_Reference(Tokens),
-%     case Rest of
-% 	[{'{',_},{'}',_}|Rest2] ->
-% 	    {{ptref,Ref},Rest2};
-% 	_  ->
-% 	    {{ptref,Ref},Rest}
-%     end.
-
-parse_SimpleDefinedType([{typereference,L1,ModuleName},{'.',_},
-			 {typereference,_,TypeName}|Rest]) ->
-    {#'Externaltypereference'{pos=L1,module=ModuleName,
-						 type=TypeName},Rest};
-parse_SimpleDefinedType([Tref={typereference,_,_}|Rest]) ->
-%    {#'Externaltypereference'{pos=L2,module=get(asn1_module),
-%						 type=TypeName},Rest};
-    {tref2Exttref(Tref),Rest};
-parse_SimpleDefinedType(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-			[typereference,'typereference.typereference']]}}).
-
-parse_SimpleDefinedValue([{typereference,L1,ModuleName},{'.',_},
-			  {identifier,_,Value}|Rest]) ->
-    {{simpledefinedvalue,#'Externalvaluereference'{pos=L1,module=ModuleName,
-						   value=Value}},Rest};
-parse_SimpleDefinedValue([{identifier,L2,Value}|Rest]) ->
-    {{simpledefinedvalue,L2,Value},Rest};
-parse_SimpleDefinedValue(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-			['typereference.identifier',identifier]]}}).
-
-parse_ParameterizedType(Tokens) ->
-    {Type,Rest} = parse_SimpleDefinedType(Tokens),
-    {Params,Rest2} = parse_ActualParameterList(Rest),
-    {{pt,Type,Params},Rest2}.
-
-parse_ParameterizedValue(Tokens) ->
-    {Value,Rest} = parse_SimpleDefinedValue(Tokens),
-    {Params,Rest2} = parse_ActualParameterList(Rest),
-    {{pv,Value,Params},Rest2}.
-
-parse_ParameterizedObjectClass(Tokens) ->
-    {Type,Rest} = parse_DefinedObjectClass(Tokens),
-    {Params,Rest2} = parse_ActualParameterList(Rest),
-    {{poc,Type,Params},Rest2}.
-
-parse_ParameterizedObjectSet(Tokens) ->
-    {ObjectSet,Rest} = parse_DefinedObjectSet(Tokens),
-    {Params,Rest2} = parse_ActualParameterList(Rest),
-    {{pos,ObjectSet,Params},Rest2}.
-
-parse_ParameterizedObject(Tokens) ->
-    {Object,Rest} = parse_DefinedObject(Tokens),
-    {Params,Rest2} = parse_ActualParameterList(Rest),
-    {{po,Object,Params},Rest2}.
-
-parse_ActualParameterList([{'{',_}|Rest]) ->
-    parse_ActualParameterList(Rest,[]);
-parse_ActualParameterList(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'{']}}).
-
-parse_ActualParameterList(Tokens,Acc) ->
-    {Parameter,Rest} = parse_ActualParameter(Tokens),
-    case Rest of
-	[{',',_}|Rest2] ->
-	    parse_ActualParameterList(Rest2,[Parameter|Acc]);
-	[{'}',_}|Rest3] ->
-	    {lists:reverse([Parameter|Acc]),Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,[',','}']]}})
-%%%	Other ->
-%%%	    throw(Other)
-    end.
-
-
-
-
-
-
-
-%-------------------------
-
-is_word(Token) ->
-    case not_allowed_word(Token) of
-	true -> false;
-	_ ->
-	    if
-		atom(Token) ->
-		    Item = atom_to_list(Token),
-		    is_word(Item);
-		list(Token), length(Token) == 1 ->
-		    check_one_char_word(Token);
-		list(Token) ->
-		    [A|Rest] = Token,
-		    case check_first(A) of
-			true ->
-			    check_rest(Rest);
-			_ -> 
-			    false
-		    end
-	    end
-    end.
-
-not_allowed_word(Name) ->
-    lists:member(Name,["BIT",
-		       "BOOLEAN",
-		       "CHARACTER",
-		       "CHOICE",
-		       "EMBEDDED",
-		       "END",
-		       "ENUMERATED",
-		       "EXTERNAL",
-		       "FALSE",
-		       "INSTANCE",
-		       "INTEGER",
-		       "INTERSECTION",
-		       "MINUS-INFINITY",
-		       "NULL",
-		       "OBJECT",
-		       "OCTET",
-		       "PLUS-INFINITY",
-		       "REAL",
-		       "SEQUENCE",
-		       "SET",
-		       "TRUE",
-		       "UNION"]).
-
-check_one_char_word([A]) when $A =< A, $Z >= A ->
-    true;
-check_one_char_word([_]) ->
-    false. %% unknown item in SyntaxList
-
-check_first(A) when $A =< A, $Z >= A ->
-    true;
-check_first(_) ->
-    false. %% unknown item in SyntaxList
-
-check_rest([R,R|_Rs]) when $- == R ->
-    false; %% two consecutive hyphens are not allowed in a word
-check_rest([R]) when $- == R ->
-    false; %% word cannot end with hyphen
-check_rest([R|Rs]) when $A=<R, $Z>=R; $-==R ->
-    check_rest(Rs);
-check_rest([]) ->
-    true;
-check_rest(_) ->
-    false.
-
-
-to_set(V) when list(V) ->
-	ordsets:list_to_set(V);
-to_set(V) ->
-	ordsets:list_to_set([V]).
-
-
-parse_AlternativeTypeLists(Tokens) ->
-    {AlternativeTypeList,Rest1} = parse_AlternativeTypeList(Tokens),
-    {ExtensionAndException,Rest2} = 
-	case Rest1 of
-	    [{',',_},{'...',L1},{'!',_}|Rest12] ->
-		{_,Rest13} = parse_ExceptionIdentification(Rest12),
-		%% Exception info is currently thrown away
-		{[#'EXTENSIONMARK'{pos=L1}],Rest13};
-	    [{',',_},{'...',L1}|Rest12] ->
-		{[#'EXTENSIONMARK'{pos=L1}],Rest12};
-	    _ ->
-		{[],Rest1}
-	end,
-    case ExtensionAndException of
-	[] ->
-	    {AlternativeTypeList,Rest2};
-	_ ->
-	    {ExtensionAddition,Rest3} = 
-		case Rest2 of
-		    [{',',_}|Rest23] ->
-			parse_ExtensionAdditionAlternativeList(Rest23);
-		    _ ->
-			{[],Rest2}
-		end,
-	    {OptionalExtensionMarker,Rest4} =
-		case Rest3 of
-		    [{',',_},{'...',L3}|Rest31] ->
-			{[#'EXTENSIONMARK'{pos=L3}],Rest31};
-		    _ ->
-			{[],Rest3}
-		end,
-	    {AlternativeTypeList ++ ExtensionAndException ++ ExtensionAddition ++ OptionalExtensionMarker, Rest4}
-    end.
-    
-
-parse_AlternativeTypeList(Tokens) ->
-    parse_AlternativeTypeList(Tokens,[]).
-
-parse_AlternativeTypeList(Tokens,Acc) ->
-    {NamedType,Rest} = parse_NamedType(Tokens),
-    case Rest of
-	[{',',_},Id = {identifier,_,_}|Rest2] ->
-	    parse_AlternativeTypeList([Id|Rest2],[NamedType|Acc]);
-	_ ->
-	    {lists:reverse([NamedType|Acc]),Rest}
-    end.
-
-    
-
-parse_ExtensionAdditionAlternativeList(Tokens) ->
-    parse_ExtensionAdditionAlternativeList(Tokens,[]).
-    
-parse_ExtensionAdditionAlternativeList(Tokens,Acc) ->
-    {Element,Rest0} =
-	case Tokens of
-	    [{identifier,_,_}|_Rest] ->
-		parse_NamedType(Tokens);
-	    [{'[[',_}|_] ->
-		parse_ExtensionAdditionAlternatives(Tokens)
-	end,
-    case Rest0 of
-	[{',',_}|Rest01] ->
-	    parse_ExtensionAdditionAlternativeList(Rest01,[Element|Acc]);
-	_  ->
-	    {lists:reverse([Element|Acc]),Rest0}
-    end.
-
-parse_ExtensionAdditionAlternatives([{'[[',_}|Rest]) ->
-    parse_ExtensionAdditionAlternatives(Rest,[]);
-parse_ExtensionAdditionAlternatives(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'[[']}}).
-
-parse_ExtensionAdditionAlternatives([Id = {identifier,_,_}|Rest],Acc) ->
-    {NamedType, Rest2} = parse_NamedType([Id|Rest]),
-    case Rest2 of
-	[{',',_}|Rest21] ->
-	    parse_ExtensionAdditionAlternatives(Rest21,[NamedType|Acc]);
-	[{']]',_}|Rest21] ->
-	    {lists:reverse(Acc),Rest21};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,[',',']]']]}})
-    end.
-
-parse_NamedType([{identifier,L1,Idname}|Rest]) ->
-    {Type,Rest2} = parse_Type(Rest),
-    {#'ComponentType'{pos=L1,name=Idname,typespec=Type,prop=mandatory},Rest2};
-parse_NamedType(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,identifier]}}).
-
-
-parse_ComponentTypeLists(Tokens) ->
-%    Resulting tuple {ComponentTypeList,Rest1} is returned
-    case Tokens of 
-	[{identifier,_,_}|_Rest0] ->
-	    {Clist,Rest01} = parse_ComponentTypeList(Tokens),
-	    case Rest01 of
-		[{',',_}|Rest02] -> 
-		    parse_ComponentTypeLists(Rest02,Clist);
-		_ ->
-		    {Clist,Rest01}
-	    end;
-	[{'COMPONENTS',_},{'OF',_}|_Rest] ->
-	    {Clist,Rest01} = parse_ComponentTypeList(Tokens),
-	    case Rest01 of
-		[{',',_}|Rest02] -> 
-		    parse_ComponentTypeLists(Rest02,Clist);
-		_ ->
-		    {Clist,Rest01}
-	    end;
-	_ ->
-	    parse_ComponentTypeLists(Tokens,[])
-    end.
-
-parse_ComponentTypeLists([{'...',L1},{'!',_}|Rest],Clist1) ->
-    {_,Rest2} = parse_ExceptionIdentification(Rest),
-    %% Exception info is currently thrown away
-    parse_ComponentTypeLists2(Rest2,Clist1++[#'EXTENSIONMARK'{pos=L1}]);
-parse_ComponentTypeLists([{'...',L1}|Rest],Clist1) ->
-    parse_ComponentTypeLists2(Rest,Clist1++[#'EXTENSIONMARK'{pos=L1}]);
-parse_ComponentTypeLists(Tokens,Clist1) ->
-    {Clist1,Tokens}.
-
-
-parse_ComponentTypeLists2(Tokens,Clist1) ->
-    {ExtensionAddition,Rest2} = 
-	case Tokens of
-	    [{',',_}|Rest1] ->
-		parse_ExtensionAdditionList(Rest1);
-	    _ ->
-		{[],Tokens}
-	end,
-    {OptionalExtensionMarker,Rest3} =
-	case Rest2 of
-	    [{',',_},{'...',L2}|Rest21] ->
-		{[#'EXTENSIONMARK'{pos=L2}],Rest21};
-	    _ ->
-		{[],Rest2}
-	end,
-    {RootComponentTypeList,Rest4} =
-	case Rest3 of
-	    [{',',_}|Rest31] ->
-		parse_ComponentTypeList(Rest31);
-	    _ ->
-		{[],Rest3}
-	end,
-    {Clist1 ++ ExtensionAddition ++ OptionalExtensionMarker ++ RootComponentTypeList, Rest4}.
-    
-
-parse_ComponentTypeList(Tokens) ->
-    parse_ComponentTypeList(Tokens,[]).
-
-parse_ComponentTypeList(Tokens,Acc) ->
-    {ComponentType,Rest} = parse_ComponentType(Tokens),
-    case Rest of
-	[{',',_},Id = {identifier,_,_}|Rest2] ->
-	    parse_ComponentTypeList([Id|Rest2],[ComponentType|Acc]);
-	[{',',_},C1={'COMPONENTS',_},C2={'OF',_}|Rest2] ->
-	    parse_ComponentTypeList([C1,C2|Rest2],[ComponentType|Acc]);
-% 	_ ->
-% 	    {lists:reverse([ComponentType|Acc]),Rest}
-	[{'}',_}|_] ->
-	    {lists:reverse([ComponentType|Acc]),Rest};
-	[{',',_},{'...',_}|_] ->
-	    {lists:reverse([ComponentType|Acc]),Rest};
-	_ ->
-	    throw({asn1_error,
-		   {get_line(hd(Tokens)),get(asn1_module),
-		    [got,[get_token(hd(Rest)),get_token(hd(tl(Rest)))],
-		     expected,['}',', identifier']]}})
-    end.
-
-    
-parse_ExtensionAdditionList(Tokens) ->
-    parse_ExtensionAdditionList(Tokens,[]).
-    
-parse_ExtensionAdditionList(Tokens,Acc) ->
-    {Element,Rest0} =
-	case Tokens of
-	    [{identifier,_,_}|_Rest] ->
-		parse_ComponentType(Tokens);
-	    [{'[[',_}|_] ->
-		parse_ExtensionAdditions(Tokens);
-	    _ ->
-		throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-				   [got,get_token(hd(Tokens)),expected,
-				    [identifier,'[[']]}})
-	end,
-    case Rest0 of
-	[{',',_}|Rest01] ->
-	    parse_ExtensionAdditionList(Rest01,[Element|Acc]);
-	_  ->
-	    {lists:reverse([Element|Acc]),Rest0}
-    end.
-
-parse_ExtensionAdditions([{'[[',_}|Rest]) ->
-    parse_ExtensionAdditions(Rest,[]);
-parse_ExtensionAdditions(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'[[']}}).
-
-parse_ExtensionAdditions([Id = {identifier,_,_}|Rest],Acc) ->
-    {ComponentType, Rest2} = parse_ComponentType([Id|Rest]),
-    case Rest2 of
-	[{',',_}|Rest21] ->
-	    parse_ExtensionAdditions(Rest21,[ComponentType|Acc]);
-	[{']]',_}|Rest21] ->
-	    {lists:reverse(Acc),Rest21};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,[',',']]']]}})
-    end;
-parse_ExtensionAdditions(Tokens,_) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,identifier]}}).
-
-parse_ComponentType([{'COMPONENTS',_},{'OF',_}|Rest]) ->
-    {Type,Rest2} = parse_Type(Rest),
-    {{'COMPONENTS OF',Type},Rest2};
-parse_ComponentType(Tokens) ->
-    {NamedType,Rest} = parse_NamedType(Tokens),
-    case Rest of
-	[{'OPTIONAL',_}|Rest2] ->
-	    {NamedType#'ComponentType'{prop='OPTIONAL'},Rest2};
-	[{'DEFAULT',_}|Rest2] ->
-	    {Value,Rest21} = parse_Value(Rest2),
-	    {NamedType#'ComponentType'{prop={'DEFAULT',Value}},Rest21};
-	_ ->
-	    {NamedType,Rest}
-    end.
-
-	    
-
-parse_SignedNumber([{number,_,Value}|Rest]) ->
-    {Value,Rest};
-parse_SignedNumber([{'-',_},{number,_,Value}|Rest]) ->
-    {-Value,Rest};
-parse_SignedNumber(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,
-			[number,'-number']]}}).
-
-parse_Enumerations(Tokens=[{identifier,_,_}|_Rest]) ->
-    parse_Enumerations(Tokens,[]);
-parse_Enumerations([H|_T]) ->
-    throw({asn1_error,{get_line(H),get(asn1_module),
-		       [got,get_token(H),expected,identifier]}}).
-
-parse_Enumerations(Tokens = [{identifier,_,_},{'(',_}|_Rest], Acc) ->
-    {NamedNumber,Rest2} = parse_NamedNumber(Tokens),
-    case Rest2 of
-	[{',',_}|Rest3] ->
-	    parse_Enumerations(Rest3,[NamedNumber|Acc]);
-	_ ->
-	    {lists:reverse([NamedNumber|Acc]),Rest2}
-    end;
-parse_Enumerations([{identifier,_,Id}|Rest], Acc) ->
-    case Rest of
-	[{',',_}|Rest2] ->
-	    parse_Enumerations(Rest2,[Id|Acc]);
-	_ ->
-	    {lists:reverse([Id|Acc]),Rest}
-    end;
-parse_Enumerations([{'...',_}|Rest], Acc) ->
-    case Rest of
-	[{',',_}|Rest2] ->
-	    parse_Enumerations(Rest2,['EXTENSIONMARK'|Acc]);
-	_ ->
-	    {lists:reverse(['EXTENSIONMARK'|Acc]),Rest}
-    end;
-parse_Enumerations([H|_T],_) ->
-    throw({asn1_error,{get_line(H),get(asn1_module),
-		       [got,get_token(H),expected,identifier]}}).
-
-parse_NamedNumberList(Tokens) ->
-    parse_NamedNumberList(Tokens,[]).
-
-parse_NamedNumberList(Tokens,Acc) ->
-    {NamedNum,Rest} = parse_NamedNumber(Tokens),
-    case Rest of
-	[{',',_}|Rest2] ->
-	    parse_NamedNumberList(Rest2,[NamedNum|Acc]);
-	_ ->
-	    {lists:reverse([NamedNum|Acc]),Rest}
-    end.
-
-parse_NamedNumber([{identifier,_,Name},{'(',_}|Rest]) ->
-    Flist = [fun parse_SignedNumber/1,
-	     fun parse_DefinedValue/1],
-    case (catch parse_or(Rest,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	{NamedNum,[{')',_}|Rest2]} ->
-	    {{'NamedNumber',Name,NamedNum},Rest2};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
-			       [got,get_token(hd(Rest)),expected,'NamedNumberList']}})
-    end;
-parse_NamedNumber(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,identifier]}}).
-
-
-parse_Tag([{'[',_}|Rest]) ->
-    {Class,Rest2} = parse_Class(Rest),
-    {ClassNumber,Rest3} = 
-	case Rest2 of
-	    [{number,_,Num}|Rest21] ->
-		{Num,Rest21};
-	    _ ->
-		parse_DefinedValue(Rest2)
-	end,
-    case Rest3 of
-	[{']',_}|Rest4] ->
-	    {#tag{class=Class,number=ClassNumber},Rest4};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest3)),get(asn1_module),
-			       [got,get_token(hd(Rest3)),expected,']']}})
-    end;
-parse_Tag(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'[']}}).
-
-parse_Class([{'UNIVERSAL',_}|Rest]) ->
-    {'UNIVERSAL',Rest};
-parse_Class([{'APPLICATION',_}|Rest]) ->
-    {'APPLICATION',Rest};
-parse_Class([{'PRIVATE',_}|Rest]) ->
-    {'PRIVATE',Rest};
-parse_Class(Tokens) ->
-    {'CONTEXT',Tokens}.
-
-parse_Value(Tokens) ->
-    Flist = [fun parse_BuiltinValue/1,
-	     fun parse_ValueFromObject/1,
-	     fun parse_DefinedValue/1],
-
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end.
-
-parse_BuiltinValue([{bstring,_,Bstr}|Rest]) ->
-    {{bstring,Bstr},Rest};
-parse_BuiltinValue([{hstring,_,Hstr}|Rest]) ->
-    {{hstring,Hstr},Rest};
-parse_BuiltinValue([{'{',_},{'}',_}|Rest]) ->
-    {[],Rest};
-parse_BuiltinValue(Tokens = [{'{',_}|_Rest]) ->
-    Flist = [
-	     fun parse_SequenceOfValue/1, 
-	     fun parse_SequenceValue/1, 
-	     fun parse_ObjectIdentifierValue/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	Result ->
-	    Result
-    end;
-parse_BuiltinValue([{identifier,_,IdName},{':',_}|Rest]) ->
-    {Value,Rest2} = parse_Value(Rest),
-    {{'CHOICE',{IdName,Value}},Rest2};
-parse_BuiltinValue([{'NULL',_}|Rest]) ->
-    {'NULL',Rest};
-parse_BuiltinValue([{'TRUE',_}|Rest]) ->
-    {true,Rest};
-parse_BuiltinValue([{'FALSE',_}|Rest]) ->
-    {false,Rest};
-parse_BuiltinValue([{'PLUS-INFINITY',_}|Rest]) ->
-    {'PLUS-INFINITY',Rest};
-parse_BuiltinValue([{'MINUS-INFINITY',_}|Rest]) ->
-    {'MINUS-INFINITY',Rest};
-parse_BuiltinValue([{cstring,_,Cstr}|Rest]) ->
-    {Cstr,Rest};
-parse_BuiltinValue([{number,_,Num}|Rest]) ->
-    {Num,Rest};
-parse_BuiltinValue([{'-',_},{number,_,Num}|Rest]) ->
-    {- Num,Rest};
-parse_BuiltinValue(Tokens) ->
-    parse_ObjectClassFieldValue(Tokens).
-
-%% Externalvaluereference
-parse_DefinedValue([{typereference,L1,Tname},{'.',_},{identifier,_,Idname}|Rest]) ->
-    {#'Externalvaluereference'{pos=L1,module=Tname,value=Idname},Rest};
-%% valuereference
-parse_DefinedValue([Id = {identifier,_,_}|Rest]) ->
-    {identifier2Extvalueref(Id),Rest};
-%% ParameterizedValue
-parse_DefinedValue(Tokens) ->
-    parse_ParameterizedValue(Tokens).
-
-
-parse_SequenceValue([{'{',_}|Tokens]) ->
-    parse_SequenceValue(Tokens,[]);
-parse_SequenceValue(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'{']}}).
-
-parse_SequenceValue([{identifier,_,IdName}|Rest],Acc) ->
-    {Value,Rest2} = parse_Value(Rest),
-    case Rest2 of
-	[{',',_}|Rest3] ->
-	    parse_SequenceValue(Rest3,[{IdName,Value}|Acc]);
-	[{'}',_}|Rest3] ->
-	    {lists:reverse([{IdName,Value}|Acc]),Rest3};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'}']}})
-    end;
-parse_SequenceValue(Tokens,_Acc) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,identifier]}}).
-
-parse_SequenceOfValue([{'{',_}|Tokens]) ->
-    parse_SequenceOfValue(Tokens,[]);
-parse_SequenceOfValue(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'{']}}).
-
-parse_SequenceOfValue(Tokens,Acc) ->
-    {Value,Rest2} = parse_Value(Tokens),
-    case Rest2 of
-	[{',',_}|Rest3] ->
-	    parse_SequenceOfValue(Rest3,[Value|Acc]);
-	[{'}',_}|Rest3] ->
-	    {lists:reverse([Value|Acc]),Rest3};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'}']}})
-    end.
-
-parse_ValueSetTypeAssignment([{typereference,L1,Name}|Rest]) ->
-    {Type,Rest2} = parse_Type(Rest),
-    case Rest2 of
-	[{'::=',_}|Rest3] ->
-	    {ValueSet,Rest4} = parse_ValueSet(Rest3),
-	    {#valuedef{pos=L1,name=Name,type=Type,value=ValueSet},Rest4};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(L1),get(asn1_module),
-			       [got,get_token(H),expected,'::=']}})
-    end;
-parse_ValueSetTypeAssignment(Tokens) ->
-    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
-				  [got,get_token(hd(Tokens)),expected,
-				   typereference]}}).
-
-parse_ValueSet([{'{',_}|Rest]) ->
-    {Elems,Rest2} = parse_ElementSetSpecs(Rest),
-    case Rest2 of
-	[{'}',_}|Rest3] ->
-	    {{valueset,Elems},Rest3};
-	[H|_T] ->
-	    throw({asn1_error,{get_line(H),get(asn1_module),
-			       [got,get_token(H),expected,'}']}})
-    end;
-parse_ValueSet(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'{']}}).
-
-parse_ValueAssignment([{identifier,L1,IdName}|Rest]) ->
-    {Type,Rest2} = parse_Type(Rest),
-    case Rest2 of
-	[{'::=',_}|Rest3] ->
-	    {Value,Rest4} = parse_Value(Rest3),
-	    case lookahead_assignment(Rest4) of
-		ok ->
-		    {#valuedef{pos=L1,name=IdName,type=Type,value=Value},Rest4};
-		_ ->
-		    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-				       [got,get_token(hd(Rest2)),expected,'::=']}})
-	    end;
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'::=']}})
-    end;
-parse_ValueAssignment(Tokens) ->
-    throw({asn1_assignment_error,{get_line(hd(Tokens)),get(asn1_module),
-				  [got,get_token(hd(Tokens)),expected,identifier]}}).
-
-%% SizeConstraint
-parse_SubtypeElements([{'SIZE',_}|Tokens]) ->
-    {Constraint,Rest} = parse_Constraint(Tokens),
-    {{'SizeConstraint',Constraint#constraint.c},Rest};
-%% PermittedAlphabet
-parse_SubtypeElements([{'FROM',_}|Tokens]) ->
-    {Constraint,Rest} = parse_Constraint(Tokens),
-    {{'PermittedAlphabet',Constraint#constraint.c},Rest};
-%% InnerTypeConstraints
-parse_SubtypeElements([{'WITH',_},{'COMPONENT',_}|Tokens]) ->
-    {Constraint,Rest} = parse_Constraint(Tokens),
-    {{'WITH COMPONENT',Constraint},Rest};
-parse_SubtypeElements([{'WITH',_},{'COMPONENTS',_},{'{',_},{'...',_},{',',_}|Tokens]) ->
-    {Constraint,Rest} = parse_TypeConstraints(Tokens),
-    case Rest of
-	[{'}',_}|Rest2] ->
-	    {{'WITH COMPONENTS',{'PartialSpecification',Constraint}},Rest2};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
-			       [got,get_token(hd(Rest)),expected,'}']}})
-    end;
-parse_SubtypeElements([{'WITH',_},{'COMPONENTS',_},{'{',_}|Tokens]) ->
-    {Constraint,Rest} = parse_TypeConstraints(Tokens),
-    case Rest of
-	[{'}',_}|Rest2] ->
-	    {{'WITH COMPONENTS',{'FullSpecification',Constraint}},Rest2};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
-			       [got,get_token(hd(Rest)),expected,'}']}})
-    end;
-%% SingleValue
-%% ContainedSubtype
-%% ValueRange
-%% TypeConstraint
-parse_SubtypeElements(Tokens) ->
-    Flist = [fun parse_ContainedSubtype/1,
-	     fun parse_Value/1, 
-	     fun([{'MIN',_}|T]) -> {'MIN',T} end,
-	     fun parse_Type/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	{asn1_error,Reason} ->
-	    throw(Reason);
-	Result = {Val,_} when record(Val,type) ->
-	    Result;
-	{Lower,[{'..',_}|Rest]} ->
-	    {Upper,Rest2} = parse_UpperEndpoint(Rest),
-	    {{'ValueRange',{Lower,Upper}},Rest2};
-	{Lower,[{'<',_},{'..',_}|Rest]} ->
-	    {Upper,Rest2} = parse_UpperEndpoint(Rest),
-	    {{'ValueRange',{{gt,Lower},Upper}},Rest2};
-	{Res={'ContainedSubtype',_Type},Rest} ->
-	    {Res,Rest};
-	{Value,Rest} ->
-	    {{'SingleValue',Value},Rest}
-    end.
-
-parse_ContainedSubtype([{'INCLUDES',_}|Rest]) ->
-    {Type,Rest2} = parse_Type(Rest),
-    {{'ContainedSubtype',Type},Rest2};
-parse_ContainedSubtype(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'INCLUDES']}}).
-%%parse_ContainedSubtype(Tokens) -> %this option is moved to parse_SubtypeElements
-%%    parse_Type(Tokens).
-
-parse_UpperEndpoint([{'<',_}|Rest]) ->
-    parse_UpperEndpoint(lt,Rest);
-parse_UpperEndpoint(Tokens) ->
-    parse_UpperEndpoint(false,Tokens).
-
-parse_UpperEndpoint(Lt,Tokens) ->
-    Flist = [ fun([{'MAX',_}|T]) -> {'MAX',T} end,
-	      fun parse_Value/1],
-    case (catch parse_or(Tokens,Flist)) of
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	AsnErr = {asn1_error,_} ->
-	    throw(AsnErr);
-	{Value,Rest2} when Lt == lt ->
-	    {{lt,Value},Rest2};
-	{Value,Rest2} ->
-	    {Value,Rest2}
-    end.
-
-parse_TypeConstraints(Tokens) ->
-    parse_TypeConstraints(Tokens,[]).
-
-parse_TypeConstraints([{identifier,_,_}|Rest],Acc) ->
-    {ComponentConstraint,Rest2} = parse_ComponentConstraint(Rest),
-    case Rest2 of
-	[{',',_}|Rest3] ->
-	    parse_TypeConstraints(Rest3,[ComponentConstraint|Acc]);
-	_ ->
-	    {lists:reverse([ComponentConstraint|Acc]),Rest2}
-    end;
-parse_TypeConstraints([H|_T],_) ->
-    throw({asn1_error,{get_line(H),get(asn1_module),
-		       [got,get_token(H),expected,identifier]}}).
-
-parse_ComponentConstraint(Tokens = [{'(',_}|_Rest]) ->
-    {ValueConstraint,Rest2} = parse_Constraint(Tokens),
-    {PresenceConstraint,Rest3} = parse_PresenceConstraint(Rest2),
-    {{ValueConstraint,PresenceConstraint},Rest3};
-parse_ComponentConstraint(Tokens) ->
-    {PresenceConstraint,Rest} = parse_PresenceConstraint(Tokens),
-    {{asn1_empty,PresenceConstraint},Rest}.
-
-parse_PresenceConstraint([{'PRESENT',_}|Rest]) ->
-    {'PRESENT',Rest};
-parse_PresenceConstraint([{'ABSENT',_}|Rest]) ->
-    {'ABSENT',Rest};
-parse_PresenceConstraint([{'OPTIONAL',_}|Rest]) ->
-    {'OPTIONAL',Rest};
-parse_PresenceConstraint(Tokens) ->
-    {asn1_empty,Tokens}.
-
-
-merge_constraints({Rlist,ExtList}) -> % extensionmarker in constraint
-    {merge_constraints(Rlist,[],[]),
-     merge_constraints(ExtList,[],[])};
-	
-merge_constraints(Clist) ->
-    merge_constraints(Clist, [], []).
-
-merge_constraints([Ch|Ct],Cacc, Eacc) ->
-    NewEacc = case Ch#constraint.e of
-		  undefined -> Eacc;
-		  E -> [E|Eacc]
-	      end,
-    merge_constraints(Ct,[fixup_constraint(Ch#constraint.c)|Cacc],NewEacc);
-
-merge_constraints([],Cacc,[]) ->
-%%    lists:flatten(Cacc);
-    lists:reverse(Cacc);
-merge_constraints([],Cacc,Eacc) ->
-%%    lists:flatten(Cacc) ++ [{'Errors',Eacc}].
-    lists:reverse(Cacc) ++ [{'Errors',Eacc}].
-
-fixup_constraint(C) ->
-    case C of
-	{'SingleValue',SubType} when element(1,SubType) == 'ContainedSubtype' ->
-	    SubType;
-	{'SingleValue',V} when list(V) ->
-	    C;
-	%%	    [C,{'ValueRange',{lists:min(V),lists:max(V)}}]; 
-	%% bug, turns wrong when an element in V is a reference to a defined value
-	{'PermittedAlphabet',{'SingleValue',V}} when list(V) ->
-	    %%sort and remove duplicates
-	    V2 = {'SingleValue',
-		  ordsets:list_to_set(lists:flatten(V))},
-	    {'PermittedAlphabet',V2};
-	{'PermittedAlphabet',{'SingleValue',V}} ->
-	    V2 = {'SingleValue',[V]},
-	    {'PermittedAlphabet',V2};
-	{'SizeConstraint',Sc} ->
-	    {'SizeConstraint',fixup_size_constraint(Sc)};
-	
-	List when list(List) ->  %% In This case maybe a union or intersection
-	    [fixup_constraint(Xc)||Xc <- List];
-	Other ->
-	    Other
-    end.
-
-fixup_size_constraint({'ValueRange',{Lb,Ub}}) ->
-	{Lb,Ub};
-fixup_size_constraint({{'ValueRange',R},[]}) ->
-	{R,[]};
-fixup_size_constraint({[],{'ValueRange',R}}) ->
-	{[],R};
-fixup_size_constraint({{'ValueRange',R1},{'ValueRange',R2}}) ->
-	{R1,R2};
-fixup_size_constraint({'SingleValue',[Sv]}) ->
-	fixup_size_constraint({'SingleValue',Sv});
-fixup_size_constraint({'SingleValue',L}) when list(L) ->
-	ordsets:list_to_set(L);
-fixup_size_constraint({'SingleValue',L}) ->
-	{L,L};
-fixup_size_constraint({C1,C2}) ->
-	{fixup_size_constraint(C1), fixup_size_constraint(C2)}.
-   
-get_line({_,Pos,Token}) when integer(Pos),atom(Token) ->
-    Pos;
-get_line({Token,Pos}) when integer(Pos),atom(Token) ->
-    Pos;
-get_line(_) ->
-    undefined.
-
-get_token({_,Pos,Token}) when integer(Pos),atom(Token) ->
-    Token;
-get_token({'$end',Pos}) when integer(Pos) ->
-    undefined;
-get_token({Token,Pos}) when integer(Pos),atom(Token) ->
-    Token;
-get_token(_) ->
-    undefined.
-
-prioritize_error(ErrList) ->
-    case lists:keymember(asn1_error,1,ErrList) of
-	false -> % only asn1_assignment_error -> take the last
-	    lists:last(ErrList);
-	true -> % contains errors from deeper in a Type
-	    NewErrList = [_Err={_,_}|_RestErr] =
-		lists:filter(fun({asn1_error,_})->true;(_)->false end,
-			     ErrList),
-	    SplitErrs =
-		lists:splitwith(fun({_,X})->
-					case element(1,X) of
-					    Int when integer(Int) -> true;
-					    _ -> false
-					end
-				end,
-				NewErrList),
-	    case SplitErrs of
-		{[],UndefPosErrs} -> % if no error with Positon exists
-		    lists:last(UndefPosErrs);
-		{IntPosErrs,_} ->
-		    IntPosReasons = lists:map(fun(X)->element(2,X) end,IntPosErrs),
-		    SortedReasons = lists:keysort(1,IntPosReasons),
-		    {asn1_error,lists:last(SortedReasons)}
-	    end
-    end.
-
-%% most_prio_error([H={_,Reason}|T],Atom,Err) when atom(Atom) ->
-%%     most_prio_error(T,element(1,Reason),H);
-%% most_prio_error([H={_,Reason}|T],Greatest,Err) ->
-%%     case element(1,Reason) of
-%% 	Pos when integer(Pos),Pos>Greatest ->
-%% 	    most_prio_error(
-
-
-tref2Exttref(#typereference{pos=Pos,val=Name}) ->
-    #'Externaltypereference'{pos=Pos,
-			     module=get(asn1_module),
-			     type=Name}.
-
-tref2Exttref(Pos,Name) ->
-    #'Externaltypereference'{pos=Pos,
-			     module=get(asn1_module),
-			     type=Name}.
-
-identifier2Extvalueref(#identifier{pos=Pos,val=Name}) ->
-    #'Externalvaluereference'{pos=Pos,
-			      module=get(asn1_module),
-			      value=Name}.
-
-%% lookahead_assignment/1 checks that the next sequence of tokens
-%% in Token contain a valid assignment or the
-%% 'END' token. Otherwise an exception is thrown.
-lookahead_assignment([{'END',_}|_Rest]) ->
-    ok;
-lookahead_assignment(Tokens) ->
-    parse_Assignment(Tokens),
-    ok.
-	
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_pretty_format.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_pretty_format.erl
deleted file mode 100644
index e0abcd36ec..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_pretty_format.erl
+++ /dev/null
@@ -1,199 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_pretty_format.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
-
-%% usage:  pretty_format:term(Term) -> PNF list of characters
-%%   
-%%  Note: this is usually used in expressions like:
-%%	io:format('~s\n',[pretty_format:term(Term)]).
-%%
-%%  Uses the following simple heuristics
-%%
-%%  1) Simple tuples are printed across the page
-%%     (Simple means *all* the elements are "flat")
-%%  2) The Complex tuple {Arg1, Arg2, Arg3,....} is printed thus:
-%%       {Arg1,
-%%          Arg2,
-%%          Arg3,
-%%          ...}
-%%  3) Lists are treated as for tuples
-%%  4) Lists of printable characters are treated as strings
-%%
-%%  This method seems to work reasonable well for {Tag, ...} type
-%%  data structures
-
--module(asn1ct_pretty_format).
-
--export([term/1]).
-
--import(io_lib, [write/1, write_string/1]).
-
-term(Term) ->
-    element(2, term(Term, 0)).
-
-%%______________________________________________________________________
-%% pretty_format:term(Term, Indent} -> {Indent', Chars}
-%%   Format <Term> -- use <Indent> to indent the *next* line
-%%     Note: Indent' is a new indentaion level (sometimes printing <Term>
-%%     the next line to need an "extra" indent!).
-
-term([], Indent) ->
-    {Indent, [$[,$]]};
-term(L, Indent) when is_list(L) ->
-    case is_string(L) of
-	true ->
-	    {Indent, write_string(L)};
-	false ->
-	    case complex_list(L) of
-		true ->
-		    write_complex_list(L, Indent);
-		false ->
-		    write_simple_list(L, Indent)
-	    end
-    end;
-term(T, Indent) when is_tuple(T) ->
-    case complex_tuple(T) of
-	true ->
-	    write_complex_tuple(T, Indent);
-	false ->
-	    write_simple_tuple(T, Indent)
-    end;
-term(A, Indent) ->
-    {Indent, write(A)}.
-
-%%______________________________________________________________________
-%%  write_simple_list([H|T], Indent) -> {Indent', Chars}
-
-write_simple_list([H|T], Indent) ->
-    {_, S1} = term(H, Indent),
-    {_, S2} = write_simple_list_tail(T, Indent),
-    {Indent, [$[,S1|S2]}.
-
-write_simple_list_tail([H|T], Indent) ->
-    {_, S1} = term(H, Indent),
-    {_, S2} = write_simple_list_tail(T, Indent),
-    {Indent, [$,,S1| S2]};
-write_simple_list_tail([], Indent) ->
-    {Indent, "]"};
-write_simple_list_tail(Other, Indent) ->
-    {_, S} = term(Other, Indent),
-    {Indent, [$|,S,$]]}.
-
-%%______________________________________________________________________
-%%  write_complex_list([H|T], Indent) -> {Indent', Chars}
-
-write_complex_list([H|T], Indent) ->
-    {I1, S1} = term(H, Indent+1),
-    {_, S2} = write_complex_list_tail(T, I1),
-    {Indent, [$[,S1|S2]}.
-
-write_complex_list_tail([H|T], Indent) ->
-    {I1, S1} = term(H, Indent),
-    {_, S2} = write_complex_list_tail(T, I1),
-    {Indent, [$,,nl_indent(Indent),S1,S2]};
-write_complex_list_tail([], Indent) ->
-    {Indent, "]"};
-write_complex_list_tail(Other, Indent) ->$,, 
-    {_, S} = term(Other, Indent),
-    {Indent, [$|,S,$]]}.
-
-%%______________________________________________________________________
-%%  complex_list(List) -> true | false
-%%     returns true if the list is complex otherwise false
-
-complex_list([]) -> 
-    false;
-complex_list([H|T]) when is_number(H); is_atom(H) -> 
-    complex_list(T);
-complex_list([H|T]) ->
-    case is_string(H) of
-	true ->
-	    complex_list(T);
-	false ->
-	    true
-    end;
-complex_list(_) -> true.
-
-%%______________________________________________________________________
-%%  complex_tuple(Tuple) -> true | false
-%%     returns true if the tuple is complex otherwise false
-
-complex_tuple(T) -> 
-    complex_list(tuple_to_list(T)).
-
-%%______________________________________________________________________
-%%  write_simple_tuple(Tuple, Indent} -> {Indent', Chars}
-
-write_simple_tuple({}, Indent) ->
-    {Indent, "{}"};
-write_simple_tuple(Tuple, Indent) ->
-    {_, S} = write_simple_tuple_args(tuple_to_list(Tuple), Indent),
-    {Indent, [${, S, $}]}.
-
-write_simple_tuple_args([X], Indent) ->
-    term(X, Indent);
-write_simple_tuple_args([H|T], Indent) ->
-    {_, SH} = term(H, Indent),
-    {_, ST} = write_simple_tuple_args(T, Indent),
-    {Indent, [SH, $,, ST]}.
-
-%%______________________________________________________________________
-%%  write_complex_tuple(Tuple, Indent} -> {Indent', Chars}
-
-write_complex_tuple(Tuple, Indent) ->
-    [H|T] = tuple_to_list(Tuple),
-    {I1, SH} = term(H, Indent+2),
-    {_, ST} = write_complex_tuple_args(T, I1),
-    {Indent, [${, SH, ST, $}]}.
-
-write_complex_tuple_args([X], Indent) ->
-    {_, S} = term(X, Indent),
-    {Indent, [$,, nl_indent(Indent), S]};
-write_complex_tuple_args([H|T], Indent) ->
-    {I1, SH} = term(H, Indent),
-    {_, ST} = write_complex_tuple_args(T, I1),
-    {Indent, [$,, nl_indent(Indent) , SH, ST]};
-write_complex_tuple_args([], Indent) ->
-    {Indent, []}.
-	
-%%______________________________________________________________________
-%% utilities
-				   
-nl_indent(I) when I >= 0 ->
-    ["\n"|indent(I)];
-nl_indent(_) ->
-    [$\s].
-
-indent(I) when I >= 8 ->
-    [$\t|indent(I-8)];
-indent(I) when I > 0 ->
-    [$\s|indent(I-1)];
-indent(_) ->
-    [].
-
-is_string([9|T]) ->
-    is_string(T);
-is_string([10|T]) ->
-    is_string(T);
-is_string([H|T]) when H >31, H < 127 -> 
-    is_string(T);
-is_string([]) -> 
-    true;
-is_string(_) -> 
-    false.
-
-    
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_tok.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_tok.erl
deleted file mode 100644
index 3ac1b68b37..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_tok.erl
+++ /dev/null
@@ -1,351 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_tok.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
--module(asn1ct_tok).
-
-%% Tokenize ASN.1 code (input to parser generated with yecc)   
-
--export([get_name/2,tokenise/2, file/1]).
-
-
-file(File) ->
-    case file:open(File, [read])  of
-	{error, Reason} ->
-	    {error,{File,file:format_error(Reason)}};
-	{ok,Stream} ->
-	    process0(Stream)
-    end.
-
-process0(Stream) ->
-    process(Stream,0,[]). 
-
-process(Stream,Lno,R) ->
-    process(io:get_line(Stream, ''), Stream,Lno+1,R).
-
-process(eof, Stream,Lno,R) ->
-    file:close(Stream),
-    lists:flatten(lists:reverse([{'$end',Lno}|R]));
-
-
-process(L, Stream,Lno,R) when list(L) ->
-    %%io:format('read:~s',[L]),
-    case catch tokenise(L,Lno) of
-	{'ERR',Reason} ->
-	    io:format("Tokeniser error on line: ~w ~w~n",[Lno,Reason]),
-	    exit(0);
-	T ->
-	    %%io:format('toks:~w~n',[T]),
-	    process(Stream,Lno,[T|R])
-    end. 
-
-
-tokenise([H|T],Lno) when $a =< H , H =< $z ->
-    {X, T1} = get_name(T, [H]),
-    [{identifier,Lno, list_to_atom(X)}|tokenise(T1,Lno)];
-
-tokenise([$&,H|T],Lno) when $A =< H , H =< $Z ->
-    {Y, T1} = get_name(T, [H]),
-    X = list_to_atom(Y),
-    [{typefieldreference, Lno, X} | tokenise(T1, Lno)];
-
-tokenise([$&,H|T],Lno) when $a =< H , H =< $z ->
-    {Y, T1} = get_name(T, [H]),
-    X = list_to_atom(Y),
-    [{valuefieldreference, Lno, X} | tokenise(T1, Lno)];
-
-tokenise([H|T],Lno) when $A =< H , H =< $Z ->
-    {Y, T1} = get_name(T, [H]),
-    X = list_to_atom(Y),
-    case reserved_word(X) of
-	true ->
-	    [{X,Lno}|tokenise(T1,Lno)];
-	false ->
-	    [{typereference,Lno,X}|tokenise(T1,Lno)];
-	rstrtype ->
-	    [{restrictedcharacterstringtype,Lno,X}|tokenise(T1,Lno)]
-    end;
-
-tokenise([$-,H|T],Lno) when $0 =< H , H =< $9 ->
-    {X, T1} = get_number(T, [H]),
-    [{number,Lno,-1 * list_to_integer(X)}|tokenise(T1,Lno)];
-
-tokenise([H|T],Lno) when $0 =< H , H =< $9 ->
-    {X, T1} = get_number(T, [H]),
-    [{number,Lno,list_to_integer(X)}|tokenise(T1,Lno)];
-
-tokenise([$-,$-|T],Lno) ->
-    tokenise(skip_comment(T),Lno);
-tokenise([$:,$:,$=|T],Lno) ->
-    [{'::=',Lno}|tokenise(T,Lno)];
-
-tokenise([$'|T],Lno) ->
-    case catch collect_quoted(T,Lno,[]) of
-         {'ERR',_} ->
-             throw({'ERR','bad_quote'});
-         {Thing, T1} ->
-             [Thing|tokenise(T1,Lno)]
-    end;
-
-tokenise([$"|T],Lno) ->
-    collect_string(T,Lno);
-
-tokenise([${|T],Lno) ->
-    [{'{',Lno}|tokenise(T,Lno)];
-
-tokenise([$}|T],Lno) ->
-    [{'}',Lno}|tokenise(T,Lno)];
-
-tokenise([$]|T],Lno) ->
-    [{']',Lno}|tokenise(T,Lno)];
-
-tokenise([$[|T],Lno) ->
-    [{'[',Lno}|tokenise(T,Lno)];
-
-tokenise([$,|T],Lno) ->
-    [{',',Lno}|tokenise(T,Lno)];
-
-tokenise([$(|T],Lno) ->
-    [{'(',Lno}|tokenise(T,Lno)];
-tokenise([$)|T],Lno) ->
-    [{')',Lno}|tokenise(T,Lno)];
-
-tokenise([$.,$.,$.|T],Lno) ->
-    [{'...',Lno}|tokenise(T,Lno)];
-
-tokenise([$.,$.|T],Lno) ->
-    [{'..',Lno}|tokenise(T,Lno)];
-
-tokenise([$.|T],Lno) ->
-    [{'.',Lno}|tokenise(T,Lno)];
-tokenise([$^|T],Lno) ->
-    [{'^',Lno}|tokenise(T,Lno)];
-tokenise([$!|T],Lno) ->
-    [{'!',Lno}|tokenise(T,Lno)];
-tokenise([$||T],Lno) ->
-    [{'|',Lno}|tokenise(T,Lno)];
-
-
-tokenise([H|T],Lno) ->
-    case white_space(H) of
-	true ->
-	    tokenise(T,Lno);
-	false ->
-	    [{list_to_atom([H]),Lno}|tokenise(T,Lno)]
-    end;
-tokenise([],_) ->
-    [].
-
-
-collect_string(L,Lno) ->
-    collect_string(L,Lno,[]).
-
-collect_string([],_,_) ->
-    throw({'ERR','bad_quote found eof'});
-
-collect_string([H|T],Lno,Str) ->
-    case H of
-	$" ->
-           [{cstring,1,lists:reverse(Str)}|tokenise(T,Lno)];
-        Ch ->
-           collect_string(T,Lno,[Ch|Str])
-    end.
-           
-
-
-% <name> is letters digits hyphens
-% hypen is not the last character. Hypen hyphen is NOT allowed
-%
-% <identifier> ::= <lowercase> <name>
-
-get_name([$-,Char|T], L) ->
-    case isalnum(Char) of
-	true ->
-	    get_name(T,[Char,$-|L]);
-	false ->
-	    {lists:reverse(L),[$-,Char|T]}
-    end;
-get_name([$-|T], L) ->
-    {lists:reverse(L),[$-|T]};
-get_name([Char|T], L) ->
-    case isalnum(Char) of
-	true ->
-	    get_name(T,[Char|L]);
-	false ->
-	    {lists:reverse(L),[Char|T]}
-    end;
-get_name([], L) ->
-    {lists:reverse(L), []}.
-
-	    
-isalnum(H) when $A =< H , H =< $Z ->
-    true;
-isalnum(H) when $a =< H , H =< $z ->
-    true;
-isalnum(H) when $0 =< H , H =< $9 ->
-    true;
-isalnum(_) ->
-    false.
-
-isdigit(H) when $0 =< H , H =< $9 ->
-    true;
-isdigit(_) ->
-    false.
-
-white_space(9) -> true;
-white_space(10) -> true;
-white_space(13) -> true;
-white_space(32) -> true;
-white_space(_) -> false.
-
-
-get_number([H|T], L) ->
-    case isdigit(H) of
-	true ->
-	    get_number(T, [H|L]);
-	false ->
-	    {lists:reverse(L), [H|T]}
-    end;
-get_number([], L) ->
-    {lists:reverse(L), []}.
-
-skip_comment([]) ->
-    [];
-skip_comment([$-,$-|T]) ->
-    T;
-skip_comment([_|T]) ->
-    skip_comment(T).
-
-collect_quoted([$',$B|T],Lno, L) ->
-    case check_bin(L) of
-        true ->
-            {{bstring,Lno, lists:reverse(L)}, T};
-        false ->
-            throw({'ERR',{invalid_binary_number, lists:reverse(L)}})
-    end;
-collect_quoted([$',$H|T],Lno, L) ->
-    case check_hex(L) of
-        true ->
-            {{hstring,Lno, lists:reverse(L)}, T};
-        false ->
-            throw({'ERR',{invalid_binary_number, lists:reverse(L)}})
-    end;
-collect_quoted([H|T], Lno, L) ->
-    collect_quoted(T, Lno,[H|L]);
-collect_quoted([], _, _) ->        % This should be allowed FIX later
-    throw({'ERR',{eol_in_token}}).
-
-check_bin([$0|T]) ->
-    check_bin(T);
-check_bin([$1|T]) ->
-    check_bin(T);
-check_bin([]) ->
-    true;
-check_bin(_) ->
-    false.
-
-check_hex([H|T]) when $0 =< H , H =< $9 ->
-    check_hex(T);
-check_hex([H|T])  when $A =< H , H =< $F ->
-    check_hex(T);
-check_hex([]) ->
-    true;
-check_hex(_) ->
-    false.
-
-
-%% reserved_word(A) -> true|false|rstrtype
-%% A = atom()
-%% returns true if A is a reserved ASN.1 word
-%% returns false if A is not a reserved word
-%% returns rstrtype if A is a reserved word in the group 
-%% 	RestrictedCharacterStringType
-reserved_word('ABSENT') -> true;
-%reserved_word('ABSTRACT-SYNTAX') -> true; % impl as predef item
-reserved_word('ALL') -> true;
-reserved_word('ANY') -> true;
-reserved_word('APPLICATION') -> true;
-reserved_word('AUTOMATIC') -> true;
-reserved_word('BEGIN') -> true;
-reserved_word('BIT') -> true;
-reserved_word('BMPString') -> rstrtype;
-reserved_word('BOOLEAN') -> true;
-reserved_word('BY') -> true;
-reserved_word('CHARACTER') -> true;
-reserved_word('CHOICE') -> true;
-reserved_word('CLASS') -> true;
-reserved_word('COMPONENT') -> true;
-reserved_word('COMPONENTS') -> true;
-reserved_word('CONSTRAINED') -> true;
-reserved_word('DEFAULT') -> true;
-reserved_word('DEFINED') -> true;
-reserved_word('DEFINITIONS') -> true;
-reserved_word('EMBEDDED') -> true;
-reserved_word('END') -> true;
-reserved_word('ENUMERATED') -> true;
-reserved_word('EXCEPT') -> true;
-reserved_word('EXPLICIT') -> true;
-reserved_word('EXPORTS') -> true;
-reserved_word('EXTERNAL') -> true;
-reserved_word('FALSE') -> true;
-reserved_word('FROM') -> true;
-reserved_word('GeneralizedTime') -> true;
-reserved_word('GeneralString') -> rstrtype;
-reserved_word('GraphicString') -> rstrtype;
-reserved_word('IA5String') -> rstrtype;
-% reserved_word('TYPE-IDENTIFIER') -> true; % impl as predef item
-reserved_word('IDENTIFIER') -> true;
-reserved_word('IMPLICIT') -> true;
-reserved_word('IMPORTS') -> true;
-reserved_word('INCLUDES') -> true;
-reserved_word('INSTANCE') -> true;
-reserved_word('INTEGER') -> true;
-reserved_word('INTERSECTION') -> true;
-reserved_word('ISO646String') -> rstrtype;
-reserved_word('MAX') -> true;
-reserved_word('MIN') -> true;
-reserved_word('MINUS-INFINITY') -> true;
-reserved_word('NULL') -> true;
-reserved_word('NumericString') -> rstrtype;
-reserved_word('OBJECT') -> true;
-reserved_word('ObjectDescriptor') -> true;
-reserved_word('OCTET') -> true;
-reserved_word('OF') -> true;
-reserved_word('OPTIONAL') -> true;
-reserved_word('PDV') -> true;
-reserved_word('PLUS-INFINITY') -> true;
-reserved_word('PRESENT') -> true;
-reserved_word('PrintableString') -> rstrtype;
-reserved_word('PRIVATE') -> true;
-reserved_word('REAL') -> true;
-reserved_word('SEQUENCE') -> true;
-reserved_word('SET') -> true;
-reserved_word('SIZE') -> true;
-reserved_word('STRING') -> true;
-reserved_word('SYNTAX') -> true;
-reserved_word('T61String') -> rstrtype;
-reserved_word('TAGS') -> true;
-reserved_word('TeletexString') -> rstrtype;
-reserved_word('TRUE') -> true;
-reserved_word('UNION') -> true;
-reserved_word('UNIQUE') -> true;
-reserved_word('UNIVERSAL') -> true;
-reserved_word('UniversalString') -> rstrtype;
-reserved_word('UTCTime') -> true;
-reserved_word('VideotexString') -> rstrtype;
-reserved_word('VisibleString') -> rstrtype;
-reserved_word('WITH') -> true;
-reserved_word(_) -> false.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_value.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_value.erl
deleted file mode 100644
index 9510e4b341..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1ct_value.erl
+++ /dev/null
@@ -1,330 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1ct_value.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
--module(asn1ct_value).
-
-%%  Generate Erlang values for ASN.1 types.
-%%  The value is randomized within it's constraints
-
--include("asn1_records.hrl").
-%-compile(export_all).
-
--export([get_type/3]).
-
-
-
-%% Generate examples of values ******************************
-%%****************************************x
-
-
-get_type(M,Typename,Tellname) ->
-    case asn1_db:dbget(M,Typename) of
-	undefined -> 
-	    {asn1_error,{not_found,{M,Typename}}};
-	Tdef when record(Tdef,typedef) ->
-	    Type = Tdef#typedef.typespec,
-	    get_type(M,[Typename],Type,Tellname);
-	Err ->
-	    {asn1_error,{other,Err}}
-    end.
-
-get_type(M,Typename,Type,Tellname) when record(Type,type) ->
-    InnerType = get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    get_type(Emod,Etype,Tellname);
-	{_,user} ->
-	    case Tellname of
-		yes -> {Typename,get_type(M,InnerType,no)};
-		no -> get_type(M,InnerType,no)
-	    end;
-	{notype,_} ->
-	    true;
-	{primitive,bif} ->
-	    get_type_prim(Type);
-	'ASN1_OPEN_TYPE' ->
-	    case  Type#type.constraint of
-		[#'Externaltypereference'{type=TrefConstraint}] ->
-		    get_type(M,TrefConstraint,no);
-		_ ->
-		    "open_type"
-	    end;
-	{constructed,bif} ->
-	    get_type_constructed(M,Typename,InnerType,Type)
-    end;
-get_type(M,Typename,#'ComponentType'{name = Name,typespec = Type},_)  ->
-    get_type(M,[Name|Typename],Type,no);
-get_type(_,_,_,_) -> % 'EXTENSIONMARK'
-    undefined.
-
-get_inner(A) when atom(A) -> A;    
-get_inner(Ext) when record(Ext,'Externaltypereference') -> Ext;    
-get_inner({typereference,_Pos,Name}) -> Name;
-get_inner(T) when tuple(T) -> 
-    case asn1ct_gen:get_inner(T) of
-	{fixedtypevaluefield,_,Type} ->
-	    Type#type.def;
-	{typefield,_FieldName} -> 
-	    'ASN1_OPEN_TYPE';
-	Other ->
-	    Other
-    end.
-%%get_inner(T) when tuple(T) -> element(1,T).
-
-
-
-get_type_constructed(M,Typename,InnerType,D) when record(D,type) ->
-    case InnerType of
-	'SET' ->
-	    get_sequence(M,Typename,D);
-	'SEQUENCE' ->
-	    get_sequence(M,Typename,D);
-	'CHOICE' ->
-	    get_choice(M,Typename,D);
-	'SEQUENCE OF' ->
-	    {_,Type} = D#type.def,
-	    NameSuffix = asn1ct_gen:constructed_suffix(InnerType,Type#type.def),
-	    get_sequence_of(M,Typename,D,NameSuffix);
-	'SET OF' ->
-	    {_,Type} = D#type.def,
-	    NameSuffix = asn1ct_gen:constructed_suffix(InnerType,Type#type.def),
-	    get_sequence_of(M,Typename,D,NameSuffix);
-	_ ->
-	    exit({nyi,InnerType})
-    end.
-
-get_sequence(M,Typename,Type) ->
-    {_SEQorSET,CompList} = 
-	case Type#type.def of
-	    #'SEQUENCE'{components=Cl} -> {'SEQUENCE',Cl};
-	    #'SET'{components=Cl} -> {'SET',Cl}
-	end,
-    case get_components(M,Typename,CompList) of
-        [] ->
-            {list_to_atom(asn1ct_gen:list2rname(Typename))};
-        C ->
-            list_to_tuple([list_to_atom(asn1ct_gen:list2rname(Typename))|C])
-    end.
-
-get_components(M,Typename,{Root,Ext}) ->
-    get_components(M,Typename,Root++Ext);
-
-%% Should enhance this *** HERE *** with proper handling of extensions
-
-get_components(M,Typename,[H|T]) ->
-    [get_type(M,Typename,H,no)|
-    get_components(M,Typename,T)];
-get_components(_,_,[]) ->
-    [].
-
-get_choice(M,Typename,Type) ->
-    {'CHOICE',TCompList} = Type#type.def,
-    case TCompList of
-	[] -> 
-	    {asn1_EMPTY,asn1_EMPTY};
-	{CompList,ExtList} -> % Should be enhanced to handle extensions too
-	    CList = CompList ++ ExtList,
-	    C = lists:nth(random(length(CList)),CList),
-	    {C#'ComponentType'.name,get_type(M,Typename,C,no)};
-	CompList when list(CompList) ->
-	    C = lists:nth(random(length(CompList)),CompList),
-	    {C#'ComponentType'.name,get_type(M,Typename,C,no)}
-    end.
-    
-get_sequence_of(M,Typename,Type,TypeSuffix) ->
-    %% should generate length according to constraints later
-    {_,Oftype} = Type#type.def,
-    C = Type#type.constraint,
-    S = size_random(C),
-    NewTypeName = [TypeSuffix|Typename],
-    gen_list(M,NewTypeName,Oftype,no,S).
-
-gen_list(_,_,_,_,0) ->
-    [];
-gen_list(M,Typename,Oftype,Tellname,N) ->
-    [get_type(M,Typename,Oftype,no)|gen_list(M,Typename,Oftype,Tellname,N-1)].
-    
-get_type_prim(D) ->
-    C = D#type.constraint,
-    case D#type.def of
-	'INTEGER' ->
-	    i_random(C);
-	{'INTEGER',NamedNumberList} ->
-	    NN = [X||{X,_} <- NamedNumberList],
-	    case NN of 
-		[] ->
-		    i_random(C);
-		_ ->
-		    lists:nth(random(length(NN)),NN)
-	    end;
-	Enum when tuple(Enum),element(1,Enum)=='ENUMERATED' ->
-	    NamedNumberList =
-		case Enum of
-		    {_,_,NNL} -> NNL;
-		    {_,NNL} -> NNL
-		end,
-	    NNew=
-		case NamedNumberList of
-		    {N1,N2} ->
-			N1 ++ N2;
-		    _->
-			NamedNumberList
-		end,
-	    NN = [X||{X,_} <- NNew],
-	    case NN of
-		[] ->
-		    asn1_EMPTY;
-		_ ->
-		    lists:nth(random(length(NN)),NN)
-	    end;
-	{'BIT STRING',NamedNumberList} ->
-%%	    io:format("get_type_prim 1: ~w~n",[NamedNumberList]),
-	    NN = [X||{X,_} <- NamedNumberList],
-	    case NN of
-		[] ->
-		    Bl1 =lists:reverse(adjust_list(size_random(C),[1,0,1,1])),
-		    lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,Bl1));
-		_ ->
-%%		    io:format("get_type_prim 2: ~w~n",[NN]),
-		    [lists:nth(random(length(NN)),NN)]
-	    end;
-	'ANY' ->
-	    exit({asn1_error,nyi,'ANY'});
-	'NULL' ->
-	    'NULL';
-	'OBJECT IDENTIFIER' ->
-	    Len = random(3),
-	    Olist = [(random(1000)-1)||_X <-lists:seq(1,Len)],
-	    list_to_tuple([random(3)-1,random(40)-1|Olist]);
-	'ObjectDescriptor' ->
-	    object_descriptor_nyi;
-	'BOOLEAN' ->
-	    true;
-	'OCTET STRING' ->
-	    adjust_list(size_random(C),c_string(C,"OCTET STRING"));
-	'NumericString' ->
-	    adjust_list(size_random(C),c_string(C,"0123456789"));
-	'TeletexString' ->
-	    adjust_list(size_random(C),c_string(C,"TeletexString"));
-	'VideotexString' ->
-	    adjust_list(size_random(C),c_string(C,"VideotexString"));
-	'UTCTime' ->
-	    "97100211-0500";
-	'GeneralizedTime' ->
-	    "19971002103130.5";
-	'GraphicString' ->
-	    adjust_list(size_random(C),c_string(C,"GraphicString"));
-	'VisibleString' ->
-	    adjust_list(size_random(C),c_string(C,"VisibleString"));
-	'GeneralString' ->
-	    adjust_list(size_random(C),c_string(C,"GeneralString"));
-	'PrintableString' ->
-	    adjust_list(size_random(C),c_string(C,"PrintableString"));
-	'IA5String' ->
-	    adjust_list(size_random(C),c_string(C,"IA5String"));
-	'BMPString' ->
-	    adjust_list(size_random(C),c_string(C,"BMPString"));
-	'UniversalString' ->
-	    adjust_list(size_random(C),c_string(C,"UniversalString"));
-	XX ->
-	    exit({asn1_error,nyi,XX})
-    end.
-
-c_string(undefined,Default) ->
-    Default;
-c_string(C,Default) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} when list(Sv) ->
-	    Sv;
-	{'SingleValue',V} when integer(V) ->
-	    [V];
-	no ->
-	    Default
-    end.
-
-random(Upper) ->
-    {A1,A2,A3} = erlang:now(),
-    random:seed(A1,A2,A3),
-    random:uniform(Upper).
-
-size_random(C) ->
-    case get_constraint(C,'SizeConstraint') of
-	no ->
-	    c_random({0,5},no);
-	{Lb,Ub} when Ub-Lb =< 4 ->
-	    c_random({Lb,Ub},no);
-	{Lb,_}  ->
-	    c_random({Lb,Lb+4},no);
-	Sv ->
-	    c_random(no,Sv)
-    end.
-	
-i_random(C) ->
-    c_random(get_constraint(C,'ValueRange'),get_constraint(C,'SingleValue')).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% c_random(Range,SingleValue)
-%% only called from other X_random functions
-
-c_random(VRange,Single) ->
-    case {VRange,Single} of
-	{no,no} ->
-	    random(16#fffffff) - (16#fffffff bsr 1);
-	{R,no} ->
-	    case R of 
-		{Lb,Ub} when integer(Lb),integer(Ub) ->
-		    Range = Ub - Lb +1,
-		    Lb + (random(Range)-1);
-		{Lb,'MAX'} ->
-		    Lb + random(16#fffffff)-1;
-		{'MIN',Ub} ->
-		    Ub - random(16#fffffff)-1;
-		{A,{'ASN1_OK',B}} ->
-		    Range = B - A +1,
-		    A + (random(Range)-1)
-	    end;
-	{_,S} when integer(S) ->
-	    S;
-	{_,S} when list(S) ->
-	    lists:nth(random(length(S)),S)
-%%	{S1,S2} ->
-%%	    io:format("asn1ct_value: hejsan hoppsan~n");
-%%	_ ->
-%%	    io:format("asn1ct_value: hejsan hoppsan 2~n")
-%%	    io:format("asn1ct_value: c_random/2: S1 = ~w~n"
-%%		      "S2 = ~w,~n",[S1,S2])
-%%	    exit(self(),goodbye)
-    end.
-
-adjust_list(Len,Orig) ->
-    adjust_list1(Len,Orig,Orig,[]).
-
-adjust_list1(0,_Orig,[_Oh|_Ot],Acc) ->
-    lists:reverse(Acc);
-adjust_list1(Len,Orig,[],Acc) ->
-    adjust_list1(Len,Orig,Orig,Acc);
-adjust_list1(Len,Orig,[Oh|Ot],Acc) ->
-    adjust_list1(Len-1,Orig,Ot,[Oh|Acc]).
-
-
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	     no;
-	{value,{_,V}} -> 
-	    V
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt.erl
deleted file mode 100644
index 1d73927052..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt.erl
+++ /dev/null
@@ -1,69 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1rt.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
--module(asn1rt).
-
-%% Runtime functions for ASN.1 (i.e encode, decode)
-
--export([encode/2,encode/3,decode/3,load_driver/0,unload_driver/0,info/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.
-	
-load_driver() ->
-    asn1rt_driver_handler:load_driver(),
-    receive
-	driver_ready ->
-	    ok;
-	Err={error,_Reason} ->
-	    Err;
-	Error ->
-	    {error,Error}
-    end.
-
-unload_driver() ->
-    case catch asn1rt_driver_handler:unload_driver() of
-	ok ->
-	    ok;
-	Error ->
-	    {error,Error}
-    end.
-
-
-info(Module) ->
-    case catch apply(Module,info,[]) of
-	{'EXIT',{undef,_Reason}} ->
-	    {error,{asn1,{undef,Module,info}}};
-	Result ->
-	    {ok,Result}
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_ber_bin.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_ber_bin.erl
deleted file mode 100644
index 4f4574513e..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_ber_bin.erl
+++ /dev/null
@@ -1,2310 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1rt_ber_bin.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
--module(asn1rt_ber_bin).
- 
-%% encoding / decoding of BER  
-
--export([decode/1]). 
--export([fixoptionals/2,split_list/2,cindex/3,restbytes2/3,
-	 list_to_record/2,
-	 encode_tag_val/1,decode_tag/1,peek_tag/1,
-	 check_tags/3, encode_tags/3]).
--export([encode_boolean/2,decode_boolean/3,
-	 encode_integer/3,encode_integer/4,
-	 decode_integer/4,decode_integer/5,encode_enumerated/2,
-	 encode_enumerated/4,decode_enumerated/5,
-	 encode_real/2,decode_real/4,
-	 encode_bit_string/4,decode_bit_string/6,
-	 decode_compact_bit_string/6,
-	 encode_octet_string/3,decode_octet_string/5,
-	 encode_null/2,decode_null/3,
-	 encode_object_identifier/2,decode_object_identifier/3,
-	 encode_restricted_string/4,decode_restricted_string/6,
-	 encode_universal_string/3,decode_universal_string/5,
-	 encode_BMP_string/3,decode_BMP_string/5,
-	 encode_generalized_time/3,decode_generalized_time/5,
-	 encode_utc_time/3,decode_utc_time/5,
-	 encode_length/1,decode_length/1,
-	 check_if_valid_tag/3,
-	 decode_tag_and_length/1, decode_components/6, 
-	 decode_components/7, decode_set/6]).
-
--export([encode_open_type/1,encode_open_type/2,decode_open_type/1,decode_open_type/2,decode_open_type/3]).
--export([skipvalue/1, skipvalue/2]).
- 
--include("asn1_records.hrl"). 
- 
-% the encoding of class of tag bits 8 and 7 
--define(UNIVERSAL,   0). 
--define(APPLICATION, 16#40). 
--define(CONTEXT,     16#80). 
--define(PRIVATE,     16#C0). 
- 
-%%% primitive or constructed encoding % bit 6 
--define(PRIMITIVE,   0). 
--define(CONSTRUCTED, 2#00100000). 
-
-%%% The tag-number for universal types
--define(N_BOOLEAN, 1). 
--define(N_INTEGER, 2). 
--define(N_BIT_STRING, 3).
--define(N_OCTET_STRING, 4).
--define(N_NULL, 5). 
--define(N_OBJECT_IDENTIFIER, 6). 
--define(N_OBJECT_DESCRIPTOR, 7). 
--define(N_EXTERNAL, 8). 
--define(N_REAL, 9). 
--define(N_ENUMERATED, 10). 
--define(N_EMBEDDED_PDV, 11). 
--define(N_SEQUENCE, 16). 
--define(N_SET, 17). 
--define(N_NumericString, 18).
--define(N_PrintableString, 19).
--define(N_TeletexString, 20).
--define(N_VideotexString, 21).
--define(N_IA5String, 22).
--define(N_UTCTime, 23). 
--define(N_GeneralizedTime, 24). 
--define(N_GraphicString, 25).
--define(N_VisibleString, 26).
--define(N_GeneralString, 27).
--define(N_UniversalString, 28).
--define(N_BMPString, 30).
-
- 
-% the complete tag-word of built-in types 
--define(T_BOOLEAN,          ?UNIVERSAL bor ?PRIMITIVE bor 1). 
--define(T_INTEGER,          ?UNIVERSAL bor ?PRIMITIVE bor 2). 
--define(T_BIT_STRING,       ?UNIVERSAL bor ?PRIMITIVE bor 3). % can be CONSTRUCTED 
--define(T_OCTET_STRING,     ?UNIVERSAL bor ?PRIMITIVE bor 4). % can be CONSTRUCTED 
--define(T_NULL,             ?UNIVERSAL bor ?PRIMITIVE bor 5). 
--define(T_OBJECT_IDENTIFIER,?UNIVERSAL bor ?PRIMITIVE bor 6). 
--define(T_OBJECT_DESCRIPTOR,?UNIVERSAL bor ?PRIMITIVE bor 7). 
--define(T_EXTERNAL,         ?UNIVERSAL bor ?PRIMITIVE bor 8). 
--define(T_REAL,             ?UNIVERSAL bor ?PRIMITIVE bor 9). 
--define(T_ENUMERATED,       ?UNIVERSAL bor ?PRIMITIVE bor 10). 
--define(T_EMBEDDED_PDV,     ?UNIVERSAL bor ?PRIMITIVE bor 11). 
--define(T_SEQUENCE,         ?UNIVERSAL bor ?CONSTRUCTED bor 16). 
--define(T_SET,              ?UNIVERSAL bor ?CONSTRUCTED bor 17). 
--define(T_NumericString,    ?UNIVERSAL bor ?PRIMITIVE bor 18). %can be constructed 
--define(T_PrintableString,  ?UNIVERSAL bor ?PRIMITIVE bor 19). %can be constructed 
--define(T_TeletexString,    ?UNIVERSAL bor ?PRIMITIVE bor 20). %can be constructed 
--define(T_VideotexString,   ?UNIVERSAL bor ?PRIMITIVE bor 21). %can be constructed 
--define(T_IA5String,        ?UNIVERSAL bor ?PRIMITIVE bor 22). %can be constructed 
--define(T_UTCTime,          ?UNIVERSAL bor ?PRIMITIVE bor 23). 
--define(T_GeneralizedTime,  ?UNIVERSAL bor ?PRIMITIVE bor 24). 
--define(T_GraphicString,    ?UNIVERSAL bor ?PRIMITIVE bor 25). %can be constructed 
--define(T_VisibleString,    ?UNIVERSAL bor ?PRIMITIVE bor 26). %can be constructed 
--define(T_GeneralString,    ?UNIVERSAL bor ?PRIMITIVE bor 27). %can be constructed 
--define(T_UniversalString,  ?UNIVERSAL bor ?PRIMITIVE bor 28). %can be constructed 
--define(T_BMPString,        ?UNIVERSAL bor ?PRIMITIVE bor 30). %can be constructed 
- 
-
-decode(Bin) ->
-    decode_primitive(Bin).
-
-decode_primitive(Bin) ->
-    {Tlv = {Tag,Len,V},<<>>} = decode_tlv(Bin),
-    case element(2,Tag) of 
-	?CONSTRUCTED ->
-	    {Tag,Len,decode_constructed(V)};
-	_ ->
-	    Tlv
-    end.
-
-decode_constructed(<<>>) ->
-    [];
-decode_constructed(Bin) ->
-    {Tlv = {Tag,Len,V},Rest} = decode_tlv(Bin),
-    NewTlv =
-	case element(2,Tag) of 
-	    ?CONSTRUCTED ->
-		{Tag,Len,decode_constructed(V)};
-	    _ ->
-		Tlv
-	end,
-    [NewTlv|decode_constructed(Rest)].
-    
-decode_tlv(Bin) ->
-    {Tag,Bin1,_Rb1} = decode_tag(Bin),
-    {{Len,Bin2},_Rb2} = decode_length(Bin1),
-    <<V:Len/binary,Bin3/binary>> = Bin2,
-    {{Tag,Len,V},Bin3}.
-    
-
- 
-%%%%%%%%%%%%%
-% split_list(List,HeadLen) -> {HeadList,TailList}
-%
-% splits List into HeadList (Length=HeadLen) and TailList
-% if HeadLen == indefinite -> return {List,indefinite}
-split_list(List,indefinite) ->
-    {List, indefinite};
-split_list(Bin, Len) when binary(Bin) ->
-    split_binary(Bin,Len);
-split_list(List,Len) ->
-    {lists:sublist(List,Len),lists:nthtail(Len,List)}.
-
-
-%%% new function which fixes a bug regarding indefinite length decoding
-restbytes2(indefinite,<<0,0,RemBytes/binary>>,_) ->
-    {RemBytes,2};
-restbytes2(indefinite,RemBytes,ext) ->
-    skipvalue(indefinite,RemBytes);
-restbytes2(RemBytes,<<>>,_) ->
-    {RemBytes,0};
-restbytes2(_RemBytes,Bytes,noext) ->
-    exit({error,{asn1, {unexpected,Bytes}}});
-restbytes2(RemBytes,_Bytes,ext) ->
-    {RemBytes,0}.
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% skipvalue(Length, Bytes) -> {RemainingBytes, RemovedNumberOfBytes}
-%%
-%% skips the one complete (could be nested) TLV from Bytes
-%% handles both definite and indefinite length encodings
-%%
-
-skipvalue(L, Bytes) ->
-    skipvalue(L, Bytes, 0).
-
-skipvalue(indefinite, Bytes, Rb) ->
-    {_T,Bytes2,R2} = decode_tag(Bytes),
-    {{L,Bytes3},R3} = decode_length(Bytes2),
-    {Bytes4,Rb4} = case L of
-		       indefinite ->
-			   skipvalue(indefinite,Bytes3,R2+R3);
-		       _ ->
-			   <<_:L/binary, RestBytes/binary>> = Bytes3,
-			   {RestBytes, R2+R3+L}
-		   end,
-    case Bytes4 of
-	<<0,0,Bytes5/binary>> ->
-	    {Bytes5,Rb+Rb4+2};
-	_  -> skipvalue(indefinite,Bytes4,Rb+Rb4)
-    end;
-skipvalue(L, Bytes, Rb) ->
-%    <<Skip:L/binary, RestBytes/binary>> = Bytes,
-    <<_:L/binary, RestBytes/binary>> = Bytes,
-    {RestBytes,Rb+L}.
-
-%%skipvalue(indefinite, Bytes, Rb) ->
-%%    {T,Bytes2,R2} = decode_tag(Bytes),
-%%    {L,Bytes3,R3} = decode_length(Bytes2),
-%%    {Bytes4,Rb4} = case L of
-%%		 indefinite ->
-%%		     skipvalue(indefinite,Bytes3,R2+R3);
-%%		 _ ->
-%%		     lists:nthtail(L,Bytes3) %% konstigt !?
-%%	     end,
-%%    case Bytes4 of
-%%	[0,0|Bytes5] ->
-%%	    {Bytes5,Rb4+2};
-%%	_  -> skipvalue(indefinite,Bytes4,Rb4)
-%%    end;
-%%skipvalue(L, Bytes, Rb) ->
-%%    {lists:nthtail(L,Bytes),Rb+L}.
-    
-skipvalue(Bytes) ->
-    {_T,Bytes2,R2} = decode_tag(Bytes),
-    {{L,Bytes3},R3} = decode_length(Bytes2),
-    skipvalue(L,Bytes3,R2+R3).
-	
-
-cindex(Ix,Val,Cname) -> 
-    case element(Ix,Val) of 
-	{Cname,Val2} -> Val2; 
-	X -> X 
-    end. 
- 
-%%=============================================================================== 
-%%=============================================================================== 
-%%=============================================================================== 
-%% Optionals, preset not filled optionals with asn1_NOVALUE 
-%%=============================================================================== 
-%%=============================================================================== 
-%%=============================================================================== 
- 
-% converts a list to a record if necessary 
-list_to_record(Name,List) when list(List) -> 
-    list_to_tuple([Name|List]); 
-list_to_record(_Name,Tuple) when tuple(Tuple) -> 
-    Tuple. 
- 
- 
-fixoptionals(OptList,Val) when list(Val) -> 
-    fixoptionals(OptList,Val,1,[],[]). 
- 
-fixoptionals([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) -> 
-    fixoptionals(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]); 
-fixoptionals([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) -> 
-    fixoptionals(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]); 
-fixoptionals(O,[Vh|Vt],Pos,Acc1,Acc2) -> 
-    fixoptionals(O,Vt,Pos+1,Acc1,[Vh|Acc2]); 
-fixoptionals([],[Vh|Vt],Pos,Acc1,Acc2) -> 
-    fixoptionals([],Vt,Pos+1,Acc1,[Vh|Acc2]); 
-fixoptionals([],[],_,_Acc1,Acc2) -> 
-    % return Val as a record 
-    list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]).
- 
- 
-%%encode_tag(TagClass(?UNI, APP etc), Form (?PRIM etx), TagInteger) ->  
-%%     8bit Int | binary 
-encode_tag_val({Class, Form, TagNo}) when (TagNo =< 30) -> 
-    <<(Class bsr 6):2,(Form bsr 5):1,TagNo:5>>;
-
-encode_tag_val({Class, Form, TagNo}) -> 
-    {Octets,_Len} = mk_object_val(TagNo),
-    BinOct = list_to_binary(Octets),
-    <<(Class bsr 6):2, (Form bsr 5):1, 31:5,BinOct/binary>>; 
- 
-%% asumes whole correct tag bitpattern, multiple of 8 
-encode_tag_val(Tag) when (Tag =< 255) -> Tag;  %% anv�nds denna funktion??!!
-%% asumes correct bitpattern of 0-5 
-encode_tag_val(Tag) -> encode_tag_val2(Tag,[]). 
- 
-encode_tag_val2(Tag, OctAck) when (Tag =< 255) -> 
-    [Tag | OctAck]; 
-encode_tag_val2(Tag, OctAck) -> 
-    encode_tag_val2(Tag bsr 8, [255 band Tag | OctAck]). 
-
-
-%%%encode_tag(TagClass(?UNI, APP etc), Form (?PRIM etx), TagInteger) ->  
-%%%     8bit Int | [list of octets] 
-%encode_tag_val({Class, Form, TagNo}) when (TagNo =< 30) -> 
-%%%    <<Class:2,Form:1,TagNo:5>>;
-%    [Class bor Form bor TagNo]; 
-%encode_tag_val({Class, Form, TagNo}) -> 
-%    {Octets,L} = mk_object_val(TagNo),
-%    [Class bor Form bor 31 | Octets]; 
-
-
-%%============================================================================\%% Peek on the initial tag
-%% peek_tag(Bytes) -> TagBytes
-%% interprets the first byte and possible  second, third and fourth byte as
-%% a tag and returns all the bytes comprising the tag, the constructed/primitive bit (6:th bit of first byte) is normalised to 0
-%%
-
-peek_tag(<<B7_6:2,_:1,31:5,Buffer/binary>>) ->
-    Bin = peek_tag(Buffer, <<>>),
-    <<B7_6:2,31:6,Bin/binary>>;
-%% single tag (tagno < 31)
-peek_tag(<<B7_6:2,_:1,B4_0:5,_Buffer/binary>>) ->
-    <<B7_6:2,B4_0:6>>.
-
-peek_tag(<<0:1,PartialTag:7,_Buffer/binary>>, TagAck) ->
-    <<TagAck/binary,PartialTag>>;
-peek_tag(<<PartialTag,Buffer/binary>>, TagAck) ->
-    peek_tag(Buffer,<<TagAck/binary,PartialTag>>);
-peek_tag(_,TagAck) ->
-    exit({error,{asn1, {invalid_tag,TagAck}}}). 
-%%peek_tag([Tag|Buffer]) when (Tag band 31) == 31 -> 
-%%    [Tag band 2#11011111 | peek_tag(Buffer,[])];
-%%%% single tag (tagno < 31)
-%%peek_tag([Tag|Buffer]) ->
-%%    [Tag band 2#11011111].
-
-%%peek_tag([PartialTag|Buffer], TagAck) when (PartialTag < 128 ) ->
-%%    lists:reverse([PartialTag|TagAck]);
-%%peek_tag([PartialTag|Buffer], TagAck) ->
-%%    peek_tag(Buffer,[PartialTag|TagAck]);
-%%peek_tag(Buffer,TagAck) ->
-%%    exit({error,{asn1, {invalid_tag,lists:reverse(TagAck)}}}). 
-  
-
-%%=============================================================================== 
-%% Decode a tag 
-%% 
-%% decode_tag(OctetListBuffer) -> {{Class, Form, TagNo}, RestOfBuffer, RemovedBytes} 
-%%=============================================================================== 
- 
-%% multiple octet tag 
-decode_tag(<<Class:2, Form:1, 31:5, Buffer/binary>>) ->
-    {TagNo, Buffer1, RemovedBytes} = decode_tag(Buffer, 0, 1),
-    {{(Class bsl 6), (Form bsl 5), TagNo}, Buffer1, RemovedBytes};
-
-%% single tag (< 31 tags)
-decode_tag(<<Class:2,Form:1,TagNo:5, Buffer/binary>>) -> 
-    {{(Class bsl 6), (Form bsl 5), TagNo}, Buffer, 1}.
-     
-%% last partial tag 
-decode_tag(<<0:1,PartialTag:7, Buffer/binary>>, TagAck, RemovedBytes) ->
-    TagNo = (TagAck bsl 7) bor PartialTag,
-    %%<<TagNo>> = <<TagAck:1, PartialTag:7>>,
-    {TagNo, Buffer, RemovedBytes+1}; 
-% more tags 
-decode_tag(<<_:1,PartialTag:7, Buffer/binary>>, TagAck, RemovedBytes) -> 
-    TagAck1 = (TagAck bsl 7) bor PartialTag, 
-    %%<<TagAck1:16>> = <<TagAck:1, PartialTag:7,0:8>>,
-    decode_tag(Buffer, TagAck1, RemovedBytes+1). 
- 
-%%------------------------------------------------------------------
-%% check_tags_i is the same as check_tags except that it stops and
-%% returns the remaining tags not checked when it encounters an
-%% indefinite length field 
-%% only called internally within this module
-
-check_tags_i([Tag], Buffer, OptOrMand) -> % optimized very usual case
-    {[],check_one_tag(Tag, Buffer, OptOrMand)};
-check_tags_i(Tags, Buffer, OptOrMand) ->
-    check_tags_i(Tags, Buffer, 0, OptOrMand).
-
-check_tags_i([Tag1,Tag2|TagRest], Buffer, Rb, OptOrMand) 
-  when Tag1#tag.type == 'IMPLICIT' ->
-    check_tags_i([Tag1#tag{type=Tag2#tag.type}|TagRest], Buffer, Rb, OptOrMand);
-
-check_tags_i([Tag1|TagRest], Buffer, Rb, OptOrMand) ->
-    {Form_Length,Buffer2,Rb1} = check_one_tag(Tag1, Buffer, OptOrMand),
-    case TagRest of
-	[] -> {TagRest, {Form_Length, Buffer2, Rb + Rb1}};
-	_ -> 
-	    case Form_Length of
-		{?CONSTRUCTED,_} ->
-		    {TagRest, {Form_Length, Buffer2, Rb + Rb1}};
-		_ -> 
-		    check_tags_i(TagRest, Buffer2, Rb + Rb1, mandatory)
-	    end
-    end;
-
-check_tags_i([], Buffer, Rb, _) ->
-    {[],{{0,0},Buffer,Rb}}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% This function is called from generated code
-
-check_tags([Tag], Buffer, OptOrMand) -> % optimized very usual case
-    check_one_tag(Tag, Buffer, OptOrMand);
-check_tags(Tags, Buffer, OptOrMand) ->
-    check_tags(Tags, Buffer, 0, OptOrMand).
-
-check_tags([Tag1,Tag2|TagRest], Buffer, Rb, OptOrMand) 
-  when Tag1#tag.type == 'IMPLICIT' ->
-    check_tags([Tag1#tag{type=Tag2#tag.type}|TagRest], Buffer, Rb, OptOrMand);
-
-check_tags([Tag1|TagRest], Buffer, Rb, OptOrMand) ->
-    {Form_Length,Buffer2,Rb1} = check_one_tag(Tag1, Buffer, OptOrMand),
-    case TagRest of
-	[] -> {Form_Length, Buffer2, Rb + Rb1};
-	_ -> check_tags(TagRest, Buffer2, Rb + Rb1, mandatory)
-    end;
-
-check_tags([], Buffer, Rb, _) ->
-    {{0,0},Buffer,Rb}.
-
-check_one_tag(Tag=#tag{class=ExpectedClass,number=ExpectedNumber}, Buffer, OptOrMand) ->
-    case catch decode_tag(Buffer) of
-	{'EXIT',_Reason} -> 
-	    tag_error(no_data,Tag,Buffer,OptOrMand);
-	{{ExpectedClass,Form,ExpectedNumber},Buffer2,Rb} ->
-	    {{L,Buffer3},RemBytes2} = decode_length(Buffer2),
-	    {{Form,L}, Buffer3, RemBytes2+Rb};
-	{ErrorTag,_,_} ->
-	    tag_error(ErrorTag, Tag, Buffer, OptOrMand)
-    end.
-	    
-tag_error(ErrorTag, Tag, Buffer, OptOrMand) ->
-    case OptOrMand of
-	mandatory ->
-	    exit({error,{asn1, {invalid_tag, 
-				{ErrorTag, Tag, Buffer}}}});
-	_ ->
-	    exit({error,{asn1, {no_optional_tag, 
-				{ErrorTag, Tag, Buffer}}}})
-    end.    
-%%=======================================================================
-%%
-%% Encode all tags in the list Tags and return a possibly deep list of
-%% bytes with tag and length encoded
-%%
-%% prepend_tags(Tags, BytesSoFar, LenSoFar) -> {Bytes, Len}
-encode_tags(Tags, BytesSoFar, LenSoFar) ->
-    NewTags = encode_tags1(Tags, []), 
-    %% NewTags contains the resulting tags in reverse order
-    encode_tags2(NewTags, BytesSoFar, LenSoFar).
-
-%encode_tags2([#tag{class=?UNIVERSAL,number=No}|Trest], BytesSoFar, LenSoFar) ->
-%    {Bytes2,L2} = encode_length(LenSoFar),
-%    encode_tags2(Trest,[[No|Bytes2],BytesSoFar], LenSoFar + 1 + L2);
-encode_tags2([Tag|Trest], BytesSoFar, LenSoFar) ->
-    {Bytes1,L1} = encode_one_tag(Tag),
-    {Bytes2,L2} = encode_length(LenSoFar),
-    encode_tags2(Trest, [Bytes1,Bytes2|BytesSoFar], 
-		 LenSoFar + L1 + L2);
-encode_tags2([], BytesSoFar, LenSoFar) ->
-    {BytesSoFar,LenSoFar}.
-
-encode_tags1([Tag1, Tag2| Trest], Acc) 
-  when Tag1#tag.type == 'IMPLICIT' ->
-    encode_tags1([Tag1#tag{type=Tag2#tag.type,form=Tag2#tag.form}|Trest],Acc);
-encode_tags1([Tag1 | Trest], Acc) -> 
-    encode_tags1(Trest, [Tag1|Acc]);
-encode_tags1([], Acc) ->
-    Acc. % the resulting tags are returned in reverse order
-
-encode_one_tag(Bin) when binary(Bin) ->
-    {Bin,size(Bin)};
-encode_one_tag(#tag{class=Class,number=No,type=Type, form = Form}) ->			  
-    NewForm = case Type of
-	       'EXPLICIT' ->
-		   ?CONSTRUCTED;
-	       _ ->
-		   Form
-	   end,
-    Bytes = encode_tag_val({Class,NewForm,No}),
-    {Bytes,size(Bytes)}.
-   
-%%=============================================================================== 
-%% Change the tag (used when an implicit tagged type has a reference to something else) 
-%% The constructed bit in the tag is taken from the tag to be replaced.
-%% 
-%% change_tag(NewTag,[Tag,Buffer]) -> [NewTag,Buffer] 
-%%=============================================================================== 
- 
-%change_tag({NewClass,NewTagNr}, Buffer) ->
-%    {{OldClass, OldForm, OldTagNo}, Buffer1, RemovedBytes} = decode_tag(lists:flatten(Buffer)),
-%    [encode_tag_val({NewClass, OldForm, NewTagNr}) | Buffer1].
-    
-  
- 
- 
- 
- 
- 
-%%=============================================================================== 
-%% 
-%% This comment is valid for all the encode/decode functions 
-%% 
-%% C = Constraint -> typically {'ValueRange',LowerBound,UpperBound} 
-%%     used for PER-coding but not for BER-coding. 
-%% 
-%% Val = Value.  If Val is an atom then it is a symbolic integer value  
-%%       (i.e the atom must be one of the names in the NamedNumberList). 
-%%       The NamedNumberList is used to translate the atom to an integer value 
-%%       before encoding. 
-%% 
-%%=============================================================================== 
- 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_open_type(Value) -> CompleteList
-%% Value = list of bytes of an already encoded value (the list must be flat)
-%%         | binary
-
-%% This version does not consider Explicit tagging of the open type. It 
-%% is only left because of backward compatibility.
-encode_open_type(Val) when list(Val) -> 
-    {Val,size(list_to_binary(Val))};
-encode_open_type(Val) ->
-    {Val, size(Val)}. 
-
-%% 
-encode_open_type(Val, []) when list(Val) -> 
-    {Val,size(list_to_binary(Val))};
-encode_open_type(Val,[]) ->
-    {Val, size(Val)};
-encode_open_type(Val, Tag) when list(Val) -> 
-    encode_tags(Tag,Val,size(list_to_binary(Val)));
-encode_open_type(Val,Tag) ->
-    encode_tags(Tag,Val, size(Val)). 
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_open_type(Buffer) -> Value
-%% Bytes = [byte] with BER encoded data 
-%% Value = [byte] with decoded data (which must be decoded again as some type)
-%%
-decode_open_type(Bytes) ->
-    {_Tag, Len, _RemainingBuffer, RemovedBytes} = decode_tag_and_length(Bytes),
-    N = Len + RemovedBytes,
-    <<Val:N/binary, RemainingBytes/binary>> = Bytes,
-    {Val, RemainingBytes, Len + RemovedBytes}.
-
-decode_open_type(Bytes,ExplTag) ->
-    {Tag, Len, RemainingBuffer, RemovedBytes} = decode_tag_and_length(Bytes),
-    case {Tag,ExplTag} of
-	{{Class,Form,No},[#tag{class=Class,number=No,form=Form}]} ->
-	    {_Tag2, Len2, _RemainingBuffer2, RemovedBytes2} = decode_tag_and_length(RemainingBuffer),
-	    N = Len2 + RemovedBytes2,
-	    <<_:RemovedBytes/unit:8,Val:N/binary,RemainingBytes/binary>> = Bytes,
-	    {Val, RemainingBytes, N + RemovedBytes};
-	_ ->
-	    N = Len + RemovedBytes,
-	    <<Val:N/binary, RemainingBytes/binary>> = Bytes,
-	    {Val, RemainingBytes, Len + RemovedBytes}
-    end.
- 
-decode_open_type(ber_bin,Bytes,ExplTag) ->
-    decode_open_type(Bytes,ExplTag);
-decode_open_type(ber,Bytes,ExplTag) ->
-    {Val,RemBytes,Len}=decode_open_type(Bytes,ExplTag),
-    {binary_to_list(Val),RemBytes,Len}.
- 
-%%=============================================================================== 
-%%=============================================================================== 
-%%=============================================================================== 
-%% Boolean, ITU_T X.690 Chapter 8.2 
-%%=============================================================================== 
-%%=============================================================================== 
-%%=============================================================================== 
- 
-%%=============================================================================== 
-%% encode_boolean(Integer, tag | notag) -> [octet list] 
-%%=============================================================================== 
- 
-encode_boolean({Name, Val}, DoTag) when atom(Name) -> 
-    dotag(DoTag, ?N_BOOLEAN, encode_boolean(Val)); 
-encode_boolean(true,[]) ->
-    {[1,1,16#FF],3};
-encode_boolean(false,[]) ->
-    {[1,1,0],3};
-encode_boolean(Val, DoTag) -> 
-    dotag(DoTag, ?N_BOOLEAN, encode_boolean(Val)). 
-
-%% encode_boolean(Boolean) -> [Len, Boolean] = [1, $FF | 0] 
-encode_boolean(true)   ->    {[16#FF],1}; 
-encode_boolean(false)  ->    {[0],1}; 
-encode_boolean(X) -> exit({error,{asn1, {encode_boolean, X}}}). 
- 
- 
-%%=============================================================================== 
-%% decode_boolean(BuffList, HasTag, TotalLen) -> {true, Remain, RemovedBytes} |  
-%%                                               {false, Remain, RemovedBytes} 
-%%=============================================================================== 
- 
-decode_boolean(Buffer, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_BOOLEAN}),
-    decode_boolean_notag(Buffer, NewTags, OptOrMand).
-
-decode_boolean_notag(Buffer, Tags, OptOrMand) -> 
-    {RestTags, {FormLen,Buffer0,Rb0}} = 
-	check_tags_i(Tags, Buffer, OptOrMand),
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val,Buffer1,Rb1} = decode_boolean_notag(Buffer00, RestTags, OptOrMand),
-	    {Buffer2, Rb2} = restbytes2(RestBytes,Buffer1,noext),
-	    {Val, Buffer2, Rb0+Rb1+Rb2};
-	{_,_} ->
-	    decode_boolean2(Buffer0, Rb0)
-    end.
- 
-decode_boolean2(<<0:8, Buffer/binary>>, RemovedBytes) ->
-    {false, Buffer, RemovedBytes + 1};
-decode_boolean2(<<_:8, Buffer/binary>>, RemovedBytes) ->
-    {true, Buffer, RemovedBytes + 1};
-decode_boolean2(Buffer, _) ->  
-    exit({error,{asn1, {decode_boolean, Buffer}}}). 
- 
-  
-
-
-%%=========================================================================== 
-%% Integer, ITU_T X.690 Chapter 8.3 
-
-%% encode_integer(Constraint, Value, Tag) -> [octet list] 
-%% encode_integer(Constraint, Name, NamedNumberList, Tag) -> [octet list] 
-%%    Value = INTEGER | {Name,INTEGER}  
-%%    Tag = tag | notag 
-%%=========================================================================== 
- 
-encode_integer(C, Val, []) when integer(Val) -> 
-    {EncVal,Len}=encode_integer(C, Val),
-    dotag_universal(?N_INTEGER,EncVal,Len);
-encode_integer(C, Val, Tag) when integer(Val) -> 
-    dotag(Tag, ?N_INTEGER, encode_integer(C, Val));
-encode_integer(C,{Name,Val},Tag) when atom(Name) ->
-    encode_integer(C,Val,Tag);
-encode_integer(_, Val, _) -> 
-    exit({error,{asn1, {encode_integer, Val}}}). 
- 
- 
- 
-encode_integer(C, Val, NamedNumberList, Tag) when atom(Val) -> 
-    case lists:keysearch(Val, 1, NamedNumberList) of 
-	{value,{_, NewVal}} ->  
-	    dotag(Tag, ?N_INTEGER, encode_integer(C, NewVal)); 
-	_ ->  
-	    exit({error,{asn1, {encode_integer_namednumber, Val}}}) 
-    end; 
-encode_integer(C,{_,Val},NamedNumberList,Tag) ->
-    encode_integer(C,Val,NamedNumberList,Tag); 
-encode_integer(C, Val, _NamedNumberList, Tag) -> 
-    dotag(Tag, ?N_INTEGER, encode_integer(C, Val)). 
- 
- 
- 
- 
-encode_integer(_C, Val) -> 
-    Bytes =  
-	if  
-	    Val >= 0 -> 
-		encode_integer_pos(Val, []); 
-	    true -> 
-		encode_integer_neg(Val, []) 
-	end, 
-    {Bytes,length(Bytes)}. 
- 
-encode_integer_pos(0, L=[B|_Acc]) when B < 128 ->
-    L;
-encode_integer_pos(N, Acc) ->
-    encode_integer_pos((N bsr 8), [N band 16#ff| Acc]).
-
-encode_integer_neg(-1, L=[B1|_T]) when B1 > 127 ->
-    L;
-encode_integer_neg(N, Acc) ->
-    encode_integer_neg(N bsr 8, [N band 16#ff|Acc]).
-
-%%=============================================================================== 
-%% decode integer  
-%%    (Buffer, Range, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}  
-%%    (Buffer, Range, NamedNumberList, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}  
-%%=============================================================================== 
-
- 
-decode_integer(Buffer, Range, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_INTEGER}),
-    decode_integer_notag(Buffer, Range, [], NewTags, OptOrMand).
- 
-decode_integer(Buffer, Range, NamedNumberList, Tags, OptOrMand) -> 
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_INTEGER}),
-    decode_integer_notag(Buffer, Range, NamedNumberList, NewTags, OptOrMand).
-
-decode_integer_notag(Buffer, Range, NamedNumberList, NewTags, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} = 
-	check_tags_i(NewTags, Buffer, OptOrMand),
-%    Result = {Val, Buffer2, RemovedBytes} =
-	case FormLen of
-	    {?CONSTRUCTED,Len} ->
-		{Buffer00, RestBytes} = split_list(Buffer0,Len),
-		{Val01, Buffer01, Rb01} = 
-		    decode_integer_notag(Buffer00, Range, NamedNumberList, 
-					 RestTags, OptOrMand),
-		{Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-		{Val01, Buffer02, Rb0+Rb01+Rb02};
-	    {_, Len} ->
-		Result =
-		    decode_integer2(Len,Buffer0,Rb0+Len),
-		Result2 = check_integer_constraint(Result,Range),
-		resolve_named_value(Result2,NamedNumberList)
-	end.
- 
-resolve_named_value(Result={Val,Buffer,RemBytes},NamedNumberList) ->
-    case NamedNumberList of
-	[] -> Result;
-	_ ->
-	    NewVal = case lists:keysearch(Val, 2, NamedNumberList) of 
-			 {value,{NamedVal, _}} -> 
-			     NamedVal; 
-			 _ -> 
-			     Val 
-		     end, 
-	    {NewVal, Buffer, RemBytes}
-    end.
-    
-check_integer_constraint(Result={Val, _Buffer,_},Range) ->
-    case Range of
-	[] -> % No length constraint
-	    Result;
-	{Lb,Ub} when Val >= Lb, Ub >= Val -> % variable length constraint
-	    Result;
-	Val -> % fixed value constraint
-	    Result;
-	{_,_} -> 
-	    exit({error,{asn1,{integer_range,Range,Val}}});
-	SingleValue when integer(SingleValue) ->
-	    exit({error,{asn1,{integer_range,Range,Val}}});
-	_ -> % some strange constraint that we don't support yet
-	    Result
-    end.
-
-%%============================================================================ 
-%% Enumerated value, ITU_T X.690 Chapter 8.4 
-
-%% encode enumerated value 
-%%============================================================================ 
-encode_enumerated(Val, []) when integer(Val)->
-    {EncVal,Len} = encode_integer(false,Val),
-    dotag_universal(?N_ENUMERATED,EncVal,Len);
-encode_enumerated(Val, DoTag) when integer(Val)->
-    dotag(DoTag, ?N_ENUMERATED, encode_integer(false,Val));
-encode_enumerated({Name,Val}, DoTag) when atom(Name) ->
-    encode_enumerated(Val, DoTag).
-
-%% The encode_enumerated functions below this line can be removed when the
-%% new code generation is stable. (the functions might have to be kept here
-%% a while longer for compatibility reasons)
-
-encode_enumerated(C, Val, {NamedNumberList,ExtList}, DoTag) when atom(Val) ->
-    case catch encode_enumerated(C, Val, NamedNumberList, DoTag) of
-	{'EXIT',_} -> encode_enumerated(C, Val, ExtList, DoTag);
-	Result -> Result
-    end;
- 
-encode_enumerated(C, Val, NamedNumberList, DoTag) when atom(Val) -> 
-    case lists:keysearch(Val, 1, NamedNumberList) of 
-	{value, {_, NewVal}} when DoTag == []->
-	    {EncVal,Len} = encode_integer(C,NewVal),
-	    dotag_universal(?N_ENUMERATED,EncVal,Len);
-	{value, {_, NewVal}} ->
-	    dotag(DoTag, ?N_ENUMERATED, encode_integer(C, NewVal)); 
-	_ -> 
-	    exit({error,{asn1, {enumerated_not_in_range, Val}}}) 
-    end; 
-
-encode_enumerated(C, {asn1_enum, Val}, {_,_}, DoTag) when integer(Val) ->
-    dotag(DoTag, ?N_ENUMERATED, encode_integer(C,Val));
-
-encode_enumerated(C, {Name,Val}, NamedNumberList, DoTag) when atom(Name) -> 
-    encode_enumerated(C, Val, NamedNumberList, DoTag);
-
-encode_enumerated(_, Val, _, _) -> 
-    exit({error,{asn1, {enumerated_not_namednumber, Val}}}). 
- 
- 
- 
-%%============================================================================ 
-%% decode enumerated value 
-%%   (Buffer, Range, NamedNumberList, HasTag, TotalLen) ->  
-%%                                    {Value, RemainingBuffer, RemovedBytes} 
-%%===========================================================================
-decode_enumerated(Buffer, Range, NamedNumberList, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_ENUMERATED}),
-    decode_enumerated_notag(Buffer, Range, NamedNumberList, 
-			    NewTags, OptOrMand).
-
-decode_enumerated_notag(Buffer, Range, NNList = {NamedNumberList,ExtList}, Tags, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} = 
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} = 
-		decode_enumerated_notag(Buffer00, Range, NNList, RestTags, OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->		    
-	    {Val01, Buffer01, Rb01} = 
-		decode_integer2(Len, Buffer0, Rb0+Len),
-	    case decode_enumerated1(Val01, NamedNumberList) of
-		{asn1_enum,Val01} ->
-		    {decode_enumerated1(Val01,ExtList), Buffer01, Rb01};
-		Result01 ->
-		    {Result01, Buffer01, Rb01}
-	    end
-    end;
- 
-decode_enumerated_notag(Buffer, Range, NNList, Tags, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} = 
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} = 
-		decode_enumerated_notag(Buffer00, Range, NNList, RestTags, OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->		    
-	    {Val01, Buffer02, Rb02} = 
-		decode_integer2(Len, Buffer0, Rb0+Len), 
-	    case decode_enumerated1(Val01, NNList) of
-		{asn1_enum,_} ->
-		    exit({error,{asn1, {illegal_enumerated, Val01}}});
-		Result01 ->
-		    {Result01, Buffer02, Rb02}
-	    end
-    end.
-
-decode_enumerated1(Val, NamedNumberList) ->     
-    %% it must be a named integer 
-    case lists:keysearch(Val, 2, NamedNumberList) of 
-	{value,{NamedVal, _}} -> 
-	    NamedVal; 
-	_ -> 
-	    {asn1_enum,Val}
-    end.
- 
-
-%%============================================================================ 
-%%
-%% Real value, ITU_T X.690 Chapter 8.5 
-%%============================================================================ 
-%%
-%% encode real value 
-%%============================================================================ 
- 
-%% only base 2 internally so far!! 
-encode_real(0, DoTag) ->
-    dotag(DoTag, ?N_REAL, {[],0}); 
-encode_real('PLUS-INFINITY', DoTag) ->
-    dotag(DoTag, ?N_REAL, {[64],1}); 
-encode_real('MINUS-INFINITY', DoTag) -> 
-    dotag(DoTag, ?N_REAL, {[65],1}); 
-encode_real(Val, DoTag) when tuple(Val)-> 
-    dotag(DoTag, ?N_REAL, encode_real(Val)). 
- 
-%%%%%%%%%%%%%% 
-%% not optimal efficient..  
-%% only base 2 of Mantissa encoding! 
-%% only base 2 of ExpBase encoding! 
-encode_real({Man, Base, Exp}) -> 
-%%    io:format("Mantissa: ~w Base: ~w, Exp: ~w~n",[Man, Base, Exp]), 
-     
-    OctExp = if Exp >= 0 -> list_to_binary(encode_integer_pos(Exp, [])); 
-		true     -> list_to_binary(encode_integer_neg(Exp, []))
-	     end, 
-%%    ok = io:format("OctExp: ~w~n",[OctExp]), 
-    SignBit = if  Man > 0 -> 0;  % bit 7 is pos or neg, no Zeroval 
-		  true -> 1
-	      end, 
-%%    ok = io:format("SignBitMask: ~w~n",[SignBitMask]), 
-    InBase = if  Base =:= 2 -> 0;   % bit 6,5: only base 2 this far! 
-			   true -> 
-			       exit({error,{asn1, {encode_real_non_supported_encodeing, Base}}}) 
-		       end, 
-    SFactor = 0,   % bit 4,3: no scaling since only base 2 
-    OctExpLen = size(OctExp), 
-    if OctExpLen > 255 -> 
-	    exit({error,{asn1, {to_big_exp_in_encode_real, OctExpLen}}}); 
-       true  -> true %% make real assert later.. 
-    end,  
-    {LenCode, EOctets} = case OctExpLen of   % bit 2,1  
-			     1 -> {0, OctExp}; 
-			     2 -> {1, OctExp}; 
-			     3 -> {2, OctExp}; 
-			     _ -> {3, <<OctExpLen, OctExp/binary>>}  
-			 end, 
-    FirstOctet = <<1:1,SignBit:1,InBase:2,SFactor:2,LenCode:2>>,
-    OctMantissa = if Man > 0 -> list_to_binary(minimum_octets(Man)); 
-		     true    -> list_to_binary(minimum_octets(-(Man))) % signbit keeps track of sign 
-		  end, 
-    %%    ok = io:format("LenMask: ~w EOctets: ~w~nFirstOctet: ~w OctMantissa: ~w OctExpLen: ~w~n", [LenMask, EOctets, FirstOctet, OctMantissa, OctExpLen]), 
-    Bin = <<FirstOctet/binary, EOctets/binary, OctMantissa/binary>>,
-    {Bin, size(Bin)}. 
- 
- 
-%encode_real({Man, Base, Exp}) -> 
-%%    io:format("Mantissa: ~w Base: ~w, Exp: ~w~n",[Man, Base, Exp]), 
-     
-%    OctExp = if Exp >= 0 -> encode_integer_pos(Exp, []); 
-%		true     -> encode_integer_neg(Exp, []) 
-%	     end, 
-%%    ok = io:format("OctExp: ~w~n",[OctExp]), 
-%    SignBitMask = if  Man > 0 -> 2#00000000;  % bit 7 is pos or neg, no Zeroval 
-%		      true    -> 2#01000000 
-%		  end, 
-%%    ok = io:format("SignBitMask: ~w~n",[SignBitMask]), 
-%    InternalBaseMask = if  Base =:= 2 -> 2#00000000;   % bit 6,5: only base 2 this far! 
-%			   true -> 
-%			       exit({error,{asn1, {encode_real_non_supported_encodeing, Base}}}) 
-%		       end, 
-%    ScalingFactorMask =2#00000000,   % bit 4,3: no scaling since only base 2 
-%    OctExpLen = length(OctExp), 
-%    if OctExpLen > 255  -> 
-%	    exit({error,{asn1, {to_big_exp_in_encode_real, OctExpLen}}}); 
-%       true  -> true %% make real assert later.. 
-%    end,  
-%    {LenMask, EOctets} = case OctExpLen of   % bit 2,1  
-%			     1 -> {0, OctExp}; 
-%			     2 -> {1, OctExp}; 
-%			     3 -> {2, OctExp}; 
-%			     _ -> {3, [OctExpLen, OctExp]}  
-%			 end, 
-%    FirstOctet = (SignBitMask bor InternalBaseMask bor 
-%		  ScalingFactorMask bor LenMask bor 
-%		  2#10000000), % bit set for binary mantissa encoding! 
-%    OctMantissa = if Man > 0 -> minimum_octets(Man); 
-%		     true    -> minimum_octets(-(Man)) % signbit keeps track of sign 
-%		  end, 
-%%    ok = io:format("LenMask: ~w EOctets: ~w~nFirstOctet: ~w OctMantissa: ~w OctExpLen: ~w~n", [LenMask, EOctets, FirstOctet, OctMantissa, OctExpLen]), 
-%     {[FirstOctet, EOctets, OctMantissa],
-%      length(OctMantissa) + 
-%      (if OctExpLen > 3 -> 
-%	       OctExpLen + 2; 
-%	  true -> 
-%	       OctExpLen + 1 
-%       end) 
-%     }. 
- 
-  
-%%============================================================================ 
-%% decode real value 
-%% 
-%% decode_real([OctetBufferList], tuple|value, tag|notag) -> 
-%%  {{Mantissa, Base, Exp} | realval | PLUS-INFINITY | MINUS-INFINITY | 0, 
-%%     RestBuff} 
-%%  
-%% only for base 2 decoding sofar!! 
-%%============================================================================ 
- 
-decode_real(Buffer, Form, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_REAL}),
-    decode_real_notag(Buffer, Form, NewTags, OptOrMand).
-
-decode_real_notag(Buffer, Form, Tags, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} = 
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} =
-		decode_real_notag(Buffer00, Form, RestTags, OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->
-	    decode_real2(Buffer0, Form, Len, Rb0)
-    end.
-
-decode_real2(Buffer0, Form, Len, RemBytes1) ->
-    <<First, Buffer2/binary>> = Buffer0,
-    if
-	First =:= 2#01000000 -> {'PLUS-INFINITY', Buffer2}; 
-	First =:= 2#01000001 -> {'MINUS-INFINITY', Buffer2}; 
-	First =:= 2#00000000 -> {0, Buffer2}; 
-	true -> 
-	    %% have some check here to verify only supported bases (2) 
-	    <<_B7:1,B6:1,B5_4:2,B3_2:2,B1_0:2>> = <<First>>,
-		Sign = B6,
-	    Base = 
-		case B5_4 of
-		    0 -> 2;  % base 2, only one so far 
-		    _ -> exit({error,{asn1, {non_supported_base, First}}}) 
-		end, 
-%	    ScalingFactor = 
-		case B3_2 of
-		    0 -> 0;  % no scaling so far  
-		    _ -> exit({error,{asn1, {non_supported_scaling, First}}}) 
-		end, 
-						%	    ok = io:format("Buffer2: ~w~n",[Buffer2]), 
-	    {FirstLen, {Exp, Buffer3}, RemBytes2} = 
-		case B1_0 of
-		    0 -> {2, decode_integer2(1, Buffer2, RemBytes1), RemBytes1+1}; 
-		    1 -> {3, decode_integer2(2, Buffer2, RemBytes1), RemBytes1+2}; 
-		    2 -> {4, decode_integer2(3, Buffer2, RemBytes1), RemBytes1+3}; 
-		    3 -> 
-			<<ExpLen1,RestBuffer/binary>> = Buffer2,
-			{ ExpLen1 + 2, 
-			  decode_integer2(ExpLen1, RestBuffer, RemBytes1), 
-			  RemBytes1+ExpLen1} 
-		end, 
-						%	    io:format("FirstLen: ~w, Exp: ~w, Buffer3: ~w ~n",
-						%	    [FirstLen, Exp, Buffer3]), 
-	    Length = Len - FirstLen,
-	    <<LongInt:Length/unit:8,RestBuff/binary>> = Buffer3,
-	    {{Mantissa, Buffer4}, RemBytes3} = 
-		if Sign =:= 0 -> 
-						%			io:format("sign plus~n"), 
-			{{LongInt, RestBuff}, 1 + Length};
-		   true -> 
-						%			io:format("sign minus~n"), 
-			{{-LongInt, RestBuff}, 1 + Length}
-		end, 
-						%	    io:format("Form: ~w~n",[Form]), 
-	    case Form of 
-		tuple -> 
-		    {Val,Buf,_RemB} = Exp, 
-		    {{Mantissa, Base, {Val,Buf}}, Buffer4, RemBytes2+RemBytes3};  
-		_value -> 
-		    comming 
-	    end 
-    end. 
- 
- 
-%%============================================================================ 
-%% Bitstring value, ITU_T X.690 Chapter 8.6 
-%%
-%% encode bitstring value 
-%% 
-%% bitstring NamedBitList 
-%% Val can be  of: 
-%% - [identifiers] where only named identifers are set to one,  
-%%   the Constraint must then have some information of the  
-%%   bitlength. 
-%% - [list of ones and zeroes] all bits  
-%% - integer value representing the bitlist 
-%% C is constrint Len, only valid when identifiers 
-%%============================================================================ 
- 
-encode_bit_string(C,Bin={Unused,BinBits},NamedBitList,DoTag) when integer(Unused), binary(BinBits) ->
-    encode_bin_bit_string(C,Bin,NamedBitList,DoTag);
-encode_bit_string(C, [FirstVal | RestVal], NamedBitList, DoTag) when atom(FirstVal) -> 
-    encode_bit_string_named(C, [FirstVal | RestVal], NamedBitList, DoTag); 
-
-encode_bit_string(C, [{bit,X} | RestVal], NamedBitList, DoTag) -> 
-    encode_bit_string_named(C, [{bit,X} | RestVal], NamedBitList, DoTag); 
- 
-encode_bit_string(C, [FirstVal| RestVal], NamedBitList, DoTag) when integer(FirstVal) -> 
-    encode_bit_string_bits(C, [FirstVal | RestVal], NamedBitList, DoTag); 
-
-encode_bit_string(_, 0, _, []) -> 
-    {[?N_BIT_STRING,1,0],3};
-
-encode_bit_string(_, 0, _, DoTag) -> 
-    dotag(DoTag, ?N_BIT_STRING, {<<0>>,1}); 
-
-encode_bit_string(_, [], _, []) -> 
-    {[?N_BIT_STRING,1,0],3};
-
-encode_bit_string(_, [], _, DoTag) -> 
-    dotag(DoTag, ?N_BIT_STRING, {<<0>>,1}); 
-
-encode_bit_string(C, IntegerVal, NamedBitList, DoTag) when integer(IntegerVal) -> 
-    BitListVal = int_to_bitlist(IntegerVal),
-    encode_bit_string_bits(C, BitListVal, NamedBitList, DoTag);
-
-encode_bit_string(C, {Name,BitList}, NamedBitList, DoTag) when atom(Name) ->
-    encode_bit_string(C, BitList, NamedBitList, DoTag).
-  
- 
- 
-int_to_bitlist(0) ->
-    [];
-int_to_bitlist(Int) when integer(Int), Int >= 0 ->
-    [Int band 1 | int_to_bitlist(Int bsr 1)].
-
-
-%%================================================================= 
-%% Encode BIT STRING of the form {Unused,BinBits}. 
-%% Unused is the number of unused bits in the last byte in BinBits 
-%% and BinBits is a binary representing the BIT STRING.
-%%================================================================= 
-encode_bin_bit_string(C,{Unused,BinBits},_NamedBitList,DoTag)->
-    case get_constraint(C,'SizeConstraint') of
-	no ->
-	    remove_unused_then_dotag(DoTag,?N_BIT_STRING,Unused,BinBits);
-	{_Min,Max} ->
-	    BBLen = (size(BinBits)*8)-Unused,
-	    if
-		BBLen > Max ->
-		    exit({error,{asn1, 
-				 {bitstring_length, 
-				  {{was,BBLen},{maximum,Max}}}}}); 
-		true ->
-		    remove_unused_then_dotag(DoTag,?N_BIT_STRING,
-					     Unused,BinBits)
-	    end;
-	Size ->
-	    case ((size(BinBits)*8)-Unused) of
-		BBSize when BBSize =< Size ->
-		    remove_unused_then_dotag(DoTag,?N_BIT_STRING,
-					     Unused,BinBits);
-		BBSize  ->
-		    exit({error,{asn1,  
-				 {bitstring_length, 
-				  {{was,BBSize},{should_be,Size}}}}})
-	    end
-    end.
-
-remove_unused_then_dotag(DoTag,StringType,Unused,BinBits) ->
-    case Unused of
-	0 when (size(BinBits) == 0),DoTag==[] ->
-	    %% time optimization of next case
-	   {[StringType,1,0],3};
-	0 when (size(BinBits) == 0) ->
-	    dotag(DoTag,StringType,{<<0>>,1});
-	0 when DoTag==[]-> % time optimization of next case
-	    dotag_universal(StringType,[Unused|BinBits],size(BinBits)+1);
-% 	    {LenEnc,Len} = encode_legth(size(BinBits)+1),
-% 	    {[StringType,LenEnc,[Unused|BinBits]],size(BinBits)+1+Len+1};
-	0 ->
-	    dotag(DoTag,StringType,<<Unused,BinBits/binary>>);
-	Num when DoTag == [] -> % time optimization of next case
-	    N = (size(BinBits)-1),
-	    <<BBits:N/binary,LastByte>> = BinBits,
-	    dotag_universal(StringType,
-			    [Unused,BBits,(LastByte bsr Num) bsl Num],
-			    size(BinBits)+1);
-% 	    {LenEnc,Len} = encode_legth(size(BinBits)+1),
-% 	    {[StringType,LenEnc,[Unused,BBits,(LastByte bsr Num) bsl Num],
-% 	      1+Len+size(BinBits)+1};
-	Num ->
-	    N = (size(BinBits)-1),
-	    <<BBits:N/binary,LastByte>> = BinBits,
-	    dotag(DoTag,StringType,{[Unused,binary_to_list(BBits) ++
-				     [(LastByte bsr Num) bsl Num]],
-				    1+size(BinBits)})
-    end.
-
-
-%%================================================================= 
-%% Encode named bits 
-%%================================================================= 
- 
-encode_bit_string_named(C, [FirstVal | RestVal], NamedBitList, DoTag) -> 
-    {Len,Unused,OctetList} =
-	case get_constraint(C,'SizeConstraint') of 
-	    no -> 
-		ToSetPos = get_all_bitposes([FirstVal | RestVal],
-					    NamedBitList, []), 
-		BitList = make_and_set_list(lists:max(ToSetPos)+1, 
-					    ToSetPos, 0), 
-		encode_bitstring(BitList);  
-	    {_Min,Max} -> 
-		ToSetPos = get_all_bitposes([FirstVal | RestVal],
-					    NamedBitList, []), 
-		BitList = make_and_set_list(Max, ToSetPos, 0), 
-		encode_bitstring(BitList);
-	    Size -> 
-		ToSetPos = get_all_bitposes([FirstVal | RestVal],
-					    NamedBitList, []), 
-		BitList = make_and_set_list(Size, ToSetPos, 0), 
-		encode_bitstring(BitList)
-	end,
-    case DoTag of
-	[] ->
-	    dotag_universal(?N_BIT_STRING,[Unused|OctetList],Len+1);
-% 	    {EncLen,LenLen} = encode_length(Len+1),
-% 	    {[?N_BIT_STRING,EncLen,Unused,OctetList],1+LenLen+Len+1};
-	_ ->
-	    dotag(DoTag, ?N_BIT_STRING, {[Unused|OctetList],Len+1})
-    end.
-
-	 
-%%---------------------------------------- 
-%% get_all_bitposes([list of named bits to set], named_bit_db, []) -> 
-%%   [sorted_list_of_bitpositions_to_set] 
-%%---------------------------------------- 
-
-get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
-    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
-get_all_bitposes([Val | Rest], NamedBitList, Ack) when atom(Val) -> 
-    case lists:keysearch(Val, 1, NamedBitList) of 
-	{value, {_ValName, ValPos}} -> 
-	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]); 
-	_ -> 
-	    exit({error,{asn1, {bitstring_namedbit, Val}}}) 
-    end; 
-get_all_bitposes([], _NamedBitList, Ack) -> 
-    lists:sort(Ack). 
- 
- 
-%%---------------------------------------- 
-%% make_and_set_list(Len of list to return, [list of positions to set to 1])-> 
-%% returns list of Len length, with all in SetPos set. 
-%% in positioning in list the first element is 0, the second 1 etc.., but 
-%% Len will make a list of length Len, not Len + 1. 
-%%    BitList = make_and_set_list(C, ToSetPos, 0), 
-%%---------------------------------------- 
- 
-make_and_set_list(0, [], _) -> []; 
-make_and_set_list(0, _, _) ->  
-    exit({error,{asn1,bitstring_sizeconstraint}}); 
-make_and_set_list(Len, [XPos|SetPos], XPos) -> 
-    [1 | make_and_set_list(Len - 1, SetPos, XPos + 1)]; 
-make_and_set_list(Len, [Pos|SetPos], XPos) -> 
-    [0 | make_and_set_list(Len - 1, [Pos | SetPos], XPos + 1)]; 
-make_and_set_list(Len, [], XPos) -> 
-    [0 | make_and_set_list(Len - 1, [], XPos + 1)]. 
- 
- 
- 
- 
- 
- 
-%%================================================================= 
-%% Encode bit string for lists of ones and zeroes 
-%%================================================================= 
-encode_bit_string_bits(C, BitListVal, _NamedBitList, DoTag) when list(BitListVal) -> 
-    {Len,Unused,OctetList} =
-	case get_constraint(C,'SizeConstraint') of 
-	    no -> 
-		encode_bitstring(BitListVal);  
-	    Constr={Min,Max} when integer(Min),integer(Max) -> 
-		encode_constr_bit_str_bits(Constr,BitListVal,DoTag);
-	    {Constr={_,_},[]} ->
-		%% constraint with extension mark
-		encode_constr_bit_str_bits(Constr,BitListVal,DoTag);
-	    Constr={{_,_},{_,_}} ->%{{Min1,Max1},{Min2,Max2}}
-		%% constraint with extension mark
-		encode_constr_bit_str_bits(Constr,BitListVal,DoTag);
-	    Size ->
-		case length(BitListVal) of
-		    BitSize when BitSize == Size ->
-			encode_bitstring(BitListVal);  
-		    BitSize when BitSize < Size ->
-			PaddedList = 
-			    pad_bit_list(Size-BitSize,BitListVal),
-			encode_bitstring(PaddedList);
-		    BitSize -> 
-			exit({error,
-			      {asn1,  
-			       {bitstring_length, 
-				{{was,BitSize},
-				 {should_be,Size}}}}}) 
-		end
-	end,
-    %%add unused byte to the Len 
-    case DoTag of
-	[] ->
-	    dotag_universal(?N_BIT_STRING,[Unused|OctetList],Len+1);
-% 	    {EncLen,LenLen}=encode_length(Len+1),
-% 	    {[?N_BIT_STRING,EncLen,Unused|OctetList],1+LenLen+Len+1};
-	_ ->
-	    dotag(DoTag, ?N_BIT_STRING, 
-		  {[Unused | OctetList],Len+1})
-    end.
-
- 
-encode_constr_bit_str_bits({_Min,Max},BitListVal,_DoTag) ->
-    BitLen = length(BitListVal), 
-    if  
-	BitLen > Max -> 
-	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
-						 {maximum,Max}}}}}); 
-	true -> 
-	    encode_bitstring(BitListVal)  
-    end;
-encode_constr_bit_str_bits({{_Min1,Max1},{Min2,Max2}},BitListVal,_DoTag) ->
-    BitLen = length(BitListVal),
-    case BitLen of
-	Len when Len > Max2 -> 
-	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
-						 {maximum,Max2}}}}}); 
-	Len when Len > Max1, Len < Min2  ->
-	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
-						 {not_allowed_interval,
-						  Max1,Min2}}}}});
-	_ ->
-	    encode_bitstring(BitListVal)
-    end.
-
-%% returns a list of length Size + length(BitListVal), with BitListVal 
-%% as the most significant elements followed by padded zero elements
-pad_bit_list(Size,BitListVal) ->
-    Tail = lists:duplicate(Size,0),
-    lists:append(BitListVal,Tail).
- 
-%%================================================================= 
-%% Do the actual encoding 
-%%     ([bitlist]) -> {ListLen, UnusedBits, OctetList} 
-%%================================================================= 
- 
-encode_bitstring([B8, B7, B6, B5, B4, B3, B2, B1 | Rest]) -> 
-    Val = (B8 bsl 7) bor (B7 bsl 6) bor (B6 bsl 5) bor (B5 bsl 4) bor 
-	(B4 bsl 3) bor (B3 bsl 2) bor (B2 bsl 1) bor B1, 
-    encode_bitstring(Rest, [Val], 1); 
-encode_bitstring(Val) -> 
-    {Unused, Octet} = unused_bitlist(Val, 7, 0), 
-    {1, Unused, [Octet]}. 
- 
-encode_bitstring([B8, B7, B6, B5, B4, B3, B2, B1 | Rest], Ack, Len) -> 
-    Val = (B8 bsl 7) bor (B7 bsl 6) bor (B6 bsl 5) bor (B5 bsl 4) bor 
-	(B4 bsl 3) bor (B3 bsl 2) bor (B2 bsl 1) bor B1, 
-    encode_bitstring(Rest, [Ack | [Val]], Len + 1); 
-%%even multiple of 8 bits.. 
-encode_bitstring([], Ack, Len) -> 
-    {Len, 0, Ack}; 
-%% unused bits in last octet 
-encode_bitstring(Rest, Ack, Len) -> 
-%    io:format("uneven ~w ~w ~w~n",[Rest, Ack, Len]), 
-    {Unused, Val} = unused_bitlist(Rest, 7, 0), 
-    {Len + 1, Unused, [Ack | [Val]]}. 
- 
-%%%%%%%%%%%%%%%%%% 
-%% unused_bitlist([list of ones and zeros <= 7], 7, []) -> 
-%%  {Unused bits, Last octet with bits moved to right} 
-unused_bitlist([], Trail, Ack) -> 
-    {Trail + 1, Ack}; 
-unused_bitlist([Bit | Rest], Trail, Ack) -> 
-%%    io:format("trail Bit: ~w Rest: ~w Trail: ~w Ack:~w~n",[Bit, Rest, Trail, Ack]), 
-    unused_bitlist(Rest, Trail - 1, (Bit bsl Trail) bor Ack). 
- 
- 
-%%============================================================================ 
-%% decode bitstring value 
-%%    (Buffer, Range, NamedNumberList, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}  
-%%============================================================================ 
-
-decode_compact_bit_string(Buffer, Range, NamedNumberList, Tags, LenIn, OptOrMand) ->
-%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_BIT_STRING}),
-     decode_restricted_string(Buffer, Range, ?N_BIT_STRING, Tags, LenIn, 
-			     NamedNumberList, OptOrMand,bin).
-
-decode_bit_string(Buffer, Range, NamedNumberList, Tags, LenIn, OptOrMand) -> 
-%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_BIT_STRING}),
-    decode_restricted_string(Buffer, Range, ?N_BIT_STRING, Tags, LenIn, 
-			     NamedNumberList, OptOrMand,old). 
- 
-
-decode_bit_string2(1,<<0 ,Buffer/binary>>,_NamedNumberList,RemovedBytes,BinOrOld) -> 
-    case BinOrOld of
-	bin ->
-	    {{0,<<>>},Buffer,RemovedBytes};
-	_ ->
-	    {[], Buffer, RemovedBytes}
-    end;
-decode_bit_string2(Len,<<Unused,Buffer/binary>>,NamedNumberList,
-		   RemovedBytes,BinOrOld) -> 
-    L = Len - 1,
-    <<Bits:L/binary,BufferTail/binary>> = Buffer,
-    case NamedNumberList of 
-	[] -> 
-	    case BinOrOld of
-		bin ->
-		    {{Unused,Bits},BufferTail,RemovedBytes};
-		_ ->
-		    BitString = decode_bitstring2(L, Unused, Buffer),
-		    {BitString,BufferTail, RemovedBytes}
-	    end;
-	_ -> 
-	    BitString = decode_bitstring2(L, Unused, Buffer),
-	    {decode_bitstring_NNL(BitString,NamedNumberList), 
-	     BufferTail,  
-	     RemovedBytes} 
-    end. 
- 
-%%---------------------------------------- 
-%% Decode the in buffer to bits 
-%%---------------------------------------- 
-decode_bitstring2(1,Unused,<<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,_/binary>>) -> 
-    lists:sublist([B7,B6,B5,B4,B3,B2,B1,B0],8-Unused); 
-decode_bitstring2(Len, Unused,
-		  <<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Buffer/binary>>) -> 
-    [B7, B6, B5, B4, B3, B2, B1, B0 | 
-     decode_bitstring2(Len - 1, Unused, Buffer)]. 
- 
-%%decode_bitstring2(1, Unused, Buffer) -> 
-%%    make_bits_of_int(hd(Buffer), 128, 8-Unused); 
-%%decode_bitstring2(Len, Unused, [BitVal | Buffer]) -> 
-%%    [B7, B6, B5, B4, B3, B2, B1, B0] = make_bits_of_int(BitVal, 128, 8), 
-%%    [B7, B6, B5, B4, B3, B2, B1, B0 | 
-%%     decode_bitstring2(Len - 1, Unused, Buffer)]. 
- 
- 
-%%make_bits_of_int(_, _, 0) -> 
-%%    []; 
-%%make_bits_of_int(BitVal, MaskVal, Unused) when Unused > 0 -> 
-%%    X = case MaskVal band BitVal of 
-%%	    0 -> 0 ; 
-%%	    _ -> 1 
-%%	end, 
-%%    [X | make_bits_of_int(BitVal, MaskVal bsr 1, Unused - 1)]. 
- 
- 
- 
-%%---------------------------------------- 
-%% Decode the bitlist to names 
-%%---------------------------------------- 
-
- 
-decode_bitstring_NNL(BitList,NamedNumberList) -> 
-    decode_bitstring_NNL(BitList,NamedNumberList,0,[]). 
- 
- 
-decode_bitstring_NNL([],_,_No,Result) -> 
-    lists:reverse(Result); 
-
-decode_bitstring_NNL([B|BitList],[{Name,No}|NamedNumberList],No,Result) -> 
-    if 
-	B == 0 -> 
-	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,Result); 
-	true -> 
-	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,[Name|Result]) 
-    end; 
-decode_bitstring_NNL([1|BitList],NamedNumberList,No,Result) -> 
-	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,[{bit,No}|Result]); 
-decode_bitstring_NNL([0|BitList],NamedNumberList,No,Result) ->
-	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,Result). 
- 
- 
-%%============================================================================ 
-%% Octet string, ITU_T X.690 Chapter 8.7 
-%%
-%% encode octet string 
-%% The OctetList must be a flat list of integers in the range 0..255
-%% the function does not check this because it takes to much time
-%%============================================================================ 
-encode_octet_string(_C, OctetList, []) when binary(OctetList) -> 
-    dotag_universal(?N_OCTET_STRING,OctetList,size(OctetList));
-encode_octet_string(_C, OctetList, DoTag) when binary(OctetList) -> 
-    dotag(DoTag, ?N_OCTET_STRING, {OctetList,size(OctetList)});
-encode_octet_string(_C, OctetList, DoTag) when list(OctetList) -> 
-    case length(OctetList) of
-	Len when DoTag == [] ->
-	    dotag_universal(?N_OCTET_STRING,OctetList,Len);
-	Len ->
-	    dotag(DoTag, ?N_OCTET_STRING, {OctetList,Len})
-    end;
-% encode_octet_string(C, OctetList, DoTag) when list(OctetList) -> 
-%     dotag(DoTag, ?N_OCTET_STRING, {OctetList,length(OctetList)});
-encode_octet_string(C, {Name,OctetList}, DoTag) when atom(Name) -> 
-    encode_octet_string(C, OctetList, DoTag).
- 
-
-%%============================================================================ 
-%% decode octet string  
-%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}  
-%% 
-%% Octet string is decoded as a restricted string 
-%%============================================================================ 
-decode_octet_string(Buffer, Range, Tags, TotalLen, OptOrMand) -> 
-%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_OCTET_STRING}),
-    decode_restricted_string(Buffer, Range, ?N_OCTET_STRING, 
-			     Tags, TotalLen, [], OptOrMand,old). 
-
-%%============================================================================ 
-%% Null value, ITU_T X.690 Chapter 8.8 
-%%
-%% encode NULL value 
-%%============================================================================ 
- 
-encode_null(_, []) -> 
-    {[?N_NULL,0],2};
-encode_null(_, DoTag) -> 
-    dotag(DoTag, ?N_NULL, {[],0}). 
- 
-%%============================================================================ 
-%% decode NULL value 
-%%    (Buffer, HasTag, TotalLen) -> {NULL, Remain, RemovedBytes}  
-%%============================================================================ 
-decode_null(Buffer, Tags, OptOrMand) ->
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_NULL}),
-    decode_null_notag(Buffer, NewTags, OptOrMand).
-
-decode_null_notag(Buffer, Tags, OptOrMand) ->
-    {RestTags, {FormLen, Buffer0, Rb0}} = 
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {_Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} = decode_null_notag(Buffer0, RestTags, 
-							OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,0} ->
-	    {'NULL', Buffer0, Rb0};
-	{_,Len} ->
-	    exit({error,{asn1,{invalid_length,'NULL',Len}}})
-    end. 
- 
- 
-%%============================================================================ 
-%% Object identifier, ITU_T X.690 Chapter 8.19 
-%%
-%% encode Object Identifier value 
-%%============================================================================ 
- 
-encode_object_identifier({Name,Val}, DoTag) when atom(Name) -> 
-    encode_object_identifier(Val, DoTag);
-encode_object_identifier(Val, []) -> 
-    {EncVal,Len} = e_object_identifier(Val),
-    dotag_universal(?N_OBJECT_IDENTIFIER,EncVal,Len);
-encode_object_identifier(Val, DoTag) -> 
-    dotag(DoTag, ?N_OBJECT_IDENTIFIER, e_object_identifier(Val)).
- 
-e_object_identifier({'OBJECT IDENTIFIER', V}) -> 
-    e_object_identifier(V); 
-e_object_identifier({Cname, V}) when atom(Cname), tuple(V) -> 
-    e_object_identifier(tuple_to_list(V)); 
-e_object_identifier({Cname, V}) when atom(Cname), list(V) -> 
-    e_object_identifier(V); 
-e_object_identifier(V) when tuple(V) -> 
-    e_object_identifier(tuple_to_list(V)); 
- 
-%%%%%%%%%%%%%%% 
-%% e_object_identifier([List of Obect Identifiers]) -> 
-%% {[Encoded Octetlist of ObjIds], IntLength} 
-%% 
-e_object_identifier([E1, E2 | Tail]) -> 
-    Head = 40*E1 + E2,  % wow! 
-    {H,Lh} = mk_object_val(Head),
-    {R,Lr} = enc_obj_id_tail(Tail, [], 0),
-    {[H|R], Lh+Lr}.
-
-enc_obj_id_tail([], Ack, Len) ->
-    {lists:reverse(Ack), Len};
-enc_obj_id_tail([H|T], Ack, Len) ->
-    {B, L} = mk_object_val(H),
-    enc_obj_id_tail(T, [B|Ack], Len+L).
-
-%% e_object_identifier([List of Obect Identifiers]) -> 
-%% {[Encoded Octetlist of ObjIds], IntLength} 
-%% 
-%%e_object_identifier([E1, E2 | Tail]) -> 
-%%    Head = 40*E1 + E2,  % wow! 
-%%    F = fun(Val, AckLen) -> 
-%%		{L, Ack} = mk_object_val(Val), 
-%%		{L, Ack + AckLen} 
-%%	end, 
-%%    {Octets, Len} = lists:mapfoldl(F, 0, [Head | Tail]).
-
-%%%%%%%%%%% 
-%% mk_object_val(Value) -> {OctetList, Len} 
-%% returns a Val as a list of octets, the 8 bit is allways set to one except 
-%% for the last octet, where its 0 
-%% 
-
- 
-mk_object_val(Val) when Val =< 127 -> 
-    {[255 band Val], 1}; 
-mk_object_val(Val) -> 
-    mk_object_val(Val bsr 7, [Val band 127], 1).  
-mk_object_val(0, Ack, Len) -> 
-    {Ack, Len}; 
-mk_object_val(Val, Ack, Len) -> 
-    mk_object_val(Val bsr 7, [((Val band 127) bor 128) | Ack], Len + 1). 
- 
- 
- 
-%%============================================================================ 
-%% decode Object Identifier value   
-%%    (Buffer, HasTag, TotalLen) -> {{ObjId}, Remain, RemovedBytes}  
-%%============================================================================ 
- 
-decode_object_identifier(Buffer, Tags, OptOrMand) -> 
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,
-				 number=?N_OBJECT_IDENTIFIER}),
-    decode_object_identifier_notag(Buffer, NewTags, OptOrMand).
-
-decode_object_identifier_notag(Buffer, Tags, OptOrMand) -> 
-    {RestTags, {FormLen, Buffer0, Rb0}} = 
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} = 
-		decode_object_identifier_notag(Buffer00, 
-					       RestTags, OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->
-	    {[AddedObjVal|ObjVals],Buffer01} = 
-		dec_subidentifiers(Buffer0,0,[],Len), 
-	    {Val1, Val2} = if 
-			       AddedObjVal < 40 -> 
-				   {0, AddedObjVal}; 
-			       AddedObjVal < 80 -> 
-				   {1, AddedObjVal - 40}; 
-			       true -> 
-				   {2, AddedObjVal - 80} 
-			   end, 
-	    {list_to_tuple([Val1, Val2 | ObjVals]), Buffer01, 
-	     Rb0+Len}
-    end. 
-
-dec_subidentifiers(Buffer,_Av,Al,0) -> 
-    {lists:reverse(Al),Buffer}; 
-dec_subidentifiers(<<1:1,H:7,T/binary>>,Av,Al,Len) -> 
-    dec_subidentifiers(T,(Av bsl 7) + H,Al,Len-1); 
-dec_subidentifiers(<<H,T/binary>>,Av,Al,Len) -> 
-    dec_subidentifiers(T,0,[((Av bsl 7) + H)|Al],Len-1). 
-
-
-%%dec_subidentifiers(Buffer,Av,Al,0) -> 
-%%    {lists:reverse(Al),Buffer}; 
-%%dec_subidentifiers([H|T],Av,Al,Len) when H >=16#80 -> 
-%%    dec_subidentifiers(T,(Av bsl 7) + (H band 16#7F),Al,Len-1); 
-%%dec_subidentifiers([H|T],Av,Al,Len) -> 
-%%    dec_subidentifiers(T,0,[(Av bsl 7) + H |Al],Len-1). 
- 
- 
-%%============================================================================ 
-%% Restricted character string types, ITU_T X.690 Chapter 8.20 
-%%
-%% encode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings 
-%%============================================================================ 
-encode_restricted_string(_C, OctetList, StringType, []) 
-  when binary(OctetList) -> 
-    dotag_universal(StringType,OctetList,size(OctetList));
-encode_restricted_string(_C, OctetList, StringType, DoTag) 
-  when binary(OctetList) -> 
-    dotag(DoTag, StringType, {OctetList, size(OctetList)});
-encode_restricted_string(_C, OctetList, StringType, []) 
-  when list(OctetList) ->
-    dotag_universal(StringType,OctetList,length(OctetList));
-encode_restricted_string(_C, OctetList, StringType, DoTag) 
-  when list(OctetList) ->
-    dotag(DoTag, StringType, {OctetList, length(OctetList)}); 
-encode_restricted_string(C,{Name,OctetL},StringType,DoTag) when atom(Name)-> 
-    encode_restricted_string(C, OctetL, StringType, DoTag).
-
-%%============================================================================ 
-%% decode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings 
-%%    (Buffer, Range, StringType, HasTag, TotalLen) -> 
-%%                                  {String, Remain, RemovedBytes}  
-%%============================================================================ 
-
-decode_restricted_string(Buffer, Range, StringType, Tags, LenIn, OptOrMand) -> 
-    {Val,Buffer2,Rb} = 
-	decode_restricted_string_tag(Buffer, Range, StringType, Tags, 
-				  LenIn, [], OptOrMand,old),
-    {check_and_convert_restricted_string(Val,StringType,Range,[],old),
-     Buffer2,Rb}. 
-
-
-decode_restricted_string(Buffer, Range, StringType, Tags, LenIn, NNList, OptOrMand, BinOrOld ) -> 
-    {Val,Buffer2,Rb} = 
-	decode_restricted_string_tag(Buffer, Range, StringType, Tags, 
-			     LenIn, NNList, OptOrMand, BinOrOld),
-    {check_and_convert_restricted_string(Val,StringType,Range,NNList,BinOrOld),
-     Buffer2,Rb}. 
- 
-decode_restricted_string_tag(Buffer, Range, StringType, TagsIn, LenIn, NNList, OptOrMand, BinOrOld ) -> 
-    NewTags = new_tags(TagsIn, #tag{class=?UNIVERSAL,number=StringType}),
-    decode_restricted_string_notag(Buffer, Range, StringType, NewTags, 
-				   LenIn, NNList, OptOrMand, BinOrOld).
-
- 
-
-
-check_and_convert_restricted_string(Val,StringType,Range,NamedNumberList,_BinOrOld) ->
-    {StrLen,NewVal} = case StringType of
-			  ?N_BIT_STRING when NamedNumberList /= [] ->
-			      {no_check,Val};
-			  ?N_BIT_STRING when list(Val) ->
-			      {length(Val),Val};
-			  ?N_BIT_STRING when tuple(Val) -> 
-			      {(size(element(2,Val))*8) - element(1,Val),Val};
-			  _ when binary(Val) ->
-			      {size(Val),binary_to_list(Val)};
-			  _ when list(Val) ->
-			      {length(Val), Val}
-		      end,
-    case Range of
-	_ when StrLen == no_check ->
-	    NewVal;
-	[] -> % No length constraint
-	    NewVal;
-	{Lb,Ub} when StrLen >= Lb, Ub >= StrLen -> % variable length constraint
-	    NewVal;
-	{{Lb,_Ub},[]} when StrLen >= Lb ->
-	    NewVal;
-	{{Lb1,Ub1},{Lb2,Ub2}} when StrLen >= Lb1, StrLen =< Ub1; 
-				   StrLen =< Ub2, StrLen >= Lb2 ->
-	    NewVal;
-	StrLen -> % fixed length constraint
-	    NewVal;
-	{_,_} -> 
-	    exit({error,{asn1,{length,Range,Val}}});
-	_Len when integer(_Len) ->
-	    exit({error,{asn1,{length,Range,Val}}});
-	_ -> % some strange constraint that we don't support yet
-	    NewVal
-    end.
-
-
-%%=============================================================================
-%% Common routines for several string types including bit string
-%% handles indefinite length 
-%%=============================================================================
-
-
-decode_restricted_string_notag(Buffer, _Range, StringType, TagsIn, 
-			 _, NamedNumberList, OptOrMand,BinOrOld) -> 
-    %%----------------------------------------------------------- 
-    %% Get inner (the implicit tag or no tag) and  
-    %%     outer (the explicit tag) lengths. 
-    %%----------------------------------------------------------- 
-    {RestTags, {FormLength={_,_Len01}, Buffer0, Rb0}} = 
-	check_tags_i(TagsIn, Buffer, OptOrMand),
-
-    case FormLength of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00, RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} = 
-		decode_restricted_parts(Buffer00, RestBytes, [], StringType, 
-					RestTags,
-					Len, NamedNumberList, 
-					OptOrMand, 
-					BinOrOld, 0, []),
-	    {Val01, Buffer01, Rb0+Rb01};
-	{_, Len} ->
-	    {Val01, Buffer01, Rb01} = 
-		decode_restricted(Buffer0, Len, StringType, 
-				  NamedNumberList, BinOrOld),
-	    {Val01, Buffer01, Rb0+Rb01}
-    end.
-
-
-decode_restricted_parts(Buffer, RestBytes, [], StringType, RestTags, Len, NNList, 
-			OptOrMand, BinOrOld, AccRb, AccVal) ->
-    DecodeFun = case RestTags of
-		    [] -> fun decode_restricted_string_tag/8;
-		    _ -> fun decode_restricted_string_notag/8
-		end,
-    {Val, Buffer1, Rb} = 
-	DecodeFun(Buffer, [], StringType, RestTags, 
-		  no_length, NNList, 
-		  OptOrMand, BinOrOld),
-    {Buffer2,More} = 
-	case Buffer1 of
-	    <<0,0,Buffer10/binary>> when Len == indefinite ->
-		{Buffer10,false};
-	    <<>> ->
-		{RestBytes,false};
-	    _ ->
-		{Buffer1,true}
-	end,
-    {NewVal, NewRb} =
-	case StringType of
-	    ?N_BIT_STRING when BinOrOld == bin ->
-		{concat_bit_binaries(AccVal, Val), AccRb+Rb};
-	    _ when binary(Val),binary(AccVal) ->
-		{<<AccVal/binary,Val/binary>>,AccRb+Rb};
-	    _ when binary(Val), AccVal==[] ->
-		{Val,AccRb+Rb};				      
-	    _ ->	
-		{AccVal++Val, AccRb+Rb}
-	end,
-    case More of
-	false ->
-	    {NewVal, Buffer2, NewRb};
-	true ->
-	    decode_restricted_parts(Buffer2, RestBytes, [], StringType, RestTags, Len, NNList, 
-				    OptOrMand, BinOrOld, NewRb, NewVal)
-    end.
-
-    
- 
-decode_restricted(Buffer, InnerLen, StringType, NamedNumberList,BinOrOld) -> 
-    
-    case StringType of 
-	?N_BIT_STRING -> 
-	    decode_bit_string2(InnerLen,Buffer,NamedNumberList,InnerLen,BinOrOld); 
-	
-	?N_UniversalString ->
-	    <<PreBuff:InnerLen/binary,RestBuff/binary>> = Buffer,%%added for binary
-	    UniString = mk_universal_string(binary_to_list(PreBuff)), 
-	    {UniString,RestBuff,InnerLen}; 
-	?N_BMPString ->  
-	    <<PreBuff:InnerLen/binary,RestBuff/binary>> = Buffer,%%added for binary
-	    BMP = mk_BMP_string(binary_to_list(PreBuff)), 
-	    {BMP,RestBuff,InnerLen}; 
-	_ ->  
-	    <<PreBuff:InnerLen/binary,RestBuff/binary>> = Buffer,%%added for binary
-	    {PreBuff, RestBuff, InnerLen}
-    end. 
-     
-
-  
-%%============================================================================ 
-%% encode Universal string 
-%%============================================================================ 
-
-encode_universal_string(C, {Name, Universal}, DoTag) when atom(Name) -> 
-    encode_universal_string(C, Universal, DoTag);
-encode_universal_string(_C, Universal, []) -> 
-    OctetList = mk_uni_list(Universal),
-    dotag_universal(?N_UniversalString,OctetList,length(OctetList));
-encode_universal_string(_C, Universal, DoTag) -> 
-    OctetList = mk_uni_list(Universal), 
-    dotag(DoTag, ?N_UniversalString, {OctetList,length(OctetList)}). 
- 
-mk_uni_list(In) ->  
-    mk_uni_list(In,[]). 
- 
-mk_uni_list([],List) ->  
-    lists:reverse(List); 
-mk_uni_list([{A,B,C,D}|T],List) ->  
-    mk_uni_list(T,[D,C,B,A|List]); 
-mk_uni_list([H|T],List) ->  
-    mk_uni_list(T,[H,0,0,0|List]). 
- 
-%%=========================================================================== 
-%% decode Universal strings  
-%%    (Buffer, Range, StringType, HasTag, LenIn) -> 
-%%                           {String, Remain, RemovedBytes}  
-%%=========================================================================== 
-
-decode_universal_string(Buffer, Range, Tags, LenIn, OptOrMand) ->
-%    NewTags = new_tags(HasTag, #tag{class=?UNIVERSAL,number=?N_UniversalString}),
-    decode_restricted_string(Buffer, Range, ?N_UniversalString, 
-			     Tags, LenIn, [], OptOrMand,old).
-  
- 
-mk_universal_string(In) -> 
-    mk_universal_string(In,[]). 
- 
-mk_universal_string([],Acc) -> 
-    lists:reverse(Acc); 
-mk_universal_string([0,0,0,D|T],Acc) -> 
-    mk_universal_string(T,[D|Acc]); 
-mk_universal_string([A,B,C,D|T],Acc) -> 
-    mk_universal_string(T,[{A,B,C,D}|Acc]). 
- 
- 
-%%============================================================================ 
-%% encode BMP string 
-%%============================================================================ 
-
-encode_BMP_string(C, {Name,BMPString}, DoTag) when atom(Name)-> 
-    encode_BMP_string(C, BMPString, DoTag);
-encode_BMP_string(_C, BMPString, []) -> 
-    OctetList = mk_BMP_list(BMPString),
-    dotag_universal(?N_BMPString,OctetList,length(OctetList));
-encode_BMP_string(_C, BMPString, DoTag) -> 
-    OctetList = mk_BMP_list(BMPString), 
-    dotag(DoTag, ?N_BMPString, {OctetList,length(OctetList)}). 
- 
-mk_BMP_list(In) ->  
-    mk_BMP_list(In,[]). 
- 
-mk_BMP_list([],List) ->  
-    lists:reverse(List); 
-mk_BMP_list([{0,0,C,D}|T],List) ->  
-    mk_BMP_list(T,[D,C|List]); 
-mk_BMP_list([H|T],List) ->  
-    mk_BMP_list(T,[H,0|List]). 
- 
-%%============================================================================ 
-%% decode (OctetList, Range(ignored), tag|notag) -> {ValList, RestList} 
-%%    (Buffer, Range, StringType, HasTag, TotalLen) -> 
-%%                               {String, Remain, RemovedBytes}  
-%%============================================================================ 
-decode_BMP_string(Buffer, Range, Tags, LenIn, OptOrMand) -> 
-%    NewTags = new_tags(HasTag, #tag{class=?UNIVERSAL,number=?N_BMPString}),
-    decode_restricted_string(Buffer, Range, ?N_BMPString, 
-			     Tags, LenIn, [], OptOrMand,old). 
- 
-mk_BMP_string(In) -> 
-    mk_BMP_string(In,[]). 
- 
-mk_BMP_string([],US) -> 
-    lists:reverse(US); 
-mk_BMP_string([0,B|T],US) -> 
-    mk_BMP_string(T,[B|US]); 
-mk_BMP_string([C,D|T],US) -> 
-    mk_BMP_string(T,[{0,0,C,D}|US]). 
- 
- 
-%%============================================================================ 
-%% Generalized time, ITU_T X.680 Chapter 39 
-%%
-%% encode Generalized time 
-%%============================================================================ 
-
-encode_generalized_time(C, {Name,OctetList}, DoTag) when atom(Name) -> 
-    encode_generalized_time(C, OctetList, DoTag);
-encode_generalized_time(_C, OctetList, []) -> 
-    dotag_universal(?N_GeneralizedTime,OctetList,length(OctetList));
-encode_generalized_time(_C, OctetList, DoTag) -> 
-    dotag(DoTag, ?N_GeneralizedTime, {OctetList,length(OctetList)}). 
- 
-%%============================================================================ 
-%% decode Generalized time  
-%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}  
-%%============================================================================ 
-
-decode_generalized_time(Buffer, Range, Tags, TotalLen, OptOrMand) -> 
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,
-			 number=?N_GeneralizedTime}),
-    decode_generalized_time_notag(Buffer, Range, NewTags, TotalLen, OptOrMand).
-
-decode_generalized_time_notag(Buffer, Range, Tags, TotalLen, OptOrMand) -> 
-    {RestTags, {FormLen, Buffer0, Rb0}} =  
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} = 
-		decode_generalized_time_notag(Buffer00, Range, 
-					      RestTags, TotalLen, 
-					      OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->
-	    <<PreBuff:Len/binary,RestBuff/binary>> = Buffer0,
-	    {binary_to_list(PreBuff), RestBuff, Rb0+Len}
-    end.
-
-%%============================================================================ 
-%% Universal time, ITU_T X.680 Chapter 40 
-%%
-%% encode UTC time 
-%%============================================================================ 
-
-encode_utc_time(C, {Name,OctetList}, DoTag) when atom(Name) -> 
-    encode_utc_time(C, OctetList, DoTag);
-encode_utc_time(_C, OctetList, []) -> 
-    dotag_universal(?N_UTCTime, OctetList,length(OctetList));
-encode_utc_time(_C, OctetList, DoTag) -> 
-    dotag(DoTag, ?N_UTCTime, {OctetList,length(OctetList)}).
- 
-%%============================================================================ 
-%% decode UTC time 
-%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}  
-%%============================================================================ 
-
-decode_utc_time(Buffer, Range, Tags, TotalLen, OptOrMand) -> 
-    NewTags = new_tags(Tags,#tag{class=?UNIVERSAL,number=?N_UTCTime}),
-    decode_utc_time_notag(Buffer, Range, NewTags, TotalLen, OptOrMand).
-								  
-decode_utc_time_notag(Buffer, Range, Tags, TotalLen, OptOrMand) -> 
-    {RestTags, {FormLen, Buffer0, Rb0}} =  
-	check_tags_i(Tags, Buffer, OptOrMand),
-
-    case FormLen of
-	{?CONSTRUCTED,Len} ->
-	    {Buffer00,RestBytes} = split_list(Buffer0,Len),
-	    {Val01, Buffer01, Rb01} = 
-		decode_utc_time_notag(Buffer00, Range, 
-				      RestTags, TotalLen, 
-				      OptOrMand),
-	    {Buffer02, Rb02} = restbytes2(RestBytes,Buffer01,noext),
-	    {Val01, Buffer02, Rb0+Rb01+Rb02};
-	{_,Len} ->
-	    <<PreBuff:Len/binary,RestBuff/binary>> = Buffer0,
-	    {binary_to_list(PreBuff), RestBuff, Rb0+Len}
-    end.
-
- 
-%%============================================================================ 
-%% Length handling  
-%%
-%% Encode length 
-%% 
-%% encode_length(Int | indefinite) -> 
-%%          [<127]| [128 + Int (<127),OctetList] | [16#80] 
-%%============================================================================ 
- 
-encode_length(indefinite) -> 
-    {[16#80],1}; % 128 
-encode_length(L) when L =< 16#7F -> 
-    {[L],1}; 
-encode_length(L) -> 
-    Oct = minimum_octets(L), 
-    Len = length(Oct), 
-    if 
-	Len =< 126 -> 
-	    {[ (16#80+Len) | Oct ],Len+1}; 
-	true -> 
-	    exit({error,{asn1, to_long_length_oct, Len}}) 
-    end. 
- 
-
-%% Val must be >= 0
-minimum_octets(Val) -> 
-    minimum_octets(Val,[]). 
- 
-minimum_octets(0,Acc) ->
-    Acc;
-minimum_octets(Val, Acc) ->
-    minimum_octets((Val bsr 8),[Val band 16#FF | Acc]).
-
- 
-%%=========================================================================== 
-%% Decode length 
-%% 
-%% decode_length(OctetList) -> {{indefinite, RestOctetsL}, NoRemovedBytes} |  
-%%                             {{Length, RestOctetsL}, NoRemovedBytes} 
-%%=========================================================================== 
-
-decode_length(<<1:1,0:7,T/binary>>) ->     
-    {{indefinite, T}, 1};
-decode_length(<<0:1,Length:7,T/binary>>) ->
-    {{Length,T},1};
-decode_length(<<1:1,LL:7,T/binary>>) ->
-    <<Length:LL/unit:8,Rest/binary>> = T,
-    {{Length,Rest}, LL+1}.
-
-%decode_length([128 | T]) -> 
-%    {{indefinite, T},1}; 
-%decode_length([H | T]) when H =< 127 -> 
-%    {{H, T},1}; 
-%decode_length([H | T]) -> 
-%    dec_long_length(H band 16#7F, T, 0, 1). 
- 
-
-%%dec_long_length(0, Buffer, Acc, Len) -> 
-%%    {{Acc, Buffer},Len}; 
-%%dec_long_length(Bytes, [H | T], Acc, Len) -> 
-%%    dec_long_length(Bytes - 1, T, (Acc bsl 8) + H, Len+1). 
- 
-%%===========================================================================
-%% Decode tag and length
-%%
-%% decode_tag_and_length(Buffer) -> {Tag, Len, RemainingBuffer, RemovedBytes}
-%% 
-%%===========================================================================
-
-decode_tag_and_length(Buffer) ->
-    {Tag, Buffer2, RemBytesTag} = decode_tag(Buffer), 
-    {{Len, Buffer3}, RemBytesLen} = decode_length(Buffer2), 
-    {Tag, Len, Buffer3, RemBytesTag+RemBytesLen}. 
- 
-
-%%============================================================================ 
-%% Check if valid tag 
-%% 
-%% check_if_valid_tag(Tag, List_of_valid_tags, OptOrMand) -> name of the tag 
-%%=============================================================================== 
-
-check_if_valid_tag(<<0,0,_/binary>>,_,_) ->
-    asn1_EOC;
-check_if_valid_tag(<<>>, _, OptOrMand) -> 
-    check_if_valid_tag2(false,[],[],OptOrMand);
-check_if_valid_tag(Bytes, ListOfTags, OptOrMand) when binary(Bytes) ->
-    {Tag, _, _} = decode_tag(Bytes),
-    check_if_valid_tag(Tag, ListOfTags, OptOrMand);
-
-%% This alternative should be removed in the near future
-%% Bytes as input should be the only necessary call
-check_if_valid_tag(Tag, ListOfTags, OptOrMand) -> 
-    {Class, _Form, TagNo} = Tag, 
-    C = code_class(Class), 
-    T = case C of 
-	    'UNIVERSAL' -> 
-		code_type(TagNo); 
-	    _ -> 
-		TagNo 
-	end, 
-    check_if_valid_tag2({C,T}, ListOfTags, Tag, OptOrMand). 
-
-check_if_valid_tag2(_Class_TagNo, [], Tag, mandatory) -> 
-    exit({error,{asn1,{invalid_tag,Tag}}}); 
-check_if_valid_tag2(_Class_TagNo, [], Tag, _) -> 
-    exit({error,{asn1,{no_optional_tag,Tag}}}); 
- 
-check_if_valid_tag2(Class_TagNo, [{TagName,TagList}|T], Tag, OptOrMand) -> 
-    case check_if_valid_tag_loop(Class_TagNo, TagList) of 
-	true -> 
-	    TagName; 
-	false -> 
-	    check_if_valid_tag2(Class_TagNo, T, Tag, OptOrMand) 
-    end. 
- 
-check_if_valid_tag_loop(_Class_TagNo,[]) -> 
-    false; 
-check_if_valid_tag_loop(Class_TagNo,[H|T]) -> 
-    %% It is not possible to distinguish between SEQUENCE OF and SEQUENCE, and
-    %% between SET OF and SET because both are coded as 16 and 17, respectively.
-    H_without_OF = case H of
-		       {C, 'SEQUENCE OF'} ->
-			   {C, 'SEQUENCE'};
-		       {C, 'SET OF'} ->
-			   {C, 'SET'};
-		       Else ->
-			   Else
-		   end,
-
-    case H_without_OF of 
-	Class_TagNo -> 
-	    true; 
-	{_,_} -> 
-	    check_if_valid_tag_loop(Class_TagNo,T); 
-	_ -> 
-	    check_if_valid_tag_loop(Class_TagNo,H), 
-	    check_if_valid_tag_loop(Class_TagNo,T) 
-    end. 
- 
- 
- 
-code_class(0) -> 'UNIVERSAL'; 
-code_class(16#40) -> 'APPLICATION'; 
-code_class(16#80) -> 'CONTEXT'; 
-code_class(16#C0) -> 'PRIVATE'. 
- 
- 
-code_type(1) -> 'BOOLEAN'; 
-code_type(2) -> 'INTEGER'; 
-code_type(3) -> 'BIT STRING';  
-code_type(4) -> 'OCTET STRING';  
-code_type(5) -> 'NULL'; 
-code_type(6) -> 'OBJECT IDENTIFIER'; 
-code_type(7) -> 'OBJECT DESCRIPTOR'; 
-code_type(8) -> 'EXTERNAL'; 
-code_type(9) -> 'REAL'; 
-code_type(10) -> 'ENUMERATED'; 
-code_type(11) -> 'EMBEDDED_PDV'; 
-code_type(16) -> 'SEQUENCE'; 
-code_type(16) -> 'SEQUENCE OF'; 
-code_type(17) -> 'SET'; 
-code_type(17) -> 'SET OF'; 
-code_type(18) -> 'NumericString';   
-code_type(19) -> 'PrintableString';   
-code_type(20) -> 'TeletexString';   
-code_type(21) -> 'VideotexString';   
-code_type(22) -> 'IA5String';   
-code_type(23) -> 'UTCTime';   
-code_type(24) -> 'GeneralizedTime';   
-code_type(25) -> 'GraphicString';   
-code_type(26) -> 'VisibleString';   
-code_type(27) -> 'GeneralString';   
-code_type(28) -> 'UniversalString';   
-code_type(30) -> 'BMPString';   
-code_type(Else) -> exit({error,{asn1,{unrecognized_type,Else}}}). 
- 
-%%-------------------------------------------------------------------------
-%% decoding of the components of a SET
-%%-------------------------------------------------------------------------
-
-decode_set(Rb, indefinite, <<0,0,Bytes/binary>>, _OptOrMand, _Fun3, Acc) ->
-   {lists:reverse(Acc),Bytes,Rb+2};
-
-decode_set(Rb, indefinite, Bytes, OptOrMand, Fun3, Acc) ->
-   {Term, Remain, Rb1} = Fun3(Bytes, OptOrMand),
-   decode_set(Rb+Rb1, indefinite, Remain, OptOrMand, Fun3, [Term|Acc]);
-
-decode_set(Rb, Num, Bytes, _OptOrMand, _Fun3, Acc) when Num == 0 ->
-   {lists:reverse(Acc), Bytes, Rb};
-
-decode_set(_, Num, _, _, _, _) when Num < 0 ->
-   exit({error,{asn1,{length_error,'SET'}}});
-
-decode_set(Rb, Num, Bytes, OptOrMand, Fun3, Acc) ->
-   {Term, Remain, Rb1} = Fun3(Bytes, OptOrMand),
-   decode_set(Rb+Rb1, Num-Rb1, Remain, OptOrMand, Fun3, [Term|Acc]).
-
-
-%%-------------------------------------------------------------------------
-%% decoding of SEQUENCE OF and SET OF
-%%-------------------------------------------------------------------------
-
-decode_components(Rb, indefinite, <<0,0,Bytes/binary>>, _Fun3, _TagIn, Acc) ->
-   {lists:reverse(Acc),Bytes,Rb+2};
-
-decode_components(Rb, indefinite, Bytes, Fun3, TagIn, Acc) ->
-   {Term, Remain, Rb1} = Fun3(Bytes, mandatory, TagIn),
-   decode_components(Rb+Rb1, indefinite, Remain, Fun3, TagIn, [Term|Acc]);
-
-decode_components(Rb, Num, Bytes, _Fun3, _TagIn, Acc) when Num == 0 ->
-   {lists:reverse(Acc), Bytes, Rb};
-
-decode_components(_, Num, _, _, _, _) when Num < 0 ->
-   exit({error,{asn1,{length_error,'SET/SEQUENCE OF'}}});
-
-decode_components(Rb, Num, Bytes, Fun3, TagIn, Acc) ->
-   {Term, Remain, Rb1} = Fun3(Bytes, mandatory, TagIn),
-   decode_components(Rb+Rb1, Num-Rb1, Remain, Fun3, TagIn, [Term|Acc]).
-
-%%decode_components(Rb, indefinite, [0,0|Bytes], _Fun3, _TagIn, Acc) ->
-%%   {lists:reverse(Acc),Bytes,Rb+2};
-
-decode_components(Rb, indefinite, <<0,0,Bytes/binary>>, _Fun4, _TagIn, _Fun, Acc) ->
-   {lists:reverse(Acc),Bytes,Rb+2};
-
-decode_components(Rb, indefinite, Bytes, _Fun4, TagIn, _Fun, Acc) ->
-   {Term, Remain, Rb1} = _Fun4(Bytes, mandatory, TagIn, _Fun),
-   decode_components(Rb+Rb1, indefinite, Remain, _Fun4, TagIn, _Fun, [Term|Acc]);
-
-decode_components(Rb, Num, Bytes, _Fun4, _TagIn, _Fun, Acc) when Num == 0 ->
-   {lists:reverse(Acc), Bytes, Rb};
-
-decode_components(_, Num, _, _, _, _, _) when Num < 0 ->
-   exit({error,{asn1,{length_error,'SET/SEQUENCE OF'}}});
-
-decode_components(Rb, Num, Bytes, _Fun4, TagIn, _Fun, Acc) ->
-   {Term, Remain, Rb1} = _Fun4(Bytes, mandatory, TagIn, _Fun),
-   decode_components(Rb+Rb1, Num-Rb1, Remain, _Fun4, TagIn, _Fun, [Term|Acc]).
-
-
-
-%%-------------------------------------------------------------------------
-%% INTERNAL HELPER FUNCTIONS (not exported)
-%%-------------------------------------------------------------------------
-
- 
-%%========================================================================== 
-%% Encode tag 
-%% 
-%% dotag(tag | notag, TagValpattern | TagValTuple, [Length, Value]) -> [Tag]  
-%% TagValPattern is a correct bitpattern for a tag 
-%% TagValTuple is a tuple of three bitpatterns, Class, Form and TagNo where 
-%%     Class = UNIVERSAL | APPLICATION | CONTEXT | PRIVATE 
-%%     Form  = Primitive | Constructed 
-%%     TagNo = Number of tag 
-%%========================================================================== 
- 
-
-dotag([], Tag, {Bytes,Len}) ->
-    dotag_universal(Tag,Bytes,Len);
-dotag(Tags, Tag, {Bytes,Len}) ->
-    encode_tags(Tags ++ [#tag{class=?UNIVERSAL,number=Tag,form=?PRIMITIVE}], 
-		Bytes, Len);
-
-dotag(Tags, Tag, Bytes) ->
-    encode_tags(Tags ++ [#tag{class=?UNIVERSAL,number=Tag,form=?PRIMITIVE}], 
-		Bytes, size(Bytes)).
-
-dotag_universal(UniversalTag,Bytes,Len) when Len =< 16#7F->
-    {[UniversalTag,Len,Bytes],2+Len};
-dotag_universal(UniversalTag,Bytes,Len) ->
-    {EncLen,LenLen}=encode_length(Len),
-    {[UniversalTag,EncLen,Bytes],1+LenLen+Len}.
-
-%% decoding postitive integer values. 
-decode_integer2(Len,Bin = <<0:1,_:7,_Bs/binary>>,RemovedBytes) ->
-    <<Int:Len/unit:8,Buffer2/binary>> = Bin,
-    {Int,Buffer2,RemovedBytes};
-%% decoding negative integer values.
-decode_integer2(Len,<<1:1,B2:7,Bs/binary>>,RemovedBytes)  ->
-    <<N:Len/unit:8,Buffer2/binary>> = <<B2,Bs/binary>>,
-    Int = N - (1 bsl (8 * Len - 1)),
-    {Int,Buffer2,RemovedBytes}.
-
-%%decode_integer2(Len,Buffer,Acc,RemovedBytes) when (hd(Buffer) band 16#FF) =< 16#7F ->  
-%%    {decode_integer_pos(Buffer, 8 * (Len - 1)),skip(Buffer,Len),RemovedBytes};
-%%decode_integer2(Len,Buffer,Acc,RemovedBytes)  -> 
-%%    {decode_integer_neg(Buffer, 8 * (Len - 1)),skip(Buffer,Len),RemovedBytes}. 
- 
-%%decode_integer_pos([Byte|Tail], Shift) -> 
-%%    (Byte bsl Shift) bor decode_integer_pos(Tail, Shift-8); 
-%%decode_integer_pos([], _) -> 0.
-
- 
-%%decode_integer_neg([Byte|Tail], Shift) -> 
-%%    (-128 + (Byte band 127) bsl Shift) bor decode_integer_pos(Tail, Shift-8). 
-
-
-concat_bit_binaries([],Bin={_,_}) ->
-    Bin;
-concat_bit_binaries({0,B1},{U2,B2}) ->
-    {U2,<<B1/binary,B2/binary>>};
-concat_bit_binaries({U1,B1},{U2,B2}) ->
-    S1 = (size(B1) * 8) - U1,
-    S2 = (size(B2) * 8) - U2,
-    PadBits = 8 - ((S1+S2) rem 8),
-    {PadBits, <<B1:S1/binary-unit:1,B2:S2/binary-unit:1,0:PadBits>>};
-concat_bit_binaries(L1,L2) when list(L1),list(L2) ->
-    %% this case occur when decoding with NNL
-    L1 ++ L2.
-
-    
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	     no;
-	{value,{_,V}} -> 
-	    V
-    end.
- 
-%%skip(Buffer, 0) -> 
-%%    Buffer; 
-%%skip([H | T], Len) -> 
-%%    skip(T, Len-1). 
-
-new_tags([],LastTag) ->
-    [LastTag];
-new_tags(Tags=[#tag{type='IMPLICIT'}],_LastTag) ->
-    Tags;
-new_tags([T1 = #tag{type='IMPLICIT'},#tag{type=T2Type}|Rest],LastTag) ->
-    new_tags([T1#tag{type=T2Type}|Rest],LastTag);
-new_tags(Tags,LastTag) ->
-    case lists:last(Tags) of
-	#tag{type='IMPLICIT'} ->
-	    Tags;
-	_ ->
-	    Tags ++ [LastTag]
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_ber_bin_v2.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_ber_bin_v2.erl
deleted file mode 100644
index 7f7846184a..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_ber_bin_v2.erl
+++ /dev/null
@@ -1,1869 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1rt_ber_bin_v2.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
--module(asn1rt_ber_bin_v2).
- 
-%% encoding / decoding of BER  
-
--export([decode/1, decode/2, match_tags/2, encode/1]). 
--export([fixoptionals/2, cindex/3,
-	 list_to_record/2,
-	 encode_tag_val/1,
-	 encode_tags/3]).
--export([encode_boolean/2,decode_boolean/2,
-	 encode_integer/3,encode_integer/4,
-	 decode_integer/3, decode_integer/4,
-	 encode_enumerated/2,
-	 encode_enumerated/4,decode_enumerated/4,
-	 encode_real/2,decode_real/3,
-	 encode_bit_string/4,decode_bit_string/4,
-	 decode_compact_bit_string/4,
-	 encode_octet_string/3,decode_octet_string/3,
-	 encode_null/2,decode_null/2,
-	 encode_object_identifier/2,decode_object_identifier/2,
-	 encode_restricted_string/4,decode_restricted_string/4,
-	 encode_universal_string/3,decode_universal_string/3,
-	 encode_BMP_string/3,decode_BMP_string/3,
-	 encode_generalized_time/3,decode_generalized_time/3,
-	 encode_utc_time/3,decode_utc_time/3,
-	 encode_length/1,decode_length/1,
-	 decode_tag_and_length/1]).
-
--export([encode_open_type/1,encode_open_type/2, 
-	 decode_open_type/2,decode_open_type_as_binary/2]).
-
--export([decode_primitive_incomplete/2]).
- 
--include("asn1_records.hrl"). 
- 
-% the encoding of class of tag bits 8 and 7 
--define(UNIVERSAL,   0). 
--define(APPLICATION, 16#40). 
--define(CONTEXT,     16#80). 
--define(PRIVATE,     16#C0). 
- 
-%%% primitive or constructed encoding % bit 6 
--define(PRIMITIVE,   0). 
--define(CONSTRUCTED, 2#00100000). 
-
-%%% The tag-number for universal types
--define(N_BOOLEAN, 1). 
--define(N_INTEGER, 2). 
--define(N_BIT_STRING, 3).
--define(N_OCTET_STRING, 4).
--define(N_NULL, 5). 
--define(N_OBJECT_IDENTIFIER, 6). 
--define(N_OBJECT_DESCRIPTOR, 7). 
--define(N_EXTERNAL, 8). 
--define(N_REAL, 9). 
--define(N_ENUMERATED, 10). 
--define(N_EMBEDDED_PDV, 11). 
--define(N_SEQUENCE, 16). 
--define(N_SET, 17). 
--define(N_NumericString, 18).
--define(N_PrintableString, 19).
--define(N_TeletexString, 20).
--define(N_VideotexString, 21).
--define(N_IA5String, 22).
--define(N_UTCTime, 23). 
--define(N_GeneralizedTime, 24). 
--define(N_GraphicString, 25).
--define(N_VisibleString, 26).
--define(N_GeneralString, 27).
--define(N_UniversalString, 28).
--define(N_BMPString, 30).
-
- 
-% the complete tag-word of built-in types 
--define(T_BOOLEAN,          ?UNIVERSAL bor ?PRIMITIVE bor 1). 
--define(T_INTEGER,          ?UNIVERSAL bor ?PRIMITIVE bor 2). 
--define(T_BIT_STRING,       ?UNIVERSAL bor ?PRIMITIVE bor 3). % can be CONSTRUCTED 
--define(T_OCTET_STRING,     ?UNIVERSAL bor ?PRIMITIVE bor 4). % can be CONSTRUCTED 
--define(T_NULL,             ?UNIVERSAL bor ?PRIMITIVE bor 5). 
--define(T_OBJECT_IDENTIFIER,?UNIVERSAL bor ?PRIMITIVE bor 6). 
--define(T_OBJECT_DESCRIPTOR,?UNIVERSAL bor ?PRIMITIVE bor 7). 
--define(T_EXTERNAL,         ?UNIVERSAL bor ?PRIMITIVE bor 8). 
--define(T_REAL,             ?UNIVERSAL bor ?PRIMITIVE bor 9). 
--define(T_ENUMERATED,       ?UNIVERSAL bor ?PRIMITIVE bor 10). 
--define(T_EMBEDDED_PDV,     ?UNIVERSAL bor ?PRIMITIVE bor 11). 
--define(T_SEQUENCE,         ?UNIVERSAL bor ?CONSTRUCTED bor 16). 
--define(T_SET,              ?UNIVERSAL bor ?CONSTRUCTED bor 17). 
--define(T_NumericString,    ?UNIVERSAL bor ?PRIMITIVE bor 18). %can be constructed 
--define(T_PrintableString,  ?UNIVERSAL bor ?PRIMITIVE bor 19). %can be constructed 
--define(T_TeletexString,    ?UNIVERSAL bor ?PRIMITIVE bor 20). %can be constructed 
--define(T_VideotexString,   ?UNIVERSAL bor ?PRIMITIVE bor 21). %can be constructed 
--define(T_IA5String,        ?UNIVERSAL bor ?PRIMITIVE bor 22). %can be constructed 
--define(T_UTCTime,          ?UNIVERSAL bor ?PRIMITIVE bor 23). 
--define(T_GeneralizedTime,  ?UNIVERSAL bor ?PRIMITIVE bor 24). 
--define(T_GraphicString,    ?UNIVERSAL bor ?PRIMITIVE bor 25). %can be constructed 
--define(T_VisibleString,    ?UNIVERSAL bor ?PRIMITIVE bor 26). %can be constructed 
--define(T_GeneralString,    ?UNIVERSAL bor ?PRIMITIVE bor 27). %can be constructed 
--define(T_UniversalString,  ?UNIVERSAL bor ?PRIMITIVE bor 28). %can be constructed 
--define(T_BMPString,        ?UNIVERSAL bor ?PRIMITIVE bor 30). %can be constructed 
- 
-% encode(Tlv={_Tag={?PRIMITIVE,_},_VList}) ->
-%     encode_primitive(Tlv);
-% encode(Tlv) ->
-%     encode_constructed(Tlv).
-
-encode([Tlv]) ->
-    encode(Tlv);
-encode({TlvTag,TlvVal}) when list(TlvVal) ->
-    %% constructed form of value
-    encode_tlv(TlvTag,TlvVal,?CONSTRUCTED);
-encode({TlvTag,TlvVal}) ->
-    encode_tlv(TlvTag,TlvVal,?PRIMITIVE);
-encode(Bin) when binary(Bin) ->
-    Bin.
-
-encode_tlv(TlvTag,TlvVal,Form) ->
-    Tag = encode_tlv_tag(TlvTag,Form),
-    {Val,VLen} = encode_tlv_val(TlvVal),
-    {Len,_LLen} = encode_length(VLen),
-    BinLen = list_to_binary(Len),
-    <<Tag/binary,BinLen/binary,Val/binary>>.
-
-encode_tlv_tag(ClassTagNo,Form) ->
-    Class = ClassTagNo bsr 16,
-    case encode_tag_val({Class bsl 6,Form,(ClassTagNo - (Class bsl 16))}) of
-	T when list(T) ->
-	    list_to_binary(T);
-	T ->
-	    T
-    end.
-
-encode_tlv_val(TlvL) when list(TlvL) ->
-    encode_tlv_list(TlvL,[]);
-encode_tlv_val(Bin) ->
-    {Bin,size(Bin)}.
-
-encode_tlv_list([Tlv|Tlvs],Acc) ->
-    EncTlv = encode(Tlv),
-    encode_tlv_list(Tlvs,[EncTlv|Acc]);
-encode_tlv_list([],Acc) ->
-    Bin=list_to_binary(lists:reverse(Acc)),
-    {Bin,size(Bin)}.
-
-% encode_primitive({{_,ClassTagNo},V}) ->
-%     Len = size(V), % not sufficient as length encode
-%     Class = ClassTagNo bsr 16,
-%     {TagLen,Tag} =
-%     case encode_tag_val({Class,?PRIMITIVE,ClassTagNo - Class}) of
-% 	T when list(T) ->
-% 	    {length(T),list_to_binary(T)};
-% 	T ->
-% 	    {1,T}
-%     end,
-    
-
-decode(B,driver) ->
-    case catch port_control(drv_complete,2,B) of
-	Bin when binary(Bin) ->
-	    binary_to_term(Bin);
-	List when list(List) -> handle_error(List,B);
-	{'EXIT',{badarg,Reason}} ->
-	    asn1rt_driver_handler:load_driver(),
-	    receive
-		driver_ready ->
-		    case catch port_control(drv_complete,2,B) of
-			Bin2 when binary(Bin2) -> binary_to_term(Bin2);
-			List when list(List) -> handle_error(List,B);
-			Error -> exit(Error)
-		    end;
-		{error,Error} -> % error when loading driver
-		    %% the driver could not be loaded
-		    exit(Error);
-		Error={port_error,Reason} ->
-		    exit(Error)
-	    end;
-	{'EXIT',Reason} ->
-	    exit(Reason)
-    end.
-
-handle_error([],_)->
-    exit({error,{"memory allocation problem"}});
-handle_error([$1|_],L) -> % error in driver
-    exit({error,{asn1_error,L}});
-handle_error([$2|_],L) -> % error in driver due to wrong tag
-    exit({error,{asn1_error,{"bad tag",L}}});
-handle_error([$3|_],L) -> % error in driver due to length error
-    exit({error,{asn1_error,{"bad length field",L}}});
-handle_error([$4|_],L) -> % error in driver due to indefinite length error
-    exit({error,{asn1_error,{"indefinite length without end bytes",L}}});
-handle_error(ErrL,L) ->
-    exit({error,{unknown_error,ErrL,L}}).
-
-
-decode(Bin) when binary(Bin) ->
-    decode_primitive(Bin);
-decode(Tlv) -> % assume it is a tlv
-    {Tlv,<<>>}.
-
-
-decode_primitive(Bin) ->
-    {{Form,TagNo,Len,V},Rest} = decode_tlv(Bin),
-    case Form of 
-	1 when Len == indefinite -> % constructed
-	    {Vlist,Rest2} = decode_constructed_indefinite(V,[]),
-	    {{TagNo,Vlist},Rest2};
-	1 -> % constructed
-	    {{TagNo,decode_constructed(V)},Rest};
-	0 -> % primitive
-	    {{TagNo,V},Rest}
-    end.
-
-decode_constructed(<<>>) ->
-    [];
-decode_constructed(Bin) ->
-    {Tlv,Rest} = decode_primitive(Bin),
-    [Tlv|decode_constructed(Rest)].
-
-decode_constructed_indefinite(<<0,0,Rest/binary>>,Acc) ->
-    {lists:reverse(Acc),Rest};
-decode_constructed_indefinite(Bin,Acc) ->
-    {Tlv,Rest} = decode_primitive(Bin),
-    decode_constructed_indefinite(Rest, [Tlv|Acc]). 
-    
-decode_tlv(Bin) ->
-    {Form,TagNo,Len,Bin2} = decode_tag_and_length(Bin),
-    case Len of
-	indefinite -> 
-	    {{Form,TagNo,Len,Bin2},[]};
-	_ ->
-	    <<V:Len/binary,Bin3/binary>> = Bin2,
-	    {{Form,TagNo,Len,V},Bin3}
-    end.
-
-%% decode_primitive_incomplete/2 decodes an encoded message incomplete
-%% by help of the pattern attribute (first argument).
-decode_primitive_incomplete([[default,TagNo]],Bin) -> %default
-    case decode_tlv(Bin) of
-	{{Form,TagNo,Len,V},Rest} ->
-	    decode_incomplete2(Form,TagNo,Len,V,[],Rest);
-	_ ->
-	    %{asn1_DEFAULT,Bin}
-	    asn1_NOVALUE
-    end;
-decode_primitive_incomplete([[default,TagNo,Directives]],Bin) -> %default, constructed type, Directives points into this type
-    case decode_tlv(Bin) of
-	{{Form,TagNo,Len,V},Rest} ->	    
-	    decode_incomplete2(Form,TagNo,Len,V,Directives,Rest);
-	_ ->
-	    %{asn1_DEFAULT,Bin}
-	    asn1_NOVALUE
-    end;
-decode_primitive_incomplete([[opt,TagNo]],Bin) -> %optional
-    case decode_tlv(Bin) of
-	{{Form,TagNo,Len,V},Rest} ->
-	    decode_incomplete2(Form,TagNo,Len,V,[],Rest);
-	_ ->
-	    %{{TagNo,asn1_NOVALUE},Bin}
-	    asn1_NOVALUE
-    end;
-decode_primitive_incomplete([[opt,TagNo,Directives]],Bin) -> %optional
-    case decode_tlv(Bin) of
-	{{Form,TagNo,Len,V},Rest} ->
-	    decode_incomplete2(Form,TagNo,Len,V,Directives,Rest);
-	_ ->
-	    %{{TagNo,asn1_NOVALUE},Bin}
-	    asn1_NOVALUE
-    end;
-%% A choice alternative that shall be undecoded
-decode_primitive_incomplete([[alt_undec,TagNo]|RestAlts],Bin) ->
-%    decode_incomplete_bin(Bin);
-    case decode_tlv(Bin) of
-	{{_Form,TagNo,_Len,_V},_R} ->
-	    decode_incomplete_bin(Bin);
-	_ ->
-	    decode_primitive_incomplete(RestAlts,Bin)
-    end;
-decode_primitive_incomplete([[alt,TagNo]|RestAlts],Bin) ->
-    case decode_tlv(Bin) of
-	{{_Form,TagNo,_Len,V},Rest} ->
-	    {{TagNo,V},Rest};
-	_ ->
-	    decode_primitive_incomplete(RestAlts,Bin)
-    end;
-decode_primitive_incomplete([[alt,TagNo,Directives]|RestAlts],Bin) ->
-    case decode_tlv(Bin) of
-	{{Form,TagNo,Len,V},Rest} ->
-	    decode_incomplete2(Form,TagNo,Len,V,Directives,Rest);
-	_ ->
-	    decode_primitive_incomplete(RestAlts,Bin)
-    end;
-decode_primitive_incomplete([[alt_parts,TagNo]|RestAlts],Bin) ->
-    case decode_tlv(Bin) of
-	{{_Form,TagNo,_Len,V},Rest} ->
-	    {{TagNo,decode_parts_incomplete(V)},Rest};
-	_ ->
-	    decode_primitive_incomplete(RestAlts,Bin)
-    end;
-decode_primitive_incomplete([[undec,_TagNo]|_RestTag],Bin) -> %incomlete decode
-    decode_incomplete_bin(Bin); %% use this if changing handling of
-decode_primitive_incomplete([[parts,TagNo]|_RestTag],Bin) ->
-    case decode_tlv(Bin) of
-	{{_Form,TagNo,_Len,V},Rest} ->
-	    {{TagNo,decode_parts_incomplete(V)},Rest};
-	Err ->
-	    {error,{asn1,"tag failure",TagNo,Err}}
-    end;
-decode_primitive_incomplete([mandatory|RestTag],Bin) ->
-    case decode_tlv(Bin) of
-	{{Form,TagNo,Len,V},Rest} ->
-	    decode_incomplete2(Form,TagNo,Len,V,RestTag,Rest);
-	 _ ->
-	    {error,{asn1,"partial incomplete decode failure"}}
-    end;
-%% A choice that is a toptype or a mandatory component of a
-%% SEQUENCE or SET.
-decode_primitive_incomplete([[mandatory,Directives]],Bin) ->
-    case decode_tlv(Bin) of
-	{{Form,TagNo,Len,V},Rest} ->
-	    decode_incomplete2(Form,TagNo,Len,V,Directives,Rest);
-	 _ ->
-	    {error,{asn1,"partial incomplete decode failure"}}
-    end;
-decode_primitive_incomplete([],Bin) ->
-    decode_primitive(Bin).
-
-%% decode_parts_incomplete/1 receives a number of values encoded in
-%% sequence and returns the parts as unencoded binaries
-decode_parts_incomplete(<<>>) ->
-    [];
-decode_parts_incomplete(Bin) ->
-    {ok,Rest} = skip_tag(Bin),
-    {ok,Rest2} = skip_length_and_value(Rest),
-    LenPart = size(Bin) - size(Rest2),
-    <<Part:LenPart/binary,RestBin/binary>> = Bin,
-    [Part|decode_parts_incomplete(RestBin)].
-	    
-    
-%% decode_incomplete2 checks if V is a value of a constructed or
-%% primitive type, and continues the decode propeerly.
-decode_incomplete2(1,TagNo,indefinite,V,TagMatch,_) ->
-    %% constructed indefinite length
-    {Vlist,Rest2} = decode_constr_indef_incomplete(TagMatch,V,[]),
-    {{TagNo,Vlist},Rest2};
-decode_incomplete2(1,TagNo,_Len,V,TagMatch,Rest) ->
-    {{TagNo,decode_constructed_incomplete(TagMatch,V)},Rest};
-decode_incomplete2(0,TagNo,_Len,V,_TagMatch,Rest) ->
-    {{TagNo,V},Rest}.
-
-decode_constructed_incomplete(_TagMatch,<<>>) ->
-    [];
-decode_constructed_incomplete([mandatory|RestTag],Bin) ->
-    {Tlv,Rest} = decode_primitive(Bin),
-    [Tlv|decode_constructed_incomplete(RestTag,Rest)];
-decode_constructed_incomplete(Directives=[[Alt,_]|_],Bin) 
-  when Alt == alt_undec; Alt == alt ->
-    case decode_tlv(Bin) of
-	{{_Form,TagNo,_Len,V},Rest} ->
-	    case incomplete_choice_alt(TagNo,Directives) of
-		alt_undec ->
-		    LenA = size(Bin)-size(Rest),
-		    <<A:LenA/binary,Rest/binary>> = Bin,
-		    A;
-%		    {UndecBin,_}=decode_incomplete_bin(Bin),
-%		    UndecBin;
-%		    [{TagNo,V}];
-		alt ->
-		    {Tlv,_} = decode_primitive(V),
-		    [{TagNo,Tlv}];
-		alt_parts ->
-		    %{{TagNo,decode_parts_incomplete(V)},Rest}; % maybe wrong
-		    [{TagNo,decode_parts_incomplete(V)}];
-		Err ->
-		    {error,{asn1,"partial incomplete decode failure",Err}}
-	    end;
-	_ ->
-	    {error,{asn1,"partial incomplete decode failure"}}
-    end;
-decode_constructed_incomplete([TagNo|RestTag],Bin) ->
-%%    {Tlv,Rest} = decode_primitive_incomplete([TagNo],Bin),
-    case decode_primitive_incomplete([TagNo],Bin) of
-	{Tlv,Rest} ->
-	    [Tlv|decode_constructed_incomplete(RestTag,Rest)];
-	asn1_NOVALUE ->
-	    decode_constructed_incomplete(RestTag,Bin)
-    end;
-decode_constructed_incomplete([],Bin) ->
-    {Tlv,_Rest}=decode_primitive(Bin),
-    [Tlv].
-
-decode_constr_indef_incomplete(_TagMatch,<<0,0,Rest/binary>>,Acc) ->
-    {lists:reverse(Acc),Rest};
-decode_constr_indef_incomplete([Tag|RestTags],Bin,Acc) ->
-%    {Tlv,Rest} = decode_primitive_incomplete([Tag],Bin),
-    case decode_primitive_incomplete([Tag],Bin) of
-	{Tlv,Rest} ->
-	    decode_constr_indef_incomplete(RestTags,Rest,[Tlv|Acc]);
-	asn1_NOVALUE ->
-	    decode_constr_indef_incomplete(RestTags,Bin,Acc)
-    end.
-
-
-decode_incomplete_bin(Bin) ->
-    {ok,Rest} = skip_tag(Bin),
-    {ok,Rest2} = skip_length_and_value(Rest),
-    IncLen = size(Bin) - size(Rest2),
-    <<IncBin:IncLen/binary,Ret/binary>> = Bin,
-    {IncBin,Ret}.
-	    
-incomplete_choice_alt(TagNo,[[Alt,TagNo]|_Directives]) ->
-    Alt;
-incomplete_choice_alt(TagNo,[_H|Directives]) ->
-    incomplete_choice_alt(TagNo,Directives);
-incomplete_choice_alt(_,[]) ->
-    error.
-
-
-%% skip_tag and skip_length_and_value are rutines used both by
-%% decode_partial_incomplete and decode_partial (decode/2).
-
-skip_tag(<<_:3,31:5,Rest/binary>>)->
-    skip_long_tag(Rest);
-skip_tag(<<_:3,_Tag:5,Rest/binary>>) ->
-    {ok,Rest}.
-
-skip_long_tag(<<1:1,_:7,Rest/binary>>) ->
-    skip_long_tag(Rest);
-skip_long_tag(<<0:1,_:7,Rest/binary>>) ->
-    {ok,Rest}.
-
-skip_length_and_value(Binary) ->
-    case decode_length(Binary) of
-	{indefinite,RestBinary} ->
-	    skip_indefinite_value(RestBinary);
-	{Length,RestBinary} ->
-	    <<_:Length/unit:8,Rest/binary>> = RestBinary,
-	    {ok,Rest}
-    end.
-
-skip_indefinite_value(<<0,0,Rest/binary>>) ->
-    {ok,Rest};
-skip_indefinite_value(Binary) ->
-    {ok,RestBinary}=skip_tag(Binary),
-    {ok,RestBinary2} = skip_length_and_value(RestBinary),
-    skip_indefinite_value(RestBinary2).
-
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% match_tags takes a Tlv (Tag, Length, Value) structure and matches
-%% it with the tags in TagList. If the tags does not match the function
-%% crashes otherwise it returns the remaining Tlv after that the tags have
-%% been removed.
-%%
-%% match_tags(Tlv, TagList)
-%%
-
-
-match_tags({T,V}, [T|Tt]) ->
-    match_tags(V,Tt);
-match_tags([{T,V}],[T|Tt]) ->
-    match_tags(V, Tt);
-match_tags(Vlist = [{T,_V}|_], [T]) ->
-    Vlist;
-match_tags(Tlv, []) ->
-    Tlv;
-match_tags({Tag,_V},[T|_Tt]) ->
-    {error,{asn1,{wrong_tag,{Tag,T}}}}.
-
- 
-cindex(Ix,Val,Cname) -> 
-    case element(Ix,Val) of 
-	{Cname,Val2} -> Val2; 
-	X -> X 
-    end. 
- 
-%%=============================================================================== 
-%%=============================================================================== 
-%%=============================================================================== 
-%% Optionals, preset not filled optionals with asn1_NOVALUE 
-%%=============================================================================== 
-%%=============================================================================== 
-%%=============================================================================== 
- 
-% converts a list to a record if necessary 
-list_to_record(Name,List) when list(List) -> 
-    list_to_tuple([Name|List]); 
-list_to_record(_Name,Tuple) when tuple(Tuple) -> 
-    Tuple. 
- 
- 
-fixoptionals(OptList,Val) when list(Val) -> 
-    fixoptionals(OptList,Val,1,[],[]). 
- 
-fixoptionals([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) -> 
-    fixoptionals(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]); 
-fixoptionals([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) -> 
-    fixoptionals(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]); 
-fixoptionals(O,[Vh|Vt],Pos,Acc1,Acc2) -> 
-    fixoptionals(O,Vt,Pos+1,Acc1,[Vh|Acc2]); 
-fixoptionals([],[Vh|Vt],Pos,Acc1,Acc2) -> 
-    fixoptionals([],Vt,Pos+1,Acc1,[Vh|Acc2]); 
-fixoptionals([],[],_,_Acc1,Acc2) -> 
-    % return Val as a record 
-    list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]).
- 
- 
-%%encode_tag(TagClass(?UNI, APP etc), Form (?PRIM etx), TagInteger) ->  
-%%     8bit Int | binary 
-encode_tag_val({Class, Form, TagNo}) when (TagNo =< 30) -> 
-    <<(Class bsr 6):2,(Form bsr 5):1,TagNo:5>>;
-
-encode_tag_val({Class, Form, TagNo}) -> 
-    {Octets,_Len} = mk_object_val(TagNo),
-    BinOct = list_to_binary(Octets),
-    <<(Class bsr 6):2, (Form bsr 5):1, 31:5,BinOct/binary>>; 
- 
-%% asumes whole correct tag bitpattern, multiple of 8 
-encode_tag_val(Tag) when (Tag =< 255) -> Tag;  %% anv�nds denna funktion??!!
-%% asumes correct bitpattern of 0-5 
-encode_tag_val(Tag) -> encode_tag_val2(Tag,[]). 
- 
-encode_tag_val2(Tag, OctAck) when (Tag =< 255) -> 
-    [Tag | OctAck]; 
-encode_tag_val2(Tag, OctAck) -> 
-    encode_tag_val2(Tag bsr 8, [255 band Tag | OctAck]). 
-
-
-%%=============================================================================== 
-%% Decode a tag 
-%% 
-%% decode_tag(OctetListBuffer) -> {{Form, (Class bsl 16)+ TagNo}, RestOfBuffer, RemovedBytes} 
-%%=============================================================================== 
-
-decode_tag_and_length(<<Class:2, Form:1, TagNo:5, 0:1, Length:7, RestBuffer/binary>>) when TagNo < 31 -> 
-    {Form, (Class bsl 16) + TagNo, Length, RestBuffer};
-decode_tag_and_length(<<Class:2, Form:1, TagNo:5, 1:1, 0:7, T/binary>>) when TagNo < 31 ->
-    {Form, (Class bsl 16) + TagNo, indefinite, T};
-decode_tag_and_length(<<Class:2, Form:1, TagNo:5, 1:1, LL:7, T/binary>>) when TagNo < 31 ->
-    <<Length:LL/unit:8,RestBuffer/binary>> = T,
-    {Form, (Class bsl 16) + TagNo, Length, RestBuffer};
-decode_tag_and_length(<<Class:2, Form:1, 31:5, 0:1, TagNo:7, 0:1, Length:7, RestBuffer/binary>>) -> 
-    {Form, (Class bsl 16) + TagNo, Length, RestBuffer};
-decode_tag_and_length(<<Class:2, Form:1, 31:5, 0:1, TagNo:7, 1:1, 0:7, T/binary>>)  ->
-    {Form, (Class bsl 16) + TagNo, indefinite, T};
-decode_tag_and_length(<<Class:2, Form:1, 31:5, 0:1, TagNo:7, 1:1, LL:7, T/binary>>)  ->
-    <<Length:LL/unit:8,RestBuffer/binary>> = T,
-    {Form, (Class bsl 16) + TagNo, Length, RestBuffer};
-decode_tag_and_length(<<Class:2, Form:1, 31:5, Buffer/binary>>) ->
-    {TagNo, Buffer1} = decode_tag(Buffer, 0),
-    {Length, RestBuffer} = decode_length(Buffer1),
-    {Form, (Class bsl 16) + TagNo, Length, RestBuffer}.
-
-
-     
-%% last partial tag 
-decode_tag(<<0:1,PartialTag:7, Buffer/binary>>, TagAck) ->
-    TagNo = (TagAck bsl 7) bor PartialTag,
-    %%<<TagNo>> = <<TagAck:1, PartialTag:7>>,
-    {TagNo, Buffer}; 
-% more tags 
-decode_tag(<<_:1,PartialTag:7, Buffer/binary>>, TagAck) -> 
-    TagAck1 = (TagAck bsl 7) bor PartialTag, 
-    %%<<TagAck1:16>> = <<TagAck:1, PartialTag:7,0:8>>,
-    decode_tag(Buffer, TagAck1). 
- 
-
-%%=======================================================================
-%%
-%% Encode all tags in the list Tags and return a possibly deep list of
-%% bytes with tag and length encoded
-%% The taglist must be in reverse order (fixed by the asn1 compiler)
-%% e.g [T1,T2] will result in 
-%% {[EncodedT2,EncodedT1|BytesSoFar],LenSoFar+LenT2+LenT1}
-%% 
-
-encode_tags([Tag|Trest], BytesSoFar, LenSoFar) ->
-% remove    {Bytes1,L1} = encode_one_tag(Tag),
-    {Bytes2,L2} = encode_length(LenSoFar),
-    encode_tags(Trest, [Tag,Bytes2|BytesSoFar], 
-		 LenSoFar + size(Tag) + L2);
-encode_tags([], BytesSoFar, LenSoFar) ->
-    {BytesSoFar,LenSoFar}.
-
-encode_tags(TagIn, {BytesSoFar,LenSoFar}) ->
-    encode_tags(TagIn, BytesSoFar, LenSoFar).
-
-% encode_one_tag(#tag{class=Class,number=No,type=Type, form = Form}) ->			  
-%     NewForm = case Type of
-% 	       'EXPLICIT' ->
-% 		   ?CONSTRUCTED;
-% 	       _ ->
-% 		   Form
-% 	   end,
-%     Bytes = encode_tag_val({Class,NewForm,No}),
-%     {Bytes,size(Bytes)}.
-
- 
-%%=============================================================================== 
-%% 
-%% This comment is valid for all the encode/decode functions 
-%% 
-%% C = Constraint -> typically {'ValueRange',LowerBound,UpperBound} 
-%%     used for PER-coding but not for BER-coding. 
-%% 
-%% Val = Value.  If Val is an atom then it is a symbolic integer value  
-%%       (i.e the atom must be one of the names in the NamedNumberList). 
-%%       The NamedNumberList is used to translate the atom to an integer value 
-%%       before encoding. 
-%% 
-%%=============================================================================== 
- 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_open_type(Value) -> io_list (i.e nested list with integers, binaries)
-%% Value = list of bytes of an already encoded value (the list must be flat)
-%%         | binary
-
-%%
-encode_open_type(Val) when list(Val) -> 
-%    {Val,length(Val)};
-    encode_open_type(list_to_binary(Val));
-encode_open_type(Val) ->
-    {Val, size(Val)}. 
-
-%% 
-encode_open_type(Val, T) when list(Val) -> 
-    encode_open_type(list_to_binary(Val),T);
-encode_open_type(Val,[]) ->
-    {Val, size(Val)};
-encode_open_type(Val,Tag) ->
-    encode_tags(Tag,Val, size(Val)). 
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_open_type(Tlv, TagIn) -> Value
-%% Tlv = {Tag,V} | V where V -> binary()
-%% TagIn = [TagVal] where TagVal -> int()
-%% Value = binary with decoded data (which must be decoded again as some type)
-%%
-decode_open_type(Tlv, TagIn) ->
-    case match_tags(Tlv,TagIn) of
-	Bin when binary(Bin) ->
-	    {InnerTlv,_} = decode(Bin),
-	    InnerTlv;
-	TlvBytes -> TlvBytes
-    end.
-
- 
-decode_open_type_as_binary(Tlv,TagIn)->
-    case match_tags(Tlv,TagIn) of
-	V when binary(V) ->
-	    V;
-	[Tlv2] -> encode(Tlv2);
-	Tlv2 -> encode(Tlv2)
-    end.
- 
-%%=============================================================================== 
-%%=============================================================================== 
-%%=============================================================================== 
-%% Boolean, ITU_T X.690 Chapter 8.2 
-%%=============================================================================== 
-%%=============================================================================== 
-%%=============================================================================== 
- 
-%%=============================================================================== 
-%% encode_boolean(Integer, ReversedTagList) -> {[Octet],Len} 
-%%=============================================================================== 
- 
-encode_boolean({Name, Val}, TagIn) when atom(Name) -> 
-    encode_boolean(Val, TagIn); 
-encode_boolean(true, TagIn) -> 
-    encode_tags(TagIn, [16#FF],1);
-encode_boolean(false, TagIn) -> 
-    encode_tags(TagIn, [0],1);
-encode_boolean(X,_) ->
-    exit({error,{asn1, {encode_boolean, X}}}). 
- 
- 
-%%=============================================================================== 
-%% decode_boolean(BuffList, HasTag, TotalLen) -> {true, Remain, RemovedBytes} |  
-%%                                               {false, Remain, RemovedBytes} 
-%%=============================================================================== 
-decode_boolean(Tlv,TagIn) ->
-    Val = match_tags(Tlv, TagIn),
-    case Val of
-	<<0:8>> ->
-	    false;
-	<<_:8>> ->
-	    true;
-	_ ->
-	    exit({error,{asn1, {decode_boolean, Val}}})
-    end.
-
- 
-%%=========================================================================== 
-%% Integer, ITU_T X.690 Chapter 8.3 
-
-%% encode_integer(Constraint, Value, Tag) -> [octet list] 
-%% encode_integer(Constraint, Name, NamedNumberList, Tag) -> [octet list] 
-%%    Value = INTEGER | {Name,INTEGER}  
-%%    Tag = tag | notag 
-%%=========================================================================== 
- 
-encode_integer(C, Val, Tag) when integer(Val) -> 
-    encode_tags(Tag, encode_integer(C, Val));
-encode_integer(C,{Name,Val},Tag) when atom(Name) ->
-    encode_integer(C,Val,Tag);
-encode_integer(_C, Val, _Tag) -> 
-    exit({error,{asn1, {encode_integer, Val}}}). 
- 
- 
- 
-encode_integer(C, Val, NamedNumberList, Tag) when atom(Val) -> 
-    case lists:keysearch(Val, 1, NamedNumberList) of 
-	{value,{_, NewVal}} ->  
-	    encode_tags(Tag, encode_integer(C, NewVal)); 
-	_ ->  
-	    exit({error,{asn1, {encode_integer_namednumber, Val}}}) 
-    end; 
-encode_integer(C,{_Name,Val},NamedNumberList,Tag) ->
-    encode_integer(C,Val,NamedNumberList,Tag); 
-encode_integer(C, Val, _NamedNumberList, Tag) -> 
-    encode_tags(Tag, encode_integer(C, Val)). 
- 
- 
-encode_integer(_, Val) -> 
-    Bytes =  
-	if  
-	    Val >= 0 -> 
-		encode_integer_pos(Val, []); 
-	    true -> 
-		encode_integer_neg(Val, []) 
-	end, 
-    {Bytes,length(Bytes)}. 
- 
-encode_integer_pos(0, L=[B|_Acc]) when B < 128 ->
-    L;
-encode_integer_pos(N, Acc) ->
-    encode_integer_pos((N bsr 8), [N band 16#ff| Acc]).
-
-encode_integer_neg(-1, L=[B1|_T]) when B1 > 127 ->
-    L;
-encode_integer_neg(N, Acc) ->
-    encode_integer_neg(N bsr 8, [N band 16#ff|Acc]).
-
-%%=============================================================================== 
-%% decode integer  
-%%    (Buffer, Range, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}  
-%%    (Buffer, Range, NamedNumberList, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}  
-%%=============================================================================== 
-
-decode_integer(Tlv,Range,NamedNumberList,TagIn) ->
-    V = match_tags(Tlv,TagIn),
-    Int = decode_integer(V),
-    range_check_integer(Int,Range),
-    number2name(Int,NamedNumberList).
-
-decode_integer(Tlv,Range,TagIn) ->
-    V = match_tags(Tlv, TagIn),
-    Int = decode_integer(V),
-    range_check_integer(Int,Range),
-    Int.
-
-%% decoding postitive integer values. 
-decode_integer(Bin = <<0:1,_:7,_/binary>>) ->
-    Len = size(Bin),
-%    <<Int:Len/unit:8,Buffer2/binary>> = Bin,
-    <<Int:Len/unit:8>> = Bin,
-    Int;
-%% decoding negative integer values.
-decode_integer(Bin = <<1:1,B2:7,Bs/binary>>)  ->
-    Len = size(Bin),
-%    <<N:Len/unit:8,Buffer2/binary>> = <<B2,Bs/binary>>,
-    <<N:Len/unit:8>> = <<B2,Bs/binary>>,
-    Int = N - (1 bsl (8 * Len - 1)),
-    Int.
-
-range_check_integer(Int,Range) ->
-    case Range of
-	[] -> % No length constraint
-	    Int;
-	{Lb,Ub} when Int >= Lb, Ub >= Int -> % variable length constraint
-	    Int;
-	Int -> % fixed value constraint
-	    Int;
-	{_,_} -> 
-	    exit({error,{asn1,{integer_range,Range,Int}}});
-	SingleValue when integer(SingleValue) ->
-	    exit({error,{asn1,{integer_range,Range,Int}}});
-	_ -> % some strange constraint that we don't support yet
-	    Int
-    end.
-
-number2name(Int,[]) ->
-    Int;
-number2name(Int,NamedNumberList) ->
-    case lists:keysearch(Int, 2, NamedNumberList) of 
-	{value,{NamedVal, _}} -> 
-	    NamedVal; 
-	_ -> 
-	    Int 
-    end. 
-
- 
-%%============================================================================ 
-%% Enumerated value, ITU_T X.690 Chapter 8.4 
-
-%% encode enumerated value 
-%%============================================================================ 
-encode_enumerated(Val, TagIn) when integer(Val)->
-    encode_tags(TagIn, encode_integer(false,Val));
-encode_enumerated({Name,Val}, TagIn) when atom(Name) ->
-    encode_enumerated(Val, TagIn).
-
-%% The encode_enumerated functions below this line can be removed when the
-%% new code generation is stable. (the functions might have to be kept here
-%% a while longer for compatibility reasons)
-
-encode_enumerated(C, Val, {NamedNumberList,ExtList}, TagIn) when atom(Val) ->
-    case catch encode_enumerated(C, Val, NamedNumberList, TagIn) of
-	{'EXIT',_} -> encode_enumerated(C, Val, ExtList, TagIn);
-	Result -> Result
-    end;
- 
-encode_enumerated(C, Val, NamedNumberList, TagIn) when atom(Val) -> 
-    case lists:keysearch(Val, 1, NamedNumberList) of 
-	{value, {_, NewVal}} -> 
-	    encode_tags(TagIn, encode_integer(C, NewVal)); 
-	_ -> 
-	    exit({error,{asn1, {enumerated_not_in_range, Val}}}) 
-    end; 
-
-encode_enumerated(C, {asn1_enum, Val}, {_,_}, TagIn) when integer(Val) ->
-    encode_tags(TagIn, encode_integer(C,Val));
-
-encode_enumerated(C, {Name,Val}, NamedNumberList, TagIn) when atom(Name) -> 
-    encode_enumerated(C, Val, NamedNumberList, TagIn);
-
-encode_enumerated(_C, Val, _NamedNumberList, _TagIn) -> 
-    exit({error,{asn1, {enumerated_not_namednumber, Val}}}). 
- 
- 
- 
-%%============================================================================ 
-%% decode enumerated value 
-%%   (Buffer, Range, NamedNumberList, HasTag, TotalLen) ->  Value 
-%%===========================================================================
-decode_enumerated(Tlv, Range, NamedNumberList, Tags) ->
-    Buffer = match_tags(Tlv,Tags),
-    decode_enumerated_notag(Buffer, Range, NamedNumberList, Tags).
-
-decode_enumerated_notag(Buffer, _Range, {NamedNumberList,ExtList}, _Tags) ->
-
-    IVal = decode_integer2(size(Buffer), Buffer),
-    case decode_enumerated1(IVal, NamedNumberList) of
-	{asn1_enum,IVal} ->
-	    decode_enumerated1(IVal,ExtList);
-	EVal ->
-	    EVal
-    end;
-decode_enumerated_notag(Buffer, _Range, NNList, _Tags) ->
-    IVal = decode_integer2(size(Buffer), Buffer), 
-    case decode_enumerated1(IVal, NNList) of
-	{asn1_enum,_} ->
-	    exit({error,{asn1, {illegal_enumerated, IVal}}});
-	EVal ->
-	    EVal
-    end.
-
-decode_enumerated1(Val, NamedNumberList) ->     
-    %% it must be a named integer 
-    case lists:keysearch(Val, 2, NamedNumberList) of 
-	{value,{NamedVal, _}} -> 
-	    NamedVal; 
-	_ -> 
-	    {asn1_enum,Val}
-    end.
- 
-
-%%============================================================================ 
-%%
-%% Real value, ITU_T X.690 Chapter 8.5 
-%%============================================================================ 
-%%
-%% encode real value 
-%%============================================================================ 
- 
-%% only base 2 internally so far!! 
-encode_real(0, TagIn) ->
-    encode_tags(TagIn, {[],0}); 
-encode_real('PLUS-INFINITY', TagIn) ->
-    encode_tags(TagIn, {[64],1}); 
-encode_real('MINUS-INFINITY', TagIn) -> 
-    encode_tags(TagIn, {[65],1}); 
-encode_real(Val, TagIn) when tuple(Val)-> 
-    encode_tags(TagIn, encode_real(Val)). 
- 
-%%%%%%%%%%%%%% 
-%% not optimal efficient..  
-%% only base 2 of Mantissa encoding! 
-%% only base 2 of ExpBase encoding! 
-encode_real({Man, Base, Exp}) -> 
-%%    io:format("Mantissa: ~w Base: ~w, Exp: ~w~n",[Man, Base, Exp]), 
-     
-    OctExp = if Exp >= 0 -> list_to_binary(encode_integer_pos(Exp, [])); 
-		true     -> list_to_binary(encode_integer_neg(Exp, []))
-	     end, 
-%%    ok = io:format("OctExp: ~w~n",[OctExp]), 
-    SignBit = if  Man > 0 -> 0;  % bit 7 is pos or neg, no Zeroval 
-		  true -> 1
-	      end, 
-%%    ok = io:format("SignBitMask: ~w~n",[SignBitMask]), 
-    InBase = if  Base =:= 2 -> 0;   % bit 6,5: only base 2 this far! 
-			   true -> 
-			       exit({error,{asn1, {encode_real_non_supported_encodeing, Base}}}) 
-		       end, 
-    SFactor = 0,   % bit 4,3: no scaling since only base 2 
-    OctExpLen = size(OctExp), 
-    if OctExpLen > 255 -> 
-	    exit({error,{asn1, {to_big_exp_in_encode_real, OctExpLen}}}); 
-       true  -> true %% make real assert later.. 
-    end,  
-    {LenCode, EOctets} = case OctExpLen of   % bit 2,1  
-			     1 -> {0, OctExp}; 
-			     2 -> {1, OctExp}; 
-			     3 -> {2, OctExp}; 
-			     _ -> {3, <<OctExpLen, OctExp/binary>>}  
-			 end, 
-    FirstOctet = <<1:1,SignBit:1,InBase:2,SFactor:2,LenCode:2>>,
-    OctMantissa = if Man > 0 -> list_to_binary(minimum_octets(Man)); 
-		     true    -> list_to_binary(minimum_octets(-(Man))) % signbit keeps track of sign 
-		  end, 
-    %%    ok = io:format("LenMask: ~w EOctets: ~w~nFirstOctet: ~w OctMantissa: ~w OctExpLen: ~w~n", [LenMask, EOctets, FirstOctet, OctMantissa, OctExpLen]), 
-    Bin = <<FirstOctet/binary, EOctets/binary, OctMantissa/binary>>,
-    {Bin, size(Bin)}. 
- 
- 
-%%============================================================================ 
-%% decode real value 
-%% 
-%% decode_real([OctetBufferList], tuple|value, tag|notag) -> 
-%%  {{Mantissa, Base, Exp} | realval | PLUS-INFINITY | MINUS-INFINITY | 0, 
-%%     RestBuff} 
-%%  
-%% only for base 2 decoding sofar!! 
-%%============================================================================ 
- 
-decode_real(Tlv, Form, Tags) ->
-    Buffer = match_tags(Tlv,Tags),
-    decode_real_notag(Buffer, Form).
-
-decode_real_notag(_Buffer, _Form) ->
-    exit({error,{asn1, {unimplemented,real}}}).
-%%  decode_real2(Buffer, Form, size(Buffer)).
-
-% decode_real2(Buffer, Form, Len) ->
-%     <<First, Buffer2/binary>> = Buffer,
-%     if
-% 	First =:= 2#01000000 -> {'PLUS-INFINITY', Buffer2}; 
-% 	First =:= 2#01000001 -> {'MINUS-INFINITY', Buffer2}; 
-% 	First =:= 2#00000000 -> {0, Buffer2}; 
-% 	true -> 
-% 	    %% have some check here to verify only supported bases (2) 
-% 	    <<B7:1,B6:1,B5_4:2,B3_2:2,B1_0:2>> = <<First>>,
-% 		Sign = B6,
-% 	    Base = 
-% 		case B5_4 of
-% 		    0 -> 2;  % base 2, only one so far 
-% 		    _ -> exit({error,{asn1, {non_supported_base, First}}}) 
-% 		end, 
-% 	    ScalingFactor = 
-% 		case B3_2 of
-% 		    0 -> 0;  % no scaling so far  
-% 		    _ -> exit({error,{asn1, {non_supported_scaling, First}}}) 
-% 		end, 
-						
-% 	    {FirstLen,Exp,Buffer3} =
-% 		case B1_0 of
-% 		    0 ->
-% 			<<_:1/unit:8,Buffer21/binary>> = Buffer2,
-% 			{2, decode_integer2(1, Buffer2),Buffer21}; 
-% 		    1 ->
-% 			<<_:2/unit:8,Buffer21/binary>> = Buffer2,
-% 			{3, decode_integer2(2, Buffer2)}; 
-% 		    2 ->
-% 			<<_:3/unit:8,Buffer21/binary>> = Buffer2,
-% 			{4, decode_integer2(3, Buffer2)}; 
-% 		    3 -> 
-% 			<<ExpLen1,RestBuffer/binary>> = Buffer2,
-% 			<<_:ExpLen1/unit:8,RestBuffer2/binary>> = RestBuffer,
-% 			{ ExpLen1 + 2, 
-% 			  decode_integer2(ExpLen1, RestBuffer, RemBytes1),
-% 			  RestBuffer2} 
-% 		end, 
-% 	    Length = Len - FirstLen,
-% 	    <<LongInt:Length/unit:8,RestBuff/binary>> = Buffer3,
-% 	    {Mantissa, Buffer4} = 
-% 		if Sign =:= 0 -> 
-			
-% 			{LongInt, RestBuff};%  sign plus, 
-% 		   true -> 
-			
-% 			{-LongInt, RestBuff}%  sign minus 
-% 		end, 
-% 	    case Form of 
-% 		tuple -> 
-% 		    {Val,Buf,RemB} = Exp, 
-% 		    {{Mantissa, Base, {Val,Buf}}, Buffer4, RemBytes2+RemBytes3};  
-% 		_value -> 
-% 		    comming 
-% 	    end 
-%     end. 
- 
- 
-%%============================================================================ 
-%% Bitstring value, ITU_T X.690 Chapter 8.6 
-%%
-%% encode bitstring value 
-%% 
-%% bitstring NamedBitList 
-%% Val can be  of: 
-%% - [identifiers] where only named identifers are set to one,  
-%%   the Constraint must then have some information of the  
-%%   bitlength. 
-%% - [list of ones and zeroes] all bits  
-%% - integer value representing the bitlist 
-%% C is constrint Len, only valid when identifiers 
-%%============================================================================ 
- 
-encode_bit_string(C,Bin={Unused,BinBits},NamedBitList,TagIn) when integer(Unused), binary(BinBits) ->
-    encode_bin_bit_string(C,Bin,NamedBitList,TagIn);
-encode_bit_string(C, [FirstVal | RestVal], NamedBitList, TagIn) when atom(FirstVal) -> 
-    encode_bit_string_named(C, [FirstVal | RestVal], NamedBitList, TagIn); 
-
-encode_bit_string(C, [{bit,X} | RestVal], NamedBitList, TagIn) -> 
-    encode_bit_string_named(C, [{bit,X} | RestVal], NamedBitList, TagIn); 
- 
-encode_bit_string(C, [FirstVal| RestVal], NamedBitList, TagIn) when integer(FirstVal) -> 
-    encode_bit_string_bits(C, [FirstVal | RestVal], NamedBitList, TagIn); 
- 
-encode_bit_string(_C, 0, _NamedBitList, TagIn) -> 
-    encode_tags(TagIn, <<0>>,1); 
-
-encode_bit_string(_C, [], _NamedBitList, TagIn) -> 
-    encode_tags(TagIn, <<0>>,1); 
-
-encode_bit_string(C, IntegerVal, NamedBitList, TagIn) when integer(IntegerVal) -> 
-    BitListVal = int_to_bitlist(IntegerVal),
-    encode_bit_string_bits(C, BitListVal, NamedBitList, TagIn);
-
-encode_bit_string(C, {Name,BitList}, NamedBitList, TagIn) when atom(Name) ->
-    encode_bit_string(C, BitList, NamedBitList, TagIn).
-  
- 
- 
-int_to_bitlist(0) ->
-    [];
-int_to_bitlist(Int) when integer(Int), Int >= 0 ->
-    [Int band 1 | int_to_bitlist(Int bsr 1)].
-
-
-%%================================================================= 
-%% Encode BIT STRING of the form {Unused,BinBits}. 
-%% Unused is the number of unused bits in the last byte in BinBits 
-%% and BinBits is a binary representing the BIT STRING.
-%%================================================================= 
-encode_bin_bit_string(C,{Unused,BinBits},_NamedBitList,TagIn)->
-    case get_constraint(C,'SizeConstraint') of
-	no ->
-	    remove_unused_then_dotag(TagIn, Unused, BinBits);
-	{_Min,Max} ->
-	    BBLen = (size(BinBits)*8)-Unused,
-	    if
-		BBLen > Max ->
-		    exit({error,{asn1, 
-				 {bitstring_length, 
-				  {{was,BBLen},{maximum,Max}}}}}); 
-		true ->
-		    remove_unused_then_dotag(TagIn, Unused, BinBits)
-	    end;
-	Size ->
-	    case ((size(BinBits)*8)-Unused) of
-		BBSize when BBSize =< Size ->
-		    remove_unused_then_dotag(TagIn, Unused, BinBits);
-		BBSize  ->
-		    exit({error,{asn1,  
-				 {bitstring_length, 
-				  {{was,BBSize},{should_be,Size}}}}})
-	    end
-    end.
-
-remove_unused_then_dotag(TagIn,Unused,BinBits) ->
-    case Unused of
-	0 when (size(BinBits) == 0) ->
-	    encode_tags(TagIn,<<0>>,1);
-	0 ->
-	    Bin = <<Unused,BinBits/binary>>,
-	    encode_tags(TagIn,Bin,size(Bin));
-	Num ->
-	    N = (size(BinBits)-1),
-	    <<BBits:N/binary,LastByte>> = BinBits,
-	    encode_tags(TagIn,
-			[Unused,binary_to_list(BBits) ++[(LastByte bsr Num) bsl Num]],
-			1+size(BinBits))
-    end.
-
-
-%%================================================================= 
-%% Encode named bits 
-%%================================================================= 
- 
-encode_bit_string_named(C, [FirstVal | RestVal], NamedBitList, TagIn) -> 
-    ToSetPos = get_all_bitposes([FirstVal | RestVal], NamedBitList, []), 
-    Size = 
-	case get_constraint(C,'SizeConstraint') of 
-	    no -> 
-		lists:max(ToSetPos)+1;
-	    {_Min,Max} ->
-		Max;
-	    TSize ->
-		TSize
-	end,
-    BitList = make_and_set_list(Size, ToSetPos, 0), 
-    {Len, Unused, OctetList} = encode_bitstring(BitList),  
-    encode_tags(TagIn, [Unused|OctetList],Len+1). 
-
-	 
-%%---------------------------------------- 
-%% get_all_bitposes([list of named bits to set], named_bit_db, []) -> 
-%%   [sorted_list_of_bitpositions_to_set] 
-%%---------------------------------------- 
-
-get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
-    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
-get_all_bitposes([Val | Rest], NamedBitList, Ack) when atom(Val) -> 
-    case lists:keysearch(Val, 1, NamedBitList) of 
-	{value, {_ValName, ValPos}} -> 
-	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]); 
-	_ -> 
-	    exit({error,{asn1, {bitstring_namedbit, Val}}}) 
-    end; 
-get_all_bitposes([], _NamedBitList, Ack) -> 
-    lists:sort(Ack). 
- 
- 
-%%---------------------------------------- 
-%% make_and_set_list(Len of list to return, [list of positions to set to 1])-> 
-%% returns list of Len length, with all in SetPos set. 
-%% in positioning in list the first element is 0, the second 1 etc.., but 
-%% Len will make a list of length Len, not Len + 1. 
-%%    BitList = make_and_set_list(C, ToSetPos, 0), 
-%%---------------------------------------- 
- 
-make_and_set_list(0, [], _) -> []; 
-make_and_set_list(0, _, _) ->  
-    exit({error,{asn1,bitstring_sizeconstraint}}); 
-make_and_set_list(Len, [XPos|SetPos], XPos) -> 
-    [1 | make_and_set_list(Len - 1, SetPos, XPos + 1)]; 
-make_and_set_list(Len, [Pos|SetPos], XPos) -> 
-    [0 | make_and_set_list(Len - 1, [Pos | SetPos], XPos + 1)]; 
-make_and_set_list(Len, [], XPos) -> 
-    [0 | make_and_set_list(Len - 1, [], XPos + 1)]. 
- 
- 
- 
- 
- 
- 
-%%================================================================= 
-%% Encode bit string for lists of ones and zeroes 
-%%================================================================= 
-encode_bit_string_bits(C, BitListVal, _NamedBitList, TagIn) when list(BitListVal) -> 
-    case get_constraint(C,'SizeConstraint') of 
-	no -> 
-	    {Len, Unused, OctetList} = encode_bitstring(BitListVal),  
-	    %%add unused byte to the Len 
-	    encode_tags(TagIn, [Unused | OctetList], Len+1);
-	Constr={Min,Max} when integer(Min),integer(Max) -> 
-	    encode_constr_bit_str_bits(Constr,BitListVal,TagIn);
-	{Constr={_,_},[]} ->%Constr={Min,Max}
-	    %% constraint with extension mark
-	    encode_constr_bit_str_bits(Constr,BitListVal,TagIn);
-	Constr={{_,_},{_,_}} ->%{{Min1,Max1},{Min2,Max2}}
-	    %% constraint with extension mark
-	    encode_constr_bit_str_bits(Constr,BitListVal,TagIn);
-	Size ->
-	    case length(BitListVal) of
-		BitSize when BitSize == Size ->
-		    {Len, Unused, OctetList} = encode_bitstring(BitListVal),  
-		    %%add unused byte to the Len 
-		    encode_tags(TagIn, [Unused | OctetList], Len+1);  
-		BitSize when BitSize < Size ->
-		    PaddedList = pad_bit_list(Size-BitSize,BitListVal),
-		    {Len, Unused, OctetList} = encode_bitstring(PaddedList),  
-		    %%add unused byte to the Len 
-		    encode_tags(TagIn, [Unused | OctetList], Len+1);
-		BitSize -> 
-		    exit({error,{asn1,  
-			  {bitstring_length, {{was,BitSize},{should_be,Size}}}}}) 
-	    end 
- 
-    end. 
- 
-encode_constr_bit_str_bits({_Min,Max},BitListVal,TagIn) ->
-    BitLen = length(BitListVal), 
-    if  
-	BitLen > Max -> 
-	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
-						 {maximum,Max}}}}}); 
-	true -> 
-	    {Len, Unused, OctetList} = encode_bitstring(BitListVal),  
-	    %%add unused byte to the Len 
-	    encode_tags(TagIn, [Unused, OctetList], Len+1)  
-    end;
-encode_constr_bit_str_bits({{_Min1,Max1},{Min2,Max2}},BitListVal,TagIn) ->
-    BitLen = length(BitListVal),
-    case BitLen of
-	Len when Len > Max2 -> 
-	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
-						 {maximum,Max2}}}}}); 
-	Len when Len > Max1, Len < Min2  ->
-	    exit({error,{asn1,{bitstring_length,{{was,BitLen},
-						 {not_allowed_interval,
-						  Max1,Min2}}}}});
-	_ ->
-	    {Len, Unused, OctetList} = encode_bitstring(BitListVal),  
-	    %%add unused byte to the Len 
-	    encode_tags(TagIn, [Unused, OctetList], Len+1)  
-    end.
-
-%% returns a list of length Size + length(BitListVal), with BitListVal 
-%% as the most significant elements followed by padded zero elements
-pad_bit_list(Size,BitListVal) ->
-    Tail = lists:duplicate(Size,0),
-    lists:append(BitListVal,Tail).
- 
-%%================================================================= 
-%% Do the actual encoding 
-%%     ([bitlist]) -> {ListLen, UnusedBits, OctetList} 
-%%================================================================= 
- 
-encode_bitstring([B8, B7, B6, B5, B4, B3, B2, B1 | Rest]) -> 
-    Val = (B8 bsl 7) bor (B7 bsl 6) bor (B6 bsl 5) bor (B5 bsl 4) bor 
-	(B4 bsl 3) bor (B3 bsl 2) bor (B2 bsl 1) bor B1, 
-    encode_bitstring(Rest, [Val], 1); 
-encode_bitstring(Val) -> 
-    {Unused, Octet} = unused_bitlist(Val, 7, 0), 
-    {1, Unused, [Octet]}. 
- 
-encode_bitstring([B8, B7, B6, B5, B4, B3, B2, B1 | Rest], Ack, Len) -> 
-    Val = (B8 bsl 7) bor (B7 bsl 6) bor (B6 bsl 5) bor (B5 bsl 4) bor 
-	(B4 bsl 3) bor (B3 bsl 2) bor (B2 bsl 1) bor B1, 
-    encode_bitstring(Rest, [Ack | [Val]], Len + 1); 
-%%even multiple of 8 bits.. 
-encode_bitstring([], Ack, Len) -> 
-    {Len, 0, Ack}; 
-%% unused bits in last octet 
-encode_bitstring(Rest, Ack, Len) -> 
-%    io:format("uneven ~w ~w ~w~n",[Rest, Ack, Len]), 
-    {Unused, Val} = unused_bitlist(Rest, 7, 0), 
-    {Len + 1, Unused, [Ack | [Val]]}. 
- 
-%%%%%%%%%%%%%%%%%% 
-%% unused_bitlist([list of ones and zeros <= 7], 7, []) -> 
-%%  {Unused bits, Last octet with bits moved to right} 
-unused_bitlist([], Trail, Ack) -> 
-    {Trail + 1, Ack}; 
-unused_bitlist([Bit | Rest], Trail, Ack) -> 
-%%    io:format("trail Bit: ~w Rest: ~w Trail: ~w Ack:~w~n",[Bit, Rest, Trail, Ack]), 
-    unused_bitlist(Rest, Trail - 1, (Bit bsl Trail) bor Ack). 
- 
- 
-%%============================================================================ 
-%% decode bitstring value 
-%%    (Buffer, Range, NamedNumberList, HasTag, TotalLen) -> {Integer, Remain, RemovedBytes}  
-%%============================================================================ 
-
-decode_compact_bit_string(Buffer, Range, NamedNumberList, Tags) ->
-%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_BIT_STRING}),
-     decode_restricted_string(Buffer, Range, ?N_BIT_STRING, Tags, 
-			     NamedNumberList,bin).
-
-decode_bit_string(Buffer, Range, NamedNumberList, Tags) -> 
-%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_BIT_STRING}),
-    decode_restricted_string(Buffer, Range, ?N_BIT_STRING, Tags, 
-			     NamedNumberList,old). 
- 
-
-decode_bit_string2(<<0>>,_NamedNumberList,BinOrOld) -> 
-    case BinOrOld of
-	bin ->
-	    {0,<<>>};
-	_ ->
-	    []
-    end;
-decode_bit_string2(<<Unused,Bits/binary>>,NamedNumberList,BinOrOld) -> 
-    case NamedNumberList of 
-	[] -> 
-	    case BinOrOld of
-		bin ->
-		    {Unused,Bits};
-		_ ->
-		    decode_bitstring2(size(Bits), Unused, Bits)
-	    end;
-	_ -> 
-	    BitString = decode_bitstring2(size(Bits), Unused, Bits),
-	    decode_bitstring_NNL(BitString,NamedNumberList) 
-    end. 
- 
-%%---------------------------------------- 
-%% Decode the in buffer to bits 
-%%---------------------------------------- 
-decode_bitstring2(1,Unused,<<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,_/binary>>) -> 
-    lists:sublist([B7,B6,B5,B4,B3,B2,B1,B0],8-Unused); 
-decode_bitstring2(Len, Unused,
-		  <<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Buffer/binary>>) -> 
-    [B7, B6, B5, B4, B3, B2, B1, B0 | 
-     decode_bitstring2(Len - 1, Unused, Buffer)]. 
- 
-%%decode_bitstring2(1, Unused, Buffer) -> 
-%%    make_bits_of_int(hd(Buffer), 128, 8-Unused); 
-%%decode_bitstring2(Len, Unused, [BitVal | Buffer]) -> 
-%%    [B7, B6, B5, B4, B3, B2, B1, B0] = make_bits_of_int(BitVal, 128, 8), 
-%%    [B7, B6, B5, B4, B3, B2, B1, B0 | 
-%%     decode_bitstring2(Len - 1, Unused, Buffer)]. 
- 
- 
-%%make_bits_of_int(_, _, 0) -> 
-%%    []; 
-%%make_bits_of_int(BitVal, MaskVal, Unused) when Unused > 0 -> 
-%%    X = case MaskVal band BitVal of 
-%%	    0 -> 0 ; 
-%%	    _ -> 1 
-%%	end, 
-%%    [X | make_bits_of_int(BitVal, MaskVal bsr 1, Unused - 1)]. 
- 
- 
- 
-%%---------------------------------------- 
-%% Decode the bitlist to names 
-%%---------------------------------------- 
-
- 
-decode_bitstring_NNL(BitList,NamedNumberList) -> 
-    decode_bitstring_NNL(BitList,NamedNumberList,0,[]). 
- 
- 
-decode_bitstring_NNL([],_,_No,Result) -> 
-    lists:reverse(Result); 
-
-decode_bitstring_NNL([B|BitList],[{Name,No}|NamedNumberList],No,Result) -> 
-    if 
-	B == 0 -> 
-	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,Result); 
-	true -> 
-	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,[Name|Result]) 
-    end; 
-decode_bitstring_NNL([1|BitList],NamedNumberList,No,Result) -> 
-	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,[{bit,No}|Result]); 
-decode_bitstring_NNL([0|BitList],NamedNumberList,No,Result) ->
-	    decode_bitstring_NNL(BitList,NamedNumberList,No+1,Result). 
- 
- 
-%%============================================================================ 
-%% Octet string, ITU_T X.690 Chapter 8.7 
-%%
-%% encode octet string 
-%% The OctetList must be a flat list of integers in the range 0..255
-%% the function does not check this because it takes to much time
-%%============================================================================ 
-encode_octet_string(_C, OctetList, TagIn) when binary(OctetList) -> 
-    encode_tags(TagIn, OctetList, size(OctetList));
-encode_octet_string(_C, OctetList, TagIn) when list(OctetList) -> 
-    encode_tags(TagIn, OctetList, length(OctetList));
-encode_octet_string(C, {Name,OctetList}, TagIn) when atom(Name) -> 
-    encode_octet_string(C, OctetList, TagIn).
- 
-
-%%============================================================================ 
-%% decode octet string  
-%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}  
-%% 
-%% Octet string is decoded as a restricted string 
-%%============================================================================ 
-decode_octet_string(Buffer, Range, Tags) -> 
-%    NewTags = new_tags(HasTag,#tag{class=?UNIVERSAL,number=?N_OCTET_STRING}),
-    decode_restricted_string(Buffer, Range, ?N_OCTET_STRING, 
-			     Tags, [], old). 
-
-%%============================================================================ 
-%% Null value, ITU_T X.690 Chapter 8.8 
-%%
-%% encode NULL value 
-%%============================================================================ 
- 
-encode_null({Name, _Val}, TagIn) when atom(Name) -> 
-    encode_tags(TagIn, [], 0);
-encode_null(_Val, TagIn) -> 
-    encode_tags(TagIn, [], 0). 
- 
-%%============================================================================ 
-%% decode NULL value 
-%%    (Buffer, HasTag, TotalLen) -> {NULL, Remain, RemovedBytes}  
-%%============================================================================ 
-
-decode_null(Tlv, Tags) ->
-    Val = match_tags(Tlv, Tags),
-    case Val of
-	<<>> ->
-	    'NULL';
-	_ ->
-	    exit({error,{asn1,{decode_null,Val}}})
-	end. 
- 
-%%============================================================================ 
-%% Object identifier, ITU_T X.690 Chapter 8.19 
-%%
-%% encode Object Identifier value 
-%%============================================================================ 
- 
-encode_object_identifier({Name,Val}, TagIn) when atom(Name) -> 
-    encode_object_identifier(Val, TagIn);
-encode_object_identifier(Val, TagIn) -> 
-    encode_tags(TagIn, e_object_identifier(Val)).
- 
-e_object_identifier({'OBJECT IDENTIFIER', V}) -> 
-    e_object_identifier(V); 
-e_object_identifier({Cname, V}) when atom(Cname), tuple(V) -> 
-    e_object_identifier(tuple_to_list(V)); 
-e_object_identifier({Cname, V}) when atom(Cname), list(V) -> 
-    e_object_identifier(V); 
-e_object_identifier(V) when tuple(V) -> 
-    e_object_identifier(tuple_to_list(V)); 
- 
-%%%%%%%%%%%%%%% 
-%% e_object_identifier([List of Obect Identifiers]) -> 
-%% {[Encoded Octetlist of ObjIds], IntLength} 
-%% 
-e_object_identifier([E1, E2 | Tail]) -> 
-    Head = 40*E1 + E2,  % wow! 
-    {H,Lh} = mk_object_val(Head),
-    {R,Lr} = enc_obj_id_tail(Tail, [], 0),
-    {[H|R], Lh+Lr}.
-
-enc_obj_id_tail([], Ack, Len) ->
-    {lists:reverse(Ack), Len};
-enc_obj_id_tail([H|T], Ack, Len) ->
-    {B, L} = mk_object_val(H),
-    enc_obj_id_tail(T, [B|Ack], Len+L).
-
-%% e_object_identifier([List of Obect Identifiers]) -> 
-%% {[Encoded Octetlist of ObjIds], IntLength} 
-%% 
-%%e_object_identifier([E1, E2 | Tail]) -> 
-%%    Head = 40*E1 + E2,  % wow! 
-%%    F = fun(Val, AckLen) -> 
-%%		{L, Ack} = mk_object_val(Val), 
-%%		{L, Ack + AckLen} 
-%%	end, 
-%%    {Octets, Len} = lists:mapfoldl(F, 0, [Head | Tail]).
-
-%%%%%%%%%%% 
-%% mk_object_val(Value) -> {OctetList, Len} 
-%% returns a Val as a list of octets, the 8 bit is allways set to one except 
-%% for the last octet, where its 0 
-%% 
-
- 
-mk_object_val(Val) when Val =< 127 -> 
-    {[255 band Val], 1}; 
-mk_object_val(Val) -> 
-    mk_object_val(Val bsr 7, [Val band 127], 1).  
-mk_object_val(0, Ack, Len) -> 
-    {Ack, Len}; 
-mk_object_val(Val, Ack, Len) -> 
-    mk_object_val(Val bsr 7, [((Val band 127) bor 128) | Ack], Len + 1). 
- 
- 
- 
-%%============================================================================ 
-%% decode Object Identifier value   
-%%    (Buffer, HasTag, TotalLen) -> {{ObjId}, Remain, RemovedBytes}  
-%%============================================================================ 
- 
-decode_object_identifier(Tlv, Tags) -> 
-    Val = match_tags(Tlv, Tags),
-    [AddedObjVal|ObjVals] = dec_subidentifiers(Val,0,[]), 
-    {Val1, Val2} = if 
-		       AddedObjVal < 40 -> 
-			   {0, AddedObjVal}; 
-		       AddedObjVal < 80 -> 
-			   {1, AddedObjVal - 40}; 
-		       true -> 
-			   {2, AddedObjVal - 80} 
-		   end, 
-    list_to_tuple([Val1, Val2 | ObjVals]).
-
-dec_subidentifiers(<<>>,_Av,Al) -> 
-    lists:reverse(Al); 
-dec_subidentifiers(<<1:1,H:7,T/binary>>,Av,Al) -> 
-    dec_subidentifiers(T,(Av bsl 7) + H,Al); 
-dec_subidentifiers(<<H,T/binary>>,Av,Al) -> 
-    dec_subidentifiers(T,0,[((Av bsl 7) + H)|Al]). 
-
-
-%%============================================================================ 
-%% Restricted character string types, ITU_T X.690 Chapter 8.20 
-%%
-%% encode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings 
-%%============================================================================ 
-%% The StringType arg is kept for future use but might be removed 
-encode_restricted_string(_C, OctetList, _StringType, TagIn) 
-  when binary(OctetList) -> 
-    encode_tags(TagIn, OctetList, size(OctetList)); 
-encode_restricted_string(_C, OctetList, _StringType, TagIn) 
-  when list(OctetList) -> 
-    encode_tags(TagIn, OctetList, length(OctetList)); 
-encode_restricted_string(C,{Name,OctetL}, StringType, TagIn) when atom(Name)-> 
-    encode_restricted_string(C, OctetL, StringType, TagIn).
-
-%%============================================================================ 
-%% decode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings 
-%%    (Buffer, Range, StringType, HasTag, TotalLen) -> 
-%%                                  {String, Remain, RemovedBytes}  
-%%============================================================================ 
-
-decode_restricted_string(Buffer, Range, StringType, Tags) -> 
-	decode_restricted_string(Buffer, Range, StringType, Tags, [], old).
-
-
-decode_restricted_string(Tlv, Range, StringType, TagsIn, 
-			 NamedNumberList, BinOrOld) -> 
-    Val = match_tags(Tlv, TagsIn),
-    Val2 = 
-	case Val of
-	    PartList = [_H|_T] -> % constructed val
-		Bin = collect_parts(PartList),
-		decode_restricted(Bin, StringType, 
-				      NamedNumberList, BinOrOld);
-	    Bin ->
-		decode_restricted(Bin, StringType, 
-				      NamedNumberList, BinOrOld)
-	end,
-    check_and_convert_restricted_string(Val2,StringType,Range,NamedNumberList,BinOrOld).
-     
-
-
-% 	case StringType of
-% 	    ?N_BIT_STRING when BinOrOld == bin ->
-% 		{concat_bit_binaries(AccVal, Val), AccRb+Rb};
-% 	    _ when binary(Val),binary(AccVal) ->
-% 		{<<AccVal/binary,Val/binary>>,AccRb+Rb};
-% 	    _ when binary(Val), AccVal==[] ->
-% 		{Val,AccRb+Rb};				      
-% 	    _ ->	
-% 		{AccVal++Val, AccRb+Rb}
-% 	end,
-
-    
- 
-decode_restricted(Bin, StringType, NamedNumberList,BinOrOld) -> 
-	case StringType of 
-	    ?N_BIT_STRING -> 
-		decode_bit_string2(Bin, NamedNumberList, BinOrOld); 
-	    ?N_UniversalString ->
-		mk_universal_string(binary_to_list(Bin)); 
-	    ?N_BMPString ->  
-		mk_BMP_string(binary_to_list(Bin)); 
-	    _ ->  
-		Bin
-	end. 
-     
-
-check_and_convert_restricted_string(Val,StringType,Range,NamedNumberList,_BinOrOld) ->
-    {StrLen,NewVal} = case StringType of
-			  ?N_BIT_STRING when NamedNumberList /= [] ->
-			      {no_check,Val};
-			  ?N_BIT_STRING when list(Val) ->
-			      {length(Val),Val};
-			  ?N_BIT_STRING when tuple(Val) -> 
-			      {(size(element(2,Val))*8) - element(1,Val),Val};
-			  _ when binary(Val) ->
-			      {size(Val),binary_to_list(Val)};
-			  _ when list(Val) ->
-			      {length(Val), Val}
-		      end,
-    case Range of
-	_ when StrLen == no_check ->
-	    NewVal;
-	[] -> % No length constraint
-	    NewVal;
-	{Lb,Ub} when StrLen >= Lb, Ub >= StrLen -> % variable length constraint
-	    NewVal;
-	{{Lb,_Ub},[]} when StrLen >= Lb ->
-	    NewVal;
-	{{Lb1,Ub1},{Lb2,Ub2}} when StrLen >= Lb1, StrLen =< Ub1; 
-				   StrLen =< Ub2, StrLen >= Lb2 ->
-	    NewVal;
-	StrLen -> % fixed length constraint
-	    NewVal;
-	{_,_} -> 
-	    exit({error,{asn1,{length,Range,Val}}});
-	_Len when integer(_Len) ->
-	    exit({error,{asn1,{length,Range,Val}}});
-	_ -> % some strange constraint that we don't support yet
-	    NewVal
-    end.
-
-
-%%============================================================================ 
-%% encode Universal string 
-%%============================================================================ 
-
-encode_universal_string(C, {Name, Universal}, TagIn) when atom(Name) -> 
-    encode_universal_string(C, Universal, TagIn);
-encode_universal_string(_C, Universal, TagIn) -> 
-    OctetList = mk_uni_list(Universal), 
-    encode_tags(TagIn, OctetList, length(OctetList)). 
- 
-mk_uni_list(In) ->  
-    mk_uni_list(In,[]). 
- 
-mk_uni_list([],List) ->  
-    lists:reverse(List); 
-mk_uni_list([{A,B,C,D}|T],List) ->  
-    mk_uni_list(T,[D,C,B,A|List]); 
-mk_uni_list([H|T],List) ->  
-    mk_uni_list(T,[H,0,0,0|List]). 
- 
-%%=========================================================================== 
-%% decode Universal strings  
-%%    (Buffer, Range, StringType, HasTag, LenIn) -> 
-%%                           {String, Remain, RemovedBytes}  
-%%=========================================================================== 
-
-decode_universal_string(Buffer, Range, Tags) ->
-    decode_restricted_string(Buffer, Range, ?N_UniversalString, 
-			     Tags, [], old).
-  
- 
-mk_universal_string(In) -> 
-    mk_universal_string(In,[]). 
- 
-mk_universal_string([],Acc) -> 
-    lists:reverse(Acc); 
-mk_universal_string([0,0,0,D|T],Acc) -> 
-    mk_universal_string(T,[D|Acc]); 
-mk_universal_string([A,B,C,D|T],Acc) -> 
-    mk_universal_string(T,[{A,B,C,D}|Acc]). 
- 
- 
-%%============================================================================ 
-%% encode BMP string 
-%%============================================================================ 
-
-encode_BMP_string(C, {Name,BMPString}, TagIn) when atom(Name)-> 
-    encode_BMP_string(C, BMPString, TagIn);
-encode_BMP_string(_C, BMPString, TagIn) -> 
-    OctetList = mk_BMP_list(BMPString), 
-    encode_tags(TagIn, OctetList, length(OctetList)). 
- 
-mk_BMP_list(In) ->  
-    mk_BMP_list(In,[]). 
- 
-mk_BMP_list([],List) ->  
-    lists:reverse(List); 
-mk_BMP_list([{0,0,C,D}|T],List) ->  
-    mk_BMP_list(T,[D,C|List]); 
-mk_BMP_list([H|T],List) ->  
-    mk_BMP_list(T,[H,0|List]). 
- 
-%%============================================================================ 
-%% decode (OctetList, Range(ignored), tag|notag) -> {ValList, RestList} 
-%%    (Buffer, Range, StringType, HasTag, TotalLen) -> 
-%%                               {String, Remain, RemovedBytes}  
-%%============================================================================ 
-decode_BMP_string(Buffer, Range, Tags) -> 
-    decode_restricted_string(Buffer, Range, ?N_BMPString, 
-			     Tags, [], old). 
- 
-mk_BMP_string(In) -> 
-    mk_BMP_string(In,[]). 
- 
-mk_BMP_string([],US) -> 
-    lists:reverse(US); 
-mk_BMP_string([0,B|T],US) -> 
-    mk_BMP_string(T,[B|US]); 
-mk_BMP_string([C,D|T],US) -> 
-    mk_BMP_string(T,[{0,0,C,D}|US]). 
- 
- 
-%%============================================================================ 
-%% Generalized time, ITU_T X.680 Chapter 39 
-%%
-%% encode Generalized time 
-%%============================================================================ 
-
-encode_generalized_time(C, {Name,OctetList}, TagIn) when atom(Name) -> 
-    encode_generalized_time(C, OctetList, TagIn);
-encode_generalized_time(_C, OctetList, TagIn) -> 
-    encode_tags(TagIn, OctetList, length(OctetList)). 
- 
-%%============================================================================ 
-%% decode Generalized time  
-%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}  
-%%============================================================================ 
-
-decode_generalized_time(Tlv, _Range, Tags) -> 
-    Val = match_tags(Tlv, Tags),
-    NewVal = case Val of
-		 PartList = [_H|_T] -> % constructed
-		     collect_parts(PartList);
-		 Bin ->
-		     Bin
-	     end,
-    binary_to_list(NewVal).
-
-%%============================================================================ 
-%% Universal time, ITU_T X.680 Chapter 40 
-%%
-%% encode UTC time 
-%%============================================================================ 
-
-encode_utc_time(C, {Name,OctetList}, TagIn) when atom(Name) -> 
-    encode_utc_time(C, OctetList, TagIn);
-encode_utc_time(_C, OctetList, TagIn) -> 
-    encode_tags(TagIn, OctetList, length(OctetList)).
- 
-%%============================================================================ 
-%% decode UTC time 
-%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}  
-%%============================================================================ 
-
-decode_utc_time(Tlv, _Range, Tags) -> 
-    Val = match_tags(Tlv, Tags),
-    NewVal = case Val of
-		 PartList = [_H|_T] -> % constructed
-		     collect_parts(PartList);
-		 Bin ->
-		     Bin
-	     end,
-    binary_to_list(NewVal).
-
- 
-%%============================================================================ 
-%% Length handling  
-%%
-%% Encode length 
-%% 
-%% encode_length(Int | indefinite) -> 
-%%          [<127]| [128 + Int (<127),OctetList] | [16#80] 
-%%============================================================================ 
- 
-encode_length(indefinite) -> 
-    {[16#80],1}; % 128 
-encode_length(L) when L =< 16#7F -> 
-    {[L],1}; 
-encode_length(L) -> 
-    Oct = minimum_octets(L), 
-    Len = length(Oct), 
-    if 
-	Len =< 126 -> 
-	    {[ (16#80+Len) | Oct ],Len+1}; 
-	true -> 
-	    exit({error,{asn1, to_long_length_oct, Len}}) 
-    end. 
- 
-
-%% Val must be >= 0
-minimum_octets(Val) -> 
-    minimum_octets(Val,[]). 
- 
-minimum_octets(0,Acc) ->
-    Acc;
-minimum_octets(Val, Acc) ->
-    minimum_octets((Val bsr 8),[Val band 16#FF | Acc]).
-
- 
-%%=========================================================================== 
-%% Decode length 
-%% 
-%% decode_length(OctetList) -> {{indefinite, RestOctetsL}, NoRemovedBytes} |  
-%%                             {{Length, RestOctetsL}, NoRemovedBytes} 
-%%=========================================================================== 
-
-decode_length(<<1:1,0:7,T/binary>>) ->     
-    {indefinite, T};
-decode_length(<<0:1,Length:7,T/binary>>) ->
-    {Length,T};
-decode_length(<<1:1,LL:7,T/binary>>) ->
-    <<Length:LL/unit:8,Rest/binary>> = T,
-    {Length,Rest}.
- 
-
-
-%%-------------------------------------------------------------------------
-%% INTERNAL HELPER FUNCTIONS (not exported)
-%%-------------------------------------------------------------------------
-
- 
-%% decoding postitive integer values. 
-decode_integer2(Len,Bin = <<0:1,_:7,_Bs/binary>>) ->
-    <<Int:Len/unit:8>> = Bin,
-    Int;
-%% decoding negative integer values.
-decode_integer2(Len,<<1:1,B2:7,Bs/binary>>)  ->
-    <<N:Len/unit:8>> = <<B2,Bs/binary>>,
-    Int = N - (1 bsl (8 * Len - 1)),
-    Int.
-
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	     no;
-	{value,{_,V}} -> 
-	    V
-    end.
- 
-collect_parts(TlvList) ->
-    collect_parts(TlvList,[]).
-
-collect_parts([{_,L}|Rest],Acc) when list(L) ->
-    collect_parts(Rest,[collect_parts(L)|Acc]);
-collect_parts([{?N_BIT_STRING,<<Unused,Bits/binary>>}|Rest],_Acc) ->
-    collect_parts_bit(Rest,[Bits],Unused);
-collect_parts([{_T,V}|Rest],Acc) ->
-    collect_parts(Rest,[V|Acc]);
-collect_parts([],Acc) ->
-    list_to_binary(lists:reverse(Acc)).
-
-collect_parts_bit([{?N_BIT_STRING,<<Unused,Bits/binary>>}|Rest],Acc,Uacc) ->    
-    collect_parts_bit(Rest,[Bits|Acc],Unused+Uacc);
-collect_parts_bit([],Acc,Uacc) ->
-    list_to_binary([Uacc|lists:reverse(Acc)]).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_check.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_check.erl
deleted file mode 100644
index bd3d5e6d8b..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_check.erl
+++ /dev/null
@@ -1,333 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1rt_check.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
--module(asn1rt_check).
-
--include("asn1_records.hrl").
-
--export([check_bool/2,
-	 check_int/3,
-	 check_bitstring/3,
-	 check_octetstring/2,
-	 check_null/2,
-	 check_objectidentifier/2,
-	 check_objectdescriptor/2,
-	 check_real/2,
-	 check_enum/3,
-	 check_restrictedstring/2]).
-
--export([transform_to_EXTERNAL1990/1,
-	 transform_to_EXTERNAL1994/1]).
-
-
-check_bool(_Bool,asn1_DEFAULT) ->
-    true;
-check_bool(Bool,Bool) when Bool == true; Bool == false ->
-    true;
-check_bool(_Bool1,Bool2) ->
-    throw({error,Bool2}).
-
-check_int(_,asn1_DEFAULT,_) ->
-    true;
-check_int(Value,Value,_) when integer(Value) ->
-    true;
-check_int(DefValue,Value,NNL) when atom(Value) ->
-    case lists:keysearch(Value,1,NNL) of
-	{value,{_,DefValue}} ->
-	    true;
-	_ ->
-	    throw({error,DefValue})
-    end;
-check_int(DefaultValue,_Value,_) ->
-    throw({error,DefaultValue}).
-
-% check_bitstring([H|T],[H|T],_) when integer(H) ->
-%     true;
-% check_bitstring(V,V,_) when integer(V) ->
-%     true;
-%% Two equal lists or integers
-check_bitstring(_,asn1_DEFAULT,_) ->
-    true;
-check_bitstring(V,V,_) ->
-    true;
-%% Default value as a list of 1 and 0 and user value as an integer
-check_bitstring(L=[H|T],Int,_) when integer(Int),integer(H) ->
-    case bit_list_to_int(L,length(T)) of
-	Int -> true;
-	_ -> throw({error,L,Int})
-    end;
-%% Default value as an integer, val as list
-check_bitstring(Int,Val,NBL) when integer(Int),list(Val) ->
-    BL = int_to_bit_list(Int,[],length(Val)),
-    check_bitstring(BL,Val,NBL);
-%% Default value and user value as lists of ones and zeros
-check_bitstring(L1=[H1|_T1],L2=[H2|_T2],NBL=[_H|_T]) when integer(H1),integer(H2) ->
-    L2new = remove_trailing_zeros(L2),
-    check_bitstring(L1,L2new,NBL);
-%% Default value as a list of 1 and 0 and user value as a list of atoms
-check_bitstring(L1=[H1|_T1],L2=[H2|_T2],NBL) when integer(H1),atom(H2) ->
-    case bit_list_to_nbl(L1,NBL,0,[]) of
-	L3 -> check_bitstring(L3,L2,NBL);
-	_ -> throw({error,L2})
-    end;
-%% Both default value and user value as a list of atoms
-check_bitstring(L1=[H1|T1],L2=[H2|_T2],_) when atom(H1),atom(H2) ->
-    length(L1) == length(L2),
-    case lists:member(H1,L2) of
-	true ->
-	    check_bitstring1(T1,L2);
-	false -> throw({error,L2})
-    end;
-%% Default value as a list of atoms and user value as a list of 1 and 0
-check_bitstring(L1=[H1|_T1],L2=[H2|_T2],NBL) when atom(H1),integer(H2) ->
-    case bit_list_to_nbl(L2,NBL,0,[]) of
-	L3 ->
-	    check_bitstring(L1,L3,NBL);
-	_ -> throw({error,L2})
-    end;
-%% User value in compact format
-check_bitstring(DefVal,CBS={_,_},NBL) ->
-    NewVal = cbs_to_bit_list(CBS),
-    check_bitstring(DefVal,NewVal,NBL);
-check_bitstring(DV,V,_) ->
-    throw({error,DV,V}).
-
-    
-bit_list_to_int([0|Bs],ShL)->
-    bit_list_to_int(Bs,ShL-1) + 0;
-bit_list_to_int([1|Bs],ShL) ->
-    bit_list_to_int(Bs,ShL-1) + (1 bsl ShL);
-bit_list_to_int([],_) ->
-    0.
-
-int_to_bit_list(0,Acc,0) ->
-    Acc;
-int_to_bit_list(Int,Acc,Len) ->
-    int_to_bit_list(Int bsr 1,[Int band 1|Acc],Len - 1).
-    
-bit_list_to_nbl([0|T],NBL,Pos,Acc) ->
-    bit_list_to_nbl(T,NBL,Pos+1,Acc);
-bit_list_to_nbl([1|T],NBL,Pos,Acc) ->
-    case lists:keysearch(Pos,2,NBL) of
-	{value,{N,_}} ->
-	    bit_list_to_nbl(T,NBL,Pos+1,[N|Acc]);
-	_ ->
-	    throw({error,{no,named,element,at,pos,Pos}})
-    end;
-bit_list_to_nbl([],_,_,Acc) ->
-    Acc.
-    
-remove_trailing_zeros(L2) ->
-    remove_trailing_zeros1(lists:reverse(L2)).
-remove_trailing_zeros1(L) ->
-    lists:reverse(lists:dropwhile(fun(0)->true;
-				     (_) ->false 
-				  end,
-				  L)).
-
-check_bitstring1([H|T],NBL) ->
-    case lists:member(H,NBL) of
-	true ->
-	    check_bitstring1(T,NBL);
-	V -> throw({error,V})
-    end;
-check_bitstring1([],_) ->
-    true.
-
-cbs_to_bit_list({Unused,<<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Rest/binary>>}) when size(Rest) >= 1 ->
-    [B7,B6,B5,B4,B3,B2,B1,B0|cbs_to_bit_list({Unused,Rest})];
-cbs_to_bit_list({0,<<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1>>}) ->
-    [B7,B6,B5,B4,B3,B2,B1,B0];
-cbs_to_bit_list({Unused,Bin}) when size(Bin) == 1 ->
-    Used = 8-Unused,
-    <<Int:Used,_:Unused>> = Bin,
-    int_to_bit_list(Int,[],Used).
-
-
-check_octetstring(_,asn1_DEFAULT) ->
-    true;
-check_octetstring(L,L) ->
-    true;
-check_octetstring(L,Int) when list(L),integer(Int) ->
-    case integer_to_octetlist(Int) of
-	L -> true;
-	V -> throw({error,V})
-    end;
-check_octetstring(_,V) ->
-    throw({error,V}).
-
-integer_to_octetlist(Int) ->
-    integer_to_octetlist(Int,[]).
-integer_to_octetlist(0,Acc) ->
-    Acc;
-integer_to_octetlist(Int,Acc) ->
-    integer_to_octetlist(Int bsr 8,[(Int band 255)|Acc]).
-
-check_null(_,asn1_DEFAULT) ->
-    true;
-check_null('NULL','NULL') ->
-    true;
-check_null(_,V) ->
-    throw({error,V}).
-
-check_objectidentifier(_,asn1_DEFAULT) ->
-    true;
-check_objectidentifier(OI,OI) ->
-    true;
-check_objectidentifier(DOI,OI) when tuple(DOI),tuple(OI) ->
-    check_objectidentifier1(tuple_to_list(DOI),tuple_to_list(OI));
-check_objectidentifier(_,OI) ->
-    throw({error,OI}).
-
-check_objectidentifier1([V|Rest1],[V|Rest2]) ->
-    check_objectidentifier1(Rest1,Rest2,V);
-check_objectidentifier1([V1|Rest1],[V2|Rest2]) ->
-    case reserved_objectid(V2,[]) of
-	V1 ->
-	    check_objectidentifier1(Rest1,Rest2,[V1]);
-	V ->
-	    throw({error,V})
-    end.
-check_objectidentifier1([V|Rest1],[V|Rest2],Above) ->
-    check_objectidentifier1(Rest1,Rest2,[V|Above]);
-check_objectidentifier1([V1|Rest1],[V2|Rest2],Above) ->
-    case reserved_objectid(V2,Above) of
-	V1 ->
-	    check_objectidentifier1(Rest1,Rest2,[V1|Above]);
-	V ->
-	    throw({error,V})
-    end;
-check_objectidentifier1([],[],_) ->
-    true;
-check_objectidentifier1(_,V,_) ->
-    throw({error,object,identifier,V}).
-
-%% ITU-T Rec. X.680 Annex B - D
-reserved_objectid('itu-t',[]) -> 0;
-reserved_objectid('ccitt',[]) -> 0;
-%% arcs below "itu-t" 
-reserved_objectid('recommendation',[0]) -> 0;
-reserved_objectid('question',[0]) -> 1;
-reserved_objectid('administration',[0]) -> 2;
-reserved_objectid('network-operator',[0]) -> 3;
-reserved_objectid('identified-organization',[0]) -> 4;
-
-reserved_objectid(iso,[]) -> 1;
-%% arcs below "iso", note that number 1 is not used
-reserved_objectid('standard',[1]) -> 0;
-reserved_objectid('member-body',[1]) -> 2;
-reserved_objectid('identified-organization',[1]) -> 3;
-
-reserved_objectid('joint-iso-itu-t',[]) -> 2;
-reserved_objectid('joint-iso-ccitt',[]) -> 2;
-
-reserved_objectid(_,_) -> false.
-
-
-check_objectdescriptor(_,asn1_DEFAULT) ->
-    true;
-check_objectdescriptor(OD,OD) ->
-    true;
-check_objectdescriptor(OD,OD) ->
-    throw({error,{not_implemented_yet,check_objectdescriptor}}).
-
-check_real(_,asn1_DEFAULT) ->
-    true;
-check_real(R,R) ->
-    true;
-check_real(_,_) ->
-    throw({error,{not_implemented_yet,check_real}}).
-
-check_enum(_,asn1_DEFAULT,_) ->
-    true;
-check_enum(Val,Val,_) ->
-    true;
-check_enum(Int,Atom,Enumerations) when integer(Int),atom(Atom) ->
-    case lists:keysearch(Atom,1,Enumerations) of
-	{value,{_,Int}} -> true;
-	_ -> throw({error,{enumerated,Int,Atom}})
-    end;
-check_enum(DefVal,Val,_) ->
-    throw({error,{enumerated,DefVal,Val}}).
-
-
-check_restrictedstring(_,asn1_DEFAULT) ->
-    true;
-check_restrictedstring(Val,Val) ->
-    true;
-check_restrictedstring([V|Rest1],[V|Rest2]) ->
-    check_restrictedstring(Rest1,Rest2);
-check_restrictedstring([V1|Rest1],[V2|Rest2]) ->
-    check_restrictedstring(V1,V2),
-    check_restrictedstring(Rest1,Rest2);
-%% tuple format of value
-check_restrictedstring({V1,V2},[V1,V2]) ->
-    true;
-check_restrictedstring([V1,V2],{V1,V2}) ->
-    true;
-%% quadruple format of value
-check_restrictedstring({V1,V2,V3,V4},[V1,V2,V3,V4]) ->
-    true;
-check_restrictedstring([V1,V2,V3,V4],{V1,V2,V3,V4}) ->
-    true;
-%% character string list
-check_restrictedstring(V1,V2) when list(V1),tuple(V2) ->
-    check_restrictedstring(V1,tuple_to_list(V2));
-check_restrictedstring(V1,V2) ->
-    throw({error,{restricted,string,V1,V2}}).
-
-transform_to_EXTERNAL1990(Val) when tuple(Val),size(Val) == 4 ->
-    transform_to_EXTERNAL1990(tuple_to_list(Val),[]);
-transform_to_EXTERNAL1990(Val) when tuple(Val) ->
-    %% Data already in ASN1 1990 format
-    Val.
-
-transform_to_EXTERNAL1990(['EXTERNAL'|Rest],Acc) ->
-    transform_to_EXTERNAL1990(Rest,['EXTERNAL'|Acc]);
-transform_to_EXTERNAL1990([{syntax,Syntax}|Rest],Acc) ->
-    transform_to_EXTERNAL1990(Rest,[asn1_NOVALUE,Syntax|Acc]);
-transform_to_EXTERNAL1990([{'presentation-context-id',PCid}|Rest],Acc) ->
-    transform_to_EXTERNAL1990(Rest,[PCid,asn1_NOVALUE|Acc]);
-transform_to_EXTERNAL1990([{'context-negotiation',Context_negot}|Rest],Acc) ->
-    {_,Presentation_Cid,Transfer_syntax} = Context_negot,
-    transform_to_EXTERNAL1990(Rest,[Transfer_syntax,Presentation_Cid|Acc]);
-transform_to_EXTERNAL1990([asn1_NOVALUE|Rest],Acc) ->
-    transform_to_EXTERNAL1990(Rest,[asn1_NOVALUE|Acc]);
-transform_to_EXTERNAL1990([Data_val_desc,Data_value],Acc) when list(Data_value)->
-    list_to_tuple(lists:reverse([{'octet-aligned',Data_value},
-				 Data_val_desc|Acc]));
-transform_to_EXTERNAL1990([Data_value],Acc) when list(Data_value)->
-    list_to_tuple(lists:reverse([{'octet-aligned',Data_value}|Acc])).
-
-
-transform_to_EXTERNAL1994(V={'EXTERNAL',DRef,IndRef,Data_v_desc,Encoding}) ->
-    Identification =
-	case {DRef,IndRef} of
-	    {DRef,asn1_NOVALUE} ->
-		{syntax,DRef};
-	    {asn1_NOVALUE,IndRef} ->
-		{'presentation-context-id',IndRef};
-	     _ ->
-		{'context-negotiation',
-		 {'EXTERNAL_identification_context-negotiation',IndRef,DRef}}
-	end,
-    case Encoding of
-	{_,Val} when list(Val) ->
-	    {'EXTERNAL',Identification,Data_v_desc,Val};
-	_  ->
-	    V
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_driver_handler.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_driver_handler.erl
deleted file mode 100644
index 7a986b5376..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_driver_handler.erl
+++ /dev/null
@@ -1,108 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1rt_driver_handler.erl,v 1.1 2008/12/17 09:53:30 mikpe Exp $
-%%
-
--module(asn1rt_driver_handler).
-
--export([init/1,load_driver/0,unload_driver/0]).
-
-
-load_driver() ->
-    spawn(asn1rt_driver_handler, init, [self()]).
-
-init(From) ->
-    Port=
-	case load_driver("asn1_erl_drv") of
-	    ok ->
-		open_named_port(From);
-	    already_done ->
-		From ! driver_ready;
-	    Error -> % if erl_ddll:load_driver fails
-		erl_ddll:unload_driver("asn1_erl_drv"),
-		From ! Error
-	end,
-    register_and_loop(Port).
-
-load_driver(DriverName) ->
-    case is_driver_loaded(DriverName) of
-	false ->
-	    Dir = filename:join([code:priv_dir(asn1),"lib"]),
-	    erl_ddll:load_driver(Dir,DriverName);
-	true ->
-	    ok
-    end.
-
-		    
-is_driver_loaded(_Name) ->
-    case whereis(asn1_driver_owner) of
-	undefined ->
-	    false;
-	_ ->
-	    true
-    end.
-
-open_named_port(From) ->
-    case is_port_open(drv_complete) of
-	false ->
-	    case catch open_port({spawn,"asn1_erl_drv"},[]) of
-		{'EXIT',Reason} ->
-		    From ! {port_error,Reason};
-		Port ->
-		    register(drv_complete,Port),
-		    From ! driver_ready,
-		    Port
-	    end;
-	_ ->
-	    From ! driver_ready,
-	    ok
-    end.
-
-is_port_open(Name) ->
-    case whereis(Name) of
-	Port when port(Port) ->
-	    true;
-	_ -> false
-    end.
-
-register_and_loop(Port) when port(Port) ->
-    register(asn1_driver_owner,self()),
-    loop();
-register_and_loop(_) ->
-    ok.
-
-loop() ->
-    receive
-	unload ->
-	    case whereis(drv_complete) of
-		Port when port(Port) ->
-		    port_close(Port);
-		_ -> ok
-	    end,
-	    erl_ddll:unload_driver("asn1_erl_drv"),
-	    ok;
-	_ ->
-	    loop()
-    end.
-
-unload_driver() ->
-    case whereis(asn1_driver_owner) of
-	Pid when pid(Pid) ->
-	    Pid ! unload,
-	    ok;
-	_ -> 
-	    ok
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per.erl
deleted file mode 100644
index d531a165ae..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per.erl
+++ /dev/null
@@ -1,1609 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1rt_per.erl,v 1.1 2008/12/17 09:53:31 mikpe Exp $
-%%
--module(asn1rt_per).
-
-%% encoding / decoding of PER aligned
-
--include("asn1_records.hrl").
-
--export([dec_fixup/3, cindex/3, list_to_record/2]).
--export([setchoiceext/1, setext/1, fixoptionals/2, fixextensions/2, setoptionals/1, 
-	 getext/1, getextension/2, skipextensions/3, getbit/1, getchoice/3 ]).
--export([getoptionals/3, set_choice/3, encode_integer/2, encode_integer/3  ]).
--export([decode_integer/2, decode_integer/3, encode_boolean/1, 
-	 decode_boolean/1, encode_length/2, decode_length/1, decode_length/2,
-	encode_small_length/1, decode_small_length/1]).
--export([encode_enumerated/3, decode_enumerated/3, 
-	 encode_bit_string/3, decode_bit_string/3  ]).
--export([encode_octet_string/2, decode_octet_string/2,
-	encode_restricted_string/4, encode_restricted_string/5,
-	decode_restricted_string/4, decode_restricted_string/5,
-	encode_null/1, decode_null/1,
-	encode_object_identifier/1, decode_object_identifier/1,
-	complete/1]).
-
--export([encode_open_type/2, decode_open_type/2]).
-
--export([encode_UniversalString/2, decode_UniversalString/2,
-	 encode_PrintableString/2, decode_PrintableString/2,
-	 encode_GeneralString/2, decode_GeneralString/2,
-	 encode_GraphicString/2, decode_GraphicString/2,
-	 encode_TeletexString/2, decode_TeletexString/2,
-	 encode_VideotexString/2, decode_VideotexString/2,
-	 encode_VisibleString/2, decode_VisibleString/2,
-	 encode_BMPString/2, decode_BMPString/2,
-	 encode_IA5String/2, decode_IA5String/2,
-	 encode_NumericString/2, decode_NumericString/2
-	 ]).
-
-
-dec_fixup(Terms,Cnames,RemBytes) ->
-    dec_fixup(Terms,Cnames,RemBytes,[]).
-
-dec_fixup([novalue|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([{_Name,novalue}|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([H|T],[Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,[{Hc,H}|Acc]);
-dec_fixup([],_Cnames,RemBytes,Acc) ->
-    {lists:reverse(Acc),RemBytes}.
-
-cindex(Ix,Val,Cname) ->
-    case element(Ix,Val) of
-	{Cname,Val2} -> Val2;
-	X -> X
-    end.
-
-% converts a list to a record if necessary
-list_to_record(Name,List) when list(List) ->
-    list_to_tuple([Name|List]);
-list_to_record(_Name,Tuple) when tuple(Tuple) ->
-    Tuple.
-
-%%--------------------------------------------------------
-%% setchoiceext(InRootSet) -> [{bit,X}]
-%% X  is set to  1 when InRootSet==false
-%% X  is set to  0 when InRootSet==true
-%%
-setchoiceext(true) ->
-    [{debug,choiceext},{bit,0}];
-setchoiceext(false) ->
-    [{debug,choiceext},{bit,1}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% setext(true|false) ->  CompleteList
-%%
-
-setext(true) ->
-    [{debug,ext},{bit,1}];
-setext(false) ->
-    [{debug,ext},{bit,0}].
-
-fixoptionals(OptList,Val) when tuple(Val) ->
-    fixoptionals(OptList,Val,[]);
-    
-fixoptionals(OptList,Val) when list(Val) ->
-    fixoptionals(OptList,Val,1,[],[]).
-
-fixoptionals([],Val,Acc) ->
-    % return {Val,Opt}
-    {Val,lists:reverse(Acc)};
-fixoptionals([{_,Pos}|Ot],Val,Acc) ->
-    case element(Pos+1,Val) of
-	asn1_NOVALUE -> fixoptionals(Ot,Val,[0|Acc]);
-	asn1_DEFAULT -> fixoptionals(Ot,Val,[0|Acc]);
-	_ -> fixoptionals(Ot,Val,[1|Acc])
-    end.
-
-
-%setoptionals(OptList,Val) ->
-%    Vlist = tuple_to_list(Val),
-%    setoptionals(OptList,Vlist,1,[]).
-
-fixoptionals([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) ->
-    fixoptionals(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]);
-fixoptionals([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) ->
-    fixoptionals(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]);
-fixoptionals(O,[Vh|Vt],Pos,Acc1,Acc2) ->
-    fixoptionals(O,Vt,Pos+1,Acc1,[Vh|Acc2]);
-fixoptionals([],[Vh|Vt],Pos,Acc1,Acc2) ->
-    fixoptionals([],Vt,Pos+1,Acc1,[Vh|Acc2]);
-fixoptionals([],[],_,Acc1,Acc2) ->
-    % return {Val,Opt}
-    {list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]),lists:reverse(Acc1)}.
-
-setoptionals([H|T]) ->
-    [{bit,H}|setoptionals(T)];
-setoptionals([]) ->
-    [{debug,optionals}].
-
-getext(Bytes) when tuple(Bytes) ->
-    getbit(Bytes);
-getext(Bytes) when list(Bytes) ->
-    getbit({0,Bytes}).
-
-getextension(0, Bytes) ->
-    {{},Bytes};
-getextension(1, Bytes) ->
-    {Len,Bytes2} = decode_small_length(Bytes),
-    {Blist, Bytes3} = getbits_as_list(Len,Bytes2),
-    {list_to_tuple(Blist),Bytes3}.
-
-fixextensions({ext,ExtPos,ExtNum},Val) ->
-    case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
-	0 -> [];
-	ExtBits ->
-	    [encode_small_length(ExtNum),{bits,ExtNum,ExtBits}]
-    end.
-
-fixextensions(Pos,MaxPos,_,Acc) when Pos >= MaxPos ->
-    Acc;
-fixextensions(Pos,ExtPos,Val,Acc) ->
-    Bit = case catch(element(Pos+1,Val)) of
-	      asn1_NOVALUE ->
-		  0;
-	      asn1_NOEXTVALUE ->
-		  0;
-	      {'EXIT',_} ->
-		  0;
-	      _ ->
-		  1
-	  end,
-    fixextensions(Pos+1,ExtPos,Val,(Acc bsl 1)+Bit).
-	    
-skipextensions(Bytes,Nr,ExtensionBitPattern) -> 
-    case (catch element(Nr,ExtensionBitPattern)) of
-	1 ->
-	    {_,Bytes2} = decode_open_type(Bytes,[]),
-	    skipextensions(Bytes2, Nr+1, ExtensionBitPattern);
-	0 ->
-	    skipextensions(Bytes, Nr+1, ExtensionBitPattern);
-	{'EXIT',_} -> % badarg, no more extensions
-	    Bytes
-    end.
-    
-
-getchoice(Bytes,1,0) -> % only 1 alternative is not encoded
-    {0,Bytes};
-getchoice(Bytes,_NumChoices,1) ->
-    decode_small_number(Bytes);
-getchoice(Bytes,NumChoices,0) ->
-    decode_integer(Bytes,[{'ValueRange',{0,NumChoices-1}}]).
-
-getoptionals(Bytes,L,NumComp) when list(L) ->
-    {Blist,Bytes1} = getbits_as_list(length(L),Bytes),
-    {list_to_tuple(comptuple(Blist,L,NumComp,1)),Bytes1}.
-
-comptuple([Bh|Bt],[{_Name,Nr}|T],NumComp,Nr) ->
-    [Bh|comptuple(Bt,T,NumComp-1,Nr+1)];
-comptuple(Bl,[{Name,Tnr}|Tl],NumComp,Nr) ->
-    [0|comptuple(Bl,[{Name,Tnr}|Tl],NumComp-1,Nr+1)];
-comptuple(_B,_L,0,_Nr) ->
-    [];
-comptuple(B,O,N,Nr) ->
-    [0|comptuple(B,O,N-1,Nr+1)].
-
-getbits_as_list(Num,Bytes) ->
-    getbits_as_list(Num,Bytes,[]).
-
-getbits_as_list(0,Bytes,Acc) ->
-    {lists:reverse(Acc),Bytes};
-getbits_as_list(Num,Bytes,Acc) ->
-    {Bit,NewBytes} = getbit(Bytes),
-    getbits_as_list(Num-1,NewBytes,[Bit|Acc]).
-
-getbit(Bytes) ->
-%    io:format("getbit:~p~n",[Bytes]),
-    getbit1(Bytes).
-
-getbit1({7,[H|T]}) ->
-    {H band 1,{0,T}};
-getbit1({Pos,[H|T]}) ->
-    {(H bsr (7-Pos)) band 1,{(Pos+1) rem 8,[H|T]}};
-getbit1(Bytes) when list(Bytes) ->
-    getbit1({0,Bytes}).
-
-%% This could be optimized 
-getbits(Buffer,Num) ->
-%    io:format("getbits:Buffer = ~p~nNum=~p~n",[Buffer,Num]),
-    getbits(Buffer,Num,0).
-
-getbits(Buffer,0,Acc) ->
-    {Acc,Buffer};
-getbits(Buffer,Num,Acc) ->
-    {B,NewBuffer} = getbit(Buffer),
-    getbits(NewBuffer,Num-1,B + (Acc bsl 1)).
-
-
-getoctet(Bytes) when list(Bytes) ->
-    getoctet({0,Bytes});
-getoctet(Bytes) ->
-%    io:format("getoctet:Buffer = ~p~n",[Bytes]),
-    getoctet1(Bytes).
-
-getoctet1({0,[H|T]}) ->
-    {H,{0,T}};
-getoctet1({_Pos,[_,H|T]}) ->
-    {H,{0,T}}.
-
-align({0,L}) ->
-    {0,L};
-align({_Pos,[_H|T]}) ->
-    {0,T};
-align(Bytes) ->
-    {0,Bytes}.
-
-getoctets(Buffer,Num) ->
-%    io:format("getoctets:Buffer = ~p~nNum = ~p~n",[Buffer,Num]),
-    getoctets(Buffer,Num,0).
-
-getoctets(Buffer,0,Acc) ->
-    {Acc,Buffer};
-getoctets(Buffer,Num,Acc) ->
-    {Oct,NewBuffer} = getoctet(Buffer),
-    getoctets(NewBuffer,Num-1,(Acc bsl 8)+Oct). 
-
-getoctets_as_list(Buffer,Num) ->
-    getoctets_as_list(Buffer,Num,[]).
-
-getoctets_as_list(Buffer,0,Acc) ->
-    {lists:reverse(Acc),Buffer};
-getoctets_as_list(Buffer,Num,Acc) ->
-    {Oct,NewBuffer} = getoctet(Buffer),
-    getoctets_as_list(NewBuffer,Num-1,[Oct|Acc]).
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% set_choice(Alt,Choices,Altnum) -> ListofBitSettings
-%% Alt = atom()
-%% Altnum = integer() | {integer(),integer()}% number of alternatives
-%% Choices = [atom()] | {[atom()],[atom()]}
-%% When Choices is a tuple the first list is the Rootset and the
-%% second is the Extensions and then Altnum must also be a tuple with the
-%% lengths of the 2 lists 
-%%
-set_choice(Alt,{L1,L2},{Len1,_Len2}) ->
-    case set_choice_tag(Alt,L1) of
-	N when integer(N), Len1 > 1 ->
-	    [{bit,0}, % the value is in the root set
-	     encode_integer([{'ValueRange',{0,Len1-1}}],N)];
-	N when integer(N) ->
-	    [{bit,0}]; % no encoding if only 0 or 1 alternative
-	false ->
-	    [{bit,1}, % extension value
-	     case set_choice_tag(Alt,L2) of
-		 N2 when integer(N2) ->
-		     encode_small_number(N2);
-		 false ->
-		     unknown_choice_alt
-	     end]
-    end;
-set_choice(Alt,L,Len) ->
-    case set_choice_tag(Alt,L) of
-	N when integer(N), Len > 1 ->
-	    encode_integer([{'ValueRange',{0,Len-1}}],N);
-	N when integer(N) ->
-	    []; % no encoding if only 0 or 1 alternative
-	false ->
-	    [unknown_choice_alt]
-    end.
-
-set_choice_tag(Alt,Choices) ->
-    set_choice_tag(Alt,Choices,0).
-
-set_choice_tag(Alt,[Alt|_Rest],Tag) ->
-    Tag;
-set_choice_tag(Alt,[_H|Rest],Tag) ->
-    set_choice_tag(Alt,Rest,Tag+1);
-set_choice_tag(_,[],_) ->
-    false.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_open_type(Constraint, Value) -> CompleteList
-%% Value = list of bytes of an already encoded value (the list must be flat)
-%%         | binary
-%% Contraint = not used in this version
-%%
-encode_open_type(_Constraint, Val) when list(Val) -> 
-    [encode_length(undefined,length(Val)),align,
-	     {octets,Val}];
-encode_open_type(_Constraint, Val) when binary(Val) ->
-    [encode_length(undefined,size(Val)),align,
-	     {octets,binary_to_list(Val)}].
-%% the binary_to_list is not optimal but compatible with the current solution
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_open_type(Buffer,Constraint) -> Value
-%% Constraint is not used in this version
-%% Buffer = [byte] with PER encoded data 
-%% Value = [byte] with decoded data (which must be decoded again as some type)
-%%
-decode_open_type(Bytes, _Constraint) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    Bytes3 = align(Bytes2),
-    getoctets_as_list(Bytes3,Len).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_integer(Constraint,Value,NamedNumberList) -> CompleteList
-%% encode_integer(Constraint,Value) -> CompleteList
-%% encode_integer(Constraint,{Name,Value}) -> CompleteList
-%% 
-%%
-encode_integer(C,V,NamedNumberList) when atom(V) ->
-    case lists:keysearch(V,1,NamedNumberList) of
-	{value,{_,NewV}} -> 
-	    encode_integer(C,NewV);
-	_ -> 
-	    exit({error,{asn1,{namednumber,V}}})
-    end;
-encode_integer(C,V,_NamedNumberList) when integer(V) ->
-    encode_integer(C,V).
-    
-encode_integer(C,{Name,Val}) when atom(Name) ->
-    encode_integer(C,Val);
-
-encode_integer({Rc,_Ec},Val) ->
-    case (catch encode_integer(Rc,Val)) of
-	{'EXIT',{error,{asn1,_}}} ->
-	    [{bit,1},encode_unconstrained_number(Val)];
-	Encoded ->
-	    [{bit,0},Encoded]
-    end;
-encode_integer(C,Val ) when list(C) ->
-    case get_constraint(C,'SingleValue') of
-	no ->
-	    encode_integer1(C,Val);
-	V when integer(V),V == Val ->
-	    []; % a type restricted to a single value encodes to nothing
-	V when list(V) ->
-	    case lists:member(Val,V) of
-		true ->
-		    encode_integer1(C,Val);
-		_ ->
-		    exit({error,{asn1,{illegal_value,Val}}})
-	    end;
-	_ ->
-	    exit({error,{asn1,{illegal_value,Val}}})
-    end.
-
-encode_integer1(C, Val) ->		    
-    case VR = get_constraint(C,'ValueRange') of
-	no ->
-	    encode_unconstrained_number(Val);
-	{Lb,'MAX'} ->
-	    encode_semi_constrained_number(Lb,Val);
-	%% positive with range
-	{Lb,Ub} when Val >= Lb,
-		     Ub >= Val ->
-	    encode_constrained_number(VR,Val)
-    end.
-
-decode_integer(Buffer,Range,NamedNumberList) ->
-    {Val,Buffer2} = decode_integer(Buffer,Range),
-    case lists:keysearch(Val,2,NamedNumberList) of
-	{value,{NewVal,_}} -> {NewVal,Buffer2};
-	_ -> {Val,Buffer2}
-    end.
-
-decode_integer(Buffer,{Rc,_Ec}) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> decode_integer(Buffer2,Rc);
-	1 -> decode_unconstrained_number(Buffer2)
-    end;
-decode_integer(Buffer,undefined) ->
-    decode_unconstrained_number(Buffer);
-decode_integer(Buffer,C) ->
-    case get_constraint(C,'SingleValue') of
-	V when integer(V) ->
-	    {V,Buffer};
-	V when list(V) ->
-	    {Val,Buffer2} = decode_integer1(Buffer,C),
-	    case lists:member(Val,V) of
-		true ->
-		    {Val,Buffer2};
-		_ -> 
-		    exit({error,{asn1,{illegal_value,Val}}})
-	    end;
-	_ ->
-	    decode_integer1(Buffer,C)
-    end.
-
-decode_integer1(Buffer,C) ->
-    case VR = get_constraint(C,'ValueRange') of
-	no ->
-	    decode_unconstrained_number(Buffer);
-	{Lb, 'MAX'} ->
-	    decode_semi_constrained_number(Buffer,Lb);
-	{_,_} ->
-	    decode_constrained_number(Buffer,VR)
-    end.
-
-% X.691:10.6 Encoding of a normally small non-negative whole number
-% Use this for encoding of CHOICE index if there is an extension marker in 
-% the CHOICE
-encode_small_number({Name,Val}) when atom(Name) ->
-    encode_small_number(Val);
-encode_small_number(Val) when Val =< 63 ->
-    [{bit,0},{bits,6,Val}];
-encode_small_number(Val) ->
-    [{bit,1},encode_semi_constrained_number(0,Val)].
-
-decode_small_number(Bytes) ->
-    {Bit,Bytes2} = getbit(Bytes),
-    case Bit of
-	0 -> 
-	    getbits(Bytes2,6);
-	1 ->
-	    decode_semi_constrained_number(Bytes2,{0,'MAX'})
-    end.
-
-% X.691:10.7 Encoding of a semi-constrained whole number
-%% might be an optimization encode_semi_constrained_number(0,Val) ->
-encode_semi_constrained_number(C,{Name,Val}) when atom(Name) ->
-    encode_semi_constrained_number(C,Val);
-encode_semi_constrained_number({Lb,'MAX'},Val) ->
-    encode_semi_constrained_number(Lb,Val);
-encode_semi_constrained_number(Lb,Val) ->
-    Val2 = Val - Lb,
-    Octs = eint_positive(Val2),
-    [encode_length(undefined,length(Octs)),{octets,Octs}].
-
-decode_semi_constrained_number(Bytes,{Lb,_}) ->
-    decode_semi_constrained_number(Bytes,Lb);
-decode_semi_constrained_number(Bytes,Lb) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {V,Bytes3} = getoctets(Bytes2,Len),
-    {V+Lb,Bytes3}.
-
-encode_constrained_number(Range,{Name,Val}) when atom(Name) ->
-    encode_constrained_number(Range,Val);
-encode_constrained_number({Lb,Ub},Val) when Val >= Lb, Ub >= Val -> 
-    Range = Ub - Lb + 1,
-    Val2 = Val - Lb,
-    if 
-	Range  == 2 ->
-	    {bits,1,Val2};
-	Range  =< 4 -> 
-	    {bits,2,Val2};
-	Range  =< 8 ->
-	    {bits,3,Val2};
-	Range  =< 16 ->
-	    {bits,4,Val2};
-	Range  =< 32 ->
-	    {bits,5,Val2};
-	Range  =< 64 ->
-	    {bits,6,Val2};
-	Range  =< 128 ->
-	    {bits,7,Val2};
-	Range  =< 255 ->
-	    {bits,8,Val2};
-	Range  =< 256 ->
-	    {octets,1,Val2};
-	Range  =< 65536 ->
-	    {octets,2,Val2};
-	Range =< 16#1000000  ->
-	    Octs = eint_positive(Val2),
-	    [encode_length({1,3},length(Octs)),{octets,Octs}];
-	Range =< 16#100000000  ->
-	    Octs = eint_positive(Val2),
-	    [encode_length({1,4},length(Octs)),{octets,Octs}];
-	Range =< 16#10000000000  ->
-	    Octs = eint_positive(Val2),
-	    [encode_length({1,5},length(Octs)),{octets,Octs}];
-       true  ->
-	    exit({not_supported,{integer_range,Range}})
-    end.
-
-decode_constrained_number(Buffer,{Lb,Ub}) ->
-    Range = Ub - Lb + 1,
-%    Val2 = Val - Lb,
-    {Val,Remain} = 
-	if 
-	   Range  == 2 ->
-		getbits(Buffer,1);
-	   Range  =< 4 -> 
-		getbits(Buffer,2);
-	   Range  =< 8 ->
-		getbits(Buffer,3);
-	   Range  =< 16 ->
-		getbits(Buffer,4);
-	   Range  =< 32 ->
-		getbits(Buffer,5);
-	   Range  =< 64 ->
-		getbits(Buffer,6);
-	   Range  =< 128 ->
-		getbits(Buffer,7);
-	   Range  =< 255 ->
-		getbits(Buffer,8);
-	   Range  =< 256 ->
-		getoctets(Buffer,1);
-	   Range  =< 65536 ->
-		getoctets(Buffer,2);
-	   Range =< 16#1000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,3}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	   Range =< 16#100000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,4}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	   Range =< 16#10000000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,5}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	   true  ->
-		exit({not_supported,{integer_range,Range}})
-	end,
-    {Val+Lb,Remain}.
-
-% X.691:10.8 Encoding of an unconstrained whole number
-
-encode_unconstrained_number(Val) when Val >= 0 ->
-    Oct = eint(Val,[]),
-    [{debug,unconstrained_number},
-     encode_length({0,'MAX'},length(Oct)),
-     {octets,Oct}];
-encode_unconstrained_number(Val) -> % negative
-    Oct = enint(Val,[]),
-    [{debug,unconstrained_number},
-     encode_length({0,'MAX'},length(Oct)),
-     {octets,Oct}].
-
-%% used for positive Values which don't need a sign bit
-eint_positive(Val) ->
-    case eint(Val,[]) of
-	[0,B1|T] ->
-	    [B1|T];
-	T -> 
-	    T
-    end.
-
-eint(0, [B|Acc]) when B < 128 ->
-    [B|Acc];
-eint(N, Acc) ->
-    eint(N bsr 8, [N band 16#ff| Acc]).
-
-enint(-1, [B1|T]) when B1 > 127 ->
-    [B1|T];
-enint(N, Acc) ->
-    enint(N bsr 8, [N band 16#ff|Acc]).
-
-%% used for signed positive values
-
-%eint(Val, Ack) ->
-%    X = Val band 255,
-%    Next = Val bsr 8,
-%    if
-%	Next == 0, X >= 127 ->
-%	    [0,X|Ack];
-%	Next == 0 ->
-%	    [X|Ack];
-%	true ->
-%	    eint(Next,[X|Ack])
-%    end.
-
-%%% used for signed negative values
-%enint(Val, Acc) ->
-%    NumOctets = if 
-%		    -Val < 16#80 -> 1;
-%		    -Val < 16#8000 ->2;
-%		    -Val < 16#800000 ->3;
-%		    -Val < 16#80000000 ->4;
-%		    -Val < 16#8000000000 ->5;
-%		    -Val < 16#800000000000 ->6;
-%		    -Val < 16#80000000000000 ->7;
-%		    -Val < 16#8000000000000000 ->8;
-%		    -Val < 16#800000000000000000 ->9
-%		end,
-%    enint(Val,Acc,NumOctets).
-
-%enint(Val, Acc,0) ->
-%    Acc;
-%enint(Val, Acc,NumOctets) ->
-%    enint(Val bsr 8,[Val band 255|Acc],NumOctets-1).
-    
-
-decode_unconstrained_number(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Ints,Bytes3} = getoctets_as_list(Bytes2,Len),
-    {dec_integer(Ints),Bytes3}.
-
-dec_pos_integer(Ints) ->
-    decpint(Ints, 8 * (length(Ints) - 1)).
-dec_integer(Ints) when hd(Ints) band 255 =< 127 -> %% Positive number
-    decpint(Ints, 8 * (length(Ints) - 1));
-dec_integer(Ints) ->                        %% Negative
-    decnint(Ints,  8 * (length(Ints) - 1)).
-
-decpint([Byte|Tail], Shift) ->
-    (Byte bsl Shift) bor decpint(Tail, Shift-8);
-decpint([], _) -> 0.
-
-decnint([Byte|Tail], Shift) ->
-    (-128 + (Byte band 127) bsl Shift) bor decpint(Tail, Shift-8).
-
-minimum_octets(Val) ->
-    minimum_octets(Val,[]).
-
-minimum_octets(Val,Acc) when Val > 0 -> 
-    minimum_octets((Val bsr 8),[Val band 16#FF|Acc]);
-minimum_octets(0,Acc) ->
-    Acc.
-
-
-%% X.691:10.9 Encoding of a length determinant
-%%encode_small_length(undefined,Len) -> % null means no UpperBound
-%%    encode_small_number(Len).
-
-%% X.691:10.9.3.5 
-%% X.691:10.9.3.7
-encode_length(undefined,Len) -> % un-constrained
-    if 
-	Len < 128 ->
-	    {octet,Len band 16#7F};
-	Len < 16384 ->
-	    {octets,2,2#1000000000000000 bor Len};
-	true  ->
-	    exit({error,{asn1,{encode_length,{nyi,above_16k}}}})
-    end;
-	
-encode_length({0,'MAX'},Len) ->
-    encode_length(undefined,Len);
-encode_length({Lb,Ub},Len) when Ub =< 65535 ,Lb >= 0 -> % constrained
-    encode_constrained_number({Lb,Ub},Len);
-encode_length(SingleValue,_Len) when integer(SingleValue) ->
-    [].
-
-encode_small_length(Len) when Len =< 64 ->
-    [{bit,0},{bits,6,Len-1}];
-encode_small_length(Len) ->
-    [{bit,1},encode_length(undefined,Len)].
-
-decode_small_length(Buffer) ->
-    case getbit(Buffer) of
-	{0,Remain} -> 
-	    {Bits,Remain2} = getbits(Remain,6),
-	    {Bits+1,Remain2};
-	{1,Remain} -> 
-	    decode_length(Remain,undefined)
-    end.
-
-decode_length(Buffer) ->
-    decode_length(Buffer,undefined).
-
-decode_length(Buffer,undefined)  -> % un-constrained
-    Buffer2 = align(Buffer),
-    {Bits,_} = getbits(Buffer2,2),
-    case Bits of
-	2 -> 
-	    {Val,Bytes3} = getoctets(Buffer2,2),
-	    {(Val band 16#3FFF),Bytes3};
-	3 ->
-	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}});
-	_ ->
-	    {Val,Bytes3} = getoctet(Buffer2),
-	    {Val band 16#7F,Bytes3}
-    end;
-
-decode_length(Buffer,{Lb,Ub}) when Ub =< 65535 ,Lb >= 0 -> % constrained
-    decode_constrained_number(Buffer,{Lb,Ub});
-						% X.691:10.9.3.5 
-decode_length(Buffer,{_,_Lb,_Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub
-    case getbit(Buffer) of
-	{0,Remain} -> 
-	    getbits(Remain,7);
-	{1,_Remain} -> 
-	    {Val,Remain2} = getoctets(Buffer,2),
-	    {Val band 2#0111111111111111, Remain2}
-    end;
-decode_length(Buffer,SingleValue) when integer(SingleValue) ->
-    {SingleValue,Buffer}.
-
-
-% X.691:11
-encode_boolean({Name,Val}) when atom(Name) ->
-    encode_boolean(Val);
-encode_boolean(true) ->
-    {bit,1};
-encode_boolean(false) ->
-    {bit,0};
-encode_boolean(Val) ->
-    exit({error,{asn1,{encode_boolean,Val}}}).
-
-
-decode_boolean(Buffer) -> %when record(Buffer,buffer)
-    case getbit(Buffer) of
-	{1,Remain} -> {true,Remain};
-	{0,Remain} -> {false,Remain}
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% X.691:12 
-%% ENUMERATED
-%%
-%% encode_enumerated(C,Value,NamedNumberTup) -> CompleteList
-%%
-%% 
-
-encode_enumerated(C,{Name,Value},NamedNumberList) when 
-  atom(Name),list(NamedNumberList) ->
-    encode_enumerated(C,Value,NamedNumberList);
-
-%% ENUMERATED with extension mark
-encode_enumerated(_C,{asn1_enum,Value},{_Nlist1,Nlist2}) when Value >= length(Nlist2) ->
-    [{bit,1},encode_small_number(Value)];
-encode_enumerated(C,Value,{Nlist1,Nlist2}) ->
-    case enum_search(Value,Nlist1,0) of
-	NewV when integer(NewV) -> 
-	    [{bit,0},encode_integer(C,NewV)];
-	false -> 
-	    case enum_search(Value,Nlist2,0) of
-		ExtV when integer(ExtV) ->
-		    [{bit,1},encode_small_number(ExtV)];
-		false ->
-		    exit({error,{asn1,{encode_enumerated,Value}}})
-	    end
-    end;
-
-encode_enumerated(C,Value,NamedNumberList) when list(NamedNumberList) ->
-    case enum_search(Value,NamedNumberList,0) of
-	NewV when integer(NewV) -> 
-	    encode_integer(C,NewV);
-	false -> 
-	    exit({error,{asn1,{encode_enumerated,Value}}})
-    end.
-
-%% returns the ordinal number from 0 ,1 ... in the list where Name is found
-%% or false if not found
-%%
-enum_search(Name,[Name|_NamedNumberList],Acc) ->
-    Acc;
-enum_search(Name,[_H|T],Acc) ->
-    enum_search(Name,T,Acc+1);
-enum_search(_,[],_) ->
-    false. % name not found !error
-    
-%% ENUMERATED with extension marker
-decode_enumerated(Buffer,C,{Ntup1,Ntup2}) when tuple(Ntup1), tuple(Ntup2) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> % not an extension value
-	    {Val,Buffer3} = decode_integer(Buffer2,C),
-	    case catch (element(Val+1,Ntup1)) of
-		NewVal when atom(NewVal) -> {NewVal,Buffer3};
-		_Error -> exit({error,{asn1,{decode_enumerated,{Val,[Ntup1,Ntup2]}}}})
-	    end;
-	1 -> % this an extension value
-	    {Val,Buffer3} = decode_small_number(Buffer2),
-	    case catch (element(Val+1,Ntup2)) of
-		NewVal when atom(NewVal) -> {NewVal,Buffer3};
-		_ -> {{asn1_enum,Val},Buffer3}
-	    end
-    end;
-
-decode_enumerated(Buffer,C,NamedNumberTup) when tuple(NamedNumberTup) ->
-    {Val,Buffer2} = decode_integer(Buffer,C),
-    case catch (element(Val+1,NamedNumberTup)) of
-	NewVal when atom(NewVal) -> {NewVal,Buffer2};
-	_Error -> exit({error,{asn1,{decode_enumerated,{Val,NamedNumberTup}}}})
-    end.
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Bitstring value, ITU_T X.690 Chapter 8.5
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% encode bitstring value
-%%===============================================================================
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% bitstring NamedBitList
-%% Val can be  of:
-%% - [identifiers] where only named identifers are set to one, 
-%%   the Constraint must then have some information of the 
-%%   bitlength.
-%% - [list of ones and zeroes] all bits 
-%% - integer value representing the bitlist
-%% C is constraint Len, only valid when identifiers
-
-%% when the value is a list of named bits
-encode_bit_string(C, [FirstVal | RestVal], NamedBitList) when atom(FirstVal) ->
-    ToSetPos = get_all_bitposes([FirstVal | RestVal], NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos,0),
-    encode_bit_string(C,BitList,NamedBitList);
-
-encode_bit_string(C, [{bit,No} | RestVal], NamedBitList) ->
-    ToSetPos = get_all_bitposes([{bit,No} | RestVal], NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos,0),
-    encode_bit_string(C,BitList,NamedBitList);
-
-%% when the value is a list of ones and zeroes
-
-encode_bit_string(C, BitListValue, _NamedBitList) when list(BitListValue) ->
-    %% first remove any trailing zeroes
-    Bl1 = lists:dropwhile(fun(0)->true;(1)->false end,lists:reverse(BitListValue)),
-    BitList = [{bit,X} || X <- lists:reverse(Bl1)],
-    case get_constraint(C,'SizeConstraint') of
-	0 -> % fixed length
-	    []; % nothing to encode
-	V when integer(V),V=<16 -> % fixed length 16 bits or less
-	    pad_list(V,BitList);
-	V when integer(V) -> % fixed length more than 16 bits
-	    [align,pad_list(V,BitList)];
-	{Lb,Ub} when integer(Lb),integer(Ub) ->
-	    [encode_length({Lb,Ub},length(BitList)),align,BitList];
-	no ->
-	    [encode_length(undefined,length(BitList)),align,BitList]
-    end;
-
-%% when the value is an integer
-encode_bit_string(C, IntegerVal, NamedBitList) ->
-    BitList = int_to_bitlist(IntegerVal),
-    encode_bit_string(C,BitList,NamedBitList).
-   
-
-    
-    
-%%%%%%%%%%%%%%%
-%% The result is presented as a list of named bits (if possible)
-%% else as a list of 0 and 1.
-%% 
-decode_bit_string(Buffer, C, NamedNumberList) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 -> % fixed length
-	    {[],Buffer}; % nothing to encode
-	V when integer(V),V=<16 -> % fixed length 16 bits or less
-	    bit_list_to_named(Buffer,V,NamedNumberList);
-	V when integer(V) -> % fixed length 16 bits or less
-	    Bytes2 = align(Buffer),
-	    bit_list_to_named(Bytes2,V,NamedNumberList);
-	{Lb,Ub} when integer(Lb),integer(Ub) ->
-	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
-	    Bytes3 = align(Bytes2),
-	    bit_list_to_named(Bytes3,Len,NamedNumberList);
-	no ->
-	    {Len,Bytes2} = decode_length(Buffer,undefined),
-	    Bytes3 = align(Bytes2),
-	    bit_list_to_named(Bytes3,Len,NamedNumberList)
-    end.
-
-%% if no named bits are declared we will return a
-%% BitList = [0 | 1]
-
-bit_list_to_named(Buffer,Len,[]) ->
-    getbits_as_list(Len,Buffer);
-
-%% if there are named bits declared we will return a named
-%% BitList where the names are atoms and unnamed bits represented
-%% as {bit,Pos}
-%% BitList = [atom() | {bit,Pos}]
-%% Pos = integer()
-
-bit_list_to_named(Buffer,Len,NamedNumberList) ->
-    {BitList,Rest} = getbits_as_list(Len,Buffer),
-    {bit_list_to_named1(0,BitList,NamedNumberList,[]), Rest}.
-
-bit_list_to_named1(Pos,[0|Bt],Names,Acc) ->
-    bit_list_to_named1(Pos+1,Bt,Names,Acc);
-bit_list_to_named1(Pos,[1|Bt],Names,Acc) ->
-    case lists:keysearch(Pos,2,Names) of
-	{value,{Name,_}} ->
-	    bit_list_to_named1(Pos+1,Bt,Names,[Name|Acc]);
-	_  -> 
-	    bit_list_to_named1(Pos+1,Bt,Names,[{bit,Pos}|Acc])
-    end;
-bit_list_to_named1(_Pos,[],_Names,Acc) ->
-    lists:reverse(Acc).
-
-
-
-%%%%%%%%%%%%%%%
-%% 
-
-int_to_bitlist(0) ->
-    [];
-int_to_bitlist(Int) when integer(Int), Int >= 0 ->
-    [Int band 1 | int_to_bitlist(Int bsr 1)].
-
-
-%%%%%%%%%%%%%%%%%%
-%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
-%%   [sorted_list_of_bitpositions_to_set]
-
-get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
-    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
-
-get_all_bitposes([Val | Rest], NamedBitList, Ack) ->
-    case lists:keysearch(Val, 1, NamedBitList) of
-	{value, {_ValName, ValPos}} ->
-	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
-	_ ->
-	    exit({error,{asn1, {bitstring_namedbit, Val}}})
-    end;
-get_all_bitposes([], _NamedBitList, Ack) ->
-    lists:sort(Ack).
-
-%%%%%%%%%%%%%%%%%%
-%% make_and_set_list([list of positions to set to 1])->
-%% returns list with all in SetPos set.
-%% in positioning in list the first element is 0, the second 1 etc.., but
-%% 
-
-make_and_set_list([XPos|SetPos], XPos) ->
-    [1 | make_and_set_list(SetPos, XPos + 1)];
-make_and_set_list([Pos|SetPos], XPos) ->
-    [0 | make_and_set_list([Pos | SetPos], XPos + 1)];
-make_and_set_list([], _) ->
-    [].
-
-%%%%%%%%%%%%%%%%%
-%% pad_list(N,BitList) -> PaddedList
-%% returns a padded (with trailing {bit,0} elements) list of length N
-%% if Bitlist contains more than N significant bits set an exit asn1_error 
-%% is generated
-
-pad_list(0,BitList) ->
-    case BitList of
-	[] -> [];
-	_ -> exit({error,{asn1,{range_error,{bit_string,BitList}}}})
-    end;
-pad_list(N,[Bh|Bt]) ->
-    [Bh|pad_list(N-1,Bt)];
-pad_list(N,[]) ->
-    [{bit,0},pad_list(N-1,[])].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% X.691:16
-%% encode_octet_string(Constraint,ExtensionMarker,Val)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-encode_octet_string(C,{Name,Val}) when atom(Name) ->
-    encode_octet_string(C,false,Val);
-encode_octet_string(C,Val) ->
-    encode_octet_string(C,false,Val).
-
-encode_octet_string(_C,true,_Val) -> 
-    exit({error,{asn1,{'not_supported',extensionmarker}}});
-encode_octet_string(C,false,Val) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 ->
-	    [];
-	1 ->
-	    [V] = Val,
-	    {bits,8,V};
-	2 ->
-	    [V1,V2] = Val,
-	    [{bits,8,V1},{bits,8,V2}];
-	Sv when Sv =<65535, Sv == length(Val) -> % fixed length
-	    [align,{octets,Val}];
-	{Lb,Ub}  ->
-	    [encode_length({Lb,Ub},length(Val)),align,
-	     {octets,Val}];
-	Sv when list(Sv) ->
-	    [encode_length({hd(Sv),lists:max(Sv)},length(Val)),align,
-	     {octets,Val}];
-	no  ->
-	    [encode_length(undefined,length(Val)),align,
-	     {octets,Val}]
-    end.
-
-decode_octet_string(Bytes,Range) ->
-    decode_octet_string(Bytes,Range,false).
-
-decode_octet_string(Bytes,C,false) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 ->
-	    {[],Bytes};
-	1 ->
-	    {B1,Bytes2} = getbits(Bytes,8),
-	    {[B1],Bytes2};
-	2 ->
-	    {B1,Bytes2}= getbits(Bytes,8),
-	    {B2,Bytes3}= getbits(Bytes2,8),
-	    {[B1,B2],Bytes3};
-	{_,0} ->
-	    {[],Bytes};
-	Sv when integer(Sv), Sv =<65535 -> % fixed length
-	    Bytes2 = align(Bytes),
-	    getoctets_as_list(Bytes2,Sv);
-	{Lb,Ub}  ->
-	    {Len,Bytes2} = decode_length(Bytes,{Lb,Ub}),
-	    Bytes3 = align(Bytes2),
-	    getoctets_as_list(Bytes3,Len);
-	Sv when list(Sv) ->
-	    {Len,Bytes2} = decode_length(Bytes,{hd(Sv),lists:max(Sv)}),
-	    Bytes3 = align(Bytes2),
-	    getoctets_as_list(Bytes3,Len);
-	no  ->
-	    {Len,Bytes2} = decode_length(Bytes,undefined),
-	    Bytes3 = align(Bytes2),
-	    getoctets_as_list(Bytes3,Len)
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Restricted char string types 
-%% (NumericString, PrintableString,VisibleString,IA5String,BMPString,UniversalString)
-%% X.691:26 and X.680:34-36
-%%encode_restricted_string(aligned,'BMPString',Constraints,Extension,Val)
-
-encode_restricted_string(aligned,StringType,C,Val) ->
-encode_restricted_string(aligned,StringType,C,false,Val).
-
-
-encode_restricted_string(aligned,StringType,C,_Ext,{Name,Val}) when atom(Name) ->
-    encode_restricted_string(aligned,StringType,C,false,Val);
-encode_restricted_string(aligned,StringType,C,_Ext,Val) ->
-    Result = chars_encode(C,StringType,Val),
-    NumBits = get_NumBits(C,StringType),
-    case get_constraint(C,'SizeConstraint') of
-	Ub when integer(Ub), Ub*NumBits =< 16  ->
-	    case {StringType,Result} of
-		{'BMPString',{octets,Ol}} ->
-		    [{bits,8,Oct}||Oct <- Ol];
-		_ ->
-		    Result
-	    end;
-	0 ->
-	    [];
-	Ub when integer(Ub),Ub =<65535 -> % fixed length
-	    [align,Result];
-	{Ub,Lb} ->
-	    [encode_length({Ub,Lb},length(Val)),align,Result];
-	Vl when list(Vl) ->
-	    [encode_length({lists:min(Vl),lists:max(Vl)},length(Val)),align,Result];
-	no  ->
-	    [encode_length(undefined,length(Val)),align,Result]
-    end.
-
-decode_restricted_string(Bytes,aligned,StringType,C) ->
-    decode_restricted_string(Bytes,aligned,StringType,C,false).
-
-decode_restricted_string(Bytes,aligned,StringType,C,_Ext) ->
-    NumBits = get_NumBits(C,StringType),
-    case get_constraint(C,'SizeConstraint') of
-	Ub when integer(Ub), Ub*NumBits =< 16  ->
-	    chars_decode(Bytes,NumBits,StringType,C,Ub);
-	Ub when integer(Ub),Ub =<65535 -> % fixed length
-	    Bytes1 = align(Bytes),
-	    chars_decode(Bytes1,NumBits,StringType,C,Ub);
-	0 ->
-	    {[],Bytes};
-	Vl when list(Vl) ->
-	    {Len,Bytes1} = decode_length(Bytes,{hd(Vl),lists:max(Vl)}),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len);
-	no  ->
-	    {Len,Bytes1} = decode_length(Bytes,undefined),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len);
-	{Lb,Ub}->
-	    {Len,Bytes1} = decode_length(Bytes,{Lb,Ub}),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len)
-    end.
-
-
-
-encode_BMPString(C,Val) ->
-    encode_restricted_string(aligned,'BMPString',C,false,Val).
-decode_BMPString(Bytes,C) ->
-    decode_restricted_string(Bytes,aligned,'BMPString',C,false).
-
-encode_GeneralString(C,Val) ->
-    encode_restricted_string(aligned,'GeneralString',C,false,Val).
-decode_GeneralString(Bytes,C) ->
-    decode_restricted_string(Bytes,aligned,'GeneralString',C,false).
-
-encode_GraphicString(C,Val) ->
-    encode_restricted_string(aligned,'GraphicString',C,false,Val).
-decode_GraphicString(Bytes,C) ->
-    decode_restricted_string(Bytes,aligned,'GraphicString',C,false).
-
-encode_IA5String(C,Val) ->
-    encode_restricted_string(aligned,'IA5String',C,false,Val).
-decode_IA5String(Bytes,C) ->
-    decode_restricted_string(Bytes,aligned,'IA5String',C,false).
-
-encode_NumericString(C,Val) ->
-    encode_restricted_string(aligned,'NumericString',C,false,Val).
-decode_NumericString(Bytes,C) ->
-    decode_restricted_string(Bytes,aligned,'NumericString',C,false).
-
-encode_PrintableString(C,Val) ->
-    encode_restricted_string(aligned,'PrintableString',C,false,Val).
-decode_PrintableString(Bytes,C) ->
-    decode_restricted_string(Bytes,aligned,'PrintableString',C,false).
-
-encode_TeletexString(C,Val) -> % equivalent with T61String
-    encode_restricted_string(aligned,'TeletexString',C,false,Val).
-decode_TeletexString(Bytes,C) ->
-    decode_restricted_string(Bytes,aligned,'TeletexString',C,false).
-
-encode_UniversalString(C,Val) ->
-    encode_restricted_string(aligned,'UniversalString',C,false,Val).
-decode_UniversalString(Bytes,C) ->
-    decode_restricted_string(Bytes,aligned,'UniversalString',C,false).
-
-encode_VideotexString(C,Val) ->
-    encode_restricted_string(aligned,'VideotexString',C,false,Val).
-decode_VideotexString(Bytes,C) ->
-    decode_restricted_string(Bytes,aligned,'VideotexString',C,false).
-
-encode_VisibleString(C,Val) -> % equivalent with ISO646String
-    encode_restricted_string(aligned,'VisibleString',C,false,Val).
-decode_VisibleString(Bytes,C) ->
-    decode_restricted_string(Bytes,aligned,'VisibleString',C,false).
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% getBMPChars(Bytes,Len) ->{BMPcharList,RemainingBytes}
-%%
-getBMPChars(Bytes,1) ->
-    {O1,Bytes2} = getbits(Bytes,8),
-    {O2,Bytes3} = getbits(Bytes2,8),
-    if 
-	O1 == 0 ->
-	    {[O2],Bytes3};
-	true ->
-	    {[{O1,O2}],Bytes3}
-    end;
-getBMPChars(Bytes,Len) ->
-    getBMPChars(Bytes,Len,[]).
-
-getBMPChars(Bytes,0,Acc) ->
-    {lists:reverse(Acc),Bytes};
-getBMPChars(Bytes,Len,Acc) ->
-    {Octs,Bytes1} = getoctets_as_list(Bytes,2),
-    case Octs of
-	[0,O2] ->
-	    getBMPChars(Bytes1,Len-1,[O2|Acc]);
-	[O1,O2]->
-	    getBMPChars(Bytes1,Len-1,[{O1,O2}|Acc])
-    end.
-
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% chars_encode(C,StringType,Value) -> ValueList
-%%
-%% encodes chars according to the per rules taking the constraint PermittedAlphabet 
-%% into account.
-%% This function does only encode the value part and NOT the length
-
-chars_encode(C,StringType,Value) ->
-    case {StringType,get_constraint(C,'PermittedAlphabet')} of
-	{'UniversalString',{_,_Sv}} ->
-	    exit({error,{asn1,{'not implemented',"UniversalString with PermittedAlphabet constraint"}}});
-	{'BMPString',{_,_Sv}} ->
-	    exit({error,{asn1,{'not implemented',"BMPString with PermittedAlphabet constraint"}}});
-	_ ->
-	    {NumBits,CharOutTab} = {get_NumBits(C,StringType),get_CharOutTab(C,StringType)}, 
-	    chars_encode2(Value,NumBits,CharOutTab)
-    end.
-
-chars_encode2([H|T],NumBits,{Min,Max,notab}) when  H =< Max, H >= Min ->
-    [{bits,NumBits,H-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([H|T],NumBits,{Min,Max,Tab}) when H =< Max, H >= Min ->
-    [{bits,NumBits,element(H-Min+1,Tab)}|chars_encode2(T,NumBits,{Min,Max,Tab})];
-chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,notab}) -> 
-    %% no value range check here (ought to be, but very expensive)
-    [{bits,NumBits,(A*B*C*D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,Tab}) -> 
-    %% no value range check here (ought to be, but very expensive)
-    [{bits,NumBits,element((A*B*C*D)-Min,Tab)}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([H|_T],_NumBits,{_Min,_Max,_Tab}) ->
-    exit({error,{asn1,{illegal_char_value,H}}});
-chars_encode2([],_,_) ->
-    [].
-
-
-get_NumBits(C,StringType) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} ->
-	    charbits(length(Sv),aligned);
-	no ->
-	    case StringType of
-		'GeneralString' ->
-		    exit({error,{asn1,{not implemented,'GeneralString'}}});
-		'GraphicString' ->
-		    exit({error,{asn1,{not implemented,'GraphicString'}}});
-		'TeletexString' ->
-		    exit({error,{asn1,{not implemented,'TeletexString'}}});
-		'VideotexString' ->
-		    exit({error,{asn1,{not implemented,'VideotexString'}}});
-		'IA5String' ->
-		    charbits(128,aligned); % 16#00..16#7F
-		'VisibleString' ->
-		    charbits(95,aligned); % 16#20..16#7E
-		'PrintableString' ->
-		    charbits(74,aligned); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-		'NumericString' ->
-		    charbits(11,aligned); % $ ,"0123456789"
-		'UniversalString' ->
-		    32;
-		'BMPString' ->
-		    16
-	    end
-    end.
-
-%%Maybe used later
-%%get_MaxChar(C,StringType) ->
-%%    case get_constraint(C,'PermittedAlphabet') of
-%%	{'SingleValue',Sv} ->
-%%	    lists:nth(length(Sv),Sv);
-%%	no ->
-%%	    case StringType of
-%%		'IA5String' ->
-%%		    16#7F; % 16#00..16#7F
-%%		'VisibleString' ->
-%%		    16#7E; % 16#20..16#7E
-%%		'PrintableString' ->
-%%		    $z; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-%%		'NumericString' ->
-%%		    $9; % $ ,"0123456789"
-%%		'UniversalString' ->
-%%		    16#ffffffff;
-%%		'BMPString' ->
-%%		    16#ffff
-%%	    end
-%%    end.
-
-%%Maybe used later
-%%get_MinChar(C,StringType) ->
-%%    case get_constraint(C,'PermittedAlphabet') of
-%%	{'SingleValue',Sv} ->
-%%	    hd(Sv);
-%%	no ->
-%%	    case StringType of
-%%		'IA5String' ->
-%%		    16#00; % 16#00..16#7F
-%%		'VisibleString' ->
-%%		    16#20; % 16#20..16#7E
-%%		'PrintableString' ->
-%%		    $\s; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-%%		'NumericString' ->
-%%		    $\s; % $ ,"0123456789"
-%%		'UniversalString' ->
-%%		    16#00;
-%%		'BMPString' ->
-%%		    16#00
-%%	    end
-%%    end.
-
-get_CharOutTab(C,StringType) ->
-    get_CharTab(C,StringType,out).
-
-get_CharInTab(C,StringType) ->
-    get_CharTab(C,StringType,in).
-
-get_CharTab(C,StringType,InOut) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} ->
-	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv,InOut);
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    {0,16#7F,notab};
-		'VisibleString' ->
-		    get_CharTab2(C,StringType,16#20,16#7F,notab,InOut);
-		'PrintableString' ->
-		    Chars = lists:sort(
-			" '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
-		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars,InOut);
-		'NumericString' ->
-		    get_CharTab2(C,StringType,16#20,$9," 0123456789",InOut);
-		'UniversalString' ->
-		    {0,16#FFFFFFFF,notab};
-		'BMPString' ->
-		    {0,16#FFFF,notab}
-	    end
-    end.
-
-get_CharTab2(C,StringType,Min,Max,Chars,InOut) ->
-    BitValMax = (1 bsl get_NumBits(C,StringType))-1,
-    if
-	Max =< BitValMax ->
-	    {0,Max,notab};
-	true ->
-	    case InOut of
-		out ->
-		    {Min,Max,create_char_tab(Min,Chars)};
-		in  ->
-		    {Min,Max,list_to_tuple(Chars)}
-	    end
-    end.
-
-create_char_tab(Min,L) ->
-    list_to_tuple(create_char_tab(Min,L,0)).
-create_char_tab(Min,[Min|T],V) ->
-    [V|create_char_tab(Min+1,T,V+1)];
-create_char_tab(_Min,[],_V) ->
-    [];
-create_char_tab(Min,L,V) ->
-    [false|create_char_tab(Min+1,L,V)].
-
-%% This very inefficient and should be moved to compiletime
-charbits(NumOfChars,aligned) ->
-    case charbits(NumOfChars) of
-	1 -> 1;
-	2 -> 2;
-	B when B > 2, B =< 4 -> 4;
-	B when B > 4, B =< 8 -> 8;
-	B when B > 8, B =< 16 -> 16; 
-	B when B > 16, B =< 32 -> 32
-    end.
-	    
-charbits(NumOfChars) when NumOfChars =< 2 -> 1;
-charbits(NumOfChars) when NumOfChars =< 4 -> 2;
-charbits(NumOfChars) when NumOfChars =< 8 -> 3;
-charbits(NumOfChars) when NumOfChars =< 16 -> 4;
-charbits(NumOfChars) when NumOfChars =< 32 -> 5;
-charbits(NumOfChars) when NumOfChars =< 64 -> 6;
-charbits(NumOfChars) when NumOfChars =< 128 -> 7;
-charbits(NumOfChars) when NumOfChars =< 256 -> 8;
-charbits(NumOfChars) when NumOfChars =< 512 -> 9;
-charbits(NumOfChars) when NumOfChars =< 1024 -> 10;
-charbits(NumOfChars) when NumOfChars =< 2048 -> 11;
-charbits(NumOfChars) when NumOfChars =< 4096 -> 12;
-charbits(NumOfChars) when NumOfChars =< 8192 -> 13;
-charbits(NumOfChars) when NumOfChars =< 16384 -> 14;
-charbits(NumOfChars) when NumOfChars =< 32768 -> 15;
-charbits(NumOfChars) when NumOfChars =< 65536 -> 16;
-charbits(NumOfChars) when integer(NumOfChars) ->
-    16 + charbits1(NumOfChars bsr 16).
-
-charbits1(0) ->
-    0;
-charbits1(NumOfChars) ->
-    1 + charbits1(NumOfChars bsr 1).
-
-
-chars_decode(Bytes,_,'BMPString',C,Len) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	no ->
-	    getBMPChars(Bytes,Len);
-	_ ->
-	    exit({error,{asn1,
-			 {'not implemented',
-			  "BMPString with PermittedAlphabet constraint"}}})
-    end;
-chars_decode(Bytes,NumBits,StringType,C,Len) ->	
-    CharInTab = get_CharInTab(C,StringType),
-    chars_decode2(Bytes,CharInTab,NumBits,Len).
-
-
-chars_decode2(Bytes,CharInTab,NumBits,Len) ->
-    chars_decode2(Bytes,CharInTab,NumBits,Len,[]).
-
-chars_decode2(Bytes,_CharInTab,_NumBits,0,Acc) ->
-    {lists:reverse(Acc),Bytes};
-chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    Result = case minimum_octets(Char+Min) of
-	[NewChar] -> NewChar;
-	[C1,C2] -> {0,0,C1,C2};
-	[C1,C2,C3] -> {0,C1,C2,C3};
-	[C1,C2,C3,C4] -> {C1,C2,C3,C4}
-    end,
-    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
-chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Char+Min|Acc]);
-
-%% BMPString and UniversalString with PermittedAlphabet is currently not supported
-chars_decode2(Bytes,{Min,Max,CharInTab},NumBits,Len,Acc) ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    chars_decode2(Bytes2,{Min,Max,CharInTab},NumBits,Len -1,[element(Char+1,CharInTab)|Acc]).
-
-		
-			% X.691:17 
-encode_null({Name,Val}) when atom(Name) ->
-    encode_null(Val);
-encode_null(_) -> []. % encodes to nothing
-
-decode_null(Bytes) ->
-    {'NULL',Bytes}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_object_identifier(Val) -> CompleteList
-%% encode_object_identifier({Name,Val}) -> CompleteList
-%% Val -> {Int1,Int2,...,IntN} % N >= 2
-%% Name -> atom()
-%% Int1 -> integer(0..2)
-%% Int2 -> integer(0..39) when Int1 (0..1) else integer()
-%% Int3-N -> integer()
-%% CompleteList -> [{bits,8,Val}|{octets,Ol}|align|...]
-%%
-encode_object_identifier(Val) ->
-    Octets = e_object_identifier(Val,notag),
-    [{debug,object_identifier},encode_length(undefined,length(Octets)),{octets,Octets}].
-
-%% This code is copied from asn1_encode.erl (BER) and corrected and modified 
-
-e_object_identifier({'OBJECT IDENTIFIER',V},DoTag) ->
-    e_object_identifier(V,DoTag);
-e_object_identifier({Cname,V},DoTag) when atom(Cname),tuple(V) ->
-    e_object_identifier(tuple_to_list(V),DoTag);
-e_object_identifier({Cname,V},DoTag) when atom(Cname),list(V) ->
-    e_object_identifier(V,DoTag);
-e_object_identifier(V,DoTag) when tuple(V) ->
-    e_object_identifier(tuple_to_list(V),DoTag);
-
-% E1 = 0|1|2 and (E2 < 40 when E1 = 0|1) 
-e_object_identifier([E1,E2|Tail],_DoTag) when E1 =< 2 ->
-    Head = 40*E1 + E2,  % weird
-    Res = e_object_elements([Head|Tail]),
-%    dotag(DoTag,[6],elength(length(Res)+1),[Head|Res]),
-    Res.
-
-e_object_elements([]) ->
-    [];
-e_object_elements([H|T]) ->
-    lists:append(e_object_element(H),e_object_elements(T)).
-
-e_object_element(Num) when Num < 128 ->
-    [Num];
-% must be changed to handle more than 2 octets
-e_object_element(Num) ->  %% when Num < ???
-    Left = ((Num band 2#11111110000000) bsr 7) bor 2#10000000,
-    Right = Num band 2#1111111 ,
-    [Left,Right].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_object_identifier(Bytes) -> {ObjId,RemainingBytes}
-%% ObjId -> {integer(),integer(),...} % at least 2 integers
-%% RemainingBytes -> [integer()] when integer() (0..255)
-decode_object_identifier(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-    [First|Rest] = dec_subidentifiers(Octs,0,[]),
-    Idlist = if
-	First < 40 ->
-	    [0,First|Rest];
-	First < 80 ->
-	    [1,First - 40|Rest];
-	true ->
-	    [2,First - 80|Rest]
-    end,
-    {list_to_tuple(Idlist),Bytes3}.
-
-dec_subidentifiers([H|T],Av,Al) when H >=16#80 ->
-    dec_subidentifiers(T,(Av bsl 7) + (H band 16#7F),Al);
-dec_subidentifiers([H|T],Av,Al) ->
-    dec_subidentifiers(T,0,[(Av bsl 7) + H |Al]);
-dec_subidentifiers([],_Av,Al) ->
-    lists:reverse(Al).
-
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	     no;
-	{value,{_,V}} -> 
-	    V
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% complete(InList) -> ByteList
-%% Takes a coded list with bits and bytes and converts it to a list of bytes
-%% Should be applied as the last step at encode of a complete ASN.1 type
-%%
-complete(InList) when list(InList) ->
-    complete(InList,[],0);
-complete(InList) ->
-    complete([InList],[],0).
-
-complete([{debug,_}|T], Acc, Acclen) ->
-    complete(T,Acc,Acclen);
-complete([H|T],Acc,Acclen) when list(H) ->
-    complete(lists:concat([H,T]),Acc,Acclen);
-
-
-complete([{octets,N,Val}|T],Acc,Acclen) when N =< 4 ,integer(Val) ->
-    Newval = case N of
-	1 -> 
-	    Val4 = Val band 16#FF,
-	    [Val4];
-	2 -> 
-	    Val3 = (Val bsr 8) band 16#FF,
-	    Val4 = Val band 16#FF,
-	    [Val3,Val4];
-	3 ->
-	    Val2 = (Val bsr 16) band 16#FF,
-	    Val3 = (Val bsr 8) band 16#FF,
-	    Val4 = Val band 16#FF,
-	    [Val2,Val3,Val4];
-	    4 ->
-	    Val1 = (Val bsr 24) band 16#FF,
-	    Val2 = (Val bsr 16) band 16#FF,
-	    Val3 = (Val bsr 8) band 16#FF,
-	    Val4 = Val band 16#FF,
-	    [Val1,Val2,Val3,Val4]
-    end,
-    complete([{octets,Newval}|T],Acc,Acclen);
-
-complete([{octets,Oct}|T],[],_Acclen) when list(Oct) ->
-    complete(T,lists:reverse(Oct),0);
-complete([{octets,Oct}|T],[Hacc|Tacc],Acclen) when list(Oct) ->
-    Rest = 8 - Acclen,
-    if 
-	Rest == 8 ->
-	    complete(T,lists:concat([lists:reverse(Oct),[Hacc|Tacc]]),0);
-	true ->
-	    complete(T,lists:concat([lists:reverse(Oct),[Hacc bsl Rest|Tacc]]),0)
-    end;
-	    
-complete([{bit,Val}|T], Acc, Acclen) ->
-    complete([{bits,1,Val}|T],Acc,Acclen);
-complete([{octet,Val}|T], Acc, Acclen) ->
-    complete([{octets,1,Val}|T],Acc,Acclen);
-
-complete([{bits,N,Val}|T], Acc, 0) when N =< 8 ->
-    complete(T,[Val|Acc],N);
-complete([{bits,N,Val}|T], [Hacc|Tacc], Acclen) when N =< 8 ->
-    Rest = 8 - Acclen,
-    if 
-	Rest >= N ->
-	    complete(T,[(Hacc bsl N) + Val|Tacc],(Acclen+N) rem 8);
-	true -> 
-	    Diff = N - Rest, 
-	    NewHacc = (Hacc bsl Rest) + (Val bsr Diff),
-	    Mask = element(Diff,{1,3,7,15,31,63,127,255}),
-	    complete(T,[(Val band Mask),NewHacc|Tacc],(Acclen+N) rem 8)
-    end;
-complete([{bits,N,Val}|T], Acc, Acclen) -> % N > 8
-    complete([{bits,N-8,Val bsr 8},{bits,8,Val band 255}|T],Acc,Acclen);
-
-complete([align|T],Acc,0) ->
-    complete(T,Acc,0);
-complete([align|T],[Hacc|Tacc],Acclen) ->
-    Rest = 8 - Acclen,
-    complete(T,[Hacc bsl Rest|Tacc],0);
-complete([{octets,_N,Val}|T],Acc,Acclen) when list(Val) -> % no security check here 
-    complete([{octets,Val}|T],Acc,Acclen);
-complete([],Acc,0) ->
-    lists:reverse(Acc);
-complete([],[Hacc|Tacc],Acclen) when Acclen > 0->
-    Rest = 8 - Acclen,
-    NewHacc = Hacc bsl Rest,
-    lists:reverse([NewHacc|Tacc]). 
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per_bin.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per_bin.erl
deleted file mode 100644
index 08a78165a2..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per_bin.erl
+++ /dev/null
@@ -1,2182 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1rt_per_bin.erl,v 1.1 2008/12/17 09:53:31 mikpe Exp $
-%%
--module(asn1rt_per_bin).
-
-%% encoding / decoding of PER aligned
-
--include("asn1_records.hrl").
-
--export([dec_fixup/3, cindex/3, list_to_record/2]).
--export([setchoiceext/1, setext/1, fixoptionals/2, fixoptionals/3, 
-	 fixextensions/2, 
-	 getext/1, getextension/2, skipextensions/3, getbit/1, getchoice/3 ]).
--export([getoptionals/2, getoptionals2/2, set_choice/3, encode_integer/2, encode_integer/3  ]).
--export([decode_integer/2, decode_integer/3, encode_small_number/1, encode_boolean/1, 
-	 decode_boolean/1, encode_length/2, decode_length/1, decode_length/2,
-	 encode_small_length/1, decode_small_length/1,
-	 decode_compact_bit_string/3]).
--export([decode_enumerated/3, 
-	 encode_bit_string/3, decode_bit_string/3  ]).
--export([encode_octet_string/2, decode_octet_string/2,
-	 encode_null/1, decode_null/1,
-	 encode_object_identifier/1, decode_object_identifier/1,
-	 complete/1]).
-
-
--export([encode_open_type/2, decode_open_type/2]).
-
--export([encode_UniversalString/2, decode_UniversalString/2,
-	 encode_PrintableString/2, decode_PrintableString/2,
-	 encode_GeneralString/2, decode_GeneralString/2,
-	 encode_GraphicString/2, decode_GraphicString/2,
-	 encode_TeletexString/2, decode_TeletexString/2,
-	 encode_VideotexString/2, decode_VideotexString/2,
-	 encode_VisibleString/2, decode_VisibleString/2,
-	 encode_BMPString/2, decode_BMPString/2,
-	 encode_IA5String/2, decode_IA5String/2,
-	 encode_NumericString/2, decode_NumericString/2,
-	 encode_ObjectDescriptor/2, decode_ObjectDescriptor/1
-	]).
--export([complete_bytes/1]).
-
--define('16K',16384).
--define('32K',32768).
--define('64K',65536).
-
-dec_fixup(Terms,Cnames,RemBytes) ->
-    dec_fixup(Terms,Cnames,RemBytes,[]).
-
-dec_fixup([novalue|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([{_Name,novalue}|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([H|T],[Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,[{Hc,H}|Acc]);
-dec_fixup([],_Cnames,RemBytes,Acc) ->
-    {lists:reverse(Acc),RemBytes}.
-
-cindex(Ix,Val,Cname) ->
-    case element(Ix,Val) of
-	{Cname,Val2} -> Val2;
-	X -> X
-    end.
-
-%% converts a list to a record if necessary
-list_to_record(_Name,Tuple) when tuple(Tuple) ->
-    Tuple;
-list_to_record(Name,List) when list(List) ->
-    list_to_tuple([Name|List]).
-
-%%--------------------------------------------------------
-%% setchoiceext(InRootSet) -> [{bit,X}]
-%% X  is set to  1 when InRootSet==false
-%% X  is set to  0 when InRootSet==true
-%%
-setchoiceext(true) ->
-    [{debug,choiceext},{bits,1,0}];
-setchoiceext(false) ->
-    [{debug,choiceext},{bits,1,1}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% setext(true|false) ->  CompleteList
-%%
-
-setext(false) ->
-    [{debug,ext},{bits,1,0}];
-setext(true) ->
-    [{debug,ext},{bits,1,1}].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% This version of fixoptionals/2 are left only because of 
-%% backward compatibility with older generates
-
-fixoptionals(OptList,Val) when tuple(Val) ->
-    fixoptionals1(OptList,Val,[]);
-
-fixoptionals(OptList,Val) when list(Val) ->
-    fixoptionals1(OptList,Val,1,[],[]).
-
-fixoptionals1([],Val,Acc) ->
-    %% return {Val,Opt}
-    {Val,lists:reverse(Acc)};
-fixoptionals1([{_,Pos}|Ot],Val,Acc) ->
-    case element(Pos+1,Val) of
-	asn1_NOVALUE -> fixoptionals1(Ot,Val,[0|Acc]);
-	asn1_DEFAULT -> fixoptionals1(Ot,Val,[0|Acc]);
-	_ -> fixoptionals1(Ot,Val,[1|Acc])
-    end.
-
-
-fixoptionals1([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) ->
-    fixoptionals1(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]);
-fixoptionals1([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) ->
-    fixoptionals1(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]);
-fixoptionals1(O,[Vh|Vt],Pos,Acc1,Acc2) ->
-    fixoptionals1(O,Vt,Pos+1,Acc1,[Vh|Acc2]);
-fixoptionals1([],[Vh|Vt],Pos,Acc1,Acc2) ->
-    fixoptionals1([],Vt,Pos+1,Acc1,[Vh|Acc2]);
-fixoptionals1([],[],_,Acc1,Acc2) ->
-						% return {Val,Opt}
-    {list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]),lists:reverse(Acc1)}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% This is the new fixoptionals/3 which is used by the new generates
-%%
-fixoptionals(OptList,OptLength,Val) when tuple(Val) ->
-    Bits = fixoptionals(OptList,Val,0),
-    {Val,{bits,OptLength,Bits}};
-
-fixoptionals([],_Val,Acc) ->
-    %% Optbits
-    Acc;
-fixoptionals([Pos|Ot],Val,Acc) ->
-    case element(Pos,Val) of
-	asn1_NOVALUE -> fixoptionals(Ot,Val,Acc bsl 1);
-	asn1_DEFAULT -> fixoptionals(Ot,Val,Acc bsl 1);
-	_ -> fixoptionals(Ot,Val,(Acc bsl 1) + 1)
-    end.
-
-
-getext(Bytes) when tuple(Bytes) ->
-    getbit(Bytes);
-getext(Bytes) when binary(Bytes) ->
-    getbit({0,Bytes});
-getext(Bytes) when list(Bytes) ->
-    getbit({0,Bytes}).
-
-getextension(0, Bytes) ->
-    {{},Bytes};
-getextension(1, Bytes) ->
-    {Len,Bytes2} = decode_small_length(Bytes),
-    {Blist, Bytes3} = getbits_as_list(Len,Bytes2),
-    {list_to_tuple(Blist),Bytes3}.
-
-fixextensions({ext,ExtPos,ExtNum},Val) ->
-    case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
-	0 -> [];
-	ExtBits ->
-	    [encode_small_length(ExtNum),{bits,ExtNum,ExtBits}]
-    end.
-
-fixextensions(Pos,MaxPos,_,Acc) when Pos >= MaxPos ->
-    Acc;
-fixextensions(Pos,ExtPos,Val,Acc) ->
-    Bit = case catch(element(Pos+1,Val)) of
-	      asn1_NOVALUE ->
-		  0;
-	      asn1_NOEXTVALUE ->
-		  0;
-	      {'EXIT',_} ->
-		  0;
-	      _ ->
-		  1
-	  end,
-    fixextensions(Pos+1,ExtPos,Val,(Acc bsl 1)+Bit).
-
-skipextensions(Bytes,Nr,ExtensionBitPattern) -> 
-    case (catch element(Nr,ExtensionBitPattern)) of
-	1 ->
-	    {_,Bytes2} = decode_open_type(Bytes,[]),
-	    skipextensions(Bytes2, Nr+1, ExtensionBitPattern);
-	0 ->
-	    skipextensions(Bytes, Nr+1, ExtensionBitPattern);
-	{'EXIT',_} -> % badarg, no more extensions
-	    Bytes
-    end.
-
-
-getchoice(Bytes,1,0) -> % only 1 alternative is not encoded
-    {0,Bytes};
-getchoice(Bytes,_,1) ->
-    decode_small_number(Bytes);
-getchoice(Bytes,NumChoices,0) ->
-    decode_constrained_number(Bytes,{0,NumChoices-1}).
-
-%% old version kept for backward compatibility with generates from R7B
-getoptionals(Bytes,NumOpt) ->
-    {Blist,Bytes1} = getbits_as_list(NumOpt,Bytes),
-    {list_to_tuple(Blist),Bytes1}.
-
-%% new version used in generates from r8b_patch/3 and later
-getoptionals2(Bytes,NumOpt) ->
-    getbits(Bytes,NumOpt).
-
-
-%% getbits_as_binary(Num,Bytes) -> {{Unused,BinBits},RestBytes},
-%% Num = integer(),
-%% Bytes = list() | tuple(),
-%% Unused = integer(),
-%% BinBits = binary(),
-%% RestBytes = tuple()
-getbits_as_binary(Num,Bytes) when binary(Bytes) ->
-    getbits_as_binary(Num,{0,Bytes});
-getbits_as_binary(0,Buffer) ->
-    {{0,<<>>},Buffer};
-getbits_as_binary(Num,{0,Bin}) when Num > 16 ->
-    Used = Num rem 8,
-    Pad = (8 - Used) rem 8,
-%    Nbytes = Num div 8,
-    <<Bits:Num,_:Pad,RestBin/binary>> = Bin,
-    {{Pad,<<Bits:Num,0:Pad>>},RestBin};
-getbits_as_binary(Num,Buffer={_Used,_Bin}) -> % Unaligned buffer
-    %% Num =< 16,
-    {Bits2,Buffer2} = getbits(Buffer,Num),
-    Pad = (8 - (Num rem 8)) rem 8,
-    {{Pad,<<Bits2:Num,0:Pad>>},Buffer2}.
-
-
-% integer_from_list(Int,[],BigInt) ->
-%     BigInt;
-% integer_from_list(Int,[H|T],BigInt) when Int < 8 ->
-%     (BigInt bsl Int) bor (H bsr (8-Int));
-% integer_from_list(Int,[H|T],BigInt) ->
-%     integer_from_list(Int-8,T,(BigInt bsl 8) bor H).
-
-getbits_as_list(Num,Bytes) when binary(Bytes) ->
-    getbits_as_list(Num,{0,Bytes},[]);
-getbits_as_list(Num,Bytes) ->
-    getbits_as_list(Num,Bytes,[]).
-
-%% If buffer is empty and nothing more will be picked.
-getbits_as_list(0, B, Acc) ->
-    {lists:reverse(Acc),B};
-%% If first byte in buffer is full and at least one byte will be picked,
-%% then pick one byte.
-getbits_as_list(N,{0,Bin},Acc) when N >= 8 ->
-    <<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Rest/binary>> = Bin,
-    getbits_as_list(N-8,{0,Rest},[B0,B1,B2,B3,B4,B5,B6,B7|Acc]);
-getbits_as_list(N,{Used,Bin},Acc) when N >= 4, Used =< 4 ->
-    NewUsed = Used + 4,
-    Rem = 8 - NewUsed,
-    <<_:Used,B3:1,B2:1,B1:1,B0:1,_:Rem, Rest/binary>> = Bin,
-    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
-    getbits_as_list(N-4,{NewUsed rem 8,NewRest},[B0,B1,B2,B3|Acc]);
-getbits_as_list(N,{Used,Bin},Acc) when N >= 2, Used =< 6  ->
-    NewUsed = Used + 2,
-    Rem = 8 - NewUsed,
-    <<_:Used,B1:1,B0:1,_:Rem, Rest/binary>> = Bin,
-    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
-    getbits_as_list(N-2,{NewUsed rem 8,NewRest},[B0,B1|Acc]);
-getbits_as_list(N,{Used,Bin},Acc) when Used =< 7 ->
-    NewUsed = Used + 1,
-    Rem = 8 - NewUsed,
-    <<_:Used,B0:1,_:Rem, Rest/binary>> = Bin,
-    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
-    getbits_as_list(N-1,{NewUsed rem 8,NewRest},[B0|Acc]).
-
-
-getbit({7,<<_:7,B:1,Rest/binary>>}) ->
-    {B,{0,Rest}};
-getbit({0,Buffer = <<B:1,_:7,_/binary>>}) ->
-    {B,{1,Buffer}};
-getbit({Used,Buffer}) ->
-    Unused = (8 - Used) - 1,
-    <<_:Used,B:1,_:Unused,_/binary>> = Buffer,
-    {B,{Used+1,Buffer}};
-getbit(Buffer) when binary(Buffer) ->
-    getbit({0,Buffer}).
-
-
-getbits({0,Buffer},Num) when (Num rem 8) == 0 ->
-    <<Bits:Num,Rest/binary>> = Buffer,
-    {Bits,{0,Rest}};
-getbits({Used,Bin},Num) ->
-    NumPlusUsed = Num + Used,
-    NewUsed = NumPlusUsed rem 8,
-    Unused = (8-NewUsed) rem 8,
-    case Unused of
-	0 ->
-	    <<_:Used,Bits:Num,Rest/binary>> = Bin,
-	    {Bits,{0,Rest}};
-	_ ->
-	    Bytes = NumPlusUsed div 8,
-	    <<_:Used,Bits:Num,_UBits:Unused,_/binary>> = Bin,
-	    <<_:Bytes/binary,Rest/binary>> = Bin,
-	    {Bits,{NewUsed,Rest}}
-    end;
-getbits(Bin,Num) when binary(Bin) ->
-    getbits({0,Bin},Num).
-
-
-
-% getoctet(Bytes) when list(Bytes) ->
-%     getoctet({0,Bytes});
-% getoctet(Bytes) ->
-%     %%    io:format("getoctet:Buffer = ~p~n",[Bytes]),
-%     getoctet1(Bytes).
-
-% getoctet1({0,[H|T]}) ->
-%     {H,{0,T}};
-% getoctet1({Pos,[_,H|T]}) ->
-%     {H,{0,T}}.
-
-align({0,L}) ->
-    {0,L};
-align({_Pos,<<_H,T/binary>>}) ->
-    {0,T};
-align(Bytes) ->
-    {0,Bytes}.
-
-%% First align buffer, then pick the first Num octets.
-%% Returns octets as an integer with bit significance as in buffer.
-getoctets({0,Buffer},Num) ->
-    <<Val:Num/integer-unit:8,RestBin/binary>> = Buffer,
-    {Val,{0,RestBin}};
-getoctets({U,<<_Padding,Rest/binary>>},Num) when U /= 0 ->
-    getoctets({0,Rest},Num);
-getoctets(Buffer,Num) when binary(Buffer) ->
-    getoctets({0,Buffer},Num).
-% getoctets(Buffer,Num) ->
-%     %%    io:format("getoctets:Buffer = ~p~nNum = ~p~n",[Buffer,Num]),
-%     getoctets(Buffer,Num,0).
-
-% getoctets(Buffer,0,Acc) ->
-%     {Acc,Buffer};
-% getoctets(Buffer,Num,Acc) ->
-%     {Oct,NewBuffer} = getoctet(Buffer),
-%     getoctets(NewBuffer,Num-1,(Acc bsl 8)+Oct). 
-
-% getoctets_as_list(Buffer,Num) ->
-%     getoctets_as_list(Buffer,Num,[]).
-
-% getoctets_as_list(Buffer,0,Acc) ->
-%     {lists:reverse(Acc),Buffer};
-% getoctets_as_list(Buffer,Num,Acc) ->
-%     {Oct,NewBuffer} = getoctet(Buffer),
-%     getoctets_as_list(NewBuffer,Num-1,[Oct|Acc]).
-
-%% First align buffer, then pick the first Num octets.
-%% Returns octets as a binary
-getoctets_as_bin({0,Bin},Num)->
-    <<Octets:Num/binary,RestBin/binary>> = Bin,
-    {Octets,{0,RestBin}};
-getoctets_as_bin({_U,Bin},Num) ->
-    <<_Padding,Octets:Num/binary,RestBin/binary>> = Bin,
-    {Octets,{0,RestBin}};
-getoctets_as_bin(Bin,Num) when binary(Bin) ->
-    getoctets_as_bin({0,Bin},Num).
-
-%% same as above but returns octets as a List
-getoctets_as_list(Buffer,Num) ->
-    {Bin,Buffer2} = getoctets_as_bin(Buffer,Num),
-    {binary_to_list(Bin),Buffer2}.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% set_choice(Alt,Choices,Altnum) -> ListofBitSettings
-%% Alt = atom()
-%% Altnum = integer() | {integer(),integer()}% number of alternatives
-%% Choices = [atom()] | {[atom()],[atom()]}
-%% When Choices is a tuple the first list is the Rootset and the
-%% second is the Extensions and then Altnum must also be a tuple with the
-%% lengths of the 2 lists 
-%%
-set_choice(Alt,{L1,L2},{Len1,_Len2}) ->
-    case set_choice_tag(Alt,L1) of
-	N when integer(N), Len1 > 1 ->
-	    [{bits,1,0}, % the value is in the root set
-	     encode_integer([{'ValueRange',{0,Len1-1}}],N)];
-	N when integer(N) ->
-	    [{bits,1,0}]; % no encoding if only 0 or 1 alternative
-	false ->
-	    [{bits,1,1}, % extension value
-	     case set_choice_tag(Alt,L2) of
-		 N2 when integer(N2) ->
-		     encode_small_number(N2);
-		 false ->
-		     unknown_choice_alt
-	     end]
-    end;
-set_choice(Alt,L,Len) ->
-    case set_choice_tag(Alt,L) of
-	N when integer(N), Len > 1 ->
-	    encode_integer([{'ValueRange',{0,Len-1}}],N);
-	N when integer(N) ->
-	    []; % no encoding if only 0 or 1 alternative
-	false ->
-	    [unknown_choice_alt]
-    end.
-
-set_choice_tag(Alt,Choices) ->
-    set_choice_tag(Alt,Choices,0).
-
-set_choice_tag(Alt,[Alt|_Rest],Tag) ->
-    Tag;
-set_choice_tag(Alt,[_H|Rest],Tag) ->
-    set_choice_tag(Alt,Rest,Tag+1);
-set_choice_tag(_Alt,[],_Tag) ->
-    false.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_fragmented_XXX; decode of values encoded fragmented according
-%% to ITU-T X.691 clause 10.9.3.8. The unit (XXX) is either bits, octets,
-%% characters or number of components (in a choice,sequence or similar).
-%% Buffer is a buffer {Used, Bin}.
-%% C is the constrained length.
-%% If the buffer is not aligned, this function does that.
-decode_fragmented_bits({0,Buffer},C) ->
-    decode_fragmented_bits(Buffer,C,[]);
-decode_fragmented_bits({_N,<<_,Bs/binary>>},C) ->
-    decode_fragmented_bits(Bs,C,[]).
-
-decode_fragmented_bits(<<3:2,Len:6,Bin/binary>>,C,Acc) ->
-    {Value,Bin2} = split_binary(Bin, Len * ?'16K'),
-    decode_fragmented_bits(Bin2,C,[Value,Acc]);
-decode_fragmented_bits(<<0:1,0:7,Bin/binary>>,C,Acc) ->
-    BinBits = list_to_binary(lists:reverse(Acc)),
-    case C of
-	Int when integer(Int),C == size(BinBits) ->
-	    {BinBits,{0,Bin}};
-	Int when integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,BinBits}}});
-	_ ->
-	    {BinBits,{0,Bin}}
-    end;
-decode_fragmented_bits(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
-    Result = {BinBits,{Used,_Rest}} =
-	case (Len rem 8) of
-	    0 -> 
-		<<Value:Len/binary-unit:1,Bin2/binary>> = Bin,
-		{list_to_binary(lists:reverse([Value|Acc])),{0,Bin2}};
-	    Rem ->
-		Bytes = Len div 8,
-		U = 8 - Rem,
-		<<Value:Bytes/binary-unit:8,Bits1:Rem,Bits2:U,Bin2/binary>> = Bin,
-		{list_to_binary(lists:reverse([Bits1 bsl U,Value|Acc])),
-		 {Rem,<<Bits2,Bin2/binary>>}}
-	end,
-    case C of
-	 Int when integer(Int),C == (size(BinBits) - ((8 - Used) rem 8)) ->
-	    Result;
-	Int when integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,BinBits}}});
-	_ ->
-	    Result
-    end.
-
-
-decode_fragmented_octets({0,Bin},C) ->
-    decode_fragmented_octets(Bin,C,[]);
-decode_fragmented_octets({_N,<<_,Bs/binary>>},C) ->
-    decode_fragmented_octets(Bs,C,[]).
-
-decode_fragmented_octets(<<3:2,Len:6,Bin/binary>>,C,Acc) ->
-    {Value,Bin2} = split_binary(Bin,Len * ?'16K'),
-    decode_fragmented_octets(Bin2,C,[Value,Acc]);
-decode_fragmented_octets(<<0:1,0:7,Bin/binary>>,C,Acc) ->
-    Octets = list_to_binary(lists:reverse(Acc)),
-    case C of
-	Int when integer(Int), C == size(Octets) ->
-	    {Octets,{0,Bin}};
-	Int when integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,Octets}}});
-	_ ->
-	    {Octets,{0,Bin}}
-    end;
-decode_fragmented_octets(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
-    <<Value:Len/binary-unit:8,Bin2/binary>> = Bin,
-    BinOctets = list_to_binary(lists:reverse([Value|Acc])),
-    case C of
-	Int when integer(Int),size(BinOctets) == Int ->
-	    {BinOctets,Bin2};
-	Int when integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,BinOctets}}});
-	_ ->
-	    {BinOctets,Bin2}
-    end.
-
-
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_open_type(Constraint, Value) -> CompleteList
-%% Value = list of bytes of an already encoded value (the list must be flat)
-%%         | binary
-%% Contraint = not used in this version
-%%
-encode_open_type(_C, Val) when list(Val) ->
-    Bin = list_to_binary(Val),
-    [encode_length(undefined,size(Bin)),{octets,Bin}]; % octets implies align
-encode_open_type(_C, Val) when binary(Val) ->
-    [encode_length(undefined,size(Val)),{octets,Val}]. % octets implies align
-%% the binary_to_list is not optimal but compatible with the current solution
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_open_type(Buffer,Constraint) -> Value
-%% Constraint is not used in this version
-%% Buffer = [byte] with PER encoded data 
-%% Value = [byte] with decoded data (which must be decoded again as some type)
-%%
-decode_open_type(Bytes, _C) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    getoctets_as_bin(Bytes2,Len).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_integer(Constraint,Value,NamedNumberList) -> CompleteList
-%% encode_integer(Constraint,Value) -> CompleteList
-%% encode_integer(Constraint,{Name,Value}) -> CompleteList
-%% 
-%%
-encode_integer(C,V,NamedNumberList) when atom(V) ->
-    case lists:keysearch(V,1,NamedNumberList) of
-	{value,{_,NewV}} -> 
-	    encode_integer(C,NewV);
-	_ -> 
-	    exit({error,{asn1,{namednumber,V}}})
-    end;
-encode_integer(C,V,_NamedNumberList) when integer(V) ->
-    encode_integer(C,V);
-encode_integer(C,{Name,V},NamedNumberList) when atom(Name) ->
-    encode_integer(C,V,NamedNumberList).
-
-encode_integer(C,{Name,Val}) when atom(Name) ->
-    encode_integer(C,Val);
-
-encode_integer([{Rc,_Ec}],Val) when tuple(Rc) -> % XXX when is this invoked? First argument most often a list,...Ok this is the extension case...but it doesn't work.
-    case (catch encode_integer([Rc],Val)) of
-	{'EXIT',{error,{asn1,_}}} ->
-	    [{bits,1,1},encode_unconstrained_number(Val)];
-	Encoded ->
-	    [{bits,1,0},Encoded]
-    end;
-encode_integer(C,Val ) when list(C) ->
-    case get_constraint(C,'SingleValue') of
-	no ->
-	    encode_integer1(C,Val);
-	V when integer(V),V == Val ->
-	    []; % a type restricted to a single value encodes to nothing
-	V when list(V) ->
-	    case lists:member(Val,V) of
-		true ->
-		    encode_integer1(C,Val);
-		_ ->
-		    exit({error,{asn1,{illegal_value,Val}}})
-	    end;
-	_ ->
-	    exit({error,{asn1,{illegal_value,Val}}})
-    end.
-
-encode_integer1(C, Val) ->		    
-    case VR = get_constraint(C,'ValueRange') of
-	no ->
-	    encode_unconstrained_number(Val);
-	{Lb,'MAX'} ->
-	    encode_semi_constrained_number(Lb,Val);
-	%% positive with range
-	{Lb,Ub} when Val >= Lb,
-		     Ub >= Val ->
-	    encode_constrained_number(VR,Val);
-	_ ->
-	    exit({error,{asn1,{illegal_value,VR,Val}}})
-    end.
-
-decode_integer(Buffer,Range,NamedNumberList) ->
-    {Val,Buffer2} = decode_integer(Buffer,Range),
-    case lists:keysearch(Val,2,NamedNumberList) of
-	{value,{NewVal,_}} -> {NewVal,Buffer2};
-	_ -> {Val,Buffer2}
-    end.
-
-decode_integer(Buffer,[{Rc,_Ec}]) when tuple(Rc) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> decode_integer(Buffer2,[Rc]);
-	1 -> decode_unconstrained_number(Buffer2)
-    end;
-decode_integer(Buffer,undefined) ->
-    decode_unconstrained_number(Buffer);
-decode_integer(Buffer,C) ->
-    case get_constraint(C,'SingleValue') of
-	V when integer(V) ->
-	    {V,Buffer};
-	V when list(V) ->
-	    {Val,Buffer2} = decode_integer1(Buffer,C),
-	    case lists:member(Val,V) of
-		true ->
-		    {Val,Buffer2};
-		_ -> 
-		    exit({error,{asn1,{illegal_value,Val}}})
-	    end;
-	_ ->
-	    decode_integer1(Buffer,C)
-    end.
-
-decode_integer1(Buffer,C) ->
-    case VR = get_constraint(C,'ValueRange') of
-	no ->
-	    decode_unconstrained_number(Buffer);
-	{Lb, 'MAX'} ->
-	    decode_semi_constrained_number(Buffer,Lb);
-	{_,_} ->
-	    decode_constrained_number(Buffer,VR)
-    end.
-
-						% X.691:10.6 Encoding of a normally small non-negative whole number
-						% Use this for encoding of CHOICE index if there is an extension marker in 
-						% the CHOICE
-encode_small_number({Name,Val}) when atom(Name) ->
-    encode_small_number(Val);
-encode_small_number(Val) when Val =< 63 ->
-%    [{bits,1,0},{bits,6,Val}];
-    [{bits,7,Val}]; % same as above but more efficient
-encode_small_number(Val) ->
-    [{bits,1,1},encode_semi_constrained_number(0,Val)].
-
-decode_small_number(Bytes) ->
-    {Bit,Bytes2} = getbit(Bytes),
-    case Bit of
-	0 -> 
-	    getbits(Bytes2,6);
-	1 ->
-	    decode_semi_constrained_number(Bytes2,0)
-    end.
-
-%% X.691:10.7 Encoding of a semi-constrained whole number
-%% might be an optimization encode_semi_constrained_number(0,Val) ->
-encode_semi_constrained_number(C,{Name,Val}) when atom(Name) ->
-    encode_semi_constrained_number(C,Val);
-encode_semi_constrained_number({Lb,'MAX'},Val) ->
-    encode_semi_constrained_number(Lb,Val);
-encode_semi_constrained_number(Lb,Val) ->
-    Val2 = Val - Lb,
-    Oct = eint_positive(Val2),
-    Len = length(Oct),
-    if 
-	Len < 128 ->
-	    {octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
-	true ->
-	    [encode_length(undefined,Len),{octets,Oct}]
-    end.
-
-decode_semi_constrained_number(Bytes,{Lb,_}) ->
-    decode_semi_constrained_number(Bytes,Lb);
-decode_semi_constrained_number(Bytes,Lb) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {V,Bytes3} = getoctets(Bytes2,Len),
-    {V+Lb,Bytes3}.
-
-encode_constrained_number(Range,{Name,Val}) when atom(Name) ->
-    encode_constrained_number(Range,Val);
-encode_constrained_number({Lb,Ub},Val) when Val >= Lb, Ub >= Val -> 
-    Range = Ub - Lb + 1,
-    Val2 = Val - Lb,
-    if 
-	Range  == 2 ->
-	    {bits,1,Val2};
-	Range  =< 4 -> 
-	    {bits,2,Val2};
-	Range  =< 8 ->
-	    {bits,3,Val2};
-	Range  =< 16 ->
-	    {bits,4,Val2};
-	Range  =< 32 ->
-	    {bits,5,Val2};
-	Range  =< 64 ->
-	    {bits,6,Val2};
-	Range  =< 128 ->
-	    {bits,7,Val2};
-	Range  =< 255 ->
-	    {bits,8,Val2};
-	Range  =< 256 ->
-	    {octets,[Val2]};
-	Range  =< 65536 ->
-	    {octets,<<Val2:16>>};
-	Range =< 16#1000000  ->
-	    Octs = eint_positive(Val2),
-	    [{bits,2,length(Octs)-1},{octets,Octs}];
-	Range =< 16#100000000  ->
-	    Octs = eint_positive(Val2),
-	    [{bits,2,length(Octs)-1},{octets,Octs}];
-	Range =< 16#10000000000  ->
-	    Octs = eint_positive(Val2),
-	    [{bits,3,length(Octs)-1},{octets,Octs}];
-	true  ->
-	    exit({not_supported,{integer_range,Range}})
-    end;
-encode_constrained_number(Range,Val) -> 
-    exit({error,{asn1,{integer_range,Range,value,Val}}}).
-
-
-decode_constrained_number(Buffer,{Lb,Ub}) ->
-    Range = Ub - Lb + 1,
-						%    Val2 = Val - Lb,
-    {Val,Remain} = 
-	if 
-	    Range  == 2 ->
-		getbits(Buffer,1);
-	    Range  =< 4 -> 
-		getbits(Buffer,2);
-	    Range  =< 8 ->
-		getbits(Buffer,3);
-	    Range  =< 16 ->
-		getbits(Buffer,4);
-	    Range  =< 32 ->
-		getbits(Buffer,5);
-	    Range  =< 64 ->
-		getbits(Buffer,6);
-	    Range  =< 128 ->
-		getbits(Buffer,7);
-	    Range  =< 255 ->
-		getbits(Buffer,8);
-	    Range  =< 256 ->
-		getoctets(Buffer,1);
-	    Range  =< 65536 ->
-		getoctets(Buffer,2);
-	    Range =< 16#1000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,3}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	    Range =< 16#100000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,4}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	    Range =< 16#10000000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,5}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	    true  ->
-		exit({not_supported,{integer_range,Range}})
-	end,
-    {Val+Lb,Remain}.
-
-%% X.691:10.8 Encoding of an unconstrained whole number
-
-encode_unconstrained_number(Val) when Val >= 0 ->
-    Oct = eint(Val,[]),
-    Len = length(Oct),
-    if 
-	Len < 128 ->
-	    {octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
-	true ->
-	    [encode_length(undefined,Len),{octets,Oct}]
-    end;
-encode_unconstrained_number(Val) -> % negative
-    Oct = enint(Val,[]),
-    Len = length(Oct),
-    if 
-	Len < 128 ->
-	    {octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
-	true ->
-	    [encode_length(undefined,Len),{octets,Oct}]
-    end.
-
-
-%% used for positive Values which don't need a sign bit
-%% returns a binary
-eint_positive(Val) ->
-    case eint(Val,[]) of
-	[0,B1|T] ->
-	    [B1|T];
-	T -> 
-	    T
-    end.
-
-
-eint(0, [B|Acc]) when B < 128 ->
-    [B|Acc];
-eint(N, Acc) ->
-    eint(N bsr 8, [N band 16#ff| Acc]).
-
-enint(-1, [B1|T]) when B1 > 127 ->
-    [B1|T];
-enint(N, Acc) ->
-    enint(N bsr 8, [N band 16#ff|Acc]).
-
-decode_unconstrained_number(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Ints,Bytes3} = getoctets_as_list(Bytes2,Len),
-    {dec_integer(Ints),Bytes3}.
-
-dec_pos_integer(Ints) ->
-    decpint(Ints, 8 * (length(Ints) - 1)).
-dec_integer(Ints) when hd(Ints) band 255 =< 127 -> %% Positive number
-    decpint(Ints, 8 * (length(Ints) - 1));
-dec_integer(Ints) ->                        %% Negative
-    decnint(Ints,  8 * (length(Ints) - 1)).
-
-decpint([Byte|Tail], Shift) ->
-    (Byte bsl Shift) bor decpint(Tail, Shift-8);
-decpint([], _) -> 0.
-
-decnint([Byte|Tail], Shift) ->
-    (-128 + (Byte band 127) bsl Shift) bor decpint(Tail, Shift-8).
-
-% minimum_octets(Val) ->
-%     minimum_octets(Val,[]).
-
-% minimum_octets(Val,Acc) when Val > 0 -> 
-%     minimum_octets((Val bsr 8),[Val band 16#FF|Acc]);
-% minimum_octets(0,Acc) ->
-%     Acc.
-
-
-%% X.691:10.9 Encoding of a length determinant
-%%encode_small_length(undefined,Len) -> % null means no UpperBound
-%%    encode_small_number(Len).
-
-%% X.691:10.9.3.5 
-%% X.691:10.9.3.7
-encode_length(undefined,Len) -> % un-constrained
-    if 
-	Len < 128 ->
-	    {octets,[Len]};
-	Len < 16384 ->
-	    {octets,<<2:2,Len:14>>};
-	true  -> % should be able to endode length >= 16384
-	    exit({error,{asn1,{encode_length,{nyi,above_16k}}}})
-    end;
-
-encode_length({0,'MAX'},Len) ->
-    encode_length(undefined,Len);
-encode_length(Vr={Lb,Ub},Len) when Ub =< 65535 ,Lb >= 0 -> % constrained
-    encode_constrained_number(Vr,Len);
-encode_length({Lb,_Ub},Len) when integer(Lb), Lb >= 0 -> % Ub > 65535
-    encode_length(undefined,Len);
-encode_length({Vr={Lb,Ub},[]},Len) when Ub =< 65535 ,Lb >= 0 -> 
-    %% constrained extensible
-    [{bits,1,0},encode_constrained_number(Vr,Len)];
-encode_length(SingleValue,_Len) when integer(SingleValue) ->
-    [].
-
-%% X.691 10.9.3.4 (only used for length of bitmap that prefixes extension 
-%% additions in a sequence or set
-encode_small_length(Len) when Len =< 64 ->
-%%    [{bits,1,0},{bits,6,Len-1}];
-    {bits,7,Len-1}; % the same as above but more efficient
-encode_small_length(Len) ->
-    [{bits,1,1},encode_length(undefined,Len)].
-
-% decode_small_length({Used,<<_:Used,0:1,Num:6,_:((8-Used+1) rem 8),Rest/binary>>}) ->
-%     case Buffer of
-% 	<<_:Used,0:1,Num:6,_:((8-Used+1) rem 8),Rest/binary>> ->
-% 	    {Num,
-%     case getbit(Buffer) of
-% 	{0,Remain} -> 
-% 	    {Bits,Remain2} = getbits(Remain,6),
-% 	    {Bits+1,Remain2};
-% 	{1,Remain} -> 
-% 	    decode_length(Remain,undefined)
-%     end.
-
-decode_small_length(Buffer) ->
-    case getbit(Buffer) of
-	{0,Remain} -> 
-	    {Bits,Remain2} = getbits(Remain,6),
-	    {Bits+1,Remain2};
-	{1,Remain} -> 
-	    decode_length(Remain,undefined)
-    end.
-
-decode_length(Buffer) ->
-    decode_length(Buffer,undefined).
-
-decode_length(Buffer,undefined)  -> % un-constrained
-    {0,Buffer2} = align(Buffer),
-    case Buffer2 of
-	<<0:1,Oct:7,Rest/binary>> ->
-	    {Oct,{0,Rest}};
-	<<2:2,Val:14,Rest/binary>> ->
-	    {Val,{0,Rest}};
-	<<3:2,_:14,_Rest/binary>> ->
-	    %% this case should be fixed
-	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}})
-    end;
-%%    {Bits,_} = getbits(Buffer2,2),
-%     case Bits of
-% 	2 -> 
-% 	    {Val,Bytes3} = getoctets(Buffer2,2),
-% 	    {(Val band 16#3FFF),Bytes3};
-% 	3 -> 
-% 	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}});
-% 	_ ->
-% 	    {Val,Bytes3} = getoctet(Buffer2),
-% 	    {Val band 16#7F,Bytes3}
-%     end;
-
-decode_length(Buffer,{Lb,Ub}) when Ub =< 65535 ,Lb >= 0 -> % constrained
-    decode_constrained_number(Buffer,{Lb,Ub});
-decode_length(_,{Lb,_}) when integer(Lb), Lb >= 0 -> % Ub > 65535
-    exit({error,{asn1,{decode_length,{nyi,above_64K}}}});
-decode_length(Buffer,{{Lb,Ub},[]}) -> 
-    case getbit(Buffer) of
-	{0,Buffer2} ->
-	    decode_length(Buffer2, {Lb,Ub})
-    end;
-
-
-%When does this case occur with {_,_Lb,Ub} ??
-% X.691:10.9.3.5 
-decode_length({Used,Bin},{_,_Lb,_Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub NOTE! this case does not cover case when Ub > 65535
-    Unused = (8-Used) rem 8,
-    case Bin of
-	<<_:Used,0:1,Val:7,R:Unused,Rest/binary>> -> 
-	    {Val,{Used,<<R,Rest/binary>>}};
-	<<_:Used,_:Unused,2:2,Val:14,Rest/binary>> -> 
-	    {Val, {0,Rest}};
-	<<_:Used,_:Unused,3:2,_:14,_Rest/binary>> -> 
-	    exit({error,{asn1,{decode_length,{nyi,length_above_64K}}}})
-    end;
-% decode_length(Buffer,{_,_Lb,Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub
-%     case getbit(Buffer) of
-% 	{0,Remain} -> 
-% 	    getbits(Remain,7);
-% 	{1,Remain} -> 
-% 	    {Val,Remain2} = getoctets(Buffer,2),
-% 	    {Val band 2#0111111111111111, Remain2}
-%     end;
-decode_length(Buffer,SingleValue) when integer(SingleValue) ->
-    {SingleValue,Buffer}.
-
-
-						% X.691:11
-encode_boolean(true) ->
-    {bits,1,1};
-encode_boolean(false) ->
-    {bits,1,0};
-encode_boolean({Name,Val}) when atom(Name) ->
-    encode_boolean(Val);
-encode_boolean(Val) ->
-    exit({error,{asn1,{encode_boolean,Val}}}).
-
-decode_boolean(Buffer) -> %when record(Buffer,buffer)
-    case getbit(Buffer) of
-	{1,Remain} -> {true,Remain};
-	{0,Remain} -> {false,Remain}
-    end.
-
-
-%% ENUMERATED with extension marker
-decode_enumerated(Buffer,C,{Ntup1,Ntup2}) when tuple(Ntup1), tuple(Ntup2) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> % not an extension value
-	    {Val,Buffer3} = decode_integer(Buffer2,C),
-	    case catch (element(Val+1,Ntup1)) of
-		NewVal when atom(NewVal) -> {NewVal,Buffer3};
-		_Error -> exit({error,{asn1,{decode_enumerated,{Val,[Ntup1,Ntup2]}}}})
-	    end;
-	1 -> % this an extension value
-	    {Val,Buffer3} = decode_small_number(Buffer2),
-	    case catch (element(Val+1,Ntup2)) of
-		NewVal when atom(NewVal) -> {NewVal,Buffer3};
-		_ -> {{asn1_enum,Val},Buffer3}
-	    end
-    end;
-
-decode_enumerated(Buffer,C,NamedNumberTup) when tuple(NamedNumberTup) ->
-    {Val,Buffer2} = decode_integer(Buffer,C),
-    case catch (element(Val+1,NamedNumberTup)) of
-	NewVal when atom(NewVal) -> {NewVal,Buffer2};
-	_Error -> exit({error,{asn1,{decode_enumerated,{Val,NamedNumberTup}}}})
-    end.
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Bitstring value, ITU_T X.690 Chapter 8.5
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% encode bitstring value
-%%===============================================================================
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% bitstring NamedBitList
-%% Val can be  of:
-%% - [identifiers] where only named identifers are set to one, 
-%%   the Constraint must then have some information of the 
-%%   bitlength.
-%% - [list of ones and zeroes] all bits 
-%% - integer value representing the bitlist
-%% C is constraint Len, only valid when identifiers
-
-
-%% when the value is a list of {Unused,BinBits}, where 
-%% Unused = integer(),
-%% BinBits = binary().
-
-encode_bit_string(C,Bin={Unused,BinBits},NamedBitList) when integer(Unused),
-							    binary(BinBits) ->
-    encode_bin_bit_string(C,Bin,NamedBitList);
-
-%% when the value is a list of named bits
-encode_bit_string(C, LoNB=[FirstVal | _RestVal], NamedBitList) when atom(FirstVal) ->
-    ToSetPos = get_all_bitposes(LoNB, NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos,0),
-    encode_bit_string(C,BitList,NamedBitList);
-
-encode_bit_string(C, BL=[{bit,_No} | _RestVal], NamedBitList) ->
-    ToSetPos = get_all_bitposes(BL, NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos,0),
-    encode_bit_string(C,BitList,NamedBitList);
-
-%% when the value is a list of ones and zeroes
-
-% encode_bit_string(C, BitListValue, NamedBitList) when list(BitListValue) ->
-%     Bl1 = 
-% 	case NamedBitList of
-% 	    [] ->  % dont remove trailing zeroes
-% 		BitListValue;
-% 	    _ -> % first remove any trailing zeroes
-% 		lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,
-% 					      lists:reverse(BitListValue)))
-% 	end,
-%     BitList = [{bit,X} || X <- Bl1],
-% %%    BListLen = length(BitList),
-%     case get_constraint(C,'SizeConstraint') of
-% 	0 -> % fixed length
-% 	    []; % nothing to encode
-% 	V when integer(V),V=<16 -> % fixed length 16 bits or less
-% 	    pad_list(V,BitList);
-% 	V when integer(V) -> % fixed length 16 bits or more
-% 	    [align,pad_list(V,BitList)]; % should be another case for V >= 65537
-% 	{Lb,Ub} when integer(Lb),integer(Ub) ->	    
-% 	    [encode_length({Lb,Ub},length(BitList)),align,BitList];
-% 	no ->
-% 	    [encode_length(undefined,length(BitList)),align,BitList];
-% 	Sc -> % extension marker
-% 	    [encode_length(Sc,length(BitList)),align,BitList]
-%     end;
-encode_bit_string(C, BitListValue, NamedBitList) when list(BitListValue) ->
-    BitListToBinary = 
-	%% fun that transforms a list of 1 and 0 to a tuple:
-	%% {UnusedBitsInLastByte, Binary}
-	fun([H|T],Acc,N,Fun) ->
-		Fun(T,(Acc bsl 1)+H,N+1,Fun);
-	   ([],Acc,N,_) -> 
-		Unused = (8 - (N rem 8)) rem 8,
-		{Unused,<<Acc:N,0:Unused>>}
-	end,
-    UnusedAndBin =
-	case NamedBitList of
-	    [] ->  % dont remove trailing zeroes
-		BitListToBinary(BitListValue,0,0,BitListToBinary);
-	    _ ->
-		BitListToBinary(lists:reverse(
-			       lists:dropwhile(fun(0)->true;(1)->false end,
-					       lists:reverse(BitListValue))),
-			     0,0,BitListToBinary)
-	end,
-    encode_bin_bit_string(C,UnusedAndBin,NamedBitList);
-
-%% when the value is an integer
-encode_bit_string(C, IntegerVal, NamedBitList) when integer(IntegerVal)->
-    BitList = int_to_bitlist(IntegerVal),
-    encode_bit_string(C,BitList,NamedBitList);
-
-%% when the value is a tuple
-encode_bit_string(C,{Name,Val}, NamedBitList) when atom(Name) ->
-    encode_bit_string(C,Val,NamedBitList).
-
-
-%% encode_bin_bit_string/3, when value is a tuple of Unused and BinBits.
-%% Unused = integer(),i.e. number unused bits in least sign. byte of
-%% BinBits = binary().
-
-
-encode_bin_bit_string(C,UnusedAndBin={_Unused,_BinBits},NamedBitList) ->
-    Constr = get_constraint(C,'SizeConstraint'),
-    UnusedAndBin1 = {Unused1,Bin1} = 
-	remove_trailing_bin(NamedBitList,UnusedAndBin,lower_bound(Constr)),
-    case Constr of
-	0 ->
-	    [];
-	V when integer(V),V=<16 ->
-	    {Unused2,Bin2} = pad_list(V,UnusedAndBin1),
-	    <<BitVal:V,_:Unused2>> = Bin2,
-	    {bits,V,BitVal};
-	V when integer(V) ->
-	    [align, pad_list(V, UnusedAndBin1)];
-	{Lb,Ub} when integer(Lb),integer(Ub) ->
-	    [encode_length({Lb,Ub},size(Bin1)*8 - Unused1),
-	     align,UnusedAndBin1];
-	no ->
-	    [encode_length(undefined,size(Bin1)*8 - Unused1),
-	     align,UnusedAndBin1];
-	Sc ->
-	    [encode_length(Sc,size(Bin1)*8 - Unused1),
-	     align,UnusedAndBin1]
-    end.
-
-remove_trailing_bin([], {Unused,Bin},_) ->
-    {Unused,Bin};
-remove_trailing_bin(NamedNumberList, {_Unused,Bin},C) ->
-    Size = size(Bin)-1,
-    <<Bfront:Size/binary, LastByte:8>> = Bin,
-    %% clear the Unused bits to be sure
-%    LastByte1 = LastByte band (((1 bsl Unused) -1) bxor 255),
-    Unused1 = trailingZeroesInNibble(LastByte band 15),
-    Unused2 = 
-	case Unused1 of 
-	    4 ->
-		4 + trailingZeroesInNibble(LastByte bsr 4);
-	    _ -> Unused1
-	end,
-    case Unused2 of
-	8 ->
-	    remove_trailing_bin(NamedNumberList,{0,Bfront},C);
-	_ ->
-	    case C of
-		Int when integer(Int),Int > ((size(Bin)*8)-Unused2) ->
-		    %% this padding see OTP-4353
-		    pad_list(Int,{Unused2,Bin});
-		_ -> {Unused2,Bin}
-	    end
-    end.
-
-
-trailingZeroesInNibble(0) ->
-    4;
-trailingZeroesInNibble(1) ->
-    0;
-trailingZeroesInNibble(2) ->
-    1;
-trailingZeroesInNibble(3) ->
-    0;
-trailingZeroesInNibble(4) ->
-    2;
-trailingZeroesInNibble(5) ->
-    0;
-trailingZeroesInNibble(6) ->
-    1;
-trailingZeroesInNibble(7) ->
-    0;
-trailingZeroesInNibble(8) ->
-    3;
-trailingZeroesInNibble(9) ->
-    0;
-trailingZeroesInNibble(10) ->
-    1;
-trailingZeroesInNibble(11) ->
-    0;
-trailingZeroesInNibble(12) -> %#1100
-    2;
-trailingZeroesInNibble(13) ->
-    0;
-trailingZeroesInNibble(14) ->
-    1;
-trailingZeroesInNibble(15) ->
-    0.
-
-lower_bound({{Lb,_},_}) when integer(Lb) ->
-    Lb;
-lower_bound({Lb,_}) when integer(Lb) ->
-    Lb;
-lower_bound(C) ->
-    C.
-
-%%%%%%%%%%%%%%%
-%% The result is presented as a list of named bits (if possible)
-%% else as a tuple {Unused,Bits}. Unused is the number of unused
-%% bits, least significant bits in the last byte of Bits. Bits is
-%% the BIT STRING represented as a binary.
-%% 
-decode_compact_bit_string(Buffer, C, NamedNumberList) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 -> % fixed length
-	    {{8,0},Buffer};
-	V when integer(V),V=<16 -> %fixed length 16 bits or less
-	    compact_bit_string(Buffer,V,NamedNumberList);
-	V when integer(V),V=<65536 -> %fixed length > 16 bits
-	    Bytes2 = align(Buffer),
-	    compact_bit_string(Bytes2,V,NamedNumberList);
-	V when integer(V) -> % V > 65536 => fragmented value
-	    {Bin,Buffer2} = decode_fragmented_bits(Buffer,V),
-	    case Buffer2 of
-		{0,_} -> {{0,Bin},Buffer2};
-		{U,_} -> {{8-U,Bin},Buffer2}
-	    end;
-	{Lb,Ub} when integer(Lb),integer(Ub) ->
-	    %% This case may demand decoding of fragmented length/value
-	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList);
-	no ->
-	    %% This case may demand decoding of fragmented length/value
-	    {Len,Bytes2} = decode_length(Buffer,undefined),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList);
-	Sc ->
-	    {Len,Bytes2} = decode_length(Buffer,Sc),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList)
-    end.
-
-
-%%%%%%%%%%%%%%%
-%% The result is presented as a list of named bits (if possible)
-%% else as a list of 0 and 1.
-%% 
-decode_bit_string(Buffer, C, NamedNumberList) ->
-    case get_constraint(C,'SizeConstraint') of
-	{Lb,Ub} when integer(Lb),integer(Ub) ->
-	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
-	    Bytes3 = align(Bytes2),
-	    bit_list_or_named(Bytes3,Len,NamedNumberList);
-	no ->
-	    {Len,Bytes2} = decode_length(Buffer,undefined),
-	    Bytes3 = align(Bytes2),
-	    bit_list_or_named(Bytes3,Len,NamedNumberList);
-	0 -> % fixed length
-	    {[],Buffer}; % nothing to encode
-	V when integer(V),V=<16 -> % fixed length 16 bits or less
-	    bit_list_or_named(Buffer,V,NamedNumberList);
-	V when integer(V),V=<65536 ->
-	    Bytes2 = align(Buffer),
-	    bit_list_or_named(Bytes2,V,NamedNumberList);
-	V when integer(V) ->
-	    Bytes2 = align(Buffer),
-	    {BinBits,_} = decode_fragmented_bits(Bytes2,V),
-	    bit_list_or_named(BinBits,V,NamedNumberList);
-	Sc -> % extension marker
-	    {Len,Bytes2} = decode_length(Buffer,Sc),
-	    Bytes3 = align(Bytes2),
-	    bit_list_or_named(Bytes3,Len,NamedNumberList)
-    end.
-
-
-%% if no named bits are declared we will return a
-%% {Unused,Bits}. Unused = integer(),
-%% Bits = binary().
-compact_bit_string(Buffer,Len,[]) ->
-    getbits_as_binary(Len,Buffer); % {{Unused,BinBits},NewBuffer}
-compact_bit_string(Buffer,Len,NamedNumberList) ->
-    bit_list_or_named(Buffer,Len,NamedNumberList).
-
-
-%% if no named bits are declared we will return a
-%% BitList = [0 | 1]
-
-bit_list_or_named(Buffer,Len,[]) ->
-    getbits_as_list(Len,Buffer);
-
-%% if there are named bits declared we will return a named
-%% BitList where the names are atoms and unnamed bits represented
-%% as {bit,Pos}
-%% BitList = [atom() | {bit,Pos}]
-%% Pos = integer()
-
-bit_list_or_named(Buffer,Len,NamedNumberList) ->
-    {BitList,Rest} = getbits_as_list(Len,Buffer),
-    {bit_list_or_named1(0,BitList,NamedNumberList,[]), Rest}.
-
-bit_list_or_named1(Pos,[0|Bt],Names,Acc) ->
-    bit_list_or_named1(Pos+1,Bt,Names,Acc);
-bit_list_or_named1(Pos,[1|Bt],Names,Acc) ->
-    case lists:keysearch(Pos,2,Names) of
-	{value,{Name,_}} ->
-	    bit_list_or_named1(Pos+1,Bt,Names,[Name|Acc]);
-	_  -> 
-	    bit_list_or_named1(Pos+1,Bt,Names,[{bit,Pos}|Acc])
-    end;
-bit_list_or_named1(_,[],_,Acc) ->
-    lists:reverse(Acc).
-
-
-
-%%%%%%%%%%%%%%%
-%% 
-
-int_to_bitlist(Int) when integer(Int), Int > 0 ->
-    [Int band 1 | int_to_bitlist(Int bsr 1)];
-int_to_bitlist(0) ->
-    [].
-
-
-%%%%%%%%%%%%%%%%%%
-%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
-%%   [sorted_list_of_bitpositions_to_set]
-
-get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
-    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
-
-get_all_bitposes([Val | Rest], NamedBitList, Ack) ->
-    case lists:keysearch(Val, 1, NamedBitList) of
-	{value, {_ValName, ValPos}} ->
-	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
-	_ ->
-	    exit({error,{asn1, {bitstring_namedbit, Val}}})
-    end;
-get_all_bitposes([], _NamedBitList, Ack) ->
-    lists:sort(Ack).
-
-%%%%%%%%%%%%%%%%%%
-%% make_and_set_list([list of positions to set to 1])->
-%% returns list with all in SetPos set.
-%% in positioning in list the first element is 0, the second 1 etc.., but
-%% 
-
-make_and_set_list([XPos|SetPos], XPos) ->
-    [1 | make_and_set_list(SetPos, XPos + 1)];
-make_and_set_list([Pos|SetPos], XPos) ->
-    [0 | make_and_set_list([Pos | SetPos], XPos + 1)];
-make_and_set_list([], _) ->
-    [].
-
-%%%%%%%%%%%%%%%%%
-%% pad_list(N,BitList) -> PaddedList
-%% returns a padded (with trailing {bit,0} elements) list of length N
-%% if Bitlist contains more than N significant bits set an exit asn1_error 
-%% is generated
-
-pad_list(N,In={Unused,Bin}) ->
-    pad_list(N, size(Bin)*8 - Unused, In).
-    
-pad_list(N,Size,In={_,_}) when N < Size ->
-    exit({error,{asn1,{range_error,{bit_string,In}}}});
-pad_list(N,Size,{Unused,Bin}) when N > Size, Unused > 0 ->
-    pad_list(N,Size+1,{Unused-1,Bin});
-pad_list(N,Size,{_Unused,Bin}) when N > Size ->
-    pad_list(N,Size+1,{7,<<Bin/binary,0>>});
-pad_list(N,N,In={_,_}) ->
-    In.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% X.691:16
-%% encode_octet_string(Constraint,ExtensionMarker,Val)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-encode_octet_string(C,Val) ->
-    encode_octet_string(C,false,Val).
-
-encode_octet_string(C,Bool,{_Name,Val}) ->
-    encode_octet_string(C,Bool,Val);
-encode_octet_string(_,true,_) -> 
-    exit({error,{asn1,{'not_supported',extensionmarker}}});
-encode_octet_string(C,false,Val) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 ->
-	    [];
-	1 ->
-	    [V] = Val,
-	    {bits,8,V};
-	2 ->
-	    [V1,V2] = Val,
-	    [{bits,8,V1},{bits,8,V2}];
-	Sv when Sv =<65535, Sv == length(Val) -> % fixed length
-	    {octets,Val};
-	{Lb,Ub}  ->
-	    [encode_length({Lb,Ub},length(Val)),{octets,Val}];
-	Sv when list(Sv) ->
-	    [encode_length({hd(Sv),lists:max(Sv)},length(Val)),{octets,Val}];
-	no  ->
-	    [encode_length(undefined,length(Val)),{octets,Val}]
-    end.
-
-decode_octet_string(Bytes,Range) ->
-    decode_octet_string(Bytes,Range,false).
-
-decode_octet_string(Bytes,C,false) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 ->
-	    {[],Bytes};
-	1 ->
-	    {B1,Bytes2} = getbits(Bytes,8),
-	    {[B1],Bytes2};
-	2 ->
-	    {Bs,Bytes2}= getbits(Bytes,16),
-	    {binary_to_list(<<Bs:16>>),Bytes2};
-	{_,0} ->
-	    {[],Bytes};
-	Sv when integer(Sv), Sv =<65535 -> % fixed length
-	    getoctets_as_list(Bytes,Sv);
-	Sv when integer(Sv) -> % fragmented encoding
-	    Bytes2 = align(Bytes),
-	    decode_fragmented_octets(Bytes2,Sv);
-	{Lb,Ub}  ->
-	    {Len,Bytes2} = decode_length(Bytes,{Lb,Ub}),
-	    getoctets_as_list(Bytes2,Len);
-	Sv when list(Sv) ->
-	    {Len,Bytes2} = decode_length(Bytes,{hd(Sv),lists:max(Sv)}),
-	    getoctets_as_list(Bytes2,Len);
-	no  ->
-	    {Len,Bytes2} = decode_length(Bytes,undefined),
-	    getoctets_as_list(Bytes2,Len)
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Restricted char string types 
-%% (NumericString, PrintableString,VisibleString,IA5String,BMPString,UniversalString)
-%% X.691:26 and X.680:34-36
-%%encode_restricted_string(aligned,'BMPString',Constraints,Extension,Val)
-
-
-encode_restricted_string(aligned,{Name,Val}) when atom(Name) ->
-    encode_restricted_string(aligned,Val);
-
-encode_restricted_string(aligned,Val) when list(Val)->
-    [encode_length(undefined,length(Val)),{octets,Val}].
-
-encode_known_multiplier_string(aligned,StringType,C,_Ext,{Name,Val}) when atom(Name) ->
-    encode_known_multiplier_string(aligned,StringType,C,false,Val);
-
-encode_known_multiplier_string(aligned,StringType,C,_Ext,Val) ->
-    Result = chars_encode(C,StringType,Val),
-    NumBits = get_NumBits(C,StringType),
-    case get_constraint(C,'SizeConstraint') of
-	Ub when integer(Ub), Ub*NumBits =< 16  ->
-	    case {StringType,Result} of
-		{'BMPString',{octets,Ol}} ->
-		    [{bits,8,Oct}||Oct <- Ol];
-		_ ->
-		    Result
-	    end;
-	0 ->
-	    [];
-	Ub when integer(Ub),Ub =<65535 -> % fixed length
-	    [align,Result];
-	{Ub,Lb} ->
-	    [encode_length({Ub,Lb},length(Val)),align,Result];
-	Vl when list(Vl) ->
-	    [encode_length({lists:min(Vl),lists:max(Vl)},length(Val)),align,Result];
-	no  ->
-	    [encode_length(undefined,length(Val)),align,Result]
-    end.
-
-decode_restricted_string(Bytes,aligned) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    getoctets_as_list(Bytes2,Len).
-
-decode_known_multiplier_string(Bytes,aligned,StringType,C,_Ext) ->
-    NumBits = get_NumBits(C,StringType),
-    case get_constraint(C,'SizeConstraint') of
-	Ub when integer(Ub), Ub*NumBits =< 16  ->
-	    chars_decode(Bytes,NumBits,StringType,C,Ub);
-	Ub when integer(Ub),Ub =<65535 -> % fixed length
-	    Bytes1 = align(Bytes),
-	    chars_decode(Bytes1,NumBits,StringType,C,Ub);
-	0 ->
-	    {[],Bytes};
-	Vl when list(Vl) ->
-	    {Len,Bytes1} = decode_length(Bytes,{hd(Vl),lists:max(Vl)}),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len);
-	no  ->
-	    {Len,Bytes1} = decode_length(Bytes,undefined),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len);
-	{Lb,Ub}->
-	    {Len,Bytes1} = decode_length(Bytes,{Lb,Ub}),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len)
-    end.
-
-
-encode_NumericString(C,Val) ->
-    encode_known_multiplier_string(aligned,'NumericString',C,false,Val).
-decode_NumericString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'NumericString',C,false).
-
-encode_PrintableString(C,Val) ->
-    encode_known_multiplier_string(aligned,'PrintableString',C,false,Val).
-decode_PrintableString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'PrintableString',C,false).
-
-encode_VisibleString(C,Val) -> % equivalent with ISO646String
-    encode_known_multiplier_string(aligned,'VisibleString',C,false,Val).
-decode_VisibleString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'VisibleString',C,false).
-
-encode_IA5String(C,Val) ->
-    encode_known_multiplier_string(aligned,'IA5String',C,false,Val).
-decode_IA5String(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'IA5String',C,false).
-
-encode_BMPString(C,Val) ->
-    encode_known_multiplier_string(aligned,'BMPString',C,false,Val).
-decode_BMPString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'BMPString',C,false).
-
-encode_UniversalString(C,Val) ->
-    encode_known_multiplier_string(aligned,'UniversalString',C,false,Val).
-decode_UniversalString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'UniversalString',C,false).
-
-%% end of known-multiplier strings for which PER visible constraints are
-%% applied
-
-encode_GeneralString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_GeneralString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_GraphicString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_GraphicString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_ObjectDescriptor(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_ObjectDescriptor(Bytes) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_TeletexString(_C,Val) -> % equivalent with T61String
-    encode_restricted_string(aligned,Val).
-decode_TeletexString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_VideotexString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_VideotexString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% getBMPChars(Bytes,Len) ->{BMPcharList,RemainingBytes}
-%%
-getBMPChars(Bytes,1) ->
-    {O1,Bytes2} = getbits(Bytes,8),
-    {O2,Bytes3} = getbits(Bytes2,8),
-    if 
-	O1 == 0 ->
-	    {[O2],Bytes3};
-	true ->
-	    {[{0,0,O1,O2}],Bytes3}
-    end;
-getBMPChars(Bytes,Len) ->
-    getBMPChars(Bytes,Len,[]).
-
-getBMPChars(Bytes,0,Acc) ->
-    {lists:reverse(Acc),Bytes};
-getBMPChars(Bytes,Len,Acc) ->
-    {Octs,Bytes1} = getoctets_as_list(Bytes,2),
-    case Octs of
-	[0,O2] ->
-	    getBMPChars(Bytes1,Len-1,[O2|Acc]);
-	[O1,O2]->
-	    getBMPChars(Bytes1,Len-1,[{0,0,O1,O2}|Acc])
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% chars_encode(C,StringType,Value) -> ValueList
-%%
-%% encodes chars according to the per rules taking the constraint PermittedAlphabet 
-%% into account.
-%% This function does only encode the value part and NOT the length
-
-chars_encode(C,StringType,Value) ->
-    case {StringType,get_constraint(C,'PermittedAlphabet')} of
-	{'UniversalString',{_,_Sv}} ->
-	    exit({error,{asn1,{'not implemented',"UniversalString with PermittedAlphabet constraint"}}});
-	{'BMPString',{_,_Sv}} ->
-	    exit({error,{asn1,{'not implemented',"BMPString with PermittedAlphabet constraint"}}});
-	_ ->
-	    {NumBits,CharOutTab} = {get_NumBits(C,StringType),get_CharOutTab(C,StringType)}, 
-	    chars_encode2(Value,NumBits,CharOutTab)
-    end.
-
-chars_encode2([H|T],NumBits,{Min,Max,notab}) when  H =< Max, H >= Min ->
-    [{bits,NumBits,H-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([H|T],NumBits,{Min,Max,Tab}) when H =< Max, H >= Min ->
-    [{bits,NumBits,exit_if_false(H,element(H-Min+1,Tab))}|chars_encode2(T,NumBits,{Min,Max,Tab})];
-chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,notab}) -> 
-    %% no value range check here (ought to be, but very expensive)
-%    [{bits,NumBits,(A*B*C*D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-    [{bits,NumBits,((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,Tab}) -> 
-    %% no value range check here (ought to be, but very expensive)
-%    [{bits,NumBits,element((A*B*C*D)-Min,Tab)}|chars_encode2(T,NumBits,{Min,Max,notab})];
-    [{bits,NumBits,exit_if_false({A,B,C,D},element(((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min,Tab))}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([H|_T],_,{_,_,_}) ->
-    exit({error,{asn1,{illegal_char_value,H}}});
-chars_encode2([],_,_) ->
-    [].
-
-exit_if_false(V,false)->
-    exit({error,{asn1,{"illegal value according to Permitted alphabet constraint",V}}});
-exit_if_false(_,V) ->V.
-
-
-get_NumBits(C,StringType) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} ->
-	    charbits(length(Sv),aligned);
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    charbits(128,aligned); % 16#00..16#7F
-		'VisibleString' ->
-		    charbits(95,aligned); % 16#20..16#7E
-		'PrintableString' ->
-		    charbits(74,aligned); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-		'NumericString' ->
-		    charbits(11,aligned); % $ ,"0123456789"
-		'UniversalString' ->
-		    32;
-		'BMPString' ->
-		    16
-	    end
-    end.
-
-%%Maybe used later
-%%get_MaxChar(C,StringType) ->
-%%    case get_constraint(C,'PermittedAlphabet') of
-%%	{'SingleValue',Sv} ->
-%%	    lists:nth(length(Sv),Sv);
-%%	no ->
-%%	    case StringType of
-%%		'IA5String' ->
-%%		    16#7F; % 16#00..16#7F
-%%		'VisibleString' ->
-%%		    16#7E; % 16#20..16#7E
-%%		'PrintableString' ->
-%%		    $z; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-%%		'NumericString' ->
-%%		    $9; % $ ,"0123456789"
-%%		'UniversalString' ->
-%%		    16#ffffffff;
-%%		'BMPString' ->
-%%		    16#ffff
-%%	    end
-%%    end.
-
-%%Maybe used later
-%%get_MinChar(C,StringType) ->
-%%    case get_constraint(C,'PermittedAlphabet') of
-%%	{'SingleValue',Sv} ->
-%%	    hd(Sv);
-%%	no ->
-%%	    case StringType of
-%%		'IA5String' ->
-%%		    16#00; % 16#00..16#7F
-%%		'VisibleString' ->
-%%		    16#20; % 16#20..16#7E
-%%		'PrintableString' ->
-%%		    $\s; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-%%		'NumericString' ->
-%%		    $\s; % $ ,"0123456789"
-%%		'UniversalString' ->
-%%		    16#00;
-%%		'BMPString' ->
-%%		    16#00
-%%	    end
-%%    end.
-
-get_CharOutTab(C,StringType) ->
-    get_CharTab(C,StringType,out).
-
-get_CharInTab(C,StringType) ->
-    get_CharTab(C,StringType,in).
-
-get_CharTab(C,StringType,InOut) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} ->
-	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv,InOut);
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    {0,16#7F,notab};
-		'VisibleString' ->
-		    get_CharTab2(C,StringType,16#20,16#7F,notab,InOut);
-		'PrintableString' ->
-		    Chars = lists:sort(
-			      " '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
-		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars,InOut);
-		'NumericString' ->
-		    get_CharTab2(C,StringType,16#20,$9," 0123456789",InOut);
-		'UniversalString' ->
-		    {0,16#FFFFFFFF,notab};
-		'BMPString' ->
-		    {0,16#FFFF,notab}
-	    end
-    end.
-
-get_CharTab2(C,StringType,Min,Max,Chars,InOut) ->
-    BitValMax = (1 bsl get_NumBits(C,StringType))-1,
-    if
-	Max =< BitValMax ->
-	    {0,Max,notab};
-	true ->
-	    case InOut of
-		out ->
-		    {Min,Max,create_char_tab(Min,Chars)};
-		in  ->
-		    {Min,Max,list_to_tuple(Chars)}
-	    end
-    end.
-
-create_char_tab(Min,L) ->
-    list_to_tuple(create_char_tab(Min,L,0)).
-create_char_tab(Min,[Min|T],V) ->
-    [V|create_char_tab(Min+1,T,V+1)];
-create_char_tab(_Min,[],_V) ->
-    [];
-create_char_tab(Min,L,V) ->
-    [false|create_char_tab(Min+1,L,V)].
-
-%% This very inefficient and should be moved to compiletime
-charbits(NumOfChars,aligned) ->
-    case charbits(NumOfChars) of
-	1 -> 1;
-	2 -> 2;
-	B when B =< 4 -> 4;
-	B when B =< 8 -> 8;
-	B when B =< 16 -> 16; 
-	B when B =< 32 -> 32
-    end.
-
-charbits(NumOfChars) when NumOfChars =< 2 -> 1;
-charbits(NumOfChars) when NumOfChars =< 4 -> 2;
-charbits(NumOfChars) when NumOfChars =< 8 -> 3;
-charbits(NumOfChars) when NumOfChars =< 16 -> 4;
-charbits(NumOfChars) when NumOfChars =< 32 -> 5;
-charbits(NumOfChars) when NumOfChars =< 64 -> 6;
-charbits(NumOfChars) when NumOfChars =< 128 -> 7;
-charbits(NumOfChars) when NumOfChars =< 256 -> 8;
-charbits(NumOfChars) when NumOfChars =< 512 -> 9;
-charbits(NumOfChars) when NumOfChars =< 1024 -> 10;
-charbits(NumOfChars) when NumOfChars =< 2048 -> 11;
-charbits(NumOfChars) when NumOfChars =< 4096 -> 12;
-charbits(NumOfChars) when NumOfChars =< 8192 -> 13;
-charbits(NumOfChars) when NumOfChars =< 16384 -> 14;
-charbits(NumOfChars) when NumOfChars =< 32768 -> 15;
-charbits(NumOfChars) when NumOfChars =< 65536 -> 16;
-charbits(NumOfChars) when integer(NumOfChars) ->
-    16 + charbits1(NumOfChars bsr 16).
-
-charbits1(0) ->
-    0;
-charbits1(NumOfChars) ->
-    1 + charbits1(NumOfChars bsr 1).
-
-
-chars_decode(Bytes,_,'BMPString',C,Len) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	no ->
-	    getBMPChars(Bytes,Len);
-	_ ->
-	    exit({error,{asn1,
-			 {'not implemented',
-			  "BMPString with PermittedAlphabet constraint"}}})
-    end;
-chars_decode(Bytes,NumBits,StringType,C,Len) ->	
-    CharInTab = get_CharInTab(C,StringType),
-    chars_decode2(Bytes,CharInTab,NumBits,Len).
-
-
-chars_decode2(Bytes,CharInTab,NumBits,Len) ->
-    chars_decode2(Bytes,CharInTab,NumBits,Len,[]).
-
-chars_decode2(Bytes,_CharInTab,_NumBits,0,Acc) ->
-    {lists:reverse(Acc),Bytes};
-chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    Result = 
-	if
-	    Char < 256 -> Char;
-	    true ->
-		list_to_tuple(binary_to_list(<<Char:32>>))
-	end,
-    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
-% chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
-%     {Char,Bytes2} = getbits(Bytes,NumBits),
-%     Result = case minimum_octets(Char+Min) of
-% 		 [NewChar] -> NewChar;
-% 		 [C1,C2] -> {0,0,C1,C2};
-% 		 [C1,C2,C3] -> {0,C1,C2,C3};
-% 		 [C1,C2,C3,C4] -> {C1,C2,C3,C4}
-% 	     end,
-%     chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
-chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Char+Min|Acc]);
-
-%% BMPString and UniversalString with PermittedAlphabet is currently not supported
-chars_decode2(Bytes,{Min,Max,CharInTab},NumBits,Len,Acc) ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    chars_decode2(Bytes2,{Min,Max,CharInTab},NumBits,Len -1,[element(Char+1,CharInTab)|Acc]).
-
-
-						% X.691:17 
-encode_null(_) -> []; % encodes to nothing
-encode_null({Name,Val}) when atom(Name) ->
-    encode_null(Val).
-
-decode_null(Bytes) ->
-    {'NULL',Bytes}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_object_identifier(Val) -> CompleteList
-%% encode_object_identifier({Name,Val}) -> CompleteList
-%% Val -> {Int1,Int2,...,IntN} % N >= 2
-%% Name -> atom()
-%% Int1 -> integer(0..2)
-%% Int2 -> integer(0..39) when Int1 (0..1) else integer()
-%% Int3-N -> integer()
-%% CompleteList -> [{bits,8,Val}|{octets,Ol}|align|...]
-%%
-encode_object_identifier({Name,Val}) when atom(Name) ->
-    encode_object_identifier(Val);
-encode_object_identifier(Val) ->
-    OctetList = e_object_identifier(Val),
-    Octets = list_to_binary(OctetList), % performs a flatten at the same time
-    [{debug,object_identifier},encode_length(undefined,size(Octets)),{octets,Octets}].
-
-%% This code is copied from asn1_encode.erl (BER) and corrected and modified 
-
-e_object_identifier({'OBJECT IDENTIFIER',V}) ->
-    e_object_identifier(V);
-e_object_identifier({Cname,V}) when atom(Cname),tuple(V) ->
-    e_object_identifier(tuple_to_list(V));
-e_object_identifier({Cname,V}) when atom(Cname),list(V) ->
-    e_object_identifier(V);
-e_object_identifier(V) when tuple(V) ->
-    e_object_identifier(tuple_to_list(V));
-
-%% E1 = 0|1|2 and (E2 < 40 when E1 = 0|1) 
-e_object_identifier([E1,E2|Tail]) when E1 >= 0, E1 < 2, E2 < 40 ; E1==2 ->
-    Head = 40*E1 + E2,  % weird
-    e_object_elements([Head|Tail],[]);
-e_object_identifier(Oid=[_,_|_Tail]) ->
-    exit({error,{asn1,{'illegal_value',Oid}}}).
-
-e_object_elements([],Acc) ->
-    lists:reverse(Acc);
-e_object_elements([H|T],Acc) ->
-    e_object_elements(T,[e_object_element(H)|Acc]).
-
-e_object_element(Num) when Num < 128 ->
-    Num;
-%% must be changed to handle more than 2 octets
-e_object_element(Num) ->  %% when Num < ???
-    Left = ((Num band 2#11111110000000) bsr 7) bor 2#10000000,
-    Right = Num band 2#1111111 ,
-    [Left,Right].
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_object_identifier(Bytes) -> {ObjId,RemainingBytes}
-%% ObjId -> {integer(),integer(),...} % at least 2 integers
-%% RemainingBytes -> [integer()] when integer() (0..255)
-decode_object_identifier(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-    [First|Rest] = dec_subidentifiers(Octs,0,[]),
-    Idlist = if
-		 First < 40 ->
-		     [0,First|Rest];
-		 First < 80 ->
-		     [1,First - 40|Rest];
-		 true ->
-		     [2,First - 80|Rest]
-	     end,
-    {list_to_tuple(Idlist),Bytes3}.
-
-dec_subidentifiers([H|T],Av,Al) when H >=16#80 ->
-    dec_subidentifiers(T,(Av bsl 7) + (H band 16#7F),Al);
-dec_subidentifiers([H|T],Av,Al) ->
-    dec_subidentifiers(T,0,[(Av bsl 7) + H |Al]);
-dec_subidentifiers([],_Av,Al) ->
-    lists:reverse(Al).
-
-get_constraint([{Key,V}],Key) ->
-    V;
-get_constraint([],_Key) ->
-    no;
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	    no;
-	{value,{_,V}} -> 
-	    V
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% complete(InList) -> ByteList
-%% Takes a coded list with bits and bytes and converts it to a list of bytes
-%% Should be applied as the last step at encode of a complete ASN.1 type
-%%
-
-% complete(L) ->
-%     case complete1(L) of
-% 	{[],0} ->
-% 	    <<0>>;
-% 	{Acc,0} ->
-% 	    lists:reverse(Acc);
-% 	{[Hacc|Tacc],Acclen}  -> % Acclen >0
-% 	    Rest = 8 - Acclen,
-% 	    NewHacc = Hacc bsl Rest,	       
-% 	    lists:reverse([NewHacc|Tacc])
-%     end.
-
-
-% complete1(InList) when list(InList) ->
-%     complete1(InList,[]);
-% complete1(InList) ->
-%     complete1([InList],[]).
-
-% complete1([{debug,_}|T], Acc) ->
-%     complete1(T,Acc);
-% complete1([H|T],Acc) when list(H) ->
-%     {NewH,NewAcclen} = complete1(H,Acc),
-%     complete1(T,NewH,NewAcclen);
-
-% complete1([{0,Bin}|T],Acc,0) when binary(Bin) ->
-%     complete1(T,[Bin|Acc],0);
-% complete1([{Unused,Bin}|T],Acc,0) when integer(Unused),binary(Bin) ->
-%     Size = size(Bin)-1,
-%     <<Bs:Size/binary,B>> = Bin,
-%     complete1(T,[(B bsr Unused),Bs|Acc],8-Unused);
-% complete1([{Unused,Bin}|T],[Hacc|Tacc],Acclen) when integer(Unused),binary(Bin) ->
-%     Rest = 8 - Acclen,
-%     Used = 8 - Unused,
-%     case size(Bin) of
-% 	1 ->
-% 	    if
-% 		Rest >= Used ->
-% 		    <<B:Used,_:Unused>> = Bin,
-% 		    complete1(T,[(Hacc bsl Used) + B|Tacc],
-% 			     (Acclen+Used) rem 8);
-% 		true ->
-% 		    LeftOver = 8 - Rest - Unused,
-% 		    <<Val2:Rest,Val1:LeftOver,_:Unused>> = Bin,
-% 		    complete1(T,[Val1,(Hacc bsl Rest) + Val2|Tacc],
-% 			     (Acclen+Used) rem 8)
-% 	    end;
-% 	N ->
-% 	    if 
-% 		Rest == Used ->
-% 		    N1 = N - 1,
-% 		    <<B:Rest,Bs:N1/binary,_:Unused>> = Bin,
-% 		    complete1(T,[Bs,(Hacc bsl Rest) + B|Tacc],0);
-% 		Rest > Used ->
-% 		    N1 = N - 2,
-% 		    N2 = (8 - Rest) + Used,
-% 		    <<B1:Rest,Bytes:N1/binary,B2:N2,_:Unused>> = Bin,
-% 		    complete1(T,[B2,Bytes,(Hacc bsl Rest) + B1|Tacc],
-% 			     (Acclen + Used) rem 8);
-% 		true -> % Rest < Used
-% 		    N1 = N - 1,
-% 		    N2 = Used - Rest,
-% 		    <<B1:Rest,Bytes:N1/binary,B2:N2,_:Unused>> = Bin,
-% 		    complete1(T,[B2,Bytes,(Hacc bsl Rest) + B1|Tacc],
-% 			     (Acclen + Used) rem 8)
-% 	    end
-%     end;
-	    
-% %complete1([{octets,N,Val}|T],Acc,Acclen) when N =< 4 ,integer(Val) ->
-% %    complete1([{octets,<<Val:N/unit:8>>}|T],Acc,Acclen);
-% complete1([{octets,N,Val}|T],Acc,Acclen) when N =< 4 ,integer(Val) ->
-%    Newval = case N of
-% 		 1 -> 
-% 		     Val4 = Val band 16#FF,
-% 		     [Val4];
-% 		 2 -> 
-% 		     Val3 = (Val bsr 8) band 16#FF,
-% 		     Val4 = Val band 16#FF,
-% 		     [Val3,Val4];
-% 		 3 ->
-% 		     Val2 = (Val bsr 16) band 16#FF,
-% 		     Val3 = (Val bsr 8) band 16#FF,
-% 		     Val4 = Val band 16#FF,
-% 		     [Val2,Val3,Val4];
-% 		 4 ->
-% 		     Val1 = (Val bsr 24) band 16#FF,
-% 		     Val2 = (Val bsr 16) band 16#FF,
-% 		     Val3 = (Val bsr 8) band 16#FF,
-% 		     Val4 = Val band 16#FF,
-% 		     [Val1,Val2,Val3,Val4]
-% 	     end,
-%    complete1([{octets,Newval}|T],Acc,Acclen);
-
-% complete1([{octets,Bin}|T],Acc,Acclen) when binary(Bin) ->
-%     Rest = 8 - Acclen,
-%     if 
-% 	Rest == 8 ->
-% 	    complete1(T,[Bin|Acc],0);
-% 	true ->
-% 	    [Hacc|Tacc]=Acc,
-% 	    complete1(T,[Bin, Hacc bsl Rest|Tacc],0)
-%     end;
-
-% complete1([{octets,Oct}|T],Acc,Acclen) when list(Oct) ->
-%     Rest = 8 - Acclen,
-%     if 
-% 	Rest == 8 ->
-% 	    complete1(T,[list_to_binary(Oct)|Acc],0);
-% 	true ->
-% 	    [Hacc|Tacc]=Acc,
-% 	    complete1(T,[list_to_binary(Oct), Hacc bsl Rest|Tacc],0)
-%     end;
-
-% complete1([{bit,Val}|T], Acc, Acclen) ->
-%     complete1([{bits,1,Val}|T],Acc,Acclen);
-% complete1([{octet,Val}|T], Acc, Acclen) ->
-%     complete1([{octets,1,Val}|T],Acc,Acclen);
-
-% complete1([{bits,N,Val}|T], Acc, 0) when N =< 8 ->
-%     complete1(T,[Val|Acc],N);
-% complete1([{bits,N,Val}|T], [Hacc|Tacc], Acclen) when N =< 8 ->
-%     Rest = 8 - Acclen,
-%     if 
-% 	Rest >= N ->
-% 	    complete1(T,[(Hacc bsl N) + Val|Tacc],(Acclen+N) rem 8);
-% 	true -> 
-% 	    Diff = N - Rest, 
-% 	    NewHacc = (Hacc bsl Rest) + (Val bsr Diff),
-% 	    Mask = element(Diff,{1,3,7,15,31,63,127,255}),
-% 	    complete1(T,[(Val band Mask),NewHacc|Tacc],(Acclen+N) rem 8)
-%     end;
-% complete1([{bits,N,Val}|T], Acc, Acclen) -> % N > 8
-%     complete1([{bits,N-8,Val bsr 8},{bits,8,Val band 255}|T],Acc,Acclen);
-
-% complete1([align|T],Acc,0) ->
-%     complete1(T,Acc,0);
-% complete1([align|T],[Hacc|Tacc],Acclen) ->
-%     Rest = 8 - Acclen,
-%     complete1(T,[Hacc bsl Rest|Tacc],0);
-% complete1([{octets,N,Val}|T],Acc,Acclen) when list(Val) -> % no security check here 
-%     complete1([{octets,Val}|T],Acc,Acclen);
-
-% complete1([],Acc,Acclen) ->
-%     {Acc,Acclen}.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% complete(InList) -> ByteList
-%% Takes a coded list with bits and bytes and converts it to a list of bytes
-%% Should be applied as the last step at encode of a complete ASN.1 type
-%%
-
-complete(L) ->
-    case complete1(L) of
-	{[],[]} ->
-	    <<0>>;
-	{Acc,[]} ->
-	    Acc;
-	{Acc,Bacc}  ->
-	    [Acc|complete_bytes(Bacc)]
-    end.
-
-%% this function builds the ugly form of lists [E1|E2] to avoid having to reverse it at the end.
-%% this is done because it is efficient and that the result always will be sent on a port or
-%% converted by means of list_to_binary/1
-complete1(InList) when list(InList) ->
-    complete1(InList,[],[]);
-complete1(InList) ->
-    complete1([InList],[],[]).
-
-complete1([],Acc,Bacc) ->
-    {Acc,Bacc};
-complete1([H|T],Acc,Bacc) when list(H) ->
-    {NewH,NewBacc} = complete1(H,Acc,Bacc),
-    complete1(T,NewH,NewBacc);
-
-complete1([{octets,Bin}|T],Acc,[]) ->
-    complete1(T,[Acc|Bin],[]);
-
-complete1([{octets,Bin}|T],Acc,Bacc) ->
-    complete1(T,[Acc|[complete_bytes(Bacc),Bin]],[]);
-
-complete1([{debug,_}|T], Acc,Bacc) ->
-    complete1(T,Acc,Bacc);
-
-complete1([{bits,N,Val}|T],Acc,Bacc) ->
-    complete1(T,Acc,complete_update_byte(Bacc,Val,N));
-
-complete1([{bit,Val}|T],Acc,Bacc) ->
-    complete1(T,Acc,complete_update_byte(Bacc,Val,1));
-
-complete1([align|T],Acc,[]) ->
-    complete1(T,Acc,[]);
-complete1([align|T],Acc,Bacc) ->
-    complete1(T,[Acc|complete_bytes(Bacc)],[]);
-complete1([{0,Bin}|T],Acc,[]) when binary(Bin) ->
-    complete1(T,[Acc|Bin],[]);
-complete1([{Unused,Bin}|T],Acc,[]) when integer(Unused),binary(Bin) ->
-    Size = size(Bin)-1,
-    <<Bs:Size/binary,B>> = Bin,
-    NumBits = 8-Unused,
-    complete1(T,[Acc|Bs],[[B bsr Unused]|NumBits]);
-complete1([{Unused,Bin}|T],Acc,Bacc) when integer(Unused),binary(Bin) ->
-    Size = size(Bin)-1,
-    <<Bs:Size/binary,B>> = Bin,
-    NumBits = 8 - Unused,
-    Bf = complete_bytes(Bacc),
-    complete1(T,[Acc|[Bf,Bs]],[[B bsr Unused]|NumBits]).
-
-
-complete_update_byte([],Val,Len) ->
-    complete_update_byte([[0]|0],Val,Len);
-complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len == 8 ->
-    [[0,((Byte bsl Len) + Val) band 255|Bacc]|0];
-complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len > 8  ->
-    Rem = 8 - NumBits,
-    Rest = Len - Rem,
-    complete_update_byte([[0,((Byte bsl Rem) + (Val bsr Rest)) band 255 |Bacc]|0],Val,Rest);
-complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) ->
-    [[((Byte bsl Len) + Val) band 255|Bacc]|NumBits+Len].
-
- 
-complete_bytes([[_Byte|Bacc]|0]) ->
-    lists:reverse(Bacc);
-complete_bytes([[Byte|Bacc]|NumBytes]) ->
-    lists:reverse([(Byte bsl (8-NumBytes)) band 255|Bacc]);
-complete_bytes([]) ->
-    [].
-
-% complete_bytes(L) ->
-%     complete_bytes1(lists:reverse(L),[],[],0,0).
-
-% complete_bytes1([H={V,B}|T],Acc,ReplyAcc,NumBits,NumFields) when ((NumBits+B) rem 8) == 0 ->
-% 	    NewReplyAcc = [complete_bytes2([H|Acc],0)|ReplyAcc],
-% 	    complete_bytes1(T,[],NewReplyAcc,0,0);
-% complete_bytes1([H={V,B}|T],Acc,ReplyAcc,NumBits,NumFields)  when NumFields == 7; (NumBits+B) div 8 > 0 ->
-%     Rem = (NumBits+B) rem 8,
-%     NewReplyAcc = [complete_bytes2([{V bsr Rem,B - Rem}|Acc],0)|ReplyAcc],
-%     complete_bytes1([{V,Rem}|T],[],NewReplyAcc,0,0);
-% complete_bytes1([H={V,B}|T],Acc,ReplyAcc,NumBits,NumFields)  ->
-%     complete_bytes1(T,[H|Acc],ReplyAcc,NumBits+B,NumFields+1);
-% complete_bytes1([],[],ReplyAcc,_,_) ->
-%     lists:reverse(ReplyAcc);
-% complete_bytes1([],Acc,ReplyAcc,NumBits,_) ->
-%     PadBits = case NumBits rem 8 of
-% 		  0 -> 0;
-% 		  Rem -> 8 - Rem
-% 	      end,
-%     lists:reverse([complete_bytes2(Acc,PadBits)|ReplyAcc]).
-
-
-% complete_bytes2([{V1,B1}],PadBits) ->
-%     <<V1:B1,0:PadBits>>;
-% complete_bytes2([{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,0:PadBits>>;
-% complete_bytes2([{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,0:PadBits>>;
-% complete_bytes2([{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,V4:B4,0:PadBits>>;
-% complete_bytes2([{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,0:PadBits>>;
-% complete_bytes2([{V6,B6},{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,V6:B6,0:PadBits>>;
-% complete_bytes2([{V7,B7},{V6,B6},{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,V6:B6,V7:B7,0:PadBits>>;
-% complete_bytes2([{V8,B8},{V7,B7},{V6,B6},{V5,B5},{V4,B4},{V3,B3},{V2,B2},{V1,B1}],PadBits) ->
-%     <<V1:B1,V2:B2,V3:B3,V4:B4,V5:B5,V6:B6,V7:B7,V8:B8,0:PadBits>>.
-
-    
-    
-    
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per_bin_rt2ct.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per_bin_rt2ct.erl
deleted file mode 100644
index 0647650ea6..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per_bin_rt2ct.erl
+++ /dev/null
@@ -1,2102 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1rt_per_bin_rt2ct.erl,v 1.1 2008/12/17 09:53:31 mikpe Exp $
-%%
--module(asn1rt_per_bin_rt2ct).
-
-%% encoding / decoding of PER aligned
-
--include("asn1_records.hrl").
-
--export([dec_fixup/3, cindex/3, list_to_record/2]).
--export([setchoiceext/1, setext/1, fixoptionals/3, fixextensions/2, 
-	 getext/1, getextension/2, skipextensions/3, getbit/1, getchoice/3 ]).
--export([getoptionals/2, getoptionals2/2, 
-	 set_choice/3, encode_integer/2, encode_integer/3  ]).
--export([decode_integer/2, decode_integer/3, encode_small_number/1, 
-	 decode_boolean/1, encode_length/2, decode_length/1, decode_length/2,
-	 encode_small_length/1, decode_small_length/1,
-	 decode_compact_bit_string/3]).
--export([decode_enumerated/3, 
-	 encode_bit_string/3, decode_bit_string/3  ]).
--export([encode_octet_string/2, decode_octet_string/2,
-	 encode_null/1, decode_null/1,
-	 encode_object_identifier/1, decode_object_identifier/1,
-	 complete/1]).
-
-
--export([encode_open_type/2, decode_open_type/2]).
-
--export([%encode_UniversalString/2, decode_UniversalString/2,
-	 %encode_PrintableString/2, decode_PrintableString/2,
-	 encode_GeneralString/2, decode_GeneralString/2,
-	 encode_GraphicString/2, decode_GraphicString/2,
-	 encode_TeletexString/2, decode_TeletexString/2,
-	 encode_VideotexString/2, decode_VideotexString/2,
-	 %encode_VisibleString/2, decode_VisibleString/2,
-	 %encode_BMPString/2, decode_BMPString/2,
-	 %encode_IA5String/2, decode_IA5String/2,
-	 %encode_NumericString/2, decode_NumericString/2,
-	 encode_ObjectDescriptor/2, decode_ObjectDescriptor/1
-	]).
-
--export([decode_constrained_number/2,
-	 decode_constrained_number/3,
-	 decode_unconstrained_number/1,
-	 decode_semi_constrained_number/2,
-	 encode_unconstrained_number/1,
-	 decode_constrained_number/4,
-	 encode_octet_string/3,
-	 decode_octet_string/3,
-	 encode_known_multiplier_string/5,
-	 decode_known_multiplier_string/5,
-	 getoctets/2, getbits/2
-%	 start_drv/1,start_drv2/1,init_drv/1
-	]).
-
-
--export([eint_positive/1]).
--export([pre_complete_bits/2]).
-
--define('16K',16384).
--define('32K',32768).
--define('64K',65536).
-
-%%-define(nodriver,true).
-
-dec_fixup(Terms,Cnames,RemBytes) ->
-    dec_fixup(Terms,Cnames,RemBytes,[]).
-
-dec_fixup([novalue|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([{_Name,novalue}|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([H|T],[Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,[{Hc,H}|Acc]);
-dec_fixup([],_Cnames,RemBytes,Acc) ->
-    {lists:reverse(Acc),RemBytes}.
-
-cindex(Ix,Val,Cname) ->
-    case element(Ix,Val) of
-	{Cname,Val2} -> Val2;
-	X -> X
-    end.
-
-%% converts a list to a record if necessary
-list_to_record(_,Tuple) when tuple(Tuple) ->
-    Tuple;
-list_to_record(Name,List) when list(List) ->
-    list_to_tuple([Name|List]).
-
-%%--------------------------------------------------------
-%% setchoiceext(InRootSet) -> [{bit,X}]
-%% X  is set to  1 when InRootSet==false
-%% X  is set to  0 when InRootSet==true
-%%
-setchoiceext(true) ->
-%    [{debug,choiceext},{bits,1,0}];
-    [0];
-setchoiceext(false) ->
-%    [{debug,choiceext},{bits,1,1}].
-    [1].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% setext(true|false) ->  CompleteList
-%%
-
-setext(false) ->
-%    [{debug,ext},{bits,1,0}];
-    [0];
-setext(true) ->
-%    [{debug,ext},{bits,1,1}];
-    [1].
-
-fixoptionals(OptList,_OptLength,Val) when tuple(Val) ->
-%    Bits = fixoptionals(OptList,Val,0),
-%    {Val,{bits,OptLength,Bits}};
-%    {Val,[10,OptLength,Bits]};
-    {Val,fixoptionals(OptList,Val,[])};
-
-fixoptionals([],_,Acc) ->
-    %% Optbits
-    lists:reverse(Acc);
-fixoptionals([Pos|Ot],Val,Acc) ->
-    case element(Pos,Val) of
-% 	asn1_NOVALUE -> fixoptionals(Ot,Val,Acc bsl 1);
-% 	asn1_DEFAULT -> fixoptionals(Ot,Val,Acc bsl 1);
-% 	_ -> fixoptionals(Ot,Val,(Acc bsl 1) + 1)
-	asn1_NOVALUE -> fixoptionals(Ot,Val,[0|Acc]);
-	asn1_DEFAULT -> fixoptionals(Ot,Val,[0|Acc]);
-	_ -> fixoptionals(Ot,Val,[1|Acc])
-    end.
-
-
-getext(Bytes) when tuple(Bytes) ->
-    getbit(Bytes);
-getext(Bytes) when binary(Bytes) ->
-    getbit({0,Bytes});
-getext(Bytes) when list(Bytes) ->
-    getbit({0,Bytes}).
-
-getextension(0, Bytes) ->
-    {{},Bytes};
-getextension(1, Bytes) ->
-    {Len,Bytes2} = decode_small_length(Bytes),
-    {Blist, Bytes3} = getbits_as_list(Len,Bytes2),
-    {list_to_tuple(Blist),Bytes3}.
-
-fixextensions({ext,ExtPos,ExtNum},Val) ->
-    case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
-	0 -> [];
-	ExtBits ->
-%	    [encode_small_length(ExtNum),{bits,ExtNum,ExtBits}]
-%	    [encode_small_length(ExtNum),[10,ExtNum,ExtBits]]
-	    [encode_small_length(ExtNum),pre_complete_bits(ExtNum,ExtBits)]
-    end.
-
-fixextensions(Pos,MaxPos,_,Acc) when Pos >= MaxPos ->
-    Acc;
-fixextensions(Pos,ExtPos,Val,Acc) ->
-    Bit = case catch(element(Pos+1,Val)) of
-	      asn1_NOVALUE ->
-		  0;
-	      asn1_NOEXTVALUE ->
-		  0;
-	      {'EXIT',_} ->
-		  0;
-	      _ ->
-		  1
-	  end,
-    fixextensions(Pos+1,ExtPos,Val,(Acc bsl 1)+Bit).
-
-skipextensions(Bytes,Nr,ExtensionBitPattern) -> 
-    case (catch element(Nr,ExtensionBitPattern)) of
-	1 ->
-	    {_,Bytes2} = decode_open_type(Bytes,[]),
-	    skipextensions(Bytes2, Nr+1, ExtensionBitPattern);
-	0 ->
-	    skipextensions(Bytes, Nr+1, ExtensionBitPattern);
-	{'EXIT',_} -> % badarg, no more extensions
-	    Bytes
-    end.
-
-
-getchoice(Bytes,1,0) -> % only 1 alternative is not encoded
-    {0,Bytes};
-getchoice(Bytes,_,1) ->
-    decode_small_number(Bytes);
-getchoice(Bytes,NumChoices,0) ->
-    decode_constrained_number(Bytes,{0,NumChoices-1}).
-
-%% old version kept for backward compatibility with generates from R7B01
-getoptionals(Bytes,NumOpt) ->
-    {Blist,Bytes1} = getbits_as_list(NumOpt,Bytes),
-    {list_to_tuple(Blist),Bytes1}.
-
-%% new version used in generates from r8b_patch/3 and later
-getoptionals2(Bytes,NumOpt) ->
-    {_,_} = getbits(Bytes,NumOpt).
-
-
-%% getbits_as_binary(Num,Bytes) -> {{Unused,BinBits},RestBytes},
-%% Num = integer(),
-%% Bytes = list() | tuple(),
-%% Unused = integer(),
-%% BinBits = binary(),
-%% RestBytes = tuple()
-getbits_as_binary(Num,Bytes) when binary(Bytes) ->
-    getbits_as_binary(Num,{0,Bytes});
-getbits_as_binary(0,Buffer) ->
-    {{0,<<>>},Buffer};
-getbits_as_binary(Num,{0,Bin}) when Num > 16 ->
-    Used = Num rem 8,
-    Pad = (8 - Used) rem 8,
-%%    Nbytes = Num div 8,
-    <<Bits:Num,_:Pad,RestBin/binary>> = Bin,
-    {{Pad,<<Bits:Num,0:Pad>>},RestBin};
-getbits_as_binary(Num,Buffer={_Used,_Bin}) -> % Unaligned buffer
-    %% Num =< 16,
-    {Bits2,Buffer2} = getbits(Buffer,Num),
-    Pad = (8 - (Num rem 8)) rem 8,
-    {{Pad,<<Bits2:Num,0:Pad>>},Buffer2}.
-
-
-% integer_from_list(Int,[],BigInt) ->
-%     BigInt;
-% integer_from_list(Int,[H|T],BigInt) when Int < 8 ->
-%     (BigInt bsl Int) bor (H bsr (8-Int));
-% integer_from_list(Int,[H|T],BigInt) ->
-%     integer_from_list(Int-8,T,(BigInt bsl 8) bor H).
-
-getbits_as_list(Num,Bytes) when binary(Bytes) ->
-    getbits_as_list(Num,{0,Bytes},[]);
-getbits_as_list(Num,Bytes) ->
-    getbits_as_list(Num,Bytes,[]).
-
-%% If buffer is empty and nothing more will be picked.
-getbits_as_list(0, B, Acc) ->
-    {lists:reverse(Acc),B};
-%% If first byte in buffer is full and at least one byte will be picked,
-%% then pick one byte.
-getbits_as_list(N,{0,Bin},Acc) when N >= 8 ->
-    <<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1,Rest/binary>> = Bin,
-    getbits_as_list(N-8,{0,Rest},[B0,B1,B2,B3,B4,B5,B6,B7|Acc]);
-getbits_as_list(N,{Used,Bin},Acc) when N >= 4, Used =< 4 ->
-    NewUsed = Used + 4,
-    Rem = 8 - NewUsed,
-    <<_:Used,B3:1,B2:1,B1:1,B0:1,_:Rem, Rest/binary>> = Bin,
-    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
-    getbits_as_list(N-4,{NewUsed rem 8,NewRest},[B0,B1,B2,B3|Acc]);
-getbits_as_list(N,{Used,Bin},Acc) when N >= 2, Used =< 6  ->
-    NewUsed = Used + 2,
-    Rem = 8 - NewUsed,
-    <<_:Used,B1:1,B0:1,_:Rem, Rest/binary>> = Bin,
-    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
-    getbits_as_list(N-2,{NewUsed rem 8,NewRest},[B0,B1|Acc]);
-getbits_as_list(N,{Used,Bin},Acc) when Used =< 7 ->
-    NewUsed = Used + 1,
-    Rem = 8 - NewUsed,
-    <<_:Used,B0:1,_:Rem, Rest/binary>> = Bin,
-    NewRest = case Rem of 0 -> Rest; _ -> Bin end,
-    getbits_as_list(N-1,{NewUsed rem 8,NewRest},[B0|Acc]).
-
-
-getbit({7,<<_:7,B:1,Rest/binary>>}) ->
-    {B,{0,Rest}};
-getbit({0,Buffer = <<B:1,_:7,_/binary>>}) ->
-    {B,{1,Buffer}};
-getbit({Used,Buffer}) ->
-    Unused = (8 - Used) - 1,
-    <<_:Used,B:1,_:Unused,_/binary>> = Buffer,
-    {B,{Used+1,Buffer}};
-getbit(Buffer) when binary(Buffer) ->
-    getbit({0,Buffer}).
-
-
-getbits({0,Buffer},Num) when (Num rem 8) == 0 ->
-    <<Bits:Num,Rest/binary>> = Buffer,
-    {Bits,{0,Rest}};
-getbits({Used,Bin},Num) ->
-    NumPlusUsed = Num + Used,
-    NewUsed = NumPlusUsed rem 8,
-    Unused = (8-NewUsed) rem 8,
-    case Unused of
-	0 ->
-	    <<_:Used,Bits:Num,Rest/binary>> = Bin,
-	    {Bits,{0,Rest}};
-	_ ->
-	    Bytes = NumPlusUsed div 8,
-	    <<_:Used,Bits:Num,_:Unused,_/binary>> = Bin,
-	    <<_:Bytes/binary,Rest/binary>> = Bin,
-	    {Bits,{NewUsed,Rest}}
-    end;
-getbits(Bin,Num) when binary(Bin) ->
-    getbits({0,Bin},Num).
-
-
-
-% getoctet(Bytes) when list(Bytes) ->
-%     getoctet({0,Bytes});
-% getoctet(Bytes) ->
-%     %%    io:format("getoctet:Buffer = ~p~n",[Bytes]),
-%     getoctet1(Bytes).
-
-% getoctet1({0,[H|T]}) ->
-%     {H,{0,T}};
-% getoctet1({Pos,[_,H|T]}) ->
-%     {H,{0,T}}.
-
-align({0,L}) ->
-    {0,L};
-align({_Pos,<<_H,T/binary>>}) ->
-    {0,T};
-align(Bytes) ->
-    {0,Bytes}.
-
-%% First align buffer, then pick the first Num octets.
-%% Returns octets as an integer with bit significance as in buffer.
-getoctets({0,Buffer},Num) ->
-    <<Val:Num/integer-unit:8,RestBin/binary>> = Buffer,
-    {Val,{0,RestBin}};
-getoctets({U,<<_Padding,Rest/binary>>},Num) when U /= 0 ->
-    getoctets({0,Rest},Num);
-getoctets(Buffer,Num) when binary(Buffer) ->
-    getoctets({0,Buffer},Num).
-% getoctets(Buffer,Num) ->
-%     %%    io:format("getoctets:Buffer = ~p~nNum = ~p~n",[Buffer,Num]),
-%     getoctets(Buffer,Num,0).
-
-% getoctets(Buffer,0,Acc) ->
-%     {Acc,Buffer};
-% getoctets(Buffer,Num,Acc) ->
-%     {Oct,NewBuffer} = getoctet(Buffer),
-%     getoctets(NewBuffer,Num-1,(Acc bsl 8)+Oct). 
-
-% getoctets_as_list(Buffer,Num) ->
-%     getoctets_as_list(Buffer,Num,[]).
-
-% getoctets_as_list(Buffer,0,Acc) ->
-%     {lists:reverse(Acc),Buffer};
-% getoctets_as_list(Buffer,Num,Acc) ->
-%     {Oct,NewBuffer} = getoctet(Buffer),
-%     getoctets_as_list(NewBuffer,Num-1,[Oct|Acc]).
-
-%% First align buffer, then pick the first Num octets.
-%% Returns octets as a binary
-getoctets_as_bin({0,Bin},Num)->
-    <<Octets:Num/binary,RestBin/binary>> = Bin,
-    {Octets,{0,RestBin}};
-getoctets_as_bin({_U,Bin},Num) ->
-    <<_Padding,Octets:Num/binary,RestBin/binary>> = Bin,
-    {Octets,{0,RestBin}};
-getoctets_as_bin(Bin,Num) when binary(Bin) ->
-    getoctets_as_bin({0,Bin},Num).
-
-%% same as above but returns octets as a List
-getoctets_as_list(Buffer,Num) ->
-    {Bin,Buffer2} = getoctets_as_bin(Buffer,Num),
-    {binary_to_list(Bin),Buffer2}.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% set_choice(Alt,Choices,Altnum) -> ListofBitSettings
-%% Alt = atom()
-%% Altnum = integer() | {integer(),integer()}% number of alternatives
-%% Choices = [atom()] | {[atom()],[atom()]}
-%% When Choices is a tuple the first list is the Rootset and the
-%% second is the Extensions and then Altnum must also be a tuple with the
-%% lengths of the 2 lists 
-%%
-set_choice(Alt,{L1,L2},{Len1,_Len2}) ->
-    case set_choice_tag(Alt,L1) of
-	N when integer(N), Len1 > 1 ->
-%	    [{bits,1,0}, % the value is in the root set
-%	     encode_constrained_number({0,Len1-1},N)];
-	    [0, % the value is in the root set
-	     encode_constrained_number({0,Len1-1},N)];
-	N when integer(N) ->
-%	    [{bits,1,0}]; % no encoding if only 0 or 1 alternative
-	    [0]; % no encoding if only 0 or 1 alternative
-	false ->
-%	    [{bits,1,1}, % extension value
-	    [1, % extension value
-	     case set_choice_tag(Alt,L2) of
-		 N2 when integer(N2) ->
-		     encode_small_number(N2);
-		 false ->
-		     unknown_choice_alt
-	     end]
-    end;
-set_choice(Alt,L,Len) ->
-    case set_choice_tag(Alt,L) of
-	N when integer(N), Len > 1 ->
-	    encode_constrained_number({0,Len-1},N);
-	N when integer(N) ->
-	    []; % no encoding if only 0 or 1 alternative
-	false ->
-	    [unknown_choice_alt]
-    end.
-
-set_choice_tag(Alt,Choices) ->
-    set_choice_tag(Alt,Choices,0).
-
-set_choice_tag(Alt,[Alt|_Rest],Tag) ->
-    Tag;
-set_choice_tag(Alt,[_H|Rest],Tag) ->
-    set_choice_tag(Alt,Rest,Tag+1);
-set_choice_tag(_Alt,[],_Tag) ->
-    false.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_fragmented_XXX; decode of values encoded fragmented according
-%% to ITU-T X.691 clause 10.9.3.8. The unit (XXX) is either bits, octets,
-%% characters or number of components (in a choice,sequence or similar).
-%% Buffer is a buffer {Used, Bin}.
-%% C is the constrained length.
-%% If the buffer is not aligned, this function does that.
-decode_fragmented_bits({0,Buffer},C) ->
-    decode_fragmented_bits(Buffer,C,[]);
-decode_fragmented_bits({_N,<<_B,Bs/binary>>},C) ->
-    decode_fragmented_bits(Bs,C,[]).
-
-decode_fragmented_bits(<<3:2,Len:6,Bin/binary>>,C,Acc) ->
-    {Value,Bin2} = split_binary(Bin, Len * ?'16K'),
-    decode_fragmented_bits(Bin2,C,[Value,Acc]);
-decode_fragmented_bits(<<0:1,0:7,Bin/binary>>,C,Acc) ->
-    BinBits = list_to_binary(lists:reverse(Acc)),
-    case C of
-	Int when integer(Int),C == size(BinBits) ->
-	    {BinBits,{0,Bin}};
-	Int when integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,BinBits}}});
-	_ ->
-	    {BinBits,{0,Bin}}
-    end;
-decode_fragmented_bits(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
-    Result = {BinBits,{Used,_Rest}} =
-	case (Len rem 8) of
-	    0 -> 
-		<<Value:Len/binary-unit:1,Bin2/binary>> = Bin,
-		{list_to_binary(lists:reverse([Value|Acc])),{0,Bin2}};
-	    Rem ->
-		Bytes = Len div 8,
-		U = 8 - Rem,
-		<<Value:Bytes/binary-unit:8,Bits1:Rem,Bits2:U,Bin2/binary>> = Bin,
-		{list_to_binary(lists:reverse([Bits1 bsl U,Value|Acc])),
-		 {Rem,<<Bits2,Bin2/binary>>}}
-	end,
-    case C of
-	 Int when integer(Int),C == (size(BinBits) - ((8 - Used) rem 8)) ->
-	    Result;
-	Int when integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,BinBits}}});
-	_ ->
-	    Result
-    end.
-
-
-decode_fragmented_octets({0,Bin},C) ->
-    decode_fragmented_octets(Bin,C,[]);
-decode_fragmented_octets({_N,<<_B,Bs/binary>>},C) ->
-    decode_fragmented_octets(Bs,C,[]).
-
-decode_fragmented_octets(<<3:2,Len:6,Bin/binary>>,C,Acc) ->
-    {Value,Bin2} = split_binary(Bin,Len * ?'16K'),
-    decode_fragmented_octets(Bin2,C,[Value,Acc]);
-decode_fragmented_octets(<<0:1,0:7,Bin/binary>>,C,Acc) ->
-    Octets = list_to_binary(lists:reverse(Acc)),
-    case C of
-	Int when integer(Int), C == size(Octets) ->
-	    {Octets,{0,Bin}};
-	Int when integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,Octets}}});
-	_ ->
-	    {Octets,{0,Bin}}
-    end;
-decode_fragmented_octets(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
-    <<Value:Len/binary-unit:8,Bin2/binary>> = Bin,
-    BinOctets = list_to_binary(lists:reverse([Value|Acc])),
-    case C of
-	Int when integer(Int),size(BinOctets) == Int ->
-	    {BinOctets,Bin2};
-	Int when integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,BinOctets}}});
-	_ ->
-	    {BinOctets,Bin2}
-    end.
-
-
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_open_type(Constraint, Value) -> CompleteList
-%% Value = list of bytes of an already encoded value (the list must be flat)
-%%         | binary
-%% Contraint = not used in this version
-%%
-encode_open_type(_Constraint, Val) when list(Val) ->
-    Bin = list_to_binary(Val),
-    case size(Bin) of 
-	Size when Size>255 ->
-	    [encode_length(undefined,Size),[21,<<Size:16>>,Bin]];
-	Size ->
-	    [encode_length(undefined,Size),[20,Size,Bin]]
-    end;
-%    [encode_length(undefined,size(Bin)),{octets,Bin}]; % octets implies align
-encode_open_type(_Constraint, Val) when binary(Val) ->
-%    [encode_length(undefined,size(Val)),{octets,Val}]. % octets implies align
-    case size(Val) of
-	Size when Size>255 ->
-	    [encode_length(undefined,size(Val)),[21,<<Size:16>>,Val]]; % octets implies align
-	Size ->
-	    [encode_length(undefined,Size),[20,Size,Val]]
-    end.
-%% the binary_to_list is not optimal but compatible with the current solution
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_open_type(Buffer,Constraint) -> Value
-%% Constraint is not used in this version
-%% Buffer = [byte] with PER encoded data 
-%% Value = [byte] with decoded data (which must be decoded again as some type)
-%%
-decode_open_type(Bytes, _Constraint) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    getoctets_as_bin(Bytes2,Len).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_integer(Constraint,Value,NamedNumberList) -> CompleteList
-%% encode_integer(Constraint,Value) -> CompleteList
-%% encode_integer(Constraint,{Name,Value}) -> CompleteList
-%% 
-%%
-encode_integer(C,V,NamedNumberList) when atom(V) ->
-    case lists:keysearch(V,1,NamedNumberList) of
-	{value,{_,NewV}} -> 
-	    encode_integer(C,NewV);
-	_ -> 
-	    exit({error,{asn1,{namednumber,V}}})
-    end;
-encode_integer(C,V,_NamedNumberList) when integer(V) ->
-    encode_integer(C,V);
-encode_integer(C,{Name,V},NamedNumberList) when atom(Name) ->
-    encode_integer(C,V,NamedNumberList).
-
-encode_integer(C,{Name,Val}) when atom(Name) ->
-    encode_integer(C,Val);
-
-encode_integer([{Rc,_Ec}],Val) when tuple(Rc) -> % XXX when is this invoked? First argument most often a list,...Ok this is the extension case...but it doesn't work.
-    case (catch encode_integer([Rc],Val)) of
-	{'EXIT',{error,{asn1,_}}} ->
-%	    [{bits,1,1},encode_unconstrained_number(Val)];
-	    [1,encode_unconstrained_number(Val)];
-	Encoded ->
-%	    [{bits,1,0},Encoded]
-	    [0,Encoded]
-    end;
-
-encode_integer([],Val) ->
-    encode_unconstrained_number(Val);
-%% The constraint is the effective constraint, and in this case is a number
-encode_integer([{'SingleValue',V}],V) ->
-    [];
-encode_integer([{'ValueRange',VR={Lb,Ub},Range,PreEnc}],Val) when Val >= Lb,
-						Ub >= Val ->
-    %% this case when NamedNumberList
-    encode_constrained_number(VR,Range,PreEnc,Val);
-encode_integer([{'ValueRange',{Lb,'MAX'}}],Val) ->
-    encode_semi_constrained_number(Lb,Val);
-encode_integer([{'ValueRange',{'MIN',_}}],Val) ->
-    encode_unconstrained_number(Val);
-encode_integer([{'ValueRange',VR={_Lb,_Ub}}],Val) ->
-    encode_constrained_number(VR,Val);
-encode_integer(_,Val) ->
-    exit({error,{asn1,{illegal_value,Val}}}).
-
-    
-
-decode_integer(Buffer,Range,NamedNumberList) ->
-    {Val,Buffer2} = decode_integer(Buffer,Range),
-    case lists:keysearch(Val,2,NamedNumberList) of
-	{value,{NewVal,_}} -> {NewVal,Buffer2};
-	_ -> {Val,Buffer2}
-    end.
-
-decode_integer(Buffer,[{Rc,_Ec}]) when tuple(Rc) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> decode_integer(Buffer2,[Rc]);
-	1 -> decode_unconstrained_number(Buffer2)
-    end;
-decode_integer(Buffer,undefined) ->
-    decode_unconstrained_number(Buffer);
-decode_integer(Buffer,C) ->
-    case get_constraint(C,'SingleValue') of
-	V when integer(V) ->
-	    {V,Buffer};
-	_ ->
-	    decode_integer1(Buffer,C)
-    end.
-
-decode_integer1(Buffer,C) ->
-    case VR = get_constraint(C,'ValueRange') of
-	no ->
-	    decode_unconstrained_number(Buffer);
-	{Lb, 'MAX'} ->
-	    decode_semi_constrained_number(Buffer,Lb);
-	{_Lb,_Ub} ->
-	    decode_constrained_number(Buffer,VR)
-    end.
-
-%% X.691:10.6 Encoding of a normally small non-negative whole number
-%% Use this for encoding of CHOICE index if there is an extension marker in 
-%% the CHOICE
-encode_small_number({Name,Val}) when atom(Name) ->
-    encode_small_number(Val);
-encode_small_number(Val) when Val =< 63 ->
-%    [{bits,1,0},{bits,6,Val}];
-%    [{bits,7,Val}]; % same as above but more efficient
-    [10,7,Val]; % same as above but more efficient
-encode_small_number(Val) ->
-%    [{bits,1,1},encode_semi_constrained_number(0,Val)].
-    [1,encode_semi_constrained_number(0,Val)].
-
-decode_small_number(Bytes) ->
-    {Bit,Bytes2} = getbit(Bytes),
-    case Bit of
-	0 -> 
-	    getbits(Bytes2,6);
-	1 ->
-	    decode_semi_constrained_number(Bytes2,0)
-    end.
-
-%% X.691:10.7 Encoding of a semi-constrained whole number
-%% might be an optimization encode_semi_constrained_number(0,Val) ->
-encode_semi_constrained_number(C,{Name,Val}) when atom(Name) ->
-    encode_semi_constrained_number(C,Val);
-encode_semi_constrained_number({Lb,'MAX'},Val) ->
-    encode_semi_constrained_number(Lb,Val);
-encode_semi_constrained_number(Lb,Val) ->
-    Val2 = Val - Lb,
-    Oct = eint_positive(Val2),
-    Len = length(Oct),
-    if 
-	Len < 128 ->
-	    %{octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
-	    [20,Len+1,[Len|Oct]];
-	Len < 256 ->
-	    [encode_length(undefined,Len),[20,Len,Oct]];
-	true ->
-	    [encode_length(undefined,Len),[21,<<Len:16>>,Oct]]
-    end.
-
-decode_semi_constrained_number(Bytes,{Lb,_}) ->
-    decode_semi_constrained_number(Bytes,Lb);
-decode_semi_constrained_number(Bytes,Lb) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {V,Bytes3} = getoctets(Bytes2,Len),
-    {V+Lb,Bytes3}.
-
-encode_constrained_number({Lb,_Ub},_Range,{bits,N},Val) ->
-    Val2 = Val-Lb,
-%    {bits,N,Val2};
-    [10,N,Val2];
-encode_constrained_number({Lb,_Ub},_Range,{octets,N},Val) when N < 256->
-    %% N is 8 or 16 (1 or 2 octets)
-    Val2 = Val-Lb,
-%    {octets,<<Val2:N/unit:8>>};
-    [20,N,Val2];
-encode_constrained_number({Lb,_Ub},_Range,{octets,N},Val) -> % N>255
-    %% N is 8 or 16 (1 or 2 octets)
-    Val2 = Val-Lb,
-%    {octets,<<Val2:N/unit:8>>};
-    [21,<<N:16>>,Val2];
-encode_constrained_number({Lb,_Ub},Range,_,Val) ->
-    Val2 = Val-Lb,
-    if
-	Range =< 16#1000000  -> % max 3 octets
-	    Octs = eint_positive(Val2),
-%	    [encode_length({1,3},size(Octs)),{octets,Octs}];
-	    L = length(Octs),
-	    [encode_length({1,3},L),[20,L,Octs]];
-	Range =< 16#100000000  -> % max 4 octets
-	    Octs = eint_positive(Val2),
-%	    [encode_length({1,4},size(Octs)),{octets,Octs}];
-	    L = length(Octs),
-	    [encode_length({1,4},L),[20,L,Octs]];
-	Range =< 16#10000000000  -> % max 5 octets
-	    Octs = eint_positive(Val2),
-%	    [encode_length({1,5},size(Octs)),{octets,Octs}];
-	    L = length(Octs),
-	    [encode_length({1,5},L),[20,L,Octs]];
-	true  ->
-	    exit({not_supported,{integer_range,Range}})
-    end.
-
-encode_constrained_number(Range,{Name,Val}) when atom(Name) ->
-    encode_constrained_number(Range,Val);
-encode_constrained_number({Lb,Ub},Val) when Val >= Lb, Ub >= Val -> 
-    Range = Ub - Lb + 1,
-    Val2 = Val - Lb,
-    if 
-	Range  == 2 ->
-%	    Size = {bits,1,Val2};
-	    [Val2];
-	Range  =< 4 -> 
-%	    Size = {bits,2,Val2};
-	    [10,2,Val2];
-	Range  =< 8 ->
-	    [10,3,Val2];
-	Range  =< 16 ->
-	    [10,4,Val2];
-	Range  =< 32 ->
-	    [10,5,Val2];
-	Range  =< 64 ->
-	    [10,6,Val2];
-	Range  =< 128 ->
-	    [10,7,Val2];
-	Range  =< 255 ->
-	    [10,8,Val2];
-	Range  =< 256 ->
-%	    Size = {octets,[Val2]};
-	    [20,1,Val2];
-	Range  =< 65536 ->
-%	    Size = {octets,<<Val2:16>>};
-	    [20,2,<<Val2:16>>];
-	Range =< 16#1000000  ->
-	    Octs = eint_positive(Val2),
-%	    [{bits,2,length(Octs)-1},{octets,Octs}];
-	    Len = length(Octs),
-	    [10,2,Len-1,20,Len,Octs];
-	Range =< 16#100000000  ->
-	    Octs = eint_positive(Val2),
-	    Len = length(Octs),
-	    [10,2,Len-1,20,Len,Octs];
-	Range =< 16#10000000000  ->
-	    Octs = eint_positive(Val2),
-	    Len = length(Octs),
-	    [10,3,Len-1,20,Len,Octs];
-	true  ->
-	    exit({not_supported,{integer_range,Range}})
-    end;
-encode_constrained_number({_,_},Val) -> 
-    exit({error,{asn1,{illegal_value,Val}}}).
-
-decode_constrained_number(Buffer,VR={Lb,Ub}) ->
-    Range = Ub - Lb + 1,
-    decode_constrained_number(Buffer,VR,Range).
-
-decode_constrained_number(Buffer,{Lb,_Ub},_Range,{bits,N}) ->
-    {Val,Remain} = getbits(Buffer,N),
-    {Val+Lb,Remain};
-decode_constrained_number(Buffer,{Lb,_Ub},_Range,{octets,N}) ->
-    {Val,Remain} = getoctets(Buffer,N),
-    {Val+Lb,Remain}.
-
-decode_constrained_number(Buffer,{Lb,_Ub},Range) ->
-						%    Val2 = Val - Lb,
-    {Val,Remain} = 
-	if 
-	    Range  == 2 ->
-		getbits(Buffer,1);
-	    Range  =< 4 -> 
-		getbits(Buffer,2);
-	    Range  =< 8 ->
-		getbits(Buffer,3);
-	    Range  =< 16 ->
-		getbits(Buffer,4);
-	    Range  =< 32 ->
-		getbits(Buffer,5);
-	    Range  =< 64 ->
-		getbits(Buffer,6);
-	    Range  =< 128 ->
-		getbits(Buffer,7);
-	    Range  =< 255 ->
-		getbits(Buffer,8);
-	    Range  =< 256 ->
-		getoctets(Buffer,1);
-	    Range  =< 65536 ->
-		getoctets(Buffer,2);
-	    Range =< 16#1000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,3}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	    Range =< 16#100000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,4}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	    Range =< 16#10000000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,5}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	    true  ->
-		exit({not_supported,{integer_range,Range}})
-	end,
-    {Val+Lb,Remain}.
-
-%% X.691:10.8 Encoding of an unconstrained whole number
-
-encode_unconstrained_number(Val) when Val >= 0 ->
-    Oct = eint(Val,[]),
-    Len = length(Oct),
-    if 
-	Len < 128 ->
-	    %{octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
-	    [20,Len+1,[Len|Oct]];
-	Len < 256 ->
-%	    [encode_length(undefined,Len),20,Len,Oct];
-	    [20,Len+2,<<2:2,Len:14>>,Oct];% equiv with encode_length(undefined,Len) but faster
-	true ->
-%	    [encode_length(undefined,Len),{octets,Oct}]
-	    [encode_length(undefined,Len),[21,<<Len:16>>,Oct]]
-    end;
-encode_unconstrained_number(Val) -> % negative
-    Oct = enint(Val,[]),
-    Len = length(Oct),
-    if 
-	Len < 128 ->
-%	    {octets,[Len|Oct]}; % equiv with encode_length(undefined,Len) but faster
-	    [20,Len+1,[Len|Oct]];% equiv with encode_length(undefined,Len) but faster
-	Len < 256 ->
-%	    [encode_length(undefined,Len),20,Len,Oct];
-	    [20,Len+2,<<2:2,Len:14>>,Oct];% equiv with encode_length(undefined,Len) but faster
-	true ->
-	    %[encode_length(undefined,Len),{octets,Oct}]
-	    [encode_length(undefined,Len),[21,<<Len:16>>,Oct]]
-    end.
-
-
-%% used for positive Values which don't need a sign bit
-%% returns a list
-eint_positive(Val) ->
-    case eint(Val,[]) of
-	[0,B1|T] ->
-	    [B1|T];
-	T -> 
-	    T
-    end.
-
-
-eint(0, [B|Acc]) when B < 128 ->
-    [B|Acc];
-eint(N, Acc) ->
-    eint(N bsr 8, [N band 16#ff| Acc]).
-
-enint(-1, [B1|T]) when B1 > 127 ->
-    [B1|T];
-enint(N, Acc) ->
-    enint(N bsr 8, [N band 16#ff|Acc]).
-
-decode_unconstrained_number(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Ints,Bytes3} = getoctets_as_list(Bytes2,Len),
-    {dec_integer(Ints),Bytes3}.
-
-dec_pos_integer(Ints) ->
-    decpint(Ints, 8 * (length(Ints) - 1)).
-dec_integer(Ints) when hd(Ints) band 255 =< 127 -> %% Positive number
-    decpint(Ints, 8 * (length(Ints) - 1));
-dec_integer(Ints) ->                        %% Negative
-    decnint(Ints,  8 * (length(Ints) - 1)).
-
-decpint([Byte|Tail], Shift) ->
-    (Byte bsl Shift) bor decpint(Tail, Shift-8);
-decpint([], _) -> 0.
-
-decnint([Byte|Tail], Shift) ->
-    (-128 + (Byte band 127) bsl Shift) bor decpint(Tail, Shift-8).
-
-% minimum_octets(Val) ->
-%     minimum_octets(Val,[]).
-
-% minimum_octets(Val,Acc) when Val > 0 -> 
-%     minimum_octets((Val bsr 8),[Val band 16#FF|Acc]);
-% minimum_octets(0,Acc) ->
-%     Acc.
-
-
-%% X.691:10.9 Encoding of a length determinant
-%%encode_small_length(undefined,Len) -> % null means no UpperBound
-%%    encode_small_number(Len).
-
-%% X.691:10.9.3.5 
-%% X.691:10.9.3.7
-encode_length(undefined,Len) -> % un-constrained
-    if 
-	Len < 128 ->
-%	    {octets,[Len]};
-	    [20,1,Len];
-	Len < 16384 ->
-	    %{octets,<<2:2,Len:14>>};
-	    [20,2,<<2:2,Len:14>>];
-	true  -> % should be able to endode length >= 16384 i.e. fragmented length
-	    exit({error,{asn1,{encode_length,{nyi,above_16k}}}})
-    end;
-
-encode_length({0,'MAX'},Len) ->
-    encode_length(undefined,Len);
-encode_length(Vr={Lb,Ub},Len) when Ub =< 65535 ,Lb >= 0 -> % constrained
-    encode_constrained_number(Vr,Len);
-encode_length({Lb,_Ub},Len) when integer(Lb), Lb >= 0 -> % Ub > 65535
-    encode_length(undefined,Len);
-encode_length({Vr={Lb,Ub},[]},Len) when Ub =< 65535 ,Lb >= 0,Len=<Ub -> 
-    %% constrained extensible 
-%    [{bits,1,0},encode_constrained_number(Vr,Len)];
-    [0,encode_constrained_number(Vr,Len)];
-encode_length({{Lb,_},[]},Len) -> 
-    [1,encode_semi_constrained_number(Lb,Len)];
-encode_length(SingleValue,_Len) when integer(SingleValue) ->
-    [].
-
-%% X.691 10.9.3.4 (only used for length of bitmap that prefixes extension 
-%% additions in a sequence or set
-encode_small_length(Len) when Len =< 64 ->
-%%    [{bits,1,0},{bits,6,Len-1}];
-%    {bits,7,Len-1}; % the same as above but more efficient
-    [10,7,Len-1];
-encode_small_length(Len) ->
-%    [{bits,1,1},encode_length(undefined,Len)].
-    [1,encode_length(undefined,Len)].
-
-% decode_small_length({Used,<<_:Used,0:1,Num:6,_:((8-Used+1) rem 8),Rest/binary>>}) ->
-%     case Buffer of
-% 	<<_:Used,0:1,Num:6,_:((8-Used+1) rem 8),Rest/binary>> ->
-% 	    {Num,
-%     case getbit(Buffer) of
-% 	{0,Remain} -> 
-% 	    {Bits,Remain2} = getbits(Remain,6),
-% 	    {Bits+1,Remain2};
-% 	{1,Remain} -> 
-% 	    decode_length(Remain,undefined)
-%     end.
-
-decode_small_length(Buffer) ->
-    case getbit(Buffer) of
-	{0,Remain} -> 
-	    {Bits,Remain2} = getbits(Remain,6),
-	    {Bits+1,Remain2};
-	{1,Remain} -> 
-	    decode_length(Remain,undefined)
-    end.
-
-decode_length(Buffer) ->
-    decode_length(Buffer,undefined).
-
-decode_length(Buffer,undefined)  -> % un-constrained
-    {0,Buffer2} = align(Buffer),
-    case Buffer2 of
-	<<0:1,Oct:7,Rest/binary>> ->
-	    {Oct,{0,Rest}};
-	<<2:2,Val:14,Rest/binary>> ->
-	    {Val,{0,Rest}};
-	<<3:2,_Val:14,_Rest/binary>> ->
-	    %% this case should be fixed
-	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}})
-    end;
-%%    {Bits,_} = getbits(Buffer2,2),
-%     case Bits of
-% 	2 -> 
-% 	    {Val,Bytes3} = getoctets(Buffer2,2),
-% 	    {(Val band 16#3FFF),Bytes3};
-% 	3 -> 
-% 	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}});
-% 	_ ->
-% 	    {Val,Bytes3} = getoctet(Buffer2),
-% 	    {Val band 16#7F,Bytes3}
-%     end;
-
-decode_length(Buffer,{Lb,Ub}) when Ub =< 65535 ,Lb >= 0 -> % constrained
-    decode_constrained_number(Buffer,{Lb,Ub});
-decode_length(_Buffer,{Lb,_Ub}) when integer(Lb), Lb >= 0 -> % Ub > 65535
-    exit({error,{asn1,{decode_length,{nyi,above_64K}}}});
-decode_length(Buffer,{{Lb,Ub},[]}) -> 
-    case getbit(Buffer) of
-	{0,Buffer2} ->
-	    decode_length(Buffer2, {Lb,Ub})
-    end;
-
-
-%When does this case occur with {_,_Lb,Ub} ??
-% X.691:10.9.3.5 
-decode_length({Used,Bin},{_,_Lb,_Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub NOTE! this case does not cover case when Ub > 65535
-    Unused = (8-Used) rem 8,
-    case Bin of
-	<<_:Used,0:1,Val:7,R:Unused,Rest/binary>> -> 
-	    {Val,{Used,<<R,Rest/binary>>}};
-	<<_:Used,_:Unused,2:2,Val:14,Rest/binary>> -> 
-	    {Val, {0,Rest}};
-	<<_:Used,_:Unused,3:2,_:14,_Rest/binary>> -> 
-	    exit({error,{asn1,{decode_length,{nyi,length_above_64K}}}})
-    end;
-% decode_length(Buffer,{_,_Lb,Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub
-%     case getbit(Buffer) of
-% 	{0,Remain} -> 
-% 	    getbits(Remain,7);
-% 	{1,Remain} -> 
-% 	    {Val,Remain2} = getoctets(Buffer,2),
-% 	    {Val band 2#0111111111111111, Remain2}
-%     end;
-decode_length(Buffer,SingleValue) when integer(SingleValue) ->
-    {SingleValue,Buffer}.
-
-
-						% X.691:11
-decode_boolean(Buffer) -> %when record(Buffer,buffer)
-    case getbit(Buffer) of
-	{1,Remain} -> {true,Remain};
-	{0,Remain} -> {false,Remain}
-    end.
-
-
-%% ENUMERATED with extension marker
-decode_enumerated(Buffer,C,{Ntup1,Ntup2}) when tuple(Ntup1), tuple(Ntup2) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> % not an extension value
-	    {Val,Buffer3} = decode_integer(Buffer2,C),
-	    case catch (element(Val+1,Ntup1)) of
-		NewVal when atom(NewVal) -> {NewVal,Buffer3};
-		_Error -> exit({error,{asn1,{decode_enumerated,{Val,[Ntup1,Ntup2]}}}})
-	    end;
-	1 -> % this an extension value
-	    {Val,Buffer3} = decode_small_number(Buffer2),
-	    case catch (element(Val+1,Ntup2)) of
-		NewVal when atom(NewVal) -> {NewVal,Buffer3};
-		_ -> {{asn1_enum,Val},Buffer3}
-	    end
-    end;
-
-decode_enumerated(Buffer,C,NamedNumberTup) when tuple(NamedNumberTup) ->
-    {Val,Buffer2} = decode_integer(Buffer,C),
-    case catch (element(Val+1,NamedNumberTup)) of
-	NewVal when atom(NewVal) -> {NewVal,Buffer2};
-	_Error -> exit({error,{asn1,{decode_enumerated,{Val,NamedNumberTup}}}})
-    end.
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Bitstring value, ITU_T X.690 Chapter 8.5
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% encode bitstring value
-%%===============================================================================
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% bitstring NamedBitList
-%% Val can be  of:
-%% - [identifiers] where only named identifers are set to one, 
-%%   the Constraint must then have some information of the 
-%%   bitlength.
-%% - [list of ones and zeroes] all bits 
-%% - integer value representing the bitlist
-%% C is constraint Len, only valid when identifiers
-
-
-%% when the value is a list of {Unused,BinBits}, where 
-%% Unused = integer(),
-%% BinBits = binary().
-
-encode_bit_string(C,Bin={Unused,BinBits},NamedBitList) when integer(Unused),
-							    binary(BinBits) ->
-    encode_bin_bit_string(C,Bin,NamedBitList);
-
-%% when the value is a list of named bits
-
-encode_bit_string(C, LoNB=[FirstVal | _RestVal], NamedBitList) when atom(FirstVal) ->
-    ToSetPos = get_all_bitposes(LoNB, NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos,0),
-    encode_bit_string(C,BitList,NamedBitList);% consider the constraint
-
-encode_bit_string(C, BL=[{bit,_} | _RestVal], NamedBitList) ->
-    ToSetPos = get_all_bitposes(BL, NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos,0),
-    encode_bit_string(C,BitList,NamedBitList);
-
-%% when the value is a list of ones and zeroes
-encode_bit_string(Int, BitListValue, _) 
-  when list(BitListValue),integer(Int) ->
-    %% The type is constrained by a single value size constraint
-    [40,Int,length(BitListValue),BitListValue];
-% encode_bit_string(C, BitListValue,NamedBitList) 
-%   when list(BitListValue) ->
-%     [encode_bit_str_length(C,BitListValue),
-%      2,45,BitListValue];
-encode_bit_string(no, BitListValue,[]) 
-  when list(BitListValue) ->
-    [encode_length(undefined,length(BitListValue)),
-     2,BitListValue];
-encode_bit_string(C, BitListValue,[]) 
-  when list(BitListValue) ->
-    [encode_length(C,length(BitListValue)),
-     2,BitListValue];
-encode_bit_string(no, BitListValue,_NamedBitList) 
-  when list(BitListValue) ->
-    %% this case with an unconstrained BIT STRING can be made more efficient
-    %% if the complete driver can take a special code so the length field
-    %% is encoded there.
-    NewBitLVal = lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,
-					    lists:reverse(BitListValue))),
-    [encode_length(undefined,length(NewBitLVal)),
-     2,NewBitLVal];
-encode_bit_string(C,BitListValue,_NamedBitList) 
-  when list(BitListValue) ->% C = {_,'MAX'}
-%     NewBitLVal = lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,
-% 					    lists:reverse(BitListValue))),
-    NewBitLVal = bit_string_trailing_zeros(BitListValue,C),
-    [encode_length(C,length(NewBitLVal)),
-     2,NewBitLVal]; 
-
-% encode_bit_string(C, BitListValue, NamedBitList) when list(BitListValue) ->
-%     BitListToBinary = 
-% 	%% fun that transforms a list of 1 and 0 to a tuple:
-% 	%% {UnusedBitsInLastByte, Binary}
-% 	fun([H|T],Acc,N,Fun) ->
-% 		Fun(T,(Acc bsl 1)+H,N+1,Fun);
-% 	   ([],Acc,N,_) -> % length fits in one byte
-% 		Unused = (8 - (N rem 8)) rem 8,
-% % 		case N/8 of
-% % 		    _Len =< 255 -> 
-% % 			[30,Unused,(Unused+N)/8,<<Acc:N,0:Unused>>];
-% % 		    _Len -> 
-% % 			Len = (Unused+N)/8,
-% % 			[31,Unused,<<Len:16>>,<<Acc:N,0:Unused>>]
-% % 		end
-% 		{Unused,<<Acc:N,0:Unused>>}
-% 	end,
-%     UnusedAndBin =
-% 	case NamedBitList of
-% 	    [] ->  % dont remove trailing zeroes
-% 		BitListToBinary(BitListValue,0,0,BitListToBinary);
-% 	    _ ->
-% 		BitListToBinary(lists:reverse(
-% 				  lists:dropwhile(fun(0)->true;(1)->false end,
-% 						  lists:reverse(BitListValue))),
-% 				0,0,BitListToBinary)
-% 	end,
-%     encode_bin_bit_string(C,UnusedAndBin,NamedBitList);
-
-%% when the value is an integer
-encode_bit_string(C, IntegerVal, NamedBitList) when integer(IntegerVal)->
-    BitList = int_to_bitlist(IntegerVal),
-    encode_bit_string(C,BitList,NamedBitList);
-
-%% when the value is a tuple
-encode_bit_string(C,{Name,Val}, NamedBitList) when atom(Name) ->
-    encode_bit_string(C,Val,NamedBitList).
-
-bit_string_trailing_zeros(BitList,C) when integer(C) ->
-    bit_string_trailing_zeros1(BitList,C,C);
-bit_string_trailing_zeros(BitList,{Lb,Ub}) when integer(Lb) ->
-    bit_string_trailing_zeros1(BitList,Lb,Ub);
-bit_string_trailing_zeros(BitList,{{Lb,Ub},_}) when integer(Lb) ->
-    bit_string_trailing_zeros1(BitList,Lb,Ub);
-bit_string_trailing_zeros(BitList,_) ->
-    BitList.
-
-bit_string_trailing_zeros1(BitList,Lb,Ub) ->
-    case length(BitList) of
-	Lb -> BitList;
-	B when B<Lb -> BitList++lists:duplicate(Lb-B,0);
-	D -> F = fun(L,LB,LB,_,_)->lists:reverse(L);
-		    ([0|R],L1,LB,UB,Fun)->Fun(R,L1-1,LB,UB,Fun);
-		    (L,L1,_,UB,_)when L1 =< UB -> lists:reverse(L);
-		    (_,_L1,_,_,_) ->exit({error,{list_length_BIT_STRING,
-						 BitList}}) end,
-	     F(lists:reverse(BitList),D,Lb,Ub,F)
-    end.
-
-%% encode_bin_bit_string/3, when value is a tuple of Unused and BinBits.
-%% Unused = integer(),i.e. number unused bits in least sign. byte of
-%% BinBits = binary().
-encode_bin_bit_string(C,{_,BinBits},_NamedBitList)
-  when integer(C),C=<16 ->
-    [45,C,size(BinBits),BinBits];
-encode_bin_bit_string(C,{_Unused,BinBits},_NamedBitList)
-  when integer(C) ->
-    [2,45,C,size(BinBits),BinBits];
-encode_bin_bit_string(C,UnusedAndBin={_,_},NamedBitList) ->
-%    UnusedAndBin1 = {Unused1,Bin1} = 
-    {Unused1,Bin1} = 
-	%% removes all trailing bits if NamedBitList is not empty
-	remove_trailing_bin(NamedBitList,UnusedAndBin),
-    case C of
-%    case get_constraint(C,'SizeConstraint') of
-
-% 	0 ->
-% 	    []; % borde avg�ras i compile-time
-% 	V when integer(V),V=<16 ->
-% 	    {Unused2,Bin2} = pad_list(V,UnusedAndBin1),
-% 	    <<BitVal:V,_:Unused2>> = Bin2,
-% %	    {bits,V,BitVal};
-% 	    [10,V,BitVal];
-% 	V when integer(V) ->
-% 	    %[align, pad_list(V, UnusedAndBin1)];
-% 	    {Unused2,Bin2} = pad_list(V, UnusedAndBin1),
-% 	    <<BitVal:V,_:Unused2>> = Bin2,
-% 	    [2,octets_unused_to_complete(Unused2,size(Bin2),Bin2)];
-
-	{Lb,Ub} when integer(Lb),integer(Ub) ->
-%	    [encode_length({Lb,Ub},size(Bin1)*8 - Unused1),
-%	     align,UnusedAndBin1];
-	    Size=size(Bin1),
-	    [encode_length({Lb,Ub},Size*8 - Unused1),
-	     2,octets_unused_to_complete(Unused1,Size,Bin1)];
-	no ->
-	    Size=size(Bin1),
-	    [encode_length(undefined,Size*8 - Unused1),
-	     2,octets_unused_to_complete(Unused1,Size,Bin1)];
-	Sc -> 
-	    Size=size(Bin1),
-	    [encode_length(Sc,Size*8 - Unused1),
-	     2,octets_unused_to_complete(Unused1,Size,Bin1)]
-    end.
-
-remove_trailing_bin([], {Unused,Bin}) ->
-    {Unused,Bin};
-remove_trailing_bin(NamedNumberList, {_Unused,Bin}) ->
-    Size = size(Bin)-1,
-    <<Bfront:Size/binary, LastByte:8>> = Bin,
-    %% clear the Unused bits to be sure
-%    LastByte1 = LastByte band (((1 bsl Unused) -1) bxor 255),% why this???
-    Unused1 = trailingZeroesInNibble(LastByte band 15),
-    Unused2 = 
-	case Unused1 of 
-	    4 ->
-		4 + trailingZeroesInNibble(LastByte bsr 4);
-	    _ -> Unused1
-	end,
-    case Unused2 of
-	8 ->
-	    remove_trailing_bin(NamedNumberList,{0,Bfront});
-	_ ->
-	    {Unused2,Bin}
-    end.
-
-
-trailingZeroesInNibble(0) ->
-    4;
-trailingZeroesInNibble(1) ->
-    0;
-trailingZeroesInNibble(2) ->
-    1;
-trailingZeroesInNibble(3) ->
-    0;
-trailingZeroesInNibble(4) ->
-    2;
-trailingZeroesInNibble(5) ->
-    0;
-trailingZeroesInNibble(6) ->
-    1;
-trailingZeroesInNibble(7) ->
-    0;
-trailingZeroesInNibble(8) ->
-    3;
-trailingZeroesInNibble(9) ->
-    0;
-trailingZeroesInNibble(10) ->
-    1;
-trailingZeroesInNibble(11) ->
-    0;
-trailingZeroesInNibble(12) -> %#1100
-    2;
-trailingZeroesInNibble(13) ->
-    0;
-trailingZeroesInNibble(14) ->
-    1;
-trailingZeroesInNibble(15) ->
-    0.
-
-%%%%%%%%%%%%%%%
-%% The result is presented as a list of named bits (if possible)
-%% else as a tuple {Unused,Bits}. Unused is the number of unused
-%% bits, least significant bits in the last byte of Bits. Bits is
-%% the BIT STRING represented as a binary.
-%% 
-decode_compact_bit_string(Buffer, C, NamedNumberList) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 -> % fixed length
-	    {{8,0},Buffer};
-	V when integer(V),V=<16 -> %fixed length 16 bits or less
-	    compact_bit_string(Buffer,V,NamedNumberList);
-	V when integer(V),V=<65536 -> %fixed length > 16 bits
-	    Bytes2 = align(Buffer),
-	    compact_bit_string(Bytes2,V,NamedNumberList);
-	V when integer(V) -> % V > 65536 => fragmented value
-	    {Bin,Buffer2} = decode_fragmented_bits(Buffer,V),
-	    case Buffer2 of
-		{0,_} -> {{0,Bin},Buffer2};
-		{U,_} -> {{8-U,Bin},Buffer2}
-	    end;
-	{Lb,Ub} when integer(Lb),integer(Ub) ->
-	    %% This case may demand decoding of fragmented length/value
-	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList);
-	no ->
-	    %% This case may demand decoding of fragmented length/value
-	    {Len,Bytes2} = decode_length(Buffer,undefined),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList);
-	Sc ->
-	    {Len,Bytes2} = decode_length(Buffer,Sc),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList)
-    end.
-
-
-%%%%%%%%%%%%%%%
-%% The result is presented as a list of named bits (if possible)
-%% else as a list of 0 and 1.
-%% 
-decode_bit_string(Buffer, C, NamedNumberList) ->
-    case get_constraint(C,'SizeConstraint') of
-	{Lb,Ub} when integer(Lb),integer(Ub) ->
-	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
-	    Bytes3 = align(Bytes2),
-	    bit_list_or_named(Bytes3,Len,NamedNumberList);
-	no ->
-	    {Len,Bytes2} = decode_length(Buffer,undefined),
-	    Bytes3 = align(Bytes2),
-	    bit_list_or_named(Bytes3,Len,NamedNumberList);
-	0 -> % fixed length
-	    {[],Buffer}; % nothing to encode
-	V when integer(V),V=<16 -> % fixed length 16 bits or less
-	    bit_list_or_named(Buffer,V,NamedNumberList);
-	V when integer(V),V=<65536 ->
-	    Bytes2 = align(Buffer),
-	    bit_list_or_named(Bytes2,V,NamedNumberList);
-	V when integer(V) ->
-	    Bytes2 = align(Buffer),
-	    {BinBits,_Bytes3} = decode_fragmented_bits(Bytes2,V),
-	    bit_list_or_named(BinBits,V,NamedNumberList);
-	Sc -> % extension marker
-	    {Len,Bytes2} = decode_length(Buffer,Sc),
-	    Bytes3 = align(Bytes2),
-	    bit_list_or_named(Bytes3,Len,NamedNumberList)
-    end.
-
-
-%% if no named bits are declared we will return a
-%% {Unused,Bits}. Unused = integer(),
-%% Bits = binary().
-compact_bit_string(Buffer,Len,[]) ->
-    getbits_as_binary(Len,Buffer); % {{Unused,BinBits},NewBuffer}
-compact_bit_string(Buffer,Len,NamedNumberList) ->
-    bit_list_or_named(Buffer,Len,NamedNumberList).
-
-
-%% if no named bits are declared we will return a
-%% BitList = [0 | 1]
-
-bit_list_or_named(Buffer,Len,[]) ->
-    getbits_as_list(Len,Buffer);
-
-%% if there are named bits declared we will return a named
-%% BitList where the names are atoms and unnamed bits represented
-%% as {bit,Pos}
-%% BitList = [atom() | {bit,Pos}]
-%% Pos = integer()
-
-bit_list_or_named(Buffer,Len,NamedNumberList) ->
-    {BitList,Rest} = getbits_as_list(Len,Buffer),
-    {bit_list_or_named1(0,BitList,NamedNumberList,[]), Rest}.
-
-bit_list_or_named1(Pos,[0|Bt],Names,Acc) ->
-    bit_list_or_named1(Pos+1,Bt,Names,Acc);
-bit_list_or_named1(Pos,[1|Bt],Names,Acc) ->
-    case lists:keysearch(Pos,2,Names) of
-	{value,{Name,_}} ->
-	    bit_list_or_named1(Pos+1,Bt,Names,[Name|Acc]);
-	_  -> 
-	    bit_list_or_named1(Pos+1,Bt,Names,[{bit,Pos}|Acc])
-    end;
-bit_list_or_named1(_Pos,[],_Names,Acc) ->
-    lists:reverse(Acc).
-
-
-
-%%%%%%%%%%%%%%%
-%% 
-
-int_to_bitlist(Int) when integer(Int), Int > 0 ->
-    [Int band 1 | int_to_bitlist(Int bsr 1)];
-int_to_bitlist(0) ->
-    [].
-
-
-%%%%%%%%%%%%%%%%%%
-%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
-%%   [sorted_list_of_bitpositions_to_set]
-
-get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
-    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
-
-get_all_bitposes([Val | Rest], NamedBitList, Ack) ->
-    case lists:keysearch(Val, 1, NamedBitList) of
-	{value, {_ValName, ValPos}} ->
-	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
-	_ ->
-	    exit({error,{asn1, {bitstring_namedbit, Val}}})
-    end;
-get_all_bitposes([], _NamedBitList, Ack) ->
-    lists:sort(Ack).
-
-%%%%%%%%%%%%%%%%%%
-%% make_and_set_list([list of positions to set to 1])->
-%% returns list with all in SetPos set.
-%% in positioning in list the first element is 0, the second 1 etc.., but
-%% 
-
-make_and_set_list([XPos|SetPos], XPos) ->
-    [1 | make_and_set_list(SetPos, XPos + 1)];
-make_and_set_list([Pos|SetPos], XPos) ->
-    [0 | make_and_set_list([Pos | SetPos], XPos + 1)];
-make_and_set_list([], _) ->
-    [].
-
-%%%%%%%%%%%%%%%%%
-%% pad_list(N,BitList) -> PaddedList
-%% returns a padded (with trailing {bit,0} elements) list of length N
-%% if Bitlist contains more than N significant bits set an exit asn1_error 
-%% is generated
-
-% pad_list(N,In={Unused,Bin}) ->
-%     pad_list(N, size(Bin)*8 - Unused, In).
-    
-% pad_list(N,Size,In={Unused,Bin}) when N < Size ->
-%     exit({error,{asn1,{range_error,{bit_string,In}}}});
-% pad_list(N,Size,{Unused,Bin}) when N > Size, Unused > 0 ->
-%     pad_list(N,Size+1,{Unused-1,Bin});
-% pad_list(N,Size,{Unused,Bin}) when N > Size ->
-%     pad_list(N,Size+1,{7,<<Bin/binary,0>>});
-% pad_list(N,N,In={Unused,Bin}) ->
-%     In.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% X.691:16
-%% encode_octet_string(Constraint,ExtensionMarker,Val)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-encode_octet_string(C,Val) ->
-    encode_octet_string(C,false,Val).
-
-encode_octet_string(C,Bool,{_Name,Val}) ->
-    encode_octet_string(C,Bool,Val);
-encode_octet_string(_C,true,_Val) -> 
-    exit({error,{asn1,{'not_supported',extensionmarker}}});
-encode_octet_string(SZ={_,_},false,Val) ->
-%    [encode_length(SZ,length(Val)),align,
-%	     {octets,Val}];
-    Len = length(Val),
-    [encode_length(SZ,Len),2,
-     octets_to_complete(Len,Val)];
-encode_octet_string(SZ,false,Val) when list(SZ) ->
-    Len = length(Val),
-    [encode_length({hd(SZ),lists:max(SZ)},Len),2,
-     octets_to_complete(Len,Val)];
-encode_octet_string(no,false,Val) ->
-    Len = length(Val),
-    [encode_length(undefined,Len),2,
-     octets_to_complete(Len,Val)];
-encode_octet_string(C,_,_) ->
-    exit({error,{not_implemented,C}}).
-
-
-decode_octet_string(Bytes,Range) ->
-    decode_octet_string(Bytes,Range,false).
-
-decode_octet_string(Bytes,1,false) ->
-    {B1,Bytes2} = getbits(Bytes,8),
-    {[B1],Bytes2};
-decode_octet_string(Bytes,2,false) ->
-    {Bs,Bytes2}= getbits(Bytes,16),
-    {binary_to_list(<<Bs:16>>),Bytes2};
-decode_octet_string(Bytes,Sv,false) when integer(Sv),Sv=<65535 ->
-    Bytes2 = align(Bytes),
-    getoctets_as_list(Bytes2,Sv);
-decode_octet_string(Bytes,Sv,false) when integer(Sv) ->
-    Bytes2 = align(Bytes),
-    decode_fragmented_octets(Bytes2,Sv);
-decode_octet_string(Bytes,{Lb,Ub},false) ->
-    {Len,Bytes2} = decode_length(Bytes,{Lb,Ub}),
-    Bytes3 = align(Bytes2),
-    getoctets_as_list(Bytes3,Len);
-decode_octet_string(Bytes,Sv,false) when list(Sv) ->
-    {Len,Bytes2} = decode_length(Bytes,{hd(Sv),lists:max(Sv)}),
-    Bytes3 = align(Bytes2),
-    getoctets_as_list(Bytes3,Len);
-decode_octet_string(Bytes,no,false) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    Bytes3 = align(Bytes2),
-    getoctets_as_list(Bytes3,Len).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Restricted char string types 
-%% (NumericString, PrintableString,VisibleString,IA5String,BMPString,UniversalString)
-%% X.691:26 and X.680:34-36
-%%encode_restricted_string(aligned,'BMPString',Constraints,Extension,Val)
-
-
-encode_restricted_string(aligned,{Name,Val}) when atom(Name) ->
-    encode_restricted_string(aligned,Val);
-
-encode_restricted_string(aligned,Val) when list(Val)->
-    Len = length(Val),
-%    [encode_length(undefined,length(Val)),{octets,Val}].
-    [encode_length(undefined,Len),octets_to_complete(Len,Val)].
-
-
-encode_known_multiplier_string(StringType,SizeC,NumBits,CharOutTab,{Name,Val}) when atom(Name) ->
-    encode_known_multiplier_string(StringType,SizeC,NumBits,CharOutTab,Val);
-encode_known_multiplier_string(StringType,SizeC,NumBits,CharOutTab,Val) ->
-    Result = chars_encode2(Val,NumBits,CharOutTab),
-    case SizeC of
-	Ub when integer(Ub), Ub*NumBits =< 16  ->
-	    case {StringType,Result} of
-		{'BMPString',{octets,Ol}} -> %% this case cannot happen !!??
-		    [{bits,8,Oct}||Oct <- Ol];
-		_ ->
-		    Result
-	    end;
-	Ub when integer(Ub),Ub =<65535 -> % fixed length
-%%	    [align,Result];
-	    [2,Result];
-	{Ub,Lb} ->
-%	    [encode_length({Ub,Lb},length(Val)),align,Result];
-	    [encode_length({Ub,Lb},length(Val)),2,Result];
-	no  ->
-%	    [encode_length(undefined,length(Val)),align,Result]
-	    [encode_length(undefined,length(Val)),2,Result]
-    end.
-
-decode_restricted_string(Bytes,aligned) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    getoctets_as_list(Bytes2,Len).
-
-decode_known_multiplier_string(StringType,SizeC,NumBits,CharInTab,Bytes) ->
-    case SizeC of
-	Ub when integer(Ub), Ub*NumBits =< 16  ->
-	    chars_decode(Bytes,NumBits,StringType,CharInTab,Ub);
-	Ub when integer(Ub),Ub =<65535 -> % fixed length
-	    Bytes1 = align(Bytes),
-	    chars_decode(Bytes1,NumBits,StringType,CharInTab,Ub);
-	Vl when list(Vl) ->
-	    {Len,Bytes1} = decode_length(Bytes,{hd(Vl),lists:max(Vl)}),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,CharInTab,Len);
-	no  ->
-	    {Len,Bytes1} = decode_length(Bytes,undefined),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,CharInTab,Len);
-	{Lb,Ub}->
-	    {Len,Bytes1} = decode_length(Bytes,{Lb,Ub}),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,CharInTab,Len)
-    end.
-
-encode_GeneralString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_GeneralString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_GraphicString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_GraphicString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_ObjectDescriptor(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_ObjectDescriptor(Bytes) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_TeletexString(_C,Val) -> % equivalent with T61String
-    encode_restricted_string(aligned,Val).
-decode_TeletexString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_VideotexString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_VideotexString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% getBMPChars(Bytes,Len) ->{BMPcharList,RemainingBytes}
-%%
-getBMPChars(Bytes,1) ->
-    {O1,Bytes2} = getbits(Bytes,8),
-    {O2,Bytes3} = getbits(Bytes2,8),
-    if 
-	O1 == 0 ->
-	    {[O2],Bytes3};
-	true ->
-	    {[{0,0,O1,O2}],Bytes3}
-    end;
-getBMPChars(Bytes,Len) ->
-    getBMPChars(Bytes,Len,[]).
-
-getBMPChars(Bytes,0,Acc) ->
-    {lists:reverse(Acc),Bytes};
-getBMPChars(Bytes,Len,Acc) ->
-    {Octs,Bytes1} = getoctets_as_list(Bytes,2),
-    case Octs of
-	[0,O2] ->
-	    getBMPChars(Bytes1,Len-1,[O2|Acc]);
-	[O1,O2]->
-	    getBMPChars(Bytes1,Len-1,[{0,0,O1,O2}|Acc])
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% chars_encode(C,StringType,Value) -> ValueList
-%%
-%% encodes chars according to the per rules taking the constraint PermittedAlphabet 
-%% into account.
-%% This function does only encode the value part and NOT the length
-
-% chars_encode(C,StringType,Value) ->
-%     case {StringType,get_constraint(C,'PermittedAlphabet')} of
-% 	{'UniversalString',{_,Sv}} ->
-% 	    exit({error,{asn1,{'not implemented',"UniversalString with PermittedAlphabet constraint"}}});
-% 	{'BMPString',{_,Sv}} ->
-% 	    exit({error,{asn1,{'not implemented',"BMPString with PermittedAlphabet constraint"}}});
-% 	_ ->
-% 	    {NumBits,CharOutTab} = {get_NumBits(C,StringType),get_CharOutTab(C,StringType)}, 
-% 	    chars_encode2(Value,NumBits,CharOutTab)
-%     end.
-
-
-chars_encode2([H|T],NumBits,T1={Min,Max,notab}) when  H =< Max, H >= Min ->
-%    [[10,NumBits,H-Min]|chars_encode2(T,NumBits,T1)];
-    [pre_complete_bits(NumBits,H-Min)|chars_encode2(T,NumBits,T1)];
-chars_encode2([H|T],NumBits,T1={Min,Max,Tab}) when H =< Max, H >= Min ->
-%    [[10,NumBits,element(H-Min+1,Tab)]|chars_encode2(T,NumBits,T1)];
-    [pre_complete_bits(NumBits,exit_if_false(H,element(H-Min+1,Tab)))|
-     chars_encode2(T,NumBits,T1)];
-chars_encode2([{A,B,C,D}|T],NumBits,T1={Min,_Max,notab}) -> 
-    %% no value range check here (ought to be, but very expensive)
-%    [{bits,NumBits,(A*B*C*D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-%    [[10,NumBits,((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min]|chars_encode2(T,NumBits,T1)];
-    [pre_complete_bits(NumBits,
-			       ((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min)|
-     chars_encode2(T,NumBits,T1)];
-chars_encode2([H={A,B,C,D}|T],NumBits,{Min,Max,Tab}) -> 
-    %% no value range check here (ought to be, but very expensive)
-    [pre_complete_bits(NumBits,exit_if_false(H,element(((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min,Tab)))|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([H|_T],_NumBits,{_Min,_Max,_Tab}) ->
-    exit({error,{asn1,{illegal_char_value,H}}});
-chars_encode2([],_,_) ->
-    [].
-
-exit_if_false(V,false)->
-    exit({error,{asn1,{"illegal value according to Permitted alphabet constraint",V}}});
-exit_if_false(_,V) ->V.
-
-pre_complete_bits(NumBits,Val) when NumBits =< 8 ->
-    [10,NumBits,Val];
-pre_complete_bits(NumBits,Val) when NumBits =< 16 ->
-    [10,NumBits-8,Val bsr 8,10,8,(Val band 255)];
-pre_complete_bits(NumBits,Val) when NumBits =< 2040 -> % 255 * 8
-%     LBUsed = NumBits rem 8,
-%     {Unused,Len} = case (8 - LBUsed) of
-% 		       8 -> {0,NumBits div 8};
-% 		       U -> {U,(NumBits div 8) + 1}
-% 		   end,
-%     NewVal = Val bsr LBUsed,
-%     [30,Unused,Len,<<NewVal:Len/unit:8,Val:LBUsed,0:Unused>>].
-    Unused = (8 - (NumBits rem 8)) rem 8,
-    Len = NumBits + Unused,
-    [30,Unused,Len div 8,<<(Val bsl Unused):Len>>].
-
-% get_NumBits(C,StringType) ->
-%     case get_constraint(C,'PermittedAlphabet') of
-% 	{'SingleValue',Sv} ->
-% 	    charbits(length(Sv),aligned);
-% 	no ->
-% 	    case StringType of
-% 		'IA5String' ->
-% 		    charbits(128,aligned); % 16#00..16#7F
-% 		'VisibleString' ->
-% 		    charbits(95,aligned); % 16#20..16#7E
-% 		'PrintableString' ->
-% 		    charbits(74,aligned); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-% 		'NumericString' ->
-% 		    charbits(11,aligned); % $ ,"0123456789"
-% 		'UniversalString' ->
-% 		    32;
-% 		'BMPString' ->
-% 		    16
-% 	    end
-%     end.
-
-%%Maybe used later
-%%get_MaxChar(C,StringType) ->
-%%    case get_constraint(C,'PermittedAlphabet') of
-%%	{'SingleValue',Sv} ->
-%%	    lists:nth(length(Sv),Sv);
-%%	no ->
-%%	    case StringType of
-%%		'IA5String' ->
-%%		    16#7F; % 16#00..16#7F
-%%		'VisibleString' ->
-%%		    16#7E; % 16#20..16#7E
-%%		'PrintableString' ->
-%%		    $z; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-%%		'NumericString' ->
-%%		    $9; % $ ,"0123456789"
-%%		'UniversalString' ->
-%%		    16#ffffffff;
-%%		'BMPString' ->
-%%		    16#ffff
-%%	    end
-%%    end.
-
-%%Maybe used later
-%%get_MinChar(C,StringType) ->
-%%    case get_constraint(C,'PermittedAlphabet') of
-%%	{'SingleValue',Sv} ->
-%%	    hd(Sv);
-%%	no ->
-%%	    case StringType of
-%%		'IA5String' ->
-%%		    16#00; % 16#00..16#7F
-%%		'VisibleString' ->
-%%		    16#20; % 16#20..16#7E
-%%		'PrintableString' ->
-%%		    $\s; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-%%		'NumericString' ->
-%%		    $\s; % $ ,"0123456789"
-%%		'UniversalString' ->
-%%		    16#00;
-%%		'BMPString' ->
-%%		    16#00
-%%	    end
-%%    end.
-
-% get_CharOutTab(C,StringType) ->
-%     get_CharTab(C,StringType,out).
-
-% get_CharInTab(C,StringType) ->
-%     get_CharTab(C,StringType,in).
-
-% get_CharTab(C,StringType,InOut) ->
-%     case get_constraint(C,'PermittedAlphabet') of
-% 	{'SingleValue',Sv} ->
-% 	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv,InOut);
-% 	no ->
-% 	    case StringType of
-% 		'IA5String' ->
-% 		    {0,16#7F,notab};
-% 		'VisibleString' ->
-% 		    get_CharTab2(C,StringType,16#20,16#7F,notab,InOut);
-% 		'PrintableString' ->
-% 		    Chars = lists:sort(
-% 			      " '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
-% 		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars,InOut);
-% 		'NumericString' ->
-% 		    get_CharTab2(C,StringType,16#20,$9," 0123456789",InOut);
-% 		'UniversalString' ->
-% 		    {0,16#FFFFFFFF,notab};
-% 		'BMPString' ->
-% 		    {0,16#FFFF,notab}
-% 	    end
-%     end.
-
-% get_CharTab2(C,StringType,Min,Max,Chars,InOut) ->
-%     BitValMax = (1 bsl get_NumBits(C,StringType))-1,
-%     if
-% 	Max =< BitValMax ->
-% 	    {0,Max,notab};
-% 	true ->
-% 	    case InOut of
-% 		out ->
-% 		    {Min,Max,create_char_tab(Min,Chars)};
-% 		in  ->
-% 		    {Min,Max,list_to_tuple(Chars)}
-% 	    end
-%     end.
-
-% create_char_tab(Min,L) ->
-%     list_to_tuple(create_char_tab(Min,L,0)).
-% create_char_tab(Min,[Min|T],V) ->
-%     [V|create_char_tab(Min+1,T,V+1)];
-% create_char_tab(_Min,[],_V) ->
-%     [];
-% create_char_tab(Min,L,V) ->
-%     [false|create_char_tab(Min+1,L,V)].
-
-%% This very inefficient and should be moved to compiletime
-% charbits(NumOfChars,aligned) ->
-%     case charbits(NumOfChars) of
-% 	1 -> 1;
-% 	2 -> 2;
-% 	B when B =< 4 -> 4;
-% 	B when B =< 8 -> 8;
-% 	B when B =< 16 -> 16; 
-% 	B when B =< 32 -> 32
-%     end.
-
-% charbits(NumOfChars) when NumOfChars =< 2 -> 1;
-% charbits(NumOfChars) when NumOfChars =< 4 -> 2;
-% charbits(NumOfChars) when NumOfChars =< 8 -> 3;
-% charbits(NumOfChars) when NumOfChars =< 16 -> 4;
-% charbits(NumOfChars) when NumOfChars =< 32 -> 5;
-% charbits(NumOfChars) when NumOfChars =< 64 -> 6;
-% charbits(NumOfChars) when NumOfChars =< 128 -> 7;
-% charbits(NumOfChars) when NumOfChars =< 256 -> 8;
-% charbits(NumOfChars) when NumOfChars =< 512 -> 9;
-% charbits(NumOfChars) when NumOfChars =< 1024 -> 10;
-% charbits(NumOfChars) when NumOfChars =< 2048 -> 11;
-% charbits(NumOfChars) when NumOfChars =< 4096 -> 12;
-% charbits(NumOfChars) when NumOfChars =< 8192 -> 13;
-% charbits(NumOfChars) when NumOfChars =< 16384 -> 14;
-% charbits(NumOfChars) when NumOfChars =< 32768 -> 15;
-% charbits(NumOfChars) when NumOfChars =< 65536 -> 16;
-% charbits(NumOfChars) when integer(NumOfChars) ->
-%     16 + charbits1(NumOfChars bsr 16).
-
-% charbits1(0) ->
-%     0;
-% charbits1(NumOfChars) ->
-%     1 + charbits1(NumOfChars bsr 1).
-
-
-chars_decode(Bytes,_,'BMPString',_,Len) ->
-    getBMPChars(Bytes,Len);
-chars_decode(Bytes,NumBits,_StringType,CharInTab,Len) ->	
-    chars_decode2(Bytes,CharInTab,NumBits,Len).
-
-
-chars_decode2(Bytes,CharInTab,NumBits,Len) ->
-    chars_decode2(Bytes,CharInTab,NumBits,Len,[]).
-
-chars_decode2(Bytes,_CharInTab,_NumBits,0,Acc) ->
-    {lists:reverse(Acc),Bytes};
-chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    Result = 
-	if
-	    Char < 256 -> Char;
-	    true ->
-		list_to_tuple(binary_to_list(<<Char:32>>))
-	end,
-    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
-chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Char+Min|Acc]);
-
-%% BMPString and UniversalString with PermittedAlphabet is currently not supported
-chars_decode2(Bytes,{Min,Max,CharInTab},NumBits,Len,Acc) ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    chars_decode2(Bytes2,{Min,Max,CharInTab},NumBits,Len -1,[element(Char+1,CharInTab)|Acc]).
-
-
-						% X.691:17 
-encode_null(_Val) -> []; % encodes to nothing
-encode_null({Name,Val}) when atom(Name) ->
-    encode_null(Val).
-
-decode_null(Bytes) ->
-    {'NULL',Bytes}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_object_identifier(Val) -> CompleteList
-%% encode_object_identifier({Name,Val}) -> CompleteList
-%% Val -> {Int1,Int2,...,IntN} % N >= 2
-%% Name -> atom()
-%% Int1 -> integer(0..2)
-%% Int2 -> integer(0..39) when Int1 (0..1) else integer()
-%% Int3-N -> integer()
-%% CompleteList -> [{bits,8,Val}|{octets,Ol}|align|...]
-%%
-encode_object_identifier({Name,Val}) when atom(Name) ->
-    encode_object_identifier(Val);
-encode_object_identifier(Val) ->
-    OctetList = e_object_identifier(Val),
-    Octets = list_to_binary(OctetList), % performs a flatten at the same time
-%    [{debug,object_identifier},encode_length(undefined,size(Octets)),{octets,Octets}].
-    [encode_length(undefined,size(Octets)),
-     octets_to_complete(size(Octets),Octets)].
-
-%% This code is copied from asn1_encode.erl (BER) and corrected and modified 
-
-e_object_identifier({'OBJECT IDENTIFIER',V}) ->
-    e_object_identifier(V);
-e_object_identifier({Cname,V}) when atom(Cname),tuple(V) ->
-    e_object_identifier(tuple_to_list(V));
-e_object_identifier({Cname,V}) when atom(Cname),list(V) ->
-    e_object_identifier(V);
-e_object_identifier(V) when tuple(V) ->
-    e_object_identifier(tuple_to_list(V));
-
-%% E1 = 0|1|2 and (E2 < 40 when E1 = 0|1) 
-e_object_identifier([E1,E2|Tail]) when E1 >= 0, E1 < 2, E2 < 40 ; E1==2 ->
-    Head = 40*E1 + E2,  % weird
-    e_object_elements([Head|Tail],[]);
-e_object_identifier(Oid=[_,_|_Tail]) ->
-    exit({error,{asn1,{'illegal_value',Oid}}}).
-
-e_object_elements([],Acc) ->
-    lists:reverse(Acc);
-e_object_elements([H|T],Acc) ->
-    e_object_elements(T,[e_object_element(H)|Acc]).
-
-e_object_element(Num) when Num < 128 ->
-    Num;
-%% must be changed to handle more than 2 octets
-e_object_element(Num) ->  %% when Num < ???
-    Left = ((Num band 2#11111110000000) bsr 7) bor 2#10000000,
-    Right = Num band 2#1111111 ,
-    [Left,Right].
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_object_identifier(Bytes) -> {ObjId,RemainingBytes}
-%% ObjId -> {integer(),integer(),...} % at least 2 integers
-%% RemainingBytes -> [integer()] when integer() (0..255)
-decode_object_identifier(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-    [First|Rest] = dec_subidentifiers(Octs,0,[]),
-    Idlist = if
-		 First < 40 ->
-		     [0,First|Rest];
-		 First < 80 ->
-		     [1,First - 40|Rest];
-		 true ->
-		     [2,First - 80|Rest]
-	     end,
-    {list_to_tuple(Idlist),Bytes3}.
-
-dec_subidentifiers([H|T],Av,Al) when H >=16#80 ->
-    dec_subidentifiers(T,(Av bsl 7) + (H band 16#7F),Al);
-dec_subidentifiers([H|T],Av,Al) ->
-    dec_subidentifiers(T,0,[(Av bsl 7) + H |Al]);
-dec_subidentifiers([],_Av,Al) ->
-    lists:reverse(Al).
-
-get_constraint([{Key,V}],Key) ->
-    V;
-get_constraint([],_) ->
-    no;
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	    no;
-	{value,{_,V}} -> 
-	    V
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% complete(InList) -> ByteList
-%% Takes a coded list with bits and bytes and converts it to a list of bytes
-%% Should be applied as the last step at encode of a complete ASN.1 type
-%%
-
--ifdef(nodriver).
-
-complete(L) ->
-    case complete1(L) of
-	{[],[]} ->
-	    <<0>>;
-	{Acc,[]} ->
-	    Acc;
-	{Acc,Bacc}  ->
-	    [Acc|complete_bytes(Bacc)]
-    end.
-
-
-% this function builds the ugly form of lists [E1|E2] to avoid having to reverse it at the end.
-% this is done because it is efficient and that the result always will be sent on a port or
-% converted by means of list_to_binary/1
- complete1(InList) when list(InList) ->
-     complete1(InList,[],[]);
- complete1(InList) ->
-     complete1([InList],[],[]).
-
- complete1([],Acc,Bacc) ->
-     {Acc,Bacc};
- complete1([H|T],Acc,Bacc) when list(H) ->
-     {NewH,NewBacc} = complete1(H,Acc,Bacc),
-     complete1(T,NewH,NewBacc);
-
- complete1([{octets,Bin}|T],Acc,[]) ->
-     complete1(T,[Acc|Bin],[]);
-
- complete1([{octets,Bin}|T],Acc,Bacc) ->
-     complete1(T,[Acc|[complete_bytes(Bacc),Bin]],[]);
-
- complete1([{debug,_}|T], Acc,Bacc) ->
-     complete1(T,Acc,Bacc);
-
- complete1([{bits,N,Val}|T],Acc,Bacc) ->
-     complete1(T,Acc,complete_update_byte(Bacc,Val,N));
-
- complete1([{bit,Val}|T],Acc,Bacc) ->
-     complete1(T,Acc,complete_update_byte(Bacc,Val,1));
-
- complete1([align|T],Acc,[]) ->
-     complete1(T,Acc,[]);
- complete1([align|T],Acc,Bacc) ->
-     complete1(T,[Acc|complete_bytes(Bacc)],[]);
- complete1([{0,Bin}|T],Acc,[]) when binary(Bin) ->
-     complete1(T,[Acc|Bin],[]);
- complete1([{Unused,Bin}|T],Acc,[]) when integer(Unused),binary(Bin) ->
-     Size = size(Bin)-1,
-     <<Bs:Size/binary,B>> = Bin,
-     NumBits = 8-Unused,
-     complete1(T,[Acc|Bs],[[B bsr Unused]|NumBits]);
- complete1([{Unused,Bin}|T],Acc,Bacc) when integer(Unused),binary(Bin) ->
-     Size = size(Bin)-1,
-     <<Bs:Size/binary,B>> = Bin,
-     NumBits = 8 - Unused,
-     Bf = complete_bytes(Bacc),
-     complete1(T,[Acc|[Bf,Bs]],[[B bsr Unused]|NumBits]).
-
-
- complete_update_byte([],Val,Len) ->
-     complete_update_byte([[0]|0],Val,Len);
- complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len == 8 ->
-     [[0,((Byte bsl Len) + Val) band 255|Bacc]|0];
- complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len > 8  ->
-     Rem = 8 - NumBits,
-     Rest = Len - Rem,
-     complete_update_byte([[0,((Byte bsl Rem) + (Val bsr Rest)) band 255 |Bacc]|0],Val,Rest);
- complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) ->
-     [[((Byte bsl Len) + Val) band 255|Bacc]|NumBits+Len].
-
- 
- complete_bytes([[Byte|Bacc]|0]) ->
-     lists:reverse(Bacc);
- complete_bytes([[Byte|Bacc]|NumBytes]) ->
-     lists:reverse([(Byte bsl (8-NumBytes)) band 255|Bacc]);
- complete_bytes([]) ->
-     [].
-
--else.
-
-
- complete(L) ->
-    case catch port_control(drv_complete,1,L) of
-	Bin when binary(Bin) ->
-	    Bin;
-	List when list(List) -> handle_error(List,L);
-	{'EXIT',{badarg,Reason}} ->
-	    asn1rt_driver_handler:load_driver(),
-	    receive
-		driver_ready ->
-		    case catch port_control(drv_complete,1,L) of
-			Bin2 when binary(Bin2) -> Bin2;
-			List when list(List) -> handle_error(List,L);
-			Error -> exit(Error)
-		    end;
-		{error,Error} -> % error when loading driver
-		    %% the driver could not be loaded
-		    exit(Error);
-		Error={port_error,Reason} ->
-		    exit(Error)
-	    end;
-	{'EXIT',Reason} ->
-	    exit(Reason)
-    end.
-
-handle_error([],_)->
-    exit({error,{"memory allocation problem"}});
-handle_error("1",L) -> % error in complete in driver
-    exit({error,{asn1_error,L}});
-handle_error(ErrL,L) ->
-    exit({error,{unknown_error,ErrL,L}}).
-
--endif.
-
-
-octets_to_complete(Len,Val) when Len < 256 ->
-    [20,Len,Val];
-octets_to_complete(Len,Val) ->
-    [21,<<Len:16>>,Val].
-
-octets_unused_to_complete(Unused,Len,Val) when Len < 256 ->
-    [30,Unused,Len,Val];
-octets_unused_to_complete(Unused,Len,Val) ->
-    [31,Unused,<<Len:16>>,Val].
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per_v1.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per_v1.erl
deleted file mode 100644
index ebab269f5d..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/asn1rt_per_v1.erl
+++ /dev/null
@@ -1,1843 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: asn1rt_per_v1.erl,v 1.1 2008/12/17 09:53:31 mikpe Exp $
-%%
--module(asn1rt_per_v1).
-
-%% encoding / decoding of PER aligned
-
--include("asn1_records.hrl").
-
--export([dec_fixup/3, cindex/3, list_to_record/2]).
--export([setchoiceext/1, setext/1, fixoptionals/2, fixextensions/2,
-	 setoptionals/1, fixoptionals2/3, getext/1, getextension/2,
-	 skipextensions/3, getbit/1, getchoice/3 ]).
--export([getoptionals/2, getoptionals/3, set_choice/3,
-	 getoptionals2/2,
-	 encode_integer/2, encode_integer/3  ]).
--export([decode_integer/2, decode_integer/3, encode_small_number/1,
-	 encode_boolean/1, decode_boolean/1, encode_length/2,
-	 decode_length/1, decode_length/2,
-	 encode_small_length/1, decode_small_length/1,
-	 decode_compact_bit_string/3]).
--export([encode_enumerated/3, decode_enumerated/3, 
-	 encode_bit_string/3, decode_bit_string/3  ]).
--export([encode_octet_string/2, decode_octet_string/2,
-	encode_null/1, decode_null/1,
-	encode_object_identifier/1, decode_object_identifier/1,
-	complete/1]).
-
--export([encode_open_type/2, decode_open_type/2]).
-
--export([encode_UniversalString/2, decode_UniversalString/2,
-	 encode_PrintableString/2, decode_PrintableString/2,
-	 encode_GeneralString/2, decode_GeneralString/2,
-	 encode_GraphicString/2, decode_GraphicString/2,
-	 encode_TeletexString/2, decode_TeletexString/2,
-	 encode_VideotexString/2, decode_VideotexString/2,
-	 encode_VisibleString/2, decode_VisibleString/2,
-	 encode_BMPString/2, decode_BMPString/2,
-	 encode_IA5String/2, decode_IA5String/2,
-	 encode_NumericString/2, decode_NumericString/2,
-	 encode_ObjectDescriptor/2, decode_ObjectDescriptor/1
-	 ]).
-
-
-dec_fixup(Terms,Cnames,RemBytes) ->
-    dec_fixup(Terms,Cnames,RemBytes,[]).
-
-dec_fixup([novalue|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([{_Name,novalue}|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([H|T],[Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,[{Hc,H}|Acc]);
-dec_fixup([],_Cnames,RemBytes,Acc) ->
-    {lists:reverse(Acc),RemBytes}.
-
-cindex(Ix,Val,Cname) ->
-    case element(Ix,Val) of
-	{Cname,Val2} -> Val2;
-	X -> X
-    end.
-
-% converts a list to a record if necessary
-list_to_record(Name,List) when list(List) ->
-    list_to_tuple([Name|List]);
-list_to_record(_Name,Tuple) when tuple(Tuple) ->
-    Tuple.
-
-%%--------------------------------------------------------
-%% setchoiceext(InRootSet) -> [{bit,X}]
-%% X  is set to  1 when InRootSet==false
-%% X  is set to  0 when InRootSet==true
-%%
-setchoiceext(true) ->
-    [{debug,choiceext},{bit,0}];
-setchoiceext(false) ->
-    [{debug,choiceext},{bit,1}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% setext(true|false) ->  CompleteList
-%%
-
-setext(true) ->
-    [{debug,ext},{bit,1}];
-setext(false) ->
-    [{debug,ext},{bit,0}].
-
-%%
-
-fixoptionals2(OptList,OptLength,Val) when tuple(Val) ->
-    Bits = fixoptionals2(OptList,Val,0),
-    {Val,{bits,OptLength,Bits}};
-
-fixoptionals2([],_Val,Acc) ->
-    %% Optbits
-    Acc;
-fixoptionals2([Pos|Ot],Val,Acc) ->
-    case element(Pos,Val) of
-	asn1_NOVALUE -> fixoptionals2(Ot,Val,Acc bsl 1);
-	asn1_DEFAULT -> fixoptionals2(Ot,Val,Acc bsl 1);
-	_ -> fixoptionals2(Ot,Val,(Acc bsl 1) + 1)
-    end.
-
-
-%%
-%% fixoptionals remains only for backward compatibility purpose
-fixoptionals(OptList,Val) when tuple(Val) ->
-    fixoptionals(OptList,Val,[]);
-    
-fixoptionals(OptList,Val) when list(Val) ->
-    fixoptionals(OptList,Val,1,[],[]).
-
-fixoptionals([],Val,Acc) ->
-    % return {Val,Opt}
-    {Val,lists:reverse(Acc)};
-fixoptionals([{_,Pos}|Ot],Val,Acc) ->
-    case element(Pos+1,Val) of
-	asn1_NOVALUE -> fixoptionals(Ot,Val,[0|Acc]);
-	asn1_DEFAULT -> fixoptionals(Ot,Val,[0|Acc]);
-	_ -> fixoptionals(Ot,Val,[1|Acc])
-    end.
-
-
-%setoptionals(OptList,Val) ->
-%    Vlist = tuple_to_list(Val),
-%    setoptionals(OptList,Vlist,1,[]).
-
-fixoptionals([{Name,Pos}|Ot],[{Name,Val}|Vt],_Opt,Acc1,Acc2) ->
-    fixoptionals(Ot,Vt,Pos+1,[1|Acc1],[{Name,Val}|Acc2]);
-fixoptionals([{_Name,Pos}|Ot],V,Pos,Acc1,Acc2) ->
-    fixoptionals(Ot,V,Pos+1,[0|Acc1],[asn1_NOVALUE|Acc2]);
-fixoptionals(O,[Vh|Vt],Pos,Acc1,Acc2) ->
-    fixoptionals(O,Vt,Pos+1,Acc1,[Vh|Acc2]);
-fixoptionals([],[Vh|Vt],Pos,Acc1,Acc2) ->
-    fixoptionals([],Vt,Pos+1,Acc1,[Vh|Acc2]);
-fixoptionals([],[],_,Acc1,Acc2) ->
-    % return {Val,Opt}
-    {list_to_tuple([asn1_RECORDNAME|lists:reverse(Acc2)]),lists:reverse(Acc1)}.
-
-setoptionals([H|T]) ->
-    [{bit,H}|setoptionals(T)];
-setoptionals([]) ->
-    [{debug,optionals}].
-
-getext(Bytes) when tuple(Bytes) ->
-    getbit(Bytes);
-getext(Bytes) when list(Bytes) ->
-    getbit({0,Bytes}).
-
-getextension(0, Bytes) ->
-    {{},Bytes};
-getextension(1, Bytes) ->
-    {Len,Bytes2} = decode_small_length(Bytes),
-    {Blist, Bytes3} = getbits_as_list(Len,Bytes2),
-    {list_to_tuple(Blist),Bytes3}.
-
-fixextensions({ext,ExtPos,ExtNum},Val) ->
-    case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
-	0 -> [];
-	ExtBits ->
-	    [encode_small_length(ExtNum),{bits,ExtNum,ExtBits}]
-    end.
-
-fixextensions(Pos,MaxPos,_,Acc) when Pos >= MaxPos ->
-    Acc;
-fixextensions(Pos,ExtPos,Val,Acc) ->
-    Bit = case catch(element(Pos+1,Val)) of
-	      asn1_NOVALUE ->
-		  0;
-	      asn1_NOEXTVALUE ->
-		  0;
-	      {'EXIT',_} ->
-		  0;
-	      _ ->
-		  1
-	  end,
-    fixextensions(Pos+1,ExtPos,Val,(Acc bsl 1)+Bit).
-	    
-skipextensions(Bytes,Nr,ExtensionBitPattern) -> 
-    case (catch element(Nr,ExtensionBitPattern)) of
-	1 ->
-	    {_,Bytes2} = decode_open_type(Bytes,[]),
-	    skipextensions(Bytes2, Nr+1, ExtensionBitPattern);
-	0 ->
-	    skipextensions(Bytes, Nr+1, ExtensionBitPattern);
-	{'EXIT',_} -> % badarg, no more extensions
-	    Bytes
-    end.
-    
-
-getchoice(Bytes,1,0) -> % only 1 alternative is not encoded
-    {0,Bytes};
-getchoice(Bytes,_NumChoices,1) ->
-    decode_small_number(Bytes);
-getchoice(Bytes,NumChoices,0) ->
-    decode_integer(Bytes,[{'ValueRange',{0,NumChoices-1}}]).
-
-getoptionals2(Bytes,NumOpt) ->
-    getbits(Bytes,NumOpt).
-
-%% getoptionals is kept only for bakwards compatibility
-getoptionals(Bytes,NumOpt) ->
-    {Blist,Bytes1} = getbits_as_list(NumOpt,Bytes),
-    {list_to_tuple(Blist),Bytes1}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% getoptionals/3 is only here for compatibility from 1.3.2 
-%% the codegenerator uses getoptionals/2
-
-getoptionals(Bytes,L,NumComp) when list(L) ->
-    {Blist,Bytes1} = getbits_as_list(length(L),Bytes),
-    {list_to_tuple(comptuple(Blist,L,NumComp,1)),Bytes1}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% comptuple is only here for compatibility not used from 1.3.2
-comptuple([Bh|Bt],[{_Name,Nr}|T],NumComp,Nr) ->
-    [Bh|comptuple(Bt,T,NumComp-1,Nr+1)];
-comptuple(Bl,[{Name,Tnr}|Tl],NumComp,Nr) ->
-    [0|comptuple(Bl,[{Name,Tnr}|Tl],NumComp-1,Nr+1)];
-comptuple(_B,_L,0,_Nr) ->
-    [];
-comptuple(B,O,N,Nr) ->
-    [0|comptuple(B,O,N-1,Nr+1)].
-
-%% getbits_as_binary(Num,Bytes) -> {{Unused,BinBits},RestBytes},
-%% Num = integer(),
-%% Bytes = list() | tuple(),
-%% Unused = integer(),
-%% BinBits = binary(),
-%% RestBytes = tuple()
-getbits_as_binary(Num,Bytes) when list(Bytes) ->
-    getbits_as_binary(Num,{0,Bytes});
-getbits_as_binary(_Num,{Used,[]}) ->
-    {{0,<<>>},{Used,[]}};
-getbits_as_binary(Num,{Used,Bits=[H|T]}) ->
-    B1 = case (Num+Used) =< 8 of
-	     true -> Num;
-	     _ -> 8-Used
-	 end,
-    B2 = Num - B1,
-    Pad = (8 - ((B1+B2) rem 8)) rem 8,% Pad /= 8
-    RestBits = lists:nthtail((B1+B2) div 8,Bits),
-    Int = integer_from_list(B2,T,0),
-    NewUsed = (Used + Num) rem 8,
-    {{Pad,<<(H bsr (8-(Used+B1))):B1,Int:B2,0:Pad>>},{NewUsed,RestBits}}.
-
-integer_from_list(_Int,[],BigInt) ->
-    BigInt;
-integer_from_list(Int,[H|_T],BigInt) when Int < 8 ->
-    (BigInt bsl Int) bor (H bsr (8-Int));
-integer_from_list(Int,[H|T],BigInt) ->
-    integer_from_list(Int-8,T,(BigInt bsl 8) bor H).
-     
-getbits_as_list(Num,Bytes) ->
-    getbits_as_list(Num,Bytes,[]).
-
-getbits_as_list(0,Bytes,Acc) ->
-    {lists:reverse(Acc),Bytes};
-getbits_as_list(Num,Bytes,Acc) ->
-    {Bit,NewBytes} = getbit(Bytes),
-    getbits_as_list(Num-1,NewBytes,[Bit|Acc]).
-
-getbit(Bytes) ->
-%    io:format("getbit:~p~n",[Bytes]),
-    getbit1(Bytes).
-
-getbit1({7,[H|T]}) ->
-    {H band 1,{0,T}};
-getbit1({Pos,[H|T]}) ->
-    {(H bsr (7-Pos)) band 1,{(Pos+1) rem 8,[H|T]}};
-getbit1(Bytes) when list(Bytes) ->
-    getbit1({0,Bytes}).
-
-%% This could be optimized 
-getbits(Buffer,Num) ->
-%    io:format("getbits:Buffer = ~p~nNum=~p~n",[Buffer,Num]),
-    getbits(Buffer,Num,0).
-
-getbits(Buffer,0,Acc) ->
-    {Acc,Buffer};
-getbits(Buffer,Num,Acc) ->
-    {B,NewBuffer} = getbit(Buffer),
-    getbits(NewBuffer,Num-1,B + (Acc bsl 1)).
-
-
-getoctet(Bytes) when list(Bytes) ->
-    getoctet({0,Bytes});
-getoctet(Bytes) ->
-%    io:format("getoctet:Buffer = ~p~n",[Bytes]),
-    getoctet1(Bytes).
-
-getoctet1({0,[H|T]}) ->
-    {H,{0,T}};
-getoctet1({_Pos,[_,H|T]}) ->
-    {H,{0,T}}.
-
-align({0,L}) ->
-    {0,L};
-align({_Pos,[_H|T]}) ->
-    {0,T};
-align(Bytes) ->
-    {0,Bytes}.
-
-getoctets(Buffer,Num) ->
-%    io:format("getoctets:Buffer = ~p~nNum = ~p~n",[Buffer,Num]),
-    getoctets(Buffer,Num,0).
-
-getoctets(Buffer,0,Acc) ->
-    {Acc,Buffer};
-getoctets(Buffer,Num,Acc) ->
-    {Oct,NewBuffer} = getoctet(Buffer),
-    getoctets(NewBuffer,Num-1,(Acc bsl 8)+Oct). 
-
-getoctets_as_list(Buffer,Num) ->
-    getoctets_as_list(Buffer,Num,[]).
-
-getoctets_as_list(Buffer,0,Acc) ->
-    {lists:reverse(Acc),Buffer};
-getoctets_as_list(Buffer,Num,Acc) ->
-    {Oct,NewBuffer} = getoctet(Buffer),
-    getoctets_as_list(NewBuffer,Num-1,[Oct|Acc]).
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% set_choice(Alt,Choices,Altnum) -> ListofBitSettings
-%% Alt = atom()
-%% Altnum = integer() | {integer(),integer()}% number of alternatives
-%% Choices = [atom()] | {[atom()],[atom()]}
-%% When Choices is a tuple the first list is the Rootset and the
-%% second is the Extensions and then Altnum must also be a tuple with the
-%% lengths of the 2 lists 
-%%
-set_choice(Alt,{L1,L2},{Len1,_Len2}) ->
-    case set_choice_tag(Alt,L1) of
-	N when integer(N), Len1 > 1 ->
-	    [{bit,0}, % the value is in the root set
-	     encode_integer([{'ValueRange',{0,Len1-1}}],N)];
-	N when integer(N) ->
-	    [{bit,0}]; % no encoding if only 0 or 1 alternative
-	false ->
-	    [{bit,1}, % extension value
-	     case set_choice_tag(Alt,L2) of
-		 N2 when integer(N2) ->
-		     encode_small_number(N2);
-		 false ->
-		     unknown_choice_alt
-	     end]
-    end;
-set_choice(Alt,L,Len) ->
-    case set_choice_tag(Alt,L) of
-	N when integer(N), Len > 1 ->
-	    encode_integer([{'ValueRange',{0,Len-1}}],N);
-	N when integer(N) ->
-	    []; % no encoding if only 0 or 1 alternative
-	false ->
-	    [unknown_choice_alt]
-    end.
-
-set_choice_tag(Alt,Choices) ->
-    set_choice_tag(Alt,Choices,0).
-
-set_choice_tag(Alt,[Alt|_Rest],Tag) ->
-    Tag;
-set_choice_tag(Alt,[_H|Rest],Tag) ->
-    set_choice_tag(Alt,Rest,Tag+1);
-set_choice_tag(_Alt,[],_Tag) ->
-    false.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_open_type(Constraint, Value) -> CompleteList
-%% Value = list of bytes of an already encoded value (the list must be flat)
-%%         | binary
-%% Contraint = not used in this version
-%%
-encode_open_type(_Constraint, Val) when list(Val) -> 
-    [encode_length(undefined,length(Val)),align,
-	     {octets,Val}];
-encode_open_type(_Constraint, Val) when binary(Val) ->
-    [encode_length(undefined,size(Val)),align,
-	     {octets,binary_to_list(Val)}].
-%% the binary_to_list is not optimal but compatible with the current solution
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_open_type(Buffer,Constraint) -> Value
-%% Constraint is not used in this version
-%% Buffer = [byte] with PER encoded data 
-%% Value = [byte] with decoded data (which must be decoded again as some type)
-%%
-decode_open_type(Bytes, _Constraint) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    Bytes3 = align(Bytes2),
-    getoctets_as_list(Bytes3,Len).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_integer(Constraint,Value,NamedNumberList) -> CompleteList
-%% encode_integer(Constraint,Value) -> CompleteList
-%% encode_integer(Constraint,{Name,Value}) -> CompleteList
-%% 
-%%
-encode_integer(C,V,NamedNumberList) when atom(V) ->
-    case lists:keysearch(V,1,NamedNumberList) of
-	{value,{_,NewV}} -> 
-	    encode_integer(C,NewV);
-	_ -> 
-	    exit({error,{asn1,{namednumber,V}}})
-    end;
-encode_integer(C,V,_) when integer(V) ->
-    encode_integer(C,V);
-encode_integer(C,{Name,V},NamedNumberList) when atom(Name) ->
-    encode_integer(C,V,NamedNumberList).
-    
-encode_integer(C,{Name,Val}) when atom(Name) ->
-    encode_integer(C,Val);
-
-encode_integer({Rc,_Ec},Val) ->
-    case (catch encode_integer(Rc,Val)) of
-	{'EXIT',{error,{asn1,_}}} ->
-	    [{bit,1},encode_unconstrained_number(Val)];
-	Encoded ->
-	    [{bit,0},Encoded]
-    end;
-encode_integer(C,Val ) when list(C) ->
-    case get_constraint(C,'SingleValue') of
-	no ->
-	    encode_integer1(C,Val);
-	V when integer(V),V == Val ->
-	    []; % a type restricted to a single value encodes to nothing
-	V when list(V) ->
-	    case lists:member(Val,V) of
-		true ->
-		    encode_integer1(C,Val);
-		_ ->
-		    exit({error,{asn1,{illegal_value,Val}}})
-	    end;
-	_ ->
-	    exit({error,{asn1,{illegal_value,Val}}})
-    end.
-
-encode_integer1(C, Val) ->		    
-    case VR = get_constraint(C,'ValueRange') of
-	no ->
-	    encode_unconstrained_number(Val);
-	{Lb,'MAX'} ->
-	    encode_semi_constrained_number(Lb,Val);
-	%% positive with range
-	{Lb,Ub} when Val >= Lb,
-		     Ub >= Val ->
-	    encode_constrained_number(VR,Val);
-	_ ->
-	    exit({error,{asn1,{illegal_value,VR,Val}}})
-    end.
-
-decode_integer(Buffer,Range,NamedNumberList) ->
-    {Val,Buffer2} = decode_integer(Buffer,Range),
-    case lists:keysearch(Val,2,NamedNumberList) of
-	{value,{NewVal,_}} -> {NewVal,Buffer2};
-	_ -> {Val,Buffer2}
-    end.
-
-decode_integer(Buffer,{Rc,_Ec}) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> decode_integer(Buffer2,Rc);
-	1 -> decode_unconstrained_number(Buffer2)
-    end;
-decode_integer(Buffer,undefined) ->
-    decode_unconstrained_number(Buffer);
-decode_integer(Buffer,C) ->
-    case get_constraint(C,'SingleValue') of
-	V when integer(V) ->
-	    {V,Buffer};
-	V when list(V) ->
-	    {Val,Buffer2} = decode_integer1(Buffer,C),
-	    case lists:member(Val,V) of
-		true ->
-		    {Val,Buffer2};
-		_ -> 
-		    exit({error,{asn1,{illegal_value,Val}}})
-	    end;
-	_ ->
-	    decode_integer1(Buffer,C)
-    end.
-
-decode_integer1(Buffer,C) ->
-    case VR = get_constraint(C,'ValueRange') of
-	no ->
-	    decode_unconstrained_number(Buffer);
-	{Lb, 'MAX'} ->
-	    decode_semi_constrained_number(Buffer,Lb);
-	{_,_} ->
-	    decode_constrained_number(Buffer,VR)
-    end.
-
-% X.691:10.6 Encoding of a normally small non-negative whole number
-% Use this for encoding of CHOICE index if there is an extension marker in 
-% the CHOICE
-encode_small_number({Name,Val}) when atom(Name) ->
-    encode_small_number(Val);
-encode_small_number(Val) when Val =< 63 ->
-    [{bit,0},{bits,6,Val}];
-encode_small_number(Val) ->
-    [{bit,1},encode_semi_constrained_number(0,Val)].
-
-decode_small_number(Bytes) ->
-    {Bit,Bytes2} = getbit(Bytes),
-    case Bit of
-	0 -> 
-	    getbits(Bytes2,6);
-	1 ->
-	    decode_semi_constrained_number(Bytes2,{0,'MAX'})
-    end.
-
-% X.691:10.7 Encoding of a semi-constrained whole number
-%% might be an optimization encode_semi_constrained_number(0,Val) ->
-encode_semi_constrained_number(C,{Name,Val}) when atom(Name) ->
-    encode_semi_constrained_number(C,Val);
-encode_semi_constrained_number({Lb,'MAX'},Val) ->
-    encode_semi_constrained_number(Lb,Val);
-encode_semi_constrained_number(Lb,Val) ->
-    Val2 = Val - Lb,
-    Octs = eint_positive(Val2),
-    [encode_length(undefined,length(Octs)),{octets,Octs}].
-
-decode_semi_constrained_number(Bytes,{Lb,_}) ->
-    decode_semi_constrained_number(Bytes,Lb);
-decode_semi_constrained_number(Bytes,Lb) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {V,Bytes3} = getoctets(Bytes2,Len),
-    {V+Lb,Bytes3}.
-
-encode_constrained_number(Range,{Name,Val}) when atom(Name) ->
-    encode_constrained_number(Range,Val);
-encode_constrained_number({Lb,Ub},Val) when Val >= Lb, Ub >= Val -> 
-    Range = Ub - Lb + 1,
-    Val2 = Val - Lb,
-    if 
-	Range  == 2 ->
-	    {bits,1,Val2};
-	Range  =< 4 -> 
-	    {bits,2,Val2};
-	Range  =< 8 ->
-	    {bits,3,Val2};
-	Range  =< 16 ->
-	    {bits,4,Val2};
-	Range  =< 32 ->
-	    {bits,5,Val2};
-	Range  =< 64 ->
-	    {bits,6,Val2};
-	Range  =< 128 ->
-	    {bits,7,Val2};
-	Range  =< 255 ->
-	    {bits,8,Val2};
-	Range  =< 256 ->
-	    {octets,1,Val2};
-	Range  =< 65536 ->
-	    {octets,2,Val2};
-	Range =< 16#1000000  ->
-	    Octs = eint_positive(Val2),
-	    [encode_length({1,3},length(Octs)),{octets,Octs}];
-	Range =< 16#100000000  ->
-	    Octs = eint_positive(Val2),
-	    [encode_length({1,4},length(Octs)),{octets,Octs}];
-	Range =< 16#10000000000  ->
-	    Octs = eint_positive(Val2),
-	    [encode_length({1,5},length(Octs)),{octets,Octs}];
-       true  ->
-	    exit({not_supported,{integer_range,Range}})
-    end.
-
-decode_constrained_number(Buffer,{Lb,Ub}) ->
-    Range = Ub - Lb + 1,
-%    Val2 = Val - Lb,
-    {Val,Remain} = 
-	if 
-	   Range  == 2 ->
-		getbits(Buffer,1);
-	   Range  =< 4 -> 
-		getbits(Buffer,2);
-	   Range  =< 8 ->
-		getbits(Buffer,3);
-	   Range  =< 16 ->
-		getbits(Buffer,4);
-	   Range  =< 32 ->
-		getbits(Buffer,5);
-	   Range  =< 64 ->
-		getbits(Buffer,6);
-	   Range  =< 128 ->
-		getbits(Buffer,7);
-	   Range  =< 255 ->
-		getbits(Buffer,8);
-	   Range  =< 256 ->
-		getoctets(Buffer,1);
-	   Range  =< 65536 ->
-		getoctets(Buffer,2);
-	   Range =< 16#1000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,3}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	   Range =< 16#100000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,4}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	   Range =< 16#10000000000  ->
-		{Len,Bytes2} = decode_length(Buffer,{1,5}),
-		{Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-		{dec_pos_integer(Octs),Bytes3};
-	   true  ->
-		exit({not_supported,{integer_range,Range}})
-	end,
-    {Val+Lb,Remain}.
-
-% X.691:10.8 Encoding of an unconstrained whole number
-
-encode_unconstrained_number(Val) when Val >= 0 ->
-    Oct = eint(Val,[]),
-    [{debug,unconstrained_number},
-     encode_length({0,'MAX'},length(Oct)),
-     {octets,Oct}];
-encode_unconstrained_number(Val) -> % negative
-    Oct = enint(Val,[]),
-    [{debug,unconstrained_number},
-     encode_length({0,'MAX'},length(Oct)),
-     {octets,Oct}].
-
-%% used for positive Values which don't need a sign bit
-eint_positive(Val) ->
-    case eint(Val,[]) of
-	[0,B1|T] ->
-	    [B1|T];
-	T -> 
-	    T
-    end.
-
-eint(0, [B|Acc]) when B < 128 ->
-    [B|Acc];
-eint(N, Acc) ->
-    eint(N bsr 8, [N band 16#ff| Acc]).
-
-enint(-1, [B1|T]) when B1 > 127 ->
-    [B1|T];
-enint(N, Acc) ->
-    enint(N bsr 8, [N band 16#ff|Acc]).
-
-%% used for signed positive values
-
-%eint(Val, Ack) ->
-%    X = Val band 255,
-%    Next = Val bsr 8,
-%    if
-%	Next == 0, X >= 127 ->
-%	    [0,X|Ack];
-%	Next == 0 ->
-%	    [X|Ack];
-%	true ->
-%	    eint(Next,[X|Ack])
-%    end.
-
-%%% used for signed negative values
-%enint(Val, Acc) ->
-%    NumOctets = if 
-%		    -Val < 16#80 -> 1;
-%		    -Val < 16#8000 ->2;
-%		    -Val < 16#800000 ->3;
-%		    -Val < 16#80000000 ->4;
-%		    -Val < 16#8000000000 ->5;
-%		    -Val < 16#800000000000 ->6;
-%		    -Val < 16#80000000000000 ->7;
-%		    -Val < 16#8000000000000000 ->8;
-%		    -Val < 16#800000000000000000 ->9
-%		end,
-%    enint(Val,Acc,NumOctets).
-
-%enint(Val, Acc,0) ->
-%    Acc;
-%enint(Val, Acc,NumOctets) ->
-%    enint(Val bsr 8,[Val band 255|Acc],NumOctets-1).
-    
-
-decode_unconstrained_number(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Ints,Bytes3} = getoctets_as_list(Bytes2,Len),
-    {dec_integer(Ints),Bytes3}.
-
-dec_pos_integer(Ints) ->
-    decpint(Ints, 8 * (length(Ints) - 1)).
-dec_integer(Ints) when hd(Ints) band 255 =< 127 -> %% Positive number
-    decpint(Ints, 8 * (length(Ints) - 1));
-dec_integer(Ints) ->                        %% Negative
-    decnint(Ints,  8 * (length(Ints) - 1)).
-
-decpint([Byte|Tail], Shift) ->
-    (Byte bsl Shift) bor decpint(Tail, Shift-8);
-decpint([], _) -> 0.
-
-decnint([Byte|Tail], Shift) ->
-    (-128 + (Byte band 127) bsl Shift) bor decpint(Tail, Shift-8).
-
-minimum_octets(Val) ->
-    minimum_octets(Val,[]).
-
-minimum_octets(Val,Acc) when Val > 0 -> 
-    minimum_octets((Val bsr 8),[Val band 16#FF|Acc]);
-minimum_octets(0,Acc) ->
-    Acc.
-
-
-%% X.691:10.9 Encoding of a length determinant
-%%encode_small_length(undefined,Len) -> % null means no UpperBound
-%%    encode_small_number(Len).
-
-%% X.691:10.9.3.5 
-%% X.691:10.9.3.7
-encode_length(undefined,Len) -> % un-constrained
-    if 
-	Len < 128 ->
-	    {octet,Len band 16#7F};
-	Len < 16384 ->
-	    {octets,2,2#1000000000000000 bor Len};
-	true  ->
-	    exit({error,{asn1,{encode_length,{nyi,above_16k}}}})
-    end;
-	
-encode_length({0,'MAX'},Len) ->
-    encode_length(undefined,Len);
-encode_length({Lb,Ub},Len) when Ub =< 65535 ,Lb >= 0 -> % constrained
-    encode_constrained_number({Lb,Ub},Len);
-encode_length({{Lb,Ub},[]},Len) when Ub =< 65535 ,Lb >= 0 -> 
-    %% constrained extensible
-    [{bit,0},encode_constrained_number({Lb,Ub},Len)];
-encode_length(SingleValue,_) when integer(SingleValue) ->
-    [].
-
-encode_small_length(Len) when Len =< 64 ->
-    [{bit,0},{bits,6,Len-1}];
-encode_small_length(Len) ->
-    [{bit,1},encode_length(undefined,Len)].
-
-decode_small_length(Buffer) ->
-    case getbit(Buffer) of
-	{0,Remain} -> 
-	    {Bits,Remain2} = getbits(Remain,6),
-	    {Bits+1,Remain2};
-	{1,Remain} -> 
-	    decode_length(Remain,undefined)
-    end.
-
-decode_length(Buffer) ->
-    decode_length(Buffer,undefined).
-
-decode_length(Buffer,undefined)  -> % un-constrained
-    Buffer2 = align(Buffer),
-    {Bits,_} = getbits(Buffer2,2),
-    case Bits of
-	2 -> 
-	    {Val,Bytes3} = getoctets(Buffer2,2),
-	    {(Val band 16#3FFF),Bytes3};
-	3 ->
-	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}});
-	_ ->
-	    {Val,Bytes3} = getoctet(Buffer2),
-	    {Val band 16#7F,Bytes3}
-    end;
-
-decode_length(Buffer,{Lb,Ub}) when Ub =< 65535 ,Lb >= 0 -> % constrained
-    decode_constrained_number(Buffer,{Lb,Ub});
-
-decode_length(Buffer,{{Lb,Ub},[]}) -> 
-    case getbit(Buffer) of
-	{0,Buffer2} ->
-	    decode_length(Buffer2, {Lb,Ub})
-    end;
-						% X.691:10.9.3.5 
-decode_length(Buffer,{_,_Lb,_Ub}) -> %when Len =< 127 -> % Unconstrained or large Ub
-    case getbit(Buffer) of
-	{0,Remain} -> 
-	    getbits(Remain,7);
-	{1,_Remain} -> 
-	    {Val,Remain2} = getoctets(Buffer,2),
-	    {Val band 2#0111111111111111, Remain2}
-    end;
-decode_length(Buffer,SingleValue) when integer(SingleValue) ->
-    {SingleValue,Buffer}.
-
-
-% X.691:11
-encode_boolean({Name,Val}) when atom(Name) ->
-    encode_boolean(Val);
-encode_boolean(true) ->
-    {bit,1};
-encode_boolean(false) ->
-    {bit,0};
-encode_boolean(Val) ->
-    exit({error,{asn1,{encode_boolean,Val}}}).
-
-
-decode_boolean(Buffer) -> %when record(Buffer,buffer)
-    case getbit(Buffer) of
-	{1,Remain} -> {true,Remain};
-	{0,Remain} -> {false,Remain}
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% X.691:12 
-%% ENUMERATED
-%%
-%% encode_enumerated(C,Value,NamedNumberTup) -> CompleteList
-%%
-%% 
-
-encode_enumerated(C,{Name,Value},NamedNumberList) when 
-  atom(Name),list(NamedNumberList) ->
-    encode_enumerated(C,Value,NamedNumberList);
-
-%% ENUMERATED with extension mark
-encode_enumerated(_C,{asn1_enum,Value},{_Nlist1,Nlist2}) when Value >= length(Nlist2) ->
-    [{bit,1},encode_small_number(Value)];
-encode_enumerated(C,Value,{Nlist1,Nlist2}) ->
-    case enum_search(Value,Nlist1,0) of
-	NewV when integer(NewV) -> 
-	    [{bit,0},encode_integer(C,NewV)];
-	false -> 
-	    case enum_search(Value,Nlist2,0) of
-		ExtV when integer(ExtV) ->
-		    [{bit,1},encode_small_number(ExtV)];
-		false ->
-		    exit({error,{asn1,{encode_enumerated,Value}}})
-	    end
-    end;
-
-encode_enumerated(C,Value,NamedNumberList) when list(NamedNumberList) ->
-    case enum_search(Value,NamedNumberList,0) of
-	NewV when integer(NewV) -> 
-	    encode_integer(C,NewV);
-	false -> 
-	    exit({error,{asn1,{encode_enumerated,Value}}})
-    end.
-
-%% returns the ordinal number from 0 ,1 ... in the list where Name is found
-%% or false if not found
-%%
-enum_search(Name,[Name|_NamedNumberList],Acc) ->
-    Acc;
-enum_search(Name,[_H|T],Acc) ->
-    enum_search(Name,T,Acc+1);
-enum_search(_,[],_) ->
-    false. % name not found !error
-    
-%% ENUMERATED with extension marker
-decode_enumerated(Buffer,C,{Ntup1,Ntup2}) when tuple(Ntup1), tuple(Ntup2) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> % not an extension value
-	    {Val,Buffer3} = decode_integer(Buffer2,C),
-	    case catch (element(Val+1,Ntup1)) of
-		NewVal when atom(NewVal) -> {NewVal,Buffer3};
-		_Error -> exit({error,{asn1,{decode_enumerated,{Val,[Ntup1,Ntup2]}}}})
-	    end;
-	1 -> % this an extension value
-	    {Val,Buffer3} = decode_small_number(Buffer2),
-	    case catch (element(Val+1,Ntup2)) of
-		NewVal when atom(NewVal) -> {NewVal,Buffer3};
-		_ -> {{asn1_enum,Val},Buffer3}
-	    end
-    end;
-
-decode_enumerated(Buffer,C,NamedNumberTup) when tuple(NamedNumberTup) ->
-    {Val,Buffer2} = decode_integer(Buffer,C),
-    case catch (element(Val+1,NamedNumberTup)) of
-	NewVal when atom(NewVal) -> {NewVal,Buffer2};
-	_Error -> exit({error,{asn1,{decode_enumerated,{Val,NamedNumberTup}}}})
-    end.
-
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-%% Bitstring value, ITU_T X.690 Chapter 8.5
-%%===============================================================================
-%%===============================================================================
-%%===============================================================================
-
-%%===============================================================================
-%% encode bitstring value
-%%===============================================================================
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% bitstring NamedBitList
-%% Val can be  of:
-%% - [identifiers] where only named identifers are set to one, 
-%%   the Constraint must then have some information of the 
-%%   bitlength.
-%% - [list of ones and zeroes] all bits 
-%% - integer value representing the bitlist
-%% C is constraint Len, only valid when identifiers
-
-
-%% when the value is a list of {Unused,BinBits}, where 
-%% Unused = integer(),
-%% BinBits = binary().
-encode_bit_string(C,Bin={Unused,BinBits},NamedBitList) when integer(Unused),
-							    binary(BinBits) ->
-    encode_bin_bit_string(C,Bin,NamedBitList);
-
-%% when the value is a list of named bits
-encode_bit_string(C, [FirstVal | RestVal], NamedBitList) when atom(FirstVal) ->
-    ToSetPos = get_all_bitposes([FirstVal | RestVal], NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos,0),
-    encode_bit_string(C,BitList,NamedBitList);
-
-encode_bit_string(C, [{bit,No} | RestVal], NamedBitList) ->
-    ToSetPos = get_all_bitposes([{bit,No} | RestVal], NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos,0),
-    encode_bit_string(C,BitList,NamedBitList);
-
-%% when the value is a list of ones and zeroes
-
-encode_bit_string(C, BitListValue, NamedBitList) when list(BitListValue) ->
-    Bl1 = 
-	case NamedBitList of
-	    [] ->  % dont remove trailing zeroes
-		BitListValue;
-	    _ -> % first remove any trailing zeroes
-		lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,
-					      lists:reverse(BitListValue)))
-	end,
-    BitList = [{bit,X} || X <- Bl1],
-    BListLen = length(BitList),
-    case get_constraint(C,'SizeConstraint') of
-	0 -> % fixed length
-	    []; % nothing to encode
-	V when integer(V),V=<16 -> % fixed length 16 bits or less
-	    pad_list(V,BitList);
-	V when integer(V) -> % fixed length 16 bits or less
-	    [align,pad_list(V,BitList)];
-	{Lb,Ub} when integer(Lb),integer(Ub),BListLen<Lb ->
-	    %% padding due to OTP-4353
-	    [encode_length({Lb,Ub},Lb),align,pad_list(Lb,BitList)];
-	{Lb,Ub} when integer(Lb),integer(Ub) ->	    
-	    [encode_length({Lb,Ub},length(BitList)),align,BitList];
-	no ->
-	    [encode_length(undefined,length(BitList)),align,BitList];
-	Sc={{Lb,Ub},_} when integer(Lb),integer(Ub),BListLen<Lb ->
-	    %% padding due to OTP-4353
-	    [encode_length(Sc,Lb),align,pad_list(Lb,BitList)];
-	Sc -> % extension marker
-	    [encode_length(Sc,length(BitList)),align,BitList]
-    end;
-
-%% when the value is an integer
-encode_bit_string(C, IntegerVal, NamedBitList) when integer(IntegerVal)->
-    BitList = int_to_bitlist(IntegerVal),
-    encode_bit_string(C,BitList,NamedBitList);
-
-%% when the value is a tuple
-encode_bit_string(C,{Name,Val}, NamedBitList) when atom(Name) ->
-    encode_bit_string(C,Val,NamedBitList).
-
-
-%% encode_bin_bit_string/3, when value is a tuple of Unused and BinBits.
-%% Unused = integer(),
-%% BinBits = binary().
-
-encode_bin_bit_string(C,{Unused,BinBits},NamedBitList) ->
-    RemoveZerosIfNNL =
-	fun({NNL,BitList}) -> 
-		case NNL of
-		    [] -> BitList;
-		    _ ->
-			lists:reverse(
-			  lists:dropwhile(fun(0)->true;(1)->false end,
-					  lists:reverse(BitList)))
-		end
-	end,
-    {OctetList,OLSize,LastBits} =
-	case size(BinBits) of
-	    N when N>1 ->
-		IntList = binary_to_list(BinBits),
-		[H|T] = lists:reverse(IntList),
-		Bl1 = RemoveZerosIfNNL({NamedBitList,lists:reverse(int_to_bitlist(H,8-Unused))}),% lists:sublist obsolete if trailing bits are zero !
-		{[{octet,X} || X <- lists:reverse(T)],size(BinBits)-1,
-		 [{bit,X} || X <- Bl1]};
-	    1 ->
-		<<B7:1,B6:1,B5:1,B4:1,B3:1,B2:1,B1:1,B0:1>> = BinBits,
-		{[],0,[{bit,X} || X <- lists:sublist([B7,B6,B5,B4,B3,B2,B1,B0],8-Unused)]};
-	    _ ->
-		{[],0,[]}
-	end,
-    case get_constraint(C,'SizeConstraint') of
-	0 ->
-	    [];
-	V when integer(V),V=<16 ->
-	    [OctetList, pad_list(V,LastBits)];
-	V when integer(V) ->
-%	    [OctetList, align, pad_list(V rem 8,LastBits)];
-	    [align,OctetList, pad_list(V rem 8,LastBits)];
-	{Lb,Ub} when integer(Lb),integer(Ub) ->
-	    NewLastBits = maybe_pad(Lb,length(LastBits)+(OLSize*8),LastBits,NamedBitList),
-	    [encode_length({Lb,Ub},length(NewLastBits)+(OLSize*8)),
-%			   OctetList,align,LastBits];
-			   align,OctetList,NewLastBits];
-	no ->
-	    [encode_length(undefined,length(LastBits)+(OLSize*8)),
-%	     OctetList,align,LastBits];
-	     align,OctetList,LastBits];
-	Sc={{Lb,_},_} when integer(Lb) ->
-	    NewLastBits = maybe_pad(Lb,length(LastBits)+(OLSize*8),LastBits,NamedBitList),
-	    [encode_length(Sc,length(NewLastBits)+(OLSize*8)),
-	     align,OctetList,NewLastBits];
-	Sc ->
-	    [encode_length(Sc,length(LastBits)+(OLSize*8)),
-%	     OctetList,align,LastBits]
-	     align,OctetList,LastBits]
-    end.
-    
-maybe_pad(_,_,Bits,[]) ->
-    Bits;
-maybe_pad(Lb,LenBits,Bits,_) when Lb>LenBits ->
-    pad_list(Lb,Bits);
-maybe_pad(_,_,Bits,_) ->
-    Bits.
-    
-%%%%%%%%%%%%%%%
-%% The result is presented as a list of named bits (if possible)
-%% else as a tuple {Unused,Bits}. Unused is the number of unused
-%% bits, least significant bits in the last byte of Bits. Bits is
-%% the BIT STRING represented as a binary.
-%% 
-decode_compact_bit_string(Buffer, C, NamedNumberList) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 -> % fixed length
-	    {{0,<<>>},Buffer};
-	V when integer(V),V=<16 -> %fixed length 16 bits or less
-	    compact_bit_string(Buffer,V,NamedNumberList);
-	V when integer(V) -> %fixed length > 16 bits
-	    Bytes2 = align(Buffer),
-	    compact_bit_string(Bytes2,V,NamedNumberList);
-	{Lb,Ub} when integer(Lb),integer(Ub) ->
-	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList);
-	no ->
-	    {Len,Bytes2} = decode_length(Buffer,undefined),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList);
-	Sc ->
-	    {Len,Bytes2} = decode_length(Buffer,Sc),
-	    Bytes3 = align(Bytes2),
-	    compact_bit_string(Bytes3,Len,NamedNumberList)
-    end.
-
-
-%%%%%%%%%%%%%%%
-%% The result is presented as a list of named bits (if possible)
-%% else as a list of 0 and 1.
-%% 
-decode_bit_string(Buffer, C, NamedNumberList) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 -> % fixed length
-	    {[],Buffer}; % nothing to encode
-	V when integer(V),V=<16 -> % fixed length 16 bits or less
-	    bit_list_to_named(Buffer,V,NamedNumberList);
-	V when integer(V) -> % fixed length 16 bits or less
-	    Bytes2 = align(Buffer),
-	    bit_list_to_named(Bytes2,V,NamedNumberList);
-	{Lb,Ub} when integer(Lb),integer(Ub) ->
-	    {Len,Bytes2} = decode_length(Buffer,{Lb,Ub}),
-	    Bytes3 = align(Bytes2),
-	    bit_list_to_named(Bytes3,Len,NamedNumberList);
-	no ->
-	    {Len,Bytes2} = decode_length(Buffer,undefined),
-	    Bytes3 = align(Bytes2),
-	    bit_list_to_named(Bytes3,Len,NamedNumberList);
-	Sc -> % extension marker
-	    {Len,Bytes2} = decode_length(Buffer,Sc),
-	    Bytes3 = align(Bytes2),
-	    bit_list_to_named(Bytes3,Len,NamedNumberList)
-    end.
-
-
-%% if no named bits are declared we will return a
-%% {Unused,Bits}. Unused = integer(),
-%% Bits = binary().
-compact_bit_string(Buffer,Len,[]) ->
-    getbits_as_binary(Len,Buffer); % {{Unused,BinBits},NewBuffer}
-compact_bit_string(Buffer,Len,NamedNumberList) ->
-    bit_list_to_named(Buffer,Len,NamedNumberList).
-
-
-%% if no named bits are declared we will return a
-%% BitList = [0 | 1]
-
-bit_list_to_named(Buffer,Len,[]) ->
-    getbits_as_list(Len,Buffer);
-
-%% if there are named bits declared we will return a named
-%% BitList where the names are atoms and unnamed bits represented
-%% as {bit,Pos}
-%% BitList = [atom() | {bit,Pos}]
-%% Pos = integer()
-
-bit_list_to_named(Buffer,Len,NamedNumberList) ->
-    {BitList,Rest} = getbits_as_list(Len,Buffer),
-    {bit_list_to_named1(0,BitList,NamedNumberList,[]), Rest}.
-
-bit_list_to_named1(Pos,[0|Bt],Names,Acc) ->
-    bit_list_to_named1(Pos+1,Bt,Names,Acc);
-bit_list_to_named1(Pos,[1|Bt],Names,Acc) ->
-    case lists:keysearch(Pos,2,Names) of
-	{value,{Name,_}} ->
-	    bit_list_to_named1(Pos+1,Bt,Names,[Name|Acc]);
-	_  -> 
-	    bit_list_to_named1(Pos+1,Bt,Names,[{bit,Pos}|Acc])
-    end;
-bit_list_to_named1(_Pos,[],_Names,Acc) ->
-    lists:reverse(Acc).
-
-
-
-%%%%%%%%%%%%%%%
-%% 
-
-int_to_bitlist(0) ->
-    [];
-int_to_bitlist(Int) when integer(Int), Int >= 0 ->
-    [Int band 1 | int_to_bitlist(Int bsr 1)].
-
-int_to_bitlist(_Int,0) ->
-    [];
-int_to_bitlist(0,N) ->
-    [0|int_to_bitlist(0,N-1)];
-int_to_bitlist(Int,N) ->
-    [Int band 1 | int_to_bitlist(Int bsr 1, N-1)].
-
-
-%%%%%%%%%%%%%%%%%%
-%% get_all_bitposes([list of named bits to set], named_bit_db, []) ->
-%%   [sorted_list_of_bitpositions_to_set]
-
-get_all_bitposes([{bit,ValPos}|Rest], NamedBitList, Ack) ->
-    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack ]);
-
-get_all_bitposes([Val | Rest], NamedBitList, Ack) ->
-    case lists:keysearch(Val, 1, NamedBitList) of
-	{value, {_ValName, ValPos}} ->
-	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
-	_ ->
-	    exit({error,{asn1, {bitstring_namedbit, Val}}})
-    end;
-get_all_bitposes([], _NamedBitList, Ack) ->
-    lists:sort(Ack).
-
-%%%%%%%%%%%%%%%%%%
-%% make_and_set_list([list of positions to set to 1])->
-%% returns list with all in SetPos set.
-%% in positioning in list the first element is 0, the second 1 etc.., but
-%% 
-
-make_and_set_list([XPos|SetPos], XPos) ->
-    [1 | make_and_set_list(SetPos, XPos + 1)];
-make_and_set_list([Pos|SetPos], XPos) ->
-    [0 | make_and_set_list([Pos | SetPos], XPos + 1)];
-make_and_set_list([], _XPos) ->
-    [].
-
-%%%%%%%%%%%%%%%%%
-%% pad_list(N,BitList) -> PaddedList
-%% returns a padded (with trailing {bit,0} elements) list of length N
-%% if Bitlist contains more than N significant bits set an exit asn1_error 
-%% is generated
-
-pad_list(0,BitList) ->
-    case BitList of
-	[] -> [];
-	_ -> exit({error,{asn1,{range_error,{bit_string,BitList}}}})
-    end;
-pad_list(N,[Bh|Bt]) ->
-    [Bh|pad_list(N-1,Bt)];
-pad_list(N,[]) ->
-    [{bit,0},pad_list(N-1,[])].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% X.691:16
-%% encode_octet_string(Constraint,ExtensionMarker,Val)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-encode_octet_string(C,{Name,Val}) when atom(Name) ->
-    encode_octet_string(C,false,Val);
-encode_octet_string(C,Val) ->
-    encode_octet_string(C,false,Val).
-
-encode_octet_string(C,Bool,{_Name,Val}) ->
-    encode_octet_string(C,Bool,Val);
-encode_octet_string(_,true,_) -> 
-    exit({error,{asn1,{'not_supported',extensionmarker}}});
-encode_octet_string(C,false,Val) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 ->
-	    [];
-	1 ->
-	    [V] = Val,
-	    {bits,8,V};
-	2 ->
-	    [V1,V2] = Val,
-	    [{bits,8,V1},{bits,8,V2}];
-	Sv when Sv =<65535, Sv == length(Val) -> % fixed length
-	    [align,{octets,Val}];
-	{Lb,Ub}  ->
-	    [encode_length({Lb,Ub},length(Val)),align,
-	     {octets,Val}];
-	Sv when list(Sv) ->
-	    [encode_length({hd(Sv),lists:max(Sv)},length(Val)),align,
-	     {octets,Val}];
-	no  ->
-	    [encode_length(undefined,length(Val)),align,
-	     {octets,Val}]
-    end.
-
-decode_octet_string(Bytes,Range) ->
-    decode_octet_string(Bytes,Range,false).
-
-decode_octet_string(Bytes,C,false) ->
-    case get_constraint(C,'SizeConstraint') of
-	0 ->
-	    {[],Bytes};
-	1 ->
-	    {B1,Bytes2} = getbits(Bytes,8),
-	    {[B1],Bytes2};
-	2 ->
-	    {B1,Bytes2}= getbits(Bytes,8),
-	    {B2,Bytes3}= getbits(Bytes2,8),
-	    {[B1,B2],Bytes3};
-	{_,0} ->
-	    {[],Bytes};
-	Sv when integer(Sv), Sv =<65535 -> % fixed length
-	    Bytes2 = align(Bytes),
-	    getoctets_as_list(Bytes2,Sv);
-	{Lb,Ub}  ->
-	    {Len,Bytes2} = decode_length(Bytes,{Lb,Ub}),
-	    Bytes3 = align(Bytes2),
-	    getoctets_as_list(Bytes3,Len);
-	Sv when list(Sv) ->
-	    {Len,Bytes2} = decode_length(Bytes,{hd(Sv),lists:max(Sv)}),
-	    Bytes3 = align(Bytes2),
-	    getoctets_as_list(Bytes3,Len);
-	no  ->
-	    {Len,Bytes2} = decode_length(Bytes,undefined),
-	    Bytes3 = align(Bytes2),
-	    getoctets_as_list(Bytes3,Len)
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Restricted char string types 
-%% (NumericString, PrintableString,VisibleString,IA5String,BMPString,UniversalString)
-%% X.691:26 and X.680:34-36
-%%encode_restricted_string(aligned,'BMPString',Constraints,Extension,Val)
-
-
-encode_restricted_string(aligned,{Name,Val}) when atom(Name) ->
-    encode_restricted_string(aligned,Val);
-
-encode_restricted_string(aligned,Val) when list(Val)->
-    [encode_length(undefined,length(Val)),align,
-     {octets,Val}].
-
-encode_known_multiplier_string(aligned,StringType,C,_Ext,{Name,Val}) when atom(Name) ->
-    encode_known_multiplier_string(aligned,StringType,C,false,Val);
-
-encode_known_multiplier_string(aligned,StringType,C,_Ext,Val) ->
-    Result = chars_encode(C,StringType,Val),
-    NumBits = get_NumBits(C,StringType),
-    case get_constraint(C,'SizeConstraint') of
-	Ub when integer(Ub), Ub*NumBits =< 16  ->
-	    case {StringType,Result} of
-		{'BMPString',{octets,Ol}} ->
-		    [{bits,8,Oct}||Oct <- Ol];
-		_ ->
-		    Result
-	    end;
-	0 ->
-	    [];
-	Ub when integer(Ub),Ub =<65535 -> % fixed length
-	    [align,Result];
-	{Ub,Lb} ->
-	    [encode_length({Ub,Lb},length(Val)),align,Result];
-	Vl when list(Vl) ->
-	    [encode_length({lists:min(Vl),lists:max(Vl)},length(Val)),align,Result];
-	no  ->
-	    [encode_length(undefined,length(Val)),align,Result]
-    end.
-
-decode_restricted_string(Bytes,aligned) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    Bytes3 = align(Bytes2),
-    getoctets_as_list(Bytes3,Len).
-
-decode_known_multiplier_string(Bytes,aligned,StringType,C,_Ext) ->
-    NumBits = get_NumBits(C,StringType),
-    case get_constraint(C,'SizeConstraint') of
-	Ub when integer(Ub), Ub*NumBits =< 16  ->
-	    chars_decode(Bytes,NumBits,StringType,C,Ub);
-	Ub when integer(Ub),Ub =<65535 -> % fixed length
-	    Bytes1 = align(Bytes),
-	    chars_decode(Bytes1,NumBits,StringType,C,Ub);
-	0 ->
-	    {[],Bytes};
-	Vl when list(Vl) ->
-	    {Len,Bytes1} = decode_length(Bytes,{hd(Vl),lists:max(Vl)}),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len);
-	no  ->
-	    {Len,Bytes1} = decode_length(Bytes,undefined),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len);
-	{Lb,Ub}->
-	    {Len,Bytes1} = decode_length(Bytes,{Lb,Ub}),
-	    Bytes2 = align(Bytes1),
-	    chars_decode(Bytes2,NumBits,StringType,C,Len)
-    end.
-
-
-encode_NumericString(C,Val) ->
-    encode_known_multiplier_string(aligned,'NumericString',C,false,Val).
-decode_NumericString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'NumericString',C,false).
-
-encode_PrintableString(C,Val) ->
-    encode_known_multiplier_string(aligned,'PrintableString',C,false,Val).
-decode_PrintableString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'PrintableString',C,false).
-
-encode_VisibleString(C,Val) -> % equivalent with ISO646String
-    encode_known_multiplier_string(aligned,'VisibleString',C,false,Val).
-decode_VisibleString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'VisibleString',C,false).
-
-encode_IA5String(C,Val) ->
-    encode_known_multiplier_string(aligned,'IA5String',C,false,Val).
-decode_IA5String(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'IA5String',C,false).
-
-encode_BMPString(C,Val) ->
-    encode_known_multiplier_string(aligned,'BMPString',C,false,Val).
-decode_BMPString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'BMPString',C,false).
-
-encode_UniversalString(C,Val) ->
-    encode_known_multiplier_string(aligned,'UniversalString',C,false,Val).
-decode_UniversalString(Bytes,C) ->
-    decode_known_multiplier_string(Bytes,aligned,'UniversalString',C,false).
-
-%% end of known-multiplier strings for which PER visible constraints are
-%% applied
-
-encode_GeneralString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_GeneralString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_GraphicString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_GraphicString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_ObjectDescriptor(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_ObjectDescriptor(Bytes) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_TeletexString(_C,Val) -> % equivalent with T61String
-    encode_restricted_string(aligned,Val).
-decode_TeletexString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-encode_VideotexString(_C,Val) ->
-    encode_restricted_string(aligned,Val).
-decode_VideotexString(Bytes,_C) ->
-    decode_restricted_string(Bytes,aligned).
-
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% getBMPChars(Bytes,Len) ->{BMPcharList,RemainingBytes}
-%%
-getBMPChars(Bytes,1) ->
-    {O1,Bytes2} = getbits(Bytes,8),
-    {O2,Bytes3} = getbits(Bytes2,8),
-    if 
-	O1 == 0 ->
-	    {[O2],Bytes3};
-	true ->
-	    {[{0,0,O1,O2}],Bytes3}
-    end;
-getBMPChars(Bytes,Len) ->
-    getBMPChars(Bytes,Len,[]).
-
-getBMPChars(Bytes,0,Acc) ->
-    {lists:reverse(Acc),Bytes};
-getBMPChars(Bytes,Len,Acc) ->
-    {Octs,Bytes1} = getoctets_as_list(Bytes,2),
-    case Octs of
-	[0,O2] ->
-	    getBMPChars(Bytes1,Len-1,[O2|Acc]);
-	[O1,O2]->
-	    getBMPChars(Bytes1,Len-1,[{0,0,O1,O2}|Acc])
-    end.
-
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% chars_encode(C,StringType,Value) -> ValueList
-%%
-%% encodes chars according to the per rules taking the constraint PermittedAlphabet 
-%% into account.
-%% This function does only encode the value part and NOT the length
-
-chars_encode(C,StringType,Value) ->
-    case {StringType,get_constraint(C,'PermittedAlphabet')} of
-	{'UniversalString',{_,_Sv}} ->
-	    exit({error,{asn1,{'not implemented',"UniversalString with PermittedAlphabet constraint"}}});
-	{'BMPString',{_,_Sv}} ->
-	    exit({error,{asn1,{'not implemented',"BMPString with PermittedAlphabet constraint"}}});
-	_ ->
-	    {NumBits,CharOutTab} = {get_NumBits(C,StringType),get_CharOutTab(C,StringType)}, 
-	    chars_encode2(Value,NumBits,CharOutTab)
-    end.
-
-chars_encode2([H|T],NumBits,{Min,Max,notab}) when  H =< Max, H >= Min ->
-    [{bits,NumBits,H-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([H|T],NumBits,{Min,Max,Tab}) when H =< Max, H >= Min ->
-    [{bits,NumBits,element(H-Min+1,Tab)}|chars_encode2(T,NumBits,{Min,Max,Tab})];
-chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,notab}) -> 
-    %% no value range check here (ought to be, but very expensive)
-%    [{bits,NumBits,(A*B*C*D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-    [{bits,NumBits,((((((A bsl 8) + B) bsl 8) + C) bsl 8) + D)-Min}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([{A,B,C,D}|T],NumBits,{Min,Max,Tab}) -> 
-    %% no value range check here (ought to be, but very expensive)
-%    [{bits,NumBits,element((A*B*C*D)-Min,Tab)}|chars_encode2(T,NumBits,{Min,Max,notab})];
-    [{bits,NumBits,element(((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min,Tab)}|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([H|_T],_,{_,_,_}) ->
-    exit({error,{asn1,{illegal_char_value,H}}});
-chars_encode2([],_,_) ->
-    [].
-
-
-get_NumBits(C,StringType) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} ->
-	    charbits(length(Sv),aligned);
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    charbits(128,aligned); % 16#00..16#7F
-		'VisibleString' ->
-		    charbits(95,aligned); % 16#20..16#7E
-		'PrintableString' ->
-		    charbits(74,aligned); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-		'NumericString' ->
-		    charbits(11,aligned); % $ ,"0123456789"
-		'UniversalString' ->
-		    32;
-		'BMPString' ->
-		    16
-	    end
-    end.
-
-%%Maybe used later
-%%get_MaxChar(C,StringType) ->
-%%    case get_constraint(C,'PermittedAlphabet') of
-%%	{'SingleValue',Sv} ->
-%%	    lists:nth(length(Sv),Sv);
-%%	no ->
-%%	    case StringType of
-%%		'IA5String' ->
-%%		    16#7F; % 16#00..16#7F
-%%		'VisibleString' ->
-%%		    16#7E; % 16#20..16#7E
-%%		'PrintableString' ->
-%%		    $z; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-%%		'NumericString' ->
-%%		    $9; % $ ,"0123456789"
-%%		'UniversalString' ->
-%%		    16#ffffffff;
-%%		'BMPString' ->
-%%		    16#ffff
-%%	    end
-%%    end.
-
-%%Maybe used later
-%%get_MinChar(C,StringType) ->
-%%    case get_constraint(C,'PermittedAlphabet') of
-%%	{'SingleValue',Sv} ->
-%%	    hd(Sv);
-%%	no ->
-%%	    case StringType of
-%%		'IA5String' ->
-%%		    16#00; % 16#00..16#7F
-%%		'VisibleString' ->
-%%		    16#20; % 16#20..16#7E
-%%		'PrintableString' ->
-%%		    $\s; % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-%%		'NumericString' ->
-%%		    $\s; % $ ,"0123456789"
-%%		'UniversalString' ->
-%%		    16#00;
-%%		'BMPString' ->
-%%		    16#00
-%%	    end
-%%    end.
-
-get_CharOutTab(C,StringType) ->
-    get_CharTab(C,StringType,out).
-
-get_CharInTab(C,StringType) ->
-    get_CharTab(C,StringType,in).
-
-get_CharTab(C,StringType,InOut) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} ->
-	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv,InOut);
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    {0,16#7F,notab};
-		'VisibleString' ->
-		    get_CharTab2(C,StringType,16#20,16#7F,notab,InOut);
-		'PrintableString' ->
-		    Chars = lists:sort(
-			" '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
-		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars,InOut);
-		'NumericString' ->
-		    get_CharTab2(C,StringType,16#20,$9," 0123456789",InOut);
-		'UniversalString' ->
-		    {0,16#FFFFFFFF,notab};
-		'BMPString' ->
-		    {0,16#FFFF,notab}
-	    end
-    end.
-
-get_CharTab2(C,StringType,Min,Max,Chars,InOut) ->
-    BitValMax = (1 bsl get_NumBits(C,StringType))-1,
-    if
-	Max =< BitValMax ->
-	    {0,Max,notab};
-	true ->
-	    case InOut of
-		out ->
-		    {Min,Max,create_char_tab(Min,Chars)};
-		in  ->
-		    {Min,Max,list_to_tuple(Chars)}
-	    end
-    end.
-
-create_char_tab(Min,L) ->
-    list_to_tuple(create_char_tab(Min,L,0)).
-create_char_tab(Min,[Min|T],V) ->
-    [V|create_char_tab(Min+1,T,V+1)];
-create_char_tab(_Min,[],_V) ->
-    [];
-create_char_tab(Min,L,V) ->
-    [false|create_char_tab(Min+1,L,V)].
-
-%% This very inefficient and should be moved to compiletime
-charbits(NumOfChars,aligned) ->
-    case charbits(NumOfChars) of
-	1 -> 1;
-	2 -> 2;
-	B when B > 2, B =< 4 -> 4;
-	B when B > 4, B =< 8 -> 8;
-	B when B > 8, B =< 16 -> 16; 
-	B when B > 16, B =< 32 -> 32
-    end.
-	    
-charbits(NumOfChars) when NumOfChars =< 2 -> 1;
-charbits(NumOfChars) when NumOfChars =< 4 -> 2;
-charbits(NumOfChars) when NumOfChars =< 8 -> 3;
-charbits(NumOfChars) when NumOfChars =< 16 -> 4;
-charbits(NumOfChars) when NumOfChars =< 32 -> 5;
-charbits(NumOfChars) when NumOfChars =< 64 -> 6;
-charbits(NumOfChars) when NumOfChars =< 128 -> 7;
-charbits(NumOfChars) when NumOfChars =< 256 -> 8;
-charbits(NumOfChars) when NumOfChars =< 512 -> 9;
-charbits(NumOfChars) when NumOfChars =< 1024 -> 10;
-charbits(NumOfChars) when NumOfChars =< 2048 -> 11;
-charbits(NumOfChars) when NumOfChars =< 4096 -> 12;
-charbits(NumOfChars) when NumOfChars =< 8192 -> 13;
-charbits(NumOfChars) when NumOfChars =< 16384 -> 14;
-charbits(NumOfChars) when NumOfChars =< 32768 -> 15;
-charbits(NumOfChars) when NumOfChars =< 65536 -> 16;
-charbits(NumOfChars) when integer(NumOfChars) ->
-    16 + charbits1(NumOfChars bsr 16).
-
-charbits1(0) ->
-    0;
-charbits1(NumOfChars) ->
-    1 + charbits1(NumOfChars bsr 1).
-
-
-chars_decode(Bytes,_,'BMPString',C,Len) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	no ->
-	    getBMPChars(Bytes,Len);
-	_ ->
-	    exit({error,{asn1,
-			 {'not implemented',
-			  "BMPString with PermittedAlphabet constraint"}}})
-    end;
-chars_decode(Bytes,NumBits,StringType,C,Len) ->	
-    CharInTab = get_CharInTab(C,StringType),
-    chars_decode2(Bytes,CharInTab,NumBits,Len).
-
-
-chars_decode2(Bytes,CharInTab,NumBits,Len) ->
-    chars_decode2(Bytes,CharInTab,NumBits,Len,[]).
-
-chars_decode2(Bytes,_CharInTab,_NumBits,0,Acc) ->
-    {lists:reverse(Acc),Bytes};
-chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) when NumBits > 8 ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    Result = case minimum_octets(Char+Min) of
-	[NewChar] -> NewChar;
-	[C1,C2] -> {0,0,C1,C2};
-	[C1,C2,C3] -> {0,C1,C2,C3};
-	[C1,C2,C3,C4] -> {C1,C2,C3,C4}
-    end,
-    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Result|Acc]);
-chars_decode2(Bytes,{Min,Max,notab},NumBits,Len,Acc) ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    chars_decode2(Bytes2,{Min,Max,notab},NumBits,Len -1,[Char+Min|Acc]);
-
-%% BMPString and UniversalString with PermittedAlphabet is currently not supported
-chars_decode2(Bytes,{Min,Max,CharInTab},NumBits,Len,Acc) ->
-    {Char,Bytes2} = getbits(Bytes,NumBits),
-    chars_decode2(Bytes2,{Min,Max,CharInTab},NumBits,Len -1,[element(Char+1,CharInTab)|Acc]).
-
-		
-			% X.691:17 
-encode_null({Name,Val}) when atom(Name) ->
-    encode_null(Val);
-encode_null(_) -> []. % encodes to nothing
-
-decode_null(Bytes) ->
-    {'NULL',Bytes}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_object_identifier(Val) -> CompleteList
-%% encode_object_identifier({Name,Val}) -> CompleteList
-%% Val -> {Int1,Int2,...,IntN} % N >= 2
-%% Name -> atom()
-%% Int1 -> integer(0..2)
-%% Int2 -> integer(0..39) when Int1 (0..1) else integer()
-%% Int3-N -> integer()
-%% CompleteList -> [{bits,8,Val}|{octets,Ol}|align|...]
-%%
-encode_object_identifier({Name,Val}) when atom(Name) ->
-    encode_object_identifier(Val);
-encode_object_identifier(Val) ->
-    Octets = e_object_identifier(Val,notag),
-    [{debug,object_identifier},encode_length(undefined,length(Octets)),{octets,Octets}].
-
-%% This code is copied from asn1_encode.erl (BER) and corrected and modified 
-
-e_object_identifier({'OBJECT IDENTIFIER',V},DoTag) ->
-    e_object_identifier(V,DoTag);
-e_object_identifier({Cname,V},DoTag) when atom(Cname),tuple(V) ->
-    e_object_identifier(tuple_to_list(V),DoTag);
-e_object_identifier({Cname,V},DoTag) when atom(Cname),list(V) ->
-    e_object_identifier(V,DoTag);
-e_object_identifier(V,DoTag) when tuple(V) ->
-    e_object_identifier(tuple_to_list(V),DoTag);
-
-% E1 = 0|1|2 and (E2 < 40 when E1 = 0|1) 
-e_object_identifier([E1,E2|Tail],_DoTag) when E1 =< 2 ->
-    Head = 40*E1 + E2,  % weird
-    Res = e_object_elements([Head|Tail]),
-%    dotag(DoTag,[6],elength(length(Res)+1),[Head|Res]),
-    Res.
-
-e_object_elements([]) ->
-    [];
-e_object_elements([H|T]) ->
-    lists:append(e_object_element(H),e_object_elements(T)).
-
-e_object_element(Num) when Num < 128 ->
-    [Num];
-% must be changed to handle more than 2 octets
-e_object_element(Num) ->  %% when Num < ???
-    Left = ((Num band 2#11111110000000) bsr 7) bor 2#10000000,
-    Right = Num band 2#1111111 ,
-    [Left,Right].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode_object_identifier(Bytes) -> {ObjId,RemainingBytes}
-%% ObjId -> {integer(),integer(),...} % at least 2 integers
-%% RemainingBytes -> [integer()] when integer() (0..255)
-decode_object_identifier(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Octs,Bytes3} = getoctets_as_list(Bytes2,Len),
-    [First|Rest] = dec_subidentifiers(Octs,0,[]),
-    Idlist = if
-	First < 40 ->
-	    [0,First|Rest];
-	First < 80 ->
-	    [1,First - 40|Rest];
-	true ->
-	    [2,First - 80|Rest]
-    end,
-    {list_to_tuple(Idlist),Bytes3}.
-
-dec_subidentifiers([H|T],Av,Al) when H >=16#80 ->
-    dec_subidentifiers(T,(Av bsl 7) + (H band 16#7F),Al);
-dec_subidentifiers([H|T],Av,Al) ->
-    dec_subidentifiers(T,0,[(Av bsl 7) + H |Al]);
-dec_subidentifiers([],_Av,Al) ->
-    lists:reverse(Al).
-
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	     no;
-	{value,{_,V}} -> 
-	    V
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% complete(InList) -> ByteList
-%% Takes a coded list with bits and bytes and converts it to a list of bytes
-%% Should be applied as the last step at encode of a complete ASN.1 type
-%%
-complete(InList) when list(InList) ->
-    complete(InList,[],0);
-complete(InList) ->
-    complete([InList],[],0).
-
-complete([{debug,_}|T], Acc, Acclen) ->
-    complete(T,Acc,Acclen);
-complete([H|T],Acc,Acclen) when list(H) ->
-    complete(lists:concat([H,T]),Acc,Acclen);
-
-
-complete([{octets,N,Val}|T],Acc,Acclen) when N =< 4 ,integer(Val) ->
-    Newval = case N of
-	1 -> 
-	    Val4 = Val band 16#FF,
-	    [Val4];
-	2 -> 
-	    Val3 = (Val bsr 8) band 16#FF,
-	    Val4 = Val band 16#FF,
-	    [Val3,Val4];
-	3 ->
-	    Val2 = (Val bsr 16) band 16#FF,
-	    Val3 = (Val bsr 8) band 16#FF,
-	    Val4 = Val band 16#FF,
-	    [Val2,Val3,Val4];
-	    4 ->
-	    Val1 = (Val bsr 24) band 16#FF,
-	    Val2 = (Val bsr 16) band 16#FF,
-	    Val3 = (Val bsr 8) band 16#FF,
-	    Val4 = Val band 16#FF,
-	    [Val1,Val2,Val3,Val4]
-    end,
-    complete([{octets,Newval}|T],Acc,Acclen);
-
-complete([{octets,Oct}|T],[],_Acclen) when list(Oct) ->
-    complete(T,lists:reverse(Oct),0);
-complete([{octets,Oct}|T],[Hacc|Tacc],Acclen) when list(Oct) ->
-    Rest = 8 - Acclen,
-    if 
-	Rest == 8 ->
-	    complete(T,lists:concat([lists:reverse(Oct),[Hacc|Tacc]]),0);
-	true ->
-	    complete(T,lists:concat([lists:reverse(Oct),[Hacc bsl Rest|Tacc]]),0)
-    end;
-	    
-complete([{bit,Val}|T], Acc, Acclen) ->
-    complete([{bits,1,Val}|T],Acc,Acclen);
-complete([{octet,Val}|T], Acc, Acclen) ->
-    complete([{octets,1,Val}|T],Acc,Acclen);
-
-complete([{bits,N,Val}|T], Acc, 0) when N =< 8 ->
-    complete(T,[Val|Acc],N);
-complete([{bits,N,Val}|T], [Hacc|Tacc], Acclen) when N =< 8 ->
-    Rest = 8 - Acclen,
-    if 
-	Rest >= N ->
-	    complete(T,[(Hacc bsl N) + Val|Tacc],(Acclen+N) rem 8);
-	true -> 
-	    Diff = N - Rest, 
-	    NewHacc = (Hacc bsl Rest) + (Val bsr Diff),
-	    Mask = element(Diff,{1,3,7,15,31,63,127,255}),
-	    complete(T,[(Val band Mask),NewHacc|Tacc],(Acclen+N) rem 8)
-    end;
-complete([{bits,N,Val}|T], Acc, Acclen) -> % N > 8
-    complete([{bits,N-8,Val bsr 8},{bits,8,Val band 255}|T],Acc,Acclen);
-
-complete([align|T],Acc,0) ->
-    complete(T,Acc,0);
-complete([align|T],[Hacc|Tacc],Acclen) ->
-    Rest = 8 - Acclen,
-    complete(T,[Hacc bsl Rest|Tacc],0);
-complete([{octets,_N,Val}|T],Acc,Acclen) when list(Val) -> % no security check here 
-    complete([{octets,Val}|T],Acc,Acclen);
-
-complete([],[],0) ->
-    [0]; % a complete encoding must always be at least 1 byte
-complete([],Acc,0) ->
-    lists:reverse(Acc);
-complete([],[Hacc|Tacc],Acclen) when Acclen > 0->
-    Rest = 8 - Acclen,
-    NewHacc = Hacc bsl Rest,
-    lists:reverse([NewHacc|Tacc]). 
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/notes_history.sgml b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/notes_history.sgml
deleted file mode 100644
index f63b3360eb..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/notes_history.sgml
+++ /dev/null
@@ -1,100 +0,0 @@
-<!doctype chapter PUBLIC "-//Stork//DTD chapter//EN">
-<!-- 
- ``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 via the world wide web 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.
- 
- The Initial Developer of the Original Code is Ericsson Utvecklings AB.
- Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
- AB. All Rights Reserved.''
- 
-     $Id: notes_history.sgml,v 1.1 2008/12/17 09:53:31 mikpe Exp $
--->
-<chapter>
-  <header>
-    <title>ASN1 Release Notes (Old)</title>
-    <prepared>Kenneth Lundin</prepared>
-    <responsible>Kenneth Lundin</responsible>
-    <docno></docno>
-    <approved>Kenneth Lundin</approved>
-    <checked>Kenneth Lundin</checked>
-    <date>98-02-02</date>
-    <rev>A</rev>
-    <file>notes_history.sgml</file>
-  </header>
-  
-  <p>This document describes the changes made to old versions of the <c>asn1</c> application.
-
-  <section>
-    <title>ASN1 0.8.1</title>
-    <p>This is the first release of the ASN1 application. This version is released
-      for beta-testing. Some functionality will be added until the 1.0 version is
-      released. A list of missing features and restrictions can be found in the
-      chapter below.
-    
-    <section>
-      <title>Missing features and other restrictions</title>
-      <list>
-	<item> 
-	  <p>The encoding rules BER and PER (aligned) is supported. <em>PER (unaligned) 
-	      IS NOT SUPPORTED</em>.
-	<item> 
-	  <p>NOT SUPPORTED types <c>ANY</c> and <c>ANY DEFINED BY</c> 
-	    (is not in the standard any more).
-	<item> 
-	  <p>NOT SUPPORTED types <c>EXTERNAL</c> and <c>EMBEDDED-PDV</c>. 
-	<item> 
-	  <p>NOT SUPPORTED type <c>REAL</c> (planned to  be implemented). 
-	<item> 
-	  <p>The code generation support for value definitions in the ASN.1 notation is very limited
-	    (planned to be enhanced).
-	<item>
-	  <p>The support for constraints is limited to:
-	  <list>
-	    <item><p>
-		SizeConstraint	SIZE(X)
-	    <item><p>
-		SingleValue	(1)
-	    <item><p>
-		ValueRange	(X..Y)
-	    <item><p>
-		PermittedAlpabet FROM (but not for BMPString and UniversalString when generating PER).
-	  </list>
-	  <p>Complex expressions in constraints is not supported (planned to be extended).
-	<item> 
-	  <p>The current version of the compiler has very limited error checking:
-	    <list>
-	    <item><p>Stops at first syntax error.
-	    <item><p>Does not stop when a reference to an undefined type is found , 
-		but prints an error message. Compilation of the generated 
-		Erlang module will then fail.
-	    <item><p>A whole number of other semantical controls is currently missing. This
-		means that the compiler will give little or bad help to detect what's wrong
-		with an ASN.1 specification, but will mostly work very well when the
-		ASN.1 specification is correct.
-	  </list>
-	<item> 
-	  <p>The maximum INTEGER supported in this version is a signed 64 bit integer. This
-	    limitation is probably quite reasonable. (Planned to be extended).
-	<item> 
-	  <p>Only AUTOMATIC TAGS supported for PER.
-	<item> 
-	  <p>Only EXPLICIT and IMPLICIT TAGS supported for BER.
-	<item> 
-	  <p>The compiler supports decoding of BER-data with indefinite length but it is 
-	    not possible to produce data with indefinite length with the encoder. 
-      </list>
-    </section>
-	  
-  </section>
-</chapter>
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/notes_latest.sgml b/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/notes_latest.sgml
deleted file mode 100644
index 7accc797a6..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/asn1/notes_latest.sgml
+++ /dev/null
@@ -1,100 +0,0 @@
-<!doctype chapter PUBLIC "-//Stork//DTD chapter//EN">
-<!-- 
- ``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 via the world wide web 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.
- 
- The Initial Developer of the Original Code is Ericsson Utvecklings AB.
- Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
- AB. All Rights Reserved.''
- 
-     $Id: notes_latest.sgml,v 1.1 2008/12/17 09:53:31 mikpe Exp $
--->
-<chapter>
-  <header>
-    <title>ASN1 Release Notes</title>
-    <prepared>Kenneth Lundin</prepared>
-    <responsible>Kenneth Lundin</responsible>
-    <docno></docno>
-    <approved>Kenneth Lundin</approved>
-    <checked>Kenneth Lundin</checked>
-    <date>97-10-07</date>
-    <rev>A</rev>
-    <file>notes_latest.sgml</file>
-  </header>
-  
-  <p>This document describes the changes made to the asn1 application.
-
-  <section>
-    <title>ASN1 0.8.1</title>
-    <p>This is the first release of the ASN1 application. This version is released
-      for beta-testing. Some functionality will be added until the 1.0 version is
-      released. A list of missing features and restrictions can be found in the
-      chapter below.
-    
-    <section>
-      <title>Missing features and other restrictions</title>
-      <list>
-	<item> 
-	  <p>The encoding rules BER and PER (aligned) is supported. <em>PER (unaligned) 
-	      IS NOT SUPPORTED</em>.
-	<item> 
-	  <p>NOT SUPPORTED types <c>ANY</c> and <c>ANY DEFINED BY</c> 
-	    (is not in the standard any more).
-	<item> 
-	  <p>NOT SUPPORTED types <c>EXTERNAL</c> and <c>EMBEDDED-PDV</c>. 
-	<item> 
-	  <p>NOT SUPPORTED type <c>REAL</c> (planned to  be implemented). 
-	<item> 
-	  <p>The code generation support for value definitions in the ASN.1 notation is very limited
-	    (planned to be enhanced).
-	<item>
-	  <p>The support for constraints is limited to:
-	  <list>
-	    <item><p>
-		SizeConstraint	SIZE(X)
-	    <item><p>
-		SingleValue	(1)
-	    <item><p>
-		ValueRange	(X..Y)
-	    <item><p>
-		PermittedAlpabet FROM (but not for BMPString and UniversalString when generating PER).
-	  </list>
-	  <p>Complex expressions in constraints is not supported (planned to be extended).
-	<item> 
-	  <p>The current version of the compiler has very limited error checking:
-	    <list>
-	    <item><p>Stops at first syntax error.
-	    <item><p>Does not stop when a reference to an undefined type is found , 
-		but prints an error message. Compilation of the generated 
-		Erlang module will then fail.
-	    <item><p>A whole number of other semantical controls is currently missing. This
-		means that the compiler will give little or bad help to detect what's wrong
-		with an ASN.1 specification, but will mostly work very well when the
-		ASN.1 specification is correct.
-	  </list>
-	<item> 
-	  <p>The maximum INTEGER supported in this version is a signed 64 bit integer. This
-	    limitation is probably quite reasonable. (Planned to be extended).
-	<item> 
-	  <p>Only AUTOMATIC TAGS supported for PER.
-	<item> 
-	  <p>Only EXPLICIT and IMPLICIT TAGS supported for BER.
-	<item> 
-	  <p>The compiler supports decoding of BER-data with indefinite length but it is 
-	    not possible to produce data with indefinite length with the encoder. 
-      </list>
-    </section>
-	  
-  </section>
-</chapter>
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/Makefile b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/Makefile
deleted file mode 100644
index ab0d7c0a63..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/Makefile
+++ /dev/null
@@ -1,178 +0,0 @@
-# ``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 via the world wide web 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.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id: Makefile,v 1.1 2008/12/17 09:53:33 mikpe Exp $
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-
-VSN     = $(INETS_VSN)
-APP_VSN = "inets-$(VSN)"
-
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/inets-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-MODULES = \
-	ftp \
-	http \
-	http_lib \
-	httpc_handler \
-	httpc_manager \
-	uri \
-	httpd \
-	httpd_acceptor \
-	httpd_acceptor_sup \
-	httpd_conf \
-	httpd_example \
-	httpd_manager \
-	httpd_misc_sup \
-	httpd_parse \
-	httpd_request_handler \
-	httpd_response \
-	httpd_socket \
-	httpd_sup \
-	httpd_util \
-	httpd_verbosity \
-	inets_sup \
-	mod_actions \
-	mod_alias \
-	mod_auth \
-	mod_auth_plain \
-	mod_auth_dets \
-	mod_auth_mnesia \
-	mod_auth_server \
-	mod_browser \
-	mod_cgi \
-	mod_dir \
-	mod_disk_log \
-	mod_esi \
-	mod_get \
-	mod_head \
-	mod_htaccess \
-	mod_include \
-	mod_log \
-	mod_range \
-	mod_responsecontrol \
-	mod_trace \
-	mod_security \
-	mod_security_server
-
-HRL_FILES = httpd.hrl httpd_verbosity.hrl mod_auth.hrl \
-            http.hrl jnets_httpd.hrl
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
-
-APP_FILE= inets.app
-APPUP_FILE= inets.appup
-
-APP_SRC= $(APP_FILE).src
-APP_TARGET= $(EBIN)/$(APP_FILE)
-
-APPUP_SRC= $(APPUP_FILE).src
-APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
-
-# ----------------------------------------------------
-# INETS FLAGS
-# ----------------------------------------------------
-# DONT_USE_VERBOSITY = -Ddont_use_verbosity=true
-INETS_FLAGS = -D'SERVER_SOFTWARE="inets/$(VSN)"' \
-              -Ddefault_verbosity=silence \
-              $(DONT_USE_VERBOSITY)
-
-# INETS_DEBUG_DEFAULT = d
-ifeq ($(INETS_DEBUG),)
-  INETS_DEBUG = $(INETS_DEBUG_DEFAULT)
-endif
-
-ifeq ($(INETS_DEBUG),c)
-  INETS_FLAGS += -Dinets_cdebug -Dinets_debug -Dinets_log -Dinets_error
-endif
-ifeq ($(INETS_DEBUG),d)
-  INETS_FLAGS += -Dinets_debug -Dinets_log -Dinets_error
-endif
-ifeq ($(INETS_DEBUG),l)
-  INETS_FLAGS += -Dinets_log -Dinets_error
-endif
-ifeq ($(INETS_DEBUG),e)
-  INETS_FLAGS += -Dinets_error
-endif
-
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_FLAGS += 
-
-ifeq ($(WARN_UNUSED_WARS),true)
-ERL_COMPILE_FLAGS += +warn_unused_vars
-endif
-
-ERL_COMPILE_FLAGS += $(INETS_FLAGS) \
-                     +'{parse_transform,sys_pre_attributes}' \
-                     +'{attribute,insert,app_vsn,$(APP_VSN)}'
-
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-
-release_docs_spec:
-
-info:
-	@echo "INETS_DEBUG       = $(INETS_DEBUG)"
-	@echo "INETS_FLAGS       = $(INETS_FLAGS)"
-	@echo "ERL_COMPILE_FLAGS = $(ERL_COMPILE_FLAGS)"
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/ftp.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/ftp.erl
deleted file mode 100644
index be06ec654c..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/ftp.erl
+++ /dev/null
@@ -1,1582 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: ftp.erl,v 1.2 2009/03/03 01:55:01 kostis Exp $
-%%
--module(ftp).
-
--behaviour(gen_server).
-
-%% This module implements an ftp client based on socket(3)/gen_tcp(3),
-%% file(3) and filename(3).
-%%
-
-
--define(OPEN_TIMEOUT, 60*1000).
--define(BYTE_TIMEOUT, 1000).   % Timeout for _ONE_ byte to arrive. (ms)
--define(OPER_TIMEOUT, 300).    % Operation timeout (seconds)
--define(FTP_PORT, 21).
-
-%% Client interface
--export([cd/2, close/1, delete/2, formaterror/1, help/0, 
-	 lcd/2, lpwd/1, ls/1, ls/2, 
-	 mkdir/2, nlist/1, nlist/2, 
-	 open/1, open/2, open/3, 
-	 pwd/1, 
-	 recv/2, recv/3, recv_bin/2, 
-	 recv_chunk_start/2, recv_chunk/1, 
-	 rename/3, rmdir/2, 
-	 send/2, send/3, send_bin/3, 
-	 send_chunk_start/2, send_chunk/2, send_chunk_end/1, 
-	 type/2, user/3,user/4,account/2,
-	 append/3, append/2, append_bin/3,
-	 append_chunk/2, append_chunk_end/1, append_chunk_start/2]).
-
-%% Internal
--export([init/1, handle_call/3, handle_cast/2, 
-	 handle_info/2, terminate/2,code_change/3]).
-
-
-%%
-%% CLIENT FUNCTIONS
-%%
-
-%% open(Host)
-%% open(Host, Flags)
-%%
-%% Purpose:  Start an ftp client and connect to a host.
-%% Args:     Host = string(), 
-%%           Port = integer(), 
-%%           Flags = [Flag], 
-%%           Flag = verbose | debug
-%% Returns:  {ok, Pid} | {error, ehost}
-		
-%%Tho only option was the host in textual form
-open({option_list,Option_list})->
-    %% Dbg = {debug,[trace,log,statistics]},
-    %% Options = [Dbg],
-    Options = [],
-    {ok,Pid1}=case lists:keysearch(flags,1,Option_list) of
-		  {value,{flags,Flags}}->
-		      {ok, Pid} = gen_server:start_link(?MODULE, [Flags], Options);
-		  false ->
-		      {ok, Pid} = gen_server:start_link(?MODULE, [], Options)
-	      end,
-    gen_server:call(Pid1, {open, ip_comm,Option_list}, infinity);
-	 
-
-%%The only option was the tuple form of the ip-number
-open(Host)when tuple(Host) ->
-    open(Host, ?FTP_PORT, []);
-
-%%Host is the string form of the hostname 
-open(Host)->
-    open(Host,?FTP_PORT,[]).
-
-
-
-open(Host, Port) when integer(Port) ->
-    open(Host,Port,[]);
-
-open(Host, Flags) when list(Flags) ->
-    open(Host,?FTP_PORT, Flags).
-
-open(Host,Port,Flags) when integer(Port), list(Flags) ->
-    %% Dbg = {debug,[trace,log,statistics]},
-    %% Options = [Dbg],
-    Options = [],
-    {ok, Pid} = gen_server:start_link(?MODULE, [Flags], Options),
-    gen_server:call(Pid, {open, ip_comm, Host, Port}, infinity).
-
-%% user(Pid, User, Pass)
-%% Purpose:  Login.
-%% Args:     Pid = pid(), User = Pass = string()
-%% Returns:  ok | {error, euser} | {error, econn}
-user(Pid, User, Pass) ->
-  gen_server:call(Pid, {user, User, Pass}, infinity).
-
-%% user(Pid, User, Pass,Acc)
-%% Purpose:  Login whith a supplied account name
-%% Args:     Pid = pid(), User = Pass = Acc = string()
-%% Returns:  ok | {error, euser} | {error, econn} | {error, eacct}
-user(Pid, User, Pass,Acc) ->
-  gen_server:call(Pid, {user, User, Pass,Acc}, infinity).
-
-%% account(Pid,Acc)
-%% Purpose:  Set a user Account.
-%% Args:     Pid = pid(), Acc= string()
-%% Returns:  ok | {error, eacct}
-account(Pid,Acc) ->
-  gen_server:call(Pid, {account,Acc}, infinity).
-
-%% pwd(Pid)
-%%
-%% Purpose:  Get the current working directory at remote server.
-%% Args:     Pid = pid()
-%% Returns:  {ok, Dir} | {error, elogin} | {error, econn}
-pwd(Pid) ->
-  gen_server:call(Pid, pwd, infinity).
-
-%% lpwd(Pid)
-%%
-%% Purpose:  Get the current working directory at local server.
-%% Args:     Pid = pid()
-%% Returns:  {ok, Dir} | {error, elogin} 
-lpwd(Pid) ->
-  gen_server:call(Pid, lpwd, infinity).
-
-%% cd(Pid, Dir)
-%%
-%% Purpose:  Change current working directory at remote server.
-%% Args:     Pid = pid(), Dir = string()
-%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
-cd(Pid, Dir) ->
-  gen_server:call(Pid, {cd, Dir}, infinity).
-
-%% lcd(Pid, Dir)
-%%
-%% Purpose:  Change current working directory for the local client.
-%% Args:     Pid = pid(), Dir = string()
-%% Returns:  ok | {error, epath}
-lcd(Pid, Dir) ->
-  gen_server:call(Pid, {lcd, Dir}, infinity).
-
-%% ls(Pid)
-%% ls(Pid, Dir)
-%%
-%% Purpose:  List the contents of current directory (ls/1) or directory
-%%           Dir (ls/2) at remote server.
-%% Args:     Pid = pid(), Dir = string()
-%% Returns:  {ok, Listing} | {error, epath} | {error, elogin} | {error, econn}
-ls(Pid) ->
-  ls(Pid, "").
-ls(Pid, Dir) ->
-  gen_server:call(Pid, {dir, long, Dir}, infinity).
-
-%% nlist(Pid)
-%% nlist(Pid, Dir)
-%%
-%% Purpose:  List the contents of current directory (ls/1) or directory
-%%           Dir (ls/2) at remote server. The returned list is a stream
-%%           of file names.
-%% Args:     Pid = pid(), Dir = string()
-%% Returns:  {ok, Listing} | {error, epath} | {error, elogin} | {error, econn}
-nlist(Pid) ->
-  nlist(Pid, "").
-nlist(Pid, Dir) ->
-  gen_server:call(Pid, {dir, short, Dir}, infinity).
-
-%% rename(Pid, CurrFile, NewFile)
-%%
-%% Purpose:  Rename a file at remote server.
-%% Args:     Pid = pid(), CurrFile = NewFile = string()
-%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
-rename(Pid, CurrFile, NewFile) ->
-  gen_server:call(Pid, {rename, CurrFile, NewFile}, infinity).
-
-%% delete(Pid, File)
-%%
-%% Purpose:  Remove file at remote server.
-%% Args:     Pid = pid(), File = string()
-%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
-delete(Pid, File) ->
-  gen_server:call(Pid, {delete, File}, infinity).
-
-%% mkdir(Pid, Dir)
-%%
-%% Purpose:  Make directory at remote server.
-%% Args:     Pid = pid(), Dir = string()
-%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
-mkdir(Pid, Dir) ->
-  gen_server:call(Pid, {mkdir, Dir}, infinity).
-
-%% rmdir(Pid, Dir)
-%%
-%% Purpose:  Remove directory at remote server.
-%% Args:     Pid = pid(), Dir = string()
-%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
-rmdir(Pid, Dir) ->
-  gen_server:call(Pid, {rmdir, Dir}, infinity).
-
-%% type(Pid, Type)
-%%
-%% Purpose:  Set transfer type.
-%% Args:     Pid = pid(), Type = ascii | binary
-%% Returns:  ok | {error, etype} | {error, elogin} | {error, econn}
-type(Pid, Type) ->
-  gen_server:call(Pid, {type, Type}, infinity).
-
-%% recv(Pid, RFile [, LFile])
-%%
-%% Purpose:  Transfer file from remote server.
-%% Args:     Pid = pid(), RFile = LFile = string()
-%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
-recv(Pid, RFile) ->
-  recv(Pid, RFile, "").
-
-recv(Pid, RFile, LFile) ->
-  gen_server:call(Pid, {recv, RFile, LFile}, infinity).
-
-%% recv_bin(Pid, RFile)
-%%
-%% Purpose:  Transfer file from remote server into binary.
-%% Args:     Pid = pid(), RFile = string()
-%% Returns:  {ok, Bin} | {error, epath} | {error, elogin} | {error, econn}
-recv_bin(Pid, RFile) ->
-  gen_server:call(Pid, {recv_bin, RFile}, infinity).
-
-%% recv_chunk_start(Pid, RFile)
-%%
-%% Purpose:  Start receive of chunks of remote file.
-%% Args:     Pid = pid(), RFile = string().
-%% Returns:  ok | {error, elogin} | {error, epath} | {error, econn}
-recv_chunk_start(Pid, RFile) ->
-  gen_server:call(Pid, {recv_chunk_start, RFile}, infinity).
-
-
-%% recv_chunk(Pid, RFile)
-%%
-%% Purpose:  Transfer file from remote server into binary in chunks
-%% Args:     Pid = pid(), RFile = string()
-%% Returns:  Reference
-recv_chunk(Pid) ->
-    gen_server:call(Pid, recv_chunk, infinity).
-
-%% send(Pid, LFile [, RFile])
-%%
-%% Purpose:  Transfer file to remote server.
-%% Args:     Pid = pid(), LFile = RFile = string()
-%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
-send(Pid, LFile) ->
-  send(Pid, LFile, "").
-
-send(Pid, LFile, RFile) ->
-  gen_server:call(Pid, {send, LFile, RFile}, infinity).
-
-%% send_bin(Pid, Bin, RFile)
-%%
-%% Purpose:  Transfer a binary to a remote file.
-%% Args:     Pid = pid(), Bin = binary(), RFile = string()
-%% Returns:  ok | {error, epath} | {error, elogin} | {error, enotbinary} 
-%%           | {error, econn}
-send_bin(Pid, Bin, RFile) when binary(Bin) ->
-  gen_server:call(Pid, {send_bin, Bin, RFile}, infinity);
-send_bin(Pid, Bin, RFile) ->
-  {error, enotbinary}.
-
-%% send_chunk_start(Pid, RFile)
-%%
-%% Purpose:  Start transfer of chunks to remote file.
-%% Args:     Pid = pid(), RFile = string().
-%% Returns:  ok | {error, elogin} | {error, epath} | {error, econn}
-send_chunk_start(Pid, RFile) ->
-  gen_server:call(Pid, {send_chunk_start, RFile}, infinity).
-
-
-%% append_chunk_start(Pid, RFile)
-%%
-%% Purpose:  Start append chunks of data to remote file.
-%% Args:     Pid = pid(), RFile = string().
-%% Returns:  ok | {error, elogin} | {error, epath} | {error, econn}
-append_chunk_start(Pid, RFile) ->
-  gen_server:call(Pid, {append_chunk_start, RFile}, infinity).
-
-
-%% send_chunk(Pid, Bin)
-%%
-%% Purpose:  Send chunk to remote file.
-%% Args:     Pid = pid(), Bin = binary().
-%% Returns:  ok | {error, elogin} | {error, enotbinary} | {error, echunk}
-%%           | {error, econn}
-send_chunk(Pid, Bin) when binary(Bin) ->
-  gen_server:call(Pid, {send_chunk, Bin}, infinity);
-send_chunk(Pid, Bin) ->
-  {error, enotbinary}.
-
-%%append_chunk(Pid, Bin)
-%%
-%% Purpose:  Append chunk to remote file.
-%% Args:     Pid = pid(), Bin = binary().
-%% Returns:  ok | {error, elogin} | {error, enotbinary} | {error, echunk}
-%%           | {error, econn}
-append_chunk(Pid, Bin) when binary(Bin) ->
-  gen_server:call(Pid, {append_chunk, Bin}, infinity);
-append_chunk(Pid, Bin) ->
-  {error, enotbinary}.
-
-%% send_chunk_end(Pid)
-%%
-%% Purpose:  End sending of chunks to remote file.
-%% Args:     Pid = pid().
-%% Returns:  ok | {error, elogin} | {error, echunk} | {error, econn}
-send_chunk_end(Pid) ->
-  gen_server:call(Pid, send_chunk_end, infinity).
-
-%% append_chunk_end(Pid)
-%%
-%% Purpose:  End appending of chunks to remote file.
-%% Args:     Pid = pid().
-%% Returns:  ok | {error, elogin} | {error, echunk} | {error, econn}
-append_chunk_end(Pid) ->
-  gen_server:call(Pid, append_chunk_end, infinity).
-
-%% append(Pid, LFile,RFile)
-%%
-%% Purpose:  Append the local file to the remote file
-%% Args:     Pid = pid(), LFile = RFile = string()
-%% Returns:  ok | {error, epath} | {error, elogin} | {error, econn}
-append(Pid, LFile) ->
-    append(Pid, LFile, "").
-
-append(Pid, LFile, RFile) ->
-  gen_server:call(Pid, {append, LFile, RFile}, infinity).
-
-%% append_bin(Pid, Bin, RFile)
-%%
-%% Purpose:  Append a binary to a remote file.
-%% Args:     Pid = pid(), Bin = binary(), RFile = string()
-%% Returns:  ok | {error, epath} | {error, elogin} | {error, enotbinary} 
-%%           | {error, econn}
-append_bin(Pid, Bin, RFile) when binary(Bin) ->
-  gen_server:call(Pid, {append_bin, Bin, RFile}, infinity);
-append_bin(Pid, Bin, RFile) ->
-  {error, enotbinary}.
-
-
-%% close(Pid)
-%%
-%% Purpose:  End the ftp session.
-%% Args:     Pid = pid()
-%% Returns:  ok
-close(Pid) ->
-  case (catch gen_server:call(Pid, close, 30000)) of
-      ok -> 
-	  ok;
-      {'EXIT',{noproc,_}} ->
-	  %% Already gone...
-	  ok;
-      Res ->
-	  Res
-  end.
-
-%% formaterror(Tag) 
-%%
-%% Purpose:  Return diagnostics.
-%% Args:     Tag = atom() | {error, atom()}
-%% Returns:  string().
-formaterror(Tag) ->
-  errstr(Tag).
-
-%% help()
-%%
-%% Purpose:  Print list of valid commands.
-%%
-%% Undocumented.
-%%
-help() ->
-  io:format("\n  Commands:\n"
-	    "  ---------\n" 
-	    "  cd(Pid, Dir)\n"
-	    "  close(Pid)\n"
-	    "  delete(Pid, File)\n"
-	    "  formaterror(Tag)\n"
-	    "  help()\n"
-	    "  lcd(Pid, Dir)\n"
-	    "  lpwd(Pid)\n"
-	    "  ls(Pid [, Dir])\n"
-	    "  mkdir(Pid, Dir)\n"
-	    "  nlist(Pid [, Dir])\n"
-	    "  open(Host [Port, Flags])\n"
-	    "  pwd(Pid)\n"
-	    "  recv(Pid, RFile [, LFile])\n"
-	    "  recv_bin(Pid, RFile)\n"
-	    "  recv_chunk_start(Pid, RFile)\n"
-	    "  recv_chunk(Pid)\n"
-	    "  rename(Pid, CurrFile, NewFile)\n"
-	    "  rmdir(Pid, Dir)\n"
-	    "  send(Pid, LFile [, RFile])\n"
-	    "  send_chunk(Pid, Bin)\n"
-	    "  send_chunk_start(Pid, RFile)\n"
-	    "  send_chunk_end(Pid)\n"
-	    "  send_bin(Pid, Bin, RFile)\n"
-	    "  append(Pid, LFile [, RFile])\n"
-	    "  append_chunk(Pid, Bin)\n"
-	    "  append_chunk_start(Pid, RFile)\n"
-	    "  append_chunk_end(Pid)\n"
-	    "  append_bin(Pid, Bin, RFile)\n"
-	    "  type(Pid, Type)\n"
-	    "  account(Pid,Account)\n"
-	    "  user(Pid, User, Pass)\n"
-	    "  user(Pid, User, Pass,Account)\n").
-
-%%
-%% INIT
-%%
-
--record(state, {csock = undefined, dsock = undefined, flags = undefined, 
-		ldir = undefined, type = undefined, chunk = false,
-		pending = undefined}).
-
-init([Flags]) ->
-    sock_start(),				
-    put(debug,get_debug(Flags)),
-    put(verbose,get_verbose(Flags)),
-    process_flag(priority, low),
-    {ok, LDir} = file:get_cwd(),
-    {ok, #state{flags = Flags, ldir = LDir}}.
-
-%%
-%% HANDLERS
-%%
-
-%% First group of reply code digits
--define(POS_PREL, 1).
--define(POS_COMPL, 2).
--define(POS_INTERM, 3).
--define(TRANS_NEG_COMPL, 4).
--define(PERM_NEG_COMPL, 5).
-
-%% Second group of reply code digits
--define(SYNTAX,0).
--define(INFORMATION,1).
--define(CONNECTION,2).
--define(AUTH_ACC,3).
--define(UNSPEC,4).
--define(FILE_SYSTEM,5).
-
-
--define(STOP_RET(E),{stop, normal, {error, E}, 
-		     State#state{csock = undefined}}).
-
-
-rescode(?POS_PREL,_,_)                   -> pos_prel; %%Positive Preleminary Reply
-rescode(?POS_COMPL,_,_)                  -> pos_compl; %%Positive Completion Reply
-rescode(?POS_INTERM,?AUTH_ACC,2)         -> pos_interm_acct; %%Positive Intermediate Reply nedd account
-rescode(?POS_INTERM,_,_)                 -> pos_interm; %%Positive Intermediate Reply
-rescode(?TRANS_NEG_COMPL,?FILE_SYSTEM,2) -> trans_no_space; %%No storage area no action taken
-rescode(?TRANS_NEG_COMPL,_,_)            -> trans_neg_compl;%%Temporary Error, no action taken
-rescode(?PERM_NEG_COMPL,?FILE_SYSTEM,2)  -> perm_no_space; %%Permanent disk space error, the user shall not try again
-rescode(?PERM_NEG_COMPL,?FILE_SYSTEM,3)  -> perm_fname_not_allowed; 
-rescode(?PERM_NEG_COMPL,_,_)             -> perm_neg_compl.
-
-retcode(trans_no_space,_)         -> etnospc;
-retcode(perm_no_space,_)          -> epnospc;
-retcode(perm_fname_not_allowed,_) -> efnamena;
-retcode(_,Otherwise)              -> Otherwise.
-
-handle_call({open,ip_comm,Conn_data},From,State) ->
-    case lists:keysearch(host,1,Conn_data) of
-	{value,{host,Host}}->
-	    Port=get_key1(port,Conn_data,?FTP_PORT),
-	    Timeout=get_key1(timeout,Conn_data,?OPEN_TIMEOUT),
-	    open(Host,Port,Timeout,State);
-	false ->
-	    ehost
-    end;
-	
-handle_call({open,ip_comm,Host,Port},From,State) ->
-    open(Host,Port,?OPEN_TIMEOUT,State); 
-
-handle_call({user, User, Pass}, _From, State) ->
-    #state{csock = CSock} = State,
-    case ctrl_cmd(CSock, "USER ~s", [User]) of
-	pos_interm ->
-	    case ctrl_cmd(CSock, "PASS ~s", [Pass]) of
-		pos_compl ->
-		    set_type(binary, CSock),
-		    {reply, ok, State#state{type = binary}};
-		{error,enotconn} ->
-		    ?STOP_RET(econn);
-		_ ->
-		    {reply, {error, euser}, State}
-	    end;
-	pos_compl ->
-	    set_type(binary, CSock),
-	    {reply, ok, State#state{type = binary}};
-	{error, enotconn} ->
-	    ?STOP_RET(econn);
- 	_ ->
-	    {reply, {error, euser}, State}
-    end;
-    
-handle_call({user, User, Pass,Acc}, _From, State) ->
-    #state{csock = CSock} = State,
-    case ctrl_cmd(CSock, "USER ~s", [User]) of
-	pos_interm ->
-	    case ctrl_cmd(CSock, "PASS ~s", [Pass]) of
-		pos_compl ->
-		    set_type(binary, CSock),
-		    {reply, ok, State#state{type = binary}};
-		pos_interm_acct->
-		    case ctrl_cmd(CSock,"ACCT ~s",[Acc]) of
-			pos_compl->
-			    set_type(binary, CSock),
-			    {reply, ok, State#state{type = binary}};
-			{error,enotconn}->
-			    ?STOP_RET(econn);
-			_ ->
-			    {reply, {error, eacct}, State}
-		    end;
-		{error,enotconn} ->
-		    ?STOP_RET(econn);
-		_ ->
-		    {reply, {error, euser}, State}
-	    end;
-	pos_compl ->
-	    set_type(binary, CSock),
-	    {reply, ok, State#state{type = binary}};
-	{error, enotconn} ->
-	    ?STOP_RET(econn);
-	_ ->
-	    {reply, {error, euser}, State}
-    end;
-
-%%set_account(Acc,State)->Reply
-%%Reply={reply, {error, euser}, State} | {error,enotconn}->
-handle_call({account,Acc},_From,State)->
-    #state{csock = CSock} = State,
-    case ctrl_cmd(CSock,"ACCT ~s",[Acc]) of
-	pos_compl->
-	    {reply, ok,State};
-	{error,enotconn}->
-	    ?STOP_RET(econn);
-	Error ->
-	    debug(" error: ~p",[Error]),
-	    {reply, {error, eacct}, State}
-    end;
-
-handle_call(pwd, _From, State) when State#state.chunk == false ->
-  #state{csock = CSock} = State,
-  %%
-  %% NOTE: The directory string comes over the control connection.
-  case sock_write(CSock, mk_cmd("PWD", [])) of
-    ok ->
-      {_, Line} = result_line(CSock),
-      {_, Cs} = split($", Line),			% XXX Ugly
-      {Dir0, _} = split($", Cs),
-      Dir = lists:delete($", Dir0),
-      {reply, {ok, Dir}, State};
-    {error, enotconn} ->
-      ?STOP_RET(econn)
-  end;
-
-handle_call(lpwd, _From, State) ->
-  #state{csock = CSock, ldir = LDir} = State,
-  {reply, {ok, LDir}, State};
-
-handle_call({cd, Dir}, _From, State) when State#state.chunk == false ->
-  #state{csock = CSock} = State,
-  case ctrl_cmd(CSock, "CWD ~s", [Dir]) of
-    pos_compl ->
-      {reply, ok, State};
-    {error, enotconn} ->
-      ?STOP_RET(econn);
-    _ ->
-      {reply, {error, epath}, State}
-  end;
-
-handle_call({lcd, Dir}, _From, State) ->
-  #state{csock = CSock, ldir = LDir0} = State,
-  LDir = absname(LDir0, Dir),
-  case file:read_file_info(LDir) of
-    {ok, _ } ->
-      {reply, ok, State#state{ldir = LDir}};
-    _  ->
-      {reply, {error, epath}, State}
-  end;
-
-handle_call({dir, Len, Dir}, _From, State) when State#state.chunk == false ->
-    debug("  dir : ~p: ~s~n",[Len,Dir]),
-    #state{csock = CSock, type = Type} = State,
-    set_type(ascii, Type, CSock),
-    LSock = listen_data(CSock, raw),
-    Cmd = case Len of
-	      short -> "NLST";
-	      long -> "LIST"
-	  end,
-    Result = case Dir of 
-		 "" ->
-		     ctrl_cmd(CSock, Cmd, "");
-		 _ ->
-		     ctrl_cmd(CSock, Cmd ++ " ~s", [Dir])
-	     end,
-    debug(" ctrl : command result: ~p~n",[Result]),
-    case Result of
-	pos_prel ->
-	    debug("  dbg : await the data connection", []),
-	    DSock = accept_data(LSock),
-	    debug("  dbg : await the data", []),
-	    Reply0 = 
-		case recv_data(DSock) of
-		    {ok, DirData} ->
-			debug(" data : DirData: ~p~n",[DirData]),
-			case result(CSock) of
-			    pos_compl ->
-				{ok, DirData};
-			    _ ->
-				{error, epath}
-			end;
-		    {error, Reason} ->
-			sock_close(DSock),
-			verbose(" data : error: ~p, ~p~n",[Reason, result(CSock)]),
-			{error, epath}
-		end,
-	    
-	    debug(" ctrl : reply: ~p~n",[Reply0]),
-	    reset_type(ascii, Type, CSock),
-	    {reply, Reply0, State};
-	{closed, _Why} ->
-	    ?STOP_RET(econn);
-	_ ->
-	    sock_close(LSock),
-	    {reply, {error, epath}, State}
-    end;
-
-
-handle_call({rename, CurrFile, NewFile}, _From, State) when State#state.chunk == false ->
-  #state{csock = CSock} = State,
-  case ctrl_cmd(CSock, "RNFR ~s", [CurrFile]) of
-    pos_interm ->
-      case ctrl_cmd(CSock, "RNTO ~s", [NewFile]) of
-	pos_compl ->
-	  {reply, ok, State};
-	_ ->
-	  {reply, {error, epath}, State}
-      end;
-    {error, enotconn} ->
-      ?STOP_RET(econn);
-    _ ->
-      {reply, {error, epath}, State}
-  end;
-
-handle_call({delete, File}, _From, State) when State#state.chunk == false ->
-  #state{csock = CSock} = State,
-  case ctrl_cmd(CSock, "DELE ~s", [File]) of
-    pos_compl ->
-      {reply, ok, State};
-    {error, enotconn} ->
-      ?STOP_RET(econn);
-    _ ->
-      {reply, {error, epath}, State}
-  end;
-
-handle_call({mkdir, Dir}, _From, State) when State#state.chunk == false ->
-  #state{csock = CSock} = State,
-  case ctrl_cmd(CSock, "MKD ~s", [Dir]) of
-    pos_compl ->
-      {reply, ok, State};
-    {error, enotconn} ->
-      ?STOP_RET(econn);
-    _ ->
-      {reply, {error, epath}, State}
-  end;
-
-handle_call({rmdir, Dir}, _From, State) when State#state.chunk == false ->
-  #state{csock = CSock} = State,
-  case ctrl_cmd(CSock, "RMD ~s", [Dir]) of
-    pos_compl ->
-      {reply, ok, State};
-    {error, enotconn} ->
-      ?STOP_RET(econn);
-    _ ->
-      {reply, {error, epath}, State}
-  end;
-
-handle_call({type, Type}, _From, State) when State#state.chunk == false ->
-  #state{csock = CSock} = State,
-  case Type of
-    ascii ->
-      set_type(ascii, CSock),
-      {reply, ok, State#state{type = ascii}};
-    binary ->
-      set_type(binary, CSock),
-      {reply, ok, State#state{type = binary}};
-    _ ->
-      {reply, {error, etype}, State}
-  end;
-
-handle_call({recv, RFile, LFile}, _From, State) when State#state.chunk == false ->
-  #state{csock = CSock, ldir = LDir} = State,
-  ALFile = case LFile of
-	     "" ->
-	       absname(LDir, RFile);
-	     _ ->
-	       absname(LDir, LFile)
-	   end,
-  case file_open(ALFile, write) of
-    {ok, Fd} ->
-      LSock = listen_data(CSock, binary),
-      Ret = case ctrl_cmd(CSock, "RETR ~s", [RFile]) of
-	      pos_prel ->
-		DSock = accept_data(LSock),
-		recv_file(DSock, Fd),
-		Reply0 = case result(CSock) of
-			   pos_compl ->
-			     ok;
-			   _ ->
-			     {error, epath}
-			 end,
-		sock_close(DSock),
-		{reply, Reply0, State};
-	      {error, enotconn} ->
-		?STOP_RET(econn);
-	      _ ->
-		{reply, {error, epath}, State}
-	    end,
-      file_close(Fd),
-      Ret;
-    {error, _What} ->
-      {reply, {error, epath}, State}
-  end;
-
-handle_call({recv_bin, RFile}, _From, State) when State#state.chunk == false ->
-    #state{csock = CSock, ldir = LDir} = State,
-    LSock = listen_data(CSock, binary),
-    case ctrl_cmd(CSock, "RETR ~s", [RFile]) of
-	pos_prel ->
-	    DSock = accept_data(LSock),
-	    Reply = recv_binary(DSock,CSock),
-	    sock_close(DSock),
-	    {reply, Reply, State};
-	{error, enotconn} ->
-	    ?STOP_RET(econn);
-	_ ->
-	    {reply, {error, epath}, State}
-    end;
-
-
-handle_call({recv_chunk_start, RFile}, _From, State)
-  when State#state.chunk == false ->
-    start_chunk_transfer("RETR",RFile,State);
-
-handle_call(recv_chunk, _From, State) 
-  when State#state.chunk == true ->
-    do_recv_chunk(State);
-
-
-handle_call({send, LFile, RFile}, _From, State)
-  when State#state.chunk == false ->
-    transfer_file("STOR",LFile,RFile,State);
-
-handle_call({append, LFile, RFile}, _From, State) 
-  when State#state.chunk == false ->
-    transfer_file("APPE",LFile,RFile,State);
-
-
-handle_call({send_bin, Bin, RFile}, _From, State)
-  when State#state.chunk == false ->
-    transfer_data("STOR",Bin,RFile,State);
-
-handle_call({append_bin, Bin, RFile}, _From, State)
-  when State#state.chunk == false ->
-  transfer_data("APPE",Bin,RFile,State);
-
-
-
-handle_call({send_chunk_start, RFile}, _From, State)
-  when State#state.chunk == false ->
-    start_chunk_transfer("STOR",RFile,State);
-
-handle_call({append_chunk_start,RFile},_From,State)
-  when State#state.chunk==false->
-    start_chunk_transfer("APPE",RFile,State);
-
-handle_call({send_chunk, Bin}, _From, State) 
-  when State#state.chunk == true ->
-    chunk_transfer(Bin,State);
-
-handle_call({append_chunk, Bin}, _From, State) 
-  when State#state.chunk == true ->
-    chunk_transfer(Bin,State);
-
-handle_call(append_chunk_end, _From, State) 
-  when State#state.chunk == true ->
-    end_chunk_transfer(State);
-
-handle_call(send_chunk_end, _From, State) 
-  when State#state.chunk == true ->
-    end_chunk_transfer(State);
-
-
-    
-handle_call(close, _From, State) when State#state.chunk == false ->
-  #state{csock = CSock} = State,
-  ctrl_cmd(CSock, "QUIT", []),
-  sock_close(CSock),
-  {stop, normal, ok, State};
-
-handle_call(_, _From, State) when State#state.chunk == true ->
-  {reply, {error, echunk}, State}.
-
-
-handle_cast(Msg, State) ->
-  {noreply, State}.
-
-
-handle_info({Sock, {fromsocket, Bytes}}, State) when Sock == State#state.csock ->
-  put(leftovers, Bytes ++ leftovers()),
-  {noreply, State};
-
-%% Data connection closed (during chunk sending)
-handle_info({Sock, {socket_closed, _Reason}}, State) when Sock == State#state.dsock ->
-  {noreply, State#state{dsock = undefined}};
-
-%% Control connection closed.
-handle_info({Sock, {socket_closed, _Reason}}, State) when Sock == State#state.csock ->
-  debug("   sc : ~s~n",[leftovers()]),
-  {stop, ftp_server_close, State#state{csock = undefined}};
-
-handle_info(Info, State) ->
-  error_logger:info_msg("ftp : ~w : Unexpected message: ~w\n", [self(),Info]),
-  {noreply, State}.
-
-code_change(OldVsn,State,Extra)->
-    {ok,State}.
-
-terminate(Reason, State) ->
-  ok.
-%%
-%% OPEN CONNECTION
-%%
-open(Host,Port,Timeout,State)->
-    case sock_connect(Host,Port,Timeout) of
-	{error, What} ->
-	    {stop, normal, {error, What}, State};
-	CSock ->
-	    case result(CSock, State#state.flags) of
-		{error,Reason} ->
-		    sock_close(CSock),
-		    {stop,normal,{error,Reason},State};
-		_ -> % We should really check this...
-		    {reply, {ok, self()}, State#state{csock = CSock}}
-	    end
-    end.
-
-
-
-%%
-%% CONTROL CONNECTION
-%%
-
-ctrl_cmd(CSock, Fmt, Args) ->
-    Cmd = mk_cmd(Fmt, Args),
-    case sock_write(CSock, Cmd) of
-	ok ->
-	    debug("  cmd : ~s",[Cmd]),
-	    result(CSock);
-	{error, enotconn} ->
-	    {error, enotconn};
-	Other ->
-	    Other
-    end.
-
-mk_cmd(Fmt, Args) ->
-    [io_lib:format(Fmt, Args)| "\r\n"].		% Deep list ok.
-
-%%
-%% TRANSFER TYPE
-%%
-
-%%
-%% set_type(NewType, CurrType, CSock)
-%% reset_type(NewType, CurrType, CSock)
-%%
-set_type(Type, Type, CSock) ->
-  ok;
-set_type(NewType, _OldType, CSock) ->
-  set_type(NewType, CSock).
-
-reset_type(Type, Type, CSock) ->
-  ok;
-reset_type(_NewType, OldType, CSock) ->
-  set_type(OldType, CSock).
-
-set_type(ascii, CSock) ->
-  ctrl_cmd(CSock, "TYPE A", []);
-set_type(binary, CSock) ->
-  ctrl_cmd(CSock, "TYPE I", []).
-
-%%
-%% DATA CONNECTION 
-%%
-
-%% Create a listen socket for a data connection and send a PORT command 
-%% containing the IP address and port number. Mode is binary or raw.
-%%
-listen_data(CSock, Mode) ->
-  {IP, _} = sock_name(CSock), % IP address of control conn.
-  LSock = sock_listen(Mode, IP),
-  Port = sock_listen_port(LSock),
-  {A1, A2, A3, A4} = IP,
-  {P1, P2} = {Port div 256, Port rem 256},
-  ctrl_cmd(CSock, "PORT ~w,~w,~w,~w,~w,~w", [A1, A2, A3, A4, P1, P2]),
-  LSock.
-
-%%
-%% Accept the data connection and close the listen socket.
-%%
-accept_data(LSock) ->
-  Sock = sock_accept(LSock),
-  sock_close(LSock),
-  Sock.
-
-%%
-%% DATA COLLECTION (ls, dir)
-%%
-%% Socket is a byte stream in ASCII mode.
-%%
-
-%% Receive data (from data connection).
-recv_data(Sock) ->
-    recv_data(Sock, [], 0).
-recv_data(Sock, Sofar, ?OPER_TIMEOUT) ->
-    sock_close(Sock),
-    {ok, lists:flatten(lists:reverse(Sofar))};
-recv_data(Sock, Sofar, Retry) ->
-    case sock_read(Sock) of
-	{ok, Data} ->
-	    debug("  dbg : received some data: ~n~s", [Data]),
-	    recv_data(Sock, [Data| Sofar], 0);
-	{error, timeout} ->
-	    %% Retry..
-	    recv_data(Sock, Sofar, Retry+1);
-	{error, Reason} ->
-	    SoFar1 = lists:flatten(lists:reverse(Sofar)),
-	    {error, {socket_error, Reason, SoFar1, Retry}};
-	{closed, _} ->
-	    {ok, lists:flatten(lists:reverse(Sofar))}
-    end.
-
-%%
-%% BINARY TRANSFER
-%%
-
-%% --------------------------------------------------
-
-%% recv_binary(DSock,CSock) = {ok,Bin} | {error,Reason}
-%%
-recv_binary(DSock,CSock) ->
-    recv_binary1(recv_binary2(DSock,[],0),CSock).
-
-recv_binary1(Reply,Sock) ->
-    case result(Sock) of
-	pos_compl -> Reply;
-	_         -> {error, epath}
-    end.
-    
-recv_binary2(Sock, _Bs, ?OPER_TIMEOUT) ->
-    sock_close(Sock),
-    {error,eclosed};
-recv_binary2(Sock, Bs, Retry) ->
-    case sock_read(Sock) of
-	{ok, Bin} ->
-	    recv_binary2(Sock, [Bs, Bin], 0);
-	{error, timeout} ->
-	    recv_binary2(Sock, Bs, Retry+1);
-	{closed, _Why} ->
-	    {ok,list_to_binary(Bs)}
-  end.
-
-%% --------------------------------------------------
-
-%%
-%% recv_chunk
-%%
-
-do_recv_chunk(#state{dsock = undefined} = State) ->
-    {reply, {error,econn}, State};
-do_recv_chunk(State) ->
-    recv_chunk1(recv_chunk2(State, 0), State).
-
-recv_chunk1({ok, _Bin} = Reply, State) ->
-    {reply, Reply, State};
-%% Reply = ok | {error, Reason}
-recv_chunk1(Reply, #state{csock = CSock} = State) -> 
-    State1 = State#state{dsock = undefined, chunk = false},
-    case result(CSock) of
-	pos_compl -> 
-	    {reply, Reply, State1};
-	_         -> 
-	    {reply, {error, epath}, State1}
-    end.
-    
-recv_chunk2(#state{dsock = DSock} = State, ?OPER_TIMEOUT) ->
-    sock_close(DSock),
-    {error, eclosed};
-recv_chunk2(#state{dsock = DSock} = State, Retry) ->
-    case sock_read(DSock) of
-	{ok, Bin} ->
-	    {ok, Bin};
-	{error, timeout} ->
-           recv_chunk2(State, Retry+1);
-	{closed, Reason} ->
-	    debug("  dbg : socket closed: ~p", [Reason]),
-	    ok
-    end.
-
-
-%% --------------------------------------------------
-
-%%
-%% FILE TRANSFER
-%%
-
-recv_file(Sock, Fd) ->
-    recv_file(Sock, Fd, 0).
-
-recv_file(Sock, Fd, ?OPER_TIMEOUT) ->
-    sock_close(Sock),
-    {closed, timeout};
-recv_file(Sock, Fd, Retry) ->
-    case sock_read(Sock) of
-	{ok, Bin} ->
-	    file_write(Fd, Bin),
-	    recv_file(Sock, Fd);
-	{error, timeout} ->
-	    recv_file(Sock, Fd, Retry+1);
-% 	{error, Reason} ->
-% 	    SoFar1 = lists:flatten(lists:reverse(Sofar)),
-% 	    exit({socket_error, Reason, Sock, SoFar1, Retry});
-	{closed, How} ->
-	    {closed, How}
-  end.
-
-%%
-%% send_file(Fd, Sock) = ok | {error, Why}
-%%
-
-send_file(Fd, Sock) ->
-  {N, Bin} = file_read(Fd),
-  if 
-    N > 0 ->
-      case sock_write(Sock, Bin) of
-	ok ->
-	  send_file(Fd, Sock);
-	{error, Reason} ->
-	  {error, Reason}
-      end;
-    true ->
-      ok
-  end.
-
-
-
-%%
-%% PARSING OF RESULT LINES
-%%
-
-%% Excerpt from RFC 959:
-%%
-%%      "A reply is defined to contain the 3-digit code, followed by Space
-%%      <SP>, followed by one line of text (where some maximum line length
-%%      has been specified), and terminated by the Telnet end-of-line
-%%      code.  There will be cases however, where the text is longer than
-%%      a single line.  In these cases the complete text must be bracketed
-%%      so the User-process knows when it may stop reading the reply (i.e.
-%%      stop processing input on the control connection) and go do other
-%%      things.  This requires a special format on the first line to
-%%      indicate that more than one line is coming, and another on the
-%%      last line to designate it as the last.  At least one of these must
-%%      contain the appropriate reply code to indicate the state of the
-%%      transaction.  To satisfy all factions, it was decided that both
-%%      the first and last line codes should be the same.
-%%
-%%         Thus the format for multi-line replies is that the first line
-%%         will begin with the exact required reply code, followed
-%%         immediately by a Hyphen, "-" (also known as Minus), followed by
-%%         text.  The last line will begin with the same code, followed
-%%         immediately by Space <SP>, optionally some text, and the Telnet
-%%         end-of-line code.
-%%
-%%            For example:
-%%                                123-First line
-%%                                Second line
-%%                                  234 A line beginning with numbers
-%%                                123 The last line
-%%
-%%         The user-process then simply needs to search for the second
-%%         occurrence of the same reply code, followed by <SP> (Space), at
-%%         the beginning of a line, and ignore all intermediary lines.  If
-%%         an intermediary line begins with a 3-digit number, the Server
-%%         must pad the front  to avoid confusion.
-%%
-%%            This scheme allows standard system routines to be used for
-%%            reply information (such as for the STAT reply), with
-%%            "artificial" first and last lines tacked on.  In rare cases
-%%            where these routines are able to generate three digits and a
-%%            Space at the beginning of any line, the beginning of each
-%%            text line should be offset by some neutral text, like Space.
-%%
-%%         This scheme assumes that multi-line replies may not be nested."
-
-%% We have to collect the stream of result characters into lines (ending
-%% in "\r\n"; we check for "\n"). When a line is assembled, left-over 
-%% characters are saved in the process dictionary.
-%%
-
-%% result(Sock) = rescode()
-%% 
-result(Sock) ->
-  result(Sock, false).
-
-result_line(Sock) ->
-  result(Sock, true).
-
-%% result(Sock, Bool) = {error,Reason} | rescode() | {rescode(), Lines}
-%% Printout if Bool = true.
-%%
-result(Sock, RetForm) ->
-    case getline(Sock) of
-	Line when length(Line) > 3 ->
-	    [D1, D2, D3| Tail] = Line,
-	    case Tail of
-		[$-| _] ->
-		    parse_to_end(Sock, [D1, D2, D3, $ ]); % 3 digits + space
-		_ ->
-		    ok
-	    end,
-	    result(D1,D2,D3,Line,RetForm);
-	_ ->
-	    retform(rescode(?PERM_NEG_COMPL,-1,-1),[],RetForm)
-    end.
-
-result(D1,_D2,_D3,Line,_RetForm) when D1 - $0 > 10 ->
-    {error,{invalid_server_response,Line}};
-result(D1,_D2,_D3,Line,_RetForm) when D1 - $0 < 0 ->
-    {error,{invalid_server_response,Line}};
-result(D1,D2,D3,Line,RetForm) ->
-    Res1 = D1 - $0,
-    Res2 = D2 - $0,
-    Res3 = D3 - $0,
-    verbose("    ~w : ~s", [Res1, Line]),
-    retform(rescode(Res1,Res2,Res3),Line,RetForm).
-
-retform(ResCode,Line,true) ->
-    {ResCode,Line};
-retform(ResCode,_,_) ->
-    ResCode.
-
-leftovers() ->
-  case get(leftovers) of
-    undefined -> [];
-    X -> X
-  end.
-
-%% getline(Sock) = Line
-%%
-getline(Sock) ->
-  getline(Sock, leftovers()).
-
-getline(Sock, Rest) ->
-  getline1(Sock, split($\n, Rest), 0).
-
-getline1(Sock, {[], Rest}, ?OPER_TIMEOUT) ->
-    sock_close(Sock),
-    put(leftovers, Rest),
-    [];
-getline1(Sock, {[], Rest}, Retry) ->
-    case sock_read(Sock) of
-	{ok, More} ->
-	    debug(" read : ~s~n",[More]),
-	    getline(Sock, Rest ++ More);
-	{error, timeout} ->
-	    %% Retry..
-	    getline1(Sock, {[], Rest}, Retry+1);
-	Error ->
-	    put(leftovers, Rest),
-	    []
-    end;
-getline1(Sock, {Line, Rest}, Retry) ->
-    put(leftovers, Rest),
-    Line.
-
-parse_to_end(Sock, Prefix) ->
-  Line = getline(Sock),
-  case lists:prefix(Prefix, Line) of
-    false ->
-      parse_to_end(Sock, Prefix);
-    true ->
-      ok
-  end.
-
-
-%% Split list after first occurence of S.
-%% Returns {Prefix, Suffix} ({[], Cs} if S not found).
-split(S, Cs) ->
-  split(S, Cs, []).
-
-split(S, [S| Cs], As) ->
-  {lists:reverse([S|As]), Cs};
-split(S, [C| Cs], As) ->
-  split(S, Cs, [C| As]);
-split(_, [], As) ->
-  {[], lists:reverse(As)}.
-
-%%
-%%  FILE INTERFACE
-%%
-%%  All files are opened raw in binary mode.
-%%
--define(BUFSIZE, 4096).
-
-file_open(File, Option) ->
-  file:open(File, [raw, binary, Option]).
-
-file_close(Fd) ->
-  file:close(Fd).
-
-
-file_read(Fd) ->				% Compatible with pre R2A.
-  case file:read(Fd, ?BUFSIZE) of
-    {ok, {N, Bytes}} ->
-      {N, Bytes};
-    {ok, Bytes} ->
-      {size(Bytes), Bytes};
-    eof ->
-      {0, []}
-  end.
-
-file_write(Fd, Bytes) ->
-  file:write(Fd, Bytes).
-
-absname(Dir, File) ->				% Args swapped.
-  filename:absname(File, Dir).	
-
-
-
-%% sock_start()
-%%
-
-%%
-%% USE GEN_TCP
-%%
-
-sock_start() ->
-  inet_db:start().
-
-%%
-%% Connect to FTP server at Host (default is TCP port 21) in raw mode, 
-%% in order to establish a control connection.
-%%
-
-sock_connect(Host,Port,TimeOut) ->
-    debug(" info : connect to server on ~p:~p~n",[Host,Port]),
-    Opts = [{packet, 0}, {active, false}],
-    case (catch gen_tcp:connect(Host, Port, Opts,TimeOut)) of
-	{'EXIT', R1} ->	% XXX Probably no longer needed.
-	    debug(" error: socket connectionn failed with exit reason:"
-		  "~n   ~p",[R1]),
-	    {error, ehost};
-	{error, R2} ->
-	    debug(" error: socket connectionn failed with exit reason:"
-		  "~n   ~p",[R2]),
-	    {error, ehost};
-	{ok, Sock} ->
-	    Sock
-    end.
-
-%% 
-%% Create a listen socket (any port) in binary or raw non-packet mode for 
-%% data connection.
-%%
-sock_listen(Mode, IP) ->
-  Opts = case Mode of 
-	   binary ->
-	     [binary, {packet, 0}];
-	   raw ->
-	     [{packet, 0}]
-	 end,
-  {ok, Sock} = gen_tcp:listen(0, [{ip, IP}, {active, false} | Opts]),
-  Sock.
-
-sock_accept(LSock) ->
-  {ok, Sock} = gen_tcp:accept(LSock),
-  Sock.
-
-sock_close(undefined) ->
-  ok;
-sock_close(Sock) ->
-  gen_tcp:close(Sock).
-
-sock_read(Sock) ->
-  case gen_tcp:recv(Sock, 0, ?BYTE_TIMEOUT) of
-      {ok, Bytes} ->
-	  {ok, Bytes};
-
-      {error, closed} ->
-	  {closed, closed};			% Yes
-
-      %% --- OTP-4770 begin ---
-      %%
-      %% This seems to happen on windows
-      %% "Someone" tried to close an already closed socket...
-      %%
-
-      {error, enotsock} -> 
-	  {closed, enotsock};
-
-      %%
-      %% --- OTP-4770 end ---
-
-      {error, etimedout} ->
-	  {error, timeout};
-
-      Other ->
-	  Other
-  end.
-
-%%    receive
-%%	{tcp, Sock, Bytes} ->
-%%	    {ok, Bytes};
-%%	{tcp_closed, Sock} ->
-%%	    {closed, closed}
-%%    end.
-
-sock_write(Sock, Bytes) ->
-  gen_tcp:send(Sock, Bytes).
-
-sock_name(Sock) ->
-  {ok, {IP, Port}} = inet:sockname(Sock),
-  {IP, Port}.
-
-sock_listen_port(LSock) ->
-  {ok, Port} = inet:port(LSock),
-  Port.
-
-
-%%
-%%  ERROR STRINGS
-%%
-errstr({error, Reason}) ->
-  errstr(Reason);
-
-errstr(echunk) -> "Synchronisation error during chung sending.";
-errstr(eclosed) -> "Session has been closed.";
-errstr(econn) ->  "Connection to remote server prematurely closed.";
-errstr(eexists) ->"File or directory already exists.";
-errstr(ehost) ->  "Host not found, FTP server not found, "
-"or connection rejected.";
-errstr(elogin) -> "User not logged in.";
-errstr(enotbinary) -> "Term is not a binary.";
-errstr(epath) ->  "No such file or directory, already exists, "
-"or permission denied.";
-errstr(etype) ->  "No such type.";
-errstr(euser) ->  "User name or password not valid.";
-errstr(etnospc) -> "Insufficient storage space in system.";
-errstr(epnospc) -> "Exceeded storage allocation "
-"(for current directory or dataset).";
-errstr(efnamena) -> "File name not allowed.";
-errstr(Reason) -> 
-  lists:flatten(io_lib:format("Unknown error: ~w", [Reason])).
-
-
-
-%% ----------------------------------------------------------
-
-get_verbose(Params) -> check_param(verbose,Params).
-    
-get_debug(Flags)    -> check_param(debug,Flags).
-    
-check_param(P,Ps)   -> lists:member(P,Ps).
-
-
-%% verbose -> ok
-%%
-%% Prints the string if the Flags list is non-epmty
-%%
-%% Params: F   Format string
-%%         A   Arguments to the format string
-%% 
-verbose(F,A) -> verbose(get(verbose),F,A).
-
-verbose(true,F,A) -> print(F,A);
-verbose(_,_F,_A)  -> ok.
-
-    
-
-
-%% debug -> ok
-%%
-%% Prints the string if debug enabled
-%%
-%% Params: F   Format string
-%%         A   Arguments to the format string
-%% 
-debug(F,A) -> debug(get(debug),F,A).
-
-debug(true,F,A) -> print(F,A);
-debug(_,_F,_A)  -> ok.
-
-
-print(F,A) -> io:format(F,A).
-
-
-    
-transfer_file(Cmd,LFile,RFile,State)->
-    #state{csock = CSock, ldir = LDir} = State,
-    ARFile = case RFile of
-	       "" ->
-		   LFile;
-	       _ ->
-		   RFile
-	   end,
-    ALFile = absname(LDir, LFile),
-    case file_open(ALFile, read) of
-      {ok, Fd} ->
-	  LSock = listen_data(CSock, binary),
-	  case ctrl_cmd(CSock, "~s ~s", [Cmd,ARFile]) of
-	      pos_prel ->
-		  DSock = accept_data(LSock),
-		  SFreply = send_file(Fd, DSock),
-		  file_close(Fd),
-		  sock_close(DSock),
-		  case {SFreply,result(CSock)} of
-		      {ok,pos_compl} ->
-			  {reply, ok, State};
-		      {ok,Other} ->
-			  debug(" error: unknown reply: ~p~n",[Other]),
-			  {reply, {error, epath}, State};
-		      {{error,Why},Result} ->
-			  ?STOP_RET(retcode(Result,econn))
-		  end;
-	      {error, enotconn} ->
-		  ?STOP_RET(econn);
-	      Other ->
-		  debug(" error: ctrl failed: ~p~n",[Other]),
-		  {reply, {error, epath}, State}
-	  end;
-	{error, Reason} ->
-	    debug(" error: file open: ~p~n",[Reason]),
-	    {reply, {error, epath}, State}
-    end.
-
-transfer_data(Cmd,Bin,RFile,State)->
-    #state{csock = CSock, ldir = LDir} = State,
-    LSock = listen_data(CSock, binary),
-    case ctrl_cmd(CSock, "~s ~s", [Cmd,RFile]) of
-	pos_prel ->
-	    DSock  = accept_data(LSock),
-	    SReply = sock_write(DSock, Bin),
-	    sock_close(DSock),
-	    case {SReply,result(CSock)} of
-		{ok,pos_compl} ->
-		    {reply, ok, State};
-		{ok,trans_no_space} ->
-		    ?STOP_RET(etnospc);
-		{ok,perm_no_space} ->
-		    ?STOP_RET(epnospc);
-		{ok,perm_fname_not_allowed} ->
-		    ?STOP_RET(efnamena);
-		{ok,Other} ->
-		    debug(" error: unknown reply: ~p~n",[Other]),
-		    {reply, {error, epath}, State};
-		{{error,Why},Result} ->
-		    ?STOP_RET(retcode(Result,econn))
-	    %% {{error,_Why},_Result} ->
-	    %%    ?STOP_RET(econn)
-	    end;
-
-	{error, enotconn} ->
-	    ?STOP_RET(econn);
-
-	Other ->
-	    debug(" error: ctrl failed: ~p~n",[Other]),
-	    {reply, {error, epath}, State}
-    end.
-
-
-start_chunk_transfer(Cmd, RFile, #state{csock = CSock} = State) ->
-  LSock = listen_data(CSock, binary),
-  case ctrl_cmd(CSock, "~s ~s", [Cmd,RFile]) of
-    pos_prel ->
-      DSock = accept_data(LSock),
-      {reply, ok, State#state{dsock = DSock, chunk = true}};
-    {error, enotconn} ->
-      ?STOP_RET(econn);
-    Otherwise ->
-      debug(" error: ctrl failed: ~p~n",[Otherwise]),
-      {reply, {error, epath}, State}
-  end.
-
-
-chunk_transfer(Bin,State)->
-  #state{dsock = DSock, csock = CSock} = State,
-  case DSock of
-    undefined ->
-      {reply,{error,econn},State};
-    _ ->
-      case sock_write(DSock, Bin) of
-	ok ->
-	  {reply, ok, State};
-	Other ->
-	  debug(" error: chunk write error: ~p~n",[Other]),
-	  {reply, {error, econn}, State#state{dsock = undefined}}
-      end
-  end.
-
-
-
-end_chunk_transfer(State)->
-    #state{csock = CSock, dsock = DSock} = State,
-    case DSock of
-	undefined ->
-	    Result = result(CSock),
-	    case Result of
-		pos_compl ->
-		    {reply,ok,State#state{dsock = undefined, 
-					  chunk = false}};
-		trans_no_space ->
-		    ?STOP_RET(etnospc);
-		perm_no_space ->
-		    ?STOP_RET(epnospc);
-		perm_fname_not_allowed ->
-		    ?STOP_RET(efnamena);
-		Result ->
-		    debug(" error: send chunk end (1): ~p~n",
-			  [Result]),
-		    {reply,{error,epath},State#state{dsock = undefined, 
-						     chunk = false}}
-	    end;
-	_ ->
-	    sock_close(DSock),
-	    Result = result(CSock),
-	    case Result of
-		pos_compl ->
-		    {reply,ok,State#state{dsock = undefined, 
-					  chunk = false}};
-		trans_no_space ->
-		    sock_close(CSock),
-		    ?STOP_RET(etnospc);
-		perm_no_space ->
-		    sock_close(CSock),
-		    ?STOP_RET(epnospc);
-		perm_fname_not_allowed ->
-		    sock_close(CSock),
-		    ?STOP_RET(efnamena);
-		Result ->
-		    debug(" error: send chunk end (2): ~p~n",
-			  [Result]),
-		    {reply,{error,epath},State#state{dsock = undefined, 
-						     chunk = false}}
-	    end
-    end.
-				      
-get_key1(Key,List,Default)->	     
-    case lists:keysearch(Key,1,List)of
-	{value,{_,Val}}->
-	    Val;
-	false->
-	    Default
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/http.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/http.erl
deleted file mode 100644
index 764e7fb092..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/http.erl
+++ /dev/null
@@ -1,260 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Mobile Arts AB
-%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
-%% All Rights Reserved.''
-%% 
-%%
-
-%%% This version of the HTTP/1.1 client implements:
-%%%      - RFC 2616 HTTP 1.1 client part
-%%%      - RFC 2817 Upgrading to TLS Within HTTP/1.1 (not yet!)
-%%%      - RFC 2818 HTTP Over TLS
-%%%      - RFC 3229 Delta encoding in HTTP (not yet!)
-%%%      - RFC 3230 Instance Digests in HTTP (not yet!)
-%%%      - RFC 3310 Authentication and Key Agreement (AKA) (not yet!)
-%%%      - HTTP/1.1 Specification Errata found at
-%%%        http://world.std.com/~lawrence/http_errata.html
-%%%    Additionaly follows the following recommendations:
-%%%      - RFC 3143 Known HTTP Proxy/Caching Problems (not yet!)
-%%%      - draft-nottingham-hdrreg-http-00.txt (not yet!)
-%%%
-%%% Depends on
-%%%      - uri.erl for all URL parsing (except what is handled by the C driver)
-%%%      - http_lib.erl for all parsing of body and headers
-%%%
-%%% Supported Settings are:
-%%% http_timeout      % (int) Milliseconds before a request times out
-%%% http_useproxy     % (bool) True if a proxy should be used
-%%% http_proxy        % (string) Proxy
-%%% http_noproxylist  % (list) List with hosts not requiring proxy
-%%% http_autoredirect % (bool) True if automatic redirection on 30X responses
-%%% http_ssl          % (list) SSL settings. A non-empty list enables SSL/TLS
-%%%                      support in the HTTP client
-%%% http_pipelinesize % (int) Length of pipeline. 1 means no pipeline.
-%%%                      Only has effect when initiating a new session.
-%%% http_sessions     % (int) Max number of open sessions for {Addr,Port}
-%%%
-%%% TODO: (Known bugs!)
-%% - Cache handling
-%% - Doesn't handle a bunch of entity headers properly
-%% - Better handling of status codes different from 200,30X and 50X 
-%% - Many of the settings above are not implemented!
-%% - close_session/2 and cancel_request/1 doesn't work
-%% - Variable pipe size.
-%% - Due to the fact that inet_drv only has a single timer, the timeouts given
-%%   for pipelined requests are not ok (too long)
-%%
-%% Note:
-%% - Some servers (e.g. Microsoft-IIS/5.0) may sometimes not return a proper
-%%   'Location' header on a redirect.
-%%   The client will fail with {error,no_scheme} in these cases.
-
--module(http).
--author("[email protected]").
-
--export([start/0,
-	 request/3,request/4,cancel_request/1,
-	 request_sync/2,request_sync/3]).
-
--include("http.hrl").
--include("jnets_httpd.hrl").
-
--define(START_OPTIONS,[]).
-
-%%% HTTP Client manager. Used to store open connections.
-%%% Will be started automatically unless started explicitly.
-start() ->
-    application:start(ssl),
-    httpc_manager:start().
-
-%%% Asynchronous HTTP request that spawns a handler.
-%%% Method                          HTTPReq
-%%% options,get,head,delete,trace = {Url,Headers}
-%%% post,put                      = {Url,Headers,ContentType,Body}
-%%%  where Url is a {Scheme,Host,Port,PathQuery} tuple, as returned by uri.erl
-%%% 
-%%% Returns: {ok,ReqId} |
-%%%          {error,Reason}
-%%% If {ok,Pid} was returned, the handler will return with
-%%%    gen_server:cast(From,{Ref,ReqId,{error,Reason}}) |
-%%%    gen_server:cast(From,{Ref,ReqId,{Status,Headers,Body}})
-%%%  where Reason is an atom and Headers a #res_headers{} record
-%%% http:format_error(Reason) gives a more informative description.
-%%% 
-%%% Note:
-%%% - Always try to find an open connection to a given host and port, and use
-%%%   the associated socket.
-%%% - Unless a 'Connection: close' header is provided don't close the socket
-%%%   after a response is given 
-%%% - A given Pid, found in the database, might be terminated before the
-%%%   message is sent to the Pid. This will happen e.g., if the connection is
-%%%   closed by the other party and there are no pending requests.
-%%% - The HTTP connection process is spawned, if necessary, in
-%%%   httpc_manager:add_connection/4
-request(Ref,Method,HTTPReqCont) ->
-    request(Ref,Method,HTTPReqCont,[],self()).
-
-request(Ref,Method,HTTPReqCont,Settings) ->
-    request(Ref,Method,HTTPReqCont,Settings,self()).
-
-request(Ref,Method,{{Scheme,Host,Port,PathQuery},
-		    Headers,ContentType,Body},Settings,From) ->
-    case create_settings(Settings,#client_settings{}) of
-	{error,Reason} ->
-	    {error,Reason};
-	CS ->
-	    case create_headers(Headers,#req_headers{}) of
-		{error,Reason} ->
-		    {error,Reason};
-		H ->
-		    Req=#request{ref=Ref,from=From,
-				 scheme=Scheme,address={Host,Port},
-				 pathquery=PathQuery,method=Method,
-				 headers=H,content={ContentType,Body},
-				 settings=CS},
-		    httpc_manager:request(Req)
-	    end
-    end;
-request(Ref,Method,{Url,Headers},Settings,From) ->
-    request(Ref,Method,{Url,Headers,[],[]},Settings,From).
-
-%%% Cancels requests identified with ReqId.
-%%% FIXME! Doesn't work... 
-cancel_request(ReqId) ->
-    httpc_manager:cancel_request(ReqId).
-
-%%% Close all sessions currently open to Host:Port
-%%% FIXME! Doesn't work... 
-close_session(Host,Port) ->
-    httpc_manager:close_session(Host,Port).
-    
-
-%%% Synchronous HTTP request that waits until a response is created
-%%% (e.g. successfull reply or timeout)
-%%% Method                          HTTPReq
-%%% options,get,head,delete,trace = {Url,Headers}
-%%% post,put                      = {Url,Headers,ContentType,Body}
-%%%  where Url is a string() or a {Scheme,Host,Port,PathQuery} tuple
-%%% 
-%%% Returns: {Status,Headers,Body} |
-%%%          {error,Reason}
-%%% where Reason is an atom. 
-%%% http:format_error(Reason) gives a more informative description.
-request_sync(Method,HTTPReqCont) ->
-    request_sync(Method,HTTPReqCont,[]).
-
-request_sync(Method,{Url,Headers},Settings)
-  when Method==options;Method==get;Method==head;Method==delete;Method==trace ->
-    case uri:parse(Url) of
-	{error,Reason} ->
-	    {error,Reason};
-	ParsedUrl ->
-	    request_sync(Method,{ParsedUrl,Headers,[],[]},Settings,0)
-    end;
-request_sync(Method,{Url,Headers,ContentType,Body},Settings)
-  when Method==post;Method==put ->
-    case uri:parse(Url) of
-	{error,Reason} ->
-	    {error,Reason};
-	ParsedUrl ->
-	    request_sync(Method,{ParsedUrl,Headers,ContentType,Body},Settings,0)
-    end;
-request_sync(Method,Request,Settings) ->
-    {error,bad_request}.
-
-request_sync(Method,HTTPCont,Settings,_Redirects) ->
-    case request(request_sync,Method,HTTPCont,Settings,self()) of
-	{ok,_ReqId} ->
-	    receive
-		{'$gen_cast',{request_sync,_ReqId2,{Status,Headers,Body}}} ->
-		    {Status,pp_headers(Headers),binary_to_list(Body)};
-		{'$gen_cast',{request_sync,_ReqId2,{error,Reason}}} ->
-		    {error,Reason};
-		Error ->
-		    Error
-	    end;
-	Error ->
-	    Error
-    end.
-
-
-create_settings([],Out) ->
-    Out;
-create_settings([{http_timeout,Val}|Settings],Out) ->
-    create_settings(Settings,Out#client_settings{timeout=Val});
-create_settings([{http_useproxy,Val}|Settings],Out) ->
-    create_settings(Settings,Out#client_settings{useproxy=Val});
-create_settings([{http_proxy,Val}|Settings],Out) ->
-    create_settings(Settings,Out#client_settings{proxy=Val});
-create_settings([{http_noproxylist,Val}|Settings],Out) ->
-    create_settings(Settings,Out#client_settings{noproxylist=Val});
-create_settings([{http_autoredirect,Val}|Settings],Out) ->
-    create_settings(Settings,Out#client_settings{autoredirect=Val});
-create_settings([{http_ssl,Val}|Settings],Out) ->
-    create_settings(Settings,Out#client_settings{ssl=Val});
-create_settings([{http_pipelinesize,Val}|Settings],Out)
-  when integer(Val),Val>0 ->
-    create_settings(Settings,Out#client_settings{max_quelength=Val});
-create_settings([{http_sessions,Val}|Settings],Out)
-  when integer(Val),Val>0 ->
-    create_settings(Settings,Out#client_settings{max_sessions=Val});
-create_settings([{Key,_Val}|_Settings],_Out) ->
-    io:format("ERROR bad settings, got ~p~n",[Key]),
-    {error,bad_settings}.
-
-
-create_headers([],Req) ->
-    Req;
-create_headers([{Key,Val}|Rest],Req) ->
-    case httpd_util:to_lower(Key) of
-	"expect" ->
-	    create_headers(Rest,Req#req_headers{expect=Val});
-	OtherKey ->
-	    create_headers(Rest,
-			   Req#req_headers{other=[{OtherKey,Val}|
-						  Req#req_headers.other]})
-    end.
-		
-
-pp_headers(#res_headers{connection=Connection,
-			transfer_encoding=Transfer_encoding,
-			retry_after=Retry_after,
-			content_length=Content_length,
-			content_type=Content_type,
-			location=Location,
-			other=Other}) ->
-    H1=case Connection of
-	   undefined -> [];
-	   _ ->	 [{'Connection',Connection}]
-       end,
-    H2=case Transfer_encoding of
-	   undefined -> [];
-	   _ ->	 [{'Transfer-Encoding',Transfer_encoding}]
-       end,
-    H3=case Retry_after of
-	   undefined -> [];
-	   _ ->	 [{'Retry-After',Retry_after}]
-       end,
-    H4=case Location of
-	   undefined -> [];
-	   _ ->	 [{'Location',Location}]
-       end,
-    HCL=case Content_length of
-	   "0" -> [];
-	   _ ->	 [{'Content-Length',Content_length}]
-       end,
-    HCT=case Content_type of
-	   undefined -> [];
-	   _ ->	 [{'Content-Type',Content_type}]
-       end,
-    H1++H2++H3++H4++HCL++HCT++Other.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/http.hrl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/http.hrl
deleted file mode 100644
index f10ca47a9a..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/http.hrl
+++ /dev/null
@@ -1,127 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Mobile Arts AB
-%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
-%% All Rights Reserved.''
-%% 
-%%
-
--define(HTTP_REQUEST_TIMEOUT,   5000).
--define(PIPELINE_LENGTH,3).
--define(OPEN_SESSIONS,400).
-
-
-%%% FIXME! These definitions should probably be possible to defined via
-%%% user settings
--define(MAX_REDIRECTS, 4).
-
-
-%%% Note that if not persitent the connection can be closed immediately on a
-%%% response, because new requests are not sent to this connection process.
-%%%	  address,     % ({Host,Port}) Destination Host and Port
--record(session,{
-	  id,          % (int) Session Id identifies session in http_manager
-	  clientclose, % (bool) true if client requested "close" connection
-	  scheme,      % (atom) http (HTTP/TCP) or https (TCP/SSL/TCP)
-	  socket,      % (socket) Open socket, used by connection
-	  pipeline=[], % (list) Sent requests, not yet taken care of by the
-	               %        associated http_responder.
-	  quelength=1, % (int) Current length of pipeline (1 when created)
-	  max_quelength% (int) Max pipeline length
-	 }).
-
-%%%      [{Pid,RequestQue,QueLength},...] list where
-%%%   - RequestQue (implemented with a list) contains sent requests that
-%%%      has not yet received a response (pipelined) AND is not currently
-%%%      handled (awaiting data) by the session process.
-%%%   - QueLength is the length of this que, but 
-
-%%% Response headers
--record(res_headers,{
-%%% --- Standard "General" headers
-% 	  cache_control,
- 	  connection,
-% 	  date,
-% 	  pragma,
-% 	  trailer,
- 	  transfer_encoding,
-% 	  upgrade,
-% 	  via,
-% 	  warning,
-%%% --- Standard "Request" headers
-% 	  accept_ranges,
-% 	  age,
-% 	  etag,
- 	  location,
-% 	  proxy_authenticate,
- 	  retry_after,
-% 	  server,
-% 	  vary,
-% 	  www_authenticate,
-%%% --- Standard "Entity" headers
-% 	  allow,
-% 	  content_encoding,
-% 	  content_language,
- 	  content_length="0",
-% 	  content_location,
-% 	  content_md5,
-% 	  content_range,
- 	  content_type,
-% 	  expires,
-% 	  last_modified,
-	  other=[]        % (list) Key/Value list with other headers
-	 }).
-
-%%% All data associated to a specific HTTP request
--record(request,{
-	  id,          % (int) Request Id
-	  ref,         % Caller specific
-	  from,        % (pid) Caller
-	  redircount=0,% (int) Number of redirects made for this request
-	  scheme,      % (http|https) (HTTP/TCP) or (TCP/SSL/TCP) connection
-	  address,     % ({Host,Port}) Destination Host and Port
-	  pathquery,   % (string) Rest of parsed URL
-	  method,      % (atom) HTTP request Method
-	  headers,     % (list) Key/Value list with Headers
-	  content,     % ({ContentType,Body}) Current HTTP request
-	  settings     % (#client_settings{}) User defined settings
-	 }).
-
--record(response,{
-	  scheme,      % (atom) http (HTTP/TCP) or https (TCP/SSL/TCP)
-	  socket,      % (socket) Open socket, used by connection
-	  status,
-	  http_version,
-	  headers=#res_headers{},
-	  body = <<>>
-	 }).
-
-
-
-
-%%% HTTP Client settings
--record(client_settings,{
-	  timeout=?HTTP_REQUEST_TIMEOUT,
-	                     % (int) Milliseconds before a request times out
-	  useproxy=false,    % (bool) True if the proxy should be used
-	  proxy=undefined,   % (tuple) Parsed Proxy URL
-	  noproxylist=[],    % (list) List with hosts not requiring proxy
-	  autoredirect=true, % (bool) True if automatic redirection on 30X
-			     %        responses.
-	  max_sessions=?OPEN_SESSIONS,% (int) Max open sessions for any Adr,Port
-	  max_quelength=?PIPELINE_LENGTH, % (int) Max pipeline length
-%	  ssl=[{certfile,"/jb/server_root/ssl/ssl_client.pem"},
-%	       {keyfile,"/jb/server_root/ssl/ssl_client.pem"},
-%	       {verify,0}]
-	  ssl=false    % (list) SSL settings. A non-empty list enables SSL/TLS
-                       %  support in the HTTP client
-	 }).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/http_lib.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/http_lib.erl
deleted file mode 100644
index eb8d7d66b1..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/http_lib.erl
+++ /dev/null
@@ -1,745 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Mobile Arts AB
-%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
-%% All Rights Reserved.''
-%% 
-%%
-%%% File    : http_lib.erl
-%%% Author  : Johan Blom <[email protected]>
-%%% Description : Generic, HTTP specific helper functions
-%%% Created :  4 Mar 2002 by Johan Blom
-
-%%% TODO
-%%% - Check if I need to anything special when parsing
-%%%   "Content-Type:multipart/form-data"
-
--module(http_lib).
--author("[email protected]").
-
--include("http.hrl").
--include("jnets_httpd.hrl").
-
--export([connection_close/1,
-	 accept/3,deliver/3,recv/4,recv0/3,
-	 connect/1,send/3,close/2,controlling_process/3,setopts/3,
-	 getParameterValue/2,
-%	 get_var/2,
-	 create_request_line/3]).
-
--export([read_client_headers/2,read_server_headers/2,
-	 get_auth_data/1,create_header_list/1,
-	 read_client_body/2,read_client_multipartrange_body/3,
-	 read_server_body/2]).
-
-
-%%% Server response:
-%%%    Check "Connection" header if server requests session to be closed.
-%%%    No 'close' means returns false
-%%% Client Request:
-%%%    Check if 'close' in request headers 
-%%% Only care about HTTP 1.1 clients!
-connection_close(Headers) when record(Headers,req_headers) ->
-    case Headers#req_headers.connection of
-	"close" ->
-	    true;
-	"keep-alive" ->
-	    false;
-	Value when list(Value) ->
-	    true;
-	_ ->
-	    false
-    end;
-connection_close(Headers) when record(Headers,res_headers) ->
-    case Headers#res_headers.connection of
-	"close" ->
-	    true;
-	"keep-alive" ->
-	    false;
-	Value when list(Value) ->
-	    true;
-	_ ->
-	    false
-    end.
-
-
-%% =============================================================================
-%%% Debugging:
-
-% format_time(TS) ->
-%     {_,_,MicroSecs}=TS,
-%     {{Y,Mon,D},{H,M,S}}=calendar:now_to_universal_time(TS),
-%     lists:flatten(io_lib:format("~4.4.0w-~2.2.0w-~2.2.0w,~2.2.0w:~2.2.0w:~6.3.0f",
-% 				[Y,Mon,D,H,M,S+(MicroSecs/1000000)])).
-
-%% Time in milli seconds
-% t() ->
-%     {A,B,C} = erlang:now(),
-%     A*1000000000+B*1000+(C div 1000).
-
-% sz(L) when list(L) ->
-%     length(L);
-% sz(B) when binary(B) ->
-%     size(B);
-% sz(O) ->
-%     {unknown_size,O}.
-
-
-%% =============================================================================
-
-getHeaderValue(_Attr,[]) ->
-    [];
-getHeaderValue(Attr,[{Attr,Value}|_Rest]) ->
-    Value;
-getHeaderValue(Attr,[_|Rest]) ->
-    getHeaderValue(Attr,Rest).
-
-getParameterValue(_Attr,undefined) ->
-    undefined;
-getParameterValue(Attr,List) ->
-    case lists:keysearch(Attr,1,List) of
-	{value,{Attr,Val}} ->
-	    Val;
-	_ ->
-	    undefined
-    end.
-
-create_request_line(Method,Path,{Major,Minor}) ->
-    [atom_to_list(Method)," ",Path,
-     " HTTP/",integer_to_list(Major),".",integer_to_list(Minor)];
-create_request_line(Method,Path,Minor) ->
-    [atom_to_list(Method)," ",Path," HTTP/1.",integer_to_list(Minor)].
-
-
-%%% ============================================================================
-read_client_headers(Info,Timeout) ->
-    Headers=read_response_h(Info#response.scheme,Info#response.socket,Timeout,
-			    Info#response.headers),
-    Info#response{headers=Headers}.
-
-read_server_headers(Info,Timeout) ->
-    Headers=read_request_h(Info#mod.socket_type,Info#mod.socket,Timeout,
-			   Info#mod.headers),
-    Info#mod{headers=Headers}.
-
-
-%% Parses the header of a HTTP request and returns a key,value tuple 
-%% list containing Name and Value of each header directive as of:
-%%
-%% Content-Type: multipart/mixed -> {"Content-Type", "multipart/mixed"}
-%%
-%% But in http/1.1 the field-names are case insencitive so now it must be 
-%% Content-Type: multipart/mixed -> {"content-type", "multipart/mixed"}
-%% The standard furthermore says that leading and traling white space 
-%% is not a part of the fieldvalue and shall therefore be removed.
-read_request_h(SType,S,Timeout,H) ->
-    case recv0(SType,S,Timeout) of
-	{ok,{http_header,_,'Connection',_,Value}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{connection=Value});
-	{ok,{http_header,_,'Content-Type',_,Val}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{content_type=Val});
-	{ok,{http_header,_,'Host',_,Value}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{host=Value});
-	{ok,{http_header,_,'Content-Length',_,Value}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{content_length=Value});
-%	{ok,{http_header,_,'Expect',_,Value}} -> % FIXME! Update inet_drv.c!!
-%	    read_request_h(SType,S,Timeout,H#req_headers{expect=Value});
-	{ok,{http_header,_,'Transfer-Encoding',_,V}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{transfer_encoding=V});
-	{ok,{http_header,_,'Authorization',_,Value}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{authorization=Value});
-	{ok,{http_header,_,'User-Agent',_,Value}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{user_agent=Value});
-	{ok,{http_header,_,'Range',_,Value}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{range=Value});
-	{ok,{http_header,_,'If-Range',_,Value}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{if_range=Value});
-	{ok,{http_header,_,'If-Match',_,Value}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{if_match=Value});
-	{ok,{http_header,_,'If-None-Match',_,Value}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{if_none_match=Value});
-	{ok,{http_header,_,'If-Modified-Since',_,V}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{if_modified_since=V});
-	{ok,{http_header,_,'If-Unmodified-Since',_,V}} ->
-	    read_request_h(SType,S,Timeout,H#req_headers{if_unmodified_since=V});
-	{ok,{http_header,_,K,_,V}} ->
-	    read_request_h(SType,S,Timeout,
-			   H#req_headers{other=H#req_headers.other++[{K,V}]});
-	{ok,http_eoh} ->
-	    H;
-    	{error, timeout} when SType==http ->
-	    throw({error, session_local_timeout});
-    	{error, etimedout} when SType==https ->
-	    throw({error, session_local_timeout});
-	{error, Reason} when Reason==closed;Reason==enotconn ->
-	    throw({error, session_remotely_closed});
-	{error, Reason} ->
-	    throw({error,Reason})
-    end.
-
-
-read_response_h(SType,S,Timeout,H) ->
-    case recv0(SType,S,Timeout) of
-	{ok,{http_header,_,'Connection',_,Val}} ->
-	    read_response_h(SType,S,Timeout,H#res_headers{connection=Val});
-	{ok,{http_header,_,'Content-Length',_,Val}} ->
-	    read_response_h(SType,S,Timeout,H#res_headers{content_length=Val});
-	{ok,{http_header,_,'Content-Type',_,Val}} ->
-	    read_response_h(SType,S,Timeout,H#res_headers{content_type=Val});
-	{ok,{http_header,_,'Transfer-Encoding',_,V}} ->
-	    read_response_h(SType,S,Timeout,H#res_headers{transfer_encoding=V});
-	{ok,{http_header,_,'Location',_,V}} ->
-	    read_response_h(SType,S,Timeout,H#res_headers{location=V});
-	{ok,{http_header,_,'Retry-After',_,V}} ->
-	    read_response_h(SType,S,Timeout,H#res_headers{retry_after=V});
-	{ok,{http_header,_,K,_,V}} ->
-	    read_response_h(SType,S,Timeout,
-			    H#res_headers{other=H#res_headers.other++[{K,V}]});
-	{ok,http_eoh} ->
-	    H;
-    	{error, timeout} when SType==http ->
-	    throw({error, session_local_timeout});
-    	{error, etimedout} when SType==https ->
-	    throw({error, session_local_timeout});
-	{error, Reason} when Reason==closed;Reason==enotconn ->
-	    throw({error, session_remotely_closed});
-	{error, Reason} ->
-	    throw({error,Reason})
-    end.
-
-
-%%% Got the headers, and maybe a part of the body, now read in the rest
-%%% Note:
-%%% - No need to check for Expect header if client 
-%%% - Currently no support for setting MaxHeaderSize in client, set to
-%%%   unlimited.
-%%% - Move to raw packet mode as we are finished with HTTP parsing
-read_client_body(Info,Timeout) ->
-    Headers=Info#response.headers,    
-    case Headers#res_headers.transfer_encoding of
-	"chunked" ->
-	    ?DEBUG("read_entity_body2()->"
-		"Transfer-encoding:Chunked Data:",[]),
-	    read_client_chunked_body(Info,Timeout,?MAXBODYSIZE);
-	Encoding when list(Encoding) ->
-	    ?DEBUG("read_entity_body2()->"
-		"Transfer-encoding:Unknown",[]),
-	    throw({error,unknown_coding});
-	_ ->
-	    ContLen=list_to_integer(Headers#res_headers.content_length),
-	    if
-		ContLen>?MAXBODYSIZE -> 
-		    throw({error,body_too_big});
-		true ->
-		    ?DEBUG("read_entity_body2()->"
-			"Transfer-encoding:none ",[]),
-		    Info#response{body=read_plain_body(Info#response.scheme,
-						       Info#response.socket,
-						       ContLen,
-						       Info#response.body,
-						       Timeout)}
-	    end
-    end.
-
-
-%%% ----------------------------------------------------------------------
-read_server_body(Info,Timeout) ->
-    MaxBodySz=httpd_util:lookup(Info#mod.config_db,max_body_size,?MAXBODYSIZE),
-    ContLen=list_to_integer((Info#mod.headers)#req_headers.content_length),
-    %% ?vtrace("ContentLength: ~p", [ContLen]),
-    if
-	integer(ContLen),integer(MaxBodySz),ContLen>MaxBodySz ->
-	    throw({error,body_too_big});
-	true ->
-	    read_server_body2(Info,Timeout,ContLen,MaxBodySz)
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Control if the body is transfer encoded, if so decode it.
-%% Note:
-%% - MaxBodySz has an integer value or 'nolimit'
-%% - ContLen has an integer value or 'undefined'
-%% All applications MUST be able to receive and decode the "chunked"
-%% transfer-coding, see RFC 2616 Section 3.6.1
-read_server_body2(Info,Timeout,ContLen,MaxBodySz) ->
-    ?DEBUG("read_entity_body2()->Max: ~p ~nLength:~p ~nSocket: ~p ~n",
-	[MaxBodySz,ContLen,Info#mod.socket]),
-    case (Info#mod.headers)#req_headers.transfer_encoding of
-	"chunked" ->
-	    ?DEBUG("read_entity_body2()->"
-		"Transfer-encoding:Chunked Data:",[]),
-	    read_server_chunked_body(Info,Timeout,MaxBodySz);
-	Encoding when list(Encoding) ->
-	    ?DEBUG("read_entity_body2()->"
-		"Transfer-encoding:Unknown",[]),
-	    httpd_response:send_status(Info,501,"Unknown Transfer-Encoding"),
-	    http_lib:close(Info#mod.socket_type,Info#mod.socket),
-	    throw({error,{status_sent,"Unknown Transfer-Encoding "++Encoding}});
-	_ when integer(ContLen),integer(MaxBodySz),ContLen>MaxBodySz -> 
-	    throw({error,body_too_big});
-	_ when integer(ContLen) ->
-	    ?DEBUG("read_entity_body2()->"
-		"Transfer-encoding:none ",[]),
-	    Info#mod{entity_body=read_plain_body(Info#mod.socket_type,
-						 Info#mod.socket,
-						 ContLen,Info#mod.entity_body,
-						 Timeout)}
-    end.
-
-
-%%% ----------------------------------------------------------------------------
-%%% The body was plain, just read it from the socket.
-read_plain_body(_SocketType,Socket,0,Cont,_Timeout) ->
-    Cont;
-read_plain_body(SocketType,Socket,ContLen,Cont,Timeout) ->
-    Body=read_more_data(SocketType,Socket,ContLen,Timeout),
-    <<Cont/binary,Body/binary>>.
-
-%%% ----------------------------------------------------------------------------
-%%% The body was chunked, decode it.
-%%% From RFC2616, Section 3.6.1
-%%        Chunked-Body   = *chunk
-%%                         last-chunk
-%%                         trailer
-%%                         CRLF
-%%
-%%        chunk          = chunk-size [ chunk-extension ] CRLF
-%%                         chunk-data CRLF
-%%        chunk-size     = 1*HEX
-%%        last-chunk     = 1*("0") [ chunk-extension ] CRLF
-%%
-%%        chunk-extension= *( ";" chunk-ext-name [ "=" chunk-ext-val ] )
-%%        chunk-ext-name = token
-%%        chunk-ext-val  = token | quoted-string
-%%        chunk-data     = chunk-size(OCTET)
-%%        trailer        = *(entity-header CRLF)
-%%
-%%% "All applications MUST ignore chunk-extension extensions they do not
-%%% understand.", see RFC 2616 Section 3.6.1
-%%% We don't understand any extension...
-read_client_chunked_body(Info,Timeout,MaxChunkSz) ->
-    case read_chunk(Info#response.scheme,Info#response.socket,
-		    Timeout,0,MaxChunkSz) of
-	{last_chunk,_ExtensionList} -> % Ignore extension
-	    TrailH=read_headers_old(Info#response.scheme,Info#response.socket,
-				    Timeout),
-	    H=Info#response.headers,
-	    OtherHeaders=H#res_headers.other++TrailH,
-	    Info#response{headers=H#res_headers{other=OtherHeaders}};
-	{Chunk,ChunkSize,_ExtensionList} -> % Ignore extension
-	    Info1=Info#response{body= <<(Info#response.body)/binary,
-				        Chunk/binary>>},
-	    read_client_chunked_body(Info1,Timeout,MaxChunkSz-ChunkSize);
-	{error,Reason} ->
-	    throw({error,Reason})
-    end.
-
-
-read_server_chunked_body(Info,Timeout,MaxChunkSz) ->
-    case read_chunk(Info#mod.socket_type,Info#mod.socket,
-		    Timeout,0,MaxChunkSz) of
-	{last_chunk,_ExtensionList} -> % Ignore extension
-	    TrailH=read_headers_old(Info#mod.socket_type,Info#mod.socket,
-				    Timeout),
-	    H=Info#mod.headers,
-	    OtherHeaders=H#req_headers.other++TrailH,
-	    Info#mod{headers=H#req_headers{other=OtherHeaders}};
-	{Chunk,ChunkSize,_ExtensionList} -> % Ignore extension
-	    Info1=Info#mod{entity_body= <<(Info#mod.entity_body)/binary,
-					   Chunk/binary>>},
-	    read_server_chunked_body(Info1,Timeout,MaxChunkSz-ChunkSize);
-	{error,Reason} ->
-	    throw({error,Reason})
-    end.
-
-
-read_chunk(Scheme,Socket,Timeout,Int,MaxChunkSz) when MaxChunkSz>Int ->
-    case read_more_data(Scheme,Socket,1,Timeout) of
-	<<C>> when $0=<C,C=<$9 ->
-	    read_chunk(Scheme,Socket,Timeout,16*Int+(C-$0),MaxChunkSz);
-	<<C>> when $a=<C,C=<$f ->
-	    read_chunk(Scheme,Socket,Timeout,16*Int+10+(C-$a),MaxChunkSz);
-	<<C>> when $A=<C,C=<$F ->
-	    read_chunk(Scheme,Socket,Timeout,16*Int+10+(C-$A),MaxChunkSz);
-	<<$;>> when Int>0 ->
-	    ExtensionList=read_chunk_ext_name(Scheme,Socket,Timeout,[],[]),
-	    read_chunk_data(Scheme,Socket,Int+1,ExtensionList,Timeout);
-	<<$;>> when Int==0 ->
-	    ExtensionList=read_chunk_ext_name(Scheme,Socket,Timeout,[],[]),
-	    read_data_lf(Scheme,Socket,Timeout),
-	    {last_chunk,ExtensionList};
-	<<?CR>> when Int>0 ->
-	    read_chunk_data(Scheme,Socket,Int+1,[],Timeout);
-	<<?CR>> when Int==0 ->
-	    read_data_lf(Scheme,Socket,Timeout),
-	    {last_chunk,[]};
-	<<C>> when C==$ -> % Some servers (e.g., Apache 1.3.6) throw in
-			   % additional whitespace...
-	    read_chunk(Scheme,Socket,Timeout,Int,MaxChunkSz);
-	_Other ->
-	    {error,unexpected_chunkdata}
-    end;
-read_chunk(_Scheme,_Socket,_Timeout,_Int,_MaxChunkSz) ->
-    {error,body_too_big}.
-
-
-%%% Note:
-%%% - Got the initial ?CR already!
-%%% - Bitsyntax does not allow matching of ?CR,?LF in the end of the first read
-read_chunk_data(Scheme,Socket,Int,ExtensionList,Timeout) ->
-    case read_more_data(Scheme,Socket,Int,Timeout) of
-	<<?LF,Chunk/binary>> ->
-	    case read_more_data(Scheme,Socket,2,Timeout) of
-		<<?CR,?LF>> ->
-		    {Chunk,size(Chunk),ExtensionList};
-		_ ->
-		    {error,bad_chunkdata}
-	    end;
-	_ ->
-	    {error,bad_chunkdata}
-    end.
-
-read_chunk_ext_name(Scheme,Socket,Timeout,Name,Acc) ->
-    Len=length(Name),
-    case read_more_data(Scheme,Socket,1,Timeout) of
-	$= when Len>0 ->
-	    read_chunk_ext_val(Scheme,Socket,Timeout,Name,[],Acc);
-	$; when Len>0 ->
-	    read_chunk_ext_name(Scheme,Socket,Timeout,[],
-				[{lists:reverse(Name),""}|Acc]);
-	?CR when Len>0 ->
-	    lists:reverse([{lists:reverse(Name,"")}|Acc]);
-	Token -> % FIXME Check that it is "token"
-	    read_chunk_ext_name(Scheme,Socket,Timeout,[Token|Name],Acc);
-	_ ->
-	    {error,bad_chunk_extension_name}
-    end.
-
-read_chunk_ext_val(Scheme,Socket,Timeout,Name,Val,Acc) ->
-    Len=length(Val),
-    case read_more_data(Scheme,Socket,1,Timeout) of
-	$; when Len>0 ->
-	    read_chunk_ext_name(Scheme,Socket,Timeout,[],
-				[{Name,lists:reverse(Val)}|Acc]);
-	?CR when Len>0 ->
-	    lists:reverse([{Name,lists:reverse(Val)}|Acc]);
-	Token -> % FIXME Check that it is "token" or "quoted-string"
-	    read_chunk_ext_val(Scheme,Socket,Timeout,Name,[Token|Val],Acc);
-	_ ->
-	    {error,bad_chunk_extension_value}
-    end.
-
-read_data_lf(Scheme,Socket,Timeout) ->
-    case read_more_data(Scheme,Socket,1,Timeout) of
-	?LF ->
-	    ok;
-	_ ->
-	    {error,bad_chunkdata}
-    end.
-
-%%% ----------------------------------------------------------------------------
-%%% The body was "multipart/byteranges", decode it.
-%%% Example from RFC 2616, Appendix 19.2
-%%%    HTTP/1.1 206 Partial Content
-%%%    Date: Wed, 15 Nov 1995 06:25:24 GMT
-%%%    Last-Modified: Wed, 15 Nov 1995 04:58:08 GMT
-%%%    Content-type: multipart/byteranges; boundary=THIS_STRING_SEPARATES
-%%%
-%%%    --THIS_STRING_SEPARATES
-%%%    Content-type: application/pdf
-%%%    Content-range: bytes 500-999/8000
-%%%
-%%%    ...the first range...
-%%%    --THIS_STRING_SEPARATES
-%%%    Content-type: application/pdf
-%%%    Content-range: bytes 7000-7999/8000
-%%%
-%%%    ...the second range
-%%%    --THIS_STRING_SEPARATES--
-%%%
-%%%       Notes:
-%%%
-%%%       1) Additional CRLFs may precede the first boundary string in the
-%%%          entity.
-%%% FIXME!!
-read_client_multipartrange_body(Info,Parstr,Timeout) ->
-    Boundary=get_boundary(Parstr),
-    scan_boundary(Info,Boundary),
-    Info#response{body=read_multipart_body(Info,Boundary,Timeout)}.
-
-read_multipart_body(Info,Boundary,Timeout) ->
-    Info.
-
-%     Headers=read_headers_old(Info#response.scheme,Info#response.socket,Timeout),
-%     H=Info#response.headers,
-%     OtherHeaders=H#res_headers.other++TrailH,
-%     Info#response{headers=H#res_headers{other=OtherHeaders}}.
-
-
-scan_boundary(Info,Boundary) ->
-    Info.
-
-
-get_boundary(Parstr) ->
-    case skip_lwsp(Parstr) of
-	[] ->
-	    throw({error,missing_range_boundary_parameter});
-	Val ->
-	    get_boundary2(string:tokens(Val, ";"))
-    end.
-
-get_boundary2([]) ->
-    undefined;
-get_boundary2([Param|Rest]) ->
-    case string:tokens(skip_lwsp(Param), "=") of
-	["boundary"++Attribute,Value] ->
-	    Value;
-	_ ->
-	    get_boundary2(Rest)
-    end.
-
-
-%% skip space & tab
-skip_lwsp([$ | Cs]) -> skip_lwsp(Cs);
-skip_lwsp([$\t | Cs]) -> skip_lwsp(Cs);
-skip_lwsp(Cs) -> Cs.
-
-%%% ----------------------------------------------------------------------------
-
-%%% Read the incoming data from the open socket.
-read_more_data(http,Socket,Len,Timeout) ->
-    case gen_tcp:recv(Socket,Len,Timeout) of
-	{ok,Val} ->
-	    Val;
-	{error, timeout} ->
-	    throw({error, session_local_timeout});
-	{error, Reason} when Reason==closed;Reason==enotconn ->
-	    throw({error, session_remotely_closed});
-	{error, Reason} ->
-%	    httpd_response:send_status(Info,400,none),
-	    throw({error, Reason})
-    end;
-read_more_data(https,Socket,Len,Timeout) ->
-    case ssl:recv(Socket,Len,Timeout) of
-	{ok,Val} ->
-	    Val;
-	{error, etimedout} ->
-	    throw({error, session_local_timeout});
-	{error, Reason} when Reason==closed;Reason==enotconn ->
-	    throw({error, session_remotely_closed});
-	{error, Reason} ->
-%	    httpd_response:send_status(Info,400,none),
-	    throw({error, Reason})
-    end.
-
-
-%% =============================================================================
-%%% Socket handling
-
-accept(http,ListenSocket, Timeout) ->
-    gen_tcp:accept(ListenSocket, Timeout);
-accept(https,ListenSocket, Timeout) ->
-    ssl:accept(ListenSocket, Timeout).
-
-
-close(http,Socket) ->
-    gen_tcp:close(Socket);
-close(https,Socket) ->
-    ssl:close(Socket).
-
-
-connect(#request{scheme=http,settings=Settings,address=Addr}) ->
-    case proxyusage(Addr,Settings) of
-	{error,Reason} ->
-	    {error,Reason};
-	{Host,Port} ->
-	    Opts=[binary,{active,false},{reuseaddr,true}],    
-	    gen_tcp:connect(Host,Port,Opts)
-    end;
-connect(#request{scheme=https,settings=Settings,address=Addr}) ->
-    case proxyusage(Addr,Settings) of
-	{error,Reason} ->
-	    {error,Reason};
-	{Host,Port} ->
-	    Opts=case Settings#client_settings.ssl of
-		     false ->
-			 [binary,{active,false}];
-		     SSLSettings ->
-			 [binary,{active,false}]++SSLSettings
-		 end,
-	    ssl:connect(Host,Port,Opts)
-    end.
-
-
-%%% Check to see if the given {Host,Port} tuple is in the NoProxyList
-%%% Returns an eventually updated {Host,Port} tuple, with the proxy address
-proxyusage(HostPort,Settings) ->
-    case Settings#client_settings.useproxy of
-	true ->
-	    case noProxy(HostPort,Settings#client_settings.noproxylist) of
-		true ->
-		    HostPort;
-		_ ->
-		    case Settings#client_settings.proxy of
-			undefined ->
-			    {error,no_proxy_defined};
-			ProxyHostPort ->
-			    ProxyHostPort
-		    end
-	    end;
-	_ ->
-	    HostPort
-    end.
-
-noProxy(_HostPort,[]) ->
-    false;
-noProxy({Host,Port},[{Host,Port}|Rest]) ->
-    true;
-noProxy(HostPort,[_|Rest]) ->
-    noProxy(HostPort,Rest).
-
-
-controlling_process(http,Socket,Pid) ->
-    gen_tcp:controlling_process(Socket,Pid);
-controlling_process(https,Socket,Pid) ->
-    ssl:controlling_process(Socket,Pid).
-    
-
-deliver(SocketType, Socket, Message)  ->
-    case send(SocketType, Socket, Message) of
-	{error, einval} ->
-	    close(SocketType, Socket), 
-	    socket_closed;
-	{error, _Reason} ->
-%	    ?vlog("deliver(~p) failed for reason:"
-%		  "~n   Reason: ~p",[SocketType,_Reason]),
-	    close(SocketType, Socket), 
-	    socket_closed;
-	_Other ->
-	    ok
-    end.
-
-
-recv0(http,Socket,Timeout) ->
-    gen_tcp:recv(Socket,0,Timeout);
-recv0(https,Socket,Timeout) ->
-    ssl:recv(Socket,0,Timeout).
-
-recv(http,Socket,Len,Timeout) ->
-    gen_tcp:recv(Socket,Len,Timeout);
-recv(https,Socket,Len,Timeout) ->
-    ssl:recv(Socket,Len,Timeout).
-
-
-setopts(http,Socket,Options) ->
-    inet:setopts(Socket,Options);
-setopts(https,Socket,Options) ->
-    ssl:setopts(Socket,Options).
-
-
-send(http,Socket,Message) ->
-    gen_tcp:send(Socket,Message);
-send(https,Socket,Message) ->
-    ssl:send(Socket,Message).
-
-
-%%% ============================================================================
-%%% HTTP Server only
-
-%%% Returns the Authenticating data in the HTTP request
-get_auth_data("Basic "++EncodedString) ->
-    UnCodedString=httpd_util:decode_base64(EncodedString),
-    case catch string:tokens(UnCodedString,":") of
-	[User,PassWord] ->
-	    {User,PassWord};
-	{error,Error}->
-	    {error,Error}
-    end;
-get_auth_data(BadCredentials) when list(BadCredentials) ->
-    {error,BadCredentials};
-get_auth_data(_) ->
-    {error,nouser}.
-
-
-create_header_list(H) ->
-    lookup(connection,H#req_headers.connection)++
-	lookup(host,H#req_headers.host)++
-	lookup(content_length,H#req_headers.content_length)++
-	lookup(transfer_encoding,H#req_headers.transfer_encoding)++
-	lookup(authorization,H#req_headers.authorization)++
-	lookup(user_agent,H#req_headers.user_agent)++
-	lookup(user_agent,H#req_headers.range)++
-	lookup(user_agent,H#req_headers.if_range)++
-	lookup(user_agent,H#req_headers.if_match)++
-	lookup(user_agent,H#req_headers.if_none_match)++
-	lookup(user_agent,H#req_headers.if_modified_since)++
-	lookup(user_agent,H#req_headers.if_unmodified_since)++
-	H#req_headers.other.
-
-lookup(_Key,undefined) ->
-    [];
-lookup(Key,Val) ->
-    [{Key,Val}].
-
-
-
-%%% ============================================================================
-%%% This code is for parsing trailer headers in chunked messages.
-%%% Will be deprecated whenever I have found an alternative working solution!
-%%% Note:
-%%% - The header names are returned slighly different from what the what
-%%%   inet_drv returns
-read_headers_old(Scheme,Socket,Timeout) ->
-    read_headers_old(<<>>,Scheme,Socket,Timeout,[],[]).
-
-read_headers_old(<<>>,Scheme,Socket,Timeout,Acc,AccHdrs) ->
-    read_headers_old(read_more_data(Scheme,Socket,1,Timeout),
-		     Scheme,Socket,Timeout,Acc,AccHdrs);
-read_headers_old(<<$\r>>,Scheme,Socket,Timeout,Acc,AccHdrs) ->
-    read_headers_old(<<$\r,(read_more_data(Scheme,Socket,1,Timeout))/binary>>,
-		     Scheme,Socket,Timeout,Acc,AccHdrs);
-read_headers_old(<<$\r,$\n>>,Scheme,Socket,Timeout,Acc,AccHdrs) ->
-    if
-	Acc==[] -> % Done!
-            tagup_header(lists:reverse(AccHdrs));
-        true ->
-            read_headers_old(read_more_data(Scheme,Socket,1,Timeout),
-			     Scheme,Socket,
-			     Timeout,[],[lists:reverse(Acc)|AccHdrs])
-    end;
-read_headers_old(<<C>>,Scheme,Socket,Timeout,Acc,AccHdrs) ->
-    read_headers_old(read_more_data(Scheme,Socket,1,Timeout),
-		     Scheme,Socket,Timeout,[C|Acc],AccHdrs);
-read_headers_old(Bin,_Scheme,_Socket,_Timeout,_Acc,_AccHdrs) ->
-    io:format("ERROR: Unexpected data from inet driver: ~p",[Bin]),
-    throw({error,this_is_a_bug}).
-
-
-%% Parses the header of a HTTP request and returns a key,value tuple 
-%% list containing Name and Value of each header directive as of:
-%%
-%% Content-Type: multipart/mixed -> {"Content-Type", "multipart/mixed"}
-%%
-%% But in http/1.1 the field-names are case insencitive so now it must be 
-%% Content-Type: multipart/mixed -> {"content-type", "multipart/mixed"}
-%% The standard furthermore says that leading and traling white space 
-%% is not a part of the fieldvalue and shall therefore be removed.
-tagup_header([]) ->          [];
-tagup_header([Line|Rest]) -> [tag(Line, [])|tagup_header(Rest)].
-
-tag([], Tag) ->
-    {httpd_util:to_lower(lists:reverse(Tag)), ""};
-tag([$:|Rest], Tag) ->
-    {httpd_util:to_lower(lists:reverse(Tag)), httpd_util:strip(Rest)};
-tag([Chr|Rest], Tag) ->
-    tag(Rest, [Chr|Tag]).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpc_handler.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpc_handler.erl
deleted file mode 100644
index 5076a12aaa..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpc_handler.erl
+++ /dev/null
@@ -1,724 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Mobile Arts AB
-%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
-%% All Rights Reserved.''
-%% 
-%%
-
-%%% TODO:
-%%% - If an error is returned when sending a request, don't use this
-%%%   session anymore.
-%%% - Closing of sessions not properly implemented for some cases
-
-%%% File    : httpc_handler.erl
-%%% Author  : Johan Blom <[email protected]>
-%%% Description : Handles HTTP client responses, for a single TCP session
-%%% Created :  4 Mar 2002 by Johan Blom
-
--module(httpc_handler).
-
--include("http.hrl").
--include("jnets_httpd.hrl").
-
--export([init_connection/2,http_request/2]).
-
-%%% ==========================================================================
-%%% "Main" function in the spawned process for the session.
-init_connection(Req,Session) when record(Req,request) ->
-    case catch http_lib:connect(Req) of
-	{ok,Socket} ->
-	    case catch http_request(Req,Socket) of
-		ok ->
-		    case Session#session.clientclose of
-			true ->
-			    ok;
-			false ->
-			    httpc_manager:register_socket(Req#request.address,
-							  Session#session.id,
-							  Socket)
-		    end,
-		    next_response_with_request(Req,
-					       Session#session{socket=Socket});
-		{error,Reason} -> % Not possible to use new session
-		    gen_server:cast(Req#request.from,
-				    {Req#request.ref,Req#request.id,{error,Reason}}),
-		    exit_session_ok(Req#request.address,
-				    Session#session{socket=Socket})
-	    end;
-	{error,Reason} -> % Not possible to set up new session
-	    gen_server:cast(Req#request.from,
-			    {Req#request.ref,Req#request.id,{error,Reason}}),
-	    exit_session_ok2(Req#request.address,
-			     Session#session.clientclose,Session#session.id)
-    end.
-
-next_response_with_request(Req,Session) ->
-    Timeout=(Req#request.settings)#client_settings.timeout,
-    case catch read(Timeout,Session#session.scheme,Session#session.socket) of
-	{Status,Headers,Body} ->
-	    NewReq=handle_response({Status,Headers,Body},Timeout,Req,Session),
-	    next_response_with_request(NewReq,Session);
-	{error,Reason} ->
-	    gen_server:cast(Req#request.from,
-			    {Req#request.ref,Req#request.id,{error,Reason}}),
-	    exit_session(Req#request.address,Session,aborted_request);
-	{'EXIT',Reason} ->
-	    gen_server:cast(Req#request.from,
-			    {Req#request.ref,Req#request.id,{error,Reason}}),
-	    exit_session(Req#request.address,Session,aborted_request)
-    end.
-
-handle_response(Response,Timeout,Req,Session) ->
-    case http_response(Response,Req,Session) of
-	ok ->
-	    next_response(Timeout,Req#request.address,Session);
-	stop ->
-	    exit(normal);
-	{error,Reason} ->
-	    gen_server:cast(Req#request.from,
-			    {Req#request.ref,Req#request.id,{error,Reason}}),
-	    exit_session(Req#request.address,Session,aborted_request)
-    end.
-
-
-
-%%% Wait for the next respond until
-%%% - session is closed by the other side
-%%%      => set up a new a session, if there are pending requests in the que
-%%% - "Connection:close" header is received
-%%%      => close the connection (release socket) then
-%%%         set up a new a session, if there are pending requests in the que
-%%% 
-%%% Note:
-%%% - When invoked there are no pending responses on received requests.
-%%% - Never close the session explicitly, let it timeout instead!
-next_response(Timeout,Address,Session) ->
-    case httpc_manager:next_request(Address,Session#session.id) of
-	no_more_requests ->
-	    %% There are no more pending responses, now just wait for
-	    %% timeout or a new response.
-	    case catch read(Timeout,
-			    Session#session.scheme,Session#session.socket) of
-		{error,Reason} when Reason==session_remotely_closed;
-				    Reason==session_local_timeout ->
-		    exit_session_ok(Address,Session);
-		{error,Reason} ->
-		    exit_session(Address,Session,aborted_request);
-		{'EXIT',Reason} ->
-		    exit_session(Address,Session,aborted_request);
-		{Status2,Headers2,Body2} ->
-		    case httpc_manager:next_request(Address,
-						    Session#session.id) of
-			no_more_requests -> % Should not happen!
-			    exit_session(Address,Session,aborted_request);
-			{error,Reason} -> % Should not happen!
-			    exit_session(Address,Session,aborted_request);
-			NewReq ->
-			    handle_response({Status2,Headers2,Body2},
-					    Timeout,NewReq,Session)
-		    end
-	    end;
-	{error,Reason} -> % The connection has been closed by httpc_manager
-	    exit_session(Address,Session,aborted_request);
-	NewReq ->
-	    NewReq
-    end.
-
-%% ===========================================================================
-%% Internals
-
-%%% Read in and parse response data from the socket
-read(Timeout,SockType,Socket) ->
-    Info=#response{scheme=SockType,socket=Socket},
-    http_lib:setopts(SockType,Socket,[{packet, http}]),
-    Info1=read_response(SockType,Socket,Info,Timeout),
-    http_lib:setopts(SockType,Socket,[binary,{packet, raw}]),
-    case (Info1#response.headers)#res_headers.content_type of
-	"multipart/byteranges"++Param ->
-	    range_response_body(Info1,Timeout,Param);
-	_ ->
-	    #response{status=Status2,headers=Headers2,body=Body2}=
-		http_lib:read_client_body(Info1,Timeout),
-	    {Status2,Headers2,Body2}
-    end.
-
-
-%%% From RFC 2616:
-%%%      Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF
-%%%      HTTP-Version   = "HTTP" "/" 1*DIGIT "." 1*DIGIT
-%%%      Status-Code    = 3DIGIT
-%%%      Reason-Phrase  = *<TEXT, excluding CR, LF>
-read_response(SockType,Socket,Info,Timeout) ->
-    case http_lib:recv0(SockType,Socket,Timeout) of
-	{ok,{http_response,{1,VerMin}, Status, _Phrase}} when VerMin==0;
-							      VerMin==1 ->
-	    Info1=Info#response{status=Status,http_version=VerMin},
-	    http_lib:read_client_headers(Info1,Timeout);
-	{ok,{http_response,_Version, _Status, _Phrase}} ->
-	    throw({error,bad_status_line});
-    	{error, timeout} ->
-	    throw({error,session_local_timeout});
-	{error, Reason} when Reason==closed;Reason==enotconn ->
-	    throw({error,session_remotely_closed});
-	{error, Reason} ->
-	    throw({error,Reason})
-    end.
-
-%%% From RFC 2616, Section 4.4, Page 34
-%% 4.If the message uses the media type "multipart/byteranges", and the
-%%   transfer-length is not otherwise specified, then this self-
-%%   delimiting media type defines the transfer-length. This media type
-%%   MUST NOT be used unless the sender knows that the recipient can parse
-%%   it; the presence in a request of a Range header with multiple byte-
-%%   range specifiers from a 1.1 client implies that the client can parse
-%%   multipart/byteranges responses.
-%%% FIXME !!
-range_response_body(Info,Timeout,Param) ->
-    Headers=Info#response.headers,
-    case {Headers#res_headers.content_length,
-	  Headers#res_headers.transfer_encoding} of
-	{undefined,undefined} ->
-	    #response{status=Status2,headers=Headers2,body=Body2}=
-		http_lib:read_client_multipartrange_body(Info,Param,Timeout),
-	    {Status2,Headers2,Body2};
-	_ ->
-	    #response{status=Status2,headers=Headers2,body=Body2}=
-		http_lib:read_client_body(Info,Timeout),
-	    {Status2,Headers2,Body2}
-    end.
-    
-
-%%% ----------------------------------------------------------------------------
-%%% Host: field is required when addressing multi-homed sites ...
-%%% It must not be present when the request is being made to a proxy.
-http_request(#request{method=Method,id=Id,
-		      scheme=Scheme,address={Host,Port},pathquery=PathQuery,
-		      headers=Headers, content={ContentType,Body},
-		      settings=Settings},
-	     Socket) ->
-    PostData=
-	if
-	    Method==post;Method==put -> 
-		case Headers#req_headers.expect of
-		    "100-continue" ->
-			content_type_header(ContentType) ++
-			    content_length_header(length(Body)) ++ 
-			    "\r\n";
-		    _ ->
-			content_type_header(ContentType) ++
-			    content_length_header(length(Body)) ++ 
-			    "\r\n" ++ Body
-		end;
-	    true ->
-		"\r\n"
-	end,
-    Message=
-	case useProxy(Settings#client_settings.useproxy,
-		      {Scheme,Host,Port,PathQuery}) of
-	    false ->
-		method(Method)++" "++PathQuery++" HTTP/1.1\r\n"++
-		    host_header(Host)++te_header()++
-		    headers(Headers) ++ PostData;
-	    AbsURI ->
-		method(Method)++" "++AbsURI++" HTTP/1.1\r\n"++
-		    te_header()++
-		    headers(Headers)++PostData
-	end,
-    http_lib:send(Scheme,Socket,Message).
-
-useProxy(false,_) ->
-    false;
-useProxy(true,{Scheme,Host,Port,PathQuery}) ->
-    [atom_to_list(Scheme),"://",Host,":",integer_to_list(Port),PathQuery].
-
-
-
-headers(#req_headers{expect=Expect,
-		     other=Other}) ->
-    H1=case Expect of
-	   undefined ->[];
-	   _ -> "Expect: "++Expect++"\r\n"
-       end,
-    H1++headers_other(Other).
-
-
-headers_other([]) ->
-    [];
-headers_other([{Key,Value}|Rest]) when atom(Key) ->
-    Head = atom_to_list(Key)++": "++Value++"\r\n",
-    Head ++ headers_other(Rest);
-headers_other([{Key,Value}|Rest]) ->
-    Head = Key++": "++Value++"\r\n",
-    Head ++ headers_other(Rest).
-
-host_header(Host) ->
-    "Host: "++lists:concat([Host])++"\r\n".
-content_type_header(ContentType) ->
-    "Content-Type: " ++ ContentType ++ "\r\n".
-content_length_header(ContentLength) ->
-    "Content-Length: "++integer_to_list(ContentLength) ++ "\r\n".
-te_header() ->
-    "TE: \r\n".
-    
-method(Method) ->
-    httpd_util:to_upper(atom_to_list(Method)).
-
-
-%%% ----------------------------------------------------------------------------
-http_response({Status,Headers,Body},Req,Session) ->
-    case Status of
-	100 ->
-	    status_continue(Req,Session);
-	200 ->
-	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-					      {Status,Headers,Body}}),
-	    ServerClose=http_lib:connection_close(Headers),
-	    handle_connection(Session#session.clientclose,ServerClose,
-			      Req,Session);
-	300 -> status_multiple_choices(Headers,Body,Req,Session);
-	301 -> status_moved_permanently(Req#request.method,
-					Headers,Body,Req,Session);
-	302 -> status_found(Headers,Body,Req,Session);
-	303 -> status_see_other(Headers,Body,Req,Session);
-	304 -> status_not_modified(Headers,Body,Req,Session);
-	305 -> status_use_proxy(Headers,Body,Req,Session);
-	%% 306 This Status code is not used in HTTP 1.1
-	307 -> status_temporary_redirect(Headers,Body,Req,Session);
-	503 -> status_service_unavailable({Status,Headers,Body},Req,Session);
-	Status50x when Status50x==500;Status50x==501;Status50x==502;
-		       Status50x==504;Status50x==505 ->
-	    status_server_error_50x({Status,Headers,Body},Req,Session);
-	_ -> % FIXME May want to take some action on other Status codes as well
-	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-					      {Status,Headers,Body}}),
-	    ServerClose=http_lib:connection_close(Headers),
-	    handle_connection(Session#session.clientclose,ServerClose,
-			      Req,Session)
-    end.
-
-
-%%% Status code dependent functions.
-
-%%% Received a 100 Status code ("Continue")
-%%% From RFC2616
-%%% The client SHOULD continue with its request. This interim response is
-%%% used to inform the client that the initial part of the request has
-%%% been received and has not yet been rejected by the server. The client
-%%% SHOULD continue by sending the remainder of the request or, if the
-%%% request has already been completed, ignore this response. The server
-%%% MUST send a final response after the request has been completed. See
-%%% section 8.2.3 for detailed discussion of the use and handling of this
-%%% status code.
-status_continue(Req,Session) ->
-    {_,Body}=Req#request.content,
-    http_lib:send(Session#session.scheme,Session#session.socket,Body),
-    next_response_with_request(Req,Session).
-
-
-%%% Received a 300 Status code ("Multiple Choices")
-%%% The resource is located in any one of a set of locations
-%%% - If a 'Location' header is present (preserved server choice), use that
-%%%   to automatically redirect to the given URL
-%%% - else if the Content-Type/Body both are non-empty let the user agent make
-%%%   the choice and thus return a response with status 300
-%%% Note:
-%%% - If response to a HEAD request, the Content-Type/Body both should be empty.
-%%% - The behaviour on an empty Content-Type or Body is unspecified.
-%%%   However, e.g. "Apache/1.3" servers returns both empty if the header
-%%%   'if-modified-since: Date' was sent in the request and the content is
-%%%   "not modified" (instead of 304). Thus implicitly giving the cache as the
-%%%   only choice.
-status_multiple_choices(Headers,Body,Req,Session)
-  when ((Req#request.settings)#client_settings.autoredirect)==true ->
-    ServerClose=http_lib:connection_close(Headers),
-    case Headers#res_headers.location of
-	undefined ->
-	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-					      {300,Headers,Body}}),
-	    handle_connection(Session#session.clientclose,ServerClose,
-			      Req,Session);
-	RedirUrl ->
-	    Scheme=Session#session.scheme,
-	    case uri:parse(RedirUrl) of
-		{error,Reason} ->
-		    {error,Reason};
-		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
-		    NewReq=Req#request{redircount=Req#request.redircount+1,
-				       address={Host,Port},pathquery=PathQuery},
-		    handle_redirect(Session#session.clientclose,ServerClose,
-				    NewReq,Session)
-	    end
-    end;
-status_multiple_choices(Headers,Body,Req,Session) ->
-    ServerClose=http_lib:connection_close(Headers),
-    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-				      {300,Headers,Body}}),
-    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
-
-
-%%% Received a 301 Status code ("Moved Permanently")
-%%% The resource has been assigned a new permanent URI
-%%% - If a 'Location' header is present, use that to automatically redirect to
-%%%   the given URL if GET or HEAD request
-%%% - else return 
-%%% Note:
-%%% - The Body should contain a short hypertext note with a hyperlink to the
-%%%   new URI. Return this if Content-Type acceptable (some HTTP servers doesn't
-%%%   deal properly with Accept headers) 
-status_moved_permanently(Method,Headers,Body,Req,Session)
-  when (((Req#request.settings)#client_settings.autoredirect)==true) and
-       (Method==get) or (Method==head) ->
-    ServerClose=http_lib:connection_close(Headers),
-    case Headers#res_headers.location of
-	undefined ->
-	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-					      {301,Headers,Body}}),
-	    handle_connection(Session#session.clientclose,ServerClose,
-			      Req,Session);
-	RedirUrl ->
-	    Scheme=Session#session.scheme,
-	    case uri:parse(RedirUrl) of
-		{error,Reason} ->
-		    {error,Reason};
-		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
-		    NewReq=Req#request{redircount=Req#request.redircount+1,
-				       address={Host,Port},pathquery=PathQuery},
-		    handle_redirect(Session#session.clientclose,ServerClose,
-				    NewReq,Session)
-	    end
-    end;
-status_moved_permanently(_Method,Headers,Body,Req,Session) ->
-    ServerClose=http_lib:connection_close(Headers),
-    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-				      {301,Headers,Body}}),
-    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
-
-
-%%% Received a 302 Status code ("Found")
-%%% The requested resource resides temporarily under a different URI.
-%%% Note:
-%%% - Only cacheable if indicated by a Cache-Control or Expires header
-status_found(Headers,Body,Req,Session)
-  when ((Req#request.settings)#client_settings.autoredirect)==true ->
-    ServerClose=http_lib:connection_close(Headers),
-    case Headers#res_headers.location of
-	undefined ->
-	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-					      {302,Headers,Body}}),
-	    handle_connection(Session#session.clientclose,ServerClose,
-			      Req,Session);
-	RedirUrl ->
-	    Scheme=Session#session.scheme,
-	    case uri:parse(RedirUrl) of
-		{error,Reason} ->
-		    {error,Reason};
-		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
-		    NewReq=Req#request{redircount=Req#request.redircount+1,
-				       address={Host,Port},pathquery=PathQuery},
-		    handle_redirect(Session#session.clientclose,ServerClose,
-				    NewReq,Session)
-	    end
-    end;
-status_found(Headers,Body,Req,Session) ->
-    ServerClose=http_lib:connection_close(Headers),
-    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-				      {302,Headers,Body}}),
-    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
-
-%%% Received a 303 Status code ("See Other")
-%%% The request found under a different URI and should be retrieved using GET
-%%% Note:
-%%% - Must not be cached
-status_see_other(Headers,Body,Req,Session)
-  when ((Req#request.settings)#client_settings.autoredirect)==true ->
-    ServerClose=http_lib:connection_close(Headers),
-    case Headers#res_headers.location of
-	undefined ->
-	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-					      {303,Headers,Body}}),
-	    handle_connection(Session#session.clientclose,ServerClose,
-			      Req,Session);
-	RedirUrl ->
-	    Scheme=Session#session.scheme,
-	    case uri:parse(RedirUrl) of
-		{error,Reason} ->
-		    {error,Reason};
-		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
-		    NewReq=Req#request{redircount=Req#request.redircount+1,
-				       method=get,
-				       address={Host,Port},pathquery=PathQuery},
-		    handle_redirect(Session#session.clientclose,ServerClose,
-				    NewReq,Session)
-	    end
-    end;
-status_see_other(Headers,Body,Req,Session) ->
-    ServerClose=http_lib:connection_close(Headers),
-    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-				      {303,Headers,Body}}),
-    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
-
-
-%%% Received a 304 Status code ("Not Modified")
-%%% Note:
-%%% - The response MUST NOT contain a body.
-%%% - The response MUST include the following header fields:
-%%%   - Date, unless its omission is required
-%%%   - ETag and/or Content-Location, if the header would have been sent
-%%%        in a 200 response to the same request
-%%%   - Expires, Cache-Control, and/or Vary, if the field-value might
-%%%        differ from that sent in any previous response for the same
-%%%        variant
-status_not_modified(Headers,Body,Req,Session)
-  when ((Req#request.settings)#client_settings.autoredirect)==true ->
-    ServerClose=http_lib:connection_close(Headers),
-    case Headers#res_headers.location of
-	undefined ->
-	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-					      {304,Headers,Body}}),
-	    handle_connection(Session#session.clientclose,ServerClose,
-			      Req,Session);
-	RedirUrl ->
-	    Scheme=Session#session.scheme,
-	    case uri:parse(RedirUrl) of
-		{error,Reason} ->
-		    {error,Reason};
-		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
-		    NewReq=Req#request{redircount=Req#request.redircount+1,
-				       address={Host,Port},pathquery=PathQuery},
-		    handle_redirect(Session#session.clientclose,ServerClose,
-				    NewReq,Session)
-	    end
-    end;
-status_not_modified(Headers,Body,Req,Session) ->
-    ServerClose=http_lib:connection_close(Headers),
-    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-				      {304,Headers,Body}}),
-    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
-
-
-
-%%% Received a 305 Status code ("Use Proxy")
-%%% The requested resource MUST be accessed through the proxy given by the
-%%% Location field
-status_use_proxy(Headers,Body,Req,Session)
-  when ((Req#request.settings)#client_settings.autoredirect)==true ->
-    ServerClose=http_lib:connection_close(Headers),
-    case Headers#res_headers.location of
-	undefined ->
-	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-					      {305,Headers,Body}}),
-	    handle_connection(Session#session.clientclose,ServerClose,
-			      Req,Session);
-	RedirUrl ->
-	    Scheme=Session#session.scheme,
-	    case uri:parse(RedirUrl) of
-		{error,Reason} ->
-		    {error,Reason};
-		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
-		    NewReq=Req#request{redircount=Req#request.redircount+1,
-				       address={Host,Port},pathquery=PathQuery},
-		    handle_redirect(Session#session.clientclose,ServerClose,
-				    NewReq,Session)
-	    end
-    end;
-status_use_proxy(Headers,Body,Req,Session) ->
-    ServerClose=http_lib:connection_close(Headers),
-    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-				      {305,Headers,Body}}),
-    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
-
-
-%%% Received a 307 Status code ("Temporary Redirect")
-status_temporary_redirect(Headers,Body,Req,Session)
-  when ((Req#request.settings)#client_settings.autoredirect)==true ->
-    ServerClose=http_lib:connection_close(Headers),
-    case Headers#res_headers.location of
-	undefined ->
-	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-					      {307,Headers,Body}}),
-	    handle_connection(Session#session.clientclose,ServerClose,
-			      Req,Session);
-	RedirUrl ->
-	    Scheme=Session#session.scheme,
-	    case uri:parse(RedirUrl) of
-		{error,Reason} ->
-		    {error,Reason};
-		{Scheme,Host,Port,PathQuery} -> % Automatic redirection
-		    NewReq=Req#request{redircount=Req#request.redircount+1,
-				       address={Host,Port},pathquery=PathQuery},
-		    handle_redirect(Session#session.clientclose,ServerClose,
-				    NewReq,Session)
-	    end
-    end;
-status_temporary_redirect(Headers,Body,Req,Session) ->
-    ServerClose=http_lib:connection_close(Headers),
-    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-				      {307,Headers,Body}}),
-    handle_connection(Session#session.clientclose,ServerClose,Req,Session).
-
-
-
-%%% Received a 503 Status code ("Service Unavailable")
-%%%    The server is currently unable to handle the request due to a
-%%%    temporary overloading or maintenance of the server. The implication
-%%%    is that this is a temporary condition which will be alleviated after
-%%%    some delay. If known, the length of the delay MAY be indicated in a
-%%%    Retry-After header. If no Retry-After is given, the client SHOULD
-%%%    handle the response as it would for a 500 response.
-%% Note:
-%% - This session is now considered busy, thus cancel any requests in the
-%%   pipeline and close the session.
-%% FIXME! Implement a user option to automatically retry if the 'Retry-After'
-%%        header is given.
-status_service_unavailable(Resp,Req,Session) ->
-%    RetryAfter=Headers#res_headers.retry_after,    
-    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,Resp}),
-    close_session(server_connection_close,Req,Session).    
-
-
-%%% Received a 50x Status code (~ "Service Error")
-%%%   Response status codes beginning with the digit "5" indicate cases in
-%%%   which the server is aware that it has erred or is incapable of
-%%%   performing the request.
-status_server_error_50x(Resp,Req,Session) ->
-    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,Resp}),
-    close_session(server_connection_close,Req,Session).    
-    
-
-%%% Handles requests for redirects
-%%% The redirected request might be:
-%%% - FIXME! on another TCP session, another scheme
-%%% - on the same TCP session, same scheme
-%%% - on another TCP session , same scheme
-%%% However, in all cases treat it as a new request, with redircount updated.
-%%%
-%%% The redirect may fail, but this not a reason to close this session.
-%%% Instead return a error for this request, and continue as ok.
-handle_redirect(ClientClose,ServerClose,Req,Session) ->
-    case httpc_manager:request(Req) of
-	{ok,_ReqId} -> % FIXME Should I perhaps reuse the Reqid?
-	    handle_connection(ClientClose,ServerClose,Req,Session);
-	{error,Reason} ->
-	    gen_server:cast(Req#request.from,{Req#request.ref,Req#request.id,
-					      {error,Reason}}),
-	    handle_connection(ClientClose,ServerClose,Req,Session)
-    end.
-
-%%% Check if the persistent connection flag is false (ie client request
-%%% non-persistive connection), or if the server requires a closed connection
-%%% (by sending a "Connection: close" header). If the connection required
-%%% non-persistent, we may close the connection immediately.
-handle_connection(ClientClose,ServerClose,Req,Session) ->
-    case {ClientClose,ServerClose} of
-	{false,false} ->
-	    ok;
-	{false,true} -> % The server requests this session to be closed.
-	    close_session(server_connection_close,Req,Session);
-	{true,_} -> % The client requested a non-persistent connection
-	    close_session(client_connection_close,Req,Session)
-    end.
-
-
-%%% Close the session.
-%%% We now have three cases:
-%%% - Client request a non-persistent connection when initiating the request.
-%%%   Session info not stored in httpc_manager
-%%% - Server requests a non-persistent connection when answering a request.
-%%%   No need to resend request, but there might be a pipeline.
-%%% - Some kind of error
-%%%   Close the session, we may then try resending all requests in the pipeline
-%%%   including the current depending on the error.
-%%% FIXME! Should not always abort the session (see close_session in
-%%%     httpc_manager for more details)
-close_session(client_connection_close,_Req,Session) ->
-    http_lib:close(Session#session.scheme,Session#session.socket),
-    stop;
-close_session(server_connection_close,Req,Session) ->
-    http_lib:close(Session#session.scheme,Session#session.socket),
-    httpc_manager:abort_session(Req#request.address,Session#session.id,
-			       aborted_request),
-    stop.
-
-exit_session(Address,Session,Reason) ->
-    http_lib:close(Session#session.scheme,Session#session.socket),
-    httpc_manager:abort_session(Address,Session#session.id,Reason),
-    exit(normal).
-
-%%% This is the "normal" case to close a persistent connection. I.e., there are
-%%% no more requests waiting and the session was closed by the client, or
-%%% server because of a timeout or user request.
-exit_session_ok(Address,Session) ->
-    http_lib:close(Session#session.scheme,Session#session.socket),
-    exit_session_ok2(Address,Session#session.clientclose,Session#session.id).
-
-exit_session_ok2(Address,ClientClose,Sid) ->
-    case ClientClose of
-	false ->
-	    httpc_manager:close_session(Address,Sid);
-	true ->
-	    ok
-    end,
-    exit(normal).
-
-%%% ============================================================================
-%%% This is deprecated code, to be removed
-
-format_time() ->
-    {_,_,MicroSecs}=TS=now(),
-    {{Y,Mon,D},{H,M,S}}=calendar:now_to_universal_time(TS),
-    lists:flatten(io_lib:format("~4.4.0w-~2.2.0w-~2.2.0w,~2.2.0w:~2.2.0w:~6.3.0f",
-				[Y,Mon,D,H,M,S+(MicroSecs/1000000)])).
-
-%%% Read more data from the open socket.
-%%% Two different read functions is used because for the {active, once} socket
-%%% option is (currently) not available for SSL... 
-%%% FIXME 
-% read_more_data(http,Socket,Timeout) ->
-%     io:format("read_more_data(ip_comm) -> "
-% 	"~n   set active = 'once' and "
-% 	"await a chunk data", []),
-%     http_lib:setopts(Socket, [{active,once}]),
-%     read_more_data_ipcomm(Socket,Timeout);
-% read_more_data(https,Socket,Timeout) ->
-%     case ssl:recv(Socket,0,Timeout) of
-% 	{ok,MoreData} ->
-% 	    MoreData;
-% 	{error,closed} ->
-% 	    throw({error, session_remotely_closed});
-% 	{error,etimedout} ->
-% 	    throw({error, session_local_timeout});
-% 	{error,Reason} ->
-% 	    throw({error, Reason});
-% 	Other ->
-% 	    throw({error, Other})
-%     end.
-
-% %%% Send any incoming requests on the open session immediately
-% read_more_data_ipcomm(Socket,Timeout) ->
-%     receive
-% 	{tcp,Socket,MoreData} ->
-% %	    ?vtrace("read_more_data(ip_comm) -> got some data:~p",
-% %		[MoreData]),
-% 	    MoreData;
-% 	{tcp_closed,Socket} ->
-% %	    ?vtrace("read_more_data(ip_comm) -> socket closed",[]),
-% 	    throw({error,session_remotely_closed});
-% 	{tcp_error,Socket,Reason} ->
-% %	    ?vtrace("read_more_data(ip_comm) -> ~p socket error: ~p",
-% %		[self(),Reason]),
-% 	    throw({error, Reason});
-% 	stop ->
-% 	    throw({error, user_req})
-%     after Timeout ->
-% 	    throw({error, session_local_timeout})
-%     end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpc_manager.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpc_manager.erl
deleted file mode 100644
index 4659749270..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpc_manager.erl
+++ /dev/null
@@ -1,542 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Mobile Arts AB
-%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
-%% All Rights Reserved.''
-%% 
-%%
-%% Created : 18 Dec 2001 by Johan Blom <[email protected]>
-%%
-
--module(httpc_manager).
-
--behaviour(gen_server).
-
--include("http.hrl").
-
--define(HMACALL, ?MODULE).
--define(HMANAME, ?MODULE).
-
-%%--------------------------------------------------------------------
-%% External exports
--export([start_link/0,start/0,
-	 request/1,cancel_request/1,
-	 next_request/2,
-	 register_socket/3,
-	 abort_session/3,close_session/2,close_session/3
-	]).
-
-%% Debugging only
--export([status/0]).
-
-%% gen_server callbacks
--export([init/1,handle_call/3,handle_cast/2,handle_info/2,terminate/2,
-	 code_change/3]).
-
-%%% address_db - ets() Contains mappings from a tuple {Host,Port} to a tuple
-%%%  {LastSID,OpenSessions,ets()} where
-%%%      LastSid is the last allocated session id,
-%%%      OpenSessions is the number of currently open sessions and
-%%%      ets() contains mappings from Session Id to #session{}.
-%%%
-%%% Note:
-%%% - Only persistent connections are stored in address_db
-%%% - When automatically redirecting, multiple requests are performed.
--record(state,{
-	  address_db,   % ets()
-	  reqid         % int() Next Request id to use (identifies request).
-	 }).
-
-%%====================================================================
-%% External functions
-%%====================================================================
-%%--------------------------------------------------------------------
-%% Function: start_link/0
-%% Description: Starts the server
-%%--------------------------------------------------------------------
-start() ->
-    ensure_started().
-
-start_link() ->
-    gen_server:start_link({local,?HMACALL}, ?HMANAME, [], []).
-
-
-%% Find available session process and store in address_db. If no
-%% available, start new handler process.
-request(Req) ->
-    ensure_started(),
-    ClientClose=http_lib:connection_close(Req#request.headers),
-    gen_server:call(?HMACALL,{request,ClientClose,Req},infinity).
-
-cancel_request(ReqId) ->
-    gen_server:call(?HMACALL,{cancel_request,ReqId},infinity).
-
-
-%%% Close Session
-close_session(Addr,Sid) ->
-    gen_server:call(?HMACALL,{close_session,Addr,Sid},infinity).
-close_session(Req,Addr,Sid) ->
-    gen_server:call(?HMACALL,{close_session,Req,Addr,Sid},infinity).
-
-abort_session(Addr,Sid,Msg) ->
-    gen_server:call(?HMACALL,{abort_session,Addr,Sid,Msg},infinity).
-
-
-%%%  Pick next in request que
-next_request(Addr,Sid) ->
-    gen_server:call(?HMACALL,{next_request,Addr,Sid},infinity).
-
-%%% Session handler has succeded to set up a new session, now register
-%%% the socket
-register_socket(Addr,Sid,Socket) ->
-    gen_server:cast(?HMACALL,{register_socket,Addr,Sid,Socket}).
-    
-
-%%% Debugging
-status() ->
-    gen_server:cast(?HMACALL,status).
-    
-
-%%--------------------------------------------------------------------
-%% Function: init/1
-%% Description: Initiates the server
-%% Returns: {ok, State}          |
-%%          {ok, State, Timeout} |
-%%          ignore               |
-%%          {stop, Reason}
-%%--------------------------------------------------------------------
-init([]) ->
-    process_flag(trap_exit, true),
-    {ok,#state{address_db=ets:new(address_db,[private]),
-	       reqid=0}}.
-
-
-%%--------------------------------------------------------------------
-%% Function: handle_call/3
-%% Description: Handling call messages
-%% Returns: {reply, Reply, State}          |
-%%          {reply, Reply, State, Timeout} |
-%%          {noreply, State}               |
-%%          {noreply, State, Timeout}      |
-%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%--------------------------------------------------------------------
-%%% Note:
-%%% - We may have multiple non-persistent connections, each will be handled in
-%%%   separate processes, thus don't add such connections to address_db
-handle_call({request,false,Req},_From,State) ->
-    case ets:lookup(State#state.address_db,Req#request.address) of
-	[] ->
-	    STab=ets:new(session_db,[private,{keypos,2},set]),
-	    case persistent_new_session_request(0,Req,STab,State) of
-		{Reply,LastSid,State2} ->
-		    ets:insert(State2#state.address_db,
-			       {Req#request.address,{LastSid,1,STab}}),
-		    {reply,Reply,State2};
-		{ErrorReply,State2} ->
-		    {reply,ErrorReply,State2}
-	    end;
-	[{_,{LastSid,OpenS,STab}}] ->
-	    case lookup_session_entry(STab) of
-		{ok,Session} ->
- 		    old_session_request(Session,Req,STab,State);
-		need_new_session when OpenS<(Req#request.settings)#client_settings.max_sessions ->
-		    case persistent_new_session_request(LastSid,Req,
-							STab,State) of 
-			{Reply,LastSid2,State2} ->
-			    ets:insert(State2#state.address_db,
-				       {Req#request.address,
-					{LastSid2,OpenS+1,STab}}),
-			    {reply,Reply,State2};
-			{ErrorReply,State2} ->
-			    {reply,ErrorReply,State2}
-		    end;
-		need_new_session ->
-		    {reply,{error,too_many_sessions},State}
-	    end
-    end;
-handle_call({request,true,Req},_From,State) ->
-    {Reply,State2}=not_persistent_new_session_request(Req,State),
-    {reply,Reply,State2};
-handle_call({cancel_request,true,_ReqId},_From,State) ->
-%% FIXME Should be possible to scan through all requests made, but perhaps
-%% better to give some more hints (such as Addr etc)
-    Reply=ok,
-    {reply,Reply,State};
-handle_call({next_request,Addr,Sid},_From,State) ->
-    case ets:lookup(State#state.address_db,Addr) of
-	[] ->
-	    {reply,{error,no_connection},State};
-	[{_,{_,_,STab}}] ->
-	    case ets:lookup(STab,Sid) of
-		[] ->
-		    {reply,{error,session_not_registered},State};
-		[S=#session{pipeline=[],quelength=QueLen}] ->
-		    if
-			QueLen==1 ->
-			    ets:insert(STab,S#session{quelength=0});
-			true ->
-			    ok
-		    end,			    
-		    {reply,no_more_requests,State};
-		[S=#session{pipeline=Que}] ->
-		    [Req|RevQue]=lists:reverse(Que),
-		    ets:insert(STab,S#session{pipeline=lists:reverse(RevQue),
-					      quelength=S#session.quelength-1}),
-		    {reply,Req,State}
-	    end
-    end;
-handle_call({close_session,Addr,Sid},_From,State) ->
-    case ets:lookup(State#state.address_db,Addr) of
-	[] ->
-	    {reply,{error,no_connection},State};
-	[{_,{LastSid,OpenS,STab}}] ->
-	    case ets:lookup(STab,Sid) of
-		[#session{pipeline=Que}] ->
-		    R=handle_close_session(lists:reverse(Que),STab,Sid,State),
-		    ets:insert(State#state.address_db,
-			       {Addr,{LastSid,OpenS-1,STab}}),
-		    {reply,R,State};
-		[] ->
-		    {reply,{error,session_not_registered},State}
-	    end
-    end;
-handle_call({close_session,Req,Addr,Sid},_From,State) ->
-    case ets:lookup(State#state.address_db,Addr) of
-	[] ->
-	    {reply,{error,no_connection},State};
-	[{_,{LastSid,OpenS,STab}}] ->
-	    case ets:lookup(STab,Sid) of
-		[#session{pipeline=Que}] ->
-		    R=handle_close_session([Req|lists:reverse(Que)],
-					   STab,Sid,State),
-		    ets:insert(State#state.address_db,
-			       {Addr,{LastSid,OpenS-1,STab}}),
-		    {reply,R,State};
-		[] ->
-		    {reply,{error,session_not_registered},State}
-	    end
-    end;
-handle_call({abort_session,Addr,Sid,Msg},_From,State) ->
-    case ets:lookup(State#state.address_db,Addr) of
-	[] ->
-	    {reply,{error,no_connection},State};
-	[{_,{LastSid,OpenS,STab}}] ->
-	    case ets:lookup(STab,Sid) of
-		[#session{pipeline=Que}] ->
-		    R=abort_request_que(Que,{error,Msg}),
-		    ets:delete(STab,Sid),
-		    ets:insert(State#state.address_db,
-			       {Addr,{LastSid,OpenS-1,STab}}),
-		    {reply,R,State};
-		[] ->
-		    {reply,{error,session_not_registered},State}
-	    end
-    end.
-
-
-%%--------------------------------------------------------------------
-%% Function: handle_cast/2
-%% Description: Handling cast messages
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%--------------------------------------------------------------------
-handle_cast(status, State) ->
-    io:format("Status:~n"),
-    print_all(lists:sort(ets:tab2list(State#state.address_db))),
-    {noreply, State};
-handle_cast({register_socket,Addr,Sid,Socket},State) ->
-    case ets:lookup(State#state.address_db,Addr) of
-	[] ->
-	    {noreply,State};
-	[{_,{_,_,STab}}] ->
-	    case ets:lookup(STab,Sid) of
-		[Session] ->
-		    ets:insert(STab,Session#session{socket=Socket}),
-		    {noreply,State};
-		[] ->
-		    {noreply,State}
-	    end
-    end.
-
-print_all([]) ->
-    ok;
-print_all([{Addr,{LastSid,OpenSessions,STab}}|Rest]) ->
-    io:format(" Address:~p LastSid=~p OpenSessions=~p~n",[Addr,LastSid,OpenSessions]),
-    SortedList=lists:sort(fun(A,B) ->
-				  if
-				      A#session.id<B#session.id ->
-					  true;
-				      true ->
-					  false
-				  end
-			  end,ets:tab2list(STab)),
-    print_all2(SortedList),
-    print_all(Rest).
-
-print_all2([]) ->
-    ok;
-print_all2([Session|Rest]) ->
-    io:format("   Session:~p~n",[Session#session.id]),
-    io:format("     Client close:~p~n",[Session#session.clientclose]),
-    io:format("     Socket:~p~n",[Session#session.socket]),
-    io:format("     Pipe: length=~p Que=~p~n",[Session#session.quelength,Session#session.pipeline]),
-    print_all2(Rest).
-
-%%--------------------------------------------------------------------
-%% Function: handle_info/2
-%% Description: Handling all non call/cast messages
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%--------------------------------------------------------------------
-handle_info({'EXIT',_Pid,normal}, State) ->
-    {noreply, State};
-handle_info(Info, State) ->
-    io:format("ERROR httpc_manager:handle_info ~p~n",[Info]),
-    {noreply, State}.
-
-%%--------------------------------------------------------------------
-%% Function: terminate/2
-%% Description: Shutdown the server
-%% Returns: any (ignored by gen_server)
-%%--------------------------------------------------------------------
-terminate(_Reason, State) ->
-    ets:delete(State#state.address_db).
-
-%%--------------------------------------------------------------------
-%% Func: code_change/3
-%% Purpose: Convert process state when code is changed
-%% Returns: {ok, NewState}
-%%--------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-
-%%% From RFC 2616, Section 8.1.4
-%%%   A client, server, or proxy MAY close the transport connection at any
-%%%   time. For example, a client might have started to send a new request
-%%%   at the same time that the server has decided to close the "idle"
-%%%   connection. From the server's point of view, the connection is being
-%%%   closed while it was idle, but from the client's point of view, a
-%%%   request is in progress.
-%%%
-%%%   This means that clients, servers, and proxies MUST be able to recover
-%%%   from asynchronous close events. Client software SHOULD reopen the
-%%%   transport connection and retransmit the aborted sequence of requests
-%%%   without user interaction so long as the request sequence is
-%%%   idempotent (see section 9.1.2). Non-idempotent methods or sequences
-%%%
-%%% FIXME
-%%% Note: 
-%%% - If this happen (server close because of idle) there can't be any requests
-%%%   in the que.
-%%% - This is the main function for closing of sessions
-handle_close_session([],STab,Sid,_State) ->
-    ets:delete(STab,Sid);
-handle_close_session(Que,STab,Sid,_State) ->
-    ets:delete(STab,Sid),
-    abort_request_que(Que,{error,aborted_request}).
-
-
-%%% From RFC 2616, Section 8.1.2.2
-%%%   Clients which assume persistent connections and pipeline immediately
-%%%   after connection establishment SHOULD be prepared to retry their
-%%%   connection if the first pipelined attempt fails. If a client does
-%%%   such a retry, it MUST NOT pipeline before it knows the connection is
-%%%   persistent. Clients MUST also be prepared to resend their requests if
-%%%   the server closes the connection before sending all of the
-%%%   corresponding responses.
-%%% FIXME! I'm currently not checking if tis is the first attempt on the session
-%%% FIXME! Pipeline size must be dynamically variable (e.g. 0 if resend, 2 else)
-%%% The que contains requests that have been sent ok previously, but the session
-%%% was closed prematurely when reading the response.
-%%% Try setup a new session and resend these requests.
-%%% Note:
-%%% - This MUST be a persistent session
-% handle_closed_pipelined_session_que([],_State) ->
-%     ok;
-% handle_closed_pipelined_session_que(_Que,_State) ->
-%     ok.
-
-
-%%% From RFC 2616, Section 8.2.4
-%%%   If an HTTP/1.1 client sends a request which includes a request body,
-%%%   but which does not include an Expect request-header field with the
-%%%   "100-continue" expectation, and if the client is not directly
-%%%   connected to an HTTP/1.1 origin server, and if the client sees the
-%%%   connection close before receiving any status from the server, the
-%%%   client SHOULD retry the request.  If the client does retry this
-%%%   request, it MAY use the following "binary exponential backoff"
-%%%   algorithm to be assured of obtaining a reliable response:
-%%%   ...
-%%% FIXME! I'm currently not checking if a "Expect: 100-continue" has been sent.
-% handle_remotely_closed_session_que([],_State) ->
-%     ok;
-% handle_remotely_closed_session_que(_Que,_State) ->
-% %    resend_que(Que,Socket),
-%     ok.
-
-%%% Resend all requests in the request que
-% resend_que([],_) ->
-%     ok;
-% resend_que([Req|Que],Socket) ->
-%     case catch httpc_handler:http_request(Req,Socket) of
-% 	ok ->
-% 	    resend_que(Que,Socket);
-% 	{error,Reason} ->
-% 	    {error,Reason}
-%     end.
-
-
-%%% From RFC 2616,
-%%% Section 8.1.2.2:
-%%%   Clients SHOULD NOT pipeline requests using non-idempotent methods or
-%%%   non-idempotent sequences of methods (see section 9.1.2). Otherwise, a
-%%%   premature termination of the transport connection could lead to
-%%%   indeterminate results. A client wishing to send a non-idempotent
-%%%   request SHOULD wait to send that request until it has received the
-%%%   response status for the previous request.
-%%% Section 9.1.2:
-%%%   Methods can also have the property of "idempotence" in that (aside
-%%%   from error or expiration issues) the side-effects of N > 0 identical
-%%%   requests is the same as for a single request. The methods GET, HEAD,
-%%%   PUT and DELETE share this property. Also, the methods OPTIONS and
-%%%   TRACE SHOULD NOT have side effects, and so are inherently idempotent.
-%%%
-%%% Note that POST and CONNECT are idempotent methods.
-%%%
-%%% Tries to find an open, free session i STab. Such a session has quelength
-%%% less than ?MAX_PIPELINE_LENGTH
-%%% Don't care about non-standard, user defined methods.
-%%%
-%%% Returns {ok,Session} or need_new_session where
-%%%  Session is the session that may be used
-lookup_session_entry(STab) ->
-    MS=[{#session{quelength='$1',max_quelength='$2',
-		  id='_',clientclose='_',socket='$3',scheme='_',pipeline='_'},
-	 [{'<','$1','$2'},{is_port,'$3'}],
-	 ['$_']}],
-    case ets:select(STab,MS) of
-	[] ->
-	    need_new_session;
-	SessionList -> % Now check if any of these has an empty pipeline.
-	    case lists:keysearch(0,2,SessionList) of
-		{value,Session} ->
-		    {ok,Session};
-		false ->
-		    {ok,hd(SessionList)}
-	    end
-    end.
-
-
-%%% Returns a tuple {Reply,State} where
-%%%  Reply is the response sent back to the application
-%%%
-%%% Note:
-%%% - An {error,einval} from a send should sometimes rather be {error,closed}
-%%% - Don't close the session from here, let httpc_handler take care of that.
-%old_session_request(Session,Req,STab,State)
-%  when (Req#request.settings)#client_settings.max_quelength==0 ->
-%    Session1=Session#session{pipeline=[Req]},
-%    ets:insert(STab,Session1),
-%    {reply,{ok,ReqId},State#state{reqid=ReqId+1}};
-old_session_request(Session,Req,STab,State) ->
-    ReqId=State#state.reqid,
-    Req1=Req#request{id=ReqId},
-    case catch httpc_handler:http_request(Req1,Session#session.socket) of
-	ok ->
-	    Session1=Session#session{pipeline=[Req1|Session#session.pipeline],
-				     quelength=Session#session.quelength+1},
-	    ets:insert(STab,Session1),
-	    {reply,{ok,ReqId},State#state{reqid=ReqId+1}};
-	{error,Reason} -> 
-	    ets:insert(STab,Session#session{socket=undefined}),
-%	    http_lib:close(Session#session.sockettype,Session#session.socket),
-	    {reply,{error,Reason},State#state{reqid=ReqId+1}}
-    end.
-
-%%% Returns atuple {Reply,Sid,State} where
-%%%  Reply is the response sent back to the application, and
-%%%  Sid is the last used Session Id
-persistent_new_session_request(Sid,Req,STab,State) ->
-    ReqId=State#state.reqid,
-    case setup_new_session(Req#request{id=ReqId},false,Sid) of
-	{error,Reason} ->
-	    {{error,Reason},State#state{reqid=ReqId+1}};
-	{NewSid,Session} ->
-	    ets:insert(STab,Session),
-	    {{ok,ReqId},NewSid,State#state{reqid=ReqId+1}}
-    end.
-
-%%% Returns a tuple {Reply,State} where
-%%%  Reply is the response sent back to the application
-not_persistent_new_session_request(Req,State) ->
-    ReqId=State#state.reqid,
-    case setup_new_session(Req#request{id=ReqId},true,undefined) of
-	{error,Reason} ->
-	    {{error,Reason},State#state{reqid=ReqId+1}};
-	ok ->
-	    {{ok,ReqId},State#state{reqid=ReqId+1}}
-    end.
-
-%%% As there are no sessions available, setup a new session and send the request
-%%% on it.
-setup_new_session(Req,ClientClose,Sid) ->
-    S=#session{id=Sid,clientclose=ClientClose,
-	       scheme=Req#request.scheme,
-	       max_quelength=(Req#request.settings)#client_settings.max_quelength},
-    spawn_link(httpc_handler,init_connection,[Req,S]),
-    case ClientClose of
-	false ->
-	    {Sid+1,S};
-	true ->
-	    ok
-    end.
-
-
-%%% ----------------------------------------------------------------------------
-%%% Abort all requests in the request que.
-abort_request_que([],_Msg) ->
-    ok;
-abort_request_que([#request{from=From,ref=Ref,id=Id}|Que],Msg) ->
-    gen_server:cast(From,{Ref,Id,Msg}),
-    abort_request_que(Que,Msg);
-abort_request_que(#request{from=From,ref=Ref,id=Id},Msg) ->
-    gen_server:cast(From,{Ref,Id,Msg}).
-
-
-%%% --------------------------------
-%            C={httpc_manager,{?MODULE,start_link,[]},permanent,1000,
-%	       worker,[?MODULE]},
-%            supervisor:start_child(inets_sup, C),
-ensure_started() ->
-    case whereis(?HMANAME) of
-        undefined -> 
-	    start_link();
-        _ ->
-	    ok
-    end.
-
-
-%%% ============================================================================
-%%% This is deprecated code, to be removed
-
-% format_time() ->
-%     {_,_,MicroSecs}=TS=now(),
-%     {{Y,Mon,D},{H,M,S}}=calendar:now_to_universal_time(TS),
-%     lists:flatten(io_lib:format("~4.4.0w-~2.2.0w-~2.2.0w,~2.2.0w:~2.2.0w:~6.3.0f",
-% 				[Y,Mon,D,H,M,S+(MicroSecs/1000000)])).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd.erl
deleted file mode 100644
index 8cc1c133e9..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd.erl
+++ /dev/null
@@ -1,596 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd.erl,v 1.1 2008/12/17 09:53:33 mikpe Exp $
-%%
--module(httpd).
--export([multi_start/1, multi_start_link/1,
-	 start/0, start/1, start/2, 
-	 start_link/0, start_link/1, start_link/2,
-	 start_child/0,start_child/1,
-	 multi_stop/1,
-	 stop/0,stop/1,stop/2,
-	 stop_child/0,stop_child/1,stop_child/2,
-	 multi_restart/1,
-	 restart/0,restart/1,restart/2,
-	 parse_query/1]).
-
-%% Optional start related stuff...
--export([load/1,        load_mime_types/1, 
-	 start2/1,      start2/2, 
-	 start_link2/1, start_link2/2, 
-	 stop2/1]).
-
-%% Management stuff
--export([block/0,block/1,block/2,block/3,block/4,
-	 unblock/0,unblock/1,unblock/2]).
-
-%% Debugging and status info stuff...
--export([verbosity/3,verbosity/4]).
--export([get_status/1,get_status/2,get_status/3,
-	 get_admin_state/0,get_admin_state/1,get_admin_state/2,
-	 get_usage_state/0,get_usage_state/1,get_usage_state/2]).
-
--include("httpd.hrl").
-
--define(D(F, A), io:format("~p:" ++ F ++ "~n", [?MODULE|A])).
-
-
-%% start
-
-start() ->
-    start("/var/tmp/server_root/conf/8888.conf").
-
-start(ConfigFile) ->
-    %% ?D("start(~s) -> entry", [ConfigFile]),
-    start(ConfigFile, []).
-
-start(ConfigFile, Verbosity) when list(ConfigFile), list(Verbosity) ->
-    httpd_sup:start(ConfigFile, Verbosity).
-
-
-%% start_link
-
-start_link() ->
-    start("/var/tmp/server_root/conf/8888.conf").
-
-start_link(ConfigFile) ->
-    start_link(ConfigFile, []).
-
-start_link(ConfigFile, Verbosity) when list(ConfigFile), list(Verbosity) ->
-    httpd_sup:start_link(ConfigFile, Verbosity).
-
-
-%% start2 & start_link2
-
-start2(Config) ->
-    start2(Config, []).
-
-start2(Config, Verbosity) when list(Config), list(Verbosity) ->
-    httpd_sup:start2(Config, Verbosity).
-
-start_link2(Config) ->
-    start_link2(Config, []).
-
-start_link2(Config, Verbosity) when list(Config), list(Verbosity) ->
-    httpd_sup:start_link2(Config, Verbosity).
-
-
-%% stop
-
-stop() ->
-  stop(8888).
-
-stop(Port) when integer(Port) ->
-    stop(undefined, Port);
-stop(Pid) when pid(Pid) ->
-    httpd_sup:stop(Pid);
-stop(ConfigFile) when list(ConfigFile) ->
-    %% ?D("stop(~s) -> entry", [ConfigFile]),
-    httpd_sup:stop(ConfigFile).
-
-stop(Addr, Port) when integer(Port) ->
-    httpd_sup:stop(Addr, Port).
-
-stop2(Config) when list(Config) ->
-    httpd_sup:stop2(Config).
-
-%% start_child
-
-start_child() ->
-    start_child("/var/tmp/server_root/conf/8888.conf").
-
-start_child(ConfigFile) ->
-    start_child(ConfigFile, []).
-
-start_child(ConfigFile, Verbosity) ->
-    inets_sup:start_child(ConfigFile, Verbosity).
-
-
-%% stop_child
-
-stop_child() ->
-  stop_child(8888).
-
-stop_child(Port) ->
-    stop_child(undefined,Port).
-
-stop_child(Addr, Port) when integer(Port) ->
-    inets_sup:stop_child(Addr, Port).
-
-
-%% multi_start
-
-multi_start(MultiConfigFile) ->
-    case read_multi_file(MultiConfigFile) of
-	{ok,ConfigFiles} ->
-	    mstart(ConfigFiles);
-	Error ->
-	    Error
-    end.
-
-mstart(ConfigFiles) ->
-    mstart(ConfigFiles,[]).
-mstart([],Results) ->
-    {ok,lists:reverse(Results)};
-mstart([H|T],Results) ->
-    Res = start(H),
-    mstart(T,[Res|Results]).
-
-
-%% multi_start_link
-
-multi_start_link(MultiConfigFile) ->
-    case read_multi_file(MultiConfigFile) of
-	{ok,ConfigFiles} ->
-	    mstart_link(ConfigFiles);
-	Error ->
-	    Error
-    end.
-
-mstart_link(ConfigFiles) ->
-    mstart_link(ConfigFiles,[]).
-mstart_link([],Results) ->
-    {ok,lists:reverse(Results)};
-mstart_link([H|T],Results) ->
-    Res = start_link(H),
-    mstart_link(T,[Res|Results]).
-
-
-%% multi_stop
-
-multi_stop(MultiConfigFile) ->
-    case read_multi_file(MultiConfigFile) of
-	{ok,ConfigFiles} ->
-	    mstop(ConfigFiles);
-	Error ->
-	    Error
-    end.
-
-mstop(ConfigFiles) ->
-    mstop(ConfigFiles,[]).
-mstop([],Results) ->
-    {ok,lists:reverse(Results)};
-mstop([H|T],Results) ->
-    Res = stop(H),
-    mstop(T,[Res|Results]).
-
-
-%% multi_restart
-
-multi_restart(MultiConfigFile) ->
-    case read_multi_file(MultiConfigFile) of
-	{ok,ConfigFiles} ->
-	    mrestart(ConfigFiles);
-	Error ->
-	    Error
-    end.
-
-mrestart(ConfigFiles) ->
-    mrestart(ConfigFiles,[]).
-mrestart([],Results) ->
-    {ok,lists:reverse(Results)};
-mrestart([H|T],Results) ->
-    Res = restart(H),
-    mrestart(T,[Res|Results]).
-
-
-%% restart
-
-restart() -> restart(undefined,8888).
-
-restart(Port) when integer(Port) ->
-    restart(undefined,Port);
-restart(ConfigFile) when list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    restart(Addr,Port);
-	Error ->
-	    Error
-    end.
-    
-
-restart(Addr,Port) when integer(Port) ->
-    do_restart(Addr,Port).
-
-do_restart(Addr,Port) when integer(Port) -> 
-    Name = make_name(Addr,Port),
-    case whereis(Name) of
-	Pid when pid(Pid) ->
-	    httpd_manager:restart(Pid);
-	_ ->
-	    {error,not_started}
-    end.
-    
-
-%%% =========================================================
-%%% Function:    block/0, block/1, block/2, block/3, block/4
-%%%              block()
-%%%              block(Port)
-%%%              block(ConfigFile)
-%%%              block(Addr,Port)
-%%%              block(Port,Mode)
-%%%              block(ConfigFile,Mode)
-%%%              block(Addr,Port,Mode)
-%%%              block(ConfigFile,Mode,Timeout)
-%%%              block(Addr,Port,Mode,Timeout)
-%%% 
-%%% Returns:     ok | {error,Reason}
-%%%              
-%%% Description: This function is used to block an HTTP server.
-%%%              The blocking can be done in two ways, 
-%%%              disturbing or non-disturbing. Default is disturbing.
-%%%              When a HTTP server is blocked, all requests are rejected
-%%%              (status code 503).
-%%% 
-%%%              disturbing:
-%%%              By performing a disturbing block, the server
-%%%              is blocked forcefully and all ongoing requests
-%%%              are terminated. No new connections are accepted.
-%%%              If a timeout time is given then, on-going requests
-%%%              are given this much time to complete before the
-%%%              server is forcefully blocked. In this case no new 
-%%%              connections is accepted.
-%%% 
-%%%              non-disturbing:
-%%%              A non-disturbing block is more gracefull. No
-%%%              new connections are accepted, but the ongoing 
-%%%              requests are allowed to complete.
-%%%              If a timeout time is given, it waits this long before
-%%%              giving up (the block operation is aborted and the 
-%%%              server state is once more not-blocked).
-%%%
-%%% Types:       Port       -> integer()             
-%%%              Addr       -> {A,B,C,D} | string() | undefined
-%%%              ConfigFile -> string()
-%%%              Mode       -> disturbing | non_disturbing
-%%%              Timeout    -> integer()
-%%%
-block() -> block(undefined,8888,disturbing).
-
-block(Port) when integer(Port) -> 
-    block(undefined,Port,disturbing);
-
-block(ConfigFile) when list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    block(Addr,Port,disturbing);
-	Error ->
-	    Error
-    end.
-
-block(Addr,Port) when integer(Port) -> 
-    block(Addr,Port,disturbing);
-
-block(Port,Mode) when integer(Port), atom(Mode) ->
-    block(undefined,Port,Mode);
-
-block(ConfigFile,Mode) when list(ConfigFile), atom(Mode) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    block(Addr,Port,Mode);
-	Error ->
-	    Error
-    end.
-
-
-block(Addr,Port,disturbing) when integer(Port) ->
-    do_block(Addr,Port,disturbing);
-block(Addr,Port,non_disturbing) when integer(Port) ->
-    do_block(Addr,Port,non_disturbing);
-
-block(ConfigFile,Mode,Timeout) when list(ConfigFile), atom(Mode), integer(Timeout) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    block(Addr,Port,Mode,Timeout);
-	Error ->
-	    Error
-    end.
-
-
-block(Addr,Port,non_disturbing,Timeout) when integer(Port), integer(Timeout) ->
-    do_block(Addr,Port,non_disturbing,Timeout);
-block(Addr,Port,disturbing,Timeout) when integer(Port), integer(Timeout) ->
-    do_block(Addr,Port,disturbing,Timeout).
-
-do_block(Addr,Port,Mode) when integer(Port), atom(Mode) -> 
-    Name = make_name(Addr,Port),
-    case whereis(Name) of
-	Pid when pid(Pid) ->
-	    httpd_manager:block(Pid,Mode);
-	_ ->
-	    {error,not_started}
-    end.
-    
-
-do_block(Addr,Port,Mode,Timeout) when integer(Port), atom(Mode) -> 
-    Name = make_name(Addr,Port),
-    case whereis(Name) of
-	Pid when pid(Pid) ->
-	    httpd_manager:block(Pid,Mode,Timeout);
-	_ ->
-	    {error,not_started}
-    end.
-    
-
-%%% =========================================================
-%%% Function:    unblock/0, unblock/1, unblock/2
-%%%              unblock()
-%%%              unblock(Port)
-%%%              unblock(ConfigFile)
-%%%              unblock(Addr,Port)
-%%%              
-%%% Description: This function is used to reverse a previous block 
-%%%              operation on the HTTP server.
-%%%
-%%% Types:       Port       -> integer()             
-%%%              Addr       -> {A,B,C,D} | string() | undefined
-%%%              ConfigFile -> string()
-%%%
-unblock()                        -> unblock(undefined,8888).
-unblock(Port) when integer(Port) -> unblock(undefined,Port);
-
-unblock(ConfigFile) when list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    unblock(Addr,Port);
-	Error ->
-	    Error
-    end.
-
-unblock(Addr,Port) when integer(Port) -> 
-    Name = make_name(Addr,Port),
-    case whereis(Name) of
-	Pid when pid(Pid) ->
-	    httpd_manager:unblock(Pid);
-	_ ->
-	    {error,not_started}
-    end.
-
-
-verbosity(Port,Who,Verbosity) ->
-    verbosity(undefined,Port,Who,Verbosity).
-
-verbosity(Addr,Port,Who,Verbosity) ->
-    Name = make_name(Addr,Port),
-    case whereis(Name) of
-	Pid when pid(Pid) ->
-	    httpd_manager:verbosity(Pid,Who,Verbosity);
-	_ ->
-	    not_started
-    end.
-
-
-%%% =========================================================
-%%% Function:    get_admin_state/0, get_admin_state/1, get_admin_state/2
-%%%              get_admin_state()
-%%%              get_admin_state(Port)
-%%%              get_admin_state(Addr,Port)
-%%%              
-%%% Returns:     {ok,State} | {error,Reason}
-%%%              
-%%% Description: This function is used to retrieve the administrative 
-%%%              state of the HTTP server.
-%%%
-%%% Types:       Port    -> integer()             
-%%%              Addr    -> {A,B,C,D} | string() | undefined
-%%%              State   -> unblocked | shutting_down | blocked
-%%%              Reason  -> term()
-%%%
-get_admin_state()                        -> get_admin_state(undefined,8888).
-get_admin_state(Port) when integer(Port) -> get_admin_state(undefined,Port);
-
-get_admin_state(ConfigFile) when list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    unblock(Addr,Port);
-	Error ->
-	    Error
-    end.
-
-get_admin_state(Addr,Port) when integer(Port) -> 
-    Name = make_name(Addr,Port),
-    case whereis(Name) of
-	Pid when pid(Pid) ->
-	    httpd_manager:get_admin_state(Pid);
-	_ ->
-	    {error,not_started}
-    end.
-
-
-
-%%% =========================================================
-%%% Function:    get_usage_state/0, get_usage_state/1, get_usage_state/2
-%%%              get_usage_state()
-%%%              get_usage_state(Port)
-%%%              get_usage_state(Addr,Port)
-%%%              
-%%% Returns:     {ok,State} | {error,Reason}
-%%%              
-%%% Description: This function is used to retrieve the usage 
-%%%              state of the HTTP server.
-%%%
-%%% Types:       Port    -> integer()             
-%%%              Addr    -> {A,B,C,D} | string() | undefined
-%%%              State   -> idle | active | busy
-%%%              Reason  -> term()
-%%%
-get_usage_state()                        -> get_usage_state(undefined,8888).
-get_usage_state(Port) when integer(Port) -> get_usage_state(undefined,Port);
-
-get_usage_state(ConfigFile) when list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    unblock(Addr,Port);
-	Error ->
-	    Error
-    end.
-
-get_usage_state(Addr,Port) when integer(Port) -> 
-    Name = make_name(Addr,Port),
-    case whereis(Name) of
-	Pid when pid(Pid) ->
-	    httpd_manager:get_usage_state(Pid);
-	_ ->
-	    {error,not_started}
-    end.
-
-
-
-%%% =========================================================
-%% Function:    get_status(ConfigFile)        -> Status
-%%              get_status(Port)              -> Status
-%%              get_status(Addr,Port)         -> Status
-%%              get_status(Port,Timeout)      -> Status
-%%              get_status(Addr,Port,Timeout) -> Status
-%%
-%% Arguments:   ConfigFile -> string()  
-%%                            Configuration file from which Port and 
-%%                            BindAddress will be extracted.
-%%              Addr       -> {A,B,C,D} | string()
-%%                            Bind Address of the http server
-%%              Port       -> integer()
-%%                            Port number of the http server
-%%              Timeout    -> integer()
-%%                            Timeout time for the call
-%%
-%% Returns:     Status -> list()
-%%
-%% Description: This function is used when the caller runs in the 
-%%              same node as the http server or if calling with a 
-%%              program such as erl_call (see erl_interface).
-%% 
-
-get_status(ConfigFile) when list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    get_status(Addr,Port);
-	Error ->
-	    Error
-    end;
-
-get_status(Port) when integer(Port) ->
-    get_status(undefined,Port,5000).
-
-get_status(Port,Timeout) when integer(Port), integer(Timeout) ->
-    get_status(undefined,Port,Timeout);
-
-get_status(Addr,Port) when list(Addr), integer(Port) ->
-    get_status(Addr,Port,5000).
-
-get_status(Addr,Port,Timeout) when integer(Port) ->
-    Name = make_name(Addr,Port), 
-    case whereis(Name) of
-	Pid when pid(Pid) ->
-	    httpd_manager:get_status(Pid,Timeout);
-	_ ->
-	    not_started
-    end.
-
-
-%% load config
-
-load(ConfigFile) ->
-    httpd_conf:load(ConfigFile).
-
-load_mime_types(MimeTypesFile) ->
-    httpd_conf:load_mime_types(MimeTypesFile).
-
-
-%% parse_query
-
-parse_query(String) ->
-  {ok, SplitString} = regexp:split(String,"[&;]"),
-  foreach(SplitString).
-
-foreach([]) ->
-  [];
-foreach([KeyValue|Rest]) ->
-  {ok, Plus2Space, _} = regexp:gsub(KeyValue,"[\+]"," "),
-  case regexp:split(Plus2Space,"=") of
-    {ok,[Key|Value]} ->
-      [{httpd_util:decode_hex(Key),
-	httpd_util:decode_hex(lists:flatten(Value))}|foreach(Rest)];
-    {ok,_} ->
-      foreach(Rest)
-  end.
-
-
-%% get_addr_and_port
-
-get_addr_and_port(ConfigFile) ->
-    case httpd_conf:load(ConfigFile) of
-	{ok,ConfigList} ->
-	    Port = httpd_util:key1search(ConfigList,port,80),
-	    Addr = httpd_util:key1search(ConfigList,bind_address),
-	    {ok,Addr,Port};
-	Error ->
-	    Error
-    end.
-
-
-%% make_name
-
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd",Addr,Port).
-
-
-%% Multi stuff
-%%
-
-read_multi_file(File) ->
-    read_mfile(file:open(File,[read])).
-
-read_mfile({ok,Fd}) ->
-    read_mfile(read_line(Fd),Fd,[]);
-read_mfile(Error) ->
-    Error.
-
-read_mfile(eof,_Fd,SoFar) ->
-    {ok,lists:reverse(SoFar)};
-read_mfile({error,Reason},_Fd,SoFar) ->
-    {error,Reason};
-read_mfile([$#|Comment],Fd,SoFar) ->
-    read_mfile(read_line(Fd),Fd,SoFar);
-read_mfile([],Fd,SoFar) ->
-    read_mfile(read_line(Fd),Fd,SoFar);
-read_mfile(Line,Fd,SoFar) ->
-    read_mfile(read_line(Fd),Fd,[Line|SoFar]).
-
-read_line(Fd)      -> read_line1(io:get_line(Fd,[])).
-read_line1(eof)    -> eof;
-read_line1(String) -> httpd_conf:clean(String).
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd.hrl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd.hrl
deleted file mode 100644
index ba21bdf638..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd.hrl
+++ /dev/null
@@ -1,77 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd.hrl,v 1.1 2008/12/17 09:53:33 mikpe Exp $
-%%
-
--include_lib("kernel/include/file.hrl").
-
--ifndef(SERVER_SOFTWARE).
--define(SERVER_SOFTWARE,"inets/develop").	% Define in Makefile!
--endif.
--define(SERVER_PROTOCOL,"HTTP/1.1").
--define(SOCKET_CHUNK_SIZE,8192).
--define(SOCKET_MAX_POLL,25).
--define(FILE_CHUNK_SIZE,64*1024).
--define(NICE(Reason),lists:flatten(atom_to_list(?MODULE)++": "++Reason)).
--define(DEFAULT_CONTEXT,
-	[{errmsg,"[an error occurred while processing this directive]"},
-	 {timefmt,"%A, %d-%b-%y %T %Z"},
-	 {sizefmt,"abbrev"}]).
-
-
--ifdef(inets_error).
--define(ERROR(Format, Args), io:format("E(~p:~p:~p) : "++Format++"~n",
-				       [self(),?MODULE,?LINE]++Args)).
--else.
--define(ERROR(F,A),[]).
--endif.
-
--ifdef(inets_log).
--define(LOG(Format, Args), io:format("L(~p:~p:~p) : "++Format++"~n",
-				     [self(),?MODULE,?LINE]++Args)).
--else.
--define(LOG(F,A),[]).
--endif.
-
--ifdef(inets_debug).
--define(DEBUG(Format, Args), io:format("D(~p:~p:~p) : "++Format++"~n",
-				       [self(),?MODULE,?LINE]++Args)).
--else.
--define(DEBUG(F,A),[]).
--endif.
-
--ifdef(inets_cdebug).
--define(CDEBUG(Format, Args), io:format("C(~p:~p:~p) : "++Format++"~n",
-				       [self(),?MODULE,?LINE]++Args)).
--else.
--define(CDEBUG(F,A),[]).
--endif.
-
-
--record(init_data,{peername,resolve}).
--record(mod,{init_data,
-	     data=[],
-	     socket_type=ip_comm,
-	     socket,
-	     config_db,
-	     method,
-	     absolute_uri=[],
-	     request_uri,
-	     http_version,
-	     request_line,
-	     parsed_header=[],
-	     entity_body,
-	     connection}).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_acceptor.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_acceptor.erl
deleted file mode 100644
index 9b88f84865..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_acceptor.erl
+++ /dev/null
@@ -1,176 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_acceptor.erl,v 1.1 2008/12/17 09:53:33 mikpe Exp $
-%%
--module(httpd_acceptor).
-
--include("httpd.hrl").
--include("httpd_verbosity.hrl").
-
-
-%% External API
--export([start_link/6]).
-
-%% Other exports (for spawn's etc.)
--export([acceptor/4, acceptor/7]).
-
-
-%%
-%% External API
-%%
-
-%% start_link
-
-start_link(Manager, SocketType, Addr, Port, ConfigDb, Verbosity) ->
-    Args = [self(), Manager, SocketType, Addr, Port, ConfigDb, Verbosity],
-    proc_lib:start_link(?MODULE, acceptor, Args).
-
-
-acceptor(Parent, Manager, SocketType, Addr, Port, ConfigDb, Verbosity) ->
-    put(sname,acc),
-    put(verbosity,Verbosity),
-    ?vlog("starting",[]),
-    case (catch do_init(SocketType, Addr, Port)) of
-	{ok, ListenSocket} ->
-	    proc_lib:init_ack(Parent, {ok, self()}),
-	    acceptor(Manager, SocketType, ListenSocket, ConfigDb);
-	Error ->
-	    proc_lib:init_ack(Parent, Error),
-	    error
-    end.
-   
-do_init(SocketType, Addr, Port) ->
-    do_socket_start(SocketType),
-    ListenSocket = do_socket_listen(SocketType, Addr, Port),
-    {ok, ListenSocket}.
-
-
-do_socket_start(SocketType) ->
-    case httpd_socket:start(SocketType) of
-	ok ->
-	    ok;
-	{error, Reason} ->
-	    ?vinfo("failed socket start: ~p",[Reason]),
-	    throw({error, {socket_start_failed, Reason}})
-    end.
-
-
-do_socket_listen(SocketType, Addr, Port) ->
-    case httpd_socket:listen(SocketType, Addr, Port) of
-	{error, Reason} ->
-	    ?vinfo("failed socket listen operation: ~p", [Reason]),
-	    throw({error, {listen, Reason}});
-	ListenSocket ->
-	    ListenSocket
-    end.
-
-
-%% acceptor 
-
-acceptor(Manager, SocketType, ListenSocket, ConfigDb) ->
-    ?vdebug("await connection",[]),
-    case (catch httpd_socket:accept(SocketType, ListenSocket, 30000)) of
-	{error, Reason} ->
-	    handle_error(Reason, ConfigDb, SocketType),
-	    ?MODULE:acceptor(Manager, SocketType, ListenSocket, ConfigDb);
-
-	{'EXIT', Reason} ->
-	    handle_error({'EXIT', Reason}, ConfigDb, SocketType),
-	    ?MODULE:acceptor(Manager, SocketType, ListenSocket, ConfigDb);
-
-	Socket ->
-	    handle_connection(Manager, ConfigDb, SocketType, Socket),
-	    ?MODULE:acceptor(Manager, SocketType, ListenSocket, ConfigDb)
-    end.
-
-
-handle_connection(Manager, ConfigDb, SocketType, Socket) ->
-    case httpd_request_handler:start_link(Manager, ConfigDb) of
-	{ok, Pid} ->
-	    httpd_socket:controlling_process(SocketType, Socket, Pid),
-	    httpd_request_handler:synchronize(Pid, SocketType, Socket);
-	{error, Reason} ->
-	    handle_connection_err(SocketType, Socket, ConfigDb, Reason)
-    end.
-
-
-handle_connection_err(SocketType, Socket, ConfigDb, Reason) ->
-    String = 
-	lists:flatten(
-	  io_lib:format("failed starting request handler:~n   ~p", [Reason])),
-    report_error(ConfigDb, String),
-    httpd_socket:close(SocketType, Socket).
-
-
-handle_error(timeout, _, _) ->
-    ?vtrace("Accept timeout",[]),
-    ok;
-
-handle_error({enfile, _}, _, _) ->
-    ?vinfo("Accept error: enfile",[]),
-    %% Out of sockets...
-    sleep(200);
-
-handle_error(emfile, _, _) ->
-    ?vinfo("Accept error: emfile",[]),
-    %% Too many open files -> Out of sockets...
-    sleep(200);
-
-handle_error(closed, _, _) ->
-    ?vlog("Accept error: closed",[]),
-    %% This propably only means that the application is stopping, 
-    %% but just in case
-    exit(closed);
-
-handle_error(econnaborted, _, _) ->
-    ?vlog("Accept aborted",[]),
-    ok;
-
-handle_error(esslaccept, _, _) ->
-    %% The user has selected to cancel the installation of 
-    %% the certifikate, This is not a real error, so we do 
-    %% not write an error message.
-    ok;
-
-handle_error({'EXIT', Reason}, ConfigDb, SocketType) ->
-    ?vinfo("Accept exit:~n   ~p",[Reason]),
-    String = lists:flatten(io_lib:format("Accept exit: ~p", [Reason])),
-    accept_failed(SocketType, ConfigDb, String);
-
-handle_error(Reason, ConfigDb, SocketType) ->
-    ?vinfo("Accept error:~n   ~p",[Reason]),
-    String = lists:flatten(io_lib:format("Accept error: ~p", [Reason])),
-    accept_failed(SocketType, ConfigDb, String).
-
-
-accept_failed(SocketType, ConfigDb, String) ->
-    error_logger:error_report(String),
-    mod_log:error_log(SocketType, undefined, ConfigDb, 
-		      {0, "unknown"}, String),
-    mod_disk_log:error_log(SocketType, undefined, ConfigDb, 
-			   {0, "unknown"}, String),
-    exit({accept_failed, String}).
-
-
-report_error(Db, String) ->
-    error_logger:error_report(String),
-    mod_log:report_error(Db, String),
-    mod_disk_log:report_error(Db, String).
-    
-
-sleep(T) -> receive after T -> ok end.
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_acceptor_sup.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_acceptor_sup.erl
deleted file mode 100644
index e408614f1c..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_acceptor_sup.erl
+++ /dev/null
@@ -1,118 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_acceptor_sup.erl,v 1.1 2008/12/17 09:53:33 mikpe Exp $
-%%
-%%----------------------------------------------------------------------
-%% Purpose: The top supervisor for the Megaco/H.248 application
-%%----------------------------------------------------------------------
-
--module(httpd_acceptor_sup).
-
--behaviour(supervisor).
-
--include("httpd_verbosity.hrl").
-
-%% public
--export([start/3, stop/1, init/1]).
-
--export([start_acceptor/4, stop_acceptor/2]).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% supervisor callback functions
-
-
-start(Addr, Port, AccSupVerbosity) ->
-    SupName = make_name(Addr, Port),
-    supervisor:start_link({local, SupName}, ?MODULE, [AccSupVerbosity]).
-
-stop(StartArgs) ->
-    ok.
-
-init([Verbosity]) -> % Supervisor
-    do_init(Verbosity);
-init(BadArg) ->
-    {error, {badarg, BadArg}}.
-
-do_init(Verbosity) ->
-    put(verbosity,?vvalidate(Verbosity)),
-    put(sname,acc_sup),
-    ?vlog("starting", []),
-    Flags     = {one_for_one, 500, 100},
-    KillAfter = timer:seconds(1),
-    Workers   = [],
-    {ok, {Flags, Workers}}.
-
-
-%%----------------------------------------------------------------------
-%% Function: [start|stop]_acceptor/5
-%% Description: Starts a [auth | security] worker (child) process
-%%----------------------------------------------------------------------
-
-start_acceptor(SocketType, Addr, Port, ConfigDb) ->
-    Verbosity = get_acc_verbosity(),
-    start_worker(httpd_acceptor, SocketType, Addr, Port, 
-		 ConfigDb, Verbosity, self(), []).
-
-stop_acceptor(Addr, Port) ->
-    stop_worker(httpd_acceptor, Addr, Port).
-
-
-%%----------------------------------------------------------------------
-%% Function:    start_worker/5
-%% Description: Starts a (permanent) worker (child) process
-%%----------------------------------------------------------------------
-
-start_worker(M, SocketType, Addr, Port, ConfigDB, Verbosity, Manager, 
-	     Modules) ->
-    SupName = make_name(Addr, Port),
-    Args    = [Manager, SocketType, Addr, Port, ConfigDB, Verbosity],
-    Spec    = {{M, Addr, Port},
-	       {M, start_link, Args}, 
-	       permanent, timer:seconds(1), worker, [M] ++ Modules},
-    supervisor:start_child(SupName, Spec).
-
-
-%%----------------------------------------------------------------------
-%% Function:    stop_permanent_worker/3
-%% Description: Stops a permanent worker (child) process
-%%----------------------------------------------------------------------
-
-stop_worker(M, Addr, Port) ->
-    SupName = make_name(Addr, Port),
-    Name    = {M, Addr, Port},
-    case supervisor:terminate_child(SupName, Name) of
-	ok ->
-	    supervisor:delete_child(SupName, Name);
-	Error ->
-	    Error
-    end.
-    
-
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_acc_sup",Addr,Port).
-
-
-
-get_acc_verbosity() ->
-    get_verbosity(get(acceptor_verbosity)).
-
-get_verbosity(undefined) ->
-    ?default_verbosity;
-get_verbosity(V) ->
-    ?vvalidate(V).
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_conf.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_conf.erl
deleted file mode 100644
index 2c7a747d42..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_conf.erl
+++ /dev/null
@@ -1,688 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_conf.erl,v 1.1 2008/12/17 09:53:33 mikpe Exp $
-%%
--module(httpd_conf).
--export([load/1, load_mime_types/1, 
-	 load/2, store/1, store/2, 
-	 remove_all/1, remove/1,
-	 is_directory/1, is_file/1, 
-	 make_integer/1, clean/1, custom_clean/3, check_enum/2]).
-
-
--define(VMODULE,"CONF").
--include("httpd_verbosity.hrl").
-
-%% The configuration data is handled in three (3) phases:
-%% 1. Parse the config file and put all directives into a key-vale
-%%    tuple list (load/1). 
-%% 2. Traverse the key-value tuple list store it into an ETS table.
-%%    Directives depending on other directives are taken care of here
-%%    (store/1).
-%% 3. Traverse the ETS table and do a complete clean-up (remove/1).
-
--include("httpd.hrl").
-
-%%
-%% Phase 1: Load
-%%
-
-%% load
-
-load(ConfigFile) ->
-    ?CDEBUG("load -> ConfigFile: ~p",[ConfigFile]),
-    case read_config_file(ConfigFile) of
-	{ok, Config} ->
-	    case bootstrap(Config) of
-		{error, Reason} ->
-		    {error, Reason};
-		{ok, Modules} ->
-		    load_config(Config, lists:append(Modules, [?MODULE]))
-	    end;
-	{error, Reason} ->
-	    {error, ?NICE("Error while reading config file: "++Reason)}
-    end.
-
-
-bootstrap([]) ->
-    {error, ?NICE("Modules must be specified in the config file")};
-bootstrap([Line|Config]) ->
-    case Line of
-	[$M,$o,$d,$u,$l,$e,$s,$ |Modules] ->
-	    {ok, ModuleList} = regexp:split(Modules," "),
-	    TheMods = [list_to_atom(X) || X <- ModuleList],
-	    case verify_modules(TheMods) of
-		ok ->
-		    {ok, TheMods};
-		{error, Reason} ->
-		    ?ERROR("bootstrap -> : validation failed: ~p",[Reason]),
-		    {error, Reason}
-	    end;
-	_ ->
-	    bootstrap(Config)
-    end.
-
-
-%%
-%% verify_modules/1 -> ok | {error, Reason}
-%%
-%% Verifies that all specified modules are available.
-%%
-verify_modules([]) ->
-    ok;
-verify_modules([Mod|Rest]) ->
-    case code:which(Mod) of
-	non_existing ->
-	    {error, ?NICE(atom_to_list(Mod)++" does not exist")};
-	Path ->
-	    verify_modules(Rest)
-    end.
-
-%%
-%% read_config_file/1 -> {ok, [line(), line()..]} | {error, Reason}
-%%
-%% Reads the entire configuration file and returns list of strings or
-%% and error.
-%%
-
-
-read_config_file(FileName) ->
-    case file:open(FileName, [read]) of
-	{ok, Stream} ->
-	    read_config_file(Stream, []);
-	{error, Reason} ->
-	    {error, ?NICE("Cannot open "++FileName)}
-    end.
-
-read_config_file(Stream, SoFar) ->
-    case io:get_line(Stream, []) of
-	eof ->
-	    {ok, lists:reverse(SoFar)};
-	{error, Reason} ->
-	    {error, Reason};
-	[$#|Rest] ->
-	    %% Ignore commented lines for efficiency later ..
-	    read_config_file(Stream, SoFar);
-	Line ->
-	    {ok, NewLine, _}=regexp:sub(clean(Line),"[\t\r\f ]"," "),
-	    case NewLine of
-		[] ->
-		    %% Also ignore empty lines ..
-		    read_config_file(Stream, SoFar);
-		Other ->
-		    read_config_file(Stream, [NewLine|SoFar])
-	    end
-    end.
-
-is_exported(Module, ToFind) ->
-    Exports = Module:module_info(exports),
-    lists:member(ToFind, Exports).
-
-%%
-%% load/4 -> {ok, ConfigList} | {error, Reason}
-%%
-%% This loads the config file into each module specified by Modules
-%% Each module has its own context that is passed to and (optionally)
-%% returned by the modules load function. The module can also return
-%% a ConfigEntry, which will be added to the global configuration
-%% list.
-%% All configuration directives are guaranteed to be passed to all
-%% modules. Each module only implements the function clauses of
-%% the load function for the configuration directives it supports,
-%% it's ok if an apply returns {'EXIT', {function_clause, ..}}.
-%%
-load_config(Config, Modules) ->
-    %% Create default contexts for all modules
-    Contexts = lists:duplicate(length(Modules), []),
-    load_config(Config, Modules, Contexts, []).
-
-
-load_config([], _Modules, _Contexts, ConfigList) ->
-    case a_must(ConfigList, [server_name,port,server_root,document_root]) of
-	ok ->
-	    {ok, ConfigList};
-	{missing, Directive} ->
-	    {error, ?NICE(atom_to_list(Directive)++
-			  " must be specified in the config file")}
-    end;
-
-load_config([Line|Config], Modules, Contexts, ConfigList) ->
-    ?CDEBUG("load_config -> Line: ~p",[Line]),
-    case load_traverse(Line, Contexts, Modules, [], ConfigList, no) of
-	{ok, NewContexts, NewConfigList} ->
-	    load_config(Config, Modules, NewContexts, NewConfigList);
-	{error, Reason} -> 
-	    ?ERROR("load_config -> traverse failed: ~p",[Reason]),
-	    {error, Reason}
-    end.
-
-
-load_traverse(Line, [], [], NewContexts, ConfigList, no) ->
-    ?CDEBUG("load_traverse/no -> ~n"
-	    "     Line:        ~p~n"
-	    "     NewContexts: ~p~n"
-	    "     ConfigList:  ~p",
-	    [Line,NewContexts,ConfigList]),
-    {error, ?NICE("Configuration directive not recognized: "++Line)};
-load_traverse(Line, [], [], NewContexts, ConfigList, yes) ->
-    ?CDEBUG("load_traverse/yes -> ~n"
-	    "     Line:        ~p~n"
-	    "     NewContexts: ~p~n"
-	    "     ConfigList:  ~p",
-	    [Line,NewContexts,ConfigList]),
-    {ok, lists:reverse(NewContexts), ConfigList};
-load_traverse(Line, [Context|Contexts], [Module|Modules], NewContexts, ConfigList, State) ->
-    ?CDEBUG("load_traverse/~p -> ~n"
-	    "     Line:        ~p~n"
-	    "     Module:      ~p~n"
-	    "     Context:     ~p~n"
-	    "     Contexts:    ~p~n"
-	    "     NewContexts: ~p",
-	    [State,Line,Module,Context,Contexts,NewContexts]),
-    case is_exported(Module, {load, 2}) of
-	true ->
-	    ?CDEBUG("load_traverse -> ~p:load/2 exported",[Module]),
-	    case catch apply(Module, load, [Line, Context]) of
-		{'EXIT', {function_clause, _}} ->
-		    ?CDEBUG("load_traverse -> exit: function_clause"
-			    "~n   Module: ~p"
-			    "~n   Line:   ~s",[Module,Line]),
-		    load_traverse(Line, Contexts, Modules, [Context|NewContexts], ConfigList, State);
-		{'EXIT', Reason} ->
-		    ?CDEBUG("load_traverse -> exit: ~p",[Reason]),
-		    error_logger:error_report({'EXIT', Reason}),
-		    load_traverse(Line, Contexts, Modules, [Context|NewContexts], ConfigList, State);
-		{ok, NewContext} ->
-		    ?CDEBUG("load_traverse -> ~n"
-			    "     NewContext: ~p",[NewContext]),
-		    load_traverse(Line, Contexts, Modules, [NewContext|NewContexts], ConfigList,yes);
-		{ok, NewContext, ConfigEntry} when tuple(ConfigEntry) ->
-		    ?CDEBUG("load_traverse (tuple) -> ~n"
-			    "     NewContext:  ~p~n"
-			    "     ConfigEntry: ~p",[NewContext,ConfigEntry]),
-		    load_traverse(Line, Contexts, Modules, [NewContext|NewContexts],
-				  [ConfigEntry|ConfigList], yes);
-		{ok, NewContext, ConfigEntry} when list(ConfigEntry) ->
-		    ?CDEBUG("load_traverse (list) -> ~n"
-			    "     NewContext:  ~p~n"
-			    "     ConfigEntry: ~p",[NewContext,ConfigEntry]),
-		    load_traverse(Line, Contexts, Modules, [NewContext|NewContexts],
-				  lists:append(ConfigEntry, ConfigList), yes);
-		{error, Reason} ->
-		    ?CDEBUG("load_traverse -> error: ~p",[Reason]),
-		    {error, Reason}
-	    end;
-	false ->
-	    ?CDEBUG("load_traverse -> ~p:load/2 not exported",[Module]),
-	    load_traverse(Line, Contexts, Modules, [Context|NewContexts],
-			  ConfigList,yes)
-    end.
-	
-
-load(eof, []) ->
-    eof;
-
-load([$M,$a,$x,$H,$e,$a,$d,$e,$r,$S,$i,$z,$e,$ |MaxHeaderSize], []) ->
-    ?DEBUG("load -> MaxHeaderSize: ~p",[MaxHeaderSize]),
-    case make_integer(MaxHeaderSize) of
-        {ok, Integer} ->
-            {ok, [], {max_header_size,Integer}};
-        {error, _} ->
-            {error, ?NICE(clean(MaxHeaderSize)++
-                          " is an invalid number of MaxHeaderSize")}
-    end;
-load([$M,$a,$x,$H,$e,$a,$d,$e,$r,$A,$c,$t,$i,$o,$n,$ |Action], []) ->
-    ?DEBUG("load -> MaxHeaderAction: ~p",[Action]),
-    {ok, [], {max_header_action,list_to_atom(clean(Action))}};
-load([$M,$a,$x,$B,$o,$d,$y,$S,$i,$z,$e,$ |MaxBodySize], []) ->
-    ?DEBUG("load -> MaxBodySize: ~p",[MaxBodySize]),
-    case make_integer(MaxBodySize) of
-        {ok, Integer} ->
-            {ok, [], {max_body_size,Integer}};
-        {error, _} ->
-            {error, ?NICE(clean(MaxBodySize)++
-                          " is an invalid number of MaxBodySize")}
-    end;
-load([$M,$a,$x,$B,$o,$d,$y,$A,$c,$t,$i,$o,$n,$ |Action], []) ->
-    ?DEBUG("load -> MaxBodyAction: ~p",[Action]),
-    {ok, [], {max_body_action,list_to_atom(clean(Action))}};
-load([$S,$e,$r,$v,$e,$r,$N,$a,$m,$e,$ |ServerName], []) ->
-    ?DEBUG("load -> ServerName: ~p",[ServerName]),
-    {ok,[],{server_name,clean(ServerName)}};
-load([$S,$o,$c,$k,$e,$t,$T,$y,$p,$e,$ |SocketType], []) ->
-    ?DEBUG("load -> SocketType: ~p",[SocketType]),
-    case check_enum(clean(SocketType),["ssl","ip_comm"]) of
-	{ok, ValidSocketType} ->
-	    {ok, [], {com_type,ValidSocketType}};
-	{error,_} ->
-	    {error, ?NICE(clean(SocketType) ++ " is an invalid SocketType")}
-    end;
-load([$P,$o,$r,$t,$ |Port], []) ->
-    ?DEBUG("load -> Port: ~p",[Port]),
-    case make_integer(Port) of
-	{ok, Integer} ->
-	    {ok, [], {port,Integer}};
-	{error, _} ->
-	    {error, ?NICE(clean(Port)++" is an invalid Port")}
-    end;
-load([$B,$i,$n,$d,$A,$d,$d,$r,$e,$s,$s,$ |Address], []) ->
-    ?DEBUG("load -> Address:  ~p",[Address]),
-    case clean(Address) of
-	"*" ->
-	    {ok, [], {bind_address,any}};
-	CAddress ->
-	    ?CDEBUG("load -> CAddress:  ~p",[CAddress]),
-	    case inet:getaddr(CAddress,inet) of
-		{ok, IPAddr} ->
-		    ?CDEBUG("load -> IPAddr:  ~p",[IPAddr]),
-		    {ok, [], {bind_address,IPAddr}};
-		{error, _} ->
-		    {error, ?NICE(CAddress++" is an invalid address")}
-	    end
-    end;
-load([$K,$e,$e,$p,$A,$l,$i,$v,$e,$ |OnorOff], []) ->
-    case list_to_atom(clean(OnorOff)) of
-	off ->
-	    {ok, [], {persistent_conn, false}};
-	_ ->
-	    {ok, [], {persistent_conn, true}}
-    end;
-load([$M,$a,$x,$K,$e,$e,$p,$A,$l,$i,$v,$e,$R,$e,$q,$u,$e,$s,$t,$ |MaxRequests], []) ->
-    case make_integer(MaxRequests) of
-	{ok, Integer} ->
-	    {ok, [], {max_keep_alive_request, Integer}};
-	{error, _} ->
-	    {error, ?NICE(clean(MaxRequests)++" is an invalid MaxKeepAliveRequest")}
-    end;
-load([$K,$e,$e,$p,$A,$l,$i,$v,$e,$T,$i,$m,$e,$o,$u,$t,$ |Timeout], []) ->
-    case make_integer(Timeout) of
-	{ok, Integer} ->
-	    {ok, [], {keep_alive_timeout, Integer*1000}};
-	{error, _} ->
-	    {error, ?NICE(clean(Timeout)++" is an invalid KeepAliveTimeout")}
-    end;
-load([$M,$o,$d,$u,$l,$e,$s,$ |Modules], []) ->
-    {ok, ModuleList} = regexp:split(Modules," "),
-    {ok, [], {modules,[list_to_atom(X) || X <- ModuleList]}};
-load([$S,$e,$r,$v,$e,$r,$A,$d,$m,$i,$n,$ |ServerAdmin], []) ->
-    {ok, [], {server_admin,clean(ServerAdmin)}};
-load([$S,$e,$r,$v,$e,$r,$R,$o,$o,$t,$ |ServerRoot], []) ->
-    case is_directory(clean(ServerRoot)) of
-	{ok, Directory} ->
-	    MimeTypesFile = 
-		filename:join([clean(ServerRoot),"conf", "mime.types"]),
-	    case load_mime_types(MimeTypesFile) of
-		{ok, MimeTypesList} ->
-		    {ok, [], [{server_root,string:strip(Directory,right,$/)},
-			      {mime_types,MimeTypesList}]};
-		{error, Reason} ->
-		    {error, Reason}
-	    end;
-	{error, _} ->
-	    {error, ?NICE(clean(ServerRoot)++" is an invalid ServerRoot")}
-    end;
-load([$M,$a,$x,$C,$l,$i,$e,$n,$t,$s,$ |MaxClients], []) ->
-    ?DEBUG("load -> MaxClients: ~p",[MaxClients]),
-    case make_integer(MaxClients) of
-	{ok, Integer} ->
-	    {ok, [], {max_clients,Integer}};
-	{error, _} ->
-	    {error, ?NICE(clean(MaxClients)++" is an invalid number of MaxClients")}
-    end;
-load([$D,$o,$c,$u,$m,$e,$n,$t,$R,$o,$o,$t,$ |DocumentRoot],[]) ->
-    case is_directory(clean(DocumentRoot)) of
-	{ok, Directory} ->
-	    {ok, [], {document_root,string:strip(Directory,right,$/)}};
-	{error, _} ->
-	    {error, ?NICE(clean(DocumentRoot)++"is an invalid DocumentRoot")}
-    end;
-load([$D,$e,$f,$a,$u,$l,$t,$T,$y,$p,$e,$ |DefaultType], []) ->
-    {ok, [], {default_type,clean(DefaultType)}};
-load([$S,$S,$L,$C,$e,$r,$t,$i,$f,$i,$c,$a,$t,$e,$F,$i,$l,$e,$ | SSLCertificateFile], []) ->
-    ?DEBUG("load -> SSLCertificateFile: ~p",[SSLCertificateFile]),
-    case is_file(clean(SSLCertificateFile)) of
-	{ok, File} ->
-	    {ok, [], {ssl_certificate_file,File}};
-    {error, _} ->
-	    {error, ?NICE(clean(SSLCertificateFile)++
-			  " is an invalid SSLCertificateFile")}
-    end;
-load([$S,$S,$L,$C,$e,$r,$t,$i,$f,$i,$c,$a,$t,$e,$K,$e,$y,$F,$i,$l,$e,$ |
-      SSLCertificateKeyFile], []) ->
-    ?DEBUG("load -> SSLCertificateKeyFile: ~p",[SSLCertificateKeyFile]),
-    case is_file(clean(SSLCertificateKeyFile)) of
-	{ok, File} ->
-	    {ok, [], {ssl_certificate_key_file,File}};
-	{error, _} ->
-	    {error, ?NICE(clean(SSLCertificateKeyFile)++
-			  " is an invalid SSLCertificateKeyFile")}
-    end;
-load([$S,$S,$L,$V,$e,$r,$i,$f,$y,$C,$l,$i,$e,$n,$t,$ |SSLVerifyClient], []) ->
-    ?DEBUG("load -> SSLVerifyClient: ~p",[SSLVerifyClient]),
-    case make_integer(clean(SSLVerifyClient)) of
-	{ok, Integer} when Integer >=0,Integer =< 2 ->
-	    {ok, [], {ssl_verify_client,Integer}};
-	{ok, Integer} ->
-	    {error,?NICE(clean(SSLVerifyClient)++" is an invalid SSLVerifyClient")};
-	{error, nomatch} ->
-	    {error,?NICE(clean(SSLVerifyClient)++" is an invalid SSLVerifyClient")}
-    end;
-load([$S,$S,$L,$V,$e,$r,$i,$f,$y,$D,$e,$p,$t,$h,$ |
-      SSLVerifyDepth], []) ->
-    ?DEBUG("load -> SSLVerifyDepth: ~p",[SSLVerifyDepth]),
-    case make_integer(clean(SSLVerifyDepth)) of
-	{ok, Integer} when Integer > 0 ->
-	    {ok, [], {ssl_verify_client_depth,Integer}};
-	{ok, Integer} ->
-	    {error,?NICE(clean(SSLVerifyDepth) ++
-			 " is an invalid SSLVerifyDepth")};
-	{error, nomatch} ->
-	    {error,?NICE(clean(SSLVerifyDepth) ++
-			 " is an invalid SSLVerifyDepth")}
-    end;
-load([$S,$S,$L,$C,$i,$p,$h,$e,$r,$s,$ | SSLCiphers], []) ->
-    ?DEBUG("load -> SSLCiphers: ~p",[SSLCiphers]),
-    {ok, [], {ssl_ciphers, clean(SSLCiphers)}};
-load([$S,$S,$L,$C,$A,$C,$e,$r,$t,$i,$f,$i,$c,$a,$t,$e,$F,$i,$l,$e,$ |
-      SSLCACertificateFile], []) ->
-    case is_file(clean(SSLCACertificateFile)) of
-	{ok, File} ->
-	    {ok, [], {ssl_ca_certificate_file,File}};
-	{error, _} ->
-	    {error, ?NICE(clean(SSLCACertificateFile)++
-			  " is an invalid SSLCACertificateFile")}
-    end;
-load([$S,$S,$L,$P,$a,$s,$s,$w,$o,$r,$d,$C,$a,$l,$l,$b,$a,$c,$k,$M,$o,$d,$u,$l,$e,$ | SSLPasswordCallbackModule], []) ->
-    ?DEBUG("load -> SSLPasswordCallbackModule: ~p",
-	   [SSLPasswordCallbackModule]),
-    {ok, [], {ssl_password_callback_module,
-	      list_to_atom(clean(SSLPasswordCallbackModule))}};
-load([$S,$S,$L,$P,$a,$s,$s,$w,$o,$r,$d,$C,$a,$l,$l,$b,$a,$c,$k,$F,$u,$n,$c,$t,$i,$o,$n,$ | SSLPasswordCallbackFunction], []) ->
-    ?DEBUG("load -> SSLPasswordCallbackFunction: ~p",
-	   [SSLPasswordCallbackFunction]),
-    {ok, [], {ssl_password_callback_function,
-	      list_to_atom(clean(SSLPasswordCallbackFunction))}}.
-
-
-%%
-%% load_mime_types/1 -> {ok, MimeTypes} | {error, Reason}
-%%
-load_mime_types(MimeTypesFile) ->
-    case file:open(MimeTypesFile, [read]) of
-	{ok, Stream} ->
-	    parse_mime_types(Stream, []);
-	{error, _} ->
-	    {error, ?NICE("Can't open " ++ MimeTypesFile)}
-    end.
-
-parse_mime_types(Stream,MimeTypesList) ->
-    Line=
-	case io:get_line(Stream,'') of
-	    eof ->
-		eof;
-	    String ->
-		clean(String)
-	end,
-    parse_mime_types(Stream, MimeTypesList, Line).
-
-parse_mime_types(Stream, MimeTypesList, eof) ->
-    file:close(Stream),
-    {ok, MimeTypesList};
-parse_mime_types(Stream, MimeTypesList, "") ->
-    parse_mime_types(Stream, MimeTypesList);
-parse_mime_types(Stream, MimeTypesList, [$#|_]) ->
-    parse_mime_types(Stream, MimeTypesList);
-parse_mime_types(Stream, MimeTypesList, Line) ->
-    case regexp:split(Line, " ") of
-	{ok, [NewMimeType|Suffixes]} ->
-	    parse_mime_types(Stream,lists:append(suffixes(NewMimeType,Suffixes),
-						 MimeTypesList));
-	{ok, _} ->
-	    {error, ?NICE(Line)}
-    end.
-
-suffixes(MimeType,[]) ->
-    [];
-suffixes(MimeType,[Suffix|Rest]) ->
-    [{Suffix,MimeType}|suffixes(MimeType,Rest)].
-
-%%
-%% Phase 2: Store
-%%
-
-%% store
-
-store(ConfigList) ->
-    Modules = httpd_util:key1search(ConfigList, modules, []),
-    Port = httpd_util:key1search(ConfigList, port),
-    Addr = httpd_util:key1search(ConfigList,bind_address),
-    Name = httpd_util:make_name("httpd_conf",Addr,Port),
-    ?CDEBUG("store -> Name = ~p",[Name]),
-    ConfigDB = ets:new(Name, [named_table, bag, protected]),
-    ?CDEBUG("store -> ConfigDB = ~p",[ConfigDB]),
-    store(ConfigDB, ConfigList, lists:append(Modules,[?MODULE]),ConfigList).
-
-store(ConfigDB, ConfigList, Modules,[]) ->
-    ?vtrace("store -> done",[]),
-    ?CDEBUG("store -> done",[]),
-    {ok, ConfigDB};
-store(ConfigDB, ConfigList, Modules, [ConfigListEntry|Rest]) ->
-    ?vtrace("store -> entry with"
-	    "~n   ConfigListEntry: ~p",[ConfigListEntry]),
-    ?CDEBUG("store -> "
-	"~n   ConfigListEntry: ~p",[ConfigListEntry]),
-    case store_traverse(ConfigListEntry,ConfigList,Modules) of
-	{ok, ConfigDBEntry} when tuple(ConfigDBEntry) ->
-	    ?vtrace("store -> ConfigDBEntry(tuple): "
-		    "~n   ~p",[ConfigDBEntry]),
-	    ?CDEBUG("store -> ConfigDBEntry(tuple): "
-		    "~n   ~p",[ConfigDBEntry]),
-	    ets:insert(ConfigDB,ConfigDBEntry),
-	    store(ConfigDB,ConfigList,Modules,Rest);
-	{ok, ConfigDBEntry} when list(ConfigDBEntry) ->
-	    ?vtrace("store -> ConfigDBEntry(list): "
-		    "~n   ~p",[ConfigDBEntry]),
-	    ?CDEBUG("store -> ConfigDBEntry(list): "
-		"~n   ~p",[ConfigDBEntry]),
-	    lists:foreach(fun(Entry) ->
-				  ets:insert(ConfigDB,Entry)
-			  end,ConfigDBEntry),
-	    store(ConfigDB,ConfigList,Modules,Rest);
-	{error, Reason} ->
-	    ?vlog("store -> error: ~p",[Reason]),
-	    ?ERROR("store -> error: ~p",[Reason]),
-	    {error,Reason}
-    end.
-
-store_traverse(ConfigListEntry,ConfigList,[]) ->
-    {error,?NICE("Unable to store configuration...")};
-store_traverse(ConfigListEntry, ConfigList, [Module|Rest]) ->
-    case is_exported(Module, {store, 2}) of
-	true ->
-	    ?CDEBUG("store_traverse -> call ~p:store/2",[Module]),
-	    case catch apply(Module,store,[ConfigListEntry, ConfigList]) of
-		{'EXIT',{function_clause,_}} ->
-		    ?CDEBUG("store_traverse -> exit: function_clause",[]),
-		    store_traverse(ConfigListEntry,ConfigList,Rest);
-		{'EXIT',Reason} ->
-		    ?ERROR("store_traverse -> exit: ~p",[Reason]),
-		    error_logger:error_report({'EXIT',Reason}),
-		    store_traverse(ConfigListEntry,ConfigList,Rest);
-		Result ->
-		    ?CDEBUG("store_traverse -> ~n"
-			    "      Result: ~p",[Result]),
-		    Result
-	    end;
-	false ->
-	    store_traverse(ConfigListEntry,ConfigList,Rest)
-    end.
-
-store({mime_types,MimeTypesList},ConfigList) ->
-    Port = httpd_util:key1search(ConfigList, port),
-    Addr = httpd_util:key1search(ConfigList, bind_address),
-    Name = httpd_util:make_name("httpd_mime",Addr,Port),
-    ?CDEBUG("store(mime_types) -> Name: ~p",[Name]),
-    {ok, MimeTypesDB} = store_mime_types(Name,MimeTypesList),
-    ?CDEBUG("store(mime_types) -> ~n"
-	    "     MimeTypesDB:      ~p~n"
-	    "     MimeTypesDB info: ~p",
-	    [MimeTypesDB,ets:info(MimeTypesDB)]),
-    {ok, {mime_types,MimeTypesDB}};
-store(ConfigListEntry,ConfigList) ->
-    ?CDEBUG("store/2 -> ~n"
-	    "        ConfigListEntry: ~p~n"
-	    "        ConfigList:      ~p",
-	    [ConfigListEntry,ConfigList]),
-    {ok, ConfigListEntry}.
-
-
-%% store_mime_types
-store_mime_types(Name,MimeTypesList) ->
-    ?CDEBUG("store_mime_types -> Name: ~p",[Name]),
-    MimeTypesDB = ets:new(Name, [set, protected]),
-    ?CDEBUG("store_mime_types -> MimeTypesDB: ~p",[MimeTypesDB]),
-    store_mime_types1(MimeTypesDB, MimeTypesList).
-
-store_mime_types1(MimeTypesDB,[]) ->
-    {ok, MimeTypesDB};
-store_mime_types1(MimeTypesDB,[Type|Rest]) ->
-    ?CDEBUG("store_mime_types1 -> Type: ~p",[Type]),
-    ets:insert(MimeTypesDB, Type),
-    store_mime_types1(MimeTypesDB, Rest).
-
-
-%%
-%% Phase 3: Remove
-%%
-
-remove_all(ConfigDB) ->
-    Modules = httpd_util:lookup(ConfigDB,modules,[]),
-    remove_traverse(ConfigDB, lists:append(Modules,[?MODULE])).
-
-remove_traverse(ConfigDB,[]) ->
-    ?vtrace("remove_traverse -> done", []),
-    ok;
-remove_traverse(ConfigDB,[Module|Rest]) ->
-    ?vtrace("remove_traverse -> call ~p:remove", [Module]),
-    case (catch apply(Module,remove,[ConfigDB])) of
-	{'EXIT',{undef,_}} ->
-	    ?vtrace("remove_traverse -> undef", []),
-	    remove_traverse(ConfigDB,Rest);
-	{'EXIT',{function_clause,_}} ->
-	    ?vtrace("remove_traverse -> function_clause", []),
-	    remove_traverse(ConfigDB,Rest);
-	{'EXIT',Reason} ->
-	    ?vtrace("remove_traverse -> exit: ~p", [Reason]),
-	    error_logger:error_report({'EXIT',Reason}),
-	    remove_traverse(ConfigDB,Rest);
-	{error,Reason} ->
-	    ?vtrace("remove_traverse -> error: ~p", [Reason]),
-	    error_logger:error_report(Reason),
-	    remove_traverse(ConfigDB,Rest);
-	_ ->
-	    remove_traverse(ConfigDB,Rest)
-    end.
-
-remove(ConfigDB) ->
-    ets:delete(ConfigDB),
-    ok.
-
-
-%%
-%% Utility functions
-%%
-
-%% is_directory
-
-is_directory(Directory) ->
-    case file:read_file_info(Directory) of
-	{ok,FileInfo} ->
-	    #file_info{type = Type, access = Access} = FileInfo,
-	    is_directory(Type,Access,FileInfo,Directory);
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-
-is_directory(directory,read,_FileInfo,Directory) ->
-    {ok,Directory};
-is_directory(directory,read_write,_FileInfo,Directory) ->
-    {ok,Directory};
-is_directory(_Type,_Access,FileInfo,_Directory) ->
-    {error,FileInfo}.
-    
-
-%% is_file
-
-is_file(File) ->
-    case file:read_file_info(File) of
-	{ok,FileInfo} ->
-	    #file_info{type = Type, access = Access} = FileInfo,
-	    is_file(Type,Access,FileInfo,File);
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-
-is_file(regular,read,_FileInfo,File) ->
-    {ok,File};
-is_file(regular,read_write,_FileInfo,File) ->
-    {ok,File};
-is_file(_Type,_Access,FileInfo,_File) ->
-    {error,FileInfo}.
-
-%% make_integer
-
-make_integer(String) ->
-    case regexp:match(clean(String),"[0-9]+") of
-	{match, _, _} ->
-	    {ok, list_to_integer(clean(String))};
-	nomatch ->
-	    {error, nomatch}
-    end.
-
-
-%% clean
-
-clean(String) ->
-    {ok,CleanedString,_} = regexp:gsub(String, "^[ \t\n\r\f]*|[ \t\n\r\f]*\$",""),
-    CleanedString.
-
-%% custom_clean
-
-custom_clean(String,MoreBefore,MoreAfter) ->
-    {ok,CleanedString,_}=regexp:gsub(String,"^[ \t\n\r\f"++MoreBefore++
-				     "]*|[ \t\n\r\f"++MoreAfter++"]*\$",""),
-    CleanedString.
-
-%% check_enum
-
-check_enum(Enum,[]) ->
-    {error, not_valid};
-check_enum(Enum,[Enum|Rest]) ->
-    {ok, list_to_atom(Enum)};
-check_enum(Enum, [NotValid|Rest]) ->
-    check_enum(Enum, Rest).
-
-%% a_must
-
-a_must(ConfigList,[]) ->
-    ok;
-a_must(ConfigList,[Directive|Rest]) ->
-    case httpd_util:key1search(ConfigList,Directive) of
-	undefined ->
-	    {missing,Directive};
-	_ ->
-	    a_must(ConfigList,Rest)
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_example.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_example.erl
deleted file mode 100644
index 1819650963..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_example.erl
+++ /dev/null
@@ -1,134 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_example.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
--module(httpd_example).
--export([print/1]).
--export([get/2, post/2, yahoo/2, test1/2]).
-
--export([newformat/3]).
-%% These are used by the inets test-suite
--export([delay/1]).
-
-
-print(String) ->
-  [header(),
-   top("Print"),
-   String++"\n",
-   footer()].
-
-
-test1(Env, []) ->
-    io:format("Env:~p~n",[Env]),
-    ["<html>",
-     "<head>",
-     "<title>Test1</title>",
-     "</head>",
-     "<body>",
-     "<h1>Erlang Body</h1>",
-     "<h2>Stuff</h2>",
-     "</body>",
-     "</html>"].
-
-
-get(Env,[]) ->
-  [header(),
-   top("GET Example"),
-   "<FORM ACTION=\"/cgi-bin/erl/httpd_example:get\" METHOD=GET>	
-<B>Input:</B> <INPUT TYPE=\"text\" NAME=\"input1\">
-<INPUT TYPE=\"text\" NAME=\"input2\">
-<INPUT TYPE=\"submit\"><BR>
-</FORM>" ++ "\n",
-   footer()];
-
-get(Env,Input) ->
-  default(Env,Input).
-
-post(Env,[]) ->
-  [header(),
-   top("POST Example"),
-   "<FORM ACTION=\"/cgi-bin/erl/httpd_example:post\" METHOD=POST>	
-<B>Input:</B> <INPUT TYPE=\"text\" NAME=\"input1\">
-<INPUT TYPE=\"text\" NAME=\"input2\">
-<INPUT TYPE=\"submit\"><BR>
-</FORM>" ++ "\n",
-   footer()];
-
-post(Env,Input) ->
-  default(Env,Input).
-
-yahoo(Env,Input) ->
-  "Location: http://www.yahoo.com\r\n\r\n".
-
-default(Env,Input) ->
-  [header(),
-   top("Default Example"),
-   "<B>Environment:</B> ",io_lib:format("~p",[Env]),"<BR>\n",
-   "<B>Input:</B> ",Input,"<BR>\n",
-   "<B>Parsed Input:</B> ",
-   io_lib:format("~p",[httpd:parse_query(Input)]),"\n",
-   footer()].
-
-header() ->
-  header("text/html").
-header(MimeType) ->
-  "Content-type: " ++ MimeType ++ "\r\n\r\n".
-
-top(Title) ->
-  "<HTML>
-<HEAD>
-<TITLE>" ++ Title ++ "</TITLE>
-</HEAD>
-<BODY>\n".
-
-footer() ->
-  "</BODY>
-</HTML>\n".
-
-    
-newformat(SessionID,Env,Input)->
-    mod_esi:deliver(SessionID,"Content-Type:text/html\r\n\r\n"),
-    mod_esi:deliver(SessionID,top("new esi format test")),
-    mod_esi:deliver(SessionID,"This new format is nice<BR>"),
-    mod_esi:deliver(SessionID,"This new format is nice<BR>"),
-    mod_esi:deliver(SessionID,"This new format is nice<BR>"),
-    mod_esi:deliver(SessionID,footer()).
-    
-%% ------------------------------------------------------
-
-delay(Time) when integer(Time) ->
-    i("httpd_example:delay(~p) -> do the delay",[Time]),
-    sleep(Time),
-    i("httpd_example:delay(~p) -> done, now reply",[Time]),
-    delay_reply("delay ok");
-delay(Time) when list(Time) ->
-    delay(httpd_conf:make_integer(Time));
-delay({ok,Time}) when integer(Time) ->
-    delay(Time);
-delay({error,_Reason}) ->
-    i("delay -> called with invalid time"),
-    delay_reply("delay failed: invalid delay time").
-
-delay_reply(Reply) ->
-    [header(),
-     top("delay"),
-     Reply,
-     footer()].
-
-i(F)   -> i(F,[]).
-i(F,A) -> io:format(F ++ "~n",A).
-
-sleep(T) -> receive after T -> ok end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_manager.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_manager.erl
deleted file mode 100644
index 78750c32c9..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_manager.erl
+++ /dev/null
@@ -1,1030 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_manager.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
-
--module(httpd_manager).
-
--include("httpd.hrl").
--include("httpd_verbosity.hrl").
-
--behaviour(gen_server).
-
-%% External API
--export([start/2, start/3, start_link/2, start_link/3, stop/1, restart/1]).
-
-%% Internal API
--export([new_connection/1, done_connection/1]).
-
-%% Module API
--export([config_lookup/2, config_lookup/3, 
-	 config_multi_lookup/2, config_multi_lookup/3, 
-	 config_match/2, config_match/3]).
-
-%% gen_server exports
--export([init/1, 
-	 handle_call/3, handle_cast/2, handle_info/2, 
-	 terminate/2,
-         code_change/3]).
-
-
-%% Management exports
--export([block/2, block/3, unblock/1]).
--export([get_admin_state/1, get_usage_state/1]).
--export([is_busy/1,is_busy/2,is_busy_or_blocked/1,is_blocked/1]). %% ???????
--export([get_status/1, get_status/2]).
--export([verbosity/2, verbosity/3]).
-
-
--export([c/1]).
-
--record(state,{socket_type  = ip_comm,
-	       config_file,
-	       config_db    = null,
-	       connections, %% Current request handlers
-	       admin_state  = unblocked,
-	       blocker_ref  = undefined,
-	       blocking_tmr = undefined,
-	       status       = []}).
-
-
-c(Port) ->
-    Ref = httpd_util:make_name("httpd",undefined,Port),
-    gen_server:call(Ref, fake_close).
-
-
-%%
-%% External API
-%%
-
-start(ConfigFile, ConfigList) ->
-    start(ConfigFile, ConfigList, []).
-
-start(ConfigFile, ConfigList, Verbosity) ->
-    Port = httpd_util:key1search(ConfigList,port,80),
-    Addr = httpd_util:key1search(ConfigList,bind_address),
-    Name = make_name(Addr,Port),
-    ?LOG("start -> Name = ~p",[Name]),
-    gen_server:start({local,Name},?MODULE,
-		     [ConfigFile, ConfigList, Addr, Port, Verbosity],[]).
-    
-start_link(ConfigFile, ConfigList) ->
-    start_link(ConfigFile, ConfigList, []).
-    
-start_link(ConfigFile, ConfigList, Verbosity) ->
-    Port = httpd_util:key1search(ConfigList,port,80),
-    Addr = httpd_util:key1search(ConfigList,bind_address),
-    Name = make_name(Addr,Port),
-    ?LOG("start_link -> Name = ~p",[Name]),
-    gen_server:start_link({local, Name},?MODULE,
-			  [ConfigFile, ConfigList, Addr, Port, Verbosity],[]).
-    
-%% stop
-
-stop(ServerRef) ->
-    gen_server:call(ServerRef, stop).
-
-%% restart
-
-restart(ServerRef) ->
-    gen_server:call(ServerRef, restart).
-
-
-%%%----------------------------------------------------------------
-
-block(ServerRef, disturbing) ->
-    call(ServerRef,block);
-
-block(ServerRef, non_disturbing) ->
-    do_block(ServerRef, non_disturbing, infinity).
-
-block(ServerRef, Method, Timeout) ->
-    do_block(ServerRef, Method, Timeout).
-
-
-%% The reason for not using call here, is that the manager cannot
-%% _wait_ for completion of the requests. It must be able to do
-%% do other things at the same time as the blocking goes on.
-do_block(ServerRef, Method, infinity) ->
-    Ref = make_ref(),
-    cast(ServerRef, {block, Method, infinity, self(), Ref}),
-    receive
-	{block_reply, Reply, Ref} ->
-	    Reply
-    end;
-do_block(ServerRef,Method,Timeout) when Timeout > 0 ->
-    Ref = make_ref(),
-    cast(ServerRef,{block,Method,Timeout,self(),Ref}),
-    receive
-	{block_reply,Reply,Ref} ->
-	    Reply
-    end.
-
-
-%%%----------------------------------------------------------------
-
-%% unblock
-
-unblock(ServerRef) ->
-    call(ServerRef,unblock).
-
-%% get admin/usage state
-
-get_admin_state(ServerRef) ->
-    call(ServerRef,get_admin_state).
-
-get_usage_state(ServerRef) ->
-    call(ServerRef,get_usage_state).
-
-
-%% get_status
-
-get_status(ServerRef) ->
-    gen_server:call(ServerRef,get_status).
-
-get_status(ServerRef,Timeout) ->
-    gen_server:call(ServerRef,get_status,Timeout).
-
-
-verbosity(ServerRef,Verbosity) ->
-    verbosity(ServerRef,all,Verbosity).
-
-verbosity(ServerRef,all,Verbosity) ->
-    gen_server:call(ServerRef,{verbosity,all,Verbosity});
-verbosity(ServerRef,manager,Verbosity) ->
-    gen_server:call(ServerRef,{verbosity,manager,Verbosity});
-verbosity(ServerRef,request,Verbosity) ->
-    gen_server:call(ServerRef,{verbosity,request,Verbosity});
-verbosity(ServerRef,acceptor,Verbosity) ->
-    gen_server:call(ServerRef,{verbosity,acceptor,Verbosity});
-verbosity(ServerRef,security,Verbosity) ->
-    gen_server:call(ServerRef,{verbosity,security,Verbosity});
-verbosity(ServerRef,auth,Verbosity) ->
-    gen_server:call(ServerRef,{verbosity,auth,Verbosity}).
-
-%%
-%% Internal API
-%%
-
-
-%% new_connection
-
-new_connection(Manager) ->
-    gen_server:call(Manager, {new_connection, self()}).
-
-%% done
-
-done_connection(Manager) ->
-    gen_server:cast(Manager, {done_connection, self()}).
-
-
-%% is_busy(ServerRef) -> true | false
-%% 
-%% Tests if the server is (in usage state) busy, 
-%% i.e. has rached the heavy load limit.
-%% 
-
-is_busy(ServerRef) ->
-    gen_server:call(ServerRef,is_busy).
-    
-is_busy(ServerRef,Timeout) ->
-    gen_server:call(ServerRef,is_busy,Timeout).
-
-
-%% is_busy_or_blocked(ServerRef) -> busy | blocked | false
-%% 
-%% Tests if the server is busy (usage state), i.e. has rached,
-%% the heavy load limit, or blocked (admin state) .
-%% 
-
-is_busy_or_blocked(ServerRef) ->
-    gen_server:call(ServerRef,is_busy_or_blocked).
-    
-
-%% is_blocked(ServerRef) -> true | false
-%% 
-%% Tests if the server is blocked (admin state) .
-%% 
-
-is_blocked(ServerRef) ->
-    gen_server:call(ServerRef,is_blocked).
-    
-
-%%
-%% Module API. Theese functions are intended for use from modules only.
-%%
-
-config_lookup(Port, Query) ->
-    config_lookup(undefined, Port, Query).
-config_lookup(Addr, Port, Query) ->
-    Name = httpd_util:make_name("httpd",Addr,Port),
-    gen_server:call(whereis(Name), {config_lookup, Query}).
-
-config_multi_lookup(Port, Query) ->
-    config_multi_lookup(undefined,Port,Query).
-config_multi_lookup(Addr,Port, Query) ->
-    Name = httpd_util:make_name("httpd",Addr,Port),
-    gen_server:call(whereis(Name), {config_multi_lookup, Query}).
-
-config_match(Port, Pattern) ->
-    config_match(undefined,Port,Pattern).
-config_match(Addr, Port, Pattern) ->
-    Name = httpd_util:make_name("httpd",Addr,Port),
-    gen_server:call(whereis(Name), {config_match, Pattern}).
-
-
-%%
-%% Server call-back functions
-%%
-
-%% init
-
-init([ConfigFile, ConfigList, Addr, Port, Verbosity]) ->
-    process_flag(trap_exit, true),
-    case (catch do_init(ConfigFile, ConfigList, Addr, Port, Verbosity)) of
-	{error, Reason} ->
-	    ?vlog("failed starting server: ~p", [Reason]),
-	    {stop, Reason};
-	{ok, State} ->
-	    {ok, State}
-    end.
-   
-
-do_init(ConfigFile, ConfigList, Addr, Port, Verbosity) ->
-    put(sname,man),
-    set_verbosity(Verbosity),
-    ?vlog("starting",[]),
-    ConfigDB   = do_initial_store(ConfigList),
-    ?vtrace("config db: ~p", [ConfigDB]),
-    SocketType = httpd_socket:config(ConfigDB),
-    ?vtrace("socket type: ~p, now start acceptor", [SocketType]),
-    case httpd_acceptor_sup:start_acceptor(SocketType, Addr, Port, ConfigDB) of
-	{ok, Pid} ->
-	    ?vtrace("acceptor started: ~p", [Pid]),
-	    Status = [{max_conn,0}, {last_heavy_load,never}, 
-		      {last_connection,never}],
-	    State  = #state{socket_type = SocketType,
-			    config_file = ConfigFile,
-			    config_db   = ConfigDB,
-			    connections = [],
-			    status      = Status},
-	    ?vdebug("started",[]),
-	    {ok, State};
-	Else ->
-	    Else
-    end.
-
-
-do_initial_store(ConfigList) ->
-    case httpd_conf:store(ConfigList) of
-	{ok, ConfigDB} ->
-	    ConfigDB;
-	{error, Reason} ->
-	    ?vinfo("failed storing configuration: ~p",[Reason]),
-	    throw({error, Reason})
-    end.
-
-   
-
-%% handle_call
-
-handle_call(stop, _From, State) ->
-    ?vlog("stop",[]),
-    {stop, normal, ok, State};
-
-handle_call({config_lookup, Query}, _From, State) ->
-    ?vlog("config lookup: Query = ~p",[Query]),
-    Res = httpd_util:lookup(State#state.config_db, Query),
-    ?vdebug("config lookup result: ~p",[Res]),
-    {reply, Res, State};
-
-handle_call({config_multi_lookup, Query}, _From, State) ->
-    ?vlog("multi config lookup: Query = ~p",[Query]),
-    Res = httpd_util:multi_lookup(State#state.config_db, Query),
-    ?vdebug("multi config lookup result: ~p",[Res]),
-    {reply, Res, State};
-
-handle_call({config_match, Query}, _From, State) ->
-    ?vlog("config match: Query = ~p",[Query]),
-    Res = ets:match_object(State#state.config_db, Query),
-    ?vdebug("config match result: ~p",[Res]),
-    {reply, Res, State};
-
-handle_call(get_status, _From, State) ->
-    ?vdebug("get status",[]),
-    ManagerStatus  = manager_status(self()),
-    %% AuthStatus     = auth_status(get(auth_server)),
-    %% SecStatus      = sec_status(get(sec_server)),
-    %% AccStatus      = sec_status(get(acceptor_server)),
-    S1 = [{current_conn,length(State#state.connections)}|State#state.status]++
-	[ManagerStatus],
-    ?vtrace("status = ~p",[S1]),
-    {reply,S1,State};
-
-handle_call(is_busy, From, State) ->
-    Reply = case get_ustate(State) of
-		busy ->
-		    true;
-		_ ->
-		    false
-	  end,
-    ?vlog("is busy: ~p",[Reply]),
-    {reply,Reply,State};
-
-handle_call(is_busy_or_blocked, From, State) ->
-    Reply = 
-	case get_astate(State) of
-	    unblocked ->
-		case get_ustate(State) of
-		    busy ->
-			busy;
-		    _ ->
-			false
-		end;
-	    _ ->
-		blocked
-	  end,
-    ?vlog("is busy or blocked: ~p",[Reply]),
-    {reply,Reply,State};
-
-handle_call(is_blocked, From, State) ->
-    Reply = 
-	case get_astate(State) of
-	    unblocked ->
-		false;
-	    _ ->
-		true
-	  end,
-    ?vlog("is blocked: ~p",[Reply]),
-    {reply,Reply,State};
-
-handle_call(get_admin_state, From, State) ->
-    Reply = get_astate(State),
-    ?vlog("admin state: ~p",[Reply]),
-    {reply,Reply,State};
-
-handle_call(get_usage_state, From, State) ->
-    Reply = get_ustate(State),
-    ?vlog("usage state: ~p",[Reply]),
-    {reply,Reply,State};
-
-handle_call({verbosity,Who,Verbosity}, From, State) ->
-    V = ?vvalidate(Verbosity),
-    ?vlog("~n   Set new verbosity to ~p for ~p",[V,Who]),
-    Reply = set_verbosity(Who,V,State),
-    {reply,Reply,State};
-
-handle_call(restart, From, State) when State#state.admin_state == blocked ->
-    ?vlog("restart",[]),
-    case handle_restart(State) of
-	{stop, Reply,S1} ->
-	    {stop, Reply, S1};
-	{_, Reply, S1} ->
-	    {reply,Reply,S1}
-    end;
-
-handle_call(restart, From, State) ->
-    ?vlog("restart(~p)",[State#state.admin_state]),
-    {reply,{error,{invalid_admin_state,State#state.admin_state}},State};
-
-handle_call(block, From, State) ->
-    ?vlog("block(disturbing)",[]),
-    {Reply,S1} = handle_block(State),
-    {reply,Reply,S1};
-
-handle_call(unblock, {From,_Tag}, State) ->
-    ?vlog("unblock",[]),
-    {Reply,S1} = handle_unblock(State,From),
-    {reply, Reply, S1};
-
-handle_call({new_connection, Pid}, From, State) ->
-    ?vlog("~n   New connection (~p) when connection count = ~p",
-	  [Pid,length(State#state.connections)]),
-    {S, S1} = handle_new_connection(State, Pid),
-    Reply = {S, get(request_handler_verbosity)},
-    {reply, Reply, S1};
-
-handle_call(Request, From, State) ->
-    ?vinfo("~n   unknown request '~p' from ~p", [Request,From]),
-    String = 
-	lists:flatten(
-	  io_lib:format("Unknown request "
-			"~n   ~p"
-			"~nto manager (~p)"
-			"~nfrom ~p",
-			[Request, self(), From])),
-    report_error(State,String),
-    {reply, ok, State}.
-
-
-%% handle_cast
-
-handle_cast({done_connection, Pid}, State) ->
-    ?vlog("~n   Done connection (~p)", [Pid]),
-    S1 = handle_done_connection(State, Pid),
-    {noreply, S1};
-
-handle_cast({block, disturbing, Timeout, From, Ref}, State) ->
-    ?vlog("block(disturbing,~p)",[Timeout]),
-    S1 = handle_block(State, Timeout, From, Ref),
-    {noreply,S1};
-
-handle_cast({block, non_disturbing, Timeout, From, Ref}, State) ->
-    ?vlog("block(non-disturbing,~p)",[Timeout]),
-    S1 = handle_nd_block(State, Timeout, From, Ref),
-    {noreply,S1};
-
-handle_cast(Message, State) ->
-    ?vinfo("~n   received unknown message '~p'",[Message]),
-    String = 
-	lists:flatten(
-	  io_lib:format("Unknown message "
-			"~n   ~p"
-			"~nto manager (~p)",
-			[Message, self()])),
-    report_error(State, String),
-    {noreply, State}.
-
-%% handle_info
-
-handle_info({block_timeout, Method}, State) ->
-    ?vlog("received block_timeout event",[]),
-    S1 = handle_block_timeout(State,Method),
-    {noreply, S1};
-
-handle_info({'DOWN', Ref, process, _Object, Info}, State) ->
-    ?vlog("~n   down message for ~p",[Ref]),
-    S1 = 
-	case State#state.blocker_ref of
-	    Ref ->
-		handle_blocker_exit(State);
-	    _ ->
-		%% Not our blocker, so ignore
-		State
-	end,
-    {noreply, S1};
-
-handle_info({'EXIT', Pid, normal}, State) ->
-    ?vdebug("~n   Normal exit message from ~p", [Pid]),
-    {noreply, State};
-
-handle_info({'EXIT', Pid, blocked}, S) ->
-    ?vdebug("blocked exit signal from request handler (~p)", [Pid]),
-    {noreply, S};
-
-handle_info({'EXIT', Pid, Reason}, State) ->
-    ?vlog("~n   Exit message from ~p for reason ~p",[Pid, Reason]),
-    S1 = check_connections(State, Pid, Reason),
-    {noreply, S1};
-
-handle_info(Info, State) ->
-    ?vinfo("~n   received unknown info '~p'",[Info]),
-    String = 
-	lists:flatten(
-	  io_lib:format("Unknown info "
-			"~n   ~p"
-			"~nto manager (~p)",
-			[Info, self()])),
-    report_error(State, String),
-    {noreply, State}.
-
-
-%% terminate
-
-terminate(R, #state{config_db = Db}) -> 
-    ?vlog("Terminating for reason: ~n   ~p", [R]),
-    httpd_conf:remove_all(Db),
-    ok.
-
-
-%% code_change({down,ToVsn}, State, Extra)
-%% 
-%% NOTE:
-%% Actually upgrade from 2.5.1 to 2.5.3 and downgrade from 
-%% 2.5.3 to 2.5.1 is done with an application restart, so 
-%% these function is actually never used. The reason for keeping
-%% this stuff is only for future use.
-%%
-code_change({down,ToVsn},State,Extra) ->
-    {ok,State};
-
-%% code_change(FromVsn, State, Extra)
-%%
-code_change(FromVsn,State,Extra) ->
-    {ok,State}.
-
-
-
-%% -------------------------------------------------------------------------
-%% check_connection
-%%
-%%
-%%
-%%
-
-check_connections(#state{connections = []} = State, _Pid, _Reason) ->
-    State;
-check_connections(#state{admin_state = shutting_down,
-			 connections = Connections} = State, Pid, Reason) ->
-    %% Could be a crashing request handler
-    case lists:delete(Pid, Connections) of
-	[] -> % Crashing request handler => block complete
-	    String = 
-		lists:flatten(
-		  io_lib:format("request handler (~p) crashed:"
-				"~n   ~p", [Pid, Reason])),
-	    report_error(State, String),
-	    ?vlog("block complete",[]),
-	    demonitor_blocker(State#state.blocker_ref),
-	    {Tmr,From,Ref} = State#state.blocking_tmr,
-	    ?vlog("(possibly) stop block timer",[]),
-	    stop_block_tmr(Tmr),
-	    ?vlog("and send the reply",[]),
-	    From ! {block_reply,ok,Ref},
-	    State#state{admin_state = blocked, connections = [],
-			blocker_ref = undefined};
-	Connections1 ->
-	    State#state{connections = Connections1}
-    end;
-check_connections(#state{connections = Connections} = State, Pid, Reason) ->
-    case lists:delete(Pid, Connections) of
-	Connections -> % Not a request handler, so ignore
-	    State;
-	Connections1 ->
-	    String = 
-		lists:flatten(
-		  io_lib:format("request handler (~p) crashed:"
-				"~n   ~p", [Pid, Reason])),
-	    report_error(State, String),
-	    State#state{connections = lists:delete(Pid, Connections)}
-    end.
-
-
-%% -------------------------------------------------------------------------
-%% handle_[new | done]_connection
-%%
-%%
-%%
-%%
-
-handle_new_connection(State, Handler) ->
-    UsageState = get_ustate(State),
-    AdminState = get_astate(State),
-    handle_new_connection(UsageState, AdminState, State, Handler).
-
-handle_new_connection(busy, unblocked, State, Handler) ->
-    Status = update_heavy_load_status(State#state.status),
-    {{reject, busy}, 
-     State#state{status = Status}};
-
-handle_new_connection(_UsageState, unblocked, State, Handler) ->
-    Connections = State#state.connections,
-    Status      = update_connection_status(State#state.status, 
-					   length(Connections)+1),
-    link(Handler),
-    {accept, 
-     State#state{connections = [Handler|Connections], status = Status}};
-
-handle_new_connection(_UsageState, _AdminState, State, _Handler) ->
-    {{reject, blocked}, 
-     State}.
-
-
-handle_done_connection(#state{admin_state = shutting_down,
-			      connections = Connections} = State, Handler) ->
-    unlink(Handler),
-    case lists:delete(Handler, Connections) of
-	[] -> % Ok, block complete
-	    ?vlog("block complete",[]),
-	    demonitor_blocker(State#state.blocker_ref),
-	    {Tmr,From,Ref} = State#state.blocking_tmr,
-	    ?vlog("(possibly) stop block timer",[]),
-	    stop_block_tmr(Tmr),
-	    ?vlog("and send the reply",[]),
-	    From ! {block_reply,ok,Ref},
-	    State#state{admin_state = blocked, connections = [],
-			blocker_ref = undefined};
-	Connections1 ->
-	    State#state{connections = Connections1}
-    end;
-
-handle_done_connection(#state{connections = Connections} = State, Handler) ->
-    State#state{connections = lists:delete(Handler, Connections)}.
-    
-    
-%% -------------------------------------------------------------------------
-%% handle_block
-%%
-%%
-%%
-%%
-handle_block(#state{admin_state = AdminState} = S) ->
-    handle_block(S, AdminState).
-
-handle_block(S,unblocked) ->
-    %% Kill all connections
-    ?vtrace("handle_block(unblocked) -> kill all request handlers",[]),
-%%    [exit(Pid,blocked) || Pid <- S#state.connections],
-    [kill_handler(Pid) || Pid <- S#state.connections],
-    {ok,S#state{connections = [], admin_state = blocked}};
-handle_block(S,blocked) ->
-    ?vtrace("handle_block(blocked) -> already blocked",[]),
-    {ok,S};
-handle_block(S,shutting_down) ->
-    ?vtrace("handle_block(shutting_down) -> ongoing...",[]),
-    {{error,shutting_down},S}.
-    
-
-kill_handler(Pid) ->
-    ?vtrace("kill request handler: ~p",[Pid]),
-    exit(Pid, blocked).
-%%    exit(Pid, kill).
-
-handle_block(S,Timeout,From,Ref) when Timeout >= 0 ->
-    do_block(S,Timeout,From,Ref);
-
-handle_block(S,Timeout,From,Ref) ->
-    Reply = {error,{invalid_block_request,Timeout}},
-    From ! {block_reply,Reply,Ref},
-    S.
-
-do_block(S,Timeout,From,Ref) ->
-    case S#state.connections of
-	[] ->
-	    %% Already in idle usage state => go directly to blocked
-	    ?vdebug("do_block -> already in idle usage state",[]),
-	    From ! {block_reply,ok,Ref},
-	    S#state{admin_state = blocked};
-	_ ->
-	    %% Active or Busy usage state => go to shutting_down
-	    ?vdebug("do_block -> active or busy usage state",[]),
-	    %% Make sure we get to know if blocker dies...
-	    ?vtrace("do_block -> create blocker monitor",[]),
-	    MonitorRef = monitor_blocker(From),
-	    ?vtrace("do_block -> (possibly) start block timer",[]),
-	    Tmr = {start_block_tmr(Timeout,disturbing),From,Ref},
-	    S#state{admin_state = shutting_down, 
-		    blocker_ref = MonitorRef, blocking_tmr = Tmr}
-    end.
-
-handle_nd_block(S,infinity,From,Ref) ->
-    do_nd_block(S,infinity,From,Ref);
-
-handle_nd_block(S,Timeout,From,Ref) when Timeout >= 0 ->
-    do_nd_block(S,Timeout,From,Ref);
-
-handle_nd_block(S,Timeout,From,Ref) ->
-    Reply = {error,{invalid_block_request,Timeout}},
-    From ! {block_reply,Reply,Ref},
-    S.
-
-do_nd_block(S,Timeout,From,Ref) ->
-    case S#state.connections of
-	[] ->
-	    %% Already in idle usage state => go directly to blocked
-	    ?vdebug("do_nd_block -> already in idle usage state",[]),
-	    From ! {block_reply,ok,Ref},
-	    S#state{admin_state = blocked};
-	_ ->
-	    %% Active or Busy usage state => go to shutting_down
-	    ?vdebug("do_nd_block -> active or busy usage state",[]),
-	    %% Make sure we get to know if blocker dies...
-	    ?vtrace("do_nd_block -> create blocker monitor",[]),
-	    MonitorRef = monitor_blocker(From),
-	    ?vtrace("do_nd_block -> (possibly) start block timer",[]),
-	    Tmr = {start_block_tmr(Timeout,non_disturbing),From,Ref},
-	    S#state{admin_state = shutting_down, 
-		    blocker_ref = MonitorRef, blocking_tmr = Tmr}
-    end.
-
-handle_block_timeout(S,Method) ->
-    %% Time to take this to the road...
-    demonitor_blocker(S#state.blocker_ref),
-    handle_block_timeout1(S,Method,S#state.blocking_tmr).
-
-handle_block_timeout1(S,non_disturbing,{_,From,Ref}) ->
-    ?vdebug("handle_block_timeout1(non-disturbing) -> send reply: timeout",[]),
-    From ! {block_reply,{error,timeout},Ref},
-    S#state{admin_state = unblocked, 
-	    blocker_ref = undefined, blocking_tmr = undefined};
-
-handle_block_timeout1(S,disturbing,{_,From,Ref}) ->
-    ?vdebug("handle_block_timeout1(disturbing) -> kill all connections",[]),
-    [exit(Pid,blocked) || Pid <- S#state.connections],
-
-    ?vdebug("handle_block_timeout1 -> send reply: ok",[]),
-    From ! {block_reply,ok,Ref},
-    S#state{admin_state = blocked,    connections = [], 
-	    blocker_ref = undefined, blocking_tmr = undefined};
-
-handle_block_timeout1(S,Method,{_,From,Ref}) ->
-    ?vinfo("received block timeout with unknown block method:"
-	   "~n   Method:  ~p",[Method]),
-    From ! {block_reply,{error,{unknown_block_method,Method}},Ref},
-    S#state{admin_state = blocked,    connections = [], 
-	    blocker_ref = undefined, blocking_tmr = undefined};
-
-handle_block_timeout1(S,Method,TmrInfo) ->
-    ?vinfo("received block timeout with erroneous timer info:"
-	   "~n   Method:  ~p"
-	   "~n   TmrInfo: ~p",[Method,TmrInfo]),
-    S#state{admin_state = unblocked,
-	    blocker_ref = undefined, blocking_tmr = undefined}.
-
-handle_unblock(S,FromA) ->
-    handle_unblock(S,FromA,S#state.admin_state).
-
-handle_unblock(S,_FromA,unblocked) ->
-    {ok,S};
-handle_unblock(S,FromA,_AdminState) ->
-    ?vtrace("handle_unblock -> (possibly) stop block timer",[]),
-    stop_block_tmr(S#state.blocking_tmr),
-    case S#state.blocking_tmr of
-	{Tmr,FromB,Ref} ->
-	    %% Another process is trying to unblock
-	    %% Inform the blocker
-	    FromB ! {block_reply, {error,{unblocked,FromA}},Ref};
-	_ ->
-	    ok
-    end,
-    {ok,S#state{admin_state = unblocked, blocking_tmr = undefined}}.
-    
-%% The blocker died so we give up on the block.
-handle_blocker_exit(S) ->
-    {Tmr,_From,_Ref} = S#state.blocking_tmr,
-    ?vtrace("handle_blocker_exit -> (possibly) stop block timer",[]),
-    stop_block_tmr(Tmr),
-    S#state{admin_state = unblocked,
-	    blocker_ref = undefined, blocking_tmr = undefined}.
-    
-
-
-%% -------------------------------------------------------------------------
-%% handle_restart
-%%
-%%
-%%
-%%
-handle_restart(#state{config_file = undefined} = State) ->
-    {continue, {error, undefined_config_file}, State};
-handle_restart(#state{config_db = Db, config_file = ConfigFile} = State) ->
-    ?vtrace("load new configuration",[]),
-    {ok, Config} = httpd_conf:load(ConfigFile),
-    ?vtrace("check for illegal changes (addr, port and socket-type)",[]),
-    case (catch check_constant_values(Db, Config)) of
-	ok ->
-	    %% If something goes wrong between the remove 
-	    %% and the store where fu-ed
-	    ?vtrace("remove old configuration, now hold you breath...",[]),
-	    httpd_conf:remove_all(Db),
-	    ?vtrace("store new configuration",[]),
-	    case httpd_conf:store(Config) of
-		{ok, NewConfigDB} ->
-		    ?vlog("restart done, puh!",[]),
-		    {continue, ok, State#state{config_db = NewConfigDB}};
-		Error ->
-		    ?vlog("failed store new config: ~n   ~p",[Error]),
-		    {stop, Error, State}
-	    end;
-	Error ->
-	    ?vlog("restart NOT performed due to:"
-		  "~n   ~p",[Error]),
-	    {continue, Error, State}
-    end.
-
-
-check_constant_values(Db, Config) ->
-    %% Check port number
-    ?vtrace("check_constant_values -> check port number",[]),
-    Port = httpd_util:lookup(Db,port),
-    case httpd_util:key1search(Config,port) of  %% MUST be equal
-	Port ->
-	    ok;
-	OtherPort ->
-	    throw({error,{port_number_changed,Port,OtherPort}})
-    end,
-
-    %% Check bind address
-    ?vtrace("check_constant_values -> check bind address",[]),
-    Addr = httpd_util:lookup(Db,bind_address),
-    case httpd_util:key1search(Config,bind_address) of  %% MUST be equal
-	Addr ->
-	    ok;
-	OtherAddr ->
-	    throw({error,{addr_changed,Addr,OtherAddr}})
-    end,
-
-    %% Check socket type
-    ?vtrace("check_constant_values -> check socket type",[]),
-    SockType = httpd_util:lookup(Db, com_type),
-    case httpd_util:key1search(Config, com_type) of  %% MUST be equal
-	SockType ->
-	    ok;
-	OtherSockType ->
-	    throw({error,{sock_type_changed,SockType,OtherSockType}})
-    end,
-    ?vtrace("check_constant_values -> done",[]),
-    ok.
-
-
-%% get_ustate(State) -> idle | active | busy
-%%
-%% Retrieve the usage state of the HTTP server:
-%%   0 active connection            -> idle
-%%   max_clients active connections -> busy
-%%   Otherwise                      -> active
-%%
-get_ustate(State) ->
-    get_ustate(length(State#state.connections),State).
-
-get_ustate(0,_State) ->
-    idle;
-get_ustate(ConnectionCnt,State) ->
-    ConfigDB = State#state.config_db,
-    case httpd_util:lookup(ConfigDB, max_clients, 150) of
-	ConnectionCnt ->
-	    busy;
-	_ ->
-	    active
-    end.
-
-
-get_astate(S) -> S#state.admin_state.
-
-
-%% Timer handling functions
-start_block_tmr(infinity,_) ->
-    undefined;
-start_block_tmr(T,M) ->
-    erlang:send_after(T,self(),{block_timeout,M}).
-
-stop_block_tmr(undefined) ->
-    ok;
-stop_block_tmr(Ref) ->
-    erlang:cancel_timer(Ref).
-
-
-%% Monitor blocker functions
-monitor_blocker(Pid) when pid(Pid) ->
-    case (catch erlang:monitor(process,Pid)) of
-	MonitorRef ->
-	    MonitorRef;
-	{'EXIT',Reason} ->
-	    undefined
-    end;
-monitor_blocker(_) ->
-    undefined.
-
-demonitor_blocker(undefined) ->
-    ok;
-demonitor_blocker(Ref) ->
-    (catch erlang:demonitor(Ref)).
-
-
-%% Some status utility functions
-
-update_heavy_load_status(Status) ->
-    update_status_with_time(Status,last_heavy_load).
-
-update_connection_status(Status,ConnCount) ->
-    S1 = case lists:keysearch(max_conn,1,Status) of
-	     {value,{max_conn,C1}} when ConnCount > C1 ->
-		 lists:keyreplace(max_conn,1,Status,{max_conn,ConnCount});
-	     {value,{max_conn,C2}} ->
-		 Status;
-	     false ->
-		 [{max_conn,ConnCount}|Status]
-	 end,
-    update_status_with_time(S1,last_connection).
-
-update_status_with_time(Status,Key) ->
-    lists:keyreplace(Key,1,Status,{Key,universal_time()}).
-
-universal_time() -> calendar:universal_time().
-
-
-auth_status(P) when pid(P) ->
-    Items = [status, message_queue_len, reductions,
-	     heap_size, stack_size, current_function],
-    {auth_status, process_status(P,Items,[])};
-auth_status(_) ->
-    {auth_status, undefined}.
-
-sec_status(P) when pid(P) ->
-    Items = [status, message_queue_len, reductions,
-	     heap_size, stack_size, current_function],
-    {security_status, process_status(P,Items,[])};
-sec_status(_) ->
-    {security_status, undefined}.
-
-acceptor_status(P) when pid(P) ->
-    Items = [status, message_queue_len, reductions,
-	     heap_size, stack_size, current_function],
-    {acceptor_status, process_status(P,Items,[])};
-acceptor_status(_) ->
-    {acceptor_status, undefined}.
-
-
-manager_status(P) ->
-    Items = [status, message_queue_len, reductions,
-	     heap_size, stack_size],
-    {manager_status, process_status(P,Items,[])}.
-
-
-process_status(P,[],L) ->
-    [{pid,P}|lists:reverse(L)];
-process_status(P,[H|T],L) ->
-    case (catch process_info(P,H)) of
-	{H, Value} ->
-	    process_status(P,T,[{H,Value}|L]);
-	_ ->
-	    process_status(P,T,[{H,undefined}|L])
-    end.
-	
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd",Addr,Port).
-
-
-report_error(State,String) ->
-    Cdb = State#state.config_db,
-    error_logger:error_report(String),
-    mod_log:report_error(Cdb,String),
-    mod_disk_log:report_error(Cdb,String).
-    
-
-set_verbosity(V) ->
-    Units = [manager_verbosity, 
-	     acceptor_verbosity, request_handler_verbosity, 
-	     security_verbosity, auth_verbosity],
-    case httpd_util:key1search(V, all) of
-	undefined ->
-	    set_verbosity(V, Units);
-	Verbosity when atom(Verbosity) ->
-	    V1 = [{Unit, Verbosity} || Unit <- Units],
-	    set_verbosity(V1, Units)
-    end.
-
-set_verbosity(_V, []) ->
-    ok;
-set_verbosity(V, [manager_verbosity = Unit|Units]) ->
-    Verbosity = httpd_util:key1search(V, Unit, ?default_verbosity),
-    put(verbosity, ?vvalidate(Verbosity)),
-    set_verbosity(V, Units);
-set_verbosity(V, [Unit|Units]) ->
-    Verbosity = httpd_util:key1search(V, Unit, ?default_verbosity),
-    put(Unit, ?vvalidate(Verbosity)),
-    set_verbosity(V, Units).
-
-    
-set_verbosity(manager,V,_S) ->
-    put(verbosity,V);
-set_verbosity(acceptor,V,_S) ->
-    put(acceptor_verbosity,V);
-set_verbosity(request,V,_S) ->
-    put(request_handler_verbosity,V);
-set_verbosity(security,V,S) ->
-    OldVerbosity = put(security_verbosity,V),
-    Addr = httpd_util:lookup(S#state.config_db, bind_address),
-    Port = httpd_util:lookup(S#state.config_db, port),
-    mod_security_server:verbosity(Addr,Port,V),
-    OldVerbosity;
-set_verbosity(auth,V,S) ->
-    OldVerbosity = put(auth_verbosity,V),
-    Addr = httpd_util:lookup(S#state.config_db, bind_address),
-    Port = httpd_util:lookup(S#state.config_db, port),
-    mod_auth_server:verbosity(Addr,Port,V),
-    OldVerbosity;
-
-set_verbosity(all,V,S) ->
-    OldMv = put(verbosity,V),
-    OldAv = put(acceptor_verbosity,V),
-    OldRv = put(request_handler_verbosity,V),
-    OldSv = put(security_verbosity,V),
-    OldAv = put(auth_verbosity,V),
-    Addr  = httpd_util:lookup(S#state.config_db, bind_address),
-    Port  = httpd_util:lookup(S#state.config_db, port),
-    mod_security_server:verbosity(Addr,Port,V),
-    mod_auth_server:verbosity(Addr,Port,V),
-    [{manager,OldMv}, {request,OldRv}, {security,OldSv}, {auth, OldAv}].
-    
-    
-%%
-call(ServerRef,Request) ->
-    gen_server:call(ServerRef,Request).
-
-cast(ServerRef,Message) ->
-    gen_server:cast(ServerRef,Message).
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_misc_sup.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_misc_sup.erl
deleted file mode 100644
index 5921c5db60..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_misc_sup.erl
+++ /dev/null
@@ -1,116 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_misc_sup.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
-%%----------------------------------------------------------------------
-%% Purpose: The top supervisor for the Megaco/H.248 application
-%%----------------------------------------------------------------------
-
--module(httpd_misc_sup).
-
--behaviour(supervisor).
-
--include("httpd_verbosity.hrl").
-
-%% public
--export([start/3, stop/1, init/1]).
-
--export([start_auth_server/3, stop_auth_server/2, 
-	 start_sec_server/3,  stop_sec_server/2]).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% supervisor callback functions
-
-
-start(Addr, Port, MiscSupVerbosity) ->
-    SupName = make_name(Addr, Port),
-    supervisor:start_link({local, SupName}, ?MODULE, [MiscSupVerbosity]).
-
-stop(StartArgs) ->
-    ok.
-
-init([Verbosity]) -> % Supervisor
-    do_init(Verbosity);
-init(BadArg) ->
-    {error, {badarg, BadArg}}.
-
-do_init(Verbosity) ->
-    put(verbosity,?vvalidate(Verbosity)),
-    put(sname,misc_sup),
-    ?vlog("starting", []),
-    Flags     = {one_for_one, 0, 1},
-    KillAfter = timer:seconds(1),
-    Workers   = [],
-    {ok, {Flags, Workers}}.
-
-
-%%----------------------------------------------------------------------
-%% Function: [start|stop]_[auth|sec]_server/3
-%% Description: Starts a [auth | security] worker (child) process
-%%----------------------------------------------------------------------
-
-start_auth_server(Addr, Port, Verbosity) ->
-    start_permanent_worker(mod_auth_server, Addr, Port, 
-			   Verbosity, [gen_server]).
-
-stop_auth_server(Addr, Port) ->
-    stop_permanent_worker(mod_auth_server, Addr, Port).
-
-
-start_sec_server(Addr, Port, Verbosity) ->
-    start_permanent_worker(mod_security_server, Addr, Port, 
-			   Verbosity, [gen_server]).
-
-stop_sec_server(Addr, Port) ->
-    stop_permanent_worker(mod_security_server, Addr, Port).
-
-
-
-%%----------------------------------------------------------------------
-%% Function:    start_permanent_worker/5
-%% Description: Starts a permanent worker (child) process
-%%----------------------------------------------------------------------
-
-start_permanent_worker(Mod, Addr, Port, Verbosity, Modules) ->
-    SupName = make_name(Addr, Port),
-    Spec    = {{Mod, Addr, Port},
-	       {Mod, start_link, [Addr, Port, Verbosity]}, 
-	       permanent, timer:seconds(1), worker, [Mod] ++ Modules},
-    supervisor:start_child(SupName, Spec).
-
-
-%%----------------------------------------------------------------------
-%% Function:    stop_permanent_worker/3
-%% Description: Stops a permanent worker (child) process
-%%----------------------------------------------------------------------
-
-stop_permanent_worker(Mod, Addr, Port) ->
-    SupName = make_name(Addr, Port),
-    Name    = {Mod, Addr, Port},
-    case supervisor:terminate_child(SupName, Name) of
-	ok ->
-	    supervisor:delete_child(SupName, Name);
-	Error ->
-	    Error
-    end.
-    
-
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_misc_sup",Addr,Port).
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_parse.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_parse.erl
deleted file mode 100644
index 3f8f0837f9..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_parse.erl
+++ /dev/null
@@ -1,348 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_parse.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
--module(httpd_parse).
--export([
-	 request_header/1,
-	 hsplit/2,
-	 get_request_record/10,
-	 split_lines/1,
-	 tagup_header/1]).
--include("httpd.hrl").
-
-
-%%----------------------------------------------------------------------
-%% request_header
-%%
-%% Input: The request as sent from the client (list of characters) 
-%%        (may include part of the entity body)
-%%
-%% Returns:
-%%   {ok, Info#mod}
-%%   {not_implemented,Info#mod}
-%%   {bad_request, Reason}
-%%----------------------------------------------------------------------
-
-request_header(Header)->
-    [RequestLine|HeaderFields] = split_lines(Header),
-    ?DEBUG("request ->"
-	   "~n   RequestLine: ~p"
-	   "~n   Header:      ~p",[RequestLine,Header]),
-    ParsedHeader = tagup_header(HeaderFields),
-    ?DEBUG("request ->"
-	   "~n   ParseHeader: ~p",[ParsedHeader]),
-    case verify_request(string:tokens(RequestLine," ")) of
-	["HEAD", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
-	    {ok, ["HEAD", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
-		 ParsedHeader]};
-	["GET", RequestURI, "HTTP/0.9"] ->
-	    {ok, ["GET", RequestURI, "HTTP/0.9", RequestLine, ParsedHeader]};
-	["GET", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
-	    {ok, ["GET", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
-		 ParsedHeader]};
-	["POST", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
-	    {ok, ["POST", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
-		 ParsedHeader]};
-	%%HTTP must be 1.1 or higher
-	["TRACE", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] when N>48->
-	    {ok, ["TRACE", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
-		 ParsedHeader]};
-	[Method, RequestURI] ->
-	    {not_implemented, RequestLine, Method, RequestURI,ParsedHeader,"HTTP/0.9"};
-	[Method, RequestURI, HTTPVersion] ->
-	    {not_implemented, RequestLine, Method, RequestURI,ParsedHeader, HTTPVersion};	
-	{bad_request, Reason} ->
-	    {bad_request, Reason};
-	Reason ->
-	    {bad_request, "Unknown request method"}
-    end.		
-
-
-
-
-
-
-%%----------------------------------------------------------------------
-%% The request is passed through the server as a record of type mod get it
-%% ----------------------------------------------------------------------
-
-get_request_record(Socket,SocketType,ConfigDB,Method,RequestURI,
-		 HTTPVersion,RequestLine,ParsedHeader,EntityBody,InitData)-> 
-    PersistentConn=get_persistens(HTTPVersion,ParsedHeader,ConfigDB),
-    Info=#mod{init_data=InitData,
-	      data=[],
-	      socket_type=SocketType,
-	      socket=Socket,
-	      config_db=ConfigDB,
-	      method=Method,
-	      absolute_uri=formatAbsoluteURI(RequestURI,ParsedHeader),
-	      request_uri=formatRequestUri(RequestURI),
-	      http_version=HTTPVersion,
-	      request_line=RequestLine,
-	      parsed_header=ParsedHeader,
-	      entity_body=maybe_remove_nl(ParsedHeader,EntityBody),
-	      connection=PersistentConn},
-    {ok,Info}.
-
-%%----------------------------------------------------------------------
-%% Conmtrol wheater we shall maintain a persistent connection or not
-%%----------------------------------------------------------------------
-get_persistens(HTTPVersion,ParsedHeader,ConfigDB)->
-    case httpd_util:lookup(ConfigDB,persistent_conn,true) of
-	true->
-	    case HTTPVersion of
-		%%If it is version prio to 1.1 kill the conneciton
-		[$H, $T, $T, $P, $\/, $1, $.,N] ->
-		    case httpd_util:key1search(ParsedHeader,"connection","keep-alive")of       
-			%%if the connection isnt ordered to go down let it live
-			%%The keep-alive value is the older http/1.1 might be older
-			%%Clients that use it.
-			"keep-alive" when N >= 49 ->
-			    ?DEBUG("CONNECTION MODE: ~p",[true]),  
-			    true;
-			"close" ->
-			    ?DEBUG("CONNECTION MODE: ~p",[false]),  
-			    false;
-			Connect ->
-  			    ?DEBUG("CONNECTION MODE: ~p VALUE: ~p",[false,Connect]),  
-			    false
-		    end; 
-		_ ->
-		    ?DEBUG("CONNECTION MODE: ~p VERSION: ~p",[false,HTTPVersion]),  
-		    false
-	    
-	    end;
-	_ ->
-	    false
-    end.
-
-
-
-
-%%----------------------------------------------------------------------
-%% Control whether the last newline of the body is a part of the message or
-%%it is a part of the multipart message.
-%%----------------------------------------------------------------------
-maybe_remove_nl(Header,Rest) ->
-    case find_content_type(Header) of
-	false ->
-	    {ok,EntityBody,_}=regexp:sub(Rest,"\r\n\$",""),
-	    EntityBody;
-	{ok, Value} ->
-	    case string:str(Value, "multipart/form-data") of
-		0 ->
-		    {ok,EntityBody,_}=regexp:sub(Rest,"\r\n\$",""),
-		    EntityBody;
-		_ ->
-		    Rest
-	    end
-    end.
-
-%%----------------------------------------------------------------------
-%% Cet the content type of the incomming request
-%%----------------------------------------------------------------------
-
-
-find_content_type([]) ->
-    false;
-find_content_type([{Name,Value}|Tail]) ->
-    case httpd_util:to_lower(Name) of
-	"content-type" ->
-	    {ok, Value};
-	_ ->
-	    find_content_type(Tail)
-    end.
-
-%%----------------------------------------------------------------------
-%% Split the header to a list of strings where each string represents a 
-%% HTTP header-field
-%%----------------------------------------------------------------------
-split_lines(Request) ->
-    split_lines(Request, [], []).
-split_lines([], CAcc, Acc) ->
-    lists:reverse([lists:reverse(CAcc)|Acc]);
-
-%%White space in the header fields are allowed but the new line must begin with LWS se 
-%%rfc2616 chap 4.2. The rfc do not say what to
-split_lines([$\r, $\n, $\t |Rest], CAcc, Acc) ->
-    split_lines(Rest, [$\r, $\n |CAcc], Acc);
-
-split_lines([$\r, $\n, $\s |Rest], CAcc, Acc) ->
-    split_lines(Rest, [$\r, $\n |CAcc], Acc);
-
-split_lines([$\r, $\n|Rest], CAcc, Acc) ->
-    split_lines(Rest, [], [lists:reverse(CAcc)|Acc]);
-split_lines([Chr|Rest], CAcc, Acc) ->
-    split_lines(Rest, [Chr|CAcc], Acc).
-
-
-%%----------------------------------------------------------------------
-%% This is a 'hack' to stop people from trying to access directories/files
-%% relative to the ServerRoot.
-%%----------------------------------------------------------------------
-
-
-verify_request([Request, RequestURI]) ->
-    verify_request([Request, RequestURI, "HTTP/0.9"]);
-
-verify_request([Request, RequestURI, Protocol]) ->
-    NewRequestURI = 
-	case string:str(RequestURI, "?") of
-	    0 ->
-		RequestURI;
-	    Ndx ->
-		string:left(RequestURI, Ndx)
-	end,
-   case string:str(NewRequestURI, "..") of
-	0 ->
-	    [Request, RequestURI, Protocol];
-	_ ->
-	    {bad_request, {forbidden, RequestURI}}
-    end;
-verify_request(Request) ->
-    Request.
-		      
-%%----------------------------------------------------------------------
-%% tagup_header
-%%
-%% Parses the header of a HTTP request and returns a key,value tuple 
-%% list containing Name and Value of each header directive as of:
-%%
-%% Content-Type: multipart/mixed -> {"Content-Type", "multipart/mixed"}
-%%
-%% But in http/1.1 the field-names are case insencitive so now it must be 
-%% Content-Type: multipart/mixed -> {"content-type", "multipart/mixed"}
-%% The standard furthermore says that leading and traling white space 
-%% is not a part of the fieldvalue and shall therefore be removed.
-%%----------------------------------------------------------------------
-
-tagup_header([]) ->          [];
-tagup_header([Line|Rest]) -> [tag(Line, [])|tagup_header(Rest)].
-
-tag([], Tag) ->
-    {httpd_util:to_lower(lists:reverse(Tag)), ""};
-tag([$:|Rest], Tag) ->
-    {httpd_util:to_lower(lists:reverse(Tag)), httpd_util:strip(Rest)};
-tag([Chr|Rest], Tag) ->
-    tag(Rest, [Chr|Tag]).
-
-
-%%----------------------------------------------------------------------
-%% There are 3 possible forms of the reuqest URI 
-%%
-%%  1. * When the request is not for a special assset. is is instead
-%%     to the server itself
-%%
-%%  2. absoluteURI the whole servername port and asset is in the request
-%%
-%%  3. The most common form that http/1.0 used abs path that is a path
-%%     to the requested asset.
-%5----------------------------------------------------------------------
-formatRequestUri("*")->
-    "*";
-formatRequestUri([$h,$t,$t,$p,$:,$\/,$\/|ServerAndPath]) ->
-   removeServer(ServerAndPath);
-
-formatRequestUri([$H,$T,$T,$P,$:,$\/,$\/|ServerAndPath]) ->
-    removeServer(ServerAndPath);
-
-formatRequestUri(ABSPath) ->
-    ABSPath.
-
-removeServer([$\/|Url])->
-    case Url of
-	[]->
-	    "/";
-        _->
-	    [$\/|Url]
-    end;
-removeServer([N|Url]) ->
-    removeServer(Url).
-
-
-formatAbsoluteURI([$h,$t,$t,$p,$:,$\/,$\/|Uri],ParsedHeader)->
-    [$H,$T,$T,$P,$:,$\/,$\/|Uri];
-
-formatAbsoluteURI([$H,$T,$T,$P,$:,$\/,$\/|Uri],ParsedHeader)->
-    [$H,$T,$T,$P,$:,$\/,$\/|Uri];
-
-formatAbsoluteURI(Uri,ParsedHeader)->
-    case httpd_util:key1search(ParsedHeader,"host") of
-	undefined ->
-	    nohost;
-	Host ->
-	    Host++Uri
-    end.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%Code below is crap from an older version shall be removed when 
-%%transformation to http/1.1 is finished
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-			 
-
-
-%request(Request) ->
-%    ?DEBUG("request -> entry with:"
-%	   "~n   Request: ~s",[Request]),
- %   {BeforeEntityBody, Rest} = hsplit([], Request),
- %   ?DEBUG("request ->"
-%	   "~n   BeforeEntityBody: ~p"
-%	   "~n   Rest:             ~p",[BeforeEntityBody, Rest]),
-%    [RequestLine|Header] = split_lines(BeforeEntityBody),
-%    ?DEBUG("request ->"
-%	   "~n   RequestLine: ~p"
-%	   "~n   Header:      ~p",[RequestLine,Header]),
-%    ParsedHeader = tagup_header(Header),
-%    ?DEBUG("request ->"
-%	   "~n   ParseHeader: ~p",[ParsedHeader]),
-%    EntityBody = maybe_remove_nl(ParsedHeader,Rest),
-%    ?DEBUG("request ->"
-%	   "~n   EntityBody: ~p",[EntityBody]),
-%    case verify_request(string:tokens(RequestLine," ")) of
-%	["HEAD", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
-%	    {ok, ["HEAD", formatRequestUri(RequestURI), [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
-%		 ParsedHeader, EntityBody]};
-%	["GET", RequestURI, "HTTP/0.9"] ->
-%	    {ok, ["GET", RequestURI, "HTTP/0.9", RequestLine, ParsedHeader,
-%		 EntityBody]};
-%	["GET", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
-%	    {ok, ["GET", formatRequestUri(RequestURI), [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
-%		 ParsedHeader,EntityBody]};
-%%	["POST", RequestURI, [$H,$T,$T,$P,$/,$1,$.,N]] ->
-%	    {ok, ["POST", formatRequestUri(RequestURI), [$H,$T,$T,$P,$/,$1,$.,N], RequestLine,
-%		 ParsedHeader, EntityBody]};
-%	[Method, RequestURI] ->
-%	    {not_implemented, RequestLine, Method, RequestURI,ParsedHeader,"HTTP/0.9"};
-%	[Method, RequestURI, HTTPVersion] ->
-%	    {not_implemented, RequestLine, Method, RequestURI,ParsedHeader, HTTPVersion};	
-%	{bad_request, Reason} ->
-%	    {bad_request, Reason};
-%	Reason ->
-%	    {bad_request, "Unknown request method"}
-%    end.	
-
-hsplit(Accu,[]) ->
-    {lists:reverse(Accu), []};
-hsplit(Accu, [ $\r, $\n, $\r, $\n | Tail]) ->
-    {lists:reverse(Accu), Tail}; 
-hsplit(Accu, [H|T]) ->
-    hsplit([H|Accu],T).
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_request_handler.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_request_handler.erl
deleted file mode 100644
index 5008e6022e..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_request_handler.erl
+++ /dev/null
@@ -1,995 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_request_handler.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
--module(httpd_request_handler).
-
-%% app internal api
--export([start_link/2, synchronize/3]).
-
-%% module internal api
--export([connection/2, do_next_connection/6, read_header/7]). 
--export([parse_trailers/1, newline/1]).
-
--include("httpd.hrl").
--include("httpd_verbosity.hrl").
-
-
-%% start_link
-
-start_link(Manager, ConfigDB) ->
-    Pid = proc_lib:spawn(?MODULE, connection, [Manager, ConfigDB]),
-    {ok, Pid}.
-
-
-%% synchronize
-
-synchronize(Pid, SocketType, Socket) ->
-    Pid ! {synchronize, SocketType, Socket}.
-
-% connection 
-
-connection(Manager, ConfigDB) ->
-    {SocketType, Socket, {Status, Verbosity}} = await_synchronize(Manager),
-    put(sname,self()),
-    put(verbosity,?vvalidate(Verbosity)),
-    connection1(Status, Manager, ConfigDB, SocketType, Socket).
-
-
-connection1({reject, busy}, Manager, ConfigDB, SocketType, Socket) ->
-    handle_busy(Manager, ConfigDB, SocketType, Socket);
-
-connection1({reject, blocked}, Manager, ConfigDB, SocketType, Socket) ->
-    handle_blocked(Manager, ConfigDB, SocketType, Socket);
-
-connection1(accept, Manager, ConfigDB, SocketType, Socket) ->
-    handle_connection(Manager, ConfigDB, SocketType, Socket).
-
-
-%% await_synchronize
-
-await_synchronize(Manager) ->
-    receive
-	{synchronize, SocketType, Socket} ->
-	    ?vlog("received syncronize: "
-		  "~n   SocketType: ~p"
-		  "~n   Socket:     ~p", [SocketType, Socket]),
-	    {SocketType, Socket, httpd_manager:new_connection(Manager)}
-    after 5000 ->
-	    exit(synchronize_timeout)
-    end.
-
-
-% handle_busy
-
-handle_busy(Manager, ConfigDB, SocketType, Socket) ->
-    ?vlog("handle busy: ~p", [Socket]),
-    MaxClients = httpd_util:lookup(ConfigDB, max_clients, 150),
-    String = io_lib:format("heavy load (>~w processes)", [MaxClients]),
-    reject_connection(Manager, ConfigDB, SocketType, Socket, String).
-
-
-% handle_blocked 
-
-handle_blocked(Manager, ConfigDB, SocketType, Socket) ->
-    ?vlog("handle blocked: ~p", [Socket]),
-    String = "Server maintenance performed, try again later",
-    reject_connection(Manager, ConfigDB, SocketType, Socket, String).
-
-
-% reject_connection
-
-reject_connection(Manager, ConfigDB, SocketType, Socket, Info) ->
-    String = lists:flatten(Info),
-    ?vtrace("send status (503) message", []),
-    httpd_response:send_status(SocketType, Socket, 503, String, ConfigDB),
-    %% This ugly thing is to make ssl deliver the message, before the close...
-    close_sleep(SocketType, 1000),  
-    ?vtrace("close the socket", []),
-    close(SocketType, Socket, ConfigDB).
-
-
-% handle_connection
-
-handle_connection(Manager, ConfigDB, SocketType, Socket) ->
-    ?vlog("handle connection: ~p", [Socket]),
-    Resolve     = httpd_socket:resolve(SocketType),
-    Peername    = httpd_socket:peername(SocketType, Socket),
-    InitData    = #init_data{peername=Peername, resolve=Resolve},
-    TimeOut     = httpd_util:lookup(ConfigDB, keep_alive_timeout, 150000),
-    NrOfRequest = httpd_util:lookup(ConfigDB, max_keep_alive_request, forever),
-    ?MODULE:do_next_connection(ConfigDB, InitData, 
-			       SocketType, Socket,NrOfRequest,TimeOut),
-    ?vlog("handle connection: done", []),
-    httpd_manager:done_connection(Manager),
-    ?vlog("handle connection: close socket", []),
-    close(SocketType, Socket, ConfigDB).
-
-
-% do_next_connection
-do_next_connection(_ConfigDB, _InitData, _SocketType, _Socket, NrOfRequests, 
-		   _Timeout) when NrOfRequests < 1 -> 
-    ?vtrace("do_next_connection: done", []),
-    ok;
-do_next_connection(ConfigDB, InitData, SocketType, Socket, NrOfRequests, 
-		   Timeout) ->
-    Peername = InitData#init_data.peername,
-    case (catch read(ConfigDB, SocketType, Socket, InitData, Timeout)) of
-        {'EXIT', Reason} ->
-            ?vlog("exit reading from socket: ~p",[Reason]),
-            error_logger:error_report({'EXIT',Reason}),
-	    String = 
-		lists:flatten(
-		  io_lib:format("exit reading from socket: ~p => ~n~p~n",
-				[Socket, Reason])),
-	    error_log(mod_log, 
-		      SocketType, Socket, ConfigDB, Peername, String),
-	    error_log(mod_disk_log, 
-		      SocketType, Socket, ConfigDB, Peername, String);
-        {error, Reason} ->
-            handle_read_error(Reason,SocketType,Socket,ConfigDB,Peername);
-        Info when record(Info, mod) ->
-            case Info#mod.connection of
-                true ->
-                    ReqTimeout = httpd_util:lookup(ConfigDB, 
-						   keep_alive_timeout, 150000),
-		    ?MODULE:do_next_connection(ConfigDB,          InitData,
-					       SocketType,        Socket,
-					       dec(NrOfRequests), ReqTimeout);
-		_ ->
-                    ok
-            end;
-        _ ->
-            ok
-    end.
-
-    
-
-%% read
-read(ConfigDB, SocketType, Socket, InitData, Timeout) ->
-    ?vdebug("read from socket ~p with Timeout ~p",[Socket, Timeout]),
-    MaxHdrSz = httpd_util:lookup(ConfigDB, max_header_size, 10240),
-    case ?MODULE:read_header(SocketType, Socket, Timeout, MaxHdrSz, 
-			     ConfigDB, InitData, []) of
-	{socket_closed, Reason} ->
-	    ?vlog("Socket closed while reading request header: "
-		  "~n   ~p", [Reason]),
-	    socket_close;
-	{error, Error} ->
-	    {error, Error};
-	{ok, Info, EntityBodyPart} ->
-	    read1(SocketType, Socket, ConfigDB, InitData, Timeout, Info,
-		  EntityBodyPart)
-    end.
-
-%% Got the head and maybe a part of the body: read in the rest
-read1(SocketType, Socket, ConfigDB, InitData, Timeout, Info, BodyPart)->
-    MaxBodySz     = httpd_util:lookup(ConfigDB, max_body_size, nolimit),
-    ContentLength = content_length(Info),
-    ?vtrace("ContentLength: ~p", [ContentLength]),
-    case read_entity_body(SocketType, Socket, Timeout, MaxBodySz,
-			  ContentLength, BodyPart, Info, ConfigDB) of
-	{socket_closed, Reason} ->
-	    ?vlog("Socket closed while reading request body: "
-		  "~n   ~p", [Reason]),
-	    socket_close;
-	{ok, EntityBody} ->
-	    finish_request(EntityBody, [], Info); 
-	{ok, ExtraHeader, EntityBody} ->
-	    finish_request(EntityBody, ExtraHeader, Info);
-	Response ->
-	    httpd_socket:close(SocketType, Socket),
-	    socket_closed
-	    %% Catch up all bad return values
-    end.
-
-
-%% The request is read in send it forward to the module that 
-%% generates the response
-
-finish_request(EntityBody, ExtraHeader, 
-	       #mod{parsed_header = ParsedHeader} = Info)->
-    ?DEBUG("finish_request -> ~n"
-	"    EntityBody:   ~p~n"
-	"    ExtraHeader:  ~p~n"
-	"    ParsedHeader: ~p~n",
-	[EntityBody, ExtraHeader, ParsedHeader]),
-    httpd_response:send(Info#mod{parsed_header = ParsedHeader ++ ExtraHeader,
-				 entity_body   = EntityBody}).
-
-
-%% read_header
-
-%% This algorithm rely on the buffer size of the inet driver together
-%% with the {active, once} socket option. Atmost one message of this 
-%% size will be received at a given time. When a full header has been 
-%% read, the body is read with the recv function (the body size is known). 
-%%
-read_header(SocketType, Socket, Timeout, MaxHdrSz, ConfigDB, 
-	    InitData, SoFar0) ->
-    T = t(),
-    %% remove any newlines at the begining, they might be crap from ?
-    SoFar = remove_newline(SoFar0),
-				   
-    case terminated_header(MaxHdrSz, SoFar) of
-	{true, Header, EntityBodyPart} ->
-	    ?vdebug("read_header -> done reading header: "
-		    "~n   length(Header):         ~p"
-		    "~n   length(EntityBodyPart): ~p", 
-		    [length(Header), length(EntityBodyPart)]),
-	    transform_header(SocketType, Socket, Header, ConfigDB, InitData, 
-			     EntityBodyPart);
-	false ->
-	    ?vtrace("read_header -> "
-		    "~n   set active = 'once' and "
-		    "await a chunk of the header", []),
-	    
-	    case httpd_socket:active_once(SocketType, Socket) of
-		ok ->
-		    receive
-			%% 
-			%% TCP
-			%% 
-			{tcp, Socket, Data} ->
-			    ?vtrace("read_header(ip) -> got some data: ~p", 
-				[sz(Data)]),
-			    ?MODULE:read_header(SocketType, Socket, 
-						Timeout - (t()-T), 
-						MaxHdrSz, ConfigDB, 
-						InitData, SoFar ++ Data);
-			{tcp_closed, Socket} ->
-			    ?vtrace("read_header(ip) -> socket closed",[]),
-			    {socket_closed,normal};
-			{tcp_error, Socket, Reason} ->
-			    ?vtrace("read_header(ip) -> socket error: ~p",
-				[Reason]),
-			    {socket_closed, Reason};
-			
-			%% 
-			%% SSL
-			%% 
-			{ssl, Socket, Data} ->
-			    ?vtrace("read_header(ssl) -> got some data: ~p", 
-				[sz(Data)]),
-			    ?MODULE:read_header(SocketType, Socket, 
-						Timeout - (t()-T), 
-						MaxHdrSz, ConfigDB, 
-						InitData, SoFar ++ Data);
-			{ssl_closed, Socket} ->
-			    ?vtrace("read_header(ssl) -> socket closed", []),
-			    {socket_closed, normal};
-			{ssl_error, Socket, Reason} ->
-			    ?vtrace("read_header(ssl) -> socket error: ~p", 
-				[Reason]),
-			    {socket_closed, Reason}
-		    
-		    after Timeout ->
-			    ?vlog("read_header -> timeout", []),
-			    {socket_closed, timeout}
-		    end;
-
-		Error ->
-		    httpd_response:send_status(SocketType, Socket, 
-					       500, none, ConfigDB),
-		    Error
-	    end
-    end.
-
-
-terminated_header(MaxHdrSz, Data) ->
-    D1 = lists:flatten(Data),
-    ?vtrace("terminated_header -> Data size: ~p",[sz(D1)]),
-    case hsplit(MaxHdrSz,[],D1) of
-	not_terminated ->
-	    false;
-	[Header, EntityBodyPart] ->
-	    {true, Header++"\r\n\r\n",EntityBodyPart}
-    end.
-
-
-transform_header(SocketType, Socket, Request, ConfigDB, InitData, BodyPart) ->
-    case httpd_parse:request_header(Request) of
-	{not_implemented, RequestLine, Method, RequestURI, ParsedHeader,
-	 HTTPVersion} ->
-	    httpd_response:send_status(SocketType, Socket, 501,
-				       {Method, RequestURI, HTTPVersion},
-				       ConfigDB),
-	    {error,"Not Implemented"};
-	{bad_request, {forbidden, URI}} ->
-	    httpd_response:send_status(SocketType, Socket, 403, URI, ConfigDB),
-	    {error,"Forbidden Request"};
-	{bad_request, Reason} ->
-	    httpd_response:send_status(SocketType, Socket, 400, none, 
-				       ConfigDB),
-	    {error,"Malformed request"};
-	{ok,[Method, RequestURI, HTTPVersion, RequestLine, ParsedHeader]} ->
-	    ?DEBUG("send -> ~n"
-		   "    Method:      ~p~n"
-		   "    RequestURI:  ~p~n"
-		   "    HTTPVersion: ~p~n"
-		   "    RequestLine: ~p~n",
-		   [Method, RequestURI, HTTPVersion, RequestLine]),
-	    {ok, Info} = 
-		httpd_parse:get_request_record(Socket, SocketType, ConfigDB,
-					       Method, RequestURI, HTTPVersion,
-					       RequestLine, ParsedHeader,
-					       [], InitData),
-	    %% Control that the Host header field is provided
-	    case Info#mod.absolute_uri of
-		nohost ->
-		    case Info#mod.http_version of
-			"HTTP/1.1" ->
-			    httpd_response:send_status(Info, 400, none),
-			    {error,"No host specified"};
-			_ ->
-			    {ok, Info, BodyPart}
-		    end;
-		_ ->
-		    {ok, Info, BodyPart}
-	    end
-    end.
-
-
-hsplit(_MaxHdrSz, Accu,[]) ->
-    not_terminated;
-hsplit(_MaxHdrSz, Accu, [ $\r, $\n, $\r, $\n | Tail]) ->
-    [lists:reverse(Accu), Tail];
-hsplit(nolimit, Accu, [H|T]) ->
-    hsplit(nolimit,[H|Accu],T);
-hsplit(MaxHdrSz, Accu, [H|T]) when length(Accu) < MaxHdrSz ->
-    hsplit(MaxHdrSz,[H|Accu],T);
-hsplit(MaxHdrSz, Accu, D) ->
-    throw({error,{header_too_long,length(Accu),length(D)}}).
-
-
-
-%%----------------------------------------------------------------------
-%% The http/1.1 standard chapter 8.2.3 says that a request containing
-%% An Except header-field must be responded to by 100 (Continue) by 
-%% the server before the client sends the body.
-%%----------------------------------------------------------------------
-
-read_entity_body(SocketType, Socket, Timeout, Max, Length, BodyPart, Info,
-		 ConfigDB) when integer(Max) ->
-    case expect(Info#mod.http_version, Info#mod.parsed_header, ConfigDB) of
-	continue when Max > Length ->
-	    ?DEBUG("read_entity_body()->100 Continue  ~n", []),
-	    httpd_response:send_status(Info, 100, ""),
-	    read_entity_body2(SocketType, Socket, Timeout, Max, Length, 
-			      BodyPart, Info, ConfigDB);
-	continue when Max < Length ->
-	    httpd_response:send_status(Info, 417, "Body to big"),
-	    httpd_socket:close(SocketType, Socket),
-	    {socket_closed,"Expect denied according to size"};
-	break ->
-	    httpd_response:send_status(Info, 417, "Method not allowed"),
-	    httpd_socket:close(SocketType, Socket),
-	    {socket_closed,"Expect conditions was not fullfilled"};
-	no_expect_header ->
-	    read_entity_body2(SocketType, Socket, Timeout, Max, Length,
-			      BodyPart, Info, ConfigDB);
-	http_1_0_expect_header ->
-	    httpd_response:send_status(Info, 400, 
-				       "Only HTTP/1.1 Clients "
-				       "may use the Expect Header"),
-	    httpd_socket:close(SocketType, Socket),
-	    {socket_closed,"Due to a HTTP/1.0 expect header"}
-    end;
-
-read_entity_body(SocketType, Socket, Timeout, Max, Length, BodyPart,
-		 Info, ConfigDB) ->
-    case expect(Info#mod.http_version, Info#mod.parsed_header, ConfigDB) of
-	continue ->
-	    ?DEBUG("read_entity_body() -> 100 Continue  ~n", []),
-	    httpd_response:send_status(Info, 100, ""),
-	    read_entity_body2(SocketType, Socket, Timeout, Max, Length,
-			      BodyPart, Info, ConfigDB);
-	break->
-	    httpd_response:send_status(Info, 417, "Method not allowed"),
-	    httpd_socket:close(SocketType, Socket),
-	    {socket_closed,"Expect conditions was not fullfilled"};
-	no_expect_header ->
-	    read_entity_body2(SocketType, Socket, Timeout, Max, Length, 
-			      BodyPart, Info, ConfigDB);
-	http_1_0_expect_header ->
-	    httpd_response:send_status(Info, 400, 
-				       "HTTP/1.0 Clients are not allowed "
-				       "to use the Expect Header"),
-	    httpd_socket:close(SocketType, Socket),
-	    {socket_closed,"Expect header field in an HTTP/1.0 request"}
-	end.    
-    
-%%----------------------------------------------------------------------
-%% control if the body is transfer encoded
-%%----------------------------------------------------------------------
-read_entity_body2(SocketType, Socket, Timeout, Max, Length, BodyPart, 
-		  Info, ConfigDB) ->
-    ?DEBUG("read_entity_body2() -> "
-	"~n   Max:    ~p"
-	"~n   Length: ~p"
-	"~n   Socket: ~p", [Max, Length, Socket]),
-      
-    case transfer_coding(Info) of
-	{chunked, ChunkedData} ->
-	    ?DEBUG("read_entity_body2() -> "
-		"Transfer-encoding: Chunked Data: BodyPart ~s", [BodyPart]),
-	    read_chunked_entity(Info, Timeout, Max, Length, ChunkedData, [],
-				BodyPart);
-	unknown_coding ->
-	    ?DEBUG("read_entity_body2() -> Transfer-encoding: Unknown",[]),
-	    httpd_response:send_status(Info, 501, "Unknown Transfer-Encoding"),
-	    httpd_socket:close(SocketType, Socket),
-	    {socket_closed,"Expect conditions was not fullfilled"};
-	none ->
-	      ?DEBUG("read_entity_body2() -> Transfer-encoding: none",[]),
-	    read_entity_body(SocketType, Socket, Timeout, Max, Length, 
-			     BodyPart)
-    end.
-
-	
-%%----------------------------------------------------------------------
-%% The body was plain read it from the socket
-%% ----------------------------------------------------------------------
-read_entity_body(_SocketType, _Socket, _Timeout, _Max, 0, _BodyPart) ->
-    {ok, []};
-
-read_entity_body(_SocketType, _Socket, _Timeout, Max, Len, _BodyPart) 
-  when Max < Len ->
-    ?vlog("body to long: "
-	  "~n   Max: ~p"
-	  "~n   Len: ~p", [Max,Len]),
-    throw({error,{body_too_long,Max,Len}});
-
-%% OTP-4409: Fixing POST problem
-read_entity_body(_,_,_,_, Len, BodyPart) when Len == length(BodyPart) ->
-    ?vtrace("read_entity_body -> done when"
-	"~n   Len = length(BodyPart): ~p", [Len]),
-    {ok, BodyPart};
-
-%% OTP-4550: Fix problem with trailing garbage produced by some clients.
-read_entity_body(_, _, _, _, Len, BodyPart) when Len < length(BodyPart) ->
-    ?vtrace("read_entity_body -> done when"
-	"~n   Len:              ~p"
-	"~n   length(BodyPart): ~p", [Len, length(BodyPart)]),
-    {ok, lists:sublist(BodyPart,Len)};
-
-read_entity_body(SocketType, Socket, Timeout, Max, Len, BodyPart) ->
-    ?vtrace("read_entity_body -> entry when"
-	"~n   Len:              ~p"
-	"~n   length(BodyPart): ~p", [Len, length(BodyPart)]),
-    %% OTP-4548:
-    %% The length calculation was previously (inets-2.*) done in the 
-    %% read function. As of 3.0 it was removed from read but not 
-    %% included here.
-    L = Len - length(BodyPart), 
-    case httpd_socket:recv(SocketType, Socket, L, Timeout) of
-	{ok, Body} ->
-	    ?vtrace("read_entity_body -> received some data:"
-		"~n   length(Body): ~p", [length(Body)]),
-	    {ok, BodyPart ++ Body};
-	{error,closed} ->
-	    {socket_closed,normal};
-	{error,etimedout} ->
-	    {socket_closed, timeout};
-	{error,Reason} ->
-	    {socket_closed, Reason}; 
-	Other ->
-	    {socket_closed, Other}
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If the body of the message is encoded used the chunked transfer encoding 
-%% it looks somethin like this:
-%% METHOD URI HTTP/VSN
-%% Transfer-Encoding: chunked
-%% CRLF
-%% ChunkSize
-%% Chunk
-%% ChunkSize
-%% Chunk
-%% 0
-%% Trailer
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-read_chunked_entity(Info, Timeout, Max, Length, ChunkedData, Body, []) ->
-    ?DEBUG("read_chunked_entity()->:no_chunks ~n", []),
-    read_chunked_entity(Info#mod.socket_type, Info#mod.socket,
-			Timeout, Max, Length, ChunkedData, Body, 
-			Info#mod.config_db, Info);
-
-read_chunked_entity(Info, Timeout, Max, Length, ChunkedData, Body, BodyPart) ->
-    %% Get the size
-    ?DEBUG("read_chunked_entity() -> PrefetchedBodyPart: ~p ~n",[BodyPart]),
-    case parse_chunk_size(Info, Timeout, BodyPart) of
-	{ok, Size, NewBodyPart} when Size > 0 ->
-	    ?DEBUG("read_chunked_entity() -> Size: ~p ~n", [Size]),
-	    case parse_chunked_entity_body(Info, Timeout, Max, length(Body),
-					   Size, NewBodyPart) of
-		{ok, Chunk, NewBodyPart1} ->
-		    ?DEBUG("read_chunked_entity()->Size: ~p ~n", [Size]),
-		    read_chunked_entity(Info, Timeout, Max, Length, 
-					ChunkedData, Body ++ Chunk,
-					NewBodyPart1);
-		OK ->
-		    httpd_socket:close(Info#mod.socket_type, Info#mod.socket),
-		    {socket_closed, error}
-	    end;
-	{ok, 0, Trailers} ->
-	   ?DEBUG("read_chunked_entity()->Size: 0, Trailers: ~s Body: ~s ~n", 
-		[Trailers, Body]),
-	    case parse_chunk_trailer(Info, Timeout, Info#mod.config_db,
-				     Trailers) of
-		{ok, TrailerFields} ->
-		    {ok, TrailerFields, Body};
-		_->
-		    {ok, []}
-	    end;
-	Error ->
-	    Error
-    end.
-
-
-parse_chunk_size(Info, Timeout, BodyPart) ->
-    case httpd_util:split(remove_newline(BodyPart), "\r\n", 2) of
-	{ok, [Size, Body]} ->
-	    ?DEBUG("parse_chunk_size()->Size: ~p ~n", [Size]),
-	    {ok, httpd_util:hexlist_to_integer(Size), Body};
-	{ok, [Size]} ->
-	    ?DEBUG("parse_chunk_size()->Size: ~p ~n", [Size]),
-	    Sz = get_chunk_size(Info#mod.socket_type,
-				Info#mod.socket, Timeout, 
-				lists:reverse(Size)),
-	    {ok, Sz, []}
-    end.
-
-%%----------------------------------------------------------------------
-%% We got the chunk size get the chunk
-%%
-%% Max:     Max numbers of bytes to read may also be undefined 
-%% Length:  Numbers of bytes already read
-%% Size     Numbers of byte to read for the chunk
-%%----------------------------------------------------------------------
-
-%% body to big
-parse_chunked_entity_body(Info, Timeout, Max, Length, Size, BodyPart) 
-  when Max =< (Length + Size) ->
-    {error, body_to_big};
-
-%% Prefetched body part is bigger than the current chunk
-%% (i.e. BodyPart includes more than one chunk)
-parse_chunked_entity_body(Info, Timeout, Max, Length, Size, BodyPart) 
-  when (Size+2) =< length(BodyPart) ->
-    Chunk = string:substr(BodyPart, 1, Size),
-    Rest  = string:substr(BodyPart, Size+3),
-    ?DEBUG("parse_chunked_entity_body() -> ~nChunk: ~s ~nRest: ~s ~n", 
-	[Chunk, Rest]),
-    {ok, Chunk, Rest};
-
-
-%% We just got a part of the current chunk
-parse_chunked_entity_body(Info, Timeout, Max, Length, Size, BodyPart) ->
-    %% OTP-4551:
-    %% Subtracting BodyPart from Size does not produce an integer 
-    %% when BodyPart is a list...
-    Remaining = Size - length(BodyPart), 
-    LastPartOfChunk = read_chunked_entity_body(Info#mod.socket_type,
-					       Info#mod.socket,
-					       Timeout, Max, 
-					       Length, Remaining),
-    %% Remove newline
-    httpd_socket:recv(Info#mod.socket_type, Info#mod.socket, 2, Timeout),
-    ?DEBUG("parse_chunked_entity_body() -> "
-	"~nBodyPart: ~s"
-	"~nLastPartOfChunk: ~s  ~n",
-	[BodyPart, LastPartOfChunk]),
-    {ok, BodyPart ++ LastPartOfChunk, []}.
-    
-
-%%----------------------------------------------------------------------
-%% If the data we got along with the header contained the whole chunked body 
-%% It may aswell contain the trailer :-(
-%%----------------------------------------------------------------------
-%% Either trailer begins with  \r\n and then all data is there or 
-%% The trailer has data  then read upto \r\n\r\n
-parse_chunk_trailer(Info,Timeout,ConfigDB,"\r\n")->
-    {ok,[]};
-parse_chunk_trailer(Info,Timeout,ConfigDB,Trailers) ->
-    ?DEBUG("parse_chunk_trailer()->Trailers: ~s ~n", [Trailers]),
-    case string:rstr(Trailers,"\r\n\r\n") of
-	0 ->
-	    MaxHdrSz=httpd_util:lookup(ConfigDB, max_header_size, 10240),
-	    read_trailer_end(Info,Timeout,MaxHdrSz,Trailers);
-	_->
-	    %%We got the whole header parse it up
-	    parse_trailers(Trailers)
-    end.
-
-parse_trailers(Trailer)->
-    ?DEBUG("parse_trailer()->Trailer: ~s",[Trailer]),
-    {ok,[Fields0|Crap]}=httpd_util:split(Trailer,"\r\n\r\n",2),
-    Fields=string:tokens(Fields0,"\r\n"),
-	[getTrailerField(X)||X<-Fields,lists:member($:,X)].
-
-
-read_trailer_end(Info,Timeout,MaxHdrSz,[])->
-    ?DEBUG("read_trailer_end()->[]",[]),
-    case read_trailer(Info#mod.socket_type,Info#mod.socket,
-		 Timeout,MaxHdrSz,[],[],
-		      httpd_util:key1search(Info#mod.parsed_header,"trailer",[])) of
-	{ok,Trailers}->
-	    Trailers;
-	_->
-	    []
-    end;
-read_trailer_end(Info,Timeout,MaxHdrSz,Trailers)->
-    ?DEBUG("read_trailer_end()->Trailers: ~s ~n ",[Trailers]),
-    %% Get the last paart of the the last headerfield
-    End=lists:reverse(lists:takewhile(fun(X)->case X of 10 ->false;13->false;_ ->true end end,lists:reverse(Trailers))),
-    Fields0=regexp:split(Trailers,"\r\n"),
-    %%Get rid of the last header field
-    [_Last|Fields]=lists:reverse(Fields0),
-    Headers=[getTrailerField(X)||X<-Fields,lists:member($:,X)],
-    case read_trailer(Info#mod.socket_type,Info#mod.socket,
-		 Timeout,MaxHdrSz,Headers,End,
-		      httpd_util:key1search(Info#mod.parsed_header,"trailer",[])) of
-	{ok,Trailers}->
-	    Trailers;
-	_->
-	    []
-    end.
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The code below is a a good way to read in chunked encoding but 
-%% that require that the encoding comes from a stream and not from a list 
-%%&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-
-%%----------------------------------------------------------------------
-%% The body is encoded by chubnked encoding read it in
-%% ChunkedData= Chunked extensions
-%% Body= the inread chunked body
-%% Max:     Max numbers of bytes to read
-%% Length:  Numbers of bytes already readed
-%% Size     Numbers of byte to read for the chunk
-%%----------------------------------------------------------------------    
-
-
-
-read_chunked_entity(SocketType, Socket, Timeout, Max, Length, ChunkedData,
-		    Body, ConfigDB, Info) ->
-    T = t(),
-    case get_chunk_size(SocketType,Socket,Timeout,[]) of
-	Size when integer(Size), Size>0 ->
-	    case read_chunked_entity_body(SocketType, Socket, 
-					  Timeout-(t()-T),
-					  Max, length(Body), Size) of
-		{ok,Chunk} ->
-		    ?DEBUG("read_chunked_entity/9 Got a chunk: ~p " ,[Chunk]),
-		    %% Two bytes are left of the chunk, that is the CRLF 
-		    %% at the end that is not a part of the message
-		    %% So we read it and do nothing with it.
-		    httpd_socket:recv(SocketType,Socket,2,Timeout-(t()-T)),
-		    read_chunked_entity(SocketType, Socket, Timeout-(t()-T),
-					Max, Length, ChunkedData, Body++Chunk,
-					ConfigDB, Info);
-		Error ->
-		    ?DEBUG("read_chunked_entity/9 Error: ~p " ,[Error]),
-		    httpd_socket:close(SocketType,Socket),
-		    {socket_closed,error}
-	    end;
-	Size when integer(Size), Size == 0 ->
-	    %% Must read in any trailer fields here
-	    read_chunk_trailer(SocketType, Socket, Timeout,
-			       Max, Info, ChunkedData, Body, ConfigDB);
-	Error ->
-	    Error
-    end.
-
-
-%% If a user wants to send header data after the chunked data we 
-%% must pick it out
-read_chunk_trailer(SocketType, Socket, Timeout, Max, Info, ChunkedData,
-		   Body, ConfigDB) ->
-    ?DEBUG("read_chunk_trailer/8: ~p " ,[Body]),
-    MaxHdrSz = httpd_util:lookup(ConfigDB,max_header_size,10240),
-    case httpd_util:key1search(Info#mod.parsed_header,"trailer")of
-	undefined ->
-	    {ok,Body};
-	Fields ->
-	    case read_trailer(SocketType, Socket, Timeout,
-			      MaxHdrSz, [], [],
-			      string:tokens(
-				httpd_util:to_lower(Fields),",")) of
-		{ok,[]} ->
-		    {ok,Body};
-		{ok,HeaderFields} ->
-		    % ParsedExtraHeaders = 
-		    % httpd_parse:tagup_header(httpd_parse:split_lines(HeaderFields)),
-		    {ok,HeaderFields,Body};
-		Error ->
-		    Error
-	    end
-    end.
-
-read_chunked_entity_body(SocketType, Socket, Timeout, Max, Length, Size) 
-  when integer(Max) ->
-    read_entity_body(SocketType, Socket, Timeout, Max-Length, Size, []);
-
-read_chunked_entity_body(SocketType, Socket, Timeout, Max, _Length, Size) ->
-    read_entity_body(SocketType, Socket, Timeout, Max, Size, []).
-
-%% If we read in the \r\n the httpd_util:hexlist_to_integer
-%% Will remove it and we get rid of it emmediatly :-) 
-get_chunk_size(SocketType, Socket, Timeout, Size) ->
-    T = t(),
-    ?DEBUG("get_chunk_size: ~p " ,[Size]),
-    case httpd_socket:recv(SocketType,Socket,1,Timeout) of
-	{ok,[Digit]} when Digit==$\n ->
-	    httpd_util:hexlist_to_integer(lists:reverse(Size));
-       {ok,[Digit]} ->
-	    get_chunk_size(SocketType,Socket,Timeout-(t()-T),[Digit|Size]);
-	{error,closed} ->
-	    {socket_closed,normal};
-	{error,etimedout} ->
-	    {socket_closed, timeout};
-	{error,Reason} ->
-	    {socket_closed, Reason}; 
-	Other ->
-	    {socket_closed,Other}
-    end.
-
-
-
-
-%%----------------------------------------------------------------------
-%% Reads the HTTP-trailer
-%% Would be easy to tweak the read_head to do this but in this way
-%% the chunked encoding can be updated better.
-%%----------------------------------------------------------------------
-
-
-%% When end is reached
-%% read_trailer(SocketType,Socket,Timeout,MaxHdrSz,Headers,Last,[]) ->
-%%    {ok,Headers};
-
-%% When header to big    
-read_trailer(_,_,_,MaxHdrSz,Headers,Bs,_Fields) 
-  when MaxHdrSz < length(Headers) ->
-    ?vlog("header to long: "
-	  "~n   MaxHdrSz:   ~p"
-	  "~n   length(Bs): ~p", [MaxHdrSz,length(Bs)]),
-    throw({error,{header_too_long,MaxHdrSz,length(Bs)}});
-
-%% The last Crlf is there 
-read_trailer(_, _, _, _, Headers, [$\n, $\r], _) ->
-    {ok,Headers};
-
-read_trailer(SocketType, Socket, Timeout, MaxHdrSz, Headers,
-	     [$\n, $\r|Rest], Fields) ->
-    case getTrailerField(lists:reverse(Rest))of
-	{error,Reason}->
-	    {error,"Bad trailer"};
-	{HeaderField,Value}->
-	    case lists:member(HeaderField,Fields) of
-		true ->
-		    read_trailer(SocketType,Socket,Timeout,MaxHdrSz,
-				 [{HeaderField,Value} |Headers],[],
-				 lists:delete(HeaderField,Fields));
-		false ->
-		    read_trailer(SocketType,Socket,Timeout,MaxHdrSz,
-				 Headers,[],Fields)
-	    end
-    end;
-
-% read_trailer(SocketType,Socket,Timeout,MaxHdrSz,Headers,[$\n, $\r|Rest],Fields) ->
-%     case Rest of
-% 	[] ->
-% 	   read_trailer(SocketType,Socket,Timeout,MaxHdrSz,Headers,Rest,Fields);
-% 	Field ->
-% 	    case getTrailerField(lists:reverse(Rest))of
-% 		{error,Reason}->
-% 		    {error,"Bad trailer"};
-% 		{HeaderField,Value}->
-% 		    case lists:member(HeaderField,Fields) of
-% 			true ->
-% 			    read_trailer(SocketType,Socket,Timeout,MaxHdrSz,
-% 					 [{HeaderField,Value} |Headers],[],
-% 					 lists:delete(HeaderField,Fields));
-% 			false ->
-% 			    read_trailer(SocketType,Socket,Timeout,MaxHdrSz,
-% 					 Headers,[],Fields)
-% 		    end
-% 	    end
-%     end;
-
-read_trailer(SocketType,Socket,Timeout,MaxHdrSz,Headers,Bs,Fields) ->
-    %% ?vlog("read_header -> entry with Timeout: ~p",[Timeout]),
-    T = t(),
-    case (catch httpd_socket:recv(SocketType,Socket,1,Timeout)) of
-	{ok,[B]} ->
-	    read_trailer(SocketType, Socket, Timeout-(t()-T),
-			 MaxHdrSz, Headers, [B|Bs], Fields);
-	{error,closed} ->
-	    {socket_closed,normal};
-	{error,etimedout} ->
-	    {socket_closed, timeout};
-	{error,Reason} ->
-	    {socket_closed, Reason};
-	Other ->
-	    {socket_closed,Other}
-    end.
-
-getTrailerField(HeaderField)->
-   case string:str(HeaderField,":") of
-       0->
-	   {error,"badheaderfield"};
-       Number ->
-	   {httpd_util:to_lower(string:substr(HeaderField,1,Number-1)),
-	    httpd_util:to_lower(string:substr(HeaderField,Number+1))}
-   end.
-
-	    
-    
-
-%% Time in milli seconds
-t() ->
-    {A,B,C} = erlang:now(),
-    A*1000000000+B*1000+(C div 1000).
-
-%%----------------------------------------------------------------------
-%% If the user sends an expect header-field with the value 100-continue
-%% We must send a 100 status message if he is a HTTP/1.1 client. 
-
-%% If it is an HTTP/1.0 client it's little more difficult.
-%% If expect is not defined it is easy but in the other case shall we 
-%% Break or the transmission or let it continue the standard is not clear 
-%% if to break connection or wait for data.  
-%%----------------------------------------------------------------------
-expect(HTTPVersion,ParsedHeader,ConfigDB)->    
-    case HTTPVersion of
-	[$H,$T,$T,$P,$\/,$1,$.,N|_Whatever]when N>=1->
-	    case httpd_util:key1search(ParsedHeader,"expect") of
-		"100-continue" ->
-		    continue; 
-		undefined ->
-		    no_expect_header;
-		NewValue ->
-		    break
-	    end;
-	_OldVersion ->
-	    case httpd_util:key1search(ParsedHeader,"expect") of
-		undefined ->
-		    no_expect_header;
-		NewValue ->
-		    case httpd_util:lookup(ConfigDB,expect,continue) of
-			continue->
-			    no_expect_header;
-			_ ->
-			    http_1_0_expect_header
-		    end
-	    end
-    end.
-
-
-%%----------------------------------------------------------------------
-%% According to the http/1.1 standard all applications must understand
-%% Chunked encoded data. (Last line chapter 3.6.1).		
-transfer_coding(#mod{parsed_header = Ph}) ->
-    case httpd_util:key1search(Ph, "transfer-encoding", none) of
-	none ->
-	    none;
-	[$c,$h,$u,$n,$k,$e,$d|Data]->
-	    {chunked,Data};
-	_ ->
-	    unknown_coding
-    end.
-
-
-
-handle_read_error({header_too_long,Max,Rem},
-                  SocketType,Socket,ConfigDB,Peername) ->
-    String = io_lib:format("header too long: ~p : ~p",[Max,Rem]),
-    handle_read_error(ConfigDB,String,SocketType,Socket,Peername,
-                      max_header_action,close);
-handle_read_error({body_too_long,Max,Actual},
-                  SocketType,Socket,ConfigDB,Peername) ->
-    String = io_lib:format("body too long: ~p : ~p",[Max,Actual]),
-    handle_read_error(ConfigDB,String,SocketType,Socket,Peername,
-                      max_body_action,close);
-handle_read_error(Error,SocketType,Socket,ConfigDB,Peername) ->
-    ok.
-
-
-handle_read_error(ConfigDB, ReasonString, SocketType, Socket, Peername,
-                  Item, Default) ->
-    ?vlog("error reading request: ~s",[ReasonString]),
-    E = lists:flatten(
-          io_lib:format("Error reading request: ~s",[ReasonString])),
-    error_log(mod_log, SocketType, Socket, ConfigDB, Peername, E),
-    error_log(mod_disk_log, SocketType, Socket, ConfigDB, Peername, E),
-    case httpd_util:lookup(ConfigDB,Item,Default) of
-        reply414 ->
-            send_read_status(SocketType, Socket, 414, ReasonString, ConfigDB);
-        _ ->
-            ok
-    end.
-    
-send_read_status(SocketType, Socket, Code, ReasonString, ConfigDB) ->
-    httpd_response:send_status(SocketType, Socket, Code, ReasonString, 
-			       ConfigDB).
-
-
-error_log(Mod, SocketType, Socket, ConfigDB, Peername, String) ->
-    Modules = httpd_util:lookup(ConfigDB, modules,
-				[mod_get, mod_head, mod_log]),
-    case lists:member(Mod, Modules) of
-	true ->
-	    Mod:error_log(SocketType, Socket, ConfigDB, Peername, String);
-	_ ->
-	    ok
-    end.
-
-    
-sz(L) when list(L) ->
-    length(L);
-sz(B) when binary(B) ->
-    size(B);
-sz(O) ->
-    {unknown_size,O}.
-
-
-%% Socket utility functions:
-
-close(SocketType, Socket, ConfigDB) ->
-    case httpd_socket:close(SocketType, Socket) of
-        ok ->
-            ok;
-        {error, Reason} ->
-            ?vlog("error while closing socket: ~p",[Reason]),
-	    ok
-    end.
-
-close_sleep({ssl, _}, Time) ->
-    sleep(Time);
-close_sleep(_, _) ->
-    ok.
-
-
-sleep(T) -> receive after T -> ok end.
-
-
-dec(N) when integer(N) ->
-    N-1;
-dec(N) ->
-    N.
-
-
-content_length(#mod{parsed_header = Ph}) ->
-    list_to_integer(httpd_util:key1search(Ph, "content-length","0")).
-
-
-remove_newline(List)->
-    lists:dropwhile(fun newline/1,List).
-
-newline($\r) ->
-    true;
-newline($\n) ->
-    true;
-newline(_Sign) ->
-    false.
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_response.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_response.erl
deleted file mode 100644
index 4c7f8e0c8f..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_response.erl
+++ /dev/null
@@ -1,437 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_response.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
--module(httpd_response).
--export([send/1, send_status/3, send_status/5]).
-
-%%code is the key for the statuscode ex: 200 404 ...
--define(HTTP11HEADERFIELDS,[content_length, accept_ranges, cache_control, date,
-			    pragma, trailer, transfer_encoding, etag, location,
-			    retry_after, server, allow, 
-			    content_encoding, content_language, 
-			    content_location, content_MD5, content_range,
-			    content_type, expires, last_modified]).
-
--define(HTTP10HEADERFIELDS,[content_length, date, pragma, transfer_encoding,
-			    location, server, allow, content_encoding, 
-			    content_type, last_modified]).
-
--define(PROCEED_RESPONSE(StatusCode, Info), 
-	{proceed, 
-	 [{response,{already_sent, StatusCode, 
-		     httpd_util:key1search(Info#mod.data,content_lenght)}}]}).
-
-
--include("httpd.hrl").
-
--define(VMODULE,"RESPONSE").
--include("httpd_verbosity.hrl").
-
-%% send
-
-send(#mod{config_db = ConfigDB} = Info) ->
-    ?vtrace("send -> Request line: ~p", [Info#mod.request_line]),
-    Modules = httpd_util:lookup(ConfigDB,modules,[mod_get, mod_head, mod_log]),
-    case traverse_modules(Info, Modules) of
-	done ->
-	    Info;
-	{proceed, Data} ->
-	    case httpd_util:key1search(Data, status) of
-		{StatusCode, PhraseArgs, Reason} ->
-		    ?vdebug("send -> proceed/status: ~n"
-			    "~n   StatusCode: ~p"
-			    "~n   PhraseArgs: ~p"
-			    "~n   Reason:     ~p",
-			    [StatusCode, PhraseArgs, Reason]),
-		    send_status(Info, StatusCode, PhraseArgs),
-		    Info;
-		
-		undefined ->
-		    case httpd_util:key1search(Data, response) of
-			{already_sent, StatusCode, Size} ->
-			    ?vtrace("send -> already sent: "
-				    "~n   StatusCode: ~p"
-				    "~n   Size:       ~p", 
-				    [StatusCode, Size]),
-			    Info;
-			{response, Header, Body} -> %% New way
-			    send_response(Info, Header, Body),
-			    Info;
-			{StatusCode, Response} ->   %% Old way
-			    send_response_old(Info, StatusCode, Response),
-			    Info;
-			undefined ->
-			    ?vtrace("send -> undefined response", []),
-			    send_status(Info, 500, none),
-			    Info
-		    end
-	    end
-    end.
-
-
-%% traverse_modules
-
-traverse_modules(Info,[]) ->
-    {proceed,Info#mod.data};
-traverse_modules(Info,[Module|Rest]) ->
-    case (catch apply(Module,do,[Info])) of
-	{'EXIT', Reason} ->
-	    ?vlog("traverse_modules -> exit reason: ~p",[Reason]),
-	    String = 
-		lists:flatten(
-		  io_lib:format("traverse exit from apply: ~p:do => ~n~p",
-				[Module, Reason])),
-	    report_error(mod_log, Info#mod.config_db, String),
-	    report_error(mod_disk_log, Info#mod.config_db, String),
-	    done;
-	done ->
-	    done;
-	{break,NewData} ->
-	    {proceed,NewData};
-	{proceed,NewData} ->
-	    traverse_modules(Info#mod{data=NewData},Rest)
-    end.
-
-%% send_status %%
-
-
-send_status(#mod{socket_type = SocketType, 
-		 socket      = Socket, 
-		 connection  = Conn} = Info, 100, _PhraseArgs) ->
-    ?DEBUG("send_status -> StatusCode: ~p~n",[100]),
-    Header = httpd_util:header(100, Conn),
-    httpd_socket:deliver(SocketType, Socket,
-			 [Header, "Content-Length:0\r\n\r\n"]);
-
-send_status(#mod{socket_type = SocketType, 
-		 socket      = Socket, 
-		 config_db   = ConfigDB} = Info, StatusCode, PhraseArgs) ->
-    send_status(SocketType, Socket, StatusCode, PhraseArgs, ConfigDB).
-
-send_status(SocketType, Socket, StatusCode, PhraseArgs, ConfigDB) ->
-    ?DEBUG("send_status -> ~n"
-	"    StatusCode: ~p~n"
-	"    PhraseArgs: ~p",
-	[StatusCode, PhraseArgs]),
-    Header       = httpd_util:header(StatusCode, "text/html", false),
-    ReasonPhrase = httpd_util:reason_phrase(StatusCode),
-    Message      = httpd_util:message(StatusCode, PhraseArgs, ConfigDB),
-    Body         = get_body(ReasonPhrase, Message),
-    Header1 = 
-	Header ++ 
-	"Content-Length:" ++ 
-	integer_to_list(length(Body)) ++
-	"\r\n\r\n",
-    httpd_socket:deliver(SocketType, Socket, [Header1, Body]).
-
-
-get_body(ReasonPhrase, Message)->
-    "<HTML>
-       <HEAD>
-           <TITLE>"++ReasonPhrase++"</TITLE>
-      </HEAD>
-      <BODY>
-      <H1>"++ReasonPhrase++"</H1>\n"++Message++"\n</BODY>
-      </HTML>\n".
-
-
-%%% Create a response from the Key/Val tuples In the Head  List
-%%% Body is a tuple {body,Fun(),Args}
-
-%% send_response
-%% Allowed Fields 
-
-% HTTP-Version StatusCode Reason-Phrase
-% *((general-headers
-%   response-headers
-%    entity-headers)CRLF)
-%  CRLF
-% ?(BODY)
-
-% General Header fields
-% ======================
-% Cache-Control cache_control
-% Connection %%Is set dependiong on the request
-% Date
-% Pramga
-% Trailer
-% Transfer-Encoding
-
-% Response Header field
-% =====================
-% Accept-Ranges
-% (Age) Mostly for proxys
-% Etag
-% Location
-% (Proxy-Authenticate) Only for proxies
-% Retry-After
-% Server
-% Vary
-% WWW-Authenticate
-%
-% Entity Header Fields
-% ====================
-% Allow
-% Content-Encoding
-% Content-Language
-% Content-Length
-% Content-Location
-% Content-MD5
-% Content-Range
-% Content-Type
-% Expires
-% Last-Modified
- 
-
-send_response(Info, Header, Body) ->
-    ?vtrace("send_response -> (new) entry with"
-	    "~n   Header:       ~p", [Header]),
-    case httpd_util:key1search(Header, code) of
-	undefined ->
-	    %% No status code 
-	    %% Ooops this must be very bad:
-	    %% generate a 404 content not availible
-	    send_status(Info, 404, "The file is not availible");
-	StatusCode ->
-	    case send_header(Info, StatusCode, Header) of
-		ok ->
-		    send_body(Info, StatusCode, Body);
-		Error ->
-		    ?vlog("head delivery failure: ~p", [Error]),
-		    done   
-	    end
-    end.
-
-
-send_header(#mod{socket_type  = Type, socket     = Sock, 
-		 http_version = Ver,  connection = Conn} = Info, 
-	    StatusCode, Head0) ->
-    ?vtrace("send_haeder -> entry with"
-	    "~n   Ver:  ~p"
-	    "~n   Conn: ~p", [Ver, Conn]),
-    Head1 = create_header(Ver, Head0),
-    StatusLine = [Ver, " ",
-		  io_lib:write(StatusCode), " ",
-		  httpd_util:reason_phrase(StatusCode), "\r\n"],
-    Connection = get_connection(Conn, Ver),
-    Head = list_to_binary([StatusLine, Head1, Connection,"\r\n"]),
-    ?vtrace("deliver head", []),
-    httpd_socket:deliver(Type, Sock, Head).
-
-
-send_body(_, _, nobody) ->
-    ?vtrace("send_body -> no body", []),
-    ok;
-
-send_body(#mod{socket_type = Type, socket = Sock}, 
-	  StatusCode, Body) when list(Body) ->
-    ?vtrace("deliver body of size ~p", [length(Body)]),
-    httpd_socket:deliver(Type, Sock, Body);
-
-send_body(#mod{socket_type = Type, socket = Sock} = Info, 
-	  StatusCode, {Fun, Args}) ->
-    case (catch apply(Fun, Args)) of
-	close ->
-	    httpd_socket:close(Type, Sock),
-	    done;
-
-	sent ->
-	    ?PROCEED_RESPONSE(StatusCode, Info);
-	
-	{ok, Body} ->
-	    ?vtrace("deliver body", []),
-	    case httpd_socket:deliver(Type, Sock, Body) of
-		ok ->
-		    ?PROCEED_RESPONSE(StatusCode, Info);
-		Error ->
-		    ?vlog("body delivery failure: ~p", [Error]),
-		    done
-	    end;	    
-
-	Error ->
-	    ?vlog("failure of apply(~p,~p): ~p", [Fun, Args, Error]),
-	    done
-    end;
-send_body(I, S, B) ->
-    ?vinfo("BAD ARGS: "
-	   "~n   I: ~p"
-	   "~n   S: ~p"
-	   "~n   B: ~p", [I, S, B]),
-    exit({bad_args, {I, S, B}}).
-    
-
-%% Return a HTTP-header field that indicates that the 
-%% connection will be inpersistent
-get_connection(true,"HTTP/1.0")->
-    "Connection:close\r\n";
-get_connection(false,"HTTP/1.1") ->
-    "Connection:close\r\n";
-get_connection(_,_) ->
-    "".
-
-
-create_header("HTTP/1.1", Data) ->
-    create_header1(?HTTP11HEADERFIELDS, Data);
-create_header(_, Data) ->
-    create_header1(?HTTP10HEADERFIELDS, Data).
-
-create_header1(Fields, Data) ->
-    ?DEBUG("create_header() -> "
-	   "~n   Fields :~p~n   Data: ~p ~n", [Fields, Data]),
-    mapfilter(fun(Field)->
-		      transform({Field, httpd_util:key1search(Data, Field)})
-	      end, Fields, undefined).
-
-
-%% Do a map and removes the values that evaluates to RemoveVal
-mapfilter(Fun,List,RemoveVal)->	
-    mapfilter(Fun,List,[],RemoveVal).
-
-mapfilter(Fun,[],[RemoveVal|Acc],RemoveVal)->
-    Acc;
-mapfilter(Fun,[],Acc,_RemoveVal)->
-    Acc;
-			     
-mapfilter(Fun,[Elem|Rest],[RemoveVal|Acc],RemoveVal)->
-    mapfilter(Fun,Rest,[Fun(Elem)|Acc],RemoveVal);
-mapfilter(Fun,[Elem|Rest],Acc,RemoveVal)->
-    mapfilter(Fun,Rest,[Fun(Elem)|Acc],RemoveVal).
- 
-
-transform({content_type,undefined})->
-    ["Content-Type:text/plain\r\n"];
-
-transform({date,undefined})->
-    ["Date:",httpd_util:rfc1123_date(),"\r\n"];
-
-transform({date,RFCDate})->
-    ["Date:",RFCDate,"\r\n"];
-
-
-transform({_Key,undefined})->
-		 undefined;
-transform({accept_ranges,Value})->
-    ["Accept-Ranges:",Value,"\r\n"];
-transform({cache_control,Value})->
-    ["Cache-Control:",Value,"\r\n"];
-transform({pragma,Value})->
-    ["Pragma:",Value,"\r\n"];
-transform({trailer,Value})->
-    ["Trailer:",Value,"\r\n"];
-transform({transfer_encoding,Value})->
-    ["Pragma:",Value,"\r\n"];
-transform({etag,Value})->
-    ["ETag:",Value,"\r\n"];
-transform({location,Value})->
-    ["Retry-After:",Value,"\r\n"];
-transform({server,Value})->
-    ["Server:",Value,"\r\n"];
-transform({allow,Value})->
-    ["Allow:",Value,"\r\n"];
-transform({content_encoding,Value})->
-    ["Content-Encoding:",Value,"\r\n"];
-transform({content_language,Value})->
-    ["Content-Language:",Value,"\r\n"];
-transform({retry_after,Value})->
-    ["Retry-After:",Value,"\r\n"];
-transform({server,Value})->
-    ["Server:",Value,"\r\n"];
-transform({allow,Value})->
-    ["Allow:",Value,"\r\n"];
-transform({content_encoding,Value})->
-    ["Content-Encoding:",Value,"\r\n"];
-transform({content_language,Value})->
-    ["Content-Language:",Value,"\r\n"];
-transform({content_location,Value})->
-    ["Content-Location:",Value,"\r\n"];
-transform({content_length,Value})->
-    ["Content-Length:",Value,"\r\n"];
-transform({content_MD5,Value})->
-    ["Content-MD5:",Value,"\r\n"];
-transform({content_range,Value})->
-    ["Content-Range:",Value,"\r\n"];
-transform({content_type,Value})->
-    ["Content-Type:",Value,"\r\n"];
-transform({expires,Value})->
-    ["Expires:",Value,"\r\n"];
-transform({last_modified,Value})->
-    ["Last-Modified:",Value,"\r\n"].
-
-
-
-%%----------------------------------------------------------------------
-%% This is the old way of sending data it is strongly encouraged to 
-%% Leave this method and go on to the newer form of response
-%% OTP-4408
-%%----------------------------------------------------------------------
-
-send_response_old(#mod{socket_type = Type, 
-		       socket      = Sock, 
-		       method      = "HEAD"} = Info,
-		  StatusCode, Response) ->
-    ?vtrace("send_response_old(HEAD) -> entry with"
-	    "~n   StatusCode: ~p"
-	    "~n   Response:   ~p",
-	    [StatusCode,Response]),
-    case httpd_util:split(lists:flatten(Response),"\r\n\r\n|\n\n",2) of
-	{ok, [Head, Body]} ->
-	    Header = 
-		httpd_util:header(StatusCode,Info#mod.connection) ++
-		"Content-Length:" ++ content_length(Body), 
-	    httpd_socket:deliver(Type, Sock, [Header,Head,"\r\n"]);
-
-	Error ->
-	    send_status(Info, 500, "Internal Server Error")
-    end;
-
-send_response_old(#mod{socket_type = Type, 
-		       socket      = Sock} = Info,
-		  StatusCode, Response) ->
-    ?vtrace("send_response_old -> entry with"
-	    "~n   StatusCode: ~p"
-	    "~n   Response:   ~p",
-	    [StatusCode,Response]),
-    case httpd_util:split(lists:flatten(Response),"\r\n\r\n|\n\n",2) of
-	{ok, [_Head, Body]} ->
-	    Header = 
-		httpd_util:header(StatusCode,Info#mod.connection) ++
-		"Content-Length:" ++ content_length(Body), 
-	    httpd_socket:deliver(Type, Sock, [Header, Response]);
-
-	{ok, Body} ->
-	    Header = 
-		httpd_util:header(StatusCode,Info#mod.connection) ++
-		"Content-Length:" ++ content_length(Body) ++ "\r\n", 
-	    httpd_socket:deliver(Type, Sock, [Header, Response]);
-
-	{error, Reason} ->
-	    send_status(Info, 500, "Internal Server Error")
-    end.
-
-content_length(Body)->
-    integer_to_list(httpd_util:flatlength(Body))++"\r\n".
-
-
-report_error(Mod, ConfigDB, Error) ->
-    Modules = httpd_util:lookup(ConfigDB, modules,
-				[mod_get, mod_head, mod_log]),
-    case lists:member(Mod, Modules) of
-	true ->
-	    Mod:report_error(ConfigDB, Error);
-	_ ->
-	    ok
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_socket.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_socket.erl
deleted file mode 100644
index 95dfc5e824..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_socket.erl
+++ /dev/null
@@ -1,381 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_socket.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
--module(httpd_socket).
--export([start/1,
-	 listen/2, listen/3, accept/2, accept/3,
-	 deliver/3, send/3, recv/4, 
-	 close/2,
-	 peername/2, resolve/1, config/1,
-	 controlling_process/3,
-	 active_once/2]).
-
--include("httpd.hrl").
-
--define(VMODULE,"SOCKET").
--include("httpd_verbosity.hrl").
-
--include_lib("kernel/include/inet.hrl").
-
-%% start -> ok | {error,Reason}
-
-start(ip_comm) ->
-    case inet_db:start() of
-	{ok,_Pid} ->
-	    ok;
-	{error,{already_started,_Pid}} ->
-	    ok;
-	Error ->
-	    Error
-    end;
-start({ssl,_SSLConfig}) ->
-    case ssl:start() of
-	ok ->
-	    ok;
-	{ok, _} ->
-	    ok;
-	{error,{already_started,_}} ->
-	    ok;
-	Error ->
-	    Error
-    end.
-
-%% listen
-
-listen(SocketType,Port) ->
-    listen(SocketType,undefined,Port).
-
-listen(ip_comm,Addr,Port) ->
-    ?DEBUG("listening(ip_comm) to port ~p", [Port]),
-    Opt = sock_opt(Addr,[{backlog,128},{reuseaddr,true}]),
-    case gen_tcp:listen(Port,Opt) of
-	{ok,ListenSocket} ->
-	    ListenSocket;
-	Error ->
-	    Error
-    end;
-listen({ssl,SSLConfig},Addr,Port) ->
-    ?DEBUG("listening(ssl) to port ~p"
-           "~n   SSLConfig: ~p", [Port,SSLConfig]),
-    Opt = sock_opt(Addr,SSLConfig),
-    case ssl:listen(Port, Opt) of
-	{ok,ListenSocket} ->
-	    ListenSocket;
-	Error ->
-	    Error
-    end.
-
-
-sock_opt(undefined,Opt) -> [{packet,0},{active,false}|Opt];
-sock_opt(Addr,Opt)      -> [{ip, Addr},{packet,0},{active,false}|Opt].
-
-%% -define(packet_type_http,true).
-%% -define(packet_type_httph,true).
-
-%% -ifdef(packet_type_http).
-%% sock_opt(undefined,Opt) -> [{packet,http},{active,false}|Opt];
-%% sock_opt(Addr,Opt)      -> [{ip, Addr},{packet,http},{active,false}|Opt].
-%% -elif(packet_type_httph).
-%% sock_opt(undefined,Opt) -> [{packet,httph},{active,false}|Opt];
-%% sock_opt(Addr,Opt)      -> [{ip, Addr},{packet,httph},{active,false}|Opt].
-%% -else.
-%% sock_opt(undefined,Opt) -> [{packet,0},{active,false}|Opt];
-%% sock_opt(Addr,Opt)      -> [{ip, Addr},{packet,0},{active,false}|Opt].
-%% -endif.
-
-
-%% active_once
-
-active_once(Type, Sock) ->
-    active(Type, Sock, once).
-
-active(ip_comm, Sock, Active) ->
-    inet:setopts(Sock, [{active, Active}]);
-active({ssl, _SSLConfig}, Sock, Active) ->
-    ssl:setopts(Sock, [{active, Active}]).
-
-%% accept
-
-accept(A, B) ->
-    accept(A, B, infinity).
-
-
-accept(ip_comm,ListenSocket, T) ->
-    ?DEBUG("accept(ip_comm) on socket ~p", [ListenSocket]),
-    case gen_tcp:accept(ListenSocket, T) of
-	{ok,Socket} ->
-	    Socket;
-	Error ->
-	    ?vtrace("accept(ip_comm) failed for reason:"
-		    "~n   Error: ~p",[Error]),
-	    Error
-    end;
-accept({ssl,_SSLConfig},ListenSocket, T) ->
-    ?DEBUG("accept(ssl) on socket ~p", [ListenSocket]),
-    case ssl:accept(ListenSocket, T) of
-	{ok,Socket} ->
-	    Socket;
-	Error ->
-	    ?vtrace("accept(ssl) failed for reason:"
-		    "~n   Error: ~p",[Error]),
-	    Error
-    end.
-
-
-%% controlling_process
-
-controlling_process(ip_comm, Socket, Pid) ->
-    gen_tcp:controlling_process(Socket, Pid);
-controlling_process({ssl, _}, Socket, Pid) ->
-    ssl:controlling_process(Socket, Pid).
-
-
-%% deliver
-
-deliver(SocketType, Socket, IOListOrBinary)  ->
-    case send(SocketType, Socket, IOListOrBinary) of
-% 	{error, einval} ->
-% 	    ?vlog("deliver failed for reason: einval"
-% 		  "~n   SocketType: ~p"
-% 		  "~n   Socket:     ~p"
-% 		  "~n   Data:       ~p",
-% 		  [SocketType, Socket, type(IOListOrBinary)]),
-% 	    (catch close(SocketType, Socket)), 
-% 	    socket_closed;
-	{error, _Reason} ->
-	    ?vlog("deliver(~p) failed for reason:"
-		  "~n   Reason: ~p",[SocketType,_Reason]),
-	    (catch close(SocketType, Socket)), 
-	    socket_closed;
-	_ ->
-	    ok
-    end.
-
-% type(L) when list(L) ->
-%     {list, L};
-% type(B) when binary(B) ->
-%     Decoded = 
-% 	case (catch binary_to_term(B)) of
-% 	    {'EXIT', _} ->
-% 		%% Oups, not a term, try list
-% 		case (catch binary_to_list(B)) of
-% 		    %% Oups, not a list either, give up
-% 		    {'EXIT', _} ->
-% 			{size, size(B)};
-% 		    L ->
-% 		    {list, L}
-% 		end;
-	    
-% 	    T ->
-% 		{term, T}
-% 	end,
-%     {binary, Decoded};
-% type(T) when tuple(T) ->
-%     {tuple, T};
-% type(I) when integer(I) ->
-%     {integer, I};
-% type(F) when float(F) ->
-%     {float, F};
-% type(P) when pid(P) ->
-%     {pid, P};
-% type(P) when port(P) ->
-%     {port, P};
-% type(R) when reference(R) ->
-%     {reference, R};
-% type(T) ->
-%     {term, T}.
-
-     
-
-send(ip_comm,Socket,Data) ->
-    ?DEBUG("send(ip_comm) -> ~p bytes on socket ~p",[data_size(Data),Socket]),
-    gen_tcp:send(Socket,Data);
-send({ssl,SSLConfig},Socket,Data) ->
-    ?DEBUG("send(ssl) -> ~p bytes on socket ~p",[data_size(Data),Socket]),
-    ssl:send(Socket, Data).
-
-recv(ip_comm,Socket,Length,Timeout) ->
-    ?DEBUG("recv(ip_comm) -> read from socket ~p",[Socket]),
-    gen_tcp:recv(Socket,Length,Timeout);
-recv({ssl,SSLConfig},Socket,Length,Timeout) ->
-    ?DEBUG("recv(ssl) -> read from socket ~p",[Socket]),
-    ssl:recv(Socket,Length,Timeout).
-
--ifdef(inets_debug).
-data_size(L) when list(L) -> 
-    httpd_util:flatlength(L);
-data_size(B) when binary(B) ->
-    size(B);
-data_size(O) ->
-    {unknown_size,O}.
--endif.
-
-
-%% peername
-
-peername(ip_comm, Socket) ->
-    case inet:peername(Socket) of
-	{ok,{{A,B,C,D},Port}} ->
-	    PeerName = integer_to_list(A)++"."++integer_to_list(B)++"."++
-		integer_to_list(C)++"."++integer_to_list(D),
-	    ?DEBUG("peername(ip_comm) on socket ~p: ~p",
-		   [Socket,{Port,PeerName}]),
-	    {Port,PeerName};
-	{error,Reason} ->
-	    ?vlog("failed getting peername:"
-		  "~n   Reason: ~p"
-		  "~n   Socket: ~p",
-		  [Reason,Socket]),
-	    {-1,"unknown"}
-    end;
-peername({ssl,_SSLConfig},Socket) ->
-    case ssl:peername(Socket) of
-	{ok,{{A,B,C,D},Port}} ->
-	    PeerName = integer_to_list(A)++"."++integer_to_list(B)++"."++
-		integer_to_list(C)++"."++integer_to_list(D),
-	    ?DEBUG("peername(ssl) on socket ~p: ~p", 
-		   [Socket, {Port,PeerName}]),
-	    {Port,PeerName};
-	{error,_Reason} ->
-	    {-1,"unknown"}
-    end.
-
-%% resolve
-
-resolve(_) ->
-    {ok,Name} = inet:gethostname(),
-    Name.
-
-%% close
-
-close(ip_comm,Socket) ->
-    Res = 
-	case (catch gen_tcp:close(Socket)) of
-	    ok ->                  ok;
-	    {error,Reason} ->      {error,Reason};
-	    {'EXIT',{noproc,_}} -> {error,closed};
-	    {'EXIT',Reason} ->     {error,Reason};
-	    Otherwise ->           {error,Otherwise}
-	end,
-    ?vtrace("close(ip_comm) result: ~p",[Res]),
-    Res;
-close({ssl,_SSLConfig},Socket) ->
-    Res = 
-	case (catch ssl:close(Socket)) of
-	    ok ->                  ok;
-	    {error,Reason} ->      {error,Reason};
-	    {'EXIT',{noproc,_}} -> {error,closed};
-	    {'EXIT',Reason} ->     {error,Reason};
-	    Otherwise ->           {error,Otherwise}
-	end,
-    ?vtrace("close(ssl) result: ~p",[Res]),
-    Res.
-
-%% config (debug: {certfile, "/var/tmp/server_root/conf/ssl_server.pem"})
-
-config(ConfigDB) ->
-    case httpd_util:lookup(ConfigDB,com_type,ip_comm) of
-	ssl ->
-	    case ssl_certificate_file(ConfigDB) of
-		undefined ->
-		    {error,
-		     ?NICE("Directive SSLCertificateFile "
-			   "not found in the config file")};
-		SSLCertificateFile ->
-		    {ssl,
-		     SSLCertificateFile++
-		     ssl_certificate_key_file(ConfigDB)++
-		     ssl_verify_client(ConfigDB)++
-		     ssl_ciphers(ConfigDB)++
-		     ssl_password(ConfigDB)++
-		     ssl_verify_depth(ConfigDB)++
-		     ssl_ca_certificate_file(ConfigDB)}
-	    end;
-	ip_comm ->
-	    ip_comm
-    end.
-
-ssl_certificate_file(ConfigDB) ->
-    case httpd_util:lookup(ConfigDB,ssl_certificate_file) of
-	undefined ->
-	    undefined;
-	SSLCertificateFile ->
-	    [{certfile,SSLCertificateFile}]
-    end.
-
-ssl_certificate_key_file(ConfigDB) ->
-    case httpd_util:lookup(ConfigDB,ssl_certificate_key_file) of
-	undefined ->
-	    [];
-	SSLCertificateKeyFile ->
-	    [{keyfile,SSLCertificateKeyFile}]
-    end.
-
-ssl_verify_client(ConfigDB) ->
-    case httpd_util:lookup(ConfigDB,ssl_verify_client) of
-	undefined ->
-	    [];
-	SSLVerifyClient ->
-	    [{verify,SSLVerifyClient}]
-    end.
-
-ssl_ciphers(ConfigDB) ->
-    case httpd_util:lookup(ConfigDB,ssl_ciphers) of
-	undefined ->
-	    [];
-	Ciphers ->
-	    [{ciphers, Ciphers}]
-    end.
-
-ssl_password(ConfigDB) ->
-    case httpd_util:lookup(ConfigDB,ssl_password_callback_module) of
-	undefined ->
-	    [];
-	Module ->
-	    case httpd_util:lookup(ConfigDB, ssl_password_callback_function) of
-		undefined ->
-		    [];
-		Function ->
-		    case catch apply(Module, Function, []) of
-			Password when list(Password) ->
-			    [{password, Password}];
-			Error ->
-			    error_report(ssl_password,Module,Function,Error),
-			    []
-		    end
-	    end
-    end.
-
-ssl_verify_depth(ConfigDB) ->
-    case httpd_util:lookup(ConfigDB, ssl_verify_client_depth) of
-	undefined ->
-	    [];
-	Depth ->
-	    [{depth, Depth}]
-    end.
-
-ssl_ca_certificate_file(ConfigDB) ->
-    case httpd_util:lookup(ConfigDB, ssl_ca_certificate_file) of
-	undefined ->
-	    [];
-	File ->
-	    [{cacertfile, File}]
-    end.
-
-
-error_report(Where,M,F,Error) ->
-    error_logger:error_report([{?MODULE, Where}, {apply, {M, F, []}}, Error]).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_sup.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_sup.erl
deleted file mode 100644
index fd557c30db..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_sup.erl
+++ /dev/null
@@ -1,203 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_sup.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
-%%----------------------------------------------------------------------
-%% Purpose: The top supervisor for the inets application
-%%----------------------------------------------------------------------
-
--module(httpd_sup).
-
--behaviour(supervisor).
-
--include("httpd_verbosity.hrl").
-
-%% public
--export([start/2, start_link/2, start2/2, start_link2/2, stop/1, stop/2, stop2/1]).
--export([init/1]).
-
-
--define(D(F, A), io:format("~p:" ++ F ++ "~n", [?MODULE|A])).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% supervisor callback functions
-
-start(ConfigFile, Verbosity) ->
-    case start_link(ConfigFile, Verbosity) of
-	{ok, Pid} ->
-	    unlink(Pid),
-	    {ok, Pid};
-
-	Else ->
-	    Else
-    end.
-
-    
-start_link(ConfigFile, Verbosity) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok, ConfigList, Addr, Port} ->
-	    Name    = make_name(Addr, Port),
-	    SupName = {local, Name},
-	    supervisor:start_link(SupName, ?MODULE, 
-				  [ConfigFile, ConfigList, 
-				   Verbosity, Addr, Port]);
-
-	{error, Reason} ->
-	    error_logger:error_report(Reason),
-	    {stop, Reason};
-
-	Else ->
-	    error_logger:error_report(Else),
-	    {stop, Else}
-    end.
-
-    
-start2(ConfigList, Verbosity) ->
-    case start_link2(ConfigList, Verbosity) of
-	{ok, Pid} ->
-	    unlink(Pid),
-	    {ok, Pid};
-
-	Else ->
-	    Else
-    end.
-
-    
-start_link2(ConfigList, Verbosity) ->
-    case get_addr_and_port2(ConfigList) of
-	{ok, Addr, Port} ->
-	    Name    = make_name(Addr, Port),
-	    SupName = {local, Name},
-	    supervisor:start_link(SupName, ?MODULE, 
-				  [undefined, ConfigList, Verbosity, Addr, Port]);
-
-	{error, Reason} ->
-	    error_logger:error_report(Reason),
-	    {stop, Reason};
-
-	Else ->
-	    error_logger:error_report(Else),
-	    {stop, Else}
-    end.
-
-    
-
-stop(Pid) when pid(Pid) ->
-    do_stop(Pid);
-stop(ConfigFile) when list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok, _, Addr, Port} ->
-	    stop(Addr, Port);
-	    
-	Error ->
-	    Error
-    end;
-stop(StartArgs) ->
-    ok.
-
-
-stop(Addr, Port) when integer(Port) ->
-    Name = make_name(Addr, Port), 
-    case whereis(Name) of
-	Pid when pid(Pid) ->
-	    do_stop(Pid),
-	    ok;
-	_ ->
-	    not_started
-    end.
-    
-stop2(ConfigList) when list(ConfigList) ->
-    {ok, Addr, Port} = get_addr_and_port2(ConfigList),
-    stop(Addr, Port).
-
-
-do_stop(Pid) ->
-    exit(Pid, shutdown).
-
-
-init([ConfigFile, ConfigList, Verbosity, Addr, Port]) -> 
-    init(ConfigFile, ConfigList, Verbosity, Addr, Port);
-init(BadArg) ->
-    {error, {badarg, BadArg}}.
-
-init(ConfigFile, ConfigList, Verbosity, Addr, Port) ->
-    Flags = {one_for_one, 0, 1},
-    AccSupVerbosity  = get_acc_sup_verbosity(Verbosity),
-    MiscSupVerbosity = get_misc_sup_verbosity(Verbosity),
-    Sups  = [sup_spec(httpd_acceptor_sup, Addr, Port, AccSupVerbosity), 
-	     sup_spec(httpd_misc_sup, Addr, Port, MiscSupVerbosity), 
-	     worker_spec(httpd_manager, Addr, Port, ConfigFile, ConfigList, 
-			 Verbosity, [gen_server])],
-    {ok, {Flags, Sups}}.
-
-
-sup_spec(Name, Addr, Port, Verbosity) ->
-    {{Name, Addr, Port}, 
-     {Name, start, [Addr, Port, Verbosity]}, 
-     permanent, 2000, supervisor, [Name, supervisor]}.
-    
-worker_spec(Name, Addr, Port, ConfigFile, ConfigList, Verbosity, Modules) ->
-    {{Name, Addr, Port}, 
-     {Name, start_link, [ConfigFile, ConfigList, Verbosity]}, 
-     permanent, 2000, worker, [Name] ++ Modules}.
-
-
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_sup",Addr,Port).
-
-
-%% get_addr_and_port
-
-get_addr_and_port(ConfigFile) ->
-    case httpd_conf:load(ConfigFile) of
-	{ok, ConfigList} ->
-	    {ok, Addr, Port} = get_addr_and_port2(ConfigList),
-	    {ok, ConfigList, Addr, Port};
-	Error ->
-	    Error
-    end.
-
-
-get_addr_and_port2(ConfigList) ->
-    Port = httpd_util:key1search(ConfigList, port, 80),
-    Addr = httpd_util:key1search(ConfigList, bind_address),
-    {ok, Addr, Port}.
-
-get_acc_sup_verbosity(V) ->
-    case key1search(V, all) of
-	undefined ->
-	    key1search(V, acceptor_sup_verbosity, ?default_verbosity);
-	Verbosity ->
-	    Verbosity
-    end.
-
-
-get_misc_sup_verbosity(V) ->
-    case key1search(V, all) of
-	undefined ->
-	    key1search(V, misc_sup_verbosity, ?default_verbosity);
-	Verbosity ->
-	    Verbosity
-    end.
-
-
-key1search(L, K) ->
-    httpd_util:key1search(L, K).
-
-key1search(L, K, D) ->
-    httpd_util:key1search(L, K, D).
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_util.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_util.erl
deleted file mode 100644
index 05064a8d38..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_util.erl
+++ /dev/null
@@ -1,777 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_util.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
--module(httpd_util).
--export([key1search/2, key1search/3, lookup/2, lookup/3, multi_lookup/2,
-	 lookup_mime/2, lookup_mime/3, lookup_mime_default/2,
-	 lookup_mime_default/3, reason_phrase/1, message/3, rfc1123_date/0,
-	 rfc1123_date/1, day/1, month/1, decode_hex/1, decode_base64/1, encode_base64/1,
-	 flatlength/1, split_path/1, split_script_path/1, suffix/1, to_upper/1,
-	 to_lower/1, split/3, header/2, header/3, header/4, uniq/1,
-	 make_name/2,make_name/3,make_name/4,strip/1,
-	 hexlist_to_integer/1,integer_to_hexlist/1,
-	 convert_request_date/1,create_etag/1,create_etag/2,getSize/1,
-	 response_generated/1]).
-
-%%Since hexlist_to_integer is a lousy name make a name convert
--export([encode_hex/1]).
--include("httpd.hrl").
-
-%% key1search
-
-key1search(TupleList,Key) ->
-  key1search(TupleList,Key,undefined).
-
-key1search(TupleList,Key,Undefined) ->
-  case lists:keysearch(Key,1,TupleList) of
-    {value,{Key,Value}} ->
-      Value;
-    false ->
-      Undefined
-  end.
-
-%% lookup
-
-lookup(Table,Key) ->
-  lookup(Table,Key,undefined).
-
-lookup(Table,Key,Undefined) ->
-    case catch ets:lookup(Table,Key) of
-	[{Key,Value}|_] ->
-	    Value;
-	_->
-	    Undefined
-    end.
-
-%% multi_lookup
-
-multi_lookup(Table,Key) ->
-    remove_key(ets:lookup(Table,Key)).
-
-remove_key([]) ->
-    [];
-remove_key([{_Key,Value}|Rest]) ->
-    [Value|remove_key(Rest)].
-
-%% lookup_mime
-
-lookup_mime(ConfigDB,Suffix) ->
-    lookup_mime(ConfigDB,Suffix,undefined).
-
-lookup_mime(ConfigDB,Suffix,Undefined) ->
-    [{mime_types,MimeTypesDB}|_]=ets:lookup(ConfigDB,mime_types),
-    case ets:lookup(MimeTypesDB,Suffix) of
-	[] ->
-	    Undefined;
-	[{Suffix,MimeType}|_] ->
-	    MimeType
-    end.
-
-%% lookup_mime_default
-
-lookup_mime_default(ConfigDB,Suffix) ->
-    lookup_mime_default(ConfigDB,Suffix,undefined).
-
-lookup_mime_default(ConfigDB,Suffix,Undefined) ->
-    [{mime_types,MimeTypesDB}|_]=ets:lookup(ConfigDB,mime_types),
-    case ets:lookup(MimeTypesDB,Suffix) of
-	[] ->
-	    case ets:lookup(ConfigDB,default_type) of
-		[] ->
-		    Undefined;
-		[{default_type,DefaultType}|_] ->
-		    DefaultType
-	    end;
-	[{Suffix,MimeType}|_] ->
-	    MimeType
-    end.
-
-%% reason_phrase
-reason_phrase(100) -> "Continue";
-reason_phrase(101) -> "Swithing protocol";
-reason_phrase(200) -> "OK";
-reason_phrase(201) -> "Created";
-reason_phrase(202) -> "Accepted";
-reason_phrase(204) -> "No Content";
-reason_phrase(205) -> "Reset Content";
-reason_phrase(206) -> "Partial Content";
-reason_phrase(301) -> "Moved Permanently";
-reason_phrase(302) -> "Moved Temporarily";
-reason_phrase(304) -> "Not Modified";
-reason_phrase(400) -> "Bad Request";
-reason_phrase(401) -> "Unauthorized";
-reason_phrase(402) -> "Payment Required";
-reason_phrase(403) -> "Forbidden";
-reason_phrase(404) -> "Not Found";
-reason_phrase(405) -> "Method Not Allowed";
-reason_phrase(408) -> "Request Timeout";
-reason_phrase(411) -> "Length Required";
-reason_phrase(414) -> "Request-URI Too Long";
-reason_phrase(412) -> "Precondition Failed";
-reason_phrase(416) -> "request Range Not Satisfiable";
-reason_phrase(417) -> "Expectation failed";
-reason_phrase(500) -> "Internal Server Error";
-reason_phrase(501) -> "Not Implemented";
-reason_phrase(502) -> "Bad Gateway";
-reason_phrase(503) -> "Service Unavailable";
-reason_phrase(_) -> "Internal Server Error".
-
-%% message
-
-message(301,URL,_) ->
-  "The document has moved <A HREF=\""++URL++"\">here</A>.";
-message(304,_URL,_) ->
-    "The document has not been changed.";
-message(400,none,_) ->
-  "Your browser sent a query that this server could not understand.";
-message(401,none,_) ->
-  "This server could not verify that you
-are authorized to access the document you
-requested.  Either you supplied the wrong
-credentials (e.g., bad password), or your
-browser does not understand how to supply
-the credentials required.";
-message(403,RequestURI,_) ->
-  "You do not have permission to access "++RequestURI++" on this server.";
-message(404,RequestURI,_) ->
-  "The requested URL "++RequestURI++" was not found on this server.";
-message(412,none,_) ->
-  "The requested preconditions where false";
-message(414,ReasonPhrase,_) ->
-  "Message "++ReasonPhrase++".";
-message(416,ReasonPhrase,_) ->
-    ReasonPhrase;
-
-message(500,none,ConfigDB) ->
-  ServerAdmin=lookup(ConfigDB,server_admin,"unknown@unknown"),
-  "The server encountered an internal error or
-misconfiguration and was unable to complete
-your request.
-<P>Please contact the server administrator "++ServerAdmin++",
-and inform them of the time the error occurred
-and anything you might have done that may have
-caused the error.";
-message(501,{Method,RequestURI,HTTPVersion},_ConfigDB) ->
-  Method++" to "++RequestURI++" ("++HTTPVersion++") not supported.";
-message(503,String,_ConfigDB) ->
-  "This service in unavailable due to: "++String.
-
-%%convert_rfc_date(Date)->{{YYYY,MM,DD},{HH,MIN,SEC}}
-
-convert_request_date([D,A,Y,DateType|Rest]) ->
-    Func=case DateType of
-	     $\, ->
-		 fun convert_rfc1123_date/1;
-	     $\  ->
-		 fun convert_ascii_date/1;
-	     _ ->
-		 fun convert_rfc850_date/1
-	 end,
-    case catch Func([D,A,Y,DateType|Rest])of
-	{ok,Date} ->
-	    Date;
-	_Error ->
-	    bad_date
-    end.
-
-convert_rfc850_date(DateStr) ->
-    case string:tokens(DateStr," ") of
-	[_WeekDay,Date,Time,_TimeZone|_Rest] ->
-	   convert_rfc850_date(Date,Time);
-	_Error ->
-	    bad_date
-    end.
-
-convert_rfc850_date([D1,D2,_,M,O,N,_,Y1,Y2|_Rest],[H1,H2,_Col,M1,M2,_Col,S1,S2|_Rest2])->    
-    Year=list_to_integer([50,48,Y1,Y2]),
-    Day=list_to_integer([D1,D2]),
-    Month=convert_month([M,O,N]),
-    Hour=list_to_integer([H1,H2]),
-    Min=list_to_integer([M1,M2]),
-    Sec=list_to_integer([S1,S2]),
-    {ok,{{Year,Month,Day},{Hour,Min,Sec}}};
-convert_rfc850_date(_BadDate,_BadTime)->
-    bad_date.
-
-convert_ascii_date([_D,_A,_Y,_SP,M,O,N,_SP,D1,D2,_SP,H1,H2,_Col,M1,M2,_Col,S1,S2,_SP,Y1,Y2,Y3,Y4|_Rest])->
-    Year=list_to_integer([Y1,Y2,Y3,Y4]),
-    Day=case D1 of 
-	$\ ->
-	    list_to_integer([D2]);
-	_->
-	    list_to_integer([D1,D2])
-    end,
-    Month=convert_month([M,O,N]),
-    Hour=list_to_integer([H1,H2]),
-    Min=list_to_integer([M1,M2]),
-    Sec=list_to_integer([S1,S2]),
-    {ok,{{Year,Month,Day},{Hour,Min,Sec}}};
-convert_ascii_date(BadDate)->
-    bad_date.
-convert_rfc1123_date([_D,_A,_Y,_C,_SP,D1,D2,_SP,M,O,N,_SP,Y1,Y2,Y3,Y4,_SP,H1,H2,_Col,M1,M2,_Col,S1,S2|Rest])->    
-    Year=list_to_integer([Y1,Y2,Y3,Y4]),
-    Day=list_to_integer([D1,D2]),
-    Month=convert_month([M,O,N]),
-    Hour=list_to_integer([H1,H2]),
-    Min=list_to_integer([M1,M2]),
-    Sec=list_to_integer([S1,S2]),
-    {ok,{{Year,Month,Day},{Hour,Min,Sec}}};
-convert_rfc1123_date(BadDate)->    
-    bad_date.
-
-convert_month("Jan")->1;
-convert_month("Feb") ->2;
-convert_month("Mar") ->3; 
-convert_month("Apr") ->4;
-convert_month("May") ->5;
-convert_month("Jun") ->6;
-convert_month("Jul") ->7;
-convert_month("Aug") ->8;
-convert_month("Sep") ->9;
-convert_month("Oct") ->10;
-convert_month("Nov") ->11;
-convert_month("Dec") ->12.
-
-
-%% rfc1123_date
-
-rfc1123_date() ->
-  {{YYYY,MM,DD},{Hour,Min,Sec}}=calendar:universal_time(),
-  DayNumber=calendar:day_of_the_week({YYYY,MM,DD}),
-  lists:flatten(io_lib:format("~s, ~2.2.0w ~3.s ~4.4.0w ~2.2.0w:~2.2.0w:~2.2.0w GMT",
-                        [day(DayNumber),DD,month(MM),YYYY,Hour,Min,Sec])).
-
-rfc1123_date({{YYYY,MM,DD},{Hour,Min,Sec}}) ->
-  DayNumber=calendar:day_of_the_week({YYYY,MM,DD}),
-  lists:flatten(io_lib:format("~s, ~2.2.0w ~3.s ~4.4.0w ~2.2.0w:~2.2.0w:~2.2.0w GMT",
-                        [day(DayNumber),DD,month(MM),YYYY,Hour,Min,Sec])).
-
-%% uniq
-
-uniq([]) ->
-    [];
-uniq([First,First|Rest]) ->
-    uniq([First|Rest]);
-uniq([First|Rest]) ->
-    [First|uniq(Rest)].
-
-
-%% day
-
-day(1) -> "Mon";
-day(2) -> "Tue";
-day(3) -> "Wed";
-day(4) -> "Thu";
-day(5) -> "Fri";
-day(6) -> "Sat"; 
-day(7) -> "Sun".
-
-%% month
-
-month(1) -> "Jan";
-month(2) -> "Feb";
-month(3) -> "Mar";
-month(4) -> "Apr";
-month(5) -> "May";
-month(6) -> "Jun";
-month(7) -> "Jul";
-month(8) -> "Aug";
-month(9) -> "Sep";
-month(10) -> "Oct";
-month(11) -> "Nov";
-month(12) -> "Dec".
-
-%% decode_hex
-
-decode_hex([$%,Hex1,Hex2|Rest]) ->
-  [hex2dec(Hex1)*16+hex2dec(Hex2)|decode_hex(Rest)];
-decode_hex([First|Rest]) ->
-  [First|decode_hex(Rest)];
-decode_hex([]) ->
-  [].
-
-hex2dec(X) when X>=$0,X=<$9 -> X-$0;
-hex2dec(X) when X>=$A,X=<$F -> X-$A+10;
-hex2dec(X) when X>=$a,X=<$f -> X-$a+10.
-
-%% decode_base64 (DEBUG STRING: QWxhZGRpbjpvcGVuIHNlc2FtZQ==)
-
-decode_base64([]) ->
-  [];
-decode_base64([Sextet1,Sextet2,$=,$=|Rest]) ->
-  Bits2x6=
-    (d(Sextet1) bsl 18) bor
-    (d(Sextet2) bsl 12),
-  Octet1=Bits2x6 bsr 16,
-  [Octet1|decode_base64(Rest)];
-decode_base64([Sextet1,Sextet2,Sextet3,$=|Rest]) ->
-  Bits3x6=
-    (d(Sextet1) bsl 18) bor
-    (d(Sextet2) bsl 12) bor
-    (d(Sextet3) bsl 6),
-  Octet1=Bits3x6 bsr 16,
-  Octet2=(Bits3x6 bsr 8) band 16#ff,
-  [Octet1,Octet2|decode_base64(Rest)];
-decode_base64([Sextet1,Sextet2,Sextet3,Sextet4|Rest]) ->
-  Bits4x6=
-    (d(Sextet1) bsl 18) bor
-    (d(Sextet2) bsl 12) bor
-    (d(Sextet3) bsl 6) bor
-    d(Sextet4),
-  Octet1=Bits4x6 bsr 16,
-  Octet2=(Bits4x6 bsr 8) band 16#ff,
-  Octet3=Bits4x6 band 16#ff,
-  [Octet1,Octet2,Octet3|decode_base64(Rest)];
-decode_base64(CatchAll) ->
-  "BAD!".
-
-d(X) when X >= $A, X =<$Z ->
-    X-65;
-d(X) when X >= $a, X =<$z ->
-    X-71;
-d(X) when X >= $0, X =<$9 ->
-    X+4;
-d($+) -> 62;
-d($/) -> 63;
-d(_) -> 63.
-
-
-encode_base64([]) ->
-    [];
-encode_base64([A]) ->
-    [e(A bsr 2), e((A band 3) bsl 4), $=, $=];
-encode_base64([A,B]) ->
-    [e(A bsr 2), e(((A band 3) bsl 4) bor (B bsr 4)), e((B band 15) bsl 2), $=];
-encode_base64([A,B,C|Ls]) ->
-    encode_base64_do(A,B,C, Ls).
-encode_base64_do(A,B,C, Rest) ->
-    BB = (A bsl 16) bor (B bsl 8) bor C,
-    [e(BB bsr 18), e((BB bsr 12) band 63), 
-     e((BB bsr 6) band 63), e(BB band 63)|encode_base64(Rest)].
-
-e(X) when X >= 0, X < 26 -> X+65;
-e(X) when X>25, X<52 ->     X+71;
-e(X) when X>51, X<62 ->     X-4;
-e(62) ->                    $+;
-e(63) ->                    $/;
-e(X) ->                     exit({bad_encode_base64_token, X}).
-
-
-%% flatlength
-
-flatlength(List) ->
-    flatlength(List, 0).
-
-flatlength([H|T],L) when list(H) ->
-    flatlength(H,flatlength(T,L));
-flatlength([H|T],L) when binary(H) ->
-    flatlength(T,L+size(H));
-flatlength([H|T],L) ->
-    flatlength(T,L+1);
-flatlength([],L) ->
-  L.
-
-%% split_path
-
-split_path(Path) ->
-    case regexp:match(Path,"[\?].*\$") of
-	%% A QUERY_STRING exists!
-	{match,Start,Length} ->
-	    {httpd_util:decode_hex(string:substr(Path,1,Start-1)),
-	     string:substr(Path,Start,Length)};
-	%% A possible PATH_INFO exists!
-	nomatch ->
-	    split_path(Path,[])
-    end.
-
-split_path([],SoFar) ->
-    {httpd_util:decode_hex(lists:reverse(SoFar)),[]};
-split_path([$/|Rest],SoFar) ->
-    Path=httpd_util:decode_hex(lists:reverse(SoFar)),
-    case file:read_file_info(Path) of
-	{ok,FileInfo} when FileInfo#file_info.type == regular ->
-	    {Path,[$/|Rest]};
-	{ok,FileInfo} ->
-	    split_path(Rest,[$/|SoFar]);
-	{error,Reason} ->
-	    split_path(Rest,[$/|SoFar])
-    end;
-split_path([C|Rest],SoFar) ->
-    split_path(Rest,[C|SoFar]).
-
-%% split_script_path
-
-split_script_path(Path) ->
-    case split_script_path(Path, []) of
-	{Script, AfterPath} ->
-	    {PathInfo, QueryString} = pathinfo_querystring(AfterPath),
-	    {Script, {PathInfo, QueryString}};
-	not_a_script ->
-	    not_a_script
-    end.
-
-pathinfo_querystring(Str) ->
-    pathinfo_querystring(Str, []).
-pathinfo_querystring([], SoFar) ->
-    {lists:reverse(SoFar), []};
-pathinfo_querystring([$?|Rest], SoFar) ->
-    {lists:reverse(SoFar), Rest};
-pathinfo_querystring([C|Rest], SoFar) ->
-    pathinfo_querystring(Rest, [C|SoFar]).
-
-split_script_path([$?|QueryString], SoFar) ->
-    Path = httpd_util:decode_hex(lists:reverse(SoFar)),
-    case file:read_file_info(Path) of
-	{ok,FileInfo} when FileInfo#file_info.type == regular ->
-	    {Path, [$?|QueryString]};
-	{ok,FileInfo} ->
-	    not_a_script;
-	{error,Reason} ->
-	    not_a_script
-    end;
-split_script_path([], SoFar) ->
-    Path = httpd_util:decode_hex(lists:reverse(SoFar)),
-    case file:read_file_info(Path) of
-	{ok,FileInfo} when FileInfo#file_info.type == regular ->
-	    {Path, []};
-	{ok,FileInfo} ->
-	    not_a_script;
-	{error,Reason} ->
-	    not_a_script
-    end;
-split_script_path([$/|Rest], SoFar) ->
-    Path = httpd_util:decode_hex(lists:reverse(SoFar)),
-    case file:read_file_info(Path) of
-	{ok, FileInfo} when FileInfo#file_info.type == regular ->
-	    {Path, [$/|Rest]};
-	{ok, _FileInfo} ->
-	    split_script_path(Rest, [$/|SoFar]);
-	{error, _Reason} ->
-	    split_script_path(Rest, [$/|SoFar])
-    end;
-split_script_path([C|Rest], SoFar) ->
-    split_script_path(Rest,[C|SoFar]).
-
-%% suffix
-
-suffix(Path) ->
-    case filename:extension(Path) of
-	[] ->
-	    [];
-	Extension ->
-	    tl(Extension)
-    end.
-
-%% to_upper
-
-to_upper([C|Cs]) when C >= $a, C =< $z ->
-    [C-($a-$A)|to_upper(Cs)];
-to_upper([C|Cs]) ->
-    [C|to_upper(Cs)];
-to_upper([]) ->
-    [].
-
-%% to_lower
-
-to_lower([C|Cs]) when C >= $A, C =< $Z ->
-    [C+($a-$A)|to_lower(Cs)];
-to_lower([C|Cs]) ->
-    [C|to_lower(Cs)];
-to_lower([]) ->
-    [].
-
-
-%% strip
-strip(Value)->
-    lists:reverse(remove_ws(lists:reverse(remove_ws(Value)))).
-	
-remove_ws([$\s|Rest])->
-    remove_ws(Rest);
-remove_ws([$\t|Rest]) ->
-    remove_ws(Rest);
-remove_ws(Rest) ->
-    Rest.
-
-%% split
-
-split(String,RegExp,Limit) ->
-    case regexp:parse(RegExp) of
-	{error,Reason} ->
-	    {error,Reason};
-	{ok,_} ->
-	    {ok,do_split(String,RegExp,Limit)}
-    end.
-
-do_split(String,RegExp,1) ->
-    [String];
-
-do_split(String,RegExp,Limit) ->
-    case regexp:first_match(String,RegExp) of 
-	{match,Start,Length} ->
-	    [string:substr(String,1,Start-1)|
-	     do_split(lists:nthtail(Start+Length-1,String),RegExp,Limit-1)];
-	nomatch ->
-	    [String]
-    end.
-
-%% header
-header(StatusCode,Date)when list(Date)->
-    header(StatusCode,"text/plain",false);
-
-header(StatusCode, PersistentConnection) when integer(StatusCode)->
-    Date = rfc1123_date(),
-    Connection = 
-	case PersistentConnection of
-	    true ->
-		"";
-	    _ ->
-		"Connection: close \r\n"
-	end,
-    io_lib:format("HTTP/1.1 ~w ~s \r\nDate: ~s\r\nServer: ~s\r\n~s",
-		  [StatusCode, httpd_util:reason_phrase(StatusCode),
-		   Date, ?SERVER_SOFTWARE, Connection]).
-
-%%----------------------------------------------------------------------
-
-header(StatusCode, MimeType, Date) when list(Date) ->
-    header(StatusCode, MimeType, false,rfc1123_date());
-
-
-header(StatusCode, MimeType, PersistentConnection) when integer(StatusCode) ->
-    header(StatusCode, MimeType, PersistentConnection,rfc1123_date()).
-
-
-%%----------------------------------------------------------------------
-
-header(416, MimeType,PersistentConnection,Date)-> 
-    Connection = 
-	case PersistentConnection of
-	    true ->
-		"";
-	    _ ->
-		"Connection: close \r\n"
-	end,
-    io_lib:format("HTTP/1.1 ~w ~s \r\nDate: ~s\r\nServer: ~s\r\n"
-		  "Content-Range:bytes *"
-		  "Content-Type: ~s\r\n~s",
-		  [416, httpd_util:reason_phrase(416),
-		   Date, ?SERVER_SOFTWARE, MimeType, Connection]);
-
-
-header(StatusCode, MimeType,PersistentConnection,Date) when integer(StatusCode)-> 
-    Connection = 
-	case PersistentConnection of
-	    true ->
-		"";
-	    _ ->
-		"Connection: close \r\n"
-	end,
-    io_lib:format("HTTP/1.1 ~w ~s \r\nDate: ~s\r\nServer: ~s\r\n"
-		  "Content-Type: ~s\r\n~s",
-		  [StatusCode, httpd_util:reason_phrase(StatusCode),
-		   Date, ?SERVER_SOFTWARE, MimeType, Connection]).
-
-
-
-%% make_name/2, make_name/3
-%% Prefix  -> string()
-%%            First part of the name, e.g. "httpd"
-%% Addr    -> {A,B,C,D} | string() | undefined
-%%            The address part of the name. 
-%%            e.g. "123.234.55.66" or {123,234,55,66} or "otp.ericsson.se" 
-%%            for a host address or undefined if local host.
-%% Port    -> integer()
-%%            Last part of the name, such as the HTTPD server port 
-%%            number (80).
-%% Postfix -> Any string that will be added last to the name
-%%
-%% Example:
-%% make_name("httpd","otp.ericsson.se",80) => httpd__otp_ericsson_se__80
-%% make_name("httpd",undefined,8088)       => httpd_8088
-
-make_name(Prefix,Port) ->
-    make_name(Prefix,undefined,Port,"").
-
-make_name(Prefix,Addr,Port) ->
-    make_name(Prefix,Addr,Port,"").
-    
-make_name(Prefix,"*",Port,Postfix) ->
-    make_name(Prefix,undefined,Port,Postfix);
-
-make_name(Prefix,any,Port,Postfix) ->
-    make_name1(io_lib:format("~s_~w~s",[Prefix,Port,Postfix]));
-
-make_name(Prefix,undefined,Port,Postfix) ->
-    make_name1(io_lib:format("~s_~w~s",[Prefix,Port,Postfix]));
-
-make_name(Prefix,Addr,Port,Postfix) ->
-    NameString = 
-        Prefix ++ "__" ++ make_name2(Addr) ++ "__" ++ 
-	integer_to_list(Port) ++ Postfix,
-    make_name1(NameString).
-    
-make_name1(String) ->
-    list_to_atom(lists:flatten(String)).
-
-make_name2({A,B,C,D}) ->
-    io_lib:format("~w_~w_~w_~w",[A,B,C,D]);
-make_name2(Addr) ->
-    search_and_replace(Addr,$.,$_).
-
-search_and_replace(S,A,B) ->
-    Fun = fun(What) -> 
-                  case What of
-                      A -> B;
-                      O -> O
-                  end
-          end,
-    lists:map(Fun,S).
-
-
-
-%%----------------------------------------------------------------------
-%% Converts  a string that constists of 0-9,A-F,a-f to a 
-%% integer
-%%----------------------------------------------------------------------
-
-hexlist_to_integer([])->
-    empty;
-
-
-%%When the string only contains one value its eaasy done.
-%% 0-9
-hexlist_to_integer([Size]) when Size>=48 , Size=<57 ->
-   Size-48;
-%% A-F
-hexlist_to_integer([Size]) when Size>=65 , Size=<70 ->
-    Size-55;
-%% a-f
-hexlist_to_integer([Size]) when Size>=97 , Size=<102 ->
-    Size-87;
-hexlist_to_integer([Size]) ->
-    not_a_num;
-
-hexlist_to_integer(Size) ->
-    Len=string:span(Size,"1234567890abcdefABCDEF"),
-    hexlist_to_integer2(Size,16 bsl (4 *(Len-2)),0).
-
-hexlist_to_integer2([],_Pos,Sum)->
-    Sum;
-hexlist_to_integer2([HexVal|HexString],Pos,Sum)when HexVal>=48,HexVal=<57->
-    hexlist_to_integer2(HexString,Pos bsr 4,Sum+((HexVal-48)*Pos));
-
-hexlist_to_integer2([HexVal|HexString],Pos,Sum)when HexVal>=65,HexVal=<70->
-    hexlist_to_integer2(HexString,Pos bsr 4,Sum+((HexVal-55)*Pos));
-
-hexlist_to_integer2([HexVal|HexString],Pos,Sum)when HexVal>=97,HexVal=<102->
-    hexlist_to_integer2(HexString,Pos bsr 4,Sum+((HexVal-87)*Pos));
-
-hexlist_to_integer2(_AfterHexString,_Pos,Sum)->
-    Sum.
-
-%%----------------------------------------------------------------------
-%%Converts an integer to an hexlist
-%%----------------------------------------------------------------------
-encode_hex(Num)->
-    integer_to_hexlist(Num).
-
-
-integer_to_hexlist(Num)->
-    integer_to_hexlist(Num,getSize(Num),[]).
-
-integer_to_hexlist(Num,Pot,Res) when Pot<0 ->
-    convert_to_ascii([Num|Res]);
-
-integer_to_hexlist(Num,Pot,Res) ->
-    Position=(16 bsl (Pot*4)),
-    PosVal=Num div Position,
-    integer_to_hexlist(Num-(PosVal*Position),Pot-1,[PosVal|Res]).
-convert_to_ascii(RevesedNum)->
-    convert_to_ascii(RevesedNum,[]).
-
-convert_to_ascii([],Num)->
-    Num;
-convert_to_ascii([Num|Reversed],Number)when Num>-1, Num<10 ->
-    convert_to_ascii(Reversed,[Num+48|Number]);
-convert_to_ascii([Num|Reversed],Number)when Num>9, Num<16 ->
-    convert_to_ascii(Reversed,[Num+55|Number]);
-convert_to_ascii(NumReversed,Number) ->
-    error.
-
-
-				    	      
-getSize(Num)->
-    getSize(Num,0).
-
-getSize(Num,Pot)when Num<(16 bsl(Pot *4))  ->
-    Pot-1;
-
-getSize(Num,Pot) ->
-    getSize(Num,Pot+1).
-
-
-
-
-
-create_etag(FileInfo)->
-    create_etag(FileInfo#file_info.mtime,FileInfo#file_info.size).
-
-create_etag({{Year,Month,Day},{Hour,Min,Sec}},Size)->
-    create_part([Year,Month,Day,Hour,Min,Sec])++io_lib:write(Size);
-
-create_etag(FileInfo,Size)->
-    create_etag(FileInfo#file_info.mtime,Size).
-
-create_part(Values)->
-    lists:map(fun(Val0)->
-		      Val=Val0 rem 60,
-			  if
-			      Val=<25 ->
-				  65+Val;  % A-Z
-			      Val=<50 ->
-				  72+Val;  % a-z
-			      %%Since no date s
-			      true ->
-				  Val-3
-			  end
-	      end,Values).
-				    
-
-
-%%----------------------------------------------------------------------
-%%Function that controls whether a response is generated or not
-%%----------------------------------------------------------------------
-response_generated(Info)->
-    case httpd_util:key1search(Info#mod.data,status) of
-	%% A status code has been generated!
-	{StatusCode,PhraseArgs,Reason}->
-	    true;
-	%%No status code control repsonsxe
-	undefined ->
-	    case httpd_util:key1search(Info#mod.data, response) of
-		%% No response has been generated!
-		undefined ->
-		    false;
-		%% A response has been generated or sent!
-		Response ->
-		    true
-	    end
-    end.
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_verbosity.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_verbosity.erl
deleted file mode 100644
index c772a11dd1..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_verbosity.erl
+++ /dev/null
@@ -1,94 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_verbosity.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
--module(httpd_verbosity).
-
--include_lib("stdlib/include/erl_compile.hrl").
-
--export([print/4,print/5,printc/4,validate/1]).
-
-print(silence,_Severity,_Format,_Arguments) ->
-    ok;
-print(Verbosity,Severity,Format,Arguments) ->
-    print1(printable(Verbosity,Severity),Format,Arguments).
-
-
-print(silence,_Severity,_Module,_Format,_Arguments) ->
-    ok;
-print(Verbosity,Severity,Module,Format,Arguments) ->
-    print1(printable(Verbosity,Severity),Module,Format,Arguments).
-
-
-printc(silence,Severity,Format,Arguments) ->
-    ok;
-printc(Verbosity,Severity,Format,Arguments) ->
-    print2(printable(Verbosity,Severity),Format,Arguments).
-
-
-print1(false,_Format,_Arguments) -> ok;
-print1(Verbosity,Format,Arguments) ->
-    V = image_of_verbosity(Verbosity),
-    S = image_of_sname(get(sname)),
-    io:format("** HTTPD ~s ~s: " ++ Format ++ "~n",[S,V]++Arguments).
-
-print1(false,_Module,_Format,_Arguments) -> ok;
-print1(Verbosity,Module,Format,Arguments) ->
-    V = image_of_verbosity(Verbosity),
-    S = image_of_sname(get(sname)),
-    io:format("** HTTPD ~s ~s ~s: " ++ Format ++ "~n",[S,Module,V]++Arguments).
-
-
-print2(false,_Format,_Arguments) -> ok;
-print2(_Verbosity,Format,Arguments) ->
-    io:format(Format ++ "~n",Arguments).
-
-
-%% printable(Verbosity,Severity)
-printable(info,info)      -> info;
-printable(log,info)       -> info;
-printable(log,log)        -> log;
-printable(debug,info)     -> info;
-printable(debug,log)      -> log;
-printable(debug,debug)    -> debug;
-printable(trace,V)        -> V;
-printable(_Verb,_Sev)     -> false.
-
-
-image_of_verbosity(info)  -> "INFO";
-image_of_verbosity(log)   -> "LOG";
-image_of_verbosity(debug) -> "DEBUG";
-image_of_verbosity(trace) -> "TRACE";
-image_of_verbosity(_)     -> "".
-
-%% ShortName
-image_of_sname(acc)           -> "ACCEPTOR";
-image_of_sname(acc_sup)       -> "ACCEPTOR_SUP";
-image_of_sname(auth)          -> "AUTH";
-image_of_sname(man)           -> "MANAGER";
-image_of_sname(misc_sup)      -> "MISC_SUP";
-image_of_sname(sec)           -> "SECURITY";
-image_of_sname(P) when pid(P) -> io_lib:format("REQUEST_HANDLER(~p)",[P]);
-image_of_sname(undefined)     -> "";
-image_of_sname(V)             -> io_lib:format("~p",[V]).
-
-
-validate(info)  -> info;
-validate(log)   -> log;
-validate(debug) -> debug;
-validate(trace) -> trace;
-validate(_)     -> silence.
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_verbosity.hrl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_verbosity.hrl
deleted file mode 100644
index caafd8ef18..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/httpd_verbosity.hrl
+++ /dev/null
@@ -1,65 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: httpd_verbosity.hrl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
-
--ifndef(dont_use_verbosity).
-
--ifndef(default_verbosity).
--define(default_verbosity,silence).
--endif.
-
--define(vvalidate(V), httpd_verbosity:validate(V)).
-
--ifdef(VMODULE).
-
--define(vinfo(F,A), httpd_verbosity:print(get(verbosity),info, ?VMODULE,F,A)).
--define(vlog(F,A),  httpd_verbosity:print(get(verbosity),log,  ?VMODULE,F,A)).
--define(vdebug(F,A),httpd_verbosity:print(get(verbosity),debug,?VMODULE,F,A)).
--define(vtrace(F,A),httpd_verbosity:print(get(verbosity),trace,?VMODULE,F,A)).
-
--else.
-
--define(vinfo(F,A), httpd_verbosity:print(get(verbosity),info, F,A)).
--define(vlog(F,A),  httpd_verbosity:print(get(verbosity),log,  F,A)).
--define(vdebug(F,A),httpd_verbosity:print(get(verbosity),debug,F,A)).
--define(vtrace(F,A),httpd_verbosity:print(get(verbosity),trace,F,A)).
-
--endif.
-
--define(vinfoc(F,A), httpd_verbosity:printc(get(verbosity),info, F,A)).
--define(vlogc(F,A),  httpd_verbosity:printc(get(verbosity),log,  F,A)).
--define(vdebugc(F,A),httpd_verbosity:printc(get(verbosity),debug,F,A)).
--define(vtracec(F,A),httpd_verbosity:printc(get(verbosity),trace,F,A)).
-
--else.
-
--define(vvalidate(V),ok).
-
--define(vinfo(F,A),ok).
--define(vlog(F,A),ok).
--define(vdebug(F,A),ok).
--define(vtrace(F,A),ok).
-
--define(vinfoc(F,A),ok).
--define(vlogc(F,A),ok).
--define(vdebugc(F,A),ok).
--define(vtracec(F,A),ok).
-
--endif.
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets.app.src b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets.app.src
deleted file mode 100644
index 1bf5fcc56e..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets.app.src
+++ /dev/null
@@ -1,56 +0,0 @@
-{application,inets,
- [{description,"INETS  CXC 138 49"},
-  {vsn,"%VSN%"},
-  {modules,[
-	    %% FTP
-	    ftp,
-
-            %% HTTP client:
-            http,
-            http_lib,
-            httpc_handler,
-            httpc_manager,
-            uri,
-
-            %% HTTP server:
-            httpd,
-            httpd_acceptor,
-            httpd_acceptor_sup,
-            httpd_conf,
-            httpd_example,
-            httpd_manager,
-            httpd_misc_sup,
-            httpd_parse,
-            httpd_request_handler,
-            httpd_response,
-            httpd_socket,
-            httpd_sup,
-            httpd_util,
-            httpd_verbosity,
-            inets_sup,
-            mod_actions,
-            mod_alias,
-            mod_auth,
-	    mod_auth_dets,
-	    mod_auth_mnesia,
-	    mod_auth_plain,
-	    mod_auth_server,
-            mod_browser,
-	    mod_cgi,
-            mod_dir,
-            mod_disk_log,
-            mod_esi,
-            mod_get,
-            mod_head,
-            mod_htaccess,
-            mod_include,
-            mod_log,
-	    mod_range,
-	    mod_responsecontrol,
-	    mod_security,
-	    mod_security_server,
-	    mod_trace   
-	]},
-  {registered,[inets_sup]},
-  {applications,[kernel,stdlib]},
-  {mod,{inets_sup,[]}}]}.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets.appup.src b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets.appup.src
deleted file mode 100644
index f612dc5b91..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets.appup.src
+++ /dev/null
@@ -1,135 +0,0 @@
-{"%VSN%",
- [{"3.0.5",
-   [
-    {load_module, ftp, soft_purge, soft_purge, []}
-   ]
-  },
-  {"3.0.4",
-   [
-    {update, httpd_acceptor, soft, soft_purge, soft_purge, []}
-   ]
-  },
-  {"3.0.3",
-   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_socket, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, [mod_disk_log]},
-    {load_module, mod_disk_log, soft_purge, soft_purge, []},
-    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
-    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
-    {update, httpd_manager, soft, soft_purge, soft_purge, 
-     [mod_disk_log, httpd_conf, httpd_socket]}]
-  },
-  {"3.0.2",
-   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_socket, soft_purge, soft_purge, []},
-    {load_module, mod_disk_log, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, [mod_disk_log]},
-    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
-    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
-    {update, httpd_manager, soft, soft_purge, soft_purge, 
-     [httpd_request_handler, httpd_conf, httpd_socket]},
-    {update, httpd_request_handler, soft, soft_purge, soft_purge, 
-     [httpd_response]}]
-  },
-  {"3.0.1",
-   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_socket, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, 
-     [mod_auth, mod_disk_log]},
-    {load_module, mod_disk_log, soft_purge, soft_purge, []},
-    {load_module, mod_auth, soft_purge, soft_purge, []},
-    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
-    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
-    {update, httpd_manager, soft, soft_purge, soft_purge, 
-     [httpd_request_handler, httpd_conf, httpd_socket]},
-    {update, httpd_request_handler, soft, soft_purge, soft_purge, 
-     [httpd_response]}]
-  },
-  {"3.0",
-   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_socket, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, 
-     [mod_auth, mod_disk_log]},
-    {load_module, mod_disk_log, soft_purge, soft_purge, []},
-    {load_module, mod_auth, soft_purge, soft_purge, []},
-    {update, httpd_sup, soft, soft_purge, soft_purge, 
-     [httpd_manager, httpd_misc_sup]},
-    {update, httpd_misc_sup, soft, soft_purge, soft_purge, []},
-    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
-    {update, httpd_manager, soft, soft_purge, soft_purge, 
-     [httpd_request_handler, httpd_conf, httpd_socket]},
-    {update, httpd_request_handler, soft, soft_purge, soft_purge, 
-     [httpd_response]}]
-  }
- ],
- [{"3.0.5",
-   [
-    {load_module, ftp, soft_purge, soft_purge, []}
-   ]
-  },
-  {"3.0.4",
-   [{update, httpd_acceptor, soft, soft_purge, soft_purge, []}]
-  },
-  {"3.0.3",
-   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_socket, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, [mod_disk_log]},
-    {load_module, mod_disk_log, soft_purge, soft_purge, []},
-    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
-    {update, httpd_manager, soft, soft_purge, soft_purge, 
-     [mod_disk_log, httpd_conf, httpd_socket]}]
-  },
-  {"3.0.2",
-   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_socket, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, [mod_disk_log]},
-    {load_module, mod_disk_log, soft_purge, soft_purge, []},
-    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
-    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
-    {update, httpd_manager, soft, soft_purge, soft_purge, 
-     [httpd_request_handler, httpd_conf, httpd_socket]},
-    {update, httpd_request_handler, soft, soft_purge, soft_purge, 
-     [httpd_response]}]
-  },
-  {"3.0.1",
-   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_socket, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, 
-     [mod_auth, mod_disk_log]},
-    {load_module, mod_disk_log, soft_purge, soft_purge, []},
-    {load_module, mod_auth, soft_purge, soft_purge, []},
-    {update, httpd_sup, soft, soft_purge, soft_purge, [httpd_manager]},
-    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
-    {update, httpd_manager, soft, soft_purge, soft_purge, 
-     [httpd_request_handler, httpd_conf, httpd_socket]},
-    {update, httpd_request_handler, soft, soft_purge, soft_purge, 
-     [httpd_response]}]
-  },
-  {"3.0",
-   [{load_module, httpd, soft_purge, soft_purge, [httpd_conf, httpd_sup]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_socket, soft_purge, soft_purge, []},
-    {load_module, httpd_response, soft_purge, soft_purge, 
-     [mod_auth, mod_disk_log]},
-    {load_module, mod_disk_log, soft_purge, soft_purge, []},
-    {load_module, mod_auth, soft_purge, soft_purge, []},
-    {update, httpd_sup, soft, soft_purge, soft_purge, 
-     [httpd_manager, httpd_misc_sup]},
-    {update, httpd_misc_sup, soft, soft_purge, soft_purge, []},
-    {update, httpd_acceptor, soft, soft_purge, soft_purge, []},
-    {update, httpd_manager, soft, soft_purge, soft_purge, 
-     [httpd_request_handler, httpd_conf, httpd_socket]},
-    {update, httpd_request_handler, soft, soft_purge, soft_purge, 
-     [httpd_response]}]
-  }
- ]
-}.
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets.config b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets.config
deleted file mode 100644
index adf0e3ecf1..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[{inets,[{services,[{httpd,"/var/tmp/server_root/conf/8888.conf"},
-		    {httpd,"/var/tmp/server_root/conf/8080.conf"}]}]}]. 
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets_sup.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets_sup.erl
deleted file mode 100644
index 6bda87148c..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/inets_sup.erl
+++ /dev/null
@@ -1,158 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: inets_sup.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
--module(inets_sup).
-
--export([crock/0]).
--export([start/2, stop/1, init/1]).
--export([start_child/2, stop_child/2, which_children/0]).
-
-
-%% crock (Used for debugging!)
-
-crock() ->
-    application:start(sasl),
-    application:start(inets).
-
-
-%% start
-
-start(Type, State) ->
-    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
-
-
-%% stop
-
-stop(State) ->
-    ok.
-
-
-%% start_child
-
-start_child(ConfigFile, Verbosity) ->
-    {ok, Spec} = httpd_child_spec(ConfigFile, Verbosity),
-    supervisor:start_child(?MODULE, Spec).
-    
-
-%% stop_child
-
-stop_child(Addr, Port) ->
-    Name = {httpd_sup, Addr, Port},
-    case supervisor:terminate_child(?MODULE, Name) of
-        ok ->
-            supervisor:delete_child(?MODULE, Name);
-        Error ->
-            Error
-    end.
-    
-
-%% which_children
-
-which_children() ->
-    supervisor:which_children(?MODULE).
-    
-
-%% init
-
-init([]) ->
-    case get_services() of
-	{error, Reason} ->
-	    {error,Reason};
-	Services ->
-	    SupFlags = {one_for_one, 10, 3600},
-	    {ok, {SupFlags, child_spec(Services, [])}}
-    end.
-
-get_services() ->
-    case (catch application:get_env(inets, services)) of
-	{ok, Services} ->
-	    Services;
-	_ ->
-	    []
-    end.
-
-
-child_spec([], Acc) ->
-    Acc;
-child_spec([{httpd, ConfigFile, Verbosity}|Rest], Acc) ->
-    case httpd_child_spec(ConfigFile, Verbosity) of
-	{ok, Spec} ->
-	    child_spec(Rest, [Spec | Acc]);
-	{error, Reason} ->
-	    error_msg("Failed creating child spec "
-		      "using ~p for reason: ~p", [ConfigFile, Reason]),
-	    child_spec(Rest, Acc)
-    end;
-child_spec([{httpd, ConfigFile}|Rest], Acc) ->
-    case httpd_child_spec(ConfigFile, []) of
-	{ok, Spec} ->
-	    child_spec(Rest, [Spec | Acc]);
-	{error, Reason} ->
-	    error_msg("Failed creating child spec "
-		      "using ~p for reason: ~p", [ConfigFile, Reason]),
-	    child_spec(Rest, Acc)
-    end.
-
-
-httpd_child_spec(ConfigFile, Verbosity) ->
-    case httpd_conf:load(ConfigFile) of
-	{ok, ConfigList} ->
-	    Port = httpd_util:key1search(ConfigList, port, 80),
-	    Addr = httpd_util:key1search(ConfigList, bind_address),
-	    {ok, httpd_child_spec(ConfigFile, Addr, Port, Verbosity)};
-	Error ->
-	    Error
-    end.
-
-
-httpd_child_spec(ConfigFile, Addr, Port, Verbosity) ->
-    {{httpd_sup, Addr, Port},{httpd_sup, start_link,[ConfigFile, Verbosity]},
-     permanent, 20000, supervisor,
-     [ftp,
-      httpd,
-      httpd_conf,
-      httpd_example,
-      httpd_manager,
-      httpd_misc_sup,
-      httpd_listener,
-      httpd_parse,
-      httpd_request,
-      httpd_response,
-      httpd_socket,
-      httpd_sup,
-      httpd_util,
-      httpd_verbosity,
-      inets_sup,
-      mod_actions,
-      mod_alias,
-      mod_auth,
-      mod_cgi,
-      mod_dir,
-      mod_disk_log,
-      mod_esi,
-      mod_get,
-      mod_head,
-      mod_include,
-      mod_log,
-      mod_auth_mnesia,
-      mod_auth_plain,
-      mod_auth_dets,
-      mod_security]}.
-
-
-error_msg(F, A) ->
-    error_logger:error_msg(F ++ "~n", A).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/jnets_httpd.hrl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/jnets_httpd.hrl
deleted file mode 100644
index 721a6b991d..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/jnets_httpd.hrl
+++ /dev/null
@@ -1,138 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Mobile Arts AB
-%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
-%% All Rights Reserved.''
-%% 
-%%
-
--include_lib("kernel/include/file.hrl").
-
--define(SOCKET_CHUNK_SIZE,8192).
--define(SOCKET_MAX_POLL,25).
--define(FILE_CHUNK_SIZE,64*1024).
--define(NICE(Reason),lists:flatten(atom_to_list(?MODULE)++": "++Reason)).
--define(DEFAULT_CONTEXT,
-	[{errmsg,"[an error occurred while processing this directive]"},
-	 {timefmt,"%A, %d-%b-%y %T %Z"},
-	 {sizefmt,"abbrev"}]).
-
-
--ifdef(inets_debug).
--define(DEBUG(Format, Args), io:format("D(~p:~p:~p) : "++Format++"~n",
-				       [self(),?MODULE,?LINE]++Args)).
--else.
--define(DEBUG(F,A),[]).
--endif.
-
--define(MAXBODYSIZE,16#ffffffff).
-
--define(HTTP_VERSION_10,0).
--define(HTTP_VERSION_11,1).
-
--define(CR,13).
--define(LF,10).
-
-
--record(init_data,{peername,resolve}).
-
-
--record(mod,{
-	  init_data,           % 
-	  data= [],            % list() Used to propagate data between modules
-	  socket_type=ip_comm, % socket_type() IP or SSL socket
-	  socket,              % socket() Actual socket
-	  config_db,           % ets() {key,val} db with config entries
-	  method,              % atom() HTTP method, e.g. 'GET'
-%	  request_uri,         % string() Request URI
-	  path,                % string() Absolute path. May include query etc
-	  http_version,        % int() HTTP minor version number, e.g. 0 or 1
-%	  request_line,        % string() Request Line
-	  headers,             % #req_headers{} Parsed request headers
-	  entity_body= <<>>,   % binary() Body of request
-	  connection,          % boolean() true if persistant connection
-	  status_code,         % int() Status code
-	  logging              % int() 0=No logging
-	                       %       1=Only mod_log present
-	                       %       2=Only mod_disk_log present
-	                       %       3=Both mod_log and mod_disk_log present
-	 }).
-
-% -record(ssl,{
-% 	  certfile,      %
-% 	  keyfile,       %
-% 	  verify= 0,     %
-% 	  ciphers,       %
-% 	  password,      %
-% 	  depth = 1,     %
-% 	  cacertfile,    %
-	  
-% 	  cachetimeout   % Found in yaws....
-% 	 }).
-
-
--record(http_request,{
-	  method,  % atom() if known else string() HTTP methd
-	  path,    % {abs_path,string()} URL path
-	  version  % {int(),int()}  {Major,Minor} HTTP version
-	 }).
-
--record(http_response,{
-	  version, % {int(),int()}  {Major,Minor} HTTP version
-	  status,  % int() Status code
-	  phrase   % string() HTTP Reason phrase
-	 }).
-
-
-%%% Request headers
--record(req_headers,{
-%%% --- Standard "General" headers
-% 	  cache_control,
- 	  connection="keep-alive",
-% 	  date,
-% 	  pragma,
-% 	  trailer,
- 	  transfer_encoding,
-% 	  upgrade,
-% 	  via,
-% 	  warning,
-%%% --- Standard "Request" headers
-% 	  accept,
-% 	  accept_charset,
-% 	  accept_encoding,
-% 	  accept_language,
- 	  authorization,
- 	  expect, %% FIXME! Update inet_drv.c!!
-% 	  from,
- 	  host,
- 	  if_match,
- 	  if_modified_since,
- 	  if_none_match,
- 	  if_range,
- 	  if_unmodified_since,
-% 	  max_forwards,
-% 	  proxy_authorization,
- 	  range,
-% 	  referer,
-% 	  te, %% FIXME! Update inet_drv.c!!
- 	  user_agent,
-%%% --- Standard "Entity" headers
-% 	  content_encoding,
-% 	  content_language,
- 	  content_length="0",
-% 	  content_location,
-% 	  content_md5,
-% 	  content_range,
- 	  content_type,
-% 	  last_modified,
-	  other=[]        % (list) Key/Value list with other headers
-	 }).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_actions.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_actions.erl
deleted file mode 100644
index 93bdb9fb40..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_actions.erl
+++ /dev/null
@@ -1,92 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_actions.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
--module(mod_actions).
--export([do/1,load/2]).
-
--include("httpd.hrl").
-
-%% do
-
-do(Info) ->
-  case httpd_util:key1search(Info#mod.data,status) of
-    %% A status code has been generated!
-    {StatusCode,PhraseArgs,Reason} ->
-      {proceed,Info#mod.data};
-    %% No status code has been generated!
-    undefined ->
-      case httpd_util:key1search(Info#mod.data,response) of
-	%% No response has been generated!
-	undefined ->
-	  Path=mod_alias:path(Info#mod.data,Info#mod.config_db,
-			      Info#mod.request_uri),
-	  Suffix=httpd_util:suffix(Path),
-	  MimeType=httpd_util:lookup_mime(Info#mod.config_db,Suffix,
-					  "text/plain"),
-	  Actions=httpd_util:multi_lookup(Info#mod.config_db,action),
-	  case action(Info#mod.request_uri,MimeType,Actions) of
-	    {yes,RequestURI} ->
-	      {proceed,[{new_request_uri,RequestURI}|Info#mod.data]};
-	    no ->
-	      Scripts=httpd_util:multi_lookup(Info#mod.config_db,script),
-	      case script(Info#mod.request_uri,Info#mod.method,Scripts) of
-		{yes,RequestURI} ->
-		  {proceed,[{new_request_uri,RequestURI}|Info#mod.data]};
-		no ->
-		  {proceed,Info#mod.data}
-	      end
-	  end;
-	%% A response has been generated or sent!
-	Response ->
-	  {proceed,Info#mod.data}
-      end
-  end.
-
-action(RequestURI,MimeType,[]) ->
-  no;
-action(RequestURI,MimeType,[{MimeType,CGIScript}|Rest]) ->
-  {yes,CGIScript++RequestURI};
-action(RequestURI,MimeType,[_|Rest]) ->
-  action(RequestURI,MimeType,Rest).
-
-script(RequestURI,Method,[]) ->
-  no;
-script(RequestURI,Method,[{Method,CGIScript}|Rest]) ->
-  {yes,CGIScript++RequestURI};
-script(RequestURI,Method,[_|Rest]) ->
-  script(RequestURI,Method,Rest).
-
-%%
-%% Configuration
-%%
-
-%% load
-
-load([$A,$c,$t,$i,$o,$n,$ |Action],[]) ->
-  case regexp:split(Action," ") of
-    {ok,[MimeType,CGIScript]} ->
-      {ok,[],{action,{MimeType,CGIScript}}};
-    {ok,_} ->
-      {error,?NICE(httpd_conf:clean(Action)++" is an invalid Action")}
-  end;
-load([$S,$c,$r,$i,$p,$t,$ |Script],[]) ->
-  case regexp:split(Script," ") of
-    {ok,[Method,CGIScript]} ->
-      {ok,[],{script,{Method,CGIScript}}};
-    {ok,_} ->
-      {error,?NICE(httpd_conf:clean(Script)++" is an invalid Script")}
-  end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_alias.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_alias.erl
deleted file mode 100644
index e01c18b3d6..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_alias.erl
+++ /dev/null
@@ -1,175 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_alias.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
--module(mod_alias).
--export([do/1,real_name/3,real_script_name/3,default_index/2,load/2,path/3]).
-
--include("httpd.hrl").
-
-%% do
-
-do(Info) ->
-    ?DEBUG("do -> entry",[]),
-    case httpd_util:key1search(Info#mod.data,status) of
-	%% A status code has been generated!
-	{StatusCode,PhraseArgs,Reason} ->
-	    {proceed,Info#mod.data};
-	%% No status code has been generated!
-	undefined ->
-	    case httpd_util:key1search(Info#mod.data,response) of
-		%% No response has been generated!
-		undefined ->
-		    do_alias(Info);
-		%% A response has been generated or sent!
-		Response ->
-		    {proceed,Info#mod.data}
-	    end
-    end.
-
-do_alias(Info) ->
-    ?DEBUG("do_alias -> Request URI: ~p",[Info#mod.request_uri]),
-    {ShortPath,Path,AfterPath} =
-	real_name(Info#mod.config_db,Info#mod.request_uri,
-		  httpd_util:multi_lookup(Info#mod.config_db,alias)),
-    %% Relocate if a trailing slash is missing else proceed!
-    LastChar = lists:last(ShortPath),
-    case file:read_file_info(ShortPath) of 
-	{ok,FileInfo} when FileInfo#file_info.type == directory,LastChar /= $/ ->
-	    ?LOG("do_alias -> ~n"
-		 "      ShortPath: ~p~n"
-		 "      LastChar:  ~p~n"
-		 "      FileInfo:  ~p",
-		 [ShortPath,LastChar,FileInfo]),
-	    ServerName = httpd_util:lookup(Info#mod.config_db,server_name),
-	    Port = port_string(httpd_util:lookup(Info#mod.config_db,port,80)),
-	    URL = "http://"++ServerName++Port++Info#mod.request_uri++"/",
-	    ReasonPhrase = httpd_util:reason_phrase(301),
-	    Message = httpd_util:message(301,URL,Info#mod.config_db),
-	    {proceed,
-	     [{response,
-	       {301, ["Location: ", URL, "\r\n"
-		      "Content-Type: text/html\r\n",
-		      "\r\n",
-		      "<HTML>\n<HEAD>\n<TITLE>",ReasonPhrase,
-		      "</TITLE>\n</HEAD>\n"
-		      "<BODY>\n<H1>",ReasonPhrase,
-		      "</H1>\n", Message, 
-		      "\n</BODY>\n</HTML>\n"]}}|
-	      [{real_name,{Path,AfterPath}}|Info#mod.data]]};
-	NoFile ->
-	    {proceed,[{real_name,{Path,AfterPath}}|Info#mod.data]}
-    end.
-
-port_string(80) ->
-    "";
-port_string(Port) ->
-    ":"++integer_to_list(Port).
-
-%% real_name
-
-real_name(ConfigDB, RequestURI,[]) ->
-    DocumentRoot = httpd_util:lookup(ConfigDB, document_root, ""),
-    RealName = DocumentRoot++RequestURI,
-    {ShortPath, _AfterPath} = httpd_util:split_path(RealName),
-    {Path, AfterPath}=httpd_util:split_path(default_index(ConfigDB,RealName)),
-    {ShortPath, Path, AfterPath};
-real_name(ConfigDB, RequestURI, [{FakeName,RealName}|Rest]) ->
-    case regexp:match(RequestURI, "^"++FakeName) of
-	{match, _, _} ->
-	    {ok, ActualName, _} = regexp:sub(RequestURI,
-					     "^"++FakeName, RealName),
-	    {ShortPath, _AfterPath} = httpd_util:split_path(ActualName),
-	    {Path, AfterPath} =
-		httpd_util:split_path(default_index(ConfigDB, ActualName)),
-	    {ShortPath, Path, AfterPath};
-	nomatch ->
-	    real_name(ConfigDB,RequestURI,Rest)
-    end.
-
-%% real_script_name
-
-real_script_name(ConfigDB,RequestURI,[]) ->
-    not_a_script;
-real_script_name(ConfigDB,RequestURI,[{FakeName,RealName}|Rest]) ->
-    case regexp:match(RequestURI,"^"++FakeName) of
-	{match,_,_} ->
-	    {ok,ActualName,_}=regexp:sub(RequestURI,"^"++FakeName,RealName),
-	    httpd_util:split_script_path(default_index(ConfigDB,ActualName));
-	nomatch ->
-	    real_script_name(ConfigDB,RequestURI,Rest)
-    end.
-
-%% default_index
-
-default_index(ConfigDB, Path) ->
-    case file:read_file_info(Path) of
-	{ok, FileInfo} when FileInfo#file_info.type == directory ->
-	    DirectoryIndex = httpd_util:lookup(ConfigDB, directory_index, []),
-	    append_index(Path, DirectoryIndex);
-	_ ->
-	    Path
-    end.
-
-append_index(RealName, []) ->
-    RealName;
-append_index(RealName, [Index|Rest]) ->
-    case file:read_file_info(filename:join(RealName, Index)) of
-	{error,Reason} ->
-	    append_index(RealName, Rest);
-	_ ->
-	    filename:join(RealName,Index)
-    end.
-
-%% path
-
-path(Data, ConfigDB, RequestURI) ->
-    case httpd_util:key1search(Data,real_name) of
-	undefined ->
-	    DocumentRoot = httpd_util:lookup(ConfigDB, document_root, ""),
-	    {Path,AfterPath} = 
-		httpd_util:split_path(DocumentRoot++RequestURI),
-	    Path;
-	{Path,AfterPath} ->
-	    Path
-    end.
-
-%%
-%% Configuration
-%%
-
-%% load
-
-load([$D,$i,$r,$e,$c,$t,$o,$r,$y,$I,$n,$d,$e,$x,$ |DirectoryIndex],[]) ->
-    {ok, DirectoryIndexes} = regexp:split(DirectoryIndex," "),
-    {ok,[], {directory_index, DirectoryIndexes}};
-load([$A,$l,$i,$a,$s,$ |Alias],[]) ->
-    case regexp:split(Alias," ") of
-	{ok, [FakeName, RealName]} ->
-	    {ok,[],{alias,{FakeName,RealName}}};
-	{ok, _} ->
-	    {error,?NICE(httpd_conf:clean(Alias)++" is an invalid Alias")}
-    end;
-load([$S,$c,$r,$i,$p,$t,$A,$l,$i,$a,$s,$ |ScriptAlias],[]) ->
-    case regexp:split(ScriptAlias," ") of
-	{ok, [FakeName, RealName]} ->
-	    %% Make sure the path always has a trailing slash..
-	    RealName1 = filename:join(filename:split(RealName)),
-	    {ok, [], {script_alias,{FakeName, RealName1++"/"}}};
-	{ok, _} ->
-	    {error, ?NICE(httpd_conf:clean(ScriptAlias)++
-			  " is an invalid ScriptAlias")}
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth.erl
deleted file mode 100644
index dadb64e3c1..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth.erl
+++ /dev/null
@@ -1,750 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_auth.erl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
--module(mod_auth).
-
-
-%% The functions that the webbserver call on startup stop
-%% and when the server traverse the modules.
--export([do/1, load/2, store/2, remove/1]).
-
-%% User entries to the gen-server.
--export([add_user/2, add_user/5, add_user/6, 
-	 add_group_member/3, add_group_member/4, add_group_member/5, 
-	 list_users/1, list_users/2, list_users/3, 
-	 delete_user/2, delete_user/3, delete_user/4,
-	 delete_group_member/3, delete_group_member/4, delete_group_member/5, 
-	 list_groups/1, list_groups/2, list_groups/3, 
-	 delete_group/2, delete_group/3, delete_group/4,
-	 get_user/2, get_user/3, get_user/4, 
-	 list_group_members/2, list_group_members/3, list_group_members/4,
-	 update_password/6, update_password/5]).
-
--include("httpd.hrl").
--include("mod_auth.hrl").
-
--define(VMODULE,"AUTH").
--include("httpd_verbosity.hrl").
-
--define(NOPASSWORD,"NoPassword").
-
-
-%% do
-do(Info) ->
-    ?vtrace("do", []),
-    case httpd_util:key1search(Info#mod.data,status) of
-	%% A status code has been generated!
-	{StatusCode,PhraseArgs,Reason} ->
-	    {proceed, Info#mod.data};
-	%% No status code has been generated!
-	undefined ->
-	    case httpd_util:key1search(Info#mod.data,response) of
-		%% No response has been generated!
-		undefined ->
-		    Path = mod_alias:path(Info#mod.data,Info#mod.config_db,
-					  Info#mod.request_uri),
-		    %% Is it a secret area?
-		    case secretp(Path,Info#mod.config_db) of
-			{yes, Directory, DirectoryData} ->
-			    %% Authenticate (allow)
-			    case allow((Info#mod.init_data)#init_data.peername,
-				       Info#mod.socket_type,Info#mod.socket,
-				       DirectoryData) of
-				allowed ->
-				    case deny((Info#mod.init_data)#init_data.peername,
-					      Info#mod.socket_type, Info#mod.socket,
-					      DirectoryData) of
-					not_denied ->
-					    case httpd_util:key1search(DirectoryData,
-								       auth_type) of
-						undefined ->
-						    {proceed, Info#mod.data};
-						none ->
-						    {proceed, Info#mod.data};
-						AuthType ->
-						    do_auth(Info, 
-							    Directory, 
-							    DirectoryData,
-							    AuthType)
-					    end;
-					{denied, Reason} ->
-					    {proceed,
-					     [{status,{403,Info#mod.request_uri,Reason}}|
-					      Info#mod.data]}
-				    end;
-				{not_allowed, Reason} ->
-				    {proceed,[{status,{403,Info#mod.request_uri,Reason}}|
-					      Info#mod.data]}
-			    end;
-			no ->
-			    {proceed, Info#mod.data}
-		    end;
-		%% A response has been generated or sent!
-		Response ->
-		    {proceed, Info#mod.data}
-	    end
-    end.
-
-
-do_auth(Info, Directory, DirectoryData, AuthType) ->
-    %% Authenticate (require)
-    case require(Info, Directory, DirectoryData) of
-	authorized ->
-	    {proceed,Info#mod.data};
-	{authorized, User} ->
-	    {proceed, [{remote_user,User}|Info#mod.data]};
-	{authorization_failed, Reason} ->
-	    ?vtrace("do_auth -> authorization_failed: ~p",[Reason]),
-	    {proceed, [{status,{401,none,Reason}}|Info#mod.data]};
-	{authorization_required, Realm} ->
-	    ?vtrace("do_auth -> authorization_required: ~p",[Realm]),
-	    ReasonPhrase = httpd_util:reason_phrase(401),
-	    Message = httpd_util:message(401,none,Info#mod.config_db),
-	    {proceed,
-	     [{response,
-	       {401,
-		["WWW-Authenticate: Basic realm=\"",Realm,
-		 "\"\r\n\r\n","<HTML>\n<HEAD>\n<TITLE>",
-		 ReasonPhrase,"</TITLE>\n",
-		 "</HEAD>\n<BODY>\n<H1>",ReasonPhrase,
-		 "</H1>\n",Message,"\n</BODY>\n</HTML>\n"]}}|
-	      Info#mod.data]};
-	{status, {StatusCode,PhraseArgs,Reason}} ->
-	    {proceed, [{status,{StatusCode,PhraseArgs,Reason}}|
-		       Info#mod.data]}
-    end.
-
-
-%% require
-
-require(Info, Directory, DirectoryData) ->
-    ParsedHeader = Info#mod.parsed_header,
-    ValidUsers   = httpd_util:key1search(DirectoryData, require_user),
-    ValidGroups  = httpd_util:key1search(DirectoryData, require_group),
-
-    %% Any user or group restrictions?
-    case ValidGroups of
-	undefined when ValidUsers == undefined ->
-	    authorized;
-	_ ->
-	    case httpd_util:key1search(ParsedHeader, "authorization") of
-		%% Authorization required!
-		undefined ->
-		    case httpd_util:key1search(DirectoryData, auth_name) of
-			undefined ->
-			    {status,{500,none,?NICE("AuthName directive not specified")}};
-			Realm ->
-			    {authorization_required, Realm}
-		    end;
-		%% Check credentials!
-		[$B,$a,$s,$i,$c,$ | EncodedString] ->
-		    DecodedString = httpd_util:decode_base64(EncodedString),
-		    case a_valid_user(Info, DecodedString, 
-				      ValidUsers, ValidGroups, 
-				      Directory, DirectoryData) of
-			{yes, User} ->
-			    {authorized, User};
-			{no, Reason} ->
-			    {authorization_failed, Reason};
-			{status, {StatusCode,PhraseArgs,Reason}} ->
-			    {status,{StatusCode,PhraseArgs,Reason}}
-		    end;
-		%% Bad credentials!
-		BadCredentials ->
-		    {status,{401,none,?NICE("Bad credentials "++BadCredentials)}}
-	    end
-    end.
-
-a_valid_user(Info,DecodedString,ValidUsers,ValidGroups,Dir,DirData) ->
-    case httpd_util:split(DecodedString,":",2) of
-	{ok,[SupposedUser, Password]} ->
-	    case user_accepted(SupposedUser, ValidUsers) of
-		true ->
-		    check_password(SupposedUser, Password, Dir, DirData);
-		false ->
-		    case group_accepted(Info,SupposedUser,ValidGroups,Dir,DirData) of
-			true ->
-			    check_password(SupposedUser,Password,Dir,DirData);
-			false ->
-			    {no,?NICE("No such user exists")}
-		    end
-	    end;
-	{ok,BadCredentials} ->
-	    {status,{401,none,?NICE("Bad credentials "++BadCredentials)}}
-    end.
-
-user_accepted(SupposedUser, undefined) ->
-    false;
-user_accepted(SupposedUser, ValidUsers) ->
-    lists:member(SupposedUser, ValidUsers).
-
-
-group_accepted(Info, User, undefined, Dir, DirData) ->
-    false;
-group_accepted(Info, User, [], Dir, DirData) ->
-    false;
-group_accepted(Info, User, [Group|Rest], Dir, DirData) ->
-    Ret = int_list_group_members(Group, Dir, DirData),
-    case Ret of
-	{ok, UserList} ->
-	    case lists:member(User, UserList) of
-		true ->
-		    true;
-		false ->
-		    group_accepted(Info, User, Rest, Dir, DirData)
-	    end;
-	Other ->
-	    false
-    end.
-
-check_password(User, Password, Dir, DirData) ->
-    case int_get_user(DirData, User) of
-	{ok, UStruct} ->
-	    case UStruct#httpd_user.password of
-		Password ->
-		    %% FIXME
-		    {yes, UStruct#httpd_user.username};
-		Other ->
-		    {no, "No such user"}   % Don't say 'Bad Password' !!!
-	    end;
-	_ ->
-	    {no, "No such user"}
-    end.
-
-
-%% Middle API. Theese functions call the appropriate authentication module.
-int_get_user(DirData, User) ->    
-    AuthMod = auth_mod_name(DirData), 
-    apply(AuthMod, get_user, [DirData, User]).
-
-int_list_group_members(Group, Dir, DirData) ->
-    AuthMod = auth_mod_name(DirData),
-    apply(AuthMod, list_group_members, [DirData, Group]).
-
-auth_mod_name(DirData) ->
-    case httpd_util:key1search(DirData, auth_type, plain) of
-	plain ->    mod_auth_plain;
-	mnesia ->   mod_auth_mnesia;
-	dets ->	    mod_auth_dets
-    end.
-
-    
-%%
-%% Is it a secret area?
-%%
-
-%% secretp
-
-secretp(Path,ConfigDB) ->
-    Directories = ets:match(ConfigDB,{directory,'$1','_'}),
-    case secret_path(Path, Directories) of
-	{yes,Directory} ->
-	    {yes,Directory,
-	     lists:flatten(ets:match(ConfigDB,{directory,Directory,'$1'}))};
-	no ->
-	    no
-    end.
-
-secret_path(Path,Directories) ->
-    secret_path(Path, httpd_util:uniq(lists:sort(Directories)),to_be_found).
-
-secret_path(Path,[],to_be_found) ->
-    no;
-secret_path(Path,[],Directory) ->
-    {yes,Directory};
-secret_path(Path,[[NewDirectory]|Rest],Directory) ->
-    case regexp:match(Path,NewDirectory) of
-	{match,_,_} when Directory == to_be_found ->
-	    secret_path(Path,Rest,NewDirectory);
-	{match,_,Length} when Length > length(Directory)->
-	    secret_path(Path,Rest,NewDirectory);
-	{match,_,Length} ->
-	    secret_path(Path,Rest,Directory);
-	nomatch ->
-	    secret_path(Path,Rest,Directory)
-    end.
-
-%%
-%% Authenticate
-%%
-
-%% allow
-
-allow({_,RemoteAddr},SocketType,Socket,DirectoryData) ->
-    Hosts = httpd_util:key1search(DirectoryData, allow_from, all),
-    case validate_addr(RemoteAddr,Hosts) of
-	true ->
-	    allowed;
-	false ->
-	    {not_allowed, ?NICE("Connection from your host is not allowed")}
-    end.
-
-validate_addr(RemoteAddr,all) ->            % When called from 'allow'
-    true;
-validate_addr(RemoteAddr,none) ->           % When called from 'deny'
-    false;
-validate_addr(RemoteAddr,[]) ->
-    false;
-validate_addr(RemoteAddr,[HostRegExp|Rest]) ->
-    ?DEBUG("validate_addr -> RemoteAddr: ~p HostRegExp: ~p",
-	   [RemoteAddr, HostRegExp]),
-    case regexp:match(RemoteAddr, HostRegExp) of
-	{match,_,_} ->
-	    true;
-	nomatch ->
-	    validate_addr(RemoteAddr,Rest)
-    end.
-
-%% deny
-
-deny({_,RemoteAddr},SocketType,Socket,DirectoryData) ->
-    ?DEBUG("deny -> RemoteAddr: ~p",[RemoteAddr]),
-    Hosts = httpd_util:key1search(DirectoryData, deny_from, none),
-    ?DEBUG("deny -> Hosts: ~p",[Hosts]),
-    case validate_addr(RemoteAddr,Hosts) of
-	true ->
-	    {denied, ?NICE("Connection from your host is not allowed")};
-	false ->
-	    not_denied
-    end.    
-
-%%
-%% Configuration
-%%
-
-%% load/2
-%%
-
-%% mod_auth recognizes the following Configuration Directives:
-%% <Directory /path/to/directory>
-%%  AuthDBType
-%%  AuthName
-%%  AuthUserFile
-%%  AuthGroupFile
-%%  AuthAccessPassword
-%%  require
-%%  allow
-%% </Directory>
-
-%% When a <Directory> directive is found, a new context is set to
-%% [{directory, Directory, DirData}|OtherContext]
-%% DirData in this case is a key-value list of data belonging to the
-%% directory in question.
-%%
-%% When the </Directory> statement is found, the Context created earlier
-%% will be returned as a ConfigList and the context will return to the
-%% state it was previously.
-
-load([$<,$D,$i,$r,$e,$c,$t,$o,$r,$y,$ |Directory],[]) ->
-    Dir = httpd_conf:custom_clean(Directory,"",">"),
-    {ok,[{directory, Dir, [{path, Dir}]}]};
-load(eof,[{directory,Directory, DirData}|_]) ->
-    {error, ?NICE("Premature end-of-file in "++Directory)};
-
-load([$A,$u,$t,$h,$N,$a,$m,$e,$ |AuthName], [{directory,Directory, DirData}|Rest]) ->
-    {ok, [{directory,Directory,
-	   [ {auth_name, httpd_conf:clean(AuthName)}|DirData]} | Rest ]};
-
-load([$A,$u,$t,$h,$U,$s,$e,$r,$F,$i,$l,$e,$ |AuthUserFile0],
-     [{directory, Directory, DirData}|Rest]) ->
-    AuthUserFile = httpd_conf:clean(AuthUserFile0),
-    {ok,[{directory,Directory,
-	  [ {auth_user_file, AuthUserFile}|DirData]} | Rest ]};
-
-load([$A,$u,$t,$h,$G,$r,$o,$u,$p,$F,$i,$l,$e,$ |AuthGroupFile0],
-	 [{directory,Directory, DirData}|Rest]) ->
-    AuthGroupFile = httpd_conf:clean(AuthGroupFile0),
-    {ok,[{directory,Directory,
-	  [ {auth_group_file, AuthGroupFile}|DirData]} | Rest]};
-
-%AuthAccessPassword
-load([$A,$u,$t,$h,$A,$c,$c,$e,$s,$s,$P,$a,$s,$s,$w,$o,$r,$d,$ |AuthAccessPassword0],
-	 [{directory,Directory, DirData}|Rest]) ->
-    AuthAccessPassword = httpd_conf:clean(AuthAccessPassword0),
-    {ok,[{directory,Directory,
-	  [{auth_access_password, AuthAccessPassword}|DirData]} | Rest]};
-
-
-
-
-load([$A,$u,$t,$h,$D,$B,$T,$y,$p,$e,$ |Type],
-	 [{directory, Dir, DirData}|Rest]) ->
-    case httpd_conf:clean(Type) of
-	"plain" ->
-	    {ok, [{directory, Dir, [{auth_type, plain}|DirData]} | Rest ]};
-	"mnesia" ->
-	    {ok, [{directory, Dir, [{auth_type, mnesia}|DirData]} | Rest ]};
-	"dets" ->
-	    {ok, [{directory, Dir, [{auth_type, dets}|DirData]} | Rest ]};
-	_ ->
-	    {error, ?NICE(httpd_conf:clean(Type)++" is an invalid AuthDBType")}
-    end;
-
-load([$r,$e,$q,$u,$i,$r,$e,$ |Require],[{directory,Directory, DirData}|Rest]) ->
-    case regexp:split(Require," ") of
-	{ok,["user"|Users]} ->
-	    {ok,[{directory,Directory,
-		  [{require_user,Users}|DirData]} | Rest]};
-	{ok,["group"|Groups]} ->
-	    {ok,[{directory,Directory,
-		  [{require_group,Groups}|DirData]} | Rest]};
-	{ok,_} ->
-	    {error,?NICE(httpd_conf:clean(Require)++" is an invalid require")}
-    end;
-
-load([$a,$l,$l,$o,$w,$ |Allow],[{directory,Directory, DirData}|Rest]) ->
-    case regexp:split(Allow," ") of
-	{ok,["from","all"]} ->
-	    {ok,[{directory,Directory,
-		  [{allow_from,all}|DirData]} | Rest]};
-	{ok,["from"|Hosts]} ->
-	    {ok,[{directory,Directory,
-		  [{allow_from,Hosts}|DirData]} | Rest]};
-	{ok,_} ->
-	    {error,?NICE(httpd_conf:clean(Allow)++" is an invalid allow")}
-    end;
-
-load([$d,$e,$n,$y,$ |Deny],[{directory,Directory, DirData}|Rest]) ->
-    case regexp:split(Deny," ") of
-	{ok, ["from", "all"]} ->
-	    {ok,[{directory, Directory,
-		  [{deny_from, all}|DirData]} | Rest]};
-	{ok, ["from"|Hosts]} ->
-	    {ok,[{directory, Directory,
-		  [{deny_from, Hosts}|DirData]} | Rest]};
-	{ok, _} ->
-	    {error,?NICE(httpd_conf:clean(Deny)++" is an invalid deny")}
-    end;
-
-load("</Directory>",[{directory,Directory, DirData}|Rest]) -> 
-    {ok, Rest, {directory, Directory, DirData}};
-
-load([$A,$u,$t,$h,$M,$n,$e,$s,$i,$a,$D,$B,$ |AuthMnesiaDB],
-      [{directory, Dir, DirData}|Rest]) ->
-    case httpd_conf:clean(AuthMnesiaDB) of
-	"On" ->
-	    {ok,[{directory,Dir,[{auth_type,mnesia}|DirData]}|Rest]};
-	"Off" ->
-	    {ok,[{directory,Dir,[{auth_type,plain}|DirData]}|Rest]};
-	_ ->
-	    {error, ?NICE(httpd_conf:clean(AuthMnesiaDB)++" is an invalid AuthMnesiaDB")}
-    end.
-
-%% store
-
-store({directory,Directory0, DirData0}, ConfigList) ->
-    Port = httpd_util:key1search(ConfigList, port),
-    DirData = case httpd_util:key1search(ConfigList, bind_address) of
-		  undefined ->
-		      [{port, Port}|DirData0];
-		  Addr ->
-		      [{port, Port},{bind_address,Addr}|DirData0]
-	      end,
-    Directory = 
-	case filename:pathtype(Directory0) of
-	    relative ->
-		SR = httpd_util:key1search(ConfigList, server_root),
-		filename:join(SR, Directory0);
-	    _ ->
-		Directory0
-	end,
-    AuthMod =
-	case httpd_util:key1search(DirData0, auth_type) of
-	    mnesia -> mod_auth_mnesia;
-	    dets ->   mod_auth_dets;
-	    plain ->  mod_auth_plain;
-	    _ ->      no_module_at_all
-	end,
-    case AuthMod of
-	no_module_at_all ->
-	    {ok, {directory, Directory, DirData}};
-	_ ->
-	    %% Control that there are a password or add a standard password: 
-	    %% "NoPassword"
-	    %% In this way a user must select to use a noPassword
-	    Pwd = case httpd_util:key1search(DirData,auth_access_password)of
-		      undefined->
-			  ?NOPASSWORD;
-		      PassW->
-			  PassW
-		  end,
-	    DirDataLast = lists:keydelete(auth_access_password,1,DirData), 
-	    case catch AuthMod:store_directory_data(Directory, DirDataLast) of
-		ok ->
-		    add_auth_password(Directory,Pwd,ConfigList),
-		    {ok, {directory, Directory, DirDataLast}};
-		{ok, NewDirData} ->
-		    add_auth_password(Directory,Pwd,ConfigList),
-		    {ok, {directory, Directory, NewDirData}};
-		{error, Reason} ->
-		    {error, Reason};
-		Other ->
-		    ?ERROR("unexpected result: ~p",[Other]),
-		    {error, Other}
-	    end
-    end.
-
-
-add_auth_password(Dir, Pwd0, ConfigList) ->    
-    Addr = httpd_util:key1search(ConfigList, bind_address),
-    Port = httpd_util:key1search(ConfigList, port),
-    mod_auth_server:start(Addr, Port),
-    mod_auth_server:add_password(Addr, Port, Dir, Pwd0).
-    
-%% remove
-
-
-remove(ConfigDB) ->
-    lists:foreach(fun({directory, Dir, DirData}) -> 
-			  AuthMod = auth_mod_name(DirData),
-			  (catch apply(AuthMod, remove, [DirData]))
-		  end,
-		  ets:match_object(ConfigDB,{directory,'_','_'})),
-    Addr = case lookup(ConfigDB, bind_address) of
-	       [] -> 
-		   undefined;
-	       [{bind_address, Address}] ->
-		   Address
-	   end,
-    [{port, Port}] = lookup(ConfigDB, port),
-    mod_auth_server:stop(Addr, Port),
-    ok.
-
-
-
-
-%% --------------------------------------------------------------------
-
-%% update_password
-
-update_password(Port, Dir, Old, New, New)->
-    update_password(undefined, Port, Dir, Old, New, New).
-
-update_password(Addr, Port, Dir, Old, New, New) when list(New) ->
-    mod_auth_server:update_password(Addr, Port, Dir, Old, New);
-
-update_password(_Addr, _Port, _Dir, _Old, New, New) ->
-    {error, badtype};
-update_password(_Addr, _Port, _Dir, _Old, New, New1) ->
-    {error, notqeual}.
-
-
-%% add_user
-
-add_user(UserName, Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd}->
-	    case get_options(Opt, userData) of
-		{error, Reason}->
-		    {error, Reason};
-		{UserData, Password}->
-		    User = [#httpd_user{username  = UserName, 
-					password  = Password,
-					user_data = UserData}],
-		    mod_auth_server:add_user(Addr, Port, Dir, User, AuthPwd);
-		{error, Reason} ->
-		    {error, Reason}
-	    end
-    end.
-
-
-add_user(UserName, Password, UserData, Port, Dir) ->
-    add_user(UserName, Password, UserData, undefined, Port, Dir).
-add_user(UserName, Password, UserData, Addr, Port, Dir) ->
-    User = [#httpd_user{username  = UserName, 
-			password  = Password,
-			user_data = UserData}],
-    mod_auth_server:add_user(Addr, Port, Dir, User, ?NOPASSWORD).
-
-
-%% get_user
-
-get_user(UserName, Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:get_user(Addr, Port, Dir, UserName, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-get_user(UserName, Port, Dir) ->
-    get_user(UserName, undefined, Port, Dir).
-get_user(UserName, Addr, Port, Dir) ->
-    mod_auth_server:get_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
-
-
-%% add_group_member
-
-add_group_member(GroupName, UserName, Opt)->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd}->
-	    mod_auth_server:add_group_member(Addr, Port, Dir, 
-					     GroupName, UserName, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-add_group_member(GroupName, UserName, Port, Dir) ->
-    add_group_member(GroupName, UserName, undefined, Port, Dir).
-
-add_group_member(GroupName, UserName, Addr, Port, Dir) ->
-    mod_auth_server:add_group_member(Addr, Port, Dir, 
-				     GroupName, UserName, ?NOPASSWORD).
-
-
-%% delete_group_member
-
-delete_group_member(GroupName, UserName, Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:delete_group_member(Addr, Port, Dir, 
-						GroupName, UserName, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-delete_group_member(GroupName, UserName, Port, Dir) ->
-    delete_group_member(GroupName, UserName, undefined, Port, Dir).
-delete_group_member(GroupName, UserName, Addr, Port, Dir) ->
-    mod_auth_server:delete_group_member(Addr, Port, Dir, 
-					GroupName, UserName, ?NOPASSWORD).
-
-
-%% list_users
-
-list_users(Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:list_users(Addr, Port, Dir, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-list_users(Port, Dir) ->
-    list_users(undefined, Port, Dir).
-list_users(Addr, Port, Dir) ->
-    mod_auth_server:list_users(Addr, Port, Dir, ?NOPASSWORD).
-
-    
-%% delete_user
-
-delete_user(UserName, Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:delete_user(Addr, Port, Dir, UserName, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-delete_user(UserName, Port, Dir) ->
-    delete_user(UserName, undefined, Port, Dir).
-delete_user(UserName, Addr, Port, Dir) ->
-    mod_auth_server:delete_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
-	  
-
-%% delete_group
-
-delete_group(GroupName, Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd}->
-	    mod_auth_server:delete_group(Addr, Port, Dir, GroupName, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-delete_group(GroupName, Port, Dir) ->
-    delete_group(GroupName, undefined, Port, Dir).
-delete_group(GroupName, Addr, Port, Dir) ->
-    mod_auth_server:delete_group(Addr, Port, Dir, GroupName, ?NOPASSWORD).
-
-
-%% list_groups
-
-list_groups(Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd}->
-	    mod_auth_server:list_groups(Addr, Port, Dir, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-list_groups(Port, Dir) ->
-    list_groups(undefined, Port, Dir).
-list_groups(Addr, Port, Dir) ->
-    mod_auth_server:list_groups(Addr, Port, Dir, ?NOPASSWORD).
-
-
-%% list_group_members
-
-list_group_members(GroupName,Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:list_group_members(Addr, Port, Dir, GroupName, 
-					       AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-list_group_members(GroupName, Port, Dir) ->
-    list_group_members(GroupName, undefined, Port, Dir).
-list_group_members(GroupName, Addr, Port, Dir) ->
-    mod_auth_server:list_group_members(Addr, Port, Dir, GroupName, ?NOPASSWORD).
-
-
-
-%% Opt = [{port, Port},
-%%        {addr, Addr},
-%%        {dir,  Dir},
-%%        {authPassword, AuthPassword} | FunctionSpecificData]
-get_options(Opt, mandatory)->    
-    case httpd_util:key1search(Opt, port, undefined) of
-	Port when integer(Port) ->
-	    case httpd_util:key1search(Opt, dir, undefined) of
-		Dir when list(Dir) ->
-		    Addr = httpd_util:key1search(Opt,
-						 addr,
-						 undefined),
-		    AuthPwd = httpd_util:key1search(Opt,
-						    authPassword,
-						    ?NOPASSWORD),
-		    {Addr, Port, Dir, AuthPwd};
-		_->
-		    {error, bad_dir}
-	    end;
-	_ ->
-	    {error, bad_dir}
-    end;
-
-%% FunctionSpecificData = {userData, UserData} | {password, Password}
-get_options(Opt, userData)->
-    case httpd_util:key1search(Opt, userData, undefined) of
-	undefined ->
-	    {error, no_userdata};
-	UserData ->
-	    case httpd_util:key1search(Opt, password, undefined) of
-		undefined->
-		    {error, no_password};
-		Pwd ->
-		    {UserData, Pwd}
-	    end
-    end.
-
-
-lookup(Db, Key) ->
-    ets:lookup(Db, Key).
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth.hrl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth.hrl
deleted file mode 100644
index ed3f437e60..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth.hrl
+++ /dev/null
@@ -1,27 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_auth.hrl,v 1.1 2008/12/17 09:53:34 mikpe Exp $
-%%
-
--record(httpd_user,
-	{username,
-	 password,
-	 user_data}).
-
--record(httpd_group,
-	{name,
-	 userlist}).
-	  
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_dets.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_dets.erl
deleted file mode 100644
index 89d8574e83..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_dets.erl
+++ /dev/null
@@ -1,222 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_auth_dets.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_auth_dets).
-
-%% dets authentication storage
-
--export([get_user/2,
-	 list_group_members/2,
-	 add_user/2,
-	 add_group_member/3,
-	 list_users/1,
-	 delete_user/2,
-	 list_groups/1,
-	 delete_group_member/3,
-	 delete_group/2,
-	 remove/1]).
-
--export([store_directory_data/2]).
-
--include("httpd.hrl").
--include("mod_auth.hrl").
-
-store_directory_data(Directory, DirData) ->
-    ?CDEBUG("store_directory_data -> ~n"
-	    "     Directory: ~p~n"
-	    "     DirData:   ~p",
-	    [Directory, DirData]),
-
-    PWFile = httpd_util:key1search(DirData, auth_user_file),
-    GroupFile = httpd_util:key1search(DirData, auth_group_file),
-    Addr = httpd_util:key1search(DirData, bind_address),
-    Port = httpd_util:key1search(DirData, port),
-
-    PWName  = httpd_util:make_name("httpd_dets_pwdb",Addr,Port),
-    case dets:open_file(PWName,[{type,set},{file,PWFile},{repair,true}]) of
-	{ok, PWDB} ->
-	    GDBName = httpd_util:make_name("httpd_dets_groupdb",Addr,Port),
-	    case dets:open_file(GDBName,[{type,set},{file,GroupFile},{repair,true}]) of
-		{ok, GDB} ->
-		    NDD1 = lists:keyreplace(auth_user_file, 1, DirData, 
-					    {auth_user_file, PWDB}),
-		    NDD2 = lists:keyreplace(auth_group_file, 1, NDD1, 
-					    {auth_group_file, GDB}),
-		    {ok, NDD2};
-		{error, Err}->
-		    {error, {{file, GroupFile},Err}}
-	    end;
-	{error, Err2} ->
-	    {error, {{file, PWFile},Err2}} 
-    end.
-
-%%
-%% Storage format of users in the dets table:
-%% {{UserName, Addr, Port, Dir}, Password, UserData}
-%%
-
-add_user(DirData, UStruct) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    PWDB = httpd_util:key1search(DirData, auth_user_file),
-    Record = {{UStruct#httpd_user.username, Addr, Port, Dir},
-	      UStruct#httpd_user.password, UStruct#httpd_user.user_data}, 
-    case dets:lookup(PWDB, UStruct#httpd_user.username) of
-	[Record] ->
-	    {error, user_already_in_db};
-	_ ->
-	    dets:insert(PWDB, Record),
-	    true
-    end.
-
-get_user(DirData, UserName) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    PWDB = httpd_util:key1search(DirData, auth_user_file),
-    User = {UserName, Addr, Port, Dir},
-    case dets:lookup(PWDB, User) of
-	[{User, Password, UserData}] ->
-	    {ok, #httpd_user{username=UserName, password=Password, user_data=UserData}};
-	Other ->
-	    {error, no_such_user}
-    end.
-
-list_users(DirData) ->
-    ?DEBUG("list_users -> ~n"
-	   "     DirData: ~p", [DirData]),
-    {Addr, Port, Dir} = lookup_common(DirData),
-    PWDB = httpd_util:key1search(DirData, auth_user_file),
-    case dets:traverse(PWDB, fun(X) -> {continue, X} end) of    %% SOOOO Ugly !
-	Records when list(Records) ->
-	    ?DEBUG("list_users -> ~n"
-		   "     Records: ~p", [Records]),
-	    {ok, [UserName || {{UserName, AnyAddr, AnyPort, AnyDir}, Password, _Data} <- Records,
-			      AnyAddr == Addr, AnyPort == Port, AnyDir == Dir]};
-	O ->
-	    ?DEBUG("list_users -> ~n"
-		   "     O: ~p", [O]),
-	    {ok, []}
-    end.
-
-delete_user(DirData, UserName) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    PWDB = httpd_util:key1search(DirData, auth_user_file),
-    User = {UserName, Addr, Port, Dir},
-    case dets:lookup(PWDB, User) of
-	[{User, SomePassword, UserData}] ->
-	    dets:delete(PWDB, User),
-	    lists:foreach(fun(Group) -> delete_group_member(DirData, Group, UserName) end, 
-			  list_groups(DirData)),
-	    true;
-	_ ->
-	    {error, no_such_user}
-    end.
-
-%%
-%% Storage of groups in the dets table:
-%% {Group, UserList} where UserList is a list of strings.
-%%
-add_group_member(DirData, GroupName, UserName) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    GDB = httpd_util:key1search(DirData, auth_group_file),
-    Group = {GroupName, Addr, Port, Dir},
-    case dets:lookup(GDB, Group) of
-	[{Group, Users}] ->
-	    case lists:member(UserName, Users) of
-		true ->
-		    true;
-		false ->
-		    dets:insert(GDB, {Group, [UserName|Users]}),
-		    true
-	    end;
-	[] ->
-	    dets:insert(GDB, {Group, [UserName]}),
-	    true;
-	Other ->
-	    {error, Other}
-    end.
-
-list_group_members(DirData, GroupName) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    GDB = httpd_util:key1search(DirData, auth_group_file),
-    Group = {GroupName, Addr, Port, Dir},
-    case dets:lookup(GDB, Group) of
-	[{Group, Users}] ->
-	    {ok, Users};
-	Other ->
-	    {error, no_such_group}
-    end.
-
-list_groups(DirData) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    GDB  = httpd_util:key1search(DirData, auth_group_file),
-    case dets:match(GDB, {'$1', '_'}) of
-	[] ->
-	    {ok, []};
-	List when list(List) ->
-	    Groups = lists:flatten(List),
-	    {ok, [GroupName || {GroupName, AnyAddr, AnyPort, AnyDir} <- Groups,
-			   AnyAddr == Addr, AnyPort == Port, AnyDir == Dir]};
-	_ ->
-	    {ok, []}
-    end.
-
-delete_group_member(DirData, GroupName, UserName) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    GDB = httpd_util:key1search(DirData, auth_group_file),
-    Group = {GroupName, Addr, Port, Dir},
-    case dets:lookup(GDB, GroupName) of
-	[{Group, Users}] ->
-	    case lists:member(UserName, Users) of
-		true ->
-		    dets:delete(GDB, Group),
-		    dets:insert(GDB, {Group,
-				      lists:delete(UserName, Users)}),
-		    true;
-		false ->
-		    {error, no_such_group_member}
-	    end;
-	_ ->
-	    {error, no_such_group}
-    end.
-
-delete_group(DirData, GroupName) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    GDB = httpd_util:key1search(DirData, auth_group_file),
-    Group = {GroupName, Addr, Port, Dir},
-    case dets:lookup(GDB, Group) of
-	[{Group, Users}] ->
-	    dets:delete(GDB, Group),
-	    true;
-	_ ->
-	    {error, no_such_group}
-    end.
-
-lookup_common(DirData) ->
-    Dir  = httpd_util:key1search(DirData, path),
-    Port = httpd_util:key1search(DirData, port),
-    Addr = httpd_util:key1search(DirData, bind_address),
-    {Addr, Port, Dir}.
-
-%% remove/1
-%%
-%% Closes dets tables used by this auth mod.
-%%
-remove(DirData) ->
-    PWDB = httpd_util:key1search(DirData, auth_user_file),
-    GDB = httpd_util:key1search(DirData, auth_group_file),
-    dets:close(GDB),
-    dets:close(PWDB),
-    ok.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_mnesia.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_mnesia.erl
deleted file mode 100644
index ec29022da0..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_mnesia.erl
+++ /dev/null
@@ -1,276 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_auth_mnesia.erl,v 1.2 2010/03/04 13:54:19 maria Exp $
-%%
--module(mod_auth_mnesia).
--export([get_user/2,
-	 list_group_members/2,
-	 add_user/2,
-	 add_group_member/3,
-	 list_users/1,
-	 delete_user/2,
-	 list_groups/1,
-	 delete_group_member/3,
-	 delete_group/2]).
-
--export([store_user/5, store_user/6, 
-	 store_group_member/5, store_group_member/6, 
-	 list_group_members/3, list_group_members/4, 
-	 list_groups/2, list_groups/3,
-	 list_users/2, list_users/3, 
-	 remove_user/4, remove_user/5, 
-	 remove_group_member/5, remove_group_member/6, 
-	 remove_group/4, remove_group/5]).
-
--export([store_directory_data/2]).
-
--include("httpd.hrl").
--include("mod_auth.hrl").
-
-
-
-store_directory_data(Directory, DirData) ->
-    %% We don't need to do anything here, we could ofcourse check that the appropriate
-    %% mnesia tables has been created prior to starting the http server.
-    ok.
-
-
-%%
-%% API
-%%
-
-%% Compability API
-
-
-store_user(UserName, Password, Port, Dir, AccessPassword) ->
-   %% AccessPassword is ignored - was not used in previous version
-   DirData = [{path,Dir},{port,Port}],
-   UStruct = #httpd_user{username = UserName,
-			 password = Password},
-   add_user(DirData, UStruct).
-
-store_user(UserName, Password, Addr, Port, Dir, AccessPassword) ->
-   %% AccessPassword is ignored - was not used in previous version
-   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
-   UStruct = #httpd_user{username = UserName,
-			 password = Password},
-   add_user(DirData, UStruct).
-
-store_group_member(GroupName, UserName, Port, Dir, AccessPassword) ->
-   DirData = [{path,Dir},{port,Port}],
-   add_group_member(DirData, GroupName, UserName).
-
-store_group_member(GroupName, UserName, Addr, Port, Dir, AccessPassword) ->
-   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
-   add_group_member(DirData, GroupName, UserName).
-
-list_group_members(GroupName, Port, Dir) ->
-   DirData = [{path,Dir},{port,Port}],
-   list_group_members(DirData, GroupName).
-
-list_group_members(GroupName, Addr, Port, Dir) ->
-   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
-   list_group_members(DirData, GroupName).
-
-list_groups(Port, Dir) ->
-   DirData = [{path,Dir},{port,Port}],
-   list_groups(DirData).
-
-list_groups(Addr, Port, Dir) ->
-   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
-   list_groups(DirData).
-
-list_users(Port, Dir) ->
-   DirData = [{path,Dir},{port,Port}],
-   list_users(DirData).
-    
-list_users(Addr, Port, Dir) ->
-   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
-   list_users(DirData).
-    
-remove_user(UserName, Port, Dir, _AccessPassword) ->
-   DirData = [{path,Dir},{port,Port}],
-   delete_user(DirData, UserName).
-
-remove_user(UserName, Addr, Port, Dir, _AccessPassword) ->
-   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
-   delete_user(DirData, UserName).
-
-remove_group_member(GroupName,UserName,Port,Dir,_AccessPassword) ->
-   DirData = [{path,Dir},{port,Port}],
-   delete_group_member(DirData, GroupName, UserName).
-
-remove_group_member(GroupName,UserName,Addr,Port,Dir,_AccessPassword) ->
-   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
-   delete_group_member(DirData, GroupName, UserName).
-
-remove_group(GroupName,Port,Dir,_AccessPassword) ->
-   DirData = [{path,Dir},{port,Port}],
-   delete_group(DirData, GroupName).
-
-remove_group(GroupName,Addr,Port,Dir,_AccessPassword) ->
-   DirData = [{path,Dir},{bind_address,Addr},{port,Port}],
-   delete_group(DirData, GroupName).
-
-%%
-%% Storage format of users in the mnesia table:
-%% httpd_user records
-%%
-
-add_user(DirData, UStruct) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    UserName = UStruct#httpd_user.username,
-    Password = UStruct#httpd_user.password,
-    Data     = UStruct#httpd_user.user_data,
-    User=#httpd_user{username={UserName,Addr,Port,Dir},
-		     password=Password,
-		     user_data=Data},
-    case mnesia:transaction(fun() -> mnesia:write(User) end) of
-	{aborted,Reason} ->
-	    {error,Reason};
-	_ ->
-	    true
-    end.
-
-get_user(DirData, UserName) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    case mnesia:transaction(fun() ->
-				    mnesia:read({httpd_user, 
-						 {UserName,Addr,Port,Dir}})
-			    end) of
-	{aborted,Reason} ->
-	    {error, Reason};
-	{'atomic',[]} ->
-	    {error, no_such_user};
-	{'atomic', [Record]} when record(Record, httpd_user) ->
-	    {ok, Record#httpd_user{username=UserName}};
-	Other ->
-	    {error, no_such_user}
-    end.
-
-list_users(DirData) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    case mnesia:transaction(fun() ->
-				    mnesia:match_object({httpd_user,
-							 {'_',Addr,Port,Dir},'_','_'})
-			    end) of
-	{aborted,Reason} ->
-	    {error,Reason};
-	{'atomic',Users} ->
-	    {ok, 
-	     lists:foldr(fun({httpd_user, {UserName, AnyAddr, AnyPort, AnyDir}, 
-			      Password, Data}, Acc) ->
-				 [UserName|Acc]
-			 end,
-			 [], Users)}
-    end.
-
-delete_user(DirData, UserName) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    case mnesia:transaction(fun() ->
-				    mnesia:delete({httpd_user,
-						   {UserName,Addr,Port,Dir}})
-			    end) of
-	{aborted,Reason} ->
-	    {error,Reason};
-	_ ->
-	    true
-    end.
-
-%%
-%% Storage of groups in the mnesia table:
-%% Multiple instances of {#httpd_group, User}
-%%
-
-add_group_member(DirData, GroupName, User) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    Group=#httpd_group{name={GroupName, Addr, Port, Dir}, userlist=User},
-    case mnesia:transaction(fun() -> mnesia:write(Group) end) of
-	{aborted,Reason} ->
-	    {error,Reason};
-	_ ->
-	    true
-    end.
-
-list_group_members(DirData, GroupName) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    case mnesia:transaction(fun() ->
-				    mnesia:read({httpd_group,
-						 {GroupName,Addr,Port,Dir}})
-			    end) of
-	{aborted, Reason} ->
-	    {error,Reason};
-	{'atomic', Members} ->
-	    {ok,[UserName || {httpd_group,{AnyGroupName,AnyAddr,AnyPort,AnyDir},UserName} <- Members,
-			     AnyGroupName == GroupName, AnyAddr == Addr,
-			     AnyPort == Port, AnyDir == Dir]}
-  end.
-
-list_groups(DirData) -> 
-    {Addr, Port, Dir} = lookup_common(DirData),
-    case mnesia:transaction(fun() ->
-				    mnesia:match_object({httpd_group,
-							 {'_',Addr,Port,Dir},'_'}) 
-			    end) of
-	{aborted, Reason} ->
-	    {error, Reason};
-	{'atomic', Groups} ->
-	    GroupNames=
-		[GroupName || {httpd_group,{GroupName,AnyAddr,AnyPort,AnyDir}, UserName} <- Groups,
-			      AnyAddr == Addr, AnyPort == AnyPort, AnyDir == Dir],
-	    {ok, httpd_util:uniq(lists:sort(GroupNames))}
-    end.
-
-delete_group_member(DirData, GroupName, UserName) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    Group = #httpd_group{name={GroupName, Addr, Port, Dir}, userlist=UserName},
-    case mnesia:transaction(fun() -> mnesia:delete_object(Group) end) of
-	{aborted,Reason} ->
-	    {error,Reason};
-	_ ->
-	    true
-    end.
-
-%% THIS IS WRONG (?) !
-%% Should first match out all httpd_group records for this group and then
-%% do mnesia:delete on those. Or ?
-
-delete_group(DirData, GroupName) ->
-    {Addr, Port, Dir} = lookup_common(DirData),
-    case mnesia:transaction(fun() ->
-				    mnesia:delete({httpd_group, 
-						   {GroupName,Addr,Port,Dir}})
-			    end) of
-	{aborted,Reason} ->
-	    {error,Reason};
-	_ ->
-	    true
-    end.
-
-%% Utility functions.
-
-lookup_common(DirData) ->
-    Dir = httpd_util:key1search(DirData, path),
-    Port = httpd_util:key1search(DirData, port),
-    Addr = httpd_util:key1search(DirData, bind_address),
-    {Addr, Port, Dir}.
-
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_plain.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_plain.erl
deleted file mode 100644
index 2f92dcb446..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_plain.erl
+++ /dev/null
@@ -1,344 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_auth_plain.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_auth_plain).
-
--include("httpd.hrl").
--include("mod_auth.hrl").
-
--define(VMODULE,"AUTH_PLAIN").
--include("httpd_verbosity.hrl").
-
-
-%% Internal API
--export([store_directory_data/2]).
-
-
--export([get_user/2, 
-	 list_group_members/2, 
-	 add_user/2, 
-	 add_group_member/3, 
-	 list_users/1, 
-	 delete_user/2, 
-	 list_groups/1, 
-	 delete_group_member/3, 
-	 delete_group/2, 
-	 remove/1]).
-
-%%
-%% API
-%%
-
-%%
-%% Storage format of users in the ets table:
-%% {UserName, Password, UserData}
-%%
-
-add_user(DirData, #httpd_user{username = User} = UStruct) ->
-    ?vtrace("add_user -> entry with:"
-	"~n   User: ~p",[User]),
-    PWDB = httpd_util:key1search(DirData, auth_user_file),
-    Record = {User,
-	      UStruct#httpd_user.password, 
-	      UStruct#httpd_user.user_data}, 
-    case ets:lookup(PWDB, User) of
-	[{User, _SomePassword, _SomeData}] ->
-	    {error, user_already_in_db};
-	_ ->
-	    ets:insert(PWDB, Record),
-	    true
-    end.
-
-get_user(DirData, User) ->
-    ?vtrace("get_user -> entry with:"
-	"~n   User: ~p",[User]),
-    PWDB = httpd_util:key1search(DirData, auth_user_file),
-    case ets:lookup(PWDB, User) of
-	[{User, PassWd, Data}] ->
-	    {ok, #httpd_user{username=User, password=PassWd, user_data=Data}};
-	_ ->
-	    {error, no_such_user}
-    end.
-
-list_users(DirData) ->
-    PWDB = httpd_util:key1search(DirData, auth_user_file),
-    case ets:match(PWDB, '$1') of
-	Records when list(Records) ->
-	    {ok, lists:foldr(fun({User,PassWd,Data}, A) -> [User|A] end, 
-			     [], lists:flatten(Records))};
-	O ->
-	    {ok, []}
-    end.
-
-delete_user(DirData, UserName) ->
-    ?vtrace("delete_user -> entry with:"
-	"~n   UserName: ~p",[UserName]),
-    PWDB = httpd_util:key1search(DirData, auth_user_file),
-    case ets:lookup(PWDB, UserName) of
-	[{UserName, SomePassword, SomeData}] ->
-	    ets:delete(PWDB, UserName),
-	    case list_groups(DirData) of
-		{ok,Groups}->
-		    lists:foreach(fun(Group) -> 
-					  delete_group_member(DirData, Group, UserName) 
-				  end,Groups),
-		    true;
-		_->
-		    true
-	    end;
-	_ ->
-	    {error, no_such_user}
-    end.
-
-%%
-%% Storage of groups in the ets table:
-%% {Group, UserList} where UserList is a list of strings.
-%%
-  
-add_group_member(DirData, Group, UserName) ->
-    ?DEBUG("add_group_members -> ~n"
-	   "    Group:    ~p~n"
-	   "    UserName: ~p",[Group,UserName]),
-    GDB = httpd_util:key1search(DirData, auth_group_file),
-    case ets:lookup(GDB, Group) of
-	[{Group, Users}] ->
-	    case lists:member(UserName, Users) of
-		true ->
-		    ?DEBUG("add_group_members -> already member in group",[]),
-		    true;
-		false ->
-		    ?DEBUG("add_group_members -> add",[]),
-		    ets:insert(GDB, {Group, [UserName|Users]}),
-		    true
-	    end;
-	[] ->
-	    ?DEBUG("add_group_members -> create grouo",[]),
-	    ets:insert(GDB, {Group, [UserName]}),
-	    true;
-	Other ->
-	    ?ERROR("add_group_members -> Other: ~p",[Other]),
-	    {error, Other}
-    end.
-
-list_group_members(DirData, Group) ->
-    ?DEBUG("list_group_members -> Group: ~p",[Group]),
-    GDB = httpd_util:key1search(DirData, auth_group_file),
-    case ets:lookup(GDB, Group) of
-	[{Group, Users}] ->
-	    ?DEBUG("list_group_members -> Users: ~p",[Users]),
-	    {ok, Users};
-	_ ->
-	    {error, no_such_group}
-    end.
-
-list_groups(DirData) ->
-    ?DEBUG("list_groups -> entry",[]),
-    GDB = httpd_util:key1search(DirData, auth_group_file),
-    case ets:match(GDB, '$1') of
-	[] ->
-	    ?DEBUG("list_groups -> []",[]),
-	    {ok, []};
-	Groups0 when list(Groups0) ->
-	    ?DEBUG("list_groups -> Groups0: ~p",[Groups0]),
-	    {ok, httpd_util:uniq(lists:foldr(fun({G, U}, A) -> [G|A] end,
-					     [], lists:flatten(Groups0)))};
-	_ ->
-	    {ok, []}
-    end.
-
-delete_group_member(DirData, Group, User) ->
-    ?DEBUG("list_group_members -> ~n"
-	   "     Group: ~p~n"
-	   "     User:  ~p",[Group,User]),
-    GDB = httpd_util:key1search(DirData, auth_group_file),
-    UDB = httpd_util:key1search(DirData, auth_user_file),
-    case ets:lookup(GDB, Group) of
-	[{Group, Users}] when list(Users) ->
-	    case lists:member(User, Users) of
-		true ->
-		    ?DEBUG("list_group_members -> deleted from group",[]),
-		    ets:delete(GDB, Group),
-		    ets:insert(GDB, {Group, lists:delete(User, Users)}),
-		    true;
-		false ->
-		    ?DEBUG("list_group_members -> not member",[]),
-		    {error, no_such_group_member}
-	    end;
-	_ ->
-	    ?ERROR("list_group_members -> no such group",[]),
-	    {error, no_such_group}
-    end.
-
-delete_group(DirData, Group) ->
-    ?DEBUG("list_group_members -> Group: ~p",[Group]),
-    GDB = httpd_util:key1search(DirData, auth_group_file),
-    case ets:lookup(GDB, Group) of
-	[{Group, Users}] ->
-	    ?DEBUG("list_group_members -> delete",[]),
-	    ets:delete(GDB, Group),
-	    true;
-	_ ->
-	    ?ERROR("delete_group -> no such group",[]),
-	    {error, no_such_group}
-    end.
-
-
-store_directory_data(Directory, DirData) ->
-    PWFile = httpd_util:key1search(DirData, auth_user_file),
-    GroupFile = httpd_util:key1search(DirData, auth_group_file),
-    case load_passwd(PWFile) of
-	{ok, PWDB} ->
-	    case load_group(GroupFile) of
-		{ok, GRDB} ->
-		    %% Address and port is included in the file names...
-		    Addr = httpd_util:key1search(DirData, bind_address),
-		    Port = httpd_util:key1search(DirData, port),
-		    {ok, PasswdDB} = store_passwd(Addr,Port,PWDB),
-		    {ok, GroupDB}  = store_group(Addr,Port,GRDB),
-		    NDD1 = lists:keyreplace(auth_user_file, 1, DirData, 
-					    {auth_user_file, PasswdDB}),
-		    NDD2 = lists:keyreplace(auth_group_file, 1, NDD1, 
-					    {auth_group_file, GroupDB}),
-		    {ok, NDD2};
-		Err ->
-		    ?ERROR("failed storing directory data: "
-			   "load group error: ~p",[Err]),
-		    {error, Err}
-	    end;
-	Err2 ->
-	    ?ERROR("failed storing directory data: "
-		   "load passwd error: ~p",[Err2]),
-	    {error, Err2}
-    end.
-
-
-
-%% load_passwd
-
-load_passwd(AuthUserFile) ->
-    case file:open(AuthUserFile, [read]) of
-	{ok,Stream} ->
-	    parse_passwd(Stream, []);
-	{error, _} ->
-	    {error, ?NICE("Can't open "++AuthUserFile)}
-    end.
-
-parse_passwd(Stream,PasswdList) ->
-    Line =
-	case io:get_line(Stream, '') of
-	    eof ->
-		eof;
-	    String ->
-		httpd_conf:clean(String)
-	end,
-    parse_passwd(Stream, PasswdList, Line).
-
-parse_passwd(Stream, PasswdList, eof) ->
-    file:close(Stream),
-    {ok, PasswdList};
-parse_passwd(Stream, PasswdList, "") ->
-    parse_passwd(Stream, PasswdList);
-parse_passwd(Stream, PasswdList, [$#|_]) ->
-    parse_passwd(Stream, PasswdList);
-parse_passwd(Stream, PasswdList, Line) ->      
-    case regexp:split(Line,":") of
-	{ok, [User,Password]} ->
-	    parse_passwd(Stream, [{User,Password, []}|PasswdList]);
-	{ok,_} ->
-	    {error, ?NICE(Line)}
-    end.
-
-%% load_group
-
-load_group(AuthGroupFile) ->
-    case file:open(AuthGroupFile, [read]) of
-	{ok, Stream} ->
-	    parse_group(Stream,[]);
-	{error, _} ->
-	    {error, ?NICE("Can't open "++AuthGroupFile)}
-    end.
-
-parse_group(Stream, GroupList) ->
-    Line=
-	case io:get_line(Stream,'') of
-	    eof ->
-		eof;
-	    String ->
-		httpd_conf:clean(String)
-	end,
-    parse_group(Stream, GroupList, Line).
-
-parse_group(Stream, GroupList, eof) ->
-    file:close(Stream),
-    {ok, GroupList};
-parse_group(Stream, GroupList, "") ->
-    parse_group(Stream, GroupList);
-parse_group(Stream, GroupList, [$#|_]) ->
-    parse_group(Stream, GroupList);
-parse_group(Stream, GroupList, Line) ->      
-    case regexp:split(Line, ":") of
-	{ok, [Group,Users]} ->
-	    {ok, UserList} = regexp:split(Users," "),
-	    parse_group(Stream, [{Group,UserList}|GroupList]);
-	{ok, _} ->
-	    {error, ?NICE(Line)}
-    end.
-
-
-%% store_passwd
-
-store_passwd(Addr,Port,PasswdList) ->
-    Name = httpd_util:make_name("httpd_passwd",Addr,Port),
-    PasswdDB = ets:new(Name, [set, public]),
-    store_passwd(PasswdDB, PasswdList).
-
-store_passwd(PasswdDB, []) ->
-    {ok, PasswdDB};
-store_passwd(PasswdDB, [User|Rest]) ->
-    ets:insert(PasswdDB, User),
-    store_passwd(PasswdDB, Rest).
-
-%% store_group
-
-store_group(Addr,Port,GroupList) ->
-    Name = httpd_util:make_name("httpd_group",Addr,Port),
-    GroupDB = ets:new(Name, [set, public]),
-    store_group(GroupDB, GroupList).
-
-
-store_group(GroupDB,[]) ->
-    {ok, GroupDB};
-store_group(GroupDB,[User|Rest]) ->
-    ets:insert(GroupDB, User),
-    store_group(GroupDB, Rest).
-
-
-%% remove/1
-%%
-%% Deletes ets tables used by this auth mod.
-%%
-remove(DirData) ->
-    PWDB = httpd_util:key1search(DirData, auth_user_file),
-    GDB = httpd_util:key1search(DirData, auth_group_file),
-    ets:delete(PWDB),
-    ets:delete(GDB).
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_server.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_server.erl
deleted file mode 100644
index 6694ed7eac..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_auth_server.erl
+++ /dev/null
@@ -1,424 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_auth_server.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
-
--module(mod_auth_server).
-
--include("httpd.hrl").
-%% -include("mod_auth.hrl").
--include("httpd_verbosity.hrl").
-
--behaviour(gen_server).
-
-
-%% mod_auth exports 
--export([start/2, stop/2, 
-	 add_password/4, update_password/5, 
-	 add_user/5, delete_user/5, get_user/5, list_users/4, 
-	 add_group_member/6, delete_group_member/6, list_group_members/5, 
-	 delete_group/5, list_groups/4]).
-
-%% Management exports
--export([verbosity/3]).
-
-%% gen_server exports
--export([start_link/3,
-	 init/1,
-	 handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
-
-
--record(state,{tab}).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% External API                                                     %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% start_link/3
-%% 
-%% NOTE: This is called by httpd_misc_sup when the process is started
-%% 
-start_link(Addr, Port, Verbosity)->
-    ?vlog("start_link -> entry with"
-	  "~n   Addr: ~p"
-	  "~n   Port: ~p", [Addr, Port]),
-    Name = make_name(Addr, Port),
-    gen_server:start_link({local, Name}, ?MODULE, [Verbosity],
-			  [{timeout, infinity}]).
-
-
-%% start/2
-
-start(Addr, Port)->
-    ?vtrace("start -> entry with"
-	    "~n   Addr: ~p"
-	    "~n   Port: ~p", [Addr, Port]),
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	undefined ->
-           Verbosity = get(auth_verbosity),
-           case (catch httpd_misc_sup:start_auth_server(Addr, Port, 
-                                                        Verbosity)) of
-		{ok, Pid} ->
-		    put(auth_server, Pid),
-		    ok;
-		{error, Reason} ->
-		    exit({failed_start_auth_server, Reason});
-		Error ->
-		    exit({failed_start_auth_server, Error})
-	    end;
-	_ -> %% Already started...
-	    ok
-    end.
-
-
-%% stop/2
-
-stop(Addr, Port)->
-    ?vtrace("stop -> entry with"
-	    "~n   Addr: ~p"
-	    "~n   Port: ~p", [Addr, Port]),
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	undefined -> %% Already stopped
-	    ok;
-	_ ->
-           (catch httpd_misc_sup:stop_auth_server(Addr, Port))
-    end.
-
-
-%% verbosity/3
-
-verbosity(Addr, Port, Verbosity) ->
-    Name = make_name(Addr, Port),
-    Req  = {verbosity, Verbosity},
-    call(Name, Req).
-
-
-%% add_password/4
-
-add_password(Addr, Port, Dir, Password)->
-    Name = make_name(Addr, Port),
-    Req  = {add_password, Dir, Password},
-    call(Name, Req).
-
-
-%% update_password/6
-
-update_password(Addr, Port, Dir, Old, New) when list(New) ->
-    Name = make_name(Addr, Port),
-    Req  = {update_password, Dir, Old, New},
-    call(Name, Req).
-	   
- 
-%% add_user/5
-
-add_user(Addr, Port, Dir, User, Password) ->
-    Name = make_name(Addr, Port),
-    Req  = {add_user, Addr, Port, Dir, User, Password},
-    call(Name, Req).
-
-
-%% delete_user/5
-
-delete_user(Addr, Port, Dir, UserName, Password) ->
-    Name = make_name(Addr, Port),
-    Req  = {delete_user, Addr, Port, Dir, UserName, Password},
-    call(Name, Req).
-
-
-%% get_user/5
-
-get_user(Addr, Port, Dir, UserName, Password) ->
-    Name = make_name(Addr, Port),
-    Req  = {get_user, Addr, Port, Dir, UserName, Password},
-    call(Name, Req).
-
-
-%% list_users/4
-
-list_users(Addr, Port, Dir, Password) ->
-    Name = make_name(Addr,Port),
-    Req  = {list_users, Addr, Port, Dir, Password},
-    call(Name, Req).
-
-
-%% add_group_member/6
-
-add_group_member(Addr, Port, Dir, GroupName, UserName, Password) ->
-    Name = make_name(Addr,Port),
-    Req  = {add_group_member, Addr, Port, Dir, GroupName, UserName, Password},
-    call(Name, Req).
-
-
-%% delete_group_member/6
-
-delete_group_member(Addr, Port, Dir, GroupName, UserName, Password) ->
-    Name = make_name(Addr,Port),
-    Req  = {delete_group_member, Addr, Port, Dir, GroupName, UserName, Password},
-    call(Name, Req).
-
-
-%% list_group_members/4
-
-list_group_members(Addr, Port, Dir, Group, Password) ->
-    Name = make_name(Addr, Port),
-    Req  = {list_group_members, Addr, Port, Dir, Group, Password},
-    call(Name, Req).
-
-
-%% delete_group/5
-
-delete_group(Addr, Port, Dir, GroupName, Password) ->
-    Name = make_name(Addr, Port),
-    Req  = {delete_group, Addr, Port, Dir, GroupName, Password},
-    call(Name, Req).
-
-
-%% list_groups/4
-
-list_groups(Addr, Port, Dir, Password) ->
-    Name = make_name(Addr, Port),
-    Req  = {list_groups, Addr, Port, Dir, Password},
-    call(Name, Req).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% Server call-back functions                                       %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% init
-
-init([undefined]) ->
-    init([?default_verbosity]);
-
-init([Verbosity]) ->
-    put(sname,auth),
-    put(verbosity,Verbosity),
-    ?vlog("starting",[]),
-    {ok,#state{tab = ets:new(auth_pwd,[set,protected])}}.
-
-
-%% handle_call
-
-%% Add a user
-handle_call({add_user, Addr, Port, Dir, User, AuthPwd}, _From, State) ->
-    Reply = api_call(Addr, Port, Dir, add_user, User, AuthPwd, State),
-    {reply, Reply, State};
-
-%% Get data about a user
-handle_call({get_user, Addr, Port, Dir, User, AuthPwd}, _From, State) ->
-    Reply = api_call(Addr, Port, Dir, get_user, [User], AuthPwd, State),
-    {reply, Reply, State};
-
-%% Add a group member
-handle_call({add_group_member, Addr, Port, Dir, Group, User, AuthPwd},
-	    _From, State) ->
-    Reply = api_call(Addr, Port, Dir, add_group_member, [Group, User], 
-		     AuthPwd, State),
-    {reply, Reply, State};
-
-%% delete a group
-handle_call({delete_group_member, Addr, Port, Dir, Group, User, AuthPwd},
-	    _From, State)->
-    Reply = api_call(Addr, Port, Dir, delete_group_member, [Group, User], 
-		     AuthPwd, State), 
-    {reply, Reply, State};
-
-%% List all users thats standalone users
-handle_call({list_users, Addr, Port, Dir, AuthPwd}, _From, State)->
-    Reply = api_call(Addr, Port, Dir, list_users, [], AuthPwd, State),
-    {reply, Reply, State};
-
-%% Delete a user
-handle_call({delete_user, Addr, Port, Dir, User, AuthPwd}, _From, State)->
-    Reply = api_call(Addr, Port, Dir, delete_user, [User], AuthPwd, State),
-    {reply, Reply, State};
-
-%% Delete a group
-handle_call({delete_group, Addr, Port, Dir, Group, AuthPwd}, _From, State)->
-    Reply = api_call(Addr, Port, Dir, delete_group, [Group], AuthPwd, State),
-    {reply, Reply, State};
-
-%% List the current groups
-handle_call({list_groups, Addr, Port, Dir, AuthPwd}, _From, State)->
-    Reply = api_call(Addr, Port, Dir, list_groups, [], AuthPwd, State),
-    {reply, Reply, State};
-
-%% List the members of the given group
-handle_call({list_group_members, Addr, Port, Dir, Group, AuthPwd},
-	    _From, State)->
-    Reply = api_call(Addr, Port, Dir, list_group_members, [Group],
-		     AuthPwd, State), 
-    {reply, Reply, State};
-
-
-%% Add password for a directory
-handle_call({add_password, Dir, Password}, _From, State)->
-    Reply = do_add_password(Dir, Password, State),
-    {reply, Reply, State};
-
-
-%% Update the password for a directory
-  
-handle_call({update_password, Dir, Old, New},_From,State)->
-    Reply = 
-	case getPassword(State, Dir) of
-	    OldPwd when binary(OldPwd)->
-		case erlang:md5(Old) of
-		    OldPwd ->
-			%% The old password is right =>
-			%% update the password to the new
-			do_update_password(Dir,New,State),
-			ok;
-		_->
-		    {error, error_new}
-	    end;
-	_->
-	    {error, error_old}
-    end,
-    {reply, Reply, State};
-
-handle_call(stop, _From, State)->
-    {stop, normal, State};
-
-handle_call({verbosity,Verbosity},_From,State)->
-    OldVerbosity = put(verbosity,Verbosity),
-    ?vlog("set verbosity:  ~p -> ~p",[Verbosity,OldVerbosity]),
-    {reply,OldVerbosity,State}.
-
-handle_info(Info,State)->
-    {noreply,State}.
-
-handle_cast(Request,State)->
-    {noreply,State}.
-    
-
-terminate(Reason,State) ->
-    ets:delete(State#state.tab),
-    ok.
-
-
-%% code_change({down, ToVsn}, State, Extra)
-%% 
-code_change({down, _}, #state{tab = Tab}, downgrade_to_2_6_0) ->
-    ?vlog("downgrade to 2.6.0", []),
-    {ok, {state, Tab, undefined}};
-
-
-%% code_change(FromVsn, State, Extra)
-%%
-code_change(_, {state, Tab, _}, upgrade_from_2_6_0) ->
-    ?vlog("upgrade from 2.6.0", []),
-    {ok, #state{tab = Tab}}.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% The functions that really changes the data in the database       %%
-%% of users to different directories                                %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
-
-%% API gateway
-
-api_call(Addr, Port, Dir, Func, Args,Password,State) ->
-    case controlPassword(Password,State,Dir) of
-	ok->
-	    ConfigName = httpd_util:make_name("httpd_conf",Addr,Port),
-	    case ets:match_object(ConfigName, {directory, Dir, '$1'}) of
-		[{directory, Dir, DirData}] ->
-		    AuthMod = auth_mod_name(DirData),
-		    ?DEBUG("api_call -> call ~p:~p",[AuthMod,Func]),
-		    Ret = (catch apply(AuthMod, Func, [DirData|Args])),
-		    ?DEBUG("api_call -> Ret: ~p",[ret]),
-		    Ret;
-		O ->
-		    ?DEBUG("api_call -> O: ~p",[O]),
-		    {error, no_such_directory}
-	    end;
-	bad_password ->
-	    {error,bad_password}
-    end.
-
-controlPassword(Password,State,Dir)when Password=:="DummyPassword"->
-    bad_password;
-
-controlPassword(Password,State,Dir)->
-    case getPassword(State,Dir) of
-	Pwd when binary(Pwd)->
-	    case erlang:md5(Password) of
-		Pwd ->
-		    ok;
-		_->
-		    bad_password
-	    end;
-	_ ->
-	    bad_password
-    end.
-
-    
-getPassword(State,Dir)->
-    case lookup(State#state.tab, Dir) of
-	[{_,Pwd}]->
-	    Pwd;
-	_ ->
-	    {error,bad_password}
-    end.
-
-do_update_password(Dir, New, State) ->
-    ets:insert(State#state.tab, {Dir, erlang:md5(New)}).
-
-do_add_password(Dir, Password, State) ->
-    case getPassword(State,Dir) of
-	PwdExists when binary(PwdExists) ->
-	    {error, dir_protected};
-	{error, _} ->
-	    do_update_password(Dir, Password, State)
-    end.
-	    
-
-auth_mod_name(DirData) ->
-    case httpd_util:key1search(DirData, auth_type, plain) of
-	plain ->    mod_auth_plain;
-	mnesia ->   mod_auth_mnesia;
-	dets ->	    mod_auth_dets
-    end.
-
-    
-lookup(Db, Key) ->
-    ets:lookup(Db, Key).
-
-
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_auth",Addr,Port).
-
-
-call(Name, Req) ->
-    case (catch gen_server:call(Name, Req)) of
-	{'EXIT', Reason} ->
-	    {error, Reason};
-	Reply ->
-	    Reply
-    end.
-    
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_browser.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_browser.erl
deleted file mode 100644
index 62ffba0e5b..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_browser.erl
+++ /dev/null
@@ -1,214 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_browser.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
-%% ----------------------------------------------------------------------
-%%
-%% Browsers sends a string to the webbserver
-%% to identify themsevles. They are a bit nasty
-%% since the only thing that the specification really 
-%% is strict about is that they shall be short
-%% tree axamples:
-%%
-%% Netscape Mozilla/4.75 [en] (X11; U; SunOS 5.8 sun4u)
-%% IE5      Mozilla/4.0 (compatible; MSIE 5.0; SP1B; SunOS 5.8 sun4u; X11)
-%% Lynx     Lynx/2.8.3rel.1 libwww-FM/2.142
-%%
-%% ----------------------------------------------------------------------
-
--module(mod_browser).
-
-%% Remember that the order of the mozilla browsers are 
-%% important since some browsers include others to behave 
-%% as they were something else  
--define(MOZILLA_BROWSERS,[{opera,"opera"},{msie,"msie"}]).
-
-
-%% If your operatingsystem is not recognized add it to this list.
--define(OPERATIVE_SYSTEMS,[{win3x,["win16","windows 3","windows 16-bit"]},
-			   {win95,["win95","windows 95"]},
-			   {win98,["win98", "windows 98"]},
-			   {winnt,["winnt", "windows nt"]},
-			   {win2k,["nt 5"]},
-			   {sunos4,["sunos 4"]},
-			   {sunos5,["sunos 5"]},
-			   {sun,["sunos"]},
-			   {aix,["aix"]},
-			   {linux,["linux"]},
-			   {sco,["sco","unix_sv"]},
-			   {freebsd,["freebsd"]},
-			   {bsd,["bsd"]}]).
-
--define(LYNX,lynx).
--define(MOZILLA,mozilla).
--define(EMACS,emacs).
--define(STAROFFICE,soffice).
--define(MOSAIC,mosaic).
--define(NETSCAPE,netscape).
--define(UNKOWN,unknown).
-
--include("httpd.hrl").
-
--export([do/1, test/0, getBrowser/1]).
-
-
-do(Info) ->
-    case httpd_util:key1search(Info#mod.data,status) of
-	{Status_code,PhraseArgs,Reason} ->
-	    {proceed,Info#mod.data};
-	undefined ->
-	    {proceed,[{'user-agent',getBrowser1(Info)}|Info#mod.data]}
-    end.
-
-getBrowser1(Info) ->
-    PHead=Info#mod.parsed_header,
-    case httpd_util:key1search(PHead,"User-Agent") of
-	undefined->
-	   undefined;
-	AgentString ->
-	    getBrowser(AgentString)
-    end.
-
-getBrowser(AgentString) ->
-    LAgentString = httpd_util:to_lower(AgentString),
-    case regexp:first_match(LAgentString,"^[^ ]*") of
-	{match,Start,Length} ->
-	    Browser=lists:sublist(LAgentString,Start,Length),
-	    case browserType(Browser) of
-		{mozilla,Vsn} ->
-		    {getMozilla(LAgentString,
-				?MOZILLA_BROWSERS,{?NETSCAPE,Vsn}),
-		     operativeSystem(LAgentString)};
-		AnyBrowser ->
-		      {AnyBrowser,operativeSystem(LAgentString)}
-	    end;
-	nomatch ->
-	    browserType(LAgentString)
-    end.
-
-browserType([$l,$y,$n,$x|Version]) ->
-    {?LYNX,browserVersion(Version)};
-browserType([$m,$o,$z,$i,$l,$l,$a|Version]) ->
-    {?MOZILLA,browserVersion(Version)};
-browserType([$e,$m,$a,$c,$s|Version]) ->
-    {?EMACS,browserVersion(Version)};
-browserType([$e,$t,$a,$r,$o,$f,$f,$i,$c,$e|Version]) ->
-    {?STAROFFICE,browserVersion(Version)};
-browserType([$m,$o,$s,$a,$i,$c|Version]) ->
-    {?MOSAIC,browserVersion(Version)};
-browserType(Unknown)->
-    unknown.
- 
-
-browserVersion([$/|VsnString]) ->
-    case catch list_to_float(VsnString) of
-	Number when float(Number) ->
-	    Number;
-	Whatever ->
-	    case string:span(VsnString,"1234567890.") of
-		0 ->
-		    unknown;
-		VLength ->
-		    Vsn = string:substr(VsnString,1,VLength),
-		    case string:tokens(Vsn,".") of
-			[Number] ->
-			   list_to_float(Number++".0");
-			[Major,Minor|_MinorMinor] ->
-			    list_to_float(Major++"."++Minor)
-		    end
-	    end
-    end;
-browserVersion(VsnString) ->
-    browserVersion([$/|VsnString]).
-
-operativeSystem(OpString) ->
-  operativeSystem(OpString, ?OPERATIVE_SYSTEMS).
-
-operativeSystem(OpString,[]) ->
-    unknown;
-operativeSystem(OpString,[{RetVal,RegExps}|Rest]) ->
-    case controlOperativeSystem(OpString,RegExps) of
-	true->
-	    RetVal;
-	_ ->
-	    operativeSystem(OpString,Rest)
-    end.
-
-controlOperativeSystem(OpString,[]) ->
-    false;
-controlOperativeSystem(OpString,[Regexp|Regexps]) ->
-    case regexp:match(OpString,Regexp) of
-	{match,_,_}->
-	    true;
-	nomatch->
-	    controlOperativeSystem(OpString,Regexps)
-    end.
-
-
-%% OK this is ugly but thats the only way since 
-%% all browsers dont conform to the name/vsn standard
-%% First we check if it is one of the browsers that 
-%% not are the default mozillaborwser against the regexp 
-%% for the different browsers. if no match it a mozilla 
-%% browser i.e opera netscape or internet explorer
-
-getMozilla(AgentString,[],Default) ->
-    Default;
-getMozilla(AgentString,[{Agent,AgentRegExp}|Rest],Default) ->
-    case regexp:match(AgentString,AgentRegExp) of
-	{match,_,_} ->
-	    {Agent,getVersion(AgentString,AgentRegExp)};
-	nomatch ->
-	    getMozilla(AgentString,Rest,Default)
-    end.
-
-getVersion(AgentString,AgentRegExp) ->
-    case regexp:match(AgentString,AgentRegExp++"[0-9\.\ ]*") of
-	{match,Start,Length} when length(AgentRegExp) < Length ->
-	    %% Ok we got the number split it out
-	    RealStart=Start+length(AgentRegExp),
-	    RealLength=Length-length(AgentRegExp),
-	    VsnString=string:substr(AgentString,RealStart,RealLength),
-	    case string:strip(VsnString,both,$\ ) of
-		[] ->
-		    unknown;
-		Vsn ->
-		    case string:tokens(Vsn,".") of
-			[Number]->
-			    list_to_float(Number++".0");
-			[Major,Minor|_MinorMinor]->
-			    list_to_float(Major++"."++Minor)
-		    end
-	    end;
-	nomatch ->
-	    unknown
-    end.
-
-
-test()->
-    io:format("~n--------------------------------------------------------~n"),
-    Res1=getBrowser("Mozilla/4.75 [en] (X11; U; SunOS 5.8 sun4u)"),
-    io:format("~p",[Res1]),
-    io:format("~n--------------------------------------------------------~n"),
-    io:format("~n--------------------------------------------------------~n"),
-    Res2=getBrowser("Mozilla/4.0 (compatible; MSIE 5.0; SP1B; SunOS 5.8 sun4u; X11)"),
-    io:format("~p",[Res2]),
-    io:format("~n--------------------------------------------------------~n"),
-    io:format("~n--------------------------------------------------------~n"),
-    Res3=getBrowser("Lynx/2.8.3rel.1 libwww-FM/2.142"),
-    io:format("~p",[Res3]),
-    io:format("~n--------------------------------------------------------~n").
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_cgi.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_cgi.erl
deleted file mode 100644
index d9070b8860..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_cgi.erl
+++ /dev/null
@@ -1,694 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_cgi.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_cgi).
--export([do/1,env/3,status_code/1,load/2]).
-
-%%Exports to the interface for sending chunked data 
-%% to http/1.1 users and full responses to http/1.0
--export([send/5,final_send/4, update_status_code/2,get_new_size/2]).
--include("httpd.hrl").
-
--define(VMODULE,"CGI").
--include("httpd_verbosity.hrl").
-
--define(GATEWAY_INTERFACE,"CGI/1.1").
--define(DEFAULT_CGI_TIMEOUT,15000).
-
-%% do
-
-do(Info) ->
-    ?vtrace("do",[]),
-    case httpd_util:key1search(Info#mod.data,status) of
-	%% A status code has been generated!
-	{StatusCode, PhraseArgs, Reason} ->
-	    {proceed, Info#mod.data};
-	%% No status code has been generated!
-	undefined ->
-	    ?vtrace("do -> no status code has been generated", []),
-	    case httpd_util:key1search(Info#mod.data,response) of
-		%% No response has been generated!
-		undefined ->
-		    ?vtrace("do -> no response has been generated", []),
-		    RequestURI =
-			case httpd_util:key1search(Info#mod.data,
-						   new_request_uri) of
-			    undefined ->
-				Info#mod.request_uri;
-			    Value ->
-				Value
-			end,
-		    ?vtrace("do -> RequestURI: ~p", [RequestURI]),
-		    ScriptAliases =
-			httpd_util:multi_lookup(Info#mod.config_db,
-						script_alias),
-		    ?vtrace("do -> ScriptAliases: ~p", [ScriptAliases]),
-		    case mod_alias:real_script_name(Info#mod.config_db,
-						    RequestURI,
-						    ScriptAliases) of
-			{Script, AfterScript} ->
-			    exec_script(Info, Script, AfterScript, RequestURI);
-			not_a_script ->
-			    {proceed,Info#mod.data}
-		    end;
-		%% A response has been generated or sent!
-		Response ->
-		    {proceed,Info#mod.data}
-	    end
-    end.
-
-
-%% is_executable(File) ->
-%%    ?DEBUG("is_executable -> entry with~n"
-%%	   "   File: ~s",[File]),
-%%    Dir      = filename:dirname(File),
-%%    FileName = filename:basename(File),
-%%    is_executable(FileName,Dir).
-%%
-%% is_executable(FileName,Dir) ->
-%%    ?DEBUG("is_executable -> entry with~n"
-%%	   "   Dir:      ~s~n"
-%%	   "   FileName: ~s",[Dir,FileName]),
-%%    case os:find_executable(FileName, Dir) of
-%%	false ->
-%%	    false;
-%%	_ ->
-%%	    true
-%%    end.
-
-
-%% -------------------------
-%% Start temporary (hopefully) fix for win32
-%% OTP-3627
-%%
-
-is_executable(File) ->
-    Dir      = filename:dirname(File),
-    FileName = filename:basename(File),
-    case os:type() of
-	{win32,_} ->
-	    is_win32_executable(Dir,FileName);
-	_ ->
-	    is_other_executable(Dir,FileName) 
-    end.
-
-
-is_win32_executable(D,F) ->
-    case ends_with(F,[".bat",".exe",".com"]) of
-	false ->
-	    %% This is why we cant use 'os:find_executable' directly.
-	    %% It assumes that executable files is given without extension
-	    case os:find_executable(F,D) of
-		false ->
-		    false;
-		_ ->
-		    true
-	    end;
-	true ->
-	    case file:read_file_info(D ++ "/" ++ F) of
-		{ok,_} ->
-		    true;
-		_ ->
-		    false
-	    end
-    end.
-	    
-
-is_other_executable(D,F) ->
-    case os:find_executable(F,D) of
-	false ->
-	    false;
-	_ ->
-	    true
-    end.
-
-
-ends_with(File,[]) ->
-    false;
-ends_with(File,[Ext|Rest]) ->
-    case ends_with1(File,Ext) of
-	true ->
-	    true;
-	false ->
-	    ends_with(File,Rest)
-    end.
-    
-ends_with1(S,E) when length(S) >= length(E) ->
-    case to_lower(string:right(S,length(E))) of
-	E ->
-	    true;
-	_ ->
-	    false
-    end;
-ends_with1(_S,_E) ->
-    false.
-    
-
-to_lower(S)       -> to_lower(S,[]).
-
-to_lower([],L)    -> lists:reverse(L);
-to_lower([H|T],L) -> to_lower(T,[to_lower1(H)|L]).
-
-to_lower1(C) when C >= $A, C =< $Z ->
-    C + ($a - $A);
-to_lower1(C) ->
-    C.
-
-%%
-%% End fix
-%% ---------------------------------
-    
-
-env(VarName, Value) ->
-    {VarName, Value}.
-
-env(Info, Script, AfterScript) ->
-    ?vtrace("env -> entry with"
-	    "~n   Script:      ~p"
-	    "~n   AfterScript: ~p",
-	    [Script, AfterScript]),
-    {_, RemoteAddr} = (Info#mod.init_data)#init_data.peername,
-    ServerName = (Info#mod.init_data)#init_data.resolve,
-    PH = parsed_header(Info#mod.parsed_header),
-    Env =
-	[env("SERVER_SOFTWARE",?SERVER_SOFTWARE),
-	 env("SERVER_NAME",ServerName),
-	 env("GATEWAY_INTERFACE",?GATEWAY_INTERFACE),
-	 env("SERVER_PROTOCOL",?SERVER_PROTOCOL),
-	 env("SERVER_PORT", 
-	     integer_to_list(httpd_util:lookup(Info#mod.config_db,port,80))),
-	 env("REQUEST_METHOD",Info#mod.method),
-	 env("REMOTE_ADDR",RemoteAddr),
-	 env("SCRIPT_NAME",Script)],
-    Env1 =
-        case Info#mod.method of
-            "GET" ->
-                case AfterScript of
-		    {[], QueryString} ->
-                        [env("QUERY_STRING", QueryString)|Env];
-		    {PathInfo, []} ->
-                        Aliases = httpd_util:multi_lookup(
-				    Info#mod.config_db,alias),
-                        {_, PathTranslated, _} =
-                            mod_alias:real_name(
-                              Info#mod.config_db, PathInfo, Aliases),
-                        [Env|
-                         [env("PATH_INFO","/"++httpd_util:decode_hex(PathInfo)),
-                          env("PATH_TRANSLATED",PathTranslated)]];
-		    {PathInfo, QueryString} ->
-                        Aliases = httpd_util:multi_lookup(
-				    Info#mod.config_db,alias),
-                        {_, PathTranslated, _} =
-                            mod_alias:real_name(
-                              Info#mod.config_db, PathInfo, Aliases),
-                        [Env|
-                         [env("PATH_INFO",
-			      httpd_util:decode_hex(PathInfo)),
-                          env("PATH_TRANSLATED",PathTranslated),
-			  env("QUERY_STRING", QueryString)]];
-		    [] ->
-			Env
-                end;
-            "POST" ->
-                [env("CONTENT_LENGTH",
-                     integer_to_list(httpd_util:flatlength(
-                                       Info#mod.entity_body)))|Env];
-            _ ->
-                Env
-        end,
-    Env2 =
-        case httpd_util:key1search(Info#mod.data,remote_user) of
-            undefined ->
-                Env1;
-            RemoteUser ->
-                [env("REMOTE_USER",RemoteUser)|Env1] %% OTP-4416
-        end,
-    lists:flatten([Env2|PH]).
-
-
-parsed_header(List) ->
-    parsed_header(List, []).
- 
-parsed_header([], SoFar) ->
-    SoFar;
-parsed_header([{Name,[Value|R1]}|R2], SoFar) when list(Value)->
-    NewName=lists:map(fun(X) -> if X == $- -> $_; true -> X end end,Name),
-    Env = env("HTTP_"++httpd_util:to_upper(NewName),
-	      multi_value([Value|R1])),
-    parsed_header(R2, [Env|SoFar]);
- 
-parsed_header([{Name,Value}|Rest], SoFar) ->
-    {ok,NewName,_} = regexp:gsub(Name, "-", "_"),
-    Env=env("HTTP_"++httpd_util:to_upper(NewName),Value),
-    parsed_header(Rest, [Env|SoFar]).
- 
-
-multi_value([]) ->
-  [];
-multi_value([Value]) ->
-  Value;
-multi_value([Value|Rest]) ->
-  Value++", "++multi_value(Rest).
-
-
-exec_script(Info, Script, AfterScript, RequestURI) ->
-    ?vdebug("exec_script -> entry with"
-	    "~n   Script:      ~p"
-	    "~n   AfterScript: ~p",
-	    [Script,AfterScript]),
-    exec_script(is_executable(Script),Info,Script,AfterScript,RequestURI).
-
-exec_script(true, Info, Script, AfterScript, RequestURI) ->
-    ?vtrace("exec_script -> entry when script is executable",[]),
-    process_flag(trap_exit,true),
-    Dir  = filename:dirname(Script),
-    [Script_Name|_] = string:tokens(RequestURI, "?"),
-    Env  = env(Info, Script_Name, AfterScript),
-    Port = (catch open_port({spawn,Script},[stream,{cd, Dir},{env, Env}])),
-    ?vtrace("exec_script -> Port: ~w",[Port]),
-    case Port of
-	P when port(P) ->
-	    %% Send entity_body to port.
-	    Res = case Info#mod.entity_body of
-		      [] ->
-			  true;
-		      EntityBody ->
-			  (catch port_command(Port, EntityBody))
-		  end,
-	    case Res of
-		{'EXIT',Reason} ->
-		    ?vlog("port send failed:"
-			  "~n   Port:   ~p"
-			  "~n   URI:    ~p"
-			  "~n   Reason: ~p",
-			  [Port,Info#mod.request_uri,Reason]),
-		    exit({open_cmd_failed,Reason,
-			  [{mod,?MODULE},{port,Port},
-			   {uri,Info#mod.request_uri},
-			   {script,Script},{env,Env},{dir,Dir},
-			   {ebody_size,sz(Info#mod.entity_body)}]});
-		 true ->
-		    proxy(Info, Port)
-	    end;
-	{'EXIT',Reason} ->
-	    ?vlog("open port failed: exit"
-		  "~n   URI:    ~p"
-		  "~n   Reason: ~p",
-		  [Info#mod.request_uri,Reason]),
-	    exit({open_port_failed,Reason,
-		  [{mod,?MODULE},{uri,Info#mod.request_uri},{script,Script},
-		   {env,Env},{dir,Dir}]});
-	O ->
-	    ?vlog("open port failed: unknown result"
-		  "~n   URI: ~p"
-		  "~n   O:   ~p",
-		  [Info#mod.request_uri,O]),
-	    exit({open_port_failed,O,
-		  [{mod,?MODULE},{uri,Info#mod.request_uri},{script,Script},
-		   {env,Env},{dir,Dir}]})
-    end;
-
-exec_script(false,Info,Script,_AfterScript,_RequestURI) ->
-    ?vlog("script ~s not executable",[Script]),
-    {proceed,
-     [{status,
-       {404,Info#mod.request_uri,
-	?NICE("You don't have permission to execute " ++
-	      Info#mod.request_uri ++ " on this server")}}|
-      Info#mod.data]}.
-    
-	    
-
-%%
-%% Socket <-> Port communication
-%%
-
-proxy(#mod{config_db = ConfigDb} = Info, Port) ->
-    Timeout = httpd_util:lookup(ConfigDb, cgi_timeout, ?DEFAULT_CGI_TIMEOUT),
-    proxy(Info, Port, 0, undefined,[], Timeout).
-
-proxy(Info, Port, Size, StatusCode, AccResponse, Timeout) ->
-    ?vdebug("proxy -> entry with"
-	    "~n   Size:      ~p"
-	    "~n   StatusCode ~p"
-	    "~n   Timeout:   ~p",
-	    [Size, StatusCode, Timeout]),
-    receive
-	{Port, {data, Response}} when port(Port) ->
-	    ?vtrace("proxy -> got some data from the port",[]),
-	    
-	    NewStatusCode = update_status_code(StatusCode, Response),
-				  
-	    ?vtrace("proxy -> NewStatusCode: ~p",[NewStatusCode]),
-	    case send(Info, NewStatusCode, Response, Size, AccResponse) of
-		socket_closed ->
-		    ?vtrace("proxy -> socket closed: kill port",[]),
-		    (catch port_close(Port)), % KILL the port !!!!
-		    process_flag(trap_exit,false),
-		    {proceed,
-		     [{response,{already_sent,200,Size}}|Info#mod.data]};
-
-		head_sent ->
-		    ?vtrace("proxy -> head sent: kill port",[]),
-		    (catch port_close(Port)), % KILL the port !!!!
-		    process_flag(trap_exit,false),
-		    {proceed,
-		     [{response,{already_sent,200,Size}}|Info#mod.data]};
-
-		{http_response, NewAccResponse} ->
-		    ?vtrace("proxy -> head response: continue",[]),
-		    NewSize = get_new_size(Size, Response),
-		    proxy(Info, Port, NewSize, NewStatusCode,
-			  NewAccResponse, Timeout);
-
-		_ ->
-		    ?vtrace("proxy -> continue",[]),
-		    %% The data is sent and the socket is not closed, continue
-		    NewSize = get_new_size(Size, Response),
-		    proxy(Info, Port, NewSize, NewStatusCode,
-			  "nonempty", Timeout)
-	    end;
-
-	{'EXIT', Port, normal} when port(Port) ->
-	    ?vtrace("proxy -> exit signal from port: normal",[]),
-	    NewStatusCode = update_status_code(StatusCode,AccResponse),
-	    final_send(Info,NewStatusCode,Size,AccResponse),
-	    process_flag(trap_exit,false),
-	    {proceed, [{response,{already_sent,200,Size}}|Info#mod.data]};
-
-	{'EXIT', Port, Reason} when port(Port) ->
-	    ?vtrace("proxy -> exit signal from port: ~p",[Reason]),
-	    process_flag(trap_exit, false),
-	    {proceed, [{status,{400,none,reason(Reason)}}|Info#mod.data]};
-
-	{'EXIT', Pid, Reason} when pid(Pid) ->
-	    %% This is the case that a linked process has died, 
-	    %% It would be nice to response with a server error 
-	    %% but since the heade alredy is sent
-	    ?vtrace("proxy -> exit signal from ~p: ~p",[Pid, Reason]),
-	    proxy(Info, Port, Size, StatusCode, AccResponse, Timeout);
-
-	%% This should not happen
-	WhatEver ->
-	    ?vinfo("proxy -> received garbage: ~n~p", [WhatEver]),
-	    NewStatusCode = update_status_code(StatusCode, AccResponse),
-	    final_send(Info, StatusCode, Size, AccResponse),
-	    process_flag(trap_exit, false),
-	    {proceed, [{response,{already_sent,200,Size}}|Info#mod.data]}
-
-    after Timeout ->
-	    ?vlog("proxy -> timeout",[]),
-	    (catch port_close(Port)), % KILL the port !!!!
-	    httpd_socket:close(Info#mod.socket_type, Info#mod.socket),
-	    process_flag(trap_exit,false),
-	    {proceed,[{response,{already_sent,200,Size}}|Info#mod.data]}
-    end.
-
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% The functions that handles the sending of the data to the client   %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%----------------------------------------------------------------------
-%% Send the header the first time the size of the body is Zero
-%%----------------------------------------------------------------------
-
-send(#mod{method = "HEAD"} = Info, StatusCode, Response, 0, []) ->
-    first_handle_head_request(Info, StatusCode, Response);
-send(Info, StatusCode, Response, 0, []) ->
-    first_handle_other_request(Info, StatusCode, Response);
-
-%%----------------------------------------------------------------------
-%% The size of the body is bigger than zero => 
-%% we have a part of the body to send
-%%----------------------------------------------------------------------
-send(Info, StatusCode, Response, Size, AccResponse) ->
-    handle_other_request(Info, StatusCode, Response).
-
-
-%%----------------------------------------------------------------------
-%% The function is called the last time when the port has closed 
-%%----------------------------------------------------------------------
-
-final_send(Info, StatusCode, Size, AccResponse)->
-    final_handle_other_request(Info, StatusCode).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %% 
-%% The code that handles the head requests                            %%
-%%                                                                    %% 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%----------------------------------------------------------------------
-%% The request is a head request if its a HTPT/1.1 request answer to it
-%% otherwise we must collect the size of hte body before we can answer.
-%% Return Values:
-%% head_sent
-%%----------------------------------------------------------------------
-first_handle_head_request(Info, StatusCode, Response)->
-    case Info#mod.http_version of
-	"HTTP/1.1" ->
-	    %% Since we have all we need to create the header create it 
-	    %% send it and return head_sent.
-	    case httpd_util:split(Response,"\r\n\r\n|\n\n",2) of
-		{ok, [HeadEnd, Rest]} ->
-		    HeadEnd1 = removeStatus(HeadEnd),
-		    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket,
-					 [create_header(Info,StatusCode),
-					  HeadEnd1,"\r\n\r\n"]);
-		_ ->
-		    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket,
-					 [create_header(Info, StatusCode),
-					  "Content-Type:text/html\r\n\r\n"])
-	    end;
-	_ ->
-	  Response1= case regexp:split(Response,"\r\n\r\n|\n\n") of
-			  {ok,[HeadEnd|Rest]} ->
-			     removeStatus(HeadEnd);
-			  _ ->
-			     ["Content-Type:text/html"]
-		     end,
-	    H1 = httpd_util:header(StatusCode,Info#mod.connection),
-	    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket, 
-				 [H1,Response1,"\r\n\r\n"])
-    end,    
-    head_sent.
-  
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% Handle the requests that is to the other methods                   %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%----------------------------------------------------------------------
-%% Create the http-response header and send it to the user if it is
-%% a http/1.1 request otherwise we must accumulate it 
-%%----------------------------------------------------------------------
-first_handle_other_request(Info,StatusCode,Response)->
-    Header = create_header(Info,StatusCode),
-    Response1 = 
-	case httpd_util:split(Response,"\r\n\r\n|\n\n",2) of
-	    {ok,[HeadPart,[]]} ->
-		[Header, removeStatus(HeadPart),"\r\n\r\n"];
-	    
-	    {ok,[HeadPart,BodyPart]} ->
-		      [Header, removeStatus(HeadPart), "\r\n\r\n",
-		       httpd_util:integer_to_hexlist(length(BodyPart)),
-		       "\r\n", BodyPart];
-	    _WhatEver ->
-		%% No response header field from the cgi-script, 
-		%% Just a body
-		[Header, "Content-Type:text/html","\r\n\r\n",
-		 httpd_util:integer_to_hexlist(length(Response)),
-		 "\r\n", Response]
-	end,
-    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket, Response1).
-
-
-handle_other_request(#mod{http_version = "HTTP/1.1", 
-			  socket_type = Type, socket = Sock} = Info, 
-		     StatusCode, Response0) ->
-    Response = create_chunk(Info, Response0),
-    httpd_socket:deliver(Type, Sock, Response);
-handle_other_request(#mod{socket_type = Type, socket = Sock} = Info, 
-		     StatusCode, Response) ->
-    httpd_socket:deliver(Type, Sock, Response).
-
-
-final_handle_other_request(#mod{http_version = "HTTP/1.1", 
-				socket_type = Type, socket = Sock}, 
-			   StatusCode) ->
-    httpd_socket:deliver(Type, Sock, "0\r\n");
-final_handle_other_request(#mod{socket_type = Type, socket = Sock}, 
-			   StatusCode) ->
-    httpd_socket:close(Type, Sock),
-    socket_closed.
-
-
-create_chunk(_Info, Response) ->
-    HEXSize = httpd_util:integer_to_hexlist(length(lists:flatten(Response))),
-    HEXSize++"\r\n"++Response++"\r\n".
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% The various helper functions                                       %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- 
-update_status_code(undefined, Response) ->
-    case status_code(Response) of
-	{ok, StatusCode1} ->
-	    StatusCode1;
-	_ ->	    
-	    ?vlog("invalid response from script:~n~p", [Response]),
-	    500
-    end;
-update_status_code(StatusCode,_Response)->
-    StatusCode.
-
-
-get_new_size(0,Response)->
-    case httpd_util:split(Response,"\r\n\r\n|\n\n",2) of
-	{ok,[Head,Body]}->
-	    length(lists:flatten(Body));
-	_ ->
-	    %%No header in the respone 
-	    length(lists:flatten(Response))
-    end;
-
-get_new_size(Size,Response)->
-    Size+length(lists:flatten(Response)).
-
-%%----------------------------------------------------------------------
-%% Creates the http-header for a response
-%%----------------------------------------------------------------------
-create_header(Info,StatusCode)->
-    Cache=case httpd_util:lookup(Info#mod.config_db,script_nocache,false) of
-	      true->
-		  Date=httpd_util:rfc1123_date(),
-		  "Cache-Control:no-cache\r\nPragma:no-cache\r\nExpires:"++ Date ++ "\r\n";
-	      false ->
-		  []
-	  end,
-    case Info#mod.http_version of 
-	"HTTP/1.1"  ->
-	    Header=httpd_util:header(StatusCode, Info#mod.connection),
-	    Header++"Transfer-encoding:chunked\r\n"++Cache;
-	_ ->
-	    httpd_util:header(StatusCode,Info#mod.connection)++Cache
-    end.
-
-
-
-%% status_code
-
-status_code(Response) ->
-  case httpd_util:split(Response,"\n\n|\r\n\r\n",2) of
-    {ok,[Header,Body]} ->
-      case regexp:split(Header,"\n|\r\n") of
-	{ok,HeaderFields} ->
-	  {ok,extract_status_code(HeaderFields)};
-	{error,_} ->
-	      {error, bad_script_output(Response)}
-      end;
-    _ ->
-	  %% No header field in the returned data return 200 the standard code
-	  {ok, 200}
-  end.
-
-bad_script_output(Bad) ->
-    lists:flatten(io_lib:format("Bad script output ~s",[Bad])).
-
-
-extract_status_code([]) ->
-  200;
-extract_status_code([[$L,$o,$c,$a,$t,$i,$o,$n,$:,$ |_]|_]) ->
-  302;
-extract_status_code([[$S,$t,$a,$t,$u,$s,$:,$ |CodeAndReason]|_]) ->
-  case httpd_util:split(CodeAndReason," ",2) of
-    {ok,[Code,_]} ->
-      list_to_integer(Code);
-    {ok,_} ->
-      200
-  end;
-extract_status_code([_|Rest]) ->
-  extract_status_code(Rest).
-
-
-sz(B) when binary(B) -> {binary,size(B)};
-sz(L) when list(L)   -> {list,length(L)};
-sz(_)                -> undefined.
-
-
-%% Convert error to printable string
-%%
-reason({error,emfile})     -> ": To many open files";
-reason({error,{enfile,_}}) -> ": File/port table overflow";
-reason({error,enomem})     -> ": Not enough memory";
-reason({error,eagain})     -> ": No more available OS processes";
-reason(_)                  -> "".
-
-removeStatus(Head)->
-    case httpd_util:split(Head,"Status:.\r\n",2) of
-	{ok,[HeadPart,HeadEnd]}->
-	    HeadPart++HeadEnd;
-	_ ->
-	    Head
-    end.
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% There are 2 config directives for mod_cgi:                         %%
-%% ScriptNoCache true|false, defines whether the server shall add     %%
-%%                           header fields to stop proxies and        %%  
-%%                           clients from saving the page in history  %%
-%%                           or cache                                 %%
-%%                                                                    %%
-%% ScriptTimeout Seconds, The number of seconds that the server       %%
-%%                        maximum will wait for the script to         %%
-%%                        generate a part of the document             %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-load([$S,$c,$r,$i,$p,$t,$N,$o,$C,$a,$c,$h,$e |CacheArg],[])->
-    case catch list_to_atom(httpd_conf:clean(CacheArg)) of
-        true ->
-	    {ok, [], {script_nocache,true}};
-	false ->
-	   {ok, [], {script_nocache,false}};
-	_ ->
-	   {error, ?NICE(httpd_conf:clean(CacheArg)++
-			 " is an invalid ScriptNoCache directive")}
-    end;
-
-load([$S,$c,$r,$i,$p,$t,$T,$i,$m,$e,$o,$u,$t,$ |Timeout],[])->
-    case catch list_to_integer(httpd_conf:clean(Timeout)) of
-	TimeoutSec when integer(TimeoutSec)  ->
-	   {ok, [], {script_timeout,TimeoutSec*1000}};
-	_ ->
-	   {error, ?NICE(httpd_conf:clean(Timeout)++
-			 " is an invalid ScriptTimeout")}
-    end.
-	
-	
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_dir.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_dir.erl
deleted file mode 100644
index 449b088055..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_dir.erl
+++ /dev/null
@@ -1,266 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_dir.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_dir).
--export([do/1]).
-
--include("httpd.hrl").
-
-%% do
-
-do(Info) ->
-    ?DEBUG("do -> entry",[]),
-    case Info#mod.method of
-	"GET" ->
-	    case httpd_util:key1search(Info#mod.data,status) of
-		%% A status code has been generated!
-		{StatusCode,PhraseArgs,Reason} ->
-		    {proceed,Info#mod.data};
-		%% No status code has been generated!
-		undefined ->
-		    case httpd_util:key1search(Info#mod.data,response) of
-			%% No response has been generated!
-			undefined ->
-			    do_dir(Info);
-			%% A response has been generated or sent!
-			Response ->
-			    {proceed,Info#mod.data}
-		    end
-	    end;
-	%% Not a GET method!
-	_ ->
-	    {proceed,Info#mod.data}
-    end.
-
-do_dir(Info) ->
-    ?DEBUG("do_dir -> Request URI: ~p",[Info#mod.request_uri]),
-    Path = mod_alias:path(Info#mod.data,Info#mod.config_db,
-			  Info#mod.request_uri),
-    DefaultPath = mod_alias:default_index(Info#mod.config_db,Path),
-    %% Is it a directory?
-    case file:read_file_info(DefaultPath) of
-	{ok,FileInfo} when FileInfo#file_info.type == directory ->
-	    DecodedRequestURI =
-		httpd_util:decode_hex(Info#mod.request_uri),
-	    ?DEBUG("do_dir -> ~n"
-		   "      Path:              ~p~n"
-		   "      DefaultPath:       ~p~n"
-		   "      DecodedRequestURI: ~p",
-		   [Path,DefaultPath,DecodedRequestURI]),
-	    case dir(DefaultPath,string:strip(DecodedRequestURI,right,$/),Info#mod.config_db) of
-		{ok, Dir} ->
-		    Head=[{content_type,"text/html"},
-			  {content_length,integer_to_list(httpd_util:flatlength(Dir))},
-			   {date,httpd_util:rfc1123_date(FileInfo#file_info.mtime)},
-			  {code,200}],
-		    {proceed,[{response,{response,Head,Dir}},
-			      {mime_type,"text/html"}|Info#mod.data]};
-		{error, Reason} ->
-		    ?ERROR("do_dir -> dir operation failed: ~p",[Reason]),
-		    {proceed,
-		     [{status,{404,Info#mod.request_uri,Reason}}|
-		      Info#mod.data]}
-	    end;
-	{ok,FileInfo} ->
-	    ?DEBUG("do_dir -> ~n"
-		   "      Path:        ~p~n"
-		   "      DefaultPath: ~p~n"
-		   "      FileInfo:    ~p",
-		   [Path,DefaultPath,FileInfo]),
-	    {proceed,Info#mod.data};
-	{error,Reason} ->
-	    ?LOG("do_dir -> failed reading file info (~p) for: ~p",
-		 [Reason,DefaultPath]),
-	    {proceed,
-	     [{status,read_file_info_error(Reason,Info,DefaultPath)}|
-	      Info#mod.data]}
-    end.
-
-dir(Path,RequestURI,ConfigDB) ->
-    case file:list_dir(Path) of
-	{ok,FileList} ->
-	    SortedFileList=lists:sort(FileList),
-	    {ok,[header(Path,RequestURI),
-		 body(Path,RequestURI,ConfigDB,SortedFileList),
-		 footer(Path,SortedFileList)]};
-	{error,Reason} ->
-	    {error,?NICE("Can't open directory "++Path++": "++Reason)}
-  end.
-
-%% header
-
-header(Path,RequestURI) ->
-  Header=
-    "<HTML>\n<HEAD>\n<TITLE>Index of "++RequestURI++"</TITLE>\n</HEAD>\n<BODY>\n<H1>Index of "++
-    RequestURI++"</H1>\n<PRE><IMG SRC=\""++icon(blank)++
-    "\" ALT="     "> Name                   Last modified         Size  Description
-<HR>\n",
-  case regexp:sub(RequestURI,"[^/]*\$","") of
-    {ok,"/",_} ->
-      Header;
-    {ok,ParentRequestURI,_} ->
-      {ok,ParentPath,_}=regexp:sub(string:strip(Path,right,$/),"[^/]*\$",""),
-      Header++format(ParentPath,ParentRequestURI)
-  end.
-
-format(Path,RequestURI) ->
-  {ok,FileInfo}=file:read_file_info(Path),
-  {{Year,Month,Day},{Hour,Minute,Second}}=FileInfo#file_info.mtime,
-  io_lib:format("<IMG SRC=\"~s\" ALT=\"[~s]\"> <A HREF=\"~s\">Parent directory</A>       ~2.2.0w-~s-~w ~2.2.0w:~2.2.0w        -\n",
-		[icon(back),"DIR",RequestURI,Day,
-		 httpd_util:month(Month),Year,Hour,Minute]).
-
-%% body
-
-body(Path,RequestURI,ConfigDB,[]) ->
-  [];
-body(Path,RequestURI,ConfigDB,[Entry|Rest]) ->
-  [format(Path,RequestURI,ConfigDB,Entry)|body(Path,RequestURI,ConfigDB,Rest)].
-
-format(Path,RequestURI,ConfigDB,Entry) ->
-  case file:read_file_info(Path++"/"++Entry) of
-    {ok,FileInfo} when FileInfo#file_info.type == directory ->
-      {{Year,Month,Day},{Hour,Minute,Second}}=FileInfo#file_info.mtime,
-      EntryLength=length(Entry),
-      if
-	EntryLength > 21 ->
-	  io_lib:format("<IMG SRC=\"~s\" ALT=\"[~s]\"> <A HREF=\"~s\">~-21.s..</A>~2.2.0w-~s-~w ~2.2.0w:~2.2.0w        -\n",
-			[icon(folder),"DIR",RequestURI++"/"++Entry++"/",Entry,
-			 Day,httpd_util:month(Month),Year,Hour,Minute]);
-	true ->
-	  io_lib:format("<IMG SRC=\"~s\" ALT=\"[~s]\"> <A HREF=\"~s\">~s</A>~*.*c~2.2.0w-~s-~w ~2.2.0w:~2.2.0w        -\n",
-			[icon(folder),"DIR",RequestURI++"/"++Entry++"/",Entry,
-			 23-EntryLength,23-EntryLength,$ ,Day,
-			 httpd_util:month(Month),Year,Hour,Minute])
-      end;
-    {ok,FileInfo} ->
-      {{Year,Month,Day},{Hour,Minute,Second}}=FileInfo#file_info.mtime,
-      Suffix=httpd_util:suffix(Entry),
-      MimeType=httpd_util:lookup_mime(ConfigDB,Suffix,""),
-      EntryLength=length(Entry),
-      if
-	EntryLength > 21 ->
-	  io_lib:format("<IMG SRC=\"~s\" ALT=\"[~s]\"> <A HREF=\"~s\">~-21.s..</A>~2.2.0w-~s-~w ~2.2.0w:~2.2.0w~8wk  ~s\n",
-			[icon(Suffix,MimeType),Suffix,RequestURI++"/"++Entry,
-			 Entry,Day,httpd_util:month(Month),Year,Hour,Minute,
-			 trunc(FileInfo#file_info.size/1024+1),MimeType]);
-	true ->
-	  io_lib:format("<IMG SRC=\"~s\" ALT=\"[~s]\"> <A HREF=\"~s\">~s</A>~*.*c~2.2.0w-~s-~w ~2.2.0w:~2.2.0w~8wk  ~s\n",
-			[icon(Suffix,MimeType),Suffix,RequestURI++"/"++Entry,
-			 Entry,23-EntryLength,23-EntryLength,$ ,Day,
-			 httpd_util:month(Month),Year,Hour,Minute,
-			 trunc(FileInfo#file_info.size/1024+1),MimeType])
-      end;
-    {error,Reason} ->
-      ""
-  end.
-
-%% footer
-
-footer(Path,FileList) ->
-  case lists:member("README",FileList) of
-    true ->
-      {ok,Body}=file:read_file(Path++"/README"),
-      "</PRE>\n<HR>\n<PRE>\n"++binary_to_list(Body)++
-	"\n</PRE>\n</BODY>\n</HTML>\n";
-    false ->
-      "</PRE>\n</BODY>\n</HTML>\n"
-  end.
-
-%%
-%% Icon mappings are hard-wired ala default Apache (Ugly!)
-%%
-
-icon(Suffix,MimeType) ->
-  case icon(Suffix) of
-    undefined ->
-      case MimeType of
-	[$t,$e,$x,$t,$/|_] ->
-	  "/icons/text.gif";
-	[$i,$m,$a,$g,$e,$/|_] ->
-	  "/icons/image2.gif";
-	[$a,$u,$d,$i,$o,$/|_] ->
-	  "/icons/sound2.gif";
-	[$v,$i,$d,$e,$o,$/|_] ->
-	  "/icons/movie.gif";
-	_ ->
-	  "/icons/unknown.gif"
-      end;
-    Icon ->
-      Icon
-  end.
-
-icon(blank) -> "/icons/blank.gif";
-icon(back) -> "/icons/back.gif";
-icon(folder) -> "/icons/folder.gif";
-icon("bin") -> "/icons/binary.gif";
-icon("exe") -> "/icons/binary.gif";
-icon("hqx") -> "/icons/binhex.gif";
-icon("tar") -> "/icons/tar.gif";
-icon("wrl") -> "/icons/world2.gif";
-icon("wrl.gz") -> "/icons/world2.gif";
-icon("vrml") -> "/icons/world2.gif";
-icon("vrm") -> "/icons/world2.gif";
-icon("iv") -> "/icons/world2.gif";
-icon("Z") -> "/icons/compressed.gif";
-icon("z") -> "/icons/compressed.gif";
-icon("tgz") -> "/icons/compressed.gif";
-icon("gz") -> "/icons/compressed.gif";
-icon("zip") -> "/icons/compressed.gif";
-icon("ps") -> "/icons/a.gif";
-icon("ai") -> "/icons/a.gif";
-icon("eps") -> "/icons/a.gif";
-icon("html") -> "/icons/layout.gif";
-icon("shtml") -> "/icons/layout.gif";
-icon("htm") -> "/icons/layout.gif";
-icon("pdf") -> "/icons/layout.gif";
-icon("txt") -> "/icons/text.gif";
-icon("erl") -> "/icons/burst.gif";
-icon("c") -> "/icons/c.gif";
-icon("pl") -> "/icons/p.gif";
-icon("py") -> "/icons/p.gif";
-icon("for") -> "/icons/f.gif";
-icon("dvi") -> "/icons/dvi.gif";
-icon("uu") -> "/icons/uuencoded.gif";
-icon("conf") -> "/icons/script.gif";
-icon("sh") -> "/icons/script.gif";
-icon("shar") -> "/icons/script.gif";
-icon("csh") -> "/icons/script.gif";
-icon("ksh") -> "/icons/script.gif";
-icon("tcl") -> "/icons/script.gif";
-icon("tex") -> "/icons/tex.gif";
-icon("core") -> "/icons/tex.gif";
-icon(_) -> undefined.
-
-
-read_file_info_error(eacces,Info,Path) ->
-    read_file_info_error(403,Info,Path,
-			 ": Missing search permissions for one "
-			 "of the parent directories");
-read_file_info_error(enoent,Info,Path) ->
-    read_file_info_error(404,Info,Path,"");
-read_file_info_error(enotdir,Info,Path) ->
-    read_file_info_error(404,Info,Path,
-			 ": A component of the file name is not a directory");
-read_file_info_error(_,Info,Path) ->
-    read_file_info_error(500,none,Path,"").
-
-read_file_info_error(StatusCode,none,Path,Reason) ->
-    {StatusCode,none,?NICE("Can't access "++Path++Reason)};
-read_file_info_error(StatusCode,Info,Path,Reason) ->
-    {StatusCode,Info#mod.request_uri,
-     ?NICE("Can't access "++Path++Reason)}.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_disk_log.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_disk_log.erl
deleted file mode 100644
index c5d110ee4b..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_disk_log.erl
+++ /dev/null
@@ -1,405 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_disk_log.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_disk_log).
--export([do/1,error_log/5,security_log/2,load/2,store/2,remove/1]).
-
--export([report_error/2]).
-
--define(VMODULE,"DISK_LOG").
--include("httpd_verbosity.hrl").
-
--include("httpd.hrl").
-
-%% do
-
-do(Info) ->
-    AuthUser  = auth_user(Info#mod.data),
-    Date      = custom_date(),
-    log_internal_info(Info,Date,Info#mod.data),
-    LogFormat = get_log_format(Info#mod.config_db),
-    case httpd_util:key1search(Info#mod.data,status) of
-	%% A status code has been generated!
-	{StatusCode,PhraseArgs,Reason} ->
-	    transfer_log(Info, "-", AuthUser, Date, StatusCode, 0, LogFormat),
-	    if
-		StatusCode >= 400 ->
-		    error_log(Info, Date, Reason, LogFormat);
-		true ->
-		    not_an_error
-	    end,
-	    {proceed,Info#mod.data};
-	%% No status code has been generated!
-	undefined ->
-	    case httpd_util:key1search(Info#mod.data,response) of
-		{already_sent,StatusCode,Size} ->
-		    transfer_log(Info, "-", AuthUser, Date, StatusCode,
-				 Size, LogFormat),
-		    {proceed,Info#mod.data};
-
-		{response, Head, Body} ->
-		    Size = httpd_util:key1search(Head, content_length, 0),
-		    Code = httpd_util:key1search(Head, code, 200),
-		    transfer_log(Info, "-", AuthUser, Date, Code, 
-				 Size, LogFormat),
-		    {proceed,Info#mod.data};	
-		
-		{StatusCode,Response} ->
-		    transfer_log(Info, "-", AuthUser, Date, 200,
-				 httpd_util:flatlength(Response), LogFormat),
-		    {proceed,Info#mod.data};
-		undefined ->
-		    transfer_log(Info, "-", AuthUser, Date, 200,
-				 0, LogFormat),
-		    {proceed,Info#mod.data}
-	    end
-    end.
-
-custom_date() ->
-    LocalTime     = calendar:local_time(),
-    UniversalTime = calendar:universal_time(),
-    Minutes       = round(diff_in_minutes(LocalTime,UniversalTime)),
-    {{YYYY,MM,DD},{Hour,Min,Sec}} = LocalTime,
-    Date = 
-	io_lib:format("~.2.0w/~.3s/~.4w:~.2.0w:~.2.0w:~.2.0w ~c~.2.0w~.2.0w",
-		      [DD,httpd_util:month(MM),YYYY,Hour,Min,Sec,sign(Minutes),
-		       abs(Minutes) div 60,abs(Minutes) rem 60]),  
-    lists:flatten(Date).
-
-diff_in_minutes(L,U) ->
-    (calendar:datetime_to_gregorian_seconds(L) -
-     calendar:datetime_to_gregorian_seconds(U))/60.
-
-sign(Minutes) when Minutes > 0 ->
-    $+;
-sign(Minutes) ->
-    $-.
-
-auth_user(Data) ->
-    case httpd_util:key1search(Data,remote_user) of
-	undefined ->
-	    "-";
-	RemoteUser ->
-	    RemoteUser
-    end.
-
-%% log_internal_info
-
-log_internal_info(Info,Date,[]) ->
-    ok;
-log_internal_info(Info,Date,[{internal_info,Reason}|Rest]) ->
-    Format = get_log_format(Info#mod.config_db),
-    error_log(Info,Date,Reason,Format),
-    log_internal_info(Info,Date,Rest);
-log_internal_info(Info,Date,[_|Rest]) ->
-    log_internal_info(Info,Date,Rest).
-
-
-%% transfer_log
-
-transfer_log(Info,RFC931,AuthUser,Date,StatusCode,Bytes,Format) ->
-    case httpd_util:lookup(Info#mod.config_db,transfer_disk_log) of
-	undefined ->
-	    no_transfer_log;
-	TransferDiskLog ->
-	    {PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
-	    Entry = io_lib:format("~s ~s ~s [~s] \"~s\" ~w ~w~n",
-				  [RemoteHost,RFC931,AuthUser,Date,
-				   Info#mod.request_line,StatusCode,Bytes]),
-	    write(TransferDiskLog, Entry, Format)
-    end.
-
-
-%% error_log
-
-error_log(Info, Date, Reason, Format) ->
-    Format=get_log_format(Info#mod.config_db),
-    case httpd_util:lookup(Info#mod.config_db,error_disk_log) of
-	undefined ->
-	    no_error_log;
-	ErrorDiskLog ->
-	    {PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
-	    Entry = 
-		io_lib:format("[~s] access to ~s failed for ~s, reason: ~p~n",
-			      [Date, Info#mod.request_uri, 
-			       RemoteHost, Reason]),
-	    write(ErrorDiskLog, Entry, Format)
-    end.
-
-error_log(SocketType, Socket, ConfigDB, {PortNumber, RemoteHost}, Reason) ->
-    Format = get_log_format(ConfigDB),
-    case httpd_util:lookup(ConfigDB,error_disk_log) of
-	undefined ->
-	    no_error_log;
-	ErrorDiskLog ->
-	    Date  = custom_date(),
-	    Entry = 
-		io_lib:format("[~s] server crash for ~s, reason: ~p~n",
-			      [Date,RemoteHost,Reason]),
-	    write(ErrorDiskLog, Entry, Format),
-	    ok
-    end.
-
-
-%% security_log
-
-security_log(ConfigDB, Event) ->
-    Format = get_log_format(ConfigDB),
-    case httpd_util:lookup(ConfigDB,security_disk_log) of
-	undefined ->
-	    no_error_log;
-	DiskLog ->
-	    Date  = custom_date(),
-	    Entry = io_lib:format("[~s] ~s ~n", [Date, Event]),
-	    write(DiskLog, Entry, Format),
-	    ok
-    end.
-
-report_error(ConfigDB, Error) ->
-    Format = get_log_format(ConfigDB),
-    case httpd_util:lookup(ConfigDB, error_disk_log) of
-	undefined ->
-	    no_error_log;
-	ErrorDiskLog ->
-	    Date  = custom_date(),
-	    Entry = io_lib:format("[~s] reporting error: ~s",[Date,Error]),
-	    write(ErrorDiskLog, Entry, Format),
-	    ok
-    end.
-
-%%----------------------------------------------------------------------
-%% Get the current format of the disklog
-%%----------------------------------------------------------------------
-get_log_format(ConfigDB)->
-    httpd_util:lookup(ConfigDB,disk_log_format,external).
-
-
-%%
-%% Configuration
-%%
-
-%% load
-
-load([$T,$r,$a,$n,$s,$f,$e,$r,$D,$i,$s,$k,$L,$o,$g,$S,$i,$z,$e,$ |
-      TransferDiskLogSize],[]) ->
-    case regexp:split(TransferDiskLogSize," ") of
-	{ok,[MaxBytes,MaxFiles]} ->
-	    case httpd_conf:make_integer(MaxBytes) of
-		{ok,MaxBytesInteger} ->
-		    case httpd_conf:make_integer(MaxFiles) of
-			{ok,MaxFilesInteger} ->
-			    {ok,[],{transfer_disk_log_size,
-				    {MaxBytesInteger,MaxFilesInteger}}};
-			{error,_} ->
-			    {error,
-			     ?NICE(httpd_conf:clean(TransferDiskLogSize)++
-				   " is an invalid TransferDiskLogSize")}
-		    end;
-		{error,_} ->
-		    {error,?NICE(httpd_conf:clean(TransferDiskLogSize)++
-				 " is an invalid TransferDiskLogSize")}
-	    end
-    end;
-load([$T,$r,$a,$n,$s,$f,$e,$r,$D,$i,$s,$k,$L,$o,$g,$ |TransferDiskLog],[]) ->
-    {ok,[],{transfer_disk_log,httpd_conf:clean(TransferDiskLog)}};
-
-load([$E,$r,$r,$o,$r,$D,$i,$s,$k,$L,$o,$g,$S,$i,$z,$e,$ | ErrorDiskLogSize],[]) ->
-    case regexp:split(ErrorDiskLogSize," ") of
-	{ok,[MaxBytes,MaxFiles]} ->
-	    case httpd_conf:make_integer(MaxBytes) of
-		{ok,MaxBytesInteger} ->
-		    case httpd_conf:make_integer(MaxFiles) of
-			{ok,MaxFilesInteger} ->
-			    {ok,[],{error_disk_log_size,
-				    {MaxBytesInteger,MaxFilesInteger}}};
-			{error,_} ->
-			    {error,?NICE(httpd_conf:clean(ErrorDiskLogSize)++
-					 " is an invalid ErrorDiskLogSize")}
-		    end;
-		{error,_} ->
-		    {error,?NICE(httpd_conf:clean(ErrorDiskLogSize)++
-				 " is an invalid ErrorDiskLogSize")}
-	    end
-    end;
-load([$E,$r,$r,$o,$r,$D,$i,$s,$k,$L,$o,$g,$ |ErrorDiskLog],[]) ->
-    {ok, [], {error_disk_log, httpd_conf:clean(ErrorDiskLog)}};
-
-load([$S,$e,$c,$u,$r,$i,$t,$y,$D,$i,$s,$k,$L,$o,$g,$S,$i,$z,$e,$ |SecurityDiskLogSize],[]) ->
-    case regexp:split(SecurityDiskLogSize, " ") of
-	{ok, [MaxBytes, MaxFiles]} ->
-	    case httpd_conf:make_integer(MaxBytes) of
-		{ok, MaxBytesInteger} ->
-		    case httpd_conf:make_integer(MaxFiles) of
-			{ok, MaxFilesInteger} ->
-			    {ok, [], {security_disk_log_size,
-				      {MaxBytesInteger, MaxFilesInteger}}};
-			{error,_} ->
-			    {error, ?NICE(httpd_conf:clean(SecurityDiskLogSize)++
-					  " is an invalid SecurityDiskLogSize")}
-		    end;
-		{error, _} ->
-		    {error, ?NICE(httpd_conf:clean(SecurityDiskLogSize)++
-				  " is an invalid SecurityDiskLogSize")}
-	    end
-    end;
-load([$S,$e,$c,$u,$r,$i,$t,$y,$D,$i,$s,$k,$L,$o,$g,$ |SecurityDiskLog],[]) ->
-    {ok, [], {security_disk_log, httpd_conf:clean(SecurityDiskLog)}};
-
-load([$D,$i,$s,$k,$L,$o,$g,$F,$o,$r,$m,$a,$t,$ |Format],[]) ->
-    case httpd_conf:clean(Format) of
-	"internal" ->
-	    {ok, [], {disk_log_format,internal}};
-	"external" ->
-	    {ok, [], {disk_log_format,external}};
-	_Default ->
-	    {ok, [], {disk_log_format,external}}
-    end.
-
-%% store
-
-store({transfer_disk_log,TransferDiskLog},ConfigList) ->
-    case create_disk_log(TransferDiskLog, transfer_disk_log_size, ConfigList) of
-	{ok,TransferDB} ->
-	    {ok,{transfer_disk_log,TransferDB}};
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-store({security_disk_log,SecurityDiskLog},ConfigList) ->
-    case create_disk_log(SecurityDiskLog, security_disk_log_size, ConfigList) of
-	{ok,SecurityDB} ->
-	    {ok,{security_disk_log,SecurityDB}};
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-store({error_disk_log,ErrorDiskLog},ConfigList) ->
-    case create_disk_log(ErrorDiskLog, error_disk_log_size, ConfigList) of
-	{ok,ErrorDB} ->
-	    {ok,{error_disk_log,ErrorDB}};
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Open or creates the disklogs 
-%%----------------------------------------------------------------------
-log_size(ConfigList, Tag) ->
-    httpd_util:key1search(ConfigList, Tag, {500*1024,8}).
-
-create_disk_log(LogFile, SizeTag, ConfigList) ->
-    Filename = httpd_conf:clean(LogFile),
-    {MaxBytes, MaxFiles} = log_size(ConfigList, SizeTag),
-    case filename:pathtype(Filename) of
-	absolute ->
-	    create_disk_log(Filename, MaxBytes, MaxFiles, ConfigList);
-	volumerelative ->
-	    create_disk_log(Filename, MaxBytes, MaxFiles, ConfigList);
-	relative ->
-	    case httpd_util:key1search(ConfigList,server_root) of
-		undefined ->
-		    {error,
-		     ?NICE(Filename++
-			   " is an invalid ErrorLog beacuse ServerRoot is not defined")};
-		ServerRoot ->
-		    AbsoluteFilename = filename:join(ServerRoot,Filename),
-		    create_disk_log(AbsoluteFilename, MaxBytes, MaxFiles,
-				     ConfigList)
-	    end
-    end.
-
-create_disk_log(Filename, MaxBytes, MaxFiles, ConfigList) ->
-    Format = httpd_util:key1search(ConfigList, disk_log_format, external),
-    open(Filename, MaxBytes, MaxFiles, Format).
-    
-
-
-%% remove
-remove(ConfigDB) ->
-    lists:foreach(fun([DiskLog]) -> close(DiskLog) end,
-		  ets:match(ConfigDB,{transfer_disk_log,'$1'})),
-    lists:foreach(fun([DiskLog]) -> close(DiskLog) end,
-		  ets:match(ConfigDB,{error_disk_log,'$1'})),
-    ok.
-
-
-%% 
-%% Some disk_log wrapper functions:
-%% 
-
-%%----------------------------------------------------------------------
-%% Function:    open/4
-%% Description: Open a disk log file.
-%% Control which format the disk log will be in. The external file 
-%% format is used as default since that format was used by older 
-%% implementations of inets.
-%%
-%% When the internal disk log format is used, we will do some extra 
-%% controls. If the files are valid, try to repair them and if 
-%% thats not possible, truncate.
-%%----------------------------------------------------------------------
-
-open(Filename, MaxBytes, MaxFiles, internal) ->
-    Opts = [{format, internal}, {repair, truncate}],
-    open1(Filename, MaxBytes, MaxFiles, Opts);
-open(Filename, MaxBytes, MaxFiles, _) ->
-    Opts = [{format, external}],
-    open1(Filename, MaxBytes, MaxFiles, Opts).
-
-open1(Filename, MaxBytes, MaxFiles, Opts0) ->
-    Opts1 = [{name, Filename}, {file, Filename}, {type, wrap}] ++ Opts0,
-    case open2(Opts1, {MaxBytes, MaxFiles}) of
-        {ok, LogDB} ->
-            {ok, LogDB};
-        {error, Reason} ->
-            ?vlog("failed opening disk log with args:"
-                  "~n   Filename: ~p"
-                  "~n   MaxBytes: ~p"
-                  "~n   MaxFiles: ~p"
-                  "~n   Opts0:    ~p"
-                  "~nfor reason:"
-                  "~n   ~p", [Filename, MaxBytes, MaxFiles, Opts0, Reason]),
-            {error, 
-             ?NICE("Can't create " ++ Filename ++ 
-                   lists:flatten(io_lib:format(", ~p",[Reason])))};
-        _ ->
-            {error, ?NICE("Can't create "++Filename)}
-    end.
-
-open2(Opts, Size) ->
-    case disk_log:open(Opts) of
-        {error, {badarg, size}} ->
-            %% File did not exist, add the size option and try again
-            disk_log:open([{size, Size} | Opts]);
-        Else ->
-            Else
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Actually writes the entry to the disk_log. If the log is an 
-%% internal disk_log write it with log otherwise with blog.
-%%----------------------------------------------------------------------  
-write(Log, Entry, internal) ->
-    disk_log:log(Log, Entry);
-
-write(Log, Entry, _) ->
-    disk_log:blog(Log, Entry).
-
-%% Close the log file
-close(Log) ->
-    disk_log:close(Log).
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_esi.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_esi.erl
deleted file mode 100644
index d527f36788..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_esi.erl
+++ /dev/null
@@ -1,490 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_esi.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_esi).
--export([do/1,load/2]).
-
-%%Functions provided to help erl scheme alias programmer to 
-%%Create dynamic webpages that are sent back to the user during 
-%%Generation
--export([deliver/2]).
-
-
--include("httpd.hrl").
-
--define(VMODULE,"ESI").
--include("httpd_verbosity.hrl").
-
--define(GATEWAY_INTERFACE,"CGI/1.1").
--define(DEFAULT_ERL_TIMEOUT,15000).
-%% do
-
-do(Info) ->
-    ?vtrace("do",[]),
-    case httpd_util:key1search(Info#mod.data,status) of
-	%% A status code has been generated!
-	{StatusCode,PhraseArgs,Reason} ->
-	    {proceed,Info#mod.data};
-	%% No status code has been generated!
-	undefined ->
-	    case httpd_util:key1search(Info#mod.data,response) of
-		%% No response has been generated!
-		undefined ->
-		    case erl_or_eval(Info#mod.request_uri,
-				     Info#mod.config_db) of
-			{eval,CGIBody,Modules} ->
-			    eval(Info,Info#mod.method,CGIBody,Modules);
-			{erl,CGIBody,Modules} ->
-			    erl(Info,Info#mod.method,CGIBody,Modules);
-			proceed ->
-			    {proceed,Info#mod.data}
-		    end;
-		%% A response has been generated or sent!
-		Response ->
-		    {proceed,Info#mod.data}
-	    end
-    end.
-
-	    
-
-%% erl_or_eval
-
-erl_or_eval(RequestURI, ConfigDB) ->
-    case erlp(RequestURI, ConfigDB) of
-	false ->
-	    case evalp(RequestURI, ConfigDB) of
-		false ->
-		    ?vtrace("neither erl nor eval",[]),
-		    proceed;
-		Other ->
-		    Other
-	    end;
-	Other ->
-	    Other
-    end.
-
-erlp(RequestURI, ConfigDB) ->
-    case httpd_util:multi_lookup(ConfigDB, erl_script_alias) of
-	[] ->
-	    false;
-	AliasMods ->
-	    erlp_find_alias(RequestURI,AliasMods)
-    end.
-
-erlp_find_alias(_RequestURI,[]) ->
-    ?vtrace("erlp_find_alias -> no match",[]),
-    false;
-erlp_find_alias(RequestURI,[{Alias,Modules}|Rest]) ->
-    case regexp:first_match(RequestURI,"^"++Alias++"/") of
-	{match,1,Length} ->
-	    ?vtrace("erlp -> match with Length: ~p",[Length]),
-	    {erl,string:substr(RequestURI,Length+1),Modules};
-	nomatch ->
-	    erlp_find_alias(RequestURI,Rest)
-    end.
-
-evalp(RequestURI, ConfigDB) ->
-    case httpd_util:multi_lookup(ConfigDB, eval_script_alias) of
-	[] ->
-	    false;
-	AliasMods ->
-	    evalp_find_alias(RequestURI,AliasMods)
-    end.
-
-evalp_find_alias(_RequestURI,[]) ->
-    ?vtrace("evalp_find_alias -> no match",[]),
-    false;
-evalp_find_alias(RequestURI,[{Alias,Modules}|Rest]) ->
-    case regexp:first_match(RequestURI,"^"++Alias++"\\?") of
-	{match, 1, Length} ->
-	    ?vtrace("evalp_find_alias -> match with Length: ~p",[Length]),
-	    {eval, string:substr(RequestURI,Length+1),Modules};
-	nomatch ->
-	    evalp_find_alias(RequestURI,Rest)
-    end.
-
-
-%%
-%% Erl mechanism
-%% 
-
-%%This is exactly the same as the GET method the difference is that
-%%The response must not contain any data expect the response header
-
-
-erl(Info,"HEAD",CGIBody,Modules) ->
-    erl(Info,"GET",CGIBody,Modules);	
-		
-erl(Info,"GET",CGIBody,Modules) ->
-    ?vtrace("erl GET request",[]),
-    case httpd_util:split(CGIBody,":|%3A|/",2) of
-	{ok, [Mod,FuncAndInput]} ->
-	    ?vtrace("~n   Mod:          ~p"
-		    "~n   FuncAndInput: ~p",[Mod,FuncAndInput]),
-	    case httpd_util:split(FuncAndInput,"[\?/]",2) of
-		{ok, [Func,Input]} ->
-		    ?vtrace("~n   Func:  ~p"
-			    "~n   Input: ~p",[Func,Input]),
-		    exec(Info,"GET",CGIBody,Modules,Mod,Func,
-			 {input_type(FuncAndInput),Input});
-		{ok, [Func]} ->
-		    exec(Info,"GET",CGIBody,Modules,Mod,Func,{no_input,""});
-		{ok, BadRequest} ->
-		    {proceed,[{status,{400,none,BadRequest}}|Info#mod.data]}
-	    end;
-	{ok, BadRequest} ->
-	    ?vlog("erl BAD (GET-) request",[]),
-	    {proceed, [{status,{400,none,BadRequest}}|Info#mod.data]}
-    end;
-
-erl(Info, "POST", CGIBody, Modules) ->
-    ?vtrace("erl POST request",[]),
-    case httpd_util:split(CGIBody,":|%3A|/",2) of
-	{ok,[Mod,Func]} ->
-	    ?vtrace("~n   Mod:  ~p"
-		    "~n   Func: ~p",[Mod,Func]),
-	    exec(Info,"POST",CGIBody,Modules,Mod,Func,
-		 {entity_body,Info#mod.entity_body});
-	{ok,BadRequest} ->
-	    ?vlog("erl BAD (POST-) request",[]),
-	    {proceed,[{status,{400,none,BadRequest}}|Info#mod.data]}
-    end.
-
-input_type([]) ->
-    no_input;
-input_type([$/|Rest]) ->
-    path_info;
-input_type([$?|Rest]) ->
-    query_string;
-input_type([First|Rest]) ->
-    input_type(Rest).
-
-
-%% exec
-
-exec(Info,Method,CGIBody,["all"],Mod,Func,{Type,Input}) ->
-    ?vtrace("exec ~s 'all'",[Method]),
-    exec(Info,Method,CGIBody,[Mod],Mod,Func,{Type,Input});
-exec(Info,Method,CGIBody,Modules,Mod,Func,{Type,Input}) ->
-    ?vtrace("exec ~s request with:"
-	    "~n   Modules: ~p"
-	    "~n   Mod:     ~p"
-	    "~n   Func:    ~p"
-	    "~n   Type:    ~p"
-	    "~n   Input:   ~p",
-	    [Method,Modules,Mod,Func,Type,Input]),
-    case lists:member(Mod,Modules) of
-	true ->
-	    {_,RemoteAddr}=(Info#mod.init_data)#init_data.peername,
-	    ServerName=(Info#mod.init_data)#init_data.resolve,
-	    Env=get_environment(Info,ServerName,Method,RemoteAddr,Type,Input),
-	    ?vtrace("and now call the module",[]),
-	    case try_new_erl_scheme_method(Info,Env,Input,list_to_atom(Mod),list_to_atom(Func)) of
-		{error,not_new_method}->
-		    case catch apply(list_to_atom(Mod),list_to_atom(Func),[Env,Input]) of
-			{'EXIT',Reason} ->
-			    ?vlog("exit with Reason: ~p",[Reason]),
-			    {proceed,[{status,{500,none,Reason}}|Info#mod.data]};
-			Response ->
-			    control_response_header(Info,Mod,Func,Response)
-		    end;
-		ResponseResult->
-		    ResponseResult
-	    end;
-	false ->
-	    ?vlog("unknown module",[]),
-	    {proceed,[{status,{403,Info#mod.request_uri,
-			       ?NICE("Client not authorized to evaluate: "++CGIBody)}}|Info#mod.data]}
-    end.
-
-control_response_header(Info,Mod,Func,Response)->
-    case control_response(Response,Info,Mod,Func) of
-	{proceed,[{response,{StatusCode,Response}}|Rest]} ->
-	    case httpd_util:lookup(Info#mod.config_db,erl_script_nocache,false) of
-		true ->
-		    case httpd_util:split(Response,"\r\n\r\n|\n\n",2) of
-			{ok,[Head,Body]}->
-			    Date=httpd_util:rfc1123_date(),
-			    Cache="Cache-Control:no-cache\r\nPragma:no-cache\r\nExpires:"++ Date ++ "\r\n",
-			    {proceed,[{response,{StatusCode,[Head,"\r\n",Cache,"\r\n",Body]}}|Rest]};
-			_->    
-			   {proceed,[{response,{StatusCode,Response}}|Rest]}
-		    end;
-		WhatEver->
-		    {proceed,[{response,{StatusCode,Response}}|Rest]}
-	    end;
-	WhatEver->
-	    WhatEver
-    end.
-
-control_response(Response,Info,Mod,Func)->
-    ?vdebug("Response: ~n~p",[Response]),
-    case mod_cgi:status_code(lists:flatten(Response)) of
-	{ok,StatusCode} ->
-	    {proceed,[{response,{StatusCode,Response}}|Info#mod.data]};
-	{error,Reason} ->
-	    {proceed,
-	     [{status,{400,none,
-		       ?NICE("Error in "++Mod++":"++Func++"/2: "++
-			     lists:flatten(io_lib:format("~p",[Reason])))}}|
-	      Info#mod.data]}
-    end.
-
-parsed_header([]) ->
-    [];
-parsed_header([{Name,[Value|R1]}|R2]) when list(Value) ->
-    NewName=lists:map(fun(X) -> if X == $- -> $_; true -> X end end,Name),
-    [{list_to_atom("http_"++httpd_util:to_lower(NewName)),
-      multi_value([Value|R1])}|parsed_header(R2)];
-parsed_header([{Name,Value}|Rest]) when list(Value)->
-    {ok,NewName,_}=regexp:gsub(Name,"-","_"),
-    [{list_to_atom("http_"++httpd_util:to_lower(NewName)),Value}|
-     parsed_header(Rest)].
-
-multi_value([]) ->
-    [];
-multi_value([Value]) ->
-    Value;
-multi_value([Value|Rest]) ->
-    Value++", "++multi_value(Rest).
-
-%%
-%% Eval mechanism
-%% 
-
-
-eval(Info,"POST",CGIBody,Modules) ->
-    ?vtrace("eval(POST) -> method not supported",[]),	    
-    {proceed,[{status,{501,{"POST",Info#mod.request_uri,Info#mod.http_version},
-		       ?NICE("Eval mechanism doesn't support method POST")}}|
-	      Info#mod.data]};
-
-eval(Info,"HEAD",CGIBody,Modules) ->
-    %%The function that sends the data in httpd_response handles HEAD reqest by not
-    %% Sending the body
-    eval(Info,"GET",CGIBody,Modules);
-
-
-eval(Info,"GET",CGIBody,Modules) ->
-    ?vtrace("eval(GET) -> entry when"
-	    "~n   Modules: ~p",[Modules]),	    
-    case auth(CGIBody,Modules) of
-	true ->
-	    case lib:eval_str(string:concat(CGIBody,". ")) of
-		{error,Reason} ->
-		    ?vlog("eval -> error:"
-			  "~n   Reason: ~p",[Reason]),	    
-		    {proceed,[{status,{500,none,Reason}}|Info#mod.data]};
-		{ok,Response} ->
-		    ?vtrace("eval -> ok:"
-			    "~n   Response: ~p",[Response]),	    
-		    case mod_cgi:status_code(lists:flatten(Response)) of
-			{ok,StatusCode} ->
-			    {proceed,[{response,{StatusCode,Response}}|Info#mod.data]};
-			{error,Reason} ->
-			    {proceed,[{status,{400,none,Reason}}|Info#mod.data]}
-		    end
-	    end;
-	false ->
-	    ?vlog("eval -> auth failed",[]),	    
-	    {proceed,[{status,
-		       {403,Info#mod.request_uri,
-			?NICE("Client not authorized to evaluate: "++CGIBody)}}|
-		      Info#mod.data]}
-    end.
-
-auth(CGIBody,["all"]) ->
-    true;
-auth(CGIBody,Modules) ->
-    case regexp:match(CGIBody,"^[^\:(%3A)]*") of
-	{match,Start,Length} ->
-	    lists:member(string:substr(CGIBody,Start,Length),Modules);
-	nomatch ->
-	    false
-    end.
-
-%%----------------------------------------------------------------------
-%%Creates the environment list that will be the first arg to the 
-%%Functions that is called through the ErlScript Schema
-%%----------------------------------------------------------------------
-
-get_environment(Info,ServerName,Method,RemoteAddr,Type,Input)->
-    Env=[{server_software,?SERVER_SOFTWARE},
-		 {server_name,ServerName},
-		 {gateway_interface,?GATEWAY_INTERFACE},
-		 {server_protocol,?SERVER_PROTOCOL},
-		 {server_port,httpd_util:lookup(Info#mod.config_db,port,80)},
-		 {request_method,Method},
-		 {remote_addr,RemoteAddr},
-		 {script_name,Info#mod.request_uri}|
-		 parsed_header(Info#mod.parsed_header)],
-    get_environment(Type,Input,Env,Info).
-
-
-get_environment(Type,Input,Env,Info)->
-    Env1=case Type of
-	query_string ->
-	    [{query_string,Input}|Env];
-	path_info ->
-	    Aliases=httpd_util:multi_lookup(Info#mod.config_db,alias),
-	    {_,PathTranslated,_}=mod_alias:real_name(Info#mod.config_db,[$/|Input],Aliases),
-	    [{path_info,"/"++httpd_util:decode_hex(Input)},
-	     {path_translated,PathTranslated}|Env];
-	entity_body ->
-	    [{content_length,httpd_util:flatlength(Input)}|Env];
-	no_input ->
-	    Env
-    end,
-    get_environment(Info,Env1).
-
-get_environment(Info,Env)->
-    case httpd_util:key1search(Info#mod.data,remote_user) of
-	undefined ->
-	    Env;
-	RemoteUser ->
-	    [{remote_user,RemoteUser}|Env]
-    end.
-%%
-%% Configuration
-%%
-
-%% load
-
-load([$E,$r,$l,$S,$c,$r,$i,$p,$t,$A,$l,$i,$a,$s,$ |ErlScriptAlias],[]) ->
-    case regexp:split(ErlScriptAlias," ") of
-	{ok, [ErlName|Modules]} ->
-	    {ok, [], {erl_script_alias, {ErlName,Modules}}};
-	{ok, _} ->
-	    {error,?NICE(httpd_conf:clean(ErlScriptAlias)++
-			 " is an invalid ErlScriptAlias")}
-    end;
-load([$E,$v,$a,$l,$S,$c,$r,$i,$p,$t,$A,$l,$i,$a,$s,$ |EvalScriptAlias],[]) ->
-    case regexp:split(EvalScriptAlias, " ") of
-	{ok, [EvalName|Modules]} ->
-	    {ok, [], {eval_script_alias, {EvalName,Modules}}};
-	{ok, _} ->
-	    {error, ?NICE(httpd_conf:clean(EvalScriptAlias)++
-			  " is an invalid EvalScriptAlias")}
-    end;
-load([$E,$r,$l,$S,$c,$r,$i,$p,$t,$T,$i,$m,$e,$o,$u,$t,$ |Timeout],[])->
-    case catch list_to_integer(httpd_conf:clean(Timeout)) of
-	TimeoutSec when integer(TimeoutSec)  ->
-	   {ok, [], {erl_script_timeout,TimeoutSec*1000}};
-	_ ->
-	   {error, ?NICE(httpd_conf:clean(Timeout)++
-			 " is an invalid ErlScriptTimeout")}
-    end;
-load([$E,$r,$l,$S,$c,$r,$i,$p,$t,$N,$o,$C,$a,$c,$h,$e |CacheArg],[])->
-    case catch list_to_atom(httpd_conf:clean(CacheArg)) of
-        true ->
-	    {ok, [], {erl_script_nocache,true}};
-	false ->
-	   {ok, [], {erl_script_nocache,false}};
-	_ ->
-	   {error, ?NICE(httpd_conf:clean(CacheArg)++
-			 " is an invalid ErlScriptNoCache directive")}
-    end.
-
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% Functions below handles the data from the dynamic webpages         %%
-%% That sends data back to the user part by part                      %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%----------------------------------------------------------------------
-%%Deliver is the callback function users can call to deliver back data to the
-%%client
-%%----------------------------------------------------------------------
-
-deliver(SessionID,Data)when pid(SessionID) ->
-    SessionID ! {ok,Data},
-    ok;
-deliver(SessionID,Data) ->
-    {error,bad_sessionID}.
-
-
-%%----------------------------------------------------------------------
-%% The method that tries to execute the new format 
-%%----------------------------------------------------------------------
-
-%%It would be nicer to use erlang:function_exported/3 but if the 
-%%Module isn't loaded the function says that it is not loaded
-
-
-try_new_erl_scheme_method(Info,Env,Input,Mod,Func)-> 
-    process_flag(trap_exit,true),
-    Pid=spawn_link(Mod,Func,[self(),Env,Input]),
-    Timeout=httpd_util:lookup(Info#mod.config_db,erl_script_timeout,?DEFAULT_ERL_TIMEOUT),
-    RetVal=receive_response_data(Info,Pid,0,undefined,[],Timeout),
-    process_flag(trap_exit,false),
-    RetVal.
-
-
-%%----------------------------------------------------------------------
-%%The function recieves the data from the process that generates the page
-%%and send the data to the client through the mod_cgi:send function
-%%----------------------------------------------------------------------
-
-receive_response_data(Info,Pid,Size,StatusCode,AccResponse,Timeout) ->
-    ?DEBUG("receive_response_data()-> Script Size: ~p,StatusCode ~p ,Timeout: ~p ~n",[Size,StatusCode,Timeout]),
-    receive
-	{ok, Response} ->
-	    NewStatusCode=mod_cgi:update_status_code(StatusCode,Response),
-				  
-	    ?DEBUG("receive_response_data/2 NewStatusCode: ~p~n",[NewStatusCode]),
-	    case mod_cgi:send(Info, NewStatusCode,Response, Size,AccResponse) of
-		socket_closed ->
-		    (catch exit(Pid,final)),
-		    {proceed,[{response,{already_sent,200,Size}}|Info#mod.data]};
-		head_sent->
-		    (catch exit(Pid,final)),
-		    {proceed,[{response,{already_sent,200,Size}}|Info#mod.data]};
-		_ ->
-		    %%The data is sent and the socket is not closed contine
-		    NewSize = mod_cgi:get_new_size(Size,Response),
-		    receive_response_data(Info,Pid,NewSize,NewStatusCode,"notempty",Timeout)
-	    end;
-	{'EXIT', Pid, Reason} when AccResponse==[] ->
-	    {error,not_new_method};
-	{'EXIT', Pid, Reason} when pid(Pid) ->
-	    NewStatusCode=mod_cgi:update_status_code(StatusCode,AccResponse),
-	    mod_cgi:final_send(Info,NewStatusCode,Size,AccResponse),
-	    {proceed, [{response,{already_sent,200,Size}}|Info#mod.data]};
-	%% This should not happen!
-	WhatEver ->
-	    NewStatusCode=mod_cgi:update_status_code(StatusCode,AccResponse),
-	    mod_cgi:final_send(Info,StatusCode,Size,AccResponse),
-	    {proceed, [{response,{already_sent,200,Size}}|Info#mod.data]}
-    after 
-	Timeout ->
-	    (catch exit(Pid,timeout)), % KILL the port !!!!
-	    httpd_socket:close(Info#mod.socket_type,Info#mod.socket),
-	    {proceed,[{response,{already_sent,200,Size}}|Info#mod.data]}
-    end.
-
-
-
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_get.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_get.erl
deleted file mode 100644
index 02f708f85b..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_get.erl
+++ /dev/null
@@ -1,179 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_get.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_get).
--export([do/1]).
--include("httpd.hrl").
-
-%% do
-
-do(Info) ->
-    ?DEBUG("do -> entry",[]),
-    case Info#mod.method of
-	"GET" ->
-	    case httpd_util:key1search(Info#mod.data,status) of
-		%% A status code has been generated!
-		{StatusCode,PhraseArgs,Reason} ->
-		    {proceed,Info#mod.data};
-		%% No status code has been generated!
-		undefined ->
-		    case httpd_util:key1search(Info#mod.data,response) of
-			%% No response has been generated!
-			undefined ->
-			    do_get(Info);
-			%% A response has been generated or sent!
-			Response ->
-			    {proceed,Info#mod.data}
-		    end
-	    end;
-	%% Not a GET method!
-	_ ->
-	    {proceed,Info#mod.data}
-    end.
-
-
-do_get(Info) ->
-    ?DEBUG("do_get -> Request URI: ~p",[Info#mod.request_uri]),
-    Path = mod_alias:path(Info#mod.data, Info#mod.config_db, 
-			  Info#mod.request_uri),
-    {FileInfo, LastModified} =get_modification_date(Path),
-
-    send_response(Info#mod.socket,Info#mod.socket_type,Path,Info,FileInfo,LastModified).
-
-
-%%The common case when no range is specified
-send_response(Socket,SocketType,Path,Info,FileInfo,LastModified)->
-    %% Send the file!
-    %% Find the modification date of the file
-    case file:open(Path,[raw,binary]) of
-	{ok, FileDescriptor} ->
-	    ?DEBUG("do_get -> FileDescriptor: ~p",[FileDescriptor]),
-	    Suffix = httpd_util:suffix(Path),
-	    MimeType = httpd_util:lookup_mime_default(Info#mod.config_db,
-						      Suffix,"text/plain"),
-	    %FileInfo=file:read_file_info(Path),
-	    Date = httpd_util:rfc1123_date(),
-	    Size = integer_to_list(FileInfo#file_info.size),
-	    Header=case Info#mod.http_version of
-		       "HTTP/1.1" ->
-			   [httpd_util:header(200, MimeType, Info#mod.connection),
-			    "Last-Modified: ", LastModified, "\r\n",
-			    "Etag: ",httpd_util:create_etag(FileInfo),"\r\n",
-			    "Content-Length: ",Size,"\r\n\r\n"];
-		       "HTTP/1.0" ->
-			   [httpd_util:header(200, MimeType, Info#mod.connection),
-			    "Last-Modified: ", LastModified, "\r\n",
-			    "Content-Length: ",Size,"\r\n\r\n"]
-		   end,
-		       
-	    send(Info#mod.socket_type, Info#mod.socket,
-		 Header, FileDescriptor),
-	    file:close(FileDescriptor),
-	    {proceed,[{response,{already_sent,200,
-				 FileInfo#file_info.size}},
-		      {mime_type,MimeType}|Info#mod.data]};
-	{error, Reason} ->
-	    
-	    {proceed,
-	     [{status,open_error(Reason,Info,Path)}|Info#mod.data]}
-    end.
-
-%% send
-
-send(SocketType,Socket,Header,FileDescriptor) ->
-    ?DEBUG("send -> send header",[]),
-    case httpd_socket:deliver(SocketType,Socket,Header) of
-	socket_closed ->
-	    ?LOG("send -> socket closed while sending header",[]),
-	    socket_close;
-	_ ->
-	    send_body(SocketType,Socket,FileDescriptor)
-    end.
-
-send_body(SocketType,Socket,FileDescriptor) ->
-    case file:read(FileDescriptor,?FILE_CHUNK_SIZE) of
-	{ok,Binary} ->
-	    ?DEBUG("send_body -> send another chunk: ~p",[size(Binary)]),
-	    case httpd_socket:deliver(SocketType,Socket,Binary) of
-		socket_closed ->
-		    ?LOG("send_body -> socket closed while sending",[]),
-		    socket_close;
-		_ ->
-		    send_body(SocketType,Socket,FileDescriptor)
-	    end;
-	eof ->
-	    ?DEBUG("send_body -> done with this file",[]),
-	    eof
-    end.
-    
-
-%% open_error - Handle file open failure
-%%
-open_error(eacces,Info,Path) ->
-    open_error(403,Info,Path,"");
-open_error(enoent,Info,Path) ->
-    open_error(404,Info,Path,"");
-open_error(enotdir,Info,Path) ->
-    open_error(404,Info,Path,
-	       ": A component of the file name is not a directory");
-open_error(emfile,_Info,Path) ->
-    open_error(500,none,Path,": To many open files");
-open_error({enfile,_},_Info,Path) ->
-    open_error(500,none,Path,": File table overflow");
-open_error(_Reason,_Info,Path) ->
-    open_error(500,none,Path,"").
-	    
-open_error(StatusCode,none,Path,Reason) ->
-    {StatusCode,none,?NICE("Can't open "++Path++Reason)};
-open_error(StatusCode,Info,Path,Reason) ->
-    {StatusCode,Info#mod.request_uri,?NICE("Can't open "++Path++Reason)}.
-
-get_modification_date(Path)->
-    case file:read_file_info(Path) of
-	{ok, FileInfo0} ->
-	    {FileInfo0, httpd_util:rfc1123_date(FileInfo0#file_info.mtime)};
-	_ ->
-	    {#file_info{},""}
-    end.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_head.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_head.erl
deleted file mode 100644
index 542604e092..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_head.erl
+++ /dev/null
@@ -1,89 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_head.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_head).
--export([do/1]).
-
--include("httpd.hrl").
-
-%% do
-
-do(Info) ->
-    ?DEBUG("do -> entry",[]),
-    case Info#mod.method of
-	"HEAD" ->
-	    case httpd_util:key1search(Info#mod.data,status) of
-		%% A status code has been generated!
-		{StatusCode,PhraseArgs,Reason} ->
-		    {proceed,Info#mod.data};
-		%% No status code has been generated!
-		_undefined ->
-		    case httpd_util:key1search(Info#mod.data,response) of
-			%% No response has been generated!
-			undefined ->
-			    do_head(Info);
-			%% A response has been sent! Nothing to do about it!
-			{already_sent,StatusCode,Size} ->
-			    {proceed,Info#mod.data};
-			%% A response has been generated!
-			{StatusCode,Response} ->
-			    {proceed,Info#mod.data}
-		    end
-	    end;
-	%% Not a HEAD method!
-	_ ->
-	    {proceed,Info#mod.data}
-    end.
-
-do_head(Info) -> 
-    ?DEBUG("do_head -> Request URI: ~p",[Info#mod.request_uri]),
-    Path = mod_alias:path(Info#mod.data,Info#mod.config_db,
-			  Info#mod.request_uri),
-    Suffix = httpd_util:suffix(Path),
-    %% Does the file exists?
-    case file:read_file_info(Path) of
-	{ok,FileInfo} ->
-	    MimeType=httpd_util:lookup_mime_default(Info#mod.config_db,Suffix,"text/plain"),
-	    Length=io_lib:write(FileInfo#file_info.size),
-	    Head=[{content_type,MimeType},{content_length,Length},{code,200}],
-	    {proceed,[{response,{response,Head,nobody}}|Info#mod.data]};
-	{error,Reason} ->
-	    {proceed,
-	     [{status,read_file_info_error(Reason,Info,Path)}|Info#mod.data]}
-    end.
-
-%% read_file_info_error - Handle file info read failure
-%%
-read_file_info_error(eacces,Info,Path) ->
-    read_file_info_error(403,Info,Path,"");
-read_file_info_error(enoent,Info,Path) ->
-    read_file_info_error(404,Info,Path,"");
-read_file_info_error(enotdir,Info,Path) ->
-    read_file_info_error(404,Info,Path,
-			 ": A component of the file name is not a directory");
-read_file_info_error(emfile,_Info,Path) ->
-    read_file_info_error(500,none,Path,": To many open files");
-read_file_info_error({enfile,_},_Info,Path) ->
-    read_file_info_error(500,none,Path,": File table overflow");
-read_file_info_error(_Reason,_Info,Path) ->
-    read_file_info_error(500,none,Path,"").
-
-read_file_info_error(StatusCode,none,Path,Reason) ->
-    {StatusCode,none,?NICE("Can't access "++Path++Reason)};
-read_file_info_error(StatusCode,Info,Path,Reason) ->
-    {StatusCode,Info#mod.request_uri,
-     ?NICE("Can't access "++Path++Reason)}.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_htaccess.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_htaccess.erl
deleted file mode 100644
index 069e4ad3a9..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_htaccess.erl
+++ /dev/null
@@ -1,1150 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_htaccess.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
-
--module(mod_htaccess).
-
--export([do/1, load/2]).
--export([debug/0]).
-
--include("httpd.hrl").
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Public methods that interface the eswapi                         %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
-
-%----------------------------------------------------------------------
-% Public method called by the webbserver to insert the data about
-% Names on accessfiles
-%----------------------------------------------------------------------
-load([$A,$c,$c,$e,$s,$s,$F,$i,$l,$e,$N,$a,$m,$e|FileNames],Context)->
-    CleanFileNames=httpd_conf:clean(FileNames),
-    %%io:format("\n The filenames is:" ++ FileNames ++ "\n"),
-    {ok,[],{access_files,string:tokens(CleanFileNames," ")}}.
-
-
-%----------------------------------------------------------------------
-% Public method that the webbserver calls to control the page 
-%----------------------------------------------------------------------
-do(Info)->
-    case httpd_util:key1search(Info#mod.data,status) of
-	{Status_code,PhraseArgs,Reason}->
-	    {proceed,Info#mod.data};
-	undefined ->
-	    control_path(Info)
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% The functions that start the control if there is a accessfile    %%
-%% and if so controls if the dir is allowed or not                  %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%----------------------------------------------------------------------
-%Info = record mod as specified in httpd.hrl           
-%returns either {proceed,Info#mod.data}
-%{proceed,[{status,403....}|Info#mod.data]}
-%{proceed,[{status,401....}|Info#mod.data]}
-%{proceed,[{status,500....}|Info#mod.data]}
-%----------------------------------------------------------------------
-control_path(Info) ->
-    Path = mod_alias:path(Info#mod.data,
-			  Info#mod.config_db,
-			  Info#mod.request_uri),
-    case isErlScriptOrNotAccessibleFile(Path,Info) of
-	true->
-	    {proceed,Info#mod.data};
-	false->
-	    case getHtAccessData(Path,Info)of
-		{ok,public}->
-		    %%There was no restrictions on the page continue
-		    {proceed,Info#mod.data};
-		{error,Reason} ->
-		    %Something got wrong continue or quit??????????????????/
-                   {proceed,Info#mod.data};
-		{accessData,AccessData}->
-		    controlAllowedMethod(Info,AccessData)
-	    end
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% These methods controls that the method the client used in the    %%
-%% request is one of the limited                                    %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%----------------------------------------------------------------------
-%Control that if the accessmethod used is in the list of modes to challenge
-%
-%Info is the mod record as specified in httpd.hrl
-%AccessData is an ets table whit the data in the .htaccessfiles
-%----------------------------------------------------------------------
-controlAllowedMethod(Info,AccessData)->
-    case allowedRequestMethod(Info,AccessData) of
-	allow->
-	    %%The request didnt use one of the limited methods
-	    ets:delete(AccessData),
-	    {proceed,Info#mod.data};
-	challenge->
-	    authenticateUser(Info,AccessData)
-    end.
-
-%----------------------------------------------------------------------
-%Check the specified access method in the .htaccessfile
-%----------------------------------------------------------------------
-allowedRequestMethod(Info,AccessData)->
-    case ets:lookup(AccessData,limit) of
-	[{limit,all}]->
-	    challenge;
-	[{limit,Methods}]->
-	    isLimitedRequestMethod(Info,Methods)
-    end.
-
-
-%----------------------------------------------------------------------
-%Check the specified accessmethods in the .htaccesfile against the users 
-%accessmethod
-%
-%Info is the record from the do call
-%Methods is a list of the methods specified in the .htaccessfile
-%----------------------------------------------------------------------
-isLimitedRequestMethod(Info,Methods)->
-    case lists:member(Info#mod.method,Methods) of
-	true->
-	    challenge;
-	false ->
-	    allow
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% These methods controls that the user comes from an allowwed net  %%
-%% and if so wheather its a valid user or a challenge shall be      %%
-%% generated                                                        %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%----------------------------------------------------------------------
-%The first thing to control is that the user is from a network
-%that has access to the page
-%---------------------------------------------------------------------- 
-authenticateUser(Info,AccessData)->
-    case controlNet(Info,AccessData) of
-	allow->
-	    %the network is ok control that it is an allowed user
-	    authenticateUser2(Info,AccessData);
-	deny->
-	    %The user isnt allowed to access the pages from that network
-	    ets:delete(AccessData),
-	    {proceed,[{status,{403,Info#mod.request_uri,
-	    "Restricted area not allowed from your network"}}|Info#mod.data]}
-    end.
-
-
-%----------------------------------------------------------------------
-%The network the user comes from is allowed to view the resources 
-%control whether the user needsto supply a password or not 
-%----------------------------------------------------------------------
-authenticateUser2(Info,AccessData)->
-    case ets:lookup(AccessData,require) of
-	[{require,AllowedUsers}]->
-	    case ets:lookup(AccessData,auth_name) of
-		[{auth_name,Realm}]->
-		    authenticateUser2(Info,AccessData,Realm,AllowedUsers);
-		_NoAuthName->
-		    ets:delete(AccessData),
-		    {break,[{status,{500,none,
-				     ?NICE("mod_htaccess:AuthName directive not specified")}}]}
-	    end;
-	[] ->
-	    %%No special user is required the network is ok so let
-	    %%the user in
-	    ets:delete(AccessData),
-	    {proceed,Info#mod.data}
-    end.
-
-
-%----------------------------------------------------------------------
-%The user must send a userId and a password to get the resource
-%Control if its already in the http-request
-%if the file with users is bad send an 500 response
-%----------------------------------------------------------------------
-authenticateUser2(Info,AccessData,Realm,AllowedUsers)->
-    case authenticateUser(Info,AccessData,AllowedUsers) of
-	allow ->
-	    ets:delete(AccessData),
-	    {user,Name,Pwd}=getAuthenticatingDataFromHeader(Info),
-	    {proceed, [{remote_user_name,Name}|Info#mod.data]};
-	challenge->  
-	    ets:delete(AccessData),
-	    ReasonPhrase = httpd_util:reason_phrase(401),
-	    Message = httpd_util:message(401,none,Info#mod.config_db),
-	    {proceed,
-	     [{response,
-	       {401,
-		["WWW-Authenticate: Basic realm=\"",Realm,
-		 "\"\r\n\r\n","<HTML>\n<HEAD>\n<TITLE>",
-		 ReasonPhrase,"</TITLE>\n",
-		 "</HEAD>\n<BODY>\n<H1>",ReasonPhrase,
-		 "</H1>\n",Message,"\n</BODY>\n</HTML>\n"]}}|
-	      Info#mod.data]};
-	deny->
-	    ets:delete(AccessData),
-	    {break,[{status,{500,none,
-			     ?NICE("mod_htaccess:Bad path to user or group file")}}]}
-    end.
-
-                                                                      
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% Methods that validate the netwqork the user comes from           %%
-%% according to the allowed networks                                %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%--------------------------------------------------------------------- 
-%Controls the users networkaddress agains the specifed networks to 
-%allow or deny
-%
-%returns either allow or deny
-%----------------------------------------------------------------------
-controlNet(Info,AccessData)->
-    UserNetwork=getUserNetworkAddress(Info),
-    case getAllowDenyOrder(AccessData) of
-	{_deny,[],_allow,[]}->
-	    allow;
-	{deny,[],allow,AllowedNetworks}->
-	    controlIfAllowed(AllowedNetworks,UserNetwork,allow,deny);
-	{allow,AllowedNetworks,deny,[]}->
-	    controlIfAllowed(AllowedNetworks,UserNetwork,allow,deny);
-	
-	{deny,DeniedNetworks,allow,[]}->
-	    controlIfAllowed(DeniedNetworks,UserNetwork,allow,deny);
-	{allow,[],deny,DeniedNetworks}->
-	    controlIfAllowed(DeniedNetworks,UserNetwork,allow,deny);
-        
-	{deny,DeniedNetworks,allow,AllowedNetworks}->		    
-	    controlDenyAllow(DeniedNetworks,AllowedNetworks,UserNetwork); 
-	{allow,AllowedNetworks,deny,DeniedNetworks}->		 
-	    controlAllowDeny(AllowedNetworks,DeniedNetworks,UserNetwork)
-    end.
-
-
-%----------------------------------------------------------------------
-%Returns the users IP-Number
-%----------------------------------------------------------------------
-getUserNetworkAddress(Info)->
-    {_Socket,Address}=(Info#mod.init_data)#init_data.peername,
-    Address.
-
-
-%----------------------------------------------------------------------
-%Control the users Ip-number against the ip-numbers in the .htaccessfile
-%----------------------------------------------------------------------
-controlIfAllowed(AllowedNetworks,UserNetwork,IfAllowed,IfDenied)->
-    case AllowedNetworks of
-	[{allow,all}]->
-	   IfAllowed;
-	[{deny,all}]->
-	    IfDenied;
-        [{deny,Networks}]->
-	    memberNetwork(Networks,UserNetwork,IfDenied,IfAllowed);
-	[{allow,Networks}]->
-	    memberNetwork(Networks,UserNetwork,IfAllowed,IfDenied);
-	_Error->
-	    IfDenied
-    end.
-
-
-%---------------------------------------------------------------------%
-%The Denycontrol isn't neccessary to preform since the allow control  %
-%override the deny control                                            %
-%---------------------------------------------------------------------% 
-controlDenyAllow(DeniedNetworks,AllowedNetworks,UserNetwork)->
-    case AllowedNetworks of
-	[{allow,all}]->
-	    allow;
-	[{allow,Networks}]->
-	  case memberNetwork(Networks,UserNetwork) of
-	      true->
-		  allow;
-	      false->
-		  deny
-	  end
-    end.
-
-
-%----------------------------------------------------------------------%
-%Control that the user is in the allowed list if so control that the   %
-%network is in the denied list                             
-%----------------------------------------------------------------------%
-controlAllowDeny(AllowedNetworks,DeniedNetworks,UserNetwork)->
-    case controlIfAllowed(AllowedNetworks,UserNetwork,allow,deny) of
-	allow->
-	    controlIfAllowed(DeniedNetworks,UserNetwork,deny,allow);
-	deny ->
-	    deny
-    end.
-	    
-%----------------------------------------------------------------------
-%Controls if the users Ipnumber is in the list of either denied or
-%allowed networks
-%----------------------------------------------------------------------	
-memberNetwork(Networks,UserNetwork,IfTrue,IfFalse)->
-    case memberNetwork(Networks,UserNetwork) of
-	true->
-	    IfTrue;
-	false->
-	    IfFalse
-    end.
-
-
-%----------------------------------------------------------------------
-%regexp match the users ip-address against the networks in the list of 
-%ipadresses or subnet addresses.
-memberNetwork(Networks,UserNetwork)->
-    case lists:filter(fun(Net)->
-			      case regexp:match(UserNetwork,
-						formatRegexp(Net)) of
-				  {match,1,_}->
-				      true;
-				  _NotSubNet ->
-				      false
-			      end
-		      end,Networks) of
-	[]->
-	    false;
-	MemberNetWork ->
-	    true
-    end.
-
-
-%----------------------------------------------------------------------
-%Creates a regexp from an ip-number i.e "127.0.0-> "^127[.]0[.]0.*"
-%"127.0.0.-> "^127[.]0[.]0[.].*"
-%----------------------------------------------------------------------
-formatRegexp(Net)->	    
-    [SubNet1|SubNets]=string:tokens(Net,"."),
-    NetRegexp=lists:foldl(fun(SubNet,Newnet)->
-				  Newnet ++ "[.]" ++SubNet
-			  end,"^"++SubNet1,SubNets),
-    case string:len(Net)-string:rchr(Net,$.) of
-	0->
-	    NetRegexp++"[.].*";
-	_->
-	    NetRegexp++".*"
-    end.
-
-
-%----------------------------------------------------------------------
-%If the user has specified if the allow or deny check shall be preformed
-%first get that order if no order is specified take 
-%allow - deny since its harder that deny - allow
-%----------------------------------------------------------------------
-getAllowDenyOrder(AccessData)->
-    case ets:lookup(AccessData,order) of
-	[{order,{deny,allow}}]->
-	    {deny,ets:lookup(AccessData,deny),
-	     allow,ets:lookup(AccessData,allow)};
-	_DefaultOrder->
-	    {allow,ets:lookup(AccessData,allow),
-	     deny,ets:lookup(AccessData,deny)}
-    end.
-                                                                      
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% The methods that validates the user                              %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------------------------------------
-%Control if there is anyu autheticating data in threquest header
-%if so it controls it against the users in the list Allowed Users
-%----------------------------------------------------------------------
-authenticateUser(Info,AccessData,AllowedUsers)->
-    case getAuthenticatingDataFromHeader(Info) of
-	{user,User,PassWord}->
-	    authenticateUser(Info,AccessData,AllowedUsers,
-			     {user,User,PassWord});
-	{error,nouser}->
-	    challenge; 
-	{error,BadData}->
-	    challenge 
-    end.
-
-
-%----------------------------------------------------------------------
-%Returns the Autheticating data in the http-request
-%----------------------------------------------------------------------
-getAuthenticatingDataFromHeader(Info)->              
-    PrsedHeader=Info#mod.parsed_header,
-    case httpd_util:key1search(PrsedHeader,"authorization" ) of
-	undefined->
-	    {error,nouser};
-	[$B,$a,$s,$i,$c,$\ |EncodedString]->
-	    UnCodedString=httpd_util:decode_base64(EncodedString),
-	    case httpd_util:split(UnCodedString,":",2) of
-		{ok,[User,PassWord]}->
-		    {user,User,PassWord};
-		{error,Error}->
-		    {error,Error}
-	    end;
-	BadCredentials ->
-	    {error,BadCredentials}
-    end.
-
-
-%----------------------------------------------------------------------
-%Returns a list of all members of the allowed groups
-%----------------------------------------------------------------------
-getGroupMembers(Groups,AllowedGroups)->
-    Allowed=lists:foldl(fun({group,Name,Members},AllowedMembers)->
-				case lists:member(Name,AllowedGroups) of
-				    true->
-					AllowedMembers++Members;
-				    false ->
-					AllowedMembers
-				end
-	       end,[],Groups),
-    {ok,Allowed}.
-    
-authenticateUser(Info,AccessData,{{users,[]},{groups,Groups}},User)->
-    authenticateUser(Info,AccessData,{groups,Groups},User);
-authenticateUser(Info,AccessData,{{users,Users},{groups,[]}},User)->
-    authenticateUser(Info,AccessData,{users,Users},User);
-
-authenticateUser(Info,AccessData,{{users,Users},{groups,Groups}},User)->
-    AllowUser=authenticateUser(Info,AccessData,{users,Users},User),
-    AllowGroup=authenticateUser(Info,AccessData,{groups,Groups},User),
-    case {AllowGroup,AllowUser} of
-	{_,allow}->
-	    allow;
-	{allow,_}->
-	    allow;
-	{challenge,_}->
-	    challenge;
-	{_,challenge}->
-	    challenge;
-	{_deny,_deny}->
-	    deny
-    end;
-    
-
-%----------------------------------------------------------------------
-%Controls that the user is a member in one of the allowed group
-%----------------------------------------------------------------------
-authenticateUser(Info,AccessData,{groups,AllowedGroups},{user,User,PassWord})->
-    case getUsers(AccessData,group_file) of
-	{group_data,Groups}->
-	    case  getGroupMembers(Groups,AllowedGroups) of
-	       {ok,Members}->
-		    authenticateUser(Info,AccessData,{users,Members},
-				     {user,User,PassWord});
-		{error,BadData}->
-		    deny
-	    end;
-	{error,BadData}->
-	    deny
-    end;
-
-
-%----------------------------------------------------------------------
-%Control that the user is one of the allowed users and that the passwd is ok
-%----------------------------------------------------------------------
-authenticateUser(Info,AccessData,{users,AllowedUsers},{user,User,PassWord})->
-    case lists:member(User,AllowedUsers) of
-       true->
-	    %Get the usernames and passwords from the file
-	    case getUsers(AccessData,user_file) of
-		{error,BadData}->
-		    deny;
-		{user_data,Users}-> 
-		    %Users is a list of the users in
-		    %the userfile [{user,User,Passwd}]
-		    checkPassWord(Users,{user,User,PassWord})
-	    end;
-	false ->
-	    challenge
-    end.
-
-
-%----------------------------------------------------------------------
-%Control that the user User={user,"UserName","PassWd"} is
-%member of the list of Users
-%----------------------------------------------------------------------
-checkPassWord(Users,User)->
-    case lists:member(User,Users) of
-	true->
-	    allow;
-	false->
-	    challenge
-    end.
-
-
-%----------------------------------------------------------------------
-%Get the users in the specified file
-%UserOrGroup is an atom that specify if its a group file or a user file
-%i.e. group_file or user_file
-%----------------------------------------------------------------------
-getUsers({file,FileName},UserOrGroup)->
-    case file:open(FileName,[read]) of
-        {ok,AccessFileHandle} ->
-	    getUsers({stream,AccessFileHandle},[],UserOrGroup);
-        {error,Reason} ->
-	    {error,{Reason,FileName}}
-    end;
-
-
-%----------------------------------------------------------------------
-%The method that starts the lokkong for user files
-%----------------------------------------------------------------------
-
-getUsers(AccessData,UserOrGroup)->
-    case ets:lookup(AccessData,UserOrGroup) of
-	[{UserOrGroup,File}]->
-	    getUsers({file,File},UserOrGroup);
-	_ ->
-	    {error,noUsers}
-    end.
-    
-
-%----------------------------------------------------------------------
-%Reads data from the filehandle File to the list FileData and when its
-%reach the end it returns the list in a tuple {user_file|group_file,FileData}
-%----------------------------------------------------------------------
-getUsers({stream,File},FileData,UserOrGroup)->
-    case io:get_line(File,[]) of
-        eof when UserOrGroup==user_file->
-	    {user_data,FileData};
-	eof when UserOrGroup ==group_file->
-	   {group_data,FileData};
-        Line ->
-	    getUsers({stream,File},
-		     formatUser(Line,FileData,UserOrGroup),UserOrGroup)
-    end.
-
-                                                                      
-%----------------------------------------------------------------------
-%If the line is a comment remove it
-%----------------------------------------------------------------------
-formatUser([$#|UserDataComment],FileData,_UserOrgroup)->
-    FileData;
-
-
-%----------------------------------------------------------------------
-%The user name in the file is Username:Passwd\n 
-%Remove the newline sign and split the user name in  
-%UserName and Password
-%----------------------------------------------------------------------
-formatUser(UserData,FileData,UserOrGroup)->
-    case string:tokens(UserData," \r\n")of
-	[User|Whitespace] when UserOrGroup==user_file->
-	    case string:tokens(User,":") of
-		[Name,PassWord]->
-		    [{user,Name,PassWord}|FileData];
-		_Error->
-		    FileData
-	    end;
-	GroupData when UserOrGroup==group_file ->
-	    parseGroupData(GroupData,FileData);
-	_Error ->
-	    FileData
-    end.
-
-
-%----------------------------------------------------------------------
-%if everything is right GroupData is on the form
-% ["groupName:", "Member1", "Member2", "Member2"
-%----------------------------------------------------------------------
-parseGroupData([GroupName|GroupData],FileData)->
-    [{group,formatGroupName(GroupName),GroupData}|FileData].
-
-
-%----------------------------------------------------------------------
-%the line in the file is GroupName: Member1 Member2 .....MemberN
-%Remove the : from the group name
-%---------------------------------------------------------------------- 
-formatGroupName(GroupName)->
-    string:strip(GroupName,right,$:).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%%  Functions that parses the accessfiles                           %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%----------------------------------------------------------------------
-%Control that the asset is a real file and not a request for an virtual
-%asset
-%----------------------------------------------------------------------
-isErlScriptOrNotAccessibleFile(Path,Info)->
-    case file:read_file_info(Path) of
-	{ok,_fileInfo}->
-	    false;
-	{error,_Reason} ->
-	    true
-    end.
-
-
-%----------------------------------------------------------------------
-%Path=PathToTheRequestedFile=String
-%Innfo=record#mod
-%----------------------------------------------------------------------
-getHtAccessData(Path,Info)->
-    HtAccessFileNames=getHtAccessFileNames(Info),
-    case getData(Path,Info,HtAccessFileNames) of
-	{ok,public}->
-	    {ok,public};	
-	{accessData,AccessData}->
-	    {accessData,AccessData};
-	{error,Reason} ->
-	    {error,Reason}
-    end.
-
-
-%----------------------------------------------------------------------
-%returns the names of the accessfiles
-%----------------------------------------------------------------------
-getHtAccessFileNames(Info)->
-    case httpd_util:lookup(Info#mod.config_db,access_files) of
-	undefined->
-	    [".htaccess"];
-	Files->
-	    Files
-    end.
-%----------------------------------------------------------------------
-%HtAccessFileNames=["accessfileName1",..."AccessFileName2"]
-%----------------------------------------------------------------------
-getData(Path,Info,HtAccessFileNames)->	    
-    case regexp:split(Path,"/") of
-	{error,Error}->
-	    {error,Error};
-	{ok,SplittedPath}->
-	    getData2(HtAccessFileNames,SplittedPath,Info)
-	end.
-
-
-%----------------------------------------------------------------------
-%Add to together the data in the Splittedpath up to the path 
-%that is the alias or the document root
-%Since we do not need to control after any accessfiles before here
-%----------------------------------------------------------------------
-getData2(HtAccessFileNames,SplittedPath,Info)->	
-    case getRootPath(SplittedPath,Info) of
-	{error,Path}->
-	    {error,Path};
-	{ok,StartPath,RestOfSplittedPath} ->
-	    getData2(HtAccessFileNames,StartPath,RestOfSplittedPath,Info)
-    end.
-
-
-%----------------------------------------------------------------------
-%HtAccessFilenames is a list the names the accesssfiles can have
-%Path is the shortest match agains all alias and documentroot
-%rest of splitted path is a list of the parts of the path
-%Info is the mod recod from the server  
-%----------------------------------------------------------------------
-getData2(HtAccessFileNames,StartPath,RestOfSplittedPath,Info)->
-    case getHtAccessFiles(HtAccessFileNames,StartPath,RestOfSplittedPath) of
-	[]->
-	    %No accessfile qiut its a public directory
-	    {ok,public};
-	Files ->
-	    loadAccessFilesData(Files)
-    end.
-
-
-%----------------------------------------------------------------------
-%Loads the data in the accessFiles specifiied by 
-% AccessFiles=["/hoem/public/html/accefile",
-%               "/home/public/html/priv/accessfile"]
-%----------------------------------------------------------------------
-loadAccessFilesData(AccessFiles)->
-    loadAccessFilesData(AccessFiles,ets:new(accessData,[])).
-
-
-%----------------------------------------------------------------------
-%Returns the found data
-%----------------------------------------------------------------------
-contextToValues(AccessData)->
-    case ets:lookup(AccessData,context) of
-	[{context,Values}]->
-	    ets:delete(AccessData,context),
-	    insertContext(AccessData,Values),
-	    {accessData,AccessData};
-	_Error->
-	    {error,errorInAccessFile}
-    end.
-
-
-insertContext(AccessData,[])->
-    ok;
-
-insertContext(AccessData,[{allow,From}|Values])->
-    insertDenyAllowContext(AccessData,{allow,From}),
-    insertContext(AccessData,Values);
-   
-insertContext(AccessData,[{deny,From}|Values])->
-    insertDenyAllowContext(AccessData,{deny,From}),
-    insertContext(AccessData,Values);
-
-insertContext(AccessData,[{require,{GrpOrUsr,Members}}|Values])->    
-    case ets:lookup(AccessData,require) of
-	[]when GrpOrUsr==users->
-	    ets:insert(AccessData,{require,{{users,Members},{groups,[]}}});
-
-	[{require,{{users,Users},{groups,Groups}}}]when GrpOrUsr==users ->
-	    ets:insert(AccessData,{require,{{users,Users++Members},
-					   {groups,Groups}}});
-	[]when GrpOrUsr==groups->
-	    ets:insert(AccessData,{require,{{users,[]},{groups,Members}}});
-
-	[{require,{{users,Users},{groups,Groups}}}]when GrpOrUsr==groups ->
-	    ets:insert(AccessData,{require,{{users,Users},
-					   {groups,Groups++Members}}})    
-    end,
-    insertContext(AccessData,Values);
-
-	
-
-%%limit and order directive need no transforming they areis just to insert
-insertContext(AccessData,[Elem|Values])->   
-    ets:insert(AccessData,Elem),
-    insertContext(AccessData,Values).
-    
-
-insertDenyAllowContext(AccessData,{AllowDeny,From})->
-    case From of
-	all->
-	    ets:insert(AccessData,{AllowDeny,all});
-	AllowedSubnets->
-	    case ets:lookup(AccessData,AllowDeny) of
-		[]->
-		    ets:insert(AccessData,{AllowDeny,From});
-		[{AllowDeny,all}]->
-		    ok;
-		[{AllowDeny,Networks}]->
-		    ets:insert(AccessData,{allow,Networks++From})
-	    end
-    end.
-
-loadAccessFilesData([],AccessData)->
-    %preform context to limits
-    contextToValues(AccessData),
-    {accessData,AccessData};
-
-%----------------------------------------------------------------------
-%Takes each file in the list and load the data to the ets table 
-%AccessData
-%----------------------------------------------------------------------
-loadAccessFilesData([FileName|FileNames],AccessData)->
-    case loadAccessFileData({file,FileName},AccessData) of
-	overRide->
-	    loadAccessFilesData(FileNames,AccessData);
-	noOverRide ->
-	    {accessData,AccessData};
-	error->
-	    ets:delete(AccessData),
-	    {error,errorInAccessFile}
-    end.
-
-%----------------------------------------------------------------------
-%opens the filehandle to the specified file
-%----------------------------------------------------------------------
-loadAccessFileData({file,FileName},AccessData)->
-    case file:open(FileName,[read]) of
-        {ok,AccessFileHandle}->
-	    loadAccessFileData({stream,AccessFileHandle},AccessData,[]);
-        {error,Reason} ->
-	    overRide
-    end.
-
-%----------------------------------------------------------------------
-%%look att each line in the file and add them to the database
-%%When end of file is reached control i overrride is allowed
-%% if so return 
-%----------------------------------------------------------------------
-loadAccessFileData({stream,File},AccessData,FileData)->
-    case io:get_line(File,[]) of
-        eof->
-	    insertData(AccessData,FileData),
-	    case ets:match_object(AccessData,{'_',error}) of
-		[]->
-		    %Case we got no error control that we can override a
-		    %at least some of the values
-		    case ets:match_object(AccessData,
-					  {allow_over_ride,none}) of
-			[]->
-			    overRide;
-			_NoOverride->
-			    noOverRide
-		    end;
-		Errors->
-		    error
-	    end;
-	Line ->
-	    loadAccessFileData({stream,File},AccessData,
-			       insertLine(string:strip(Line,left),FileData))
-    end.
-
-%----------------------------------------------------------------------
-%AccessData is a ets table where the previous found data is inserted
-%FileData is a list of the directives in the last parsed file
-%before insertion a control is done that the directive is allowed to
-%override
-%----------------------------------------------------------------------
-insertData(AccessData,{{context,Values},FileData})->
-    insertData(AccessData,[{context,Values}|FileData]);
-
-insertData(AccessData,FileData)->
-    case ets:lookup(AccessData,allow_over_ride) of
-	[{allow_over_ride,all}]->
-	    lists:foreach(fun(Elem)->
-				  ets:insert(AccessData,Elem)
-			  end,FileData);
-	[]->
-	    lists:foreach(fun(Elem)->
-				  ets:insert(AccessData,Elem)
-			  end,FileData);
-	[{allow_over_ride,Directives}]when list(Directives)->
-	    lists:foreach(fun({Key,Value})->
-				  case lists:member(Key,Directives) of
-				      true->
-					  ok;
-				      false ->
-					  ets:insert(AccessData,{Key,Value})
-				  end
-			  end,FileData);
-	[{allow_over_ride,_}]->
-	    %Will never appear if the user 
-	    %aint doing very strang econfig files
-	    ok
-    end.
-%----------------------------------------------------------------------
-%Take a line in the accessfile and transform it into a tuple that 
-%later can be inserted in to the ets:table				
-%----------------------------------------------------------------------      
-%%%Here is the alternatives that resides inside the limit context
-
-insertLine([$o,$r,$d,$e,$r|Order],{{context,Values},FileData})->
-    {{context,[{order,getOrder(Order)}|Values]},FileData};
-%%Let the user place a tab in the beginning
-insertLine([$\t,$o,$r,$d,$e,$r|Order],{{context,Values},FileData})->
-    {{context,[{order,getOrder(Order)}|Values]},FileData};
-
-insertLine([$a,$l,$l,$o,$w|Allow],{{context,Values},FileData})->
-    {{context,[{allow,getAllowDenyData(Allow)}|Values]},FileData};
-insertLine([$\t,$a,$l,$l,$o,$w|Allow],{{context,Values},FileData})->
-    {{context,[{allow,getAllowDenyData(Allow)}|Values]},FileData};
-
-insertLine([$d,$e,$n,$y|Deny],{{context,Values},FileData})->
-    {{context,[{deny,getAllowDenyData(Deny)}|Values]},FileData};
-insertLine([$\t,$d,$e,$n,$y|Deny],{{context,Values},FileData})->
-    {{context,[{deny,getAllowDenyData(Deny)}|Values]},FileData};
-
-
-insertLine([$r,$e,$q,$u,$i,$r,$e|Require],{{context,Values},FileData})->
-    {{context,[{require,getRequireData(Require)}|Values]},FileData};
-insertLine([$\t,$r,$e,$q,$u,$i,$r,$e|Require],{{context,Values},FileData})->
-    {{context,[{require,getRequireData(Require)}|Values]},FileData};
-
-
-insertLine([$<,$/,$L,$i,$m,$i,$t|EndLimit],{Context,FileData})->
-    [Context|FileData];
-
-insertLine([$<,$L,$i,$m,$i,$t|Limit],FileData)->
-    {{context,[{limit,getLimits(Limit)}]}, FileData};
-
-
-
-insertLine([$A,$u,$t,$h,$U,$s,$e,$r,$F,$i,$l,$e,$\ |AuthUserFile],FileData)->
-    [{user_file,string:strip(AuthUserFile,right,$\n)}|FileData];
-
-insertLine([$A,$u,$t,$h,$G,$r,$o,$u,$p,$F,$i,$l,$e,$\ |AuthGroupFile],
-	   FileData)->
-    [{group_file,string:strip(AuthGroupFile,right,$\n)}|FileData];
-
-insertLine([$A,$l,$l,$o,$w,$O,$v,$e,$r,$R,$i,$d,$e|AllowOverRide],FileData)->
-    [{allow_over_ride,getAllowOverRideData(AllowOverRide)}
-     |FileData];
-
-insertLine([$A,$u,$t,$h,$N,$a,$m,$e,$\ |AuthName],FileData)->
-    [{auth_name,string:strip(AuthName,right,$\n)}|FileData];
-
-insertLine([$A,$u,$t,$h,$T,$y,$p,$e|AuthType],FileData)->
-    [{auth_type,getAuthorizationType(AuthType)}|FileData];
-
-insertLine(_BadDirectiveOrComment,FileData)->
-    FileData.
-
-%----------------------------------------------------------------------
-%transform the Data specified about override to a form that is ieasier 
-%handled later
-%Override data="all"|"md5"|"Directive1 .... DirectioveN"
-%----------------------------------------------------------------------
-
-getAllowOverRideData(OverRideData)->
-   case string:tokens(OverRideData," \r\n") of
-       [[$a,$l,$l]|_]->
-	   all;
-        [[$n,$o,$n,$e]|_]->
-	   none;
-       Directives ->
-	   getOverRideDirectives(Directives)
-   end.
-
-getOverRideDirectives(Directives)->
-    lists:map(fun(Directive)->
-		      transformDirective(Directive)
-	      end,Directives).
-transformDirective([$A,$u,$t,$h,$U,$s,$e,$r,$F,$i,$l,$e|_])->
-    user_file;
-transformDirective([$A,$u,$t,$h,$G,$r,$o,$u,$p,$F,$i,$l,$e|_]) ->
-    group_file;
-transformDirective([$A,$u,$t,$h,$N,$a,$m,$e|_])->
-    auth_name;
-transformDirective([$A,$u,$t,$h,$T,$y,$p,$e|_])-> 
-    auth_type;
-transformDirective(_UnAllowedOverRideDirective) ->
-    unallowed.
-%----------------------------------------------------------------------
-%Replace the string that specify which method to use for authentication
-%and replace it with the atom for easier mathing
-%----------------------------------------------------------------------   
-getAuthorizationType(AuthType)->
-    [Arg|Crap]=string:tokens(AuthType,"\n\r\ "),
-    case Arg of
-	[$B,$a,$s,$i,$c]->
-	    basic;
-	[$M,$D,$5] ->
-	    md5;
-	_What ->
-	    error
-    end.
-%----------------------------------------------------------------------
-%Returns a list of the specified methods to limit or the atom all
-%----------------------------------------------------------------------
-getLimits(Limits)->
-    case regexp:split(Limits,">")of
-	{ok,[_NoEndOnLimit]}->
-	    error;
-	{ok,[Methods|Crap]}->
-	    case regexp:split(Methods," ")of
-		{ok,[]}->
-		    all;
-		{ok,SplittedMethods}->
-		    SplittedMethods;
-		{error,Error}->
-		    error
-	    end;
-	{error,_Error}->
-	    error
-    end.
-
-
-%----------------------------------------------------------------------
-% Transform the order to prefrom deny allow control to a tuple of atoms
-%----------------------------------------------------------------------
-getOrder(Order)->
-    [First|Rest]=lists:map(fun(Part)->
-		      list_to_atom(Part)
-	      end,string:tokens(Order," \n\r")),
-    case First of
-	deny->
-	    {deny,allow};
-	allow->
-	    {allow,deny};
-	_Error->
-	    error
-    end.
-
-%----------------------------------------------------------------------
-% The string AllowDeny is "from all" or "from Subnet1 Subnet2...SubnetN"
-%----------------------------------------------------------------------
-getAllowDenyData(AllowDeny)->
-    case string:tokens(AllowDeny," \n\r") of
-	[_From|AllowDenyData] when length(AllowDenyData)>=1->
-	    case lists:nth(1,AllowDenyData) of
-		[$a,$l,$l]->
-		    all;
-		Hosts->
-		    AllowDenyData
-	    end;
-	Error->
-	    errror
-    end.
-%----------------------------------------------------------------------
-% Fix the string that describes who is allowed to se the page
-%----------------------------------------------------------------------
-getRequireData(Require)->
-    [UserOrGroup|UserData]=string:tokens(Require," \n\r"),
-    case UserOrGroup of
-	[$u,$s,$e,$r]->
-	    {users,UserData};
-	[$g,$r,$o,$u,$p] ->
-	    {groups,UserData};
-	_Whatever ->
-	    error
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% Methods that collects the searchways to the accessfiles          %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------------------------------------
-% Get the whole path to the different accessfiles
-%----------------------------------------------------------------------	
-getHtAccessFiles(HtAccessFileNames,Path,RestOfSplittedPath)->
-    getHtAccessFiles(HtAccessFileNames,Path,RestOfSplittedPath,[]).
-
-getHtAccessFiles(HtAccessFileNames,Path,[[]],HtAccessFiles)->
-    HtAccessFiles ++ accessFilesOfPath(HtAccessFileNames,Path++"/");   
-    
-getHtAccessFiles(HtAccessFileNames,Path,[],HtAccessFiles)->
-    HtAccessFiles;
-getHtAccessFiles(HtAccessFileNames,Path,[NextDir|RestOfSplittedPath],
-		 AccessFiles)->   
-    getHtAccessFiles(HtAccessFileNames,Path++"/"++NextDir,RestOfSplittedPath,
-		     AccessFiles ++ 
-		     accessFilesOfPath(HtAccessFileNames,Path++"/")).   
-    
-
-%----------------------------------------------------------------------
-%Control if therer are any accessfies in the path
-%----------------------------------------------------------------------
-accessFilesOfPath(HtAccessFileNames,Path)->
-    lists:foldl(fun(HtAccessFileName,Files)->
-			case file:read_file_info(Path++HtAccessFileName) of
-			    {ok,FileInfo}->
-				[Path++HtAccessFileName|Files];
-			    {error,_Error} ->
-				Files
-			end
-		end,[],HtAccessFileNames).
-
-
-%----------------------------------------------------------------------
-%Sake the splitted path and joins it up to the documentroot or the alias
-%that match first
-%----------------------------------------------------------------------
-
-getRootPath(SplittedPath,Info)->
-    DocRoot=httpd_util:lookup(Info#mod.config_db,document_root,"/"),
-    PresumtiveRootPath=
-	[DocRoot|lists:map(fun({Alias,RealPath})->
-				   RealPath
-			   end,
-		 httpd_util:multi_lookup(Info#mod.config_db,alias))],
-    getRootPath(PresumtiveRootPath,SplittedPath,Info).
-
-
-getRootPath(PresumtiveRootPath,[[],Splittedpath],Info)->
-    getRootPath(PresumtiveRootPath,["/",Splittedpath],Info);
-
- 
-getRootPath(PresumtiveRootPath,[Part,NextPart|SplittedPath],Info)->
-    case lists:member(Part,PresumtiveRootPath)of
-	true->
-	    {ok,Part,[NextPart|SplittedPath]};
-	false ->
-	    getRootPath(PresumtiveRootPath,
-			[Part++"/"++NextPart|SplittedPath],Info)
-    end;
-
-getRootPath(PresumtiveRootPath,[Part],Info)->
-    case lists:member(Part,PresumtiveRootPath)of
-	true->
-	    {ok,Part,[]};
-	false ->
-	    {error,Part}
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%Debug methods                                                     %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%      
-%----------------------------------------------------------------------
-% Simulate the webserver by calling do/1 with apropiate parameters
-%----------------------------------------------------------------------
-debug()->
-    Conf=getConfigData(),
-    Uri=getUri(),
-    {_Proceed,Data}=getDataFromAlias(Conf,Uri),
-    Init_data=#init_data{peername={socket,"127.0.0.1"}},
-    ParsedHeader=headerparts(),
-    do(#mod{init_data=Init_data,
-	    data=Data,
-	    config_db=Conf,
-	    request_uri=Uri,
-	    parsed_header=ParsedHeader,
-	   method="GET"}).
-	    
-%----------------------------------------------------------------------
-%Add authenticate data to the fake http-request header
-%----------------------------------------------------------------------
-headerparts()->
-    [{"authorization","Basic " ++ httpd_util:encode_base64("lotta:potta")}].
-
-getDataFromAlias(Conf,Uri)->
-    mod_alias:do(#mod{config_db=Conf,request_uri=Uri}).
-
-getUri()->
-    "/appmon/test/test.html".
-
-getConfigData()->
-    Tab=ets:new(test_inets,[bag,public]),
-    ets:insert(Tab,{server_name,"localhost"}),
-    ets:insert(Tab,{bind_addresss,{127,0,0,1}}),
-    ets:insert(Tab,{erl_script_alias,{"/webcover/erl",["webcover"]}}),
-    ets:insert(Tab,{erl_script_alias,{"/erl",["webappmon"]}}),
-    ets:insert(Tab,{com_type,ip_comm}),
-    ets:insert(Tab,{modules,[mod_alias,mod_auth,mod_header]}),
-    ets:insert(Tab,{default_type,"text/plain"}),
-    ets:insert(Tab,{server_root,
-		    "/home/gandalf/marting/exjobb/webtool-1.0/priv/root"}),
-    ets:insert(Tab,{port,8888}),
-    ets:insert(Tab,{document_root,
-		    "/home/gandalf/marting/exjobb/webtool-1.0/priv/root"}),
-    ets:insert(Tab,
-	       {alias,
-		{"/appmon"
-		 ,"/home/gandalf/marting/exjobb/webappmon-1.0/priv"}}),
-    ets:insert(Tab,{alias,
-		    {"/webcover"
-		     ,"/home/gandalf/marting/exjobb/webcover-1.0/priv"}}),
-    ets:insert(Tab,{access_file,[".htaccess","kalle","pelle"]}),
-    Tab.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_include.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_include.erl
deleted file mode 100644
index c93e0a4f59..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_include.erl
+++ /dev/null
@@ -1,726 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_include.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_include).
--export([do/1,parse/2,config/6,include/6,echo/6,fsize/6,flastmod/6,exec/6]).
-
--include("httpd.hrl").
-
--define(VMODULE,"INCLUDE").
--include("httpd_verbosity.hrl").
-
-%% do
-
-do(Info) ->
-    ?vtrace("do",[]),
-    case Info#mod.method of
-	"GET" ->
-	    case httpd_util:key1search(Info#mod.data,status) of
-		%% A status code has been generated!
-		{StatusCode,PhraseArgs,Reason} ->
-		    {proceed,Info#mod.data};
-		%% No status code has been generated!
-		undefined ->
-		    case httpd_util:key1search(Info#mod.data, response) of
-			%% No response has been generated!
-			undefined ->
-			    do_include(Info);
-			%% A response has been generated or sent!
-			Response ->
-			    {proceed,Info#mod.data}
-		    end
-	    end;
-	%% Not a GET method!
-	_ ->
-	    {proceed,Info#mod.data}
-    end.
-
-do_include(Info) ->
-    ?vtrace("do_include -> entry with"
-	    "~n   URI: ~p",[Info#mod.request_uri]),
-    Path = mod_alias:path(Info#mod.data,Info#mod.config_db,
-			  Info#mod.request_uri),
-    Suffix = httpd_util:suffix(Path),
-    case httpd_util:lookup_mime_default(Info#mod.config_db,Suffix) of
-	"text/x-server-parsed-html" ->
-	    HeaderStart = 
-		httpd_util:header(200, "text/html", Info#mod.connection),
-	    ?vtrace("do_include -> send ~p", [Path]),
-	    case send_in(Info,Path,HeaderStart,file:read_file_info(Path)) of
-		{ok, ErrorLog, Size} ->
-		    ?vtrace("do_include -> sent ~w bytes", [Size]),
-		    {proceed,[{response,{already_sent,200,Size}},
-			      {mime_type,"text/html"}|
-			      lists:append(ErrorLog,Info#mod.data)]};
-		{error, Reason} ->
-		    ?vlog("send in failed:"
-			  "~n   Reason: ~p"
-			  "~n   Path:   ~p"
-			  "~n   Info:   ~p",
-			  [Reason,Info,Path]),
-		    {proceed,
-		     [{status,send_error(Reason,Info,Path)}|Info#mod.data]}
-	    end;
-	_ -> %% Unknown mime type, ignore
-	    {proceed,Info#mod.data}
-    end.
-
-
-%%
-%% config directive
-%%
-
-config(Info, Context, ErrorLog, TagList, ValueList, R) ->
-    case verify_tags("config",[errmsg,timefmt,sizefmt],
-		     TagList,ValueList) of
-	ok ->
-	    {ok,update_context(TagList,ValueList,Context),ErrorLog,"",R};
-	{error,Reason} ->
-	    {ok,Context,[{internal_info,Reason}|ErrorLog],
-	     httpd_util:key1search(Context,errmsg,""),R}
-    end.
-
-update_context([],[],Context) ->
-    Context;
-update_context([Tag|R1],[Value|R2],Context) ->
-    update_context(R1,R2,[{Tag,Value}|Context]).
-
-verify_tags(Command,ValidTags,TagList,ValueList) when length(TagList)==length(ValueList) ->
-    verify_tags(Command,ValidTags,TagList);
-verify_tags(Command,ValidTags,TagList,ValueList) ->
-    {error,?NICE(Command++" directive has spurious tags")}.
-
-verify_tags(Command, ValidTags, []) ->
-    ok;
-verify_tags(Command, ValidTags, [Tag|Rest]) ->
-    case lists:member(Tag, ValidTags) of
-	true ->
-	    verify_tags(Command, ValidTags, Rest);
-	false ->
-	    {error,?NICE(Command++" directive has a spurious tag ("++
-			 atom_to_list(Tag)++")")}
-    end.
-
-%%
-%% include directive
-%%
-
-include(Info,Context,ErrorLog,[virtual],[VirtualPath],R) ->
-    Aliases = httpd_util:multi_lookup(Info#mod.config_db,alias),
-    {_, Path, _AfterPath} =
-	mod_alias:real_name(Info#mod.config_db, VirtualPath, Aliases),
-    include(Info,Context,ErrorLog,R,Path);
-include(Info, Context, ErrorLog, [file], [FileName], R) ->
-    Path = file(Info#mod.config_db, Info#mod.request_uri, FileName),
-    include(Info, Context, ErrorLog, R, Path);
-include(Info, Context, ErrorLog, TagList, ValueList, R) ->
-    {ok, Context,
-     [{internal_info,?NICE("include directive has a spurious tag")}|
-      ErrorLog], httpd_util:key1search(Context, errmsg, ""), R}.
-
-include(Info, Context, ErrorLog, R, Path) ->
-    ?DEBUG("include -> read file: ~p",[Path]),
-    case file:read_file(Path) of
-	{ok, Body} ->
-	    ?DEBUG("include -> size(Body): ~p",[size(Body)]),
-	    {ok, NewContext, NewErrorLog, Result} =
-		parse(Info, binary_to_list(Body), Context, ErrorLog, []),
-	    {ok, Context, NewErrorLog, Result, R};
-	{error, Reason} ->
-	    {ok, Context, 
-	     [{internal_info, ?NICE("Can't open "++Path)}|ErrorLog],
-	     httpd_util:key1search(Context, errmsg, ""), R}
-    end.
-
-file(ConfigDB, RequestURI, FileName) ->
-    Aliases = httpd_util:multi_lookup(ConfigDB, alias),
-    {_, Path, _AfterPath}
-	= mod_alias:real_name(ConfigDB, RequestURI, Aliases),
-    Pwd = filename:dirname(Path),
-    filename:join(Pwd, FileName).
-
-%%
-%% echo directive
-%%
-
-echo(Info,Context,ErrorLog,[var],["DOCUMENT_NAME"],R) ->
-    {ok,Context,ErrorLog,document_name(Info#mod.data,Info#mod.config_db,
-				       Info#mod.request_uri),R};
-echo(Info,Context,ErrorLog,[var],["DOCUMENT_URI"],R) ->
-    {ok,Context,ErrorLog,document_uri(Info#mod.config_db,
-				      Info#mod.request_uri),R};
-echo(Info,Context,ErrorLog,[var],["QUERY_STRING_UNESCAPED"],R) ->
-    {ok,Context,ErrorLog,query_string_unescaped(Info#mod.request_uri),R};
-echo(Info,Context,ErrorLog,[var],["DATE_LOCAL"],R) ->
-    {ok,Context,ErrorLog,date_local(),R};
-echo(Info,Context,ErrorLog,[var],["DATE_GMT"],R) ->
-    {ok,Context,ErrorLog,date_gmt(),R};
-echo(Info,Context,ErrorLog,[var],["LAST_MODIFIED"],R) ->
-    {ok,Context,ErrorLog,last_modified(Info#mod.data,Info#mod.config_db,
-				       Info#mod.request_uri),R};
-echo(Info,Context,ErrorLog,TagList,ValueList,R) ->
-    {ok,Context,
-     [{internal_info,?NICE("echo directive has a spurious tag")}|
-      ErrorLog],"(none)",R}.
-
-document_name(Data,ConfigDB,RequestURI) ->
-    Path = mod_alias:path(Data,ConfigDB,RequestURI),
-    case regexp:match(Path,"[^/]*\$") of
-	{match,Start,Length} ->
-	    string:substr(Path,Start,Length);
-	nomatch ->
-	    "(none)"
-    end.
-
-document_uri(ConfigDB, RequestURI) ->
-    Aliases = httpd_util:multi_lookup(ConfigDB, alias),
-    {Path, AfterPath} = 
-	case mod_alias:real_name(ConfigDB, RequestURI, Aliases) of
-	    {_, Name, {[], []}} ->
-		{Name, ""};
-	    {_, Name, {PathInfo, []}} ->
-		{Name, "/"++PathInfo};
-	    {_, Name, {PathInfo, QueryString}} ->
-		{Name, "/"++PathInfo++"?"++QueryString};
-	    {_, Name, _} ->
-		{Name, ""};
-	    Gurka ->
-		io:format("Gurka: ~p~n", [Gurka])
-	end,
-    VirtualPath = string:substr(RequestURI, 1, 
-				length(RequestURI)-length(AfterPath)),
-    {match, Start, Length} = regexp:match(Path,"[^/]*\$"),
-    FileName = string:substr(Path,Start,Length),
-    case regexp:match(VirtualPath, FileName++"\$") of
-	{match, _, _} ->
-	    httpd_util:decode_hex(VirtualPath)++AfterPath;
-	nomatch ->
-	    string:strip(httpd_util:decode_hex(VirtualPath),right,$/)++
-		"/"++FileName++AfterPath
-    end.
-
-query_string_unescaped(RequestURI) ->
-  case regexp:match(RequestURI,"[\?].*\$") of
-    {match,Start,Length} ->
-      %% Escape all shell-special variables with \
-      escape(string:substr(RequestURI,Start+1,Length-1));      
-    nomatch ->
-      "(none)"
-  end.
-
-escape([]) -> [];
-escape([$;|R]) -> [$\\,$;|escape(R)];
-escape([$&|R]) -> [$\\,$&|escape(R)];
-escape([$(|R]) -> [$\\,$(|escape(R)];
-escape([$)|R]) -> [$\\,$)|escape(R)];
-escape([$||R]) -> [$\\,$||escape(R)];
-escape([$^|R]) -> [$\\,$^|escape(R)];
-escape([$<|R]) -> [$\\,$<|escape(R)];
-escape([$>|R]) -> [$\\,$>|escape(R)];
-escape([$\n|R]) -> [$\\,$\n|escape(R)];
-escape([$ |R]) -> [$\\,$ |escape(R)];
-escape([$\t|R]) -> [$\\,$\t|escape(R)];
-escape([C|R]) -> [C|escape(R)].
-
-date_local() ->
-  {{Year,Month,Day},{Hour,Minute,Second}}=calendar:local_time(),
-  %% Time format hard-wired to: "%a %b %e %T %Y" according to strftime(3)
-  io_lib:format("~s ~s ~2w ~2.2.0w:~2.2.0w:~2.2.0w ~w",
-		[httpd_util:day(calendar:day_of_the_week(Year,Month,Day)),
-		 httpd_util:month(Month),Day,Hour,Minute,Second,Year]).
-
-date_gmt() ->
-  {{Year,Month,Day},{Hour,Minute,Second}}=calendar:universal_time(),
-  %% Time format hard-wired to: "%a %b %e %T %Z %Y" according to strftime(3)
-  io_lib:format("~s ~s ~2w ~2.2.0w:~2.2.0w:~2.2.0w GMT ~w",
-		[httpd_util:day(calendar:day_of_the_week(Year,Month,Day)),
-		 httpd_util:month(Month),Day,Hour,Minute,Second,Year]).
-
-last_modified(Data,ConfigDB,RequestURI) ->
-  {ok,FileInfo}=file:read_file_info(mod_alias:path(Data,ConfigDB,RequestURI)),
-  {{Year,Month,Day},{Hour,Minute,Second}}=FileInfo#file_info.mtime,
-  io_lib:format("~s ~s ~2w ~2.2.0w:~2.2.0w:~2.2.0w ~w",
-		[httpd_util:day(calendar:day_of_the_week(Year,Month,Day)),
-		 httpd_util:month(Month),Day,Hour,Minute,Second,Year]).
-
-%%
-%% fsize directive
-%%
-
-fsize(Info,Context,ErrorLog,[virtual],[VirtualPath],R) ->
-  Aliases=httpd_util:multi_lookup(Info#mod.config_db,alias),
-  {_,Path,AfterPath}=
-    mod_alias:real_name(Info#mod.config_db,VirtualPath,Aliases),
-  fsize(Info, Context, ErrorLog, R, Path);
-fsize(Info,Context,ErrorLog,[file],[FileName],R) ->
-  Path=file(Info#mod.config_db,Info#mod.request_uri,FileName),
-  fsize(Info,Context,ErrorLog,R,Path);
-fsize(Info,Context,ErrorLog,TagList,ValueList,R) ->
-  {ok,Context,[{internal_info,?NICE("fsize directive has a spurious tag")}|
-	       ErrorLog],httpd_util:key1search(Context,errmsg,""),R}.
-
-fsize(Info,Context,ErrorLog,R,Path) ->
-    case file:read_file_info(Path) of
-	{ok,FileInfo} ->
-	    case httpd_util:key1search(Context,sizefmt) of
-		"bytes" ->
-		    {ok,Context,ErrorLog,
-		     integer_to_list(FileInfo#file_info.size),R};
-		"abbrev" ->
-		    Size = integer_to_list(trunc(FileInfo#file_info.size/1024+1))++"k",
-		    {ok,Context,ErrorLog,Size,R};
-		Value->
-		    {ok,Context,
-		     [{internal_info,
-		       ?NICE("fsize directive has a spurious tag value ("++
-			     Value++")")}|
-		      ErrorLog],
-		     httpd_util:key1search(Context, errmsg, ""), R}
-	    end;
-	{error,Reason} ->
-	    {ok,Context,[{internal_info,?NICE("Can't open "++Path)}|ErrorLog],
-	     httpd_util:key1search(Context,errmsg,""),R}
-    end.
-
-%%
-%% flastmod directive
-%%
-
-flastmod(Info, Context, ErrorLog, [virtual], [VirtualPath],R) ->
-    Aliases=httpd_util:multi_lookup(Info#mod.config_db,alias),
-    {_,Path,AfterPath}=
-	mod_alias:real_name(Info#mod.config_db,VirtualPath,Aliases),
-    flastmod(Info,Context,ErrorLog,R,Path);
-flastmod(Info, Context, ErrorLog, [file], [FileName], R) ->
-    Path = file(Info#mod.config_db, Info#mod.request_uri, FileName),
-    flastmod(Info, Context, ErrorLog, R, Path);
-flastmod(Info,Context,ErrorLog,TagList,ValueList,R) ->
-    {ok,Context,[{internal_info,?NICE("flastmod directive has a spurious tag")}|
-		 ErrorLog],httpd_util:key1search(Context,errmsg,""),R}.
-
-flastmod(Info,Context,ErrorLog,R,File) ->
-    case file:read_file_info(File) of
-	{ok,FileInfo} ->
-	    {{Yr,Mon,Day},{Hour,Minute,Second}}=FileInfo#file_info.mtime,
-	    Result=
-		io_lib:format("~s ~s ~2w ~w:~w:~w ~w",
-			      [httpd_util:day(
-				 calendar:day_of_the_week(Yr,Mon, Day)),
-			       httpd_util:month(Mon),Day,Hour,Minute,Second, Yr]),
-	    {ok,Context,ErrorLog,Result,R};
-	{error,Reason} ->
-	    {ok,Context,[{internal_info,?NICE("Can't open "++File)}|ErrorLog],
-	     httpd_util:key1search(Context,errmsg,""),R}
-    end.
-
-%%
-%% exec directive
-%%
-
-exec(Info,Context,ErrorLog,[cmd],[Command],R) ->
-    ?vtrace("exec cmd:~n   Command: ~p",[Command]),
-    cmd(Info,Context,ErrorLog,R,Command);
-exec(Info,Context,ErrorLog,[cgi],[RequestURI],R) ->
-    ?vtrace("exec cgi:~n   RequestURI: ~p",[RequestURI]),
-    cgi(Info,Context,ErrorLog,R,RequestURI);
-exec(Info,Context,ErrorLog,TagList,ValueList,R) ->
-    ?vtrace("exec with spurious tag:"
-	    "~n   TagList:   ~p"
-	    "~n   ValueList: ~p",
-	    [TagList,ValueList]),
-    {ok, Context,
-     [{internal_info,?NICE("exec directive has a spurious tag")}|
-      ErrorLog], httpd_util:key1search(Context,errmsg,""),R}.
-
-%% cmd
-
-cmd(Info, Context, ErrorLog, R, Command) ->
-    process_flag(trap_exit,true),    
-    Env  = env(Info),
-    Dir  = filename:dirname(Command),
-    Port = (catch open_port({spawn,Command},[stream,{cd,Dir},{env,Env}])),
-    case Port of
-	P when port(P) ->
-	    {NewErrorLog, Result} = proxy(Port, ErrorLog),
-	    {ok, Context, NewErrorLog, Result, R};
-	{'EXIT', Reason} ->
-	    ?vlog("open port failed: exit"
-		  "~n   URI:    ~p"
-		  "~n   Reason: ~p",
-		  [Info#mod.request_uri,Reason]),
-	    exit({open_port_failed,Reason,
-		  [{uri,Info#mod.request_uri},{script,Command},
-		   {env,Env},{dir,Dir}]});
-	O ->
-	    ?vlog("open port failed: unknown result"
-		  "~n   URI: ~p"
-		  "~n   O:   ~p",
-		  [Info#mod.request_uri,O]),
-	    exit({open_port_failed,O,
-		  [{uri,Info#mod.request_uri},{script,Command},
-		   {env,Env},{dir,Dir}]})
-    end.
-
-env(Info) ->
-    [{"DOCUMENT_NAME",document_name(Info#mod.data,Info#mod.config_db,
-				    Info#mod.request_uri)},
-     {"DOCUMENT_URI", document_uri(Info#mod.config_db, Info#mod.request_uri)},
-     {"QUERY_STRING_UNESCAPED", query_string_unescaped(Info#mod.request_uri)},
-     {"DATE_LOCAL", date_local()},
-     {"DATE_GMT", date_gmt()},
-     {"LAST_MODIFIED", last_modified(Info#mod.data, Info#mod.config_db,
-				     Info#mod.request_uri)}
-    ].
-
-%% cgi
-
-cgi(Info, Context, ErrorLog, R, RequestURI) ->
-    ScriptAliases = httpd_util:multi_lookup(Info#mod.config_db, script_alias),
-    case mod_alias:real_script_name(Info#mod.config_db, RequestURI,
-				    ScriptAliases) of
-	{Script, AfterScript} ->
-	    exec_script(Info,Script,AfterScript,ErrorLog,Context,R);
-	not_a_script ->
-	    {ok, Context,
-	     [{internal_info, ?NICE(RequestURI++" is not a script")}|
-	      ErrorLog], httpd_util:key1search(Context, errmsg, ""),R}
-    end.
-
-remove_header([]) ->
-    [];
-remove_header([$\n,$\n|Rest]) ->
-    Rest;
-remove_header([C|Rest]) ->
-    remove_header(Rest).
-
-
-exec_script(Info,Script,AfterScript,ErrorLog,Context,R) ->
-    process_flag(trap_exit,true),    
-    Aliases = httpd_util:multi_lookup(Info#mod.config_db, alias),
-    {_, Path, AfterPath} = mod_alias:real_name(Info#mod.config_db,
-					       Info#mod.request_uri,
-					       Aliases),
-    Env  = env(Info)++mod_cgi:env(Info, Path, AfterPath),
-    Dir  = filename:dirname(Path),
-    Port = (catch open_port({spawn,Script},[stream,{env, Env},{cd, Dir}])),
-    case Port of
-	P when port(P) ->
-	    %% Send entity body to port.
-	    Res = case Info#mod.entity_body of
-		      [] ->
-			  true;
-		      EntityBody ->
-			  (catch port_command(Port,EntityBody))
-		  end,
-	    case Res of
-		{'EXIT', Reason} ->
-		    ?vlog("port send failed:"
-			  "~n   Port:   ~p"
-			  "~n   URI:    ~p"
-			  "~n   Reason: ~p",
-			  [Port,Info#mod.request_uri,Reason]),
-		    exit({open_cmd_failed,Reason,
-			  [{mod,?MODULE},{port,Port},
-			   {uri,Info#mod.request_uri},
-			   {script,Script},{env,Env},{dir,Dir},
-			   {ebody_size,sz(Info#mod.entity_body)}]});
-		true ->
-		    {NewErrorLog, Result} = proxy(Port, ErrorLog),
-		    {ok, Context, NewErrorLog, remove_header(Result), R}
-	    end;
-	{'EXIT', Reason} ->
-	    ?vlog("open port failed: exit"
-		  "~n   URI:    ~p"
-		  "~n   Reason: ~p",
-		  [Info#mod.request_uri,Reason]),
-	    exit({open_port_failed,Reason,
-		  [{mod,?MODULE},{uri,Info#mod.request_uri},{script,Script},
-		   {env,Env},{dir,Dir}]});
-	O ->
-	    ?vlog("open port failed: unknown result"
-		  "~n   URI: ~p"
-		  "~n   O:   ~p",
-		  [Info#mod.request_uri,O]),
-	    exit({open_port_failed,O,
-		  [{mod,?MODULE},{uri,Info#mod.request_uri},{script,Script},
-		   {env,Env},{dir,Dir}]})
-    end.
-    
-
-%%
-%% Port communication
-%%
-
-proxy(Port,ErrorLog) ->
-    process_flag(trap_exit, true),
-    proxy(Port, ErrorLog, []).
-
-proxy(Port, ErrorLog, Result) ->
-    receive
-	{Port, {data, Response}} ->
-	    proxy(Port, ErrorLog, lists:append(Result,Response));
-	{'EXIT', Port, normal} when port(Port) ->
-	    process_flag(trap_exit, false),
-	    {ErrorLog, Result};
-	{'EXIT', Port, Reason} when port(Port) ->
-	    process_flag(trap_exit, false),
-	    {[{internal_info,
-	       ?NICE("Scrambled output from CGI-script")}|ErrorLog],
-	     Result};
-	{'EXIT', Pid, Reason} when pid(Pid) ->
-	    process_flag(trap_exit, false),
-	    {'EXIT', Pid, Reason};
-	%% This should not happen!
-	WhatEver ->
-	    process_flag(trap_exit, false),
-	    {ErrorLog, Result}
-    end.
-
-
-%% ------
-%% Temporary until I figure out a way to fix send_in_chunks
-%% (comments and directives that start in one chunk but end
-%% in another is not handled).
-%%
-
-send_in(Info, Path,Head, {ok,FileInfo}) ->
-    case file:read_file(Path) of
-	{ok, Bin} ->
-	    send_in1(Info, binary_to_list(Bin), Head, FileInfo);
-	{error, Reason} ->
-	    ?vlog("failed reading file: ~p",[Reason]),
-	    {error, {open,Reason}}
-    end;
-send_in(Info,Path,Head,{error,Reason}) ->
-    ?vlog("failed open file: ~p",[Reason]),
-    {error, {open,Reason}}.
-
-send_in1(Info, Data,Head,FileInfo) ->
-    {ok, _Context, Err, ParsedBody} = parse(Info,Data,?DEFAULT_CONTEXT,[],[]),
-    Size = length(ParsedBody),
-    ?vdebug("send_in1 -> Size: ~p",[Size]),
-    Head1 = case Info#mod.http_version of 
-		"HTTP/1.1"->
-		    Head ++ 
-			"Content-Length: " ++ 
-			integer_to_list(Size) ++
-			"\r\nEtag:" ++ 
-			httpd_util:create_etag(FileInfo,Size) ++"\r\n" ++
-			"Last-Modified: " ++ 
-			httpd_util:rfc1123_date(FileInfo#file_info.mtime)  ++ 
-			"\r\n\r\n";
-		_->
-		    %% i.e http/1.0 and http/0.9
-		    Head ++
-			"Content-Length: " ++ 
-			integer_to_list(Size) ++
-			"\r\nLast-Modified: " ++ 
-			httpd_util:rfc1123_date(FileInfo#file_info.mtime)  ++ 
-			"\r\n\r\n"
-	    end,
-    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket, 
-			 [Head1,ParsedBody]),
-    {ok, Err, Size}.
-
-
-
-%%
-%% Addition to "Fuzzy" HTML parser. This is actually a ugly hack to
-%% avoid putting to much data on the heap. To be rewritten...
-%%
-
-% -define(CHUNK_SIZE, 4096).
-
-% send_in_chunks(Info, Path) ->
-%     ?DEBUG("send_in_chunks -> Path: ~p",[Path]),
-%     case file:open(Path, [read, raw]) of
-% 	{ok, Stream} ->
-% 	    send_in_chunks(Info, Stream, ?DEFAULT_CONTEXT,[]);
-% 	{error, Reason} ->
-% 	    ?ERROR("Failed open file: ~p",[Reason]),
-% 	    {error, {open,Reason}}
-%     end.
-
-% send_in_chunks(Info, Stream, Context, ErrorLog) ->
-%     case file:read(Stream, ?CHUNK_SIZE) of
-% 	{ok, Data} ->
-% 	    ?DEBUG("send_in_chunks -> read ~p bytes",[length(Data)]),
-% 	    {ok, NewContext, NewErrorLog, ParsedBody}=
-% 		parse(Info, Data, Context, ErrorLog, []),
-% 	    httpd_socket:deliver(Info#mod.socket_type,
-% 				 Info#mod.socket, ParsedBody),
-% 	    send_in_chunks(Info,Stream,NewContext,NewErrorLog);
-% 	eof ->
-% 	    {ok, ErrorLog};
-% 	{error, Reason} ->
-% 	    ?ERROR("Failed read from file: ~p",[Reason]),
-% 	    {error, {read,Reason}}
-%     end.
-
-
-%%
-%% "Fuzzy" HTML parser
-%%
-
-parse(Info,Body) ->
-  parse(Info, Body, ?DEFAULT_CONTEXT, [], []).
-
-parse(Info, [], Context, ErrorLog, Result) ->
-    {ok, Context, lists:reverse(ErrorLog), lists:reverse(Result)};
-parse(Info,[$<,$!,$-,$-,$#|R1],Context,ErrorLog,Result) ->
-  ?DEBUG("parse -> start command directive when length(R1): ~p",[length(R1)]),
-  case catch parse0(R1,Context) of
-    {parse_error,Reason} ->
-      parse(Info,R1,Context,[{internal_info,?NICE(Reason)}|ErrorLog],
-	    [$#,$-,$-,$!,$<|Result]);
-    {ok,Context,Command,TagList,ValueList,R2} ->
-      ?DEBUG("parse -> Command: ~p",[Command]),
-      {ok,NewContext,NewErrorLog,MoreResult,R3}=
-	handle(Info,Context,ErrorLog,Command,TagList,ValueList,R2),
-      parse(Info,R3,NewContext,NewErrorLog,lists:reverse(MoreResult)++Result)
-  end;
-parse(Info,[$<,$!,$-,$-|R1],Context,ErrorLog,Result) ->
-  ?DEBUG("parse -> start comment when length(R1) = ~p",[length(R1)]),
-  case catch parse5(R1,[],0) of
-    {parse_error,Reason} ->
-      ?ERROR("parse -> parse error: ~p",[Reason]),
-      parse(Info,R1,Context,[{internal_info,?NICE(Reason)}|ErrorLog],Result);
-    {Comment,R2} ->
-      ?DEBUG("parse -> length(Comment) = ~p, length(R2) = ~p",
-	     [length(Comment),length(R2)]),
-      parse(Info,R2,Context,ErrorLog,Comment++Result)
-  end;
-parse(Info,[C|R],Context,ErrorLog,Result) ->
-  parse(Info,R,Context,ErrorLog,[C|Result]).
-
-handle(Info,Context,ErrorLog,Command,TagList,ValueList,R) ->
-  case catch apply(?MODULE,Command,[Info,Context,ErrorLog,TagList,ValueList,
-				    R]) of
-    {'EXIT',{undef,_}} ->
-      throw({parse_error,"Unknown command "++atom_to_list(Command)++
-	     " in parsed doc"});
-    Result ->
-      Result
-  end.
-
-parse0([],Context) ->
-  throw({parse_error,"Premature EOF in parsed file"});
-parse0([$-,$-,$>|R],Context) ->
-  throw({parse_error,"Premature EOF in parsed file"});
-parse0([$ |R],Context) ->
-  parse0(R,Context);
-parse0(String,Context) ->
-  parse1(String,Context,"").
-
-parse1([],Context,Command) ->
-  throw({parse_error,"Premature EOF in parsed file"});
-parse1([$-,$-,$>|R],Context,Command) ->
-  throw({parse_error,"Premature EOF in parsed file"});
-parse1([$ |R],Context,Command) ->
-  parse2(R,Context,list_to_atom(lists:reverse(Command)),[],[],"");
-parse1([C|R],Context,Command) ->
-  parse1(R,Context,[C|Command]).
-
-parse2([],Context,Command,TagList,ValueList,Tag) ->
-  throw({parse_error,"Premature EOF in parsed file"});
-parse2([$-,$-,$>|R],Context,Command,TagList,ValueList,Tag) ->
-  {ok,Context,Command,TagList,ValueList,R};
-parse2([$ |R],Context,Command,TagList,ValueList,Tag) ->
-  parse2(R,Context,Command,TagList,ValueList,Tag);
-parse2([$=|R],Context,Command,TagList,ValueList,Tag) ->
-  parse3(R,Context,Command,[list_to_atom(lists:reverse(Tag))|TagList],
-	 ValueList);
-parse2([C|R],Context,Command,TagList,ValueList,Tag) ->
-  parse2(R,Context,Command,TagList,ValueList,[C|Tag]).
-
-parse3([],Context,Command,TagList,ValueList) ->
-  throw({parse_error,"Premature EOF in parsed file"});
-parse3([$-,$-,$>|R],Context,Command,TagList,ValueList) ->
-  throw({parse_error,"Premature EOF in parsed file"});
-parse3([$ |R],Context,Command,TagList,ValueList) ->
-  parse3(R,Context,Command,TagList,ValueList);
-parse3([$"|R],Context,Command,TagList,ValueList) ->
-  parse4(R,Context,Command,TagList,ValueList,"");
-parse3(String,Context,Command,TagList,ValueList) ->
-  throw({parse_error,"Premature EOF in parsed file"}).
-
-parse4([],Context,Command,TagList,ValueList,Value) ->
-  throw({parse_error,"Premature EOF in parsed file"});
-parse4([$-,$-,$>|R],Context,Command,TagList,ValueList,Value) ->
-  throw({parse_error,"Premature EOF in parsed file"});
-parse4([$"|R],Context,Command,TagList,ValueList,Value) ->
-  parse2(R,Context,Command,TagList,[lists:reverse(Value)|ValueList],"");
-parse4([C|R],Context,Command,TagList,ValueList,Value) ->
-  parse4(R,Context,Command,TagList,ValueList,[C|Value]).
-
-parse5([],Comment,Depth) ->
-  ?ERROR("parse5 -> unterminated comment of ~p bytes when Depth = ~p",
-	 [length(Comment),Depth]),
-  throw({parse_error,"Premature EOF in parsed file"});
-parse5([$<,$!,$-,$-|R],Comment,Depth) ->
-  parse5(R,[$-,$-,$!,$<|Comment],Depth+1);
-parse5([$-,$-,$>|R],Comment,0) ->
-  {">--"++Comment++"--!<",R};
-parse5([$-,$-,$>|R],Comment,Depth) ->
-  parse5(R,[$>,$-,$-|Comment],Depth-1);
-parse5([C|R],Comment,Depth) ->
-  parse5(R,[C|Comment],Depth).
-
-
-sz(B) when binary(B) -> {binary,size(B)};
-sz(L) when list(L)   -> {list,length(L)};
-sz(_)                -> undefined.
-
-
-%% send_error - Handle failure to send the file
-%%
-send_error({open,Reason},Info,Path) -> open_error(Reason,Info,Path);
-send_error({read,Reason},Info,Path) -> read_error(Reason,Info,Path).
-
-
-%% open_error - Handle file open failure
-%%
-open_error(eacces,Info,Path) ->
-    open_error(403,Info,Path,"");
-open_error(enoent,Info,Path) ->
-    open_error(404,Info,Path,"");
-open_error(enotdir,Info,Path) ->
-    open_error(404,Info,Path,
-	       ": A component of the file name is not a directory");
-open_error(emfile,_Info,Path) ->
-    open_error(500,none,Path,": To many open files");
-open_error({enfile,_},_Info,Path) ->
-    open_error(500,none,Path,": File table overflow");
-open_error(_Reason,_Info,Path) ->
-    open_error(500,none,Path,"").
-	    
-open_error(StatusCode,none,Path,Reason) ->
-    {StatusCode,none,?NICE("Can't open "++Path++Reason)};
-open_error(StatusCode,Info,Path,Reason) ->
-    {StatusCode,Info#mod.request_uri,?NICE("Can't open "++Path++Reason)}.
-
-read_error(_Reason,_Info,Path) -> 
-    read_error(500,none,Path,"").
-
-read_error(StatusCode,none,Path,Reason) ->
-    {StatusCode,none,?NICE("Can't read "++Path++Reason)};
-read_error(StatusCode,Info,Path,Reason) ->
-    {StatusCode,Info#mod.request_uri,?NICE("Can't read "++Path++Reason)}.
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_log.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_log.erl
deleted file mode 100644
index 29fa2cfd11..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_log.erl
+++ /dev/null
@@ -1,250 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_log.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_log).
--export([do/1,error_log/5,security_log/2,load/2,store/2,remove/1]).
-
--export([report_error/2]).
-
--include("httpd.hrl").
-
--define(VMODULE,"LOG").
--include("httpd_verbosity.hrl").
-
-%% do
-
-do(Info) ->
-    AuthUser = auth_user(Info#mod.data),
-    Date     = custom_date(),
-    log_internal_info(Info,Date,Info#mod.data),
-    case httpd_util:key1search(Info#mod.data,status) of
-	%% A status code has been generated!
-	{StatusCode,PhraseArgs,Reason} ->
-	    transfer_log(Info,"-",AuthUser,Date,StatusCode,0),
-	    if
-		StatusCode >= 400 ->
-		    error_log(Info,Date,Reason);
-		true ->
-		    not_an_error
-	    end,
-	    {proceed,Info#mod.data};
-	%% No status code has been generated!
-	undefined ->
-	    case httpd_util:key1search(Info#mod.data,response) of
-		{already_sent,StatusCode,Size} ->
-		    transfer_log(Info,"-",AuthUser,Date,StatusCode,Size),
-		    {proceed,Info#mod.data};
-		{response,Head,Body} ->
-		    Size=httpd_util:key1search(Head,content_length,unknown),
-		    Code=httpd_util:key1search(Head,code,unknown),
-		    transfer_log(Info,"-",AuthUser,Date,Code,Size),
-		    {proceed,Info#mod.data};
-		{StatusCode,Response} ->
-		    transfer_log(Info,"-",AuthUser,Date,200,
-				 httpd_util:flatlength(Response)),
-		    {proceed,Info#mod.data};
-		undefined ->
-		    transfer_log(Info,"-",AuthUser,Date,200,0),
-		    {proceed,Info#mod.data}
-	    end
-    end.
-
-custom_date() ->
-    LocalTime=calendar:local_time(),
-    UniversalTime=calendar:universal_time(),
-    Minutes=round(diff_in_minutes(LocalTime,UniversalTime)),
-    {{YYYY,MM,DD},{Hour,Min,Sec}}=LocalTime,
-    Date = 
-	io_lib:format("~.2.0w/~.3s/~.4w:~.2.0w:~.2.0w:~.2.0w ~c~.2.0w~.2.0w",
-		      [DD, httpd_util:month(MM), YYYY, Hour, Min, Sec, 
-		       sign(Minutes),
-		       abs(Minutes) div 60, abs(Minutes) rem 60]),  
-    lists:flatten(Date).
-
-diff_in_minutes(L,U) ->
-    (calendar:datetime_to_gregorian_seconds(L) -
-     calendar:datetime_to_gregorian_seconds(U))/60.
-
-sign(Minutes) when Minutes > 0 ->
-    $+;
-sign(Minutes) ->
-    $-.
-
-auth_user(Data) ->
-    case httpd_util:key1search(Data,remote_user) of
-	undefined ->
-	    "-";
-	RemoteUser ->
-	    RemoteUser
-    end.
-
-%% log_internal_info
-
-log_internal_info(Info,Date,[]) ->
-    ok;
-log_internal_info(Info,Date,[{internal_info,Reason}|Rest]) ->
-    error_log(Info,Date,Reason),
-    log_internal_info(Info,Date,Rest);
-log_internal_info(Info,Date,[_|Rest]) ->
-    log_internal_info(Info,Date,Rest).
-
-%% transfer_log
-
-transfer_log(Info,RFC931,AuthUser,Date,StatusCode,Bytes) ->
-    case httpd_util:lookup(Info#mod.config_db,transfer_log) of
-	undefined ->
-	    no_transfer_log;
-	TransferLog ->
-	    {PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
-	    case (catch io:format(TransferLog, "~s ~s ~s [~s] \"~s\" ~w ~w~n",
-				  [RemoteHost, RFC931, AuthUser, 
-				   Date, Info#mod.request_line,
-				   StatusCode, Bytes])) of
-		ok ->
-		    ok;
-		Error ->
-		    error_logger:error_report(Error)
-	    end
-    end.
-
-%% security log
-
-security_log(Info, Reason) ->
-    case httpd_util:lookup(Info#mod.config_db, security_log) of
-	undefined ->
-	    no_security_log;
-	SecurityLog ->
-	    io:format(SecurityLog,"[~s] ~s~n", [custom_date(), Reason])
-    end.
-
-%% error_log
-
-error_log(Info,Date,Reason) ->
-    case httpd_util:lookup(Info#mod.config_db, error_log) of
-	undefined ->
-	    no_error_log;
-	ErrorLog ->
-	    {PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
-	    io:format(ErrorLog,"[~s] access to ~s failed for ~s, reason: ~p~n",
-		      [Date,Info#mod.request_uri,RemoteHost,Reason])
-    end.
-
-error_log(SocketType,Socket,ConfigDB,{PortNumber,RemoteHost},Reason) ->
-    case httpd_util:lookup(ConfigDB,error_log) of
-	undefined ->
-	    no_error_log;
-	ErrorLog ->
-	    Date=custom_date(),
-	    io:format(ErrorLog,"[~s] server crash for ~s, reason: ~p~n",
-		      [Date,RemoteHost,Reason]),
-	    ok
-    end.
-
-report_error(ConfigDB,Error) ->
-    case httpd_util:lookup(ConfigDB,error_log) of
-	undefined ->
-	    no_error_log;
-	ErrorLog ->
-	    Date=custom_date(),
-	    io:format(ErrorLog,"[~s] reporting error: ~s~n",[Date,Error]),
-	    ok
-    end.
-
-%%
-%% Configuration
-%%
-
-%% load
-
-load([$T,$r,$a,$n,$s,$f,$e,$r,$L,$o,$g,$ |TransferLog],[]) ->
-    {ok,[],{transfer_log,httpd_conf:clean(TransferLog)}};
-load([$E,$r,$r,$o,$r,$L,$o,$g,$ |ErrorLog],[]) ->
-    {ok,[],{error_log,httpd_conf:clean(ErrorLog)}};
-load([$S,$e,$c,$u,$r,$i,$t,$y,$L,$o,$g,$ |SecurityLog], []) ->
-    {ok, [], {security_log, httpd_conf:clean(SecurityLog)}}.
-
-%% store
-
-store({transfer_log,TransferLog},ConfigList) ->
-    case create_log(TransferLog,ConfigList) of
-	{ok,TransferLogStream} ->
-	    {ok,{transfer_log,TransferLogStream}};
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-store({error_log,ErrorLog},ConfigList) ->
-    case create_log(ErrorLog,ConfigList) of
-	{ok,ErrorLogStream} ->
-	    {ok,{error_log,ErrorLogStream}};
-	{error,Reason} ->
-	    {error,Reason}
-    end;
-store({security_log, SecurityLog},ConfigList) ->
-    case create_log(SecurityLog, ConfigList) of
-	{ok, SecurityLogStream} ->
-	    {ok, {security_log, SecurityLogStream}};
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-create_log(LogFile,ConfigList) ->
-    Filename = httpd_conf:clean(LogFile),
-    case filename:pathtype(Filename) of
-	absolute ->
-	    case file:open(Filename, [read,write]) of
-		{ok,LogStream} ->
-		    file:position(LogStream,{eof,0}),
-		    {ok,LogStream};
-		{error,_} ->
-		    {error,?NICE("Can't create "++Filename)}
-	    end;
-	volumerelative ->
-	    case file:open(Filename, [read,write]) of
-		{ok,LogStream} ->
-		    file:position(LogStream,{eof,0}),
-		    {ok,LogStream};
-		{error,_} ->
-		    {error,?NICE("Can't create "++Filename)}
-	    end;
-	relative ->
-	    case httpd_util:key1search(ConfigList,server_root) of
-		undefined ->
-		    {error,
-		     ?NICE(Filename++
-			   " is an invalid logfile name beacuse ServerRoot is not defined")};
-		ServerRoot ->
-		    AbsoluteFilename=filename:join(ServerRoot,Filename),
-		    case file:open(AbsoluteFilename, [read,write]) of
-			{ok,LogStream} ->
-			    file:position(LogStream,{eof,0}),
-			    {ok,LogStream};
-			{error,Reason} ->
-			    {error,?NICE("Can't create "++AbsoluteFilename)}
-		    end
-	    end
-    end.
-
-%% remove
-
-remove(ConfigDB) ->
-    lists:foreach(fun([Stream]) -> file:close(Stream) end,
-		  ets:match(ConfigDB,{transfer_log,'$1'})),
-    lists:foreach(fun([Stream]) -> file:close(Stream) end,
-		  ets:match(ConfigDB,{error_log,'$1'})),
-    lists:foreach(fun([Stream]) -> file:close(Stream) end,
-		  ets:match(ConfigDB,{security_log,'$1'})),
-    ok.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_range.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_range.erl
deleted file mode 100644
index 0728bd2d91..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_range.erl
+++ /dev/null
@@ -1,397 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_range.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_range).
--export([do/1]).
--include("httpd.hrl").
-
-%% do
-
-
-
-do(Info) ->
-    ?DEBUG("do -> entry",[]),
-    case Info#mod.method of
-	"GET" ->
-	    case httpd_util:key1search(Info#mod.data,status) of
-		%% A status code has been generated!
-		{StatusCode,PhraseArgs,Reason} ->
-		    {proceed,Info#mod.data};
-		%% No status code has been generated!
-		undefined ->
-		    case httpd_util:key1search(Info#mod.data,response) of
-			%% No response has been generated!
-			undefined ->
-			    case httpd_util:key1search(Info#mod.parsed_header,"range") of
-				undefined ->
-				    %Not a range response
-				    {proceed,Info#mod.data};
-				Range ->
-				    %%Control that there weren't a if-range field that stopped
-				    %%The range request in favor for the whole file
-				    case httpd_util:key1search(Info#mod.data,if_range) of
-					send_file ->
-					    {proceed,Info#mod.data};
-					_undefined ->
-					    do_get_range(Info,Range)
-				    end
-			    end; 			
-			%% A response has been generated or sent!
-			Response ->
-			    {proceed,Info#mod.data}
-		    end
-	    end;
-	%% Not a GET method!
-	_ ->
-	    {proceed,Info#mod.data}
-    end.
-
-do_get_range(Info,Ranges) ->
-    ?DEBUG("do_get_range -> Request URI: ~p",[Info#mod.request_uri]),		
-     Path = mod_alias:path(Info#mod.data, Info#mod.config_db, 
-			  Info#mod.request_uri),
-    {FileInfo, LastModified} =get_modification_date(Path),
-    send_range_response(Path,Info,Ranges,FileInfo,LastModified).
-
-
-send_range_response(Path,Info,Ranges,FileInfo,LastModified)->
-    case parse_ranges(Ranges) of
-	error->
-	    ?ERROR("send_range_response-> Unparsable range request",[]),
-	    {proceed,Info#mod.data};
-	{multipart,RangeList}->
-	    send_multi_range_response(Path,Info,RangeList);
-	{Start,Stop}->
-	    send_range_response(Path,Info,Start,Stop,FileInfo,LastModified)
-    end.
-%%More than one range specified
-%%Send a multipart reponse to the user
-%
-%%An example of an multipart range response
-
-% HTTP/1.1 206 Partial Content
-% Date:Wed 15 Nov 1995 04:08:23 GMT
-% Last-modified:Wed 14 Nov 1995 04:08:23 GMT 
-% Content-type: multipart/byteranges; boundary="SeparatorString" 
-%
-% --"SeparatorString"
-% Content-Type: application/pdf
-% Content-Range: bytes 500-600/1010
-% .... The data..... 101 bytes
-%
-% --"SeparatorString"
-% Content-Type: application/pdf
-% Content-Range: bytes 700-1009/1010
-% .... The data.....
-
-
-
-send_multi_range_response(Path,Info,RangeList)->
-    case file:open(Path, [raw,binary]) of
-	{ok, FileDescriptor} ->
-	    file:close(FileDescriptor),
-	    ?DEBUG("send_multi_range_response -> FileDescriptor: ~p",[FileDescriptor]),
-	    Suffix = httpd_util:suffix(Path),
-	    PartMimeType = httpd_util:lookup_mime_default(Info#mod.config_db,Suffix,"text/plain"),
-	    Date = httpd_util:rfc1123_date(),
-	    {FileInfo,LastModified}=get_modification_date(Path),
-	    case valid_ranges(RangeList,Path,FileInfo) of
-		{ValidRanges,true}->
-		    ?DEBUG("send_multi_range_response -> Ranges are valid:",[]),
-		    %Apache breaks the standard by sending the size field in the Header.
-		    Header = [{code,206},
-			      {content_type,"multipart/byteranges;boundary=RangeBoundarySeparator"}, 
-			      {etag,httpd_util:create_etag(FileInfo)},
-			      {last_modified,LastModified}
-			     ],
-		    ?DEBUG("send_multi_range_response -> Valid Ranges: ~p",[RagneList]),
-		    Body={fun send_multiranges/4,[ValidRanges,Info,PartMimeType,Path]},
-		    {proceed,[{response,{response,Header,Body}}|Info#mod.data]};
-		_ ->
-		    {proceed, [{status, {416,"Range not valid",bad_range_boundaries }}]}
-	    end;
-	{error, Reason} ->
-	    ?ERROR("do_get -> failed open file: ~p",[Reason]),
-	    {proceed,Info#mod.data}
-    end.
-
-send_multiranges(ValidRanges,Info,PartMimeType,Path)->    
-    ?DEBUG("send_multiranges -> Start sending the ranges",[]),
-    case file:open(Path, [raw,binary]) of
-	{ok,FileDescriptor} ->
-	    lists:foreach(fun(Range)->
-				  send_multipart_start(Range,Info,PartMimeType,FileDescriptor)
-			  end,ValidRanges),
-	    file:close(FileDescriptor),
-	    %%Sends an end of the multipart
-	    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket,"\r\n--RangeBoundarySeparator--"),
-	    sent;
-	_ ->
-	    close
-    end.
-   
-send_multipart_start({{Start,End},{StartByte,EndByte,Size}},Info,PartMimeType,FileDescriptor)when StartByte<Size->
-    PartHeader=["\r\n--RangeBoundarySeparator\r\n","Content-type: ",PartMimeType,"\r\n",
-                "Content-Range:bytes=",integer_to_list(StartByte),"-",integer_to_list(EndByte),"/",
-		integer_to_list(Size),"\r\n\r\n"],
-    send_part_start(Info#mod.socket_type,Info#mod.socket,PartHeader,FileDescriptor,Start,End);
-
-
-send_multipart_start({{Start,End},{StartByte,EndByte,Size}},Info,PartMimeType,FileDescriptor)->
-    PartHeader=["\r\n--RangeBoundarySeparator\r\n","Content-type: ",PartMimeType,"\r\n",
-                "Content-Range:bytes=",integer_to_list(Size-(StartByte-Size)),"-",integer_to_list(EndByte),"/",
-		integer_to_list(Size),"\r\n\r\n"],
-    send_part_start(Info#mod.socket_type,Info#mod.socket,PartHeader,FileDescriptor,Start,End).
-
-send_part_start(SocketType,Socket,PartHeader,FileDescriptor,Start,End)->
-    case httpd_socket:deliver(SocketType,Socket,PartHeader) of
-	ok ->
-	    send_part_start(SocketType,Socket,FileDescriptor,Start,End);
-	_ ->
-	    close
-    end.    
-
-send_range_response(Path,Info,Start,Stop,FileInfo,LastModified)->
-    case file:open(Path, [raw,binary]) of
-	{ok, FileDescriptor} ->
-	    file:close(FileDescriptor),
-	    ?DEBUG("send_range_response -> FileDescriptor: ~p",[FileDescriptor]),
-	    Suffix = httpd_util:suffix(Path),
-	    MimeType = httpd_util:lookup_mime_default(Info#mod.config_db,Suffix,"text/plain"),
-	    Date = httpd_util:rfc1123_date(),
-	    Size = get_range_size(Start,Stop,FileInfo),
-	    case valid_range(Start,Stop,FileInfo) of
-		{true,StartByte,EndByte,TotByte}->
-		   Head=[{code,206},{content_type, MimeType}, 
-			 {last_modified, LastModified},
-			 {etag,httpd_util:create_etag(FileInfo)},
-			 {content_range,["bytes=",integer_to_list(StartByte),"-",
-					 integer_to_list(EndByte),"/",integer_to_list(TotByte)]},
-			 {content_length,Size}],
-		    BodyFunc=fun send_range_body/5,
-		    Arg=[Info#mod.socket_type, Info#mod.socket,Path,Start,Stop], 
-		    {proceed,[{response,{response,Head,{BodyFunc,Arg}}}|Info#mod.data]};
-		{false,Reason} ->
-		    {proceed, [{status, {416,Reason,bad_range_boundaries }}]}
-	    end;
-	{error, Reason} ->
-	    ?ERROR("send_range_response -> failed open file: ~p",[Reason]),
-	    {proceed,Info#mod.data}
-    end.
-
-
-send_range_body(SocketType,Socket,Path,Start,End) ->
-    ?DEBUG("mod_range -> send_range_body",[]),
-    case file:open(Path, [raw,binary]) of
-	{ok,FileDescriptor} ->
-	    send_part_start(SocketType,Socket,FileDescriptor,Start,End),
-	    file:close(FileDescriptor);
-	_ ->
-	    close
-    end.
-
-send_part_start(SocketType,Socket,FileDescriptor,Start,End) ->
-    case Start of
-	from_end ->
-	    file:position(FileDescriptor,{eof,End}),
-	    send_body(SocketType,Socket,FileDescriptor);
-	from_start ->
-	    file:position(FileDescriptor,{bof,End}),
-	    send_body(SocketType,Socket,FileDescriptor);
-	Byte when integer(Byte) ->
-	    file:position(FileDescriptor,{bof,Start}),
-	    send_part(SocketType,Socket,FileDescriptor,End)
-    end,
-    sent.
-
-
-%%This function could replace send_body by calling it with Start=0 end =FileSize
-%% But i gues it would be stupid when we look at performance 
-send_part(SocketType,Socket,FileDescriptor,End)->
-    case file:position(FileDescriptor,{cur,0}) of
-	{ok,NewPos} ->
-	   if 
-	       NewPos > End ->
-		   ok;
-	       true ->
-		   Size=get_file_chunk_size(NewPos,End,?FILE_CHUNK_SIZE),
-		   case file:read(FileDescriptor,Size) of
-		       eof ->
-			   ok;
-		       {error,Reason} ->
-			   ok;
-		       {ok,Binary} ->
-			   case httpd_socket:deliver(SocketType,Socket,Binary) of
-			       socket_closed ->
-				   ?LOG("send_range of body -> socket closed while sending",[]),
-				   socket_close;
-			       _ ->
-				   send_part(SocketType,Socket,FileDescriptor,End)
-			   end
-		   end
-	   end;
-	_->
-	    ok
-    end.
-
-%% validate that the range is in the limits of the file
-valid_ranges(RangeList,Path,FileInfo)->
-    lists:mapfoldl(fun({Start,End},Acc)->
-			case Acc of 
-			    true ->
-				case valid_range(Start,End,FileInfo) of
-				    {true,StartB,EndB,Size}->
-					{{{Start,End},{StartB,EndB,Size}},true};
-				    _ ->
-					false
-				end;
-			    _ ->
-				{false,false}
-			end
-		   end,true,RangeList).
-				 
-			      
-
-valid_range(from_end,End,FileInfo)->
-    Size=FileInfo#file_info.size,
-    if
-	End < Size ->
-	    {true,(Size+End),Size-1,Size};
-	true ->
-	    false
-    end;
-valid_range(from_start,End,FileInfo)->
-  Size=FileInfo#file_info.size,
-    if
-	End < Size ->
-	    {true,End,Size-1,Size};
-	true ->
-	    false
-    end;
-
-valid_range(Start,End,FileInfo)when Start=<End->
-    case FileInfo#file_info.size of
-	FileSize when Start< FileSize ->
-	    case FileInfo#file_info.size of
-		Size when End<Size ->
-		    {true,Start,End,FileInfo#file_info.size};
-		Size ->
-		    {true,Start,Size-1,Size}
-	    end;
-	_->
-	    {false,"The size of the range is negative"}
-    end;
-		      
-valid_range(Start,End,FileInfo)->
-    {false,"Range starts out of file boundaries"}.
-%% Find the modification date of the file
-get_modification_date(Path)->
-    case file:read_file_info(Path) of
-	{ok, FileInfo0} ->
-	    {FileInfo0, httpd_util:rfc1123_date(FileInfo0#file_info.mtime)};
-	_ ->
-	    {#file_info{},""}
-    end.
-
-%Calculate the size of the chunk to read
-	
-get_file_chunk_size(Position,End,DefaultChunkSize)when (Position+DefaultChunkSize) =< End->
-    DefaultChunkSize;
-get_file_chunk_size(Position,End,DefaultChunkSize)->
-    (End-Position) +1.
-
-
-
-%Get the size of the range to send. Remember that
-%A range is from startbyte up to endbyte which means that
-%the nuber of byte in a range is (StartByte-EndByte)+1
-
-get_range_size(from_end,Stop,FileInfo)->
-    integer_to_list(-1*Stop);
-
-get_range_size(from_start,StartByte,FileInfo) ->
-    integer_to_list((((FileInfo#file_info.size)-StartByte)));
-
-get_range_size(StartByte,EndByte,FileInfo) ->
-    integer_to_list((EndByte-StartByte)+1).
-
-parse_ranges([$\ ,$b,$y,$t,$e,$s,$\=|Ranges])->
-    parse_ranges([$b,$y,$t,$e,$s,$\=|Ranges]);
-parse_ranges([$b,$y,$t,$e,$s,$\=|Ranges])->
-    case string:tokens(Ranges,", ") of
-       [Range] ->
-	   parse_range(Range);
-       [Range1|SplittedRanges]->
-	   {multipart,lists:map(fun parse_range/1,[Range1|SplittedRanges])}
-    end;
-%Bad unit
-parse_ranges(Ranges)->
-    io:format("Bad Ranges : ~p",[Ranges]),
-    error.
-%Parse the range  specification from the request to {Start,End}
-%Start=End : Numreric string | []
-
-parse_range(Range)->
-    format_range(split_range(Range,[],[])).
-format_range({[],BytesFromEnd})->
-    {from_end,-1*(list_to_integer(BytesFromEnd))};
-format_range({StartByte,[]})->    
-    {from_start,list_to_integer(StartByte)};
-format_range({StartByte,EndByte})->        
-    {list_to_integer(StartByte),list_to_integer(EndByte)}.
-%Last case return the splitted range
-split_range([],Current,Other)->
-    {lists:reverse(Other),lists:reverse(Current)};
-
-split_range([$-|Rest],Current,Other)->
-    split_range(Rest,Other,Current);
-
-split_range([N|Rest],Current,End) ->
-    split_range(Rest,[N|Current],End).
-
-send_body(SocketType,Socket,FileDescriptor) ->
-    case file:read(FileDescriptor,?FILE_CHUNK_SIZE) of
-	{ok,Binary} ->
-	    ?DEBUG("send_body -> send another chunk: ~p",[size(Binary)]),
-	    case httpd_socket:deliver(SocketType,Socket,Binary) of
-		socket_closed ->
-		    ?LOG("send_body -> socket closed while sending",[]),
-		    socket_close;
-		_ ->
-		    send_body(SocketType,Socket,FileDescriptor)
-	    end;
-	eof ->
-	    ?DEBUG("send_body -> done with this file",[]),
-	    eof
-    end.
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_responsecontrol.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_responsecontrol.erl
deleted file mode 100644
index c946098120..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_responsecontrol.erl
+++ /dev/null
@@ -1,337 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_responsecontrol.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
-
--module(mod_responsecontrol).
--export([do/1]).
-
--include("httpd.hrl").
-
-
-do(Info) ->
-    ?DEBUG("do -> response_control",[]),
-    case httpd_util:key1search(Info#mod.data,status) of
-	%% A status code has been generated!
-	{StatusCode,PhraseArgs,Reason} ->
-	    {proceed,Info#mod.data};
-	%% No status code has been generated!
-	undefined ->
-	    case httpd_util:key1search(Info#mod.data,response) of
-		%% No response has been generated!
-		undefined ->
-		    case do_responsecontrol(Info) of
-			continue ->
-			    {proceed,Info#mod.data};
-			Response ->
-			    {proceed,[Response|Info#mod.data]}
-		    end;
-		%% A response has been generated or sent!
-		Response ->
-		    {proceed,Info#mod.data}
-	    end
-    end.
-
-
-%%----------------------------------------------------------------------
-%%Control that the request header did not contians any limitations 
-%%wheather a response shall be createed or not
-%%----------------------------------------------------------------------
-
-do_responsecontrol(Info) ->
-    ?DEBUG("do_response_control -> Request URI: ~p",[Info#mod.request_uri]),
-    Path = mod_alias:path(Info#mod.data, Info#mod.config_db, 
-			  Info#mod.request_uri),
-    case file:read_file_info(Path) of
-	{ok, FileInfo} ->
-	    control(Path,Info,FileInfo);
-	_ ->
-	    %% The requested asset is not a plain file and then it must 
-	    %% be generated everytime its requested
-	    continue
-    end.
-
-%%----------------------------------------------------------------------
-%%Control the If-Match, If-None-Match,  and If-Modified-Since    
-%%----------------------------------------------------------------------
-
-
-%% If a client sends more then one of the if-XXXX fields in a request
-%% The standard says it does not specify the behaviuor so I specified it :-)
-%% The priority between the fields is 
-%% 1.If-modified
-%% 2.If-Unmodified
-%% 3.If-Match
-%% 4.If-Nomatch
-
-%% This means if more than one of the fields are in the request the 
-%% field with highest priority will be used
-
-%%If the request is a range request the If-Range field will be the winner.
-
-control(Path,Info,FileInfo)->
-    case control_range(Path,Info,FileInfo) of
-	undefined ->
-	    case control_Etag(Path,Info,FileInfo) of
-		undefined ->
-		    case control_modification(Path,Info,FileInfo) of
-			continue ->
-			    continue;
-			ReturnValue ->
-			    send_return_value(ReturnValue,FileInfo)
-		    end;
-		continue ->
-		    continue;
-		ReturnValue ->
-		    send_return_value(ReturnValue,FileInfo)
-	    end;
-	Response->
-	    Response
-    end.
-
-%%----------------------------------------------------------------------
-%%If there are both a range and an if-range field control if
-%%----------------------------------------------------------------------
-control_range(Path,Info,FileInfo) ->
-    case httpd_util:key1search(Info#mod.parsed_header,"range") of
-	undefined->
-	    undefined;
-	_Range ->
-	    case httpd_util:key1search(Info#mod.parsed_header,"if-range") of
-		undefined ->
-		    undefined;
-		EtagOrDate ->
-		    control_if_range(Path,Info,FileInfo,EtagOrDate)
-	    end
-    end.
-
-control_if_range(Path,Info,FileInfo,EtagOrDate) ->
-    case httpd_util:convert_request_date(strip_date(EtagOrDate)) of
-	bad_date ->
-	    FileEtag=httpd_util:create_etag(FileInfo),
-	    case FileEtag of
-		EtagOrDate ->
-		    continue;
-		_ ->
-		    {if_range,send_file}
-	    end;
-	ErlDate ->    
-	    %%We got the date in the request if it is 
-	    case control_modification_data(Info,FileInfo#file_info.mtime,"if-range") of
-		modified ->
-		    {if_range,send_file};
-		_UnmodifiedOrUndefined->
-		    continue
-	    end
-    end.
-		 
-%%----------------------------------------------------------------------
-%%Controls the values of the If-Match and I-None-Mtch
-%%----------------------------------------------------------------------
-control_Etag(Path,Info,FileInfo)->
-    FileEtag=httpd_util:create_etag(FileInfo),
-    %%Control if the E-Tag for the resource  matches one of the Etags in
-    %%the -if-match header field
-    case control_match(Info,FileInfo,"if-match",FileEtag) of
-	nomatch ->
-	    %%None of the Etags in the if-match field matched the current 
-	    %%Etag for the resource return a 304 
-	    {412,Info,Path};
-	match ->
-	    continue;
-	undefined ->
-	    case control_match(Info,FileInfo,"if-none-match",FileEtag) of
-		nomatch ->
-		    continue;
-		match ->
-		    case  Info#mod.method of
-			"GET" ->
-			    {304,Info,Path};
-			"HEAD" ->
-			    {304,Info,Path};
-			_OtherrequestMethod ->
-			    {412,Info,Path}
-		    end;
-		undefined ->
-		    undefined
-	    end
-    end.
-
-%%----------------------------------------------------------------------
-%%Control if there are any Etags for HeaderField in the request if so 
-%%Control if they match the Etag for the requested file
-%%----------------------------------------------------------------------
-control_match(Info,FileInfo,HeaderField,FileEtag)-> 
-    case split_etags(httpd_util:key1search(Info#mod.parsed_header,HeaderField)) of
- 	undefined->
-	    undefined;
-        Etags->
-	    %%Control that the match any star not is availible 
-	    case lists:member("*",Etags) of
-		true-> 
-		    match;
-		false->
-		    compare_etags(FileEtag,Etags)
-	    end
-    end.
-
-%%----------------------------------------------------------------------
-%%Split the etags from the request
-%%----------------------------------------------------------------------
-split_etags(undefined)->
-    undefined;
-split_etags(Tags) ->
-    string:tokens(Tags,", ").
-
-%%----------------------------------------------------------------------
-%%Control if the etag for the file is in the list
-%%----------------------------------------------------------------------
-compare_etags(Tag,Etags) ->
-    case lists:member(Tag,Etags) of
-	true ->
-	    match;
-	_ ->
-	    nomatch
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                   %%
-%%Control if the file is modificated                                 %%
-%%                                                                   %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%	    
-
-%%----------------------------------------------------------------------
-%%Control the If-Modified-Since and If-Not-Modified-Since header fields
-%%----------------------------------------------------------------------
-control_modification(Path,Info,FileInfo)->
-    ?DEBUG("control_modification() -> entry",[]),
-    case control_modification_data(Info,FileInfo#file_info.mtime,"if-modified-since") of
-	modified->
-	    continue;	
-	unmodified->
-	    {304,Info,Path};
-	undefined ->
-	    case control_modification_data(Info,FileInfo#file_info.mtime,"if-unmodified-since") of
-		modified  ->
-		    {412,Info,Path};
-		_ContinueUndefined ->
-		    continue	
-	    end
-    end.
-
-%%----------------------------------------------------------------------
-%%Controls the date from the http-request if-modified-since and 
-%%if-not-modified-since against the modification data of the
-%%File
-%%----------------------------------------------------------------------     
-%%Info is the record about the request
-%%ModificationTime is the time the file was edited last
-%%Header Field is the name of the field  to control
-
-control_modification_data(Info,ModificationTime,HeaderField)-> 
-    case strip_date(httpd_util:key1search(Info#mod.parsed_header,HeaderField)) of
- 	undefined->
-	    undefined;
-	LastModified0 ->
-	    LastModified=httpd_util:convert_request_date(LastModified0),
-	    ?DEBUG("control_modification_data() -> "
-		   "~n   Request-Field:    ~s"
-		   "~n   FileLastModified: ~p"
-		   "~n   FieldValue:       ~p",
-		   [HeaderField,ModificationTime,LastModified]),
-	    case LastModified of 
-		bad_date ->
-		    undefined;
-		_ ->
-		    FileTime=calendar:datetime_to_gregorian_seconds(ModificationTime),
-		    FieldTime=calendar:datetime_to_gregorian_seconds(LastModified),
-		    if 
-			FileTime=<FieldTime ->
-			    ?DEBUG("File unmodified~n", []),
-			    unmodified;
-			FileTime>=FieldTime ->
-			    ?DEBUG("File modified~n", []),
-			    modified	    
-		    end
-	    end
-    end.
-
-%%----------------------------------------------------------------------
-%%Compare to dates on the form {{YYYY,MM,DD},{HH,MIN,SS}}
-%%If the first date is the biggest returns biggest1 (read biggestFirst)
-%%If the first date is smaller 
-% compare_date(Date,bad_date)->
-%     bad_date;
-
-% compare_date({D1,T1},{D2,T2})->
-%     case compare_date1(D1,D2) of
-%       	equal ->
-% 	    compare_date1(T1,T2);
-% 	GTorLT->
-% 	    GTorLT
-%     end.
-
-% compare_date1({T1,T2,T3},{T12,T22,T32}) when T1>T12 ->
-%     bigger1;
-% compare_date1({T1,T2,T3},{T1,T22,T32}) when T2>T22 ->
-%     bigger1;
-% compare_date1({T1,T2,T3},{T1,T2,T32}) when T3>T32 ->
-%     bigger1;
-% compare_date1({T1,T2,T3},{T1,T2,T3})->
-%     equal;
-% compare_date1(_D1,_D2)->
-%     smaller1.
-
-
-%% IE4 & NS4 sends an extra '; length=xxxx' string at the end of the If-Modified-Since
-%% header, we detect this and ignore it (the RFCs does not mention this).
-strip_date(undefined) ->
-    undefined;
-strip_date([]) ->
-    [];
-strip_date([$;,$ |Rest]) ->
-    [];
-strip_date([C|Rest]) ->
-    [C|strip_date(Rest)].
-
-send_return_value({412,_,_},FileInfo)->
-    {status,{412,none,"Precondition Failed"}};
-
-send_return_value({304,Info,Path},FileInfo)->
-    Suffix=httpd_util:suffix(Path),
-    MimeType = httpd_util:lookup_mime_default(Info#mod.config_db,Suffix,"text/plain"),
-    Header = [{code,304},
-	      {etag,httpd_util:create_etag(FileInfo)},
-	      {content_length,0},
-	      {last_modified,httpd_util:rfc1123_date(FileInfo#file_info.mtime)}],
-    {response,{response,Header,nobody}}.
-	      
-
-
-
-
-	
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_security.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_security.erl
deleted file mode 100644
index 14197979d1..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_security.erl
+++ /dev/null
@@ -1,307 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_security.erl,v 1.1 2008/12/17 09:53:35 mikpe Exp $
-%%
--module(mod_security).
-
-%% Security Audit Functionality
-
-%% User API exports
--export([list_blocked_users/1, list_blocked_users/2, list_blocked_users/3, 
-	 block_user/4, block_user/5, 
-	 unblock_user/2, unblock_user/3, unblock_user/4,
-	 list_auth_users/1, list_auth_users/2, list_auth_users/3]).
-
-%% module API exports
--export([do/1, load/2, store/2, remove/1]).
-
--include("httpd.hrl").
-
--define(VMODULE,"SEC").
--include("httpd_verbosity.hrl").
-
-
-%% do/1
-do(Info) ->
-    ?vdebug("~n   do with ~n   Info: ~p",[Info]),
-    %% Check and see if any user has been authorized.
-    case httpd_util:key1search(Info#mod.data,remote_user,not_defined_user) of
-	not_defined_user ->
-	    %% No user has been authorized.
-	    case httpd_util:key1search(Info#mod.data, status) of
-		%% A status code has been generated!
-		{401, PhraseArgs, Reason} ->
-		    case httpd_util:key1search(Info#mod.parsed_header,
-					       "authorization") of
-			undefined ->
-			    %% Not an authorization attempt (server just replied to
-			    %% challenge for authentication)
-			    {proceed, Info#mod.data};
-			[$B,$a,$s,$i,$c,$ |EncodedString] ->
-			    %% Someone tried to authenticate, and obviously failed!
-			    ?vlog("~n   Authentication failed: ~s",
-				  [EncodedString]),
-			    report_failed(Info, EncodedString,"Failed authentication"),
-			    take_failed_action(Info, EncodedString),
-			    {proceed, Info#mod.data}
-		    end;
-		_ ->
-		    {proceed, Info#mod.data}
-	    end;
-	User ->
-	    %% A user has been authenticated, now is he blocked ?
-	    ?vtrace("user '~p' authentication",[User]),
-	    Path = mod_alias:path(Info#mod.data,
-				  Info#mod.config_db,
-				  Info#mod.request_uri),
-	    {Dir, SDirData} = secretp(Path, Info#mod.config_db),
-	    Addr = httpd_util:lookup(Info#mod.config_db, bind_address),
-	    Port = httpd_util:lookup(Info#mod.config_db, port),
-	    DF   = httpd_util:key1search(SDirData, data_file),
-	    case mod_security_server:check_blocked_user(Info, User, 
-							SDirData, 
-							Addr, Port) of
-		true ->
-		    ?vtrace("user blocked",[]),
-		    report_failed(Info,httpd_util:decode_base64(User) ,"User Blocked"),
-		    {proceed, [{status, {403, Info#mod.request_uri, ""}}|Info#mod.data]};
-		false ->
-		    ?vtrace("user not blocked",[]),
-		    EncodedUser=httpd_util:decode_base64(User),
-		    report_failed(Info, EncodedUser,"Authentication Succedded"),
-		    mod_security_server:store_successful_auth(Addr, Port, 
-							      User, SDirData),
-		    {proceed, Info#mod.data}
-	    end
-    end.
-
-
-
-report_failed(Info, EncodedString,Event) ->
-    Request = Info#mod.request_line,
-    Decoded = httpd_util:decode_base64(EncodedString),
-    {PortNumber,RemoteHost}=(Info#mod.init_data)#init_data.peername,
-    String = RemoteHost++" : " ++ Event ++ " : "++Request++" : "++Decoded,
-    mod_disk_log:security_log(Info,String),
-    mod_log:security_log(Info, String).
-
-take_failed_action(Info, EncodedString) ->
-    Path = mod_alias:path(Info#mod.data,Info#mod.config_db, Info#mod.request_uri),
-    {Dir, SDirData} = secretp(Path, Info#mod.config_db),
-    Addr = httpd_util:lookup(Info#mod.config_db, bind_address),
-    Port = httpd_util:lookup(Info#mod.config_db, port),
-    DecodedString = httpd_util:decode_base64(EncodedString),
-    mod_security_server:store_failed_auth(Info, Addr, Port, 
-					  DecodedString, SDirData).
-
-secretp(Path, ConfigDB) ->
-    Directories = ets:match(ConfigDB,{directory,'$1','_'}),
-    case secret_path(Path, Directories) of
-	{yes, Directory} ->
-	    SDirs0 = httpd_util:multi_lookup(ConfigDB, security_directory),
-	    SDir = lists:filter(fun(X) ->
-					lists:member({path, Directory}, X)
-				end, SDirs0),
-	    {Directory, lists:flatten(SDir)};
-	no ->
-	    error_report({internal_error_secretp, ?MODULE}),
-	    {[], []}
-    end.
-
-secret_path(Path,Directories) ->
-    secret_path(Path, httpd_util:uniq(lists:sort(Directories)), to_be_found).
-
-secret_path(Path, [], to_be_found) ->
-    no;
-secret_path(Path, [], Directory) ->
-    {yes, Directory};
-secret_path(Path, [[NewDirectory]|Rest], Directory) ->
-    case regexp:match(Path, NewDirectory) of
-	{match, _, _} when Directory == to_be_found ->
-	    secret_path(Path, Rest, NewDirectory);
-	{match, _, Length} when Length > length(Directory)->
-	    secret_path(Path, Rest, NewDirectory);
-	{match, _, Length} ->
-	    secret_path(Path, Rest, Directory);
-	nomatch ->
-	    secret_path(Path, Rest, Directory)
-    end.
-
-
-load([$<,$D,$i,$r,$e,$c,$t,$o,$r,$y,$ |Directory],[]) ->
-    Dir = httpd_conf:custom_clean(Directory,"",">"),
-    {ok, [{security_directory, Dir, [{path, Dir}]}]};
-load(eof,[{security_directory,Directory, DirData}|_]) ->
-    {error, ?NICE("Premature end-of-file in "++Directory)};
-load([$S,$e,$c,$u,$r,$i,$t,$y,$D,$a,$t,$a,$F,$i,$l,$e,$ |FileName],
-     [{security_directory, Dir, DirData}]) ->
-    File = httpd_conf:clean(FileName),
-    {ok, [{security_directory, Dir, [{data_file, File}|DirData]}]};
-load([$S,$e,$c,$u,$r,$i,$t,$y,$C,$a,$l,$l,$b,$a,$c,$k,$M,$o,$d,$u,$l,$e,$ |ModuleName],
-     [{security_directory, Dir, DirData}]) ->
-    Mod = list_to_atom(httpd_conf:clean(ModuleName)),
-    {ok, [{security_directory, Dir, [{callback_module, Mod}|DirData]}]};
-load([$S,$e,$c,$u,$r,$i,$t,$y,$M,$a,$x,$R,$e,$t,$r,$i,$e,$s,$ |Retries],
-     [{security_directory, Dir, DirData}]) ->
-    MaxRetries = httpd_conf:clean(Retries),
-    load_return_int_tag("SecurityMaxRetries", max_retries, 
-			httpd_conf:clean(Retries), Dir, DirData);
-load([$S,$e,$c,$u,$r,$i,$t,$y,$B,$l,$o,$c,$k,$T,$i,$m,$e,$ |Time],
-     [{security_directory, Dir, DirData}]) ->
-    load_return_int_tag("SecurityBlockTime", block_time,
-			httpd_conf:clean(Time), Dir, DirData);
-load([$S,$e,$c,$u,$r,$i,$t,$y,$F,$a,$i,$l,$E,$x,$p,$i,$r,$e,$T,$i,$m,$e,$ |Time],
-     [{security_directory, Dir, DirData}]) ->
-    load_return_int_tag("SecurityFailExpireTime", fail_expire_time,
-			httpd_conf:clean(Time), Dir, DirData);
-load([$S,$e,$c,$u,$r,$i,$t,$y,$A,$u,$t,$h,$T,$i,$m,$e,$o,$u,$t,$ |Time0],
-     [{security_directory, Dir, DirData}]) ->
-    Time = httpd_conf:clean(Time0),
-    load_return_int_tag("SecurityAuthTimeout", auth_timeout,
-			httpd_conf:clean(Time), Dir, DirData);
-load([$A,$u,$t,$h,$N,$a,$m,$e,$ |Name0],
-     [{security_directory, Dir, DirData}]) ->
-    Name = httpd_conf:clean(Name0),
-    {ok, [{security_directory, Dir, [{auth_name, Name}|DirData]}]};
-load("</Directory>",[{security_directory,Directory, DirData}]) ->
-    {ok, [], {security_directory, Directory, DirData}}.
-
-load_return_int_tag(Name, Atom, Time, Dir, DirData) ->
-    case Time of
-	"infinity" ->
-	    {ok, [{security_directory, Dir, [{Atom, 99999999999999999999999999999}|DirData]}]};
-	Int ->
-	    case catch list_to_integer(Time) of
-		{'EXIT', _} ->
-		    {error, Time++" is an invalid "++Name};
-		Val ->
-		    {ok, [{security_directory, Dir, [{Atom, Val}|DirData]}]}
-	    end
-    end.
-
-store({security_directory, Dir0, DirData}, ConfigList) ->
-    ?CDEBUG("store(security_directory) -> ~n"
-	    "      Dir0:       ~p~n"
-	    "      DirData:    ~p",
-	    [Dir0, DirData]),
-    Addr = httpd_util:key1search(ConfigList, bind_address),
-    Port = httpd_util:key1search(ConfigList, port),
-    mod_security_server:start(Addr, Port),
-    SR = httpd_util:key1search(ConfigList, server_root),
-    Dir = 
-	case filename:pathtype(Dir0) of
-	    relative ->
-		filename:join(SR, Dir0);
-	    _ ->
-		Dir0
-	end,
-    case httpd_util:key1search(DirData, data_file, no_data_file) of
-	no_data_file ->
-	    {error, no_security_data_file};
-	DataFile0 ->
-	    DataFile = 
-		case filename:pathtype(DataFile0) of
-		    relative ->
-			filename:join(SR, DataFile0);
-		    _ ->
-			DataFile0
-		end,
-	    case mod_security_server:new_table(Addr, Port, DataFile) of
-		{ok, TwoTables} ->
-		    NewDirData0 = lists:keyreplace(data_file, 1, DirData, 
-						   {data_file, TwoTables}),
-		    NewDirData1 = case Addr of
-				      undefined ->
-					  [{port,Port}|NewDirData0];
-				      _ ->
-					  [{port,Port},{bind_address,Addr}|
-					   NewDirData0]
-				  end,
-		    {ok, {security_directory,NewDirData1}};
-		{error, Err} ->
-		    {error, {{open_data_file, DataFile}, Err}}
-	    end
-    end.
-
-
-remove(ConfigDB) ->
-    Addr = case ets:lookup(ConfigDB, bind_address) of
-	       [] -> 
-		   undefined;
-	       [{bind_address, Address}] ->
-		   Address
-	   end,
-    [{port, Port}] = ets:lookup(ConfigDB, port),
-    mod_security_server:delete_tables(Addr, Port),
-    mod_security_server:stop(Addr, Port).
-    
-
-%%
-%% User API
-%%
-
-%% list_blocked_users
-
-list_blocked_users(Port) ->
-    list_blocked_users(undefined, Port).
-
-list_blocked_users(Port, Dir) when integer(Port) ->
-    list_blocked_users(undefined,Port,Dir);
-list_blocked_users(Addr, Port) when integer(Port) ->
-    mod_security_server:list_blocked_users(Addr, Port).
-
-list_blocked_users(Addr, Port, Dir) ->
-    mod_security_server:list_blocked_users(Addr, Port, Dir).
-
-
-%% block_user
-
-block_user(User, Port, Dir, Time) ->
-    block_user(User, undefined, Port, Dir, Time).
-block_user(User, Addr, Port, Dir, Time) ->
-    mod_security_server:block_user(User, Addr, Port, Dir, Time).
-
-
-%% unblock_user
-
-unblock_user(User, Port) ->
-    unblock_user(User, undefined, Port).
-
-unblock_user(User, Port, Dir) when integer(Port) ->
-    unblock_user(User, undefined, Port, Dir);
-unblock_user(User, Addr, Port) when integer(Port) ->
-    mod_security_server:unblock_user(User, Addr, Port).
-
-unblock_user(User, Addr, Port, Dir) ->
-    mod_security_server:unblock_user(User, Addr, Port, Dir).
-
-
-%% list_auth_users
-
-list_auth_users(Port) ->
-    list_auth_users(undefined,Port).
-
-list_auth_users(Port, Dir) when integer(Port) ->
-    list_auth_users(undefined, Port, Dir);
-list_auth_users(Addr, Port) when integer(Port) ->
-    mod_security_server:list_auth_users(Addr, Port).
-
-list_auth_users(Addr, Port, Dir) ->
-    mod_security_server:list_auth_users(Addr, Port, Dir).
-    
-
-error_report(M) ->
-    error_logger:error_report(M).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_security_server.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_security_server.erl
deleted file mode 100644
index 7df61df63e..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_security_server.erl
+++ /dev/null
@@ -1,728 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_security_server.erl,v 1.1 2008/12/17 09:53:36 mikpe Exp $
-%%
-%% Security Audit Functionality
-
-%%
-%% The gen_server code.
-%%
-%% A gen_server is needed in this module to take care of shared access to the
-%% data file used to store failed and successful authentications aswell as 
-%% user blocks.
-%%
-%% The storage model is a write-through model with both an ets and a dets 
-%% table. Writes are done to both the ets and then the dets table, but reads 
-%% are only done from the ets table.
-%%
-%% This approach also enables parallelism when using dets by returning the 
-%% same dets table identifier when opening several files with the same 
-%% physical location.
-%%
-%% NOTE: This could be implemented using a single dets table, as it is 
-%%       possible to open a dets file with the ram_file flag, but this 
-%%       would require periodical sync's to disk, and it would be hard 
-%%       to decide when such an operation should occur.
-%%
-
-
--module(mod_security_server).
-
--include("httpd.hrl").
--include("httpd_verbosity.hrl").
-
-
--behaviour(gen_server).
-
-
-%% User API exports (called via mod_security)
--export([list_blocked_users/2, list_blocked_users/3, 
-	 block_user/5, 
-	 unblock_user/3, unblock_user/4,
-	 list_auth_users/2, list_auth_users/3]).
-
-%% Internal exports (for mod_security only)
--export([start/2, stop/1, stop/2,
-	 new_table/3, delete_tables/2, 
-	 store_failed_auth/5, store_successful_auth/4, 
-	 check_blocked_user/5]).
-
-%% gen_server exports
--export([start_link/3, 
-	 init/1, 
-	 handle_info/2, handle_call/3, handle_cast/2, 
-	 terminate/2,
-	 code_change/3]).
-
--export([verbosity/3]).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% External API                                                     %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% start_link/3
-%% 
-%% NOTE: This is called by httpd_misc_sup when the process is started
-%% 
-
-start_link(Addr, Port, Verbosity) ->
-    ?vtrace("start_link -> entry with"
-	    "~n   Addr: ~p"
-	    "~n   Port: ~p", [Addr, Port]),
-    Name = make_name(Addr, Port),
-    gen_server:start_link({local, Name}, ?MODULE, [Verbosity],
-			  [{timeout, infinity}]).
-
-
-%% start/2
-%% Called  by the mod_security module.
-
-start(Addr, Port) ->
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	undefined ->
-	    Verbosity = get(security_verbosity),
-	    case httpd_misc_sup:start_sec_server(Addr, Port, Verbosity) of
-		{ok, Pid} ->
-		    put(security_server, Pid),
-		    ok;
-		Error ->
-		    exit({failed_start_security_server, Error})
-	    end;
-	_ -> %% Already started...
-	    ok
-    end.
-
-
-%% stop
-
-stop(Port) ->
-    stop(undefined, Port).
-stop(Addr, Port) ->
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	undefined ->
-	    ok;
-	_ ->
-	    httpd_misc_sup:stop_sec_server(Addr, Port)
-    end.
-
-
-%% verbosity
-
-verbosity(Addr, Port, Verbosity) ->
-    Name = make_name(Addr, Port),
-    Req  = {verbosity, Verbosity},
-    call(Name, Req).
-    
-
-%% list_blocked_users
-
-list_blocked_users(Addr, Port) ->
-    Name = make_name(Addr,Port),
-    Req  = {list_blocked_users, Addr, Port, '_'},
-    call(Name, Req).
-
-list_blocked_users(Addr, Port, Dir) ->
-    Name = make_name(Addr, Port),
-    Req  = {list_blocked_users, Addr, Port, Dir},
-    call(Name, Req).
-
-
-%% block_user
-
-block_user(User, Addr, Port, Dir, Time) ->
-    Name = make_name(Addr, Port),
-    Req  = {block_user, User, Addr, Port, Dir, Time},
-    call(Name, Req).
-
-
-%% unblock_user
-
-unblock_user(User, Addr, Port) ->
-    Name = make_name(Addr, Port),
-    Req  = {unblock_user, User, Addr, Port, '_'},
-    call(Name, Req).
-
-unblock_user(User, Addr, Port, Dir) ->
-    Name = make_name(Addr, Port),
-    Req  = {unblock_user, User, Addr, Port, Dir},
-    call(Name, Req).
-
-
-%% list_auth_users
-
-list_auth_users(Addr, Port) ->
-    Name = make_name(Addr, Port),
-    Req  = {list_auth_users, Addr, Port, '_'},
-    call(Name, Req).
-
-list_auth_users(Addr, Port, Dir) ->
-    Name = make_name(Addr,Port),
-    Req  = {list_auth_users, Addr, Port, Dir}, 
-    call(Name, Req).
-    
-
-%% new_table
-
-new_table(Addr, Port, TabName) ->
-    Name = make_name(Addr,Port),
-    Req  = {new_table, Addr, Port, TabName}, 
-    call(Name, Req).
-
-
-%% delete_tables
-    
-delete_tables(Addr, Port) ->
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	undefined ->
-	    ok;
-	_ ->
-	    call(Name, delete_tables)
-    end.
-
-
-%% store_failed_auth
-
-store_failed_auth(Info, Addr, Port, DecodedString, SDirData) ->
-    Name = make_name(Addr,Port),
-    Msg  = {store_failed_auth,[Info,DecodedString,SDirData]},
-    cast(Name, Msg).
-
-
-%% store_successful_auth
-
-store_successful_auth(Addr, Port, User, SDirData) ->
-    Name = make_name(Addr,Port),
-    Msg  = {store_successful_auth, [User,Addr,Port,SDirData]}, 
-    cast(Name, Msg).
-    
-
-%% check_blocked_user
-
-check_blocked_user(Info, User, SDirData, Addr, Port) ->
-    Name = make_name(Addr, Port),
-    Req  = {check_blocked_user, [Info, User, SDirData]}, 
-    call(Name, Req).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% Server call-back functions                                       %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% init
-
-init([undefined]) ->
-    init([?default_verbosity]);
-init([Verbosity]) ->
-    ?DEBUG("init -> entry with Verbosity: ~p",[Verbosity]),
-    process_flag(trap_exit, true),
-    put(sname, sec),
-    put(verbosity, Verbosity),
-    ?vlog("starting",[]),
-    {ok, []}.
-
-
-%% handle_call
-
-handle_call(stop, _From, Tables) ->
-    ?vlog("stop",[]),
-    {stop, normal, ok, []};
-
-
-handle_call({verbosity,Verbosity}, _From, Tables) ->
-    ?vlog("set verbosity to ~p",[Verbosity]),
-    OldVerbosity = get(verbosity),
-    put(verbosity,Verbosity),
-    ?vdebug("old verbosity: ~p",[OldVerbosity]),
-    {reply,OldVerbosity,Tables};
-
-
-handle_call({block_user, User, Addr, Port, Dir, Time}, _From, Tables) ->
-    ?vlog("block user '~p' for ~p",[User,Dir]),
-    Ret = block_user_int({User, Addr, Port, Dir, Time}),
-    ?vdebug("block user result: ~p",[Ret]),
-    {reply, Ret, Tables};
-
-
-handle_call({list_blocked_users, Addr, Port, Dir}, _From, Tables) ->
-    ?vlog("list blocked users for ~p",[Dir]),
-    Blocked = list_blocked(Tables, Addr, Port, Dir, []),
-    ?vdebug("list blocked users: ~p",[Blocked]),
-    {reply, Blocked, Tables};
-
-
-handle_call({unblock_user, User, Addr, Port, Dir}, _From, Tables) ->
-    ?vlog("unblock user '~p' for ~p",[User,Dir]),
-    Ret = unblock_user_int({User, Addr, Port, Dir}),
-    ?vdebug("unblock user result: ~p",[Ret]),
-    {reply, Ret, Tables};
-
-
-handle_call({list_auth_users, Addr, Port, Dir}, _From, Tables) ->
-    ?vlog("list auth users for ~p",[Dir]),
-    Auth = list_auth(Tables, Addr, Port, Dir, []),
-    ?vdebug("list auth users result: ~p",[Auth]),
-    {reply, Auth, Tables};
-
-
-handle_call({new_table, Addr, Port, Name}, _From, Tables) ->
-    case lists:keysearch(Name, 1, Tables) of
-	{value, {Name, {Ets, Dets}}} ->
-	    ?DEBUG("handle_call(new_table) -> we already have this table: ~p",
-		   [Name]),
-	    ?vdebug("new table; we already have this one: ~p",[Name]),
-	    {reply, {ok, {Ets, Dets}}, Tables};
-	false ->
-	    ?LOG("handle_call(new_table) -> new_table: Name = ~p",[Name]),
-	    ?vlog("new table: ~p",[Name]),
-	    TName = make_name(Addr,Port,length(Tables)),
-	    ?DEBUG("handle_call(new_table) -> TName: ~p",[TName]),
-	    ?vdebug("new table: ~p",[TName]),
-	    case dets:open_file(TName, [{type, bag}, {file, Name}, 
-					{repair, true}, 
-					{access, read_write}]) of
-		{ok, DFile} ->
-		    ETS = ets:new(TName, [bag, private]),
-		    sync_dets_to_ets(DFile, ETS),
-		    NewTables = [{Name, {ETS, DFile}}|Tables],
-		    ?DEBUG("handle_call(new_table) -> ~n"
-			   "       NewTables: ~p",[NewTables]),
-		    ?vtrace("new tables: ~p",[NewTables]),
-		    {reply, {ok, {ETS, DFile}}, NewTables};
-		{error, Err} ->
-		    ?LOG("handle_call -> Err: ~p",[Err]),
-		    ?vinfo("failed open dets file: ~p",[Err]),
-		    {reply, {error, {create_dets, Err}}, Tables}
-	    end
-    end;
-
-handle_call(delete_tables, _From, Tables) ->
-    ?vlog("delete tables",[]),
-    lists:foreach(fun({Name, {ETS, DETS}}) ->
-			  dets:close(DETS),
-			  ets:delete(ETS)
-		  end, Tables),
-    {reply, ok, []};
-
-handle_call({check_blocked_user, [Info, User, SDirData]}, _From, Tables) ->
-    ?vlog("check blocked user '~p'",[User]),
-    {ETS, DETS} = httpd_util:key1search(SDirData, data_file),
-    Dir = httpd_util:key1search(SDirData, path),
-    Addr = httpd_util:key1search(SDirData, bind_address),
-    Port = httpd_util:key1search(SDirData, port),
-    CBModule = httpd_util:key1search(SDirData, callback_module, no_module_at_all),
-    ?vdebug("call back module: ~p",[CBModule]),
-    Ret = check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule),
-    ?vdebug("check result: ~p",[Ret]),
-    {reply, Ret, Tables};
-handle_call(Request,From,Tables) ->
-    ?vinfo("~n   unknown call '~p' from ~p",[Request,From]),
-    {reply,ok,Tables}.
-  
-
-%% handle_cast
-
-handle_cast({store_failed_auth, [Info, DecodedString, SDirData]}, Tables) ->
-    ?vlog("store failed auth",[]),
-    {ETS, DETS} = httpd_util:key1search(SDirData, data_file),
-    Dir  = httpd_util:key1search(SDirData, path),
-    Addr = httpd_util:key1search(SDirData, bind_address),
-    Port = httpd_util:key1search(SDirData, port),
-    {ok, [User,Password]} = httpd_util:split(DecodedString,":",2),
-    ?vdebug("user '~p' and password '~p'",[User,Password]),
-    Seconds = universal_time(),
-    Key = {User, Dir, Addr, Port},
-
-    %% Event
-    CBModule = httpd_util:key1search(SDirData, callback_module, no_module_at_all),
-    ?vtrace("call back module: ~p",[CBModule]),
-    auth_fail_event(CBModule,Addr,Port,Dir,User,Password),
-    
-    %% Find out if any of this user's other failed logins are too old to keep..
-    ?vtrace("remove old login failures",[]),
-    case ets:match_object(ETS, {failed, {Key, '_', '_'}}) of
-	[] ->
-	    ?vtrace("no old login failures",[]),
-	    no;
-	List when list(List) ->
-	    ?vtrace("~p old login failures",[length(List)]),
-	    ExpireTime = httpd_util:key1search(SDirData, fail_expire_time, 30)*60,
-	    ?vtrace("expire time ~p",[ExpireTime]),
-	    lists:map(fun({failed, {TheKey, LS, Gen}}) ->
-			      Diff = Seconds-LS,
-			      if
-				  Diff > ExpireTime ->
-				      ?vtrace("~n   '~p' is to old to keep: ~p",
-					      [TheKey,Gen]),
-				      ets:match_delete(ETS, {failed, {TheKey, LS, Gen}}),
-				      dets:match_delete(DETS, {failed, {TheKey, LS, Gen}});
-				  true ->
-				      ?vtrace("~n   '~p' is not old enough: ~p",
-					      [TheKey,Gen]),
-				      ok
-			      end
-		      end,
-		      List);
-	O ->
-	    ?vlog("~n   unknown login failure search resuylt: ~p",[O]),
-	    no
-    end,
-
-    %% Insert the new failure..
-    Generation = length(ets:match_object(ETS, {failed, {Key, '_', '_'}})),
-    ?vtrace("insert ('~p') new login failure: ~p",[Key,Generation]),
-    ets:insert(ETS, {failed, {Key, Seconds, Generation}}),
-    dets:insert(DETS, {failed, {Key, Seconds, Generation}}),
-    
-    %% See if we should block this user..
-    MaxRetries = httpd_util:key1search(SDirData, max_retries, 3),
-    BlockTime = httpd_util:key1search(SDirData, block_time, 60),
-    ?vtrace("~n   Max retries ~p, block time ~p",[MaxRetries,BlockTime]),
-    case ets:match_object(ETS, {failed, {Key, '_', '_'}}) of
-	List1 ->
-	    ?vtrace("~n   ~p tries so far",[length(List1)]),
-	    if 
-		length(List1) >= MaxRetries ->
-		    %% Block this user until Future
-		    ?vtrace("block user '~p'",[User]),
-		    Future = Seconds+BlockTime*60,
-		    ?vtrace("future: ~p",[Future]),
-		    Reason = io_lib:format("Blocking user ~s from dir ~s "
-					   "for ~p minutes", 
-					   [User, Dir, BlockTime]),
-		    mod_log:security_log(Info, lists:flatten(Reason)),
-		    
-		    %% Event
-		    user_block_event(CBModule,Addr,Port,Dir,User),
-		    
-		    ets:match_delete(ETS,{blocked_user,
-					  {User, Addr, Port, Dir, '$1'}}), 
-		    dets:match_delete(DETS, {blocked_user,
-					     {User, Addr, Port, Dir, '$1'}}),
-		    BlockRecord = {blocked_user, 
-				   {User, Addr, Port, Dir, Future}},
-		    ets:insert(ETS, BlockRecord),
-		    dets:insert(DETS, BlockRecord),
-		    %% Remove previous failed requests.
-		    ets:match_delete(ETS, {failed, {Key, '_', '_'}}),
-		    dets:match_delete(DETS, {failed, {Key, '_', '_'}});
-		true ->
-		    ?vtrace("still some tries to go",[]),
-		    no
-	    end;
-	Other ->
-	    no
-    end,
-    {noreply, Tables};
-
-handle_cast({store_successful_auth, [User, Addr, Port, SDirData]}, Tables) ->
-    ?vlog("store successfull auth",[]),
-    {ETS, DETS} = httpd_util:key1search(SDirData, data_file),
-    AuthTimeOut = httpd_util:key1search(SDirData, auth_timeout, 30),
-    Dir = httpd_util:key1search(SDirData, path),
-    Key = {User, Dir, Addr, Port},
-
-    %% Remove failed entries for this Key
-    dets:match_delete(DETS, {failed, {Key, '_', '_'}}),
-    ets:match_delete(ETS, {failed, {Key, '_', '_'}}), 
-
-    %% Keep track of when the last successful login took place.
-    Seconds = universal_time()+AuthTimeOut,
-    ets:match_delete(ETS, {success, {Key, '_'}}),
-    dets:match_delete(DETS, {success, {Key, '_'}}),
-    ets:insert(ETS, {success, {Key, Seconds}}),
-    dets:insert(DETS, {success, {Key, Seconds}}),
-    {noreply, Tables};
-	    
-handle_cast(Req, Tables) ->
-    ?vinfo("~n   unknown cast '~p'",[Req]),
-    error_msg("security server got unknown cast: ~p",[Req]),
-    {noreply, Tables}.
-
-
-%% handle_info
-
-handle_info(Info, State) ->
-    ?vinfo("~n   unknown info '~p'",[Info]),
-    {noreply, State}.
-
-
-%% terminate
-
-terminate(Reason, _Tables) ->
-    ?vlog("~n   Terminating for reason: ~p",[Reason]),
-    ok.
-
-
-%% code_change({down, ToVsn}, State, Extra)
-%% 
-code_change({down, _}, State, _Extra) ->
-    ?vlog("downgrade", []),
-    {ok, State};
-
-
-%% code_change(FromVsn, State, Extra)
-%%
-code_change(_, State, Extra) ->
-    ?vlog("upgrade", []),
-    {ok, State}.
-
-
-
-
-%% block_user_int/2
-block_user_int({User, Addr, Port, Dir, Time}) ->
-    Dirs = httpd_manager:config_match(Addr, Port, {security_directory, '_'}),
-    ?vtrace("block '~p' for ~p during ~p",[User,Dir,Time]),
-    case find_dirdata(Dirs, Dir) of
-	{ok, DirData, {ETS, DETS}} ->
-	    Time1 = 
-		case Time of
-		    infinity ->
-			99999999999999999999999999999;
-		    _ ->
-			Time
-		end,
-	    Future = universal_time()+Time1,
-	    ets:match_delete(ETS, {blocked_user, {User,Addr,Port,Dir,'_'}}),
-	    dets:match_delete(DETS, {blocked_user, {User,Addr,Port,Dir,'_'}}),
-	    ets:insert(ETS, {blocked_user, {User,Addr,Port,Dir,Future}}),
-	    dets:insert(DETS, {blocked_user, {User,Addr,Port,Dir,Future}}),
-	    CBModule = httpd_util:key1search(DirData, callback_module, 
-					     no_module_at_all),
-	    ?vtrace("call back module ~p",[CBModule]),
-	    user_block_event(CBModule,Addr,Port,Dir,User),
-	    true;
-	_ ->
-	    {error, no_such_directory}
-    end.
-    
-
-find_dirdata([], _Dir) ->
-    false;
-find_dirdata([{security_directory, DirData}|SDirs], Dir) ->
-    case lists:keysearch(path, 1, DirData) of
-	{value, {path, Dir}} ->
-	    {value, {data_file, {ETS, DETS}}} =
-		lists:keysearch(data_file, 1, DirData),
-	    {ok, DirData, {ETS, DETS}};
-	_ ->
-	    find_dirdata(SDirs, Dir)
-    end.
-
-%% unblock_user_int/2
-
-unblock_user_int({User, Addr, Port, Dir}) ->
-    ?vtrace("unblock user '~p' for ~p",[User,Dir]),
-    Dirs = httpd_manager:config_match(Addr, Port, {security_directory, '_'}),
-    ?vtrace("~n   dirs: ~p",[Dirs]),
-    case find_dirdata(Dirs, Dir) of
-	{ok, DirData, {ETS, DETS}} ->
-	    case ets:match_object(ETS,{blocked_user,{User,Addr,Port,Dir,'_'}}) of
-		[] ->
-		    ?vtrace("not blocked",[]),
-		    {error, not_blocked};
-		Objects ->
-		    ets:match_delete(ETS, {blocked_user,
-					   {User, Addr, Port, Dir, '_'}}),
-		    dets:match_delete(DETS, {blocked_user,
-					     {User, Addr, Port, Dir, '_'}}),
-	       	    CBModule = httpd_util:key1search(DirData, callback_module, 
-						     no_module_at_all),
-		    user_unblock_event(CBModule,Addr,Port,Dir,User),
-		    true
-	    end;
-	_ ->
-	    ?vlog("~n   cannot unblock: no such directory '~p'",[Dir]),
-	    {error, no_such_directory}
-    end.
-
-
-
-%% list_auth/2
-
-list_auth([], _Addr, _Port, Dir, Acc) ->
-    Acc;
-list_auth([{Name, {ETS, DETS}}|Tables], Addr, Port, Dir, Acc) ->
-    case ets:match_object(ETS, {success, {{'_', Dir, Addr, Port}, '_'}}) of
-	[] ->
-	    list_auth(Tables, Addr, Port, Dir, Acc);
-	List when list(List) ->
-	    TN = universal_time(),
-	    NewAcc = lists:foldr(fun({success,{{U,Ad,P,D},T}},Ac) -> 
-					 if
-					     T-TN > 0 ->
-						 [U|Ac];
-					     true ->
-						 Rec = {success,{{U,Ad,P,D},T}},
-						 ets:match_delete(ETS,Rec),
-						 dets:match_delete(DETS,Rec),
-						 Ac
-					 end
-				 end,
-				 Acc, List),
-	    list_auth(Tables, Addr, Port, Dir, NewAcc);
-	_ ->
-	    list_auth(Tables, Addr, Port, Dir, Acc)
-    end.
-
-
-%% list_blocked/2
-
-list_blocked([], Addr, Port, Dir, Acc) ->
-    TN = universal_time(),
-    lists:foldl(fun({U,Ad,P,D,T}, Ac) ->
-			if
-			    T-TN > 0 ->
-				[{U,Ad,P,D,local_time(T)}|Ac];
-			    true ->
-				Ac
-			end
-		end, 
-		[], Acc);
-list_blocked([{Name, {ETS, DETS}}|Tables], Addr, Port, Dir, Acc) ->
-    NewBlocked = 
-	case ets:match_object(ETS, {blocked_user, {'_',Addr,Port,Dir,'_'}}) of
-	    List when list(List) ->
-		lists:foldl(fun({blocked_user, X}, A) -> [X|A] end, Acc, List);
-	    _ ->
-		Acc
-	end,
-    list_blocked(Tables, Addr, Port, Dir, NewBlocked).
-    
-
-%%
-%% sync_dets_to_ets/2
-%%
-%% Reads dets-table DETS and syncronizes it with the ets-table ETS.
-%%
-sync_dets_to_ets(DETS, ETS) ->
-    dets:traverse(DETS, fun(X) ->
-				ets:insert(ETS, X),
-				continue
-			end).
-
-%%
-%% check_blocked_user/7 -> true | false
-%%
-%% Check if a specific user is blocked from access.
-%%
-%% The sideeffect of this routine is that it unblocks also other users
-%% whos blocking time has expired. This to keep the tables as small
-%% as possible.
-%%
-check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule) ->
-    TN = universal_time(),
-    case ets:match_object(ETS, {blocked_user, {User, '_', '_', '_', '_'}}) of
-	List when list(List) ->
-	    Blocked = lists:foldl(fun({blocked_user, X}, A) ->
-					  [X|A] end, [], List),
-	    check_blocked_user(Info,User,Dir,Addr,Port,ETS,DETS,TN,Blocked,CBModule);
-	_ ->
-	    false
-    end.
-check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, TN, [], CBModule) ->
-    false;
-check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, TN, 
-		   [{User,Addr,Port,Dir,T}|Ls], CBModule) ->
-    TD = T-TN,
-    if
-	TD =< 0 ->
-	    %% Blocking has expired, remove and grant access.
-	    unblock_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule),
-	    false;
-	true ->
-	    true
-    end;
-check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, TN, 
-		   [{OUser,ODir,OAddr,OPort,T}|Ls], CBModule) ->
-    TD = T-TN,
-    if
-	TD =< 0 ->
-	    %% Blocking has expired, remove.
-	    unblock_user(Info, OUser, ODir, OAddr, OPort, ETS, DETS, CBModule);
-	true ->
-	    true
-    end,
-    check_blocked_user(Info, User, Dir, Addr, Port, ETS, DETS, TN, Ls, CBModule).
-
-unblock_user(Info, User, Dir, Addr, Port, ETS, DETS, CBModule) ->
-    Reason=io_lib:format("User ~s was removed from the block list for dir ~s",
-			 [User, Dir]),
-    mod_log:security_log(Info, lists:flatten(Reason)),
-    user_unblock_event(CBModule,Addr,Port,Dir,User),
-    dets:match_delete(DETS, {blocked_user, {User, Addr, Port, Dir, '_'}}),
-    ets:match_delete(ETS, {blocked_user, {User, Addr, Port, Dir, '_'}}).
-  
-
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_security",Addr,Port).
-
-make_name(Addr,Port,Num) ->
-    httpd_util:make_name("httpd_security",Addr,Port,
-			 "__" ++ integer_to_list(Num)).
-
-
-auth_fail_event(Mod,Addr,Port,Dir,User,Passwd) ->
-    event(auth_fail,Mod,Addr,Port,Dir,[{user,User},{password,Passwd}]).
-
-user_block_event(Mod,Addr,Port,Dir,User) ->
-    event(user_block,Mod,Addr,Port,Dir,[{user,User}]).
-
-user_unblock_event(Mod,Addr,Port,Dir,User) ->
-    event(user_unblock,Mod,Addr,Port,Dir,[{user,User}]).
-
-event(Event,Mod,undefined,Port,Dir,Info) ->
-    (catch Mod:event(Event,Port,Dir,Info));
-event(Event,Mod,Addr,Port,Dir,Info) ->
-    (catch Mod:event(Event,Addr,Port,Dir,Info)).
-
-universal_time() ->
-    calendar:datetime_to_gregorian_seconds(calendar:universal_time()).
-
-local_time(T) ->
-    calendar:universal_time_to_local_time(
-      calendar:gregorian_seconds_to_datetime(T)).
-
-
-error_msg(F, A) ->
-    error_logger:error_msg(F, A).
-
-
-call(Name, Req) ->
-    case (catch gen_server:call(Name, Req)) of
-        {'EXIT', Reason} ->
-            {error, Reason};
-        Reply ->
-            Reply
-    end.
-
-
-cast(Name, Msg) ->
-    case (catch gen_server:cast(Name, Msg)) of
-        {'EXIT', Reason} ->
-            {error, Reason};
-        Result ->
-            Result
-    end.
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_trace.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_trace.erl
deleted file mode 100644
index 51fe6d283a..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/mod_trace.erl
+++ /dev/null
@@ -1,69 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mod_trace.erl,v 1.1 2008/12/17 09:53:36 mikpe Exp $
-%%
--module(mod_trace).
-
--export([do/1]).
-
--include("httpd.hrl").
-
-
-do(Info) ->
-    %%?vtrace("do",[]),
-    case Info#mod.method of
-	"TRACE" ->
-	    case httpd_util:response_generated(Info) of
-		false->
-		    generate_trace_response(Info);
-	        true->
-		    {proceed,Info#mod.data}
-	    end;
-	_ ->
-	    {proceed,Info#mod.data}
-    end.
-
-
-%%---------------------------------------------------------------------
-%%Generate the trace response the trace response consists of a 
-%%http-header and the body will be the request.
-%5----------------------------------------------------------------------
-
-generate_trace_response(Info)->
-    RequestHead=Info#mod.parsed_header,
-    Body=generate_trace_response_body(RequestHead),
-    Len=length(Body),
-    Response=["HTTP/1.1 200 OK\r\n",
-	      "Content-Type:message/http\r\n",
-	      "Content-Length:",integer_to_list(Len),"\r\n\r\n",
-	      Info#mod.request_line,Body],
-    httpd_socket:deliver(Info#mod.socket_type,Info#mod.socket,Response),
-    {proceed,[{response,{already_sent,200,Len}}|Info#mod.data]}.
-
-generate_trace_response_body(Parsed_header)->
-    generate_trace_response_body(Parsed_header,[]).
-
-generate_trace_response_body([],Head)->
-    lists:flatten(Head);
-generate_trace_response_body([{[],[]}|Rest],Head) ->
-    generate_trace_response_body(Rest,Head);
-generate_trace_response_body([{Field,Value}|Rest],Head) ->
-    generate_trace_response_body(Rest,[Field ++ ":" ++ Value ++ "\r\n"|Head]).
-
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/uri.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/uri.erl
deleted file mode 100644
index e1acd62a31..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/inets/uri.erl
+++ /dev/null
@@ -1,349 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Mobile Arts AB
-%% Portions created by Mobile Arts are Copyright 2002, Mobile Arts AB
-%% All Rights Reserved.''
-%% 
-%%
-%% Author  : Johan Blom <[email protected]>
-%% Description :
-%%   Implements various scheme dependent subsets (e.g. HTTP, FTP etc) based on
-%%   RFC 2396, Uniform Resource Identifiers (URI): Generic Syntax
-%% Created : 27 Jul 2001 by Johan Blom <[email protected]>
-%%
-
--module(uri).
-
--author('[email protected]').
-
--export([parse/1,resolve/2]).
-
-
-%%% Parse URI and return {Scheme,Path}
-%%% Note that Scheme specific parsing/validation is not handled here!
-resolve(Root,Rel) ->
-    ok.
-
-%%% See "http://www.isi.edu/in-notes/iana/assignments/url-schemes" for a list of
-%%% defined URL schemes and references to its sources.
-
-parse(URI) ->
-    case parse_scheme(URI) of
-	{http,Cont} -> parse_http(Cont,http);
-	{https,Cont} -> parse_http(Cont,https);
-	{ftp,Cont} -> parse_ftp(Cont,ftp);
-	{sip,Cont} -> parse_sip(Cont,sip);
-	{sms,Cont} -> parse_sms(Cont,sip);
-	{error,Error} -> {error,Error};
-	{Scheme,Cont} -> {Scheme,Cont}
-    end.
-
-
-%%% Parse the scheme.
-parse_scheme(URI) ->
-    parse_scheme(URI,[]).
-
-parse_scheme([H|URI],Acc) when $a=<H,H=<$z; $A=<H,H=<$Z  ->
-    parse_scheme2(URI,[H|Acc]);
-parse_scheme(_,_) ->
-    {error,no_scheme}.
-
-parse_scheme2([H|URI],Acc)
-  when $a=<H,H=<$z; $A=<H,H=<$Z; $0=<H,H=<$9; H==$-;H==$+;H==$. ->
-    parse_scheme2(URI,[H|Acc]);
-parse_scheme2([$:|URI],Acc) ->
-    {list_to_atom(lists:reverse(Acc)),URI};
-parse_scheme2(_,_) ->
-    {error,no_scheme}.
-
-
-%%% ............................................................................
--define(HTTP_DEFAULT_PORT, 80).
--define(HTTPS_DEFAULT_PORT, 443).
-
-%%% HTTP (Source RFC 2396, RFC 2616) 
-%%%  http_URL = "*" | absoluteURI | abs_path [ "?" query ] | authority
-
-%%%  http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]
-%%% Returns a tuple {http,Host,Port,PathQuery} where
-%%%  Host     = string() Host value
-%%%  Port     = string() Port value
-%%%  PathQuery= string() Combined absolute path and query value
-parse_http("//"++C0,Scheme) ->
-    case scan_hostport(C0,Scheme) of
-	{C1,Host,Port} ->
-	    case scan_pathquery(C1) of
-		{error,Error} ->
-		    {error,Error};
-		PathQuery ->
-		    {Scheme,Host,Port,PathQuery}
-	    end;
-	{error,Error} ->
-	    {error,Error}
-    end;
-parse_http(_,_) ->
-    {error,invalid_url}.
-
-scan_pathquery(C0) ->
-    case scan_abspath(C0) of
-	{error,Error} ->
-	    {error,Error};
-	{[],[]} -> % Add implicit path
-	    "/";
-	{"?"++C1,Path} ->
-	    case scan_query(C1,[]) of
-		{error,Error} ->
-		    {error,Error};
-		Query ->
-		    Path++"?"++Query
-	    end;
-	{[],Path} ->
-	    Path
-    end.
-
-
-%%% ............................................................................
-%%% FIXME!!! This is just a quick hack that doesn't work!
--define(FTP_DEFAULT_PORT, 80).
-
-%%% FTP (Source RFC 2396, RFC 1738, RFC 959)
-%%% Note: This BNF has been modified to better fit with RFC 2396
-%%%  ftp_URL = "ftp:" "//" [ ftp_userinfo ] host [ ":" port ] ftp_abs_path
-%%%  ftp_userinfo	= ftp_user [ ":" ftp_password ]
-%%%  ftp_abs_path 	= "/" ftp_path_segments [ ";type=" ftp_type ]
-%%%  ftp_path_segments	= ftp_segment *( "/" ftp_segment)
-%%%  ftp_segment	= *[ ftp_uchar | "?" | ":" | "@" | "&" | "=" ]
-%%%  ftp_type		= "A" | "I" | "D" | "a" | "i" | "d"
-%%%  ftp_user		= *[ ftp_uchar | ";" | "?" | "&" | "=" ]
-%%%  ftp_password	= *[ ftp_uchar | ";" | "?" | "&" | "=" ]
-%%%  ftp_uchar		= ftp_unreserved | escaped
-%%%  ftp_unreserved	= alphanum | mark | "$" | "+" | ","
-parse_ftp("//"++C0,Scheme) ->
-    case ftp_userinfo(C0) of
-	{C1,Creds} ->
-	    case scan_hostport(C1,Scheme) of
-		{C2,Host,Port} ->
-		    case scan_abspath(C2) of
-			{error,Error} ->
-			    {error,Error};
-			{[],[]} -> % Add implicit path
-			    {Scheme,Creds,Host,Port,"/"};
-			{[],Path} ->
-			    {Scheme,Creds,Host,Port,Path}
-		    end;
-		{error,Error} ->
-		    {error,Error}
-	    end;
-    	{error,Error} ->
-	    {error,Error}
-    end.
-
-ftp_userinfo(C0) ->
-    User="",
-    Password="",
-    {C0,{User,Password}}.
-
-
-%%% ............................................................................
-%%% SIP (Source RFC 2396, RFC 2543)
-%%%  sip_URL = "sip:" [ sip_userinfo "@" ] host [ ":" port ] 
-%%%				sip_url-parameters [ sip_headers ]
-%%%  sip_userinfo    = sip_user [ ":" sip_password ]
-%%%  sip_user	     = *( unreserved | escaped | "&" | "=" | "+" | "$" | "," )
-%%%  sip_password    = *( unreserved | escaped | "&" | "=" | "+" | "$" | "," )
-%%%  sip_url-parameters  = *( ";" sip_url-parameter )
-%%%  sip_url-parameter   = sip_transport-param | sip_user-param |
-%%%  				sip_method-param | sip_ttl-param |
-%%%				sip_maddr-param | sip_other-param
-%%%  sip_transport-param = "transport=" ( "udp" | "tcp" )
-%%%  sip_ttl-param       = "ttl=" sip_ttl
-%%%  sip_ttl             = 1*3DIGIT       ; 0 to 255
-%%%  sip_maddr-param     = "maddr=" host
-%%%  sip_user-param      = "user=" ( "phone" | "ip" )
-%%%  sip_method-param    = "method=" sip_Method
-%%%  sip_tag-param       = "tag=" sip_UUID
-%%%  sip_UUID            = 1*( hex | "-" )
-%%%  sip_other-param     = ( token | ( token "=" ( token | quoted-string )))
-%%%  sip_Method		 = "INVITE" | "ACK" | "OPTIONS" | "BYE" |
-%%%				"CANCEL" | "REGISTER"
-%%%  sip_token		 = 1*< any CHAR  except CTL's  or separators>
-%%%  sip_quoted-string	 = ( <"> *(qdtext | quoted-pair ) <"> )
-%%%  sip_qdtext		 = <any TEXT-UTF8 except <">>
-%%%  sip_quoted-pair	 =  " \ " CHAR
-parse_sip(Cont,Scheme) ->
-    {Scheme,Cont}.
-
-
-
-
-%%% ............................................................................
-%%% SMS (Source draft-wilde-sms-uri-01, January 24 2002 and
-%%%        draft-allocchio-gstn-01, November 2001)
-%%% The syntax definition for "gstn-phone" is taken from
-%%% [draft-allocchio-gstn-01], allowing global as well as local telephone
-%%% numbers.
-%%% Note: This BNF has been modified to better fit with RFC 2396
-%%%   sms_URI               =  sms ":" 1*( sms-recipient ) [ sms-body ]
-%%%   sms-recipient         =  gstn-phone sms-qualifier
-%%%                            [ "," sms-recipient ]
-%%%   sms-qualifier         =  *( smsc-qualifier / pid-qualifier )
-%%%   smsc-qualifier        =  ";smsc=" SMSC-sub-addr
-%%%   pid-qualifier         =  ";pid=" PID-sub-addr
-%%%   sms-body              =  ";body=" *urlc
-%%%   gstn-phone = ( global-phone / local-phone )
-%%%   global-phone = "+" 1*( DIGIT / written-sep )
-%%%   local-phone =  [ exit-code ] dial-number / exit-code [ dial-number ]
-%%%   exit-code = phone-string
-%%%   dial-number = phone-string
-%%%   subaddr-string = phone-string
-%%%   post-dial = phone-string
-%%%   phone-string = 1*( DTMF / pause / tonewait / written-sep )
-%%%   DTMF = ( DIGIT / "#" / "*" / "A" / "B" / "C" / "D" )
-%%%   written-sep = ( "-" / "." )
-%%%   pause = "p"
-%%%   tonewait = "w"
-parse_sms(Cont,Scheme) ->
-    {Scheme,Cont}.
-    
-
-%%% ============================================================================
-%%% Generic URI parsing. BNF rules from RFC 2396
-
-%%%      hostport      = host [ ":" port ]
-scan_hostport(C0,Scheme) ->
-    case scan_host(C0) of
-	{error,Error} ->
-	    {error,Error};
-	{":"++C1,Host} ->
-	    {C2,Port}=scan_port(C1,[]),
-	    {C2,Host,list_to_integer(Port)};
-	{C1,Host} when Scheme==http ->
-	    {C1,Host,?HTTP_DEFAULT_PORT};
-	{C1,Host} when Scheme==https ->
-	    {C1,Host,?HTTPS_DEFAULT_PORT};
-	{C1,Host} when Scheme==ftp ->
-	    {C1,Host,?FTP_DEFAULT_PORT}
-    end.
-
-
-%%%      host          = hostname | IPv4address
-%%%      hostname      = *( domainlabel "." ) toplabel [ "." ]
-%%%      domainlabel   = alphanum | alphanum *( alphanum | "-" ) alphanum
-%%%      toplabel      = alpha | alpha *( alphanum | "-" ) alphanum
-%%%      IPv4address   = 1*digit "." 1*digit "." 1*digit "." 1*digit
-
--define(ALPHA, 1).
--define(DIGIT, 2).
-
-scan_host(C0) ->
-    case scan_host2(C0,[],0,[],[]) of
-	{C1,IPv4address,[?DIGIT,?DIGIT,?DIGIT,?DIGIT]} ->
-	    {C1,lists:reverse(lists:append(IPv4address))};
-	{C1,Hostname,[?ALPHA|HostF]} ->
-	    {C1,lists:reverse(lists:append(Hostname))};
-	_ ->
-	    {error,no_host}
-    end.
-    
-scan_host2([H|C0],Acc,CurF,Host,HostF) when $0=<H,H=<$9 ->
-    scan_host2(C0,[H|Acc],CurF bor ?DIGIT,Host,HostF);
-scan_host2([H|C0],Acc,CurF,Host,HostF) when $a=<H,H=<$z; $A=<H,H=<$Z ->
-    scan_host2(C0,[H|Acc],CurF bor ?ALPHA,Host,HostF);
-scan_host2([$-|C0],Acc,CurF,Host,HostF) when CurF=/=0 ->
-    scan_host2(C0,[$-|Acc],CurF,Host,HostF);
-scan_host2([$.|C0],Acc,CurF,Host,HostF) when CurF=/=0 ->
-    scan_host2(C0,[],0,[".",Acc|Host],[CurF|HostF]);
-scan_host2(C0,Acc,CurF,Host,HostF) ->
-    {C0,[Acc|Host],[CurF|HostF]}.
-
-
-%%%      port          = *digit
-scan_port([H|C0],Acc) when $0=<H,H=<$9 ->
-    scan_port(C0,[H|Acc]);
-scan_port(C0,Acc) ->
-    {C0,lists:reverse(Acc)}.
-
-%%%      abs_path      = "/"  path_segments
-scan_abspath([]) ->
-    {[],[]};
-scan_abspath("/"++C0) ->
-    scan_pathsegments(C0,["/"]);
-scan_abspath(_) ->
-    {error,no_abspath}.
-
-%%%      path_segments = segment *( "/" segment )
-scan_pathsegments(C0,Acc) ->
-    case scan_segment(C0,[]) of
-	{"/"++C1,Segment} ->
-	    scan_pathsegments(C1,["/",Segment|Acc]);
-	{C1,Segment} ->
-	    {C1,lists:reverse(lists:append([Segment|Acc]))}
-    end.
-
-
-%%%      segment       = *pchar *( ";" param )
-%%%      param         = *pchar
-scan_segment(";"++C0,Acc) ->
-    {C1,ParamAcc}=scan_pchars(C0,";"++Acc),
-    scan_segment(C1,ParamAcc);
-scan_segment(C0,Acc) ->
-    case scan_pchars(C0,Acc) of
-	{";"++C1,Segment} ->
-	    {C2,ParamAcc}=scan_pchars(C1,";"++Segment),
-	    scan_segment(C2,ParamAcc);
-	{C1,Segment} ->
-	    {C1,Segment}
-    end.
-
-%%%      query         = *uric
-%%%      uric          = reserved | unreserved | escaped
-%%%      reserved      = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
-%%%                      "$" | ","
-%%%      unreserved    = alphanum | mark
-%%%      mark          = "-" | "_" | "." | "!" | "~" | "*" | "'" |
-%%%                      "(" | ")"
-%%%      escaped       = "%" hex hex
-scan_query([],Acc) ->
-    lists:reverse(Acc);
-scan_query([$%,H1,H2|C0],Acc) -> % escaped
-    scan_query(C0,[hex2dec(H1)*16+hex2dec(H2)|Acc]);
-scan_query([H|C0],Acc) when $a=<H,H=<$z;$A=<H,H=<$Z;$0=<H,H=<$9 -> % alphanum
-    scan_query(C0,[H|Acc]);
-scan_query([H|C0],Acc) when H==$;; H==$/; H==$?; H==$:; H==$@;
-			    H==$&; H==$=; H==$+; H==$$; H==$, -> % reserved
-    scan_query(C0,[H|Acc]);
-scan_query([H|C0],Acc) when H==$-; H==$_; H==$.; H==$!; H==$~;
-			    H==$*; H==$'; H==$(; H==$) -> % mark
-    scan_query(C0,[H|Acc]);
-scan_query([H|C0],Acc) ->
-    {error,no_query}.
-
-
-%%%      pchar         = unreserved | escaped |
-%%%                      ":" | "@" | "&" | "=" | "+" | "$" | ","
-scan_pchars([],Acc) ->
-    {[],Acc};
-scan_pchars([$%,H1,H2|C0],Acc) -> % escaped
-    scan_pchars(C0,[hex2dec(H1)*16+hex2dec(H2)|Acc]);
-scan_pchars([H|C0],Acc) when $a=<H,H=<$z;$A=<H,H=<$Z;$0=<H,H=<$9  -> % alphanum
-    scan_pchars(C0,[H|Acc]);
-scan_pchars([H|C0],Acc) when H==$-; H==$_; H==$.; H==$!; H==$~;
-			     H==$*; H==$'; H==$(; H==$) -> % mark
-    scan_pchars(C0,[H|Acc]);
-scan_pchars([H|C0],Acc) when H==$:; H==$@; H==$&; H==$=; H==$+; H==$$; H==$, ->
-    scan_pchars(C0,[H|Acc]);
-scan_pchars(C0,Acc) ->
-    {C0,Acc}.
-
-hex2dec(X) when X>=$0,X=<$9 -> X-$0;
-hex2dec(X) when X>=$A,X=<$F -> X-$A+10;
-hex2dec(X) when X>=$a,X=<$f -> X-$a+10.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/Makefile b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/Makefile
deleted file mode 100644
index 461dc82155..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/Makefile
+++ /dev/null
@@ -1,137 +0,0 @@
-# ``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 via the world wide web 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.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id: Makefile,v 1.1 2008/12/17 09:53:37 mikpe Exp $
-#
-include $(ERL_TOP)/make/target.mk
-
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug -W
-endif
- 
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(MNESIA_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/mnesia-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-MODULES= \
-	mnesia \
-	mnesia_backup \
-	mnesia_bup \
-	mnesia_checkpoint \
-	mnesia_checkpoint_sup \
-	mnesia_controller \
-	mnesia_dumper\
-	mnesia_event \
-	mnesia_frag \
-	mnesia_frag_hash \
-	mnesia_frag_old_hash \
-	mnesia_index \
-	mnesia_kernel_sup \
-	mnesia_late_loader \
-	mnesia_lib\
-	mnesia_loader \
-	mnesia_locker \
-	mnesia_log \
-	mnesia_monitor \
-	mnesia_recover \
-	mnesia_registry \
-	mnesia_schema\
-	mnesia_snmp_hook \
-	mnesia_snmp_sup \
-	mnesia_subscr \
-	mnesia_sup \
-	mnesia_sp  \
-	mnesia_text \
-	mnesia_tm
-
-HRL_FILES= mnesia.hrl
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
-
-APP_FILE= mnesia.app
-
-APP_SRC= $(APP_FILE).src
-APP_TARGET= $(EBIN)/$(APP_FILE)
-
-APPUP_FILE= mnesia.appup
-
-APPUP_SRC= $(APPUP_FILE).src
-APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
-
-
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_FLAGS += 
-ERL_COMPILE_FLAGS += \
-	+warn_unused_vars \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,vsn,"mnesia_$(MNESIA_VSN)"}' \
-	-W
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-opt: $(TARGET_FILES)
-
-debug:
-	@${MAKE} TYPE=debug
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-
-release_docs_spec:
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.app.src b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.app.src
deleted file mode 100644
index 3715488ec2..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.app.src
+++ /dev/null
@@ -1,52 +0,0 @@
-{application, mnesia,
- [{description, "MNESIA  CXC 138 12"},
-  {vsn, "%VSN%"},
-  {modules, [
-	     mnesia, 
-	     mnesia_backup, 
-	     mnesia_bup, 
-	     mnesia_checkpoint, 
-	     mnesia_checkpoint_sup,
-	     mnesia_controller,
-	     mnesia_dumper, 
-	     mnesia_event, 
-	     mnesia_frag, 
-	     mnesia_frag_hash, 
-             mnesia_frag_old_hash,
-	     mnesia_index, 
-             mnesia_kernel_sup,
-	     mnesia_late_loader,
-	     mnesia_lib, 
-	     mnesia_loader, 
-	     mnesia_locker, 
-	     mnesia_log, 
-	     mnesia_monitor, 
-	     mnesia_recover,
-	     mnesia_registry,
-	     mnesia_schema, 
-	     mnesia_snmp_hook, 
-	     mnesia_snmp_sup, 
-	     mnesia_subscr, 
-	     mnesia_sup, 
-	     mnesia_sp,
-	     mnesia_text,
-	     mnesia_tm 
-            ]},
-  {registered, [
-		mnesia_dumper_load_regulator,
-		mnesia_event,
-		mnesia_fallback,
-		mnesia_controller,
-		mnesia_kernel_sup,
-		mnesia_late_loader, 
-		mnesia_locker, 
-		mnesia_monitor,
-		mnesia_recover,
-		mnesia_substr, 
-		mnesia_sup, 
-		mnesia_tm
-	       ]},
-  {applications, [kernel, stdlib]},
-  {mod, {mnesia_sup, []}}]}.
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.appup.src b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.appup.src
deleted file mode 100644
index 502ddb02fc..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.appup.src
+++ /dev/null
@@ -1,6 +0,0 @@
-{"%VSN%",
- [ 
-  ],
- [
-  ] 
-}.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.erl
deleted file mode 100644
index 956f4f5395..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.erl
+++ /dev/null
@@ -1,2191 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia.erl,v 1.2 2010/03/04 13:54:19 maria Exp $
-%%
-%% This module exports the public interface of the Mnesia DBMS engine
-
--module(mnesia).
-%-behaviour(mnesia_access).
-
--export([
-	 %% Start, stop and debugging
-	 start/0, start/1, stop/0,           % Not for public use
-	 set_debug_level/1, lkill/0, kill/0, % Not for public use
-	 ms/0, nc/0, nc/1, ni/0, ni/1,       % Not for public use
-	 change_config/2,
-
-	 %% Activity mgt
-	 abort/1, transaction/1, transaction/2, transaction/3,
-	 sync_transaction/1, sync_transaction/2, sync_transaction/3,
-	 async_dirty/1, async_dirty/2, sync_dirty/1, sync_dirty/2, ets/1, ets/2,
-	 activity/2, activity/3, activity/4, % Not for public use
-
-	 %% Access within an activity - Lock acquisition
-	 lock/2, lock/4,
-	 read_lock_table/1, 
-	 write_lock_table/1,
-
-	 %% Access within an activity - Updates
-	 write/1, s_write/1, write/3, write/5, 
-	 delete/1, s_delete/1, delete/3, delete/5, 
-	 delete_object/1, s_delete_object/1, delete_object/3, delete_object/5, 
-	 
-	 %% Access within an activity - Reads
-	 read/1, wread/1, read/3, read/5,
-	 match_object/1, match_object/3, match_object/5,
-	 select/2, select/3, select/5,
-	 all_keys/1, all_keys/4,
-	 index_match_object/2, index_match_object/4, index_match_object/6,
-	 index_read/3, index_read/6,
-
-	 %% Iterators within an activity 
-	 foldl/3, foldl/4, foldr/3, foldr/4,
-	 
-	 %% Dirty access regardless of activities - Updates
-	 dirty_write/1, dirty_write/2,
-	 dirty_delete/1, dirty_delete/2,
-	 dirty_delete_object/1, dirty_delete_object/2,
-	 dirty_update_counter/2, dirty_update_counter/3,
-
-	 %% Dirty access regardless of activities - Read
-	 dirty_read/1, dirty_read/2,
-	 dirty_select/2,
-	 dirty_match_object/1, dirty_match_object/2, dirty_all_keys/1,
-	 dirty_index_match_object/2, dirty_index_match_object/3,
-	 dirty_index_read/3, dirty_slot/2, 
-	 dirty_first/1, dirty_next/2, dirty_last/1, dirty_prev/2, 
-
-	 %% Info
-	 table_info/2, table_info/4, schema/0, schema/1,
-	 error_description/1, info/0, system_info/1,
-	 system_info/0,                      % Not for public use
-
-	 %% Database mgt
-	 create_schema/1, delete_schema/1,
-	 backup/1, backup/2, traverse_backup/4, traverse_backup/6,
-	 install_fallback/1, install_fallback/2,
-	 uninstall_fallback/0, uninstall_fallback/1,
-	 activate_checkpoint/1, deactivate_checkpoint/1,
-	 backup_checkpoint/2, backup_checkpoint/3, restore/2,
-
-	 %% Table mgt
-	 create_table/1, create_table/2, delete_table/1,
-	 add_table_copy/3, del_table_copy/2, move_table_copy/3,
-	 add_table_index/2, del_table_index/2,
-	 transform_table/3, transform_table/4,
-	 change_table_copy_type/3,
-	 read_table_property/2, write_table_property/2, delete_table_property/2,
-	 change_table_frag/2,
-	 clear_table/1,
-
-	 %% Table load
-	 dump_tables/1, wait_for_tables/2, force_load_table/1,
-	 change_table_access_mode/2, change_table_load_order/2,
-	 set_master_nodes/1, set_master_nodes/2,
-	 
-	 %% Misc admin
-	 dump_log/0, subscribe/1, unsubscribe/1, report_event/1,
-
-	 %% Snmp
-	 snmp_open_table/2, snmp_close_table/1,
-	 snmp_get_row/2, snmp_get_next_index/2, snmp_get_mnesia_key/2,
-
-	 %% Textfile access
-	 load_textfile/1, dump_to_textfile/1,
-	 
-	 %% Mnemosyne exclusive
-	 get_activity_id/0, put_activity_id/1, % Not for public use
-
-	 %% Mnesia internal functions
-	 dirty_rpc/4,                          % Not for public use
-	 has_var/1, fun_select/7,
-	 foldl/6, foldr/6,
-
-	 %% Module internal callback functions
-	 remote_dirty_match_object/2,           % Not for public use
-	 remote_dirty_select/2                  % Not for public use
-	]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--include("mnesia.hrl").
--import(mnesia_lib, [verbose/2]).
-
--define(DEFAULT_ACCESS, ?MODULE).
-
-%% Select 
--define(PATTERN_TO_OBJECT_MATCH_SPEC(Pat), [{Pat,[],['$_']}]).
--define(PATTERN_TO_BINDINGS_MATCH_SPEC(Pat), [{Pat,[],['$$']}]).
-   
-%% Local function in order to avoid external function call
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason); 
-	Value -> Value
-    end.
-
-is_dollar_digits(Var) ->
-    case atom_to_list(Var) of
-	[$$ | Digs] -> 
-	    is_digits(Digs);
-	_ ->
-	    false
-    end.
-
-is_digits([Dig | Tail]) ->
-    if
-	$0 =< Dig, Dig =< $9 ->
-	    is_digits(Tail);
-	true ->
-	    false
-    end;
-is_digits([]) ->
-    true.
-
-has_var(X) when atom(X) -> 
-    if 
-	X == '_' -> 
-	    true;
-	atom(X) -> 
-	    is_dollar_digits(X);
-	true  -> 
-	    false
-    end;
-has_var(X) when tuple(X) ->
-    e_has_var(X, size(X));
-has_var([H|T]) ->
-    case has_var(H) of
-	false -> has_var(T);
-	Other -> Other
-    end;
-has_var(_) -> false.
-
-e_has_var(_, 0) -> false;
-e_has_var(X, Pos) ->
-    case has_var(element(Pos, X))of
-	false -> e_has_var(X, Pos-1);
-	Other -> Other
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Start and stop
-
-start() ->
-    {Time , Res} =  timer:tc(application, start, [?APPLICATION, temporary]),
-    
-    Secs = Time div 1000000,
-    case Res of 
-	ok ->
-	    verbose("Mnesia started, ~p seconds~n",[ Secs]),
-	    ok;
-	{error, {already_started, mnesia}} ->
-	    verbose("Mnesia already started, ~p seconds~n",[ Secs]),
-	    ok;
-	{error, R} ->
-	    verbose("Mnesia failed to start, ~p seconds: ~p~n",[ Secs, R]),
-	    {error, R}
-    end.
-
-start(ExtraEnv) when list(ExtraEnv) ->
-    case mnesia_lib:ensure_loaded(?APPLICATION) of
-	ok ->
-	    patched_start(ExtraEnv);
-	Error ->
-	    Error
-    end;
-start(ExtraEnv) ->
-    {error, {badarg, ExtraEnv}}.
-
-patched_start([{Env, Val} | Tail]) when atom(Env) ->
-    case mnesia_monitor:patch_env(Env, Val) of
-	{error, Reason} ->
-	    {error, Reason};
-	_NewVal ->
-	    patched_start(Tail)
-    end;
-patched_start([Head | _]) ->
-    {error, {bad_type, Head}};
-patched_start([]) ->
-    start().
-
-stop() ->
-    case application:stop(?APPLICATION) of
-	ok -> stopped;
-	{error, {not_started, ?APPLICATION}} -> stopped;
-	Other -> Other
-    end.
-
-change_config(extra_db_nodes, Ns) when list(Ns) ->
-    mnesia_controller:connect_nodes(Ns);
-change_config(BadKey, _BadVal) ->
-    {error, {badarg, BadKey}}.
-     
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Debugging
-
-set_debug_level(Level) -> 
-    mnesia_subscr:set_debug_level(Level).
-
-lkill() ->
-    mnesia_sup:kill().
-
-kill() ->
-    rpc:multicall(mnesia_sup, kill, []).
-
-ms() ->
-    [
-     mnesia,
-     mnesia_backup,
-     mnesia_bup,
-     mnesia_checkpoint,
-     mnesia_checkpoint_sup,
-     mnesia_controller,
-     mnesia_dumper,
-     mnesia_loader,
-     mnesia_frag, 
-     mnesia_frag_hash, 
-     mnesia_frag_old_hash, 
-     mnesia_index,
-     mnesia_kernel_sup,
-     mnesia_late_loader,
-     mnesia_lib,
-     mnesia_log,
-     mnesia_registry,
-     mnesia_schema,
-     mnesia_snmp_hook,
-     mnesia_snmp_sup,
-     mnesia_subscr,
-     mnesia_sup,
-     mnesia_text,
-     mnesia_tm,
-     mnesia_recover,
-     mnesia_locker,
-
-     %% Keep these last in the list, so
-     %% mnesia_sup kills these last
-     mnesia_monitor, 
-     mnesia_event
-    ]. 
-
-nc() ->
-    Mods = ms(),
-    nc(Mods).
-
-nc(Mods) when list(Mods)->
-    [Mod || Mod <- Mods, ok /= load(Mod, compile)].
-
-ni() -> 
-    Mods = ms(),
-    ni(Mods).
-
-ni(Mods) when list(Mods) ->
-    [Mod || Mod <- Mods, ok /= load(Mod, interpret)].
-
-load(Mod, How) when atom(Mod) ->
-    case try_load(Mod, How) of
-	ok ->
-	    ok;
-	_ ->
-	    mnesia_lib:show( "~n RETRY ~p FROM: ", [Mod]),
-	    Abs = mod2abs(Mod),
-	    load(Abs, How)
-    end;
-load(Abs, How) ->
-    case try_load(Abs, How) of
-	ok ->
-	    ok;
-	{error, Reason} ->
-	    mnesia_lib:show( " *** ERROR *** ~p~n", [Reason]),
-	    {error, Reason}
-    end.
-
-try_load(Mod, How) ->
-    mnesia_lib:show( " ~p ", [Mod]),
-    Flags = [{d, debug}],
-    case How of
-	compile ->
-	    case catch c:nc(Mod, Flags) of
-		{ok, _} -> ok;
-		Other -> {error, Other}
-	    end;
-	interpret ->
-	    case catch int:ni(Mod, Flags) of
-		{module, _} -> ok;
-		Other -> {error, Other}
-	    end
-    end.
-
-mod2abs(Mod) ->
-    ModString = atom_to_list(Mod),
-    SubDir =
-	case lists:suffix("test", ModString) of
-	    true -> test;
-	    false -> src
-	end,
-    filename:join([code:lib_dir(?APPLICATION), SubDir, ModString]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Activity mgt
-
-abort(Reason) -> 
-    exit({aborted, Reason}).
-
-transaction(Fun) ->
-    transaction(get(mnesia_activity_state), Fun, [], infinity, ?DEFAULT_ACCESS, async).
-transaction(Fun, Retries) when integer(Retries), Retries >= 0 ->
-    transaction(get(mnesia_activity_state), Fun, [], Retries, ?DEFAULT_ACCESS, async);
-transaction(Fun, Retries) when Retries == infinity ->
-    transaction(get(mnesia_activity_state), Fun, [], Retries, ?DEFAULT_ACCESS, async);
-transaction(Fun, Args) ->
-    transaction(get(mnesia_activity_state), Fun, Args, infinity, ?DEFAULT_ACCESS, async).
-transaction(Fun, Args, Retries) ->
-    transaction(get(mnesia_activity_state), Fun, Args, Retries, ?DEFAULT_ACCESS, async).
-
-sync_transaction(Fun) ->
-    transaction(get(mnesia_activity_state), Fun, [], infinity, ?DEFAULT_ACCESS, sync).
-sync_transaction(Fun, Retries) when integer(Retries), Retries >= 0 ->
-    transaction(get(mnesia_activity_state), Fun, [], Retries, ?DEFAULT_ACCESS, sync);
-sync_transaction(Fun, Retries) when Retries == infinity ->
-    transaction(get(mnesia_activity_state), Fun, [], Retries, ?DEFAULT_ACCESS, sync);
-sync_transaction(Fun, Args) ->
-    transaction(get(mnesia_activity_state), Fun, Args, infinity, ?DEFAULT_ACCESS, sync).
-sync_transaction(Fun, Args, Retries) ->
-    transaction(get(mnesia_activity_state), Fun, Args, Retries, ?DEFAULT_ACCESS, sync).
-
-
-transaction(State, Fun, Args, Retries, Mod, Kind) 
-  when function(Fun), list(Args), Retries == infinity, atom(Mod) ->
-    mnesia_tm:transaction(State, Fun, Args, Retries, Mod, Kind);
-transaction(State, Fun, Args, Retries, Mod, Kind)
-  when function(Fun), list(Args), integer(Retries), Retries >= 0, atom(Mod) ->
-    mnesia_tm:transaction(State, Fun, Args, Retries, Mod, Kind);
-transaction(_State, Fun, Args, Retries, Mod, _Kind) ->
-    {aborted, {badarg, Fun, Args, Retries, Mod}}.
-
-non_transaction(State, Fun, Args, ActivityKind, Mod) 
-  when function(Fun), list(Args), atom(Mod) ->
-    mnesia_tm:non_transaction(State, Fun, Args, ActivityKind, Mod);
-non_transaction(_State, Fun, Args, _ActivityKind, _Mod) ->
-    {aborted, {badarg, Fun, Args}}.
-
-async_dirty(Fun) ->
-    async_dirty(Fun, []).
-async_dirty(Fun, Args) ->
-    non_transaction(get(mnesia_activity_state), Fun, Args, async_dirty, ?DEFAULT_ACCESS).
-
-sync_dirty(Fun) ->
-    sync_dirty(Fun, []).
-sync_dirty(Fun, Args) ->
-    non_transaction(get(mnesia_activity_state), Fun, Args, sync_dirty, ?DEFAULT_ACCESS).
-
-ets(Fun) ->
-    ets(Fun, []).
-ets(Fun, Args) ->
-    non_transaction(get(mnesia_activity_state), Fun, Args, ets, ?DEFAULT_ACCESS).
-
-activity(Kind, Fun) ->
-    activity(Kind, Fun, []).
-activity(Kind, Fun, Args) when list(Args) ->
-    activity(Kind, Fun, Args, mnesia_monitor:get_env(access_module));
-activity(Kind, Fun, Mod) ->
-    activity(Kind, Fun, [], Mod).
-
-activity(Kind, Fun, Args, Mod) ->
-    State = get(mnesia_activity_state),
-    case Kind of
-	ets ->                    non_transaction(State, Fun, Args, Kind, Mod);
-	async_dirty ->            non_transaction(State, Fun, Args, Kind, Mod);
-	sync_dirty ->             non_transaction(State, Fun, Args, Kind, Mod);
-	transaction ->            wrap_trans(State, Fun, Args, infinity, Mod, async);
-	{transaction, Retries} -> wrap_trans(State, Fun, Args, Retries, Mod, async);
-	sync_transaction ->            wrap_trans(State, Fun, Args, infinity, Mod, sync);
-	{sync_transaction, Retries} -> wrap_trans(State, Fun, Args, Retries, Mod, sync);
-	_ ->                      {aborted, {bad_type, Kind}}
-    end.
-
-wrap_trans(State, Fun, Args, Retries, Mod, Kind) ->
-    case transaction(State, Fun, Args, Retries, Mod, Kind) of
-	{'atomic', GoodRes} -> GoodRes;
-	BadRes -> exit(BadRes)
-    end.
-	     
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Access within an activity - lock acquisition
-
-%% Grab a lock on an item in the global lock table
-%% Item may be any term. Lock may be write or read.
-%% write lock is set on all the given nodes
-%% read lock is only set on the first node
-%% Nodes may either be a list of nodes or one node as an atom
-%% Mnesia on all Nodes must be connected to each other, but
-%% it is not neccessary that they are up and running.
-
-lock(LockItem, LockKind) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    lock(Tid, Ts, LockItem, LockKind);
-	{Mod, Tid, Ts} ->
-	    Mod:lock(Tid, Ts, LockItem, LockKind);
-	_ ->
-	    abort(no_transaction)
-    end.
-
-lock(Tid, Ts, LockItem, LockKind) ->
-    case element(1, Tid) of
-	tid ->
-	    case LockItem of
-		{record, Tab, Key} ->
-		    lock_record(Tid, Ts, Tab, Key, LockKind);
-		{table, Tab} ->
-		    lock_table(Tid, Ts, Tab, LockKind);
-		{global, GlobalKey, Nodes} ->
-		    global_lock(Tid, Ts, GlobalKey, LockKind, Nodes);
-		_ ->
-		    abort({bad_type, LockItem})
-	    end;
-	_Protocol ->
-	    []
-    end.
-
-%% Grab a read lock on a whole table
-read_lock_table(Tab) ->
-    lock({table, Tab}, read),
-    ok.
-
-%% Grab a write lock on a whole table
-write_lock_table(Tab) ->
-    lock({table, Tab}, write),
-    ok.
-
-lock_record(Tid, Ts, Tab, Key, LockKind) when atom(Tab) ->
-    Store = Ts#tidstore.store,
-    Oid =  {Tab, Key},
-    case LockKind of
-	read ->
-	    mnesia_locker:rlock(Tid, Store, Oid);
-	write ->
-	    mnesia_locker:wlock(Tid, Store, Oid);
-	sticky_write ->
-	    mnesia_locker:sticky_wlock(Tid, Store, Oid);
-	none ->
-	    [];
-	_ ->
-	    abort({bad_type, Tab, LockKind})
-    end;
-lock_record(_Tid, _Ts, Tab, _Key, _LockKind) ->
-    abort({bad_type, Tab}).
-
-lock_table(Tid, Ts, Tab, LockKind) when atom(Tab) ->
-    Store = Ts#tidstore.store,
-    case LockKind of
-	read ->
-	    mnesia_locker:rlock_table(Tid, Store, Tab);
-	write ->
-	    mnesia_locker:wlock_table(Tid, Store, Tab);
-	sticky_write ->
-	    mnesia_locker:sticky_wlock_table(Tid, Store, Tab);
-	none ->
-	    [];
-	_ ->
-	    abort({bad_type, Tab, LockKind})
-    end;
-lock_table(_Tid, _Ts, Tab, _LockKind) ->
-    abort({bad_type, Tab}).
-
-global_lock(Tid, Ts, Item, Kind, Nodes) when list(Nodes) ->
-    case element(1, Tid) of
-	tid ->
-	    Store = Ts#tidstore.store,
-	    GoodNs = good_global_nodes(Nodes),
-	    if
-		Kind /= read, Kind /= write ->
-		    abort({bad_type, Kind});
-		true ->
-		    mnesia_locker:global_lock(Tid, Store, Item, Kind, GoodNs)
-	    end;
-	_Protocol ->
-	    []
-    end;
-global_lock(_Tid, _Ts, _Item, _Kind, Nodes) ->
-    abort({bad_type, Nodes}).
-
-good_global_nodes(Nodes) ->
-    Recover = [node() | val(recover_nodes)],
-    mnesia_lib:intersect(Nodes, Recover).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Access within an activity - updates
-
-write(Val) when tuple(Val), size(Val) > 2 -> 
-    Tab = element(1, Val),
-    write(Tab, Val, write);
-write(Val) ->
-    abort({bad_type, Val}).
-
-s_write(Val) when tuple(Val), size(Val) > 2 -> 
-    Tab = element(1, Val),
-    write(Tab, Val, sticky_write).
-
-write(Tab, Val, LockKind) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    write(Tid, Ts, Tab, Val, LockKind);
-	{Mod, Tid, Ts} ->
-	    Mod:write(Tid, Ts, Tab, Val, LockKind);
-	_ ->
-	    abort(no_transaction)
-    end.
-
-write(Tid, Ts, Tab, Val, LockKind)
-  when atom(Tab), Tab /= schema, tuple(Val), size(Val) > 2 ->
-    case element(1, Tid) of
-	ets ->
-	    ?ets_insert(Tab, Val),
-	    ok;
-	tid ->
-	    Store = Ts#tidstore.store,
-	    Oid = {Tab, element(2, Val)},
-	    case LockKind of
-		write ->
-		    mnesia_locker:wlock(Tid, Store, Oid);
-		sticky_write ->
-		    mnesia_locker:sticky_wlock(Tid, Store, Oid);
-		_ ->
-		    abort({bad_type, Tab, LockKind})
-	    end,
-	    write_to_store(Tab, Store, Oid, Val);
-	Protocol ->
-	    do_dirty_write(Protocol, Tab, Val)
-    end;
-write(_Tid, _Ts, Tab, Val, LockKind) ->
-    abort({bad_type, Tab, Val, LockKind}).
-
-write_to_store(Tab, Store, Oid, Val) ->
-    case ?catch_val({Tab, record_validation}) of
-	{RecName, Arity, Type}
-	  when size(Val) == Arity, RecName == element(1, Val) ->
-	    case Type of
-		bag ->
-		    ?ets_insert(Store, {Oid, Val, write});
-		_  ->
-		    ?ets_delete(Store, Oid),
-		    ?ets_insert(Store, {Oid, Val, write})
-	    end, 
-	    ok;
-	{'EXIT', _} ->
-	    abort({no_exists, Tab});
-	_ ->
-	    abort({bad_type, Val})
-    end.
-
-delete({Tab, Key}) ->
-    delete(Tab, Key, write);
-delete(Oid) ->
-    abort({bad_type, Oid}).
-
-s_delete({Tab, Key}) ->
-    delete(Tab, Key, sticky_write);
-s_delete(Oid) ->
-    abort({bad_type, Oid}).
-
-delete(Tab, Key, LockKind) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    delete(Tid, Ts, Tab, Key, LockKind);
-	{Mod, Tid, Ts} ->
-	    Mod:delete(Tid, Ts, Tab, Key, LockKind);
-	_ ->
-	    abort(no_transaction)
-    end.
-
-delete(Tid, Ts, Tab, Key, LockKind)
-  when atom(Tab), Tab /= schema ->
-      case element(1, Tid) of
-	  ets ->
-	      ?ets_delete(Tab, Key),
-	      ok;
-	  tid ->
-	      Store = Ts#tidstore.store,
-	      Oid = {Tab, Key},
-	      case LockKind of
-		  write ->
-		      mnesia_locker:wlock(Tid, Store, Oid);
-		  sticky_write ->
-		      mnesia_locker:sticky_wlock(Tid, Store, Oid);
-		  _ ->
-		      abort({bad_type, Tab, LockKind})
-	      end,
-	      ?ets_delete(Store, Oid),
-	      ?ets_insert(Store, {Oid, Oid, delete}),
-	      ok;
-	Protocol ->
-	      do_dirty_delete(Protocol, Tab, Key)
-    end; 
-delete(_Tid, _Ts, Tab, _Key, _LockKind) ->
-    abort({bad_type, Tab}).
-
-delete_object(Val) when tuple(Val), size(Val) > 2 ->
-    Tab = element(1, Val),
-    delete_object(Tab, Val, write);
-delete_object(Val) ->
-    abort({bad_type, Val}).
-
-s_delete_object(Val) when tuple(Val), size(Val) > 2 ->
-    Tab = element(1, Val),
-    delete_object(Tab, Val, sticky_write);
-s_delete_object(Val) ->
-    abort({bad_type, Val}).
-
-delete_object(Tab, Val, LockKind) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    delete_object(Tid, Ts, Tab, Val, LockKind);
-	{Mod, Tid, Ts} ->
-	    Mod:delete_object(Tid, Ts, Tab, Val, LockKind);
-	_ ->
-	    abort(no_transaction)
-    end.
-
-delete_object(Tid, Ts, Tab, Val, LockKind)
-  when atom(Tab), Tab /= schema, tuple(Val), size(Val) > 2 ->
-      case element(1, Tid) of
-	  ets ->
-	      ?ets_match_delete(Tab, Val),
-	      ok;
-	  tid ->
-	      Store = Ts#tidstore.store,
-	      Oid = {Tab, element(2, Val)},
-	      case LockKind of
-		  write ->
-		      mnesia_locker:wlock(Tid, Store, Oid);
-		  sticky_write ->
-		      mnesia_locker:sticky_wlock(Tid, Store, Oid);
-		  _ ->
-		      abort({bad_type, Tab, LockKind})
-	      end,
-	      case val({Tab, setorbag}) of
-		  bag -> 
-		      ?ets_match_delete(Store, {Oid, Val, '_'}),
-		      ?ets_insert(Store, {Oid, Val, delete_object});
-		  _ ->
-		      case ?ets_match_object(Store, {Oid, '_', write}) of
-			  [] ->
-			      ?ets_match_delete(Store, {Oid, Val, '_'}),
-			      ?ets_insert(Store, {Oid, Val, delete_object});
-			  _  ->
-			      ?ets_delete(Store, Oid),
-			      ?ets_insert(Store, {Oid, Oid, delete})
-		      end
-	      end,
-	      ok;
-	Protocol ->
-	      do_dirty_delete_object(Protocol, Tab, Val)
-    end; 
-delete_object(_Tid, _Ts, Tab, _Key, _LockKind) ->
-    abort({bad_type, Tab}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Access within an activity - read
-
-read({Tab, Key}) ->
-    read(Tab, Key, read);
-read(Oid) ->
-    abort({bad_type, Oid}).
-
-wread({Tab, Key}) ->
-    read(Tab, Key, write);
-wread(Oid) ->
-    abort({bad_type, Oid}).
-
-read(Tab, Key, LockKind) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    read(Tid, Ts, Tab, Key, LockKind);
-	{Mod, Tid, Ts} ->
-	    Mod:read(Tid, Ts, Tab, Key, LockKind);
-	_ ->
-	    abort(no_transaction)
-    end.
-
-read(Tid, Ts, Tab, Key, LockKind)
-  when atom(Tab), Tab /= schema ->
-      case element(1, Tid) of
-	  ets ->
-	      ?ets_lookup(Tab, Key);
-	  tid ->
-	      Store = Ts#tidstore.store,
-	      Oid = {Tab, Key},
-	      Objs =
-		  case LockKind of
-		      read ->
-			  mnesia_locker:rlock(Tid, Store, Oid);
-		      write ->
-			  mnesia_locker:rwlock(Tid, Store, Oid);
-		      sticky_write ->
-			  mnesia_locker:sticky_rwlock(Tid, Store, Oid);
-		      _ ->
-			  abort({bad_type, Tab, LockKind})
-		  end,
-	      add_written(?ets_lookup(Store, Oid), Tab, Objs);
-	  _Protocol ->
-	      dirty_read(Tab, Key)
-    end; 
-read(_Tid, _Ts, Tab, _Key, _LockKind) ->
-    abort({bad_type, Tab}).
-
-%%%%%%%%%%%%%%%%%%%%%
-%% Iterators 
-
-foldl(Fun, Acc, Tab) ->
-    foldl(Fun, Acc, Tab, read).
-
-foldl(Fun, Acc, Tab, LockKind) when function(Fun) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    foldl(Tid, Ts, Fun, Acc, Tab, LockKind);
-	{Mod, Tid, Ts} ->
-	    Mod:foldl(Tid, Ts, Fun, Acc, Tab, LockKind);
-	_ ->
-	    abort(no_transaction)
-    end.
-
-foldl(ActivityId, Opaque, Fun, Acc, Tab, LockKind) ->
-    {Type, Prev} = init_iteration(ActivityId, Opaque, Tab, LockKind),
-    Res = (catch do_foldl(ActivityId, Opaque, Tab, dirty_first(Tab), Fun, Acc, Type, Prev)),
-    close_iteration(Res, Tab).
-
-do_foldl(A, O, Tab, '$end_of_table', Fun, RAcc, _Type, Stored) ->
-    lists:foldl(fun(Key, Acc) -> 
-			lists:foldl(Fun, Acc, read(A, O, Tab, Key, read))
-		end, RAcc, Stored);
-do_foldl(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H == Key ->
-    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
-    do_foldl(A, O, Tab, dirty_next(Tab, Key), Fun, NewAcc, ordered_set, Stored);
-do_foldl(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H < Key ->
-    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, H, read)),
-    do_foldl(A, O, Tab, Key, Fun, NewAcc, ordered_set, Stored);
-do_foldl(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H > Key ->
-    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
-    do_foldl(A, O, Tab, dirty_next(Tab, Key), Fun, NewAcc, ordered_set, [H |Stored]);
-do_foldl(A, O, Tab, Key, Fun, Acc, Type, Stored) ->  %% Type is set or bag 
-    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
-    NewStored = ordsets:del_element(Key, Stored),
-    do_foldl(A, O, Tab, dirty_next(Tab, Key), Fun, NewAcc, Type, NewStored).
-
-foldr(Fun, Acc, Tab) ->
-    foldr(Fun, Acc, Tab, read).
-foldr(Fun, Acc, Tab, LockKind) when function(Fun) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    foldr(Tid, Ts, Fun, Acc, Tab, LockKind);
-	{Mod, Tid, Ts} ->
-	    Mod:foldr(Tid, Ts, Fun, Acc, Tab, LockKind);
-	_ ->
-	    abort(no_transaction)
-    end.
-
-foldr(ActivityId, Opaque, Fun, Acc, Tab, LockKind) ->
-    {Type, TempPrev} = init_iteration(ActivityId, Opaque, Tab, LockKind),
-    Prev = 
-	if 
-	    Type == ordered_set ->
-		lists:reverse(TempPrev);
-	    true ->      %% Order doesn't matter for set and bag
-		TempPrev %% Keep the order so we can use ordsets:del_element
-	end,
-    Res = (catch do_foldr(ActivityId, Opaque, Tab, dirty_last(Tab), Fun, Acc, Type, Prev)),
-    close_iteration(Res, Tab).
-
-do_foldr(A, O, Tab, '$end_of_table', Fun, RAcc, _Type, Stored) ->
-    lists:foldl(fun(Key, Acc) -> 
-			lists:foldl(Fun, Acc, read(A, O, Tab, Key, read))
-		end, RAcc, Stored);
-do_foldr(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H == Key ->
-    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
-    do_foldr(A, O, Tab, dirty_prev(Tab, Key), Fun, NewAcc, ordered_set, Stored);
-do_foldr(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H > Key ->
-    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, H, read)),
-    do_foldr(A, O, Tab, Key, Fun, NewAcc, ordered_set, Stored);
-do_foldr(A, O, Tab, Key, Fun, Acc, ordered_set, [H | Stored]) when H < Key ->
-    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
-    do_foldr(A, O, Tab, dirty_prev(Tab, Key), Fun, NewAcc, ordered_set, [H |Stored]);
-do_foldr(A, O, Tab, Key, Fun, Acc, Type, Stored) ->  %% Type is set or bag 
-    NewAcc = lists:foldl(Fun, Acc, read(A, O, Tab, Key, read)),
-    NewStored = ordsets:del_element(Key, Stored),
-    do_foldr(A, O, Tab, dirty_prev(Tab, Key), Fun, NewAcc, Type, NewStored).
-
-init_iteration(ActivityId, Opaque, Tab, LockKind) ->
-    lock(ActivityId, Opaque, {table, Tab}, LockKind),
-    Type = val({Tab, setorbag}),    
-    Previous = add_previous(ActivityId, Opaque, Type, Tab),
-    St = val({Tab, storage_type}),
-    if 
-	St == unknown -> 
-	    ignore;
-	true ->
-	    mnesia_lib:db_fixtable(St, Tab, true)
-    end, 
-    {Type, Previous}.
-
-close_iteration(Res, Tab) ->
-    case val({Tab, storage_type}) of
-	unknown -> 
-	    ignore;
-	St -> 
-	    mnesia_lib:db_fixtable(St, Tab, false)
-    end,
-    case Res of 
-	{'EXIT', {aborted, What}} ->
-	   abort(What);
-	{'EXIT', What} ->
-	    abort(What);
-	_ ->
-	    Res
-    end.
-
-add_previous(_ActivityId, non_transaction, _Type, _Tab) ->
-    [];
-add_previous(_Tid, Ts, _Type, Tab) ->
-    Previous = ?ets_match(Ts#tidstore.store, {{Tab, '$1'}, '_', write}),
-    lists:sort(lists:concat(Previous)).
-
-%% This routine fixes up the return value from read/1 so that
-%% it is correct with respect to what this particular transaction
-%% has already written, deleted .... etc
-
-add_written([], _Tab, Objs) -> 
-    Objs;  % standard normal fast case
-add_written(Written, Tab, Objs) ->
-    case val({Tab, setorbag}) of
-	bag ->
-	    add_written_to_bag(Written, Objs, []);
-	_   ->
-	    add_written_to_set(Written)
-    end.
-
-add_written_to_set(Ws) ->
-    case lists:last(Ws) of
-	{_, _, delete} -> [];
-	{_, Val, write} -> [Val];
-	{_, _, delete_object} -> []
-    end.
-
-add_written_to_bag([{_, Val, write} | Tail], Objs, Ack) ->
-    add_written_to_bag(Tail, lists:delete(Val, Objs), [Val | Ack]);
-add_written_to_bag([], Objs, Ack) -> 
-    Objs ++ lists:reverse(Ack); %% Oldest write first as in ets
-add_written_to_bag([{_, _ , delete} | Tail], _Objs, _Ack) ->
-    %% This transaction just deleted all objects
-    %% with this key
-    add_written_to_bag(Tail, [], []);
-add_written_to_bag([{_, Val, delete_object} | Tail], Objs, Ack) ->
-    add_written_to_bag(Tail, lists:delete(Val, Objs), lists:delete(Val, Ack)).
-
-match_object(Pat) when tuple(Pat), size(Pat) > 2 ->
-    Tab = element(1, Pat),
-    match_object(Tab, Pat, read);
-match_object(Pat) ->
-    abort({bad_type, Pat}).
-
-match_object(Tab, Pat, LockKind) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    match_object(Tid, Ts, Tab, Pat, LockKind);
-	{Mod, Tid, Ts} ->
-	    Mod:match_object(Tid, Ts, Tab, Pat, LockKind);
-	_ ->
-	    abort(no_transaction)
-    end.
-
-match_object(Tid, Ts, Tab, Pat, LockKind) 
-  when atom(Tab), Tab /= schema, tuple(Pat), size(Pat) > 2 ->
-    case element(1, Tid) of
-	ets ->
-	    mnesia_lib:db_match_object(ram_copies, Tab, Pat);
-	tid ->
-	    Key = element(2, Pat),
-	    case has_var(Key) of
-		false -> lock_record(Tid, Ts, Tab, Key, LockKind);
-		true  -> lock_table(Tid, Ts, Tab, LockKind)
-	    end,
-	    Objs = dirty_match_object(Tab, Pat),
-	    add_written_match(Ts#tidstore.store, Pat, Tab, Objs);
-	_Protocol ->
-	    dirty_match_object(Tab, Pat)
-    end;
-match_object(_Tid, _Ts, Tab, Pat, _LockKind) ->
-    abort({bad_type, Tab, Pat}).
-
-add_written_match(S, Pat, Tab, Objs) ->
-    Ops = find_ops(S, Tab, Pat),
-    add_match(Ops, Objs, val({Tab, setorbag})).
-
-find_ops(S, Tab, Pat) ->
-    GetWritten = [{{{Tab, '_'}, Pat, write}, [], ['$_']}, 
-		  {{{Tab, '_'}, '_', delete}, [], ['$_']},
-		  {{{Tab, '_'}, Pat, delete_object}, [], ['$_']}],
-    ets:select(S, GetWritten).
-    
-add_match([], Objs, _Type) ->
-    Objs;
-add_match(Written, Objs, ordered_set) ->
-    %% Must use keysort which is stable
-    add_ordered_match(lists:keysort(1,Written), Objs, []);
-add_match([{Oid, _, delete}|R], Objs, Type) ->
-    add_match(R, deloid(Oid, Objs), Type);
-add_match([{_Oid, Val, delete_object}|R], Objs, Type) ->
-    add_match(R, lists:delete(Val, Objs), Type);
-add_match([{_Oid, Val, write}|R], Objs, bag) ->
-    add_match(R, [Val | lists:delete(Val, Objs)], bag);
-add_match([{Oid, Val, write}|R], Objs, set) ->
-    add_match(R, [Val | deloid(Oid,Objs)],set).
-
-%% For ordered_set only !!
-add_ordered_match(Written = [{{_, Key}, _, _}|_], [Obj|Objs], Acc) 
-  when Key > element(2, Obj) ->
-    add_ordered_match(Written, Objs, [Obj|Acc]);
-add_ordered_match([{{_, Key}, Val, write}|Rest], Objs =[Obj|_], Acc) 
-  when Key < element(2, Obj) ->
-    add_ordered_match(Rest, [Val|Objs],Acc);
-add_ordered_match([{{_, Key}, _, _DelOP}|Rest], Objs =[Obj|_], Acc) 
-  when Key < element(2, Obj) ->
-    add_ordered_match(Rest,Objs,Acc);
-%% Greater than last object
-add_ordered_match([{_, Val, write}|Rest], [], Acc) ->
-    add_ordered_match(Rest, [Val], Acc);
-add_ordered_match([_|Rest], [], Acc) ->
-    add_ordered_match(Rest, [], Acc);
-%% Keys are equal from here 
-add_ordered_match([{_, Val, write}|Rest], [_Obj|Objs], Acc) ->
-    add_ordered_match(Rest, [Val|Objs], Acc);
-add_ordered_match([{_, _Val, delete}|Rest], [_Obj|Objs], Acc) ->
-    add_ordered_match(Rest, Objs, Acc);
-add_ordered_match([{_, Val, delete_object}|Rest], [Val|Objs], Acc) ->
-    add_ordered_match(Rest, Objs, Acc);
-add_ordered_match([{_, _, delete_object}|Rest], Objs, Acc) ->
-    add_ordered_match(Rest, Objs, Acc);
-add_ordered_match([], Objs, Acc) ->
-    lists:reverse(Acc, Objs).
-
-
-%%%%%%%%%%%%%%%%%%
-% select 
-
-select(Tab, Pat) ->
-    select(Tab, Pat, read).
-select(Tab, Pat, LockKind) 
-  when atom(Tab), Tab /= schema, list(Pat) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    select(Tid, Ts, Tab, Pat, LockKind);
-	{Mod, Tid, Ts} ->
-	    Mod:select(Tid, Ts, Tab, Pat, LockKind);
-	_ ->
-	    abort(no_transaction)
-    end;
-select(Tab, Pat, _Lock) ->
-    abort({badarg, Tab, Pat}).
-
-select(Tid, Ts, Tab, Spec, LockKind) ->
-    SelectFun = fun(FixedSpec) -> dirty_select(Tab, FixedSpec) end,
-    fun_select(Tid, Ts, Tab, Spec, LockKind, Tab, SelectFun).
-
-fun_select(Tid, Ts, Tab, Spec, LockKind, TabPat, SelectFun) ->
-    case element(1, Tid) of
-	ets ->
-	    mnesia_lib:db_select(ram_copies, Tab, Spec);
-	tid ->    
-	    Store = Ts#tidstore.store,
-	    Written = ?ets_match_object(Store, {{TabPat, '_'}, '_', '_'}),	    
-	    %% Avoid table lock if possible
-	    case Spec of
-		[{HeadPat,_, _}] when tuple(HeadPat), size(HeadPat) > 2 ->
-		    Key = element(2, HeadPat),
-		    case has_var(Key) of
-			false -> lock_record(Tid, Ts, Tab, Key, LockKind);
-			true  -> lock_table(Tid, Ts, Tab, LockKind)
-		    end;
-		_ ->
-		    lock_table(Tid, Ts, Tab, LockKind)
-	    end,
-	    case Written of 
-		[] ->  
-		    %% Nothing changed in the table during this transaction,
-		    %% Simple case get results from [d]ets
-		    SelectFun(Spec);
-		_ ->   
-		    %% Hard (slow case) records added or deleted earlier 
-		    %% in the transaction, have to cope with that.
-		    Type = val({Tab, setorbag}),
-		    FixedSpec = get_record_pattern(Spec),
-		    TabRecs = SelectFun(FixedSpec),
-		    FixedRes = add_match(Written, TabRecs, Type),
-		    CMS = ets:match_spec_compile(Spec),
-% 		    case Type of 
-% 			ordered_set -> 
-% 			    ets:match_spec_run(lists:sort(FixedRes), CMS);
-% 			_ ->
-% 			    ets:match_spec_run(FixedRes, CMS)
-% 		    end
-		    ets:match_spec_run(FixedRes, CMS)
-	    end;
-	_Protocol ->
-	    SelectFun(Spec)
-    end. 
-
-get_record_pattern([]) ->
-    [];
-get_record_pattern([{M,C,_B}|R]) ->
-    [{M,C,['$_']} | get_record_pattern(R)].
-
-deloid(_Oid, []) ->
-    [];
-deloid({Tab, Key}, [H | T]) when element(2, H) == Key ->
-    deloid({Tab, Key}, T);
-deloid(Oid, [H | T]) ->
-    [H | deloid(Oid, T)].
-
-all_keys(Tab) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    all_keys(Tid, Ts, Tab, read);
-	{Mod, Tid, Ts} ->
-	    Mod:all_keys(Tid, Ts, Tab, read);
-	_ ->
-	    abort(no_transaction)
-    end. 
-
-all_keys(Tid, Ts, Tab, LockKind) 
-  when atom(Tab), Tab /= schema ->
-    Pat0 = val({Tab, wild_pattern}),
-    Pat = setelement(2, Pat0, '$1'),
-    Keys = select(Tid, Ts, Tab, [{Pat, [], ['$1']}], LockKind),
-    case val({Tab, setorbag}) of
-	bag ->
-	    mnesia_lib:uniq(Keys);
-	_ ->
-	    Keys
-    end;
-all_keys(_Tid, _Ts, Tab, _LockKind) ->    
-    abort({bad_type, Tab}).
-
-index_match_object(Pat, Attr) when tuple(Pat), size(Pat) > 2 ->
-    Tab = element(1, Pat),
-    index_match_object(Tab, Pat, Attr, read);
-index_match_object(Pat, _Attr) ->
-    abort({bad_type, Pat}).
-
-index_match_object(Tab, Pat, Attr, LockKind) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    index_match_object(Tid, Ts, Tab, Pat, Attr, LockKind);
-	{Mod, Tid, Ts} ->
-	    Mod:index_match_object(Tid, Ts, Tab, Pat, Attr, LockKind);
-	_ ->
-	    abort(no_transaction)
-    end.
-
-index_match_object(Tid, Ts, Tab, Pat, Attr, LockKind) 
-  when atom(Tab), Tab /= schema, tuple(Pat), size(Pat) > 2 ->
-    case element(1, Tid) of
-	ets ->
-	    dirty_index_match_object(Tab, Pat, Attr); % Should be optimized?
-	tid ->
-	    case mnesia_schema:attr_tab_to_pos(Tab, Attr) of
-		Pos when Pos =< size(Pat) ->
-		    case LockKind of
-			read ->
-			    Store = Ts#tidstore.store,
-			    mnesia_locker:rlock_table(Tid, Store, Tab),
-			    Objs = dirty_index_match_object(Tab, Pat, Attr),
-			    add_written_match(Store, Pat, Tab, Objs);
-			_ ->
-			    abort({bad_type, Tab, LockKind})
-		    end;
-		BadPos ->
-		    abort({bad_type, Tab, BadPos})
-	    end;
-	_Protocol ->
-	    dirty_index_match_object(Tab, Pat, Attr)
-    end;
-index_match_object(_Tid, _Ts, Tab, Pat, _Attr, _LockKind) ->
-    abort({bad_type, Tab, Pat}).
-
-index_read(Tab, Key, Attr) ->
-    case get(mnesia_activity_state) of
-	{?DEFAULT_ACCESS, Tid, Ts} ->
-	    index_read(Tid, Ts, Tab, Key, Attr, read);
-	{Mod, Tid, Ts} ->
-	    Mod:index_read(Tid, Ts, Tab, Key, Attr, read);
-	_ ->
-	    abort(no_transaction)
-    end.    
-
-index_read(Tid, Ts, Tab, Key, Attr, LockKind) 
-  when atom(Tab), Tab /= schema ->
-    case element(1, Tid) of
-	ets ->
-	    dirty_index_read(Tab, Key, Attr); % Should be optimized?
-	tid ->
-	    Pos = mnesia_schema:attr_tab_to_pos(Tab, Attr),
-	    case LockKind of
-		read ->
-		    case has_var(Key) of
-			false ->
-			    Store = Ts#tidstore.store,
-			    Objs = mnesia_index:read(Tid, Store, Tab, Key, Pos),
-			    Pat = setelement(Pos, val({Tab, wild_pattern}), Key),
-			    add_written_match(Store, Pat, Tab, Objs);
-			true ->
-			    abort({bad_type, Tab, Attr, Key})
-		    end;
-		_ ->
-		    abort({bad_type, Tab, LockKind})
-	    end;
-	_Protocol ->
-	    dirty_index_read(Tab, Key, Attr)
-    end;
-index_read(_Tid, _Ts, Tab, _Key, _Attr, _LockKind) ->
-    abort({bad_type, Tab}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Dirty access regardless of activities - updates
-
-dirty_write(Val) when tuple(Val), size(Val) > 2  ->
-    Tab = element(1, Val),
-    dirty_write(Tab, Val);
-dirty_write(Val) ->
-    abort({bad_type, Val}).
-    
-dirty_write(Tab, Val) ->
-    do_dirty_write(async_dirty, Tab, Val).
-
-do_dirty_write(SyncMode, Tab, Val)
-  when atom(Tab), Tab /= schema, tuple(Val), size(Val) > 2 ->
-    case ?catch_val({Tab, record_validation}) of
-	{RecName, Arity, _Type}
-	when size(Val) == Arity, RecName == element(1, Val) ->
-	    Oid = {Tab, element(2, Val)},
-	    mnesia_tm:dirty(SyncMode, {Oid, Val, write});
-	{'EXIT', _} ->
-	    abort({no_exists, Tab});
-	_ ->
-	    abort({bad_type, Val})
-    end;
-do_dirty_write(_SyncMode, Tab, Val) ->
-    abort({bad_type, Tab, Val}).
-
-dirty_delete({Tab, Key}) ->
-    dirty_delete(Tab, Key);
-dirty_delete(Oid) ->
-    abort({bad_type, Oid}).
-
-dirty_delete(Tab, Key) ->
-    do_dirty_delete(async_dirty, Tab, Key).
-    
-do_dirty_delete(SyncMode, Tab, Key) when atom(Tab), Tab /= schema  ->
-    Oid = {Tab, Key},
-    mnesia_tm:dirty(SyncMode, {Oid, Oid, delete});
-do_dirty_delete(_SyncMode, Tab, _Key) ->
-    abort({bad_type, Tab}).
-
-dirty_delete_object(Val) when tuple(Val), size(Val) > 2 ->
-    Tab = element(1, Val),
-    dirty_delete_object(Tab, Val);
-dirty_delete_object(Val) ->
-    abort({bad_type, Val}).
-
-dirty_delete_object(Tab, Val) ->
-    do_dirty_delete_object(async_dirty, Tab, Val).
-
-do_dirty_delete_object(SyncMode, Tab, Val)
-    when atom(Tab), Tab /= schema, tuple(Val), size(Val) > 2 ->
-    Oid = {Tab, element(2, Val)},
-    mnesia_tm:dirty(SyncMode, {Oid, Val, delete_object});
-do_dirty_delete_object(_SyncMode, Tab, Val) ->
-    abort({bad_type, Tab, Val}).
-
-%% A Counter is an Oid being {CounterTab, CounterName}
-
-dirty_update_counter({Tab, Key}, Incr) ->
-    dirty_update_counter(Tab, Key, Incr);
-dirty_update_counter(Counter, _Incr) ->
-    abort({bad_type, Counter}).
-
-dirty_update_counter(Tab, Key, Incr) ->
-    do_dirty_update_counter(async_dirty, Tab, Key, Incr).
-    
-do_dirty_update_counter(SyncMode, Tab, Key, Incr)
-  when atom(Tab), Tab /= schema, integer(Incr) ->
-    case ?catch_val({Tab, record_validation}) of
-	{RecName, 3, set} ->
-	    Oid = {Tab, Key},
-	    mnesia_tm:dirty(SyncMode, {Oid, {RecName, Incr}, update_counter});
-	_ ->
-	    abort({combine_error, Tab, update_counter})
-    end;
-do_dirty_update_counter(_SyncMode, Tab, _Key, Incr) ->
-    abort({bad_type, Tab, Incr}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Dirty access regardless of activities - read
-
-dirty_read({Tab, Key}) ->
-    dirty_read(Tab, Key);
-dirty_read(Oid) ->
-    abort({bad_type, Oid}).
-
-dirty_read(Tab, Key)
-  when atom(Tab), Tab /= schema ->
-%%    case catch ?ets_lookup(Tab, Key) of
-%%        {'EXIT', _} ->
-            %% Bad luck, we have to perform a real lookup
-            dirty_rpc(Tab, mnesia_lib, db_get, [Tab, Key]);
-%%        Val ->
-%%            Val
-%%    end;
-dirty_read(Tab, _Key) ->
-    abort({bad_type, Tab}).
-
-dirty_match_object(Pat) when tuple(Pat), size(Pat) > 2 ->
-    Tab = element(1, Pat),
-    dirty_match_object(Tab, Pat);
-dirty_match_object(Pat) ->
-    abort({bad_type, Pat}).
-    
-dirty_match_object(Tab, Pat)
-  when atom(Tab), Tab /= schema, tuple(Pat), size(Pat) > 2 ->
-    dirty_rpc(Tab, ?MODULE, remote_dirty_match_object, [Tab, Pat]);
-dirty_match_object(Tab, Pat) ->
-    abort({bad_type, Tab, Pat}).
-
-remote_dirty_match_object(Tab, Pat) ->
-    Key = element(2, Pat),
-    case has_var(Key) of
-	false ->
-	    mnesia_lib:db_match_object(Tab, Pat);
-	true ->
-	    PosList = val({Tab, index}),
-	    remote_dirty_match_object(Tab, Pat, PosList)
-    end.
-
-remote_dirty_match_object(Tab, Pat, [Pos | Tail]) when Pos =< size(Pat) ->
-    IxKey = element(Pos, Pat),
-    case has_var(IxKey) of
-	false ->
-	    mnesia_index:dirty_match_object(Tab, Pat, Pos);
-	true ->
-	    remote_dirty_match_object(Tab, Pat, Tail)
-    end;
-remote_dirty_match_object(Tab, Pat, []) ->
-    mnesia_lib:db_match_object(Tab, Pat);
-remote_dirty_match_object(Tab, Pat, _PosList) ->
-    abort({bad_type, Tab, Pat}).
-
-dirty_select(Tab, Spec) when atom(Tab), Tab /= schema, list(Spec) ->
-    dirty_rpc(Tab, ?MODULE, remote_dirty_select, [Tab, Spec]);
-dirty_select(Tab, Spec) ->
-    abort({bad_type, Tab, Spec}).
-
-remote_dirty_select(Tab, Spec) ->
-    case Spec of
-	[{HeadPat, _, _}] when tuple(HeadPat), size(HeadPat) > 2 ->
-	    Key = element(2, HeadPat),
-	    case has_var(Key) of
-		false ->
-		    mnesia_lib:db_select(Tab, Spec);
-		true  ->
-		    PosList = val({Tab, index}),
-		    remote_dirty_select(Tab, Spec, PosList)
-	    end;
-	_ ->
-	    mnesia_lib:db_select(Tab, Spec)
-    end.
-
-remote_dirty_select(Tab, [{HeadPat,_, _}] = Spec, [Pos | Tail])
-  when tuple(HeadPat), size(HeadPat) > 2, Pos =< size(Spec) ->
-    Key = element(Pos, HeadPat),
-    case has_var(Key) of
-	false ->
-	    Recs = mnesia_index:dirty_select(Tab, Spec, Pos),
-	    %% Returns the records without applying the match spec
-	    %% The actual filtering is handled by the caller
-	    CMS = ets:match_spec_compile(Spec),
-	    case val({Tab, setorbag}) of 
-		ordered_set -> 
-		    ets:match_spec_run(lists:sort(Recs), CMS);
-		_ ->
-		    ets:match_spec_run(Recs, CMS)
-	    end;
-	true  ->
-	    remote_dirty_select(Tab, Spec, Tail)
-    end;
-remote_dirty_select(Tab, Spec, _) ->
-    mnesia_lib:db_select(Tab, Spec).
-
-dirty_all_keys(Tab) when atom(Tab), Tab /= schema ->
-    case ?catch_val({Tab, wild_pattern}) of
-	{'EXIT', _} ->
-	    abort({no_exists, Tab});
-	Pat0 ->
-	    Pat = setelement(2, Pat0, '$1'),
-	    Keys = dirty_select(Tab, [{Pat, [], ['$1']}]),
-	    case val({Tab, setorbag}) of
-		bag -> mnesia_lib:uniq(Keys);
-		_ -> Keys
-	    end
-    end;
-dirty_all_keys(Tab) ->
-    abort({bad_type, Tab}).
-    
-dirty_index_match_object(Pat, Attr) when tuple(Pat), size(Pat) > 2 ->
-    Tab = element(1, Pat),
-    dirty_index_match_object(Tab, Pat, Attr);
-dirty_index_match_object(Pat, _Attr) ->
-    abort({bad_type, Pat}).
-
-dirty_index_match_object(Tab, Pat, Attr) 
-  when atom(Tab), Tab /= schema, tuple(Pat), size(Pat) > 2 ->
-    case mnesia_schema:attr_tab_to_pos(Tab, Attr) of
-	Pos when Pos =< size(Pat) ->
-	    case has_var(element(2, Pat)) of
-		false ->
-		    dirty_match_object(Tab, Pat);
-		true ->
-		    Elem = element(Pos, Pat),
-		    case has_var(Elem) of
-			false ->
-			    dirty_rpc(Tab, mnesia_index, dirty_match_object,
-				      [Tab, Pat, Pos]);
-			true ->
-			    abort({bad_type, Tab, Attr, Elem})
-		    end		    
-	    end;
-	BadPos ->
-	    abort({bad_type, Tab, BadPos})
-    end;
-dirty_index_match_object(Tab, Pat, _Attr) ->
-    abort({bad_type, Tab, Pat}).
-
-dirty_index_read(Tab, Key, Attr) when atom(Tab), Tab /= schema ->
-    Pos = mnesia_schema:attr_tab_to_pos(Tab, Attr),
-    case has_var(Key) of
-	false ->
-	    mnesia_index:dirty_read(Tab, Key, Pos);
-	true ->
-	    abort({bad_type, Tab, Attr, Key})
-    end;
-dirty_index_read(Tab, _Key, _Attr) ->
-    abort({bad_type, Tab}).
-
-dirty_slot(Tab, Slot) when atom(Tab), Tab /= schema, integer(Slot)  ->
-    dirty_rpc(Tab, mnesia_lib, db_slot, [Tab, Slot]);
-dirty_slot(Tab, Slot) ->
-    abort({bad_type, Tab, Slot}).
-
-dirty_first(Tab) when atom(Tab), Tab /= schema ->
-    dirty_rpc(Tab, mnesia_lib, db_first, [Tab]);
-dirty_first(Tab) ->
-    abort({bad_type, Tab}).
-
-dirty_last(Tab) when atom(Tab), Tab /= schema ->
-    dirty_rpc(Tab, mnesia_lib, db_last, [Tab]);
-dirty_last(Tab) ->
-    abort({bad_type, Tab}).
-
-dirty_next(Tab, Key) when atom(Tab), Tab /= schema ->
-    dirty_rpc(Tab, mnesia_lib, db_next_key, [Tab, Key]);
-dirty_next(Tab, _Key) ->
-    abort({bad_type, Tab}).
-
-dirty_prev(Tab, Key) when atom(Tab), Tab /= schema ->
-    dirty_rpc(Tab, mnesia_lib, db_prev_key, [Tab, Key]);
-dirty_prev(Tab, _Key) ->
-    abort({bad_type, Tab}).
-
-
-dirty_rpc(Tab, M, F, Args) ->
-    Node = val({Tab, where_to_read}),
-    do_dirty_rpc(Tab, Node, M, F, Args).
-
-do_dirty_rpc(_Tab, nowhere, _, _, Args) ->
-    mnesia:abort({no_exists, Args});
-do_dirty_rpc(Tab, Node, M, F, Args) ->
-    case rpc:call(Node, M, F, Args) of
-	{badrpc,{'EXIT', {undef, [{ M, F, _} | _]}}}
-	  when M == ?MODULE, F == remote_dirty_select ->
-	    %% Oops, the other node has not been upgraded
-	    %% to 4.0.3 yet. Lets do it the old way.
-	    %% Remove this in next release.
-	    do_dirty_rpc(Tab, Node, mnesia_lib, db_select, Args);
-	{badrpc, Reason} ->
-	    erlang:yield(), %% Do not be too eager
-	    case mnesia_controller:call({check_w2r, Node, Tab}) of % Sync
-		NewNode when NewNode == Node -> 
-		    ErrorTag = mnesia_lib:dirty_rpc_error_tag(Reason),
-		    mnesia:abort({ErrorTag, Args});
-		NewNode ->
-		    case get(mnesia_activity_state) of
-			{_Mod, Tid, _Ts} when record(Tid, tid) ->
-			    %% In order to perform a consistent
-			    %% retry of a transaction we need
-			    %% to acquire the lock on the NewNode.
-			    %% In this context we do neither know
-			    %% the kind or granularity of the lock.
-			    %% --> Abort the transaction 
-			    mnesia:abort({node_not_running, Node});
-			_ ->
-			    %% Splendid! A dirty retry is safe
-			    %% 'Node' probably went down now
-			    %% Let mnesia_controller get broken link message first			    
-			    do_dirty_rpc(Tab, NewNode, M, F, Args)
-		    end
-	    end;
-	Other ->
-	    Other
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Info
-
-%% Info about one table
-table_info(Tab, Item) ->
-    case get(mnesia_activity_state) of
-	undefined ->
-	    any_table_info(Tab, Item);
-	{?DEFAULT_ACCESS, _Tid, _Ts} ->
-	    any_table_info(Tab, Item);
-	{Mod, Tid, Ts} ->
-	    Mod:table_info(Tid, Ts, Tab, Item);
-	_ ->
-	    abort(no_transaction)
-    end.
-
-table_info(_Tid, _Ts, Tab, Item) ->
-    any_table_info(Tab, Item).
-
-
-any_table_info(Tab, Item) when atom(Tab) ->    
-    case Item of
-	master_nodes ->
-	    mnesia_recover:get_master_nodes(Tab);
-%	checkpoints -> 
-%	    case ?catch_val({Tab, commit_work}) of
-%		[{checkpoints, List} | _] -> List;
-%		No_chk when list(No_chk) ->  [];
-%		Else -> info_reply(Else, Tab, Item)
-%	    end;
-	size -> 
-	    raw_table_info(Tab, Item);
-	memory ->
-	    raw_table_info(Tab, Item);
-	type -> 
-	    case ?catch_val({Tab, setorbag}) of
-		{'EXIT', _} ->
-		    bad_info_reply(Tab, Item);
-		Val ->
-		    Val
-	    end;
-	all ->
-	    case mnesia_schema:get_table_properties(Tab) of
-		[] ->
-		    abort({no_exists, Tab, Item});
-		Props ->
-		    lists:map(fun({setorbag, Type}) -> {type, Type};
-				 (Prop) -> Prop end, 
-			      Props) 
-	    end;
-	_ ->
-	    case ?catch_val({Tab, Item}) of
-		{'EXIT', _} ->
-		    bad_info_reply(Tab, Item);
-		Val ->
-		    Val
-	    end
-    end;
-any_table_info(Tab, _Item) ->
-    abort({bad_type, Tab}).
-
-raw_table_info(Tab, Item) ->
-    case ?catch_val({Tab, storage_type}) of
-	ram_copies ->
-	    info_reply(catch ?ets_info(Tab, Item), Tab, Item);
-	disc_copies ->
-	    info_reply(catch ?ets_info(Tab, Item), Tab, Item);
-	disc_only_copies ->
-	    info_reply(catch dets:info(Tab, Item), Tab, Item);
-	unknown ->
-	    bad_info_reply(Tab, Item);
-	{'EXIT', _} ->
-	    bad_info_reply(Tab, Item)
-    end.
-
-info_reply({'EXIT', _Reason}, Tab, Item) ->
-    bad_info_reply(Tab, Item);
-info_reply({error, _Reason}, Tab, Item) ->
-    bad_info_reply(Tab, Item);
-info_reply(Val, _Tab, _Item) ->
-    Val.
-
-bad_info_reply(_Tab, size) -> 0;
-bad_info_reply(_Tab, memory) -> 0;
-bad_info_reply(Tab, Item) -> abort({no_exists, Tab, Item}).
-
-%% Raw info about all tables
-schema() -> 
-    mnesia_schema:info().
-
-%% Raw info about one tables
-schema(Tab) -> 
-    mnesia_schema:info(Tab).
-
-error_description(Err) -> 
-    mnesia_lib:error_desc(Err).
-
-info() ->
-    case mnesia_lib:is_running() of
-	yes ->
-	    TmInfo = mnesia_tm:get_info(10000),
-	    Held = system_info(held_locks),
-	    Queued = system_info(lock_queue),
-
-	    io:format("---> Processes holding locks <--- ~n", []),
-	    lists:foreach(fun(L) -> io:format("Lock: ~p~n", [L]) end,
-			  Held),
-
-	    io:format( "---> Processes waiting for locks <--- ~n", []),
-	    lists:foreach(fun({Oid, Op, _Pid, Tid, OwnerTid}) ->
-				  io:format("Tid ~p waits for ~p lock "
-					    "on oid ~p owned by ~p ~n", 
-					    [Tid, Op, Oid, OwnerTid])
-		  end, Queued),
-	    mnesia_tm:display_info(group_leader(), TmInfo),
-	    
-	    Pat = {'_', unclear, '_'},
-	    Uncertain = ets:match_object(mnesia_decision, Pat),
-
-	    io:format( "---> Uncertain transactions <--- ~n", []),
-	    lists:foreach(fun({Tid, _, Nodes}) ->
-				  io:format("Tid ~w waits for decision "
-					    "from ~w~n", 
-					    [Tid, Nodes])
-		  end, Uncertain),
-
-	    mnesia_controller:info(),
-	    display_system_info(Held, Queued, TmInfo, Uncertain);
-	_ ->
-	    mini_info()
-    end,
-    ok.
-
-mini_info() ->
-    io:format("===> System info in version ~p, debug level = ~p <===~n",
-	      [system_info(version), system_info(debug)]),
-    Not =
-	case system_info(use_dir) of
-	    true -> "";
-	    false  -> "NOT "
-	end,
-
-    io:format("~w. Directory ~p is ~sused.~n",
-	      [system_info(schema_location), system_info(directory), Not]),
-    io:format("use fallback at restart = ~w~n",
-	      [system_info(fallback_activated)]),
-    Running = system_info(running_db_nodes),
-    io:format("running db nodes   = ~w~n", [Running]),
-    All = mnesia_lib:all_nodes(),
-    io:format("stopped db nodes   = ~w ~n", [All -- Running]).
-
-display_system_info(Held, Queued, TmInfo, Uncertain) ->
-    mini_info(),
-    display_tab_info(),
-    S = fun(Items) -> [system_info(I) || I <- Items] end,
-
-    io:format("~w transactions committed, ~w aborted, "
-	      "~w restarted, ~w logged to disc~n",
-	      S([transaction_commits, transaction_failures,
-		transaction_restarts, transaction_log_writes])),
-
-    {Active, Pending} =
-	case TmInfo of
-	    {timeout, _} -> {infinity, infinity};
-	    {info, P, A} -> {length(A), length(P)}
-	end,
-    io:format("~w held locks, ~w in queue; "
-	      "~w local transactions, ~w remote~n",
-	      [length(Held), length(Queued), Active, Pending]),
-
-    Ufold = fun({_, _, Ns}, {C, Old}) ->
-		    New = [N || N <- Ns, not lists:member(N, Old)],
-		    {C + 1, New ++ Old}
-	    end,
-    {Ucount, Unodes} = lists:foldl(Ufold, {0, []}, Uncertain),
-    io:format("~w transactions waits for other nodes: ~p~n",
-	      [Ucount, Unodes]).
-
-display_tab_info() ->
-    MasterTabs = mnesia_recover:get_master_node_tables(),
-    io:format("master node tables = ~p~n", [lists:sort(MasterTabs)]),
-
-    Tabs = system_info(tables),
-    
-    {Unknown, Ram, Disc, DiscOnly} =
-	lists:foldl(fun storage_count/2, {[], [], [], []}, Tabs),
-    
-    io:format("remote             = ~p~n", [lists:sort(Unknown)]),
-    io:format("ram_copies         = ~p~n", [lists:sort(Ram)]),
-    io:format("disc_copies        = ~p~n", [lists:sort(Disc)]),
-    io:format("disc_only_copies   = ~p~n", [lists:sort(DiscOnly)]),
-    
-    Rfoldl = fun(T, Acc) ->
-		     Rpat =
-			 case val({T, access_mode}) of
-			     read_only ->
-				 lists:sort([{A, read_only} || A <- val({T, active_replicas})]);
-			     read_write ->
-				 table_info(T, where_to_commit)
-			 end,
-		     case lists:keysearch(Rpat, 1, Acc) of
-			 {value, {_Rpat, Rtabs}} -> 
-			     lists:keyreplace(Rpat, 1, Acc, {Rpat, [T | Rtabs]});
-			 false ->
-			     [{Rpat, [T]} | Acc]
-		     end
-	     end,
-    Repl = lists:foldl(Rfoldl, [], Tabs),
-    Rdisp = fun({Rpat, Rtabs}) -> io:format("~p = ~p~n", [Rpat, Rtabs]) end,
-    lists:foreach(Rdisp, lists:sort(Repl)).
-
-storage_count(T, {U, R, D, DO}) ->
-    case table_info(T, storage_type) of
-	unknown -> {[T | U], R, D, DO};
-	ram_copies -> {U, [T | R], D, DO};
-	disc_copies -> {U, R, [T | D], DO};
-	disc_only_copies -> {U, R, D, [T | DO]}
-    end.
-
-system_info(Item) ->
-    case catch system_info2(Item) of
-	{'EXIT',Error} -> abort(Error);
-	Other -> Other
-    end.
-
-system_info2(all) ->
-    Items = system_info_items(mnesia_lib:is_running()),
-    [{I, system_info(I)} || I <- Items];
-
-system_info2(db_nodes) ->
-    DiscNs = ?catch_val({schema, disc_copies}),
-    RamNs = ?catch_val({schema, ram_copies}),
-    if
-	list(DiscNs), list(RamNs) ->
-	    DiscNs ++ RamNs;
-	true ->
-	    case mnesia_schema:read_nodes() of
-		{ok, Nodes} -> Nodes;
-		{error,Reason} -> exit(Reason)
-	    end
-    end;
-system_info2(running_db_nodes) ->
-    case ?catch_val({current, db_nodes}) of
-	{'EXIT',_} ->
-	    %% Ensure that we access the intended Mnesia
-	    %% directory. This function may not be called
-	    %% during startup since it will cause the
-	    %% application_controller to get into deadlock
-	    load_mnesia_or_abort(),
-	    mnesia_lib:running_nodes();
-	Other ->
-	    Other
-    end;
-
-system_info2(extra_db_nodes) ->
-    case ?catch_val(extra_db_nodes) of
-	{'EXIT',_} ->
-	    %% Ensure that we access the intended Mnesia
-	    %% directory. This function may not be called
-	    %% during startup since it will cause the
-	    %% application_controller to get into deadlock
-	    load_mnesia_or_abort(),
-	    mnesia_monitor:get_env(extra_db_nodes);
-	Other ->
-	    Other
-    end;
-
-system_info2(directory) ->
-    case ?catch_val(directory) of
-	{'EXIT',_} ->
-	    %% Ensure that we access the intended Mnesia
-	    %% directory. This function may not be called
-	    %% during startup since it will cause the
-	    %% application_controller to get into deadlock
-	    load_mnesia_or_abort(),
-	    mnesia_monitor:get_env(dir);
-	Other ->
-	    Other
-    end;
-
-system_info2(use_dir) ->
-    case ?catch_val(use_dir) of
-	{'EXIT',_} ->
-	    %% Ensure that we access the intended Mnesia
-	    %% directory. This function may not be called
-	    %% during startup since it will cause the
-	    %% application_controller to get into deadlock
-	    load_mnesia_or_abort(),
-	    mnesia_monitor:use_dir();
-	Other ->
-	    Other
-    end;
-
-system_info2(schema_location) ->
-    case ?catch_val(schema_location) of
-	{'EXIT',_} ->
-	    %% Ensure that we access the intended Mnesia
-	    %% directory. This function may not be called
-	    %% during startup since it will cause the
-	    %% application_controller to get into deadlock
-	    load_mnesia_or_abort(),
-	    mnesia_monitor:get_env(schema_location);
-	Other ->
-	    Other
-    end;
-
-system_info2(fallback_activated) ->
-    case ?catch_val(fallback_activated) of
-	{'EXIT',_} ->
-	    %% Ensure that we access the intended Mnesia
-	    %% directory. This function may not be called
-	    %% during startup since it will cause the
-	    %% application_controller to get into deadlock
-	    load_mnesia_or_abort(),
-	    mnesia_bup:fallback_exists();
-	Other ->
-	    Other
-    end;
-
-system_info2(version) ->
-    case ?catch_val(version) of
-	{'EXIT', _} -> 
-	    Apps = application:loaded_applications(),
-	    case lists:keysearch(?APPLICATION, 1, Apps) of
-		{value, {_Name, _Desc, Version}} ->
-		    Version;
-		false ->
-		    %% Ensure that it does not match
-		    {mnesia_not_loaded, node(), now()} 
-	    end;
-	Version ->
-	    Version
-    end;
-
-system_info2(access_module) -> mnesia_monitor:get_env(access_module); 
-system_info2(auto_repair) -> mnesia_monitor:get_env(auto_repair);
-system_info2(is_running) -> mnesia_lib:is_running();
-system_info2(backup_module) -> mnesia_monitor:get_env(backup_module);
-system_info2(event_module) -> mnesia_monitor:get_env(event_module);
-system_info2(debug) -> mnesia_monitor:get_env(debug);
-system_info2(dump_log_load_regulation) -> mnesia_monitor:get_env(dump_log_load_regulation);
-system_info2(dump_log_write_threshold) -> mnesia_monitor:get_env(dump_log_write_threshold);
-system_info2(dump_log_time_threshold) -> mnesia_monitor:get_env(dump_log_time_threshold);
-system_info2(dump_log_update_in_place) -> 
-    mnesia_monitor:get_env(dump_log_update_in_place);
-system_info2(dump_log_update_in_place) -> 
-    mnesia_monitor:get_env(dump_log_update_in_place);
-system_info2(max_wait_for_decision) -> mnesia_monitor:get_env(max_wait_for_decision);
-system_info2(embedded_mnemosyne) -> mnesia_monitor:get_env(embedded_mnemosyne);
-system_info2(ignore_fallback_at_startup) -> mnesia_monitor:get_env(ignore_fallback_at_startup);
-system_info2(fallback_error_function) ->  mnesia_monitor:get_env(fallback_error_function);
-system_info2(log_version) -> mnesia_log:version();
-system_info2(protocol_version) -> mnesia_monitor:protocol_version();
-system_info2(schema_version) -> mnesia_schema:version(); %backward compatibility
-system_info2(tables) -> val({schema, tables});
-system_info2(local_tables) -> val({schema, local_tables});
-system_info2(master_node_tables) -> mnesia_recover:get_master_node_tables();
-system_info2(subscribers) -> mnesia_subscr:subscribers();
-system_info2(checkpoints) -> mnesia_checkpoint:checkpoints();
-system_info2(held_locks) -> mnesia_locker:get_held_locks();
-system_info2(lock_queue) -> mnesia_locker:get_lock_queue();
-system_info2(transactions) -> mnesia_tm:get_transactions();
-system_info2(transaction_failures) -> mnesia_lib:read_counter(trans_failures);
-system_info2(transaction_commits) -> mnesia_lib:read_counter(trans_commits);
-system_info2(transaction_restarts) -> mnesia_lib:read_counter(trans_restarts);
-system_info2(transaction_log_writes) -> mnesia_dumper:get_log_writes();
-
-system_info2(Item) -> exit({badarg, Item}).
-
-system_info_items(yes) ->
-    [
-     access_module,
-     auto_repair,
-     backup_module,
-     checkpoints,
-     db_nodes,
-     debug,
-     directory,
-     dump_log_load_regulation,
-     dump_log_time_threshold,
-     dump_log_update_in_place,
-     dump_log_write_threshold,
-     embedded_mnemosyne,
-     event_module,
-     extra_db_nodes,
-     fallback_activated,
-     held_locks,
-     ignore_fallback_at_startup,
-     fallback_error_function,
-     is_running,
-     local_tables,
-     lock_queue,
-     log_version,
-     master_node_tables,
-     max_wait_for_decision,
-     protocol_version,
-     running_db_nodes,
-     schema_location,
-     schema_version,
-     subscribers,
-     tables,
-     transaction_commits,
-     transaction_failures,
-     transaction_log_writes,
-     transaction_restarts,
-     transactions,
-     use_dir,
-     version
-    ];
-system_info_items(no) ->
-    [
-     auto_repair,
-     backup_module,
-     db_nodes,
-     debug,
-     directory,
-     dump_log_load_regulation,
-     dump_log_time_threshold,
-     dump_log_update_in_place,
-     dump_log_write_threshold,
-     event_module,
-     extra_db_nodes,
-     ignore_fallback_at_startup,
-     fallback_error_function,
-     is_running,
-     log_version,
-     max_wait_for_decision,
-     protocol_version,
-     running_db_nodes,
-     schema_location,
-     schema_version,
-     use_dir,
-     version
-    ].
-    
-system_info() ->
-    IsRunning = mnesia_lib:is_running(),
-    case IsRunning of
-	yes ->
-	    TmInfo = mnesia_tm:get_info(10000),
-	    Held = system_info(held_locks),
-	    Queued = system_info(lock_queue),
-	    Pat = {'_', unclear, '_'},
-	    Uncertain = ets:match_object(mnesia_decision, Pat),
-	    display_system_info(Held, Queued, TmInfo, Uncertain);
-	_ ->
-	    mini_info()
-    end,
-    IsRunning.
-
-load_mnesia_or_abort() ->
-    case mnesia_lib:ensure_loaded(?APPLICATION) of
-	ok ->
-	    ok;
-	{error, Reason} ->
-	    abort(Reason)
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Database mgt
-
-create_schema(Ns) -> 
-    mnesia_bup:create_schema(Ns).
-
-delete_schema(Ns) -> 
-    mnesia_schema:delete_schema(Ns).
-
-backup(Opaque) -> 
-    mnesia_log:backup(Opaque).
-
-backup(Opaque, Mod) -> 
-    mnesia_log:backup(Opaque, Mod).
-
-traverse_backup(S, T, Fun, Acc) -> 
-    mnesia_bup:traverse_backup(S, T, Fun, Acc).
-
-traverse_backup(S, SM, T, TM, F, A) -> 
-    mnesia_bup:traverse_backup(S, SM, T, TM, F, A).
-
-install_fallback(Opaque) -> 
-    mnesia_bup:install_fallback(Opaque).
-
-install_fallback(Opaque, Mod) -> 
-    mnesia_bup:install_fallback(Opaque, Mod).
-
-uninstall_fallback() -> 
-    mnesia_bup:uninstall_fallback().
-
-uninstall_fallback(Args) -> 
-    mnesia_bup:uninstall_fallback(Args).
-
-activate_checkpoint(Args) -> 
-    mnesia_checkpoint:activate(Args).
-
-deactivate_checkpoint(Name) -> 
-    mnesia_checkpoint:deactivate(Name).
-
-backup_checkpoint(Name, Opaque) -> 
-    mnesia_log:backup_checkpoint(Name, Opaque).
-
-backup_checkpoint(Name, Opaque, Mod) -> 
-    mnesia_log:backup_checkpoint(Name, Opaque, Mod).
-
-restore(Opaque, Args) -> 
-    mnesia_schema:restore(Opaque, Args).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Table mgt
-
-create_table(Arg) -> 
-    mnesia_schema:create_table(Arg).
-create_table(Name, Arg) when list(Arg) -> 
-    mnesia_schema:create_table([{name, Name}| Arg]);
-create_table(Name, Arg) ->
-    {aborted, badarg, Name, Arg}.
-
-delete_table(Tab) -> 
-    mnesia_schema:delete_table(Tab).
-
-add_table_copy(Tab, N, S) ->
-    mnesia_schema:add_table_copy(Tab, N, S).
-del_table_copy(Tab, N) ->
-    mnesia_schema:del_table_copy(Tab, N).
-
-move_table_copy(Tab, From, To) -> 
-    mnesia_schema:move_table(Tab, From, To).
-
-add_table_index(Tab, Ix) -> 
-    mnesia_schema:add_table_index(Tab, Ix).
-del_table_index(Tab, Ix) -> 
-    mnesia_schema:del_table_index(Tab, Ix).
-
-transform_table(Tab, Fun, NewA) -> 
-    case catch val({Tab, record_name}) of
-	{'EXIT', Reason} -> 
-	    mnesia:abort(Reason);
-	OldRN -> 
-	    mnesia_schema:transform_table(Tab, Fun, NewA, OldRN)
-    end.
-
-transform_table(Tab, Fun, NewA, NewRN) -> 
-    mnesia_schema:transform_table(Tab, Fun, NewA, NewRN).
-
-change_table_copy_type(T, N, S) ->
-    mnesia_schema:change_table_copy_type(T, N, S).
-
-clear_table(Tab) ->
-    mnesia_schema:clear_table(Tab).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Table mgt - user properties
-
-read_table_property(Tab, PropKey) -> 
-    val({Tab, user_property, PropKey}).
-
-write_table_property(Tab, Prop) -> 
-    mnesia_schema:write_table_property(Tab, Prop).
-
-delete_table_property(Tab, PropKey) -> 
-    mnesia_schema:delete_table_property(Tab, PropKey).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Table mgt - user properties
-
-change_table_frag(Tab, FragProp) -> 
-    mnesia_schema:change_table_frag(Tab, FragProp).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Table mgt - table load
-
-%% Dump a ram table to disc
-dump_tables(Tabs) -> 
-    mnesia_schema:dump_tables(Tabs).
-
-%% allow the user to wait for some tables to be loaded
-wait_for_tables(Tabs, Timeout) ->
-    mnesia_controller:wait_for_tables(Tabs, Timeout).
-
-force_load_table(Tab) ->
-    case mnesia_controller:force_load_table(Tab) of
-	ok -> yes; % Backwards compatibility
-	Other -> Other
-    end.
-
-change_table_access_mode(T, Access) -> 
-    mnesia_schema:change_table_access_mode(T, Access).
-
-change_table_load_order(T, O) -> 
-    mnesia_schema:change_table_load_order(T, O).
-
-set_master_nodes(Nodes) when list(Nodes) ->
-    UseDir = system_info(use_dir),
-    IsRunning = system_info(is_running),
-    case IsRunning of
-	yes ->
-	    CsPat = {{'_', cstruct}, '_'},
-	    Cstructs0 = ?ets_match_object(mnesia_gvar, CsPat),
-	    Cstructs = [Cs || {_, Cs} <- Cstructs0], 
-	    log_valid_master_nodes(Cstructs, Nodes, UseDir, IsRunning);
-	_NotRunning ->
-	    case UseDir of
-		true ->
-		    mnesia_lib:lock_table(schema),
-		    Res = 
-			case mnesia_schema:read_cstructs_from_disc() of
-			    {ok, Cstructs} ->
-				log_valid_master_nodes(Cstructs, Nodes, UseDir, IsRunning);
-			    {error, Reason} ->
-				{error, Reason}
-			end,
-			mnesia_lib:unlock_table(schema),
-		    Res;
-		false ->
-		    ok
-	    end
-    end;
-set_master_nodes(Nodes) ->
-    {error, {bad_type, Nodes}}.
-
-log_valid_master_nodes(Cstructs, Nodes, UseDir, IsRunning) ->
-    Fun = fun(Cs) ->
-		  Copies = mnesia_lib:copy_holders(Cs),
-		  Valid = mnesia_lib:intersect(Nodes, Copies),
-		  {Cs#cstruct.name, Valid}  
-	  end,
-    Args = lists:map(Fun, Cstructs),
-    mnesia_recover:log_master_nodes(Args, UseDir, IsRunning).
-
-set_master_nodes(Tab, Nodes) when list(Nodes) ->
-    UseDir = system_info(use_dir),
-    IsRunning = system_info(is_running),
-    case IsRunning of
-	yes ->
-	    case ?catch_val({Tab, cstruct}) of
-		{'EXIT', _} ->
-		    {error, {no_exists, Tab}};
-		Cs ->
-		    case Nodes -- mnesia_lib:copy_holders(Cs) of
-			[] ->
-			    Args = [{Tab , Nodes}],
-			    mnesia_recover:log_master_nodes(Args, UseDir, IsRunning);
-			BadNodes ->
-			    {error, {no_exists, Tab,  BadNodes}}
-		    end
-	    end;
-	_NotRunning ->
-	    case UseDir of
-		true ->
-		    mnesia_lib:lock_table(schema),
-		    Res = 
-			case mnesia_schema:read_cstructs_from_disc() of
-			    {ok, Cstructs} ->
-				case lists:keysearch(Tab, 2, Cstructs) of
-				    {value, Cs} ->
-					case Nodes -- mnesia_lib:copy_holders(Cs) of
-					    [] ->
-						Args = [{Tab , Nodes}],
-						mnesia_recover:log_master_nodes(Args, UseDir, IsRunning);
-					    BadNodes ->
-						{error, {no_exists, Tab,  BadNodes}}
-					end;
-				    false ->
-					{error, {no_exists, Tab}}
-				end;
-			    {error, Reason} ->
-				{error, Reason}
-			end,
-		    mnesia_lib:unlock_table(schema),
-		    Res;
-		false ->
-		    ok
-	    end
-    end;
-set_master_nodes(Tab, Nodes) ->
-    {error, {bad_type, Tab, Nodes}}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Misc admin
-
-dump_log() -> 
-    mnesia_controller:sync_dump_log(user).
-
-subscribe(What) ->
-    mnesia_subscr:subscribe(self(), What).
-
-unsubscribe(What) ->
-    mnesia_subscr:unsubscribe(self(), What).
-
-report_event(Event) ->
-    mnesia_lib:report_system_event({mnesia_user, Event}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Snmp
-
-snmp_open_table(Tab, Us) -> 
-    mnesia_schema:add_snmp(Tab, Us).
-
-snmp_close_table(Tab) ->  
-    mnesia_schema:del_snmp(Tab).
-
-snmp_get_row(Tab, RowIndex) when atom(Tab), Tab /= schema ->
-    dirty_rpc(Tab, mnesia_snmp_hook, get_row, [Tab, RowIndex]);
-snmp_get_row(Tab, _RowIndex) ->
-    abort({bad_type, Tab}).
-
-snmp_get_next_index(Tab, RowIndex) when atom(Tab), Tab /= schema ->
-    dirty_rpc(Tab, mnesia_snmp_hook, get_next_index, [Tab, RowIndex]);
-snmp_get_next_index(Tab, _RowIndex) ->
-    abort({bad_type, Tab}).
-
-snmp_get_mnesia_key(Tab, RowIndex) when atom(Tab), Tab /= schema ->
-    dirty_rpc(Tab, mnesia_snmp_hook, get_mnesia_key, [Tab, RowIndex]);
-snmp_get_mnesia_key(Tab, _RowIndex) ->
-    abort({bad_type, Tab}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Textfile access
-
-load_textfile(F) -> 
-    mnesia_text:load_textfile(F).
-dump_to_textfile(F) -> 
-    mnesia_text:dump_to_textfile(F).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Mnemosyne exclusive
-
-get_activity_id() -> 
-    get(mnesia_activity_state).
-
-put_activity_id(Activity) -> 
-    mnesia_tm:put_activity_id(Activity).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.hrl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.hrl
deleted file mode 100644
index b9715ad927..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia.hrl
+++ /dev/null
@@ -1,118 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia.hrl,v 1.1 2008/12/17 09:53:37 mikpe Exp $
-%%
-
--define(APPLICATION, mnesia).
-
--define(ets_lookup(Tab, Key), ets:lookup(Tab, Key)).
--define(ets_lookup_element(Tab, Key, Pos), ets:lookup_element(Tab, Key, Pos)).
--define(ets_insert(Tab, Rec), ets:insert(Tab, Rec)).
--define(ets_delete(Tab, Key), ets:delete(Tab, Key)).
--define(ets_match_delete(Tab, Pat), ets:match_delete(Tab, Pat)).
--define(ets_match_object(Tab, Pat), ets:match_object(Tab, Pat)).
--define(ets_match(Tab, Pat), ets:match(Tab, Pat)).
--define(ets_info(Tab, Item), ets:info(Tab, Item)).
--define(ets_update_counter(Tab, Key, Incr), ets:update_counter(Tab, Key, Incr)).
--define(ets_first(Tab), ets:first(Tab)).
--define(ets_next(Tab, Key), ets:next(Tab, Key)).
--define(ets_last(Tab), ets:last(Tab)).
--define(ets_prev(Tab, Key), ets:prev(Tab, Key)).
--define(ets_slot(Tab, Pos), ets:slot(Tab, Pos)).
--define(ets_new_table(Tab, Props), ets:new(Tab, Props)).
--define(ets_delete_table(Tab), ets:delete(Tab)).
--define(ets_fixtable(Tab, Bool), ets:fixtable(Tab, Bool)).
-
--define(catch_val(Var), (catch ?ets_lookup_element(mnesia_gvar, Var, 2))).
-
-%% It's important that counter is first, since we compare tid's
-
--record(tid, 
-        {counter,         %% serial no for tid
-         pid}).           %%  owner of tid
-
-
--record(tidstore,         
-        {store,           %% current ets table for tid
-         up_stores = [],  %% list of upper layer stores for nested trans
-         level = 1}).     %% transaction level
-
--define(unique_cookie, {erlang:now(), node()}).
-
--record(cstruct, {name,                            % Atom
-		  type = set,                      % set | bag
-		  ram_copies = [],                 % [Node]
-		  disc_copies = [],                % [Node]
-		  disc_only_copies = [],           % [Node]
-		  load_order = 0,                  % Integer
-		  access_mode = read_write,        % read_write | read_only
-		  index = [],                      % [Integer]
-		  snmp = [],                       % Snmp Ustruct
-		  local_content = false,           % true | false
-		  record_name = {bad_record_name}, % Atom (Default = Name)
-		  attributes = [key, val],         % [Atom]
-		  user_properties = [],            % [Record]
-		  frag_properties = [],            % [{Key, Val]
-                  cookie = ?unique_cookie,         % Term
-                  version = {{2, 0}, []}}).        % {{Integer, Integer}, [Node]}
-
-%% Record for the head structure in Mnesia's log files
-%% 
-%% The definition of this record may *NEVER* be changed
-%% since it may be written to very old backup files.
-%% By holding this record definition stable we can be
-%% able to comprahend backups from timepoint 0. It also
-%% allows us to use the backup format as an interchange
-%% format between Mnesia releases.
-
--record(log_header,{log_kind,
-		    log_version,
-		    mnesia_version,
-		    node,
-		    now}).
-
-%% Commit records stored in the transaction log
--record(commit, {node,
-		 decision, % presume_commit | Decision
-		 ram_copies = [],
-		 disc_copies = [],
-		 disc_only_copies = [],
-		 snmp = [],
-		 schema_ops = []
-		}).
-
--record(decision, {tid,
-		   outcome, % presume_abort | committed
-		   disc_nodes,
-		   ram_nodes}).
-
-%% Maybe cyclic wait
--record(cyclic, {node = node(),
-		 oid,  % {Tab, Key}
-		 op,   % read | write
-		 lock, % read | write
-		 lucky
-		}).
-
-%% Managing conditional debug functions
-
--ifdef(debug).
-    -define(eval_debug_fun(I, C),
-	    mnesia_lib:eval_debug_fun(I, C, ?FILE, ?LINE)).
--else.
-    -define(eval_debug_fun(I, C), ok).
--endif.    
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_backup.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_backup.erl
deleted file mode 100644
index a1fbb21d94..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_backup.erl
+++ /dev/null
@@ -1,195 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_backup.erl,v 1.1 2008/12/17 09:53:37 mikpe Exp $
-%%
-%0
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% This module contains one implementation of callback functions
-%% used by Mnesia at backup and restore. The user may however
-%% write an own module the same interface as mnesia_backup and
-%% configure Mnesia so the alternate module performs the actual
-%% accesses to the backup media. This means that the user may put
-%% the backup on medias that Mnesia does not know about, possibly
-%% on hosts where Erlang is not running.
-%%
-%% The OpaqueData argument is never interpreted by other parts of
-%% Mnesia. It is the property of this module. Alternate implementations
-%% of this module may have different interpretations of OpaqueData.
-%% The OpaqueData argument given to open_write/1 and open_read/1
-%% are forwarded directly from the user.
-%%
-%% All functions must return {ok, NewOpaqueData} or {error, Reason}.
-%%
-%% The NewOpaqueData arguments returned by backup callback functions will
-%% be given as input when the next backup callback function is invoked.
-%% If any return value does not match {ok, _} the backup will be aborted.
-%%
-%% The NewOpaqueData arguments returned by restore callback functions will
-%% be given as input when the next restore callback function is invoked
-%% If any return value does not match {ok, _} the restore will be aborted.
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--module(mnesia_backup).
--behaviour(mnesia_backup).
-
--include_lib("kernel/include/file.hrl").
-
--export([
-	 %% Write access
-         open_write/1, 
-	 write/2, 
-	 commit_write/1, 
-	 abort_write/1,
-
-	 %% Read access
-         open_read/1, 
-	 read/1, 
-	 close_read/1
-        ]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Backup callback interface
--record(backup, {tmp_file, file, file_desc}).
-
-%% Opens backup media for write
-%%
-%% Returns {ok, OpaqueData} or {error, Reason}
-open_write(OpaqueData) ->
-    File = OpaqueData,
-    Tmp = lists:concat([File,".BUPTMP"]),
-    file:delete(Tmp),
-    file:delete(File),
-    case disk_log:open([{name, make_ref()},
-			{file, Tmp},
-			{repair, false},
-			{linkto, self()}]) of
-	{ok, Fd} ->
-	    {ok, #backup{tmp_file = Tmp, file = File, file_desc = Fd}};
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-%% Writes BackupItems to the backup media
-%%
-%% Returns {ok, OpaqueData} or {error, Reason}
-write(OpaqueData, BackupItems) ->
-    B = OpaqueData,
-    case disk_log:log_terms(B#backup.file_desc, BackupItems) of
-        ok ->
-            {ok, B};
-        {error, Reason} ->
-            abort_write(B),
-            {error, Reason}
-    end.
-
-%% Closes the backup media after a successful backup
-%%
-%% Returns {ok, ReturnValueToUser} or {error, Reason}
-commit_write(OpaqueData) ->
-    B = OpaqueData,
-    case disk_log:sync(B#backup.file_desc) of
-        ok ->
-            case disk_log:close(B#backup.file_desc) of
-                ok ->
-		    case file:rename(B#backup.tmp_file, B#backup.file) of
-		       ok ->
-			    {ok, B#backup.file};
-		       {error, Reason} ->
-			    {error, Reason}
-		    end;
-                {error, Reason} ->
-		    {error, Reason}
-            end;
-        {error, Reason} ->
-            {error, Reason}
-    end.
-
-%% Closes the backup media after an interrupted backup
-%%
-%% Returns {ok, ReturnValueToUser} or {error, Reason}
-abort_write(BackupRef) ->
-    Res = disk_log:close(BackupRef#backup.file_desc),
-    file:delete(BackupRef#backup.tmp_file),
-    case Res of
-        ok ->
-            {ok, BackupRef#backup.file};
-        {error, Reason} ->
-            {error, Reason}
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Restore callback interface
-
--record(restore, {file, file_desc, cont}).
-
-%% Opens backup media for read
-%%
-%% Returns {ok, OpaqueData} or {error, Reason}
-open_read(OpaqueData) ->
-    File = OpaqueData,
-    case file:read_file_info(File) of
-	{error, Reason} ->
-	    {error, Reason};
-	_FileInfo -> %% file exists
-	    case disk_log:open([{file, File},
-				{name, make_ref()},
-				{repair, false},
-				{mode, read_only},
-				{linkto, self()}]) of
-		{ok, Fd} ->
-		    {ok, #restore{file = File, file_desc = Fd, cont = start}};
-		{repaired, Fd, _, {badbytes, 0}} ->
-		    {ok, #restore{file = File, file_desc = Fd, cont = start}};
-		{repaired, Fd, _, _} ->
-		    {ok, #restore{file = File, file_desc = Fd, cont = start}};
-		{error, Reason} ->
-		    {error, Reason}
-	    end
-    end.
-
-%% Reads BackupItems from the backup media
-%%
-%% Returns {ok, OpaqueData, BackupItems} or {error, Reason}
-%%
-%% BackupItems == [] is interpreted as eof
-read(OpaqueData) ->
-    R = OpaqueData,
-    Fd = R#restore.file_desc,
-    case disk_log:chunk(Fd, R#restore.cont) of
-        {error, Reason} ->
-            {error, {"Possibly truncated", Reason}};
-        eof ->
-            {ok, R, []};
-        {Cont, []} ->
-            read(R#restore{cont = Cont});
-        {Cont, BackupItems} ->
-            {ok, R#restore{cont = Cont}, BackupItems}
-    end.
-
-%% Closes the backup media after restore
-%%
-%% Returns {ok, ReturnValueToUser} or {error, Reason}
-close_read(OpaqueData) ->
-    R = OpaqueData,
-    case disk_log:close(R#restore.file_desc) of
-        ok -> {ok, R#restore.file};
-        {error, Reason} -> {error, Reason}
-    end.
-%0
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_bup.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_bup.erl
deleted file mode 100644
index f03dc029cc..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_bup.erl
+++ /dev/null
@@ -1,1169 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_bup.erl,v 1.1 2008/12/17 09:53:37 mikpe Exp $
-%%
--module(mnesia_bup).
--export([
-	 %% Public interface
-	 iterate/4,
-	 read_schema/2,
-	 fallback_bup/0,
-	 fallback_exists/0,
-	 tm_fallback_start/1,
-	 create_schema/1,
-	 install_fallback/1,
-	 install_fallback/2,
-	 uninstall_fallback/0,
-	 uninstall_fallback/1,
-	 traverse_backup/4,
-	 traverse_backup/6,
-	 make_initial_backup/3,
-	 fallback_to_schema/0,
-	 lookup_schema/2,
-	 schema2bup/1,
-	 refresh_cookie/2,
-
-	 %% Internal
-	 fallback_receiver/2,
-	 install_fallback_master/2,
-	 uninstall_fallback_master/2,
-	 local_uninstall_fallback/2,
-	 do_traverse_backup/7,
-	 trav_apply/4
-	]).
-
--include("mnesia.hrl").
--import(mnesia_lib, [verbose/2, dbg_out/2]).
-
--record(restore, {mode, bup_module, bup_data}).
-
--record(fallback_args, {opaque,
-			scope = global,
-			module = mnesia_monitor:get_env(backup_module),
-			use_default_dir = true,
-			mnesia_dir,
-			fallback_bup,
-			fallback_tmp,
-			skip_tables = [],
-			keep_tables = [],
-			default_op = keep_tables		       
-		       }).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Backup iterator
-
-%% Reads schema section and iterates over all records in a backup.
-%%
-%% Fun(BunchOfRecords, Header, Schema, Acc) is applied when a suitable amount
-%% of records has been collected.
-%%
-%% BunchOfRecords will be [] when the iteration is done.
-iterate(Mod, Fun, Opaque, Acc) ->
-    R = #restore{bup_module = Mod, bup_data = Opaque},
-    case catch read_schema_section(R) of
-	{error, Reason} ->
-	    {error, Reason};
-	{R2, {Header, Schema, Rest}} ->
-	    case catch iter(R2, Header, Schema, Fun, Acc, Rest) of
-		{ok, R3, Res} ->
-		    catch safe_apply(R3, close_read, [R3#restore.bup_data]),
-		    {ok, Res};
-		{error, Reason} ->
-		    catch safe_apply(R2, close_read, [R2#restore.bup_data]),
-		    {error, Reason};
-		{'EXIT', Pid, Reason} ->
-		    catch safe_apply(R2, close_read, [R2#restore.bup_data]),
-		    {error, {'EXIT', Pid, Reason}};
-		{'EXIT', Reason} ->
-		    catch safe_apply(R2, close_read, [R2#restore.bup_data]),
-		    {error, {'EXIT', Reason}}
-	    end
-    end.
-
-iter(R, Header, Schema, Fun, Acc, []) ->
-    case safe_apply(R, read, [R#restore.bup_data]) of
-	{R2, []} ->
-	    Res = Fun([], Header, Schema, Acc),
-	    {ok, R2, Res};
-	{R2, BupItems} ->
-	    iter(R2, Header, Schema, Fun, Acc, BupItems)
-    end;
-iter(R, Header, Schema, Fun, Acc, BupItems) ->
-    Acc2 = Fun(BupItems, Header, Schema, Acc),
-    iter(R, Header, Schema, Fun, Acc2, []).
-
-safe_apply(R, write, [_, Items]) when Items == [] ->
-    R;
-safe_apply(R, What, Args) ->
-    Abort = fun(Re) -> abort_restore(R, What, Args, Re) end,
-    receive
-	{'EXIT', Pid, Re} -> Abort({'EXIT', Pid, Re})
-    after 0 ->
-	    Mod = R#restore.bup_module,
-	    case catch apply(Mod, What, Args) of
-		{ok, Opaque, Items} when What == read ->
-		    {R#restore{bup_data = Opaque}, Items};
-		{ok, Opaque}  when What /= read->
-		    R#restore{bup_data = Opaque};
-		{error, Re} ->
-		    Abort(Re);
-		Re ->
-		    Abort(Re)
-	    end
-    end.
-
-abort_restore(R, What, Args, Reason) ->
-    Mod = R#restore.bup_module,
-    Opaque = R#restore.bup_data,
-    dbg_out("Restore aborted. ~p:~p~p -> ~p~n",
-	    [Mod, What, Args, Reason]),
-    catch apply(Mod, close_read, [Opaque]),
-    throw({error, Reason}).
-	    
-fallback_to_schema() ->
-    Fname = fallback_bup(),
-    fallback_to_schema(Fname).
-
-fallback_to_schema(Fname) ->
-    Mod = mnesia_backup,
-    case read_schema(Mod, Fname) of
-	{error, Reason} ->
-	    {error, Reason};
-	Schema ->
-	    case catch lookup_schema(schema, Schema) of
-		{error, _} -> 
-		    {error, "No schema in fallback"};
-		List ->
-		    {ok, fallback, List}
-	    end
-    end.
-
-%% Opens Opaque reads schema and then close 
-read_schema(Mod, Opaque) ->
-    R = #restore{bup_module = Mod, bup_data = Opaque},
-    case catch read_schema_section(R) of
-	{error, Reason} ->
-	    {error, Reason};
-	{R2, {_Header, Schema, _}} ->
-	    catch safe_apply(R2, close_read, [R2#restore.bup_data]),
-	    Schema
-    end.
-    
-%% Open backup media and extract schema
-%% rewind backup media and leave it open
-%% Returns {R, {Header, Schema}}
-read_schema_section(R) ->
-    case catch do_read_schema_section(R) of
-	{'EXIT', Reason} ->
-	    catch safe_apply(R, close_read, [R#restore.bup_data]),
-	    {error, {'EXIT', Reason}};
-	{error, Reason} ->
-	    catch safe_apply(R, close_read, [R#restore.bup_data]),
-	    {error, Reason};
-	{R2, {H, Schema, Rest}} ->
-	    Schema2 = convert_schema(H#log_header.log_version, Schema),
-	    {R2, {H, Schema2, Rest}}
-    end.
-
-do_read_schema_section(R) ->
-    R2 = safe_apply(R, open_read, [R#restore.bup_data]),
-    {R3, RawSchema} = safe_apply(R2, read, [R2#restore.bup_data]),
-    do_read_schema_section(R3, verify_header(RawSchema), []).
-
-do_read_schema_section(R, {ok, B, C, []}, Acc) ->
-    case safe_apply(R, read, [R#restore.bup_data]) of
-	{R2, []} ->
-	    {R2, {B, Acc, []}};
-	{R2, RawSchema} ->
-	    do_read_schema_section(R2, {ok, B, C, RawSchema}, Acc)
-    end;
-
-do_read_schema_section(R, {ok, B, C, [Head | Tail]}, Acc)
-        when element(1, Head) == schema ->
-    do_read_schema_section(R, {ok, B, C, Tail}, Acc ++ [Head]);
-
-do_read_schema_section(R, {ok, B, _C, Rest}, Acc) ->
-    {R, {B, Acc, Rest}};
-
-do_read_schema_section(_R, {error, Reason}, _Acc) ->
-    {error, Reason}.
-
-verify_header([H | RawSchema])  when record(H, log_header) ->
-    Current = mnesia_log:backup_log_header(),
-    if
-	H#log_header.log_kind == Current#log_header.log_kind ->
-	    Versions = ["0.1", "1.1", Current#log_header.log_version],
-	    case lists:member(H#log_header.log_version, Versions) of
-		true ->
-		    {ok, H, Current, RawSchema};
-		false ->
-		    {error, {"Bad header version. Cannot be used as backup.", H}}
-	    end;
-	true ->
-	    {error, {"Bad kind of header. Cannot be used as backup.", H}}
-    end;
-verify_header(RawSchema) ->
-    {error, {"Missing header. Cannot be used as backup.", catch hd(RawSchema)}}.
-
-refresh_cookie(Schema, NewCookie) ->
-    case lists:keysearch(schema, 2, Schema) of
-	{value, {schema, schema, List}} ->
-	    Cs = mnesia_schema:list2cs(List),
-	    Cs2 = Cs#cstruct{cookie = NewCookie},
-	    Item = {schema, schema, mnesia_schema:cs2list(Cs2)},
-	    lists:keyreplace(schema, 2, Schema, Item);
-	
-	false ->
-	    Reason = "No schema found. Cannot be used as backup.",
-	    throw({error, {Reason, Schema}})
-    end.
-
-%% Convert schema items from an external backup
-%% If backup format is the latest, no conversion is needed
-%% All supported backup formats should have their converters
-%% here as separate function clauses.
-convert_schema("0.1", Schema) ->
-    convert_0_1(Schema);
-convert_schema("1.1", Schema) ->
-    %% The new backup format is a pure extension of the old one
-    Current = mnesia_log:backup_log_header(),
-    convert_schema(Current#log_header.log_version, Schema);
-convert_schema(Latest, Schema) ->
-    H = mnesia_log:backup_log_header(),
-    if
-	H#log_header.log_version == Latest ->
-	    Schema;
-	true ->
-	    Reason = "Bad backup header version. Cannot convert schema.",
-	    throw({error, {Reason, H}})
-    end.
-
-%% Backward compatibility for 0.1
-convert_0_1(Schema) ->
-    case lists:keysearch(schema, 2, Schema) of
-	{value, {schema, schema, List}} ->
-	    Schema2 = lists:keydelete(schema, 2, Schema),
-	    Cs = mnesia_schema:list2cs(List),
-	    convert_0_1(Schema2, [], Cs);
-	false ->
-	    List = mnesia_schema:get_initial_schema(disc_copies, [node()]),
-	    Cs = mnesia_schema:list2cs(List),
-	    convert_0_1(Schema, [], Cs)
-    end.
-
-convert_0_1([{schema, cookie, Cookie} | Schema], Acc, Cs) ->
-    convert_0_1(Schema, Acc, Cs#cstruct{cookie = Cookie});
-convert_0_1([{schema, db_nodes, DbNodes} | Schema], Acc, Cs) ->
-    convert_0_1(Schema, Acc, Cs#cstruct{disc_copies = DbNodes});
-convert_0_1([{schema, version, Version} | Schema], Acc, Cs) ->
-    convert_0_1(Schema, Acc, Cs#cstruct{version = Version});
-convert_0_1([{schema, Tab, Def} | Schema], Acc, Cs) ->
-    Head = 
-	case lists:keysearch(index, 1, Def) of
-	    {value, {index, PosList}} ->
-		%% Remove the snmp "index"
-		P = PosList -- [snmp],
-		Def2 = lists:keyreplace(index, 1, Def, {index, P}),
-		{schema, Tab, Def2};
-	    false ->
-		{schema, Tab, Def}
-	end,
-    convert_0_1(Schema, [Head | Acc], Cs);
-convert_0_1([Head | Schema], Acc, Cs) ->
-    convert_0_1(Schema, [Head | Acc], Cs);
-convert_0_1([], Acc, Cs) ->
-    [schema2bup({schema, schema, Cs}) | Acc].
-
-%% Returns Val or throw error
-lookup_schema(Key, Schema) ->
-    case lists:keysearch(Key, 2, Schema) of
-	{value, {schema, Key, Val}} -> Val;
-	false -> throw({error, {"Cannot lookup", Key}})
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Backup compatibility
-
-%% Convert internal schema items to backup dito
-schema2bup({schema, Tab}) ->
-    {schema, Tab};
-schema2bup({schema, Tab, TableDef}) ->
-    {schema, Tab, mnesia_schema:cs2list(TableDef)}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Create schema on the given nodes
-%% Requires that old schemas has been deleted
-%% Returns ok | {error, Reason}
-create_schema([]) ->
-    create_schema([node()]);
-create_schema(Ns) when list(Ns) ->
-    case is_set(Ns) of
-	true ->
-	    create_schema(Ns, mnesia_schema:ensure_no_schema(Ns));
-	false ->
-	    {error, {combine_error, Ns}}
-    end;
-create_schema(Ns) ->
-    {error, {badarg, Ns}}.
-
-is_set(List) when list(List) ->
-    ordsets:is_set(lists:sort(List));
-is_set(_) ->
-    false.
-
-create_schema(Ns, ok) ->
-    %% Ensure that we access the intended Mnesia
-    %% directory. This function may not be called
-    %% during startup since it will cause the
-    %% application_controller to get into deadlock
-    case mnesia_lib:ensure_loaded(?APPLICATION) of
-	ok ->
-	    case mnesia_monitor:get_env(schema_location) of
-		ram -> 
-		    {error, {has_no_disc, node()}};
-		_ ->
-		    case mnesia_schema:opt_create_dir(true, mnesia_lib:dir()) of
-			{error, What} ->
-			    {error, What};
-			ok ->
-			    Mod = mnesia_backup,
-			    Str = mk_str(),
-			    File = mnesia_lib:dir(Str),
-			    file:delete(File),
-			    case catch make_initial_backup(Ns, File, Mod) of
-				{ok, _Res} ->
-				    case do_install_fallback(File, Mod) of
-					ok ->
-					    file:delete(File),
-					    ok;
-					{error, Reason} ->
-					    {error, Reason}
-				    end;
-				{error, Reason} ->
-				    {error, Reason}
-			    end
-		    end
-	    end;	
-	{error, Reason} ->
-	    {error, Reason}
-    end;
-create_schema(_Ns, {error, Reason}) ->
-    {error, Reason};
-create_schema(_Ns, Reason) ->
-    {error, Reason}.
-
-mk_str() ->
-    Now = [integer_to_list(I) || I <- tuple_to_list(now())],
-    lists:concat([node()] ++ Now ++ ".TMP").
-
-make_initial_backup(Ns, Opaque, Mod) ->
-    Schema = [{schema, schema, mnesia_schema:get_initial_schema(disc_copies, Ns)}],
-    O2 = do_apply(Mod, open_write, [Opaque], Opaque),
-    O3 = do_apply(Mod, write, [O2, [mnesia_log:backup_log_header()]], O2),
-    O4 = do_apply(Mod, write, [O3, Schema], O3),
-    O5 = do_apply(Mod, commit_write, [O4], O4),
-    {ok, O5}.
-
-do_apply(_, write, [_, Items], Opaque) when Items == [] ->
-    Opaque;
-do_apply(Mod, What, Args, _Opaque) ->
-    case catch apply(Mod, What, Args) of
-	{ok, Opaque2} ->  Opaque2;
-	{error, Reason} -> throw({error, Reason});
-	{'EXIT', Reason} -> throw({error, {'EXIT', Reason}})
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Restore
-
-%% Restore schema and possibly other tables from a backup
-%% and replicate them to the necessary nodes
-%% Requires that old schemas has been deleted
-%% Returns ok | {error, Reason}
-install_fallback(Opaque) ->
-    install_fallback(Opaque, []).
-
-install_fallback(Opaque, Args) ->
-    %% Ensure that we access the intended Mnesia
-    %% directory. This function may not be called
-    %% during startup since it will cause the
-    %% application_controller to get into deadlock
-    case mnesia_lib:ensure_loaded(?APPLICATION) of
-	ok ->
-	    do_install_fallback(Opaque, Args);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-do_install_fallback(Opaque,  Mod) when atom(Mod) ->
-    do_install_fallback(Opaque, [{module, Mod}]);
-do_install_fallback(Opaque, Args) when list(Args) ->
-    case check_fallback_args(Args, #fallback_args{opaque = Opaque}) of
-	{ok, FA} ->
-	    do_install_fallback(FA);
-	{error, Reason} ->
-	    {error, Reason}
-    end;
-do_install_fallback(_Opaque, Args) ->
-    {error, {badarg, Args}}.
-
-check_fallback_args([Arg | Tail], FA) ->
-    case catch check_fallback_arg_type(Arg, FA) of
-	{'EXIT', _Reason} ->
-	    {error, {badarg, Arg}};
-	FA2 ->
-	    check_fallback_args(Tail, FA2)
-    end;
-check_fallback_args([], FA) ->
-    {ok, FA}.
-
-check_fallback_arg_type(Arg, FA) ->    
-    case Arg of
-	{scope, global} ->
-	    FA#fallback_args{scope = global};
-	{scope, local} ->
-	    FA#fallback_args{scope = local};
-	{module, Mod} ->
-	    Mod2 = mnesia_monitor:do_check_type(backup_module, Mod),
-	    FA#fallback_args{module = Mod2};
-	{mnesia_dir, Dir} ->
-	    FA#fallback_args{mnesia_dir = Dir,
-			     use_default_dir = false};
-	{keep_tables, Tabs} ->
-	    atom_list(Tabs),
-	    FA#fallback_args{keep_tables = Tabs};
-	{skip_tables, Tabs} ->
-	    atom_list(Tabs),
-	    FA#fallback_args{skip_tables = Tabs};
-	{default_op, keep_tables} ->
-	    FA#fallback_args{default_op = keep_tables};
-	{default_op, skip_tables} ->
-	    FA#fallback_args{default_op = skip_tables}
-    end.
-
-atom_list([H | T]) when atom(H) ->
-    atom_list(T);
-atom_list([]) ->
-    ok.
-    
-do_install_fallback(FA) ->
-    Pid = spawn_link(?MODULE, install_fallback_master, [self(), FA]),
-    Res = 
-	receive
-	    {'EXIT', Pid, Reason} -> % if appl has trapped exit
-		{error, {'EXIT', Reason}};
-	    {Pid, Res2} ->
-		case Res2 of
-		    {ok, _} ->
-			ok;
-		    {error, Reason} ->
-			{error, {"Cannot install fallback", Reason}}
-		end
-	end,
-    Res.
-
-install_fallback_master(ClientPid, FA) ->
-    process_flag(trap_exit, true),
-    State = {start, FA},
-    Opaque = FA#fallback_args.opaque,
-    Mod = FA#fallback_args.module,
-    Res = (catch iterate(Mod, fun restore_recs/4, Opaque, State)),
-    unlink(ClientPid),
-    ClientPid ! {self(), Res},
-    exit(shutdown).
-
-restore_recs(_, _, _, stop) ->
-    throw({error, "restore_recs already stopped"});
-
-restore_recs(Recs, Header, Schema, {start, FA}) ->
-    %% No records in backup
-    Schema2 = convert_schema(Header#log_header.log_version, Schema),
-    CreateList = lookup_schema(schema, Schema2),
-    case catch mnesia_schema:list2cs(CreateList) of
-	{'EXIT', Reason} ->
-	    throw({error, {"Bad schema in restore_recs", Reason}});
-	Cs ->
-	    Ns = get_fallback_nodes(FA, Cs#cstruct.disc_copies),
-	    global:set_lock({{mnesia_table_lock, schema}, self()}, Ns, infinity),
-	    Args = [self(), FA],
-	    Pids = [spawn_link(N, ?MODULE, fallback_receiver, Args) || N <- Ns],
-	    send_fallback(Pids, {start, Header, Schema2}),
-	    Res = restore_recs(Recs, Header, Schema2, Pids),
-	    global:del_lock({{mnesia_table_lock, schema}, self()}, Ns), 
-	    Res
-    end;
-
-restore_recs([], _Header, _Schema, Pids) ->
-    send_fallback(Pids, swap),
-    send_fallback(Pids, stop),
-    stop;
-
-restore_recs(Recs, _, _, Pids) ->
-    send_fallback(Pids, {records, Recs}),
-    Pids.
-
-get_fallback_nodes(FA, Ns) ->
-    This = node(),
-    case lists:member(This, Ns) of
-	true ->
-	    case FA#fallback_args.scope of
-		global ->  Ns;
-		local -> [This]
-	    end;
-	false ->
-	    throw({error, {"No disc resident schema on local node", Ns}})
-    end.
-
-send_fallback(Pids, Msg) when list(Pids), Pids /= [] ->
-    lists:foreach(fun(Pid) -> Pid ! {self(), Msg} end, Pids),
-    rec_answers(Pids, []).
-
-rec_answers([], Acc) ->
-    case {lists:keysearch(error, 1, Acc), mnesia_lib:uniq(Acc)} of
-	{{value, {error, Val}}, _} -> throw({error, Val});
-	{_, [SameAnswer]} -> SameAnswer;
-	{_, Other} -> throw({error, {"Different answers", Other}})
-    end;
-rec_answers(Pids, Acc) ->
-    receive
-	{'EXIT', Pid, stopped} ->
-	    Pids2 = lists:delete(Pid, Pids),
-	    rec_answers(Pids2, [stopped|Acc]);
-	{'EXIT', Pid, Reason} ->
-	    Pids2 = lists:delete(Pid, Pids),
-	    rec_answers(Pids2, [{error, {'EXIT', Pid, Reason}}|Acc]);
-	{Pid, Reply} ->
-	    Pids2 = lists:delete(Pid, Pids),
-	    rec_answers(Pids2, [Reply|Acc])
-    end.
-
-fallback_exists() ->
-    Fname = fallback_bup(),
-    fallback_exists(Fname).
-
-fallback_exists(Fname) ->
-    case mnesia_monitor:use_dir() of
-	true ->
-	    mnesia_lib:exists(Fname);
-	false ->
-	    case ?catch_val(active_fallback) of
-		{'EXIT', _} -> false;
-		Bool -> Bool
-	    end
-    end.
-
-fallback_name() -> "FALLBACK.BUP".
-fallback_bup() -> mnesia_lib:dir(fallback_name()).
-
-fallback_tmp_name() -> "FALLBACK.TMP".
-%% fallback_full_tmp_name() -> mnesia_lib:dir(fallback_tmp_name()).
-
-fallback_receiver(Master, FA) ->
-    process_flag(trap_exit, true),
-    
-    case catch register(mnesia_fallback, self()) of
-	{'EXIT', _} ->
-	    Reason = {already_exists, node()},
-	    local_fallback_error(Master, Reason);
-	true ->
-	    FA2 = check_fallback_dir(Master, FA),
-	    Bup = FA2#fallback_args.fallback_bup,
-	    case mnesia_lib:exists(Bup) of
-		true ->
-		    Reason2 = {already_exists, node()},
-		    local_fallback_error(Master, Reason2);
-		false ->
-		    Mod = mnesia_backup,
-		    Tmp = FA2#fallback_args.fallback_tmp,
-		    R = #restore{mode = replace,
-				 bup_module = Mod,
-				 bup_data = Tmp},
-		    file:delete(Tmp),
-		    case catch fallback_receiver_loop(Master, R, FA2, schema) of
-			{error, Reason} ->
-			    local_fallback_error(Master, Reason);
-			Other ->
-			    exit(Other)
-		    end
-	    end
-    end.
-
-local_fallback_error(Master, Reason) ->
-    Master ! {self(), {error, Reason}},
-    unlink(Master),
-    exit(Reason).
-    
-check_fallback_dir(Master, FA) ->
-    case mnesia:system_info(schema_location) of
-	ram ->
-	    Reason = {has_no_disc, node()},
-	    local_fallback_error(Master, Reason);
-	_ ->
-	    Dir = check_fallback_dir_arg(Master, FA),
-	    Bup = filename:join([Dir, fallback_name()]),
-	    Tmp = filename:join([Dir, fallback_tmp_name()]),
-	    FA#fallback_args{fallback_bup = Bup,
-			     fallback_tmp = Tmp,
-			     mnesia_dir = Dir}
-    end.
-
-check_fallback_dir_arg(Master, FA) ->
-    case FA#fallback_args.use_default_dir of
-	true ->
-	    mnesia_lib:dir();
-	false when FA#fallback_args.scope == local ->
-	    Dir = FA#fallback_args.mnesia_dir,
-	    case catch mnesia_monitor:do_check_type(dir, Dir) of
-		{'EXIT', _R} ->
-		    Reason = {badarg, {dir, Dir}, node()},
-		    local_fallback_error(Master, Reason);
-		AbsDir->
-		    AbsDir
-	    end;
-	false when FA#fallback_args.scope == global ->
-	    Reason = {combine_error, global, dir, node()},
-	    local_fallback_error(Master, Reason)
-    end.
-
-fallback_receiver_loop(Master, R, FA, State) ->
-    receive
-	{Master, {start, Header, Schema}} when State == schema ->
-	    Dir = FA#fallback_args.mnesia_dir,
-	    throw_bad_res(ok, mnesia_schema:opt_create_dir(true, Dir)),
-	    R2 = safe_apply(R, open_write, [R#restore.bup_data]),
-	    R3 = safe_apply(R2, write, [R2#restore.bup_data, [Header]]),
-	    BupSchema = [schema2bup(S) || S <- Schema],
-	    R4 = safe_apply(R3, write, [R3#restore.bup_data, BupSchema]),
-	    Master ! {self(), ok},
-	    fallback_receiver_loop(Master, R4, FA, records);
-
-	{Master, {records, Recs}} when State == records ->
-	    R2 = safe_apply(R, write, [R#restore.bup_data, Recs]),
-	    Master ! {self(), ok},
-	    fallback_receiver_loop(Master, R2, FA, records);
-	
-	{Master, swap} when State /= schema ->
-	    ?eval_debug_fun({?MODULE, fallback_receiver_loop, pre_swap}, []),
-	    safe_apply(R, commit_write, [R#restore.bup_data]),
-	    Bup = FA#fallback_args.fallback_bup,
-	    Tmp = FA#fallback_args.fallback_tmp,
-	    throw_bad_res(ok, file:rename(Tmp, Bup)),
-	    catch mnesia_lib:set(active_fallback, true),
-	    ?eval_debug_fun({?MODULE, fallback_receiver_loop, post_swap}, []),
-	    Master ! {self(), ok},
-	    fallback_receiver_loop(Master, R, FA, stop);
-
-	{Master, stop} when State == stop ->
-	    stopped;
-
-	Msg ->
-	    safe_apply(R, abort_write, [R#restore.bup_data]),
-	    Tmp = FA#fallback_args.fallback_tmp,
-	    file:delete(Tmp),
-	    throw({error, "Unexpected msg fallback_receiver_loop", Msg})
-    end.
-
-throw_bad_res(Expected, Expected) -> Expected;
-throw_bad_res(_Expected, {error, Actual}) -> throw({error, Actual});
-throw_bad_res(_Expected, Actual) -> throw({error, Actual}).
-
--record(local_tab, {name, storage_type, dets_args, open, close, add, record_name}).
-
-tm_fallback_start(IgnoreFallback) ->
-    mnesia_schema:lock_schema(),
-    Res = do_fallback_start(fallback_exists(), IgnoreFallback),
-    mnesia_schema: unlock_schema(),
-    case Res of
-	ok -> ok;
-	{error, Reason} -> exit(Reason)
-    end.
-
-do_fallback_start(false, _IgnoreFallback) ->
-    ok;
-do_fallback_start(true, true) ->
-    verbose("Ignoring fallback at startup, but leaving it active...~n", []),
-    mnesia_lib:set(active_fallback, true),
-    ok;
-do_fallback_start(true, false) ->
-    verbose("Starting from fallback...~n", []),
-
-    Fname = fallback_bup(),
-    Mod = mnesia_backup,
-    Ets = ?ets_new_table(mnesia_local_tables, [set, public, {keypos, 2}]),
-    case catch iterate(Mod, fun restore_tables/4, Fname, {start, Ets}) of
-	{ok, Res} ->
-	    case Res of 
-		{local, _, LT} ->  %% Close the last file
-		    (LT#local_tab.close)(LT);
-		_ ->
-		    ignore
-	    end,
-	    List = ?ets_match_object(Ets, '_'),
-	    Tabs = [L#local_tab.name || L <- List, L#local_tab.name /= schema],
-	    ?ets_delete_table(Ets),
-	    mnesia_lib:swap_tmp_files(Tabs),
-	    catch dets:close(schema),
-	    Tmp = mnesia_lib:tab2tmp(schema),
-	    Dat = mnesia_lib:tab2dat(schema),
-	    case file:rename(Tmp, Dat) of
-		ok ->
-		    file:delete(Fname),
-		    ok;
-		{error, Reason} ->
-		    file:delete(Tmp),
-		    {error, {"Cannot start from fallback. Rename error.", Reason}}
-	    end;
-	{error, Reason} ->
-	    {error, {"Cannot start from fallback", Reason}};
-	{'EXIT', Reason} ->
-	    {error, {"Cannot start from fallback", Reason}}
-    end.
-
-restore_tables(Recs, Header, Schema, {start, LocalTabs}) ->
-    Dir = mnesia_lib:dir(),
-    OldDir = filename:join([Dir, "OLD_DIR"]),
-    mnesia_schema:purge_dir(OldDir, []),
-    mnesia_schema:purge_dir(Dir, [fallback_name()]),
-    init_dat_files(Schema, LocalTabs),
-    State = {new, LocalTabs},
-    restore_tables(Recs, Header, Schema, State);
-restore_tables([Rec | Recs], Header, Schema, {new, LocalTabs}) ->
-    Tab = element(1, Rec),
-    case ?ets_lookup(LocalTabs, Tab) of
-	[] ->
-	    State = {not_local, LocalTabs, Tab},
-	    restore_tables(Recs, Header, Schema, State);
-	[L] when record(L, local_tab) ->
-	    (L#local_tab.open)(Tab, L),
-	    State = {local, LocalTabs, L},
-	    restore_tables([Rec | Recs], Header, Schema, State)
-    end;
-restore_tables([Rec | Recs], Header, Schema, S = {not_local, LocalTabs, PrevTab}) ->
-    Tab = element(1, Rec),
-    if
-	Tab == PrevTab ->
-	    restore_tables(Recs, Header, Schema, S);
-	true ->
-	    State = {new, LocalTabs},
-	    restore_tables([Rec | Recs], Header, Schema, State)
-    end;
-restore_tables([Rec | Recs], Header, Schema, State = {local, LocalTabs, L}) ->
-    Tab = element(1, Rec),
-    if
-	Tab == L#local_tab.name ->
-	    Key = element(2, Rec),
-	    (L#local_tab.add)(Tab, Key, Rec, L),
-	    restore_tables(Recs, Header, Schema, State);
-	true ->
-	    (L#local_tab.close)(L),
-	    NState = {new, LocalTabs},
-	    restore_tables([Rec | Recs], Header, Schema, NState)
-    end;
-restore_tables([], _Header, _Schema, State) ->
-    State.
-
-%% Creates all neccessary dat files and inserts
-%% the table definitions in the schema table
-%%
-%% Returns a list of local_tab tuples for all local tables
-init_dat_files(Schema, LocalTabs) ->
-    Fname = mnesia_lib:tab2tmp(schema),
-    Args = [{file, Fname}, {keypos, 2}, {type, set}],
-    case dets:open_file(schema, Args) of % Assume schema lock
-	{ok, _} ->
-	    create_dat_files(Schema, LocalTabs),
-	    dets:close(schema),
-	    LocalTab = #local_tab{name = schema,
-				  storage_type = disc_copies,
-				  dets_args = Args,
-				  open   = fun open_media/2,
-				  close  = fun close_media/1,
-				  add    = fun add_to_media/4,
-				  record_name = schema},
-	    ?ets_insert(LocalTabs, LocalTab);
-	{error, Reason} ->
-	    throw({error, {"Cannot open file", schema, Args, Reason}})
-    end.
-
-create_dat_files([{schema, schema, TabDef} | Tail], LocalTabs) ->
-    ok = dets:insert(schema, {schema, schema, TabDef}),
-    create_dat_files(Tail, LocalTabs);
-create_dat_files([{schema, Tab, TabDef} | Tail], LocalTabs) ->
-    Cs =  mnesia_schema:list2cs(TabDef),
-    ok = dets:insert(schema, {schema, Tab, TabDef}),
-    RecName = Cs#cstruct.record_name,
-    case mnesia_lib:cs_to_storage_type(node(), Cs) of
-	unknown ->
-	    cleanup_dat_file(Tab),
-	    create_dat_files(Tail, LocalTabs);
-	disc_only_copies ->
-	    Fname = mnesia_lib:tab2tmp(Tab),
-	    Args = [{file, Fname}, {keypos, 2}, 
-		    {type, mnesia_lib:disk_type(Tab, Cs#cstruct.type)}],
-	    case mnesia_lib:dets_sync_open(Tab, Args) of
-		{ok, _} ->
-		    mnesia_lib:dets_sync_close(Tab),
-		    LocalTab = #local_tab{name = Tab,
-					  storage_type = disc_only_copies,
-					  dets_args = Args,
-					  open   = fun open_media/2,
-					  close  = fun close_media/1,
-					  add    = fun add_to_media/4,
-					  record_name = RecName},		    
-		    ?ets_insert(LocalTabs, LocalTab),
-		    create_dat_files(Tail, LocalTabs);
-		{error, Reason} ->
-		    throw({error, {"Cannot open file", Tab, Args, Reason}})
-	    end;
-	ram_copies ->
-	    %% Create .DCD if needed in open_media in case any ram_copies
-	    %% are backed up.
-	    LocalTab = #local_tab{name = Tab,
-				  storage_type = ram_copies,
-				  dets_args = ignore,
-				  open   = fun open_media/2,
-				  close  = fun close_media/1,
-				  add    = fun add_to_media/4,
-				  record_name = RecName},
-	    ?ets_insert(LocalTabs, LocalTab),
-	    create_dat_files(Tail, LocalTabs);
-	Storage ->
-	    %% Create DCD
-	    Fname = mnesia_lib:tab2dcd(Tab),
-	    file:delete(Fname),
-	    Log = mnesia_log:open_log(fallback_tab, mnesia_log:dcd_log_header(), 
-				      Fname, false),
-	    LocalTab = #local_tab{name = Tab,
-				  storage_type = Storage,
-				  dets_args = ignore,
-				  open   = fun open_media/2,
-				  close  = fun close_media/1,
-				  add    = fun add_to_media/4,
-				  record_name = RecName},
-	    mnesia_log:close_log(Log),
-	    ?ets_insert(LocalTabs, LocalTab),
-	    create_dat_files(Tail, LocalTabs)
-    end;
-create_dat_files([{schema, Tab} | Tail], LocalTabs) ->
-    cleanup_dat_file(Tab),
-    create_dat_files(Tail, LocalTabs);
-create_dat_files([], _LocalTabs) ->
-    ok.
-
-cleanup_dat_file(Tab) ->
-    ok = dets:delete(schema, {schema, Tab}),
-    mnesia_lib:cleanup_tmp_files([Tab]).
-
-open_media(Tab, LT) ->
-    case LT#local_tab.storage_type of
-	disc_only_copies ->
-	    Args = LT#local_tab.dets_args,	    
-	    case mnesia_lib:dets_sync_open(Tab, Args) of
-		{ok, _} -> ok;
-		{error, Reason} ->
-		    throw({error, {"Cannot open file", Tab, Args, Reason}})
-	    end;
-	ram_copies ->
-	    %% Create .DCD as ram_copies backed up.
-	    FnameDCD = mnesia_lib:tab2dcd(Tab),
-	    file:delete(FnameDCD),
-	    Log = mnesia_log:open_log(fallback_tab,
-				      mnesia_log:dcd_log_header(),
-				      FnameDCD, false),
-	    mnesia_log:close_log(Log),
-	    
-	    %% Create .DCL
-	    Fname = mnesia_lib:tab2dcl(Tab),
-	    file:delete(Fname),
-	    mnesia_log:open_log({?MODULE,Tab}, 
-				mnesia_log:dcl_log_header(), 
-				Fname, false, false,
-				read_write);
-	_ ->
-	    Fname = mnesia_lib:tab2dcl(Tab),
-	    file:delete(Fname),
-	    mnesia_log:open_log({?MODULE,Tab}, 
-				mnesia_log:dcl_log_header(), 
-				Fname, false, false,
-				read_write)
-    end.
-close_media(L) ->
-    Tab = L#local_tab.name,
-    case L#local_tab.storage_type of
-	disc_only_copies ->
-	    mnesia_lib:dets_sync_close(Tab);
-	_ ->		    
-	    mnesia_log:close_log({?MODULE,Tab})
-    end.
-
-add_to_media(Tab, Key, Rec, L) -> 
-    RecName = L#local_tab.record_name,
-    case L#local_tab.storage_type of
-	disc_only_copies ->
-	    case Rec of
-		{Tab, Key} ->
-		    ok = dets:delete(Tab, Key);
-		(Rec) when Tab == RecName ->
-		    ok = dets:insert(Tab, Rec);
-		(Rec) ->
-		    Rec2 = setelement(1, Rec, RecName),
-		    ok = dets:insert(Tab, Rec2)
-	    end;
-	_ ->		
-	    Log = {?MODULE, Tab},
-	    case Rec of
-		{Tab, Key} ->
-		    mnesia_log:append(Log, {{Tab, Key}, {Tab, Key}, delete});
-		(Rec) when Tab == RecName ->
-		    mnesia_log:append(Log, {{Tab, Key}, Rec, write});
-		(Rec) ->
-		    Rec2 = setelement(1, Rec, RecName),
-		    mnesia_log:append(Log, {{Tab, Key}, Rec2, write})
-	    end
-    end.
-
-uninstall_fallback() ->
-    uninstall_fallback([{scope, global}]).    
-
-uninstall_fallback(Args) ->
-    case check_fallback_args(Args, #fallback_args{}) of
-	{ok, FA} ->
-	    do_uninstall_fallback(FA);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-do_uninstall_fallback(FA) ->    
-    %% Ensure that we access the intended Mnesia
-    %% directory. This function may not be called
-    %% during startup since it will cause the
-    %% application_controller to get into deadlock
-    case mnesia_lib:ensure_loaded(?APPLICATION) of
-	ok ->
-	    Pid = spawn_link(?MODULE, uninstall_fallback_master, [self(), FA]),
-	    receive
-		{'EXIT', Pid, Reason} -> % if appl has trapped exit
-		    {error, {'EXIT', Reason}};
-		{Pid, Res} ->
-		    Res
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-uninstall_fallback_master(ClientPid, FA) ->
-    process_flag(trap_exit, true),
-
-    FA2 = check_fallback_dir(ClientPid, FA), % May exit
-    Bup = FA2#fallback_args.fallback_bup,
-    case fallback_to_schema(Bup) of
-	{ok, fallback, List} ->
-	    Cs = mnesia_schema:list2cs(List),
-	    case catch get_fallback_nodes(FA, Cs#cstruct.disc_copies) of
-		Ns when list(Ns) ->
-		    do_uninstall(ClientPid, Ns, FA);
-		{error, Reason} ->
-		    local_fallback_error(ClientPid, Reason)
-	    end;
-	{error, Reason} ->
-	    local_fallback_error(ClientPid, Reason)
-    end.
-
-do_uninstall(ClientPid, Ns, FA) ->
-    Args = [self(), FA],
-    global:set_lock({{mnesia_table_lock, schema}, self()}, Ns, infinity),
-    Pids = [spawn_link(N, ?MODULE, local_uninstall_fallback, Args) || N <- Ns],
-    Res = do_uninstall(ClientPid, Pids, [], [], ok),
-    global:del_lock({{mnesia_table_lock, schema}, self()}, Ns),
-    ClientPid ! {self(), Res},
-    unlink(ClientPid),
-    exit(shutdown).
-
-do_uninstall(ClientPid, [Pid | Pids], GoodPids, BadNodes, Res) ->
-    receive
-	%% {'EXIT', ClientPid, _} ->
-	%% client_exit;
-	{'EXIT', Pid, Reason} ->
-	    BadNode = node(Pid),
-	    BadRes = {error, {"Uninstall fallback", BadNode, Reason}},
-	    do_uninstall(ClientPid, Pids, GoodPids, [BadNode | BadNodes], BadRes);
-	{Pid, {error, Reason}} ->
-	    BadNode = node(Pid),
-	    BadRes = {error, {"Uninstall fallback", BadNode, Reason}},
-	    do_uninstall(ClientPid, Pids, GoodPids, [BadNode | BadNodes], BadRes);
-	{Pid, started} ->
-	    do_uninstall(ClientPid, Pids, [Pid | GoodPids], BadNodes, Res)
-    end;
-do_uninstall(ClientPid, [], GoodPids, [], ok) ->
-    lists:foreach(fun(Pid) -> Pid ! {self(), do_uninstall} end, GoodPids),
-    rec_uninstall(ClientPid, GoodPids, ok);
-do_uninstall(_ClientPid, [], GoodPids, BadNodes, BadRes) ->
-    lists:foreach(fun(Pid) -> exit(Pid, shutdown) end, GoodPids),
-    {error, {node_not_running, BadNodes, BadRes}}.
-
-local_uninstall_fallback(Master, FA) ->
-    %% Don't trap exit
-    
-    register(mnesia_fallback, self()),        % May exit
-    FA2 = check_fallback_dir(Master, FA), % May exit
-    Master ! {self(), started},
-    
-    receive
-	{Master, do_uninstall} ->
-	    ?eval_debug_fun({?MODULE, uninstall_fallback2, pre_delete}, []),
-	    catch mnesia_lib:set(active_fallback, false),
-	    Tmp = FA2#fallback_args.fallback_tmp,
-	    Bup = FA2#fallback_args.fallback_bup,
-	    file:delete(Tmp),
-	    Res = 
-		case fallback_exists(Bup) of
-		    true -> file:delete(Bup);
-		    false -> ok
-		end,
-	    ?eval_debug_fun({?MODULE, uninstall_fallback2, post_delete}, []),
-	    Master ! {self(), Res},
-	    unlink(Master),
-	    exit(normal)
-    end.
-
-rec_uninstall(ClientPid, [Pid | Pids], AccRes) ->
-    receive
-	%% {'EXIT', ClientPid, _} ->
-	%% exit(shutdown);
-	{'EXIT', Pid, R} ->
-	    Reason = {node_not_running, {node(Pid), R}},
-	    rec_uninstall(ClientPid, Pids, {error, Reason});
-	{Pid, ok} ->
-	    rec_uninstall(ClientPid, Pids, AccRes);
-	{Pid, BadRes} ->
-	    rec_uninstall(ClientPid, Pids, BadRes)
-    end;
-rec_uninstall(ClientPid, [], Res) ->
-    ClientPid ! {self(), Res},
-    unlink(ClientPid),
-    exit(normal).
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Backup traversal
-
-%% Iterate over a backup and produce a new backup.
-%% Fun(BackupItem, Acc) is applied for each BackupItem.
-%%
-%% Valid BackupItems are:
-%%
-%%   {schema, Tab}		Table to be deleted
-%%   {schema, Tab, CreateList}	Table to be created, CreateList may be empty
-%%   {schema, db_nodes, DbNodes}List of nodes, defaults to [node()] OLD
-%%   {schema, version, Version} Schema version                      OLD
-%%   {schema, cookie, Cookie}	Unique schema cookie                OLD
-%%   {Tab, Key}			Oid for record to be deleted
-%%   Record			Record to be inserted.
-%%
-%% The Fun must return a tuple {BackupItems, NewAcc}
-%% where BackupItems is a list of valid BackupItems and
-%% NewAcc is a new accumulator value. Once BackupItems
-%% that not are schema  related has been returned, no more schema
-%% items may be  returned. The schema related items must always be
-%% first in the backup.
-%%
-%% If TargetMod == read_only, no new backup will be created.
-%%
-%% Opening of the source media will be performed by
-%% to SourceMod:open_read(Source)
-%%
-%% Opening of the target media will be performed by
-%% to TargetMod:open_write(Target)
-traverse_backup(Source, Target, Fun, Acc) ->
-    Mod = mnesia_monitor:get_env(backup_module),
-    traverse_backup(Source, Mod, Target, Mod, Fun, Acc).
-
-traverse_backup(Source, SourceMod, Target, TargetMod, Fun, Acc) ->
-    Args = [self(), Source, SourceMod, Target, TargetMod, Fun, Acc],
-    Pid = spawn_link(?MODULE, do_traverse_backup, Args),
-    receive
-	{'EXIT', Pid, Reason} ->
-	    {error, {"Backup traversal crashed", Reason}};
-	{iter_done, Pid, Res} ->
-	    Res
-    end.
-
-do_traverse_backup(ClientPid, Source, SourceMod, Target, TargetMod, Fun, Acc) ->
-    process_flag(trap_exit, true),
-    Iter =
-	if
-	    TargetMod /= read_only ->
-		case catch do_apply(TargetMod, open_write, [Target], Target) of
-		    {error, Error} -> 
-			unlink(ClientPid),
-			ClientPid ! {iter_done, self(), {error, Error}},
-			exit(Error);
-		    Else -> Else
-		end;
-	    true ->
-		ignore
-	end,
-    A = {start, Fun, Acc, TargetMod, Iter},
-    Res = 
-	case iterate(SourceMod, fun trav_apply/4, Source, A) of
-	    {ok, {iter, _, Acc2, _, Iter2}} when TargetMod /= read_only ->
-		case catch do_apply(TargetMod, commit_write, [Iter2], Iter2) of
-		    {error, Reason} -> 
-			{error, Reason};
-		    _ -> 
-			{ok, Acc2}
-		end;		
-	    {ok, {iter, _, Acc2, _, _}} ->
-		{ok, Acc2};
-	    {error, Reason} when TargetMod /= read_only->
-		catch do_apply(TargetMod, abort_write, [Iter], Iter),
-		{error, {"Backup traversal failed", Reason}};
-	    {error, Reason} ->
-		{error, {"Backup traversal failed", Reason}}
-	end,
-    unlink(ClientPid),
-    ClientPid ! {iter_done, self(), Res}.
-
-trav_apply(Recs, _Header, _Schema, {iter, Fun, Acc, Mod, Iter}) ->
-    {NewRecs, Acc2} = filter_foldl(Fun, Acc, Recs),
-    if
-	Mod /= read_only, NewRecs /= [] ->
-	    Iter2 = do_apply(Mod, write, [Iter, NewRecs], Iter),
-	    {iter, Fun, Acc2, Mod, Iter2};
-	true ->
-	    {iter, Fun, Acc2, Mod, Iter}
-    end;
-trav_apply(Recs, Header, Schema, {start, Fun, Acc, Mod, Iter}) ->
-    Iter2 =
-	if
-	    Mod /= read_only ->
-		do_apply(Mod, write, [Iter, [Header]], Iter);
-	    true ->
-		Iter
-	end,
-    TravAcc = trav_apply(Schema, Header, Schema, {iter, Fun, Acc, Mod, Iter2}),
-    trav_apply(Recs, Header, Schema, TravAcc).
-
-filter_foldl(Fun, Acc, [Head|Tail]) ->
-    case Fun(Head, Acc) of
-	{HeadItems, HeadAcc} when list(HeadItems) ->
-	    {TailItems, TailAcc} = filter_foldl(Fun, HeadAcc, Tail),
-	    {HeadItems ++ TailItems, TailAcc};
-	Other ->
-	    throw({error, {"Fun must return a list", Other}})
-    end;
-filter_foldl(_Fun, Acc, []) ->
-    {[], Acc}.
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_checkpoint.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_checkpoint.erl
deleted file mode 100644
index aa2e99642b..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_checkpoint.erl
+++ /dev/null
@@ -1,1284 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_checkpoint.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%
--module(mnesia_checkpoint).
-
-%% TM callback interface
--export([
-	 tm_add_copy/2,
-	 tm_change_table_copy_type/3,
-	 tm_del_copy/2,
-	 tm_mnesia_down/1,
-	 tm_prepare/1,
-	 tm_retain/4,
-	 tm_retain/5,
-	 tm_enter_pending/1,
-	 tm_enter_pending/3,
-	 tm_exit_pending/1,
-	 convert_cp_record/1
-	]).
-
-%% Public interface
--export([
-	 activate/1,
-	 checkpoints/0,
-	 deactivate/1,
-	 deactivate/2,
-	 iterate/6,
-	 most_local_node/2,
-	 really_retain/2,
-	 stop/0,
-	 stop_iteration/1,
-	 tables_and_cookie/1
-	]).
-
-%% Internal
--export([
-	 call/2,
-	 cast/2,
-	 init/1,
-	 remote_deactivate/1,
-	 start/1
-	]).
-
-%% sys callback interface
--export([
-	 system_code_change/4,
-	 system_continue/3,
-	 system_terminate/4
-	]).
-
--include("mnesia.hrl").
--import(mnesia_lib, [add/2, del/2, set/2, unset/1]).
--import(mnesia_lib, [dbg_out/2]).
-
--record(tm, {log, pending, transactions, checkpoints}).
-
--record(checkpoint_args, {name = {now(), node()},
-			  allow_remote = true,
-			  ram_overrides_dump = false,
-			  nodes = [],
-			  node = node(),
-			  now = now(),
-			  cookie = ?unique_cookie,
-			  min = [],
-			  max = [],
-			  pending_tab,
-			  wait_for_old, % Initially undefined then List
-			  is_activated = false,
-			  ignore_new = [],
-			  retainers = [],
-			  iterators = [],
-			  supervisor,
-			  pid
-			 }).
-
-%% Old record definition
--record(checkpoint, {name,
-		     allow_remote,
-		     ram_overrides_dump,
-		     nodes,
-		     node,
-		     now,
-		     min,
-		     max,
-		     pending_tab,
-		     wait_for_old,
-		     is_activated,
-		     ignore_new,
-		     retainers,
-		     iterators,
-		     supervisor,
-		     pid
-		    }).
-
--record(retainer, {cp_name, tab_name, store, writers = [], really_retain = true}).
-
--record(iter, {tab_name, oid_tab, main_tab, retainer_tab, source, val, pid}).
-
--record(pending, {tid, disc_nodes = [], ram_nodes = []}).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% TM callback functions
-
-stop() ->
-    lists:foreach(fun(Name) -> call(Name, stop) end,
-		  checkpoints()),
-    ok.
-
-tm_prepare(Cp) when record(Cp, checkpoint_args) ->
-    Name = Cp#checkpoint_args.name,
-    case lists:member(Name, checkpoints()) of
-	false ->
-	    start_retainer(Cp);
-	true ->
-	    {error, {already_exists, Name, node()}}
-    end;
-tm_prepare(Cp) when record(Cp, checkpoint) ->
-    %% Node with old protocol sent an old checkpoint record
-    %% and we have to convert it
-    case convert_cp_record(Cp) of
-	{ok, NewCp} ->
-	    tm_prepare(NewCp);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-tm_mnesia_down(Node) ->
-    lists:foreach(fun(Name) -> cast(Name, {mnesia_down, Node}) end,
-		  checkpoints()).
-
-%% Returns pending
-tm_enter_pending(Tid, DiscNs, RamNs) ->
-    Pending = #pending{tid = Tid, disc_nodes = DiscNs, ram_nodes = RamNs},
-    tm_enter_pending(Pending).
-
-tm_enter_pending(Pending) ->
-    PendingTabs = val(pending_checkpoints),
-    tm_enter_pending(PendingTabs, Pending).
-
-tm_enter_pending([], Pending) ->
-    Pending;
-tm_enter_pending([Tab | Tabs], Pending) ->
-    catch ?ets_insert(Tab, Pending),
-    tm_enter_pending(Tabs, Pending).
-
-tm_exit_pending(Tid) ->
-    Pids = val(pending_checkpoint_pids),
-    tm_exit_pending(Pids, Tid).
-    
-tm_exit_pending([], Tid) ->
-    Tid;
-tm_exit_pending([Pid | Pids], Tid) ->
-    Pid ! {self(), {exit_pending, Tid}},
-    tm_exit_pending(Pids, Tid).
-
-enter_still_pending([Tid | Tids], Tab) ->
-    ?ets_insert(Tab, #pending{tid = Tid}),
-    enter_still_pending(Tids, Tab);
-enter_still_pending([], _Tab) ->
-    ok.
-
-
-%% Looks up checkpoints for functions in mnesia_tm.
-tm_retain(Tid, Tab, Key, Op) ->
-    case val({Tab, commit_work}) of
-	[{checkpoints, Checkpoints} | _ ] ->
-	    tm_retain(Tid, Tab, Key, Op, Checkpoints);
-	_ -> 
-	    undefined
-    end.
-    
-tm_retain(Tid, Tab, Key, Op, Checkpoints) ->
-    case Op of
-	clear_table ->
-	    OldRecs = mnesia_lib:db_match_object(Tab, '_'),
-	    send_group_retain(OldRecs, Checkpoints, Tid, Tab, []),
-	    OldRecs;
-	_ ->
-	    OldRecs = mnesia_lib:db_get(Tab, Key),
-	    send_retain(Checkpoints, {retain, Tid, Tab, Key, OldRecs}),
-	    OldRecs
-    end.
-
-send_group_retain([Rec | Recs], Checkpoints, Tid, Tab, [PrevRec | PrevRecs])
-  when element(2, Rec) /= element(2, PrevRec) ->
-    Key = element(2, PrevRec),
-    OldRecs = lists:reverse([PrevRec | PrevRecs]),
-    send_retain(Checkpoints, {retain, Tid, Tab, Key, OldRecs}),
-    send_group_retain(Recs, Checkpoints, Tid, Tab, [Rec]);
-send_group_retain([Rec | Recs], Checkpoints, Tid, Tab, Acc) ->
-    send_group_retain(Recs, Checkpoints, Tid, Tab, [Rec | Acc]);
-send_group_retain([], Checkpoints, Tid, Tab, [PrevRec | PrevRecs]) ->
-    Key = element(2, PrevRec),
-    OldRecs = lists:reverse([PrevRec | PrevRecs]),
-    send_retain(Checkpoints, {retain, Tid, Tab, Key, OldRecs}),
-    ok;
-send_group_retain([], _Checkpoints, _Tid, _Tab, []) ->
-    ok.
-
-send_retain([Name | Names], Msg) ->
-    cast(Name, Msg),
-    send_retain(Names, Msg);
-send_retain([], _Msg) ->
-    ok.
-    
-tm_add_copy(Tab, Node) when Node /= node() ->
-    case val({Tab, commit_work}) of
-	[{checkpoints, Checkpoints} | _ ] ->
-	    Fun = fun(Name) -> call(Name, {add_copy, Tab, Node}) end,
-	    map_call(Fun, Checkpoints, ok);
-	_  -> 
-	    ok
-    end.
-
-tm_del_copy(Tab, Node) when Node == node() ->
-    mnesia_subscr:unsubscribe_table(Tab),
-    case val({Tab, commit_work}) of
-	[{checkpoints, Checkpoints} | _ ] ->	    
-	    Fun = fun(Name) -> call(Name, {del_copy, Tab, Node}) end,
-	    map_call(Fun, Checkpoints, ok);
-	_ ->
-	    ok
-    end.
-
-tm_change_table_copy_type(Tab, From, To) ->
-    case val({Tab, commit_work}) of
-	[{checkpoints, Checkpoints} | _ ] ->
-	    Fun = fun(Name) -> call(Name, {change_copy, Tab, From, To}) end,
-	    map_call(Fun, Checkpoints, ok);
-	_ -> 
-	    ok
-    end.
-
-map_call(Fun, [Name | Names], Res) ->
-    case Fun(Name) of
-	 ok ->
-	    map_call(Fun, Names, Res);
-	{error, {no_exists, Name}} ->
-	    map_call(Fun, Names, Res);
-	{error, Reason} ->
-	    %% BUGBUG: We may end up with some checkpoint retainers
-	    %% too much in the add_copy case. How do we remove them?
-	    map_call(Fun, Names, {error, Reason})
-    end;
-map_call(_Fun, [], Res) ->
-    Res.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Public functions
-
-deactivate(Name) ->
-    case call(Name, get_checkpoint) of
-	{error, Reason} ->
-	    {error, Reason};
-	Cp ->
-	    deactivate(Cp#checkpoint_args.nodes, Name)
-    end.
-
-deactivate(Nodes, Name) ->
-    rpc:multicall(Nodes, ?MODULE, remote_deactivate, [Name]),
-    ok.
-
-remote_deactivate(Name) ->
-    call(Name, deactivate).
-
-checkpoints() -> val(checkpoints).
-
-tables_and_cookie(Name) ->
-    case call(Name, get_checkpoint) of
-	{error, Reason} ->
-	    {error, Reason};
-	Cp ->
-	    Tabs = Cp#checkpoint_args.min ++ Cp#checkpoint_args.max,
-	    Cookie = Cp#checkpoint_args.cookie,
-	    {ok, Tabs, Cookie}
-    end.
-
-most_local_node(Name, Tab) ->
-    case ?catch_val({Tab, {retainer, Name}}) of
-	{'EXIT', _} -> 
-	    {error, {"No retainer attached to table", [Tab, Name]}};
-	R -> 	    
-	    Writers = R#retainer.writers,
-	    LocalWriter = lists:member(node(), Writers),
-	    if
-		LocalWriter == true ->
-		    {ok, node()};
-		Writers /= [] ->
-		    {ok, hd(Writers)};
-		true  ->
-		    {error, {"No retainer attached to table", [Tab, Name]}}
-	    end
-    end.
-
-really_retain(Name, Tab) ->
-    R = val({Tab, {retainer, Name}}),
-    R#retainer.really_retain.
- 
-%% Activate a checkpoint.
-%%
-%% A checkpoint is a transaction consistent state that may be used to
-%% perform a distributed backup or to rollback the involved tables to
-%% their old state. Backups may also be used to restore tables to
-%% their old state. Args is a list of the following tuples:
-%%
-%% {name, Name}
-%%    Name of checkpoint. Each checkpoint must have a name which
-%%    is unique on the reachable nodes. The name may be reused when
-%%    the checkpoint has been deactivated.
-%%    By default a probably unique name is generated.
-%%    Multiple checkpoints may be set on the same table.
-%%
-%% {allow_remote, Bool}
-%%   false means that all retainers must be local. If the
-%%   table does not reside locally, the checkpoint fails.
-%%   true allows retainers on other nodes.
-%%
-%% {min, MinTabs}
-%%   Minimize redundancy and only keep checkpoint info together with
-%%   one replica, preferrably at the local node. If any node involved
-%%   the checkpoint goes down, the checkpoint is deactivated.
-%%
-%% {max, MaxTabs}
-%%    Maximize redundancy and keep checkpoint info together with all
-%%    replicas. The checkpoint becomes more fault tolerant if the
-%%    tables has several replicas. When new replicas are added, they
-%%    will also get a retainer attached to them.
-%%
-%% {ram_overrides_dump, Bool}
-%% {ram_overrides_dump, Tabs}
-%%   Only applicable for ram_copies. Bool controls which versions of
-%%   the records that should be included in the checkpoint state.
-%%   true means that the latest comitted records in ram (i.e. the
-%%   records that the application accesses) should be included
-%%   in the checkpoint. false means that the records dumped to
-%%   dat-files (the records that will be loaded at startup) should
-%%   be included in the checkpoint. Tabs is a list of tables.
-%%   Default is false.
-%%
-%% {ignore_new, TidList}
-%%   Normally we wait for all pending transactions to complete
-%%   before we allow iteration over the checkpoint. But in order
-%%   to cope with checkpoint activation inside a transaction that
-%%   currently prepares commit (mnesia_init:get_net_work_copy) we
-%%   need to have the ability to ignore the enclosing transaction.
-%%   We do not wait for the transactions in TidList to end. The
-%%   transactions in TidList are regarded as newer than the checkpoint.
-
-activate(Args) ->
-    case args2cp(Args) of
-	{ok, Cp} ->
-	    do_activate(Cp);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-args2cp(Args) when list(Args)->
-    case catch lists:foldl(fun check_arg/2, #checkpoint_args{}, Args) of
-	{'EXIT', Reason} ->
-	    {error, Reason};
-	Cp ->
-	    case check_tables(Cp) of
-		{error, Reason} ->
-		    {error, Reason};
-		{ok, Overriders, AllTabs} ->
-		    arrange_retainers(Cp, Overriders, AllTabs)
-	    end
-    end;
-args2cp(Args) ->
-    {error, {badarg, Args}}.
-
-check_arg({name, Name}, Cp) ->
-    case lists:member(Name, checkpoints()) of
-	true ->
-	    exit({already_exists, Name});
-	false ->
-	    case catch tab2retainer({foo, Name}) of
-		List when list(List) ->
-		    Cp#checkpoint_args{name = Name};
-		_ ->
-		    exit({badarg, Name})
-	    end
-    end;
-check_arg({allow_remote, true}, Cp) ->
-    Cp#checkpoint_args{allow_remote = true};
-check_arg({allow_remote, false}, Cp) ->
-    Cp#checkpoint_args{allow_remote = false};
-check_arg({ram_overrides_dump, true}, Cp) ->
-    Cp#checkpoint_args{ram_overrides_dump = true};
-check_arg({ram_overrides_dump, false}, Cp) ->
-    Cp#checkpoint_args{ram_overrides_dump = false};
-check_arg({ram_overrides_dump, Tabs}, Cp) when list(Tabs) ->
-    Cp#checkpoint_args{ram_overrides_dump = Tabs};
-check_arg({min, Tabs}, Cp) when list(Tabs) ->
-    Cp#checkpoint_args{min = Tabs};
-check_arg({max, Tabs}, Cp) when list(Tabs) ->
-    Cp#checkpoint_args{max = Tabs};
-check_arg({ignore_new, Tids}, Cp) when list(Tids) ->
-    Cp#checkpoint_args{ignore_new = Tids};
-check_arg(Arg, _) ->
-    exit({badarg, Arg}).
-
-check_tables(Cp) ->
-    Min = Cp#checkpoint_args.min,
-    Max = Cp#checkpoint_args.max,
-    AllTabs = Min ++ Max,
-    DoubleTabs = [T || T <- Min, lists:member(T, Max)],
-    Overriders = Cp#checkpoint_args.ram_overrides_dump,
-    if
-	DoubleTabs /= [] ->
-	    {error, {combine_error, Cp#checkpoint_args.name,
-		     [{min, DoubleTabs}, {max, DoubleTabs}]}};
-	Min == [], Max == [] ->
-	    {error, {combine_error, Cp#checkpoint_args.name,
-		     [{min, Min}, {max, Max}]}};
-	Overriders == false ->
-	    {ok, [], AllTabs};
-	Overriders == true ->
-	    {ok, AllTabs, AllTabs};
-	list(Overriders) ->
-	    case [T || T <- Overriders, not lists:member(T, Min)] of
-		[] ->
-		    case [T || T <- Overriders, not lists:member(T, Max)] of
-			[] ->
-			    {ok, Overriders, AllTabs};
-			Outsiders ->
-			    {error, {combine_error, Cp#checkpoint_args.name,
-				     [{ram_overrides_dump, Outsiders},
-				      {max, Outsiders}]}}
-		    end;
-		Outsiders ->
-		    {error, {combine_error, Cp#checkpoint_args.name,
-			     [{ram_overrides_dump, Outsiders},
-			      {min, Outsiders}]}}
-	    end
-    end.
-
-arrange_retainers(Cp, Overriders, AllTabs) ->
-    R = #retainer{cp_name = Cp#checkpoint_args.name},
-    case catch [R#retainer{tab_name = Tab, 
-			   writers = select_writers(Cp, Tab)}
-		|| Tab <- AllTabs] of
-	{'EXIT', Reason} ->
-	    {error, Reason};
-	Retainers ->
-	    {ok, Cp#checkpoint_args{ram_overrides_dump = Overriders,
-			       retainers = Retainers,
-			       nodes = writers(Retainers)}}
-    end.
-
-select_writers(Cp, Tab) ->
-    case filter_remote(Cp, val({Tab, active_replicas})) of
-	[] ->
-	    exit({"Cannot prepare checkpoint (replica not available)",
-		 [Tab, Cp#checkpoint_args.name]});
-	Writers ->
-	    This = node(),
-	    case {lists:member(Tab, Cp#checkpoint_args.max),
-		  lists:member(This, Writers)} of
-		{true, _} -> Writers; % Max
-		{false, true} -> [This];
-		{false, false} -> [hd(Writers)]
-	    end
-    end.
-
-filter_remote(Cp, Writers) when Cp#checkpoint_args.allow_remote == true ->
-    Writers;
-filter_remote(_Cp, Writers) ->
-    This = node(),
-    case lists:member(This, Writers) of
-	true -> [This];
-	false  -> []
-    end.
-	
-writers(Retainers) ->
-    Fun = fun(R, Acc) -> R#retainer.writers ++ Acc end,
-    Writers = lists:foldl(Fun, [], Retainers),
-    mnesia_lib:uniq(Writers).
-
-do_activate(Cp) ->
-    Name = Cp#checkpoint_args.name,
-    Nodes = Cp#checkpoint_args.nodes,
-    case mnesia_tm:prepare_checkpoint(Nodes, Cp) of
-	{Replies, []} ->
-	    check_prep(Replies, Name, Nodes, Cp#checkpoint_args.ignore_new);
-	{_, BadNodes} ->
-	    {error, {"Cannot prepare checkpoint (bad nodes)",
-		     [Name, BadNodes]}}
-    end.
-	
-check_prep([{ok, Name, IgnoreNew, _Node} | Replies], Name, Nodes, IgnoreNew) ->
-    check_prep(Replies, Name, Nodes, IgnoreNew);
-check_prep([{error, Reason} | _Replies], Name, _Nodes, _IgnoreNew) ->
-    {error, {"Cannot prepare checkpoint (bad reply)",
-	     [Name, Reason]}};
-check_prep([{badrpc, Reason} | _Replies], Name, _Nodes, _IgnoreNew) ->
-    {error, {"Cannot prepare checkpoint (badrpc)",
-	     [Name, Reason]}};
-check_prep([], Name, Nodes, IgnoreNew) ->
-    collect_pending(Name, Nodes, IgnoreNew).
-
-collect_pending(Name, Nodes, IgnoreNew) ->
-    case rpc:multicall(Nodes, ?MODULE, call, [Name, collect_pending]) of
-	{Replies, []} ->
-	    case catch ?ets_new_table(mnesia_union, [bag]) of
-		{'EXIT', Reason} -> %% system limit
-		    Msg = "Cannot create an ets table pending union",
-		    {error, {system_limit, Msg, Reason}};
-		UnionTab ->
-		    compute_union(Replies, Nodes, Name, UnionTab, IgnoreNew)
-	    end;
-	{_, BadNodes} ->
-	    deactivate(Nodes, Name),
-	    {error, {"Cannot collect from pending checkpoint", Name, BadNodes}}
-    end.
-
-compute_union([{ok, Pending} | Replies], Nodes, Name, UnionTab, IgnoreNew) ->
-    add_pending(Pending, UnionTab),
-    compute_union(Replies, Nodes, Name, UnionTab, IgnoreNew);
-compute_union([{error, Reason} | _Replies], Nodes, Name, UnionTab, _IgnoreNew) ->
-    deactivate(Nodes, Name),
-    ?ets_delete_table(UnionTab),
-    {error, Reason};
-compute_union([{badrpc, Reason} | _Replies], Nodes, Name, UnionTab, _IgnoreNew) ->
-    deactivate(Nodes, Name),
-    ?ets_delete_table(UnionTab),
-    {error, {badrpc, Reason}};
-compute_union([], Nodes, Name, UnionTab, IgnoreNew) ->
-    send_activate(Nodes, Nodes, Name, UnionTab, IgnoreNew).
-
-add_pending([P | Pending], UnionTab) ->
-    add_pending_node(P#pending.disc_nodes, P#pending.tid, UnionTab),
-    add_pending_node(P#pending.ram_nodes, P#pending.tid, UnionTab),
-    add_pending(Pending, UnionTab);
-add_pending([], _UnionTab) ->
-    ok.
-
-add_pending_node([Node | Nodes], Tid, UnionTab) ->
-    ?ets_insert(UnionTab, {Node, Tid}),
-    add_pending_node(Nodes, Tid, UnionTab);
-add_pending_node([], _Tid, _UnionTab) ->
-    ok.
-
-send_activate([Node | Nodes], AllNodes, Name, UnionTab, IgnoreNew) ->
-    Pending = [Tid || {_, Tid} <- ?ets_lookup(UnionTab, Node), 
-		      not lists:member(Tid, IgnoreNew)],
-    case rpc:call(Node, ?MODULE, call, [Name, {activate, Pending}]) of
-	activated ->
-	    send_activate(Nodes, AllNodes, Name, UnionTab, IgnoreNew);
-	{badrpc, Reason} ->
-	    deactivate(Nodes, Name),
-	    ?ets_delete_table(UnionTab),
-	    {error, {"Activation failed (bad node)", Name, Node, Reason}};
-	{error, Reason} ->
-	    deactivate(Nodes, Name),
-	    ?ets_delete_table(UnionTab),
-	    {error, {"Activation failed", Name, Node, Reason}}
-    end;
-send_activate([], AllNodes, Name, UnionTab, _IgnoreNew) ->
-    ?ets_delete_table(UnionTab),
-    {ok, Name, AllNodes}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Checkpoint server
-
-cast(Name, Msg) ->
-    case ?catch_val({checkpoint, Name}) of
-	{'EXIT', _} ->
-	    {error, {no_exists, Name}};
-	
-	Pid when pid(Pid) ->
-	    Pid ! {self(), Msg},
-	    {ok, Pid}
-    end.
-
-call(Name, Msg) ->
-    case cast(Name, Msg) of
-	{ok, Pid} ->
-	    catch link(Pid), % Always local
-	    Self = self(),
-	    receive
-		{'EXIT', Pid, Reason} ->
-		    {error, {"Got exit", [Name, Reason]}};
-		{Name, Self, Reply} ->
-		    unlink(Pid),
-		    Reply
-	    end;
-	Error ->
-	    Error
-    end.
-
-abcast(Nodes, Name, Msg) ->
-    rpc:eval_everywhere(Nodes, ?MODULE, cast, [Name, Msg]).
-
-reply(nopid, _Name, _Reply) ->
-    ignore;
-reply(ReplyTo, Name, Reply) ->
-    ReplyTo ! {Name, ReplyTo, Reply}.
-
-%% Returns {ok, NewCp} or {error, Reason}
-start_retainer(Cp) ->
-    % Will never be restarted
-    Name = Cp#checkpoint_args.name,
-    case supervisor:start_child(mnesia_checkpoint_sup, [Cp]) of
-	{ok, _Pid} ->
-	    {ok, Name, Cp#checkpoint_args.ignore_new, node()};
-	{error, Reason} ->
-	    {error, {"Cannot create checkpoint retainer",
-		     Name, node(), Reason}}
-    end.
-
-start(Cp) ->
-    Name = Cp#checkpoint_args.name,
-    Args = [Cp#checkpoint_args{supervisor = self()}],
-    mnesia_monitor:start_proc({?MODULE, Name}, ?MODULE, init, Args).
-
-init(Cp) ->
-    process_flag(trap_exit, true),
-    Name = Cp#checkpoint_args.name,
-    Props = [set, public, {keypos, 2}],
-    case catch ?ets_new_table(mnesia_pending_checkpoint, Props) of
-	{'EXIT', Reason} -> %% system limit
-	    Msg = "Cannot create an ets table for pending transactions",
-	    Error = {error, {system_limit, Name, Msg, Reason}},
-	    proc_lib:init_ack(Cp#checkpoint_args.supervisor, Error);
-	PendingTab ->
-	    Rs = [prepare_tab(Cp, R) || R <- Cp#checkpoint_args.retainers],
-	    Cp2 = Cp#checkpoint_args{retainers = Rs,
-				pid = self(),
-				pending_tab = PendingTab},
-	    add(pending_checkpoint_pids, self()),
-	    add(pending_checkpoints, PendingTab),
-	    set({checkpoint, Name}, self()),
-	    add(checkpoints, Name),
-	    dbg_out("Checkpoint ~p (~p) started~n", [Name, self()]),
-	    proc_lib:init_ack(Cp2#checkpoint_args.supervisor, {ok, self()}),
-	    retainer_loop(Cp2)
-    end.
-    
-prepare_tab(Cp, R) ->
-    Tab = R#retainer.tab_name,
-    prepare_tab(Cp, R, val({Tab, storage_type})).
-
-prepare_tab(Cp, R, Storage) ->
-    Tab = R#retainer.tab_name,
-    Name = R#retainer.cp_name,
-    case lists:member(node(), R#retainer.writers) of
-	true ->
-	    R2 = retainer_create(Cp, R, Tab, Name, Storage),
-	    set({Tab, {retainer, Name}}, R2),
-	    add({Tab, checkpoints}, Name), %% Keep checkpoint info for table_info & mnesia_session 
-	    add_chkp_info(Tab, Name),
-	    R2;
-	false ->
-	    set({Tab, {retainer, Name}}, R#retainer{store = undefined}),
-	    R
-    end.
-
-add_chkp_info(Tab, Name) ->
-    case val({Tab, commit_work}) of
-	[{checkpoints, OldList} | CommitList] ->
-	    case lists:member(Name, OldList) of 
-		true -> 
-		    ok;
-		false -> 
-		    NewC = [{checkpoints, [Name | OldList]} | CommitList],
-		    mnesia_lib:set({Tab, commit_work}, NewC)
-	    end;
-	CommitList ->
-	    Chkp = {checkpoints, [Name]},
-	    %% OBS checkpoints needs to be first in the list!
-	    mnesia_lib:set({Tab, commit_work}, [Chkp | CommitList])
-    end.
-
-tab2retainer({Tab, Name}) ->
-    FlatName = lists:flatten(io_lib:write(Name)),
-    mnesia_lib:dir(lists:concat([?MODULE, "_", Tab, "_", FlatName, ".RET"])).
-
-retainer_create(_Cp, R, Tab, Name, disc_only_copies) ->
-    Fname = tab2retainer({Tab, Name}),
-    file:delete(Fname),
-    Args = [{file, Fname}, {type, set}, {keypos, 2}, {repair, false}],
-    {ok, _} = mnesia_lib:dets_sync_open({Tab, Name}, Args),
-    dbg_out("Checkpoint retainer created ~p ~p~n", [Name, Tab]),
-    R#retainer{store = {dets, {Tab, Name}}, really_retain = true};
-retainer_create(Cp, R, Tab, Name, Storage) ->
-    T = ?ets_new_table(mnesia_retainer, [set, public, {keypos, 2}]),
-    Overriders = Cp#checkpoint_args.ram_overrides_dump,
-    ReallyR = R#retainer.really_retain,
-    ReallyCp = lists:member(Tab, Overriders),
-    ReallyR2 = prepare_ram_tab(Tab, T, Storage, ReallyR, ReallyCp),
-    dbg_out("Checkpoint retainer created ~p ~p~n", [Name, Tab]),
-    R#retainer{store = {ets, T}, really_retain = ReallyR2}.
-
-%% Copy the dumped table into retainer if needed
-%% If the really_retain flag already has been set to false,
-%% it should remain false even if we change storage type
-%% while the checkpoint is activated.
-prepare_ram_tab(Tab, T, ram_copies, true, false) ->
-    Fname = mnesia_lib:tab2dcd(Tab),
-    case mnesia_lib:exists(Fname) of
-	true -> 
-	    Log = mnesia_log:open_log(prepare_ram_tab, 
-				      mnesia_log:dcd_log_header(), 
-				      Fname, true, 
-				      mnesia_monitor:get_env(auto_repair), 
-				      read_only),
-	    Add = fun(Rec) ->
-			  Key = element(2, Rec),
-			  Recs =
-			      case ?ets_lookup(T, Key) of
-				  [] -> [];
-				  [{_, _, Old}] -> Old
-			      end,
-			  ?ets_insert(T, {Tab, Key, [Rec | Recs]}),
-			  continue
-		  end,
-	    traverse_dcd(mnesia_log:chunk_log(Log, start), Log, Add),
-	    mnesia_log:close_log(Log);
-	false ->
-	    ok
-    end,
-    false;
-prepare_ram_tab(_, _, _, ReallyRetain, _) ->
-    ReallyRetain.
-
-traverse_dcd({Cont, [LogH | Rest]}, Log, Fun) 
-  when record(LogH, log_header),  
-       LogH#log_header.log_kind == dcd_log, 
-       LogH#log_header.log_version >= "1.0" ->    
-    traverse_dcd({Cont, Rest}, Log, Fun);   %% BUGBUG Error handling repaired files
-traverse_dcd({Cont, Recs}, Log, Fun) ->     %% trashed data?? 
-    lists:foreach(Fun, Recs), 
-    traverse_dcd(mnesia_log:chunk_log(Log, Cont), Log, Fun);
-traverse_dcd(eof, _Log, _Fun) ->
-    ok.
-
-retainer_get({ets, Store}, Key) -> ?ets_lookup(Store, Key);
-retainer_get({dets, Store}, Key) -> dets:lookup(Store, Key).
-
-retainer_put({ets, Store}, Val) -> ?ets_insert(Store, Val);
-retainer_put({dets, Store}, Val) -> dets:insert(Store, Val).
-
-retainer_first({ets, Store}) -> ?ets_first(Store);
-retainer_first({dets, Store}) -> dets:first(Store).
- 
-retainer_next({ets, Store}, Key) -> ?ets_next(Store, Key);
-retainer_next({dets, Store}, Key) -> dets:next(Store, Key).
-
-%% retainer_next_slot(Tab, Pos) ->
-%%     case retainer_slot(Tab, Pos) of
-%% 	   '$end_of_table' ->
-%% 	       '$end_of_table';
-%% 	   [] ->
-%% 	       retainer_next_slot(Tab, Pos + 1);
-%% 	   Recs when list(Recs) ->
-%% 	       {Pos, Recs}
-%%     end.
-%% 
-%% retainer_slot({ets, Store}, Pos) -> ?ets_next(Store, Pos);
-%% retainer_slot({dets, Store}, Pos) -> dets:slot(Store, Pos).
-
-retainer_fixtable(Tab, Bool) when atom(Tab) ->
-    mnesia_lib:db_fixtable(val({Tab, storage_type}), Tab, Bool);
-retainer_fixtable({ets, Tab}, Bool) ->
-    mnesia_lib:db_fixtable(ram_copies, Tab, Bool);
-retainer_fixtable({dets, Tab}, Bool) ->
-    mnesia_lib:db_fixtable(disc_only_copies, Tab, Bool).
-
-retainer_delete({ets, Store}) ->
-    ?ets_delete_table(Store);
-retainer_delete({dets, Store}) ->
-    mnesia_lib:dets_sync_close(Store),
-    Fname = tab2retainer(Store),
-    file:delete(Fname).
-
-retainer_loop(Cp) ->
-    Name = Cp#checkpoint_args.name,
-    receive
-	{_From, {retain, Tid, Tab, Key, OldRecs}}
-	when Cp#checkpoint_args.wait_for_old == [] ->
-	    R = val({Tab, {retainer, Name}}),
-	    case R#retainer.really_retain of
-		true ->
-		    PendingTab = Cp#checkpoint_args.pending_tab,
-		    case catch ?ets_lookup_element(PendingTab, Tid, 1) of
-			{'EXIT', _} ->
-			    Store = R#retainer.store,
-			    case retainer_get(Store, Key) of
-				[] ->
-				    retainer_put(Store, {Tab, Key, OldRecs});
-				_ ->
-				    already_retained
-			    end;
-			pending ->
-			    ignore
-		    end;
-		false ->
-		    ignore
-	    end,
-	    retainer_loop(Cp);
-	
-	%% Adm
-	{From, deactivate} ->
-	    do_stop(Cp),
-	    reply(From, Name, deactivated),
-	    unlink(From),
-	    exit(shutdown);
-
-	{'EXIT', Parent, _} when Parent == Cp#checkpoint_args.supervisor ->
-	    %% do_stop(Cp),
-	    %% assume that entire Mnesia is terminating
-	    exit(shutdown);
-
-	{_From, {mnesia_down, Node}} ->
-	    Cp2 = do_del_retainers(Cp, Node),
-	    retainer_loop(Cp2);
-	{From, get_checkpoint} ->
-	    reply(From, Name, Cp),
-	    retainer_loop(Cp);
-	{From, {add_copy, Tab, Node}} when Cp#checkpoint_args.wait_for_old == [] ->
-	    {Res, Cp2} = do_add_copy(Cp, Tab, Node),
-	    reply(From, Name, Res),
-	    retainer_loop(Cp2);
-	{From, {del_copy, Tab, Node}} when Cp#checkpoint_args.wait_for_old == [] ->
-	    Cp2 = do_del_copy(Cp, Tab, Node),
-	    reply(From, Name, ok),
-	    retainer_loop(Cp2);
-	{From, {change_copy, Tab, From, To}} when Cp#checkpoint_args.wait_for_old == [] ->
-	    Cp2 = do_change_copy(Cp, Tab, From, To),
-	    reply(From, Name, ok),
-	    retainer_loop(Cp2);
-	{_From, {add_retainer, R, Node}} ->
-	    Cp2 = do_add_retainer(Cp, R, Node),
-	    retainer_loop(Cp2);
-	{_From, {del_retainer, R, Node}} when Cp#checkpoint_args.wait_for_old == [] ->
-	    Cp2 = do_del_retainer(Cp, R, Node),
-	    retainer_loop(Cp2);
-
-	%% Iteration
-	{From, {iter_begin, Iter}} when Cp#checkpoint_args.wait_for_old == [] ->
-	    Cp2 = iter_begin(Cp, From, Iter),
-	    retainer_loop(Cp2);
-
-	{From, {iter_end, Iter}} when Cp#checkpoint_args.wait_for_old == [] ->
-	    retainer_fixtable(Iter#iter.oid_tab, false),
-	    Iters = Cp#checkpoint_args.iterators -- [Iter],
-	    reply(From, Name, ok),
-	    retainer_loop(Cp#checkpoint_args{iterators = Iters});	
-
-	{_From, {exit_pending, Tid}}
-	    when list(Cp#checkpoint_args.wait_for_old) ->
-	    StillPending = lists:delete(Tid, Cp#checkpoint_args.wait_for_old),
-	    Cp2 = Cp#checkpoint_args{wait_for_old = StillPending},
-	    Cp3 = maybe_activate(Cp2),
-	    retainer_loop(Cp3);
-
-	{From, collect_pending} ->
-	    PendingTab = Cp#checkpoint_args.pending_tab,
-	    del(pending_checkpoints, PendingTab),
-	    Pending = ?ets_match_object(PendingTab, '_'),
-	    reply(From, Name, {ok, Pending}),
-	    retainer_loop(Cp);
-
-	{From, {activate, Pending}} ->
-            StillPending = mnesia_recover:still_pending(Pending),
-            enter_still_pending(StillPending, Cp#checkpoint_args.pending_tab),
-            Cp2 = maybe_activate(Cp#checkpoint_args{wait_for_old = StillPending}),
-            reply(From, Name, activated),
-	    retainer_loop(Cp2);
-
-	{'EXIT', From, _Reason} ->
-	    Iters = [Iter || Iter <- Cp#checkpoint_args.iterators,
-			     check_iter(From, Iter)],
-	    retainer_loop(Cp#checkpoint_args{iterators = Iters});
-
-	{system, From, Msg} ->
-	    dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
-	    sys:handle_system_msg(Msg, From, no_parent, ?MODULE, [], Cp)
-    end.
-
-maybe_activate(Cp)
-        when Cp#checkpoint_args.wait_for_old == [],
-             Cp#checkpoint_args.is_activated == false ->
-    Cp#checkpoint_args{pending_tab = undefined, is_activated = true};
-maybe_activate(Cp) ->
-    Cp.
-
-iter_begin(Cp, From, Iter) ->
-    Name = Cp#checkpoint_args.name,
-    R = val({Iter#iter.tab_name, {retainer, Name}}),
-    Iter2 = init_tabs(R, Iter),
-    Iter3 = Iter2#iter{pid = From},
-    retainer_fixtable(Iter3#iter.oid_tab, true),
-    Iters = [Iter3 | Cp#checkpoint_args.iterators],
-    reply(From, Name, {ok, Iter3, self()}),
-    Cp#checkpoint_args{iterators = Iters}.
-
-do_stop(Cp) ->
-    Name = Cp#checkpoint_args.name,
-    del(pending_checkpoints, Cp#checkpoint_args.pending_tab),
-    del(pending_checkpoint_pids, self()),
-    del(checkpoints, Name),
-    unset({checkpoint, Name}),
-    lists:foreach(fun deactivate_tab/1, Cp#checkpoint_args.retainers),
-    Iters = Cp#checkpoint_args.iterators,
-    lists:foreach(fun(I) -> retainer_fixtable(I#iter.oid_tab, false) end, Iters).
-
-deactivate_tab(R) ->
-    Name = R#retainer.cp_name,
-    Tab = R#retainer.tab_name,
-    del({Tab, checkpoints}, Name),   %% Keep checkpoint info for table_info & mnesia_session 
-    del_chkp_info(Tab, Name),
-    unset({Tab, {retainer, Name}}),
-    Active = lists:member(node(), R#retainer.writers),
-    case R#retainer.store of
-	undefined ->
-	    ignore;
-	Store when Active == true ->
-	    retainer_delete(Store);
-	_ ->
-	    ignore
-    end.
-
-del_chkp_info(Tab, Name) ->   
-    case val({Tab, commit_work}) of
-	[{checkpoints, ChkList} | Rest] -> 
-	    case lists:delete(Name, ChkList) of
-		[] -> 
-		    %% The only checkpoint was deleted
-		    mnesia_lib:set({Tab, commit_work}, Rest);
-		NewList ->
-		    mnesia_lib:set({Tab, commit_work}, 
-				   [{checkpoints, NewList} | Rest])
-	    end;
-	_  -> ignore
-    end.
-
-do_del_retainers(Cp, Node) ->
-    Rs = [do_del_retainer2(Cp, R, Node) || R <- Cp#checkpoint_args.retainers],
-    Cp#checkpoint_args{retainers = Rs, nodes = writers(Rs)}.
-
-do_del_retainer2(Cp, R, Node) ->
-    Writers = R#retainer.writers -- [Node],
-    R2 = R#retainer{writers = Writers},
-    set({R2#retainer.tab_name, {retainer, R2#retainer.cp_name}}, R2),
-    if
-	Writers == [] ->
-	    Event = {mnesia_checkpoint_deactivated, Cp#checkpoint_args.name},
-	    mnesia_lib:report_system_event(Event),
-	    do_stop(Cp),
-	    exit(shutdown);
-	Node == node() ->
-	    deactivate_tab(R), % Avoids unnecessary tm_retain accesses
-	    set({R2#retainer.tab_name, {retainer, R2#retainer.cp_name}}, R2),
-	    R2; 
-	true ->
-	    R2
-    end.
-
-do_del_retainer(Cp, R0, Node) ->
-    {R, Rest} = find_retainer(R0, Cp#checkpoint_args.retainers, []),
-    R2 = do_del_retainer2(Cp, R, Node),
-    Rs = [R2|Rest],
-    Cp#checkpoint_args{retainers = Rs, nodes = writers(Rs)}.
-
-do_del_copy(Cp, Tab, ThisNode) when ThisNode == node() ->
-    Name = Cp#checkpoint_args.name,
-    Others = Cp#checkpoint_args.nodes -- [ThisNode],
-    R = val({Tab, {retainer, Name}}),
-    abcast(Others, Name, {del_retainer, R, ThisNode}),
-    do_del_retainer(Cp, R, ThisNode).
-
-do_add_copy(Cp, Tab, Node) when Node /= node()->
-    case lists:member(Tab, Cp#checkpoint_args.max) of
-	false ->
-	    {ok, Cp};
-	true ->
-	    Name = Cp#checkpoint_args.name,
-	    R0 = val({Tab, {retainer, Name}}),
-	    W = R0#retainer.writers,
-	    R = R0#retainer{writers = W ++ [Node]},
-
-	    case lists:member(Node, Cp#checkpoint_args.nodes) of
-		true ->
-		    send_retainer(Cp, R, Node);
-		false ->
-		    case tm_remote_prepare(Node, Cp) of
-			{ok, Name, _IgnoreNew, Node} ->
-			    case lists:member(schema, Cp#checkpoint_args.max) of
-				true ->
-				    %% We need to send schema retainer somewhere
-				    RS0 = val({schema, {retainer, Name}}),
-				    W = RS0#retainer.writers,
-				    RS1 = RS0#retainer{writers = W ++ [Node]},
-				    case send_retainer(Cp, RS1, Node) of
-					{ok, Cp1} ->
-					    send_retainer(Cp1, R, Node);
-					Error ->
-					    Error
-				    end;
-				false ->
-				    send_retainer(Cp, R, Node)
-			    end;
-			{badrpc, Reason} ->
-			    {{error, {badrpc, Reason}}, Cp};
-			{error, Reason} ->
-			    {{error, Reason}, Cp}
-		    end
-	    end
-    end.
-
-tm_remote_prepare(Node, Cp) ->
-    rpc:call(Node, ?MODULE, tm_prepare, [Cp]).
-  
-do_add_retainer(Cp, R0, Node) ->
-    Writers = R0#retainer.writers,
-    {R, Rest} = find_retainer(R0, Cp#checkpoint_args.retainers, []),    
-    NewRet = 
-	if 
-	    Node == node() ->
-		prepare_tab(Cp, R#retainer{writers = Writers});
-	    true -> 
-		R#retainer{writers = Writers}
-	end,
-    Rs = [NewRet | Rest],
-    set({NewRet#retainer.tab_name, {retainer, NewRet#retainer.cp_name}}, NewRet),
-    Cp#checkpoint_args{retainers = Rs, nodes = writers(Rs)}.
-
-find_retainer(#retainer{cp_name = CP, tab_name = Tab}, 
-	      [Ret = #retainer{cp_name = CP, tab_name = Tab} | R], Acc) ->
-    {Ret, R ++ Acc};
-find_retainer(Ret, [H|R], Acc) ->
-    find_retainer(Ret, R, [H|Acc]).
-
-send_retainer(Cp, R, Node) ->
-    Name = Cp#checkpoint_args.name,
-    Nodes0 = Cp#checkpoint_args.nodes -- [Node],
-    Nodes1 = Nodes0 ++ [Node],
-    Nodes = Nodes1 -- [node()],
-    abcast(Nodes, Name, {add_retainer, R, Node}),
-    Store = R#retainer.store,
-%%    send_retainer2(Node, Name, Store, retainer_next_slot(Store, 0)),
-    send_retainer2(Node, Name, Store, retainer_first(Store)),
-    Cp2 = do_add_retainer(Cp, R, Node),
-    {ok, Cp2}.
-
-send_retainer2(_, _, _, '$end_of_table') ->
-    ok;
-%%send_retainer2(Node, Name, Store, {Slot, Records}) ->
-send_retainer2(Node, Name, Store, Key) ->
-    [{Tab, _, Records}] = retainer_get(Store, Key),
-    abcast([Node], Name, {retain, {dirty, send_retainer}, Tab, Key, Records}),
-    send_retainer2(Node, Name, Store, retainer_next(Store, Key)).
-
-do_change_copy(Cp, Tab, FromType, ToType) ->
-    Name = Cp#checkpoint_args.name,
-    R = val({Tab, {retainer, Name}}),
-    R2 = prepare_tab(Cp, R, ToType),
-    {_, Old} = R#retainer.store,
-    {_, New} = R2#retainer.store,
-
-    Fname = tab2retainer({Tab, Name}),
-    if
-	FromType == disc_only_copies ->
-	    mnesia_lib:dets_sync_close(Old),
-	    loaded = mnesia_lib:dets_to_ets(Old, New, Fname, set, no, yes),
-	    ok = file:delete(Fname);
-	ToType == disc_only_copies ->
-	    TabSize = ?ets_info(Old, size),
-	    Props = [{file, Fname},
-		     {type, set},
-		     {keypos, 2},
-%%	             {ram_file, true},
-		     {estimated_no_objects, TabSize + 256},
-		     {repair, false}],
-	    {ok, _} = mnesia_lib:dets_sync_open(New, Props),
-	    ok = mnesia_dumper:raw_dump_table(New, Old),
-	    ?ets_delete_table(Old);
-	true ->
-	    ignore
-    end,
-    Pos = #retainer.tab_name,
-    Rs = lists:keyreplace(Tab, Pos, Cp#checkpoint_args.retainers, R2),
-    Cp#checkpoint_args{retainers = Rs, nodes = writers(Rs)}.
-
-check_iter(From, Iter) when Iter#iter.pid == From ->
-    retainer_fixtable(Iter#iter.oid_tab, false),
-    false;
-check_iter(_From, _Iter) ->
-    true.
-
-init_tabs(R, Iter) ->
-    {Kind, _} = Store = R#retainer.store,
-    Main = {Kind, Iter#iter.tab_name},
-    Ret = Store,
-    Iter2 = Iter#iter{main_tab = Main, retainer_tab = Ret},
-    case Iter#iter.source of
-	table -> Iter2#iter{oid_tab = Main};
-	retainer -> Iter2#iter{oid_tab = Ret}
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Iteration
-%%
-%% Iterates over a table and applies Fun(ListOfRecords)
-%% with a suitable amount of records, e.g. 1000 or so.
-%% ListOfRecords is [] when the iteration is over.
-%%
-%% OidKind affects which internal table to be iterated over and
-%% ValKind affects which table to pick the actual records from. Legal
-%% values for OidKind and ValKind is the atom table or the atom
-%% retainer.
-%%
-%% The iteration may either be performed over the main table (which
-%% contains the latest values of the records, i.e. the values that
-%% are visible to the applications) or over the checkpoint retainer
-%% (which contains the values as the looked like the timepoint when
-%% the checkpoint was activated).
-%%
-%% It is possible to iterate over the main table and pick values
-%% from the retainer and vice versa.
-
-iterate(Name, Tab, Fun, Acc, Source, Val) ->
-    Iter0 = #iter{tab_name = Tab, source = Source, val = Val},
-    case call(Name, {iter_begin, Iter0}) of
-	{error, Reason} ->
-	    {error, Reason};
-	{ok, Iter, Pid} ->
-	    link(Pid), % We don't want any pending fixtable's
-	    Res = (catch iter(Fun, Acc, Iter)),
-	    unlink(Pid),
-	    call(Name, {iter_end, Iter}),
-	    case Res of
-		{'EXIT', Reason} -> {error, Reason};
-		{error, Reason} -> {error, Reason};
-		Acc2 -> {ok, Acc2}
-	    end
-    end.
-
-iter(Fun, Acc, Iter)->
-    iter(Fun, Acc, Iter, retainer_first(Iter#iter.oid_tab)).
-
-iter(Fun, Acc, Iter, Key) ->
-    case get_records(Iter, Key) of
-	{'$end_of_table', []} ->
-	    Fun([], Acc);
-	{'$end_of_table', Records} ->
-	    Acc2 = Fun(Records, Acc),
-	    Fun([], Acc2);
-	{Next, Records} ->
-	    Acc2 = Fun(Records, Acc),
-	    iter(Fun, Acc2, Iter, Next)
-    end.
-
-stop_iteration(Reason) ->
-    throw({error, {stopped, Reason}}).
-
-get_records(Iter, Key) ->
-    get_records(Iter, Key, 500, []). % 500 keys
-
-get_records(_Iter, Key, 0, Acc) ->
-    {Key, lists:append(lists:reverse(Acc))};
-get_records(_Iter, '$end_of_table', _I, Acc) ->
-    {'$end_of_table', lists:append(lists:reverse(Acc))};
-get_records(Iter, Key, I, Acc) ->
-    Recs = get_val(Iter, Key),
-    Next = retainer_next(Iter#iter.oid_tab, Key),
-    get_records(Iter, Next, I-1, [Recs | Acc]).
-
-get_val(Iter, Key) when Iter#iter.val == latest ->
-    get_latest_val(Iter, Key);
-get_val(Iter, Key) when Iter#iter.val == checkpoint ->
-    get_checkpoint_val(Iter, Key).
-
-get_latest_val(Iter, Key) when Iter#iter.source == table ->
-    retainer_get(Iter#iter.main_tab, Key);
-get_latest_val(Iter, Key) when Iter#iter.source == retainer ->
-    DeleteOid = {Iter#iter.tab_name, Key},
-    [DeleteOid | retainer_get(Iter#iter.main_tab, Key)].
-
-get_checkpoint_val(Iter, Key) when Iter#iter.source == table ->
-    retainer_get(Iter#iter.main_tab, Key);
-get_checkpoint_val(Iter, Key) when Iter#iter.source == retainer ->
-    DeleteOid = {Iter#iter.tab_name, Key},
-    case retainer_get(Iter#iter.retainer_tab, Key) of
-	[{_, _, []}] -> [DeleteOid];
-	[{_, _, Records}] -> [DeleteOid | Records]
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% System upgrade
-
-system_continue(_Parent, _Debug, Cp) ->
-    retainer_loop(Cp).
-
-system_terminate(_Reason, _Parent,_Debug, Cp) ->
-    do_stop(Cp).
-
-system_code_change(Cp, _Module, _OldVsn, _Extra) ->
-    {ok, Cp}.
-
-convert_cp_record(Cp) when record(Cp, checkpoint) ->
-    ROD = 
-	case Cp#checkpoint.ram_overrides_dump of
-	    true -> Cp#checkpoint.min ++ Cp#checkpoint.max;
-	    false -> []
-	end,
-
-    {ok, #checkpoint_args{name = Cp#checkpoint.name,
-			  allow_remote = Cp#checkpoint.name,
-			  ram_overrides_dump = ROD,
-			  nodes = Cp#checkpoint.nodes,
-			  node = Cp#checkpoint.node,
-			  now = Cp#checkpoint.now,
-			  cookie = ?unique_cookie,
-			  min = Cp#checkpoint.min,
-			  max = Cp#checkpoint.max,
-			  pending_tab = Cp#checkpoint.pending_tab,
-			  wait_for_old = Cp#checkpoint.wait_for_old,
-			  is_activated = Cp#checkpoint.is_activated,
-			  ignore_new = Cp#checkpoint.ignore_new,
-			  retainers = Cp#checkpoint.retainers,
-			  iterators = Cp#checkpoint.iterators,
-			  supervisor = Cp#checkpoint.supervisor,
-			  pid = Cp#checkpoint.pid
-			 }};
-convert_cp_record(Cp) when record(Cp, checkpoint_args) ->
-    AllTabs = Cp#checkpoint_args.min ++ Cp#checkpoint_args.max,
-    ROD = case Cp#checkpoint_args.ram_overrides_dump of
-	      [] -> 
-		  false;
-	      AllTabs -> 
-		  true;
-	      _ -> 
-		  error
-	  end,
-    if
-	ROD == error ->
-	    {error, {"Old node cannot handle new checkpoint protocol",
-		     ram_overrides_dump}};
-	true ->
-	    {ok, #checkpoint{name = Cp#checkpoint_args.name,
-			     allow_remote = Cp#checkpoint_args.name,
-			     ram_overrides_dump = ROD,
-			     nodes = Cp#checkpoint_args.nodes,
-			     node = Cp#checkpoint_args.node,
-			     now = Cp#checkpoint_args.now,
-			     min = Cp#checkpoint_args.min,
-			     max = Cp#checkpoint_args.max,
-			     pending_tab = Cp#checkpoint_args.pending_tab,
-			     wait_for_old = Cp#checkpoint_args.wait_for_old,
-			     is_activated = Cp#checkpoint_args.is_activated,
-			     ignore_new = Cp#checkpoint_args.ignore_new,
-			     retainers = Cp#checkpoint_args.retainers,
-			     iterators = Cp#checkpoint_args.iterators,
-			     supervisor = Cp#checkpoint_args.supervisor,
-			     pid = Cp#checkpoint_args.pid
-			    }}
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_); 
-	_VaLuE_ -> _VaLuE_ 
-    end.
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_checkpoint_sup.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_checkpoint_sup.erl
deleted file mode 100644
index 29e31f15a6..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_checkpoint_sup.erl
+++ /dev/null
@@ -1,39 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_checkpoint_sup.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%
--module(mnesia_checkpoint_sup).
-
--behaviour(supervisor).
-
--export([start/0, init/1]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% top supervisor callback functions
-
-start() ->
-    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% sub supervisor callback functions
-
-init([]) ->
-    Flags = {simple_one_for_one, 0, timer:hours(24)}, % Trust the top supervisor
-    MFA = {mnesia_checkpoint, start, []},
-    Modules = [?MODULE, mnesia_checkpoint, supervisor],
-    KillAfter = mnesia_kernel_sup:supervisor_timeout(timer:seconds(3)),
-    Workers = [{?MODULE, MFA, transient, KillAfter, worker, Modules}],
-    {ok, {Flags, Workers}}.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_controller.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_controller.erl
deleted file mode 100644
index b6f865f0d4..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_controller.erl
+++ /dev/null
@@ -1,2012 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_controller.erl,v 1.3 2010/03/04 13:54:19 maria Exp $
-%%
-%% The mnesia_init process loads tables from local disc or from
-%% another nodes. It also coordinates updates of the info about
-%% where we can read and write tables.
-%%
-%% Tables may need to be loaded initially at startup of the local
-%% node or when other nodes announces that they already have loaded
-%% tables that we also want.
-%%
-%% Initially we set the load request queue to those tables that we
-%% safely can load locally, i.e. tables where we have the last
-%% consistent replica and we have received mnesia_down from all
-%% other nodes holding the table. Then we let the mnesia_init
-%% process enter its normal working state.
-%%
-%% When we need to load a table we append a request to the load
-%% request queue. All other requests are regarded as high priority
-%% and are processed immediately (e.g. update table whereabouts).
-%% We processes the load request queue as a "background" job..
-
--module(mnesia_controller).
-
--behaviour(gen_server).
-
-%% Mnesia internal stuff
--export([
-	 start/0,
-	 i_have_tab/1,
-	 info/0,
-	 get_info/1,
-	 get_workers/1,
-	 force_load_table/1,
-	 async_dump_log/1,
-	 sync_dump_log/1,
-	 connect_nodes/1,
-	 wait_for_schema_commit_lock/0,
-	 release_schema_commit_lock/0,
-	 create_table/1,
-	 get_disc_copy/1,
-	 get_cstructs/0,
-	 sync_and_block_table_whereabouts/4,
-	 sync_del_table_copy_whereabouts/2,
-	 block_table/1,
-	 unblock_table/1,
-	 block_controller/0,
-	 unblock_controller/0,
-	 unannounce_add_table_copy/2,
-	 master_nodes_updated/2,
-	 mnesia_down/1,
-	 add_active_replica/2,
-	 add_active_replica/3,
-	 add_active_replica/4,
-	 change_table_access_mode/1,
-	 del_active_replica/2,
-	 wait_for_tables/2,
-	 get_network_copy/2,
-	 merge_schema/0,
-	 start_remote_sender/4,
-	 schedule_late_disc_load/2
-	]).
-
-%% gen_server callbacks
--export([init/1,
-	 handle_call/3,
-	 handle_cast/2,
-	 handle_info/2,
-	 terminate/2,
-	 code_change/3]).
-
-%% Module internal stuff
--export([call/1,
-	 cast/1,
-	 dump_and_reply/2,
-	 load_and_reply/2,
-	 send_and_reply/2,
-	 wait_for_tables_init/2
-	]).
-
--import(mnesia_lib, [set/2, add/2]).
--import(mnesia_lib, [fatal/2, error/2, verbose/2, dbg_out/2]).
-
--include("mnesia.hrl").
-
--define(SERVER_NAME, ?MODULE).  
-
--record(state, {supervisor,
-		schema_is_merged = false,
-		early_msgs = [],
-		loader_pid,
-		loader_queue = [],
-		sender_pid,
-		sender_queue =  [],
-		late_loader_queue = [],
-		dumper_pid,          % Dumper or schema commit pid
-		dumper_queue = [],   % Dumper or schema commit queue
-		dump_log_timer_ref,
-		is_stopping = false
-	       }).
-
--record(worker_reply, {what,
-		       pid,
-		       result
-		      }).
-
--record(schema_commit_lock, {owner}).
--record(block_controller, {owner}).
-
--record(dump_log, {initiated_by,
-		   opt_reply_to
-		  }).
-
--record(net_load, {table,
-		   reason,
-		   opt_reply_to,
-		   cstruct = unknown
-		  }).
-
--record(send_table, {table,
-		     receiver_pid,
-		     remote_storage
-		    }).
-
--record(disc_load, {table, 
-		    reason,
-		    opt_reply_to
-		   }).
-
--record(late_load, {table,
-		    reason,
-		    opt_reply_to,
-		    loaders
-		   }).
-
--record(loader_done, {worker_pid,
-		      is_loaded,
-		      table_name,
-		      needs_announce,
-		      needs_sync,
-		      needs_reply,
-		      reply_to,
-		      reply}).
-
--record(sender_done, {worker_pid,
-		      worker_res,
-		      table_name
-		     }).
-
--record(dumper_done, {worker_pid,
-		      worker_res
-		     }).
-
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason); 
-	Value -> Value
-    end.
-
-start() ->
-    gen_server:start_link({local, ?SERVER_NAME}, ?MODULE, [self()],
-			  [{timeout, infinity}
-			   %% ,{debug, [trace]}
-			  ]).
-
-sync_dump_log(InitBy) ->
-    call({sync_dump_log, InitBy}).
-
-async_dump_log(InitBy) ->
-    ?SERVER_NAME ! {async_dump_log, InitBy}.
-    
-%% Wait for tables to be active
-%% If needed, we will wait for Mnesia to start
-%% If Mnesia stops, we will wait for Mnesia to restart
-%% We will wait even if the list of tables is empty
-%%
-wait_for_tables(Tabs, Timeout) when list(Tabs), Timeout == infinity ->
-    do_wait_for_tables(Tabs, Timeout);
-wait_for_tables(Tabs, Timeout) when list(Tabs),
-                                    integer(Timeout), Timeout >= 0 ->
-    do_wait_for_tables(Tabs, Timeout);
-wait_for_tables(Tabs, Timeout) ->
-    {error, {badarg, Tabs, Timeout}}.
-
-do_wait_for_tables(Tabs, 0) ->
-    reply_wait(Tabs);
-do_wait_for_tables(Tabs, Timeout) ->
-    Pid = spawn_link(?MODULE, wait_for_tables_init, [self(), Tabs]),
-    receive
-	{?SERVER_NAME, Pid, Res} ->
-	    Res;
-
-	{'EXIT', Pid, _} ->
-	    reply_wait(Tabs)
-
-    after Timeout ->
-	    unlink(Pid),
-	    exit(Pid, timeout),
-	    reply_wait(Tabs)
-    end.
-	
-reply_wait(Tabs) ->
-    case catch mnesia_lib:active_tables() of
-	{'EXIT', _} ->
-	    {error, {node_not_running, node()}};
-	Active when list(Active) ->
-	    case Tabs -- Active of
-		[] ->
-		    ok;
-		BadTabs ->
-		    {timeout, BadTabs}
-	    end
-    end.
-
-wait_for_tables_init(From, Tabs) ->
-    process_flag(trap_exit, true),
-    Res = wait_for_init(From, Tabs, whereis(?SERVER_NAME)),
-    From ! {?SERVER_NAME, self(), Res},
-    unlink(From),
-    exit(normal).
-
-wait_for_init(From, Tabs, Init) ->
-    case catch link(Init) of
-	{'EXIT', _} ->
-	    %% Mnesia is not started
-	    {error, {node_not_running, node()}};
-	true when pid(Init) ->
-	    cast({sync_tabs, Tabs, self()}),
-	    rec_tabs(Tabs, Tabs, From, Init)
-    end.
-
-sync_reply(Waiter, Tab) ->
-    Waiter ! {?SERVER_NAME, {tab_synced, Tab}}.
-
-rec_tabs([Tab | Tabs], AllTabs, From, Init) ->
-    receive
-	{?SERVER_NAME, {tab_synced, Tab}} ->
-	    rec_tabs(Tabs, AllTabs, From, Init);
-
-	{'EXIT', From, _} ->
-	    %% This will trigger an exit signal
-	    %% to mnesia_init
-	    exit(wait_for_tables_timeout);
-	
-	{'EXIT', Init, _} ->
-	    %% Oops, mnesia_init stopped,
-	    exit(mnesia_stopped)
-    end;
-rec_tabs([], _, _, Init) ->
-    unlink(Init),
-    ok.
-
-get_cstructs() ->
-    call(get_cstructs).
-
-mnesia_down(Node) ->
-    case cast({mnesia_down, Node}) of
-	{error, _} -> mnesia_monitor:mnesia_down(?SERVER_NAME, Node);
-	_Pid ->  ok
-    end.
-wait_for_schema_commit_lock() ->
-    link(whereis(?SERVER_NAME)),
-    unsafe_call(wait_for_schema_commit_lock).
-
-block_controller() ->
-    call(block_controller).
-
-unblock_controller() ->
-    cast(unblock_controller).
-
-release_schema_commit_lock() ->
-    cast({release_schema_commit_lock, self()}),
-    unlink(whereis(?SERVER_NAME)).
-    
-%% Special for preparation of add table copy
-get_network_copy(Tab, Cs) ->
-    Work = #net_load{table = Tab,
-		     reason = {dumper, add_table_copy},
-		     cstruct = Cs
-		    },
-    Res = (catch load_table(Work)),
-    if Res#loader_done.is_loaded == true ->
-	    Tab = Res#loader_done.table_name,
-	    case Res#loader_done.needs_announce of
-		true ->
-		    i_have_tab(Tab);
-		false ->
-		    ignore
-	    end;
-       true -> ignore
-    end,
-
-    receive %% Flush copier done message
-	{copier_done, _Node} ->
-	    ok
-    after 500 ->  %% avoid hanging if something is wrong and we shall fail.
-	    ignore
-    end,
-    Res#loader_done.reply.
-
-%% This functions is invoked from the dumper
-%% 
-%% There are two cases here:
-%% startup ->
-%%   no need for sync, since mnesia_controller not started yet
-%% schema_trans ->
-%%   already synced with mnesia_controller since the dumper
-%%   is syncronously started from mnesia_controller
-
-create_table(Tab) ->
-    {loaded, ok} = mnesia_loader:disc_load_table(Tab, {dumper,create_table}).
-
-get_disc_copy(Tab) ->
-    disc_load_table(Tab, {dumper,change_table_copy_type}, undefined).
-
-%% Returns ok instead of yes
-force_load_table(Tab) when atom(Tab), Tab /= schema ->
-    case ?catch_val({Tab, storage_type}) of
-	ram_copies ->
-	    do_force_load_table(Tab);
-	disc_copies ->
-	    do_force_load_table(Tab);
-	disc_only_copies ->
-	    do_force_load_table(Tab);
-	unknown ->
-	    set({Tab, load_by_force}, true),
-	    cast({force_load_updated, Tab}),
-	    wait_for_tables([Tab], infinity);
-	{'EXIT', _} ->
-	    {error, {no_exists, Tab}}
-    end;
-force_load_table(Tab) ->
-    {error, {bad_type, Tab}}.
-    
-do_force_load_table(Tab) ->
-    Loaded = ?catch_val({Tab, load_reason}),
-    case Loaded of
-	unknown -> 
-	    set({Tab, load_by_force}, true),
-	    mnesia_late_loader:async_late_disc_load(node(), [Tab], forced_by_user),
-	    wait_for_tables([Tab], infinity);
-	{'EXIT', _} ->
-	    set({Tab, load_by_force}, true),
-	    mnesia_late_loader:async_late_disc_load(node(), [Tab], forced_by_user),
-	    wait_for_tables([Tab], infinity);
-	_ ->
-	    ok
-    end.    
-master_nodes_updated(schema, _Masters) ->
-    ignore;
-master_nodes_updated(Tab, Masters) ->
-    cast({master_nodes_updated, Tab, Masters}).
-
-schedule_late_disc_load(Tabs, Reason) ->
-    MsgTag = late_disc_load,
-    try_schedule_late_disc_load(Tabs, Reason, MsgTag).
-
-try_schedule_late_disc_load(Tabs, _Reason, MsgTag)
-  when Tabs == [], MsgTag /= schema_is_merged ->
-    ignore;
-try_schedule_late_disc_load(Tabs, Reason, MsgTag) ->
-    GetIntents =
-	fun() ->
-		Item = mnesia_late_disc_load,
-		Nodes = val({current, db_nodes}),
-		mnesia:lock({global, Item, Nodes}, write),
-		case multicall(Nodes -- [node()], disc_load_intents) of
-		    {Replies, []} ->
-			call({MsgTag, Tabs, Reason, Replies}),
-			done;
-		    {_, BadNodes} ->
-			%% Some nodes did not respond, lets try again
-			{retry, BadNodes}
-		end
-	end,
-    case mnesia:transaction(GetIntents) of
-	{'atomic', done} ->
-	    done;
-	{'atomic', {retry, BadNodes}} ->
-	    verbose("Retry late_load_tables because bad nodes: ~p~n",
-		    [BadNodes]),
-	    try_schedule_late_disc_load(Tabs, Reason, MsgTag);
-	{aborted, AbortReason} ->
-	    fatal("Cannot late_load_tables~p: ~p~n",
-		  [[Tabs, Reason, MsgTag], AbortReason])
-    end.
-
-connect_nodes(Ns) ->    
-    case mnesia:system_info(is_running) of 
-	no ->
-	    {error, {node_not_running, node()}};
-	yes ->	  	   
-	    {NewC, OldC} = mnesia_recover:connect_nodes(Ns),
-	    Connected = NewC ++OldC,
-	    New1 = mnesia_lib:intersect(Ns, Connected),
-	    New = New1 -- val({current, db_nodes}),
-	    
-	    case try_merge_schema(New) of
-		ok -> 
-		    mnesia_lib:add_list(extra_db_nodes, New),
-		    {ok, New};
-		{aborted, {throw, Str}} when list(Str) ->
-		    %%mnesia_recover:disconnect_nodes(New),
-		    {error, {merge_schema_failed, lists:flatten(Str)}};
-		Else ->
-		    %% Unconnect nodes where merge failed!!
-		    %% mnesia_recover:disconnect_nodes(New),
-		    {error, Else}
-	    end
-    end.
-
-%% Merge the local schema with the schema on other nodes.
-%% But first we must let all processes that want to force
-%% load tables wait until the schema merge is done.
-
-merge_schema() ->
-    AllNodes = mnesia_lib:all_nodes(),
-    case try_merge_schema(AllNodes) of
-	ok -> 
-	    schema_is_merged();
-	{aborted, {throw, Str}} when list(Str) ->
-	    fatal("Failed to merge schema: ~s~n", [Str]);
-	Else ->
-	    fatal("Failed to merge schema: ~p~n", [Else])
-    end.
-
-try_merge_schema(Nodes) ->
-    case mnesia_schema:merge_schema() of
-	{'atomic', not_merged} ->
-	    %% No more nodes that we need to merge the schema with
-	    ok;
-	{'atomic', {merged, OldFriends, NewFriends}} ->
-	    %% Check if new nodes has been added to the schema
-	    Diff = mnesia_lib:all_nodes() -- [node() | Nodes],
-	    mnesia_recover:connect_nodes(Diff),
-
-	    %% Tell everybody to adopt orphan tables
-	    im_running(OldFriends, NewFriends),
-	    im_running(NewFriends, OldFriends),
-	    
-	    try_merge_schema(Nodes);
-	{'atomic', {"Cannot get cstructs", Node, Reason}} ->
-	    dbg_out("Cannot get cstructs, Node ~p ~p~n", [Node, Reason]),
-	    timer:sleep(1000), % Avoid a endless loop look alike	    
-	    try_merge_schema(Nodes);
-	Other ->
-	    Other
-    end.
-
-im_running(OldFriends, NewFriends) ->
-    abcast(OldFriends, {im_running, node(), NewFriends}).
-
-schema_is_merged() ->
-    MsgTag = schema_is_merged,
-    SafeLoads = initial_safe_loads(),
-    
-    %% At this point we do not know anything about
-    %% which tables that the other nodes already
-    %% has loaded and therefore we let the normal
-    %% processing of the loader_queue take care
-    %% of it, since we at that time point will
-    %% know the whereabouts. We rely on the fact
-    %% that all nodes tells each other directly
-    %% when they have loaded a table and are
-    %% willing to share it.
-    
-    try_schedule_late_disc_load(SafeLoads, initial, MsgTag).
-
-
-cast(Msg) ->
-    case whereis(?SERVER_NAME) of
-	undefined ->{error, {node_not_running, node()}};
-	Pid ->  gen_server:cast(Pid, Msg)
-    end.
-
-abcast(Nodes, Msg) ->
-    gen_server:abcast(Nodes, ?SERVER_NAME, Msg).
-
-unsafe_call(Msg) ->
-    case whereis(?SERVER_NAME) of
-	undefined -> {error, {node_not_running, node()}};
-	Pid -> gen_server:call(Pid, Msg, infinity)
-    end.
-
-call(Msg) ->
-    case whereis(?SERVER_NAME) of
-	undefined ->
-	    {error, {node_not_running, node()}};
-	Pid ->
-	    link(Pid),
-	    Res = gen_server:call(Pid, Msg, infinity),
-	    unlink(Pid),
-
-	    %% We get an exit signal if server dies
-            receive
-                {'EXIT', Pid, _Reason} ->
-                    {error, {node_not_running, node()}}
-            after 0 ->
-                    ignore
-            end,
-	    Res
-    end.
-
-remote_call(Node, Func, Args) ->
-    case catch gen_server:call({?MODULE, Node}, {Func, Args, self()}, infinity) of
-	{'EXIT', Error} ->
-	    {error, Error};
-	Else ->
-	    Else
-    end.
-    
-multicall(Nodes, Msg) ->
-    {Good, Bad} = gen_server:multi_call(Nodes, ?MODULE, Msg, infinity),
-    PatchedGood = [Reply || {_Node, Reply} <- Good],
-    {PatchedGood, Bad}.  %% Make the replies look like rpc:multicalls..
-%%    rpc:multicall(Nodes, ?MODULE, call, [Msg]).
-
-%%%----------------------------------------------------------------------
-%%% Callback functions from gen_server
-%%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% Func: init/1
-%% Returns: {ok, State}          |
-%%          {ok, State, Timeout} |
-%%          {stop, Reason}
-%%----------------------------------------------------------------------
-init([Parent]) ->
-    process_flag(trap_exit, true),
-    mnesia_lib:verbose("~p starting: ~p~n", [?SERVER_NAME, self()]),
-
-    %% Handshake and initialize transaction recovery
-    %% for new nodes detected in the schema
-    All = mnesia_lib:all_nodes(),
-    Diff = All -- [node() | val(original_nodes)],
-    mnesia_lib:unset(original_nodes),
-    mnesia_recover:connect_nodes(Diff),
-
-    Interval = mnesia_monitor:get_env(dump_log_time_threshold),
-    Msg = {async_dump_log, time_threshold},
-    {ok, Ref} = timer:send_interval(Interval, Msg),
-    mnesia_dumper:start_regulator(),
-    
-    {ok, #state{supervisor = Parent, dump_log_timer_ref = Ref}}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_call/3
-%% Returns: {reply, Reply, State}          |
-%%          {reply, Reply, State, Timeout} |
-%%          {noreply, State}               |
-%%          {noreply, State, Timeout}      |
-%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
-%%          {stop, Reason, Reply, State}     (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_call({sync_dump_log, InitBy}, From, State) ->
-    Worker = #dump_log{initiated_by = InitBy,
-		       opt_reply_to = From
-		      },
-    State2 = add_worker(Worker, State),
-    noreply(State2);
-
-handle_call(wait_for_schema_commit_lock, From, State) ->
-    Worker = #schema_commit_lock{owner = From},
-    State2 = add_worker(Worker, State),
-    noreply(State2);
-
-handle_call(block_controller, From, State) ->
-    Worker = #block_controller{owner = From},
-    State2 = add_worker(Worker, State),
-    noreply(State2);
-
-
-handle_call(get_cstructs, From, State) ->
-    Tabs = val({schema, tables}),
-    Cstructs = [val({T, cstruct}) || T <- Tabs],
-    Running = val({current, db_nodes}),
-    reply(From, {cstructs, Cstructs, Running}),
-    noreply(State);
-
-handle_call({schema_is_merged, TabsR, Reason, RemoteLoaders}, From, State) ->
-    State2 = late_disc_load(TabsR, Reason, RemoteLoaders, From, State),
-
-    %% Handle early messages
-    Msgs = State2#state.early_msgs,
-    State3 = State2#state{early_msgs = [], schema_is_merged = true},
-    Ns = val({current, db_nodes}),
-    dbg_out("Schema is merged ~w, State ~w~n", [Ns, State3]),    
-%%    dbg_out("handle_early_msgs ~p ~n", [Msgs]), % qqqq
-    handle_early_msgs(lists:reverse(Msgs), State3);
-
-handle_call(disc_load_intents, From, State) ->
-    Tabs = disc_load_intents(State#state.loader_queue) ++
-           disc_load_intents(State#state.late_loader_queue),
-    ActiveTabs = mnesia_lib:local_active_tables(),
-    reply(From, {ok, node(), mnesia_lib:union(Tabs, ActiveTabs)}),
-    noreply(State);
-
-handle_call({update_where_to_write, [add, Tab, AddNode], _From}, _Dummy, State) ->
-%%%    dbg_out("update_w2w ~p", [[add, Tab, AddNode]]), %%% qqqq
-    Current = val({current, db_nodes}),
-    Res = 
-	case lists:member(AddNode, Current) and 
-	    State#state.schema_is_merged == true of
-	    true ->
-		mnesia_lib:add({Tab, where_to_write}, AddNode);
-	    false ->
-		ignore
-	end,
-    {reply, Res, State};
-
-handle_call({add_active_replica, [Tab, ToNode, RemoteS, AccessMode], From},
-	    ReplyTo, State) ->
-    KnownNode = lists:member(ToNode, val({current, db_nodes})),
-    Merged = State#state.schema_is_merged,
-    if
-	KnownNode == false ->
-	    reply(ReplyTo, ignore),
-	    noreply(State);
-	Merged == true ->
-	    Res = add_active_replica(Tab, ToNode, RemoteS, AccessMode),
-	    reply(ReplyTo, Res),
-	    noreply(State);
-	true -> %% Schema is not merged
-	    Msg = {add_active_replica, [Tab, ToNode, RemoteS, AccessMode], From},
-	    Msgs = State#state.early_msgs,
-	    reply(ReplyTo, ignore),   %% Reply ignore and add data after schema merge
-	    noreply(State#state{early_msgs = [{call, Msg, undefined} | Msgs]})
-    end;
-
-handle_call({unannounce_add_table_copy, [Tab, Node], From}, ReplyTo, State) ->    
-    KnownNode = lists:member(node(From), val({current, db_nodes})),
-    Merged = State#state.schema_is_merged,
-    if
-	KnownNode == false ->
-	    reply(ReplyTo, ignore),
-	    noreply(State);
-	Merged == true ->
-	    Res = unannounce_add_table_copy(Tab, Node),
-	    reply(ReplyTo, Res),
-	    noreply(State);
-	true -> %% Schema is not merged
-	    Msg = {unannounce_add_table_copy, [Tab, Node], From},
-	    Msgs = State#state.early_msgs,
-	    reply(ReplyTo, ignore),   %% Reply ignore and add data after schema merge
-	    %% Set ReplyTO to undefined so we don't reply twice
-	    noreply(State#state{early_msgs = [{call, Msg, undefined} | Msgs]})
-    end;
-
-handle_call(Msg, From, State) when State#state.schema_is_merged == false ->
-    %% Buffer early messages
-%%    dbg_out("Buffered early msg ~p ~n", [Msg]),   %% qqqq
-    Msgs = State#state.early_msgs,
-    noreply(State#state{early_msgs = [{call, Msg, From} | Msgs]});
-
-handle_call({net_load, Tab, Cs}, From, State) ->
-    Worker = #net_load{table = Tab,
-		       opt_reply_to = From,
-		       reason = add_table_copy,
-		       cstruct = Cs
-		      },
-    State2 = add_worker(Worker, State),
-    noreply(State2);
-
-handle_call({late_disc_load, Tabs, Reason, RemoteLoaders}, From, State) ->
-    State2 = late_disc_load(Tabs, Reason, RemoteLoaders, From, State),
-    noreply(State2);
-
-handle_call({block_table, [Tab], From}, _Dummy, State) ->
-    case lists:member(node(From), val({current, db_nodes})) of
-	true ->
-	    block_table(Tab);
-	false ->
-	    ignore
-    end,
-    {reply, ok, State};
-
-handle_call({check_w2r, _Node, Tab}, _From, State) ->
-    {reply, val({Tab, where_to_read}), State};
-
-handle_call(Msg, _From, State) ->
-    error("~p got unexpected call: ~p~n", [?SERVER_NAME, Msg]),
-    noreply(State).
-
-disc_load_intents([H | T]) when record(H, disc_load) ->
-    [H#disc_load.table | disc_load_intents(T)];
-disc_load_intents([H | T]) when record(H, late_load) ->
-    [H#late_load.table | disc_load_intents(T)];
-disc_load_intents( [H | T]) when record(H, net_load) ->
-    disc_load_intents(T);
-disc_load_intents([]) ->
-    [].
-
-late_disc_load(TabsR, Reason, RemoteLoaders, From, State) ->
-    verbose("Intend to load tables: ~p~n", [TabsR]),
-    ?eval_debug_fun({?MODULE, late_disc_load},
-		    [{tabs, TabsR}, 
-		     {reason, Reason},
-		     {loaders, RemoteLoaders}]),
-
-    reply(From, queued),
-    %% RemoteLoaders is a list of {ok, Node, Tabs} tuples
-
-    %% Remove deleted tabs
-    LocalTabs = mnesia_lib:val({schema, local_tables}),
-    Filter = fun({Tab, Reas}, Acc) -> 
-		     case lists:member(Tab, LocalTabs) of
-			 true -> [{Tab, Reas} | Acc];
-		         false -> Acc
-		     end;
-		(Tab, Acc) ->
-		     case lists:member(Tab, LocalTabs) of
-			 true -> [Tab | Acc];
-		         false -> Acc
-		     end
-	     end,
-    
-    Tabs = lists:foldl(Filter, [], TabsR),
-    
-    Nodes = val({current, db_nodes}),
-    LateLoaders = late_loaders(Tabs, Reason, RemoteLoaders, Nodes),
-    LateQueue = State#state.late_loader_queue ++ LateLoaders,
-    State#state{late_loader_queue = LateQueue}.
-
-late_loaders([{Tab, Reason} | Tabs], DefaultReason, RemoteLoaders, Nodes) ->
-    LoadNodes = late_load_filter(RemoteLoaders, Tab, Nodes, []),
-    case LoadNodes of
-	[] ->
-	    cast({disc_load, Tab, Reason}); % Ugly cast
-	_ ->
-	    ignore
-    end,
-    LateLoad = #late_load{table = Tab, loaders = LoadNodes, reason = Reason},
-    [LateLoad | late_loaders(Tabs, DefaultReason, RemoteLoaders, Nodes)];
-
-late_loaders([Tab | Tabs], Reason, RemoteLoaders, Nodes) ->
-    Loaders = late_load_filter(RemoteLoaders, Tab, Nodes, []),
-    case Loaders of
-	[] ->
-	    cast({disc_load, Tab, Reason});  % Ugly cast
-	_ ->
-	    ignore
-    end,
-    LateLoad = #late_load{table = Tab, loaders = Loaders, reason = Reason},
-    [LateLoad | late_loaders(Tabs, Reason, RemoteLoaders, Nodes)];
-late_loaders([], _Reason, _RemoteLoaders, _Nodes) ->
-    [].
-
-late_load_filter([{error, _} | RemoteLoaders], Tab, Nodes, Acc) ->
-    late_load_filter(RemoteLoaders, Tab, Nodes, Acc);
-late_load_filter([{badrpc, _} | RemoteLoaders], Tab, Nodes, Acc) ->
-    late_load_filter(RemoteLoaders, Tab, Nodes, Acc);
-late_load_filter([RL | RemoteLoaders], Tab, Nodes, Acc) ->
-    {ok, Node, Intents} = RL,
-    Access = val({Tab, access_mode}),
-    LocalC = val({Tab, local_content}),
-    StillActive = lists:member(Node, Nodes),
-    RemoteIntent = lists:member(Tab, Intents),
-    if
-	Access == read_write,
-	LocalC == false,
-	StillActive == true,
-	RemoteIntent == true ->
-	    Masters = mnesia_recover:get_master_nodes(Tab),
-	    case lists:member(Node, Masters) of
-		true ->
-		    %% The other node is master node for
-		    %% the table, accept his load intent
-		    late_load_filter(RemoteLoaders, Tab, Nodes, [Node | Acc]);
-		false when Masters == [] ->
-		    %% The table has no master nodes
-		    %% accept his load intent
-		    late_load_filter(RemoteLoaders, Tab, Nodes, [Node | Acc]);
-		false ->
-		    %% Some one else is master node for
-		    %% the table, ignore his load intent
-		    late_load_filter(RemoteLoaders, Tab, Nodes, Acc)
-	    end;
-	true ->
-	    late_load_filter(RemoteLoaders, Tab, Nodes, Acc)
-    end;
-late_load_filter([], _Tab, _Nodes, Acc) ->
-    Acc.
-    
-%%----------------------------------------------------------------------
-%% Func: handle_cast/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_cast({release_schema_commit_lock, _Owner}, State) ->
-    if
-	State#state.is_stopping == true ->
-	    {stop, shutdown, State};
-	true -> 
-	    case State#state.dumper_queue of
-		[#schema_commit_lock{}|Rest] ->
-		    [_Worker | Rest] = State#state.dumper_queue,
-		    State2 = State#state{dumper_pid = undefined,
-					 dumper_queue = Rest},
-		    State3 = opt_start_worker(State2),
-		    noreply(State3);
-		_ ->
-		    noreply(State)
-	    end
-    end;
-
-handle_cast(unblock_controller, State) ->
-    if
-	State#state.is_stopping == true ->
-	    {stop, shutdown, State};
-	record(hd(State#state.dumper_queue), block_controller) ->
-	    [_Worker | Rest] = State#state.dumper_queue,
-	    State2 = State#state{dumper_pid = undefined,
-				 dumper_queue = Rest},
-	    State3 = opt_start_worker(State2),	    
-	    noreply(State3)
-    end;
-
-handle_cast({mnesia_down, Node}, State) ->
-    maybe_log_mnesia_down(Node),
-    mnesia_lib:del({current, db_nodes}, Node),
-    mnesia_checkpoint:tm_mnesia_down(Node),
-    Alltabs = val({schema, tables}),
-    State2 = reconfigure_tables(Node, State, Alltabs),
-    case State#state.sender_pid of
-	undefined -> ignore;
-	Pid when pid(Pid) -> Pid ! {copier_done, Node}
-    end,
-    case State#state.loader_pid of
-	undefined -> ignore;
-	Pid2 when pid(Pid2) -> Pid2 ! {copier_done, Node}
-    end,
-    NewSenders = 
-	case State#state.sender_queue of
-	    [OldSender | RestSenders] ->
-		Remove = fun(ST) ->
-				 node(ST#send_table.receiver_pid) /= Node
-			 end,
-		NewS = lists:filter(Remove, RestSenders),
-		%% Keep old sender it will be removed by sender_done
-		[OldSender | NewS];
-	    [] ->
-		[]
-	end,
-    Early = remove_early_messages(State2#state.early_msgs, Node),
-    mnesia_monitor:mnesia_down(?SERVER_NAME, Node),
-    noreply(State2#state{sender_queue = NewSenders, early_msgs = Early});
-
-handle_cast({im_running, _Node, NewFriends}, State) ->
-    Tabs = mnesia_lib:local_active_tables() -- [schema],
-    Ns = mnesia_lib:intersect(NewFriends, val({current, db_nodes})),
-    abcast(Ns, {adopt_orphans, node(), Tabs}),
-    noreply(State);
-
-handle_cast(Msg, State) when State#state.schema_is_merged == false ->
-    %% Buffer early messages
-    Msgs = State#state.early_msgs,
-    noreply(State#state{early_msgs = [{cast, Msg} | Msgs]});
-
-handle_cast({disc_load, Tab, Reason}, State) ->
-    Worker = #disc_load{table = Tab, reason = Reason},
-    State2 = add_worker(Worker, State),
-    noreply(State2);
-
-handle_cast(Worker, State) when record(Worker, send_table) ->
-    State2 = add_worker(Worker, State),
-    noreply(State2);
-
-handle_cast({sync_tabs, Tabs, From}, State) ->
-    %% user initiated wait_for_tables
-    handle_sync_tabs(Tabs, From),
-    noreply(State);
-
-handle_cast({i_have_tab, Tab, Node}, State) ->
-    case lists:member(Node, val({current, db_nodes})) of
-	true -> 
-	    State2 = node_has_tabs([Tab], Node, State),
-	    noreply(State2);
-	false ->
-	    noreply(State)
-    end;
-
-handle_cast({force_load_updated, Tab}, State) ->
-    case val({Tab, active_replicas}) of
-	[] ->
-	    %% No valid replicas
-	    noreply(State);
-	[SomeNode | _] ->
-	    State2 = node_has_tabs([Tab], SomeNode, State),
-	    noreply(State2)
-    end;
-    
-handle_cast({master_nodes_updated, Tab, Masters}, State) ->
-    Active = val({Tab, active_replicas}),
-    Valid = 
-	case val({Tab, load_by_force}) of
-	    true ->
-		Active;
-	    false ->
-		if
-		    Masters == [] ->
-			Active;
-		    true ->
-			mnesia_lib:intersect(Masters, Active)
-		end
-	end,
-    case Valid of
-	[] ->
-	    %% No valid replicas
-	    noreply(State);
-	[SomeNode | _] ->
-	    State2 = node_has_tabs([Tab], SomeNode, State),
-	    noreply(State2)
-    end;
-    
-handle_cast({adopt_orphans, Node, Tabs}, State) ->
-
-    State2 = node_has_tabs(Tabs, Node, State),
-    
-    %% Register the other node as up and running
-    mnesia_recover:log_mnesia_up(Node),
-    verbose("Logging mnesia_up ~w~n", [Node]),
-    mnesia_lib:report_system_event({mnesia_up, Node}),
-    
-    %% Load orphan tables
-    LocalTabs = val({schema, local_tables}) -- [schema],
-    Nodes = val({current, db_nodes}),
-    {LocalOrphans, RemoteMasters} =
-	orphan_tables(LocalTabs, Node, Nodes, [], []),
-    Reason = {adopt_orphan, node()},
-    mnesia_late_loader:async_late_disc_load(node(), LocalOrphans, Reason),
-    
-    Fun =
-	fun(N) ->
-		RemoteOrphans =
-		    [Tab || {Tab, Ns} <- RemoteMasters,
-			    lists:member(N, Ns)],
-		mnesia_late_loader:maybe_async_late_disc_load(N, RemoteOrphans, Reason)
-	  end,
-    lists:foreach(Fun, Nodes),
-    
-    Queue = State2#state.loader_queue,
-    State3 = State2#state{loader_queue = Queue},
-    noreply(State3);
-
-handle_cast(Msg, State) ->
-    error("~p got unexpected cast: ~p~n", [?SERVER_NAME, Msg]),
-    noreply(State).
-
-handle_sync_tabs([Tab | Tabs], From) ->
-    case val({Tab, where_to_read}) of
-	nowhere ->
-	    case get({sync_tab, Tab}) of
-		undefined ->
-		    put({sync_tab, Tab}, [From]);
-		Pids ->
-		    put({sync_tab, Tab}, [From | Pids])
-	    end;
-	_ ->
-	    sync_reply(From, Tab)
-    end,
-    handle_sync_tabs(Tabs, From);
-handle_sync_tabs([], _From) ->
-    ok.
-
-%%----------------------------------------------------------------------
-%% Func: handle_info/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_info({async_dump_log, InitBy}, State) ->
-    Worker = #dump_log{initiated_by = InitBy},
-    State2 = add_worker(Worker, State),
-    noreply(State2);
-
-handle_info(Done, State) when record(Done, dumper_done) ->
-    Pid = Done#dumper_done.worker_pid,
-    Res = Done#dumper_done.worker_res,
-    if
-	State#state.is_stopping == true ->
-	    {stop, shutdown, State};
-	Res == dumped, Pid == State#state.dumper_pid ->
-	    [Worker | Rest] = State#state.dumper_queue,
-	    reply(Worker#dump_log.opt_reply_to, Res),
-	    State2 = State#state{dumper_pid = undefined,
-				 dumper_queue = Rest},
-	    State3 = opt_start_worker(State2),
-	    noreply(State3);
-	true ->
-	    fatal("Dumper failed: ~p~n state: ~p~n", [Res, State]),
-	    {stop, fatal, State}
-    end;
-
-handle_info(Done, State) when record(Done, loader_done) ->
-    if
-	%% Assertion
-	Done#loader_done.worker_pid == State#state.loader_pid -> ok
-    end,
-	    
-    [_Worker | Rest] = LoadQ0 = State#state.loader_queue,
-    LateQueue0 = State#state.late_loader_queue,
-    {LoadQ, LateQueue} =
-	case Done#loader_done.is_loaded of
-	    true ->
-		Tab = Done#loader_done.table_name,
-		
-		%% Optional user sync
-		case Done#loader_done.needs_sync of
-		    true -> user_sync_tab(Tab);
-		    false -> ignore
-		end,
-		
-		%% Optional table announcement
-		case Done#loader_done.needs_announce of
-		    true ->
-			i_have_tab(Tab),
-			case Tab of
-			    schema ->
-				ignore;
-			    _ ->
-				%% Local node needs to perform user_sync_tab/1
-				Ns = val({current, db_nodes}),
-				abcast(Ns, {i_have_tab, Tab, node()})
-			end;
-		    false ->
-			case Tab of
-			    schema ->
-				ignore;
-			    _ ->
-				%% Local node needs to perform user_sync_tab/1
-				Ns = val({current, db_nodes}),
-				AlreadyKnows = val({Tab, active_replicas}),
-				abcast(Ns -- AlreadyKnows, {i_have_tab, Tab, node()})
-			end	       
-		end,
-
-		%% Optional client reply
-		case Done#loader_done.needs_reply of
-		    true ->
-			reply(Done#loader_done.reply_to,
-			      Done#loader_done.reply);
-		    false ->
-			ignore
-		end,
-		{Rest, reply_late_load(Tab, LateQueue0)};
-	    false ->
-		case Done#loader_done.reply of
-		    restart -> 
-			{LoadQ0, LateQueue0};
-		    _ ->
-			{Rest, LateQueue0}
-		end
-	end,
-
-    State2 = State#state{loader_pid = undefined,
-			 loader_queue = LoadQ,
-			 late_loader_queue = LateQueue},
-
-    State3 = opt_start_worker(State2),
-    noreply(State3);
-
-handle_info(Done, State) when record(Done, sender_done) ->
-    Pid = Done#sender_done.worker_pid,
-    Res = Done#sender_done.worker_res,
-    if
-	Res == ok, Pid == State#state.sender_pid ->
-	    [Worker | Rest] = State#state.sender_queue,
-	    Worker#send_table.receiver_pid ! {copier_done, node()},
-	    State2 = State#state{sender_pid = undefined,
-				 sender_queue = Rest},
-	    State3 = opt_start_worker(State2),
-	    noreply(State3);
-	true ->
-	    %% No need to send any message to the table receiver
-	    %% since it will soon get a mnesia_down anyway
-	    fatal("Sender failed: ~p~n state: ~p~n", [Res, State]),
-	    {stop, fatal, State}
-    end;
-
-handle_info({'EXIT', Pid, R}, State) when Pid == State#state.supervisor ->
-    catch set(mnesia_status, stopping),
-    case State#state.dumper_pid of
-	undefined ->
-	    dbg_out("~p was ~p~n", [?SERVER_NAME, R]),
-	    {stop, shutdown, State};
-	_ ->
-	    noreply(State#state{is_stopping = true})
-    end;
-
-handle_info({'EXIT', Pid, R}, State) when Pid == State#state.dumper_pid ->
-    case State#state.dumper_queue of
-	[#schema_commit_lock{}|Workers] ->  %% Schema trans crashed or was killed
-	    State2 = State#state{dumper_queue = Workers, dumper_pid = undefined},
-	    State3 = opt_start_worker(State2),
-	    noreply(State3);
-	_Other ->
-	    fatal("Dumper or schema commit crashed: ~p~n state: ~p~n", [R, State]),
-	    {stop, fatal, State}
-    end;
-
-handle_info({'EXIT', Pid, R}, State) when Pid == State#state.loader_pid ->
-    fatal("Loader crashed: ~p~n state: ~p~n", [R, State]),
-    {stop, fatal, State};
-
-handle_info({'EXIT', Pid, R}, State) when Pid == State#state.sender_pid ->
-    %% No need to send any message to the table receiver
-    %% since it will soon get a mnesia_down anyway
-    fatal("Sender crashed: ~p~n state: ~p~n", [R, State]),
-    {stop, fatal, State};
-
-handle_info({From, get_state}, State) ->
-    From ! {?SERVER_NAME, State},
-    noreply(State);
-
-%% No real need for buffering
-handle_info(Msg, State) when State#state.schema_is_merged == false ->
-    %% Buffer early messages
-    Msgs = State#state.early_msgs,
-    noreply(State#state{early_msgs = [{info, Msg} | Msgs]});
-
-handle_info({'EXIT', Pid, wait_for_tables_timeout}, State) ->
-    sync_tab_timeout(Pid, get()),
-    noreply(State);
-
-handle_info(Msg, State) ->
-    error("~p got unexpected info: ~p~n", [?SERVER_NAME, Msg]),
-    noreply(State).
-
-reply_late_load(Tab, [H | T]) when H#late_load.table == Tab ->
-    reply(H#late_load.opt_reply_to, ok),
-    reply_late_load(Tab, T);
-reply_late_load(Tab, [H | T])  ->
-    [H | reply_late_load(Tab, T)];
-reply_late_load(_Tab, []) ->
-    [].
-
-sync_tab_timeout(Pid, [{{sync_tab, Tab}, Pids} | Tail]) ->
-    case lists:delete(Pid, Pids) of
-	[] ->
-	    erase({sync_tab, Tab});
-	Pids2 ->
-	    put({sync_tab, Tab}, Pids2)
-    end,
-    sync_tab_timeout(Pid, Tail);
-sync_tab_timeout(Pid, [_ | Tail]) ->
-    sync_tab_timeout(Pid, Tail);
-sync_tab_timeout(_Pid, []) ->
-    ok.
-
-%% Pick the load record that has the highest load order
-%% Returns {BestLoad, RemainingQueue} or {none, []} if queue is empty
-pick_next(Queue) ->
-    pick_next(Queue, none, none, []).
-
-pick_next([Head | Tail], Load, Order, Rest) when record(Head, net_load) ->
-    Tab = Head#net_load.table,
-    select_best(Head, Tail, val({Tab, load_order}), Load, Order, Rest);
-pick_next([Head | Tail], Load, Order, Rest) when record(Head, disc_load) ->
-    Tab = Head#disc_load.table,
-    select_best(Head, Tail, val({Tab, load_order}), Load, Order, Rest);
-pick_next([], Load, _Order, Rest) ->
-    {Load, Rest}.
-
-select_best(Load, Tail, Order, none, none, Rest) ->
-    pick_next(Tail, Load, Order, Rest);
-select_best(Load, Tail, Order, OldLoad, OldOrder, Rest) when Order > OldOrder ->
-    pick_next(Tail, Load, Order, [OldLoad | Rest]);
-select_best(Load, Tail, _Order, OldLoad, OldOrder, Rest) ->
-    pick_next(Tail, OldLoad, OldOrder, [Load | Rest]).
-
-%%----------------------------------------------------------------------
-%% Func: terminate/2
-%% Purpose: Shutdown the server
-%% Returns: any (ignored by gen_server)
-%%----------------------------------------------------------------------
-terminate(Reason, State) ->
-    mnesia_monitor:terminate_proc(?SERVER_NAME, Reason, State).
-
-%%----------------------------------------------------------------------
-%% Func: code_change/3
-%% Purpose: Upgrade process when its code is to be changed
-%% Returns: {ok, NewState}
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%%----------------------------------------------------------------------
-%%% Internal functions
-%%%----------------------------------------------------------------------
-
-maybe_log_mnesia_down(N) ->
-    %% We use mnesia_down when deciding which tables to load locally,
-    %% so if we are not running (i.e haven't decided which tables
-    %% to load locally), don't log mnesia_down yet.
-    case mnesia_lib:is_running() of
-	yes -> 
-	    verbose("Logging mnesia_down ~w~n", [N]),
-	    mnesia_recover:log_mnesia_down(N),
-	    ok;
-	_ ->	    	    
-	    Filter = fun(Tab) ->
-			     inactive_copy_holders(Tab, N)
-		     end,
-	    HalfLoadedTabs = lists:any(Filter, val({schema, local_tables}) -- [schema]),
-	    if 
-		HalfLoadedTabs == true ->
-		    verbose("Logging mnesia_down ~w~n", [N]),
-		    mnesia_recover:log_mnesia_down(N),
-		    ok;		
-		true ->
-		    %% Unfortunately we have not loaded some common
-		    %% tables yet, so we cannot rely on the nodedown
-		    log_later   %% BUGBUG handle this case!!!
-	    end
-    end.
-
-inactive_copy_holders(Tab, Node) ->
-    Cs = val({Tab, cstruct}),
-    case mnesia_lib:cs_to_storage_type(Node, Cs) of
-	unknown ->
-	    false;
-	_Storage ->
-	    mnesia_lib:not_active_here(Tab)
-    end.
-
-orphan_tables([Tab | Tabs], Node, Ns, Local, Remote) ->
-    Cs = val({Tab, cstruct}),
-    CopyHolders = mnesia_lib:copy_holders(Cs),
-    RamCopyHolders = Cs#cstruct.ram_copies,
-    DiscCopyHolders = CopyHolders -- RamCopyHolders,
-    DiscNodes = val({schema, disc_copies}),
-    LocalContent = Cs#cstruct.local_content,
-    RamCopyHoldersOnDiscNodes = mnesia_lib:intersect(RamCopyHolders, DiscNodes),
-    Active = val({Tab, active_replicas}),
-    case lists:member(Node, DiscCopyHolders) of
-	true when Active == [] ->
-	    case DiscCopyHolders -- Ns of
-		[] ->
-		    %% We're last up and the other nodes have not
-		    %% loaded the table. Lets load it if we are
-		    %% the smallest node.
-		    case lists:min(DiscCopyHolders) of
-			Min when Min == node() ->
-			    case mnesia_recover:get_master_nodes(Tab) of
-				[] ->
-				    L = [Tab | Local],
-				    orphan_tables(Tabs, Node, Ns, L, Remote);
-				Masters ->
-				    R = [{Tab, Masters} | Remote],
-				    orphan_tables(Tabs, Node, Ns, Local, R)
-			    end;
-			_ ->
-			    orphan_tables(Tabs, Node, Ns, Local, Remote)
-		    end;
-		_ ->
-		    orphan_tables(Tabs, Node, Ns, Local, Remote)
-	    end;
-	false when Active == [], DiscCopyHolders == [], RamCopyHoldersOnDiscNodes == [] ->
-	    %% Special case when all replicas resides on disc less nodes
-	    orphan_tables(Tabs, Node, Ns, [Tab | Local], Remote);
-	_ when LocalContent == true ->
-	    orphan_tables(Tabs, Node, Ns, [Tab | Local], Remote);
-	_ ->
-	    orphan_tables(Tabs, Node, Ns, Local, Remote)
-    end;
-orphan_tables([], _, _, LocalOrphans, RemoteMasters) ->
-    {LocalOrphans, RemoteMasters}.
-
-node_has_tabs([Tab | Tabs], Node, State) when Node /= node() ->
-    State2 = update_whereabouts(Tab, Node, State),
-    node_has_tabs(Tabs, Node, State2);
-node_has_tabs([Tab | Tabs], Node, State) ->
-    user_sync_tab(Tab),
-    node_has_tabs(Tabs, Node, State);
-node_has_tabs([], _Node, State) ->
-    State.
-
-update_whereabouts(Tab, Node, State) ->
-    Storage = val({Tab, storage_type}),
-    Read = val({Tab, where_to_read}),
-    LocalC = val({Tab, local_content}),
-    BeingCreated = (?catch_val({Tab, create_table}) == true),
-    Masters = mnesia_recover:get_master_nodes(Tab),
-    ByForce = val({Tab, load_by_force}),
-    GoGetIt =
-	if
-	    ByForce == true ->
-		true;
-	    Masters == [] ->
-		true;
-	    true ->
-		lists:member(Node, Masters)
-	end,
-    
-    dbg_out("Table ~w is loaded on ~w. s=~w, r=~w, lc=~w, f=~w, m=~w~n",
-	    [Tab, Node, Storage, Read, LocalC, ByForce, GoGetIt]),
-    if
-	LocalC == true ->
-	    %% Local contents, don't care about other node
-	    State;
-	Storage == unknown, Read == nowhere ->
-	    %% No own copy, time to read remotely
-	    %% if the other node is a good node
-	    add_active_replica(Tab, Node),
-	    case GoGetIt of
-		true ->
-		    set({Tab, where_to_read}, Node),
-		    user_sync_tab(Tab),
-		    State;
-		false ->
-		    State
-	    end;
-	Storage == unknown ->
-	    %% No own copy, continue to read remotely	    
-	    add_active_replica(Tab, Node),	    
-	    NodeST = mnesia_lib:storage_type_at_node(Node, Tab),
-	    ReadST = mnesia_lib:storage_type_at_node(Read, Tab),
-	    if   %% Avoid reading from disc_only_copies
-		NodeST == disc_only_copies ->
-		    ignore;
-		ReadST == disc_only_copies ->
-		    mnesia_lib:set_remote_where_to_read(Tab);
-		true ->
-		    ignore
-	    end,
-	    user_sync_tab(Tab),
-	    State;
-	BeingCreated == true ->
-	    %% The table is currently being created
-	    %% and we shall have an own copy of it.
-	    %% We will load the (empty) table locally.
-	    add_active_replica(Tab, Node),
-	    State;
-	Read == nowhere ->
-	    %% Own copy, go and get a copy of the table
-	    %% if the other node is master or if there
-	    %% are no master at all
-	    add_active_replica(Tab, Node),
-	    case GoGetIt of
-		true ->
-		    Worker = #net_load{table = Tab,
-				       reason = {active_remote, Node}},
-		    add_worker(Worker, State);
-		false ->
-		    State
-	    end;
-	true ->
-	    %% We already have an own copy
-	    add_active_replica(Tab, Node),
-	    user_sync_tab(Tab),
-	    State
-    end.
-
-initial_safe_loads() ->
-    case val({schema, storage_type}) of
-	ram_copies ->
-	    Downs = [],
-	    Tabs = val({schema, local_tables}) -- [schema],
-	    LastC = fun(T) -> last_consistent_replica(T, Downs) end,
-	    lists:zf(LastC, Tabs);
-	
-	disc_copies ->
-	    Downs = mnesia_recover:get_mnesia_downs(),
-	    dbg_out("mnesia_downs = ~p~n", [Downs]),
-		
-	    Tabs = val({schema, local_tables}) -- [schema],
-	    LastC = fun(T) -> last_consistent_replica(T, Downs) end,
-	    lists:zf(LastC, Tabs)
-    end.
-    
-last_consistent_replica(Tab, Downs) ->
-    Cs = val({Tab, cstruct}),
-    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
-    Ram = Cs#cstruct.ram_copies,
-    Disc = Cs#cstruct.disc_copies,
-    DiscOnly = Cs#cstruct.disc_only_copies,
-    BetterCopies0 = mnesia_lib:remote_copy_holders(Cs) -- Downs,
-    BetterCopies = BetterCopies0 -- Ram,
-    AccessMode = Cs#cstruct.access_mode,
-    Copies = mnesia_lib:copy_holders(Cs),
-    Masters = mnesia_recover:get_master_nodes(Tab),
-    LocalMaster0 = lists:member(node(), Masters),
-    LocalContent = Cs#cstruct.local_content,
-    RemoteMaster =
-	if
-	    Masters == [] -> false;
-	    true -> not LocalMaster0
-	end,
-    LocalMaster =
-	if
-	    Masters == [] -> false;
-	    true -> LocalMaster0
-	end,
-    if
-	Copies == [node()]  ->
-	    %% Only one copy holder and it is local.
-	    %% It may also be a local contents table
-	    {true, {Tab, local_only}};
-	LocalContent == true ->
-	    {true, {Tab, local_content}};
-	LocalMaster == true ->
-	    %% We have a local master
-	    {true, {Tab, local_master}};
-	RemoteMaster == true ->
-	    %% Wait for remote master copy
-	    false;
-	Storage == ram_copies ->
-	    if
-		Disc == [], DiscOnly == [] ->
-		    %% Nobody has copy on disc
-		    {true, {Tab, ram_only}};
-		true ->
-		    %% Some other node has copy on disc
-		    false
-	    end;
-	AccessMode == read_only ->
-	    %% No one has been able to update the table,
-	    %% i.e. all disc resident copies are equal
-	    {true, {Tab, read_only}};
-	BetterCopies /= [], Masters /= [node()] ->
-	    %% There are better copies on other nodes
-	    %% and we do not have the only master copy
-	    false;
-	true ->
-	    {true, {Tab, initial}}
-    end.
-
-reconfigure_tables(N, State, [Tab |Tail]) ->
-    del_active_replica(Tab, N),
-    case val({Tab, where_to_read}) of
-	N ->  mnesia_lib:set_remote_where_to_read(Tab);
-	_ ->  ignore
-    end,
-    LateQ = drop_loaders(Tab, N, State#state.late_loader_queue),
-    reconfigure_tables(N, State#state{late_loader_queue = LateQ}, Tail);
-
-reconfigure_tables(_, State, []) ->
-    State.
-
-remove_early_messages([], _Node) ->
-    [];
-remove_early_messages([{call, {add_active_replica, [_, Node, _, _], _}, _}|R], Node) ->
-    remove_early_messages(R, Node); %% Does a reply before queuing
-remove_early_messages([{call, {block_table, _, From}, ReplyTo}|R], Node) 
-  when node(From) == Node ->
-    reply(ReplyTo, ok),  %% Remove gen:server waits..
-    remove_early_messages(R, Node);
-remove_early_messages([{cast, {i_have_tab, _Tab, Node}}|R], Node) ->
-    remove_early_messages(R, Node);
-remove_early_messages([{cast, {adopt_orphans, Node, _Tabs}}|R], Node) ->
-    remove_early_messages(R, Node);
-remove_early_messages([M|R],Node) ->
-    [M|remove_early_messages(R,Node)].
-
-%% Drop loader from late load queue and possibly trigger a disc_load
-drop_loaders(Tab, Node, [H | T]) when H#late_load.table == Tab ->
-    %% Check if it is time to issue a disc_load request
-    case H#late_load.loaders of
-	[Node] ->
-	    Reason = {H#late_load.reason, last_loader_down, Node},
-	    cast({disc_load, Tab, Reason});  % Ugly cast
-	_ ->
-	    ignore
-    end,
-    %% Drop the node from the list of loaders
-    H2 = H#late_load{loaders = H#late_load.loaders -- [Node]},
-    [H2 | drop_loaders(Tab, Node, T)];
-drop_loaders(Tab, Node, [H | T]) ->
-    [H | drop_loaders(Tab, Node, T)];
-drop_loaders(_, _, []) ->
-    [].
-
-add_active_replica(Tab, Node) ->
-    add_active_replica(Tab, Node, val({Tab, cstruct})).
-
-add_active_replica(Tab, Node, Cs) when record(Cs, cstruct) ->
-    Storage = mnesia_lib:schema_cs_to_storage_type(Node, Cs),
-    AccessMode = Cs#cstruct.access_mode,
-    add_active_replica(Tab, Node, Storage, AccessMode).
-
-%% Block table primitives
-
-block_table(Tab) ->
-    Var = {Tab, where_to_commit},
-    Old = val(Var),
-    New = {blocked, Old},
-    set(Var, New). % where_to_commit
-
-unblock_table(Tab) ->
-    Var = {Tab, where_to_commit},
-    New = 
-	case val(Var) of
-	    {blocked, List} ->
-		List;
-	    List ->
-		List
-	end,
-    set(Var, New). % where_to_commit
-
-is_tab_blocked(W2C) when list(W2C) ->
-    {false, W2C};
-is_tab_blocked({blocked, W2C}) when list(W2C) ->
-    {true, W2C}.
-
-mark_blocked_tab(true, Value) -> 
-    {blocked, Value};
-mark_blocked_tab(false, Value) -> 
-    Value.
-
-%%
-
-add_active_replica(Tab, Node, Storage, AccessMode) ->
-    Var = {Tab, where_to_commit},
-    {Blocked, Old} = is_tab_blocked(val(Var)),
-    Del = lists:keydelete(Node, 1, Old),
-    case AccessMode of
-	read_write ->
-	    New = lists:sort([{Node, Storage} | Del]),
-	    set(Var, mark_blocked_tab(Blocked, New)), % where_to_commit
-	    add({Tab, where_to_write}, Node);
-	read_only ->
-	    set(Var, mark_blocked_tab(Blocked, Del)),
-	    mnesia_lib:del({Tab, where_to_write}, Node)
-    end,
-    add({Tab, active_replicas}, Node).
-
-del_active_replica(Tab, Node) ->
-    Var = {Tab, where_to_commit},
-    {Blocked, Old} = is_tab_blocked(val(Var)),
-    Del = lists:keydelete(Node, 1, Old),
-    New = lists:sort(Del),
-    set(Var, mark_blocked_tab(Blocked, New)),      % where_to_commit
-    mnesia_lib:del({Tab, active_replicas}, Node),
-    mnesia_lib:del({Tab, where_to_write}, Node).
-
-change_table_access_mode(Cs) ->
-    Tab = Cs#cstruct.name,
-    lists:foreach(fun(N) -> add_active_replica(Tab, N, Cs) end,
-		  val({Tab, active_replicas})).
-
-%% node To now has tab loaded, but this must be undone
-%% This code is rpc:call'ed from the tab_copier process
-%% when it has *not* released it's table lock
-unannounce_add_table_copy(Tab, To) ->
-    del_active_replica(Tab, To),
-    case val({Tab , where_to_read}) of
-	To -> 
-	    mnesia_lib:set_remote_where_to_read(Tab);
-	_ ->
-	    ignore
-    end.
-
-user_sync_tab(Tab) ->
-    case val(debug) of
-	trace ->
-	    mnesia_subscr:subscribe(whereis(mnesia_event), {table, Tab});
-	_ ->
-	    ignore
-    end,
-	
-    case erase({sync_tab, Tab}) of
-	undefined ->
-	    ok;
-	Pids ->
-	    lists:foreach(fun(Pid) -> sync_reply(Pid, Tab) end, Pids)
-    end.
-
-i_have_tab(Tab) ->
-    case val({Tab, local_content}) of
-	true ->
-	    mnesia_lib:set_local_content_whereabouts(Tab);
-	false ->
-	    set({Tab, where_to_read}, node())
-    end,
-    add_active_replica(Tab, node()).
-
-sync_and_block_table_whereabouts(Tab, ToNode, RemoteS, AccessMode) when Tab /= schema ->
-    Current = val({current, db_nodes}),
-    Ns = 
-	case lists:member(ToNode, Current) of
-	    true -> Current -- [ToNode];
-	    false -> Current
-	end,   
-    remote_call(ToNode, block_table, [Tab]),
-    [remote_call(Node, add_active_replica, [Tab, ToNode, RemoteS, AccessMode]) ||
-	Node <- [ToNode | Ns]],
-    ok.
-
-sync_del_table_copy_whereabouts(Tab, ToNode) when Tab /= schema ->
-    Current = val({current, db_nodes}),
-    Ns =
-	case lists:member(ToNode, Current) of
-	    true -> Current;
-	    false -> [ToNode | Current]
-	end,
-    Args = [Tab, ToNode],
-    [remote_call(Node, unannounce_add_table_copy, Args) || Node <- Ns],
-    ok.
-
-get_info(Timeout) ->
-    case whereis(?SERVER_NAME) of
-	undefined ->
-	    {timeout, Timeout};
-	Pid ->
-	    Pid ! {self(), get_state},
-	    receive
-		{?SERVER_NAME, State} when record(State, state) ->
-		    {info,State}
-	    after Timeout ->
-		    {timeout, Timeout}
-	    end
-    end.
-
-get_workers(Timeout) ->
-    case whereis(?SERVER_NAME) of
-	undefined ->
-	    {timeout, Timeout};
-	Pid ->
-	    Pid ! {self(), get_state},
-	    receive
-		{?SERVER_NAME, State} when record(State, state) ->
-		    {workers, State#state.loader_pid, State#state.sender_pid, State#state.dumper_pid}
-	    after Timeout ->
-		    {timeout, Timeout}
-	    end
-    end.
-    
-info() ->
-    Tabs = mnesia_lib:local_active_tables(),
-    io:format( "---> Active tables <--- ~n", []),
-    info(Tabs).
-
-info([Tab | Tail]) ->
-    case val({Tab, storage_type}) of
-	disc_only_copies ->
-	    info_format(Tab, 
-			dets:info(Tab, size), 
-			dets:info(Tab, file_size),
-			"bytes on disc");
-	_ ->
-	    info_format(Tab, 
-			?ets_info(Tab, size),
-			?ets_info(Tab, memory),
-			"words of mem")
-    end,
-    info(Tail);
-info([]) -> ok;
-info(Tab) -> info([Tab]).
-
-info_format(Tab, Size, Mem, Media) ->
-    StrT = mnesia_lib:pad_name(atom_to_list(Tab), 15, []),
-    StrS = mnesia_lib:pad_name(integer_to_list(Size), 8, []),
-    StrM = mnesia_lib:pad_name(integer_to_list(Mem), 8, []),
-    io:format("~s: with ~s records occupying ~s ~s~n",
-	      [StrT, StrS, StrM, Media]).
-
-%% Handle early arrived messages
-handle_early_msgs([Msg | Msgs], State) ->
-    %% The messages are in reverse order
-    case handle_early_msg(Msg, State) of
-        {stop, Reason, Reply, State2} ->
-	    {stop, Reason, Reply, State2};
-        {stop, Reason, State2} ->
-	    {stop, Reason, State2};
-	{noreply, State2} ->
-	    handle_early_msgs(Msgs, State2);
-	{noreply, State2, _Timeout} ->
-	    handle_early_msgs(Msgs, State2);
-	Else ->  
-	    dbg_out("handle_early_msgs case clause ~p ~n", [Else]),
-	    erlang:error(Else, [[Msg | Msgs], State])
-    end;
-handle_early_msgs([], State) ->
-    noreply(State).
-
-handle_early_msg({call, Msg, From}, State) ->
-    handle_call(Msg, From, State);
-handle_early_msg({cast, Msg}, State) ->
-    handle_cast(Msg, State);
-handle_early_msg({info, Msg}, State) ->
-    handle_info(Msg, State).
-    
-noreply(State) ->
-    {noreply, State}.
-
-reply(undefined, Reply) ->
-    Reply;
-reply(ReplyTo, Reply) ->
-    gen_server:reply(ReplyTo, Reply),
-    Reply.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Worker management
-
-%% Returns new State
-add_worker(Worker, State) when record(Worker, dump_log) ->
-    InitBy = Worker#dump_log.initiated_by,
-    Queue = State#state.dumper_queue,
-    case lists:keymember(InitBy, #dump_log.initiated_by, Queue) of
-	false ->
-	    ignore;
-	true when Worker#dump_log.opt_reply_to == undefined ->
-	    %% The same threshold has been exceeded again,
-	    %% before we have had the possibility to
-	    %% process the older one.
-	    DetectedBy = {dump_log, InitBy},
-	    Event = {mnesia_overload, DetectedBy},
-	    mnesia_lib:report_system_event(Event)
-    end,
-    Queue2 = Queue ++ [Worker],
-    State2 = State#state{dumper_queue = Queue2},
-    opt_start_worker(State2);
-add_worker(Worker, State) when record(Worker, schema_commit_lock) ->
-    Queue = State#state.dumper_queue,
-    Queue2 = Queue ++ [Worker],
-    State2 = State#state{dumper_queue = Queue2},
-    opt_start_worker(State2);
-add_worker(Worker, State) when record(Worker, net_load) ->
-    Queue = State#state.loader_queue,
-    State2 = State#state{loader_queue = Queue ++ [Worker]},
-    opt_start_worker(State2);
-add_worker(Worker, State) when record(Worker, send_table) ->
-    Queue = State#state.sender_queue,
-    State2 = State#state{sender_queue = Queue ++ [Worker]},
-    opt_start_worker(State2);
-add_worker(Worker, State) when record(Worker, disc_load) ->
-    Queue = State#state.loader_queue,
-    State2 = State#state{loader_queue = Queue ++ [Worker]},
-    opt_start_worker(State2);
-% Block controller should be used for upgrading mnesia.
-add_worker(Worker, State) when record(Worker, block_controller) -> 
-    Queue = State#state.dumper_queue,
-    Queue2 = [Worker | Queue],
-    State2 = State#state{dumper_queue = Queue2},
-    opt_start_worker(State2).
-
-%% Optionally start a worker
-%% 
-%% Dumpers and loaders may run simultaneously
-%% but neither of them may run during schema commit.
-%% Loaders may not start if a schema commit is enqueued.
-opt_start_worker(State) when State#state.is_stopping == true ->
-    State;
-opt_start_worker(State) ->
-    %% Prioritize dumper and schema commit
-    %% by checking them first
-    case State#state.dumper_queue of
-	[Worker | _Rest] when State#state.dumper_pid == undefined ->
-	    %% Great, a worker in queue and neither
-	    %% a schema transaction is being
-	    %% committed and nor a dumper is running
-		    
-	    %% Start worker but keep him in the queue
-	    if
-		record(Worker, schema_commit_lock) ->
-		    ReplyTo = Worker#schema_commit_lock.owner,
-		    reply(ReplyTo, granted),
-		    {Owner, _Tag} = ReplyTo,
-		    State#state{dumper_pid = Owner};
-		
-		record(Worker, dump_log) ->
-		    Pid = spawn_link(?MODULE, dump_and_reply, [self(), Worker]),
-		    State2 = State#state{dumper_pid = Pid},
-
-		    %% If the worker was a dumper we may
-		    %% possibly be able to start a loader
-		    %% or sender
-		    State3 = opt_start_sender(State2),
-		    opt_start_loader(State3);
-		
-		record(Worker, block_controller) ->
-		    case {State#state.sender_pid, State#state.loader_pid} of
-			{undefined, undefined} ->
-			    ReplyTo = Worker#block_controller.owner,
-			    reply(ReplyTo, granted),
-			    {Owner, _Tag} = ReplyTo,
-			    State#state{dumper_pid = Owner};
-			_ ->
-			    State
-		    end
-	    end;
-	_ ->
-	    %% Bad luck, try with a loader or sender instead 
-	    State2 = opt_start_sender(State),
-	    opt_start_loader(State2)
-    end.
-
-opt_start_sender(State) ->
-    case State#state.sender_queue of
-	[]->
-	    %% No need
-	    State;
-
-	_ when State#state.sender_pid /= undefined ->
-	    %% Bad luck, a sender is already running
-	    State;
-	
-	[Sender | _SenderRest] ->
-	    case State#state.loader_queue of
-		[Loader | _LoaderRest]
-		when State#state.loader_pid /= undefined,
-		     Loader#net_load.table == Sender#send_table.table ->
-		    %% A conflicting loader is running
-		    State;
-		_ ->
-		    SchemaQueue = State#state.dumper_queue,
-		    case lists:keymember(schema_commit, 1, SchemaQueue) of
-			false ->
-
-			    %% Start worker but keep him in the queue
-			    Pid = spawn_link(?MODULE, send_and_reply,
-					     [self(), Sender]),
-			    State#state{sender_pid = Pid};
-			true ->
-			    %% Bad luck, we must wait for the schema commit
-			    State
-		    end
-	    end
-    end.
-
-opt_start_loader(State) ->
-    LoaderQueue = State#state.loader_queue,
-    if
-	LoaderQueue == [] ->
-	    %% No need
-	    State;
-
-	State#state.loader_pid /= undefined ->
-	    %% Bad luck, an loader is already running
-	    State;
-	
-	true ->
-	    SchemaQueue = State#state.dumper_queue,
-	    case lists:keymember(schema_commit, 1, SchemaQueue) of
-		false ->
-		    {Worker, Rest} = pick_next(LoaderQueue),
-
-		    %% Start worker but keep him in the queue
-		    Pid = spawn_link(?MODULE, load_and_reply, [self(), Worker]),
-		    State#state{loader_pid = Pid,
-				loader_queue = [Worker | Rest]};
-		true ->
-		    %% Bad luck, we must wait for the schema commit
-		    State
-	    end
-    end.
-
-start_remote_sender(Node, Tab, Receiver, Storage) ->
-    Msg = #send_table{table = Tab,
-		      receiver_pid = Receiver,
-		      remote_storage = Storage},
-    gen_server:cast({?SERVER_NAME, Node}, Msg).
-
-dump_and_reply(ReplyTo, Worker) ->
-    %% No trap_exit, die intentionally instead
-    Res = mnesia_dumper:opt_dump_log(Worker#dump_log.initiated_by),
-    ReplyTo ! #dumper_done{worker_pid = self(),
-			   worker_res = Res},
-    unlink(ReplyTo),
-    exit(normal).
-
-send_and_reply(ReplyTo, Worker) ->
-    %% No trap_exit, die intentionally instead
-    Res = mnesia_loader:send_table(Worker#send_table.receiver_pid,
-				   Worker#send_table.table,
-				   Worker#send_table.remote_storage),
-    ReplyTo ! #sender_done{worker_pid = self(),
-			   worker_res = Res},
-    unlink(ReplyTo),
-    exit(normal).
-
-
-load_and_reply(ReplyTo, Worker) ->
-    process_flag(trap_exit, true),
-    Done = load_table(Worker),
-    ReplyTo ! Done#loader_done{worker_pid = self()},
-    unlink(ReplyTo),
-    exit(normal).
-
-%% Now it is time to load the table
-%% but first we must check if it still is neccessary
-load_table(Load) when record(Load, net_load) ->
-    Tab = Load#net_load.table,
-    ReplyTo = Load#net_load.opt_reply_to,
-    Reason =  Load#net_load.reason,
-    LocalC = val({Tab, local_content}),
-    AccessMode = val({Tab, access_mode}),
-    ReadNode = val({Tab, where_to_read}),
-    Active = filter_active(Tab),
-    Done = #loader_done{is_loaded = true,
-			table_name = Tab,
-			needs_announce = false,
-			needs_sync = false,
-			needs_reply = true,
-			reply_to = ReplyTo,
-			reply = {loaded, ok}
-		       },
-    if
-	ReadNode == node() ->
-	    %% Already loaded locally
-	    Done;
-	LocalC == true ->
-	    Res = mnesia_loader:disc_load_table(Tab, load_local_content),
-	    Done#loader_done{reply = Res, needs_announce = true, needs_sync = true};
-	AccessMode == read_only ->
-	    disc_load_table(Tab, Reason, ReplyTo);
-	true ->
-	    %% Either we cannot read the table yet
-	    %% or someone is moving a replica between
-	    %% two nodes
-	    Cs =  Load#net_load.cstruct,
-	    Res = mnesia_loader:net_load_table(Tab, Reason, Active, Cs),
-	    case Res of
-		{loaded, ok} ->
-		    Done#loader_done{needs_sync = true,
-				     reply = Res};
-		{not_loaded, storage_unknown} ->
-		    Done#loader_done{reply = Res};
-		{not_loaded, _} ->
-		    Done#loader_done{is_loaded = false,
-				     needs_reply = false,
-				     reply = Res}
-	    end
-    end;
-
-load_table(Load) when record(Load, disc_load) ->
-    Tab = Load#disc_load.table,
-    Reason =  Load#disc_load.reason,
-    ReplyTo = Load#disc_load.opt_reply_to,
-    ReadNode = val({Tab, where_to_read}),
-    Active = filter_active(Tab),
-    Done = #loader_done{is_loaded = true,
-			table_name = Tab,
-			needs_announce = false,
-			needs_sync = false,
-			needs_reply = false
-		       },
-    if
-	Active == [], ReadNode == nowhere ->
-	    %% Not loaded anywhere, lets load it from disc
-	    disc_load_table(Tab, Reason, ReplyTo);
-	ReadNode == nowhere ->
-	    %% Already loaded on other node, lets get it
-	    Cs = val({Tab, cstruct}),
-	    case mnesia_loader:net_load_table(Tab, Reason, Active, Cs) of
-		{loaded, ok} ->
-		    Done#loader_done{needs_sync = true};
-		{not_loaded, storage_unknown} ->
-		    Done#loader_done{is_loaded = false};
-		{not_loaded, ErrReason} ->
-		    Done#loader_done{is_loaded = false,
-				     reply = {not_loaded,ErrReason}}
-	    end;
-	true ->
-	    %% Already readable, do not worry be happy
-	    Done
-    end.
-
-disc_load_table(Tab, Reason, ReplyTo) ->
-    Done = #loader_done{is_loaded = true,
-			table_name = Tab,
-			needs_announce = false,
-			needs_sync = false,
-			needs_reply = true,
-			reply_to = ReplyTo,
-			reply = {loaded, ok}
-		       },
-    Res = mnesia_loader:disc_load_table(Tab, Reason),
-    if
-	Res == {loaded, ok} ->
-	    Done#loader_done{needs_announce = true,
-			     needs_sync = true,
-			     reply = Res};
-	ReplyTo /= undefined ->
-	    Done#loader_done{is_loaded = false,
-			     reply = Res};
-	true ->
-	    fatal("Cannot load table ~p from disc: ~p~n", [Tab, Res])
-    end.
-
-filter_active(Tab) ->
-    ByForce = val({Tab, load_by_force}),
-    Active = val({Tab, active_replicas}),
-    Masters = mnesia_recover:get_master_nodes(Tab),
-    do_filter_active(ByForce, Active, Masters).
-
-do_filter_active(true, Active, _Masters) ->
-    Active;
-do_filter_active(false, Active, []) ->
-    Active;
-do_filter_active(false, Active, Masters) ->
-    mnesia_lib:intersect(Active, Masters).
-    
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_dumper.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_dumper.erl
deleted file mode 100644
index bbdb04589b..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_dumper.erl
+++ /dev/null
@@ -1,1092 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_dumper.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%
--module(mnesia_dumper).
-
-%% The InitBy arg may be one of the following:
-%% scan_decisions     Initial scan for decisions
-%% startup	      Initial dump during startup
-%% schema_prepare     Dump initiated during schema transaction preparation
-%% schema_update      Dump initiated during schema transaction commit
-%% fast_schema_update A schema_update, but ignores the log file
-%% user		      Dump initiated by user
-%% write_threshold    Automatic dump caused by too many log writes
-%% time_threshold     Automatic dump caused by timeout
-
-%% Public interface
--export([
-	 get_log_writes/0,
-	 incr_log_writes/0,
-	 raw_dump_table/2,
-	 raw_named_dump_table/2,
-	 start_regulator/0,
-	 opt_dump_log/1,
-	 update/3
-	]).
-
- %% Internal stuff
--export([regulator_init/1]).
-	
--include("mnesia.hrl").
--include_lib("kernel/include/file.hrl").
-
--import(mnesia_lib, [fatal/2, dbg_out/2]).
-
--define(REGULATOR_NAME, mnesia_dumper_load_regulator).
--define(DumpToEtsMultiplier, 4).
-
--record(state, {initiated_by = nobody,
-		dumper = nopid,
-		regulator_pid,
-		supervisor_pid,
-		queue = [],
-		timeout}).
-
-get_log_writes() ->
-    Max = mnesia_monitor:get_env(dump_log_write_threshold),
-    Prev = mnesia_lib:read_counter(trans_log_writes),
-    Left = mnesia_lib:read_counter(trans_log_writes_left),
-    Diff = Max - Left,
-    Prev + Diff.
-
-incr_log_writes() ->
-    Left = mnesia_lib:incr_counter(trans_log_writes_left, -1),
-    if
-	Left > 0 ->
-	    ignore;
-	true ->
-	    adjust_log_writes(true)
-    end.
-
-adjust_log_writes(DoCast) ->
-    Token = {mnesia_adjust_log_writes, self()},
-    case global:set_lock(Token, [node()], 1) of 
-	false ->
-	    ignore; %% Somebody else is sending a dump request
-	true -> 
-	    case DoCast of 
-		false ->
-		    ignore;
-		true -> 
-		    mnesia_controller:async_dump_log(write_threshold)
-	    end,
-	    Max = mnesia_monitor:get_env(dump_log_write_threshold),
-	    Left = mnesia_lib:read_counter(trans_log_writes_left),
-	    %% Don't care if we lost a few writes
-	    mnesia_lib:set_counter(trans_log_writes_left, Max),
-	    Diff = Max - Left,
-	    mnesia_lib:incr_counter(trans_log_writes, Diff),
-	    global:del_lock(Token, [node()])
-    end.
-
-%% Returns 'ok' or exits
-opt_dump_log(InitBy) ->
-    Reg = case whereis(?REGULATOR_NAME) of
-	      undefined ->
-		  nopid; 
-	      Pid when pid(Pid) ->
-		  Pid 
-	  end,
-    perform_dump(InitBy, Reg).
-
-%% Scan for decisions
-perform_dump(InitBy, Regulator) when InitBy == scan_decisions ->
-    ?eval_debug_fun({?MODULE, perform_dump}, [InitBy]),
-    
-    dbg_out("Transaction log dump initiated by ~w~n", [InitBy]),
-    scan_decisions(mnesia_log:previous_log_file(), InitBy, Regulator),
-    scan_decisions(mnesia_log:latest_log_file(), InitBy, Regulator);
-
-%% Propagate the log into the DAT-files
-perform_dump(InitBy, Regulator) ->
-    ?eval_debug_fun({?MODULE, perform_dump}, [InitBy]),
-    LogState = mnesia_log:prepare_log_dump(InitBy),
-    dbg_out("Transaction log dump initiated by ~w: ~w~n",
-	    [InitBy, LogState]), 
-    adjust_log_writes(false),    
-    mnesia_recover:allow_garb(),
-    case LogState of
-	already_dumped ->
-	    dumped;
-	{needs_dump, Diff} ->
-	    U = mnesia_monitor:get_env(dump_log_update_in_place),
-	    Cont = mnesia_log:init_log_dump(),
-	    case catch do_perform_dump(Cont, U, InitBy, Regulator, undefined) of
-		ok ->
-		    ?eval_debug_fun({?MODULE, post_dump}, [InitBy]),
-		    case mnesia_monitor:use_dir() of
-			true ->
-			    mnesia_recover:dump_decision_tab();
-			false ->
-			    mnesia_log:purge_some_logs()
-		    end,
-		    %% And now to the crucial point...
-		    mnesia_log:confirm_log_dump(Diff);
-		{error, Reason} ->
-		    {error, Reason};
- 		{'EXIT', {Desc, Reason}} ->
-		    case mnesia_monitor:get_env(auto_repair) of
-			true ->
-			    mnesia_lib:important(Desc, Reason),
-			    %% Ignore rest of the log
-			    mnesia_log:confirm_log_dump(Diff);
-			false -> 
-			    fatal(Desc, Reason)
-		    end
-	    end;
-	{error, Reason} ->
-	    {error, {"Cannot prepare log dump", Reason}}
-    end.
-
-scan_decisions(Fname, InitBy, Regulator) ->
-    Exists = mnesia_lib:exists(Fname),
-    case Exists of
-	false ->
-	    ok;
-	true ->
-	    Header = mnesia_log:trans_log_header(),
-	    Name = previous_log,
-	    mnesia_log:open_log(Name, Header, Fname, Exists,
-				mnesia_monitor:get_env(auto_repair), read_only),
-	    Cont = start,
-	    Res = (catch do_perform_dump(Cont, false, InitBy, Regulator, undefined)),
-	    mnesia_log:close_log(Name),
-	    case Res of
-		ok -> ok;
-		{'EXIT', Reason} -> {error, Reason}
-	    end
-    end.
-
-do_perform_dump(Cont, InPlace, InitBy, Regulator, OldVersion) ->
-    case mnesia_log:chunk_log(Cont) of
-	{C2, Recs} ->
-	    case catch insert_recs(Recs, InPlace, InitBy, Regulator, OldVersion) of
-		{'EXIT', R} ->
-		    Reason = {"Transaction log dump error: ~p~n", [R]},
-		    close_files(InPlace, {error, Reason}, InitBy),
-		    exit(Reason);
-		Version ->
-		    do_perform_dump(C2, InPlace, InitBy, Regulator, Version)
-	    end;
-	eof ->
-	    close_files(InPlace, ok, InitBy),
-	    ok
-    end.
-
-insert_recs([Rec | Recs], InPlace, InitBy, Regulator, LogV) ->
-    regulate(Regulator),
-    case insert_rec(Rec, InPlace, InitBy, LogV) of
- 	LogH when record(LogH, log_header) ->	    
-	    insert_recs(Recs, InPlace, InitBy, Regulator, LogH#log_header.log_version);
-	_ -> 
-	    insert_recs(Recs, InPlace, InitBy, Regulator, LogV)
-    end;
-
-insert_recs([], _InPlace, _InitBy, _Regulator, Version) ->
-    Version.
-
-insert_rec(Rec, _InPlace, scan_decisions, _LogV) ->
-    if 
-	record(Rec, commit) ->
-	    ignore;
-	record(Rec, log_header) ->
-	    ignore;
-	true ->
-	    mnesia_recover:note_log_decision(Rec, scan_decisions)
-    end;
-insert_rec(Rec, InPlace, InitBy, LogV) when record(Rec, commit) ->
-    %% Determine the Outcome of the transaction and recover it
-    D = Rec#commit.decision,
-    case mnesia_recover:wait_for_decision(D, InitBy) of
-	{Tid, committed} ->
-	    do_insert_rec(Tid, Rec, InPlace, InitBy, LogV);
-	{Tid, aborted} ->
-	    mnesia_schema:undo_prepare_commit(Tid, Rec)
-    end;
-insert_rec(H, _InPlace, _InitBy, _LogV) when record(H, log_header) ->
-    CurrentVersion = mnesia_log:version(),
-    if
-        H#log_header.log_kind /= trans_log ->
-	    exit({"Bad kind of transaction log", H});
-	H#log_header.log_version == CurrentVersion ->
-	    ok; 
-	H#log_header.log_version == "4.2" ->
-	    ok;
-	H#log_header.log_version == "4.1" ->
-	    ok;
-	H#log_header.log_version == "4.0" ->
-	    ok;
-	true ->
-	    fatal("Bad version of transaction log: ~p~n", [H])
-    end,
-    H;
-
-insert_rec(_Rec, _InPlace, _InitBy, _LogV) ->
-    ok.
-
-do_insert_rec(Tid, Rec, InPlace, InitBy, LogV) ->
-    case Rec#commit.schema_ops of
-	[] ->
-	    ignore;
-	SchemaOps ->
-	    case val({schema, storage_type}) of 
-		ram_copies -> 
-		    insert_ops(Tid, schema_ops, SchemaOps, InPlace, InitBy, LogV);
-	        Storage ->
-		    true = open_files(schema, Storage, InPlace, InitBy),
-		    insert_ops(Tid, schema_ops, SchemaOps, InPlace, InitBy, LogV)
-	    end
-    end,
-    D = Rec#commit.disc_copies,
-    insert_ops(Tid, disc_copies, D, InPlace, InitBy, LogV),
-    case InitBy of
-	startup ->
-	    DO = Rec#commit.disc_only_copies,
-	    insert_ops(Tid, disc_only_copies, DO, InPlace, InitBy, LogV);
-	_ ->
-	    ignore
-    end.
-    
-
-update(_Tid, [], _DumperMode) ->
-    dumped;
-update(Tid, SchemaOps, DumperMode) ->
-    UseDir = mnesia_monitor:use_dir(),
-    Res = perform_update(Tid, SchemaOps, DumperMode, UseDir),    
-    mnesia_controller:release_schema_commit_lock(),
-    Res.
-
-perform_update(_Tid, _SchemaOps, mandatory, true) ->
-    %% Force a dump of the transaction log in order to let the
-    %% dumper perform needed updates
-
-    InitBy = schema_update,
-    ?eval_debug_fun({?MODULE, dump_schema_op}, [InitBy]),    
-    opt_dump_log(InitBy);
-perform_update(Tid, SchemaOps, _DumperMode, _UseDir) ->
-    %% No need for a full transaction log dump.
-    %% Ignore the log file and perform only perform
-    %% the corresponding updates.
-
-    InitBy = fast_schema_update, 
-    InPlace = mnesia_monitor:get_env(dump_log_update_in_place),
-    ?eval_debug_fun({?MODULE, dump_schema_op}, [InitBy]),
-    case catch insert_ops(Tid, schema_ops, SchemaOps, InPlace, InitBy, 
-			  mnesia_log:version()) of
-	{'EXIT', Reason} ->
-	    Error = {error, {"Schema update error", Reason}},
-	    close_files(InPlace, Error, InitBy),
-            fatal("Schema update error ~p ~p", [Reason, SchemaOps]);
-	_ ->		    
-	    ?eval_debug_fun({?MODULE, post_dump}, [InitBy]),
-	    close_files(InPlace, ok, InitBy),
-	    ok
-    end.
-
-insert_ops(_Tid, _Storage, [], _InPlace, _InitBy, _) ->    ok;
-insert_ops(Tid, Storage, [Op], InPlace, InitBy, Ver)  when Ver >= "4.3"->
-    insert_op(Tid, Storage, Op, InPlace, InitBy),
-    ok;
-insert_ops(Tid, Storage, [Op | Ops], InPlace, InitBy, Ver)  when Ver >= "4.3"->
-    insert_op(Tid, Storage, Op, InPlace, InitBy),
-    insert_ops(Tid, Storage, Ops, InPlace, InitBy, Ver);
-insert_ops(Tid, Storage, [Op | Ops], InPlace, InitBy, Ver) when Ver < "4.3" ->
-    insert_ops(Tid, Storage, Ops, InPlace, InitBy, Ver),
-    insert_op(Tid, Storage, Op, InPlace, InitBy).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Normal ops
-
-disc_insert(_Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy) ->
-    case open_files(Tab, Storage, InPlace, InitBy) of
-	true ->
-	    case Storage of 
-		disc_copies when Tab /= schema ->
-		    mnesia_log:append({?MODULE,Tab}, {{Tab, Key}, Val, Op}),
-		    ok;
-		_ ->
-		    case Op of
-			write ->
-			    ok = dets:insert(Tab, Val);
-			delete ->
-			    ok = dets:delete(Tab, Key);
-			update_counter ->
-			    {RecName, Incr} = Val,
-			    case catch dets:update_counter(Tab, Key, Incr) of
-				CounterVal when integer(CounterVal) ->
-				    ok;
-				_ ->
-				    Zero = {RecName, Key, 0},
-				    ok = dets:insert(Tab, Zero)
-			    end;
-			delete_object ->
-			    ok = dets:delete_object(Tab, Val);
-			clear_table ->
-			    ok = dets:match_delete(Tab, '_')
-		    end
-	    end;
-	false ->
-	    ignore
-    end.
-
-insert(Tid, Storage, Tab, Key, [Val | Tail], Op, InPlace, InitBy) ->
-    insert(Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy),
-    insert(Tid, Storage, Tab, Key, Tail, Op, InPlace, InitBy);
-
-insert(_Tid, _Storage, _Tab, _Key, [], _Op, _InPlace, _InitBy) ->
-    ok;
-    
-insert(Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy) ->
-    Item = {{Tab, Key}, Val, Op},
-    case InitBy of
-	startup ->
-	    disc_insert(Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy);
-
-	_ when Storage == ram_copies ->
-	    mnesia_tm:do_update_op(Tid, Storage, Item),
-	    Snmp = mnesia_tm:prepare_snmp(Tab, Key, [Item]),
-	    mnesia_tm:do_snmp(Tid, Snmp);
-
-	_ when Storage == disc_copies ->
-	    disc_insert(Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy),
-	    mnesia_tm:do_update_op(Tid, Storage, Item),
-	    Snmp = mnesia_tm:prepare_snmp(Tab, Key, [Item]),
-	    mnesia_tm:do_snmp(Tid, Snmp);
-
-	_ when Storage == disc_only_copies ->
-	    mnesia_tm:do_update_op(Tid, Storage, Item),
-	    Snmp = mnesia_tm:prepare_snmp(Tab, Key, [Item]),
-	    mnesia_tm:do_snmp(Tid, Snmp);
-
-	_ when Storage == unknown ->
-	    ignore
-    end.
-
-disc_delete_table(Tab, Storage) ->
-    case mnesia_monitor:use_dir() of
-	true ->
-	    if 		
-		Storage == disc_only_copies; Tab == schema ->  
-		    mnesia_monitor:unsafe_close_dets(Tab),
-		    Dat = mnesia_lib:tab2dat(Tab),
-		    file:delete(Dat);		
-		true -> 
-		    DclFile = mnesia_lib:tab2dcl(Tab),
-		    case get({?MODULE,Tab}) of
-			{opened_dumper, dcl} ->
-			    del_opened_tab(Tab),
-			    mnesia_log:unsafe_close_log(Tab);
-			_ -> 
-			    ok
-		    end,
-		    file:delete(DclFile),
-		    DcdFile = mnesia_lib:tab2dcd(Tab),
-		    file:delete(DcdFile),
-		    ok
-	    end,
-	    erase({?MODULE, Tab});
-	false ->
-	    ignore
-    end.
-
-disc_delete_indecies(_Tab, _Cs, Storage) when Storage /= disc_only_copies ->
-    ignore;
-disc_delete_indecies(Tab, Cs, disc_only_copies) ->
-    Indecies = Cs#cstruct.index,
-    mnesia_index:del_transient(Tab, Indecies, disc_only_copies).
-
-insert_op(Tid, Storage, {{Tab, Key}, Val, Op}, InPlace, InitBy) ->
-    %% Propagate to disc only
-    disc_insert(Tid, Storage, Tab, Key, Val, Op, InPlace, InitBy);
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% NOTE that all operations below will only
-%% be performed if the dump is initiated by
-%% startup or fast_schema_update
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-insert_op(_Tid, schema_ops, _OP, _InPlace, Initby)
-  when Initby /= startup,
-       Initby /= fast_schema_update,
-       Initby /= schema_update -> 
-    ignore;
-
-insert_op(Tid, _, {op, rec, Storage, Item}, InPlace, InitBy) ->
-    {{Tab, Key}, ValList, Op} = Item,
-    insert(Tid, Storage, Tab, Key, ValList, Op, InPlace, InitBy);
-
-insert_op(Tid, _, {op, change_table_copy_type, N, FromS, ToS, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    Val = mnesia_schema:insert_cstruct(Tid, Cs, true), % Update ram only
-    {schema, Tab, _} = Val,
-    if
-	InitBy /= startup ->
-	    mnesia_controller:add_active_replica(Tab, N, Cs);
-	true ->
-	    ignore
-    end,
-    if  
-	N == node() ->
-	    Dmp  = mnesia_lib:tab2dmp(Tab),
-	    Dat  = mnesia_lib:tab2dat(Tab),
-	    Dcd  = mnesia_lib:tab2dcd(Tab),
-	    Dcl  = mnesia_lib:tab2dcl(Tab),
-	    case {FromS, ToS} of
-		{ram_copies, disc_copies} when Tab == schema ->
-		    ok = ensure_rename(Dmp, Dat);
-		{ram_copies, disc_copies} ->
-		    file:delete(Dcl),
-		    ok = ensure_rename(Dmp, Dcd);
-		{disc_copies, ram_copies} when Tab == schema ->
-		    mnesia_lib:set(use_dir, false),
-		    mnesia_monitor:unsafe_close_dets(Tab),
-		    file:delete(Dat);
-		{disc_copies, ram_copies} ->
-		    file:delete(Dcl),
-		    file:delete(Dcd);
-		{ram_copies, disc_only_copies} ->
-		    ok = ensure_rename(Dmp, Dat),
-		    true = open_files(Tab, disc_only_copies, InPlace, InitBy),
-		    %% ram_delete_table must be done before init_indecies,
-		    %% it uses info which is reset in init_indecies,
-		    %% it doesn't matter, because init_indecies don't use 
-		    %% the ram replica of the table when creating the disc 
-		    %% index; Could be improved :)
-		    mnesia_schema:ram_delete_table(Tab, FromS),
-		    PosList = Cs#cstruct.index,
-		    mnesia_index:init_indecies(Tab, disc_only_copies, PosList);
-		{disc_only_copies, ram_copies} ->
-		    mnesia_monitor:unsafe_close_dets(Tab),
-		    disc_delete_indecies(Tab, Cs, disc_only_copies),
-		    case InitBy of 
-			startup -> 
-			    ignore;
-			_ -> 
-			    mnesia_controller:get_disc_copy(Tab)
-		    end,
-		    disc_delete_table(Tab, disc_only_copies);
-		{disc_copies, disc_only_copies} ->
-		    ok = ensure_rename(Dmp, Dat),
-		    true = open_files(Tab, disc_only_copies, InPlace, InitBy),
-		    mnesia_schema:ram_delete_table(Tab, FromS), 
-		    PosList = Cs#cstruct.index,
-		    mnesia_index:init_indecies(Tab, disc_only_copies, PosList),
-		    file:delete(Dcl),
-		    file:delete(Dcd);
-		{disc_only_copies, disc_copies} ->
-		    mnesia_monitor:unsafe_close_dets(Tab),
-		    disc_delete_indecies(Tab, Cs, disc_only_copies),
-		    case InitBy of 
-			startup -> 
-			    ignore;
-			_ ->
-			    mnesia_log:ets2dcd(Tab),
-			    mnesia_controller:get_disc_copy(Tab),
-			    disc_delete_table(Tab, disc_only_copies)
-		    end
-	    end;
-	true ->
-	    ignore
-    end,
-    S = val({schema, storage_type}),
-    disc_insert(Tid, S, schema, Tab, Val, write, InPlace, InitBy);
-
-insert_op(Tid, _, {op, transform, _Fun, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    case mnesia_lib:cs_to_storage_type(node(), Cs) of
-	disc_copies -> 
-	    open_dcl(Cs#cstruct.name);
-	_ ->
-	    ignore
-    end,
-    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
-
-%%%  Operations below this are handled without using the logg.
-
-insert_op(Tid, _, {op, restore_recreate, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    Type = Cs#cstruct.type,
-    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
-    %% Delete all possbibly existing files and tables
-    disc_delete_table(Tab, Storage),
-    disc_delete_indecies(Tab, Cs, Storage),
-    case InitBy of
-	startup ->
-	    ignore;
-	_ ->
-	    mnesia_schema:ram_delete_table(Tab, Storage),
-	    mnesia_checkpoint:tm_del_copy(Tab, node())
-    end,
-    %%    delete_cstruct(Tid, Cs, InPlace, InitBy),     
-    %% And create new ones..
-    if
-	(InitBy == startup) or (Storage == unknown) ->
-	    ignore;	
-	Storage == ram_copies ->
-	    Args = [{keypos, 2}, public, named_table, Type],
-	    mnesia_monitor:mktab(Tab, Args);
-	Storage == disc_copies ->
-	    Args = [{keypos, 2}, public, named_table, Type],
-	    mnesia_monitor:mktab(Tab, Args),
-	    File = mnesia_lib:tab2dcd(Tab),	    
-	    FArg = [{file, File}, {name, {mnesia,create}}, 
-		    {repair, false}, {mode, read_write}],
-	    {ok, Log} = mnesia_monitor:open_log(FArg),
-	    mnesia_monitor:unsafe_close_log(Log);
-	Storage == disc_only_copies ->
-	    File = mnesia_lib:tab2dat(Tab),
-	    file:delete(File),
-	    Args = [{file, mnesia_lib:tab2dat(Tab)},
-		    {type, mnesia_lib:disk_type(Tab, Type)},
-		    {keypos, 2},
-		    {repair, mnesia_monitor:get_env(auto_repair)}],
-	    mnesia_monitor:open_dets(Tab, Args)
-    end,
-    insert_op(Tid, ignore, {op, create_table, TabDef}, InPlace, InitBy);
-
-insert_op(Tid, _, {op, create_table, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    insert_cstruct(Tid, Cs, false, InPlace, InitBy),
-    Tab = Cs#cstruct.name,
-    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
-    case InitBy of
-	startup ->
-	    case Storage of
-		unknown ->
-		    ignore;
-		ram_copies ->
-		    ignore;
-		disc_copies ->
-		    Dcd = mnesia_lib:tab2dcd(Tab),
-		    case mnesia_lib:exists(Dcd) of  
-			true -> ignore;
-			false ->
-			    mnesia_log:open_log(temp, 
-						mnesia_log:dcl_log_header(),
-						Dcd, 
-						false, 
-						false,
-						read_write),
-			    mnesia_log:unsafe_close_log(temp)
-		    end;
-		_ ->
-		    Args = [{file, mnesia_lib:tab2dat(Tab)},
-			    {type, mnesia_lib:disk_type(Tab, Cs#cstruct.type)},
-			    {keypos, 2},
-			    {repair, mnesia_monitor:get_env(auto_repair)}],
-		    case mnesia_monitor:open_dets(Tab, Args) of
-			{ok, _} ->
-			    mnesia_monitor:unsafe_close_dets(Tab);
-			{error, Error} ->
-			    exit({"Failed to create dets table", Error})
-		    end
-	    end;
-	_ ->
-	    Copies = mnesia_lib:copy_holders(Cs),
-	    Active = mnesia_lib:intersect(Copies, val({current, db_nodes})),
-	    [mnesia_controller:add_active_replica(Tab, N, Cs) || N <- Active],
-
-	    case Storage of
-		unknown ->
-		    case Cs#cstruct.local_content of
-			true ->
-			    ignore;
-			false ->
-			    mnesia_lib:set_remote_where_to_read(Tab)
-		    end;
-		_ ->
-		    case Cs#cstruct.local_content of
-			true ->
-			    mnesia_lib:set_local_content_whereabouts(Tab);
-			false ->
-			    mnesia_lib:set({Tab, where_to_read}, node())
-		    end,
-		    case Storage of
-			ram_copies ->
-			    ignore;
-			_ ->
-			    %% Indecies are still created by loader
-			    disc_delete_indecies(Tab, Cs, Storage)
-			    %% disc_delete_table(Tab, Storage)
-		    end,
-
-		    %% Update whereabouts and create table
-		    mnesia_controller:create_table(Tab)
-	    end
-    end;
-
-insert_op(_Tid, _, {op, dump_table, Size, TabDef}, _InPlace, _InitBy) ->
-    case Size of
-	unknown ->
-	    ignore;
-	_ ->
-	    Cs = mnesia_schema:list2cs(TabDef),
-	    Tab = Cs#cstruct.name,
-	    Dmp = mnesia_lib:tab2dmp(Tab),
-	    Dat = mnesia_lib:tab2dcd(Tab),
-	    case Size of
-		0 ->
-	    	    %% Assume that table files already are closed
-		    file:delete(Dmp),
-		    file:delete(Dat);
-		_ ->
-		    ok = ensure_rename(Dmp, Dat)
-	    end
-    end;
-
-insert_op(Tid, _, {op, delete_table, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    case mnesia_lib:cs_to_storage_type(node(), Cs) of
-	unknown ->
-	    ignore;
-	Storage ->
-	    disc_delete_table(Tab, Storage),
-	    disc_delete_indecies(Tab, Cs, Storage),
-	    case InitBy of
-		startup ->
-		    ignore;
-		_ ->
-		    mnesia_schema:ram_delete_table(Tab, Storage),
-		    mnesia_checkpoint:tm_del_copy(Tab, node())
-	    end
-    end,
-    delete_cstruct(Tid, Cs, InPlace, InitBy);
-
-insert_op(Tid, _, {op, clear_table, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    case mnesia_lib:cs_to_storage_type(node(), Cs) of
-	unknown ->
-	    ignore;
-	Storage ->
-	    Oid = '_', %%val({Tab, wild_pattern}),
-	    if Storage == disc_copies ->
-		    open_dcl(Cs#cstruct.name);
-	       true ->
-		    ignore
-	    end,
-	    insert(Tid, Storage, Tab, '_', Oid, clear_table, InPlace, InitBy)
-    end;
-
-insert_op(Tid, _, {op, merge_schema, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    insert_cstruct(Tid, Cs, false, InPlace, InitBy);
-
-insert_op(Tid, _, {op, del_table_copy, Storage, Node, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    if
-	Tab == schema, Storage == ram_copies ->
-	    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
-        Tab /= schema ->
-	    mnesia_controller:del_active_replica(Tab, Node),
-	    mnesia_lib:del({Tab, Storage}, Node),
-	    if
-		Node == node() ->
-		    case Cs#cstruct.local_content of
-			true -> mnesia_lib:set({Tab, where_to_read}, nowhere);
-			false -> mnesia_lib:set_remote_where_to_read(Tab)
-		    end,
-		    mnesia_lib:del({schema, local_tables}, Tab),
-		    mnesia_lib:set({Tab, storage_type}, unknown),
-		    insert_cstruct(Tid, Cs, true, InPlace, InitBy),
-		    disc_delete_table(Tab, Storage),
-		    disc_delete_indecies(Tab, Cs, Storage),
-		    mnesia_schema:ram_delete_table(Tab, Storage),
-		    mnesia_checkpoint:tm_del_copy(Tab, Node);
-		true ->
-		    case val({Tab, where_to_read}) of
-			Node ->
-			    mnesia_lib:set_remote_where_to_read(Tab);
-			_  ->
-			    ignore
-		    end,
-		    insert_cstruct(Tid, Cs, true, InPlace, InitBy)
-	    end
-    end;
-
-insert_op(Tid, _, {op, add_table_copy, _Storage, _Node, TabDef}, InPlace, InitBy) ->
-    %% During prepare commit, the files was created
-    %% and the replica was announced
-    Cs = mnesia_schema:list2cs(TabDef),
-    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
-
-insert_op(Tid, _, {op, add_snmp, _Us, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
-
-insert_op(Tid, _, {op, del_snmp, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
-    if
-	InitBy /= startup,
-	Storage /= unknown ->
-	    case ?catch_val({Tab, {index, snmp}}) of
-		{'EXIT', _} -> 
-		    ignore;
-		Stab -> 
-		    mnesia_snmp_hook:delete_table(Tab, Stab),
-		    mnesia_lib:unset({Tab, {index, snmp}})
-	    end;
-	true ->
-	    ignore
-    end,
-    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
-
-insert_op(Tid, _, {op, add_index, Pos, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    Tab = insert_cstruct(Tid, Cs, true, InPlace, InitBy),
-    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
-    case InitBy of
-	startup when Storage == disc_only_copies ->
-	    mnesia_index:init_indecies(Tab, Storage, [Pos]);
-	startup ->
-	    ignore; 
-	_  ->
-	    mnesia_index:init_indecies(Tab, Storage, [Pos])
-    end;
-
-insert_op(Tid, _, {op, del_index, Pos, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
-    case InitBy of
-	startup when Storage == disc_only_copies ->
-	    mnesia_index:del_index_table(Tab, Storage, Pos);
-	startup -> 
-	    ignore;
-	_ ->
-	    mnesia_index:del_index_table(Tab, Storage, Pos)
-    end,
-    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
-
-insert_op(Tid, _, {op, change_table_access_mode,TabDef, _OldAccess, _Access}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    case InitBy of
-	startup -> ignore;
-	_ -> mnesia_controller:change_table_access_mode(Cs)
-    end,
-    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
-
-insert_op(Tid, _, {op, change_table_load_order, TabDef, _OldLevel, _Level}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
-
-insert_op(Tid, _, {op, delete_property, TabDef, PropKey}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    mnesia_lib:unset({Tab, user_property, PropKey}),
-    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
-
-insert_op(Tid, _, {op, write_property, TabDef, _Prop}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
-
-insert_op(Tid, _, {op, change_table_frag, _Change, TabDef}, InPlace, InitBy) ->
-    Cs = mnesia_schema:list2cs(TabDef),
-    insert_cstruct(Tid, Cs, true, InPlace, InitBy).
-
-open_files(Tab, Storage, UpdateInPlace, InitBy)
-  when Storage /= unknown, Storage /= ram_copies ->
-    case get({?MODULE, Tab}) of
-	undefined ->
-	    case ?catch_val({Tab, setorbag}) of
-		{'EXIT', _} ->
-		    false;
-		Type ->
-		    case Storage of 
-			disc_copies when Tab /= schema ->
-			    Bool = open_disc_copies(Tab, InitBy),
-			    Bool;
-			_ ->
-			    Fname = prepare_open(Tab, UpdateInPlace),
-			    Args = [{file, Fname},
-				    {keypos, 2},
-				    {repair, mnesia_monitor:get_env(auto_repair)},
-				    {type, mnesia_lib:disk_type(Tab, Type)}],
-			    {ok, _} = mnesia_monitor:open_dets(Tab, Args),
-			    put({?MODULE, Tab}, {opened_dumper, dat}),
-			    true
-		    end
-	    end;
-	already_dumped ->
-	    false;
-	{opened_dumper, _} ->
-	    true
-    end;
-open_files(_Tab, _Storage, _UpdateInPlace, _InitBy) ->
-    false.
-
-open_disc_copies(Tab, InitBy) ->
-    DclF = mnesia_lib:tab2dcl(Tab),
-    DumpEts = 
-	case file:read_file_info(DclF) of
-	    {error, enoent} ->
-		false;
-	    {ok, DclInfo} ->
-		DcdF =  mnesia_lib:tab2dcd(Tab),
-		case file:read_file_info(DcdF) of
-		    {error, Reason} ->
-			mnesia_lib:dbg_out("File ~p info_error ~p ~n",
-					   [DcdF, Reason]),
-			true;
-		    {ok, DcdInfo} -> 
-			DcdInfo#file_info.size =< 
-			    (DclInfo#file_info.size * 
-			     ?DumpToEtsMultiplier)
-		end
-	end,
-    if 
-	DumpEts == false; InitBy == startup ->	    
-	    mnesia_log:open_log({?MODULE,Tab}, 
-				mnesia_log:dcl_log_header(), 
-				DclF, 
-				mnesia_lib:exists(DclF), 
-				mnesia_monitor:get_env(auto_repair),
-				read_write),
-	    put({?MODULE, Tab}, {opened_dumper, dcl}),
-	    true;
-	true ->
-	    mnesia_log:ets2dcd(Tab),
-	    put({?MODULE, Tab}, already_dumped),
-	    false
-    end. 
-
-%% Always opens the dcl file for writing overriding already_dumped 
-%% mechanismen, used for schema transactions.
-open_dcl(Tab) ->
-    case get({?MODULE, Tab}) of
-    	{opened_dumper, _} ->
-	    true;
-	_ -> %% undefined or already_dumped
-	    DclF = mnesia_lib:tab2dcl(Tab),
-	    mnesia_log:open_log({?MODULE,Tab}, 
-				mnesia_log:dcl_log_header(), 
-				DclF, 
-				mnesia_lib:exists(DclF), 
-				mnesia_monitor:get_env(auto_repair),
-				read_write),
-	    put({?MODULE, Tab}, {opened_dumper, dcl}),
-	    true
-    end.
-
-prepare_open(Tab, UpdateInPlace) ->
-    Dat =  mnesia_lib:tab2dat(Tab),
-    case UpdateInPlace of
-	true ->
-	    Dat;
-	false ->
-	    Tmp = mnesia_lib:tab2tmp(Tab),
-	    case catch mnesia_lib:copy_file(Dat, Tmp) of
-		ok ->
-		    Tmp;
-		Error ->
-		    fatal("Cannot copy dets file ~p to ~p: ~p~n",
-			  [Dat, Tmp, Error])
-	    end
-	end.
-
-del_opened_tab(Tab) ->
-    erase({?MODULE, Tab}).
-
-close_files(UpdateInPlace, Outcome, InitBy) -> % Update in place
-    close_files(UpdateInPlace, Outcome, InitBy, get()).
-
-close_files(InPlace, Outcome, InitBy, [{{?MODULE, Tab}, already_dumped} | Tail]) ->
-    erase({?MODULE, Tab}),
-    close_files(InPlace, Outcome, InitBy, Tail);
-close_files(InPlace, Outcome, InitBy, [{{?MODULE, Tab}, {opened_dumper, Type}} | Tail]) ->
-    erase({?MODULE, Tab}),
-    case val({Tab, storage_type}) of
-	disc_only_copies when InitBy /= startup ->
-	    ignore;
-	disc_copies when Tab /= schema -> 
-	    mnesia_log:close_log({?MODULE,Tab});
-	Storage ->
-	    do_close(InPlace, Outcome, Tab, Type, Storage)
-    end,
-    close_files(InPlace, Outcome, InitBy, Tail);
-
-close_files(InPlace, Outcome, InitBy, [_ | Tail]) ->
-    close_files(InPlace, Outcome, InitBy, Tail);
-close_files(_, _, _InitBy, []) ->
-    ok.
-
-%% If storage is unknown during close clean up files, this can happen if timing
-%% is right and dirty_write conflicts with schema operations.
-do_close(_, _, Tab, dcl, unknown) ->
-    mnesia_log:close_log({?MODULE,Tab}),
-    file:delete(mnesia_lib:tab2dcl(Tab));
-do_close(_, _, Tab, dcl, _) ->  %% To be safe, can it happen?
-    mnesia_log:close_log({?MODULE,Tab});
-
-do_close(InPlace, Outcome, Tab, dat, Storage) ->
-    mnesia_monitor:close_dets(Tab),
-    if
-	Storage == unknown, InPlace == true  ->
-	    file:delete(mnesia_lib:tab2dat(Tab));
-	InPlace == true ->
-	    %% Update in place
-	    ok;
-	Outcome == ok, Storage /= unknown ->
-	    %% Success: swap tmp files with dat files
-	    TabDat = mnesia_lib:tab2dat(Tab),
-	    ok = file:rename(mnesia_lib:tab2tmp(Tab), TabDat);
-	true ->
-	    file:delete(mnesia_lib:tab2tmp(Tab))
-    end.
-    
-
-ensure_rename(From, To) ->
-    case mnesia_lib:exists(From) of
-	true ->
-	    file:rename(From, To);
-	false ->
-	    case mnesia_lib:exists(To) of
-		true ->
-		    ok;
-		false ->
-		    {error, {rename_failed, From, To}}
-	    end
-    end.
-    
-insert_cstruct(Tid, Cs, KeepWhereabouts, InPlace, InitBy) ->
-    Val = mnesia_schema:insert_cstruct(Tid, Cs, KeepWhereabouts),
-    {schema, Tab, _} = Val,
-    S = val({schema, storage_type}),
-    disc_insert(Tid, S, schema, Tab, Val, write, InPlace, InitBy),
-    Tab.
-
-delete_cstruct(Tid, Cs, InPlace, InitBy) ->
-    Val = mnesia_schema:delete_cstruct(Tid, Cs),
-    {schema, Tab, _} = Val,
-    S = val({schema, storage_type}),
-    disc_insert(Tid, S, schema, Tab, Val, delete, InPlace, InitBy),
-    Tab.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Raw dump of table. Dumper must have unique access to the ets table.
-
-raw_named_dump_table(Tab, Ftype) ->
-    case mnesia_monitor:use_dir() of
-	true ->
-	    mnesia_lib:lock_table(Tab),
-	    TmpFname = mnesia_lib:tab2tmp(Tab),
-	    Fname =
-		case Ftype of
-		    dat -> mnesia_lib:tab2dat(Tab);
-		    dmp -> mnesia_lib:tab2dmp(Tab)
-		end,
-	    file:delete(TmpFname),
-	    file:delete(Fname),
-	    TabSize = ?ets_info(Tab, size),
-	    TabRef = Tab,
-	    DiskType = mnesia_lib:disk_type(Tab),
-	    Args = [{file, TmpFname},
-		    {keypos, 2},
-		    %%		    {ram_file, true},
-		    {estimated_no_objects, TabSize + 256},
-		    {repair, mnesia_monitor:get_env(auto_repair)},
-		    {type, DiskType}],
-	    case mnesia_lib:dets_sync_open(TabRef, Args) of
-		{ok, TabRef} ->
-		    Storage = ram_copies,
-		    mnesia_lib:db_fixtable(Storage, Tab, true),
-		    
-		    case catch raw_dump_table(TabRef, Tab) of
-			{'EXIT', Reason} ->
-			    mnesia_lib:db_fixtable(Storage, Tab, false),
-			    mnesia_lib:dets_sync_close(Tab),
-			    file:delete(TmpFname),
-			    mnesia_lib:unlock_table(Tab),
-			    exit({"Dump of table to disc failed", Reason});
-			ok ->
-			    mnesia_lib:db_fixtable(Storage, Tab, false),
-			    mnesia_lib:dets_sync_close(Tab),
-			    mnesia_lib:unlock_table(Tab),
-			    ok = file:rename(TmpFname, Fname)
-		    end;
-		{error, Reason} ->
-		    mnesia_lib:unlock_table(Tab),
-		    exit({"Open of file before dump to disc failed", Reason})
-	    end;
-	false ->
-	    exit({has_no_disc, node()})
-    end.
-
-raw_dump_table(DetsRef, EtsRef) ->
-    dets:from_ets(DetsRef, EtsRef).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Load regulator
-%% 
-%% This is a poor mans substitute for a fair scheduler algorithm 
-%% in the Erlang emulator. The mnesia_dumper process performs many 
-%% costly BIF invokations and must pay for this. But since the 
-%% Emulator does not handle this properly we must compensate for 
-%% this with some form of load regulation of ourselves in order to
-%% not steal all computation power in the Erlang Emulator ans make
-%% other processes starve. Hopefully this is a temporary solution.
-
-start_regulator() ->
-    case mnesia_monitor:get_env(dump_log_load_regulation) of
-	false ->
-	    nopid;
-	true ->
-	    N = ?REGULATOR_NAME,
-	    case mnesia_monitor:start_proc(N, ?MODULE, regulator_init, [self()]) of
-		{ok, Pid} ->
-		    Pid;
-		{error, Reason} ->
-		    fatal("Failed to start ~n: ~p~n", [N, Reason])
-	    end
-    end.
-
-regulator_init(Parent) ->
-    %% No need for trapping exits.
-    %% Using low priority causes the regulation
-    process_flag(priority, low),
-    register(?REGULATOR_NAME, self()),
-    proc_lib:init_ack(Parent, {ok, self()}),
-    regulator_loop().
-
-regulator_loop() ->
-    receive
-	{regulate, From} ->
-	    From ! {regulated, self()},
-	    regulator_loop();
-	{stop, From} ->
-	    From ! {stopped, self()},
-	    exit(normal)
-    end.
-
-regulate(nopid) ->
-    ok;
-regulate(RegulatorPid) ->
-    RegulatorPid ! {regulate, self()},
-    receive
-	{regulated, RegulatorPid} -> ok
-    end.
-
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason); 
-	Value -> Value 
-    end.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_event.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_event.erl
deleted file mode 100644
index fc0638e1ad..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_event.erl
+++ /dev/null
@@ -1,263 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_event.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%
--module(mnesia_event).
-
--behaviour(gen_event).
-%-behaviour(mnesia_event).
-
-%% gen_event callback interface
--export([init/1,
-	 handle_event/2,
-	 handle_call/2,
-	 handle_info/2,
-	 terminate/2,
-	 code_change/3]).
-
--record(state, {nodes = [], 
-		dumped_core = false,  %% only dump fatal core once
-		args}).
-
-%%%----------------------------------------------------------------
-%%% Callback functions from gen_server
-%%%----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% init(Args) ->
-%%     {ok, State} | Error
-%%-----------------------------------------------------------------
-
-init(Args) ->
-    {ok, #state{args = Args}}.
-
-%%-----------------------------------------------------------------
-%% handle_event(Event, State) -> 
-%%    {ok, NewState} | remove_handler |
-%%    {swap_handler, Args1, State1, Mod2, Args2}
-%%-----------------------------------------------------------------
-
-handle_event(Event, State) ->
-    handle_any_event(Event, State).
-
-%%-----------------------------------------------------------------
-%% handle_info(Msg, State) ->
-%%    {ok, NewState} | remove_handler |
-%%    {swap_handler, Args1, State1, Mod2, Args2}
-%%-----------------------------------------------------------------
-
-handle_info(Msg, State) ->
-    handle_any_event(Msg, State),
-    {ok, State}.
-
-%%-----------------------------------------------------------------
-%% handle_call(Event, State) -> 
-%%    {ok, Reply, NewState} | {remove_handler, Reply} | 
-%%    {swap_handler, Reply, Args1, State1, Mod2, Args2}
-%%-----------------------------------------------------------------
-
-handle_call(Msg, State) ->
-    Reply = ok,
-    case handle_any_event(Msg, State) of
-	{ok, NewState} ->
-	    {ok, Reply, NewState};
-	remove_handler ->
-	    {remove_handler, Reply};
-	{swap_handler,Args1, State1, Mod2, Args2} ->
-	    {swap_handler, Reply, Args1, State1, Mod2, Args2}
-    end.
-
-%%-----------------------------------------------------------------
-%% terminate(Reason, State) ->
-%%     AnyVal
-%%-----------------------------------------------------------------
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%----------------------------------------------------------------------
-%% Func: code_change/3
-%% Purpose: Upgrade process when its code is to be changed
-%% Returns: {ok, NewState}
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-handle_any_event({mnesia_system_event, Event}, State) ->
-    handle_system_event(Event, State);
-handle_any_event({mnesia_table_event, Event}, State) ->
-    handle_table_event(Event, State);
-handle_any_event(Msg, State) ->
-    report_error("~p got unexpected event: ~p~n", [?MODULE, Msg]),
-    {ok, State}.
-
-handle_table_event({Oper, Record, TransId}, State) ->
-    report_info("~p performed by ~p on record:~n\t~p~n",
-		[Oper, TransId, Record]),
-    {ok, State}.  
-
-handle_system_event({mnesia_checkpoint_activated, _Checkpoint}, State) ->
-    {ok, State};
-
-handle_system_event({mnesia_checkpoint_deactivated, _Checkpoint}, State) ->
-    {ok, State};
-
-handle_system_event({mnesia_up, Node}, State) ->
-    Nodes = [Node | State#state.nodes],
-    {ok, State#state{nodes = Nodes}}; 
-
-handle_system_event({mnesia_down, Node}, State) ->
-    case mnesia:system_info(fallback_activated) of
-	true ->
-	    case mnesia_monitor:get_env(fallback_error_function) of
-		{mnesia, lkill} ->
-		    Msg = "A fallback is installed and Mnesia "
-			"must be restarted. Forcing shutdown "
-			"after mnesia_down from ~p...~n",
-		    report_fatal(Msg, [Node], nocore, State#state.dumped_core),
-		    mnesia:lkill(),
-		    exit(fatal);
-		{UserMod, UserFunc} ->
-		    Msg = "Warning: A fallback is installed and Mnesia got mnesia_down "
-			"from ~p. ~n",
-		    report_info(Msg, [Node]),
-		    case catch apply(UserMod, UserFunc, [Node]) of
-			{'EXIT', {undef, _Reason}} ->
-			    %% Backward compatibility
-			    apply(UserMod, UserFunc, []);
-			{'EXIT', Reason} ->
-			    exit(Reason);
-			_ ->
-			    ok
-		    end,
-		    Nodes = lists:delete(Node, State#state.nodes),
-		    {ok, State#state{nodes = Nodes}}
-	    end;
-	false ->
-	    Nodes = lists:delete(Node, State#state.nodes),
-	    {ok, State#state{nodes = Nodes}}
-    end;
-
-handle_system_event({mnesia_overload, Details}, State) ->
-    report_warning("Mnesia is overloaded: ~p~n", [Details]),
-    {ok, State}; 
-
-handle_system_event({mnesia_info, Format, Args}, State) ->
-    report_info(Format, Args),
-    {ok, State}; 
-
-handle_system_event({mnesia_warning, Format, Args}, State) ->
-    report_warning(Format, Args),
-    {ok, State}; 
-
-handle_system_event({mnesia_error, Format, Args}, State) ->
-    report_error(Format, Args),
-    {ok, State}; 
-
-handle_system_event({mnesia_fatal, Format, Args, BinaryCore}, State) ->
-    report_fatal(Format, Args, BinaryCore, State#state.dumped_core),
-    {ok, State#state{dumped_core = true}};
-
-handle_system_event({inconsistent_database, Reason, Node}, State) ->
-    report_error("mnesia_event got {inconsistent_database, ~w, ~w}~n",
-		 [Reason, Node]),
-    {ok, State}; 
-
-handle_system_event({mnesia_user, Event}, State) ->
-    report_info("User event: ~p~n", [Event]),
-    {ok, State}; 
-
-handle_system_event(Msg, State) ->
-    report_error("mnesia_event got unexpected system event: ~p~n", [Msg]),
-    {ok, State}.
-
-report_info(Format0, Args0) ->
-    Format = "Mnesia(~p): " ++ Format0,
-    Args = [node() | Args0],
-    case global:whereis_name(mnesia_global_logger) of
-	undefined ->
-	    io:format(Format, Args);
-	Pid ->
-	    io:format(Pid, Format, Args)
-    end.
-
-report_warning(Format0, Args0) ->
-    Format = "Mnesia(~p): ** WARNING ** " ++ Format0,
-    Args = [node() | Args0],
-    case erlang:function_exported(error_logger, warning_msg, 2) of
-	true -> 
-	    error_logger:warning_msg(Format, Args);
-	false ->
-	    error_logger:format(Format, Args)
-    end,
-    case global:whereis_name(mnesia_global_logger) of
-	undefined ->
-	    ok;
-	Pid ->
-	    io:format(Pid, Format, Args)
-    end.
-
-report_error(Format0, Args0) ->
-    Format = "Mnesia(~p): ** ERROR ** " ++ Format0,
-    Args = [node() | Args0],
-    error_logger:format(Format, Args),
-    case global:whereis_name(mnesia_global_logger) of
-	undefined ->
-	    ok;
-	Pid ->
-	    io:format(Pid, Format, Args)
-    end.
-
-report_fatal(Format, Args, BinaryCore, CoreDumped) ->
-    UseDir = mnesia_monitor:use_dir(),
-    CoreDir = mnesia_monitor:get_env(core_dir),
-    if
-	list(CoreDir),CoreDumped == false,binary(BinaryCore) ->	    
-	    core_file(CoreDir,BinaryCore,Format,Args);
-	(UseDir == true),CoreDumped == false,binary(BinaryCore) ->
-	    core_file(CoreDir,BinaryCore,Format,Args);
-	true ->
-	    report_error("(ignoring core) ** FATAL ** " ++ Format, Args)
-    end.
-
-core_file(CoreDir,BinaryCore,Format,Args) ->
-    %% Integers = tuple_to_list(date()) ++ tuple_to_list(time()),
-    Integers = tuple_to_list(now()),
-    Fun = fun(I) when I < 10 -> ["_0",I];
-	     (I) -> ["_",I]
-	  end,
-    List = lists:append([Fun(I) || I <- Integers]),
-    CoreFile = if list(CoreDir) ->
-		       filename:absname(lists:concat(["MnesiaCore.", node()] ++ List), 
-					CoreDir);
-		  true ->
-		       filename:absname(lists:concat(["MnesiaCore.", node()] ++ List))
-	       end,
-    case file:write_file(CoreFile, BinaryCore) of
-	ok ->
-	    report_error("(core dumped to file: ~p)~n ** FATAL ** " ++ Format,
-			 [CoreFile] ++ Args);
-	{error, Reason} ->
-	    report_error("(could not write core file: ~p)~n ** FATAL ** " ++ Format,
-			 [Reason] ++ Args)
-    end.
-
-
-	
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_frag.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_frag.erl
deleted file mode 100644
index e1f4e96a95..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_frag.erl
+++ /dev/null
@@ -1,1201 +0,0 @@
-%%% ``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 via the world wide web 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.
-%%% 
-%%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%%% AB. All Rights Reserved.''
-%%% 
-%%%     $Id: mnesia_frag.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%%
-%%%----------------------------------------------------------------------
-%%% Purpose : Support tables so large that they need
-%%%           to be divided into several fragments.
-%%%----------------------------------------------------------------------
-
-%header_doc_include
-
--module(mnesia_frag).
--behaviour(mnesia_access).
-
-%% Callback functions when accessed within an activity
--export([
-	 lock/4,
-	 write/5, delete/5, delete_object/5,
-	 read/5, match_object/5, all_keys/4,
-	 select/5,
-	 index_match_object/6, index_read/6,
-	 foldl/6, foldr/6,
-	 table_info/4
-       ]).
-
-%header_doc_include
-
--export([
-	 change_table_frag/2,
-	 remove_node/2,
-	 expand_cstruct/1,
-	 lookup_frag_hash/1,
-	 lookup_foreigners/1,
-	 frag_names/1,
-	 set_frag_hash/2,
-	 local_select/4,
-	 remote_select/4
-	]).
-
--include("mnesia.hrl").
-
--define(OLD_HASH_MOD, mnesia_frag_old_hash).
--define(DEFAULT_HASH_MOD, mnesia_frag_hash).
-%%-define(DEFAULT_HASH_MOD, ?OLD_HASH_MOD). %%  BUGBUG: New should be default
-
--record(frag_state,
-	{foreign_key,
-	 n_fragments,
-	 hash_module,
-	 hash_state}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Access functions
-
-%impl_doc_include
-
-%% Callback functions which provides transparent
-%% access of fragmented tables from any activity
-%% access context.
-
-lock(ActivityId, Opaque, {table , Tab}, LockKind) ->
-    case frag_names(Tab) of
-	[Tab] ->
-	    mnesia:lock(ActivityId, Opaque, {table, Tab}, LockKind);	    
-	Frags ->
-	    DeepNs = [mnesia:lock(ActivityId, Opaque, {table, F}, LockKind) ||
-			 F <- Frags],
-	    mnesia_lib:uniq(lists:append(DeepNs))
-    end;
-
-lock(ActivityId, Opaque, LockItem, LockKind) ->
-    mnesia:lock(ActivityId, Opaque, LockItem, LockKind).
-
-write(ActivityId, Opaque, Tab, Rec, LockKind) ->
-    Frag = record_to_frag_name(Tab, Rec),
-    mnesia:write(ActivityId, Opaque, Frag, Rec, LockKind).
-
-delete(ActivityId, Opaque, Tab, Key, LockKind) ->
-    Frag = key_to_frag_name(Tab, Key),
-    mnesia:delete(ActivityId, Opaque, Frag, Key, LockKind).
-
-delete_object(ActivityId, Opaque, Tab, Rec, LockKind) ->
-    Frag = record_to_frag_name(Tab, Rec),
-    mnesia:delete_object(ActivityId, Opaque, Frag, Rec, LockKind).
-
-read(ActivityId, Opaque, Tab, Key, LockKind) ->
-    Frag = key_to_frag_name(Tab, Key),
-    mnesia:read(ActivityId, Opaque, Frag, Key, LockKind).
-
-match_object(ActivityId, Opaque, Tab, HeadPat, LockKind) ->
-    MatchSpec = [{HeadPat, [], ['$_']}],
-    select(ActivityId, Opaque, Tab, MatchSpec, LockKind).
-
-select(ActivityId, Opaque, Tab, MatchSpec, LockKind) ->
-    do_select(ActivityId, Opaque, Tab, MatchSpec, LockKind).
-
-all_keys(ActivityId, Opaque, Tab, LockKind) ->
-    Match = [mnesia:all_keys(ActivityId, Opaque, Frag, LockKind)
-	     || Frag <- frag_names(Tab)],
-    lists:append(Match).
-
-index_match_object(ActivityId, Opaque, Tab, Pat, Attr, LockKind) ->
-    Match =
-	[mnesia:index_match_object(ActivityId, Opaque, Frag, Pat, Attr, LockKind)
-	 || Frag <- frag_names(Tab)],
-    lists:append(Match).
-
-index_read(ActivityId, Opaque, Tab, Key, Attr, LockKind) ->
-    Match =
-	[mnesia:index_read(ActivityId, Opaque, Frag, Key, Attr, LockKind)
-	     || Frag <- frag_names(Tab)],
-    lists:append(Match).
-
-foldl(ActivityId, Opaque, Fun, Acc, Tab, LockKind) ->
-    Fun2 = fun(Frag, A) ->
-		   mnesia:foldl(ActivityId, Opaque, Fun, A, Frag, LockKind)
-	   end,
-    lists:foldl(Fun2, Acc, frag_names(Tab)).
-
-foldr(ActivityId, Opaque, Fun, Acc, Tab, LockKind) ->
-    Fun2 = fun(Frag, A) ->
-		   mnesia:foldr(ActivityId, Opaque, Fun, A, Frag, LockKind)
-	   end,
-    lists:foldr(Fun2, Acc, frag_names(Tab)).
-
-table_info(ActivityId, Opaque, {Tab, Key}, Item) ->
-    Frag = key_to_frag_name(Tab, Key),
-    table_info2(ActivityId, Opaque, Tab, Frag, Item);
-table_info(ActivityId, Opaque, Tab, Item) ->
-    table_info2(ActivityId, Opaque, Tab, Tab, Item).
-
-table_info2(ActivityId, Opaque, Tab, Frag, Item) ->
-    case Item of
-	size ->
-	    SumFun = fun({_, Size}, Acc) -> Acc + Size end,
-	    lists:foldl(SumFun, 0, frag_size(ActivityId, Opaque, Tab));
-	memory ->
-	    SumFun = fun({_, Size}, Acc) -> Acc + Size end,
-	    lists:foldl(SumFun, 0, frag_memory(ActivityId, Opaque, Tab));
-	base_table ->
-	    lookup_prop(Tab, base_table);
-	node_pool ->
-	    lookup_prop(Tab, node_pool);
-	n_fragments ->
-	    FH = lookup_frag_hash(Tab),
-	    FH#frag_state.n_fragments;
-	foreign_key ->
-	    FH = lookup_frag_hash(Tab),
-	    FH#frag_state.foreign_key;
-	foreigners ->
-	    lookup_foreigners(Tab);
-	n_ram_copies ->
-	    length(val({Tab, ram_copies}));
-	n_disc_copies ->
-	    length(val({Tab, disc_copies}));
-	n_disc_only_copies ->
-	    length(val({Tab, disc_only_copies}));
-
-	frag_names ->
-	    frag_names(Tab);
-	frag_dist ->
-	    frag_dist(Tab);
-	frag_size ->
-	    frag_size(ActivityId, Opaque, Tab);
-	frag_memory ->
-	    frag_memory(ActivityId, Opaque, Tab);
-	_ ->
-	    mnesia:table_info(ActivityId, Opaque, Frag, Item)
-    end.
-%impl_doc_include
-
-frag_size(ActivityId, Opaque, Tab) ->
-    [{F, remote_table_info(ActivityId, Opaque, F, size)} || F <- frag_names(Tab)].
-
-frag_memory(ActivityId, Opaque, Tab) ->
-    [{F, remote_table_info(ActivityId, Opaque, F, memory)} || F <- frag_names(Tab)].
-
-    
-  
-remote_table_info(ActivityId, Opaque, Tab, Item) ->
-    N = val({Tab, where_to_read}),
-    case rpc:call(N, mnesia, table_info, [ActivityId, Opaque, Tab, Item]) of
-	{badrpc, _} ->
-	    mnesia:abort({no_exists, Tab, Item});
-	Info ->
-	    Info
-    end.
-
-do_select(ActivityId, Opaque, Tab, MatchSpec, LockKind) ->
-    case ?catch_val({Tab, frag_hash}) of
-	{'EXIT', _} ->
-	    mnesia:select(ActivityId, Opaque, Tab, MatchSpec, LockKind);
-	FH ->
-	    HashState = FH#frag_state.hash_state,
-	    FragNumbers = 
-		case FH#frag_state.hash_module of
-		    HashMod when HashMod == ?DEFAULT_HASH_MOD ->
-			?DEFAULT_HASH_MOD:match_spec_to_frag_numbers(HashState, MatchSpec);
-		    HashMod ->
-			HashMod:match_spec_to_frag_numbers(HashState, MatchSpec)
-		end,
-	    N = FH#frag_state.n_fragments,
-	    VerifyFun = fun(F) when integer(F), F >= 1, F =< N -> false;
-			   (_F) -> true
-			end,
-	    case catch lists:filter(VerifyFun, FragNumbers) of
-		[] ->
-		    Fun = fun(Num) ->
-				  Name = n_to_frag_name(Tab, Num),
-				  Node = val({Name, where_to_read}),
-				  mnesia:lock(ActivityId, Opaque, {table, Name}, LockKind),
-				  {Name, Node}
-			  end,
-		    NameNodes = lists:map(Fun, FragNumbers),
-		    SelectAllFun =
-			fun(PatchedMatchSpec) ->
-				Match = [mnesia:dirty_select(Name, PatchedMatchSpec)
-					 || {Name, _Node} <- NameNodes],
-				lists:append(Match)
-			end,
-		    case [{Name, Node} || {Name, Node} <- NameNodes, Node /= node()] of
-			[] ->
-			    %% All fragments are local
-			    mnesia:fun_select(ActivityId, Opaque, Tab, MatchSpec, none, '_', SelectAllFun);
-			RemoteNameNodes ->
-			    SelectFun =
-				fun(PatchedMatchSpec) ->
-					Ref = make_ref(),
-					Args = [self(), Ref, RemoteNameNodes, PatchedMatchSpec],
-					Pid = spawn_link(?MODULE, local_select, Args),
-					LocalMatch = [mnesia:dirty_select(Name, PatchedMatchSpec)
-						      || {Name, Node} <- NameNodes, Node == node()],
-					OldSelectFun = fun() -> SelectAllFun(PatchedMatchSpec) end,
-					local_collect(Ref, Pid, lists:append(LocalMatch), OldSelectFun)
-				end,
-			    mnesia:fun_select(ActivityId, Opaque, Tab, MatchSpec, none, '_', SelectFun)
-		    end;
-		BadFrags ->
-		    mnesia:abort({"match_spec_to_frag_numbers: Fragment numbers out of range",
-				  BadFrags, {range, 1, N}})
-	    end
-    end.
-
-local_select(ReplyTo, Ref, RemoteNameNodes, MatchSpec) ->
-    RemoteNodes = mnesia_lib:uniq([Node || {_Name, Node} <- RemoteNameNodes]),
-    Args = [ReplyTo, Ref, RemoteNameNodes, MatchSpec],
-    {Replies, BadNodes} = rpc:multicall(RemoteNodes, ?MODULE, remote_select, Args),
-    case mnesia_lib:uniq(Replies) -- [ok] of
-	[] when BadNodes == [] ->
-	    ReplyTo ! {local_select, Ref, ok};
-	_ when BadNodes /= [] ->
-	    ReplyTo ! {local_select, Ref, {error, {node_not_running, hd(BadNodes)}}};
-	[{badrpc, {'EXIT', Reason}} | _] ->
-	    ReplyTo ! {local_select, Ref, {error, Reason}};
-	[Reason | _] ->
-	    ReplyTo ! {local_select, Ref, {error, Reason}}
-    end,
-    unlink(ReplyTo),
-    exit(normal).
-    
-remote_select(ReplyTo, Ref, NameNodes, MatchSpec) ->
-    do_remote_select(ReplyTo, Ref, NameNodes, MatchSpec).
-
-do_remote_select(ReplyTo, Ref, [{Name, Node} | NameNodes], MatchSpec) ->
-    if
-	Node == node() ->
-	    Res = (catch {ok, mnesia:dirty_select(Name, MatchSpec)}),
-	    ReplyTo ! {remote_select, Ref, Node, Res},
-	    do_remote_select(ReplyTo, Ref, NameNodes, MatchSpec);
-	true ->
-	    do_remote_select(ReplyTo, Ref, NameNodes, MatchSpec)
-    end;
-do_remote_select(_ReplyTo, _Ref, [], _MatchSpec) ->
-    ok.
-
-local_collect(Ref, Pid, LocalMatch, OldSelectFun) ->
-    receive
-	{local_select, Ref, LocalRes} ->
-	    remote_collect(Ref, LocalRes, LocalMatch, OldSelectFun);
-	{'EXIT', Pid, Reason} ->
-	    remote_collect(Ref, {error, Reason}, [], OldSelectFun)
-    end.
-    
-remote_collect(Ref, LocalRes = ok, Acc, OldSelectFun) ->
-    receive
-	{remote_select, Ref, Node, RemoteRes} ->
-	    case RemoteRes of
-		{ok, RemoteMatch} ->
-		    remote_collect(Ref, LocalRes, RemoteMatch ++ Acc, OldSelectFun);
-		_ ->
-		    remote_collect(Ref, {error, {node_not_running, Node}}, [], OldSelectFun)
-	    end
-    after 0 ->
-	    Acc
-    end;
-remote_collect(Ref, LocalRes = {error, Reason}, _Acc, OldSelectFun) ->
-    receive
-	{remote_select, Ref, _Node, _RemoteRes} ->
-	    remote_collect(Ref, LocalRes, [], OldSelectFun)
-    after 0 ->
-	    mnesia:abort(Reason)
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Returns a list of cstructs
-
-expand_cstruct(Cs) ->
-    expand_cstruct(Cs, create).
-    
-expand_cstruct(Cs, Mode) ->
-    Tab = Cs#cstruct.name,
-    Props = Cs#cstruct.frag_properties,
-    mnesia_schema:verify({alt, [nil, list]}, mnesia_lib:etype(Props),
-			 {badarg, Tab, Props}), 
-    %% Verify keys
-    ValidKeys = [foreign_key, n_fragments, node_pool,
-		 n_ram_copies, n_disc_copies, n_disc_only_copies,
-		 hash_module, hash_state],
-    Keys = mnesia_schema:check_keys(Tab, Props, ValidKeys),
-    mnesia_schema:check_duplicates(Tab, Keys),
-
-    %% Pick fragmentation props
-    ForeignKey = mnesia_schema:pick(Tab, foreign_key, Props, undefined),
-    {ForeignKey2, N, Pool, DefaultNR, DefaultND, DefaultNDO} =
-	pick_props(Tab, Cs, ForeignKey),
-
-    %% Verify node_pool
-    BadPool = {bad_type, Tab, {node_pool, Pool}},
-    mnesia_schema:verify(list, mnesia_lib:etype(Pool), BadPool),
-    NotAtom = fun(A) when atom(A) -> false;
-		 (_A) -> true
-	      end,
-    mnesia_schema:verify([], [P || P <- Pool, NotAtom(P)], BadPool),
-
-    NR  = mnesia_schema:pick(Tab, n_ram_copies, Props, 0),
-    ND  = mnesia_schema:pick(Tab, n_disc_copies, Props, 0),
-    NDO = mnesia_schema:pick(Tab, n_disc_only_copies, Props, 0),
-    
-    PosInt = fun(I) when integer(I), I >= 0 -> true;
-		(_I) -> false
-	     end,
-    mnesia_schema:verify(true, PosInt(NR),
-			 {bad_type, Tab, {n_ram_copies, NR}}),
-    mnesia_schema:verify(true, PosInt(ND),
-			 {bad_type, Tab, {n_disc_copies, ND}}),
-    mnesia_schema:verify(true, PosInt(NDO),
-			 {bad_type, Tab, {n_disc_only_copies, NDO}}),
-    
-    %% Verify n_fragments
-    Cs2 = verify_n_fragments(N, Cs, Mode),
-    
-    %% Verify hash callback
-    HashMod = mnesia_schema:pick(Tab, hash_module, Props, ?DEFAULT_HASH_MOD),
-    HashState = mnesia_schema:pick(Tab, hash_state, Props, undefined),
-    HashState2 = HashMod:init_state(Tab, HashState), %% BUGBUG: Catch?
-
-    FH = #frag_state{foreign_key = ForeignKey2,
-		     n_fragments = 1,
-		     hash_module = HashMod,
-		     hash_state  = HashState2},
-    if
-	NR == 0, ND == 0, NDO == 0 ->
-	    do_expand_cstruct(Cs2, FH, N, Pool, DefaultNR, DefaultND, DefaultNDO, Mode);
-	true ->
-	    do_expand_cstruct(Cs2, FH, N, Pool, NR, ND, NDO, Mode)
-    end.
-	    
-do_expand_cstruct(Cs, FH, N, Pool, NR, ND, NDO, Mode) ->
-    Tab = Cs#cstruct.name,
-    
-    LC = Cs#cstruct.local_content,
-    mnesia_schema:verify(false, LC,
-			 {combine_error, Tab, {local_content, LC}}),
-
-    Snmp = Cs#cstruct.snmp,
-    mnesia_schema:verify([], Snmp,
-			 {combine_error, Tab, {snmp, Snmp}}),
-
-    %% Add empty fragments
-    CommonProps = [{base_table, Tab}],
-    Cs2 = Cs#cstruct{frag_properties = lists:sort(CommonProps)},
-    expand_frag_cstructs(N, NR, ND, NDO, Cs2, Pool, Pool, FH, Mode).
-
-verify_n_fragments(N, Cs, Mode) when integer(N), N >= 1 ->
-    case Mode of
-	create ->
-	    Cs#cstruct{ram_copies = [],
-		       disc_copies = [],
-		       disc_only_copies = []};
-	activate  ->
-	    Reason = {combine_error, Cs#cstruct.name, {n_fragments, N}},
-	    mnesia_schema:verify(1, N, Reason),
-	    Cs
-    end;
-verify_n_fragments(N, Cs, _Mode) ->
-    mnesia:abort({bad_type, Cs#cstruct.name, {n_fragments, N}}).
-
-pick_props(Tab, Cs, {ForeignTab, Attr}) ->
-    mnesia_schema:verify(true, ForeignTab /= Tab,
-			 {combine_error, Tab, {ForeignTab, Attr}}),
-    Props = Cs#cstruct.frag_properties,
-    Attrs = Cs#cstruct.attributes,
-
-    ForeignKey  = lookup_prop(ForeignTab, foreign_key),
-    ForeignN    = lookup_prop(ForeignTab, n_fragments),
-    ForeignPool = lookup_prop(ForeignTab, node_pool),
-    N           = mnesia_schema:pick(Tab, n_fragments, Props,  ForeignN),
-    Pool        = mnesia_schema:pick(Tab, node_pool, Props, ForeignPool),
-    
-    mnesia_schema:verify(ForeignN, N, 
-			 {combine_error, Tab, {n_fragments, N},
-			  ForeignTab, {n_fragments, ForeignN}}),
-
-    mnesia_schema:verify(ForeignPool, Pool, 
-			 {combine_error, Tab, {node_pool, Pool},
-			  ForeignTab, {node_pool, ForeignPool}}),
-
-    mnesia_schema:verify(undefined, ForeignKey,
-			 {combine_error, Tab,
-			  "Multiple levels of foreign_key dependencies",
-			  {ForeignTab, Attr}, ForeignKey}),
-
-    Key = {ForeignTab, mnesia_schema:attr_to_pos(Attr, Attrs)},
-    DefaultNR = length(val({ForeignTab, ram_copies})), 
-    DefaultND = length(val({ForeignTab, disc_copies})), 
-    DefaultNDO = length(val({ForeignTab, disc_only_copies})),
-    {Key, N, Pool, DefaultNR, DefaultND, DefaultNDO};
-pick_props(Tab, Cs, undefined) ->
-    Props = Cs#cstruct.frag_properties,
-    DefaultN = 1,
-    DefaultPool = mnesia:system_info(db_nodes),
-    N    = mnesia_schema:pick(Tab, n_fragments, Props,  DefaultN),
-    Pool = mnesia_schema:pick(Tab, node_pool, Props, DefaultPool),
-    DefaultNR = 1,
-    DefaultND = 0,
-    DefaultNDO = 0,
-    {undefined, N, Pool, DefaultNR, DefaultND, DefaultNDO};
-pick_props(Tab, _Cs, BadKey) ->
-    mnesia:abort({bad_type, Tab, {foreign_key, BadKey}}).
-
-expand_frag_cstructs(N, NR, ND, NDO, CommonCs, Dist, Pool, FH, Mode)
-  when N > 1, Mode == create ->
-    Frag = n_to_frag_name(CommonCs#cstruct.name, N),
-    Cs = CommonCs#cstruct{name = Frag},
-    {Cs2, RevModDist, RestDist} = set_frag_nodes(NR, ND, NDO, Cs, Dist, []),
-    ModDist = lists:reverse(RevModDist),
-    Dist2 = rearrange_dist(Cs, ModDist, RestDist, Pool),
-    %% Adjusts backwards, but it doesn't matter.
-    {FH2, _FromFrags, _AdditionalWriteFrags} = adjust_before_split(FH), 
-    CsList = expand_frag_cstructs(N - 1, NR, ND, NDO, CommonCs, Dist2, Pool, FH2, Mode),
-    [Cs2 | CsList];
-expand_frag_cstructs(1, NR, ND, NDO, CommonCs, Dist, Pool, FH, Mode) ->
-    BaseProps = CommonCs#cstruct.frag_properties ++  
-	[{foreign_key, FH#frag_state.foreign_key},
-	 {hash_module, FH#frag_state.hash_module},
-	 {hash_state,  FH#frag_state.hash_state},
-	 {n_fragments, FH#frag_state.n_fragments},
-	 {node_pool, Pool}
-	],
-    BaseCs = CommonCs#cstruct{frag_properties = lists:sort(BaseProps)},
-    case Mode of
-	activate ->
-	    [BaseCs];
-	create ->
-	    {BaseCs2, _, _} = set_frag_nodes(NR, ND, NDO, BaseCs, Dist, []),
-	    [BaseCs2]
-    end.
-    
-set_frag_nodes(NR, ND, NDO, Cs, [Head | Tail], Acc) when NR > 0 ->
-    Pos = #cstruct.ram_copies,
-    {Cs2, Head2} = set_frag_node(Cs, Pos, Head),
-    set_frag_nodes(NR - 1, ND, NDO, Cs2, Tail, [Head2 | Acc]); 
-set_frag_nodes(NR, ND, NDO, Cs, [Head | Tail], Acc) when ND > 0 ->
-    Pos = #cstruct.disc_copies,
-    {Cs2, Head2} = set_frag_node(Cs, Pos, Head),
-    set_frag_nodes(NR, ND - 1, NDO, Cs2, Tail, [Head2 | Acc]); 
-set_frag_nodes(NR, ND, NDO, Cs, [Head | Tail], Acc) when NDO > 0 ->
-    Pos = #cstruct.disc_only_copies,
-    {Cs2, Head2} = set_frag_node(Cs, Pos, Head),
-    set_frag_nodes(NR, ND, NDO - 1, Cs2, Tail, [Head2 | Acc]); 
-set_frag_nodes(0, 0, 0, Cs, RestDist, ModDist) ->
-    {Cs, ModDist, RestDist};
-set_frag_nodes(_, _, _, Cs, [], _) ->
-    mnesia:abort({combine_error,  Cs#cstruct.name, "Too few nodes in node_pool"}).
-
-set_frag_node(Cs, Pos, Head) ->
-    Ns = element(Pos, Cs),
-    {Node, Count2} =  
-	case Head of
-	    {N, Count} when atom(N), integer(Count), Count >= 0 ->
-		{N, Count + 1};
-	    N when atom(N) ->
-		{N, 1};
-	    BadNode ->
-		mnesia:abort({bad_type, Cs#cstruct.name, BadNode})
-	end,
-    Cs2 = setelement(Pos, Cs, [Node | Ns]),
-    {Cs2, {Node, Count2}}.
-
-rearrange_dist(Cs, [{Node, Count} | ModDist], Dist, Pool) ->
-    Dist2 = insert_dist(Cs, Node, Count, Dist, Pool),
-    rearrange_dist(Cs, ModDist, Dist2, Pool);
-rearrange_dist(_Cs, [], Dist, _) ->
-    Dist.
-
-insert_dist(Cs, Node, Count, [Head | Tail], Pool) ->
-    case Head of
-	{Node2, Count2} when atom(Node2), integer(Count2), Count2 >= 0 ->
-	    case node_diff(Node, Count, Node2, Count2, Pool) of
-		less ->
-		    [{Node, Count}, Head | Tail];
-		greater ->
-		    [Head | insert_dist(Cs, Node, Count, Tail, Pool)]
-	    end;
-	Node2 when atom(Node2) -> 
-	    insert_dist(Cs, Node, Count, [{Node2, 0} | Tail], Pool);
-	BadNode ->
-	    mnesia:abort({bad_type, Cs#cstruct.name, BadNode})
-    end;
-insert_dist(_Cs, Node, Count, [], _Pool) ->
-    [{Node, Count}];
-insert_dist(_Cs, _Node, _Count, Dist, _Pool) ->
-    mnesia:abort({bad_type, Dist}).
-    
-node_diff(_Node, Count, _Node2, Count2, _Pool) when Count < Count2 ->
-    less;
-node_diff(Node, Count, Node2, Count2, Pool) when Count == Count2 ->
-    Pos = list_pos(Node, Pool, 1),
-    Pos2 = list_pos(Node2, Pool, 1),
-    if
-	Pos < Pos2 ->
-	    less;
-	Pos > Pos2 ->
-	    greater
-    end;
-node_diff(_Node, Count, _Node2, Count2, _Pool) when Count > Count2 ->
-    greater.
-
-%% Returns position of element in list
-list_pos(H,  [H | _T], Pos) ->
-    Pos;
-list_pos(E,  [_H | T], Pos) ->
-    list_pos(E,  T, Pos + 1).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Switch function for changing of table fragmentation
-%%
-%% Returns a list of lists of schema ops 
-
-change_table_frag(Tab, {activate, FragProps}) ->
-    make_activate(Tab, FragProps);
-change_table_frag(Tab, deactivate) ->
-    make_deactivate(Tab);
-change_table_frag(Tab,  {add_frag, SortedNodes}) ->
-    make_multi_add_frag(Tab, SortedNodes);
-change_table_frag(Tab,  del_frag) ->
-    make_multi_del_frag(Tab);
-change_table_frag(Tab,  {add_node, Node}) ->
-    make_multi_add_node(Tab, Node);
-change_table_frag(Tab,  {del_node, Node}) ->
-    make_multi_del_node(Tab, Node);
-change_table_frag(Tab,  Change) ->
-    mnesia:abort({bad_type, Tab, Change}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Turn a normal table into a fragmented table
-%% 
-%% The storage type must be the same on all nodes
-
-make_activate(Tab, Props) ->
-    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
-    mnesia_schema:ensure_active(Cs),
-    case Cs#cstruct.frag_properties of
-	[] ->
-	    Cs2 = Cs#cstruct{frag_properties = Props},
-	    [Cs3] = expand_cstruct(Cs2, activate),
-	    TabDef = mnesia_schema:cs2list(Cs3),
-	    Op = {op, change_table_frag, activate, TabDef},
-	    [[Op]];
-	BadProps ->
-	    mnesia:abort({already_exists, Tab, {frag_properties, BadProps}})
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Turn a table into a normal defragmented table
-
-make_deactivate(Tab) ->
-    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
-    mnesia_schema:ensure_active(Cs),
-    Foreigners = lookup_foreigners(Tab),
-    BaseTab = lookup_prop(Tab, base_table),
-    FH = lookup_frag_hash(Tab),
-    if
-	BaseTab /= Tab ->
-	    mnesia:abort({combine_error, Tab, "Not a base table"});
-	Foreigners /= [] ->
-	    mnesia:abort({combine_error, Tab, "Too many foreigners", Foreigners});
-	FH#frag_state.n_fragments > 1 ->
-	    mnesia:abort({combine_error, Tab, "Too many fragments"});
-	true ->
-	    Cs2 = Cs#cstruct{frag_properties = []},
-	    TabDef = mnesia_schema:cs2list(Cs2),
-	    Op = {op, change_table_frag, deactivate, TabDef},
-	    [[Op]]
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Add a fragment to a fragmented table  and fill it with half of
-%% the records from one of the old fragments
-    
-make_multi_add_frag(Tab, SortedNs) when list(SortedNs) ->
-    verify_multi(Tab),
-    Ops = make_add_frag(Tab, SortedNs),
-
-    %% Propagate to foreigners
-    MoreOps = [make_add_frag(T, SortedNs) || T <- lookup_foreigners(Tab)],
-    [Ops | MoreOps]; 
-make_multi_add_frag(Tab, SortedNs) ->
-    mnesia:abort({bad_type, Tab, SortedNs}).
-
-verify_multi(Tab) ->
-    FH = lookup_frag_hash(Tab),
-    ForeignKey = FH#frag_state.foreign_key,
-    mnesia_schema:verify(undefined, ForeignKey, 
-			 {combine_error, Tab, 
-			  "Op only allowed via foreign table",
-			  {foreign_key, ForeignKey}}).
-
-make_frag_names_and_acquire_locks(Tab, N, FragIndecies, DoNotLockN) ->
-    mnesia_schema:get_tid_ts_and_lock(Tab, write),
-    Fun = fun(Index, FN) ->
-		  if
-		      DoNotLockN == true, Index == N ->
-			  Name = n_to_frag_name(Tab, Index),
-			  setelement(Index, FN, Name);
-		      true ->
-			  Name = n_to_frag_name(Tab, Index),
-			  mnesia_schema:get_tid_ts_and_lock(Name, write),
-			  setelement(Index , FN, Name)
-		  end
-	  end,
-    FragNames = erlang:make_tuple(N, undefined),
-    lists:foldl(Fun, FragNames, FragIndecies).
-    
-make_add_frag(Tab, SortedNs) ->
-    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
-    mnesia_schema:ensure_active(Cs),
-    FH = lookup_frag_hash(Tab),
-    {FH2, FromIndecies, WriteIndecies} = adjust_before_split(FH),
-    N = FH2#frag_state.n_fragments,
-    FragNames = make_frag_names_and_acquire_locks(Tab, N, WriteIndecies, true),
-    NewFrag = element(N, FragNames),
-
-    NR = length(Cs#cstruct.ram_copies), 
-    ND = length(Cs#cstruct.disc_copies), 
-    NDO = length(Cs#cstruct.disc_only_copies),
-    NewCs = Cs#cstruct{name = NewFrag,
-		       frag_properties = [{base_table, Tab}],
-		       ram_copies = [],
-		       disc_copies = [],
-		       disc_only_copies = []},
-    {NewCs2, _, _} = set_frag_nodes(NR, ND, NDO, NewCs, SortedNs, []),
-    [NewOp] = mnesia_schema:make_create_table(NewCs2),
-
-    SplitOps = split(Tab, FH2, FromIndecies, FragNames, []),
-
-    Cs2 = replace_frag_hash(Cs, FH2),
-    TabDef = mnesia_schema:cs2list(Cs2),
-    BaseOp = {op, change_table_frag, {add_frag, SortedNs}, TabDef},
-
-    [BaseOp, NewOp | SplitOps].
-
-replace_frag_hash(Cs, FH) when record(FH, frag_state) ->
-    Fun = fun(Prop) ->
-		  case Prop of
-		      {n_fragments, _} ->
-			  {true, {n_fragments, FH#frag_state.n_fragments}};
-		      {hash_module, _} ->
-			  {true, {hash_module, FH#frag_state.hash_module}};
-		      {hash_state, _} ->
-			  {true, {hash_state, FH#frag_state.hash_state}};
-		      {next_n_to_split, _} ->
-			  false;
-		      {n_doubles, _} ->
-			  false;
-		      _ ->
-			  true
-		  end
-	  end,
-    Props = lists:zf(Fun, Cs#cstruct.frag_properties),
-    Cs#cstruct{frag_properties = Props}.
-
-%% Adjust table info before split
-adjust_before_split(FH) ->
-    HashState = FH#frag_state.hash_state,
-    {HashState2, FromFrags, AdditionalWriteFrags} = 
-	case FH#frag_state.hash_module of
-	    HashMod when HashMod == ?DEFAULT_HASH_MOD ->
-		?DEFAULT_HASH_MOD:add_frag(HashState);
-	    HashMod ->
-		HashMod:add_frag(HashState)
-	end,
-    N = FH#frag_state.n_fragments + 1,
-    FromFrags2 = (catch lists:sort(FromFrags)),
-    UnionFrags = (catch lists:merge(FromFrags2, lists:sort(AdditionalWriteFrags))),
-    VerifyFun = fun(F) when integer(F), F >= 1, F =< N -> false;
-		   (_F) -> true
-		end,
-    case catch lists:filter(VerifyFun, UnionFrags) of
-	[] ->
-	    FH2 = FH#frag_state{n_fragments = N,
-				hash_state  = HashState2},
-	    {FH2, FromFrags2, UnionFrags};
-	BadFrags ->
-	    mnesia:abort({"add_frag: Fragment numbers out of range",
-			  BadFrags, {range, 1, N}})
-    end.
-
-split(Tab, FH, [SplitN | SplitNs], FragNames, Ops) ->
-    SplitFrag = element(SplitN, FragNames),
-    Pat = mnesia:table_info(SplitFrag, wild_pattern),
-    {_Mod, Tid, Ts} = mnesia_schema:get_tid_ts_and_lock(Tab, none),
-    Recs = mnesia:match_object(Tid, Ts, SplitFrag, Pat, read),
-    Ops2 = do_split(FH, SplitN, FragNames, Recs, Ops),
-    split(Tab, FH, SplitNs, FragNames, Ops2);
-split(_Tab, _FH, [], _FragNames, Ops) ->
-    Ops.
-
-%% Perform the split of the table
-do_split(FH, OldN, FragNames, [Rec | Recs], Ops) ->
-    Pos = key_pos(FH),
-    HashKey = element(Pos, Rec),
-    case key_to_n(FH, HashKey) of
-	NewN when NewN == OldN ->
-	    %% Keep record in the same fragment. No need to move it.
-	    do_split(FH, OldN, FragNames, Recs, Ops);
-	NewN ->
-	    case element(NewN, FragNames) of
-		NewFrag when NewFrag /= undefined ->
-		    OldFrag = element(OldN, FragNames),
-		    Key = element(2, Rec),
-		    NewOid = {NewFrag, Key},
-		    OldOid = {OldFrag, Key},
-		    Ops2 = [{op, rec, unknown, {NewOid, [Rec], write}}, 
-			    {op, rec, unknown, {OldOid, [OldOid], delete}} | Ops],
-		    do_split(FH, OldN, FragNames, Recs, Ops2);
-		_NewFrag ->
-		    %% Tried to move record to fragment that not is locked
-		    mnesia:abort({"add_frag: Fragment not locked", NewN})
-	    end
-    end;
-do_split(_FH, _OldN, _FragNames, [], Ops) ->
-    Ops.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Delete a fragment from a fragmented table
-%% and merge its records with an other fragment
-    
-make_multi_del_frag(Tab) ->
-    verify_multi(Tab),
-    Ops = make_del_frag(Tab),
-
-    %% Propagate to foreigners
-    MoreOps = [make_del_frag(T) || T <- lookup_foreigners(Tab)],
-    [Ops | MoreOps].
-
-make_del_frag(Tab) ->
-    FH = lookup_frag_hash(Tab),
-    case FH#frag_state.n_fragments of
-	N when N > 1 ->
-	    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
-	    mnesia_schema:ensure_active(Cs),
-	    {FH2, FromIndecies, WriteIndecies} = adjust_before_merge(FH),
-	    FragNames = make_frag_names_and_acquire_locks(Tab, N, WriteIndecies, false),
-
-	    MergeOps = merge(Tab, FH2, FromIndecies, FragNames, []),
-	    LastFrag = element(N, FragNames),
-	    [LastOp] = mnesia_schema:make_delete_table(LastFrag, single_frag),
-	    Cs2 = replace_frag_hash(Cs, FH2),
-	    TabDef = mnesia_schema:cs2list(Cs2),
-	    BaseOp = {op, change_table_frag, del_frag, TabDef},
-	    [BaseOp, LastOp | MergeOps];
-	_ ->
-	    %% Cannot remove the last fragment
-	    mnesia:abort({no_exists, Tab})
-    end.
-
-%% Adjust tab info before merge
-adjust_before_merge(FH) ->
-    HashState = FH#frag_state.hash_state,
-    {HashState2, FromFrags, AdditionalWriteFrags} = 
-	case FH#frag_state.hash_module of
-	    HashMod when HashMod == ?DEFAULT_HASH_MOD ->
-		?DEFAULT_HASH_MOD:del_frag(HashState);
-	    HashMod ->
-		HashMod:del_frag(HashState)
-	end,
-    N = FH#frag_state.n_fragments,
-    FromFrags2 = (catch lists:sort(FromFrags)),
-    UnionFrags = (catch lists:merge(FromFrags2, lists:sort(AdditionalWriteFrags))),
-    VerifyFun = fun(F) when integer(F), F >= 1, F =< N -> false;
-		   (_F) -> true
-		end,
-    case catch lists:filter(VerifyFun, UnionFrags) of
-	[] ->
-	    case lists:member(N, FromFrags2) of
-		true ->
-		    FH2 = FH#frag_state{n_fragments = N - 1,
-					hash_state  = HashState2},
-		    {FH2, FromFrags2, UnionFrags};
-		false ->
-		    mnesia:abort({"del_frag: Last fragment number not included", N})
-	    end;
-	BadFrags ->
-	    mnesia:abort({"del_frag: Fragment numbers out of range",
-			  BadFrags, {range, 1, N}})
-    end.
-
-merge(Tab, FH, [FromN | FromNs], FragNames, Ops) ->
-    FromFrag = element(FromN, FragNames),
-    Pat = mnesia:table_info(FromFrag, wild_pattern),
-    {_Mod, Tid, Ts} = mnesia_schema:get_tid_ts_and_lock(Tab, none),
-    Recs = mnesia:match_object(Tid, Ts, FromFrag, Pat, read),
-    Ops2 = do_merge(FH, FromN, FragNames, Recs, Ops),
-    merge(Tab, FH, FromNs, FragNames, Ops2);
-merge(_Tab, _FH, [], _FragNames, Ops) ->
-    Ops.
-
-%% Perform the merge of the table
-do_merge(FH, OldN, FragNames, [Rec | Recs], Ops) ->
-    Pos = key_pos(FH),
-    LastN = FH#frag_state.n_fragments + 1,
-    HashKey = element(Pos, Rec),
-    case key_to_n(FH, HashKey) of
-	NewN when NewN == LastN ->
-	    %% Tried to leave a record in the fragment that is to be deleted
-	    mnesia:abort({"del_frag: Fragment number out of range",
-			  NewN, {range, 1, LastN}});
-	NewN when NewN == OldN ->
-	    %% Keep record in the same fragment. No need to move it.
-	    do_merge(FH, OldN, FragNames, Recs, Ops);
-	NewN when OldN == LastN ->
-	    %% Move record from the fragment that is to be deleted
-	    %% No need to create a delete op for each record.
-	    case element(NewN, FragNames) of
-		NewFrag when NewFrag /= undefined ->
-		    Key = element(2, Rec),
-		    NewOid = {NewFrag, Key},
-		    Ops2 = [{op, rec, unknown, {NewOid, [Rec], write}} | Ops],
-		    do_merge(FH, OldN, FragNames, Recs, Ops2);
-		_NewFrag ->
-		    %% Tried to move record to fragment that not is locked
-		    mnesia:abort({"del_frag: Fragment not locked", NewN})
-	    end;
-	NewN ->
-	    case element(NewN, FragNames) of
-		NewFrag when NewFrag /= undefined ->
-		    OldFrag = element(OldN, FragNames),
-		    Key = element(2, Rec),
-		    NewOid = {NewFrag, Key},
-		    OldOid = {OldFrag, Key},
-		    Ops2 = [{op, rec, unknown, {NewOid, [Rec], write}}, 
-			    {op, rec, unknown, {OldOid, [OldOid], delete}} | Ops],
-		    do_merge(FH, OldN, FragNames, Recs, Ops2);
-		_NewFrag ->
-		    %% Tried to move record to fragment that not is locked
-		    mnesia:abort({"del_frag: Fragment not locked", NewN})
-	    end
-    end;
- do_merge(_FH, _OldN, _FragNames, [], Ops) ->
-   Ops.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Add a node to the node pool of a fragmented table
-    
-make_multi_add_node(Tab, Node)  ->
-    verify_multi(Tab),
-    Ops = make_add_node(Tab, Node),
-
-    %% Propagate to foreigners
-    MoreOps = [make_add_node(T, Node) || T <- lookup_foreigners(Tab)],
-    [Ops | MoreOps].
-    
-make_add_node(Tab, Node) when atom(Node)  ->
-    Pool = lookup_prop(Tab, node_pool),
-    case lists:member(Node, Pool) of
-	false ->
-	    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
-	    Pool2 = Pool ++ [Node],
-	    Props = Cs#cstruct.frag_properties,
-	    Props2 = lists:keyreplace(node_pool, 1, Props, {node_pool, Pool2}),
-	    Cs2 = Cs#cstruct{frag_properties = Props2},
-	    TabDef = mnesia_schema:cs2list(Cs2),
-	    Op = {op, change_table_frag, {add_node, Node}, TabDef},
-	    [Op];
-	true ->
-	    mnesia:abort({already_exists, Tab, Node})
-    end;
-make_add_node(Tab, Node) ->
-    mnesia:abort({bad_type, Tab, Node}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Delet a node from the node pool of a fragmented table
-
-make_multi_del_node(Tab, Node)  ->
-    verify_multi(Tab),
-    Ops = make_del_node(Tab, Node),
-
-    %% Propagate to foreigners
-    MoreOps = [make_del_node(T, Node) || T <- lookup_foreigners(Tab)],
-    [Ops | MoreOps].
-    
-make_del_node(Tab, Node) when atom(Node) ->
-    Cs = mnesia_schema:incr_version(val({Tab, cstruct})),
-    mnesia_schema:ensure_active(Cs),
-    Pool = lookup_prop(Tab, node_pool),
-    case lists:member(Node, Pool) of
-	true ->
-	    Pool2 = Pool -- [Node],
-	    Props = lists:keyreplace(node_pool, 1, Cs#cstruct.frag_properties, {node_pool, Pool2}),
-	    Cs2 = Cs#cstruct{frag_properties = Props},
-	    TabDef = mnesia_schema:cs2list(Cs2),
-	    Op = {op, change_table_frag, {del_node, Node}, TabDef},
-	    [Op];
-	false ->
-	    mnesia:abort({no_exists, Tab, Node})
-    end;
-make_del_node(Tab, Node) ->
-    mnesia:abort({bad_type, Tab, Node}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Special case used to remove all references to a node during 
-%% mnesia:del_table_copy(schema, Node)
-
-remove_node(Node, Cs) ->
-    Tab = Cs#cstruct.name,
-    case is_top_frag(Tab) of
-	false ->
-	    {Cs, false};
-	true -> 
-	    Pool = lookup_prop(Tab, node_pool),
-	    case lists:member(Node, Pool) of
-		true ->
-		    Pool2 = Pool -- [Node],
-		    Props = lists:keyreplace(node_pool, 1, 
-					     Cs#cstruct.frag_properties, 
-					     {node_pool, Pool2}),
-		    {Cs#cstruct{frag_properties = Props}, true};
-		false ->
-		    {Cs, false}
-	    end
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Helpers
-
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason); 
-	Value -> Value 
-    end.
-
-set_frag_hash(Tab, Props) ->
-    case props_to_frag_hash(Tab, Props) of
-	FH when record(FH, frag_state) ->
-	    mnesia_lib:set({Tab, frag_hash}, FH);
-	no_hash ->
-	    mnesia_lib:unset({Tab, frag_hash})
-    end.
-
-props_to_frag_hash(_Tab, []) ->
-    no_hash;
-props_to_frag_hash(Tab, Props) ->
-    case mnesia_schema:pick(Tab, base_table, Props, undefined) of
-	T when T == Tab ->
-	    Foreign = mnesia_schema:pick(Tab, foreign_key, Props, must),
-	    N = mnesia_schema:pick(Tab, n_fragments, Props, must),
-	    
-	    case mnesia_schema:pick(Tab, hash_module, Props, undefined) of
-		undefined ->
-		    Split = mnesia_schema:pick(Tab, next_n_to_split, Props, must),
-		    Doubles = mnesia_schema:pick(Tab, n_doubles, Props, must),
-		    FH = {frag_hash, Foreign, N, Split, Doubles},
-		    HashState = ?OLD_HASH_MOD:init_state(Tab, FH),
-    		    #frag_state{foreign_key = Foreign,
-				n_fragments = N,
-				hash_module = ?OLD_HASH_MOD,
-				hash_state  = HashState};
-		HashMod ->
-		    HashState = mnesia_schema:pick(Tab, hash_state, Props, must),
-		    #frag_state{foreign_key = Foreign,
-				n_fragments = N,
-				hash_module = HashMod,
-				hash_state  = HashState}
-		    %% Old style. Kept for backwards compatibility.
-	    end;
-	_ ->
-	    no_hash
-    end.
-
-lookup_prop(Tab, Prop) ->
-    Props = val({Tab, frag_properties}),
-    case lists:keysearch(Prop, 1,  Props) of
-	{value, {Prop, Val}} ->
-	    Val;
-	false ->
-	    mnesia:abort({no_exists, Tab, Prop, {frag_properties, Props}})
-    end.
-
-lookup_frag_hash(Tab) ->
-    case ?catch_val({Tab, frag_hash}) of
-	FH when record(FH, frag_state) ->
-	    FH;
-	{frag_hash, K, N, _S, _D} = FH ->
-	    %% Old style. Kept for backwards compatibility.
-	    HashState = ?OLD_HASH_MOD:init_state(Tab, FH),
-	    #frag_state{foreign_key = K, 
-			n_fragments = N, 
-			hash_module = ?OLD_HASH_MOD,
-			hash_state  = HashState};    
-	{'EXIT', _} ->
-	    mnesia:abort({no_exists, Tab, frag_properties, frag_hash})
-    end.
-
-is_top_frag(Tab) ->
-    case ?catch_val({Tab, frag_hash}) of
-	{'EXIT', _} ->
-	    false;
-	_ -> 
-	    [] == lookup_foreigners(Tab)
-    end.
-
-%% Returns a list of tables
-lookup_foreigners(Tab) ->
-    %% First field in HashPat is either frag_hash or frag_state
-    HashPat = {'_', {Tab, '_'}, '_', '_', '_'},
-    [T || [T] <- ?ets_match(mnesia_gvar, {{'$1', frag_hash}, HashPat})].
-
-%% Returns name of fragment table
-record_to_frag_name(Tab, Rec) ->
-    case ?catch_val({Tab, frag_hash}) of
-	{'EXIT', _} ->
-	    Tab;
-	FH ->
-	    Pos = key_pos(FH),
-	    Key = element(Pos, Rec),
-	    N = key_to_n(FH, Key),
-	    n_to_frag_name(Tab, N)
-    end.
-
-key_pos(FH) ->
-    case FH#frag_state.foreign_key of
-	undefined ->
-	    2;
-	{_ForeignTab, Pos} -> 
-	    Pos
-    end.
-    
-%% Returns name of fragment table
-key_to_frag_name({BaseTab, _} = Tab, Key) ->
-    N = key_to_frag_number(Tab, Key),
-    n_to_frag_name(BaseTab, N);
-key_to_frag_name(Tab, Key) ->
-    N = key_to_frag_number(Tab, Key),
-    n_to_frag_name(Tab, N).
-
-%% Returns name of fragment table
-n_to_frag_name(Tab, 1) ->
-    Tab;
-n_to_frag_name(Tab, N) when atom(Tab), integer(N) ->
-    list_to_atom(atom_to_list(Tab) ++ "_frag" ++ integer_to_list(N));
-n_to_frag_name(Tab, N) ->
-    mnesia:abort({bad_type, Tab, N}).
-
-%% Returns name of fragment table
-key_to_frag_number({Tab, ForeignKey}, _Key) ->
-    FH = val({Tab, frag_hash}),
-    case FH#frag_state.foreign_key of
-	{_ForeignTab, _Pos} ->
-	    key_to_n(FH, ForeignKey);
-	undefined ->
-	    mnesia:abort({combine_error, Tab, frag_properties,
-			  {foreign_key, undefined}})
-    end;
-key_to_frag_number(Tab, Key) ->
-    case ?catch_val({Tab, frag_hash}) of
-	{'EXIT', _} ->
-	    1;
-	FH ->
-	    key_to_n(FH, Key)
-    end.
-
-%% Returns fragment number
-key_to_n(FH, Key) ->
-    HashState = FH#frag_state.hash_state,
-    N = 
-	case FH#frag_state.hash_module of
-	    HashMod when HashMod == ?DEFAULT_HASH_MOD ->
-		?DEFAULT_HASH_MOD:key_to_frag_number(HashState, Key);
-	    HashMod ->
-		HashMod:key_to_frag_number(HashState, Key)
-	end,
-    if
-	integer(N), N >= 1, N =< FH#frag_state.n_fragments ->
-	    N;
-	true ->
-	    mnesia:abort({"key_to_frag_number: Fragment number out of range",
-			  N, {range, 1, FH#frag_state.n_fragments}})
-    end.
-
-%% Returns a list of frament table names
-frag_names(Tab) ->
-    case ?catch_val({Tab, frag_hash}) of
-	{'EXIT', _} ->
-	    [Tab];
-	FH ->
-	    N = FH#frag_state.n_fragments,
-	    frag_names(Tab, N, [])
-    end.
-
-frag_names(Tab, 1, Acc) ->
-    [Tab | Acc];
-frag_names(Tab, N, Acc) ->
-    Frag = n_to_frag_name(Tab, N),
-    frag_names(Tab, N - 1, [Frag | Acc]).
-
-%% Returns a list of {Node, FragCount} tuples
-%% sorted on FragCounts
-frag_dist(Tab) ->
-    Pool = lookup_prop(Tab, node_pool),
-    Dist = [{good, Node, 0} || Node <- Pool],
-    Dist2 = count_frag(frag_names(Tab), Dist),
-    sort_dist(Dist2).
-
-count_frag([Frag | Frags], Dist) ->
-    Dist2 =  incr_nodes(val({Frag, ram_copies}), Dist),
-    Dist3 =  incr_nodes(val({Frag, disc_copies}), Dist2),
-    Dist4 =  incr_nodes(val({Frag, disc_only_copies}), Dist3),
-    count_frag(Frags, Dist4);
-count_frag([], Dist) ->
-    Dist.
-
-incr_nodes([Node | Nodes], Dist) ->
-    Dist2 = incr_node(Node, Dist),
-    incr_nodes(Nodes, Dist2);
-incr_nodes([], Dist) ->
-    Dist.
-
-incr_node(Node, [{Kind, Node, Count} | Tail]) ->
-    [{Kind, Node, Count + 1} | Tail];
-incr_node(Node, [Head | Tail]) ->
-    [Head | incr_node(Node, Tail)];
-incr_node(Node, []) ->
-    [{bad, Node, 1}].
-
-%% Sorts dist according in decreasing count order
-sort_dist(Dist) -> 
-    Dist2 = deep_dist(Dist, []),
-    Dist3 = lists:keysort(1, Dist2),
-    shallow_dist(Dist3).
-
-deep_dist([Head | Tail], Deep) ->
-    {Kind, _Node, Count} = Head,
-    {Tag, Same, Other} = pick_count(Kind, Count, [Head | Tail]),
-    deep_dist(Other, [{Tag, Same} | Deep]);
-deep_dist([], Deep) ->
-    Deep.
-
-pick_count(Kind, Count, [{Kind2, Node2, Count2} | Tail]) ->
-    Head = {Node2, Count2},
-    {_, Same, Other} = pick_count(Kind, Count, Tail),
-    if
-	Kind == bad ->
-	    {bad, [Head | Same], Other};
-	Kind2 == bad ->
-	    {Count, Same, [{Kind2, Node2, Count2} | Other]};
-	Count == Count2 ->
-	    {Count, [Head | Same], Other};
-	true ->
-	    {Count, Same, [{Kind2, Node2, Count2} | Other]}
-    end;
-pick_count(_Kind, Count, []) ->
-    {Count, [], []}.
-
-shallow_dist([{_Tag, Shallow} | Deep]) ->
-    Shallow ++ shallow_dist(Deep);
-shallow_dist([]) ->
-    [].
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_frag_hash.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_frag_hash.erl
deleted file mode 100644
index 19b97f8d61..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_frag_hash.erl
+++ /dev/null
@@ -1,118 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_frag_hash.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%
-%%%----------------------------------------------------------------------
-%%% Purpose : Implements hashing functionality for fragmented tables
-%%%----------------------------------------------------------------------
-
-%header_doc_include
--module(mnesia_frag_hash).
--behaviour(mnesia_frag_hash).
-
-%% Fragmented Table Hashing callback functions
--export([
-	 init_state/2,
-	 add_frag/1,
-	 del_frag/1,
-	 key_to_frag_number/2,
-	 match_spec_to_frag_numbers/2
-	]).
-
-%header_doc_include
-
-%impl_doc_include
--record(hash_state, {n_fragments, next_n_to_split, n_doubles}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-init_state(_Tab, State) when State == undefined ->
-    #hash_state{n_fragments = 1,
-		next_n_to_split = 1,
-		n_doubles = 0}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-add_frag(State) when record(State, hash_state) ->
-    SplitN = State#hash_state.next_n_to_split,
-    P = SplitN + 1,
-    L = State#hash_state.n_doubles,
-    NewN = State#hash_state.n_fragments + 1,
-    State2 = case trunc(math:pow(2, L)) + 1 of
-		 P2 when P2 == P ->
-		     State#hash_state{n_fragments = NewN,
-				      n_doubles = L + 1,
-				      next_n_to_split = 1};
-		 _ ->
-		     State#hash_state{n_fragments = NewN,
-				      next_n_to_split = P}
-	     end,
-    {State2, [SplitN], [NewN]}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-del_frag(State) when record(State, hash_state) ->
-    P = State#hash_state.next_n_to_split - 1,
-    L = State#hash_state.n_doubles,
-    N = State#hash_state.n_fragments,
-    if
-	P < 1 ->
-	    L2 = L - 1,
-	    MergeN = trunc(math:pow(2, L2)),
-	    State2 = State#hash_state{n_fragments = N - 1,
-				      next_n_to_split = MergeN,
-				      n_doubles = L2},
-	    {State2, [N], [MergeN]};
-	true ->
-	    MergeN = P,
-	    State2 = State#hash_state{n_fragments = N - 1,
-				      next_n_to_split = MergeN},
-	    {State2, [N], [MergeN]}
-	end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-key_to_frag_number(State, Key) when record(State, hash_state) ->
-    L = State#hash_state.n_doubles,
-    A = erlang:phash(Key, trunc(math:pow(2, L))),
-    P = State#hash_state.next_n_to_split,
-    if
-	A < P ->
-	    erlang:phash(Key, trunc(math:pow(2, L + 1)));
-	true ->
-	    A
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-match_spec_to_frag_numbers(State, MatchSpec) when record(State, hash_state) ->
-    case MatchSpec of
-	[{HeadPat, _, _}] when tuple(HeadPat), size(HeadPat) > 2 ->
-	    KeyPat = element(2, HeadPat),
-	    case has_var(KeyPat) of
-		false ->
-		    [key_to_frag_number(State, KeyPat)];
-		true ->
-		    lists:seq(1, State#hash_state.n_fragments)
-	    end;
-	_ -> 
-	    lists:seq(1, State#hash_state.n_fragments)
-    end.
-
-%impl_doc_include
-
-has_var(Pat) ->
-    mnesia:has_var(Pat).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_frag_old_hash.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_frag_old_hash.erl
deleted file mode 100644
index 6560613302..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_frag_old_hash.erl
+++ /dev/null
@@ -1,127 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_frag_old_hash.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%
-%%%----------------------------------------------------------------------
-%%% Purpose : Implements hashing functionality for fragmented tables
-%%%----------------------------------------------------------------------
-
--module(mnesia_frag_old_hash).
--behaviour(mnesia_frag_hash).
-
-%% Hashing callback functions
--export([
-	 init_state/2,
-	 add_frag/1,
-	 del_frag/1,
-	 key_to_frag_number/2,
-	 match_spec_to_frag_numbers/2
-	]).
-
--record(old_hash_state,
-	{n_fragments,
-	 next_n_to_split,
-	 n_doubles}).
-
-%% Old style. Kept for backwards compatibility.
--record(frag_hash,
-	{foreign_key,
-	 n_fragments,
-	 next_n_to_split,
-	 n_doubles}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-init_state(_Tab, InitialState) when InitialState == undefined ->
-    #old_hash_state{n_fragments     = 1,
-		    next_n_to_split = 1,
-		    n_doubles       = 0};
-init_state(_Tab, FH) when record(FH, frag_hash) ->
-    %% Old style. Kept for backwards compatibility.
-    #old_hash_state{n_fragments     = FH#frag_hash.n_fragments,
-		    next_n_to_split = FH#frag_hash.next_n_to_split,
-		    n_doubles       = FH#frag_hash.n_doubles}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-add_frag(State) when record(State, old_hash_state) ->
-    SplitN = State#old_hash_state.next_n_to_split,
-    P = SplitN + 1,
-    L = State#old_hash_state.n_doubles,
-    NewN = State#old_hash_state.n_fragments + 1,
-    State2 = case trunc(math:pow(2, L)) + 1 of
-		 P2 when P2 == P ->
-		     State#old_hash_state{n_fragments = NewN,
-					  next_n_to_split = 1,
-					  n_doubles = L + 1};
-		 _ ->
-		     State#old_hash_state{n_fragments = NewN,
-					  next_n_to_split = P}
-	     end,
-    {State2, [SplitN], [NewN]}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-del_frag(State) when record(State, old_hash_state) ->
-    P = State#old_hash_state.next_n_to_split - 1,
-    L = State#old_hash_state.n_doubles,
-    N = State#old_hash_state.n_fragments,
-    if
-	P < 1 ->
-	    L2 = L - 1,
-	    MergeN = trunc(math:pow(2, L2)),
-	    State2 = State#old_hash_state{n_fragments = N - 1,
-					  next_n_to_split = MergeN,
-					  n_doubles = L2},
-	    {State2, [N], [MergeN]};
-	true ->
-	    MergeN = P,
-	    State2 = State#old_hash_state{n_fragments = N - 1,
-					  next_n_to_split = MergeN},
-	    {State2, [N], [MergeN]}
-	end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-key_to_frag_number(State, Key) when record(State, old_hash_state) ->
-    L = State#old_hash_state.n_doubles,
-    A = erlang:hash(Key, trunc(math:pow(2, L))),
-    P = State#old_hash_state.next_n_to_split,
-    if
-	A < P ->
-	    erlang:hash(Key, trunc(math:pow(2, L + 1)));
-	true ->
-	    A
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-match_spec_to_frag_numbers(State, MatchSpec) when record(State, old_hash_state) ->
-    case MatchSpec of
-	[{HeadPat, _, _}] when tuple(HeadPat), size(HeadPat) > 2 ->
-	    KeyPat = element(2, HeadPat),
-	    case has_var(KeyPat) of
-		false ->
-		    [key_to_frag_number(State, KeyPat)];
-		true ->
-		    lists:seq(1, State#old_hash_state.n_fragments)
-	    end;
-	_ -> 
-	    lists:seq(1, State#old_hash_state.n_fragments)
-    end.
-
-has_var(Pat) ->
-    mnesia:has_var(Pat).
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_index.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_index.erl
deleted file mode 100644
index 3455a4808a..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_index.erl
+++ /dev/null
@@ -1,380 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_index.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%
-%% Purpose: Handles index functionality in mnesia
-
--module(mnesia_index).
--export([read/5,
-	 add_index/5,
-	 delete_index/3,
-	 del_object_index/5,
-	 clear_index/4,
-	 dirty_match_object/3,
-	 dirty_select/3,
-	 dirty_read/3,
-	 dirty_read2/3,
-
-	 db_put/2,
-	 db_get/2,
-	 db_match_erase/2,
-	 get_index_table/2,
-	 get_index_table/3,
-	 
-	 tab2filename/2,
-	 tab2tmp_filename/2,
-	 init_index/2,
-	 init_indecies/3,
-	 del_transient/2,
-	 del_transient/3,
-	 del_index_table/3]).
-
--import(mnesia_lib, [verbose/2]).
--include("mnesia.hrl").
-
--record(index, {setorbag, pos_list}).
-
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_); 
-	_VaLuE_ -> _VaLuE_ 
-    end.
-
-%% read an object list throuh its index table
-%% we assume that table Tab has index on attribute number Pos
-
-read(Tid, Store, Tab, IxKey, Pos) ->
-    ResList = mnesia_locker:ixrlock(Tid, Store, Tab, IxKey, Pos),
-    %% Remove all tuples which don't include Ixkey, happens when Tab is a bag
-    case val({Tab, setorbag}) of
-	bag -> 
-	    mnesia_lib:key_search_all(IxKey, Pos, ResList);
-	_ -> 
-	    ResList
-    end.
-
-add_index(Index, Tab, Key, Obj, Old) ->    
-    add_index2(Index#index.pos_list, Index#index.setorbag, Tab, Key, Obj, Old).
-
-add_index2([{Pos, Ixt} |Tail], bag, Tab, K, Obj, OldRecs) ->
-    db_put(Ixt, {element(Pos, Obj), K}),
-    add_index2(Tail, bag, Tab, K, Obj, OldRecs);
-add_index2([{Pos, Ixt} |Tail], Type, Tab, K, Obj, OldRecs) ->
-    %% Remove old tuples in index if Tab is updated
-    case OldRecs of 
-	undefined -> 
-	    Old = mnesia_lib:db_get(Tab, K),
-	    del_ixes(Ixt, Old, Pos, K);
-	Old -> 
-	    del_ixes(Ixt, Old, Pos, K)
-    end,
-    db_put(Ixt, {element(Pos, Obj), K}),
-    add_index2(Tail, Type, Tab, K, Obj, OldRecs);
-add_index2([], _, _Tab, _K, _Obj, _) -> ok.
-
-delete_index(Index, Tab, K) ->
-    delete_index2(Index#index.pos_list, Tab, K).
-
-delete_index2([{Pos, Ixt} | Tail], Tab, K) ->
-    DelObjs = mnesia_lib:db_get(Tab, K), 
-    del_ixes(Ixt, DelObjs, Pos, K),
-    delete_index2(Tail, Tab, K);
-delete_index2([], _Tab, _K) -> ok.
-
-
-del_ixes(_Ixt, [], _Pos, _L) -> ok;
-del_ixes(Ixt, [Obj | Tail], Pos, Key) ->
-    db_match_erase(Ixt, {element(Pos, Obj), Key}),
-    del_ixes(Ixt, Tail, Pos, Key).
-
-del_object_index(Index, Tab, K, Obj, Old) ->
-    del_object_index2(Index#index.pos_list, Index#index.setorbag, Tab, K, Obj, Old).
-
-del_object_index2([], _, _Tab, _K, _Obj, _Old) -> ok;
-del_object_index2([{Pos, Ixt} | Tail], SoB, Tab, K, Obj, Old) ->
-    case SoB of
-	bag -> 
-	    del_object_bag(Tab, K, Obj, Pos, Ixt, Old);
-	_ -> %% If set remove the tuple in index table
-	    del_ixes(Ixt, [Obj], Pos, K)	
-    end,
-    del_object_index2(Tail, SoB, Tab, K, Obj, Old).
-
-del_object_bag(Tab, Key, Obj, Pos, Ixt, undefined) -> 
-    Old = mnesia_lib:db_get(Tab, Key),
-    del_object_bag(Tab, Key, Obj, Pos, Ixt, Old);
-%% If Tab type is bag we need remove index identifier if Tab 
-%% contains less than 2 elements. 
-del_object_bag(_Tab, Key, Obj, Pos, Ixt, Old) when length(Old) < 2 ->
-    del_ixes(Ixt, [Obj], Pos, Key);
-del_object_bag(_Tab, _Key, _Obj, _Pos, _Ixt, _Old) -> ok.
-
-clear_index(Index, Tab, K, Obj) ->
-    clear_index2(Index#index.pos_list, Tab, K, Obj).
-
-clear_index2([], _Tab, _K, _Obj) -> ok;
-clear_index2([{_Pos, Ixt} | Tail], Tab, K, Obj) ->
-    db_match_erase(Ixt, Obj),
-    clear_index2(Tail, Tab, K, Obj).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-dirty_match_object(Tab, Pat, Pos) ->
-    %% Assume that we are on the node where the replica is
-    case element(2, Pat) of
-	'_' ->
-	    IxKey = element(Pos, Pat),
-	    RealKeys = realkeys(Tab, Pos, IxKey),
-	    merge(RealKeys, Tab, Pat, []);
-	_Else ->
-	    mnesia_lib:db_match_object(Tab, Pat)
-    end.
-
-merge([{_IxKey, RealKey} | Tail], Tab, Pat, Ack) ->
-    %% Assume that we are on the node where the replica is
-    Pat2 = setelement(2, Pat, RealKey),
-    Recs = mnesia_lib:db_match_object(Tab, Pat2),
-    merge(Tail, Tab, Pat, Recs ++ Ack);
-merge([], _, _, Ack) ->
-    Ack.
-
-realkeys(Tab, Pos, IxKey) ->
-    Index = get_index_table(Tab, Pos),
-    db_get(Index, IxKey). % a list on the form [{IxKey, RealKey1} , ....
-    
-dirty_select(Tab, Spec, Pos) ->
-    %% Assume that we are on the node where the replica is
-    %% Returns the records without applying the match spec
-    %% The actual filtering is handled by the caller
-    IxKey = element(Pos, Spec),
-    RealKeys = realkeys(Tab, Pos, IxKey),
-    StorageType = val({Tab, storage_type}),
-    lists:append([mnesia_lib:db_get(StorageType, Tab, Key) || Key <- RealKeys]).
-
-dirty_read(Tab, IxKey, Pos) ->
-    ResList = mnesia:dirty_rpc(Tab, ?MODULE, dirty_read2,
-			       [Tab, IxKey, Pos]),
-    case val({Tab, setorbag}) of
-	bag ->
-	    %% Remove all tuples which don't include Ixkey
-	    mnesia_lib:key_search_all(IxKey, Pos, ResList);
-	_ -> 
-	    ResList
-    end.
-
-dirty_read2(Tab, IxKey, Pos) ->
-    Ix = get_index_table(Tab, Pos),
-    Keys = db_match(Ix, {IxKey, '$1'}),
-    r_keys(Keys, Tab, []).
-
-r_keys([[H]|T],Tab,Ack) -> 
-    V = mnesia_lib:db_get(Tab, H),
-    r_keys(T, Tab, V ++ Ack);
-r_keys([], _, Ack) ->
-    Ack.
-	    
-
-%%%%%%% Creation, Init and deletion routines for index tables
-%% We can have several indexes on the same table
-%% this can be a fairly costly operation if table is *very* large
-
-tab2filename(Tab, Pos) ->
-    mnesia_lib:dir(Tab) ++ "_" ++ integer_to_list(Pos) ++ ".DAT".
-
-tab2tmp_filename(Tab, Pos) ->
-    mnesia_lib:dir(Tab) ++ "_" ++ integer_to_list(Pos) ++ ".TMP".
-        
-init_index(Tab, Storage) ->
-    PosList = val({Tab, index}),
-    init_indecies(Tab, Storage, PosList).
-
-init_indecies(Tab, Storage, PosList) ->
-    case Storage of
-	unknown ->
-	    ignore;
-	disc_only_copies ->
-	    init_disc_index(Tab, PosList);
-	ram_copies ->
-	    make_ram_index(Tab, PosList);
-	disc_copies ->
-	    make_ram_index(Tab, PosList)
-    end.
-
-%% works for both ram and disc indexes
-
-del_index_table(_, unknown, _) ->
-    ignore;
-del_index_table(Tab, Storage, Pos) ->
-    delete_transient_index(Tab, Pos, Storage),
-    mnesia_lib:del({Tab, index}, Pos).
-
-del_transient(Tab, Storage) ->
-    PosList = val({Tab, index}),
-    del_transient(Tab, PosList, Storage).
-
-del_transient(_, [], _) -> done;
-del_transient(Tab, [Pos | Tail], Storage) ->
-    delete_transient_index(Tab, Pos, Storage),
-    del_transient(Tab, Tail, Storage).
-
-delete_transient_index(Tab, Pos, disc_only_copies) ->
-    Tag = {Tab, index, Pos},
-    mnesia_monitor:unsafe_close_dets(Tag),
-    file:delete(tab2filename(Tab, Pos)),
-    del_index_info(Tab, Pos), %% Uses val(..)
-    mnesia_lib:unset({Tab, {index, Pos}});
-
-delete_transient_index(Tab, Pos, _Storage) ->
-    Ixt = val({Tab, {index, Pos}}),
-    ?ets_delete_table(Ixt),
-    del_index_info(Tab, Pos),
-    mnesia_lib:unset({Tab, {index, Pos}}).
-
-%%%%% misc functions for the index create/init/delete functions above
-
-%% assuming that the file exists.
-init_disc_index(_Tab, []) ->
-    done;
-init_disc_index(Tab, [Pos | Tail]) when integer(Pos) ->
-    Fn = tab2filename(Tab, Pos),
-    IxTag = {Tab, index, Pos},
-    file:delete(Fn),
-    Args = [{file, Fn}, {keypos, 1}, {type, bag}],
-    mnesia_monitor:open_dets(IxTag, Args),
-    Storage = disc_only_copies,
-    Key = mnesia_lib:db_first(Storage, Tab),
-    Recs = mnesia_lib:db_get(Storage, Tab, Key),
-    BinSize = size(term_to_binary(Recs)),
-    KeysPerChunk = (4000 div BinSize) + 1,
-    Init = {start, KeysPerChunk},
-    mnesia_lib:db_fixtable(Storage, Tab, true),
-    ok = dets:init_table(IxTag, create_fun(Init, Tab, Pos)),
-    mnesia_lib:db_fixtable(Storage, Tab, false),
-    mnesia_lib:set({Tab, {index, Pos}}, IxTag),
-    add_index_info(Tab, val({Tab, setorbag}), {Pos, {dets, IxTag}}),
-    init_disc_index(Tab, Tail).
-
-create_fun(Cont, Tab, Pos) ->
-    fun(read) ->
-	    Data = 
-		case Cont of
-		    {start, KeysPerChunk} ->
-			mnesia_lib:db_init_chunk(disc_only_copies, Tab, KeysPerChunk);
-		    '$end_of_table' -> 
-			'$end_of_table';
-		    _Else ->
-			mnesia_lib:db_chunk(disc_only_copies, Cont)
-		end,
-	    case Data of
-		'$end_of_table' ->
-		    end_of_input;
-		{Recs, Next} ->
-		    IdxElems = [{element(Pos, Obj), element(2, Obj)} || Obj <- Recs],
-		    {IdxElems, create_fun(Next, Tab, Pos)}
-	    end;
-       (close) ->
-	    ok
-    end.
-
-make_ram_index(_, []) -> 
-    done;
-make_ram_index(Tab, [Pos | Tail]) ->
-    add_ram_index(Tab, Pos),
-    make_ram_index(Tab, Tail).
-
-add_ram_index(Tab, Pos) when integer(Pos) ->
-    verbose("Creating index for ~w ~n", [Tab]),
-    Index = mnesia_monitor:mktab(mnesia_index, [bag, public]),
-    Insert = fun(Rec, _Acc) ->
-		     true = ?ets_insert(Index, {element(Pos, Rec), element(2, Rec)})
-	     end,
-    mnesia_lib:db_fixtable(ram_copies, Tab, true),
-    true = ets:foldl(Insert, true, Tab),
-    mnesia_lib:db_fixtable(ram_copies, Tab, false),
-    mnesia_lib:set({Tab, {index, Pos}}, Index),
-    add_index_info(Tab, val({Tab, setorbag}), {Pos, {ram, Index}});
-add_ram_index(_Tab, snmp) ->
-    ok.
-
-add_index_info(Tab, Type, IxElem) ->
-    Commit = val({Tab, commit_work}),
-    case lists:keysearch(index, 1, Commit) of
-	false ->
-	    Index = #index{setorbag = Type, 
-			   pos_list = [IxElem]},
-	    %% Check later if mnesia_tm is sensative about the order 
-	    mnesia_lib:set({Tab, commit_work}, 
-			   mnesia_lib:sort_commit([Index | Commit]));
-	{value, Old} ->
-	    %% We could check for consistency here
-	    Index = Old#index{pos_list = [IxElem | Old#index.pos_list]},
-	    NewC = lists:keyreplace(index, 1, Commit, Index),
-	    mnesia_lib:set({Tab, commit_work}, 
-			   mnesia_lib:sort_commit(NewC))
-    end.
-
-del_index_info(Tab, Pos) ->
-    Commit = val({Tab, commit_work}),
-    case lists:keysearch(index, 1, Commit) of
-	false ->
-	    %% Something is wrong ignore
-	    skip;
-	{value, Old} ->
-	    case lists:keydelete(Pos, 1, Old#index.pos_list) of
-		[] -> 
-		    NewC = lists:keydelete(index, 1, Commit),
-		    mnesia_lib:set({Tab, commit_work}, 
-				   mnesia_lib:sort_commit(NewC));
-		New ->
-		    Index = Old#index{pos_list = New},
-		    NewC = lists:keyreplace(index, 1, Commit, Index),
-		    mnesia_lib:set({Tab, commit_work}, 
-				   mnesia_lib:sort_commit(NewC))
-	    end
-    end.
-
-db_put({ram, Ixt}, V) ->
-    true = ?ets_insert(Ixt, V);
-db_put({dets, Ixt}, V) ->
-    ok = dets:insert(Ixt, V).
-
-db_get({ram, Ixt}, K) ->
-    ?ets_lookup(Ixt, K);
-db_get({dets, Ixt}, K) ->
-    dets:lookup(Ixt, K).
-
-db_match_erase({ram, Ixt}, Pat) ->
-    true = ?ets_match_delete(Ixt, Pat);
-db_match_erase({dets, Ixt}, Pat) ->
-    ok = dets:match_delete(Ixt, Pat).
-    
-db_match({ram, Ixt}, Pat) ->
-    ?ets_match(Ixt, Pat);
-db_match({dets, Ixt}, Pat) ->
-    dets:match(Ixt, Pat).
-    
-get_index_table(Tab, Pos) ->
-    get_index_table(Tab,  val({Tab, storage_type}), Pos).
-
-get_index_table(Tab, ram_copies, Pos) ->
-    {ram,  val({Tab, {index, Pos}})};
-get_index_table(Tab, disc_copies, Pos) ->
-    {ram,  val({Tab, {index, Pos}})};
-get_index_table(Tab, disc_only_copies, Pos) ->
-    {dets, val({Tab, {index, Pos}})};
-get_index_table(_Tab, unknown, _Pos) ->
-    unknown.
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_kernel_sup.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_kernel_sup.erl
deleted file mode 100644
index 899d434fdd..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_kernel_sup.erl
+++ /dev/null
@@ -1,62 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_kernel_sup.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%
--module(mnesia_kernel_sup).
-
--behaviour(supervisor).
-
--export([start/0, init/1, supervisor_timeout/1]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% top supervisor callback functions
-
-start() ->
-    supervisor:start_link({local, mnesia_kernel_sup}, ?MODULE, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% sub supervisor callback functions
-
-init([]) ->
-    ProcLib = [mnesia_monitor, proc_lib],
-    Flags = {one_for_all, 0, timer:hours(24)}, % Trust the top supervisor
-    Workers = [worker_spec(mnesia_monitor, timer:seconds(3), [gen_server]),
-	       worker_spec(mnesia_subscr, timer:seconds(3), [gen_server]),
-	       worker_spec(mnesia_locker, timer:seconds(3), ProcLib),
-	       worker_spec(mnesia_recover, timer:minutes(3), [gen_server]),
-	       worker_spec(mnesia_tm, timer:seconds(30), ProcLib),
-	       supervisor_spec(mnesia_checkpoint_sup),
-	       supervisor_spec(mnesia_snmp_sup),
-	       worker_spec(mnesia_controller, timer:seconds(3), [gen_server]),
-	       worker_spec(mnesia_late_loader, timer:seconds(3), ProcLib)
-	      ],
-    {ok, {Flags, Workers}}.
-
-worker_spec(Name, KillAfter, Modules) ->
-    KA = supervisor_timeout(KillAfter),
-    {Name, {Name, start, []}, permanent, KA, worker, [Name] ++ Modules}.
-
-supervisor_spec(Name) ->
-    {Name, {Name, start, []}, permanent, infinity, supervisor,
-     [Name, supervisor]}.
-    
--ifdef(debug_shutdown).
-supervisor_timeout(_KillAfter) -> timer:hours(24).
--else.
-supervisor_timeout(KillAfter) -> KillAfter.
--endif.    
-
-    
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_late_loader.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_late_loader.erl
deleted file mode 100644
index 96d00f6e81..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_late_loader.erl
+++ /dev/null
@@ -1,95 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_late_loader.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%
--module(mnesia_late_loader).
-
--export([
-	 async_late_disc_load/3,
-	 maybe_async_late_disc_load/3,
-	 init/1,
-	 start/0
-	]).
-
-%% sys callback functions
--export([
-	 system_continue/3,
-	 system_terminate/4,
-	 system_code_change/4
-	]).
-
--define(SERVER_NAME, ?MODULE).
-
--record(state, {supervisor}).
-
-async_late_disc_load(Node, Tabs, Reason) ->
-    Msg = {async_late_disc_load, Tabs, Reason},
-    catch ({?SERVER_NAME, Node} ! {self(), Msg}).
-
-maybe_async_late_disc_load(Node, Tabs, Reason) ->
-    Msg = {maybe_async_late_disc_load, Tabs, Reason},
-    catch ({?SERVER_NAME, Node} ! {self(), Msg}).
-
-start() ->
-    mnesia_monitor:start_proc(?SERVER_NAME, ?MODULE, init, [self()]).
-
-init(Parent) ->
-    %% Trap exit omitted intentionally
-    register(?SERVER_NAME, self()),
-    link(whereis(mnesia_controller)),  %% We may not hang
-    mnesia_controller:merge_schema(),
-    unlink(whereis(mnesia_controller)),
-    mnesia_lib:set(mnesia_status, running),
-    proc_lib:init_ack(Parent, {ok, self()}),
-    loop(#state{supervisor = Parent}).
-
-loop(State) ->
-    receive
-	{_From, {async_late_disc_load, Tabs, Reason}} ->
-	    mnesia_controller:schedule_late_disc_load(Tabs, Reason),
-	    loop(State);
-
-	{_From, {maybe_async_late_disc_load, Tabs, Reason}} ->
-	    GoodTabs =
-		[T || T <- Tabs,
-		      lists:member(node(),
-				   mnesia_recover:get_master_nodes(T))],
-	    mnesia_controller:schedule_late_disc_load(GoodTabs, Reason),
-	    loop(State);
-
-	{system, From, Msg} ->
-	    mnesia_lib:dbg_out("~p got {system, ~p, ~p}~n",
-			       [?SERVER_NAME, From, Msg]),
-	    Parent = State#state.supervisor,
-	    sys:handle_system_msg(Msg, From, Parent, ?MODULE, [], State);
-	    
-	Msg ->
-	    mnesia_lib:error("~p got unexpected message: ~p~n",
-			     [?SERVER_NAME, Msg]),
-	    loop(State)
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% System upgrade
-
-system_continue(_Parent, _Debug, State) ->
-    loop(State).
-
-system_terminate(Reason, _Parent, _Debug, _State) ->
-    exit(Reason).
-
-system_code_change(State, _Module, _OldVsn, _Extra) ->
-    {ok, State}.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_lib.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_lib.erl
deleted file mode 100644
index 2c9e4d4fcf..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_lib.erl
+++ /dev/null
@@ -1,1278 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_lib.erl,v 1.3 2009/07/01 15:45:40 kostis Exp $
-%%
-%% This module contains all sorts of various which doesn't fit
-%% anywhere else. Basically everything is exported.
-
--module(mnesia_lib).
-
--include("mnesia.hrl").
--include_lib("kernel/include/file.hrl").
-
--export([core_file/0]).
-
--export([
-	 active_tables/0,
-	 add/2,
-	 add_list/2,
-	 all_nodes/0,
-%%	 catch_val/1,
-	 cleanup_tmp_files/1,	 
-	 copy_file/2,
-	 copy_holders/1,
-	 coredump/0,
-	 coredump/1,
-	 create_counter/1,
-	 cs_to_nodes/1,
-	 cs_to_storage_type/2,
-	 dets_to_ets/6,
-	 db_chunk/2,
-	 db_init_chunk/1,
-	 db_init_chunk/2,
-	 db_init_chunk/3,
-	 db_erase/2,
-	 db_erase/3,
-	 db_erase_tab/1,
-	 db_erase_tab/2,
-	 db_first/1,
-	 db_first/2,
-	 db_last/1,
-	 db_last/2,
-	 db_fixtable/3,
-	 db_get/2,
-	 db_get/3,
-	 db_match_erase/2,
-	 db_match_erase/3,
-	 db_match_object/2,
-	 db_match_object/3,
-	 db_next_key/2,
-	 db_next_key/3,
-	 db_prev_key/2,
-	 db_prev_key/3,
-	 db_put/2,
-	 db_put/3,
-	 db_select/2,	 
-	 db_select/3,
-	 db_slot/2,
-	 db_slot/3,
-	 db_update_counter/3,
-	 db_update_counter/4,
-	 dbg_out/2,
-	 del/2,
-	 dets_sync_close/1,
-	 dets_sync_open/2,
-	 dets_sync_open/3,
-	 dir/0,
-	 dir/1,
-	 dir_info/0,
-	 dirty_rpc_error_tag/1,
-	 dist_coredump/0,
-	 disk_type/1,
-	 disk_type/2,	 
-	 elems/2,
-	 ensure_loaded/1,
-	 error/2,
-	 error_desc/1,
-	 etype/1,
-	 exists/1,
-	 fatal/2,
-	 get_node_number/0,
-	 fix_error/1,
-	 important/2,
-	 incr_counter/1,
-	 incr_counter/2,
-	 intersect/2,
-	 is_running/0,
-	 is_running/1,
-	 is_running_remote/0,
-	 is_string/1,
-	 key_search_delete/3,
-	 key_search_all/3,
-	 last_error/0,
-	 local_active_tables/0,
-	 lock_table/1,
-	 mkcore/1,
-	 not_active_here/1,
-	 other_val/2,
-	 pad_name/3,
-	 random_time/2,
-	 read_counter/1,
-	 readable_indecies/1,
-	 remote_copy_holders/1,
-	 report_fatal/2,
-	 report_system_event/1,
-	 running_nodes/0,
-	 running_nodes/1,
-	 schema_cs_to_storage_type/2,
-	 search_delete/2,
-	 set/2,
-	 set_counter/2,
-	 set_local_content_whereabouts/1,
-	 set_remote_where_to_read/1,
-	 set_remote_where_to_read/2,
-	 show/1,
-	 show/2,
-	 sort_commit/1,
-	 storage_type_at_node/2,
-	 swap_tmp_files/1,
-	 tab2dat/1,
-	 tab2dmp/1,
-	 tab2tmp/1,
-	 tab2dcd/1,
-	 tab2dcl/1,
-	 to_list/1,
-	 union/2,
-	 uniq/1,
-	 unlock_table/1,
-	 unset/1,
-	 update_counter/2,
-	 val/1,
-	 vcore/0,
-	 vcore/1,
-	 verbose/2,
-	 view/0,
-	 view/1,
-	 view/2,
-	 warning/2,
-
-	 is_debug_compiled/0,
-	 activate_debug_fun/5,
-	 deactivate_debug_fun/3,
-	 eval_debug_fun/4,
-	 scratch_debug_fun/0
-	]).
- 
-
-search_delete(Obj, List) ->
-    search_delete(Obj, List, [], none).
-search_delete(Obj, [Obj|Tail], Ack, _Res) ->
-    search_delete(Obj, Tail, Ack, Obj);
-search_delete(Obj, [H|T], Ack, Res) ->
-    search_delete(Obj, T, [H|Ack], Res);
-search_delete(_, [], Ack, Res) ->
-    {Res, Ack}.
-
-key_search_delete(Key, Pos, TupleList) ->
-    key_search_delete(Key, Pos, TupleList, none, []).
-key_search_delete(Key, Pos, [H|T], _Obj, Ack) when element(Pos, H) == Key ->
-    key_search_delete(Key, Pos, T, H, Ack);
-key_search_delete(Key, Pos, [H|T], Obj, Ack) ->
-    key_search_delete(Key, Pos, T, Obj, [H|Ack]);
-key_search_delete(_, _, [], Obj, Ack) ->
-    {Obj, Ack}.
-
-key_search_all(Key, Pos, TupleList) -> 
-    key_search_all(Key, Pos, TupleList, []).
-key_search_all(Key, N, [H|T], Ack) when element(N, H) == Key ->
-    key_search_all(Key, N, T, [H|Ack]);
-key_search_all(Key, N, [_|T], Ack) ->
-    key_search_all(Key, N, T, Ack);
-key_search_all(_, _, [], Ack) -> Ack.
-
-intersect(L1, L2) ->
-    L2 -- (L2 -- L1).
-
-elems(I, [H|T]) ->
-    [element(I, H) | elems(I, T)];
-elems(_, []) ->
-    [].
-
-%%  sort_commit see to that checkpoint info is always first in 
-%%  commit_work structure the other info don't need to be sorted.
-sort_commit(List) ->
-    sort_commit2(List, []).
-
-sort_commit2([{checkpoints, ChkpL}| Rest], Acc) ->
-    [{checkpoints, ChkpL}| Rest] ++ Acc;
-sort_commit2([H | R], Acc) ->
-    sort_commit2(R, [H | Acc]);
-sort_commit2([], Acc) -> Acc.
-    
-is_string([H|T]) ->
-    if
-	0 =< H, H < 256, integer(H)  -> is_string(T);
-	true -> false
-    end;
-is_string([]) -> true.
-
-%%%
-
-union([H|L1], L2) ->
-    case lists:member(H, L2) of
-	true -> union(L1, L2);
-	false -> [H | union(L1, L2)]
-    end;
-union([], L2) -> L2.
-
-uniq([]) ->
-    [];
-uniq(List) ->
-    [H|T] = lists:sort(List),
-    uniq1(H, T, []).
-
-uniq1(H, [H|R], Ack) ->
-    uniq1(H, R, Ack);
-uniq1(Old, [H|R], Ack) ->
-    uniq1(H, R, [Old|Ack]);
-uniq1(Old, [], Ack) ->
-    [Old| Ack].
-
-to_list(X) when list(X) -> X;
-to_list(X) -> atom_to_list(X).
-
-all_nodes() ->
-    Ns = mnesia:system_info(db_nodes) ++
-	mnesia:system_info(extra_db_nodes),
-    mnesia_lib:uniq(Ns).
-
-running_nodes() ->
-    running_nodes(all_nodes()).
-
-running_nodes(Ns) ->
-    {Replies, _BadNs} = rpc:multicall(Ns, ?MODULE, is_running_remote, []),
-    [N || {GoodState, N} <- Replies, GoodState == true].
-
-is_running_remote() ->
-    IsRunning = is_running(),
-    {IsRunning == yes, node()}.
-
-is_running(Node) when atom(Node) ->
-    case rpc:call(Node, ?MODULE, is_running, []) of
-	{badrpc, _} -> no;
-	X -> X
-    end.
-
-is_running() ->
-    case ?catch_val(mnesia_status) of
-	{'EXIT', _} -> no;
-	running -> yes;
-	starting -> starting;
-	stopping -> stopping
-    end.
-
-show(X) ->
-    show(X, []).
-show(F, A) ->
-    io:format(user, F, A).
-
-
-pad_name([Char | Chars], Len, Tail) ->
-    [Char | pad_name(Chars, Len - 1, Tail)];
-pad_name([], Len, Tail) when Len =< 0 ->
-    Tail;
-pad_name([], Len, Tail) ->
-    [$ | pad_name([], Len - 1, Tail)].
-    
-%% Some utility functions .....
-active_here(Tab) ->
-    case val({Tab, where_to_read}) of
-	Node when Node == node() -> true;
-	_ -> false
-    end.
-
-not_active_here(Tab) ->
-    not active_here(Tab).
-
-exists(Fname) ->
-    case file:open(Fname, [raw,read]) of
-	{ok, F} ->file:close(F), true;
-	_ -> false
-    end.
-
-dir() -> mnesia_monitor:get_env(dir).
-
-dir(Fname) ->
-    filename:join([dir(), to_list(Fname)]).
-
-tab2dat(Tab) ->  %% DETS files 
-    dir(lists:concat([Tab, ".DAT"])).
-
-tab2tmp(Tab) ->
-    dir(lists:concat([Tab, ".TMP"])).
-
-tab2dmp(Tab) ->  %% Dumped ets tables
-    dir(lists:concat([Tab, ".DMP"])).
-
-tab2dcd(Tab) ->  %% Disc copies data
-    dir(lists:concat([Tab, ".DCD"])).
-
-tab2dcl(Tab) ->  %% Disc copies log
-    dir(lists:concat([Tab, ".DCL"])).
-
-storage_type_at_node(Node, Tab) ->
-    search_key(Node, [{disc_copies, val({Tab, disc_copies})},
-		      {ram_copies, val({Tab, ram_copies})},
-		      {disc_only_copies, val({Tab, disc_only_copies})}]).
-
-cs_to_storage_type(Node, Cs) ->
-    search_key(Node, [{disc_copies, Cs#cstruct.disc_copies},
-		      {ram_copies, Cs#cstruct.ram_copies},
-		      {disc_only_copies, Cs#cstruct.disc_only_copies}]).
-
-schema_cs_to_storage_type(Node, Cs) ->
-    case cs_to_storage_type(Node, Cs) of
-	unknown when Cs#cstruct.name == schema -> ram_copies;
-	Other -> Other
-    end.
-
-
-search_key(Key, [{Val, List} | Tail]) ->
-    case lists:member(Key, List) of
-	true -> Val;
-	false -> search_key(Key, Tail)
-    end;
-search_key(_Key, []) ->
-    unknown.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% ops, we've got some global variables here :-)
-
-%% They are
-%%
-%%   {Tab, setorbag}, -> set | bag
-%%   {Tab, storage_type}       -> disc_copies |ram_copies | unknown (**)
-%%   {Tab, disc_copies}        -> node list  (from schema)
-%%   {Tab, ram_copies}, -> node list  (from schema)
-%%   {Tab, arity}, -> number
-%%   {Tab, attributes}, -> atom list
-%%   {Tab, wild_pattern}, -> record tuple with '_'s
-%%   {Tab, {index, Pos}}       -> ets table
-%%   {Tab, index}              -> integer list
-%%   {Tab, cstruct}            -> cstruct  structure
-%%
-
-%%   The following fields are dynamic according to the
-%%   the current node/table situation
-
-%%   {Tab, where_to_write}      -> node list
-%%   {Tab, where_to_read}       -> node | nowhere
-%%
-%%   {schema, tables}                    -> tab list
-%%   {schema, local_tables}              -> tab list  (**)
-%%
-%%   {current, db_nodes}                  -> node list
-%%
-%%   dir                                  -> directory path (**)
-%%   mnesia_status                        -> status | running | stopping (**)
-%%   (**) ==   (Different on all nodes)
-%%
-
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_); 
-	_VaLuE_ -> _VaLuE_ 
-    end.
-
-set(Var, Val) ->
-    ?ets_insert(mnesia_gvar, {Var, Val}).
-
-unset(Var) ->
-    ?ets_delete(mnesia_gvar, Var).
-
-other_val(Var, Other) ->
-    case Var of
-	{_, where_to_read} -> nowhere;
-	{_, where_to_write} -> [];
-	{_, active_replicas} -> [];
-	_ ->
-	    pr_other(Var, Other)
-    end.
-
-pr_other(Var, Other) ->
-    Why = 
-	case is_running() of
-	    no -> {node_not_running, node()};
-	    _ -> {no_exists, Var}
-	end,
-    verbose("~p (~p) val(mnesia_gvar, ~w) -> ~p ~p ~n",
-	    [self(), process_info(self(), registered_name),
-	     Var, Other, Why]),
-    case Other of
-	{badarg, [{ets, lookup_element, _}|_]} ->
-	    exit(Why);
-	_ ->
-	    erlang:error(Why)
-    end.
-
-%% Some functions for list valued variables
-add(Var, Val) ->
-    L = val(Var),
-    set(Var, [Val | lists:delete(Val, L)]).
-
-add_list(Var, List) ->
-    L = val(Var),
-    set(Var, union(L, List)).
-
-del(Var, Val) ->
-    L = val(Var),
-    set(Var, lists:delete(Val, L)).
-
-%% This function is needed due to the fact
-%% that the application_controller enters
-%% a deadlock now and then. ac is implemented
-%% as a rather naive server.
-ensure_loaded(Appl) ->
-    case application_controller:get_loaded(Appl) of
-	{true, _} -> 
-	    ok;
-	false ->
-	    case application:load(Appl) of
-		ok ->
-		    ok;
-		{error, {already_loaded, Appl}} ->
-		    ok;
-		{error, Reason} ->
-		    {error, {application_load_error, Reason}}
-	    end
-    end.
-
-local_active_tables() ->
-    Tabs = val({schema, local_tables}),
-    lists:zf(fun(Tab) -> active_here(Tab) end, Tabs).
-
-active_tables() ->
-    Tabs = val({schema, tables}),
-    F = fun(Tab) ->
-		case val({Tab, where_to_read}) of
-		    nowhere -> false;
-		    _ -> {true, Tab}
-		end
-	end,
-    lists:zf(F, Tabs).
-
-etype(X) when integer(X) -> integer;
-etype([]) -> nil;
-etype(X) when list(X) -> list;
-etype(X) when tuple(X) -> tuple;
-etype(X) when atom(X) -> atom;
-etype(_) -> othertype.
-
-remote_copy_holders(Cs) ->
-    copy_holders(Cs) -- [node()].
-
-copy_holders(Cs) when Cs#cstruct.local_content == false ->
-    cs_to_nodes(Cs);
-copy_holders(Cs) when Cs#cstruct.local_content == true ->
-    case lists:member(node(), cs_to_nodes(Cs)) of
-	true -> [node()];
-	false -> []
-    end.
-
-
-set_remote_where_to_read(Tab) ->
-    set_remote_where_to_read(Tab, []).
-
-set_remote_where_to_read(Tab, Ignore) ->
-    Active = val({Tab, active_replicas}),
-    Valid = 
-	case mnesia_recover:get_master_nodes(Tab) of
-	    [] ->  Active;
-	    Masters -> mnesia_lib:intersect(Masters, Active)
-	end,    
-    Available = mnesia_lib:intersect(val({current, db_nodes}), Valid -- Ignore),    
-    DiscOnlyC = val({Tab, disc_only_copies}),
-    Prefered  = Available -- DiscOnlyC,
-    if
-	Prefered /= [] ->
-	    set({Tab, where_to_read}, hd(Prefered));
-	Available /= [] ->
-	    set({Tab, where_to_read}, hd(Available));
-	true ->
-	    set({Tab, where_to_read}, nowhere)
-    end.
-
-%%% Local only
-set_local_content_whereabouts(Tab) ->
-    add({schema, local_tables}, Tab),
-    add({Tab, active_replicas}, node()),
-    set({Tab, where_to_write}, [node()]),
-    set({Tab, where_to_read}, node()).
-
-%%% counter routines
-
-create_counter(Name) ->
-    set_counter(Name, 0).
-
-set_counter(Name, Val) ->
-    ?ets_insert(mnesia_gvar, {Name, Val}).
-
-incr_counter(Name) ->
-    ?ets_update_counter(mnesia_gvar, Name, 1).
-
-incr_counter(Name, I) ->
-    ?ets_update_counter(mnesia_gvar, Name, I).
-
-update_counter(Name, Val) ->
-    ?ets_update_counter(mnesia_gvar, Name, Val).
-
-read_counter(Name) ->
-    ?ets_lookup_element(mnesia_gvar, Name, 2).
-
-cs_to_nodes(Cs) ->
-    Cs#cstruct.disc_only_copies ++
-    Cs#cstruct.disc_copies ++
-    Cs#cstruct.ram_copies.
- 
-dist_coredump() ->
-    dist_coredump(all_nodes()).
-dist_coredump(Ns) ->
-    {Replies, _} = rpc:multicall(Ns, ?MODULE, coredump, []),
-    Replies.
-
-coredump() ->
-    coredump({crashinfo, {"user initiated~n", []}}).
-coredump(CrashInfo) ->
-    Core = mkcore(CrashInfo),
-    Out = core_file(),
-    important("Writing Mnesia core to file: ~p...~p~n", [Out, CrashInfo]),
-    file:write_file(Out, Core),
-    Out.
-
-core_file() ->
-    Integers = tuple_to_list(date()) ++ tuple_to_list(time()),
-    Fun = fun(I) when I < 10 -> ["_0", I];
-	     (I) -> ["_", I]
-	  end,
-    List = lists:append([Fun(I) || I <- Integers]),
-    filename:absname(lists:concat(["MnesiaCore.", node()] ++ List)).
-
-mkcore(CrashInfo) ->
-%   dbg_out("Making a Mnesia core dump...~p~n", [CrashInfo]),
-    Nodes = [node() |nodes()],
-    TidLocks = (catch ets:tab2list(mnesia_tid_locks)),
-    Core = [
-	    CrashInfo,
-	    {time, {date(), time()}},
-	    {self, catch process_info(self())},
-	    {nodes, catch rpc:multicall(Nodes, ?MODULE, get_node_number, [])},
-	    {applications, catch lists:sort(application:loaded_applications())},
-	    {flags, catch init:get_arguments()},
-	    {code_path, catch code:get_path()},
-	    {code_loaded, catch lists:sort(code:all_loaded())},
-	    {etsinfo, catch ets_info(ets:all())},
-
-	    {version, catch mnesia:system_info(version)},
-	    {schema, catch ets:tab2list(schema)},
-	    {gvar, catch ets:tab2list(mnesia_gvar)},
-	    {master_nodes, catch mnesia_recover:get_master_node_info()},
-
-	    {processes, catch procs()},
-	    {relatives, catch relatives()},
-	    {workers, catch workers(mnesia_controller:get_workers(2000))},
-	    {locking_procs, catch locking_procs(TidLocks)},
-
-	    {held_locks, catch mnesia:system_info(held_locks)},
-	    {tid_locks, TidLocks},
-	    {lock_queue, catch mnesia:system_info(lock_queue)},
-	    {load_info, catch mnesia_controller:get_info(2000)},
-	    {trans_info, catch mnesia_tm:get_info(2000)},
-	    	    
-	    {schema_file, catch file:read_file(tab2dat(schema))},
-	    {dir_info, catch dir_info()},
-	    {logfile, catch {ok, read_log_files()}}
-	   ],
-    term_to_binary(Core).
-
-procs() ->
-    Fun = fun(P) -> {P, (catch lists:zf(fun proc_info/1, process_info(P)))} end,
-    lists:map(Fun, processes()).
-
-proc_info({registered_name, Val}) -> {true, Val};
-proc_info({message_queue_len, Val}) -> {true, Val};
-proc_info({status, Val}) -> {true, Val};
-proc_info({current_function, Val}) -> {true, Val};
-proc_info(_) -> false.
-
-get_node_number() ->
-    {node(), self()}.
-
-read_log_files() ->
-    [{F, catch file:read_file(F)} || F <- mnesia_log:log_files()].
-
-dir_info() ->
-    {ok, Cwd} = file:get_cwd(),
-    Dir = dir(),
-    [{cwd, Cwd, file:read_file_info(Cwd)},
-     {mnesia_dir, Dir, file:read_file_info(Dir)}] ++
-    case file:list_dir(Dir) of
-	{ok, Files} ->
-	    [{mnesia_file, F, catch file:read_file_info(dir(F))} || F <- Files];
-	Other ->
-	    [Other]
-    end.
-
-ets_info([H|T]) ->
-    [{table, H, ets:info(H)} | ets_info(T)];
-ets_info([]) -> [].
-
-relatives() ->
-    Info = fun(Name) ->
-		   case whereis(Name) of
-		       undefined -> false;
-		       Pid -> {true, {Name, Pid, catch process_info(Pid)}}
-		   end
-	   end,
-    lists:zf(Info, mnesia:ms()).
-
-workers({workers, Loader, Sender, Dumper}) ->
-    Info = fun({Name, Pid}) ->
-		   case Pid of
-		       undefined -> false;
-		       Pid -> {true, {Name, Pid, catch process_info(Pid)}}
-		   end
-	   end,
-    lists:zf(Info, [{loader, Loader}, {sender, Sender}, {dumper, Dumper}]).
-
-locking_procs(LockList) when list(LockList) ->
-    Tids = [element(1, Lock) || Lock <- LockList],
-    UT = uniq(Tids),    
-    Info = fun(Tid) ->
-		   Pid = Tid#tid.pid,
-		   case node(Pid) == node() of
-		       true -> 
-			   {true, {Pid, catch process_info(Pid)}};
-		       _ ->
-			   false
-		   end
-	   end,
-    lists:zf(Info, UT).
-
-view() ->
-    Bin = mkcore({crashinfo, {"view only~n", []}}),
-    vcore(Bin).
-
-%% Displays a Mnesia file on the tty. The file may be repaired.
-view(File) ->
-    case suffix([".DAT", ".RET", ".DMP", ".TMP"], File) of
-	true ->
-	    view(File, dat);
-	false ->
-	    case suffix([".LOG", ".BUP", ".ETS"], File) of
-		true ->
-		    view(File, log);
-		false ->
-		    case lists:prefix("MnesiaCore.", File) of
-			true ->
-			    view(File, core);
-			false ->
-			    {error, "Unknown file name"}
-		    end
-	    end
-    end.
-
-view(File, dat) ->
-    dets:view(File);
-view(File, log) ->
-    mnesia_log:view(File);
-view(File, core) ->
-    vcore(File).
-
-suffix(Suffixes, File) ->
-    Fun = fun(S) -> lists:suffix(S, File) end,
-    lists:any(Fun, Suffixes).
-
-%% View a core file
-
-vcore() ->
-    Prefix = lists:concat(["MnesiaCore.", node()]),
-    Filter = fun(F) -> lists:prefix(Prefix, F) end,
-    {ok, Cwd} = file:get_cwd(),
-    case file:list_dir(Cwd) of
-	{ok, Files}->
-	    CoreFiles = lists:sort(lists:zf(Filter, Files)),
-	    show("Mnesia core files: ~p~n", [CoreFiles]),
-	    vcore(lists:last(CoreFiles));
-	Error ->
-	    Error
-    end.
-
-vcore(Bin) when binary(Bin) ->
-    Core = binary_to_term(Bin),
-    Fun = fun({Item, Info}) ->
-		  show("***** ~p *****~n", [Item]),
-		  case catch vcore_elem({Item, Info}) of
-		      {'EXIT', Reason} ->
-			  show("{'EXIT', ~p}~n", [Reason]);
-		      _ -> ok
-		  end
-	  end,
-    lists:foreach(Fun, Core);
-    
-vcore(File) ->
-    show("~n***** Mnesia core: ~p *****~n", [File]),
-    case file:read_file(File) of
-	{ok, Bin} ->
-	    vcore(Bin);
-	_ ->
-	    nocore
-    end.
-
-vcore_elem({schema_file, {ok, B}}) ->
-    Fname = "/tmp/schema.DAT",
-    file:write_file(Fname, B),
-    dets:view(Fname),
-    file:delete(Fname);
-
-vcore_elem({logfile, {ok, BinList}}) ->
-    Fun = fun({F, Info}) ->
-		  show("----- logfile: ~p -----~n", [F]),
-		  case Info of
-		      {ok, B} ->
-			  Fname = "/tmp/mnesia_vcore_elem.TMP",
-			  file:write_file(Fname, B),
-			  mnesia_log:view(Fname),
-			  file:delete(Fname);
-		      _ ->
-			  show("~p~n", [Info])
-		  end
-	  end,
-    lists:foreach(Fun, BinList);
-
-vcore_elem({crashinfo, {Format, Args}}) ->
-    show(Format, Args);
-vcore_elem({gvar, L}) ->
-    show("~p~n", [lists:sort(L)]);
-vcore_elem({transactions, Info}) ->
-    mnesia_tm:display_info(user, Info);
-
-vcore_elem({_Item, Info}) ->
-    show("~p~n", [Info]).
-
-fix_error(X) ->
-    set(last_error, X), %% for debugabililty
-    case X of
-	{aborted, Reason} -> Reason;
-	{abort, Reason} -> Reason;
-	Y when atom(Y) -> Y;
-	{'EXIT', {_Reason, {Mod, _, _}}} when atom(Mod) ->
-	    save(X),
-	    case atom_to_list(Mod) of
-		[$m, $n, $e|_] -> badarg;
-		_ -> X
-	    end;
-	_ -> X
-    end.
-
-last_error() ->
-    val(last_error).
-
-%% The following is a list of possible mnesia errors and what they
-%% actually mean
-
-error_desc(nested_transaction) -> "Nested transactions are not allowed";
-error_desc(badarg) -> "Bad or invalid argument, possibly bad type";
-error_desc(no_transaction) -> "Operation not allowed outside transactions";
-error_desc(combine_error)  -> "Table options were ilegally combined";
-error_desc(bad_index)  -> "Index already exists or was out of bounds";
-error_desc(already_exists) -> "Some schema option we try to set is already on";
-error_desc(index_exists)-> "Some ops can not  be performed on tabs with index";
-error_desc(no_exists)-> "Tried to perform op on non-existing (non alive) item";
-error_desc(system_limit) -> "Some system_limit was exhausted";
-error_desc(mnesia_down) -> "A transaction involving objects at some remote "
-                           "node which died while transaction was executing"
-                           "*and* object(s) are no longer available elsewhere"
-                           "in the network";
-error_desc(not_a_db_node) -> "A node which is non existant in "
-                              "the schema was mentioned";
-error_desc(bad_type)            -> "Bad type on some provided arguments";
-error_desc(node_not_running)    -> "Node not running";
-error_desc(truncated_binary_file) -> "Truncated binary in file";
-error_desc(active)     -> "Some delete ops require that "
-                           "all active objects are removed";
-error_desc(illegal) -> "Operation not supported on object";
-error_desc({'EXIT', Reason}) ->
-    error_desc(Reason);
-error_desc({error, Reason}) ->
-    error_desc(Reason);
-error_desc({aborted, Reason}) ->
-    error_desc(Reason);
-error_desc(Reason) when tuple(Reason), size(Reason) > 0 ->
-    setelement(1, Reason, error_desc(element(1, Reason)));
-error_desc(Reason) ->
-    Reason.
-
-dirty_rpc_error_tag(Reason) ->
-    case Reason of
-	{'EXIT', _} -> badarg;
-	no_variable -> badarg;
-	_           -> no_exists
-    end.
-
-fatal(Format, Args) ->
-    catch set(mnesia_status, stopping),
-    Core = mkcore({crashinfo, {Format, Args}}),
-    report_fatal(Format, Args, Core),
-    timer:sleep(10000), % Enough to write the core dump to disc?
-    mnesia:lkill(),
-    exit(fatal).
-
-report_fatal(Format, Args) ->
-    report_fatal(Format, Args, nocore).
-
-report_fatal(Format, Args, Core) ->
-    report_system_event({mnesia_fatal, Format, Args, Core}),
-    catch exit(whereis(mnesia_monitor), fatal).
-
-%% We sleep longer and longer the more we try
-%% Made some testing and came up with the following constants
-random_time(Retries, _Counter0) ->    
-%    UpperLimit = 2000,
-%    MaxIntv = trunc(UpperLimit * (1-(4/((Retries*Retries)+4)))),
-    UpperLimit = 500,
-    Dup = Retries * Retries,
-    MaxIntv = trunc(UpperLimit * (1-(50/((Dup)+50)))),
-    
-    case get(random_seed) of
-	undefined ->
-	    {X, Y, Z} = erlang:now(), %% time()
-	    random:seed(X, Y, Z),
-	    Time = Dup + random:uniform(MaxIntv),
-	    %%	    dbg_out("---random_test rs ~w max ~w val ~w---~n", [Retries, MaxIntv, Time]),
-	    Time;
-	_ ->
-	    Time = Dup + random:uniform(MaxIntv),
-	    %%	    dbg_out("---random_test rs ~w max ~w val ~w---~n", [Retries, MaxIntv, Time]),
-	    Time	    
-    end.
-
-report_system_event(Event0) ->
-    Event = {mnesia_system_event, Event0},
-    report_system_event(catch_notify(Event), Event),
-    case ?catch_val(subscribers) of
-	{'EXIT', _} -> ignore;
-	Pids -> lists:foreach(fun(Pid) -> Pid ! Event end, Pids)
-    end,
-    ok.
-
-catch_notify(Event) ->
-    case whereis(mnesia_event) of
-	undefined ->
-	    {'EXIT', {badarg, {mnesia_event, Event}}};
-	Pid ->
-	    gen_event:notify(Pid, Event)
-    end.
-
-report_system_event({'EXIT', Reason}, Event) ->
-    Mod = mnesia_monitor:get_env(event_module),
-    case mnesia_sup:start_event() of
-	{ok, Pid} ->
-	    link(Pid),
-	    gen_event:call(mnesia_event, Mod, Event, infinity),
-	    unlink(Pid),
-
-            %% We get an exit signal if server dies
-            receive
-                {'EXIT', Pid, _Reason} ->
-                    {error, {node_not_running, node()}}
-            after 0 ->
-		    gen_event:stop(mnesia_event),
-                    ok
-            end;
-
-	Error ->
-	    Msg = "Mnesia(~p): Cannot report event ~p: ~p (~p)~n",
-	    error_logger:format(Msg, [node(), Event, Reason, Error])
-    end;
-report_system_event(_Res, _Event) ->
-    ignore.
-
-%% important messages are reported regardless of debug level
-important(Format, Args) ->
-    save({Format, Args}),
-    report_system_event({mnesia_info, Format, Args}).
-
-%% Warning messages are reported regardless of debug level
-warning(Format, Args) ->
-    save({Format, Args}),
-    report_system_event({mnesia_warning, Format, Args}).
-
-%% error messages are reported regardless of debug level
-error(Format, Args) ->
-    save({Format, Args}),
-    report_system_event({mnesia_error, Format, Args}).
-
-%% verbose messages are reported if debug level == debug or verbose
-verbose(Format, Args) ->
-    case mnesia_monitor:get_env(debug) of
-	none ->    save({Format, Args});
-	verbose -> important(Format, Args);
-	debug ->   important(Format, Args);
-	trace ->   important(Format, Args)
-    end.
-
-%% debug message are display if debug level == 2
-dbg_out(Format, Args) ->
-    case mnesia_monitor:get_env(debug) of
-	none ->    ignore;
-	verbose -> save({Format, Args});
-	_ ->  report_system_event({mnesia_info, Format, Args})
-    end.
-
-%% Keep the last 10 debug print outs
-save(DbgInfo) ->
-    catch save2(DbgInfo).
-
-save2(DbgInfo) ->
-    Key = {'$$$_report', current_pos},
-    P =
-	case ?ets_lookup_element(mnesia_gvar, Key, 2) of
-	    30 -> -1;
-	    I -> I
-	end,
-    set({'$$$_report', current_pos}, P+1),
-    set({'$$$_report', P+1}, {date(), time(), DbgInfo}).
-
-copy_file(From, To) ->
-    case file:open(From, [raw, binary, read]) of
-	{ok, F} ->
-	    case file:open(To, [raw, binary, write]) of
-		{ok, T} ->
-		    Res = copy_file_loop(F, T, 8000),
-		    file:close(F),
-		    file:close(T),
-		    Res;
-		{error, Reason} ->
-		    {error, Reason}
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-copy_file_loop(F, T, ChunkSize) ->
-    case file:read(F, ChunkSize) of
-	{ok, {0, _}} ->
-	    ok;
-	{ok, {_, Bin}} ->
-	    file:write(T, Bin),
-	    copy_file_loop(F, T, ChunkSize);
-	{ok, Bin} ->
-	    file:write(T, Bin),
-	    copy_file_loop(F, T, ChunkSize);
-	eof ->
-	    ok;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-
-%%%%%%%%%%%%
-%% versions of all the lowlevel db funcs that determine whether we
-%% shall go to disc or ram to do the actual operation.
-
-db_get(Tab, Key) ->
-    db_get(val({Tab, storage_type}), Tab, Key).
-db_get(ram_copies, Tab, Key) -> ?ets_lookup(Tab, Key);
-db_get(disc_copies, Tab, Key) -> ?ets_lookup(Tab, Key);
-db_get(disc_only_copies, Tab, Key) -> dets:lookup(Tab, Key).
-
-db_init_chunk(Tab) ->
-    db_init_chunk(val({Tab, storage_type}), Tab, 1000).
-db_init_chunk(Tab, N) ->
-    db_init_chunk(val({Tab, storage_type}), Tab, N).
-
-db_init_chunk(disc_only_copies, Tab, N) ->
-    dets:select(Tab, [{'_', [], ['$_']}], N);
-db_init_chunk(_, Tab, N) ->
-    ets:select(Tab, [{'_', [], ['$_']}], N).
-
-db_chunk(disc_only_copies, State) ->
-    dets:select(State);
-db_chunk(_, State) ->
-    ets:select(State).
-
-db_put(Tab, Val) ->
-    db_put(val({Tab, storage_type}), Tab, Val).
-
-db_put(ram_copies, Tab, Val) -> ?ets_insert(Tab, Val), ok;
-db_put(disc_copies, Tab, Val) -> ?ets_insert(Tab, Val), ok;
-db_put(disc_only_copies, Tab, Val) -> dets:insert(Tab, Val).
-
-db_match_object(Tab, Pat) ->
-    db_match_object(val({Tab, storage_type}), Tab, Pat).
-db_match_object(Storage, Tab, Pat) ->
-    db_fixtable(Storage, Tab, true),
-    Res = catch_match_object(Storage, Tab, Pat),
-    db_fixtable(Storage, Tab, false),
-    case Res of
-	{'EXIT', Reason} -> exit(Reason);
-	_ -> Res
-    end.
-
-catch_match_object(disc_only_copies, Tab, Pat) ->
-    catch dets:match_object(Tab, Pat);
-catch_match_object(_, Tab, Pat) ->
-    catch ets:match_object(Tab, Pat).
-
-db_select(Tab, Pat) ->
-    db_select(val({Tab, storage_type}), Tab, Pat).
-
-db_select(Storage, Tab, Pat) ->
-    db_fixtable(Storage, Tab, true),
-    Res = catch_select(Storage, Tab, Pat),
-    db_fixtable(Storage, Tab, false),
-    case Res of
-	{'EXIT', Reason} -> exit(Reason);
-	_ -> Res
-    end.
-
-catch_select(disc_only_copies, Tab, Pat) ->
-    dets:select(Tab, Pat);
-catch_select(_, Tab, Pat) ->
-    ets:select(Tab, Pat).
-
-db_fixtable(ets, Tab, Bool) ->
-    ets:safe_fixtable(Tab, Bool);
-db_fixtable(ram_copies, Tab, Bool) ->
-    ets:safe_fixtable(Tab, Bool);
-db_fixtable(disc_copies, Tab, Bool) ->
-    ets:safe_fixtable(Tab, Bool);
-db_fixtable(dets, Tab, Bool) ->
-    dets:safe_fixtable(Tab, Bool);
-db_fixtable(disc_only_copies, Tab, Bool) ->
-    dets:safe_fixtable(Tab, Bool).
-
-db_erase(Tab, Key) ->
-    db_erase(val({Tab, storage_type}), Tab, Key).
-db_erase(ram_copies, Tab, Key) -> ?ets_delete(Tab, Key), ok;
-db_erase(disc_copies, Tab, Key) -> ?ets_delete(Tab, Key), ok;
-db_erase(disc_only_copies, Tab, Key) -> dets:delete(Tab, Key).
-
-db_match_erase(Tab, Pat) ->
-    db_match_erase(val({Tab, storage_type}), Tab, Pat).
-db_match_erase(ram_copies, Tab, Pat) -> ?ets_match_delete(Tab, Pat), ok;
-db_match_erase(disc_copies, Tab, Pat) -> ?ets_match_delete(Tab, Pat), ok;
-db_match_erase(disc_only_copies, Tab, Pat) -> dets:match_delete(Tab, Pat).
-
-db_first(Tab) ->
-    db_first(val({Tab, storage_type}), Tab).
-db_first(ram_copies, Tab) -> ?ets_first(Tab);
-db_first(disc_copies, Tab) -> ?ets_first(Tab);
-db_first(disc_only_copies, Tab) -> dets:first(Tab).
-
-db_next_key(Tab, Key) ->
-    db_next_key(val({Tab, storage_type}), Tab, Key).
-db_next_key(ram_copies, Tab, Key) -> ?ets_next(Tab, Key);
-db_next_key(disc_copies, Tab, Key) -> ?ets_next(Tab, Key);
-db_next_key(disc_only_copies, Tab, Key) -> dets:next(Tab, Key).
-
-db_last(Tab) ->
-    db_last(val({Tab, storage_type}), Tab).
-db_last(ram_copies, Tab) -> ?ets_last(Tab);
-db_last(disc_copies, Tab) -> ?ets_last(Tab);
-db_last(disc_only_copies, Tab) -> dets:first(Tab). %% Dets don't have order
-
-db_prev_key(Tab, Key) ->
-    db_prev_key(val({Tab, storage_type}), Tab, Key).
-db_prev_key(ram_copies, Tab, Key) -> ?ets_prev(Tab, Key);
-db_prev_key(disc_copies, Tab, Key) -> ?ets_prev(Tab, Key);
-db_prev_key(disc_only_copies, Tab, Key) -> dets:next(Tab, Key). %% Dets don't have order
-
-db_slot(Tab, Pos) ->
-    db_slot(val({Tab, storage_type}), Tab, Pos).
-db_slot(ram_copies, Tab, Pos) -> ?ets_slot(Tab, Pos);
-db_slot(disc_copies, Tab, Pos) -> ?ets_slot(Tab, Pos);
-db_slot(disc_only_copies, Tab, Pos) -> dets:slot(Tab, Pos).
-
-db_update_counter(Tab, C, Val) ->
-    db_update_counter(val({Tab, storage_type}), Tab, C, Val).
-db_update_counter(ram_copies, Tab, C, Val) ->
-    ?ets_update_counter(Tab, C, Val);
-db_update_counter(disc_copies, Tab, C, Val) ->
-    ?ets_update_counter(Tab, C, Val);
-db_update_counter(disc_only_copies, Tab, C, Val) ->
-    dets:update_counter(Tab, C, Val).
-
-db_erase_tab(Tab) ->
-    db_erase_tab(val({Tab, storage_type}), Tab).
-db_erase_tab(ram_copies, Tab) -> ?ets_delete_table(Tab);
-db_erase_tab(disc_copies, Tab) -> ?ets_delete_table(Tab);
-db_erase_tab(disc_only_copies, _Tab) -> ignore.
-
-%% assuming that Tab is a valid ets-table
-dets_to_ets(Tabname, Tab, File, Type, Rep, Lock) ->
-    {Open, Close} = mkfuns(Lock),
-    case Open(Tabname, [{file, File}, {type, disk_type(Tab, Type)},
-			{keypos, 2}, {repair, Rep}]) of
-	{ok, Tabname} ->
-	    Res = dets:to_ets(Tabname, Tab),
-	    Close(Tabname),
-	    trav_ret(Res, Tab);
-	Other ->
-	    Other
-    end.
-
-trav_ret(Tabname, Tabname) -> loaded;
-trav_ret(Other, _Tabname) -> Other.
-
-mkfuns(yes) ->
-    {fun(Tab, Args) -> dets_sync_open(Tab, Args) end,
-     fun(Tab) -> dets_sync_close(Tab) end};
-mkfuns(no) ->
-    {fun(Tab, Args) -> dets:open_file(Tab, Args) end,
-     fun(Tab) -> dets:close(Tab) end}.
-
-disk_type(Tab) ->
-    disk_type(Tab, val({Tab, setorbag})).
-
-disk_type(_Tab, ordered_set) ->
-    set;
-disk_type(_, Type) ->
-    Type.
-
-dets_sync_open(Tab, Ref, File) ->
-    Args = [{file, File},
-	    {keypos, 2},
-	    {repair, mnesia_monitor:get_env(auto_repair)},
-	    {type, disk_type(Tab)}],
-    dets_sync_open(Ref, Args).
-
-lock_table(Tab) ->
-    global:set_lock({{mnesia_table_lock, Tab}, self()}, [node()], infinity).
-%    dbg_out("dets_sync_open: ~p ~p~n", [T, self()]),
-
-unlock_table(Tab) ->
-    global:del_lock({{mnesia_table_lock, Tab}, self()}, [node()]).
-%    dbg_out("unlock_table: ~p ~p~n", [T, self()]),
-
-dets_sync_open(Tab, Args) ->
-    lock_table(Tab),
-    case dets:open_file(Tab, Args) of
-	{ok, Tab} ->
-	    {ok, Tab};
-	Other ->
-	    dets_sync_close(Tab),
-	    Other
-    end.
-
-dets_sync_close(Tab) ->
-    catch dets:close(Tab),
-    unlock_table(Tab),
-    ok.
-
-cleanup_tmp_files([Tab | Tabs]) ->
-    dets_sync_close(Tab),
-    file:delete(tab2tmp(Tab)),
-    cleanup_tmp_files(Tabs);
-cleanup_tmp_files([]) ->
-    ok.
-
-%% Returns a list of bad tables
-swap_tmp_files([Tab | Tabs]) ->
-    dets_sync_close(Tab),
-    Tmp = tab2tmp(Tab),
-    Dat = tab2dat(Tab),
-    case file:rename(Tmp, Dat) of
-	ok ->
-	    swap_tmp_files(Tabs);
-	_ -> 
-	    file:delete(Tmp),
-	    [Tab | swap_tmp_files(Tabs)]
-    end;
-swap_tmp_files([]) ->
-    [].
-
-readable_indecies(Tab) ->
-    val({Tab, index}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Managing conditional debug functions
-%%
-%% The main idea with the debug_fun's is to allow test programs
-%% to control the internal behaviour of Mnesia. This is needed
-%% to make the test programs independent of system load, swapping
-%% and other circumstances that may affect the behaviour of Mnesia.
-%%
-%% First should calls to ?eval_debug_fun be inserted at well
-%% defined places in Mnesia's code. E.g. in critical situations
-%% of startup, transaction commit, backups etc.
-%%
-%% Then compile Mnesia with the compiler option 'debug'.
-%%
-%% In test programs ?activate_debug_fun should be called
-%% in order to bind a fun to the debug identifier stated
-%% in the call to ?eval_debug_fun.
-%%
-%% If eval_debug_fun finds that the fun is activated it
-%% invokes the fun as NewContext = Fun(PreviousContext, EvalContext)
-%% and replaces the PreviousContext with the NewContext.
-%% The initial context of a debug_fun is given as argument to
-%% activate_debug_fun.
-
--define(DEBUG_TAB, mnesia_debug).
--record(debug_info, {id, function, context, file, line}).
-
-scratch_debug_fun() ->
-    dbg_out("scratch_debug_fun(): ~p~n", [?DEBUG_TAB]),
-    (catch ?ets_delete_table(?DEBUG_TAB)),
-    ?ets_new_table(?DEBUG_TAB, [set, public, named_table, {keypos, 2}]).
-
-activate_debug_fun(FunId, Fun, InitialContext, File, Line) ->
-    Info = #debug_info{id = FunId,
-		       function = Fun,
-		       context = InitialContext,
-		       file = File,
-		       line = Line
-		      },
-    update_debug_info(Info).
-
-update_debug_info(Info) ->
-    case catch ?ets_insert(?DEBUG_TAB, Info) of
-	{'EXIT', _} ->
-	    scratch_debug_fun(),
-	    ?ets_insert(?DEBUG_TAB, Info);
-	_ ->
-	    ok
-    end,
-    dbg_out("update_debug_info(~p)~n", [Info]),
-    ok.
-
-deactivate_debug_fun(FunId, _File, _Line) ->
-    catch ?ets_delete(?DEBUG_TAB, FunId),
-    ok.
-
-eval_debug_fun(FunId, EvalContext, EvalFile, EvalLine) ->
-    case catch ?ets_lookup(?DEBUG_TAB, FunId) of
-	[] ->
-	    ok;
-	[Info] ->
-	    OldContext = Info#debug_info.context,
-	    dbg_out("~s(~p): ~w "
-		    "activated in ~s(~p)~n  "
-		    "eval_debug_fun(~w, ~w)~n",
-		    [filename:basename(EvalFile), EvalLine, Info#debug_info.id,
-		     filename:basename(Info#debug_info.file), Info#debug_info.line,
-		     OldContext, EvalContext]),
-	    Fun = Info#debug_info.function,
-	    NewContext = Fun(OldContext, EvalContext),
-	    
-	    case catch ?ets_lookup(?DEBUG_TAB, FunId) of
-		[Info] when NewContext /= OldContext ->
-		    NewInfo = Info#debug_info{context = NewContext},
-		    update_debug_info(NewInfo);
-		_ ->
-		    ok
-	    end;
-	{'EXIT', _} -> ok    
-    end.
-	
--ifdef(debug).
-    is_debug_compiled() -> true.
--else.
-    is_debug_compiled() -> false.
--endif.   
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_loader.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_loader.erl
deleted file mode 100644
index df3309cfa6..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_loader.erl
+++ /dev/null
@@ -1,805 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_loader.erl,v 1.2 2010/03/04 13:54:19 maria Exp $
-%%
-%%% Purpose : Loads tables from local disc or from remote node
-
--module(mnesia_loader).
-
-%% Mnesia internal stuff
--export([disc_load_table/2,
-	 net_load_table/4,
-	 send_table/3]).
-
--export([old_node_init_table/6]). %% Spawned old node protocol conversion hack
--export([spawned_receiver/8]).    %% Spawned lock taking process
-
--import(mnesia_lib, [set/2, fatal/2, verbose/2, dbg_out/2]).
-
--include("mnesia.hrl").
-
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason); 
-	Value -> Value
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Load a table from local disc
-
-disc_load_table(Tab, Reason) ->
-    Storage =  val({Tab, storage_type}),
-    Type = val({Tab, setorbag}),
-    dbg_out("Getting table ~p (~p) from disc: ~p~n",
-	    [Tab, Storage, Reason]),
-    ?eval_debug_fun({?MODULE, do_get_disc_copy},
-		    [{tab, Tab},
-		     {reason, Reason},
-		     {storage, Storage}, 
-		     {type, Type}]),
-    do_get_disc_copy2(Tab, Reason, Storage, Type).
-
-do_get_disc_copy2(Tab, _Reason, Storage, _Type) when Storage == unknown ->
-    verbose("Local table copy of ~p has recently been deleted, ignored.~n",
-	    [Tab]),
-    {loaded, ok};  %% ?
-do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_copies ->
-    %% NOW we create the actual table
-    Repair = mnesia_monitor:get_env(auto_repair),
-    Args = [{keypos, 2}, public, named_table, Type],
-    case Reason of 
-	{dumper, _} -> %% Resources allready allocated
-	    ignore;
-	_ ->
-	    mnesia_monitor:mktab(Tab, Args),
-	    Count = mnesia_log:dcd2ets(Tab, Repair),	    
-	    case ets:info(Tab, size) of
-		X when X < Count * 4 ->
-		    ok = mnesia_log:ets2dcd(Tab); 
-		_ ->
-		    ignore
-	    end
-    end, 
-    mnesia_index:init_index(Tab, Storage),
-    snmpify(Tab, Storage),
-    set({Tab, load_node}, node()),
-    set({Tab, load_reason}, Reason),
-    {loaded, ok};
-
-do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == ram_copies ->
-    Args = [{keypos, 2}, public, named_table, Type],
-    case Reason of 
-	{dumper, _} -> %% Resources allready allocated
-	    ignore;
-	_ ->
-	    mnesia_monitor:mktab(Tab, Args),
-	    Fname = mnesia_lib:tab2dcd(Tab),
-	    Datname = mnesia_lib:tab2dat(Tab),
-	    Repair = mnesia_monitor:get_env(auto_repair),
-	    case mnesia_monitor:use_dir() of
-		true ->
-		    case mnesia_lib:exists(Fname) of 
-			true -> mnesia_log:dcd2ets(Tab, Repair);
-			false ->
-			    case mnesia_lib:exists(Datname) of
-				true ->
-				    mnesia_lib:dets_to_ets(Tab, Tab, Datname, 
-							   Type, Repair, no);
-				false ->
-				    false
-			    end
-		    end;
-		false ->
-		    false
-	    end
-    end,
-    mnesia_index:init_index(Tab, Storage),
-    snmpify(Tab, Storage),
-    set({Tab, load_node}, node()),
-    set({Tab, load_reason}, Reason),
-    {loaded, ok};
-
-do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_only_copies ->
-    Args = [{file, mnesia_lib:tab2dat(Tab)},
-	    {type, mnesia_lib:disk_type(Tab, Type)},
-	    {keypos, 2},
-	    {repair, mnesia_monitor:get_env(auto_repair)}],
-    case Reason of
-	{dumper, _} ->
-	    mnesia_index:init_index(Tab, Storage),
-	    snmpify(Tab, Storage),
-	    set({Tab, load_node}, node()),
-	    set({Tab, load_reason}, Reason),
-	    {loaded, ok};
-	_ ->
-	    case mnesia_monitor:open_dets(Tab, Args) of
-		{ok, _} ->
-		    mnesia_index:init_index(Tab, Storage),
-		    snmpify(Tab, Storage),
-		    set({Tab, load_node}, node()),
-		    set({Tab, load_reason}, Reason),
-		    {loaded, ok};
-		{error, Error} ->
-		    {not_loaded, {"Failed to create dets table", Error}}
-	    end
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Load a table from a remote node
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Receiver                             Sender
-%% --------                             ------
-%% Grab schema lock on table
-%%                                      Determine table size
-%% Create empty pre-grown table
-%%                                      Grab read lock on table
-%%                                      Let receiver subscribe on updates done on sender node
-%%                                      Disable rehashing of table
-%%                                      Release read lock on table
-%%                                      Send table to receiver in chunks
-%% 
-%%                                      Grab read lock on table
-%% Block dirty updates
-%%                                      Update wherabouts
-%% 
-%%                                      Cancel the update subscription
-%% Process the subscription events
-%% Optionally dump to disc
-%% Unblock dirty updates
-%%                                      Release read lock on table
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--define(MAX_TRANSFER_SIZE, 7500). 
--define(MAX_RAM_FILE_SIZE, 1000000).
--define(MAX_RAM_TRANSFERS, (?MAX_RAM_FILE_SIZE div ?MAX_TRANSFER_SIZE) + 1).
--define(MAX_NOPACKETS, 20).
-
-net_load_table(Tab, Reason, Ns, Cs)
-        when Reason == {dumper,add_table_copy} ->
-    try_net_load_table(Tab, Reason, Ns, Cs);
-net_load_table(Tab, Reason, Ns, _Cs) ->
-    try_net_load_table(Tab, Reason, Ns, val({Tab, cstruct})).
-
-try_net_load_table(Tab, _Reason, [], _Cs) ->
-    verbose("Copy failed. No active replicas of ~p are available.~n", [Tab]),
-    {not_loaded, none_active};
-try_net_load_table(Tab, Reason, Ns, Cs) ->
-    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
-    do_get_network_copy(Tab, Reason, Ns, Storage, Cs).
-
-do_get_network_copy(Tab, _Reason, _Ns, unknown, _Cs) ->
-    verbose("Local table copy of ~p has recently been deleted, ignored.~n", [Tab]),
-    {not_loaded, storage_unknown};
-do_get_network_copy(Tab, Reason, Ns, Storage, Cs) ->
-    [Node | Tail] = Ns,
-    dbg_out("Getting table ~p (~p) from node ~p: ~p~n",
-	    [Tab, Storage, Node, Reason]),
-    ?eval_debug_fun({?MODULE, do_get_network_copy},
-		    [{tab, Tab}, {reason, Reason}, 
-		     {nodes, Ns}, {storage, Storage}]),
-    mnesia_controller:start_remote_sender(Node, Tab, self(), Storage),
-    put(mnesia_table_sender_node, {Tab, Node}),
-    case init_receiver(Node, Tab, Storage, Cs, Reason) of
-	ok ->
-	    set({Tab, load_node}, Node),
-	    set({Tab, load_reason}, Reason),
-	    mnesia_controller:i_have_tab(Tab),
-	    dbg_out("Table ~p copied from ~p to ~p~n", [Tab, Node, node()]),
-	    {loaded, ok};
-	Err = {error, _} when element(1, Reason) == dumper ->
-	    {not_loaded,Err};
-	restart ->
-	    try_net_load_table(Tab, Reason, Tail, Cs);
-	down ->
-	    try_net_load_table(Tab, Reason, Tail, Cs) 
-    end.
-
-snmpify(Tab, Storage) ->
-    do_snmpify(Tab, val({Tab, snmp}), Storage).
-
-do_snmpify(_Tab, [], _Storage) ->
-    ignore;
-do_snmpify(Tab, Us, Storage) ->
-    Snmp = mnesia_snmp_hook:create_table(Us, Tab, Storage),
-    set({Tab, {index, snmp}}, Snmp).
-
-%% Start the recieiver 
-%% Sender should be started first, so we don't have the schema-read
-%% lock to long (or get stuck in a deadlock)
-init_receiver(Node, Tab, Storage, Cs, Reason) ->
-    receive 
-	{SenderPid, {first, TabSize}} ->	    
-	    spawn_receiver(Tab,Storage,Cs,SenderPid,
-			   TabSize,false,Reason);
-	{SenderPid, {first, TabSize, DetsData}} ->
-	    spawn_receiver(Tab,Storage,Cs,SenderPid,
-			   TabSize,DetsData,Reason);
-	%% Protocol conversion hack
-	{copier_done, Node} ->
-	    dbg_out("Sender of table ~p crashed on node ~p ~n", [Tab, Node]),
-	    down(Tab, Storage)
-    end.
-
-
-table_init_fun(SenderPid) ->
-    PConv = mnesia_monitor:needs_protocol_conversion(node(SenderPid)),
-    MeMyselfAndI = self(),
-    fun(read) ->
-	    Receiver = 
-		if 
-		    PConv == true -> 
-			MeMyselfAndI ! {actual_tabrec, self()},
-			MeMyselfAndI; %% Old mnesia
-		    PConv == false -> self()
-		end,
-	    SenderPid ! {Receiver, more},
-	    get_data(SenderPid, Receiver)
-    end.
-
-
-%% Add_table_copy get's it's own locks.
-spawn_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,{dumper,add_table_copy}) ->    
-    Init = table_init_fun(SenderPid),
-    case do_init_table(Tab,Storage,Cs,SenderPid,TabSize,DetsData,self(), Init) of
-	Err = {error, _} ->
-	    SenderPid ! {copier_done, node()},
-	    Err;
-	Else ->
-	    Else
-    end;
-
-spawn_receiver(Tab,Storage,Cs,SenderPid,
-	       TabSize,DetsData,Reason) ->
-    %% Grab a schema lock to avoid deadlock between table_loader and schema_commit dumping.
-    %% Both may grab tables-locks in different order.
-    Load = fun() -> 
-		   {_,Tid,Ts} = get(mnesia_activity_state), 
-		   mnesia_locker:rlock(Tid, Ts#tidstore.store, 
-				       {schema, Tab}),
-		   Init = table_init_fun(SenderPid),
-		   Pid = spawn_link(?MODULE, spawned_receiver, 
-				    [self(),Tab,Storage,Cs,
-				     SenderPid,TabSize,DetsData,
-				     Init]),
-		   put(mnesia_real_loader, Pid),
-		   wait_on_load_complete(Pid)
-	   end,
-    Res = case mnesia:transaction(Load, 20) of
-	      {'atomic', {error,Result}} when element(1,Reason) == dumper -> 
-		  SenderPid ! {copier_done, node()},
-		  {error,Result};
-	      {'atomic', {error,Result}} -> 
-		  SenderPid ! {copier_done, node()},
-		  fatal("Cannot create table ~p: ~p~n",
-			[[Tab, Storage], Result]);
-	      {'atomic', Result} -> Result;
-	      {aborted, nomore} -> 
-		  SenderPid ! {copier_done, node()},
-		  restart;
-	      {aborted, _ } -> 
-		  SenderPid ! {copier_done, node()},
-		  down  %% either this node or sender is dying
-	  end,
-    unlink(whereis(mnesia_tm)),  %% Avoid late unlink from tm
-    Res.
-
-spawned_receiver(ReplyTo,Tab,Storage,Cs,
-		 SenderPid,TabSize,DetsData, Init) ->
-    process_flag(trap_exit, true), 
-    Done = do_init_table(Tab,Storage,Cs, 
-			 SenderPid,TabSize,DetsData,
-			 ReplyTo, Init),
-    ReplyTo ! {self(),Done},
-    unlink(ReplyTo),
-    unlink(whereis(mnesia_controller)),
-    exit(normal).
-
-wait_on_load_complete(Pid) ->
-    receive 
-	{Pid, Res} -> 
-	    Res;
-	{'EXIT', Pid, Reason} -> 
-	    exit(Reason);
-	Else -> 
-	    Pid ! Else,
-	    wait_on_load_complete(Pid)
-    end.
-
-tab_receiver(Node, Tab, Storage, Cs, PConv, OrigTabRec) ->
-    receive
-	{SenderPid, {no_more, DatBin}} when PConv == false ->
-	    finish_copy(Storage,Tab,Cs,SenderPid,DatBin,OrigTabRec);
-	
-	%% Protocol conversion hack
-	{SenderPid, {no_more, DatBin}} when pid(PConv) ->
-	    PConv ! {SenderPid, no_more},
-	    receive 
-		{old_init_table_complete, ok} ->
-		    finish_copy(Storage, Tab, Cs, SenderPid, DatBin,OrigTabRec);
-		{old_init_table_complete, Reason} ->
-		    Msg = "OLD: [d]ets:init table failed",
-		    dbg_out("~s: ~p: ~p~n", [Msg, Tab, Reason]),
-		    down(Tab, Storage)
-	    end;
-
-	{actual_tabrec, Pid} ->	
-	    tab_receiver(Node, Tab, Storage, Cs, Pid,OrigTabRec);
-	
-	{SenderPid, {more, [Recs]}} when pid(PConv) ->  
-	    PConv ! {SenderPid, {more, Recs}}, %% Forward Msg to OldNodes 
-	    tab_receiver(Node, Tab, Storage, Cs, PConv,OrigTabRec);
-
-	{'EXIT', PConv, Reason} ->  %% [d]ets:init process crashed 
-	    Msg = "Receiver crashed",
-	    dbg_out("~s: ~p: ~p~n", [Msg, Tab, Reason]),
-	    down(Tab, Storage);
-	
-	%% Protocol conversion hack
-	{copier_done, Node} ->
-	    dbg_out("Sender of table ~p crashed on node ~p ~n", [Tab, Node]),
-	    down(Tab, Storage);
-	
-	{'EXIT', Pid, Reason} ->
-	    handle_exit(Pid, Reason),
-	    tab_receiver(Node, Tab, Storage, Cs, PConv,OrigTabRec)
-    end.
-
-create_table(Tab, TabSize, Storage, Cs) ->
-    if 
-	Storage == disc_only_copies ->
-	    mnesia_lib:lock_table(Tab),
-	    Tmp = mnesia_lib:tab2tmp(Tab),
-	    Size = lists:max([TabSize, 256]),
-	    Args = [{file, Tmp},
-		    {keypos, 2},
-%%		    {ram_file, true},
-		    {estimated_no_objects, Size},
-		    {repair, mnesia_monitor:get_env(auto_repair)},
-		    {type, mnesia_lib:disk_type(Tab, Cs#cstruct.type)}],
-	    file:delete(Tmp),
-	    case mnesia_lib:dets_sync_open(Tab, Args) of
-		{ok, _} ->
-		    mnesia_lib:unlock_table(Tab),
-		    {Storage, Tab};
-		Else ->
-		    mnesia_lib:unlock_table(Tab),
-		    Else
-	    end;
-	(Storage == ram_copies) or (Storage == disc_copies) ->
-	    Args = [{keypos, 2}, public, named_table, Cs#cstruct.type],
-	    case mnesia_monitor:unsafe_mktab(Tab, Args) of
-		Tab ->
-		    {Storage, Tab};
-		Else ->
-		    Else
-	    end
-    end.
-
-do_init_table(Tab,Storage,Cs,SenderPid, 
-	      TabSize,DetsInfo,OrigTabRec,Init) ->
-    case create_table(Tab, TabSize, Storage, Cs) of
-	{Storage,Tab} ->
-	    %% Debug info
-	    Node = node(SenderPid),
-	    put(mnesia_table_receiver, {Tab, Node, SenderPid}),
-	    mnesia_tm:block_tab(Tab),
-	    PConv = mnesia_monitor:needs_protocol_conversion(Node),
-	    
-	    case init_table(Tab,Storage,Init,PConv,DetsInfo,SenderPid) of
-		ok -> 
-		    tab_receiver(Node,Tab,Storage,Cs,PConv,OrigTabRec);
-		Reason ->
-		    Msg = "[d]ets:init table failed",
-		    dbg_out("~s: ~p: ~p~n", [Msg, Tab, Reason]),
-		    down(Tab, Storage)
-	    end;
-	Error ->
-	    Error
-    end.
-
-make_table_fun(Pid, TabRec) ->
-    fun(close) ->
-	    ok;
-       (read) ->
-	    get_data(Pid, TabRec)	   
-    end.
-
-get_data(Pid, TabRec) ->
-    receive 
-	{Pid, {more, Recs}} ->
-	    Pid ! {TabRec, more},
-	    {Recs, make_table_fun(Pid,TabRec)};
-	{Pid, no_more} ->
-	    end_of_input;
-	{copier_done, Node} ->
-	    case node(Pid) of
-		Node -> 
-		    {copier_done, Node};
-		_ ->
-		    get_data(Pid, TabRec)
-	    end;
-	{'EXIT', Pid, Reason} ->
-	    handle_exit(Pid, Reason),
-	    get_data(Pid, TabRec)
-    end.
-
-init_table(Tab, disc_only_copies, Fun, false, DetsInfo,Sender) ->
-    ErtsVer = erlang:system_info(version),
-    case DetsInfo of
-	{ErtsVer, DetsData}  ->  
-	    Res = (catch dets:is_compatible_bchunk_format(Tab, DetsData)),
-	    case Res of
-		{'EXIT',{undef,[{dets,_,_}|_]}} ->
-		    Sender ! {self(), {old_protocol, Tab}},
-		    dets:init_table(Tab, Fun);  %% Old dets version
-		{'EXIT', What} ->
-		    exit(What);
-		false ->
-		    Sender ! {self(), {old_protocol, Tab}},
-		    dets:init_table(Tab, Fun);  %% Old dets version
-		true ->
-		    dets:init_table(Tab, Fun, [{format, bchunk}])
-	    end;
-	Old when Old /= false ->
-	    Sender ! {self(), {old_protocol, Tab}},
-	    dets:init_table(Tab, Fun);  %% Old dets version
-	_ ->
-	    dets:init_table(Tab, Fun)
-    end;
-init_table(Tab, _, Fun, false, _DetsInfo,_) ->
-    case catch ets:init_table(Tab, Fun) of
-	true ->
-	    ok;
-	{'EXIT', Else} -> Else
-    end;
-init_table(Tab, Storage, Fun, true, _DetsInfo, Sender) ->  %% Old Nodes    
-    spawn_link(?MODULE, old_node_init_table, 
-	       [Tab, Storage, Fun, self(), false, Sender]),
-    ok.
-
-old_node_init_table(Tab, Storage, Fun, TabReceiver, DetsInfo,Sender) ->    
-    Res = init_table(Tab, Storage, Fun, false, DetsInfo,Sender),
-    TabReceiver ! {old_init_table_complete, Res},
-    unlink(TabReceiver),
-    ok.
-
-finish_copy(Storage,Tab,Cs,SenderPid,DatBin,OrigTabRec) ->
-    TabRef = {Storage, Tab},
-    subscr_receiver(TabRef, Cs#cstruct.record_name),
-    case handle_last(TabRef, Cs#cstruct.type, DatBin) of
-	ok -> 
-	    mnesia_index:init_index(Tab, Storage),
-	    snmpify(Tab, Storage),
-	    %% OrigTabRec must not be the spawned tab-receiver
-	    %% due to old protocol.
-	    SenderPid ! {OrigTabRec, no_more},
-	    mnesia_tm:unblock_tab(Tab),
-	    ok;
-	{error, Reason} ->
-	    Msg = "Failed to handle last",
-	    dbg_out("~s: ~p: ~p~n", [Msg, Tab, Reason]),
-	    down(Tab, Storage)
-    end.
-
-subscr_receiver(TabRef = {_, Tab}, RecName) ->
-    receive
-	{mnesia_table_event, {Op, Val, _Tid}} ->
-	    if
-		Tab == RecName ->
-		    handle_event(TabRef, Op, Val);
-		true ->
-		    handle_event(TabRef, Op, setelement(1, Val, RecName))
-	    end,
-	    subscr_receiver(TabRef, RecName);
-
-	{'EXIT', Pid, Reason} ->
-	    handle_exit(Pid, Reason),
-	    subscr_receiver(TabRef, RecName)
-    after 0 ->
-	    ok
-    end.
-
-handle_event(TabRef, write, Rec) ->	    
-    db_put(TabRef, Rec);
-handle_event(TabRef, delete, {_Tab, Key}) ->
-    db_erase(TabRef, Key);
-handle_event(TabRef, delete_object, OldRec) ->
-    db_match_erase(TabRef, OldRec);
-handle_event(TabRef, clear_table, {_Tab, _Key}) ->
-    db_match_erase(TabRef, '_').
-
-handle_last({disc_copies, Tab}, _Type, nobin) ->
-    Ret = mnesia_log:ets2dcd(Tab),
-    Fname = mnesia_lib:tab2dat(Tab),  
-    case mnesia_lib:exists(Fname) of 
-	true ->  %% Remove old .DAT files.
-	    file:delete(Fname);
-	false ->
-	    ok
-    end,
-    Ret;
-
-handle_last({disc_only_copies, Tab}, Type, nobin) ->
-    case mnesia_lib:swap_tmp_files([Tab]) of
-	[] ->
-	    Args = [{file, mnesia_lib:tab2dat(Tab)},
-		    {type, mnesia_lib:disk_type(Tab, Type)},
-		    {keypos, 2},
-		    {repair, mnesia_monitor:get_env(auto_repair)}],
-	    mnesia_monitor:open_dets(Tab, Args),
-	    ok;
-	L when list(L) ->
-	    {error, {"Cannot swap tmp files", Tab, L}}
-    end;
-
-handle_last({ram_copies, _Tab}, _Type, nobin) ->
-    ok;
-handle_last({ram_copies, Tab}, _Type, DatBin) ->
-    case mnesia_monitor:use_dir() of
-	true ->
-	    mnesia_lib:lock_table(Tab),
-	    Tmp = mnesia_lib:tab2tmp(Tab),
-	    ok = file:write_file(Tmp, DatBin),
-	    ok = file:rename(Tmp, mnesia_lib:tab2dcd(Tab)),
-	    mnesia_lib:unlock_table(Tab),
-	    ok;
-	false ->
-	    ok
-    end.
-
-down(Tab, Storage) ->
-    case Storage of
-	ram_copies ->
-	    catch ?ets_delete_table(Tab);
-	disc_copies ->
-	    catch ?ets_delete_table(Tab);
-	disc_only_copies ->
-	    mnesia_lib:cleanup_tmp_files([Tab])
-    end,
-    mnesia_checkpoint:tm_del_copy(Tab, node()),
-    mnesia_controller:sync_del_table_copy_whereabouts(Tab, node()),
-    mnesia_tm:unblock_tab(Tab),
-    flush_subcrs(),
-    down.
-
-flush_subcrs() ->
-    receive
-	{mnesia_table_event, _} ->
-	    flush_subcrs();
-
-	{'EXIT', Pid, Reason} ->
-	    handle_exit(Pid, Reason),
-	    flush_subcrs()
-    after 0 ->
-	    done
-    end.
-
-db_erase({ram_copies, Tab}, Key) ->
-    true = ?ets_delete(Tab, Key);
-db_erase({disc_copies, Tab}, Key) ->
-    true = ?ets_delete(Tab, Key);
-db_erase({disc_only_copies, Tab}, Key) ->
-    ok = dets:delete(Tab, Key).
-
-db_match_erase({ram_copies, Tab} , Pat) ->
-    true = ?ets_match_delete(Tab, Pat);
-db_match_erase({disc_copies, Tab} , Pat) ->
-    true = ?ets_match_delete(Tab, Pat);
-db_match_erase({disc_only_copies, Tab}, Pat) ->
-    ok = dets:match_delete(Tab, Pat).
-
-db_put({ram_copies, Tab}, Val) ->
-    true = ?ets_insert(Tab, Val);
-db_put({disc_copies, Tab}, Val) ->
-    true = ?ets_insert(Tab, Val);
-db_put({disc_only_copies, Tab}, Val) ->
-    ok = dets:insert(Tab, Val).
-
-%% This code executes at the remote site where the data is
-%% executes in a special copier process.
-
-calc_nokeys(Storage, Tab) ->
-    %% Calculate #keys per transfer
-    Key = mnesia_lib:db_first(Storage, Tab),
-    Recs = mnesia_lib:db_get(Storage, Tab, Key),
-    BinSize = size(term_to_binary(Recs)),
-    (?MAX_TRANSFER_SIZE div BinSize) + 1.
-
-send_table(Pid, Tab, RemoteS) ->
-    case ?catch_val({Tab, storage_type}) of
-	{'EXIT', _} ->
-	    {error, {no_exists, Tab}};
-	unknown ->
-	    {error, {no_exists, Tab}};
-	Storage ->
-	    %% Send first
-	    TabSize = mnesia:table_info(Tab, size),	    
-	    Pconvert = mnesia_monitor:needs_protocol_conversion(node(Pid)),
-	    KeysPerTransfer = calc_nokeys(Storage, Tab),
-	    ChunkData = dets:info(Tab, bchunk_format),
-
-	    UseDetsChunk = 
-		Storage == RemoteS andalso 
-		Storage == disc_only_copies andalso 
-		ChunkData /= undefined andalso
-		Pconvert == false,	    
-	    if 
-		UseDetsChunk == true ->
-		    DetsInfo = erlang:system_info(version),
-		    Pid ! {self(), {first, TabSize, {DetsInfo, ChunkData}}};
-		true  ->
-		    Pid ! {self(), {first, TabSize}}
-	    end,
-	    
-	    %% Debug info
-	    put(mnesia_table_sender, {Tab, node(Pid), Pid}),
-	    {Init, Chunk} = reader_funcs(UseDetsChunk, Tab, Storage, KeysPerTransfer),
-	    
-	    SendIt = fun() ->
-			     prepare_copy(Pid, Tab, Storage),
-			     send_more(Pid, 1, Chunk, Init(), Tab, Pconvert),
-			     finish_copy(Pid, Tab, Storage, RemoteS)
-		     end,
-
-	    case catch SendIt() of
-		receiver_died ->
-		    cleanup_tab_copier(Pid, Storage, Tab),
-		    unlink(whereis(mnesia_tm)),
-		    ok;
-		{_, receiver_died} ->
-		    unlink(whereis(mnesia_tm)),
-		    ok;
-		{'atomic', no_more} ->
-		    unlink(whereis(mnesia_tm)),
-		    ok;
-		Reason ->
-		    cleanup_tab_copier(Pid, Storage, Tab),
-		    unlink(whereis(mnesia_tm)),
-		    {error, Reason}
-	    end
-    end.
-		
-prepare_copy(Pid, Tab, Storage) ->
-    Trans =
-	fun() ->
-		mnesia:write_lock_table(Tab),
-		mnesia_subscr:subscribe(Pid, {table, Tab}),
-		update_where_to_write(Tab, node(Pid)),
-		mnesia_lib:db_fixtable(Storage, Tab, true),
-		ok
-	end,
-    case mnesia:transaction(Trans) of
-	{'atomic', ok} ->
-	    ok;
-	{aborted, Reason} ->
-	    exit({tab_copier_prepare, Tab, Reason})
-    end.
-
-update_where_to_write(Tab, Node) ->
-    case val({Tab, access_mode}) of
-	read_only -> 
-	    ignore;
-	read_write -> 
-	    Current = val({current, db_nodes}),
-	    Ns = 
-		case lists:member(Node, Current) of
-		    true -> Current;
-		    false -> [Node | Current]
-		end,
-	    update_where_to_write(Ns, Tab, Node)
-    end.
-
-update_where_to_write([], _, _) -> 
-    ok;
-update_where_to_write([H|T], Tab, AddNode) ->
-    rpc:call(H,  mnesia_controller, call, 
-	     [{update_where_to_write, [add, Tab, AddNode], self()}]),
-    update_where_to_write(T, Tab, AddNode).
-
-send_more(Pid, N, Chunk, DataState, Tab, OldNode) ->
-    receive
-	{NewPid, more} ->
-	    case send_packet(N - 1, NewPid, Chunk, DataState, OldNode) of 
-		New when integer(New) -> 
-		    New - 1;
-		NewData ->
-		    send_more(NewPid, ?MAX_NOPACKETS, Chunk, NewData, Tab, OldNode)
-	    end;
-	{_NewPid, {old_protocol, Tab}} ->
-	    Storage =  val({Tab, storage_type}),
-	    {Init, NewChunk} = 
-		reader_funcs(false, Tab, Storage, calc_nokeys(Storage, Tab)),
-	    send_more(Pid, 1, NewChunk, Init(), Tab, OldNode);
-
-	{copier_done, Node} when Node == node(Pid)->
-	    verbose("Receiver of table ~p crashed on ~p (more)~n", [Tab, Node]),
-	    throw(receiver_died)
-    end.
-
-reader_funcs(UseDetsChunk, Tab, Storage, KeysPerTransfer) ->
-    case UseDetsChunk of
-	false ->
-	    {fun() -> mnesia_lib:db_init_chunk(Storage, Tab, KeysPerTransfer) end,
-	     fun(Cont) -> mnesia_lib:db_chunk(Storage, Cont) end};
-	true ->
-	    {fun() -> dets_bchunk(Tab, start) end,
-	     fun(Cont) -> dets_bchunk(Tab, Cont) end}
-    end.
-
-dets_bchunk(Tab, Chunk) -> %% Arrg
-    case dets:bchunk(Tab, Chunk) of
-	{Cont, Data} -> {Data, Cont};
-	Else -> Else
-    end.	    
-
-send_packet(N, Pid, _Chunk, '$end_of_table', OldNode) ->
-    case OldNode of
-	true -> ignore; %% Old nodes can't handle the new no_more
-	false ->  Pid ! {self(), no_more}
-    end,
-    N;
-send_packet(N, Pid, Chunk, {[], Cont}, OldNode) ->
-    send_packet(N, Pid, Chunk, Chunk(Cont), OldNode);
-send_packet(N, Pid, Chunk, {Recs, Cont}, OldNode) when N < ?MAX_NOPACKETS ->
-    case OldNode of
-	true -> Pid ! {self(), {more, [Recs]}}; %% Old need's wrapping list
-	false -> Pid ! {self(), {more, Recs}}
-    end,
-    send_packet(N+1, Pid, Chunk, Chunk(Cont), OldNode);
-send_packet(_N, _Pid, _Chunk, DataState, _OldNode) ->
-    DataState.
-
-finish_copy(Pid, Tab, Storage, RemoteS) ->
-    RecNode = node(Pid),
-    DatBin = dat2bin(Tab, Storage, RemoteS),
-    Trans =
-	fun() ->
-		mnesia:read_lock_table(Tab),
-		A = val({Tab, access_mode}),
-		mnesia_controller:sync_and_block_table_whereabouts(Tab, RecNode, RemoteS, A),
-		cleanup_tab_copier(Pid, Storage, Tab),
-		mnesia_checkpoint:tm_add_copy(Tab, RecNode),
-		Pid ! {self(), {no_more, DatBin}},
-		receive
-		    {Pid, no_more} -> % Dont bother about the spurious 'more' message
-			no_more;
-		    {copier_done, Node} when Node == node(Pid)->
-			verbose("Tab receiver ~p crashed (more): ~p~n", [Tab, Node]),
-			receiver_died
-		end
-	end,
-    mnesia:transaction(Trans).
-
-cleanup_tab_copier(Pid, Storage, Tab) ->
-    mnesia_lib:db_fixtable(Storage, Tab, false),
-    mnesia_subscr:unsubscribe(Pid, {table, Tab}).
-
-dat2bin(Tab, ram_copies, ram_copies) ->
-    mnesia_lib:lock_table(Tab),
-    Res = file:read_file(mnesia_lib:tab2dcd(Tab)),
-    mnesia_lib:unlock_table(Tab),
-    case Res of
-	{ok, DatBin} -> DatBin;
-	_ -> nobin
-    end;
-dat2bin(_Tab, _LocalS, _RemoteS) ->
-    nobin.
-
-handle_exit(Pid, Reason) when node(Pid) == node() ->
-    exit(Reason);
-handle_exit(_Pid, _Reason) ->  %% Not from our node, this will be handled by 
-    ignore.                  %% mnesia_down soon.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_locker.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_locker.erl
deleted file mode 100644
index 8fe08414d0..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_locker.erl
+++ /dev/null
@@ -1,1022 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_locker.erl,v 1.2 2009/07/01 15:45:40 kostis Exp $
-%%
--module(mnesia_locker).
-
--export([
-	 get_held_locks/0,
-	 get_lock_queue/0,
-	 global_lock/5,
-	 ixrlock/5,
-	 init/1,
-	 mnesia_down/2,
-	 release_tid/1,
-	 async_release_tid/2,
-	 send_release_tid/2,
-	 receive_release_tid_acc/2,
-	 rlock/3,
-	 rlock_table/3,
-	 rwlock/3,
-	 sticky_rwlock/3,
-	 start/0,
-	 sticky_wlock/3,
-	 sticky_wlock_table/3,
-	 wlock/3,
-	 wlock_no_exist/4,
-	 wlock_table/3
-	]).
-
-%% sys callback functions
--export([system_continue/3,
-	 system_terminate/4,
-	 system_code_change/4
-	]).
-
--include("mnesia.hrl").
--import(mnesia_lib, [dbg_out/2, error/2, verbose/2]).
-
--define(dbg(S,V), ok).
-%-define(dbg(S,V), dbg_out("~p:~p: " ++ S, [?MODULE, ?LINE] ++ V)).
-
--define(ALL, '______WHOLETABLE_____').
--define(STICK, '______STICK_____').
--define(GLOBAL, '______GLOBAL_____').
-
--record(state, {supervisor}).
-
--record(queue, {oid, tid, op, pid, lucky}).
-
-%% mnesia_held_locks: contain       {Oid, Op, Tid} entries  (bag)
--define(match_oid_held_locks(Oid),  {Oid, '_', '_'}).
-%% mnesia_tid_locks: contain        {Tid, Oid, Op} entries  (bag) 
--define(match_oid_tid_locks(Tid),   {Tid, '_', '_'}).
-%% mnesia_sticky_locks: contain     {Oid, Node} entries and {Tab, Node} entries (set)
--define(match_oid_sticky_locks(Oid),{Oid, '_'}).
-%% mnesia_lock_queue: contain       {queue, Oid, Tid, Op, ReplyTo, WaitForTid} entries (ordered_set)
--define(match_oid_lock_queue(Oid),  #queue{oid=Oid, tid='_', op = '_', pid = '_', lucky = '_'}). 
-%% mnesia_lock_counter:             {{write, Tab}, Number} &&
-%%                                  {{read, Tab}, Number} entries  (set)
-
-start() ->
-    mnesia_monitor:start_proc(?MODULE, ?MODULE, init, [self()]).
-
-init(Parent) ->
-    register(?MODULE, self()),
-    process_flag(trap_exit, true),
-    proc_lib:init_ack(Parent, {ok, self()}),
-    loop(#state{supervisor = Parent}).
-
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_); 
-	_VaLuE_ -> _VaLuE_ 
-    end.
-
-reply(From, R) ->
-    From ! {?MODULE, node(), R}.
-
-l_request(Node, X, Store) ->
-    {?MODULE, Node} ! {self(), X},
-    l_req_rec(Node, Store).
-
-l_req_rec(Node, Store) ->
-    ?ets_insert(Store, {nodes, Node}),
-    receive 
-	{?MODULE, Node, {switch, Node2, Req}} ->
-	    ?ets_insert(Store, {nodes, Node2}),
-	    {?MODULE, Node2} ! Req,
-	    {switch, Node2, Req};
-	{?MODULE, Node, Reply} -> 
-	    Reply;
-	{mnesia_down, Node} -> 
-	    {not_granted, {node_not_running, Node}}
-    end.
-
-release_tid(Tid) ->
-    ?MODULE ! {release_tid, Tid}.
-
-async_release_tid(Nodes, Tid) ->
-    rpc:abcast(Nodes, ?MODULE, {release_tid, Tid}).
-
-send_release_tid(Nodes, Tid) ->
-    rpc:abcast(Nodes, ?MODULE, {self(), {sync_release_tid, Tid}}).
-
-receive_release_tid_acc([Node | Nodes], Tid) ->
-    receive 
-	{?MODULE, Node, {tid_released, Tid}} -> 
-	    receive_release_tid_acc(Nodes, Tid);
-	{mnesia_down, Node} -> 
-	    receive_release_tid_acc(Nodes, Tid)
-    end;
-receive_release_tid_acc([], _Tid) ->
-    ok.
-
-loop(State) ->
-    receive
-	{From, {write, Tid, Oid}} ->
-	    try_sticky_lock(Tid, write, From, Oid),
-	    loop(State);
-
-	%% If Key == ?ALL it's a request to lock the entire table
-	%%
-
-	{From, {read, Tid, Oid}} ->
-	    try_sticky_lock(Tid, read, From, Oid),
-	    loop(State);
-
-	%% Really do a  read, but get hold of a write lock
-	%% used by mnesia:wread(Oid).
-	
-	{From, {read_write, Tid, Oid}} ->
-	    try_sticky_lock(Tid, read_write, From, Oid),
-	    loop(State);
-	
-	%% Tid has somehow terminated, clear up everything
-	%% and pass locks on to queued processes.
-	%% This is the purpose of the mnesia_tid_locks table
-	
-	{release_tid, Tid} ->
-	    do_release_tid(Tid),
-	    loop(State);
-	
-	%% stick lock, first tries this to the where_to_read Node
-	{From, {test_set_sticky, Tid, {Tab, _} = Oid, Lock}} ->
-	    case ?ets_lookup(mnesia_sticky_locks, Tab) of
-		[] -> 
-		    reply(From, not_stuck),
-		    loop(State);
-		[{_,Node}] when Node == node() ->
-		    %% Lock is stuck here, see now if we can just set 
-		    %% a regular write lock
-		    try_lock(Tid, Lock, From, Oid),
-		    loop(State);
-		[{_,Node}] ->
-		    reply(From, {stuck_elsewhere, Node}),
-		    loop(State)
-	    end;
-
-	%% If test_set_sticky fails, we send this to all nodes
-	%% after aquiring a real write lock on Oid
-
-	{stick, {Tab, _}, N} ->
-	    ?ets_insert(mnesia_sticky_locks, {Tab, N}),
-	    loop(State);
-
-	%% The caller which sends this message, must have first 
-	%% aquired a write lock on the entire table
-	{unstick, Tab} ->
-	    ?ets_delete(mnesia_sticky_locks, Tab),
-	    loop(State);
-
-	{From, {ix_read, Tid, Tab, IxKey, Pos}} ->
-	    case catch mnesia_index:get_index_table(Tab, Pos) of
-		{'EXIT', _} ->
-		    reply(From, {not_granted, {no_exists, Tab, {index, [Pos]}}}),
-		    loop(State);
-		Index ->
-		    Rk = mnesia_lib:elems(2,mnesia_index:db_get(Index, IxKey)),
-		    %% list of real keys
-		    case ?ets_lookup(mnesia_sticky_locks, Tab) of
-			[] ->
-			    set_read_lock_on_all_keys(Tid, From,Tab,Rk,Rk, 
-						      []),
-			    loop(State);
-			[{_,N}] when N == node() ->
-			    set_read_lock_on_all_keys(Tid, From,Tab,Rk,Rk, 
-						      []),
-			    loop(State);
-			[{_,N}] ->
-			    Req = {From, {ix_read, Tid, Tab, IxKey, Pos}},
-			    From ! {?MODULE, node(), {switch, N, Req}},
-			    loop(State)
-		    end
-	    end;
-
-	{From, {sync_release_tid, Tid}} ->
-	    do_release_tid(Tid),
-	    reply(From, {tid_released, Tid}),
-	    loop(State);
-	
-	{release_remote_non_pending, Node, Pending} ->
-	    release_remote_non_pending(Node, Pending),
-	    mnesia_monitor:mnesia_down(?MODULE, Node),
-	    loop(State);
-
-	{'EXIT', Pid, _} when Pid == State#state.supervisor ->
-	    do_stop();
-
-	{system, From, Msg} ->
-	    verbose("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
-	    Parent = State#state.supervisor,
-	    sys:handle_system_msg(Msg, From, Parent, ?MODULE, [], State);
-	    
-	Msg ->
-	    error("~p got unexpected message: ~p~n", [?MODULE, Msg]),
-	    loop(State)
-    end.
-
-set_lock(Tid, Oid, Op) ->
-    ?dbg("Granted ~p ~p ~p~n", [Tid,Oid,Op]),
-    ?ets_insert(mnesia_held_locks, {Oid, Op, Tid}),
-    ?ets_insert(mnesia_tid_locks, {Tid, Oid, Op}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Acquire locks
-
-try_sticky_lock(Tid, Op, Pid, {Tab, _} = Oid) ->
-    case ?ets_lookup(mnesia_sticky_locks, Tab) of
-	[] ->
-	    try_lock(Tid, Op, Pid, Oid);
-	[{_,N}] when N == node() ->
-	    try_lock(Tid, Op, Pid, Oid);
-	[{_,N}] ->
-	    Req = {Pid, {Op, Tid, Oid}},
-	    Pid ! {?MODULE, node(), {switch, N, Req}}
-    end.
-
-try_lock(Tid, read_write, Pid, Oid) ->
-    try_lock(Tid, read_write, read, write, Pid, Oid);
-try_lock(Tid, Op, Pid, Oid) ->
-    try_lock(Tid, Op, Op, Op, Pid, Oid).
-
-try_lock(Tid, Op, SimpleOp, Lock, Pid, Oid) ->
-    case can_lock(Tid, Lock, Oid, {no, bad_luck}) of
-	yes ->
-	    Reply = grant_lock(Tid, SimpleOp, Lock, Oid),
-	    reply(Pid, Reply);
-	{no, Lucky} ->
-	    C = #cyclic{op = SimpleOp, lock = Lock, oid = Oid, lucky = Lucky},
-	    ?dbg("Rejected ~p ~p ~p ~p ~n", [Tid, Oid, Lock, Lucky]),
-	    reply(Pid, {not_granted, C});
-	{queue, Lucky} ->
-	    ?dbg("Queued ~p ~p ~p ~p ~n", [Tid, Oid, Lock, Lucky]),
-	    %% Append to queue: Nice place for trace output
-	    ?ets_insert(mnesia_lock_queue, 
-			#queue{oid = Oid, tid = Tid, op = Op, 
-			       pid = Pid, lucky = Lucky}),
-	    ?ets_insert(mnesia_tid_locks, {Tid, Oid, {queued, Op}})
-    end.
-
-grant_lock(Tid, read, Lock, {Tab, Key})
-  when Key /= ?ALL, Tab /= ?GLOBAL ->
-    case node(Tid#tid.pid) == node() of
-	true ->
-	    set_lock(Tid, {Tab, Key}, Lock),
-	    {granted, lookup_in_client};
-	false ->
-	    case catch mnesia_lib:db_get(Tab, Key) of %% lookup as well
-		{'EXIT', _Reason} ->
-		    %% Table has been deleted from this node,
-		    %% restart the transaction.
-		    C = #cyclic{op = read, lock = Lock, oid = {Tab, Key},
-				lucky = nowhere},
-		    {not_granted, C};
-		Val -> 
-		    set_lock(Tid, {Tab, Key}, Lock),
-		    {granted, Val}
-	    end
-    end;
-grant_lock(Tid, read, Lock, Oid) ->
-    set_lock(Tid, Oid, Lock),
-    {granted, ok};
-grant_lock(Tid, write, Lock, Oid) ->
-    set_lock(Tid, Oid, Lock),
-    granted.
-
-%% 1) Impose an ordering on all transactions favour old (low tid) transactions
-%%    newer (higher tid) transactions may never wait on older ones,
-%% 2) When releasing the tids from the queue always begin with youngest (high tid)
-%%    because of 1) it will avoid the deadlocks.
-%% 3) TabLocks is the problem :-) They should not starve and not deadlock 
-%%    handle tablocks in queue as they had locks on unlocked records.
-
-can_lock(Tid, read, {Tab, Key}, AlreadyQ) when Key /= ?ALL ->
-    %% The key is bound, no need for the other BIF
-    Oid = {Tab, Key}, 
-    ObjLocks = ?ets_match_object(mnesia_held_locks, {Oid, write, '_'}),
-    TabLocks = ?ets_match_object(mnesia_held_locks, {{Tab, ?ALL}, write, '_'}),
-    check_lock(Tid, Oid, ObjLocks, TabLocks, yes, AlreadyQ, read);
-
-can_lock(Tid, read, Oid, AlreadyQ) -> % Whole tab
-    Tab = element(1, Oid),
-    ObjLocks = ?ets_match_object(mnesia_held_locks, {{Tab, '_'}, write, '_'}),
-    check_lock(Tid, Oid, ObjLocks, [], yes, AlreadyQ, read);
-
-can_lock(Tid, write, {Tab, Key}, AlreadyQ) when Key /= ?ALL -> 
-    Oid = {Tab, Key},
-    ObjLocks = ?ets_lookup(mnesia_held_locks, Oid),
-    TabLocks = ?ets_lookup(mnesia_held_locks, {Tab, ?ALL}),
-    check_lock(Tid, Oid, ObjLocks, TabLocks, yes, AlreadyQ, write);
-
-can_lock(Tid, write, Oid, AlreadyQ) -> % Whole tab
-    Tab = element(1, Oid),
-    ObjLocks = ?ets_match_object(mnesia_held_locks, ?match_oid_held_locks({Tab, '_'})),
-    check_lock(Tid, Oid, ObjLocks, [], yes, AlreadyQ, write).
-
-%% Check held locks for conflicting locks
-check_lock(Tid, Oid, [Lock | Locks], TabLocks, X, AlreadyQ, Type) ->
-    case element(3, Lock) of
-	Tid ->
-	    check_lock(Tid, Oid, Locks, TabLocks, X, AlreadyQ, Type);
-	WaitForTid when WaitForTid > Tid -> % Important order
-	    check_lock(Tid, Oid, Locks, TabLocks, {queue, WaitForTid}, AlreadyQ, Type);
-	WaitForTid when Tid#tid.pid == WaitForTid#tid.pid ->
-	    dbg_out("Spurious lock conflict ~w ~w: ~w -> ~w~n",
-		    [Oid, Lock, Tid, WaitForTid]),  
-%%	    check_lock(Tid, Oid, Locks, TabLocks, {queue, WaitForTid}, AlreadyQ);
-	    %% BUGBUG Fix this if possible
-	    {no, WaitForTid};
-	WaitForTid ->
-	    {no, WaitForTid}
-    end;
-
-check_lock(_, _, [], [], X, {queue, bad_luck}, _) ->
-    X;  %% The queue should be correct already no need to check it again
-
-check_lock(_, _, [], [], X = {queue, _Tid}, _AlreadyQ, _) ->
-    X;  
-
-check_lock(Tid, Oid, [], [], X, AlreadyQ, Type) ->
-    {Tab, Key} = Oid,
-    if
-	Type == write ->
-	    check_queue(Tid, Tab, X, AlreadyQ);
-	Key == ?ALL ->
-	    %% hmm should be solvable by a clever select expr but not today...
-	    check_queue(Tid, Tab, X, AlreadyQ);
-	true ->
-	    %% If there is a queue on that object, read_lock shouldn't be granted
-	    ObjLocks = ets:lookup(mnesia_lock_queue, Oid),
-	    Greatest = max(ObjLocks),
-	    case Greatest of
-		empty -> 
-		    check_queue(Tid, Tab, X, AlreadyQ);
-		ObjL when Tid > ObjL -> 
-		    {no, ObjL}; %% Starvation Preemption (write waits for read)
-		ObjL ->
-		    check_queue(Tid, Tab, {queue, ObjL}, AlreadyQ)
-	    end
-    end;
-
-check_lock(Tid, Oid, [], TabLocks, X, AlreadyQ, Type) ->
-    check_lock(Tid, Oid, TabLocks, [], X, AlreadyQ, Type).
-
-%% Check queue for conflicting locks
-%% Assume that all queued locks belongs to other tid's
-
-check_queue(Tid, Tab, X, AlreadyQ) ->
-    TabLocks = ets:lookup(mnesia_lock_queue, {Tab,?ALL}),
-    Greatest = max(TabLocks),
-    case Greatest of
-	empty -> 
-	    X;
-	Tid ->
-	    X; 
-	WaitForTid when WaitForTid#queue.tid > Tid -> % Important order
-	    {queue, WaitForTid};
-	WaitForTid -> 
-	    case AlreadyQ of
-		{no, bad_luck} -> {no, WaitForTid};
-		_ ->  
-		    erlang:error({mnesia_locker, assert, AlreadyQ})
-	    end
-    end.
-
-max([]) ->
-    empty;
-max([H|R]) ->
-    max(R, H#queue.tid).
-
-max([H|R], Tid) when H#queue.tid > Tid ->
-    max(R, H#queue.tid);
-max([_|R], Tid) ->
-    max(R, Tid);
-max([], Tid) ->
-    Tid.
-
-%% We can't queue the ixlock requests since it
-%% becomes to complivated for little me :-)
-%% If we encounter an object with a wlock we reject the
-%% entire lock request
-%% 
-%% BUGBUG: this is actually a bug since we may starve
-
-set_read_lock_on_all_keys(Tid, From, Tab, [RealKey | Tail], Orig, Ack) ->
-    Oid = {Tab, RealKey},
-    case can_lock(Tid, read, Oid, {no, bad_luck}) of
-	yes ->
-	    {granted, Val} = grant_lock(Tid, read, read, Oid),
-	    case opt_lookup_in_client(Val, Oid, read) of  % Ought to be invoked
-		C when record(C, cyclic) ->               % in the client
-		    reply(From, {not_granted, C});
-		Val2 -> 
-		    Ack2 = lists:append(Val2, Ack),
-		    set_read_lock_on_all_keys(Tid, From, Tab, Tail, Orig, Ack2)
-	    end;
-	{no, Lucky} ->
-	    C = #cyclic{op = read, lock = read, oid = Oid, lucky = Lucky},
-	    reply(From, {not_granted, C});
-	{queue, Lucky} ->
-	    C = #cyclic{op = read, lock = read, oid = Oid, lucky = Lucky},
-	    reply(From, {not_granted, C})
-    end;
-set_read_lock_on_all_keys(_Tid, From, _Tab, [], Orig, Ack) ->
-    reply(From, {granted, Ack, Orig}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Release of locks
-
-%% Release remote non-pending nodes
-release_remote_non_pending(Node, Pending) ->
-    %% Clear the mnesia_sticky_locks table first, to avoid
-    %% unnecessary requests to the failing node
-    ?ets_match_delete(mnesia_sticky_locks, {'_' , Node}),
-
-    %% Then we have to release all locks held by processes
-    %% running at the failed node and also simply remove all
-    %% queue'd requests back to the failed node
-
-    AllTids = ?ets_match(mnesia_tid_locks, {'$1', '_', '_'}),
-    Tids = [T || [T] <- AllTids, Node == node(T#tid.pid), not lists:member(T, Pending)],
-    do_release_tids(Tids).
-
-do_release_tids([Tid | Tids]) ->
-    do_release_tid(Tid),
-    do_release_tids(Tids);
-do_release_tids([]) ->
-    ok.
-
-do_release_tid(Tid) ->
-    Locks = ?ets_lookup(mnesia_tid_locks, Tid),
-    ?dbg("Release ~p ~p ~n", [Tid, Locks]),
-    ?ets_delete(mnesia_tid_locks, Tid),
-    release_locks(Locks),
-    %% Removed queued locks which has had locks
-    UniqueLocks = keyunique(lists:sort(Locks),[]),
-    rearrange_queue(UniqueLocks).
-
-keyunique([{_Tid, Oid, _Op}|R], Acc = [{_, Oid, _}|_]) ->
-    keyunique(R, Acc);
-keyunique([H|R], Acc) ->
-    keyunique(R, [H|Acc]);
-keyunique([], Acc) ->
-    Acc.
-
-release_locks([Lock | Locks]) ->
-    release_lock(Lock),
-    release_locks(Locks);
-release_locks([]) ->
-    ok.
-
-release_lock({Tid, Oid, {queued, _}}) ->
-    ?ets_match_delete(mnesia_lock_queue, 
-		      #queue{oid=Oid, tid = Tid, op = '_',
-			     pid = '_', lucky = '_'});
-release_lock({Tid, Oid, Op}) ->
-    if
-	Op == write ->
-	    ?ets_delete(mnesia_held_locks, Oid);
-	Op == read ->
-	    ?ets_match_delete(mnesia_held_locks, {Oid, Op, Tid})
-    end.
-
-rearrange_queue([{_Tid, {Tab, Key}, _} | Locks]) ->
-    if
-	Key /= ?ALL->	    
-	    Queue =  
-		ets:lookup(mnesia_lock_queue, {Tab, ?ALL}) ++ 
-		ets:lookup(mnesia_lock_queue, {Tab, Key}),
-	    case Queue of 
-		[] -> 
-		    ok;
-		_ ->
-		    Sorted = lists:reverse(lists:keysort(#queue.tid, Queue)),
-		    try_waiters_obj(Sorted)
-	    end;	
-	true -> 
-	    Pat = ?match_oid_lock_queue({Tab, '_'}),
-	    Queue = ?ets_match_object(mnesia_lock_queue, Pat),	    
-	    Sorted = lists:reverse(lists:keysort(#queue.tid, Queue)),
-	    try_waiters_tab(Sorted)
-    end,
-    ?dbg("RearrQ ~p~n", [Queue]),
-    rearrange_queue(Locks);
-rearrange_queue([]) ->
-    ok.
-
-try_waiters_obj([W | Waiters]) ->
-    case try_waiter(W) of
-	queued ->
-	    no;
-	_ -> 	    
-	    try_waiters_obj(Waiters)
-    end;
-try_waiters_obj([]) ->
-    ok.
-
-try_waiters_tab([W | Waiters]) ->
-    case W#queue.oid of
-	{_Tab, ?ALL} ->
-	    case try_waiter(W) of
-		queued ->
-		    no;
-		_ ->
-		    try_waiters_tab(Waiters)
-	    end;
-	Oid ->
-	    case try_waiter(W) of
-		queued -> 	    
-		    Rest = key_delete_all(Oid, #queue.oid, Waiters),
-		    try_waiters_tab(Rest);
-		_ ->		    
-		    try_waiters_tab(Waiters)
-	    end
-    end;
-try_waiters_tab([]) ->
-    ok.
-
-try_waiter({queue, Oid, Tid, read_write, ReplyTo, _}) ->
-    try_waiter(Oid, read_write, read, write, ReplyTo, Tid);
-try_waiter({queue, Oid, Tid, Op, ReplyTo, _}) ->
-    try_waiter(Oid, Op, Op, Op, ReplyTo, Tid).
-
-try_waiter(Oid, Op, SimpleOp, Lock, ReplyTo, Tid) ->
-    case can_lock(Tid, Lock, Oid, {queue, bad_luck}) of
-	yes ->
-	    %% Delete from queue: Nice place for trace output
-	    ?ets_match_delete(mnesia_lock_queue, 
-			      #queue{oid=Oid, tid = Tid, op = Op,
-				     pid = ReplyTo, lucky = '_'}),
-	    Reply = grant_lock(Tid, SimpleOp, Lock, Oid),	    
-	    ReplyTo ! {?MODULE, node(), Reply},
-	    locked;
-	{queue, _Why} ->
-	    ?dbg("Keep ~p ~p ~p ~p~n", [Tid, Oid, Lock, _Why]),
-	    queued; % Keep waiter in queue	
-	{no, Lucky} ->
-	    C = #cyclic{op = SimpleOp, lock = Lock, oid = Oid, lucky = Lucky},
-	    verbose("** WARNING ** Restarted transaction, possible deadlock in lock queue ~w: cyclic = ~w~n",
-		    [Tid, C]),
-	    ?ets_match_delete(mnesia_lock_queue, 
-			      #queue{oid=Oid, tid = Tid, op = Op,
-				     pid = ReplyTo, lucky = '_'}),
-	    Reply = {not_granted, C},
-	    ReplyTo ! {?MODULE, node(), Reply},
-	    removed
-    end.
-
-key_delete_all(Key, Pos, TupleList) ->
-    key_delete_all(Key, Pos, TupleList, []).
-key_delete_all(Key, Pos, [H|T], Ack) when element(Pos, H) == Key ->
-    key_delete_all(Key, Pos, T, Ack);
-key_delete_all(Key, Pos, [H|T], Ack) ->
-    key_delete_all(Key, Pos, T, [H|Ack]);
-key_delete_all(_, _, [], Ack) ->
-    lists:reverse(Ack).
-
-
-%% ********************* end server code ********************
-%% The following code executes at the client side of a transactions
-
-mnesia_down(N, Pending) ->
-    case whereis(?MODULE) of
-	undefined ->
-	    %% Takes care of mnesia_down's in early startup
-	    mnesia_monitor:mnesia_down(?MODULE, N);
-	Pid ->
-	    %% Syncronously call needed in order to avoid
-	    %% race with mnesia_tm's coordinator processes
-	    %% that may restart and acquire new locks.
-	    %% mnesia_monitor ensures the sync.
-	    Pid ! {release_remote_non_pending, N, Pending}
-    end.
-
-%% Aquire a write lock, but do a read, used by 
-%% mnesia:wread/1
-
-rwlock(Tid, Store, Oid) ->
-    {Tab, Key} = Oid,
-    case val({Tab, where_to_read}) of
-	nowhere ->
-	    mnesia:abort({no_exists, Tab});
-	Node ->
-	    Lock = write,
-	    case need_lock(Store, Tab, Key, Lock)  of
-		yes ->
-		    Ns = w_nodes(Tab),
-		    Res = get_rwlocks_on_nodes(Ns, Ns, Node, Store, Tid, Oid),
-		    ?ets_insert(Store, {{locks, Tab, Key}, Lock}),
-		    Res;
-		no ->
-		    if
-			Key == ?ALL ->
-			    w_nodes(Tab);
-			Tab == ?GLOBAL ->
-			    w_nodes(Tab);
-			true ->
-			    dirty_rpc(Node, Tab, Key, Lock)
-		    end
-	    end
-    end.
-
-get_rwlocks_on_nodes([Node | Tail], Orig, Node, Store, Tid, Oid) ->
-    Op = {self(), {read_write, Tid, Oid}},
-    {?MODULE, Node} ! Op,
-    ?ets_insert(Store, {nodes, Node}),
-    add_debug(Node),
-    get_rwlocks_on_nodes(Tail, Orig, Node, Store, Tid, Oid);
-get_rwlocks_on_nodes([Node | Tail], Orig, OtherNode, Store, Tid, Oid) ->
-    Op = {self(), {write, Tid, Oid}},
-    {?MODULE, Node} ! Op,
-    add_debug(Node),
-    ?ets_insert(Store, {nodes, Node}),
-    get_rwlocks_on_nodes(Tail, Orig, OtherNode, Store, Tid, Oid);
-get_rwlocks_on_nodes([], Orig, _Node, Store, _Tid, Oid) ->
-    receive_wlocks(Orig, read_write_lock, Store, Oid).
-
-%% Return a list of nodes or abort transaction
-%% WE also insert any additional where_to_write nodes
-%% in the local store under the key == nodes
-
-w_nodes(Tab) ->
-    Nodes = ?catch_val({Tab, where_to_write}),
-    case Nodes of
-	[_ | _] -> Nodes;
-	_ ->  mnesia:abort({no_exists, Tab})
-    end.
-
-%% aquire a sticky wlock, a sticky lock is a lock
-%% which remains at this node after the termination of the
-%% transaction.
-
-sticky_wlock(Tid, Store, Oid) ->
-    sticky_lock(Tid, Store, Oid, write).
-
-sticky_rwlock(Tid, Store, Oid) ->
-    sticky_lock(Tid, Store, Oid, read_write).
-
-sticky_lock(Tid, Store, {Tab, Key} = Oid, Lock) ->
-    N = val({Tab, where_to_read}), 
-    if
-	node() == N ->
-	    case need_lock(Store, Tab, Key, write) of
-	    	yes ->
-		    do_sticky_lock(Tid, Store, Oid, Lock);
-		no ->
-		    dirty_sticky_lock(Tab, Key, [N], Lock)
-	    end;
-	true ->
-	    mnesia:abort({not_local, Tab})
-    end.
-
-do_sticky_lock(Tid, Store, {Tab, Key} = Oid, Lock) ->
-    ?MODULE ! {self(), {test_set_sticky, Tid, Oid, Lock}},
-    receive
-	{?MODULE, _N, granted} ->
-	    ?ets_insert(Store, {{locks, Tab, Key}, write}),
-	    granted;
-	{?MODULE, _N, {granted, Val}} -> %% for rwlocks
-	    case opt_lookup_in_client(Val, Oid, write) of
-		C when record(C, cyclic) ->
-		    exit({aborted, C});
-		Val2 ->
-		    ?ets_insert(Store, {{locks, Tab, Key}, write}),
-		    Val2
-	    end;
-	{?MODULE, _N, {not_granted, Reason}} ->
-	    exit({aborted, Reason});
-	{?MODULE, N, not_stuck} ->
-	    not_stuck(Tid, Store, Tab, Key, Oid, Lock, N),
-	    dirty_sticky_lock(Tab, Key, [N], Lock);
-	{mnesia_down, N} ->
-	    exit({aborted, {node_not_running, N}});
-	{?MODULE, N, {stuck_elsewhere, _N2}} ->
-	    stuck_elsewhere(Tid, Store, Tab, Key, Oid, Lock),
-	    dirty_sticky_lock(Tab, Key, [N], Lock)
-    end.
-
-not_stuck(Tid, Store, Tab, _Key, Oid, _Lock, N) ->
-    rlock(Tid, Store, {Tab, ?ALL}),   %% needed?
-    wlock(Tid, Store, Oid),           %% perfect sync
-    wlock(Tid, Store, {Tab, ?STICK}), %% max one sticker/table
-    Ns = val({Tab, where_to_write}),
-    rpc:abcast(Ns, ?MODULE, {stick, Oid, N}).
-
-stuck_elsewhere(Tid, Store, Tab, _Key, Oid, _Lock) ->
-    rlock(Tid, Store, {Tab, ?ALL}),   %% needed?
-    wlock(Tid, Store, Oid),           %% perfect sync
-    wlock(Tid, Store, {Tab, ?STICK}), %% max one sticker/table
-    Ns = val({Tab, where_to_write}),
-    rpc:abcast(Ns, ?MODULE, {unstick, Tab}).
-
-dirty_sticky_lock(Tab, Key, Nodes, Lock) ->
-    if
-	Lock == read_write ->
-	    mnesia_lib:db_get(Tab, Key);
-	Key == ?ALL ->
-	    Nodes;
-	Tab == ?GLOBAL ->
-	    Nodes;
-	true ->
-	    ok
-    end.	   
-
-sticky_wlock_table(Tid, Store, Tab) ->
-    sticky_lock(Tid, Store, {Tab, ?ALL}, write).
-
-%% aquire a wlock on Oid
-%% We store a {Tabname, write, Tid} in all locktables
-%% on all nodes containing a copy of Tabname
-%% We also store an item {{locks, Tab, Key}, write} in the 
-%% local store when we have aquired the lock.
-%% 
-wlock(Tid, Store, Oid) ->
-    {Tab, Key} = Oid,
-    case need_lock(Store, Tab, Key, write) of
-	yes ->
-	    Ns = w_nodes(Tab),
-	    Op = {self(), {write, Tid, Oid}},
-	    ?ets_insert(Store, {{locks, Tab, Key}, write}),
-	    get_wlocks_on_nodes(Ns, Ns, Store, Op, Oid);
-	no when Key /= ?ALL, Tab /= ?GLOBAL ->
-	    [];
-	no ->
-	    w_nodes(Tab)
-    end.
-
-wlock_table(Tid, Store, Tab) ->
-    wlock(Tid, Store, {Tab, ?ALL}).
-
-%% Write lock even if the table does not exist
-
-wlock_no_exist(Tid, Store, Tab, Ns) ->
-    Oid = {Tab, ?ALL},
-    Op = {self(), {write, Tid, Oid}},
-    get_wlocks_on_nodes(Ns, Ns, Store, Op, Oid).
-
-need_lock(Store, Tab, Key, LockPattern) ->
-    TabL = ?ets_match_object(Store, {{locks, Tab, ?ALL}, LockPattern}),
-    if 
-	TabL == [] ->
-	    KeyL = ?ets_match_object(Store, {{locks, Tab, Key}, LockPattern}),
-	    if 
-		KeyL == [] ->
-		    yes;
-		true  ->
-		    no
-	    end;
-	true ->
-	    no
-    end.
-
-add_debug(Node) ->  % Use process dictionary for debug info
-    case get(mnesia_wlock_nodes) of       
-	undefined -> 
-	    put(mnesia_wlock_nodes, [Node]);
-	NodeList  ->
-	    put(mnesia_wlock_nodes, [Node|NodeList])
-    end.
-
-del_debug(Node) ->
-    case get(mnesia_wlock_nodes) of
-	undefined ->  % Shouldn't happen
-	    ignore;
-	[Node] ->
-	    erase(mnesia_wlock_nodes);
-	List -> 
-	    put(mnesia_wlock_nodes, lists:delete(Node, List))
-    end.
-
-%% We first send lock requests to the lockmanagers on all 
-%% nodes holding a copy of the table
-
-get_wlocks_on_nodes([Node | Tail], Orig, Store, Request, Oid) ->
-    {?MODULE, Node} ! Request,
-    ?ets_insert(Store, {nodes, Node}),
-    add_debug(Node),
-    get_wlocks_on_nodes(Tail, Orig, Store, Request, Oid);
-get_wlocks_on_nodes([], Orig, Store, _Request, Oid) ->
-    receive_wlocks(Orig, Orig, Store, Oid).
-
-receive_wlocks([Node | Tail], Res, Store, Oid) ->
-    receive
-	{?MODULE, Node, granted} ->
-	    del_debug(Node),
-	    receive_wlocks(Tail, Res, Store, Oid);
-	{?MODULE, Node, {granted, Val}} -> %% for rwlocks
-	    del_debug(Node),
-	    case opt_lookup_in_client(Val, Oid, write) of
-		C when record(C, cyclic) ->
-		    flush_remaining(Tail, Node, {aborted, C});
-		Val2 ->
-		    receive_wlocks(Tail, Val2, Store, Oid)
-	    end;
-	{?MODULE, Node, {not_granted, Reason}} ->
-	    del_debug(Node),
-	    Reason1 = {aborted, Reason},
-	    flush_remaining(Tail, Node, Reason1);
-	{mnesia_down, Node} ->
-	    del_debug(Node),
-	    Reason1 = {aborted, {node_not_running, Node}},
-	    flush_remaining(Tail, Node, Reason1);
-	{?MODULE, Node, {switch, Node2, Req}} -> %% for rwlocks
-	    del_debug(Node),
-	    add_debug(Node2),
-	    ?ets_insert(Store, {nodes, Node2}),
-	    {?MODULE, Node2} ! Req,
-	    receive_wlocks([Node2 | Tail], Res, Store, Oid)
-    end;
-
-receive_wlocks([], Res, _Store, _Oid) ->
-    Res.
-
-flush_remaining([], _SkipNode, Res) ->
-    exit(Res);
-flush_remaining([SkipNode | Tail ], SkipNode, Res) ->
-    del_debug(SkipNode),
-    flush_remaining(Tail, SkipNode, Res);
-flush_remaining([Node | Tail], SkipNode, Res) ->
-    receive
-	{?MODULE, Node, _} ->
-	    del_debug(Node),
-	    flush_remaining(Tail, SkipNode, Res);
-	{mnesia_down, Node} ->
-	    del_debug(Node),
-	    flush_remaining(Tail, SkipNode, {aborted, {node_not_running, Node}})
-    end.
-
-opt_lookup_in_client(lookup_in_client, Oid, Lock) ->
-    {Tab, Key} = Oid,
-    case catch mnesia_lib:db_get(Tab, Key) of
-	{'EXIT', _} ->
-	    %% Table has been deleted from this node,
-	    %% restart the transaction.
-	    #cyclic{op = read, lock = Lock, oid = Oid, lucky = nowhere};
-	Val -> 
-	    Val
-    end;
-opt_lookup_in_client(Val, _Oid, _Lock) ->
-    Val.
-
-return_granted_or_nodes({_, ?ALL}   , Nodes) -> Nodes;
-return_granted_or_nodes({?GLOBAL, _}, Nodes) -> Nodes;
-return_granted_or_nodes(_           , _Nodes) -> granted.
-    
-%% We store a {Tab, read, From} item in the 
-%% locks table on the node where we actually do pick up the object
-%% and we also store an item {lock, Oid, read} in our local store
-%% so that we can release any locks we hold when we commit.
-%% This function not only aquires a read lock, but also reads the object
-
-%% Oid's are always {Tab, Key} tuples
-rlock(Tid, Store, Oid) ->
-    {Tab, Key} = Oid,
-    case val({Tab, where_to_read}) of
-	nowhere ->
-	    mnesia:abort({no_exists, Tab});
-	Node ->
-	    case need_lock(Store, Tab, Key, '_') of
-		yes ->
-		    R = l_request(Node, {read, Tid, Oid}, Store),
-		    rlock_get_reply(Node, Store, Oid, R);
-		no ->
-		    if
-			Key == ?ALL ->
-			    [Node];
-			Tab == ?GLOBAL ->
-			    [Node];
-			true ->
-			    dirty_rpc(Node, Tab, Key, read)
-		    end
-	    end
-    end.
-
-dirty_rpc(nowhere, Tab, Key, _Lock) ->
-    mnesia:abort({no_exists, {Tab, Key}});
-dirty_rpc(Node, _Tab, ?ALL, _Lock) ->
-    [Node];
-dirty_rpc(Node, ?GLOBAL, _Key, _Lock) ->
-    [Node];
-dirty_rpc(Node, Tab, Key, Lock) ->
-    Args = [Tab, Key],
-    case rpc:call(Node, mnesia_lib, db_get, Args) of
-	{badrpc, Reason} ->
-	    case val({Tab, where_to_read}) of
-		Node ->
-		    ErrorTag = mnesia_lib:dirty_rpc_error_tag(Reason),
-		    mnesia:abort({ErrorTag, Args});
-		_NewNode ->
-		    %% Table has been deleted from the node,
-		    %% restart the transaction.
-		    C = #cyclic{op = read, lock = Lock, oid = {Tab, Key}, lucky = nowhere},
-		    exit({aborted, C})
-	    end;
-	Other ->
-	    Other
-    end.
-
-rlock_get_reply(Node, Store, Oid, {granted, V}) ->
-    {Tab, Key} = Oid,
-    ?ets_insert(Store, {{locks, Tab, Key}, read}),
-    ?ets_insert(Store, {nodes, Node}),
-    case opt_lookup_in_client(V, Oid, read) of
-	C when record(C, cyclic) -> 
-	    mnesia:abort(C);
-	Val -> 
-	    Val
-    end;
-rlock_get_reply(Node, Store, Oid, granted) ->
-    {Tab, Key} = Oid,
-    ?ets_insert(Store, {{locks, Tab, Key}, read}),
-    ?ets_insert(Store, {nodes, Node}),
-    return_granted_or_nodes(Oid, [Node]);
-rlock_get_reply(Node, Store, Tab, {granted, V, RealKeys}) ->
-    L = fun(K) -> ?ets_insert(Store, {{locks, Tab, K}, read}) end,
-    lists:foreach(L, RealKeys),
-    ?ets_insert(Store, {nodes, Node}),
-    V;
-rlock_get_reply(_Node, _Store, _Oid, {not_granted , Reason}) ->
-    exit({aborted, Reason});
-
-rlock_get_reply(_Node, Store, Oid, {switch, N2, Req}) ->
-    ?ets_insert(Store, {nodes, N2}),
-    {?MODULE, N2} ! Req,
-    rlock_get_reply(N2, Store, Oid, l_req_rec(N2, Store)).
-
-
-rlock_table(Tid, Store, Tab) ->
-    rlock(Tid, Store, {Tab, ?ALL}).
-
-ixrlock(Tid, Store, Tab, IxKey, Pos) ->
-    case val({Tab, where_to_read}) of
-	nowhere ->
-	    mnesia:abort({no_exists, Tab});
-	Node ->
-	    R = l_request(Node, {ix_read, Tid, Tab, IxKey, Pos}, Store),
-	    rlock_get_reply(Node, Store, Tab, R)
-    end.
-
-%% Grabs the locks or exits
-global_lock(Tid, Store, Item, write, Ns) ->
-    Oid = {?GLOBAL, Item},
-    Op = {self(), {write, Tid, Oid}},
-    get_wlocks_on_nodes(Ns, Ns, Store, Op, Oid);
-global_lock(Tid, Store, Item, read, Ns) ->
-    Oid = {?GLOBAL, Item},
-    send_requests(Ns, {read, Tid, Oid}),
-    rec_requests(Ns, Oid, Store),
-    Ns.
-
-send_requests([Node | Nodes], X) ->
-    {?MODULE, Node} ! {self(), X},
-    send_requests(Nodes, X);
-send_requests([], _X) ->
-    ok.
-
-rec_requests([Node | Nodes], Oid, Store) ->
-    Res = l_req_rec(Node, Store),
-    case catch rlock_get_reply(Node, Store, Oid, Res) of
-	{'EXIT', Reason} ->
-	    flush_remaining(Nodes, Node, Reason);
-	_ ->
-	    rec_requests(Nodes, Oid, Store)
-    end;
-rec_requests([], _Oid, _Store) ->
-    ok.
-
-get_held_locks() ->
-    ?ets_match_object(mnesia_held_locks, '_').
-
-get_lock_queue() ->
-    Q = ?ets_match_object(mnesia_lock_queue, '_'),
-    [{Oid, Op, Pid, Tid, WFT} || {queue, Oid, Tid, Op, Pid, WFT} <- Q].
-
-do_stop() ->
-    exit(shutdown).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% System upgrade
-
-system_continue(_Parent, _Debug, State) ->
-    loop(State).
-
-system_terminate(_Reason, _Parent, _Debug, _State) ->
-    do_stop().
-
-system_code_change(State, _Module, _OldVsn, _Extra) ->
-    {ok, State}.
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_log.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_log.erl
deleted file mode 100644
index 79bd8d3812..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_log.erl
+++ /dev/null
@@ -1,1019 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_log.erl,v 1.2 2009/07/01 15:45:40 kostis Exp $
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% This module administers three kinds of log files:
-%%
-%% 1 The transaction log
-%%   mnesia_tm appends to the log (via mnesia_log) at the
-%%   end of each transaction (or dirty write) and
-%%   mnesia_dumper reads the log and performs the ops in
-%%   the dat files. The dump_log is done  at startup and
-%%   at intervals controlled by the user.
-%%
-%% 2 The mnesia_down log
-%%   mnesia_tm appends to the log (via mnesia_log) when it
-%%   realizes that mnesia goes up or down on another node.
-%%   mnesia_init reads the log (via mnesia_log) at startup.
-%%
-%% 3 The backup log
-%%   mnesia_schema produces one tiny log when the schema is
-%%   initially created. mnesia_schema also reads the log
-%%   when the user wants tables (possibly incl the schema)
-%%   to be restored. mnesia_log appends to the log when the
-%%   user wants to produce a real backup.
-%%
-%%   The actual access to the backup media is performed via the
-%%   mnesia_backup module for both read and write. mnesia_backup
-%%   uses the disk_log (*), BUT the user may write an own module
-%%   with the same interface as mnesia_backup and configure
-%%   Mnesia so the alternate module performs the actual accesses
-%%   to the backup media. This means that the user may put the
-%%   backup on medias that Mnesia does not know about possibly on
-%%   hosts where Erlang is not running.
-%%
-%% All these logs have to some extent a common structure.
-%% They are all using the disk_log module (*) for the basic
-%% file structure. The disk_log has a repair feature that
-%% can be used to skip erroneous log records if one comes to
-%% the conclusion that it is more important to reuse some
-%% of the log records than the risque of obtaining inconsistent
-%% data. If the data becomes inconsistent it is solely up to the
-%% application to make it consistent again. The automatic
-%% reparation of the disk_log is very powerful, but use it
-%% with extreme care.
-%%
-%% First in all Mnesia's log file is a mnesia log header.
-%% It contains a list with a log_header record as single
-%% element. The structure of the log_header may never be
-%% changed since it may be written to very old backup files.
-%% By holding this record definition stable we can be
-%% able to comprahend backups from timepoint 0. It also
-%% allows us to use the backup format as an interchange
-%% format between Mnesia releases.
-%%
-%% An op-list is a list of tuples with arity 3. Each tuple
-%% has this structure: {Oid, Recs, Op} where Oid is the tuple
-%% {Tab, Key}, Recs is a (possibly empty) list of records and
-%% Op is an atom.
-%%
-%% The log file structure for the transaction log is as follows.
-%%
-%%    After the mnesia log section follows an extended record section
-%%    containing op-lists. There are several values that Op may
-%%    have, such as write, delete, update_counter, delete_object,
-%%    and replace. There is no special end of section marker.
-%%
-%%    +-----------------+
-%%    | mnesia log head |
-%%    +-----------------+
-%%    | extended record |
-%%    | section         |
-%%    +-----------------+
-%%
-%% The log file structure for the mnesia_down log is as follows.
-%%
-%%    After the mnesia log section follows a mnesia_down section
-%%    containg lists with yoyo records as single element.
-%%
-%%    +-----------------+
-%%    | mnesia log head |
-%%    +-----------------+
-%%    | mnesia_down     |
-%%    | section         |
-%%    +-----------------+
-%%
-%% The log file structure for the backup log is as follows.
-%%
-%%    After the mnesia log section follows a schema section
-%%    containing record lists. A record list is a list of tuples
-%%    where {schema, Tab} is interpreted as a delete_table(Tab) and
-%%    {schema, Tab, CreateList} are interpreted as create_table.
-%%
-%%    The record section also contains record lists. In this section
-%%    {Tab, Key} is interpreted as delete({Tab, Key}) and other tuples
-%%    as write(Tuple). There is no special end of section marker.
-%%
-%%    +-----------------+
-%%    | mnesia log head |
-%%    +-----------------+
-%%    | schema section  |
-%%    +-----------------+
-%%    | record section  |
-%%    +-----------------+
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--module(mnesia_log).
-
--export([
-	 append/2,
-	 backup/1,
-	 backup/2,
-	 backup_checkpoint/2,
-	 backup_checkpoint/3,
-	 backup_log_header/0,
-	 backup_master/2,
-	 chunk_decision_log/1,
-	 chunk_decision_tab/1,
-	 chunk_log/1,
-	 chunk_log/2,
-	 close_decision_log/0,
-	 close_decision_tab/0,
-	 close_log/1,
-	 unsafe_close_log/1,
-	 confirm_log_dump/1,
-	 confirm_decision_log_dump/0,
-	 previous_log_file/0,
-	 previous_decision_log_file/0,
-	 latest_log_file/0,
-	 decision_log_version/0,
-	 decision_log_file/0,
-	 decision_tab_file/0,
-	 decision_tab_version/0,
-	 dcl_version/0,
-	 dcd_version/0,
-	 ets2dcd/1,
-	 ets2dcd/2,
-	 dcd2ets/1,
-	 dcd2ets/2,
-	 init/0,
-	 init_log_dump/0,
-	 log/1,
-	 slog/1,
-	 log_decision/1,
-	 log_files/0,
-	 open_decision_log/0,
-	 trans_log_header/0,
-	 open_decision_tab/0,
-	 dcl_log_header/0,
-	 dcd_log_header/0,
-	 open_log/4,
-	 open_log/6,
-	 prepare_decision_log_dump/0,
-	 prepare_log_dump/1,
-	 save_decision_tab/1,
-	 purge_all_logs/0,
-	 purge_some_logs/0,
-	 stop/0,
-	 tab_copier/3,
-	 version/0,
-	 view/0,
-	 view/1,
-	 write_trans_log_header/0
-	]).
-	
-	
--include("mnesia.hrl").
--import(mnesia_lib, [val/1, dir/1]).
--import(mnesia_lib, [exists/1, fatal/2, error/2, dbg_out/2]).
-
-trans_log_header() -> log_header(trans_log, version()).
-backup_log_header() -> log_header(backup_log, "1.2").
-decision_log_header() -> log_header(decision_log, decision_log_version()).
-decision_tab_header() -> log_header(decision_tab, decision_tab_version()).
-dcl_log_header() -> log_header(dcl_log, dcl_version()).
-dcd_log_header() -> log_header(dcd_log, dcd_version()).
-
-log_header(Kind, Version) ->
-    #log_header{log_version=Version,
-		log_kind=Kind,
-		mnesia_version=mnesia:system_info(version),
-		node=node(),
-		now=now()}.
-
-version() -> "4.3".
-
-decision_log_version() -> "3.0".
-
-decision_tab_version() -> "1.0".
-
-dcl_version() -> "1.0".
-dcd_version() -> "1.0".
-     
-append(Log, Bin) when binary(Bin) ->
-    disk_log:balog(Log, Bin);
-append(Log, Term) ->
-    disk_log:alog(Log, Term).
-
-%% Synced append
-sappend(Log, Bin) when binary(Bin) ->
-    ok = disk_log:blog(Log, Bin);  
-sappend(Log, Term) ->
-    ok = disk_log:log(Log, Term).  
-
-%% Write commit records to the latest_log
-log(C) when  C#commit.disc_copies == [],
-             C#commit.disc_only_copies  == [],
-             C#commit.schema_ops == [] ->
-    ignore;
-log(C) ->
-    case mnesia_monitor:use_dir() of
-        true ->
-	    if
-		record(C, commit) ->
-		    C2 =  C#commit{ram_copies = [], snmp = []},
-		    append(latest_log, C2);
-		true ->
-		    %% Either a commit record as binary
-		    %% or some decision related info
-		    append(latest_log, C)
-	    end,
-	    mnesia_dumper:incr_log_writes();
-	false ->
-	    ignore
-    end.
-
-%% Synced
-
-slog(C) when  C#commit.disc_copies == [],
-             C#commit.disc_only_copies  == [],
-             C#commit.schema_ops == [] ->
-    ignore;
-slog(C) ->
-    case mnesia_monitor:use_dir() of
-        true ->
-	    if
-		record(C, commit) ->
-		    C2 =  C#commit{ram_copies = [], snmp = []},
-		    sappend(latest_log, C2);
-		true ->
-		    %% Either a commit record as binary
-		    %% or some decision related info
-		    sappend(latest_log, C)
-	    end,
-	    mnesia_dumper:incr_log_writes();
-	false ->
-	    ignore
-    end.
-
-
-%% Stuff related to the file LOG
-
-%% Returns a list of logfiles. The oldest is first.
-log_files() -> [previous_log_file(),
-		latest_log_file(),
-		decision_tab_file()
-	       ].
-
-latest_log_file() -> dir(latest_log_name()).
-
-previous_log_file() -> dir("PREVIOUS.LOG").
-
-decision_log_file() -> dir(decision_log_name()).
-
-decision_tab_file() -> dir(decision_tab_name()).
-    
-previous_decision_log_file() -> dir("PDECISION.LOG").
-
-latest_log_name() -> "LATEST.LOG".
-
-decision_log_name() -> "DECISION.LOG".
-
-decision_tab_name() -> "DECISION_TAB.LOG".
-
-init() ->
-    case mnesia_monitor:use_dir() of
-	true ->
-	    Prev = previous_log_file(),
-	    verify_no_exists(Prev),
-	    
-	    Latest = latest_log_file(),
-	    verify_no_exists(Latest),
-	    
-	    Header = trans_log_header(),
-	    open_log(latest_log, Header, Latest);
-	false ->
-	    ok
-    end.
-
-verify_no_exists(Fname) ->
-    case exists(Fname) of
-	false ->
-	    ok;
-	true ->
-	    fatal("Log file exists: ~p~n", [Fname])
-    end.
-
-open_log(Name, Header, Fname) ->
-    Exists = exists(Fname),
-    open_log(Name, Header, Fname, Exists).
-
-open_log(Name, Header, Fname, Exists) ->
-    Repair = mnesia_monitor:get_env(auto_repair),
-    open_log(Name, Header, Fname, Exists, Repair).
-
-open_log(Name, Header, Fname, Exists, Repair) ->
-    case Name == previous_log of
-	true ->
-	    open_log(Name, Header, Fname, Exists, Repair, read_only);
-	false ->
-	    open_log(Name, Header, Fname, Exists, Repair, read_write)
-    end.
-
-open_log(Name, Header, Fname, Exists, Repair, Mode) ->
-    Args = [{file, Fname}, {name, Name}, {repair, Repair}, {mode, Mode}],
-%%    io:format("~p:open_log: ~p ~p~n", [?MODULE, Name, Fname]),
-    case mnesia_monitor:open_log(Args) of
-	{ok, Log} when Exists == true ->
-	    Log;
-	{ok, Log} ->
-	    write_header(Log, Header),
-	    Log;
-	{repaired, Log, _, {badbytes, 0}} when Exists == true ->
-	    Log;
-	{repaired, Log, _, {badbytes, 0}} ->
-	    write_header(Log, Header),
-	    Log;
-	{repaired, Log, _Recover, BadBytes} ->
-	    mnesia_lib:important("Data may be missing, log ~p repaired: Lost ~p bytes~n", 
-				 [Fname, BadBytes]),
-	    Log;
-	{error, Reason} when Repair == true ->
-	    file:delete(Fname),
-	    mnesia_lib:important("Data may be missing, Corrupt logfile deleted: ~p, ~p ~n", 
-				 [Fname, Reason]),
-	    %% Create a new 
-	    open_log(Name, Header, Fname, false, false, read_write);
-	{error, Reason} ->
-	    fatal("Cannot open log file ~p: ~p~n", [Fname, Reason])
-    end.
-
-write_header(Log, Header) -> 
-    append(Log, Header).
-
-write_trans_log_header() ->
-    write_header(latest_log, trans_log_header()).
-
-stop() ->
-    case mnesia_monitor:use_dir() of
-        true ->
-	    close_log(latest_log);
-	false ->
-	    ok
-    end.
-
-close_log(Log) ->
-%%    io:format("mnesia_log:close_log ~p~n", [Log]),
-%%    io:format("mnesia_log:close_log ~p~n", [Log]),
-    case disk_log:sync(Log) of 
-	ok -> ok;
-	{error, {read_only_mode, Log}} -> 
-	    ok;
-	{error, Reason} -> 
-	    mnesia_lib:important("Failed syncing ~p to_disk reason ~p ~n", 
-				 [Log, Reason])
-    end,
-    mnesia_monitor:close_log(Log).
-
-unsafe_close_log(Log) ->
-%%    io:format("mnesia_log:close_log ~p~n", [Log]),
-    mnesia_monitor:unsafe_close_log(Log).
-
-
-purge_some_logs() ->
-    mnesia_monitor:unsafe_close_log(latest_log), 
-    file:delete(latest_log_file()),
-    file:delete(decision_tab_file()).
-
-purge_all_logs() ->
-    file:delete(previous_log_file()),
-    file:delete(latest_log_file()),
-    file:delete(decision_tab_file()).
-
-%% Prepare dump by renaming the open logfile if possible
-%% Returns a tuple on the following format: {Res, OpenLog}
-%% where OpenLog is the file descriptor to log file, ready for append
-%% and Res is one of the following: already_dumped, needs_dump or {error, Reason}
-prepare_log_dump(InitBy) ->
-    Diff = mnesia_dumper:get_log_writes() -
-           mnesia_lib:read_counter(trans_log_writes_prev),
-    if
-	Diff == 0, InitBy /= startup ->
-	    already_dumped;
-	true ->
-	    case mnesia_monitor:use_dir() of
-		true ->
-		    Prev = previous_log_file(),
-		    prepare_prev(Diff, InitBy, Prev, exists(Prev));
-		false ->
-		    already_dumped
-	    end
-    end.
-
-prepare_prev(Diff, _, _, true) ->
-    {needs_dump, Diff};
-prepare_prev(Diff, startup, Prev, false) ->
-    Latest = latest_log_file(),
-    case exists(Latest) of
-	true ->
-	    case file:rename(Latest, Prev) of
-		ok ->
-		    {needs_dump, Diff};
-		{error, Reason} ->
-		    {error, Reason}
-	    end;
-	false ->
-	    already_dumped
-    end;
-prepare_prev(Diff, _InitBy, Prev, false) ->
-    Head = trans_log_header(),
-    case mnesia_monitor:reopen_log(latest_log, Prev, Head) of
-	ok ->
-	    {needs_dump, Diff};
-	{error, Reason} ->
-	    Latest = latest_log_file(),
-	    {error, {"Cannot rename log file",
-		     [Latest, Prev, Reason]}}
-    end.
-
-%% Init dump and return PrevLogFileDesc or exit.
-init_log_dump() ->
-    Fname = previous_log_file(),
-    open_log(previous_log, trans_log_header(), Fname),
-    start.
-
-
-chunk_log(Cont) ->
-    chunk_log(previous_log, Cont).
-
-chunk_log(_Log, eof) ->
-    eof;
-chunk_log(Log, Cont) ->
-    case catch disk_log:chunk(Log, Cont) of
-	{error, Reason} ->
-	    fatal("Possibly truncated ~p file: ~p~n",
-		  [Log, Reason]);
-	{C2, Chunk, _BadBytes} ->
-	    %% Read_only case, should we warn about the bad log file?
-	    %% BUGBUG Should we crash if Repair == false ?? 
-	    %% We got to check this !!
-	    mnesia_lib:important("~p repaired, lost ~p bad bytes~n", [Log, _BadBytes]),
-	    {C2, Chunk}; 
-	Other ->
-	    Other
-    end.
-
-%% Confirms the dump by closing prev log and delete the file
-confirm_log_dump(Updates) ->
-    case mnesia_monitor:close_log(previous_log) of
-	ok ->
-	    file:delete(previous_log_file()),
-	    mnesia_lib:incr_counter(trans_log_writes_prev, Updates),
-	    dumped;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Decision log
-
-open_decision_log() ->
-    Latest = decision_log_file(),
-    open_log(decision_log, decision_log_header(), Latest),
-    start.
-    
-prepare_decision_log_dump() ->
-    Prev = previous_decision_log_file(),
-    prepare_decision_log_dump(exists(Prev), Prev).
-
-prepare_decision_log_dump(false, Prev) ->
-    Head = decision_log_header(),
-    case mnesia_monitor:reopen_log(decision_log, Prev, Head) of
-	ok ->
-	    prepare_decision_log_dump(true, Prev);
-	{error, Reason} ->
-	    fatal("Cannot rename decision log file ~p -> ~p: ~p~n",
-		     [decision_log_file(), Prev, Reason])
-    end;
-prepare_decision_log_dump(true, Prev) ->
-    open_log(previous_decision_log, decision_log_header(), Prev),
-    start.
-
-chunk_decision_log(Cont) ->
-    %% dbg_out("chunk log ~p~n", [Cont]),
-    chunk_log(previous_decision_log, Cont).
-
-%% Confirms dump of the decision log
-confirm_decision_log_dump() ->
-    case mnesia_monitor:close_log(previous_decision_log) of
-	ok ->
-	    file:delete(previous_decision_log_file());
-	{error, Reason} ->
-	    fatal("Cannot confirm decision log dump: ~p~n",
-		  [Reason])
-    end.
-
-save_decision_tab(Decisions) ->
-    Log = decision_tab,
-    Tmp = mnesia_lib:dir("DECISION_TAB.TMP"),
-    file:delete(Tmp),
-    open_log(Log, decision_tab_header(), Tmp),
-    append(Log, Decisions),
-    close_log(Log),
-    TabFile = decision_tab_file(),
-    ok = file:rename(Tmp, TabFile).
-
-open_decision_tab() ->
-    TabFile = decision_tab_file(),
-    open_log(decision_tab, decision_tab_header(), TabFile),
-    start.
-
-close_decision_tab() ->
-    close_log(decision_tab).
-
-chunk_decision_tab(Cont) ->
-    %% dbg_out("chunk tab ~p~n", [Cont]),
-    chunk_log(decision_tab, Cont).
-
-close_decision_log() ->
-    close_log(decision_log).
-
-log_decision(Decision) ->
-    append(decision_log, Decision).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Debug functions
-
-view() ->
-    lists:foreach(fun(F) -> view(F) end, log_files()).
-
-view(File) ->
-    mnesia_lib:show("*****  ~p ***** ~n", [File]),
-    case exists(File) of
-	false ->
-	    nolog;
-	true ->
-	    N = view_only,
-	    Args = [{file, File}, {name, N}, {mode, read_only}],
-	    case disk_log:open(Args) of
-		{ok, N} ->
-		    view_file(start, N);
-		{repaired, _, _, _} ->
-		    view_file(start, N);
-		{error, Reason} ->
-		    error("Cannot open log ~p: ~p~n", [File, Reason])
-	    end
-    end.
-
-view_file(C, Log) ->
-    case disk_log:chunk(Log, C) of
-	{error, Reason} ->
-	    error("** Possibly truncated FILE ~p~n", [Reason]),
-	    error;
-	eof ->
-	    disk_log:close(Log),
-	    eof;
-	{C2, Terms, _BadBytes} ->
-	    dbg_out("Lost ~p bytes in ~p ~n", [_BadBytes, Log]),
-	    lists:foreach(fun(X) -> mnesia_lib:show("~p~n", [X]) end, 
-			  Terms),
-	    view_file(C2, Log);
-	{C2, Terms} ->
-	    lists:foreach(fun(X) -> mnesia_lib:show("~p~n", [X]) end, 
-			  Terms),
-	    view_file(C2, Log)
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Backup
-
--record(backup_args, {name, module, opaque, scope, prev_name, tables, cookie}).
-
-backup(Opaque) ->
-    backup(Opaque, []).
-
-backup(Opaque, Mod) when atom(Mod) ->
-    backup(Opaque, [{module, Mod}]);
-backup(Opaque, Args) when list(Args) ->
-    %% Backup all tables with max redundancy
-    CpArgs = [{ram_overrides_dump, false}, {max, val({schema, tables})}],
-    case mnesia_checkpoint:activate(CpArgs) of
-	{ok, Name, _Nodes} ->
-	    Res = backup_checkpoint(Name, Opaque, Args),
-	    mnesia_checkpoint:deactivate(Name),
-	    Res;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-backup_checkpoint(Name, Opaque) ->
-    backup_checkpoint(Name, Opaque, []).
-
-backup_checkpoint(Name, Opaque, Mod) when atom(Mod) ->
-    backup_checkpoint(Name, Opaque, [{module, Mod}]);
-backup_checkpoint(Name, Opaque, Args) when list(Args) ->
-    DefaultMod = mnesia_monitor:get_env(backup_module),
-    B = #backup_args{name = Name,
-		     module = DefaultMod,
-		     opaque = Opaque,
-		     scope = global,
-		     tables = all,
-		     prev_name = Name},
-    case check_backup_args(Args, B) of
-	{ok, B2} ->
-	    %% Decentralized backup
-	    %% Incremental
-
-	    Self = self(),
-	    Pid = spawn_link(?MODULE, backup_master, [Self, B2]),
-	    receive
-		{Pid, Self, Res} -> Res
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-check_backup_args([Arg | Tail], B) ->
-    case catch check_backup_arg_type(Arg, B) of
-	{'EXIT', _Reason} ->
-	    {error, {badarg, Arg}};
-	B2 ->
-	    check_backup_args(Tail, B2)
-    end;
-
-check_backup_args([], B) ->
-    {ok, B}.
-
-check_backup_arg_type(Arg, B) ->    
-    case Arg of
-	{scope, global} ->
-	    B#backup_args{scope = global};
-	{scope, local} ->
-	    B#backup_args{scope = local};
-	{module, Mod} ->
-	    Mod2 = mnesia_monitor:do_check_type(backup_module, Mod),
-	    B#backup_args{module = Mod2};
-	{incremental, Name} ->
-	    B#backup_args{prev_name = Name};
-	{tables, Tabs} when list(Tabs) ->
-	    B#backup_args{tables = Tabs}
-    end.
-
-backup_master(ClientPid, B) ->
-    process_flag(trap_exit, true),
-    case catch do_backup_master(B) of
-	{'EXIT', Reason} ->
-	    ClientPid ! {self(), ClientPid, {error, {'EXIT', Reason}}};
-	Res ->
-	    ClientPid ! {self(), ClientPid, Res}
-    end,
-    unlink(ClientPid),
-    exit(normal).
-
-do_backup_master(B) ->
-    Name = B#backup_args.name,
-    B2 = safe_apply(B, open_write, [B#backup_args.opaque]),
-    B3 = safe_write(B2, [backup_log_header()]),
-    case mnesia_checkpoint:tables_and_cookie(Name) of
-	{ok, AllTabs, Cookie} ->
-	    Tabs = select_tables(AllTabs, B3),
-	    B4 = B3#backup_args{cookie = Cookie},
-	    %% Always put schema first in backup file
-	    B5 = backup_schema(B4, Tabs),
-	    B6 = lists:foldl(fun backup_tab/2, B5, Tabs -- [schema]),
-	    safe_apply(B6, commit_write, [B6#backup_args.opaque]),
-	    ok;
-	{error, Reason} ->
-	    abort_write(B3, {?MODULE, backup_master}, [B], {error, Reason})
-    end.
-
-select_tables(AllTabs, B) ->
-    Tabs =
-	case B#backup_args.tables of
-	    all -> AllTabs;
-	    SomeTabs when list(SomeTabs) -> SomeTabs
-	end,
-    case B#backup_args.scope of
-	global ->
-	    Tabs;
-	local ->
-	    Name = B#backup_args.name,
-	    [T || T <- Tabs, mnesia_checkpoint:most_local_node(Name, T) == node()]
-    end.
-
-safe_write(B, []) ->
-    B;
-safe_write(B, Recs) ->	
-    safe_apply(B, write, [B#backup_args.opaque, Recs]).
-
-backup_schema(B, Tabs) ->
-    case lists:member(schema, Tabs) of
-	true ->
-	    backup_tab(schema, B);
-	false ->
-	    Defs = [{schema, T, mnesia_schema:get_create_list(T)} || T <- Tabs],
-	    safe_write(B, Defs)
-    end.
-
-safe_apply(B, write, [_, Items]) when Items == [] ->
-    B;
-safe_apply(B, What, Args) ->
-    Abort = fun(R) -> abort_write(B, What, Args, R) end,
-    receive
-	{'EXIT', Pid, R} -> Abort({'EXIT', Pid, R})
-    after 0 ->
-	    Mod = B#backup_args.module,
-	    case catch apply(Mod, What, Args) of
-		{ok, Opaque} -> B#backup_args{opaque=Opaque};
-		{error, R} -> Abort(R);
-		R -> Abort(R)
-	    end
-    end.
-
-abort_write(B, What, Args, Reason) ->
-    Mod = B#backup_args.module,
-    Opaque = B#backup_args.opaque,
-    dbg_out("Failed to perform backup. M=~p:F=~p:A=~p -> ~p~n",
-	    [Mod, What, Args, Reason]),
-    case catch apply(Mod, abort_write, [Opaque]) of
-	{ok, _Res} ->
-	    throw({error, Reason});
-	Other ->
-	    error("Failed to abort backup. ~p:~p~p -> ~p~n",
-		  [Mod, abort_write, [Opaque], Other]),
-	    throw({error, Reason})
-    end.
-	
-backup_tab(Tab, B) ->
-    Name = B#backup_args.name,
-    case mnesia_checkpoint:most_local_node(Name, Tab) of
-	{ok, Node} when Node == node() ->
-	    tab_copier(self(), B, Tab);
-	{ok, Node} ->
-	    RemoteB = B,
-	    Pid = spawn_link(Node, ?MODULE, tab_copier, [self(), RemoteB, Tab]),
-	    RecName = val({Tab, record_name}),
-	    tab_receiver(Pid, B, Tab, RecName, 0);
-	{error, Reason} ->
-	    abort_write(B, {?MODULE, backup_tab}, [Tab, B], {error, Reason})
-    end.
-    
-tab_copier(Pid, B, Tab) when record(B, backup_args) ->
-    %% Intentional crash at exit
-    Name = B#backup_args.name,
-    PrevName = B#backup_args.prev_name,
-    {FirstName, FirstSource} = select_source(Tab, Name, PrevName),
-
-    ?eval_debug_fun({?MODULE, tab_copier, pre}, [{name, Name}, {tab, Tab}]),
-    Res = handle_more(Pid, B, Tab, FirstName, FirstSource, Name),
-    ?eval_debug_fun({?MODULE, tab_copier, post}, [{name, Name}, {tab, Tab}]),
-
-    handle_last(Pid, Res).
-
-select_source(Tab, Name, PrevName) ->
-    if
-	Tab == schema ->
-	    %% Always full backup of schema
-	    {Name, table};
-	Name == PrevName ->
-	    %% Full backup
-	    {Name, table};
-	true ->
-	    %% Wants incremental backup
-	    case mnesia_checkpoint:most_local_node(PrevName, Tab) of
-		{ok, Node} when Node == node() ->
-		    %% Accept incremental backup
-		    {PrevName, retainer};
-		_ ->
-		    %% Do a full backup anyway
-		    dbg_out("Incremental backup escalated to full backup: ~p~n", [Tab]),
-		    {Name, table}
-	    end
-    end.
-
-handle_more(Pid, B, Tab, FirstName, FirstSource, Name) ->
-    Acc = {0, B},
-    case {mnesia_checkpoint:really_retain(Name, Tab),
-	  mnesia_checkpoint:really_retain(FirstName, Tab)} of
-	{true, true} ->
-	    Acc2 = iterate(B, FirstName, Tab, Pid, FirstSource, latest, first, Acc),
-	    iterate(B, Name, Tab, Pid, retainer, checkpoint, last, Acc2);
-	{false, false}->
-	    %% Put the dumped file in the backup
-	    %% instead of the ram table. Does
-	    %% only apply to ram_copies.
-	    iterate(B, Name, Tab, Pid, retainer, checkpoint, last, Acc);
-	Bad ->
-	    Reason = {"Checkpoints for incremental backup must have same "
-		      "setting of ram_overrides_dump",
-		      Tab, Name, FirstName, Bad},
-	    abort_write(B, {?MODULE, backup_tab}, [Tab, B], {error, Reason})
-    end.
-
-handle_last(Pid, {_Count, B}) when Pid == self() ->
-    B;
-handle_last(Pid, _Acc) ->
-    unlink(Pid),
-    Pid ! {self(), {last, {ok, dummy}}},
-    exit(normal).
-
-iterate(B, Name, Tab, Pid, Source, Age, Pass, Acc) ->
-    Fun = 
-	if
-	    Pid == self() ->
-		RecName = val({Tab, record_name}),
-		fun(Recs, A) -> copy_records(RecName, Tab, Recs, A) end;
-	    true ->
-		fun(Recs, A) -> send_records(Pid, Tab, Recs, Pass, A) end
-	end,
-    case mnesia_checkpoint:iterate(Name, Tab, Fun, Acc, Source, Age) of
-	{ok, Acc2} ->
-	    Acc2;
-	{error, Reason} ->
-	    R = {error, {"Tab copier iteration failed", Reason}},
-	    abort_write(B, {?MODULE, iterate}, [self(), B, Tab], R)
-    end.
-
-copy_records(_RecName, _Tab, [], Acc) ->
-    Acc;
-copy_records(RecName, Tab, Recs, {Count, B}) ->
-    Recs2 = rec_filter(B, Tab, RecName, Recs),
-    B2 = safe_write(B, Recs2),
-    {Count + 1, B2}.
-
-send_records(Pid, Tab, Recs, Pass, {Count, B}) ->
-    receive
-	{Pid, more, Count} ->
-	    if
-		Pass == last, Recs == [] ->
-		    {Count, B};
-		true ->
-		    Next = Count + 1,
-		    Pid ! {self(), {more, Next, Recs}},
-		    {Next, B}
-	    end;
-	Msg ->
-	    exit({send_records_unexpected_msg, Tab, Msg})
-    end.
-
-tab_receiver(Pid, B, Tab, RecName, Slot) ->
-    Pid ! {self(), more, Slot},
-    receive
-	{Pid, {more, Next, Recs}} ->
-	    Recs2 = rec_filter(B, Tab, RecName, Recs),
-	    B2 = safe_write(B, Recs2),
-	    tab_receiver(Pid, B2, Tab, RecName, Next);
-	
-	{Pid, {last, {ok,_}}} ->
-	    B;
-
-	{'EXIT', Pid, {error, R}} ->
-	    Reason = {error, {"Tab copier crashed", R}},
-	    abort_write(B, {?MODULE, remote_tab_sender}, [self(), B, Tab], Reason);
-	{'EXIT', Pid, R} ->
-	    Reason = {error, {"Tab copier crashed", {'EXIT', R}}},
-	    abort_write(B, {?MODULE, remote_tab_sender}, [self(), B, Tab], Reason);
-	Msg ->
-	    R = {error, {"Tab receiver got unexpected msg", Msg}}, 
-	    abort_write(B, {?MODULE, remote_tab_sender}, [self(), B, Tab], R)
-    end.
-
-rec_filter(B, schema, _RecName, Recs) ->
-    case catch mnesia_bup:refresh_cookie(Recs, B#backup_args.cookie) of
-	Recs2 when list(Recs2) ->
-	    Recs2;
-	{error, _Reason} ->
-	    %% No schema table cookie
-	    Recs
-    end;
-rec_filter(_B, Tab, Tab, Recs) ->
-    Recs;
-rec_filter(_B, Tab, _RecName, Recs) ->
-    [setelement(1, Rec, Tab) || Rec <- Recs].
-
-ets2dcd(Tab) ->
-    ets2dcd(Tab, dcd).
-
-ets2dcd(Tab, Ftype) ->
-    Fname =
-	case Ftype of
-	    dcd -> mnesia_lib:tab2dcd(Tab);
-	    dmp -> mnesia_lib:tab2dmp(Tab)
-	end,    
-    TmpF = mnesia_lib:tab2tmp(Tab),
-    file:delete(TmpF),    
-    Log  = open_log({Tab, ets2dcd}, dcd_log_header(), TmpF, false),
-    mnesia_lib:db_fixtable(ram_copies, Tab, true),
-    ok   = ets2dcd(mnesia_lib:db_init_chunk(ram_copies, Tab, 1000), Tab, Log),
-    mnesia_lib:db_fixtable(ram_copies, Tab, false),
-    close_log(Log),
-    ok = file:rename(TmpF, Fname),
-    %% Remove old log data which is now in the new dcd.
-    %% No one else should be accessing this file!
-    file:delete(mnesia_lib:tab2dcl(Tab)),
-    ok.
-
-ets2dcd('$end_of_table', _Tab, _Log) ->
-    ok;
-ets2dcd({Recs, Cont}, Tab, Log) -> 
-    ok = disk_log:alog_terms(Log, Recs),     
-    ets2dcd(mnesia_lib:db_chunk(ram_copies, Cont), Tab, Log).
-
-dcd2ets(Tab) ->
-    dcd2ets(Tab, mnesia_monitor:get_env(auto_repair)).
-
-dcd2ets(Tab, Rep) ->
-    Dcd = mnesia_lib:tab2dcd(Tab),
-    case mnesia_lib:exists(Dcd) of
-	true ->
-	    Log = open_log({Tab, dcd2ets}, dcd_log_header(), Dcd, 
-			   true, Rep, read_only),
-	    Data = chunk_log(Log, start),
-	    ok = insert_dcdchunk(Data, Log, Tab),
-	    close_log(Log),
-	    load_dcl(Tab, Rep); 
-	false -> %% Handle old dets files, and conversion from disc_only to disc.
-	    Fname = mnesia_lib:tab2dat(Tab),
-	    Type = val({Tab, setorbag}),
-	    case mnesia_lib:dets_to_ets(Tab, Tab, Fname, Type, Rep, yes) of
-		loaded ->
-		    ets2dcd(Tab),
-		    file:delete(Fname),
-		    0;
-		{error, Error} ->
-		    erlang:error({"Failed to load table from disc", [Tab, Error]})
-	    end
-    end.
-
-insert_dcdchunk({Cont, [LogH | Rest]}, Log, Tab) 
-  when record(LogH, log_header),  
-       LogH#log_header.log_kind == dcd_log, 
-       LogH#log_header.log_version >= "1.0" ->    
-    insert_dcdchunk({Cont, Rest}, Log, Tab);   
-
-insert_dcdchunk({Cont, Recs}, Log, Tab) ->     
-    true = ets:insert(Tab, Recs),
-    insert_dcdchunk(chunk_log(Log, Cont), Log, Tab);
-insert_dcdchunk(eof, _Log, _Tab) ->
-    ok.
-
-load_dcl(Tab, Rep) ->
-    FName = mnesia_lib:tab2dcl(Tab),
-    case mnesia_lib:exists(FName) of
-	true -> 	    
-	    Name = {load_dcl,Tab},
-	    open_log(Name, 
-		     dcl_log_header(), 
-		     FName, 
-		     true,
-		     Rep, 
-		     read_only),
-	    FirstChunk = chunk_log(Name, start),
-            N = insert_logchunk(FirstChunk, Name, 0),
-	    close_log(Name),
-	    N;
-	false ->
-	    0
-    end.
-
-insert_logchunk({C2, Recs}, Tab, C) ->
-    N = add_recs(Recs, C),
-    insert_logchunk(chunk_log(Tab, C2), Tab, C+N);
-insert_logchunk(eof, _Tab, C) ->
-    C.
-
-add_recs([{{Tab, _Key}, Val, write} | Rest], N) ->
-    true = ets:insert(Tab, Val),
-    add_recs(Rest, N+1);
-add_recs([{{Tab, Key}, _Val, delete} | Rest], N) ->
-    true = ets:delete(Tab, Key),
-    add_recs(Rest, N+1);
-add_recs([{{Tab, _Key}, Val, delete_object} | Rest], N) ->
-    true = ets:match_delete(Tab, Val),
-    add_recs(Rest, N+1);
-add_recs([{{Tab, Key}, Val, update_counter} | Rest], N) ->
-    {RecName, Incr} = Val,
-    case catch ets:update_counter(Tab, Key, Incr) of
-	CounterVal when integer(CounterVal) ->
-	    ok;
-	_ ->
-	    Zero = {RecName, Key, 0},
-	    true = ets:insert(Tab, Zero)
-    end,
-    add_recs(Rest, N+1);
-add_recs([LogH|Rest], N) 
-  when record(LogH, log_header),  
-       LogH#log_header.log_kind == dcl_log, 
-       LogH#log_header.log_version >= "1.0" ->    
-    add_recs(Rest, N);
-add_recs([{{Tab, _Key}, _Val, clear_table} | Rest], N) ->
-    true = ets:match_delete(Tab, '_'),
-    add_recs(Rest, N+ets:info(Tab, size));  
-add_recs([], N) ->
-    N.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_monitor.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_monitor.erl
deleted file mode 100644
index 554f020ffb..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_monitor.erl
+++ /dev/null
@@ -1,776 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_monitor.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%
--module(mnesia_monitor).
-
--behaviour(gen_server).
-
-%% Public exports
--export([
-	 close_dets/1,
-	 close_log/1,
-	 detect_inconcistency/2,
-	 get_env/1,
-	 init/0,
-	 mktab/2,
-	 unsafe_mktab/2,
-	 mnesia_down/2,
-	 needs_protocol_conversion/1,
-	 negotiate_protocol/1,
-	 disconnect/1,
-	 open_dets/2,
-	 unsafe_open_dets/2,
-	 open_log/1,
-	 patch_env/2,
-	 protocol_version/0,
-	 reopen_log/3,
-	 set_env/2,
-	 start/0,
-	 start_proc/4,
-	 terminate_proc/3,
-	 unsafe_close_dets/1,
-	 unsafe_close_log/1,
-	 use_dir/0,
-	 do_check_type/2
-	]).
-
-%% gen_server callbacks
--export([
-	 init/1,
-	 handle_call/3,
-	 handle_cast/2,
-	 handle_info/2,
-	 terminate/2,
-	 code_change/3
-	]).
-
-%% Internal exports
--export([
-	 call/1,
-	 cast/1,
-	 detect_partitioned_network/2,
-	 has_remote_mnesia_down/1
-	]).
-
--import(mnesia_lib, [dbg_out/2, verbose/2, error/2, fatal/2, set/2]).
-
--include("mnesia.hrl").
-
--record(state, {supervisor, pending_negotiators = [], 
-		going_down = [], tm_started = false, early_connects = []}).
-
--define(current_protocol_version, {7,6}).
-
--define(previous_protocol_version, {7,5}).
-
-start() ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE,
-			  [self()], [{timeout, infinity}
-				     %% ,{debug, [trace]}
-				    ]).
-
-init() ->
-    call(init).
-
-mnesia_down(From, Node) ->
-    cast({mnesia_down, From, Node}).
-
-mktab(Tab, Args) ->
-    unsafe_call({mktab, Tab, Args}).
-unsafe_mktab(Tab, Args) ->
-    unsafe_call({unsafe_mktab, Tab, Args}).
-
-open_dets(Tab, Args) ->
-    unsafe_call({open_dets, Tab, Args}).
-unsafe_open_dets(Tab, Args) ->
-    unsafe_call({unsafe_open_dets, Tab, Args}).
-
-close_dets(Tab) ->
-    unsafe_call({close_dets, Tab}).
-
-unsafe_close_dets(Name) ->
-    unsafe_call({unsafe_close_dets, Name}).
-
-open_log(Args) ->
-    unsafe_call({open_log, Args}).
-
-reopen_log(Name, Fname, Head) ->
-    unsafe_call({reopen_log, Name, Fname, Head}).
-
-close_log(Name) ->
-    unsafe_call({close_log, Name}).
-
-unsafe_close_log(Name) ->
-    unsafe_call({unsafe_close_log, Name}).
-
-
-disconnect(Node) ->
-    cast({disconnect, Node}).
-
-%% Returns GoodNoodes
-%% Creates a link to each compatible monitor and
-%% protocol_version to agreed version upon success
-
-negotiate_protocol(Nodes) ->
-    Version = mnesia:system_info(version),
-    Protocols = acceptable_protocol_versions(),
-    MonitorPid = whereis(?MODULE),
-    Msg = {negotiate_protocol, MonitorPid, Version, Protocols},
-    {Replies, _BadNodes} = multicall(Nodes, Msg),
-    check_protocol(Replies, Protocols).
-
-check_protocol([{Node, {accept, Mon, _Version, Protocol}} | Tail], Protocols) ->
-    case lists:member(Protocol, Protocols) of
-	true ->
-	    case Protocol == protocol_version() of
-		true -> 
-		    set({protocol, Node}, {Protocol, false});
-		false ->
-		    set({protocol, Node}, {Protocol, true})
-	    end,
-	    [node(Mon) | check_protocol(Tail, Protocols)]; 
-	false  ->
-	    unlink(Mon), % Get rid of unneccessary link
-	    check_protocol(Tail, Protocols)
-    end;
-check_protocol([{Node, {reject, _Mon, Version, Protocol}} | Tail], Protocols) ->
-    verbose("Failed to connect with ~p. ~p protocols rejected. "
-	    "expected version = ~p, expected protocol = ~p~n",
-	    [Node, Protocols, Version, Protocol]),
-    check_protocol(Tail, Protocols);
-check_protocol([{error, _Reason} | Tail], Protocols) ->
-    check_protocol(Tail, Protocols);
-check_protocol([{badrpc, _Reason} | Tail], Protocols) ->
-    check_protocol(Tail, Protocols);
-check_protocol([], [Protocol | _Protocols]) ->
-    set(protocol_version, Protocol),
-    [];
-check_protocol([], []) ->
-    set(protocol_version, protocol_version()),
-    [].
-
-protocol_version() -> 
-    case ?catch_val(protocol_version) of
-	{'EXIT', _} -> ?current_protocol_version;
-	Version -> Version
-    end.
-
-%% A sorted list of acceptable protocols the
-%% preferred protocols are first in the list
-acceptable_protocol_versions() ->
-    [protocol_version(), ?previous_protocol_version].
-    
-needs_protocol_conversion(Node) ->
-    case {?catch_val({protocol, Node}), protocol_version()} of
-	{{'EXIT', _}, _} ->
-	    false;
-	{{_, Bool}, ?current_protocol_version} -> 
-	    Bool;
-	{{_, Bool}, _} -> 
-	    not Bool
-    end.
-
-cast(Msg) ->
-    case whereis(?MODULE) of
-	undefined -> ignore;
-	Pid ->  gen_server:cast(Pid, Msg)
-    end.
-
-unsafe_call(Msg) ->
-    case whereis(?MODULE) of
-	undefined -> {error, {node_not_running, node()}};
-	Pid -> gen_server:call(Pid, Msg, infinity)
-    end.
-
-call(Msg) ->
-    case whereis(?MODULE) of
-	undefined ->
-	    {error, {node_not_running, node()}};
-	Pid ->
-	    link(Pid),
-	    Res = gen_server:call(Pid, Msg, infinity),
-	    unlink(Pid),
-
-            %% We get an exit signal if server dies
-	    receive
-		{'EXIT', Pid, _Reason} ->
-		    {error, {node_not_running, node()}}
-	    after 0 ->
-		    ignore
-	    end,
-	    Res
-    end.
-
-multicall(Nodes, Msg) ->
-    rpc:multicall(Nodes, ?MODULE, call, [Msg]).
-
-start_proc(Who, Mod, Fun, Args) ->
-    Args2 = [Who, Mod, Fun, Args],
-    proc_lib:start_link(mnesia_sp, init_proc, Args2, infinity).
-
-terminate_proc(Who, R, State) when R /= shutdown, R /= killed ->
-    fatal("~p crashed: ~p state: ~p~n", [Who, R, State]);
-
-terminate_proc(Who, Reason, _State) ->
-    mnesia_lib:verbose("~p terminated: ~p~n", [Who, Reason]),
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Callback functions from gen_server
-
-%%----------------------------------------------------------------------
-%% Func: init/1
-%% Returns: {ok, State}          |
-%%          {ok, State, Timeout} |
-%%          {stop, Reason}
-%%----------------------------------------------------------------------
-init([Parent]) ->
-    process_flag(trap_exit, true),
-    ?ets_new_table(mnesia_gvar, [set, public, named_table]), 
-    set(subscribers, []),
-    mnesia_lib:verbose("~p starting: ~p~n", [?MODULE, self()]),
-    Version = mnesia:system_info(version),
-    set(version, Version),
-    dbg_out("Version: ~p~n", [Version]),
-    
-    case catch process_config_args(env()) of
-	ok ->
-	    mnesia_lib:set({'$$$_report', current_pos}, 0),
-	    Level = mnesia_lib:val(debug),
-	    mnesia_lib:verbose("Mnesia debug level set to ~p\n", [Level]),
-	    set(mnesia_status, starting), %%  set start status
-	    set({current, db_nodes}, [node()]),
-	    set(use_dir, use_dir()),
-	    mnesia_lib:create_counter(trans_aborts),
-	    mnesia_lib:create_counter(trans_commits),
-	    mnesia_lib:create_counter(trans_log_writes),
-	    Left = get_env(dump_log_write_threshold),
-	    mnesia_lib:set_counter(trans_log_writes_left, Left),
-	    mnesia_lib:create_counter(trans_log_writes_prev),
-	    mnesia_lib:create_counter(trans_restarts),
-	    mnesia_lib:create_counter(trans_failures),
-	    ?ets_new_table(mnesia_held_locks, [bag, public, named_table]), 
-	    ?ets_new_table(mnesia_tid_locks, [bag, public, named_table]),
-	    ?ets_new_table(mnesia_sticky_locks, [set, public, named_table]),
-	    ?ets_new_table(mnesia_lock_queue, 
-			   [bag, public, named_table, {keypos, 2}]),
-	    ?ets_new_table(mnesia_lock_counter, [set, public, named_table]),
-	    set(checkpoints, []),
-	    set(pending_checkpoints, []),
-	    set(pending_checkpoint_pids, []),
-	    
-	    {ok, #state{supervisor = Parent}};
-	{'EXIT', Reason} ->
-	    mnesia_lib:report_fatal("Bad configuration: ~p~n", [Reason]),
-	    {stop, {bad_config, Reason}}
-    end.
-
-use_dir() ->
-    case ?catch_val(use_dir) of
-	{'EXIT', _} ->
-	    case get_env(schema_location) of
-		disc -> true;
-		opt_disc -> non_empty_dir();
-		ram -> false
-	    end;
-	Bool ->
-	    Bool
-    end.
-
-%% Returns true if the Mnesia directory contains
-%% important files
-non_empty_dir() ->
-    mnesia_lib:exists(mnesia_bup:fallback_bup()) or
-    mnesia_lib:exists(mnesia_lib:tab2dmp(schema)) or
-    mnesia_lib:exists(mnesia_lib:tab2dat(schema)).
-
-%%----------------------------------------------------------------------
-%% Func: handle_call/3
-%% Returns: {reply, Reply, State}          |
-%%          {reply, Reply, State, Timeout} |
-%%          {noreply, State}               |
-%%          {noreply, State, Timeout}      |
-%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_call({mktab, Tab, Args}, _From, State) ->
-    case catch ?ets_new_table(Tab, Args) of
-	{'EXIT', ExitReason} ->
-	    Msg = "Cannot create ets table",
-	    Reason = {system_limit, Msg, Tab, Args, ExitReason},
-	    fatal("~p~n", [Reason]),
-	    {noreply, State};
-	Reply ->
-	    {reply, Reply, State}
-    end;
-
-handle_call({unsafe_mktab, Tab, Args}, _From, State) ->
-    case catch ?ets_new_table(Tab, Args) of
-	{'EXIT', ExitReason} ->
-	    {reply, {error, ExitReason}, State};
-	Reply ->
-	    {reply, Reply, State}
-    end;
-
-
-handle_call({open_dets, Tab, Args}, _From, State) ->
-    case mnesia_lib:dets_sync_open(Tab, Args) of
-	{ok, Tab} ->
-	    {reply, {ok, Tab}, State};
-
-	{error, Reason} ->
-	    Msg = "Cannot open dets table",
-	    Error = {error, {Msg, Tab, Args, Reason}},
-	    fatal("~p~n", [Error]),
-	    {noreply, State}
-    end;
-
-handle_call({unsafe_open_dets, Tab, Args}, _From, State) ->
-    case mnesia_lib:dets_sync_open(Tab, Args) of
-	{ok, Tab} ->
-	    {reply, {ok, Tab}, State};
-	{error, Reason} ->
-	    {reply, {error,Reason}, State}
-    end;
-
-handle_call({close_dets, Tab}, _From, State) ->
-    case mnesia_lib:dets_sync_close(Tab) of
-	ok ->
-	    {reply, ok, State};
-        {error, Reason} ->
-	    Msg = "Cannot close dets table",
-            Error = {error, {Msg, Tab, Reason}},
-	    fatal("~p~n", [Error]),
-	    {noreply, State}
-    end;
-
-handle_call({unsafe_close_dets, Tab}, _From, State) ->
-    mnesia_lib:dets_sync_close(Tab),
-    {reply, ok, State};
-
-handle_call({open_log, Args}, _From, State) ->
-    Res = disk_log:open([{notify, true}|Args]),
-    {reply, Res, State};
-
-handle_call({reopen_log, Name, Fname, Head}, _From, State) ->
-    case disk_log:reopen(Name, Fname, Head) of
-	ok ->
-	    {reply, ok, State};
-
-        {error, Reason} ->
-	    Msg = "Cannot rename disk_log file",
-            Error = {error, {Msg, Name, Fname, Head, Reason}},
-	    fatal("~p~n", [Error]),
- 	    {noreply, State}
-    end;
-
-handle_call({close_log, Name}, _From, State) ->
-    case disk_log:close(Name) of
-	ok ->
-	    {reply, ok, State};
-
-        {error, Reason} ->
-	    Msg = "Cannot close disk_log file",
-            Error = {error, {Msg, Name, Reason}},
-	    fatal("~p~n", [Error]),
-	    {noreply, State}
-    end;
-
-handle_call({unsafe_close_log, Name}, _From, State) ->
-    disk_log:close(Name),
-    {reply, ok, State};
-
-handle_call({negotiate_protocol, Mon, _Version, _Protocols}, _From, State) 
-  when State#state.tm_started == false ->
-    State2 =  State#state{early_connects = [node(Mon) | State#state.early_connects]},    
-    {reply, {node(), {reject, self(), uninitialized, uninitialized}}, State2};
-
-handle_call({negotiate_protocol, Mon, Version, Protocols}, From, State)
-  when node(Mon) /= node() ->
-    Protocol = protocol_version(),
-    MyVersion = mnesia:system_info(version),
-    case lists:member(Protocol, Protocols) of
-	true ->
-	    accept_protocol(Mon, MyVersion, Protocol, From, State);
-	false ->
-	    %% in this release we should be able to handle the previous 
-	    %% protocol
-	    case hd(Protocols) of
-		?previous_protocol_version ->
-		    accept_protocol(Mon, MyVersion, ?previous_protocol_version, From, State);
-		_ ->
-		    verbose("Connection with ~p rejected. "
-			    "version = ~p, protocols = ~p, "
-			    "expected version = ~p, expected protocol = ~p~n",
-			    [node(Mon), Version, Protocols, MyVersion, Protocol]),
-		    {reply, {node(), {reject, self(), MyVersion, Protocol}}, State}
-	    end
-    end;
-
-handle_call(init, _From, State) ->
-    net_kernel:monitor_nodes(true),
-    EarlyNodes = State#state.early_connects,
-    State2 = State#state{tm_started = true},
-    {reply, EarlyNodes, State2};
-
-handle_call(Msg, _From, State) ->
-    error("~p got unexpected call: ~p~n", [?MODULE, Msg]),
-    {noreply, State}.
-
-accept_protocol(Mon, Version, Protocol, From, State) ->
-    Reply = {node(), {accept, self(), Version, Protocol}},
-    Node = node(Mon),
-    Pending0 = State#state.pending_negotiators,
-    Pending = lists:keydelete(Node, 1, Pending0),
-    case lists:member(Node, State#state.going_down) of
-	true ->
-	    %% Wait for the mnesia_down to be processed,
-	    %% before we reply
-	    P = Pending ++ [{Node, Mon, From, Reply}],
-	    {noreply, State#state{pending_negotiators = P}};
-	false ->
-	    %% No need for wait
-	    link(Mon),  %% link to remote Monitor
-	    case Protocol == protocol_version() of
-		true -> 
-		    set({protocol, Node}, {Protocol, false});
-		false ->
-		    set({protocol, Node}, {Protocol, true})
-	    end,
-	    {reply, Reply, State#state{pending_negotiators = Pending}}
-    end.
-
-%%----------------------------------------------------------------------
-%% Func: handle_cast/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_cast({mnesia_down, mnesia_controller, Node}, State) ->
-    mnesia_tm:mnesia_down(Node),
-    {noreply, State};
-
-handle_cast({mnesia_down, mnesia_tm, {Node, Pending}}, State) ->
-    mnesia_locker:mnesia_down(Node, Pending),
-    {noreply, State};
-
-handle_cast({mnesia_down, mnesia_locker, Node}, State) ->
-    Down = {mnesia_down, Node},
-    mnesia_lib:report_system_event(Down),
-    GoingDown = lists:delete(Node, State#state.going_down),
-    State2 = State#state{going_down = GoingDown},
-    Pending = State#state.pending_negotiators,
-    case lists:keysearch(Node, 1, Pending) of
-	{value, {Node, Mon, ReplyTo, Reply}} ->
-	    %% Late reply to remote monitor
-	    link(Mon),  %% link to remote Monitor
-	    gen_server:reply(ReplyTo, Reply),
-	    P2 = lists:keydelete(Node, 1,Pending),
-	    State3 = State2#state{pending_negotiators = P2},
-	    {noreply, State3};
-	false ->
-	    %% No pending remote monitors
-	    {noreply, State2}
-    end;
-
-handle_cast({disconnect, Node}, State) ->
-    case rpc:call(Node, erlang, whereis, [?MODULE]) of
-	{badrpc, _} ->
-	    ignore;
-	RemoteMon when pid(RemoteMon) -> 
-	    unlink(RemoteMon)
-    end,
-    {noreply, State};
-
-handle_cast({inconsistent_database, Context, Node}, State) ->
-    Msg = {inconsistent_database, Context, Node},
-    mnesia_lib:report_system_event(Msg),
-    {noreply, State};
-
-handle_cast(Msg, State) ->
-    error("~p got unexpected cast: ~p~n", [?MODULE, Msg]),
-    {noreply, State}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_info/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_info({'EXIT', Pid, R}, State) when Pid == State#state.supervisor ->
-    dbg_out("~p was ~p by supervisor~n",[?MODULE, R]),
-    {stop, R, State};
-
-handle_info({'EXIT', Pid, fatal}, State) when node(Pid) == node() -> 
-    dbg_out("~p got FATAL ERROR from: ~p~n",[?MODULE, Pid]),
-    exit(State#state.supervisor, shutdown),
-    {noreply, State};
-
-handle_info({'EXIT', Pid, Reason}, State) ->
-    Node = node(Pid),
-    if
-	Node /= node() ->
-	    %% Remotly linked process died, assume that it was a mnesia_monitor
-	    mnesia_recover:mnesia_down(Node),
-	    mnesia_controller:mnesia_down(Node),
-	    {noreply, State#state{going_down = [Node | State#state.going_down]}};
-	true ->
-	    %% We have probably got an exit signal from from
-	    %% disk_log or dets
-	    Hint = "Hint: check that the disk still is writable",
-	    Msg = {'EXIT', Pid, Reason},
-	    fatal("~p got unexpected info: ~p; ~p~n",
-		  [?MODULE, Msg, Hint])
-    end;
-
-handle_info({nodeup, Node}, State) ->
-    %% Ok, we are connected to yet another Erlang node
-    %% Let's check if Mnesia is running there in order
-    %% to detect if the network has been partitioned
-    %% due to communication failure.
-    
-    HasDown   = mnesia_recover:has_mnesia_down(Node),
-    ImRunning = mnesia_lib:is_running(),
-    
-    if
-	%% If I'm not running the test will be made later.
-	HasDown == true, ImRunning == yes ->
-	    spawn_link(?MODULE, detect_partitioned_network, [self(), Node]);
-	true ->
-	    ignore
-    end,
-    {noreply, State};
-
-handle_info({nodedown, _Node}, State) ->
-    %% Ignore, we are only caring about nodeup's
-    {noreply, State};
-
-handle_info({disk_log, _Node, Log, Info}, State) ->
-    case Info of
-	{truncated, _No} ->
-	    ok;
-	_ ->
-	    mnesia_lib:important("Warning Log file ~p error reason ~s~n", 
-				 [Log, disk_log:format_error(Info)])
-    end,
-    {noreply, State};
-
-handle_info(Msg, State) ->
-    error("~p got unexpected info (~p): ~p~n", [?MODULE, State, Msg]).
-
-%%----------------------------------------------------------------------
-%% Func: terminate/2
-%% Purpose: Shutdown the server
-%% Returns: any (ignored by gen_server)
-%%----------------------------------------------------------------------
-terminate(Reason, State) ->
-    terminate_proc(?MODULE, Reason, State).
-
-%%----------------------------------------------------------------------
-%% Func: code_change/3
-%% Purpose: Upgrade process when its code is to be changed
-%% Returns: {ok, NewState}
-%%----------------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%%----------------------------------------------------------------------
-%%% Internal functions
-%%%----------------------------------------------------------------------
-
-process_config_args([]) ->
-    ok;
-process_config_args([C|T]) ->
-    V = get_env(C),
-    dbg_out("Env ~p: ~p~n", [C, V]),
-    mnesia_lib:set(C, V),
-    process_config_args(T).
-
-set_env(E,Val) ->
-    mnesia_lib:set(E, check_type(E,Val)),
-    ok.
-
-get_env(E) ->
-    case ?catch_val(E) of
-	{'EXIT', _} ->
-	    case application:get_env(mnesia, E) of
-		{ok, Val} ->
-		    check_type(E, Val);
-		undefined ->
-		    check_type(E, default_env(E))
-	    end;
-	Val ->
-	    Val
-    end.
-
-env() ->
-    [
-     access_module,
-     auto_repair,
-     backup_module,
-     debug,
-     dir,
-     dump_log_load_regulation,
-     dump_log_time_threshold,
-     dump_log_update_in_place,
-     dump_log_write_threshold,
-     embedded_mnemosyne,
-     event_module,
-     extra_db_nodes,
-     ignore_fallback_at_startup,
-     fallback_error_function,
-     max_wait_for_decision,
-     schema_location,
-     core_dir
-    ].
-
-default_env(access_module) -> 
-    mnesia;
-default_env(auto_repair) -> 
-    true;
-default_env(backup_module) -> 
-    mnesia_backup;
-default_env(debug) -> 
-    none;
-default_env(dir) ->
-    Name = lists:concat(["Mnesia.", node()]),
-    filename:absname(Name);
-default_env(dump_log_load_regulation) -> 
-    false;
-default_env(dump_log_time_threshold) -> 
-    timer:minutes(3);
-default_env(dump_log_update_in_place) -> 
-    true;
-default_env(dump_log_write_threshold) ->
-    1000;
-default_env(embedded_mnemosyne) -> 
-    false;
-default_env(event_module) -> 
-    mnesia_event;
-default_env(extra_db_nodes) -> 
-    [];
-default_env(ignore_fallback_at_startup) -> 
-    false;
-default_env(fallback_error_function) ->
-    {mnesia, lkill};
-default_env(max_wait_for_decision) -> 
-    infinity;
-default_env(schema_location) -> 
-    opt_disc;
-default_env(core_dir) ->
-    false.
-
-check_type(Env, Val) ->
-    case catch do_check_type(Env, Val) of
-	{'EXIT', _Reason} ->
-	    exit({bad_config, Env, Val});
-	NewVal ->
-	    NewVal
-    end.
-				      
-do_check_type(access_module, A) when atom(A) -> A;
-do_check_type(auto_repair, B) -> bool(B);
-do_check_type(backup_module, B) when atom(B) -> B;
-do_check_type(debug, debug) -> debug;
-do_check_type(debug, false) -> none;
-do_check_type(debug, none) -> none;
-do_check_type(debug, trace) -> trace;
-do_check_type(debug, true) -> debug;
-do_check_type(debug, verbose) -> verbose;
-do_check_type(dir, V) -> filename:absname(V);
-do_check_type(dump_log_load_regulation, B) -> bool(B);
-do_check_type(dump_log_time_threshold, I) when integer(I), I > 0 -> I;
-do_check_type(dump_log_update_in_place, B) -> bool(B);
-do_check_type(dump_log_write_threshold, I) when integer(I), I > 0 -> I;
-do_check_type(event_module, A) when atom(A) -> A;
-do_check_type(ignore_fallback_at_startup, B) -> bool(B);
-do_check_type(fallback_error_function, {Mod, Func}) 
-  when atom(Mod), atom(Func) -> {Mod, Func};
-do_check_type(embedded_mnemosyne, B) -> bool(B);
-do_check_type(extra_db_nodes, L) when list(L) ->
-    Fun = fun(N) when N == node() -> false;
-	     (A) when atom(A) -> true
-	  end,
-    lists:filter(Fun, L);
-do_check_type(max_wait_for_decision, infinity) -> infinity;
-do_check_type(max_wait_for_decision, I) when integer(I), I > 0 -> I;
-do_check_type(schema_location, M) -> media(M);
-do_check_type(core_dir, "false") -> false;
-do_check_type(core_dir, false) -> false;
-do_check_type(core_dir, Dir) when list(Dir) -> Dir.
-
-
-bool(true) -> true;
-bool(false) -> false.
-
-media(disc) -> disc;
-media(opt_disc) -> opt_disc;
-media(ram) -> ram.
-
-patch_env(Env, Val) ->
-    case catch do_check_type(Env, Val) of
-	{'EXIT', _Reason} ->
-	    {error, {bad_type, Env, Val}};
-	NewVal ->
-	    application_controller:set_env(mnesia, Env, NewVal),
-	    NewVal
-    end.
-
-detect_partitioned_network(Mon, Node) ->
-    GoodNodes = negotiate_protocol([Node]),
-    detect_inconcistency(GoodNodes, running_partitioned_network),
-    unlink(Mon),
-    exit(normal).
-
-detect_inconcistency([], _Context) ->
-    ok;
-detect_inconcistency(Nodes, Context) ->
-    Downs = [N || N <- Nodes, mnesia_recover:has_mnesia_down(N)],
-    {Replies, _BadNodes} =
-	rpc:multicall(Downs, ?MODULE, has_remote_mnesia_down, [node()]),
-    report_inconsistency(Replies, Context, ok).
-
-has_remote_mnesia_down(Node) ->
-    HasDown = mnesia_recover:has_mnesia_down(Node),
-    Master  = mnesia_recover:get_master_nodes(schema),
-    if 
-	HasDown == true, Master == [] -> 
-	    {true, node()};
-	true ->
-	    {false, node()}
-    end.
-
-report_inconsistency([{true, Node} | Replies], Context, _Status) ->
-    %% Oops, Mnesia is already running on the
-    %% other node AND we both regard each
-    %% other as down. The database is
-    %% potentially inconsistent and we has to
-    %% do tell the applications about it, so
-    %% they may perform some clever recovery
-    %% action.
-    Msg = {inconsistent_database, Context, Node},
-    mnesia_lib:report_system_event(Msg),
-    report_inconsistency(Replies, Context, inconsistent_database);
-report_inconsistency([{false, _Node} | Replies], Context, Status) ->
-    report_inconsistency(Replies, Context, Status);
-report_inconsistency([{badrpc, _Reason} | Replies], Context, Status) ->
-    report_inconsistency(Replies, Context, Status);
-report_inconsistency([], _Context, Status) ->
-    Status.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_recover.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_recover.erl
deleted file mode 100644
index b3e8f1c386..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_recover.erl
+++ /dev/null
@@ -1,1175 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_recover.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
-%%
--module(mnesia_recover).
-
--behaviour(gen_server).
-
--export([
-	 allow_garb/0,
-	 call/1,
-	 connect_nodes/1,
-	 disconnect/1,
-	 dump_decision_tab/0,
-	 get_master_node_info/0,
-	 get_master_node_tables/0,
-	 get_master_nodes/1,
-	 get_mnesia_downs/0,
-	 has_mnesia_down/1,
-	 incr_trans_tid_serial/0,
-	 init/0,
-	 log_decision/1,
-	 log_master_nodes/3,
-	 log_mnesia_down/1,
-	 log_mnesia_up/1,
-	 mnesia_down/1,
-	 note_decision/2,
-	 note_log_decision/2,
-	 outcome/2,
-	 start/0,
-	 start_garb/0,
-	 still_pending/1,
-	 sync_trans_tid_serial/1,
-	 wait_for_decision/2,
-	 what_happened/3
-	]).
-
-%% gen_server callbacks
--export([init/1,
-	 handle_call/3,
-	 handle_cast/2,
-	 handle_info/2,
-	 terminate/2,
-	 code_change/3
-	]).
-
-
--include("mnesia.hrl").
--import(mnesia_lib, [set/2, verbose/2, error/2, fatal/2]).
-
--record(state, {supervisor,
-		unclear_pid,
-		unclear_decision,
-		unclear_waitfor,
-		tm_queue_len = 0,
-		initiated = false,
-		early_msgs = []
-	       }).
-
-%%-define(DBG(F, A), mnesia:report_event(list_to_atom(lists:flatten(io_lib:format(F, A))))).
-%%-define(DBG(F, A), io:format("DBG: " ++ F, A)).
-
--record(transient_decision, {tid, outcome}).
-
-start() ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [self()],
-			  [{timeout, infinity}
-			   %%, {debug, [trace]}
-			  ]).
-
-init() ->
-    call(init).
-
-start_garb() ->
-    Pid = whereis(mnesia_recover),
-    {ok, _} = timer:send_interval(timer:minutes(2), Pid, garb_decisions),
-    {ok, _} = timer:send_interval(timer:seconds(10), Pid, check_overload).
-
-allow_garb() ->
-    cast(allow_garb).
-
-
-%% The transaction log has either been swiched (latest -> previous) or
-%% there is nothing to be dumped. This means that the previous
-%% transaction log only may contain commit records which refers to
-%% transactions noted in the last two of the 'Prev' tables. All other
-%% tables may now be garbed by 'garb_decisions' (after 2 minutes).
-%% Max 10 tables are kept. 
-do_allow_garb() ->
-    %% The order of the following stuff is important!
-    Curr = val(latest_transient_decision),
-    Old = val(previous_transient_decisions),
-    Next = create_transient_decision(),
-    {Prev, ReallyOld} = sublist([Curr | Old], 10, []),
-    [?ets_delete_table(Tab) || Tab <- ReallyOld],
-    set(previous_transient_decisions, Prev),
-    set(latest_transient_decision, Next).
-    
-sublist([H|R], N, Acc) when N > 0 ->
-    sublist(R, N-1, [H| Acc]);
-sublist(List, _N, Acc) ->
-    {lists:reverse(Acc), List}.
-
-do_garb_decisions() ->
-    case val(previous_transient_decisions) of
-	[First, Second | Rest] ->
-	    set(previous_transient_decisions, [First, Second]),
-	    [?ets_delete_table(Tab) || Tab <- Rest];
-	_ ->
-	    ignore
-    end.
-
-connect_nodes([]) ->
-    [];
-connect_nodes(Ns) ->
-    %% Determine which nodes we should try to connect
-    AlreadyConnected = val(recover_nodes),
-    {_, Nodes} = mnesia_lib:search_delete(node(), Ns),
-    Check = Nodes -- AlreadyConnected,
-    GoodNodes = mnesia_monitor:negotiate_protocol(Check),
-    if
-	GoodNodes == [] ->
-	    %% No good noodes to connect to
-	    ignore;
-	true ->
-	    %% Now we have agreed upon a protocol with some new nodes
-	    %% and we may use them when we recover transactions
-	    mnesia_lib:add_list(recover_nodes, GoodNodes),
-	    cast({announce_all, GoodNodes}),
-	    case get_master_nodes(schema) of 
-		[] ->
-		    Context = starting_partitioned_network,
-		    mnesia_monitor:detect_inconcistency(GoodNodes, Context);
-		_ -> %% If master_nodes is set ignore old inconsistencies
-		    ignore
-	    end
-    end,
-    {GoodNodes, AlreadyConnected}.
-
-disconnect(Node) ->
-    mnesia_monitor:disconnect(Node),
-    mnesia_lib:del(recover_nodes, Node).
-
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason); 
-	Value -> Value
-    end.
-
-call(Msg) ->
-    Pid = whereis(?MODULE),
-    case Pid of
-	undefined ->
-	    {error, {node_not_running, node()}};
-	Pid ->
-	    link(Pid),
-	    Res = gen_server:call(Pid, Msg, infinity),
-	    unlink(Pid),
-
-            %% We get an exit signal if server dies
-            receive
-                {'EXIT', Pid, _Reason} ->
-                    {error, {node_not_running, node()}}
-            after 0 ->
-                    ignore
-            end,
-	    Res
-    end.
-
-multicall(Nodes, Msg) ->
-    rpc:multicall(Nodes, ?MODULE, call, [Msg]).
-
-cast(Msg) ->
-    case whereis(?MODULE) of
-	undefined -> ignore;
-	Pid ->  gen_server:cast(Pid, Msg)
-    end.
-
-abcast(Nodes, Msg) ->
-    gen_server:abcast(Nodes, ?MODULE, Msg).
-
-note_decision(Tid, Outcome) ->
-    Tab = val(latest_transient_decision),
-    ?ets_insert(Tab, #transient_decision{tid = Tid, outcome = Outcome}).
-
-note_up(Node, _Date, _Time) ->
-    ?ets_delete(mnesia_decision, Node).
-    
-note_down(Node, Date, Time) ->
-    ?ets_insert(mnesia_decision, {mnesia_down, Node, Date, Time}).
-    
-note_master_nodes(Tab, []) ->
-    ?ets_delete(mnesia_decision, Tab);
-note_master_nodes(Tab, Nodes) when list(Nodes) ->
-    Master = {master_nodes, Tab, Nodes},
-    ?ets_insert(mnesia_decision, Master).
-
-note_outcome(D) when D#decision.disc_nodes == [] ->
-%%    ?DBG("~w: note_tmp_decision: ~w~n", [node(), D]),
-    note_decision(D#decision.tid, filter_outcome(D#decision.outcome)),
-    ?ets_delete(mnesia_decision, D#decision.tid);
-note_outcome(D) when D#decision.disc_nodes /= [] ->
-%%    ?DBG("~w: note_decision: ~w~n", [node(), D]),
-    ?ets_insert(mnesia_decision, D).
-
-log_decision(D) when D#decision.outcome /= unclear ->
-    OldD = decision(D#decision.tid),
-    MergedD = merge_decisions(node(), OldD, D),
-    do_log_decision(MergedD, true);
-log_decision(D) ->
-    do_log_decision(D, false).
-
-do_log_decision(D, DoTell) ->
-    RamNs = D#decision.ram_nodes,
-    DiscNs = D#decision.disc_nodes -- [node()],
-    Outcome = D#decision.outcome,
-    D2 =
-	case Outcome of
-	    aborted -> D#decision{disc_nodes = DiscNs};
-	    committed -> D#decision{disc_nodes = DiscNs};
-	    _ -> D
-	end,
-    note_outcome(D2),
-    case mnesia_monitor:use_dir() of
-	true ->
-	    mnesia_log:append(latest_log, D2),
-	    if
-		DoTell == true, Outcome /= unclear ->
-		    tell_im_certain(DiscNs, D2),
-		    tell_im_certain(RamNs, D2);
-		true ->
-		    ignore
-	    end;
-	false ->
-	    ignore
-    end.
-
-tell_im_certain([], _D) ->
-    ignore;
-tell_im_certain(Nodes, D) ->
-    Msg = {im_certain, node(), D},
-%%    ?DBG("~w: ~w: tell: ~w~n", [node(), Msg, Nodes]),
-    abcast(Nodes, Msg).
-
-log_mnesia_up(Node) ->
-    call({log_mnesia_up, Node}).
-
-log_mnesia_down(Node) ->
-    call({log_mnesia_down, Node}).
-
-get_mnesia_downs() ->
-    Tab = mnesia_decision,
-    Pat = {mnesia_down, '_', '_', '_'},
-    Downs = ?ets_match_object(Tab, Pat),
-    [Node || {mnesia_down, Node, _Date, _Time} <- Downs].
-
-%% Check if we have got a mnesia_down from Node
-has_mnesia_down(Node) ->
-    case ?ets_lookup(mnesia_decision, Node) of
-	[{mnesia_down, Node, _Date, _Time}] ->
-	    true;
-	[] ->
-	    false
-    end.
-    
-mnesia_down(Node) ->
-    case ?catch_val(recover_nodes) of
-	{'EXIT', _} ->
-	    %% Not started yet
-	    ignore;
-	_ ->
-	    mnesia_lib:del(recover_nodes, Node),
-	    cast({mnesia_down, Node})
-    end.
-
-log_master_nodes(Args, UseDir, IsRunning) ->
-    if
-	IsRunning == yes ->
-	    log_master_nodes2(Args, UseDir, IsRunning, ok);
-	UseDir == false ->
-	    ok;
-	true ->
-	    Name = latest_log,
-	    Fname = mnesia_log:latest_log_file(),
-	    Exists = mnesia_lib:exists(Fname),
-	    Repair = mnesia:system_info(auto_repair),
-	    OpenArgs = [{file, Fname}, {name, Name}, {repair, Repair}],
-	    case disk_log:open(OpenArgs) of
-		{ok, Name} ->
-		    log_master_nodes2(Args, UseDir, IsRunning, ok);
-		{repaired, Name, {recovered,  _R}, {badbytes, _B}}
-		  when Exists == true ->
-		    log_master_nodes2(Args, UseDir, IsRunning, ok);
-		{repaired, Name, {recovered,  _R}, {badbytes, _B}}
-		  when Exists == false ->
-		    mnesia_log:write_trans_log_header(),
-		    log_master_nodes2(Args, UseDir, IsRunning, ok);
-		{error, Reason} ->
-		    {error, Reason}
-	    end
-    end.
-
-log_master_nodes2([{Tab, Nodes} | Tail], UseDir, IsRunning, WorstRes) ->
-    Res = 
-	case IsRunning of
-	    yes ->
-		R = call({log_master_nodes, Tab, Nodes, UseDir, IsRunning}),
-		mnesia_controller:master_nodes_updated(Tab, Nodes),
-		R;
-	    _ ->
-		do_log_master_nodes(Tab, Nodes, UseDir, IsRunning)
-	end,
-    case Res of
-	ok ->
-	    log_master_nodes2(Tail, UseDir, IsRunning, WorstRes);
-	{error, Reason} ->
-	    log_master_nodes2(Tail, UseDir, IsRunning, {error, Reason})
-    end;
-log_master_nodes2([], _UseDir, IsRunning, WorstRes) ->
-    case IsRunning of
-	yes ->
-	    WorstRes;
-	_ ->
-	    disk_log:close(latest_log),
-	    WorstRes
-    end.
-
-get_master_node_info() ->
-    Tab = mnesia_decision,
-    Pat = {master_nodes, '_', '_'},
-    case catch mnesia_lib:db_match_object(ram_copies,Tab, Pat) of
-	{'EXIT', _} ->
-	    [];
-	Masters ->
-	    Masters
-    end.
-
-get_master_node_tables() ->
-    Masters = get_master_node_info(),
-    [Tab || {master_nodes, Tab, _Nodes} <- Masters].
-
-get_master_nodes(Tab) ->
-    case catch ?ets_lookup_element(mnesia_decision, Tab, 3) of
-	{'EXIT', _} -> [];
-	Nodes  -> Nodes
-    end.
-
-%% Determine what has happened to the transaction
-what_happened(Tid, Protocol, Nodes) ->
-    Default = 
-	case Protocol of
-	    asym_trans -> aborted;
-	    _ -> unclear  %% sym_trans and sync_sym_trans
-	end,
-    This = node(),
-    case lists:member(This, Nodes) of
-	true ->
-	    {ok, Outcome} = call({what_happened, Default, Tid}),
-	    Others = Nodes -- [This],
-	    case filter_outcome(Outcome) of
-		unclear -> what_happened_remotely(Tid, Default, Others);
-		aborted -> aborted;
-		committed -> committed
-	    end;
-	false ->
-	    what_happened_remotely(Tid, Default, Nodes)
-    end.
-
-what_happened_remotely(Tid, Default, Nodes) ->
-    {Replies, _} = multicall(Nodes, {what_happened, Default, Tid}),
-    check_what_happened(Replies, 0, 0).
-
-check_what_happened([H | T], Aborts, Commits) ->
-    case H of
-	{ok, R} ->
-	    case filter_outcome(R) of
-		committed ->
-		    check_what_happened(T, Aborts, Commits + 1);
-		aborted ->
-		    check_what_happened(T, Aborts + 1, Commits);
-		unclear ->
-		    check_what_happened(T, Aborts, Commits)
-	    end;
-	{error, _} ->
-	    check_what_happened(T, Aborts, Commits);
-	{badrpc, _} ->
-	    check_what_happened(T, Aborts, Commits)
-    end;
-check_what_happened([], Aborts, Commits) ->
-    if
-	Aborts == 0, Commits == 0 -> aborted;  % None of the active nodes knows
-	Aborts > 0 -> aborted;                 % Someody has aborted
-	Aborts == 0, Commits > 0 -> committed  % All has committed
-    end.
-
-%% Determine what has happened to the transaction
-%% and possibly wait forever for the decision.
-wait_for_decision(presume_commit, _InitBy) ->
-    %% sym_trans
-    {{presume_commit, self()}, committed};
-
-wait_for_decision(D, InitBy) when D#decision.outcome == presume_abort ->
-    %% asym_trans
-    Tid = D#decision.tid,
-    Outcome = filter_outcome(outcome(Tid, D#decision.outcome)),
-    if 
-	Outcome /= unclear ->
-	    {Tid, Outcome};
-
-	InitBy /= startup ->
-	    %% Wait a while for active transactions
-	    %% to end and try again
-	    timer:sleep(200), 
-	    wait_for_decision(D, InitBy);
-
-	InitBy == startup ->
-	    {ok, Res} = call({wait_for_decision, D}),
-	    {Tid, Res}
-    end.
-
-still_pending([Tid | Pending]) ->
-    case filter_outcome(outcome(Tid, unclear)) of
-	unclear -> [Tid | still_pending(Pending)];
-	_ -> still_pending(Pending)
-    end;
-still_pending([]) ->
-    [].
-
-load_decision_tab() ->
-    Cont = mnesia_log:open_decision_tab(),
-    load_decision_tab(Cont, load_decision_tab),
-    mnesia_log:close_decision_tab().
-
-load_decision_tab(eof, _InitBy) ->
-    ok;
-load_decision_tab(Cont, InitBy) ->
-    case mnesia_log:chunk_decision_tab(Cont) of
-	{Cont2, Decisions} ->
-	    note_log_decisions(Decisions, InitBy),
-	    load_decision_tab(Cont2, InitBy);
-	eof ->
-	    ok
-    end.
-
-%% Dumps DECISION.LOG and PDECISION.LOG and removes them.
-%% From now on all decisions are logged in the transaction log file
-convert_old() ->
-    HasOldStuff = 
-	mnesia_lib:exists(mnesia_log:previous_decision_log_file()) or
-	mnesia_lib:exists(mnesia_log:decision_log_file()),
-    case HasOldStuff of
-	true ->
-	    mnesia_log:open_decision_log(),
-	    dump_decision_log(startup),
-	    dump_decision_log(startup),
-	    mnesia_log:close_decision_log(),
-	    Latest = mnesia_log:decision_log_file(),
-	    ok = file:delete(Latest);
-	false ->
-	    ignore
-    end.
-
-dump_decision_log(InitBy) ->
-    %% Assumed to be run in transaction log dumper process
-    Cont = mnesia_log:prepare_decision_log_dump(),
-    perform_dump_decision_log(Cont, InitBy).
-
-perform_dump_decision_log(eof, _InitBy) ->
-    confirm_decision_log_dump();
-perform_dump_decision_log(Cont, InitBy) when InitBy == startup ->
-    case mnesia_log:chunk_decision_log(Cont) of
-	{Cont2, Decisions} ->
-	    note_log_decisions(Decisions, InitBy),
-	    perform_dump_decision_log(Cont2, InitBy);
-	eof ->
-	    confirm_decision_log_dump()
-    end;
-perform_dump_decision_log(_Cont, _InitBy) ->
-    confirm_decision_log_dump().
-
-confirm_decision_log_dump() ->
-    dump_decision_tab(),
-    mnesia_log:confirm_decision_log_dump().
-
-dump_decision_tab() ->
-    Tab = mnesia_decision,
-    All = mnesia_lib:db_match_object(ram_copies,Tab, '_'),
-    mnesia_log:save_decision_tab({decision_list, All}).
-
-note_log_decisions([What | Tail], InitBy) ->
-    note_log_decision(What, InitBy),
-    note_log_decisions(Tail, InitBy);
-note_log_decisions([], _InitBy) ->
-    ok.
-
-note_log_decision(NewD, InitBy) when NewD#decision.outcome == pre_commit ->
-    note_log_decision(NewD#decision{outcome = unclear}, InitBy);
-
-note_log_decision(NewD, _InitBy) when record(NewD, decision) ->
-    Tid = NewD#decision.tid,
-    sync_trans_tid_serial(Tid),
-    OldD = decision(Tid),
-    MergedD = merge_decisions(node(), OldD, NewD),
-    note_outcome(MergedD);
-
-note_log_decision({trans_tid, serial, _Serial}, startup) ->
-    ignore;
-
-note_log_decision({trans_tid, serial, Serial}, _InitBy) ->
-    sync_trans_tid_serial(Serial);
-
-note_log_decision({mnesia_up, Node, Date, Time}, _InitBy) ->
-    note_up(Node, Date, Time);
-
-note_log_decision({mnesia_down, Node, Date, Time}, _InitBy) ->
-    note_down(Node, Date, Time);
-
-note_log_decision({master_nodes, Tab, Nodes}, _InitBy) ->
-    note_master_nodes(Tab, Nodes);
-
-note_log_decision(H, _InitBy) when H#log_header.log_kind == decision_log ->
-    V = mnesia_log:decision_log_version(),
-    if
-	H#log_header.log_version == V->
-	    ok;
-	H#log_header.log_version == "2.0" ->
-	    verbose("Accepting an old version format of decision log: ~p~n",
-		    [V]),
-	    ok;
-	true ->
-	    fatal("Bad version of decision log: ~p~n", [H])
-    end;
-
-note_log_decision(H, _InitBy) when H#log_header.log_kind == decision_tab ->
-    V = mnesia_log:decision_tab_version(),
-    if
-	V == H#log_header.log_version ->
-	    ok;
-	true ->
-	    fatal("Bad version of decision tab: ~p~n", [H])
-    end;
-note_log_decision({decision_list, ItemList}, InitBy) ->
-    note_log_decisions(ItemList, InitBy);
-note_log_decision(BadItem, InitBy) ->
-    exit({"Bad decision log item", BadItem, InitBy}).
-
-trans_tid_serial() ->
-    ?ets_lookup_element(mnesia_decision, serial, 3).
-
-set_trans_tid_serial(Val) ->
-    ?ets_insert(mnesia_decision, {trans_tid, serial, Val}).
-
-incr_trans_tid_serial() ->
-    ?ets_update_counter(mnesia_decision, serial, 1).
-
-sync_trans_tid_serial(ThatCounter) when integer(ThatCounter) ->
-    ThisCounter = trans_tid_serial(),
-    if
-	ThatCounter > ThisCounter ->
-	    set_trans_tid_serial(ThatCounter + 1);
-	true ->
-	    ignore
-    end;
-sync_trans_tid_serial(Tid) ->
-    sync_trans_tid_serial(Tid#tid.counter).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Callback functions from gen_server
-
-%%----------------------------------------------------------------------
-%% Func: init/1
-%% Returns: {ok, State}          |
-%%          {ok, State, Timeout} |
-%%          {stop, Reason}
-%%----------------------------------------------------------------------
-init([Parent]) ->
-    process_flag(trap_exit, true),
-    mnesia_lib:verbose("~p starting: ~p~n", [?MODULE, self()]),
-    set(latest_transient_decision, create_transient_decision()),
-    set(previous_transient_decisions, []),
-    set(recover_nodes, []),
-    State = #state{supervisor = Parent},
-    {ok, State}.
-
-create_transient_decision() ->
-    ?ets_new_table(mnesia_transient_decision, [{keypos, 2}, set, public]).
-
-%%----------------------------------------------------------------------
-%% Func: handle_call/3
-%% Returns: {reply, Reply, State}          |
-%%          {reply, Reply, State, Timeout} |
-%%          {noreply, State}               |
-%%          {noreply, State, Timeout}      |
-%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_call(init, From, State) when State#state.initiated == false ->
-    Args = [{keypos, 2}, set, public, named_table],
-    case mnesia_monitor:use_dir() of
-	true ->
-	    ?ets_new_table(mnesia_decision, Args),
-	    set_trans_tid_serial(0),
-	    TabFile = mnesia_log:decision_tab_file(),
-	    case mnesia_lib:exists(TabFile) of
-		true ->
-		    load_decision_tab();
-		false ->
-		    ignore
-	    end,
-	    convert_old(),
-	    mnesia_dumper:opt_dump_log(scan_decisions);
-	false ->
-	    ?ets_new_table(mnesia_decision, Args),
-	    set_trans_tid_serial(0)
-    end,
-    handle_early_msgs(State, From);
-
-handle_call(Msg, From, State) when State#state.initiated == false ->
-    %% Buffer early messages
-    Msgs = State#state.early_msgs,
-    {noreply, State#state{early_msgs = [{call, Msg, From} | Msgs]}};
-
-handle_call({what_happened, Default, Tid}, _From, State) ->
-    sync_trans_tid_serial(Tid),
-    Outcome = outcome(Tid, Default),
-    {reply, {ok, Outcome}, State};
-
-handle_call({wait_for_decision, D}, From, State) ->
-    Recov = val(recover_nodes),
-    AliveRam = (mnesia_lib:intersect(D#decision.ram_nodes, Recov) -- [node()]),
-    RemoteDisc = D#decision.disc_nodes -- [node()],
-    if
-	AliveRam == [], RemoteDisc == [] ->
-	    %% No more else to wait for and we may safely abort
-	    {reply, {ok, aborted}, State};
-	true ->
-	    verbose("Transaction ~p is unclear. "
-		    "Wait for disc nodes: ~w ram: ~w~n",
-		    [D#decision.tid, RemoteDisc, AliveRam]),
-	    AliveDisc = mnesia_lib:intersect(RemoteDisc, Recov),
-	    Msg = {what_decision, node(), D},
-	    abcast(AliveRam, Msg),
-	    abcast(AliveDisc, Msg),
-	    case val(max_wait_for_decision) of
-		infinity ->
-		    ignore;
-		MaxWait ->
-		    ForceMsg =  {force_decision, D#decision.tid},
-		    {ok, _} = timer:send_after(MaxWait, ForceMsg)
-	    end,
-	    State2 = State#state{unclear_pid = From,
-				 unclear_decision = D,
-				 unclear_waitfor = (RemoteDisc ++ AliveRam)},
-	    {noreply, State2}
-    end;
-
-handle_call({log_mnesia_up, Node}, _From, State) ->
-    do_log_mnesia_up(Node),
-    {reply, ok, State};
-
-handle_call({log_mnesia_down, Node}, _From, State) ->
-    do_log_mnesia_down(Node),
-    {reply, ok, State};
-
-handle_call({log_master_nodes, Tab, Nodes, UseDir, IsRunning}, _From, State) ->
-    do_log_master_nodes(Tab, Nodes, UseDir, IsRunning),
-    {reply, ok, State};
-
-handle_call(Msg, _From, State) ->
-    error("~p got unexpected call: ~p~n", [?MODULE, Msg]),
-    {noreply, State}.
-
-do_log_mnesia_up(Node) ->
-    Yoyo = {mnesia_up, Node, Date = date(), Time = time()},
-    case mnesia_monitor:use_dir() of
-	true ->
-	    mnesia_log:append(latest_log, Yoyo),
-	    disk_log:sync(latest_log);
-	false  ->
-	    ignore
-    end,
-    note_up(Node, Date, Time).
-
-do_log_mnesia_down(Node) ->
-    Yoyo = {mnesia_down, Node, Date = date(), Time = time()},
-    case mnesia_monitor:use_dir() of
-	true ->
-	    mnesia_log:append(latest_log, Yoyo),
-	    disk_log:sync(latest_log);
-	false  ->
-	    ignore
-    end,
-    note_down(Node, Date, Time).
-
-do_log_master_nodes(Tab, Nodes, UseDir, IsRunning) ->
-    Master = {master_nodes, Tab, Nodes},
-    Res = 
-	case UseDir of
-	    true ->
-		LogRes = mnesia_log:append(latest_log, Master),
-		disk_log:sync(latest_log),
-		LogRes;
-	    false  ->
-		ok
-	end,
-    case IsRunning of
-	yes ->
-	    note_master_nodes(Tab, Nodes);
-	_NotRunning ->
-	    ignore
-    end,
-    Res.
-
-%%----------------------------------------------------------------------
-%% Func: handle_cast/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_cast(Msg, State) when State#state.initiated == false ->
-    %% Buffer early messages
-    Msgs = State#state.early_msgs,
-    {noreply, State#state{early_msgs = [{cast, Msg} | Msgs]}};
-
-handle_cast({im_certain, Node, NewD}, State) ->
-    OldD = decision(NewD#decision.tid),
-    MergedD = merge_decisions(Node, OldD, NewD),    
-    do_log_decision(MergedD, false),
-    {noreply, State};
-
-handle_cast(allow_garb, State) ->
-    do_allow_garb(),
-    {noreply, State};
-
-handle_cast({decisions, Node, Decisions}, State) ->
-    mnesia_lib:add(recover_nodes, Node),
-    State2 = add_remote_decisions(Node, Decisions, State),
-    {noreply, State2};
-
-handle_cast({what_decision, Node, OtherD}, State) ->
-    Tid = OtherD#decision.tid,
-    sync_trans_tid_serial(Tid),
-    Decision = 
-	case decision(Tid) of
-	    no_decision -> OtherD;
-	    MyD when record(MyD, decision) -> MyD
-	end,
-    announce([Node], [Decision], [], true),
-    {noreply, State};
-
-handle_cast({mnesia_down, Node}, State) ->
-    case State#state.unclear_decision of
-	undefined ->
-	    {noreply, State};
-	D ->
-	    case lists:member(Node, D#decision.ram_nodes) of
-		false ->
-		    {noreply, State};
-		true ->
-		    State2 = add_remote_decision(Node, D, State),
-		    {noreply, State2}
-		end
-    end;
-
-handle_cast({announce_all, Nodes}, State) ->
-    announce_all(Nodes, tabs()),
-    {noreply, State};
-
-handle_cast(Msg, State) ->
-    error("~p got unexpected cast: ~p~n", [?MODULE, Msg]),
-    {noreply, State}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_info/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-%% No need for buffering
-%% handle_info(Msg, State) when State#state.initiated == false ->
-%%     %% Buffer early messages
-%%     Msgs = State#state.early_msgs,
-%%     {noreply, State#state{early_msgs = [{info, Msg} | Msgs]}};
-
-handle_info(check_overload, S) ->
-    %% Time to check if mnesia_tm is overloaded
-    case whereis(mnesia_tm) of
-	Pid when pid(Pid) ->
-	    
-	    Threshold = 100,
-	    Prev = S#state.tm_queue_len,
-	    {message_queue_len, Len} =
-		process_info(Pid, message_queue_len),
-	    if
-		Len > Threshold, Prev > Threshold ->
-		    What = {mnesia_tm, message_queue_len, [Prev, Len]},
-		    mnesia_lib:report_system_event({mnesia_overload, What}),
-		    {noreply, S#state{tm_queue_len = 0}};
-		
-		Len > Threshold ->
-		    {noreply, S#state{tm_queue_len = Len}};
-		
-		true ->
-		    {noreply, S#state{tm_queue_len = 0}}
-	    end;
-	undefined ->
-	    {noreply, S}
-    end;
-
-handle_info(garb_decisions, State) ->
-    do_garb_decisions(),
-    {noreply, State};
-
-handle_info({force_decision, Tid}, State) ->
-    %% Enforce a transaction recovery decision,
-    %% if we still are waiting for the outcome
-    
-    case State#state.unclear_decision of
-	U when U#decision.tid == Tid ->
-	    verbose("Decided to abort transaction ~p since "
-		    "max_wait_for_decision has been exceeded~n",
-		    [Tid]),
-	    D = U#decision{outcome = aborted},
-	    State2 = add_remote_decision(node(), D, State),
-	    {noreply, State2};
-	_ ->
-	    {noreply, State}
-    end;
-
-handle_info({'EXIT', Pid, R}, State) when Pid == State#state.supervisor ->
-    mnesia_lib:dbg_out("~p was ~p~n",[?MODULE, R]),
-    {stop, shutdown, State};
-
-handle_info(Msg, State) ->
-    error("~p got unexpected info: ~p~n", [?MODULE, Msg]),
-    {noreply, State}.
-
-%%----------------------------------------------------------------------
-%% Func: terminate/2
-%% Purpose: Shutdown the server
-%% Returns: any (ignored by gen_server)
-%%----------------------------------------------------------------------
-
-terminate(Reason, State) ->
-    mnesia_monitor:terminate_proc(?MODULE, Reason, State).
-
-%%----------------------------------------------------------------------
-%% Func: code_change/3
-%% Purpose: Upgrade process when its code is to be changed
-%% Returns: {ok, NewState}
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%%----------------------------------------------------------------------
-%%% Internal functions
-%%%----------------------------------------------------------------------
-
-handle_early_msgs(State, From) ->
-    Res = do_handle_early_msgs(State#state.early_msgs,
-			       State#state{early_msgs = [],
-					   initiated = true}),
-    gen_server:reply(From, ok),
-    Res.
-
-do_handle_early_msgs([Msg | Msgs], State) ->
-    %% The messages are in reverted order
-    case do_handle_early_msgs(Msgs, State) of
-        {stop, Reason, Reply, State2} ->
-	    {stop, Reason, Reply, State2};
-        {stop, Reason, State2} ->
-	    {stop, Reason, State2};
-	{noreply, State2} ->
-	    handle_early_msg(Msg, State2)
-    end;
-
-do_handle_early_msgs([], State) ->
-    {noreply, State}.
-    
-handle_early_msg({call, Msg, From}, State) ->
-    case handle_call(Msg, From, State) of
-	{reply, R, S} ->
-	    gen_server:reply(From, R),
-	    {noreply, S};
-	Other ->
-	    Other
-    end;
-handle_early_msg({cast, Msg}, State) ->
-    handle_cast(Msg, State);
-handle_early_msg({info, Msg}, State) ->
-    handle_info(Msg, State).
-
-tabs() ->
-    Curr = val(latest_transient_decision),    % Do not miss any trans even
-    Prev = val(previous_transient_decisions), % if the tabs are switched
-    [Curr, mnesia_decision | Prev].           % Ordered by hit probability
-
-decision(Tid) ->
-    decision(Tid, tabs()).
-
-decision(Tid, [Tab | Tabs]) ->
-    case catch ?ets_lookup(Tab, Tid) of
-	[D] when record(D, decision) ->
-	    D;
-	[C] when record(C, transient_decision) ->
-	    #decision{tid = C#transient_decision.tid,
-		      outcome =  C#transient_decision.outcome,
-		      disc_nodes = [],
-		      ram_nodes = []
-		     };
-	[] ->
-	    decision(Tid, Tabs);
-	{'EXIT', _} ->
-	    %% Recently switched transient decision table
-	    decision(Tid, Tabs)
-    end;
-decision(_Tid, []) ->
-    no_decision.
-
-outcome(Tid, Default) ->
-    outcome(Tid, Default, tabs()).
-
-outcome(Tid, Default, [Tab | Tabs]) ->
-    case catch ?ets_lookup_element(Tab, Tid, 3) of
-	{'EXIT', _} ->
-	    outcome(Tid, Default, Tabs);
-	Val ->
-	    Val
-    end;
-outcome(_Tid, Default, []) ->
-    Default.
-
-filter_outcome(Val) ->
-    case Val of
-	unclear -> unclear;
-	aborted -> aborted;
-	presume_abort -> aborted;
-	committed -> committed;
-	pre_commit -> unclear
-    end.
-
-filter_aborted(D) when D#decision.outcome == presume_abort ->
-    D#decision{outcome = aborted};
-filter_aborted(D) ->
-    D.
-  
-%% Merge old decision D with new (probably remote) decision
-merge_decisions(Node, D, NewD0) ->
-    NewD = filter_aborted(NewD0),
-    if
-	D == no_decision, node() /= Node ->
-	    %% We did not know anything about this txn
-	    NewD#decision{disc_nodes = []};
-	D == no_decision ->
-	    NewD;
-	record(D, decision) ->
-	    DiscNs = D#decision.disc_nodes -- ([node(), Node]),
-	    OldD = filter_aborted(D#decision{disc_nodes = DiscNs}),
-%%	    mnesia_lib:dbg_out("merge ~w: NewD = ~w~n D = ~w~n OldD = ~w~n", 
-%%			       [Node, NewD, D, OldD]),
-	    if
-		OldD#decision.outcome == unclear,
-		NewD#decision.outcome == unclear ->
-		    D;
-
-		OldD#decision.outcome == NewD#decision.outcome ->
-		    %% We have come to the same decision
-		    OldD;
-
-		OldD#decision.outcome == committed,
-		NewD#decision.outcome == aborted ->
-		    %% Interesting! We have already committed,
-		    %% but someone else has aborted. Now we
-		    %% have a nice little inconcistency. The
-		    %% other guy (or some one else) has 
-		    %% enforced a recovery decision when
-		    %% max_wait_for_decision was exceeded.
-		    %% We will pretend that we have obeyed
-		    %% the forced recovery decision, but we
-		    %% will also generate an event in case the
-		    %% application wants to do something clever.
-		    Msg = {inconsistent_database, bad_decision, Node},
-		    mnesia_lib:report_system_event(Msg),
-		    OldD#decision{outcome = aborted};
-
-		OldD#decision.outcome == aborted ->
-		    %% aborted overrrides anything
-		    OldD#decision{outcome = aborted};
-
-		NewD#decision.outcome == aborted ->
-		    %% aborted overrrides anything
-		    OldD#decision{outcome = aborted};
-
-		OldD#decision.outcome == committed,
-		NewD#decision.outcome == unclear ->
-		    %% committed overrides unclear
-		    OldD#decision{outcome = committed};
-
-		OldD#decision.outcome == unclear,
-		NewD#decision.outcome == committed ->
-		    %% committed overrides unclear
-		    OldD#decision{outcome = committed}
-	    end
-    end.
-
-add_remote_decisions(Node, [D | Tail], State) when record(D, decision) ->
-    State2 = add_remote_decision(Node, D, State),
-    add_remote_decisions(Node, Tail, State2);
-
-add_remote_decisions(Node, [C | Tail], State)
-        when record(C, transient_decision) ->
-    D = #decision{tid = C#transient_decision.tid,
-		  outcome = C#transient_decision.outcome,
-		  disc_nodes = [],
-		  ram_nodes = []},
-    State2 = add_remote_decision(Node, D, State),
-    add_remote_decisions(Node, Tail, State2);
-
-add_remote_decisions(Node, [{mnesia_down, _, _, _} | Tail], State) ->
-    add_remote_decisions(Node, Tail, State);
-
-add_remote_decisions(Node, [{trans_tid, serial, Serial} | Tail], State) ->
-    sync_trans_tid_serial(Serial),
-    case State#state.unclear_decision of
-	undefined ->
-	    ignored;
-	D ->
-	    case lists:member(Node, D#decision.ram_nodes) of
-		true ->
-		    ignore;
-		false ->
-		    abcast([Node], {what_decision, node(), D})
-	    end
-    end,
-    add_remote_decisions(Node, Tail, State);
-
-add_remote_decisions(_Node, [], State) ->
-    State.
-
-add_remote_decision(Node, NewD, State) ->
-    Tid = NewD#decision.tid,
-    OldD = decision(Tid),
-    D = merge_decisions(Node, OldD, NewD),
-    do_log_decision(D, false),
-    Outcome = D#decision.outcome,
-    if
-	OldD == no_decision ->
-	    ignore;
-	Outcome == unclear ->
-	    ignore;
-	true ->
-	    case lists:member(node(), NewD#decision.disc_nodes) or
-		 lists:member(node(), NewD#decision.ram_nodes) of
-		true ->
-		    tell_im_certain([Node], D);
-		false ->
-		    ignore
-	    end
-    end,
-    case State#state.unclear_decision of
-	U when U#decision.tid == Tid ->
-	    WaitFor = State#state.unclear_waitfor -- [Node],
-	    if
-		Outcome == unclear, WaitFor == [] ->
-		    %% Everybody are uncertain, lets abort
-		    NewOutcome = aborted,
-		    CertainD = D#decision{outcome = NewOutcome, 
-					  disc_nodes = [],
-					  ram_nodes = []},
-		    tell_im_certain(D#decision.disc_nodes, CertainD),
-		    tell_im_certain(D#decision.ram_nodes, CertainD),
-		    do_log_decision(CertainD, false),
-		    verbose("Decided to abort transaction ~p "
-			    "since everybody are uncertain ~p~n",
-			    [Tid, CertainD]),
-		    gen_server:reply(State#state.unclear_pid, {ok, NewOutcome}),
-		    State#state{unclear_pid = undefined,
-				unclear_decision = undefined,
-				unclear_waitfor = undefined};
-		Outcome /= unclear ->
-		    verbose("~p told us that transaction ~p was ~p~n",
-			    [Node, Tid, Outcome]),
-		    gen_server:reply(State#state.unclear_pid, {ok, Outcome}),
-		    State#state{unclear_pid = undefined,
-				unclear_decision = undefined,
-				unclear_waitfor = undefined};
-		Outcome == unclear ->
-		    State#state{unclear_waitfor = WaitFor}
-	    end;
-	_ ->
-	    State
-    end.
-
-announce_all([], _Tabs) ->
-    ok;
-announce_all(ToNodes, [Tab | Tabs]) ->
-    case catch mnesia_lib:db_match_object(ram_copies, Tab, '_') of
-	{'EXIT', _} ->
-	    %% Oops, we are in the middle of a 'garb_decisions'
-	    announce_all(ToNodes, Tabs);
-	List ->
-	    announce(ToNodes, List, [], false),
-	    announce_all(ToNodes, Tabs)
-    end;
-announce_all(_ToNodes, []) ->
-    ok.
-
-announce(ToNodes, [Head | Tail], Acc, ForceSend) ->
-    Acc2 = arrange(ToNodes, Head, Acc, ForceSend),
-    announce(ToNodes, Tail, Acc2, ForceSend);
-
-announce(_ToNodes, [], Acc, _ForceSend) ->
-    send_decisions(Acc).
-
-send_decisions([{Node, Decisions} | Tail]) ->
-    abcast([Node], {decisions, node(), Decisions}),
-    send_decisions(Tail);
-send_decisions([]) ->
-    ok.
-
-arrange([To | ToNodes], D, Acc, ForceSend) when record(D, decision) ->
-    NeedsAdd = (ForceSend or
-		lists:member(To, D#decision.disc_nodes) or
-		lists:member(To, D#decision.ram_nodes)),
-    case NeedsAdd of
-	true ->
-	    Acc2 = add_decision(To, D, Acc),
-	    arrange(ToNodes, D, Acc2, ForceSend);
-	false ->
-	    arrange(ToNodes, D, Acc, ForceSend)
-    end;
-
-arrange([To | ToNodes], C, Acc, ForceSend) when record(C, transient_decision) ->
-    Acc2 = add_decision(To, C, Acc),
-    arrange(ToNodes, C, Acc2, ForceSend);
-
-arrange([_To | _ToNodes], {mnesia_down, _Node, _Date, _Time}, Acc, _ForceSend) ->
-    %% The others have their own info about this
-    Acc;
-
-arrange([_To | _ToNodes], {master_nodes, _Tab, _Nodes}, Acc, _ForceSend) ->
-    %% The others have their own info about this
-    Acc;
-
-arrange([To | ToNodes], {trans_tid, serial, Serial}, Acc, ForceSend) ->
-    %% Do the lamport thing plus release the others
-    %% from uncertainity.
-    Acc2 = add_decision(To, {trans_tid, serial, Serial}, Acc),
-    arrange(ToNodes, {trans_tid, serial, Serial}, Acc2, ForceSend);
-
-arrange([], _Decision, Acc, _ForceSend) ->
-    Acc.
-
-add_decision(Node, Decision, [{Node, Decisions} | Tail]) ->
-    [{Node, [Decision | Decisions]} | Tail];
-add_decision(Node, Decision, [Head | Tail]) ->
-    [Head | add_decision(Node, Decision, Tail)];
-add_decision(Node, Decision, []) ->
-    [{Node, [Decision]}].
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_registry.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_registry.erl
deleted file mode 100644
index c16603f344..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_registry.erl
+++ /dev/null
@@ -1,277 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_registry.erl,v 1.2 2010/03/04 13:54:19 maria Exp $
-%%
--module(mnesia_registry).
-
-%%%----------------------------------------------------------------------
-%%% File    : mnesia_registry.erl
-%%% Purpose : Support dump and restore of a registry on a C-node
-%%%           This is an OTP internal module and is not public available.
-%%%
-%%% Example : Dump some hardcoded records into the Mnesia table Tab
-%%%
-%%% 	  case rpc:call(Node, mnesia_registry, start_dump, [Tab, self()]) of
-%%% 	     Pid when pid(Pid) ->
-%%% 		 Pid ! {write, key1, key_size1, val_type1, val_size1, val1},
-%%% 		 Pid ! {delete, key3},
-%%% 		 Pid ! {write, key2, key_size2, val_type2, val_size2, val2},
-%%% 		 Pid ! {write, key4, key_size4, val_type4, val_size4, val4},
-%%% 		 Pid ! {commit, self()},
-%%% 		 receive
-%%% 		     {ok, Pid} ->
-%%% 			 ok;
-%%% 		     {'EXIT', Pid, Reason} ->
-%%% 			 exit(Reason)
-%%% 		 end;
-%%% 	     {badrpc, Reason} ->
-%%% 		 exit(Reason)
-%%% 	 end.
-%%%
-%%% Example : Restore the corresponding Mnesia table Tab
-%%%
-%%% 	  case rpc:call(Node, mnesia_registry, start_restore, [Tab, self()]) of
-%%% 	     {size, Pid, N, LargestKey, LargestVal} ->
-%%% 		 Pid ! {send_records, self()},
-%%%              Fun = fun() ->
-%%%                        receive
-%%%                            {restore, KeySize, ValSize, ValType, Key, Val} -> 
-%%%                                {Key, Val};
-%%% 		               {'EXIT', Pid, Reason} ->
-%%% 			           exit(Reason)
-%%%                        end
-%%% 		       end,
-%%%              lists:map(Fun, lists:seq(1, N));
-%%% 	     {badrpc, Reason} ->
-%%% 		 exit(Reason)
-%%% 	 end.
-%%%
-%%%----------------------------------------------------------------------
-
-%% External exports
--export([start_dump/2, start_restore/2]).
--export([create_table/1, create_table/2]).
-
-%% Internal exports 
--export([init/4]).
-
--record(state, {table, ops = [], link_to}).
-
--record(registry_entry, {key, key_size, val_type, val_size, val}).
-
--record(size, {pid = self(), n_values = 0, largest_key = 0, largest_val = 0}).
-
-%%%----------------------------------------------------------------------
-%%% Client
-%%%----------------------------------------------------------------------
-
-start(Type, Tab, LinkTo) ->
-    Starter = self(),
-    Args = [Type, Starter, LinkTo, Tab],
-    Pid = spawn_link(?MODULE, init, Args),
-    %% The receiver process may unlink the current process
-    receive
-	{ok, Res} ->
-	    Res;
-	{'EXIT', Pid, Reason} when LinkTo == Starter ->
-	    exit(Reason)
-    end.
-
-%% Starts a receiver process and optionally creates a Mnesia table
-%% with suitable default values. Returns the Pid of the receiver process
-%% 
-%% The receiver process accumulates Mnesia operations and performs
-%% all operations or none at commit. The understood messages are:
-%% 
-%%    {write, Key, KeySize, ValType, ValSize, Val} ->
-%%        accumulates mnesia:write({Tab, Key, KeySize, ValType, ValSize, Val})
-%%                                                    (no reply)
-%%    {delete, Key}     ->
-%%        accumulates mnesia:delete({Tab, Key})       (no reply)
-%%    {commit, ReplyTo} ->
-%%        commits all accumulated operations
-%%        and stops the process                       (replies {ok, Pid})
-%%    abort             ->
-%%        stops the process                           (no reply)
-%%    
-%% The receiver process is linked to the process with the process identifier
-%% LinkTo. If some error occurs the receiver process will invoke exit(Reason)
-%% and it is up to he LinkTo process to act properly when it receives an exit
-%% signal.
-
-start_dump(Tab, LinkTo) ->
-    start(dump, Tab, LinkTo).
-
-%% Starts a sender process which sends restore messages back to the
-%% LinkTo process. But first are some statistics about the table
-%% determined and returned as a 5-tuple:
-%% 
-%%    {size, SenderPid, N, LargestKeySize, LargestValSize}
-%%
-%% where N is the number of records in the table. Then the sender process
-%% waits for a 2-tuple message:
-%% 
-%%    {send_records, ReplyTo}
-%%
-%% At last N 6-tuple messages is sent to the ReplyTo process:
-%% 
-%%    ReplyTo !  {restore, KeySize, ValSize, ValType, Key, Val}
-%%
-%% If some error occurs the receiver process will invoke exit(Reason)
-%% and it is up to he LinkTo process to act properly when it receives an
-%% exit signal.
-
-start_restore(Tab, LinkTo) ->
-    start(restore, Tab, LinkTo).
-
-
-%% Optionally creates the Mnesia table Tab with suitable default values.
-%% Returns ok or EXIT's
-create_table(Tab) ->
-    Storage = mnesia:table_info(schema, storage_type),
-    create_table(Tab, [{Storage, [node()]}]).
-
-create_table(Tab, TabDef) ->
-    Attrs = record_info(fields, registry_entry),
-    case mnesia:create_table(Tab, [{attributes, Attrs} | TabDef]) of
-	{'atomic', ok} ->
-	    ok;
-	{aborted, {already_exists, Tab}} ->
-	    ok;
-	{aborted, Reason} ->
-	    exit(Reason)
-    end.
-    
-%%%----------------------------------------------------------------------
-%%% Server
-%%%----------------------------------------------------------------------
-
-init(Type, Starter, LinkTo, Tab) ->
-    if
-	LinkTo /= Starter ->
-	    link(LinkTo),
-	    unlink(Starter);
-	true ->
-	    ignore
-    end,
-    case Type of
-	dump ->
-	    Starter ! {ok, self()},
-	    dump_loop(#state{table = Tab, link_to = LinkTo});
-	restore ->
-	    restore_table(Tab, Starter, LinkTo)
-    end.
-
-%%%----------------------------------------------------------------------
-%%% Dump loop    
-%%%----------------------------------------------------------------------
-
-dump_loop(S) ->
-    Tab = S#state.table,
-    Ops = S#state.ops,
-    receive
-	{write, Key, KeySize, ValType, ValSize, Val} ->
-	    RE = #registry_entry{key = Key,
-				 key_size = KeySize,
-				 val_type = ValType,
-				 val_size = ValSize,
-				 val = Val},
-	    dump_loop(S#state{ops = [{write, RE} | Ops]});
-	{delete, Key} ->
-	    dump_loop(S#state{ops = [{delete, Key} | Ops]});
-	{commit, ReplyTo} ->
-	    create_table(Tab),
-	    RecName = mnesia:table_info(Tab, record_name),
-	    %% The Ops are in reverse order, but there is no need
-	    %% for reversing the list of accumulated operations
-	    case mnesia:transaction(fun handle_ops/3, [Tab, RecName, Ops]) of
-                {'atomic', ok} ->
-                    ReplyTo ! {ok, self()},
-                    stop(S#state.link_to);
-                {aborted, Reason} ->
-                    exit({aborted, Reason})
-            end;
-	abort ->
-	    stop(S#state.link_to);
-        BadMsg ->
-            exit({bad_message, BadMsg})					   
-    end.
-
-stop(LinkTo) ->
-    unlink(LinkTo),
-    exit(normal).
-
-%% Grab a write lock for the entire table
-%% and iterate over all accumulated operations
-handle_ops(Tab, RecName, Ops) ->
-    mnesia:write_lock_table(Tab),
-    do_handle_ops(Tab, RecName, Ops).
-
-do_handle_ops(Tab, RecName, [{write, RegEntry} | Ops]) ->
-    Record = setelement(1, RegEntry, RecName),
-    mnesia:write(Tab, Record, write),
-    do_handle_ops(Tab, RecName, Ops);
-do_handle_ops(Tab, RecName, [{delete, Key} | Ops]) ->
-    mnesia:delete(Tab, Key, write),
-    do_handle_ops(Tab, RecName, Ops);
-do_handle_ops(_Tab, _RecName, []) ->
-    ok.
-    
-%%%----------------------------------------------------------------------
-%%% Restore table
-%%%----------------------------------------------------------------------
-
-restore_table(Tab, Starter, LinkTo) ->
-    Pat = mnesia:table_info(Tab, wild_pattern),
-    Fun = fun() -> mnesia:match_object(Tab, Pat, read) end,
-    case mnesia:transaction(Fun) of
-	{'atomic', AllRecords} ->
-	    Size = calc_size(AllRecords, #size{}),
-	    Starter ! {ok, Size},
-	    receive
-		{send_records, ReplyTo} -> 
-		    send_records(AllRecords, ReplyTo),
-		    unlink(LinkTo),
-		    exit(normal);
-		BadMsg ->
-		    exit({bad_message, BadMsg})
-	    end;
-	{aborted, Reason} ->
-            exit(Reason)
-    end.
-
-calc_size([H | T], S) ->
-    KeySize = max(element(#registry_entry.key_size, H), S#size.largest_key),
-    ValSize = max(element(#registry_entry.val_size, H), S#size.largest_val),
-    N = S#size.n_values + 1,
-    calc_size(T, S#size{n_values = N, largest_key = KeySize, largest_val = ValSize});
-calc_size([], Size) ->
-    Size.
-
-max(New, Old) when New > Old -> New;
-max(_New, Old) -> Old.
-
-send_records([H | T], ReplyTo) ->
-    KeySize = element(#registry_entry.key_size, H),
-    ValSize = element(#registry_entry.val_size, H),
-    ValType = element(#registry_entry.val_type, H),
-    Key = element(#registry_entry.key, H),
-    Val = element(#registry_entry.val, H),
-    ReplyTo ! {restore, KeySize, ValSize, ValType, Key, Val},
-    send_records(T, ReplyTo);
-send_records([], _ReplyTo) ->
-    ok.
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_schema.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_schema.erl
deleted file mode 100644
index cceb6bf0d1..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_schema.erl
+++ /dev/null
@@ -1,2899 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_schema.erl,v 1.2 2010/03/04 13:54:20 maria Exp $
-%%
-%% In this module we provide a number of explicit functions
-%% to maninpulate the schema. All these functions are called
-%% within a special schema transaction.
-%%
-%% We also have an init/1 function defined here, this func is
-%% used by mnesia:start() to initialize the entire schema.
-
--module(mnesia_schema).
-
--export([
-         add_snmp/2,
-         add_table_copy/3,
-         add_table_index/2,
-	 arrange_restore/3,
-         attr_tab_to_pos/2,
-         attr_to_pos/2,
-         change_table_copy_type/3,
-         change_table_access_mode/2,
-         change_table_load_order/2,
-	 change_table_frag/2,
-	 clear_table/1,
-         create_table/1,
-	 cs2list/1,
-         del_snmp/1,
-         del_table_copy/2,
-         del_table_index/2,
-         delete_cstruct/2,
-         delete_schema/1,
-         delete_schema2/0,
-         delete_table/1,
-         delete_table_property/2,
-         dump_tables/1,
-         ensure_no_schema/1,
-	 get_create_list/1,
-         get_initial_schema/2,
-	 get_table_properties/1,
-         info/0,
-         info/1,
-         init/1,
-         insert_cstruct/3,
-	 is_remote_member/1,
-         list2cs/1,
-         lock_schema/0,
-	 lock_del_table/4, % Spawned
-         merge_schema/0,
-         move_table/3,
-         opt_create_dir/2,
-         prepare_commit/3,
-         purge_dir/2,
-         purge_tmp_files/0,
-         ram_delete_table/2,
-%         ram_delete_table/3,
-	 read_cstructs_from_disc/0,
-         read_nodes/0,
-         remote_read_schema/0,
-	 restore/1,
-         restore/2,
-         restore/3,
-	 schema_coordinator/3,
-	 set_where_to_read/3,
-         transform_table/4,
-         undo_prepare_commit/2,
-         unlock_schema/0,
-         version/0,
-         write_table_property/2
-        ]).
-
-%% Exports for mnesia_frag
--export([
-	 get_tid_ts_and_lock/2,
-	 make_create_table/1,
-         ensure_active/1,
-	 pick/4,
-	 verify/3,
-	 incr_version/1,
-	 check_keys/3,
-	 check_duplicates/2,
-	 make_delete_table/2
-	]).
-
-%% Needed outside to be able to use/set table_properties
-%% from user (not supported) 
--export([schema_transaction/1,
-	 insert_schema_ops/2,
-	 do_create_table/1,
-	 do_delete_table/1,
-	 do_delete_table_property/2,
- 	 do_write_table_property/2]).
-
--include("mnesia.hrl").
--include_lib("kernel/include/file.hrl").
-
--import(mnesia_lib, [set/2, del/2, verbose/2, dbg_out/2]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Here comes the init function which also resides in
-%% this module, it is called upon by the trans server
-%% at startup of the system
-%% 
-%% We have a meta table which looks like
-%% {table, schema, 
-%%    {type, set},
-%%    {disc_copies, all},
-%%    {arity, 2}
-%%    {attributes, [key, val]}
-%%
-%% This means that we have a series of {schema, Name, Cs} tuples
-%% in a table called schema !!
-
-init(IgnoreFallback) ->
-    Res = read_schema(true, false, IgnoreFallback),
-    {ok, Source, _CreateList} = exit_on_error(Res),
-    verbose("Schema initiated from: ~p~n", [Source]),
-    set({schema, tables}, []),
-    set({schema, local_tables}, []),
-    Tabs = set_schema(?ets_first(schema)),
-    lists:foreach(fun(Tab) -> clear_whereabouts(Tab) end, Tabs),
-    set({schema, where_to_read}, node()),
-    set({schema, load_node}, node()),
-    set({schema, load_reason}, initial),
-    mnesia_controller:add_active_replica(schema, node()).
-
-exit_on_error({error, Reason}) ->
-    exit(Reason);
-exit_on_error(GoodRes) ->
-    GoodRes.
-
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason); 
-	Value -> Value 
-    end.
-
-%% This function traverses all cstructs in the schema and
-%% sets all values in mnesia_gvar accordingly for each table/cstruct
-
-set_schema('$end_of_table') -> 
-    [];
-set_schema(Tab) ->
-    do_set_schema(Tab),
-    [Tab | set_schema(?ets_next(schema, Tab))].
-
-get_create_list(Tab) ->
-    ?ets_lookup_element(schema, Tab, 3).
-
-do_set_schema(Tab) ->
-    List = get_create_list(Tab),
-    Cs = list2cs(List),
-    do_set_schema(Tab, Cs).
-
-do_set_schema(Tab, Cs) ->
-    Type = Cs#cstruct.type,
-    set({Tab, setorbag}, Type),
-    set({Tab, local_content}, Cs#cstruct.local_content),
-    set({Tab, ram_copies}, Cs#cstruct.ram_copies),
-    set({Tab, disc_copies}, Cs#cstruct.disc_copies),
-    set({Tab, disc_only_copies}, Cs#cstruct.disc_only_copies),
-    set({Tab, load_order}, Cs#cstruct.load_order),
-    set({Tab, access_mode}, Cs#cstruct.access_mode),
-    set({Tab, snmp}, Cs#cstruct.snmp),
-    set({Tab, user_properties}, Cs#cstruct.user_properties),
-    [set({Tab, user_property, element(1, P)}, P) || P <- Cs#cstruct.user_properties],
-    set({Tab, frag_properties}, Cs#cstruct.frag_properties),
-    mnesia_frag:set_frag_hash(Tab, Cs#cstruct.frag_properties),
-    set({Tab, attributes}, Cs#cstruct.attributes),
-    Arity = length(Cs#cstruct.attributes) + 1,
-    set({Tab, arity}, Arity),
-    RecName =  Cs#cstruct.record_name,
-    set({Tab, record_name}, RecName),
-    set({Tab, record_validation}, {RecName, Arity, Type}),
-    set({Tab, wild_pattern}, wild(RecName, Arity)),
-    set({Tab, index}, Cs#cstruct.index),
-    %% create actual index tabs later
-    set({Tab, cookie}, Cs#cstruct.cookie),
-    set({Tab, version}, Cs#cstruct.version),
-    set({Tab, cstruct}, Cs),
-    Storage = mnesia_lib:schema_cs_to_storage_type(node(), Cs),
-    set({Tab, storage_type}, Storage),
-    mnesia_lib:add({schema, tables}, Tab),
-    Ns = mnesia_lib:cs_to_nodes(Cs),
-    case lists:member(node(), Ns) of
-        true ->
-            mnesia_lib:add({schema, local_tables}, Tab);
-        false when Tab == schema ->
-            mnesia_lib:add({schema, local_tables}, Tab);
-        false ->
-            ignore
-    end.
-
-wild(RecName, Arity) ->
-    Wp0 = list_to_tuple(lists:duplicate(Arity, '_')),
-    setelement(1, Wp0, RecName).
-
-%% Temporarily read the local schema and return a list
-%% of all nodes mentioned in the schema.DAT file
-read_nodes() ->
-    %% Ensure that we access the intended Mnesia
-    %% directory. This function may not be called
-    %% during startup since it will cause the
-    %% application_controller to get into deadlock
-    case mnesia_lib:ensure_loaded(?APPLICATION) of
-	ok ->
-	    case read_schema(false, false) of
-		{ok, _Source, CreateList} ->
-		    Cs = list2cs(CreateList),
-		    {ok, Cs#cstruct.disc_copies ++ Cs#cstruct.ram_copies};
-		{error, Reason} ->
-		    {error, Reason}
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-%% Returns Version from the tuple {Version,MasterNodes}
-version() ->
-    case read_schema(false, false) of
-        {ok, Source, CreateList} when Source /= default ->
-	    Cs = list2cs(CreateList),
-            {Version, _Details} = Cs#cstruct.version,
-            Version;
-        _ ->
-            case dir_exists(mnesia_lib:dir()) of
-                true -> {1,0};
-                false -> {0,0}
-            end
-    end.
-
-%% Calculate next table version from old cstruct
-incr_version(Cs) ->
-    {{Major, Minor}, _} = Cs#cstruct.version,
-    Nodes = mnesia_lib:intersect(val({schema, disc_copies}),
-                                 mnesia_lib:cs_to_nodes(Cs)), 
-    V = 
-        case Nodes -- val({Cs#cstruct.name, active_replicas}) of
-            [] -> {Major + 1, 0};    % All replicas are active
-            _ -> {Major, Minor + 1}  % Some replicas are inactive
-        end,
-    Cs#cstruct{version = {V, {node(), now()}}}.
-
-%% Returns table name
-insert_cstruct(Tid, Cs, KeepWhereabouts) ->
-    Tab = Cs#cstruct.name,
-    TabDef = cs2list(Cs),
-    Val = {schema, Tab, TabDef},
-    mnesia_checkpoint:tm_retain(Tid, schema, Tab, write),
-    mnesia_subscr:report_table_event(schema, Tid, Val, write),
-    Active = val({Tab, active_replicas}),
-
-    case KeepWhereabouts of
-        true ->
-            ignore;
-        false when Active == [] ->
-            clear_whereabouts(Tab);
-        false ->
-            %% Someone else has initiated table
-            ignore
-    end,
-    set({Tab, cstruct}, Cs),
-    ?ets_insert(schema, Val),
-    do_set_schema(Tab, Cs),
-    Val.
-
-clear_whereabouts(Tab) ->
-    set({Tab, checkpoints}, []),
-    set({Tab, subscribers}, []),
-    set({Tab, where_to_read}, nowhere),
-    set({Tab, active_replicas}, []),
-    set({Tab, commit_work}, []),
-    set({Tab, where_to_write}, []),
-    set({Tab, where_to_commit}, []),
-    set({Tab, load_by_force}, false),
-    set({Tab, load_node}, unknown),
-    set({Tab, load_reason}, unknown).
-
-%% Returns table name
-delete_cstruct(Tid, Cs) ->
-    Tab = Cs#cstruct.name,
-    TabDef = cs2list(Cs),
-    Val = {schema, Tab, TabDef},
-    mnesia_checkpoint:tm_retain(Tid, schema, Tab, delete),
-    mnesia_subscr:report_table_event(schema, Tid, Val, delete),
-    ?ets_match_delete(mnesia_gvar, {{Tab, '_'}, '_'}),
-    ?ets_match_delete(mnesia_gvar, {{Tab, '_', '_'}, '_'}),
-    del({schema, local_tables}, Tab),
-    del({schema, tables}, Tab),
-    ?ets_delete(schema, Tab),
-    Val.
-
-%% Delete the Mnesia directory on all given nodes
-%% Requires that Mnesia is not running anywhere
-%% Returns ok | {error,Reason}
-delete_schema(Ns) when list(Ns), Ns /= [] ->
-    RunningNs = mnesia_lib:running_nodes(Ns),
-    Reason = "Cannot delete schema on all nodes",
-    if
-        RunningNs == [] ->
-	    case rpc:multicall(Ns, ?MODULE, delete_schema2, []) of
-		{Replies, []} ->
-		    case [R || R <- Replies, R /= ok]  of
-			[] ->
-			    ok;
-			BadReplies ->
-			    verbose("~s: ~p~n", [Reason, BadReplies]),
-			    {error, {"All nodes not running", BadReplies}}
-		    end;
-		{_Replies, BadNs} ->
-                    verbose("~s: ~p~n", [Reason, BadNs]),
-                    {error, {"All nodes not running", BadNs}}
-            end;
-        true ->
-            verbose("~s: ~p~n", [Reason, RunningNs]),
-            {error, {"Mnesia is not stopped everywhere", RunningNs}}
-    end;
-delete_schema(Ns) ->
-    {error, {badarg, Ns}}.
-
-delete_schema2() ->
-    %% Ensure that we access the intended Mnesia
-    %% directory. This function may not be called
-    %% during startup since it will cause the
-    %% application_controller to get into deadlock
-    case mnesia_lib:ensure_loaded(?APPLICATION) of
-	ok ->
-	    case mnesia_lib:is_running() of
-		no ->
-		    Dir = mnesia_lib:dir(),
-		    purge_dir(Dir, []),
-		    ok;
-		_ ->
-		    {error, {"Mnesia still running", node()}}
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-    
-ensure_no_schema([H|T]) when atom(H) ->
-    case rpc:call(H, ?MODULE, remote_read_schema, []) of
-        {badrpc, Reason} ->
-            {H, {"All nodes not running", H, Reason}};
-        {ok,Source, _} when Source /= default ->
-            {H, {already_exists, H}};
-        _ ->
-            ensure_no_schema(T)
-    end;
-ensure_no_schema([H|_]) ->
-    {error,{badarg, H}};
-ensure_no_schema([]) ->
-    ok.
-
-remote_read_schema() ->
-    %% Ensure that we access the intended Mnesia
-    %% directory. This function may not be called
-    %% during startup since it will cause the
-    %% application_controller to get into deadlock
-    case mnesia_lib:ensure_loaded(?APPLICATION) of
-	ok ->
-	    case mnesia_monitor:get_env(schema_location) of
-		opt_disc ->
-		    read_schema(false, true);
-		_ ->
-		    read_schema(false, false)
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-dir_exists(Dir) ->
-    dir_exists(Dir, mnesia_monitor:use_dir()).
-dir_exists(Dir, true) ->
-    case file:read_file_info(Dir) of
-        {ok, _} -> true;
-        _ -> false
-    end;
-dir_exists(_Dir, false) ->
-    false.
-
-opt_create_dir(UseDir, Dir) when UseDir == true->
-    case dir_exists(Dir, UseDir) of
-        true ->
-            check_can_write(Dir);
-        false ->
-            case file:make_dir(Dir) of
-                ok -> 
-                    verbose("Create Directory ~p~n", [Dir]),
-                    ok;
-                {error, Reason} ->
-                    verbose("Cannot create mnesia dir ~p~n", [Reason]),
-                    {error, {"Cannot create Mnesia dir", Dir, Reason}}
-            end
-    end;
-opt_create_dir(false, _) ->
-    {error, {has_no_disc, node()}}.
-    
-check_can_write(Dir) ->
-    case file:read_file_info(Dir) of
-        {ok, FI} when FI#file_info.type == directory,
-		      FI#file_info.access == read_write ->
-            ok;
-        {ok, _} ->
-            {error, "Not allowed to write in Mnesia dir", Dir};
-        _ ->
-            {error, "Non existent Mnesia dir", Dir}
-    end.
-
-lock_schema() ->
-    mnesia_lib:lock_table(schema).
-
-unlock_schema() ->
-    mnesia_lib:unlock_table(schema).
-
-read_schema(Keep, _UseDirAnyway) ->
-    read_schema(Keep, false, false).
-
-%% The schema may be read for several reasons.
-%% If Mnesia is not already started the read intention
-%% we normally do not want the ets table named schema
-%% be left around.
-%% If Keep == true, the ets table schema is kept
-%% If Keep == false, the ets table schema is removed
-%%
-%% Returns {ok, Source, SchemaCstruct} or {error, Reason}
-%% Source may be: default | ram | disc | fallback
-
-read_schema(Keep, UseDirAnyway, IgnoreFallback) ->
-    lock_schema(),
-    Res = 
-        case mnesia:system_info(is_running) of
-            yes ->
-                {ok, ram, get_create_list(schema)};
-            _IsRunning ->
-                    case mnesia_monitor:use_dir() of
-                        true ->
-                            read_disc_schema(Keep, IgnoreFallback);
-                        false when UseDirAnyway == true ->
-                            read_disc_schema(Keep, IgnoreFallback);
-                        false when Keep == true ->
-                            Args = [{keypos, 2}, public, named_table, set],
-                            mnesia_monitor:mktab(schema, Args),
-                            CreateList = get_initial_schema(ram_copies, []),
-                            ?ets_insert(schema,{schema, schema, CreateList}),
-                            {ok, default, CreateList};
-                        false when Keep == false ->
-			    CreateList = get_initial_schema(ram_copies, []),
-                            {ok, default, CreateList}
-                    end
-        end,
-    unlock_schema(),
-    Res.
-
-read_disc_schema(Keep, IgnoreFallback) ->
-    Running = mnesia:system_info(is_running),
-    case mnesia_bup:fallback_exists() of
-        true when IgnoreFallback == false, Running /= yes ->
-             mnesia_bup:fallback_to_schema();
-        _ ->  
-            %% If we're running, we read the schema file even
-            %% if fallback exists
-            Dat = mnesia_lib:tab2dat(schema),
-            case mnesia_lib:exists(Dat) of
-                true ->
-                    do_read_disc_schema(Dat, Keep);
-                false ->
-		    Dmp = mnesia_lib:tab2dmp(schema),
-		    case mnesia_lib:exists(Dmp) of
-			true ->
-			    %% May only happen when toggling of
-			    %% schema storage type has been
-			    %% interrupted
-			    do_read_disc_schema(Dmp, Keep);
-			false ->
-			    {error, "No schema file exists"}
-		    end
-            end
-    end.
-
-do_read_disc_schema(Fname, Keep) ->
-    T = 
-        case Keep of
-            false ->
-                Args = [{keypos, 2}, public, set],
-                ?ets_new_table(schema, Args);
-            true ->
-                Args = [{keypos, 2}, public, named_table, set],
-                mnesia_monitor:mktab(schema, Args)
-        end,
-    Repair = mnesia_monitor:get_env(auto_repair),
-    Res =  % BUGBUG Fixa till dcl!
-        case mnesia_lib:dets_to_ets(schema, T, Fname, set, Repair, no) of
-            loaded -> {ok, disc, ?ets_lookup_element(T, schema, 3)};
-            Other -> {error, {"Cannot read schema", Fname, Other}}
-        end,
-    case Keep of
-        true -> ignore;
-        false -> ?ets_delete_table(T)
-    end,
-    Res.
-
-get_initial_schema(SchemaStorage, Nodes) ->
-    Cs = #cstruct{name = schema,
-		  record_name = schema,
-		  attributes = [table, cstruct]},    
-    Cs2 =
-	case SchemaStorage of
-        ram_copies -> Cs#cstruct{ram_copies = Nodes};
-        disc_copies -> Cs#cstruct{disc_copies = Nodes}
-    end,
-    cs2list(Cs2).
-
-read_cstructs_from_disc() ->
-    %% Assumptions: 
-    %% - local schema lock in global
-    %% - use_dir is true
-    %% - Mnesia is not running
-    %% - Ignore fallback
-
-    Fname = mnesia_lib:tab2dat(schema),
-    case mnesia_lib:exists(Fname) of
-	true ->
-	    Args = [{file, Fname},
-		    {keypos, 2},
-		    {repair, mnesia_monitor:get_env(auto_repair)},
-		    {type, set}],
-	    case dets:open_file(make_ref(), Args) of
-		{ok, Tab} ->
-		    Fun = fun({_, _, List}) ->
-				  {continue, list2cs(List)}
-			  end,
-		    Cstructs = dets:traverse(Tab, Fun),
-		    dets:close(Tab),
-		    {ok, Cstructs};  
-		{error, Reason} ->
-		    {error, Reason}
-	    end;
-	false ->
-	    {error, "No schema file exists"}
-    end.
-    
-%% We run a very special type of transactions when we
-%% we want to manipulate the schema.
-
-get_tid_ts_and_lock(Tab, Intent) ->
-    TidTs = get(mnesia_activity_state),
-    case TidTs of
-	{_Mod, Tid, Ts} when record(Ts, tidstore)->
-	    Store = Ts#tidstore.store,
-	    case Intent of
-		read -> mnesia_locker:rlock_table(Tid, Store, Tab);
-		write -> mnesia_locker:wlock_table(Tid, Store, Tab);
-		none -> ignore
-	    end,
-	    TidTs;
-	_ ->
-	    mnesia:abort(no_transaction)
-    end.
-
-schema_transaction(Fun) ->
-    case get(mnesia_activity_state) of
-	undefined ->
-	    Args = [self(), Fun, whereis(mnesia_controller)],
-	    Pid = spawn_link(?MODULE, schema_coordinator, Args),
-	    receive
-		{transaction_done, Res, Pid} -> Res;
-		{'EXIT', Pid, R} -> {aborted, {transaction_crashed, R}}
-	    end;
-	_ ->
-            {aborted, nested_transaction}
-    end.
-
-%% This process may dump the transaction log, and should
-%% therefore not be run in an application process
-%% 
-schema_coordinator(Client, _Fun, undefined) ->
-    Res = {aborted, {node_not_running, node()}},
-    Client ! {transaction_done, Res, self()},
-    unlink(Client);
-    
-schema_coordinator(Client, Fun, Controller) when pid(Controller) ->
-    %% Do not trap exit in order to automatically die
-    %% when the controller dies
-
-    link(Controller),
-    unlink(Client),
-    
-    %% Fulfull the transaction even if the client dies     
-    Res = mnesia:transaction(Fun),
-    Client ! {transaction_done, Res, self()},
-    unlink(Controller),         % Avoids spurious exit message
-    unlink(whereis(mnesia_tm)), % Avoids spurious exit message
-    exit(normal).
-
-%% The make* rotines return a list of ops, this function
-%% inserts em all in the Store and maintains the local order
-%% of ops.
-
-insert_schema_ops({_Mod, _Tid, Ts}, SchemaIOps) ->
-    do_insert_schema_ops(Ts#tidstore.store, SchemaIOps).
-    
-do_insert_schema_ops(Store, [Head | Tail]) ->
-    ?ets_insert(Store, Head),
-    do_insert_schema_ops(Store, Tail);
-do_insert_schema_ops(_Store, []) ->
-    ok.
-
-cs2list(Cs) when record(Cs, cstruct) ->
-    Tags = record_info(fields, cstruct),
-    rec2list(Tags, 2, Cs);
-cs2list(CreateList) when list(CreateList) ->
-    CreateList.
-
-rec2list([Tag | Tags], Pos, Rec) ->
-    Val = element(Pos, Rec),
-    [{Tag, Val} | rec2list(Tags, Pos + 1, Rec)];
-rec2list([], _Pos, _Rec) ->
-    [].
-
-list2cs(List) when list(List) ->
-    Name = pick(unknown, name, List, must),
-    Type = pick(Name, type, List, set),
-    Rc0 = pick(Name, ram_copies, List, []),
-    Dc = pick(Name, disc_copies, List, []),
-    Doc = pick(Name, disc_only_copies, List, []),
-    Rc = case {Rc0, Dc, Doc} of
-             {[], [], []} -> [node()];
-             _ -> Rc0
-         end,
-    LC = pick(Name, local_content, List, false),
-    RecName = pick(Name, record_name, List, Name),
-    Attrs = pick(Name, attributes, List, [key, val]),
-    Snmp = pick(Name, snmp, List, []),
-    LoadOrder = pick(Name, load_order, List, 0),
-    AccessMode = pick(Name, access_mode, List, read_write),
-    UserProps = pick(Name, user_properties, List, []),
-    verify({alt, [nil, list]}, mnesia_lib:etype(UserProps),
-	   {bad_type, Name, {user_properties, UserProps}}),
-    Cookie = pick(Name, cookie, List, ?unique_cookie),
-    Version = pick(Name, version, List, {{2, 0}, []}),
-    Ix = pick(Name, index, List, []),
-    verify({alt, [nil, list]}, mnesia_lib:etype(Ix),
-	   {bad_type, Name, {index, [Ix]}}),
-    Ix2 = [attr_to_pos(I, Attrs) || I <- Ix],
-
-    Frag = pick(Name, frag_properties, List, []),
-    verify({alt, [nil, list]}, mnesia_lib:etype(Frag),
-	   {badarg, Name, {frag_properties, Frag}}), 
-        
-    Keys = check_keys(Name, List, record_info(fields, cstruct)),
-    check_duplicates(Name, Keys),
-    #cstruct{name = Name,
-             ram_copies = Rc,
-             disc_copies = Dc,
-             disc_only_copies = Doc,
-             type = Type,
-             index = Ix2,
-             snmp = Snmp,
-             load_order = LoadOrder,
-             access_mode = AccessMode,
-             local_content = LC,
-	     record_name = RecName,
-             attributes = Attrs,
-             user_properties = lists:sort(UserProps),
-	     frag_properties = lists:sort(Frag),
-             cookie = Cookie,
-             version = Version};
-list2cs(Other) ->
-    mnesia:abort({badarg, Other}).
-
-pick(Tab, Key, List, Default) ->
-    case lists:keysearch(Key, 1, List) of
-        false  when Default == must ->
-            mnesia:abort({badarg, Tab, "Missing key", Key, List});
-        false ->
-            Default;
-        {value, {Key, Value}} ->
-            Value;
-	{value, BadArg} ->
-	    mnesia:abort({bad_type, Tab, BadArg})
-    end.
-
-%% Convert attribute name to integer if neccessary
-attr_tab_to_pos(_Tab, Pos) when integer(Pos) ->
-    Pos;
-attr_tab_to_pos(Tab, Attr) ->
-    attr_to_pos(Attr, val({Tab, attributes})).
-    
-%% Convert attribute name to integer if neccessary
-attr_to_pos(Pos, _Attrs) when integer(Pos) ->
-    Pos;
-attr_to_pos(Attr, Attrs) when atom(Attr) ->
-    attr_to_pos(Attr, Attrs, 2);
-attr_to_pos(Attr, _) ->
-    mnesia:abort({bad_type, Attr}).
-
-attr_to_pos(Attr, [Attr | _Attrs], Pos) ->
-    Pos;
-attr_to_pos(Attr, [_ | Attrs], Pos) ->
-    attr_to_pos(Attr, Attrs, Pos + 1);
-attr_to_pos(Attr, _, _) ->
-    mnesia:abort({bad_type, Attr}).
-    
-check_keys(Tab, [{Key, _Val} | Tail], Items) ->
-    case lists:member(Key, Items) of
-        true ->  [Key | check_keys(Tab, Tail, Items)];
-        false -> mnesia:abort({badarg, Tab, Key})
-    end;
-check_keys(_, [], _) ->
-    [];
-check_keys(Tab, Arg, _) ->
-    mnesia:abort({badarg, Tab, Arg}).
-
-check_duplicates(Tab, Keys) ->
-    case has_duplicates(Keys) of
-        false -> ok;
-        true -> mnesia:abort({badarg, Tab, "Duplicate keys", Keys})
-    end.
-
-has_duplicates([H | T]) ->
-    case lists:member(H, T) of
-        true -> true;
-        false -> has_duplicates(T)
-    end;
-has_duplicates([]) ->
-    false.
-
-%% This is the only place where we check the validity of data
-verify_cstruct(Cs) when record(Cs, cstruct) ->
-    verify_nodes(Cs),
-
-    Tab = Cs#cstruct.name,
-    verify(atom, mnesia_lib:etype(Tab), {bad_type, Tab}),
-    Type = Cs#cstruct.type,
-    verify(true, lists:member(Type, [set, bag, ordered_set]),
-	   {bad_type, Tab, {type, Type}}),
-
-    %% Currently ordered_set is not supported for disk_only_copies.
-    if 
- 	Type == ordered_set, Cs#cstruct.disc_only_copies /= [] ->
-	    mnesia:abort({bad_type, Tab, {not_supported, Type, disc_only_copies}});
-	true ->
-	    ok
-    end,
-
-    RecName = Cs#cstruct.record_name,
-    verify(atom, mnesia_lib:etype(RecName),
-	   {bad_type, Tab, {record_name, RecName}}),
-
-    Attrs = Cs#cstruct.attributes,
-    verify(list, mnesia_lib:etype(Attrs),
-	   {bad_type, Tab, {attributes, Attrs}}),
-
-    Arity = length(Attrs) + 1,
-    verify(true, Arity > 2, {bad_type, Tab, {attributes, Attrs}}),
-    
-    lists:foldl(fun(Attr,_Other) when Attr == snmp ->
-                        mnesia:abort({bad_type, Tab, {attributes, [Attr]}});
-                   (Attr,Other) -> 
-                        verify(atom, mnesia_lib:etype(Attr),
-                               {bad_type, Tab, {attributes, [Attr]}}),
-                        verify(false, lists:member(Attr, Other),
-                               {combine_error, Tab, {attributes, [Attr | Other]}}),
-                        [Attr | Other]
-                end,
-                [],
-                Attrs),
-
-    Index = Cs#cstruct.index,
-    verify({alt, [nil, list]}, mnesia_lib:etype(Index),
-	   {bad_type, Tab, {index, Index}}),
-    
-    IxFun =
-        fun(Pos) ->
-                verify(true, fun() ->
-                                     if
-					 integer(Pos),
-                                         Pos > 2,
-                                         Pos =< Arity ->
-                                             true;
-                                         true -> false
-                                     end
-                             end,
-                       {bad_type, Tab, {index, [Pos]}})
-        end,
-    lists:foreach(IxFun, Index),
-    
-    LC = Cs#cstruct.local_content,
-    verify({alt, [true, false]}, LC,
-	   {bad_type, Tab, {local_content, LC}}),
-    Access = Cs#cstruct.access_mode,
-    verify({alt, [read_write, read_only]}, Access,
-	   {bad_type, Tab, {access_mode, Access}}),
-
-    Snmp = Cs#cstruct.snmp,
-    verify(true, mnesia_snmp_hook:check_ustruct(Snmp),
-	   {badarg, Tab, {snmp, Snmp}}),
-
-    CheckProp = fun(Prop) when tuple(Prop), size(Prop) >= 1 -> ok;
-		   (Prop) -> mnesia:abort({bad_type, Tab, {user_properties, [Prop]}})
-		end,
-    lists:foreach(CheckProp, Cs#cstruct.user_properties),
-
-    case Cs#cstruct.cookie of
-	{{MegaSecs, Secs, MicroSecs}, _Node} 
-	when integer(MegaSecs), integer(Secs),
-	     integer(MicroSecs), atom(node) ->
-            ok;
-        Cookie ->
-            mnesia:abort({bad_type, Tab, {cookie, Cookie}})
-    end,
-    case Cs#cstruct.version of
-        {{Major, Minor}, _Detail}
-                when integer(Major), integer(Minor) ->
-            ok;
-        Version ->
-            mnesia:abort({bad_type, Tab, {version, Version}})
-    end.
-
-verify_nodes(Cs) ->
-    Tab = Cs#cstruct.name,
-    Ram = Cs#cstruct.ram_copies,
-    Disc = Cs#cstruct.disc_copies,
-    DiscOnly = Cs#cstruct.disc_only_copies,
-    LoadOrder = Cs#cstruct.load_order,
-
-    verify({alt, [nil, list]}, mnesia_lib:etype(Ram),
-	   {bad_type, Tab, {ram_copies, Ram}}),
-    verify({alt, [nil, list]}, mnesia_lib:etype(Disc),
-	   {bad_type, Tab, {disc_copies, Disc}}),
-    case Tab of
-	schema ->
-	    verify([], DiscOnly, {bad_type, Tab, {disc_only_copies, DiscOnly}});
-	_ ->
-	    verify({alt, [nil, list]},
-		   mnesia_lib:etype(DiscOnly),
-		   {bad_type, Tab, {disc_only_copies, DiscOnly}})
-    end,
-    verify(integer, mnesia_lib:etype(LoadOrder),
-	   {bad_type, Tab, {load_order, LoadOrder}}),
-    
-    Nodes = Ram ++ Disc ++ DiscOnly,
-    verify(list, mnesia_lib:etype(Nodes),
-	   {combine_error, Tab,
-	    [{ram_copies, []}, {disc_copies, []}, {disc_only_copies, []}]}),
-    verify(false, has_duplicates(Nodes), {combine_error, Tab, Nodes}),
-    AtomCheck = fun(N) -> verify(atom, mnesia_lib:etype(N), {bad_type, Tab, N}) end, 
-    lists:foreach(AtomCheck, Nodes).
-    
-verify(Expected, Fun, Error) when function(Fun) ->
-    do_verify(Expected, catch Fun(), Error);
-verify(Expected, Actual, Error) ->
-    do_verify(Expected, Actual, Error).
-
-do_verify({alt, Values}, Value, Error) ->
-    case lists:member(Value, Values) of
-        true -> ok;
-        false -> mnesia:abort(Error)
-    end;
-do_verify(Value, Value, _) ->
-    ok;
-do_verify(_Value, _, Error) ->
-     mnesia:abort(Error).
-
-ensure_writable(Tab) ->
-    case val({Tab, where_to_write}) of
-        [] -> mnesia:abort({read_only, Tab});
-        _ -> ok
-    end.
-
-%% Ensure that all replicas on disk full nodes are active
-ensure_active(Cs) ->
-    ensure_active(Cs, active_replicas).
-
-ensure_active(Cs, What) ->
-    Tab = Cs#cstruct.name,
-    case val({Tab, What}) of
-        [] -> mnesia:abort({no_exists, Tab});
-        _ -> ok
-    end,
-    Nodes = mnesia_lib:intersect(val({schema, disc_copies}),
-                                 mnesia_lib:cs_to_nodes(Cs)), 
-    W = {Tab, What},
-    case Nodes -- val(W) of
-        [] ->
-            ok;
-        Ns ->
-            Expl = "All replicas on diskfull nodes are not active yet",
-            case val({Tab, local_content}) of
-                true ->
-		    case rpc:multicall(Ns, ?MODULE, is_remote_member, [W]) of
-			{Replies, []} ->
-			    check_active(Replies, Expl, Tab);
-			{_Replies, BadNs} ->
-			    mnesia:abort({not_active, Expl, Tab, BadNs})
-                    end;
-                false ->
-                    mnesia:abort({not_active, Expl, Tab, Ns})
-            end
-    end.
-
-ensure_not_active(schema, Node) ->
-    case lists:member(Node, val({schema, active_replicas})) of 
-	false ->
-	    ok;
-	true ->
-	    Expl = "Mnesia is running",
-	    mnesia:abort({active, Expl, Node})
-    end.
-
-is_remote_member(Key) ->
-    IsActive = lists:member(node(), val(Key)),
-    {IsActive, node()}.
-
-check_active([{true, _Node} | Replies], Expl, Tab) ->
-    check_active(Replies, Expl, Tab);
-check_active([{false, Node} | _Replies], Expl, Tab) ->
-    mnesia:abort({not_active, Expl, Tab, [Node]});
-check_active([{badrpc, Reason} | _Replies], Expl, Tab) ->
-    mnesia:abort({not_active, Expl, Tab, Reason});
-check_active([], _Expl, _Tab) ->
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Here's the real interface function to create a table
-
-create_table(TabDef) ->
-    schema_transaction(fun() -> do_multi_create_table(TabDef) end).
-
-%% And the corresponding do routines ....
-
-do_multi_create_table(TabDef) ->
-    get_tid_ts_and_lock(schema, write),
-    ensure_writable(schema),
-    Cs = list2cs(TabDef),
-    case Cs#cstruct.frag_properties of
-	[] ->
-	    do_create_table(Cs);
-	_Props ->
-	    CsList = mnesia_frag:expand_cstruct(Cs),
-	    lists:foreach(fun do_create_table/1, CsList)
-    end,
-    ok.
-
-do_create_table(Cs) ->
-    {_Mod, _Tid, Ts} =  get_tid_ts_and_lock(schema, none),
-    Store = Ts#tidstore.store,
-    do_insert_schema_ops(Store, make_create_table(Cs)).
-
-make_create_table(Cs) ->
-    Tab = Cs#cstruct.name,
-    verify('EXIT', element(1, ?catch_val({Tab, cstruct})),
-	   {already_exists, Tab}),
-    unsafe_make_create_table(Cs).
-
-% unsafe_do_create_table(Cs) ->
-%     {_Mod, Tid, Ts} =  get_tid_ts_and_lock(schema, none),
-%     Store = Ts#tidstore.store,
-%     do_insert_schema_ops(Store, unsafe_make_create_table(Cs)).
-
-unsafe_make_create_table(Cs) ->
-    {_Mod, Tid, Ts} =  get_tid_ts_and_lock(schema, none),
-    verify_cstruct(Cs),
-    Tab = Cs#cstruct.name,
-        
-    %% Check that we have all disc replica nodes running
-    DiscNodes = Cs#cstruct.disc_copies ++ Cs#cstruct.disc_only_copies,
-    RunningNodes = val({current, db_nodes}),
-    CheckDisc = fun(N) ->
-			verify(true, lists:member(N, RunningNodes),
-			       {not_active, Tab, N})
-		end,
-    lists:foreach(CheckDisc, DiscNodes),
-
-    Nodes = mnesia_lib:intersect(mnesia_lib:cs_to_nodes(Cs), RunningNodes),
-    Store = Ts#tidstore.store,
-    mnesia_locker:wlock_no_exist(Tid, Store, Tab, Nodes),
-    [{op, create_table, cs2list(Cs)}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Delete a table entirely on all nodes.
-
-delete_table(Tab) ->
-    schema_transaction(fun() -> do_delete_table(Tab) end).
-
-do_delete_table(schema) ->
-    mnesia:abort({bad_type, schema});
-do_delete_table(Tab) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    ensure_writable(schema),
-    insert_schema_ops(TidTs, make_delete_table(Tab, whole_table)).
-
-make_delete_table(Tab, Mode) ->
-    case Mode of
-	whole_table ->
-	    case val({Tab, frag_properties}) of
-		[] ->
-		    [make_delete_table2(Tab)];
-		_Props ->
-		    %% Check if it is a base table 
-		    mnesia_frag:lookup_frag_hash(Tab),
-
-		    %% Check for foreigners
-		    F = mnesia_frag:lookup_foreigners(Tab),
-		    verify([], F, {combine_error, Tab, "Too many foreigners", F}),
-		    [make_delete_table2(T) || T <- mnesia_frag:frag_names(Tab)]		    
-	    end;
-	single_frag ->
-	    [make_delete_table2(Tab)]
-    end.
-
-make_delete_table2(Tab) ->
-    get_tid_ts_and_lock(Tab, write),
-    Cs = val({Tab, cstruct}),
-    ensure_active(Cs),
-    ensure_writable(Tab),
-    {op, delete_table, cs2list(Cs)}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Change fragmentation of a table
-    
-change_table_frag(Tab, Change) ->
-    schema_transaction(fun() -> do_change_table_frag(Tab, Change) end).
-
-do_change_table_frag(Tab, Change) when atom(Tab), Tab /= schema ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    Ops = mnesia_frag:change_table_frag(Tab, Change),
-    [insert_schema_ops(TidTs, Op) || Op <- Ops],
-    ok;
-do_change_table_frag(Tab, _Change) ->
-    mnesia:abort({bad_type, Tab}).
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Clear a table
-
-clear_table(Tab) ->
-    schema_transaction(fun() -> do_clear_table(Tab) end).
-
-do_clear_table(schema) ->
-    mnesia:abort({bad_type, schema});
-do_clear_table(Tab) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    get_tid_ts_and_lock(Tab, write),
-    insert_schema_ops(TidTs, make_clear_table(Tab)).
-
-make_clear_table(Tab) ->
-    ensure_writable(schema),
-    Cs = val({Tab, cstruct}),
-    ensure_active(Cs),
-    ensure_writable(Tab),
-    [{op, clear_table, cs2list(Cs)}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-add_table_copy(Tab, Node, Storage) ->
-    schema_transaction(fun() -> do_add_table_copy(Tab, Node, Storage) end).
-
-do_add_table_copy(Tab, Node, Storage) when atom(Tab), atom(Node) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    insert_schema_ops(TidTs, make_add_table_copy(Tab, Node, Storage));
-do_add_table_copy(Tab,Node,_) ->
-    mnesia:abort({badarg, Tab, Node}).
-
-make_add_table_copy(Tab, Node, Storage) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    Ns = mnesia_lib:cs_to_nodes(Cs),
-    verify(false, lists:member(Node, Ns), {already_exists, Tab, Node}),
-    Cs2 = new_cs(Cs, Node, Storage, add),
-    verify_cstruct(Cs2),
-    
-    %% Check storage and if node is running
-    IsRunning = lists:member(Node, val({current, db_nodes})),
-    if
-	Storage == unknown ->
-	    mnesia:abort({badarg, Tab, Storage});
-	Tab == schema ->
-	    if
-		Storage /= ram_copies ->
-		    mnesia:abort({badarg, Tab, Storage});
-		IsRunning == true ->
-		    mnesia:abort({already_exists, Tab, Node});
-		true ->
-		    ignore
-	    end;
-	Storage == ram_copies ->
-	    ignore;
-	IsRunning == true ->
-	    ignore;
-	IsRunning == false ->
-	    mnesia:abort({not_active, schema, Node})
-    end,
-    [{op, add_table_copy, Storage, Node, cs2list(Cs2)}].
-
-del_table_copy(Tab, Node) ->
-    schema_transaction(fun() -> do_del_table_copy(Tab, Node) end).
-
-do_del_table_copy(Tab, Node) when atom(Node)  ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-%%    get_tid_ts_and_lock(Tab, write), 
-    insert_schema_ops(TidTs, make_del_table_copy(Tab, Node));
-do_del_table_copy(Tab, Node) ->
-    mnesia:abort({badarg, Tab, Node}).
-   
-make_del_table_copy(Tab, Node) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    Storage = mnesia_lib:schema_cs_to_storage_type(Node, Cs),
-    Cs2 = new_cs(Cs, Node, Storage, del),    
-    case mnesia_lib:cs_to_nodes(Cs2) of
-        [] when Tab == schema ->
-            mnesia:abort({combine_error, Tab, "Last replica"});
-        [] ->
-	    ensure_active(Cs),	    
-            dbg_out("Last replica deleted in table ~p~n",  [Tab]),
-            make_delete_table(Tab,  whole_table);
-        _ when Tab == schema ->
-	    ensure_active(Cs2),
-	    ensure_not_active(Tab, Node),
-            verify_cstruct(Cs2),
-	    Ops = remove_node_from_tabs(val({schema, tables}), Node),
-	    [{op, del_table_copy, ram_copies, Node, cs2list(Cs2)} | Ops];
-        _ ->
-	    ensure_active(Cs),
-            verify_cstruct(Cs2),
-            [{op, del_table_copy, Storage, Node, cs2list(Cs2)}]
-    end.
-
-remove_node_from_tabs([], _Node) ->
-    [];
-remove_node_from_tabs([schema|Rest], Node) ->
-    remove_node_from_tabs(Rest, Node);
-remove_node_from_tabs([Tab|Rest], Node) ->    
-    {Cs, IsFragModified} = 
-	mnesia_frag:remove_node(Node, incr_version(val({Tab, cstruct}))),
-    case mnesia_lib:schema_cs_to_storage_type(Node, Cs)  of
-	unknown ->
-	    case IsFragModified of
-		true ->
-		    [{op, change_table_frag, {del_node, Node}, cs2list(Cs)} | 
-		     remove_node_from_tabs(Rest, Node)];
-		false ->
-		    remove_node_from_tabs(Rest, Node)
-	    end;
-	Storage ->
-	    Cs2 = new_cs(Cs, Node, Storage, del),
-	    case mnesia_lib:cs_to_nodes(Cs2) of
-		[] ->
-		    [{op, delete_table, cs2list(Cs)} |
-		     remove_node_from_tabs(Rest, Node)];
-		_Ns ->
-		    verify_cstruct(Cs2),
-		    [{op, del_table_copy, ram_copies, Node, cs2list(Cs2)}|
-		     remove_node_from_tabs(Rest, Node)]
-	    end
-    end.
-
-new_cs(Cs, Node, ram_copies, add) ->
-    Cs#cstruct{ram_copies = opt_add(Node, Cs#cstruct.ram_copies)};
-new_cs(Cs, Node, disc_copies, add) ->
-    Cs#cstruct{disc_copies = opt_add(Node, Cs#cstruct.disc_copies)};
-new_cs(Cs, Node, disc_only_copies, add) ->
-    Cs#cstruct{disc_only_copies = opt_add(Node, Cs#cstruct.disc_only_copies)};
-new_cs(Cs, Node, ram_copies, del) ->
-    Cs#cstruct{ram_copies = lists:delete(Node , Cs#cstruct.ram_copies)};
-new_cs(Cs, Node, disc_copies, del) ->
-    Cs#cstruct{disc_copies = lists:delete(Node , Cs#cstruct.disc_copies)};
-new_cs(Cs, Node, disc_only_copies, del) ->
-    Cs#cstruct{disc_only_copies = 
-               lists:delete(Node , Cs#cstruct.disc_only_copies)};
-new_cs(Cs, _Node, Storage, _Op) ->
-    mnesia:abort({badarg, Cs#cstruct.name, Storage}).
-
-
-opt_add(N, L) -> [N | lists:delete(N, L)].
-
-move_table(Tab, FromNode, ToNode) ->
-    schema_transaction(fun() -> do_move_table(Tab, FromNode, ToNode) end).
-
-do_move_table(schema, _FromNode, _ToNode) ->
-    mnesia:abort({bad_type, schema});
-do_move_table(Tab, FromNode, ToNode) when atom(FromNode), atom(ToNode) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    insert_schema_ops(TidTs, make_move_table(Tab, FromNode, ToNode));
-do_move_table(Tab, FromNode, ToNode) ->
-    mnesia:abort({badarg, Tab, FromNode, ToNode}).
-
-make_move_table(Tab, FromNode, ToNode) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    Ns = mnesia_lib:cs_to_nodes(Cs),
-    verify(false, lists:member(ToNode, Ns), {already_exists, Tab, ToNode}),
-    verify(true, lists:member(FromNode, val({Tab, where_to_write})),
-           {not_active, Tab, FromNode}),
-    verify(false, val({Tab,local_content}),
-           {"Cannot move table with local content", Tab}),
-    ensure_active(Cs),
-    Running = val({current, db_nodes}),
-    Storage = mnesia_lib:schema_cs_to_storage_type(FromNode, Cs),
-    verify(true, lists:member(ToNode, Running), {not_active, schema, ToNode}),
-    
-    Cs2 = new_cs(Cs, ToNode, Storage, add),
-    Cs3 = new_cs(Cs2, FromNode, Storage, del),
-    verify_cstruct(Cs3),
-    [{op, add_table_copy, Storage, ToNode, cs2list(Cs2)},
-     {op, sync_trans},
-     {op, del_table_copy, Storage, FromNode, cs2list(Cs3)}].
-
-%% end of functions to add and delete nodes to tables
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-
-change_table_copy_type(Tab, Node, ToS) ->
-    schema_transaction(fun() -> do_change_table_copy_type(Tab, Node, ToS) end).
-
-do_change_table_copy_type(Tab, Node, ToS) when atom(Node) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    get_tid_ts_and_lock(Tab, write), % ensure global sync
-    %% get_tid_ts_and_lock(Tab, read),
-    insert_schema_ops(TidTs, make_change_table_copy_type(Tab, Node, ToS));
-do_change_table_copy_type(Tab, Node, _ToS) ->
-    mnesia:abort({badarg, Tab, Node}).
-
-make_change_table_copy_type(Tab, Node, unknown) ->
-    make_del_table_copy(Tab, Node);
-make_change_table_copy_type(Tab, Node, ToS) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    FromS = mnesia_lib:storage_type_at_node(Node, Tab), 
-
-    case compare_storage_type(false, FromS, ToS) of
-	{same, _} ->
-	    mnesia:abort({already_exists, Tab, Node, ToS});
-	{diff, _} ->
-	    ignore;
-	incompatible ->
-	    ensure_active(Cs)
-    end,
-
-    Cs2 = new_cs(Cs, Node, FromS, del),
-    Cs3 = new_cs(Cs2, Node, ToS, add),
-    verify_cstruct(Cs3),
-    
-    if
-	FromS == unknown ->
-	    make_add_table_copy(Tab, Node, ToS);
-	true ->
-	    ignore
-    end,
-
-    [{op, change_table_copy_type, Node, FromS, ToS, cs2list(Cs3)}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% change index functions ....
-%% Pos is allready added by 1 in both of these functions 
-
-add_table_index(Tab, Pos) ->
-    schema_transaction(fun() -> do_add_table_index(Tab, Pos) end).
-
-do_add_table_index(schema, _Attr) ->
-    mnesia:abort({bad_type, schema});
-do_add_table_index(Tab, Attr) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    get_tid_ts_and_lock(Tab, read),
-    Pos = attr_tab_to_pos(Tab, Attr),
-    insert_schema_ops(TidTs, make_add_table_index(Tab, Pos)).
-
-make_add_table_index(Tab, Pos) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    ensure_active(Cs),
-    Ix = Cs#cstruct.index,
-    verify(false, lists:member(Pos, Ix), {already_exists, Tab, Pos}),
-    Ix2 = lists:sort([Pos | Ix]),
-    Cs2 = Cs#cstruct{index = Ix2},
-    verify_cstruct(Cs2),
-    [{op, add_index, Pos, cs2list(Cs2)}].
-
-del_table_index(Tab, Pos) ->
-    schema_transaction(fun() -> do_del_table_index(Tab, Pos) end).
-
-do_del_table_index(schema, _Attr) ->
-    mnesia:abort({bad_type, schema});
-do_del_table_index(Tab, Attr) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    get_tid_ts_and_lock(Tab, read),
-    Pos = attr_tab_to_pos(Tab, Attr),
-    insert_schema_ops(TidTs, make_del_table_index(Tab, Pos)).
-
-make_del_table_index(Tab, Pos) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    ensure_active(Cs),
-    Ix = Cs#cstruct.index,
-    verify(true, lists:member(Pos, Ix), {no_exists, Tab, Pos}),
-    Cs2 = Cs#cstruct{index = lists:delete(Pos, Ix)},
-    verify_cstruct(Cs2),
-    [{op, del_index, Pos, cs2list(Cs2)}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-add_snmp(Tab, Ustruct) ->
-    schema_transaction(fun() -> do_add_snmp(Tab, Ustruct) end).
-
-do_add_snmp(schema, _Ustruct) ->
-    mnesia:abort({bad_type, schema});
-do_add_snmp(Tab, Ustruct) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    get_tid_ts_and_lock(Tab, read),
-    insert_schema_ops(TidTs, make_add_snmp(Tab, Ustruct)).
-
-make_add_snmp(Tab, Ustruct) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    ensure_active(Cs),
-    verify([], Cs#cstruct.snmp, {already_exists, Tab, snmp}),
-    Error = {badarg, Tab, snmp, Ustruct},
-    verify(true, mnesia_snmp_hook:check_ustruct(Ustruct), Error),
-    Cs2 = Cs#cstruct{snmp = Ustruct},
-    verify_cstruct(Cs2),
-    [{op, add_snmp, Ustruct, cs2list(Cs2)}].
-
-del_snmp(Tab) ->
-    schema_transaction(fun() -> do_del_snmp(Tab) end).
-
-do_del_snmp(schema) ->
-    mnesia:abort({bad_type, schema});
-do_del_snmp(Tab) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    get_tid_ts_and_lock(Tab, read),
-    insert_schema_ops(TidTs, make_del_snmp(Tab)).
-
-make_del_snmp(Tab) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    ensure_active(Cs),
-    Cs2 = Cs#cstruct{snmp = []},
-    verify_cstruct(Cs2),
-    [{op, del_snmp, cs2list(Cs2)}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
-
-transform_table(Tab, Fun, NewAttrs, NewRecName) 
-  when function(Fun), list(NewAttrs), atom(NewRecName) -> 
-    schema_transaction(fun() -> do_transform_table(Tab, Fun, NewAttrs, NewRecName) end);
-
-transform_table(Tab, ignore, NewAttrs, NewRecName) 
-  when list(NewAttrs), atom(NewRecName) -> 
-    schema_transaction(fun() -> do_transform_table(Tab, ignore, NewAttrs, NewRecName) end);
-
-transform_table(Tab, Fun, NewAttrs, NewRecName) ->
-    {aborted,{bad_type, Tab, Fun, NewAttrs, NewRecName}}.
-
-do_transform_table(schema, _Fun, _NewAttrs, _NewRecName) ->
-    mnesia:abort({bad_type, schema});
-do_transform_table(Tab, Fun, NewAttrs, NewRecName) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    get_tid_ts_and_lock(Tab, write),
-    insert_schema_ops(TidTs, make_transform(Tab, Fun, NewAttrs, NewRecName)).
-
-make_transform(Tab, Fun, NewAttrs, NewRecName) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    ensure_active(Cs),
-    ensure_writable(Tab),
-    case mnesia_lib:val({Tab, index}) of
-	[] -> 
-	    Cs2 = Cs#cstruct{attributes = NewAttrs, record_name = NewRecName},
-	    verify_cstruct(Cs2),
-	    [{op, transform, Fun, cs2list(Cs2)}];
-	PosList ->
-	    DelIdx = fun(Pos, Ncs) ->
-			     Ix = Ncs#cstruct.index,
-			     Ncs1 = Ncs#cstruct{index = lists:delete(Pos, Ix)},
-			     Op = {op, del_index, Pos, cs2list(Ncs1)},
-			     {Op, Ncs1}
-		     end,
-	    AddIdx = fun(Pos, Ncs) ->
-			     Ix = Ncs#cstruct.index,
-			     Ix2 = lists:sort([Pos | Ix]),
-			     Ncs1 = Ncs#cstruct{index = Ix2},
-			     Op = {op, add_index, Pos, cs2list(Ncs1)},
-			     {Op, Ncs1}
-		     end,
-            {DelOps, Cs1} = lists:mapfoldl(DelIdx, Cs, PosList),
-	    Cs2 = Cs1#cstruct{attributes = NewAttrs, record_name = NewRecName},
-            {AddOps, Cs3} = lists:mapfoldl(AddIdx, Cs2, PosList),
-	    verify_cstruct(Cs3),
-	    lists:flatten([DelOps, {op, transform, Fun, cs2list(Cs2)}, AddOps])
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
-
-change_table_access_mode(Tab, Mode) ->
-    schema_transaction(fun() -> do_change_table_access_mode(Tab, Mode) end).
-
-do_change_table_access_mode(Tab, Mode) ->
-    {_Mod, Tid, Ts} = get_tid_ts_and_lock(schema, write),
-    Store = Ts#tidstore.store,
-    mnesia_locker:wlock_no_exist(Tid, Store, schema, val({schema, active_replicas})),
-    mnesia_locker:wlock_no_exist(Tid, Store, Tab, val({Tab, active_replicas})),
-    do_insert_schema_ops(Store, make_change_table_access_mode(Tab, Mode)).
-
-make_change_table_access_mode(Tab, Mode) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    ensure_active(Cs),
-    OldMode = Cs#cstruct.access_mode,
-    verify(false, OldMode ==  Mode, {already_exists, Tab, Mode}),
-    Cs2 = Cs#cstruct{access_mode = Mode},
-    verify_cstruct(Cs2),
-    [{op, change_table_access_mode, cs2list(Cs2), OldMode, Mode}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-change_table_load_order(Tab, LoadOrder) ->
-    schema_transaction(fun() -> do_change_table_load_order(Tab, LoadOrder) end).
-
-do_change_table_load_order(schema, _LoadOrder) ->
-    mnesia:abort({bad_type, schema});
-do_change_table_load_order(Tab, LoadOrder) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    get_tid_ts_and_lock(Tab, none),
-    insert_schema_ops(TidTs, make_change_table_load_order(Tab, LoadOrder)).
-
-make_change_table_load_order(Tab, LoadOrder) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    ensure_active(Cs),
-    OldLoadOrder = Cs#cstruct.load_order,
-    Cs2 = Cs#cstruct{load_order = LoadOrder},
-    verify_cstruct(Cs2),
-    [{op, change_table_load_order, cs2list(Cs2), OldLoadOrder, LoadOrder}].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-write_table_property(Tab, Prop) when tuple(Prop), size(Prop) >= 1 ->
-    schema_transaction(fun() -> do_write_table_property(Tab, Prop) end);
-write_table_property(Tab, Prop) ->
-    {aborted, {bad_type, Tab, Prop}}.
-do_write_table_property(Tab, Prop) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    {_, _, Ts} = TidTs,
-    Store = Ts#tidstore.store,
-    case change_prop_in_existing_op(Tab, Prop, write_property, Store) of
-	true ->
-	    dbg_out("change_prop_in_existing_op"
-		    "(~p,~p,write_property,Store) -> true~n",
-		    [Tab,Prop]),
-	    %% we have merged the table prop into the create_table op
-	    ok;
-	false ->
-	    dbg_out("change_prop_in_existing_op"
-		    "(~p,~p,write_property,Store) -> false~n",
-		    [Tab,Prop]),
-	    %% this must be an existing table
-	    get_tid_ts_and_lock(Tab, none),
-	    insert_schema_ops(TidTs, make_write_table_properties(Tab, [Prop]))
-    end.
-
-make_write_table_properties(Tab, Props) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    ensure_active(Cs),
-    make_write_table_properties(Tab, Props, Cs).
-
-make_write_table_properties(Tab, [Prop | Props], Cs) ->
-    OldProps = Cs#cstruct.user_properties,
-    PropKey = element(1, Prop),
-    DelProps = lists:keydelete(PropKey, 1, OldProps),
-    MergedProps = lists:merge(DelProps, [Prop]),
-    Cs2 = Cs#cstruct{user_properties = MergedProps},
-    verify_cstruct(Cs2),
-    [{op, write_property, cs2list(Cs2), Prop} |
-     make_write_table_properties(Tab, Props, Cs2)];
-make_write_table_properties(_Tab, [], _Cs) ->
-    [].
-
-change_prop_in_existing_op(Tab, Prop, How, Store) ->
-    Ops = ets:match_object(Store, '_'),
-    case update_existing_op(Ops, Tab, Prop, How, []) of
-	{true, Ops1} ->
-	    ets:match_delete(Store, '_'),
-	    [ets:insert(Store, Op) || Op <- Ops1],
-	    true;
-	false ->
-	    false
-    end.
- 
-update_existing_op([{op, Op, L = [{name,Tab}|_], _OldProp}|Ops], 
-		   Tab, Prop, How, Acc) when Op == write_property; 
-					     Op == delete_property ->
-    %% Apparently, mnesia_dumper doesn't care about OldProp here -- just L,
-    %% so we will throw away OldProp (not that it matters...) and insert Prop.
-    %% as element 3.
-    L1 = insert_prop(Prop, L, How),
-    NewOp = {op, How, L1, Prop},
-    {true, lists:reverse(Acc) ++ [NewOp|Ops]};
-update_existing_op([Op = {op, create_table, L}|Ops], Tab, Prop, How, Acc) ->
-    case lists:keysearch(name, 1, L) of
-	{value, {_, Tab}} ->
-	    %% Tab is being created here -- insert Prop into L
-	    L1 = insert_prop(Prop, L, How),
-	    {true, lists:reverse(Acc) ++ [{op, create_table, L1}|Ops]};
-	_ ->
-	    update_existing_op(Ops, Tab, Prop, How, [Op|Acc])
-    end;
-update_existing_op([Op|Ops], Tab, Prop, How, Acc) ->
-    update_existing_op(Ops, Tab, Prop, How, [Op|Acc]);
-update_existing_op([], _, _, _, _) ->
-    false.
- 
-%% perhaps a misnomer. How could also be delete_property... never mind.
-%% Returns the modified L.
-insert_prop(Prop, L, How) ->
-    Prev = find_props(L),
-    MergedProps = merge_with_previous(How, Prop, Prev),
-    replace_props(L, MergedProps).
-
-
-find_props([{user_properties, P}|_]) -> P;
-find_props([_H|T]) -> find_props(T).
-%% we shouldn't reach []
-
-replace_props([{user_properties, _}|T], P) -> [{user_properties, P}|T];
-replace_props([H|T], P) -> [H|replace_props(T, P)].
-%% again, we shouldn't reach []
-
-merge_with_previous(write_property, Prop, Prev) ->
-    Key = element(1, Prop),
-    Prev1 = lists:keydelete(Key, 1, Prev),
-    lists:sort([Prop|Prev1]);
-merge_with_previous(delete_property, PropKey, Prev) ->
-    lists:keydelete(PropKey, 1, Prev).
-
-delete_table_property(Tab, PropKey) ->
-    schema_transaction(fun() -> do_delete_table_property(Tab, PropKey) end).
-
-do_delete_table_property(Tab, PropKey) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    {_, _, Ts} = TidTs,
-    Store = Ts#tidstore.store,
-    case change_prop_in_existing_op(Tab, PropKey, delete_property, Store) of
-	true ->
-	    dbg_out("change_prop_in_existing_op"
-		    "(~p,~p,delete_property,Store) -> true~n",
-		    [Tab,PropKey]),
-	    %% we have merged the table prop into the create_table op
-	    ok;
-	false ->
-	    dbg_out("change_prop_in_existing_op"
-		    "(~p,~p,delete_property,Store) -> false~n",
-		    [Tab,PropKey]),
-	    %% this must be an existing table
-	    get_tid_ts_and_lock(Tab, none),
-	    insert_schema_ops(TidTs, 
-			      make_delete_table_properties(Tab, [PropKey]))
-    end.
-
-make_delete_table_properties(Tab, PropKeys) ->
-    ensure_writable(schema),
-    Cs = incr_version(val({Tab, cstruct})),
-    ensure_active(Cs),
-    make_delete_table_properties(Tab, PropKeys, Cs).
-
-make_delete_table_properties(Tab, [PropKey | PropKeys], Cs) ->
-    OldProps = Cs#cstruct.user_properties,
-    Props = lists:keydelete(PropKey, 1, OldProps),
-    Cs2 = Cs#cstruct{user_properties = Props},
-    verify_cstruct(Cs2),
-    [{op, delete_property, cs2list(Cs2), PropKey} |
-     make_delete_table_properties(Tab, PropKeys, Cs2)];
-make_delete_table_properties(_Tab, [], _Cs) ->
-    [].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% Ensure that the transaction can be committed even 
-%% if the node crashes and Mnesia is restarted
-prepare_commit(Tid, Commit, WaitFor) ->
-    case Commit#commit.schema_ops of
-	[] ->
-	    {false, Commit, optional};
-	OrigOps ->
-	    {Modified, Ops, DumperMode} = 
-		prepare_ops(Tid, OrigOps, WaitFor, false, [], optional),
-	    InitBy = schema_prepare,
-	    GoodRes = {Modified, 
-		       Commit#commit{schema_ops = lists:reverse(Ops)},
-		       DumperMode},
-	    case DumperMode of
-		optional ->
-		    dbg_out("Transaction log dump skipped (~p): ~w~n",
-			    [DumperMode, InitBy]);
-		mandatory ->
-		    case mnesia_controller:sync_dump_log(InitBy) of
-			dumped ->
-			    GoodRes;
-			{error, Reason} ->
-			    mnesia:abort(Reason)
-		    end
-	    end,
-	    case Ops of
-		[] -> 
-		    ignore;
-		_ ->
-		    %% We need to grab a dumper lock here, the log may not
-		    %% be dumped by others, during the schema commit phase.
-		    mnesia_controller:wait_for_schema_commit_lock()
-	    end,
-	    GoodRes
-    end.
-
-prepare_ops(Tid, [Op | Ops], WaitFor, Changed, Acc, DumperMode) ->
-    case prepare_op(Tid, Op, WaitFor) of
-        {true, mandatory} -> 
-	    prepare_ops(Tid, Ops, WaitFor, Changed, [Op | Acc], mandatory);
-        {true, optional} -> 
-	    prepare_ops(Tid, Ops, WaitFor, Changed, [Op | Acc], DumperMode);
-        {true, Ops2, mandatory} -> 
-	    prepare_ops(Tid, Ops, WaitFor, true, Ops2 ++ Acc, mandatory);
-        {true, Ops2, optional} -> 
-	    prepare_ops(Tid, Ops, WaitFor, true, Ops2 ++ Acc, DumperMode);
-	{false, mandatory} -> 
-	    prepare_ops(Tid, Ops, WaitFor, true, Acc, mandatory);
-	{false, optional} -> 
-	    prepare_ops(Tid, Ops, WaitFor, true, Acc, DumperMode)
-    end;
-prepare_ops(_Tid, [], _WaitFor, Changed, Acc, DumperMode) ->
-    {Changed, Acc, DumperMode}.
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Prepare for commit
-%% returns true if Op should be included, i.e. unmodified
-%%         {true, Operation} if NewRecs should be included, i.e. modified
-%%         false if Op should NOT be included, i.e. modified
-%%
-prepare_op(_Tid, {op, rec, unknown, Rec}, _WaitFor) ->
-    {{Tab, Key}, Items, _Op} = Rec,
-    case val({Tab, storage_type}) of
-        unknown ->
-            {false, optional};
-        Storage ->
-            mnesia_tm:prepare_snmp(Tab, Key, Items), % May exit
-            {true, [{op, rec, Storage, Rec}], optional}
-    end;
-
-prepare_op(_Tid, {op, announce_im_running, _Node, SchemaDef, Running, RemoteRunning}, _WaitFor) ->
-    SchemaCs = list2cs(SchemaDef),
-    case lists:member(node(), Running) of
-        true ->
-            announce_im_running(RemoteRunning -- Running, SchemaCs);
-        false ->
-            announce_im_running(Running -- RemoteRunning, SchemaCs)
-    end,
-    {false, optional};
-
-prepare_op(_Tid, {op, sync_trans}, {part, CoordPid}) ->    
-    CoordPid ! {sync_trans, self()},
-    receive 
-	{sync_trans, CoordPid} ->
-	    {false, optional};
-	Else ->
-	    mnesia_lib:verbose("sync_op terminated due to ~p~n", [Else]),
-	    mnesia:abort(Else)
-    end;
-
-prepare_op(_Tid, {op, sync_trans}, {coord, Nodes}) ->    
-    case receive_sync(Nodes, []) of
-	{abort, Reason} ->
-	    mnesia_lib:verbose("sync_op terminated due to ~p~n", [Reason]),
-	    mnesia:abort(Reason);
-	Pids ->
-	    [Pid ! {sync_trans, self()} || Pid <- Pids],
-	    {false, optional}
-    end;
-prepare_op(Tid, {op, create_table, TabDef}, _WaitFor) ->
-    Cs = list2cs(TabDef),
-    Storage = mnesia_lib:cs_to_storage_type(node(), Cs),
-    UseDir = mnesia_monitor:use_dir(),
-    Tab = Cs#cstruct.name,
-    case Storage of
-        disc_copies when UseDir == false ->
-	    UseDirReason = {bad_type, Tab, Storage, node()},
-            mnesia:abort(UseDirReason);
-        disc_only_copies when UseDir == false ->
-	    UseDirReason = {bad_type, Tab, Storage, node()},
-            mnesia:abort(UseDirReason);
-	ram_copies ->
-	    create_ram_table(Tab, Cs#cstruct.type),
-	    insert_cstruct(Tid, Cs, false),
-	    {true, optional};
-	disc_copies ->
-	    create_ram_table(Tab, Cs#cstruct.type),
-	    create_disc_table(Tab),
-	    insert_cstruct(Tid, Cs, false),
-	    {true, optional};	
-	disc_only_copies ->
-	    create_disc_only_table(Tab,Cs#cstruct.type),
-	    insert_cstruct(Tid, Cs, false),
-	    {true, optional};
-        unknown -> %% No replica on this node
-	    insert_cstruct(Tid, Cs, false),
-            {true, optional}
-    end;
-
-prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}, _WaitFor) ->
-    Cs = list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-
-    if
-	Tab == schema ->
-	    {true, optional}; % Nothing to prepare
-	Node == node() ->
-	    case mnesia_lib:val({schema, storage_type}) of 
-		ram_copies when Storage /= ram_copies -> 
-		    Error = {combine_error, Tab, "has no disc", Node},
-		    mnesia:abort(Error);
-		_  ->
-		    ok
-	    end,   
-	    %% Tables are created by mnesia_loader get_network code
-	    insert_cstruct(Tid, Cs, true),
-	    case mnesia_controller:get_network_copy(Tab, Cs) of
-		{loaded, ok} ->
-		    {true, optional};
-		{not_loaded, ErrReason} ->
-		    Reason = {system_limit, Tab, {Node, ErrReason}},
-		    mnesia:abort(Reason)
-	    end;
-	Node /= node() ->
-	    %% Verify that ram table not has been dumped to disc
-	    if
-		Storage /= ram_copies ->
-		    case mnesia_lib:schema_cs_to_storage_type(node(), Cs) of
-			ram_copies ->
-			    Dat = mnesia_lib:tab2dcd(Tab),
-			    case mnesia_lib:exists(Dat) of
-				true ->
-				    mnesia:abort({combine_error, Tab, Storage,
-						  "Table dumped to disc", node()});
-				false ->
-				    ok
-			    end;
-			_ ->
-			    ok
-		    end;
-		true ->
-		    ok
-	    end,
-	    insert_cstruct(Tid, Cs, true),
-	    {true, optional}
-    end;
-
-prepare_op(Tid, {op, del_table_copy, _Storage, Node, TabDef}, _WaitFor) ->
-    Cs = list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    
-    if
-	%% Schema table lock is always required to run a schema op.
-	%% No need to look it.
-	node(Tid#tid.pid) == node(), Tab /= schema -> 
-	    Pid = spawn_link(?MODULE, lock_del_table, [Tab, Node, Cs, self()]),
-	    receive 
-		{Pid, updated} -> 
-		    {true, optional};
-		{Pid, FailReason} ->
-		    mnesia:abort(FailReason);
-		{'EXIT', Pid, Reason} ->
-		    mnesia:abort(Reason)
-	    end;	
-	true ->
-	    {true, optional}
-    end;
-
-prepare_op(_Tid, {op, change_table_copy_type,  N, FromS, ToS, TabDef}, _WaitFor)
-  when N == node() ->
-    Cs = list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-
-    NotActive = mnesia_lib:not_active_here(Tab),
-    
-    if 
-	NotActive == true ->
-	    mnesia:abort({not_active, Tab, node()});
-	
-	Tab == schema ->	    
-	    case {FromS, ToS} of
-		{ram_copies, disc_copies} ->
-		    case mnesia:system_info(schema_location) of
-			opt_disc ->
-			    ignore;
-			_ ->
-			    mnesia:abort({combine_error,  Tab, node(),
-					  "schema_location must be opt_disc"})
-		    end,
-		    Dir = mnesia_lib:dir(),    
-		    case opt_create_dir(true, Dir) of
-			ok ->
-			    purge_dir(Dir, []),
-			    mnesia_log:purge_all_logs(),
-			    set(use_dir, true),
-			    mnesia_log:init(),
-			    Ns = val({current, db_nodes}), %mnesia_lib:running_nodes(),
-			    F = fun(U) -> mnesia_recover:log_mnesia_up(U) end,
-			    lists:foreach(F, Ns),
-
-			    mnesia_dumper:raw_named_dump_table(Tab, dmp),
-			    mnesia_checkpoint:tm_change_table_copy_type(Tab, FromS, ToS);
-			{error, Reason} ->
-			    mnesia:abort(Reason)
-		    end;
-		{disc_copies, ram_copies} ->
-		    Ltabs = val({schema, local_tables}) -- [schema],
-		    Dtabs = [L || L <- Ltabs,
-				  val({L, storage_type}) /= ram_copies],
-		    verify([], Dtabs, {"Disc resident tables", Dtabs, N});
-		_ ->
-		    mnesia:abort({combine_error, Tab, ToS})
-	    end;
-	
-	FromS == ram_copies ->	    
-	    case mnesia_monitor:use_dir() of
-		true -> 
-		    Dat = mnesia_lib:tab2dcd(Tab),
-		    case mnesia_lib:exists(Dat) of
-			true ->
-			    mnesia:abort({combine_error, Tab, node(),
-					  "Table dump exists"});
-			false ->
-			    case ToS of 
-				disc_copies -> 
-				    mnesia_log:ets2dcd(Tab, dmp);
-				disc_only_copies ->
-				    mnesia_dumper:raw_named_dump_table(Tab, dmp)
-			    end,
-			    mnesia_checkpoint:tm_change_table_copy_type(Tab, FromS, ToS)
-		    end;
-		false ->
-		    mnesia:abort({has_no_disc, node()})
-	    end;
-	
-	FromS == disc_copies, ToS == disc_only_copies ->
-	    mnesia_dumper:raw_named_dump_table(Tab, dmp);
-	FromS == disc_only_copies ->
-	    Type = Cs#cstruct.type,
-	    create_ram_table(Tab, Type),
-	    Datname = mnesia_lib:tab2dat(Tab),
-	    Repair = mnesia_monitor:get_env(auto_repair),
-	    case mnesia_lib:dets_to_ets(Tab, Tab, Datname, Type, Repair, no) of
-		loaded -> ok;
-		Reason ->
-		    Err = "Failed to copy disc data to ram",
-		    mnesia:abort({system_limit, Tab, {Err,Reason}})
-	    end;
-	true ->
-	    ignore
-    end,
-    {true, mandatory};
-
-prepare_op(_Tid, {op, change_table_copy_type,  N, _FromS, _ToS, _TabDef}, _WaitFor)
-  when N /= node() ->
-    {true, mandatory};
-
-prepare_op(_Tid, {op, delete_table, _TabDef}, _WaitFor) ->
-    {true, mandatory};
-
-prepare_op(_Tid, {op, dump_table, unknown, TabDef}, _WaitFor) ->
-    Cs = list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    case lists:member(node(), Cs#cstruct.ram_copies) of
-        true ->
-	    case mnesia_monitor:use_dir() of
-		true -> 
-		    mnesia_log:ets2dcd(Tab, dmp),
-		    Size = mnesia:table_info(Tab, size),
-		    {true, [{op, dump_table, Size, TabDef}], optional};
-		false ->
-		    mnesia:abort({has_no_disc, node()})
-	    end;
-        false ->
-            {false, optional}
-    end;
-
-prepare_op(_Tid, {op, add_snmp, Ustruct, TabDef}, _WaitFor) ->
-    Cs = list2cs(TabDef),
-    case mnesia_lib:cs_to_storage_type(node(), Cs) of
-        unknown ->
-            {true, optional};
-        Storage ->
-            Tab = Cs#cstruct.name,
-            Stab = mnesia_snmp_hook:create_table(Ustruct, Tab, Storage),
-            mnesia_lib:set({Tab, {index, snmp}}, Stab),
-            {true, optional}
-    end;
-
-prepare_op(_Tid, {op, transform, ignore, _TabDef}, _WaitFor) ->
-    {true, mandatory};   %% Apply schema changes only.
-prepare_op(_Tid, {op, transform, Fun, TabDef}, _WaitFor) ->
-    Cs = list2cs(TabDef),
-    case mnesia_lib:cs_to_storage_type(node(), Cs) of
-        unknown ->
-            {true, mandatory};
-        Storage ->
-            Tab = Cs#cstruct.name,
-            RecName = Cs#cstruct.record_name,
-	    Type = Cs#cstruct.type,
-            NewArity = length(Cs#cstruct.attributes) + 1,
-	    mnesia_lib:db_fixtable(Storage, Tab, true),
-            Key = mnesia_lib:db_first(Tab),
-	    Op = {op, transform, Fun, TabDef},
-            case catch transform_objs(Fun, Tab, RecName, 
-				      Key, NewArity, Storage, Type, [Op]) of
-                {'EXIT', Reason} ->
-		    mnesia_lib:db_fixtable(Storage, Tab, false),
-                    exit({"Bad transform function", Tab, Fun, node(), Reason});
-                Objs ->
-		    mnesia_lib:db_fixtable(Storage, Tab, false),
-                    {true, Objs, mandatory}
-            end
-    end;
-
-prepare_op(_Tid, _Op, _WaitFor) ->
-    {true, optional}.
-
-
-create_ram_table(Tab, Type) ->
-    Args = [{keypos, 2}, public, named_table, Type],
-    case mnesia_monitor:unsafe_mktab(Tab, Args) of
-	Tab ->
-	    ok;
-	{error,Reason} ->
-	    Err = "Failed to create ets table",
-	    mnesia:abort({system_limit, Tab, {Err,Reason}})
-    end.
-create_disc_table(Tab) ->
-    File = mnesia_lib:tab2dcd(Tab),
-    file:delete(File),
-    FArg = [{file, File}, {name, {mnesia,create}}, 
-	    {repair, false}, {mode, read_write}],
-    case mnesia_monitor:open_log(FArg) of
-	{ok,Log} ->
-	    mnesia_monitor:unsafe_close_log(Log),
-	    ok;
-	{error,Reason} ->
-	    Err = "Failed to create disc table",
-	    mnesia:abort({system_limit, Tab, {Err,Reason}})
-    end.
-create_disc_only_table(Tab,Type) ->
-    File = mnesia_lib:tab2dat(Tab),
-    file:delete(File),
-    Args = [{file, mnesia_lib:tab2dat(Tab)},
-	    {type, mnesia_lib:disk_type(Tab, Type)},
-	    {keypos, 2},
-	    {repair, mnesia_monitor:get_env(auto_repair)}],
-    case mnesia_monitor:unsafe_open_dets(Tab, Args) of
-	{ok, _} ->
-	    ok;
-	{error,Reason} ->
-	    Err = "Failed to create disc table",
-	    mnesia:abort({system_limit, Tab, {Err,Reason}})
-    end.
-
-
-receive_sync([], Pids) ->
-    Pids;
-receive_sync(Nodes, Pids) ->
-    receive
-	{sync_trans, Pid} ->
-	    Node = node(Pid),	    
-	    receive_sync(lists:delete(Node, Nodes), [Pid | Pids]);
-	Else ->
-	    {abort, Else}
-    end.
-
-lock_del_table(Tab, Node, Cs, Father) ->
-    Ns = val({schema, active_replicas}),
-    Lock = fun() ->
-		   mnesia:write_lock_table(Tab),
-		   {Res, []} = rpc:multicall(Ns, ?MODULE, set_where_to_read, [Tab, Node, Cs]),
-		   Filter = fun(ok) ->
-				    false;
-			       ({badrpc, {'EXIT', {undef, _}}}) ->
-				    %% This will be the case we talks with elder nodes
-				    %% than 3.8.2, they will set where_to_read without 
-				    %% getting a lock. 
-				    false;
-			       (_) ->
-				    true
-			    end,
-		   [] = lists:filter(Filter, Res),
-		   ok
-	   end,    
-    case mnesia:transaction(Lock) of
-	{'atomic', ok} ->
-	    Father ! {self(), updated};
-	{aborted, R} ->
-	    Father ! {self(), R}
-    end,
-    unlink(Father),
-    exit(normal).
-
-set_where_to_read(Tab, Node, Cs) ->
-    case mnesia_lib:val({Tab, where_to_read}) of 
-	Node ->
-	    case Cs#cstruct.local_content of
-		true ->
-		    ok;
-		false ->
-		    mnesia_lib:set_remote_where_to_read(Tab, [Node]),
-		    ok
-	    end;
-	_ ->
-	    ok
-    end.
-
-%% Build up the list in reverse order.
-transform_objs(_Fun, _Tab, _RT, '$end_of_table', _NewArity, _Storage, _Type, Acc) ->
-    Acc;
-transform_objs(Fun, Tab, RecName, Key, A, Storage, Type, Acc) ->
-    Objs = mnesia_lib:db_get(Tab, Key),
-    NextKey = mnesia_lib:db_next_key(Tab, Key),
-    Oid = {Tab, Key},   
-    NewObjs = {Ws, Ds} = transform_obj(Tab, RecName, Key, Fun, Objs, A, Type, [], []),
-    if 
-	NewObjs == {[], []} -> 
-	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type, Acc);
-	Type == bag ->	    
-	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
-			   [{op, rec, Storage, {Oid, Ws, write}},
-			    {op, rec, Storage, {Oid, [Oid], delete}} | Acc]);
-	Ds == [] -> 
-	    %% Type is set or ordered_set, no need to delete the record first
-	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
-			   [{op, rec, Storage, {Oid, Ws, write}} | Acc]);
-	Ws == [] ->
-	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
-			   [{op, rec, Storage, {Oid, Ds, write}} | Acc]);
-	true ->
-	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
-			   [{op, rec, Storage, {Oid, Ws, write}},
-			    {op, rec, Storage, {Oid, Ds, delete}} | Acc])
-    end.
-
-transform_obj(Tab, RecName, Key, Fun, [Obj|Rest], NewArity, Type, Ws, Ds) ->
-    NewObj = Fun(Obj),
-    if
-        size(NewObj) /= NewArity ->
-            exit({"Bad arity", Obj, NewObj});
-	NewObj == Obj ->
-	    transform_obj(Tab, RecName, Key, Fun, Rest, NewArity, Type, Ws, Ds);
-        RecName == element(1, NewObj), Key == element(2, NewObj) ->
-            transform_obj(Tab, RecName, Key, Fun, Rest, NewArity, 
-			  Type, [NewObj | Ws], Ds);
-	NewObj == delete -> 
-	    case Type of 
-		bag -> %% Just don't write that object
-		   transform_obj(Tab, RecName, Key, Fun, Rest, 
-				 NewArity, Type, Ws, Ds); 
-		_ ->
-		    transform_obj(Tab, RecName, Key, Fun, Rest, NewArity, 
-				  Type, Ws, [NewObj | Ds])
-	    end;
-        true ->
-            exit({"Bad key or Record Name", Obj, NewObj})
-    end;
-transform_obj(_Tab, _RecName, _Key, _Fun, [], _NewArity, _Type, Ws, Ds) ->
-    {lists:reverse(Ws), lists:reverse(Ds)}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Undo prepare of commit
-undo_prepare_commit(Tid, Commit) ->
-    case Commit#commit.schema_ops of
-	[] ->
-	    ignore;
-	Ops ->
-	    %% Catch to allow failure mnesia_controller may not be started
-	    catch mnesia_controller:release_schema_commit_lock(),
-	    undo_prepare_ops(Tid, Ops)
-    end,
-    Commit.
-
-%% Undo in reverse order
-undo_prepare_ops(Tid, [Op | Ops]) ->
-    case element(1, Op) of	
-	TheOp when TheOp /= op, TheOp /= restore_op ->
-	    undo_prepare_ops(Tid, Ops);
-	_ ->
-	    undo_prepare_ops(Tid, Ops),
-	    undo_prepare_op(Tid, Op)
-    end;
-undo_prepare_ops(_Tid, []) ->
-    [].
-
-undo_prepare_op(_Tid, {op, announce_im_running, _, _, Running, RemoteRunning}) ->
-    case lists:member(node(), Running) of
-        true ->
-            unannounce_im_running(RemoteRunning -- Running);
-        false ->
-            unannounce_im_running(Running -- RemoteRunning)
-    end;
-
-undo_prepare_op(_Tid, {op, sync_trans}) ->
-    ok;
-
-undo_prepare_op(Tid, {op, create_table, TabDef}) ->
-    Cs = list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    mnesia_lib:unset({Tab, create_table}),
-    delete_cstruct(Tid, Cs),
-    case mnesia_lib:cs_to_storage_type(node(), Cs) of
-	unknown -> 
-	    ok;
-	ram_copies ->
-	    ram_delete_table(Tab, ram_copies);
-	disc_copies ->
-	    ram_delete_table(Tab, disc_copies),
-	    DcdFile = mnesia_lib:tab2dcd(Tab),
-	    %%	    disc_delete_table(Tab, Storage),
-	    file:delete(DcdFile);
-	disc_only_copies ->
-	    mnesia_monitor:unsafe_close_dets(Tab),
-	    Dat = mnesia_lib:tab2dat(Tab),
-	    %%	    disc_delete_table(Tab, Storage),
-	    file:delete(Dat)
-    end;
-	    
-undo_prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}) ->
-    Cs = list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    if
-	Tab == schema ->
-	    true; % Nothing to prepare
-	Node == node() ->
-	    mnesia_checkpoint:tm_del_copy(Tab, Node),
-	    mnesia_controller:unannounce_add_table_copy(Tab, Node),
-	    if
-		Storage == disc_only_copies; Tab == schema ->
-		    mnesia_monitor:close_dets(Tab),
-		    file:delete(mnesia_lib:tab2dat(Tab));
-		true ->
-		    file:delete(mnesia_lib:tab2dcd(Tab))
-	    end,
-	    ram_delete_table(Tab, Storage),
-	    Cs2 = new_cs(Cs, Node, Storage, del),
-	    insert_cstruct(Tid, Cs2, true); % Don't care about the version
-	Node /= node() ->
-	    mnesia_controller:unannounce_add_table_copy(Tab, Node),
-	    Cs2 = new_cs(Cs, Node, Storage, del),
-	    insert_cstruct(Tid, Cs2, true) % Don't care about the version
-    end;
-    
-undo_prepare_op(_Tid, {op, del_table_copy, _, Node, TabDef}) 
-  when Node == node() ->
-    Cs = list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    mnesia_lib:set({Tab, where_to_read}, Node);
-
-
-undo_prepare_op(_Tid, {op, change_table_copy_type, N, FromS, ToS, TabDef}) 
-        when N == node() ->
-    Cs = list2cs(TabDef),
-    Tab = Cs#cstruct.name,
-    mnesia_checkpoint:tm_change_table_copy_type(Tab, ToS, FromS),
-    Dmp = mnesia_lib:tab2dmp(Tab),
-    
-    case {FromS, ToS} of
-        {ram_copies, disc_copies} when Tab == schema ->
-            file:delete(Dmp),
-            mnesia_log:purge_some_logs(),
-	    set(use_dir, false);
-	{ram_copies, disc_copies} ->
-	    file:delete(Dmp);
-	{ram_copies, disc_only_copies} ->
-	    file:delete(Dmp);
-	{disc_only_copies, _} ->
-	    ram_delete_table(Tab, ram_copies);
-	_ ->
-	    ignore
-    end;
-
-undo_prepare_op(_Tid, {op, dump_table, _Size, TabDef}) ->
-    Cs = list2cs(TabDef),
-    case lists:member(node(), Cs#cstruct.ram_copies) of
-	true ->
-	    Tab = Cs#cstruct.name,
-	    Dmp = mnesia_lib:tab2dmp(Tab),
-	    file:delete(Dmp);
-	false ->
-	    ignore
-    end;
-
-undo_prepare_op(_Tid, {op, add_snmp, _Ustruct, TabDef}) ->
-    Cs = list2cs(TabDef),
-    case mnesia_lib:cs_to_storage_type(node(), Cs) of
-	unknown ->
-	    true;
-	_Storage ->
-	    Tab = Cs#cstruct.name,
-	    case ?catch_val({Tab, {index, snmp}}) of
-		{'EXIT',_} ->
-		    ignore;
-		Stab ->
-		    mnesia_snmp_hook:delete_table(Tab, Stab),
-		    mnesia_lib:unset({Tab, {index, snmp}})
-	    end
-    end;
-
-undo_prepare_op(_Tid, _Op) ->
-    ignore.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-ram_delete_table(Tab, Storage) ->
-    case Storage of
-	unknown ->
-	    ignore;
-	disc_only_copies ->
-	    ignore;
-	_Else -> 
-	    %% delete possible index files and data .....
-	    %% Got to catch this since if no info has been set in the 
-	    %% mnesia_gvar it will crash
-	    catch mnesia_index:del_transient(Tab, Storage),
-	    case ?catch_val({Tab, {index, snmp}}) of
-		{'EXIT', _} ->
-		    ignore;
-		Etab ->
-		    catch mnesia_snmp_hook:delete_table(Tab, Etab)
-	    end,
-	    catch ?ets_delete_table(Tab)
-    end.
-
-purge_dir(Dir, KeepFiles) ->
-    Suffixes = known_suffixes(),
-    purge_dir(Dir, KeepFiles, Suffixes).
-
-purge_dir(Dir, KeepFiles, Suffixes) ->
-    case dir_exists(Dir) of
-	true ->
-	    {ok, AllFiles} = file:list_dir(Dir),
-	    purge_known_files(AllFiles, KeepFiles, Dir, Suffixes);
-	false ->
-	    ok
-    end.
-
-purge_tmp_files() ->
-    case mnesia_monitor:use_dir() of
-	true ->
-	    Dir = mnesia_lib:dir(),
-	    KeepFiles = [],
-	    Exists = mnesia_lib:exists(mnesia_lib:tab2dat(schema)),
-	    case Exists of
-		true ->
-		    Suffixes = tmp_suffixes(),
-		    purge_dir(Dir, KeepFiles, Suffixes);
-		false ->
-		    %% Interrupted change of storage type
-		    %% for schema table
-		    Suffixes = known_suffixes(),
-		    purge_dir(Dir, KeepFiles, Suffixes),
-		    mnesia_lib:set(use_dir, false)
-		end;
-
-	false ->
-	    ok
-    end.
-
-purge_known_files([File | Tail], KeepFiles, Dir, Suffixes) ->
-    case lists:member(File, KeepFiles) of
-	true ->
-	    ignore;
-	false ->
-	    case has_known_suffix(File, Suffixes, false) of
-		false ->
-		    ignore;
-		true ->
-		    AbsFile = filename:join([Dir, File]),
-		    file:delete(AbsFile)
-	    end
-    end,
-    purge_known_files(Tail, KeepFiles, Dir, Suffixes);
-purge_known_files([], _KeepFiles, _Dir, _Suffixes) ->
-    ok.
-
-has_known_suffix(_File, _Suffixes, true) ->
-    true;
-has_known_suffix(File, [Suffix | Tail], false) ->
-    has_known_suffix(File, Tail, lists:suffix(Suffix, File));
-has_known_suffix(_File, [], Bool) ->
-    Bool.
-	    
-known_suffixes() -> real_suffixes() ++ tmp_suffixes().
-
-real_suffixes() ->  [".DAT", ".LOG", ".BUP", ".DCL", ".DCD"].
-
-tmp_suffixes() -> [".TMP", ".BUPTMP", ".RET", ".DMP"].
-
-info() ->
-    Tabs = lists:sort(val({schema, tables})),
-    lists:foreach(fun(T) -> info(T) end, Tabs),
-    ok.
-
-info(Tab) ->
-    Props = get_table_properties(Tab),
-    io:format("-- Properties for ~w table --- ~n",[Tab]),
-    info2(Tab, Props).
-info2(Tab, [{cstruct, _V} | Tail]) -> % Ignore cstruct
-    info2(Tab, Tail);
-info2(Tab, [{frag_hash, _V} | Tail]) -> % Ignore frag_hash
-    info2(Tab, Tail);
-info2(Tab, [{P, V} | Tail]) ->
-    io:format("~-20w -> ~p~n",[P,V]),
-    info2(Tab, Tail);
-info2(_, []) -> 
-    io:format("~n", []).
-
-get_table_properties(Tab) ->
-    case catch mnesia_lib:db_match_object(ram_copies, 
-					  mnesia_gvar, {{Tab, '_'}, '_'}) of
-	{'EXIT', _} ->
-	    mnesia:abort({no_exists, Tab, all});
-	RawGvar ->
-	    case [{Item, Val} || {{_Tab, Item}, Val} <- RawGvar] of
-		[] ->
-		    [];
-		Gvar ->
-		    Size = {size, mnesia:table_info(Tab, size)},
-		    Memory = {memory, mnesia:table_info(Tab, memory)},
-		    Master = {master_nodes, mnesia:table_info(Tab, master_nodes)},
-		    lists:sort([Size, Memory, Master | Gvar])
-	    end
-    end.
-
-%%%%%%%%%%% RESTORE %%%%%%%%%%%
-
--record(r, {iter = schema,
-	    module,
-	    table_options = [],
-	    default_op = clear_tables,
-	    tables = [],
-	    opaque,
-	    insert_op = error_fun,
-	    recs = error_recs
-	   }).
-
-restore(Opaque) -> 
-    restore(Opaque, [], mnesia_monitor:get_env(backup_module)).
-restore(Opaque, Args) when list(Args) -> 
-    restore(Opaque, Args, mnesia_monitor:get_env(backup_module));
-restore(_Opaque, BadArg) ->
-    {aborted, {badarg, BadArg}}.
-restore(Opaque, Args, Module) when list(Args), atom(Module) ->
-    InitR = #r{opaque = Opaque, module = Module},
-    case catch lists:foldl(fun check_restore_arg/2, InitR, Args) of
-	R when record(R, r) ->
-	    case mnesia_bup:read_schema(Module, Opaque) of
-		{error, Reason} ->
-		    {aborted, Reason};
-		BupSchema -> 
-		    schema_transaction(fun() -> do_restore(R, BupSchema) end)
-	    end;
-	{'EXIT', Reason} ->
-	    {aborted, Reason}
-    end;
-restore(_Opaque, Args, Module) ->
-    {aborted, {badarg, Args, Module}}.
-
-check_restore_arg({module, Mod}, R) when atom(Mod) ->
-    R#r{module = Mod};
-
-check_restore_arg({clear_tables, List}, R) when list(List) ->
-    case lists:member(schema, List) of
-	false ->
-	    TableList = [{Tab, clear_tables} || Tab <- List],
-	    R#r{table_options = R#r.table_options ++ TableList};
-	true ->
-	    exit({badarg, {clear_tables, schema}})
-    end;
-check_restore_arg({recreate_tables, List}, R) when list(List) ->
-    case lists:member(schema, List) of
-	false ->
-	    TableList = [{Tab, recreate_tables} || Tab <- List],
-	    R#r{table_options = R#r.table_options ++ TableList};
-	true ->
-	    exit({badarg, {recreate_tables, schema}})
-    end;
-check_restore_arg({keep_tables, List}, R) when list(List) ->
-    TableList = [{Tab, keep_tables} || Tab <- List],
-    R#r{table_options = R#r.table_options ++ TableList};
-check_restore_arg({skip_tables, List}, R) when list(List) ->
-    TableList = [{Tab, skip_tables} || Tab <- List],
-    R#r{table_options = R#r.table_options ++ TableList};
-check_restore_arg({default_op, Op}, R) -> 
-    case Op of 
-	clear_tables -> ok;
-	recreate_tables -> ok;
-	keep_tables -> ok;
-	skip_tables -> ok;
-	Else ->
-	    exit({badarg, {bad_default_op, Else}})
-    end,
-    R#r{default_op = Op};
-
-check_restore_arg(BadArg,_) ->
-    exit({badarg, BadArg}).
-
-do_restore(R, BupSchema) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    R2 = restore_schema(BupSchema, R),
-    insert_schema_ops(TidTs, [{restore_op, R2}]),
-    [element(1, TabStruct) || TabStruct <- R2#r.tables].
-
-arrange_restore(R, Fun, Recs) ->
-    R2 = R#r{insert_op = Fun, recs = Recs},
-    case mnesia_bup:iterate(R#r.module, fun restore_items/4, R#r.opaque, R2) of
-	{ok, R3} -> R3#r.recs;
-	{error, Reason} -> mnesia:abort(Reason);
-	Reason -> mnesia:abort(Reason)
-    end.
-
-restore_items([Rec | Recs], Header, Schema, R) ->
-    Tab = element(1, Rec),
-    case lists:keysearch(Tab, 1, R#r.tables) of
-	{value, {Tab, Where, Snmp, RecName}} ->
-	    {Rest, NRecs} =
-		restore_tab_items([Rec | Recs], Tab, RecName, Where, Snmp,
-				  R#r.recs, R#r.insert_op),
-	    restore_items(Rest, Header, Schema, R#r{recs = NRecs});
-	false ->
-	    Rest = skip_tab_items(Recs, Tab),
-	    restore_items(Rest, Header, Schema, R)
-    end;
-    
-restore_items([], _Header, _Schema, R) ->
-    R.
-
-restore_func(Tab, R) ->
-    case lists:keysearch(Tab, 1, R#r.table_options) of 
-	{value, {Tab, OP}} ->
-	    OP;
-	false ->
-	    R#r.default_op
-    end.
-
-where_to_commit(Tab, CsList) ->
-    Ram =   [{N, ram_copies} || N <- pick(Tab, ram_copies, CsList, [])],
-    Disc =  [{N, disc_copies} || N <- pick(Tab, disc_copies, CsList, [])],
-    DiscO = [{N, disc_only_copies} || N <- pick(Tab, disc_only_copies, CsList, [])],
-    Ram ++ Disc ++ DiscO.
-    
-%% Changes of the Meta info of schema itself is not allowed
-restore_schema([{schema, schema, _List} | Schema], R) ->
-    restore_schema(Schema, R);
-restore_schema([{schema, Tab, List} | Schema], R) ->
-    case restore_func(Tab, R) of
-	clear_tables -> 
-	    do_clear_table(Tab),
-	    Where = val({Tab, where_to_commit}),
-	    Snmp = val({Tab, snmp}), 
-	    RecName = val({Tab, record_name}), 
-	    R2 = R#r{tables = [{Tab, Where, Snmp, RecName} | R#r.tables]},
-	    restore_schema(Schema, R2);
-	recreate_tables -> 
-	    TidTs = get_tid_ts_and_lock(Tab, write),
-	    NC    = {cookie, ?unique_cookie},
-	    List2 = lists:keyreplace(cookie, 1, List, NC),		
-	    Where = where_to_commit(Tab, List2),
-	    Snmp  = pick(Tab, snmp, List2, []),
-	    RecName = pick(Tab, record_name, List2, Tab),
-% 	    case ?catch_val({Tab, cstruct}) of
-% 		{'EXIT', _} ->
-% 		    ignore;
-% 		OldCs when record(OldCs, cstruct) -> 
-% 		    do_delete_table(Tab)
-% 	    end,
-% 	    unsafe_do_create_table(list2cs(List2)),
-	    insert_schema_ops(TidTs, [{op, restore_recreate, List2}]),
-	    R2 = R#r{tables = [{Tab, Where, Snmp, RecName} | R#r.tables]},
-	    restore_schema(Schema, R2);
-	keep_tables -> 
-	    get_tid_ts_and_lock(Tab, write),
-	    Where = val({Tab, where_to_commit}),
-	    Snmp = val({Tab, snmp}),
-	    RecName = val({Tab, record_name}), 
-	    R2 = R#r{tables = [{Tab, Where, Snmp, RecName} | R#r.tables]},
-	    restore_schema(Schema, R2);
-	skip_tables -> 
-	    restore_schema(Schema, R)
-    end;
-
-restore_schema([{schema, Tab} | Schema], R) ->
-    do_delete_table(Tab),
-    Tabs = lists:delete(Tab,R#r.tables),
-    restore_schema(Schema, R#r{tables = Tabs});
-restore_schema([], R) ->
-    R.
-
-restore_tab_items([Rec | Rest], Tab, RecName, Where, Snmp, Recs, Op) 
-  when element(1, Rec) == Tab ->
-    NewRecs = Op(Rec, Recs, RecName, Where, Snmp),
-    restore_tab_items(Rest, Tab, RecName, Where, Snmp, NewRecs, Op);
-
-restore_tab_items(Rest, _Tab, _RecName, _Where, _Snmp, Recs, _Op) ->
-    {Rest, Recs}.
-
-skip_tab_items([Rec| Rest], Tab) 
-  when element(1, Rec) == Tab ->
-    skip_tab_items(Rest, Tab);
-skip_tab_items(Recs, _) ->
-    Recs.
-
-%%%%%%%%% Dump tables %%%%%%%%%%%%%
-dump_tables(Tabs) when list(Tabs) ->
-    schema_transaction(fun() -> do_dump_tables(Tabs) end);
-dump_tables(Tabs) ->
-    {aborted, {bad_type, Tabs}}.
-
-do_dump_tables(Tabs) ->
-    TidTs = get_tid_ts_and_lock(schema, write),
-    insert_schema_ops(TidTs, make_dump_tables(Tabs)).
-
-make_dump_tables([schema | _Tabs]) ->
-    mnesia:abort({bad_type, schema});
-make_dump_tables([Tab | Tabs]) ->
-    get_tid_ts_and_lock(Tab, read),
-    TabDef = get_create_list(Tab),
-    DiscResident =  val({Tab, disc_copies}) ++ val({Tab, disc_only_copies}),
-    verify([], DiscResident,
-	   {"Only allowed on ram_copies", Tab, DiscResident}),
-    [{op, dump_table, unknown, TabDef} | make_dump_tables(Tabs)];
-make_dump_tables([]) ->
-    [].
-
-%% Merge the local schema with the schema on other nodes
-merge_schema() ->
-    schema_transaction(fun() -> do_merge_schema() end).
-
-do_merge_schema() ->
-    {_Mod, Tid, Ts} = get_tid_ts_and_lock(schema, write),
-    Connected = val(recover_nodes),
-    Running = val({current, db_nodes}),
-    Store = Ts#tidstore.store,
-    case Connected -- Running of
-	[Node | _] ->
-	    %% Time for a schema merging party!
-	    mnesia_locker:wlock_no_exist(Tid, Store, schema, [Node]),
-	    
-	    case rpc:call(Node, mnesia_controller, get_cstructs, []) of
-		{cstructs, Cstructs, RemoteRunning1} ->
-		    LockedAlready = Running ++ [Node],
-		    {New, Old} = mnesia_recover:connect_nodes(RemoteRunning1),
-		    RemoteRunning = mnesia_lib:intersect(New ++ Old, RemoteRunning1),
-		    if 
-			RemoteRunning /= RemoteRunning1 ->
-			    mnesia_lib:error("Mnesia on ~p could not connect to node(s) ~p~n", 
-					     [node(), RemoteRunning1 -- RemoteRunning]);
-			true -> ok
-		    end,
-		    NeedsLock = RemoteRunning -- LockedAlready,
-		    mnesia_locker:wlock_no_exist(Tid, Store, schema, NeedsLock),
-
-		    {value, SchemaCs} =
-			lists:keysearch(schema, #cstruct.name, Cstructs),
-
-		    %% Announce that Node is running
-		    A = [{op, announce_im_running, node(),
-			  cs2list(SchemaCs), Running, RemoteRunning}],
-		    do_insert_schema_ops(Store, A),
-		    
-		    %% Introduce remote tables to local node
-		    do_insert_schema_ops(Store, make_merge_schema(Node, Cstructs)),
-		    
-		    %% Introduce local tables to remote nodes
-		    Tabs = val({schema, tables}),
-		    Ops = [{op, merge_schema, get_create_list(T)}
-			   || T <- Tabs,
-			      not lists:keymember(T, #cstruct.name, Cstructs)],
-		    do_insert_schema_ops(Store, Ops),
-		    
-		    %% Ensure that the txn will be committed on all nodes
-		    announce_im_running(RemoteRunning, SchemaCs), 
-		    {merged, Running, RemoteRunning};
-		{error, Reason} ->
-		    {"Cannot get cstructs", Node, Reason};
-		{badrpc, Reason} ->
-		    {"Cannot get cstructs", Node, {badrpc, Reason}}
-	    end;
-	[] ->
-	    %% No more nodes to merge schema with
-	    not_merged
-    end.
-
-make_merge_schema(Node, [Cs | Cstructs]) ->
-    Ops = do_make_merge_schema(Node, Cs),
-    Ops ++ make_merge_schema(Node, Cstructs);
-make_merge_schema(_Node, []) ->
-    [].
-
-%% Merge definitions of schema table
-do_make_merge_schema(Node, RemoteCs)
-        when RemoteCs#cstruct.name == schema ->
-    Cs = val({schema, cstruct}),
-    Masters = mnesia_recover:get_master_nodes(schema),
-    HasRemoteMaster = lists:member(Node, Masters),
-    HasLocalMaster = lists:member(node(), Masters),
-    Force = HasLocalMaster or HasRemoteMaster,
-    %% What is the storage types opinions?
-    StCsLocal   = mnesia_lib:cs_to_storage_type(node(), Cs),
-    StRcsLocal  = mnesia_lib:cs_to_storage_type(node(), RemoteCs),
-    StCsRemote  = mnesia_lib:cs_to_storage_type(Node, Cs),
-    StRcsRemote = mnesia_lib:cs_to_storage_type(Node, RemoteCs),        
-    
-    if
-	Cs#cstruct.cookie == RemoteCs#cstruct.cookie,
-	Cs#cstruct.version == RemoteCs#cstruct.version ->
-	    %% Great, we have the same cookie and version
-	    %% and do not need to merge cstructs
-	    [];
-	
-	Cs#cstruct.cookie /= RemoteCs#cstruct.cookie,
-	Cs#cstruct.disc_copies /= [],
-	RemoteCs#cstruct.disc_copies /= [] ->
-	    %% Both cstructs involves disc nodes
-	    %% and we cannot merge them
-	    if
-		HasLocalMaster == true,
-		HasRemoteMaster == false ->
-		    %% Choose local cstruct,
-		    %% since it's the master
-		    [{op, merge_schema, cs2list(Cs)}];
-
-		HasRemoteMaster == true,
-		HasLocalMaster == false ->
-		    %% Choose remote cstruct,
-		    %% since it's the master
-		    [{op, merge_schema, cs2list(RemoteCs)}];
-		
-		true ->
-		    Str = io_lib:format("Incompatible schema cookies. "
-					"Please, restart from old backup."
-					"~w = ~w, ~w = ~w~n",
-					[Node, cs2list(RemoteCs), node(), cs2list(Cs)]),
-		    throw(Str)
-	    end;
-	
-	StCsLocal /= StRcsLocal, StRcsLocal /= unknown ->
-	    Str = io_lib:format("Incompatible schema storage types. "
-				"on ~w storage ~w, on ~w storage ~w~n",
-				[node(), StCsLocal, Node, StRcsLocal]),
-	    throw(Str);    
-	StCsRemote /= StRcsRemote, StCsRemote /= unknown ->
-	    Str = io_lib:format("Incompatible schema storage types. "
-				"on ~w storage ~w, on ~w storage ~w~n",
-				[node(), StCsRemote, Node, StRcsRemote]),
-	    throw(Str);
-
-     	Cs#cstruct.disc_copies /= [] ->
-	    %% Choose local cstruct,
-	    %% since it involves disc nodes
-	    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}];
-	
-	RemoteCs#cstruct.disc_copies /= [] ->
-	    %% Choose remote cstruct,
-	    %% since it involves disc nodes
-	    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}];
-
-	Cs > RemoteCs ->
-	    %% Choose remote cstruct
-	    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}];
-	
-	true ->
-	    %% Choose local cstruct
-	    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}]
-    end;
-
-%% Merge definitions of normal table
-do_make_merge_schema(Node, RemoteCs) ->
-    Tab = RemoteCs#cstruct.name,
-    Masters = mnesia_recover:get_master_nodes(schema),
-    HasRemoteMaster = lists:member(Node, Masters),
-    HasLocalMaster = lists:member(node(), Masters),
-    Force = HasLocalMaster or HasRemoteMaster,
-    case ?catch_val({Tab, cstruct}) of
-	{'EXIT', _} ->
-	    %% A completely new table, created while Node was down
-	    [{op, merge_schema, cs2list(RemoteCs)}];
-	Cs when Cs#cstruct.cookie == RemoteCs#cstruct.cookie ->
-	    if
-		Cs#cstruct.version == RemoteCs#cstruct.version ->
-		    %% We have exactly the same version of the
-		    %% table def
-		    [];
-		
-		Cs#cstruct.version > RemoteCs#cstruct.version ->
-		    %% Oops, we have different versions
-		    %% of the table def, lets merge them.
-		    %% The only changes that may have occurred
-		    %% is that new replicas may have been added.
-		    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
-		    [{op, merge_schema, cs2list(MergedCs)}];
-		
-		Cs#cstruct.version < RemoteCs#cstruct.version ->
-		    %% Oops, we have different versions
-		    %% of the table def, lets merge them
-		    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
-		    [{op, merge_schema, cs2list(MergedCs)}]
-	    end;
-	Cs ->
-	    %% Different cookies, not possible to merge
-	    if
-		HasLocalMaster == true,
-		HasRemoteMaster == false ->
-		    %% Choose local cstruct,
-		    %% since it's the master
-		    [{op, merge_schema, cs2list(Cs)}];
-
-		HasRemoteMaster == true,
-		HasLocalMaster == false ->
-		    %% Choose remote cstruct,
-		    %% since it's the master
-		    [{op, merge_schema, cs2list(RemoteCs)}];
-		
-		true ->
-		    Str = io_lib:format("Bad cookie in table definition"
-					" ~w: ~w = ~w, ~w = ~w~n",
-					[Tab, node(), Cs, Node, RemoteCs]),
-		    throw(Str)
-	    end
-    end.
-
-%% Change of table definitions (cstructs) requires all replicas
-%% of the table to be active. New replicas, db_nodes and tables
-%% may however be added even if some replica is inactive. These
-%% invariants must be enforced in order to allow merge of cstructs.
-%%
-%% Returns a new cstruct or issues a fatal error
-merge_cstructs(Cs, RemoteCs, Force) ->
-    verify_cstruct(Cs),
-    case catch do_merge_cstructs(Cs, RemoteCs, Force) of
-	{'EXIT', {aborted, _Reason}} when Force == true ->
-	    Cs;
-	{'EXIT', Reason} ->
-	    exit(Reason);
-	MergedCs when record(MergedCs, cstruct) ->
-	    MergedCs;
-	Other ->
-	    throw(Other)
-    end.
-
-do_merge_cstructs(Cs, RemoteCs, Force) ->
-    verify_cstruct(RemoteCs),
-    Ns = mnesia_lib:uniq(mnesia_lib:cs_to_nodes(Cs) ++
-			 mnesia_lib:cs_to_nodes(RemoteCs)),
-    {AnythingNew, MergedCs} =
-	merge_storage_type(Ns, false, Cs, RemoteCs, Force),
-    MergedCs2 = merge_versions(AnythingNew, MergedCs, RemoteCs, Force),
-    verify_cstruct(MergedCs2),
-    MergedCs2.
-
-merge_storage_type([N | Ns], AnythingNew, Cs, RemoteCs, Force) ->
-    Local = mnesia_lib:cs_to_storage_type(N, Cs),
-    Remote = mnesia_lib:cs_to_storage_type(N, RemoteCs),
-    case compare_storage_type(true, Local, Remote) of
-	{same, _Storage} ->
-	    merge_storage_type(Ns, AnythingNew, Cs, RemoteCs, Force);
-	{diff, Storage} ->
-	    Cs2 = change_storage_type(N, Storage, Cs),
-	    merge_storage_type(Ns, true, Cs2, RemoteCs, Force);
-	incompatible when Force == true ->
-	    merge_storage_type(Ns, AnythingNew, Cs, RemoteCs, Force);
-	Other ->
-	    Str = io_lib:format("Cannot merge storage type for node ~w "
-				"in cstruct ~w with remote cstruct ~w (~w)~n",
-				[N, Cs, RemoteCs, Other]),
-	    throw(Str)
-    end;
-merge_storage_type([], AnythingNew, MergedCs, _RemoteCs, _Force) ->
-    {AnythingNew, MergedCs}.
-
-compare_storage_type(_Retry, Any, Any) ->
-    {same, Any};
-compare_storage_type(_Retry, unknown, Any) ->
-    {diff, Any};
-compare_storage_type(_Retry, ram_copies, disc_copies) ->
-    {diff, disc_copies};
-compare_storage_type(_Retry, disc_copies, disc_only_copies) ->
-    {diff, disc_only_copies};
-compare_storage_type(true, One, Another) ->
-    compare_storage_type(false, Another, One);
-compare_storage_type(false, _One, _Another) ->
-    incompatible.
-  
-change_storage_type(N, ram_copies, Cs) ->
-    Nodes = [N | Cs#cstruct.ram_copies],
-    Cs#cstruct{ram_copies = mnesia_lib:uniq(Nodes)};
-change_storage_type(N, disc_copies, Cs) ->
-    Nodes = [N | Cs#cstruct.disc_copies],
-    Cs#cstruct{disc_copies = mnesia_lib:uniq(Nodes)};
-change_storage_type(N, disc_only_copies, Cs) ->
-    Nodes = [N | Cs#cstruct.disc_only_copies],
-    Cs#cstruct{disc_only_copies = mnesia_lib:uniq(Nodes)}.
-
-%% BUGBUG: Verify match of frag info; equalit demanded for all but add_node
-
-merge_versions(AnythingNew, Cs, RemoteCs, Force) ->
-    if
-	Cs#cstruct.name == schema ->
-	    ok;
-	Cs#cstruct.name /= schema,
-	Cs#cstruct.cookie == RemoteCs#cstruct.cookie ->
-	    ok;
-	Force == true ->
-	    ok;
-	true ->
-	    Str = io_lib:format("Bad cookies. Cannot merge definitions of "
-				"table ~w. Local = ~w, Remote = ~w~n",
-				[Cs#cstruct.name, Cs, RemoteCs]),
-	    throw(Str)
-    end,
-    if
-	Cs#cstruct.name == RemoteCs#cstruct.name,
-	Cs#cstruct.type == RemoteCs#cstruct.type,
-	Cs#cstruct.local_content == RemoteCs#cstruct.local_content,
-	Cs#cstruct.attributes == RemoteCs#cstruct.attributes,
-	Cs#cstruct.index == RemoteCs#cstruct.index,
-	Cs#cstruct.snmp == RemoteCs#cstruct.snmp,
-	Cs#cstruct.access_mode == RemoteCs#cstruct.access_mode,
-	Cs#cstruct.load_order == RemoteCs#cstruct.load_order,
-	Cs#cstruct.user_properties == RemoteCs#cstruct.user_properties ->
-	    do_merge_versions(AnythingNew, Cs, RemoteCs);
-	Force == true ->
-	    do_merge_versions(AnythingNew, Cs, RemoteCs);
-	true ->
-	    Str1 = io_lib:format("Cannot merge definitions of "
-				"table ~w. Local = ~w, Remote = ~w~n",
-				[Cs#cstruct.name, Cs, RemoteCs]),
-	    throw(Str1)
-    end.
-
-do_merge_versions(AnythingNew, MergedCs, RemoteCs) ->
-    {{Major1, Minor1}, _Detail1} = MergedCs#cstruct.version,
-    {{Major2, Minor2}, _Detail2} = RemoteCs#cstruct.version,
-    if
-	MergedCs#cstruct.version == RemoteCs#cstruct.version ->
-	    MergedCs;
-	AnythingNew == false ->
-	    MergedCs;
-	Major1 == Major2 ->
-	    Minor = lists:max([Minor1, Minor2]),
-	    V = {{Major1, Minor}, dummy},
-	    incr_version(MergedCs#cstruct{version = V});
-	Major1 /= Major2 ->
-	    Major = lists:max([Major1, Major2]),
-	    V = {{Major, 0}, dummy},
-	    incr_version(MergedCs#cstruct{version = V})
-    end.
-
-announce_im_running([N | Ns], SchemaCs) ->    
-    {L1, L2} = mnesia_recover:connect_nodes([N]),
-    case lists:member(N, L1) or lists:member(N, L2) of
-	true ->
-%%	    dbg_out("Adding ~p to {current db_nodes} ~n", [N]),  %% qqqq
-	    mnesia_lib:add({current, db_nodes}, N),
-	    mnesia_controller:add_active_replica(schema, N, SchemaCs);
-	false ->
-	    ignore
-    end,
-    announce_im_running(Ns, SchemaCs);
-announce_im_running([], _) ->
-    [].
-
-unannounce_im_running([N | Ns]) ->
-    mnesia_lib:del({current, db_nodes}, N),
-    mnesia_controller:del_active_replica(schema, N),    
-    mnesia_recover:disconnect(N),
-    unannounce_im_running(Ns);
-unannounce_im_running([]) ->
-    [].
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_snmp_hook.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_snmp_hook.erl
deleted file mode 100644
index 458323c0e4..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_snmp_hook.erl
+++ /dev/null
@@ -1,271 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_snmp_hook.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
-%%
--module(mnesia_snmp_hook).
-
-%% Hooks (called from mnesia)
--export([check_ustruct/1, create_table/3, delete_table/2,
-	 key_to_oid/3, update/1, start/2,
-	 get_row/2, get_next_index/2, get_mnesia_key/2]).
-
-%% sys callback functions
--export([system_continue/3,
-	 system_terminate/4,
-	 system_code_change/4
-	]).
-
-%% Internal exports
--export([b_init/2]).
-
-check_ustruct([]) ->
-    true;  %% default value, not SNMP'ified
-check_ustruct([{key, Types}]) -> 
-    is_snmp_type(to_list(Types));
-check_ustruct(_) -> false.
-    
-to_list(Tuple) when tuple(Tuple) -> tuple_to_list(Tuple);
-to_list(X) -> [X].
-
-is_snmp_type([integer | T]) -> is_snmp_type(T);
-is_snmp_type([string | T]) -> is_snmp_type(T);
-is_snmp_type([fix_string | T]) -> is_snmp_type(T);
-is_snmp_type([]) -> true;
-is_snmp_type(_) -> false.
-
-create_table([], MnesiaTab, _Storage) ->
-    mnesia:abort({badarg, MnesiaTab, {snmp, empty_snmpstruct}});
-
-create_table([{key, Us}], MnesiaTab, Storage) ->
-    Tree = b_new(MnesiaTab, Us),
-    mnesia_lib:db_fixtable(Storage, MnesiaTab, true),
-    First = mnesia_lib:db_first(Storage, MnesiaTab),
-    build_table(First, MnesiaTab, Tree, Us, Storage),
-    mnesia_lib:db_fixtable(Storage, MnesiaTab, false),
-    Tree.
-    
-build_table(MnesiaKey, MnesiaTab, Tree, Us, Storage)
-  when MnesiaKey /= '$end_of_table' ->
-%%    SnmpKey = key_to_oid(MnesiaTab, MnesiaKey, Us),
-%%    update(write, Tree, MnesiaKey, SnmpKey),
-    update(write, Tree, MnesiaKey, MnesiaKey),
-    Next = mnesia_lib:db_next_key(Storage, MnesiaTab, MnesiaKey), 
-    build_table(Next, MnesiaTab, Tree, Us, Storage);
-build_table('$end_of_table', _MnesiaTab, _Tree, _Us, _Storage) ->
-    ok.
-
-delete_table(_MnesiaTab, Tree) ->
-    exit(Tree, shutdown),
-    ok.
-
-%%-----------------------------------------------------------------
-%% update({Op, MnesiaTab, MnesiaKey, SnmpKey})
-%%-----------------------------------------------------------------
-   
-update({clear_table, MnesiaTab}) ->
-    Tree = mnesia_lib:val({MnesiaTab, {index, snmp}}),
-    b_clear(Tree);
-    
-update({Op, MnesiaTab, MnesiaKey, SnmpKey}) ->
-    Tree = mnesia_lib:val({MnesiaTab, {index, snmp}}),
-    update(Op, Tree, MnesiaKey, SnmpKey).
-
-update(Op, Tree, MnesiaKey, _) ->
-    case Op of
-	write ->
-	    b_insert(Tree, MnesiaKey, MnesiaKey);
-	update_counter ->
-	    ignore;
-	delete ->
-	    b_delete(Tree, MnesiaKey);
-	delete_object ->
-	    b_delete(Tree, MnesiaKey)
-    end,
-    ok.
-
-%%-----------------------------------------------------------------
-%% Func: key_to_oid(Tab, Key, Ustruct)
-%% Args: Key ::= key()
-%%         key() ::= int() | string() | {int() | string()}
-%%       Type ::= {fix_string | term()}
-%% Make an OBJECT IDENTIFIER out of it.
-%% Variable length objects are prepended by their length.
-%% Ex. Key = {"pelle", 42} AND Type = {string, integer} =>
-%%        OID [5, $p, $e, $l, $l, $e, 42]
-%%     Key = {"pelle", 42} AND Type = {fix_string, integer} =>
-%%        OID [$p, $e, $l, $l, $e, 42]
-%%-----------------------------------------------------------------
-key_to_oid(Tab, Key, [{key, Types}]) ->
-    MnesiaOid = {Tab, Key},
-    if
-	tuple(Key), tuple(Types) ->
-	    case {size(Key), size(Types)} of
-		{Size, Size} ->
-		    keys_to_oid(MnesiaOid, Size, Key, [], Types);
-		_ ->
-		    exit({bad_snmp_key, MnesiaOid})
-	    end;
-	true ->
-	    key_to_oid_i(MnesiaOid, Key, Types)
-    end.
-
-key_to_oid_i(_MnesiaOid, Key, integer) when integer(Key) -> [Key];
-key_to_oid_i(_MnesiaOid, Key, fix_string) when list(Key) -> Key;
-key_to_oid_i(_MnesiaOid, Key, string) when list(Key) -> [length(Key) | Key];
-key_to_oid_i(MnesiaOid, Key, Type) ->
-    exit({bad_snmp_key, [MnesiaOid, Key, Type]}).
-
-keys_to_oid(_MnesiaOid, 0, _Key, Oid, _Types) -> Oid;
-keys_to_oid(MnesiaOid, N, Key, Oid, Types) ->
-    Type = element(N, Types),
-    KeyPart = element(N, Key),
-    Oid2 = key_to_oid_i(MnesiaOid, KeyPart, Type) ++ Oid,
-    keys_to_oid(MnesiaOid, N-1, Key, Oid2, Types).
-
-%%-----------------------------------------------------------------
-%% Func: get_row/2
-%% Args: Name is the name of the table (atom)
-%%       RowIndex is an Oid
-%% Returns: {ok, Row} | undefined
-%%          Note that the Row returned might contain columns that
-%%          are not visible via SNMP. e.g. the first column may be
-%%          ifIndex, and the last MFA ({ifIndex, col1, col2, MFA}).
-%%          where ifIndex is used only as index (not as a real col),
-%%          and MFA as extra info, used by the application.
-%%-----------------------------------------------------------------
-get_row(Name, RowIndex) ->
-    Tree = mnesia_lib:val({Name, {index, snmp}}),
-    case b_lookup(Tree, RowIndex) of
-	{ok, {_RowIndex, Key}} ->
-	    [Row] = mnesia:dirty_read({Name, Key}),
-	    {ok, Row};
-	_ ->
-	    undefined
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: get_next_index/2
-%% Args: Name is the name of the table (atom)
-%%       RowIndex is an Oid
-%% Returns: {ok, NextIndex} | endOfTable
-%%-----------------------------------------------------------------
-get_next_index(Name, RowIndex) ->
-    Tree = mnesia_lib:val({Name, {index, snmp}}),
-    case b_lookup_next(Tree, RowIndex) of
-	{ok, {NextIndex, _Key}} ->
-	    {ok, NextIndex};
-	_ ->
-	    endOfTable
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: get_mnesia_key/2
-%% Purpose: Get the mnesia key corresponding to the RowIndex.
-%% Args: Name is the name of the table (atom)
-%%       RowIndex is an Oid
-%% Returns: {ok, Key} | undefiend
-%%-----------------------------------------------------------------
-get_mnesia_key(Name, RowIndex) ->
-    Tree = mnesia_lib:val({Name, {index, snmp}}),
-    case b_lookup(Tree, RowIndex) of
-	{ok, {_RowIndex, Key}} ->
-	    {ok, Key};
-	_ ->
-	    undefined
-    end.
-
-%%-----------------------------------------------------------------
-%% Encapsulate a bplus_tree in a process.
-%%-----------------------------------------------------------------
-
-b_new(MnesiaTab, Us) ->
-    case supervisor:start_child(mnesia_snmp_sup, [MnesiaTab, Us]) of
-	{ok, Tree} ->
-	    Tree;
-	{error, Reason} ->
-	    exit({badsnmp, MnesiaTab, Reason})
-    end.
-
-start(MnesiaTab, Us) ->
-    Name = {mnesia_snmp, MnesiaTab},
-    mnesia_monitor:start_proc(Name, ?MODULE, b_init, [self(), Us]).
-
-b_insert(Tree, Key, Val) -> Tree ! {insert, Key, Val}.
-b_delete(Tree, Key) -> Tree ! {delete, Key}.
-b_lookup(Tree, Key) ->
-    Tree ! {lookup, self(), Key},
-    receive
-	{bplus_res, Res} ->
-	    Res
-    end.
-b_lookup_next(Tree, Key) ->
-    Tree ! {lookup_next, self(), Key},
-    receive
-	{bplus_res, Res} ->
-	    Res
-    end.
-
-b_clear(Tree) ->
-    Tree ! clear,
-    ok.
-
-b_init(Parent, Us) ->
-    %% Do not trap exit
-    Tree = snmp_index:new(Us),
-    proc_lib:init_ack(Parent, {ok, self()}),
-    b_loop(Parent, Tree, Us).
-
-b_loop(Parent, Tree, Us) ->
-    receive
-	{insert, Key, Val} ->
-	    NTree = snmp_index:insert(Tree, Key, Val),
-	    b_loop(Parent, NTree, Us);
-	{delete, Key} ->
-	    NTree = snmp_index:delete(Tree, Key),
-	    b_loop(Parent, NTree, Us);
-	{lookup, From, Key} ->
-	    Res = snmp_index:get(Tree, Key),
-	    From ! {bplus_res, Res},
-	    b_loop(Parent, Tree, Us);
-	{lookup_next, From, Key} ->
-	    Res = snmp_index:get_next(Tree, Key),
-	    From ! {bplus_res, Res},
-	    b_loop(Parent, Tree, Us);
-	clear ->
-	    catch snmp_index:delete(Tree), %% Catch because delete/1 is not 
-	    NewTree = snmp_index:new(Us),  %% available in old snmp (before R5)
-	    b_loop(Parent, NewTree, Us);
-	
-	{'EXIT', Parent, Reason} ->
-	    exit(Reason);
-
-	{system, From, Msg} ->
-	    mnesia_lib:dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
-	    sys:handle_system_msg(Msg, From, Parent, ?MODULE, [], {Tree, Us})
-	
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% System upgrade
-
-system_continue(Parent, _Debug, {Tree, Us}) ->
-    b_loop(Parent, Tree, Us).
-
-system_terminate(Reason, _Parent, _Debug, _Tree) ->
-    exit(Reason).
-
-system_code_change(State, _Module, _OldVsn, _Extra) ->
-    {ok, State}.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_snmp_sup.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_snmp_sup.erl
deleted file mode 100644
index 1cbac23e9d..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_snmp_sup.erl
+++ /dev/null
@@ -1,39 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_snmp_sup.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
-%%
--module(mnesia_snmp_sup).
-
--behaviour(supervisor).
-
--export([start/0, init/1]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% top supervisor callback functions
-
-start() ->
-    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% sub supervisor callback functions
-
-init([]) ->
-    Flags = {simple_one_for_one, 0, timer:hours(24)}, % Trust the top supervisor
-    MFA = {mnesia_snmp_hook, start, []},
-    Modules = [?MODULE, mnesia_snmp_hook, supervisor],
-    KillAfter = mnesia_kernel_sup:supervisor_timeout(timer:seconds(3)),
-    Workers = [{?MODULE, MFA, transient, KillAfter, worker, Modules}],
-    {ok, {Flags, Workers}}.
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_sp.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_sp.erl
deleted file mode 100644
index ad29d3cc78..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_sp.erl
+++ /dev/null
@@ -1,39 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_sp.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
-%%
-
-%% To able to generate nice crash reports we need a catch on the highest level.
-%% This code can't be purged so a code change is not possible.
-%% And hence this a simple module.
-
--module(mnesia_sp).
-
--export([init_proc/4]).
-
-init_proc(Who, Mod, Fun, Args) ->
-    mnesia_lib:verbose("~p starting: ~p~n", [Who, self()]),
-    case catch apply(Mod, Fun, Args) of
-	{'EXIT', Reason} ->
-	    mnesia_monitor:terminate_proc(Who, Reason, Args),
-	    exit(Reason);
-	Other ->
-	    Other
-    end.
-
-
-
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_subscr.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_subscr.erl
deleted file mode 100644
index f077291bc6..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_subscr.erl
+++ /dev/null
@@ -1,492 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_subscr.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
-%%
--module(mnesia_subscr).
-
--behaviour(gen_server).
-
--export([start/0,
-	 set_debug_level/1,
-	 subscribe/2,
-	 unsubscribe/2,
-	 unsubscribe_table/1,
-	 subscribers/0,
-	 report_table_event/4,
-	 report_table_event/5, 
-	 report_table_event/6
-	]).
-
-%% gen_server callbacks
--export([init/1,
-	 handle_call/3,
-	 handle_cast/2,
-	 handle_info/2,
-	 terminate/2,
-	 code_change/3
-	]).
-
--include("mnesia.hrl").
-
--import(mnesia_lib, [error/2]).
--record(state, {supervisor, pid_tab}).
-
-start() ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [self()],
-			  [{timeout, infinity}]).
-
-set_debug_level(Level) ->
-    OldEnv = application:get_env(mnesia, debug),
-    case mnesia_monitor:patch_env(debug, Level) of
-	{error, Reason} ->
-	    {error, Reason};
-	NewLevel ->
-	    set_debug_level(NewLevel, OldEnv)
-    end.
-
-set_debug_level(Level, OldEnv) ->
-    case mnesia:system_info(is_running) of
-	no when OldEnv == undefined ->
-	    none;
-	no ->
-	    {ok, E} = OldEnv,
-	    E;
-	_ ->
-	    Old = mnesia_lib:val(debug),
-	    Local = mnesia:system_info(local_tables),
-	    E = whereis(mnesia_event),
-	    Sub = fun(Tab) -> subscribe(E, {table, Tab}) end,
-	    UnSub = fun(Tab) -> unsubscribe(E, {table, Tab}) end,
-	
-	    case Level of
-		none ->
-		    lists:foreach(UnSub, Local);
-		verbose ->
-		    lists:foreach(UnSub, Local);
-		debug ->
-		    lists:foreach(UnSub, Local -- [schema]),
-		    Sub(schema);
-		trace ->
-		    lists:foreach(Sub, Local)
-	    end,
-	    mnesia_lib:set(debug, Level),
-	    Old
-    end.
-
-subscribe(ClientPid, system) ->
-    change_subscr(activate, ClientPid, system);
-subscribe(ClientPid, {table, Tab}) ->
-    change_subscr(activate, ClientPid, {table, Tab, simple});
-subscribe(ClientPid, {table, Tab, simple}) ->
-    change_subscr(activate, ClientPid, {table, Tab, simple});
-subscribe(ClientPid, {table, Tab, detailed}) ->
-    change_subscr(activate, ClientPid, {table, Tab, detailed});
-subscribe(_ClientPid, What) ->
-    {error, {badarg, What}}.
-
-unsubscribe(ClientPid, system) ->
-    change_subscr(deactivate, ClientPid, system);
-unsubscribe(ClientPid, {table, Tab}) ->
-    change_subscr(deactivate, ClientPid, {table, Tab, simple});
-unsubscribe(ClientPid, {table, Tab, simple}) ->
-    change_subscr(deactivate, ClientPid, {table, Tab, simple});
-unsubscribe(ClientPid, {table, Tab, detailed}) ->
-    change_subscr(deactivate, ClientPid, {table, Tab, detailed});
-unsubscribe(_ClientPid, What) ->
-    {error, {badarg, What}}.
-
-unsubscribe_table(Tab) ->
-    call({change, {deactivate_table, Tab}}).
-
-change_subscr(Kind, ClientPid, What) ->
-    call({change, {Kind, ClientPid, What}}).
-
-subscribers() ->
-    [whereis(mnesia_event) | mnesia_lib:val(subscribers)].
-
-report_table_event(Tab, Tid, Obj, Op) ->   
-    case ?catch_val({Tab, commit_work}) of
-	{'EXIT', _} -> ok;
-	Commit ->
-	    case lists:keysearch(subscribers, 1, Commit) of
-		false -> ok;
-		{value, Subs} -> 
-		    report_table_event(Subs, Tab, Tid, Obj, Op, undefined)
-	    end
-    end.
-
-%% Backwards compatible for the moment when mnesia_tm get's updated!
-report_table_event(Subscr, Tab, Tid, Obj, Op) ->
-    report_table_event(Subscr, Tab, Tid, Obj, Op, undefined).
-
-report_table_event({subscribers, S1, S2}, Tab, Tid, _Obj, clear_table, _Old) ->
-    What   = {delete, {schema, Tab}, Tid},
-    deliver(S1, {mnesia_table_event, What}),
-    TabDef = mnesia_schema:cs2list(?catch_val({Tab, cstruct})),
-    What2  = {write, {schema, Tab, TabDef}, Tid},
-    deliver(S1, {mnesia_table_event, What2}),
-    What3  = {delete, schema, {schema, Tab}, [{schema, Tab, TabDef}], Tid},
-    deliver(S2, {mnesia_table_event, What3}),
-    What4  = {write, schema,  {schema, Tab, TabDef}, [], Tid},
-    deliver(S2, {mnesia_table_event, What4});
-
-report_table_event({subscribers, Subscr, []}, Tab, Tid, Obj, Op, _Old) ->
-    What = {Op, patch_record(Tab, Obj), Tid},
-    deliver(Subscr, {mnesia_table_event, What});
-
-report_table_event({subscribers, S1, S2}, Tab, Tid, Obj, Op, Old) ->
-    Standard = {Op, patch_record(Tab, Obj), Tid},
-    deliver(S1, {mnesia_table_event, Standard}), 
-    Extended = what(Tab, Tid, Obj, Op, Old), 
-    deliver(S2, Extended);
-
-%% Backwards compatible for the moment when mnesia_tm get's updated!
-report_table_event({subscribers, Subscr}, Tab, Tid, Obj, Op, Old) ->    
-    report_table_event({subscribers, Subscr, []}, Tab, Tid, Obj, Op, Old).
-
-
-patch_record(Tab, Obj) ->
-    case Tab == element(1, Obj) of
-	true -> 
-	    Obj;
-	false ->
-	    setelement(1, Obj, Tab)
-    end.
-
-what(Tab, Tid, {RecName, Key}, delete, undefined) ->
-    case catch mnesia_lib:db_get(Tab, Key) of
-	Old when list(Old) -> %% Op only allowed for set table.
-	    {mnesia_table_event, {delete, Tab, {RecName, Key}, Old, Tid}};
-	_ ->
-	    %% Record just deleted by a dirty_op or 
-	    %% the whole table has been deleted
-	    ignore
-    end;
-what(Tab, Tid, Obj, delete, Old) ->
-    {mnesia_table_event, {delete, Tab, Obj, Old, Tid}};
-what(Tab, Tid, Obj, delete_object, _Old) ->
-    {mnesia_table_event, {delete, Tab, Obj, [Obj], Tid}};
-what(Tab, Tid, Obj, write, undefined) ->
-    case catch mnesia_lib:db_get(Tab, element(2, Obj)) of
-	Old when list(Old) ->
-	    {mnesia_table_event, {write, Tab, Obj, Old, Tid}};
-	{'EXIT', _} ->
-	    ignore
-    end.
-
-deliver(_, ignore) -> 
-    ok;
-deliver([Pid | Pids], Msg) ->
-    Pid ! Msg,
-    deliver(Pids, Msg);
-deliver([], _Msg) ->
-    ok.
-
-call(Msg) ->
-    Pid = whereis(?MODULE),
-    case Pid of
-	undefined ->
-	    {error, {node_not_running, node()}};
-	Pid ->
-	    Res = gen_server:call(Pid, Msg, infinity),
-            %% We get an exit signal if server dies
-            receive
-                {'EXIT', _Pid, _Reason} ->
-                    {error, {node_not_running, node()}}
-            after 0 ->
-                    ignore
-            end,
-	    Res
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Callback functions from gen_server
-
-%%----------------------------------------------------------------------
-%% Func: init/1
-%% Returns: {ok, State}          |
-%%          {ok, State, Timeout} |
-%%          {stop, Reason}
-%%----------------------------------------------------------------------
-init([Parent]) ->
-    process_flag(trap_exit, true),
-    ClientPid = whereis(mnesia_event),
-    link(ClientPid),
-    mnesia_lib:verbose("~p starting: ~p~n", [?MODULE, self()]),
-    Tab = ?ets_new_table(mnesia_subscr, [duplicate_bag, private]),
-    ?ets_insert(Tab, {ClientPid, system}),
-    {ok, #state{supervisor = Parent, pid_tab = Tab}}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_call/3
-%% Returns: {reply, Reply, State}          |
-%%          {reply, Reply, State, Timeout} |
-%%          {noreply, State}               |
-%%          {noreply, State, Timeout}      |
-%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
-%%----------------------------------------------------------------------
-handle_call({change, How}, _From, State) ->
-    Reply = do_change(How, State#state.pid_tab),
-    {reply, Reply, State};
-
-handle_call(Msg, _From, State) ->
-    error("~p got unexpected call: ~p~n", [?MODULE, Msg]),
-    {noreply, State}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_cast/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-handle_cast(Msg, State) ->
-    error("~p got unexpected cast: ~p~n", [?MODULE, Msg]),
-    {noreply, State}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_info/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_info({'EXIT', Pid, _R}, State) when Pid == State#state.supervisor ->
-    {stop, shutdown, State};
-
-handle_info({'EXIT', Pid, _Reason}, State) ->
-    handle_exit(Pid, State#state.pid_tab),
-    {noreply, State};
-
-handle_info(Msg, State) ->
-    error("~p got unexpected info: ~p~n", [?MODULE, Msg]),
-    {noreply, State}.
-
-%%----------------------------------------------------------------------
-%% Func: terminate/2
-%% Purpose: Shutdown the server
-%% Returns: any (ignored by gen_server)
-%%----------------------------------------------------------------------
-terminate(Reason, State) ->
-    prepare_stop(State#state.pid_tab),
-    mnesia_monitor:terminate_proc(?MODULE, Reason, State).
-
-%%----------------------------------------------------------------------
-%% Func: code_change/3
-%% Purpose: Upgrade process when its code is to be changed
-%% Returns: {ok, NewState}
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%%----------------------------------------------------------------------
-%%% Internal functions
-%%%----------------------------------------------------------------------
-
-do_change({activate, ClientPid, system}, SubscrTab) when pid(ClientPid) ->
-    Var = subscribers,
-    activate(ClientPid, system, Var, subscribers(), SubscrTab);
-do_change({activate, ClientPid, {table, Tab, How}}, SubscrTab) when pid(ClientPid) ->
-    case ?catch_val({Tab, where_to_read}) of
-	Node when Node == node() ->
-	    Var = {Tab, commit_work},
-	    activate(ClientPid, {table, Tab, How}, Var, mnesia_lib:val(Var), SubscrTab);
-	{'EXIT', _} ->
-	    {error, {no_exists, Tab}};
-	_Node ->
-	    {error, {not_active_local, Tab}}
-    end;
-do_change({deactivate, ClientPid, system}, SubscrTab) ->
-    Var = subscribers,
-    deactivate(ClientPid, system, Var, SubscrTab);
-do_change({deactivate, ClientPid, {table, Tab, How}}, SubscrTab) ->
-    Var = {Tab, commit_work},
-    deactivate(ClientPid, {table, Tab, How}, Var, SubscrTab);
-do_change({deactivate_table, Tab}, SubscrTab) ->
-    Var = {Tab, commit_work},
-    case ?catch_val(Var) of
-	{'EXIT', _} ->
-	    {error, {no_exists, Tab}};
-	CommitWork ->
-	    case lists:keysearch(subscribers, 1, CommitWork) of
-		false ->
-		    ok;
-		{value, Subs} -> 
-		    Simple   = {table, Tab, simple}, 
-		    Detailed = {table, Tab, detailed}, 
-		    Fs = fun(C) -> deactivate(C, Simple, Var, SubscrTab) end,
-		    Fd = fun(C) -> deactivate(C, Detailed, Var, SubscrTab) end,
-		    case Subs of
-			{subscribers, L1, L2} -> 
-			    lists:foreach(Fs, L1),
-			    lists:foreach(Fd, L2);
-			{subscribers, L1} ->
-			    lists:foreach(Fs, L1)
-		    end
-	    end,
-	    {ok, node()}
-    end;
-do_change(_, _) ->
-    {error, badarg}.
-
-activate(ClientPid, What, Var, OldSubscribers, SubscrTab) ->
-    Old = 
-	if Var == subscribers -> 
-		OldSubscribers;
-	   true -> 
-		case lists:keysearch(subscribers, 1, OldSubscribers) of
-		    false -> [];
-		{value, Subs} -> 
-			case Subs of
-			    {subscribers, L1, L2} -> 
-				L1 ++ L2;
-			    {subscribers, L1} ->
-				L1
-			end
-		end
-	end,
-    case lists:member(ClientPid, Old) of
-	false ->
-	    %% Don't care about checking old links
-	    case catch link(ClientPid) of
-		true ->
-		    ?ets_insert(SubscrTab, {ClientPid, What}),
-		    add_subscr(Var, What, ClientPid),
-		    {ok, node()};
-		{'EXIT', _Reason} ->
-		    {error, {no_exists, ClientPid}}
-	    end;
-	true ->
-	    {error, {already_exists, What}}
-    end.
-
-%%-record(subscribers, {pids = []}).  Old subscriber record removed
-%% To solve backward compatibility, this code is a cludge.. 
-add_subscr(subscribers, _What, Pid) ->
-    mnesia_lib:add(subscribers, Pid),
-    {ok, node()};
-add_subscr({Tab, commit_work}, What, Pid) ->
-    Commit = mnesia_lib:val({Tab, commit_work}),
-    case lists:keysearch(subscribers, 1, Commit) of
-	false ->
-	    Subscr = 
-		case What of 
-		    {table, _, simple} -> 
-			{subscribers, [Pid], []};
-		    {table, _, detailed} ->
-			{subscribers, [], [Pid]}
-		end,
-	    mnesia_lib:add({Tab, subscribers}, Pid),
-	    mnesia_lib:set({Tab, commit_work}, 
-			   mnesia_lib:sort_commit([Subscr | Commit]));
-	{value, Old} ->
-	    {L1, L2} = 
-		case Old of
-		    {subscribers, L} ->  %% Old Way
-			{L, []};
-		    {subscribers, SL1, SL2} -> 
-			{SL1, SL2}
-		end,
-	    Subscr = 
-		case What of 
-		    {table, _, simple} -> 
-			{subscribers, [Pid | L1], L2};
-		    {table, _, detailed} ->  
-			{subscribers, L1, [Pid | L2]}
-		end,
-	    NewC  = lists:keyreplace(subscribers, 1, Commit, Subscr),
-	    mnesia_lib:set({Tab, commit_work}, 
-			   mnesia_lib:sort_commit(NewC)),
-	    mnesia_lib:add({Tab, subscribers}, Pid)
-    end.
-
-deactivate(ClientPid, What, Var, SubscrTab) ->
-    ?ets_match_delete(SubscrTab, {ClientPid, What}),
-    case catch ?ets_lookup_element(SubscrTab, ClientPid, 1) of
-	List when list(List) ->
-	    ignore;
-	{'EXIT', _} ->
-	    unlink(ClientPid)
-    end,
-    del_subscr(Var, What, ClientPid),
-    {ok, node()}.
-
-del_subscr(subscribers, _What, Pid) ->
-    mnesia_lib:del(subscribers, Pid);
-del_subscr({Tab, commit_work}, What, Pid) ->
-    Commit = mnesia_lib:val({Tab, commit_work}),
-    case lists:keysearch(subscribers, 1, Commit) of
-	false ->
-	    false;
-	{value, Old} ->
-	    {L1, L2} = 
-		case Old of
-		    {subscribers, L} ->  %% Old Way
-			{L, []};
-		    {subscribers, SL1, SL2} -> 
-			{SL1, SL2}
-		end,
-	    Subscr = 
-		case What of %% Ignore user error delete subscr from any list
-		    {table, _, simple} -> 
-			NewL1 = lists:delete(Pid, L1),
-			NewL2 = lists:delete(Pid, L2),
-			{subscribers, NewL1, NewL2};
-		    {table, _, detailed} ->
-			NewL1 = lists:delete(Pid, L1),
-			NewL2 = lists:delete(Pid, L2),
-			{subscribers, NewL1, NewL2}
-		end,
-	    case Subscr of
-		{subscribers, [], []} ->
-		    NewC = lists:keydelete(subscribers, 1, Commit),
-		    mnesia_lib:del({Tab, subscribers}, Pid),
-		    mnesia_lib:set({Tab, commit_work}, 
-				   mnesia_lib:sort_commit(NewC));
-		_ ->
-		    NewC = lists:keyreplace(subscribers, 1, Commit, Subscr),
-		    mnesia_lib:del({Tab, subscribers}, Pid),
-		    mnesia_lib:set({Tab, commit_work}, 
-				   mnesia_lib:sort_commit(NewC))
-	    end
-    end.
-
-handle_exit(ClientPid, SubscrTab) ->
-    do_handle_exit(?ets_lookup(SubscrTab, ClientPid)),
-    ?ets_delete(SubscrTab, ClientPid).
-
-do_handle_exit([{ClientPid, What} | Tail]) ->
-    case What of
-	system ->
-	    del_subscr(subscribers, What, ClientPid);
-	{_, Tab, _Level} ->
-	    del_subscr({Tab, commit_work}, What, ClientPid)    
-    end,
-    do_handle_exit(Tail);
-do_handle_exit([]) ->
-    ok.
-
-prepare_stop(SubscrTab) ->
-    mnesia_lib:report_system_event({mnesia_down, node()}),
-    do_prepare_stop(?ets_first(SubscrTab), SubscrTab).
-
-do_prepare_stop('$end_of_table', _SubscrTab) ->
-    ok;
-do_prepare_stop(ClientPid, SubscrTab) ->
-    Next = ?ets_next(SubscrTab, ClientPid),
-    handle_exit(ClientPid, SubscrTab),
-    unlink(ClientPid),
-    do_prepare_stop(Next, SubscrTab).
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_sup.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_sup.erl
deleted file mode 100644
index a8a1df885f..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_sup.erl
+++ /dev/null
@@ -1,137 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_sup.erl,v 1.1 2008/12/17 09:53:39 mikpe Exp $
-%%
-%% Supervisor for the entire Mnesia application
-
--module(mnesia_sup).
-
--behaviour(application).
--behaviour(supervisor).
-
--export([start/0, start/2, init/1, stop/1, start_event/0, kill/0]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% application and suprvisor callback functions
-
-start(normal, Args) ->
-    SupName = {local,?MODULE},
-    case supervisor:start_link(SupName, ?MODULE, [Args]) of
-	{ok, Pid} ->
-	    {ok, Pid, {normal, Args}};
-	Error -> 
-	    Error
-    end;
-start(_, _) ->
-    {error, badarg}.
-
-start() ->
-    SupName = {local,?MODULE},
-    supervisor:start_link(SupName, ?MODULE, []).
-
-stop(_StartArgs) ->
-    ok.
-
-init([]) -> % Supervisor
-    init();
-init([[]]) -> % Application
-    init();
-init(BadArg) ->
-    {error, {badarg, BadArg}}.
-    
-init() ->
-    Flags = {one_for_all, 0, 3600}, % Should be rest_for_one policy
-
-    Event = event_procs(),
-    Kernel = kernel_procs(),
-    Mnemosyne = mnemosyne_procs(),
-
-    {ok, {Flags, Event ++ Kernel ++ Mnemosyne}}.
-
-event_procs() ->
-    KillAfter = timer:seconds(30),
-    KA = mnesia_kernel_sup:supervisor_timeout(KillAfter),
-    E = mnesia_event,
-    [{E, {?MODULE, start_event, []}, permanent, KA, worker, [E, gen_event]}].
-
-kernel_procs() ->
-    K = mnesia_kernel_sup,
-    KA = infinity,
-    [{K, {K, start, []}, permanent, KA, supervisor, [K, supervisor]}].
-
-mnemosyne_procs() ->
-    case mnesia_monitor:get_env(embedded_mnemosyne) of
-	true ->
-	    Q = mnemosyne_sup,
-	    KA = infinity,
-	    [{Q, {Q, start, []}, permanent, KA, supervisor, [Q, supervisor]}];
-	false ->
-	    []
-    end.
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% event handler
-
-start_event() ->
-    case gen_event:start_link({local, mnesia_event}) of
-	{ok, Pid} ->
-	    case add_event_handler() of
-		ok -> 
-		    {ok, Pid};
-		Error ->
-		    Error
-	    end;
-	Error  ->
-	    Error
-    end.
-
-add_event_handler() ->
-    Handler = mnesia_monitor:get_env(event_module),
-    gen_event:add_handler(mnesia_event, Handler, []).
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% debug functions
-
-kill() ->
-    Mnesia = [mnesia_fallback | mnesia:ms()],
-    Mnemosyne = mnemosyne_ms(),
-    Kill = fun(Name) -> catch exit(whereis(Name), kill) end,
-    lists:foreach(Kill, Mnemosyne),
-    lists:foreach(Kill, Mnesia),
-    lists:foreach(fun ensure_dead/1, Mnemosyne),
-    lists:foreach(fun ensure_dead/1, Mnesia),
-    timer:sleep(10),
-    case lists:keymember(mnesia, 1, application:which_applications()) of
-	true -> kill();
-	false -> ok
-    end.
-
-ensure_dead(Name) ->
-    case whereis(Name) of
-	undefined ->
-	    ok;
-	Pid when pid(Pid) ->
-	    exit(Pid, kill),
-	    timer:sleep(10),
-	    ensure_dead(Name)
-    end.
-
-mnemosyne_ms() ->
-    case mnesia_monitor:get_env(embedded_mnemosyne) of
-	true -> mnemosyne:ms();
-	false -> []
-    end.
-
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_text.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_text.erl
deleted file mode 100644
index e6084efbb1..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_text.erl
+++ /dev/null
@@ -1,191 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_text.erl,v 1.2 2010/03/04 13:54:20 maria Exp $
-%%
--module(mnesia_text).
-
--export([parse/1, file/1, load_textfile/1, dump_to_textfile/1]).
-
-load_textfile(File) ->
-    ensure_started(),
-    case parse(File) of
-	{ok, {Tabs, Data}} ->
-	    Badtabs = make_tabs(lists:map(fun validate_tab/1, Tabs)),
-	    load_data(del_data(Badtabs, Data, []));
-	Other ->
-	    Other
-    end.
-
-dump_to_textfile(File) ->
-    dump_to_textfile(mnesia_lib:is_running(), file:open(File, [write])).
-dump_to_textfile(yes, {ok, F}) ->
-    Tabs = lists:delete(schema, mnesia_lib:local_active_tables()),
-    Defs = lists:map(fun(T) -> {T, [{record_name, mnesia_lib:val({T, record_name})},
-				    {attributes, mnesia_lib:val({T, attributes})}]} 
-		     end,
-		     Tabs),
-    io:format(F, "~p.~n", [{tables, Defs}]),
-    lists:foreach(fun(T) -> dump_tab(F, T) end, Tabs),
-    file:close(F);
-dump_to_textfile(_,_) -> error.
-
-    
-dump_tab(F, T) ->
-    W = mnesia_lib:val({T, wild_pattern}),
-    {'atomic',All} = mnesia:transaction(fun() -> mnesia:match_object(T, W, read) end),
-    lists:foreach(fun(Term) -> io:format(F,"~p.~n", [setelement(1, Term, T)]) end, All).
-
-
-ensure_started() ->
-    case mnesia_lib:is_running() of
-	yes ->
-	    yes;
-	no ->
-	    case mnesia_lib:exists(mnesia_lib:dir("schema.DAT")) of
-		true ->
-		    mnesia:start();
-		false ->
-		    mnesia:create_schema([node()]),
-		    mnesia:start()
-	    end
-    end.
-
-del_data(Bad, [H|T], Ack) ->
-    case lists:member(element(1, H), Bad) of
-	true -> del_data(Bad, T, Ack);
-	false -> del_data(Bad, T, [H|Ack])
-    end;
-del_data(_Bad, [], Ack) ->
-    lists:reverse(Ack).
-		
-%% Tis the place to call the validate func in mnesia_schema
-validate_tab({Tabname, List}) ->
-    {Tabname, List};
-validate_tab({Tabname, RecName, List}) ->
-    {Tabname, RecName, List};
-validate_tab(_) -> error(badtab).
-
-make_tabs([{Tab, Def} | Tail]) ->
-    case catch mnesia:table_info(Tab, where_to_read) of
-	{'EXIT', _} -> %% non-existing table
-	    case mnesia:create_table(Tab, Def) of
-		{aborted, Reason} ->
-		    io:format("** Failed to create table ~w ~n"
-			      "** Reason = ~w, Args = ~p~n", 
-			      [Tab, Reason, Def]),
-		    [Tab | make_tabs(Tail)];
-		_ -> 
-		    io:format("New table ~w~n", [Tab]),
-		    make_tabs(Tail)
-	    end;
-	Node ->
-	    io:format("** Table ~w already exists on ~p, just entering data~n",
-		      [Tab, Node]),
-	    make_tabs(Tail)
-    end;
-
-make_tabs([]) -> 
-    [].
-
-load_data(L) ->
-    mnesia:transaction(fun() ->
-			       F = fun(X) -> 
-					   Tab = element(1, X),
-					   RN = mnesia:table_info(Tab, record_name),
-					   Rec = setelement(1, X, RN),
-					   mnesia:write(Tab, Rec, write) end,
-			       lists:foreach(F, L)
-		       end).
-
-parse(File) ->
-    case file(File) of
-	{ok, Terms} ->
-	    case catch collect(Terms) of
-		{error, X} ->
-		    {error, X};
-		Other ->
-		    {ok, Other}
-	    end;
-	Other ->
-	    Other
-    end.
-
-collect([{_, {tables, Tabs}}|L]) ->
-    {Tabs, collect_data(Tabs, L)};
-
-collect(_) ->
-    io:format("No tables found\n", []),
-    error(bad_header).
-
-collect_data(Tabs, [{Line, Term} | Tail]) when tuple(Term) ->
-    case lists:keysearch(element(1, Term), 1, Tabs) of
-	{value, _} ->
-	    [Term | collect_data(Tabs, Tail)];
-	_Other ->
-	    io:format("Object:~p at line ~w unknown\n", [Term,Line]),
-	    error(undefined_object)
-    end;
-collect_data(_Tabs, []) -> [];
-collect_data(_Tabs, [H|_T]) ->
-    io:format("Object:~p unknown\n", [H]),
-    error(undefined_object).
-
-error(What) -> throw({error, What}).
-
-file(File) ->
-    case file:open(File, [read]) of
-	{ok, Stream} ->
-	    Res = read_terms(Stream, File, 1, []),
-	    file:close(Stream),
-	    Res;
-	_Other ->
-	    {error, open}
-    end.
-
-read_terms(Stream, File, Line, L) ->
-    case read_term_from_stream(Stream, File, Line) of
-	{ok, Term, NextLine} ->
-	    read_terms(Stream, File, NextLine, [Term|L]);
-	error ->
-	    {error, read};
-	eof ->
-	    {ok, lists:reverse(L)}
-    end.
-
-read_term_from_stream(Stream, File, Line) ->
-    R = io:request(Stream, {get_until,'',erl_scan,tokens,[Line]}),
-    case R of
-	{ok,Toks,EndLine} ->
-	    case erl_parse:parse_term(Toks) of
-		{ok, Term} ->
-		    {ok, {Line, Term}, EndLine};
-		{error, {NewLine,Mod,What}} ->
-		    Str = Mod:format_error(What),
-		    io:format("Error in line:~p of:~p ~s\n",
-			      [NewLine, File, Str]),
-		    error;
-		T ->
-		    io:format("Error2 **~p~n",[T]),
-		    error
-	    end;
-	{eof,_EndLine} ->
-	    eof;
-	Other ->
-	    io:format("Error1 **~p~n",[Other]),
-	    error
-    end.
-
-			       
diff --git a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_tm.erl b/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_tm.erl
deleted file mode 100644
index 7bee382a89..0000000000
--- a/lib/dialyzer/test/r9c_tests_SUITE_data/src/mnesia/mnesia_tm.erl
+++ /dev/null
@@ -1,2173 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: mnesia_tm.erl,v 1.2 2010/03/04 13:54:20 maria Exp $
-%%
--module(mnesia_tm).
-
--export([
-	 start/0,
-	 init/1,
-	 non_transaction/5,
-	 transaction/6,
-	 commit_participant/5,
-	 dirty/2,
-	 display_info/2,
-	 do_update_op/3,
-	 get_info/1,
-	 get_transactions/0,
-	 info/1,
-	 mnesia_down/1,
-	 prepare_checkpoint/2,
-	 prepare_checkpoint/1, % Internal
-	 prepare_snmp/3,
-	 do_snmp/2,
-	 put_activity_id/1,
-	 block_tab/1,
-	 unblock_tab/1
-	]).
-
-%% sys callback functions
--export([system_continue/3,
-	 system_terminate/4,
-	 system_code_change/4
-	]).
-
--include("mnesia.hrl").
--import(mnesia_lib, [set/2]).
--import(mnesia_lib, [fatal/2, verbose/2, dbg_out/2]).
-
--record(state, {coordinators = [], participants = [], supervisor,
-		blocked_tabs = [], dirty_queue = []}).
-%% Format on coordinators is [{Tid, EtsTabList} .....
-
--record(prep, {protocol = sym_trans,
-	       %% async_dirty | sync_dirty | sym_trans | sync_sym_trans | asym_trans
-	       records = [],
-	       prev_tab = [], % initiate to a non valid table name
-	       prev_types,
-	       prev_snmp,
-	       types 
-	      }).
-
--record(participant, {tid, pid, commit, disc_nodes = [], 
-		      ram_nodes = [], protocol = sym_trans}).
-
-start() ->
-    mnesia_monitor:start_proc(?MODULE, ?MODULE, init, [self()]).
-
-init(Parent) ->
-    register(?MODULE, self()),
-    process_flag(trap_exit, true),
-    
-    %% Initialize the schema
-    IgnoreFallback = mnesia_monitor:get_env(ignore_fallback_at_startup),
-    mnesia_bup:tm_fallback_start(IgnoreFallback),
-    mnesia_schema:init(IgnoreFallback),
-    
-    %% Handshake and initialize transaction recovery
-    mnesia_recover:init(),
-    Early = mnesia_monitor:init(),
-    AllOthers = mnesia_lib:uniq(Early ++ mnesia_lib:all_nodes()) -- [node()],
-    set(original_nodes, AllOthers),
-    mnesia_recover:connect_nodes(AllOthers),
-
-    %% Recover transactions, may wait for decision
-    case mnesia_monitor:use_dir() of
-	true ->
-	    P = mnesia_dumper:opt_dump_log(startup), % previous log
-	    L = mnesia_dumper:opt_dump_log(startup), % latest log
-	    Msg = "Initial dump of log during startup: ~p~n",
-	    mnesia_lib:verbose(Msg, [[P, L]]),
-	    mnesia_log:init();
-	false ->
-	    ignore
-    end,
-    
-    mnesia_schema:purge_tmp_files(),
-    mnesia_recover:start_garb(),
-    
-    ?eval_debug_fun({?MODULE, init},  [{nodes, AllOthers}]),		   
-
-    case val(debug) of
-	Debug when Debug /= debug, Debug /= trace ->
-	    ignore;
-	_ ->
-	    mnesia_subscr:subscribe(whereis(mnesia_event), {table, schema})
-    end,
-    proc_lib:init_ack(Parent, {ok, self()}),
-    doit_loop(#state{supervisor = Parent}).
-
-val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_); 
-	_VaLuE_ -> _VaLuE_ 
-    end.
-
-reply({From,Ref}, R) ->
-    From ! {?MODULE, Ref, R};
-reply(From, R) ->
-    From ! {?MODULE, node(), R}.
-
-reply(From, R, State) ->
-    reply(From, R),
-    doit_loop(State).
-
-req(R) ->
-    case whereis(?MODULE) of
-	undefined ->
-	    {error, {node_not_running, node()}};
-	Pid ->
-	    Ref = make_ref(), 
-	    Pid ! {{self(), Ref}, R},
-	    rec(Pid, Ref)
-    end.
-
-rec() ->
-    rec(whereis(?MODULE)).
-
-rec(Pid) when pid(Pid) ->
-    receive
-	{?MODULE, _, Reply} ->
-	    Reply;
-
-	{'EXIT', Pid, _} ->
-	    {error, {node_not_running, node()}}
-    end;
-rec(undefined) ->
-    {error, {node_not_running, node()}}.
-
-rec(Pid, Ref) ->
-    receive
-	{?MODULE, Ref, Reply} ->
-	    Reply;
-	{'EXIT', Pid, _} ->
-	    {error, {node_not_running, node()}}
-    end.   
-
-tmlink({From, Ref}) when reference(Ref) ->
-    link(From);
-tmlink(From) ->
-    link(From).
-tmpid({Pid, _Ref}) when pid(Pid) ->
-    Pid;
-tmpid(Pid) ->
-    Pid.
-
-%% Returns a list of participant transaction Tid's
-mnesia_down(Node) ->
-    %% Syncronously call needed in order to avoid
-    %% race with mnesia_tm's coordinator processes
-    %% that may restart and acquire new locks.
-    %% mnesia_monitor takes care of the sync
-    case whereis(?MODULE) of
-	undefined ->
-	    mnesia_monitor:mnesia_down(?MODULE, {Node, []});
-	Pid ->
-	    Pid ! {mnesia_down, Node}
-    end.
-
-prepare_checkpoint(Nodes, Cp) ->
-    rpc:multicall(Nodes, ?MODULE, prepare_checkpoint, [Cp]).
-
-prepare_checkpoint(Cp) ->
-    req({prepare_checkpoint,Cp}).
-
-block_tab(Tab) ->
-    req({block_tab, Tab}).
-
-unblock_tab(Tab) ->
-    req({unblock_tab, Tab}).
-
-doit_loop(#state{coordinators = Coordinators, participants = Participants, supervisor = Sup} 
-	  = State) ->
-    receive
-	{_From, {async_dirty, Tid, Commit, Tab}} ->
-	    case lists:member(Tab, State#state.blocked_tabs) of
-		false ->
-		    do_async_dirty(Tid, Commit, Tab),
-		    doit_loop(State);
-		true ->
-		    Item = {async_dirty, Tid, Commit, Tab},
-		    State2 = State#state{dirty_queue = [Item | State#state.dirty_queue]},
-		    doit_loop(State2)
-	    end;
-	
-	{From, {sync_dirty, Tid, Commit, Tab}} ->
-	    case lists:member(Tab, State#state.blocked_tabs) of
-		false ->
-		    do_sync_dirty(From, Tid, Commit, Tab),
-		    doit_loop(State);
-		true ->
-		    Item = {sync_dirty, From, Tid, Commit, Tab},
-		    State2 = State#state{dirty_queue = [Item | State#state.dirty_queue]},
-		    doit_loop(State2)
-	    end;
-	
-	{From, start_outer} -> %% Create and associate ets_tab with Tid
-	    case catch ?ets_new_table(mnesia_trans_store, [bag, public]) of
-		{'EXIT', Reason} -> %% system limit
-		    Msg = "Cannot create an ets table for the "
-	                  "local transaction store",
-		    reply(From, {error, {system_limit, Msg, Reason}}, State);
-		Etab ->
-		    tmlink(From),
-		    C = mnesia_recover:incr_trans_tid_serial(),
-		    ?ets_insert(Etab, {nodes, node()}),
-		    Tid = #tid{pid = tmpid(From), counter = C},
-		    A2 = [{Tid , [Etab]} | Coordinators],
-		    S2 = State#state{coordinators = A2},
-		    reply(From, {new_tid, Tid, Etab}, S2)
-	    end;
-	
-	{From, {ask_commit, Protocol, Tid, Commit, DiscNs, RamNs}} ->
-	    ?eval_debug_fun({?MODULE, doit_ask_commit}, 
-			    [{tid, Tid}, {prot, Protocol}]),
-	    mnesia_checkpoint:tm_enter_pending(Tid, DiscNs, RamNs),
-	    Pid = 
-		case Protocol of
-		    asym_trans when node(Tid#tid.pid) /= node() ->
-			Args = [tmpid(From), Tid, Commit, DiscNs, RamNs],
-			spawn_link(?MODULE, commit_participant, Args);		
-		    _ when node(Tid#tid.pid) /= node() -> %% *_sym_trans
-			reply(From, {vote_yes, Tid}),
-			nopid
-		end,
-	    P = #participant{tid = Tid,
-			     pid = Pid,
-			     commit = Commit,
-			     disc_nodes = DiscNs,
-			     ram_nodes = RamNs,
-			     protocol = Protocol},
-	    State2 = State#state{participants = [P | Participants]},
-	    doit_loop(State2);
-	
-	{Tid, do_commit} ->
-	    case mnesia_lib:key_search_delete(Tid, #participant.tid, Participants) of
-		{none, _} ->
-		    verbose("Tried to commit a non participant transaction ~p~n",
-			    [Tid]),
-		    doit_loop(State);
-		{P, Participants2} ->
-		    ?eval_debug_fun({?MODULE, do_commit, pre}, 
-				    [{tid, Tid}, {participant, P}]),
-		    case P#participant.pid of
-			nopid ->
-			    Commit = P#participant.commit,
-			    Member = lists:member(node(), P#participant.disc_nodes),
-			    if Member == false ->
-				    ignore;
-			       P#participant.protocol == sym_trans -> 
-				    mnesia_log:log(Commit);
-			       P#participant.protocol == sync_sym_trans -> 
-				    mnesia_log:slog(Commit)
-			    end,
-			    mnesia_recover:note_decision(Tid, committed),
-			    do_commit(Tid, Commit),
-			    if 
-				P#participant.protocol == sync_sym_trans ->
-				    Tid#tid.pid ! {?MODULE, node(), {committed, Tid}};
-				true ->
-				    ignore
-			    end,
-			    mnesia_locker:release_tid(Tid),
-			    transaction_terminated(Tid),
-			    ?eval_debug_fun({?MODULE, do_commit, post}, [{tid, Tid}, {pid, nopid}]),
-			    doit_loop(State#state{participants = Participants2});
-			Pid when pid(Pid) ->
-			    Pid ! {Tid, committed},
-			    ?eval_debug_fun({?MODULE, do_commit, post}, [{tid, Tid}, {pid, Pid}]),
-			    doit_loop(State)
-		    end
-	    end;
-	
-	{Tid, simple_commit} ->
-	    mnesia_recover:note_decision(Tid, committed),
-	    mnesia_locker:release_tid(Tid),
-	    transaction_terminated(Tid),
-	    doit_loop(State);
-	
-	{Tid, {do_abort, Reason}} ->
-	    ?eval_debug_fun({?MODULE, do_abort, pre}, [{tid, Tid}]),
-	    mnesia_locker:release_tid(Tid),
-	    case mnesia_lib:key_search_delete(Tid, #participant.tid, Participants) of
-		{none, _} ->
-		    verbose("Tried to abort a non participant transaction ~p: ~p~n",
-			    [Tid, Reason]),
-		    doit_loop(State);
-		{P, Participants2} ->
-		    case P#participant.pid of
-			nopid ->
-			    Commit = P#participant.commit,
-			    mnesia_recover:note_decision(Tid, aborted),
-			    do_abort(Tid, Commit),
-			    if 
-				P#participant.protocol == sync_sym_trans ->
-				    Tid#tid.pid ! {?MODULE, node(), {aborted, Tid}};
-				true ->
-				    ignore
-			    end,
-			    transaction_terminated(Tid),
-			    ?eval_debug_fun({?MODULE, do_abort, post}, [{tid, Tid}, {pid, nopid}]),
-			    doit_loop(State#state{participants = Participants2});
-			Pid when pid(Pid) ->
-			    Pid ! {Tid, {do_abort, Reason}},
-			    ?eval_debug_fun({?MODULE, do_abort, post},
-					    [{tid, Tid}, {pid, Pid}]),
-			    doit_loop(State)
-		    end
-	    end;
-	
-	{From, {add_store, Tid}} -> %% new store for nested  transaction
-	    case catch ?ets_new_table(mnesia_trans_store, [bag, public]) of
-		{'EXIT', Reason} -> %% system limit
-		    Msg = "Cannot create an ets table for a nested "
-                          "local transaction store",
-		    reply(From, {error, {system_limit, Msg, Reason}}, State);
-		Etab ->
-		    A2 = add_coord_store(Coordinators, Tid, Etab),
-		    reply(From, {new_store, Etab},
-			  State#state{coordinators = A2})
-	    end;
-
-	{From, {del_store, Tid, Current, Obsolete, PropagateStore}} ->
-	    opt_propagate_store(Current, Obsolete, PropagateStore),
-	    A2 = del_coord_store(Coordinators, Tid, Current, Obsolete),
-	    reply(From, store_erased, State#state{coordinators = A2});
-
-	{'EXIT', Pid, Reason} ->
-	    handle_exit(Pid, Reason, State);
-	
-	{From, {restart, Tid, Store}} ->
-	    A2 = restore_stores(Coordinators, Tid, Store),
-	    ?ets_match_delete(Store, '_'),
-	    ?ets_insert(Store, {nodes, node()}),
-	    reply(From, {restarted, Tid}, State#state{coordinators = A2});
-	
-	{delete_transaction, Tid} ->
-	    %% used to clear transactions which are committed
-	    %% in coordinator or participant processes
-	    case mnesia_lib:key_search_delete(Tid, #participant.tid, Participants) of
-		{none, _} ->
-		    case mnesia_lib:key_search_delete(Tid, 1, Coordinators) of
-			{none, _} ->
-			    verbose("** ERROR ** Tried to delete a non transaction ~p~n",
-				  [Tid]),
-			    doit_loop(State);
-			{{_Tid, Etabs}, A2} ->
-			    erase_ets_tabs(Etabs),
-			    transaction_terminated(Tid),
-			    doit_loop(State#state{coordinators = A2})
-		    end;
-		{_P, Participants2} ->
-		    transaction_terminated(Tid),
-		    State2 = State#state{participants = Participants2},
-		    doit_loop(State2)
-	    end;
-	
-	{sync_trans_serial, Tid} ->
-	    %% Do the Lamport thing here
-	    mnesia_recover:sync_trans_tid_serial(Tid),
-	    doit_loop(State);
-	    
-	{From, info} ->
-	    reply(From, {info, Participants, Coordinators}, State);
-	
-	{mnesia_down, N} ->
-	    verbose("Got mnesia_down from ~p, reconfiguring...~n", [N]),
-	    reconfigure_coordinators(N, Coordinators),
-
-	    Tids = [P#participant.tid || P <- Participants],
-	    reconfigure_participants(N, Participants),
-	    mnesia_monitor:mnesia_down(?MODULE, {N, Tids}),
-	    doit_loop(State);
-
-	{From, {unblock_me, Tab}} ->
-	    case lists:member(Tab, State#state.blocked_tabs) of
-		false ->
-		    verbose("Wrong dirty Op blocked on ~p ~p ~p", 
-			    [node(), Tab, From]),
-		    reply(From, unblocked),
-		    doit_loop(State);
-		true ->
-		    Item = {Tab, unblock_me, From}, 
-		    State2 = State#state{dirty_queue = [Item | State#state.dirty_queue]},
-		    doit_loop(State2)
-	    end;	    
-	
-	{From, {block_tab, Tab}} ->
-	    State2 = State#state{blocked_tabs = [Tab | State#state.blocked_tabs]},
-	    reply(From, ok, State2);
-	
-	{From, {unblock_tab, Tab}} ->
-	    BlockedTabs2 = State#state.blocked_tabs -- [Tab],
-	    case lists:member(Tab, BlockedTabs2) of
-		false ->
-		    mnesia_controller:unblock_table(Tab),
-		    Queue = process_dirty_queue(Tab, State#state.dirty_queue),
-		    State2 = State#state{blocked_tabs = BlockedTabs2, 
-					 dirty_queue = Queue},
-		    reply(From, ok, State2);
-		true ->
-		    State2 = State#state{blocked_tabs = BlockedTabs2},
-		    reply(From, ok, State2)
-	    end;
-	
-	{From, {prepare_checkpoint, Cp}} ->
-	    Res = mnesia_checkpoint:tm_prepare(Cp),
-	    case Res of
-		{ok, _Name, IgnoreNew, _Node} ->
-		    prepare_pending_coordinators(Coordinators, IgnoreNew),
-		    prepare_pending_participants(Participants, IgnoreNew);
-		{error, _Reason} ->
-		    ignore
-	    end,
-	    reply(From, Res, State);
-	
-	{system, From, Msg} ->
-	    dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
-	    sys:handle_system_msg(Msg, From, Sup, ?MODULE, [], State);
-	
-	Msg ->
-	    verbose("** ERROR ** ~p got unexpected message: ~p~n", [?MODULE, Msg]),
-	    doit_loop(State)
-    end.
-
-do_sync_dirty(From, Tid, Commit, _Tab) ->
-    ?eval_debug_fun({?MODULE, sync_dirty, pre}, [{tid, Tid}]),
-    Res = (catch do_dirty(Tid, Commit)),
-    ?eval_debug_fun({?MODULE, sync_dirty, post}, [{tid, Tid}]),
-    From ! {?MODULE, node(), {dirty_res, Res}}.
-
-do_async_dirty(Tid, Commit, _Tab) ->
-    ?eval_debug_fun({?MODULE, async_dirty, pre}, [{tid, Tid}]),
-    catch do_dirty(Tid, Commit),
-    ?eval_debug_fun({?MODULE, async_dirty, post}, [{tid, Tid}]).
-
-%% Process items in fifo order
-process_dirty_queue(Tab, [Item | Queue]) ->
-    Queue2 = process_dirty_queue(Tab, Queue),
-    case Item of
-	{async_dirty, Tid, Commit, Tab} ->
-	    do_async_dirty(Tid, Commit, Tab),
-	    Queue2;
-	{sync_dirty, From, Tid, Commit, Tab} ->
-	    do_sync_dirty(From, Tid, Commit, Tab),
-	    Queue2;
-	{Tab, unblock_me, From} ->
-	    reply(From, unblocked),
-	    Queue2;
-	_ ->
-	    [Item | Queue2]
-    end;
-process_dirty_queue(_Tab, []) ->
-    [].
-
-prepare_pending_coordinators([{Tid, [Store | _Etabs]} | Coords], IgnoreNew) ->
-    case catch ?ets_lookup(Store, pending) of
-	[] ->
-	    prepare_pending_coordinators(Coords, IgnoreNew);
-	[Pending] ->
-	    case lists:member(Tid, IgnoreNew) of
-		false ->
-		    mnesia_checkpoint:tm_enter_pending(Pending);
-		true ->
-		    ignore
-	    end,
-	    prepare_pending_coordinators(Coords, IgnoreNew);
-	{'EXIT', _} -> 
-	    prepare_pending_coordinators(Coords, IgnoreNew)
-    end;
-prepare_pending_coordinators([], _IgnoreNew) ->
-    ok.
-
-prepare_pending_participants([Part | Parts], IgnoreNew) ->
-    Tid = Part#participant.tid,
-    D = Part#participant.disc_nodes,
-    R = Part#participant.ram_nodes,
-    case lists:member(Tid, IgnoreNew) of
-	false ->
-	    mnesia_checkpoint:tm_enter_pending(Tid, D, R);
-	true ->
-	    ignore
-    end,
-    prepare_pending_participants(Parts, IgnoreNew);
-prepare_pending_participants([], _IgnoreNew) ->
-    ok.
-
-handle_exit(Pid, Reason, State) when node(Pid) /= node() ->
-    %% We got exit from a remote fool
-    dbg_out("~p got remote EXIT from unknown ~p~n",  
-	    [?MODULE, {Pid, Reason}]),
-    doit_loop(State);
-
-handle_exit(Pid, _Reason, State) when Pid == State#state.supervisor ->
-    %% Our supervisor has died, time to stop
-    do_stop(State);
-
-handle_exit(Pid, Reason, State) ->
-    %% Check if it is a coordinator
-    case pid_search_delete(Pid, State#state.coordinators) of 
-	{none, _} ->
-	    %% Check if it is a participant
-	    case mnesia_lib:key_search_delete(Pid, #participant.pid, State#state.participants) of
-		{none, _} ->
-		    %% We got exit from a local fool
-		    verbose("** ERROR ** ~p got local EXIT from unknown process: ~p~n",  
-			    [?MODULE, {Pid, Reason}]),
-		    doit_loop(State);
-		
-		{P, RestP} when record(P, participant) ->
-		    fatal("Participant ~p in transaction ~p died ~p~n",
-			  [P#participant.pid, P#participant.tid, Reason]),
-		    doit_loop(State#state{participants = RestP})
-	    end;
-	
-	{{Tid, Etabs}, RestC} ->
-	    %% A local coordinator has died and 
-	    %% we must determine the outcome of the
-	    %% transaction and tell mnesia_tm on the
-	    %% other nodes about it and then recover
-	    %% locally.
-	    recover_coordinator(Tid, Etabs),
-	    doit_loop(State#state{coordinators = RestC})
-    end.
-
-recover_coordinator(Tid, Etabs) ->
-    verbose("Coordinator ~p in transaction ~p died.~n", [Tid#tid.pid, Tid]),
-
-    Store = hd(Etabs),
-    CheckNodes = get_nodes(Store),
-    TellNodes = CheckNodes -- [node()],
-    case catch arrange(Tid, Store, async) of
-	{'EXIT', Reason} ->
-	    dbg_out("Recovery of coordinator ~p failed:~n", [Tid, Reason]),
-	    Protocol = asym_trans,
-	    tell_outcome(Tid, Protocol, node(), CheckNodes, TellNodes);
-	{_N, Prep} ->
-	    %% Tell the participants about the outcome
-	    Protocol = Prep#prep.protocol,
-	    Outcome = tell_outcome(Tid, Protocol, node(), CheckNodes, TellNodes),
-
-	    %% Recover locally
-	    CR = Prep#prep.records,
-	    {DiscNs, RamNs} = commit_nodes(CR, [], []),
-	    {value, Local} = lists:keysearch(node(), #commit.node, CR),
-
-	    ?eval_debug_fun({?MODULE, recover_coordinator, pre},
-			    [{tid, Tid}, {outcome, Outcome}, {prot, Protocol}]),
-	    recover_coordinator(Tid, Protocol, Outcome, Local, DiscNs, RamNs),
-	    ?eval_debug_fun({?MODULE, recover_coordinator, post},
-			    [{tid, Tid}, {outcome, Outcome}, {prot, Protocol}])
-    
-    end,
-    erase_ets_tabs(Etabs),
-    transaction_terminated(Tid),
-    mnesia_locker:release_tid(Tid).
-
-recover_coordinator(Tid, sym_trans, committed, Local, _, _) ->
-    mnesia_recover:note_decision(Tid, committed),
-    do_dirty(Tid, Local);
-recover_coordinator(Tid, sym_trans, aborted, _Local, _, _) ->
-    mnesia_recover:note_decision(Tid, aborted);
-recover_coordinator(Tid, sync_sym_trans, committed, Local, _, _) ->
-    mnesia_recover:note_decision(Tid, committed),
-    do_dirty(Tid, Local);
-recover_coordinator(Tid, sync_sym_trans, aborted, _Local, _, _) ->
-    mnesia_recover:note_decision(Tid, aborted);
-
-recover_coordinator(Tid, asym_trans, committed, Local, DiscNs, RamNs) ->
-    D = #decision{tid = Tid, outcome = committed,
-		  disc_nodes = DiscNs, ram_nodes = RamNs},		
-    mnesia_recover:log_decision(D),
-    do_commit(Tid, Local);
-recover_coordinator(Tid, asym_trans, aborted, Local, DiscNs, RamNs) ->
-    D = #decision{tid = Tid, outcome = aborted,
- 		  disc_nodes = DiscNs, ram_nodes = RamNs},		
-    mnesia_recover:log_decision(D),
-    do_abort(Tid, Local).
-
-restore_stores([{Tid, Etstabs} | Tail], Tid, Store) ->
-    Remaining  = lists:delete(Store, Etstabs),
-    erase_ets_tabs(Remaining),
-    [{Tid, [Store]} | Tail];
-restore_stores([H | T], Tid, Store) ->
-    [H | restore_stores(T, Tid, Store)].
-%% No NIL case on purpose
-
-add_coord_store([{Tid, Stores} | Coordinators], Tid, Etab) ->
-    [{Tid, [Etab | Stores]} | Coordinators];
-add_coord_store([H | T], Tid, Etab) ->
-    [H | add_coord_store(T, Tid, Etab)].
-%% no NIL case on purpose
-
-del_coord_store([{Tid, Stores} | Coordinators], Tid, Current, Obsolete) ->
-    Rest = 
-	case Stores of
-	    [Obsolete, Current | Tail] -> Tail;
-	    [Current, Obsolete | Tail] -> Tail
-	end,
-    ?ets_delete_table(Obsolete),
-    [{Tid, [Current | Rest]} | Coordinators];
-del_coord_store([H | T], Tid, Current, Obsolete) ->
-    [H | del_coord_store(T, Tid, Current, Obsolete)].
-%% no NIL case on purpose
-
-erase_ets_tabs([H | T]) ->
-    ?ets_delete_table(H),
-    erase_ets_tabs(T);
-erase_ets_tabs([]) -> 
-    ok.
-
-%% Deletes a pid from a list of participants
-%% or from a list of coordinators and returns
-%% {none, All} or {Tr, Rest} 
-pid_search_delete(Pid, Trs) ->
-    pid_search_delete(Pid, Trs, none, []).
-pid_search_delete(Pid, [Tr = {Tid, _Ts} | Trs], _Val, Ack) when Tid#tid.pid == Pid ->
-    pid_search_delete(Pid, Trs, Tr, Ack);
-pid_search_delete(Pid, [Tr | Trs], Val, Ack) ->
-    pid_search_delete(Pid, Trs, Val, [Tr | Ack]);
-
-pid_search_delete(_Pid, [], Val, Ack) ->
-    {Val, Ack}.
-
-%% When TM gets an EXIT sig, we must also check to see 
-%% if the crashing transaction is in the Participant list
-%% 
-%% search_participant_for_pid([Participant | Tail], Pid) ->
-%%     Tid = Participant#participant.tid,
-%%     if
-%% 	   Tid#tid.pid == Pid  ->
-%% 	       {coordinator, Participant};
-%% 	   Participant#participant.pid == Pid  ->
-%% 	       {participant, Participant};
-%% 	   true ->
-%% 	       search_participant_for_pid(Tail, Pid)
-%%     end;
-%% search_participant_for_pid([], _) ->
-%%     fool.
- 
-transaction_terminated(Tid)  ->
-    mnesia_checkpoint:tm_exit_pending(Tid),
-    Pid = Tid#tid.pid,
-    if
-	node(Pid) == node() ->
-	    unlink(Pid);
-	true ->  %% Do the Lamport thing here
-	    mnesia_recover:sync_trans_tid_serial(Tid)
-    end.
-
-non_transaction(OldState, Fun, Args, ActivityKind, Mod) ->
-    Id = {ActivityKind, self()},
-    NewState = {Mod, Id, non_transaction},
-    put(mnesia_activity_state, NewState),
-    %% I Want something uniqe here, references are expensive
-    Ref = mNeSia_nOn_TrAnSacTioN,
-    RefRes = (catch {Ref, apply(Fun, Args)}),
-    case OldState of
-	undefined -> erase(mnesia_activity_state);
-	_ -> put(mnesia_activity_state, OldState)
-    end,
-    case RefRes of
-	{Ref, Res} ->
-	    case Res of
-		{'EXIT', Reason} -> exit(Reason);
-		{aborted, Reason} -> mnesia:abort(Reason);
-		_ -> Res
-	    end;
-	{'EXIT', Reason} ->
-	    exit(Reason);
-	Throw ->
-	    throw(Throw)
-    end.
-
-transaction(OldTidTs, Fun, Args, Retries, Mod, Type) ->
-    Factor = 1,
-    case OldTidTs of
-	undefined -> % Outer
-	    execute_outer(Mod, Fun, Args, Factor, Retries, Type);
-	{_OldMod, Tid, Ts} ->  % Nested
-	    execute_inner(Mod, Tid, Ts, Fun, Args, Factor, Retries, Type);
-	_ -> % Bad nesting
-	    {aborted, nested_transaction}
-    end.
-
-execute_outer(Mod, Fun, Args, Factor, Retries, Type) ->
-    case req(start_outer) of
-	{error, Reason} -> 
-	    {aborted, Reason};
-	{new_tid, Tid, Store} ->
-	    Ts = #tidstore{store = Store},
-	    NewTidTs = {Mod, Tid, Ts},
-	    put(mnesia_activity_state, NewTidTs),
-	    execute_transaction(Fun, Args, Factor, Retries, Type)
-    end.
-
-execute_inner(Mod, Tid, Ts, Fun, Args, Factor, Retries, Type) ->
-    case req({add_store, Tid}) of
-	{error, Reason} ->
-	    {aborted, Reason};
-	{new_store, Ets} ->
-	    copy_ets(Ts#tidstore.store, Ets),
-	    Up = [Ts#tidstore.store | Ts#tidstore.up_stores],
-	    NewTs = Ts#tidstore{level = 1 + Ts#tidstore.level,
-				store = Ets,
-				up_stores = Up},
-	    NewTidTs = {Mod, Tid, NewTs},
-	    put(mnesia_activity_state, NewTidTs),
-	    execute_transaction(Fun, Args, Factor, Retries, Type)
-    end.
-
-copy_ets(From, To) ->
-    do_copy_ets(?ets_first(From), From, To).
-do_copy_ets('$end_of_table', _,_) -> 
-    ok;
-do_copy_ets(K, From, To) ->
-    Objs = ?ets_lookup(From, K),
-    insert_objs(Objs, To),
-    do_copy_ets(?ets_next(From, K), From, To).
-
-insert_objs([H|T], Tab) ->
-    ?ets_insert(Tab, H),
-    insert_objs(T, Tab);
-insert_objs([], _Tab) ->
-    ok.
-
-execute_transaction(Fun, Args, Factor, Retries, Type) ->
-    case catch apply_fun(Fun, Args, Type) of
-	{'EXIT', Reason} ->
-	    check_exit(Fun, Args, Factor, Retries, Reason, Type);
-	{'atomic', Value} ->
-	    mnesia_lib:incr_counter(trans_commits),
-	    erase(mnesia_activity_state),
-	    %% no need to clear locks, already done by commit ...
-	    %% Flush any un processed mnesia_down messages we might have 
-	    flush_downs(),
-	    {'atomic', Value};
-	{nested_atomic, Value} ->
-	    mnesia_lib:incr_counter(trans_commits),
-	    {'atomic', Value};
-	Value -> %% User called throw
-	    Reason = {aborted, {throw, Value}},
-	    return_abort(Fun, Args, Reason)
-    end.
-
-apply_fun(Fun, Args, Type) ->
-    Result = apply(Fun, Args),
-    case t_commit(Type) of
-	do_commit ->
-            {'atomic', Result};
-        do_commit_nested ->
-            {nested_atomic, Result};
-        {do_abort, {aborted, Reason}} ->
-            {'EXIT', {aborted, Reason}};
-        {do_abort, Reason} ->
-            {'EXIT', {aborted, Reason}}
-    end.
-
-check_exit(Fun, Args, Factor, Retries, Reason, Type) ->
-    case Reason of
-	{aborted, C} when record(C, cyclic) ->
-	    maybe_restart(Fun, Args, Factor, Retries, Type, C);
-	{aborted, {node_not_running, N}} ->
-	    maybe_restart(Fun, Args, Factor, Retries, Type, {node_not_running, N});
-	{aborted, {bad_commit, N}} ->
-	    maybe_restart(Fun, Args, Factor, Retries, Type, {bad_commit, N});
-	_ -> 
-	    return_abort(Fun, Args, Reason)
-    end.
-
-maybe_restart(Fun, Args, Factor, Retries, Type, Why) ->
-    {Mod, Tid, Ts} = get(mnesia_activity_state),
-    case try_again(Retries) of
-	yes when Ts#tidstore.level == 1 ->
-	    restart(Mod, Tid, Ts, Fun, Args, Factor, Retries, Type, Why);
-	yes ->
-	    return_abort(Fun, Args, Why);
-	no ->
-	    return_abort(Fun, Args, {aborted, nomore})
-    end.
-
-try_again(infinity) -> yes;
-try_again(X) when number(X) , X > 1 -> yes;
-try_again(_) -> no.
-
-%% We can only restart toplevel transactions.
-%% If a deadlock situation occurs in a nested transaction
-%% The whole thing including all nested transactions need to be
-%% restarted. The stack is thus popped by a consequtive series of
-%% exit({aborted, #cyclic{}}) calls
-
-restart(Mod, Tid, Ts, Fun, Args, Factor0, Retries0, Type, Why) ->
-    mnesia_lib:incr_counter(trans_restarts),
-    Retries = decr(Retries0),
-    case Why of
-	{bad_commit, _N} ->
-	    return_abort(Fun, Args, Why),
-	    Factor = 1,
-	    SleepTime = mnesia_lib:random_time(Factor, Tid#tid.counter),
-	    dbg_out("Restarting transaction ~w: in ~wms ~w~n", [Tid, SleepTime, Why]),
-	    timer:sleep(SleepTime),
-	    execute_outer(Mod, Fun, Args, Factor, Retries, Type);
-	{node_not_running, _N} ->   %% Avoids hanging in receive_release_tid_ack
-	    return_abort(Fun, Args, Why),
-	    Factor = 1,
-	    SleepTime = mnesia_lib:random_time(Factor, Tid#tid.counter),
-	    dbg_out("Restarting transaction ~w: in ~wms ~w~n", [Tid, SleepTime, Why]),
-	    timer:sleep(SleepTime),
-	    execute_outer(Mod, Fun, Args, Factor, Retries, Type);	
-	_ ->
-	    SleepTime = mnesia_lib:random_time(Factor0, Tid#tid.counter),
-	    dbg_out("Restarting transaction ~w: in ~wms ~w~n", [Tid, SleepTime, Why]),
-	    
-	    if
-		Factor0 /= 10 ->
-		    ignore;
-		true ->
-		    %% Our serial may be much larger than other nodes ditto
-		    AllNodes = val({current, db_nodes}),
-		    verbose("Sync serial ~p~n", [Tid]),
-		    rpc:abcast(AllNodes, ?MODULE, {sync_trans_serial, Tid})
-	    end,
-	    intercept_friends(Tid, Ts),
-	    Store = Ts#tidstore.store,
-	    Nodes = get_nodes(Store),
-	    ?MODULE ! {self(), {restart, Tid, Store}},
-	    mnesia_locker:send_release_tid(Nodes, Tid),
-	    timer:sleep(SleepTime),
-	    mnesia_locker:receive_release_tid_acc(Nodes, Tid),
-	    case rec() of
-		{restarted, Tid} ->
-		    execute_transaction(Fun, Args, Factor0 + 1, 
-					Retries, Type);
-		{error, Reason} ->
-		    mnesia:abort(Reason)
-	    end
-    end.
-
-decr(infinity) -> infinity;
-decr(X) when integer(X), X > 1 -> X - 1;
-decr(_X) -> 0.
-
-return_abort(Fun, Args, Reason)  ->
-    {Mod, Tid, Ts} = get(mnesia_activity_state),
-    OldStore = Ts#tidstore.store,
-    Nodes = get_nodes(OldStore),
-    intercept_friends(Tid, Ts),
-    catch mnesia_lib:incr_counter(trans_failures),
-    Level = Ts#tidstore.level,
-    if
-	Level == 1 ->
-	    mnesia_locker:async_release_tid(Nodes, Tid),
-	    ?MODULE ! {delete_transaction, Tid},
-	    erase(mnesia_activity_state),
-	    dbg_out("Transaction ~p calling ~p with ~p, failed ~p~n", 
-		    [Tid, Fun, Args, Reason]),
-	    flush_downs(),
-	    {aborted, mnesia_lib:fix_error(Reason)};
-	true ->
-	    %% Nested transaction
-	    [NewStore | Tail] = Ts#tidstore.up_stores,
-	    req({del_store, Tid, NewStore, OldStore, true}),
-	    Ts2 = Ts#tidstore{store = NewStore,
-			      up_stores = Tail,
-			      level = Level - 1},
-	    NewTidTs = {Mod, Tid, Ts2},
-	    put(mnesia_activity_state, NewTidTs),
-	    case Reason of 
-		#cyclic{} ->
-		    exit({aborted, Reason});
-		{node_not_running, _N} -> 
-		    exit({aborted, Reason});
-		{bad_commit, _N}-> 
-		    exit({aborted, Reason});
-		_ -> 
-		    {aborted, mnesia_lib:fix_error(Reason)}
-	    end
-    end.
-
-flush_downs() ->
-    receive
-	{?MODULE, _, _} -> flush_downs(); % Votes
-	{mnesia_down, _} -> flush_downs()
-    after 0 -> flushed
-    end.
-
-put_activity_id(undefined) ->
-    erase_activity_id();
-put_activity_id({Mod, Tid, Ts}) when record(Tid, tid), record(Ts, tidstore) ->
-    flush_downs(),
-    Store = Ts#tidstore.store,
-    ?ets_insert(Store, {friends, self()}),
-    NewTidTs = {Mod, Tid, Ts},
-    put(mnesia_activity_state, NewTidTs);
-put_activity_id(SimpleState) ->
-    put(mnesia_activity_state, SimpleState).
-
-erase_activity_id() ->
-    flush_downs(),
-    erase(mnesia_activity_state).
-
-get_nodes(Store) ->    
-    case catch ?ets_lookup_element(Store, nodes, 2) of
-	{'EXIT', _} -> [node()];
-	Nodes -> Nodes
-    end.	     
-    
-get_friends(Store) ->    
-    case catch ?ets_lookup_element(Store, friends, 2) of
-	{'EXIT', _} -> [];
-	Friends -> Friends
-    end.	     
-    
-opt_propagate_store(_Current, _Obsolete, false) ->
-    ok;
-opt_propagate_store(Current, Obsolete, true) ->
-    propagate_store(Current, nodes, get_nodes(Obsolete)),
-    propagate_store(Current, friends, get_friends(Obsolete)).
-
-propagate_store(Store, Var, [Val | Vals]) ->
-    ?ets_insert(Store, {Var, Val}),
-    propagate_store(Store, Var, Vals);
-propagate_store(_Store, _Var, []) ->
-    ok.
-
-%% Tell all processes that are cooperating with the current transaction
-intercept_friends(_Tid, Ts) ->
-    Friends = get_friends(Ts#tidstore.store),
-    Message = {activity_ended, undefined, self()},
-    intercept_best_friend(Friends, Message).
-
-intercept_best_friend([], _Message) ->
-    ok;
-intercept_best_friend([Pid | _], Message) ->
-    Pid ! Message, 
-    wait_for_best_friend(Pid, 0).
-
-wait_for_best_friend(Pid, Timeout) ->
-    receive
-	{'EXIT', Pid, _} -> ok;
-	{activity_ended, _, Pid} -> ok
-    after Timeout ->
-	    case my_process_is_alive(Pid) of
-		true -> wait_for_best_friend(Pid, 1000);
-		false -> ok
-	    end
-    end.
-    
-my_process_is_alive(Pid) ->
-    case catch erlang:is_process_alive(Pid) of % New BIF in R5
-	true -> 
-	    true;
-	false -> 
-	    false;
-	{'EXIT', _} -> % Pre R5 backward compatibility 
-	    case process_info(Pid, message_queue_len) of
-		undefined -> false;
-		_ -> true
-	    end 
-    end.
-
-dirty(Protocol, Item) ->
-    {{Tab, Key}, _Val, _Op} = Item,
-    Tid = {dirty, self()},
-    Prep = prepare_items(Tid, Tab, Key, [Item], #prep{protocol= Protocol}),
-    CR =  Prep#prep.records,
-    case Protocol of
-	async_dirty ->
-	    %% Send commit records to the other involved nodes,
-	    %% but do only wait for one node to complete.
-	    %% Preferrably, the local node if possible. 
-		    
-	    ReadNode = val({Tab, where_to_read}),
-	    {WaitFor, FirstRes} = async_send_dirty(Tid, CR, Tab, ReadNode),
-	    rec_dirty(WaitFor, FirstRes);
-		
-	sync_dirty ->
-	    %% Send commit records to the other involved nodes,
-	    %% and wait for all nodes to complete
-	    {WaitFor, FirstRes} = sync_send_dirty(Tid, CR, Tab, []),
-	    rec_dirty(WaitFor, FirstRes);
-	_ ->
-	    mnesia:abort({bad_activity, Protocol})
-    end.
-
-%% This is the commit function, The first thing it does,
-%% is to find out which nodes that have been participating
-%% in this particular transaction, all of the mnesia_locker:lock*
-%% functions insert the names of the nodes where it aquires locks
-%% into the local shadow Store
-%% This function exacutes in the context of the user process
-t_commit(Type) ->
-    {Mod, Tid, Ts} = get(mnesia_activity_state),
-    Store = Ts#tidstore.store,
-    if
-	Ts#tidstore.level == 1 ->
-	    intercept_friends(Tid, Ts),
-	    %% N is number of updates 
-	    case arrange(Tid, Store, Type) of
-		{N, Prep} when N > 0 ->
-		    multi_commit(Prep#prep.protocol,
-				 Tid, Prep#prep.records, Store);
-		{0, Prep} ->
-		    multi_commit(read_only, Tid, Prep#prep.records, Store)
-	    end;
-	true ->
-	    %% nested commit
-	    Level = Ts#tidstore.level,
-	    [Obsolete | Tail] = Ts#tidstore.up_stores,
-	    req({del_store, Tid, Store, Obsolete, false}),
-	    NewTs = Ts#tidstore{store = Store,
-				up_stores = Tail,
-				level = Level - 1},
-	    NewTidTs = {Mod, Tid, NewTs},
-	    put(mnesia_activity_state, NewTidTs),
-	    do_commit_nested
-    end.
-
-%% This function arranges for all objects we shall write in S to be
-%% in a list of {Node, CommitRecord}
-%% Important function for the performance of mnesia.
-
-arrange(Tid, Store, Type) ->
-    %% The local node is always included
-    Nodes = get_nodes(Store),
-    Recs = prep_recs(Nodes, []),
-    Key = ?ets_first(Store),
-    N = 0,
-    Prep = 
-	case Type of 
-	    async -> #prep{protocol = sym_trans, records = Recs};
-	    sync -> #prep{protocol = sync_sym_trans, records = Recs}
-	end,
-    case catch do_arrange(Tid, Store, Key, Prep, N) of
-	{'EXIT', Reason} ->
-	    dbg_out("do_arrange failed ~p ~p~n", [Reason, Tid]),
-	    case Reason of
-		{aborted, R} ->
-		    mnesia:abort(R);
-		_ -> 
-		    mnesia:abort(Reason)
-	    end;
-	{New, Prepared} ->
-	    {New, Prepared#prep{records = reverse(Prepared#prep.records)}}
-    end.
-
-reverse([]) ->
-    [];
-reverse([H|R]) when record(H, commit) ->
-    [
-     H#commit{
-       ram_copies       =  lists:reverse(H#commit.ram_copies),
-       disc_copies      =  lists:reverse(H#commit.disc_copies),
-       disc_only_copies =  lists:reverse(H#commit.disc_only_copies),
-       snmp             = lists:reverse(H#commit.snmp)
-      }  
-     | reverse(R)].
-
-prep_recs([N | Nodes], Recs) ->
-    prep_recs(Nodes, [#commit{decision = presume_commit, node = N} | Recs]);
-prep_recs([], Recs) ->
-    Recs.
-
-%% storage_types is a list of {Node, Storage} tuples
-%% where each tuple represents an active replica
-do_arrange(Tid, Store, {Tab, Key}, Prep, N) ->
-    Oid = {Tab, Key},
-    Items = ?ets_lookup(Store, Oid), %% Store is a bag
-    P2 = prepare_items(Tid, Tab, Key, Items, Prep),
-    do_arrange(Tid, Store, ?ets_next(Store, Oid), P2, N + 1);
-do_arrange(Tid, Store, SchemaKey, Prep, N) when SchemaKey == op ->
-    Items = ?ets_lookup(Store, SchemaKey), %% Store is a bag
-    P2 = prepare_schema_items(Tid, Items, Prep),
-    do_arrange(Tid, Store, ?ets_next(Store, SchemaKey), P2, N + 1);
-do_arrange(Tid, Store, RestoreKey, Prep, N) when RestoreKey == restore_op ->
-    [{restore_op, R}] = ?ets_lookup(Store, RestoreKey),
-    Fun = fun({Tab, Key}, CommitRecs, _RecName, Where, Snmp) ->
-		  Item = [{{Tab, Key}, {Tab, Key}, delete}],
-		  do_prepare_items(Tid, Tab, Key, Where, Snmp, Item, CommitRecs);
-	     (BupRec, CommitRecs, RecName, Where, Snmp) ->
-		  Tab = element(1, BupRec),
-		  Key = element(2, BupRec),
-		  Item = 
-		      if
-			  Tab == RecName ->
-			      [{{Tab, Key}, BupRec, write}];
-			  true ->
-			      BupRec2 = setelement(1, BupRec, RecName),
-			      [{{Tab, Key}, BupRec2, write}]
-		      end,
-		  do_prepare_items(Tid, Tab, Key, Where, Snmp, Item, CommitRecs)
-	  end,	  
-    Recs2 = mnesia_schema:arrange_restore(R, Fun, Prep#prep.records),
-    P2 = Prep#prep{protocol = asym_trans, records = Recs2},
-    do_arrange(Tid, Store, ?ets_next(Store, RestoreKey), P2, N + 1);
-do_arrange(_Tid, _Store, '$end_of_table', Prep, N) ->
-    {N, Prep};
-do_arrange(Tid, Store, IgnoredKey, Prep, N) -> %% locks, nodes ... local atoms...
-    do_arrange(Tid, Store, ?ets_next(Store, IgnoredKey), Prep, N).
-
-%% Returns a prep record  with all items in reverse order
-prepare_schema_items(Tid, Items, Prep) ->
-    Types = [{N, schema_ops} || N <- val({current, db_nodes})],
-    Recs = prepare_nodes(Tid, Types, Items, Prep#prep.records, schema),
-    Prep#prep{protocol = asym_trans, records = Recs}.
-
-%% Returns a prep record with all items in reverse order
-prepare_items(Tid, Tab, Key, Items, Prep) when Prep#prep.prev_tab == Tab ->
-    Types = Prep#prep.prev_types,
-    Snmp = Prep#prep.prev_snmp,
-    Recs = Prep#prep.records,
-    Recs2 = do_prepare_items(Tid, Tab, Key, Types, Snmp, Items, Recs),
-    Prep#prep{records = Recs2};
-    
-prepare_items(Tid, Tab, Key, Items, Prep) ->
-    Types = val({Tab, where_to_commit}),
-    case Types of
-	[] -> mnesia:abort({no_exists, Tab});
-	{blocked, _} -> 
-	    unblocked = req({unblock_me, Tab}),
-	    prepare_items(Tid, Tab, Key, Items, Prep);
-	_ ->     
-	    Snmp = val({Tab, snmp}),
-	    Recs2 = do_prepare_items(Tid, Tab, Key, Types, 
-				     Snmp, Items, Prep#prep.records),
-	    Prep2 = Prep#prep{records = Recs2, prev_tab = Tab, 
-			      prev_types = Types, prev_snmp = Snmp},
-	    check_prep(Prep2, Types)
-    end.
-
-do_prepare_items(Tid, Tab, Key, Types, Snmp, Items, Recs) ->
-    Recs2 = prepare_snmp(Tid, Tab, Key, Types, Snmp, Items, Recs), % May exit
-    prepare_nodes(Tid, Types, Items, Recs2, normal).
-
-prepare_snmp(Tab, Key, Items) ->
-    case val({Tab, snmp}) of 
-	[] ->
-	    [];
-	Ustruct when Key /= '_' ->
-	    {_Oid, _Val, Op} = hd(Items),
-	    %% Still making snmp oid (not used) because we want to catch errors here
-	    %% And also it keeps backwards comp. with old nodes.
-	    SnmpOid = mnesia_snmp_hook:key_to_oid(Tab, Key, Ustruct), % May exit
-	    [{Op, Tab, Key, SnmpOid}];
-	_ ->
-	    [{clear_table, Tab}]
-    end.
-
-prepare_snmp(_Tid, _Tab, _Key, _Types, [], _Items, Recs) -> 
-    Recs;
-
-prepare_snmp(Tid, Tab, Key, Types, Us, Items, Recs) -> 
-    if Key /= '_' ->
-	    {_Oid, _Val, Op} = hd(Items),
-	    SnmpOid = mnesia_snmp_hook:key_to_oid(Tab, Key, Us), % May exit
-	    prepare_nodes(Tid, Types, [{Op, Tab, Key, SnmpOid}], Recs, snmp);
-       Key == '_' ->
-	    prepare_nodes(Tid, Types, [{clear_table, Tab}], Recs, snmp)
-    end.
-
-check_prep(Prep, Types) when Prep#prep.types == Types ->
-    Prep;
-check_prep(Prep, Types) when Prep#prep.types == undefined ->
-    Prep#prep{types = Types};
-check_prep(Prep, _Types) ->
-    Prep#prep{protocol = asym_trans}.
-
-%% Returns a list of commit records
-prepare_nodes(Tid, [{Node, Storage} | Rest], Items, C, Kind) ->
-    {Rec, C2} = pick_node(Tid, Node, C, []),
-    Rec2 = prepare_node(Node, Storage, Items, Rec, Kind),
-    [Rec2 | prepare_nodes(Tid, Rest, Items, C2, Kind)];
-prepare_nodes(_Tid, [], _Items, CommitRecords, _Kind) ->
-    CommitRecords.
-
-pick_node(Tid, Node, [Rec | Rest], Done) ->
-    if
-	Rec#commit.node == Node ->
-	    {Rec, Done ++ Rest};
-	true ->
-	    pick_node(Tid, Node, Rest, [Rec | Done])
-    end;
-pick_node(_Tid, Node, [], Done) ->
-    {#commit{decision = presume_commit, node = Node}, Done}.
-
-prepare_node(Node, Storage, [Item | Items], Rec, Kind) when Kind == snmp ->
-    Rec2 = Rec#commit{snmp = [Item | Rec#commit.snmp]},
-    prepare_node(Node, Storage, Items, Rec2, Kind);
-prepare_node(Node, Storage, [Item | Items], Rec, Kind) when Kind /= schema ->
-    Rec2 = 
-	case Storage of
-	    ram_copies ->
-		Rec#commit{ram_copies = [Item | Rec#commit.ram_copies]};
-	    disc_copies ->
-		Rec#commit{disc_copies = [Item | Rec#commit.disc_copies]};
-	    disc_only_copies ->
-		Rec#commit{disc_only_copies =
-			   [Item | Rec#commit.disc_only_copies]}
-	end,
-    prepare_node(Node, Storage, Items, Rec2, Kind);
-prepare_node(_Node, _Storage, Items, Rec, Kind) 
-  when Kind == schema, Rec#commit.schema_ops == []  ->
-    Rec#commit{schema_ops = Items};
-prepare_node(_Node, _Storage, [], Rec, _Kind) ->
-    Rec.
-
-%% multi_commit((Protocol, Tid, CommitRecords, Store)
-%% Local work is always performed in users process
-multi_commit(read_only, Tid, CR, _Store) ->
-    %% This featherweight commit protocol is used when no 
-    %% updates has been performed in the transaction.
-
-    {DiscNs, RamNs} = commit_nodes(CR, [], []),
-    Msg = {Tid, simple_commit},
-    rpc:abcast(DiscNs -- [node()], ?MODULE, Msg),
-    rpc:abcast(RamNs -- [node()], ?MODULE, Msg),
-    mnesia_recover:note_decision(Tid, committed),
-    mnesia_locker:release_tid(Tid),
-    ?MODULE ! {delete_transaction, Tid},
-    do_commit;
-
-multi_commit(sym_trans, Tid, CR, Store) ->
-    %% This lightweight commit protocol is used when all
-    %% the involved tables are replicated symetrically.
-    %% Their storage types must match on each node.
-    %%
-    %% 1  Ask the other involved nodes if they want to commit
-    %%    All involved nodes votes yes if they are up
-    %% 2a Somebody has voted no
-    %%    Tell all yes voters to do_abort
-    %% 2b Everybody has voted yes
-    %%    Tell everybody to do_commit. I.e. that they should
-    %%    prepare the commit, log the commit record and
-    %%    perform the updates.
-    %%
-    %%    The outcome is kept 3 minutes in the transient decision table.
-    %%    
-    %% Recovery:
-    %%    If somebody dies before the coordinator has
-    %%    broadcasted do_commit, the transaction is aborted.
-    %%    
-    %%    If a participant dies, the table load algorithm
-    %%    ensures that the contents of the involved tables
-    %%    are picked from another node.
-    %%
-    %%    If the coordinator dies, each participants checks
-    %%    the outcome with all the others. If all are uncertain
-    %%    about the outcome, the transaction is aborted. If
-    %%    somebody knows the outcome the others will follow.
-    
-    {DiscNs, RamNs} = commit_nodes(CR, [], []),
-    Pending = mnesia_checkpoint:tm_enter_pending(Tid, DiscNs, RamNs),
-    ?ets_insert(Store, Pending),
-
-    {WaitFor, Local} = ask_commit(sym_trans, Tid, CR, DiscNs, RamNs),
-    {Outcome, []} = rec_all(WaitFor, Tid, do_commit, []), 
-    ?eval_debug_fun({?MODULE, multi_commit_sym}, 
-		    [{tid, Tid}, {outcome, Outcome}]), 
-    rpc:abcast(DiscNs -- [node()], ?MODULE, {Tid, Outcome}),
-    rpc:abcast(RamNs -- [node()], ?MODULE, {Tid, Outcome}),
-    case Outcome of
-	do_commit ->
-	    mnesia_recover:note_decision(Tid, committed),
-	    do_dirty(Tid, Local),
-	    mnesia_locker:release_tid(Tid),
-	    ?MODULE ! {delete_transaction, Tid};
-	{do_abort, _Reason} ->
-	    mnesia_recover:note_decision(Tid, aborted)
-    end,
-    ?eval_debug_fun({?MODULE, multi_commit_sym, post},
-		    [{tid, Tid}, {outcome, Outcome}]),
-    Outcome;
-
-multi_commit(sync_sym_trans, Tid, CR, Store) ->
-    %%   This protocol is the same as sym_trans except that it
-    %%   uses syncronized calls to disk_log and syncronized commits
-    %%   when several nodes are involved.
-    
-    {DiscNs, RamNs} = commit_nodes(CR, [], []),
-    Pending = mnesia_checkpoint:tm_enter_pending(Tid, DiscNs, RamNs),
-    ?ets_insert(Store, Pending),
-
-    {WaitFor, Local} = ask_commit(sync_sym_trans, Tid, CR, DiscNs, RamNs),
-    {Outcome, []} = rec_all(WaitFor, Tid, do_commit, []), 
-    ?eval_debug_fun({?MODULE, multi_commit_sym_sync}, 
-		    [{tid, Tid}, {outcome, Outcome}]), 
-    rpc:abcast(DiscNs -- [node()], ?MODULE, {Tid, Outcome}),
-    rpc:abcast(RamNs -- [node()], ?MODULE, {Tid, Outcome}),
-    case Outcome of
-	do_commit ->
-	    mnesia_recover:note_decision(Tid, committed),
-	    mnesia_log:slog(Local),
-	    do_commit(Tid, Local),
-	    %% Just wait for completion result is ignore.
-	    rec_all(WaitFor, Tid, ignore, []),
-	    mnesia_locker:release_tid(Tid),
-	    ?MODULE ! {delete_transaction, Tid};
-	{do_abort, _Reason} ->
-	    mnesia_recover:note_decision(Tid, aborted)
-    end,
-    ?eval_debug_fun({?MODULE, multi_commit_sym, post},
-		    [{tid, Tid}, {outcome, Outcome}]),
-    Outcome;
-
-multi_commit(asym_trans, Tid, CR, Store) ->
-    %% This more expensive commit protocol is used when 
-    %% table definitions are changed (schema transactions).
-    %% It is also used when the involved tables are
-    %% replicated asymetrically. If the storage type differs
-    %% on at least one node this protocol is used.
-    %%
-    %% 1 Ask the other involved nodes if they want to commit.
-    %%   All involved nodes prepares the commit, logs a presume_abort
-    %%   commit record and votes yes or no depending of the
-    %%   outcome of the prepare. The preparation is also performed
-    %%   by the coordinator.
-    %%   
-    %% 2a Somebody has died or voted no
-    %%    Tell all yes voters to do_abort
-    %% 2b Everybody has voted yes
-    %%    Put a unclear marker in the log.
-    %%    Tell the others to pre_commit. I.e. that they should
-    %%    put a unclear marker in the log and reply
-    %%    acc_pre_commit when they are done. 
-    %%
-    %% 3a Somebody died
-    %%    Tell the remaining participants to do_abort
-    %% 3b Everybody has replied acc_pre_commit
-    %%    Tell everybody to committed. I.e that they should
-    %%    put a committed marker in the log, perform the updates
-    %%    and reply done_commit when they are done. The coordinator
-    %%    must wait with putting his committed marker inte the log
-    %%    until the committed has been sent to all the others.
-    %%    Then he performs local commit before collecting replies.
-    %%
-    %% 4  Everybody has either died or replied done_commit
-    %%    Return to the caller.
-    %%
-    %% Recovery:
-    %%    If the coordinator dies, the participants (and
-    %%    the coordinator when he starts again) must do
-    %%    the following:
-    %%
-    %%    If we have no unclear marker in the log we may
-    %%    safely abort, since we know that nobody may have
-    %%    decided to commit yet.
-    %%    
-    %%    If we have a committed marker in the log we may
-    %%    safely commit since we know that everybody else
-    %%    also will come to this conclusion.
-    %%
-    %%    If we have a unclear marker but no committed
-    %%    in the log we are uncertain about the real outcome
-    %%    of the transaction and must ask the others before
-    %%    we can decide what to do. If someone knows the
-    %%    outcome we will do the same. If nobody knows, we
-    %%    will wait for the remaining involved nodes to come
-    %%    up. When all involved nodes are up and uncertain,
-    %%    we decide to commit (first put a committed marker
-    %%    in the log, then do the updates).
-    
-    D = #decision{tid = Tid, outcome = presume_abort},
-    {D2, CR2} = commit_decision(D, CR, [], []),
-    DiscNs = D2#decision.disc_nodes,
-    RamNs = D2#decision.ram_nodes,
-    Pending = mnesia_checkpoint:tm_enter_pending(Tid, DiscNs, RamNs),
-    ?ets_insert(Store, Pending),
-    {WaitFor, Local} = ask_commit(asym_trans, Tid, CR2, DiscNs, RamNs),
-    SchemaPrep = (catch mnesia_schema:prepare_commit(Tid, Local, {coord, WaitFor})), 
-    {Votes, Pids} = rec_all(WaitFor, Tid, do_commit, []), 
-    
-    ?eval_debug_fun({?MODULE, multi_commit_asym_got_votes}, 
-		    [{tid, Tid}, {votes, Votes}]),
-    case Votes of
-	do_commit ->
-	    case SchemaPrep of
-		{_Modified, C, DumperMode} when record(C, commit) ->
-		    mnesia_log:log(C), % C is not a binary
-		    ?eval_debug_fun({?MODULE, multi_commit_asym_log_commit_rec},
-				    [{tid, Tid}]),
-		    
-		    D3 = C#commit.decision,
-		    D4 = D3#decision{outcome = unclear},		
-		    mnesia_recover:log_decision(D4),			
-		    ?eval_debug_fun({?MODULE, multi_commit_asym_log_commit_dec},
-				    [{tid, Tid}]),
-		    tell_participants(Pids, {Tid, pre_commit}),
-		    %% Now we are uncertain and we do not know
-		    %% if all participants have logged that
-		    %% they are uncertain or not
-		    rec_acc_pre_commit(Pids, Tid, Store, C, 
-				       do_commit, DumperMode, [], []);
-		{'EXIT', Reason} ->
-		    %% The others have logged the commit 
-		    %% record but they are not uncertain
-		    mnesia_recover:note_decision(Tid, aborted),
-		    ?eval_debug_fun({?MODULE, multi_commit_asym_prepare_exit},
-				    [{tid, Tid}]),
-		    tell_participants(Pids, {Tid, {do_abort, Reason}}),
-		    do_abort(Tid, Local),
-		    {do_abort, Reason}
-	    end;
-
-	{do_abort, Reason} ->
-	    %% The others have logged the commit
-	    %% record but they are not uncertain
-	    mnesia_recover:note_decision(Tid, aborted),
-	    ?eval_debug_fun({?MODULE, multi_commit_asym_do_abort}, [{tid, Tid}]),
-	    tell_participants(Pids, {Tid, {do_abort, Reason}}),
-	    do_abort(Tid, Local),
-	    {do_abort, Reason}
-    end.
-
-%% Returns do_commit or {do_abort, Reason}
-rec_acc_pre_commit([Pid | Tail], Tid, Store, Commit, Res, DumperMode, 
-		   GoodPids, SchemaAckPids) ->
-    receive
-	{?MODULE, _, {acc_pre_commit, Tid, Pid, true}} ->
-	    rec_acc_pre_commit(Tail, Tid, Store, Commit, Res, DumperMode,
-			       [Pid | GoodPids], [Pid | SchemaAckPids]);
-
-	{?MODULE, _, {acc_pre_commit, Tid, Pid, false}} ->
-	    rec_acc_pre_commit(Tail, Tid, Store, Commit, Res, DumperMode,
-			       [Pid | GoodPids], SchemaAckPids);
-
-	{?MODULE, _, {acc_pre_commit, Tid, Pid}} ->
-	    %% Kept for backwards compatibility. Remove after Mnesia 4.x
-	    rec_acc_pre_commit(Tail, Tid, Store, Commit, Res, DumperMode,
-			       [Pid | GoodPids], [Pid | SchemaAckPids]);
-
-	{mnesia_down, Node} when Node == node(Pid) ->
-	    AbortRes = {do_abort, {bad_commit, Node}},
-	    rec_acc_pre_commit(Tail, Tid, Store, Commit, AbortRes, DumperMode,
-			       GoodPids, SchemaAckPids)
-    end;
-rec_acc_pre_commit([], Tid, Store, Commit, Res, DumperMode, GoodPids, SchemaAckPids) ->
-    D = Commit#commit.decision,
-    case Res of
-	do_commit ->
-	    %% Now everybody knows that the others
-	    %% has voted yes. We also know that
-	    %% everybody are uncertain.
-	    prepare_sync_schema_commit(Store, SchemaAckPids),
-	    tell_participants(GoodPids, {Tid, committed}),
-	    D2 = D#decision{outcome = committed},		
-	    mnesia_recover:log_decision(D2),
-            ?eval_debug_fun({?MODULE, rec_acc_pre_commit_log_commit},
-			    [{tid, Tid}]),
-
-	    %% Now we have safely logged committed
-	    %% and we can recover without asking others
-	    do_commit(Tid, Commit, DumperMode),
-            ?eval_debug_fun({?MODULE, rec_acc_pre_commit_done_commit},
-			    [{tid, Tid}]),
-	    sync_schema_commit(Tid, Store, SchemaAckPids),
-	    mnesia_locker:release_tid(Tid),
-	    ?MODULE ! {delete_transaction, Tid};
-	
-	{do_abort, Reason} ->
-	    tell_participants(GoodPids, {Tid, {do_abort, Reason}}),
-	    D2 = D#decision{outcome = aborted},		
-	    mnesia_recover:log_decision(D2),
-            ?eval_debug_fun({?MODULE, rec_acc_pre_commit_log_abort},
-			    [{tid, Tid}]),
-	    do_abort(Tid, Commit),
-	    ?eval_debug_fun({?MODULE, rec_acc_pre_commit_done_abort},
-			    [{tid, Tid}])
-    end,
-    Res.
-
-%% Note all nodes in case of mnesia_down mgt
-prepare_sync_schema_commit(_Store, []) ->
-    ok;
-prepare_sync_schema_commit(Store, [Pid | Pids]) ->
-    ?ets_insert(Store, {waiting_for_commit_ack, node(Pid)}),
-    prepare_sync_schema_commit(Store, Pids).
-
-sync_schema_commit(_Tid, _Store, []) ->
-    ok;
-sync_schema_commit(Tid, Store, [Pid | Tail]) ->
-    receive
-	{?MODULE, _, {schema_commit, Tid, Pid}} ->
-	    ?ets_match_delete(Store, {waiting_for_commit_ack, node(Pid)}),
-	    sync_schema_commit(Tid, Store, Tail);
-
-	{mnesia_down, Node} when Node == node(Pid) ->
-	    ?ets_match_delete(Store, {waiting_for_commit_ack, Node}),
-	    sync_schema_commit(Tid, Store, Tail)
-    end.
-
-tell_participants([Pid | Pids], Msg) ->
-    Pid ! Msg,
-    tell_participants(Pids, Msg);
-tell_participants([], _Msg) ->
-    ok.
-
-%% No need for trapping exits. We are only linked
-%% to mnesia_tm and if it dies we should also die.
-%% The same goes for disk_log and dets.
-commit_participant(Coord, Tid, Bin, DiscNs, RamNs) when binary(Bin) ->
-    Commit = binary_to_term(Bin),
-    commit_participant(Coord, Tid, Bin, Commit, DiscNs, RamNs);
-commit_participant(Coord, Tid, C, DiscNs, RamNs) when record(C, commit) ->
-    commit_participant(Coord, Tid, C, C, DiscNs, RamNs).
-
-commit_participant(Coord, Tid, Bin, C0, DiscNs, _RamNs) ->
-    ?eval_debug_fun({?MODULE, commit_participant, pre}, [{tid, Tid}]),
-    case catch mnesia_schema:prepare_commit(Tid, C0, {part, Coord}) of
-	{Modified, C, DumperMode} when record(C, commit) ->
-	    %% If we can not find any local unclear decision
-	    %% we should presume abort at startup recovery
-	    case lists:member(node(), DiscNs) of
-		false ->
-		    ignore;
-		true ->
-		    case Modified of
-			false -> mnesia_log:log(Bin);
-			true  -> mnesia_log:log(C)
-		    end
-	    end,
-	    ?eval_debug_fun({?MODULE, commit_participant, vote_yes},
-			    [{tid, Tid}]),
-	    reply(Coord, {vote_yes, Tid, self()}),
-
-	    receive
-		{Tid, pre_commit} ->
-		    D = C#commit.decision,
-		    mnesia_recover:log_decision(D#decision{outcome = unclear}),
-		    ?eval_debug_fun({?MODULE, commit_participant, pre_commit},
-				    [{tid, Tid}]),
-		    Expect_schema_ack = C#commit.schema_ops /= [],
-		    reply(Coord, {acc_pre_commit, Tid, self(), Expect_schema_ack}),
-
-		    %% Now we are vulnerable for failures, since
-		    %% we cannot decide without asking others
-		    receive
-			{Tid, committed} ->
-			    mnesia_recover:log_decision(D#decision{outcome = committed}),
-			    ?eval_debug_fun({?MODULE, commit_participant, log_commit},
-					    [{tid, Tid}]),
-			    do_commit(Tid, C, DumperMode),
-			    case Expect_schema_ack of
-				false -> ignore;
-				true -> reply(Coord, {schema_commit, Tid, self()})
-			    end,
-			    ?eval_debug_fun({?MODULE, commit_participant, do_commit},
-					    [{tid, Tid}]);
-			
-			{Tid, {do_abort, _Reason}} ->
-			    mnesia_recover:log_decision(D#decision{outcome = aborted}),
-			    ?eval_debug_fun({?MODULE, commit_participant, log_abort},
-					    [{tid, Tid}]),
-			    mnesia_schema:undo_prepare_commit(Tid, C),
-			    ?eval_debug_fun({?MODULE, commit_participant, undo_prepare},
-					    [{tid, Tid}]);
-			
-			{'EXIT', _, _} ->
-			    mnesia_recover:log_decision(D#decision{outcome = aborted}),
-			    ?eval_debug_fun({?MODULE, commit_participant, exit_log_abort},
-					    [{tid, Tid}]),
-			    mnesia_schema:undo_prepare_commit(Tid, C),
-			    ?eval_debug_fun({?MODULE, commit_participant, exit_undo_prepare},
-					    [{tid, Tid}]);
-			
-			Msg ->
-			    verbose("** ERROR ** commit_participant ~p, got unexpected msg: ~p~n",
-				  [Tid, Msg])
-		    end;
-		{Tid, {do_abort, _Reason}} ->
-		    mnesia_schema:undo_prepare_commit(Tid, C),
-		    ?eval_debug_fun({?MODULE, commit_participant, pre_commit_undo_prepare},
-				    [{tid, Tid}]);
-
-		{'EXIT', _, _} ->
-		    mnesia_schema:undo_prepare_commit(Tid, C),
-		    ?eval_debug_fun({?MODULE, commit_participant, pre_commit_undo_prepare}, [{tid, Tid}]);
-
-		Msg ->
-		    verbose("** ERROR ** commit_participant ~p, got unexpected msg: ~p~n",
-			  [Tid, Msg])
-	    end;
-
-	{'EXIT', Reason} ->
-	    ?eval_debug_fun({?MODULE, commit_participant, vote_no},
-			    [{tid, Tid}]),
-	    reply(Coord, {vote_no, Tid, Reason}),
-	    mnesia_schema:undo_prepare_commit(Tid, C0)
-    end,
-    mnesia_locker:release_tid(Tid),
-    ?MODULE ! {delete_transaction, Tid},
-    unlink(whereis(?MODULE)),
-    exit(normal).
-    
-do_abort(Tid, Bin) when binary(Bin) ->
-    %% Possible optimization:
-    %% If we want we could pass arround a flag
-    %% that tells us whether the binary contains
-    %% schema ops or not. Only if the binary
-    %% contains schema ops there are meningful
-    %% unpack the binary and perform
-    %% mnesia_schema:undo_prepare_commit/1.
-    do_abort(Tid, binary_to_term(Bin));
-do_abort(Tid, Commit) ->
-    mnesia_schema:undo_prepare_commit(Tid, Commit), 
-    Commit.
-
-do_dirty(Tid, Commit) when Commit#commit.schema_ops == [] ->
-    mnesia_log:log(Commit),
-    do_commit(Tid, Commit).
-
-%% do_commit(Tid, CommitRecord)
-do_commit(Tid, Bin) when binary(Bin) ->
-    do_commit(Tid, binary_to_term(Bin));
-do_commit(Tid, C) ->
-    do_commit(Tid, C, optional).
-do_commit(Tid, Bin, DumperMode) when binary(Bin) ->
-    do_commit(Tid, binary_to_term(Bin), DumperMode);
-do_commit(Tid, C, DumperMode) ->
-    mnesia_dumper:update(Tid, C#commit.schema_ops, DumperMode),
-    R  = do_snmp(Tid, C#commit.snmp),
-    R2 = do_update(Tid, ram_copies, C#commit.ram_copies, R),
-    R3 = do_update(Tid, disc_copies, C#commit.disc_copies, R2),
-    do_update(Tid, disc_only_copies, C#commit.disc_only_copies, R3).
-
-%% Update the items
-do_update(Tid, Storage, [Op | Ops], OldRes) ->
-    case catch do_update_op(Tid, Storage, Op) of
-	ok ->
-	    do_update(Tid, Storage, Ops, OldRes);
-	{'EXIT', Reason} ->
-	    %% This may only happen when we recently have
-	    %% deleted our local replica, changed storage_type
-	    %% or transformed table
-	    %% BUGBUG: Updates may be lost if storage_type is changed.
-	    %%         Determine actual storage type and try again.
-	    %% BUGBUG: Updates may be lost if table is transformed.
-
-	    verbose("do_update in ~w failed: ~p -> {'EXIT', ~p}~n",
-		    [Tid, Op, Reason]),
-	    do_update(Tid, Storage, Ops, OldRes); 
-	NewRes ->
-	    do_update(Tid, Storage, Ops, NewRes)
-    end;
-do_update(_Tid, _Storage, [], Res) ->
-    Res.
-
-do_update_op(Tid, Storage, {{Tab, K}, Obj, write}) ->
-    commit_write(?catch_val({Tab, commit_work}), Tid, 
-		 Tab, K, Obj, undefined),
-    mnesia_lib:db_put(Storage, Tab, Obj);
-
-do_update_op(Tid, Storage, {{Tab, K}, Val, delete}) ->
-    commit_delete(?catch_val({Tab, commit_work}), Tid, Tab, K, Val, undefined),
-    mnesia_lib:db_erase(Storage, Tab, K);
-
-do_update_op(Tid, Storage, {{Tab, K}, {RecName, Incr}, update_counter}) ->
-    {NewObj, OldObjs} = 
-        case catch mnesia_lib:db_update_counter(Storage, Tab, K, Incr) of
-            NewVal when integer(NewVal), NewVal >= 0 ->
-                {{RecName, K, NewVal}, [{RecName, K, NewVal - Incr}]};
-            _ ->
-                Zero = {RecName, K, 0},
-                mnesia_lib:db_put(Storage, Tab, Zero),
-                {Zero, []}
-        end,
-    commit_update(?catch_val({Tab, commit_work}), Tid, Tab, 
-		  K, NewObj, OldObjs),
-    element(3, NewObj);
-
-do_update_op(Tid, Storage, {{Tab, Key}, Obj, delete_object}) ->
-    commit_del_object(?catch_val({Tab, commit_work}), 
-		      Tid, Tab, Key, Obj, undefined),
-    mnesia_lib:db_match_erase(Storage, Tab, Obj);
-
-do_update_op(Tid, Storage, {{Tab, Key}, Obj, clear_table}) ->
-    commit_clear(?catch_val({Tab, commit_work}), Tid, Tab, Key, Obj),
-    mnesia_lib:db_match_erase(Storage, Tab, Obj).
-
-commit_write([], _, _, _, _, _) -> ok;
-commit_write([{checkpoints, CpList}|R], Tid, Tab, K, Obj, Old) ->
-    mnesia_checkpoint:tm_retain(Tid, Tab, K, write, CpList),
-    commit_write(R, Tid, Tab, K, Obj, Old);
-commit_write([H|R], Tid, Tab, K, Obj, Old) 
-  when element(1, H) == subscribers ->
-    mnesia_subscr:report_table_event(H, Tab, Tid, Obj, write, Old),
-    commit_write(R, Tid, Tab, K, Obj, Old);
-commit_write([H|R], Tid, Tab, K, Obj, Old) 
-  when element(1, H) == index ->
-    mnesia_index:add_index(H, Tab, K, Obj, Old),
-    commit_write(R, Tid, Tab, K, Obj, Old).
-
-commit_update([], _, _, _, _, _) -> ok;
-commit_update([{checkpoints, CpList}|R], Tid, Tab, K, Obj, _) ->
-    Old = mnesia_checkpoint:tm_retain(Tid, Tab, K, write, CpList),
-    commit_update(R, Tid, Tab, K, Obj, Old);
-commit_update([H|R], Tid, Tab, K, Obj, Old) 
-  when element(1, H) == subscribers ->
-    mnesia_subscr:report_table_event(H, Tab, Tid, Obj, write, Old),
-    commit_update(R, Tid, Tab, K, Obj, Old);
-commit_update([H|R], Tid, Tab, K, Obj, Old) 
-  when element(1, H) == index ->
-    mnesia_index:add_index(H, Tab, K, Obj, Old),
-    commit_update(R, Tid, Tab, K, Obj, Old).
-
-commit_delete([], _, _, _, _, _) ->  ok;
-commit_delete([{checkpoints, CpList}|R], Tid, Tab, K, Obj, _) ->
-    Old = mnesia_checkpoint:tm_retain(Tid, Tab, K, delete, CpList),
-    commit_delete(R, Tid, Tab, K, Obj, Old);
-commit_delete([H|R], Tid, Tab, K, Obj, Old) 
-  when element(1, H) == subscribers ->
-    mnesia_subscr:report_table_event(H, Tab, Tid, Obj, delete, Old),
-    commit_delete(R, Tid, Tab, K, Obj, Old);
-commit_delete([H|R], Tid, Tab, K, Obj, Old) 
-  when element(1, H) == index ->
-    mnesia_index:delete_index(H, Tab, K),
-    commit_delete(R, Tid, Tab, K, Obj, Old).
-
-commit_del_object([], _, _, _, _, _) -> ok;
-commit_del_object([{checkpoints, CpList}|R], Tid, Tab, K, Obj, _) ->
-    Old = mnesia_checkpoint:tm_retain(Tid, Tab, K, delete_object, CpList),
-    commit_del_object(R, Tid, Tab, K, Obj, Old);
-commit_del_object([H|R], Tid, Tab, K, Obj, Old) 
-  when element(1, H) == subscribers -> 
-    mnesia_subscr:report_table_event(H, Tab, Tid, Obj, delete_object, Old),
-    commit_del_object(R, Tid, Tab, K, Obj, Old);
-commit_del_object([H|R], Tid, Tab, K, Obj, Old) 
-  when element(1, H) == index -> 
-    mnesia_index:del_object_index(H, Tab, K, Obj, Old),
-    commit_del_object(R, Tid, Tab, K, Obj, Old).
-
-commit_clear([], _, _, _, _) ->  ok;
-commit_clear([{checkpoints, CpList}|R], Tid, Tab, K, Obj) ->
-    mnesia_checkpoint:tm_retain(Tid, Tab, K, clear_table, CpList),
-    commit_clear(R, Tid, Tab, K, Obj);
-commit_clear([H|R], Tid, Tab, K, Obj) 
-  when element(1, H) == subscribers ->
-    mnesia_subscr:report_table_event(H, Tab, Tid, Obj, clear_table, undefined),
-    commit_clear(R, Tid, Tab, K, Obj);
-commit_clear([H|R], Tid, Tab, K, Obj) 
-  when element(1, H) == index ->
-    mnesia_index:clear_index(H, Tab, K, Obj),
-    commit_clear(R, Tid, Tab, K, Obj).
-
-do_snmp(_, []) ->   ok;
-do_snmp(Tid, [Head | Tail]) ->
-    case catch mnesia_snmp_hook:update(Head) of
-	{'EXIT', Reason} ->
-	    %% This should only happen when we recently have
-	    %% deleted our local replica or recently deattached
-	    %% the snmp table 
-
-	    verbose("do_snmp in ~w failed: ~p -> {'EXIT', ~p}~n",
-		    [Tid, Head, Reason]);
-	ok ->
-	    ignore
-    end,
-    do_snmp(Tid, Tail).
-
-commit_nodes([C | Tail], AccD, AccR) 
-        when C#commit.disc_copies == [],
-             C#commit.disc_only_copies  == [],
-             C#commit.schema_ops == [] ->
-    commit_nodes(Tail, AccD, [C#commit.node | AccR]);
-commit_nodes([C | Tail], AccD, AccR) ->
-    commit_nodes(Tail, [C#commit.node | AccD], AccR);
-commit_nodes([], AccD, AccR) ->
-    {AccD, AccR}.
-
-commit_decision(D, [C | Tail], AccD, AccR) ->
-    N = C#commit.node,
-    {D2, Tail2} = 
-	case C#commit.schema_ops of
-	    [] when C#commit.disc_copies == [],
-		    C#commit.disc_only_copies  == [] ->
-		commit_decision(D, Tail, AccD, [N | AccR]);
-	    [] ->
-		commit_decision(D, Tail, [N | AccD], AccR);
-	    Ops ->
-		case ram_only_ops(N, Ops) of
-		    true ->
-			commit_decision(D, Tail, AccD, [N | AccR]);
-		    false ->
-			commit_decision(D, Tail, [N | AccD], AccR)
-		end
-	end,
-    {D2, [C#commit{decision = D2} | Tail2]};
-commit_decision(D, [], AccD, AccR) ->
-    {D#decision{disc_nodes = AccD, ram_nodes = AccR}, []}.
-
-ram_only_ops(N, [{op, change_table_copy_type, N, _FromS, _ToS, Cs} | _Ops ]) ->
-    case lists:member({name, schema}, Cs) of 
-	true -> 
-	    %% We always use disk if change type of the schema
-	    false;
-	false ->
-	    not lists:member(N, val({schema, disc_copies}))
-    end;
-
-ram_only_ops(N, _Ops) ->
-    not lists:member(N, val({schema, disc_copies})).
-
-%% Returns {WaitFor, Res}
-sync_send_dirty(Tid, [Head | Tail], Tab, WaitFor) ->
-    Node = Head#commit.node,
-    if
-	Node == node() ->
-	    {WF, _} = sync_send_dirty(Tid, Tail, Tab, WaitFor),
-	    Res =  do_dirty(Tid, Head),
-	    {WF, Res};
-	true ->
-    	    {?MODULE, Node} ! {self(), {sync_dirty, Tid, Head, Tab}},
-	    sync_send_dirty(Tid, Tail, Tab, [Node | WaitFor])
-    end;
-sync_send_dirty(_Tid, [], _Tab, WaitFor) ->
-    {WaitFor, {'EXIT', {aborted, {node_not_running, WaitFor}}}}.
-
-%% Returns {WaitFor, Res}
-async_send_dirty(_Tid, _Nodes, Tab, nowhere) ->
-    {[], {'EXIT', {aborted, {no_exists, Tab}}}};
-async_send_dirty(Tid, Nodes, Tab, ReadNode) ->
-    async_send_dirty(Tid, Nodes, Tab, ReadNode, [], ok).
-
-async_send_dirty(Tid, [Head | Tail], Tab, ReadNode, WaitFor, Res) ->
-    Node = Head#commit.node,
-    if
-	ReadNode == Node, Node == node() ->
-	    NewRes =  do_dirty(Tid, Head),
-	    async_send_dirty(Tid, Tail, Tab, ReadNode, WaitFor, NewRes);
-	ReadNode == Node ->
-	    {?MODULE, Node} ! {self(), {sync_dirty, Tid, Head, Tab}},
-	    NewRes = {'EXIT', {aborted, {node_not_running, Node}}},
-	    async_send_dirty(Tid, Tail, Tab, ReadNode, [Node | WaitFor], NewRes);
-	true ->
-	    {?MODULE, Node} ! {self(), {async_dirty, Tid, Head, Tab}},
-	    async_send_dirty(Tid, Tail, Tab, ReadNode, WaitFor, Res)
-    end;
-async_send_dirty(_Tid, [], _Tab, _ReadNode, WaitFor, Res) ->
-    {WaitFor, Res}.
-
-rec_dirty([Node | Tail], Res) when Node /= node() ->
-    NewRes = get_dirty_reply(Node, Res),
-    rec_dirty(Tail, NewRes);
-rec_dirty([], Res) ->
-    Res.
-
-get_dirty_reply(Node, Res) ->
-    receive
-	{?MODULE, Node, {'EXIT', Reason}} ->
-	    {'EXIT', {aborted, {badarg, Reason}}};
-	{?MODULE, Node, {dirty_res, ok}} ->
-	    case Res of
-		{'EXIT', {aborted, {node_not_running, _Node}}} ->
-		    ok;
-		_ ->
-		    %% Prioritize bad results, but node_not_running
-		    Res
-	    end;
-	{?MODULE, Node, {dirty_res, Reply}} ->
-	    Reply;
-	{mnesia_down, Node} ->
-	    %% It's ok to ignore mnesia_down's 
-	    %% since we will make the replicas
-	    %% consistent again when Node is started
-	    Res
-    after 1000 ->
-	    case lists:member(Node, val({current, db_nodes})) of
-		true ->
-		    get_dirty_reply(Node, Res);
-		false ->
-		    Res
-	    end
-    end.
-
-%% Assume that CommitRecord is no binary
-%% Return {Res, Pids}
-ask_commit(Protocol, Tid, CR, DiscNs, RamNs) ->
-    ask_commit(Protocol, Tid, CR, DiscNs, RamNs, [], no_local).
-
-ask_commit(Protocol, Tid, [Head | Tail], DiscNs, RamNs, WaitFor, Local) ->
-    Node = Head#commit.node,
-    if
-	Node == node() ->
-	    ask_commit(Protocol, Tid, Tail, DiscNs, RamNs, WaitFor, Head);
-	true ->
-	    Bin = opt_term_to_binary(Protocol, Head, DiscNs++RamNs),
-	    Msg = {ask_commit, Protocol, Tid, Bin, DiscNs, RamNs},
-	    {?MODULE, Node} ! {self(), Msg},
-	    ask_commit(Protocol, Tid, Tail, DiscNs, RamNs, [Node | WaitFor], Local)
-    end;
-ask_commit(_Protocol, _Tid, [], _DiscNs, _RamNs, WaitFor, Local) ->
-    {WaitFor, Local}.
-
-opt_term_to_binary(asym_trans, Head, Nodes) ->
-    opt_term_to_binary(Nodes, Head);
-opt_term_to_binary(_Protocol, Head, _Nodes) ->
-    Head.
-    
-opt_term_to_binary([], Head) ->
-    term_to_binary(Head);
-opt_term_to_binary([H|R], Head) ->
-    case mnesia_monitor:needs_protocol_conversion(H) of
-	true -> Head;
-	false -> 
-	    opt_term_to_binary(R, Head)
-    end.
-	    
-rec_all([Node | Tail], Tid, Res, Pids) ->
-    receive
-	{?MODULE, Node, {vote_yes, Tid}} ->
-	    rec_all(Tail, Tid, Res, Pids);
-	{?MODULE, Node, {vote_yes, Tid, Pid}} ->
-	    rec_all(Tail, Tid, Res, [Pid | Pids]);
-	{?MODULE, Node, {vote_no, Tid, Reason}} ->
-	    rec_all(Tail, Tid, {do_abort, Reason}, Pids);
-	{?MODULE, Node, {committed, Tid}} ->
-	    rec_all(Tail, Tid, Res, Pids);
-	{?MODULE, Node, {aborted, Tid}} ->
-	    rec_all(Tail, Tid, Res, Pids);
-
-	{mnesia_down, Node} ->  
-	    rec_all(Tail, Tid, {do_abort, {bad_commit, Node}}, Pids)
-    end;
-rec_all([], _Tid, Res, Pids) ->
-    {Res, Pids}.
-
-get_transactions() -> 
-    {info, Participant, Coordinator} = req(info),
-    lists:map(fun({Tid, _Tabs}) ->
-		      Status = tr_status(Tid,Participant),
-		      {Tid#tid.counter, Tid#tid.pid, Status}
-	      end,Coordinator).
-
-tr_status(Tid,Participant) ->
-    case lists:keymember(Tid, 1, Participant) of
-	true -> participant;
-	false  -> coordinator
-    end.
-
-get_info(Timeout) ->
-    case whereis(?MODULE) of
-	undefined ->
-	    {timeout, Timeout};
-	Pid ->
-	    Pid ! {self(), info},
-	    receive
-		{?MODULE, _, {info, Part, Coord}} ->
-		    {info, Part, Coord}
-	    after Timeout ->
-		    {timeout, Timeout}
-	    end
-    end.
-
-display_info(Stream, {timeout, T}) ->
-    io:format(Stream, "---> No info about coordinator and participant transactions, "
-	      "timeout ~p <--- ~n", [T]);
-    
-display_info(Stream, {info, Part, Coord}) ->
-    io:format(Stream, "---> Participant transactions <--- ~n", []),
-    lists:foreach(fun(P) -> pr_participant(Stream, P) end, Part),
-    io:format(Stream, "---> Coordinator transactions <---~n", []),
-    lists:foreach(fun({Tid, _Tabs}) -> pr_tid(Stream, Tid) end, Coord).
-
-pr_participant(Stream, P) ->
-    Commit0 = P#participant.commit,
-    Commit = 
-	if
-	    binary(Commit0) -> binary_to_term(Commit0);
-	    true -> Commit0
-	end,
-    pr_tid(Stream, P#participant.tid),
-    io:format(Stream, "with participant objects ~p~n", [Commit]).
-
-
-pr_tid(Stream, Tid) ->
-    io:format(Stream, "Tid: ~p (owned by ~p) ~n",
-	      [Tid#tid.counter, Tid#tid.pid]).
-
-info(Serial) ->
-    io:format( "Info about transaction with serial == ~p~n", [Serial]),
-    {info, Participant, Trs} = req(info),
-    search_pr_participant(Serial, Participant),
-    search_pr_coordinator(Serial, Trs).
-
-
-search_pr_coordinator(_S, []) -> no;
-search_pr_coordinator(S, [{Tid, _Ts}|Tail]) ->
-    case Tid#tid.counter of
-	S ->
-	    io:format( "Tid is coordinator, owner == \n", []),
-	    display_pid_info(Tid#tid.pid),
-	    search_pr_coordinator(S, Tail);
-	_ -> 
-	    search_pr_coordinator(S, Tail)
-    end.
-
-search_pr_participant(_S, []) -> 
-    false;
-search_pr_participant(S, [ P | Tail]) ->
-    Tid = P#participant.tid,
-    Commit0 = P#participant.commit,
-    if
-	Tid#tid.counter == S ->
-	    io:format( "Tid is participant to commit, owner == \n", []),
-	    Pid = Tid#tid.pid,
-	    display_pid_info(Pid),
-	    io:format( "Tid wants to write objects \n",[]),
-	    Commit = 
-		if
-		    binary(Commit0) -> binary_to_term(Commit0);
-		    true -> Commit0
-		end,
-	    
-	    io:format("~p~n", [Commit]),
-	    search_pr_participant(S,Tail);  %% !!!!!
-	true -> 
-	    search_pr_participant(S, Tail)
-    end.
-
-display_pid_info(Pid) ->
-    case rpc:pinfo(Pid) of
-	undefined ->
-	    io:format( "Dead process \n");
-	Info ->
-	    Call = fetch(initial_call, Info),
-	    Curr = case fetch(current_function, Info) of
-		       {Mod,F,Args} when list(Args) ->
-			   {Mod,F,length(Args)};
-		       Other ->
-			   Other
-		   end,
-	    Reds  = fetch(reductions, Info), 
-	    LM = length(fetch(messages, Info)),
-	    pformat(io_lib:format("~p", [Pid]),
-		    io_lib:format("~p", [Call]),
-		    io_lib:format("~p", [Curr]), Reds, LM)
-    end.
-
-pformat(A1, A2, A3, A4, A5) ->
-    io:format( "~-12s ~-21s ~-21s ~9w ~4w~n", [A1,A2,A3,A4,A5]).
-
-fetch(Key, Info) ->
-    case lists:keysearch(Key, 1, Info) of
-	{value, {_, Val}} ->
-	    Val;
-	_ ->
-	    0
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%  reconfigure stuff comes here ......
-%%%%%%%%%%%%%%%%%%%%%
-
-reconfigure_coordinators(N, [{Tid, [Store | _]} | Coordinators]) ->
-    case mnesia_recover:outcome(Tid, unknown) of
-	committed ->
-	    WaitingNodes = ?ets_lookup(Store, waiting_for_commit_ack),
-	    case lists:keymember(N, 2, WaitingNodes) of
-		false ->
-		    ignore; % avoid spurious mnesia_down messages
-		true ->
-		    send_mnesia_down(Tid, Store, N)
-	    end;
-	aborted ->
-	    ignore; % avoid spurious mnesia_down messages
-	_ ->
-	    %% Tell the coordinator about the mnesia_down
-	    send_mnesia_down(Tid, Store, N)
-    end,
-    reconfigure_coordinators(N, Coordinators);
-reconfigure_coordinators(_N, []) ->
-    ok.
-
-send_mnesia_down(Tid, Store, Node) ->
-    Msg = {mnesia_down, Node},
-    send_to_pids([Tid#tid.pid | get_friends(Store)], Msg).
-
-send_to_pids([Pid | Pids], Msg) ->
-    Pid ! Msg,
-    send_to_pids(Pids, Msg);
-send_to_pids([], _Msg) ->
-    ok.
-    
-reconfigure_participants(N, [P | Tail]) ->
-    case lists:member(N, P#participant.disc_nodes) or
-	 lists:member(N, P#participant.ram_nodes) of
-	false ->
-	    %% Ignore, since we are not a participant
-	    %% in the transaction.
-	    reconfigure_participants(N, Tail);
- 
-	true ->
-	    %% We are on a participant node, lets
-	    %% check if the dead one was a
-	    %% participant or a coordinator.
-	    Tid  = P#participant.tid,
-	    if 
-		node(Tid#tid.pid) /= N ->
-		    %% Another participant node died. Ignore.
-		    reconfigure_participants(N, Tail);
-
-		true ->
-		    %% The coordinator node has died and 
-		    %% we must determine the outcome of the
-		    %% transaction and tell mnesia_tm on all
-		    %% nodes (including the local node) about it
-		    verbose("Coordinator ~p in transaction ~p died~n",
-			    [Tid#tid.pid, Tid]),
-			    
-		    Nodes = P#participant.disc_nodes ++
-			    P#participant.ram_nodes,
-		    AliveNodes = Nodes  -- [N],
-		    Protocol =  P#participant.protocol,
-		    tell_outcome(Tid, Protocol, N, AliveNodes, AliveNodes),
-		    reconfigure_participants(N, Tail)
-	    end
-    end;
-reconfigure_participants(_, []) ->
-    [].
-
-%% We need to determine the outcome of the transaction and
-%% tell mnesia_tm on all involved nodes (including the local node)
-%% about the outcome.
-tell_outcome(Tid, Protocol, Node, CheckNodes, TellNodes) ->
-    Outcome = mnesia_recover:what_happened(Tid, Protocol, CheckNodes),
-    case Outcome of
-	aborted ->
-	    rpc:abcast(TellNodes, ?MODULE, {Tid,{do_abort, {mnesia_down, Node}}});
-	committed ->
-	    rpc:abcast(TellNodes, ?MODULE, {Tid, do_commit})
-    end,
-    Outcome.
-
-do_stop(#state{coordinators = Coordinators}) ->
-    Msg = {mnesia_down, node()},
-    lists:foreach(fun({Tid, _}) -> Tid#tid.pid ! Msg end, Coordinators),
-    mnesia_checkpoint:stop(),
-    mnesia_log:stop(),
-    exit(shutdown).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% System upgrade
-
-system_continue(_Parent, _Debug, State) ->
-    doit_loop(State).
-
-system_terminate(_Reason, _Parent, _Debug, State) ->
-    do_stop(State).
-
-system_code_change(State, _Module, _OldVsn, _Extra) ->
-    {ok, State}.
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/dialyzer_options b/lib/dialyzer/test/race_SUITE_data/dialyzer_options
index 44e1720715..44e1720715 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/race_SUITE_data/dialyzer_options
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args1 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args1
index 3bbe99d4af..3bbe99d4af 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args1
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args2 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args2
index 34176c66ac..34176c66ac 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args2
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args3 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args3
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args3
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args3
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args4 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args4
index 8c45de08c2..8c45de08c2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args4
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args4
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args5 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args5
index a4a0c021c2..a4a0c021c2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args5
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args5
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args6 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args6
index 10fa4c27e3..10fa4c27e3 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args6
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args6
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args7 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args7
index af43145c17..af43145c17 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args7
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args7
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args8 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args8
index 5a2b41ed8c..5a2b41ed8c 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_args8
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_args8
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_control_flow1 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow1
index d7df214939..d7df214939 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_control_flow1
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_control_flow2 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow2
index cdaeafb0ed..cdaeafb0ed 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_control_flow2
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_control_flow3 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow3
index d640f564cd..d640f564cd 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_control_flow3
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow3
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_control_flow4 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow4
index 6f34e75902..6f34e75902 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_control_flow4
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow4
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_control_flow5 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow5
index 5af592f43f..5af592f43f 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_control_flow5
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow5
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race1 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race1
index 98ccf34e7d..98ccf34e7d 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race1
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race2 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race2
index b6af99b4cc..b6af99b4cc 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race2
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race3 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race3
index d79182c289..d79182c289 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race3
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race3
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race4 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race4
index 5bb1b9f781..5bb1b9f781 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race4
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race4
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race5 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race5
index 7db320e758..7db320e758 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race5
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race5
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race6 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race6
index c029f79ed5..c029f79ed5 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_diff_atoms_race6
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_diff_atoms_race6
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_double1 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_double1
index b640b91271..b640b91271 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_double1
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_double1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_double2 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_double2
index cf61cb5ec3..cf61cb5ec3 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_double2
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_double2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_funs1 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_funs1
index 540a0cf388..540a0cf388 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_funs1
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_funs1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_funs2 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_funs2
index 6b618f72b6..6b618f72b6 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_funs2
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_funs2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_new b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_new
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_new
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_new
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_param b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_param
index 58f934a190..58f934a190 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/ets_insert_param
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_param
diff --git a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_public b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_public
new file mode 100644
index 0000000000..d091ce3b50
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_public
@@ -0,0 +1,2 @@
+
+ets_insert_public.erl:14: The call ets:insert(Foo::atom(),{'counter',number()}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Foo::atom(),'counter') call in ets_insert_public.erl on line 12
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/extract_translations b/lib/dialyzer/test/race_SUITE_data/results/extract_translations
index f7d5abc6f5..f7d5abc6f5 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/extract_translations
+++ b/lib/dialyzer/test/race_SUITE_data/results/extract_translations
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_diff_atoms_race1 b/lib/dialyzer/test/race_SUITE_data/results/mnesia_diff_atoms_race1
index f5e544dc2a..f5e544dc2a 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_diff_atoms_race1
+++ b/lib/dialyzer/test/race_SUITE_data/results/mnesia_diff_atoms_race1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_diff_atoms_race2 b/lib/dialyzer/test/race_SUITE_data/results/mnesia_diff_atoms_race2
index 0ad0bc0afd..0ad0bc0afd 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_diff_atoms_race2
+++ b/lib/dialyzer/test/race_SUITE_data/results/mnesia_diff_atoms_race2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_one_write_two b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_one_write_two
index a4f3c269f1..a4f3c269f1 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_one_write_two
+++ b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_one_write_two
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_two_write_one b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_two_write_one
index 6e666d755f..6e666d755f 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_two_write_one
+++ b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_two_write_one
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_double1 b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_double1
index e953c6948b..e953c6948b 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_double1
+++ b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_double1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_double2 b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_double2
index 2a0b4eddd0..2a0b4eddd0 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_double2
+++ b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_double2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_double3 b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_double3
index fe51a5e838..fe51a5e838 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_double3
+++ b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_double3
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_double4 b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_double4
index d6a60d847a..d6a60d847a 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_double4
+++ b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_double4
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_one b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_one
index b47f66eb79..b47f66eb79 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_one
+++ b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_one
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_two b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_two
index 2faf55fe72..2faf55fe72 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/mnesia_dirty_read_write_two
+++ b/lib/dialyzer/test/race_SUITE_data/results/mnesia_dirty_read_write_two
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow1 b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow1
index 0fcf13c50a..0fcf13c50a 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow1
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow2 b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow2
index d0c048701d..d0c048701d 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow2
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow3 b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow3
index 0d93428758..0d93428758 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow3
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow3
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow4 b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow4
index f0ce12d0a4..f0ce12d0a4 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow4
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow4
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow5 b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow5
index fd809139e4..fd809139e4 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow5
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow5
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow6 b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow6
index ba89cc5624..ba89cc5624 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_control_flow6
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_control_flow6
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_atoms_no_race b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_atoms_no_race
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_atoms_no_race
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_atoms_no_race
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_atoms_race b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_atoms_race
index 76c746e2f4..76c746e2f4 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_atoms_race
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_atoms_race
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions1 b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions1
index 14c157885f..14c157885f 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions1
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions1_nested b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions1_nested
index c791d4b347..c791d4b347 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions1_nested
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions1_nested
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions1_pathsens b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions1_pathsens
index d22e696196..d22e696196 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions1_pathsens
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions1_pathsens
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions1_twice b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions1_twice
index 3024c77d91..3024c77d91 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions1_twice
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions1_twice
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions2 b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions2
index 9a22eb7e17..9a22eb7e17 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions2
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions2_nested b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions2_nested
index 0e757fbccc..0e757fbccc 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions2_nested
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions2_nested
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions2_pathsens b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions2_pathsens
index c102b39243..c102b39243 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions2_pathsens
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions2_pathsens
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions2_twice b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions2_twice
index b048bc6bed..b048bc6bed 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions2_twice
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions2_twice
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions3 b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions3
index 6d5154b411..6d5154b411 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions3
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions3
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions3_nested b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions3_nested
index 298c4c7178..298c4c7178 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions3_nested
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions3_nested
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions3_pathsens b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions3_pathsens
index 5d1ea5bda5..5d1ea5bda5 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions3_pathsens
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions3_pathsens
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions4 b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions4
index cb51301f1e..cb51301f1e 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions4
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions4
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions5 b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions5
index 34c477e05a..34c477e05a 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions5
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions5
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions6 b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions6
index 8840ef4ca7..8840ef4ca7 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_functions6
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_functions6
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules1 b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules1
index 8f7d0b7a17..8f7d0b7a17 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules1
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules1_pathsens b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules1_pathsens
index 40d36eb7d2..40d36eb7d2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules1_pathsens
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules1_pathsens
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules1_rec b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules1_rec
index 278b679aba..278b679aba 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules1_rec
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules1_rec
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules2 b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules2
index a4e5a000e2..a4e5a000e2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules2
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules2_pathsens b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules2_pathsens
index cc93133019..cc93133019 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules2_pathsens
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules2_pathsens
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules2_rec b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules2_rec
index 8874ab3553..8874ab3553 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules2_rec
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules2_rec
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules3 b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules3
index 8e839a53dc..8e839a53dc 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules3
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules3
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules_nested b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules_nested
index 9192dc0708..9192dc0708 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules_nested
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules_nested
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules_twice b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules_twice
index 3758347255..3758347255 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_modules_twice
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_modules_twice
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_vars_no_race b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_vars_no_race
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_vars_no_race
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_vars_no_race
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_vars_race b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_vars_race
index e34b4d2138..e34b4d2138 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_diff_vars_race
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_diff_vars_race
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module1 b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module1
index 3ed6f50d8d..3ed6f50d8d 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module1
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module2 b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module2
index 737054fe67..737054fe67 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module2
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module3 b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module3
index 4111498efe..4111498efe 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module3
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module3
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module4 b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module4
index 4e70a8efa1..4e70a8efa1 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module4
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module4
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module5 b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module5
index f6a10f52fd..f6a10f52fd 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module5
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module5
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module6 b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module6
index a8623ee985..a8623ee985 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module6
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module6
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module7 b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module7
index e39d630c75..e39d630c75 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module7
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module7
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module8 b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module8
index 58ae498bd4..58ae498bd4 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_intra_inter_module8
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_intra_inter_module8
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_param b/lib/dialyzer/test/race_SUITE_data/results/whereis_param
index fb7563b1c7..fb7563b1c7 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_param
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_param
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_param_inter_module b/lib/dialyzer/test/race_SUITE_data/results/whereis_param_inter_module
index fc3e9ca59d..fc3e9ca59d 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_param_inter_module
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_param_inter_module
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function1 b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function1
index 2cf1960d65..2cf1960d65 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function1
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function2 b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function2
index 4b55bc61ad..4b55bc61ad 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function2
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function3 b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function3
index 638e9b0f4b..638e9b0f4b 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function3
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function3
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function4 b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function4
index f255cb8170..f255cb8170 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function4
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function4
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function5 b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function5
index 78d81b9a57..78d81b9a57 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function5
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function5
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function6 b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function6
index 6df6de1922..6df6de1922 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function6
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function6
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function7 b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function7
index f3ddb0b537..f3ddb0b537 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function7
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function7
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function8 b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function8
index 9d731ada29..9d731ada29 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_rec_function8
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_rec_function8
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_try_catch b/lib/dialyzer/test/race_SUITE_data/results/whereis_try_catch
index fecb0756bd..fecb0756bd 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_try_catch
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_try_catch
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars1 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars1
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars1
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars1
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars10 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars10
index 36a59096e0..36a59096e0 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars10
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars10
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars11 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars11
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars11
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars11
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars12 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars12
index d34e1b1c7e..d34e1b1c7e 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars12
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars12
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars13 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars13
index e6ae40cee0..e6ae40cee0 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars13
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars13
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars14 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars14
index cdd23a7471..cdd23a7471 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars14
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars14
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars15 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars15
index 7f79852978..7f79852978 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars15
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars15
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars16 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars16
index 0f28dff25d..0f28dff25d 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars16
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars16
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars17 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars17
index 3681c1aa9f..3681c1aa9f 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars17
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars17
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars18 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars18
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars18
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars18
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars19 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars19
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars19
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars19
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars2 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars2
index 1636a6e908..1636a6e908 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars2
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars2
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars20 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars20
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars20
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars20
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars21 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars21
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars21
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars21
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars22 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars22
index 0f258cc097..0f258cc097 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars22
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars22
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars3 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars3
index 4f43b9adca..4f43b9adca 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars3
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars3
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars4 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars4
index 9eb833c42a..9eb833c42a 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars4
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars4
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars5 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars5
index b1c269c020..b1c269c020 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars5
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars5
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars6 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars6
index 88c58cfdf2..88c58cfdf2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars6
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars6
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars7 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars7
index 8924869634..8924869634 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars7
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars7
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars8 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars8
index d9d8f3872f..d9d8f3872f 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars8
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars8
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars9 b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars9
index da52ca1f82..da52ca1f82 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/results/whereis_vars9
+++ b/lib/dialyzer/test/race_SUITE_data/results/whereis_vars9
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args1.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args1.erl
new file mode 100644
index 0000000000..0039195e0a
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args1.erl
@@ -0,0 +1,17 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account the argument types of the calls.
+
+-module(ets_insert_args1).
+-export([start/0]).
+
+start() ->
+  F = fun(T) -> [{_, N}] = ets:lookup(T, counter),
+               ets:insert(T, [{counter, N+1}])
+      end,
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {counter, 0}),
+  io:format("Inserted ~w\n", [{counter, 0}]),
+  F(foo),
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, counter),
+  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args2.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args2.erl
new file mode 100644
index 0000000000..c1857eb58b
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args2.erl
@@ -0,0 +1,17 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account the argument types of the calls.
+
+-module(ets_insert_args2).
+-export([start/0]).
+
+start() ->
+  F = fun(T)-> [{_, N}] = ets:lookup(T, counter),
+               ets:insert(T, [{counter, N+1}, {maria, N+1}, {kostis, N+1}])
+      end,
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {counter, 0}),
+  io:format("Inserted ~w\n", [{counter, 0}]),
+  F(foo),
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, counter),
+  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args3.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args3.erl
new file mode 100644
index 0000000000..74401b76fd
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args3.erl
@@ -0,0 +1,17 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account the argument types of the calls.
+
+-module(ets_insert_args3).
+-export([start/0]).
+
+start() ->
+  F = fun(T)-> [{_, N}] = ets:lookup(T, counter),
+               ets:insert(T, [{maria, N+1}, {kostis, N+1}])
+      end,
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {counter, 0}),
+  io:format("Inserted ~w\n", [{counter, 0}]),
+  F(foo),
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, counter),
+  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args4.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args4.erl
new file mode 100644
index 0000000000..2c892074ec
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args4.erl
@@ -0,0 +1,17 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account the argument types of the calls.
+
+-module(ets_insert_args4).
+-export([start/0]).
+
+start() ->
+  F = fun(T)-> [{_, N}] = ets:lookup(T, counter),
+               ets:insert(T, {counter, N+1})
+      end,
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {counter, 0}),
+  io:format("Inserted ~w\n", [{counter, 0}]),
+  F(foo),
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, counter),
+  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args5.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args5.erl
new file mode 100644
index 0000000000..156f555a7c
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args5.erl
@@ -0,0 +1,17 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account the argument types of the calls.
+
+-module(ets_insert_args5).
+-export([start/0]).
+
+start() ->
+  F = fun(T)-> [{_, N}] = ets:lookup(T, counter),
+               ets:insert(T, {counter, N+1, N+2})
+      end,
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {counter, 0, 0}),
+  io:format("Inserted ~w\n", [{counter, 0, 0}]),
+  F(foo),
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, counter),
+  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args6.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args6.erl
new file mode 100644
index 0000000000..1e5887f76d
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args6.erl
@@ -0,0 +1,17 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account the argument types of the calls.
+
+-module(ets_insert_args6).
+-export([start/0]).
+
+start() ->
+  F = fun(T)-> [{_, N}] = ets:lookup(T, counter),
+               ets:insert(T, [{counter, N+1, N+2}])
+      end,
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {counter, 0, 0}),
+  io:format("Inserted ~w\n", [{counter, 0, 0}]),
+  F(foo),
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, counter),
+  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args7.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args7.erl
new file mode 100644
index 0000000000..912bbf7073
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args7.erl
@@ -0,0 +1,17 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account the argument types of the calls.
+
+-module(ets_insert_args7).
+-export([test/0]).
+
+test() ->
+  Foo = foo,
+  ets:new(Foo, [named_table, public]),
+  race(Foo).
+
+race(Tab) ->
+    [{_, N}] = ets:lookup(Tab, counter),
+    aux(Tab, N).
+
+aux(Table, N) ->
+  ets:insert(Table, [{counter, N+1}]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args8.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args8.erl
new file mode 100644
index 0000000000..275cf0291c
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_args8.erl
@@ -0,0 +1,16 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account the argument types of the calls.
+
+-module(ets_insert_args8).
+-export([test/1]).
+
+test(Foo) ->
+  ets:new(Foo, [named_table, public]),
+  race(Foo).
+
+race(Tab) ->
+    [{_, N}] = ets:lookup(Tab, counter),
+    aux(Tab, N).
+
+aux(Table, N) ->
+  ets:insert(Table, [{counter, N+1}]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow1.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow1.erl
new file mode 100644
index 0000000000..cfe0b2b727
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow1.erl
@@ -0,0 +1,20 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account control flow that might exist.
+
+-module(ets_insert_control_flow1).
+-export([start/0]).
+
+start() ->
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {random, random:uniform(maria:get_int())}),
+  io:format("Inserted ~w\n", [{_, N}] = ets:lookup(foo, random)),
+  case (N rem 2 == 0) of
+    true ->
+      io:format("\nInserted an even number\n", []),
+      io:format("\nWill make it odd\n", []),
+      ets:insert(foo, {random, N+1});
+    false -> ok
+  end,
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, random),
+  io:format("Random odd integer: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow2.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow2.erl
new file mode 100644
index 0000000000..d160418bdb
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow2.erl
@@ -0,0 +1,26 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account control flow that might exist.
+
+-module(ets_insert_control_flow2).
+-export([start/0]).
+
+start() ->
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {random, random:uniform(150)}),
+  io:format("Inserted ~w\n", [{_, N}] = ets:lookup(foo, random)),
+  case (N rem 2 == 0) of
+    true ->
+      io:format("\nInserted an even integer\n", []),
+      io:format("\nWill make it odd and generate password\n", []),
+      ets:insert(foo, [{random, N+1}, {pass, generate_password(N)}]);
+    false ->
+      io:format("\nInserted an odd integer\n", []),
+      io:format("\nWill make it even and generate password\n", []),
+      ets:insert(foo, [{random, N+1}, {pass, generate_password(N)}])
+  end,
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, pass),
+  io:format("New password: ~w\n", [ObjectList]).
+
+generate_password(N) ->
+  lists:map(fun (_) -> random:uniform(90)+$\s+1 end, lists:seq(1,N)).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow3.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow3.erl
index 9c6a22eb05..9c6a22eb05 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow3.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow3.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow4.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow4.erl
index caa3804614..caa3804614 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow4.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow4.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow5.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow5.erl
index b19fd776ec..b19fd776ec 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow5.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_control_flow5.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race1.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race1.erl
new file mode 100644
index 0000000000..7b2dbb8eff
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race1.erl
@@ -0,0 +1,22 @@
+%% This tests that the race condition detection between ets:lookup/
+%% ets:insert is robust even when the functions are called with
+%% different atoms as arguments.
+
+-module(ets_insert_diff_atoms_race1).
+-export([test/0]).
+
+test() ->
+  ets:new(foo, [named_table, public]),
+  {race(foo), no_race(foo)}.
+
+race(Tab) ->
+    [{_, N}] = ets:lookup(Tab, counter),
+    aux(Tab, N).
+
+no_race(Tab) ->
+    [{_, N}] = ets:lookup(Tab, counter),
+    AnotherTab = bar,
+    aux(AnotherTab, N).
+
+aux(Table, N) ->
+  ets:insert(Table, [{counter, N+1}]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race2.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race2.erl
new file mode 100644
index 0000000000..d7afc79d07
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race2.erl
@@ -0,0 +1,22 @@
+%% This tests that the race condition detection between ets:lookup/
+%% ets:insert is robust even when the functions are called with
+%% different atoms as arguments.
+
+-module(ets_insert_diff_atoms_race2).
+-export([test/0]).
+
+test() ->
+  ets:new(foo, [named_table, public]),
+  {race(foo, counter), no_race(foo, counter)}.
+
+race(Tab, Counter) ->
+    [{_, N}] = ets:lookup(Tab, Counter),
+    aux(Tab, Counter, N).
+
+no_race(Tab, Counter) ->
+    [{_, N}] = ets:lookup(Tab, Counter),
+    AnotherTab = bar,
+    aux(AnotherTab, Counter, N).
+
+aux(Table, Counter, N) ->
+  ets:insert(Table, [{Counter, N+1}]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race3.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race3.erl
new file mode 100644
index 0000000000..e05e9be54b
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race3.erl
@@ -0,0 +1,22 @@
+%% This tests that the race condition detection between ets:lookup/
+%% ets:insert is robust even when the functions are called with
+%% different atoms as arguments.
+
+-module(ets_insert_diff_atoms_race3).
+-export([test/0]).
+
+test() ->
+  ets:new(foo, [named_table, public]),
+  {race(foo), no_race(foo)}.
+
+race(Tab) ->
+    [{_, N}] = ets:lookup(Tab, counter),
+    aux(Tab, N).
+
+no_race(Tab) ->
+    [{_, N}] = ets:lookup(Tab, counter),
+    AnotherTab = bar,
+    aux(AnotherTab, N).
+
+aux(Table, N) ->
+  ets:insert(Table, {counter, N+1}).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race4.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race4.erl
new file mode 100644
index 0000000000..e2a3588f41
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race4.erl
@@ -0,0 +1,22 @@
+%% This tests that the race condition detection between ets:lookup/
+%% ets:insert is robust even when the functions are called with
+%% different atoms as arguments.
+
+-module(ets_insert_diff_atoms_race4).
+-export([test/0]).
+
+test() ->
+  ets:new(foo, [named_table, public]),
+  {race(foo, counter), no_race(foo, counter)}.
+
+race(Tab, Counter) ->
+    [{_, N}] = ets:lookup(Tab, Counter),
+    aux(Tab, Counter, N).
+
+no_race(Tab, Counter) ->
+    [{_, N}] = ets:lookup(Tab, Counter),
+    AnotherTab = bar,
+    aux(AnotherTab, Counter, N).
+
+aux(Table, Counter, N) ->
+  ets:insert(Table, {Counter, N+1}).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race5.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race5.erl
new file mode 100644
index 0000000000..dd53387c11
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race5.erl
@@ -0,0 +1,22 @@
+%% This tests that the race condition detection between ets:lookup/
+%% ets:insert is robust even when the functions are called with
+%% different atoms as arguments.
+
+-module(ets_insert_diff_atoms_race5).
+-export([test/0]).
+
+test() ->
+  ets:new(foo, [named_table, public]),
+  {race(foo, counter), no_race(foo, counter)}.
+
+race(Tab, Counter) ->
+    [{_, N}] = ets:lookup(Tab, Counter),
+    aux(Tab, Counter, N).
+
+no_race(Tab, Counter) ->
+    [{_, N}] = ets:lookup(Tab, Counter),
+    AnotherCounter = index,
+    aux(Tab, AnotherCounter, N).
+
+aux(Table, Counter, N) ->
+  ets:insert(Table, [{Counter, N+1}]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race6.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race6.erl
new file mode 100644
index 0000000000..ec0a0eaadf
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_diff_atoms_race6.erl
@@ -0,0 +1,22 @@
+%% This tests that the race condition detection between ets:lookup/
+%% ets:insert is robust even when the functions are called with
+%% different atoms as arguments.
+
+-module(ets_insert_diff_atoms_race6).
+-export([test/0]).
+
+test() ->
+  ets:new(foo, [named_table, public]),
+  {race(foo, counter), no_race(foo, counter)}.
+
+race(Tab, Counter) ->
+    [{_, N}] = ets:lookup(Tab, Counter),
+    aux(Tab, Counter, N).
+
+no_race(Tab, Counter) ->
+    [{_, N}] = ets:lookup(Tab, Counter),
+    AnotherCounter = index,
+    aux(Tab, AnotherCounter, N).
+
+aux(Table, Counter, N) ->
+  ets:insert(Table, {Counter, N+1}).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_double1.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_double1.erl
new file mode 100644
index 0000000000..d5b6689eb1
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_double1.erl
@@ -0,0 +1,28 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account multiple ets:inserts that might exist.
+
+-module(ets_insert_double1).
+-export([start/0]).
+
+start() ->
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {random, random:uniform(150)}),
+  io:format("Inserted ~w\n", [{_, N}] = ets:lookup(foo, random)),
+  case (N rem 2 == 0) of
+    true ->
+      io:format("\nInserted an even integer\n", []),
+      io:format("\nWill make it odd and generate new password\n", []),
+      ets:insert(foo, [{random, N+1}, {pass, generate_password(N)}]);
+    false ->
+      io:format("\nInserted an odd integer\n", []),
+      io:format("\nWill make it even and generate new password\n", []),
+      ets:insert(foo, [{random, N+1}, {pass, generate_password(N)}])
+  end,
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, pass),
+  io:format("New password: ~w\n", [ObjectList]),
+  ets:insert(foo, {pass, 'empty'}).
+
+generate_password(N) ->
+  [{_, P}] = ets:lookup(foo, pass),
+  lists:map(fun (_) -> random:uniform(90)+P+$\s+1 end, lists:seq(1,N)).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_double2.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_double2.erl
new file mode 100644
index 0000000000..fa653e3090
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_double2.erl
@@ -0,0 +1,28 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account multiple ets:inserts that might exist.
+
+-module(ets_insert_double2).
+-export([start/2]).
+
+start(Random, Pass) ->
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {Random, random:uniform(150)}),
+  io:format("Inserted ~w\n", [{_, N}] = ets:lookup(foo, Random)),
+  case (N rem 2 == 0) of
+    true ->
+      io:format("\nInserted an even integer\n", []),
+      io:format("\nWill make it odd and generate new password\n", []),
+      ets:insert(foo, [{Random, N+1}, {Pass, generate_password(Pass, N)}]);
+    false ->
+      io:format("\nInserted an odd integer\n", []),
+      io:format("\nWill make it even and generate new password\n", []),
+      ets:insert(foo, [{Random, N+1}, {Pass, generate_password(Pass, N)}])
+  end,
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, Pass),
+  io:format("New password: ~w\n", [ObjectList]),
+  ets:insert(foo, {Pass, 'empty'}).
+
+generate_password(Pass, N) ->
+  [{_, P}] = ets:lookup(foo, Pass),
+  lists:map(fun (_) -> random:uniform(90)+P+$\s+1 end, lists:seq(1,N)).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_funs1.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_funs1.erl
new file mode 100644
index 0000000000..b6b258fd21
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_funs1.erl
@@ -0,0 +1,18 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account the anonymous functions.
+
+-module(ets_insert_funs1).
+-export([start/0]).
+
+start() ->
+  F = fun(T) ->
+        ets:lookup(T, counter)
+      end,
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {counter, 0}),
+  io:format("Inserted ~w\n", [{counter, 0}]),
+  [{_, N}] = F(foo),
+  ets:insert(foo, [{counter, N+1}]),
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, counter),
+  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_funs2.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_funs2.erl
new file mode 100644
index 0000000000..6b9518f314
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_funs2.erl
@@ -0,0 +1,18 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account the anonymous functions.
+
+-module(ets_insert_funs2).
+-export([start/0]).
+
+start() ->
+  F = fun(T, N) ->
+        ets:insert(T, [{counter, N+1}])
+      end,
+  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
+  ets:insert(foo, {counter, 0}),
+  io:format("Inserted ~w\n", [{counter, 0}]),
+  [{_, N}] = ets:lookup(foo, counter),
+  F(foo, N),
+  io:format("Update complete\n", []),
+  ObjectList = ets:lookup(foo, counter),
+  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_new.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_new.erl
index 63f3272912..63f3272912 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_new.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_new.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_param.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_param.erl
index a479a31792..a479a31792 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_param.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_param.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/ets_insert_public.erl b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_public.erl
new file mode 100644
index 0000000000..4caa9fe8a0
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/ets_insert_public.erl
@@ -0,0 +1,23 @@
+%% This tests the presence of possible races due to an ets:lookup/ets:insert
+%% combination. It takes into account any public ETS tables that might exist.
+
+-module(ets_insert_public).
+
+-export([main/1]).
+
+%% Main
+main(Foo) ->
+    make_table(Foo),
+    ets:insert(Foo, {counter, 0}),
+    [{_, N}] = ets:lookup(Foo, counter),
+    NewN = N + 1,
+    ets:insert(Foo, {counter, NewN}),
+    NewN.
+
+make_table(Foo) ->
+    init(Foo).
+
+init(Foo) ->
+    ets:new(Foo, [named_table, public]),
+    ets:insert(Foo, {counter, 0}),
+    {ok, feeling_good}.
diff --git a/lib/dialyzer/test/race_SUITE_data/src/extract_translations.erl b/lib/dialyzer/test/race_SUITE_data/src/extract_translations.erl
new file mode 100644
index 0000000000..76ffca4676
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/extract_translations.erl
@@ -0,0 +1,293 @@
+%%%----------------------------------------------------------------------
+%%% File    : extract_translations.erl
+%%% Author  : Sergei Golovan <[email protected]>
+%%% Purpose : Auxiliary tool for interface/messages translators
+%%% Created : 23 Apr 2005 by Sergei Golovan <[email protected]>
+%%% Id      : $Id: extract_translations.erl,v 1.1 2009/08/17 09:18:59 maria Exp $
+%%%----------------------------------------------------------------------
+
+-module(extract_translations).
+-author('[email protected]').
+
+-export([start/0]).
+
+-define(STATUS_SUCCESS, 0).
+-define(STATUS_ERROR,   1).
+-define(STATUS_USAGE,   2).
+
+-include_lib("kernel/include/file.hrl").
+
+
+start() ->
+    ets:new(translations, [named_table, public]),
+    ets:new(translations_obsolete, [named_table, public]),
+    ets:new(files, [named_table, public]),
+    ets:new(vars, [named_table, public]),
+    case init:get_plain_arguments() of
+	["-srcmsg2po", Dir, File] ->
+	    print_po_header(File),
+	    Status = process(Dir, File, srcmsg2po),
+	    halt(Status);
+	["-unused", Dir, File] ->
+	    Status = process(Dir, File, unused),
+	    halt(Status);
+	[Dir, File] ->
+	    Status = process(Dir, File, used),
+	    halt(Status);
+	_ ->
+	    print_usage(),
+	    halt(?STATUS_USAGE)
+    end.
+
+
+process(Dir, File, Used) ->
+    case load_file(File) of
+	{error, Reason} ->
+	    io:format("~s: ~s~n", [File, file:format_error(Reason)]),
+	    ?STATUS_ERROR;
+	_ ->
+	    FileList = find_src_files(Dir),
+	    lists:foreach(
+	      fun(F) ->
+		    parse_file(Dir, F, Used)
+	      end, FileList),
+	    case Used of
+		unused ->
+		    ets:foldl(fun({Key, _}, _) ->
+				      io:format("~p~n", [Key])
+			      end, ok, translations);
+		srcmsg2po ->
+		    ets:foldl(fun({Key, Trans}, _) ->
+				      print_translation_obsolete(Key, Trans)
+			      end, ok, translations_obsolete);
+		_ ->
+		    ok
+	    end,
+	    ?STATUS_SUCCESS
+    end.
+
+parse_file(Dir, File, Used) ->
+    ets:delete_all_objects(vars),
+    case epp:parse_file(File, [Dir, filename:dirname(File) | code:get_path()], []) of
+	{ok, Forms} ->
+	    lists:foreach(
+	      fun(F) ->
+		    parse_form(Dir, File, F, Used)
+	      end, Forms);
+	_ ->
+	    ok
+    end.
+
+parse_form(Dir, File, Form, Used) ->
+    case Form of
+	%%{undefined, Something} ->
+        %% io:format("Undefined: ~p~n", [Something]);
+	{call,
+	 _,
+	 {remote, _, {atom, _, translate}, {atom, _, translate}},
+	 [_, {string, Line, Str}]
+	} ->
+	    process_string(Dir, File, Line, Str, Used);
+	{call,
+	 _,
+	 {remote, _, {atom, _, translate}, {atom, _, translate}},
+	 [_, {var, _, Name}]
+	} ->
+	    case ets:lookup(vars, Name) of
+		[{_Name, Value, Line}] ->
+		    process_string(Dir, File, Line, Value, Used);
+		_ ->
+		    ok
+	    end;
+	{match,
+	 _,
+	 {var, _, Name},
+	 {string, Line, Value}
+	} ->
+	    ets:insert(vars, {Name, Value, Line});
+	L when is_list(L) ->
+	    lists:foreach(
+	      fun(F) ->
+		      parse_form(Dir, File, F, Used)
+	      end, L);
+	T when is_tuple(T) ->
+	    lists:foreach(
+	      fun(F) ->
+		      parse_form(Dir, File, F, Used)
+	      end, tuple_to_list(T));
+	_ ->
+	    ok
+    end.
+
+process_string(_Dir, _File, _Line, "", _Used) ->
+    ok;
+
+process_string(_Dir, File, Line, Str, Used) ->
+    case {ets:lookup(translations, Str), Used} of
+	{[{_Key, _Trans}], unused} ->
+	    ets:delete(translations, Str);
+	{[{_Key, _Trans}], used} ->
+	    ok;
+	{[{_Key, Trans}], srcmsg2po} ->
+	    ets:delete(translations_obsolete, Str),
+	    print_translation(File, Line, Str, Trans);
+	{_, used} ->
+	    case ets:lookup(files, File) of
+		[{_}] ->
+		    ok;
+		_ ->
+		    io:format("~n% ~s~n", [File]),
+		    ets:insert(files, {File})
+	    end,
+	    case Str of
+		[] -> ok;
+		_ -> io:format("{~p, \"\"}.~n", [Str])
+	    end,
+	    ets:insert(translations, {Str, ""});
+	{_, srcmsg2po} ->
+	    case ets:lookup(files, File) of
+		[{_}] ->
+		    ok;
+		_ ->
+		    ets:insert(files, {File})
+	    end,
+	    ets:insert(translations, {Str, ""}),
+	    print_translation(File, Line, Str, "");
+	_ ->
+	    ok
+    end.
+
+load_file(File) ->
+    case file:consult(File) of
+	{ok, Terms} ->
+	    lists:foreach(
+	      fun({Orig, Trans}) ->
+		    case Trans of
+			"" ->
+			    ok;
+			_ ->
+			    ets:insert(translations, {Orig, Trans}),
+			    ets:insert(translations_obsolete, {Orig, Trans})
+		    end
+	      end, Terms);
+	Err ->
+	    Err
+    end.
+
+find_src_files(Dir) ->
+    case file:list_dir(Dir) of
+	{ok, FileList} ->
+	    recurse_filelist(
+	      lists:map(
+	        fun(F) ->
+			filename:join(Dir, F)
+		end, FileList));
+	_ ->
+	    []
+    end.
+
+recurse_filelist(FileList) ->
+    recurse_filelist(FileList, []).
+
+recurse_filelist([], Acc) ->
+    lists:reverse(Acc);
+
+recurse_filelist([H | T], Acc) ->
+    case file:read_file_info(H) of
+	{ok, #file_info{type = directory}} ->
+	    recurse_filelist(T, lists:reverse(find_src_files(H)) ++ Acc);
+	{ok, #file_info{type = regular}} ->
+	    case string:substr(H, string:len(H) - 3) of
+		".erl" ->
+		    recurse_filelist(T, [H | Acc]);
+		".hrl" ->
+		    recurse_filelist(T, [H | Acc]);
+		_ ->
+		    recurse_filelist(T, Acc)
+	    end;
+	_ ->
+	    recurse_filelist(T, Acc)
+    end.
+
+
+print_usage() ->
+    io:format(
+      "Usage: extract_translations [-unused] dir file~n"
+      "~n"
+      "Example:~n"
+      "  extract_translations . ./msgs/ru.msg~n"
+     ).
+
+
+%%%
+%%% Gettext
+%%%
+
+print_po_header(File) ->
+    MsgProps = get_msg_header_props(File),
+    {Language, [LastT | AddT]} = prepare_props(MsgProps),
+    application:load(ejabberd),
+    {ok, Version} = application:get_key(ejabberd, vsn),
+    print_po_header(Version, Language, LastT, AddT).
+
+get_msg_header_props(File) ->
+    {ok, F} = file:open(File, [read]),
+    Lines = get_msg_header_props(F, []),
+    file:close(F),
+    Lines.
+
+get_msg_header_props(F, Lines) ->
+    String = io:get_line(F, ""),
+    case io_lib:fread("% ", String) of
+	{ok, [], RemString} ->
+	    case io_lib:fread("~s", RemString) of
+		{ok, [Key], Value} when Value /= "\n" ->
+		    %% The first character in Value is a blankspace:
+		    %% And the last characters are 'slash n'
+		    ValueClean = string:substr(Value, 2, string:len(Value)-2),
+		    get_msg_header_props(F, Lines ++ [{Key, ValueClean}]);
+		_ ->
+		    get_msg_header_props(F, Lines)
+	    end;
+	_ ->
+	    Lines
+    end.
+
+prepare_props(MsgProps) ->
+    Language = proplists:get_value("Language:", MsgProps),
+    Authors = proplists:get_all_values("Author:", MsgProps),
+    {Language, Authors}.
+
+print_po_header(Version, Language, LastTranslator, AdditionalTranslatorsList) ->
+    AdditionalTranslatorsString = build_additional_translators(AdditionalTranslatorsList),
+    HeaderString =
+	"msgid \"\"\n"
+	"msgstr \"\"\n"
+	"\"Project-Id-Version: " ++ Version ++ "\\n\"\n"
+	++ "\"X-Language: " ++ Language ++ "\\n\"\n"
+	"\"Last-Translator: " ++ LastTranslator ++ "\\n\"\n"
+	++ AdditionalTranslatorsString ++
+	"\"MIME-Version: 1.0\\n\"\n"
+	"\"Content-Type: text/plain; charset=UTF-8\\n\"\n"
+	"\"Content-Transfer-Encoding: 8bit\\n\"\n",
+    io:format("~s~n", [HeaderString]).
+
+build_additional_translators(List) ->
+    lists:foldl(
+      fun(T, Str) ->
+	      Str ++ "\"X-Additional-Translator: " ++ T ++ "\\n\"\n"
+      end,
+      "",
+      List).
+
+print_translation(File, Line, Str, StrT) ->
+    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
+    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
+    io:format("#: ~s:~p~nmsgid \"~s\"~nmsgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).
+
+print_translation_obsolete(Str, StrT) ->
+    File = "unknown.erl",
+    Line = 1,
+    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
+    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
+    io:format("#: ~s:~p~n#~~ msgid \"~s\"~n#~~ msgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/mnesia_diff_atoms_race1.erl b/lib/dialyzer/test/race_SUITE_data/src/mnesia_diff_atoms_race1.erl
new file mode 100644
index 0000000000..2f499208a2
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/mnesia_diff_atoms_race1.erl
@@ -0,0 +1,33 @@
+%% This tests that the race condition detection between mnesia:dirty_read/
+%% mnesia:dirty_write is robust even when the functions are called with
+%% different atoms as arguments.
+
+-module(mnesia_diff_atoms_race1).
+-export([test/2]).
+
+-record(employee, {emp_no,
+                   name,
+                   salary,
+                   sex,
+                   phone,
+                   room_no}).
+
+test(Eno, Raise) ->
+  {race(employee, Eno, Raise), no_race(employee, Eno, Raise)}.
+
+race(Tab, Eno, Raise) ->
+    [E] = mnesia:dirty_read(Tab, Eno),
+    Salary = E#employee.salary + Raise,
+    New = E#employee{salary = Salary},
+    aux(Tab, New).
+
+no_race(Tab, Eno, Raise) ->
+    [E] = mnesia:dirty_read(Tab, Eno),
+    Salary = E#employee.salary + Raise,
+    New = E#employee{salary = Salary},
+    AnotherTab = employer,
+    aux(AnotherTab, New).
+
+
+aux(Table, Record) ->
+  mnesia:dirty_write(Table, Record).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/mnesia_diff_atoms_race2.erl b/lib/dialyzer/test/race_SUITE_data/src/mnesia_diff_atoms_race2.erl
new file mode 100644
index 0000000000..c1dcfbd8f5
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/mnesia_diff_atoms_race2.erl
@@ -0,0 +1,37 @@
+%% This tests that the race condition detection between mnesia:dirty_read/
+%% mnesia:dirty_write is robust even when the functions are called with
+%% different atoms as arguments.
+
+-module(mnesia_diff_atoms_race2).
+-export([test/2]).
+
+-record(employee, {emp_no,
+                   name,
+                   salary,
+                   sex,
+                   phone,
+                   room_no}).
+
+-record(employer, {emp_no,
+                   name,
+                   salary,
+                   sex,
+                   phone,
+                   room_no}).
+
+test(Eno, Raise) ->
+  {race(employee, Eno, Raise), no_race(employee, Eno, Raise)}.
+
+race(Tab, Eno, Raise) ->
+    [E] = mnesia:dirty_read(Tab, Eno),
+    Salary = E#employee.salary + Raise,
+    New = E#employee{salary = Salary},
+    aux(New).
+
+no_race(Tab, Eno, Raise) ->
+    [E] = mnesia:dirty_read(Tab, Eno),
+    AnotherRecord = #employer{},
+    aux(AnotherRecord).
+
+aux(Record) ->
+  mnesia:dirty_write(Record).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_one_write_two.erl b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_one_write_two.erl
new file mode 100644
index 0000000000..4ca62deedc
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_one_write_two.erl
@@ -0,0 +1,20 @@
+%% This tests the presence of possible races due to an mnesia:dirty_read/
+%% mnesia:dirty_write combination. It takes into account the argument types
+%% of the calls.
+
+-module(mnesia_dirty_read_one_write_two).
+-export([raise/2]).
+
+-record(employee, {emp_no,
+                   name,
+                   salary,
+                   sex,
+                   phone,
+                   room_no}).
+
+
+raise(Eno, Raise) ->
+    [E] = mnesia:dirty_read({employee, Eno}),
+    Salary = E#employee.salary + Raise,
+    New = E#employee{salary = Salary},
+    mnesia:dirty_write(employee, New).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_two_write_one.erl b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_two_write_one.erl
new file mode 100644
index 0000000000..e523a03789
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_two_write_one.erl
@@ -0,0 +1,20 @@
+%% This tests the presence of possible races due to an mnesia:dirty_read/
+%% mnesia:dirty_write combination. It takes into account the argument types
+%% of the calls.
+
+-module(mnesia_dirty_read_two_write_one).
+-export([raise/2]).
+
+-record(employee, {emp_no,
+                   name,
+                   salary,
+                   sex,
+                   phone,
+                   room_no}).
+
+
+raise(Eno, Raise) ->
+    [E] = mnesia:dirty_read(employee, Eno),
+    Salary = E#employee.salary + Raise,
+    New = E#employee{salary = Salary},
+    mnesia:dirty_write(New).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_double1.erl b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_double1.erl
index 2bd18e4772..2bd18e4772 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_double1.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_double1.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_double2.erl b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_double2.erl
index cdbfdc700a..cdbfdc700a 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_double2.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_double2.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_double3.erl b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_double3.erl
index 051524917e..051524917e 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_double3.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_double3.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_double4.erl b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_double4.erl
index 96752a6045..96752a6045 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_double4.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_double4.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_one.erl b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_one.erl
new file mode 100644
index 0000000000..aee6433736
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_one.erl
@@ -0,0 +1,20 @@
+%% This tests the presence of possible races due to an mnesia:dirty_read/
+%% mnesia:dirty_write combination. It takes into account the argument types
+%% of the calls.
+
+-module(mnesia_dirty_read_write_one).
+-export([raise/2]).
+
+-record(employee, {emp_no,
+                   name,
+                   salary,
+                   sex,
+                   phone,
+                   room_no}).
+
+
+raise(Eno, Raise) ->
+    [E] = mnesia:dirty_read({employee, Eno}),
+    Salary = E#employee.salary + Raise,
+    New = E#employee{salary = Salary},
+    mnesia:dirty_write(New).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_two.erl b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_two.erl
new file mode 100644
index 0000000000..037aeddafd
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/mnesia_dirty_read_write_two.erl
@@ -0,0 +1,20 @@
+%% This tests the presence of possible races due to an mnesia:dirty_read/
+%% mnesia:dirty_write combination. It takes into account the argument types
+%% of the calls.
+
+-module(mnesia_dirty_read_write_two).
+-export([raise/2]).
+
+-record(employee, {emp_no,
+                   name,
+                   salary,
+                   sex,
+                   phone,
+                   room_no}).
+
+
+raise(Eno, Raise) ->
+    [E] = mnesia:dirty_read(employee, Eno),
+    Salary = E#employee.salary + Raise,
+    New = E#employee{salary = Salary},
+    mnesia:dirty_write(employee, New).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow1.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow1.erl
index e65f6c3e23..e65f6c3e23 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow1.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow1.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow2.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow2.erl
index 41039482c9..41039482c9 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow2.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow2.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow3.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow3.erl
new file mode 100644
index 0000000000..94f8445fad
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow3.erl
@@ -0,0 +1,25 @@
+%% This tests the presence of possible races due to a whereis/register
+%% combination. It takes into account control flow that might exist.
+
+-module(whereis_control_flow3).
+-export([start/3]).
+
+start(AnAtom, Fun, FunName) ->
+  Pid =
+    case FunName of
+      master ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end;
+      slave ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end
+    end,
+  register(AnAtom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow4.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow4.erl
new file mode 100644
index 0000000000..2a59760789
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow4.erl
@@ -0,0 +1,29 @@
+%% This tests the presence of possible races due to a whereis/register
+%% combination. It takes into account control flow that might exist.
+
+-module(whereis_control_flow4).
+-export([start/1]).
+
+start(Fun) ->
+  case whereis(maria) of
+    undefined ->
+      Pid1 = spawn(Fun),
+      case Pid1 =:= self() of
+        true ->
+          case whereis(kostis) of
+            undefined ->
+              Pid2 = spawn(Fun),
+              case Pid2 =:= self() of
+                true ->
+                  register(maria, Pid1),
+                  register(kostis, Pid2);
+                false -> ok
+              end;
+            P when is_pid(P) ->
+              ok
+          end;
+        false -> ok
+      end;
+    P when is_pid(P) ->
+      ok
+  end.
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow5.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow5.erl
index 8de9cb2dad..8de9cb2dad 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow5.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow5.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow6.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow6.erl
index 03c5095a50..03c5095a50 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow6.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_control_flow6.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_atoms_no_race.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_atoms_no_race.erl
new file mode 100644
index 0000000000..704ee6015d
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_atoms_no_race.erl
@@ -0,0 +1,23 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust even when the functions are called with different atoms
+%% as arguments.
+
+-module(whereis_diff_atoms_no_race).
+-export([test/0]).
+
+test() ->
+  Fun = fun () -> foo end,
+  {no_race(maria, Fun)}.
+
+no_race(AnAtom, Fun) ->
+  case whereis(AnAtom) of
+    undefined ->
+      Pid = spawn(Fun),
+      AnotherAtom = kostis,
+      aux(AnotherAtom, Pid);
+    P when is_pid(P) ->
+      ok
+  end.
+
+aux(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_atoms_race.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_atoms_race.erl
new file mode 100644
index 0000000000..6c834caa0c
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_atoms_race.erl
@@ -0,0 +1,34 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust even when the functions are called with different atoms
+%% as arguments.
+
+-module(whereis_diff_atoms_race).
+-export([test/0]). %, race/1, no_race/1]).
+
+test() ->
+  Fun = fun () -> foo end,
+  {race(maria, Fun), no_race(maria, Fun)}.
+
+race(AnAtom, Fun) ->
+  %AnAtom = maria,
+  case whereis(AnAtom) of
+    undefined ->
+      Pid = spawn(Fun),
+      aux(AnAtom, Pid);
+    P when is_pid(P) ->
+      ok
+  end.
+
+no_race(AnAtom, Fun) ->
+  %AnAtom = maria,
+  case whereis(AnAtom) of
+    undefined ->
+      Pid = spawn(Fun),
+      AnotherAtom = kostis,
+      aux(AnotherAtom, Pid);
+    P when is_pid(P) ->
+      ok
+  end.
+
+aux(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions1.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions1.erl
index 6a1c197c06..6a1c197c06 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions1.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions1.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions1_nested.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions1_nested.erl
new file mode 100644
index 0000000000..4967dec133
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions1_nested.erl
@@ -0,0 +1,23 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions.
+
+-module(whereis_diff_functions1_nested).
+-export([test/2]).
+
+test(AnAtom, Fun) ->
+  start(AnAtom, Fun).
+
+start(AnAtom, Fun) ->
+  case whereis(AnAtom) of
+    undefined ->
+      Pid = spawn(Fun),
+      race1(AnAtom, Pid);
+    P when is_pid(P) ->
+      true
+  end.
+
+race1(Atom, Pid) ->
+  race2(Atom, Pid).
+
+race2(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions1_pathsens.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions1_pathsens.erl
new file mode 100644
index 0000000000..ff6506eee8
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions1_pathsens.erl
@@ -0,0 +1,32 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions.
+%% It takes into account control flow that might exist.
+
+-module(whereis_diff_functions1_pathsens).
+-export([test/1]).
+
+test(FunName) ->
+  start(kostis, mod:function(), FunName).
+
+start(AnAtom, Fun, FunName) ->
+  Pid =
+    case FunName of
+      master ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end;
+      slave ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end
+    end,
+  race(AnAtom, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions1_twice.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions1_twice.erl
new file mode 100644
index 0000000000..dd395bb6d8
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions1_twice.erl
@@ -0,0 +1,30 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having multiple calls in separate functions.
+
+-module(whereis_diff_functions1_twice).
+-export([test/2]).
+
+test(AnAtom, Fun) ->
+  start(AnAtom, Fun).
+
+start(AnAtom, Fun) ->
+  case whereis(AnAtom) of
+    undefined ->
+      Pid1 = spawn(Fun),
+      race(AnAtom, Pid1),
+      case whereis(AnAtom) of
+        undefined ->
+          Pid2 = spawn(Fun),
+          race_again(AnAtom, Pid2);
+        P when is_pid(P) ->
+        true
+      end;
+    P when is_pid(P) ->
+      true
+  end.
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
+
+race_again(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2.erl
new file mode 100644
index 0000000000..eaf98291ed
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2.erl
@@ -0,0 +1,25 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions.
+
+-module(whereis_diff_functions2).
+-export([test/0]).
+
+test() ->
+  start(kostis, mod:function()).
+
+start(AnAtom, Fun) ->
+  Pid1 = spawn(Fun),
+  no_race(Pid1),
+  case whereis(AnAtom) of
+    undefined ->
+      Pid2 = spawn(Fun),
+      race(AnAtom, Pid2);
+    P when is_pid(P) ->
+      true
+  end.
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2_nested.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2_nested.erl
new file mode 100644
index 0000000000..5ae8784389
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2_nested.erl
@@ -0,0 +1,20 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions.
+
+-module(whereis_diff_functions2_nested).
+-export([start/2]).
+
+start(AnAtom, Fun) ->
+  case whereis(AnAtom) of
+    undefined ->
+      Pid = spawn(Fun),
+      race1(AnAtom, Pid);
+    P when is_pid(P) ->
+      true
+  end.
+
+race1(Atom, Pid) ->
+  race2(Atom, Pid).
+
+race2(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2_pathsens.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2_pathsens.erl
new file mode 100644
index 0000000000..e9ce4bc48e
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2_pathsens.erl
@@ -0,0 +1,29 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions.
+%% It takes into account control flow that might exist.
+
+-module(whereis_diff_functions2_pathsens).
+-export([race/4]).
+
+start(AnAtom, Fun, FunName) ->
+  Pid =
+    case FunName of
+      master ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end;
+      slave ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end
+    end.
+
+race(Atom, Fun, FunName, Pid) ->
+  start(Atom, Fun, FunName),
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2_twice.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2_twice.erl
new file mode 100644
index 0000000000..d5efe631b8
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions2_twice.erl
@@ -0,0 +1,27 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having multiple calls in separate functions.
+
+-module(whereis_diff_functions2_twice).
+-export([start/2]).
+
+start(AnAtom, Fun) ->
+  case whereis(AnAtom) of
+    undefined ->
+      Pid1 = spawn(Fun),
+      race(AnAtom, Pid1),
+      case whereis(AnAtom) of
+        undefined ->
+          Pid2 = spawn(Fun),
+          race_again(AnAtom, Pid2);
+        P when is_pid(P) ->
+        true
+      end;
+    P when is_pid(P) ->
+      true
+  end.
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
+
+race_again(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions3.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions3.erl
new file mode 100644
index 0000000000..093f02a06f
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions3.erl
@@ -0,0 +1,11 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions.
+
+-module(whereis_diff_functions3).
+-export([start/1]).
+
+start(AnAtom) ->
+  register(AnAtom, race(AnAtom)).
+
+race(Atom) ->
+  whereis(Atom).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions3_nested.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions3_nested.erl
new file mode 100644
index 0000000000..5c28fc74f6
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions3_nested.erl
@@ -0,0 +1,21 @@
+%% This tests that the race condition detection between whereis/unregister
+%% is robust w.r.t. having the calls in separate functions.
+
+-module(whereis_diff_functions3_nested).
+-export([test/1]).
+
+test(AnAtom) ->
+  start(AnAtom).
+
+start(AnAtom) ->
+  case whereis(AnAtom) of
+    undefined -> true;
+    P when is_pid(P) ->
+      race1(AnAtom)
+  end.
+
+race1(Atom) ->
+  race2(Atom).
+
+race2(Atom) ->
+  unregister(Atom).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions3_pathsens.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions3_pathsens.erl
new file mode 100644
index 0000000000..a3a245b9ea
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions3_pathsens.erl
@@ -0,0 +1,29 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions.
+%% It takes into account control flow that might exist.
+
+-module(whereis_diff_functions3_pathsens).
+-export([start/3]).
+
+start(AnAtom, Fun, FunName) ->
+  Pid =
+    case FunName of
+      master ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end;
+      slave ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end
+    end,
+  race(AnAtom, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions4.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions4.erl
new file mode 100644
index 0000000000..e40483d487
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions4.erl
@@ -0,0 +1,32 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions.
+
+-module(whereis_diff_functions4).
+-export([test/2]).
+
+test(AnAtom, Fun) ->
+  start(AnAtom, Fun).
+
+start(AnAtom, Fun) ->
+  Pid1 = spawn(Fun),
+  no_race(Pid1),
+  case whereis(AnAtom) of
+    undefined ->
+      Pid2 = spawn(Fun),
+      race(AnAtom, Pid2),
+      case whereis(AnAtom) of
+        undefined ->
+          Pid3 = spawn(Fun),
+          race(AnAtom, Pid3);
+        P when is_pid(P) ->
+          true
+      end;
+    P when is_pid(P) ->
+      true
+  end.
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions5.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions5.erl
new file mode 100644
index 0000000000..a2c4352803
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions5.erl
@@ -0,0 +1,22 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions.
+
+-module(whereis_diff_functions5).
+-export([start/2]).
+
+start(AnAtom, Fun) ->
+  Pid1 = spawn(Fun),
+  no_race(Pid1),
+  case whereis(AnAtom) of
+    undefined ->
+      Pid2 = spawn(Fun),
+      race(AnAtom, Pid2);
+    P when is_pid(P) ->
+      true
+  end.
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions6.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions6.erl
new file mode 100644
index 0000000000..f016d79533
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_functions6.erl
@@ -0,0 +1,29 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions.
+
+-module(whereis_diff_functions6).
+-export([start/2]).
+
+start(AnAtom, Fun) ->
+  Pid1 = spawn(Fun),
+  no_race(Pid1),
+  case whereis(AnAtom) of
+    undefined ->
+      Pid2 = spawn(Fun),
+      race(AnAtom, Pid2),
+      case whereis(AnAtom) of
+        undefined ->
+          Pid3 = spawn(Fun),
+          race(AnAtom, Pid3);
+        P when is_pid(P) ->
+          true
+      end;
+    P when is_pid(P) ->
+      true
+  end.
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1/whereis_diff_modules1.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1/whereis_diff_modules1.erl
index 00cb29cec0..00cb29cec0 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1/whereis_diff_modules1.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1/whereis_diff_modules1.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1/whereis_diff_modules2.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1/whereis_diff_modules2.erl
new file mode 100644
index 0000000000..e5f6fdeb7b
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1/whereis_diff_modules2.erl
@@ -0,0 +1,11 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate modules.
+
+-module(whereis_diff_modules2).
+-export([no_race/1, race/2]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules1_pathsens.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules1_pathsens.erl
new file mode 100644
index 0000000000..a5f1d4d3c7
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules1_pathsens.erl
@@ -0,0 +1,26 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate modules (backward analysis).
+%% It takes into account control flow that might exist.
+
+-module(whereis_diff_modules1_pathsens).
+-export([start/3]).
+
+start(AnAtom, Fun, FunName) ->
+  Pid =
+    case FunName of
+      master ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end;
+      slave ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end
+    end,
+  whereis_diff_modules2_pathsens:race(AnAtom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules2_pathsens.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules2_pathsens.erl
new file mode 100644
index 0000000000..d24d13976b
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules2_pathsens.erl
@@ -0,0 +1,12 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate modules (backward analysis).
+%% It takes into account control flow that might exist.
+
+-module(whereis_diff_modules2_pathsens).
+-export([no_race/1, race/2]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_rec/whereis_diff_modules1_rec.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1_rec/whereis_diff_modules1_rec.erl
index a397954eea..a397954eea 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_rec/whereis_diff_modules1_rec.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1_rec/whereis_diff_modules1_rec.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_rec/whereis_diff_modules2_rec.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1_rec/whereis_diff_modules2_rec.erl
index 4b46b4a8e5..4b46b4a8e5 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_rec/whereis_diff_modules2_rec.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules1_rec/whereis_diff_modules2_rec.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2/whereis_diff_modules3.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2/whereis_diff_modules3.erl
index 60b5a1d378..60b5a1d378 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2/whereis_diff_modules3.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2/whereis_diff_modules3.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2/whereis_diff_modules4.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2/whereis_diff_modules4.erl
new file mode 100644
index 0000000000..1ab4fbf8d8
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2/whereis_diff_modules4.erl
@@ -0,0 +1,11 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate modules.
+
+-module(whereis_diff_modules4).
+-export([no_race/1, race/1]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom) ->
+  whereis(Atom).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules3_pathsens.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules3_pathsens.erl
new file mode 100644
index 0000000000..cb2f85a103
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules3_pathsens.erl
@@ -0,0 +1,25 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate modules (forward analysis).
+%% It takes into account control flow that might exist.
+
+-module(whereis_diff_modules3_pathsens).
+-export([start/3]).
+
+start(AnAtom, Fun, FunName) ->
+  Pid =
+    case FunName of
+      master ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end;
+      slave ->
+        case whereis(AnAtom) of
+          undefined ->
+            spawn(Fun);
+          P when is_pid(P) ->
+            P
+        end
+    end.
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules4_pathsens.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules4_pathsens.erl
new file mode 100644
index 0000000000..952f9312f4
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules4_pathsens.erl
@@ -0,0 +1,13 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate modules (forward analysis).
+%% It takes into account control flow that might exist.
+
+-module(whereis_diff_modules4_pathsens).
+-export([no_race/1, race/4]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Fun, FunName, Pid) ->
+  whereis_diff_modules3_pathsens:start(Atom, Fun, FunName),
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_rec/whereis_diff_modules3_rec.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2_rec/whereis_diff_modules3_rec.erl
index 0320140768..0320140768 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_rec/whereis_diff_modules3_rec.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2_rec/whereis_diff_modules3_rec.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_rec/whereis_diff_modules4_rec.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2_rec/whereis_diff_modules4_rec.erl
index d49c59ed5c..d49c59ed5c 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_rec/whereis_diff_modules4_rec.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules2_rec/whereis_diff_modules4_rec.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules3/whereis_diff_modules5.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules3/whereis_diff_modules5.erl
index 591732aa31..591732aa31 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules3/whereis_diff_modules5.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules3/whereis_diff_modules5.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules3/whereis_diff_modules6.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules3/whereis_diff_modules6.erl
new file mode 100644
index 0000000000..159d96cfc5
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules3/whereis_diff_modules6.erl
@@ -0,0 +1,11 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate modules.
+
+-module(whereis_diff_modules6).
+-export([no_race/1, race/2]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules1_nested.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules1_nested.erl
index a25d2f8784..a25d2f8784 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules1_nested.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules1_nested.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules2_nested.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules2_nested.erl
new file mode 100644
index 0000000000..32a55e731a
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules2_nested.erl
@@ -0,0 +1,11 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate modules.
+
+-module(whereis_diff_modules2_nested).
+-export([no_race/1, race/2]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  whereis_diff_modules3_nested:race(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules3_nested.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules3_nested.erl
new file mode 100644
index 0000000000..414129611f
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules3_nested.erl
@@ -0,0 +1,11 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate modules.
+
+-module(whereis_diff_modules3_nested).
+-export([no_race/1, race/2]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_twice/whereis_diff_modules1_twice.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_twice/whereis_diff_modules1_twice.erl
index 92f2cb1fbc..92f2cb1fbc 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_twice/whereis_diff_modules1_twice.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_twice/whereis_diff_modules1_twice.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_twice/whereis_diff_modules2_twice.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_twice/whereis_diff_modules2_twice.erl
new file mode 100644
index 0000000000..390c0dcc94
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_modules_twice/whereis_diff_modules2_twice.erl
@@ -0,0 +1,11 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate modules.
+
+-module(whereis_diff_modules2_twice).
+-export([race/2, race_again/2]).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
+
+race_again(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_vars_no_race.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_vars_no_race.erl
new file mode 100644
index 0000000000..8466004ce4
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_vars_no_race.erl
@@ -0,0 +1,13 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust even when the functions are called with different variables
+%% as arguments.
+
+-module(whereis_diff_vars_no_race).
+-export([test/3]).
+
+test(AnAtom, AnotherAtom, Pid) ->
+  {aux(AnAtom, Pid), aux(AnotherAtom, Pid)}.
+
+aux(Atom, Pid) ->
+  register(Atom, Pid),
+  whereis(Atom).
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_vars_race.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_vars_race.erl
new file mode 100644
index 0000000000..90791de1b2
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_diff_vars_race.erl
@@ -0,0 +1,19 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust even when the functions are called with different variables
+%% as arguments.
+
+-module(whereis_diff_vars_race).
+-export([test/2]).
+
+test(AnAtom, AnotherAtom) ->
+  Fun = fun () -> foo end,
+  {aux(AnAtom, AnotherAtom, Fun), aux(AnotherAtom, AnAtom, Fun)}.
+
+aux(Atom1, Atom2, Fun) ->
+  case whereis(Atom1) of
+    undefined ->
+      Pid = spawn(Fun),
+      register(Atom2, Pid);
+    P when is_pid(P) ->
+      ok
+  end.
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module1/whereis_intra_inter_module1.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module1/whereis_intra_inter_module1.erl
index 677551c99d..677551c99d 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module1/whereis_intra_inter_module1.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module1/whereis_intra_inter_module1.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module1/whereis_intra_inter_module2.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module1/whereis_intra_inter_module2.erl
new file mode 100644
index 0000000000..e7acee0cfd
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module1/whereis_intra_inter_module2.erl
@@ -0,0 +1,11 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions and modules.
+
+-module(whereis_intra_inter_module2).
+-export([no_race/1, race/2]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module2/whereis_intra_inter_module3.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module2/whereis_intra_inter_module3.erl
index c8103db122..c8103db122 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module2/whereis_intra_inter_module3.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module2/whereis_intra_inter_module3.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module2/whereis_intra_inter_module4.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module2/whereis_intra_inter_module4.erl
new file mode 100644
index 0000000000..4094a95223
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module2/whereis_intra_inter_module4.erl
@@ -0,0 +1,14 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions and modules.
+
+-module(whereis_intra_inter_module4).
+-export([no_race/1, race/2]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  continue(Atom, Pid).
+
+continue(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module3/whereis_intra_inter_module5.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module3/whereis_intra_inter_module5.erl
index 2a29779153..2a29779153 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module3/whereis_intra_inter_module5.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module3/whereis_intra_inter_module5.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module3/whereis_intra_inter_module6.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module3/whereis_intra_inter_module6.erl
new file mode 100644
index 0000000000..cd05431cd5
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module3/whereis_intra_inter_module6.erl
@@ -0,0 +1,14 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions and modules.
+
+-module(whereis_intra_inter_module6).
+-export([no_race/1, race/2]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  continue(Atom, Pid).
+
+continue(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module4/whereis_intra_inter_module7.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module4/whereis_intra_inter_module7.erl
index 1f702e7af3..1f702e7af3 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module4/whereis_intra_inter_module7.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module4/whereis_intra_inter_module7.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module4/whereis_intra_inter_module8.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module4/whereis_intra_inter_module8.erl
index 581817308b..581817308b 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module4/whereis_intra_inter_module8.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module4/whereis_intra_inter_module8.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module5/whereis_intra_inter_module10.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module5/whereis_intra_inter_module10.erl
index 7ed50ea742..7ed50ea742 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module5/whereis_intra_inter_module10.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module5/whereis_intra_inter_module10.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module5/whereis_intra_inter_module9.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module5/whereis_intra_inter_module9.erl
index 5c5d92b770..5c5d92b770 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module5/whereis_intra_inter_module9.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module5/whereis_intra_inter_module9.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module6/whereis_intra_inter_module11.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module6/whereis_intra_inter_module11.erl
index 82abe2f4a8..82abe2f4a8 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module6/whereis_intra_inter_module11.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module6/whereis_intra_inter_module11.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module6/whereis_intra_inter_module12.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module6/whereis_intra_inter_module12.erl
new file mode 100644
index 0000000000..c2f5d560a0
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module6/whereis_intra_inter_module12.erl
@@ -0,0 +1,14 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions and modules.
+
+-module(whereis_intra_inter_module12).
+-export([no_race/1, race/2, continue/2]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  continue(Atom, Pid).
+
+continue(Atom, Pid) ->
+  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module7/whereis_intra_inter_module13.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module7/whereis_intra_inter_module13.erl
index 3cd5cc6fa6..3cd5cc6fa6 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module7/whereis_intra_inter_module13.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module7/whereis_intra_inter_module13.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module7/whereis_intra_inter_module14.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module7/whereis_intra_inter_module14.erl
new file mode 100644
index 0000000000..6b6a982055
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module7/whereis_intra_inter_module14.erl
@@ -0,0 +1,22 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions and modules.
+
+-module(whereis_intra_inter_module14).
+-export([no_race/1, race/2, start/2]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
+
+start(AnAtom, Fun) ->
+  Pid1 = spawn(Fun),
+  no_race(Pid1),
+  case whereis(AnAtom) of
+    undefined ->
+      Pid2 = spawn(Fun),
+      race(AnAtom, Pid2);
+    P when is_pid(P) ->
+      true
+  end.
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module8/whereis_intra_inter_module15.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module8/whereis_intra_inter_module15.erl
index c60d166fa9..c60d166fa9 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module8/whereis_intra_inter_module15.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module8/whereis_intra_inter_module15.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module8/whereis_intra_inter_module16.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module8/whereis_intra_inter_module16.erl
new file mode 100644
index 0000000000..279e633d66
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_intra_inter_module8/whereis_intra_inter_module16.erl
@@ -0,0 +1,22 @@
+%% This tests that the race condition detection between whereis/register
+%% is robust w.r.t. having the calls in separate functions and modules.
+
+-module(whereis_intra_inter_module16).
+-export([no_race/1, race/2, start/2]).
+
+no_race(Pid) ->
+  register(master, Pid).
+
+race(Atom, Pid) ->
+  register(Atom, Pid).
+
+start(AnAtom, Fun) ->
+  Pid1 = spawn(Fun),
+  no_race(Pid1),
+  case whereis(AnAtom) of
+    undefined ->
+      Pid2 = spawn(Fun),
+      whereis_intra_inter_module15:continue(AnAtom, Pid2);
+    P when is_pid(P) ->
+      true
+  end.
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_param.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_param.erl
index 7bcde321a1..7bcde321a1 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_param.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_param.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_param_inter_module/whereis_param_inter_module1.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_param_inter_module/whereis_param_inter_module1.erl
new file mode 100644
index 0000000000..8bac0326a5
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_param_inter_module/whereis_param_inter_module1.erl
@@ -0,0 +1,8 @@
+%% This tests the presence of possible races due to a whereis/register
+%% combination in higher order functions and inter-module calls.
+
+-module(whereis_param_inter_module1).
+-export([start/2]).
+
+start(AnAtom, Fun) ->
+  register(AnAtom, whereis_param_inter_module2:continue(AnAtom, Fun)).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_param_inter_module/whereis_param_inter_module2.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_param_inter_module/whereis_param_inter_module2.erl
index 61252add9a..61252add9a 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_param_inter_module/whereis_param_inter_module2.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_param_inter_module/whereis_param_inter_module2.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function1.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function1.erl
index c8095fbf4c..c8095fbf4c 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function1.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function1.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function2.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function2.erl
index 2721c9e19c..2721c9e19c 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function2.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function2.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function3.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function3.erl
index e101f34fba..e101f34fba 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function3.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function3.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function4.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function4.erl
index 4894d3397b..4894d3397b 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function4.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function4.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function5.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function5.erl
index d821f829a2..d821f829a2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function5.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function5.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function6.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function6.erl
index 4ec4baf0be..4ec4baf0be 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function6.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function6.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function7.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function7.erl
index 7667443117..7667443117 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function7.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function7.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function8.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function8.erl
index a06fb75f64..a06fb75f64 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_rec_function8.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_rec_function8.erl
diff --git a/lib/dialyzer/test/race_SUITE_data/src/whereis_try_catch.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_try_catch.erl
new file mode 100644
index 0000000000..39bb440f56
--- /dev/null
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_try_catch.erl
@@ -0,0 +1,25 @@
+% This tests that warnings do appear when a whereis/register combination
+% is handled by try/catch.
+
+-module(whereis_try_catch).
+-export([race/1, no_race/1]).
+
+race(Pid) ->
+  case whereis(master) of
+    undefined ->
+      try
+	io:format("exception", [])
+      catch
+        _ -> register(master, Pid)
+      end
+  end.
+
+no_race(Pid) ->
+  case whereis(master) of
+    undefined ->
+      try
+        register(master, Pid)
+      catch
+        _ -> io:format("exception", [])
+      end
+  end.
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars1.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars1.erl
index 9b249e72be..9b249e72be 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars1.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars1.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars10.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars10.erl
index 5c1896d6b4..5c1896d6b4 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars10.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars10.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars11.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars11.erl
index dc8551b3f2..dc8551b3f2 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars11.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars11.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars12.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars12.erl
index 38b0dc5d04..38b0dc5d04 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars12.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars12.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars13.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars13.erl
index 3a04bba02f..3a04bba02f 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars13.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars13.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars14.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars14.erl
index c688847551..c688847551 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars14.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars14.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars15.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars15.erl
index 4b3a72537e..4b3a72537e 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars15.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars15.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars16.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars16.erl
index 7badb8df22..7badb8df22 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars16.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars16.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars17.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars17.erl
index bc7ef5e980..bc7ef5e980 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars17.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars17.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars18.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars18.erl
index 06416fa987..06416fa987 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars18.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars18.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars19.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars19.erl
index ae5b28e42d..ae5b28e42d 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars19.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars19.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars2.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars2.erl
index bafb5d4644..bafb5d4644 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars2.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars2.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars20.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars20.erl
index 87c6caadf0..87c6caadf0 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars20.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars20.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars21.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars21.erl
index 73d22d3467..73d22d3467 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars21.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars21.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars22.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars22.erl
index dd16928e33..dd16928e33 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars22.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars22.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars3.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars3.erl
index 16c9a6c8bc..16c9a6c8bc 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars3.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars3.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars4.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars4.erl
index da5b329ca9..da5b329ca9 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars4.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars4.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars5.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars5.erl
index dff8646ea8..dff8646ea8 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars5.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars5.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars6.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars6.erl
index cf22ab1883..cf22ab1883 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars6.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars6.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars7.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars7.erl
index 4bce53982a..4bce53982a 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars7.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars7.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars8.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars8.erl
index 937b83cf02..937b83cf02 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars8.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars8.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars9.erl b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars9.erl
index 9beb67ca38..9beb67ca38 100644
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_vars9.erl
+++ b/lib/dialyzer/test/race_SUITE_data/src/whereis_vars9.erl
diff --git a/lib/dialyzer/test/race_tests_SUITE.erl b/lib/dialyzer/test/race_tests_SUITE.erl
deleted file mode 100644
index cfc898d464..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE.erl
+++ /dev/null
@@ -1,799 +0,0 @@
-%% ATTENTION!
-%% This is an automatically generated file. Do not edit.
-%% Use './remake' script to refresh it if needed.
-%% All Dialyzer options should be defined in dialyzer_options
-%% file.
-
--module(race_tests_SUITE).
-
--include("ct.hrl").
--include("dialyzer_test_constants.hrl").
-
--export([suite/0, init_per_suite/0, init_per_suite/1,
-         end_per_suite/1, all/0]).
--export([race_tests_SUITE_consistency/1, ets_insert_args1/1, 
-         ets_insert_args2/1, ets_insert_args3/1, ets_insert_args4/1, 
-         ets_insert_args5/1, ets_insert_args6/1, ets_insert_args7/1, 
-         ets_insert_args8/1, ets_insert_control_flow1/1, 
-         ets_insert_control_flow2/1, ets_insert_control_flow3/1, 
-         ets_insert_control_flow4/1, ets_insert_control_flow5/1, 
-         ets_insert_diff_atoms_race1/1, ets_insert_diff_atoms_race2/1, 
-         ets_insert_diff_atoms_race3/1, ets_insert_diff_atoms_race4/1, 
-         ets_insert_diff_atoms_race5/1, ets_insert_diff_atoms_race6/1, 
-         ets_insert_double1/1, ets_insert_double2/1, ets_insert_funs1/1, 
-         ets_insert_funs2/1, ets_insert_new/1, ets_insert_param/1, 
-         extract_translations/1, mnesia_diff_atoms_race1/1, 
-         mnesia_diff_atoms_race2/1, mnesia_dirty_read_one_write_two/1, 
-         mnesia_dirty_read_two_write_one/1, 
-         mnesia_dirty_read_write_double1/1, 
-         mnesia_dirty_read_write_double2/1, 
-         mnesia_dirty_read_write_double3/1, 
-         mnesia_dirty_read_write_double4/1, mnesia_dirty_read_write_one/1, 
-         mnesia_dirty_read_write_two/1, whereis_control_flow1/1, 
-         whereis_control_flow2/1, whereis_control_flow3/1, 
-         whereis_control_flow4/1, whereis_control_flow5/1, 
-         whereis_control_flow6/1, whereis_diff_atoms_no_race/1, 
-         whereis_diff_atoms_race/1, whereis_diff_functions1/1, 
-         whereis_diff_functions1_nested/1, 
-         whereis_diff_functions1_pathsens/1, 
-         whereis_diff_functions1_twice/1, whereis_diff_functions2/1, 
-         whereis_diff_functions2_nested/1, 
-         whereis_diff_functions2_pathsens/1, 
-         whereis_diff_functions2_twice/1, whereis_diff_functions3/1, 
-         whereis_diff_functions3_nested/1, 
-         whereis_diff_functions3_pathsens/1, whereis_diff_functions4/1, 
-         whereis_diff_functions5/1, whereis_diff_functions6/1, 
-         whereis_diff_modules1/1, whereis_diff_modules1_pathsens/1, 
-         whereis_diff_modules1_rec/1, whereis_diff_modules2/1, 
-         whereis_diff_modules2_pathsens/1, whereis_diff_modules2_rec/1, 
-         whereis_diff_modules3/1, whereis_diff_modules_nested/1, 
-         whereis_diff_modules_twice/1, whereis_diff_vars_no_race/1, 
-         whereis_diff_vars_race/1, whereis_intra_inter_module1/1, 
-         whereis_intra_inter_module2/1, whereis_intra_inter_module3/1, 
-         whereis_intra_inter_module4/1, whereis_intra_inter_module5/1, 
-         whereis_intra_inter_module6/1, whereis_intra_inter_module7/1, 
-         whereis_intra_inter_module8/1, whereis_param/1, 
-         whereis_param_inter_module/1, whereis_rec_function1/1, 
-         whereis_rec_function2/1, whereis_rec_function3/1, 
-         whereis_rec_function4/1, whereis_rec_function5/1, 
-         whereis_rec_function6/1, whereis_rec_function7/1, 
-         whereis_rec_function8/1, whereis_try_catch/1, whereis_vars1/1, 
-         whereis_vars10/1, whereis_vars11/1, whereis_vars12/1, 
-         whereis_vars13/1, whereis_vars14/1, whereis_vars15/1, 
-         whereis_vars16/1, whereis_vars17/1, whereis_vars18/1, 
-         whereis_vars19/1, whereis_vars2/1, whereis_vars20/1, 
-         whereis_vars21/1, whereis_vars22/1, whereis_vars3/1, 
-         whereis_vars4/1, whereis_vars5/1, whereis_vars6/1, 
-         whereis_vars7/1, whereis_vars8/1, whereis_vars9/1]).
-
-suite() ->
-  [{timetrap, {minutes, 1}}].
-
-init_per_suite() ->
-  [{timetrap, ?plt_timeout}].
-init_per_suite(Config) ->
-  OutDir = ?config(priv_dir, Config),
-  case dialyzer_common:check_plt(OutDir) of
-    fail -> {skip, "Plt creation/check failed."};
-    ok -> [{dialyzer_options, [{warnings,[race_conditions]}]}|Config]
-  end.
-
-end_per_suite(_Config) ->
-  ok.
-
-all() ->
-  [race_tests_SUITE_consistency,ets_insert_args1,ets_insert_args2,
-   ets_insert_args3,ets_insert_args4,ets_insert_args5,ets_insert_args6,
-   ets_insert_args7,ets_insert_args8,ets_insert_control_flow1,
-   ets_insert_control_flow2,ets_insert_control_flow3,ets_insert_control_flow4,
-   ets_insert_control_flow5,ets_insert_diff_atoms_race1,
-   ets_insert_diff_atoms_race2,ets_insert_diff_atoms_race3,
-   ets_insert_diff_atoms_race4,ets_insert_diff_atoms_race5,
-   ets_insert_diff_atoms_race6,ets_insert_double1,ets_insert_double2,
-   ets_insert_funs1,ets_insert_funs2,ets_insert_new,ets_insert_param,
-   extract_translations,mnesia_diff_atoms_race1,mnesia_diff_atoms_race2,
-   mnesia_dirty_read_one_write_two,mnesia_dirty_read_two_write_one,
-   mnesia_dirty_read_write_double1,mnesia_dirty_read_write_double2,
-   mnesia_dirty_read_write_double3,mnesia_dirty_read_write_double4,
-   mnesia_dirty_read_write_one,mnesia_dirty_read_write_two,
-   whereis_control_flow1,whereis_control_flow2,whereis_control_flow3,
-   whereis_control_flow4,whereis_control_flow5,whereis_control_flow6,
-   whereis_diff_atoms_no_race,whereis_diff_atoms_race,whereis_diff_functions1,
-   whereis_diff_functions1_nested,whereis_diff_functions1_pathsens,
-   whereis_diff_functions1_twice,whereis_diff_functions2,
-   whereis_diff_functions2_nested,whereis_diff_functions2_pathsens,
-   whereis_diff_functions2_twice,whereis_diff_functions3,
-   whereis_diff_functions3_nested,whereis_diff_functions3_pathsens,
-   whereis_diff_functions4,whereis_diff_functions5,whereis_diff_functions6,
-   whereis_diff_modules1,whereis_diff_modules1_pathsens,
-   whereis_diff_modules1_rec,whereis_diff_modules2,
-   whereis_diff_modules2_pathsens,whereis_diff_modules2_rec,
-   whereis_diff_modules3,whereis_diff_modules_nested,
-   whereis_diff_modules_twice,whereis_diff_vars_no_race,
-   whereis_diff_vars_race,whereis_intra_inter_module1,
-   whereis_intra_inter_module2,whereis_intra_inter_module3,
-   whereis_intra_inter_module4,whereis_intra_inter_module5,
-   whereis_intra_inter_module6,whereis_intra_inter_module7,
-   whereis_intra_inter_module8,whereis_param,whereis_param_inter_module,
-   whereis_rec_function1,whereis_rec_function2,whereis_rec_function3,
-   whereis_rec_function4,whereis_rec_function5,whereis_rec_function6,
-   whereis_rec_function7,whereis_rec_function8,whereis_try_catch,
-   whereis_vars1,whereis_vars10,whereis_vars11,whereis_vars12,whereis_vars13,
-   whereis_vars14,whereis_vars15,whereis_vars16,whereis_vars17,whereis_vars18,
-   whereis_vars19,whereis_vars2,whereis_vars20,whereis_vars21,whereis_vars22,
-   whereis_vars3,whereis_vars4,whereis_vars5,whereis_vars6,whereis_vars7,
-   whereis_vars8,whereis_vars9].
-
-dialyze(Config, TestCase) ->
-  Opts = ?config(dialyzer_options, Config),
-  Dir = ?config(data_dir, Config),
-  OutDir = ?config(priv_dir, Config),
-  dialyzer_common:check(TestCase, Opts, Dir, OutDir).
-
-race_tests_SUITE_consistency(Config) ->
-  Dir = ?config(data_dir, Config),
-  case dialyzer_common:new_tests(Dir, all()) of
-    []  -> ok;
-    New -> ct:fail({missing_tests,New})
-  end.
-
-ets_insert_args1(Config) ->
-  case dialyze(Config, ets_insert_args1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_args2(Config) ->
-  case dialyze(Config, ets_insert_args2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_args3(Config) ->
-  case dialyze(Config, ets_insert_args3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_args4(Config) ->
-  case dialyze(Config, ets_insert_args4) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_args5(Config) ->
-  case dialyze(Config, ets_insert_args5) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_args6(Config) ->
-  case dialyze(Config, ets_insert_args6) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_args7(Config) ->
-  case dialyze(Config, ets_insert_args7) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_args8(Config) ->
-  case dialyze(Config, ets_insert_args8) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_control_flow1(Config) ->
-  case dialyze(Config, ets_insert_control_flow1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_control_flow2(Config) ->
-  case dialyze(Config, ets_insert_control_flow2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_control_flow3(Config) ->
-  case dialyze(Config, ets_insert_control_flow3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_control_flow4(Config) ->
-  case dialyze(Config, ets_insert_control_flow4) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_control_flow5(Config) ->
-  case dialyze(Config, ets_insert_control_flow5) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_diff_atoms_race1(Config) ->
-  case dialyze(Config, ets_insert_diff_atoms_race1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_diff_atoms_race2(Config) ->
-  case dialyze(Config, ets_insert_diff_atoms_race2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_diff_atoms_race3(Config) ->
-  case dialyze(Config, ets_insert_diff_atoms_race3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_diff_atoms_race4(Config) ->
-  case dialyze(Config, ets_insert_diff_atoms_race4) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_diff_atoms_race5(Config) ->
-  case dialyze(Config, ets_insert_diff_atoms_race5) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_diff_atoms_race6(Config) ->
-  case dialyze(Config, ets_insert_diff_atoms_race6) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_double1(Config) ->
-  case dialyze(Config, ets_insert_double1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_double2(Config) ->
-  case dialyze(Config, ets_insert_double2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_funs1(Config) ->
-  case dialyze(Config, ets_insert_funs1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_funs2(Config) ->
-  case dialyze(Config, ets_insert_funs2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_new(Config) ->
-  case dialyze(Config, ets_insert_new) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_insert_param(Config) ->
-  case dialyze(Config, ets_insert_param) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-extract_translations(Config) ->
-  case dialyze(Config, extract_translations) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mnesia_diff_atoms_race1(Config) ->
-  case dialyze(Config, mnesia_diff_atoms_race1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mnesia_diff_atoms_race2(Config) ->
-  case dialyze(Config, mnesia_diff_atoms_race2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mnesia_dirty_read_one_write_two(Config) ->
-  case dialyze(Config, mnesia_dirty_read_one_write_two) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mnesia_dirty_read_two_write_one(Config) ->
-  case dialyze(Config, mnesia_dirty_read_two_write_one) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mnesia_dirty_read_write_double1(Config) ->
-  case dialyze(Config, mnesia_dirty_read_write_double1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mnesia_dirty_read_write_double2(Config) ->
-  case dialyze(Config, mnesia_dirty_read_write_double2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mnesia_dirty_read_write_double3(Config) ->
-  case dialyze(Config, mnesia_dirty_read_write_double3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mnesia_dirty_read_write_double4(Config) ->
-  case dialyze(Config, mnesia_dirty_read_write_double4) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mnesia_dirty_read_write_one(Config) ->
-  case dialyze(Config, mnesia_dirty_read_write_one) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mnesia_dirty_read_write_two(Config) ->
-  case dialyze(Config, mnesia_dirty_read_write_two) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_control_flow1(Config) ->
-  case dialyze(Config, whereis_control_flow1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_control_flow2(Config) ->
-  case dialyze(Config, whereis_control_flow2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_control_flow3(Config) ->
-  case dialyze(Config, whereis_control_flow3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_control_flow4(Config) ->
-  case dialyze(Config, whereis_control_flow4) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_control_flow5(Config) ->
-  case dialyze(Config, whereis_control_flow5) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_control_flow6(Config) ->
-  case dialyze(Config, whereis_control_flow6) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_atoms_no_race(Config) ->
-  case dialyze(Config, whereis_diff_atoms_no_race) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_atoms_race(Config) ->
-  case dialyze(Config, whereis_diff_atoms_race) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions1(Config) ->
-  case dialyze(Config, whereis_diff_functions1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions1_nested(Config) ->
-  case dialyze(Config, whereis_diff_functions1_nested) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions1_pathsens(Config) ->
-  case dialyze(Config, whereis_diff_functions1_pathsens) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions1_twice(Config) ->
-  case dialyze(Config, whereis_diff_functions1_twice) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions2(Config) ->
-  case dialyze(Config, whereis_diff_functions2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions2_nested(Config) ->
-  case dialyze(Config, whereis_diff_functions2_nested) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions2_pathsens(Config) ->
-  case dialyze(Config, whereis_diff_functions2_pathsens) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions2_twice(Config) ->
-  case dialyze(Config, whereis_diff_functions2_twice) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions3(Config) ->
-  case dialyze(Config, whereis_diff_functions3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions3_nested(Config) ->
-  case dialyze(Config, whereis_diff_functions3_nested) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions3_pathsens(Config) ->
-  case dialyze(Config, whereis_diff_functions3_pathsens) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions4(Config) ->
-  case dialyze(Config, whereis_diff_functions4) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions5(Config) ->
-  case dialyze(Config, whereis_diff_functions5) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_functions6(Config) ->
-  case dialyze(Config, whereis_diff_functions6) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_modules1(Config) ->
-  case dialyze(Config, whereis_diff_modules1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_modules1_pathsens(Config) ->
-  case dialyze(Config, whereis_diff_modules1_pathsens) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_modules1_rec(Config) ->
-  case dialyze(Config, whereis_diff_modules1_rec) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_modules2(Config) ->
-  case dialyze(Config, whereis_diff_modules2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_modules2_pathsens(Config) ->
-  case dialyze(Config, whereis_diff_modules2_pathsens) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_modules2_rec(Config) ->
-  case dialyze(Config, whereis_diff_modules2_rec) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_modules3(Config) ->
-  case dialyze(Config, whereis_diff_modules3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_modules_nested(Config) ->
-  case dialyze(Config, whereis_diff_modules_nested) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_modules_twice(Config) ->
-  case dialyze(Config, whereis_diff_modules_twice) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_vars_no_race(Config) ->
-  case dialyze(Config, whereis_diff_vars_no_race) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_diff_vars_race(Config) ->
-  case dialyze(Config, whereis_diff_vars_race) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_intra_inter_module1(Config) ->
-  case dialyze(Config, whereis_intra_inter_module1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_intra_inter_module2(Config) ->
-  case dialyze(Config, whereis_intra_inter_module2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_intra_inter_module3(Config) ->
-  case dialyze(Config, whereis_intra_inter_module3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_intra_inter_module4(Config) ->
-  case dialyze(Config, whereis_intra_inter_module4) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_intra_inter_module5(Config) ->
-  case dialyze(Config, whereis_intra_inter_module5) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_intra_inter_module6(Config) ->
-  case dialyze(Config, whereis_intra_inter_module6) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_intra_inter_module7(Config) ->
-  case dialyze(Config, whereis_intra_inter_module7) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_intra_inter_module8(Config) ->
-  case dialyze(Config, whereis_intra_inter_module8) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_param(Config) ->
-  case dialyze(Config, whereis_param) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_param_inter_module(Config) ->
-  case dialyze(Config, whereis_param_inter_module) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_rec_function1(Config) ->
-  case dialyze(Config, whereis_rec_function1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_rec_function2(Config) ->
-  case dialyze(Config, whereis_rec_function2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_rec_function3(Config) ->
-  case dialyze(Config, whereis_rec_function3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_rec_function4(Config) ->
-  case dialyze(Config, whereis_rec_function4) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_rec_function5(Config) ->
-  case dialyze(Config, whereis_rec_function5) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_rec_function6(Config) ->
-  case dialyze(Config, whereis_rec_function6) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_rec_function7(Config) ->
-  case dialyze(Config, whereis_rec_function7) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_rec_function8(Config) ->
-  case dialyze(Config, whereis_rec_function8) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_try_catch(Config) ->
-  case dialyze(Config, whereis_try_catch) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars1(Config) ->
-  case dialyze(Config, whereis_vars1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars10(Config) ->
-  case dialyze(Config, whereis_vars10) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars11(Config) ->
-  case dialyze(Config, whereis_vars11) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars12(Config) ->
-  case dialyze(Config, whereis_vars12) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars13(Config) ->
-  case dialyze(Config, whereis_vars13) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars14(Config) ->
-  case dialyze(Config, whereis_vars14) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars15(Config) ->
-  case dialyze(Config, whereis_vars15) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars16(Config) ->
-  case dialyze(Config, whereis_vars16) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars17(Config) ->
-  case dialyze(Config, whereis_vars17) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars18(Config) ->
-  case dialyze(Config, whereis_vars18) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars19(Config) ->
-  case dialyze(Config, whereis_vars19) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars2(Config) ->
-  case dialyze(Config, whereis_vars2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars20(Config) ->
-  case dialyze(Config, whereis_vars20) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars21(Config) ->
-  case dialyze(Config, whereis_vars21) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars22(Config) ->
-  case dialyze(Config, whereis_vars22) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars3(Config) ->
-  case dialyze(Config, whereis_vars3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars4(Config) ->
-  case dialyze(Config, whereis_vars4) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars5(Config) ->
-  case dialyze(Config, whereis_vars5) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars6(Config) ->
-  case dialyze(Config, whereis_vars6) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars7(Config) ->
-  case dialyze(Config, whereis_vars7) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars8(Config) ->
-  case dialyze(Config, whereis_vars8) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-whereis_vars9(Config) ->
-  case dialyze(Config, whereis_vars9) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args1.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args1.erl
deleted file mode 100644
index 78b586f097..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args1.erl
+++ /dev/null
@@ -1,17 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account the argument types of the calls.
-
--module(ets_insert_args1).
--export([start/0]).
-
-start() ->
-  F = fun(T) -> [{_, N}] = ets:lookup(T, counter),
-               ets:insert(T, [{counter, N+1}])
-      end,
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {counter, 0}),  
-  io:format("Inserted ~w\n", [{counter, 0}]),
-  F(foo),
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, counter),
-  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args2.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args2.erl
deleted file mode 100644
index 7e53b1e8bf..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args2.erl
+++ /dev/null
@@ -1,17 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account the argument types of the calls.
-
--module(ets_insert_args2).
--export([start/0]).
-
-start() ->
-  F = fun(T)-> [{_, N}] = ets:lookup(T, counter),
-               ets:insert(T, [{counter, N+1}, {maria, N+1}, {kostis, N+1}])
-      end,
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {counter, 0}),  
-  io:format("Inserted ~w\n", [{counter, 0}]),
-  F(foo),
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, counter),
-  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args3.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args3.erl
deleted file mode 100644
index b99bde14fa..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args3.erl
+++ /dev/null
@@ -1,17 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account the argument types of the calls.
-
--module(ets_insert_args3).
--export([start/0]).
-
-start() ->
-  F = fun(T)-> [{_, N}] = ets:lookup(T, counter),
-               ets:insert(T, [{maria, N+1}, {kostis, N+1}])
-      end,
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {counter, 0}),  
-  io:format("Inserted ~w\n", [{counter, 0}]),
-  F(foo),
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, counter),
-  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args4.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args4.erl
deleted file mode 100644
index 7bf3599c65..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args4.erl
+++ /dev/null
@@ -1,17 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account the argument types of the calls.
-
--module(ets_insert_args4).
--export([start/0]).
-
-start() ->
-  F = fun(T)-> [{_, N}] = ets:lookup(T, counter),
-               ets:insert(T, {counter, N+1})
-      end,
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {counter, 0}),  
-  io:format("Inserted ~w\n", [{counter, 0}]),
-  F(foo),
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, counter),
-  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args5.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args5.erl
deleted file mode 100644
index 93fef43cf1..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args5.erl
+++ /dev/null
@@ -1,17 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account the argument types of the calls.
-
--module(ets_insert_args5).
--export([start/0]).
-
-start() ->
-  F = fun(T)-> [{_, N}] = ets:lookup(T, counter),
-               ets:insert(T, {counter, N+1, N+2})
-      end,
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {counter, 0, 0}),  
-  io:format("Inserted ~w\n", [{counter, 0, 0}]),
-  F(foo),
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, counter),
-  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args6.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args6.erl
deleted file mode 100644
index 2a803ccaac..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args6.erl
+++ /dev/null
@@ -1,17 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account the argument types of the calls.
-
--module(ets_insert_args6).
--export([start/0]).
-
-start() ->
-  F = fun(T)-> [{_, N}] = ets:lookup(T, counter),
-               ets:insert(T, [{counter, N+1, N+2}])
-      end,
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {counter, 0, 0}),  
-  io:format("Inserted ~w\n", [{counter, 0, 0}]),
-  F(foo),
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, counter),
-  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args7.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args7.erl
deleted file mode 100644
index adc13703a7..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args7.erl
+++ /dev/null
@@ -1,17 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account the argument types of the calls.
-
--module(ets_insert_args7).
--export([test/0]).
-
-test() ->
-  Foo = foo,
-  ets:new(Foo, [named_table, public]),
-  race(Foo).
-
-race(Tab) ->
-    [{_, N}] = ets:lookup(Tab, counter),
-    aux(Tab, N).
-
-aux(Table, N) -> 
-  ets:insert(Table, [{counter, N+1}]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args8.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args8.erl
deleted file mode 100644
index 832fc2eef1..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_args8.erl
+++ /dev/null
@@ -1,16 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account the argument types of the calls.
-
--module(ets_insert_args8).
--export([test/1]).
-
-test(Foo) ->
-  ets:new(Foo, [named_table, public]),
-  race(Foo).
-
-race(Tab) ->
-    [{_, N}] = ets:lookup(Tab, counter),
-    aux(Tab, N).
-
-aux(Table, N) -> 
-  ets:insert(Table, [{counter, N+1}]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow1.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow1.erl
deleted file mode 100644
index 7b56495e47..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow1.erl
+++ /dev/null
@@ -1,20 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account control flow that might exist.
-
--module(ets_insert_control_flow1).
--export([start/0]).
-
-start() ->
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {random, random:uniform(maria:get_int())}),  
-  io:format("Inserted ~w\n", [{_, N}] = ets:lookup(foo, random)),
-  case (N rem 2 == 0) of
-    true ->
-      io:format("\nInserted an even number\n", []),
-      io:format("\nWill make it odd\n", []),
-      ets:insert(foo, {random, N+1});
-    false -> ok
-  end,
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, random),
-  io:format("Random odd integer: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow2.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow2.erl
deleted file mode 100644
index 434ca113ee..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_control_flow2.erl
+++ /dev/null
@@ -1,26 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account control flow that might exist.
-
--module(ets_insert_control_flow2).
--export([start/0]).
-
-start() ->
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {random, random:uniform(150)}),  
-  io:format("Inserted ~w\n", [{_, N}] = ets:lookup(foo, random)),
-  case (N rem 2 == 0) of
-    true ->
-      io:format("\nInserted an even integer\n", []),
-      io:format("\nWill make it odd and generate password\n", []),
-      ets:insert(foo, [{random, N+1}, {pass, generate_password(N)}]);
-    false ->
-      io:format("\nInserted an odd integer\n", []),
-      io:format("\nWill make it even and generate password\n", []),
-      ets:insert(foo, [{random, N+1}, {pass, generate_password(N)}])
-  end,
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, pass),
-  io:format("New password: ~w\n", [ObjectList]).
-
-generate_password(N) ->
-  lists:map(fun (_) -> random:uniform(90)+$\s+1 end, lists:seq(1,N)).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race1.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race1.erl
deleted file mode 100644
index 57022c86d4..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race1.erl
+++ /dev/null
@@ -1,22 +0,0 @@
-%% This tests that the race condition detection between ets:lookup/
-%% ets:insert is robust even when the functions are called with
-%% different atoms as arguments.
-
--module(ets_insert_diff_atoms_race1).
--export([test/0]).
-
-test() ->
-  ets:new(foo, [named_table, public]),
-  {race(foo), no_race(foo)}.
-
-race(Tab) ->
-    [{_, N}] = ets:lookup(Tab, counter),
-    aux(Tab, N).
-
-no_race(Tab) ->
-    [{_, N}] = ets:lookup(Tab, counter),
-    AnotherTab = bar,
-    aux(AnotherTab, N).
-
-aux(Table, N) -> 
-  ets:insert(Table, [{counter, N+1}]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race2.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race2.erl
deleted file mode 100644
index 233a19087e..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race2.erl
+++ /dev/null
@@ -1,22 +0,0 @@
-%% This tests that the race condition detection between ets:lookup/
-%% ets:insert is robust even when the functions are called with
-%% different atoms as arguments.
-
--module(ets_insert_diff_atoms_race2).
--export([test/0]).
-
-test() ->
-  ets:new(foo, [named_table, public]),
-  {race(foo, counter), no_race(foo, counter)}.
-
-race(Tab, Counter) ->
-    [{_, N}] = ets:lookup(Tab, Counter),
-    aux(Tab, Counter, N).
-
-no_race(Tab, Counter) ->
-    [{_, N}] = ets:lookup(Tab, Counter),
-    AnotherTab = bar,
-    aux(AnotherTab, Counter, N).
-
-aux(Table, Counter, N) -> 
-  ets:insert(Table, [{Counter, N+1}]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race3.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race3.erl
deleted file mode 100644
index a09e4644f8..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race3.erl
+++ /dev/null
@@ -1,22 +0,0 @@
-%% This tests that the race condition detection between ets:lookup/
-%% ets:insert is robust even when the functions are called with
-%% different atoms as arguments.
-
--module(ets_insert_diff_atoms_race3).
--export([test/0]).
-
-test() ->
-  ets:new(foo, [named_table, public]),
-  {race(foo), no_race(foo)}.
-
-race(Tab) ->
-    [{_, N}] = ets:lookup(Tab, counter),
-    aux(Tab, N).
-
-no_race(Tab) ->
-    [{_, N}] = ets:lookup(Tab, counter),
-    AnotherTab = bar,
-    aux(AnotherTab, N).
-
-aux(Table, N) -> 
-  ets:insert(Table, {counter, N+1}).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race4.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race4.erl
deleted file mode 100644
index d0a3f0a1d1..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race4.erl
+++ /dev/null
@@ -1,22 +0,0 @@
-%% This tests that the race condition detection between ets:lookup/
-%% ets:insert is robust even when the functions are called with
-%% different atoms as arguments.
-
--module(ets_insert_diff_atoms_race4).
--export([test/0]).
-
-test() ->
-  ets:new(foo, [named_table, public]),
-  {race(foo, counter), no_race(foo, counter)}.
-
-race(Tab, Counter) ->
-    [{_, N}] = ets:lookup(Tab, Counter),
-    aux(Tab, Counter, N).
-
-no_race(Tab, Counter) ->
-    [{_, N}] = ets:lookup(Tab, Counter),
-    AnotherTab = bar,
-    aux(AnotherTab, Counter, N).
-
-aux(Table, Counter, N) -> 
-  ets:insert(Table, {Counter, N+1}).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race5.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race5.erl
deleted file mode 100644
index bbccaab94d..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race5.erl
+++ /dev/null
@@ -1,22 +0,0 @@
-%% This tests that the race condition detection between ets:lookup/
-%% ets:insert is robust even when the functions are called with
-%% different atoms as arguments.
-
--module(ets_insert_diff_atoms_race5).
--export([test/0]).
-
-test() ->
-  ets:new(foo, [named_table, public]),
-  {race(foo, counter), no_race(foo, counter)}.
-
-race(Tab, Counter) ->
-    [{_, N}] = ets:lookup(Tab, Counter),
-    aux(Tab, Counter, N).
-
-no_race(Tab, Counter) ->
-    [{_, N}] = ets:lookup(Tab, Counter),
-    AnotherCounter = index,
-    aux(Tab, AnotherCounter, N).
-
-aux(Table, Counter, N) -> 
-  ets:insert(Table, [{Counter, N+1}]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race6.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race6.erl
deleted file mode 100644
index 17457e2b44..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_diff_atoms_race6.erl
+++ /dev/null
@@ -1,22 +0,0 @@
-%% This tests that the race condition detection between ets:lookup/
-%% ets:insert is robust even when the functions are called with
-%% different atoms as arguments.
-
--module(ets_insert_diff_atoms_race6).
--export([test/0]).
-
-test() ->
-  ets:new(foo, [named_table, public]),
-  {race(foo, counter), no_race(foo, counter)}.
-
-race(Tab, Counter) ->
-    [{_, N}] = ets:lookup(Tab, Counter),
-    aux(Tab, Counter, N).
-
-no_race(Tab, Counter) ->
-    [{_, N}] = ets:lookup(Tab, Counter),
-    AnotherCounter = index,
-    aux(Tab, AnotherCounter, N).
-
-aux(Table, Counter, N) -> 
-  ets:insert(Table, {Counter, N+1}).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_double1.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_double1.erl
deleted file mode 100644
index 92fa945b73..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_double1.erl
+++ /dev/null
@@ -1,28 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account multiple ets:inserts that might exist.
-
--module(ets_insert_double1).
--export([start/0]).
-
-start() ->
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {random, random:uniform(150)}),  
-  io:format("Inserted ~w\n", [{_, N}] = ets:lookup(foo, random)),
-  case (N rem 2 == 0) of
-    true ->
-      io:format("\nInserted an even integer\n", []),
-      io:format("\nWill make it odd and generate new password\n", []),
-      ets:insert(foo, [{random, N+1}, {pass, generate_password(N)}]);
-    false ->
-      io:format("\nInserted an odd integer\n", []),
-      io:format("\nWill make it even and generate new password\n", []),
-      ets:insert(foo, [{random, N+1}, {pass, generate_password(N)}])
-  end,
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, pass),
-  io:format("New password: ~w\n", [ObjectList]),
-  ets:insert(foo, {pass, 'empty'}).
-
-generate_password(N) ->
-  [{_, P}] = ets:lookup(foo, pass),
-  lists:map(fun (_) -> random:uniform(90)+P+$\s+1 end, lists:seq(1,N)).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_double2.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_double2.erl
deleted file mode 100644
index dc2b14ada0..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_double2.erl
+++ /dev/null
@@ -1,28 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account multiple ets:inserts that might exist.
-
--module(ets_insert_double2).
--export([start/2]).
-
-start(Random, Pass) ->
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {Random, random:uniform(150)}),  
-  io:format("Inserted ~w\n", [{_, N}] = ets:lookup(foo, Random)),
-  case (N rem 2 == 0) of
-    true ->
-      io:format("\nInserted an even integer\n", []),
-      io:format("\nWill make it odd and generate new password\n", []),
-      ets:insert(foo, [{Random, N+1}, {Pass, generate_password(Pass, N)}]);
-    false ->
-      io:format("\nInserted an odd integer\n", []),
-      io:format("\nWill make it even and generate new password\n", []),
-      ets:insert(foo, [{Random, N+1}, {Pass, generate_password(Pass, N)}])
-  end,
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, Pass),
-  io:format("New password: ~w\n", [ObjectList]),
-  ets:insert(foo, {Pass, 'empty'}).
-
-generate_password(Pass, N) ->
-  [{_, P}] = ets:lookup(foo, Pass),
-  lists:map(fun (_) -> random:uniform(90)+P+$\s+1 end, lists:seq(1,N)).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_funs1.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_funs1.erl
deleted file mode 100644
index 4a0a012fe3..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_funs1.erl
+++ /dev/null
@@ -1,18 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account the anonymous functions.
-
--module(ets_insert_funs1).
--export([start/0]).
-
-start() ->
-  F = fun(T) ->
-        ets:lookup(T, counter)
-      end,
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {counter, 0}),  
-  io:format("Inserted ~w\n", [{counter, 0}]),
-  [{_, N}] = F(foo),
-  ets:insert(foo, [{counter, N+1}]),
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, counter),
-  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_funs2.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_funs2.erl
deleted file mode 100644
index 3abb9f2fca..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/ets_insert_funs2.erl
+++ /dev/null
@@ -1,18 +0,0 @@
-%% This tests the presence of possible races due to an ets:lookup/ets:insert
-%% combination. It takes into account the anonymous functions.
-
--module(ets_insert_funs2).
--export([start/0]).
-
-start() ->
-  F = fun(T, N) ->
-        ets:insert(T, [{counter, N+1}])
-      end,
-  io:format("Created ~w\n", [ets:new(foo, [named_table, public])]),
-  ets:insert(foo, {counter, 0}),  
-  io:format("Inserted ~w\n", [{counter, 0}]),
-  [{_, N}] = ets:lookup(foo, counter),
-  F(foo, N),
-  io:format("Update complete\n", []),
-  ObjectList = ets:lookup(foo, counter),
-  io:format("Counter: ~w\n", [ObjectList]).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/extract_translations.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/extract_translations.erl
deleted file mode 100644
index 4bf6f1b198..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/extract_translations.erl
+++ /dev/null
@@ -1,294 +0,0 @@
-%%%----------------------------------------------------------------------
-%%% File    : extract_translations.erl
-%%% Author  : Sergei Golovan <[email protected]>
-%%% Purpose : Auxiliary tool for interface/messages translators
-%%% Created : 23 Apr 2005 by Sergei Golovan <[email protected]>
-%%% Id      : $Id: extract_translations.erl,v 1.1 2009/08/17 09:18:59 maria Exp $
-%%%----------------------------------------------------------------------
-
--module(extract_translations).
--author('[email protected]').
-
--export([start/0]).
-
--define(STATUS_SUCCESS, 0).
--define(STATUS_ERROR,   1).
--define(STATUS_USAGE,   2).
-
--include_lib("kernel/include/file.hrl").
-
-
-start() ->
-    ets:new(translations, [named_table, public]),
-    ets:new(translations_obsolete, [named_table, public]),
-    ets:new(files, [named_table, public]),
-    ets:new(vars, [named_table, public]),
-    case init:get_plain_arguments() of
-	["-srcmsg2po", Dir, File] ->
-	    print_po_header(File),
-	    Status = process(Dir, File, srcmsg2po),
-	    halt(Status);
-	["-unused", Dir, File] ->
-	    Status = process(Dir, File, unused),
-	    halt(Status);
-	[Dir, File] ->
-	    Status = process(Dir, File, used),
-	    halt(Status);
-	_ ->
-	    print_usage(),
-	    halt(?STATUS_USAGE)
-    end.
-
-
-process(Dir, File, Used) ->
-    case load_file(File) of
-	{error, Reason} ->
-	    io:format("~s: ~s~n", [File, file:format_error(Reason)]),
-	    ?STATUS_ERROR;
-	_ ->
-	    FileList = find_src_files(Dir),
-	    lists:foreach(
-	      fun(F) ->
-		    parse_file(Dir, F, Used)
-	      end, FileList),
-	    case Used of
-		unused ->
-		    ets:foldl(fun({Key, _}, _) ->
-				      io:format("~p~n", [Key])
-			      end, ok, translations);
-		srcmsg2po ->
-		    ets:foldl(fun({Key, Trans}, _) ->
-				      print_translation_obsolete(Key, Trans)
-			      end, ok, translations_obsolete);
-		_ ->
-		    ok
-	    end,
-	    ?STATUS_SUCCESS
-    end.
-
-parse_file(Dir, File, Used) ->
-    ets:delete_all_objects(vars),
-    case epp:parse_file(File, [Dir, filename:dirname(File) | code:get_path()], []) of
-	{ok, Forms} ->
-	    lists:foreach(
-	      fun(F) ->
-		    parse_form(Dir, File, F, Used)
-	      end, Forms);
-	_ ->
-	    ok
-    end.
-
-parse_form(Dir, File, Form, Used) ->
-    case Form of
-	%%{undefined, Something} ->
-        %% io:format("Undefined: ~p~n", [Something]);
-	{call,
-	 _,
-	 {remote, _, {atom, _, translate}, {atom, _, translate}},
-	 [_, {string, Line, Str}]
-	} ->
-	    process_string(Dir, File, Line, Str, Used);
-	{call,
-	 _,
-	 {remote, _, {atom, _, translate}, {atom, _, translate}},
-	 [_, {var, _, Name}]
-	} ->
-	    case ets:lookup(vars, Name) of
-		[{_Name, Value, Line}] ->
-		    process_string(Dir, File, Line, Value, Used);
-		_ ->
-		    ok
-	    end;
-	{match,
-	 _,
-	 {var, _, Name},
-	 {string, Line, Value}
-	} ->
-	    ets:insert(vars, {Name, Value, Line});
-	L when is_list(L) ->
-	    lists:foreach(
-	      fun(F) ->
-		      parse_form(Dir, File, F, Used)
-	      end, L);
-	T when is_tuple(T) ->
-	    lists:foreach(
-	      fun(F) ->
-		      parse_form(Dir, File, F, Used)
-	      end, tuple_to_list(T));
-	_ ->
-	    ok
-    end.
-	    
-process_string(_Dir, _File, _Line, "", _Used) ->
-    ok;
-
-process_string(_Dir, File, Line, Str, Used) ->
-    case {ets:lookup(translations, Str), Used} of
-	{[{_Key, _Trans}], unused} ->
-	    ets:delete(translations, Str);
-	{[{_Key, _Trans}], used} ->
-	    ok;
-	{[{_Key, Trans}], srcmsg2po} ->
-	    ets:delete(translations_obsolete, Str),
-	    print_translation(File, Line, Str, Trans);
-	{_, used} ->
-	    case ets:lookup(files, File) of
-		[{_}] ->
-		    ok;
-		_ ->
-		    io:format("~n% ~s~n", [File]),
-		    ets:insert(files, {File})
-	    end,
-	    case Str of
-		[] -> ok;
-		_ -> io:format("{~p, \"\"}.~n", [Str])
-	    end,
-	    ets:insert(translations, {Str, ""});
-	{_, srcmsg2po} ->
-	    case ets:lookup(files, File) of
-		[{_}] ->
-		    ok;
-		_ ->
-		    ets:insert(files, {File})
-	    end,
-	    ets:insert(translations, {Str, ""}),
-	    print_translation(File, Line, Str, "");
-	_ ->
-	    ok
-    end.
-
-load_file(File) ->
-    case file:consult(File) of
-	{ok, Terms} ->
-	    lists:foreach(
-	      fun({Orig, Trans}) ->
-		    case Trans of
-			"" ->
-			    ok;
-			_ ->
-			    ets:insert(translations, {Orig, Trans}),
-			    ets:insert(translations_obsolete, {Orig, Trans})
-		    end
-	      end, Terms);
-	Err ->
-	    Err
-    end.
-
-find_src_files(Dir) ->
-    case file:list_dir(Dir) of
-	{ok, FileList} ->
-	    recurse_filelist(
-	      lists:map(
-	        fun(F) ->
-			filename:join(Dir, F)
-		end, FileList));
-	_ ->
-	    []
-    end.
-
-recurse_filelist(FileList) ->
-    recurse_filelist(FileList, []).
-
-recurse_filelist([], Acc) ->
-    lists:reverse(Acc);
-
-recurse_filelist([H | T], Acc) ->
-    case file:read_file_info(H) of
-	{ok, #file_info{type = directory}} ->
-	    recurse_filelist(T, lists:reverse(find_src_files(H)) ++ Acc);
-	{ok, #file_info{type = regular}} ->
-	    case string:substr(H, string:len(H) - 3) of
-		".erl" ->
-		    recurse_filelist(T, [H | Acc]);
-		".hrl" ->
-		    recurse_filelist(T, [H | Acc]);
-		_ ->
-		    recurse_filelist(T, Acc)
-	    end;
-	_ ->
-	    recurse_filelist(T, Acc)
-    end.
-
-
-print_usage() ->
-    io:format(
-      "Usage: extract_translations [-unused] dir file~n"
-      "~n"
-      "Example:~n"
-      "  extract_translations . ./msgs/ru.msg~n"
-     ).
-
-
-%%%
-%%% Gettext
-%%%
-
-print_po_header(File) ->
-    MsgProps = get_msg_header_props(File),
-    {Language, [LastT | AddT]} = prepare_props(MsgProps),
-    application:load(ejabberd),
-    {ok, Version} = application:get_key(ejabberd, vsn),
-    print_po_header(Version, Language, LastT, AddT).
-
-get_msg_header_props(File) ->
-    {ok, F} = file:open(File, [read]),
-    Lines = get_msg_header_props(F, []),
-    file:close(F),
-    Lines.
-
-get_msg_header_props(F, Lines) ->
-    String = io:get_line(F, ""),
-    case io_lib:fread("% ", String) of
-	{ok, [], RemString} ->
-	    case io_lib:fread("~s", RemString) of
-		{ok, [Key], Value} when Value /= "\n" ->
-		    %% The first character in Value is a blankspace:
-		    %% And the last characters are 'slash n'
-		    ValueClean = string:substr(Value, 2, string:len(Value)-2),
-		    get_msg_header_props(F, Lines ++ [{Key, ValueClean}]);
-		_ ->
-		    get_msg_header_props(F, Lines)
-	    end;
-	_ ->
-	    Lines
-    end.
-
-prepare_props(MsgProps) ->
-    Language = proplists:get_value("Language:", MsgProps),
-    Authors = proplists:get_all_values("Author:", MsgProps),
-    {Language, Authors}.
-
-print_po_header(Version, Language, LastTranslator, AdditionalTranslatorsList) ->
-    AdditionalTranslatorsString = build_additional_translators(AdditionalTranslatorsList),
-    HeaderString =
-	"msgid \"\"\n"
-	"msgstr \"\"\n"
-	"\"Project-Id-Version: " ++ Version ++ "\\n\"\n"
-	++ "\"X-Language: " ++ Language ++ "\\n\"\n"
-	"\"Last-Translator: " ++ LastTranslator ++ "\\n\"\n"
-	++ AdditionalTranslatorsString ++
-	"\"MIME-Version: 1.0\\n\"\n"
-	"\"Content-Type: text/plain; charset=UTF-8\\n\"\n"
-	"\"Content-Transfer-Encoding: 8bit\\n\"\n",
-    io:format("~s~n", [HeaderString]).
-
-build_additional_translators(List) ->
-    lists:foldl(
-      fun(T, Str) ->
-	      Str ++ "\"X-Additional-Translator: " ++ T ++ "\\n\"\n"
-      end,
-      "",
-      List).
-
-print_translation(File, Line, Str, StrT) ->
-    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
-    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
-    io:format("#: ~s:~p~nmsgid \"~s\"~nmsgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).
-
-print_translation_obsolete(Str, StrT) ->
-    File = "unknown.erl",
-    Line = 1,
-    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
-    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
-    io:format("#: ~s:~p~n#~~ msgid \"~s\"~n#~~ msgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).
-
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_diff_atoms_race1.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_diff_atoms_race1.erl
deleted file mode 100644
index 74d17aab0c..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_diff_atoms_race1.erl
+++ /dev/null
@@ -1,33 +0,0 @@
-%% This tests that the race condition detection between mnesia:dirty_read/
-%% mnesia:dirty_write is robust even when the functions are called with
-%% different atoms as arguments.
-
--module(mnesia_diff_atoms_race1).
--export([test/2]).
-
--record(employee, {emp_no,
-                   name,
-                   salary,
-                   sex,
-                   phone,
-                   room_no}).
-
-test(Eno, Raise) ->
-  {race(employee, Eno, Raise), no_race(employee, Eno, Raise)}.
-
-race(Tab, Eno, Raise) ->
-    [E] = mnesia:dirty_read(Tab, Eno),
-    Salary = E#employee.salary + Raise,
-    New = E#employee{salary = Salary},
-    aux(Tab, New).
-
-no_race(Tab, Eno, Raise) ->
-    [E] = mnesia:dirty_read(Tab, Eno),
-    Salary = E#employee.salary + Raise,
-    New = E#employee{salary = Salary},
-    AnotherTab = employer,
-    aux(AnotherTab, New).
-
-
-aux(Table, Record) -> 
-  mnesia:dirty_write(Table, Record).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_diff_atoms_race2.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_diff_atoms_race2.erl
deleted file mode 100644
index e92405a673..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_diff_atoms_race2.erl
+++ /dev/null
@@ -1,37 +0,0 @@
-%% This tests that the race condition detection between mnesia:dirty_read/
-%% mnesia:dirty_write is robust even when the functions are called with
-%% different atoms as arguments.
-
--module(mnesia_diff_atoms_race2).
--export([test/2]).
-
--record(employee, {emp_no,
-                   name,
-                   salary,
-                   sex,
-                   phone,
-                   room_no}).
-
--record(employer, {emp_no,
-                   name,
-                   salary,
-                   sex,
-                   phone,
-                   room_no}).
-
-test(Eno, Raise) ->
-  {race(employee, Eno, Raise), no_race(employee, Eno, Raise)}.
-
-race(Tab, Eno, Raise) ->
-    [E] = mnesia:dirty_read(Tab, Eno),
-    Salary = E#employee.salary + Raise,
-    New = E#employee{salary = Salary},
-    aux(New).
-
-no_race(Tab, Eno, Raise) ->
-    [E] = mnesia:dirty_read(Tab, Eno),
-    AnotherRecord = #employer{},
-    aux(AnotherRecord).
-
-aux(Record) -> 
-  mnesia:dirty_write(Record).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_one_write_two.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_one_write_two.erl
deleted file mode 100644
index 81e460be45..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_one_write_two.erl
+++ /dev/null
@@ -1,22 +0,0 @@
-%% This tests the presence of possible races due to an mnesia:dirty_read/
-%% mnesia:dirty_write combination. It takes into account the argument types
-%% of the calls.
-
--module(mnesia_dirty_read_one_write_two).
--export([raise/2]).
-
--record(employee, {emp_no,
-                   name,
-                   salary,
-                   sex,
-                   phone,
-                   room_no}).
-
-
-raise(Eno, Raise) ->
-    [E] = mnesia:dirty_read({employee, Eno}),
-    Salary = E#employee.salary + Raise,
-    New = E#employee{salary = Salary},
-    mnesia:dirty_write(employee, New).
-
-
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_two_write_one.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_two_write_one.erl
deleted file mode 100644
index 515e9f11de..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_two_write_one.erl
+++ /dev/null
@@ -1,22 +0,0 @@
-%% This tests the presence of possible races due to an mnesia:dirty_read/
-%% mnesia:dirty_write combination. It takes into account the argument types
-%% of the calls.
-
--module(mnesia_dirty_read_two_write_one).
--export([raise/2]).
-
--record(employee, {emp_no,
-                   name,
-                   salary,
-                   sex,
-                   phone,
-                   room_no}).
-
-
-raise(Eno, Raise) ->
-    [E] = mnesia:dirty_read(employee, Eno),
-    Salary = E#employee.salary + Raise,
-    New = E#employee{salary = Salary},
-    mnesia:dirty_write(New).
-
-
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_one.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_one.erl
deleted file mode 100644
index 7ff546a9ea..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_one.erl
+++ /dev/null
@@ -1,22 +0,0 @@
-%% This tests the presence of possible races due to an mnesia:dirty_read/
-%% mnesia:dirty_write combination. It takes into account the argument types
-%% of the calls.
-
--module(mnesia_dirty_read_write_one).
--export([raise/2]).
-
--record(employee, {emp_no,
-                   name,
-                   salary,
-                   sex,
-                   phone,
-                   room_no}).
-
-
-raise(Eno, Raise) ->
-    [E] = mnesia:dirty_read({employee, Eno}),
-    Salary = E#employee.salary + Raise,
-    New = E#employee{salary = Salary},
-    mnesia:dirty_write(New).
-
-
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_two.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_two.erl
deleted file mode 100644
index 10952ac86d..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/mnesia_dirty_read_write_two.erl
+++ /dev/null
@@ -1,22 +0,0 @@
-%% This tests the presence of possible races due to an mnesia:dirty_read/
-%% mnesia:dirty_write combination. It takes into account the argument types
-%% of the calls.
-
--module(mnesia_dirty_read_write_two).
--export([raise/2]).
-
--record(employee, {emp_no,
-                   name,
-                   salary,
-                   sex,
-                   phone,
-                   room_no}).
-
-
-raise(Eno, Raise) ->
-    [E] = mnesia:dirty_read(employee, Eno),
-    Salary = E#employee.salary + Raise,
-    New = E#employee{salary = Salary},
-    mnesia:dirty_write(employee, New).
-
-
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow3.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow3.erl
deleted file mode 100644
index 87b2976165..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow3.erl
+++ /dev/null
@@ -1,25 +0,0 @@
-%% This tests the presence of possible races due to a whereis/register
-%% combination. It takes into account control flow that might exist.
-
--module(whereis_control_flow3).
--export([start/3]).
-
-start(AnAtom, Fun, FunName) ->
-  Pid = 
-    case FunName of
-      master ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end;
-      slave ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end
-    end,
-  register(AnAtom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow4.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow4.erl
deleted file mode 100644
index 9292006fa8..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_control_flow4.erl
+++ /dev/null
@@ -1,29 +0,0 @@
-%% This tests the presence of possible races due to a whereis/register
-%% combination. It takes into account control flow that might exist.
-
--module(whereis_control_flow4).
--export([start/1]).
-
-start(Fun) ->
-  case whereis(maria) of
-    undefined ->
-      Pid1 = spawn(Fun),
-      case Pid1 =:= self() of
-        true ->  
-          case whereis(kostis) of
-            undefined ->
-              Pid2 = spawn(Fun),
-              case Pid2 =:= self() of
-                true ->
-                  register(maria, Pid1),
-                  register(kostis, Pid2);
-                false -> ok
-              end;
-            P when is_pid(P) ->
-              ok
-          end;  
-        false -> ok
-      end;
-    P when is_pid(P) ->
-      ok
-  end.
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_atoms_no_race.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_atoms_no_race.erl
deleted file mode 100644
index dcadcb3683..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_atoms_no_race.erl
+++ /dev/null
@@ -1,24 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust even when the functions are called with different atoms 
-%% as arguments.
-
--module(whereis_diff_atoms_no_race).
--export([test/0]).
-
-test() ->
-  Fun = fun () -> foo end,
-  {no_race(maria, Fun)}.
-
-no_race(AnAtom, Fun) ->
-  case whereis(AnAtom) of
-    undefined ->
-      Pid = spawn(Fun),
-      AnotherAtom = kostis,
-      aux(AnotherAtom, Pid);
-    P when is_pid(P) ->
-      ok
-  end.
-
-aux(Atom, Pid) -> 
-  register(Atom, Pid).
-
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_atoms_race.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_atoms_race.erl
deleted file mode 100644
index 7e302247f8..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_atoms_race.erl
+++ /dev/null
@@ -1,35 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust even when the functions are called with different atoms 
-%% as arguments.
-
--module(whereis_diff_atoms_race).
--export([test/0]). %, race/1, no_race/1]).
-
-test() ->
-  Fun = fun () -> foo end,
-  {race(maria, Fun), no_race(maria, Fun)}.
-
-race(AnAtom, Fun) ->
-  %AnAtom = maria,
-  case whereis(AnAtom) of
-    undefined ->
-      Pid = spawn(Fun),
-      aux(AnAtom, Pid);
-    P when is_pid(P) ->
-      ok
-  end.
-
-no_race(AnAtom, Fun) ->
-  %AnAtom = maria,
-  case whereis(AnAtom) of
-    undefined ->
-      Pid = spawn(Fun),
-      AnotherAtom = kostis,
-      aux(AnotherAtom, Pid);
-    P when is_pid(P) ->
-      ok
-  end.
-
-aux(Atom, Pid) -> 
-  register(Atom, Pid).
-
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions1_nested.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions1_nested.erl
deleted file mode 100644
index 0a77c78ba3..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions1_nested.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions.
-
--module(whereis_diff_functions1_nested).
--export([test/2]).
-
-test(AnAtom, Fun) ->
-  start(AnAtom, Fun).
-
-start(AnAtom, Fun) ->
-  case whereis(AnAtom) of
-    undefined ->
-      Pid = spawn(Fun),
-      race1(AnAtom, Pid);
-    P when is_pid(P) ->
-      true
-  end.
-
-race1(Atom, Pid) ->
-  race2(Atom, Pid).
-
-race2(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions1_pathsens.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions1_pathsens.erl
deleted file mode 100644
index 53955a7fa1..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions1_pathsens.erl
+++ /dev/null
@@ -1,32 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions.
-%% It takes into account control flow that might exist.
-
--module(whereis_diff_functions1_pathsens).
--export([test/1]).
-
-test(FunName) ->
-  start(kostis, mod:function(), FunName).
-
-start(AnAtom, Fun, FunName) ->
-  Pid = 
-    case FunName of
-      master ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end;
-      slave ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end
-    end,
-  race(AnAtom, Pid).
-
-race(Atom, Pid) ->
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions1_twice.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions1_twice.erl
deleted file mode 100644
index 2e87caff4f..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions1_twice.erl
+++ /dev/null
@@ -1,30 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having multiple calls in separate functions.
-
--module(whereis_diff_functions1_twice).
--export([test/2]).
-
-test(AnAtom, Fun) ->
-  start(AnAtom, Fun).
-
-start(AnAtom, Fun) ->
-  case whereis(AnAtom) of
-    undefined ->
-      Pid1 = spawn(Fun),
-      race(AnAtom, Pid1),
-      case whereis(AnAtom) of
-        undefined ->
-          Pid2 = spawn(Fun),
-          race_again(AnAtom, Pid2);
-        P when is_pid(P) ->
-        true
-      end;
-    P when is_pid(P) ->
-      true
-  end.
-
-race(Atom, Pid) -> 
-  register(Atom, Pid).
-	
-race_again(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2.erl
deleted file mode 100644
index 1ec8d194be..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2.erl
+++ /dev/null
@@ -1,25 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions.
-
--module(whereis_diff_functions2).
--export([test/0]).
-
-test() ->
-  start(kostis, mod:function()).
-
-start(AnAtom, Fun) ->
-  Pid1 = spawn(Fun),
-  no_race(Pid1),
-  case whereis(AnAtom) of
-    undefined ->
-      Pid2 = spawn(Fun),
-      race(AnAtom, Pid2);
-    P when is_pid(P) ->
-      true
-  end.
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2_nested.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2_nested.erl
deleted file mode 100644
index 415f73d555..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2_nested.erl
+++ /dev/null
@@ -1,20 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions.
-
--module(whereis_diff_functions2_nested).
--export([start/2]).
-
-start(AnAtom, Fun) ->
-  case whereis(AnAtom) of
-    undefined ->
-      Pid = spawn(Fun),
-      race1(AnAtom, Pid);
-    P when is_pid(P) ->
-      true
-  end.
-
-race1(Atom, Pid) ->
-  race2(Atom, Pid).
-
-race2(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2_pathsens.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2_pathsens.erl
deleted file mode 100644
index cbd9a7d016..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2_pathsens.erl
+++ /dev/null
@@ -1,29 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions.
-%% It takes into account control flow that might exist.
-
--module(whereis_diff_functions2_pathsens).
--export([race/4]).
-
-start(AnAtom, Fun, FunName) ->
-  Pid = 
-    case FunName of
-      master ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end;
-      slave ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end
-    end.
-
-race(Atom, Fun, FunName, Pid) -> 
-  start(Atom, Fun, FunName),
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2_twice.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2_twice.erl
deleted file mode 100644
index d8e4987758..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions2_twice.erl
+++ /dev/null
@@ -1,27 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having multiple calls in separate functions.
-
--module(whereis_diff_functions2_twice).
--export([start/2]).
-
-start(AnAtom, Fun) ->
-  case whereis(AnAtom) of
-    undefined ->
-      Pid1 = spawn(Fun),
-      race(AnAtom, Pid1),
-      case whereis(AnAtom) of
-        undefined ->
-          Pid2 = spawn(Fun),
-          race_again(AnAtom, Pid2);
-        P when is_pid(P) ->
-        true
-      end;
-    P when is_pid(P) ->
-      true
-  end.
-
-race(Atom, Pid) -> 
-  register(Atom, Pid).
-	
-race_again(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions3.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions3.erl
deleted file mode 100644
index 7d4e0905ef..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions3.erl
+++ /dev/null
@@ -1,11 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions.
-
--module(whereis_diff_functions3).
--export([start/1]).
-
-start(AnAtom) ->
-  register(AnAtom, race(AnAtom)).
-
-race(Atom) -> 
-  whereis(Atom).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions3_nested.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions3_nested.erl
deleted file mode 100644
index b4129dc83b..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions3_nested.erl
+++ /dev/null
@@ -1,21 +0,0 @@
-%% This tests that the race condition detection between whereis/unregister
-%% is robust w.r.t. having the calls in separate functions.
-
--module(whereis_diff_functions3_nested).
--export([test/1]).
-
-test(AnAtom) ->
-  start(AnAtom).
-
-start(AnAtom) ->
-  case whereis(AnAtom) of
-    undefined -> true;
-    P when is_pid(P) ->
-      race1(AnAtom)
-  end.
-
-race1(Atom) ->
-  race2(Atom).
-
-race2(Atom) -> 
-  unregister(Atom).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions3_pathsens.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions3_pathsens.erl
deleted file mode 100644
index f06e43024b..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions3_pathsens.erl
+++ /dev/null
@@ -1,29 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions.
-%% It takes into account control flow that might exist.
-
--module(whereis_diff_functions3_pathsens).
--export([start/3]).
-
-start(AnAtom, Fun, FunName) ->
-  Pid = 
-    case FunName of
-      master ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end;
-      slave ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end
-    end,
-  race(AnAtom, Pid).
-
-race(Atom, Pid) ->
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions4.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions4.erl
deleted file mode 100644
index 334485921c..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions4.erl
+++ /dev/null
@@ -1,32 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions.
-
--module(whereis_diff_functions4).
--export([test/2]).
-
-test(AnAtom, Fun) ->
-  start(AnAtom, Fun).
-
-start(AnAtom, Fun) ->
-  Pid1 = spawn(Fun),
-  no_race(Pid1),
-  case whereis(AnAtom) of
-    undefined ->
-      Pid2 = spawn(Fun),
-      race(AnAtom, Pid2),
-      case whereis(AnAtom) of
-        undefined ->
-          Pid3 = spawn(Fun),
-          race(AnAtom, Pid3);
-        P when is_pid(P) ->
-          true
-      end;
-    P when is_pid(P) ->
-      true
-  end.
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions5.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions5.erl
deleted file mode 100644
index b4459273f9..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions5.erl
+++ /dev/null
@@ -1,22 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions.
-
--module(whereis_diff_functions5).
--export([start/2]).
-
-start(AnAtom, Fun) ->
-  Pid1 = spawn(Fun),
-  no_race(Pid1),
-  case whereis(AnAtom) of
-    undefined ->
-      Pid2 = spawn(Fun),
-      race(AnAtom, Pid2);
-    P when is_pid(P) ->
-      true
-  end.
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions6.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions6.erl
deleted file mode 100644
index ccf0f5e127..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_functions6.erl
+++ /dev/null
@@ -1,29 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions.
-
--module(whereis_diff_functions6).
--export([start/2]).
-
-start(AnAtom, Fun) ->
-  Pid1 = spawn(Fun),
-  no_race(Pid1),
-  case whereis(AnAtom) of
-    undefined ->
-      Pid2 = spawn(Fun),
-      race(AnAtom, Pid2),
-      case whereis(AnAtom) of
-        undefined ->
-          Pid3 = spawn(Fun),
-          race(AnAtom, Pid3);
-        P when is_pid(P) ->
-          true
-      end;
-    P when is_pid(P) ->
-      true
-  end.
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1/whereis_diff_modules2.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1/whereis_diff_modules2.erl
deleted file mode 100644
index dabb7fd2da..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1/whereis_diff_modules2.erl
+++ /dev/null
@@ -1,11 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate modules.
-
--module(whereis_diff_modules2).
--export([no_race/1, race/2]).
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules1_pathsens.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules1_pathsens.erl
deleted file mode 100644
index 3dbb645e65..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules1_pathsens.erl
+++ /dev/null
@@ -1,26 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate modules (backward analysis).
-%% It takes into account control flow that might exist.
-
--module(whereis_diff_modules1_pathsens).
--export([start/3]).
-
-start(AnAtom, Fun, FunName) ->
-  Pid = 
-    case FunName of
-      master ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end;
-      slave ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end
-    end,
-  whereis_diff_modules2_pathsens:race(AnAtom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules2_pathsens.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules2_pathsens.erl
deleted file mode 100644
index 99331b81b1..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules1_pathsens/whereis_diff_modules2_pathsens.erl
+++ /dev/null
@@ -1,12 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate modules (backward analysis).
-%% It takes into account control flow that might exist.
-
--module(whereis_diff_modules2_pathsens).
--export([no_race/1, race/2]).
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2/whereis_diff_modules4.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2/whereis_diff_modules4.erl
deleted file mode 100644
index 6ab9a4d824..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2/whereis_diff_modules4.erl
+++ /dev/null
@@ -1,11 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate modules.
-
--module(whereis_diff_modules4).
--export([no_race/1, race/1]).
-
-no_race(Pid) -> 
-  register(master, Pid).
-	
-race(Atom) -> 
-  whereis(Atom).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules3_pathsens.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules3_pathsens.erl
deleted file mode 100644
index 1eaa954fa1..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules3_pathsens.erl
+++ /dev/null
@@ -1,25 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate modules (forward analysis).
-%% It takes into account control flow that might exist.
-
--module(whereis_diff_modules3_pathsens).
--export([start/3]).
-
-start(AnAtom, Fun, FunName) ->
-  Pid = 
-    case FunName of
-      master ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end;
-      slave ->
-        case whereis(AnAtom) of
-          undefined ->
-            spawn(Fun);
-          P when is_pid(P) ->
-            P
-        end
-    end.
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules4_pathsens.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules4_pathsens.erl
deleted file mode 100644
index f23a63c8f0..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules2_pathsens/whereis_diff_modules4_pathsens.erl
+++ /dev/null
@@ -1,13 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate modules (forward analysis).
-%% It takes into account control flow that might exist.
-
--module(whereis_diff_modules4_pathsens).
--export([no_race/1, race/4]).
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Fun, FunName, Pid) -> 
-  whereis_diff_modules3_pathsens:start(Atom, Fun, FunName),
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules3/whereis_diff_modules6.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules3/whereis_diff_modules6.erl
deleted file mode 100644
index ec6c245c9a..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules3/whereis_diff_modules6.erl
+++ /dev/null
@@ -1,11 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate modules.
-
--module(whereis_diff_modules6).
--export([no_race/1, race/2]).
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules2_nested.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules2_nested.erl
deleted file mode 100644
index 4b4c058884..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules2_nested.erl
+++ /dev/null
@@ -1,11 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate modules.
-
--module(whereis_diff_modules2_nested).
--export([no_race/1, race/2]).
-
-no_race(Pid) -> 
-  register(master, Pid).
-	
-race(Atom, Pid) ->
-  whereis_diff_modules3_nested:race(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules3_nested.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules3_nested.erl
deleted file mode 100644
index 5412660b16..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_nested/whereis_diff_modules3_nested.erl
+++ /dev/null
@@ -1,11 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate modules.
-
--module(whereis_diff_modules3_nested).
--export([no_race/1, race/2]).
-
-no_race(Pid) -> 
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_twice/whereis_diff_modules2_twice.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_twice/whereis_diff_modules2_twice.erl
deleted file mode 100644
index afe5214648..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_modules_twice/whereis_diff_modules2_twice.erl
+++ /dev/null
@@ -1,11 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate modules.
-
--module(whereis_diff_modules2_twice).
--export([race/2, race_again/2]).
-
-race(Atom, Pid) -> 
-  register(Atom, Pid).
-	
-race_again(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_vars_no_race.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_vars_no_race.erl
deleted file mode 100644
index 16f1d91490..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_vars_no_race.erl
+++ /dev/null
@@ -1,13 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust even when the functions are called with different variables 
-%% as arguments.
-
--module(whereis_diff_vars_no_race).
--export([test/3]).
-
-test(AnAtom, AnotherAtom, Pid) ->
-  {aux(AnAtom, Pid), aux(AnotherAtom, Pid)}.
-
-aux(Atom, Pid) ->
-  register(Atom, Pid),
-  whereis(Atom).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_vars_race.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_vars_race.erl
deleted file mode 100644
index 7382d184dc..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_diff_vars_race.erl
+++ /dev/null
@@ -1,19 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust even when the functions are called with different variables 
-%% as arguments.
-
--module(whereis_diff_vars_race).
--export([test/2]).
-
-test(AnAtom, AnotherAtom) ->
-  Fun = fun () -> foo end,
-  {aux(AnAtom, AnotherAtom, Fun), aux(AnotherAtom, AnAtom, Fun)}.
-
-aux(Atom1, Atom2, Fun) ->
-  case whereis(Atom1) of
-    undefined ->
-      Pid = spawn(Fun),
-      register(Atom2, Pid);
-    P when is_pid(P) ->
-      ok
-  end.
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module1/whereis_intra_inter_module2.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module1/whereis_intra_inter_module2.erl
deleted file mode 100644
index cc2efbecd0..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module1/whereis_intra_inter_module2.erl
+++ /dev/null
@@ -1,11 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions and modules.
-
--module(whereis_intra_inter_module2).
--export([no_race/1, race/2]).
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module2/whereis_intra_inter_module4.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module2/whereis_intra_inter_module4.erl
deleted file mode 100644
index 9769f312a8..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module2/whereis_intra_inter_module4.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions and modules.
-
--module(whereis_intra_inter_module4).
--export([no_race/1, race/2]).
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  continue(Atom, Pid).
-
-continue(Atom, Pid) ->
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module3/whereis_intra_inter_module6.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module3/whereis_intra_inter_module6.erl
deleted file mode 100644
index 92a589f97f..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module3/whereis_intra_inter_module6.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions and modules.
-
--module(whereis_intra_inter_module6).
--export([no_race/1, race/2]).
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  continue(Atom, Pid).
-
-continue(Atom, Pid) ->
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module6/whereis_intra_inter_module12.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module6/whereis_intra_inter_module12.erl
deleted file mode 100644
index 2160780d8e..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module6/whereis_intra_inter_module12.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions and modules.
-
--module(whereis_intra_inter_module12).
--export([no_race/1, race/2, continue/2]).
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  continue(Atom, Pid).
-
-continue(Atom, Pid) ->
-  register(Atom, Pid).
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module7/whereis_intra_inter_module14.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module7/whereis_intra_inter_module14.erl
deleted file mode 100644
index 2de6c91985..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module7/whereis_intra_inter_module14.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions and modules.
-
--module(whereis_intra_inter_module14).
--export([no_race/1, race/2, start/2]).
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  register(Atom, Pid).
-
-start(AnAtom, Fun) ->
-  Pid1 = spawn(Fun),
-  no_race(Pid1),
-  case whereis(AnAtom) of
-    undefined ->
-      Pid2 = spawn(Fun),
-      race(AnAtom, Pid2);
-    P when is_pid(P) ->
-      true
-  end.
-
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module8/whereis_intra_inter_module16.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module8/whereis_intra_inter_module16.erl
deleted file mode 100644
index 6c170dc851..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_intra_inter_module8/whereis_intra_inter_module16.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-%% This tests that the race condition detection between whereis/register
-%% is robust w.r.t. having the calls in separate functions and modules.
-
--module(whereis_intra_inter_module16).
--export([no_race/1, race/2, start/2]).
-
-no_race(Pid) ->
-  register(master, Pid).
-	
-race(Atom, Pid) -> 
-  register(Atom, Pid).
-
-start(AnAtom, Fun) ->
-  Pid1 = spawn(Fun),
-  no_race(Pid1),
-  case whereis(AnAtom) of
-    undefined ->
-      Pid2 = spawn(Fun),
-      whereis_intra_inter_module15:continue(AnAtom, Pid2);
-    P when is_pid(P) ->
-      true
-  end.
-
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_param_inter_module/whereis_param_inter_module1.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_param_inter_module/whereis_param_inter_module1.erl
deleted file mode 100644
index ab7c9b4cf9..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_param_inter_module/whereis_param_inter_module1.erl
+++ /dev/null
@@ -1,9 +0,0 @@
-%% This tests the presence of possible races due to a whereis/register
-%% combination in higher order functions and inter-module calls.
-
--module(whereis_param_inter_module1).
--export([start/2]).
-
-start(AnAtom, Fun) ->
-  register(AnAtom, whereis_param_inter_module2:continue(AnAtom, Fun)).
-
diff --git a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_try_catch.erl b/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_try_catch.erl
deleted file mode 100644
index 9c8daf8d8c..0000000000
--- a/lib/dialyzer/test/race_tests_SUITE_data/src/whereis_try_catch.erl
+++ /dev/null
@@ -1,25 +0,0 @@
-% This tests that warnings do appear when a whereis/register combination
-% is handled by try/catch.
-
--module(whereis_try_catch).
--export([race/1, no_race/1]).
-
-race(Pid) ->
-  case whereis(master) of
-    undefined ->
-      try
-	io:format("exception", [])
-      catch 
-        _ -> register(master, Pid)
-      end
-  end.
-
-no_race(Pid) ->
-  case whereis(master) of
-    undefined ->
-      try
-        register(master, Pid)
-      catch 
-        _ -> io:format("exception", [])
-      end
-  end.
diff --git a/lib/dialyzer/test/remake b/lib/dialyzer/test/remake
deleted file mode 100755
index 654bdd9e88..0000000000
--- a/lib/dialyzer/test/remake
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-erlc +warn_exported_vars +warn_unused_import +warn_untyped_record +warn_missing_spec dialyzer_common.erl file_utils.erl
-if [ -n "$1" ]; then
-    erl -noshell -run dialyzer_common create_suite "$1" -s erlang halt
-else
-    erl -noshell -run dialyzer_common create_all_suites -s erlang halt
-fi
-rm dialyzer_common.beam file_utils.beam
\ No newline at end of file
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/dialyzer_options b/lib/dialyzer/test/small_SUITE_data/dialyzer_options
index 50991c9bc5..50991c9bc5 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/small_SUITE_data/dialyzer_options
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/andalso_test b/lib/dialyzer/test/small_SUITE_data/results/andalso_test
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/andalso_test
+++ b/lib/dialyzer/test/small_SUITE_data/results/andalso_test
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/app_call b/lib/dialyzer/test/small_SUITE_data/results/app_call
index cc1a63f944..cc1a63f944 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/app_call
+++ b/lib/dialyzer/test/small_SUITE_data/results/app_call
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/appmon_place b/lib/dialyzer/test/small_SUITE_data/results/appmon_place
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/appmon_place
+++ b/lib/dialyzer/test/small_SUITE_data/results/appmon_place
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/areq b/lib/dialyzer/test/small_SUITE_data/results/areq
index dd91f2d2bf..dd91f2d2bf 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/areq
+++ b/lib/dialyzer/test/small_SUITE_data/results/areq
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/atom_call b/lib/dialyzer/test/small_SUITE_data/results/atom_call
index 851bb7ab12..851bb7ab12 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/atom_call
+++ b/lib/dialyzer/test/small_SUITE_data/results/atom_call
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/atom_widen b/lib/dialyzer/test/small_SUITE_data/results/atom_widen
index 6d0a7b2737..6d0a7b2737 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/atom_widen
+++ b/lib/dialyzer/test/small_SUITE_data/results/atom_widen
diff --git a/lib/dialyzer/test/small_SUITE_data/results/blame_contract_range b/lib/dialyzer/test/small_SUITE_data/results/blame_contract_range
new file mode 100644
index 0000000000..0c1c58ac8e
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/blame_contract_range
@@ -0,0 +1,4 @@
+
+blame_contract_range.erl:11: Function foo/0 has no local return
+blame_contract_range.erl:14: The contract blame_contract_range:bar(atom()) -> 'a' cannot be right because the inferred return for bar('b') on line 12 is 'b'
+blame_contract_range.erl:15: The pattern 'a' can never match the type 'b'
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/bs_fail_constr b/lib/dialyzer/test/small_SUITE_data/results/bs_fail_constr
index dbc8241971..dbc8241971 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/bs_fail_constr
+++ b/lib/dialyzer/test/small_SUITE_data/results/bs_fail_constr
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/bs_utf8 b/lib/dialyzer/test/small_SUITE_data/results/bs_utf8
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/bs_utf8
+++ b/lib/dialyzer/test/small_SUITE_data/results/bs_utf8
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/cerl_hipeify b/lib/dialyzer/test/small_SUITE_data/results/cerl_hipeify
index 87bf6f309f..87bf6f309f 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/cerl_hipeify
+++ b/lib/dialyzer/test/small_SUITE_data/results/cerl_hipeify
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/comm_layer b/lib/dialyzer/test/small_SUITE_data/results/comm_layer
index cb4bf14eb4..cb4bf14eb4 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/comm_layer
+++ b/lib/dialyzer/test/small_SUITE_data/results/comm_layer
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/compare1 b/lib/dialyzer/test/small_SUITE_data/results/compare1
index f0d696ffcb..f0d696ffcb 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/compare1
+++ b/lib/dialyzer/test/small_SUITE_data/results/compare1
diff --git a/lib/dialyzer/test/small_SUITE_data/results/confusing_record_warning b/lib/dialyzer/test/small_SUITE_data/results/confusing_record_warning
new file mode 100644
index 0000000000..ac3d89b02b
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/confusing_record_warning
@@ -0,0 +1,3 @@
+
+confusing_record_warning.erl:18: Function test/1 has no local return
+confusing_record_warning.erl:18: Matching of pattern {'r', [_]} tagged with a record name violates the declared type of #r{field::'binary' | 'undefined'}
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/confusing_warning b/lib/dialyzer/test/small_SUITE_data/results/confusing_warning
index d2d0c91fff..d2d0c91fff 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/confusing_warning
+++ b/lib/dialyzer/test/small_SUITE_data/results/confusing_warning
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/contract1 b/lib/dialyzer/test/small_SUITE_data/results/contract1
index fb8ba5f72b..fb8ba5f72b 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/contract1
+++ b/lib/dialyzer/test/small_SUITE_data/results/contract1
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/contract2 b/lib/dialyzer/test/small_SUITE_data/results/contract2
index 6809e528c4..6809e528c4 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/contract2
+++ b/lib/dialyzer/test/small_SUITE_data/results/contract2
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/contract3 b/lib/dialyzer/test/small_SUITE_data/results/contract3
index 44b49e745a..44b49e745a 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/contract3
+++ b/lib/dialyzer/test/small_SUITE_data/results/contract3
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/contract5 b/lib/dialyzer/test/small_SUITE_data/results/contract5
index 116c4f4d4d..116c4f4d4d 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/contract5
+++ b/lib/dialyzer/test/small_SUITE_data/results/contract5
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/eqeq b/lib/dialyzer/test/small_SUITE_data/results/eqeq
index dabd38ebe3..dabd38ebe3 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/eqeq
+++ b/lib/dialyzer/test/small_SUITE_data/results/eqeq
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/ets_select b/lib/dialyzer/test/small_SUITE_data/results/ets_select
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/ets_select
+++ b/lib/dialyzer/test/small_SUITE_data/results/ets_select
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/exhaust_case b/lib/dialyzer/test/small_SUITE_data/results/exhaust_case
index 45cdd80b64..45cdd80b64 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/exhaust_case
+++ b/lib/dialyzer/test/small_SUITE_data/results/exhaust_case
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/failing_guard1 b/lib/dialyzer/test/small_SUITE_data/results/failing_guard1
index 5bdd13093a..5bdd13093a 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/failing_guard1
+++ b/lib/dialyzer/test/small_SUITE_data/results/failing_guard1
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/flatten b/lib/dialyzer/test/small_SUITE_data/results/flatten
index 4571214e49..4571214e49 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/flatten
+++ b/lib/dialyzer/test/small_SUITE_data/results/flatten
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/fun_app b/lib/dialyzer/test/small_SUITE_data/results/fun_app
index b28baad43b..b28baad43b 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/fun_app
+++ b/lib/dialyzer/test/small_SUITE_data/results/fun_app
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/fun_ref_match b/lib/dialyzer/test/small_SUITE_data/results/fun_ref_match
index 60b34530b4..60b34530b4 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/fun_ref_match
+++ b/lib/dialyzer/test/small_SUITE_data/results/fun_ref_match
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/gencall b/lib/dialyzer/test/small_SUITE_data/results/gencall
index d0479ed738..d0479ed738 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/gencall
+++ b/lib/dialyzer/test/small_SUITE_data/results/gencall
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/gs_make b/lib/dialyzer/test/small_SUITE_data/results/gs_make
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/gs_make
+++ b/lib/dialyzer/test/small_SUITE_data/results/gs_make
diff --git a/lib/dialyzer/test/small_SUITE_data/results/guard_warnings b/lib/dialyzer/test/small_SUITE_data/results/guard_warnings
new file mode 100644
index 0000000000..0ff998bf50
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/guard_warnings
@@ -0,0 +1,97 @@
+
+guard_warnings.erl:100: Function test45/0 has no local return
+guard_warnings.erl:100: Guard test 'not'('true') can never succeed
+guard_warnings.erl:102: Function test46/1 has no local return
+guard_warnings.erl:102: Guard test X::'true' =:= 'false' can never succeed
+guard_warnings.erl:104: Function test47/1 has no local return
+guard_warnings.erl:104: Guard test X::'true' == 'false' can never succeed
+guard_warnings.erl:106: Function test48/1 has no local return
+guard_warnings.erl:106: Guard test X::'true' =/= 'true' can never succeed
+guard_warnings.erl:114: Function test52_w/1 has no local return
+guard_warnings.erl:118: Function test54_w/1 has no local return
+guard_warnings.erl:12: Function test1/1 has no local return
+guard_warnings.erl:12: Guard test X::'true' =:= 'false' can never succeed
+guard_warnings.erl:14: Function test2/1 has no local return
+guard_warnings.erl:14: Guard test X::'false' =:= 'true' can never succeed
+guard_warnings.erl:16: Function test3/1 has no local return
+guard_warnings.erl:16: Guard test 'not'(X::'true') can never succeed
+guard_warnings.erl:18: Function test4/1 has no local return
+guard_warnings.erl:18: Guard test 'and'('true',X::none()) can never succeed
+guard_warnings.erl:20: Function test5/1 has no local return
+guard_warnings.erl:20: Guard test 'not'(X::'true') can never succeed
+guard_warnings.erl:22: Function test6/1 has no local return
+guard_warnings.erl:22: Guard test 'and'('true',X::none()) can never succeed
+guard_warnings.erl:24: Function test7_w/1 has no local return
+guard_warnings.erl:26: Function test8_w/1 has no local return
+guard_warnings.erl:28: Function test9/1 has no local return
+guard_warnings.erl:28: Guard test not('not'(X::'false')) can never succeed
+guard_warnings.erl:30: Function test10/1 has no local return
+guard_warnings.erl:30: Guard test not('or'('false',X::none())) can never succeed
+guard_warnings.erl:32: Function test11/1 has no local return
+guard_warnings.erl:32: Guard test not('not'(X::'false')) can never succeed
+guard_warnings.erl:34: Function test12/1 has no local return
+guard_warnings.erl:34: Guard test not('or'('false',X::none())) can never succeed
+guard_warnings.erl:36: Function test13/1 has no local return
+guard_warnings.erl:36: Guard test 'and'('true','false') can never succeed
+guard_warnings.erl:38: Function test14/1 has no local return
+guard_warnings.erl:38: Guard test 'and'('false',any()) can never succeed
+guard_warnings.erl:40: Function test15/1 has no local return
+guard_warnings.erl:40: Guard test 'and'(X::'true','false') can never succeed
+guard_warnings.erl:42: Function test16/1 has no local return
+guard_warnings.erl:42: Guard test 'and'('false',X::any()) can never succeed
+guard_warnings.erl:44: Function test17/1 has no local return
+guard_warnings.erl:44: Guard test 'and'(X::'true','false') can never succeed
+guard_warnings.erl:46: Function test18/1 has no local return
+guard_warnings.erl:46: Guard test 'and'('false',X::any()) can never succeed
+guard_warnings.erl:48: Function test19/1 has no local return
+guard_warnings.erl:48: Guard test not('or'('true',any())) can never succeed
+guard_warnings.erl:50: Function test20/1 has no local return
+guard_warnings.erl:50: Guard test not('or'('false','true')) can never succeed
+guard_warnings.erl:52: Function test21/1 has no local return
+guard_warnings.erl:52: Guard test not('or'('true',X::any())) can never succeed
+guard_warnings.erl:54: Function test22/1 has no local return
+guard_warnings.erl:54: Guard test not('or'(X::'false','true')) can never succeed
+guard_warnings.erl:56: Function test23/1 has no local return
+guard_warnings.erl:56: Guard test not('or'('true',X::any())) can never succeed
+guard_warnings.erl:58: Function test24/1 has no local return
+guard_warnings.erl:58: Guard test not('or'(X::'false','true')) can never succeed
+guard_warnings.erl:60: Function test25/1 has no local return
+guard_warnings.erl:60: Guard test 'and'('false',any()) can never succeed
+guard_warnings.erl:62: Function test26/1 has no local return
+guard_warnings.erl:62: Guard test 'and'('true','false') can never succeed
+guard_warnings.erl:64: Function test27/1 has no local return
+guard_warnings.erl:64: Guard test 'and'('false',X::any()) can never succeed
+guard_warnings.erl:66: Function test28/1 has no local return
+guard_warnings.erl:66: Guard test 'and'(X::'true','false') can never succeed
+guard_warnings.erl:68: Function test29/1 has no local return
+guard_warnings.erl:68: Guard test 'and'('false',X::any()) can never succeed
+guard_warnings.erl:70: Function test30/1 has no local return
+guard_warnings.erl:70: Guard test 'and'(X::'true','false') can never succeed
+guard_warnings.erl:72: Function test31/0 has no local return
+guard_warnings.erl:72: Guard test 'and'('false',any()) can never succeed
+guard_warnings.erl:74: Function test32/0 has no local return
+guard_warnings.erl:74: Guard test 'and'('false',any()) can never succeed
+guard_warnings.erl:76: Function test33/0 has no local return
+guard_warnings.erl:76: Guard test not('and'('true','true')) can never succeed
+guard_warnings.erl:78: Function test34/0 has no local return
+guard_warnings.erl:78: Guard test 'and'('false',any()) can never succeed
+guard_warnings.erl:80: Function test35/0 has no local return
+guard_warnings.erl:80: Guard test not('and'('true','true')) can never succeed
+guard_warnings.erl:82: Function test36/0 has no local return
+guard_warnings.erl:82: Guard test 'or'('false','false') can never succeed
+guard_warnings.erl:84: Function test37/0 has no local return
+guard_warnings.erl:84: Guard test 'or'('false','false') can never succeed
+guard_warnings.erl:86: Function test38/0 has no local return
+guard_warnings.erl:86: Guard test 'or'('false','false') can never succeed
+guard_warnings.erl:88: Function test39/0 has no local return
+guard_warnings.erl:88: Guard test 'or'('false','false') can never succeed
+guard_warnings.erl:90: Function test40/0 has no local return
+guard_warnings.erl:90: Guard test 'or'('false','false') can never succeed
+guard_warnings.erl:92: Function test41/0 has no local return
+guard_warnings.erl:92: Guard test 'true' =:= 'false' can never succeed
+guard_warnings.erl:94: Function test42/0 has no local return
+guard_warnings.erl:94: Guard test 'true' == 'false' can never succeed
+guard_warnings.erl:96: Function test43/0 has no local return
+guard_warnings.erl:96: Guard test 'true' =:= 'false' can never succeed
+guard_warnings.erl:98: Function test44/0 has no local return
+guard_warnings.erl:98: Guard test not('true' == 'true') can never succeed
diff --git a/lib/dialyzer/test/small_SUITE_data/results/guards b/lib/dialyzer/test/small_SUITE_data/results/guards
new file mode 100644
index 0000000000..824a7cfa24
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/guards
@@ -0,0 +1,17 @@
+
+guards.erl:100: The variable _ can never match since previous clauses completely covered the type {'true','true'}
+guards.erl:111: The pattern {_, _} can never match since previous clauses completely covered the type {'false',boolean()} | {'true',boolean()}
+guards.erl:122: The pattern {_, _} can never match since previous clauses completely covered the type {'false',boolean()} | {'true',boolean()}
+guards.erl:129: Function t15_a/0 has no local return
+guards.erl:129: The call guards:t15('a') will never return since it differs in the 1st argument from the success typing arguments: ('b')
+guards.erl:129: The call guards:t15('c') will never return since it differs in the 1st argument from the success typing arguments: ('b')
+guards.erl:136: Function t16_a/0 has no local return
+guards.erl:136: The call guards:t16('a') will never return since it differs in the 1st argument from the success typing arguments: ('b')
+guards.erl:136: The call guards:t16('c') will never return since it differs in the 1st argument from the success typing arguments: ('b')
+guards.erl:55: Function t5/1 has no local return
+guards.erl:55: Guard test is_integer(A::atom()) can never succeed
+guards.erl:59: Clause guard cannot succeed. The variable A was matched against the type any()
+guards.erl:59: Function t6/1 has no local return
+guards.erl:67: The call guards:t7({42}) will never return since it differs in the 1st argument from the success typing arguments: (atom() | integer())
+guards.erl:75: The call guards:t8({42}) will never return since it differs in the 1st argument from the success typing arguments: (atom() | integer())
+guards.erl:92: The variable _ can never match since previous clauses completely covered the type {'true','true'}
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/inf_loop2 b/lib/dialyzer/test/small_SUITE_data/results/inf_loop2
index 7e9972ad98..7e9972ad98 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/inf_loop2
+++ b/lib/dialyzer/test/small_SUITE_data/results/inf_loop2
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/invalid_specs b/lib/dialyzer/test/small_SUITE_data/results/invalid_specs
index c95c0ff1f8..c95c0ff1f8 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/invalid_specs
+++ b/lib/dialyzer/test/small_SUITE_data/results/invalid_specs
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/letrec1 b/lib/dialyzer/test/small_SUITE_data/results/letrec1
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/letrec1
+++ b/lib/dialyzer/test/small_SUITE_data/results/letrec1
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/list_match b/lib/dialyzer/test/small_SUITE_data/results/list_match
index 95007da604..95007da604 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/list_match
+++ b/lib/dialyzer/test/small_SUITE_data/results/list_match
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/lzip b/lib/dialyzer/test/small_SUITE_data/results/lzip
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/lzip
+++ b/lib/dialyzer/test/small_SUITE_data/results/lzip
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/make_tuple b/lib/dialyzer/test/small_SUITE_data/results/make_tuple
index 4d51586e35..4d51586e35 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/make_tuple
+++ b/lib/dialyzer/test/small_SUITE_data/results/make_tuple
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/minus_minus b/lib/dialyzer/test/small_SUITE_data/results/minus_minus
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/minus_minus
+++ b/lib/dialyzer/test/small_SUITE_data/results/minus_minus
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/mod_info b/lib/dialyzer/test/small_SUITE_data/results/mod_info
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/mod_info
+++ b/lib/dialyzer/test/small_SUITE_data/results/mod_info
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/my_filter b/lib/dialyzer/test/small_SUITE_data/results/my_filter
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/my_filter
+++ b/lib/dialyzer/test/small_SUITE_data/results/my_filter
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/my_sofs b/lib/dialyzer/test/small_SUITE_data/results/my_sofs
index bfee0bce0d..bfee0bce0d 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/my_sofs
+++ b/lib/dialyzer/test/small_SUITE_data/results/my_sofs
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/no_match b/lib/dialyzer/test/small_SUITE_data/results/no_match
index 9760b980a2..9760b980a2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/no_match
+++ b/lib/dialyzer/test/small_SUITE_data/results/no_match
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/no_unused_fun b/lib/dialyzer/test/small_SUITE_data/results/no_unused_fun
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/no_unused_fun
+++ b/lib/dialyzer/test/small_SUITE_data/results/no_unused_fun
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/no_unused_fun2 b/lib/dialyzer/test/small_SUITE_data/results/no_unused_fun2
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/no_unused_fun2
+++ b/lib/dialyzer/test/small_SUITE_data/results/no_unused_fun2
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/non_existing b/lib/dialyzer/test/small_SUITE_data/results/non_existing
index 58da2bfc8b..58da2bfc8b 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/non_existing
+++ b/lib/dialyzer/test/small_SUITE_data/results/non_existing
diff --git a/lib/dialyzer/test/small_SUITE_data/results/none_scc_inf_loop b/lib/dialyzer/test/small_SUITE_data/results/none_scc_inf_loop
new file mode 100644
index 0000000000..3b1b204708
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/none_scc_inf_loop
@@ -0,0 +1,5 @@
+
+none_scc_inf_loop.erl:10: Function foo/0 has no local return
+none_scc_inf_loop.erl:13: Function foo/1 has no local return
+none_scc_inf_loop.erl:13: The pattern 0 can never match the type 1 | 3
+none_scc_inf_loop.erl:18: Function bar/1 has no local return
diff --git a/lib/dialyzer/test/small_SUITE_data/results/not_bogus_warning b/lib/dialyzer/test/small_SUITE_data/results/not_bogus_warning
new file mode 100644
index 0000000000..e3a7f6b444
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/not_bogus_warning
@@ -0,0 +1,3 @@
+
+not_bogus_warning.erl:11: Guard test not(is_atom(A::'bar' | 'foo')) can never succeed
+not_bogus_warning.erl:24: Guard test not(is_integer(X::42)) can never succeed
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/not_guard_crash b/lib/dialyzer/test/small_SUITE_data/results/not_guard_crash
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/not_guard_crash
+++ b/lib/dialyzer/test/small_SUITE_data/results/not_guard_crash
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/or_bug b/lib/dialyzer/test/small_SUITE_data/results/or_bug
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/or_bug
+++ b/lib/dialyzer/test/small_SUITE_data/results/or_bug
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/orelsebug b/lib/dialyzer/test/small_SUITE_data/results/orelsebug
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/orelsebug
+++ b/lib/dialyzer/test/small_SUITE_data/results/orelsebug
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/orelsebug2 b/lib/dialyzer/test/small_SUITE_data/results/orelsebug2
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/orelsebug2
+++ b/lib/dialyzer/test/small_SUITE_data/results/orelsebug2
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/overloaded1 b/lib/dialyzer/test/small_SUITE_data/results/overloaded1
index ab57ec03ff..ab57ec03ff 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/overloaded1
+++ b/lib/dialyzer/test/small_SUITE_data/results/overloaded1
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/port_info_test b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
index 9ee863f9eb..9ee863f9eb 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/port_info_test
+++ b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/process_info_test b/lib/dialyzer/test/small_SUITE_data/results/process_info_test
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/process_info_test
+++ b/lib/dialyzer/test/small_SUITE_data/results/process_info_test
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/pubsub b/lib/dialyzer/test/small_SUITE_data/results/pubsub
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/pubsub
+++ b/lib/dialyzer/test/small_SUITE_data/results/pubsub
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/receive1 b/lib/dialyzer/test/small_SUITE_data/results/receive1
index abf6eec0ca..abf6eec0ca 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/receive1
+++ b/lib/dialyzer/test/small_SUITE_data/results/receive1
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/record_construct b/lib/dialyzer/test/small_SUITE_data/results/record_construct
index c0110b144f..c0110b144f 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/record_construct
+++ b/lib/dialyzer/test/small_SUITE_data/results/record_construct
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/record_pat b/lib/dialyzer/test/small_SUITE_data/results/record_pat
index 9a3f925e42..9a3f925e42 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/record_pat
+++ b/lib/dialyzer/test/small_SUITE_data/results/record_pat
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/record_send_test b/lib/dialyzer/test/small_SUITE_data/results/record_send_test
index 6a08d44179..6a08d44179 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/record_send_test
+++ b/lib/dialyzer/test/small_SUITE_data/results/record_send_test
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/record_test b/lib/dialyzer/test/small_SUITE_data/results/record_test
index 9715f0dcfb..9715f0dcfb 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/record_test
+++ b/lib/dialyzer/test/small_SUITE_data/results/record_test
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types1 b/lib/dialyzer/test/small_SUITE_data/results/recursive_types1
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types1
+++ b/lib/dialyzer/test/small_SUITE_data/results/recursive_types1
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types2 b/lib/dialyzer/test/small_SUITE_data/results/recursive_types2
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types2
+++ b/lib/dialyzer/test/small_SUITE_data/results/recursive_types2
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types3 b/lib/dialyzer/test/small_SUITE_data/results/recursive_types3
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types3
+++ b/lib/dialyzer/test/small_SUITE_data/results/recursive_types3
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types4 b/lib/dialyzer/test/small_SUITE_data/results/recursive_types4
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types4
+++ b/lib/dialyzer/test/small_SUITE_data/results/recursive_types4
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types5 b/lib/dialyzer/test/small_SUITE_data/results/recursive_types5
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types5
+++ b/lib/dialyzer/test/small_SUITE_data/results/recursive_types5
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types6 b/lib/dialyzer/test/small_SUITE_data/results/recursive_types6
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types6
+++ b/lib/dialyzer/test/small_SUITE_data/results/recursive_types6
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types7 b/lib/dialyzer/test/small_SUITE_data/results/recursive_types7
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/recursive_types7
+++ b/lib/dialyzer/test/small_SUITE_data/results/recursive_types7
diff --git a/lib/dialyzer/test/small_SUITE_data/results/refine_failing b/lib/dialyzer/test/small_SUITE_data/results/refine_failing
new file mode 100644
index 0000000000..2bf67c9d81
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/refine_failing
@@ -0,0 +1,2 @@
+
+refine_failing.erl:25: The call refine_failing:update_one(F::any(),Ds::{_,non_neg_integer()},[{_,non_neg_integer()},...]) will never return since it differs in the 2nd argument from the success typing arguments: (any(),[{_,non_neg_integer()}],[{_,non_neg_integer()}])
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/toth b/lib/dialyzer/test/small_SUITE_data/results/toth
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/toth
+++ b/lib/dialyzer/test/small_SUITE_data/results/toth
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/trec b/lib/dialyzer/test/small_SUITE_data/results/trec
index 01ccc63761..01ccc63761 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/trec
+++ b/lib/dialyzer/test/small_SUITE_data/results/trec
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/try1 b/lib/dialyzer/test/small_SUITE_data/results/try1
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/try1
+++ b/lib/dialyzer/test/small_SUITE_data/results/try1
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/tuple1 b/lib/dialyzer/test/small_SUITE_data/results/tuple1
index 1b5ed49b56..1b5ed49b56 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/tuple1
+++ b/lib/dialyzer/test/small_SUITE_data/results/tuple1
diff --git a/lib/dialyzer/test/small_SUITE_data/results/tuple_set_crash b/lib/dialyzer/test/small_SUITE_data/results/tuple_set_crash
new file mode 100644
index 0000000000..191d3d4173
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/tuple_set_crash
@@ -0,0 +1,15 @@
+
+tuple_set_crash.erl:103: Invalid type specification for function tuple_set_crash:parse_device_properties/1. The success typing is (<<_:48>>) -> [{'controller_description',binary()} | {'controller_name',binary()} | {'controller_status',byte()} | {'fw_version',<<_:24>>}]
+tuple_set_crash.erl:123: Invalid type specification for function tuple_set_crash:parse_video_target_info/1. The success typing is (<<_:48>>) -> [{'status',byte()} | {'target_id',non_neg_integer()},...]
+tuple_set_crash.erl:127: Invalid type specification for function tuple_set_crash:parse_audio_target_info/1. The success typing is (<<_:48>>) -> [{'master_volume',char()} | {'status',byte()} | {'target_id',non_neg_integer()},...]
+tuple_set_crash.erl:138: Invalid type specification for function tuple_set_crash:parse_av_device_info/1. The success typing is (<<_:48>>) -> [{'address',byte()} | {'device_id',non_neg_integer()} | {'model',binary()} | {'status',byte()},...]
+tuple_set_crash.erl:143: The pattern <<TargetId:32/integer-little-unit:1,Rest1/binary-unit:8>> can never match the type <<_:8>>
+tuple_set_crash.erl:155: Invalid type specification for function tuple_set_crash:parse_video_output_info/1. The success typing is (<<_:48>>) -> [{'audio_volume',char()} | {'display_type',binary()} | {'output_id',non_neg_integer()},...]
+tuple_set_crash.erl:160: The pattern <<DeviceId:32/integer-little-unit:1,Rest1/binary-unit:8>> can never match the type <<_:8>>
+tuple_set_crash.erl:171: Invalid type specification for function tuple_set_crash:parse_audio_output_info/1. The success typing is (<<_:48>>) -> [{'output_id',non_neg_integer()},...]
+tuple_set_crash.erl:176: The pattern <<DeviceId:32/integer-little-unit:1,Rest1/binary-unit:8>> can never match the type <<_:8>>
+tuple_set_crash.erl:179: The pattern <<AudioVolume:16/integer-little-unit:1,Rest2/binary-unit:8>> can never match the type <<_:8>>
+tuple_set_crash.erl:182: The pattern <<Delay:16/integer-little-unit:1,_Padding/binary-unit:8>> can never match the type <<_:8>>
+tuple_set_crash.erl:62: The pattern {'play_list', _Playlist} can never match the type 'ok' | {'device_properties',[{atom(),_}]} | {'error',[{atom(),_}]}
+tuple_set_crash.erl:64: The pattern {'error', 17} can never match the type 'ok' | {'device_properties',[{atom(),_}]} | {'error',[{atom(),_}]}
+tuple_set_crash.erl:83: The specification for tuple_set_crash:parse_message/1 states that the function might also return {'media_item_url_reply',integer(),binary()} but the inferred return is 'ok' | {'audio_device_info' | 'audio_output_info' | 'audio_target_info' | 'device_properties' | 'error' | 'video_device_info' | 'video_output_info' | 'video_target_info',[{'address' | 'audio_volume' | 'controller_description' | 'controller_name' | 'controller_status' | 'device_id' | 'display_type' | 'fw_version' | 'master_volume' | 'model' | 'output_id' | 'status' | 'target_id',binary() | non_neg_integer()}] | 1..255}
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/unsafe_beamcode_bug b/lib/dialyzer/test/small_SUITE_data/results/unsafe_beamcode_bug
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/unsafe_beamcode_bug
+++ b/lib/dialyzer/test/small_SUITE_data/results/unsafe_beamcode_bug
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/unused_cases b/lib/dialyzer/test/small_SUITE_data/results/unused_cases
index cafe1c042b..cafe1c042b 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/unused_cases
+++ b/lib/dialyzer/test/small_SUITE_data/results/unused_cases
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/unused_clauses b/lib/dialyzer/test/small_SUITE_data/results/unused_clauses
index 4603e888c1..4603e888c1 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/unused_clauses
+++ b/lib/dialyzer/test/small_SUITE_data/results/unused_clauses
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/zero_tuple b/lib/dialyzer/test/small_SUITE_data/results/zero_tuple
index bf5ec5cd6e..bf5ec5cd6e 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/results/zero_tuple
+++ b/lib/dialyzer/test/small_SUITE_data/results/zero_tuple
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/app_call.erl b/lib/dialyzer/test/small_SUITE_data/src/app_call.erl
index 54d178d29a..54d178d29a 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/app_call.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/app_call.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/appmon_place.erl b/lib/dialyzer/test/small_SUITE_data/src/appmon_place.erl
new file mode 100644
index 0000000000..60ffbe818f
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/appmon_place.erl
@@ -0,0 +1,70 @@
+%%---------------------------------------------------------------------
+%% This is added as a test because it was giving a false positive
+%% (function move/4 will nevr be called) due to the strange use of
+%% self-recursive fun construction in placex/3.
+%%
+%% The analysis was getting confused that the foldl call will never
+%% terminate (due to a wrong hard-coded type for foldl) and inferred
+%% that the remaining calls in the body of placex/3 will not be
+%% reached.  Fixed 11 March 2005.
+%%---------------------------------------------------------------------
+
+-module(appmon_place).
+-export([place/2]).
+
+place(DG, Root) ->
+    case appmon_dg:get(data, DG, Root) of
+	false -> [0];
+	_Other ->
+	    placey(DG, Root, 1),
+	    placex(DG, Root, [])
+    end.
+
+placey(DG, V, Y) ->
+    appmon_dg:set(y, DG, V, Y),
+    Y1 = Y+1,
+    lists:foreach(fun(C) -> placey(DG, C, Y1) end, appmon_dg:get(out, DG, V)).
+
+placex(DG, V, LastX) ->
+    Ch = appmon_dg:get(out, DG, V),
+    ChLX = lists:foldl(fun(C, Accu) -> placex(DG, C, Accu) end,
+		       tll(LastX),
+		       Ch),
+    Width	= appmon_dg:get(w, DG, V),
+    MyX		= calc_mid(DG, Width, Ch),
+    DeltaX	= calc_delta(MyX, hdd(LastX)+20),
+    appmon_dg:set(x, DG, V, MyX),
+    move(DG, V, [MyX+Width | ChLX], DeltaX).
+
+move(_DG, _L, LastX, 0) -> LastX;
+move(DG, V, LastX, DeltaX) -> move2(DG, V, LastX, DeltaX).
+
+move2(DG, V, LastX, DeltaX) ->
+    NewX = appmon_dg:get(x, DG, V)+DeltaX,
+    appmon_dg:set(x, DG, V, NewX),
+    ChLX = lists:foldl(fun(C, LX) -> move2(DG, C, LX, DeltaX) end,
+		       tll(LastX),
+		       appmon_dg:get(out, DG, V)),
+    [max(NewX+appmon_dg:get(w, DG, V), hdd(LastX)) | ChLX].
+
+max(A, B) when A>B -> A;
+max(_, B) -> B.
+
+calc_mid(_DG, _Width, []) -> 0;
+calc_mid(DG, Width, ChList) ->
+    LeftMostX = appmon_dg:get(x, DG, hd(ChList)),
+    Z2 = lists:last(ChList),
+    RightMostX = appmon_dg:get(x, DG, Z2)+appmon_dg:get(w, DG, Z2),
+    trunc((LeftMostX+RightMostX)/2)-trunc(Width/2).
+
+calc_delta(Mid, Right) ->
+    if  Right>Mid	-> Right-Mid;
+	true		-> 0
+    end.
+
+%% Special head and tail
+%% Handles empty list in a non-standard way
+tll([]) -> [];
+tll([_|T]) -> T.
+hdd([]) -> 0;
+hdd([H|_]) -> H.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/areq.erl b/lib/dialyzer/test/small_SUITE_data/src/areq.erl
new file mode 100644
index 0000000000..66bb30491c
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/areq.erl
@@ -0,0 +1,11 @@
+-module(areq).
+
+-export([t/0]).
+
+t() ->
+  ar_comp(3.0, 3),
+  ex_comp(3.0, 3).
+
+ar_comp(X, Y) -> X == Y.
+
+ex_comp(X, Y) -> X =:= Y.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/atom_call.erl b/lib/dialyzer/test/small_SUITE_data/src/atom_call.erl
new file mode 100644
index 0000000000..2b70503144
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/atom_call.erl
@@ -0,0 +1,14 @@
+%%%-------------------------------------------------------------------
+%%% File    : atom_call.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created : 10 Dec 2007 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(atom_call).
+
+-export([f/0,g/0]).
+
+f() -> ok.
+
+g() -> F = f, F().
diff --git a/lib/dialyzer/test/small_SUITE_data/src/atom_guard.erl b/lib/dialyzer/test/small_SUITE_data/src/atom_guard.erl
new file mode 100644
index 0000000000..95581b339a
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/atom_guard.erl
@@ -0,0 +1,8 @@
+-module(atom_guard).
+-export([test/0]).
+
+test() ->
+    foo(42).
+
+foo(X) when is_atom(x) ->
+    X.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/atom_widen.erl b/lib/dialyzer/test/small_SUITE_data/src/atom_widen.erl
index 81bfac9d56..81bfac9d56 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/atom_widen.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/atom_widen.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/bin_compr.erl b/lib/dialyzer/test/small_SUITE_data/src/bin_compr.erl
new file mode 100644
index 0000000000..8c2497ed21
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/bin_compr.erl
@@ -0,0 +1,16 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%------------------------------------------------------------------------
+%%% File    : bin_compr.erl
+%%% Purpose : Test case which crashes in dialyzer_dataflow:bind_bin_segs/5.
+%%%------------------------------------------------------------------------
+
+-module(bin_compr).
+
+-export([bc/1]).
+
+%% The binary comprehension below is stupid: it consumes the whole
+%% bitstr in one go and produces a [666] result provided Bits is a
+%% bitstr of at least 8 bits. Still, this is a valid Erlang program
+%% and dialyzer's analysis should not crash on it.
+bc(Bits) ->
+  [666 || <<_:8/integer, _/bits>> <= Bits].
diff --git a/lib/dialyzer/test/small_SUITE_data/src/blame_contract_range.erl b/lib/dialyzer/test/small_SUITE_data/src/blame_contract_range.erl
new file mode 100644
index 0000000000..efd3332b44
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/blame_contract_range.erl
@@ -0,0 +1,16 @@
+%%-----------------------------------------------------------------------
+%% A test where the contract is wrongly specified by the programmer;
+%% however, this is found only by refinement.
+%% Dialyzer in R14B01 and prior gave a confusing (if not bogus) warning
+%% for this case.  Corrected in R14B02.
+%%-----------------------------------------------------------------------
+-module(blame_contract_range).
+
+-export([foo/0]).
+
+foo() ->
+  bar(b).
+
+-spec bar(atom()) -> a.
+bar(a) -> a;
+bar(b) -> b.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/bs_fail_constr.erl b/lib/dialyzer/test/small_SUITE_data/src/bs_fail_constr.erl
new file mode 100644
index 0000000000..8c1f8c009a
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/bs_fail_constr.erl
@@ -0,0 +1,15 @@
+-module(bs_fail_constr).
+
+-export([w1/1, w2/1, w3/1, w4/1]).
+
+w1(V) when is_float(V) ->
+  <<V/integer>>.
+
+w2(V) when is_atom(V) ->
+  <<V/binary>>.
+
+w3(S) when is_integer(S), S < 0 ->
+  <<42:S/integer>>.
+
+w4(V) when is_float(V) ->
+  <<V/utf32>>.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/bs_utf8.erl b/lib/dialyzer/test/small_SUITE_data/src/bs_utf8.erl
index 5fe28f1da1..5fe28f1da1 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/bs_utf8.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/bs_utf8.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/cerl_hipeify.erl b/lib/dialyzer/test/small_SUITE_data/src/cerl_hipeify.erl
new file mode 100644
index 0000000000..b7883e7b49
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/cerl_hipeify.erl
@@ -0,0 +1,684 @@
+%% =====================================================================
+%% This library is free software; you can redistribute it and/or modify
+%% it under the terms of the GNU Lesser General Public License as
+%% published by the Free Software Foundation; either version 2 of the
+%% License, or (at your option) any later version.
+%%
+%% This library is distributed in the hope that it will be useful, but
+%% WITHOUT ANY WARRANTY; without even the implied warranty of
+%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+%% Lesser General Public License for more details.
+%%
+%% You should have received a copy of the GNU Lesser General Public
+%% License along with this library; if not, write to the Free Software
+%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+%% USA
+%%
+%% $Id: cerl_hipeify.erl,v 1.1 2008/12/17 09:53:49 mikpe Exp $
+%%
+%% @author Richard Carlsson <[email protected]>
+%% @copyright 2000-2004 Richard Carlsson
+%% @doc HiPE-ification of Core Erlang code. Prepares Core Erlang code
+%% for translation to ICode.
+%% @see cerl_to_icode
+
+-module(cerl_hipeify).
+
+-export([transform/2]).
+
+-define(PRIMOP_IDENTITY, identity).		% arity 1
+-define(PRIMOP_NOT, 'not').			% arity 1
+-define(PRIMOP_AND, 'and').			% arity 2
+-define(PRIMOP_OR, 'or').			% arity 2
+-define(PRIMOP_XOR, 'xor').			% arity 2
+-define(PRIMOP_ADD, '+').			% arity 2
+-define(PRIMOP_SUB, '-').			% arity 2
+-define(PRIMOP_NEG, neg).			% arity 1
+-define(PRIMOP_MUL, '*').			% arity 2
+-define(PRIMOP_DIV, '/').			% arity 2
+-define(PRIMOP_INTDIV, 'div').			% arity 2
+-define(PRIMOP_REM, 'rem').			% arity 2
+-define(PRIMOP_BAND, 'band').			% arity 2
+-define(PRIMOP_BOR, 'bor').			% arity 2
+-define(PRIMOP_BXOR, 'bxor').			% arity 2
+-define(PRIMOP_BNOT, 'bnot').			% arity 1
+-define(PRIMOP_BSL, 'bsl').			% arity 2
+-define(PRIMOP_BSR, 'bsr').			% arity 2
+-define(PRIMOP_EQ, '==').			% arity 2
+-define(PRIMOP_NE, '/=').			% arity 2
+-define(PRIMOP_EXACT_EQ, '=:=').		% arity 2
+-define(PRIMOP_EXACT_NE, '=/=').		% arity 2
+-define(PRIMOP_LT, '<').			% arity 2
+-define(PRIMOP_GT, '>').			% arity 2
+-define(PRIMOP_LE, '=<').			% arity 2
+-define(PRIMOP_GE, '>=').			% arity 2
+-define(PRIMOP_IS_ATOM, 'is_atom').		% arity 1
+-define(PRIMOP_IS_BIGNUM, 'is_bignum').		% arity 1
+-define(PRIMOP_IS_BINARY, 'is_binary').		% arity 1
+-define(PRIMOP_IS_CONSTANT, 'is_constant').	% arity 1
+-define(PRIMOP_IS_FIXNUM, 'is_fixnum').		% arity 1
+-define(PRIMOP_IS_FLOAT, 'is_float').		% arity 1
+-define(PRIMOP_IS_FUNCTION, 'is_function').	% arity 1
+-define(PRIMOP_IS_INTEGER, 'is_integer').	% arity 1
+-define(PRIMOP_IS_LIST, 'is_list').		% arity 1
+-define(PRIMOP_IS_NUMBER, 'is_number').		% arity 1
+-define(PRIMOP_IS_PID, 'is_pid').		% arity 1
+-define(PRIMOP_IS_PORT, 'is_port').		% arity 1
+-define(PRIMOP_IS_REFERENCE, 'is_reference').	% arity 1
+-define(PRIMOP_IS_TUPLE, 'is_tuple').		% arity 1
+-define(PRIMOP_IS_RECORD, 'is_record').		% arity 3
+-define(PRIMOP_EXIT, exit).			% arity 1
+-define(PRIMOP_THROW, throw).			% arity 1
+-define(PRIMOP_ERROR, error).			% arity 1,2
+-define(PRIMOP_RETHROW, raise).			% arity 2
+-define(PRIMOP_RECEIVE_SELECT, receive_select).	% arity 0
+-define(PRIMOP_RECEIVE_NEXT, receive_next).	% arity 0
+-define(PRIMOP_ELEMENT, element).		% arity 2
+-define(PRIMOP_DSETELEMENT, dsetelement).	% arity 3
+-define(PRIMOP_MAKE_FUN, make_fun).		% arity 6
+-define(PRIMOP_APPLY_FUN, apply_fun).		% arity 2
+-define(PRIMOP_FUN_ELEMENT, closure_element).	% arity 2
+-define(PRIMOP_SET_LABEL, set_label).           % arity 1
+-define(PRIMOP_GOTO_LABEL, goto_label).         % arity 1
+-define(PRIMOP_REDUCTION_TEST, reduction_test). % arity 0
+
+-record(ctxt, {class = expr}).
+
+
+%% @spec transform(Module::cerl(), Options::[term()]) -> cerl()
+%%
+%%    cerl() = cerl:cerl()
+%%
+%% @doc Rewrites a Core Erlang module to a form suitable for further
+%% translation to HiPE Icode. See module <code>cerl_to_icode</code> for
+%% details.
+%%
+%% @see cerl_to_icode
+%% @see cerl_cconv
+
+transform(E, Opts) ->
+    %% Start by closure converting the code
+    module(cerl_cconv:transform(E, Opts), Opts).
+
+module(E, Opts) ->
+    {Ds, Env, Ren} = add_defs(cerl:module_defs(E), env__new(),
+			      ren__new()),
+    M = cerl:module_name(E),
+    S0 = s__new(cerl:atom_val(M)),
+    S = s__set_pmatch(proplists:get_value(pmatch, Opts), S0),
+    {Ds1, _} = defs(Ds, true, Env, Ren, S),
+    cerl:update_c_module(E, M, cerl:module_exports(E),
+			 cerl:module_attrs(E), Ds1).
+
+%% Note that the environment is defined on the renamed variables.
+
+expr(E0, Env, Ren, Ctxt, S0) ->
+    %% Do peephole optimizations as we traverse the code.
+    E = cerl_lib:reduce_expr(E0),
+    case cerl:type(E) of
+	literal ->
+	    {E, S0};
+	var ->
+	    variable(E, Env, Ren, Ctxt, S0);
+	values ->
+	    {Es, S1} = expr_list(cerl:values_es(E), Env, Ren, Ctxt, S0),
+	    {cerl:update_c_values(E, Es), S1};
+	cons ->
+	    {E1, S1} = expr(cerl:cons_hd(E), Env, Ren, Ctxt, S0),
+	    {E2, S2} = expr(cerl:cons_tl(E), Env, Ren, Ctxt, S1),
+	    {cerl:update_c_cons(E, E1, E2), S2};
+	tuple ->
+	    {Es, S1} = expr_list(cerl:tuple_es(E), Env, Ren, Ctxt, S0),
+	    {cerl:update_c_tuple(E, Es), S1};
+	'let' ->
+	    let_expr(E, Env, Ren, Ctxt, S0);
+	seq ->
+	    {A, S1} = expr(cerl:seq_arg(E), Env, Ren, Ctxt, S0),
+	    {B, S2} = expr(cerl:seq_body(E), Env, Ren, Ctxt, S1),
+	    {cerl:update_c_seq(E, A, B), S2};
+	apply ->
+	    {Op, S1} = expr(cerl:apply_op(E), Env, Ren, Ctxt, S0),
+	    {As, S2} = expr_list(cerl:apply_args(E), Env, Ren, Ctxt, S1),
+	    {cerl:update_c_apply(E, Op, As), S2};
+	call ->
+	    {M, S1} = expr(cerl:call_module(E), Env, Ren, Ctxt, S0),
+	    {N, S2} = expr(cerl:call_name(E), Env, Ren, Ctxt, S1),
+	    {As, S3} = expr_list(cerl:call_args(E), Env, Ren, Ctxt, S2),
+	    {rewrite_call(E, M, N, As, S3), S3};
+	primop ->
+	    {As, S1} = expr_list(cerl:primop_args(E), Env, Ren, Ctxt, S0),
+	    N = cerl:primop_name(E),
+	    {rewrite_primop(E, N, As, S1), S1};
+	'case' ->
+	    {A, S1} = expr(cerl:case_arg(E), Env, Ren, Ctxt, S0),
+	    {E1, Vs, S2} = clauses(cerl:case_clauses(E), Env, Ren, Ctxt, S1),
+	    {cerl:c_let(Vs, A, E1), S2};
+	'fun' ->
+	    Vs = cerl:fun_vars(E),
+	    {Vs1, Env1, Ren1} = add_vars(Vs, Env, Ren),
+	    {B, S1} = expr(cerl:fun_body(E), Env1, Ren1, Ctxt, S0),
+	    {cerl:update_c_fun(E, Vs1, B), S1};
+	'receive' ->
+	    receive_expr(E, Env, Ren, Ctxt, S0);
+	'try' ->
+	    {A, S1} = expr(cerl:try_arg(E), Env, Ren, Ctxt, S0),
+	    Vs = cerl:try_vars(E),
+	    {Vs1, Env1, Ren1} = add_vars(Vs, Env, Ren),
+	    {B, S2} = expr(cerl:try_body(E), Env1, Ren1, Ctxt, S1),
+	    Evs = cerl:try_evars(E),
+	    {Evs1, Env2, Ren2} = add_vars(Evs, Env, Ren),
+	    {H, S3} = expr(cerl:try_handler(E), Env2, Ren2, Ctxt, S2),
+	    {cerl:update_c_try(E, A, Vs1, B, Evs1, H), S3};
+	'catch' ->
+	    catch_expr(E, Env, Ren, Ctxt, S0);
+	letrec ->
+	    {Ds, Env1, Ren1} = add_defs(cerl:letrec_defs(E), Env, Ren),
+	    {Ds1, S1} = defs(Ds, false, Env1, Ren1, S0),
+	    {B, S2} = expr(cerl:letrec_body(E), Env1, Ren1, Ctxt, S1),
+	    {cerl:update_c_letrec(E, Ds1, B), S2};
+	binary ->
+	    {Segs, S1}=expr_list(cerl:binary_segments(E), Env, Ren,
+				 Ctxt, S0),
+	    {cerl:update_c_binary(E, Segs), S1};
+	bitstr ->
+	    {E1,S1} = expr(cerl:bitstr_val(E), Env, Ren, Ctxt, S0),
+	    {E2,S2} = expr(cerl:bitstr_size(E), Env, Ren, Ctxt, S1),
+	    E3 = cerl:bitstr_unit(E),
+	    E4 = cerl:bitstr_type(E),
+	    E5 = cerl:bitstr_flags(E),
+	    {cerl:update_c_bitstr(E, E1, E2, E3, E4, E5), S2}
+    end.
+
+guard_expr(E, Env, Ren, Ctxt, S) ->
+    expr(E, Env, Ren, Ctxt#ctxt{class = guard}, S).
+
+expr_list(Es, Env, Ren, Ctxt, S0) ->
+    list(Es, Env, Ren, Ctxt, S0, fun expr/5).
+
+list([E | Es], Env, Ren, Ctxt, S0, F) ->
+    {E1, S1} = F(E, Env, Ren, Ctxt, S0),
+    {Es1, S2} = list(Es, Env, Ren, Ctxt, S1, F),
+    {[E1 | Es1], S2};
+list([], _, _, _, S, _) ->
+    {[], S}.
+
+pattern(E, Env, Ren) ->
+    case cerl:type(E) of
+	literal ->
+	    E;
+	var ->
+	    cerl:update_c_var(E, ren__map(cerl:var_name(E), Ren));
+	values ->
+	    Es = pattern_list(cerl:values_es(E), Env, Ren),
+	    cerl:update_c_values(E, Es);
+	cons ->
+	    E1 = pattern(cerl:cons_hd(E), Env, Ren),
+	    E2 = pattern(cerl:cons_tl(E), Env, Ren),
+	    cerl:update_c_cons(E, E1, E2);
+	tuple ->
+	    Es = pattern_list(cerl:tuple_es(E), Env, Ren),
+	    cerl:update_c_tuple(E, Es);
+	alias ->
+	    V = pattern(cerl:alias_var(E), Env, Ren),
+	    P = pattern(cerl:alias_pat(E), Env, Ren),
+	    cerl:update_c_alias(E, V, P);
+	binary ->
+	    Segs=pattern_list(cerl:binary_segments(E), Env, Ren),
+	    cerl:update_c_binary(E, Segs);
+	bitstr ->
+	    E1 = pattern(cerl:bitstr_val(E), Env, Ren),
+	    E2 = pattern(cerl:bitstr_size(E), Env, Ren),
+	    E3 = cerl:bitstr_unit(E),
+	    E4 = cerl:bitstr_type(E),
+	    E5 = cerl:bitstr_flags(E),
+	    cerl:update_c_bitstr(E, E1, E2, E3, E4, E5)
+    end.
+
+
+
+pattern_list([E | Es], Env, Ren) ->
+    [pattern(E, Env, Ren) | pattern_list(Es, Env, Ren)];
+pattern_list([], _, _) ->
+    [].
+
+%% Visit the function body of each definition. We insert an explicit
+%% reduction test at the start of each function.
+
+defs(Ds, Top, Env, Ren, S) ->
+    defs(Ds, [], Top, Env, Ren, S).
+
+defs([{V, F} | Ds], Ds1, Top, Env, Ren, S0) ->
+    S1 = case Top of
+	     true -> s__enter_function(cerl:var_name(V), S0);
+	     false -> S0
+	 end,
+    {B, S2} = expr(cerl:fun_body(F), Env, Ren, #ctxt{}, S1),
+    B1 = cerl:c_seq(cerl:c_primop(cerl:c_atom(?PRIMOP_REDUCTION_TEST),
+				  []),
+		    B),
+    F1 = cerl:update_c_fun(F, cerl:fun_vars(F), B1),
+    defs(Ds, [{V, F1} | Ds1], Top, Env, Ren, S2);
+defs([], Ds, _Top, _Env, _Ren, S) ->
+    {lists:reverse(Ds), S}.
+
+clauses([C|_]=Cs, Env, Ren, Ctxt, S) ->
+    {Cs1, S1} = clause_list(Cs, Env, Ren, Ctxt, S),
+    %% Perform pattern matching compilation on the clauses.
+    {E, Vs} = case s__get_pmatch(S) of
+		  true ->
+		      cerl_pmatch:clauses(Cs1, Env);
+		  no_duplicates ->
+		      put('cerl_pmatch_duplicate_code', never),
+		      cerl_pmatch:clauses(Cs1, Env);
+		  duplicate_all ->
+		      put('cerl_pmatch_duplicate_code', always),
+		      cerl_pmatch:clauses(Cs1, Env);
+		  Other when Other == false; Other == undefined ->
+		      Vs0 = new_vars(cerl:clause_arity(C), Env),
+		      {cerl:c_case(cerl:c_values(Vs0), Cs1), Vs0}
+	      end,
+    %% We must make sure that we also visit any clause guards generated
+    %% by the pattern matching compilation. We pass an empty renaming,
+    %% so we do not rename any variables twice.
+    {E1, S2} = revisit_expr(E, Env, ren__new(), Ctxt, S1),
+    {E1, Vs, S2}.
+
+clause_list(Cs, Env, Ren, Ctxt, S) ->
+    list(Cs, Env, Ren, Ctxt, S, fun clause/5).
+
+clause(E, Env, Ren, Ctxt, S0) ->
+    Vs = cerl:clause_vars(E),
+    {_, Env1, Ren1} = add_vars(Vs, Env, Ren),
+    %% Visit patterns to rename variables.
+    Ps = pattern_list(cerl:clause_pats(E), Env1, Ren1),
+    {G, S1} = guard_expr(cerl:clause_guard(E), Env1, Ren1, Ctxt, S0),
+    {B, S2} = expr(cerl:clause_body(E), Env1, Ren1, Ctxt, S1),
+    {cerl:update_c_clause(E, Ps, G, B), S2}.
+
+%% This does what 'expr' does, but only recurses into clause guard
+%% expressions, 'case'-expressions, and the bodies of lets and letrecs.
+%% Note that revisiting should not add further renamings, and we simply
+%% ignore making any bindings at all at this level.
+
+revisit_expr(E, Env, Ren, Ctxt, S0) ->
+    %% Also enable peephole optimizations here.
+    revisit_expr_1(cerl_lib:reduce_expr(E), Env, Ren, Ctxt, S0).
+
+revisit_expr_1(E, Env, Ren, Ctxt, S0) ->
+    case cerl:type(E) of
+	'case' ->
+	    {Cs, S1} = revisit_clause_list(cerl:case_clauses(E), Env,
+					   Ren, Ctxt, S0),
+	    {cerl:update_c_case(E, cerl:case_arg(E), Cs), S1};
+	'let' ->
+	    {B, S1} = revisit_expr(cerl:let_body(E), Env, Ren, Ctxt, S0),
+	    {cerl:update_c_let(E, cerl:let_vars(E), cerl:let_arg(E), B),
+	     S1};
+	'letrec' ->
+	    {B, S1} = revisit_expr(cerl:letrec_body(E), Env, Ren, Ctxt, S0),
+	    {cerl:update_c_letrec(E, cerl:letrec_defs(E), B), S1};
+	_ ->
+	    {E, S0}
+    end.
+
+revisit_clause_list(Cs, Env, Ren, Ctxt, S) ->
+    list(Cs, Env, Ren, Ctxt, S, fun revisit_clause/5).
+
+revisit_clause(E, Env, Ren, Ctxt, S0) ->
+    %% Ignore the bindings.
+    {G, S1} = guard_expr(cerl:clause_guard(E), Env, Ren, Ctxt, S0),
+    {B, S2} = revisit_expr(cerl:clause_body(E), Env, Ren, Ctxt, S1),
+    {cerl:update_c_clause(E, cerl:clause_pats(E), G, B), S2}.
+
+%% We use the no-shadowing strategy, renaming variables on the fly and
+%% only when necessary to uphold the invariant.
+
+add_vars(Vs, Env, Ren) ->
+    add_vars(Vs, [], Env, Ren).
+
+add_vars([V | Vs], Vs1, Env, Ren) ->
+    Name = cerl:var_name(V),
+    {Name1, Ren1} = rename(Name, Env, Ren),
+    add_vars(Vs, [cerl:update_c_var(V, Name1) | Vs1],
+	     env__bind(Name1, variable, Env), Ren1);
+add_vars([], Vs, Env, Ren) ->
+    {lists:reverse(Vs), Env, Ren}.
+
+rename(Name, Env, Ren) ->
+    case env__is_defined(Name, Env) of
+	false ->
+	    {Name, Ren};
+	true ->
+	    New = env__new_name(Env),
+	    {New, ren__add(Name, New, Ren)}
+    end.
+
+%% Setting up the environment for a list of letrec-bound definitions.
+
+add_defs(Ds, Env, Ren) ->
+    add_defs(Ds, [], Env, Ren).
+
+add_defs([{V, F} | Ds], Ds1, Env, Ren) ->
+    Name = cerl:var_name(V),
+    {Name1, Ren1} =
+	case env__is_defined(Name, Env) of
+	    false ->
+		{Name, Ren};
+	    true ->
+		{N, A} = Name,
+		S = atom_to_list(N) ++ "_",
+		F = fun (Num) ->	%% XXX: BUG: This should be F1
+			    {list_to_atom(S ++ integer_to_list(Num)), A}
+		    end,
+		New = env__new_function_name(F, Env),
+		{New, ren__add(Name, New, Ren)}
+	end,
+    add_defs(Ds, [{cerl:update_c_var(V, Name1), F} | Ds1],
+	     env__bind(Name1, function, Env), Ren1);
+add_defs([], Ds, Env, Ren) ->
+    {lists:reverse(Ds), Env, Ren}.
+
+%% We change remote calls to important built-in functions into primop
+%% calls. In some cases (e.g., for the boolean operators), this is
+%% mainly to allow the cerl_to_icode module to handle them more
+%% straightforwardly. In most cases however, it is simply because they
+%% are supposed to be represented as primop calls on the Icode level.
+
+rewrite_call(E, M, F, As, S) ->
+    case cerl:is_c_atom(M) and cerl:is_c_atom(F) of
+	true ->
+	    case call_to_primop(cerl:atom_val(M),
+				cerl:atom_val(F),
+				length(As))
+		of
+		{yes, N} ->
+		    %% The primop might need further handling
+		    N1 = cerl:c_atom(N),
+		    E1 = cerl:update_c_primop(E, N1, As),
+		    rewrite_primop(E1, N1, As, S);
+		no ->
+		    cerl:update_c_call(E, M, F, As)
+	    end;
+	false ->
+	    cerl:update_c_call(E, M, F, As)
+    end.
+
+call_to_primop(erlang, 'not', 1) -> {yes, ?PRIMOP_NOT};
+call_to_primop(erlang, 'and', 2) -> {yes, ?PRIMOP_AND};
+call_to_primop(erlang, 'or', 2) -> {yes, ?PRIMOP_OR};
+call_to_primop(erlang, 'xor', 2) -> {yes, ?PRIMOP_XOR};
+call_to_primop(erlang, '+', 2) -> {yes, ?PRIMOP_ADD};
+call_to_primop(erlang, '+', 1) -> {yes, ?PRIMOP_IDENTITY};
+call_to_primop(erlang, '-', 2) -> {yes, ?PRIMOP_SUB};
+call_to_primop(erlang, '-', 1) -> {yes, ?PRIMOP_NEG};
+call_to_primop(erlang, '*', 2) -> {yes, ?PRIMOP_MUL};
+call_to_primop(erlang, '/', 2) -> {yes, ?PRIMOP_DIV};
+call_to_primop(erlang, 'div', 2) -> {yes, ?PRIMOP_INTDIV};
+call_to_primop(erlang, 'rem', 2) -> {yes, ?PRIMOP_REM};
+call_to_primop(erlang, 'band', 2) -> {yes, ?PRIMOP_BAND};
+call_to_primop(erlang, 'bor', 2) -> {yes, ?PRIMOP_BOR};
+call_to_primop(erlang, 'bxor', 2) -> {yes, ?PRIMOP_BXOR};
+call_to_primop(erlang, 'bnot', 1) -> {yes, ?PRIMOP_BNOT};
+call_to_primop(erlang, 'bsl', 2) -> {yes, ?PRIMOP_BSL};
+call_to_primop(erlang, 'bsr', 2) -> {yes, ?PRIMOP_BSR};
+call_to_primop(erlang, '==', 2) -> {yes, ?PRIMOP_EQ};
+call_to_primop(erlang, '/=', 2) -> {yes, ?PRIMOP_NE};
+call_to_primop(erlang, '=:=', 2) -> {yes, ?PRIMOP_EXACT_EQ};
+call_to_primop(erlang, '=/=', 2) -> {yes, ?PRIMOP_EXACT_NE};
+call_to_primop(erlang, '<', 2) -> {yes, ?PRIMOP_LT};
+call_to_primop(erlang, '>', 2) -> {yes, ?PRIMOP_GT};
+call_to_primop(erlang, '=<', 2) -> {yes, ?PRIMOP_LE};
+call_to_primop(erlang, '>=', 2) -> {yes, ?PRIMOP_GE};
+call_to_primop(erlang, is_atom, 1) -> {yes, ?PRIMOP_IS_ATOM};
+call_to_primop(erlang, is_binary, 1) -> {yes, ?PRIMOP_IS_BINARY};
+call_to_primop(erlang, is_constant, 1) -> {yes, ?PRIMOP_IS_CONSTANT};
+call_to_primop(erlang, is_float, 1) -> {yes, ?PRIMOP_IS_FLOAT};
+call_to_primop(erlang, is_function, 1) -> {yes, ?PRIMOP_IS_FUNCTION};
+call_to_primop(erlang, is_integer, 1) -> {yes, ?PRIMOP_IS_INTEGER};
+call_to_primop(erlang, is_list, 1) -> {yes, ?PRIMOP_IS_LIST};
+call_to_primop(erlang, is_number, 1) -> {yes, ?PRIMOP_IS_NUMBER};
+call_to_primop(erlang, is_pid, 1) -> {yes, ?PRIMOP_IS_PID};
+call_to_primop(erlang, is_port, 1) -> {yes, ?PRIMOP_IS_PORT};
+call_to_primop(erlang, is_reference, 1) -> {yes, ?PRIMOP_IS_REFERENCE};
+call_to_primop(erlang, is_tuple, 1) -> {yes, ?PRIMOP_IS_TUPLE};
+call_to_primop(erlang, internal_is_record, 3) -> {yes, ?PRIMOP_IS_RECORD};
+call_to_primop(erlang, element, 2) -> {yes, ?PRIMOP_ELEMENT};
+call_to_primop(erlang, exit, 1) -> {yes, ?PRIMOP_EXIT};
+call_to_primop(erlang, throw, 1) -> {yes, ?PRIMOP_THROW};
+call_to_primop(erlang, error, 1) -> {yes, ?PRIMOP_ERROR};
+call_to_primop(erlang, error, 2) -> {yes, ?PRIMOP_ERROR};
+call_to_primop(erlang, fault, 1) -> {yes, ?PRIMOP_ERROR};
+call_to_primop(erlang, fault, 2) -> {yes, ?PRIMOP_ERROR};
+call_to_primop(_, _, _) -> no.
+
+%% Also, some primops (introduced by Erlang to Core Erlang translation
+%% and possibly other stages) must be recognized and rewritten.
+
+rewrite_primop(E, N, As, S) ->
+    case {cerl:atom_val(N), As} of
+	{match_fail, [R]} ->
+	    M = s__get_module_name(S),
+	    {F, A} = s__get_function_name(S),
+	    Stack = cerl:abstract([{M, F, A}]),
+	    case cerl:type(R) of
+		tuple ->
+		    %% Function clause failures have a special encoding
+		    %% as '{function_clause, Arg1, ..., ArgN}'.
+		    case cerl:tuple_es(R) of
+			[X | Xs] ->
+			    case cerl:is_c_atom(X) of
+				true ->
+				    case cerl:atom_val(X) of
+					function_clause ->
+					    FStack = cerl:make_list(
+						       [cerl:c_tuple(
+							  [cerl:c_atom(M),
+							   cerl:c_atom(F),
+							   cerl:make_list(Xs)])]),
+					    match_fail(E, X, FStack);
+					_ ->
+					    match_fail(E, R, Stack)
+				    end;
+				false ->
+				    match_fail(E, R, Stack)
+			    end;
+			_ ->
+			    match_fail(E, R, Stack)
+		    end;
+		_ ->
+		    match_fail(E, R, Stack)
+	    end;
+	_ ->
+	    cerl:update_c_primop(E, N, As)
+    end.
+
+match_fail(E, R, Stack) ->
+    cerl:update_c_primop(E, cerl:c_atom(?PRIMOP_ERROR), [R, Stack]).
+
+%% Simple let-definitions (of degree 1) in guard context are always
+%% inline expanded. This is allowable, since they cannot have side
+%% effects, and it makes it easy to generate good code for boolean
+%% expressions. It could cause repeated evaluations, but typically,
+%% local definitions within guards are used exactly once.
+
+let_expr(E, Env, Ren, Ctxt, S) ->
+    if Ctxt#ctxt.class == guard ->
+	    case cerl:let_vars(E) of
+		[V] ->
+		    {Name, Ren1} = rename(cerl:var_name(V), Env, Ren),
+		    Env1 = env__bind(Name, {expr, cerl:let_arg(E)}, Env),
+		    expr(cerl:let_body(E), Env1, Ren1, Ctxt, S);
+		_ ->
+		    let_expr_1(E, Env, Ren, Ctxt, S)
+	    end;
+       true ->
+	    let_expr_1(E, Env, Ren, Ctxt, S)
+    end.
+
+let_expr_1(E, Env, Ren, Ctxt, S0) ->
+    {A, S1} = expr(cerl:let_arg(E), Env, Ren, Ctxt, S0),
+    Vs = cerl:let_vars(E),
+    {Vs1, Env1, Ren1} = add_vars(Vs, Env, Ren),
+    {B, S2} = expr(cerl:let_body(E), Env1, Ren1, Ctxt, S1),
+    {cerl:update_c_let(E, Vs1, A, B), S2}.
+
+variable(E, Env, Ren, Ctxt, S) ->
+    V = ren__map(cerl:var_name(E), Ren),
+    if Ctxt#ctxt.class == guard ->
+	    case env__lookup(V, Env) of
+		{ok, {expr, E1}} ->
+		    expr(E1, Env, Ren, Ctxt, S);   % inline
+		_ ->
+		    %% Since we don't track all bindings when we revisit
+		    %% guards, some names will not be in the environment.
+		    variable_1(E, V, S)
+	    end;
+       true ->
+	    variable_1(E, V, S)
+    end.
+
+variable_1(E, V, S) ->
+    {cerl:update_c_var(E, V), S}.
+
+%% A catch-expression 'catch Expr' is rewritten as:
+%%
+%%	try Expr
+%%	of (V) -> V
+%%	catch (T, V, E) ->
+%%	    letrec 'wrap'/1 = fun (V) -> {'EXIT', V}
+%%	    in case T of
+%%	         'throw' when 'true' -> V
+%%	         'exit' when 'true' -> 'wrap'/1(V)
+%%	         V when 'true' ->
+%%	             'wrap'/1({V, erlang:get_stacktrace()})
+%%	       end
+
+catch_expr(E, Env, Ren, Ctxt, S) ->
+    T = cerl:c_var('T'),
+    V = cerl:c_var('V'),
+    X = cerl:c_var('X'),
+    W = cerl:c_var({wrap,1}),
+    G = cerl:c_call(cerl:c_atom('erlang'),cerl:c_atom('get_stacktrace'),[]),
+    Cs = [cerl:c_clause([cerl:c_atom('throw')], V),
+	  cerl:c_clause([cerl:c_atom('exit')], cerl:c_apply(W, [V])),
+	  cerl:c_clause([T], cerl:c_apply(W, [cerl:c_tuple([V,G])]))
+	 ],
+    C = cerl:c_case(T, Cs),
+    F = cerl:c_fun([V], cerl:c_tuple([cerl:c_atom('EXIT'), V])),
+    H = cerl:c_letrec([{W,F}], C),
+    As = cerl:get_ann(E),
+    {B, S1} = expr(cerl:catch_body(E),Env, Ren, Ctxt, S),
+    {cerl:ann_c_try(As, B, [V], V, [T,V,X], H), S1}.
+
+%% Receive-expressions are rewritten as follows:
+%%
+%%	receive
+%%	    P1 when G1 -> B1
+%%	      ...
+%%	    Pn when Gn -> Bn
+%%	after T -> A end
+%% becomes:
+%%	receive
+%%	    M when 'true' ->
+%%	      case M of
+%%	        P1 when G1 -> do primop RECEIVE_SELECT B1
+%%	          ...
+%%	        Pn when Gn -> do primop RECEIVE_SELECT Bn
+%%	        Pn+1 when 'true' -> primop RECEIVE_NEXT()
+%%	    end
+%%	after T -> A end
+
+receive_expr(E, Env, Ren, Ctxt, S0) ->
+    Cs = cerl:receive_clauses(E),
+    {B, Vs, S1} = clauses(receive_clauses(Cs), Env, Ren, Ctxt, S0),
+    {T, S2} = expr(cerl:receive_timeout(E), Env, Ren, Ctxt, S1),
+    {A, S3} = expr(cerl:receive_action(E), Env, Ren, Ctxt, S2),
+    Cs1 = [cerl:c_clause(Vs, B)],
+    {cerl:update_c_receive(E, Cs1, T, A), S3}.
+
+receive_clauses([C | Cs]) ->
+    Call = cerl:c_primop(cerl:c_atom(?PRIMOP_RECEIVE_SELECT),
+			 []),
+    B = cerl:c_seq(Call, cerl:clause_body(C)),
+    C1 =  cerl:update_c_clause(C, cerl:clause_pats(C),
+			       cerl:clause_guard(C), B),
+    [C1 | receive_clauses(Cs)];
+receive_clauses([]) ->
+    Call = cerl:c_primop(cerl:c_atom(?PRIMOP_RECEIVE_NEXT),
+			 []),
+    V = cerl:c_var('X'),    % any name is ok
+    [cerl:c_clause([V], Call)].
+
+
+new_vars(N, Env) ->
+    [cerl:c_var(V) || V <- env__new_names(N, Env)].
+
+
+%% ---------------------------------------------------------------------
+%% Environment
+
+env__new() ->
+    rec_env:empty().
+
+env__bind(Key, Value, Env) ->
+    rec_env:bind(Key, Value, Env).
+
+%% env__get(Key, Env) ->
+%%     rec_env:get(Key, Env).
+
+env__lookup(Key, Env) ->
+    rec_env:lookup(Key, Env).
+
+env__is_defined(Key, Env) ->
+    rec_env:is_defined(Key, Env).
+
+env__new_name(Env) ->
+    rec_env:new_key(Env).
+
+env__new_names(N, Env) ->
+    rec_env:new_keys(N, Env).
+
+env__new_function_name(F, Env) ->
+    rec_env:new_key(F, Env).
+
+
+%% ---------------------------------------------------------------------
+%% Renaming
+
+ren__new() ->
+    dict:new().
+
+ren__add(Key, Value, Ren) ->
+    dict:store(Key, Value, Ren).
+
+ren__map(Key, Ren) ->
+    case dict:find(Key, Ren) of
+	{ok, Value} ->
+	    Value;
+	error ->
+	    Key
+    end.
+
+
+%% ---------------------------------------------------------------------
+%% State
+
+-record(state, {module, function, pmatch=true}).
+
+s__new(Module) ->
+    #state{module = Module}.
+
+s__get_module_name(S) ->
+    S#state.module.
+
+s__enter_function(F, S) ->
+    S#state{function = F}.
+
+s__get_function_name(S) ->
+    S#state.function.
+
+s__set_pmatch(V, S) ->
+    S#state{pmatch = V}.
+
+s__get_pmatch(S) ->
+    S#state.pmatch.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_acceptor.erl b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_acceptor.erl
new file mode 100644
index 0000000000..2ca1468911
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_acceptor.erl
@@ -0,0 +1,119 @@
+%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%
+%   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.
+%%%-------------------------------------------------------------------
+%%% File    : comm_acceptor.erl
+%%% Author  : Thorsten Schuett <[email protected]>
+%%% Description : Acceptor
+%%%           This module accepts new connections and starts corresponding
+%%%           comm_connection processes.
+%%%
+%%% Created : 18 Apr 2008 by Thorsten Schuett <[email protected]>
+%%%-------------------------------------------------------------------
+%% @author Thorsten Schuett <[email protected]>
+%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%% @version $Id $
+-module(comm_layer_dir.comm_acceptor).
+
+-export([start_link/1, init/2]).
+
+-import(config).
+-import(gen_tcp).
+-import(inet).
+-import(log).
+-import(lists).
+-import(process_dictionary).
+
+start_link(InstanceId) ->
+    Pid = spawn_link(comm_layer_dir.comm_acceptor, init, [InstanceId, self()]),
+    receive
+        {started} ->
+            {ok, Pid}
+    end.
+
+init(InstanceId, Supervisor) ->
+    process_dictionary:register_process(InstanceId, acceptor, self()),
+    erlang:register(comm_layer_acceptor, self()),
+   log:log(info,"[ CC ] listening on ~p:~p", [config:listenIP(), config:listenPort()]),
+    LS = case config:listenIP() of
+		       undefined ->
+			   open_listen_port(config:listenPort(), first_ip());
+		       _ ->
+			   open_listen_port(config:listenPort(), config:listenIP())
+		   end,
+    {ok, {_LocalAddress, LocalPort}} = inet:sockname(LS),
+    comm_port:set_local_address(undefined, LocalPort),
+    %io:format("this() == ~w~n", [{LocalAddress, LocalPort}]),
+    Supervisor ! {started},
+    server(LS).
+
+server(LS) ->
+    case gen_tcp:accept(LS) of
+	{ok, S} ->
+	    case comm_port:get_local_address_port() of
+		{undefined, LocalPort} ->
+		    {ok, {MyIP, _LocalPort}} = inet:sockname(S),
+		    comm_port:set_local_address(MyIP, LocalPort);
+		_ ->
+		    ok
+	    end,
+	    receive
+		{tcp, S, Msg} ->
+		    {endpoint, Address, Port} = binary_to_term(Msg),
+		    % auto determine remote address, when not sent correctly
+		    NewAddress = if Address =:= {0,0,0,0} orelse Address =:= {127,0,0,1} ->
+			    case inet:peername(S) of
+				{ok, {PeerAddress, _Port}} ->
+				    % io:format("Sent Address ~p\n",[Address]),
+				    % io:format("Peername is ~p\n",[PeerAddress]),
+				    PeerAddress;
+				{error, _Why} ->
+				    % io:format("Peername error ~p\n",[Why]).
+				    Address
+			    end;
+			true ->
+			    % io:format("Address is ~p\n",[Address]),
+			    Address
+		    end,
+		    NewPid = comm_connection:new(NewAddress, Port, S),
+		    gen_tcp:controlling_process(S, NewPid),
+		    inet:setopts(S, [{active, once}, {send_timeout, config:read(tcp_send_timeout)}]),
+		    comm_port:register_connection(NewAddress, Port, NewPid, S)
+	    end,
+	    server(LS);
+	Other ->
+            log:log(warn,"[ CC ] unknown message ~p", [Other])
+    end.
+
+open_listen_port({From, To}, IP) ->
+    open_listen_port(lists:seq(From, To), IP);
+open_listen_port([Port | Rest], IP) ->
+    case gen_tcp:listen(Port, [binary, {packet, 4}, {reuseaddr, true},
+					      {active, once}, {ip, IP}]) of
+	{ok, Socket} ->
+	    Socket;
+	{error, Reason} ->
+	   log:log(error,"[ CC ] can't listen on ~p: ~p~n", [Port, Reason]),
+	    open_listen_port(Rest, IP)
+    end;
+open_listen_port([], _) ->
+    abort;
+open_listen_port(Port, IP) ->
+    open_listen_port([Port], IP).
+
+-include_lib("kernel/include/inet.hrl").
+
+first_ip() ->
+    {ok, Hostname} = inet:gethostname(),
+    {ok, HostEntry} = inet:gethostbyname(Hostname),
+    erlang:hd(HostEntry#hostent.h_addr_list).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_connection.erl b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_connection.erl
new file mode 100644
index 0000000000..48cc50ae21
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_connection.erl
@@ -0,0 +1,206 @@
+%  Copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
+%
+%   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.
+%%%-------------------------------------------------------------------
+%%% File    : comm_connection.erl
+%%% Author  : Thorsten Schuett <[email protected]>
+%%% Description : creates and destroys connections and represents the
+%%%           endpoint of a connection where messages are received and
+%%            send from/to the network.
+%%%
+%%% Created : 18 Apr 2008 by Thorsten Schuett <[email protected]>
+%%%-------------------------------------------------------------------
+%% @author Thorsten Schuett <[email protected]>
+%% @copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
+%% @version $Id $
+-module(comm_layer_dir.comm_connection).
+
+-export([send/3, open_new/4, new/3, open_new_async/4]).
+
+-import(config).
+-import(gen_tcp).
+-import(inet).
+-import(io).
+-import(io_lib).
+-import(log).
+-import(timer).
+
+-include("comm_layer.hrl").
+
+%% @doc new accepted connection. called by comm_acceptor
+%% @spec new(inet:ip_address(), int(), socket()) -> pid()
+new(Address, Port, Socket) ->
+    spawn(fun () -> loop(Socket, Address, Port) end).
+
+%% @doc open new connection
+%% @spec open_new(inet:ip_address(), int(), inet:ip_address(), int()) ->
+%%       {local_ip, inet:ip_address(), int(), pid(), inet:socket()}
+%%     | fail
+%%     | {connection, pid(), inet:socket()}
+open_new(Address, Port, undefined, MyPort) ->
+    Myself = self(),
+    LocalPid = spawn(fun () ->
+			     case new_connection(Address, Port, MyPort) of
+				 fail ->
+				     Myself ! {new_connection_failed};
+				 Socket ->
+				     {ok, {MyIP, _MyPort}} = inet:sockname(Socket),
+				     Myself ! {new_connection_started, MyIP, MyPort, Socket},
+				     loop(Socket, Address, Port)
+			     end
+		     end),
+    receive
+	{new_connection_failed} ->
+	    fail;
+	{new_connection_started, MyIP, MyPort, S} ->
+	    {local_ip, MyIP, MyPort, LocalPid, S}
+    end;
+open_new(Address, Port, _MyAddress, MyPort) ->
+    Owner = self(),
+    LocalPid = spawn(fun () ->
+			     case new_connection(Address, Port, MyPort) of
+				 fail ->
+				     Owner ! {new_connection_failed};
+				 Socket ->
+				     Owner ! {new_connection_started, Socket},
+				     loop(Socket, Address, Port)
+			     end
+		     end),
+    receive
+	{new_connection_failed} ->
+	    fail;
+	{new_connection_started, Socket} ->
+	    {connection, LocalPid, Socket}
+    end.
+
+% ===============================================================================
+% @doc open a new connection asynchronously
+% ===============================================================================
+-spec(open_new_async/4 :: (any(), any(), any(), any()) -> pid()).
+open_new_async(Address, Port, _MyAddr, MyPort) ->
+    Pid = spawn(fun () ->
+			case new_connection(Address, Port, MyPort) of
+			    fail ->
+				comm_port:unregister_connection(Address, Port),
+				ok;
+			    Socket ->
+				loop(Socket, Address, Port)
+			end
+		end),
+    Pid.
+
+
+send({Address, Port, Socket}, Pid, Message) ->
+    BinaryMessage = term_to_binary({deliver, Pid, Message}),
+    SendTimeout    = config:read(tcp_send_timeout),
+    {Time, Result} = timer:tc(gen_tcp, send, [Socket, BinaryMessage]),
+    if
+	Time > 1200 * SendTimeout ->
+	    log:log(error,"[ CC ] send to ~p took ~p: ~p",
+		    [Address, Time, inet:getopts(Socket, [keep_alive, send_timeout])]);
+	true ->
+	    ok
+    end,
+    case Result of
+	ok ->
+	    ?LOG_MESSAGE(erlang:element(1, Message), byte_size(BinaryMessage)),
+	    ok;
+	{error, closed} ->
+	    comm_port:unregister_connection(Address, Port),
+	    close_connection(Socket);
+	{error, _Reason} ->
+	    %log:log(error,"[ CC ] couldn't send to ~p:~p (~p)", [Address, Port, Reason]),
+	    comm_port:unregister_connection(Address, Port),
+	    close_connection(Socket)
+    end.
+
+loop(fail, Address, Port) ->
+    comm_port:unregister_connection(Address, Port),
+    ok;
+loop(Socket, Address, Port) ->
+    receive
+	{send, Pid, Message} ->
+	    case send({Address, Port, Socket}, Pid, Message) of
+		ok -> loop(Socket, Address, Port);
+		_ -> ok
+	    end;
+	{tcp_closed, Socket} ->
+		comm_port:unregister_connection(Address, Port),
+		gen_tcp:close(Socket);
+	{tcp, Socket, Data} ->
+	    case binary_to_term(Data) of
+	        {deliver, Process, Message} ->
+		    Process ! Message,
+		    inet:setopts(Socket, [{active, once}]),
+		    loop(Socket, Address, Port);
+		{user_close} ->
+		    comm_port:unregister_connection(Address, Port),
+		    gen_tcp:close(Socket);
+		{youare, _Address, _Port} ->
+		    %% @TODO what do we get from this information?
+		    inet:setopts(Socket, [{active, once}]),
+		    loop(Socket, Address, Port);
+		Unknown ->
+		    log:log(warn,"[ CC ] unknown message ~p", [Unknown]),
+		    inet:setopts(Socket, [{active, once}]),
+		    loop(Socket, Address, Port)
+	    end;
+
+	{youare, _IP, _Port} ->
+	    loop(Socket, Address, Port);
+
+        Unknown ->
+	    log:log(warn,"[ CC ] unknown message2 ~p", [Unknown]) ,
+	    loop(Socket, Address, Port)
+    end.
+
+% ===============================================================================
+
+-spec(new_connection(inet:ip_address(), integer(), integer()) -> inet:socket() | fail).
+new_connection(Address, Port, MyPort) ->
+    case gen_tcp:connect(Address, Port, [binary, {packet, 4}, {nodelay, true}, {active, once},
+					 {send_timeout, config:read(tcp_send_timeout)}],
+			 config:read(tcp_connect_timeout)) of
+        {ok, Socket} ->
+	    % send end point data
+	    case inet:sockname(Socket) of
+		{ok, {MyAddress, _MyPort}} ->
+		    Message = term_to_binary({endpoint, MyAddress, MyPort}),
+	            gen_tcp:send(Socket, Message),
+		    case inet:peername(Socket) of
+			{ok, {RemoteIP, RemotePort}} ->
+			    YouAre = term_to_binary({youare, RemoteIP, RemotePort}),
+		            gen_tcp:send(Socket, YouAre),
+		            Socket;
+			{error, _Reason} ->
+			    %log:log(error,"[ CC ] reconnect to ~p because socket is ~p",
+				%    [Address, Reason]),
+			    close_connection(Socket),
+			    new_connection(Address, Port, MyPort)
+		    end;
+		{error, _Reason} ->
+		    %log:log(error,"[ CC ] reconnect to ~p because socket is ~p",
+			%    [Address, Reason]),
+		    close_connection(Socket),
+	            new_connection(Address, Port, MyPort)
+	    end;
+        {error, _Reason} ->
+            %log:log(error,"[ CC ] couldn't connect to ~p:~p (~p)",
+		    %[Address, Port, Reason]),
+	    fail
+    end.
+
+close_connection(Socket) ->
+    spawn( fun () ->
+		   gen_tcp:close(Socket)
+	   end ).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_layer.erl b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_layer.erl
new file mode 100644
index 0000000000..b7fdd183e1
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_layer.erl
@@ -0,0 +1,83 @@
+%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%
+%   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.
+%%%-------------------------------------------------------------------
+%%% File    : comm_layer.erl
+%%% Author  : Thorsten Schuett <[email protected]>
+%%% Description : Public interface to Communication Layer.
+%%%           Generic functions to send messages.
+%%%           Distinguishes on runtime whether the destination is in the
+%%%           same Erlang virtual machine (use ! for sending) or on a remote
+%%%           site (use comm_port:send()).
+%%%
+%%% Created :  04 Feb 2008 by Thorsten Schuett <[email protected]>
+%%%-------------------------------------------------------------------
+%% @author Thorsten Schuett <[email protected]>
+%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%% @version $Id $
+-module(comm_layer_dir.comm_layer).
+
+-author('[email protected]').
+-vsn('$Id: comm_layer.erl,v 1.1 2009/11/06 12:41:36 maria Exp $ ').
+
+-export([start_link/0, send/2, this/0, here/1]).
+
+-import(io).
+-import(util).
+-import(log).
+
+-include("comm_layer.hrl").
+
+
+% @TODO: should be ip
+-type(process_id() :: {any(), integer(), pid()}).
+%%====================================================================
+%% public functions
+%%====================================================================
+
+%% @doc starts the communication port (for supervisor)
+%% @spec start_link() -> {ok,Pid} | ignore | {error,Error}
+start_link() ->
+    comm_port_sup:start_link().
+
+%% @doc a process descriptor has to specify the erlang vm
+%%      + the process inside. {IP address, port, pid}
+%% @type process_id() = {inet:ip_address(), int(), pid()}.
+%% @spec send(process_id(), term()) -> ok
+
+send({{_IP1, _IP2, _IP3, _IP4} = _IP, _Port, _Pid} = Target, Message) ->
+    {MyIP,MyPort} = comm_port:get_local_address_port(),
+    %io:format("send: ~p:~p -> ~p:~p(~p) : ~p\n", [MyIP, MyPort, _IP, _Port, _Pid, Message]),
+    IsLocal = (MyIP == _IP) and (MyPort == _Port),
+    if
+	IsLocal ->
+	    ?LOG_MESSAGE(erlang:element(1, Message), byte_size(term_to_binary(Message))),
+	    _Pid ! Message;
+	true ->
+	    comm_port:send(Target, Message)
+    end;
+
+send(Target, Message) ->
+    log:log(error,"[ CC ] wrong call to cs_send:send: ~w ! ~w", [Target, Message]),
+    log:log(error,"[ CC ] stacktrace: ~w", [util:get_stacktrace()]),
+    ok.
+
+%% @doc returns process descriptor for the calling process
+-spec(this/0 :: () -> atom()).%process_id()).
+this() ->
+    here(self()).
+
+-spec(here/1 :: (pid()) -> process_id()).
+here(Pid) ->
+    {LocalIP, LocalPort} = comm_port:get_local_address_port(),
+    {LocalIP, LocalPort, Pid}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_layer.hrl b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_layer.hrl
new file mode 100644
index 0000000000..54f31b7c55
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_layer.hrl
@@ -0,0 +1,29 @@
+%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%
+%   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.
+%%%-------------------------------------------------------------------
+%%% File    : comm_layer.hrl
+%%% Author  : Thorsten Schuett <[email protected]>
+%%% Description :
+%%%
+%%% Created : 31 Jul 2008 by Thorsten Schuett <[email protected]>
+%%%-------------------------------------------------------------------
+%% @author Thorsten Schuett <[email protected]>
+%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%% @version $Id: comm_layer.hrl,v 1.1 2009/11/06 12:41:36 maria Exp $
+-author('[email protected]').
+-vsn('$Id: comm_layer.hrl,v 1.1 2009/11/06 12:41:36 maria Exp $ ').
+
+% enable logging of message statistics
+%-define(LOG_MESSAGE(TAG, SIZE), comm_layer.comm_logger:log(TAG, SIZE)).
+-define(LOG_MESSAGE(TAG, SIZE), ok).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_logger.erl b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_logger.erl
new file mode 100644
index 0000000000..b8882758af
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_logger.erl
@@ -0,0 +1,143 @@
+%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%
+%   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.
+%%%-------------------------------------------------------------------
+%%% File    : comm_logger.erl
+%%% Author  : Thorsten Schuett <[email protected]>
+%%% Description :
+%%%
+%%% Created : 31 Jul 2008 by Thorsten Schuett <[email protected]>
+%%%-------------------------------------------------------------------
+%% @author Thorsten Schuett <[email protected]>
+%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%% @version $Id: comm_logger.erl,v 1.1 2009/11/06 12:41:36 maria Exp $
+-module(comm_layer_dir.comm_logger).
+
+-author('[email protected]').
+-vsn('$Id: comm_logger.erl,v 1.1 2009/11/06 12:41:36 maria Exp $ ').
+
+-behaviour(gen_server).
+
+-import(gb_trees).
+-import(gen_server).
+
+%% API
+-export([start_link/0]).
+
+-export([log/2, dump/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+-record(state, {start, map}).
+
+%%====================================================================
+%% API
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+%% Description: Starts the server
+%%--------------------------------------------------------------------
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+%%--------------------------------------------------------------------
+%% Function: log(Tag, Size) -> ok
+%% Description: logs a message type with its size
+%%--------------------------------------------------------------------
+log(Tag, Size) ->
+    gen_server:cast(?MODULE, {log, Tag, Size}).
+
+%%--------------------------------------------------------------------
+%% Function: dump() -> {gb_tree:gb_trees(), {Date, Time}}
+%% Description: gets the logging state
+%%--------------------------------------------------------------------
+dump() ->
+    gen_server:call(?MODULE, {dump}).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+
+%%--------------------------------------------------------------------
+%% Function: init(Args) -> {ok, State} |
+%%                         {ok, State, Timeout} |
+%%                         ignore               |
+%%                         {stop, Reason}
+%% Description: Initiates the server
+%%--------------------------------------------------------------------
+init([]) ->
+    {ok, #state{start=erlang:now(), map=gb_trees:empty()}}.
+
+%%--------------------------------------------------------------------
+%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
+%%                                      {reply, Reply, State, Timeout} |
+%%                                      {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, Reply, State} |
+%%                                      {stop, Reason, State}
+%% Description: Handling call messages
+%%--------------------------------------------------------------------
+handle_call({dump}, _From, State) ->
+    Reply = {State#state.map, State#state.start},
+    {reply, Reply, State};
+handle_call(_Request, _From, State) ->
+    Reply = ok,
+    {reply, Reply, State}.
+
+%%--------------------------------------------------------------------
+%% Function: handle_cast(Msg, State) -> {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, State}
+%% Description: Handling cast messages
+%%--------------------------------------------------------------------
+handle_cast({log, Tag, Size}, State) ->
+    case gb_trees:lookup(Tag, State#state.map) of
+	none ->
+	    {noreply, State#state{map=gb_trees:insert(Tag, {Size, 1}, State#state.map)}};
+	{value, {OldSize, OldCount}} ->
+	    {noreply, State#state{map=gb_trees:update(Tag, {Size + OldSize, OldCount + 1}, State#state.map)}}
+    end;
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+%%--------------------------------------------------------------------
+%% Function: handle_info(Info, State) -> {noreply, State} |
+%%                                       {noreply, State, Timeout} |
+%%                                       {stop, Reason, State}
+%% Description: Handling all non call/cast messages
+%%--------------------------------------------------------------------
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+%%--------------------------------------------------------------------
+%% Function: terminate(Reason, State) -> void()
+%% Description: This function is called by a gen_server when it is about to
+%% terminate. It should be the opposite of Module:init/1 and do any necessary
+%% cleaning up. When it returns, the gen_server terminates with Reason.
+%% The return value is ignored.
+%%--------------------------------------------------------------------
+terminate(_Reason, _State) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
+%% Description: Convert process state when code is changed
+%%--------------------------------------------------------------------
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_port.erl b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_port.erl
new file mode 100644
index 0000000000..e8169b4673
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_port.erl
@@ -0,0 +1,240 @@
+%  Copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
+%
+%   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.
+%%%-------------------------------------------------------------------
+%%% File    : comm_port.erl
+%%% Author  : Thorsten Schuett <[email protected]>
+%%% Description : Main CommLayer Interface
+%%%           Maps remote addresses to comm_connection PIDs.
+%%%
+%%% Created : 18 Apr 2008 by Thorsten Schuett <[email protected]>
+%%%-------------------------------------------------------------------
+%% @author Thorsten Schuett <[email protected]>
+%% @copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
+%% @version $Id $
+-module(comm_layer_dir.comm_port).
+
+-author('[email protected]').
+-vsn('$Id: comm_port.erl,v 1.1 2009/11/06 12:41:36 maria Exp $ ').
+
+-behaviour(gen_server).
+
+-import(ets).
+-import(gen_server).
+-import(io).
+-import(log).
+
+-define(ASYNC, true).
+%-define(SYNC, true).
+
+%% API
+-export([start_link/0,
+	send/2,
+	unregister_connection/2, register_connection/4,
+	set_local_address/2, get_local_address_port/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+%%====================================================================
+%% API
+%%====================================================================
+
+%% @doc
+%% @spec send({inet:ip_address(), int(), pid()}, term()) -> ok
+-ifdef(ASYNC).
+send({Address, Port, Pid}, Message) ->
+    gen_server:call(?MODULE, {send, Address, Port, Pid, Message}, 20000).
+-endif.
+-ifdef(SYNC).
+send({Address, Port, Pid}, Message) ->
+    case ets:lookup(?MODULE, {Address, Port}) of
+	[{{Address, Port}, {_LPid, Socket}}] ->
+	    comm_connection:send({Address, Port, Socket}, Pid, Message),
+	    ok;
+	[] ->
+	    gen_server:call(?MODULE, {send, Address, Port, Pid, Message}, 20000)
+    end.
+-endif.
+
+
+%% @doc
+%% @spec unregister_connection(inet:ip_address(), int()) -> ok
+unregister_connection(Adress, Port) ->
+    gen_server:call(?MODULE, {unregister_conn, Adress, Port}, 20000).
+
+%% @doc
+%% @spec register_connection(inet:ip_address(), int(), pid(), gen_tcp:socket()) -> ok | duplicate
+register_connection(Adress, Port, Pid, Socket) ->
+    gen_server:call(?MODULE, {register_conn, Adress, Port, Pid, Socket}, 20000).
+
+%% @doc
+%% @spec set_local_address(inet:ip_address(), int()) -> ok
+set_local_address(Address, Port) ->
+    gen_server:call(?MODULE, {set_local_address, Address, Port}, 20000).
+
+
+%% @doc
+%% @spec get_local_address_port() -> {inet:ip_address(),int()}
+get_local_address_port() ->
+    case ets:lookup(?MODULE, local_address_port) of
+	[{local_address_port, Value}] ->
+	    Value;
+	[] ->
+	    undefined
+    end.
+
+%%--------------------------------------------------------------------
+%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+%% Description: Starts the server
+%%--------------------------------------------------------------------
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+
+%%--------------------------------------------------------------------
+%% Function: init(Args) -> {ok, State} |
+%%                         {ok, State, Timeout} |
+%%                         ignore               |
+%%                         {stop, Reason}
+%% Description: Initiates the server
+%%--------------------------------------------------------------------
+init([]) ->
+    ets:new(?MODULE, [set, protected, named_table]),
+    {ok, ok}. % empty state.
+
+%%--------------------------------------------------------------------
+%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
+%%                                      {reply, Reply, State, Timeout} |
+%%                                      {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, Reply, State} |
+%%                                      {stop, Reason, State}
+%% Description: Handling call messages
+%%--------------------------------------------------------------------
+handle_call({send, Address, Port, Pid, Message}, _From, State) ->
+    send(Address, Port, Pid, Message, State);
+
+handle_call({unregister_conn, Address, Port}, _From, State) ->
+    ets:delete(?MODULE, {Address, Port}),
+    {reply, ok, State};
+
+handle_call({register_conn, Address, Port, Pid, Socket}, _From, State) ->
+    case ets:lookup(?MODULE, {Address, Port}) of
+	[{{Address, Port}, _}] ->
+	    {reply, duplicate, State};
+	[] ->
+	    ets:insert(?MODULE, {{Address, Port}, {Pid, Socket}}),
+	    {reply, ok, State}
+    end;
+
+handle_call({set_local_address, Address, Port}, _From, State) ->
+    ets:insert(?MODULE, {local_address_port, {Address,Port}}),
+    {reply, ok, State}.
+
+%%--------------------------------------------------------------------
+%% Function: handle_cast(Msg, State) -> {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, State}
+%% Description: Handling cast messages
+%%--------------------------------------------------------------------
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+%%--------------------------------------------------------------------
+%% Function: handle_info(Info, State) -> {noreply, State} |
+%%                                       {noreply, State, Timeout} |
+%%                                       {stop, Reason, State}
+%% Description: Handling all non call/cast messages
+%%--------------------------------------------------------------------
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+%%--------------------------------------------------------------------
+%% Function: terminate(Reason, State) -> void()
+%% Description: This function is called by a gen_server when it is about to
+%% terminate. It should be the opposite of Module:init/1 and do any necessary
+%% cleaning up. When it returns, the gen_server terminates with Reason.
+%% The return value is ignored.
+%%--------------------------------------------------------------------
+terminate(_Reason, _State) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
+%% Description: Convert process state when code is changed
+%%--------------------------------------------------------------------
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
+-ifdef(ASYNC).
+send(Address, Port, Pid, Message, State) ->
+    {DepAddr,DepPort} = get_local_address_port(),
+    if
+	DepAddr == undefined ->
+	    open_sync_connection(Address, Port, Pid, Message, State);
+	true ->
+	    case ets:lookup(?MODULE, {Address, Port}) of
+		[{{Address, Port}, {ConnPid, _Socket}}] ->
+		    ConnPid ! {send, Pid, Message},
+		    {reply, ok, State};
+		[] ->
+		    ConnPid = comm_connection:open_new_async(Address, Port,
+							     DepAddr, DepPort),
+		    ets:insert(?MODULE, {{Address, Port}, {ConnPid, undef}}),
+		    ConnPid ! {send, Pid, Message},
+		    {reply, ok, State}
+	    end
+    end.
+-endif.
+
+-ifdef(SYNC).
+send(Address, Port, Pid, Message, State) ->
+    case ets:lookup(?MODULE, {Address, Port}) of
+	[{{Address, Port}, {_LPid, Socket}}] ->
+	    comm_connection:send({Address, Port, Socket}, Pid, Message),
+	    {reply, ok, State};
+	[] ->
+	    open_sync_connection(Address, Port, Pid, Message, State)
+    end.
+-endif.
+
+
+open_sync_connection(Address, Port, Pid, Message, State) ->
+    {DepAddr,DepPort} = get_local_address_port(),
+    case comm_connection:open_new(Address, Port, DepAddr, DepPort) of
+	{local_ip, MyIP, MyPort, MyPid, MySocket} ->
+	    comm_connection:send({Address, Port, MySocket}, Pid, Message),
+	    log:log(info,"[ CC ] this() == ~w", [{MyIP, MyPort}]),
+						%		    set_local_address(t, {MyIP,MyPort}}),
+						%		    register_connection(Address, Port, MyPid, MySocket),
+	    ets:insert(?MODULE, {local_address_port, {MyIP,MyPort}}),
+	    ets:insert(?MODULE, {{Address, Port}, {MyPid, MySocket}}),
+	    {reply, ok, State};
+	fail ->
+						% drop message (remote node not reachable, failure detector will notice)
+	    {reply, ok, State};
+	{connection, LocalPid, NewSocket} ->
+	    comm_connection:send({Address, Port, NewSocket}, Pid, Message),
+	    ets:insert(?MODULE, {{Address, Port}, {LocalPid, NewSocket}}),
+						%		    register_connection(Address, Port, LPid, NewSocket),
+	    {reply, ok, State}
+    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_port_sup.erl b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_port_sup.erl
new file mode 100644
index 0000000000..d7a25b14ab
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_port_sup.erl
@@ -0,0 +1,88 @@
+%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%
+%   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.
+%%%-------------------------------------------------------------------
+%%% File    : comm_port_sup.erl
+%%% Author  : Thorsten Schuett <[email protected]>
+%%% Description :
+%%%
+%%% Created : 04 Feb 2008 by Thorsten Schuett <[email protected]>
+%%%-------------------------------------------------------------------
+%% @author Thorsten Schuett <[email protected]>
+%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%% @version $Id: comm_port_sup.erl,v 1.1 2009/11/06 12:41:36 maria Exp $
+-module(comm_layer_dir.comm_port_sup).
+
+-author('[email protected]').
+-vsn('$Id: comm_port_sup.erl,v 1.1 2009/11/06 12:41:36 maria Exp $ ').
+
+-behaviour(supervisor).
+
+-import(supervisor).
+-import(randoms).
+-import(string).
+-import(config).
+
+-export([start_link/0, init/1]).
+
+%%====================================================================
+%% API functions
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+%% Description: Starts the supervisor
+%%--------------------------------------------------------------------
+start_link() ->
+    supervisor:start_link(?MODULE, []).
+
+%%====================================================================
+%% Supervisor callbacks
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Func: init(Args) -> {ok,  {SupFlags,  [ChildSpec]}} |
+%%                     ignore                          |
+%%                     {error, Reason}
+%% Description: Whenever a supervisor is started using
+%% supervisor:start_link/[2,3], this function is called by the new process
+%% to find out about restart strategy, maximum restart frequency and child
+%% specifications.
+%%--------------------------------------------------------------------
+init([]) ->
+    InstanceId = string:concat("comm_port_", randoms:getRandomId()),
+    CommPort =
+	{comm_port,
+	 {comm_layer_dir.comm_port, start_link, []},
+	 permanent,
+	 brutal_kill,
+	 worker,
+	 []},
+    CommAcceptor =
+	{comm_acceptor,
+	 {comm_layer_dir.comm_acceptor, start_link, [InstanceId]},
+	 permanent,
+	 brutal_kill,
+	 worker,
+	 []},
+    CommLogger =
+	{comm_logger,
+	 {comm_layer_dir.comm_logger, start_link, []},
+	 permanent,
+	 brutal_kill,
+	 worker,
+	 []},
+    {ok, {{one_for_all, 10, 1},
+	  [
+	   CommPort,
+	   CommLogger,
+	   CommAcceptor
+	  ]}}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/compare1.erl b/lib/dialyzer/test/small_SUITE_data/src/compare1.erl
new file mode 100644
index 0000000000..915ae7621c
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/compare1.erl
@@ -0,0 +1,21 @@
+%%%-------------------------------------------------------------------
+%%% File    : compare1.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created : 20 Apr 2007 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(compare1).
+
+-export([t/0]).
+
+t() ->
+  t(42).
+
+t(X) when X > 42 ->
+  error;
+t(X) when X < 42 ->
+  error;
+t(X) when X =/= 42 ->
+  error;
+t(X) -> ok.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/confusing_record_warning.erl b/lib/dialyzer/test/small_SUITE_data/src/confusing_record_warning.erl
new file mode 100644
index 0000000000..8af74e0914
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/confusing_record_warning.erl
@@ -0,0 +1,19 @@
+%%---------------------------------------------------------------------
+%% A user complained that dialyzer produces a weird warning for the
+%% following program.  I explained to him that there is an implicit
+%% assumption that when a record is typed one cannot have types of
+%% the same size which are tagged by the record name whose elements
+%% have different types than the ones declared in the record.
+%%
+%% But the warning from dialyzer was weird nonetheless:
+%%    The pattern {'r', [_]} can never match the type any()
+%% We should clearly give some less confusing warning in this case.
+%%---------------------------------------------------------------------
+-module(confusing_record_warning).
+
+-export([test/1]).
+
+-record(r, {field :: binary}).
+
+test({r, [_]}) ->
+  #r{field = <<42>>}.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/confusing_warning.erl b/lib/dialyzer/test/small_SUITE_data/src/confusing_warning.erl
index c82df0f056..c82df0f056 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/confusing_warning.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/confusing_warning.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/contract2.erl b/lib/dialyzer/test/small_SUITE_data/src/contract2.erl
new file mode 100644
index 0000000000..211de7f009
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/contract2.erl
@@ -0,0 +1,18 @@
+-module(contract2).
+-export([test/2]).
+
+-spec test(list(), list()) -> ok.
+
+test([], []) ->
+  ok;
+test([], L) ->
+  raise(L);
+test([H|T], L) ->
+  case H of
+    true -> test(T, L);
+    false -> test(T, [H|L])
+  end.
+
+-spec raise(_) -> no_return().
+raise(X) ->
+  throw(X).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/contract3.erl b/lib/dialyzer/test/small_SUITE_data/src/contract3.erl
new file mode 100644
index 0000000000..5b0bee9694
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/contract3.erl
@@ -0,0 +1,33 @@
+%%%-------------------------------------------------------------------
+%%% File    : contract3.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description : Check overloaded domains
+%%%
+%%% Created :  2 Nov 2007 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(contract3).
+
+-export([t/3]).
+
+t(X, Y, Z) ->
+  t1(X),
+  t2(X, Y),
+  t3(X, Y, Z).
+
+-spec t1(atom()|integer()) -> integer();
+        (atom()|list()) -> atom().
+
+t1(X) ->
+  foo:bar(X).
+
+-spec t2(atom(), integer()) -> integer();
+        (atom(), list()) -> atom().
+
+t2(X, Y) ->
+  foo:bar(X, Y).
+
+-spec t3(atom(), integer(), list()) -> integer();
+        (X, integer(), list()) -> X.
+
+t3(X, Y, Z) ->
+  X.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/contract5.erl b/lib/dialyzer/test/small_SUITE_data/src/contract5.erl
new file mode 100644
index 0000000000..c4c9ac9ebf
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/contract5.erl
@@ -0,0 +1,15 @@
+%%%-------------------------------------------------------------------
+%%% File    : contract5.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description : Excercise modified record types.
+%%%
+%%% Created : 15 Apr 2008 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(contract5).
+-export([t/0]).
+
+-record(bar, {baz}).
+
+-spec t() -> #bar{baz :: boolean()}.
+
+t() -> #bar{baz = not_a_boolean}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/disj_norm_form.erl b/lib/dialyzer/test/small_SUITE_data/src/disj_norm_form.erl
new file mode 100644
index 0000000000..fedac566ea
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/disj_norm_form.erl
@@ -0,0 +1,23 @@
+%%%-------------------------------------------------------------------
+%%% File    : disj_norm_form.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description : Exposes a bad behavior in expansion to
+%%%               disjunctive normal form of guards.
+%%%
+%%% Created : 24 Aug 2007 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(disj_norm_form).
+
+-export([t/1]).
+
+-record(foo, {bar}).
+
+t(R) ->
+  if R#foo.bar =:= 1;
+     R#foo.bar =:= 2;
+     R#foo.bar =:= 3;
+     R#foo.bar =:= 4;
+     R#foo.bar =:= 5;
+     R#foo.bar =:= 6 -> ok;
+     true -> error
+  end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/eqeq.erl b/lib/dialyzer/test/small_SUITE_data/src/eqeq.erl
new file mode 100644
index 0000000000..f8989185d4
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/eqeq.erl
@@ -0,0 +1,15 @@
+%%%-------------------------------------------------------------------
+%%% File    : eqeq.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created : 12 Nov 2007 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(eqeq).
+
+-export([t/0]).
+
+t() ->
+  comp(3.14, foo).
+
+comp(X, Y) -> X =:= Y.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/ets_select.erl b/lib/dialyzer/test/small_SUITE_data/src/ets_select.erl
new file mode 100644
index 0000000000..17bfb5c8bc
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/ets_select.erl
@@ -0,0 +1,11 @@
+-module(ets_select).
+-export([test/0]).
+
+test() ->
+  Table = ets:new(table, [set,{keypos,1}]),
+  ets:insert(Table, {foo, bar, baz}),
+  foo(Table). % ets:select(Table, [{{'_', '$1', '$2'}, [], ['$$']}]).
+
+foo(Table) ->
+  Tuples = ets:select(Table, [{{'_', '$1', '$2'}, [], ['$$']}]),
+  [list_to_tuple(Tuple) || Tuple <- Tuples].
diff --git a/lib/dialyzer/test/small_SUITE_data/src/ets_update_counter.erl b/lib/dialyzer/test/small_SUITE_data/src/ets_update_counter.erl
new file mode 100644
index 0000000000..057748cfb4
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/ets_update_counter.erl
@@ -0,0 +1,25 @@
+-module(ets_update_counter).
+
+-export([ti/2, tl/2, tn/2, tt/2, tu/3, tmix/3]).
+
+ti(T, K) ->
+  ets:update_counter(T, K, 42).
+
+tl(T, K) ->
+  ets:update_counter(T, K, [{2,1}, {3,2}]).
+
+tn(T, K) ->
+  ets:update_counter(T, K, []).
+
+tt(T, K) ->
+  ets:update_counter(T, K, {4,2}).
+
+tu(T, K, Op) ->
+  ets:update_counter(T, K, Op).
+
+tmix(T, K, Choice) ->
+  Op = get_op(Choice),
+  ets:update_counter(T, K, Op).
+
+get_op(i) -> 42;
+get_op(t) -> {4,2}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/exhaust_case.erl b/lib/dialyzer/test/small_SUITE_data/src/exhaust_case.erl
new file mode 100644
index 0000000000..4b2c16f8a2
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/exhaust_case.erl
@@ -0,0 +1,23 @@
+%%-------------------------------------------------------------------
+%% File    : exhaust_case.erl
+%% Author  : Kostis Sagonas <[email protected]>
+%% Description : Tests that Dialyzer warns when it finds an unreachable
+%%		 case clause (independently of whether ground vs. var).
+%%
+%% Created : 15 Dec 2004 by Kostis Sagonas <[email protected]>
+%%-------------------------------------------------------------------
+
+-module(exhaust_case).
+-export([t/1]).
+
+t(X) when is_integer(X) ->
+  case ret(X) of
+    foo -> ok;
+    bar -> ok;
+    42  -> ok;
+    _other -> error	%% unreachable clause (currently no warning)
+    %% other -> error	%% but contrast this with this clause... hmm
+  end.
+
+ret(1) -> foo;
+ret(2) -> bar.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/failing_guard1.erl b/lib/dialyzer/test/small_SUITE_data/src/failing_guard1.erl
new file mode 100644
index 0000000000..9e39975105
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/failing_guard1.erl
@@ -0,0 +1,15 @@
+%%-----------------------------------------------------------------------
+%% Author: Kostis Sagonas (Wed Aug 23 14:54:25 CEST 2006)
+%%
+%% Program to test failing arithmetic comparisons with a number of the
+%% wrong type. The first case is handled properly; the second one is not.
+%% Why?
+%%-----------------------------------------------------------------------
+
+-module(failing_guard1).
+-export([n/1]).
+
+n(N) when (N / 2) =:= 2 -> multiple_of_four;
+n(N) when (N div 3) =:= 2.0 -> multiple_of_six;
+n(N) when (N rem 3) =:= 2.0 -> multiple_of_six;
+n(N) when is_number(N) -> other_number.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/false_false.erl b/lib/dialyzer/test/small_SUITE_data/src/false_false.erl
new file mode 100644
index 0000000000..e8efc42868
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/false_false.erl
@@ -0,0 +1,32 @@
+%%----------------------------------------------------------------------------
+%% Mail from user (username: sauron!) via Dan Gudmundsson (17 Dec 2010).
+%%
+%%   tried this on:
+%%     Erlang R14B (erts-5.8.1.2) [smp:2:2] [rq:2] [async-threads:0] ...
+%%   and got funny diagnostics from dialyzer
+%%
+%%   false_false.erl:20: Function false_or/0 has no local return
+%%   false_false.erl:25: The variable _ can never match since previous
+%%		         clauses completely covered the type 'ok'
+%%
+%% Problem in the handling of 'or' with constant 'false' arguments
+%% fixed by Stavros Aronis and Maria Christakis on the same day.
+%%----------------------------------------------------------------------------
+-module(false_false).
+
+-export([false_or/0, wips/0]).
+
+false_or() ->
+  false or false.
+
+wips() ->
+  case new_execute_cmd(random:uniform(2)) of
+    ok -> mostly_good;
+    _ -> and_here_we_are
+  end.
+
+new_execute_cmd(1) ->
+  ok;
+new_execute_cmd(2) ->
+  io:format("Surprise result is: ~p~n", [false or false]),
+  false.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/file_open_encoding.erl b/lib/dialyzer/test/small_SUITE_data/src/file_open_encoding.erl
new file mode 100644
index 0000000000..4f1268eba8
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/file_open_encoding.erl
@@ -0,0 +1,26 @@
+%%-----------------------------------------------------------------------
+%% Program that gave erroneous warnings due to missing information about
+%% the {encoding, latin1 | unicode | utf8 | ...} option of file:open/3.
+%%-----------------------------------------------------------------------
+-module(file_open_encoding).
+
+-export([parse/1]).
+
+-type proplist() :: [{atom(), any()}].
+
+-spec parse(string()) -> proplist().
+parse(FileName) ->
+  {ok, IoDevice} = file:open(FileName, [read, binary, {encoding, utf8}]),
+  do_parse(IoDevice, []).
+
+do_parse(IoDevice, ResultSoFar) ->
+  case io:get_line(IoDevice, "") of
+    eof ->
+      file:close(IoDevice),
+      ResultSoFar;
+    <<"--"/utf8, _Comment/binary>> ->
+      do_parse(IoDevice, ResultSoFar);
+    Line ->
+      [Key, Value] = binary:split(Line, [<<": ">>, <<"\n">>], [global, trim]),
+      do_parse(IoDevice, [{binary_to_atom(Key, utf8), Value} | ResultSoFar])
+ end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/flatten.erl b/lib/dialyzer/test/small_SUITE_data/src/flatten.erl
new file mode 100644
index 0000000000..e424d5404c
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/flatten.erl
@@ -0,0 +1,18 @@
+%%%-------------------------------------------------------------------
+%%% File    : flatten.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created :  4 Nov 2007 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(flatten).
+
+-export([t/1]).
+
+t(Dir) ->
+  case file:list_dir(Dir) of
+    {ok,FileList} ->
+      FileList;
+    {error,Reason} ->
+      {error,lists:flatten("Can't open directory "++Dir++": "++Reason)}
+  end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/fun_app.erl b/lib/dialyzer/test/small_SUITE_data/src/fun_app.erl
new file mode 100644
index 0000000000..20b6138d26
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/fun_app.erl
@@ -0,0 +1,41 @@
+%% This is taken from the code of distel.
+
+-module(fun_app).
+-export([html_index/2]). % , lines/3, curry/2]).
+
+html_index(file,Dir) ->
+  fold_file(curry(fun lines/3,Dir),[],filename:join([Dir,"doc","man_index.html"])).
+
+fold_file(Fun,Acc0,File) ->
+  {ok, FD} = file:open(File, [read]),
+  Acc = fold_file_lines(FD,Fun,Acc0),
+  file:close(FD),
+  Acc.
+
+fold_file_lines(FD,Fun,Acc) ->
+  case io:get_line(FD, "") of
+    eof -> Acc;
+    Line -> fold_file_lines(FD,Fun,Fun(trim_nl(Line),Acc))
+  end.
+
+trim_nl(Str) -> lists:reverse(tl(lists:reverse(Str))).
+
+lines(Line,_,Dir) ->
+  case string:tokens(Line, "<> \"") of
+    ["TD", "A", "HREF=", "../"++Href, M|_] ->
+      case filename:basename(Href, ".html") of
+	"index" -> ok;
+	M -> e_set({file,M}, filename:join([Dir,Href]))
+      end;
+    _ -> ok
+  end.
+
+e_set(Key,Val) -> ets:insert(?MODULE, {Key,Val}).
+
+curry(F, Arg) ->
+  case erlang:fun_info(F,arity) of
+    {_,1} -> fun() -> F(Arg) end;
+    {_,2} -> fun(A) -> F(A,Arg) end;
+    {_,3} -> fun(A,B) -> F(A,B,Arg) end;
+    {_,4} -> fun(A,B,C) -> F(A,B,C,Arg) end
+  end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/fun_ref_match.erl b/lib/dialyzer/test/small_SUITE_data/src/fun_ref_match.erl
new file mode 100644
index 0000000000..31e6bdfb47
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/fun_ref_match.erl
@@ -0,0 +1,21 @@
+%%%-------------------------------------------------------------------
+%%% File    : fun_ref_match.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description : Find that newly created funs and references cannot
+%%%               match on earlier bound variables.
+%%%
+%%% Created : 10 Mar 2005 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(fun_ref_match).
+
+-export([t1/1, t2/1]).
+
+t1(X) ->
+  X = fun(Y) -> Y end,
+  ok.
+
+t2(X) ->
+  case make_ref() of
+    X -> error;
+    _ -> ok
+  end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/fun_ref_record.erl b/lib/dialyzer/test/small_SUITE_data/src/fun_ref_record.erl
index eace7a4332..eace7a4332 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/fun_ref_record.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/fun_ref_record.erl
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/gencall.erl b/lib/dialyzer/test/small_SUITE_data/src/gencall.erl
index d2875c9df1..d2875c9df1 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/gencall.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/gencall.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/gs_make.erl b/lib/dialyzer/test/small_SUITE_data/src/gs_make.erl
new file mode 100644
index 0000000000..2842e773c4
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/gs_make.erl
@@ -0,0 +1,260 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id: gs_make.erl,v 1.1 2008/12/17 09:53:50 mikpe Exp $
+%%
+-module(gs_make).
+
+-export([start/0]).
+
+start() ->
+    Terms = the_config(),
+    DB=fill_ets(Terms),
+    {ok,OutFd} = file:open("gstk_generic.hrl", [write]),
+    put(stdout,OutFd),
+%    io:format("terms: ~p ~n ets:~p~n",[Terms,ets:tab2list(DB)]),
+    p("% Don't edit this file. It was generated by gs_make:start/0 "),
+    p("at ~p-~p-~p, ~p:~p:~p.\n\n",
+      lists:append(tuple_to_list(date()),tuple_to_list(time()))),
+    gen_out_opts(DB),
+    gen_read(DB),
+    file:close(OutFd),
+    {ok,"gstk_generic.hrl",DB}.
+
+fill_ets(Terms) ->
+    DB = ets:new(gs_mapping,[bag,public]),
+    fill_ets(DB,Terms).
+
+fill_ets(DB,[]) -> DB;
+fill_ets(DB,[{Objs,Opt,Fun,Access}|Terms]) ->
+    fill_ets(DB,lists:flatten(Objs),Opt,Fun,Access),
+    fill_ets(DB,Terms).
+
+fill_ets(_DB,[],_,_,_) -> done;
+fill_ets(DB,[Obj|Objs],Opt,Fun,rw) ->
+    ets:insert(DB,{Obj,Opt,Fun,read}),
+    ets:insert(DB,{Obj,Opt,Fun,write}),
+    fill_ets(DB,Objs,Opt,Fun,rw);
+fill_ets(DB,[Obj|Objs],Opt,Fun,r) ->
+    ets:insert(DB,{Obj,Opt,Fun,read}),
+    fill_ets(DB,Objs,Opt,Fun,r);
+fill_ets(DB,[Obj|Objs],Opt,Fun,w) ->
+    ets:insert(DB,{Obj,Opt,Fun,write}),
+    fill_ets(DB,Objs,Opt,Fun,w).
+
+
+
+gen_out_opts(DB) ->
+    ObjTypes = lists:flatten(ordsets:from_list(ets:match(DB,{'$1','_','_',write}))),
+    p("out_opts([Option|Options],Gstkid,TkW,DB,ExtraArg,S,P,C) ->\n"),
+    p("  {Opt,Val} =\n"),
+    p("    case Option of \n"),
+    p("      {{default,Cat,Key},V} -> {default,{Cat,{Key,V}}};\n"),
+    p("      {_Key,_V} -> Option;\n"),
+    p("      {default,Cat,Opti} -> {default,{Cat,Opti}};\n"),
+    p("      Atom when atom(Atom) -> {Atom,undefined};\n"),
+    p("      _ -> {error, {invalid_option,Option}}\n"),
+    p("    end,\n"),
+    p("  case Gstkid#gstkid.objtype of\n"),
+    gen_out_type_case_clauses(merge_types(ObjTypes),DB),
+    p("    Q -> exit({internal_error,unknown_objtype,Q})\n"),
+    p("  end;\n"),
+    p("out_opts([],_Gstkid,_TkW,_DB,_ExtraArg,S,P,C) -> \n"),
+    p("  {S,P,C}.\n").
+
+
+gen_out_type_case_clauses([],_DB) -> done;
+gen_out_type_case_clauses([Objtype|Objtypes],DB) ->
+    OptsFuns = lists:map(fun (L) -> list_to_tuple(L) end,
+			 ets:match(DB,{Objtype,'$1','$2',write})),
+    p("   ~p -> \ncase Opt of\n",[Objtype]),
+    gen_opt_case_clauses(merge_opts(opt_prio(),OptsFuns)),
+    p("  _ -> \n"),
+    p("    handle_external_opt_call([Option|Options],Gstkid,TkW,DB,ExtraArg,"
+      "                             gstk_~p:option(Option,Gstkid,TkW,DB,ExtraArg),S,P,C)\n",
+      [Objtype]),
+    p("  end;\n"),
+    gen_out_type_case_clauses(Objtypes,DB).
+
+gen_opt_case_clauses([]) ->
+    done;
+gen_opt_case_clauses([{Opt,Fun}|OptFuncs]) ->
+    p("  ~p ->\n",[Opt]),
+    p("    ~p(Val,Options,Gstkid,TkW,DB,ExtraArg,S,P,C);\n",[Fun]),
+    gen_opt_case_clauses(OptFuncs).
+
+gen_read(DB) ->
+    ObjTypes = lists:flatten(ordsets:from_list(ets:match(DB,{'$1','_','_',read}))),
+    p("read_option(DB,Gstkid,TkW,Option,ExtraArg) ->\n"),
+    p("  Key = case Option of\n"),
+    p("    Atom when atom(Atom) -> Atom;\n"),
+    p("    Opt when tuple(Opt) -> element(1,Opt)\n"),
+    p("  end,\n"),
+    p("  case Gstkid#gstkid.objtype of\n"),
+    gen_read_type_clauses(merge_types(ObjTypes),DB),
+    p("    Q -> exit({internal_error,unknown_objtype,Q})\n"),
+    p("  end.\n").
+
+
+gen_read_type_clauses([],_) -> done;
+gen_read_type_clauses([Objtype|Objtypes],DB) ->
+    OptsFuns = lists:map(fun (L) -> list_to_tuple(L) end,
+			 ets:match(DB,{Objtype,'$1','$2',read})),
+    p("  ~p -> \ncase Key of\n",[Objtype]),
+    gen_readopt_case_clauses(merge_opts(opt_prio(),OptsFuns)),
+    p("  _ -> \nhandle_external_read(gstk_~p:read_option(Option,Gstkid,TkW,DB,ExtraArg))\n",[Objtype]),
+    p("  end;\n"),
+    gen_read_type_clauses(Objtypes,DB).
+
+gen_readopt_case_clauses([]) ->
+    done;
+gen_readopt_case_clauses([{Opt,Fun}|OptFuncs]) ->
+    p("  ~p -> \n~p(Option,Gstkid,TkW,DB,ExtraArg);\n",[Opt,Fun]),
+    gen_readopt_case_clauses(OptFuncs).
+
+
+p(Str) ->
+    ok = io:format(get(stdout),Str,[]).
+
+p(Format,Data) ->
+    ok = io:format(get(stdout),Format,Data).
+
+%%----------------------------------------------------------------------
+%% There items should be placed early in a case statement.
+%%----------------------------------------------------------------------
+obj_prio() -> [rectangle,line,gridline,image,button,canvas,checkbutton,radiobutton].
+opt_prio() -> [x,y,width,height,move,coords,data].
+
+merge_types(Types) ->
+    T2 = ordsets:from_list(Types),
+    P2 = ordsets:from_list(obj_prio()),
+    obj_prio() ++ ordsets:subtract(T2, P2).
+
+merge_opts([],L) -> L;
+merge_opts([Opt|Opts],Dict) ->
+    case gs:assq(Opt,Dict) of
+	{value,V} -> [{Opt,V}|merge_opts(Opts,lists:keydelete(Opt,1,Dict))];
+	false -> merge_opts(Opts,Dict)
+    end.
+
+the_config() ->
+    Buttons=[button,checkbutton,radiobutton],
+    AllPureTk = [Buttons,canvas,editor,entry,frame,label,listbox,
+                 menubar,menubutton,scale,window],
+    CanvasObj = [arc,image,line,oval,polygon,rectangle,text],
+    All = [AllPureTk,CanvasObj,grid,gridline,menu,menuitem,gs],
+    Containers = [canvas,frame,grid,menu,menubar,menubutton,menuitem,window],
+    Ob1 = [Buttons,canvas,grid,frame,label,entry,editor,listbox,scale],
+    Ob2 = [button,checkbutton,radiobutton,label,menubutton],
+    Ob3 = [Buttons,frame,label,entry,editor,listbox,scale,menubutton,
+	   menubar,menu],
+    Ob4 = [canvas,editor,listbox],
+    [{[Buttons,entry,scale,menubutton],enable,gen_enable,rw},
+     {[Buttons,label,entry,scale,menubutton,menu],fg,gen_fg,rw},
+     {[Buttons,label,entry,scale,menubutton,menu],bg,gen_bg,rw},
+     {Ob1,anchor,gen_anchor,rw},
+     {Ob1,height,gen_height,r},
+     {Ob1--[frame],height,gen_height,w},
+     {Ob1,width,gen_width,r},
+     {Ob1--[frame],width,gen_width,w},
+     {Ob1,pack_x,gen_pack_x,rw},
+     {Ob1,pack_y,gen_pack_y,rw},
+     {Ob1,pack_xy,gen_pack_xy,w},
+     {Ob1,x,gen_x,rw},
+     {Ob1,y,gen_y,rw},
+     {Ob1,raise,gen_raise,w},
+     {Ob1,lower,gen_lower,w},
+     {Ob2,align,gen_align,rw},
+     {Ob2,font,gen_font,rw},
+     {Ob2,justify,gen_justify,rw},
+     {Ob2,padx,gen_padx,rw},
+     {Ob2,pady,gen_pady,rw},
+     {Containers,default,gen_default,w},
+     {[AllPureTk,menu],relief,gen_relief,rw},
+     {[AllPureTk,menu],bw,gen_bw,rw},
+     {[Buttons,canvas,frame,label,entry,scale,menubutton,menu,menubar],
+      setfocus,gen_setfocus,rw},
+     {Ob3,buttonpress,gen_buttonpress,rw},
+     {Ob3,buttonrelease,gen_buttonrelease,rw},
+     {Ob3,configure,gen_configure,rw},
+     {[Ob3,window],destroy,gen_destroy,rw},
+     {[Ob3,window],enter,gen_enter,rw},
+     {[Ob3,window],leave,gen_leave,rw},
+     {[Ob3,window],focus,gen_focus_ev,rw},
+     {[Ob3,window],keypress,gen_keypress,rw},
+     {[Ob3,window],keyrelease,gen_keyrelease,rw},
+     {Ob3,motion,gen_motion,rw},
+     %% events containing x,y are special
+     {[window],buttonpress,gen_buttonpress,r},
+     {[window],buttonrelease,gen_buttonrelease,r},
+     {[window],motion,gen_motion,r},
+     {All,font_wh,gen_font_wh,r},
+     {All,choose_font,gen_choose_font,r},
+     {All,data,gen_data,rw},
+     {All,children,gen_children,r},
+     {All,id,gen_id,r},
+     {All,parent,gen_parent,r},
+     {All,type,gen_type,r},
+     {All,beep,gen_beep,w},
+     {All,keep_opt,gen_keep_opt,w},
+     {All,flush,gen_flush,rw},
+     {AllPureTk,highlightbw,gen_highlightbw,rw},
+     {AllPureTk,highlightbg,gen_highlightbg,rw},
+     {AllPureTk,highlightfg,gen_highlightfg,rw},
+     {AllPureTk,cursor,gen_cursor,rw}, % bug
+     {[Buttons,label,menubutton],label,gen_label,rw},
+     {[Buttons,menubutton,menu],activebg,gen_activebg,rw},
+     {[Buttons,menubutton,menu],activefg,gen_activefg,rw},
+     {[entry],selectbg,gen_selectbg,rw},
+     {[entry],selectbw,gen_selectbw,rw},
+     {[entry],selectfg,gen_selectfg,rw},
+     {Ob4,activebg,gen_so_activebg,rw},
+     {Ob4,bc,gen_so_bc,rw},
+     {Ob4,bg,gen_so_bg,rw},
+     {Ob4,hscroll,gen_so_hscroll,r},
+     {Ob4,scrollbg,gen_so_scrollbg,rw},
+     {Ob4,scrollfg,gen_so_scrollfg,rw},
+     {Ob4,scrolls,gen_so_scrolls,w},
+     {Ob4,selectbg,gen_so_selectbg,rw},
+     {Ob4,selectbg,gen_so_selectbg,rw},
+     {Ob4,selectbw,gen_so_selectbw,rw},
+     {Ob4,selectbw,gen_so_selectbw,rw},
+     {Ob4,selectfg,gen_so_selectfg,rw},
+     {Ob4,selectfg,gen_so_selectfg,rw},
+     {Ob4,vscroll,gen_so_vscroll,r},
+     {CanvasObj,coords,gen_citem_coords,rw},
+     {CanvasObj,lower,gen_citem_lower,w},
+     {CanvasObj,raise,gen_citem_raise,w},
+     {CanvasObj,move,gen_citem_move,w},
+     {CanvasObj,setfocus,gen_citem_setfocus,rw},
+     {CanvasObj,buttonpress,gen_citem_buttonpress,w}, % should be rw
+     {CanvasObj,buttonrelease,gen_citem_buttonrelease,w},
+     {CanvasObj,enter,gen_citem_enter,w},
+     {CanvasObj,focus,gen_citem_setfocus,w},
+     {CanvasObj,keypress,gen_citem_keypress,w},
+     {CanvasObj,keyrelease,gen_citem_keyrelease,w},
+     {CanvasObj,leave,gen_citem_leave,w},
+     {CanvasObj,motion,gen_citem_motion,w},
+     {CanvasObj,buttonpress,gen_buttonpress,r},
+     {CanvasObj,buttonrelease,gen_buttonrelease,r},
+     {CanvasObj,configure,gen_configure,r},
+     {CanvasObj,destroy,gen_destroy,r},
+     {CanvasObj,enter,gen_enter,r},
+     {CanvasObj,leave,gen_leave,r},
+     {CanvasObj,focus,gen_focus_ev,r},
+     {CanvasObj,keypress,gen_keypress,r},
+     {CanvasObj,keyrelease,gen_keyrelease,r},
+     {CanvasObj,motion,gen_motion,r},
+     {[arc,oval,polygon,rectangle],fill,gen_citem_fill,rw}].
diff --git a/lib/dialyzer/test/small_SUITE_data/src/guard_warnings.erl b/lib/dialyzer/test/small_SUITE_data/src/guard_warnings.erl
new file mode 100644
index 0000000000..6ab13eef9a
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/guard_warnings.erl
@@ -0,0 +1,118 @@
+%%
+%% A couple of tests for booleans in guards.
+%% Tests with suffix w have incomplete results due to weak dataflow.
+%% Tests with suffix ww have incomplete results due to weak dialyzer.
+%% Tests with suffix x should not give warnings.
+%%
+
+-module(and_bug).
+
+-compile(export_all).
+
+test1(X) when X and not X -> never.
+
+test2(X) when not X and X -> never.
+
+test3(X) when (X and not X) =:= true -> never.
+
+test4(X) when (not X and X) =:= true -> never.
+
+test5(X) when (X and not X) == true -> never.
+
+test6(X) when (not X and X) == true -> never.
+
+test7_w(X) when not (X or not X) -> never.
+
+test8_w(X) when not (not X or X) -> never.
+
+test9(X) when (X or not X) =:= false -> never.
+
+test10(X) when (not X or X) =:= false -> never.
+
+test11(X) when (X or not X) == false -> never.
+
+test12(X) when (not X or X) == false -> never.
+
+test13(X) when X and false -> never.
+
+test14(X) when false and X -> never.
+
+test15(X) when (X and false) =:= true -> never.
+
+test16(X) when (false and X) =:= true -> never.
+
+test17(X) when (X and false) == true -> never.
+
+test18(X) when (false and X) == true -> never.
+
+test19(X) when not (true or X) -> never.
+
+test20(X) when not (X or true) -> never.
+
+test21(X) when (true or X) =:= false -> never.
+
+test22(X) when (X or true) =:= false -> never.
+
+test23(X) when (true or X) == false -> never.
+
+test24(X) when (X or true) == false -> never.
+
+test25(X) when (false and X) -> never.
+
+test26(X) when (X and false) -> never.
+
+test27(X) when (false and X) =:= true -> never.
+
+test28(X) when (X and false) =:= true -> never.
+
+test29(X) when (false and X) == true -> never.
+
+test30(X) when (X and false) == true -> never.
+
+test31() when false and false -> never.
+
+test32() when (false and false) =:= true -> never.
+
+test33() when not (true and true) =:= true -> never.
+
+test34() when (false and false) == true -> never.
+
+test35() when not (true and true) == true -> never.
+
+test36() when false or false -> never.
+
+test37() when (false or false) =:= true -> never.
+
+test38() when not (false or false) =:= false -> never.
+
+test39() when (false or false) == true -> never.
+
+test40() when not (false or false) == false -> never.
+
+test41() when true =:= false -> never.
+
+test42() when true == false -> never.
+
+test43() when not (true =:= true) -> never.
+
+test44() when not (true == true) -> never.
+
+test45() when not (not (not (not (not (not (not true)))))) -> never.
+
+test46(X) when (X =:= true) and (X =:= false) -> never.
+
+test47(X) when (X == true) and (X == false) -> never.
+
+test48(X) when is_boolean(X) and (X =:= true) and (X =/= true) -> never.
+
+test49_x(X) when not (X or X) -> maybe.
+
+test50_x(X) when not (X and X) -> maybe.
+
+test51_x(X) when not (not X) -> maybe.
+
+test52_w(X) when is_boolean(X) and (X =/= true) and (X =:= true) -> never.
+
+test53_ww(X) when is_boolean(X) and (X =/= true) and (X =/= false) -> never.
+
+test54_w(X) when is_boolean(X) and not ((X =:= true) or (X =:= false)) -> never.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/guards.erl b/lib/dialyzer/test/small_SUITE_data/src/guards.erl
new file mode 100644
index 0000000000..34c43d6d12
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/guards.erl
@@ -0,0 +1,136 @@
+-module(guards).
+
+-compile([export_all]).
+
+-record(r, {f}).
+
+%% This is the reduced original test (no warnings)
+
+-define(g1(A), ((A#r.f =:= a) orelse (A#r.f =:= b))).
+
+t1(A) when     ?g1(A) -> ok;
+t1(A) when not ?g1(A) -> ko.
+
+%% This should emit a warning
+
+t1_s(A) when ?g1(A) -> ok.
+
+t1_s_a() ->
+    t1_s(#r{f=c}).
+
+%% Same as t1 with 'or' instead of 'orelse' (no warnings)
+
+-define(g2(A), ((A#r.f =:= a) or (A#r.f =:= b))).
+
+t2(A) when     ?g2(A) -> ok;
+t2(A) when not ?g2(A) -> ko.
+
+%% This should emit a warning
+
+t2_s(A) when ?g2(A) -> ok.
+
+t2_s_a() ->
+    t2_s(#r{f=c}).
+
+%% This could probably give a warning
+
+-define(g3(A), (A#r.f =:= a orelse is_atom(A))).
+
+t3(A) when     ?g3(A) -> ok;
+t3(A) when not ?g3(A) -> ko.
+
+%% This could probably give a warning as well
+
+-define(g4(A), ((A#r.f =:= a) or is_atom(A))).
+
+t4(A) when     ?g4(A) -> ok;
+t4(A) when not ?g4(A) -> ko.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Some shots in the dark on guard abuse %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Should give a warning
+
+t5(A) when is_atom(A) and is_integer(A) -> never.
+
+%% Should give the same warning as t5
+
+t6(A) when is_atom(A) andalso is_integer(A) -> never.
+
+%% Should give a warning
+
+t7(A) when is_atom(A) or is_integer(A) -> ok.
+
+at7(42) -> t7(42);
+at7('a') -> t7('a');
+at7({42}) -> t7({42}).
+
+%% Should give a warning
+
+t8(A) when is_atom(A) orelse is_integer(A) -> ok.
+
+at8(42) -> t8(42);
+at8('a') -> t8('a');
+at8({42}) -> t8({42}).
+
+%% Should give a warning
+
+t9(A) when is_atom(A) orelse is_integer(A) -> ok;
+t9(A) when is_atom(A) -> redundant.
+
+%% Should give a warning
+
+t10(A) when is_atom(A) or is_integer(A) -> ok;
+t10(A) when is_atom(A) -> redundant.
+
+%% Should give a warning
+
+t11(A, B) when is_atom(A) and is_atom(B) ->
+    case {is_atom(A), is_atom(B)} of
+	{true, true} -> ok;
+	_ -> redundant
+    end.
+
+%% Should give a warning
+
+t12(A, B) when is_atom(A) andalso is_atom(B) ->
+    case {is_atom(A), is_atom(B)} of
+	{true, true} -> ok;
+	_ -> redundant
+    end.
+
+%% Should give two warnings
+
+t13(A, B) when is_atom(A) or is_atom(B) ->
+    case {is_atom(A), is_atom(B)} of
+	{true , true } -> ok;
+	{true , false} -> ok;
+	{false, true } -> ok;
+	{false, false} -> never;
+	{_    , _    } -> even_more_never
+    end.
+
+%% Should give two warnings
+
+t14(A, B) when is_atom(A) orelse is_atom(B) ->
+    case {is_atom(A), is_atom(B)} of
+	{true , true } -> ok;
+	{true , false} -> ok;
+	{false, true } -> ok;
+	{false, false} -> never;
+	{_    , _    } -> even_more_never
+    end.
+
+%% Should give two warnings
+
+t15(A) when ((A =:= a) or (A =:= b)) and ((A =:= b) or (A =:= c)) -> ok.
+
+t15_a() -> t15(a), t15(b), t15(c).
+
+%% Should give two warnings
+
+t16(A) when ((A =:= a) orelse (A =:= b)) andalso
+	    ((A =:= b) orelse (A =:= c)) -> ok.
+
+t16_a() -> t16(a), t16(b), t16(c).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/inf_loop2.erl b/lib/dialyzer/test/small_SUITE_data/src/inf_loop2.erl
new file mode 100644
index 0000000000..6ac29116a5
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/inf_loop2.erl
@@ -0,0 +1,23 @@
+%%---------------------------------------------------------------------
+%% Module that went into an infinite loop when trying to assign types.
+%%
+%% What was happening is that for functions which are in an SCC but all
+%% return none(), a second chance was given to them by the analysis to
+%% see whether they return none() because they are involved in an loop
+%% (presumably server-related) and could be assigned the type unit()
+%% instead. The problem is that when the really return none() for some
+%% other reason (an error such in this case) then we will again find
+%% none() and try again for unit(), thereby entering an infinite loop.
+%% The issue was resolved on May 17th by adding an appropriate boolean
+%% parameter to dialyzer_typesig:solve_scc() function.
+%%---------------------------------------------------------------------
+-module(inf_loop2).
+
+-export([test/0]).
+
+test() ->
+  lists:reverse(gazonk),
+  loop().
+
+loop() ->
+  test().
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/invalid_specs/invalid_spec1.erl b/lib/dialyzer/test/small_SUITE_data/src/invalid_specs/invalid_spec1.erl
index 06ab2f9a22..06ab2f9a22 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/invalid_specs/invalid_spec1.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/invalid_specs/invalid_spec1.erl
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/invalid_specs/invalid_spec2.erl b/lib/dialyzer/test/small_SUITE_data/src/invalid_specs/invalid_spec2.erl
index e49f73d014..e49f73d014 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/invalid_specs/invalid_spec2.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/invalid_specs/invalid_spec2.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/letrec1.erl b/lib/dialyzer/test/small_SUITE_data/src/letrec1.erl
new file mode 100644
index 0000000000..eeea671bcc
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/letrec1.erl
@@ -0,0 +1,13 @@
+%%%-------------------------------------------------------------------
+%%% File    : letrec1.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created :  9 Mar 2007 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(letrec1).
+
+-export([t/1]).
+
+t(Opts) ->
+  [Opt || Opt <- Opts, Opt =/= compressed].
diff --git a/lib/dialyzer/test/small_SUITE_data/src/list_match.erl b/lib/dialyzer/test/small_SUITE_data/src/list_match.erl
new file mode 100644
index 0000000000..38ef6ef976
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/list_match.erl
@@ -0,0 +1,20 @@
+%%%-------------------------------------------------------------------
+%%% File    : list_match.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created : 12 Mar 2007 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(list_match).
+
+-export([t/0]).
+
+t() ->
+  t([1,2,3,4]).
+
+t([]) ->
+  ok;
+t([H|T]) when is_integer(H) ->
+  t(T);
+t([_|T]) ->
+  t(T).
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/lzip.erl b/lib/dialyzer/test/small_SUITE_data/src/lzip.erl
index 753d2939d8..753d2939d8 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/lzip.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/lzip.erl
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/make_tuple.erl b/lib/dialyzer/test/small_SUITE_data/src/make_tuple.erl
index 0a5edf8c24..0a5edf8c24 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/make_tuple.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/make_tuple.erl
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/minus_minus.erl b/lib/dialyzer/test/small_SUITE_data/src/minus_minus.erl
index f1e9483c40..f1e9483c40 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/minus_minus.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/minus_minus.erl
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/mod_info.erl b/lib/dialyzer/test/small_SUITE_data/src/mod_info.erl
index a24e4276ad..a24e4276ad 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/mod_info.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/mod_info.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/my_filter.erl b/lib/dialyzer/test/small_SUITE_data/src/my_filter.erl
new file mode 100644
index 0000000000..ecb2827eb4
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/my_filter.erl
@@ -0,0 +1,17 @@
+-module(my_filter).
+-export([test/0]).
+
+test() ->
+  filter(fun mystery/1, [1,2,3,4]).
+
+filter(Pred, List) when is_function(Pred, 1) ->
+  [ E || E <- List, Pred(E) ].
+
+mystery(X) ->
+  case (X rem 3) of
+    0 -> true;
+    1 -> false;
+    2 -> gazonk
+  end.
+
+%% mystery(_X,_Y) -> true.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/my_sofs.erl b/lib/dialyzer/test/small_SUITE_data/src/my_sofs.erl
new file mode 100644
index 0000000000..e3ae99ebbc
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/my_sofs.erl
@@ -0,0 +1,83 @@
+%% Program showing the problems with record field accesses.
+
+-module(my_sofs).
+-export([ordset_of_sets/3, is_equal/2]).
+
+-define(TAG, 'Set').
+-define(ORDTAG, 'OrdSet').
+
+-record(?TAG, {data = [], type = type}).
+-record(?ORDTAG, {orddata = {}, ordtype = type}).
+
+-define(LIST(S), (S)#?TAG.data).
+-define(TYPE(S), (S)#?TAG.type).
+-define(SET(L, T), #?TAG{data = L, type = T}).
+-define(IS_SET(S), record(S, ?TAG)).
+
+%% Ordered sets and atoms:
+-define(ORDDATA(S), (S)#?ORDTAG.orddata).
+-define(ORDTYPE(S), (S)#?ORDTAG.ordtype).
+-define(ORDSET(L, T), #?ORDTAG{orddata = L, ordtype = T}).
+-define(IS_ORDSET(S), record(S, ?ORDTAG)).
+
+%% When IS_SET is true:
+-define(ANYTYPE, '_').
+-define(REL_TYPE(I, R), element(I, R)).
+-define(SET_OF(X), [X]).
+
+is_equal(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    case match_types(?TYPE(S1), ?TYPE(S2)) of
+        true  -> ?LIST(S1) == ?LIST(S2);
+        false -> erlang:error(type_mismatch, [S1, S2])
+    end;
+is_equal(S1, S2) when ?IS_ORDSET(S1), ?IS_ORDSET(S2) ->
+    case match_types(?TYPE(S1), ?TYPE(S2)) of
+        true  -> ?ORDDATA(S1) == ?ORDDATA(S2);
+        false -> erlang:error(type_mismatch, [S1, S2])
+    end;
+is_equal(S1, S2) when ?IS_SET(S1), ?IS_ORDSET(S2) ->
+    erlang:error(type_mismatch, [S1, S2]);
+is_equal(S1, S2) when ?IS_ORDSET(S1), ?IS_SET(S2) ->
+    erlang:error(type_mismatch, [S1, S2]).
+
+%% Type = OrderedSetType
+%%      | SetType
+%%      | atom() except '_'
+%% OrderedSetType = {Type, ..., Type}
+%% SetType = [ElementType]           % list of exactly one element
+%% ElementType = '_'                 % any type (implies empty set)
+%%             | Type
+
+ordset_of_sets([S | Ss], L, T) when ?IS_SET(S) ->
+    ordset_of_sets(Ss, [?LIST(S) | L], [[?TYPE(S)] | T]);
+ordset_of_sets([S | Ss], L, T) when ?IS_ORDSET(S) ->
+    ordset_of_sets(Ss, [?LIST(S) | L], [?ORDTYPE(S) | T]);
+ordset_of_sets([], L, T) ->
+    ?ORDSET(list_to_tuple(lists:reverse(L)), list_to_tuple(lists:reverse(T)));
+ordset_of_sets(_, _L, _T) ->
+    error.
+
+%% inlined.
+match_types(T, T) -> true;
+match_types(Type1, Type2) -> match_types1(Type1, Type2).
+
+match_types1(Atom, Atom) when is_atom(Atom) ->
+    true;
+match_types1(?ANYTYPE, _) ->
+    true;
+match_types1(_, ?ANYTYPE) ->
+    true;
+match_types1(?SET_OF(Type1), ?SET_OF(Type2)) ->
+    match_types1(Type1, Type2);
+match_types1(T1, T2) when tuple(T1), tuple(T2), size(T1) =:= size(T2) ->
+    match_typesl(size(T1), T1, T2);
+match_types1(_T1, _T2) ->
+    false.
+
+match_typesl(0, _T1, _T2) ->
+    true;
+match_typesl(N, T1, T2) ->
+    case match_types1(?REL_TYPE(N, T1), ?REL_TYPE(N, T2)) of
+        true  -> match_typesl(N-1, T1, T2);
+        false -> false
+    end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/no_match.erl b/lib/dialyzer/test/small_SUITE_data/src/no_match.erl
index e3e7a4b2d1..e3e7a4b2d1 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/no_match.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/no_match.erl
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/no_unused_fun.erl b/lib/dialyzer/test/small_SUITE_data/src/no_unused_fun.erl
index 0bd8ba402c..0bd8ba402c 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/no_unused_fun.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/no_unused_fun.erl
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/no_unused_fun2.erl b/lib/dialyzer/test/small_SUITE_data/src/no_unused_fun2.erl
index e287c4de5f..e287c4de5f 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/no_unused_fun2.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/no_unused_fun2.erl
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/non_existing.erl b/lib/dialyzer/test/small_SUITE_data/src/non_existing.erl
index 5701b8a745..5701b8a745 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/non_existing.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/non_existing.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/none_scc_inf_loop.erl b/lib/dialyzer/test/small_SUITE_data/src/none_scc_inf_loop.erl
new file mode 100644
index 0000000000..111758965c
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/none_scc_inf_loop.erl
@@ -0,0 +1,21 @@
+%%===========================================================================
+%% Test that made dialyzer go into an infinite loop. The reason was that
+%% t_inf(t_unit(), t_none()) returned t_unit() instead of t_none() as it
+%% should. The issue was identified and fixed by Stavros Aronis on 5/11/2010.
+%%===========================================================================
+-module(none_scc_inf_loop).
+
+-export([foo/0]).
+
+foo() ->
+    foo(3).
+
+foo(0) ->
+    exit(foo);
+foo(N) ->
+    bar(N-1).
+
+bar(0) ->
+    exit(foo);
+bar(N) ->
+    foo(N-1).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/not_bogus_warning.erl b/lib/dialyzer/test/small_SUITE_data/src/not_bogus_warning.erl
new file mode 100644
index 0000000000..53f7e934e4
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/not_bogus_warning.erl
@@ -0,0 +1,25 @@
+%%-----------------------------------------------------------------------------
+%% Test which produces an erroneous warning:
+%%   Guard test is_atom(A::'bar' | 'foo') can never succeed
+%% due to the handling of not which of course succeeds when its argument fails
+%%-----------------------------------------------------------------------------
+-module(not_bogus_warning).
+
+-export([t1/0, t2/0, t3/0, t4/0]).
+
+t1() ->
+  [A || A <- [foo, bar], not is_atom(A)].
+
+t2() ->
+  [A || A <- [foo, bar], not is_integer(A)].
+
+t3() ->
+  should_we_warn_here(42).
+
+should_we_warn_here(X) when is_integer(X) -> int.
+
+t4() ->
+  should_we_warn_or_not(42).
+
+should_we_warn_or_not(X) when not is_integer(X) -> not_int;
+should_we_warn_or_not(X) -> int.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/not_guard_crash.erl b/lib/dialyzer/test/small_SUITE_data/src/not_guard_crash.erl
new file mode 100644
index 0000000000..75bcffc2bc
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/not_guard_crash.erl
@@ -0,0 +1,49 @@
+%% From: Matthias Radestock <[email protected]>
+%% Date: 19 August 2007
+%%
+%% when I run dialyzer on my code it throws the following error:
+%%
+%% Analysis failed with error report:
+%%         {{case_clause,any},
+%%          [{dialyzer_dataflow,bind_guard,5},
+%%           {dialyzer_dataflow,bind_guard_case_clauses,6},
+%%           {dialyzer_dataflow,bind_guard,5},
+%%           {dialyzer_dataflow,bind_guard_case_clauses,6},
+%%           {dialyzer_dataflow,bind_guard,5},
+%%           {dialyzer_dataflow,bind_eqeq_guard_lit_other,6},
+%%           {dialyzer_dataflow,bind_guard,...},
+%%           {dialyzer_dataflow,...}]}
+%%
+%% This is happening with the R11B-5 version of dialyzer when
+%% analyzing the attached file.
+%%--------------------------------------------------------------------
+
+-module(not_guard_crash).
+
+-export([match_ticket/2]).
+
+-record(ticket, {passive_flag, active_flag, write_flag, read_flag}).
+
+%%--------------------------------------------------------------------
+
+match_ticket(#ticket{passive_flag = PP,
+                     active_flag  = PA,
+                     write_flag   = PW,
+                     read_flag    = PR},
+             #ticket{passive_flag = TP,
+                     active_flag  = TA,
+                     write_flag   = TW,
+                     read_flag    = TR}) ->
+    if
+        %% Matches if either we're not requesting passive access, or
+        %% passive access is permitted, and ...
+        (not(TP) orelse PP) andalso
+        (not(TA) orelse PA) andalso
+        (not(TW) orelse PW) andalso
+        (not(TR) orelse PR) ->
+            match;
+        true ->
+            no_match
+    end.
+
+%%--------------------------------------------------------------------
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/or_bug.erl b/lib/dialyzer/test/small_SUITE_data/src/or_bug.erl
index fb8f6558b8..fb8f6558b8 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/or_bug.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/or_bug.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/orelsebug.erl b/lib/dialyzer/test/small_SUITE_data/src/orelsebug.erl
new file mode 100644
index 0000000000..8479fc33cc
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/orelsebug.erl
@@ -0,0 +1,16 @@
+%%%-------------------------------------------------------------------
+%%% File    : orelsebug.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created : 14 Nov 2006 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(orelsebug).
+
+-export([t/1, t1/1]).
+
+t(Format) when is_list(Format) ->
+   t1(Format).
+
+t1(Format) when is_list(Format) orelse is_binary(Format) ->
+   Format.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/orelsebug2.erl b/lib/dialyzer/test/small_SUITE_data/src/orelsebug2.erl
new file mode 100644
index 0000000000..60e0c47384
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/orelsebug2.erl
@@ -0,0 +1,23 @@
+%%%-------------------------------------------------------------------
+%%% File    : orelsebug2.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created : 21 Nov 2006 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(orelsebug2).
+
+-export([t/1]).
+
+-record(eventdata, {
+	  expires
+	 }).
+
+t(L) ->
+  L2 = [E1 || E1 <- L, E1#eventdata.expires == x
+			orelse E1#eventdata.expires == y],
+
+  case L2 of
+    [_E] -> x;
+    [] ->  y
+  end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/overloaded1.erl b/lib/dialyzer/test/small_SUITE_data/src/overloaded1.erl
index 0af4f7446f..0af4f7446f 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/overloaded1.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/overloaded1.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/param_types_crash.erl b/lib/dialyzer/test/small_SUITE_data/src/param_types_crash.erl
new file mode 100644
index 0000000000..52d52cc9a9
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/param_types_crash.erl
@@ -0,0 +1,77 @@
+%%---------------------------------------------------------------------------
+%% From: Nicolas Tranger <[email protected]>
+%% Date: 10/11/2110
+%%
+%% After adding spec statements to my module, Dialyzer failed on execution
+%% though. I've been trying to create a minimal reproducible case and
+%% reduced the code to something similar of about 80 LOC.  As noted in the
+%% comments, commenting out some lines makes Dialyzer parse and analyze
+%% the file correctly.  The code executes correctly and as expected.
+%%
+%% I'm not sure what causes the issue. parse_result is polymorphic in its
+%% return type, but statically typed based on the type of the 3th argument
+%% (well, that's how I see things from a Haskell background).
+%%---------------------------------------------------------------------------
+%% This was a bug in erl_types:t_subtract/2 which was not handling the case
+%% of free variables in prameterized types. Fixed 15/10/2010.
+%%---------------------------------------------------------------------------
+-module(param_types_crash).
+
+-export([test/0]).
+
+-type socket_error() :: 'connection_closed' | 'timeout'.
+-type app_error() :: 'no_magic' | 'unknown_failure'.
+
+-type resulthandler_result(T) :: {'ok', T} | socket_error() | app_error().
+-type resulthandler(T) :: fun((binary()) -> resulthandler_result(T)).
+
+test() ->
+  Data = <<0:32/little-unsigned, 1:8/little, 1:8/little-unsigned>>,
+  case parse_result(Data, get_option(fun get_bool/1)) of
+	%% Removing the next 2 lines makes
+	%% dialyzer param_types_crash.erl -Wunmatched_returns -Wunderspecs
+	%% succeed. With these lines, it fails.
+	{ok, none} -> none;
+	{ok, {some, Value}} -> Value;
+	Reply -> {error, Reply}
+  end.
+
+-spec parse_result(binary(), resulthandler(T)) -> resulthandler_result(T).
+parse_result(<<ResultCode:32/little-unsigned, Rest/binary>>, ResultHandler) ->
+  case ResultCode of
+	0 -> ResultHandler(Rest);
+	1 -> no_magic;
+	2 -> unknown_failure
+  end.
+
+-spec get_bool(binary()) -> {'ok', boolean()} | socket_error().
+get_bool(Data) ->
+  case get_data(Data, 1, size(Data)) of
+    {<<Value:8/little-unsigned>>, <<>>} -> {ok, (Value =:= 1)};
+    Other -> Other
+  end.
+
+-spec get_option(resulthandler(T)) -> resulthandler('none' | {'some', T}).
+get_option(Fun) ->
+  fun(Data) ->
+      case get_data(Data, 1, size(Data)) of
+	{<<HasValue:8/little>>, Rest} ->
+	  case HasValue of
+	    0 -> {ok, none};
+	    1 -> {ok, Value} = Fun(Rest),
+		 {ok, {some, Value}}
+	   end;
+	Other -> Other
+      end
+    end.
+
+-spec get_data(binary(), non_neg_integer(), non_neg_integer()) ->
+	{binary(), binary()} | socket_error().
+get_data(Data, Length, Received) when Length > Received ->
+    case Data of
+      <<>> -> connection_closed;
+      _ -> timeout
+    end;
+get_data(Data, Length, _) ->
+    <<Bin:Length/binary, Rest/binary>> = Data,
+    {Bin, Rest}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
new file mode 100644
index 0000000000..2ee9a3a6e2
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
@@ -0,0 +1,33 @@
+%%
+%% Tests hardcoded dependent type info
+%% and the quality of the warnings that Dialyzer spits out
+%%
+-module(port_info_test).
+-export([t1/1, t2/1, t3/1, t4/1, t5/2, buggy/1]).
+
+%% The following errors are correctly caught, but the messages are a bit weird
+t1(X) when is_port(X) ->
+  {connected, 42} = erlang:port_info(X, connected);
+t1(_) -> ok.
+
+t2(X) when is_port(X) ->
+  {registered_name, "42"} = erlang:port_info(X, registered_name);
+t2(_) -> ok.
+
+%% Here only one od the two errors is reported...
+t3(X) when is_atom(X) ->
+  {output, 42} = erlang:port_info(X, connected);
+t3(_) -> ok.
+
+t4(X) when is_atom(X) ->
+  {Atom, _} = erlang:port_info(X, connected),
+  Atom = links;
+t4(_) -> ok.
+
+t5(X, Atom) when is_port(X) ->
+  {gazonk, _} = erlang:port_info(X, Atom);
+t5(_, _) -> ok.
+
+%% The type system is not strong enough to catch the following errors
+buggy(X) when is_atom(X) ->
+  {links, X} = erlang:port_info(foo, X).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/process_info_test.erl b/lib/dialyzer/test/small_SUITE_data/src/process_info_test.erl
new file mode 100644
index 0000000000..2c24ae597f
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/process_info_test.erl
@@ -0,0 +1,20 @@
+%%
+%% Tests hardcoded dependent type info for process_info/1
+%%
+-module(process_info_test).
+-export([pinfo/1]).
+
+pinfo(P) when node(P) == node() ->  % On same node
+  case process_info(P) of
+    undefined ->
+      exit(dead);
+    Info -> Info
+  end;
+pinfo(P) ->                         % On different node
+  case rpc:call(node(P), erlang, process_info, [P]) of
+    {badrpc, _} ->
+      exit(badrpc);
+    undefined ->           % This does happen
+      exit(dead);
+    Info -> Info
+  end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/pubsub/pubsub_api.erl b/lib/dialyzer/test/small_SUITE_data/src/pubsub/pubsub_api.erl
new file mode 100644
index 0000000000..85ea292077
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/pubsub/pubsub_api.erl
@@ -0,0 +1,99 @@
+%  Copyright 2007-2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%
+%   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.
+%%%-------------------------------------------------------------------
+%%% File    : pubsub_api.erl
+%%% Author  : Thorsten Schuett <[email protected]>
+%%% Description : Publish API function
+%%%
+%%% Created : 17 Sep 2007 by Thorsten Schuett <[email protected]>
+%%%-------------------------------------------------------------------
+%% @author Thorsten Schuett <[email protected]>
+%% @copyright 2007-2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%% @version $Id $
+-module(pubsub_dir.pubsub_api).
+
+-author('[email protected]').
+-vsn('$Id: pubsub_api.erl,v 1.1 2009/11/06 12:39:55 maria Exp $ ').
+
+-export([publish/2, subscribe/2, unsubscribe/2, get_subscribers/1]).
+
+-import(transstore.transaction_api).
+-import(io).
+-import(lists).
+
+%%====================================================================
+%% public functions
+%%====================================================================
+
+%% @doc publishs an event under a given topic.
+%%      called e.g. from the java-interface
+%% @spec publish(string(), string()) -> ok
+publish(Topic, Content) ->
+    Subscribers = get_subscribers(Topic),
+    io:format("calling subscribers ~p~n", [Subscribers]),
+    lists:foreach(fun (Subscriber) ->
+			  io:format("calling ~p~n", [Subscriber]),
+			  pubsub_publish:publish(Subscriber, Topic, Content)
+		  end,
+		  Subscribers),
+    ok.
+
+%% @doc subscribes a url for a topic.
+%%      called e.g. from the java-interface
+%% @spec subscribe(string(), string()) -> ok | {fail, term()}
+subscribe(Topic, URL) ->
+    TFun = fun(TransLog) ->
+		   {{Success, _ValueOrReason} = Result, TransLog1} = transaction_api:read(Topic, TransLog),
+		   {Result2, TransLog2} = if
+		       Success == fail ->
+			   transaction_api:write(Topic, [URL], TransLog); %obacht: muss TransLog sein!
+		       true ->
+			   {value, Subscribers} = Result,
+			   transaction_api:write(Topic, [URL | Subscribers], TransLog1)
+		   end,
+		   if
+		       Result2 == ok ->
+			   {{ok, ok}, TransLog2};
+		       true ->
+			   {Result2, TransLog2}
+		   end
+	   end,
+    transaction_api:do_transaction(TFun, fun (_) -> ok end, fun (X) -> {fail, X} end).
+
+%% @doc unsubscribes a url for a topic.
+-spec(unsubscribe/2 :: (string(), string()) -> ok | {fail, any()}).
+unsubscribe(Topic, URL) ->
+    TFun = fun(TransLog) ->
+		   {Subscribers, TransLog1} = transaction_api:read2(TransLog, Topic),
+		   case lists:member(URL, Subscribers) of
+		       true ->
+			   NewSubscribers = lists:delete(URL, Subscribers),
+			   TransLog2 = transaction_api:write2(TransLog1, Topic, NewSubscribers),
+			   {{ok, ok}, TransLog2};
+		       false ->
+			   {{fail, not_found}, TransLog}
+		   end
+	   end,
+    transaction_api:do_transaction(TFun, fun (_) -> ok end, fun (X) -> {fail, X} end).
+
+%% @doc queries the subscribers of a query
+%% @spec get_subscribers(string()) -> [string()]
+get_subscribers(Topic) ->
+    {Fl, _Value} = transaction_api:quorum_read(Topic),
+    if
+	Fl == fail -> %% Fl is either Fail or the Value/Subscribers
+	    [];
+	true ->
+	    Fl
+    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/pubsub/pubsub_publish.erl b/lib/dialyzer/test/small_SUITE_data/src/pubsub/pubsub_publish.erl
new file mode 100644
index 0000000000..601dbad74b
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/pubsub/pubsub_publish.erl
@@ -0,0 +1,49 @@
+%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%
+%   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.
+%%%-------------------------------------------------------------------
+%%% File    : pubsub_publish.erl
+%%% Author  : Thorsten Schuett <[email protected]>
+%%% Description : Publish function
+%%%
+%%% Created : 26 Mar 2008 by Thorsten Schuett <[email protected]>
+%%%-------------------------------------------------------------------
+%% @author Thorsten Schuett <[email protected]>
+%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
+%% @version $Id $
+-module(pubsub_dir.pubsub_publish).
+
+-author('[email protected]').
+-vsn('$Id: pubsub_publish.erl,v 1.1 2009/11/06 12:39:55 maria Exp $ ').
+
+-export([publish/3, publish_internal/3]).
+
+-import(json).
+-import(io).
+-import(http).
+-import(jsonrpc).
+
+%%====================================================================
+%% public functions
+%%====================================================================
+
+%% @doc publishs an event to a given url.
+%% @spec publish(string(), string(), string()) -> ok
+%% @todo use pool:pspawn
+publish(URL, Topic, Content) ->
+    spawn(fun () -> pubsub_publish:publish_internal(URL, Topic, Content) end),
+    ok.
+
+publish_internal(URL, Topic, Content) ->
+    Res = jsonrpc:call(URL, [], {call, notify, [Topic, Content]}),
+    io:format("~p ~p~n", [Res, URL]).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/receive1.erl b/lib/dialyzer/test/small_SUITE_data/src/receive1.erl
new file mode 100644
index 0000000000..96fdf54e4d
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/receive1.erl
@@ -0,0 +1,16 @@
+%%%-------------------------------------------------------------------
+%%% File    : receive1.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created : 27 Mar 2007 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(receive1).
+
+-export([t/1]).
+
+t(X) ->
+  receive
+  after
+    infinity -> X
+  end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/record_construct.erl b/lib/dialyzer/test/small_SUITE_data/src/record_construct.erl
new file mode 100644
index 0000000000..54cc2601bd
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/record_construct.erl
@@ -0,0 +1,21 @@
+-module(record_construct).
+-export([t_loc/0, t_opa/0, t_rem/0]).
+
+-record(r_loc, {a = gazonk :: integer(), b = 42 :: atom()}).
+
+t_loc() ->
+  #r_loc{}.
+
+-record(r_opa, {a                 :: atom(),
+		b = gb_sets:new() :: gb_set(),
+		c = 42            :: boolean(),
+		d,	% untyped on purpose
+		e = false         :: boolean()}).
+
+t_opa() ->
+  #r_opa{}.
+
+-record(r_rem, {a = gazonk :: string()}).
+
+t_rem() ->
+  #r_rem{}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/record_pat.erl b/lib/dialyzer/test/small_SUITE_data/src/record_pat.erl
new file mode 100644
index 0000000000..3308641571
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/record_pat.erl
@@ -0,0 +1,15 @@
+%%%-------------------------------------------------------------------
+%%% File    : record_pat.erl
+%%% Author  : Tobias Lindahl <>
+%%% Description : Emit warning if a pattern violates the record type
+%%%
+%%% Created : 21 Oct 2008 by Tobias Lindahl <>
+%%%-------------------------------------------------------------------
+-module(record_pat).
+
+-export([t/1]).
+
+-record(foo, {bar :: integer()}).
+
+t(#foo{bar=baz}) -> no_way;
+t(#foo{bar=1}) -> ok.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/record_send_test.erl b/lib/dialyzer/test/small_SUITE_data/src/record_send_test.erl
new file mode 100644
index 0000000000..87cd97bd85
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/record_send_test.erl
@@ -0,0 +1,32 @@
+%%-------------------------------------------------------------------
+%% File    : record_send_test.erl
+%% Author  : Kostis Sagonas <[email protected]>
+%% Description : A test inspired by a post of Mkcael Remond to the
+%%		 Erlang mailing list suggesting thst Dialyzer should
+%%		 be reporting sends to records rather than to pids.
+%%		 Dialyzer v1.3.0 indeed reports one of the dicrepancies
+%%		 (the one with the 4-tuple) but not the one where the
+%%		 message is sent to a pair which is a record.
+%%		 This should be fixed.
+%%
+%% Created : 10 Apr 2005 by Kostis Sagonas <[email protected]>
+%%-------------------------------------------------------------------
+-module(record_send_test).
+
+-export([t/0]).
+
+-record(rec1, {a=a, b=b, c=c}).
+-record(rec2, {a}).
+
+t() ->
+  t(#rec1{}).
+
+t(Rec1 = #rec1{b=B}) ->
+  Rec2 = some_mod:some_function(),
+  if
+    is_record(Rec2, rec2) ->
+      Rec2 ! hello;	%% currently this one is not found
+    true ->
+      Rec1 ! hello_again
+  end,
+  B.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/record_test.erl b/lib/dialyzer/test/small_SUITE_data/src/record_test.erl
new file mode 100644
index 0000000000..48a00b172e
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/record_test.erl
@@ -0,0 +1,22 @@
+%%%-------------------------------------------------------------------
+%%% File    : record_test.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created : 22 Oct 2004 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(record_test).
+
+-export([t/0]).
+
+-record(foo, {bar}).
+
+t() ->
+  doit(foo).
+
+doit(X) ->
+  case X of
+    #foo{} -> error1;
+    foo -> ok;
+    _ -> error2
+  end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types1.erl b/lib/dialyzer/test/small_SUITE_data/src/recursive_types1.erl
index 657d11653b..657d11653b 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types1.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/recursive_types1.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/recursive_types2.erl b/lib/dialyzer/test/small_SUITE_data/src/recursive_types2.erl
new file mode 100644
index 0000000000..7985d5fb4b
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/recursive_types2.erl
@@ -0,0 +1,12 @@
+-module(recursive_types2).
+
+-export([test/0]).
+
+-type tree() :: 'nil' | {non_neg_integer(), subtree(), subtree()}.
+
+-type subtree() :: tree().
+
+-spec test() -> {42, tree(), tree()}.
+
+test() ->
+  {42, {42, nil, nil}, {42, {42, nil, nil}, {42, nil, nil}}}.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types3.erl b/lib/dialyzer/test/small_SUITE_data/src/recursive_types3.erl
index 997678ac92..997678ac92 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types3.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/recursive_types3.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/recursive_types4.erl b/lib/dialyzer/test/small_SUITE_data/src/recursive_types4.erl
new file mode 100644
index 0000000000..f6b5f87e04
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/recursive_types4.erl
@@ -0,0 +1,13 @@
+-module(recursive_types4).
+
+-export([test/0]).
+
+-record(tree,   {node         :: atom(),
+		 kid = nil    :: 'nil' | tree()}).
+
+-type tree() :: #tree{}.
+
+-spec test() -> tree().
+
+test() ->
+  #tree{node = root, kid = #tree{}}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/recursive_types5.erl b/lib/dialyzer/test/small_SUITE_data/src/recursive_types5.erl
new file mode 100644
index 0000000000..cd1cd5ede9
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/recursive_types5.erl
@@ -0,0 +1,13 @@
+-module(recursive_types5).
+
+-export([test/0]).
+
+-type tree() :: 'nil' | {non_neg_integer(), tree(), tree()}.
+
+-record(tree,   {node         :: atom(),
+		 kid = 'nil'  :: tree()}).
+
+-spec test() -> #tree{}.
+
+test() ->
+  #tree{node = root, kid = {42, {42, nil, nil}, {42, nil, nil}}}.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types6.erl b/lib/dialyzer/test/small_SUITE_data/src/recursive_types6.erl
index ff61976736..ff61976736 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types6.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/recursive_types6.erl
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types7.erl b/lib/dialyzer/test/small_SUITE_data/src/recursive_types7.erl
index 92106e9694..92106e9694 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types7.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/recursive_types7.erl
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/refine_bug1.erl b/lib/dialyzer/test/small_SUITE_data/src/refine_bug1.erl
index 1b299e782a..1b299e782a 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/refine_bug1.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/refine_bug1.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/refine_failing.erl b/lib/dialyzer/test/small_SUITE_data/src/refine_failing.erl
new file mode 100644
index 0000000000..243f4806e6
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/refine_failing.erl
@@ -0,0 +1,26 @@
+%% This testcase shows why it's a bad idea to block refinement (by forwarding
+%% any() to all arguments) when a failing call is encountered. The initial
+%% success typing for update_one allows anything to be an element of the list in
+%% the second argument. This will be refined during dataflow by the result from
+%% add_counters to just a list of tuples. This will cause the call in the second
+%% clause of update_one to fail correctly and identify the discrepancy. It could
+%% be a better idea to refuse to add the failing calls but this may lead to a
+%% ton of unused functions,
+%%
+%% by Stavros Aronis<[email protected]>
+
+-module(refine_failing).
+
+-export([foo/2]).
+
+foo(A, B) -> update_all(add_counters(A, []), B).
+
+add_counters(   [], Acc) -> Acc;
+add_counters([H|T], Acc) -> add_counters(T, [{H, 0}|Acc]).
+
+update_all(Ds,     []) -> Ds;
+update_all(Ds, [F|Fs]) -> update_all(update_one(F, Ds, []), Fs).
+
+update_one(_F,           [], Acc) -> Acc;
+update_one( F, [{F, Cr},Ds], Acc) -> update_one(F, Ds, [{F,Cr+1}|Acc]);
+update_one( F, [      D|Ds], Acc) -> update_one(F, Ds, [       D|Acc]).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/toth.erl b/lib/dialyzer/test/small_SUITE_data/src/toth.erl
new file mode 100644
index 0000000000..bae22be4f1
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/toth.erl
@@ -0,0 +1,99 @@
+-module(toth).
+-export([sys_table_view/1]).
+
+%%% Constants
+-define(sysTabETS,1).
+-define(sysTabMnesia,2).
+-define(sysTabBoth,3).
+
+sys_table_view([CpId,{match,Pattern},TableType, ViewType]) ->
+    AllTableList =
+	case TableType of
+	    ?sysTabMnesia ->
+		lists:sort(mnesia:system_info(tables));
+	    ?sysTabBoth ->
+		lists:sort(rpc:call(CpId,ets,all,[]));
+	    ?sysTabETS ->
+		lists:sort(rpc:call(CpId,ets,all,[]) --
+			   mnesia:system_info(tables));
+	    _ -> %%% Happens at registration only
+		[ok]
+    end,
+    %% Filter the matching table names, skip unnamed tables first:
+    NamedTableList = lists:filter(fun (X) -> is_atom(X) end, AllTableList),
+    TablesShown =
+	case Pattern of
+	    "" ->
+		NamedTableList;
+	    _ ->
+		%% Filter the ones whose name begins with the Pattern:
+		Filter = fun(T) ->
+				 lists:prefix(Pattern, atom_to_list(T))
+			 end,
+		lists:filter(Filter, NamedTableList)
+	end,
+
+    Fields = [{text, [{value,"CpId: " ++ atom_to_list(CpId)}]},
+	      {text, [{value,"TabSpec=" ++ Pattern},
+		      {value_format, term}]},
+	      {text, [{value,"Table type: " ++ formatTableType(TableType)},
+		      {value_format, term}]}],
+
+    Template = [[{type, index},
+		 {link, {?MODULE, sys_table_browse,
+			 [{"CpId",CpId},{"TableType",TableType},
+			  {"View", ViewType},
+			  {"FirstKey",1}, {"KeyPattern",""}]}}],
+
+		[{type, data},
+		 {title, "Table name"},
+		 {display_value, {erlang, atom_to_list}}], %%% else crash
+
+                [{type,data},
+		 {title, "No of rows"},
+		 {display_value, term}],
+
+                [{type,data},
+		 {title, "Memory"},
+		 {display_value, term}]
+	       ],
+
+    TableAttr = [{rows, [[T,T|tableSize(T,TableType,CpId)] ||
+			    T <- TablesShown]},
+		 {template,Template}],
+
+    Page = [{header, {"Filter tables", "Selected tables"}},
+	    {buttons, [reload, back]},
+	    {layout, [{form, Fields},
+		      {table, TableAttr}]}
+	   ],
+    Page.
+
+%%--------------------------------------------------------------------
+%% tableSize/3
+%% @spec tableSize(T::atom(),TableType::integer(),CpId::atom()) ->
+%%                 list(integer())
+%% @doc Return the table size and memory size of the table.
+%% @end
+%%---------------------------------------------------------------------
+
+tableSize(T, TableType, CpId) ->
+    case TableType of
+        ?sysTabETS ->
+	    [rpc:call(CpId, ets, info, [T, size]),
+	     rpc:call(CpId, ets, info, [T, memory])];
+	?sysTabMnesia ->
+            [mnesia:table_info(T, size),mnesia:table_info(T, memory)];
+	_ -> %%% Registration
+	    [0,0]
+    end.
+
+formatTableType(T) ->
+    case T of
+	?sysTabETS ->
+	    "ETS";
+	?sysTabMnesia ->
+            "mnesia";
+	_ -> %%% Registration !
+	    "ETS + mnesia"
+    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/trec.erl b/lib/dialyzer/test/small_SUITE_data/src/trec.erl
new file mode 100644
index 0000000000..ba50c3b401
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/trec.erl
@@ -0,0 +1,37 @@
+%%
+%% The current treatment of typed records leaves much to be desired.
+%% These are not made up examples; I have cases like that the branch
+%% of the HiPE compiler with types in records. I get very confusing
+%% warnings which require a lot of effort to find their cause and why
+%% a function has no local return.
+%%
+-module(trec).
+-export([test/0, mk_foo_exp/2]).
+
+-record(foo, {a :: integer(), b :: [atom()]}).
+
+%%
+%% For these functions we currently get the following warnings:
+%%   1. Function test/0 has no local return
+%%   2. The call trec:mk_foo_loc(42,any()) will fail since it differs
+%%      in argument position 1 from the success typing arguments:
+%%      ('undefined',atom())
+%%   3. Function mk_foo_loc/2 has no local return
+%%
+%% Arguably, the second warning is not what most users have in mind
+%% when they wrote the type declarations in the 'foo' record, so no
+%% doubt they'll find it confusing. But note that it is also inconsistent!
+%% How come there is a success typing for a function that has no local return?
+%%
+test() ->
+   mk_foo_loc(42, bar:f()).
+
+mk_foo_loc(A, B) ->
+    #foo{a = A, b = [A,B]}.
+
+%%
+%% For this function we currently get "has no local return" but we get
+%% no reason; I want us to get a reason.
+%%
+mk_foo_exp(A, B) when is_integer(A) ->
+    #foo{a = A, b = [A,B]}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/try1.erl b/lib/dialyzer/test/small_SUITE_data/src/try1.erl
new file mode 100644
index 0000000000..05963a16af
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/try1.erl
@@ -0,0 +1,26 @@
+%%%-------------------------------------------------------------------
+%%% File    : try1.erl
+%%% Author  :  <[email protected]>
+%%% Description :
+%%%
+%%% Created : 23 Aug 2005 by  <[email protected]>
+%%%-------------------------------------------------------------------
+-module(try1).
+
+-export([t/1]).
+
+t(X) ->
+  case wierd_is_bool(X) of
+    true -> ok;
+    false -> ok
+  end.
+
+wierd_is_bool(X) ->
+  try bool(X) of
+      Y -> Y
+  catch
+    _:_  -> false
+  end.
+
+bool(true) -> true;
+bool(false) -> true.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/tuple1.erl b/lib/dialyzer/test/small_SUITE_data/src/tuple1.erl
new file mode 100644
index 0000000000..d608275efe
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/tuple1.erl
@@ -0,0 +1,29 @@
+%%%-------------------------------------------------------------------
+%%% File    : tuple1.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description : Exposed two bugs in the analysis;
+%%%               one supressed warning and one crash.
+%%%
+%%% Created : 13 Nov 2006 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(tuple1).
+
+-export([t1/2, t2/2, t3/2, bar/2]).
+
+t1(List = [_|_], X) ->
+  lists:mapfoldl(fun foo/2, X, List).
+
+t2(List = [_|_], X) ->
+  lists:mapfoldl(fun bar/2, X, List).
+
+t3(List = [_|_], X) ->
+  lists:mapfoldl(fun baz/1, X, List).
+
+
+foo(1, 1) -> a;
+foo(a, 1) -> b.
+
+bar(1, 1) -> {b, b};
+bar(a, 1) -> {a, a}.
+
+baz(1) -> 1.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/tuple_set_crash.erl b/lib/dialyzer/test/small_SUITE_data/src/tuple_set_crash.erl
new file mode 100644
index 0000000000..5503f39412
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/tuple_set_crash.erl
@@ -0,0 +1,207 @@
+%% ====================================================================
+%% Program which resulted in an erl_types crash due to incomplete
+%% handling of tuple_sets in function inf_tuples_in_sets/4.
+%% Reported by Alexey Romanov on 10/10/2010 and fixed 16/10/2010.
+%% Stavros Aronis provided a better fix of the issue on 8/11/2010.
+%% ====================================================================
+
+-module(tuple_set_crash).
+-export([test/5]).
+
+%% ====================================================================
+
+-define(PREPEND_IF_BIT_SET(BitMap, Bit,
+			   PatternInBinary, PatternInList,
+			   OldRestVar, NewRestVar,
+			   OldAccVar, NewAccVar),
+	case byteset:contains(Bit, BitMap) of
+	    true ->
+		<<PatternInBinary, NewRestVar/binary>> = OldRestVar,
+		NewAccVar = [PatternInList | OldAccVar];
+	    false ->
+		NewRestVar = OldRestVar,
+		NewAccVar = OldAccVar
+	end).
+
+%% ====================================================================
+
+%% Types used in parsing binaries
+-define(BITMAP1, 8/integer-big-unsigned).
+-define(BYTE, 8/integer-little-unsigned).
+-define(WORD, 16/integer-little-unsigned).
+-define(DWORD, 32/integer-little-unsigned).
+-define(DATE, 16/integer-little-signed).
+-define(TIME, 32/float-little-unsigned).
+-define(TINY_STRING_M(Var, Size), Size:?BYTE, Var:Size/binary).
+-define(SMALL_STRING_M(Var, Size), Size:?WORD, Var:Size/binary).
+
+-type config_change() ::
+	{device_properties |
+	 video_target |
+	 audio_target |
+	 video_device |
+	 audio_device |
+	 video_output |
+	 audio_output, [{atom(), any()}]}.
+
+-type message_from_server() ::
+	 ok |
+	 {error, atom()} |
+	 config_change() |
+	 {media_item_url_reply, integer(), binary()}.
+
+%% ====================================================================
+
+-spec test(integer(), [integer()], binary(), binary(), binary()) -> {binary(), binary()}.
+test(_TargetId, [], _Key, IVT, IVF) ->
+    {IVT, IVF};
+test(TargetId, [Date | DateTail], Key, IVT, IVF) ->
+    PlayListRequest = play_list_request(TargetId, Date),
+    {ok, Reply, IVT1, IVF1} = culprit(PlayListRequest, Key, IVT, IVF),
+    case Reply of
+	{play_list, _Playlist} ->
+	    test(TargetId, DateTail, Key, IVT1, IVF1);
+	{error, 16#11} ->
+	    {IVT1, IVF1} %% we can finish early
+    end.
+
+-spec culprit(binary(), binary(), binary(), binary()) ->
+	{ok, message_from_server(), binary(), binary()}.
+culprit(Message, Key, IVecToServer, IVecFromServer) ->
+    {Packet, NewIVecToServer} = message_to_packet(Message, Key, IVecToServer),
+    Message = crypto:aes_cbc_128_decrypt(Key, IVecFromServer, Packet),
+    NewIVecFromServer = crypto:aes_cbc_ivec(Packet),
+    ParsedMessage = parse_message(Message),
+    {ok, ParsedMessage, NewIVecToServer, NewIVecFromServer}.
+
+%% ====================================================================
+
+-spec play_list_request(integer(), integer()) -> binary().
+play_list_request(TargetId, Date) ->
+    <<16#06:?WORD, TargetId:?DWORD, Date:?DATE>>.
+
+-spec parse_message(binary()) -> message_from_server().
+parse_message(<<MessageID:?WORD, Rest/binary>>) ->
+    case MessageID of
+	16#00 -> parse_error_code(Rest);
+	16#22 -> {device_properties, parse_device_properties(Rest)};
+	16#24 -> {video_target_info, parse_video_target_info(Rest)};
+	16#25 -> {audio_target_info, parse_audio_target_info(Rest)};
+	16#26 -> {video_device_info, parse_av_device_info(Rest)};
+	16#27 -> {audio_device_info, parse_av_device_info(Rest)};
+	16#28 -> {video_output_info, parse_video_output_info(Rest)};
+	16#29 -> {audio_output_info, parse_audio_output_info(Rest)}
+    end.
+
+-spec parse_error_code(binary()) -> ok | {error, integer()}.
+parse_error_code(<<ErrorCode:?BYTE, _Padding/binary>>) ->
+    case ErrorCode of
+	0 -> ok;
+	_ -> {error, ErrorCode}
+    end.
+
+-spec parse_device_properties(binary()) -> config_change().
+parse_device_properties(<<BitMap:?BITMAP1, Rest/binary>>) ->
+    Acc0 = [],
+    ?PREPEND_IF_BIT_SET(BitMap, 0,
+			FwVersion:3/binary, {fw_version, FwVersion},
+			Rest, Rest1, Acc0, Acc1),
+    ?PREPEND_IF_BIT_SET(BitMap, 1,
+			?TINY_STRING_M(ControllerName, _S1),
+			{controller_name, ControllerName},
+			Rest1, Rest2, Acc1, Acc2),
+    ?PREPEND_IF_BIT_SET(BitMap, 2,
+			?SMALL_STRING_M(ControllerDescription, _S2),
+			{controller_description, ControllerDescription},
+			Rest2, Rest3, Acc2, Acc3),
+    ?PREPEND_IF_BIT_SET(BitMap, 3,
+			ControllerStatus:?BYTE,
+			{controller_status, ControllerStatus},
+			Rest3, _Padding, Acc3, Acc4),
+    Acc4.
+
+-spec parse_video_target_info(binary()) -> config_change().
+parse_video_target_info(<<TargetId:?DWORD, Status:?BYTE, _Padding/binary>>) ->
+    [{target_id, TargetId}, {status, Status}].
+
+-spec parse_audio_target_info(binary()) -> [config_change()].
+parse_audio_target_info(<<TargetId:?DWORD, BitMap:?BITMAP1, Rest/binary>>) ->
+    Acc0 = [{target_id, TargetId}],
+    ?PREPEND_IF_BIT_SET(BitMap, 0,
+			Status:?BYTE, {status, Status},
+			Rest, Rest1, Acc0, Acc1),
+    ?PREPEND_IF_BIT_SET(BitMap, 1,
+			MasterVolume:?WORD, {master_volume, MasterVolume},
+			Rest1, _Padding, Acc1, Acc2),
+    Acc2.
+
+-spec parse_av_device_info(binary()) -> [config_change()].
+parse_av_device_info(<<DeviceId:?DWORD, BitMap:?BITMAP1, Rest/binary>>) ->
+    Acc0 = [{device_id, DeviceId}],
+    ?PREPEND_IF_BIT_SET(BitMap, 0,
+			TargetId:?DWORD, {target_id, TargetId},
+			Rest, Rest1, Acc0, Acc1),
+    ?PREPEND_IF_BIT_SET(BitMap, 1,
+			?TINY_STRING_M(Model, _S1), {model, Model},
+			Rest1, Rest2, Acc1, Acc2),
+    ?PREPEND_IF_BIT_SET(BitMap, 2,
+			Address:?BYTE, {address, Address},
+			Rest2, Rest3, Acc2, Acc3),
+    ?PREPEND_IF_BIT_SET(BitMap, 3,
+			Status:?BYTE, {status, Status},
+			Rest3, _Padding, Acc3, Acc4),
+    Acc4.
+
+-spec parse_video_output_info(binary()) -> [config_change()].
+parse_video_output_info(<<Output:?DWORD, BitMap:?BITMAP1, Rest/binary>>) ->
+    Acc0 = [{output_id, Output}],
+    ?PREPEND_IF_BIT_SET(BitMap, 0,
+			DeviceId:?DWORD, {device_id, DeviceId},
+			Rest, Rest1, Acc0, Acc1),
+    ?PREPEND_IF_BIT_SET(BitMap, 1,
+			?TINY_STRING_M(DisplayType, _S1),
+			{display_type, DisplayType},
+			Rest1, Rest2, Acc1, Acc2),
+    ?PREPEND_IF_BIT_SET(BitMap, 2,
+			AudioVolume:?WORD,
+			{audio_volume, AudioVolume},
+			Rest2, _Padding, Acc2, Acc3),
+    Acc3.
+
+-spec parse_audio_output_info(binary()) -> [config_change()].
+parse_audio_output_info(<<Output:?DWORD, BitMap:?BITMAP1, Rest/binary>>) ->
+    Acc0 = [{output_id, Output}],
+    ?PREPEND_IF_BIT_SET(BitMap, 0,
+			DeviceId:?DWORD, {device_id, DeviceId},
+			Rest, Rest1, Acc0, Acc1),
+    ?PREPEND_IF_BIT_SET(BitMap, 1,
+			AudioVolume:?WORD, {audio_volume, AudioVolume},
+			Rest1, Rest2, Acc1, Acc2),
+    ?PREPEND_IF_BIT_SET(BitMap, 2,
+			Delay:?WORD, {delay, Delay},
+			Rest2, _Padding, Acc2, Acc3),
+    Acc3.
+
+-spec message_to_packet(binary(), binary(), binary()) -> {binary(), binary()}.
+message_to_packet(Message, Key, IVec) ->
+    PaddedMessage = pad_pkcs5(Message),
+    Packet = crypto:aes_cbc_128_encrypt(Key, IVec, PaddedMessage),
+    TotalSize = byte_size(Packet),
+    NewIVec = crypto:aes_cbc_ivec(Packet),
+    {<<TotalSize:?WORD, Packet/binary>>, NewIVec}.
+
+-spec pad_pkcs5(binary()) -> binary().
+pad_pkcs5(Message) ->
+    Size = byte_size(Message),
+    PaddingSize = case Size rem 16 of
+		      0 -> 0;
+		      Rem -> 16 - Rem
+		  end,
+    pad_pkcs5(Message, PaddingSize, PaddingSize).
+
+-spec pad_pkcs5(binary(), integer(), integer()) -> binary().
+pad_pkcs5(Message, _PaddingSize, 0) ->
+    Message;
+pad_pkcs5(Message, PaddingSize, PaddingSizeRemaining) ->
+    pad_pkcs5(<<Message/binary, PaddingSize:?BYTE>>,
+	      PaddingSize, PaddingSizeRemaining - 1).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/unsafe_beamcode_bug.erl b/lib/dialyzer/test/small_SUITE_data/src/unsafe_beamcode_bug.erl
new file mode 100644
index 0000000000..071b4a53c1
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/unsafe_beamcode_bug.erl
@@ -0,0 +1,14 @@
+-module(unsafe_beamcode_bug).
+-export([test/1]).
+
+test(N) -> i(r(N)).
+
+%% this function cannot be exported, or the error does not occur
+i({one}) -> ok1;
+i({two, _}) -> ok2;
+i({three, {_,R}, _}) -> R.
+
+r(1) -> {one};
+r(2) -> {two, 2};
+r(42)-> {dummy, 42};	% without this clause, no problem ... hmm
+r(3) -> {three, {rec,ok3}, 2}.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/unused_cases.erl b/lib/dialyzer/test/small_SUITE_data/src/unused_cases.erl
index e6e6693963..e6e6693963 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/unused_cases.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/unused_cases.erl
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/unused_clauses.erl b/lib/dialyzer/test/small_SUITE_data/src/unused_clauses.erl
index a98b227a6b..a98b227a6b 100644
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/unused_clauses.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/unused_clauses.erl
diff --git a/lib/dialyzer/test/small_SUITE_data/src/zero_tuple.erl b/lib/dialyzer/test/small_SUITE_data/src/zero_tuple.erl
new file mode 100644
index 0000000000..7c790e5658
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/zero_tuple.erl
@@ -0,0 +1,12 @@
+-module(zero_tuple).
+-export([t1/0, t2/0]).
+
+t1() ->
+  {} = a(),
+  ok.
+
+t2() ->
+  b = a(),
+  ok.
+
+a() -> a.
diff --git a/lib/dialyzer/test/small_tests_SUITE.erl b/lib/dialyzer/test/small_tests_SUITE.erl
deleted file mode 100644
index dbcc044eea..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE.erl
+++ /dev/null
@@ -1,489 +0,0 @@
-%% ATTENTION!
-%% This is an automatically generated file. Do not edit.
-%% Use './remake' script to refresh it if needed.
-%% All Dialyzer options should be defined in dialyzer_options
-%% file.
-
--module(small_tests_SUITE).
-
--include("ct.hrl").
--include("dialyzer_test_constants.hrl").
-
--export([suite/0, init_per_suite/0, init_per_suite/1,
-         end_per_suite/1, all/0]).
--export([small_tests_SUITE_consistency/1, app_call/1, appmon_place/1, 
-         areq/1, atom_call/1, atom_guard/1, atom_widen/1, 
-         bs_fail_constr/1, bs_utf8/1, cerl_hipeify/1, comm_layer/1, 
-         compare1/1, confusing_warning/1, contract2/1, contract3/1, 
-         contract5/1, disj_norm_form/1, eqeq/1, ets_select/1, 
-         exhaust_case/1, failing_guard1/1, flatten/1, fun_app/1, 
-         fun_ref_match/1, fun_ref_record/1, gencall/1, gs_make/1, 
-         inf_loop2/1, invalid_specs/1, letrec1/1, list_match/1, lzip/1,
-         make_tuple/1, minus_minus/1, mod_info/1, my_filter/1,
-         my_sofs/1, no_match/1, no_unused_fun/1, no_unused_fun2/1,
-         non_existing/1, not_guard_crash/1, or_bug/1, orelsebug/1,
-         orelsebug2/1, overloaded1/1, port_info_test/1,
-         process_info_test/1, pubsub/1, receive1/1, record_construct/1,
-         record_pat/1, record_send_test/1, record_test/1,
-         recursive_types1/1, recursive_types2/1, recursive_types3/1,
-         recursive_types4/1, recursive_types5/1, recursive_types6/1,
-         recursive_types7/1, refine_bug1/1, toth/1, trec/1, try1/1,
-         tuple1/1, unsafe_beamcode_bug/1, unused_cases/1,
-         unused_clauses/1, zero_tuple/1]).
-
-suite() ->
-  [{timetrap, {minutes, 1}}].
-
-init_per_suite() ->
-  [{timetrap, ?plt_timeout}].
-init_per_suite(Config) ->
-  OutDir = ?config(priv_dir, Config),
-  case dialyzer_common:check_plt(OutDir) of
-    fail -> {skip, "Plt creation/check failed."};
-    ok -> [{dialyzer_options, []}|Config]
-  end.
-
-end_per_suite(_Config) ->
-  ok.
-
-all() ->
-  [small_tests_SUITE_consistency,app_call,appmon_place,areq,atom_call,
-   atom_guard,atom_widen,bs_fail_constr,bs_utf8,cerl_hipeify,comm_layer,
-   compare1,confusing_warning,contract2,contract3,contract5,disj_norm_form,
-   eqeq,ets_select,exhaust_case,failing_guard1,flatten,fun_app,fun_ref_match,
-   fun_ref_record,gencall,gs_make,inf_loop2,invalid_specs,letrec1,list_match,
-   lzip,make_tuple,minus_minus,mod_info,my_filter,my_sofs,no_match,
-   no_unused_fun,no_unused_fun2,non_existing,not_guard_crash,or_bug,orelsebug,
-   orelsebug2,overloaded1,port_info_test,process_info_test,pubsub,receive1,
-   record_construct,record_pat,record_send_test,record_test,recursive_types1,
-   recursive_types2,recursive_types3,recursive_types4,recursive_types5,
-   recursive_types6,recursive_types7,refine_bug1,toth,trec,try1,tuple1,
-   unsafe_beamcode_bug,unused_cases,unused_clauses,zero_tuple].
-
-dialyze(Config, TestCase) ->
-  Opts = ?config(dialyzer_options, Config),
-  Dir = ?config(data_dir, Config),
-  OutDir = ?config(priv_dir, Config),
-  dialyzer_common:check(TestCase, Opts, Dir, OutDir).
-
-small_tests_SUITE_consistency(Config) ->
-  Dir = ?config(data_dir, Config),
-  case dialyzer_common:new_tests(Dir, all()) of
-    []  -> ok;
-    New -> ct:fail({missing_tests,New})
-  end.
-
-app_call(Config) ->
-  case dialyze(Config, app_call) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-appmon_place(Config) ->
-  case dialyze(Config, appmon_place) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-areq(Config) ->
-  case dialyze(Config, areq) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-atom_call(Config) ->
-  case dialyze(Config, atom_call) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-atom_guard(Config) ->
-  case dialyze(Config, atom_guard) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-atom_widen(Config) ->
-  case dialyze(Config, atom_widen) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-bs_fail_constr(Config) ->
-  case dialyze(Config, bs_fail_constr) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-bs_utf8(Config) ->
-  case dialyze(Config, bs_utf8) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-cerl_hipeify(Config) ->
-  case dialyze(Config, cerl_hipeify) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-comm_layer(Config) ->
-  case dialyze(Config, comm_layer) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-compare1(Config) ->
-  case dialyze(Config, compare1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-confusing_warning(Config) ->
-  case dialyze(Config, confusing_warning) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-contract2(Config) ->
-  case dialyze(Config, contract2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-contract3(Config) ->
-  case dialyze(Config, contract3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-contract5(Config) ->
-  case dialyze(Config, contract5) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-disj_norm_form(Config) ->
-  case dialyze(Config, disj_norm_form) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-eqeq(Config) ->
-  case dialyze(Config, eqeq) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-ets_select(Config) ->
-  case dialyze(Config, ets_select) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-exhaust_case(Config) ->
-  case dialyze(Config, exhaust_case) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-failing_guard1(Config) ->
-  case dialyze(Config, failing_guard1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-flatten(Config) ->
-  case dialyze(Config, flatten) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-fun_app(Config) ->
-  case dialyze(Config, fun_app) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-fun_ref_match(Config) ->
-  case dialyze(Config, fun_ref_match) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-fun_ref_record(Config) ->
-  case dialyze(Config, fun_ref_record) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-gencall(Config) ->
-  case dialyze(Config, gencall) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-gs_make(Config) ->
-  case dialyze(Config, gs_make) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-inf_loop2(Config) ->
-  case dialyze(Config, inf_loop2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-invalid_specs(Config) ->
-  case dialyze(Config, invalid_specs) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-letrec1(Config) ->
-  case dialyze(Config, letrec1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-list_match(Config) ->
-  case dialyze(Config, list_match) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-lzip(Config) ->
-  case dialyze(Config, lzip) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-make_tuple(Config) ->
-  case dialyze(Config, make_tuple) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-minus_minus(Config) ->
-  case dialyze(Config, minus_minus) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-mod_info(Config) ->
-  case dialyze(Config, mod_info) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-my_filter(Config) ->
-  case dialyze(Config, my_filter) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-my_sofs(Config) ->
-  case dialyze(Config, my_sofs) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-no_match(Config) ->
-  case dialyze(Config, no_match) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-no_unused_fun(Config) ->
-  case dialyze(Config, no_unused_fun) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-no_unused_fun2(Config) ->
-  case dialyze(Config, no_unused_fun2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-non_existing(Config) ->
-  case dialyze(Config, non_existing) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-not_guard_crash(Config) ->
-  case dialyze(Config, not_guard_crash) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-or_bug(Config) ->
-  case dialyze(Config, or_bug) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-orelsebug(Config) ->
-  case dialyze(Config, orelsebug) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-orelsebug2(Config) ->
-  case dialyze(Config, orelsebug2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-overloaded1(Config) ->
-  case dialyze(Config, overloaded1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-port_info_test(Config) ->
-  case dialyze(Config, port_info_test) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-process_info_test(Config) ->
-  case dialyze(Config, process_info_test) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-pubsub(Config) ->
-  case dialyze(Config, pubsub) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-receive1(Config) ->
-  case dialyze(Config, receive1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-record_construct(Config) ->
-  case dialyze(Config, record_construct) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-record_pat(Config) ->
-  case dialyze(Config, record_pat) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-record_send_test(Config) ->
-  case dialyze(Config, record_send_test) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-record_test(Config) ->
-  case dialyze(Config, record_test) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-recursive_types1(Config) ->
-  case dialyze(Config, recursive_types1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-recursive_types2(Config) ->
-  case dialyze(Config, recursive_types2) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-recursive_types3(Config) ->
-  case dialyze(Config, recursive_types3) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-recursive_types4(Config) ->
-  case dialyze(Config, recursive_types4) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-recursive_types5(Config) ->
-  case dialyze(Config, recursive_types5) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-recursive_types6(Config) ->
-  case dialyze(Config, recursive_types6) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-recursive_types7(Config) ->
-  case dialyze(Config, recursive_types7) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-refine_bug1(Config) ->
-  case dialyze(Config, refine_bug1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-toth(Config) ->
-  case dialyze(Config, toth) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-trec(Config) ->
-  case dialyze(Config, trec) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-try1(Config) ->
-  case dialyze(Config, try1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-tuple1(Config) ->
-  case dialyze(Config, tuple1) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-unsafe_beamcode_bug(Config) ->
-  case dialyze(Config, unsafe_beamcode_bug) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-unused_cases(Config) ->
-  case dialyze(Config, unused_cases) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-unused_clauses(Config) ->
-  case dialyze(Config, unused_clauses) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-zero_tuple(Config) ->
-  case dialyze(Config, zero_tuple) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/appmon_place.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/appmon_place.erl
deleted file mode 100644
index 8371cab233..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/appmon_place.erl
+++ /dev/null
@@ -1,71 +0,0 @@
-%%---------------------------------------------------------------------
-%% This is added as a test because it was giving a false positive
-%% (function move/4 will nevr be called) due to the strange use of
-%% self-recursive fun construction in placex/3.
-%%
-%% The analysis was getting confused that the foldl call will never
-%% terminate (due to a wrong hard-coded type for foldl) and inferred
-%% that the remaining calls in the body of placex/3 will not be
-%% reached.  Fixed 11 March 2005.
-%%---------------------------------------------------------------------
-
--module(appmon_place).
--export([place/2]).
-
-place(DG, Root) ->
-    case appmon_dg:get(data, DG, Root) of
-	false -> [0];
-	_Other -> 
-	    placey(DG, Root, 1),
-	    placex(DG, Root, [])
-    end.
-
-placey(DG, V, Y) ->
-    appmon_dg:set(y, DG, V, Y),
-    Y1 = Y+1,
-    lists:foreach(fun(C) -> placey(DG, C, Y1) end, appmon_dg:get(out, DG, V)).
-
-placex(DG, V, LastX) ->
-    Ch = appmon_dg:get(out, DG, V),
-    ChLX = lists:foldl(fun(C, Accu) -> placex(DG, C, Accu) end,
-		       tll(LastX),
-		       Ch),
-    Width	= appmon_dg:get(w, DG, V),
-    MyX		= calc_mid(DG, Width, Ch),
-    DeltaX	= calc_delta(MyX, hdd(LastX)+20),
-    appmon_dg:set(x, DG, V, MyX),
-    move(DG, V, [MyX+Width | ChLX], DeltaX).
-
-move(_DG, _L, LastX, 0) -> LastX;
-move(DG, V, LastX, DeltaX) -> move2(DG, V, LastX, DeltaX).
-
-move2(DG, V, LastX, DeltaX) ->
-    NewX = appmon_dg:get(x, DG, V)+DeltaX,
-    appmon_dg:set(x, DG, V, NewX),
-    ChLX = lists:foldl(fun(C, LX) -> move2(DG, C, LX, DeltaX) end,
-		       tll(LastX), 
-		       appmon_dg:get(out, DG, V)),
-    [max(NewX+appmon_dg:get(w, DG, V), hdd(LastX)) | ChLX].
-
-max(A, B) when A>B -> A;
-max(_, B) -> B.
-
-calc_mid(_DG, _Width, []) -> 0;
-calc_mid(DG, Width, ChList) ->
-    LeftMostX = appmon_dg:get(x, DG, hd(ChList)),
-    Z2 = lists:last(ChList),
-    RightMostX = appmon_dg:get(x, DG, Z2)+appmon_dg:get(w, DG, Z2),
-    trunc((LeftMostX+RightMostX)/2)-trunc(Width/2).
-
-calc_delta(Mid, Right) ->    
-    if  Right>Mid	-> Right-Mid;
-	true		-> 0
-    end.
-
-%% Special head and tail
-%% Handles empty list in a non-standard way
-tll([]) -> [];
-tll([_|T]) -> T.
-hdd([]) -> 0;
-hdd([H|_]) -> H.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/areq.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/areq.erl
deleted file mode 100644
index 1b4eea8511..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/areq.erl
+++ /dev/null
@@ -1,12 +0,0 @@
--module(areq).
-
--export([t/0]).
-
-t() ->
-  ar_comp(3.0, 3),
-  ex_comp(3.0, 3).
-
-ar_comp(X, Y) -> X == Y.
-
-ex_comp(X, Y) -> X =:= Y.
-  
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/atom_call.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/atom_call.erl
deleted file mode 100644
index bf0646eadc..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/atom_call.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : atom_call.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 10 Dec 2007 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(atom_call).
-
--export([f/0,g/0]).
-
-f() -> ok.
-
-g() -> F = f, F(). 
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/atom_guard.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/atom_guard.erl
deleted file mode 100644
index 67d97f8e29..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/atom_guard.erl
+++ /dev/null
@@ -1,9 +0,0 @@
--module(atom_guard).
--export([test/0]).
-
-test() ->
-    foo(42).
-
-foo(X) when is_atom(x) ->
-    X.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/bs_fail_constr.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/bs_fail_constr.erl
deleted file mode 100644
index 20fd1cbf64..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/bs_fail_constr.erl
+++ /dev/null
@@ -1,16 +0,0 @@
--module(bs_fail_constr).
-
--export([w1/1, w2/1, w3/1, w4/1]).
-
-w1(V) when is_float(V) ->
-  <<V/integer>>.
-
-w2(V) when is_atom(V) ->
-  <<V/binary>>.
-
-w3(S) when is_integer(S), S < 0 ->
-  <<42:S/integer>>.
-
-w4(V) when is_float(V) ->
-  <<V/utf32>>.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/cerl_hipeify.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/cerl_hipeify.erl
deleted file mode 100644
index 3ccadec4d0..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/cerl_hipeify.erl
+++ /dev/null
@@ -1,684 +0,0 @@
-%% =====================================================================
-%% This library is free software; you can redistribute it and/or modify
-%% it under the terms of the GNU Lesser General Public License as
-%% published by the Free Software Foundation; either version 2 of the
-%% License, or (at your option) any later version.
-%%
-%% This library is distributed in the hope that it will be useful, but
-%% WITHOUT ANY WARRANTY; without even the implied warranty of
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%% Lesser General Public License for more details.
-%%
-%% You should have received a copy of the GNU Lesser General Public
-%% License along with this library; if not, write to the Free Software
-%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-%% USA
-%%
-%% $Id: cerl_hipeify.erl,v 1.1 2008/12/17 09:53:49 mikpe Exp $
-%%
-%% @author Richard Carlsson <[email protected]>
-%% @copyright 2000-2004 Richard Carlsson
-%% @doc HiPE-ification of Core Erlang code. Prepares Core Erlang code
-%% for translation to ICode.
-%% @see cerl_to_icode
-
--module(cerl_hipeify).
-
--export([transform/2]).
-
--define(PRIMOP_IDENTITY, identity).		% arity 1
--define(PRIMOP_NOT, 'not').			% arity 1
--define(PRIMOP_AND, 'and').			% arity 2
--define(PRIMOP_OR, 'or').			% arity 2
--define(PRIMOP_XOR, 'xor').			% arity 2
--define(PRIMOP_ADD, '+').			% arity 2
--define(PRIMOP_SUB, '-').			% arity 2
--define(PRIMOP_NEG, neg).			% arity 1
--define(PRIMOP_MUL, '*').			% arity 2
--define(PRIMOP_DIV, '/').			% arity 2
--define(PRIMOP_INTDIV, 'div').			% arity 2
--define(PRIMOP_REM, 'rem').			% arity 2
--define(PRIMOP_BAND, 'band').			% arity 2
--define(PRIMOP_BOR, 'bor').			% arity 2
--define(PRIMOP_BXOR, 'bxor').			% arity 2
--define(PRIMOP_BNOT, 'bnot').			% arity 1
--define(PRIMOP_BSL, 'bsl').			% arity 2
--define(PRIMOP_BSR, 'bsr').			% arity 2
--define(PRIMOP_EQ, '==').			% arity 2
--define(PRIMOP_NE, '/=').			% arity 2
--define(PRIMOP_EXACT_EQ, '=:=').		% arity 2
--define(PRIMOP_EXACT_NE, '=/=').		% arity 2
--define(PRIMOP_LT, '<').			% arity 2
--define(PRIMOP_GT, '>').			% arity 2
--define(PRIMOP_LE, '=<').			% arity 2
--define(PRIMOP_GE, '>=').			% arity 2
--define(PRIMOP_IS_ATOM, 'is_atom').		% arity 1
--define(PRIMOP_IS_BIGNUM, 'is_bignum').		% arity 1
--define(PRIMOP_IS_BINARY, 'is_binary').		% arity 1
--define(PRIMOP_IS_CONSTANT, 'is_constant').	% arity 1
--define(PRIMOP_IS_FIXNUM, 'is_fixnum').		% arity 1
--define(PRIMOP_IS_FLOAT, 'is_float').		% arity 1
--define(PRIMOP_IS_FUNCTION, 'is_function').	% arity 1
--define(PRIMOP_IS_INTEGER, 'is_integer').	% arity 1
--define(PRIMOP_IS_LIST, 'is_list').		% arity 1
--define(PRIMOP_IS_NUMBER, 'is_number').		% arity 1
--define(PRIMOP_IS_PID, 'is_pid').		% arity 1
--define(PRIMOP_IS_PORT, 'is_port').		% arity 1
--define(PRIMOP_IS_REFERENCE, 'is_reference').	% arity 1
--define(PRIMOP_IS_TUPLE, 'is_tuple').		% arity 1
--define(PRIMOP_IS_RECORD, 'is_record').		% arity 3
--define(PRIMOP_EXIT, exit).			% arity 1
--define(PRIMOP_THROW, throw).			% arity 1
--define(PRIMOP_ERROR, error).			% arity 1,2
--define(PRIMOP_RETHROW, raise).			% arity 2
--define(PRIMOP_RECEIVE_SELECT, receive_select).	% arity 0
--define(PRIMOP_RECEIVE_NEXT, receive_next).	% arity 0
--define(PRIMOP_ELEMENT, element).		% arity 2
--define(PRIMOP_DSETELEMENT, dsetelement).	% arity 3
--define(PRIMOP_MAKE_FUN, make_fun).		% arity 6
--define(PRIMOP_APPLY_FUN, apply_fun).		% arity 2
--define(PRIMOP_FUN_ELEMENT, closure_element).	% arity 2
--define(PRIMOP_SET_LABEL, set_label).           % arity 1
--define(PRIMOP_GOTO_LABEL, goto_label).         % arity 1
--define(PRIMOP_REDUCTION_TEST, reduction_test). % arity 0
-
--record(ctxt, {class = expr}).
-
-
-%% @spec transform(Module::cerl(), Options::[term()]) -> cerl()
-%%
-%%    cerl() = cerl:cerl()
-%%
-%% @doc Rewrites a Core Erlang module to a form suitable for further
-%% translation to HiPE Icode. See module <code>cerl_to_icode</code> for
-%% details.
-%%
-%% @see cerl_to_icode
-%% @see cerl_cconv
-
-transform(E, Opts) ->
-    %% Start by closure converting the code
-    module(cerl_cconv:transform(E, Opts), Opts).
-
-module(E, Opts) ->
-    {Ds, Env, Ren} = add_defs(cerl:module_defs(E), env__new(),
-			      ren__new()),
-    M = cerl:module_name(E),
-    S0 = s__new(cerl:atom_val(M)),    	    
-    S = s__set_pmatch(proplists:get_value(pmatch, Opts), S0),
-    {Ds1, _} = defs(Ds, true, Env, Ren, S),
-    cerl:update_c_module(E, M, cerl:module_exports(E),
-			 cerl:module_attrs(E), Ds1).
-
-%% Note that the environment is defined on the renamed variables.
-
-expr(E0, Env, Ren, Ctxt, S0) ->
-    %% Do peephole optimizations as we traverse the code.
-    E = cerl_lib:reduce_expr(E0),
-    case cerl:type(E) of
- 	literal ->
-	    {E, S0};
-	var ->
-	    variable(E, Env, Ren, Ctxt, S0);
-	values ->
-	    {Es, S1} = expr_list(cerl:values_es(E), Env, Ren, Ctxt, S0),
- 	    {cerl:update_c_values(E, Es), S1};
-	cons ->
-	    {E1, S1} = expr(cerl:cons_hd(E), Env, Ren, Ctxt, S0),
-	    {E2, S2} = expr(cerl:cons_tl(E), Env, Ren, Ctxt, S1),
-	    {cerl:update_c_cons(E, E1, E2), S2};
- 	tuple ->
-	    {Es, S1} = expr_list(cerl:tuple_es(E), Env, Ren, Ctxt, S0),
-	    {cerl:update_c_tuple(E, Es), S1};
- 	'let' ->
-	    let_expr(E, Env, Ren, Ctxt, S0);
-	seq ->
-	    {A, S1} = expr(cerl:seq_arg(E), Env, Ren, Ctxt, S0),
-	    {B, S2} = expr(cerl:seq_body(E), Env, Ren, Ctxt, S1),
- 	    {cerl:update_c_seq(E, A, B), S2};
- 	apply ->
-	    {Op, S1} = expr(cerl:apply_op(E), Env, Ren, Ctxt, S0),
-	    {As, S2} = expr_list(cerl:apply_args(E), Env, Ren, Ctxt, S1),
- 	    {cerl:update_c_apply(E, Op, As), S2};
- 	call ->
-	    {M, S1} = expr(cerl:call_module(E), Env, Ren, Ctxt, S0),
-	    {N, S2} = expr(cerl:call_name(E), Env, Ren, Ctxt, S1),
-	    {As, S3} = expr_list(cerl:call_args(E), Env, Ren, Ctxt, S2),
- 	    {rewrite_call(E, M, N, As, S3), S3};
- 	primop ->
-	    {As, S1} = expr_list(cerl:primop_args(E), Env, Ren, Ctxt, S0),
-	    N = cerl:primop_name(E),
-	    {rewrite_primop(E, N, As, S1), S1};
- 	'case' ->
-	    {A, S1} = expr(cerl:case_arg(E), Env, Ren, Ctxt, S0),
-	    {E1, Vs, S2} = clauses(cerl:case_clauses(E), Env, Ren, Ctxt, S1),
- 	    {cerl:c_let(Vs, A, E1), S2};
- 	'fun' ->
-	    Vs = cerl:fun_vars(E),
-	    {Vs1, Env1, Ren1} = add_vars(Vs, Env, Ren),
-	    {B, S1} = expr(cerl:fun_body(E), Env1, Ren1, Ctxt, S0),
-	    {cerl:update_c_fun(E, Vs1, B), S1};
- 	'receive' ->
-	    receive_expr(E, Env, Ren, Ctxt, S0);
- 	'try' ->
-	    {A, S1} = expr(cerl:try_arg(E), Env, Ren, Ctxt, S0),
-	    Vs = cerl:try_vars(E),
-	    {Vs1, Env1, Ren1} = add_vars(Vs, Env, Ren),
-	    {B, S2} = expr(cerl:try_body(E), Env1, Ren1, Ctxt, S1),
-	    Evs = cerl:try_evars(E),
-	    {Evs1, Env2, Ren2} = add_vars(Evs, Env, Ren),
-	    {H, S3} = expr(cerl:try_handler(E), Env2, Ren2, Ctxt, S2),
-	    {cerl:update_c_try(E, A, Vs1, B, Evs1, H), S3};
- 	'catch' ->
-	    catch_expr(E, Env, Ren, Ctxt, S0);
-	letrec ->
-	    {Ds, Env1, Ren1} = add_defs(cerl:letrec_defs(E), Env, Ren),
-	    {Ds1, S1} = defs(Ds, false, Env1, Ren1, S0),
-	    {B, S2} = expr(cerl:letrec_body(E), Env1, Ren1, Ctxt, S1),
-	    {cerl:update_c_letrec(E, Ds1, B), S2};
-	binary ->
-	    {Segs, S1}=expr_list(cerl:binary_segments(E), Env, Ren,
-				 Ctxt, S0),
-	    {cerl:update_c_binary(E, Segs), S1};
-	bitstr ->
-	    {E1,S1} = expr(cerl:bitstr_val(E), Env, Ren, Ctxt, S0),
-	    {E2,S2} = expr(cerl:bitstr_size(E), Env, Ren, Ctxt, S1),	
-	    E3 = cerl:bitstr_unit(E), 
-	    E4 = cerl:bitstr_type(E),
-	    E5 = cerl:bitstr_flags(E),
-	    {cerl:update_c_bitstr(E, E1, E2, E3, E4, E5), S2} 
-    end.
-
-guard_expr(E, Env, Ren, Ctxt, S) ->
-    expr(E, Env, Ren, Ctxt#ctxt{class = guard}, S).
-
-expr_list(Es, Env, Ren, Ctxt, S0) ->
-    list(Es, Env, Ren, Ctxt, S0, fun expr/5).
-
-list([E | Es], Env, Ren, Ctxt, S0, F) ->
-    {E1, S1} = F(E, Env, Ren, Ctxt, S0),
-    {Es1, S2} = list(Es, Env, Ren, Ctxt, S1, F),
-    {[E1 | Es1], S2};
-list([], _, _, _, S, _) ->
-    {[], S}.
-
-pattern(E, Env, Ren) ->
-    case cerl:type(E) of
- 	literal ->
-	    E;
-	var ->
-	    cerl:update_c_var(E, ren__map(cerl:var_name(E), Ren));
-	values ->
-	    Es = pattern_list(cerl:values_es(E), Env, Ren),
- 	    cerl:update_c_values(E, Es);
-	cons ->
-	    E1 = pattern(cerl:cons_hd(E), Env, Ren),
-	    E2 = pattern(cerl:cons_tl(E), Env, Ren),
-	    cerl:update_c_cons(E, E1, E2);
- 	tuple ->
-	    Es = pattern_list(cerl:tuple_es(E), Env, Ren),
-	    cerl:update_c_tuple(E, Es);
-	alias ->
-	    V = pattern(cerl:alias_var(E), Env, Ren),
-	    P = pattern(cerl:alias_pat(E), Env, Ren),
-	    cerl:update_c_alias(E, V, P);
-	binary ->
-	    Segs=pattern_list(cerl:binary_segments(E), Env, Ren),
-	    cerl:update_c_binary(E, Segs);
-	bitstr ->
-	    E1 = pattern(cerl:bitstr_val(E), Env, Ren),
-	    E2 = pattern(cerl:bitstr_size(E), Env, Ren),	
-	    E3 = cerl:bitstr_unit(E), 
-	    E4 = cerl:bitstr_type(E),
-	    E5 = cerl:bitstr_flags(E),
-	    cerl:update_c_bitstr(E, E1, E2, E3, E4, E5)
-    end.
-
-
-
-pattern_list([E | Es], Env, Ren) ->
-    [pattern(E, Env, Ren) | pattern_list(Es, Env, Ren)];
-pattern_list([], _, _) ->
-    [].
-
-%% Visit the function body of each definition. We insert an explicit
-%% reduction test at the start of each function.
-
-defs(Ds, Top, Env, Ren, S) ->
-    defs(Ds, [], Top, Env, Ren, S).
-
-defs([{V, F} | Ds], Ds1, Top, Env, Ren, S0) ->
-    S1 = case Top of
-	     true -> s__enter_function(cerl:var_name(V), S0);
-	     false -> S0
-	 end,
-    {B, S2} = expr(cerl:fun_body(F), Env, Ren, #ctxt{}, S1),
-    B1 = cerl:c_seq(cerl:c_primop(cerl:c_atom(?PRIMOP_REDUCTION_TEST),
-				  []),
-		    B),
-    F1 = cerl:update_c_fun(F, cerl:fun_vars(F), B1),
-    defs(Ds, [{V, F1} | Ds1], Top, Env, Ren, S2);
-defs([], Ds, _Top, _Env, _Ren, S) ->
-    {lists:reverse(Ds), S}.
-
-clauses([C|_]=Cs, Env, Ren, Ctxt, S) ->
-    {Cs1, S1} = clause_list(Cs, Env, Ren, Ctxt, S),
-    %% Perform pattern matching compilation on the clauses.
-    {E, Vs} = case s__get_pmatch(S) of
-		  true ->
-		      cerl_pmatch:clauses(Cs1, Env);
-		  no_duplicates ->
-		      put('cerl_pmatch_duplicate_code', never),
-		      cerl_pmatch:clauses(Cs1, Env);
-		  duplicate_all ->
-		      put('cerl_pmatch_duplicate_code', always),
-		      cerl_pmatch:clauses(Cs1, Env);
-		  Other when Other == false; Other == undefined ->
-		      Vs0 = new_vars(cerl:clause_arity(C), Env),
-		      {cerl:c_case(cerl:c_values(Vs0), Cs1), Vs0}
-	      end,
-    %% We must make sure that we also visit any clause guards generated
-    %% by the pattern matching compilation. We pass an empty renaming,
-    %% so we do not rename any variables twice.
-    {E1, S2} = revisit_expr(E, Env, ren__new(), Ctxt, S1),
-    {E1, Vs, S2}.
-
-clause_list(Cs, Env, Ren, Ctxt, S) ->
-    list(Cs, Env, Ren, Ctxt, S, fun clause/5).
-
-clause(E, Env, Ren, Ctxt, S0) ->
-    Vs = cerl:clause_vars(E),
-    {_, Env1, Ren1} = add_vars(Vs, Env, Ren),
-    %% Visit patterns to rename variables.
-    Ps = pattern_list(cerl:clause_pats(E), Env1, Ren1),
-    {G, S1} = guard_expr(cerl:clause_guard(E), Env1, Ren1, Ctxt, S0),
-    {B, S2} = expr(cerl:clause_body(E), Env1, Ren1, Ctxt, S1),
-    {cerl:update_c_clause(E, Ps, G, B), S2}.
-
-%% This does what 'expr' does, but only recurses into clause guard
-%% expressions, 'case'-expressions, and the bodies of lets and letrecs.
-%% Note that revisiting should not add further renamings, and we simply
-%% ignore making any bindings at all at this level.
-
-revisit_expr(E, Env, Ren, Ctxt, S0) ->
-    %% Also enable peephole optimizations here.
-    revisit_expr_1(cerl_lib:reduce_expr(E), Env, Ren, Ctxt, S0).
-
-revisit_expr_1(E, Env, Ren, Ctxt, S0) ->
-    case cerl:type(E) of
- 	'case' ->
-	    {Cs, S1} = revisit_clause_list(cerl:case_clauses(E), Env,
-					   Ren, Ctxt, S0),
-	    {cerl:update_c_case(E, cerl:case_arg(E), Cs), S1};
-	'let' ->
-	    {B, S1} = revisit_expr(cerl:let_body(E), Env, Ren, Ctxt, S0),
-	    {cerl:update_c_let(E, cerl:let_vars(E), cerl:let_arg(E), B),
-	     S1};
-	'letrec' ->
-	    {B, S1} = revisit_expr(cerl:letrec_body(E), Env, Ren, Ctxt, S0),
-	    {cerl:update_c_letrec(E, cerl:letrec_defs(E), B), S1};
-	_ ->
-	    {E, S0}
-    end.
-
-revisit_clause_list(Cs, Env, Ren, Ctxt, S) ->
-    list(Cs, Env, Ren, Ctxt, S, fun revisit_clause/5).
-
-revisit_clause(E, Env, Ren, Ctxt, S0) ->
-    %% Ignore the bindings.
-    {G, S1} = guard_expr(cerl:clause_guard(E), Env, Ren, Ctxt, S0),
-    {B, S2} = revisit_expr(cerl:clause_body(E), Env, Ren, Ctxt, S1),
-    {cerl:update_c_clause(E, cerl:clause_pats(E), G, B), S2}.
-
-%% We use the no-shadowing strategy, renaming variables on the fly and
-%% only when necessary to uphold the invariant.
-
-add_vars(Vs, Env, Ren) ->
-    add_vars(Vs, [], Env, Ren).
-
-add_vars([V | Vs], Vs1, Env, Ren) ->
-    Name = cerl:var_name(V),
-    {Name1, Ren1} = rename(Name, Env, Ren),
-    add_vars(Vs, [cerl:update_c_var(V, Name1) | Vs1],
-	     env__bind(Name1, variable, Env), Ren1);
-add_vars([], Vs, Env, Ren) ->
-    {lists:reverse(Vs), Env, Ren}.
-
-rename(Name, Env, Ren) ->
-    case env__is_defined(Name, Env) of
-	false ->
-	    {Name, Ren};
-	true ->
-	    New = env__new_name(Env),
-	    {New, ren__add(Name, New, Ren)}
-    end.
-
-%% Setting up the environment for a list of letrec-bound definitions.
-
-add_defs(Ds, Env, Ren) ->
-    add_defs(Ds, [], Env, Ren).
-
-add_defs([{V, F} | Ds], Ds1, Env, Ren) ->
-    Name = cerl:var_name(V),
-    {Name1, Ren1} =
-	case env__is_defined(Name, Env) of
-	    false ->
-		{Name, Ren};
-	    true ->
-		{N, A} = Name,
-		S = atom_to_list(N) ++ "_",
-		F = fun (Num) ->	%% XXX: BUG: This should be F1
-			    {list_to_atom(S ++ integer_to_list(Num)), A}
-		    end,
-		New = env__new_function_name(F, Env),
-		{New, ren__add(Name, New, Ren)}
-	end,
-    add_defs(Ds, [{cerl:update_c_var(V, Name1), F} | Ds1],
-	     env__bind(Name1, function, Env), Ren1);
-add_defs([], Ds, Env, Ren) ->
-    {lists:reverse(Ds), Env, Ren}.
-
-%% We change remote calls to important built-in functions into primop
-%% calls. In some cases (e.g., for the boolean operators), this is
-%% mainly to allow the cerl_to_icode module to handle them more
-%% straightforwardly. In most cases however, it is simply because they
-%% are supposed to be represented as primop calls on the Icode level.
-
-rewrite_call(E, M, F, As, S) ->
-    case cerl:is_c_atom(M) and cerl:is_c_atom(F) of
-	true ->
-	    case call_to_primop(cerl:atom_val(M),
-				cerl:atom_val(F),
-				length(As))
-		of
-		{yes, N} ->
-		    %% The primop might need further handling
-		    N1 = cerl:c_atom(N),
-		    E1 = cerl:update_c_primop(E, N1, As),
-		    rewrite_primop(E1, N1, As, S);
-		no ->
-		    cerl:update_c_call(E, M, F, As)
-	    end;
-	false ->
-	    cerl:update_c_call(E, M, F, As)
-    end.
-
-call_to_primop(erlang, 'not', 1) -> {yes, ?PRIMOP_NOT};
-call_to_primop(erlang, 'and', 2) -> {yes, ?PRIMOP_AND};
-call_to_primop(erlang, 'or', 2) -> {yes, ?PRIMOP_OR};
-call_to_primop(erlang, 'xor', 2) -> {yes, ?PRIMOP_XOR};
-call_to_primop(erlang, '+', 2) -> {yes, ?PRIMOP_ADD};
-call_to_primop(erlang, '+', 1) -> {yes, ?PRIMOP_IDENTITY};
-call_to_primop(erlang, '-', 2) -> {yes, ?PRIMOP_SUB};
-call_to_primop(erlang, '-', 1) -> {yes, ?PRIMOP_NEG};
-call_to_primop(erlang, '*', 2) -> {yes, ?PRIMOP_MUL};
-call_to_primop(erlang, '/', 2) -> {yes, ?PRIMOP_DIV};
-call_to_primop(erlang, 'div', 2) -> {yes, ?PRIMOP_INTDIV};
-call_to_primop(erlang, 'rem', 2) -> {yes, ?PRIMOP_REM};
-call_to_primop(erlang, 'band', 2) -> {yes, ?PRIMOP_BAND};
-call_to_primop(erlang, 'bor', 2) -> {yes, ?PRIMOP_BOR};
-call_to_primop(erlang, 'bxor', 2) -> {yes, ?PRIMOP_BXOR};
-call_to_primop(erlang, 'bnot', 1) -> {yes, ?PRIMOP_BNOT};
-call_to_primop(erlang, 'bsl', 2) -> {yes, ?PRIMOP_BSL};
-call_to_primop(erlang, 'bsr', 2) -> {yes, ?PRIMOP_BSR};
-call_to_primop(erlang, '==', 2) -> {yes, ?PRIMOP_EQ};
-call_to_primop(erlang, '/=', 2) -> {yes, ?PRIMOP_NE};
-call_to_primop(erlang, '=:=', 2) -> {yes, ?PRIMOP_EXACT_EQ};
-call_to_primop(erlang, '=/=', 2) -> {yes, ?PRIMOP_EXACT_NE};
-call_to_primop(erlang, '<', 2) -> {yes, ?PRIMOP_LT};
-call_to_primop(erlang, '>', 2) -> {yes, ?PRIMOP_GT};
-call_to_primop(erlang, '=<', 2) -> {yes, ?PRIMOP_LE};
-call_to_primop(erlang, '>=', 2) -> {yes, ?PRIMOP_GE};
-call_to_primop(erlang, is_atom, 1) -> {yes, ?PRIMOP_IS_ATOM};
-call_to_primop(erlang, is_binary, 1) -> {yes, ?PRIMOP_IS_BINARY};
-call_to_primop(erlang, is_constant, 1) -> {yes, ?PRIMOP_IS_CONSTANT};
-call_to_primop(erlang, is_float, 1) -> {yes, ?PRIMOP_IS_FLOAT};
-call_to_primop(erlang, is_function, 1) -> {yes, ?PRIMOP_IS_FUNCTION};
-call_to_primop(erlang, is_integer, 1) -> {yes, ?PRIMOP_IS_INTEGER};
-call_to_primop(erlang, is_list, 1) -> {yes, ?PRIMOP_IS_LIST};
-call_to_primop(erlang, is_number, 1) -> {yes, ?PRIMOP_IS_NUMBER};
-call_to_primop(erlang, is_pid, 1) -> {yes, ?PRIMOP_IS_PID};
-call_to_primop(erlang, is_port, 1) -> {yes, ?PRIMOP_IS_PORT};
-call_to_primop(erlang, is_reference, 1) -> {yes, ?PRIMOP_IS_REFERENCE};
-call_to_primop(erlang, is_tuple, 1) -> {yes, ?PRIMOP_IS_TUPLE};
-call_to_primop(erlang, internal_is_record, 3) -> {yes, ?PRIMOP_IS_RECORD};
-call_to_primop(erlang, element, 2) -> {yes, ?PRIMOP_ELEMENT};
-call_to_primop(erlang, exit, 1) -> {yes, ?PRIMOP_EXIT};
-call_to_primop(erlang, throw, 1) -> {yes, ?PRIMOP_THROW};
-call_to_primop(erlang, error, 1) -> {yes, ?PRIMOP_ERROR};
-call_to_primop(erlang, error, 2) -> {yes, ?PRIMOP_ERROR};
-call_to_primop(erlang, fault, 1) -> {yes, ?PRIMOP_ERROR};
-call_to_primop(erlang, fault, 2) -> {yes, ?PRIMOP_ERROR};
-call_to_primop(_, _, _) -> no.
-
-%% Also, some primops (introduced by Erlang to Core Erlang translation
-%% and possibly other stages) must be recognized and rewritten.
-
-rewrite_primop(E, N, As, S) ->
-    case {cerl:atom_val(N), As} of
-	{match_fail, [R]} ->
-	    M = s__get_module_name(S),
-	    {F, A} = s__get_function_name(S),
-	    Stack = cerl:abstract([{M, F, A}]),
-	    case cerl:type(R) of
-		tuple ->
-		    %% Function clause failures have a special encoding
-		    %% as '{function_clause, Arg1, ..., ArgN}'.
-		    case cerl:tuple_es(R) of
-			[X | Xs] ->
-			    case cerl:is_c_atom(X) of
-				true ->
-				    case cerl:atom_val(X) of
-					function_clause ->
-					    FStack = cerl:make_list(
-						       [cerl:c_tuple(
-							  [cerl:c_atom(M),
-							   cerl:c_atom(F),
-							   cerl:make_list(Xs)])]),
-					    match_fail(E, X, FStack);
-					_ ->
-					    match_fail(E, R, Stack)
-				    end;
-				false ->
-				    match_fail(E, R, Stack)
-			    end;
-			_ ->
-			    match_fail(E, R, Stack)
-		    end;
-		_ ->
-		    match_fail(E, R, Stack)
-	    end;
-	_ ->
-	    cerl:update_c_primop(E, N, As)
-    end.
-
-match_fail(E, R, Stack) ->
-    cerl:update_c_primop(E, cerl:c_atom(?PRIMOP_ERROR), [R, Stack]).
-
-%% Simple let-definitions (of degree 1) in guard context are always
-%% inline expanded. This is allowable, since they cannot have side
-%% effects, and it makes it easy to generate good code for boolean
-%% expressions. It could cause repeated evaluations, but typically,
-%% local definitions within guards are used exactly once.
-
-let_expr(E, Env, Ren, Ctxt, S) ->
-    if Ctxt#ctxt.class == guard ->
-	    case cerl:let_vars(E) of
-		[V] ->
-		    {Name, Ren1} = rename(cerl:var_name(V), Env, Ren),
-		    Env1 = env__bind(Name, {expr, cerl:let_arg(E)}, Env),
-		    expr(cerl:let_body(E), Env1, Ren1, Ctxt, S);
-		_ ->
-		    let_expr_1(E, Env, Ren, Ctxt, S)
-	    end;
-       true ->
-	    let_expr_1(E, Env, Ren, Ctxt, S)
-    end.
-
-let_expr_1(E, Env, Ren, Ctxt, S0) ->
-    {A, S1} = expr(cerl:let_arg(E), Env, Ren, Ctxt, S0),
-    Vs = cerl:let_vars(E),
-    {Vs1, Env1, Ren1} = add_vars(Vs, Env, Ren),
-    {B, S2} = expr(cerl:let_body(E), Env1, Ren1, Ctxt, S1),
-    {cerl:update_c_let(E, Vs1, A, B), S2}.
-
-variable(E, Env, Ren, Ctxt, S) ->
-    V = ren__map(cerl:var_name(E), Ren),
-    if Ctxt#ctxt.class == guard ->
-	    case env__lookup(V, Env) of
-		{ok, {expr, E1}} ->
-		    expr(E1, Env, Ren, Ctxt, S);   % inline
-		_ ->
-		    %% Since we don't track all bindings when we revisit
-		    %% guards, some names will not be in the environment.
-		    variable_1(E, V, S)
-	    end;
-       true ->
-	    variable_1(E, V, S)
-    end.
-
-variable_1(E, V, S) ->
-    {cerl:update_c_var(E, V), S}.
-
-%% A catch-expression 'catch Expr' is rewritten as:
-%%
-%%	try Expr
-%%	of (V) -> V
-%%	catch (T, V, E) ->
-%%	    letrec 'wrap'/1 = fun (V) -> {'EXIT', V}
-%%	    in case T of
-%%	         'throw' when 'true' -> V
-%%	         'exit' when 'true' -> 'wrap'/1(V)
-%%	         V when 'true' ->
-%%	             'wrap'/1({V, erlang:get_stacktrace()})
-%%	       end
-
-catch_expr(E, Env, Ren, Ctxt, S) ->
-    T = cerl:c_var('T'),
-    V = cerl:c_var('V'),
-    X = cerl:c_var('X'),
-    W = cerl:c_var({wrap,1}),
-    G = cerl:c_call(cerl:c_atom('erlang'),cerl:c_atom('get_stacktrace'),[]),
-    Cs = [cerl:c_clause([cerl:c_atom('throw')], V),
-	  cerl:c_clause([cerl:c_atom('exit')], cerl:c_apply(W, [V])),
-	  cerl:c_clause([T], cerl:c_apply(W, [cerl:c_tuple([V,G])]))
-	 ],
-    C = cerl:c_case(T, Cs),
-    F = cerl:c_fun([V], cerl:c_tuple([cerl:c_atom('EXIT'), V])),
-    H = cerl:c_letrec([{W,F}], C),
-    As = cerl:get_ann(E),
-    {B, S1} = expr(cerl:catch_body(E),Env, Ren, Ctxt, S),
-    {cerl:ann_c_try(As, B, [V], V, [T,V,X], H), S1}.
-
-%% Receive-expressions are rewritten as follows:
-%%
-%%	receive
-%%	    P1 when G1 -> B1
-%%	      ...
-%%	    Pn when Gn -> Bn
-%%	after T -> A end
-%% becomes:
-%%	receive
-%%	    M when 'true' ->
-%%	      case M of
-%%	        P1 when G1 -> do primop RECEIVE_SELECT B1
-%%	          ...
-%%	        Pn when Gn -> do primop RECEIVE_SELECT Bn
-%%	        Pn+1 when 'true' -> primop RECEIVE_NEXT()
-%%	    end
-%%	after T -> A end
-
-receive_expr(E, Env, Ren, Ctxt, S0) ->
-    Cs = cerl:receive_clauses(E),
-    {B, Vs, S1} = clauses(receive_clauses(Cs), Env, Ren, Ctxt, S0),
-    {T, S2} = expr(cerl:receive_timeout(E), Env, Ren, Ctxt, S1),
-    {A, S3} = expr(cerl:receive_action(E), Env, Ren, Ctxt, S2),
-    Cs1 = [cerl:c_clause(Vs, B)],
-    {cerl:update_c_receive(E, Cs1, T, A), S3}.
-
-receive_clauses([C | Cs]) ->
-    Call = cerl:c_primop(cerl:c_atom(?PRIMOP_RECEIVE_SELECT),
-			 []),
-    B = cerl:c_seq(Call, cerl:clause_body(C)),
-    C1 =  cerl:update_c_clause(C, cerl:clause_pats(C),
-			       cerl:clause_guard(C), B),
-    [C1 | receive_clauses(Cs)];
-receive_clauses([]) ->
-    Call = cerl:c_primop(cerl:c_atom(?PRIMOP_RECEIVE_NEXT),
-			 []),
-    V = cerl:c_var('X'),    % any name is ok
-    [cerl:c_clause([V], Call)].
-
-
-new_vars(N, Env) ->
-    [cerl:c_var(V) || V <- env__new_names(N, Env)].
-
-
-%% ---------------------------------------------------------------------
-%% Environment
-
-env__new() ->
-    rec_env:empty().
-
-env__bind(Key, Value, Env) ->
-    rec_env:bind(Key, Value, Env).
-
-%% env__get(Key, Env) ->
-%%     rec_env:get(Key, Env).
-
-env__lookup(Key, Env) ->
-    rec_env:lookup(Key, Env).
-
-env__is_defined(Key, Env) ->
-    rec_env:is_defined(Key, Env).
-
-env__new_name(Env) ->
-    rec_env:new_key(Env).
-
-env__new_names(N, Env) ->
-    rec_env:new_keys(N, Env).
-
-env__new_function_name(F, Env) ->
-    rec_env:new_key(F, Env).
-
-
-%% ---------------------------------------------------------------------
-%% Renaming
-
-ren__new() ->
-    dict:new().
-
-ren__add(Key, Value, Ren) ->
-    dict:store(Key, Value, Ren).
-
-ren__map(Key, Ren) ->
-    case dict:find(Key, Ren) of
-	{ok, Value} ->
-	    Value;
-	error ->
-	    Key
-    end.
-
-
-%% ---------------------------------------------------------------------
-%% State
-
--record(state, {module, function, pmatch=true}).
-
-s__new(Module) ->
-    #state{module = Module}.
-
-s__get_module_name(S) ->
-    S#state.module.
-
-s__enter_function(F, S) ->
-    S#state{function = F}.
-
-s__get_function_name(S) ->
-    S#state.function.
-
-s__set_pmatch(V, S) ->
-    S#state{pmatch = V}.
-
-s__get_pmatch(S) ->
-    S#state.pmatch.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_acceptor.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_acceptor.erl
deleted file mode 100644
index 2aef625dc6..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_acceptor.erl
+++ /dev/null
@@ -1,120 +0,0 @@
-%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%
-%   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.
-%%%-------------------------------------------------------------------
-%%% File    : comm_acceptor.erl
-%%% Author  : Thorsten Schuett <[email protected]>
-%%% Description : Acceptor
-%%%           This module accepts new connections and starts corresponding 
-%%%           comm_connection processes.
-%%%
-%%% Created : 18 Apr 2008 by Thorsten Schuett <[email protected]>
-%%%-------------------------------------------------------------------
-%% @author Thorsten Schuett <[email protected]>
-%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%% @version $Id $
--module(comm_layer_dir.comm_acceptor).
-
--export([start_link/1, init/2]).
-
--import(config).
--import(gen_tcp).
--import(inet).
--import(log).
--import(lists).
--import(process_dictionary).
-
-start_link(InstanceId) ->
-    Pid = spawn_link(comm_layer_dir.comm_acceptor, init, [InstanceId, self()]),
-    receive
-        {started} ->
-            {ok, Pid}
-    end.
-
-init(InstanceId, Supervisor) ->
-    process_dictionary:register_process(InstanceId, acceptor, self()),
-    erlang:register(comm_layer_acceptor, self()),
-   log:log(info,"[ CC ] listening on ~p:~p", [config:listenIP(), config:listenPort()]),
-    LS = case config:listenIP() of
-		       undefined ->
-			   open_listen_port(config:listenPort(), first_ip());
-		       _ ->
-			   open_listen_port(config:listenPort(), config:listenIP())
-		   end,
-    {ok, {_LocalAddress, LocalPort}} = inet:sockname(LS),
-    comm_port:set_local_address(undefined, LocalPort),
-    %io:format("this() == ~w~n", [{LocalAddress, LocalPort}]),
-    Supervisor ! {started},
-    server(LS).
-
-server(LS) ->
-    case gen_tcp:accept(LS) of
-	{ok, S} ->
-	    case comm_port:get_local_address_port() of
-		{undefined, LocalPort} ->
-		    {ok, {MyIP, _LocalPort}} = inet:sockname(S),
-		    comm_port:set_local_address(MyIP, LocalPort);
-		_ ->
-		    ok
-	    end,
-	    receive
-		{tcp, S, Msg} ->
-		    {endpoint, Address, Port} = binary_to_term(Msg),
-		    % auto determine remote address, when not sent correctly
- 		    NewAddress = if Address =:= {0,0,0,0} orelse Address =:= {127,0,0,1} ->  
- 			    case inet:peername(S) of
- 				{ok, {PeerAddress, _Port}} -> 
-				    % io:format("Sent Address ~p\n",[Address]),
-				    % io:format("Peername is ~p\n",[PeerAddress]),
-				    PeerAddress;
- 				{error, _Why} ->
- 				    % io:format("Peername error ~p\n",[Why]).
-				    Address
- 			    end;
-  			true ->
-  			    % io:format("Address is ~p\n",[Address]),
-			    Address
-		    end,
-		    NewPid = comm_connection:new(NewAddress, Port, S),
-		    gen_tcp:controlling_process(S, NewPid),
-		    inet:setopts(S, [{active, once}, {send_timeout, config:read(tcp_send_timeout)}]),
-		    comm_port:register_connection(NewAddress, Port, NewPid, S)
-	    end,
-	    server(LS);
-	Other ->
-            log:log(warn,"[ CC ] unknown message ~p", [Other])
-    end.
-
-open_listen_port({From, To}, IP) ->
-    open_listen_port(lists:seq(From, To), IP);
-open_listen_port([Port | Rest], IP) ->
-    case gen_tcp:listen(Port, [binary, {packet, 4}, {reuseaddr, true}, 
-					      {active, once}, {ip, IP}]) of
-	{ok, Socket} ->
-	    Socket;
-	{error, Reason} ->
-	   log:log(error,"[ CC ] can't listen on ~p: ~p~n", [Port, Reason]),
-	    open_listen_port(Rest, IP)
-    end;
-open_listen_port([], _) ->
-    abort;
-open_listen_port(Port, IP) ->
-    open_listen_port([Port], IP).
-
--include_lib("kernel/include/inet.hrl").
-
-first_ip() ->
-    {ok, Hostname} = inet:gethostname(),
-    {ok, HostEntry} = inet:gethostbyname(Hostname),
-    erlang:hd(HostEntry#hostent.h_addr_list).
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_connection.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_connection.erl
deleted file mode 100644
index 8dca647f6d..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_connection.erl
+++ /dev/null
@@ -1,206 +0,0 @@
-%  Copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
-%
-%   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.
-%%%-------------------------------------------------------------------
-%%% File    : comm_connection.erl
-%%% Author  : Thorsten Schuett <[email protected]>
-%%% Description : creates and destroys connections and represents the 
-%%%           endpoint of a connection where messages are received and 
-%%            send from/to the network.
-%%%
-%%% Created : 18 Apr 2008 by Thorsten Schuett <[email protected]>
-%%%-------------------------------------------------------------------
-%% @author Thorsten Schuett <[email protected]>
-%% @copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
-%% @version $Id $
--module(comm_layer_dir.comm_connection).
-
--export([send/3, open_new/4, new/3, open_new_async/4]).
-
--import(config).
--import(gen_tcp).
--import(inet).
--import(io).
--import(io_lib).
--import(log).
--import(timer).
-
--include("comm_layer.hrl").
-
-%% @doc new accepted connection. called by comm_acceptor
-%% @spec new(inet:ip_address(), int(), socket()) -> pid()
-new(Address, Port, Socket) ->
-    spawn(fun () -> loop(Socket, Address, Port) end).
-
-%% @doc open new connection
-%% @spec open_new(inet:ip_address(), int(), inet:ip_address(), int()) -> 
-%%       {local_ip, inet:ip_address(), int(), pid(), inet:socket()} 
-%%     | fail 
-%%     | {connection, pid(), inet:socket()}
-open_new(Address, Port, undefined, MyPort) ->
-    Myself = self(),
-    LocalPid = spawn(fun () ->
-  			     case new_connection(Address, Port, MyPort) of
-				 fail -> 
-				     Myself ! {new_connection_failed};
-				 Socket ->
-				     {ok, {MyIP, _MyPort}} = inet:sockname(Socket),
-				     Myself ! {new_connection_started, MyIP, MyPort, Socket},
-				     loop(Socket, Address, Port)
-			     end
-  		     end),
-    receive
-  	{new_connection_failed} ->
-	    fail;
-  	{new_connection_started, MyIP, MyPort, S} ->
-  	    {local_ip, MyIP, MyPort, LocalPid, S}
-    end;
-open_new(Address, Port, _MyAddress, MyPort) ->
-    Owner = self(),
-    LocalPid = spawn(fun () ->
-			     case new_connection(Address, Port, MyPort) of
-				 fail ->
-				     Owner ! {new_connection_failed};
-				 Socket ->
-				     Owner ! {new_connection_started, Socket},
-				     loop(Socket, Address, Port) 
-			     end
-		     end),
-    receive
-	{new_connection_failed} ->
-	    fail;
-	{new_connection_started, Socket} ->
-	    {connection, LocalPid, Socket}
-    end.
-
-% ===============================================================================
-% @doc open a new connection asynchronously
-% ===============================================================================
--spec(open_new_async/4 :: (any(), any(), any(), any()) -> pid()).
-open_new_async(Address, Port, _MyAddr, MyPort) ->
-    Pid = spawn(fun () ->
-			case new_connection(Address, Port, MyPort) of
-			    fail ->
-				comm_port:unregister_connection(Address, Port),
-				ok;
-			    Socket ->
-				loop(Socket, Address, Port)
-			end
-		end),
-    Pid.
-
-
-send({Address, Port, Socket}, Pid, Message) ->
-    BinaryMessage = term_to_binary({deliver, Pid, Message}),
-    SendTimeout    = config:read(tcp_send_timeout),
-    {Time, Result} = timer:tc(gen_tcp, send, [Socket, BinaryMessage]),
-    if
-	Time > 1200 * SendTimeout ->
-	    log:log(error,"[ CC ] send to ~p took ~p: ~p", 
-		    [Address, Time, inet:getopts(Socket, [keep_alive, send_timeout])]);
-	true ->
-	    ok
-    end,
-    case Result of
-	ok ->
-	    ?LOG_MESSAGE(erlang:element(1, Message), byte_size(BinaryMessage)),
-	    ok;
-	{error, closed} ->
-	    comm_port:unregister_connection(Address, Port),
-	    close_connection(Socket);
-	{error, _Reason} ->
-	    %log:log(error,"[ CC ] couldn't send to ~p:~p (~p)", [Address, Port, Reason]),
-	    comm_port:unregister_connection(Address, Port),
-	    close_connection(Socket)
-    end.
-
-loop(fail, Address, Port) ->
-    comm_port:unregister_connection(Address, Port),
-    ok;
-loop(Socket, Address, Port) ->
-    receive
-	{send, Pid, Message} ->
-	    case send({Address, Port, Socket}, Pid, Message) of
-		ok -> loop(Socket, Address, Port);
-		_ -> ok
-	    end;
-	{tcp_closed, Socket} ->
-	    	comm_port:unregister_connection(Address, Port),
-	    	gen_tcp:close(Socket);
-	{tcp, Socket, Data} ->
-	    case binary_to_term(Data) of
-	        {deliver, Process, Message} ->
-		    Process ! Message,
-		    inet:setopts(Socket, [{active, once}]),
-		    loop(Socket, Address, Port);
-		{user_close} ->
-		    comm_port:unregister_connection(Address, Port),
-		    gen_tcp:close(Socket);
-		{youare, _Address, _Port} ->
-		    %% @TODO what do we get from this information?
-		    inet:setopts(Socket, [{active, once}]),
-		    loop(Socket, Address, Port);
-		Unknown ->
-		    log:log(warn,"[ CC ] unknown message ~p", [Unknown]),
-		    inet:setopts(Socket, [{active, once}]),
-		    loop(Socket, Address, Port)
-	    end;
-
-	{youare, _IP, _Port} ->
-	    loop(Socket, Address, Port);
-
-        Unknown ->
-	    log:log(warn,"[ CC ] unknown message2 ~p", [Unknown]) ,
-	    loop(Socket, Address, Port)
-    end.
-
-% ===============================================================================
-
--spec(new_connection(inet:ip_address(), integer(), integer()) -> inet:socket() | fail).
-new_connection(Address, Port, MyPort) ->
-    case gen_tcp:connect(Address, Port, [binary, {packet, 4}, {nodelay, true}, {active, once}, 
-					 {send_timeout, config:read(tcp_send_timeout)}], 
-			 config:read(tcp_connect_timeout)) of
-        {ok, Socket} ->
-	    % send end point data
-	    case inet:sockname(Socket) of
-		{ok, {MyAddress, _MyPort}} ->
-		    Message = term_to_binary({endpoint, MyAddress, MyPort}),
-	            gen_tcp:send(Socket, Message),
-		    case inet:peername(Socket) of
-			{ok, {RemoteIP, RemotePort}} ->
-			    YouAre = term_to_binary({youare, RemoteIP, RemotePort}),
-		            gen_tcp:send(Socket, YouAre),
-		            Socket;
-			{error, _Reason} ->
-			    %log:log(error,"[ CC ] reconnect to ~p because socket is ~p", 
-				%    [Address, Reason]),
-			    close_connection(Socket),
-	    		    new_connection(Address, Port, MyPort)
-		    end;
-		{error, _Reason} ->
-		    %log:log(error,"[ CC ] reconnect to ~p because socket is ~p", 
-			%    [Address, Reason]),
-		    close_connection(Socket),
-	            new_connection(Address, Port, MyPort)
-	    end;
-        {error, _Reason} ->
-            %log:log(error,"[ CC ] couldn't connect to ~p:~p (~p)", 
-		    %[Address, Port, Reason]),
-	    fail
-    end.
-    
-close_connection(Socket) ->
-    spawn( fun () ->
-		   gen_tcp:close(Socket)
-	   end ).
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_layer.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_layer.erl
deleted file mode 100644
index f48324e49c..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_layer.erl
+++ /dev/null
@@ -1,83 +0,0 @@
-%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%
-%   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.
-%%%-------------------------------------------------------------------
-%%% File    : comm_layer.erl
-%%% Author  : Thorsten Schuett <[email protected]>
-%%% Description : Public interface to Communication Layer. 
-%%%           Generic functions to send messages.
-%%%           Distinguishes on runtime whether the destination is in the 
-%%%           same Erlang virtual machine (use ! for sending) or on a remote
-%%%           site (use comm_port:send()).
-%%%
-%%% Created :  04 Feb 2008 by Thorsten Schuett <[email protected]>
-%%%-------------------------------------------------------------------
-%% @author Thorsten Schuett <[email protected]>
-%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%% @version $Id $
--module(comm_layer_dir.comm_layer).
-
--author('[email protected]').
--vsn('$Id: comm_layer.erl,v 1.1 2009/11/06 12:41:36 maria Exp $ ').
-
--export([start_link/0, send/2, this/0, here/1]).
-
--import(io).
--import(util).
--import(log).
-
--include("comm_layer.hrl").
-
-
-% @TODO: should be ip
--type(process_id() :: {any(), integer(), pid()}).
-%%====================================================================
-%% public functions
-%%====================================================================
-
-%% @doc starts the communication port (for supervisor)
-%% @spec start_link() -> {ok,Pid} | ignore | {error,Error}
-start_link() ->
-    comm_port_sup:start_link().
-
-%% @doc a process descriptor has to specify the erlang vm 
-%%      + the process inside. {IP address, port, pid}
-%% @type process_id() = {inet:ip_address(), int(), pid()}.
-%% @spec send(process_id(), term()) -> ok
-
-send({{_IP1, _IP2, _IP3, _IP4} = _IP, _Port, _Pid} = Target, Message) ->
-    {MyIP,MyPort} = comm_port:get_local_address_port(),
-    %io:format("send: ~p:~p -> ~p:~p(~p) : ~p\n", [MyIP, MyPort, _IP, _Port, _Pid, Message]),
-    IsLocal = (MyIP == _IP) and (MyPort == _Port),
-    if
- 	IsLocal ->        
-	    ?LOG_MESSAGE(erlang:element(1, Message), byte_size(term_to_binary(Message))),
- 	    _Pid ! Message;
- 	true ->
-	    comm_port:send(Target, Message)
-    end;
-
-send(Target, Message) ->
-    log:log(error,"[ CC ] wrong call to cs_send:send: ~w ! ~w", [Target, Message]),
-    log:log(error,"[ CC ] stacktrace: ~w", [util:get_stacktrace()]),
-    ok.
-
-%% @doc returns process descriptor for the calling process
--spec(this/0 :: () -> atom()).%process_id()).
-this() ->
-    here(self()).
-
--spec(here/1 :: (pid()) -> process_id()).
-here(Pid) ->
-    {LocalIP, LocalPort} = comm_port:get_local_address_port(),
-    {LocalIP, LocalPort, Pid}.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_layer.hrl b/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_layer.hrl
deleted file mode 100644
index f4e4d560f7..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_layer.hrl
+++ /dev/null
@@ -1,30 +0,0 @@
-%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%
-%   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.
-%%%-------------------------------------------------------------------
-%%% File    : comm_layer.hrl
-%%% Author  : Thorsten Schuett <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 31 Jul 2008 by Thorsten Schuett <[email protected]>
-%%%-------------------------------------------------------------------
-%% @author Thorsten Schuett <[email protected]>
-%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%% @version $Id: comm_layer.hrl,v 1.1 2009/11/06 12:41:36 maria Exp $
--author('[email protected]').
--vsn('$Id: comm_layer.hrl,v 1.1 2009/11/06 12:41:36 maria Exp $ ').
-
-% enable logging of message statistics
-%-define(LOG_MESSAGE(TAG, SIZE), comm_layer.comm_logger:log(TAG, SIZE)).
--define(LOG_MESSAGE(TAG, SIZE), ok).
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_logger.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_logger.erl
deleted file mode 100644
index c70b0d3438..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_logger.erl
+++ /dev/null
@@ -1,143 +0,0 @@
-%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%
-%   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.
-%%%-------------------------------------------------------------------
-%%% File    : comm_logger.erl
-%%% Author  : Thorsten Schuett <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 31 Jul 2008 by Thorsten Schuett <[email protected]>
-%%%-------------------------------------------------------------------
-%% @author Thorsten Schuett <[email protected]>
-%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%% @version $Id: comm_logger.erl,v 1.1 2009/11/06 12:41:36 maria Exp $
--module(comm_layer_dir.comm_logger).
-
--author('[email protected]').
--vsn('$Id: comm_logger.erl,v 1.1 2009/11/06 12:41:36 maria Exp $ ').
-
--behaviour(gen_server).
-
--import(gb_trees).
--import(gen_server).
-
-%% API
--export([start_link/0]).
-
--export([log/2, dump/0]).
-
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
-
--record(state, {start, map}).
-
-%%====================================================================
-%% API
-%%====================================================================
-%%--------------------------------------------------------------------
-%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
-%% Description: Starts the server
-%%--------------------------------------------------------------------
-start_link() ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
-
-%%--------------------------------------------------------------------
-%% Function: log(Tag, Size) -> ok
-%% Description: logs a message type with its size
-%%--------------------------------------------------------------------
-log(Tag, Size) ->
-    gen_server:cast(?MODULE, {log, Tag, Size}).
-
-%%--------------------------------------------------------------------
-%% Function: dump() -> {gb_tree:gb_trees(), {Date, Time}}
-%% Description: gets the logging state
-%%--------------------------------------------------------------------
-dump() ->
-    gen_server:call(?MODULE, {dump}).
-
-%%====================================================================
-%% gen_server callbacks
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: init(Args) -> {ok, State} |
-%%                         {ok, State, Timeout} |
-%%                         ignore               |
-%%                         {stop, Reason}
-%% Description: Initiates the server
-%%--------------------------------------------------------------------
-init([]) ->
-    {ok, #state{start=erlang:now(), map=gb_trees:empty()}}.
-
-%%--------------------------------------------------------------------
-%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
-%%                                      {reply, Reply, State, Timeout} |
-%%                                      {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, Reply, State} |
-%%                                      {stop, Reason, State}
-%% Description: Handling call messages
-%%--------------------------------------------------------------------
-handle_call({dump}, _From, State) ->
-    Reply = {State#state.map, State#state.start},
-    {reply, Reply, State};
-handle_call(_Request, _From, State) ->
-    Reply = ok,
-    {reply, Reply, State}.
-
-%%--------------------------------------------------------------------
-%% Function: handle_cast(Msg, State) -> {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, State}
-%% Description: Handling cast messages
-%%--------------------------------------------------------------------
-handle_cast({log, Tag, Size}, State) ->
-    case gb_trees:lookup(Tag, State#state.map) of
-	none ->
-	    {noreply, State#state{map=gb_trees:insert(Tag, {Size, 1}, State#state.map)}};
-	{value, {OldSize, OldCount}} ->
-	    {noreply, State#state{map=gb_trees:update(Tag, {Size + OldSize, OldCount + 1}, State#state.map)}}
-    end;
-handle_cast(_Msg, State) ->
-    {noreply, State}.
-
-%%--------------------------------------------------------------------
-%% Function: handle_info(Info, State) -> {noreply, State} |
-%%                                       {noreply, State, Timeout} |
-%%                                       {stop, Reason, State}
-%% Description: Handling all non call/cast messages
-%%--------------------------------------------------------------------
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-%%--------------------------------------------------------------------
-%% Function: terminate(Reason, State) -> void()
-%% Description: This function is called by a gen_server when it is about to
-%% terminate. It should be the opposite of Module:init/1 and do any necessary
-%% cleaning up. When it returns, the gen_server terminates with Reason.
-%% The return value is ignored.
-%%--------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%--------------------------------------------------------------------
-%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
-%% Description: Convert process state when code is changed
-%%--------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_port.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_port.erl
deleted file mode 100644
index 5eded48750..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_port.erl
+++ /dev/null
@@ -1,240 +0,0 @@
-%  Copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
-%
-%   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.
-%%%-------------------------------------------------------------------
-%%% File    : comm_port.erl
-%%% Author  : Thorsten Schuett <[email protected]>
-%%% Description : Main CommLayer Interface
-%%%           Maps remote addresses to comm_connection PIDs.
-%%%
-%%% Created : 18 Apr 2008 by Thorsten Schuett <[email protected]>
-%%%-------------------------------------------------------------------
-%% @author Thorsten Schuett <[email protected]>
-%% @copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
-%% @version $Id $
--module(comm_layer_dir.comm_port).
-
--author('[email protected]').
--vsn('$Id: comm_port.erl,v 1.1 2009/11/06 12:41:36 maria Exp $ ').
-
--behaviour(gen_server).
-
--import(ets).
--import(gen_server).
--import(io).
--import(log).
-
--define(ASYNC, true).
-%-define(SYNC, true).
-
-%% API
--export([start_link/0,
-	send/2,
-	unregister_connection/2, register_connection/4,
-	set_local_address/2, get_local_address_port/0]).
-
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
-
-%%====================================================================
-%% API
-%%====================================================================
-
-%% @doc 
-%% @spec send({inet:ip_address(), int(), pid()}, term()) -> ok
--ifdef(ASYNC).
-send({Address, Port, Pid}, Message) ->
-    gen_server:call(?MODULE, {send, Address, Port, Pid, Message}, 20000).
--endif.
--ifdef(SYNC).
-send({Address, Port, Pid}, Message) ->
-    case ets:lookup(?MODULE, {Address, Port}) of
-	[{{Address, Port}, {_LPid, Socket}}] ->
-	    comm_connection:send({Address, Port, Socket}, Pid, Message), 
-	    ok;
-	[] ->
-	    gen_server:call(?MODULE, {send, Address, Port, Pid, Message}, 20000)
-    end.
--endif.
-
-
-%% @doc 
-%% @spec unregister_connection(inet:ip_address(), int()) -> ok
-unregister_connection(Adress, Port) ->
-    gen_server:call(?MODULE, {unregister_conn, Adress, Port}, 20000).
-
-%% @doc 
-%% @spec register_connection(inet:ip_address(), int(), pid(), gen_tcp:socket()) -> ok | duplicate
-register_connection(Adress, Port, Pid, Socket) ->
-    gen_server:call(?MODULE, {register_conn, Adress, Port, Pid, Socket}, 20000).
-
-%% @doc 
-%% @spec set_local_address(inet:ip_address(), int()) -> ok
-set_local_address(Address, Port) ->
-    gen_server:call(?MODULE, {set_local_address, Address, Port}, 20000).
-
-
-%% @doc 
-%% @spec get_local_address_port() -> {inet:ip_address(),int()}
-get_local_address_port() ->
-    case ets:lookup(?MODULE, local_address_port) of
-     	[{local_address_port, Value}] ->
- 	    Value;
- 	[] ->
- 	    undefined
-    end.
-
-%%--------------------------------------------------------------------
-%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
-%% Description: Starts the server
-%%--------------------------------------------------------------------
-start_link() ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
-
-%%====================================================================
-%% gen_server callbacks
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: init(Args) -> {ok, State} |
-%%                         {ok, State, Timeout} |
-%%                         ignore               |
-%%                         {stop, Reason}
-%% Description: Initiates the server
-%%--------------------------------------------------------------------
-init([]) ->
-    ets:new(?MODULE, [set, protected, named_table]),
-    {ok, ok}. % empty state.
-
-%%--------------------------------------------------------------------
-%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
-%%                                      {reply, Reply, State, Timeout} |
-%%                                      {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, Reply, State} |
-%%                                      {stop, Reason, State}
-%% Description: Handling call messages
-%%--------------------------------------------------------------------
-handle_call({send, Address, Port, Pid, Message}, _From, State) ->
-    send(Address, Port, Pid, Message, State);
-
-handle_call({unregister_conn, Address, Port}, _From, State) ->
-    ets:delete(?MODULE, {Address, Port}),
-    {reply, ok, State};
-
-handle_call({register_conn, Address, Port, Pid, Socket}, _From, State) ->
-    case ets:lookup(?MODULE, {Address, Port}) of
-	[{{Address, Port}, _}] ->
-	    {reply, duplicate, State};
-	[] ->
-	    ets:insert(?MODULE, {{Address, Port}, {Pid, Socket}}),
-	    {reply, ok, State}
-    end;
-
-handle_call({set_local_address, Address, Port}, _From, State) ->
-    ets:insert(?MODULE, {local_address_port, {Address,Port}}),
-    {reply, ok, State}.
-
-%%--------------------------------------------------------------------
-%% Function: handle_cast(Msg, State) -> {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, State}
-%% Description: Handling cast messages
-%%--------------------------------------------------------------------
-handle_cast(_Msg, State) ->
-    {noreply, State}.
-
-%%--------------------------------------------------------------------
-%% Function: handle_info(Info, State) -> {noreply, State} |
-%%                                       {noreply, State, Timeout} |
-%%                                       {stop, Reason, State}
-%% Description: Handling all non call/cast messages
-%%--------------------------------------------------------------------
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-%%--------------------------------------------------------------------
-%% Function: terminate(Reason, State) -> void()
-%% Description: This function is called by a gen_server when it is about to
-%% terminate. It should be the opposite of Module:init/1 and do any necessary
-%% cleaning up. When it returns, the gen_server terminates with Reason.
-%% The return value is ignored.
-%%--------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%--------------------------------------------------------------------
-%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
-%% Description: Convert process state when code is changed
-%%--------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-
--ifdef(ASYNC).
-send(Address, Port, Pid, Message, State) ->
-    {DepAddr,DepPort} = get_local_address_port(),
-    if
-	DepAddr == undefined ->
-	    open_sync_connection(Address, Port, Pid, Message, State);
-	true ->
-	    case ets:lookup(?MODULE, {Address, Port}) of
-		[{{Address, Port}, {ConnPid, _Socket}}] ->
-		    ConnPid ! {send, Pid, Message},
-		    {reply, ok, State};
-		[] ->
-		    ConnPid = comm_connection:open_new_async(Address, Port, 
-							     DepAddr, DepPort),
-		    ets:insert(?MODULE, {{Address, Port}, {ConnPid, undef}}),
-		    ConnPid ! {send, Pid, Message},
-		    {reply, ok, State}
-	    end
-    end.
--endif.
-
--ifdef(SYNC).
-send(Address, Port, Pid, Message, State) ->
-    case ets:lookup(?MODULE, {Address, Port}) of
-	[{{Address, Port}, {_LPid, Socket}}] ->
-	    comm_connection:send({Address, Port, Socket}, Pid, Message), 
-	    {reply, ok, State};
-	[] ->
-	    open_sync_connection(Address, Port, Pid, Message, State)
-    end.
--endif.
-
-
-open_sync_connection(Address, Port, Pid, Message, State) ->
-    {DepAddr,DepPort} = get_local_address_port(),
-    case comm_connection:open_new(Address, Port, DepAddr, DepPort) of
-	{local_ip, MyIP, MyPort, MyPid, MySocket} ->
-	    comm_connection:send({Address, Port, MySocket}, Pid, Message),
-	    log:log(info,"[ CC ] this() == ~w", [{MyIP, MyPort}]),
-						%		    set_local_address(t, {MyIP,MyPort}}),
-						%		    register_connection(Address, Port, MyPid, MySocket),
-	    ets:insert(?MODULE, {local_address_port, {MyIP,MyPort}}),
-	    ets:insert(?MODULE, {{Address, Port}, {MyPid, MySocket}}),
-	    {reply, ok, State};
-	fail ->
-						% drop message (remote node not reachable, failure detector will notice)
-	    {reply, ok, State};
-	{connection, LocalPid, NewSocket} ->
-	    comm_connection:send({Address, Port, NewSocket}, Pid, Message),
-	    ets:insert(?MODULE, {{Address, Port}, {LocalPid, NewSocket}}),
-						%		    register_connection(Address, Port, LPid, NewSocket),
-	    {reply, ok, State}
-    end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_port_sup.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_port_sup.erl
deleted file mode 100644
index 622d0a8c06..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/comm_layer/comm_port_sup.erl
+++ /dev/null
@@ -1,90 +0,0 @@
-%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%
-%   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.
-%%%-------------------------------------------------------------------
-%%% File    : comm_port_sup.erl
-%%% Author  : Thorsten Schuett <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 04 Feb 2008 by Thorsten Schuett <[email protected]>
-%%%-------------------------------------------------------------------
-%% @author Thorsten Schuett <[email protected]>
-%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%% @version $Id: comm_port_sup.erl,v 1.1 2009/11/06 12:41:36 maria Exp $
--module(comm_layer_dir.comm_port_sup).
-
--author('[email protected]').
--vsn('$Id: comm_port_sup.erl,v 1.1 2009/11/06 12:41:36 maria Exp $ ').
-
--behaviour(supervisor).
-
--import(supervisor).
--import(randoms).
--import(string).
--import(config).
-
--export([start_link/0, init/1]).
-
-%%====================================================================
-%% API functions
-%%====================================================================
-%%--------------------------------------------------------------------
-%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
-%% Description: Starts the supervisor
-%%--------------------------------------------------------------------
-start_link() ->
-    supervisor:start_link(?MODULE, []).
-
-%%====================================================================
-%% Supervisor callbacks
-%%====================================================================
-%%--------------------------------------------------------------------
-%% Func: init(Args) -> {ok,  {SupFlags,  [ChildSpec]}} |
-%%                     ignore                          |
-%%                     {error, Reason}
-%% Description: Whenever a supervisor is started using 
-%% supervisor:start_link/[2,3], this function is called by the new process 
-%% to find out about restart strategy, maximum restart frequency and child 
-%% specifications.
-%%--------------------------------------------------------------------
-init([]) ->
-    InstanceId = string:concat("comm_port_", randoms:getRandomId()),
-    CommPort =
-	{comm_port,
-	 {comm_layer_dir.comm_port, start_link, []},
-	 permanent,
-	 brutal_kill,
-	 worker,
-	 []},
-    CommAcceptor =
-	{comm_acceptor,
-	 {comm_layer_dir.comm_acceptor, start_link, [InstanceId]},
-	 permanent,
-	 brutal_kill,
-	 worker,
-	 []},
-    CommLogger =
-	{comm_logger,
-	 {comm_layer_dir.comm_logger, start_link, []},
-	 permanent,
-	 brutal_kill,
-	 worker,
-	 []},
-    {ok, {{one_for_all, 10, 1},
-	  [
-	   CommPort,
-	   CommLogger,
-	   CommAcceptor	   
-	  ]}}.
-    
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/compare1.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/compare1.erl
deleted file mode 100644
index 2626d2ebea..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/compare1.erl
+++ /dev/null
@@ -1,21 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : compare1.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 20 Apr 2007 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(compare1).
-
--export([t/0]).
-
-t() ->
-  t(42).
-
-t(X) when X > 42 ->
-  error;
-t(X) when X < 42 ->
-  error;
-t(X) when X =/= 42 ->
-  error;
-t(X) -> ok.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/contract2.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/contract2.erl
deleted file mode 100644
index 83ee5910f2..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/contract2.erl
+++ /dev/null
@@ -1,18 +0,0 @@
--module(contract2).
--export([test/2]).
-
--spec test(list(), list()) -> ok.
-
-test([], []) ->
-  ok;
-test([], L) ->
-  raise(L);
-test([H|T], L) ->
-  case H of
-    true -> test(T, L);
-    false -> test(T, [H|L])
-  end.
-
--spec raise(_) -> no_return().
-raise(X) -> 
-  throw(X).
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/contract3.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/contract3.erl
deleted file mode 100644
index c135b72d45..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/contract3.erl
+++ /dev/null
@@ -1,34 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : contract3.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : Check overloaded domains
-%%%
-%%% Created :  2 Nov 2007 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(contract3).
-
--export([t/3]).
-
-t(X, Y, Z) ->
-  t1(X),
-  t2(X, Y),
-  t3(X, Y, Z).
-
--spec t1(atom()|integer()) -> integer();
-        (atom()|list()) -> atom().
-	  
-t1(X) ->
-  foo:bar(X).
-
--spec t2(atom(), integer()) -> integer();
-        (atom(), list()) -> atom().
-
-t2(X, Y) ->
-  foo:bar(X, Y).
-
--spec t3(atom(), integer(), list()) -> integer();
-        (X, integer(), list()) -> X.
-
-t3(X, Y, Z) ->
-  X.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/contract5.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/contract5.erl
deleted file mode 100644
index 6385473c20..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/contract5.erl
+++ /dev/null
@@ -1,15 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : contract5.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : Excercise modified record types.
-%%%
-%%% Created : 15 Apr 2008 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(contract5).
--export([t/0]).
-
--record(bar, {baz}).
-
--spec t() -> #bar{baz :: boolean()}.
-
-t() -> #bar{baz = not_a_boolean}. 
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/disj_norm_form.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/disj_norm_form.erl
deleted file mode 100644
index 313c2e8b86..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/disj_norm_form.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : disj_norm_form.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : Exposes a bad behavior in expansion to 
-%%%               disjunctive normal form of guards.
-%%%
-%%% Created : 24 Aug 2007 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(disj_norm_form).
-
--export([t/1]).
-
--record(foo, {bar}).
-
-t(R) ->
-  if R#foo.bar =:= 1;
-     R#foo.bar =:= 2;
-     R#foo.bar =:= 3;
-     R#foo.bar =:= 4;
-     R#foo.bar =:= 5;
-     R#foo.bar =:= 6 -> ok;
-     true -> error
-  end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/eqeq.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/eqeq.erl
deleted file mode 100644
index 6767023e3a..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/eqeq.erl
+++ /dev/null
@@ -1,16 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : eqeq.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 12 Nov 2007 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(eqeq).
-
--export([t/0]).
-
-t() ->
-  comp(3.14, foo).
-
-comp(X, Y) -> X =:= Y.
-  
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/ets_select.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/ets_select.erl
deleted file mode 100644
index 2b3c38cd59..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/ets_select.erl
+++ /dev/null
@@ -1,12 +0,0 @@
--module(ets_select).
--export([test/0]).
-
-test() ->
-  Table = ets:new(table, [set,{keypos,1}]),
-  ets:insert(Table, {foo, bar, baz}),
-  foo(Table). % ets:select(Table, [{{'_', '$1', '$2'}, [], ['$$']}]).
-
-foo(Table) ->
-  Tuples = ets:select(Table, [{{'_', '$1', '$2'}, [], ['$$']}]),
-  [list_to_tuple(Tuple) || Tuple <- Tuples].
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/exhaust_case.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/exhaust_case.erl
deleted file mode 100644
index 6b20c7c98c..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/exhaust_case.erl
+++ /dev/null
@@ -1,24 +0,0 @@
-%%-------------------------------------------------------------------
-%% File    : exhaust_case.erl
-%% Author  : Kostis Sagonas <[email protected]>
-%% Description : Tests that Dialyzer warns when it finds an unreachable
-%%		 case clause (independently of whether ground vs. var).
-%%
-%% Created : 15 Dec 2004 by Kostis Sagonas <[email protected]>
-%%-------------------------------------------------------------------
-
--module(exhaust_case).
--export([t/1]).
-
-t(X) when is_integer(X) ->
-  case ret(X) of
-    foo -> ok;
-    bar -> ok;
-    42  -> ok;
-    _other -> error	%% unreachable clause (currently no warning)
-    %% other -> error	%% but contrast this with this clause... hmm
-  end.
-
-ret(1) -> foo;
-ret(2) -> bar.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/failing_guard1.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/failing_guard1.erl
deleted file mode 100644
index 8fa1ce9ce0..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/failing_guard1.erl
+++ /dev/null
@@ -1,16 +0,0 @@
-%%-----------------------------------------------------------------------
-%% Author: Kostis Sagonas (Wed Aug 23 14:54:25 CEST 2006)
-%%
-%% Program to test failing arithmetic comparisons with a number of the
-%% wrong type. The first case is handled properly; the second one is not.
-%% Why?
-%%-----------------------------------------------------------------------
-
--module(failing_guard1).
--export([n/1]).
-
-n(N) when (N / 2) =:= 2 -> multiple_of_four;
-n(N) when (N div 3) =:= 2.0 -> multiple_of_six;
-n(N) when (N rem 3) =:= 2.0 -> multiple_of_six;
-n(N) when is_number(N) -> other_number.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/flatten.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/flatten.erl
deleted file mode 100644
index ac28fe27c9..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/flatten.erl
+++ /dev/null
@@ -1,18 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : flatten.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created :  4 Nov 2007 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(flatten).
-
--export([t/1]).
-
-t(Dir) ->
-  case file:list_dir(Dir) of
-    {ok,FileList} ->
-      FileList;
-    {error,Reason} ->
-      {error,lists:flatten("Can't open directory "++Dir++": "++Reason)}
-  end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/fun_app.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/fun_app.erl
deleted file mode 100644
index 605b0799d1..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/fun_app.erl
+++ /dev/null
@@ -1,42 +0,0 @@
-%% This is taken from the code of distel.
-
--module(fun_app).
--export([html_index/2]). % , lines/3, curry/2]).
-
-html_index(file,Dir) ->
-  fold_file(curry(fun lines/3,Dir),[],filename:join([Dir,"doc","man_index.html"])).
-
-fold_file(Fun,Acc0,File) ->
-  {ok, FD} = file:open(File, [read]),
-  Acc = fold_file_lines(FD,Fun,Acc0),
-  file:close(FD),
-  Acc.
-
-fold_file_lines(FD,Fun,Acc) ->
-  case io:get_line(FD, "") of
-    eof -> Acc;
-    Line -> fold_file_lines(FD,Fun,Fun(trim_nl(Line),Acc))
-  end.
-
-trim_nl(Str) -> lists:reverse(tl(lists:reverse(Str))).
-
-lines(Line,_,Dir) ->
-  case string:tokens(Line, "<> \"") of
-    ["TD", "A", "HREF=", "../"++Href, M|_] ->
-      case filename:basename(Href, ".html") of
-	"index" -> ok;
-	M -> e_set({file,M}, filename:join([Dir,Href]))
-      end;
-    _ -> ok
-  end.
-
-e_set(Key,Val) -> ets:insert(?MODULE, {Key,Val}).
-
-curry(F, Arg) ->
-  case erlang:fun_info(F,arity) of
-    {_,1} -> fun() -> F(Arg) end;
-    {_,2} -> fun(A) -> F(A,Arg) end;
-    {_,3} -> fun(A,B) -> F(A,B,Arg) end;
-    {_,4} -> fun(A,B,C) -> F(A,B,C,Arg) end
-  end.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/fun_ref_match.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/fun_ref_match.erl
deleted file mode 100644
index c15226ba6e..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/fun_ref_match.erl
+++ /dev/null
@@ -1,21 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : fun_ref_match.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : Find that newly created funs and references cannot 
-%%%               match on earlier bound variables.
-%%%
-%%% Created : 10 Mar 2005 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(fun_ref_match).
-
--export([t1/1, t2/1]).
-
-t1(X) ->
-  X = fun(Y) -> Y end,
-  ok.
-
-t2(X) ->
-  case make_ref() of
-    X -> error;
-    _ -> ok
-  end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/gs_make.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/gs_make.erl
deleted file mode 100644
index cbf3ef5dcb..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/gs_make.erl
+++ /dev/null
@@ -1,261 +0,0 @@
-%% ``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 via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id: gs_make.erl,v 1.1 2008/12/17 09:53:50 mikpe Exp $
-%%
--module(gs_make).
-
--export([start/0]).
-
-start() ->
-    Terms = the_config(),
-    DB=fill_ets(Terms),
-    {ok,OutFd} = file:open("gstk_generic.hrl", [write]),
-    put(stdout,OutFd),
-%    io:format("terms: ~p ~n ets:~p~n",[Terms,ets:tab2list(DB)]),
-    p("% Don't edit this file. It was generated by gs_make:start/0 "),
-    p("at ~p-~p-~p, ~p:~p:~p.\n\n",
-      lists:append(tuple_to_list(date()),tuple_to_list(time()))),
-    gen_out_opts(DB),
-    gen_read(DB),
-    file:close(OutFd),
-    {ok,"gstk_generic.hrl",DB}.
-
-fill_ets(Terms) ->
-    DB = ets:new(gs_mapping,[bag,public]),
-    fill_ets(DB,Terms).
-
-fill_ets(DB,[]) -> DB;
-fill_ets(DB,[{Objs,Opt,Fun,Access}|Terms]) ->
-    fill_ets(DB,lists:flatten(Objs),Opt,Fun,Access),
-    fill_ets(DB,Terms).
-
-fill_ets(_DB,[],_,_,_) -> done;
-fill_ets(DB,[Obj|Objs],Opt,Fun,rw) ->
-    ets:insert(DB,{Obj,Opt,Fun,read}),
-    ets:insert(DB,{Obj,Opt,Fun,write}),
-    fill_ets(DB,Objs,Opt,Fun,rw);
-fill_ets(DB,[Obj|Objs],Opt,Fun,r) ->
-    ets:insert(DB,{Obj,Opt,Fun,read}),
-    fill_ets(DB,Objs,Opt,Fun,r);
-fill_ets(DB,[Obj|Objs],Opt,Fun,w) ->
-    ets:insert(DB,{Obj,Opt,Fun,write}),
-    fill_ets(DB,Objs,Opt,Fun,w).
-
-    
-    
-gen_out_opts(DB) ->
-    ObjTypes = lists:flatten(ordsets:from_list(ets:match(DB,{'$1','_','_',write}))),
-    p("out_opts([Option|Options],Gstkid,TkW,DB,ExtraArg,S,P,C) ->\n"),
-    p("  {Opt,Val} =\n"),
-    p("    case Option of \n"),
-    p("      {{default,Cat,Key},V} -> {default,{Cat,{Key,V}}};\n"),
-    p("      {_Key,_V} -> Option;\n"),
-    p("      {default,Cat,Opti} -> {default,{Cat,Opti}};\n"),
-    p("      Atom when atom(Atom) -> {Atom,undefined};\n"),
-    p("      _ -> {error, {invalid_option,Option}}\n"),
-    p("    end,\n"),
-    p("  case Gstkid#gstkid.objtype of\n"),
-    gen_out_type_case_clauses(merge_types(ObjTypes),DB),
-    p("    Q -> exit({internal_error,unknown_objtype,Q})\n"),
-    p("  end;\n"),
-    p("out_opts([],_Gstkid,_TkW,_DB,_ExtraArg,S,P,C) -> \n"),
-    p("  {S,P,C}.\n").
-
-
-gen_out_type_case_clauses([],_DB) -> done;
-gen_out_type_case_clauses([Objtype|Objtypes],DB) ->
-    OptsFuns = lists:map(fun (L) -> list_to_tuple(L) end,
-			 ets:match(DB,{Objtype,'$1','$2',write})),
-    p("   ~p -> \ncase Opt of\n",[Objtype]),
-    gen_opt_case_clauses(merge_opts(opt_prio(),OptsFuns)),
-    p("  _ -> \n"),
-    p("    handle_external_opt_call([Option|Options],Gstkid,TkW,DB,ExtraArg,"
-      "                             gstk_~p:option(Option,Gstkid,TkW,DB,ExtraArg),S,P,C)\n",
-      [Objtype]),
-    p("  end;\n"),
-    gen_out_type_case_clauses(Objtypes,DB).
-
-gen_opt_case_clauses([]) ->
-    done;
-gen_opt_case_clauses([{Opt,Fun}|OptFuncs]) ->
-    p("  ~p ->\n",[Opt]),
-    p("    ~p(Val,Options,Gstkid,TkW,DB,ExtraArg,S,P,C);\n",[Fun]),
-    gen_opt_case_clauses(OptFuncs).
-
-gen_read(DB) ->
-    ObjTypes = lists:flatten(ordsets:from_list(ets:match(DB,{'$1','_','_',read}))),
-    p("read_option(DB,Gstkid,TkW,Option,ExtraArg) ->\n"),
-    p("  Key = case Option of\n"),
-    p("    Atom when atom(Atom) -> Atom;\n"),
-    p("    Opt when tuple(Opt) -> element(1,Opt)\n"),
-    p("  end,\n"),
-    p("  case Gstkid#gstkid.objtype of\n"),
-    gen_read_type_clauses(merge_types(ObjTypes),DB),
-    p("    Q -> exit({internal_error,unknown_objtype,Q})\n"),
-    p("  end.\n").
-    
-
-gen_read_type_clauses([],_) -> done;
-gen_read_type_clauses([Objtype|Objtypes],DB) ->
-    OptsFuns = lists:map(fun (L) -> list_to_tuple(L) end,
-			 ets:match(DB,{Objtype,'$1','$2',read})),
-    p("  ~p -> \ncase Key of\n",[Objtype]),
-    gen_readopt_case_clauses(merge_opts(opt_prio(),OptsFuns)),
-    p("  _ -> \nhandle_external_read(gstk_~p:read_option(Option,Gstkid,TkW,DB,ExtraArg))\n",[Objtype]),
-    p("  end;\n"),
-    gen_read_type_clauses(Objtypes,DB).
-
-gen_readopt_case_clauses([]) ->
-    done;
-gen_readopt_case_clauses([{Opt,Fun}|OptFuncs]) ->
-    p("  ~p -> \n~p(Option,Gstkid,TkW,DB,ExtraArg);\n",[Opt,Fun]),
-    gen_readopt_case_clauses(OptFuncs).
-
-
-p(Str) ->
-    ok = io:format(get(stdout),Str,[]).
-
-p(Format,Data) ->
-    ok = io:format(get(stdout),Format,Data).
-
-%%----------------------------------------------------------------------
-%% There items should be placed early in a case statement.
-%%----------------------------------------------------------------------
-obj_prio() -> [rectangle,line,gridline,image,button,canvas,checkbutton,radiobutton].
-opt_prio() -> [x,y,width,height,move,coords,data].
-
-merge_types(Types) ->
-    T2 = ordsets:from_list(Types),
-    P2 = ordsets:from_list(obj_prio()),
-    obj_prio() ++ ordsets:subtract(T2, P2).
-
-merge_opts([],L) -> L;
-merge_opts([Opt|Opts],Dict) ->
-    case gs:assq(Opt,Dict) of
-	{value,V} -> [{Opt,V}|merge_opts(Opts,lists:keydelete(Opt,1,Dict))];
-	false -> merge_opts(Opts,Dict)
-    end.
-
-the_config() ->
-    Buttons=[button,checkbutton,radiobutton],
-    AllPureTk = [Buttons,canvas,editor,entry,frame,label,listbox,
-                 menubar,menubutton,scale,window],
-    CanvasObj = [arc,image,line,oval,polygon,rectangle,text],
-    All = [AllPureTk,CanvasObj,grid,gridline,menu,menuitem,gs],
-    Containers = [canvas,frame,grid,menu,menubar,menubutton,menuitem,window],
-    Ob1 = [Buttons,canvas,grid,frame,label,entry,editor,listbox,scale],
-    Ob2 = [button,checkbutton,radiobutton,label,menubutton],
-    Ob3 = [Buttons,frame,label,entry,editor,listbox,scale,menubutton,
-	   menubar,menu],
-    Ob4 = [canvas,editor,listbox],
-    [{[Buttons,entry,scale,menubutton],enable,gen_enable,rw},
-     {[Buttons,label,entry,scale,menubutton,menu],fg,gen_fg,rw},
-     {[Buttons,label,entry,scale,menubutton,menu],bg,gen_bg,rw},
-     {Ob1,anchor,gen_anchor,rw},
-     {Ob1,height,gen_height,r},
-     {Ob1--[frame],height,gen_height,w},
-     {Ob1,width,gen_width,r},
-     {Ob1--[frame],width,gen_width,w},
-     {Ob1,pack_x,gen_pack_x,rw},
-     {Ob1,pack_y,gen_pack_y,rw},
-     {Ob1,pack_xy,gen_pack_xy,w},
-     {Ob1,x,gen_x,rw},
-     {Ob1,y,gen_y,rw},
-     {Ob1,raise,gen_raise,w},
-     {Ob1,lower,gen_lower,w},
-     {Ob2,align,gen_align,rw},
-     {Ob2,font,gen_font,rw},
-     {Ob2,justify,gen_justify,rw},
-     {Ob2,padx,gen_padx,rw},
-     {Ob2,pady,gen_pady,rw},
-     {Containers,default,gen_default,w},
-     {[AllPureTk,menu],relief,gen_relief,rw},
-     {[AllPureTk,menu],bw,gen_bw,rw},
-     {[Buttons,canvas,frame,label,entry,scale,menubutton,menu,menubar],
-      setfocus,gen_setfocus,rw},
-     {Ob3,buttonpress,gen_buttonpress,rw}, 
-     {Ob3,buttonrelease,gen_buttonrelease,rw},
-     {Ob3,configure,gen_configure,rw},
-     {[Ob3,window],destroy,gen_destroy,rw},
-     {[Ob3,window],enter,gen_enter,rw},
-     {[Ob3,window],leave,gen_leave,rw},
-     {[Ob3,window],focus,gen_focus_ev,rw},
-     {[Ob3,window],keypress,gen_keypress,rw},
-     {[Ob3,window],keyrelease,gen_keyrelease,rw},
-     {Ob3,motion,gen_motion,rw},
-     %% events containing x,y are special
-     {[window],buttonpress,gen_buttonpress,r},
-     {[window],buttonrelease,gen_buttonrelease,r},
-     {[window],motion,gen_motion,r},
-     {All,font_wh,gen_font_wh,r},
-     {All,choose_font,gen_choose_font,r},
-     {All,data,gen_data,rw},
-     {All,children,gen_children,r},
-     {All,id,gen_id,r},
-     {All,parent,gen_parent,r},
-     {All,type,gen_type,r},
-     {All,beep,gen_beep,w},
-     {All,keep_opt,gen_keep_opt,w},
-     {All,flush,gen_flush,rw},
-     {AllPureTk,highlightbw,gen_highlightbw,rw},
-     {AllPureTk,highlightbg,gen_highlightbg,rw},
-     {AllPureTk,highlightfg,gen_highlightfg,rw},
-     {AllPureTk,cursor,gen_cursor,rw}, % bug
-     {[Buttons,label,menubutton],label,gen_label,rw},
-     {[Buttons,menubutton,menu],activebg,gen_activebg,rw},
-     {[Buttons,menubutton,menu],activefg,gen_activefg,rw},
-     {[entry],selectbg,gen_selectbg,rw},
-     {[entry],selectbw,gen_selectbw,rw},
-     {[entry],selectfg,gen_selectfg,rw},
-     {Ob4,activebg,gen_so_activebg,rw},
-     {Ob4,bc,gen_so_bc,rw},
-     {Ob4,bg,gen_so_bg,rw},
-     {Ob4,hscroll,gen_so_hscroll,r},
-     {Ob4,scrollbg,gen_so_scrollbg,rw},
-     {Ob4,scrollfg,gen_so_scrollfg,rw},
-     {Ob4,scrolls,gen_so_scrolls,w},
-     {Ob4,selectbg,gen_so_selectbg,rw},
-     {Ob4,selectbg,gen_so_selectbg,rw},
-     {Ob4,selectbw,gen_so_selectbw,rw},
-     {Ob4,selectbw,gen_so_selectbw,rw},
-     {Ob4,selectfg,gen_so_selectfg,rw},
-     {Ob4,selectfg,gen_so_selectfg,rw},
-     {Ob4,vscroll,gen_so_vscroll,r},
-     {CanvasObj,coords,gen_citem_coords,rw},
-     {CanvasObj,lower,gen_citem_lower,w},
-     {CanvasObj,raise,gen_citem_raise,w},
-     {CanvasObj,move,gen_citem_move,w},
-     {CanvasObj,setfocus,gen_citem_setfocus,rw},
-     {CanvasObj,buttonpress,gen_citem_buttonpress,w}, % should be rw
-     {CanvasObj,buttonrelease,gen_citem_buttonrelease,w},
-     {CanvasObj,enter,gen_citem_enter,w},
-     {CanvasObj,focus,gen_citem_setfocus,w},
-     {CanvasObj,keypress,gen_citem_keypress,w},
-     {CanvasObj,keyrelease,gen_citem_keyrelease,w},
-     {CanvasObj,leave,gen_citem_leave,w},
-     {CanvasObj,motion,gen_citem_motion,w},
-     {CanvasObj,buttonpress,gen_buttonpress,r}, 
-     {CanvasObj,buttonrelease,gen_buttonrelease,r},
-     {CanvasObj,configure,gen_configure,r},
-     {CanvasObj,destroy,gen_destroy,r},
-     {CanvasObj,enter,gen_enter,r},
-     {CanvasObj,leave,gen_leave,r},
-     {CanvasObj,focus,gen_focus_ev,r},
-     {CanvasObj,keypress,gen_keypress,r},
-     {CanvasObj,keyrelease,gen_keyrelease,r},
-     {CanvasObj,motion,gen_motion,r},
-     {[arc,oval,polygon,rectangle],fill,gen_citem_fill,rw}].
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/inf_loop2.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/inf_loop2.erl
deleted file mode 100644
index fbbec10a55..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/inf_loop2.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-%%---------------------------------------------------------------------
-%% Module that went into an infinite loop when trying to assign types.
-%%
-%% What was happening is that for functions which are in an SCC but all
-%% return none(), a second chance was given to them by the analysis to
-%% see whether they return none() because they are involved in an loop
-%% (presumably server-related) and could be assigned the type unit()
-%% instead. The problem is that when the really return none() for some
-%% other reason (an error such in this case) then we will again find
-%% none() and try again for unit(), thereby entering an infinite loop.
-%% The issue was resolved on May 17th by adding an appropriate boolean
-%% parameter to dialyzer_typesig:solve_scc() function.
-%%---------------------------------------------------------------------
--module(inf_loop2).
-
--export([test/0]).
-
-test() ->
-  lists:reverse(gazonk),
-  loop().
-
-loop() ->
-  test(). 
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/letrec1.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/letrec1.erl
deleted file mode 100644
index f5c265cc60..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/letrec1.erl
+++ /dev/null
@@ -1,13 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : letrec1.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created :  9 Mar 2007 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(letrec1).
-
--export([t/1]).
-
-t(Opts) ->
-  [Opt || Opt <- Opts, Opt =/= compressed].
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/list_match.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/list_match.erl
deleted file mode 100644
index 77de6d7dee..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/list_match.erl
+++ /dev/null
@@ -1,20 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : list_match.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 12 Mar 2007 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(list_match).
-
--export([t/0]).
-
-t() ->
-  t([1,2,3,4]).
-
-t([]) ->
-  ok;
-t([H|T]) when is_integer(H) ->
-  t(T);
-t([_|T]) ->
-  t(T).
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/my_filter.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/my_filter.erl
deleted file mode 100644
index a67c4bd432..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/my_filter.erl
+++ /dev/null
@@ -1,17 +0,0 @@
--module(my_filter).
--export([test/0]).
-
-test() ->
-  filter(fun mystery/1, [1,2,3,4]).
-
-filter(Pred, List) when is_function(Pred, 1) ->
-  [ E || E <- List, Pred(E) ].
-
-mystery(X) ->
-  case (X rem 3) of 
-    0 -> true;
-    1 -> false;
-    2 -> gazonk
-  end.
-
-%% mystery(_X,_Y) -> true.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/my_sofs.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/my_sofs.erl
deleted file mode 100644
index 32252071d2..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/my_sofs.erl
+++ /dev/null
@@ -1,83 +0,0 @@
-%% Program showing the problems with record field accesses.
-
--module(my_sofs).
--export([ordset_of_sets/3, is_equal/2]).
-
--define(TAG, 'Set').
--define(ORDTAG, 'OrdSet').
-
--record(?TAG, {data = [], type = type}).
--record(?ORDTAG, {orddata = {}, ordtype = type}).
-
--define(LIST(S), (S)#?TAG.data).
--define(TYPE(S), (S)#?TAG.type).
--define(SET(L, T), #?TAG{data = L, type = T}).
--define(IS_SET(S), record(S, ?TAG)).
-
-%% Ordered sets and atoms:
--define(ORDDATA(S), (S)#?ORDTAG.orddata).
--define(ORDTYPE(S), (S)#?ORDTAG.ordtype).
--define(ORDSET(L, T), #?ORDTAG{orddata = L, ordtype = T}).
--define(IS_ORDSET(S), record(S, ?ORDTAG)).
-
-%% When IS_SET is true:
--define(ANYTYPE, '_').
--define(REL_TYPE(I, R), element(I, R)).
--define(SET_OF(X), [X]).
-
-is_equal(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
-    case match_types(?TYPE(S1), ?TYPE(S2)) of
-        true  -> ?LIST(S1) == ?LIST(S2);
-        false -> erlang:error(type_mismatch, [S1, S2])
-    end;
-is_equal(S1, S2) when ?IS_ORDSET(S1), ?IS_ORDSET(S2) ->
-    case match_types(?TYPE(S1), ?TYPE(S2)) of
-        true  -> ?ORDDATA(S1) == ?ORDDATA(S2);
-        false -> erlang:error(type_mismatch, [S1, S2])
-    end;
-is_equal(S1, S2) when ?IS_SET(S1), ?IS_ORDSET(S2) ->
-    erlang:error(type_mismatch, [S1, S2]);
-is_equal(S1, S2) when ?IS_ORDSET(S1), ?IS_SET(S2) ->
-    erlang:error(type_mismatch, [S1, S2]).
-
-%% Type = OrderedSetType
-%%      | SetType
-%%      | atom() except '_'
-%% OrderedSetType = {Type, ..., Type}
-%% SetType = [ElementType]           % list of exactly one element
-%% ElementType = '_'                 % any type (implies empty set)
-%%             | Type
-
-ordset_of_sets([S | Ss], L, T) when ?IS_SET(S) ->
-    ordset_of_sets(Ss, [?LIST(S) | L], [[?TYPE(S)] | T]);
-ordset_of_sets([S | Ss], L, T) when ?IS_ORDSET(S) ->
-    ordset_of_sets(Ss, [?LIST(S) | L], [?ORDTYPE(S) | T]);
-ordset_of_sets([], L, T) ->
-    ?ORDSET(list_to_tuple(lists:reverse(L)), list_to_tuple(lists:reverse(T)));
-ordset_of_sets(_, _L, _T) ->
-    error.
-
-%% inlined.
-match_types(T, T) -> true;
-match_types(Type1, Type2) -> match_types1(Type1, Type2).
-
-match_types1(Atom, Atom) when is_atom(Atom) ->
-    true;
-match_types1(?ANYTYPE, _) -> 
-    true;
-match_types1(_, ?ANYTYPE) -> 
-    true;
-match_types1(?SET_OF(Type1), ?SET_OF(Type2)) -> 
-    match_types1(Type1, Type2);
-match_types1(T1, T2) when tuple(T1), tuple(T2), size(T1) =:= size(T2) ->
-    match_typesl(size(T1), T1, T2);
-match_types1(_T1, _T2) ->
-    false.
-
-match_typesl(0, _T1, _T2) ->
-    true;
-match_typesl(N, T1, T2) ->
-    case match_types1(?REL_TYPE(N, T1), ?REL_TYPE(N, T2)) of
-        true  -> match_typesl(N-1, T1, T2);
-        false -> false
-    end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/not_guard_crash.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/not_guard_crash.erl
deleted file mode 100644
index 0350864dce..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/not_guard_crash.erl
+++ /dev/null
@@ -1,49 +0,0 @@
-%% From: Matthias Radestock <[email protected]>
-%% Date: 19 August 2007
-%%
-%% when I run dialyzer on my code it throws the following error:
-%%
-%% Analysis failed with error report:
-%%         {{case_clause,any},
-%%          [{dialyzer_dataflow,bind_guard,5},
-%%           {dialyzer_dataflow,bind_guard_case_clauses,6},
-%%           {dialyzer_dataflow,bind_guard,5},
-%%           {dialyzer_dataflow,bind_guard_case_clauses,6},
-%%           {dialyzer_dataflow,bind_guard,5},
-%%           {dialyzer_dataflow,bind_eqeq_guard_lit_other,6},
-%%           {dialyzer_dataflow,bind_guard,...},
-%%           {dialyzer_dataflow,...}]}
-%% 
-%% This is happening with the R11B-5 version of dialyzer when
-%% analyzing the attached file.
-%%--------------------------------------------------------------------
-
--module(not_guard_crash).
-
--export([match_ticket/2]).
-
--record(ticket, {passive_flag, active_flag, write_flag, read_flag}).
-
-%%--------------------------------------------------------------------
-
-match_ticket(#ticket{passive_flag = PP,
-                     active_flag  = PA,
-                     write_flag   = PW,
-                     read_flag    = PR},
-             #ticket{passive_flag = TP,
-                     active_flag  = TA,
-                     write_flag   = TW,
-                     read_flag    = TR}) ->
-    if
-        %% Matches if either we're not requesting passive access, or
-        %% passive access is permitted, and ...
-        (not(TP) orelse PP) andalso
-        (not(TA) orelse PA) andalso
-        (not(TW) orelse PW) andalso
-        (not(TR) orelse PR) ->
-            match;
-        true ->
-            no_match
-    end.
-
-%%--------------------------------------------------------------------
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/orelsebug.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/orelsebug.erl
deleted file mode 100644
index 626f2b7f03..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/orelsebug.erl
+++ /dev/null
@@ -1,17 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : orelsebug.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 14 Nov 2006 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(orelsebug).
-
--export([t/1, t1/1]).
-	 
-t(Format) when is_list(Format) ->
-   t1(Format).
-
-t1(Format) when is_list(Format) orelse is_binary(Format) ->
-   Format.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/orelsebug2.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/orelsebug2.erl
deleted file mode 100644
index 52b1b3b5a9..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/orelsebug2.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : orelsebug2.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 21 Nov 2006 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(orelsebug2).
-
--export([t/1]).
-
--record(eventdata, {
-	  expires
-	 }).
-
-t(L) ->
-  L2 = [E1 || E1 <- L, E1#eventdata.expires == x 
-			orelse E1#eventdata.expires == y],
-    
-  case L2 of
-    [_E] -> x;
-    [] ->  y
-  end. 
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/port_info_test.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/port_info_test.erl
deleted file mode 100644
index d8a5e15caf..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/port_info_test.erl
+++ /dev/null
@@ -1,34 +0,0 @@
-%%
-%% Tests hardcoded dependent type info
-%% and the quality of the warnings that Dialyzer spits out
-%%
--module(port_info_test).
--export([t1/1, t2/1, t3/1, t4/1, t5/2, buggy/1]).
-
-%% The following errors are correctly caught, but the messages are a bit weird
-t1(X) when is_port(X) ->
-  {connected, 42} = erlang:port_info(X, connected);
-t1(_) -> ok.
-
-t2(X) when is_port(X) ->
-  {registered_name, "42"} = erlang:port_info(X, registered_name);
-t2(_) -> ok.
-
-%% Here only one od the two errors is reported...
-t3(X) when is_atom(X) ->
-  {output, 42} = erlang:port_info(X, connected);
-t3(_) -> ok.
-
-t4(X) when is_atom(X) ->
-  {Atom, _} = erlang:port_info(X, connected),
-  Atom = links;
-t4(_) -> ok.
-
-t5(X, Atom) when is_port(X) ->
-  {gazonk, _} = erlang:port_info(X, Atom);
-t5(_, _) -> ok.
-
-%% The type system is not strong enough to catch the following errors
-buggy(X) when is_atom(X) ->
-  {links, X} = erlang:port_info(foo, X).
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/process_info_test.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/process_info_test.erl
deleted file mode 100644
index d098884f4d..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/process_info_test.erl
+++ /dev/null
@@ -1,21 +0,0 @@
-%%
-%% Tests hardcoded dependent type info for process_info/1
-%%
--module(process_info_test).
--export([pinfo/1]).
-
-pinfo(P) when node(P) == node() ->  % On same node
-  case process_info(P) of
-    undefined ->
-      exit(dead);
-    Info -> Info
-  end;
-pinfo(P) ->                         % On different node
-  case rpc:call(node(P), erlang, process_info, [P]) of
-    {badrpc, _} ->
-      exit(badrpc);
-    undefined ->           % This does happen
-      exit(dead);
-    Info -> Info
-  end.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/pubsub/pubsub_api.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/pubsub/pubsub_api.erl
deleted file mode 100644
index c30233b8f5..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/pubsub/pubsub_api.erl
+++ /dev/null
@@ -1,99 +0,0 @@
-%  Copyright 2007-2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%
-%   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.
-%%%-------------------------------------------------------------------
-%%% File    : pubsub_api.erl
-%%% Author  : Thorsten Schuett <[email protected]>
-%%% Description : Publish API function
-%%%
-%%% Created : 17 Sep 2007 by Thorsten Schuett <[email protected]>
-%%%-------------------------------------------------------------------
-%% @author Thorsten Schuett <[email protected]>
-%% @copyright 2007-2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%% @version $Id $
--module(pubsub_dir.pubsub_api).
-
--author('[email protected]').
--vsn('$Id: pubsub_api.erl,v 1.1 2009/11/06 12:39:55 maria Exp $ ').
-
--export([publish/2, subscribe/2, unsubscribe/2, get_subscribers/1]).
-
--import(transstore.transaction_api).
--import(io).
--import(lists).
-
-%%====================================================================
-%% public functions
-%%====================================================================
-
-%% @doc publishs an event under a given topic.
-%%      called e.g. from the java-interface
-%% @spec publish(string(), string()) -> ok
-publish(Topic, Content) ->
-    Subscribers = get_subscribers(Topic),
-    io:format("calling subscribers ~p~n", [Subscribers]),
-    lists:foreach(fun (Subscriber) -> 
-			  io:format("calling ~p~n", [Subscriber]),
-			  pubsub_publish:publish(Subscriber, Topic, Content) 
-		  end, 
-		  Subscribers),
-    ok.
-
-%% @doc subscribes a url for a topic.
-%%      called e.g. from the java-interface
-%% @spec subscribe(string(), string()) -> ok | {fail, term()}
-subscribe(Topic, URL) ->
-    TFun = fun(TransLog) ->
-		   {{Success, _ValueOrReason} = Result, TransLog1} = transaction_api:read(Topic, TransLog),
-		   {Result2, TransLog2} = if
-		       Success == fail ->
-			   transaction_api:write(Topic, [URL], TransLog); %obacht: muss TransLog sein!
-		       true ->
-			   {value, Subscribers} = Result,
-			   transaction_api:write(Topic, [URL | Subscribers], TransLog1)
-		   end,
-		   if
-		       Result2 == ok ->
-			   {{ok, ok}, TransLog2};
-		       true ->
-			   {Result2, TransLog2}
-		   end
-	   end,
-    transaction_api:do_transaction(TFun, fun (_) -> ok end, fun (X) -> {fail, X} end).
-
-%% @doc unsubscribes a url for a topic.
--spec(unsubscribe/2 :: (string(), string()) -> ok | {fail, any()}).
-unsubscribe(Topic, URL) ->
-    TFun = fun(TransLog) ->
-		   {Subscribers, TransLog1} = transaction_api:read2(TransLog, Topic),
-		   case lists:member(URL, Subscribers) of
-		       true ->
-			   NewSubscribers = lists:delete(URL, Subscribers),
-			   TransLog2 = transaction_api:write2(TransLog1, Topic, NewSubscribers),
-			   {{ok, ok}, TransLog2};
-		       false ->
-			   {{fail, not_found}, TransLog}
-		   end
-	   end,
-    transaction_api:do_transaction(TFun, fun (_) -> ok end, fun (X) -> {fail, X} end).	   
-
-%% @doc queries the subscribers of a query
-%% @spec get_subscribers(string()) -> [string()]
-get_subscribers(Topic) ->
-    {Fl, _Value} = transaction_api:quorum_read(Topic),
-    if 
-	Fl == fail -> %% Fl is either Fail or the Value/Subscribers
-	    [];
-	true ->
-	    Fl
-    end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/pubsub/pubsub_publish.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/pubsub/pubsub_publish.erl
deleted file mode 100644
index 97c993e576..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/pubsub/pubsub_publish.erl
+++ /dev/null
@@ -1,50 +0,0 @@
-%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%
-%   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.
-%%%-------------------------------------------------------------------
-%%% File    : pubsub_publish.erl
-%%% Author  : Thorsten Schuett <[email protected]>
-%%% Description : Publish function
-%%%
-%%% Created : 26 Mar 2008 by Thorsten Schuett <[email protected]>
-%%%-------------------------------------------------------------------
-%% @author Thorsten Schuett <[email protected]>
-%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
-%% @version $Id $
--module(pubsub_dir.pubsub_publish).
-
--author('[email protected]').
--vsn('$Id: pubsub_publish.erl,v 1.1 2009/11/06 12:39:55 maria Exp $ ').
-
--export([publish/3, publish_internal/3]).
-
--import(json).
--import(io).
--import(http).
--import(jsonrpc).
-
-%%====================================================================
-%% public functions
-%%====================================================================
-
-%% @doc publishs an event to a given url.
-%% @spec publish(string(), string(), string()) -> ok
-%% @todo use pool:pspawn
-publish(URL, Topic, Content) ->
-    spawn(fun () -> pubsub_publish:publish_internal(URL, Topic, Content) end),
-    ok.
-
-publish_internal(URL, Topic, Content) ->
-    Res = jsonrpc:call(URL, [], {call, notify, [Topic, Content]}),
-    io:format("~p ~p~n", [Res, URL]).
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/receive1.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/receive1.erl
deleted file mode 100644
index 2699a6da51..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/receive1.erl
+++ /dev/null
@@ -1,17 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : receive1.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 27 Mar 2007 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(receive1).
-
--export([t/1]).
-
-t(X) ->
-  receive 
-  after 
-    infinity -> X 
-  end.
-	      
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/record_construct.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/record_construct.erl
deleted file mode 100644
index 627e23956b..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/record_construct.erl
+++ /dev/null
@@ -1,22 +0,0 @@
--module(record_construct).
--export([t_loc/0, t_opa/0, t_rem/0]).
-
--record(r_loc, {a = gazonk :: integer(), b = 42 :: atom()}).
-
-t_loc() ->
-  #r_loc{}.
-
--record(r_opa, {a                 :: atom(),
-		b = gb_sets:new() :: gb_set(),
-		c = 42            :: boolean(),
-		d,	% untyped on purpose
-		e = false         :: boolean()}).
-
-t_opa() ->
-  #r_opa{}.
-
--record(r_rem, {a = gazonk :: string()}).
-
-t_rem() ->
-  #r_rem{}.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/record_pat.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/record_pat.erl
deleted file mode 100644
index 89228b8357..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/record_pat.erl
+++ /dev/null
@@ -1,19 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : record_pat.erl
-%%% Author  : Tobias Lindahl <>
-%%% Description : Emit warning if a pattern violates the record type
-%%%
-%%% Created : 21 Oct 2008 by Tobias Lindahl <>
-%%%-------------------------------------------------------------------
--module(record_pat).
-
--export([t/1]).
-
--record(foo, {bar :: integer()}).
-
-t(#foo{bar=baz}) -> no_way;
-t(#foo{bar=1}) -> ok.
-
-  
-
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/record_send_test.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/record_send_test.erl
deleted file mode 100644
index 742519e54e..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/record_send_test.erl
+++ /dev/null
@@ -1,33 +0,0 @@
-%%-------------------------------------------------------------------
-%% File    : record_send_test.erl
-%% Author  : Kostis Sagonas <[email protected]>
-%% Description : A test inspired by a post of Mkcael Remond to the
-%%		 Erlang mailing list suggesting thst Dialyzer should
-%%		 be reporting sends to records rather than to pids.
-%%		 Dialyzer v1.3.0 indeed reports one of the dicrepancies
-%%		 (the one with the 4-tuple) but not the one where the
-%%		 message is sent to a pair which is a record.
-%%		 This should be fixed.
-%%
-%% Created : 10 Apr 2005 by Kostis Sagonas <[email protected]>
-%%-------------------------------------------------------------------
--module(record_send_test).
-
--export([t/0]).
-
--record(rec1, {a=a, b=b, c=c}).
--record(rec2, {a}).
-
-t() ->
-  t(#rec1{}).
-
-t(Rec1 = #rec1{b=B}) ->
-  Rec2 = some_mod:some_function(),
-  if
-    is_record(Rec2, rec2) ->
-      Rec2 ! hello;	%% currently this one is not found
-    true ->
-      Rec1 ! hello_again
-  end,
-  B.
-  
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/record_test.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/record_test.erl
deleted file mode 100644
index 8151e595a0..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/record_test.erl
+++ /dev/null
@@ -1,24 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : record_test.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 22 Oct 2004 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(record_test).
-
--export([t/0]).
-
--record(foo, {bar}).
-
-t() ->
-  doit(foo).
-
-doit(X) ->
-  case X of
-    #foo{} -> error1;
-    foo -> ok;
-    _ -> error2
-  end.
-      
-  
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types2.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types2.erl
deleted file mode 100644
index 3a22bbf5d2..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types2.erl
+++ /dev/null
@@ -1,12 +0,0 @@
--module(recursive_types2).
-
--export([test/0]).
-
--type tree() :: 'nil' | {non_neg_integer(), child(), child()}.
-
--type child() :: tree().
-
--spec test() -> {42, tree(), tree()}.
-
-test() ->
-  {42, {42, nil, nil}, {42, {42, nil, nil}, {42, nil, nil}}}.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types4.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types4.erl
deleted file mode 100644
index 118bab57a1..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types4.erl
+++ /dev/null
@@ -1,13 +0,0 @@
--module(recursive_types4).
-
--export([test/0]).
-
--record(tree,   {node         :: atom(),
-		 kid = nil    :: 'nil' | tree()}).
-
--type tree() :: #tree{}.
-
--spec test() -> tree().
-
-test() ->
-  #tree{node = root, kid = #tree{}}. 
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types5.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types5.erl
deleted file mode 100644
index a71e613cf0..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/recursive_types5.erl
+++ /dev/null
@@ -1,13 +0,0 @@
--module(recursive_types5).
-
--export([test/0]).
-
--type tree() :: 'nil' | {non_neg_integer(), tree(), tree()}.
-
--record(tree,   {node         :: atom(),
-		 kid = 'nil'  :: tree()}).
-
--spec test() -> #tree{}.
-
-test() ->
-  #tree{node = root, kid = {42, {42, nil, nil}, {42, nil, nil}}}. 
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/toth.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/toth.erl
deleted file mode 100644
index bd7fa4982e..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/toth.erl
+++ /dev/null
@@ -1,99 +0,0 @@
--module(toth).
--export([sys_table_view/1]).
-
-%%% Constants
--define(sysTabETS,1).
--define(sysTabMnesia,2).
--define(sysTabBoth,3).
-
-sys_table_view([CpId,{match,Pattern},TableType, ViewType]) ->
-    AllTableList =
-	case TableType of
-	    ?sysTabMnesia ->
-		lists:sort(mnesia:system_info(tables));
-	    ?sysTabBoth ->
-		lists:sort(rpc:call(CpId,ets,all,[]));
-	    ?sysTabETS ->
-		lists:sort(rpc:call(CpId,ets,all,[]) --
-			   mnesia:system_info(tables));
-	    _ -> %%% Happens at registration only
-		[ok]
-    end,
-    %% Filter the matching table names, skip unnamed tables first:
-    NamedTableList = lists:filter(fun (X) -> is_atom(X) end, AllTableList),
-    TablesShown =
-	case Pattern of
-	    "" ->
-		NamedTableList;
-	    _ ->
-		%% Filter the ones whose name begins with the Pattern:
-		Filter = fun(T) ->
-				 lists:prefix(Pattern, atom_to_list(T))
-			 end,
-		lists:filter(Filter, NamedTableList)   
-	end,
-    
-    Fields = [{text, [{value,"CpId: " ++ atom_to_list(CpId)}]},
-	      {text, [{value,"TabSpec=" ++ Pattern},
-		      {value_format, term}]},
-	      {text, [{value,"Table type: " ++ formatTableType(TableType)},
-		      {value_format, term}]}],
-
-    Template = [[{type, index},
-		 {link, {?MODULE, sys_table_browse,
-			 [{"CpId",CpId},{"TableType",TableType}, 
-			  {"View", ViewType},
-			  {"FirstKey",1}, {"KeyPattern",""}]}}],
-		
-		[{type, data},
-		 {title, "Table name"},
-		 {display_value, {erlang, atom_to_list}}], %%% else crash
-		
-                [{type,data},
-		 {title, "No of rows"},
-		 {display_value, term}],
-		
-                [{type,data},
-		 {title, "Memory"},
-		 {display_value, term}]
-	       ],
-    
-    TableAttr = [{rows, [[T,T|tableSize(T,TableType,CpId)] ||
-			    T <- TablesShown]},
-		 {template,Template}],
-    
-    Page = [{header, {"Filter tables", "Selected tables"}},
-	    {buttons, [reload, back]},
-	    {layout, [{form, Fields},
-		      {table, TableAttr}]}
-	   ],
-    Page.
-
-%%--------------------------------------------------------------------
-%% tableSize/3                                    
-%% @spec tableSize(T::atom(),TableType::integer(),CpId::atom()) ->
-%%                 list(integer())
-%% @doc Return the table size and memory size of the table.
-%% @end
-%%---------------------------------------------------------------------
-
-tableSize(T, TableType, CpId) ->
-    case TableType of
-        ?sysTabETS ->
-	    [rpc:call(CpId, ets, info, [T, size]),
-	     rpc:call(CpId, ets, info, [T, memory])];
-	?sysTabMnesia ->
-            [mnesia:table_info(T, size),mnesia:table_info(T, memory)];
-	_ -> %%% Registration
-	    [0,0]
-    end.
-
-formatTableType(T) ->
-    case T of
-	?sysTabETS ->
-	    "ETS";
-	?sysTabMnesia ->
-            "mnesia";
-	_ -> %%% Registration !
-	    "ETS + mnesia"
-    end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/trec.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/trec.erl
deleted file mode 100644
index b36b0cafba..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/trec.erl
+++ /dev/null
@@ -1,37 +0,0 @@
-%%
-%% The current treatment of typed records leaves much to be desired.
-%% These are not made up examples; I have cases like that the branch
-%% of the HiPE compiler with types in records. I get very confusing
-%% warnings which require a lot of effort to find their cause and why
-%% a function has no local return.
-%%
--module(trec).
--export([test/0, mk_foo_exp/2]).
-
--record(foo, {a :: integer(), b :: [atom()]}).
-
-%%
-%% For these functions we currently get the following warnings:
-%%   1. Function test/0 has no local return
-%%   2. The call trec:mk_foo_loc(42,any()) will fail since it differs
-%%      in argument position 1 from the success typing arguments:
-%%      ('undefined',atom())
-%%   3. Function mk_foo_loc/2 has no local return
-%%
-%% Arguably, the second warning is not what most users have in mind
-%% when they wrote the type declarations in the 'foo' record, so no
-%% doubt they'll find it confusing. But note that it is also inconsistent!
-%% How come there is a success typing for a function that has no local return? 
-%%
-test() ->
-   mk_foo_loc(42, bar:f()).
-
-mk_foo_loc(A, B) ->
-    #foo{a = A, b = [A,B]}.
-
-%%
-%% For this function we currently get "has no local return" but we get
-%% no reason; I want us to get a reason.
-%%
-mk_foo_exp(A, B) when is_integer(A) ->
-    #foo{a = A, b = [A,B]}.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/try1.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/try1.erl
deleted file mode 100644
index d07380295b..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/try1.erl
+++ /dev/null
@@ -1,27 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : try1.erl
-%%% Author  :  <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 23 Aug 2005 by  <[email protected]>
-%%%-------------------------------------------------------------------
--module(try1).
-
--export([t/1]).
-
-t(X) ->
-  case wierd_is_bool(X) of
-    true -> ok;
-    false -> ok
-  end.
-
-wierd_is_bool(X) ->
-  try bool(X) of
-      Y -> Y
-  catch 
-    _:_  -> false
-  end.
-
-bool(true) -> true;
-bool(false) -> true.
-      
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/tuple1.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/tuple1.erl
deleted file mode 100644
index c58aac9646..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/tuple1.erl
+++ /dev/null
@@ -1,29 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : tuple1.erl
-%%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : Exposed two bugs in the analysis; 
-%%%               one supressed warning and one crash.
-%%%
-%%% Created : 13 Nov 2006 by Tobias Lindahl <[email protected]>
-%%%-------------------------------------------------------------------
--module(tuple1).
-
--export([t1/2, t2/2, t3/2, bar/2]).
-
-t1(List = [_|_], X) ->
-  lists:mapfoldl(fun foo/2, X, List).
-
-t2(List = [_|_], X) ->
-  lists:mapfoldl(fun bar/2, X, List).
-
-t3(List = [_|_], X) ->
-  lists:mapfoldl(fun baz/1, X, List).
-
-
-foo(1, 1) -> a;
-foo(a, 1) -> b.
-
-bar(1, 1) -> {b, b};
-bar(a, 1) -> {a, a}.
-
-baz(1) -> 1.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/unsafe_beamcode_bug.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/unsafe_beamcode_bug.erl
deleted file mode 100644
index 889f94014e..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/unsafe_beamcode_bug.erl
+++ /dev/null
@@ -1,15 +0,0 @@
--module(unsafe_beamcode_bug).
--export([test/1]).
-
-test(N) -> i(r(N)).
-
-%% this function cannot be exported, or the error does not occur
-i({one}) -> ok1;
-i({two, _}) -> ok2;
-i({three, {_,R}, _}) -> R.
-
-r(1) -> {one};
-r(2) -> {two, 2};
-r(42)-> {dummy, 42};	% without this clause, no problem ... hmm
-r(3) -> {three, {rec,ok3}, 2}.
-
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/zero_tuple.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/zero_tuple.erl
deleted file mode 100644
index 90dc366fe7..0000000000
--- a/lib/dialyzer/test/small_tests_SUITE_data/src/zero_tuple.erl
+++ /dev/null
@@ -1,13 +0,0 @@
--module(zero_tuple).
--export([t1/0, t2/0]).
-
-t1() ->
-  {} = a(),
-  ok.
-
-t2() ->
-  b = a(),
-  ok.
-
-a() -> a.
-
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/dialyzer_options b/lib/dialyzer/test/user_SUITE_data/dialyzer_options
index 513ed7752b..513ed7752b 100644
--- a/lib/dialyzer/test/user_tests_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/user_SUITE_data/dialyzer_options
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/results/broken_dialyzer b/lib/dialyzer/test/user_SUITE_data/results/broken_dialyzer
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/user_tests_SUITE_data/results/broken_dialyzer
+++ b/lib/dialyzer/test/user_SUITE_data/results/broken_dialyzer
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/results/gcpFlowControl b/lib/dialyzer/test/user_SUITE_data/results/gcpFlowControl
index 7938c53fc6..7938c53fc6 100644
--- a/lib/dialyzer/test/user_tests_SUITE_data/results/gcpFlowControl
+++ b/lib/dialyzer/test/user_SUITE_data/results/gcpFlowControl
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/results/qlc_error b/lib/dialyzer/test/user_SUITE_data/results/qlc_error
index e69de29bb2..e69de29bb2 100644
--- a/lib/dialyzer/test/user_tests_SUITE_data/results/qlc_error
+++ b/lib/dialyzer/test/user_SUITE_data/results/qlc_error
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/results/spvcOrig b/lib/dialyzer/test/user_SUITE_data/results/spvcOrig
index 8c57358af0..8c57358af0 100644
--- a/lib/dialyzer/test/user_tests_SUITE_data/results/spvcOrig
+++ b/lib/dialyzer/test/user_SUITE_data/results/spvcOrig
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/results/wsp_pdu b/lib/dialyzer/test/user_SUITE_data/results/wsp_pdu
index a47b1f1f2c..a47b1f1f2c 100644
--- a/lib/dialyzer/test/user_tests_SUITE_data/results/wsp_pdu
+++ b/lib/dialyzer/test/user_SUITE_data/results/wsp_pdu
diff --git a/lib/dialyzer/test/user_SUITE_data/src/broken_dialyzer.erl b/lib/dialyzer/test/user_SUITE_data/src/broken_dialyzer.erl
new file mode 100644
index 0000000000..1e0612a345
--- /dev/null
+++ b/lib/dialyzer/test/user_SUITE_data/src/broken_dialyzer.erl
@@ -0,0 +1,130 @@
+-module(broken_dialyzer).
+
+-export([do_move_next/1]).
+
+-define(ap_indices, 512).
+-define(dp_indices, 504).
+
+
+-record(apR,{a,c=[],n=[],nc=0,nn=0,nl=[]}).
+-define(apL(L), [#apR{a=A} || A <- L]).
+
+-define(gr, get(my_return_value)).
+-define(pr(PR), put(my_return_value, PR)).
+-record(bit,{i,c,n,s}).           % index, current, next, state
+
+
+do_move_next({BL,AL}) ->
+    Max = max(length(BL), length(AL)),
+    Max2 = max(length(BL)*2, length(AL)),
+    MoveTo = [A || A <- AL, A#apR.nn < Max, A#apR.nn+A#apR.nc < Max2],
+    MoveFrom = [A || A <- AL,
+                     (A#apR.nn > Max) orelse (A#apR.nn+A#apR.nc > Max2)],
+    Unchanged = (AL--MoveTo)--MoveFrom,
+    {BL1,{AL1,{AL2,AL3}}} =
+        lists:mapfoldl(
+          fun(B=#bit{i=I,c=C,s=S,n=Next}, {From,{To,FilledUp}})
+             when S==ok;S==lost_replica;S==moved_replica ->
+                  case lists:keysearch(Next,#apR.a,From) of
+                      {value, F=#apR{n=N1,nn=NN1,nc=NC1}}
+                      when (NN1>Max) or (NN1+NC1>Max2) ->
+                          case C of
+                              [] ->
+                                  {B, {From,{To,FilledUp}}};
+                              ShortList ->
+                                  T=#apR{a=NewNext,n=N2,nn=NN2} =
+                                      find_next(Next,ShortList),
+                                  {value, {C,NL_from}} =
+                                      lists:keysearch(C,1,F#apR.nl),
+                                  {value, {C,NL_to}} =
+                                      lists:keysearch(C,1,T#apR.nl),
+                                  NewNL_from = lists:keyreplace(
+                                                 C,1,F#apR.nl,{C,NL_from--[I]}),
+                                  NewNL_to = lists:keyreplace(
+                                               C,1,T#apR.nl,{C,[I|NL_to]}),
+
+                                  NewT = T#apR{n=[I|N2],nn=NN2+1,
+                                               nl=NewNL_to},
+
+                                  {B#bit{n=NewNext,
+                                         s = if
+                                                 S == lost_replica ->
+                                                     lost_replica;
+                                                 true ->
+                                                     moved_replica
+                                             end},
+                                   {lists:keyreplace(
+                                      Next,#apR.a,From,
+                                      F#apR{n=N1--[I],nn=NN1-1,nl=NewNL_from}),
+                                    if
+                                        (NewT#apR.nn+NewT#apR.nc >= Max2)
+                                        or (NewT#apR.nn >= Max) ->
+                                            {lists:keydelete(NewNext,#apR.a,To),
+                                             [NewT|FilledUp]};
+                                        true ->
+                                            {lists:keyreplace(
+                                               NewNext,#apR.a,To,NewT),
+                                             FilledUp}
+                                    end}}
+                          end;
+                      _ ->
+                          {B, {From,{To,FilledUp}}}
+                  end;
+             (B, A) ->
+                  {B, A}
+          end, {MoveFrom,{MoveTo,[]}},BL),
+    {BL1,Unchanged++AL1++AL2++AL3}.
+
+%%% -----------------------------------------------------------------
+%%% find_next/2
+%%%
+%%% ------------------------------------------------------------------
+
+find_next(Ap,L) ->
+    hd(catch
+       lists:foreach(
+         fun(SelVal) ->
+                 case [ApR ||
+                          ApR <- L,
+                          begin
+                              {value,{Ap,NL}} =
+                                  lists:keysearch(Ap,1,ApR#apR.nl),
+                              length(NL) =< SelVal
+                          end] of
+                     [] ->
+                         ok;
+                     ShortList ->
+                         throw(ShortList)
+                 end
+         end,
+         lists:seq(0,?ap_indices))).
+
+%%% -----------------------------------------------------------------
+%%% max/2
+%%%
+%%% Calculates max number of indices per AP, given number of indices
+%%% and number of APs.
+%%% -----------------------------------------------------------------
+max(F,S) ->
+    (F div S) + if
+                    (F rem S) == 0 ->
+                        0;
+                    true ->
+                        1
+                end.
+
+%%% ==============================================================
+%%%      ADMINISTRATIVE INFORMATION
+%%% ==============================================================
+%%% #Copyright (C) 2005
+%%% by ERICSSON TELECOM AB
+%%% S - 125 26  STOCKHOLM
+%%% SWEDEN, tel int + 46 8 719 0000
+%%%
+%%% The program may be used and/or copied only with the written
+%%% permission from ERICSSON TELECOM AB, or in accordance with
+%%% the terms and conditions stipulated in the agreement/contract
+%%% under which the program has been supplied.
+%%%
+%%% All rights reserved
+%%%
diff --git a/lib/dialyzer/test/user_SUITE_data/src/gcp.hrl b/lib/dialyzer/test/user_SUITE_data/src/gcp.hrl
new file mode 100644
index 0000000000..0b0f1246b5
--- /dev/null
+++ b/lib/dialyzer/test/user_SUITE_data/src/gcp.hrl
@@ -0,0 +1,166 @@
+%%% #0.    BASIC INFORMATION
+%%% ----------------------------------------------------------
+%%% %CCaseFile:	gcp.hrl %
+%%% Author:      EAB/UPD/AV
+%%% Description: Internal include file.
+%%% ----------------------------------------------------------
+-hrl_id('9/190 55-CNA 113 033 Ux').
+-hrl_vsn('/main/R1A/21').
+-hrl_date('2005-05-31').
+-hrl_author('uabasve').
+%%% %CCaseTemplateFile:	module.hrl %
+%%% %CCaseTemplateId: 17/002 01-FEA 202 714 Ux, Rev: /main/4 %
+%%%
+%%% Copyright (C) 2000-2005 by Ericsson Telecom AB
+%%% SE-126 25  STOCKHOLM
+%%% SWEDEN, tel int + 46 8 719 0000
+%%%
+%%% The program may be used and/or copied only with the written
+%%% permission from Ericsson Telecom AB, or in accordance with
+%%% the terms and conditions stipulated in the agreement/contract
+%%% under which the program has been supplied.
+%%%
+%%% All rights reserved
+%%%
+%%% ----------------------------------------------------------
+%%% #1.    REVISION LOG
+%%% ----------------------------------------------------------
+%%% Rev        Date       Name        What
+%%% -----      -------    --------    ------------------------
+%%% R1A/1      05-02-07   uabasve    Copied from EAS R7A/9
+%%% R1A/2      05-02-08   ejojmjn    Removed SAAL
+%%% R1A/3-     05-03-18   uabasve    Clean.
+%%% ----------------------------------------------------------
+%%%
+%%% #2.    CODE
+%%% #---------------------------------------------------------
+%%% #2.1   DEFINITION OF CONSTANTS
+%%% #---------------------------------------------------------
+
+%% Keys into gcpVariables for various options/values.
+-define(TRAFFIC_DESCRIPTOR_KEY, traffic_descriptor).
+
+%% H.248 version at link creation.
+-define(INITIAL_H248_VERSION, 1).
+
+%% Exceptions for use within a module. ?MODULE is just extra protection
+%% against catching something unexpected.
+-define(THROW(Reason), throw({error, ?MODULE, ?LINE, Reason})).
+-define(CATCH(Expr),   try Expr
+                       catch throw: ?FAILURE(Reason) -> {error, Reason}
+                       end).
+-define(FAILURE(T), {error, ?MODULE, _, T}).
+
+%% The SendHandle used by a GCP transport process must be a tuple
+%% of length >= 2 whose first two elements are the pid of the
+%% transport process and index (aka #gcpLinkTable.key) of the link
+%% upon which incoming data has arrived.
+-define(SH_PID(SendHandle),  element(1, SendHandle)).
+-define(SH_LINK(SendHandle), element(2, SendHandle)).
+-define(SH_SET_PID(SendHandle, Pid), setelement(1, SendHandle, Pid)).
+
+%% Megaco process that CH and OM servers monitor. This needs to be
+%% replaced by a documented method.
+-define(MEGACO_APP, megaco_config).
+
+%% The message that gcpI:send_reply sends to the process that's waiting
+%% for an action reply.
+-define(ACTION_REPLY_MESSAGE(ActionReplies, Result),
+        {reply, ActionReplies, Result}).
+
+%%% #---------------------------------------------------------
+%%% #2.2   DEFINITION OF RECORDS
+%%% #---------------------------------------------------------
+
+-record(mg, {pref}).
+-record(mgc, {mgid}).
+
+%% User configuration that gets mapped into megaco user info by
+%% gcpLib:make_user_info/1. GCP exposes only a subset of what's
+%% possible to set in megaco.
+-record(user_config,
+        {reply_timer          = 30000, %% ms to wait for reply ack
+         %% Incoming transactions:
+         pending_timer        = 10000, %% ms until outgoing transaction pending
+         sent_pending_limit   = 5,     %% nr of outgoing pendings before 506
+         %% Outgoing transactions:
+         recv_pending_limit   = infinity,%% nr of incoming pendings before fail
+         request_timer        = 3000,  %% ms to wait for response before resend
+         request_retries      = 5,     %% nr unanswered sends before fail
+         long_request_timer   = 15000, %% ms to wait for reply after pending
+         long_request_retries = 5}).   %% nr of pendings/timeouts before fail
+
+%% Record passed into transport implementations at transport start.
+%% Expected to be passed back to gcpTransportI.
+-record(receive_handle,
+        {megaco_receive_handle,  %% passed to megaco:receive_message
+         receive_message}).      %% gcpLinkTable.receive_message
+
+%%% ---------------------------------------------------------------------------
+%%% # gcpRegistrationTable
+%%%
+%%% Record containing defined MGC's/MG's (aka megaco users).
+%%% ---------------------------------------------------------------------------
+
+-record(gcpRegistrationTable,
+        {key,                    %% user reference (aka MG/MGC id)
+         role,                   %% mg | mgc
+         mid,                    %% H.248 mid of the MGC/MG
+         version,                %% of H.248
+         callback,               %% {Module, ExtraArgs}
+         config = #user_config{}}).
+
+%%% ----------------------------------------------------------
+%%% # gcpLinkTable
+%%% ----------------------------------------------------------
+
+-record(gcpLinkTable,
+        {key,                    %% link reference
+         endpoint,               %% #mgc{} | #mg{}
+         user,                   %% registration table key
+         chid,                   %% call handler of transport
+         admin_state,            %% up | down
+         op_state,               %% up | down | pending | disabled
+         restart = auto,         %% auto | user
+         encoding_mod,           %% module implementing megaco_encoder
+         encoding_config,        %% as passed to encoding_mod
+         transport_start,        %% {M,F,ExtraArgs} for transport start
+         transport_data,         %% arbitrary, passed to transport_mod
+         send_message,           %% {default|sysrpc|transport|module, Module}
+         receive_message,        %% local | {M,F,ExtraArgs} for decode node
+         tried = false,          %% Only for links owned by a MG.
+                                 %% Used to indicate that a setup attempt
+                                 %% has been performed on this link.
+         t95_period = 350000}).
+
+%%% ----------------------------------------------------------
+%%% # gcpActiveLinkTable
+%%% ----------------------------------------------------------
+
+-record(gcpActiveLinkTable,
+        {key,                    %% {mg|mgc, MgId}
+         link,                   %% link reference
+         chid,                   %% CH the link is tied to
+         node,                   %% node the link is on
+         conn_handle,            %% record megaco_conn_handle
+         send_handle,            %% {TransportPid, LinkIdx, ...}
+         version = ?INITIAL_H248_VERSION}).
+
+%%% ----------------------------------------------------------
+%%% # gcpVariables
+%%% ----------------------------------------------------------
+
+-record(gcpVariables,
+        {key,
+         value}).
+
+%%% ----------------------------------------------------------
+%%% # gcpReplyData
+%%% ----------------------------------------------------------
+
+-record(gcpReplyData,
+        {callback,               %% {Module, Args}
+         mgid,
+         user_data,              %% As passed by the user on send
+         prio,
+         timestamp}).
diff --git a/lib/dialyzer/test/user_SUITE_data/src/gcpFlowControl.erl b/lib/dialyzer/test/user_SUITE_data/src/gcpFlowControl.erl
new file mode 100644
index 0000000000..8598efb5d1
--- /dev/null
+++ b/lib/dialyzer/test/user_SUITE_data/src/gcpFlowControl.erl
@@ -0,0 +1,397 @@
+%%%-------------------------------------------------------------------
+%%% File    : gcpFlowControl.erl
+%%% Author  : EAB/UPD/AV
+%%% Description : Implements overload protection.
+%%%-------------------------------------------------------------------
+-module(gcpFlowControl).
+-id('24/190 55-CNA 113 033 Ux').
+-vsn('/main/R1A/14').
+-date('2005-05-04').
+-author('uabasve').
+%%% ----------------------------------------------------------
+%%% %CCaseTemplateFile: module.erl %
+%%% %CCaseTemplateId: 16/002 01-FEA 202 714 Ux, Rev: /main/4 %
+%%%
+%%% Copyright (C) 2001-2005 by Ericsson Telecom AB
+%%% SE-126 25  STOCKHOLM
+%%% SWEDEN, tel int + 46 8 719 0000
+%%%
+%%% The program may be used and/or copied only with the written
+%%% permission from Ericsson Telecom AB, or in accordance with
+%%% the terms and conditions stipulated in the agreement/contract
+%%% under which the program has been supplied.
+%%%
+%%% All rights reserved
+%%%
+%%%
+%%% ----------------------------------------------------------
+%%% #1.    REVISION LOG
+%%% ----------------------------------------------------------
+%%% Rev        Date       Name        What
+%%% --------   --------   --------    ------------------------
+%%% R1A/1-2    05-02-07   ejojmjn     Copied from EAS R7A/11.
+%%% R1A/3-14   05-03-14   uabasve     Clean.
+%%%--------------------------------------------------------------------
+
+-include_lib("megaco/include/megaco.hrl").
+-include_lib("megaco/include/megaco_message_v1.hrl").
+-include("gcp.hrl").
+
+-export([send_request/4,     %% user send from gcpInterface
+         receive_reply/2,    %% from callback in gcpTransaction
+         init_ets_tables/1,
+         init_data/2]).
+
+-define(PRIO_INFINITY, 16).
+-define(MIN_WINDOW, 10).
+-define(MAX_WINDOW, 100).
+
+-define(BUCKET_MAX, 100).
+-define(BUCKET_THRESH_HIGH, 80).
+-define(BUCKET_THRESH_LOW, 20).
+
+-define(ALLOW_TIMEOUT, 1000).
+
+%% Holds counters for flow control in GCP
+-record(gcpFlowControlTable,
+	{key,
+	 window        = 50,
+	 available     = 50,
+	 bucket        = 0,
+	 q             = 0,
+	 sent          = 0,   %% Counts all attempts
+	 rejectable    = 0,   %% Counts rejectable attempts
+	 t95,
+	 errors        = 0,
+	 rejects       = 0,
+	 replies       = 0}).
+
+-record(gcpFlowControlBitmap,
+        {key,
+         count = 0}).
+
+%%====================================================================
+%% External functions
+%%====================================================================
+
+%%--------------------------------------------------------------------
+%% Function: send_request/4
+%%
+%% Output: ok | {error, Reason}
+%%--------------------------------------------------------------------
+
+send_request(ActiveLink, TimerOptions, ActionRequests, UserData) ->
+    #gcpActiveLinkTable{key = Key,
+                        conn_handle = ConnHandle}
+        = ActiveLink,
+    Prio = prio(ActionRequests),
+    incr(Key, sent),
+    case allow(Key, Prio) of
+        {true, Timestamp} ->
+            grant_request(user_data(ConnHandle),
+                          Key,
+                          Prio,
+                          Timestamp,
+                          ConnHandle,
+                          TimerOptions,
+                          ActionRequests,
+                          UserData);
+        false ->
+            {error, rejected}
+    end.
+
+%%--------------------------------------------------------------------
+%% Function: receive_reply/2
+%% Description:
+%%--------------------------------------------------------------------
+
+receive_reply(Key, Timestamp) ->
+    incr(Key, available),
+    incr(Key, replies),
+    release(Key),
+    report_time(Key, Timestamp).
+
+%%--------------------------------------------------------------------
+%% Func: init_ets_tables/1
+%%
+%% Returns: ok
+%%--------------------------------------------------------------------
+
+init_ets_tables(Role) ->
+    create_ets(Role, gcpFlowControlTable, #gcpFlowControlTable.key),
+    create_ets(Role, gcpFlowControlBitmap, #gcpFlowControlBitmap.key),
+    ok.
+
+create_ets(Role, Table, Pos) when integer(Pos) ->
+    create_ets(Role,
+               Table,
+               [named_table, ordered_set, public, {keypos, Pos}]);
+
+create_ets(test, Table, ArgList) ->
+    ets:new(Table, ArgList);
+create_ets(Role, Table, ArgList) ->
+    case ets:info(Table) of
+        undefined ->
+            sysCmd:ets_new(Table, ArgList);
+        _ when Role == ch ->
+            sysCmd:inherit_tables([Table]);
+        _ when Role == om ->
+            ok
+    end.
+
+%%--------------------------------------------------------------------
+%% Func: init_data/2
+%%--------------------------------------------------------------------
+
+init_data(Key, T95) ->
+    ets:insert(gcpFlowControlTable, #gcpFlowControlTable{key = Key,
+                                                         t95 = T95}).
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
+%%% ----------------------------------------------------------
+%%%     incr
+%%% ----------------------------------------------------------
+
+cntr(Key, Field) ->
+    incr(Key, Field, 0).
+
+incr(Key, Field) ->
+    incr(Key, Field, 1).
+
+-define(INCR(Field),
+        incr(Key, Field, X) -> upd_c(Key, {#gcpFlowControlTable.Field, X})).
+
+?INCR(sent);
+?INCR(replies);
+?INCR(q);
+?INCR(t95);
+?INCR(errors);
+?INCR(rejects);
+?INCR(rejectable);
+?INCR(window);
+?INCR(available);
+
+incr(Key, bucket, X)->
+    upd_c(Key, {#gcpFlowControlTable.bucket, X, ?BUCKET_MAX, ?BUCKET_MAX}).
+
+upd_c(Key, N) ->
+    ets:update_counter(gcpFlowControlTable, Key, N).
+
+%%% ----------------------------------------------------------
+%%%     decr
+%%%
+%%%     Beware that decr is implemented as incr, care has to be taken
+%%%     not to bungle things when max/min values are used.
+%%% ----------------------------------------------------------
+
+decr(Key, available, X) ->
+    upd_c(Key, {#gcpFlowControlTable.available, -X});
+decr(Key, window, X) ->
+    upd_c(Key, {#gcpFlowControlTable.window, -X});
+decr(Key, bucket, X) ->
+    upd_c(Key, {#gcpFlowControlTable.bucket, -X, 0, 0}).
+
+decr(Key, Field) ->
+    decr(Key, Field, 1).
+
+%%% ----------------------------------------------------------
+%%%     allow
+%%% ----------------------------------------------------------
+
+allow(Key, ?PRIO_INFINITY) ->
+    decr(Key, available),
+    {true, now()};
+
+allow(Key, Prio) ->
+    incr(Key, rejectable),
+    case decr(Key, available) of
+        N when N > 0 ->
+            {true, no_stamp};
+        _ ->
+            %% We did not send it, therefore incr available again
+            incr(Key, available),
+            queue(Key, Prio)
+    end.
+
+%%% ----------------------------------------------------------
+%%%     queue
+%%% ----------------------------------------------------------
+
+queue(Key, Prio) ->
+    incr(Key, q),
+    T = {Key, Prio, now(), self()},
+    ets:insert(gcpFlowControlBitmap, #gcpFlowControlBitmap{key = T}),
+    wait(T).
+
+%%% ----------------------------------------------------------
+%%%     wait
+%%% ----------------------------------------------------------
+
+wait({Key, _Prio, _When, _Self} = T) ->
+    receive
+        allow ->
+            ets:delete(gcpFlowControlBitmap, T),
+            decr(Key, available),
+            {true, no_stamp}
+    after ?ALLOW_TIMEOUT ->
+            timeout(T),
+            adjust_window(Key),
+            incr(Key, rejects),
+            false
+    end.
+
+timeout(T) ->
+    case ets:update_counter(gcpFlowControlBitmap, T, 1) of
+        1 ->
+            %% Got the lock: no one has released Key and sent 'allow'.
+            ets:delete(gcpFlowControlBitmap, T),
+            ok;
+        _ ->
+            %% A releasing process got the lock: 'allow' has been
+            %% sent. Try to remove the message before proceeding.
+            %% (This is to keep mdisp from complaining apparently.)
+            ets:delete(gcpFlowControlBitmap, T),
+            receive
+                allow ->
+                    ok
+            after ?ALLOW_TIMEOUT ->
+                    io:format("~p: errant allow: ~p~n", [?MODULE, T])
+            end
+    end.
+
+%% Now, if we reject and our general response time is low
+%% (i.e. low bucket) then we increase the window size.
+adjust_window(Key) ->
+    adjust_window(Key,
+                  cntr(Key, bucket) < ?BUCKET_THRESH_LOW
+                  andalso cntr(Key, window) < ?MAX_WINDOW).
+
+adjust_window(Key, true) ->
+    incr(Key, window),
+    incr(Key, available),
+    incr(Key, bucket, 20);
+adjust_window(_, false) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Func: report_time/2
+%%--------------------------------------------------------------------
+
+report_time(_, no_stamp) ->
+    ok;
+report_time(Key, {MS, S, Ms})->
+    {MegaSecs, Secs, MicroSecs} = now(),
+    p(Key,
+      MicroSecs - Ms + 1000000*(Secs - S + 1000000*(MegaSecs - MS)),
+      cntr(Key, t95)).
+
+%%% ----------------------------------------------------------
+%%%     p
+%%% ----------------------------------------------------------
+
+p(Key, Time, T95) when Time =< T95 ->
+    decr(Key, bucket);
+p(Key, _Time, _T95) ->
+    %% If we have a long response time, then increase the leaky
+    %% bucket. If the bucket is over the high watermark and the window
+    %% is not already at its minimum size, then decrease the window
+    %% and available.
+    case {cntr(Key, window), incr(Key, bucket, 20)} of
+        {Window, Bucket} when Window > ?MIN_WINDOW,
+                              Bucket > ?BUCKET_THRESH_HIGH ->
+            decr(Key, window),
+            decr(Key, available);
+        _ ->
+            ok
+    end.
+
+%%% ----------------------------------------------------------
+%%%     release
+%%% ----------------------------------------------------------
+
+release(Key) ->
+    %% The choice of the key below will cause ets:prev/2 to return
+    %% the key with the highest priority which was queued most
+    %% recently. This relies on the fact that integers sort before
+    %% atoms, the atom 'prio' in this case. The atoms 'queued' and
+    %% 'pid' are of no significance.
+    release(Key, {Key, prio, queued, pid}).
+
+%% This isn't a (FIFO) queue within each priority, but a (LIFO) stack.
+
+release(Key, T) ->
+    release(Key, cntr(Key, available), ets:prev(gcpFlowControlBitmap, T)).
+
+%% Note that only keys on the same Key are matched.
+release(Key, N, {Key, _Prio, _When, Pid} = T) when N > 0 ->
+    case catch ets:update_counter(gcpFlowControlBitmap, T, 1) of
+        1 ->
+            Pid ! allow;
+        _ ->
+            %% Another process has released this key.
+            release(Key, T)
+    end;
+
+release(_, _, _)->
+    ok.
+
+%%% ----------------------------------------------------------
+%%%     user_data
+%%% ----------------------------------------------------------
+
+user_data(ConnHandle) ->
+    case catch megaco:conn_info(ConnHandle, reply_data) of
+        {'EXIT', _Reason} ->
+            false;
+        Rec ->
+            {value, Rec}
+    end.
+
+%%% ----------------------------------------------------------
+%%%     grant_request
+%%% ----------------------------------------------------------
+
+grant_request({value, Rec},
+              Key, Prio, Time,
+              ConnHandle, Options, ActionRequests, UserData) ->
+    ReplyData = Rec#gcpReplyData{user_data = UserData,
+                                 prio      = Prio,
+                                 timestamp = Time},
+    cast_rc(megaco:cast(ConnHandle,
+                        ActionRequests,
+                        [{reply_data, ReplyData} | Options]),
+            Key,
+            ActionRequests);
+
+grant_request(false, Key, _, _, _, _, _, _) ->
+    incr(Key, available),
+    {error, reply_data}.
+
+cast_rc(ok = Ok, _, _) ->
+    Ok;
+cast_rc({error, Reason}, Key, ActionRequests) ->
+    incr(Key, available),
+    gcpLib:error_report(?MODULE, send_request, [ActionRequests],
+                        "send failed",
+                        Reason),
+    {error, {encode, Reason}}.
+
+%%--------------------------------------------------------------------
+%% Func: prio/1
+%% Returns: The priority of the request
+%%--------------------------------------------------------------------
+
+prio([ActionRequest | _]) ->
+    #'ActionRequest'{contextId = ContextId,
+                     contextRequest = ContextRequest}
+        = ActionRequest,
+    prio(ContextId, ContextRequest).
+
+prio(?megaco_choose_context_id, #'ContextRequest'{priority = Prio})
+  when integer(Prio) ->
+    Prio;
+prio(_, _) ->
+    ?PRIO_INFINITY.
diff --git a/lib/dialyzer/test/user_SUITE_data/src/qlc_error.erl b/lib/dialyzer/test/user_SUITE_data/src/qlc_error.erl
new file mode 100644
index 0000000000..04e621dd4b
--- /dev/null
+++ b/lib/dialyzer/test/user_SUITE_data/src/qlc_error.erl
@@ -0,0 +1,15 @@
+%% -*- erlang-indent-level: 2 -*-
+%% $Id: qlc_error.erl,v 1.1 2008/12/17 09:53:52 mikpe Exp $
+
+%% @author Daniel Luna <[email protected]>
+%% @copyright 2006 Daniel Luna
+%%
+%% @doc
+%%
+
+-module(qlc_error).
+-export([fix/0]).
+-include_lib("stdlib/include/qlc.hrl").
+
+fix() ->
+  qlc:eval(qlc:q([I || I <- []])).
diff --git a/lib/dialyzer/test/user_SUITE_data/src/spvcOrig.erl b/lib/dialyzer/test/user_SUITE_data/src/spvcOrig.erl
new file mode 100644
index 0000000000..279caffdde
--- /dev/null
+++ b/lib/dialyzer/test/user_SUITE_data/src/spvcOrig.erl
@@ -0,0 +1,3520 @@
+%%%=======================================================================
+%%%
+%%% Test from Mats Cronqvist <[email protected]>. The
+%%% analysis crasched due to the handling of tuples-as-funs in
+%%% hipe_icode_type.erl, and it also exposed a bug when a control flow
+%%% path is first analyzed and then shown to be infeasible.
+%%%
+
+-file("./spvcOrig.erl", 1).
+
+-module(spvcOrig).
+
+-author(qamarma).
+
+-id('3/190 55-CNA 121 64').
+
+-vsn('/main/Inc4/R2A/R4A/R6A/R7A/R7D/R8B/R10A/R11A/2').
+
+-date('2004-10-26').
+
+-export([gen_set/3,gen_set/4,connect/3,release_comp_nu/3,release_nu/3,timeout/2,restart_spvc/1,restart_multi_spvcs/1,forced_release/1,error_handler/3,get_backoff_table/2,timeout_event/1]).
+
+-export([release_incumbent/2,switch_over/2]).
+
+-export([call_failure/1,get_backoff_table/2]).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/pchTables.hrl", 1).
+
+-hrl_id('2/190 55-CNA 121 08').
+
+-hrl_vsn('/main/Inc3/Inc4/R2A/R3A/R3B/R5A/R6A/R7A/R7D/R8B/13').
+
+-hrl_date('2003-01-24').
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../derived_hrl/mib/AXD301-PCH-MIB.hrl", 1).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/pchTables.hrl", 58).
+
+-record(pchVp, {vplEntry,
+                vplLastChange,
+                vplReceiveTrafficDescrIndex = 0,
+                vplTransmitTrafficDescrIndex = 0,
+                vplCcIdentifier,
+                vplConnId,
+                vplMpId,
+                vplLeafId,
+                vplChargingIndicator = 1,
+                vplRemoteChargingInd = 1,
+                vplChargablePartyIdentifier,
+                vplSegmentEndPoint = 2,
+                vplRowStatus,
+                vplCastType = 1,
+                vplConnKind = 1,
+                vplServiceType = 2,
+                vplEndPointData,
+                vplContinuityCheck = 1,
+                vplUpcNpcMode = 2,
+                vplPreventInbandCc = 1,
+                vplMonAisRdi = 2,
+                vpcAdminStatus = 2,
+                vplSpvcAutoTarget = 2,
+                vplSchedulingFlag = 2,
+                vplApplication,
+                vplRemoteData,
+                vpccAdminStatus = 2,
+                vplContCheckSearch = 1,
+                vplPmSearch = 1,
+                vplLastBuffFlagRead,
+                vplShapingMode = 1,
+                vplGroupShapingId}).
+
+-record(pchVpDb, {vplEntry,
+                  vplLastChange,
+                  vplReceiveTrafficDescrIndex = 0,
+                  vplTransmitTrafficDescrIndex = 0,
+                  vplCcIdentifier,
+                  vplConnId,
+                  vplMpId,
+                  vplLeafId,
+                  vplAttributes,
+                  vplChargablePartyIdentifier,
+                  vplRowStatus,
+                  vplEndPointData,
+                  vplApplication,
+                  vplRemoteData,
+                  vplLastBuffFlagRead,
+                  vplShapingMode,
+                  vplGroupShapingId}).
+
+-record(pchVpExt, {vplExtEntry,
+                   vplExtReceiveTdIndex,
+                   vplExtTransmitTdIndex,
+                   vplExtUserName = [],
+                   vplExtProviderName = [],
+                   vplExtUserOperator}).
+
+-record(pchVc, {vclEntry,
+                vclLastChange,
+                vclReceiveTrafficDescrIndex = 0,
+                vclTransmitTrafficDescrIndex = 0,
+                vclCcIdentifier,
+                vclConnId,
+                vclMpId,
+                vclLeafId,
+                vclChargingIndicator = 1,
+                vclRemoteChargingInd = 1,
+                vclChargablePartyIdentifier,
+                vclPacketDiscard = 2,
+                vclSegmentEndPoint = 2,
+                vclRowStatus,
+                vclCastType = 1,
+                vclConnKind = 1,
+                vclContinuityCheck = 1,
+                vclUpcNpcMode = 2,
+                vclEndPointData,
+                vclPreventInbandCc = 1,
+                vclMonAisRdi = 2,
+                vclSpvcAutoTarget = 2,
+                vclSchedulingFlag = 2,
+                vclApplication,
+                vclRemoteData,
+                vcccAdminStatus = 2,
+                vclContCheckSearch = 1,
+                vclPmSearch = 1,
+                vclLastBuffFlagRead,
+                vclChargingIfChanid,
+                vclShapingMode = 1}).
+
+-record(pchVcDb, {vclEntry,
+                  vclLastChange,
+                  vclReceiveTrafficDescrIndex = 0,
+                  vclTransmitTrafficDescrIndex = 0,
+                  vclCcIdentifier,
+                  vclConnId,
+                  vclMpId,
+                  vclLeafId,
+                  vclAttributes,
+                  vclChargablePartyIdentifier,
+                  vclRowStatus,
+                  vclEndPointData,
+                  vclApplication,
+                  vclRemoteData,
+                  vclLastBuffFlagRead,
+                  vclChargingIfChanid,
+                  vclShapingMode}).
+
+-record(pchAtd, {tdIndex,
+                 tdType,
+                 tdParam1 = 0,
+                 tdParam2 = 0,
+                 tdParam3 = 0,
+                 tdParam4 = 0,
+                 tdParam5 = 0,
+                 tdTrafficQoSClass = 0,
+                 tdRowStatus = 1,
+                 tdServiceCategory = 6,
+                 tdVcCapability = 1,
+                 tdName = [],
+                 tdUserCounter = 0,
+                 tdUser = []}).
+
+-record(pchAbr, {abrIndex,
+                 abrIcr,
+                 abrTbe = 16277215,
+                 abrFrtt = 0,
+                 abrRdf = 11,
+                 abrRif = 11,
+                 abrNrm = 4,
+                 abrTrm = 7,
+                 abrCdf = 3,
+                 abrAdtf = 50,
+                 abrRowStatus = 1}).
+
+-record(pchIndexNext, {key,
+                       tdIndexNext,
+                       vpccIndexNext,
+                       vcccIndexNext,
+                       scheduledVpCcIndexNext,
+                       scheduledVcCcIndexNext}).
+
+-record(pchSchedVpCc, {schedVpCcIndex,
+                       schedVpCcTarget,
+                       schedVpCcReceiveTdIndex,
+                       schedVpCcTransmitTdIndex,
+                       schedVpCcOpTime,
+                       schedVpCcOpInd,
+                       schedVpCcOpStatus,
+                       schedVpCcTimerRef,
+                       schedVpCcRowStatus,
+                       schedVpCcErrorCode,
+                       schedVpCcUserName = [],
+                       schedVpCcProviderName = []}).
+
+-record(pchVpCc, {vpccId,
+                  vpccUserName = [],
+                  vpccAdminStatus,
+                  vpccApplication,
+                  vpccProviderName = []}).
+
+-record(pchSchedVcCc, {schedVcCcIndex,
+                       schedVcCcTarget,
+                       schedVcCcReceiveTdIndex,
+                       schedVcCcTransmitTdIndex,
+                       schedVcCcOpTime,
+                       schedVcCcOpInd,
+                       schedVcCcOpStatus,
+                       schedVcCcTimerRef,
+                       schedVcCcRowStatus,
+                       schedVcCcErrorCode,
+                       schedVcCcUserName = [],
+                       schedVcCcProviderName = []}).
+
+-record(pchVcCc, {vcccId,
+                  vcccUserName = [],
+                  vcccAdminStatus,
+                  vcccApplication,
+                  vcccProviderName = []}).
+
+-record(pchSigChannels, {et_entry,
+                         cp_entry,
+                         sb_cp_entry,
+                         membership,
+                         status,
+                         sb_status,
+                         application = {0,[]}}).
+
+-record(pchSigChannelExt, {et_entry,
+                           user_name,
+                           provider_name}).
+
+-record(pchApplication, {key,
+                         application,
+                         rights}).
+
+-record(pchCurrAlarm, {key,
+                       type_of_fault,
+                       fault_id}).
+
+-record(pchIfAddress, {ifAddressEntry,
+                       ifAddressRowStatus}).
+
+-record(pchAddressToIf, {address,
+                         if_index}).
+
+-record(pchPreferences, {key,
+                         if_format}).
+
+-record(pchSigChannelCallback, {key,
+                                callback,
+                                function,
+                                args,
+                                data}).
+
+-record(pchTermHcId, {hcId,
+                      vclEntry}).
+
+-record(pchChg, {chgEntry,
+                 chgStatus}).
+
+-record(pchCommState, {key,
+                       ccid,
+                       request,
+                       low_cp_state,
+                       high_cp_state,
+                       et_side,
+                       application,
+                       data,
+                       timestamp,
+                       timer_id,
+                       callback}).
+
+-record(pchBufferedCmd, {key,
+                         resource,
+                         module,
+                         function,
+                         arguments,
+                         data}).
+
+-record(pchAnswerCh, {conn_id,
+                      chg_data,
+                      call_back_cp,
+                      old_rtd,
+                      old_ttd,
+                      old_EpData,
+                      action,
+                      resource,
+                      data,
+                      fail_cause}).
+
+-record(pchAnswerOm, {conn_id}).
+
+-record(ccPch, {rowInd,
+                admState = 2}).
+
+-record(pchIf, {ilmiVpi = 0,
+                ilmiVci = 0,
+                ilmiS = 1,
+                ilmiT = 5,
+                ilmiK = 4,
+                neighborIfName = [],
+                neighborIpAddr = [0,0,0,0],
+                maxVciSvc,
+                overbookingFactor = {0,0},
+                shapingMode = 0,
+                maxVpiSvc,
+                cdvtMultFactor = 100,
+                scBandwidth1 = 0,
+                scBandwidth2 = 0,
+                scBandwidth3 = 0,
+                scBandwidth4 = 0}).
+
+-record(pchMpTemp, {key,
+                    data}).
+
+-record(pchLatestErrorCode, {key,
+                             errorCode}).
+
+-record(pchRangeTable, {node,
+                        tdIndexRange,
+                        vpccIndexRange,
+                        vcccIndexRange}).
+
+-record(pchIndexBitmaps, {key,
+                          available,
+                          bitmap}).
+
+-record(pchLinkState, {key,
+                       op_state,
+                       last_change}).
+
+-record(pchFailedVpl, {vplEntry,
+                       vplLastChange}).
+
+-record(pchFailedVcl, {vclEntry,
+                       vclLastChange}).
+
+-record(pchStatCounters, {key,
+                          ingress,
+                          egress}).
+
+-record(pchEtStatTable, {index,
+                         value = 0}).
+
+-record(pchAuditResult, {key,
+                         passed,
+                         not_passed,
+                         sizes,
+                         obj_keys}).
+
+-record(pch_fault_reqc, {fault_type,
+                         fault_location}).
+
+-record(pch_cid, {conn_id,
+                  mp_id,
+                  leaf_id}).
+
+-file("./spvcOrig.erl", 207).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/pchI.hrl", 1).
+
+-hrl_id('52/190 55-CNA 121 08 Ux').
+
+-hrl_vsn('/main/R6A/R7A/R7D/R8B/3').
+
+-hrl_date('2002-10-14').
+
+-hrl_author(uabdomo).
+
+-record(pch_vc_rec, {ifIndex,
+                     vpi,
+                     vci,
+                     application}).
+
+-record(pch_vp_rec, {ifIndex,
+                     vpi}).
+
+-record(pch_td_index, {rtd_index,
+                       ttd_index}).
+
+-record(pch_td, {service_cat,
+                 pcr,
+                 scr,
+                 mbs,
+                 mcr,
+                 cdvt,
+                 tagging,
+                 clp_significance}).
+
+-record(pch_call_back_req, {module,
+                            function,
+                            user_data}).
+
+-record(pch_chg_rec, {chg_type,
+                      chg_interface,
+                      chg_chan_id,
+                      chg_party_name}).
+
+-record(pch_polic_rec, {policing,
+                        packet_discard}).
+
+-record(pch_user_name_rec, {user_name}).
+
+-record(pch_shaping_rec, {shaping}).
+
+-record(pch_audit_callback, {mod,
+                             arg}).
+
+-file("./spvcOrig.erl", 208).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/plc.hrl", 1).
+
+-hrl_id('12/190 55-CNA 121 45 Ux').
+
+-hrl_vsn('/main/R6A/R6B/R7A/R7D/R8B/R9A/R11A/4').
+
+-hrl_date('2004-12-07').
+
+-hrl_author(ethrba).
+
+-record(plcQueues, {name,
+                    type,
+                    weight,
+                    maxlength,
+                    owner}).
+
+-record(plcSettings, {flag,
+                      value}).
+
+-record(plcAlarm, {flag,
+                   value}).
+
+-file("./spvcOrig.erl", 209).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/spvcTables.hrl", 1).
+
+-hrl_id('10/190 55-CNA 121 64').
+
+-hrl_vsn('/main/Inc4/R2A/R3A/R3B/R5A/R6A/R7A/R7D/R8B/4').
+
+-hrl_date('2003-02-12').
+
+-hrl_author(etxovp).
+
+-record(spvcVpc, {spvcVpcEntry,
+                  spvcVpcTargetAddress,
+                  spvcVpcTargetSelectType,
+                  spvcVpcTargetVpi,
+                  spvcVpcLastReleaseCause,
+                  spvcVpcLastReleaseDiagnostic,
+                  spvcVpcRetryInterval = 1000,
+                  spvcVpcRetryTimer = 0,
+                  spvcVpcRetryThreshold = 1,
+                  spvcVpcRetryFailures = 0,
+                  spvcVpcRetryLimit = 15,
+                  spvcVpcRowStatus,
+                  spvcVpcUserName = [],
+                  spvcVpcProviderName = [],
+                  currentState,
+                  crankBackCounter = 0,
+                  spvcVpcApplication,
+                  spvcRerCap = false,
+                  spvcRerStatus = false}).
+
+-record(spvcVpcOpState, {state,
+                         timeOfChange}).
+
+-record(spvcVpcPerm, {spvcVpcEntry,
+                      spvcVpcTargetAddress,
+                      spvcVpcTargetSelectType,
+                      spvcVpcTargetVpi,
+                      spvcVpcRetryInterval = 1000,
+                      spvcVpcRetryThreshold = 1,
+                      spvcVpcRetryLimit = 15,
+                      spvcVpcRowStatus,
+                      spvcVpcUserName,
+                      spvcVpcProviderName,
+                      spvcVpcApplication}).
+
+-record(spvcVpcDyn, {spvcVpcEntry,
+                     spvcVpcLastReleaseCause,
+                     spvcVpcLastReleaseDiagnostic,
+                     spvcVpcRetryTimer = 0,
+                     spvcVpcRetryFailures = 0,
+                     currentState,
+                     crankBackCounter = 0}).
+
+-record(spvcVcc, {spvcVccEntry,
+                  spvcVccTargetAddress,
+                  spvcVccTargetSelectType,
+                  spvcVccTargetVpi,
+                  spvcVccTargetVci,
+                  spvcVccLastReleaseCause,
+                  spvcVccLastReleaseDiagnostic,
+                  spvcVccRetryInterval = 1000,
+                  spvcVccRetryTimer = 0,
+                  spvcVccRetryThreshold = 1,
+                  spvcVccRetryFailures = 0,
+                  spvcVccRetryLimit = 15,
+                  spvcVccRowStatus,
+                  spvcVccUserName = [],
+                  spvcVccProviderName = [],
+                  currentState,
+                  crankBackCounter = 0,
+                  spvcVccTargetDlci,
+                  spvcVccTargetType,
+                  spvcVccApplication,
+                  spvcVccFrKey,
+                  spvcVccTranslationMode,
+                  spvcRerCap = false,
+                  spvcRerStatus = false}).
+
+-record(spvcVccOpState, {state,
+                         timeOfChange}).
+
+-record(spvcVccPerm, {spvcVccEntry,
+                      spvcVccTargetAddress,
+                      spvcVccTargetSelectType,
+                      spvcVccTargetVpi,
+                      spvcVccTargetVci,
+                      spvcVccRetryInterval = 1000,
+                      spvcVccRetryThreshold = 1,
+                      spvcVccRetryLimit = 15,
+                      spvcVccRowStatus,
+                      spvcVccUserName,
+                      spvcVccProviderName,
+                      spvcVccTargetDlci,
+                      spvcVccTargetType,
+                      spvcVccApplication,
+                      spvcVccFrKey,
+                      spvcVccTranslationMode = 2}).
+
+-record(spvcVccDyn, {spvcVccEntry,
+                     spvcVccLastReleaseCause,
+                     spvcVccLastReleaseDiagnostic,
+                     spvcVccRetryTimer = 0,
+                     spvcVccRetryFailures = 0,
+                     currentState,
+                     crankBackCounter = 0}).
+
+-record(spvcFailures, {dummy_key,
+                       spvcCallFailuresTrapEnable = 2,
+                       spvcNotificationInterval = 30,
+                       backoff_interval = 0.100000,
+                       delay_factor = 2,
+                       max_delay = 200000}).
+
+-record(spvcCounters, {key,
+                       value}).
+
+-record(spvcEventIndicator, {dummy_key,
+                             spvcTimerInd = 2,
+                             spvcSendEventInd = 2}).
+
+-record(spvcIndexNext, {dummy_key,
+                        schedVccIndexNext = 1,
+                        schedVpcIndexNext = 1}).
+
+-record(spvcHcIdToTp, {hcId,
+                       tpEntry}).
+
+-record(spvcTpToHcId, {tpEntry,
+                       hcId,
+                       orig_number,
+                       orig_vpi,
+                       orig_vci,
+                       orig_dlci,
+                       frKey}).
+
+-record(spvcSchedVpc, {schedVpcIndex,
+                       schedVpcSource,
+                       schedVpcTargetAddr,
+                       schedVpcTargetSelType,
+                       schedVpcTargetVpi,
+                       schedVpcRetryInt,
+                       schedVpcRetryThres,
+                       schedVpcRetryLimit,
+                       schedVpcOpTime,
+                       schedVpcOpInd,
+                       schedVpcOpStatus,
+                       schedVpcTimerRef,
+                       schedVpcRowStatus,
+                       schedVpcUserName,
+                       schedVpcProviderName,
+                       schedVpcFaultCause,
+                       schedVpcRerCap = false}).
+
+-record(spvcSchedVcc, {schedVccIndex,
+                       schedVccSource,
+                       schedVccTargetAddr,
+                       schedVccTargetSelType,
+                       schedVccTargetVpi,
+                       schedVccTargetVci,
+                       schedVccRetryInt,
+                       schedVccRetryThres,
+                       schedVccRetryLimit,
+                       schedVccOpTime,
+                       schedVccOpInd,
+                       schedVccOpStatus,
+                       schedVccTimerRef,
+                       schedVccRowStatus,
+                       schedVccUserName,
+                       schedVccProviderName,
+                       schedVccFaultCause,
+                       schedVccRerCap = false}).
+
+-record(spvcCurrAlarm, {key,
+                        fault_id,
+                        data}).
+
+-record(spvcChg, {key,
+                  data}).
+
+-record(spvcBackoff, {key,
+                      delay_time,
+                      flag}).
+
+-record(spvcAutoVp, {entry,
+                     lastChange,
+                     receiveTrafficDescrIndex,
+                     transmitTrafficDescrIndex,
+                     ccIdentifier,
+                     connId,
+                     mpId,
+                     leafId,
+                     chargingIndicator = 1,
+                     remoteChargingInd = 1,
+                     chargablePartyIdentifier,
+                     segmentEndPoint = 2,
+                     rowStatus,
+                     castType = 1,
+                     connKind,
+                     serviceType = 2,
+                     endPointData,
+                     continuityCheck = 1,
+                     upcNpcMode = 2,
+                     preventInbandCc = 1,
+                     monAisRdi = 2,
+                     adminStatus,
+                     autoTarget = 1,
+                     schedulingFlag = 2,
+                     application = [],
+                     remoteData,
+                     vpccAdminStatus = 2,
+                     contCheckSearch = 1,
+                     pmSearch = 1,
+                     lastBuffFlagRead,
+                     shapingMode = 1,
+                     groupShapingId}).
+
+-record(spvcAutoVc, {entry,
+                     lastChange,
+                     receiveTrafficDescrIndex,
+                     transmitTrafficDescrIndex,
+                     ccIdentifier,
+                     connId,
+                     mpId,
+                     leafId,
+                     chargingIndicator = 1,
+                     remoteChargingInd = 1,
+                     chargablePartyIdentifier,
+                     packetDiscard = 2,
+                     segmentEndPoint = 2,
+                     rowStatus,
+                     castType = 1,
+                     connKind,
+                     continuityCheck = 1,
+                     upcNpcMode = 2,
+                     endPointData,
+                     preventInbandCc = 1,
+                     monAisRdi = 2,
+                     autoTarget = 1,
+                     schedulingFlag = 2,
+                     application = [],
+                     remoteData,
+                     vcccAdminStatus = 2,
+                     contCheckSearch = 1,
+                     pmSearch = 1,
+                     lastBuffFlagRead,
+                     chargingIfChanid,
+                     shapingMode = 1}).
+
+-record(spvcAutoAtd, {index,
+                      type,
+                      param1 = 0,
+                      param2 = 0,
+                      param3 = 0,
+                      param4 = 0,
+                      param5 = 0,
+                      trafficQoSClass = 0,
+                      rowStatus = 1,
+                      serviceCategory = 6,
+                      vcCapability = 1,
+                      name = [],
+                      userCounter = 0}).
+
+-record(spvcAutoAbr, {index,
+                      icr,
+                      tbe = 16277215,
+                      frtt = 0,
+                      rdf = 11,
+                      rif = 11,
+                      nrm = 4,
+                      trm = 7,
+                      cdf = 3,
+                      adtf = 50,
+                      rowStatus = 1}).
+
+-record(spvcLatestErrorCode, {key,
+                              errorCode}).
+
+-record(spvcVcDyn, {vclEntry,
+                    vclCcIdentifier,
+                    vclConnId,
+                    vclMpId,
+                    vclLeafId}).
+
+-record(spvcVpDyn, {vplEntry,
+                    vplCcIdentifier,
+                    vplConnId,
+                    vplMpId,
+                    vplLeafId}).
+
+-record(spvcObj, {spvcEntry,
+                  spvcTargetAddress,
+                  spvcTargetSelectType,
+                  spvcTargetVpi,
+                  spvcTargetVci,
+                  spvcLastReleaseCause,
+                  spvcLastReleaseDiagnostic,
+                  spvcRetryInterval = 1000,
+                  spvcRetryTimer = 0,
+                  spvcRetryThreshold = 1,
+                  spvcRetryFailures = 0,
+                  spvcRetryLimit = 15,
+                  spvcRowStatus,
+                  spvcUserName,
+                  spvcProviderName,
+                  currentState,
+                  spvcTargetDlci,
+                  spvcTargetType,
+                  spvcApplication,
+                  spvcFrKey,
+                  spvcVccTranslationMode = 2,
+                  spvcRerCap = false,
+                  spvcRerStatus = false}).
+
+-record(spvcTargetVc, {entry,
+                       userName = [],
+                       providerName = [],
+                       opState,
+                       rowStatus}).
+
+-record(spvcTargetVp, {entry,
+                       userName = [],
+                       providerName = [],
+                       opState,
+                       rowStatus}).
+
+-record(spvcReestablishTimer, {time,
+                               timer_id,
+                               module,
+                               function,
+                               args}).
+
+-record(spvcRerVp, {entry,
+                    rerCap,
+                    rerData}).
+
+-record(spvcRerVc, {entry,
+                    rerCap,
+                    rerData}).
+
+-record(spvcHcEtStat, {key,
+                       counter = 0}).
+
+-record(spvcSaEtStat, {key,
+                       counter = 0}).
+
+-file("./spvcOrig.erl", 210).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/spvcDefines.hrl", 1).
+
+-hrl_id('41/190 55-CNA 121 64 Ux').
+
+-hrl_vsn('/main/R6A/R7A/R7D/R8B/3').
+
+-hrl_date('2003-02-21').
+
+-hrl_author(etxhebl).
+
+-file("./spvcOrig.erl", 211).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/spvcFr.hrl", 1).
+
+-hrl_id('48/190 55-CNA 121 64 Ux').
+
+-hrl_vsn('/main/R7A/R7D/2').
+
+-hrl_date('2001-12-06').
+
+-hrl_author(etxhtb).
+
+-record(spvcFr, {spvcFrEntry,
+                 spvcFrAtmEntry,
+                 spvcFrTargetAddress,
+                 spvcFrTargetSelectType,
+                 spvcFrTargetIdentifier,
+                 spvcFrTargetVpi,
+                 spvcFrTargetVci,
+                 spvcFrAtmTranslation,
+                 spvcFrLastReleaseCause,
+                 spvcFrLastReleaseDiagnostic,
+                 spvcFrAdminStatus,
+                 spvcFrRetryInterval = 1000,
+                 spvcFrRetryTimer = 0,
+                 spvcFrRetryThreshold = 1,
+                 spvcFrRetryFailures = 0,
+                 spvcFrRetryLimit = 15,
+                 spvcFrRowStatus,
+                 spvcFrUserName,
+                 spvcFrProviderName,
+                 currentState}).
+
+-record(spvcFrPerm, {spvcFrEntry,
+                     spvcFrAtmEntry,
+                     spvcFrAtmTranslation,
+                     spvcFrAdminStatus,
+                     spvcFrConnect}).
+
+-record(spvcFrAddress, {addressEntry,
+                        addressRowStatus}).
+
+-record(spvcFrAddressToIf, {address,
+                            if_index}).
+
+-record(fr_end_point, {ifIndex,
+                       dlci}).
+
+-record(fr_atm_translation, {routedIp = off,
+                             routedOsi = off,
+                             otherRouted = off,
+                             arpTranslation = off}).
+
+-record(link_layer_core_parameters, {outgoing_max_ifs,
+                                     incoming_max_ifs}).
+
+-record(priority_and_service_class, {outgoing_transfer_priority,
+                                     incoming_transfer_priority,
+                                     outgoing_discard_priority,
+                                     incoming_discard_priority}).
+
+-file("./spvcOrig.erl", 212).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../derived_hrl/mib/AXD301-PCH-MIB.hrl", 1).
+
+-file("./spvcOrig.erl", 213).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../derived_hrl/mib/AXD301-SPVC-MIB.hrl", 1).
+
+-file("./spvcOrig.erl", 214).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../derived_hrl/mib/AXD301-FRSPVC-MIB.hrl", 1).
+
+-file("./spvcOrig.erl", 215).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/sysDefines.hrl", 1).
+
+-hrl_id('3/190 55-CNA 121 70').
+
+-hrl_vsn('/main/Inc3/Inc4/Inc5/R3B/R4A/R5B/R6A/R7A/R8B/2').
+
+-hrl_date('2002-06-07').
+
+-hrl_author(etxjotj).
+
+-file("./spvcOrig.erl", 216).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/hciMsg.hrl", 1).
+
+-hrl_id('4/190 55-CNA 121 159 Ux').
+
+-hrl_vsn('/main/R7A/R8B/10').
+
+-hrl_date('2003-02-21').
+
+-hrl_author(etxmexa).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/hciComp.hrl", 1).
+
+-hrl_id('3/190 55-CNA 121 159 Ux').
+
+-hrl_vsn('/main/R7A/1').
+
+-hrl_date('00-03-22').
+
+-hrl_author(etxmexa).
+
+-record(hci_comp_info, {required_FC = 0,
+                        desired_FC = 0}).
+
+-record(hci_comp_res, {not_supported_required_FCs,
+                       not_supported_desired_FCs,
+                       all_supported_FCs}).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/hciMsg.hrl", 14).
+
+-record(hci_add_party, {hci_cpn,
+                        hci_aal,
+                        hci_bhli,
+                        hci_blli,
+                        hci_blli_bici,
+                        hci_bsco,
+                        hci_epr,
+                        hci_e2etd,
+                        hci_noti,
+                        hci_cpsa,
+                        hci_clpn,
+                        hci_clpsa,
+                        hci_cpn_soft,
+                        hci_clpn_soft,
+                        hci_geidt_list = [],
+                        hci_dtl_bin_list = [],
+                        hci_pa_list = [],
+                        hci_gat_list = [],
+                        hci_data,
+                        hci_prot_comp}).
+
+-record(hci_add_party_ack, {hci_epr,
+                            hci_aal,
+                            hci_blli,
+                            hci_blli_bici,
+                            hci_e2etd,
+                            hci_noti,
+                            hci_cpn_soft,
+                            hci_cnosa,
+                            hci_cno,
+                            hci_geidt_list = [],
+                            hci_pa_list = [],
+                            hci_gat_list = [],
+                            hci_data,
+                            hci_prot_comp}).
+
+-record(hci_add_party_rej, {hci_cause,
+                            hci_epr,
+                            hci_geidt_list = [],
+                            hci_cb,
+                            hci_pa_list = [],
+                            hci_internal_rel_info,
+                            hci_gat_list = [],
+                            hci_data,
+                            hci_prot_comp}).
+
+-record(hci_alerting, {hci_mci,
+                       hci_unrps,
+                       hci_cdpi,
+                       hci_epr,
+                       hci_prog_list = [],
+                       hci_nbc,
+                       hci_nbhlc,
+                       hci_noti,
+                       hci_geidt_list = [],
+                       hci_pa_list = [],
+                       hci_gat_list = [],
+                       hci_ssie,
+                       hci_data,
+                       hci_prot_comp}).
+
+-record(hci_b_resources, {hci_rem_dataB,
+                          hci_vpiB,
+                          hci_vciB,
+                          hci_data,
+                          hci_prot_comp}).
+
+-record(hci_connect, {hci_mci,
+                      hci_unrps,
+                      hci_aal,
+                      hci_blli,
+                      hci_blli_bici,
+                      hci_epr,
+                      hci_atd,
+                      hci_e2etd,
+                      hci_noti,
+                      hci_abrs,
+                      hci_abra,
+                      hci_nbc,
+                      hci_nbhlc,
+                      hci_nbllc,
+                      hci_prog_list = [],
+                      hci_geidt_list = [],
+                      hci_eqos,
+                      hci_cpn_soft,
+                      hci_cnosa,
+                      hci_cno,
+                      hci_pa_list = [],
+                      hci_gat_list = [],
+                      hci_rem_dataB,
+                      hci_con_dir = both,
+                      hci_ssie,
+                      hci_rer_services,
+                      hci_rer,
+                      hci_opt_traf,
+                      hci_data,
+                      hci_prot_comp}).
+
+-record(hci_drop_party, {hci_cause,
+                         hci_epr,
+                         hci_noti,
+                         hci_geidt_list = [],
+                         hci_pa_list = [],
+                         hci_internal_rel_info,
+                         hci_gat_list = [],
+                         hci_data,
+                         hci_prot_comp}).
+
+-record(hci_local_connect, {hci_rem_data,
+                            hci_con_dir,
+                            hci_data,
+                            hci_prot_comp}).
+
+-record(hci_local_connected, {hci_rem_data,
+                              hci_con_dir,
+                              hci_data,
+                              hci_prot_comp}).
+
+-record(hci_local_disconnect, {hci_discon_dir,
+                               hci_data,
+                               hci_prot_comp}).
+
+-record(hci_local_disconnected, {hci_data,
+                                 hci_prot_comp}).
+
+-record(hci_notify, {hci_epr,
+                     hci_noti,
+                     hci_pa_list = [],
+                     hci_gat_list = [],
+                     hci_data,
+                     hci_prot_comp}).
+
+-record(hci_party_alerting, {hci_epr,
+                             hci_noti,
+                             hci_geidt_list = [],
+                             hci_pa_list = [],
+                             hci_gat_list = [],
+                             hci_data,
+                             hci_prot_comp}).
+
+-record(hci_progress, {hci_mci,
+                       hci_unrps,
+                       hci_cdpi,
+                       hci_prog_list = [],
+                       hci_nbc,
+                       hci_nbhlc,
+                       hci_noti,
+                       hci_pa_list = [],
+                       hci_gat_list = [],
+                       hci_data,
+                       hci_prot_comp}).
+
+-record(hci_release, {hci_mci,
+                      hci_unrps,
+                      hci_cause_list = [],
+                      hci_noti,
+                      hci_prog_list = [],
+                      hci_geidt_list = [],
+                      hci_cb,
+                      hci_pa_list = [],
+                      hci_internal_rel_info,
+                      hci_gat_list = [],
+                      hci_ssie,
+                      hci_rer_cause,
+                      hci_data,
+                      hci_prot_comp,
+                      hci_internal_dbg_cc,
+                      hci_internal_dbg_l3}).
+
+-record(hci_setup, {hci_mci,
+                    hci_unrps,
+                    hci_atd,
+                    hci_bbc,
+                    hci_qos,
+                    hci_cpn,
+                    hci_aal,
+                    hci_bhli,
+                    hci_blli_brep,
+                    hci_blli_bici,
+                    hci_bsco,
+                    hci_epr,
+                    hci_lpt,
+                    hci_e2etd,
+                    hci_noti,
+                    hci_abrs,
+                    hci_abra,
+                    hci_prog_list = [],
+                    hci_eqos,
+                    hci_cpsa_list = [],
+                    hci_clpn,
+                    hci_bici_clpn,
+                    hci_clpsa_list = [],
+                    hci_cgpc,
+                    hci_nbc_brep,
+                    hci_nbhlc_list = [],
+                    hci_nbllc_brep,
+                    hci_conss,
+                    hci_geidt_list = [],
+                    hci_cpn_soft,
+                    hci_clpn_soft,
+                    hci_dtl_bin_list = [],
+                    hci_pa_list = [],
+                    hci_ncci,
+                    hci_routing_address,
+                    hci_protocol_internal_info,
+                    hci_gat_list = [],
+                    hci_con_dir = both,
+                    hci_ssie,
+                    hci_rer_services,
+                    hci_rer,
+                    hci_opt_traf,
+                    hci_data_setup,
+                    hci_prot_comp}).
+
+-record(hci_setup_ack, {hci_assign,
+                        hci_rem_dataB,
+                        hci_con_dir = both,
+                        hci_vpiB,
+                        hci_vciB,
+                        hci_data,
+                        hci_prot_comp}).
+
+-record(hci_status, {hci_state,
+                     hci_data,
+                     hci_prot_comp}).
+
+-record(hci_status_enq, {hci_state,
+                         hci_data,
+                         hci_prot_comp}).
+
+-record(hci_remote_data, {hci_prot_type,
+                          hci_data,
+                          hci_dummy1,
+                          hci_dummy2}).
+
+-record(hci_unrec, {hci_mci,
+                    hci_head,
+                    hci_binary,
+                    hci_data,
+                    hci_prot_comp}).
+
+-record(hci_atd, {hci_pci,
+                  hci_apci,
+                  hci_fwd_pcr_clp_0,
+                  hci_bwd_pcr_clp_0,
+                  hci_fwd_pcr_clp_0_1,
+                  hci_bwd_pcr_clp_0_1,
+                  hci_fwd_scr_clp_0,
+                  hci_bwd_scr_clp_0,
+                  hci_fwd_scr_clp_0_1,
+                  hci_bwd_scr_clp_0_1,
+                  hci_fwd_mbs_clp_0,
+                  hci_bwd_mbs_clp_0,
+                  hci_fwd_mbs_clp_0_1,
+                  hci_bwd_mbs_clp_0_1,
+                  hci_best_effort_ind = 0,
+                  hci_fwd_frame_discard = 0,
+                  hci_bwd_frame_discard = 0,
+                  hci_tagging_bwd = 0,
+                  hci_tagging_fwd = 0,
+                  hci_fwd_abr_mcr,
+                  hci_bwd_abr_mcr,
+                  hci_binary}).
+
+-record(hci_bbc, {hci_pci,
+                  hci_bearer_class,
+                  hci_atm_transfer_capability,
+                  hci_user_plane_connection_configuration,
+                  hci_susceptibility_to_clipping,
+                  hci_binary}).
+
+-record(hci_cause, {hci_pci,
+                    hci_location,
+                    hci_cause_value,
+                    hci_diagnostics_list = [],
+                    hci_binary}).
+
+-record(hci_cpn, {hci_pci,
+                  hci_type_of_number,
+                  hci_intern_netw_numb_indic,
+                  hci_numbering_plan_indicator,
+                  hci_number_digits,
+                  hci_orig_native = false}).
+
+-record(hci_clpn, {hci_pci,
+                   hci_type_of_number,
+                   hci_numbering_plan_indicator,
+                   hci_presentation_indicator,
+                   hci_screening_indicator,
+                   hci_number_digits,
+                   hci_incomplete_indicator = 0,
+                   hci_binary}).
+
+-record(hci_cno, {hci_type_of_number,
+                  hci_numbering_plan_indicator,
+                  hci_presentation_indicator,
+                  hci_screening_indicator,
+                  hci_number_digits,
+                  hci_binary}).
+
+-record(hci_cnosa, {hci_binary}).
+
+-record(hci_cpn_soft, {hci_select_type,
+                       hci_soft_vpi,
+                       hci_soft_vci,
+                       hci_soft_dlci,
+                       hci_binary}).
+
+-record(hci_clpn_soft, {hci_soft_vpi,
+                        hci_soft_vci,
+                        hci_soft_dlci,
+                        hci_binary}).
+
+-record(hci_rer_services, {hci_inter_req_hard,
+                           hci_inter_cap_hard,
+                           hci_intra_req_soft,
+                           hci_intra_req_hard,
+                           hci_intra_cap_asym,
+                           hci_intra_cap_sym,
+                           hci_intra_cap_hard,
+                           hci_binary}).
+
+-record(hci_rer, {hci_func_addr,
+                  hci_endpoint_key,
+                  hci_switchover,
+                  hci_incarnation,
+                  hci_pnni_cumul_fw_max_cell_td,
+                  hci_cumul_fw_p2p_cdv,
+                  hci_cumul_bw_p2p_cdv,
+                  hci_binary}).
+
+-record(hci_rer_cause, {hci_rer_rel_cause,
+                        hci_binary}).
+
+-record(hci_opt_traf, {hci_origin,
+                       hci_cumul_fw_aw,
+                       hci_cumul_bw_aw,
+                       hci_binary}).
+
+-record(hci_qos, {hci_pci,
+                  hci_qos_class_fwd,
+                  hci_qos_class_bwd,
+                  hci_binary}).
+
+-record(hci_aal, {hci_pci,
+                  hci_binary}).
+
+-record(hci_bhli, {hci_pci,
+                   hci_binary}).
+
+-record(hci_blli_brep, {hci_brep,
+                        hci_blli_list = []}).
+
+-record(hci_blli, {hci_binary}).
+
+-record(hci_blli_bici, {hci_repeated,
+                        hci_priority,
+                        hci_pci,
+                        hci_binary}).
+
+-record(hci_cpsa, {hci_pci,
+                   hci_binary}).
+
+-record(hci_clpsa, {hci_pci,
+                    hci_binary}).
+
+-record(hci_gat, {hci_binary}).
+
+-record(hci_epr, {hci_epr_type,
+                  hci_epr_value,
+                  hci_epr_flag,
+                  hci_binary}).
+
+-record(hci_eqos, {hci_origin,
+                   hci_acc_fwd_p2p_cdv,
+                   hci_acc_bwd_p2p_cdv,
+                   hci_cum_fwd_p2p_cdv,
+                   hci_cum_bwd_p2p_cdv,
+                   hci_acc_fwd_clr,
+                   hci_acc_bwd_clr,
+                   hci_binary}).
+
+-record(hci_brep, {hci_binary}).
+
+-record(hci_bsco, {hci_binary}).
+
+-record(hci_noti, {hci_binary}).
+
+-record(hci_abrs, {hci_fwd_abr_icr,
+                   hci_bwd_abr_icr,
+                   hci_fwd_abr_tbe,
+                   hci_bwd_abr_tbe,
+                   hci_cum_rm_fix_round_trip,
+                   hci_fwd_rif,
+                   hci_bwd_rif,
+                   hci_fwd_rdf,
+                   hci_bwd_rdf,
+                   hci_binary}).
+
+-record(hci_abra, {hci_fwd_nrm,
+                   hci_fwd_trm,
+                   hci_fwd_cdf,
+                   hci_fwd_atdf,
+                   hci_bwd_nrm,
+                   hci_bwd_trm,
+                   hci_bwd_cdf,
+                   hci_bwd_atdf,
+                   hci_binary}).
+
+-record(hci_prog, {hci_coding_std,
+                   hci_location,
+                   hci_prog_desc,
+                   hci_binary}).
+
+-record(hci_nbc_brep, {hci_brep,
+                       hci_nbc_list = []}).
+
+-record(hci_nbc, {hci_binary}).
+
+-record(hci_nbhlc, {hci_binary}).
+
+-record(hci_nbllc_brep, {hci_brep,
+                         hci_nbllc_list = []}).
+
+-record(hci_nbllc, {hci_binary}).
+
+-record(hci_geidt, {hci_binary}).
+
+-record(hci_conss, {hci_type_of_conn_scope,
+                    hci_conn_scope,
+                    hci_binary}).
+
+-record(hci_e2etd, {hci_pci,
+                    hci_cumul_td,
+                    hci_max_td,
+                    hci_pnni_cumul_td,
+                    hci_pnni_accept_fwd_max_td,
+                    hci_netw_gen}).
+
+-record(hci_cdpi, {hci_pci,
+                   hci_cdpci,
+                   hci_cdpsi,
+                   hci_binary}).
+
+-record(hci_cgpc, {hci_pci,
+                   hci_binary}).
+
+-record(hci_lpt, {hci_pci,
+                  hci_ptype}).
+
+-record(hci_cb, {hci_cb_level,
+                 hci_bl_transit_type,
+                 hci_bl_node_id,
+                 hci_bl_link_proc_node_id,
+                 hci_bl_link_port_id,
+                 hci_bl_link_succ_node_id,
+                 cause_value,
+                 hci_cb_diagnostics,
+                 hci_binary}).
+
+-record(hci_pa, {hci_ie_id,
+                 hci_coding,
+                 hci_action,
+                 hci_length,
+                 hci_binary,
+                 hci_error_type}).
+
+-record(hci_ncci, {hci_pci,
+                   hci_ni,
+                   hci_point_code,
+                   hci_call_id}).
+
+-record(hci_ssie, {hci_ssie_sas = [],
+                   hci_binary}).
+
+-record(hci_sas, {hci_sas_vsn,
+                  hci_sas_transp_ind,
+                  hci_sas_flow_ind,
+                  hci_sas_discard,
+                  hci_sas_scope,
+                  hci_sas_relative_id,
+                  hci_binary}).
+
+-record(hci_data, {hci_hcid,
+                   hci_sender_ifindex,
+                   hci_sender_hcid}).
+
+-record(hci_data_setup, {hci_hcidA,
+                         hci_pidA,
+                         hci_protA,
+                         hci_protB,
+                         hci_portB,
+                         hci_hcidB,
+                         hci_rem_dataA,
+                         hci_assign,
+                         hci_ifindexB,
+                         hci_node_id,
+                         hci_succ_node_id,
+                         hci_ifindexA,
+                         hci_vpiA,
+                         hci_vciA,
+                         hci_cpA,
+                         hci_cpB}).
+
+-record(hci_prot_comp, {hci_requiredFC = 0,
+                        hci_desiredFC = 0}).
+
+-file("./spvcOrig.erl", 217).
+
+-file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/ccCd.hrl", 1).
+
+-hrl_id('13/190 55-CNA 121 101 Ux').
+
+-hrl_vsn('/main/R6A/R7A/R8A/R8B/8').
+
+-hrl_date('2003-02-21').
+
+-hrl_author(etxmexa).
+
+-record(ccCdRR, {hcid,
+                 vpi,
+                 vci,
+                 ifindexA,
+                 call_type,
+                 spvc = false,
+                 reserve = yes,
+                 etA,
+                 destdata,
+                 leafdata,
+                 loopdata,
+                 l3,
+                 l3_loop,
+                 cc}).
+
+-record(ccCdRD, {destid,
+                 loopdata,
+                 cc}).
+
+-record(ccCdRL, {leafid,
+                 protTypeB,
+                 loopdata,
+                 l3,
+                 l3_loop,
+                 cc}).
+
+-record(ccCdDD, {hcid,
+                 hcidA,
+                 vpi,
+                 vci,
+                 ifindexB,
+                 portB,
+                 call_type,
+                 spvc = false,
+                 reserve = yes,
+                 protTypeA,
+                 etB,
+                 leafdata,
+                 loopdata,
+                 l3,
+                 l3_loop,
+                 cc}).
+
+-record(ccCdDL, {leafid,
+                 loopdata,
+                 l3,
+                 l3_loop,
+                 cc}).
+
+-record(ccRR, {protTypeA,
+               remote_dataA,
+               remote_dataB,
+               chg_counters,
+               sc,
+               chg_decision = on,
+               cc_loop}).
+
+-record(ccRL, {hcidB,
+               charging,
+               cc_loop}).
+
+-record(ccRD, {portB,
+               ifindexB,
+               cpB,
+               vpiB,
+               vciB,
+               cc_loop}).
+
+-record(ccDD, {protTypeB,
+               remote_dataA,
+               remote_dataB,
+               ifindexA,
+               cpA,
+               vpiA,
+               vciA,
+               chg_counters,
+               sc,
+               chg_decision = on,
+               cc_loop}).
+
+-record(ccDL, {cc_loop}).
+
+-record(loopRR, {vpList,
+                 nodeid,
+                 succ_nodeid,
+                 connection_type,
+                 policing,
+                 delay_contrib,
+                 charging = on,
+                 prev_routing_data}).
+
+-record(loopRD, {}).
+
+-record(loopRL, {msg_rec,
+                 providerName,
+                 userName,
+                 partyId,
+                 serviceIfA,
+                 serviceIdA,
+                 serviceIfB,
+                 serviceIdB,
+                 estAw,
+                 dtlLevels}).
+
+-record(loopDD, {nodeid,
+                 succ_nodeid,
+                 vpList,
+                 connection_type,
+                 policing,
+                 assign,
+                 delay_contrib,
+                 charging = on}).
+
+-record(loopDL, {msg_rec,
+                 providerName,
+                 userName,
+                 partyId,
+                 serviceIfA,
+                 serviceIdA,
+                 serviceIfB,
+                 serviceIdB}).
+
+-record(ccLoopRR, {pidB,
+                   qos,
+                   atd,
+                   bbc,
+                   cscope,
+                   e2etd,
+                   eqos,
+                   con_state = none,
+                   con_order = both,
+                   mr_flag,
+                   catch_up_id,
+                   cpA}).
+
+-record(ccLoopRD, {}).
+
+-record(ccLoopRL, {route,
+                   linklist,
+                   routelist,
+                   failurelist = [],
+                   nodeidlist,
+                   cb,
+                   cpn,
+                   dtl,
+                   routing_state,
+                   assign,
+                   timer_counter = 0,
+                   timer_ref,
+                   status_enq_ind,
+                   link_CB,
+                   node_CB,
+                   pnnir_rlp,
+                   pnni_only}).
+
+-record(ccLoopDD, {pidA,
+                   con_state = none,
+                   con_order = both,
+                   mr_flag,
+                   catch_up_id,
+                   cpB}).
+
+-record(ccLoopDL, {timer_counter = 0,
+                   timer_ref,
+                   status_enq_ind}).
+
+-file("./spvcOrig.erl", 218).
+
+-file("/export/localhome/locmacr/built/lib/erlang/lib/snmp-4.1.2/include/STANDARD-MIB.hrl", 1).
+
+-file("./spvcOrig.erl", 219).
+
+error_handler({From,Tag},{M,F,Args},EXITReason) ->
+    spvcLib:do_report(sccm,M,F,Args,"",EXITReason).
+
+connect(HcId,Connect,Key) ->
+    debug_disabled,
+    Obj = spvcDataBase:db_read({spvcObj,Key}),
+    orig_state_machine(Obj#spvcObj.currentState,connect_nu,Obj,[HcId,Connect]).
+
+release_nu(HcId,Release,Key) ->
+    debug_disabled,
+    Obj = spvcDataBase:db_read({spvcObj,Key}),
+    spvcDataBase:db_delete({spvcHcIdToTp,HcId}),
+    orig_state_machine(Obj#spvcObj.currentState,release_nu,Obj,[HcId,Release]).
+
+release_comp_nu(HcId,Release_comp,Key) ->
+    debug_disabled,
+    Obj = spvcDataBase:db_read({spvcObj,Key}),
+    spvcDataBase:db_delete({spvcHcIdToTp,HcId}),
+    orig_state_machine(Obj#spvcObj.currentState,release_comp_nu,Obj,[HcId,Release_comp]).
+
+release_incumbent(HcId,Release) ->
+    debug_disabled,
+    release_incumbent2(spvcDataBase:db_read({spvcHcIdToTp,HcId}),Release).
+
+release_incumbent2(SpvcHcIdToTp,Release) ->
+    release_incumbent3(SpvcHcIdToTp#spvcHcIdToTp.tpEntry,Release).
+
+release_incumbent3({orig,If,Vpi,Vci,Leaf},Release) ->
+    release_incumbent4({If,Vpi,Vci,Leaf},Release);
+release_incumbent3({orig,If,Vpi,Leaf},Release) ->
+    release_incumbent4({If,Vpi,Leaf},Release).
+
+release_incumbent4(TpKey,Release) ->
+    Spvc = spvcDataBase:db_read({spvcObj,TpKey}),
+    active = Spvc#spvcObj.currentState,
+    orig_state_machine(active,release_incumbent,Spvc,[Release]).
+
+switch_over(HcId,{If,Vpi,Vci}) ->
+    Key = case {If,Vpi,Vci} of
+              {If_Value,Vpi_Value,Vci_Value} when integer(Vci_Value) ->
+                  {If_Value,Vpi_Value,Vci_Value,1};
+              {If_Value,Vpi_Value,_} ->
+                  {If_Value,Vpi_Value,1};
+              {If_Value,Vpi_Value} ->
+                  {If_Value,Vpi_Value,1}
+          end,
+    Spvc = spvcDataBase:db_read({spvcObj,Key}),
+    do_switch_over(HcId,Spvc);
+switch_over(HcId,{If,Vpi}) ->
+    Key = case {If,Vpi,no_vc} of
+              {If_Value,Vpi_Value,Vci_Value} when integer(Vci_Value) ->
+                  {If_Value,Vpi_Value,Vci_Value,1};
+              {If_Value,Vpi_Value,_} ->
+                  {If_Value,Vpi_Value,1};
+              {If_Value,Vpi_Value} ->
+                  {If_Value,Vpi_Value,1}
+          end,
+    Spvc = spvcDataBase:db_read({spvcObj,Key}),
+    do_switch_over(HcId,Spvc).
+
+do_switch_over(HcId,Spvc) ->
+    State = Spvc#spvcObj.currentState,
+    orig_state_machine(State,switch_over,Spvc,[HcId]).
+
+gen_set(Type,Row,Cols) ->
+    debug_disabled,
+    gen_set(Type,Row,Cols,undefined).
+
+gen_set(Type,Row,Cols,FrKey) ->
+    debug_disabled,
+    case lists:keysearch(case {case Row of
+                                   {_,_,_,_} ->
+                                       spvcVcc;
+                                   {_,_,_} ->
+                                       spvcVpc;
+                                   {_,_} ->
+                                       spvcFr;
+                                   [_,_,_,_] ->
+                                       spvcVcc;
+                                   [_,_,_] ->
+                                       spvcVpc;
+                                   [_,_] ->
+                                       spvcFr
+                               end,rowStatus} of
+                             {spvcVcc,targetAddress} ->
+                                 2;
+                             {spvcVcc,selectType} ->
+                                 3;
+                             {spvcVcc,targetVpi} ->
+                                 18;
+                             {spvcVcc,targetVci} ->
+                                 5;
+                             {spvcVcc,releaseCause} ->
+                                 6;
+                             {spvcVcc,releaseDiagnostic} ->
+                                 7;
+                             {spvcVcc,retryInterval} ->
+                                 10;
+                             {spvcVcc,retryTimer} ->
+                                 11;
+                             {spvcVcc,retryThreshold} ->
+                                 12;
+                             {spvcVcc,retryFailures} ->
+                                 13;
+                             {spvcVcc,retryLimit} ->
+                                 14;
+                             {spvcVcc,rowStatus} ->
+                                 15;
+                             {spvcVcc,restart} ->
+                                 9;
+                             {spvcVcc,targetSelectType_any} ->
+                                 2;
+                             {spvcVcc,targetSelectType_required} ->
+                                 1;
+                             {spvcVpc,targetAddress} ->
+                                 2;
+                             {spvcVpc,selectType} ->
+                                 3;
+                             {spvcVpc,targetVpi} ->
+                                 15;
+                             {spvcVpc,releaseCause} ->
+                                 5;
+                             {spvcVpc,releaseDiagnostic} ->
+                                 6;
+                             {spvcVpc,retryInterval} ->
+                                 9;
+                             {spvcVpc,retryTimer} ->
+                                 10;
+                             {spvcVpc,retryThreshold} ->
+                                 11;
+                             {spvcVpc,retryFailures} ->
+                                 12;
+                             {spvcVpc,retryLimit} ->
+                                 13;
+                             {spvcVpc,rowStatus} ->
+                                 14;
+                             {spvcVpc,restart} ->
+                                 8;
+                             {spvcVpc,targetSelectType_any} ->
+                                 2;
+                             {spvcVpc,targetSelectType_required} ->
+                                 1;
+                             {spvcFr,targetAddress} ->
+                                 3;
+                             {spvcFr,selectType} ->
+                                 5;
+                             {spvcFr,identifier} ->
+                                 6;
+                             {spvcFr,targetVpi} ->
+                                 7;
+                             {spvcFr,targetVci} ->
+                                 8;
+                             {spvcFr,translation} ->
+                                 9;
+                             {spvcFr,releaseCause} ->
+                                 10;
+                             {spvcFr,releaseDiagnostic} ->
+                                 11;
+                             {spvcFr,operStatus} ->
+                                 12;
+                             {spvcFr,adminStatus} ->
+                                 13;
+                             {spvcFr,restart} ->
+                                 14;
+                             {spvcFr,retryInterval} ->
+                                 15;
+                             {spvcFr,retryTimer} ->
+                                 16;
+                             {spvcFr,retryThreshold} ->
+                                 17;
+                             {spvcFr,retryFailures} ->
+                                 18;
+                             {spvcFr,retryLimit} ->
+                                 19;
+                             {spvcFr,lastChange} ->
+                                 20;
+                             {spvcFr,rowStatus} ->
+                                 21
+                         end,1,Cols) of
+        {value,{_,4}} ->
+            debug_disabled,
+            mnesia:dirty_update_counter(spvcHcEtStat,spvcLib:get_board(hd(Row)),1),
+            case get_link_state(case Row of
+                                    Row when record(Row,spvcObj) ->
+                                        case Row#spvcObj.spvcEntry of
+                                            {If_Value,_,_,_} ->
+                                                If_Value;
+                                            {If_Value,_,_} ->
+                                                If_Value
+                                        end;
+                                    Row when record(Row,spvcVcc) ->
+                                        {If_Value,_,_,_} = Row#spvcVcc.spvcVccEntry,
+                                        If_Value;
+                                    Row when record(Row,spvcVpc) ->
+                                        {If_Value,_,_} = Row#spvcVpc.spvcVpcEntry,
+                                        If_Value;
+                                    Row when record(Row,spvcVpcPerm) ->
+                                        {If_Value,_,_} = Row#spvcVpcPerm.spvcVpcEntry,
+                                        If_Value;
+                                    Row when record(Row,spvcVccPerm) ->
+                                        {If_Value,_,_,_} = Row#spvcVccPerm.spvcVccEntry,
+                                        If_Value;
+                                    Row when record(Row,spvcTargetVc) ->
+                                        {If_Value,_,_} = Row#spvcTargetVc.entry,
+                                        If_Value;
+                                    Row when record(Row,spvcTargetVp) ->
+                                        {If_Value,_} = Row#spvcTargetVp.entry,
+                                        If_Value;
+                                    Row when record(Row,pchVc) ->
+                                        {If_Value,_,_} = Row#pchVc.vclEntry,
+                                        If_Value;
+                                    Row when record(Row,pchVp) ->
+                                        {If_Value,_} = Row#pchVp.vplEntry,
+                                        If_Value;
+                                    Row when record(Row,spvcFr) ->
+                                        {If_Value,_} = Row#spvcFr.spvcFrEntry,
+                                        If_Value;
+                                    Row when record(Row,spvcFrPerm) ->
+                                        {If_Value,_} = Row#spvcFrPerm.spvcFrEntry,
+                                        If_Value;
+                                    {If_Value,_,_,_} ->
+                                        If_Value;
+                                    {If_Value,_,_} ->
+                                        If_Value;
+                                    {If_Value,_} ->
+                                        If_Value;
+                                    [If_Value|_] ->
+                                        If_Value;
+                                    _ ->
+                                        error
+                                end) of
+                disabled ->
+                    orig_state_machine(null,createAndGo_disabled,[],[Row,Cols,Type,FrKey]);
+                enabled ->
+                    orig_state_machine(null,createAndGo_enabled,[],[Row,Cols,Type,FrKey])
+            end;
+        {value,{_,5}} ->
+            debug_disabled,
+            mnesia:dirty_update_counter(spvcHcEtStat,spvcLib:get_board(hd(Row)),1),
+            orig_state_machine(null,createAndWait,[],[Row,Cols,Type,FrKey]);
+        {value,{_,1}} ->
+            debug_disabled,
+            case spvcDataBase:db_read({spvcObj,list_to_tuple(Row)}) of
+                [] ->
+                    ok;
+                Spvc ->
+                    case get_link_state(case Row of
+                                            Row when record(Row,spvcObj) ->
+                                                case Row#spvcObj.spvcEntry of
+                                                    {If_Value,_,_,_} ->
+                                                        If_Value;
+                                                    {If_Value,_,_} ->
+                                                        If_Value
+                                                end;
+                                            Row when record(Row,spvcVcc) ->
+                                                {If_Value,_,_,_} = Row#spvcVcc.spvcVccEntry,
+                                                If_Value;
+                                            Row when record(Row,spvcVpc) ->
+                                                {If_Value,_,_} = Row#spvcVpc.spvcVpcEntry,
+                                                If_Value;
+                                            Row when record(Row,spvcVpcPerm) ->
+                                                {If_Value,_,_} = Row#spvcVpcPerm.spvcVpcEntry,
+                                                If_Value;
+                                            Row when record(Row,spvcVccPerm) ->
+                                                {If_Value,_,_,_} = Row#spvcVccPerm.spvcVccEntry,
+                                                If_Value;
+                                            Row when record(Row,spvcTargetVc) ->
+                                                {If_Value,_,_} = Row#spvcTargetVc.entry,
+                                                If_Value;
+                                            Row when record(Row,spvcTargetVp) ->
+                                                {If_Value,_} = Row#spvcTargetVp.entry,
+                                                If_Value;
+                                            Row when record(Row,pchVc) ->
+                                                {If_Value,_,_} = Row#pchVc.vclEntry,
+                                                If_Value;
+                                            Row when record(Row,pchVp) ->
+                                                {If_Value,_} = Row#pchVp.vplEntry,
+                                                If_Value;
+                                            Row when record(Row,spvcFr) ->
+                                                {If_Value,_} = Row#spvcFr.spvcFrEntry,
+                                                If_Value;
+                                            Row when record(Row,spvcFrPerm) ->
+                                                {If_Value,_} = Row#spvcFrPerm.spvcFrEntry,
+                                                If_Value;
+                                            {If_Value,_,_,_} ->
+                                                If_Value;
+                                            {If_Value,_,_} ->
+                                                If_Value;
+                                            {If_Value,_} ->
+                                                If_Value;
+                                            [If_Value|_] ->
+                                                If_Value;
+                                            _ ->
+                                                error
+                                        end) of
+                        disabled ->
+                            orig_state_machine(Spvc#spvcObj.currentState,activate_disabled,Spvc,Cols);
+                        enabled ->
+                            orig_state_machine(Spvc#spvcObj.currentState,activate_enabled,Spvc,Cols)
+                    end
+            end;
+        {value,{_,6}} ->
+            debug_disabled,
+            case spvcDataBase:db_read({spvcObj,list_to_tuple(Row)}) of
+                [] ->
+                    ok;
+                Spvc ->
+                    mnesia:dirty_update_counter(spvcHcEtStat,spvcLib:get_board(hd(Row)),- 1),
+                    orig_state_machine(Spvc#spvcObj.currentState,destroy,Spvc,Cols)
+            end;
+        {value,{_,2}} ->
+            debug_disabled,
+            case spvcDataBase:db_read({spvcObj,list_to_tuple(Row)}) of
+                [] ->
+                    mnesia:dirty_update_counter(spvcHcEtStat,spvcLib:get_board(hd(Row)),1),
+                    ok;
+                Spvc ->
+                    orig_state_machine(Spvc#spvcObj.currentState,not_in_service,Spvc,Cols)
+            end;
+        false ->
+            debug_disabled,
+            Spvc = spvcDataBase:db_read({spvcObj,list_to_tuple(Row)}),
+            CurrentState = Spvc#spvcObj.currentState,
+            NewSpvc = set_attrs(Spvc,Cols),
+            Restart = case {case Row of
+                                {_,_,_,_} ->
+                                    spvcVcc;
+                                {_,_,_} ->
+                                    spvcVpc;
+                                {_,_} ->
+                                    spvcFr;
+                                [_,_,_,_] ->
+                                    spvcVcc;
+                                [_,_,_] ->
+                                    spvcVpc;
+                                [_,_] ->
+                                    spvcFr
+                            end,restart} of
+                          {spvcVcc,targetAddress} ->
+                              2;
+                          {spvcVcc,selectType} ->
+                              3;
+                          {spvcVcc,targetVpi} ->
+                              18;
+                          {spvcVcc,targetVci} ->
+                              5;
+                          {spvcVcc,releaseCause} ->
+                              6;
+                          {spvcVcc,releaseDiagnostic} ->
+                              7;
+                          {spvcVcc,retryInterval} ->
+                              10;
+                          {spvcVcc,retryTimer} ->
+                              11;
+                          {spvcVcc,retryThreshold} ->
+                              12;
+                          {spvcVcc,retryFailures} ->
+                              13;
+                          {spvcVcc,retryLimit} ->
+                              14;
+                          {spvcVcc,rowStatus} ->
+                              15;
+                          {spvcVcc,restart} ->
+                              9;
+                          {spvcVcc,targetSelectType_any} ->
+                              2;
+                          {spvcVcc,targetSelectType_required} ->
+                              1;
+                          {spvcVpc,targetAddress} ->
+                              2;
+                          {spvcVpc,selectType} ->
+                              3;
+                          {spvcVpc,targetVpi} ->
+                              15;
+                          {spvcVpc,releaseCause} ->
+                              5;
+                          {spvcVpc,releaseDiagnostic} ->
+                              6;
+                          {spvcVpc,retryInterval} ->
+                              9;
+                          {spvcVpc,retryTimer} ->
+                              10;
+                          {spvcVpc,retryThreshold} ->
+                              11;
+                          {spvcVpc,retryFailures} ->
+                              12;
+                          {spvcVpc,retryLimit} ->
+                              13;
+                          {spvcVpc,rowStatus} ->
+                              14;
+                          {spvcVpc,restart} ->
+                              8;
+                          {spvcVpc,targetSelectType_any} ->
+                              2;
+                          {spvcVpc,targetSelectType_required} ->
+                              1;
+                          {spvcFr,targetAddress} ->
+                              3;
+                          {spvcFr,selectType} ->
+                              5;
+                          {spvcFr,identifier} ->
+                              6;
+                          {spvcFr,targetVpi} ->
+                              7;
+                          {spvcFr,targetVci} ->
+                              8;
+                          {spvcFr,translation} ->
+                              9;
+                          {spvcFr,releaseCause} ->
+                              10;
+                          {spvcFr,releaseDiagnostic} ->
+                              11;
+                          {spvcFr,operStatus} ->
+                              12;
+                          {spvcFr,adminStatus} ->
+                              13;
+                          {spvcFr,restart} ->
+                              14;
+                          {spvcFr,retryInterval} ->
+                              15;
+                          {spvcFr,retryTimer} ->
+                              16;
+                          {spvcFr,retryThreshold} ->
+                              17;
+                          {spvcFr,retryFailures} ->
+                              18;
+                          {spvcFr,retryLimit} ->
+                              19;
+                          {spvcFr,lastChange} ->
+                              20;
+                          {spvcFr,rowStatus} ->
+                              21
+                      end,
+            case lists:keysearch(Restart,1,Cols) of
+                {value,{Restart,1}} ->
+                    orig_state_machine(CurrentState,restart,NewSpvc,Cols);
+                _ ->
+                    spvcDataBase:db_write(NewSpvc),
+                    ok
+            end
+    end,
+    {noError,0}.
+
+restart_spvc(Key) ->
+    debug_disabled,
+    Spvc = spvcDataBase:db_read({spvcObj,Key}),
+    handle_restart_spvc(Spvc#spvcObj.currentState,Spvc),
+    ok.
+
+handle_restart_spvc(rest_in_peace,Spvc) ->
+    debug_disabled,
+    rest_in_peace(restart,Spvc,undefined);
+handle_restart_spvc(_,_) ->
+    ok.
+
+restart_multi_spvcs(Key) ->
+    debug_disabled,
+    Spvc = spvcDataBase:db_read({spvcObj,Key}),
+    handle_restart_multi_spvcs(Spvc#spvcObj.currentState,Spvc),
+    ok.
+
+handle_restart_multi_spvcs(rest_in_peace,Spvc) ->
+    debug_disabled,
+    handle_restart_spvc(rest_in_peace,Spvc);
+handle_restart_multi_spvcs(active,Spvc) ->
+    debug_disabled,
+    active(restart,Spvc,undefined);
+handle_restart_multi_spvcs(outgoing_callproceeding,Spvc) ->
+    debug_disabled,
+    outgoing_callproceeding(restart,Spvc,undefined);
+handle_restart_multi_spvcs(release_at_restart,Spvc) ->
+    debug_disabled,
+    release_at_restart(restart,Spvc,undefined);
+handle_restart_multi_spvcs(wait,Spvc) ->
+    debug_disabled,
+    wait(restart,Spvc,undefined);
+handle_restart_multi_spvcs(rest_in_peace,Spvc) ->
+    debug_disabled,
+    rest_in_peace(restart,Spvc,undefined);
+handle_restart_multi_spvcs(_,_) ->
+    ok.
+
+orig_state_machine(null,createAndGo_enabled,Spvc,Attrs) ->
+    null(createAndGo_enabled,Spvc,Attrs);
+orig_state_machine(null,createAndGo_disabled,Spvc,Attrs) ->
+    null(createAndGo_disabled,Spvc,Attrs);
+orig_state_machine(null,createAndWait,Spvc,Attrs) ->
+    null(createAndWait,Spvc,Attrs);
+orig_state_machine(created,activate_disabled,Spvc,Attrs) ->
+    created(activate_disabled,Spvc,Attrs);
+orig_state_machine(created,activate_enabled,Spvc,Attrs) ->
+    created(activate_enabled,Spvc,Attrs);
+orig_state_machine(created,destroy,Spvc,Attrs) ->
+    created(destroy,Spvc,Attrs);
+orig_state_machine(outgoing_callproceeding,connect_nu,Spvc,Attrs) ->
+    outgoing_callproceeding(connect_nu,Spvc,Attrs);
+orig_state_machine(outgoing_callproceeding,destroy,Spvc,Attrs) ->
+    outgoing_callproceeding(destroy,Spvc,Attrs);
+orig_state_machine(outgoing_callproceeding,restart,Spvc,Attrs) ->
+    outgoing_callproceeding(restart,Spvc,Attrs);
+orig_state_machine(outgoing_callproceeding,release_nu,Spvc,Attrs) ->
+    case get_link_state_intf(case Spvc of
+                                 Spvc when record(Spvc,spvcObj) ->
+                                     case Spvc#spvcObj.spvcEntry of
+                                         {If_Value,_,_,_} ->
+                                             If_Value;
+                                         {If_Value,_,_} ->
+                                             If_Value
+                                     end;
+                                 Spvc when record(Spvc,spvcVcc) ->
+                                     {If_Value,_,_,_} = Spvc#spvcVcc.spvcVccEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcVpc) ->
+                                     {If_Value,_,_} = Spvc#spvcVpc.spvcVpcEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcVpcPerm) ->
+                                     {If_Value,_,_} = Spvc#spvcVpcPerm.spvcVpcEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcVccPerm) ->
+                                     {If_Value,_,_,_} = Spvc#spvcVccPerm.spvcVccEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcTargetVc) ->
+                                     {If_Value,_,_} = Spvc#spvcTargetVc.entry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcTargetVp) ->
+                                     {If_Value,_} = Spvc#spvcTargetVp.entry,
+                                     If_Value;
+                                 Spvc when record(Spvc,pchVc) ->
+                                     {If_Value,_,_} = Spvc#pchVc.vclEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,pchVp) ->
+                                     {If_Value,_} = Spvc#pchVp.vplEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcFr) ->
+                                     {If_Value,_} = Spvc#spvcFr.spvcFrEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcFrPerm) ->
+                                     {If_Value,_} = Spvc#spvcFrPerm.spvcFrEntry,
+                                     If_Value;
+                                 {If_Value,_,_,_} ->
+                                     If_Value;
+                                 {If_Value,_,_} ->
+                                     If_Value;
+                                 {If_Value,_} ->
+                                     If_Value;
+                                 [If_Value|_] ->
+                                     If_Value;
+                                 _ ->
+                                     error
+                             end,release_nu) of
+        disabled ->
+            outgoing_callproceeding(release_nu_disabled,Spvc,Attrs);
+        enabled ->
+            outgoing_callproceeding(release_nu_enabled,Spvc,Attrs)
+    end;
+orig_state_machine(outgoing_callproceeding,release_comp_nu,Spvc,Attrs) ->
+    case get_link_state_intf(tuple_to_list(Spvc#spvcObj.spvcEntry),release_comp_nu) of
+        disabled ->
+            outgoing_callproceeding(release_comp_nu_disabled,Spvc,Attrs);
+        enabled ->
+            outgoing_callproceeding(release_comp_nu_enabled,Spvc,Attrs)
+    end;
+orig_state_machine(outgoing_callproceeding,not_in_service,Spvc,Attrs) ->
+    outgoing_callproceeding(not_in_service,Spvc,Attrs);
+orig_state_machine(outgoing_callproceeding,activate_enabled,Spvc,Attrs) ->
+    ok;
+orig_state_machine(outgoing_callproceeding,activate_disabled,Spvc,Attrs) ->
+    ok;
+orig_state_machine(active,destroy,Spvc,Attrs) ->
+    active(destroy,Spvc,Attrs);
+orig_state_machine(active,restart,Spvc,Attrs) ->
+    active(restart,Spvc,Attrs);
+orig_state_machine(active,release_nu,Spvc,Attrs) ->
+    case cnhChi:get_link_opstate(case Spvc of
+                                     Spvc when record(Spvc,spvcObj) ->
+                                         case Spvc#spvcObj.spvcEntry of
+                                             {If_Value,_,_,_} ->
+                                                 If_Value;
+                                             {If_Value,_,_} ->
+                                                 If_Value
+                                         end;
+                                     Spvc when record(Spvc,spvcVcc) ->
+                                         {If_Value,_,_,_} = Spvc#spvcVcc.spvcVccEntry,
+                                         If_Value;
+                                     Spvc when record(Spvc,spvcVpc) ->
+                                         {If_Value,_,_} = Spvc#spvcVpc.spvcVpcEntry,
+                                         If_Value;
+                                     Spvc when record(Spvc,spvcVpcPerm) ->
+                                         {If_Value,_,_} = Spvc#spvcVpcPerm.spvcVpcEntry,
+                                         If_Value;
+                                     Spvc when record(Spvc,spvcVccPerm) ->
+                                         {If_Value,_,_,_} = Spvc#spvcVccPerm.spvcVccEntry,
+                                         If_Value;
+                                     Spvc when record(Spvc,spvcTargetVc) ->
+                                         {If_Value,_,_} = Spvc#spvcTargetVc.entry,
+                                         If_Value;
+                                     Spvc when record(Spvc,spvcTargetVp) ->
+                                         {If_Value,_} = Spvc#spvcTargetVp.entry,
+                                         If_Value;
+                                     Spvc when record(Spvc,pchVc) ->
+                                         {If_Value,_,_} = Spvc#pchVc.vclEntry,
+                                         If_Value;
+                                     Spvc when record(Spvc,pchVp) ->
+                                         {If_Value,_} = Spvc#pchVp.vplEntry,
+                                         If_Value;
+                                     Spvc when record(Spvc,spvcFr) ->
+                                         {If_Value,_} = Spvc#spvcFr.spvcFrEntry,
+                                         If_Value;
+                                     Spvc when record(Spvc,spvcFrPerm) ->
+                                         {If_Value,_} = Spvc#spvcFrPerm.spvcFrEntry,
+                                         If_Value;
+                                     {If_Value,_,_,_} ->
+                                         If_Value;
+                                     {If_Value,_,_} ->
+                                         If_Value;
+                                     {If_Value,_} ->
+                                         If_Value;
+                                     [If_Value|_] ->
+                                         If_Value;
+                                     _ ->
+                                         error
+                                 end) of
+        disabled ->
+            active(release_nu_disabled,Spvc,Attrs);
+        enabled ->
+            active(release_nu_enabled,Spvc,Attrs)
+    end;
+orig_state_machine(active,release_comp_nu,Spvc,Attrs) ->
+    release_at_restart(release_comp_nu,Spvc,Attrs);
+orig_state_machine(active,not_in_service,Spvc,Attrs) ->
+    active(not_in_service,Spvc,Attrs);
+orig_state_machine(active,activate_enabled,Spvc,Attrs) ->
+    ok;
+orig_state_machine(active,activate_disabled,Spvc,Attrs) ->
+    ok;
+orig_state_machine(active,release_incumbent,Spvc,Attrs) ->
+    active(release_incumbent,Spvc,Attrs);
+orig_state_machine(wait,destroy,Spvc,Attrs) ->
+    wait(destroy,Spvc,Attrs);
+orig_state_machine(wait,timeout,Spvc,Attrs) ->
+    wait(timeout,Spvc,Attrs);
+orig_state_machine(wait,restart,Spvc,Attrs) ->
+    wait(restart,Spvc,Attrs);
+orig_state_machine(wait,release_nu,Spvc,Attrs) ->
+    ok;
+orig_state_machine(wait,not_in_service,Spvc,Attrs) ->
+    wait(not_in_service,Spvc,Attrs);
+orig_state_machine(wait,activate_enabled,Spvc,Attrs) ->
+    wait(timeout,Spvc,Attrs);
+orig_state_machine(wait,activate_disabled,Spvc,Attrs) ->
+    ok;
+orig_state_machine(release_at_restart,release_comp_nu,Spvc,Attrs) ->
+    release_at_restart(release_comp_nu,Spvc,Attrs);
+orig_state_machine(release_at_restart,release_nu,Spvc,Attrs) ->
+    release_at_restart(release_nu,Spvc,Attrs);
+orig_state_machine(release_at_restart,connect_nu,Spvc,Attrs) ->
+    release_at_restart(connect_nu,Spvc,Attrs);
+orig_state_machine(release_at_restart,destroy,Spvc,Attrs) ->
+    release_at_restart(destroy,Spvc,Attrs);
+orig_state_machine(release_at_restart,not_in_service,Spvc,Attrs) ->
+    release_at_restart(not_in_service,Spvc,Attrs);
+orig_state_machine(release_at_restart,activate_enabled,Spvc,Attrs) ->
+    ok;
+orig_state_machine(release_at_restart,activate_disabled,Spvc,Attrs) ->
+    ok;
+orig_state_machine(release_request,release_comp_nu,Spvc,Attrs) ->
+    release_request(release_comp_nu,Spvc,Attrs);
+orig_state_machine(release_request,release_nu,Spvc,Attrs) ->
+    release_request(release_nu,Spvc,Attrs);
+orig_state_machine(release_request,destroy,Spvc,Attrs) ->
+    release_request(destroy,Spvc,Attrs);
+orig_state_machine(release_request,not_in_service,Spvc,Attrs) ->
+    release_request(not_in_service,Spvc,Attrs);
+orig_state_machine(release_request,activate_enabled,Spvc,Attrs) ->
+    ok;
+orig_state_machine(release_request,activate_disabled,Spvc,Attrs) ->
+    ok;
+orig_state_machine(rest_in_peace,restart,Spvc,Attrs) ->
+    rest_in_peace(restart,Spvc,Attrs);
+orig_state_machine(rest_in_peace,destroy,Spvc,Attrs) ->
+    rest_in_peace(destroy,Spvc,Attrs);
+orig_state_machine(rest_in_peace,not_in_service,Spvc,Attrs) ->
+    rest_in_peace(not_in_service,Spvc,Attrs);
+orig_state_machine(rest_in_peace,connect_nu,Spvc,Attrs) ->
+    rest_in_peace(connect_nu,Spvc,Attrs);
+orig_state_machine(rest_in_peace,activate_enabled,Spvc,Attrs) ->
+    rest_in_peace(restart,Spvc,Attrs);
+orig_state_machine(rest_in_peace,activate_disabled,Spvc,Attrs) ->
+    ok;
+orig_state_machine(rest_in_peace,release_nu,Spvc,Attrs) ->
+    ok;
+orig_state_machine(rest_in_peace,release_comp_nu,Spvc,Attrs) ->
+    ok;
+orig_state_machine(not_in_service,activate_enabled,Spvc,Attrs) ->
+    not_in_service(activate_enabled,Spvc,Attrs);
+orig_state_machine(not_in_service,activate_disabled,Spvc,Attrs) ->
+    not_in_service(activate_disabled,Spvc,Attrs);
+orig_state_machine(not_in_service,destroy,Spvc,Attrs) ->
+    not_in_service(destroy,Spvc,Attrs);
+orig_state_machine(not_in_service,connect_nu,Spvc,Attrs) ->
+    not_in_service(connect_nu,Spvc,Attrs);
+orig_state_machine(not_in_service,_,Spvc,Attrs) ->
+    ok;
+orig_state_machine(awaiting_switch_over,switch_over,Spvc,[HcId]) ->
+    awaiting_switch_over(switch_over,Spvc,[HcId]);
+orig_state_machine(awaiting_switch_over,activate_disabled,Spvc,Attrs) ->
+    awaiting_switch_over(activate_disabled,Spvc,Attrs);
+orig_state_machine(awaiting_switch_over,destroy,Spvc,Attrs) ->
+    awaiting_switch_over(destroy,Spvc,Attrs);
+orig_state_machine(awaiting_switch_over,restart,Spvc,Attrs) ->
+    awaiting_switch_over(restart,Spvc,Attrs);
+orig_state_machine(awaiting_switch_over,_,Spvc,Attrs) ->
+    ok;
+orig_state_machine(undefined,destroy,Spvc,Attrs) ->
+    rest_in_peace(destroy,Spvc,Attrs).
+
+null(createAndGo_enabled,[],[Row,Cols,Type,FrKey]) ->
+    debug_disabled,
+    Key = list_to_tuple(Row),
+    Spvc = #spvcObj{spvcEntry = Key,
+                    spvcApplication = Type,
+                    spvcRowStatus = 1,
+                    spvcFrKey = FrKey},
+    Spvc1 = set_attrs(Spvc,Cols),
+    {Spvc2,HcId,Setup} = new_state_outgoing_call_proceeding(Spvc1),
+    pchTpUpdate(case Key of
+                    {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                        {IfIndex_Value,Vpi_Value,Vci_Value};
+                    {IfIndex_Value,Vpi_Value,_} ->
+                        {IfIndex_Value,Vpi_Value};
+                    [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                        [IfIndex_Value,Vpi_Value,Vci_Value];
+                    [IfIndex_Value,Vpi_Value,_] ->
+                        [IfIndex_Value,Vpi_Value]
+                end),
+    spvcDataBase:db_write(Spvc2),
+    setup(HcId,Setup,Spvc2);
+null(createAndGo_disabled,[],[Row,Cols,Type,FrKey]) ->
+    debug_disabled,
+    case get_link_state_intf(Row,null_createAndGo_disabled) of
+        disabled ->
+            Key = list_to_tuple(Row),
+            Spvc = #spvcObj{spvcEntry = Key,
+                            spvcRowStatus = 1,
+                            currentState = rest_in_peace,
+                            spvcApplication = Type,
+                            spvcFrKey = FrKey},
+            Spvc1 = set_attrs(Spvc,Cols),
+            pchTpUpdate(case Key of
+                            {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                                {IfIndex_Value,Vpi_Value,Vci_Value};
+                            {IfIndex_Value,Vpi_Value,_} ->
+                                {IfIndex_Value,Vpi_Value};
+                            [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                                [IfIndex_Value,Vpi_Value,Vci_Value];
+                            [IfIndex_Value,Vpi_Value,_] ->
+                                [IfIndex_Value,Vpi_Value]
+                        end),
+            set_call_failure_data_and_send_spvcFailingAlarm(Key),
+            spvcDataBase:db_write(Spvc1);
+        enabled ->
+            null(createAndGo_enabled,[],[Row,Cols,Type,FrKey])
+    end;
+null(createAndWait,[],[Row,Cols,Type,FrKey]) ->
+    debug_disabled,
+    Key = list_to_tuple(Row),
+    Spvc = #spvcObj{spvcEntry = Key,
+                    spvcApplication = Type,
+                    spvcFrKey = FrKey},
+    Spvc1 = new_state_created(Spvc,Cols),
+    pchTpUpdate(case Key of
+                    {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                        {IfIndex_Value,Vpi_Value,Vci_Value};
+                    {IfIndex_Value,Vpi_Value,_} ->
+                        {IfIndex_Value,Vpi_Value};
+                    [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                        [IfIndex_Value,Vpi_Value,Vci_Value];
+                    [IfIndex_Value,Vpi_Value,_] ->
+                        [IfIndex_Value,Vpi_Value]
+                end),
+    spvcDataBase:db_write(Spvc1).
+
+pchTpUpdate({If,Vpi,Vci}) ->
+    spvcDataBase:db_write(#spvcVcDyn{vclEntry = {If,Vpi,Vci},
+                                     vclCcIdentifier = 0});
+pchTpUpdate({If,Vpi}) ->
+    spvcDataBase:db_write(#spvcVpDyn{vplEntry = {If,Vpi},
+                                     vplCcIdentifier = 0}).
+
+created(activate_enabled,Spvc,Attrs) ->
+    debug_disabled,
+    Spvc1 = set_attrs(Spvc,Attrs),
+    Spvc2 = Spvc1#spvcObj{spvcRowStatus = 1},
+    {Spvc3,HcId,HciMsg} = new_state_outgoing_call_proceeding(Spvc1),
+    spvcDataBase:db_write(Spvc3),
+    setup(HcId,HciMsg,Spvc3);
+created(activate_disabled,Spvc,Attrs) ->
+    debug_disabled,
+    Spvc1 = set_attrs(Spvc,Attrs),
+    Spvc2 = Spvc1#spvcObj{currentState = rest_in_peace,
+                          spvcRowStatus = 1},
+    update_state(Spvc,4),
+    spvcDataBase:db_write(Spvc2);
+created(destroy,Spvc,Attrs) ->
+    debug_disabled,
+    clear(Spvc).
+
+outgoing_callproceeding(connect_nu,Spvc,[HcId,Connect]) ->
+    debug_disabled,
+    Spvc1 = new_state_active(Spvc),
+    case Spvc#spvcObj.spvcTargetSelectType of
+        2 ->
+            Cpn = Connect#hci_connect.hci_cpn_soft,
+            TargetVpi = Cpn#hci_cpn_soft.hci_soft_vpi,
+            TargetVci = Cpn#hci_cpn_soft.hci_soft_vci,
+            TargetDlci = Cpn#hci_cpn_soft.hci_soft_dlci,
+            Spvc2 = Spvc1#spvcObj{spvcTargetSelectType = 1,
+                                  spvcTargetVpi = TargetVpi,
+                                  spvcTargetVci = TargetVci,
+                                  spvcTargetDlci = TargetDlci},
+            spvcDataBase:db_write(Spvc2);
+        1 ->
+            spvcDataBase:db_write(ets,Spvc1);
+        2 ->
+            Cpn = Connect#hci_connect.hci_cpn_soft,
+            TargetVpi = Cpn#hci_cpn_soft.hci_soft_vpi,
+            TargetDlci = Cpn#hci_cpn_soft.hci_soft_dlci,
+            Spvc2 = Spvc1#spvcObj{spvcTargetSelectType = 1,
+                                  spvcTargetVpi = TargetVpi,
+                                  spvcTargetDlci = TargetDlci},
+            spvcDataBase:db_write(Spvc2);
+        1 ->
+            spvcDataBase:db_write(ets,Spvc1)
+    end,
+    Key = Spvc#spvcObj.spvcEntry,
+    PchKey = case Key of
+                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                     {IfIndex_Value,Vpi_Value,Vci_Value};
+                 {IfIndex_Value,Vpi_Value,_} ->
+                     {IfIndex_Value,Vpi_Value};
+                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                     [IfIndex_Value,Vpi_Value,Vci_Value];
+                 [IfIndex_Value,Vpi_Value,_] ->
+                     [IfIndex_Value,Vpi_Value]
+             end,
+    SpvcDyn = case PchKey of
+                  {_,_,_} ->
+                      case spvcDataBase:db_read({spvcVcDyn,PchKey}) of
+                          [] ->
+                              #spvcVcDyn{vclEntry = PchKey,
+                                         vclCcIdentifier = 0,
+                                         vclConnId = HcId};
+                          SpvcVcDyn ->
+                              SpvcVcDyn#spvcVcDyn{vclEntry = PchKey,
+                                                  vclConnId = HcId}
+                      end;
+                  {_,_} ->
+                      case spvcDataBase:db_read({spvcVpDyn,PchKey}) of
+                          [] ->
+                              #spvcVpDyn{vplEntry = PchKey,
+                                         vplCcIdentifier = 0,
+                                         vplConnId = HcId};
+                          SpvcVpDyn ->
+                              SpvcVpDyn#spvcVpDyn{vplEntry = PchKey,
+                                                  vplConnId = HcId}
+                      end
+              end,
+    spvcDataBase:db_write(SpvcDyn),
+    CbCValue = get(no_of_rerouting),
+    CbC = case CbCValue of
+              undefined ->
+                  debug_disabled,
+                  0;
+              _ ->
+                  CbCValue
+          end,
+    SpvcDyn2 = case Key of
+                   {_,_,_,_} ->
+                       case spvcDataBase:db_read({spvcVccDyn,Key}) of
+                           [] ->
+                               #spvcVccDyn{spvcVccEntry = Key,
+                                           crankBackCounter = CbC};
+                           SpvcVccDyn ->
+                               SpvcVccDyn#spvcVccDyn{spvcVccEntry = Key,
+                                                     crankBackCounter = CbC}
+                       end;
+                   {_,_,_} ->
+                       case spvcDataBase:db_read({spvcVpcDyn,Key}) of
+                           [] ->
+                               #spvcVpcDyn{spvcVpcEntry = Key,
+                                           crankBackCounter = CbC};
+                           SpvcVpcDyn ->
+                               SpvcVpcDyn#spvcVpcDyn{spvcVpcEntry = Key,
+                                                     crankBackCounter = CbC}
+                       end
+               end,
+    spvcDataBase:db_write(SpvcDyn2),
+    NewPch = spvcDataBase:db_read({pch,PchKey}),
+    spvcLib:clear_spvcStillTryingAlarm(Key),
+    case Spvc#spvcObj.spvcFrKey of
+        undefined ->
+            spvcLib:ilmi_change(PchKey,1),
+            ok;
+        FrEndPoint ->
+            SpvcFrObj = spvcDataBase:db_read({spvcFrPerm,FrEndPoint}),
+            NewSpvcFrObj = SpvcFrObj#spvcFrPerm{spvcFrConnect = 3},
+            spvcDataBase:db_write(NewSpvcFrObj),
+            spvcLib:ilmi_change(PchKey,1),
+            set_fr_atm_iw_admin_state(FrEndPoint,up,Spvc)
+    end;
+outgoing_callproceeding(restart,Spvc,_) ->
+    Key = Spvc#spvcObj.spvcEntry,
+    debug_disabled,
+    Spvc1 = new_state_release_at_restart(Spvc),
+    spvcDataBase:db_write(ets,Spvc1),
+    spvcLib:clear_spvcStillTryingAlarm(Key);
+outgoing_callproceeding(release_nu_enabled,Spvc,[HcId,HciMsg]) ->
+    debug_disabled,
+    Spvc1 = new_state_rest_in_peace_or_wait(Spvc,[HcId,HciMsg]),
+    [CcCause|_] = HciMsg#hci_release.hci_cause_list,
+    Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = CcCause#hci_cause.hci_cause_value,
+                          spvcLastReleaseDiagnostic = CcCause#hci_cause.hci_diagnostics_list},
+    spvcDataBase:db_write(ets,Spvc2);
+outgoing_callproceeding(release_nu_disabled,Spvc,[HcId,Release]) ->
+    debug_disabled,
+    Spvc1 = new_state_rest_in_peace(Spvc),
+    [CcCause|_] = Release#hci_release.hci_cause_list,
+    Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = CcCause#hci_cause.hci_cause_value,
+                          spvcLastReleaseDiagnostic = CcCause#hci_cause.hci_diagnostics_list},
+    spvcDataBase:db_write(ets,Spvc2),
+    spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry);
+outgoing_callproceeding(release_comp_nu_enabled,Spvc,[HcId,Release_complete]) ->
+    debug_disabled,
+    Spvc1 = new_state_rest_in_peace_or_wait(Spvc,[HcId,Release_complete]),
+    spvcDataBase:db_write(ets,Spvc1);
+outgoing_callproceeding(release_comp_nu_disabled,Spvc,[HcId,Release_complete]) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    Spvc1 = new_state_rest_in_peace(Spvc),
+    spvcDataBase:db_write(ets,Spvc1),
+    spvcLib:clear_spvcStillTryingAlarm(Key);
+outgoing_callproceeding(destroy,Spvc,_) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    Spvc1 = new_state_release_request(Spvc),
+    spvcDataBase:db_write(ets,Spvc1),
+    SpvcTpToHcId = read_spvcTpToHcId(Key),
+    Release = spvcEncode:encode_cc_release(31),
+    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc1),
+    spvcLib:clear_spvcStillTryingAlarm(Key);
+outgoing_callproceeding(not_in_service,Spvc,_) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    Spvc1 = new_state_not_in_service(Spvc),
+    spvcDataBase:db_write(Spvc1),
+    SpvcTpToHcId = read_spvcTpToHcId(Key),
+    Release = spvcEncode:encode_cc_release(31),
+    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc1),
+    spvcLib:clear_spvcStillTryingAlarm(Key).
+
+active(restart,Spvc,_) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    Spvc1 = new_state_release_at_restart(Spvc),
+    spvcDataBase:db_write(ets,Spvc1),
+    PchKey = case Key of
+                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                     {IfIndex_Value,Vpi_Value,Vci_Value};
+                 {IfIndex_Value,Vpi_Value,_} ->
+                     {IfIndex_Value,Vpi_Value};
+                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                     [IfIndex_Value,Vpi_Value,Vci_Value];
+                 [IfIndex_Value,Vpi_Value,_] ->
+                     [IfIndex_Value,Vpi_Value]
+             end,
+    spvcLib:ilmi_change(PchKey,2),
+    case Spvc#spvcObj.spvcFrKey of
+        undefined ->
+            ok;
+        FrEndPoint ->
+            set_fr_atm_iw_admin_state(FrEndPoint,down,Spvc)
+    end;
+active(release_nu_enabled,Spvc,[HcId,Release]) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    Spvc1 = new_state_rest_in_peace_or_wait(Spvc,[HcId,Release]),
+    [CcCause|_] = Release#hci_release.hci_cause_list,
+    Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = CcCause#hci_cause.hci_cause_value,
+                          spvcLastReleaseDiagnostic = CcCause#hci_cause.hci_diagnostics_list},
+    spvcDataBase:db_write(ets,Spvc2),
+    PchKey = case Key of
+                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                     {IfIndex_Value,Vpi_Value,Vci_Value};
+                 {IfIndex_Value,Vpi_Value,_} ->
+                     {IfIndex_Value,Vpi_Value};
+                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                     [IfIndex_Value,Vpi_Value,Vci_Value];
+                 [IfIndex_Value,Vpi_Value,_] ->
+                     [IfIndex_Value,Vpi_Value]
+             end,
+    spvcLib:ilmi_change(PchKey,2),
+    case Spvc#spvcObj.spvcFrKey of
+        undefined ->
+            ok;
+        FrEndPoint ->
+            set_fr_atm_iw_admin_state(FrEndPoint,down,Spvc)
+    end;
+active(release_nu_disabled,Spvc,[HcId,Release]) ->
+    debug_disabled,
+    case get_link_state_intf(case Spvc of
+                                 Spvc when record(Spvc,spvcObj) ->
+                                     case Spvc#spvcObj.spvcEntry of
+                                         {If_Value,_,_,_} ->
+                                             If_Value;
+                                         {If_Value,_,_} ->
+                                             If_Value
+                                     end;
+                                 Spvc when record(Spvc,spvcVcc) ->
+                                     {If_Value,_,_,_} = Spvc#spvcVcc.spvcVccEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcVpc) ->
+                                     {If_Value,_,_} = Spvc#spvcVpc.spvcVpcEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcVpcPerm) ->
+                                     {If_Value,_,_} = Spvc#spvcVpcPerm.spvcVpcEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcVccPerm) ->
+                                     {If_Value,_,_,_} = Spvc#spvcVccPerm.spvcVccEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcTargetVc) ->
+                                     {If_Value,_,_} = Spvc#spvcTargetVc.entry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcTargetVp) ->
+                                     {If_Value,_} = Spvc#spvcTargetVp.entry,
+                                     If_Value;
+                                 Spvc when record(Spvc,pchVc) ->
+                                     {If_Value,_,_} = Spvc#pchVc.vclEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,pchVp) ->
+                                     {If_Value,_} = Spvc#pchVp.vplEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcFr) ->
+                                     {If_Value,_} = Spvc#spvcFr.spvcFrEntry,
+                                     If_Value;
+                                 Spvc when record(Spvc,spvcFrPerm) ->
+                                     {If_Value,_} = Spvc#spvcFrPerm.spvcFrEntry,
+                                     If_Value;
+                                 {If_Value,_,_,_} ->
+                                     If_Value;
+                                 {If_Value,_,_} ->
+                                     If_Value;
+                                 {If_Value,_} ->
+                                     If_Value;
+                                 [If_Value|_] ->
+                                     If_Value;
+                                 _ ->
+                                     error
+                             end,active_release_nu_disabled) of
+        disabled ->
+            debug_disabled,
+            Key = Spvc#spvcObj.spvcEntry,
+            Spvc1 = Spvc#spvcObj{currentState = rest_in_peace},
+            [CcCause|_] = Release#hci_release.hci_cause_list,
+            Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = CcCause#hci_cause.hci_cause_value,
+                                  spvcLastReleaseDiagnostic = CcCause#hci_cause.hci_diagnostics_list},
+            PchKey = case Key of
+                         {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                             {IfIndex_Value,Vpi_Value,Vci_Value};
+                         {IfIndex_Value,Vpi_Value,_} ->
+                             {IfIndex_Value,Vpi_Value};
+                         [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                             [IfIndex_Value,Vpi_Value,Vci_Value];
+                         [IfIndex_Value,Vpi_Value,_] ->
+                             [IfIndex_Value,Vpi_Value]
+                     end,
+            spvcLib:ilmi_change(PchKey,2),
+            update_state(Spvc,4),
+            spvcDataBase:db_write(ets,Spvc2),
+            case Spvc#spvcObj.spvcFrKey of
+                undefined ->
+                    ok;
+                FrEndPoint ->
+                    set_fr_atm_iw_admin_state(FrEndPoint,down,Spvc)
+            end;
+        enabled ->
+            active(release_nu_enabled,Spvc,[HcId,Release])
+    end;
+active(destroy,Spvc,_) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    Spvc1 = new_state_release_request(Spvc),
+    spvcDataBase:db_write(ets,Spvc1),
+    PchKey = case Key of
+                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                     {IfIndex_Value,Vpi_Value,Vci_Value};
+                 {IfIndex_Value,Vpi_Value,_} ->
+                     {IfIndex_Value,Vpi_Value};
+                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                     [IfIndex_Value,Vpi_Value,Vci_Value];
+                 [IfIndex_Value,Vpi_Value,_] ->
+                     [IfIndex_Value,Vpi_Value]
+             end,
+    spvcLib:ilmi_change(PchKey,2),
+    SpvcTpToHcId = read_spvcTpToHcId(Key),
+    Release = spvcEncode:encode_cc_release(31),
+    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc);
+active(not_in_service,Spvc,_) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    Spvc1 = new_state_not_in_service(Spvc),
+    spvcDataBase:db_write(Spvc1),
+    PchKey = case Key of
+                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                     {IfIndex_Value,Vpi_Value,Vci_Value};
+                 {IfIndex_Value,Vpi_Value,_} ->
+                     {IfIndex_Value,Vpi_Value};
+                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                     [IfIndex_Value,Vpi_Value,Vci_Value];
+                 [IfIndex_Value,Vpi_Value,_] ->
+                     [IfIndex_Value,Vpi_Value]
+             end,
+    spvcLib:ilmi_change(PchKey,2),
+    SpvcTpToHcId = read_spvcTpToHcId(Key),
+    Release = spvcEncode:encode_cc_release(31),
+    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc1),
+    case Spvc#spvcObj.spvcFrKey of
+        undefined ->
+            ok;
+        FrEndPoint ->
+            set_fr_atm_iw_admin_state(FrEndPoint,down,Spvc)
+    end;
+active(release_incumbent,Spvc,[Release]) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    Spvc1 = new_state_awaiting_switch_over(Spvc),
+    spvcDataBase:db_write(Spvc1),
+    SpvcTpToHcId = read_spvcTpToHcId(Key),
+    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc1).
+
+read_spvcTpToHcId({If,Vpi,Vci,Leaf}) ->
+    spvcDataBase:db_read({spvcTpToHcId,{orig,If,Vpi,Vci,Leaf}});
+read_spvcTpToHcId({If,Vpi,Leaf}) ->
+    spvcDataBase:db_read({spvcTpToHcId,{orig,If,Vpi,Leaf}}).
+
+release_request(release_nu,Spvc,[HcId,Release]) ->
+    debug_disabled,
+    clear(Spvc);
+release_request(release_comp_nu,Spvc,[HcId,Release_comp]) ->
+    debug_disabled,
+    clear(Spvc);
+release_request(destroy,Spvc,_) ->
+    debug_disabled,
+    case Spvc#spvcObj.spvcEntry of
+        {If,Vpi,Vci,Leaf} ->
+            case spvcDataBase:db_read({spvcTpToHcId,{orig,If,Vpi,Vci,Leaf}}) of
+                SpvcTpToHcId ->
+                    Release = spvcEncode:encode_cc_release(31),
+                    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc),
+                    clear(Spvc);
+                _ ->
+                    ok
+            end;
+        {If,Vpi,Leaf} ->
+            case spvcDataBase:db_read({spvcTpToHcId,{orig,If,Vpi,Leaf}}) of
+                SpvcTpToHcId ->
+                    Release = spvcEncode:encode_cc_release(31),
+                    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc),
+                    clear(Spvc);
+                _ ->
+                    ok
+            end
+    end,
+    ok;
+release_request(not_in_service,Spvc,_) ->
+    debug_disabled,
+    ok.
+
+release_at_restart(release_nu,Spvc,[HcId,Release]) ->
+    debug_disabled,
+    {Spvc1,NewHcId,Setup} = new_state_outgoing_call_proceeding(Spvc),
+    [CcCause|_] = Release#hci_release.hci_cause_list,
+    Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = CcCause#hci_cause.hci_cause_value,
+                          spvcLastReleaseDiagnostic = CcCause#hci_cause.hci_diagnostics_list},
+    spvcDataBase:db_write(ets,Spvc2),
+    timer:sleep(500),
+    setup(NewHcId,Setup,Spvc2);
+release_at_restart(release_comp_nu,Spvc,[HcId,Release_complete]) ->
+    debug_disabled,
+    {Spvc1,NewHcId,Setup} = new_state_outgoing_call_proceeding(Spvc),
+    Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = 31,
+                          spvcLastReleaseDiagnostic = []},
+    spvcDataBase:db_write(ets,Spvc2),
+    timer:sleep(500),
+    setup(NewHcId,Setup,Spvc1);
+release_at_restart(connect_nu,Spvc,_) ->
+    debug_disabled,
+    ok;
+release_at_restart(destroy,Spvc,_) ->
+    debug_disabled,
+    Spvc1 = new_state_release_request(Spvc),
+    spvcDataBase:db_write(ets,Spvc1);
+release_at_restart(restart,Spvc,_) ->
+    debug_disabled,
+    Spvc1 = new_state_release_at_restart(Spvc);
+release_at_restart(not_in_service,Spvc,_) ->
+    debug_disabled,
+    Spvc1 = new_state_not_in_service(Spvc),
+    spvcDataBase:db_write(Spvc1).
+
+wait(timeout,Spvc,_) ->
+    debug_disabled,
+    {Spvc1,HcId,Setup} = new_state_outgoing_call_proceeding(Spvc),
+    spvcDataBase:db_write(ets,Spvc1),
+    setup(HcId,Setup,Spvc1);
+wait(destroy,Spvc,_) ->
+    debug_disabled,
+    spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
+    clear(Spvc);
+wait(restart,Spvc,_) ->
+    debug_disabled,
+    {Spvc1,HcId,Setup} = new_state_outgoing_call_proceeding(Spvc#spvcObj{spvcRetryFailures = 0}),
+    spvcDataBase:db_write(ets,Spvc1),
+    spvcReestablishTimer:cancel(Spvc#spvcObj.spvcEntry),
+    spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
+    setup(HcId,Setup,Spvc1);
+wait(not_in_service,Spvc,_) ->
+    debug_disabled,
+    Spvc1 = new_state_not_in_service(Spvc),
+    spvcDataBase:db_write(Spvc1),
+    spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry).
+
+rest_in_peace(restart,Spvc,_) ->
+    debug_disabled,
+    {Spvc1,HcId,Setup} = new_state_outgoing_call_proceeding(Spvc#spvcObj{spvcRetryFailures = 0}),
+    spvcDataBase:db_write(ets,Spvc1),
+    setup(HcId,Setup,Spvc1),
+    sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcLib,clear_spvcFailingAlarm,[spvcLib:get_membership(node())]);
+rest_in_peace(destroy,Spvc,_) ->
+    debug_disabled,
+    sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcLib,clear_spvcFailingAlarm,[spvcLib:get_membership(node())]),
+    clear(Spvc);
+rest_in_peace(connect_nu,Spvc,_) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    SpvcTpToHcId = read_spvcTpToHcId(Key),
+    Release = spvcEncode:encode_cc_release(31),
+    spvcManager:release_un(b_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc);
+rest_in_peace(not_in_service,Spvc,_) ->
+    debug_disabled,
+    Spvc1 = new_state_not_in_service(Spvc),
+    spvcDataBase:db_write(Spvc1),
+    sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcLib,clear_spvcFailingAlarm,[spvcLib:get_membership(node())]).
+
+not_in_service(activate_enabled,Spvc,_) ->
+    debug_disabled,
+    {Spvc1,HcId,Setup} = new_state_outgoing_call_proceeding(Spvc#spvcObj{spvcRetryFailures = 0}),
+    spvcDataBase:db_write(Spvc1#spvcObj{spvcRowStatus = 1}),
+    setup(HcId,Setup,Spvc1);
+not_in_service(activate_disabled,Spvc,_) ->
+    debug_disabled,
+    Spvc1 = new_state_rest_in_peace(Spvc),
+    spvcDataBase:db_write(Spvc1#spvcObj{spvcRowStatus = 1});
+not_in_service(connect_nu,Spvc,_) ->
+    debug_disabled,
+    Spvc1 = new_state_rest_in_peace(Spvc),
+    spvcDataBase:db_write(Spvc1#spvcObj{spvcRowStatus = 1}),
+    Key = Spvc#spvcObj.spvcEntry,
+    SpvcTpToHcId = read_spvcTpToHcId(Key),
+    Release = spvcEncode:encode_cc_release(31),
+    spvcManager:release_un(b_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc1);
+not_in_service(destroy,Spvc,_) ->
+    debug_disabled,
+    clear(Spvc).
+
+awaiting_switch_over(switch_over,Spvc,[HcId]) ->
+    debug_disabled,
+    Spvc1 = Spvc#spvcObj{currentState = active},
+    Index = Spvc#spvcObj.spvcEntry,
+    TpIndex = create_tp_index(Index),
+    spvcDataBase:db_write(Spvc1),
+    ets:insert(spvcTpToHcId,#spvcTpToHcId{tpEntry = TpIndex,
+                             hcId = HcId}),
+    ets:insert(spvcHcIdToTp,#spvcHcIdToTp{tpEntry = TpIndex,
+                             hcId = HcId}),
+    update_dyn_table_hcid(Index,HcId),
+    ok;
+awaiting_switch_over(activate_disabled,Spvc,Attrs) ->
+    Spvc1 = new_state_rest_in_peace(Spvc),
+    spvcDataBase:db_write(Spvc1),
+    ok;
+awaiting_switch_over(restart,Spvc,Attrs) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    Spvc1 = new_state_release_at_restart(Spvc),
+    spvcDataBase:db_write(ets,Spvc1),
+    PchKey = case Key of
+                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                     {IfIndex_Value,Vpi_Value,Vci_Value};
+                 {IfIndex_Value,Vpi_Value,_} ->
+                     {IfIndex_Value,Vpi_Value};
+                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                     [IfIndex_Value,Vpi_Value,Vci_Value];
+                 [IfIndex_Value,Vpi_Value,_] ->
+                     [IfIndex_Value,Vpi_Value]
+             end,
+    spvcLib:ilmi_change(PchKey,2),
+    case Spvc#spvcObj.spvcFrKey of
+        undefined ->
+            ok;
+        FrEndPoint ->
+            set_fr_atm_iw_admin_state(FrEndPoint,down,Spvc)
+    end;
+awaiting_switch_over(destroy,Spvc,Attrs) ->
+    clear(Spvc).
+
+create_tp_index({If,Vpi,Vci,Leaf}) ->
+    list_to_tuple([orig,If,Vpi,Vci,Leaf]);
+create_tp_index({If,Vpi,Leaf}) ->
+    list_to_tuple([orig,If,Vpi,Leaf]).
+
+update_dyn_table_hcid({If,Vpi,Vci,Leaf},HcId) ->
+    [VcDyn] = ets:lookup(spvcVcDyn,{If,Vpi,Vci}),
+    ets:insert(spvcVcDyn,VcDyn#spvcVcDyn{vclConnId = HcId});
+update_dyn_table_hcid({If,Vpi,Leaf},HcId) ->
+    [VpDyn] = ets:lookup(spvcVpDyn,{If,Vpi}),
+    ets:insert(spvcVpDyn,VpDyn#spvcVpDyn{vplConnId = HcId}).
+
+new_state_outgoing_call_proceeding(Spvc) ->
+    debug_disabled,
+    Spvc1 = Spvc#spvcObj{spvcRowStatus = 1,
+                         currentState = outgoing_callproceeding},
+    Key = Spvc1#spvcObj.spvcEntry,
+    update_state(Spvc,outgoing_callproceeding),
+    PchKey = case Key of
+                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                     {IfIndex_Value,Vpi_Value,Vci_Value};
+                 {IfIndex_Value,Vpi_Value,_} ->
+                     {IfIndex_Value,Vpi_Value};
+                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                     [IfIndex_Value,Vpi_Value,Vci_Value];
+                 [IfIndex_Value,Vpi_Value,_] ->
+                     [IfIndex_Value,Vpi_Value]
+             end,
+    {FwdAtdIndex,BwdAtdIndex} = case PchKey of
+                                    {_,_,_} ->
+                                        Vc = spvcDataBase:db_read({pchVc,PchKey}),
+                                        {Vc#pchVc.vclReceiveTrafficDescrIndex,Vc#pchVc.vclTransmitTrafficDescrIndex};
+                                    {_,_} ->
+                                        Vp = spvcDataBase:db_read({pchVp,PchKey}),
+                                        {Vp#pchVp.vplReceiveTrafficDescrIndex,Vp#pchVp.vplTransmitTrafficDescrIndex}
+                                end,
+    FwdPchAtd = spvcDataBase:db_read({pchAtd,FwdAtdIndex}),
+    BwdPchAtd = spvcDataBase:db_read({pchAtd,BwdAtdIndex}),
+    Row = tuple_to_list(Key),
+    HcId = spvcLib:create_hcid(Row,case Row of
+                                   Row when record(Row,spvcObj) ->
+                                       case Row#spvcObj.spvcEntry of
+                                           {If_Value,_,_,_} ->
+                                               If_Value;
+                                           {If_Value,_,_} ->
+                                               If_Value
+                                       end;
+                                   Row when record(Row,spvcVcc) ->
+                                       {If_Value,_,_,_} = Row#spvcVcc.spvcVccEntry,
+                                       If_Value;
+                                   Row when record(Row,spvcVpc) ->
+                                       {If_Value,_,_} = Row#spvcVpc.spvcVpcEntry,
+                                       If_Value;
+                                   Row when record(Row,spvcVpcPerm) ->
+                                       {If_Value,_,_} = Row#spvcVpcPerm.spvcVpcEntry,
+                                       If_Value;
+                                   Row when record(Row,spvcVccPerm) ->
+                                       {If_Value,_,_,_} = Row#spvcVccPerm.spvcVccEntry,
+                                       If_Value;
+                                   Row when record(Row,spvcTargetVc) ->
+                                       {If_Value,_,_} = Row#spvcTargetVc.entry,
+                                       If_Value;
+                                   Row when record(Row,spvcTargetVp) ->
+                                       {If_Value,_} = Row#spvcTargetVp.entry,
+                                       If_Value;
+                                   Row when record(Row,pchVc) ->
+                                       {If_Value,_,_} = Row#pchVc.vclEntry,
+                                       If_Value;
+                                   Row when record(Row,pchVp) ->
+                                       {If_Value,_} = Row#pchVp.vplEntry,
+                                       If_Value;
+                                   Row when record(Row,spvcFr) ->
+                                       {If_Value,_} = Row#spvcFr.spvcFrEntry,
+                                       If_Value;
+                                   Row when record(Row,spvcFrPerm) ->
+                                       {If_Value,_} = Row#spvcFrPerm.spvcFrEntry,
+                                       If_Value;
+                                   {If_Value,_,_,_} ->
+                                       If_Value;
+                                   {If_Value,_,_} ->
+                                       If_Value;
+                                   {If_Value,_} ->
+                                       If_Value;
+                                   [If_Value|_] ->
+                                       If_Value;
+                                   _ ->
+                                       error
+                               end),
+    Setup = spvcEncode:encode_cc_setup(Row,Spvc1,FwdPchAtd,BwdPchAtd),
+    debug_disabled,
+    debug_disabled,
+    debug_disabled,
+    {Spvc1,HcId,Setup}.
+
+new_state_release_request(Spvc) ->
+    debug_disabled,
+    update_state(Spvc,release_request),
+    Spvc#spvcObj{currentState = release_request}.
+
+new_state_release_at_restart(Spvc) ->
+    debug_disabled,
+    Spvc1 = Spvc#spvcObj{spvcRetryFailures = 0,
+                         currentState = release_at_restart},
+    update_state(Spvc,release_at_restart),
+    HcId = spvcEncode:encode_cc_hcid(Spvc1#spvcObj.spvcEntry),
+    Release = spvcEncode:encode_cc_release(31),
+    spvcManager:release_un(a_side,HcId,Release,Spvc1),
+    Spvc1.
+
+new_state_rest_in_peace_or_wait(Spvc,[HcId,HciMsg]) ->
+    debug_disabled,
+    Spvc1 = Spvc#spvcObj{spvcRetryFailures = Spvc#spvcObj.spvcRetryFailures + 1},
+    case check_limits(Spvc1) of
+        {ok,ok,no_retries} ->
+            send_spvcFailingAlarm(Spvc#spvcObj.spvcEntry),
+            update_state(Spvc,4),
+            spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
+            Spvc1#spvcObj{currentState = rest_in_peace};
+        {ok,ok,_} ->
+            Spvc2 = Spvc1#spvcObj{spvcRetryTimer = time(),
+                                  currentState = wait},
+            update_state(Spvc,wait),
+            start_timer(wait,Spvc2),
+            Spvc2;
+        {retry_threshold,ok,no_retries} ->
+            Spvc2 = Spvc1#spvcObj{currentState = rest_in_peace},
+            update_state(Spvc,4),
+            send_call_failure(Spvc),
+            send_spvcFailingAlarm(Spvc#spvcObj.spvcEntry),
+            spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
+            Spvc2;
+        {retry_threshold,ok,_} ->
+            Spvc2 = Spvc1#spvcObj{spvcRetryTimer = time(),
+                                  currentState = wait},
+            update_state(Spvc,wait),
+            send_call_failure(Spvc2),
+            start_timer(wait,Spvc2),
+            Spvc2;
+        {ok,retry_limit,_} ->
+            send_spvcFailingAlarm(Spvc#spvcObj.spvcEntry),
+            update_state(Spvc,4),
+            spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
+            Spvc1#spvcObj{currentState = rest_in_peace};
+        {retry_threshold,retry_limit,_} ->
+            Spvc2 = Spvc1#spvcObj{currentState = rest_in_peace},
+            update_state(Spvc,4),
+            send_call_failure(Spvc2),
+            send_spvcFailingAlarm(Spvc#spvcObj.spvcEntry),
+            spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
+            Spvc2
+    end.
+
+send_call_failure(Spvc) ->
+    case Spvc#spvcObj.spvcRetryThreshold of
+        0 ->
+            ok;
+        _ ->
+            sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcOrig,call_failure,[Spvc])
+    end.
+
+new_state_rest_in_peace(Spvc) ->
+    debug_disabled,
+    update_state(Spvc,4),
+    Spvc1 = Spvc#spvcObj{spvcRetryFailures = Spvc#spvcObj.spvcRetryFailures + 1},
+    send_spvcFailingAlarm(Spvc#spvcObj.spvcEntry),
+    case check_limits(Spvc1) of
+        {ok,_,_} ->
+            Spvc1#spvcObj{currentState = rest_in_peace};
+        {retry_threshold,_,_} ->
+            Spvc2 = Spvc1#spvcObj{currentState = rest_in_peace},
+            case Spvc2#spvcObj.spvcRetryThreshold of
+                0 ->
+                    ok;
+                _ ->
+                    sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcOrig,call_failure,[Spvc2])
+            end,
+            Spvc2
+    end.
+
+new_state_active(Spvc) ->
+    debug_disabled,
+    update_state(Spvc,3),
+    Spvc#spvcObj{spvcRetryFailures = 0,
+                 currentState = active}.
+
+new_state_created(Spvc,SetCols) ->
+    debug_disabled,
+    update_state(Spvc,created),
+    case spvcSNMP:is_all_values(case Spvc#spvcObj.spvcEntry of
+                                    {_,_,_,_} ->
+                                        spvcVcc;
+                                    {_,_,_} ->
+                                        spvcVpc;
+                                    {_,_} ->
+                                        spvcFr;
+                                    [_,_,_,_] ->
+                                        spvcVcc;
+                                    [_,_,_] ->
+                                        spvcVpc;
+                                    [_,_] ->
+                                        spvcFr
+                                end,SetCols) of
+        true ->
+            Spvc1 = Spvc#spvcObj{spvcRowStatus = 2,
+                                 currentState = created},
+            set_attrs(Spvc1,SetCols);
+        false ->
+            Spvc1 = Spvc#spvcObj{spvcRowStatus = 3,
+                                 currentState = created},
+            set_attrs(Spvc1,SetCols)
+    end.
+
+new_state_not_in_service(Spvc) ->
+    debug_disabled,
+    update_state(Spvc,not_in_service),
+    Spvc#spvcObj{currentState = not_in_service,
+                 spvcRowStatus = 2}.
+
+new_state_awaiting_switch_over(Spvc) ->
+    debug_disabled,
+    Spvc#spvcObj{currentState = awaiting_switch_over}.
+
+update_state(Spvc,NewState) ->
+    State = Spvc#spvcObj.currentState,
+    SpvcEntry = Spvc#spvcObj.spvcEntry,
+    debug_disabled,
+    spvcLib:update_state({State,SpvcEntry},NewState).
+
+send_spvcFailingAlarm(Key) ->
+    debug_disabled,
+    rpc:cast(spvcLib:get_cp(om_node),spvcLib,send_spvcFailingAlarm,[Key]).
+
+set_call_failure_data_and_send_spvcFailingAlarm({If,Vpi,Leaf}) ->
+    debug_disabled,
+    Spvc = spvcDataBase:db_read({spvcObj,{If,Vpi,Leaf}}),
+    if
+        Spvc == [] ->
+            ok;
+        true ->
+            spvcLib:update_state({Spvc#spvcObj.currentState,{If,Vpi,Leaf}},4)
+    end;
+set_call_failure_data_and_send_spvcFailingAlarm({If,Vpi,Vci,Leaf}) ->
+    debug_disabled,
+    Spvc = spvcDataBase:db_read({spvcObj,{If,Vpi,Vci,Leaf}}),
+    if
+        Spvc == [] ->
+            ok;
+        true ->
+            spvcLib:update_state({Spvc#spvcObj.currentState,{If,Vpi,Vci,Leaf}},4)
+    end.
+
+set_attrs(Spvc,SetCols) ->
+    case Spvc#spvcObj.spvcEntry of
+        {_,_,_,_} ->
+            set_attrs_spvcc(Spvc,SetCols);
+        {_,_,_} ->
+            set_attrs_spvpc(Spvc,SetCols)
+    end.
+
+set_attrs_spvcc(Spvc,[{2,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcTargetAddress = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{3,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcTargetSelectType = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{18,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcTargetVpi = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{4,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcTargetVpi = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{5,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcTargetVci = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{6,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcLastReleaseCause = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{7,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcLastReleaseDiagnostic = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{10,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcRetryInterval = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{11,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcRetryTimer = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{12,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcRetryThreshold = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{13,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcRetryFailures = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{14,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcRetryLimit = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{16,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcTargetDlci = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[{17,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcTargetType = Value},
+    set_attrs_spvcc(Spvc1,T);
+set_attrs_spvcc(Spvc,[_|T]) ->
+    set_attrs_spvcc(Spvc,T);
+set_attrs_spvcc(Spvc,[]) ->
+    debug_disabled,
+    Spvc.
+
+set_attrs_spvpc(Spvc,[{2,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcTargetAddress = Value},
+    set_attrs_spvpc(Spvc1,T);
+set_attrs_spvpc(Spvc,[{3,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcTargetSelectType = Value},
+    set_attrs_spvpc(Spvc1,T);
+set_attrs_spvpc(Spvc,[{15,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcTargetVpi = Value},
+    set_attrs_spvpc(Spvc1,T);
+set_attrs_spvpc(Spvc,[{4,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcTargetVpi = Value},
+    set_attrs_spvpc(Spvc1,T);
+set_attrs_spvpc(Spvc,[{5,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcLastReleaseCause = Value},
+    set_attrs_spvpc(Spvc1,T);
+set_attrs_spvpc(Spvc,[{6,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcLastReleaseDiagnostic = Value},
+    set_attrs_spvpc(Spvc1,T);
+set_attrs_spvpc(Spvc,[{9,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcRetryInterval = Value},
+    set_attrs_spvpc(Spvc1,T);
+set_attrs_spvpc(Spvc,[{10,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcRetryTimer = Value},
+    set_attrs_spvpc(Spvc1,T);
+set_attrs_spvpc(Spvc,[{11,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcRetryThreshold = Value},
+    set_attrs_spvpc(Spvc1,T);
+set_attrs_spvpc(Spvc,[{12,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcRetryFailures = Value},
+    set_attrs_spvpc(Spvc1,T);
+set_attrs_spvpc(Spvc,[{13,Value}|T]) ->
+    Spvc1 = Spvc#spvcObj{spvcRetryLimit = Value},
+    set_attrs_spvpc(Spvc1,T);
+set_attrs_spvpc(Spvc,[_|T]) ->
+    set_attrs_spvpc(Spvc,T);
+set_attrs_spvpc(Spvc,[]) ->
+    Spvc.
+
+call_failure(Spvc) ->
+    debug_disabled,
+    Key = case Spvc#spvcObj.spvcFrKey of
+              undefined ->
+                  spvcLib:update_counter(callFailures,1,spvcLib:get_membership(node())),
+                  atm_spvc;
+              _ ->
+                  spvcLib:update_counter(callFrFailures,1,spvcLib:get_membership(node())),
+                  fr_spvc
+          end,
+    Obj = spvcDataBase:db_read({spvcFailures,Key}),
+    case Obj#spvcFailures.spvcCallFailuresTrapEnable of
+        1 ->
+            EventIndObj = spvcDataBase:db_read({spvcEventIndicator,Key}),
+            case EventIndObj#spvcEventIndicator.spvcTimerInd of
+                1 ->
+                    spvcDataBase:db_write(EventIndObj#spvcEventIndicator{spvcSendEventInd = 1}),
+                    NI = Obj#spvcFailures.spvcNotificationInterval,
+                    sysTimer:apply_after(1000 * NI,spvcOrig,timeout_event,[EventIndObj]);
+                _ ->
+                    spvcManager:send_event(Key),
+                    NI = Obj#spvcFailures.spvcNotificationInterval,
+                    sysTimer:apply_after(1000 * NI,spvcManager,timeout,[Key]),
+                    spvcDataBase:db_write(EventIndObj#spvcEventIndicator{spvcTimerInd = 1,
+                                                                         spvcSendEventInd = 2})
+            end;
+        _ ->
+            ok
+    end.
+
+timeout_event(EventIndObj) ->
+    spvcDataBase:db_write(EventIndObj#spvcEventIndicator{spvcTimerInd = 2}).
+
+check_limits(Spvc) ->
+    debug_disabled,
+    T = Spvc#spvcObj.spvcRetryThreshold,
+    L = Spvc#spvcObj.spvcRetryLimit,
+    F = Spvc#spvcObj.spvcRetryFailures,
+    I = Spvc#spvcObj.spvcRetryInterval,
+    {check_threshold(F,T),check_limit(F,L),check_interval(I)}.
+
+check_threshold(Failures,Threshold) when Failures == Threshold ->
+    debug_disabled,
+    retry_threshold;
+check_threshold(Failures,Threshold) ->
+    debug_disabled,
+    ok.
+
+check_limit(Failures,0) ->
+    debug_disabled,
+    ok;
+check_limit(Failures,Limit) when Failures < Limit ->
+    debug_disabled,
+    ok;
+check_limit(Failures,Limit) ->
+    debug_disabled,
+    retry_limit.
+
+check_interval(0) ->
+    no_retries;
+check_interval(I) ->
+    I.
+
+start_timer(wait,Spvc) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    Id = spvcReestablishTimer:apply_after(backoff_delay(Key),spvcServer,cast_to_spvc,[node(),spvcOrig,timeout,[wait,Key]]).
+
+timeout(wait,Key) ->
+    debug_disabled,
+    case spvcDataBase:db_read({spvcObj,Key}) of
+        [] ->
+            debug_disabled,
+            ok;
+        Spvc ->
+            case Spvc#spvcObj.currentState of
+                wait ->
+                    IfIndex = element(1,Key),
+                    case spvcOam:is_reassign_et_in_progress(IfIndex) of
+                        true ->
+                            ok;
+                        _ ->
+                            orig_state_machine(wait,timeout,Spvc,[])
+                    end;
+                _ ->
+                    ok
+            end
+    end;
+timeout(X,Y) ->
+    debug_disabled,
+    ok.
+
+clear(Spvc) ->
+    debug_disabled,
+    Key = Spvc#spvcObj.spvcEntry,
+    PchKey = case Key of
+                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
+                     {IfIndex_Value,Vpi_Value,Vci_Value};
+                 {IfIndex_Value,Vpi_Value,_} ->
+                     {IfIndex_Value,Vpi_Value};
+                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
+                     [IfIndex_Value,Vpi_Value,Vci_Value];
+                 [IfIndex_Value,Vpi_Value,_] ->
+                     [IfIndex_Value,Vpi_Value]
+             end,
+    spvcEndPoint:free_tp_spvc(PchKey),
+    spvcDataBase:db_delete({spvcObj,Key}),
+    update_state(Spvc,clear),
+    OrigKey = list_to_tuple([orig] ++ tuple_to_list(Key)),
+    case Spvc#spvcObj.currentState of
+        created ->
+            ok;
+        _ ->
+            case spvcDataBase:db_read({spvcTpToHcId,OrigKey}) of
+                [] ->
+                    ok;
+                #spvcTpToHcId{hcId = HcId} ->
+                    spvcDataBase:db_delete({spvcHcIdToTp,HcId})
+            end,
+            ets:delete(spvcTpToHcId,OrigKey),
+            spvcReestablishTimer:cancel(Key),
+            ets:delete(spvcBackoff,Spvc#spvcObj.spvcEntry)
+    end,
+    case Spvc#spvcObj.spvcFrKey of
+        undefined ->
+            sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcEndPoint,remove_tp,[tuple_to_list(PchKey)]);
+        FrKey ->
+            spvcFr:clean_up(FrKey)
+    end,
+    case {Spvc#spvcObj.spvcRerCap,Spvc#spvcObj.spvcEntry} of
+        {false,_} ->
+            ok;
+        {true,Entry} when size(Entry) == 3 ->
+            spvcDataBase:db_delete({spvcRerVp,Entry});
+        {true,Entry} when size(Entry) == 4 ->
+            spvcDataBase:db_delete({spvcRerVc,Entry})
+    end.
+
+get_link_state(If) when integer(If) ->
+    debug_disabled,
+    cnhChi:get_link_opstate(If);
+get_link_state(Other) ->
+    debug_disabled,
+    disabled.
+
+get_link_state_intf(If,Msg) when integer(If) ->
+    debug_disabled,
+    case cnhChi:get_link_opstate(If) of
+        enabled ->
+            enabled;
+        _ ->
+            Om_Node = spvcLib:get_cp(om_node),
+            case rpc:call(Om_Node,intfI,get_link_op_state,[If]) of
+                {ok,enabled} ->
+                    enabled;
+                Result ->
+                    disabled
+            end
+    end;
+get_link_state_intf(Other,Msg) ->
+    debug_disabled,
+    disabled.
+
+setup(HcId,Setup,Spvc) ->
+    case spvcDataBase:db_read({spvcObj,Spvc#spvcObj.spvcEntry}) of
+        [] ->
+            ok;
+        Spvc1 ->
+            case Spvc#spvcObj.currentState == Spvc1#spvcObj.currentState of
+                true ->
+                    spvcLib:increase_counter(spvcSaEtStat,Spvc),
+                    case Spvc#spvcObj.spvcFrKey of
+                        undefined ->
+                            do_setup(HcId,Setup,Spvc#spvcObj.spvcRerCap);
+                        FrKey ->
+                            do_setup(HcId,Setup,FrKey)
+                    end;
+                _ ->
+                    ok
+            end
+    end.
+
+do_setup(HcId,Setup,Type) when Type == undefined; Type == false ->
+    debug_disabled,
+    ReturnData = {0,HcId},
+    L3Data = {0,[HcId,Setup]},
+    mdisp:msg(node(),{plcOperator,1,infinity},{HcId,{spvcI,ReturnData}},{ccI,l3_msg,[HcId,spvcI,L3Data]});
+do_setup(HcId,Setup,true) ->
+    debug_disabled,
+    ReturnData = {0,HcId},
+    L3Data = {0,[HcId,Setup]},
+    mdisp:msg(node(),{plcOperator,1,infinity},{HcId,{spvcRerI,ReturnData}},{ccI,l3_msg,[HcId,spvcRerI,L3Data]});
+do_setup(HcId,Setup,FrKey) ->
+    debug_disabled,
+    ReturnData = {0,HcId},
+    L3Data = {0,[HcId,Setup]},
+    mdisp:msg(node(),{plcOperator,1,infinity},{HcId,{spvcFrI,ReturnData}},{ccI,l3_msg,[HcId,spvcFrI,L3Data]}).
+
+backoff_delay(Key) ->
+    debug_disabled,
+    Obj = spvcDataBase:db_read({spvcObj,Key}),
+    Var = spvcDataBase:db_read({spvcFailures,atm_spvc}),
+    {Delay,Flag} = case Obj#spvcObj.spvcRetryFailures of
+                       0 ->
+                           {100,no_alarm};
+                       1 ->
+                           {Obj#spvcObj.spvcRetryInterval,no_alarm};
+                       _ ->
+                           Table = get_backoff_table(Key,Obj),
+                           Max_Delay = Var#spvcFailures.max_delay,
+                           case Var#spvcFailures.delay_factor * Table#spvcBackoff.delay_time of
+                               DelayValue when DelayValue < Max_Delay ->
+                                   {DelayValue,no_alarm};
+                               _ ->
+                                   Org_Retry_Interval = Obj#spvcObj.spvcRetryInterval,
+                                   if
+                                       Org_Retry_Interval < Max_Delay ->
+                                           spvcLib:send_spvcStillTryingAlarm(Key,Table#spvcBackoff.flag),
+                                           {Max_Delay,alarm};
+                                       true ->
+                                           spvcLib:send_spvcStillTryingAlarm(Key,Table#spvcBackoff.flag),
+                                           {Org_Retry_Interval,alarm}
+                                   end
+                           end
+                   end,
+    ets:insert(spvcBackoff,#spvcBackoff{key = Key,
+                            delay_time = Delay,
+                            flag = Flag}),
+    round(Delay).
+
+get_backoff_table(Index,Spvc) ->
+    case ets:lookup(spvcBackoff,Index) of
+        [Obj] ->
+            Obj;
+        _ ->
+            #spvcBackoff{key = Spvc#spvcObj.spvcEntry,
+                         delay_time = Spvc#spvcObj.spvcRetryInterval,
+                         flag = no_alarm}
+    end.
+
+set_fr_atm_iw_admin_state(FrEndPoint,up,Spvc) ->
+    ok;
+set_fr_atm_iw_admin_state(FrEndPoint,NewStatus,Spvc) ->
+    ok.
+
+forced_release(FrEndPoint) ->
+    FrPerm = spvcDataBase:db_read({spvcFr,FrEndPoint}),
+    case FrPerm of
+        [] ->
+            {error,no_fr_spvc};
+        _ ->
+            Key = FrPerm#spvcFr.spvcFrAtmEntry,
+            Spvc = spvcDataBase:db_read({spvcObj,Key}),
+            SpvcFrObj = spvcDataBase:db_read({spvcFrPerm,FrEndPoint}),
+            case SpvcFrObj#spvcFrPerm.spvcFrConnect of
+                3 ->
+                    SpvcTpToHcId = read_spvcTpToHcId(Key),
+                    Release = spvcEncode:encode_cc_release(31),
+                    spvcManager:release_un(b_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc);
+                _ ->
+                    {error,target_not_owned_by_this_connection}
+            end
+    end.
diff --git a/lib/dialyzer/test/user_SUITE_data/src/wdp.hrl b/lib/dialyzer/test/user_SUITE_data/src/wdp.hrl
new file mode 100644
index 0000000000..767e4d84c3
--- /dev/null
+++ b/lib/dialyzer/test/user_SUITE_data/src/wdp.hrl
@@ -0,0 +1,96 @@
+
+%%
+%% WAP Port Number Definitions (WDP Appendix B.)
+%%
+
+-define(WAP_PORT_WTA_CL_SEC,   2805).
+-define(WAP_PORT_WTA_CO_SEC,   2923).
+-define(WAP_PORT_PUSH_CL,      2948).
+-define(WAP_PORT_PUSH_CL_SEC,  2949).
+
+-define(WAP_PORT_CL,           9200).
+-define(WAP_PORT_CO,           9201).
+-define(WAP_PORT_CL_SEC,       9202).
+-define(WAP_PORT_CO_SEC,       9203).
+-define(WAP_PORT_VCARD,        9204).
+-define(WAP_PORT_VCAL,         9205).
+-define(WAP_PORT_VCARD_SEC,    9206).
+-define(WAP_PORT_VCAL_SEC,     9207).
+
+-define(WAP_PORT_RINGTONE,     5505).
+-define(WAP_PORT_OPER_LOGO,    5506).
+-define(WAP_PORT_CLI_LOGO,     5507).
+
+%%
+%% WDP Bearer Type Assignments (WDP Appendix C.)
+%%
+
+%%
+%% Names after the tag WAP_BEARER_ is [network]_[bearer_type]_[address_type]
+%%
+-define(WAP_BEARER_ANY_ANY_IPV4, 16#00).
+-define(WAP_BEARER_ANY_ANY_IPV6, 16#01).
+-define(WAP_BEARER_GSM_USSD_ANY, 16#02).
+-define(WAP_BEARER_GSM_SMS_GSMMSISDN, 16#03).
+-define(WAP_BEARER_ANSI136_GUTS_ANSI136MSISDN, 16#04).
+-define(WAP_BEARER_IS95CDMA_SMS_IS637MSISDN, 16#05).
+-define(WAP_BEARER_IS95CDMA_CSD_IPV4, 16#06).
+-define(WAP_BEARER_IS95CDMA_PACKETDATA_IPV4, 16#07).
+-define(WAP_BEARER_ANSI136_CSD_IPV4, 16#08).
+-define(WAP_BEARER_ANSI136_PACKETDATA_IPV4, 16#09).
+-define(WAP_BEARER_GSM_CSD_IPV4, 16#0a).
+-define(WAP_BEARER_GSM_GPRS_IPV4, 16#0b).
+-define(WAP_BEARER_GSM_USSD_IPV4, 16#0c).
+-define(WAP_BEARER_AMPS_CDPD_IPV4, 16#0d).
+-define(WAP_BEARER_PDC_CSD_IPV4, 16#0e).
+-define(WAP_BEARER_PDC_PACKETDATA_IPV4, 16#0f).
+-define(WAP_BEARER_IDEN_SMS_IDENMSISDN, 16#10).
+-define(WAP_BEARER_IDEN_CSD_IPV4, 16#11).
+-define(WAP_BEARER_IDEN_PACKETDATA_IPV4, 16#12).
+-define(WAP_BEARER_PAGINGNETWORK_FLEX_FLEXMSISDN, 16#13).
+-define(WAP_BEARER_PHS_SMS_PHSMSISDN, 16#14).
+-define(WAP_BEARER_PHS_CSD_IPV4, 16#15).
+-define(WAP_BEARER_GSM_USSD_GSMSERVICECODE, 16#16).
+-define(WAP_BEARER_TETRA_SDS_TETRAITSI, 16#17).
+-define(WAP_BEARER_TETRA_SDS_TETRAMSISDN, 16#18).
+-define(WAP_BEARER_TETRA_PACKETDATA_IPV4, 16#19).
+-define(WAP_BEARER_PAGINGNETWORK_REFLEX_REFLEXMSISDN, 16#1a).
+-define(WAP_BEARER_GSM_USSD_GSMMSISDN, 16#1b).
+-define(WAP_BEARER_MOBITEX_MPAK_MAN, 16#1c).
+-define(WAP_BEARER_ANSI136_GHOST_GSMMSISDN, 16#1d).
+
+-record(wdp_address,
+	{
+	  bearer,
+	  address,
+	  portnum
+	 }).
+
+-record(wdp_sap_info,
+	{
+	  mtu,   %% max transmission unit (bytes)
+	  mru    %% max receive unit (bytes)
+	 }).
+
+%%
+%% Source and destination address are wdp_addresses
+%%
+-record(wdp_socket_pair,
+	{
+	  source,
+	  destination
+	 }).
+
+-record(wdp_local_port,
+	{
+	  port,   %% wdp "socket"
+	  sap,    %% source address
+	  user,   %% WDP user process
+	  monitor %% monitor on WDP user
+	 }).
+
+-record(wdp_local_sap,
+	{
+	  sap,    %% source address
+	  port    %% wdp "socket"
+	 }).
diff --git a/lib/dialyzer/test/user_SUITE_data/src/wsp.hrl b/lib/dialyzer/test/user_SUITE_data/src/wsp.hrl
new file mode 100644
index 0000000000..0adcc13874
--- /dev/null
+++ b/lib/dialyzer/test/user_SUITE_data/src/wsp.hrl
@@ -0,0 +1,239 @@
+
+%% WSP Table 34. PDU Type Assignments
+%%
+
+-define(WSP_Connect,       16#01).
+-define(WSP_ConnectReply,  16#02).
+-define(WSP_Redirect,      16#03).
+-define(WSP_Reply,         16#04).
+-define(WSP_Disconnect,    16#05).
+-define(WSP_Push,          16#06).
+-define(WSP_ConfirmedPush, 16#07).
+-define(WSP_Suspend,       16#08).
+-define(WSP_Resume,        16#09).
+
+-define(WSP_Get,           16#40).
+-define(WSP_Options,       16#41).
+-define(WSP_Head,          16#42).
+-define(WSP_Delete,        16#43).
+-define(WSP_Trace,         16#44).
+
+-define(WSP_Post,          16#60).
+-define(WSP_Put,           16#61).
+
+-define(WSP_DataFragmentPDU, 16#80).
+
+%%
+%% WSP Table 37. Capability Assignments
+%%
+
+-define(WSP_CAP_CLIENT_SDU_SIZE,     16#00).
+-define(WSP_CAP_SERVER_SDU_SIZE,     16#01).
+-define(WSP_CAP_PROTOCOL_OPTIONS,    16#02).
+-define(WSP_CAP_METHOD_MOR,          16#03).
+-define(WSP_CAP_PUSH_MOR,            16#04).
+-define(WSP_CAP_EXTENDED_METHODS,    16#05).
+-define(WSP_CAP_HEADER_CODE_PAGES,   16#06).
+-define(WSP_CAP_ALIASES,             16#07).
+-define(WSP_CAP_CLIENT_MESSAGE_SIZE, 16#08).
+-define(WSP_CAP_SERVER_MESSAGE_SIZE, 16#09).
+
+-define(WSP_CODEPAGE_1, 1).
+-define(WSP_DEFAULT_CODEPAGE, ?WSP_CODEPAGE_1).
+
+-define(ANY_LANGUAGE,128).
+
+-define(WSP_10, {1,0}).
+-define(WSP_11, {1,1}).
+-define(WSP_12, {1,2}).
+-define(WSP_13, {1,3}).
+-define(WSP_14, {1,4}).
+-define(WSP_15, {1,5}).
+
+-define(WSP_COMPLIENT_VERSION, ?WSP_15).
+-define(WSP_DEFAULT_VERSION,   ?WSP_12).
+
+-define(WSP_STATUS_CONTINUE, 100).
+-define(WSP_STATUS_SWITCHING_PROTOCOLS, 101).
+-define(WSP_STATUS_OK, 200).
+-define(WSP_STATUS_CREATED, 201).
+-define(WSP_STATUS_ACCEPTED, 202).
+-define(WSP_STATUS_NON_AUTHORITATIVE_INFORMATION, 203).
+-define(WSP_STATUS_NO_CONTENT, 204).
+-define(WSP_STATUS_RESET_CONTENT, 205).
+-define(WSP_STATUS_PARTIAL_CONTENT, 206).
+-define(WSP_STATUS_MULTIPLE_CHOICES, 300).
+-define(WSP_STATUS_MOVED_PERMANENTLY, 301).
+-define(WSP_STATUS_MOVED_TEMPORARILY, 302).
+-define(WSP_STATUS_SEE_OTHER, 303).
+-define(WSP_STATUS_NOT_MODIFIED, 304).
+-define(WSP_STATUS_USE_PROXY, 305).
+-define(WSP_STATUS_RESERVED, 306).
+-define(WSP_STATUS_TEMPORARY_REDIRECT, 307).
+-define(WSP_STATUS_BAD_REQUEST, 400).
+-define(WSP_STATUS_UNAUTHORIZED, 401).
+-define(WSP_STATUS_PAYMENT_REQUIRED, 402).
+-define(WSP_STATUS_FORBIDDEN, 403).
+-define(WSP_STATUS_NOT_FOUND, 404).
+-define(WSP_STATUS_METHOD_NOT_ALLOWED, 405).
+-define(WSP_STATUS_NOT_ACCEPTABLE, 406).
+-define(WSP_STATUS_PROXY_AUTHENTICATION_REQUIRED, 407).
+-define(WSP_STATUS_REQUEST_TIMEOUT, 408).
+-define(WSP_STATUS_CONFLICT, 409).
+-define(WSP_STATUS_GONE, 410).
+-define(WSP_STATUS_LENGTH_REQUIRED, 411).
+-define(WSP_STATUS_PRECONDITION_FAILED, 412).
+-define(WSP_STATUS_REQUEST_ENTITY_TOO_LARGE, 413).
+-define(WSP_STATUS_REQUEST_URI_TOO_LARGE, 414).
+-define(WSP_STATUS_UNSUPPORTED_MEDIA_TYPE, 415).
+-define(WSP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE, 416).
+-define(WSP_STATUS_EXPECTATION_FAILED, 417).
+-define(WSP_STATUS_INTERNAL_SERVER_ERROR, 500).
+-define(WSP_STATUS_NOT_IMPLEMENTED, 501).
+-define(WSP_STATUS_BAD_GATEWAY, 502).
+-define(WSP_STATUS_SERVICE_UNAVAILABLE, 503).
+-define(WSP_STATUS_GATEWAY_TIMEOUT, 504).
+-define(WSP_STATUS_HTTP_VERSION_NOT_SUPPORTED, 505).
+
+-define(ENCODE_SHORT(X), <<1:1, (X):7>>).
+
+-define(ENCODE_LONG(X),
+	if (X) =< 16#ff   -> <<1, (X):8>>;
+	   (X) =< 16#ffff -> <<2, (X):16>>;
+	   (X) =< 16#ffffff -> <<3, (X):24>>;
+	   (X) =< 16#ffffffff -> <<4, (X):32>>;
+	   true -> encode_long1(X)
+	end).
+
+
+-record(wsp_session,
+	{
+	  id,            %% uniq session id
+	  ref,           %% address quadruple (socketpair)
+	  state=null,    %% connected, suspended
+	  version,       %% encoding version to use
+	  capabilities,  %% client capabilities
+	  headers        %% client hop-by-hop headers!!!
+	 }).
+
+-record(wsp_header,
+	{
+	  name,     %% field name
+	  value,    %% field value (binary value)
+	  params=[] %% field params [{Name,Value} | Value]
+	 }).
+
+-record(wsp_multipart_entry,
+	{
+	  content_type,  %% #wsp_header
+	  headers=[],
+	  data=(<<>>)
+	 }).
+
+-record(wsp_capabilities,
+	{
+	  aliases=[],             %% [#wdp_address]
+	  client_sdu_size=1400,
+	  extended_methods=[],    %% [{PduType, Name}]
+	  header_code_pages=[],   %% [{Page,Name}] | [Page]
+	  protocol_options=[],    %% [push,confirmed_push,resume,
+	                          %%  acknowledgement_headers]
+	  method_mor = 10,        %% 1?
+	  push_mor = 10,          %% 1?
+	  server_sdu_size=1400,
+	  client_message_size,
+	  server_message_size,
+	  unknown=[]
+	 }).
+
+%% WSP PDU records
+
+-record(wsp_connect,
+	{
+	  version,     %% protocol version, not wsp version?
+	  capabilities,
+	  headers
+	 }).
+
+-record(wsp_connect_reply,
+	{
+	  server_session_id,
+	  capabilities,
+	  headers=[]
+	}).
+
+-define(WSP_PERMANENT_REDIRECT, 16#80).
+-define(WSP_REUSE_SECURITY,     16#40).
+
+-record(wsp_redirect,
+	{
+	  flags=[],
+	  addresses=[]
+	 }).
+
+-record(wsp_disconnect,
+	{
+	  server_session_id
+	 }).
+
+-record(wsp_get,
+	{
+	  type,
+	  uri,
+	  headers=[]
+	 }).
+
+-record(wsp_post,
+	{
+	  type,
+	  uri,
+	  content_type, %% #wsp_header
+	  headers=[],
+	  data
+	 }).
+
+-record(wsp_reply,
+	{
+	  status,
+	  content_type, %% #wsp_header
+	  headers=[],
+	  data
+	}).
+
+-record(wsp_data_fragment_pdu,
+	{
+	  headers=[],
+	  data
+	 }).
+
+-record(wsp_push,
+	{
+	  type = push,
+	  content_type, %% #wsp_header
+	  headers=[],
+	  data
+	 }).
+
+-record(wsp_suspend,
+	{
+	  session_id
+	}).
+
+-record(wsp_resume,
+	{
+	  session_id,
+	  capabilities,
+	  headers
+	 }).
+
+%% NOTE: not a real pdu
+-record(wsp_acknowledgement_headers,
+	{
+	  headers=[]
+	}).
+
+-record(wsp_unknown_pdu,
+	{
+	  type,  %% integer
+	  data   %% the payload
+	 }).
diff --git a/lib/dialyzer/test/user_SUITE_data/src/wsp_pdu.erl b/lib/dialyzer/test/user_SUITE_data/src/wsp_pdu.erl
new file mode 100644
index 0000000000..e5b387478f
--- /dev/null
+++ b/lib/dialyzer/test/user_SUITE_data/src/wsp_pdu.erl
@@ -0,0 +1,5423 @@
+%%%=======================================================================
+%%% File        : wsp_pdu.erl
+%%% Author      : Tony Rogvall <[email protected]>
+%%% Description : WSP PDU
+%%% Created     : 18 Aug 2003 by <[email protected]>
+%%%=======================================================================
+%%%
+%%% There are a couple of bugs in this file. Some are detected by
+%%% Dialyzer v1.1 starting both from byte code and from source, some
+%%% other ones are detected only starting from sourse, while some
+%%% others go unnoticed (these are identified by "BUG" below). It is
+%%% expected that at least some of them are detected when the new type
+%%% analysis is integrated into Dialyzer. Some other ones, like the
+%%% one with the unused _Acc argument are harder to detect and might
+%%% require different techniques.
+%%%
+%%%=======================================================================
+
+-module(wsp_pdu).
+-export([encode/1, encode/2, decode/1, decode/2]).
+
+%% The following is just to suppress unused function warnings
+-export([decode_address/1, decode_header/2,
+	 decode_headers/1, decode_mms_version/1, decode_multipart/1,
+	 encode_headers/1, encode_mms_version/1, encode_multipart/1,
+	 encode_language/1, encode_short_integer/1,
+	 fmt_current_date/0,
+	 format_header/1, format_headers/1,
+	 parse_header/1, format/1]).
+
+-include("wsp.hrl").
+-include("wdp.hrl").
+
+-ifdef(debug).
+-define(dbg(Fmt,Args), io:format(Fmt, Args)).
+-else.
+-define(dbg(Fmt,Args), ok).
+-endif.
+
+-define(WARN(Cond, Message),
+	if (Cond) ->
+		io:format("Warning: ~s\n", [(Message)]);
+	   true ->
+		ok
+	end).
+
+
+format(Pdu) ->
+    if record(Pdu, wsp_connect) ->
+	    fmt(Pdu, record_info(fields, wsp_connect));
+       record(Pdu, wsp_connect_reply) ->
+	    fmt(Pdu, record_info(fields, wsp_connect_reply));
+       record(Pdu, wsp_redirect) ->
+	    fmt(Pdu, record_info(fields, wsp_redirect));
+       record(Pdu, wsp_disconnect) ->
+	    fmt(Pdu, record_info(fields, wsp_disconnect));
+       record(Pdu, wsp_get) ->
+	    fmt(Pdu, record_info(fields, wsp_get));
+       record(Pdu, wsp_post) ->
+	    fmt(Pdu, record_info(fields, wsp_post));
+       record(Pdu,wsp_reply) ->
+	    fmt(Pdu, record_info(fields, wsp_reply));
+       record(Pdu,wsp_data_fragment_pdu) ->
+	    fmt(Pdu, record_info(fields, wsp_data_fragment_pdu));
+       record(Pdu,wsp_push) ->
+	    fmt(Pdu, record_info(fields, wsp_push));
+       record(Pdu, wsp_suspend) ->
+	    fmt(Pdu, record_info(fields, wsp_suspend));
+       record(Pdu, wsp_resume) ->
+	    fmt(Pdu, record_info(fields, wsp_resume));
+       record(Pdu, wsp_unknown_pdu) ->
+	    fmt(Pdu, record_info(fields, wsp_unknown_pdu))
+    end.
+
+fmt(Pdu, Fs) ->
+    [Name | Vs] = tuple_to_list(Pdu),
+    lists:flatten(["\n",atom_to_list(Name)," {\n" , fmt1(Fs, Vs), "\n}"]).
+
+fmt1([F|Fs],[V|Vs]) ->
+    [io_lib:format("  ~s: ~s;\n", [F,fmt_value(V)]) | fmt1(Fs, Vs)];
+fmt1([], []) ->
+    "".
+
+fmt_value(V) when binary(V) -> "#Bin";
+fmt_value(V) -> lists:flatten(io_lib:format("~p",[V])).
+
+
+%%
+%% Wsp pdu encoder
+%%
+encode(Pdu) ->
+    encode(Pdu, ?WSP_DEFAULT_VERSION).
+
+encode(Pdu, Version) ->
+    ?dbg("encode pdu using encoding version ~p\n", [Version]),
+    Enc = encode1(Pdu, Version),
+    ?dbg("pdu: ~p\nreversed pdu: ~p\n",
+	 [Pdu, decode(Enc, Version)]),
+    Enc.
+
+
+encode1(Pdu, Version) ->
+    case Pdu of
+	#wsp_connect_reply {server_session_id=ServerSessionId,
+			    capabilities=Capabilities,
+			    headers=Headers} ->
+	    EncServerSessionId = e_uintvar(ServerSessionId),
+	    EncCapabilities = encode_capabilities(Capabilities),
+	    EncCapabilitiesLength = e_uintvar(size(EncCapabilities)),
+	    EncHeaders = encode_headers(Headers,Version),
+	    EncHeadersLength = e_uintvar(size(EncHeaders)),
+	    <<?WSP_ConnectReply,
+	     EncServerSessionId/binary,
+	     EncCapabilitiesLength/binary, EncHeadersLength/binary,
+	     EncCapabilities/binary, EncHeaders/binary>>;
+
+	#wsp_reply{ status=Status,
+		    content_type=ContentType,
+		    headers=Headers,
+		    data=Data} ->
+	    EncStatus = encode_status_code(Status),
+	    EncContentType = encode_content_type(ContentType,Version),
+	    EncHeaders = encode_headers(Headers,Version),
+	    EncHeadersLength = e_uintvar(size(EncContentType)+
+					 size(EncHeaders)),
+	    <<?WSP_Reply,
+	     EncStatus:8,
+	     EncHeadersLength/binary,
+	     EncContentType/binary,
+	     EncHeaders/binary,
+	     Data/binary>>;
+
+	#wsp_post{type=Type, uri=URI, content_type=ContentType,
+		  headers=Headers, data=Data} ->
+	    %% WSP_Post, WSP_Put
+	    PDUType = encode_pdu_type(Type),
+	    UriLength = e_uintvar(length(URI)),
+	    EncContentType = encode_content_type(ContentType,Version),
+	    EncHeaders = encode_headers(Headers,Version),
+	    EncHeadersLength = e_uintvar(size(EncContentType)+
+					 size(EncHeaders)),
+	    %% FIXME
+	    <<PDUType:8,
+	     UriLength/binary,
+	     EncHeadersLength/binary,
+	     (list_to_binary(URI))/binary,
+	     EncContentType/binary,
+	     EncHeaders/binary,
+	     Data/binary>>;
+
+	#wsp_push{type=Type, content_type=ContentType,
+		  headers=Headers, data=Data} ->
+	    %% WSP_Push, WSP_ConfirmedPush
+	    PDUType = encode_pdu_type(Type),
+	    EncContentType = encode_content_type(ContentType,Version),
+	    EncHeaders = encode_headers(Headers,Version),
+	    ?dbg("Version ~p Headers ~p", [Version, Headers]),
+	    ?dbg("EncHeaders ~p", [EncHeaders]),
+	    EncHeadersLength = e_uintvar(size(EncContentType)+
+					 size(EncHeaders)),
+	    ?dbg("EncCT = ~w ~w", [ContentType, EncContentType]),
+	    ?dbg("EncHL = ~w", [EncHeadersLength]),
+	    <<PDUType:8,
+	     EncHeadersLength/binary,
+	     EncContentType/binary,
+	     EncHeaders/binary,
+	     Data/binary>>;
+
+	#wsp_get{type=Type, uri=URI, headers=Headers} ->
+	    %% WSP_Get, WSP_Options, WSP_Head, WSP_Delete, WSP_Trace
+	    PDUType = encode_pdu_type(Type),
+	    UriLength = length(URI),
+	    EncHeaders = encode_headers(Headers,Version),
+	    <<PDUType:8,
+	     (e_uintvar(UriLength))/binary,
+	     (list_to_binary(URI))/binary,
+	     EncHeaders/binary>>;
+
+	#wsp_redirect { flags = Flags, addresses = Addrs } ->
+	    Flg = lists:foldl(fun(permanent,F) ->
+				       ?WSP_PERMANENT_REDIRECT bor F;
+			          (resue, F) ->
+				       ?WSP_REUSE_SECURITY bor F
+			       end, 0, Flags),
+	    EncAddr = encode_addresses(Addrs),
+	    <<?WSP_Redirect, Flg:8, EncAddr/binary >>;
+
+
+	#wsp_data_fragment_pdu { headers=Headers, data=Data } ->
+	    EncHeaders = encode_headers(Headers,Version),
+	    << ?WSP_DataFragmentPDU, EncHeaders/binary, Data/binary >>
+    end.
+
+decode(Data) ->
+    decode(Data, ?WSP_COMPLIENT_VERSION).
+
+decode(Data0, Version) ->
+    case Data0 of
+	<<?WSP_Connect:8,PduVersion:8,D0/binary>> ->
+	    %% 8.2.2.1
+	    {CapabilitiesLen,D1} = d_uintvar(D0),
+	    {HeadersLen,D2} = d_uintvar(D1),
+	    {Capabilities,D3} = split_binary(D2, CapabilitiesLen),
+	    Caps = decode_capabilities(Capabilities,#wsp_capabilities{}),
+	    {Headers,D4} = split_binary(D3, HeadersLen),
+	    DecHeaders = decode_headers(Headers, Version),
+	    ?WARN(D4 =/= <<>>, "Connect pdu contains trailing data"),
+	    %% FIXME: warn when D4 is not <<>>
+	    #wsp_connect{ version = PduVersion,
+			  capabilities=Caps,
+			  headers = DecHeaders };
+
+	<<?WSP_ConnectReply:8,D0/binary>> ->
+	    %% 8.2.2.2
+	    {ServerSessionId,D1} = d_uintvar(D0),
+	    {CapabilitiesLen,D2} = d_uintvar(D1),
+	    {HeadersLen,D3} = d_uintvar(D2),
+	    {Capabilities,D4} = split_binary(D3, CapabilitiesLen),
+	    Caps = decode_capabilities(Capabilities,#wsp_capabilities{}),
+	    {Headers,D5} = split_binary(D4, HeadersLen),
+	    DecHeaders = decode_headers(Headers, Version),
+	    ?WARN(D5 =/= <<>>, "ConnectReply pdu contains trailing data"),
+	    #wsp_connect_reply{server_session_id=ServerSessionId,
+			       capabilities=Caps,
+			       headers=DecHeaders};
+
+	<<?WSP_Redirect:8,Flg:8,D0/binary>> ->
+	    Flags =
+		if Flg band ?WSP_PERMANENT_REDIRECT =/= 0 -> [permanent];
+		   true -> []
+		end ++
+		if Flg band ?WSP_REUSE_SECURITY =/= 0 -> [security];
+		   true -> []
+		end,
+	    Addrs = decode_addresses(D0),
+	    %% 8.2.2.3 Redirect
+	    #wsp_redirect{flags=Flags,addresses=Addrs};
+
+
+	<<?WSP_Disconnect:8,D0/binary>> ->
+	    %% 8.2.2.4 Disconnect
+	    {ServerSessionId,_D1} = d_uintvar(D0),
+	    #wsp_disconnect{server_session_id=ServerSessionId};
+
+	<<?WSP_Get:8,D0/binary>> ->
+	    {URILength, D1} = d_uintvar(D0),
+	    <<UriData:URILength/binary,D2/binary>> = D1,
+	    Hs = decode_headers(D2, Version),
+	    #wsp_get{type='GET',uri=binary_to_list(UriData),headers=Hs };
+
+	<<?WSP_Options:8,D0/binary>> ->
+	    {URILength, D1} = d_uintvar(D0),
+	    <<UriData:URILength/binary,D2/binary>> = D1,
+	    Hs = decode_headers(D2, Version),
+	    #wsp_get{type='OPTIONS',uri=binary_to_list(UriData),headers=Hs };
+
+	<<?WSP_Head:8,D0/binary>> ->
+	    {URILength, D1} = d_uintvar(D0),
+	    <<UriData:URILength/binary,D2/binary>> = D1,
+	    Hs = decode_headers(D2, Version),
+	    #wsp_get{type='HEAD',uri=binary_to_list(UriData),headers=Hs };
+
+	<<?WSP_Delete:8,D0/binary>> ->
+	    {URILength, D1} = d_uintvar(D0),
+	    <<UriData:URILength/binary,D2/binary>> = D1,
+	    Hs = decode_headers(D2, Version),
+	    #wsp_get{type='DELETE',uri=binary_to_list(UriData),headers=Hs };
+
+	<<?WSP_Trace:8,D0/binary>> ->
+	    {URILength, D1} = d_uintvar(D0),
+	    <<UriData:URILength/binary,D2/binary>> = D1,
+	    Hs = decode_headers(D2, Version),
+	    #wsp_get{type='TRACE',uri=binary_to_list(UriData),headers=Hs };
+
+	%% 8.2.3.2 Post
+	<<?WSP_Post:8,D0/binary>> ->
+	    {URILen, D1} = d_uintvar(D0),
+	    {HL0, D2} = d_uintvar(D1),
+	    <<UriData:URILen/binary,D3/binary>> = D2,
+	    {FieldData,D4} = scan_header_data(D3),
+	    HL1 = (HL0-(size(D3)-size(D4))),
+	    <<D5:HL1/binary,Data/binary>> = D4,
+	    ContentType = decode_content_type(FieldData, Version),
+	    Headers = decode_headers(D5, Version),
+	    #wsp_post{ type='POST', uri=binary_to_list(UriData),
+		       content_type=ContentType, headers=Headers, data=Data};
+
+	<<?WSP_Put:8,D0/binary>> ->
+	    {URILen, D1} = d_uintvar(D0),
+	    {HL0, D2} = d_uintvar(D1),
+	    <<UriData:URILen/binary,D3/binary>> = D2,
+	    {FieldData,D4} = scan_header_data(D3),
+	    HL1 = (HL0-(size(D3)-size(D4))),
+	    <<D5:HL1/binary,Data/binary>> = D4,
+	    ContentType = decode_content_type(FieldData, Version),
+	    Headers = decode_headers(D5, Version),
+	    #wsp_post{ type='PUT', uri=binary_to_list(UriData),
+		       content_type=ContentType, headers=Headers, data=Data};
+
+	<<?WSP_Reply:8,StatusCode:8,D0/binary>> ->
+	    %% 8.2.3.3 Reply
+	    Status = decode_status_code(StatusCode),
+	    {HL0, D1} = d_uintvar(D0),
+	    {FieldData, D2} = scan_header_data(D1),
+	    ContentType = decode_content_type(FieldData, Version),
+	    %% Headers are headersLength - binary size of content type
+	    HL1 = (HL0-(size(D1)-size(D2))),
+	    <<D3:HL1/binary,Data/binary>> = D2,
+	    Hs = decode_headers(D3, Version),
+	    #wsp_reply{status=Status, content_type=ContentType,
+		       headers=Hs, data=Data};
+
+	<<?WSP_DataFragmentPDU:8,D0/binary>> ->
+	    %% 8.2.3.4 Data Fragment PDU
+	    {HL0, D1} = d_uintvar(D0),
+	    <<D2:HL0/binary,Data/binary>> = D1,
+	    Hs = decode_headers(D2, Version),
+	    #wsp_data_fragment_pdu{headers=Hs, data=Data};
+
+	%% 8.2.4.1 Push or ConfirmedPush
+	<<?WSP_Push:8,D0/binary>> ->
+	    {HeadersLength, T200} = d_uintvar(D0),
+	    {FieldData, T300} = scan_header_data(T200),
+	    ContentType = decode_content_type(FieldData, Version),
+	    RealHeadersLength = (HeadersLength-(size(T200)-size(T300))),
+	    <<T400:RealHeadersLength/binary,Data/binary>> = T300,
+	    Headers = decode_headers(T400, Version),
+	    #wsp_push{type=push,content_type=ContentType,
+		      headers=Headers,data=Data};
+
+	<<?WSP_ConfirmedPush:8,D0/binary>> ->
+	    {HeadersLength, T200} = d_uintvar(D0),
+	    {FieldData, T300} = scan_header_data(T200),
+	    ContentType = decode_content_type(FieldData, Version),
+	    RealHeadersLength = (HeadersLength-(size(T200)-size(T300))),
+	    <<T400:RealHeadersLength/binary,Data/binary>> = T300,
+	    Headers = decode_headers(T400, Version),
+	    #wsp_push{type=confirmed_push,
+		      content_type=ContentType,
+		      headers=Headers,data=Data};
+
+	<<PDUType:8,T100/binary>> ->
+	    #wsp_unknown_pdu { type = PDUType, data = T100 }
+    end.
+
+
+encode_pdu_type(connect) -> ?WSP_Connect;
+encode_pdu_type(connect_reply) -> ?WSP_ConnectReply;
+encode_pdu_type(redirect) -> ?WSP_Redirect;
+encode_pdu_type(reply) -> ?WSP_Reply;
+encode_pdu_type(disconnect) -> ?WSP_Disconnect;
+encode_pdu_type(push) -> ?WSP_Push;
+encode_pdu_type(confirmed_push) -> ?WSP_ConfirmedPush;
+encode_pdu_type(suspend) -> ?WSP_Suspend;
+encode_pdu_type(resume) -> ?WSP_Resume;
+encode_pdu_type(data_fragment_pdu) -> ?WSP_DataFragmentPDU;
+encode_pdu_type('GET') -> ?WSP_Get;
+encode_pdu_type('OPTIONS') -> ?WSP_Options;
+encode_pdu_type('HEAD') -> ?WSP_Head;
+encode_pdu_type('DELETE') -> ?WSP_Delete;
+encode_pdu_type('TRACE') -> ?WSP_Trace;
+encode_pdu_type('POST') -> ?WSP_Post;
+encode_pdu_type('PUT') -> ?WSP_Put;
+encode_pdu_type(Type) when integer(Type) -> Type.
+
+
+decode_pdu_type(?WSP_Connect) -> connect;
+decode_pdu_type(?WSP_ConnectReply) -> connect_reply;
+decode_pdu_type(?WSP_Redirect) -> redirect;
+decode_pdu_type(?WSP_Reply) -> reply;
+decode_pdu_type(?WSP_Disconnect) -> disconnect;
+decode_pdu_type(?WSP_Push) -> push;
+decode_pdu_type(?WSP_ConfirmedPush) -> confirmed_push;
+decode_pdu_type(?WSP_Suspend) -> suspend;
+decode_pdu_type(?WSP_Resume) -> resume;
+decode_pdu_type(?WSP_DataFragmentPDU) -> data_fragment_pdu;
+decode_pdu_type(?WSP_Get) -> 'GET';
+decode_pdu_type(?WSP_Options) -> 'OPTIONS';
+decode_pdu_type(?WSP_Head) -> 'HEAD';
+decode_pdu_type(?WSP_Delete) -> 'DELETE';
+decode_pdu_type(?WSP_Trace) -> 'TRACE';
+decode_pdu_type(?WSP_Post) -> 'POST';
+decode_pdu_type(?WSP_Put) -> 'PUT';
+decode_pdu_type(Type) -> Type.  %% allow unknown pdu types.
+
+
+%% Convert various data types to list
+
+to_list(I) when integer(I) ->
+    integer_to_list(I);
+to_list(A) when atom(A) ->
+    atom_to_list(A);
+to_list(Version={X,Y}) when integer(X), integer(Y) ->
+    format_version(Version);
+to_list(DateTime={{_,_,_},{_,_,_}}) ->
+    fmt_date(DateTime);
+to_list(L) when list(L) ->
+    L.
+
+
+
+encode_capabilities(Capa) ->
+    encode_capabilities(Capa,#wsp_capabilities{}).
+
+encode_capabilities(Cap,Def) ->
+    Known =
+	[encode_capability(?WSP_CAP_ALIASES,
+			   Cap#wsp_capabilities.aliases,
+			   Def#wsp_capabilities.aliases),
+	 encode_capability(?WSP_CAP_CLIENT_SDU_SIZE,
+			   Cap#wsp_capabilities.client_sdu_size,
+			   Def#wsp_capabilities.client_sdu_size),
+	 encode_capability(?WSP_CAP_SERVER_SDU_SIZE,
+			   Cap#wsp_capabilities.server_sdu_size,
+			   Def#wsp_capabilities.server_sdu_size),
+	 encode_capability(?WSP_CAP_PROTOCOL_OPTIONS,
+			   Cap#wsp_capabilities.protocol_options,
+			   Def#wsp_capabilities.protocol_options),
+	 encode_capability(?WSP_CAP_METHOD_MOR,
+			   Cap#wsp_capabilities.method_mor,
+			   Def#wsp_capabilities.method_mor),
+	 encode_capability(?WSP_CAP_PUSH_MOR,
+			   Cap#wsp_capabilities.push_mor,
+			   Def#wsp_capabilities.push_mor),
+	 encode_capability(?WSP_CAP_EXTENDED_METHODS,
+			   Cap#wsp_capabilities.extended_methods,
+			   Def#wsp_capabilities.extended_methods),
+	 encode_capability(?WSP_CAP_HEADER_CODE_PAGES,
+			   Cap#wsp_capabilities.header_code_pages,
+			   Def#wsp_capabilities.header_code_pages),
+	 encode_capability(?WSP_CAP_CLIENT_MESSAGE_SIZE,
+			   Cap#wsp_capabilities.client_message_size,
+			   Def#wsp_capabilities.client_message_size),
+	 encode_capability(?WSP_CAP_SERVER_MESSAGE_SIZE,
+			   Cap#wsp_capabilities.server_message_size,
+			   Def#wsp_capabilities.server_message_size)],
+    Unknown =
+	lists:map(fun({Id, Data}) when integer(Id) ->
+			  <<1:1, Id:7, Data/binary>>;
+		     ({Id,Data}) ->
+			  <<(encode_text_string(Id))/binary, Data/binary>>
+			      end, Cap#wsp_capabilities.unknown),
+    list_to_binary(
+      lists:map(fun(<<>>) -> [];
+		   (Bin) ->
+			[e_uintvar(size(Bin)), Bin]
+		end, Known ++ Unknown)).
+
+
+
+
+encode_capability(_Capa, Default, Default) ->
+    <<>>;
+encode_capability(Capa, Value, _) ->
+    case Capa of
+	?WSP_CAP_ALIASES ->
+	    <<1:1, ?WSP_CAP_ALIASES:7, (encode_addresses(Value))/binary>>;
+
+	?WSP_CAP_CLIENT_SDU_SIZE ->
+	    <<1:1, ?WSP_CAP_CLIENT_SDU_SIZE:7, (e_uintvar(Value))/binary>>;
+
+	?WSP_CAP_SERVER_SDU_SIZE ->
+	    <<1:1, ?WSP_CAP_SERVER_SDU_SIZE:7, (e_uintvar(Value))/binary>>;
+
+	?WSP_CAP_PROTOCOL_OPTIONS ->
+	    Opts = case lists:member(confirmed_push, Value) of
+		       true -> 16#80;
+		       false -> 0
+		   end bor
+		   case lists:member(push, Value) of
+		       true -> 16#40;
+		       false -> 0
+		   end bor
+		   case lists:member(resume, Value) of
+		       true -> 16#20;
+		       false -> 0
+		   end bor
+		   case lists:member(acknowledgement_headers, Value) of
+		       true -> 16#10;
+		       false -> 0
+		   end,
+	    %% FIXME: symbolic encode/decode of options
+	    <<1:1, ?WSP_CAP_PROTOCOL_OPTIONS:7, Opts>>;
+
+	?WSP_CAP_METHOD_MOR ->
+	    <<1:1, ?WSP_CAP_METHOD_MOR:7, (e_uintvar(Value))/binary>>;
+
+	?WSP_CAP_PUSH_MOR ->
+	    <<1:1, ?WSP_CAP_PUSH_MOR:7, (e_uintvar(Value))/binary>>;
+
+	?WSP_CAP_EXTENDED_METHODS ->
+	    <<1:1, ?WSP_CAP_EXTENDED_METHODS:7,
+	     (encode_extended_methods(Value))/binary>>;
+
+	?WSP_CAP_HEADER_CODE_PAGES ->
+	    Data = list_to_binary(
+		     lists:map(fun(Page) when integer(Page) -> Page;
+				  ({Page,Name}) ->
+				       [Page, encode_text_string(Name)]
+			       end, Value)),
+	    <<1:1, ?WSP_CAP_HEADER_CODE_PAGES:7, Data/binary>>;
+
+	?WSP_CAP_CLIENT_MESSAGE_SIZE ->
+	    <<1:1, ?WSP_CAP_CLIENT_MESSAGE_SIZE:7,
+	     (e_uintvar(Value))/binary>>;
+
+	?WSP_CAP_SERVER_MESSAGE_SIZE ->
+	    <<1:1, ?WSP_CAP_SERVER_MESSAGE_SIZE:7,
+	     (e_uintvar(Value))/binary>>;
+	_ when integer(Capa) ->
+	    <<1:1, Capa:7, Value/binary>>;
+	_ when list(Capa) ->
+	    <<(encode_text_string(Capa))/binary, Value/binary>>
+   end.
+
+
+decode_capabilities(<<>>, WspCaps) ->
+    WspCaps;
+decode_capabilities(D0,WspCaps) ->
+    {Len, D1} = d_uintvar(D0),
+    <<Capa:Len/binary, D2/binary>> = D1,
+    WspCaps1 =
+	case Capa of
+	    <<1:1, Id:7, Data/binary>> ->
+		decode_capa(Id, Data, WspCaps);
+	    _ ->
+		{Id,Data} = d_text_string(Capa),
+		decode_capa(Id, Data, WspCaps)
+	end,
+    decode_capabilities(D2, WspCaps1).
+
+
+
+decode_capa(Id,Data, WspCaps) ->
+    case Id of
+	?WSP_CAP_SERVER_SDU_SIZE ->
+	    {Val,_} = d_uintvar(Data),
+	    WspCaps#wsp_capabilities{server_sdu_size=Val};
+
+	?WSP_CAP_CLIENT_SDU_SIZE ->
+	    {Val,_} = d_uintvar(Data),
+	    WspCaps#wsp_capabilities{client_sdu_size=Val};
+
+	?WSP_CAP_PROTOCOL_OPTIONS ->
+	    <<POP,_/binary>> = Data,
+	    Opts =
+		if POP band 16#80 == 16#80 -> [confirmed_push];
+		   true -> []
+		end ++
+		if POP band 16#40 == 16#40 -> [push];
+		   true -> []
+		end ++
+		if POP band 16#20 == 16#20 -> [resume];
+		   true -> []
+		end ++
+		if POP band 16#10 == 16#10 -> [acknowledgement_headers];
+		   true -> []
+		end,
+	    WspCaps#wsp_capabilities{protocol_options=Opts};
+
+	?WSP_CAP_METHOD_MOR ->
+	    {Val,_} = d_uintvar(Data),
+	    WspCaps#wsp_capabilities{method_mor=Val};
+
+	?WSP_CAP_PUSH_MOR ->
+	    {Val,_} = d_uintvar(Data),
+	    WspCaps#wsp_capabilities{push_mor=Val};
+
+	?WSP_CAP_EXTENDED_METHODS ->
+	    Extended = decode_extended_methods(Data),
+	    WspCaps#wsp_capabilities { extended_methods = Extended };
+
+	?WSP_CAP_HEADER_CODE_PAGES ->
+	    %% Client send [Code(uint8) Name(text-string)]*
+	    %% Server send [Code(uint8)]*
+	    io:format("FIXME: Header Code Pages = ~p\n",[Data]),
+	    WspCaps;
+
+	?WSP_CAP_ALIASES ->
+	    Aliases = decode_addresses(Data),
+	    WspCaps#wsp_capabilities { aliases = Aliases };
+
+	?WSP_CAP_CLIENT_MESSAGE_SIZE ->
+	    {Val,_} = d_uintvar(Data),
+	    WspCaps#wsp_capabilities{client_message_size=Val};
+
+	?WSP_CAP_SERVER_MESSAGE_SIZE ->
+	    {Val,_} = d_uintvar(Data),
+	    WspCaps#wsp_capabilities{server_message_size=Val};
+	_  ->
+	    Unknown = [{Id, Data} | WspCaps#wsp_capabilities.unknown],
+	    io:format("WARNING: ignoring unknown capability ~p\n",
+		      [Unknown]),
+	    WspCaps#wsp_capabilities{unknown = Unknown}
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Headers = [ Header ]
+%% Header  = {FieldName, FieldValue}
+%% FieldName = atom()
+%% FieldValue = {Value, Params}
+%%            | Value
+%%
+%% Params = [{Param,Value} | Param]
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(WH(Name,Value,Params),
+	#wsp_header { name = (Name), value = (Value), params = Params}).
+
+encode_headers(Headers) ->
+    encode_headers(Headers, ?WSP_DEFAULT_VERSION).
+
+encode_headers(Headers, Version) ->
+    encode_headers(Headers, Version, []).
+
+encode_headers([H|T], Version, Acc) ->
+    encode_headers(T, Version, [encode_header(H, Version)|Acc]);
+encode_headers([], _,  Acc) ->
+    list_to_binary(lists:reverse(Acc)).
+
+
+decode_headers(Bin) ->
+    decode_headers(Bin, ?WSP_DEFAULT_VERSION).
+
+decode_headers(<<>>, _Version) ->
+    [];
+decode_headers(Data, Version) ->
+    decode_headers(Data, [], Version, ?WSP_DEFAULT_CODEPAGE).
+
+
+decode_headers(<<1:1,Code:7,Data/binary>>,Acc,Version,CP) ->
+    FieldName = lookup_field_name(Code),
+    {FieldData,Data1} = scan_header_data(Data),
+    H = decode_header(FieldName, FieldData,Version,CP),
+    ?dbg("header: ~p, field data=~p, header=~p\n",
+	 [FieldName, FieldData, H]),
+    if H#wsp_header.name == 'Encoding-Version' ->
+	    Version1 = H#wsp_header.value,
+	    ?dbg("Version switch from ~w to ~w\n", [Version, Version1]),
+	    decode_headers(Data1,[H|Acc],Version1, CP);
+       true ->
+	    decode_headers(Data1,[H|Acc],Version, CP)
+    end;
+decode_headers(Data = <<Code,_/binary>>,Acc,Version,CP)
+  when Code >= 32, Code < 127->
+    {TmpField,Data1} = d_text_string(Data),
+    FieldName = normalise_field_name(TmpField),
+    {FieldData,Data2} = scan_header_data(Data1),
+    H = decode_header(FieldName,FieldData,Version,CP),
+    ?dbg("header: ~p, field data=~p, header=~p\n",
+	 [FieldName, FieldData, H]),
+    if H#wsp_header.name == 'Encoding-Version' ->
+	    Version1 = H#wsp_header.value,
+	    ?dbg("Version switch from ~w to ~w\n", [Version, Version1]),
+	    decode_headers(Data2,[H|Acc],Version1, CP);
+       true ->
+	    decode_headers(Data2,[H|Acc],Version, CP)
+    end;
+decode_headers(<<CP1,Data/binary>>,Acc,Version,_CP) when CP1 >= 1, CP1 =< 31 ->
+    ?dbg("decode_headers: codpage changed form ~w -> ~w\n",[_CP,CP1]),
+    decode_headers(Data,Acc,Version,CP1);
+decode_headers(<<16#7f,CP1,Data/binary>>,Acc,Version,_CP) ->
+    ?dbg("decode_headers: codpage changed form ~w -> ~w\n",[_CP,CP1]),
+    decode_headers(Data,Acc,Version,CP1);
+
+decode_headers(<<>>, Acc, _Version, _CP) ->
+    lists:reverse(Acc).
+
+%%
+%% Retrive the header data
+%%  (this makes it possible to skip unknown encoding)
+%%
+scan_header_data(Data = <<N,Data0/binary>>) ->
+    if N >= 0, N =< 30 ->
+	    <<Value:N/binary, Data1/binary>> = Data0,
+	    {{short,Value}, Data1};
+       N == 31 ->
+	    {N1, Data1} = d_uintvar(Data0),
+	    <<Value:N1/binary, Data2/binary>> = Data1,
+	    {{long,Value}, Data2};
+       N >= 32, N =< 127 ->
+	    d_text_string(Data);
+       true ->
+	    { N band 16#7f, Data0}
+    end.
+
+%%
+%% Decode header: return #wsp_header
+%%
+decode_header(Field, Value) ->
+    decode_header(Field, Value,
+		  ?WSP_DEFAULT_VERSION,
+		  ?WSP_DEFAULT_CODEPAGE).
+
+decode_header(Field, Value, Version, 1) ->
+    case Field of
+	'Accept' ->
+	    decode_accept(Value, Version);
+
+	'Accept-Charset' when Version >= ?WSP_13 ->
+	    decode_accept_charset(Value, Version);
+	'Accept-Charset' ->
+	    decode_accept_charset(Value, Version);
+
+	'Accept-Encoding' when Version >= ?WSP_13 ->
+	    decode_accept_encoding(Value, Version);
+	'Accept-Encoding' ->
+	    decode_accept_encoding(Value, Version);
+
+	'Accept-Language' ->
+	    decode_accept_language(Value, Version);
+	'Accept-Ranges' ->
+	    decode_accept_ranges(Value, Version);
+	'Age' ->
+	    decode_age(Value,Version);
+	'Allow' ->
+	    decode_allow(Value,Version);
+	'Authorization' ->
+	    decode_authorization(Value,Version);
+
+	'Cache-Control' when Version >= ?WSP_14 ->
+	    decode_cache_control(Value,Version);
+	'Cache-Control' when Version >= ?WSP_13 ->
+	    decode_cache_control(Value,Version);
+	'Cache-Control' ->
+	    decode_cache_control(Value,Version);
+
+	'Connection' ->
+	    decode_connection(Value,Version);
+	'Content-Base' ->
+	    decode_content_base(Value,Version);
+	'Content-Encoding' ->
+	    decode_content_encoding(Value,Version);
+	'Content-Language' ->
+	    decode_content_language(Value,Version);
+	'Content-Length' ->
+	    decode_content_length(Value,Version);
+	'Content-Location' ->
+	    decode_content_location(Value,Version);
+	'Content-Md5' ->
+	    decode_content_md5(Value,Version);
+
+	'Content-Range' when Version >= ?WSP_13 ->
+	    decode_content_range(Value,Version);
+	'Content-Range' ->
+	    decode_content_range(Value,Version);
+
+	'Content-Type' ->
+	    decode_content_type(Value,Version);
+	'Date' ->
+	    decode_date(Value, Version);
+	'Etag' ->
+	    decode_etag(Value,Version);
+	'Expires' ->
+	    decode_expires(Value,Version);
+	'From' ->
+	    decode_from(Value,Version);
+	'Host' ->
+	    decode_host(Value,Version);
+	'If-Modified-Since' ->
+	    decode_if_modified_since(Value,Version);
+	'If-Match' ->
+	    decode_if_match(Value,Version);
+	'If-None-Match' ->
+	    decode_if_none_match(Value,Version);
+	'If-Range' ->
+	    decode_if_range(Value,Version);
+	'If-Unmodified-Since' ->
+	    decode_if_unmodified_since(Value,Version);
+	'Location' ->
+	    decode_location(Value,Version);
+	'Last-Modified' ->
+	    decode_last_modified(Value,Version);
+	'Max-Forwards' ->
+	    decode_max_forwards(Value,Version);
+	'Pragma' ->
+	    decode_pragma(Value,Version);
+	'Proxy-Authenticate' ->
+	    decode_proxy_authenticate(Value,Version);
+	'Proxy-Authorization' ->
+	    decode_proxy_authorization(Value,Version);
+	'Public' ->
+	    decode_public(Value,Version);
+	'Range' ->
+	    decode_range(Value,Version);
+	'Referer' ->
+	    decode_referer(Value,Version);
+	'Retry-After' ->
+	    decode_retry_after(Value,Version);
+	'Server' ->
+	    decode_server(Value,Version);
+	'Transfer-Encoding' ->
+	    decode_transfer_encoding(Value,Version);
+	'Upgrade' ->
+	    decode_upgrade(Value,Version);
+	'User-Agent' ->
+	    decode_user_agent(Value,Version);
+	'Vary' ->
+	    decode_vary(Value,Version);
+	'Via' ->
+	    decode_via(Value,Version);
+	'Warning' ->
+	    decode_warning(Value,Version);
+	'Www-Authenticate' ->
+	    decode_www_authenticate(Value,Version);
+
+	'Content-Disposition' when Version >= ?WSP_14 ->
+	    decode_content_disposition(Value,Version);
+	'Content-Disposition' ->
+	    decode_content_disposition(Value,Version);
+
+	'X-Wap-Application-Id' when Version >= ?WSP_12 ->
+	    decode_x_wap_application_id(Value,Version);
+
+	'X-Wap-Content-Uri' when Version >= ?WSP_12 ->
+	    decode_x_wap_content_uri(Value,Version);
+
+	'X-Wap-Initiator-Uri' when Version >= ?WSP_12 ->
+	    decode_x_wap_initiator_uri(Value,Version);
+
+	'Accept-Application' when Version >= ?WSP_12 ->
+	    decode_accept_application(Value,Version);
+
+	'Bearer-Indication' when Version >= ?WSP_12 ->
+	    decode_bearer_indication(Value,Version);
+
+	'Push-Flag' when Version >= ?WSP_12 ->
+	    decode_push_flag(Value,Version);
+
+	'Profile' when Version >= ?WSP_12 ->
+	    decode_profile(Value,Version);
+
+	'Profile-Diff' when Version >= ?WSP_12 ->
+	    decode_profile_diff(Value,Version);
+
+	'Profile-Warning' when Version >= ?WSP_12 ->
+	    decode_profile_warning(Value,Version);
+
+	'Expect' when Version >= ?WSP_15 ->
+	    decode_expect(Value,Version);
+	'Expect' when Version >= ?WSP_13 ->
+	    decode_expect(Value,Version);
+
+	'Te' when Version >= ?WSP_13 ->
+	    decode_te(Value,Version);
+	'Trailer' when Version >= ?WSP_13 ->
+	    decode_trailer(Value,Version);
+
+	'X-Wap-Tod' when Version >= ?WSP_13 ->
+	    decode_x_wap_tod(Value,Version);
+	'X-Wap.tod' when Version >= ?WSP_13 ->
+	    decode_x_wap_tod(Value,Version);
+
+	'Content-Id' when Version >= ?WSP_13 ->
+	    decode_content_id(Value,Version);
+	'Set-Cookie' when Version >= ?WSP_13 ->
+	    decode_set_cookie(Value,Version);
+	'Cookie' when Version >= ?WSP_13 ->
+	    decode_cookie(Value,Version);
+
+	'Encoding-Version' when Version >= ?WSP_13 ->
+	    decode_encoding_version(Value,Version);
+	'Profile-Warning' when Version >= ?WSP_14 ->
+	    decode_profile_warning(Value,Version);
+
+	'X-Wap-Security' when Version >= ?WSP_14 ->
+	    decode_x_wap_security(Value,Version);
+	'X-Wap-Loc-Invocation' when Version >= ?WSP_15 ->
+	    decode_x_wap_loc_invocation(Value,Version); %% ???
+	'X-Wap-Loc-Delivery' when Version >= ?WSP_15 ->
+	    decode_x_wap_loc_delivery(Value,Version);   %% ???
+	_ ->
+	    ?dbg("Warning: none standard field ~p in version ~p codepage=1\n",
+		 [Field, Version]),
+	    ?WH(Field, Value, [])
+    end;
+decode_header(Field, Value, _Version, _CP) ->
+    ?dbg("Warning: none standard field ~p in version ~p codepage=~w\n",
+	 [Field, _Version, _CP]),
+    ?WH(Field, Value, []).
+
+%%
+%% Encode field and value according to version
+%% FIXME: spilt multiple header values (i.e Via) into multiple
+%%        headers
+%%
+encode_header(H, Version) ->
+    case H#wsp_header.name of
+	'Accept' ->
+	    [16#80, encode_accept(H, Version)];
+	'Accept-Charset' when Version >= ?WSP_13 ->
+	    [16#bb, encode_accept_charset(H, Version)];
+	'Accept-Charset' ->
+	    [16#81, encode_accept_charset(H, Version)];
+	'Accept-Encoding' when Version >= ?WSP_13 ->
+	    [16#bc, encode_accept_encoding(H, Version)];
+	'Accept-Encoding' ->
+	    [16#82, encode_accept_encoding(H, Version)];
+	'Accept-Language' ->
+	    [16#83, encode_accept_language(H, Version)];
+	'Accept-Ranges' ->
+	    [16#84, encode_accept_ranges(H, Version)];
+	'Accept-Application' when Version >= ?WSP_12 ->
+	    [16#b2, encode_accept_application(H,Version)];
+	'Age' ->
+	    [16#85, encode_age(H, Version)];
+	'Allow' ->
+	    [16#86, encode_allow(H, Version)];
+	'Authorization' ->
+	    [16#87, encode_authorization(H, Version)];
+	'Cache-Control' when Version >= ?WSP_14 ->
+	    [16#c7, encode_cache_control(H, Version)];
+	'Cache-Control' when Version >= ?WSP_13 ->
+	    [16#bd, encode_cache_control(H, Version)];
+	'Cache-Control' ->
+	    [16#88, encode_cache_control(H, Version)];
+	'Connection' ->
+	    [16#89, encode_connection(H, Version)];
+	'Content-Base' ->
+	    [16#8a, encode_content_base(H, Version)];
+	'Content-Encoding' ->
+	    [16#8b, encode_content_encoding(H, Version)];
+
+	'Content-Language' ->
+	    [16#8c, encode_content_language(H,Version)];
+	'Content-Length' ->
+	    [16#8d, encode_content_length(H,Version)];
+	'Content-Location' ->
+	    [16#8e, encode_content_location(H,Version)];
+	'Content-Md5' ->
+	    [16#8f, encode_content_md5(H,Version)];
+	'Content-Range' when Version >= ?WSP_13 ->
+	    [16#be, encode_content_range(H,Version)];
+	'Content-Range' ->
+	    [16#90, encode_content_range(H,Version)];
+	'Content-Type' ->
+	    [16#91, encode_content_type(H,Version)];
+	'Date' ->
+	    [16#92, encode_date(H,Version)];
+	'Etag' ->
+	    [16#93, encode_etag(H,Version)];
+	'Expires' ->
+	    [16#94, encode_expires(H,Version)];
+	'From' ->
+	    [16#95, encode_from(H,Version)];
+	'Host' ->
+	    [16#96, encode_host(H,Version)];
+	'If-Modified-Since' ->
+	    [16#97, encode_if_modified_since(H,Version)];
+	'If-Match' ->
+	    [16#98, encode_if_match(H,Version)];
+	'If-None-Match' ->
+	    [16#99, encode_if_none_match(H,Version)];
+	'If-Range' ->
+	    [16#9a, encode_if_range(H,Version)];
+	'If-Unmodified-Since' ->
+	    [16#9b, encode_if_unmodified_since(H,Version)];
+	'Location' ->
+	    [16#9c, encode_location(H,Version)];
+	'Last-Modified' ->
+	    [16#9d, encode_last_modified(H,Version)];
+	'Max-Forwards' ->
+	    [16#9e, encode_max_forwards(H,Version)];
+	'Pragma' ->
+	    [16#9f, encode_pragma(H,Version)];
+	'Proxy-Authenticate' ->
+	    [16#a0, encode_proxy_authenticate(H,Version)];
+	'Proxy-Authorization' ->
+	    [16#a1, encode_proxy_authorization(H,Version)];
+	'Public' ->
+	    [16#a2, encode_public(H,Version)];
+	'Range' ->
+	    [16#a3, encode_range(H,Version)];
+	'Referer' ->
+	    [16#a4, encode_referer(H,Version)];
+	'Retry-After' ->
+	    [16#a5, encode_retry_after(H,Version)];
+	'Server' ->
+	    [16#a6, encode_server(H,Version)];
+	'Transfer-Encoding' ->
+	    [16#a7, encode_transfer_encoding(H,Version)];
+	'Upgrade' ->
+	    [16#a8, encode_upgrade(H,Version)];
+	'User-Agent' ->
+	    [16#a9, encode_user_agent(H,Version)];
+	'Vary' ->
+	    [16#aa, encode_vary(H,Version)];
+	'Via' ->
+	    [16#ab, encode_via(H,Version)];
+	'Warning' ->
+	    [16#ac, encode_warning(H,Version)];
+	'Www-Authenticate' ->
+	    [16#ad, encode_www_authenticate(H,Version)];
+
+	'Content-Disposition' when Version >= ?WSP_14 ->
+	    [16#c5, encode_content_disposition(H,Version)];
+	'Content-Disposition' ->
+	    [16#ae, encode_content_disposition(H,Version)];
+
+
+	'X-Wap-Application-Id' when Version >= ?WSP_12 ->
+	    [16#af, encode_x_wap_application_id(H,Version)];
+	'X-Wap-Content-Uri' when Version >= ?WSP_12 ->
+	    [16#b0, encode_x_wap_content_uri(H,Version)];
+	'X-Wap-Initiator-Uri' when Version >= ?WSP_12 ->
+	    [16#b1, encode_x_wap_initiator_uri(H,Version)];
+
+	'Bearer-Indication' when Version >= ?WSP_12 ->
+	    [16#b3, encode_bearer_indication(H,Version)];
+	'Push-Flag' when Version >= ?WSP_12 ->
+	    [16#b4, encode_push_flag(H,Version)];
+
+	'Profile' when Version >= ?WSP_12 ->
+	    [16#b5, encode_profile(H,Version)];
+	'Profile-Diff' when Version >= ?WSP_12 ->
+	    [16#b6, encode_profile_diff(H,Version)];
+	'Profile-Warning' when Version >= ?WSP_14 ->
+	    [16#c4, encode_profile_warning(H,Version)];
+	'Profile-Warning' when Version >= ?WSP_12 ->
+	    [16#b7, encode_profile_warning(H,Version)];
+
+	'Expect' when Version >= ?WSP_15 ->
+	    [16#c8, encode_expect(H,Version)];
+	'Expect' when Version >= ?WSP_13 ->
+	    [16#b8, encode_expect(H,Version)];
+	'Te' when Version >= ?WSP_13 ->
+	    [16#b9, encode_te(H,Version)];
+	'Trailer' when Version >= ?WSP_13 ->
+	    [16#ba, encode_trailer(H,Version)];
+	'X-Wap-Tod' when Version >= ?WSP_13 ->
+	    [16#bf, encode_x_wap_tod(H,Version)];
+	'Content-Id' when Version >= ?WSP_13 ->
+	    [16#c0, encode_content_id(H,Version)];
+	'Set-Cookie' when Version >= ?WSP_13 ->
+	    [16#c1, encode_set_cookie(H,Version)];
+	'Cookie' when Version >= ?WSP_13 ->
+	    [16#c2, encode_cookie(H,Version)];
+	'Encoding-Version' when Version >= ?WSP_13 ->
+	    [16#c3, encode_encoding_version(H,Version)];
+	'Encoding-Version' when Version < ?WSP_13 ->
+	    [encode_text_string("Encoding-Version"),
+	     encode_text_string(lists:flatten(format_version(H#wsp_header.value)))];
+
+	'X-Wap-Security' when Version >= ?WSP_14 ->
+	    [16#c6, encode_x_wap_security(H,Version)];
+	'X-Wap-Loc-Invocation' when Version >= ?WSP_15 ->
+	    [16#c9, encode_x_wap_loc_invocation(H,Version)];
+	'X-Wap-Loc-Delivery' when Version >= ?WSP_15 ->
+	    [16#ca, encode_x_wap_loc_delivery(H,Version)];
+	Field when atom(Field) ->
+	    [encode_text_string(atom_to_list(Field)),
+	     encode_text_string(H#wsp_header.value)];
+	Field when list(Field) ->
+	    [encode_text_string(Field),
+	     encode_text_string(H#wsp_header.value)]
+    end.
+
+%%
+%% Convert HTTP headers into WSP headers
+%%
+parse_headers([H | Hs]) ->
+    parse_header(H, Hs);
+parse_headers([]) ->
+    [].
+
+parse_header(H) ->
+    parse_header(H, []).
+
+parse_header({FieldName,FieldValue}, Hs) ->
+    case single_comma_field(FieldName) of
+	true ->
+	    io:format("parse: ~s: ~s\n", [FieldName, FieldValue]),
+	    H = parse_hdr(FieldName,FieldValue),
+	    io:format("header: ~p\n", [H]),
+	    [H | parse_headers(Hs)];
+	false ->
+	    Values = string:tokens(FieldValue, ","),
+	    parse_header(FieldName, Values, Hs)
+    end.
+
+parse_header(FieldName, [Value|Vs], Hs) ->
+    io:format("parse: ~s: ~s\n", [FieldName, Value]),
+    H = parse_hdr(FieldName, Value),
+    io:format("header: ~p\n", [H]),
+    [H | parse_header(FieldName, Vs, Hs)];
+parse_header(_FieldName, [], Hs) ->
+    parse_headers(Hs).
+
+
+single_comma_field(Field) ->
+    case Field of
+	'Set-Cookie' -> true; %% FIXME (Is multiple!)
+	'Date' -> true;
+	'Expires' -> true;
+	'If-Modified-Since' -> true;
+	'If-Range' -> true;
+	'If-Unmodified-Since' -> true;
+	'Last-Modified' -> true;
+	'Retry-After' -> true;
+	'X-Wap-Tod' -> true;
+	_ -> false
+    end.
+
+
+parse_hdr(Field, Value0) ->
+    Value = trim(Value0),
+    case Field of
+	'Accept' ->           parse_accept(Value);
+	'Accept-Charset' ->   parse_accept_charset(Value);
+	'Accept-Encoding' ->  parse_accept_encoding(Value);
+	'Accept-Language' ->  parse_accept_language(Value);
+	'Accept-Ranges' ->    parse_accept_ranges(Value);
+	'Age' ->              parse_age(Value);
+	'Allow' ->            parse_allow(Value);
+	'Authorization' ->    parse_authorization(Value);
+	'Cache-Control' ->    parse_cache_control(Value);
+	'Connection' ->       parse_connection(Value);
+	'Content-Base' ->     parse_content_base(Value);
+	'Content-Encoding' -> parse_content_encoding(Value);
+	'Content-Language' -> parse_content_language(Value);
+	'Content-Length' ->   parse_content_length(Value);
+	'Content-Location' -> parse_content_location(Value);
+	'Content-Md5' ->      parse_content_md5(Value);
+	'Content-Range' ->    parse_content_range(Value);
+	'Content-Type' ->     parse_content_type(Value);
+	'Date' ->             parse_date(Value);
+	'Etag' ->             parse_etag(Value);
+	'Expires' ->          parse_expires(Value);
+	'From' ->             parse_from(Value);
+	'Host' ->             parse_host(Value);
+	'If-Modified-Since' -> parse_if_modified_since(Value);
+	'If-Match' ->         parse_if_match(Value);
+	'If-None-Match' ->    parse_if_none_match(Value);
+	'If-Range' ->         parse_if_range(Value);
+	'If-Unmodified-Since' -> parse_if_unmodified_since(Value);
+	'Location' ->         parse_location(Value);
+	'Last-Modified' ->    parse_last_modified(Value);
+	'Max-Forwards' ->     parse_max_forwards(Value);
+	'Pragma' ->           parse_pragma(Value);
+	'Proxy-Authenticate' -> parse_proxy_authenticate(Value);
+	'Proxy-Authorization' -> parse_proxy_authorization(Value);
+	'Public' ->           parse_public(Value);
+	'Range' ->            parse_range(Value);
+	'Referer' ->          parse_referer(Value);
+	'Retry-After' ->      parse_retry_after(Value);
+	'Server' ->           parse_server(Value);
+	'Transfer-Encoding' -> parse_transfer_encoding(Value);
+	'Upgrade' ->          parse_upgrade(Value);
+	'User-Agent' ->       parse_user_agent(Value);
+	'Vary' ->             parse_vary(Value);
+	'Via' ->              parse_via(Value);
+	'Warning' ->          parse_warning(Value);
+	'Www-Authenticate' -> parse_www_authenticate(Value);
+	'Content-Disposition' -> parse_content_disposition(Value);
+	'X-Wap-Application-Id' -> parse_x_wap_application_id(Value);
+	'X-Wap-Content-Uri' -> parse_x_wap_content_uri(Value);
+	'X-Wap-Initiator-Uri' -> parse_x_wap_initiator_uri(Value);
+	'Accept-Application' -> parse_accept_application(Value);
+	'Bearer-Indication' -> parse_bearer_indication(Value);
+	'Push-Flag' ->        parse_push_flag(Value);
+	'Profile' ->          parse_profile(Value);
+	'Profile-Diff' ->     parse_profile_diff(Value);
+	'Profile-Warning' ->  parse_profile_warning(Value);
+	'Expect' ->           parse_expect(Value);
+	'Te' ->               parse_te(Value);
+	'Trailer' ->          parse_trailer(Value);
+	'X-Wap-Tod' ->        parse_x_wap_tod(Value);
+	'Content-Id' ->       parse_content_id(Value);
+	'Set-Cookie' ->       parse_set_cookie(Value);
+	'Cookie' ->           parse_cookie(Value);
+	'Encoding-Version' -> parse_encoding_version(Value);
+	'X-Wap-Security' ->   parse_x_wap_security(Value);
+	'X-Wap-Loc-Invocation' -> parse_x_wap_loc_invocation(Value);
+	'X-Wap-Loc-Delivery' -> parse_x_wap_loc_delivery(Value);
+	_ ->
+	    ?dbg("Warning: header field ~p not recognissed\n",[Field]),
+	    #wsp_header { name = Field, value = Value}
+    end.
+
+%%
+%% Format headers, will combine multiple headers into one
+%% FIXME: if length is < MAX_HTTP_HEADER_LENGTH
+%%
+format_headers(Hs) ->
+    format_hdrs(lists:keysort(#wsp_header.name,Hs), []).
+
+format_hdrs([H | Hs], Acc) ->
+    V1 = format_value(H),
+    format_hdrs(Hs, H#wsp_header.name, V1, Acc);
+format_hdrs([], Acc) ->
+    lists:reverse(Acc).
+
+format_hdrs([H|Hs], FieldName, FieldValue, Acc)
+  when FieldName == H#wsp_header.name ->
+    V1 = format_value(H),
+    format_hdrs(Hs, FieldName, [FieldValue,",",V1], Acc);
+format_hdrs(Hs, FieldName, FieldValue, Acc) ->
+    format_hdrs(Hs, [{FieldName, lists:flatten(FieldValue)} | Acc]).
+
+
+%%
+%% Format header: #wsp_header => {FieldName, Value}
+%%
+
+format_header(H) ->
+    {H#wsp_header.name, format_value(H)}.
+
+format_value(H) ->
+    case H#wsp_header.name of
+	'Accept' ->   format_accept(H);
+	'Accept-Charset' ->   format_accept_charset(H);
+	'Accept-Encoding' ->  format_accept_encoding(H);
+	'Accept-Language' ->  format_accept_language(H);
+	'Accept-Ranges' ->    format_accept_ranges(H);
+	'Age' ->     format_age(H);
+	'Allow' ->   format_allow(H);
+	'Authorization' ->   format_authorization(H);
+	'Cache-Control' ->   format_cache_control(H);
+	'Connection' ->      format_connection(H);
+	'Content-Base' ->    format_content_base(H);
+	'Content-Encoding' -> format_content_encoding(H);
+	'Content-Language' -> format_content_language(H);
+	'Content-Length' -> format_content_length(H);
+	'Content-Location' -> format_content_location(H);
+	'Content-Md5' -> format_content_md5(H);
+	'Content-Range' -> format_content_range(H);
+	'Content-Type' -> format_content_type(H);
+	'Date' -> format_date(H);
+	'Etag' -> format_etag(H);
+	'Expires' -> format_expires(H);
+	'From' -> format_from(H);
+	'Host' -> format_host(H);
+	'If-Modified-Since' -> format_if_modified_since(H);
+	'If-Match' -> format_if_match(H);
+	'If-None-Match' -> format_if_none_match(H);
+	'If-Range' -> format_if_range(H);
+	'If-Unmodified-Since' -> format_if_unmodified_since(H);
+	'Location' -> format_location(H);
+	'Last-Modified' -> format_last_modified(H);
+	'Max-Forwards' -> format_max_forwards(H);
+	'Pragma' -> format_pragma(H);
+	'Proxy-Authenticate' -> format_proxy_authenticate(H);
+	'Proxy-Authorization' -> format_proxy_authorization(H);
+	'Public' -> format_public(H);
+	'Range' -> format_range(H);
+	'Referer' -> format_referer(H);
+	'Retry-After' -> format_retry_after(H);
+	'Server' -> format_server(H);
+	'Transfer-Encoding' -> format_transfer_encoding(H);
+	'Upgrade' -> format_upgrade(H);
+	'User-Agent' -> format_user_agent(H);
+	'Vary' -> format_vary(H);
+	'Via' -> format_via(H);
+	'Warning' -> format_warning(H);
+	'Www-Authenticate' -> format_www_authenticate(H);
+	'Content-Disposition' -> format_content_disposition(H);
+	'X-Wap-Application-Id' -> format_x_wap_application_id(H);
+	'X-Wap-Content-Uri' -> format_x_wap_content_uri(H);
+	'X-Wap-Initiator-Uri' -> format_x_wap_initiator_uri(H);
+	'Accept-Application' -> format_accept_application(H);
+	'Bearer-Indication' -> format_bearer_indication(H);
+	'Push-Flag' -> format_push_flag(H);
+	'Profile' -> format_profile(H);
+	'Profile-Diff' -> format_profile_diff(H);
+	'Profile-Warning' -> format_profile_warning(H);
+	'Expect' ->  format_expect(H);
+	'Te' -> format_te(H);
+	'Trailer' -> format_trailer(H);
+	'X-Wap-Tod' ->  format_x_wap_tod(H);
+	'Content-Id' -> format_content_id(H);
+	'Set-Cookie' -> format_set_cookie(H);
+	'Cookie' -> format_cookie(H);
+	'Encoding-Version' -> format_encoding_version(H);
+	'X-Wap-Security' -> format_x_wap_security(H);
+	'X-Wap-Loc-Invocation' -> format_x_wap_loc_invocation(H);
+	'X-Wap-Loc-Delivery' -> format_x_wap_loc_delivery(H);
+	_Field ->
+	    ?dbg("Warning: header field ~s not recognissed\n",[_Field]),
+	    to_list(H#wsp_header.value)
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Encode of field values
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Accept: <content-type> [q=<q-value>] [params]
+%% Type: Multiple
+%% Ref: 8.4.2.7
+%%
+%%  Accept-value = Constrained-media | Accept-general-form
+%%
+%%  Accept-general-form = Value-length Media-range [Accept-parameters]
+%%  Media-range = (Well-known-media | Extension-media) *(Parameter)
+%%  Accept-parameters = Q-token Q-value *(Accept-extension)
+%%  Accept-extension = Parameter
+%%  Constrain-media = Constrained-encoding
+%%  Well-known-media = Integer-value
+%%  Constrained-encoding = Short-Integer | Extension-media
+%%  Q-token = <Octet 128>
+%%
+parse_accept(String) ->
+    %% FIXME
+    ?WH('Accept',String,[]).
+
+format_accept(H) ->
+    [H#wsp_header.value, format_params(H#wsp_header.params)].
+
+encode_accept(H, Version) ->
+    case encode_params(H#wsp_header.params,Version) of
+	<<>> ->
+	    encode_well_known_media(H#wsp_header.value, Version);
+	Params ->
+	    Media = encode_well_known_media(H#wsp_header.value, Version),
+	    e_value(Media, Params)
+    end.
+
+decode_accept(Value, Version) when integer(Value) ->
+    %% Constrained-encoding: Short-Integer
+    ?WH('Accept',decode_well_known_media(Value, Version),[]);
+decode_accept(Value, Version) when list(Value) ->
+    ?WH('Accept',decode_well_known_media(Value,Version),[]);
+decode_accept({_,Data}, Version)  ->
+    %% Accept-general-form
+    {Value,QData} = scan_header_data(Data),
+    Media_Range = decode_well_known_media(Value,Version),
+    Params =  decode_params(QData, Version),
+    ?WH('Accept',Media_Range,Params).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Accept-Charset: <charset> | * [q=<q-value>]
+%% Type: Multiple
+%% Ref: 8.4.2.8
+%% Note that the definition of this one is a mess!!!!
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_accept_charset(String) ->
+    %% FIXME
+    ?WH('Accept-Charset',String,[]).
+
+format_accept_charset(H) ->
+    [H#wsp_header.value, format_params(H#wsp_header.params)].
+
+encode_accept_charset(H, _Version) ->
+    %% FIXME
+    encode_text_string(H#wsp_header.value).
+
+decode_accept_charset(0, _Version) ->
+    ?WH('Accept-Charset',"*",[]);
+decode_accept_charset(Value, _Version) when integer(Value) ->
+    ?WH('Accept-Charset', decode_charset(Value),[]);
+decode_accept_charset(Value, _Version) when list(Value) ->
+    ?WH('Accept-Charset',Value,[]);
+decode_accept_charset({short,Data}, _Version) ->
+    %% Me guessing that the short form SHOULD be mulit octet integer!!!
+    Value = d_long(Data),
+    ?WH('Accept-Charset', decode_charset(Value),[]);
+decode_accept_charset({long,Value}, _Version) ->
+    {Data1, QData} = scan_header_data(Value),
+    CharSet = case Data1 of
+		  0 ->
+		      "*";
+		  Value1 when integer(Value1) ->
+		      decode_charset(Value1);
+		  Value1 when list(Value1) ->
+		      Value1;
+		  {short,Value1} ->
+		      Value2 = d_long(Value1),
+		      decode_charset(Value2)
+	      end,
+    Params = if QData == <<>> ->
+		     [];
+		true ->
+		     {QValue,_} = d_q_value(QData),
+		     {CharSet,[{q, QValue}]}
+	     end,
+    ?WH('Accept-Charset',CharSet, Params).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Accept-Encoding: gzip | compress | deflate | * [q=<q-value>]
+%% Ref:
+%% Type: Multiple
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_accept_encoding(String) ->
+    ?WH('Accept-Encoding',String,[]).
+
+format_accept_encoding(H) ->
+    [H#wsp_header.value, format_params(H#wsp_header.params)].
+
+encode_accept_encoding(H, _Version) ->
+    %% FIXME general form
+    case H#wsp_header.value of
+	"gzip"     -> ?ENCODE_SHORT(0);
+	"compress" -> ?ENCODE_SHORT(1);
+	"deflate"  -> ?ENCODE_SHORT(2);
+	Value      -> encode_text_string(Value)
+    end.
+
+decode_accept_encoding(0, _Version) ->
+    ?WH('Accept-Encoding',"gzip",[]);
+decode_accept_encoding(1, _Version) ->
+    ?WH('Accept-Encoding',"compress",[]);
+decode_accept_encoding(2, _Version) ->
+    ?WH('Accept-Encoding',"deflate",[]);
+decode_accept_encoding(Value, Version) when list(Version) ->
+    ?WH('Accept-Encoding',Value,[]);
+decode_accept_encoding({_,Data}, _Version) when binary(Data) ->
+    {Enc, Data1} = scan_header_data(Data),
+    Params = if Data1 == <<>> ->
+		     [];
+		true ->
+		     {QVal,_} = d_q_value(Data1),
+		     [{q, QVal}]
+	     end,
+    case Enc of
+	0 -> ?WH('Accept-Encoding',"gzip",Params);
+	1 -> ?WH('Accept-Encoding',"compress",Params);
+	2 -> ?WH('Accept-Encoding',"deflate",Params);
+	3 -> ?WH('Accept-Encoding',"*",Params);
+	_ when list(Enc) ->
+	    ?WH('Accept-Encoding',Enc,Params)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%	%%
+%% Accept-Language: * | <lang> [q=<q-value>]
+%% Type: Multiple
+%% Ref: 8.4.2.10
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_accept_language(Value) ->
+    ?WH('Accept-Language',Value,[]).
+
+format_accept_language(H) ->
+    [H#wsp_header.value, format_params(H#wsp_header.params)].
+
+encode_accept_language(H, _Version) ->
+    case H#wsp_header.value of
+	"*" -> ?ENCODE_SHORT(0);
+	Lang -> case catch encode_lang(Lang) of
+		    {'EXIT', _} -> encode_text_string(Lang);
+		    Code -> encode_integer(Code)
+		end
+    end.
+
+decode_accept_language(0, _Version) ->
+    ?WH('Accept-Language',"*",[]);
+decode_accept_language(Value, _Version) when integer(Value) ->
+    ?WH('Accept-Language',decode_lang(Value),[]);
+decode_accept_language(Value, _Version) when list(Value) ->
+    ?WH('Accept-Language',Value,[]);
+decode_accept_language({_,Data}, _Version) ->
+    {Data1, QData} = scan_header_data(Data),
+    Charset = case Data1 of
+		  0 ->
+		      "*";
+		  Value1 when integer(Value1) ->
+		      decode_lang(Value1);
+		  Value1 when list(Value1) ->
+		      Value1;
+		  {short,Data2} ->
+		      decode_lang(d_long(Data2))
+	      end,
+    Params =
+	if QData == <<>> ->
+		[];
+	   true ->
+		{QVal,_} = d_q_value(QData),
+		[{q, QVal}]
+	end,
+    ?WH('Accept-Language',Charset,Params).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Accept-Ranges: none | bytes | <extension>
+%% Type: single
+%% Ref:
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_accept_ranges(Value) ->
+    ?WH('Accept-Ranges', Value, []).
+
+format_accept_ranges(H) ->
+    H#wsp_header.value.
+
+encode_accept_ranges(H, _Version) ->
+    case H#wsp_header.value of
+	"none" -> ?ENCODE_SHORT(0);
+	"bytes" -> ?ENCODE_SHORT(1);
+	Value -> encode_text_string(Value)
+    end.
+
+decode_accept_ranges(0, _Version) ->
+    ?WH('Accept-Ranges', "none", []);
+decode_accept_ranges(1, _Version) ->
+    ?WH('Accept-Ranges', "bytes", []);
+decode_accept_ranges(Value, _Version) when list(Value) ->
+    ?WH('Accept-Ranges', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Age: <delta-seconds>
+%% Type: single
+%% Ref:
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_age(Value) ->
+    %% FIXME
+    ?WH('Age', Value, []).
+
+format_age(H) ->
+    integer_to_list(H#wsp_header.value).
+
+encode_age(H, _Version) ->
+    e_delta_seconds(H#wsp_header.value).
+
+decode_age(Value, _Version) when integer(Value) ->
+    ?WH('Age', Value, []);
+decode_age({short,Data}, _Version) ->
+    ?WH('Age', d_long(Data), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Allow: <well-known-method>
+%% Type: multiple
+%% Ref:
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_allow(Value) ->
+    ?WH('Allow', parse_well_known_method(Value), []).
+
+format_allow(H) ->
+    atom_to_list(H#wsp_header.value).
+
+encode_allow(H, Version) ->
+    encode_well_known_method(H#wsp_header.value, Version).
+
+decode_allow(Value, Version) ->
+    ?WH('Allow', decode_well_known_method(Value,Version), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Authorization:
+%% Ref: 8.4.2.14
+%% Type: server-to-client
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_authorization(Value) ->
+    parse_credentials('Authorization', Value).
+
+format_authorization(H) ->
+    format_credentials(H#wsp_header.value, H#wsp_header.params).
+
+encode_authorization(H, Version) ->
+    encode_credentials(H#wsp_header.value, H#wsp_header.params, Version).
+
+decode_authorization({_,Data}, Version) ->
+    decode_credentials('Authorization', Data, Version).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%%
+%% Cache-Control:
+%% 8.4.2.15
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_cache_control(Value) ->
+    case Value of
+	"no-cache" -> ?WH('Cache-Control',Value,[]);
+	"no-store" -> ?WH('Cache-Control',Value,[]);
+	"max-stale" -> ?WH('Cache-Control',Value,[]);
+	"only-if-cached" -> ?WH('Cache-Control',Value,[]);
+	"private" -> ?WH('Cache-Control',Value,[]);
+	"public" -> ?WH('Cache-Control',Value,[]);
+	"no-transform" -> ?WH('Cache-Control',Value,[]);
+	"must-revalidate" -> ?WH('Cache-Control',Value,[]);
+	"proxy-revalidate" -> ?WH('Cache-Control',Value,[]);
+	_ ->
+	    Params = parse_params([Value]),
+	    ?WH('Cache-Control',"",Params)
+    end.
+
+format_cache_control(H) ->
+    if H#wsp_header.value == "" ->
+	    format_params0(H#wsp_header.params);
+       true ->
+	    [H#wsp_header.value, format_params(H#wsp_header.params)]
+    end.
+
+
+
+encode_cache_control(H, Version) ->
+    case H#wsp_header.value of
+	"no-cache" -> ?ENCODE_SHORT(0);
+	"no-store" -> ?ENCODE_SHORT(1);
+	"max-stale" -> ?ENCODE_SHORT(3);
+	"only-if-cached" -> ?ENCODE_SHORT(5);
+	"private" -> ?ENCODE_SHORT(7);
+	"public" -> ?ENCODE_SHORT(6);
+	"no-transform" -> ?ENCODE_SHORT(8);
+	"must-revalidate" -> ?ENCODE_SHORT(9);
+	"proxy-revalidate" -> ?ENCODE_SHORT(10);
+	"" ->
+	    case H#wsp_header.params of
+		[{'no-cache',Field}] ->
+		    e_value(?ENCODE_SHORT(0),
+			    e_field_name(Field,Version));
+		[{'max-age',Sec}] ->
+		    e_value(?ENCODE_SHORT(2),
+			    e_delta_seconds(Sec));
+		[{'max-fresh',Sec}] ->
+		    e_value(?ENCODE_SHORT(4),
+			    e_delta_seconds(Sec));
+		[{'private',Field}] ->
+		    e_value(?ENCODE_SHORT(7),
+			    e_field_name(Field,Version));
+		[{'s-maxage',Sec}] ->
+		    e_value(?ENCODE_SHORT(11),
+			    e_delta_seconds(Sec))
+	    end;
+	Ext ->
+	    [Param] = H#wsp_header.params,
+	    e_value(encode_text_string(Ext),
+		    encode_parameter(Param, Version))
+    end.
+
+
+decode_cache_control(Value, _Version) when integer(Value) ->
+    case Value of
+	0 -> ?WH('Cache-Control',"no-cache",[]);
+	1 -> ?WH('Cache-Control',"no-store",[]);
+	3 -> ?WH('Cache-Control',"max-stale",[]);
+	5 -> ?WH('Cache-Control',"only-if-cached",[]);
+	7 -> ?WH('Cache-Control',"private",[]);
+	6 -> ?WH('Cache-Control',"public",[]);
+	8 -> ?WH('Cache-Control',"no-transform",[]);
+	9 -> ?WH('Cache-Control',"must-revalidate",[]);
+	10 -> ?WH('Cache-Control',"proxy-revalidate",[])
+    end;
+decode_cache_control(Value, _Version) when list(Value) ->
+    ?WH('Cache-Control',Value,[]);
+decode_cache_control({_,Data},Version) ->
+    {CacheDir, Data1} = scan_header_data(Data),
+    case CacheDir of
+	0 ->
+	    {Field,_} = d_field_name(Data1),
+	    ?WH('Cache-Control',"",[{'no-cache',Field}]);
+	2 ->
+	    {Sec,_} = d_integer_value(Data1),
+	    ?WH('Cache-Control',"",[{'max-age',Sec}]);
+	4 ->
+	    {Sec,_} = d_integer_value(Data1),
+	    ?WH('Cache-Control',"",[{'max-fresh',Sec}]);
+	7 ->
+	    {Field,_} = d_field_name(Data1),
+	    ?WH('Cache-Control',"",[{private,Field}]);
+	11 ->
+	    {Sec,_} = d_integer_value(Data1),
+	    ?WH('Cache-Control',"",[{'s-maxage',Sec}]);
+	Ext when list(Ext) ->
+	    {Param,_} = decode_parameter(Data1, Version),
+	    ?WH('Cache-Control',Ext,[Param])
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Connection: close | Ext
+%% Type: single
+%% Ref: 8.4.2.16
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_connection(Value) ->
+    ?WH('Connection', Value, []).
+
+format_connection(H) ->
+    H#wsp_header.value.
+
+encode_connection(H, _Version) ->
+    case H#wsp_header.value of
+	"close" -> ?ENCODE_SHORT(0);
+	Value ->  encode_text_string(Value)
+    end.
+
+decode_connection(0, _Version) ->
+    ?WH('Connection', "close", []);
+decode_connection(Value, _Version) when list(Value) ->
+    ?WH('Connection', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Content-Base: <uri>
+%% Type: single
+%% Ref:
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_content_base(Value) ->
+    ?WH('Content-Base', Value, []).
+
+format_content_base(H) ->
+    H#wsp_header.value.
+
+encode_content_base(H, _Version) ->
+    encode_uri_value(H#wsp_header.value).
+
+decode_content_base(Value, _Version) when list(Value) ->
+    ?WH('Content-Base', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Content-Encoding:
+%% Ref: 8.4.2.18
+%% Type: single
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_content_encoding(Value) ->
+    ?WH('Content-Encoding', tolower(Value), []).
+
+format_content_encoding(H) ->
+    H#wsp_header.value.
+
+encode_content_encoding(H, _Version) ->
+    case H#wsp_header.value of
+	"gzip"     -> ?ENCODE_SHORT(0);
+	"compress" -> ?ENCODE_SHORT(1);
+	"deflate"  -> ?ENCODE_SHORT(2);
+	Value -> encode_text_string(Value)
+    end.
+
+decode_content_encoding(0, _Version) ->
+    ?WH('Content-Encoding', "gzip", []);
+decode_content_encoding(1, _Version) ->
+    ?WH('Content-Encoding', "compress", []);
+decode_content_encoding(2, _Version) ->
+    ?WH('Content-Encoding',"deflate", []);
+decode_content_encoding(Value, _Version) when list(Value) ->
+    ?WH('Content-Encoding', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Content-Language:
+%% Ref: 8.4.2.19
+%% Type: single
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_content_language(Value) ->
+    ?WH('Content-Language', Value, []).
+
+format_content_language(H) ->
+    H#wsp_header.value.
+
+encode_content_language(H, _Version) ->
+    case H#wsp_header.value of
+	"*" -> ?ENCODE_SHORT(0);
+	Lang -> case catch encode_lang(Lang) of
+		    {'EXIT', _} -> encode_text_string(Lang);
+		    Code -> encode_integer(Code)
+		end
+    end.
+
+decode_content_language(0, _Version) ->
+    ?WH('Content-Language',"*",[]);
+decode_content_language(Value, _Version) when integer(Value) ->
+    ?WH('Content-Language',decode_lang(Value),[]);
+decode_content_language(Value, _Version) when list(Value) ->
+    ?WH('Content-Language',Value,[]);
+decode_content_language({short,Data}, _Version) ->
+    Value = d_long(Data),
+    ?WH('Content-Language',decode_lang(Value),[]);
+decode_content_language(Value, _Version) when list(Value) ->
+    ?WH('Content-Language',Value,[]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Content-Length: <integer-value>
+%% Ref: 8.4.2.20
+%% Type: single
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_content_length(Value) ->
+    ?WH('Content-Length', list_to_integer(Value), []).
+
+format_content_length(H) ->
+    integer_to_list(H#wsp_header.value).
+
+encode_content_length(H, _Version) ->
+    encode_integer(H#wsp_header.value).
+
+decode_content_length(Value, _Version) when integer(Value) ->
+    ?WH('Content-Length', Value, []);
+decode_content_length({short,Data}, _Version) ->
+    Value = d_long(Data),
+    ?WH('Content-Length', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Content-Location: <uri-value>
+%% Ref: 8.4.2.21
+%% Type: single
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_content_location(Value) ->
+    ?WH('Content-Location', Value, []).
+
+format_content_location(H) ->
+    H#wsp_header.value.
+
+encode_content_location(H, _Version) ->
+    encode_uri_value(H#wsp_header.value).
+
+decode_content_location(Value, _Version) when list(Value) ->
+    ?WH('Content-Location', decode_uri_value(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Content-Md5: <value-length> <digest>
+%% Ref: 8.4.2.22
+%% Type: single, end-to-end
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_content_md5(Value) ->
+    ?WH('Content-Md5', base64:decode(Value), []).
+
+format_content_md5(H) ->
+    base64:encode(H#wsp_header.value).
+
+encode_content_md5(H, _Version) ->
+    e_value(H#wsp_header.value).
+
+decode_content_md5({_,Data}, _Version) ->
+    ?WH('Content-Md5', Data, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Content-Range: <first-byte-pos> <entity-len>
+%% Ref: 8.4.2.23
+%% Type: single
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_content_range(Value) ->
+    %% FIXME:
+    ?WH('Content-Range', Value, []).
+
+format_content_range(H) ->
+    {Pos,Len} = H#wsp_header.value,
+    if Len == "*" ->
+	    ["bytes ", integer_to_list(Pos), "-*/*"];
+       true ->
+	    ["bytes ", integer_to_list(Pos),"-",integer_to_list(Len-1),
+	     "/", integer_to_list(Len)]
+    end.
+
+encode_content_range(H, _Version) ->
+    case H#wsp_header.value of
+	{Pos, "*"} ->
+	    e_value(e_uintvar(Pos), <<128>>);
+	{Pos, Len} ->
+	    e_value(e_uintvar(Pos), e_uintvar(Len))
+    end.
+
+decode_content_range({_, Data}, _Version) ->
+    {Pos, Data1} = d_uintvar(Data),
+    Len =
+	case Data1 of
+	    <<128>> -> "*";
+	    _ ->
+		{L, _} = d_uintvar(Data1),
+		L
+	end,
+    ?WH('Content-Range', {Pos,Len}, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Content-Type:
+%% Ref: 8.4.2.24
+%% Type: single, end-to-end
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_content_type(Value) ->
+    case string:tokens(Value, ";") of
+	[Type | Ps] ->
+	    Params = parse_params(Ps),
+	    ?WH('Content-Type', Type, Params);
+	[] ->
+	    ?WH('Content-Type', Value, [])
+    end.
+
+format_content_type(H) ->
+    [H#wsp_header.value, format_params(H#wsp_header.params)].
+
+encode_content_type(H, Version) ->
+    case encode_params(H#wsp_header.params,Version) of
+	<<>> ->
+	    encode_well_known_media(H#wsp_header.value, Version);
+	Params ->
+	    Media = encode_well_known_media(H#wsp_header.value, Version),
+	    e_value(Media, Params)
+    end.
+
+decode_content_type(Value,Version) when integer(Value) ->
+    ?WH('Content-Type', decode_well_known_media(Value,Version), []);
+decode_content_type(Value,Version) when list(Value) ->
+    ?WH('Content-Type', decode_well_known_media(Value,Version), []);
+decode_content_type({_, Data}, Version) ->
+    {Value,Data1} = scan_header_data(Data),
+    ContentType = if integer(Value) ->
+			  decode_well_known_media(Value,Version);
+		     list(Value) ->
+			  decode_well_known_media(Value,Version);
+		     true ->
+			  {_,Data2} = Value,
+			  decode_well_known_media(d_long(Data2),Version)
+		  end,
+    Params = decode_params(Data1, Version),
+    ?WH('Content-Type', ContentType, Params).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Date: <http-date>
+%% Ref: 8.2.4.25
+%% Type: single, end-to-end
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_date(String) ->
+    {DateTime, _} = parse_http_date(String),
+    ?WH('Date', DateTime, []).
+
+format_date(H) ->
+    fmt_date(H#wsp_header.value).
+
+encode_date(H, _Version) ->
+    e_date(H#wsp_header.value).
+
+decode_date(Value, _Version) ->
+    ?WH('Date', d_date(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Etag: <text-string>
+%% Ref: 8.2.4.26
+%% Type: single, end-to-end
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_etag(Value) ->
+    ?WH('Etag', Value, []).
+
+format_etag(H) ->
+    H#wsp_header.value.
+
+encode_etag(H, _Version) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_etag(Value, _Version) ->
+    ?WH('Etag', decode_text_string(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Expires: <date-value>
+%% Ref: 8.4.2.27
+%% Type: single, end-to-end, server-to-client
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_expires(String) ->
+    {DateTime, _} = parse_http_date(String),
+    ?WH('Expires', DateTime, []).
+
+format_expires(H) ->
+    fmt_date(H#wsp_header.value).
+
+encode_expires(H, _Version) ->
+    e_date(H#wsp_header.value).
+
+decode_expires(Value, _Version) ->
+    ?WH('Expires', d_date(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% From: <text-string>
+%% Ref: 8.4.2.28
+%% Type: single,
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_from(Value) ->
+    ?WH('From', Value, []).
+
+format_from(H) ->
+    H#wsp_header.value.
+
+encode_from(H, _Version) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_from(Value, _Version) ->
+    ?WH('From', decode_text_string(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Host: <text-string>
+%% Ref: 8.4.2.29
+%% Type: single, end-to-end, client-to-server
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_host(Value) ->
+    ?WH('Host', Value, []).
+
+format_host(H) ->
+    H#wsp_header.value.
+
+encode_host(H, _Version) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_host(Value, _Version) ->
+    ?WH('Host', decode_text_string(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% If-Modified-Since: <date-value>
+%% Ref: 8.4.2.30
+%% Type: single, end-to-end, client-to-server
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_if_modified_since(String) ->
+    {DateTime, _} = parse_http_date(String),
+    ?WH('If-Modified-Since', DateTime, []).
+
+format_if_modified_since(H) ->
+    fmt_date(H#wsp_header.value).
+
+encode_if_modified_since(H, _Version) ->
+    e_date(H#wsp_header.value).
+
+decode_if_modified_since(Value, _Version) ->
+    ?WH('If-Modified-Since', d_date(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% If-Match: <text-string>
+%% Ref: 8.4.2.31
+%% Type: end-to-end, client-to-server
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_if_match(Value) ->
+    ?WH('If-Match', Value, []).
+
+format_if_match(H) ->
+    H#wsp_header.value.
+
+encode_if_match(H, _Version) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_if_match(Value, _Version) ->
+    ?WH('If-Match', decode_text_string(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% If-None-Match: <text-string>
+%% Ref: 8.4.2.32
+%% Type: end-to-end, client-to-server
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_if_none_match(Value) ->
+    ?WH('If-None-Match', Value, []).
+
+format_if_none_match(H) ->
+    H#wsp_header.value.
+
+encode_if_none_match(H, _Version) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_if_none_match(Value, _Version) ->
+    ?WH('If-None-Match', decode_text_string(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% If-Range: Text | Date
+%% Ref: 8.4.2.33
+%% Type: end-to-end, client-to-server
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_if_range(Value) ->
+    case catch parse_http_date(Value) of
+	{'EXIT', _} ->
+	    ?WH('If-Range', Value, []);
+	{DateTime,_} ->
+	    ?WH('If-Range', DateTime, [])
+    end.
+
+
+format_if_range(H) ->
+    case H#wsp_header.value of
+	Value when list(Value) -> Value;
+	DateTime -> fmt_date(DateTime)
+    end.
+
+encode_if_range(H, _Version) ->
+    case H#wsp_header.value of
+	Value when list(Value) ->
+	    encode_text_string(Value);
+	DateTime ->
+	    e_date(DateTime)
+    end.
+
+decode_if_range(Value, _Version) when list(Value) ->
+    ?WH('If-Range', decode_text_string(Value), []);
+decode_if_range(Value, _Version) ->
+    ?WH('If-Range', d_date(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% If-Unmodified-Since: <date-value>
+%% Ref: 8.4.2.34
+%% Type: single, end-to-end, client-to-server
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_if_unmodified_since(String) ->
+    {DateTime, _} = parse_http_date(String),
+    ?WH('If-Unmodified-Since', DateTime, []).
+
+format_if_unmodified_since(H) ->
+    fmt_date(H#wsp_header.value).
+
+encode_if_unmodified_since(H, _Version) ->
+    e_date(H#wsp_header.value).
+
+decode_if_unmodified_since(Value, _Version) ->
+    ?WH('If-Unmodified-Since', d_date(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Location: <uri-value>
+%% Ref: 8.4.2.36
+%% Type: single, end-to-end, server-to-client
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_location(Value) ->
+    ?WH('Location', Value, []).
+
+format_location(H) ->
+    H#wsp_header.value.
+
+encode_location(H, _Version) ->
+    encode_uri_value(H#wsp_header.value).
+
+decode_location(Value, _Version) when list(Value) ->
+    ?WH('Location', decode_uri_value(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Last-Modified: <date-value>
+%% Ref: 8.4.2.35
+%% Type: single, end-to-end, server-to-client
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_last_modified(String) ->
+    {DateTime, _} = parse_http_date(String),
+    ?WH('Last-Modified', DateTime, []).
+
+format_last_modified(H) ->
+    fmt_date(H#wsp_header.value).
+
+encode_last_modified(H, _Version) ->
+    e_date(H#wsp_header.value).
+
+decode_last_modified(Value, _Version) ->
+    ?WH('Last-Modified', d_date(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Max-Forwards: <integer-value>
+%% Ref: 8.4.2.37
+%% Type: single, end-to-end, server-to-client
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_max_forwards(String) ->
+    ?WH('Max-Forwards', list_to_integer(String), []).
+
+format_max_forwards(H) ->
+    integer_to_list(H#wsp_header.value).
+
+encode_max_forwards(H, _Version) ->
+    encode_integer(H#wsp_header.value).
+
+decode_max_forwards(Value, _Version) ->
+    decode_integer(Value).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Pragma: No-Cache | value-length Parameter
+%% Ref:
+%% Type:
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_pragma(Value) ->
+    ?WH('Pragma',Value,[]).
+
+format_pragma(H) ->
+    case H#wsp_header.value of
+	"" -> format_params(H#wsp_header.params);
+	Value -> Value
+    end.
+
+encode_pragma(H, Version) ->
+    case H#wsp_header.value of
+	"no-cache" -> ?ENCODE_SHORT(0);
+	"" ->
+	    encode_parameter(hd(H#wsp_header.params), Version)
+    end.
+
+decode_pragma(0, _Version) ->
+    ?WH('Pragma',"no-cache",[]);
+decode_pragma({_,Data}, Version) ->
+    {Param,_} = decode_parameter(Data, Version),
+    ?WH('Pragma',"",[Param]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Proxy-Authenticate:
+%% Ref: 8.4.2.39
+%% Type: single?, client-to-proxy
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_proxy_authenticate(Value) ->
+    parse_challenge('Proxy-Authenticate', Value).
+
+format_proxy_authenticate(H) ->
+    format_challenge(H#wsp_header.value, H#wsp_header.params).
+
+encode_proxy_authenticate(H, Version) ->
+    encode_challenge(H#wsp_header.value,
+		     H#wsp_header.params, Version).
+
+decode_proxy_authenticate({_, Data}, Version) ->
+    decode_challenge('Proxy-Authenticate', Data, Version).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Proxy-authorization:
+%% Ref: 8.4.2.40
+%% Type: single?, proxy-to-client
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_proxy_authorization(Value) ->
+    parse_credentials('Proxy-Authorization', Value).
+
+format_proxy_authorization(H) ->
+    format_credentials(H#wsp_header.value, H#wsp_header.params).
+
+encode_proxy_authorization(H, Version) ->
+    encode_credentials(H#wsp_header.value, H#wsp_header.params, Version).
+
+decode_proxy_authorization({_,Data}, Version) ->
+    decode_credentials('Proxy-Authorization', Data, Version).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Public: <well-known-method> | Token-Text
+%% Ref: 8.4.2.41
+%% Type:
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_public(Value) ->
+    ?WH('Public', parse_well_known_method(Value), []).
+
+format_public(H) ->
+    if atom(H#wsp_header.value) ->
+	    atom_to_list(H#wsp_header.value);
+       list(H#wsp_header.value) ->
+	    H#wsp_header.value
+    end.
+
+encode_public(H, Version) ->
+    if atom(H#wsp_header.value) ->
+	    encode_well_known_method(H#wsp_header.value,Version);
+       list(H#wsp_header.value) ->
+	    encode_text_string(H#wsp_header.value)
+    end.
+
+decode_public(Value, _Version) when list(Value) ->
+    ?WH('Public', Value, []);
+decode_public(Value, Version) ->
+    ?WH('Public', decode_well_known_method(Value,Version), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Range:
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_range(Value) ->
+    %% FIXME:
+    ?WH('Range', Value, []).
+
+format_range(H) ->
+    case H#wsp_header.value of
+	{First,undefined} ->
+	    ["bytes=", integer_to_list(First), "-"];
+	{First,Last} ->
+	    ["bytes=", integer_to_list(First), "-", integer_to_list(Last)];
+	Len when integer(Len) ->
+	    ["bytes=-", integer_to_list(Len)]
+    end.
+
+encode_range(H, _Version) ->
+    case H#wsp_header.value of
+	{First,undefined} ->
+	    e_value(?ENCODE_SHORT(0),
+		    e_uintvar(First));
+	{First,Last} ->
+	    e_value(?ENCODE_SHORT(0),
+		    e_uintvar(First),
+		    e_uintvar(Last));
+	Len when integer(Len) ->
+	    e_value(?ENCODE_SHORT(1),
+		    e_uintvar(Len))
+    end.
+
+decode_range({_,Data}, _Version) ->
+    case scan_header_data(Data) of
+	{0, Data1} ->
+	    case d_uintvar(Data1) of
+		{First, <<>>} ->
+		    ?WH('Range', {First, undefined},[]);
+		{First, Data2} ->
+		    {Last, _} = d_uintvar(Data2),
+		    ?WH('Range', {First, Last}, [])
+	    end;
+	{1, Data1} ->
+	    {Len, _} =d_uintvar(Data1),
+	    ?WH('Range', Len, [])
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Referer: <uri-value>
+%% Ref: 8.4.2.43
+%% Type: single
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_referer(Value) ->
+    ?WH('Referer', Value, []).
+
+format_referer(H) ->
+    H#wsp_header.value.
+
+encode_referer(H, _Version) ->
+    encode_uri_value(H#wsp_header.value).
+
+decode_referer(Value, _Version) when list(Value) ->
+    ?WH('Referer', decode_uri_value(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Retry-After: Value-length (Retry-date-value | Retry-delta-seconds)
+%% Ref: 8.4.2.44
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_retry_after(Value) ->
+    case catch parse_http_date(Value) of
+	{'EXIT', _} ->
+	    ?WH('Retry-After', list_to_integer(Value), []);
+	{DateTime,_} ->
+	    ?WH('Retry-After', DateTime, [])
+    end.
+
+format_retry_after(H) ->
+    Value = H#wsp_header.value,
+    if integer(Value) ->
+	    integer_to_list(Value);
+       true ->
+	    fmt_date(Value)
+    end.
+
+encode_retry_after(H, _Version) ->
+    Value = H#wsp_header.value,
+    if integer(Value) ->
+	    e_value(?ENCODE_SHORT(1),
+		    e_delta_seconds(Value));
+       true ->
+	    e_value(?ENCODE_SHORT(0),
+		    e_date(Value))
+    end.
+
+decode_retry_after({_,Data}, _Version) ->
+    case scan_header_data(Data) of
+	{0, Data1} ->
+	    ?WH('Retry-After', d_date(Data1), []);
+	{1, Data1} ->
+	    case scan_header_data(Data1) of
+		Sec when integer(Sec) ->
+		    ?WH('Retry-After', Sec, []);
+		{short,Data2} ->
+		    ?WH('Retry-After', d_long(Data2), [])
+	    end
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Server: <text-string>
+%% Ref: 8.4.2.45
+%% Type: server-to-client
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_server(Value) ->
+    ?WH('Server', Value, []).
+
+format_server(H) ->
+    H#wsp_header.value.
+
+encode_server(H, _Version) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_server(Value, _Version) ->
+    ?WH('Server', decode_text_string(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Transfer-Encoding:
+%% Ref: 8.4.2.46
+%% Type: hop-by-hop
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_transfer_encoding(Value) ->
+    ?WH('Transfer-Encoding', Value, []).
+
+format_transfer_encoding(H) ->
+    H#wsp_header.value.
+
+encode_transfer_encoding(H, _Version) ->
+    case H#wsp_header.value of
+	"chunked" -> ?ENCODE_SHORT(0);
+	Value -> encode_text_string(Value)
+    end.
+
+decode_transfer_encoding(0, _Version) ->
+    ?WH('Transfer-Encoding', "chunked", []);
+decode_transfer_encoding(Value, _Version) when list(Value)->
+    ?WH('Transfer-Encoding', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Upgrade: Text-String
+%% Ref: 8.4.2.47
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_upgrade(Value) ->
+    ?WH('Upgrade', Value, []).
+
+format_upgrade(H) ->
+    H#wsp_header.value.
+
+encode_upgrade(H, _Version) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_upgrade(Value, _Version) when list(Value) ->
+    ?WH('Upgrade', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% User-Agent:
+%% Ref: 8.4.2.48
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_user_agent(Value) ->
+    ?WH('User-Agent', Value, []).
+
+format_user_agent(H) ->
+    H#wsp_header.value.
+
+encode_user_agent(H, _Version) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_user_agent(Value, _Version) ->
+    ?WH('User-Agent', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Vary: Well-known-header-field | Token-text
+%% Ref: 8.4.2.49
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_vary(Value) ->
+    ?WH('Vary', normalise_field_name(Value), []).
+
+format_vary(H) ->
+    to_list(H#wsp_header.value).
+
+encode_vary(H, Version) ->
+    e_field_name(H#wsp_header.value, Version).
+
+decode_vary(Value, _Version) when integer(Value) ->
+    ?WH('Vary', lookup_field_name(Value), []);
+decode_vary(Value, _Version) when list(Value) ->
+    ?WH('Vary', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Via: <text-string>
+%% Ref: 8.4.2.50
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_via(Value) ->
+    ?WH('Via', Value, []).
+
+format_via(H) ->
+    H#wsp_header.value.
+
+encode_via(H, _Version) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_via(Value, _Version) when list(Value) ->
+    ?WH('Via', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Warning: Warn-Code | Warning-value
+%% Ref: 8.4.2.51
+%% Type: general, multiple
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_warning(Value) ->
+    case string:tokens(Value, " ") of
+	[Code] ->
+	    ?WH('Warning', {list_to_integer(Code),"",""}, []);
+	[Code,Agent,Text] ->
+	    ?WH('Warning', {list_to_integer(Code), Agent, Text}, [])
+    end.
+
+format_warning(H) ->
+    case H#wsp_header.value of
+	{Code, "", ""} ->
+	    integer_to_list(Code);
+	{Code, Agent, Text} ->
+	    [integer_to_list(Code), " ", Agent, " ", Text]
+    end.
+
+encode_warning(H, _Version) ->
+    case H#wsp_header.value of
+	{Code,"",""} ->
+	    ?ENCODE_SHORT(Code);
+	{Code, Agent, Text} ->
+	    e_value(?ENCODE_SHORT(Code),
+		    encode_text_string(Agent),
+		    encode_text_string(Text))
+    end.
+
+decode_warning(Value, _Version) when integer(Value) ->
+    ?WH('Warning', {Value, "", ""}, []);
+decode_warning({_, Data}, _Version) ->
+    {Code,Data1}= scan_header_data(Data),
+    {Agent,Data2} = d_text_string(Data1),
+    {Text,_Data3} = d_text_string(Data2),
+    ?WH('Warning', {Code,Agent,Text}, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% WWW-Authenticate: challenge
+%% Ref: 8.4.2.52
+%% Type: single? client-to-server
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_www_authenticate(Value) ->
+    parse_challenge('Www-Authenticate', Value).
+
+format_www_authenticate(H) ->
+    format_challenge(H#wsp_header.value, H#wsp_header.params).
+
+encode_www_authenticate(H, Version) ->
+    encode_challenge(H#wsp_header.value,
+		     H#wsp_header.params, Version).
+
+decode_www_authenticate({_, Data}, Version) ->
+    decode_challenge('Www-Authenticate', Data, Version).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Content-Disposition: "form-data" | "attachment" [<param>]*
+%% Ref: 8.4.2.53
+%% Type: single
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_content_disposition(Value) ->
+    ?WH('Content-Disposition', Value, []).
+
+format_content_disposition(H) ->
+    [H#wsp_header.value, format_params(H#wsp_header.params)].
+
+encode_content_disposition(H, Version) ->
+    case H#wsp_header.value of
+	"form-data" ->
+	    e_value(?ENCODE_SHORT(0),
+		    encode_params(H#wsp_header.params, Version));
+	"attachment" ->
+	    e_value(?ENCODE_SHORT(1),
+		    encode_params(H#wsp_header.params, Version))
+    end.
+
+decode_content_disposition({_,Data}, Version) when binary(Data) ->
+    case scan_header_data(Data) of
+	{0, Data1} ->
+	    Params = decode_params(Data1, Version),
+	    ?WH('Content-Disposition', "form-data", Params);
+	{1, Data1} ->
+	    Params = decode_params(Data1, Version),
+	    ?WH('Content-Disposition', "attachment", Params)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% X-Wap-Application-Id:
+%% Ref: 8.4.2.54
+%% Type:
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_x_wap_application_id(Value) ->
+    ?WH('X-Wap-Application-Id', Value, []).
+
+format_x_wap_application_id(H) ->
+    H#wsp_header.value.
+
+encode_x_wap_application_id(H, _Version) ->
+    encode_push_application(H#wsp_header.value).
+
+decode_x_wap_application_id(Value, _Version) ->
+    ?WH('X-Wap-Application-Id', decode_push_application(Value),[]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% X-Wap-Content-Uri: <uri-value>
+%% Ref: 8.4.2.55
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_x_wap_content_uri(Value) ->
+    ?WH('X-Wap-Content-Uri', Value, []).
+
+format_x_wap_content_uri(H) ->
+    H#wsp_header.value.
+
+encode_x_wap_content_uri(H, _Version) ->
+    encode_uri_value(H#wsp_header.value).
+
+decode_x_wap_content_uri(Value, _Version) when list(Value) ->
+    ?WH('X-Wap-Content-Uri', decode_uri_value(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% X-Wap-Initiator-Uri: <uri-value>
+%% Ref: 8.4.2.56
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_x_wap_initiator_uri(Value) ->
+    ?WH('X-Wap-Initiator-Uri', Value, []).
+
+format_x_wap_initiator_uri(H) ->
+    H#wsp_header.value.
+
+encode_x_wap_initiator_uri(H, _Version) ->
+    encode_uri_value(H#wsp_header.value).
+
+decode_x_wap_initiator_uri(Value, _Version) when list(Value) ->
+    ?WH('X-Wap-Initiator-Uri', decode_uri_value(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Accept-Application: Any-Application | Appication-Id-Value
+%% Ref: 8.4.2.57
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_accept_application(Value) ->
+    ?WH('Accept-Application', Value, []).
+
+format_accept_application(H) ->
+    H#wsp_header.value.
+
+
+encode_accept_application(H, _Version) ->
+    case H#wsp_header.value of
+	"*" -> ?ENCODE_SHORT(0);
+	Value ->
+	    case catch encode_push_application(Value) of
+		{'EXIT',_} ->
+		    encode_uri_value(Value);
+		App ->
+		    encode_integer(App)
+	    end
+    end.
+
+decode_accept_application(0, _Version) ->
+    ?WH('Accept-Application', "*", []);
+decode_accept_application(Value, _Version) when integer(Value) ->
+    ?WH('Accept-Application', decode_push_application(Value), []);
+decode_accept_application({short,Data}, _Version) ->
+    Value = d_long(Data),
+    ?WH('Accept-Application', decode_push_application(Value), []);
+decode_accept_application(Value, _Version) when list(Value) ->
+    ?WH('Accept-Application', decode_uri_value(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Bearer-Indication: <integer-value>
+%% Type: sinlge
+%% Ref: 8.4.2.58
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_bearer_indication(Value) ->
+    ?WH('Bearer-Indication', Value, []).
+
+format_bearer_indication(H) ->
+    integer_to_list(H#wsp_header.value).
+
+encode_bearer_indication(H, _Version) ->
+    encode_integer(H#wsp_header.value).
+
+decode_bearer_indication(Value, _Version) when integer(Value) ->
+    ?WH('Bearer-Indication', Value, []);
+decode_bearer_indication({short,Data}, _Version) ->
+    Value = d_long(Data),
+    ?WH('Bearer-Indication', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Push-Flag: Short-Integer
+%% Type: single
+%% Ref: 8.4.2.59
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_push_flag(Value) ->
+    ?WH('Push-Flag', integer_to_list(Value), []).
+
+format_push_flag(H) ->
+    integer_to_list(H#wsp_header.value).
+
+encode_push_flag(H, _Version) ->
+    ?ENCODE_SHORT(H#wsp_header.value).
+
+decode_push_flag(Value, _Version) when integer(Value) ->
+    ?WH('Push-Flag', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Profile: <uri-value>
+%% Ref: 8.4.2.60
+%% Type: single, hop-by-hop, client-to-proxy
+%%
+%% Note: Normally transfered as 'X-Wap-Profile'
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_profile(Value) ->
+    ?WH('Profile', Value, []).
+
+format_profile(H) ->
+    H#wsp_header.value.
+
+encode_profile(H, _Version) ->
+    encode_uri_value(H#wsp_header.value).
+
+decode_profile(Value, _Version) ->
+    ?WH('Profile', decode_uri_value(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Profile-Diff: Value-Length Octets
+%% Ref: 8.4.2.61
+%% Type: single, hop-by-hop, client-to-proxy
+%%
+%%  Value is WBXML encoded profile diff information
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_profile_diff(Value) ->
+    %% FIXME parse XML code?
+    ?WH('Profile-Diff', Value, []).
+
+format_profile_diff(_H) ->
+    %% FIXME emit ???
+    "WBXML".
+
+encode_profile_diff(H, _Version) ->
+    e_value(H#wsp_header.value).
+
+decode_profile_diff({_,Value}, _Version) ->
+    ?WH('Profile-Diff', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Profile-Warning: Code
+%% Ref: 8.4.2.62
+%% Type: single
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_profile_warning(Value) ->
+    ?WH('Profile-Warning', {Value,"",undefined}, []).
+
+format_profile_warning(H) ->
+    {Code,Target,Date} = H#wsp_header.value,
+    CodeData = integer_to_list(Code),
+    if Target == "", Date == undefined ->
+	    CodeData;
+       Date == undefined ->
+	    [CodeData," ",Target];
+       true ->
+	    [CodeData," ",Target," ",format_date(Date)]
+    end.
+
+
+encode_profile_warning(H, _Version) ->
+    {Code,Target,Date} = H#wsp_header.value,
+    CodeData = case Code of
+		   100 -> ?ENCODE_SHORT(16#10);
+		   101 -> ?ENCODE_SHORT(16#11);
+		   102 -> ?ENCODE_SHORT(16#12);
+		   200 -> ?ENCODE_SHORT(16#20);
+		   201 -> ?ENCODE_SHORT(16#21);
+		   202 -> ?ENCODE_SHORT(16#22);
+		   203 -> ?ENCODE_SHORT(16#23)
+	       end,
+    if Target == "", Date == undefined ->
+	    CodeData;
+       Date == undefined ->
+	    e_value(CodeData, encode_text_string(Target));
+       true ->
+	    e_value(CodeData, encode_text_string(Target), e_date(Date))
+    end.
+
+
+decode_profile_warning(Value, _Version) when integer(Value) ->
+    Code = case Value of
+	       16#10 -> 100;
+	       16#11 -> 101;
+	       16#12 -> 102;
+	       16#20 -> 200;
+	       16#21 -> 201;
+	       16#22 -> 202;
+	       16#23 -> 203
+	   end,
+    ?WH('Profile-Warning', {Code,"",undefined}, []);
+decode_profile_warning({_, <<1:1, Value:7, Data>>}, _Version) ->
+    Code = case Value of
+	       16#10 -> 100;
+	       16#11 -> 101;
+	       16#12 -> 102;
+	       16#20 -> 200;
+	       16#21 -> 201;
+	       16#22 -> 202;
+	       16#23 -> 203
+	   end,
+    {Target,Data1} = d_text_string(Data),
+    Date =
+	if Data1 == <<>> ->
+		undefined;
+	   true ->
+		{DateValue,_} = scan_header_data(Data1),
+		d_date(DateValue)
+	end,
+    ?WH('Profile-Warning', {Code,Target,Date}, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Expect: 100-contine | Expect-expression
+%% Ref: 8.4.2.63
+%% Type: client-to-server
+%% Note: Bug in the spec value-length is missing !!!
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_expect(Value) ->
+    ?WH('Expect', Value, []).
+
+format_expect(H) ->
+    case H#wsp_header.value of
+	{Var,Val} ->
+	    [Var,"=",Val, format_params(H#wsp_header.params)];
+	Val when list(Val) ->
+	    Val
+    end.
+
+encode_expect(H, Version) ->
+    case H#wsp_header.value of
+	"100-continue" ->
+	    ?ENCODE_SHORT(0);
+	{Var,Val} ->
+	    e_value(encode_text_string(Var),
+		    encode_text_string(Val),
+		    encode_params(H#wsp_header.params,Version))
+    end.
+
+decode_expect(0, _Version) ->
+    ?WH('Expect', "100-continue", []);
+decode_expect({_, Data}, Version) ->
+    {Var, Data1} = d_text_string(Data),
+    {Val, Data2} = d_text_string(Data1),
+    Params = decode_params(Data2, Version),
+    ?WH('Expect', {decode_text_string(Var),
+		   decode_text_string(Val)}, Params).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Te: Trailers | TE-General-From
+%% Ref: 8.4.2.64
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_te(Value) ->
+    ?WH('Te', Value, []).
+
+format_te(H) ->
+    [H#wsp_header.value, format_params(H#wsp_header.params)].
+
+encode_te(H, Version) ->
+    case H#wsp_header.value of
+	"trailers" -> ?ENCODE_SHORT(1);
+	"chunked" ->
+	    e_value(?ENCODE_SHORT(2),
+		    encode_params(H#wsp_header.params,Version));
+	"identity" ->
+	    e_value(?ENCODE_SHORT(3),
+		    encode_params(H#wsp_header.params,Version));
+	"gzip" ->
+	    e_value(?ENCODE_SHORT(4),
+		    encode_params(H#wsp_header.params,Version));
+	"compress" ->
+	    e_value(?ENCODE_SHORT(5),
+		    encode_params(H#wsp_header.params,Version));
+	"deflate" ->
+	    e_value(?ENCODE_SHORT(6),
+		    encode_params(H#wsp_header.params,Version));
+	Value ->
+	    e_value(encode_text_string(Value),
+		    encode_params(H#wsp_header.params,Version))
+    end.
+
+decode_te(1, _Version) ->
+    ?WH('Te', "trailers", []);
+decode_te({_, Data}, _Version) ->
+    {Val, Data1} = scan_header_data(Data),
+    Value =
+	case Val of
+	    2 -> "chunked";
+	    3 -> "identity";
+	    4 -> "gzip";
+	    5 -> "compress";
+	    6 -> "deflate";
+	    V when list(V) -> V
+	end,
+    Params = case Data1 of
+		 <<>> ->  [];
+		 <<128, QData>> ->
+		     {QValue, _} = d_q_value(QData),
+		     [{q, QValue}]
+	     end,
+    ?WH('Te', Value, Params).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Trailer: Well-known-header-field | Token-text
+%% Ref: 8.4.2.65
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_trailer(Value) ->
+    ?WH('Trailer', normalise_field_name(Value), []).
+
+format_trailer(H) ->
+    to_list(H#wsp_header.value).
+
+encode_trailer(H, Version) ->
+    e_field_name(H#wsp_header.value, Version).
+
+decode_trailer(Value, _Version) when integer(Value) ->
+    ?WH('Trailer', lookup_field_name(Value), []);
+decode_trailer(Value, _Version) when list(Value) ->
+    ?WH('Trailer', Value, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% X-Wap-Tod:
+%% Ref: 8.4.2.66
+%% Type: hop-by-hop
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_x_wap_tod(String) ->
+    {DateTime, _} = parse_http_date(String),
+    ?WH('X-Wap-Tod', DateTime, []).
+
+format_x_wap_tod(H) ->
+    fmt_date(H#wsp_header.value).
+
+encode_x_wap_tod(H, _Version) ->
+    e_date(H#wsp_header.value).
+
+decode_x_wap_tod(Value, _Version) ->
+    ?WH('X-Wap-Tod', d_date(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Content-Id: <quoted-string>
+%% Type:
+%% Ref: 8.4.2.67
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_content_id(Value) ->
+    ?WH('Content-Id', Value, []).
+
+format_content_id(H) ->
+    [$", H#wsp_header.value, $"].
+
+encode_content_id(H, _Version) ->
+    encode_quoted_string(H#wsp_header.value).
+
+decode_content_id(Value, _Version) when list(Value) ->
+    ?WH('Content-Id', decode_quoted_string(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Set-Cookie: <len> <cookie-version> <cookie-name> <cokie-value> <parm>*
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_set_cookie(String) ->
+    %% MEGA FIXME; Cookie-value may be a quoted string and
+    %% contain both ,=; etc Fix several cookies on same line!!
+    case string:tokens(String, ";") of
+	[Cookie | Ps] ->
+	    case string:tokens(Cookie, "=") of
+		[Name,Value] ->
+		    Params = parse_params(Ps),
+		    ?WH('Set-Cookie', {{1,0}, Name, Value}, Params);
+		[Name] ->
+		    Params = parse_params(Ps),
+		    ?WH('Set-Cookie', {{1,0}, Name, ""}, Params)
+	    end;
+	[] ->
+	    ?WH('Set-Cookie', {{1,0}, String, ""}, [])
+    end.
+
+format_set_cookie(H) ->
+    case H#wsp_header.value of
+	{{1,0},Name,Value} ->
+	    [Name, "=", Value,format_params(H#wsp_header.params)];
+	{Version,Name,Value} ->
+	    [format_version(Version)," ",
+	     Name, "=", Value,
+	     format_params(H#wsp_header.params)]
+    end.
+
+encode_set_cookie(H, Version) ->
+    {CookieVersion,Name,Value} = H#wsp_header.value,
+    e_value(encode_version(CookieVersion),
+	    encode_text_string(Name),
+	    encode_text_string(Value),
+	    encode_params(H#wsp_header.params, Version)).
+
+decode_set_cookie({_, Data}, Version) ->
+    {CookieVersion, Data1} = scan_header_data(Data),
+    {CookieName, Data2} = scan_header_data(Data1),
+    {CookieValue, Data3} = scan_header_data(Data2),
+    Params = decode_params(Data3, Version),
+    ?WH('Set-Cookie', {decode_version(CookieVersion),
+		       decode_text_string(CookieName),
+		       decode_text_string(CookieValue)}, Params).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Cookie:
+%% Ref: 8.4.2.69
+%% Type: single?, client-to-server
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_cookie(Value) ->
+    %% FIXME parse cookie version etc
+    ?WH('Cookie', {{1,0},Value}, []).
+
+format_cookie(H) ->
+    case H#wsp_header.value of
+	{{1,0}, Cookies} ->
+	    lists:map(fun({Name,Value,Ps}) ->
+			      [Name,"=",Value, format_params(Ps)]
+		      end, Cookies);
+	{Version, Cookies} ->
+	    [format_version(Version)," ",
+	     lists:map(fun({Name,Value,Ps}) ->
+			       [Name,"=",Value, format_params(Ps)]
+		       end, Cookies)]
+    end.
+
+encode_cookie(H, Version) ->
+    {Version, Cookies} = H#wsp_header.value,
+    e_value(encode_version(Version),
+	    encode_cookies(Cookies, [])).
+
+encode_cookies([{Name,Value,Ps} | Cs], Acc) ->
+    List =
+	[encode_text_string(Name),
+	 encode_text_string(Value) |
+	 case Ps of
+	     [{path,P},{domain,D}] ->
+		 [encode_text_string(P), encode_text_string(D)];
+	     [{domain,D},{path,P}] ->
+		 [encode_text_string(P), encode_text_string(D)];
+	     [{path,P}] ->
+		 [encode_text_string(P)];
+	     [{domain,D}] ->
+		 [encode_text_string(""), encode_text_string(D)];
+	     [] ->
+		 []
+	 end],
+    Sz = lists:sum(lists:map(fun(B) -> size(B) end, List)),
+    encode_cookies(Cs, [[e_uintvar(Sz) | List] | Acc]);
+encode_cookies([], Acc) ->
+    list_to_binary(lists:reverse(Acc)).
+
+
+decode_cookie({_, Data}, _Version) ->
+    {CookieVersion, Data1} = scan_header_data(Data),
+    Cookies = decode_cookies(Data1, []),
+    ?WH('Cookie', {decode_version(CookieVersion), Cookies}, []).
+
+decode_cookies(<<>>, Acc) ->
+    lists:reverse(Acc);
+decode_cookies(Data0, _Acc) ->	%% IS IGNORING Acc A BUG OR NOT ?
+    {Len, Data1} = d_uintvar(Data0),
+    <<C0:Len/binary, Data2/binary>> = Data1,
+    {Name, C1} = scan_header_data(C0),
+    {Value, C2} = scan_header_data(C1),
+    {Ps1, C3} =
+	case d_text_string(C2) of
+	    {"", C21} -> {[], C21};
+	    {Path,C21} -> {[{path,Path}], C21}
+	end,
+    {Ps2, _} =
+	case C3 of
+	    <<>> -> {[], <<>>};
+	    _ ->
+		{Domain,C4} = d_text_string(C3),
+		{[{domain,Domain}], C4}
+	end,
+    decode_cookies(Data2, [{decode_text_string(Name),
+			    decode_text_string(Value),
+			    Ps1++Ps2}]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Encoding-Version: Version-Value | Value-length Code-Page [Version-Value]
+%% Ref: 8.4.2.70
+%% Type: single, hop-by-hop, client-and-proxys
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_encoding_version(Value) ->
+    ?WH('Encoding-Version', parse_version(Value), []).
+
+format_encoding_version(H) ->
+    format_version(H#wsp_header.value).
+
+encode_encoding_version(H, _Version) ->
+    encode_version(H#wsp_header.value).
+
+decode_encoding_version(Value, _Version) when integer(Value) ->
+    ?WH('Encoding-Version', decode_version(Value), []);
+decode_encoding_version(Value, _Version) when list(Value) ->
+    %% Note: in this case we parse the Value since we
+    %% Must know the Encoding version
+    ?WH('Encoding-Version', parse_version(Value), []);
+decode_encoding_version({_,<<_:1,_CodePage:7>>}, _Version) ->
+    %% ??? FIXME
+    ?WH('Encoding-Version', "", []);
+decode_encoding_version({_,<<_:1,_CodePage:7, Data1/binary>>}, _Version) ->
+    {Value,_Data2} = scan_header_data(Data1),
+    %% FIXME CodePage
+    ?WH('Encoding-Version', decode_version(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% X-Wap-Security:
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_x_wap_security(Value) ->
+    ?WH('X-Wap-Security', Value, []).
+
+format_x_wap_security(H) ->
+    H#wsp_header.value.
+
+encode_x_wap_security(H, _Version) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_x_wap_security(Value, _Version) ->
+    ?WH('X-Wap-Security', decode_text_string(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% X-Wap-Loc-Invocation:
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_x_wap_loc_invocation(Value) ->
+    ?WH('X-Wap-Loc-Invocation', Value, []).
+
+format_x_wap_loc_invocation(H) ->
+    H#wsp_header.value.
+
+encode_x_wap_loc_invocation(H, _Version) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_x_wap_loc_invocation(Value, _Version) ->
+    ?WH('X-Wap-Loc-Invocation', decode_text_string(Value), []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% X-Wap-Loc-Delivery:
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_x_wap_loc_delivery(Value) ->
+    ?WH('X-Wap-Loc-Delivery', Value, []).
+
+format_x_wap_loc_delivery(H) ->
+    H#wsp_header.value.
+
+encode_x_wap_loc_delivery(H, _Value) ->
+    encode_text_string(H#wsp_header.value).
+
+decode_x_wap_loc_delivery(Value, _Version) ->
+    ?WH('X-Wap-Loc-Delivery', decode_text_string(Value), []).
+
+
+%%
+%% Header Field parameters
+%%
+
+parse_params([Param|Ps]) ->
+    case string:tokens(Param, "=") of
+	[Name,Value0] ->
+	    Val = trim(Value0),
+	    P = case trim(tolower(Name)) of
+		    "q" ->{q,Val};
+		    "charset" -> {charset,Val};
+		    "level" -> {level,Val};
+		    "type" -> {type,Val};
+		    "name" -> {name,Val};
+		    "filename" -> {filename,Val};
+		    "differences" -> {differences,Val};
+		    "padding" -> {padding,Val};
+		    "start" -> {start,Val};
+		    "start-info" -> {'start-info',Val};
+		    "comment" -> {comment,Val};
+		    "domain" -> {domain,Val};
+		    "max-age" -> {'max-age',Val};
+		    "path" -> {path,Val};
+		    "secure" -> {secure,no_value};
+		    "sec" -> {sec, Val};
+		    "mac" -> {mac, Val};
+		    "creation-date" -> {'creation-date', Val};
+		    "modification-date" -> {'modification-date', Val};
+		    "read-date" -> {'read-date', Val};
+		    "size" -> {size, Val};
+		    Nm -> {Nm, Val}
+		end,
+	    [P | parse_params(Ps)];
+	_ ->
+	    parse_params(Ps)
+    end;
+parse_params([]) ->
+    [].
+
+%% format Params without leading ";"
+format_params0([{Param,no_value}|Ps]) ->
+    [to_list(Param) | format_params(Ps)];
+format_params0([{Param,Value}|Ps]) ->
+    [to_list(Param),"=",to_list(Value) | format_params(Ps)].
+
+format_params(Ps) ->
+    lists:map(fun({Param,no_value}) ->
+		      ["; ", to_list(Param)];
+		 ({Param,Value})->
+		      ["; ", to_list(Param),"=",to_list(Value)]
+	      end, Ps).
+
+
+encode_params(Params, Version) ->
+    list_to_binary(encode_params1(Params,Version)).
+
+encode_params1([Param|Ps], Version) ->
+    [ encode_parameter(Param, Version) | encode_params1(Ps, Version)];
+encode_params1([], _Version) ->
+    [].
+
+
+decode_params(Data, Version) ->
+    decode_params(Data, [], Version).
+
+decode_params(<<>>, Ps, _Version) ->
+    lists:reverse(Ps);
+decode_params(Data, Ps, Version) ->
+    {ParamVal, Data1} = decode_parameter(Data, Version),
+    decode_params(Data1, [ParamVal | Ps], Version).
+
+
+
+
+encode_parameter({ParamName, ParamValue}, Ver) ->
+    case ParamName of
+	q when Ver >= 16#01 ->
+	    <<1:1, 16#00:7,
+	     (encode_typed_field(Ver,'Q-value', ParamValue))/binary>>;
+	charset when Ver >= 16#01 ->
+	    <<1:1, 16#01:7,
+	     (encode_typed_field(Ver,'Well-known-charset',ParamValue))/binary>>;
+	level when Ver >= 16#01 ->
+	    <<1:1, 16#02:7,
+	     (encode_typed_field(Ver,'Ver-value',ParamValue))/binary>>;
+
+	type when Ver >= ?WSP_12 ->
+	    <<1:1, 16#09:7,
+	     (encode_typed_field(Ver,'Constrained-encoding',ParamValue))/binary>>;
+	type when Ver >= 16#01 ->
+	    <<1:1, 16#03:7,
+	     (encode_typed_field(Ver,'Integer-value',ParamValue))/binary>>;
+
+	name when Ver >= ?WSP_14 ->
+	    <<1:1, 16#17:7,
+	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
+	name when Ver >= 16#01 ->
+	    <<1:1, 16#05:7,
+	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
+
+	filename when Ver >= ?WSP_14 ->
+	    <<1:1, 16#18:7,
+	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
+	filename when Ver >= 16#01 ->
+	    <<1:1, 16#06:7,
+	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
+
+	differences when Ver >= 16#01 ->
+	    <<1:1, 16#07:7,
+	     (encode_typed_field(Ver,'Field-name',ParamValue))/binary>>;
+
+	padding when Ver >= 16#01 ->
+	    <<1:1, 16#08:7,
+	     (encode_typed_field(Ver,'Short-integer',ParamValue))/binary>>;
+
+
+	start when Ver >= ?WSP_14 ->
+	    <<1:1, 16#19:7,
+	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
+	start when Ver >= ?WSP_12 ->
+	    <<1:1, 16#0A:7,
+	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
+
+
+	'start-info' when Ver >= ?WSP_14 ->
+	    <<1:1, 16#1A:7,
+	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
+	'start-info' when Ver >= ?WSP_12 ->
+	    <<1:1, 16#0B:7,
+	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
+
+        comment when Ver >= ?WSP_14 ->
+	    <<1:1, 16#1B:7,
+	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
+	comment when Ver >= ?WSP_13 ->
+	    <<1:1, 16#0C:7,
+	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
+
+	domain when Ver >= ?WSP_14 ->
+	    <<1:1, 16#1C:7,
+	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
+	domain when Ver >= ?WSP_13 ->
+	    <<1:1, 16#0D:7,
+	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
+
+	'max-age' when Ver >= ?WSP_13 ->
+	    <<1:1, 16#0E:7,
+	     (encode_typed_field(Ver,'Delta-seconds-value',ParamValue))/binary>>;
+
+	path when Ver >= ?WSP_14 ->
+	    <<1:1, 16#1D:7,
+	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
+	path when Ver >= ?WSP_13 ->
+	    <<1:1, 16#0F:7,
+	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
+
+	secure when Ver >= ?WSP_13 ->
+	    <<1:1, 16#10:7,
+	     (encode_typed_field(Ver,'No-value',ParamValue))/binary>>;
+	%% NOTE: "sec" and "mac" are really 1.4 features but used by 1.3 client provisioning
+	%"sec" when Ver >= ?WSP_14 ->
+	sec when Ver >= ?WSP_13 ->
+	    <<1:1, 16#11:7,
+	     (encode_typed_field(Ver,'Short-integer',ParamValue))/binary>>;
+	%"mac" when Ver >= ?WSP_14 ->
+	mac when Ver >= ?WSP_13 ->
+	    <<1:1, 16#12:7,
+	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
+	'creation-date' when Ver >= ?WSP_14 ->
+	    <<1:1, 16#13:7,
+	     (encode_typed_field(Ver,'Date-value',ParamValue))/binary>>;
+	'modification-date' when Ver >= ?WSP_14 ->
+	    <<1:1, 16#14:7,
+	     (encode_typed_field(Ver,'Date-value',ParamValue))/binary>>;
+	'read-date' when Ver >= ?WSP_14 ->
+	    <<1:1, 16#15:7,
+	     (encode_typed_field(Ver,'Date-value',ParamValue))/binary>>;
+	size when Ver >= ?WSP_14 ->
+	    <<1:1, 16#16:7,
+	     (encode_typed_field(Ver,'Integer-value',ParamValue))/binary>>;
+	_ ->
+	    <<(encode_text_string(ParamName))/binary,
+	      (encode_text_string(ParamValue))/binary >>
+   end.
+
+%% decode_parameter: return {ParameterName, ParamterValue}
+decode_parameter(<<1:1,Code:7,Data/binary>>, Version) ->
+    case Code of
+	16#00 ->
+	    {Val,Data1} = decode_typed_field('Q-value', Data, Version),
+	    {{ q, Val}, Data1};
+
+	16#01 ->
+	    {Val,Data1} = decode_typed_field('Well-known-charset',Data,Version),
+	    {{charset, Val}, Data1};
+
+	16#02 ->
+	    {Val,Data1} = decode_typed_field('Version-value',Data,Version),
+	    {{level, Val}, Data1};
+
+	16#03 ->
+	    {Val,Data1} = decode_typed_field('Integer-value', Data,Version),
+	    {{type, Val}, Data1};
+
+	16#05 ->
+	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
+	    {{name, Val}, Data1};
+
+	16#06 ->
+	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
+	    {{filename, Val}, Data1};
+
+	16#07 ->
+	    {Val,Data1} = decode_typed_field('Field-name', Data,Version),
+	    {{differences, Val}, Data1};
+
+	16#08 ->
+	    {Val,Data1} = decode_typed_field('Short-integer', Data,Version),
+	    {{padding, Val}, Data1};
+
+	16#09 ->
+	    {Val,Data1} = decode_typed_field('Constrained-encoding', Data,Version),
+	    {{type, Val}, Data1};
+
+	16#0A ->
+	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
+	    {{start, Val}, Data1};
+
+	16#0B ->
+	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
+	    {{'start-info', Val}, Data1};
+
+	16#0C ->
+	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
+	    {{comment, Val}, Data1};
+
+	16#0D ->
+	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
+	    {{domain, Val}, Data1};
+
+	16#0E ->
+	    {Val,Data1} = decode_typed_field('Delta-seconds-value', Data,Version),
+	    {{'max-age', Val}, Data1};
+
+	16#0F ->
+	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
+	    {{path, Val}, Data1};
+
+	16#10 ->
+	    {Val,Data1} = decode_typed_field('No-value', Data,Version),
+	    {{secure, Val}, Data1};
+
+	16#11 ->
+	    {Val,Data1} = decode_typed_field('Short-integer', Data,Version),
+	    {{sec, Val}, Data1};
+
+	16#12 ->
+	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
+	    {{mac, Val}, Data1};
+
+	16#13 ->
+	    {Val,Data1} = decode_typed_field('Date-value', Data,Version),
+	    {{'creation-date', Val}, Data1};
+
+	16#14 ->
+	    {Val,Data1} = decode_typed_field('Date-value', Data,Version),
+	    {{'modification-date', Val}, Data1};
+
+	16#15 ->
+	    {Val,Data1} = decode_typed_field('Date-value', Data,Version),
+	    {{'read-date', Val}, Data1};
+
+	16#16 ->
+	    {Val,Data1} = decode_typed_field('Integer-value', Data,Version),
+	    {{size, Val}, Data1};
+
+	16#17 ->
+	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
+	    {{name, Val}, Data1};
+
+	16#18 ->
+	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
+	    {{filename, Val}, Data1};
+
+	16#19 ->
+	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
+	    {{start, Val}, Data1};
+
+	16#1A ->
+	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
+	    {{'start-info', Val}, Data1};
+
+	16#1B ->
+	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
+	    {{comment, Val}, Data1};
+
+	16#1C ->
+	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
+	    {{domain, Val}, Data1};
+
+	16#1D ->
+	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
+	    {{path, Val}, Data1};
+	_ ->
+	    exit({error, unknown_parameter})
+    end;
+decode_parameter(Data, _Version) ->
+    %% Untyped-parameter: Token-Text Untype-value
+    {ParamName,Data1} = d_text_string(Data),
+    %% Untype-value: Integer-Value | Text-Value!
+    {ParamValue, Data2} = decode_untyped_value(Data1),
+    {{ParamName,ParamValue}, Data2}.
+
+
+encode_typed_field(Ver,Type,Value) ->
+    case Type of
+	'Well-known-charset' ->
+	    MIBenum = encode_charset(Value),
+	    encode_integer(MIBenum);
+
+	'Constrained-encoding' ->
+	    encode_constrained_media(Value, Ver);
+
+	'Text-string' ->
+	    encode_text_string(Value);
+
+	'Text-value' ->
+	    encode_text_value(Value);
+
+	'Short-integer' ->
+	    ?ENCODE_SHORT(Value);
+
+	'Date-value' ->
+	    e_date(Value);
+
+	'Delta-Seconds-value' ->
+	    e_delta_seconds(Value);
+
+	'No-value' ->
+	    e_no_value(Value);
+
+	_ ->
+	    io:format("FIXME: encode_typed_field unsupported type = ~p\n",
+		      [Type]),
+	    exit({error,badtype})
+    end.
+
+
+decode_typed_field(Type, Data, Version) ->
+    case Type of
+	'Q-value' ->
+	    d_q_value(Data);
+
+	'Well-known-charset' ->
+	    {MIBenum, T100} = d_integer_value(Data),
+	    {decode_charset(MIBenum), T100};
+
+	'Constrained-encoding' ->
+	    {Value, Data1} = scan_header_data(Data),
+	    {decode_constrained_media(Value,Version), Data1};
+
+	'Text-string' ->
+	    d_text_string(Data);
+
+	'Text-value'  ->
+	    d_text_value(Data);
+
+	'Short-integer' ->
+	    decode_short_integer(Data);
+
+	'Delta-seconds-value' ->
+	    d_integer_value(Data);
+
+	'Date-value' ->
+	    {Val, Data1} = decode_long_integer(Data),
+	    {d_date(Val), Data1};
+
+	'Field-name' ->
+	    d_field_name(Data);
+
+	'No-value' ->
+	    d_no_value(Data);
+
+	_ ->
+	    io:format("FIXME: unsupported type = ~p\n",[Type]),
+	    exit({error,badtype})
+    end.
+
+
+%% Integer-Value | Text-Value
+%% return as {Value, Tail}
+decode_untyped_value(<<1:1, Short:7, Tail/binary>>) ->
+    {Short, Tail};
+decode_untyped_value(<<0:3, Len:5, Data/binary>>) when Len =/= 31 ->
+    Sz = Len*8,
+    <<Long:Sz, Tail/binary>> = Data,
+    {Long, Tail};
+decode_untyped_value(Data) ->
+    d_text_string(Data).
+
+
+e_field_name(Value, Version) ->
+    case normalise_field_name(Value) of
+	'Accept' -> <<16#80>>;
+	'Accept-Charset' when Version >= ?WSP_13 -> <<16#bb>>;
+	'Accept-Charset' -> <<16#81>>;
+	'Accept-Encoding' when Version >= ?WSP_13 -> <<16#bc>>;
+	'Accept-Encoding' -> <<16#82>>;
+	'Accept-Language' -> <<16#83>>;
+	'Accept-Ranges' -> <<16#84>>;
+	'Age' -> <<16#85>>;
+	'Allow' -> <<16#86>>;
+	'Authorization' -> <<16#87>>;
+	'Cache-Control' when Version >= ?WSP_14 -> <<16#c7>>;
+	'Cache-Control' when Version >= ?WSP_13 -> <<16#bd>>;
+	'Cache-Control' -> <<16#88>>;
+	'Connection' -> <<16#89>>;
+	'Content-Base' -> <<16#8a>>;
+	'Content-Encoding' -> <<16#8b>>;
+	'Content-Language' -> <<16#8c>>;
+	'Content-Length' -> <<16#8d>>;
+	'Content-Location' -> <<16#8e>>;
+	'Content-Md5' -> <<16#8f>>;
+	'Content-Range' when Version >= ?WSP_13 -> <<16#be>>;
+	'Content-Range' -> <<16#90>>;
+	'Content-Type' -> <<16#91>>;
+	'Date' -> <<16#92>>;
+	'Etag' -> <<16#93>>;
+	'Expires' -> <<16#94>>;
+	'From' -> <<16#95>>;
+	'Host' -> <<16#96>>;
+	'If-Modified-Since' -> <<16#97>>;
+	'If-Match' -> <<16#98>>;
+	'If-None-Match' -> <<16#99>>;
+	'If-Range' -> <<16#9a>>;
+	'If-Unmodified-Since' -> <<16#9b>>;
+	'Location' -> <<16#9c>>;
+	'Last-Modified' -> <<16#9d>>;
+	'Max-Forwards' -> <<16#9e>>;
+	'Pragma' -> <<16#9f>>;
+	'Proxy-Authenticate' -> <<16#a0>>;
+	'Proxy-Authorization' -> <<16#a1>>;
+	'Public' -> <<16#a2>>;
+	'Range' -> <<16#a3>>;
+	'Referer' -> <<16#a4>>;
+	'Retry-After' -> <<16#a5>>;
+	'Server' -> <<16#a6>>;
+	'Transfer-Encoding' -> <<16#a7>>;
+	'Upgrade' -> <<16#a8>>;
+	'User-Agent' -> <<16#a9>>;
+	'Vary' -> <<16#aa>>;
+	'Via' -> <<16#ab>>;
+	'Warning' -> <<16#ac>>;
+	'Www-Authenticate' -> <<16#ad>>;
+	'Content-Disposition' when Version >= ?WSP_14 -> <<16#c5>>;
+	'Content-Disposition' -> <<16#ae>>;
+	%% VERSION > 1.1
+	'X-Wap-Application-Id' when Version >= ?WSP_12 -> <<16#af>>;
+	'X-Wap-Content-Uri' when Version >= ?WSP_12 -> <<16#b0>>;
+	'X-Wap-Initiator-Uri' when Version >= ?WSP_12 -> <<16#b1>>;
+	'Accept-Application' when Version >= ?WSP_12 -> <<16#b2>>;
+	'Bearer-Indication' when Version >= ?WSP_12 -> <<16#b3>>;
+	'Push-Flag' when Version >= ?WSP_12 -> <<16#b4>>;
+	'Profile' when Version >= ?WSP_12 -> <<16#b5>>;
+	'Profile-Diff' when Version >= ?WSP_12 -> <<16#b6>>;
+	'Profile-Warning' when Version >= ?WSP_12 -> <<16#b7>>;
+	'Expect' when Version >= ?WSP_15 -> <<16#c8>>;
+	'Expect' when Version >= ?WSP_13 -> <<16#b8>>;
+	'Te' when Version >= ?WSP_13 -> <<16#b9>>;
+	'Trailer' when Version >= ?WSP_13 -> <<16#ba>>;
+	'X-Wap-Tod' when Version >= ?WSP_13 -> <<16#bf>>;
+	'Content-Id' when Version >= ?WSP_13 -> <<16#c0>>;
+	'Set-Cookie' when Version >= ?WSP_13 -> <<16#c1>>;
+	'Cookie' when Version >= ?WSP_13 -> <<16#c2>>;
+	'Encoding-Version' when Version >= ?WSP_13 -> <<16#c3>>;
+	'Profile-Warning' when Version >= ?WSP_14 -> <<16#c4>>;
+	'X-Wap-Security' when Version >= ?WSP_14 -> <<16#c6>>;
+	'X-Wap-Loc-Invocation' when Version >= ?WSP_15 -> <<16#c9>>;
+	'X-Wap-Loc-Delivery' when Version >= ?WSP_15 -> <<16#ca>>;
+	Field -> encode_text_string(atom_to_list(Field))
+    end.
+
+
+%%
+%% decode and normalise on form list_to_atom("Ulll-Ulll-Ull")
+%%
+normalise_field_name(Cs) when atom(Cs) ->
+    Cs;
+normalise_field_name(Cs) ->
+    list_to_atom(normalise_fieldU(Cs)).
+
+normalise_fieldU([C|Cs]) when C >= $a, C =< $z ->
+    [(C-$a)+$A | normalise_fieldL(Cs)];
+normalise_fieldU([C|Cs]) -> [ C | normalise_fieldL(Cs)];
+normalise_fieldU([]) -> [].
+
+normalise_fieldL([C|Cs]) when C >= $A, C =< $Z ->
+    [(C-$A)+$a | normalise_fieldL(Cs)];
+normalise_fieldL([$-|Cs]) ->  [$- | normalise_fieldU(Cs)];
+normalise_fieldL([C|Cs]) ->   [C | normalise_fieldL(Cs)];
+normalise_fieldL([]) ->  [].
+
+
+tolower([C|Cs]) when C >= $A, C =< $Z ->
+    [(C-$A)+$a | tolower(Cs)];
+tolower([C|Cs]) ->  [C|tolower(Cs)];
+tolower([]) -> [].
+
+trim(Cs) ->
+    lists:reverse(trim1(lists:reverse(trim1(Cs)))).
+
+trim1([$\s|Cs]) -> trim1(Cs);
+trim1([$\t|Cs]) -> trim1(Cs);
+trim1([$\r|Cs]) -> trim1(Cs);
+trim1([$\n|Cs]) -> trim1(Cs);
+trim1(Cs) -> Cs.
+
+
+d_field_name(Data) ->
+    case scan_header_data(Data) of
+	{Code, Data1} when integer(Code) ->
+	    {lookup_field_name(Code), Data1};
+	{TmpField,Data1} when list(TmpField) ->
+	    {normalise_field_name(TmpField), Data1}
+    end.
+
+d_no_value(<<0, Data/binary>>) ->
+    {no_value, Data}.
+
+e_no_value(_) ->
+    <<0>>.
+
+
+lookup_field_name(Code) ->
+    case Code of
+%%% Version 1.1
+	16#00 -> 'Accept';
+	16#01 -> 'Accept-Charset';
+	16#02 -> 'Accept-Encoding';
+	16#03 -> 'Accept-Language';
+	16#04 -> 'Accept-Ranges';
+	16#05 -> 'Age';
+	16#06 -> 'Allow';
+	16#07 -> 'Authorization';
+	16#08 -> 'Cache-Control';
+	16#09 -> 'Connection';
+	16#0a -> 'Content-Base';
+	16#0b -> 'Content-Encoding';
+	16#0c -> 'Content-Language';
+	16#0d -> 'Content-Length';
+	16#0e -> 'Content-Location';
+	16#0f -> 'Content-Md5';
+	16#10 -> 'Content-Range';
+	16#11 -> 'Content-Type';
+	16#12 -> 'Date';
+	16#13 -> 'Etag';
+	16#14 -> 'Expires';
+	16#15 -> 'From';
+	16#16 -> 'Host';
+	16#17 -> 'If-Modified-Since';
+	16#18 -> 'If-Match';
+	16#19 -> 'If-None-Match';
+	16#1a -> 'If-Range';
+	16#1b -> 'If-Unmodified-Since';
+	16#1c -> 'Location';
+	16#1d -> 'Last-Modified';
+	16#1e -> 'Max-Forwards';
+	16#1f -> 'Pragma';
+	16#20 -> 'Proxy-Authenticate';
+	16#21 -> 'Proxy-Authorization';
+	16#22 -> 'Public';
+	16#23 -> 'Range';
+	16#24 -> 'Referer';
+	16#25 -> 'Retry-After';
+	16#26 -> 'Server';
+	16#27 -> 'Transfer-Encoding';
+	16#28 -> 'Upgrade';
+	16#29 -> 'User-Agent';
+	16#2a -> 'Vary';
+	16#2b -> 'Via';
+	16#2c -> 'Warning';
+	16#2d -> 'Www-Authenticate';
+	16#2e -> 'Content-Disposition';
+%%% Version 1.2
+	16#2f -> 'X-Wap-Application-Id';
+	16#30 -> 'X-Wap-Content-Uri';
+	16#31 -> 'X-Wap-Initiator-Uri';
+	16#32 -> 'Accept-Application';
+	16#33 -> 'Bearer-Indication';
+	16#34 -> 'Push-Flag';
+	16#35 -> 'Profile';
+	16#36 -> 'Profile-Diff';
+	16#37 -> 'Profile-Warning';
+%%% Version 1.3
+	16#38 -> 'Expect';
+	16#39 -> 'Te';
+	16#3a -> 'Trailer';
+	16#3b -> 'Accept-Charset';
+	16#3c -> 'Accept-Encoding';
+	16#3d -> 'Cache-Control';
+	16#3e -> 'Content-Range';
+	16#3f -> 'X-Wap-Tod';
+	16#40 -> 'Content-Id';
+	16#41 -> 'Set-Cookie';
+	16#42 -> 'Cookie';
+	16#43 -> 'Encoding-Version';
+%%% Version 1.4
+	16#44 -> 'Profile-Warning';
+	16#45 -> 'Content-Disposition';
+	16#46 -> 'X-Wap-Security';
+	16#47 -> 'Cache-Control';
+%%% Version 1.5
+	16#48 -> 'Expect';
+	16#49 -> 'X-Wap-Loc-Invocation';
+	16#4a -> 'X-Wap-Loc-Delivery';
+%% Unknown
+	_ ->
+	    list_to_atom("X-Unknown-"++erlang:integer_to_list(Code, 16))
+    end.
+
+
+encode_charset(Charset) ->
+    %% FIXME: we should really resolve aliases as well
+    %% charset:from_aliases(Charset)
+    case charset:from_mime_name(Charset) of
+	0 -> exit({error, unknown_charset});
+	MIBenum	-> MIBenum
+    end.
+
+encode_language(Language) ->
+    Code = encode_lang(tolower(Language)),
+    <<Code>>.
+
+
+
+decode_charset(MIBenum) ->
+    case charset:to_mime_name(MIBenum) of
+	undefined ->
+	    exit({error, unknown_charset});
+	Preferred ->
+	    Preferred
+    end.
+
+%% ISO 639 Language Assignments, Appendix A, Table 41, Page 102-103
+decode_lang(Code) ->
+    case lookup_language(Code) of
+	[L|_] -> atom_to_list(L);
+	[] -> ""
+    end.
+
+
+lookup_language(Code) ->
+    case Code of
+	 16#01 -> ['aa','afar'];
+	 16#02 -> ['ab','abkhazian'];
+	 16#03 -> ['af','afrikans'];
+	 16#04 -> ['am','amharic'];
+	 16#05 -> ['ar','arabic'];
+	 16#06 -> ['as','assamese'];
+	 16#07 -> ['ay','aymara'];
+	 16#08 -> ['az','azerbaijani'];
+	 16#09 -> ['ba','bashkir'];
+	 16#0a -> ['be','byelorussian'];
+	 16#0b -> ['bg','bulgarian'];
+	 16#0c -> ['bh','bihari'];
+	 16#0d -> ['bi','bislama'];
+	 16#0e -> ['bn','bangla','bengali'];
+	 16#0f -> ['bo','tibetan'];
+	 16#10 -> ['br','breton'];
+	 16#11 -> ['ca','catalan'];
+	 16#12 -> ['co','corsican'];
+	 16#13 -> ['cs','czech'];
+	 16#14 -> ['cy','welsh'];
+	 16#15 -> ['da','danish'];
+	 16#16 -> ['de','german'];
+	 16#17 -> ['dz','bhutani'];
+	 16#18 -> ['el','greek'];
+	 16#19 -> ['en','english'];
+	 16#1a -> ['eo','esperanto'];
+	 16#1b -> ['es','spanish'];
+	 16#1c -> ['et','estonian'];
+	 16#1d -> ['eu','basque'];
+	 16#1e -> ['fa','persian'];
+	 16#1f -> ['fi','finnish'];
+	 16#20 -> ['fj','fiji'];
+	 16#82 -> ['fo','faeroese'];
+	 16#22 -> ['fr','french'];
+	 16#83 -> ['fy','frisian'];
+	 16#24 -> ['ga','irish'];
+	 16#25 -> ['gd','scots-gaelic'];
+	 16#26 -> ['gl','galician'];
+	 16#27 -> ['gn','guarani'];
+	 16#28 -> ['gu','gujarati'];
+	 16#29 -> ['ha','hausa'];
+	 16#2a -> ['he','hebrew'];
+	 16#2b -> ['hi','hindi'];
+	 16#2c -> ['hr','croatian'];
+	 16#2d -> ['hu','hungarian'];
+	 16#2e -> ['hy','armenian'];
+	 16#84 -> ['ia','interlingua'];
+	 16#30 -> ['id','indonesian'];
+	 16#86 -> ['ie','interlingue'];
+	 16#87 -> ['ik','inupiak'];
+	 16#33 -> ['is','icelandic'];
+	 16#34 -> ['it','italian'];
+	 16#89 -> ['iu','inuktitut'];
+	 16#36 -> ['ja','japanese'];
+	 16#37 -> ['jw','javanese'];
+	 16#38 -> ['ka','georgian'];
+	 16#39 -> ['kk','kazakh'];
+	 16#8a -> ['kl','greenlandic'];
+	 16#3b -> ['km','cambodian'];
+	 16#3c -> ['kn','kannada'];
+	 16#3d -> ['ko','korean'];
+	 16#3e -> ['ks','kashmiri'];
+	 16#3f -> ['ku','kurdish'];
+	 16#40 -> ['ky','kirghiz'];
+	 16#8b -> ['la','latin'];
+	 16#42 -> ['ln','lingala'];
+	 16#43 -> ['lo','laothian'];
+	 16#44 -> ['lt','lithuanian'];
+	 16#45 -> ['lv','lettish','latvian'];
+	 16#46 -> ['mg','malagese'];
+	 16#47 -> ['mi','maori'];
+	 16#48 -> ['mk','macedonian'];
+	 16#49 -> ['ml','malayalam'];
+	 16#4a -> ['mn','mongolian'];
+	 16#4b -> ['mo','moldavian'];
+	 16#4c -> ['mr','marathi'];
+	 16#4d -> ['ms','malay'];
+	 16#4e -> ['mt','maltese'];
+	 16#4f -> ['my','burmese'];
+	 16#81 -> ['na','nauru'];
+	 16#51 -> ['ne','nepali'];
+	 16#52 -> ['nl','dutch'];
+	 16#53 -> ['no','norwegian'];
+	 16#54 -> ['oc','occitan'];
+	 16#55 -> ['om','oromo'];
+	 16#56 -> ['or','oriya'];
+	 16#57 -> ['pa','punjabi'];
+	 16#58 -> ['po','polish'];
+	 16#59 -> ['ps','pushto','pashto'];
+	 16#5a -> ['pt','portugese'];
+	 16#5b -> ['qu','quechua'];
+	 16#8c -> ['rm','rhaeto-romance'];
+	 16#5d -> ['rn','kirundi'];
+	 16#5e -> ['ro','romanian'];
+	 16#5f -> ['ru','russian'];
+	 16#60 -> ['rw','kinyarwanda'];
+	 16#61 -> ['sa','sanskrit'];
+	 16#62 -> ['sd','sindhi'];
+	 16#63 -> ['sg','sangho'];
+	 16#64 -> ['sh','serbo-croatian'];
+	 16#65 -> ['si','sinhalese'];
+	 16#66 -> ['sk','slovak'];
+	 16#67 -> ['sl','slovenian'];
+	 16#68 -> ['sm','samoan'];
+	 16#69 -> ['sn','shona'];
+	 16#6a -> ['so','somali'];
+	 16#6b -> ['sq','albanian'];
+	 16#6c -> ['sr','serbian'];
+	 16#6d -> ['ss','siswati'];
+	 16#6e -> ['st','seshoto'];
+	 16#6f -> ['su','sundanese'];
+	 16#70 -> ['sv','swedish'];
+	 16#71 -> ['sw','swahili'];
+	 16#72 -> ['ta','tamil'];
+	 16#73 -> ['te','telugu'];
+	 16#74 -> ['tg','tajik'];
+	 16#75 -> ['th','thai'];
+	 16#76 -> ['ti','tigrinya'];
+	 16#77 -> ['tk','turkmen'];
+	 16#78 -> ['tl','tagalog'];
+	 16#79 -> ['tn','setswana'];
+	 16#7a -> ['to','tonga'];
+	 16#7b -> ['tr','turkish'];
+	 16#7c -> ['ts','tsonga'];
+	 16#7d -> ['tt','tatar'];
+	 16#7e -> ['tw','twi'];
+	 16#7f -> ['ug','uighur'];
+	 16#50 -> ['uk','ukrainian'];
+	 16#21 -> ['ur','urdu'];
+	 16#23 -> ['uz','uzbek'];
+	 16#2f -> ['vi','vietnamese'];
+	 16#85 -> ['vo','volapuk'];
+	 16#31 -> ['wo','wolof'];
+	 16#32 -> ['xh','xhosa'];
+	 16#88 -> ['yi','yiddish'];
+	 16#35 -> ['yo','yoruba'];
+	 16#3a -> ['za','zhuang'];
+	 16#41 -> ['zh','chinese'];
+	16#5c -> ['zu','zulu'];
+	_ -> []
+    end.
+
+encode_lang(Language) ->
+    case tolower(Language) of
+	"aa" -> 16#01;
+	"afar" -> 16#01;
+	"ab" -> 16#02;
+	"abkhazian" -> 16#02;
+	"af" -> 16#03;
+	"afrikans" -> 16#03;
+	"am" -> 16#04;
+	"amharic" -> 16#04;
+	"ar" -> 16#05;
+	"arabic" -> 16#05;
+	"as" -> 16#06;
+	"assamese" -> 16#06;
+	"ay" -> 16#07;
+	"aymara" -> 16#07;
+	"az" -> 16#08;
+	"azerbaijani" -> 16#08;
+	"ba" -> 16#09;
+	"bashkir" -> 16#09;
+	"be" -> 16#0a;
+	"byelorussian" -> 16#0a;
+	"bg" -> 16#0b;
+	"bulgarian" -> 16#0b;
+	"bh" -> 16#0c;
+	"bihari" -> 16#0c;
+	"bi" -> 16#0d;
+	"bislama" -> 16#0d;
+	"bn" -> 16#0e;
+	"bangla" -> 16#0e;
+	"bengali" -> 16#0e;
+	"bo" -> 16#0f;
+	"tibetan" -> 16#0f;
+	"br" -> 16#10;
+	"breton" -> 16#10;
+	"ca" -> 16#11;
+	"catalan" -> 16#11;
+	"co" -> 16#12;
+	"corsican" -> 16#12;
+	"cs" -> 16#13;
+	"czech" -> 16#13;
+	"cy" -> 16#14;
+	"welsh" -> 16#14;
+	"da" -> 16#15;
+	"danish" -> 16#15;
+	"de" -> 16#16;
+	"german" -> 16#16;
+	"dz" -> 16#17;
+	"bhutani" -> 16#17;
+	"el" -> 16#18;
+	"greek" -> 16#18;
+	"en" -> 16#19;
+	"english" -> 16#19;
+	"eo" -> 16#1a;
+	"esperanto" -> 16#1a;
+	"es" -> 16#1b;
+	"spanish" -> 16#1b;
+	"et" -> 16#1c;
+	"estonian" -> 16#1c;
+	"eu" -> 16#1d;
+	"basque" -> 16#1d;
+	"fa" -> 16#1e;
+	"persian" -> 16#1e;
+	"fi" -> 16#1f;
+	"finnish" -> 16#1f;
+	"fj" -> 16#20;
+	"fiji" -> 16#20;
+	"fo" -> 16#82;
+	"faeroese" -> 16#82;
+	"fr" -> 16#22;
+	"french" -> 16#22;
+	"fy" -> 16#83;
+	"frisian" -> 16#83;
+	"ga" -> 16#24;
+	"irish" -> 16#24;
+	"gd" -> 16#25;
+	"scots-gaelic" -> 16#25;
+	"gl" -> 16#26;
+	"galician" -> 16#26;
+	"gn" -> 16#27;
+	"guarani" -> 16#27;
+	"gu" -> 16#28;
+	"gujarati" -> 16#28;
+	"ha" -> 16#29;
+	"hausa" -> 16#29;
+	"he" -> 16#2a;
+	"hebrew" -> 16#2a;
+	"hi" -> 16#2b;
+	"hindi" -> 16#2b;
+	"hr" -> 16#2c;
+	"croatian" -> 16#2c;
+	"hu" -> 16#2d;
+	"hungarian" -> 16#2d;
+	"hy" -> 16#2e;
+	"armenian" -> 16#2e;
+	"ia" -> 16#84;
+	"interlingua" -> 16#84;
+	"id" -> 16#30;
+	"indonesian" -> 16#30;
+	"ie" -> 16#86;
+	"interlingue" -> 16#86;
+	"ik" -> 16#87;
+	"inupiak" -> 16#87;
+	"is" -> 16#33;
+	"icelandic" -> 16#33;
+	"it" -> 16#34;
+	"italian" -> 16#34;
+	"iu" -> 16#89;
+	"inuktitut" -> 16#89;
+	"ja" -> 16#36;
+	"japanese" -> 16#36;
+	"jw" -> 16#37;
+	"javanese" -> 16#37;
+	"ka" -> 16#38;
+	"georgian" -> 16#38;
+	"kk" -> 16#39;
+	"kazakh" -> 16#39;
+	"kl" -> 16#8a;
+	"greenlandic" -> 16#8a;
+	"km" -> 16#3b;
+	"cambodian" -> 16#3b;
+	"kn" -> 16#3c;
+	"kannada" -> 16#3c;
+	"ko" -> 16#3d;
+	"korean" -> 16#3d;
+	"ks" -> 16#3e;
+	"kashmiri" -> 16#3e;
+	"ku" -> 16#3f;
+	"kurdish" -> 16#3f;
+	"ky" -> 16#40;
+	"kirghiz" -> 16#40;
+	"la" -> 16#8b;
+	"latin" -> 16#8b;
+	"ln" -> 16#42;
+	"lingala" -> 16#42;
+	"lo" -> 16#43;
+	"laothian" -> 16#43;
+	"lt" -> 16#44;
+	"lithuanian" -> 16#44;
+	"lv" -> 16#45;
+	"lettish" -> 16#45;
+	"latvian" -> 16#45;
+	"mg" -> 16#46;
+	"malagese" -> 16#46;
+	"mi" -> 16#47;
+	"maori" -> 16#47;
+	"mk" -> 16#48;
+	"macedonian" -> 16#48;
+	"ml" -> 16#49;
+	"malayalam" -> 16#49;
+	"mn" -> 16#4a;
+	"mongolian" -> 16#4a;
+	"mo" -> 16#4b;
+	"moldavian" -> 16#4b;
+	"mr" -> 16#4c;
+	"marathi" -> 16#4c;
+	"ms" -> 16#4d;
+	"malay" -> 16#4d;
+	"mt" -> 16#4e;
+	"maltese" -> 16#4e;
+	"my" -> 16#4f;
+	"burmese" -> 16#4f;
+	"na" -> 16#81;
+	"nauru" -> 16#81;
+	"ne" -> 16#51;
+	"nepali" -> 16#51;
+	"nl" -> 16#52;
+	"dutch" -> 16#52;
+	"no" -> 16#53;
+	"norwegian" -> 16#53;
+	"oc" -> 16#54;
+	"occitan" -> 16#54;
+	"om" -> 16#55;
+	"oromo" -> 16#55;
+	"or" -> 16#56;
+	"oriya" -> 16#56;
+	"pa" -> 16#57;
+	"punjabi" -> 16#57;
+	"po" -> 16#58;
+	"polish" -> 16#58;
+	"ps" -> 16#59;
+	"pushto" -> 16#59;
+	"pt" -> 16#5a;
+	"portugese" -> 16#5a;
+	"qu" -> 16#5b;
+	"quechua" -> 16#5b;
+	"rm" -> 16#8c;
+	"rhaeto-romance" -> 16#8c;
+	"rn" -> 16#5d;
+	"kirundi" -> 16#5d;
+	"ro" -> 16#5e;
+	"romanian" -> 16#5e;
+	"ru" -> 16#5f;
+	"russian" -> 16#5f;
+	"rw" -> 16#60;
+	"kinyarwanda" -> 16#60;
+	"sa" -> 16#61;
+	"sanskrit" -> 16#61;
+	"sd" -> 16#62;
+	"sindhi" -> 16#62;
+	"sg" -> 16#63;
+	"sangho" -> 16#63;
+	"sh" -> 16#64;
+	"serbo-croatian" -> 16#64;
+	"si" -> 16#65;
+	"sinhalese" -> 16#65;
+	"sk" -> 16#66;
+	"slovak" -> 16#66;
+	"sl" -> 16#67;
+	"slovenian" -> 16#67;
+	"sm" -> 16#68;
+	"samoan" -> 16#68;
+	"sn" -> 16#69;
+	"shona" -> 16#69;
+	"so" -> 16#6a;
+	"somali" -> 16#6a;
+	"sq" -> 16#6b;
+	"albanian" -> 16#6b;
+	"sr" -> 16#6c;
+	"serbian" -> 16#6c;
+	"ss" -> 16#6d;
+	"siswati" -> 16#6d;
+	"st" -> 16#6e;
+	"seshoto" -> 16#6e;
+	"su" -> 16#6f;
+	"sundanese" -> 16#6f;
+	"sv" -> 16#70;
+	"swedish" -> 16#70;
+	"sw" -> 16#71;
+	"swahili" -> 16#71;
+	"ta" -> 16#72;
+	"tamil" -> 16#72;
+	"te" -> 16#73;
+	"telugu" -> 16#73;
+	"tg" -> 16#74;
+	"tajik" -> 16#74;
+	"th" -> 16#75;
+	"thai" -> 16#75;
+	"ti" -> 16#76;
+	"tigrinya" -> 16#76;
+	"tk" -> 16#77;
+	"turkmen" -> 16#77;
+	"tl" -> 16#78;
+	"tagalog" -> 16#78;
+	"tn" -> 16#79;
+	"setswana" -> 16#79;
+	"to" -> 16#7a;
+	"tonga" -> 16#7a;
+	"tr" -> 16#7b;
+	"turkish" -> 16#7b;
+	"ts" -> 16#7c;
+	"tsonga" -> 16#7c;
+	"tt" -> 16#7d;
+	"tatar" -> 16#7d;
+	"tw" -> 16#7e;
+	"twi" -> 16#7e;
+	"ug" -> 16#7f;
+	"uighur" -> 16#7f;
+	"uk" -> 16#50;
+	"ukrainian" -> 16#50;
+	"ur" -> 16#21;
+	"urdu" -> 16#21;
+	"uz" -> 16#23;
+	"uzbek" -> 16#23;
+	"vi" -> 16#2f;
+	"vietnamese" -> 16#2f;
+	"vo" -> 16#85;
+	"volapuk" -> 16#85;
+	"wo" -> 16#31;
+	"wolof" -> 16#31;
+	"xh" -> 16#32;
+	"xhosa" -> 16#32;
+	"yi" -> 16#88;
+	"yiddish" -> 16#88;
+	"yo" -> 16#35;
+	"yoruba" -> 16#35;
+	"za" -> 16#3a;
+	"zhuang" -> 16#3a;
+	"zh" -> 16#41;
+	"chinese" -> 16#41;
+	"zu" -> 16#5c;
+	"zulu" -> 16#5c
+    end.
+
+
+%% Push Application ID Assignments
+%%
+%% Assingment are found at http://www.wapforum.org/wina/push-app-id.htm
+%%
+decode_push_application({short,Data}) ->
+    decode_push_application(d_long(Data));
+
+decode_push_application(Code) when integer(Code) ->
+    case Code of
+	16#00 ->    "x-wap-application:*";
+	16#01 ->    "x-wap-application:push.sia";
+	16#02 ->    "x-wap-application:wml.ua";
+	16#03 ->    "x-wap-application:wta.ua";
+	16#04 ->    "x-wap-application:mms.ua";
+	16#05 ->    "x-wap-application:push.syncml";
+	16#06 ->    "x-wap-application:loc.ua";
+	16#07 ->    "x-wap-application:syncml.dm";
+	16#08 ->    "x-wap-application:drm.ua";
+	16#09 ->    "x-wap-application:emn.ua";
+	16#0A ->    "x-wap-application:wv.ua";
+	16#8000 ->  "x-wap-microsoft:localcontent.ua";
+	16#8001 ->  "x-wap-microsoft:IMclient.ua";
+	16#8002 ->  "x-wap-docomo:imode.mail.ua";
+	16#8003 ->  "x-wap-docomo:imode.mr.ua";
+	16#8004 ->  "x-wap-docomo:imode.mf.ua";
+	16#8005 ->  "x-motorola:location.ua";
+	16#8006 ->  "x-motorola:now.ua";
+	16#8007 ->  "x-motorola:otaprov.ua";
+	16#8008 ->  "x-motorola:browser.ua";
+	16#8009 ->  "x-motorola:splash.ua";
+	16#800B ->  "x-wap-nai:mvsw.command";
+	16#8010 ->  "x-wap-openwave:iota.ua"
+    end;
+decode_push_application(App) when list(App) ->
+    App.
+
+
+
+encode_push_application(App) ->
+    case App of
+	"x-wap-application:*" -> ?ENCODE_SHORT(16#00);
+	"x-wap-application:push.sia" -> ?ENCODE_SHORT(16#01);
+	"x-wap-application:wml.ua" -> ?ENCODE_SHORT(16#02);
+	"x-wap-application:wta.ua" -> ?ENCODE_SHORT(16#03);
+	"x-wap-application:mms.ua" -> ?ENCODE_SHORT(16#04);
+	"x-wap-application:push.syncml" -> ?ENCODE_SHORT(16#05);
+	"x-wap-application:loc.ua" -> ?ENCODE_SHORT(16#06);
+	"x-wap-application:syncml.dm" -> ?ENCODE_SHORT(16#07);
+	"x-wap-application:drm.ua" -> ?ENCODE_SHORT(16#08);
+	"x-wap-application:emn.ua" -> ?ENCODE_SHORT(16#09);
+	"x-wap-application:wv.ua" -> ?ENCODE_SHORT(16#0A);
+	"x-wap-microsoft:localcontent.ua" -> encode_integer(16#8000);
+	"x-wap-microsoft:IMclient.ua" -> encode_integer(16#8001);
+	"x-wap-docomo:imode.mail.ua" -> encode_integer(16#8002);
+	"x-wap-docomo:imode.mr.ua" -> encode_integer(16#8003);
+	"x-wap-docomo:imode.mf.ua" -> encode_integer(16#8004);
+	"x-motorola:location.ua" -> encode_integer(16#8005);
+	"x-motorola:now.ua" -> encode_integer(16#8006);
+	"x-motorola:otaprov.ua" -> encode_integer(16#8007);
+	"x-motorola:browser.ua" -> encode_integer(16#8008);
+	"x-motorola:splash.ua" -> encode_integer(16#8009);
+	"x-wap-nai:mvsw.command" -> encode_integer(16#800B);
+	"x-wap-openwave:iota.ua" -> encode_integer(16#8010);
+	_ -> encode_uri_value(App)
+    end.
+
+
+
+
+%% WSP 8.5 Multipart handling
+
+encode_multipart(Entries) ->
+    encode_multipart(Entries, ?WSP_DEFAULT_VERSION).
+
+encode_multipart([], _Version) ->
+    <<>>;
+encode_multipart(Entries, Version) ->
+    EncEntries = encode_multipart_entries(Entries, Version),
+    <<(e_uintvar(length(Entries)))/binary, EncEntries/binary >>.
+
+encode_multipart_entries(Entries, Version) ->
+    encode_multipart_entries(Entries, Version, []).
+
+encode_multipart_entries([], _Version, Acc) ->
+    list_to_binary(lists:reverse(Acc));
+encode_multipart_entries([Entry|T], Version, Acc) ->
+    EncEntry = encode_multipart_entry(Entry, Version),
+    encode_multipart_entries(T, Version, [EncEntry | Acc]).
+
+encode_multipart_entry(Entry, Version) ->
+    #wsp_multipart_entry { content_type = ContentType,
+			   headers = Headers,
+			   data = Data } = Entry,
+    EncContentType = encode_content_type(ContentType,Version),
+    EncHeaders = encode_headers(Headers, Version),
+    EncHeadersLength = e_uintvar(size(EncContentType)+size(EncHeaders)),
+    DataLen = e_uintvar(size(Data)),
+    <<EncHeadersLength/binary,
+     DataLen/binary,
+     EncContentType/binary,
+     EncHeaders/binary,
+     Data/binary>>.
+
+
+decode_multipart(Data) ->
+    decode_multipart(Data, ?WSP_DEFAULT_VERSION).
+
+decode_multipart(<<>>, _Version) ->
+    {[], <<>>};
+decode_multipart(Data, Version) ->
+    {Entries, Data1} = d_uintvar(Data),
+    decode_multipart_entries(Entries, Data1, Version).
+
+decode_multipart_entries(Entries, Data, Version) ->
+    decode_multipart_entries(Entries, Data, Version, []).
+
+decode_multipart_entries(0, Data, _Version, Acc) ->
+    {lists:reverse(Acc), Data};
+decode_multipart_entries(Entries, Data, Version, Acc) ->
+    {MultiPartEntry, Data1} = decode_multipart_entry(Data,Version),
+    decode_multipart_entries(Entries-1, Data1, Version, [MultiPartEntry|Acc]).
+
+decode_multipart_entry(Data, Version) ->
+    {HeadersLen, Data1} = d_uintvar(Data),
+    {DataLen, Data2} = d_uintvar(Data1),
+    {FieldData,Data3} = scan_header_data(Data2),
+    ContentType = decode_content_type(FieldData, Version),
+    BinHeadersLen = (HeadersLen-(size(Data2)-size(Data3))),
+    <<BinHeaders:BinHeadersLen/binary,Data4/binary>> = Data3,
+    Headers = decode_headers(BinHeaders, Version),
+    <<ValueData:DataLen/binary, Data5/binary>> = Data4,
+    {#wsp_multipart_entry{content_type=ContentType,
+			  headers=Headers,
+			  data=ValueData},Data5}.
+
+
+parse_credentials(Field, Value) ->
+    %% FIXME
+    ?WH(Field, Value, []).
+
+format_credentials("basic", [User,Password]) ->
+    ["Basic ", base64:encode(User++":"++Password)];
+format_credentials(Scheme, Params) ->
+    [Scheme, format_params(Params)].
+
+encode_credentials("basic", [User,Password], _Version) ->
+    e_value(?ENCODE_SHORT(0),
+	    encode_text_string(User),
+	    encode_text_string(Password));
+encode_credentials(Scheme, Params, Version) ->
+    e_value(encode_text_string(Scheme), encode_params(Params, Version)).
+
+decode_credentials(Field, Data, Version) ->
+    case scan_header_data(Data) of
+	{0, Data0} ->
+	    {User,Data1} = d_text_string(Data0),
+	    {Password,_Data2} = d_text_string(Data1),
+	    ?WH(Field, "basic", [User,Password]);
+	{Scheme, Data0} when list(Scheme) ->
+	    Params = decode_params(Data0, Version),
+	    ?WH(Field, Scheme, Params)
+    end.
+
+%%
+%% Challenge: Basic Realm-value | Auth-Scheme Realm *Auth-Params
+%%
+
+parse_challenge(Field, Value) ->
+    %% FIXME
+    ?WH(Field, Value, []).
+
+format_challenge({"basic",Realm}, []) ->
+    ["Basic ", Realm];
+format_challenge({Scheme,Realm}, Params) ->
+    [Scheme," ",Realm, format_params(Params)].
+
+encode_challenge({"basic",Realm}, [], _Version) ->
+    e_value(?ENCODE_SHORT(0),
+	    encode_text_string(Realm));
+encode_challenge({Scheme,Realm}, Params, Version) ->
+    e_value(encode_text_string(Scheme),
+	    encode_text_string(Realm),
+	    encode_params(Params, Version)).
+
+decode_challenge(Field, Data, Version) ->
+    case scan_header_data(Data) of
+	{0, Data0} ->
+	    {Realm,_} = d_text_string(Data0),
+	    ?WH(Field, {"basic", Realm}, []);
+	{Scheme, Data0} when list(Scheme) ->
+	    {Realm,_} = d_text_string(Data0),
+	    Params = decode_params(Data0, Version),
+	    ?WH(Field, {Scheme,Realm}, Params)
+    end.
+
+
+parse_well_known_method(Value) ->
+    case Value of
+	"GET" ->  'GET';
+	"OPTIONS" -> 'OPTIONS';
+	"HEAD" -> 'HEAD';
+	"DELETE" -> 'DELETE';
+	"TRACE" -> 'TRACE';
+	"POST" -> 'POST';
+	"PUT" -> 'PUT'
+    end.
+
+encode_well_known_method(Value, _Version) ->
+    case Value of
+	'GET'     -> ?ENCODE_SHORT(16#40);
+	'OPTIONS' -> ?ENCODE_SHORT(16#41);
+	'HEAD'    -> ?ENCODE_SHORT(16#42);
+	'DELETE'  -> ?ENCODE_SHORT(16#43);
+	'TRACE'   -> ?ENCODE_SHORT(16#44);
+	'POST'    -> ?ENCODE_SHORT(16#60);
+	'PUT'     -> ?ENCODE_SHORT(16#61)
+    end.
+
+decode_well_known_method(Value, _Version) ->
+    case Value of
+	16#40 -> 'GET';
+	16#41 -> 'OPTIONS';
+	16#42 -> 'HEAD';
+	16#43 -> 'DELETE';
+	16#44 -> 'TRACE';
+	16#60 -> 'POST';
+	16#61 -> 'PUT'
+    end.
+
+
+
+%%
+%% WSP Table 36. Status Code Assignments
+%%
+
+encode_status_code(Status) ->
+    case Status of
+	100 -> 16#10; %% 'Continue'
+	101 -> 16#11; %% 'Switching Protocols'
+	200 -> 16#20; %% 'OK, Success'
+	201 -> 16#21; %% 'Created'
+	202 -> 16#22; %% 'Accepted'
+	203 -> 16#23; %% 'Non-Authoritative Information'
+	204 -> 16#24; %% 'No Content'
+	205 -> 16#25; %% 'Reset Content'
+	206 -> 16#26; %% 'Partial Content'
+	300 -> 16#30; %% 'Multiple Choices'
+	301 -> 16#31; %% 'Moved Permanently'
+	302 -> 16#32; %% 'Moved temporarily'
+	303 -> 16#33; %% 'See Other'
+	304 -> 16#34; %% 'Not modified'
+	305 -> 16#35; %% 'Use Proxy'
+	306 -> 16#36; %% '(reserved)'
+	307 -> 16#37; %% 'Temporary Redirect'
+	400 -> 16#40; %% 'Bad Request - server could not understand request'
+	401 -> 16#41; %% 'Unauthorized'
+	402 -> 16#42; %% 'Payment required'
+	403 -> 16#43; %% 'Forbidden operation is understood but refused'
+	404 -> 16#44; %% 'Not Found'
+	405 -> 16#45; %% 'Method not allowed'
+	406 -> 16#46; %% 'Not Acceptable'
+	407 -> 16#47; %% 'Proxy Authentication required'
+	408 -> 16#48; %% 'Request Timeout'
+	409 -> 16#49; %% 'Conflict'
+	410 -> 16#4A; %% 'Gone'
+	411 -> 16#4B; %% 'Length Required'
+	412 -> 16#4C; %% 'Precondition failed'
+	413 -> 16#4D; %% 'Request entity too large'
+	414 -> 16#4E; %% 'Request-URI too large'
+	415 -> 16#4F; %% 'Unsupported media type'
+	416 -> 16#50; %% 'Requested Range Not Satisfiable'
+	417 -> 16#51; %% 'Expectation Failed'
+	500 -> 16#60; %% 'Internal Server Error'
+	501 -> 16#61; %% 'Not Implemented'
+	502 -> 16#62; %% 'Bad Gateway'
+	503 -> 16#63; %% 'Service Unavailable'
+	504 -> 16#64; %% 'Gateway Timeout'
+	505 -> 16#65  %% 'HTTP version not supported'
+    end.
+
+
+decode_status_code(StatusCode) ->
+    case StatusCode of
+	16#10 -> 100; %% 'Continue'
+	16#11 -> 101; %% 'Switching Protocols'
+	16#20 -> 200; %% 'OK, Success'
+	16#21 -> 201; %% 'Created'
+	16#22 -> 202; %% 'Accepted'
+	16#23 -> 203; %% 'Non-Authoritative Information'
+	16#24 -> 204; %% 'No Content'
+	16#25 -> 205; %% 'Reset Content'
+	16#26 -> 206; %% 'Partial Content'
+	16#30 -> 300; %% 'Multiple Choices'
+	16#31 -> 301; %% 'Moved Permanently'
+	16#32 -> 302; %% 'Moved temporarily'
+	16#33 -> 303; %% 'See Other'
+	16#34 -> 304; %% 'Not modified'
+	16#35 -> 305; %% 'Use Proxy'
+	16#36 -> 306; %% '(reserved)'
+	16#37 -> 307; %% 'Temporary Redirect'
+	16#40 -> 400; %% 'Bad Request - server could not understand request'
+	16#41 -> 401; %% 'Unauthorized'
+	16#42 -> 402; %% 'Payment required'
+	16#43 -> 403; %% 'Forbidden operation is understood but refused'
+	16#44 -> 404; %% 'Not Found'
+	16#45 -> 405; %% 'Method not allowed'
+	16#46 -> 406; %% 'Not Acceptable'
+	16#47 -> 407; %% 'Proxy Authentication required'
+	16#48 -> 408; %% 'Request Timeout'
+	16#49 -> 409; %% 'Conflict'
+	16#4A -> 410; %% 'Gone'
+	16#4B -> 411; %% 'Length Required'
+	16#4C -> 412; %% 'Precondition failed'
+	16#4D -> 413; %% 'Request entity too large'
+	16#4E -> 414; %% 'Request-URI too large'
+	16#4F -> 415; %% 'Unsupported media type'
+	16#50 -> 416; %% 'Requested Range Not Satisfiable'
+	16#51 -> 417; %% 'Expectation Failed'
+	16#60 -> 500; %% 'Internal Server Error'
+	16#61 -> 501; %% 'Not Implemented'
+	16#62 -> 502; %% 'Bad Gateway'
+	16#63 -> 503; %% 'Service Unavailable'
+	16#64 -> 504; %% 'Gateway Timeout'
+	16#65 -> 505  %% 'HTTP version not supported'
+    end.
+
+
+%%
+%% Content Type Assignments
+%%
+%% Assingment are found at http://www.wapforum.org/wina/wsp-content-type.htm
+%%
+%%
+%% string(Version, ContentType) -> Code
+%%
+encode_well_known_media(ContentType, Version) ->
+    case ContentType of
+	%% WSP_REGISTERED_CONTENT_TYPES
+	"application/vnd.uplanet.cacheop-wbxml" ->
+	    encode_integer(16#0201);
+	"application/vnd.uplanet.signal" ->
+	    encode_integer(16#0202);
+	"application/vnd.uplanet.alert-wbxml" ->
+	    encode_integer(16#0203);
+	"application/vnd.uplanet.list-wbxml" ->
+	    encode_integer(16#0204);
+	"application/vnd.uplanet.listcmd-wbxml" ->
+	    encode_integer(16#0205);
+	"application/vnd.uplanet.channel-wbxml" ->
+	    encode_integer(16#0206);
+	"application/vnd.uplanet.provisioning-status-uri" ->
+	    encode_integer(16#0207);
+	"x-wap.multipart/vnd.uplanet.header-set" ->
+	    encode_integer(16#0208);
+	"application/vnd.uplanet.bearer-choice-wbxml" ->
+	    encode_integer(16#0209);
+	"application/vnd.phonecom.mmc-wbxml" ->
+	    encode_integer(16#020A);
+	"application/vnd.nokia.syncset+wbxml" ->
+	    encode_integer(16#020B);
+	"image/x-up-wpng" ->
+	    encode_integer(16#020C);
+	_ ->
+	    encode_constrained_media(ContentType, Version)
+    end.
+
+
+encode_constrained_media(ContentType, Version) ->
+    case ContentType of
+	"*/*"    -> ?ENCODE_SHORT(16#00);
+	"text/*" -> ?ENCODE_SHORT(16#01);
+	"text/html" -> ?ENCODE_SHORT(16#02);
+	"text/plain" -> ?ENCODE_SHORT(16#03);
+	"text/x-hdml" -> ?ENCODE_SHORT(16#04);
+	"text/x-ttml" -> ?ENCODE_SHORT(16#05);
+	"text/x-vcalendar" -> ?ENCODE_SHORT(16#06);
+	"text/x-vcard" -> ?ENCODE_SHORT(16#07);
+	"text/vnd.wap.wml" -> ?ENCODE_SHORT(16#08);
+	"text/vnd.wap.wmlscript" -> ?ENCODE_SHORT(16#09);
+	"text/vnd.wap.wta-event" -> ?ENCODE_SHORT(16#0A);
+	"multipart/*" -> ?ENCODE_SHORT(16#0B);
+	"multipart/mixed" -> ?ENCODE_SHORT(16#0C);
+	"multipart/form-data" -> ?ENCODE_SHORT(16#0D);
+	"multipart/byterantes" -> ?ENCODE_SHORT(16#0E);
+	"multipart/alternative" -> ?ENCODE_SHORT(16#0F);
+	"application/*" -> ?ENCODE_SHORT(16#10);
+	"application/java-vm" -> ?ENCODE_SHORT(16#11);
+	"application/x-www-form-urlencoded" -> ?ENCODE_SHORT(16#12);
+	"application/x-hdmlc" -> ?ENCODE_SHORT(16#13);
+	"application/vnd.wap.wmlc" -> ?ENCODE_SHORT(16#14);
+	"application/vnd.wap.wmlscriptc" -> ?ENCODE_SHORT(16#15);
+	"application/vnd.wap.wta-eventc" -> ?ENCODE_SHORT(16#16);
+	"application/vnd.wap.uaprof" -> ?ENCODE_SHORT(16#17);
+	"application/vnd.wap.wtls-ca-certificate" -> ?ENCODE_SHORT(16#18);
+	"application/vnd.wap.wtls-user-certificate" -> ?ENCODE_SHORT(16#19);
+	"application/x-x509-ca-cert" -> ?ENCODE_SHORT(16#1A);
+	"application/x-x509-user-cert" -> ?ENCODE_SHORT(16#1B);
+	"image/*" -> ?ENCODE_SHORT(16#1C);
+	"image/gif" -> ?ENCODE_SHORT(16#1D);
+	"image/jpeg" -> ?ENCODE_SHORT(16#1E);
+	"image/tiff" -> ?ENCODE_SHORT(16#1F);
+	"image/png" -> ?ENCODE_SHORT(16#20);
+	"image/vnd.wap.wbmp" -> ?ENCODE_SHORT(16#21);
+	"application/vnd.wap.multipart.*" -> ?ENCODE_SHORT(16#22);
+	"application/vnd.wap.multipart.mixed" -> ?ENCODE_SHORT(16#23);
+	"application/vnd.wap.multipart.form-data" -> ?ENCODE_SHORT(16#24);
+	"application/vnd.wap.multipart.byteranges" -> ?ENCODE_SHORT(16#25);
+	"application/vnd.wap.multipart.alternative" -> ?ENCODE_SHORT(16#26);
+	"application/xml" -> ?ENCODE_SHORT(16#27);
+	"text/xml" -> ?ENCODE_SHORT(16#28);
+	"application/vnd.wap.wbxml" -> ?ENCODE_SHORT(16#29);
+	"application/x-x968-cross-cert" -> ?ENCODE_SHORT(16#2A);
+	"application/x-x968-ca-cert" -> ?ENCODE_SHORT(16#2B);
+	"application/x-x968-user-cert" -> ?ENCODE_SHORT(16#2C);
+
+	%% WAP Version 1.2
+	"text/vnd.wap.si" when Version >= ?WSP_12 ->
+	    ?ENCODE_SHORT(16#2D);
+	"application/vnd.wap.sic" when Version >= ?WSP_12 ->
+	    ?ENCODE_SHORT(16#2E);
+	"text/vnd.wap.sl" when Version >= ?WSP_12 ->
+	    ?ENCODE_SHORT(16#2F);
+	"application/vnd.wap.slc" when Version >= ?WSP_12 ->
+	    ?ENCODE_SHORT(16#30);
+	"text/vnd.wap.co" when Version >= ?WSP_12 ->
+	    ?ENCODE_SHORT(16#31);
+	"application/vnd.wap.coc" when Version >= ?WSP_12 ->
+	    ?ENCODE_SHORT(16#32);
+	"application/vnd.wap.multipart.related" when Version >= ?WSP_12 ->
+	    ?ENCODE_SHORT(16#33);
+	"application/vnd.wap.sia" when Version >= ?WSP_12 ->
+	    ?ENCODE_SHORT(16#34);
+	%% WAP Version 1.3
+	"text/vnd.wap.connectivity-xml" when Version >= ?WSP_13 ->
+	    ?ENCODE_SHORT(16#35);
+	"application/vnd.wap.connectivity-wbxml" when Version >= ?WSP_13 ->
+	    ?ENCODE_SHORT(16#36);
+	%% WAP Version 1.4
+	"application/pkcs7-mime" when Version >= ?WSP_14 ->
+	    ?ENCODE_SHORT(16#37);
+	"application/vnd.wap.hashed-certificate" when Version >= ?WSP_14 ->
+	    ?ENCODE_SHORT(16#38);
+	"application/vnd.wap.signed-certificate" when Version >= ?WSP_14 ->
+	    ?ENCODE_SHORT(16#39);
+	"application/vnd.wap.cert-response" when Version >= ?WSP_14 ->
+	    ?ENCODE_SHORT(16#3A);
+	"application/xhtml+xml" when Version >= ?WSP_14 ->
+	    ?ENCODE_SHORT(16#3B);
+	"application/wml+xml" when Version >= ?WSP_14 ->
+	    ?ENCODE_SHORT(16#3C);
+	"text/css" when Version >= ?WSP_14 ->
+	    ?ENCODE_SHORT(16#3D);
+	"application/vnd.wap.mms-message" when Version >= ?WSP_14 ->
+	    ?ENCODE_SHORT(16#3E);
+	"application/vnd.wap.rollover-certificate" when Version >= ?WSP_14 ->
+	    ?ENCODE_SHORT(16#3F);
+	%% WAP Version 1.5
+	"application/vnd.wap.locc+wbxml" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#40);
+	"application/vnd.wap.loc+xml" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#41);
+	"application/vnd.syncml.dm+wbxml" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#42);
+	"application/vnd.syncml.dm+xml" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#43);
+	"application/vnd.syncml.notification" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#44);
+	"application/vnd.wap.xhtml+xml" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#45);
+	"application/vnd.wv.csp.cir" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#46);
+	"application/vnd.oma.dd+xml" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#47);
+	"application/vnd.oma.drm.message" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#48);
+	"application/vnd.oma.drm.content" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#49);
+	"application/vnd.oma.drm.rights+xml" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#4A);
+	"application/vnd.oma.drm.rights+wbxml" when Version >= ?WSP_15 ->
+	    ?ENCODE_SHORT(16#4B);
+	_ ->
+	    encode_text_string(ContentType)
+    end.
+
+
+decode_well_known_media(Code, Version) when integer(Code) ->
+    case Code of
+	%% WSP_REGISTERED_CONTENT_TYPES
+	16#0201 -> "application/vnd.uplanet.cacheop-wbxml";
+	16#0202 -> "application/vnd.uplanet.signal";
+	16#0203 -> "application/vnd.uplanet.alert-wbxml";
+	16#0204 -> "application/vnd.uplanet.list-wbxml";
+	16#0205 -> "application/vnd.uplanet.listcmd-wbxml";
+	16#0206 -> "application/vnd.uplanet.channel-wbxml";
+	16#0207 -> "application/vnd.uplanet.provisioning-status-uri";
+	16#0208 -> "x-wap.multipart/vnd.uplanet.header-set";
+	16#0209 -> "application/vnd.uplanet.bearer-choice-wbxml";
+	16#020A -> "application/vnd.phonecom.mmc-wbxml";
+	16#020B -> "application/vnd.nokia.syncset+wbxml";
+	16#020C -> "image/x-up-wpng";
+	_ -> decode_constrained_media(Code, Version)
+    end;
+decode_well_known_media(Media, _Version) when list(Media) ->
+    Media;
+decode_well_known_media({short,_Data}, Version) ->
+    decode_well_known_media(d_long(data), Version).	%% BUG HERE: Data
+
+
+decode_constrained_media(Code, _Version) when integer(Code) ->
+    case Code of
+	16#00 -> "*/*";
+	16#01 -> "text/*";
+	16#02 -> "text/html";
+	16#03 -> "text/plain";
+	16#04 -> "text/x-hdml";
+	16#05 -> "text/x-ttml";
+	16#06 -> "text/x-vcalendar";
+	16#07 -> "text/x-vcard";
+	16#08 -> "text/vnd.wap.wml";
+	16#09 -> "text/vnd.wap.wmlscript";
+	16#0A -> "text/vnd.wap.wta-event";
+	16#0B -> "multipart/*";
+	16#0C -> "multipart/mixed";
+	16#0D -> "multipart/form-data";
+	16#0E -> "multipart/byterantes";
+	16#0F -> "multipart/alternative";
+	16#10 -> "application/*";
+	16#11 -> "application/java-vm";
+	16#12 -> "application/x-www-form-urlencoded";
+	16#13 -> "application/x-hdmlc";
+	16#14 -> "application/vnd.wap.wmlc";
+	16#15 -> "application/vnd.wap.wmlscriptc";
+	16#16 -> "application/vnd.wap.wta-eventc";
+	16#17 -> "application/vnd.wap.uaprof";
+	16#18 -> "application/vnd.wap.wtls-ca-certificate";
+	16#19 -> "application/vnd.wap.wtls-user-certificate";
+	16#1A -> "application/x-x509-ca-cert";
+	16#1B -> "application/x-x509-user-cert";
+	16#1C -> "image/*";
+	16#1D -> "image/gif";
+	16#1E -> "image/jpeg";
+	16#1F -> "image/tiff";
+	16#20 -> "image/png";
+	16#21 -> "image/vnd.wap.wbmp";
+	16#22 -> "application/vnd.wap.multipart.*";
+	16#23 -> "application/vnd.wap.multipart.mixed";
+	16#24 -> "application/vnd.wap.multipart.form-data";
+	16#25 -> "application/vnd.wap.multipart.byteranges";
+	16#26 -> "application/vnd.wap.multipart.alternative";
+	16#27 -> "application/xml";
+	16#28 -> "text/xml";
+	16#29 -> "application/vnd.wap.wbxml";
+	16#2A -> "application/x-x968-cross-cert";
+	16#2B -> "application/x-x968-ca-cert";
+	16#2C -> "application/x-x968-user-cert";
+	%% WAP Version 1.2
+	16#2D -> "text/vnd.wap.si";
+	16#2E -> "application/vnd.wap.sic";
+	16#2F -> "text/vnd.wap.sl";
+	16#30 -> "application/vnd.wap.slc";
+	16#31 -> "text/vnd.wap.co";
+	16#32 -> "application/vnd.wap.coc";
+	16#33 -> "application/vnd.wap.multipart.related";
+	16#34 -> "application/vnd.wap.sia";
+	%% WAP Version 1.3
+	16#35 -> "text/vnd.wap.connectivity-xml";
+	16#36 -> "application/vnd.wap.connectivity-wbxml";
+	%% WAP Version 1.4
+	16#37 -> "application/pkcs7-mime";
+	16#38 -> "application/vnd.wap.hashed-certificate";
+	16#39 -> "application/vnd.wap.signed-certificate";
+	16#3A -> "application/vnd.wap.cert-response";
+	16#3B -> "application/xhtml+xml";
+	16#3C -> "application/wml+xml";
+	16#3D -> "text/css";
+	16#3E -> "application/vnd.wap.mms-message";
+	16#3F -> "application/vnd.wap.rollover-certificate";
+	%% WAP Version 1.5
+	16#40 -> "application/vnd.wap.locc+wbxml";
+	16#41 -> "application/vnd.wap.loc+xml";
+	16#42 -> "application/vnd.syncml.dm+wbxml";
+	16#43 -> "application/vnd.syncml.dm+xml";
+	16#44 -> "application/vnd.syncml.notification";
+	16#45 -> "application/vnd.wap.xhtml+xml";
+	16#46 -> "application/vnd.wv.csp.cir";
+	16#47 -> "application/vnd.oma.dd+xml";
+	16#48 -> "application/vnd.oma.drm.message";
+	16#49 -> "application/vnd.oma.drm.content";
+	16#4A -> "application/vnd.oma.drm.rights+xml";
+	16#4B -> "application/vnd.oma.drm.rights+wbxml"
+    end;
+decode_constrained_media(Media, _Version) when list(Media) ->
+    Media.
+
+
+%% Parse <integer> or <integer>.<integer>
+
+parse_version(Value) ->
+    case string:tokens(Value, ".") of
+	[Major,Minor] ->
+	    {list_to_integer(Major), list_to_integer(Minor)};
+	[Major] ->
+	    case catch list_to_integer(Major) of
+		{'EXIT', _} ->
+		    Value;
+		V -> V
+	    end
+    end.
+
+format_version({Major,Minor}) ->
+    [integer_to_list(Major),".",integer_to_list(Minor)];
+format_version(Major) when integer(Major) ->
+    integer_to_list(Major);
+format_version(Version) when list(Version) ->
+    Version.
+
+encode_version({Major,Minor}) ->
+    Ver = (((Major-1) band 16#7) bsl 4) bor (Minor band 16#f),
+    ?ENCODE_SHORT(Ver);
+encode_version(Major) when integer(Major) ->
+    Ver = ((Major band 16#7) bsl 4) bor 16#f,
+    ?ENCODE_SHORT(Ver);
+encode_version(Value) when list(Value) ->
+    encode_text_string(Value).
+
+
+decode_version(Value) when integer(Value) ->
+    Major = (Value bsr 4) band 16#7,
+    Minor = Value band 16#f,
+    if Minor == 16#f ->
+	    Major;
+       true ->
+	    {Major+1,Minor}
+    end;
+decode_version(Value) when list(Value) ->
+    Value.
+
+
+encode_mms_version({Major,Minor}) ->
+    Ver = ((Major band 16#7) bsl 4) bor (Minor band 16#f),
+    ?ENCODE_SHORT(Ver);
+encode_mms_version(Major) when integer(Major) ->
+    Ver = ((Major band 16#7) bsl 4) bor 16#f,
+    ?ENCODE_SHORT(Ver);
+encode_mms_version(Value) when list(Value) ->
+    encode_text_string(Value).
+
+
+decode_mms_version(Value) when integer(Value) ->
+    Major = (Value bsr 4) band 16#7,
+    Minor = Value band 16#f,
+    if Minor == 16#f ->
+	    Major;
+       true ->
+	    {Major,Minor}
+    end;
+decode_mms_version(Value) when list(Value) ->
+    Value.
+
+
+%%%
+%%% Basic data types
+%%%
+
+e_delta_seconds(Value) ->
+    encode_integer(Value).
+
+
+encode_integer(I) when integer(I), I >= 0 , I < 127 ->
+    ?ENCODE_SHORT(I);
+encode_integer(I) when integer(I) ->
+    encode_long_integer(I);
+encode_integer(List) when list(List) ->
+    encode_integer(list_to_integer(List)).
+
+decode_integer(Value) when integer(Value) ->
+    Value;
+decode_integer({short,Data}) ->
+    Sz = size(Data)*8,
+    <<Value:Sz>> = Data,
+    Value.
+
+encode_short_integer(I) ->
+    ?ENCODE_SHORT(I).
+
+encode_long_integer(I) when I >= 0 ->
+    MOInt = encode_multioctet_integer(I, []),
+    MOIntLen = length(MOInt),
+    list_to_binary([MOIntLen band 16#1f | MOInt]).
+
+encode_multioctet_integer(I,Acc) when I < 256 ->
+    [I | Acc];
+encode_multioctet_integer(I,Acc) ->
+    encode_multioctet_integer(I bsr 8, [(I band 16#ff) | Acc]).
+
+
+%% Integer-Value: Short-Integer | Long-Integer
+%% Short-Integer: <<1:Short:7>>
+%% Long-Integer:  <<0-30, X:0-30>>
+%% return {Integer,Tail}
+d_integer_value(<<1:1,Integer:7,Tail/binary>>) ->
+    {Integer, Tail};
+d_integer_value(<<0:3,Len:5,Data/binary>>) when Len =/= 31 ->
+    Sz = Len*8,
+    <<Integer:Sz, Tail/binary>> = Data,
+    {Integer, Tail}.
+
+decode_short_integer(<<1:1,Septet:7,T100/binary>>) ->
+    {Septet, T100}.
+
+decode_long_integer(<<0:3,Len:5,Data/binary>>) when Len =/= 31 ->
+    Sz = Len*8,
+    <<Val:Sz, Tail/binary>> = Data,
+    {Val, Tail}.
+
+d_long(Data) ->
+    Sz = size(Data)*8,
+    <<Value:Sz>> = Data,
+    Value.
+
+
+encode_uri_value(Data) ->
+    encode_text_string(Data).
+
+decode_uri_value(Data) when list(Data) ->
+    Data.
+
+%% parse quoted string
+decode_quoted_string([$" | List]) ->
+    List.
+
+encode_quoted_string([$" | Value]) ->
+    case lists:reverse(Value) of
+	[$" | Value1] ->
+	    <<$", (list_to_binary(lists:reverse(Value1)))/binary, 0>>;
+	_ ->
+	    <<$", (list_to_binary(Value))/binary, 0>>
+    end;
+encode_quoted_string(Value) ->
+    <<$", (list_to_binary(Value))/binary, 0>>.
+
+
+
+decode_text_string(List) when list(List) ->
+    List;
+decode_text_string(Bin) when binary(Bin) ->
+    binary_to_list(Bin).
+
+
+
+encode_text_string(A) when atom(A) ->
+    encode_text_string(atom_to_list(A));
+encode_text_string([H|T]) when H >= 128 ->
+    <<(list_to_binary([127,H|T]))/binary,0>>;
+encode_text_string(S) ->
+    <<(list_to_binary(S))/binary,0>>.
+
+
+encode_text_value(undefined) ->
+    <<0>>;
+encode_text_value([$"|T]) ->
+    %% remove ending quote ?
+    <<34,(list_to_binary(T))/binary>>;
+encode_text_value(L) ->
+    encode_text_string(L).
+
+
+d_text_value(<<0,T100/binary>>) ->
+    { "", T100};
+d_text_value(<<34,_Tail/binary>>=Data) ->
+    d_text_string(Data);
+d_text_value(Data) ->
+    d_text_string(Data).
+
+
+d_text_string(<<127,Data/binary>>) -> %% Remove quote
+    d_text_string(Data,[]);
+d_text_string(Data) ->
+    d_text_string(Data,[]).
+
+d_text_string(<<0,Tail/binary>>,A) ->
+    {lists:reverse(A), Tail};
+d_text_string(<<C,Tail/binary>>,A) ->
+    d_text_string(Tail,[C|A]);
+d_text_string(<<>>, A) ->
+    {lists:reverse(A), <<>>}.
+
+
+d_q_value(<<0:1,Q:7,Tail/binary>>) ->
+    QVal =
+	if Q >= 1, Q =< 100 ->
+		lists:flatten(io_lib:format("0.~2..0w", [Q-1]));
+	   Q >= 101, Q =< 1099 ->
+		lists:flatten(io_lib:format("0.~3..0w", [Q-100]));
+	   true ->
+		io:format("Q-value to big ~w\n", [Q]),
+		"***"
+	end,
+    {QVal, Tail};
+d_q_value(<<1:1,Q1:7,0:1,Q0:7,Tail/binary>>) ->
+    Q = (Q1 bsl 7) bor Q0,
+    QVal =
+	if Q >= 1, Q =< 100 ->
+		lists:flatten(io_lib:format("0.~2..0w", [Q-1]));
+	   Q >= 101, Q =< 1099 ->
+		lists:flatten(io_lib:format("0.~3..0w", [Q-100]));
+	   true ->
+		io:format("Q-value to big ~w\n", [Q]),
+		"***"
+	end,
+    {QVal, Tail}.
+
+
+%%
+%% Decode uintvar
+%%
+d_uintvar(<<0:1,S0:7,T100/binary>>) ->
+    {S0, T100};
+d_uintvar(<<1:1,S1:7,0:1,S0:7,T100/binary>>) ->
+    {(S1 bsl 7) bor S0, T100};
+d_uintvar(<<1:1,S2:7,1:1,S1:7,0:1,S0:7,T100/binary>>) ->
+    {(S2 bsl 14) bor (S1 bsl 7) bor S0, T100};
+d_uintvar(<<1:1,S3:7,1:1,S2:7,1:1,S1:7,0:1,S0:7,T100/binary>>) ->
+    {(S3 bsl 21) bor (S2 bsl 14) bor (S1 bsl 7) bor S0, T100};
+d_uintvar(<<1:1,S4:7,1:1,S3:7,1:1,S2:7,1:1,S1:7,0:1,S0:7,T100/binary>>) ->
+    {(S4 bsl 28) bor (S3 bsl 21) bor (S2 bsl 14) bor (S1 bsl 7) bor S0, T100}.
+
+
+e_uintvar(I) when I < 128 -> <<I>>;
+e_uintvar(I) -> e_uintvar(I,[]).
+
+e_uintvar(0,Acc) ->
+    list_to_binary(Acc);
+e_uintvar(I,[]) ->
+    e_uintvar(I bsr 7, [I band 16#7f]);
+e_uintvar(I,Acc) ->
+    e_uintvar(I bsr 7, [16#80 bor (I band 16#7f) | Acc]).
+
+
+e_value(B) ->
+    Sz = size(B),
+    if Sz =< 30 ->
+	    <<Sz:8, B/binary>>;
+       true ->
+	    <<31:8, (e_uintvar(Sz))/binary, B/binary >>
+    end.
+
+e_value(B1,B2) ->
+    Sz = size(B1)+size(B2),
+    if Sz =< 30 ->
+	    <<Sz:8, B1/binary, B2/binary>>;
+       true ->
+	    <<31:8, (e_uintvar(Sz))/binary, B1/binary, B2/binary >>
+    end.
+
+e_value(B1,B2,B3) ->
+    Sz = size(B1)+size(B2)+size(B3),
+    if Sz =< 30 ->
+	    <<Sz:8, B1/binary,B2/binary,B3/binary>>;
+       true ->
+	    <<31:8,(e_uintvar(Sz))/binary,B1/binary,B2/binary,B3/binary>>
+    end.
+
+e_value(B1,B2,B3,B4) ->
+    Sz = size(B1)+size(B2)+size(B3)+size(B4),
+    if Sz =< 30 ->
+	    <<Sz:8, B1/binary,B2/binary,B3/binary,B4/binary>>;
+       true ->
+	    <<31:8,(e_uintvar(Sz))/binary,B1/binary,
+	     B2/binary,B3/binary,B4/binary>>
+    end.
+
+%%
+%% Extened methods
+%%
+decode_extended_methods(<<PduType:8, Data/binary>>) ->
+    Type = decode_pdu_type(PduType),
+    {Method, Data1} = d_text_string(Data),
+    [{Type,Method} | decode_extended_methods(Data1)];
+decode_extended_methods(<<>>) ->
+    [].
+
+encode_extended_methods(Ms) ->
+    list_to_binary(encode_ext_methods(Ms)).
+
+encode_ext_methods([{Type,Method} | T]) ->
+    [ encode_pdu_type(Type), encode_text_string(Method) |
+      encode_ext_methods(T)];
+encode_ext_methods([]) ->
+    [].
+
+%%
+%% Address lists used by redirect-pdu and aliases-capability
+%%
+decode_address(D0) ->
+    [A] = decode_addresses(D0),
+    A.
+
+decode_addresses(D0) ->
+    case D0 of
+	<<1:1, 1:1,Len:6,B:8,P:16,Addr:Len/binary,D1/binary>> ->
+	    [#wdp_address { bearer = B, address = Addr, portnum=P } |
+	     decode_addresses(D1)];
+	<<1:1, 0:1,Len:6,B:8,Addr:Len/binary,D1/binary>> ->
+	    [#wdp_address { bearer = B, address = Addr } |
+	     decode_addresses(D1)];
+	<<0:1, 1:1,Len:6,P:16,Addr:Len/binary,D1/binary>> ->
+	    [#wdp_address { portnum=P, address=Addr } |
+	     decode_addresses(D1)];
+	<<0:1, 0:1,Len:6,Addr:Len/binary,D1/binary>> ->
+	    [#wdp_address { address=Addr } |
+	     decode_addresses(D1)];
+	<<>> ->
+	    []
+    end.
+
+encode_addresses(As) ->
+    encode_addresses(As, []).
+
+encode_addresses([A|As], Acc) ->
+    encode_addresses(As, [encode_address(A)|Acc]);
+encode_addresses([], Acc) ->
+    list_to_binary(lists:reverse(Acc)).
+
+encode_address(#wdp_address { bearer = B, address = Addr, portnum = P }) ->
+    BAddr = if tuple(Addr) ->
+		    list_to_binary(inet:ip_to_bytes(Addr));
+	       binary(Addr) ->
+		    Addr
+	    end,
+    Len = size(BAddr),
+    if B == undefined, P == undefined ->
+	    <<0:1, 0:1, Len:6, BAddr/binary>>;
+       B == undefined ->
+	    <<0:1, 1:1, Len:6, P:16, BAddr/binary>>;
+       P == undefined ->
+	    <<1:1, 0:1, Len:6, B:8, BAddr/binary>>;
+       true ->
+	    <<1:1, 1:1, Len:6, B:8, P:16, BAddr/binary>>
+    end.
+
+
+
+
+-define(UNIX_TIME_OFFSET, 62167219200).
+
+d_date(Val) when integer(Val) ->
+    calendar:gregorian_seconds_to_datetime(Val+?UNIX_TIME_OFFSET);
+d_date({short,Data}) ->
+    Sz = size(Data)*8,
+    <<Sec:Sz>> = Data,
+    calendar:gregorian_seconds_to_datetime(Sec+?UNIX_TIME_OFFSET).
+
+e_date(DateTime) ->
+    Sec = calendar:datetime_to_gregorian_seconds(DateTime),
+    encode_long_integer(Sec -  ?UNIX_TIME_OFFSET).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% decode http-date (RFC 2068). (MUST be send in RFC1123 date format)
+%%          HTTP-date    = rfc1123-date | rfc850-date | asctime-date
+%%          rfc1123-date = wkday "," SP date1 SP time SP "GMT"
+%%          rfc850-date  = weekday "," SP date2 SP time SP "GMT"
+%%          asctime-date = wkday SP date3 SP time SP 4DIGIT
+%%
+%%          date1        = 2DIGIT SP month SP 4DIGIT
+%%                         ; day month year (e.g., 02 Jun 1982)
+%%          date2        = 2DIGIT "-" month "-" 2DIGIT
+%%                         ; day-month-year (e.g., 02-Jun-82)
+%%          date3        = month SP ( 2DIGIT | ( SP 1DIGIT ))
+%%                         ; month day (e.g., Jun  2)
+%%
+%%          time         = 2DIGIT ":" 2DIGIT ":" 2DIGIT
+%%                         ; 00:00:00 - 23:59:59
+%%
+%%          wkday        = "Mon" | "Tue" | "Wed"
+%%                       | "Thu" | "Fri" | "Sat" | "Sun"
+%%
+%%
+%%          weekday      = "Monday" | "Tuesday" | "Wednesday"
+%%                       | "Thursday" | "Friday" | "Saturday" | "Sunday"
+%%
+%%          month        = "Jan" | "Feb" | "Mar" | "Apr"
+%%                       | "May" | "Jun" | "Jul" | "Aug"
+%%                       | "Sep" | "Oct" | "Nov" | "Dec"
+%%
+%% decode date or crash!
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+parse_http_date(Date) ->
+    parse_hdate(tolower(Date)).
+
+parse_hdate([$m,$o,$n,$d,$a,$y,$  | Cs]) -> date2(Cs);
+parse_hdate([$t,$u,$e,$s,$d,$a,$y,$  | Cs]) -> date2(Cs);
+parse_hdate([$w,$e,$d,$n,$s,$d,$a,$y,$  | Cs]) -> date2(Cs);
+parse_hdate([$t,$h,$u,$r,$s,$d,$a,$y,$  | Cs]) -> date2(Cs);
+parse_hdate([$f,$r,$i,$d,$a,$y,$  | Cs]) -> date2(Cs);
+parse_hdate([$s,$a,$t,$u,$r,$d,$a,$y,$   | Cs]) -> date2(Cs);
+parse_hdate([$s,$u,$n,$d,$a,$y,$  | Cs]) -> date2(Cs);
+parse_hdate([$m,$o,$n,X | Cs]) -> date13(X,Cs);
+parse_hdate([$t,$u,$e,X  | Cs]) -> date13(X,Cs);
+parse_hdate([$w,$e,$d,X  | Cs]) -> date13(X,Cs);
+parse_hdate([$t,$h,$u,X  | Cs]) -> date13(X,Cs);
+parse_hdate([$f,$r,$i,X  | Cs]) -> date13(X,Cs);
+parse_hdate([$s,$a,$t,X  | Cs]) -> date13(X,Cs);
+parse_hdate([$s,$u,$n,X  | Cs]) -> date13(X,Cs).
+
+date13($ , Cs) -> date3(Cs);
+date13($,, [$ |Cs]) -> date1(Cs).
+
+%% date1
+date1([D1,D2,$ ,M1,M2,M3,$ ,Y1,Y2,Y3,Y4,$  | Cs]) ->
+    M = parse_month([M1,M2,M3]),
+    D = list_to_integer([D1,D2]),
+    Y = list_to_integer([Y1,Y2,Y3,Y4]),
+    {Time,[$ ,$g,$m,$t|Cs1]} = parse_time(Cs),
+    { {{Y,M,D},Time}, Cs1}.
+
+%% date2
+date2([D1,D2,$-,M1,M2,M3,$-,Y1,Y2 | Cs]) ->
+    M = parse_month([M1,M2,M3]),
+    D = list_to_integer([D1,D2]),
+    Y = 1900 + list_to_integer([Y1,Y2]),
+    {Time, [$ ,$g,$m,$t|Cs1]} = parse_time(Cs),
+    {{{Y,M,D}, Time}, Cs1}.
+
+%% date3
+date3([M1,M2,M3,$ ,D1,D2,$ | Cs]) ->
+    M = parse_month([M1,M2,M3]),
+    D = if D1 == $  -> list_to_integer([D2]);
+	   true -> list_to_integer([D1,D2])
+	end,
+    {Time,[$ ,Y1,Y2,Y3,Y4|Cs1]} = parse_time(Cs),
+    Y = list_to_integer([Y1,Y2,Y3,Y4]),
+    { {{Y,M,D}, Time}, Cs1 }.
+
+%% decode lowercase month
+parse_month("jan") -> 1;
+parse_month("feb") -> 2;
+parse_month("mar") -> 3;
+parse_month("apr") -> 4;
+parse_month("may") -> 5;
+parse_month("jun") -> 6;
+parse_month("jul") -> 7;
+parse_month("aug") -> 8;
+parse_month("sep") -> 9;
+parse_month("oct") -> 10;
+parse_month("nov") -> 11;
+parse_month("dec") -> 12.
+
+%% decode time HH:MM:SS
+parse_time([H1,H2,$:,M1,M2,$:,S1,S2|Cs]) ->
+    { {list_to_integer([H1,H2]),
+       list_to_integer([M1,M2]),
+       list_to_integer([S1,S2]) }, Cs}.
+
+%% encode date into rfc1123-date (must be a GMT time!!!)
+fmt_date({{Y,M,D},{TH,TM,TS}}) ->
+    WkDay = case calendar:day_of_the_week({Y,M,D}) of
+		1 -> "Mon";
+		2 -> "Tue";
+		3 -> "Wed";
+		4 -> "Thu";
+		5 -> "Fri";
+		6 -> "Sat";
+		7 -> "Sun"
+	    end,
+    lists:flatten(io_lib:format("~s, ~2..0w ~s ~4..0w "
+				"~2..0w:~2..0w:~2..0w GMT",
+				[WkDay, D, fmt_month(M), Y, TH, TM, TS])).
+
+fmt_current_date() ->
+    fmt_date(calendar:universal_time()).
+
+%% decode lowercase month
+fmt_month(1) -> "Jan";
+fmt_month(2) -> "Feb";
+fmt_month(3) -> "Mar";
+fmt_month(4) -> "Apr";
+fmt_month(5) -> "May";
+fmt_month(6) -> "Jun";
+fmt_month(7) -> "Jul";
+fmt_month(8) -> "Aug";
+fmt_month(9) -> "Sep";
+fmt_month(10) -> "Oct";
+fmt_month(11) -> "Nov";
+fmt_month(12) -> "Dec".
diff --git a/lib/dialyzer/test/user_tests_SUITE.erl b/lib/dialyzer/test/user_tests_SUITE.erl
deleted file mode 100644
index 9654114725..0000000000
--- a/lib/dialyzer/test/user_tests_SUITE.erl
+++ /dev/null
@@ -1,78 +0,0 @@
-%% ATTENTION!
-%% This is an automatically generated file. Do not edit.
-%% Use './remake' script to refresh it if needed.
-%% All Dialyzer options should be defined in dialyzer_options
-%% file.
-
--module(user_tests_SUITE).
-
--include("ct.hrl").
--include("dialyzer_test_constants.hrl").
-
--export([suite/0, init_per_suite/0, init_per_suite/1,
-         end_per_suite/1, all/0]).
--export([user_tests_SUITE_consistency/1, broken_dialyzer/1, 
-         gcpFlowControl/1, qlc_error/1, spvcOrig/1, wsp_pdu/1]).
-
-suite() ->
-  [{timetrap, {minutes, 3}}].
-
-init_per_suite() ->
-  [{timetrap, ?plt_timeout}].
-init_per_suite(Config) ->
-  OutDir = ?config(priv_dir, Config),
-  case dialyzer_common:check_plt(OutDir) of
-    fail -> {skip, "Plt creation/check failed."};
-    ok -> [{dialyzer_options, []}|Config]
-  end.
-
-end_per_suite(_Config) ->
-  ok.
-
-all() ->
-  [user_tests_SUITE_consistency,broken_dialyzer,gcpFlowControl,qlc_error,
-   spvcOrig,wsp_pdu].
-
-dialyze(Config, TestCase) ->
-  Opts = ?config(dialyzer_options, Config),
-  Dir = ?config(data_dir, Config),
-  OutDir = ?config(priv_dir, Config),
-  dialyzer_common:check(TestCase, Opts, Dir, OutDir).
-
-user_tests_SUITE_consistency(Config) ->
-  Dir = ?config(data_dir, Config),
-  case dialyzer_common:new_tests(Dir, all()) of
-    []  -> ok;
-    New -> ct:fail({missing_tests,New})
-  end.
-
-broken_dialyzer(Config) ->
-  case dialyze(Config, broken_dialyzer) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-gcpFlowControl(Config) ->
-  case dialyze(Config, gcpFlowControl) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-qlc_error(Config) ->
-  case dialyze(Config, qlc_error) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-spvcOrig(Config) ->
-  case dialyze(Config, spvcOrig) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
-wsp_pdu(Config) ->
-  case dialyze(Config, wsp_pdu) of
-    'same' -> 'same';
-    Error  -> ct:fail(Error)
-  end.
-
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/src/broken_dialyzer.erl b/lib/dialyzer/test/user_tests_SUITE_data/src/broken_dialyzer.erl
deleted file mode 100644
index fd9a6ada1a..0000000000
--- a/lib/dialyzer/test/user_tests_SUITE_data/src/broken_dialyzer.erl
+++ /dev/null
@@ -1,130 +0,0 @@
--module(broken_dialyzer).
-
--export([do_move_next/1]).
-
--define(ap_indices, 512).
--define(dp_indices, 504).
-
-
--record(apR,{a,c=[],n=[],nc=0,nn=0,nl=[]}).
--define(apL(L), [#apR{a=A} || A <- L]).
-
--define(gr, get(my_return_value)).
--define(pr(PR), put(my_return_value, PR)).
--record(bit,{i,c,n,s}).           % index, current, next, state
-
-
-do_move_next({BL,AL}) ->
-    Max = max(length(BL), length(AL)),
-    Max2 = max(length(BL)*2, length(AL)),
-    MoveTo = [A || A <- AL, A#apR.nn < Max, A#apR.nn+A#apR.nc < Max2],
-    MoveFrom = [A || A <- AL,
-                     (A#apR.nn > Max) orelse (A#apR.nn+A#apR.nc > Max2)],
-    Unchanged = (AL--MoveTo)--MoveFrom,
-    {BL1,{AL1,{AL2,AL3}}} =
-        lists:mapfoldl(
-          fun(B=#bit{i=I,c=C,s=S,n=Next}, {From,{To,FilledUp}})
-             when S==ok;S==lost_replica;S==moved_replica ->
-                  case lists:keysearch(Next,#apR.a,From) of
-                      {value, F=#apR{n=N1,nn=NN1,nc=NC1}}
-                      when (NN1>Max) or (NN1+NC1>Max2) ->
-                          case C of
-                              [] ->
-                                  {B, {From,{To,FilledUp}}};
-                              ShortList ->
-                                  T=#apR{a=NewNext,n=N2,nn=NN2} =
-                                      find_next(Next,ShortList),
-                                  {value, {C,NL_from}} =
-                                      lists:keysearch(C,1,F#apR.nl),
-                                  {value, {C,NL_to}} =
-                                      lists:keysearch(C,1,T#apR.nl),
-                                  NewNL_from = lists:keyreplace(
-                                                 C,1,F#apR.nl,{C,NL_from--[I]}),
-                                  NewNL_to = lists:keyreplace(
-                                               C,1,T#apR.nl,{C,[I|NL_to]}),
-
-                                  NewT = T#apR{n=[I|N2],nn=NN2+1,
-                                               nl=NewNL_to},
-
-                                  {B#bit{n=NewNext,
-                                         s = if
-                                                 S == lost_replica ->
-                                                     lost_replica;
-                                                 true ->
-                                                     moved_replica
-                                             end},
-                                   {lists:keyreplace(
-                                      Next,#apR.a,From,
-                                      F#apR{n=N1--[I],nn=NN1-1,nl=NewNL_from}),
-                                    if
-                                        (NewT#apR.nn+NewT#apR.nc >= Max2)
-                                        or (NewT#apR.nn >= Max) ->
-                                            {lists:keydelete(NewNext,#apR.a,To),
-                                             [NewT|FilledUp]};
-                                        true ->
-                                            {lists:keyreplace(
-                                               NewNext,#apR.a,To,NewT),
-                                             FilledUp}
-                                    end}}
-                          end;
-                      _ ->
-                          {B, {From,{To,FilledUp}}}
-                  end;
-             (B, A) ->
-                  {B, A}
-          end, {MoveFrom,{MoveTo,[]}},BL),
-    {BL1,Unchanged++AL1++AL2++AL3}.
-
-%%% -----------------------------------------------------------------
-%%% find_next/2
-%%%
-%%% ------------------------------------------------------------------
-
-find_next(Ap,L) ->
-    hd(catch
-       lists:foreach(
-         fun(SelVal) ->
-                 case [ApR ||
-                          ApR <- L,
-                          begin
-                              {value,{Ap,NL}} =
-                                  lists:keysearch(Ap,1,ApR#apR.nl),
-                              length(NL) =< SelVal
-                          end] of
-                     [] ->
-                         ok;
-                     ShortList ->
-                         throw(ShortList)
-                 end
-         end,
-         lists:seq(0,?ap_indices))).
-
-%%% -----------------------------------------------------------------
-%%% max/2
-%%%
-%%% Calculates max number of indices per AP, given number of indices
-%%% and number of APs.
-%%% -----------------------------------------------------------------
-max(F,S) ->
-    (F div S) + if
-                    (F rem S) == 0 ->
-                        0;
-                    true ->
-                        1
-                end.
-
-%%% ==============================================================
-%%%      ADMINISTRATIVE INFORMATION
-%%% ==============================================================
-%%% #Copyright (C) 2005
-%%% by ERICSSON TELECOM AB
-%%% S - 125 26  STOCKHOLM
-%%% SWEDEN, tel int + 46 8 719 0000
-%%% 
-%%% The program may be used and/or copied only with the written 
-%%% permission from ERICSSON TELECOM AB, or in accordance with 
-%%% the terms and conditions stipulated in the agreement/contract 
-%%% under which the program has been supplied.
-%%%   
-%%% All rights reserved
-%%% 
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/src/gcp.hrl b/lib/dialyzer/test/user_tests_SUITE_data/src/gcp.hrl
deleted file mode 100644
index aac87d8b6b..0000000000
--- a/lib/dialyzer/test/user_tests_SUITE_data/src/gcp.hrl
+++ /dev/null
@@ -1,166 +0,0 @@
-%%% #0.    BASIC INFORMATION
-%%% ----------------------------------------------------------
-%%% %CCaseFile:	gcp.hrl %
-%%% Author:      EAB/UPD/AV
-%%% Description: Internal include file.
-%%% ----------------------------------------------------------
--hrl_id('9/190 55-CNA 113 033 Ux').
--hrl_vsn('/main/R1A/21').
--hrl_date('2005-05-31').
--hrl_author('uabasve').
-%%% %CCaseTemplateFile:	module.hrl %
-%%% %CCaseTemplateId: 17/002 01-FEA 202 714 Ux, Rev: /main/4 %
-%%%
-%%% Copyright (C) 2000-2005 by Ericsson Telecom AB
-%%% SE-126 25  STOCKHOLM
-%%% SWEDEN, tel int + 46 8 719 0000
-%%% 
-%%% The program may be used and/or copied only with the written
-%%% permission from Ericsson Telecom AB, or in accordance with
-%%% the terms and conditions stipulated in the agreement/contract
-%%% under which the program has been supplied.
-%%%   
-%%% All rights reserved
-%%%
-%%% ----------------------------------------------------------
-%%% #1.    REVISION LOG
-%%% ----------------------------------------------------------
-%%% Rev        Date       Name        What
-%%% -----      -------    --------    ------------------------
-%%% R1A/1      05-02-07   uabasve    Copied from EAS R7A/9
-%%% R1A/2      05-02-08   ejojmjn    Removed SAAL
-%%% R1A/3-     05-03-18   uabasve    Clean.
-%%% ----------------------------------------------------------
-%%% 
-%%% #2.    CODE
-%%% #---------------------------------------------------------
-%%% #2.1   DEFINITION OF CONSTANTS
-%%% #---------------------------------------------------------
-
-%% Keys into gcpVariables for various options/values.
--define(TRAFFIC_DESCRIPTOR_KEY, traffic_descriptor).
-
-%% H.248 version at link creation.
--define(INITIAL_H248_VERSION, 1).
-
-%% Exceptions for use within a module. ?MODULE is just extra protection
-%% against catching something unexpected.
--define(THROW(Reason), throw({error, ?MODULE, ?LINE, Reason})).
--define(CATCH(Expr),   try Expr
-                       catch throw: ?FAILURE(Reason) -> {error, Reason}
-                       end).
--define(FAILURE(T), {error, ?MODULE, _, T}).
-
-%% The SendHandle used by a GCP transport process must be a tuple
-%% of length >= 2 whose first two elements are the pid of the
-%% transport process and index (aka #gcpLinkTable.key) of the link
-%% upon which incoming data has arrived.
--define(SH_PID(SendHandle),  element(1, SendHandle)).
--define(SH_LINK(SendHandle), element(2, SendHandle)).
--define(SH_SET_PID(SendHandle, Pid), setelement(1, SendHandle, Pid)).
-
-%% Megaco process that CH and OM servers monitor. This needs to be
-%% replaced by a documented method.
--define(MEGACO_APP, megaco_config).
-
-%% The message that gcpI:send_reply sends to the process that's waiting
-%% for an action reply.
--define(ACTION_REPLY_MESSAGE(ActionReplies, Result),
-        {reply, ActionReplies, Result}).
-
-%%% #---------------------------------------------------------
-%%% #2.2   DEFINITION OF RECORDS
-%%% #---------------------------------------------------------
-
--record(mg, {pref}).
--record(mgc, {mgid}).
-
-%% User configuration that gets mapped into megaco user info by
-%% gcpLib:make_user_info/1. GCP exposes only a subset of what's
-%% possible to set in megaco.
--record(user_config,
-        {reply_timer          = 30000, %% ms to wait for reply ack
-         %% Incoming transactions:
-         pending_timer        = 10000, %% ms until outgoing transaction pending
-         sent_pending_limit   = 5,     %% nr of outgoing pendings before 506
-         %% Outgoing transactions:
-         recv_pending_limit   = infinity,%% nr of incoming pendings before fail
-         request_timer        = 3000,  %% ms to wait for response before resend
-         request_retries      = 5,     %% nr unanswered sends before fail
-         long_request_timer   = 15000, %% ms to wait for reply after pending
-         long_request_retries = 5}).   %% nr of pendings/timeouts before fail
-
-%% Record passed into transport implementations at transport start.
-%% Expected to be passed back to gcpTransportI.
--record(receive_handle,
-        {megaco_receive_handle,  %% passed to megaco:receive_message
-         receive_message}).      %% gcpLinkTable.receive_message
-
-%%% ---------------------------------------------------------------------------
-%%% # gcpRegistrationTable
-%%%
-%%% Record containing defined MGC's/MG's (aka megaco users).
-%%% ---------------------------------------------------------------------------
-
--record(gcpRegistrationTable,
-        {key,                    %% user reference (aka MG/MGC id)
-         role,                   %% mg | mgc
-         mid,                    %% H.248 mid of the MGC/MG
-         version,                %% of H.248
-         callback,               %% {Module, ExtraArgs}
-         config = #user_config{}}).
-
-%%% ----------------------------------------------------------
-%%% # gcpLinkTable
-%%% ----------------------------------------------------------
-
--record(gcpLinkTable,
-        {key,                    %% link reference
-         endpoint,               %% #mgc{} | #mg{}
-         user,                   %% registration table key
-         chid,                   %% call handler of transport
-         admin_state,            %% up | down
-         op_state,               %% up | down | pending | disabled
-         restart = auto,         %% auto | user
-         encoding_mod,           %% module implementing megaco_encoder
-         encoding_config,        %% as passed to encoding_mod
-         transport_start,        %% {M,F,ExtraArgs} for transport start
-         transport_data,         %% arbitrary, passed to transport_mod
-         send_message,           %% {default|sysrpc|transport|module, Module}
-         receive_message,        %% local | {M,F,ExtraArgs} for decode node
-         tried = false,          %% Only for links owned by a MG.
-                                 %% Used to indicate that a setup attempt
-                                 %% has been performed on this link.
-         t95_period = 350000}).
-
-%%% ----------------------------------------------------------
-%%% # gcpActiveLinkTable
-%%% ----------------------------------------------------------
-
--record(gcpActiveLinkTable,
-        {key,                    %% {mg|mgc, MgId}
-         link,                   %% link reference
-         chid,                   %% CH the link is tied to
-         node,                   %% node the link is on
-         conn_handle,            %% record megaco_conn_handle
-         send_handle,            %% {TransportPid, LinkIdx, ...}
-         version = ?INITIAL_H248_VERSION}).
-
-%%% ----------------------------------------------------------
-%%% # gcpVariables
-%%% ----------------------------------------------------------
-
--record(gcpVariables,
-        {key,
-         value}).
-
-%%% ----------------------------------------------------------
-%%% # gcpReplyData
-%%% ----------------------------------------------------------
-
--record(gcpReplyData,
-        {callback,               %% {Module, Args}
-         mgid,
-         user_data,              %% As passed by the user on send
-         prio,
-         timestamp}).
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/src/gcpFlowControl.erl b/lib/dialyzer/test/user_tests_SUITE_data/src/gcpFlowControl.erl
deleted file mode 100644
index 1653220352..0000000000
--- a/lib/dialyzer/test/user_tests_SUITE_data/src/gcpFlowControl.erl
+++ /dev/null
@@ -1,397 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : gcpFlowControl.erl
-%%% Author  : EAB/UPD/AV
-%%% Description : Implements overload protection.
-%%%-------------------------------------------------------------------
--module(gcpFlowControl).
--id('24/190 55-CNA 113 033 Ux').
--vsn('/main/R1A/14').
--date('2005-05-04').
--author('uabasve').
-%%% ----------------------------------------------------------
-%%% %CCaseTemplateFile: module.erl %
-%%% %CCaseTemplateId: 16/002 01-FEA 202 714 Ux, Rev: /main/4 %
-%%%
-%%% Copyright (C) 2001-2005 by Ericsson Telecom AB
-%%% SE-126 25  STOCKHOLM
-%%% SWEDEN, tel int + 46 8 719 0000
-%%% 
-%%% The program may be used and/or copied only with the written
-%%% permission from Ericsson Telecom AB, or in accordance with
-%%% the terms and conditions stipulated in the agreement/contract
-%%% under which the program has been supplied.
-%%%   
-%%% All rights reserved
-%%% 
-%%%
-%%% ----------------------------------------------------------
-%%% #1.    REVISION LOG
-%%% ----------------------------------------------------------
-%%% Rev        Date       Name        What
-%%% --------   --------   --------    ------------------------
-%%% R1A/1-2    05-02-07   ejojmjn     Copied from EAS R7A/11.
-%%% R1A/3-14   05-03-14   uabasve     Clean.
-%%%--------------------------------------------------------------------
-
--include_lib("megaco/include/megaco.hrl").
--include_lib("megaco/include/megaco_message_v1.hrl").
--include("gcp.hrl").
-
--export([send_request/4,     %% user send from gcpInterface
-         receive_reply/2,    %% from callback in gcpTransaction
-         init_ets_tables/1,
-         init_data/2]).
-
--define(PRIO_INFINITY, 16).
--define(MIN_WINDOW, 10).
--define(MAX_WINDOW, 100).
-
--define(BUCKET_MAX, 100).
--define(BUCKET_THRESH_HIGH, 80).
--define(BUCKET_THRESH_LOW, 20).
-
--define(ALLOW_TIMEOUT, 1000).
-
-%% Holds counters for flow control in GCP
--record(gcpFlowControlTable,
-	{key,
-	 window        = 50,
-	 available     = 50,
-	 bucket        = 0,
-	 q             = 0,
-	 sent          = 0,   %% Counts all attempts
-	 rejectable    = 0,   %% Counts rejectable attempts
-	 t95,
-	 errors        = 0,
-	 rejects       = 0,
-	 replies       = 0}).
-
--record(gcpFlowControlBitmap,
-        {key,
-         count = 0}).
-
-%%====================================================================
-%% External functions
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: send_request/4
-%%
-%% Output: ok | {error, Reason}
-%%--------------------------------------------------------------------
-
-send_request(ActiveLink, TimerOptions, ActionRequests, UserData) ->
-    #gcpActiveLinkTable{key = Key,
-                        conn_handle = ConnHandle}
-        = ActiveLink,
-    Prio = prio(ActionRequests),
-    incr(Key, sent),
-    case allow(Key, Prio) of
-        {true, Timestamp} ->
-            grant_request(user_data(ConnHandle),
-                          Key,
-                          Prio,
-                          Timestamp,
-                          ConnHandle,
-                          TimerOptions,
-                          ActionRequests,
-                          UserData);
-        false ->
-            {error, rejected}
-    end.
-
-%%--------------------------------------------------------------------
-%% Function: receive_reply/2
-%% Description: 
-%%--------------------------------------------------------------------
-
-receive_reply(Key, Timestamp) ->
-    incr(Key, available),
-    incr(Key, replies),
-    release(Key),
-    report_time(Key, Timestamp).
-
-%%--------------------------------------------------------------------
-%% Func: init_ets_tables/1
-%%
-%% Returns: ok
-%%--------------------------------------------------------------------
-
-init_ets_tables(Role) ->
-    create_ets(Role, gcpFlowControlTable, #gcpFlowControlTable.key),
-    create_ets(Role, gcpFlowControlBitmap, #gcpFlowControlBitmap.key),
-    ok.
-
-create_ets(Role, Table, Pos) when integer(Pos) ->
-    create_ets(Role,
-               Table,
-               [named_table, ordered_set, public, {keypos, Pos}]);
-
-create_ets(test, Table, ArgList) ->
-    ets:new(Table, ArgList);
-create_ets(Role, Table, ArgList) ->
-    case ets:info(Table) of
-        undefined ->
-            sysCmd:ets_new(Table, ArgList);
-        _ when Role == ch ->
-            sysCmd:inherit_tables([Table]);
-        _ when Role == om ->
-            ok
-    end.
-
-%%--------------------------------------------------------------------
-%% Func: init_data/2
-%%--------------------------------------------------------------------
-
-init_data(Key, T95) ->
-    ets:insert(gcpFlowControlTable, #gcpFlowControlTable{key = Key,
-                                                         t95 = T95}).
-    
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-
-%%% ----------------------------------------------------------
-%%%     incr 
-%%% ----------------------------------------------------------
-
-cntr(Key, Field) ->
-    incr(Key, Field, 0).
-
-incr(Key, Field) ->
-    incr(Key, Field, 1).
-
--define(INCR(Field),
-        incr(Key, Field, X) -> upd_c(Key, {#gcpFlowControlTable.Field, X})).
-
-?INCR(sent);
-?INCR(replies);
-?INCR(q);
-?INCR(t95);
-?INCR(errors);
-?INCR(rejects);
-?INCR(rejectable);
-?INCR(window);
-?INCR(available);
-
-incr(Key, bucket, X)->
-    upd_c(Key, {#gcpFlowControlTable.bucket, X, ?BUCKET_MAX, ?BUCKET_MAX}).
-
-upd_c(Key, N) ->
-    ets:update_counter(gcpFlowControlTable, Key, N).
-
-%%% ----------------------------------------------------------
-%%%     decr 
-%%%
-%%%     Beware that decr is implemented as incr, care has to be taken
-%%%     not to bungle things when max/min values are used.
-%%% ----------------------------------------------------------
-
-decr(Key, available, X) ->
-    upd_c(Key, {#gcpFlowControlTable.available, -X});
-decr(Key, window, X) ->
-    upd_c(Key, {#gcpFlowControlTable.window, -X});
-decr(Key, bucket, X) ->
-    upd_c(Key, {#gcpFlowControlTable.bucket, -X, 0, 0}).
-
-decr(Key, Field) ->
-    decr(Key, Field, 1).
-
-%%% ----------------------------------------------------------
-%%%     allow 
-%%% ----------------------------------------------------------
-
-allow(Key, ?PRIO_INFINITY) ->
-    decr(Key, available),
-    {true, now()};
-
-allow(Key, Prio) ->
-    incr(Key, rejectable),
-    case decr(Key, available) of
-        N when N > 0 ->
-            {true, no_stamp};
-        _ ->
-            %% We did not send it, therefore incr available again
-            incr(Key, available),
-            queue(Key, Prio)
-    end.
-
-%%% ----------------------------------------------------------
-%%%     queue 
-%%% ----------------------------------------------------------
-
-queue(Key, Prio) ->
-    incr(Key, q),
-    T = {Key, Prio, now(), self()},
-    ets:insert(gcpFlowControlBitmap, #gcpFlowControlBitmap{key = T}),
-    wait(T).
-
-%%% ----------------------------------------------------------
-%%%     wait 
-%%% ----------------------------------------------------------
-
-wait({Key, _Prio, _When, _Self} = T) ->
-    receive
-        allow ->
-            ets:delete(gcpFlowControlBitmap, T),
-            decr(Key, available),
-            {true, no_stamp}
-    after ?ALLOW_TIMEOUT ->
-            timeout(T),
-            adjust_window(Key),
-            incr(Key, rejects),
-            false
-    end.
-
-timeout(T) ->
-    case ets:update_counter(gcpFlowControlBitmap, T, 1) of
-        1 ->
-            %% Got the lock: no one has released Key and sent 'allow'.
-            ets:delete(gcpFlowControlBitmap, T),
-            ok;
-        _ ->
-            %% A releasing process got the lock: 'allow' has been
-            %% sent. Try to remove the message before proceeding.
-            %% (This is to keep mdisp from complaining apparently.)
-            ets:delete(gcpFlowControlBitmap, T),
-            receive 
-                allow ->
-                    ok
-            after ?ALLOW_TIMEOUT ->
-                    io:format("~p: errant allow: ~p~n", [?MODULE, T])
-            end
-    end.
-
-%% Now, if we reject and our general response time is low
-%% (i.e. low bucket) then we increase the window size.
-adjust_window(Key) ->
-    adjust_window(Key,
-                  cntr(Key, bucket) < ?BUCKET_THRESH_LOW
-                  andalso cntr(Key, window) < ?MAX_WINDOW).
-
-adjust_window(Key, true) ->
-    incr(Key, window),
-    incr(Key, available),
-    incr(Key, bucket, 20);
-adjust_window(_, false) ->
-    ok.
-
-%%--------------------------------------------------------------------
-%% Func: report_time/2
-%%--------------------------------------------------------------------
-
-report_time(_, no_stamp) ->
-    ok;
-report_time(Key, {MS, S, Ms})->
-    {MegaSecs, Secs, MicroSecs} = now(),
-    p(Key,
-      MicroSecs - Ms + 1000000*(Secs - S + 1000000*(MegaSecs - MS)),
-      cntr(Key, t95)).
-
-%%% ----------------------------------------------------------
-%%%     p 
-%%% ----------------------------------------------------------
-
-p(Key, Time, T95) when Time =< T95 ->
-    decr(Key, bucket);
-p(Key, _Time, _T95) ->
-    %% If we have a long response time, then increase the leaky
-    %% bucket. If the bucket is over the high watermark and the window
-    %% is not already at its minimum size, then decrease the window
-    %% and available.
-    case {cntr(Key, window), incr(Key, bucket, 20)} of
-        {Window, Bucket} when Window > ?MIN_WINDOW,
-                              Bucket > ?BUCKET_THRESH_HIGH ->
-            decr(Key, window),
-            decr(Key, available);
-        _ ->
-            ok
-    end.
-
-%%% ----------------------------------------------------------
-%%%     release 
-%%% ----------------------------------------------------------
-
-release(Key) ->
-    %% The choice of the key below will cause ets:prev/2 to return
-    %% the key with the highest priority which was queued most
-    %% recently. This relies on the fact that integers sort before
-    %% atoms, the atom 'prio' in this case. The atoms 'queued' and
-    %% 'pid' are of no significance.
-    release(Key, {Key, prio, queued, pid}).
-
-%% This isn't a (FIFO) queue within each priority, but a (LIFO) stack.
-
-release(Key, T) ->
-    release(Key, cntr(Key, available), ets:prev(gcpFlowControlBitmap, T)).
-
-%% Note that only keys on the same Key are matched.
-release(Key, N, {Key, _Prio, _When, Pid} = T) when N > 0 ->
-    case catch ets:update_counter(gcpFlowControlBitmap, T, 1) of
-        1 ->
-            Pid ! allow;
-        _ ->
-            %% Another process has released this key.
-            release(Key, T)
-    end;
-
-release(_, _, _)->
-    ok.
-
-%%% ----------------------------------------------------------
-%%%     user_data
-%%% ----------------------------------------------------------
-
-user_data(ConnHandle) ->
-    case catch megaco:conn_info(ConnHandle, reply_data) of
-        {'EXIT', _Reason} ->
-            false;
-        Rec ->
-            {value, Rec}
-    end.
-
-%%% ----------------------------------------------------------
-%%%     grant_request 
-%%% ----------------------------------------------------------
-
-grant_request({value, Rec},
-              Key, Prio, Time,
-              ConnHandle, Options, ActionRequests, UserData) ->
-    ReplyData = Rec#gcpReplyData{user_data = UserData,
-                                 prio      = Prio,
-                                 timestamp = Time},
-    cast_rc(megaco:cast(ConnHandle,
-                        ActionRequests, 
-                        [{reply_data, ReplyData} | Options]),
-            Key,
-            ActionRequests);
-
-grant_request(false, Key, _, _, _, _, _, _) ->
-    incr(Key, available),
-    {error, reply_data}.
-
-cast_rc(ok = Ok, _, _) ->
-    Ok;
-cast_rc({error, Reason}, Key, ActionRequests) ->
-    incr(Key, available),
-    gcpLib:error_report(?MODULE, send_request, [ActionRequests],
-                        "send failed",
-                        Reason),
-    {error, {encode, Reason}}.
-
-%%--------------------------------------------------------------------
-%% Func: prio/1
-%% Returns: The priority of the request
-%%--------------------------------------------------------------------
-
-prio([ActionRequest | _]) ->
-    #'ActionRequest'{contextId = ContextId,
-                     contextRequest = ContextRequest}
-        = ActionRequest,
-    prio(ContextId, ContextRequest).
-
-prio(?megaco_choose_context_id, #'ContextRequest'{priority = Prio})
-  when integer(Prio) ->
-    Prio;
-prio(_, _) ->
-    ?PRIO_INFINITY.
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/src/qlc_error.erl b/lib/dialyzer/test/user_tests_SUITE_data/src/qlc_error.erl
deleted file mode 100644
index a6865c4562..0000000000
--- a/lib/dialyzer/test/user_tests_SUITE_data/src/qlc_error.erl
+++ /dev/null
@@ -1,15 +0,0 @@
-%% -*- erlang-indent-level: 2 -*-
-%% $Id: qlc_error.erl,v 1.1 2008/12/17 09:53:52 mikpe Exp $ 
-
-%% @author Daniel Luna <[email protected]>
-%% @copyright 2006 Daniel Luna
-%% 
-%% @doc 
-%% 
-
--module(qlc_error).
--export([fix/0]).
--include_lib("stdlib/include/qlc.hrl").
-
-fix() ->
-  qlc:eval(qlc:q([I || I <- []])).
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/src/spvcOrig.erl b/lib/dialyzer/test/user_tests_SUITE_data/src/spvcOrig.erl
deleted file mode 100644
index 70a3c4c7e2..0000000000
--- a/lib/dialyzer/test/user_tests_SUITE_data/src/spvcOrig.erl
+++ /dev/null
@@ -1,3523 +0,0 @@
-%%%=======================================================================
-%%%
-%%% Test from Mats Cronqvist <[email protected]>. The
-%%% analysis crasched due to the handling of tuples-as-funs in
-%%% hipe_icode_type.erl, and it also exposed a bug when a control flow
-%%% path is first analyzed and then shown to be infeasible.
-%%%
-
--file("./spvcOrig.erl", 1).
-
--module(spvcOrig).
-
--author(qamarma).
-
--id('3/190 55-CNA 121 64').
-
--vsn('/main/Inc4/R2A/R4A/R6A/R7A/R7D/R8B/R10A/R11A/2').
-
--date('2004-10-26').
-
--export([gen_set/3,gen_set/4,connect/3,release_comp_nu/3,release_nu/3,timeout/2,restart_spvc/1,restart_multi_spvcs/1,forced_release/1,error_handler/3,get_backoff_table/2,timeout_event/1]).
-
--export([release_incumbent/2,switch_over/2]).
-
--export([call_failure/1,get_backoff_table/2]).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/pchTables.hrl", 1).
-
--hrl_id('2/190 55-CNA 121 08').
-
--hrl_vsn('/main/Inc3/Inc4/R2A/R3A/R3B/R5A/R6A/R7A/R7D/R8B/13').
-
--hrl_date('2003-01-24').
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../derived_hrl/mib/AXD301-PCH-MIB.hrl", 1).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/pchTables.hrl", 58).
-
--record(pchVp, {vplEntry,
-                vplLastChange,
-                vplReceiveTrafficDescrIndex = 0,
-                vplTransmitTrafficDescrIndex = 0,
-                vplCcIdentifier,
-                vplConnId,
-                vplMpId,
-                vplLeafId,
-                vplChargingIndicator = 1,
-                vplRemoteChargingInd = 1,
-                vplChargablePartyIdentifier,
-                vplSegmentEndPoint = 2,
-                vplRowStatus,
-                vplCastType = 1,
-                vplConnKind = 1,
-                vplServiceType = 2,
-                vplEndPointData,
-                vplContinuityCheck = 1,
-                vplUpcNpcMode = 2,
-                vplPreventInbandCc = 1,
-                vplMonAisRdi = 2,
-                vpcAdminStatus = 2,
-                vplSpvcAutoTarget = 2,
-                vplSchedulingFlag = 2,
-                vplApplication,
-                vplRemoteData,
-                vpccAdminStatus = 2,
-                vplContCheckSearch = 1,
-                vplPmSearch = 1,
-                vplLastBuffFlagRead,
-                vplShapingMode = 1,
-                vplGroupShapingId}).
-
--record(pchVpDb, {vplEntry,
-                  vplLastChange,
-                  vplReceiveTrafficDescrIndex = 0,
-                  vplTransmitTrafficDescrIndex = 0,
-                  vplCcIdentifier,
-                  vplConnId,
-                  vplMpId,
-                  vplLeafId,
-                  vplAttributes,
-                  vplChargablePartyIdentifier,
-                  vplRowStatus,
-                  vplEndPointData,
-                  vplApplication,
-                  vplRemoteData,
-                  vplLastBuffFlagRead,
-                  vplShapingMode,
-                  vplGroupShapingId}).
-
--record(pchVpExt, {vplExtEntry,
-                   vplExtReceiveTdIndex,
-                   vplExtTransmitTdIndex,
-                   vplExtUserName = [],
-                   vplExtProviderName = [],
-                   vplExtUserOperator}).
-
--record(pchVc, {vclEntry,
-                vclLastChange,
-                vclReceiveTrafficDescrIndex = 0,
-                vclTransmitTrafficDescrIndex = 0,
-                vclCcIdentifier,
-                vclConnId,
-                vclMpId,
-                vclLeafId,
-                vclChargingIndicator = 1,
-                vclRemoteChargingInd = 1,
-                vclChargablePartyIdentifier,
-                vclPacketDiscard = 2,
-                vclSegmentEndPoint = 2,
-                vclRowStatus,
-                vclCastType = 1,
-                vclConnKind = 1,
-                vclContinuityCheck = 1,
-                vclUpcNpcMode = 2,
-                vclEndPointData,
-                vclPreventInbandCc = 1,
-                vclMonAisRdi = 2,
-                vclSpvcAutoTarget = 2,
-                vclSchedulingFlag = 2,
-                vclApplication,
-                vclRemoteData,
-                vcccAdminStatus = 2,
-                vclContCheckSearch = 1,
-                vclPmSearch = 1,
-                vclLastBuffFlagRead,
-                vclChargingIfChanid,
-                vclShapingMode = 1}).
-
--record(pchVcDb, {vclEntry,
-                  vclLastChange,
-                  vclReceiveTrafficDescrIndex = 0,
-                  vclTransmitTrafficDescrIndex = 0,
-                  vclCcIdentifier,
-                  vclConnId,
-                  vclMpId,
-                  vclLeafId,
-                  vclAttributes,
-                  vclChargablePartyIdentifier,
-                  vclRowStatus,
-                  vclEndPointData,
-                  vclApplication,
-                  vclRemoteData,
-                  vclLastBuffFlagRead,
-                  vclChargingIfChanid,
-                  vclShapingMode}).
-
--record(pchAtd, {tdIndex,
-                 tdType,
-                 tdParam1 = 0,
-                 tdParam2 = 0,
-                 tdParam3 = 0,
-                 tdParam4 = 0,
-                 tdParam5 = 0,
-                 tdTrafficQoSClass = 0,
-                 tdRowStatus = 1,
-                 tdServiceCategory = 6,
-                 tdVcCapability = 1,
-                 tdName = [],
-                 tdUserCounter = 0,
-                 tdUser = []}).
-
--record(pchAbr, {abrIndex,
-                 abrIcr,
-                 abrTbe = 16277215,
-                 abrFrtt = 0,
-                 abrRdf = 11,
-                 abrRif = 11,
-                 abrNrm = 4,
-                 abrTrm = 7,
-                 abrCdf = 3,
-                 abrAdtf = 50,
-                 abrRowStatus = 1}).
-
--record(pchIndexNext, {key,
-                       tdIndexNext,
-                       vpccIndexNext,
-                       vcccIndexNext,
-                       scheduledVpCcIndexNext,
-                       scheduledVcCcIndexNext}).
-
--record(pchSchedVpCc, {schedVpCcIndex,
-                       schedVpCcTarget,
-                       schedVpCcReceiveTdIndex,
-                       schedVpCcTransmitTdIndex,
-                       schedVpCcOpTime,
-                       schedVpCcOpInd,
-                       schedVpCcOpStatus,
-                       schedVpCcTimerRef,
-                       schedVpCcRowStatus,
-                       schedVpCcErrorCode,
-                       schedVpCcUserName = [],
-                       schedVpCcProviderName = []}).
-
--record(pchVpCc, {vpccId,
-                  vpccUserName = [],
-                  vpccAdminStatus,
-                  vpccApplication,
-                  vpccProviderName = []}).
-
--record(pchSchedVcCc, {schedVcCcIndex,
-                       schedVcCcTarget,
-                       schedVcCcReceiveTdIndex,
-                       schedVcCcTransmitTdIndex,
-                       schedVcCcOpTime,
-                       schedVcCcOpInd,
-                       schedVcCcOpStatus,
-                       schedVcCcTimerRef,
-                       schedVcCcRowStatus,
-                       schedVcCcErrorCode,
-                       schedVcCcUserName = [],
-                       schedVcCcProviderName = []}).
-
--record(pchVcCc, {vcccId,
-                  vcccUserName = [],
-                  vcccAdminStatus,
-                  vcccApplication,
-                  vcccProviderName = []}).
-
--record(pchSigChannels, {et_entry,
-                         cp_entry,
-                         sb_cp_entry,
-                         membership,
-                         status,
-                         sb_status,
-                         application = {0,[]}}).
-
--record(pchSigChannelExt, {et_entry,
-                           user_name,
-                           provider_name}).
-
--record(pchApplication, {key,
-                         application,
-                         rights}).
-
--record(pchCurrAlarm, {key,
-                       type_of_fault,
-                       fault_id}).
-
--record(pchIfAddress, {ifAddressEntry,
-                       ifAddressRowStatus}).
-
--record(pchAddressToIf, {address,
-                         if_index}).
-
--record(pchPreferences, {key,
-                         if_format}).
-
--record(pchSigChannelCallback, {key,
-                                callback,
-                                function,
-                                args,
-                                data}).
-
--record(pchTermHcId, {hcId,
-                      vclEntry}).
-
--record(pchChg, {chgEntry,
-                 chgStatus}).
-
--record(pchCommState, {key,
-                       ccid,
-                       request,
-                       low_cp_state,
-                       high_cp_state,
-                       et_side,
-                       application,
-                       data,
-                       timestamp,
-                       timer_id,
-                       callback}).
-
--record(pchBufferedCmd, {key,
-                         resource,
-                         module,
-                         function,
-                         arguments,
-                         data}).
-
--record(pchAnswerCh, {conn_id,
-                      chg_data,
-                      call_back_cp,
-                      old_rtd,
-                      old_ttd,
-                      old_EpData,
-                      action,
-                      resource,
-                      data,
-                      fail_cause}).
-
--record(pchAnswerOm, {conn_id}).
-
--record(ccPch, {rowInd,
-                admState = 2}).
-
--record(pchIf, {ilmiVpi = 0,
-                ilmiVci = 0,
-                ilmiS = 1,
-                ilmiT = 5,
-                ilmiK = 4,
-                neighborIfName = [],
-                neighborIpAddr = [0,0,0,0],
-                maxVciSvc,
-                overbookingFactor = {0,0},
-                shapingMode = 0,
-                maxVpiSvc,
-                cdvtMultFactor = 100,
-                scBandwidth1 = 0,
-                scBandwidth2 = 0,
-                scBandwidth3 = 0,
-                scBandwidth4 = 0}).
-
--record(pchMpTemp, {key,
-                    data}).
-
--record(pchLatestErrorCode, {key,
-                             errorCode}).
-
--record(pchRangeTable, {node,
-                        tdIndexRange,
-                        vpccIndexRange,
-                        vcccIndexRange}).
-
--record(pchIndexBitmaps, {key,
-                          available,
-                          bitmap}).
-
--record(pchLinkState, {key,
-                       op_state,
-                       last_change}).
-
--record(pchFailedVpl, {vplEntry,
-                       vplLastChange}).
-
--record(pchFailedVcl, {vclEntry,
-                       vclLastChange}).
-
--record(pchStatCounters, {key,
-                          ingress,
-                          egress}).
-
--record(pchEtStatTable, {index,
-                         value = 0}).
-
--record(pchAuditResult, {key,
-                         passed,
-                         not_passed,
-                         sizes,
-                         obj_keys}).
-
--record(pch_fault_reqc, {fault_type,
-                         fault_location}).
-
--record(pch_cid, {conn_id,
-                  mp_id,
-                  leaf_id}).
-
--file("./spvcOrig.erl", 207).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/pchI.hrl", 1).
-
--hrl_id('52/190 55-CNA 121 08 Ux').
-
--hrl_vsn('/main/R6A/R7A/R7D/R8B/3').
-
--hrl_date('2002-10-14').
-
--hrl_author(uabdomo).
-
--record(pch_vc_rec, {ifIndex,
-                     vpi,
-                     vci,
-                     application}).
-
--record(pch_vp_rec, {ifIndex,
-                     vpi}).
-
--record(pch_td_index, {rtd_index,
-                       ttd_index}).
-
--record(pch_td, {service_cat,
-                 pcr,
-                 scr,
-                 mbs,
-                 mcr,
-                 cdvt,
-                 tagging,
-                 clp_significance}).
-
--record(pch_call_back_req, {module,
-                            function,
-                            user_data}).
-
--record(pch_chg_rec, {chg_type,
-                      chg_interface,
-                      chg_chan_id,
-                      chg_party_name}).
-
--record(pch_polic_rec, {policing,
-                        packet_discard}).
-
--record(pch_user_name_rec, {user_name}).
-
--record(pch_shaping_rec, {shaping}).
-
--record(pch_audit_callback, {mod,
-                             arg}).
-
--file("./spvcOrig.erl", 208).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/plc.hrl", 1).
-
--hrl_id('12/190 55-CNA 121 45 Ux').
-
--hrl_vsn('/main/R6A/R6B/R7A/R7D/R8B/R9A/R11A/4').
-
--hrl_date('2004-12-07').
-
--hrl_author(ethrba).
-
--record(plcQueues, {name,
-                    type,
-                    weight,
-                    maxlength,
-                    owner}).
-
--record(plcSettings, {flag,
-                      value}).
-
--record(plcAlarm, {flag,
-                   value}).
-
--file("./spvcOrig.erl", 209).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/spvcTables.hrl", 1).
-
--hrl_id('10/190 55-CNA 121 64').
-
--hrl_vsn('/main/Inc4/R2A/R3A/R3B/R5A/R6A/R7A/R7D/R8B/4').
-
--hrl_date('2003-02-12').
-
--hrl_author(etxovp).
-
--record(spvcVpc, {spvcVpcEntry,
-                  spvcVpcTargetAddress,
-                  spvcVpcTargetSelectType,
-                  spvcVpcTargetVpi,
-                  spvcVpcLastReleaseCause,
-                  spvcVpcLastReleaseDiagnostic,
-                  spvcVpcRetryInterval = 1000,
-                  spvcVpcRetryTimer = 0,
-                  spvcVpcRetryThreshold = 1,
-                  spvcVpcRetryFailures = 0,
-                  spvcVpcRetryLimit = 15,
-                  spvcVpcRowStatus,
-                  spvcVpcUserName = [],
-                  spvcVpcProviderName = [],
-                  currentState,
-                  crankBackCounter = 0,
-                  spvcVpcApplication,
-                  spvcRerCap = false,
-                  spvcRerStatus = false}).
-
--record(spvcVpcOpState, {state,
-                         timeOfChange}).
-
--record(spvcVpcPerm, {spvcVpcEntry,
-                      spvcVpcTargetAddress,
-                      spvcVpcTargetSelectType,
-                      spvcVpcTargetVpi,
-                      spvcVpcRetryInterval = 1000,
-                      spvcVpcRetryThreshold = 1,
-                      spvcVpcRetryLimit = 15,
-                      spvcVpcRowStatus,
-                      spvcVpcUserName,
-                      spvcVpcProviderName,
-                      spvcVpcApplication}).
-
--record(spvcVpcDyn, {spvcVpcEntry,
-                     spvcVpcLastReleaseCause,
-                     spvcVpcLastReleaseDiagnostic,
-                     spvcVpcRetryTimer = 0,
-                     spvcVpcRetryFailures = 0,
-                     currentState,
-                     crankBackCounter = 0}).
-
--record(spvcVcc, {spvcVccEntry,
-                  spvcVccTargetAddress,
-                  spvcVccTargetSelectType,
-                  spvcVccTargetVpi,
-                  spvcVccTargetVci,
-                  spvcVccLastReleaseCause,
-                  spvcVccLastReleaseDiagnostic,
-                  spvcVccRetryInterval = 1000,
-                  spvcVccRetryTimer = 0,
-                  spvcVccRetryThreshold = 1,
-                  spvcVccRetryFailures = 0,
-                  spvcVccRetryLimit = 15,
-                  spvcVccRowStatus,
-                  spvcVccUserName = [],
-                  spvcVccProviderName = [],
-                  currentState,
-                  crankBackCounter = 0,
-                  spvcVccTargetDlci,
-                  spvcVccTargetType,
-                  spvcVccApplication,
-                  spvcVccFrKey,
-                  spvcVccTranslationMode,
-                  spvcRerCap = false,
-                  spvcRerStatus = false}).
-
--record(spvcVccOpState, {state,
-                         timeOfChange}).
-
--record(spvcVccPerm, {spvcVccEntry,
-                      spvcVccTargetAddress,
-                      spvcVccTargetSelectType,
-                      spvcVccTargetVpi,
-                      spvcVccTargetVci,
-                      spvcVccRetryInterval = 1000,
-                      spvcVccRetryThreshold = 1,
-                      spvcVccRetryLimit = 15,
-                      spvcVccRowStatus,
-                      spvcVccUserName,
-                      spvcVccProviderName,
-                      spvcVccTargetDlci,
-                      spvcVccTargetType,
-                      spvcVccApplication,
-                      spvcVccFrKey,
-                      spvcVccTranslationMode = 2}).
-
--record(spvcVccDyn, {spvcVccEntry,
-                     spvcVccLastReleaseCause,
-                     spvcVccLastReleaseDiagnostic,
-                     spvcVccRetryTimer = 0,
-                     spvcVccRetryFailures = 0,
-                     currentState,
-                     crankBackCounter = 0}).
-
--record(spvcFailures, {dummy_key,
-                       spvcCallFailuresTrapEnable = 2,
-                       spvcNotificationInterval = 30,
-                       backoff_interval = 0.100000,
-                       delay_factor = 2,
-                       max_delay = 200000}).
-
--record(spvcCounters, {key,
-                       value}).
-
--record(spvcEventIndicator, {dummy_key,
-                             spvcTimerInd = 2,
-                             spvcSendEventInd = 2}).
-
--record(spvcIndexNext, {dummy_key,
-                        schedVccIndexNext = 1,
-                        schedVpcIndexNext = 1}).
-
--record(spvcHcIdToTp, {hcId,
-                       tpEntry}).
-
--record(spvcTpToHcId, {tpEntry,
-                       hcId,
-                       orig_number,
-                       orig_vpi,
-                       orig_vci,
-                       orig_dlci,
-                       frKey}).
-
--record(spvcSchedVpc, {schedVpcIndex,
-                       schedVpcSource,
-                       schedVpcTargetAddr,
-                       schedVpcTargetSelType,
-                       schedVpcTargetVpi,
-                       schedVpcRetryInt,
-                       schedVpcRetryThres,
-                       schedVpcRetryLimit,
-                       schedVpcOpTime,
-                       schedVpcOpInd,
-                       schedVpcOpStatus,
-                       schedVpcTimerRef,
-                       schedVpcRowStatus,
-                       schedVpcUserName,
-                       schedVpcProviderName,
-                       schedVpcFaultCause,
-                       schedVpcRerCap = false}).
-
--record(spvcSchedVcc, {schedVccIndex,
-                       schedVccSource,
-                       schedVccTargetAddr,
-                       schedVccTargetSelType,
-                       schedVccTargetVpi,
-                       schedVccTargetVci,
-                       schedVccRetryInt,
-                       schedVccRetryThres,
-                       schedVccRetryLimit,
-                       schedVccOpTime,
-                       schedVccOpInd,
-                       schedVccOpStatus,
-                       schedVccTimerRef,
-                       schedVccRowStatus,
-                       schedVccUserName,
-                       schedVccProviderName,
-                       schedVccFaultCause,
-                       schedVccRerCap = false}).
-
--record(spvcCurrAlarm, {key,
-                        fault_id,
-                        data}).
-
--record(spvcChg, {key,
-                  data}).
-
--record(spvcBackoff, {key,
-                      delay_time,
-                      flag}).
-
--record(spvcAutoVp, {entry,
-                     lastChange,
-                     receiveTrafficDescrIndex,
-                     transmitTrafficDescrIndex,
-                     ccIdentifier,
-                     connId,
-                     mpId,
-                     leafId,
-                     chargingIndicator = 1,
-                     remoteChargingInd = 1,
-                     chargablePartyIdentifier,
-                     segmentEndPoint = 2,
-                     rowStatus,
-                     castType = 1,
-                     connKind,
-                     serviceType = 2,
-                     endPointData,
-                     continuityCheck = 1,
-                     upcNpcMode = 2,
-                     preventInbandCc = 1,
-                     monAisRdi = 2,
-                     adminStatus,
-                     autoTarget = 1,
-                     schedulingFlag = 2,
-                     application = [],
-                     remoteData,
-                     vpccAdminStatus = 2,
-                     contCheckSearch = 1,
-                     pmSearch = 1,
-                     lastBuffFlagRead,
-                     shapingMode = 1,
-                     groupShapingId}).
-
--record(spvcAutoVc, {entry,
-                     lastChange,
-                     receiveTrafficDescrIndex,
-                     transmitTrafficDescrIndex,
-                     ccIdentifier,
-                     connId,
-                     mpId,
-                     leafId,
-                     chargingIndicator = 1,
-                     remoteChargingInd = 1,
-                     chargablePartyIdentifier,
-                     packetDiscard = 2,
-                     segmentEndPoint = 2,
-                     rowStatus,
-                     castType = 1,
-                     connKind,
-                     continuityCheck = 1,
-                     upcNpcMode = 2,
-                     endPointData,
-                     preventInbandCc = 1,
-                     monAisRdi = 2,
-                     autoTarget = 1,
-                     schedulingFlag = 2,
-                     application = [],
-                     remoteData,
-                     vcccAdminStatus = 2,
-                     contCheckSearch = 1,
-                     pmSearch = 1,
-                     lastBuffFlagRead,
-                     chargingIfChanid,
-                     shapingMode = 1}).
-
--record(spvcAutoAtd, {index,
-                      type,
-                      param1 = 0,
-                      param2 = 0,
-                      param3 = 0,
-                      param4 = 0,
-                      param5 = 0,
-                      trafficQoSClass = 0,
-                      rowStatus = 1,
-                      serviceCategory = 6,
-                      vcCapability = 1,
-                      name = [],
-                      userCounter = 0}).
-
--record(spvcAutoAbr, {index,
-                      icr,
-                      tbe = 16277215,
-                      frtt = 0,
-                      rdf = 11,
-                      rif = 11,
-                      nrm = 4,
-                      trm = 7,
-                      cdf = 3,
-                      adtf = 50,
-                      rowStatus = 1}).
-
--record(spvcLatestErrorCode, {key,
-                              errorCode}).
-
--record(spvcVcDyn, {vclEntry,
-                    vclCcIdentifier,
-                    vclConnId,
-                    vclMpId,
-                    vclLeafId}).
-
--record(spvcVpDyn, {vplEntry,
-                    vplCcIdentifier,
-                    vplConnId,
-                    vplMpId,
-                    vplLeafId}).
-
--record(spvcObj, {spvcEntry,
-                  spvcTargetAddress,
-                  spvcTargetSelectType,
-                  spvcTargetVpi,
-                  spvcTargetVci,
-                  spvcLastReleaseCause,
-                  spvcLastReleaseDiagnostic,
-                  spvcRetryInterval = 1000,
-                  spvcRetryTimer = 0,
-                  spvcRetryThreshold = 1,
-                  spvcRetryFailures = 0,
-                  spvcRetryLimit = 15,
-                  spvcRowStatus,
-                  spvcUserName,
-                  spvcProviderName,
-                  currentState,
-                  spvcTargetDlci,
-                  spvcTargetType,
-                  spvcApplication,
-                  spvcFrKey,
-                  spvcVccTranslationMode = 2,
-                  spvcRerCap = false,
-                  spvcRerStatus = false}).
-
--record(spvcTargetVc, {entry,
-                       userName = [],
-                       providerName = [],
-                       opState,
-                       rowStatus}).
-
--record(spvcTargetVp, {entry,
-                       userName = [],
-                       providerName = [],
-                       opState,
-                       rowStatus}).
-
--record(spvcReestablishTimer, {time,
-                               timer_id,
-                               module,
-                               function,
-                               args}).
-
--record(spvcRerVp, {entry,
-                    rerCap,
-                    rerData}).
-
--record(spvcRerVc, {entry,
-                    rerCap,
-                    rerData}).
-
--record(spvcHcEtStat, {key,
-                       counter = 0}).
-
--record(spvcSaEtStat, {key,
-                       counter = 0}).
-
--file("./spvcOrig.erl", 210).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/spvcDefines.hrl", 1).
-
--hrl_id('41/190 55-CNA 121 64 Ux').
-
--hrl_vsn('/main/R6A/R7A/R7D/R8B/3').
-
--hrl_date('2003-02-21').
-
--hrl_author(etxhebl).
-
--file("./spvcOrig.erl", 211).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/spvcFr.hrl", 1).
-
--hrl_id('48/190 55-CNA 121 64 Ux').
-
--hrl_vsn('/main/R7A/R7D/2').
-
--hrl_date('2001-12-06').
-
--hrl_author(etxhtb).
-
--record(spvcFr, {spvcFrEntry,
-                 spvcFrAtmEntry,
-                 spvcFrTargetAddress,
-                 spvcFrTargetSelectType,
-                 spvcFrTargetIdentifier,
-                 spvcFrTargetVpi,
-                 spvcFrTargetVci,
-                 spvcFrAtmTranslation,
-                 spvcFrLastReleaseCause,
-                 spvcFrLastReleaseDiagnostic,
-                 spvcFrAdminStatus,
-                 spvcFrRetryInterval = 1000,
-                 spvcFrRetryTimer = 0,
-                 spvcFrRetryThreshold = 1,
-                 spvcFrRetryFailures = 0,
-                 spvcFrRetryLimit = 15,
-                 spvcFrRowStatus,
-                 spvcFrUserName,
-                 spvcFrProviderName,
-                 currentState}).
-
--record(spvcFrPerm, {spvcFrEntry,
-                     spvcFrAtmEntry,
-                     spvcFrAtmTranslation,
-                     spvcFrAdminStatus,
-                     spvcFrConnect}).
-
--record(spvcFrAddress, {addressEntry,
-                        addressRowStatus}).
-
--record(spvcFrAddressToIf, {address,
-                            if_index}).
-
--record(fr_end_point, {ifIndex,
-                       dlci}).
-
--record(fr_atm_translation, {routedIp = off,
-                             routedOsi = off,
-                             otherRouted = off,
-                             arpTranslation = off}).
-
--record(link_layer_core_parameters, {outgoing_max_ifs,
-                                     incoming_max_ifs}).
-
--record(priority_and_service_class, {outgoing_transfer_priority,
-                                     incoming_transfer_priority,
-                                     outgoing_discard_priority,
-                                     incoming_discard_priority}).
-
--file("./spvcOrig.erl", 212).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../derived_hrl/mib/AXD301-PCH-MIB.hrl", 1).
-
--file("./spvcOrig.erl", 213).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../derived_hrl/mib/AXD301-SPVC-MIB.hrl", 1).
-
--file("./spvcOrig.erl", 214).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../derived_hrl/mib/AXD301-FRSPVC-MIB.hrl", 1).
-
--file("./spvcOrig.erl", 215).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/sysDefines.hrl", 1).
-
--hrl_id('3/190 55-CNA 121 70').
-
--hrl_vsn('/main/Inc3/Inc4/Inc5/R3B/R4A/R5B/R6A/R7A/R8B/2').
-
--hrl_date('2002-06-07').
-
--hrl_author(etxjotj).
-
--file("./spvcOrig.erl", 216).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/hciMsg.hrl", 1).
-
--hrl_id('4/190 55-CNA 121 159 Ux').
-
--hrl_vsn('/main/R7A/R8B/10').
-
--hrl_date('2003-02-21').
-
--hrl_author(etxmexa).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/hciComp.hrl", 1).
-
--hrl_id('3/190 55-CNA 121 159 Ux').
-
--hrl_vsn('/main/R7A/1').
-
--hrl_date('00-03-22').
-
--hrl_author(etxmexa).
-
--record(hci_comp_info, {required_FC = 0,
-                        desired_FC = 0}).
-
--record(hci_comp_res, {not_supported_required_FCs,
-                       not_supported_desired_FCs,
-                       all_supported_FCs}).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/hciMsg.hrl", 14).
-
--record(hci_add_party, {hci_cpn,
-                        hci_aal,
-                        hci_bhli,
-                        hci_blli,
-                        hci_blli_bici,
-                        hci_bsco,
-                        hci_epr,
-                        hci_e2etd,
-                        hci_noti,
-                        hci_cpsa,
-                        hci_clpn,
-                        hci_clpsa,
-                        hci_cpn_soft,
-                        hci_clpn_soft,
-                        hci_geidt_list = [],
-                        hci_dtl_bin_list = [],
-                        hci_pa_list = [],
-                        hci_gat_list = [],
-                        hci_data,
-                        hci_prot_comp}).
-
--record(hci_add_party_ack, {hci_epr,
-                            hci_aal,
-                            hci_blli,
-                            hci_blli_bici,
-                            hci_e2etd,
-                            hci_noti,
-                            hci_cpn_soft,
-                            hci_cnosa,
-                            hci_cno,
-                            hci_geidt_list = [],
-                            hci_pa_list = [],
-                            hci_gat_list = [],
-                            hci_data,
-                            hci_prot_comp}).
-
--record(hci_add_party_rej, {hci_cause,
-                            hci_epr,
-                            hci_geidt_list = [],
-                            hci_cb,
-                            hci_pa_list = [],
-                            hci_internal_rel_info,
-                            hci_gat_list = [],
-                            hci_data,
-                            hci_prot_comp}).
-
--record(hci_alerting, {hci_mci,
-                       hci_unrps,
-                       hci_cdpi,
-                       hci_epr,
-                       hci_prog_list = [],
-                       hci_nbc,
-                       hci_nbhlc,
-                       hci_noti,
-                       hci_geidt_list = [],
-                       hci_pa_list = [],
-                       hci_gat_list = [],
-                       hci_ssie,
-                       hci_data,
-                       hci_prot_comp}).
-
--record(hci_b_resources, {hci_rem_dataB,
-                          hci_vpiB,
-                          hci_vciB,
-                          hci_data,
-                          hci_prot_comp}).
-
--record(hci_connect, {hci_mci,
-                      hci_unrps,
-                      hci_aal,
-                      hci_blli,
-                      hci_blli_bici,
-                      hci_epr,
-                      hci_atd,
-                      hci_e2etd,
-                      hci_noti,
-                      hci_abrs,
-                      hci_abra,
-                      hci_nbc,
-                      hci_nbhlc,
-                      hci_nbllc,
-                      hci_prog_list = [],
-                      hci_geidt_list = [],
-                      hci_eqos,
-                      hci_cpn_soft,
-                      hci_cnosa,
-                      hci_cno,
-                      hci_pa_list = [],
-                      hci_gat_list = [],
-                      hci_rem_dataB,
-                      hci_con_dir = both,
-                      hci_ssie,
-                      hci_rer_services,
-                      hci_rer,
-                      hci_opt_traf,
-                      hci_data,
-                      hci_prot_comp}).
-
--record(hci_drop_party, {hci_cause,
-                         hci_epr,
-                         hci_noti,
-                         hci_geidt_list = [],
-                         hci_pa_list = [],
-                         hci_internal_rel_info,
-                         hci_gat_list = [],
-                         hci_data,
-                         hci_prot_comp}).
-
--record(hci_local_connect, {hci_rem_data,
-                            hci_con_dir,
-                            hci_data,
-                            hci_prot_comp}).
-
--record(hci_local_connected, {hci_rem_data,
-                              hci_con_dir,
-                              hci_data,
-                              hci_prot_comp}).
-
--record(hci_local_disconnect, {hci_discon_dir,
-                               hci_data,
-                               hci_prot_comp}).
-
--record(hci_local_disconnected, {hci_data,
-                                 hci_prot_comp}).
-
--record(hci_notify, {hci_epr,
-                     hci_noti,
-                     hci_pa_list = [],
-                     hci_gat_list = [],
-                     hci_data,
-                     hci_prot_comp}).
-
--record(hci_party_alerting, {hci_epr,
-                             hci_noti,
-                             hci_geidt_list = [],
-                             hci_pa_list = [],
-                             hci_gat_list = [],
-                             hci_data,
-                             hci_prot_comp}).
-
--record(hci_progress, {hci_mci,
-                       hci_unrps,
-                       hci_cdpi,
-                       hci_prog_list = [],
-                       hci_nbc,
-                       hci_nbhlc,
-                       hci_noti,
-                       hci_pa_list = [],
-                       hci_gat_list = [],
-                       hci_data,
-                       hci_prot_comp}).
-
--record(hci_release, {hci_mci,
-                      hci_unrps,
-                      hci_cause_list = [],
-                      hci_noti,
-                      hci_prog_list = [],
-                      hci_geidt_list = [],
-                      hci_cb,
-                      hci_pa_list = [],
-                      hci_internal_rel_info,
-                      hci_gat_list = [],
-                      hci_ssie,
-                      hci_rer_cause,
-                      hci_data,
-                      hci_prot_comp,
-                      hci_internal_dbg_cc,
-                      hci_internal_dbg_l3}).
-
--record(hci_setup, {hci_mci,
-                    hci_unrps,
-                    hci_atd,
-                    hci_bbc,
-                    hci_qos,
-                    hci_cpn,
-                    hci_aal,
-                    hci_bhli,
-                    hci_blli_brep,
-                    hci_blli_bici,
-                    hci_bsco,
-                    hci_epr,
-                    hci_lpt,
-                    hci_e2etd,
-                    hci_noti,
-                    hci_abrs,
-                    hci_abra,
-                    hci_prog_list = [],
-                    hci_eqos,
-                    hci_cpsa_list = [],
-                    hci_clpn,
-                    hci_bici_clpn,
-                    hci_clpsa_list = [],
-                    hci_cgpc,
-                    hci_nbc_brep,
-                    hci_nbhlc_list = [],
-                    hci_nbllc_brep,
-                    hci_conss,
-                    hci_geidt_list = [],
-                    hci_cpn_soft,
-                    hci_clpn_soft,
-                    hci_dtl_bin_list = [],
-                    hci_pa_list = [],
-                    hci_ncci,
-                    hci_routing_address,
-                    hci_protocol_internal_info,
-                    hci_gat_list = [],
-                    hci_con_dir = both,
-                    hci_ssie,
-                    hci_rer_services,
-                    hci_rer,
-                    hci_opt_traf,
-                    hci_data_setup,
-                    hci_prot_comp}).
-
--record(hci_setup_ack, {hci_assign,
-                        hci_rem_dataB,
-                        hci_con_dir = both,
-                        hci_vpiB,
-                        hci_vciB,
-                        hci_data,
-                        hci_prot_comp}).
-
--record(hci_status, {hci_state,
-                     hci_data,
-                     hci_prot_comp}).
-
--record(hci_status_enq, {hci_state,
-                         hci_data,
-                         hci_prot_comp}).
-
--record(hci_remote_data, {hci_prot_type,
-                          hci_data,
-                          hci_dummy1,
-                          hci_dummy2}).
-
--record(hci_unrec, {hci_mci,
-                    hci_head,
-                    hci_binary,
-                    hci_data,
-                    hci_prot_comp}).
-
--record(hci_atd, {hci_pci,
-                  hci_apci,
-                  hci_fwd_pcr_clp_0,
-                  hci_bwd_pcr_clp_0,
-                  hci_fwd_pcr_clp_0_1,
-                  hci_bwd_pcr_clp_0_1,
-                  hci_fwd_scr_clp_0,
-                  hci_bwd_scr_clp_0,
-                  hci_fwd_scr_clp_0_1,
-                  hci_bwd_scr_clp_0_1,
-                  hci_fwd_mbs_clp_0,
-                  hci_bwd_mbs_clp_0,
-                  hci_fwd_mbs_clp_0_1,
-                  hci_bwd_mbs_clp_0_1,
-                  hci_best_effort_ind = 0,
-                  hci_fwd_frame_discard = 0,
-                  hci_bwd_frame_discard = 0,
-                  hci_tagging_bwd = 0,
-                  hci_tagging_fwd = 0,
-                  hci_fwd_abr_mcr,
-                  hci_bwd_abr_mcr,
-                  hci_binary}).
-
--record(hci_bbc, {hci_pci,
-                  hci_bearer_class,
-                  hci_atm_transfer_capability,
-                  hci_user_plane_connection_configuration,
-                  hci_susceptibility_to_clipping,
-                  hci_binary}).
-
--record(hci_cause, {hci_pci,
-                    hci_location,
-                    hci_cause_value,
-                    hci_diagnostics_list = [],
-                    hci_binary}).
-
--record(hci_cpn, {hci_pci,
-                  hci_type_of_number,
-                  hci_intern_netw_numb_indic,
-                  hci_numbering_plan_indicator,
-                  hci_number_digits,
-                  hci_orig_native = false}).
-
--record(hci_clpn, {hci_pci,
-                   hci_type_of_number,
-                   hci_numbering_plan_indicator,
-                   hci_presentation_indicator,
-                   hci_screening_indicator,
-                   hci_number_digits,
-                   hci_incomplete_indicator = 0,
-                   hci_binary}).
-
--record(hci_cno, {hci_type_of_number,
-                  hci_numbering_plan_indicator,
-                  hci_presentation_indicator,
-                  hci_screening_indicator,
-                  hci_number_digits,
-                  hci_binary}).
-
--record(hci_cnosa, {hci_binary}).
-
--record(hci_cpn_soft, {hci_select_type,
-                       hci_soft_vpi,
-                       hci_soft_vci,
-                       hci_soft_dlci,
-                       hci_binary}).
-
--record(hci_clpn_soft, {hci_soft_vpi,
-                        hci_soft_vci,
-                        hci_soft_dlci,
-                        hci_binary}).
-
--record(hci_rer_services, {hci_inter_req_hard,
-                           hci_inter_cap_hard,
-                           hci_intra_req_soft,
-                           hci_intra_req_hard,
-                           hci_intra_cap_asym,
-                           hci_intra_cap_sym,
-                           hci_intra_cap_hard,
-                           hci_binary}).
-
--record(hci_rer, {hci_func_addr,
-                  hci_endpoint_key,
-                  hci_switchover,
-                  hci_incarnation,
-                  hci_pnni_cumul_fw_max_cell_td,
-                  hci_cumul_fw_p2p_cdv,
-                  hci_cumul_bw_p2p_cdv,
-                  hci_binary}).
-
--record(hci_rer_cause, {hci_rer_rel_cause,
-                        hci_binary}).
-
--record(hci_opt_traf, {hci_origin,
-                       hci_cumul_fw_aw,
-                       hci_cumul_bw_aw,
-                       hci_binary}).
-
--record(hci_qos, {hci_pci,
-                  hci_qos_class_fwd,
-                  hci_qos_class_bwd,
-                  hci_binary}).
-
--record(hci_aal, {hci_pci,
-                  hci_binary}).
-
--record(hci_bhli, {hci_pci,
-                   hci_binary}).
-
--record(hci_blli_brep, {hci_brep,
-                        hci_blli_list = []}).
-
--record(hci_blli, {hci_binary}).
-
--record(hci_blli_bici, {hci_repeated,
-                        hci_priority,
-                        hci_pci,
-                        hci_binary}).
-
--record(hci_cpsa, {hci_pci,
-                   hci_binary}).
-
--record(hci_clpsa, {hci_pci,
-                    hci_binary}).
-
--record(hci_gat, {hci_binary}).
-
--record(hci_epr, {hci_epr_type,
-                  hci_epr_value,
-                  hci_epr_flag,
-                  hci_binary}).
-
--record(hci_eqos, {hci_origin,
-                   hci_acc_fwd_p2p_cdv,
-                   hci_acc_bwd_p2p_cdv,
-                   hci_cum_fwd_p2p_cdv,
-                   hci_cum_bwd_p2p_cdv,
-                   hci_acc_fwd_clr,
-                   hci_acc_bwd_clr,
-                   hci_binary}).
-
--record(hci_brep, {hci_binary}).
-
--record(hci_bsco, {hci_binary}).
-
--record(hci_noti, {hci_binary}).
-
--record(hci_abrs, {hci_fwd_abr_icr,
-                   hci_bwd_abr_icr,
-                   hci_fwd_abr_tbe,
-                   hci_bwd_abr_tbe,
-                   hci_cum_rm_fix_round_trip,
-                   hci_fwd_rif,
-                   hci_bwd_rif,
-                   hci_fwd_rdf,
-                   hci_bwd_rdf,
-                   hci_binary}).
-
--record(hci_abra, {hci_fwd_nrm,
-                   hci_fwd_trm,
-                   hci_fwd_cdf,
-                   hci_fwd_atdf,
-                   hci_bwd_nrm,
-                   hci_bwd_trm,
-                   hci_bwd_cdf,
-                   hci_bwd_atdf,
-                   hci_binary}).
-
--record(hci_prog, {hci_coding_std,
-                   hci_location,
-                   hci_prog_desc,
-                   hci_binary}).
-
--record(hci_nbc_brep, {hci_brep,
-                       hci_nbc_list = []}).
-
--record(hci_nbc, {hci_binary}).
-
--record(hci_nbhlc, {hci_binary}).
-
--record(hci_nbllc_brep, {hci_brep,
-                         hci_nbllc_list = []}).
-
--record(hci_nbllc, {hci_binary}).
-
--record(hci_geidt, {hci_binary}).
-
--record(hci_conss, {hci_type_of_conn_scope,
-                    hci_conn_scope,
-                    hci_binary}).
-
--record(hci_e2etd, {hci_pci,
-                    hci_cumul_td,
-                    hci_max_td,
-                    hci_pnni_cumul_td,
-                    hci_pnni_accept_fwd_max_td,
-                    hci_netw_gen}).
-
--record(hci_cdpi, {hci_pci,
-                   hci_cdpci,
-                   hci_cdpsi,
-                   hci_binary}).
-
--record(hci_cgpc, {hci_pci,
-                   hci_binary}).
-
--record(hci_lpt, {hci_pci,
-                  hci_ptype}).
-
--record(hci_cb, {hci_cb_level,
-                 hci_bl_transit_type,
-                 hci_bl_node_id,
-                 hci_bl_link_proc_node_id,
-                 hci_bl_link_port_id,
-                 hci_bl_link_succ_node_id,
-                 cause_value,
-                 hci_cb_diagnostics,
-                 hci_binary}).
-
--record(hci_pa, {hci_ie_id,
-                 hci_coding,
-                 hci_action,
-                 hci_length,
-                 hci_binary,
-                 hci_error_type}).
-
--record(hci_ncci, {hci_pci,
-                   hci_ni,
-                   hci_point_code,
-                   hci_call_id}).
-
--record(hci_ssie, {hci_ssie_sas = [],
-                   hci_binary}).
-
--record(hci_sas, {hci_sas_vsn,
-                  hci_sas_transp_ind,
-                  hci_sas_flow_ind,
-                  hci_sas_discard,
-                  hci_sas_scope,
-                  hci_sas_relative_id,
-                  hci_binary}).
-
--record(hci_data, {hci_hcid,
-                   hci_sender_ifindex,
-                   hci_sender_hcid}).
-
--record(hci_data_setup, {hci_hcidA,
-                         hci_pidA,
-                         hci_protA,
-                         hci_protB,
-                         hci_portB,
-                         hci_hcidB,
-                         hci_rem_dataA,
-                         hci_assign,
-                         hci_ifindexB,
-                         hci_node_id,
-                         hci_succ_node_id,
-                         hci_ifindexA,
-                         hci_vpiA,
-                         hci_vciA,
-                         hci_cpA,
-                         hci_cpB}).
-
--record(hci_prot_comp, {hci_requiredFC = 0,
-                        hci_desiredFC = 0}).
-
--file("./spvcOrig.erl", 217).
-
--file("/export/localhome/locmacr/wrk/axd_r11/ATS_CRA12002/SPVC_CNA12164/src/../../../inc/ccCd.hrl", 1).
-
--hrl_id('13/190 55-CNA 121 101 Ux').
-
--hrl_vsn('/main/R6A/R7A/R8A/R8B/8').
-
--hrl_date('2003-02-21').
-
--hrl_author(etxmexa).
-
--record(ccCdRR, {hcid,
-                 vpi,
-                 vci,
-                 ifindexA,
-                 call_type,
-                 spvc = false,
-                 reserve = yes,
-                 etA,
-                 destdata,
-                 leafdata,
-                 loopdata,
-                 l3,
-                 l3_loop,
-                 cc}).
-
--record(ccCdRD, {destid,
-                 loopdata,
-                 cc}).
-
--record(ccCdRL, {leafid,
-                 protTypeB,
-                 loopdata,
-                 l3,
-                 l3_loop,
-                 cc}).
-
--record(ccCdDD, {hcid,
-                 hcidA,
-                 vpi,
-                 vci,
-                 ifindexB,
-                 portB,
-                 call_type,
-                 spvc = false,
-                 reserve = yes,
-                 protTypeA,
-                 etB,
-                 leafdata,
-                 loopdata,
-                 l3,
-                 l3_loop,
-                 cc}).
-
--record(ccCdDL, {leafid,
-                 loopdata,
-                 l3,
-                 l3_loop,
-                 cc}).
-
--record(ccRR, {protTypeA,
-               remote_dataA,
-               remote_dataB,
-               chg_counters,
-               sc,
-               chg_decision = on,
-               cc_loop}).
-
--record(ccRL, {hcidB,
-               charging,
-               cc_loop}).
-
--record(ccRD, {portB,
-               ifindexB,
-               cpB,
-               vpiB,
-               vciB,
-               cc_loop}).
-
--record(ccDD, {protTypeB,
-               remote_dataA,
-               remote_dataB,
-               ifindexA,
-               cpA,
-               vpiA,
-               vciA,
-               chg_counters,
-               sc,
-               chg_decision = on,
-               cc_loop}).
-
--record(ccDL, {cc_loop}).
-
--record(loopRR, {vpList,
-                 nodeid,
-                 succ_nodeid,
-                 connection_type,
-                 policing,
-                 delay_contrib,
-                 charging = on,
-                 prev_routing_data}).
-
--record(loopRD, {}).
-
--record(loopRL, {msg_rec,
-                 providerName,
-                 userName,
-                 partyId,
-                 serviceIfA,
-                 serviceIdA,
-                 serviceIfB,
-                 serviceIdB,
-                 estAw,
-                 dtlLevels}).
-
--record(loopDD, {nodeid,
-                 succ_nodeid,
-                 vpList,
-                 connection_type,
-                 policing,
-                 assign,
-                 delay_contrib,
-                 charging = on}).
-
--record(loopDL, {msg_rec,
-                 providerName,
-                 userName,
-                 partyId,
-                 serviceIfA,
-                 serviceIdA,
-                 serviceIfB,
-                 serviceIdB}).
-
--record(ccLoopRR, {pidB,
-                   qos,
-                   atd,
-                   bbc,
-                   cscope,
-                   e2etd,
-                   eqos,
-                   con_state = none,
-                   con_order = both,
-                   mr_flag,
-                   catch_up_id,
-                   cpA}).
-
--record(ccLoopRD, {}).
-
--record(ccLoopRL, {route,
-                   linklist,
-                   routelist,
-                   failurelist = [],
-                   nodeidlist,
-                   cb,
-                   cpn,
-                   dtl,
-                   routing_state,
-                   assign,
-                   timer_counter = 0,
-                   timer_ref,
-                   status_enq_ind,
-                   link_CB,
-                   node_CB,
-                   pnnir_rlp,
-                   pnni_only}).
-
--record(ccLoopDD, {pidA,
-                   con_state = none,
-                   con_order = both,
-                   mr_flag,
-                   catch_up_id,
-                   cpB}).
-
--record(ccLoopDL, {timer_counter = 0,
-                   timer_ref,
-                   status_enq_ind}).
-
--file("./spvcOrig.erl", 218).
-
--file("/export/localhome/locmacr/built/lib/erlang/lib/snmp-4.1.2/include/STANDARD-MIB.hrl", 1).
-
--file("./spvcOrig.erl", 219).
-
-error_handler({From,Tag},{M,F,Args},EXITReason) ->
-    spvcLib:do_report(sccm,M,F,Args,"",EXITReason).
-
-connect(HcId,Connect,Key) ->
-    debug_disabled,
-    Obj = spvcDataBase:db_read({spvcObj,Key}),
-    orig_state_machine(Obj#spvcObj.currentState,connect_nu,Obj,[HcId,Connect]).
-
-release_nu(HcId,Release,Key) ->
-    debug_disabled,
-    Obj = spvcDataBase:db_read({spvcObj,Key}),
-    spvcDataBase:db_delete({spvcHcIdToTp,HcId}),
-    orig_state_machine(Obj#spvcObj.currentState,release_nu,Obj,[HcId,Release]).
-
-release_comp_nu(HcId,Release_comp,Key) ->
-    debug_disabled,
-    Obj = spvcDataBase:db_read({spvcObj,Key}),
-    spvcDataBase:db_delete({spvcHcIdToTp,HcId}),
-    orig_state_machine(Obj#spvcObj.currentState,release_comp_nu,Obj,[HcId,Release_comp]).
-
-release_incumbent(HcId,Release) ->
-    debug_disabled,
-    release_incumbent2(spvcDataBase:db_read({spvcHcIdToTp,HcId}),Release).
-
-release_incumbent2(SpvcHcIdToTp,Release) ->
-    release_incumbent3(SpvcHcIdToTp#spvcHcIdToTp.tpEntry,Release).
-
-release_incumbent3({orig,If,Vpi,Vci,Leaf},Release) ->
-    release_incumbent4({If,Vpi,Vci,Leaf},Release);
-release_incumbent3({orig,If,Vpi,Leaf},Release) ->
-    release_incumbent4({If,Vpi,Leaf},Release).
-
-release_incumbent4(TpKey,Release) ->
-    Spvc = spvcDataBase:db_read({spvcObj,TpKey}),
-    active = Spvc#spvcObj.currentState,
-    orig_state_machine(active,release_incumbent,Spvc,[Release]).
-
-switch_over(HcId,{If,Vpi,Vci}) ->
-    Key = case {If,Vpi,Vci} of
-              {If_Value,Vpi_Value,Vci_Value} when integer(Vci_Value) ->
-                  {If_Value,Vpi_Value,Vci_Value,1};
-              {If_Value,Vpi_Value,_} ->
-                  {If_Value,Vpi_Value,1};
-              {If_Value,Vpi_Value} ->
-                  {If_Value,Vpi_Value,1}
-          end,
-    Spvc = spvcDataBase:db_read({spvcObj,Key}),
-    do_switch_over(HcId,Spvc);
-switch_over(HcId,{If,Vpi}) ->
-    Key = case {If,Vpi,no_vc} of
-              {If_Value,Vpi_Value,Vci_Value} when integer(Vci_Value) ->
-                  {If_Value,Vpi_Value,Vci_Value,1};
-              {If_Value,Vpi_Value,_} ->
-                  {If_Value,Vpi_Value,1};
-              {If_Value,Vpi_Value} ->
-                  {If_Value,Vpi_Value,1}
-          end,
-    Spvc = spvcDataBase:db_read({spvcObj,Key}),
-    do_switch_over(HcId,Spvc).
-
-do_switch_over(HcId,Spvc) ->
-    State = Spvc#spvcObj.currentState,
-    orig_state_machine(State,switch_over,Spvc,[HcId]).
-
-gen_set(Type,Row,Cols) ->
-    debug_disabled,
-    gen_set(Type,Row,Cols,undefined).
-
-gen_set(Type,Row,Cols,FrKey) ->
-    debug_disabled,
-    case lists:keysearch(case {case Row of
-                                   {_,_,_,_} ->
-                                       spvcVcc;
-                                   {_,_,_} ->
-                                       spvcVpc;
-                                   {_,_} ->
-                                       spvcFr;
-                                   [_,_,_,_] ->
-                                       spvcVcc;
-                                   [_,_,_] ->
-                                       spvcVpc;
-                                   [_,_] ->
-                                       spvcFr
-                               end,rowStatus} of
-                             {spvcVcc,targetAddress} ->
-                                 2;
-                             {spvcVcc,selectType} ->
-                                 3;
-                             {spvcVcc,targetVpi} ->
-                                 18;
-                             {spvcVcc,targetVci} ->
-                                 5;
-                             {spvcVcc,releaseCause} ->
-                                 6;
-                             {spvcVcc,releaseDiagnostic} ->
-                                 7;
-                             {spvcVcc,retryInterval} ->
-                                 10;
-                             {spvcVcc,retryTimer} ->
-                                 11;
-                             {spvcVcc,retryThreshold} ->
-                                 12;
-                             {spvcVcc,retryFailures} ->
-                                 13;
-                             {spvcVcc,retryLimit} ->
-                                 14;
-                             {spvcVcc,rowStatus} ->
-                                 15;
-                             {spvcVcc,restart} ->
-                                 9;
-                             {spvcVcc,targetSelectType_any} ->
-                                 2;
-                             {spvcVcc,targetSelectType_required} ->
-                                 1;
-                             {spvcVpc,targetAddress} ->
-                                 2;
-                             {spvcVpc,selectType} ->
-                                 3;
-                             {spvcVpc,targetVpi} ->
-                                 15;
-                             {spvcVpc,releaseCause} ->
-                                 5;
-                             {spvcVpc,releaseDiagnostic} ->
-                                 6;
-                             {spvcVpc,retryInterval} ->
-                                 9;
-                             {spvcVpc,retryTimer} ->
-                                 10;
-                             {spvcVpc,retryThreshold} ->
-                                 11;
-                             {spvcVpc,retryFailures} ->
-                                 12;
-                             {spvcVpc,retryLimit} ->
-                                 13;
-                             {spvcVpc,rowStatus} ->
-                                 14;
-                             {spvcVpc,restart} ->
-                                 8;
-                             {spvcVpc,targetSelectType_any} ->
-                                 2;
-                             {spvcVpc,targetSelectType_required} ->
-                                 1;
-                             {spvcFr,targetAddress} ->
-                                 3;
-                             {spvcFr,selectType} ->
-                                 5;
-                             {spvcFr,identifier} ->
-                                 6;
-                             {spvcFr,targetVpi} ->
-                                 7;
-                             {spvcFr,targetVci} ->
-                                 8;
-                             {spvcFr,translation} ->
-                                 9;
-                             {spvcFr,releaseCause} ->
-                                 10;
-                             {spvcFr,releaseDiagnostic} ->
-                                 11;
-                             {spvcFr,operStatus} ->
-                                 12;
-                             {spvcFr,adminStatus} ->
-                                 13;
-                             {spvcFr,restart} ->
-                                 14;
-                             {spvcFr,retryInterval} ->
-                                 15;
-                             {spvcFr,retryTimer} ->
-                                 16;
-                             {spvcFr,retryThreshold} ->
-                                 17;
-                             {spvcFr,retryFailures} ->
-                                 18;
-                             {spvcFr,retryLimit} ->
-                                 19;
-                             {spvcFr,lastChange} ->
-                                 20;
-                             {spvcFr,rowStatus} ->
-                                 21
-                         end,1,Cols) of
-        {value,{_,4}} ->
-            debug_disabled,
-            mnesia:dirty_update_counter(spvcHcEtStat,spvcLib:get_board(hd(Row)),1),
-            case get_link_state(case Row of
-                                    Row when record(Row,spvcObj) ->
-                                        case Row#spvcObj.spvcEntry of
-                                            {If_Value,_,_,_} ->
-                                                If_Value;
-                                            {If_Value,_,_} ->
-                                                If_Value
-                                        end;
-                                    Row when record(Row,spvcVcc) ->
-                                        {If_Value,_,_,_} = Row#spvcVcc.spvcVccEntry,
-                                        If_Value;
-                                    Row when record(Row,spvcVpc) ->
-                                        {If_Value,_,_} = Row#spvcVpc.spvcVpcEntry,
-                                        If_Value;
-                                    Row when record(Row,spvcVpcPerm) ->
-                                        {If_Value,_,_} = Row#spvcVpcPerm.spvcVpcEntry,
-                                        If_Value;
-                                    Row when record(Row,spvcVccPerm) ->
-                                        {If_Value,_,_,_} = Row#spvcVccPerm.spvcVccEntry,
-                                        If_Value;
-                                    Row when record(Row,spvcTargetVc) ->
-                                        {If_Value,_,_} = Row#spvcTargetVc.entry,
-                                        If_Value;
-                                    Row when record(Row,spvcTargetVp) ->
-                                        {If_Value,_} = Row#spvcTargetVp.entry,
-                                        If_Value;
-                                    Row when record(Row,pchVc) ->
-                                        {If_Value,_,_} = Row#pchVc.vclEntry,
-                                        If_Value;
-                                    Row when record(Row,pchVp) ->
-                                        {If_Value,_} = Row#pchVp.vplEntry,
-                                        If_Value;
-                                    Row when record(Row,spvcFr) ->
-                                        {If_Value,_} = Row#spvcFr.spvcFrEntry,
-                                        If_Value;
-                                    Row when record(Row,spvcFrPerm) ->
-                                        {If_Value,_} = Row#spvcFrPerm.spvcFrEntry,
-                                        If_Value;
-                                    {If_Value,_,_,_} ->
-                                        If_Value;
-                                    {If_Value,_,_} ->
-                                        If_Value;
-                                    {If_Value,_} ->
-                                        If_Value;
-                                    [If_Value|_] ->
-                                        If_Value;
-                                    _ ->
-                                        error
-                                end) of
-                disabled ->
-                    orig_state_machine(null,createAndGo_disabled,[],[Row,Cols,Type,FrKey]);
-                enabled ->
-                    orig_state_machine(null,createAndGo_enabled,[],[Row,Cols,Type,FrKey])
-            end;
-        {value,{_,5}} ->
-            debug_disabled,
-            mnesia:dirty_update_counter(spvcHcEtStat,spvcLib:get_board(hd(Row)),1),
-            orig_state_machine(null,createAndWait,[],[Row,Cols,Type,FrKey]);
-        {value,{_,1}} ->
-            debug_disabled,
-            case spvcDataBase:db_read({spvcObj,list_to_tuple(Row)}) of
-                [] ->
-                    ok;
-                Spvc ->
-                    case get_link_state(case Row of
-                                            Row when record(Row,spvcObj) ->
-                                                case Row#spvcObj.spvcEntry of
-                                                    {If_Value,_,_,_} ->
-                                                        If_Value;
-                                                    {If_Value,_,_} ->
-                                                        If_Value
-                                                end;
-                                            Row when record(Row,spvcVcc) ->
-                                                {If_Value,_,_,_} = Row#spvcVcc.spvcVccEntry,
-                                                If_Value;
-                                            Row when record(Row,spvcVpc) ->
-                                                {If_Value,_,_} = Row#spvcVpc.spvcVpcEntry,
-                                                If_Value;
-                                            Row when record(Row,spvcVpcPerm) ->
-                                                {If_Value,_,_} = Row#spvcVpcPerm.spvcVpcEntry,
-                                                If_Value;
-                                            Row when record(Row,spvcVccPerm) ->
-                                                {If_Value,_,_,_} = Row#spvcVccPerm.spvcVccEntry,
-                                                If_Value;
-                                            Row when record(Row,spvcTargetVc) ->
-                                                {If_Value,_,_} = Row#spvcTargetVc.entry,
-                                                If_Value;
-                                            Row when record(Row,spvcTargetVp) ->
-                                                {If_Value,_} = Row#spvcTargetVp.entry,
-                                                If_Value;
-                                            Row when record(Row,pchVc) ->
-                                                {If_Value,_,_} = Row#pchVc.vclEntry,
-                                                If_Value;
-                                            Row when record(Row,pchVp) ->
-                                                {If_Value,_} = Row#pchVp.vplEntry,
-                                                If_Value;
-                                            Row when record(Row,spvcFr) ->
-                                                {If_Value,_} = Row#spvcFr.spvcFrEntry,
-                                                If_Value;
-                                            Row when record(Row,spvcFrPerm) ->
-                                                {If_Value,_} = Row#spvcFrPerm.spvcFrEntry,
-                                                If_Value;
-                                            {If_Value,_,_,_} ->
-                                                If_Value;
-                                            {If_Value,_,_} ->
-                                                If_Value;
-                                            {If_Value,_} ->
-                                                If_Value;
-                                            [If_Value|_] ->
-                                                If_Value;
-                                            _ ->
-                                                error
-                                        end) of
-                        disabled ->
-                            orig_state_machine(Spvc#spvcObj.currentState,activate_disabled,Spvc,Cols);
-                        enabled ->
-                            orig_state_machine(Spvc#spvcObj.currentState,activate_enabled,Spvc,Cols)
-                    end
-            end;
-        {value,{_,6}} ->
-            debug_disabled,
-            case spvcDataBase:db_read({spvcObj,list_to_tuple(Row)}) of
-                [] ->
-                    ok;
-                Spvc ->
-                    mnesia:dirty_update_counter(spvcHcEtStat,spvcLib:get_board(hd(Row)),- 1),
-                    orig_state_machine(Spvc#spvcObj.currentState,destroy,Spvc,Cols)
-            end;
-        {value,{_,2}} ->
-            debug_disabled,
-            case spvcDataBase:db_read({spvcObj,list_to_tuple(Row)}) of
-                [] ->
-                    mnesia:dirty_update_counter(spvcHcEtStat,spvcLib:get_board(hd(Row)),1),
-                    ok;
-                Spvc ->
-                    orig_state_machine(Spvc#spvcObj.currentState,not_in_service,Spvc,Cols)
-            end;
-        false ->
-            debug_disabled,
-            Spvc = spvcDataBase:db_read({spvcObj,list_to_tuple(Row)}),
-            CurrentState = Spvc#spvcObj.currentState,
-            NewSpvc = set_attrs(Spvc,Cols),
-            Restart = case {case Row of
-                                {_,_,_,_} ->
-                                    spvcVcc;
-                                {_,_,_} ->
-                                    spvcVpc;
-                                {_,_} ->
-                                    spvcFr;
-                                [_,_,_,_] ->
-                                    spvcVcc;
-                                [_,_,_] ->
-                                    spvcVpc;
-                                [_,_] ->
-                                    spvcFr
-                            end,restart} of
-                          {spvcVcc,targetAddress} ->
-                              2;
-                          {spvcVcc,selectType} ->
-                              3;
-                          {spvcVcc,targetVpi} ->
-                              18;
-                          {spvcVcc,targetVci} ->
-                              5;
-                          {spvcVcc,releaseCause} ->
-                              6;
-                          {spvcVcc,releaseDiagnostic} ->
-                              7;
-                          {spvcVcc,retryInterval} ->
-                              10;
-                          {spvcVcc,retryTimer} ->
-                              11;
-                          {spvcVcc,retryThreshold} ->
-                              12;
-                          {spvcVcc,retryFailures} ->
-                              13;
-                          {spvcVcc,retryLimit} ->
-                              14;
-                          {spvcVcc,rowStatus} ->
-                              15;
-                          {spvcVcc,restart} ->
-                              9;
-                          {spvcVcc,targetSelectType_any} ->
-                              2;
-                          {spvcVcc,targetSelectType_required} ->
-                              1;
-                          {spvcVpc,targetAddress} ->
-                              2;
-                          {spvcVpc,selectType} ->
-                              3;
-                          {spvcVpc,targetVpi} ->
-                              15;
-                          {spvcVpc,releaseCause} ->
-                              5;
-                          {spvcVpc,releaseDiagnostic} ->
-                              6;
-                          {spvcVpc,retryInterval} ->
-                              9;
-                          {spvcVpc,retryTimer} ->
-                              10;
-                          {spvcVpc,retryThreshold} ->
-                              11;
-                          {spvcVpc,retryFailures} ->
-                              12;
-                          {spvcVpc,retryLimit} ->
-                              13;
-                          {spvcVpc,rowStatus} ->
-                              14;
-                          {spvcVpc,restart} ->
-                              8;
-                          {spvcVpc,targetSelectType_any} ->
-                              2;
-                          {spvcVpc,targetSelectType_required} ->
-                              1;
-                          {spvcFr,targetAddress} ->
-                              3;
-                          {spvcFr,selectType} ->
-                              5;
-                          {spvcFr,identifier} ->
-                              6;
-                          {spvcFr,targetVpi} ->
-                              7;
-                          {spvcFr,targetVci} ->
-                              8;
-                          {spvcFr,translation} ->
-                              9;
-                          {spvcFr,releaseCause} ->
-                              10;
-                          {spvcFr,releaseDiagnostic} ->
-                              11;
-                          {spvcFr,operStatus} ->
-                              12;
-                          {spvcFr,adminStatus} ->
-                              13;
-                          {spvcFr,restart} ->
-                              14;
-                          {spvcFr,retryInterval} ->
-                              15;
-                          {spvcFr,retryTimer} ->
-                              16;
-                          {spvcFr,retryThreshold} ->
-                              17;
-                          {spvcFr,retryFailures} ->
-                              18;
-                          {spvcFr,retryLimit} ->
-                              19;
-                          {spvcFr,lastChange} ->
-                              20;
-                          {spvcFr,rowStatus} ->
-                              21
-                      end,
-            case lists:keysearch(Restart,1,Cols) of
-                {value,{Restart,1}} ->
-                    orig_state_machine(CurrentState,restart,NewSpvc,Cols);
-                _ ->
-                    spvcDataBase:db_write(NewSpvc),
-                    ok
-            end
-    end,
-    {noError,0}.
-
-restart_spvc(Key) ->
-    debug_disabled,
-    Spvc = spvcDataBase:db_read({spvcObj,Key}),
-    handle_restart_spvc(Spvc#spvcObj.currentState,Spvc),
-    ok.
-
-handle_restart_spvc(rest_in_peace,Spvc) ->
-    debug_disabled,
-    rest_in_peace(restart,Spvc,undefined);
-handle_restart_spvc(_,_) ->
-    ok.
-
-restart_multi_spvcs(Key) ->
-    debug_disabled,
-    Spvc = spvcDataBase:db_read({spvcObj,Key}),
-    handle_restart_multi_spvcs(Spvc#spvcObj.currentState,Spvc),
-    ok.
-
-handle_restart_multi_spvcs(rest_in_peace,Spvc) ->
-    debug_disabled,
-    handle_restart_spvc(rest_in_peace,Spvc);
-handle_restart_multi_spvcs(active,Spvc) ->
-    debug_disabled,
-    active(restart,Spvc,undefined);
-handle_restart_multi_spvcs(outgoing_callproceeding,Spvc) ->
-    debug_disabled,
-    outgoing_callproceeding(restart,Spvc,undefined);
-handle_restart_multi_spvcs(release_at_restart,Spvc) ->
-    debug_disabled,
-    release_at_restart(restart,Spvc,undefined);
-handle_restart_multi_spvcs(wait,Spvc) ->
-    debug_disabled,
-    wait(restart,Spvc,undefined);
-handle_restart_multi_spvcs(rest_in_peace,Spvc) ->
-    debug_disabled,
-    rest_in_peace(restart,Spvc,undefined);
-handle_restart_multi_spvcs(_,_) ->
-    ok.
-
-orig_state_machine(null,createAndGo_enabled,Spvc,Attrs) ->
-    null(createAndGo_enabled,Spvc,Attrs);
-orig_state_machine(null,createAndGo_disabled,Spvc,Attrs) ->
-    null(createAndGo_disabled,Spvc,Attrs);
-orig_state_machine(null,createAndWait,Spvc,Attrs) ->
-    null(createAndWait,Spvc,Attrs);
-orig_state_machine(created,activate_disabled,Spvc,Attrs) ->
-    created(activate_disabled,Spvc,Attrs);
-orig_state_machine(created,activate_enabled,Spvc,Attrs) ->
-    created(activate_enabled,Spvc,Attrs);
-orig_state_machine(created,destroy,Spvc,Attrs) ->
-    created(destroy,Spvc,Attrs);
-orig_state_machine(outgoing_callproceeding,connect_nu,Spvc,Attrs) ->
-    outgoing_callproceeding(connect_nu,Spvc,Attrs);
-orig_state_machine(outgoing_callproceeding,destroy,Spvc,Attrs) ->
-    outgoing_callproceeding(destroy,Spvc,Attrs);
-orig_state_machine(outgoing_callproceeding,restart,Spvc,Attrs) ->
-    outgoing_callproceeding(restart,Spvc,Attrs);
-orig_state_machine(outgoing_callproceeding,release_nu,Spvc,Attrs) ->
-    case get_link_state_intf(case Spvc of
-                                 Spvc when record(Spvc,spvcObj) ->
-                                     case Spvc#spvcObj.spvcEntry of
-                                         {If_Value,_,_,_} ->
-                                             If_Value;
-                                         {If_Value,_,_} ->
-                                             If_Value
-                                     end;
-                                 Spvc when record(Spvc,spvcVcc) ->
-                                     {If_Value,_,_,_} = Spvc#spvcVcc.spvcVccEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcVpc) ->
-                                     {If_Value,_,_} = Spvc#spvcVpc.spvcVpcEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcVpcPerm) ->
-                                     {If_Value,_,_} = Spvc#spvcVpcPerm.spvcVpcEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcVccPerm) ->
-                                     {If_Value,_,_,_} = Spvc#spvcVccPerm.spvcVccEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcTargetVc) ->
-                                     {If_Value,_,_} = Spvc#spvcTargetVc.entry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcTargetVp) ->
-                                     {If_Value,_} = Spvc#spvcTargetVp.entry,
-                                     If_Value;
-                                 Spvc when record(Spvc,pchVc) ->
-                                     {If_Value,_,_} = Spvc#pchVc.vclEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,pchVp) ->
-                                     {If_Value,_} = Spvc#pchVp.vplEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcFr) ->
-                                     {If_Value,_} = Spvc#spvcFr.spvcFrEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcFrPerm) ->
-                                     {If_Value,_} = Spvc#spvcFrPerm.spvcFrEntry,
-                                     If_Value;
-                                 {If_Value,_,_,_} ->
-                                     If_Value;
-                                 {If_Value,_,_} ->
-                                     If_Value;
-                                 {If_Value,_} ->
-                                     If_Value;
-                                 [If_Value|_] ->
-                                     If_Value;
-                                 _ ->
-                                     error
-                             end,release_nu) of
-        disabled ->
-            outgoing_callproceeding(release_nu_disabled,Spvc,Attrs);
-        enabled ->
-            outgoing_callproceeding(release_nu_enabled,Spvc,Attrs)
-    end;
-orig_state_machine(outgoing_callproceeding,release_comp_nu,Spvc,Attrs) ->
-    case get_link_state_intf(tuple_to_list(Spvc#spvcObj.spvcEntry),release_comp_nu) of
-        disabled ->
-            outgoing_callproceeding(release_comp_nu_disabled,Spvc,Attrs);
-        enabled ->
-            outgoing_callproceeding(release_comp_nu_enabled,Spvc,Attrs)
-    end;
-orig_state_machine(outgoing_callproceeding,not_in_service,Spvc,Attrs) ->
-    outgoing_callproceeding(not_in_service,Spvc,Attrs);
-orig_state_machine(outgoing_callproceeding,activate_enabled,Spvc,Attrs) ->
-    ok;
-orig_state_machine(outgoing_callproceeding,activate_disabled,Spvc,Attrs) ->
-    ok;
-orig_state_machine(active,destroy,Spvc,Attrs) ->
-    active(destroy,Spvc,Attrs);
-orig_state_machine(active,restart,Spvc,Attrs) ->
-    active(restart,Spvc,Attrs);
-orig_state_machine(active,release_nu,Spvc,Attrs) ->
-    case cnhChi:get_link_opstate(case Spvc of
-                                     Spvc when record(Spvc,spvcObj) ->
-                                         case Spvc#spvcObj.spvcEntry of
-                                             {If_Value,_,_,_} ->
-                                                 If_Value;
-                                             {If_Value,_,_} ->
-                                                 If_Value
-                                         end;
-                                     Spvc when record(Spvc,spvcVcc) ->
-                                         {If_Value,_,_,_} = Spvc#spvcVcc.spvcVccEntry,
-                                         If_Value;
-                                     Spvc when record(Spvc,spvcVpc) ->
-                                         {If_Value,_,_} = Spvc#spvcVpc.spvcVpcEntry,
-                                         If_Value;
-                                     Spvc when record(Spvc,spvcVpcPerm) ->
-                                         {If_Value,_,_} = Spvc#spvcVpcPerm.spvcVpcEntry,
-                                         If_Value;
-                                     Spvc when record(Spvc,spvcVccPerm) ->
-                                         {If_Value,_,_,_} = Spvc#spvcVccPerm.spvcVccEntry,
-                                         If_Value;
-                                     Spvc when record(Spvc,spvcTargetVc) ->
-                                         {If_Value,_,_} = Spvc#spvcTargetVc.entry,
-                                         If_Value;
-                                     Spvc when record(Spvc,spvcTargetVp) ->
-                                         {If_Value,_} = Spvc#spvcTargetVp.entry,
-                                         If_Value;
-                                     Spvc when record(Spvc,pchVc) ->
-                                         {If_Value,_,_} = Spvc#pchVc.vclEntry,
-                                         If_Value;
-                                     Spvc when record(Spvc,pchVp) ->
-                                         {If_Value,_} = Spvc#pchVp.vplEntry,
-                                         If_Value;
-                                     Spvc when record(Spvc,spvcFr) ->
-                                         {If_Value,_} = Spvc#spvcFr.spvcFrEntry,
-                                         If_Value;
-                                     Spvc when record(Spvc,spvcFrPerm) ->
-                                         {If_Value,_} = Spvc#spvcFrPerm.spvcFrEntry,
-                                         If_Value;
-                                     {If_Value,_,_,_} ->
-                                         If_Value;
-                                     {If_Value,_,_} ->
-                                         If_Value;
-                                     {If_Value,_} ->
-                                         If_Value;
-                                     [If_Value|_] ->
-                                         If_Value;
-                                     _ ->
-                                         error
-                                 end) of
-        disabled ->
-            active(release_nu_disabled,Spvc,Attrs);
-        enabled ->
-            active(release_nu_enabled,Spvc,Attrs)
-    end;
-orig_state_machine(active,release_comp_nu,Spvc,Attrs) ->
-    release_at_restart(release_comp_nu,Spvc,Attrs);
-orig_state_machine(active,not_in_service,Spvc,Attrs) ->
-    active(not_in_service,Spvc,Attrs);
-orig_state_machine(active,activate_enabled,Spvc,Attrs) ->
-    ok;
-orig_state_machine(active,activate_disabled,Spvc,Attrs) ->
-    ok;
-orig_state_machine(active,release_incumbent,Spvc,Attrs) ->
-    active(release_incumbent,Spvc,Attrs);
-orig_state_machine(wait,destroy,Spvc,Attrs) ->
-    wait(destroy,Spvc,Attrs);
-orig_state_machine(wait,timeout,Spvc,Attrs) ->
-    wait(timeout,Spvc,Attrs);
-orig_state_machine(wait,restart,Spvc,Attrs) ->
-    wait(restart,Spvc,Attrs);
-orig_state_machine(wait,release_nu,Spvc,Attrs) ->
-    ok;
-orig_state_machine(wait,not_in_service,Spvc,Attrs) ->
-    wait(not_in_service,Spvc,Attrs);
-orig_state_machine(wait,activate_enabled,Spvc,Attrs) ->
-    wait(timeout,Spvc,Attrs);
-orig_state_machine(wait,activate_disabled,Spvc,Attrs) ->
-    ok;
-orig_state_machine(release_at_restart,release_comp_nu,Spvc,Attrs) ->
-    release_at_restart(release_comp_nu,Spvc,Attrs);
-orig_state_machine(release_at_restart,release_nu,Spvc,Attrs) ->
-    release_at_restart(release_nu,Spvc,Attrs);
-orig_state_machine(release_at_restart,connect_nu,Spvc,Attrs) ->
-    release_at_restart(connect_nu,Spvc,Attrs);
-orig_state_machine(release_at_restart,destroy,Spvc,Attrs) ->
-    release_at_restart(destroy,Spvc,Attrs);
-orig_state_machine(release_at_restart,not_in_service,Spvc,Attrs) ->
-    release_at_restart(not_in_service,Spvc,Attrs);
-orig_state_machine(release_at_restart,activate_enabled,Spvc,Attrs) ->
-    ok;
-orig_state_machine(release_at_restart,activate_disabled,Spvc,Attrs) ->
-    ok;
-orig_state_machine(release_request,release_comp_nu,Spvc,Attrs) ->
-    release_request(release_comp_nu,Spvc,Attrs);
-orig_state_machine(release_request,release_nu,Spvc,Attrs) ->
-    release_request(release_nu,Spvc,Attrs);
-orig_state_machine(release_request,destroy,Spvc,Attrs) ->
-    release_request(destroy,Spvc,Attrs);
-orig_state_machine(release_request,not_in_service,Spvc,Attrs) ->
-    release_request(not_in_service,Spvc,Attrs);
-orig_state_machine(release_request,activate_enabled,Spvc,Attrs) ->
-    ok;
-orig_state_machine(release_request,activate_disabled,Spvc,Attrs) ->
-    ok;
-orig_state_machine(rest_in_peace,restart,Spvc,Attrs) ->
-    rest_in_peace(restart,Spvc,Attrs);
-orig_state_machine(rest_in_peace,destroy,Spvc,Attrs) ->
-    rest_in_peace(destroy,Spvc,Attrs);
-orig_state_machine(rest_in_peace,not_in_service,Spvc,Attrs) ->
-    rest_in_peace(not_in_service,Spvc,Attrs);
-orig_state_machine(rest_in_peace,connect_nu,Spvc,Attrs) ->
-    rest_in_peace(connect_nu,Spvc,Attrs);
-orig_state_machine(rest_in_peace,activate_enabled,Spvc,Attrs) ->
-    rest_in_peace(restart,Spvc,Attrs);
-orig_state_machine(rest_in_peace,activate_disabled,Spvc,Attrs) ->
-    ok;
-orig_state_machine(rest_in_peace,release_nu,Spvc,Attrs) ->
-    ok;
-orig_state_machine(rest_in_peace,release_comp_nu,Spvc,Attrs) ->
-    ok;
-orig_state_machine(not_in_service,activate_enabled,Spvc,Attrs) ->
-    not_in_service(activate_enabled,Spvc,Attrs);
-orig_state_machine(not_in_service,activate_disabled,Spvc,Attrs) ->
-    not_in_service(activate_disabled,Spvc,Attrs);
-orig_state_machine(not_in_service,destroy,Spvc,Attrs) ->
-    not_in_service(destroy,Spvc,Attrs);
-orig_state_machine(not_in_service,connect_nu,Spvc,Attrs) ->
-    not_in_service(connect_nu,Spvc,Attrs);
-orig_state_machine(not_in_service,_,Spvc,Attrs) ->
-    ok;
-orig_state_machine(awaiting_switch_over,switch_over,Spvc,[HcId]) ->
-    awaiting_switch_over(switch_over,Spvc,[HcId]);
-orig_state_machine(awaiting_switch_over,activate_disabled,Spvc,Attrs) ->
-    awaiting_switch_over(activate_disabled,Spvc,Attrs);
-orig_state_machine(awaiting_switch_over,destroy,Spvc,Attrs) ->
-    awaiting_switch_over(destroy,Spvc,Attrs);
-orig_state_machine(awaiting_switch_over,restart,Spvc,Attrs) ->
-    awaiting_switch_over(restart,Spvc,Attrs);
-orig_state_machine(awaiting_switch_over,_,Spvc,Attrs) ->
-    ok;
-orig_state_machine(undefined,destroy,Spvc,Attrs) ->
-    rest_in_peace(destroy,Spvc,Attrs).
-
-null(createAndGo_enabled,[],[Row,Cols,Type,FrKey]) ->
-    debug_disabled,
-    Key = list_to_tuple(Row),
-    Spvc = #spvcObj{spvcEntry = Key,
-                    spvcApplication = Type,
-                    spvcRowStatus = 1,
-                    spvcFrKey = FrKey},
-    Spvc1 = set_attrs(Spvc,Cols),
-    {Spvc2,HcId,Setup} = new_state_outgoing_call_proceeding(Spvc1),
-    pchTpUpdate(case Key of
-                    {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                        {IfIndex_Value,Vpi_Value,Vci_Value};
-                    {IfIndex_Value,Vpi_Value,_} ->
-                        {IfIndex_Value,Vpi_Value};
-                    [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                        [IfIndex_Value,Vpi_Value,Vci_Value];
-                    [IfIndex_Value,Vpi_Value,_] ->
-                        [IfIndex_Value,Vpi_Value]
-                end),
-    spvcDataBase:db_write(Spvc2),
-    setup(HcId,Setup,Spvc2);
-null(createAndGo_disabled,[],[Row,Cols,Type,FrKey]) ->
-    debug_disabled,
-    case get_link_state_intf(Row,null_createAndGo_disabled) of
-        disabled ->
-            Key = list_to_tuple(Row),
-            Spvc = #spvcObj{spvcEntry = Key,
-                            spvcRowStatus = 1,
-                            currentState = rest_in_peace,
-                            spvcApplication = Type,
-                            spvcFrKey = FrKey},
-            Spvc1 = set_attrs(Spvc,Cols),
-            pchTpUpdate(case Key of
-                            {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                                {IfIndex_Value,Vpi_Value,Vci_Value};
-                            {IfIndex_Value,Vpi_Value,_} ->
-                                {IfIndex_Value,Vpi_Value};
-                            [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                                [IfIndex_Value,Vpi_Value,Vci_Value];
-                            [IfIndex_Value,Vpi_Value,_] ->
-                                [IfIndex_Value,Vpi_Value]
-                        end),
-            set_call_failure_data_and_send_spvcFailingAlarm(Key),
-            spvcDataBase:db_write(Spvc1);
-        enabled ->
-            null(createAndGo_enabled,[],[Row,Cols,Type,FrKey])
-    end;
-null(createAndWait,[],[Row,Cols,Type,FrKey]) ->
-    debug_disabled,
-    Key = list_to_tuple(Row),
-    Spvc = #spvcObj{spvcEntry = Key,
-                    spvcApplication = Type,
-                    spvcFrKey = FrKey},
-    Spvc1 = new_state_created(Spvc,Cols),
-    pchTpUpdate(case Key of
-                    {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                        {IfIndex_Value,Vpi_Value,Vci_Value};
-                    {IfIndex_Value,Vpi_Value,_} ->
-                        {IfIndex_Value,Vpi_Value};
-                    [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                        [IfIndex_Value,Vpi_Value,Vci_Value];
-                    [IfIndex_Value,Vpi_Value,_] ->
-                        [IfIndex_Value,Vpi_Value]
-                end),
-    spvcDataBase:db_write(Spvc1).
-
-pchTpUpdate({If,Vpi,Vci}) ->
-    spvcDataBase:db_write(#spvcVcDyn{vclEntry = {If,Vpi,Vci},
-                                     vclCcIdentifier = 0});
-pchTpUpdate({If,Vpi}) ->
-    spvcDataBase:db_write(#spvcVpDyn{vplEntry = {If,Vpi},
-                                     vplCcIdentifier = 0}).
-
-created(activate_enabled,Spvc,Attrs) ->
-    debug_disabled,
-    Spvc1 = set_attrs(Spvc,Attrs),
-    Spvc2 = Spvc1#spvcObj{spvcRowStatus = 1},
-    {Spvc3,HcId,HciMsg} = new_state_outgoing_call_proceeding(Spvc1),
-    spvcDataBase:db_write(Spvc3),
-    setup(HcId,HciMsg,Spvc3);
-created(activate_disabled,Spvc,Attrs) ->
-    debug_disabled,
-    Spvc1 = set_attrs(Spvc,Attrs),
-    Spvc2 = Spvc1#spvcObj{currentState = rest_in_peace,
-                          spvcRowStatus = 1},
-    update_state(Spvc,4),
-    spvcDataBase:db_write(Spvc2);
-created(destroy,Spvc,Attrs) ->
-    debug_disabled,
-    clear(Spvc).
-
-outgoing_callproceeding(connect_nu,Spvc,[HcId,Connect]) ->
-    debug_disabled,
-    Spvc1 = new_state_active(Spvc),
-    case Spvc#spvcObj.spvcTargetSelectType of
-        2 ->
-            Cpn = Connect#hci_connect.hci_cpn_soft,
-            TargetVpi = Cpn#hci_cpn_soft.hci_soft_vpi,
-            TargetVci = Cpn#hci_cpn_soft.hci_soft_vci,
-            TargetDlci = Cpn#hci_cpn_soft.hci_soft_dlci,
-            Spvc2 = Spvc1#spvcObj{spvcTargetSelectType = 1,
-                                  spvcTargetVpi = TargetVpi,
-                                  spvcTargetVci = TargetVci,
-                                  spvcTargetDlci = TargetDlci},
-            spvcDataBase:db_write(Spvc2);
-        1 ->
-            spvcDataBase:db_write(ets,Spvc1);
-        2 ->
-            Cpn = Connect#hci_connect.hci_cpn_soft,
-            TargetVpi = Cpn#hci_cpn_soft.hci_soft_vpi,
-            TargetDlci = Cpn#hci_cpn_soft.hci_soft_dlci,
-            Spvc2 = Spvc1#spvcObj{spvcTargetSelectType = 1,
-                                  spvcTargetVpi = TargetVpi,
-                                  spvcTargetDlci = TargetDlci},
-            spvcDataBase:db_write(Spvc2);
-        1 ->
-            spvcDataBase:db_write(ets,Spvc1)
-    end,
-    Key = Spvc#spvcObj.spvcEntry,
-    PchKey = case Key of
-                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                     {IfIndex_Value,Vpi_Value,Vci_Value};
-                 {IfIndex_Value,Vpi_Value,_} ->
-                     {IfIndex_Value,Vpi_Value};
-                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                     [IfIndex_Value,Vpi_Value,Vci_Value];
-                 [IfIndex_Value,Vpi_Value,_] ->
-                     [IfIndex_Value,Vpi_Value]
-             end,
-    SpvcDyn = case PchKey of
-                  {_,_,_} ->
-                      case spvcDataBase:db_read({spvcVcDyn,PchKey}) of
-                          [] ->
-                              #spvcVcDyn{vclEntry = PchKey,
-                                         vclCcIdentifier = 0,
-                                         vclConnId = HcId};
-                          SpvcVcDyn ->
-                              SpvcVcDyn#spvcVcDyn{vclEntry = PchKey,
-                                                  vclConnId = HcId}
-                      end;
-                  {_,_} ->
-                      case spvcDataBase:db_read({spvcVpDyn,PchKey}) of
-                          [] ->
-                              #spvcVpDyn{vplEntry = PchKey,
-                                         vplCcIdentifier = 0,
-                                         vplConnId = HcId};
-                          SpvcVpDyn ->
-                              SpvcVpDyn#spvcVpDyn{vplEntry = PchKey,
-                                                  vplConnId = HcId}
-                      end
-              end,
-    spvcDataBase:db_write(SpvcDyn),
-    CbCValue = get(no_of_rerouting),
-    CbC = case CbCValue of
-              undefined ->
-                  debug_disabled,
-                  0;
-              _ ->
-                  CbCValue
-          end,
-    SpvcDyn2 = case Key of
-                   {_,_,_,_} ->
-                       case spvcDataBase:db_read({spvcVccDyn,Key}) of
-                           [] ->
-                               #spvcVccDyn{spvcVccEntry = Key,
-                                           crankBackCounter = CbC};
-                           SpvcVccDyn ->
-                               SpvcVccDyn#spvcVccDyn{spvcVccEntry = Key,
-                                                     crankBackCounter = CbC}
-                       end;
-                   {_,_,_} ->
-                       case spvcDataBase:db_read({spvcVpcDyn,Key}) of
-                           [] ->
-                               #spvcVpcDyn{spvcVpcEntry = Key,
-                                           crankBackCounter = CbC};
-                           SpvcVpcDyn ->
-                               SpvcVpcDyn#spvcVpcDyn{spvcVpcEntry = Key,
-                                                     crankBackCounter = CbC}
-                       end
-               end,
-    spvcDataBase:db_write(SpvcDyn2),
-    NewPch = spvcDataBase:db_read({pch,PchKey}),
-    spvcLib:clear_spvcStillTryingAlarm(Key),
-    case Spvc#spvcObj.spvcFrKey of
-        undefined ->
-            spvcLib:ilmi_change(PchKey,1),
-            ok;
-        FrEndPoint ->
-            SpvcFrObj = spvcDataBase:db_read({spvcFrPerm,FrEndPoint}),
-            NewSpvcFrObj = SpvcFrObj#spvcFrPerm{spvcFrConnect = 3},
-            spvcDataBase:db_write(NewSpvcFrObj),
-            spvcLib:ilmi_change(PchKey,1),
-            set_fr_atm_iw_admin_state(FrEndPoint,up,Spvc)
-    end;
-outgoing_callproceeding(restart,Spvc,_) ->
-    Key = Spvc#spvcObj.spvcEntry,
-    debug_disabled,
-    Spvc1 = new_state_release_at_restart(Spvc),
-    spvcDataBase:db_write(ets,Spvc1),
-    spvcLib:clear_spvcStillTryingAlarm(Key);
-outgoing_callproceeding(release_nu_enabled,Spvc,[HcId,HciMsg]) ->
-    debug_disabled,
-    Spvc1 = new_state_rest_in_peace_or_wait(Spvc,[HcId,HciMsg]),
-    [CcCause|_] = HciMsg#hci_release.hci_cause_list,
-    Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = CcCause#hci_cause.hci_cause_value,
-                          spvcLastReleaseDiagnostic = CcCause#hci_cause.hci_diagnostics_list},
-    spvcDataBase:db_write(ets,Spvc2);
-outgoing_callproceeding(release_nu_disabled,Spvc,[HcId,Release]) ->
-    debug_disabled,
-    Spvc1 = new_state_rest_in_peace(Spvc),
-    [CcCause|_] = Release#hci_release.hci_cause_list,
-    Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = CcCause#hci_cause.hci_cause_value,
-                          spvcLastReleaseDiagnostic = CcCause#hci_cause.hci_diagnostics_list},
-    spvcDataBase:db_write(ets,Spvc2),
-    spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry);
-outgoing_callproceeding(release_comp_nu_enabled,Spvc,[HcId,Release_complete]) ->
-    debug_disabled,
-    Spvc1 = new_state_rest_in_peace_or_wait(Spvc,[HcId,Release_complete]),
-    spvcDataBase:db_write(ets,Spvc1);
-outgoing_callproceeding(release_comp_nu_disabled,Spvc,[HcId,Release_complete]) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    Spvc1 = new_state_rest_in_peace(Spvc),
-    spvcDataBase:db_write(ets,Spvc1),
-    spvcLib:clear_spvcStillTryingAlarm(Key);
-outgoing_callproceeding(destroy,Spvc,_) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    Spvc1 = new_state_release_request(Spvc),
-    spvcDataBase:db_write(ets,Spvc1),
-    SpvcTpToHcId = read_spvcTpToHcId(Key),
-    Release = spvcEncode:encode_cc_release(31),
-    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc1),
-    spvcLib:clear_spvcStillTryingAlarm(Key);
-outgoing_callproceeding(not_in_service,Spvc,_) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    Spvc1 = new_state_not_in_service(Spvc),
-    spvcDataBase:db_write(Spvc1),
-    SpvcTpToHcId = read_spvcTpToHcId(Key),
-    Release = spvcEncode:encode_cc_release(31),
-    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc1),
-    spvcLib:clear_spvcStillTryingAlarm(Key).
-
-active(restart,Spvc,_) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    Spvc1 = new_state_release_at_restart(Spvc),
-    spvcDataBase:db_write(ets,Spvc1),
-    PchKey = case Key of
-                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                     {IfIndex_Value,Vpi_Value,Vci_Value};
-                 {IfIndex_Value,Vpi_Value,_} ->
-                     {IfIndex_Value,Vpi_Value};
-                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                     [IfIndex_Value,Vpi_Value,Vci_Value];
-                 [IfIndex_Value,Vpi_Value,_] ->
-                     [IfIndex_Value,Vpi_Value]
-             end,
-    spvcLib:ilmi_change(PchKey,2),
-    case Spvc#spvcObj.spvcFrKey of
-        undefined ->
-            ok;
-        FrEndPoint ->
-            set_fr_atm_iw_admin_state(FrEndPoint,down,Spvc)
-    end;
-active(release_nu_enabled,Spvc,[HcId,Release]) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    Spvc1 = new_state_rest_in_peace_or_wait(Spvc,[HcId,Release]),
-    [CcCause|_] = Release#hci_release.hci_cause_list,
-    Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = CcCause#hci_cause.hci_cause_value,
-                          spvcLastReleaseDiagnostic = CcCause#hci_cause.hci_diagnostics_list},
-    spvcDataBase:db_write(ets,Spvc2),
-    PchKey = case Key of
-                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                     {IfIndex_Value,Vpi_Value,Vci_Value};
-                 {IfIndex_Value,Vpi_Value,_} ->
-                     {IfIndex_Value,Vpi_Value};
-                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                     [IfIndex_Value,Vpi_Value,Vci_Value];
-                 [IfIndex_Value,Vpi_Value,_] ->
-                     [IfIndex_Value,Vpi_Value]
-             end,
-    spvcLib:ilmi_change(PchKey,2),
-    case Spvc#spvcObj.spvcFrKey of
-        undefined ->
-            ok;
-        FrEndPoint ->
-            set_fr_atm_iw_admin_state(FrEndPoint,down,Spvc)
-    end;
-active(release_nu_disabled,Spvc,[HcId,Release]) ->
-    debug_disabled,
-    case get_link_state_intf(case Spvc of
-                                 Spvc when record(Spvc,spvcObj) ->
-                                     case Spvc#spvcObj.spvcEntry of
-                                         {If_Value,_,_,_} ->
-                                             If_Value;
-                                         {If_Value,_,_} ->
-                                             If_Value
-                                     end;
-                                 Spvc when record(Spvc,spvcVcc) ->
-                                     {If_Value,_,_,_} = Spvc#spvcVcc.spvcVccEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcVpc) ->
-                                     {If_Value,_,_} = Spvc#spvcVpc.spvcVpcEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcVpcPerm) ->
-                                     {If_Value,_,_} = Spvc#spvcVpcPerm.spvcVpcEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcVccPerm) ->
-                                     {If_Value,_,_,_} = Spvc#spvcVccPerm.spvcVccEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcTargetVc) ->
-                                     {If_Value,_,_} = Spvc#spvcTargetVc.entry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcTargetVp) ->
-                                     {If_Value,_} = Spvc#spvcTargetVp.entry,
-                                     If_Value;
-                                 Spvc when record(Spvc,pchVc) ->
-                                     {If_Value,_,_} = Spvc#pchVc.vclEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,pchVp) ->
-                                     {If_Value,_} = Spvc#pchVp.vplEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcFr) ->
-                                     {If_Value,_} = Spvc#spvcFr.spvcFrEntry,
-                                     If_Value;
-                                 Spvc when record(Spvc,spvcFrPerm) ->
-                                     {If_Value,_} = Spvc#spvcFrPerm.spvcFrEntry,
-                                     If_Value;
-                                 {If_Value,_,_,_} ->
-                                     If_Value;
-                                 {If_Value,_,_} ->
-                                     If_Value;
-                                 {If_Value,_} ->
-                                     If_Value;
-                                 [If_Value|_] ->
-                                     If_Value;
-                                 _ ->
-                                     error
-                             end,active_release_nu_disabled) of
-        disabled ->
-            debug_disabled,
-            Key = Spvc#spvcObj.spvcEntry,
-            Spvc1 = Spvc#spvcObj{currentState = rest_in_peace},
-            [CcCause|_] = Release#hci_release.hci_cause_list,
-            Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = CcCause#hci_cause.hci_cause_value,
-                                  spvcLastReleaseDiagnostic = CcCause#hci_cause.hci_diagnostics_list},
-            PchKey = case Key of
-                         {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                             {IfIndex_Value,Vpi_Value,Vci_Value};
-                         {IfIndex_Value,Vpi_Value,_} ->
-                             {IfIndex_Value,Vpi_Value};
-                         [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                             [IfIndex_Value,Vpi_Value,Vci_Value];
-                         [IfIndex_Value,Vpi_Value,_] ->
-                             [IfIndex_Value,Vpi_Value]
-                     end,
-            spvcLib:ilmi_change(PchKey,2),
-            update_state(Spvc,4),
-            spvcDataBase:db_write(ets,Spvc2),
-            case Spvc#spvcObj.spvcFrKey of
-                undefined ->
-                    ok;
-                FrEndPoint ->
-                    set_fr_atm_iw_admin_state(FrEndPoint,down,Spvc)
-            end;
-        enabled ->
-            active(release_nu_enabled,Spvc,[HcId,Release])
-    end;
-active(destroy,Spvc,_) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    Spvc1 = new_state_release_request(Spvc),
-    spvcDataBase:db_write(ets,Spvc1),
-    PchKey = case Key of
-                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                     {IfIndex_Value,Vpi_Value,Vci_Value};
-                 {IfIndex_Value,Vpi_Value,_} ->
-                     {IfIndex_Value,Vpi_Value};
-                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                     [IfIndex_Value,Vpi_Value,Vci_Value];
-                 [IfIndex_Value,Vpi_Value,_] ->
-                     [IfIndex_Value,Vpi_Value]
-             end,
-    spvcLib:ilmi_change(PchKey,2),
-    SpvcTpToHcId = read_spvcTpToHcId(Key),
-    Release = spvcEncode:encode_cc_release(31),
-    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc);
-active(not_in_service,Spvc,_) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    Spvc1 = new_state_not_in_service(Spvc),
-    spvcDataBase:db_write(Spvc1),
-    PchKey = case Key of
-                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                     {IfIndex_Value,Vpi_Value,Vci_Value};
-                 {IfIndex_Value,Vpi_Value,_} ->
-                     {IfIndex_Value,Vpi_Value};
-                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                     [IfIndex_Value,Vpi_Value,Vci_Value];
-                 [IfIndex_Value,Vpi_Value,_] ->
-                     [IfIndex_Value,Vpi_Value]
-             end,
-    spvcLib:ilmi_change(PchKey,2),
-    SpvcTpToHcId = read_spvcTpToHcId(Key),
-    Release = spvcEncode:encode_cc_release(31),
-    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc1),
-    case Spvc#spvcObj.spvcFrKey of
-        undefined ->
-            ok;
-        FrEndPoint ->
-            set_fr_atm_iw_admin_state(FrEndPoint,down,Spvc)
-    end;
-active(release_incumbent,Spvc,[Release]) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    Spvc1 = new_state_awaiting_switch_over(Spvc),
-    spvcDataBase:db_write(Spvc1),
-    SpvcTpToHcId = read_spvcTpToHcId(Key),
-    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc1).
-
-read_spvcTpToHcId({If,Vpi,Vci,Leaf}) ->
-    spvcDataBase:db_read({spvcTpToHcId,{orig,If,Vpi,Vci,Leaf}});
-read_spvcTpToHcId({If,Vpi,Leaf}) ->
-    spvcDataBase:db_read({spvcTpToHcId,{orig,If,Vpi,Leaf}}).
-
-release_request(release_nu,Spvc,[HcId,Release]) ->
-    debug_disabled,
-    clear(Spvc);
-release_request(release_comp_nu,Spvc,[HcId,Release_comp]) ->
-    debug_disabled,
-    clear(Spvc);
-release_request(destroy,Spvc,_) ->
-    debug_disabled,
-    case Spvc#spvcObj.spvcEntry of
-        {If,Vpi,Vci,Leaf} ->
-            case spvcDataBase:db_read({spvcTpToHcId,{orig,If,Vpi,Vci,Leaf}}) of
-                SpvcTpToHcId ->
-                    Release = spvcEncode:encode_cc_release(31),
-                    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc),
-                    clear(Spvc);
-                _ ->
-                    ok
-            end;
-        {If,Vpi,Leaf} ->
-            case spvcDataBase:db_read({spvcTpToHcId,{orig,If,Vpi,Leaf}}) of
-                SpvcTpToHcId ->
-                    Release = spvcEncode:encode_cc_release(31),
-                    spvcManager:release_un(a_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc),
-                    clear(Spvc);
-                _ ->
-                    ok
-            end
-    end,
-    ok;
-release_request(not_in_service,Spvc,_) ->
-    debug_disabled,
-    ok.
-
-release_at_restart(release_nu,Spvc,[HcId,Release]) ->
-    debug_disabled,
-    {Spvc1,NewHcId,Setup} = new_state_outgoing_call_proceeding(Spvc),
-    [CcCause|_] = Release#hci_release.hci_cause_list,
-    Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = CcCause#hci_cause.hci_cause_value,
-                          spvcLastReleaseDiagnostic = CcCause#hci_cause.hci_diagnostics_list},
-    spvcDataBase:db_write(ets,Spvc2),
-    timer:sleep(500),
-    setup(NewHcId,Setup,Spvc2);
-release_at_restart(release_comp_nu,Spvc,[HcId,Release_complete]) ->
-    debug_disabled,
-    {Spvc1,NewHcId,Setup} = new_state_outgoing_call_proceeding(Spvc),
-    Spvc2 = Spvc1#spvcObj{spvcLastReleaseCause = 31,
-                          spvcLastReleaseDiagnostic = []},
-    spvcDataBase:db_write(ets,Spvc2),
-    timer:sleep(500),
-    setup(NewHcId,Setup,Spvc1);
-release_at_restart(connect_nu,Spvc,_) ->
-    debug_disabled,
-    ok;
-release_at_restart(destroy,Spvc,_) ->
-    debug_disabled,
-    Spvc1 = new_state_release_request(Spvc),
-    spvcDataBase:db_write(ets,Spvc1);
-release_at_restart(restart,Spvc,_) ->
-    debug_disabled,
-    Spvc1 = new_state_release_at_restart(Spvc);
-release_at_restart(not_in_service,Spvc,_) ->
-    debug_disabled,
-    Spvc1 = new_state_not_in_service(Spvc),
-    spvcDataBase:db_write(Spvc1).
-
-wait(timeout,Spvc,_) ->
-    debug_disabled,
-    {Spvc1,HcId,Setup} = new_state_outgoing_call_proceeding(Spvc),
-    spvcDataBase:db_write(ets,Spvc1),
-    setup(HcId,Setup,Spvc1);
-wait(destroy,Spvc,_) ->
-    debug_disabled,
-    spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
-    clear(Spvc);
-wait(restart,Spvc,_) ->
-    debug_disabled,
-    {Spvc1,HcId,Setup} = new_state_outgoing_call_proceeding(Spvc#spvcObj{spvcRetryFailures = 0}),
-    spvcDataBase:db_write(ets,Spvc1),
-    spvcReestablishTimer:cancel(Spvc#spvcObj.spvcEntry),
-    spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
-    setup(HcId,Setup,Spvc1);
-wait(not_in_service,Spvc,_) ->
-    debug_disabled,
-    Spvc1 = new_state_not_in_service(Spvc),
-    spvcDataBase:db_write(Spvc1),
-    spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry).
-
-rest_in_peace(restart,Spvc,_) ->
-    debug_disabled,
-    {Spvc1,HcId,Setup} = new_state_outgoing_call_proceeding(Spvc#spvcObj{spvcRetryFailures = 0}),
-    spvcDataBase:db_write(ets,Spvc1),
-    setup(HcId,Setup,Spvc1),
-    sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcLib,clear_spvcFailingAlarm,[spvcLib:get_membership(node())]);
-rest_in_peace(destroy,Spvc,_) ->
-    debug_disabled,
-    sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcLib,clear_spvcFailingAlarm,[spvcLib:get_membership(node())]),
-    clear(Spvc);
-rest_in_peace(connect_nu,Spvc,_) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    SpvcTpToHcId = read_spvcTpToHcId(Key),
-    Release = spvcEncode:encode_cc_release(31),
-    spvcManager:release_un(b_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc);
-rest_in_peace(not_in_service,Spvc,_) ->
-    debug_disabled,
-    Spvc1 = new_state_not_in_service(Spvc),
-    spvcDataBase:db_write(Spvc1),
-    sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcLib,clear_spvcFailingAlarm,[spvcLib:get_membership(node())]).
-
-not_in_service(activate_enabled,Spvc,_) ->
-    debug_disabled,
-    {Spvc1,HcId,Setup} = new_state_outgoing_call_proceeding(Spvc#spvcObj{spvcRetryFailures = 0}),
-    spvcDataBase:db_write(Spvc1#spvcObj{spvcRowStatus = 1}),
-    setup(HcId,Setup,Spvc1);
-not_in_service(activate_disabled,Spvc,_) ->
-    debug_disabled,
-    Spvc1 = new_state_rest_in_peace(Spvc),
-    spvcDataBase:db_write(Spvc1#spvcObj{spvcRowStatus = 1});
-not_in_service(connect_nu,Spvc,_) ->
-    debug_disabled,
-    Spvc1 = new_state_rest_in_peace(Spvc),
-    spvcDataBase:db_write(Spvc1#spvcObj{spvcRowStatus = 1}),
-    Key = Spvc#spvcObj.spvcEntry,
-    SpvcTpToHcId = read_spvcTpToHcId(Key),
-    Release = spvcEncode:encode_cc_release(31),
-    spvcManager:release_un(b_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc1);
-not_in_service(destroy,Spvc,_) ->
-    debug_disabled,
-    clear(Spvc).
-
-awaiting_switch_over(switch_over,Spvc,[HcId]) ->
-    debug_disabled,
-    Spvc1 = Spvc#spvcObj{currentState = active},
-    Index = Spvc#spvcObj.spvcEntry,
-    TpIndex = create_tp_index(Index),
-    spvcDataBase:db_write(Spvc1),
-    ets:insert(spvcTpToHcId,#spvcTpToHcId{tpEntry = TpIndex,
-                             hcId = HcId}),
-    ets:insert(spvcHcIdToTp,#spvcHcIdToTp{tpEntry = TpIndex,
-                             hcId = HcId}),
-    update_dyn_table_hcid(Index,HcId),
-    ok;
-awaiting_switch_over(activate_disabled,Spvc,Attrs) ->
-    Spvc1 = new_state_rest_in_peace(Spvc),
-    spvcDataBase:db_write(Spvc1),
-    ok;
-awaiting_switch_over(restart,Spvc,Attrs) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    Spvc1 = new_state_release_at_restart(Spvc),
-    spvcDataBase:db_write(ets,Spvc1),
-    PchKey = case Key of
-                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                     {IfIndex_Value,Vpi_Value,Vci_Value};
-                 {IfIndex_Value,Vpi_Value,_} ->
-                     {IfIndex_Value,Vpi_Value};
-                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                     [IfIndex_Value,Vpi_Value,Vci_Value];
-                 [IfIndex_Value,Vpi_Value,_] ->
-                     [IfIndex_Value,Vpi_Value]
-             end,
-    spvcLib:ilmi_change(PchKey,2),
-    case Spvc#spvcObj.spvcFrKey of
-        undefined ->
-            ok;
-        FrEndPoint ->
-            set_fr_atm_iw_admin_state(FrEndPoint,down,Spvc)
-    end;
-awaiting_switch_over(destroy,Spvc,Attrs) ->
-    clear(Spvc).
-
-create_tp_index({If,Vpi,Vci,Leaf}) ->
-    list_to_tuple([orig,If,Vpi,Vci,Leaf]);
-create_tp_index({If,Vpi,Leaf}) ->
-    list_to_tuple([orig,If,Vpi,Leaf]).
-
-update_dyn_table_hcid({If,Vpi,Vci,Leaf},HcId) ->
-    [VcDyn] = ets:lookup(spvcVcDyn,{If,Vpi,Vci}),
-    ets:insert(spvcVcDyn,VcDyn#spvcVcDyn{vclConnId = HcId});
-update_dyn_table_hcid({If,Vpi,Leaf},HcId) ->
-    [VpDyn] = ets:lookup(spvcVpDyn,{If,Vpi}),
-    ets:insert(spvcVpDyn,VpDyn#spvcVpDyn{vplConnId = HcId}).
-
-new_state_outgoing_call_proceeding(Spvc) ->
-    debug_disabled,
-    Spvc1 = Spvc#spvcObj{spvcRowStatus = 1,
-                         currentState = outgoing_callproceeding},
-    Key = Spvc1#spvcObj.spvcEntry,
-    update_state(Spvc,outgoing_callproceeding),
-    PchKey = case Key of
-                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                     {IfIndex_Value,Vpi_Value,Vci_Value};
-                 {IfIndex_Value,Vpi_Value,_} ->
-                     {IfIndex_Value,Vpi_Value};
-                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                     [IfIndex_Value,Vpi_Value,Vci_Value];
-                 [IfIndex_Value,Vpi_Value,_] ->
-                     [IfIndex_Value,Vpi_Value]
-             end,
-    {FwdAtdIndex,BwdAtdIndex} = case PchKey of
-                                    {_,_,_} ->
-                                        Vc = spvcDataBase:db_read({pchVc,PchKey}),
-                                        {Vc#pchVc.vclReceiveTrafficDescrIndex,Vc#pchVc.vclTransmitTrafficDescrIndex};
-                                    {_,_} ->
-                                        Vp = spvcDataBase:db_read({pchVp,PchKey}),
-                                        {Vp#pchVp.vplReceiveTrafficDescrIndex,Vp#pchVp.vplTransmitTrafficDescrIndex}
-                                end,
-    FwdPchAtd = spvcDataBase:db_read({pchAtd,FwdAtdIndex}),
-    BwdPchAtd = spvcDataBase:db_read({pchAtd,BwdAtdIndex}),
-    Row = tuple_to_list(Key),
-    HcId = spvcLib:create_hcid(Row,case Row of
-                                   Row when record(Row,spvcObj) ->
-                                       case Row#spvcObj.spvcEntry of
-                                           {If_Value,_,_,_} ->
-                                               If_Value;
-                                           {If_Value,_,_} ->
-                                               If_Value
-                                       end;
-                                   Row when record(Row,spvcVcc) ->
-                                       {If_Value,_,_,_} = Row#spvcVcc.spvcVccEntry,
-                                       If_Value;
-                                   Row when record(Row,spvcVpc) ->
-                                       {If_Value,_,_} = Row#spvcVpc.spvcVpcEntry,
-                                       If_Value;
-                                   Row when record(Row,spvcVpcPerm) ->
-                                       {If_Value,_,_} = Row#spvcVpcPerm.spvcVpcEntry,
-                                       If_Value;
-                                   Row when record(Row,spvcVccPerm) ->
-                                       {If_Value,_,_,_} = Row#spvcVccPerm.spvcVccEntry,
-                                       If_Value;
-                                   Row when record(Row,spvcTargetVc) ->
-                                       {If_Value,_,_} = Row#spvcTargetVc.entry,
-                                       If_Value;
-                                   Row when record(Row,spvcTargetVp) ->
-                                       {If_Value,_} = Row#spvcTargetVp.entry,
-                                       If_Value;
-                                   Row when record(Row,pchVc) ->
-                                       {If_Value,_,_} = Row#pchVc.vclEntry,
-                                       If_Value;
-                                   Row when record(Row,pchVp) ->
-                                       {If_Value,_} = Row#pchVp.vplEntry,
-                                       If_Value;
-                                   Row when record(Row,spvcFr) ->
-                                       {If_Value,_} = Row#spvcFr.spvcFrEntry,
-                                       If_Value;
-                                   Row when record(Row,spvcFrPerm) ->
-                                       {If_Value,_} = Row#spvcFrPerm.spvcFrEntry,
-                                       If_Value;
-                                   {If_Value,_,_,_} ->
-                                       If_Value;
-                                   {If_Value,_,_} ->
-                                       If_Value;
-                                   {If_Value,_} ->
-                                       If_Value;
-                                   [If_Value|_] ->
-                                       If_Value;
-                                   _ ->
-                                       error
-                               end),
-    Setup = spvcEncode:encode_cc_setup(Row,Spvc1,FwdPchAtd,BwdPchAtd),
-    debug_disabled,
-    debug_disabled,
-    debug_disabled,
-    {Spvc1,HcId,Setup}.
-
-new_state_release_request(Spvc) ->
-    debug_disabled,
-    update_state(Spvc,release_request),
-    Spvc#spvcObj{currentState = release_request}.
-
-new_state_release_at_restart(Spvc) ->
-    debug_disabled,
-    Spvc1 = Spvc#spvcObj{spvcRetryFailures = 0,
-                         currentState = release_at_restart},
-    update_state(Spvc,release_at_restart),
-    HcId = spvcEncode:encode_cc_hcid(Spvc1#spvcObj.spvcEntry),
-    Release = spvcEncode:encode_cc_release(31),
-    spvcManager:release_un(a_side,HcId,Release,Spvc1),
-    Spvc1.
-
-new_state_rest_in_peace_or_wait(Spvc,[HcId,HciMsg]) ->
-    debug_disabled,
-    Spvc1 = Spvc#spvcObj{spvcRetryFailures = Spvc#spvcObj.spvcRetryFailures + 1},
-    case check_limits(Spvc1) of
-        {ok,ok,no_retries} ->
-            send_spvcFailingAlarm(Spvc#spvcObj.spvcEntry),
-            update_state(Spvc,4),
-            spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
-            Spvc1#spvcObj{currentState = rest_in_peace};
-        {ok,ok,_} ->
-            Spvc2 = Spvc1#spvcObj{spvcRetryTimer = time(),
-                                  currentState = wait},
-            update_state(Spvc,wait),
-            start_timer(wait,Spvc2),
-            Spvc2;
-        {retry_threshold,ok,no_retries} ->
-            Spvc2 = Spvc1#spvcObj{currentState = rest_in_peace},
-            update_state(Spvc,4),
-            send_call_failure(Spvc),
-            send_spvcFailingAlarm(Spvc#spvcObj.spvcEntry),
-            spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
-            Spvc2;
-        {retry_threshold,ok,_} ->
-            Spvc2 = Spvc1#spvcObj{spvcRetryTimer = time(),
-                                  currentState = wait},
-            update_state(Spvc,wait),
-            send_call_failure(Spvc2),
-            start_timer(wait,Spvc2),
-            Spvc2;
-        {ok,retry_limit,_} ->
-            send_spvcFailingAlarm(Spvc#spvcObj.spvcEntry),
-            update_state(Spvc,4),
-            spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
-            Spvc1#spvcObj{currentState = rest_in_peace};
-        {retry_threshold,retry_limit,_} ->
-            Spvc2 = Spvc1#spvcObj{currentState = rest_in_peace},
-            update_state(Spvc,4),
-            send_call_failure(Spvc2),
-            send_spvcFailingAlarm(Spvc#spvcObj.spvcEntry),
-            spvcLib:clear_spvcStillTryingAlarm(Spvc#spvcObj.spvcEntry),
-            Spvc2
-    end.
-
-send_call_failure(Spvc) ->
-    case Spvc#spvcObj.spvcRetryThreshold of
-        0 ->
-            ok;
-        _ ->
-            sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcOrig,call_failure,[Spvc])
-    end.
-
-new_state_rest_in_peace(Spvc) ->
-    debug_disabled,
-    update_state(Spvc,4),
-    Spvc1 = Spvc#spvcObj{spvcRetryFailures = Spvc#spvcObj.spvcRetryFailures + 1},
-    send_spvcFailingAlarm(Spvc#spvcObj.spvcEntry),
-    case check_limits(Spvc1) of
-        {ok,_,_} ->
-            Spvc1#spvcObj{currentState = rest_in_peace};
-        {retry_threshold,_,_} ->
-            Spvc2 = Spvc1#spvcObj{currentState = rest_in_peace},
-            case Spvc2#spvcObj.spvcRetryThreshold of
-                0 ->
-                    ok;
-                _ ->
-                    sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcOrig,call_failure,[Spvc2])
-            end,
-            Spvc2
-    end.
-
-new_state_active(Spvc) ->
-    debug_disabled,
-    update_state(Spvc,3),
-    Spvc#spvcObj{spvcRetryFailures = 0,
-                 currentState = active}.
-
-new_state_created(Spvc,SetCols) ->
-    debug_disabled,
-    update_state(Spvc,created),
-    case spvcSNMP:is_all_values(case Spvc#spvcObj.spvcEntry of
-                                    {_,_,_,_} ->
-                                        spvcVcc;
-                                    {_,_,_} ->
-                                        spvcVpc;
-                                    {_,_} ->
-                                        spvcFr;
-                                    [_,_,_,_] ->
-                                        spvcVcc;
-                                    [_,_,_] ->
-                                        spvcVpc;
-                                    [_,_] ->
-                                        spvcFr
-                                end,SetCols) of
-        true ->
-            Spvc1 = Spvc#spvcObj{spvcRowStatus = 2,
-                                 currentState = created},
-            set_attrs(Spvc1,SetCols);
-        false ->
-            Spvc1 = Spvc#spvcObj{spvcRowStatus = 3,
-                                 currentState = created},
-            set_attrs(Spvc1,SetCols)
-    end.
-
-new_state_not_in_service(Spvc) ->
-    debug_disabled,
-    update_state(Spvc,not_in_service),
-    Spvc#spvcObj{currentState = not_in_service,
-                 spvcRowStatus = 2}.
-
-new_state_awaiting_switch_over(Spvc) ->
-    debug_disabled,
-    Spvc#spvcObj{currentState = awaiting_switch_over}.
-
-update_state(Spvc,NewState) ->
-    State = Spvc#spvcObj.currentState,
-    SpvcEntry = Spvc#spvcObj.spvcEntry,
-    debug_disabled,
-    spvcLib:update_state({State,SpvcEntry},NewState).
-
-send_spvcFailingAlarm(Key) ->
-    debug_disabled,
-    rpc:cast(spvcLib:get_cp(om_node),spvcLib,send_spvcFailingAlarm,[Key]).
-
-set_call_failure_data_and_send_spvcFailingAlarm({If,Vpi,Leaf}) ->
-    debug_disabled,
-    Spvc = spvcDataBase:db_read({spvcObj,{If,Vpi,Leaf}}),
-    if
-        Spvc == [] ->
-            ok;
-        true ->
-            spvcLib:update_state({Spvc#spvcObj.currentState,{If,Vpi,Leaf}},4)
-    end;
-set_call_failure_data_and_send_spvcFailingAlarm({If,Vpi,Vci,Leaf}) ->
-    debug_disabled,
-    Spvc = spvcDataBase:db_read({spvcObj,{If,Vpi,Vci,Leaf}}),
-    if
-        Spvc == [] ->
-            ok;
-        true ->
-            spvcLib:update_state({Spvc#spvcObj.currentState,{If,Vpi,Vci,Leaf}},4)
-    end.
-
-set_attrs(Spvc,SetCols) ->
-    case Spvc#spvcObj.spvcEntry of
-        {_,_,_,_} ->
-            set_attrs_spvcc(Spvc,SetCols);
-        {_,_,_} ->
-            set_attrs_spvpc(Spvc,SetCols)
-    end.
-
-set_attrs_spvcc(Spvc,[{2,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcTargetAddress = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{3,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcTargetSelectType = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{18,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcTargetVpi = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{4,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcTargetVpi = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{5,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcTargetVci = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{6,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcLastReleaseCause = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{7,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcLastReleaseDiagnostic = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{10,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcRetryInterval = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{11,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcRetryTimer = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{12,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcRetryThreshold = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{13,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcRetryFailures = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{14,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcRetryLimit = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{16,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcTargetDlci = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[{17,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcTargetType = Value},
-    set_attrs_spvcc(Spvc1,T);
-set_attrs_spvcc(Spvc,[_|T]) ->
-    set_attrs_spvcc(Spvc,T);
-set_attrs_spvcc(Spvc,[]) ->
-    debug_disabled,
-    Spvc.
-
-set_attrs_spvpc(Spvc,[{2,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcTargetAddress = Value},
-    set_attrs_spvpc(Spvc1,T);
-set_attrs_spvpc(Spvc,[{3,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcTargetSelectType = Value},
-    set_attrs_spvpc(Spvc1,T);
-set_attrs_spvpc(Spvc,[{15,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcTargetVpi = Value},
-    set_attrs_spvpc(Spvc1,T);
-set_attrs_spvpc(Spvc,[{4,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcTargetVpi = Value},
-    set_attrs_spvpc(Spvc1,T);
-set_attrs_spvpc(Spvc,[{5,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcLastReleaseCause = Value},
-    set_attrs_spvpc(Spvc1,T);
-set_attrs_spvpc(Spvc,[{6,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcLastReleaseDiagnostic = Value},
-    set_attrs_spvpc(Spvc1,T);
-set_attrs_spvpc(Spvc,[{9,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcRetryInterval = Value},
-    set_attrs_spvpc(Spvc1,T);
-set_attrs_spvpc(Spvc,[{10,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcRetryTimer = Value},
-    set_attrs_spvpc(Spvc1,T);
-set_attrs_spvpc(Spvc,[{11,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcRetryThreshold = Value},
-    set_attrs_spvpc(Spvc1,T);
-set_attrs_spvpc(Spvc,[{12,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcRetryFailures = Value},
-    set_attrs_spvpc(Spvc1,T);
-set_attrs_spvpc(Spvc,[{13,Value}|T]) ->
-    Spvc1 = Spvc#spvcObj{spvcRetryLimit = Value},
-    set_attrs_spvpc(Spvc1,T);
-set_attrs_spvpc(Spvc,[_|T]) ->
-    set_attrs_spvpc(Spvc,T);
-set_attrs_spvpc(Spvc,[]) ->
-    Spvc.
-
-call_failure(Spvc) ->
-    debug_disabled,
-    Key = case Spvc#spvcObj.spvcFrKey of
-              undefined ->
-                  spvcLib:update_counter(callFailures,1,spvcLib:get_membership(node())),
-                  atm_spvc;
-              _ ->
-                  spvcLib:update_counter(callFrFailures,1,spvcLib:get_membership(node())),
-                  fr_spvc
-          end,
-    Obj = spvcDataBase:db_read({spvcFailures,Key}),
-    case Obj#spvcFailures.spvcCallFailuresTrapEnable of
-        1 ->
-            EventIndObj = spvcDataBase:db_read({spvcEventIndicator,Key}),
-            case EventIndObj#spvcEventIndicator.spvcTimerInd of
-                1 ->
-                    spvcDataBase:db_write(EventIndObj#spvcEventIndicator{spvcSendEventInd = 1}),
-                    NI = Obj#spvcFailures.spvcNotificationInterval,
-                    sysTimer:apply_after(1000 * NI,spvcOrig,timeout_event,[EventIndObj]);
-                _ ->
-                    spvcManager:send_event(Key),
-                    NI = Obj#spvcFailures.spvcNotificationInterval,
-                    sysTimer:apply_after(1000 * NI,spvcManager,timeout,[Key]),
-                    spvcDataBase:db_write(EventIndObj#spvcEventIndicator{spvcTimerInd = 1,
-                                                                         spvcSendEventInd = 2})
-            end;
-        _ ->
-            ok
-    end.
-
-timeout_event(EventIndObj) ->
-    spvcDataBase:db_write(EventIndObj#spvcEventIndicator{spvcTimerInd = 2}).
-
-check_limits(Spvc) ->
-    debug_disabled,
-    T = Spvc#spvcObj.spvcRetryThreshold,
-    L = Spvc#spvcObj.spvcRetryLimit,
-    F = Spvc#spvcObj.spvcRetryFailures,
-    I = Spvc#spvcObj.spvcRetryInterval,
-    {check_threshold(F,T),check_limit(F,L),check_interval(I)}.
-
-check_threshold(Failures,Threshold) when Failures == Threshold ->
-    debug_disabled,
-    retry_threshold;
-check_threshold(Failures,Threshold) ->
-    debug_disabled,
-    ok.
-
-check_limit(Failures,0) ->
-    debug_disabled,
-    ok;
-check_limit(Failures,Limit) when Failures < Limit ->
-    debug_disabled,
-    ok;
-check_limit(Failures,Limit) ->
-    debug_disabled,
-    retry_limit.
-
-check_interval(0) ->
-    no_retries;
-check_interval(I) ->
-    I.
-
-start_timer(wait,Spvc) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    Id = spvcReestablishTimer:apply_after(backoff_delay(Key),spvcServer,cast_to_spvc,[node(),spvcOrig,timeout,[wait,Key]]).
-
-timeout(wait,Key) ->
-    debug_disabled,
-    case spvcDataBase:db_read({spvcObj,Key}) of
-        [] ->
-            debug_disabled,
-            ok;
-        Spvc ->
-            case Spvc#spvcObj.currentState of
-                wait ->
-                    IfIndex = element(1,Key),
-                    case spvcOam:is_reassign_et_in_progress(IfIndex) of
-                        true ->
-                            ok;
-                        _ ->
-                            orig_state_machine(wait,timeout,Spvc,[])
-                    end;
-                _ ->
-                    ok
-            end
-    end;
-timeout(X,Y) ->
-    debug_disabled,
-    ok.
-
-clear(Spvc) ->
-    debug_disabled,
-    Key = Spvc#spvcObj.spvcEntry,
-    PchKey = case Key of
-                 {IfIndex_Value,Vpi_Value,Vci_Value,_} ->
-                     {IfIndex_Value,Vpi_Value,Vci_Value};
-                 {IfIndex_Value,Vpi_Value,_} ->
-                     {IfIndex_Value,Vpi_Value};
-                 [IfIndex_Value,Vpi_Value,Vci_Value,_] ->
-                     [IfIndex_Value,Vpi_Value,Vci_Value];
-                 [IfIndex_Value,Vpi_Value,_] ->
-                     [IfIndex_Value,Vpi_Value]
-             end,
-    spvcEndPoint:free_tp_spvc(PchKey),
-    spvcDataBase:db_delete({spvcObj,Key}),
-    update_state(Spvc,clear),
-    OrigKey = list_to_tuple([orig] ++ tuple_to_list(Key)),
-    case Spvc#spvcObj.currentState of
-        created ->
-            ok;
-        _ ->
-            case spvcDataBase:db_read({spvcTpToHcId,OrigKey}) of
-                [] ->
-                    ok;
-                #spvcTpToHcId{hcId = HcId} ->
-                    spvcDataBase:db_delete({spvcHcIdToTp,HcId})
-            end,
-            ets:delete(spvcTpToHcId,OrigKey),
-            spvcReestablishTimer:cancel(Key),
-            ets:delete(spvcBackoff,Spvc#spvcObj.spvcEntry)
-    end,
-    case Spvc#spvcObj.spvcFrKey of
-        undefined ->
-            sccmManager:cast_to_sccm(spvcLib:get_cp(om_node),spvcEndPoint,remove_tp,[tuple_to_list(PchKey)]);
-        FrKey ->
-            spvcFr:clean_up(FrKey)
-    end,
-    case {Spvc#spvcObj.spvcRerCap,Spvc#spvcObj.spvcEntry} of
-        {false,_} ->
-            ok;
-        {true,Entry} when size(Entry) == 3 ->
-            spvcDataBase:db_delete({spvcRerVp,Entry});
-        {true,Entry} when size(Entry) == 4 ->
-            spvcDataBase:db_delete({spvcRerVc,Entry})
-    end.
-
-get_link_state(If) when integer(If) ->
-    debug_disabled,
-    cnhChi:get_link_opstate(If);
-get_link_state(Other) ->
-    debug_disabled,
-    disabled.
-
-get_link_state_intf(If,Msg) when integer(If) ->
-    debug_disabled,
-    case cnhChi:get_link_opstate(If) of
-        enabled ->
-            enabled;
-        _ ->
-            Om_Node = spvcLib:get_cp(om_node),
-            case rpc:call(Om_Node,intfI,get_link_op_state,[If]) of
-                {ok,enabled} ->
-                    enabled;
-                Result ->
-                    disabled
-            end
-    end;
-get_link_state_intf(Other,Msg) ->
-    debug_disabled,
-    disabled.
-
-setup(HcId,Setup,Spvc) ->
-    case spvcDataBase:db_read({spvcObj,Spvc#spvcObj.spvcEntry}) of
-        [] ->
-            ok;
-        Spvc1 ->
-            case Spvc#spvcObj.currentState == Spvc1#spvcObj.currentState of
-                true ->
-                    spvcLib:increase_counter(spvcSaEtStat,Spvc),
-                    case Spvc#spvcObj.spvcFrKey of
-                        undefined ->
-                            do_setup(HcId,Setup,Spvc#spvcObj.spvcRerCap);
-                        FrKey ->
-                            do_setup(HcId,Setup,FrKey)
-                    end;
-                _ ->
-                    ok
-            end
-    end.
-
-do_setup(HcId,Setup,Type) when Type == undefined; Type == false ->
-    debug_disabled,
-    ReturnData = {0,HcId},
-    L3Data = {0,[HcId,Setup]},
-    mdisp:msg(node(),{plcOperator,1,infinity},{HcId,{spvcI,ReturnData}},{ccI,l3_msg,[HcId,spvcI,L3Data]});
-do_setup(HcId,Setup,true) ->
-    debug_disabled,
-    ReturnData = {0,HcId},
-    L3Data = {0,[HcId,Setup]},
-    mdisp:msg(node(),{plcOperator,1,infinity},{HcId,{spvcRerI,ReturnData}},{ccI,l3_msg,[HcId,spvcRerI,L3Data]});
-do_setup(HcId,Setup,FrKey) ->
-    debug_disabled,
-    ReturnData = {0,HcId},
-    L3Data = {0,[HcId,Setup]},
-    mdisp:msg(node(),{plcOperator,1,infinity},{HcId,{spvcFrI,ReturnData}},{ccI,l3_msg,[HcId,spvcFrI,L3Data]}).
-
-backoff_delay(Key) ->
-    debug_disabled,
-    Obj = spvcDataBase:db_read({spvcObj,Key}),
-    Var = spvcDataBase:db_read({spvcFailures,atm_spvc}),
-    {Delay,Flag} = case Obj#spvcObj.spvcRetryFailures of
-                       0 ->
-                           {100,no_alarm};
-                       1 ->
-                           {Obj#spvcObj.spvcRetryInterval,no_alarm};
-                       _ ->
-                           Table = get_backoff_table(Key,Obj),
-                           Max_Delay = Var#spvcFailures.max_delay,
-                           case Var#spvcFailures.delay_factor * Table#spvcBackoff.delay_time of
-                               DelayValue when DelayValue < Max_Delay ->
-                                   {DelayValue,no_alarm};
-                               _ ->
-                                   Org_Retry_Interval = Obj#spvcObj.spvcRetryInterval,
-                                   if
-                                       Org_Retry_Interval < Max_Delay ->
-                                           spvcLib:send_spvcStillTryingAlarm(Key,Table#spvcBackoff.flag),
-                                           {Max_Delay,alarm};
-                                       true ->
-                                           spvcLib:send_spvcStillTryingAlarm(Key,Table#spvcBackoff.flag),
-                                           {Org_Retry_Interval,alarm}
-                                   end
-                           end
-                   end,
-    ets:insert(spvcBackoff,#spvcBackoff{key = Key,
-                            delay_time = Delay,
-                            flag = Flag}),
-    round(Delay).
-
-get_backoff_table(Index,Spvc) ->
-    case ets:lookup(spvcBackoff,Index) of
-        [Obj] ->
-            Obj;
-        _ ->
-            #spvcBackoff{key = Spvc#spvcObj.spvcEntry,
-                         delay_time = Spvc#spvcObj.spvcRetryInterval,
-                         flag = no_alarm}
-    end.
-
-set_fr_atm_iw_admin_state(FrEndPoint,up,Spvc) ->
-    ok;
-set_fr_atm_iw_admin_state(FrEndPoint,NewStatus,Spvc) ->
-    ok.
-
-forced_release(FrEndPoint) ->
-    FrPerm = spvcDataBase:db_read({spvcFr,FrEndPoint}),
-    case FrPerm of
-        [] ->
-            {error,no_fr_spvc};
-        _ ->
-            Key = FrPerm#spvcFr.spvcFrAtmEntry,
-            Spvc = spvcDataBase:db_read({spvcObj,Key}),
-            SpvcFrObj = spvcDataBase:db_read({spvcFrPerm,FrEndPoint}),
-            case SpvcFrObj#spvcFrPerm.spvcFrConnect of
-                3 ->
-                    SpvcTpToHcId = read_spvcTpToHcId(Key),
-                    Release = spvcEncode:encode_cc_release(31),
-                    spvcManager:release_un(b_side,SpvcTpToHcId#spvcTpToHcId.hcId,Release,Spvc);
-                _ ->
-                    {error,target_not_owned_by_this_connection}
-            end
-    end.
-
-
-
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/src/wdp.hrl b/lib/dialyzer/test/user_tests_SUITE_data/src/wdp.hrl
deleted file mode 100644
index fa0e8af8c7..0000000000
--- a/lib/dialyzer/test/user_tests_SUITE_data/src/wdp.hrl
+++ /dev/null
@@ -1,97 +0,0 @@
-
-%%
-%% WAP Port Number Definitions (WDP Appendix B.)
-%%
-
--define(WAP_PORT_WTA_CL_SEC,   2805).
--define(WAP_PORT_WTA_CO_SEC,   2923).
--define(WAP_PORT_PUSH_CL,      2948).
--define(WAP_PORT_PUSH_CL_SEC,  2949).
-
--define(WAP_PORT_CL,           9200).
--define(WAP_PORT_CO,           9201).
--define(WAP_PORT_CL_SEC,       9202).
--define(WAP_PORT_CO_SEC,       9203).
--define(WAP_PORT_VCARD,        9204).
--define(WAP_PORT_VCAL,         9205).
--define(WAP_PORT_VCARD_SEC,    9206).
--define(WAP_PORT_VCAL_SEC,     9207).
-
--define(WAP_PORT_RINGTONE,     5505).
--define(WAP_PORT_OPER_LOGO,    5506).
--define(WAP_PORT_CLI_LOGO,     5507).
-
-%%
-%% WDP Bearer Type Assignments (WDP Appendix C.)
-%% 
-
-%%
-%% Names after the tag WAP_BEARER_ is [network]_[bearer_type]_[address_type]
-%% 
--define(WAP_BEARER_ANY_ANY_IPV4, 16#00).
--define(WAP_BEARER_ANY_ANY_IPV6, 16#01).
--define(WAP_BEARER_GSM_USSD_ANY, 16#02).
--define(WAP_BEARER_GSM_SMS_GSMMSISDN, 16#03).
--define(WAP_BEARER_ANSI136_GUTS_ANSI136MSISDN, 16#04).
--define(WAP_BEARER_IS95CDMA_SMS_IS637MSISDN, 16#05).
--define(WAP_BEARER_IS95CDMA_CSD_IPV4, 16#06).
--define(WAP_BEARER_IS95CDMA_PACKETDATA_IPV4, 16#07).
--define(WAP_BEARER_ANSI136_CSD_IPV4, 16#08).
--define(WAP_BEARER_ANSI136_PACKETDATA_IPV4, 16#09).
--define(WAP_BEARER_GSM_CSD_IPV4, 16#0a).
--define(WAP_BEARER_GSM_GPRS_IPV4, 16#0b).
--define(WAP_BEARER_GSM_USSD_IPV4, 16#0c).
--define(WAP_BEARER_AMPS_CDPD_IPV4, 16#0d).
--define(WAP_BEARER_PDC_CSD_IPV4, 16#0e).
--define(WAP_BEARER_PDC_PACKETDATA_IPV4, 16#0f).
--define(WAP_BEARER_IDEN_SMS_IDENMSISDN, 16#10).
--define(WAP_BEARER_IDEN_CSD_IPV4, 16#11).
--define(WAP_BEARER_IDEN_PACKETDATA_IPV4, 16#12).
--define(WAP_BEARER_PAGINGNETWORK_FLEX_FLEXMSISDN, 16#13).
--define(WAP_BEARER_PHS_SMS_PHSMSISDN, 16#14).
--define(WAP_BEARER_PHS_CSD_IPV4, 16#15).
--define(WAP_BEARER_GSM_USSD_GSMSERVICECODE, 16#16).
--define(WAP_BEARER_TETRA_SDS_TETRAITSI, 16#17).
--define(WAP_BEARER_TETRA_SDS_TETRAMSISDN, 16#18).
--define(WAP_BEARER_TETRA_PACKETDATA_IPV4, 16#19).
--define(WAP_BEARER_PAGINGNETWORK_REFLEX_REFLEXMSISDN, 16#1a).
--define(WAP_BEARER_GSM_USSD_GSMMSISDN, 16#1b).
--define(WAP_BEARER_MOBITEX_MPAK_MAN, 16#1c).
--define(WAP_BEARER_ANSI136_GHOST_GSMMSISDN, 16#1d).
-
--record(wdp_address, 
-	{
-	  bearer,
-	  address,
-	  portnum
-	 }).
-
--record(wdp_sap_info,
-	{
-	  mtu,   %% max transmission unit (bytes)
-	  mru    %% max receive unit (bytes)
-	 }).
-	  
-%%
-%% Source and destination address are wdp_addresses
-%% 
--record(wdp_socket_pair,
-	{
-	  source,
-	  destination
-	 }).
-
--record(wdp_local_port, 
-	{
-	  port,   %% wdp "socket"
-	  sap,    %% source address
-	  user,   %% WDP user process
-	  monitor %% monitor on WDP user
-	 }).
-
--record(wdp_local_sap,
-	{
-	  sap,    %% source address
-	  port    %% wdp "socket"
-	 }).
-
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/src/wsp.hrl b/lib/dialyzer/test/user_tests_SUITE_data/src/wsp.hrl
deleted file mode 100644
index 8190bd6f6f..0000000000
--- a/lib/dialyzer/test/user_tests_SUITE_data/src/wsp.hrl
+++ /dev/null
@@ -1,242 +0,0 @@
-
-%% WSP Table 34. PDU Type Assignments
-%%
-
--define(WSP_Connect,       16#01).
--define(WSP_ConnectReply,  16#02).
--define(WSP_Redirect,      16#03).
--define(WSP_Reply,         16#04).
--define(WSP_Disconnect,    16#05).
--define(WSP_Push,          16#06).
--define(WSP_ConfirmedPush, 16#07).
--define(WSP_Suspend,       16#08).
--define(WSP_Resume,        16#09).
-
--define(WSP_Get,           16#40).
--define(WSP_Options,       16#41).
--define(WSP_Head,          16#42).
--define(WSP_Delete,        16#43).
--define(WSP_Trace,         16#44).
-
--define(WSP_Post,          16#60).
--define(WSP_Put,           16#61).
-
--define(WSP_DataFragmentPDU, 16#80).
-
-%%
-%% WSP Table 37. Capability Assignments
-%%
-
--define(WSP_CAP_CLIENT_SDU_SIZE,     16#00).
--define(WSP_CAP_SERVER_SDU_SIZE,     16#01).
--define(WSP_CAP_PROTOCOL_OPTIONS,    16#02).
--define(WSP_CAP_METHOD_MOR,          16#03).
--define(WSP_CAP_PUSH_MOR,            16#04).
--define(WSP_CAP_EXTENDED_METHODS,    16#05).
--define(WSP_CAP_HEADER_CODE_PAGES,   16#06).
--define(WSP_CAP_ALIASES,             16#07).
--define(WSP_CAP_CLIENT_MESSAGE_SIZE, 16#08).
--define(WSP_CAP_SERVER_MESSAGE_SIZE, 16#09).
-
--define(WSP_CODEPAGE_1, 1).
--define(WSP_DEFAULT_CODEPAGE, ?WSP_CODEPAGE_1).
-
--define(ANY_LANGUAGE,128).
-
--define(WSP_10, {1,0}).
--define(WSP_11, {1,1}).
--define(WSP_12, {1,2}).
--define(WSP_13, {1,3}).
--define(WSP_14, {1,4}).
--define(WSP_15, {1,5}).
-
--define(WSP_COMPLIENT_VERSION, ?WSP_15).
--define(WSP_DEFAULT_VERSION,   ?WSP_12).
-
--define(WSP_STATUS_CONTINUE, 100).
--define(WSP_STATUS_SWITCHING_PROTOCOLS, 101).
--define(WSP_STATUS_OK, 200).
--define(WSP_STATUS_CREATED, 201).
--define(WSP_STATUS_ACCEPTED, 202).
--define(WSP_STATUS_NON_AUTHORITATIVE_INFORMATION, 203).
--define(WSP_STATUS_NO_CONTENT, 204).
--define(WSP_STATUS_RESET_CONTENT, 205).
--define(WSP_STATUS_PARTIAL_CONTENT, 206).
--define(WSP_STATUS_MULTIPLE_CHOICES, 300).
--define(WSP_STATUS_MOVED_PERMANENTLY, 301).
--define(WSP_STATUS_MOVED_TEMPORARILY, 302).
--define(WSP_STATUS_SEE_OTHER, 303).
--define(WSP_STATUS_NOT_MODIFIED, 304).
--define(WSP_STATUS_USE_PROXY, 305).
--define(WSP_STATUS_RESERVED, 306).
--define(WSP_STATUS_TEMPORARY_REDIRECT, 307).
--define(WSP_STATUS_BAD_REQUEST, 400).
--define(WSP_STATUS_UNAUTHORIZED, 401).
--define(WSP_STATUS_PAYMENT_REQUIRED, 402).
--define(WSP_STATUS_FORBIDDEN, 403).
--define(WSP_STATUS_NOT_FOUND, 404).
--define(WSP_STATUS_METHOD_NOT_ALLOWED, 405).
--define(WSP_STATUS_NOT_ACCEPTABLE, 406).
--define(WSP_STATUS_PROXY_AUTHENTICATION_REQUIRED, 407).
--define(WSP_STATUS_REQUEST_TIMEOUT, 408).
--define(WSP_STATUS_CONFLICT, 409).
--define(WSP_STATUS_GONE, 410).
--define(WSP_STATUS_LENGTH_REQUIRED, 411).
--define(WSP_STATUS_PRECONDITION_FAILED, 412).
--define(WSP_STATUS_REQUEST_ENTITY_TOO_LARGE, 413).
--define(WSP_STATUS_REQUEST_URI_TOO_LARGE, 414).
--define(WSP_STATUS_UNSUPPORTED_MEDIA_TYPE, 415).
--define(WSP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE, 416).
--define(WSP_STATUS_EXPECTATION_FAILED, 417).
--define(WSP_STATUS_INTERNAL_SERVER_ERROR, 500).
--define(WSP_STATUS_NOT_IMPLEMENTED, 501).
--define(WSP_STATUS_BAD_GATEWAY, 502).
--define(WSP_STATUS_SERVICE_UNAVAILABLE, 503).
--define(WSP_STATUS_GATEWAY_TIMEOUT, 504).
--define(WSP_STATUS_HTTP_VERSION_NOT_SUPPORTED, 505).
-
--define(ENCODE_SHORT(X), <<1:1, (X):7>>).
-
--define(ENCODE_LONG(X),
-	if (X) =< 16#ff   -> <<1, (X):8>>;
-	   (X) =< 16#ffff -> <<2, (X):16>>;
-	   (X) =< 16#ffffff -> <<3, (X):24>>;
-	   (X) =< 16#ffffffff -> <<4, (X):32>>;
-	   true -> encode_long1(X)
-	end).
-
-
--record(wsp_session,
-	{
-	  id,            %% uniq session id
-	  ref,           %% address quadruple (socketpair)
-	  state=null,    %% connected, suspended
-	  version,       %% encoding version to use
-	  capabilities,  %% client capabilities
-	  headers        %% client hop-by-hop headers!!!
-	 }).
-
--record(wsp_header,
-	{
-	  name,     %% field name
-	  value,    %% field value (binary value)
-	  params=[] %% field params [{Name,Value} | Value]
-	 }).
-
--record(wsp_multipart_entry,
-	{
-	  content_type,  %% #wsp_header 
-	  headers=[],
-	  data=(<<>>)
-	 }).
-
--record(wsp_capabilities,
-	{
-	  aliases=[],             %% [#wdp_address]
-	  client_sdu_size=1400,
-	  extended_methods=[],    %% [{PduType, Name}]
-	  header_code_pages=[],   %% [{Page,Name}] | [Page]
-	  protocol_options=[],    %% [push,confirmed_push,resume,
-	                          %%  acknowledgement_headers]
-	  method_mor = 10,        %% 1?
-	  push_mor = 10,          %% 1?
-	  server_sdu_size=1400,
-	  client_message_size,
-	  server_message_size,
-	  unknown=[]
-	 }).
-
-%% WSP PDU records
-
--record(wsp_connect, 
-	{
-	  version,     %% protocol version, not wsp version?
-	  capabilities, 
-	  headers
-	 }).
-
--record(wsp_connect_reply,
-	{
-	  server_session_id,
-	  capabilities,
-	  headers=[]
-	}).
-
--define(WSP_PERMANENT_REDIRECT, 16#80).
--define(WSP_REUSE_SECURITY,     16#40).
-
--record(wsp_redirect,
-	{
-	  flags=[],
-	  addresses=[]
-	 }).
-
--record(wsp_disconnect,
-	{
-	  server_session_id
-	 }).
-
--record(wsp_get,
-	{
-	  type,
-	  uri,
-	  headers=[]
-	 }).
-
--record(wsp_post,
-	{
-	  type,
-	  uri,
-	  content_type, %% #wsp_header 
-	  headers=[],
-	  data
-	 }).
-
--record(wsp_reply,
-	{
-	  status,
-	  content_type, %% #wsp_header 
-	  headers=[],
-	  data
-	}).
-
--record(wsp_data_fragment_pdu,
-	{
-	  headers=[],
-	  data
-	 }).
-
--record(wsp_push,
-	{
-	  type = push,
-	  content_type, %% #wsp_header 
-	  headers=[],
-	  data
-	 }).
-
--record(wsp_suspend,
-	{
-	  session_id
-	}).
-
--record(wsp_resume,
-	{
-	  session_id,
-	  capabilities,
-	  headers
-	 }).
-
-%% NOTE: not a real pdu
--record(wsp_acknowledgement_headers,
-	{
-	  headers=[]
-	}).
-
--record(wsp_unknown_pdu,
-	{
-	  type,  %% integer
-	  data   %% the payload
-	 }).
-	  
-
-
diff --git a/lib/dialyzer/test/user_tests_SUITE_data/src/wsp_pdu.erl b/lib/dialyzer/test/user_tests_SUITE_data/src/wsp_pdu.erl
deleted file mode 100644
index 596a2f63ac..0000000000
--- a/lib/dialyzer/test/user_tests_SUITE_data/src/wsp_pdu.erl
+++ /dev/null
@@ -1,5423 +0,0 @@
-%%%=======================================================================
-%%% File        : wsp_pdu.erl
-%%% Author      : Tony Rogvall <[email protected]>
-%%% Description : WSP PDU
-%%% Created     : 18 Aug 2003 by <[email protected]>
-%%%=======================================================================
-%%%
-%%% There are a couple of bugs in this file. Some are detected by
-%%% Dialyzer v1.1 starting both from byte code and from source, some
-%%% other ones are detected only starting from sourse, while some
-%%% others go unnoticed (these are identified by "BUG" below). It is
-%%% expected that at least some of them are detected when the new type
-%%% analysis is integrated into Dialyzer. Some other ones, like the
-%%% one with the unused _Acc argument are harder to detect and might
-%%% require different techniques.
-%%%
-%%%=======================================================================
-
--module(wsp_pdu).
--export([encode/1, encode/2, decode/1, decode/2]).
-
-%% The following is just to suppress unused function warnings
--export([decode_address/1, decode_header/2,
- 	 decode_headers/1, decode_mms_version/1, decode_multipart/1,
- 	 encode_headers/1, encode_mms_version/1, encode_multipart/1,
- 	 encode_language/1, encode_short_integer/1,
- 	 fmt_current_date/0, 
- 	 format_header/1, format_headers/1,
- 	 parse_header/1, format/1]).
-
--include("wsp.hrl").
--include("wdp.hrl").
-
--ifdef(debug).
--define(dbg(Fmt,Args), io:format(Fmt, Args)).
--else.
--define(dbg(Fmt,Args), ok).
--endif.
-
--define(WARN(Cond, Message),
-	if (Cond) ->
-		io:format("Warning: ~s\n", [(Message)]);
-	   true ->
-		ok
-	end).
-
-	       
-format(Pdu) ->
-    if record(Pdu, wsp_connect) ->
-	    fmt(Pdu, record_info(fields, wsp_connect));
-       record(Pdu, wsp_connect_reply) ->
-	    fmt(Pdu, record_info(fields, wsp_connect_reply));
-       record(Pdu, wsp_redirect) ->
-	    fmt(Pdu, record_info(fields, wsp_redirect));
-       record(Pdu, wsp_disconnect) ->
-	    fmt(Pdu, record_info(fields, wsp_disconnect));
-       record(Pdu, wsp_get) ->
-	    fmt(Pdu, record_info(fields, wsp_get));
-       record(Pdu, wsp_post) ->
-	    fmt(Pdu, record_info(fields, wsp_post));
-       record(Pdu,wsp_reply) ->
-	    fmt(Pdu, record_info(fields, wsp_reply));
-       record(Pdu,wsp_data_fragment_pdu) ->
-	    fmt(Pdu, record_info(fields, wsp_data_fragment_pdu));
-       record(Pdu,wsp_push) ->
-	    fmt(Pdu, record_info(fields, wsp_push));
-       record(Pdu, wsp_suspend) ->
-	    fmt(Pdu, record_info(fields, wsp_suspend));
-       record(Pdu, wsp_resume) ->
-	    fmt(Pdu, record_info(fields, wsp_resume));
-       record(Pdu, wsp_unknown_pdu) ->
-	    fmt(Pdu, record_info(fields, wsp_unknown_pdu))
-    end.
-
-fmt(Pdu, Fs) ->
-    [Name | Vs] = tuple_to_list(Pdu),
-    lists:flatten(["\n",atom_to_list(Name)," {\n" , fmt1(Fs, Vs), "\n}"]).
-
-fmt1([F|Fs],[V|Vs]) ->
-    [io_lib:format("  ~s: ~s;\n", [F,fmt_value(V)]) | fmt1(Fs, Vs)];
-fmt1([], []) ->
-    "".
-
-fmt_value(V) when binary(V) -> "#Bin";
-fmt_value(V) -> lists:flatten(io_lib:format("~p",[V])).
-
-
-%%
-%% Wsp pdu encoder
-%%
-encode(Pdu) ->
-    encode(Pdu, ?WSP_DEFAULT_VERSION).
-
-encode(Pdu, Version) ->
-    ?dbg("encode pdu using encoding version ~p\n", [Version]),
-    Enc = encode1(Pdu, Version),
-    ?dbg("pdu: ~p\nreversed pdu: ~p\n",
-	 [Pdu, decode(Enc, Version)]),
-    Enc.
-    
-
-encode1(Pdu, Version) ->
-    case Pdu of
-	#wsp_connect_reply {server_session_id=ServerSessionId,
-			    capabilities=Capabilities,
-			    headers=Headers} ->
-	    EncServerSessionId = e_uintvar(ServerSessionId),
-	    EncCapabilities = encode_capabilities(Capabilities),
-	    EncCapabilitiesLength = e_uintvar(size(EncCapabilities)),
-	    EncHeaders = encode_headers(Headers,Version),
-	    EncHeadersLength = e_uintvar(size(EncHeaders)),
-	    <<?WSP_ConnectReply,
-	     EncServerSessionId/binary,
-	     EncCapabilitiesLength/binary, EncHeadersLength/binary,
-	     EncCapabilities/binary, EncHeaders/binary>>;
-
-	#wsp_reply{ status=Status,
-		    content_type=ContentType,
-		    headers=Headers,
-		    data=Data} ->
-	    EncStatus = encode_status_code(Status),
-	    EncContentType = encode_content_type(ContentType,Version),
-	    EncHeaders = encode_headers(Headers,Version),
-	    EncHeadersLength = e_uintvar(size(EncContentType)+
-					 size(EncHeaders)),
-	    <<?WSP_Reply,
-	     EncStatus:8,
-	     EncHeadersLength/binary,
-	     EncContentType/binary,
-	     EncHeaders/binary,
-	     Data/binary>>;
-
-	#wsp_post{type=Type, uri=URI, content_type=ContentType,
-		  headers=Headers, data=Data} ->
-	    %% WSP_Post, WSP_Put
-	    PDUType = encode_pdu_type(Type),
-	    UriLength = e_uintvar(length(URI)),
-	    EncContentType = encode_content_type(ContentType,Version),
-	    EncHeaders = encode_headers(Headers,Version),
-	    EncHeadersLength = e_uintvar(size(EncContentType)+
-					 size(EncHeaders)),    
-	    %% FIXME
-	    <<PDUType:8,
-	     UriLength/binary,
-	     EncHeadersLength/binary,
-	     (list_to_binary(URI))/binary,
-	     EncContentType/binary,
-	     EncHeaders/binary,
-	     Data/binary>>;
-     
-	#wsp_push{type=Type, content_type=ContentType,
-		  headers=Headers, data=Data} ->
-	    %% WSP_Push, WSP_ConfirmedPush
-	    PDUType = encode_pdu_type(Type),
-	    EncContentType = encode_content_type(ContentType,Version),
-	    EncHeaders = encode_headers(Headers,Version),
-	    ?dbg("Version ~p Headers ~p", [Version, Headers]),
-	    ?dbg("EncHeaders ~p", [EncHeaders]),
-	    EncHeadersLength = e_uintvar(size(EncContentType)+
-					 size(EncHeaders)),
-	    ?dbg("EncCT = ~w ~w", [ContentType, EncContentType]),
-	    ?dbg("EncHL = ~w", [EncHeadersLength]),
-	    <<PDUType:8,
-	     EncHeadersLength/binary,
-	     EncContentType/binary,
-	     EncHeaders/binary,
-	     Data/binary>>;
-
-	#wsp_get{type=Type, uri=URI, headers=Headers} ->
-	    %% WSP_Get, WSP_Options, WSP_Head, WSP_Delete, WSP_Trace
-	    PDUType = encode_pdu_type(Type),
-	    UriLength = length(URI),
-	    EncHeaders = encode_headers(Headers,Version),
-	    <<PDUType:8,
-	     (e_uintvar(UriLength))/binary,
-	     (list_to_binary(URI))/binary,
-	     EncHeaders/binary>>;
-
-	#wsp_redirect { flags = Flags, addresses = Addrs } ->
-	    Flg = lists:foldl(fun(permanent,F) -> 
-				       ?WSP_PERMANENT_REDIRECT bor F;
-			          (resue, F) ->
-				       ?WSP_REUSE_SECURITY bor F
-			       end, 0, Flags),
-	    EncAddr = encode_addresses(Addrs),
-	    <<?WSP_Redirect, Flg:8, EncAddr/binary >>;
-
-
-	#wsp_data_fragment_pdu { headers=Headers, data=Data } ->
-	    EncHeaders = encode_headers(Headers,Version),
-	    << ?WSP_DataFragmentPDU, EncHeaders/binary, Data/binary >>
-    end.
-
-decode(Data) ->
-    decode(Data, ?WSP_COMPLIENT_VERSION).
-
-decode(Data0, Version) ->
-    case Data0 of
-	<<?WSP_Connect:8,PduVersion:8,D0/binary>> ->
-	    %% 8.2.2.1
-	    {CapabilitiesLen,D1} = d_uintvar(D0),
-	    {HeadersLen,D2} = d_uintvar(D1),
-	    {Capabilities,D3} = split_binary(D2, CapabilitiesLen),
-	    Caps = decode_capabilities(Capabilities,#wsp_capabilities{}),
-	    {Headers,D4} = split_binary(D3, HeadersLen),
-	    DecHeaders = decode_headers(Headers, Version),
-	    ?WARN(D4 =/= <<>>, "Connect pdu contains trailing data"),
-	    %% FIXME: warn when D4 is not <<>>
-	    #wsp_connect{ version = PduVersion,
-			  capabilities=Caps,
-			  headers = DecHeaders };
-
-	<<?WSP_ConnectReply:8,D0/binary>> ->
-	    %% 8.2.2.2
-	    {ServerSessionId,D1} = d_uintvar(D0),
-	    {CapabilitiesLen,D2} = d_uintvar(D1),
-	    {HeadersLen,D3} = d_uintvar(D2),
-	    {Capabilities,D4} = split_binary(D3, CapabilitiesLen),
-	    Caps = decode_capabilities(Capabilities,#wsp_capabilities{}),
-	    {Headers,D5} = split_binary(D4, HeadersLen),
-	    DecHeaders = decode_headers(Headers, Version),
-	    ?WARN(D5 =/= <<>>, "ConnectReply pdu contains trailing data"),
-	    #wsp_connect_reply{server_session_id=ServerSessionId,
-			       capabilities=Caps,
-			       headers=DecHeaders};
-
-	<<?WSP_Redirect:8,Flg:8,D0/binary>> ->
-	    Flags =
-		if Flg band ?WSP_PERMANENT_REDIRECT =/= 0 -> [permanent];
-		   true -> []
-		end ++
-		if Flg band ?WSP_REUSE_SECURITY =/= 0 -> [security];
-		   true -> []
-		end,
-	    Addrs = decode_addresses(D0),
-	    %% 8.2.2.3 Redirect
-	    #wsp_redirect{flags=Flags,addresses=Addrs};
-
-
-	<<?WSP_Disconnect:8,D0/binary>> ->
-	    %% 8.2.2.4 Disconnect
-	    {ServerSessionId,_D1} = d_uintvar(D0),
-	    #wsp_disconnect{server_session_id=ServerSessionId};
-
-	<<?WSP_Get:8,D0/binary>> ->
-	    {URILength, D1} = d_uintvar(D0),
-	    <<UriData:URILength/binary,D2/binary>> = D1,
-	    Hs = decode_headers(D2, Version),
-	    #wsp_get{type='GET',uri=binary_to_list(UriData),headers=Hs };
-
-	<<?WSP_Options:8,D0/binary>> ->
-	    {URILength, D1} = d_uintvar(D0),
-	    <<UriData:URILength/binary,D2/binary>> = D1,
-	    Hs = decode_headers(D2, Version),
-	    #wsp_get{type='OPTIONS',uri=binary_to_list(UriData),headers=Hs };
-
-	<<?WSP_Head:8,D0/binary>> ->
-	    {URILength, D1} = d_uintvar(D0),
-	    <<UriData:URILength/binary,D2/binary>> = D1,
-	    Hs = decode_headers(D2, Version),
-	    #wsp_get{type='HEAD',uri=binary_to_list(UriData),headers=Hs };
-
-	<<?WSP_Delete:8,D0/binary>> ->
-	    {URILength, D1} = d_uintvar(D0),
-	    <<UriData:URILength/binary,D2/binary>> = D1,
-	    Hs = decode_headers(D2, Version),
-	    #wsp_get{type='DELETE',uri=binary_to_list(UriData),headers=Hs };
-
-	<<?WSP_Trace:8,D0/binary>> ->
-	    {URILength, D1} = d_uintvar(D0),
-	    <<UriData:URILength/binary,D2/binary>> = D1,
-	    Hs = decode_headers(D2, Version),
-	    #wsp_get{type='TRACE',uri=binary_to_list(UriData),headers=Hs };
-
-	%% 8.2.3.2 Post
-	<<?WSP_Post:8,D0/binary>> ->
-	    {URILen, D1} = d_uintvar(D0),
-	    {HL0, D2} = d_uintvar(D1),
-	    <<UriData:URILen/binary,D3/binary>> = D2,
-	    {FieldData,D4} = scan_header_data(D3),
-	    HL1 = (HL0-(size(D3)-size(D4))),
-	    <<D5:HL1/binary,Data/binary>> = D4,
-	    ContentType = decode_content_type(FieldData, Version),
-	    Headers = decode_headers(D5, Version),
-	    #wsp_post{ type='POST', uri=binary_to_list(UriData),
-		       content_type=ContentType, headers=Headers, data=Data};
-
-	<<?WSP_Put:8,D0/binary>> ->
-	    {URILen, D1} = d_uintvar(D0),
-	    {HL0, D2} = d_uintvar(D1),
-	    <<UriData:URILen/binary,D3/binary>> = D2,
-	    {FieldData,D4} = scan_header_data(D3),
-	    HL1 = (HL0-(size(D3)-size(D4))),
-	    <<D5:HL1/binary,Data/binary>> = D4,
-	    ContentType = decode_content_type(FieldData, Version),
-	    Headers = decode_headers(D5, Version),
-	    #wsp_post{ type='PUT', uri=binary_to_list(UriData),
-		       content_type=ContentType, headers=Headers, data=Data};
-
-	<<?WSP_Reply:8,StatusCode:8,D0/binary>> ->
-	    %% 8.2.3.3 Reply
-	    Status = decode_status_code(StatusCode),
-	    {HL0, D1} = d_uintvar(D0),
-	    {FieldData, D2} = scan_header_data(D1),
-	    ContentType = decode_content_type(FieldData, Version), 
-	    %% Headers are headersLength - binary size of content type
-	    HL1 = (HL0-(size(D1)-size(D2))),
-	    <<D3:HL1/binary,Data/binary>> = D2,
-	    Hs = decode_headers(D3, Version),
-	    #wsp_reply{status=Status, content_type=ContentType,
-		       headers=Hs, data=Data};
-	
-	<<?WSP_DataFragmentPDU:8,D0/binary>> ->
-	    %% 8.2.3.4 Data Fragment PDU
-	    {HL0, D1} = d_uintvar(D0),
-	    <<D2:HL0/binary,Data/binary>> = D1,
-	    Hs = decode_headers(D2, Version),
-	    #wsp_data_fragment_pdu{headers=Hs, data=Data};
-
-	%% 8.2.4.1 Push or ConfirmedPush
-	<<?WSP_Push:8,D0/binary>> ->
-	    {HeadersLength, T200} = d_uintvar(D0),
-	    {FieldData, T300} = scan_header_data(T200),
-	    ContentType = decode_content_type(FieldData, Version),
-	    RealHeadersLength = (HeadersLength-(size(T200)-size(T300))),
-	    <<T400:RealHeadersLength/binary,Data/binary>> = T300,
-	    Headers = decode_headers(T400, Version),
-	    #wsp_push{type=push,content_type=ContentType,
-		      headers=Headers,data=Data};
-
-	<<?WSP_ConfirmedPush:8,D0/binary>> ->
-	    {HeadersLength, T200} = d_uintvar(D0),
-	    {FieldData, T300} = scan_header_data(T200),
-	    ContentType = decode_content_type(FieldData, Version),
-	    RealHeadersLength = (HeadersLength-(size(T200)-size(T300))),
-	    <<T400:RealHeadersLength/binary,Data/binary>> = T300,
-	    Headers = decode_headers(T400, Version),
-	    #wsp_push{type=confirmed_push,
-		      content_type=ContentType,
-		      headers=Headers,data=Data};
-
-	<<PDUType:8,T100/binary>> ->
-	    #wsp_unknown_pdu { type = PDUType, data = T100 }
-    end.
-
-
-encode_pdu_type(connect) -> ?WSP_Connect;
-encode_pdu_type(connect_reply) -> ?WSP_ConnectReply;
-encode_pdu_type(redirect) -> ?WSP_Redirect;
-encode_pdu_type(reply) -> ?WSP_Reply;
-encode_pdu_type(disconnect) -> ?WSP_Disconnect;
-encode_pdu_type(push) -> ?WSP_Push;
-encode_pdu_type(confirmed_push) -> ?WSP_ConfirmedPush;
-encode_pdu_type(suspend) -> ?WSP_Suspend;
-encode_pdu_type(resume) -> ?WSP_Resume;
-encode_pdu_type(data_fragment_pdu) -> ?WSP_DataFragmentPDU;
-encode_pdu_type('GET') -> ?WSP_Get;
-encode_pdu_type('OPTIONS') -> ?WSP_Options;
-encode_pdu_type('HEAD') -> ?WSP_Head;
-encode_pdu_type('DELETE') -> ?WSP_Delete;
-encode_pdu_type('TRACE') -> ?WSP_Trace;
-encode_pdu_type('POST') -> ?WSP_Post;
-encode_pdu_type('PUT') -> ?WSP_Put;
-encode_pdu_type(Type) when integer(Type) -> Type.
-    
-
-decode_pdu_type(?WSP_Connect) -> connect;
-decode_pdu_type(?WSP_ConnectReply) -> connect_reply;
-decode_pdu_type(?WSP_Redirect) -> redirect;
-decode_pdu_type(?WSP_Reply) -> reply;
-decode_pdu_type(?WSP_Disconnect) -> disconnect;
-decode_pdu_type(?WSP_Push) -> push;
-decode_pdu_type(?WSP_ConfirmedPush) -> confirmed_push;
-decode_pdu_type(?WSP_Suspend) -> suspend;
-decode_pdu_type(?WSP_Resume) -> resume;
-decode_pdu_type(?WSP_DataFragmentPDU) -> data_fragment_pdu;
-decode_pdu_type(?WSP_Get) -> 'GET';
-decode_pdu_type(?WSP_Options) -> 'OPTIONS';
-decode_pdu_type(?WSP_Head) -> 'HEAD';
-decode_pdu_type(?WSP_Delete) -> 'DELETE';
-decode_pdu_type(?WSP_Trace) -> 'TRACE';
-decode_pdu_type(?WSP_Post) -> 'POST';
-decode_pdu_type(?WSP_Put) -> 'PUT';
-decode_pdu_type(Type) -> Type.  %% allow unknown pdu types.
-
-
-%% Convert various data types to list
-
-to_list(I) when integer(I) ->
-    integer_to_list(I);
-to_list(A) when atom(A) ->
-    atom_to_list(A);
-to_list(Version={X,Y}) when integer(X), integer(Y) ->
-    format_version(Version);
-to_list(DateTime={{_,_,_},{_,_,_}}) ->
-    fmt_date(DateTime);
-to_list(L) when list(L) ->
-    L.
-
-    
-
-encode_capabilities(Capa) ->
-    encode_capabilities(Capa,#wsp_capabilities{}).
-
-encode_capabilities(Cap,Def) ->
-    Known =
-	[encode_capability(?WSP_CAP_ALIASES, 
-			   Cap#wsp_capabilities.aliases,
-			   Def#wsp_capabilities.aliases),
-	 encode_capability(?WSP_CAP_CLIENT_SDU_SIZE,
-			   Cap#wsp_capabilities.client_sdu_size,
-			   Def#wsp_capabilities.client_sdu_size),
-	 encode_capability(?WSP_CAP_SERVER_SDU_SIZE,
-			   Cap#wsp_capabilities.server_sdu_size,
-			   Def#wsp_capabilities.server_sdu_size),
-	 encode_capability(?WSP_CAP_PROTOCOL_OPTIONS,
-			   Cap#wsp_capabilities.protocol_options,
-			   Def#wsp_capabilities.protocol_options),
-	 encode_capability(?WSP_CAP_METHOD_MOR,
-			   Cap#wsp_capabilities.method_mor,
-			   Def#wsp_capabilities.method_mor),
-	 encode_capability(?WSP_CAP_PUSH_MOR,
-			   Cap#wsp_capabilities.push_mor,
-			   Def#wsp_capabilities.push_mor),
-	 encode_capability(?WSP_CAP_EXTENDED_METHODS,
-			   Cap#wsp_capabilities.extended_methods,
-			   Def#wsp_capabilities.extended_methods),
-	 encode_capability(?WSP_CAP_HEADER_CODE_PAGES,
-			   Cap#wsp_capabilities.header_code_pages,
-			   Def#wsp_capabilities.header_code_pages),
-	 encode_capability(?WSP_CAP_CLIENT_MESSAGE_SIZE,
-			   Cap#wsp_capabilities.client_message_size,
-			   Def#wsp_capabilities.client_message_size),
-	 encode_capability(?WSP_CAP_SERVER_MESSAGE_SIZE,
-			   Cap#wsp_capabilities.server_message_size,
-			   Def#wsp_capabilities.server_message_size)],
-    Unknown =
-	lists:map(fun({Id, Data}) when integer(Id) ->
-			  <<1:1, Id:7, Data/binary>>;
-		     ({Id,Data}) ->
-			  <<(encode_text_string(Id))/binary, Data/binary>>
-			      end, Cap#wsp_capabilities.unknown),
-    list_to_binary(
-      lists:map(fun(<<>>) -> [];
-		   (Bin) ->
-			[e_uintvar(size(Bin)), Bin]
-		end, Known ++ Unknown)).
-
-    
-
-
-encode_capability(_Capa, Default, Default) ->
-    <<>>;
-encode_capability(Capa, Value, _) ->
-    case Capa of
-	?WSP_CAP_ALIASES ->
-	    <<1:1, ?WSP_CAP_ALIASES:7, (encode_addresses(Value))/binary>>;
-
-	?WSP_CAP_CLIENT_SDU_SIZE ->
-	    <<1:1, ?WSP_CAP_CLIENT_SDU_SIZE:7, (e_uintvar(Value))/binary>>;
-
-	?WSP_CAP_SERVER_SDU_SIZE ->
-	    <<1:1, ?WSP_CAP_SERVER_SDU_SIZE:7, (e_uintvar(Value))/binary>>;
-
-	?WSP_CAP_PROTOCOL_OPTIONS ->
-	    Opts = case lists:member(confirmed_push, Value) of
-		       true -> 16#80;
-		       false -> 0
-		   end bor
-		   case lists:member(push, Value) of
-		       true -> 16#40;
-		       false -> 0
-		   end bor
-		   case lists:member(resume, Value) of
-		       true -> 16#20;
-		       false -> 0
-		   end bor
-		   case lists:member(acknowledgement_headers, Value) of
-		       true -> 16#10;
-		       false -> 0
-		   end,
-	    %% FIXME: symbolic encode/decode of options
-	    <<1:1, ?WSP_CAP_PROTOCOL_OPTIONS:7, Opts>>;
-
-	?WSP_CAP_METHOD_MOR ->
-	    <<1:1, ?WSP_CAP_METHOD_MOR:7, (e_uintvar(Value))/binary>>;
-
-	?WSP_CAP_PUSH_MOR ->
-	    <<1:1, ?WSP_CAP_PUSH_MOR:7, (e_uintvar(Value))/binary>>;
-	
-	?WSP_CAP_EXTENDED_METHODS ->
-	    <<1:1, ?WSP_CAP_EXTENDED_METHODS:7,
-	     (encode_extended_methods(Value))/binary>>;
-
-	?WSP_CAP_HEADER_CODE_PAGES ->
-	    Data = list_to_binary(
-		     lists:map(fun(Page) when integer(Page) -> Page;
-				  ({Page,Name}) ->
-				       [Page, encode_text_string(Name)]
-			       end, Value)),
-	    <<1:1, ?WSP_CAP_HEADER_CODE_PAGES:7, Data/binary>>;
-
-	?WSP_CAP_CLIENT_MESSAGE_SIZE ->
-	    <<1:1, ?WSP_CAP_CLIENT_MESSAGE_SIZE:7,
-	     (e_uintvar(Value))/binary>>;
-
-	?WSP_CAP_SERVER_MESSAGE_SIZE ->
-	    <<1:1, ?WSP_CAP_SERVER_MESSAGE_SIZE:7,
-	     (e_uintvar(Value))/binary>>;
-	_ when integer(Capa) ->
-	    <<1:1, Capa:7, Value/binary>>;
-	_ when list(Capa) ->
-	    <<(encode_text_string(Capa))/binary, Value/binary>>
-   end.
-
-
-decode_capabilities(<<>>, WspCaps) ->
-    WspCaps;
-decode_capabilities(D0,WspCaps) ->
-    {Len, D1} = d_uintvar(D0),
-    <<Capa:Len/binary, D2/binary>> = D1,
-    WspCaps1 =
-	case Capa of
-	    <<1:1, Id:7, Data/binary>> ->
-		decode_capa(Id, Data, WspCaps);
-	    _ ->
-		{Id,Data} = d_text_string(Capa),
-		decode_capa(Id, Data, WspCaps)
-	end,
-    decode_capabilities(D2, WspCaps1).
-
-
-
-decode_capa(Id,Data, WspCaps) ->
-    case Id of
-	?WSP_CAP_SERVER_SDU_SIZE ->
-	    {Val,_} = d_uintvar(Data),
-	    WspCaps#wsp_capabilities{server_sdu_size=Val};
-
-	?WSP_CAP_CLIENT_SDU_SIZE ->
-	    {Val,_} = d_uintvar(Data),
-	    WspCaps#wsp_capabilities{client_sdu_size=Val};    
-
-	?WSP_CAP_PROTOCOL_OPTIONS ->
-	    <<POP,_/binary>> = Data,
-	    Opts = 
-		if POP band 16#80 == 16#80 -> [confirmed_push];
-		   true -> []
-		end ++
-		if POP band 16#40 == 16#40 -> [push];
-		   true -> []
-		end ++
-		if POP band 16#20 == 16#20 -> [resume];
-		   true -> []
-		end ++
-		if POP band 16#10 == 16#10 -> [acknowledgement_headers];
-		   true -> []
-		end,
-	    WspCaps#wsp_capabilities{protocol_options=Opts};
-
-	?WSP_CAP_METHOD_MOR ->
-	    {Val,_} = d_uintvar(Data),
-	    WspCaps#wsp_capabilities{method_mor=Val};
-
-	?WSP_CAP_PUSH_MOR ->
-	    {Val,_} = d_uintvar(Data),
-	    WspCaps#wsp_capabilities{push_mor=Val};
-
-	?WSP_CAP_EXTENDED_METHODS ->
-	    Extended = decode_extended_methods(Data),
-	    WspCaps#wsp_capabilities { extended_methods = Extended };
-
-	?WSP_CAP_HEADER_CODE_PAGES ->
-	    %% Client send [Code(uint8) Name(text-string)]*
-	    %% Server send [Code(uint8)]*
-	    io:format("FIXME: Header Code Pages = ~p\n",[Data]),
-	    WspCaps;
-
-	?WSP_CAP_ALIASES ->
-	    Aliases = decode_addresses(Data),
-	    WspCaps#wsp_capabilities { aliases = Aliases };
-
-	?WSP_CAP_CLIENT_MESSAGE_SIZE ->
-	    {Val,_} = d_uintvar(Data),
-	    WspCaps#wsp_capabilities{client_message_size=Val};
-
-	?WSP_CAP_SERVER_MESSAGE_SIZE ->
-	    {Val,_} = d_uintvar(Data),
-	    WspCaps#wsp_capabilities{server_message_size=Val};
-	_  ->
-	    Unknown = [{Id, Data} | WspCaps#wsp_capabilities.unknown],
-	    io:format("WARNING: ignoring unknown capability ~p\n",
-		      [Unknown]),
-	    WspCaps#wsp_capabilities{unknown = Unknown}
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Headers = [ Header ] 
-%% Header  = {FieldName, FieldValue}
-%% FieldName = atom()
-%% FieldValue = {Value, Params}
-%%            | Value
-%%
-%% Params = [{Param,Value} | Param]
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--define(WH(Name,Value,Params),
-	#wsp_header { name = (Name), value = (Value), params = Params}).
-
-encode_headers(Headers) ->
-    encode_headers(Headers, ?WSP_DEFAULT_VERSION).
-
-encode_headers(Headers, Version) ->
-    encode_headers(Headers, Version, []).
-
-encode_headers([H|T], Version, Acc) ->
-    encode_headers(T, Version, [encode_header(H, Version)|Acc]);
-encode_headers([], _,  Acc) ->
-    list_to_binary(lists:reverse(Acc)).
-
-
-decode_headers(Bin) ->
-    decode_headers(Bin, ?WSP_DEFAULT_VERSION).
-
-decode_headers(<<>>, _Version) -> 
-    [];
-decode_headers(Data, Version) ->
-    decode_headers(Data, [], Version, ?WSP_DEFAULT_CODEPAGE).
-
-
-decode_headers(<<1:1,Code:7,Data/binary>>,Acc,Version,CP) ->
-    FieldName = lookup_field_name(Code),
-    {FieldData,Data1} = scan_header_data(Data),
-    H = decode_header(FieldName, FieldData,Version,CP),
-    ?dbg("header: ~p, field data=~p, header=~p\n",
-	 [FieldName, FieldData, H]),
-    if H#wsp_header.name == 'Encoding-Version' ->
-	    Version1 = H#wsp_header.value,
-	    ?dbg("Version switch from ~w to ~w\n", [Version, Version1]),
-	    decode_headers(Data1,[H|Acc],Version1, CP);
-       true ->
-	    decode_headers(Data1,[H|Acc],Version, CP)
-    end;
-decode_headers(Data = <<Code,_/binary>>,Acc,Version,CP) 
-  when Code >= 32, Code < 127->
-    {TmpField,Data1} = d_text_string(Data),
-    FieldName = normalise_field_name(TmpField),
-    {FieldData,Data2} = scan_header_data(Data1),
-    H = decode_header(FieldName,FieldData,Version,CP),
-    ?dbg("header: ~p, field data=~p, header=~p\n",
-	 [FieldName, FieldData, H]),
-    if H#wsp_header.name == 'Encoding-Version' ->
-	    Version1 = H#wsp_header.value,
-	    ?dbg("Version switch from ~w to ~w\n", [Version, Version1]),
-	    decode_headers(Data2,[H|Acc],Version1, CP);
-       true ->
-	    decode_headers(Data2,[H|Acc],Version, CP)
-    end;
-decode_headers(<<CP1,Data/binary>>,Acc,Version,_CP) when CP1 >= 1, CP1 =< 31 ->
-    ?dbg("decode_headers: codpage changed form ~w -> ~w\n",[_CP,CP1]),
-    decode_headers(Data,Acc,Version,CP1);
-decode_headers(<<16#7f,CP1,Data/binary>>,Acc,Version,_CP) ->
-    ?dbg("decode_headers: codpage changed form ~w -> ~w\n",[_CP,CP1]),
-    decode_headers(Data,Acc,Version,CP1);
-
-decode_headers(<<>>, Acc, _Version, _CP) ->
-    lists:reverse(Acc).
-
-%%
-%% Retrive the header data 
-%%  (this makes it possible to skip unknown encoding)
-%%
-scan_header_data(Data = <<N,Data0/binary>>) ->
-    if N >= 0, N =< 30 ->
-	    <<Value:N/binary, Data1/binary>> = Data0,
-	    {{short,Value}, Data1};
-       N == 31 ->
-	    {N1, Data1} = d_uintvar(Data0),
-	    <<Value:N1/binary, Data2/binary>> = Data1,
-	    {{long,Value}, Data2};
-       N >= 32, N =< 127 ->
-	    d_text_string(Data);
-       true ->
-	    { N band 16#7f, Data0}
-    end.
-
-%%
-%% Decode header: return #wsp_header
-%%
-decode_header(Field, Value) ->
-    decode_header(Field, Value, 
-		  ?WSP_DEFAULT_VERSION,
-		  ?WSP_DEFAULT_CODEPAGE).
-
-decode_header(Field, Value, Version, 1) ->
-    case Field of
-	'Accept' ->
-	    decode_accept(Value, Version);
-
-	'Accept-Charset' when Version >= ?WSP_13 ->
-	    decode_accept_charset(Value, Version);
-	'Accept-Charset' -> 
-	    decode_accept_charset(Value, Version);
-
-	'Accept-Encoding' when Version >= ?WSP_13 -> 
-	    decode_accept_encoding(Value, Version);
-	'Accept-Encoding' -> 
-	    decode_accept_encoding(Value, Version);
-
-	'Accept-Language' ->
-	    decode_accept_language(Value, Version);
-	'Accept-Ranges' -> 
-	    decode_accept_ranges(Value, Version);
-	'Age' -> 
-	    decode_age(Value,Version);
-	'Allow' -> 
-	    decode_allow(Value,Version);
-	'Authorization' -> 
-	    decode_authorization(Value,Version);
-
-	'Cache-Control' when Version >= ?WSP_14 -> 
-	    decode_cache_control(Value,Version);
-	'Cache-Control' when Version >= ?WSP_13 ->
-	    decode_cache_control(Value,Version);
-	'Cache-Control' -> 
-	    decode_cache_control(Value,Version);
-
-	'Connection' -> 
-	    decode_connection(Value,Version);
-	'Content-Base' -> 
-	    decode_content_base(Value,Version);
-	'Content-Encoding' -> 
-	    decode_content_encoding(Value,Version);
-	'Content-Language' -> 
-	    decode_content_language(Value,Version);
-	'Content-Length' -> 
-	    decode_content_length(Value,Version);
-	'Content-Location' -> 
-	    decode_content_location(Value,Version);
-	'Content-Md5' -> 
-	    decode_content_md5(Value,Version);
-
-	'Content-Range' when Version >= ?WSP_13 -> 
-	    decode_content_range(Value,Version);
-	'Content-Range' -> 
-	    decode_content_range(Value,Version);
-
-	'Content-Type' -> 
-	    decode_content_type(Value,Version);
-	'Date' -> 
-	    decode_date(Value, Version);
-	'Etag' -> 
-	    decode_etag(Value,Version);
-	'Expires' -> 
-	    decode_expires(Value,Version);
-	'From' ->
-	    decode_from(Value,Version);
-	'Host' -> 
-	    decode_host(Value,Version);
-	'If-Modified-Since' -> 
-	    decode_if_modified_since(Value,Version);
-	'If-Match' -> 
-	    decode_if_match(Value,Version);
-	'If-None-Match' -> 
-	    decode_if_none_match(Value,Version);
-	'If-Range' -> 
-	    decode_if_range(Value,Version);
-	'If-Unmodified-Since' -> 
-	    decode_if_unmodified_since(Value,Version);
-	'Location' -> 
-	    decode_location(Value,Version);
-	'Last-Modified' -> 
-	    decode_last_modified(Value,Version);
-	'Max-Forwards' -> 
-	    decode_max_forwards(Value,Version);
-	'Pragma' -> 
-	    decode_pragma(Value,Version);
-	'Proxy-Authenticate' -> 
-	    decode_proxy_authenticate(Value,Version);
-	'Proxy-Authorization' -> 
-	    decode_proxy_authorization(Value,Version);
-	'Public' -> 
-	    decode_public(Value,Version);
-	'Range' -> 
-	    decode_range(Value,Version);
-	'Referer' -> 
-	    decode_referer(Value,Version);
-	'Retry-After' -> 
-	    decode_retry_after(Value,Version);
-	'Server' -> 
-	    decode_server(Value,Version);
-	'Transfer-Encoding' -> 
-	    decode_transfer_encoding(Value,Version);
-	'Upgrade' -> 
-	    decode_upgrade(Value,Version);
-	'User-Agent' -> 
-	    decode_user_agent(Value,Version);
-	'Vary' -> 
-	    decode_vary(Value,Version);
-	'Via' -> 
-	    decode_via(Value,Version);
-	'Warning' -> 
-	    decode_warning(Value,Version);
-	'Www-Authenticate' -> 
-	    decode_www_authenticate(Value,Version);
-
-	'Content-Disposition' when Version >= ?WSP_14 ->
-	    decode_content_disposition(Value,Version);
-	'Content-Disposition' -> 
-	    decode_content_disposition(Value,Version);
-
-	'X-Wap-Application-Id' when Version >= ?WSP_12 -> 
-	    decode_x_wap_application_id(Value,Version);
-
-	'X-Wap-Content-Uri' when Version >= ?WSP_12 -> 
-	    decode_x_wap_content_uri(Value,Version);
-
-	'X-Wap-Initiator-Uri' when Version >= ?WSP_12 -> 
-	    decode_x_wap_initiator_uri(Value,Version);
-
-	'Accept-Application' when Version >= ?WSP_12 -> 
-	    decode_accept_application(Value,Version);
-
-	'Bearer-Indication' when Version >= ?WSP_12 -> 
-	    decode_bearer_indication(Value,Version);
-
-	'Push-Flag' when Version >= ?WSP_12 -> 
-	    decode_push_flag(Value,Version);
-
-	'Profile' when Version >= ?WSP_12 -> 
-	    decode_profile(Value,Version);
-
-	'Profile-Diff' when Version >= ?WSP_12 -> 
-	    decode_profile_diff(Value,Version);
-
-	'Profile-Warning' when Version >= ?WSP_12 -> 
-	    decode_profile_warning(Value,Version);
-
-	'Expect' when Version >= ?WSP_15 -> 
-	    decode_expect(Value,Version);
-	'Expect' when Version >= ?WSP_13 -> 
-	    decode_expect(Value,Version);
-
-	'Te' when Version >= ?WSP_13 -> 
-	    decode_te(Value,Version);
-	'Trailer' when Version >= ?WSP_13 -> 
-	    decode_trailer(Value,Version);
-
-	'X-Wap-Tod' when Version >= ?WSP_13 -> 
-	    decode_x_wap_tod(Value,Version);
-	'X-Wap.tod' when Version >= ?WSP_13 -> 
-	    decode_x_wap_tod(Value,Version);
-
-	'Content-Id' when Version >= ?WSP_13 -> 
-	    decode_content_id(Value,Version);
-	'Set-Cookie' when Version >= ?WSP_13 -> 
-	    decode_set_cookie(Value,Version);
-	'Cookie' when Version >= ?WSP_13 -> 
-	    decode_cookie(Value,Version);
-
-	'Encoding-Version' when Version >= ?WSP_13 ->
-	    decode_encoding_version(Value,Version);
-	'Profile-Warning' when Version >= ?WSP_14 -> 
-	    decode_profile_warning(Value,Version);
-
-	'X-Wap-Security' when Version >= ?WSP_14 -> 
-	    decode_x_wap_security(Value,Version);
-	'X-Wap-Loc-Invocation' when Version >= ?WSP_15 ->
-	    decode_x_wap_loc_invocation(Value,Version); %% ???
-	'X-Wap-Loc-Delivery' when Version >= ?WSP_15 -> 
-	    decode_x_wap_loc_delivery(Value,Version);   %% ???
-	_ ->
-	    ?dbg("Warning: none standard field ~p in version ~p codepage=1\n",
-		 [Field, Version]),
-	    ?WH(Field, Value, [])
-    end;
-decode_header(Field, Value, _Version, _CP) ->
-    ?dbg("Warning: none standard field ~p in version ~p codepage=~w\n",
-	 [Field, _Version, _CP]),
-    ?WH(Field, Value, []).
-    
-%%
-%% Encode field and value according to version
-%% FIXME: spilt multiple header values (i.e Via) into multiple
-%%        headers
-%%
-encode_header(H, Version) ->
-    case H#wsp_header.name of
-	'Accept' ->
-	    [16#80, encode_accept(H, Version)];
-	'Accept-Charset' when Version >= ?WSP_13 -> 
-	    [16#bb, encode_accept_charset(H, Version)];
-	'Accept-Charset' -> 
-	    [16#81, encode_accept_charset(H, Version)];
-	'Accept-Encoding' when Version >= ?WSP_13 -> 
-	    [16#bc, encode_accept_encoding(H, Version)];
-	'Accept-Encoding' -> 
-	    [16#82, encode_accept_encoding(H, Version)];
-	'Accept-Language' ->
-	    [16#83, encode_accept_language(H, Version)];
-	'Accept-Ranges' -> 
-	    [16#84, encode_accept_ranges(H, Version)];
-	'Accept-Application' when Version >= ?WSP_12 -> 
-	    [16#b2, encode_accept_application(H,Version)];
-	'Age' -> 
-	    [16#85, encode_age(H, Version)];
-	'Allow' -> 
-	    [16#86, encode_allow(H, Version)];
-	'Authorization' -> 
-	    [16#87, encode_authorization(H, Version)];
-	'Cache-Control' when Version >= ?WSP_14 -> 
-	    [16#c7, encode_cache_control(H, Version)];
-	'Cache-Control' when Version >= ?WSP_13 ->
-	    [16#bd, encode_cache_control(H, Version)];
-	'Cache-Control' ->
-	    [16#88, encode_cache_control(H, Version)];
-	'Connection' -> 
-	    [16#89, encode_connection(H, Version)];
-	'Content-Base' -> 
-	    [16#8a, encode_content_base(H, Version)];
-	'Content-Encoding' -> 
-	    [16#8b, encode_content_encoding(H, Version)];
-
-	'Content-Language' -> 
-	    [16#8c, encode_content_language(H,Version)];
-	'Content-Length' -> 
-	    [16#8d, encode_content_length(H,Version)];
-	'Content-Location' -> 
-	    [16#8e, encode_content_location(H,Version)];
-	'Content-Md5' -> 
-	    [16#8f, encode_content_md5(H,Version)];
-	'Content-Range' when Version >= ?WSP_13 -> 
-	    [16#be, encode_content_range(H,Version)];
-	'Content-Range' -> 
-	    [16#90, encode_content_range(H,Version)];
-	'Content-Type' -> 
-	    [16#91, encode_content_type(H,Version)];
-	'Date' -> 
-	    [16#92, encode_date(H,Version)];
-	'Etag' -> 
-	    [16#93, encode_etag(H,Version)];
-	'Expires' -> 
-	    [16#94, encode_expires(H,Version)];
-	'From' ->
-	    [16#95, encode_from(H,Version)];
-	'Host' -> 
-	    [16#96, encode_host(H,Version)];
-	'If-Modified-Since' -> 
-	    [16#97, encode_if_modified_since(H,Version)];
-	'If-Match' -> 
-	    [16#98, encode_if_match(H,Version)];
-	'If-None-Match' -> 
-	    [16#99, encode_if_none_match(H,Version)];
-	'If-Range' -> 
-	    [16#9a, encode_if_range(H,Version)];
-	'If-Unmodified-Since' -> 
-	    [16#9b, encode_if_unmodified_since(H,Version)];
-	'Location' -> 
-	    [16#9c, encode_location(H,Version)];
-	'Last-Modified' -> 
-	    [16#9d, encode_last_modified(H,Version)];
-	'Max-Forwards' -> 
-	    [16#9e, encode_max_forwards(H,Version)];
-	'Pragma' -> 
-	    [16#9f, encode_pragma(H,Version)];
-	'Proxy-Authenticate' -> 
-	    [16#a0, encode_proxy_authenticate(H,Version)];
-	'Proxy-Authorization' -> 
-	    [16#a1, encode_proxy_authorization(H,Version)];
-	'Public' -> 
-	    [16#a2, encode_public(H,Version)];
-	'Range' -> 
-	    [16#a3, encode_range(H,Version)];
-	'Referer' -> 
-	    [16#a4, encode_referer(H,Version)];
-	'Retry-After' -> 
-	    [16#a5, encode_retry_after(H,Version)];
-	'Server' -> 
-	    [16#a6, encode_server(H,Version)];
-	'Transfer-Encoding' -> 
-	    [16#a7, encode_transfer_encoding(H,Version)];
-	'Upgrade' -> 
-	    [16#a8, encode_upgrade(H,Version)];
-	'User-Agent' -> 
-	    [16#a9, encode_user_agent(H,Version)];
-	'Vary' -> 
-	    [16#aa, encode_vary(H,Version)];
-	'Via' -> 
-	    [16#ab, encode_via(H,Version)];
-	'Warning' -> 
-	    [16#ac, encode_warning(H,Version)];
-	'Www-Authenticate' -> 
-	    [16#ad, encode_www_authenticate(H,Version)];
-
-	'Content-Disposition' when Version >= ?WSP_14 ->
-	    [16#c5, encode_content_disposition(H,Version)];
-	'Content-Disposition' ->
-	    [16#ae, encode_content_disposition(H,Version)];
-
-
-	'X-Wap-Application-Id' when Version >= ?WSP_12 -> 
-	    [16#af, encode_x_wap_application_id(H,Version)];
-	'X-Wap-Content-Uri' when Version >= ?WSP_12 -> 
-	    [16#b0, encode_x_wap_content_uri(H,Version)];
-	'X-Wap-Initiator-Uri' when Version >= ?WSP_12 -> 
-	    [16#b1, encode_x_wap_initiator_uri(H,Version)];
-
-	'Bearer-Indication' when Version >= ?WSP_12 -> 
-	    [16#b3, encode_bearer_indication(H,Version)];
-	'Push-Flag' when Version >= ?WSP_12 -> 
-	    [16#b4, encode_push_flag(H,Version)];
-
-	'Profile' when Version >= ?WSP_12 -> 
-	    [16#b5, encode_profile(H,Version)];
-	'Profile-Diff' when Version >= ?WSP_12 -> 
-	    [16#b6, encode_profile_diff(H,Version)];
-	'Profile-Warning' when Version >= ?WSP_14 -> 
-	    [16#c4, encode_profile_warning(H,Version)];
-	'Profile-Warning' when Version >= ?WSP_12 -> 
-	    [16#b7, encode_profile_warning(H,Version)];
-
-	'Expect' when Version >= ?WSP_15 -> 
-	    [16#c8, encode_expect(H,Version)];
-	'Expect' when Version >= ?WSP_13 -> 
-	    [16#b8, encode_expect(H,Version)];
-	'Te' when Version >= ?WSP_13 -> 
-	    [16#b9, encode_te(H,Version)];
-	'Trailer' when Version >= ?WSP_13 -> 
-	    [16#ba, encode_trailer(H,Version)];
-	'X-Wap-Tod' when Version >= ?WSP_13 -> 
-	    [16#bf, encode_x_wap_tod(H,Version)];
-	'Content-Id' when Version >= ?WSP_13 -> 
-	    [16#c0, encode_content_id(H,Version)];
-	'Set-Cookie' when Version >= ?WSP_13 -> 
-	    [16#c1, encode_set_cookie(H,Version)];
-	'Cookie' when Version >= ?WSP_13 -> 
-	    [16#c2, encode_cookie(H,Version)];
-	'Encoding-Version' when Version >= ?WSP_13 ->
-	    [16#c3, encode_encoding_version(H,Version)];
-	'Encoding-Version' when Version < ?WSP_13 ->
-	    [encode_text_string("Encoding-Version"),
-	     encode_text_string(lists:flatten(format_version(H#wsp_header.value)))];
-
-	'X-Wap-Security' when Version >= ?WSP_14 -> 
-	    [16#c6, encode_x_wap_security(H,Version)];
-	'X-Wap-Loc-Invocation' when Version >= ?WSP_15 ->
-	    [16#c9, encode_x_wap_loc_invocation(H,Version)];
-	'X-Wap-Loc-Delivery' when Version >= ?WSP_15 -> 
-	    [16#ca, encode_x_wap_loc_delivery(H,Version)];
-	Field when atom(Field) -> 
-	    [encode_text_string(atom_to_list(Field)),
-	     encode_text_string(H#wsp_header.value)];
-	Field when list(Field) -> 
-	    [encode_text_string(Field),
-	     encode_text_string(H#wsp_header.value)]
-    end.
-
-%%
-%% Convert HTTP headers into WSP headers
-%%
-parse_headers([H | Hs]) ->
-    parse_header(H, Hs);
-parse_headers([]) ->
-    [].
-
-parse_header(H) ->
-    parse_header(H, []).
-
-parse_header({FieldName,FieldValue}, Hs) ->
-    case single_comma_field(FieldName) of
-	true ->
-	    io:format("parse: ~s: ~s\n", [FieldName, FieldValue]),
-	    H = parse_hdr(FieldName,FieldValue),
-	    io:format("header: ~p\n", [H]),
-	    [H | parse_headers(Hs)];
-	false ->
-	    Values = string:tokens(FieldValue, ","),
-	    parse_header(FieldName, Values, Hs)
-    end.
-
-parse_header(FieldName, [Value|Vs], Hs) ->
-    io:format("parse: ~s: ~s\n", [FieldName, Value]),
-    H = parse_hdr(FieldName, Value),
-    io:format("header: ~p\n", [H]),
-    [H | parse_header(FieldName, Vs, Hs)];
-parse_header(_FieldName, [], Hs) ->
-    parse_headers(Hs).
-
-
-single_comma_field(Field) ->
-    case Field of
-	'Set-Cookie' -> true; %% FIXME (Is multiple!)
-	'Date' -> true;
-	'Expires' -> true;
-	'If-Modified-Since' -> true;
-	'If-Range' -> true;
-	'If-Unmodified-Since' -> true;
-	'Last-Modified' -> true;
-	'Retry-After' -> true;
-	'X-Wap-Tod' -> true;
-	_ -> false
-    end.
-    
-
-parse_hdr(Field, Value0) ->
-    Value = trim(Value0),
-    case Field of
-	'Accept' ->           parse_accept(Value);
-	'Accept-Charset' ->   parse_accept_charset(Value);
-	'Accept-Encoding' ->  parse_accept_encoding(Value);
-	'Accept-Language' ->  parse_accept_language(Value);
-	'Accept-Ranges' ->    parse_accept_ranges(Value);
-	'Age' ->              parse_age(Value);
-	'Allow' ->            parse_allow(Value);
-	'Authorization' ->    parse_authorization(Value);
-	'Cache-Control' ->    parse_cache_control(Value);
-	'Connection' ->       parse_connection(Value);
-	'Content-Base' ->     parse_content_base(Value);
-	'Content-Encoding' -> parse_content_encoding(Value);
-	'Content-Language' -> parse_content_language(Value);
-	'Content-Length' ->   parse_content_length(Value);
-	'Content-Location' -> parse_content_location(Value);
-	'Content-Md5' ->      parse_content_md5(Value);
-	'Content-Range' ->    parse_content_range(Value);
-	'Content-Type' ->     parse_content_type(Value);
-	'Date' ->             parse_date(Value);
-	'Etag' ->             parse_etag(Value);
-	'Expires' ->          parse_expires(Value);
-	'From' ->             parse_from(Value);
-	'Host' ->             parse_host(Value);
-	'If-Modified-Since' -> parse_if_modified_since(Value);
-	'If-Match' ->         parse_if_match(Value);
-	'If-None-Match' ->    parse_if_none_match(Value);
-	'If-Range' ->         parse_if_range(Value);
-	'If-Unmodified-Since' -> parse_if_unmodified_since(Value);
-	'Location' ->         parse_location(Value);
-	'Last-Modified' ->    parse_last_modified(Value);
-	'Max-Forwards' ->     parse_max_forwards(Value);
-	'Pragma' ->           parse_pragma(Value);
-	'Proxy-Authenticate' -> parse_proxy_authenticate(Value);
-	'Proxy-Authorization' -> parse_proxy_authorization(Value);
-	'Public' ->           parse_public(Value);
-	'Range' ->            parse_range(Value);
-	'Referer' ->          parse_referer(Value);
-	'Retry-After' ->      parse_retry_after(Value);
-	'Server' ->           parse_server(Value);
-	'Transfer-Encoding' -> parse_transfer_encoding(Value);
-	'Upgrade' ->          parse_upgrade(Value);
-	'User-Agent' ->       parse_user_agent(Value);
-	'Vary' ->             parse_vary(Value);
-	'Via' ->              parse_via(Value);
-	'Warning' ->          parse_warning(Value);
-	'Www-Authenticate' -> parse_www_authenticate(Value);
-	'Content-Disposition' -> parse_content_disposition(Value);
-	'X-Wap-Application-Id' -> parse_x_wap_application_id(Value);
-	'X-Wap-Content-Uri' -> parse_x_wap_content_uri(Value);
-	'X-Wap-Initiator-Uri' -> parse_x_wap_initiator_uri(Value);
-	'Accept-Application' -> parse_accept_application(Value);
-	'Bearer-Indication' -> parse_bearer_indication(Value);
-	'Push-Flag' ->        parse_push_flag(Value);
-	'Profile' ->          parse_profile(Value);
-	'Profile-Diff' ->     parse_profile_diff(Value);
-	'Profile-Warning' ->  parse_profile_warning(Value);
-	'Expect' ->           parse_expect(Value);
-	'Te' ->               parse_te(Value);
-	'Trailer' ->          parse_trailer(Value);
-	'X-Wap-Tod' ->        parse_x_wap_tod(Value);
-	'Content-Id' ->       parse_content_id(Value);
-	'Set-Cookie' ->       parse_set_cookie(Value);
-	'Cookie' ->           parse_cookie(Value);
-	'Encoding-Version' -> parse_encoding_version(Value);
-	'X-Wap-Security' ->   parse_x_wap_security(Value);
-	'X-Wap-Loc-Invocation' -> parse_x_wap_loc_invocation(Value);
-	'X-Wap-Loc-Delivery' -> parse_x_wap_loc_delivery(Value);
-	_ -> 
-	    ?dbg("Warning: header field ~p not recognissed\n",[Field]),
-	    #wsp_header { name = Field, value = Value}
-    end.
-
-%%
-%% Format headers, will combine multiple headers into one
-%% FIXME: if length is < MAX_HTTP_HEADER_LENGTH
-%%
-format_headers(Hs) ->
-    format_hdrs(lists:keysort(#wsp_header.name,Hs), []).
-
-format_hdrs([H | Hs], Acc) ->
-    V1 = format_value(H),
-    format_hdrs(Hs, H#wsp_header.name, V1, Acc);
-format_hdrs([], Acc) ->
-    lists:reverse(Acc).
-
-format_hdrs([H|Hs], FieldName, FieldValue, Acc) 
-  when FieldName == H#wsp_header.name ->
-    V1 = format_value(H),
-    format_hdrs(Hs, FieldName, [FieldValue,",",V1], Acc);
-format_hdrs(Hs, FieldName, FieldValue, Acc) ->
-    format_hdrs(Hs, [{FieldName, lists:flatten(FieldValue)} | Acc]).
-
-
-%%
-%% Format header: #wsp_header => {FieldName, Value}
-%%
-    
-format_header(H) ->
-    {H#wsp_header.name, format_value(H)}.
-
-format_value(H) ->
-    case H#wsp_header.name of
-	'Accept' ->   format_accept(H);
-	'Accept-Charset' ->   format_accept_charset(H);
-	'Accept-Encoding' ->  format_accept_encoding(H);
-	'Accept-Language' ->  format_accept_language(H);
-	'Accept-Ranges' ->    format_accept_ranges(H);
-	'Age' ->     format_age(H);
-	'Allow' ->   format_allow(H);
-	'Authorization' ->   format_authorization(H);
-	'Cache-Control' ->   format_cache_control(H);
-	'Connection' ->      format_connection(H);
-	'Content-Base' ->    format_content_base(H);
-	'Content-Encoding' -> format_content_encoding(H);
-	'Content-Language' -> format_content_language(H);
-	'Content-Length' -> format_content_length(H);
-	'Content-Location' -> format_content_location(H);
-	'Content-Md5' -> format_content_md5(H);
-	'Content-Range' -> format_content_range(H);
-	'Content-Type' -> format_content_type(H);
-	'Date' -> format_date(H);
-	'Etag' -> format_etag(H);
-	'Expires' -> format_expires(H);
-	'From' -> format_from(H);
-	'Host' -> format_host(H);
-	'If-Modified-Since' -> format_if_modified_since(H);
-	'If-Match' -> format_if_match(H);
-	'If-None-Match' -> format_if_none_match(H);
-	'If-Range' -> format_if_range(H);
-	'If-Unmodified-Since' -> format_if_unmodified_since(H);
-	'Location' -> format_location(H);
-	'Last-Modified' -> format_last_modified(H);
-	'Max-Forwards' -> format_max_forwards(H);
-	'Pragma' -> format_pragma(H);
-	'Proxy-Authenticate' -> format_proxy_authenticate(H);
-	'Proxy-Authorization' -> format_proxy_authorization(H);
-	'Public' -> format_public(H);
-	'Range' -> format_range(H);
-	'Referer' -> format_referer(H);
-	'Retry-After' -> format_retry_after(H);
-	'Server' -> format_server(H);
-	'Transfer-Encoding' -> format_transfer_encoding(H);
-	'Upgrade' -> format_upgrade(H);
-	'User-Agent' -> format_user_agent(H);
-	'Vary' -> format_vary(H);
-	'Via' -> format_via(H);
-	'Warning' -> format_warning(H);
-	'Www-Authenticate' -> format_www_authenticate(H);
-	'Content-Disposition' -> format_content_disposition(H);
-	'X-Wap-Application-Id' -> format_x_wap_application_id(H);
-	'X-Wap-Content-Uri' -> format_x_wap_content_uri(H);
-	'X-Wap-Initiator-Uri' -> format_x_wap_initiator_uri(H);
-	'Accept-Application' -> format_accept_application(H);
-	'Bearer-Indication' -> format_bearer_indication(H);
-	'Push-Flag' -> format_push_flag(H);
-	'Profile' -> format_profile(H);
-	'Profile-Diff' -> format_profile_diff(H);
-	'Profile-Warning' -> format_profile_warning(H);
-	'Expect' ->  format_expect(H);
-	'Te' -> format_te(H);
-	'Trailer' -> format_trailer(H);
-	'X-Wap-Tod' ->  format_x_wap_tod(H);
-	'Content-Id' -> format_content_id(H);
-	'Set-Cookie' -> format_set_cookie(H);
-	'Cookie' -> format_cookie(H);
-	'Encoding-Version' -> format_encoding_version(H);
-	'X-Wap-Security' -> format_x_wap_security(H);
-	'X-Wap-Loc-Invocation' -> format_x_wap_loc_invocation(H);
-	'X-Wap-Loc-Delivery' -> format_x_wap_loc_delivery(H);
-	_Field -> 
-	    ?dbg("Warning: header field ~s not recognissed\n",[_Field]),
-	    to_list(H#wsp_header.value)
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Encode of field values
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Accept: <content-type> [q=<q-value>] [params]
-%% Type: Multiple
-%% Ref: 8.4.2.7
-%%
-%%  Accept-value = Constrained-media | Accept-general-form
-%%  
-%%  Accept-general-form = Value-length Media-range [Accept-parameters]
-%%  Media-range = (Well-known-media | Extension-media) *(Parameter)
-%%  Accept-parameters = Q-token Q-value *(Accept-extension)
-%%  Accept-extension = Parameter
-%%  Constrain-media = Constrained-encoding
-%%  Well-known-media = Integer-value
-%%  Constrained-encoding = Short-Integer | Extension-media
-%%  Q-token = <Octet 128>
-%%
-parse_accept(String) ->
-    %% FIXME
-    ?WH('Accept',String,[]).
-
-format_accept(H) ->
-    [H#wsp_header.value, format_params(H#wsp_header.params)].
-
-encode_accept(H, Version) ->
-    case encode_params(H#wsp_header.params,Version) of
-	<<>> ->
-	    encode_well_known_media(H#wsp_header.value, Version);
-	Params ->
-	    Media = encode_well_known_media(H#wsp_header.value, Version),
-	    e_value(Media, Params)
-    end.
-
-decode_accept(Value, Version) when integer(Value) ->
-    %% Constrained-encoding: Short-Integer
-    ?WH('Accept',decode_well_known_media(Value, Version),[]);
-decode_accept(Value, Version) when list(Value) ->
-    ?WH('Accept',decode_well_known_media(Value,Version),[]);
-decode_accept({_,Data}, Version)  ->
-    %% Accept-general-form
-    {Value,QData} = scan_header_data(Data),
-    Media_Range = decode_well_known_media(Value,Version),
-    Params =  decode_params(QData, Version),
-    ?WH('Accept',Media_Range,Params).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Accept-Charset: <charset> | * [q=<q-value>]
-%% Type: Multiple
-%% Ref: 8.4.2.8
-%% Note that the definition of this one is a mess!!!!
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_accept_charset(String) ->
-    %% FIXME
-    ?WH('Accept-Charset',String,[]).
-
-format_accept_charset(H) ->
-    [H#wsp_header.value, format_params(H#wsp_header.params)].
-
-encode_accept_charset(H, _Version) -> 
-    %% FIXME
-    encode_text_string(H#wsp_header.value).
-
-decode_accept_charset(0, _Version) ->
-    ?WH('Accept-Charset',"*",[]);
-decode_accept_charset(Value, _Version) when integer(Value) ->
-    ?WH('Accept-Charset', decode_charset(Value),[]);
-decode_accept_charset(Value, _Version) when list(Value) ->
-    ?WH('Accept-Charset',Value,[]);
-decode_accept_charset({short,Data}, _Version) ->
-    %% Me guessing that the short form SHOULD be mulit octet integer!!!
-    Value = d_long(Data),
-    ?WH('Accept-Charset', decode_charset(Value),[]);
-decode_accept_charset({long,Value}, _Version) ->
-    {Data1, QData} = scan_header_data(Value),
-    CharSet = case Data1 of
-		  0 ->
-		      "*";
-		  Value1 when integer(Value1) ->
-		      decode_charset(Value1);
-		  Value1 when list(Value1) ->
-		      Value1;
-		  {short,Value1} ->
-		      Value2 = d_long(Value1),
-		      decode_charset(Value2)
-	      end,
-    Params = if QData == <<>> ->
-		     [];
-		true ->
-		     {QValue,_} = d_q_value(QData),
-		     {CharSet,[{q, QValue}]}
-	     end,
-    ?WH('Accept-Charset',CharSet, Params).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Accept-Encoding: gzip | compress | deflate | * [q=<q-value>]
-%% Ref:
-%% Type: Multiple
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_accept_encoding(String) ->
-    ?WH('Accept-Encoding',String,[]).
-
-format_accept_encoding(H) ->
-    [H#wsp_header.value, format_params(H#wsp_header.params)].
-
-encode_accept_encoding(H, _Version) ->
-    %% FIXME general form
-    case H#wsp_header.value of
-	"gzip"     -> ?ENCODE_SHORT(0);
-	"compress" -> ?ENCODE_SHORT(1);
-	"deflate"  -> ?ENCODE_SHORT(2);
-	Value      -> encode_text_string(Value)
-    end.
-
-decode_accept_encoding(0, _Version) ->
-    ?WH('Accept-Encoding',"gzip",[]);
-decode_accept_encoding(1, _Version) ->
-    ?WH('Accept-Encoding',"compress",[]);
-decode_accept_encoding(2, _Version) ->
-    ?WH('Accept-Encoding',"deflate",[]);
-decode_accept_encoding(Value, Version) when list(Version) ->
-    ?WH('Accept-Encoding',Value,[]);
-decode_accept_encoding({_,Data}, _Version) when binary(Data) ->
-    {Enc, Data1} = scan_header_data(Data),
-    Params = if Data1 == <<>> ->
-		     [];
-		true ->
-		     {QVal,_} = d_q_value(Data1),
-		     [{q, QVal}]
-	     end,
-    case Enc of
-	0 -> ?WH('Accept-Encoding',"gzip",Params);
-	1 -> ?WH('Accept-Encoding',"compress",Params);
-	2 -> ?WH('Accept-Encoding',"deflate",Params);
-	3 -> ?WH('Accept-Encoding',"*",Params);
-	_ when list(Enc) ->
-	    ?WH('Accept-Encoding',Enc,Params)
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%	%%
-%% Accept-Language: * | <lang> [q=<q-value>]
-%% Type: Multiple
-%% Ref: 8.4.2.10
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_accept_language(Value) ->
-    ?WH('Accept-Language',Value,[]).
-
-format_accept_language(H) ->
-    [H#wsp_header.value, format_params(H#wsp_header.params)].
-    
-encode_accept_language(H, _Version) ->
-    case H#wsp_header.value of
-	"*" -> ?ENCODE_SHORT(0);
-	Lang -> case catch encode_lang(Lang) of
-		    {'EXIT', _} -> encode_text_string(Lang);
-		    Code -> encode_integer(Code)
-		end
-    end.
-
-decode_accept_language(0, _Version) ->
-    ?WH('Accept-Language',"*",[]);
-decode_accept_language(Value, _Version) when integer(Value) ->
-    ?WH('Accept-Language',decode_lang(Value),[]);
-decode_accept_language(Value, _Version) when list(Value) ->
-    ?WH('Accept-Language',Value,[]);
-decode_accept_language({_,Data}, _Version) ->
-    {Data1, QData} = scan_header_data(Data),
-    Charset = case Data1 of
-		  0 ->
-		      "*";
-		  Value1 when integer(Value1) ->
-		      decode_lang(Value1);
-		  Value1 when list(Value1) ->
-		      Value1;
-		  {short,Data2} ->
-		      decode_lang(d_long(Data2))
-	      end,
-    Params = 
-	if QData == <<>> ->
-		[];
-	   true ->
-		{QVal,_} = d_q_value(QData),
-		[{q, QVal}]
-	end,
-    ?WH('Accept-Language',Charset,Params).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Accept-Ranges: none | bytes | <extension>
-%% Type: single
-%% Ref:
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_accept_ranges(Value) ->
-    ?WH('Accept-Ranges', Value, []).
-
-format_accept_ranges(H) ->
-    H#wsp_header.value.
-
-encode_accept_ranges(H, _Version) ->
-    case H#wsp_header.value of
-	"none" -> ?ENCODE_SHORT(0);
-	"bytes" -> ?ENCODE_SHORT(1);
-	Value -> encode_text_string(Value)
-    end.
-
-decode_accept_ranges(0, _Version) -> 
-    ?WH('Accept-Ranges', "none", []);
-decode_accept_ranges(1, _Version) -> 
-    ?WH('Accept-Ranges', "bytes", []);
-decode_accept_ranges(Value, _Version) when list(Value) ->
-    ?WH('Accept-Ranges', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Age: <delta-seconds>
-%% Type: single
-%% Ref:
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_age(Value) ->
-    %% FIXME
-    ?WH('Age', Value, []).
-
-format_age(H) ->
-    integer_to_list(H#wsp_header.value).
-
-encode_age(H, _Version) ->
-    e_delta_seconds(H#wsp_header.value).
-
-decode_age(Value, _Version) when integer(Value) ->
-    ?WH('Age', Value, []);
-decode_age({short,Data}, _Version) ->
-    ?WH('Age', d_long(Data), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Allow: <well-known-method>
-%% Type: multiple
-%% Ref:
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_allow(Value) ->
-    ?WH('Allow', parse_well_known_method(Value), []).
-
-format_allow(H) ->
-    atom_to_list(H#wsp_header.value).
-
-encode_allow(H, Version) ->
-    encode_well_known_method(H#wsp_header.value, Version).
-
-decode_allow(Value, Version) ->
-    ?WH('Allow', decode_well_known_method(Value,Version), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Authorization:
-%% Ref: 8.4.2.14
-%% Type: server-to-client
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_authorization(Value) ->
-    parse_credentials('Authorization', Value).
-
-format_authorization(H) ->
-    format_credentials(H#wsp_header.value, H#wsp_header.params).
-
-encode_authorization(H, Version) ->
-    encode_credentials(H#wsp_header.value, H#wsp_header.params, Version).
-
-decode_authorization({_,Data}, Version) ->
-    decode_credentials('Authorization', Data, Version).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%%
-%% Cache-Control:
-%% 8.4.2.15
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_cache_control(Value) ->
-    case Value of
-	"no-cache" -> ?WH('Cache-Control',Value,[]);
-	"no-store" -> ?WH('Cache-Control',Value,[]);
-	"max-stale" -> ?WH('Cache-Control',Value,[]);
-	"only-if-cached" -> ?WH('Cache-Control',Value,[]);
-	"private" -> ?WH('Cache-Control',Value,[]);
-	"public" -> ?WH('Cache-Control',Value,[]);
-	"no-transform" -> ?WH('Cache-Control',Value,[]);
-	"must-revalidate" -> ?WH('Cache-Control',Value,[]);
-	"proxy-revalidate" -> ?WH('Cache-Control',Value,[]);
-	_ ->
-	    Params = parse_params([Value]),
-	    ?WH('Cache-Control',"",Params)
-    end.
-
-format_cache_control(H) ->
-    if H#wsp_header.value == "" ->
-	    format_params0(H#wsp_header.params);
-       true ->
-	    [H#wsp_header.value, format_params(H#wsp_header.params)]
-    end.
-
-
-    
-encode_cache_control(H, Version) ->
-    case H#wsp_header.value of
-	"no-cache" -> ?ENCODE_SHORT(0);
-	"no-store" -> ?ENCODE_SHORT(1);
-	"max-stale" -> ?ENCODE_SHORT(3);
-	"only-if-cached" -> ?ENCODE_SHORT(5);
-	"private" -> ?ENCODE_SHORT(7);
-	"public" -> ?ENCODE_SHORT(6);
-	"no-transform" -> ?ENCODE_SHORT(8);
-	"must-revalidate" -> ?ENCODE_SHORT(9);
-	"proxy-revalidate" -> ?ENCODE_SHORT(10);
-	"" ->
-	    case H#wsp_header.params of
-		[{'no-cache',Field}] ->
-		    e_value(?ENCODE_SHORT(0), 
-			    e_field_name(Field,Version));
-		[{'max-age',Sec}] -> 
-		    e_value(?ENCODE_SHORT(2),
-			    e_delta_seconds(Sec));
-		[{'max-fresh',Sec}] ->
-		    e_value(?ENCODE_SHORT(4),
-			    e_delta_seconds(Sec));
-		[{'private',Field}] ->
-		    e_value(?ENCODE_SHORT(7), 
-			    e_field_name(Field,Version));
-		[{'s-maxage',Sec}] ->
-		    e_value(?ENCODE_SHORT(11),
-			    e_delta_seconds(Sec))
-	    end;
-	Ext ->
-	    [Param] = H#wsp_header.params,
-	    e_value(encode_text_string(Ext),
-		    encode_parameter(Param, Version))
-    end.
-
-
-decode_cache_control(Value, _Version) when integer(Value) ->
-    case Value of
-	0 -> ?WH('Cache-Control',"no-cache",[]);
-	1 -> ?WH('Cache-Control',"no-store",[]);
-	3 -> ?WH('Cache-Control',"max-stale",[]);
-	5 -> ?WH('Cache-Control',"only-if-cached",[]);
-	7 -> ?WH('Cache-Control',"private",[]);
-	6 -> ?WH('Cache-Control',"public",[]);
-	8 -> ?WH('Cache-Control',"no-transform",[]);
-	9 -> ?WH('Cache-Control',"must-revalidate",[]);
-	10 -> ?WH('Cache-Control',"proxy-revalidate",[])
-    end;
-decode_cache_control(Value, _Version) when list(Value) ->
-    ?WH('Cache-Control',Value,[]);
-decode_cache_control({_,Data},Version) ->
-    {CacheDir, Data1} = scan_header_data(Data),
-    case CacheDir of
-	0 ->
-	    {Field,_} = d_field_name(Data1),
-	    ?WH('Cache-Control',"",[{'no-cache',Field}]);
-	2 ->
-	    {Sec,_} = d_integer_value(Data1),
-	    ?WH('Cache-Control',"",[{'max-age',Sec}]);
-	4 ->
-	    {Sec,_} = d_integer_value(Data1),
-	    ?WH('Cache-Control',"",[{'max-fresh',Sec}]);
-	7 ->
-	    {Field,_} = d_field_name(Data1),
-	    ?WH('Cache-Control',"",[{private,Field}]);
-	11 ->
-	    {Sec,_} = d_integer_value(Data1),
-	    ?WH('Cache-Control',"",[{'s-maxage',Sec}]);
-	Ext when list(Ext) ->
-	    {Param,_} = decode_parameter(Data1, Version),
-	    ?WH('Cache-Control',Ext,[Param])
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Connection: close | Ext
-%% Type: single
-%% Ref: 8.4.2.16
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_connection(Value) ->
-    ?WH('Connection', Value, []).
-
-format_connection(H) ->
-    H#wsp_header.value.
-
-encode_connection(H, _Version) ->
-    case H#wsp_header.value of
-	"close" -> ?ENCODE_SHORT(0);
-	Value ->  encode_text_string(Value)
-    end.
-
-decode_connection(0, _Version) ->
-    ?WH('Connection', "close", []);
-decode_connection(Value, _Version) when list(Value) -> 
-    ?WH('Connection', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Content-Base: <uri>
-%% Type: single
-%% Ref: 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_content_base(Value) ->
-    ?WH('Content-Base', Value, []).
-
-format_content_base(H) ->
-    H#wsp_header.value.
-
-encode_content_base(H, _Version) -> 
-    encode_uri_value(H#wsp_header.value).
-
-decode_content_base(Value, _Version) when list(Value) -> 
-    ?WH('Content-Base', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Content-Encoding: 
-%% Ref: 8.4.2.18
-%% Type: single
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_content_encoding(Value) ->
-    ?WH('Content-Encoding', tolower(Value), []).
-
-format_content_encoding(H) ->
-    H#wsp_header.value.
-    
-encode_content_encoding(H, _Version) ->
-    case H#wsp_header.value of
-	"gzip"     -> ?ENCODE_SHORT(0);
-	"compress" -> ?ENCODE_SHORT(1);
-	"deflate"  -> ?ENCODE_SHORT(2);
-	Value -> encode_text_string(Value)
-    end.
-
-decode_content_encoding(0, _Version) -> 
-    ?WH('Content-Encoding', "gzip", []);
-decode_content_encoding(1, _Version) -> 
-    ?WH('Content-Encoding', "compress", []);
-decode_content_encoding(2, _Version) ->
-    ?WH('Content-Encoding',"deflate", []);
-decode_content_encoding(Value, _Version) when list(Value) ->
-    ?WH('Content-Encoding', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Content-Language:
-%% Ref: 8.4.2.19
-%% Type: single
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_content_language(Value) -> 
-    ?WH('Content-Language', Value, []).
-
-format_content_language(H) ->
-    H#wsp_header.value.
-
-encode_content_language(H, _Version) -> 
-    case H#wsp_header.value of
-	"*" -> ?ENCODE_SHORT(0);
-	Lang -> case catch encode_lang(Lang) of
-		    {'EXIT', _} -> encode_text_string(Lang);
-		    Code -> encode_integer(Code)
-		end
-    end.
-
-decode_content_language(0, _Version) ->
-    ?WH('Content-Language',"*",[]);
-decode_content_language(Value, _Version) when integer(Value) ->
-    ?WH('Content-Language',decode_lang(Value),[]);
-decode_content_language(Value, _Version) when list(Value) ->
-    ?WH('Content-Language',Value,[]);
-decode_content_language({short,Data}, _Version) ->
-    Value = d_long(Data),
-    ?WH('Content-Language',decode_lang(Value),[]);
-decode_content_language(Value, _Version) when list(Value) ->
-    ?WH('Content-Language',Value,[]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Content-Length: <integer-value>
-%% Ref: 8.4.2.20
-%% Type: single
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_content_length(Value) ->
-    ?WH('Content-Length', list_to_integer(Value), []).
-
-format_content_length(H) ->
-    integer_to_list(H#wsp_header.value).
-
-encode_content_length(H, _Version) ->
-    encode_integer(H#wsp_header.value).
-
-decode_content_length(Value, _Version) when integer(Value) -> 
-    ?WH('Content-Length', Value, []);
-decode_content_length({short,Data}, _Version) ->
-    Value = d_long(Data),
-    ?WH('Content-Length', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Content-Location: <uri-value>
-%% Ref: 8.4.2.21
-%% Type: single
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_content_location(Value) ->
-    ?WH('Content-Location', Value, []).    
-
-format_content_location(H) ->
-    H#wsp_header.value.
-
-encode_content_location(H, _Version) -> 
-    encode_uri_value(H#wsp_header.value).
-
-decode_content_location(Value, _Version) when list(Value) ->
-    ?WH('Content-Location', decode_uri_value(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Content-Md5: <value-length> <digest>
-%% Ref: 8.4.2.22
-%% Type: single, end-to-end
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_content_md5(Value) ->
-    ?WH('Content-Md5', base64:decode(Value), []).
-
-format_content_md5(H) ->
-    base64:encode(H#wsp_header.value).
-    
-encode_content_md5(H, _Version) ->
-    e_value(H#wsp_header.value).
-    
-decode_content_md5({_,Data}, _Version) ->
-    ?WH('Content-Md5', Data, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Content-Range: <first-byte-pos> <entity-len>
-%% Ref: 8.4.2.23
-%% Type: single
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_content_range(Value) ->
-    %% FIXME:
-    ?WH('Content-Range', Value, []).
-
-format_content_range(H) ->
-    {Pos,Len} = H#wsp_header.value,
-    if Len == "*" ->
-	    ["bytes ", integer_to_list(Pos), "-*/*"];
-       true ->
-	    ["bytes ", integer_to_list(Pos),"-",integer_to_list(Len-1),
-	     "/", integer_to_list(Len)]
-    end.
-
-encode_content_range(H, _Version) ->
-    case H#wsp_header.value of
-	{Pos, "*"} ->
-	    e_value(e_uintvar(Pos), <<128>>);
-	{Pos, Len} ->
-	    e_value(e_uintvar(Pos), e_uintvar(Len))
-    end.
-
-decode_content_range({_, Data}, _Version) -> 
-    {Pos, Data1} = d_uintvar(Data),
-    Len = 
-	case Data1 of
-	    <<128>> -> "*";
-	    _ ->
-		{L, _} = d_uintvar(Data1),
-		L
-	end,
-    ?WH('Content-Range', {Pos,Len}, []).
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Content-Type:
-%% Ref: 8.4.2.24
-%% Type: single, end-to-end
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_content_type(Value) ->
-    case string:tokens(Value, ";") of
-	[Type | Ps] ->
-	    Params = parse_params(Ps),
-	    ?WH('Content-Type', Type, Params);
-	[] ->
-	    ?WH('Content-Type', Value, [])
-    end.
-
-format_content_type(H) ->
-    [H#wsp_header.value, format_params(H#wsp_header.params)].
-
-encode_content_type(H, Version) ->
-    case encode_params(H#wsp_header.params,Version) of
-	<<>> ->
-	    encode_well_known_media(H#wsp_header.value, Version);
-	Params ->
-	    Media = encode_well_known_media(H#wsp_header.value, Version),
-	    e_value(Media, Params)
-    end.
-    
-decode_content_type(Value,Version) when integer(Value) -> 
-    ?WH('Content-Type', decode_well_known_media(Value,Version), []);
-decode_content_type(Value,Version) when list(Value) -> 
-    ?WH('Content-Type', decode_well_known_media(Value,Version), []);
-decode_content_type({_, Data}, Version) ->
-    {Value,Data1} = scan_header_data(Data),
-    ContentType = if integer(Value) ->
-			  decode_well_known_media(Value,Version);
-		     list(Value) ->
-			  decode_well_known_media(Value,Version);
-		     true ->
-			  {_,Data2} = Value,
-			  decode_well_known_media(d_long(Data2),Version)
-		  end,
-    Params = decode_params(Data1, Version),
-    ?WH('Content-Type', ContentType, Params).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Date: <http-date>
-%% Ref: 8.2.4.25
-%% Type: single, end-to-end
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_date(String) ->
-    {DateTime, _} = parse_http_date(String),
-    ?WH('Date', DateTime, []).
-
-format_date(H) ->
-    fmt_date(H#wsp_header.value).
-    
-encode_date(H, _Version) -> 
-    e_date(H#wsp_header.value).
-
-decode_date(Value, _Version) ->
-    ?WH('Date', d_date(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Etag: <text-string>
-%% Ref: 8.2.4.26
-%% Type: single, end-to-end
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_etag(Value) ->
-    ?WH('Etag', Value, []).
-
-format_etag(H) ->
-    H#wsp_header.value.
-
-encode_etag(H, _Version) -> 
-    encode_text_string(H#wsp_header.value).
-
-decode_etag(Value, _Version) -> 
-    ?WH('Etag', decode_text_string(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Expires: <date-value>
-%% Ref: 8.4.2.27
-%% Type: single, end-to-end, server-to-client
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_expires(String) ->
-    {DateTime, _} = parse_http_date(String),
-    ?WH('Expires', DateTime, []).
-
-format_expires(H) ->
-    fmt_date(H#wsp_header.value).
-    
-encode_expires(H, _Version) -> 
-    e_date(H#wsp_header.value).
-
-decode_expires(Value, _Version) ->
-    ?WH('Expires', d_date(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% From: <text-string>
-%% Ref: 8.4.2.28
-%% Type: single, 
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_from(Value) ->
-    ?WH('From', Value, []).
-
-format_from(H) ->
-    H#wsp_header.value.
-
-encode_from(H, _Version) -> 
-    encode_text_string(H#wsp_header.value).
-
-decode_from(Value, _Version) -> 
-    ?WH('From', decode_text_string(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Host: <text-string>
-%% Ref: 8.4.2.29
-%% Type: single, end-to-end, client-to-server
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_host(Value) ->
-    ?WH('Host', Value, []).
-
-format_host(H) ->
-    H#wsp_header.value.
-
-encode_host(H, _Version) -> 
-    encode_text_string(H#wsp_header.value).
-
-decode_host(Value, _Version) -> 
-    ?WH('Host', decode_text_string(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% If-Modified-Since: <date-value>
-%% Ref: 8.4.2.30
-%% Type: single, end-to-end, client-to-server
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_if_modified_since(String) ->
-    {DateTime, _} = parse_http_date(String),
-    ?WH('If-Modified-Since', DateTime, []).
-
-format_if_modified_since(H) ->
-    fmt_date(H#wsp_header.value).
-    
-encode_if_modified_since(H, _Version) -> 
-    e_date(H#wsp_header.value).
-
-decode_if_modified_since(Value, _Version) ->
-    ?WH('If-Modified-Since', d_date(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% If-Match: <text-string>
-%% Ref: 8.4.2.31
-%% Type: end-to-end, client-to-server
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_if_match(Value) ->
-    ?WH('If-Match', Value, []).
-
-format_if_match(H) ->
-    H#wsp_header.value.
-
-encode_if_match(H, _Version) -> 
-    encode_text_string(H#wsp_header.value).
-
-decode_if_match(Value, _Version) -> 
-    ?WH('If-Match', decode_text_string(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% If-None-Match: <text-string>
-%% Ref: 8.4.2.32
-%% Type: end-to-end, client-to-server
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_if_none_match(Value) ->
-    ?WH('If-None-Match', Value, []).
-
-format_if_none_match(H) ->
-    H#wsp_header.value.
-
-encode_if_none_match(H, _Version) -> 
-    encode_text_string(H#wsp_header.value).
-
-decode_if_none_match(Value, _Version) -> 
-    ?WH('If-None-Match', decode_text_string(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% If-Range: Text | Date
-%% Ref: 8.4.2.33
-%% Type: end-to-end, client-to-server
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_if_range(Value) ->
-    case catch parse_http_date(Value) of
-	{'EXIT', _} ->
-	    ?WH('If-Range', Value, []);
-	{DateTime,_} ->
-	    ?WH('If-Range', DateTime, [])
-    end.
-	    
-
-format_if_range(H) ->
-    case H#wsp_header.value of
-	Value when list(Value) -> Value;
-	DateTime -> fmt_date(DateTime)
-    end.
-
-encode_if_range(H, _Version) -> 
-    case H#wsp_header.value of
-	Value when list(Value) ->
-	    encode_text_string(Value);
-	DateTime ->
-	    e_date(DateTime)
-    end.
-
-decode_if_range(Value, _Version) when list(Value) -> 
-    ?WH('If-Range', decode_text_string(Value), []);
-decode_if_range(Value, _Version) -> 
-    ?WH('If-Range', d_date(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% If-Unmodified-Since: <date-value>
-%% Ref: 8.4.2.34
-%% Type: single, end-to-end, client-to-server
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_if_unmodified_since(String) ->
-    {DateTime, _} = parse_http_date(String),
-    ?WH('If-Unmodified-Since', DateTime, []).
-
-format_if_unmodified_since(H) ->
-    fmt_date(H#wsp_header.value).
-    
-encode_if_unmodified_since(H, _Version) -> 
-    e_date(H#wsp_header.value).
-
-decode_if_unmodified_since(Value, _Version) ->
-    ?WH('If-Unmodified-Since', d_date(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Location: <uri-value>
-%% Ref: 8.4.2.36
-%% Type: single, end-to-end, server-to-client
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_location(Value) ->
-    ?WH('Location', Value, []).    
-
-format_location(H) ->
-    H#wsp_header.value.
-
-encode_location(H, _Version) -> 
-    encode_uri_value(H#wsp_header.value).
-
-decode_location(Value, _Version) when list(Value) ->
-    ?WH('Location', decode_uri_value(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Last-Modified: <date-value>
-%% Ref: 8.4.2.35
-%% Type: single, end-to-end, server-to-client
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_last_modified(String) -> 
-    {DateTime, _} = parse_http_date(String),
-    ?WH('Last-Modified', DateTime, []).    
-
-format_last_modified(H) ->
-    fmt_date(H#wsp_header.value).
-
-encode_last_modified(H, _Version) -> 
-    e_date(H#wsp_header.value).
-
-decode_last_modified(Value, _Version) ->
-    ?WH('Last-Modified', d_date(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Max-Forwards: <integer-value>
-%% Ref: 8.4.2.37
-%% Type: single, end-to-end, server-to-client
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_max_forwards(String) ->
-    ?WH('Max-Forwards', list_to_integer(String), []).
-
-format_max_forwards(H) ->
-    integer_to_list(H#wsp_header.value).
-
-encode_max_forwards(H, _Version) ->
-    encode_integer(H#wsp_header.value).
-
-decode_max_forwards(Value, _Version) -> 
-    decode_integer(Value).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Pragma: No-Cache | value-length Parameter
-%% Ref:
-%% Type:
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_pragma(Value) ->
-    ?WH('Pragma',Value,[]).
-
-format_pragma(H) ->
-    case H#wsp_header.value of
-	"" -> format_params(H#wsp_header.params);
-	Value -> Value
-    end.
-
-encode_pragma(H, Version) ->
-    case H#wsp_header.value of
-	"no-cache" -> ?ENCODE_SHORT(0);
-	"" -> 
-	    encode_parameter(hd(H#wsp_header.params), Version)
-    end.
-
-decode_pragma(0, _Version) ->
-    ?WH('Pragma',"no-cache",[]);
-decode_pragma({_,Data}, Version) ->
-    {Param,_} = decode_parameter(Data, Version),
-    ?WH('Pragma',"",[Param]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Proxy-Authenticate:
-%% Ref: 8.4.2.39
-%% Type: single?, client-to-proxy
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_proxy_authenticate(Value) ->
-    parse_challenge('Proxy-Authenticate', Value).
-
-format_proxy_authenticate(H) ->
-    format_challenge(H#wsp_header.value, H#wsp_header.params).
-
-encode_proxy_authenticate(H, Version) ->
-    encode_challenge(H#wsp_header.value, 
-		     H#wsp_header.params, Version).
-
-decode_proxy_authenticate({_, Data}, Version) ->
-    decode_challenge('Proxy-Authenticate', Data, Version).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Proxy-authorization:
-%% Ref: 8.4.2.40
-%% Type: single?, proxy-to-client
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_proxy_authorization(Value) ->
-    parse_credentials('Proxy-Authorization', Value).
-
-format_proxy_authorization(H) ->
-    format_credentials(H#wsp_header.value, H#wsp_header.params).
-
-encode_proxy_authorization(H, Version) ->
-    encode_credentials(H#wsp_header.value, H#wsp_header.params, Version).
-
-decode_proxy_authorization({_,Data}, Version) ->
-    decode_credentials('Proxy-Authorization', Data, Version).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Public: <well-known-method> | Token-Text
-%% Ref: 8.4.2.41
-%% Type: 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_public(Value) ->
-    ?WH('Public', parse_well_known_method(Value), []).
-
-format_public(H) ->
-    if atom(H#wsp_header.value) ->
-	    atom_to_list(H#wsp_header.value);
-       list(H#wsp_header.value) ->
-	    H#wsp_header.value
-    end.
-
-encode_public(H, Version) ->
-    if atom(H#wsp_header.value) ->
-	    encode_well_known_method(H#wsp_header.value,Version);
-       list(H#wsp_header.value) ->       
-	    encode_text_string(H#wsp_header.value)
-    end.
-
-decode_public(Value, _Version) when list(Value) ->
-    ?WH('Public', Value, []);    
-decode_public(Value, Version) ->
-    ?WH('Public', decode_well_known_method(Value,Version), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Range:
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_range(Value) ->
-    %% FIXME:
-    ?WH('Range', Value, []).
-
-format_range(H) ->
-    case H#wsp_header.value of
-	{First,undefined} ->
-	    ["bytes=", integer_to_list(First), "-"];
-	{First,Last} ->
-	    ["bytes=", integer_to_list(First), "-", integer_to_list(Last)];
-	Len when integer(Len) ->
-	    ["bytes=-", integer_to_list(Len)]
-    end.
-
-encode_range(H, _Version) -> 
-    case H#wsp_header.value of
-	{First,undefined} ->
-	    e_value(?ENCODE_SHORT(0),
-		    e_uintvar(First));
-	{First,Last} ->
-	    e_value(?ENCODE_SHORT(0),
-		    e_uintvar(First),
-		    e_uintvar(Last));
-	Len when integer(Len) ->
-	    e_value(?ENCODE_SHORT(1),
-		    e_uintvar(Len))
-    end.
-
-decode_range({_,Data}, _Version) -> 
-    case scan_header_data(Data) of
-	{0, Data1} ->
-	    case d_uintvar(Data1) of
-		{First, <<>>} ->
-		    ?WH('Range', {First, undefined},[]);
-		{First, Data2} ->
-		    {Last, _} = d_uintvar(Data2),
-		    ?WH('Range', {First, Last}, [])
-	    end;
-	{1, Data1} ->
-	    {Len, _} =d_uintvar(Data1),
-	    ?WH('Range', Len, [])
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Referer: <uri-value>
-%% Ref: 8.4.2.43
-%% Type: single
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_referer(Value) ->
-    ?WH('Referer', Value, []).    
-
-format_referer(H) ->
-    H#wsp_header.value.
-
-encode_referer(H, _Version) -> 
-    encode_uri_value(H#wsp_header.value).
-
-decode_referer(Value, _Version) when list(Value) ->
-    ?WH('Referer', decode_uri_value(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Retry-After: Value-length (Retry-date-value | Retry-delta-seconds)
-%% Ref: 8.4.2.44
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_retry_after(Value) ->
-    case catch parse_http_date(Value) of
-	{'EXIT', _} ->
-	    ?WH('Retry-After', list_to_integer(Value), []);
-	{DateTime,_} ->
-	    ?WH('Retry-After', DateTime, [])
-    end.
-
-format_retry_after(H) ->
-    Value = H#wsp_header.value,
-    if integer(Value) ->
-	    integer_to_list(Value);
-       true ->
-	    fmt_date(Value)
-    end.
-
-encode_retry_after(H, _Version) -> 
-    Value = H#wsp_header.value,
-    if integer(Value) ->
-	    e_value(?ENCODE_SHORT(1),
-		    e_delta_seconds(Value));
-       true ->
-	    e_value(?ENCODE_SHORT(0),
-		    e_date(Value))
-    end.
-
-decode_retry_after({_,Data}, _Version) ->
-    case scan_header_data(Data) of
-	{0, Data1} ->
-	    ?WH('Retry-After', d_date(Data1), []);
-	{1, Data1} ->
-	    case scan_header_data(Data1) of
-		Sec when integer(Sec) ->
-		    ?WH('Retry-After', Sec, []);
-		{short,Data2} ->
-		    ?WH('Retry-After', d_long(Data2), [])
-	    end
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Server: <text-string>
-%% Ref: 8.4.2.45
-%% Type: server-to-client
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_server(Value) ->
-    ?WH('Server', Value, []).
-
-format_server(H) ->
-    H#wsp_header.value.
-
-encode_server(H, _Version) -> 
-    encode_text_string(H#wsp_header.value).
-
-decode_server(Value, _Version) ->
-    ?WH('Server', decode_text_string(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Transfer-Encoding:
-%% Ref: 8.4.2.46
-%% Type: hop-by-hop
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_transfer_encoding(Value) ->
-    ?WH('Transfer-Encoding', Value, []).
-
-format_transfer_encoding(H) ->
-    H#wsp_header.value.
-
-encode_transfer_encoding(H, _Version) -> 
-    case H#wsp_header.value of
-	"chunked" -> ?ENCODE_SHORT(0);
-	Value -> encode_text_string(Value)
-    end.
-
-decode_transfer_encoding(0, _Version) -> 
-    ?WH('Transfer-Encoding', "chunked", []);
-decode_transfer_encoding(Value, _Version) when list(Value)-> 
-    ?WH('Transfer-Encoding', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Upgrade: Text-String
-%% Ref: 8.4.2.47
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_upgrade(Value) ->
-    ?WH('Upgrade', Value, []).
-
-format_upgrade(H) ->
-    H#wsp_header.value.
-
-encode_upgrade(H, _Version) ->
-    encode_text_string(H#wsp_header.value).
-
-decode_upgrade(Value, _Version) when list(Value) ->
-    ?WH('Upgrade', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% User-Agent:
-%% Ref: 8.4.2.48
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_user_agent(Value) ->
-    ?WH('User-Agent', Value, []).
-
-format_user_agent(H) ->
-    H#wsp_header.value.
-
-encode_user_agent(H, _Version) -> 
-    encode_text_string(H#wsp_header.value).
-
-decode_user_agent(Value, _Version) -> 
-    ?WH('User-Agent', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Vary: Well-known-header-field | Token-text
-%% Ref: 8.4.2.49
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_vary(Value) ->
-    ?WH('Vary', normalise_field_name(Value), []).
-
-format_vary(H) ->
-    to_list(H#wsp_header.value).
-    
-encode_vary(H, Version) -> 
-    e_field_name(H#wsp_header.value, Version).
-
-decode_vary(Value, _Version) when integer(Value) -> 
-    ?WH('Vary', lookup_field_name(Value), []);
-decode_vary(Value, _Version) when list(Value) -> 
-    ?WH('Vary', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Via: <text-string>
-%% Ref: 8.4.2.50
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_via(Value) ->
-    ?WH('Via', Value, []).
-
-format_via(H) ->
-    H#wsp_header.value.
-
-encode_via(H, _Version) ->
-    encode_text_string(H#wsp_header.value).
-
-decode_via(Value, _Version) when list(Value) ->
-    ?WH('Via', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Warning: Warn-Code | Warning-value
-%% Ref: 8.4.2.51 
-%% Type: general, multiple
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_warning(Value) ->
-    case string:tokens(Value, " ") of
-	[Code] ->
-	    ?WH('Warning', {list_to_integer(Code),"",""}, []);
-	[Code,Agent,Text] ->
-	    ?WH('Warning', {list_to_integer(Code), Agent, Text}, [])
-    end.
-
-format_warning(H) ->
-    case H#wsp_header.value of
-	{Code, "", ""} ->
-	    integer_to_list(Code);
-	{Code, Agent, Text} ->
-	    [integer_to_list(Code), " ", Agent, " ", Text]
-    end.
-
-encode_warning(H, _Version) -> 
-    case H#wsp_header.value of
-	{Code,"",""} ->
-	    ?ENCODE_SHORT(Code);
-	{Code, Agent, Text} ->
-	    e_value(?ENCODE_SHORT(Code),
-		    encode_text_string(Agent),
-		    encode_text_string(Text))
-    end.
-
-decode_warning(Value, _Version) when integer(Value) -> 
-    ?WH('Warning', {Value, "", ""}, []);
-decode_warning({_, Data}, _Version) ->
-    {Code,Data1}= scan_header_data(Data),
-    {Agent,Data2} = d_text_string(Data1),
-    {Text,_Data3} = d_text_string(Data2),
-    ?WH('Warning', {Code,Agent,Text}, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% WWW-Authenticate: challenge
-%% Ref: 8.4.2.52
-%% Type: single? client-to-server
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_www_authenticate(Value) ->
-    parse_challenge('Www-Authenticate', Value).
-
-format_www_authenticate(H) ->
-    format_challenge(H#wsp_header.value, H#wsp_header.params).
-
-encode_www_authenticate(H, Version) ->
-    encode_challenge(H#wsp_header.value, 
-		     H#wsp_header.params, Version).
-
-decode_www_authenticate({_, Data}, Version) ->
-    decode_challenge('Www-Authenticate', Data, Version).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Content-Disposition: "form-data" | "attachment" [<param>]*
-%% Ref: 8.4.2.53 
-%% Type: single
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_content_disposition(Value) ->
-    ?WH('Content-Disposition', Value, []).
-
-format_content_disposition(H) ->
-    [H#wsp_header.value, format_params(H#wsp_header.params)].
-    
-encode_content_disposition(H, Version) -> 
-    case H#wsp_header.value of
-	"form-data" ->
-	    e_value(?ENCODE_SHORT(0), 
-		    encode_params(H#wsp_header.params, Version));
-	"attachment" ->
-	    e_value(?ENCODE_SHORT(1), 
-		    encode_params(H#wsp_header.params, Version))
-    end.
-
-decode_content_disposition({_,Data}, Version) when binary(Data) ->
-    case scan_header_data(Data) of
-	{0, Data1} ->
-	    Params = decode_params(Data1, Version),
-	    ?WH('Content-Disposition', "form-data", Params);
-	{1, Data1} ->
-	    Params = decode_params(Data1, Version),
-	    ?WH('Content-Disposition', "attachment", Params)
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% X-Wap-Application-Id:
-%% Ref: 8.4.2.54
-%% Type:
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_x_wap_application_id(Value) ->
-    ?WH('X-Wap-Application-Id', Value, []).
-
-format_x_wap_application_id(H) ->
-    H#wsp_header.value.
-    
-encode_x_wap_application_id(H, _Version) -> 
-    encode_push_application(H#wsp_header.value).
-
-decode_x_wap_application_id(Value, _Version) -> 
-    ?WH('X-Wap-Application-Id', decode_push_application(Value),[]).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% X-Wap-Content-Uri: <uri-value>
-%% Ref: 8.4.2.55
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_x_wap_content_uri(Value) -> 
-    ?WH('X-Wap-Content-Uri', Value, []).
-
-format_x_wap_content_uri(H) -> 
-    H#wsp_header.value.
-
-encode_x_wap_content_uri(H, _Version) -> 
-    encode_uri_value(H#wsp_header.value).
-
-decode_x_wap_content_uri(Value, _Version) when list(Value) ->
-    ?WH('X-Wap-Content-Uri', decode_uri_value(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% X-Wap-Initiator-Uri: <uri-value>
-%% Ref: 8.4.2.56
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_x_wap_initiator_uri(Value) -> 
-    ?WH('X-Wap-Initiator-Uri', Value, []).
-
-format_x_wap_initiator_uri(H) -> 
-    H#wsp_header.value.
-
-encode_x_wap_initiator_uri(H, _Version) -> 
-    encode_uri_value(H#wsp_header.value).
-
-decode_x_wap_initiator_uri(Value, _Version) when list(Value) ->
-    ?WH('X-Wap-Initiator-Uri', decode_uri_value(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Accept-Application: Any-Application | Appication-Id-Value
-%% Ref: 8.4.2.57
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_accept_application(Value) -> 
-    ?WH('Accept-Application', Value, []).
-
-format_accept_application(H) ->
-    H#wsp_header.value.
-    
-    
-encode_accept_application(H, _Version) ->
-    case H#wsp_header.value of
-	"*" -> ?ENCODE_SHORT(0);
-	Value ->
-	    case catch encode_push_application(Value) of
-		{'EXIT',_} ->
-		    encode_uri_value(Value);
-		App ->
-		    encode_integer(App)
-	    end
-    end.
-
-decode_accept_application(0, _Version) ->
-    ?WH('Accept-Application', "*", []);
-decode_accept_application(Value, _Version) when integer(Value) ->
-    ?WH('Accept-Application', decode_push_application(Value), []);
-decode_accept_application({short,Data}, _Version) ->
-    Value = d_long(Data),
-    ?WH('Accept-Application', decode_push_application(Value), []);
-decode_accept_application(Value, _Version) when list(Value) ->
-    ?WH('Accept-Application', decode_uri_value(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Bearer-Indication: <integer-value>
-%% Type: sinlge
-%% Ref: 8.4.2.58
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_bearer_indication(Value) ->
-    ?WH('Bearer-Indication', Value, []).
-
-format_bearer_indication(H) ->
-    integer_to_list(H#wsp_header.value).
-    
-encode_bearer_indication(H, _Version) ->
-    encode_integer(H#wsp_header.value).
-
-decode_bearer_indication(Value, _Version) when integer(Value) ->
-    ?WH('Bearer-Indication', Value, []);
-decode_bearer_indication({short,Data}, _Version) ->
-    Value = d_long(Data),
-    ?WH('Bearer-Indication', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Push-Flag: Short-Integer
-%% Type: single
-%% Ref: 8.4.2.59
-%% 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_push_flag(Value) ->
-    ?WH('Push-Flag', integer_to_list(Value), []).
-
-format_push_flag(H) ->
-    integer_to_list(H#wsp_header.value).
-    
-encode_push_flag(H, _Version) ->
-    ?ENCODE_SHORT(H#wsp_header.value).
-
-decode_push_flag(Value, _Version) when integer(Value) ->
-    ?WH('Push-Flag', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Profile: <uri-value>
-%% Ref: 8.4.2.60
-%% Type: single, hop-by-hop, client-to-proxy
-%%
-%% Note: Normally transfered as 'X-Wap-Profile'
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_profile(Value) ->
-    ?WH('Profile', Value, []).
-
-format_profile(H) ->
-    H#wsp_header.value.
-
-encode_profile(H, _Version) -> 
-    encode_uri_value(H#wsp_header.value).
-
-decode_profile(Value, _Version) -> 
-    ?WH('Profile', decode_uri_value(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Profile-Diff: Value-Length Octets
-%% Ref: 8.4.2.61
-%% Type: single, hop-by-hop, client-to-proxy
-%%
-%%  Value is WBXML encoded profile diff information
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_profile_diff(Value) ->
-    %% FIXME parse XML code?
-    ?WH('Profile-Diff', Value, []).
-
-format_profile_diff(_H) ->
-    %% FIXME emit ???
-    "WBXML".
-
-encode_profile_diff(H, _Version) ->
-    e_value(H#wsp_header.value).
-
-decode_profile_diff({_,Value}, _Version) ->
-    ?WH('Profile-Diff', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Profile-Warning: Code
-%% Ref: 8.4.2.62
-%% Type: single
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_profile_warning(Value) ->
-    ?WH('Profile-Warning', {Value,"",undefined}, []).
-
-format_profile_warning(H) ->    
-    {Code,Target,Date} = H#wsp_header.value,
-    CodeData = integer_to_list(Code),
-    if Target == "", Date == undefined ->
-	    CodeData;
-       Date == undefined ->
-	    [CodeData," ",Target];
-       true ->
-	    [CodeData," ",Target," ",format_date(Date)]
-    end.
-
-
-encode_profile_warning(H, _Version) -> 
-    {Code,Target,Date} = H#wsp_header.value,
-    CodeData = case Code of
-		   100 -> ?ENCODE_SHORT(16#10);
-		   101 -> ?ENCODE_SHORT(16#11);
-		   102 -> ?ENCODE_SHORT(16#12);
-		   200 -> ?ENCODE_SHORT(16#20);
-		   201 -> ?ENCODE_SHORT(16#21);
-		   202 -> ?ENCODE_SHORT(16#22);
-		   203 -> ?ENCODE_SHORT(16#23)
-	       end,
-    if Target == "", Date == undefined ->
-	    CodeData;
-       Date == undefined ->
-	    e_value(CodeData, encode_text_string(Target));
-       true ->
-	    e_value(CodeData, encode_text_string(Target), e_date(Date))
-    end.
-
-
-decode_profile_warning(Value, _Version) when integer(Value) -> 
-    Code = case Value of
-	       16#10 -> 100;
-	       16#11 -> 101;
-	       16#12 -> 102;
-	       16#20 -> 200;
-	       16#21 -> 201;
-	       16#22 -> 202;
-	       16#23 -> 203
-	   end,
-    ?WH('Profile-Warning', {Code,"",undefined}, []);
-decode_profile_warning({_, <<1:1, Value:7, Data>>}, _Version) ->
-    Code = case Value of
-	       16#10 -> 100;
-	       16#11 -> 101;
-	       16#12 -> 102;
-	       16#20 -> 200;
-	       16#21 -> 201;
-	       16#22 -> 202;
-	       16#23 -> 203
-	   end,
-    {Target,Data1} = d_text_string(Data),
-    Date = 
-	if Data1 == <<>> ->
-		undefined;
-	   true -> 
-		{DateValue,_} = scan_header_data(Data1),
-		d_date(DateValue)
-	end,
-    ?WH('Profile-Warning', {Code,Target,Date}, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Expect: 100-contine | Expect-expression
-%% Ref: 8.4.2.63
-%% Type: client-to-server
-%% Note: Bug in the spec value-length is missing !!!
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_expect(Value) ->
-    ?WH('Expect', Value, []).
-
-format_expect(H) ->
-    case H#wsp_header.value of
-	{Var,Val} ->
-	    [Var,"=",Val, format_params(H#wsp_header.params)];
-	Val when list(Val) ->
-	    Val
-    end.
-    
-encode_expect(H, Version) -> 
-    case H#wsp_header.value of
-	"100-continue" ->
-	    ?ENCODE_SHORT(0);
-	{Var,Val} ->
-	    e_value(encode_text_string(Var), 
-		    encode_text_string(Val),
-		    encode_params(H#wsp_header.params,Version))
-    end.
-
-decode_expect(0, _Version) -> 
-    ?WH('Expect', "100-continue", []);
-decode_expect({_, Data}, Version) -> 
-    {Var, Data1} = d_text_string(Data),
-    {Val, Data2} = d_text_string(Data1),
-    Params = decode_params(Data2, Version),
-    ?WH('Expect', {decode_text_string(Var),
-		   decode_text_string(Val)}, Params).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Te: Trailers | TE-General-From
-%% Ref: 8.4.2.64
-%% 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_te(Value) ->
-    ?WH('Te', Value, []).
-
-format_te(H) ->
-    [H#wsp_header.value, format_params(H#wsp_header.params)].
-    
-encode_te(H, Version) ->
-    case H#wsp_header.value of
-	"trailers" -> ?ENCODE_SHORT(1);
-	"chunked" ->
-	    e_value(?ENCODE_SHORT(2),
-		    encode_params(H#wsp_header.params,Version));
-	"identity" ->
-	    e_value(?ENCODE_SHORT(3),
-		    encode_params(H#wsp_header.params,Version));
-	"gzip" ->
-	    e_value(?ENCODE_SHORT(4),
-		    encode_params(H#wsp_header.params,Version));
-	"compress" ->
-	    e_value(?ENCODE_SHORT(5),
-		    encode_params(H#wsp_header.params,Version));
-	"deflate" ->
-	    e_value(?ENCODE_SHORT(6),
-		    encode_params(H#wsp_header.params,Version));
-	Value ->
-	    e_value(encode_text_string(Value),
-		    encode_params(H#wsp_header.params,Version))
-    end.
-
-decode_te(1, _Version) -> 
-    ?WH('Te', "trailers", []);
-decode_te({_, Data}, _Version) ->
-    {Val, Data1} = scan_header_data(Data),
-    Value = 
-	case Val of
-	    2 -> "chunked";
-	    3 -> "identity";
-	    4 -> "gzip";
-	    5 -> "compress";
-	    6 -> "deflate";
-	    V when list(V) -> V
-	end,
-    Params = case Data1 of
-		 <<>> ->  [];
-		 <<128, QData>> ->
-		     {QValue, _} = d_q_value(QData),
-		     [{q, QValue}]
-	     end,
-    ?WH('Te', Value, Params).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Trailer: Well-known-header-field | Token-text
-%% Ref: 8.4.2.65
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_trailer(Value) ->
-    ?WH('Trailer', normalise_field_name(Value), []).
-
-format_trailer(H) ->
-    to_list(H#wsp_header.value).
-    
-encode_trailer(H, Version) -> 
-    e_field_name(H#wsp_header.value, Version).
-
-decode_trailer(Value, _Version) when integer(Value) -> 
-    ?WH('Trailer', lookup_field_name(Value), []);
-decode_trailer(Value, _Version) when list(Value) -> 
-    ?WH('Trailer', Value, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% X-Wap-Tod:
-%% Ref: 8.4.2.66
-%% Type: hop-by-hop
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_x_wap_tod(String) ->
-    {DateTime, _} = parse_http_date(String),
-    ?WH('X-Wap-Tod', DateTime, []).
-
-format_x_wap_tod(H) ->
-    fmt_date(H#wsp_header.value).
-
-encode_x_wap_tod(H, _Version) -> 
-    e_date(H#wsp_header.value).
-
-decode_x_wap_tod(Value, _Version) -> 
-    ?WH('X-Wap-Tod', d_date(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Content-Id: <quoted-string>
-%% Type: 
-%% Ref: 8.4.2.67
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_content_id(Value) ->
-    ?WH('Content-Id', Value, []).
-
-format_content_id(H) ->
-    [$", H#wsp_header.value, $"].
-    
-encode_content_id(H, _Version) ->
-    encode_quoted_string(H#wsp_header.value).
-
-decode_content_id(Value, _Version) when list(Value) ->
-    ?WH('Content-Id', decode_quoted_string(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Set-Cookie: <len> <cookie-version> <cookie-name> <cokie-value> <parm>*
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_set_cookie(String) ->
-    %% MEGA FIXME; Cookie-value may be a quoted string and
-    %% contain both ,=; etc Fix several cookies on same line!!
-    case string:tokens(String, ";") of
-	[Cookie | Ps] ->
-	    case string:tokens(Cookie, "=") of
-		[Name,Value] ->
-		    Params = parse_params(Ps),
-		    ?WH('Set-Cookie', {{1,0}, Name, Value}, Params);
-		[Name] ->
-		    Params = parse_params(Ps),
-		    ?WH('Set-Cookie', {{1,0}, Name, ""}, Params)
-	    end;
-	[] ->
-	    ?WH('Set-Cookie', {{1,0}, String, ""}, [])
-    end.
-
-format_set_cookie(H) ->
-    case H#wsp_header.value of
-	{{1,0},Name,Value} ->
-	    [Name, "=", Value,format_params(H#wsp_header.params)];
-	{Version,Name,Value} ->
-	    [format_version(Version)," ",
-	     Name, "=", Value,
-	     format_params(H#wsp_header.params)]
-    end.
-
-encode_set_cookie(H, Version) ->
-    {CookieVersion,Name,Value} = H#wsp_header.value,
-    e_value(encode_version(CookieVersion),
-	    encode_text_string(Name),
-	    encode_text_string(Value),
-	    encode_params(H#wsp_header.params, Version)).
-
-decode_set_cookie({_, Data}, Version) -> 
-    {CookieVersion, Data1} = scan_header_data(Data),
-    {CookieName, Data2} = scan_header_data(Data1),
-    {CookieValue, Data3} = scan_header_data(Data2),
-    Params = decode_params(Data3, Version),
-    ?WH('Set-Cookie', {decode_version(CookieVersion),
-		       decode_text_string(CookieName),
-		       decode_text_string(CookieValue)}, Params).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Cookie:
-%% Ref: 8.4.2.69
-%% Type: single?, client-to-server
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_cookie(Value) ->
-    %% FIXME parse cookie version etc
-    ?WH('Cookie', {{1,0},Value}, []).
-
-format_cookie(H) ->
-    case H#wsp_header.value of
-	{{1,0}, Cookies} ->
-	    lists:map(fun({Name,Value,Ps}) ->
-			      [Name,"=",Value, format_params(Ps)]
-		      end, Cookies);
-	{Version, Cookies} ->
-	    [format_version(Version)," ",
-	     lists:map(fun({Name,Value,Ps}) ->
-			       [Name,"=",Value, format_params(Ps)]
-		       end, Cookies)]
-    end.
-
-encode_cookie(H, Version) ->
-    {Version, Cookies} = H#wsp_header.value,
-    e_value(encode_version(Version),
-	    encode_cookies(Cookies, [])).
-
-encode_cookies([{Name,Value,Ps} | Cs], Acc) ->
-    List =
-	[encode_text_string(Name),
-	 encode_text_string(Value) |
-	 case Ps of
-	     [{path,P},{domain,D}] ->
-		 [encode_text_string(P), encode_text_string(D)];
-	     [{domain,D},{path,P}] ->
-		 [encode_text_string(P), encode_text_string(D)];
-	     [{path,P}] ->
-		 [encode_text_string(P)];
-	     [{domain,D}] ->
-		 [encode_text_string(""), encode_text_string(D)];
-	     [] ->
-		 []
-	 end],
-    Sz = lists:sum(lists:map(fun(B) -> size(B) end, List)),
-    encode_cookies(Cs, [[e_uintvar(Sz) | List] | Acc]);
-encode_cookies([], Acc) ->
-    list_to_binary(lists:reverse(Acc)).
-    
-
-decode_cookie({_, Data}, _Version) ->
-    {CookieVersion, Data1} = scan_header_data(Data),
-    Cookies = decode_cookies(Data1, []),
-    ?WH('Cookie', {decode_version(CookieVersion), Cookies}, []).
-
-decode_cookies(<<>>, Acc) ->
-    lists:reverse(Acc);
-decode_cookies(Data0, _Acc) ->	%% IS IGNORING Acc A BUG OR NOT ?
-    {Len, Data1} = d_uintvar(Data0),
-    <<C0:Len/binary, Data2/binary>> = Data1,
-    {Name, C1} = scan_header_data(C0),
-    {Value, C2} = scan_header_data(C1),
-    {Ps1, C3} = 
-	case d_text_string(C2) of
-	    {"", C21} -> {[], C21};
-	    {Path,C21} -> {[{path,Path}], C21}
-	end,
-    {Ps2, _} =
-	case C3 of
-	    <<>> -> {[], <<>>};
-	    _ ->
-		{Domain,C4} = d_text_string(C3),
-		{[{domain,Domain}], C4}
-	end,
-    decode_cookies(Data2, [{decode_text_string(Name),
-			    decode_text_string(Value),
-			    Ps1++Ps2}]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Encoding-Version: Version-Value | Value-length Code-Page [Version-Value]
-%% Ref: 8.4.2.70
-%% Type: single, hop-by-hop, client-and-proxys
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_encoding_version(Value) ->
-    ?WH('Encoding-Version', parse_version(Value), []).
-
-format_encoding_version(H) ->
-    format_version(H#wsp_header.value).
-
-encode_encoding_version(H, _Version) -> 
-    encode_version(H#wsp_header.value).
-
-decode_encoding_version(Value, _Version) when integer(Value) ->
-    ?WH('Encoding-Version', decode_version(Value), []);
-decode_encoding_version(Value, _Version) when list(Value) ->
-    %% Note: in this case we parse the Value since we
-    %% Must know the Encoding version
-    ?WH('Encoding-Version', parse_version(Value), []);
-decode_encoding_version({_,<<_:1,_CodePage:7>>}, _Version) ->
-    %% ??? FIXME
-    ?WH('Encoding-Version', "", []);
-decode_encoding_version({_,<<_:1,_CodePage:7, Data1/binary>>}, _Version) ->
-    {Value,_Data2} = scan_header_data(Data1),
-    %% FIXME CodePage
-    ?WH('Encoding-Version', decode_version(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% X-Wap-Security:
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_x_wap_security(Value) ->
-    ?WH('X-Wap-Security', Value, []).
-
-format_x_wap_security(H) -> 
-    H#wsp_header.value.
-
-encode_x_wap_security(H, _Version) -> 
-    encode_text_string(H#wsp_header.value).
-
-decode_x_wap_security(Value, _Version) -> 
-    ?WH('X-Wap-Security', decode_text_string(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% X-Wap-Loc-Invocation:
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_x_wap_loc_invocation(Value) -> 
-    ?WH('X-Wap-Loc-Invocation', Value, []).
-
-format_x_wap_loc_invocation(H) -> 
-    H#wsp_header.value.
-
-encode_x_wap_loc_invocation(H, _Version) -> 
-    encode_text_string(H#wsp_header.value).
-
-decode_x_wap_loc_invocation(Value, _Version) -> 
-    ?WH('X-Wap-Loc-Invocation', decode_text_string(Value), []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% X-Wap-Loc-Delivery:
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-parse_x_wap_loc_delivery(Value) -> 
-    ?WH('X-Wap-Loc-Delivery', Value, []).    
-
-format_x_wap_loc_delivery(H) -> 
-    H#wsp_header.value.
-
-encode_x_wap_loc_delivery(H, _Value) -> 
-    encode_text_string(H#wsp_header.value).
-
-decode_x_wap_loc_delivery(Value, _Version) -> 
-    ?WH('X-Wap-Loc-Delivery', decode_text_string(Value), []).
-
-
-%% 
-%% Header Field parameters
-%%
-
-parse_params([Param|Ps]) ->
-    case string:tokens(Param, "=") of
-	[Name,Value0] ->
-	    Val = trim(Value0),
-	    P = case trim(tolower(Name)) of
-		    "q" ->{q,Val};
-		    "charset" -> {charset,Val};
-		    "level" -> {level,Val};
-		    "type" -> {type,Val};
-		    "name" -> {name,Val};
-		    "filename" -> {filename,Val};
-		    "differences" -> {differences,Val};
-		    "padding" -> {padding,Val};
-		    "start" -> {start,Val};
-		    "start-info" -> {'start-info',Val};
-		    "comment" -> {comment,Val};
-		    "domain" -> {domain,Val};
-		    "max-age" -> {'max-age',Val};
-		    "path" -> {path,Val};
-		    "secure" -> {secure,no_value};
-		    "sec" -> {sec, Val};
-		    "mac" -> {mac, Val};
-		    "creation-date" -> {'creation-date', Val};
-		    "modification-date" -> {'modification-date', Val};
-		    "read-date" -> {'read-date', Val};
-		    "size" -> {size, Val};
-		    Nm -> {Nm, Val}
-		end,
-	    [P | parse_params(Ps)];
-	_ ->
-	    parse_params(Ps)
-    end;
-parse_params([]) ->
-    [].
-
-%% format Params without leading ";"
-format_params0([{Param,no_value}|Ps]) ->
-    [to_list(Param) | format_params(Ps)];
-format_params0([{Param,Value}|Ps]) ->
-    [to_list(Param),"=",to_list(Value) | format_params(Ps)].
-    
-format_params(Ps) ->
-    lists:map(fun({Param,no_value}) ->
-		      ["; ", to_list(Param)];
-		 ({Param,Value})->
-		      ["; ", to_list(Param),"=",to_list(Value)]
-	      end, Ps).
-
-
-encode_params(Params, Version) ->
-    list_to_binary(encode_params1(Params,Version)).
-
-encode_params1([Param|Ps], Version) ->
-    [ encode_parameter(Param, Version) | encode_params1(Ps, Version)];
-encode_params1([], _Version) ->
-    [].
-
-
-decode_params(Data, Version) ->
-    decode_params(Data, [], Version).
-
-decode_params(<<>>, Ps, _Version) ->
-    lists:reverse(Ps);
-decode_params(Data, Ps, Version) ->
-    {ParamVal, Data1} = decode_parameter(Data, Version),
-    decode_params(Data1, [ParamVal | Ps], Version).
-
-
-
-
-encode_parameter({ParamName, ParamValue}, Ver) ->
-    case ParamName of
-	q when Ver >= 16#01 ->
-	    <<1:1, 16#00:7,
-	     (encode_typed_field(Ver,'Q-value', ParamValue))/binary>>;
-	charset when Ver >= 16#01 ->
-	    <<1:1, 16#01:7,
-	     (encode_typed_field(Ver,'Well-known-charset',ParamValue))/binary>>;
-	level when Ver >= 16#01 ->
-	    <<1:1, 16#02:7,
-	     (encode_typed_field(Ver,'Ver-value',ParamValue))/binary>>;
-
-	type when Ver >= ?WSP_12 ->
-	    <<1:1, 16#09:7,
-	     (encode_typed_field(Ver,'Constrained-encoding',ParamValue))/binary>>;
-	type when Ver >= 16#01 ->
-	    <<1:1, 16#03:7,
-	     (encode_typed_field(Ver,'Integer-value',ParamValue))/binary>>;
-
-	name when Ver >= ?WSP_14 ->
-	    <<1:1, 16#17:7,
-	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
-	name when Ver >= 16#01 ->
-	    <<1:1, 16#05:7,
-	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
-
-	filename when Ver >= ?WSP_14 ->
-	    <<1:1, 16#18:7,
-	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
-	filename when Ver >= 16#01 ->
-	    <<1:1, 16#06:7,
-	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
-
-	differences when Ver >= 16#01 ->
-	    <<1:1, 16#07:7,
-	     (encode_typed_field(Ver,'Field-name',ParamValue))/binary>>;
-
-	padding when Ver >= 16#01 ->
-	    <<1:1, 16#08:7,
-	     (encode_typed_field(Ver,'Short-integer',ParamValue))/binary>>;
-
-
-	start when Ver >= ?WSP_14 ->
-	    <<1:1, 16#19:7,
-	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
-	start when Ver >= ?WSP_12 ->
-	    <<1:1, 16#0A:7,
-	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
-
-
-	'start-info' when Ver >= ?WSP_14 ->
-	    <<1:1, 16#1A:7,
-	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
-	'start-info' when Ver >= ?WSP_12 ->
-	    <<1:1, 16#0B:7,
-	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
-
-        comment when Ver >= ?WSP_14 ->
-	    <<1:1, 16#1B:7,
-	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
-	comment when Ver >= ?WSP_13 ->
-	    <<1:1, 16#0C:7,
-	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
-
-	domain when Ver >= ?WSP_14 ->
-	    <<1:1, 16#1C:7,
-	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
-	domain when Ver >= ?WSP_13 ->
-	    <<1:1, 16#0D:7,
-	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
-
-	'max-age' when Ver >= ?WSP_13 ->
-	    <<1:1, 16#0E:7,
-	     (encode_typed_field(Ver,'Delta-seconds-value',ParamValue))/binary>>;
-
-	path when Ver >= ?WSP_14 ->
-	    <<1:1, 16#1D:7,
-	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
-	path when Ver >= ?WSP_13 ->
-	    <<1:1, 16#0F:7,
-	     (encode_typed_field(Ver,'Text-string',ParamValue))/binary>>;
-
-	secure when Ver >= ?WSP_13 ->
-	    <<1:1, 16#10:7,
-	     (encode_typed_field(Ver,'No-value',ParamValue))/binary>>;
-	%% NOTE: "sec" and "mac" are really 1.4 features but used by 1.3 client provisioning 
-	%"sec" when Ver >= ?WSP_14 ->
-	sec when Ver >= ?WSP_13 ->
-	    <<1:1, 16#11:7,
-	     (encode_typed_field(Ver,'Short-integer',ParamValue))/binary>>;
-	%"mac" when Ver >= ?WSP_14 ->
-	mac when Ver >= ?WSP_13 ->
-	    <<1:1, 16#12:7,
-	     (encode_typed_field(Ver,'Text-value',ParamValue))/binary>>;
-	'creation-date' when Ver >= ?WSP_14 ->
-	    <<1:1, 16#13:7,
-	     (encode_typed_field(Ver,'Date-value',ParamValue))/binary>>;
-	'modification-date' when Ver >= ?WSP_14 ->
-	    <<1:1, 16#14:7,
-	     (encode_typed_field(Ver,'Date-value',ParamValue))/binary>>;
-	'read-date' when Ver >= ?WSP_14 ->
-	    <<1:1, 16#15:7,
-	     (encode_typed_field(Ver,'Date-value',ParamValue))/binary>>;
-	size when Ver >= ?WSP_14 ->
-	    <<1:1, 16#16:7,
-	     (encode_typed_field(Ver,'Integer-value',ParamValue))/binary>>;
-	_ ->
-	    <<(encode_text_string(ParamName))/binary,
-	      (encode_text_string(ParamValue))/binary >>
-   end.
-
-%% decode_parameter: return {ParameterName, ParamterValue}
-decode_parameter(<<1:1,Code:7,Data/binary>>, Version) ->
-    case Code of
-	16#00 ->
-	    {Val,Data1} = decode_typed_field('Q-value', Data, Version),
-	    {{ q, Val}, Data1};
-	
-	16#01 ->
-	    {Val,Data1} = decode_typed_field('Well-known-charset',Data,Version),
-	    {{charset, Val}, Data1};
-
-	16#02 ->
-	    {Val,Data1} = decode_typed_field('Version-value',Data,Version),
-	    {{level, Val}, Data1};
-
-	16#03 ->
-	    {Val,Data1} = decode_typed_field('Integer-value', Data,Version),
-	    {{type, Val}, Data1};
-
-	16#05 ->
-	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
-	    {{name, Val}, Data1};
-
-	16#06 ->
-	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
-	    {{filename, Val}, Data1};
-
-	16#07 ->
-	    {Val,Data1} = decode_typed_field('Field-name', Data,Version),
-	    {{differences, Val}, Data1};
-
-	16#08 ->
-	    {Val,Data1} = decode_typed_field('Short-integer', Data,Version),
-	    {{padding, Val}, Data1};
-
-	16#09 ->
-	    {Val,Data1} = decode_typed_field('Constrained-encoding', Data,Version),
-	    {{type, Val}, Data1};
-
-	16#0A ->
-	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
-	    {{start, Val}, Data1};
-
-	16#0B ->
-	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
-	    {{'start-info', Val}, Data1};
-
-	16#0C ->
-	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
-	    {{comment, Val}, Data1};
-
-	16#0D ->
-	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
-	    {{domain, Val}, Data1};
-
-	16#0E ->
-	    {Val,Data1} = decode_typed_field('Delta-seconds-value', Data,Version),
-	    {{'max-age', Val}, Data1};
-
-	16#0F ->
-	    {Val,Data1} = decode_typed_field('Text-string', Data,Version),
-	    {{path, Val}, Data1};
-
-	16#10 ->
-	    {Val,Data1} = decode_typed_field('No-value', Data,Version),
-	    {{secure, Val}, Data1};
-
-	16#11 ->
-	    {Val,Data1} = decode_typed_field('Short-integer', Data,Version),
-	    {{sec, Val}, Data1};
-
-	16#12 ->
-	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
-	    {{mac, Val}, Data1};
-
-	16#13 ->
-	    {Val,Data1} = decode_typed_field('Date-value', Data,Version),
-	    {{'creation-date', Val}, Data1};
-
-	16#14 ->
-	    {Val,Data1} = decode_typed_field('Date-value', Data,Version),
-	    {{'modification-date', Val}, Data1};
-
-	16#15 ->
-	    {Val,Data1} = decode_typed_field('Date-value', Data,Version),
-	    {{'read-date', Val}, Data1};
-
-	16#16 ->
-	    {Val,Data1} = decode_typed_field('Integer-value', Data,Version),
-	    {{size, Val}, Data1};
-
-	16#17 ->
-	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
-	    {{name, Val}, Data1};
-
-	16#18 ->
-	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
-	    {{filename, Val}, Data1};
-
-	16#19 ->
-	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
-	    {{start, Val}, Data1};
-
-	16#1A ->
-	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
-	    {{'start-info', Val}, Data1};
-
-	16#1B ->
-	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
-	    {{comment, Val}, Data1};
-
-	16#1C ->
-	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
-	    {{domain, Val}, Data1};
-
-	16#1D ->
-	    {Val,Data1} = decode_typed_field('Text-value', Data,Version),
-	    {{path, Val}, Data1};
-	_ ->
-	    exit({error, unknown_parameter})
-    end;
-decode_parameter(Data, _Version) ->
-    %% Untyped-parameter: Token-Text Untype-value
-    {ParamName,Data1} = d_text_string(Data),
-    %% Untype-value: Integer-Value | Text-Value!
-    {ParamValue, Data2} = decode_untyped_value(Data1),
-    {{ParamName,ParamValue}, Data2}.
-
-
-encode_typed_field(Ver,Type,Value) ->	
-    case Type of
-	'Well-known-charset' ->
-	    MIBenum = encode_charset(Value),
-	    encode_integer(MIBenum);
-
-	'Constrained-encoding' ->
-	    encode_constrained_media(Value, Ver);
-
-	'Text-string' ->
-	    encode_text_string(Value);
-
-	'Text-value' ->
-	    encode_text_value(Value);
-
-	'Short-integer' ->
-	    ?ENCODE_SHORT(Value);
-
-	'Date-value' ->
-	    e_date(Value);
-
-	'Delta-Seconds-value' ->
-	    e_delta_seconds(Value);
-	
-	'No-value' ->
-	    e_no_value(Value);
-	    
-	_ ->
-	    io:format("FIXME: encode_typed_field unsupported type = ~p\n",
-		      [Type]),
-	    exit({error,badtype})
-    end.
-
-
-decode_typed_field(Type, Data, Version) ->
-    case Type of
-	'Q-value' ->
-	    d_q_value(Data);
-
-	'Well-known-charset' ->
-	    {MIBenum, T100} = d_integer_value(Data),
-	    {decode_charset(MIBenum), T100};
-
-	'Constrained-encoding' ->
-	    {Value, Data1} = scan_header_data(Data),
-	    {decode_constrained_media(Value,Version), Data1};
-
-	'Text-string' ->
-	    d_text_string(Data);
-
-	'Text-value'  ->
-	    d_text_value(Data);
-
-	'Short-integer' -> 
-	    decode_short_integer(Data);
-
-	'Delta-seconds-value' ->
-	    d_integer_value(Data);
-
-	'Date-value' ->
-	    {Val, Data1} = decode_long_integer(Data),
-	    {d_date(Val), Data1};
-
-	'Field-name' ->
-	    d_field_name(Data);
-
-	'No-value' ->
-	    d_no_value(Data);
-
-	_ ->
-	    io:format("FIXME: unsupported type = ~p\n",[Type]),
-	    exit({error,badtype})
-    end.
-
-
-%% Integer-Value | Text-Value
-%% return as {Value, Tail}
-decode_untyped_value(<<1:1, Short:7, Tail/binary>>) ->
-    {Short, Tail};
-decode_untyped_value(<<0:3, Len:5, Data/binary>>) when Len =/= 31 ->
-    Sz = Len*8,
-    <<Long:Sz, Tail/binary>> = Data,
-    {Long, Tail};
-decode_untyped_value(Data) ->
-    d_text_string(Data).
-
-
-e_field_name(Value, Version) ->
-    case normalise_field_name(Value) of
-	'Accept' -> <<16#80>>;
-	'Accept-Charset' when Version >= ?WSP_13 -> <<16#bb>>;
-	'Accept-Charset' -> <<16#81>>;
-	'Accept-Encoding' when Version >= ?WSP_13 -> <<16#bc>>;
-	'Accept-Encoding' -> <<16#82>>;
-	'Accept-Language' -> <<16#83>>;
-	'Accept-Ranges' -> <<16#84>>;
-	'Age' -> <<16#85>>;
-	'Allow' -> <<16#86>>;
-	'Authorization' -> <<16#87>>;
-	'Cache-Control' when Version >= ?WSP_14 -> <<16#c7>>;
-	'Cache-Control' when Version >= ?WSP_13 -> <<16#bd>>;
-	'Cache-Control' -> <<16#88>>;
-	'Connection' -> <<16#89>>;
-	'Content-Base' -> <<16#8a>>;
-	'Content-Encoding' -> <<16#8b>>;
-	'Content-Language' -> <<16#8c>>;
-	'Content-Length' -> <<16#8d>>;
-	'Content-Location' -> <<16#8e>>;
-	'Content-Md5' -> <<16#8f>>;
-	'Content-Range' when Version >= ?WSP_13 -> <<16#be>>;
-	'Content-Range' -> <<16#90>>;
-	'Content-Type' -> <<16#91>>;
-	'Date' -> <<16#92>>;
-	'Etag' -> <<16#93>>;
-	'Expires' -> <<16#94>>;
-	'From' -> <<16#95>>;
-	'Host' -> <<16#96>>;
-	'If-Modified-Since' -> <<16#97>>;
-	'If-Match' -> <<16#98>>;
-	'If-None-Match' -> <<16#99>>;
-	'If-Range' -> <<16#9a>>;
-	'If-Unmodified-Since' -> <<16#9b>>;
-	'Location' -> <<16#9c>>;
-	'Last-Modified' -> <<16#9d>>;
-	'Max-Forwards' -> <<16#9e>>;
-	'Pragma' -> <<16#9f>>;
-	'Proxy-Authenticate' -> <<16#a0>>;
-	'Proxy-Authorization' -> <<16#a1>>;
-	'Public' -> <<16#a2>>;
-	'Range' -> <<16#a3>>;
-	'Referer' -> <<16#a4>>;
-	'Retry-After' -> <<16#a5>>;
-	'Server' -> <<16#a6>>;
-	'Transfer-Encoding' -> <<16#a7>>;
-	'Upgrade' -> <<16#a8>>;
-	'User-Agent' -> <<16#a9>>;
-	'Vary' -> <<16#aa>>;
-	'Via' -> <<16#ab>>;
-	'Warning' -> <<16#ac>>;
-	'Www-Authenticate' -> <<16#ad>>;
-	'Content-Disposition' when Version >= ?WSP_14 -> <<16#c5>>;
-	'Content-Disposition' -> <<16#ae>>;
-	%% VERSION > 1.1
-	'X-Wap-Application-Id' when Version >= ?WSP_12 -> <<16#af>>;
-	'X-Wap-Content-Uri' when Version >= ?WSP_12 -> <<16#b0>>;
-	'X-Wap-Initiator-Uri' when Version >= ?WSP_12 -> <<16#b1>>;
-	'Accept-Application' when Version >= ?WSP_12 -> <<16#b2>>;
-	'Bearer-Indication' when Version >= ?WSP_12 -> <<16#b3>>;
-	'Push-Flag' when Version >= ?WSP_12 -> <<16#b4>>;
-	'Profile' when Version >= ?WSP_12 -> <<16#b5>>;
-	'Profile-Diff' when Version >= ?WSP_12 -> <<16#b6>>;
-	'Profile-Warning' when Version >= ?WSP_12 -> <<16#b7>>;
-	'Expect' when Version >= ?WSP_15 -> <<16#c8>>;
-	'Expect' when Version >= ?WSP_13 -> <<16#b8>>;
-	'Te' when Version >= ?WSP_13 -> <<16#b9>>;
-	'Trailer' when Version >= ?WSP_13 -> <<16#ba>>;
-	'X-Wap-Tod' when Version >= ?WSP_13 -> <<16#bf>>;
-	'Content-Id' when Version >= ?WSP_13 -> <<16#c0>>;
-	'Set-Cookie' when Version >= ?WSP_13 -> <<16#c1>>;
-	'Cookie' when Version >= ?WSP_13 -> <<16#c2>>;
-	'Encoding-Version' when Version >= ?WSP_13 -> <<16#c3>>;
-	'Profile-Warning' when Version >= ?WSP_14 -> <<16#c4>>;
-	'X-Wap-Security' when Version >= ?WSP_14 -> <<16#c6>>;
-	'X-Wap-Loc-Invocation' when Version >= ?WSP_15 -> <<16#c9>>;
-	'X-Wap-Loc-Delivery' when Version >= ?WSP_15 -> <<16#ca>>;
-	Field -> encode_text_string(atom_to_list(Field))
-    end.
-    
-
-%%
-%% decode and normalise on form list_to_atom("Ulll-Ulll-Ull")
-%%
-normalise_field_name(Cs) when atom(Cs) -> 
-    Cs;
-normalise_field_name(Cs) ->
-    list_to_atom(normalise_fieldU(Cs)).
-
-normalise_fieldU([C|Cs]) when C >= $a, C =< $z ->
-    [(C-$a)+$A | normalise_fieldL(Cs)];
-normalise_fieldU([C|Cs]) -> [ C | normalise_fieldL(Cs)];
-normalise_fieldU([]) -> [].
-
-normalise_fieldL([C|Cs]) when C >= $A, C =< $Z ->
-    [(C-$A)+$a | normalise_fieldL(Cs)];
-normalise_fieldL([$-|Cs]) ->  [$- | normalise_fieldU(Cs)];
-normalise_fieldL([C|Cs]) ->   [C | normalise_fieldL(Cs)];
-normalise_fieldL([]) ->  [].
-
-
-tolower([C|Cs]) when C >= $A, C =< $Z ->
-    [(C-$A)+$a | tolower(Cs)];
-tolower([C|Cs]) ->  [C|tolower(Cs)];
-tolower([]) -> [].
-
-trim(Cs) ->
-    lists:reverse(trim1(lists:reverse(trim1(Cs)))).
-
-trim1([$\s|Cs]) -> trim1(Cs);
-trim1([$\t|Cs]) -> trim1(Cs);
-trim1([$\r|Cs]) -> trim1(Cs);
-trim1([$\n|Cs]) -> trim1(Cs);
-trim1(Cs) -> Cs.
-
-
-d_field_name(Data) ->
-    case scan_header_data(Data) of
-	{Code, Data1} when integer(Code) ->
-	    {lookup_field_name(Code), Data1};
-	{TmpField,Data1} when list(TmpField) ->
-	    {normalise_field_name(TmpField), Data1}
-    end.
-
-d_no_value(<<0, Data/binary>>) ->
-    {no_value, Data}.
-
-e_no_value(_) ->
-    <<0>>.
-
-
-lookup_field_name(Code) ->
-    case Code of
-%%% Version 1.1
-	16#00 -> 'Accept';
-	16#01 -> 'Accept-Charset';
-	16#02 -> 'Accept-Encoding';
-	16#03 -> 'Accept-Language';
-	16#04 -> 'Accept-Ranges';
-	16#05 -> 'Age';
-	16#06 -> 'Allow';
-	16#07 -> 'Authorization';
-	16#08 -> 'Cache-Control';
-	16#09 -> 'Connection';
-	16#0a -> 'Content-Base';
-	16#0b -> 'Content-Encoding';
-	16#0c -> 'Content-Language';
-	16#0d -> 'Content-Length';
-	16#0e -> 'Content-Location';
-	16#0f -> 'Content-Md5';
-	16#10 -> 'Content-Range';
-	16#11 -> 'Content-Type';
-	16#12 -> 'Date';
-	16#13 -> 'Etag';
-	16#14 -> 'Expires';
-	16#15 -> 'From';
-	16#16 -> 'Host';
-	16#17 -> 'If-Modified-Since';
-	16#18 -> 'If-Match';
-	16#19 -> 'If-None-Match';
-	16#1a -> 'If-Range';
-	16#1b -> 'If-Unmodified-Since';
-	16#1c -> 'Location';
-	16#1d -> 'Last-Modified';
-	16#1e -> 'Max-Forwards';
-	16#1f -> 'Pragma';
-	16#20 -> 'Proxy-Authenticate';
-	16#21 -> 'Proxy-Authorization';
-	16#22 -> 'Public';
-	16#23 -> 'Range';
-	16#24 -> 'Referer';
-	16#25 -> 'Retry-After';
-	16#26 -> 'Server';
-	16#27 -> 'Transfer-Encoding';
-	16#28 -> 'Upgrade';
-	16#29 -> 'User-Agent';
-	16#2a -> 'Vary';
-	16#2b -> 'Via';
-	16#2c -> 'Warning';
-	16#2d -> 'Www-Authenticate';
-	16#2e -> 'Content-Disposition';
-%%% Version 1.2
-	16#2f -> 'X-Wap-Application-Id';
-	16#30 -> 'X-Wap-Content-Uri';
-	16#31 -> 'X-Wap-Initiator-Uri';
-	16#32 -> 'Accept-Application';
-	16#33 -> 'Bearer-Indication';
-	16#34 -> 'Push-Flag';
-	16#35 -> 'Profile';
-	16#36 -> 'Profile-Diff';
-	16#37 -> 'Profile-Warning';
-%%% Version 1.3
-	16#38 -> 'Expect';
-	16#39 -> 'Te';
-	16#3a -> 'Trailer';
-	16#3b -> 'Accept-Charset';
-	16#3c -> 'Accept-Encoding';
-	16#3d -> 'Cache-Control';
-	16#3e -> 'Content-Range';
-	16#3f -> 'X-Wap-Tod';
-	16#40 -> 'Content-Id';
-	16#41 -> 'Set-Cookie';
-	16#42 -> 'Cookie';
-	16#43 -> 'Encoding-Version';
-%%% Version 1.4
-	16#44 -> 'Profile-Warning';
-	16#45 -> 'Content-Disposition';
-	16#46 -> 'X-Wap-Security';
-	16#47 -> 'Cache-Control';
-%%% Version 1.5
-	16#48 -> 'Expect';
-	16#49 -> 'X-Wap-Loc-Invocation';
-	16#4a -> 'X-Wap-Loc-Delivery';
-%% Unknown
-	_ -> 
-	    list_to_atom("X-Unknown-"++erlang:integer_to_list(Code, 16))
-    end.
-
-
-encode_charset(Charset) ->
-    %% FIXME: we should really resolve aliases as well
-    %% charset:from_aliases(Charset)
-    case charset:from_mime_name(Charset) of
-	0 -> exit({error, unknown_charset});
-	MIBenum	-> MIBenum
-    end.
-
-encode_language(Language) ->
-    Code = encode_lang(tolower(Language)),
-    <<Code>>.
-
-
-
-decode_charset(MIBenum) ->
-    case charset:to_mime_name(MIBenum) of
-	undefined ->
-	    exit({error, unknown_charset});
-	Preferred ->
-	    Preferred
-    end.
-
-%% ISO 639 Language Assignments, Appendix A, Table 41, Page 102-103
-decode_lang(Code) ->
-    case lookup_language(Code) of
-	[L|_] -> atom_to_list(L);
-	[] -> ""
-    end.
-	     
-	    
-lookup_language(Code) ->
-    case Code of
-	 16#01 -> ['aa','afar'];
-	 16#02 -> ['ab','abkhazian'];
-	 16#03 -> ['af','afrikans'];
-	 16#04 -> ['am','amharic'];
-	 16#05 -> ['ar','arabic'];
-	 16#06 -> ['as','assamese'];
-	 16#07 -> ['ay','aymara'];
-	 16#08 -> ['az','azerbaijani'];
-	 16#09 -> ['ba','bashkir'];
-	 16#0a -> ['be','byelorussian'];
-	 16#0b -> ['bg','bulgarian'];
-	 16#0c -> ['bh','bihari'];
-	 16#0d -> ['bi','bislama'];
-	 16#0e -> ['bn','bangla','bengali'];
-	 16#0f -> ['bo','tibetan'];
-	 16#10 -> ['br','breton'];
-	 16#11 -> ['ca','catalan'];
-	 16#12 -> ['co','corsican'];
-	 16#13 -> ['cs','czech'];
-	 16#14 -> ['cy','welsh'];
-	 16#15 -> ['da','danish'];
-	 16#16 -> ['de','german'];
-	 16#17 -> ['dz','bhutani'];
-	 16#18 -> ['el','greek'];
-	 16#19 -> ['en','english'];
-	 16#1a -> ['eo','esperanto'];
-	 16#1b -> ['es','spanish'];
-	 16#1c -> ['et','estonian'];
-	 16#1d -> ['eu','basque'];
-	 16#1e -> ['fa','persian'];
-	 16#1f -> ['fi','finnish'];
-	 16#20 -> ['fj','fiji'];
-	 16#82 -> ['fo','faeroese'];
-	 16#22 -> ['fr','french'];
-	 16#83 -> ['fy','frisian'];
-	 16#24 -> ['ga','irish'];
-	 16#25 -> ['gd','scots-gaelic'];
-	 16#26 -> ['gl','galician'];
-	 16#27 -> ['gn','guarani'];
-	 16#28 -> ['gu','gujarati'];
-	 16#29 -> ['ha','hausa'];
-	 16#2a -> ['he','hebrew'];
-	 16#2b -> ['hi','hindi'];
-	 16#2c -> ['hr','croatian'];
-	 16#2d -> ['hu','hungarian'];
-	 16#2e -> ['hy','armenian'];
-	 16#84 -> ['ia','interlingua'];
-	 16#30 -> ['id','indonesian'];
-	 16#86 -> ['ie','interlingue'];
-	 16#87 -> ['ik','inupiak'];
-	 16#33 -> ['is','icelandic'];
-	 16#34 -> ['it','italian'];
-	 16#89 -> ['iu','inuktitut'];
-	 16#36 -> ['ja','japanese'];
-	 16#37 -> ['jw','javanese'];
-	 16#38 -> ['ka','georgian'];
-	 16#39 -> ['kk','kazakh'];
-	 16#8a -> ['kl','greenlandic'];
-	 16#3b -> ['km','cambodian'];
-	 16#3c -> ['kn','kannada'];
-	 16#3d -> ['ko','korean'];
-	 16#3e -> ['ks','kashmiri'];
-	 16#3f -> ['ku','kurdish'];
-	 16#40 -> ['ky','kirghiz'];
-	 16#8b -> ['la','latin'];
-	 16#42 -> ['ln','lingala'];
-	 16#43 -> ['lo','laothian'];
-	 16#44 -> ['lt','lithuanian'];
-	 16#45 -> ['lv','lettish','latvian'];
-	 16#46 -> ['mg','malagese'];
-	 16#47 -> ['mi','maori'];
-	 16#48 -> ['mk','macedonian'];
-	 16#49 -> ['ml','malayalam'];
-	 16#4a -> ['mn','mongolian'];
-	 16#4b -> ['mo','moldavian'];
-	 16#4c -> ['mr','marathi'];
-	 16#4d -> ['ms','malay'];
-	 16#4e -> ['mt','maltese'];
-	 16#4f -> ['my','burmese'];
-	 16#81 -> ['na','nauru'];
-	 16#51 -> ['ne','nepali'];
-	 16#52 -> ['nl','dutch'];
-	 16#53 -> ['no','norwegian'];
-	 16#54 -> ['oc','occitan'];
-	 16#55 -> ['om','oromo'];
-	 16#56 -> ['or','oriya'];
-	 16#57 -> ['pa','punjabi'];
-	 16#58 -> ['po','polish'];
-	 16#59 -> ['ps','pushto','pashto'];
-	 16#5a -> ['pt','portugese'];
-	 16#5b -> ['qu','quechua'];
-	 16#8c -> ['rm','rhaeto-romance'];
-	 16#5d -> ['rn','kirundi'];
-	 16#5e -> ['ro','romanian'];
-	 16#5f -> ['ru','russian'];
-	 16#60 -> ['rw','kinyarwanda'];
-	 16#61 -> ['sa','sanskrit'];
-	 16#62 -> ['sd','sindhi'];
-	 16#63 -> ['sg','sangho'];
-	 16#64 -> ['sh','serbo-croatian'];
-	 16#65 -> ['si','sinhalese'];
-	 16#66 -> ['sk','slovak'];
-	 16#67 -> ['sl','slovenian'];
-	 16#68 -> ['sm','samoan'];
-	 16#69 -> ['sn','shona'];
-	 16#6a -> ['so','somali'];
-	 16#6b -> ['sq','albanian'];
-	 16#6c -> ['sr','serbian'];
-	 16#6d -> ['ss','siswati'];
-	 16#6e -> ['st','seshoto'];
-	 16#6f -> ['su','sundanese'];
-	 16#70 -> ['sv','swedish'];
-	 16#71 -> ['sw','swahili'];
-	 16#72 -> ['ta','tamil'];
-	 16#73 -> ['te','telugu'];
-	 16#74 -> ['tg','tajik'];
-	 16#75 -> ['th','thai'];
-	 16#76 -> ['ti','tigrinya'];
-	 16#77 -> ['tk','turkmen'];
-	 16#78 -> ['tl','tagalog'];
-	 16#79 -> ['tn','setswana'];
-	 16#7a -> ['to','tonga'];
-	 16#7b -> ['tr','turkish'];
-	 16#7c -> ['ts','tsonga'];
-	 16#7d -> ['tt','tatar'];
-	 16#7e -> ['tw','twi'];
-	 16#7f -> ['ug','uighur'];
-	 16#50 -> ['uk','ukrainian'];
-	 16#21 -> ['ur','urdu'];
-	 16#23 -> ['uz','uzbek'];
-	 16#2f -> ['vi','vietnamese'];
-	 16#85 -> ['vo','volapuk'];
-	 16#31 -> ['wo','wolof'];
-	 16#32 -> ['xh','xhosa'];
-	 16#88 -> ['yi','yiddish'];
-	 16#35 -> ['yo','yoruba'];
-	 16#3a -> ['za','zhuang'];
-	 16#41 -> ['zh','chinese'];
-	16#5c -> ['zu','zulu'];
-	_ -> []
-    end.
-
-encode_lang(Language) ->
-    case tolower(Language) of
-	"aa" -> 16#01;
-	"afar" -> 16#01;
-	"ab" -> 16#02;
-	"abkhazian" -> 16#02;
-	"af" -> 16#03;
-	"afrikans" -> 16#03;
-	"am" -> 16#04;
-	"amharic" -> 16#04;
-	"ar" -> 16#05;
-	"arabic" -> 16#05;
-	"as" -> 16#06;
-	"assamese" -> 16#06;
-	"ay" -> 16#07;
-	"aymara" -> 16#07;
-	"az" -> 16#08;
-	"azerbaijani" -> 16#08;
-	"ba" -> 16#09;
-	"bashkir" -> 16#09;
-	"be" -> 16#0a;
-	"byelorussian" -> 16#0a;
-	"bg" -> 16#0b;
-	"bulgarian" -> 16#0b;
-	"bh" -> 16#0c;
-	"bihari" -> 16#0c;
-	"bi" -> 16#0d;
-	"bislama" -> 16#0d;
-	"bn" -> 16#0e;
-	"bangla" -> 16#0e;
-	"bengali" -> 16#0e;
-	"bo" -> 16#0f;
-	"tibetan" -> 16#0f;
-	"br" -> 16#10;
-	"breton" -> 16#10;
-	"ca" -> 16#11;
-	"catalan" -> 16#11;
-	"co" -> 16#12;
-	"corsican" -> 16#12;
-	"cs" -> 16#13;
-	"czech" -> 16#13;
-	"cy" -> 16#14;
-	"welsh" -> 16#14;
-	"da" -> 16#15;
-	"danish" -> 16#15;
-	"de" -> 16#16;
-	"german" -> 16#16;
-	"dz" -> 16#17;
-	"bhutani" -> 16#17;
-	"el" -> 16#18;
-	"greek" -> 16#18;
-	"en" -> 16#19;
-	"english" -> 16#19;
-	"eo" -> 16#1a;
-	"esperanto" -> 16#1a;
-	"es" -> 16#1b;
-	"spanish" -> 16#1b;
-	"et" -> 16#1c;
-	"estonian" -> 16#1c;
-	"eu" -> 16#1d;
-	"basque" -> 16#1d;
-	"fa" -> 16#1e;
-	"persian" -> 16#1e;
-	"fi" -> 16#1f;
-	"finnish" -> 16#1f;
-	"fj" -> 16#20;
-	"fiji" -> 16#20;
-	"fo" -> 16#82;
-	"faeroese" -> 16#82;
-	"fr" -> 16#22;
-	"french" -> 16#22;
-	"fy" -> 16#83;
-	"frisian" -> 16#83;
-	"ga" -> 16#24;
-	"irish" -> 16#24;
-	"gd" -> 16#25;
-	"scots-gaelic" -> 16#25;
-	"gl" -> 16#26;
-	"galician" -> 16#26;
-	"gn" -> 16#27;
-	"guarani" -> 16#27;
-	"gu" -> 16#28;
-	"gujarati" -> 16#28;
-	"ha" -> 16#29;
-	"hausa" -> 16#29;
-	"he" -> 16#2a;
-	"hebrew" -> 16#2a;
-	"hi" -> 16#2b;
-	"hindi" -> 16#2b;
-	"hr" -> 16#2c;
-	"croatian" -> 16#2c;
-	"hu" -> 16#2d;
-	"hungarian" -> 16#2d;
-	"hy" -> 16#2e;
-	"armenian" -> 16#2e;
-	"ia" -> 16#84;
-	"interlingua" -> 16#84;
-	"id" -> 16#30;
-	"indonesian" -> 16#30;
-	"ie" -> 16#86;
-	"interlingue" -> 16#86;
-	"ik" -> 16#87;
-	"inupiak" -> 16#87;
-	"is" -> 16#33;
-	"icelandic" -> 16#33;
-	"it" -> 16#34;
-	"italian" -> 16#34;
-	"iu" -> 16#89;
-	"inuktitut" -> 16#89;
-	"ja" -> 16#36;
-	"japanese" -> 16#36;
-	"jw" -> 16#37;
-	"javanese" -> 16#37;
-	"ka" -> 16#38;
-	"georgian" -> 16#38;
-	"kk" -> 16#39;
-	"kazakh" -> 16#39;
-	"kl" -> 16#8a;
-	"greenlandic" -> 16#8a;
-	"km" -> 16#3b;
-	"cambodian" -> 16#3b;
-	"kn" -> 16#3c;
-	"kannada" -> 16#3c;
-	"ko" -> 16#3d;
-	"korean" -> 16#3d;
-	"ks" -> 16#3e;
-	"kashmiri" -> 16#3e;
-	"ku" -> 16#3f;
-	"kurdish" -> 16#3f;
-	"ky" -> 16#40;
-	"kirghiz" -> 16#40;
-	"la" -> 16#8b;
-	"latin" -> 16#8b;
-	"ln" -> 16#42;
-	"lingala" -> 16#42;
-	"lo" -> 16#43;
-	"laothian" -> 16#43;
-	"lt" -> 16#44;
-	"lithuanian" -> 16#44;
-	"lv" -> 16#45;
-	"lettish" -> 16#45;
-	"latvian" -> 16#45;
-	"mg" -> 16#46;
-	"malagese" -> 16#46;
-	"mi" -> 16#47;
-	"maori" -> 16#47;
-	"mk" -> 16#48;
-	"macedonian" -> 16#48;
-	"ml" -> 16#49;
-	"malayalam" -> 16#49;
-	"mn" -> 16#4a;
-	"mongolian" -> 16#4a;
-	"mo" -> 16#4b;
-	"moldavian" -> 16#4b;
-	"mr" -> 16#4c;
-	"marathi" -> 16#4c;
-	"ms" -> 16#4d;
-	"malay" -> 16#4d;
-	"mt" -> 16#4e;
-	"maltese" -> 16#4e;
-	"my" -> 16#4f;
-	"burmese" -> 16#4f;
-	"na" -> 16#81;
-	"nauru" -> 16#81;
-	"ne" -> 16#51;
-	"nepali" -> 16#51;
-	"nl" -> 16#52;
-	"dutch" -> 16#52;
-	"no" -> 16#53;
-	"norwegian" -> 16#53;
-	"oc" -> 16#54;
-	"occitan" -> 16#54;
-	"om" -> 16#55;
-	"oromo" -> 16#55;
-	"or" -> 16#56;
-	"oriya" -> 16#56;
-	"pa" -> 16#57;
-	"punjabi" -> 16#57;
-	"po" -> 16#58;
-	"polish" -> 16#58;
-	"ps" -> 16#59;
-	"pushto" -> 16#59;
-	"pt" -> 16#5a;
-	"portugese" -> 16#5a;
-	"qu" -> 16#5b;
-	"quechua" -> 16#5b;
-	"rm" -> 16#8c;
-	"rhaeto-romance" -> 16#8c;
-	"rn" -> 16#5d;
-	"kirundi" -> 16#5d;
-	"ro" -> 16#5e;
-	"romanian" -> 16#5e;
-	"ru" -> 16#5f;
-	"russian" -> 16#5f;
-	"rw" -> 16#60;
-	"kinyarwanda" -> 16#60;
-	"sa" -> 16#61;
-	"sanskrit" -> 16#61;
-	"sd" -> 16#62;
-	"sindhi" -> 16#62;
-	"sg" -> 16#63;
-	"sangho" -> 16#63;
-	"sh" -> 16#64;
-	"serbo-croatian" -> 16#64;
-	"si" -> 16#65;
-	"sinhalese" -> 16#65;
-	"sk" -> 16#66;
-	"slovak" -> 16#66;
-	"sl" -> 16#67;
-	"slovenian" -> 16#67;
-	"sm" -> 16#68;
-	"samoan" -> 16#68;
-	"sn" -> 16#69;
-	"shona" -> 16#69;
-	"so" -> 16#6a;
-	"somali" -> 16#6a;
-	"sq" -> 16#6b;
-	"albanian" -> 16#6b;
-	"sr" -> 16#6c;
-	"serbian" -> 16#6c;
-	"ss" -> 16#6d;
-	"siswati" -> 16#6d;
-	"st" -> 16#6e;
-	"seshoto" -> 16#6e;
-	"su" -> 16#6f;
-	"sundanese" -> 16#6f;
-	"sv" -> 16#70;
-	"swedish" -> 16#70;
-	"sw" -> 16#71;
-	"swahili" -> 16#71;
-	"ta" -> 16#72;
-	"tamil" -> 16#72;
-	"te" -> 16#73;
-	"telugu" -> 16#73;
-	"tg" -> 16#74;
-	"tajik" -> 16#74;
-	"th" -> 16#75;
-	"thai" -> 16#75;
-	"ti" -> 16#76;
-	"tigrinya" -> 16#76;
-	"tk" -> 16#77;
-	"turkmen" -> 16#77;
-	"tl" -> 16#78;
-	"tagalog" -> 16#78;
-	"tn" -> 16#79;
-	"setswana" -> 16#79;
-	"to" -> 16#7a;
-	"tonga" -> 16#7a;
-	"tr" -> 16#7b;
-	"turkish" -> 16#7b;
-	"ts" -> 16#7c;
-	"tsonga" -> 16#7c;
-	"tt" -> 16#7d;
-	"tatar" -> 16#7d;
-	"tw" -> 16#7e;
-	"twi" -> 16#7e;
-	"ug" -> 16#7f;
-	"uighur" -> 16#7f;
-	"uk" -> 16#50;
-	"ukrainian" -> 16#50;
-	"ur" -> 16#21;
-	"urdu" -> 16#21;
-	"uz" -> 16#23;
-	"uzbek" -> 16#23;
-	"vi" -> 16#2f;
-	"vietnamese" -> 16#2f;
-	"vo" -> 16#85;
-	"volapuk" -> 16#85;
-	"wo" -> 16#31;
-	"wolof" -> 16#31;
-	"xh" -> 16#32;
-	"xhosa" -> 16#32;
-	"yi" -> 16#88;
-	"yiddish" -> 16#88;
-	"yo" -> 16#35;
-	"yoruba" -> 16#35;
-	"za" -> 16#3a;
-	"zhuang" -> 16#3a;
-	"zh" -> 16#41;
-	"chinese" -> 16#41;
-	"zu" -> 16#5c;
-	"zulu" -> 16#5c
-    end.
-
-
-%% Push Application ID Assignments
-%% 
-%% Assingment are found at http://www.wapforum.org/wina/push-app-id.htm
-%% 
-decode_push_application({short,Data}) ->
-    decode_push_application(d_long(Data));
-
-decode_push_application(Code) when integer(Code) ->
-    case Code of
-	16#00 ->    "x-wap-application:*";
-	16#01 ->    "x-wap-application:push.sia";
-	16#02 ->    "x-wap-application:wml.ua";
-	16#03 ->    "x-wap-application:wta.ua";
-	16#04 ->    "x-wap-application:mms.ua";
-	16#05 ->    "x-wap-application:push.syncml";
-	16#06 ->    "x-wap-application:loc.ua";
-	16#07 ->    "x-wap-application:syncml.dm";
-	16#08 ->    "x-wap-application:drm.ua";
-	16#09 ->    "x-wap-application:emn.ua";
-	16#0A ->    "x-wap-application:wv.ua";
-	16#8000 ->  "x-wap-microsoft:localcontent.ua";
-	16#8001 ->  "x-wap-microsoft:IMclient.ua";
-	16#8002 ->  "x-wap-docomo:imode.mail.ua";
-	16#8003 ->  "x-wap-docomo:imode.mr.ua";
-	16#8004 ->  "x-wap-docomo:imode.mf.ua";
-	16#8005 ->  "x-motorola:location.ua";
-	16#8006 ->  "x-motorola:now.ua";
-	16#8007 ->  "x-motorola:otaprov.ua";
-	16#8008 ->  "x-motorola:browser.ua";
-	16#8009 ->  "x-motorola:splash.ua";
-	16#800B ->  "x-wap-nai:mvsw.command";
-	16#8010 ->  "x-wap-openwave:iota.ua"
-    end;
-decode_push_application(App) when list(App) ->
-    App.
-
-
-	    
-encode_push_application(App) ->
-    case App of
-	"x-wap-application:*" -> ?ENCODE_SHORT(16#00);
-	"x-wap-application:push.sia" -> ?ENCODE_SHORT(16#01);
-	"x-wap-application:wml.ua" -> ?ENCODE_SHORT(16#02);
-	"x-wap-application:wta.ua" -> ?ENCODE_SHORT(16#03);
-	"x-wap-application:mms.ua" -> ?ENCODE_SHORT(16#04);
-	"x-wap-application:push.syncml" -> ?ENCODE_SHORT(16#05);
-	"x-wap-application:loc.ua" -> ?ENCODE_SHORT(16#06);
-	"x-wap-application:syncml.dm" -> ?ENCODE_SHORT(16#07);
-	"x-wap-application:drm.ua" -> ?ENCODE_SHORT(16#08);
-	"x-wap-application:emn.ua" -> ?ENCODE_SHORT(16#09);
-	"x-wap-application:wv.ua" -> ?ENCODE_SHORT(16#0A);
-	"x-wap-microsoft:localcontent.ua" -> encode_integer(16#8000);
-	"x-wap-microsoft:IMclient.ua" -> encode_integer(16#8001);
-	"x-wap-docomo:imode.mail.ua" -> encode_integer(16#8002);
-	"x-wap-docomo:imode.mr.ua" -> encode_integer(16#8003);
-	"x-wap-docomo:imode.mf.ua" -> encode_integer(16#8004);
-	"x-motorola:location.ua" -> encode_integer(16#8005);
-	"x-motorola:now.ua" -> encode_integer(16#8006);
-	"x-motorola:otaprov.ua" -> encode_integer(16#8007);
-	"x-motorola:browser.ua" -> encode_integer(16#8008);
-	"x-motorola:splash.ua" -> encode_integer(16#8009);
-	"x-wap-nai:mvsw.command" -> encode_integer(16#800B);
-	"x-wap-openwave:iota.ua" -> encode_integer(16#8010);
-	_ -> encode_uri_value(App)
-    end.
-
-
-
-
-%% WSP 8.5 Multipart handling 
-
-encode_multipart(Entries) ->
-    encode_multipart(Entries, ?WSP_DEFAULT_VERSION).
-
-encode_multipart([], _Version) ->
-    <<>>;
-encode_multipart(Entries, Version) ->
-    EncEntries = encode_multipart_entries(Entries, Version),
-    <<(e_uintvar(length(Entries)))/binary, EncEntries/binary >>.
-
-encode_multipart_entries(Entries, Version) ->
-    encode_multipart_entries(Entries, Version, []).
-
-encode_multipart_entries([], _Version, Acc) ->
-    list_to_binary(lists:reverse(Acc));
-encode_multipart_entries([Entry|T], Version, Acc) ->
-    EncEntry = encode_multipart_entry(Entry, Version),
-    encode_multipart_entries(T, Version, [EncEntry | Acc]).
-
-encode_multipart_entry(Entry, Version) ->
-    #wsp_multipart_entry { content_type = ContentType,
-			   headers = Headers,
-			   data = Data } = Entry,
-    EncContentType = encode_content_type(ContentType,Version),
-    EncHeaders = encode_headers(Headers, Version),
-    EncHeadersLength = e_uintvar(size(EncContentType)+size(EncHeaders)),
-    DataLen = e_uintvar(size(Data)),
-    <<EncHeadersLength/binary, 
-     DataLen/binary,
-     EncContentType/binary,
-     EncHeaders/binary, 
-     Data/binary>>.
-
-
-decode_multipart(Data) ->
-    decode_multipart(Data, ?WSP_DEFAULT_VERSION).
-    
-decode_multipart(<<>>, _Version) ->
-    {[], <<>>};
-decode_multipart(Data, Version) ->
-    {Entries, Data1} = d_uintvar(Data),
-    decode_multipart_entries(Entries, Data1, Version).
-
-decode_multipart_entries(Entries, Data, Version) ->
-    decode_multipart_entries(Entries, Data, Version, []).
-
-decode_multipart_entries(0, Data, _Version, Acc) ->
-    {lists:reverse(Acc), Data};
-decode_multipart_entries(Entries, Data, Version, Acc) ->
-    {MultiPartEntry, Data1} = decode_multipart_entry(Data,Version),
-    decode_multipart_entries(Entries-1, Data1, Version, [MultiPartEntry|Acc]).
-
-decode_multipart_entry(Data, Version) ->
-    {HeadersLen, Data1} = d_uintvar(Data),
-    {DataLen, Data2} = d_uintvar(Data1),
-    {FieldData,Data3} = scan_header_data(Data2),
-    ContentType = decode_content_type(FieldData, Version),
-    BinHeadersLen = (HeadersLen-(size(Data2)-size(Data3))),
-    <<BinHeaders:BinHeadersLen/binary,Data4/binary>> = Data3,
-    Headers = decode_headers(BinHeaders, Version),
-    <<ValueData:DataLen/binary, Data5/binary>> = Data4,
-    {#wsp_multipart_entry{content_type=ContentType,
-			  headers=Headers,
-			  data=ValueData},Data5}.
-
-
-parse_credentials(Field, Value) ->
-    %% FIXME
-    ?WH(Field, Value, []).
-
-format_credentials("basic", [User,Password]) ->
-    ["Basic ", base64:encode(User++":"++Password)];
-format_credentials(Scheme, Params) ->
-    [Scheme, format_params(Params)].
-
-encode_credentials("basic", [User,Password], _Version) ->
-    e_value(?ENCODE_SHORT(0),
-	    encode_text_string(User),
-	    encode_text_string(Password));
-encode_credentials(Scheme, Params, Version) ->
-    e_value(encode_text_string(Scheme), encode_params(Params, Version)).
-
-decode_credentials(Field, Data, Version) ->
-    case scan_header_data(Data) of
-	{0, Data0} ->
-	    {User,Data1} = d_text_string(Data0),
-	    {Password,_Data2} = d_text_string(Data1),
-	    ?WH(Field, "basic", [User,Password]);
-	{Scheme, Data0} when list(Scheme) ->
-	    Params = decode_params(Data0, Version),
-	    ?WH(Field, Scheme, Params)
-    end.
-
-%%
-%% Challenge: Basic Realm-value | Auth-Scheme Realm *Auth-Params
-%%
-
-parse_challenge(Field, Value) ->
-    %% FIXME
-    ?WH(Field, Value, []).
-
-format_challenge({"basic",Realm}, []) ->
-    ["Basic ", Realm];
-format_challenge({Scheme,Realm}, Params) ->
-    [Scheme," ",Realm, format_params(Params)].
-
-encode_challenge({"basic",Realm}, [], _Version) ->
-    e_value(?ENCODE_SHORT(0),
-	    encode_text_string(Realm));
-encode_challenge({Scheme,Realm}, Params, Version) ->
-    e_value(encode_text_string(Scheme),
-	    encode_text_string(Realm), 
-	    encode_params(Params, Version)).
-
-decode_challenge(Field, Data, Version) ->
-    case scan_header_data(Data) of
-	{0, Data0} ->
-	    {Realm,_} = d_text_string(Data0),
-	    ?WH(Field, {"basic", Realm}, []);
-	{Scheme, Data0} when list(Scheme) ->
-	    {Realm,_} = d_text_string(Data0),	    
-	    Params = decode_params(Data0, Version),
-	    ?WH(Field, {Scheme,Realm}, Params)
-    end.
-    
-
-parse_well_known_method(Value) ->
-    case Value of
-	"GET" ->  'GET';
-	"OPTIONS" -> 'OPTIONS';
-	"HEAD" -> 'HEAD';
-	"DELETE" -> 'DELETE';
-	"TRACE" -> 'TRACE';
-	"POST" -> 'POST';
-	"PUT" -> 'PUT'
-    end.    
-
-encode_well_known_method(Value, _Version) ->
-    case Value of
-	'GET'     -> ?ENCODE_SHORT(16#40);
-	'OPTIONS' -> ?ENCODE_SHORT(16#41);
-	'HEAD'    -> ?ENCODE_SHORT(16#42);
-	'DELETE'  -> ?ENCODE_SHORT(16#43);
-	'TRACE'   -> ?ENCODE_SHORT(16#44);
-	'POST'    -> ?ENCODE_SHORT(16#60);
-	'PUT'     -> ?ENCODE_SHORT(16#61)
-    end.
-
-decode_well_known_method(Value, _Version) ->
-    case Value of
-	16#40 -> 'GET';
-	16#41 -> 'OPTIONS';
-	16#42 -> 'HEAD';
-	16#43 -> 'DELETE';
-	16#44 -> 'TRACE';
-	16#60 -> 'POST';
-	16#61 -> 'PUT'
-    end.    
-
-
-
-%%
-%% WSP Table 36. Status Code Assignments
-%%
-
-encode_status_code(Status) ->
-    case Status of
-	100 -> 16#10; %% 'Continue'
-	101 -> 16#11; %% 'Switching Protocols'
-	200 -> 16#20; %% 'OK, Success'
-	201 -> 16#21; %% 'Created'
-	202 -> 16#22; %% 'Accepted'
-	203 -> 16#23; %% 'Non-Authoritative Information'
-	204 -> 16#24; %% 'No Content'
-	205 -> 16#25; %% 'Reset Content'
-	206 -> 16#26; %% 'Partial Content'
-	300 -> 16#30; %% 'Multiple Choices'
-	301 -> 16#31; %% 'Moved Permanently'
-	302 -> 16#32; %% 'Moved temporarily'
-	303 -> 16#33; %% 'See Other'
-	304 -> 16#34; %% 'Not modified'
-	305 -> 16#35; %% 'Use Proxy'
-	306 -> 16#36; %% '(reserved)'
-	307 -> 16#37; %% 'Temporary Redirect'
-	400 -> 16#40; %% 'Bad Request - server could not understand request'
-	401 -> 16#41; %% 'Unauthorized'
-	402 -> 16#42; %% 'Payment required'
-	403 -> 16#43; %% 'Forbidden operation is understood but refused'
-	404 -> 16#44; %% 'Not Found'
-	405 -> 16#45; %% 'Method not allowed'
-	406 -> 16#46; %% 'Not Acceptable'
-	407 -> 16#47; %% 'Proxy Authentication required'
-	408 -> 16#48; %% 'Request Timeout'
-	409 -> 16#49; %% 'Conflict'
-	410 -> 16#4A; %% 'Gone'
-	411 -> 16#4B; %% 'Length Required'
-	412 -> 16#4C; %% 'Precondition failed'
-	413 -> 16#4D; %% 'Request entity too large'
-	414 -> 16#4E; %% 'Request-URI too large'
-	415 -> 16#4F; %% 'Unsupported media type'
-	416 -> 16#50; %% 'Requested Range Not Satisfiable'
-	417 -> 16#51; %% 'Expectation Failed'
-	500 -> 16#60; %% 'Internal Server Error'
-	501 -> 16#61; %% 'Not Implemented'
-	502 -> 16#62; %% 'Bad Gateway'
-	503 -> 16#63; %% 'Service Unavailable'
-	504 -> 16#64; %% 'Gateway Timeout'
-	505 -> 16#65  %% 'HTTP version not supported'
-    end.
-
-
-decode_status_code(StatusCode) ->
-    case StatusCode of
-	16#10 -> 100; %% 'Continue'
-	16#11 -> 101; %% 'Switching Protocols'
-	16#20 -> 200; %% 'OK, Success'
-	16#21 -> 201; %% 'Created'
-	16#22 -> 202; %% 'Accepted'
-	16#23 -> 203; %% 'Non-Authoritative Information'
-	16#24 -> 204; %% 'No Content'
-	16#25 -> 205; %% 'Reset Content'
-	16#26 -> 206; %% 'Partial Content'
-	16#30 -> 300; %% 'Multiple Choices'
-	16#31 -> 301; %% 'Moved Permanently'
-	16#32 -> 302; %% 'Moved temporarily'
-	16#33 -> 303; %% 'See Other'
-	16#34 -> 304; %% 'Not modified'
-	16#35 -> 305; %% 'Use Proxy'
-	16#36 -> 306; %% '(reserved)'
-	16#37 -> 307; %% 'Temporary Redirect'
-	16#40 -> 400; %% 'Bad Request - server could not understand request'
-	16#41 -> 401; %% 'Unauthorized'
-	16#42 -> 402; %% 'Payment required'
-	16#43 -> 403; %% 'Forbidden operation is understood but refused'
-	16#44 -> 404; %% 'Not Found'
-	16#45 -> 405; %% 'Method not allowed'
-	16#46 -> 406; %% 'Not Acceptable'
-	16#47 -> 407; %% 'Proxy Authentication required'
-	16#48 -> 408; %% 'Request Timeout'
-	16#49 -> 409; %% 'Conflict'
-	16#4A -> 410; %% 'Gone'
-	16#4B -> 411; %% 'Length Required'
-	16#4C -> 412; %% 'Precondition failed'
-	16#4D -> 413; %% 'Request entity too large'
-	16#4E -> 414; %% 'Request-URI too large'
-	16#4F -> 415; %% 'Unsupported media type'
-	16#50 -> 416; %% 'Requested Range Not Satisfiable'
-	16#51 -> 417; %% 'Expectation Failed'
-	16#60 -> 500; %% 'Internal Server Error'
-	16#61 -> 501; %% 'Not Implemented'
-	16#62 -> 502; %% 'Bad Gateway'
-	16#63 -> 503; %% 'Service Unavailable'
-	16#64 -> 504; %% 'Gateway Timeout'
-	16#65 -> 505  %% 'HTTP version not supported'
-    end.
-
-
-%%
-%% Content Type Assignments
-%% 
-%% Assingment are found at http://www.wapforum.org/wina/wsp-content-type.htm
-%% 
-%%
-%% string(Version, ContentType) -> Code
-%%
-encode_well_known_media(ContentType, Version) ->
-    case ContentType of
-	%% WSP_REGISTERED_CONTENT_TYPES
-	"application/vnd.uplanet.cacheop-wbxml" -> 
-	    encode_integer(16#0201);
-	"application/vnd.uplanet.signal" -> 
-	    encode_integer(16#0202);
-	"application/vnd.uplanet.alert-wbxml" ->
-	    encode_integer(16#0203);
-	"application/vnd.uplanet.list-wbxml" ->
-	    encode_integer(16#0204);
-	"application/vnd.uplanet.listcmd-wbxml" ->
-	    encode_integer(16#0205);
-	"application/vnd.uplanet.channel-wbxml" ->
-	    encode_integer(16#0206);
-	"application/vnd.uplanet.provisioning-status-uri" ->
-	    encode_integer(16#0207);
-	"x-wap.multipart/vnd.uplanet.header-set" ->
-	    encode_integer(16#0208);
-	"application/vnd.uplanet.bearer-choice-wbxml" ->
-	    encode_integer(16#0209);
-	"application/vnd.phonecom.mmc-wbxml" ->
-	    encode_integer(16#020A);
-	"application/vnd.nokia.syncset+wbxml" ->
-	    encode_integer(16#020B);
-	"image/x-up-wpng" -> 
-	    encode_integer(16#020C);
-	_ ->
-	    encode_constrained_media(ContentType, Version)
-    end.
-
-    
-encode_constrained_media(ContentType, Version) ->
-    case ContentType of
-	"*/*"    -> ?ENCODE_SHORT(16#00);
-	"text/*" -> ?ENCODE_SHORT(16#01);
-	"text/html" -> ?ENCODE_SHORT(16#02);
-	"text/plain" -> ?ENCODE_SHORT(16#03);
-	"text/x-hdml" -> ?ENCODE_SHORT(16#04);
-	"text/x-ttml" -> ?ENCODE_SHORT(16#05);
-	"text/x-vcalendar" -> ?ENCODE_SHORT(16#06);
-	"text/x-vcard" -> ?ENCODE_SHORT(16#07);
-	"text/vnd.wap.wml" -> ?ENCODE_SHORT(16#08);
-	"text/vnd.wap.wmlscript" -> ?ENCODE_SHORT(16#09);
-	"text/vnd.wap.wta-event" -> ?ENCODE_SHORT(16#0A);
-	"multipart/*" -> ?ENCODE_SHORT(16#0B);
-	"multipart/mixed" -> ?ENCODE_SHORT(16#0C);
-	"multipart/form-data" -> ?ENCODE_SHORT(16#0D);
-	"multipart/byterantes" -> ?ENCODE_SHORT(16#0E);
-	"multipart/alternative" -> ?ENCODE_SHORT(16#0F);
-	"application/*" -> ?ENCODE_SHORT(16#10);
-	"application/java-vm" -> ?ENCODE_SHORT(16#11);
-	"application/x-www-form-urlencoded" -> ?ENCODE_SHORT(16#12);
-	"application/x-hdmlc" -> ?ENCODE_SHORT(16#13);
-	"application/vnd.wap.wmlc" -> ?ENCODE_SHORT(16#14);
-	"application/vnd.wap.wmlscriptc" -> ?ENCODE_SHORT(16#15);
-	"application/vnd.wap.wta-eventc" -> ?ENCODE_SHORT(16#16);
-	"application/vnd.wap.uaprof" -> ?ENCODE_SHORT(16#17);
-	"application/vnd.wap.wtls-ca-certificate" -> ?ENCODE_SHORT(16#18);
-	"application/vnd.wap.wtls-user-certificate" -> ?ENCODE_SHORT(16#19);
-	"application/x-x509-ca-cert" -> ?ENCODE_SHORT(16#1A);
-	"application/x-x509-user-cert" -> ?ENCODE_SHORT(16#1B);
-	"image/*" -> ?ENCODE_SHORT(16#1C);
-	"image/gif" -> ?ENCODE_SHORT(16#1D);
-	"image/jpeg" -> ?ENCODE_SHORT(16#1E);
-	"image/tiff" -> ?ENCODE_SHORT(16#1F);
-	"image/png" -> ?ENCODE_SHORT(16#20);
-	"image/vnd.wap.wbmp" -> ?ENCODE_SHORT(16#21);
-	"application/vnd.wap.multipart.*" -> ?ENCODE_SHORT(16#22);
-	"application/vnd.wap.multipart.mixed" -> ?ENCODE_SHORT(16#23);
-	"application/vnd.wap.multipart.form-data" -> ?ENCODE_SHORT(16#24);
-	"application/vnd.wap.multipart.byteranges" -> ?ENCODE_SHORT(16#25);
-	"application/vnd.wap.multipart.alternative" -> ?ENCODE_SHORT(16#26);
-	"application/xml" -> ?ENCODE_SHORT(16#27);
-	"text/xml" -> ?ENCODE_SHORT(16#28);
-	"application/vnd.wap.wbxml" -> ?ENCODE_SHORT(16#29);
-	"application/x-x968-cross-cert" -> ?ENCODE_SHORT(16#2A);
-	"application/x-x968-ca-cert" -> ?ENCODE_SHORT(16#2B);
-	"application/x-x968-user-cert" -> ?ENCODE_SHORT(16#2C);
-
-	%% WAP Version 1.2
-	"text/vnd.wap.si" when Version >= ?WSP_12 ->
-	    ?ENCODE_SHORT(16#2D);
-	"application/vnd.wap.sic" when Version >= ?WSP_12 ->
-	    ?ENCODE_SHORT(16#2E);
-	"text/vnd.wap.sl" when Version >= ?WSP_12 ->
-	    ?ENCODE_SHORT(16#2F);
-	"application/vnd.wap.slc" when Version >= ?WSP_12 ->
-	    ?ENCODE_SHORT(16#30);
-	"text/vnd.wap.co" when Version >= ?WSP_12 ->
-	    ?ENCODE_SHORT(16#31);
-	"application/vnd.wap.coc" when Version >= ?WSP_12 ->
-	    ?ENCODE_SHORT(16#32);
-	"application/vnd.wap.multipart.related" when Version >= ?WSP_12 ->
-	    ?ENCODE_SHORT(16#33);
-	"application/vnd.wap.sia" when Version >= ?WSP_12 ->
-	    ?ENCODE_SHORT(16#34);
-	%% WAP Version 1.3
-	"text/vnd.wap.connectivity-xml" when Version >= ?WSP_13 ->
-	    ?ENCODE_SHORT(16#35);
-	"application/vnd.wap.connectivity-wbxml" when Version >= ?WSP_13 ->
-	    ?ENCODE_SHORT(16#36);
-	%% WAP Version 1.4
-	"application/pkcs7-mime" when Version >= ?WSP_14 -> 
-	    ?ENCODE_SHORT(16#37);
-	"application/vnd.wap.hashed-certificate" when Version >= ?WSP_14 ->
-	    ?ENCODE_SHORT(16#38);
-	"application/vnd.wap.signed-certificate" when Version >= ?WSP_14 ->
-	    ?ENCODE_SHORT(16#39);
-	"application/vnd.wap.cert-response" when Version >= ?WSP_14 ->
-	    ?ENCODE_SHORT(16#3A);
-	"application/xhtml+xml" when Version >= ?WSP_14 ->
-	    ?ENCODE_SHORT(16#3B);
-	"application/wml+xml" when Version >= ?WSP_14 ->
-	    ?ENCODE_SHORT(16#3C);
-	"text/css" when Version >= ?WSP_14 ->
-	    ?ENCODE_SHORT(16#3D);
-	"application/vnd.wap.mms-message" when Version >= ?WSP_14 ->
-	    ?ENCODE_SHORT(16#3E);
-	"application/vnd.wap.rollover-certificate" when Version >= ?WSP_14 ->
-	    ?ENCODE_SHORT(16#3F);
-	%% WAP Version 1.5
-	"application/vnd.wap.locc+wbxml" when Version >= ?WSP_15 ->
-	    ?ENCODE_SHORT(16#40);
-	"application/vnd.wap.loc+xml" when Version >= ?WSP_15 ->
-	    ?ENCODE_SHORT(16#41);
-	"application/vnd.syncml.dm+wbxml" when Version >= ?WSP_15 ->
-	    ?ENCODE_SHORT(16#42);
-	"application/vnd.syncml.dm+xml" when Version >= ?WSP_15 ->
-	    ?ENCODE_SHORT(16#43);
-	"application/vnd.syncml.notification" when Version >= ?WSP_15 ->
-	    ?ENCODE_SHORT(16#44);
-	"application/vnd.wap.xhtml+xml" when Version >= ?WSP_15 ->
-	    ?ENCODE_SHORT(16#45);
-	"application/vnd.wv.csp.cir" when Version >= ?WSP_15 ->
-	    ?ENCODE_SHORT(16#46);
-	"application/vnd.oma.dd+xml" when Version >= ?WSP_15 ->
-	    ?ENCODE_SHORT(16#47);
-	"application/vnd.oma.drm.message" when Version >= ?WSP_15 ->
-	    ?ENCODE_SHORT(16#48);
-	"application/vnd.oma.drm.content" when Version >= ?WSP_15 -> 
-	    ?ENCODE_SHORT(16#49);
-	"application/vnd.oma.drm.rights+xml" when Version >= ?WSP_15 ->
-	    ?ENCODE_SHORT(16#4A);
-	"application/vnd.oma.drm.rights+wbxml" when Version >= ?WSP_15 ->
-	    ?ENCODE_SHORT(16#4B);
-	_ ->
-	    encode_text_string(ContentType)
-    end.
-    
-
-decode_well_known_media(Code, Version) when integer(Code) ->
-    case Code of
-	%% WSP_REGISTERED_CONTENT_TYPES
-	16#0201 -> "application/vnd.uplanet.cacheop-wbxml";
-	16#0202 -> "application/vnd.uplanet.signal";
-	16#0203 -> "application/vnd.uplanet.alert-wbxml";
-	16#0204 -> "application/vnd.uplanet.list-wbxml";
-	16#0205 -> "application/vnd.uplanet.listcmd-wbxml";
-	16#0206 -> "application/vnd.uplanet.channel-wbxml";
-	16#0207 -> "application/vnd.uplanet.provisioning-status-uri";
-	16#0208 -> "x-wap.multipart/vnd.uplanet.header-set";
-	16#0209 -> "application/vnd.uplanet.bearer-choice-wbxml";
-	16#020A -> "application/vnd.phonecom.mmc-wbxml";
-	16#020B -> "application/vnd.nokia.syncset+wbxml";
-	16#020C -> "image/x-up-wpng";
-	_ -> decode_constrained_media(Code, Version)
-    end;
-decode_well_known_media(Media, _Version) when list(Media) ->
-    Media;
-decode_well_known_media({short,_Data}, Version) ->
-    decode_well_known_media(d_long(data), Version).	%% BUG HERE: Data
-
-
-decode_constrained_media(Code, _Version) when integer(Code) ->
-    case Code of
-	16#00 -> "*/*";
-	16#01 -> "text/*";
-	16#02 -> "text/html";
-	16#03 -> "text/plain";
-	16#04 -> "text/x-hdml";
-	16#05 -> "text/x-ttml";
-	16#06 -> "text/x-vcalendar";
-	16#07 -> "text/x-vcard";
-	16#08 -> "text/vnd.wap.wml";
-	16#09 -> "text/vnd.wap.wmlscript";
-	16#0A -> "text/vnd.wap.wta-event";
-	16#0B -> "multipart/*";
-	16#0C -> "multipart/mixed";
-	16#0D -> "multipart/form-data";
-	16#0E -> "multipart/byterantes";
-	16#0F -> "multipart/alternative";
-	16#10 -> "application/*";
-	16#11 -> "application/java-vm";
-	16#12 -> "application/x-www-form-urlencoded";
-	16#13 -> "application/x-hdmlc";
-	16#14 -> "application/vnd.wap.wmlc";
-	16#15 -> "application/vnd.wap.wmlscriptc";
-	16#16 -> "application/vnd.wap.wta-eventc";
-	16#17 -> "application/vnd.wap.uaprof";
-	16#18 -> "application/vnd.wap.wtls-ca-certificate";
-	16#19 -> "application/vnd.wap.wtls-user-certificate";
-	16#1A -> "application/x-x509-ca-cert";
-	16#1B -> "application/x-x509-user-cert";
-	16#1C -> "image/*";
-	16#1D -> "image/gif";
-	16#1E -> "image/jpeg";
-	16#1F -> "image/tiff";
-	16#20 -> "image/png";
-	16#21 -> "image/vnd.wap.wbmp";
-	16#22 -> "application/vnd.wap.multipart.*";
-	16#23 -> "application/vnd.wap.multipart.mixed";
-	16#24 -> "application/vnd.wap.multipart.form-data";
-	16#25 -> "application/vnd.wap.multipart.byteranges";
-	16#26 -> "application/vnd.wap.multipart.alternative";
-	16#27 -> "application/xml";
-	16#28 -> "text/xml";
-	16#29 -> "application/vnd.wap.wbxml";
-	16#2A -> "application/x-x968-cross-cert";
-	16#2B -> "application/x-x968-ca-cert";
-	16#2C -> "application/x-x968-user-cert";
-	%% WAP Version 1.2
-	16#2D -> "text/vnd.wap.si";
-	16#2E -> "application/vnd.wap.sic";
-	16#2F -> "text/vnd.wap.sl";
-	16#30 -> "application/vnd.wap.slc";
-	16#31 -> "text/vnd.wap.co";
-	16#32 -> "application/vnd.wap.coc";
-	16#33 -> "application/vnd.wap.multipart.related";
-	16#34 -> "application/vnd.wap.sia";
-	%% WAP Version 1.3
-	16#35 -> "text/vnd.wap.connectivity-xml";
-	16#36 -> "application/vnd.wap.connectivity-wbxml";
-	%% WAP Version 1.4
-	16#37 -> "application/pkcs7-mime";
-	16#38 -> "application/vnd.wap.hashed-certificate";
-	16#39 -> "application/vnd.wap.signed-certificate";
-	16#3A -> "application/vnd.wap.cert-response";
-	16#3B -> "application/xhtml+xml";
-	16#3C -> "application/wml+xml";
-	16#3D -> "text/css";
-	16#3E -> "application/vnd.wap.mms-message";
-	16#3F -> "application/vnd.wap.rollover-certificate";
-	%% WAP Version 1.5
-	16#40 -> "application/vnd.wap.locc+wbxml";
-	16#41 -> "application/vnd.wap.loc+xml";
-	16#42 -> "application/vnd.syncml.dm+wbxml";
-	16#43 -> "application/vnd.syncml.dm+xml";
-	16#44 -> "application/vnd.syncml.notification";
-	16#45 -> "application/vnd.wap.xhtml+xml";
-	16#46 -> "application/vnd.wv.csp.cir";
-	16#47 -> "application/vnd.oma.dd+xml";
-	16#48 -> "application/vnd.oma.drm.message";
-	16#49 -> "application/vnd.oma.drm.content";
-	16#4A -> "application/vnd.oma.drm.rights+xml";
-	16#4B -> "application/vnd.oma.drm.rights+wbxml"
-    end;
-decode_constrained_media(Media, _Version) when list(Media) ->
-    Media.
-
-
-%% Parse <integer> or <integer>.<integer>
-
-parse_version(Value) ->
-    case string:tokens(Value, ".") of
-	[Major,Minor] ->
-	    {list_to_integer(Major), list_to_integer(Minor)};
-	[Major] ->
-	    case catch list_to_integer(Major) of
-		{'EXIT', _} ->
-		    Value;
-		V -> V
-	    end
-    end.
-	    
-format_version({Major,Minor}) ->
-    [integer_to_list(Major),".",integer_to_list(Minor)];
-format_version(Major) when integer(Major) ->
-    integer_to_list(Major);
-format_version(Version) when list(Version) ->
-    Version.
-
-encode_version({Major,Minor}) ->
-    Ver = (((Major-1) band 16#7) bsl 4) bor (Minor band 16#f),
-    ?ENCODE_SHORT(Ver);
-encode_version(Major) when integer(Major) ->
-    Ver = ((Major band 16#7) bsl 4) bor 16#f,
-    ?ENCODE_SHORT(Ver);
-encode_version(Value) when list(Value) ->
-    encode_text_string(Value).
-
-
-decode_version(Value) when integer(Value) ->
-    Major = (Value bsr 4) band 16#7,
-    Minor = Value band 16#f,
-    if Minor == 16#f ->
-	    Major;
-       true ->
-	    {Major+1,Minor}
-    end;
-decode_version(Value) when list(Value) ->
-    Value.
-
-
-encode_mms_version({Major,Minor}) ->
-    Ver = ((Major band 16#7) bsl 4) bor (Minor band 16#f),
-    ?ENCODE_SHORT(Ver);
-encode_mms_version(Major) when integer(Major) ->
-    Ver = ((Major band 16#7) bsl 4) bor 16#f,
-    ?ENCODE_SHORT(Ver);
-encode_mms_version(Value) when list(Value) ->
-    encode_text_string(Value).
-
-
-decode_mms_version(Value) when integer(Value) ->
-    Major = (Value bsr 4) band 16#7,
-    Minor = Value band 16#f,
-    if Minor == 16#f ->
-	    Major;
-       true ->
-	    {Major,Minor}
-    end;
-decode_mms_version(Value) when list(Value) ->
-    Value.
-
-
-%%%
-%%% Basic data types
-%%% 
-
-e_delta_seconds(Value) ->
-    encode_integer(Value).
-
-
-encode_integer(I) when integer(I), I >= 0 , I < 127 ->
-    ?ENCODE_SHORT(I);
-encode_integer(I) when integer(I) ->
-    encode_long_integer(I);
-encode_integer(List) when list(List) ->
-    encode_integer(list_to_integer(List)).
-
-decode_integer(Value) when integer(Value) ->	
-    Value;
-decode_integer({short,Data}) ->
-    Sz = size(Data)*8,
-    <<Value:Sz>> = Data,
-    Value.
-
-encode_short_integer(I) ->
-    ?ENCODE_SHORT(I).
-
-encode_long_integer(I) when I >= 0 ->
-    MOInt = encode_multioctet_integer(I, []),
-    MOIntLen = length(MOInt),
-    list_to_binary([MOIntLen band 16#1f | MOInt]).
-
-encode_multioctet_integer(I,Acc) when I < 256 ->
-    [I | Acc];
-encode_multioctet_integer(I,Acc) ->
-    encode_multioctet_integer(I bsr 8, [(I band 16#ff) | Acc]).
-
-
-%% Integer-Value: Short-Integer | Long-Integer
-%% Short-Integer: <<1:Short:7>>
-%% Long-Integer:  <<0-30, X:0-30>>
-%% return {Integer,Tail}
-d_integer_value(<<1:1,Integer:7,Tail/binary>>) ->
-    {Integer, Tail};
-d_integer_value(<<0:3,Len:5,Data/binary>>) when Len =/= 31 ->
-    Sz = Len*8,
-    <<Integer:Sz, Tail/binary>> = Data,
-    {Integer, Tail}.
-
-decode_short_integer(<<1:1,Septet:7,T100/binary>>) ->
-    {Septet, T100}.
-
-decode_long_integer(<<0:3,Len:5,Data/binary>>) when Len =/= 31 ->
-    Sz = Len*8,
-    <<Val:Sz, Tail/binary>> = Data,
-    {Val, Tail}.
-
-d_long(Data) ->
-    Sz = size(Data)*8,
-    <<Value:Sz>> = Data,    
-    Value.
-
-
-encode_uri_value(Data) ->
-    encode_text_string(Data).
-
-decode_uri_value(Data) when list(Data) ->
-    Data.
-
-%% parse quoted string
-decode_quoted_string([$" | List]) ->
-    List.
-
-encode_quoted_string([$" | Value]) ->
-    case lists:reverse(Value) of
-	[$" | Value1] ->
-	    <<$", (list_to_binary(lists:reverse(Value1)))/binary, 0>>;
-	_ ->
-	    <<$", (list_to_binary(Value))/binary, 0>>
-    end;
-encode_quoted_string(Value) ->
-    <<$", (list_to_binary(Value))/binary, 0>>.
-
-    
-
-decode_text_string(List) when list(List) ->
-    List;
-decode_text_string(Bin) when binary(Bin) ->
-    binary_to_list(Bin).
-
-
-
-encode_text_string(A) when atom(A) ->
-    encode_text_string(atom_to_list(A));
-encode_text_string([H|T]) when H >= 128 ->
-    <<(list_to_binary([127,H|T]))/binary,0>>;
-encode_text_string(S) ->
-    <<(list_to_binary(S))/binary,0>>.
-
-
-encode_text_value(undefined) ->
-    <<0>>;
-encode_text_value([$"|T]) ->
-    %% remove ending quote ?
-    <<34,(list_to_binary(T))/binary>>;
-encode_text_value(L) ->
-    encode_text_string(L).
-
-
-d_text_value(<<0,T100/binary>>) ->
-    { "", T100};
-d_text_value(<<34,_Tail/binary>>=Data) ->
-    d_text_string(Data);
-d_text_value(Data) ->
-    d_text_string(Data).
-
-
-d_text_string(<<127,Data/binary>>) -> %% Remove quote
-    d_text_string(Data,[]);
-d_text_string(Data) ->
-    d_text_string(Data,[]).
-
-d_text_string(<<0,Tail/binary>>,A) ->
-    {lists:reverse(A), Tail};
-d_text_string(<<C,Tail/binary>>,A) ->
-    d_text_string(Tail,[C|A]);
-d_text_string(<<>>, A) ->
-    {lists:reverse(A), <<>>}.
-
-
-d_q_value(<<0:1,Q:7,Tail/binary>>) ->
-    QVal = 
-	if Q >= 1, Q =< 100 ->
-		lists:flatten(io_lib:format("0.~2..0w", [Q-1]));
-	   Q >= 101, Q =< 1099 ->
-		lists:flatten(io_lib:format("0.~3..0w", [Q-100]));
-	   true ->
-		io:format("Q-value to big ~w\n", [Q]),
-		"***"
-	end,
-    {QVal, Tail};
-d_q_value(<<1:1,Q1:7,0:1,Q0:7,Tail/binary>>) ->
-    Q = (Q1 bsl 7) bor Q0,
-    QVal = 
-	if Q >= 1, Q =< 100 ->
-		lists:flatten(io_lib:format("0.~2..0w", [Q-1]));
-	   Q >= 101, Q =< 1099 ->
-		lists:flatten(io_lib:format("0.~3..0w", [Q-100]));
-	   true ->
-		io:format("Q-value to big ~w\n", [Q]),
-		"***"
-	end,
-    {QVal, Tail}.
-    
-
-%%
-%% Decode uintvar
-%%
-d_uintvar(<<0:1,S0:7,T100/binary>>) ->
-    {S0, T100};
-d_uintvar(<<1:1,S1:7,0:1,S0:7,T100/binary>>) ->
-    {(S1 bsl 7) bor S0, T100};
-d_uintvar(<<1:1,S2:7,1:1,S1:7,0:1,S0:7,T100/binary>>) ->    
-    {(S2 bsl 14) bor (S1 bsl 7) bor S0, T100};
-d_uintvar(<<1:1,S3:7,1:1,S2:7,1:1,S1:7,0:1,S0:7,T100/binary>>) ->    
-    {(S3 bsl 21) bor (S2 bsl 14) bor (S1 bsl 7) bor S0, T100};
-d_uintvar(<<1:1,S4:7,1:1,S3:7,1:1,S2:7,1:1,S1:7,0:1,S0:7,T100/binary>>) ->    
-    {(S4 bsl 28) bor (S3 bsl 21) bor (S2 bsl 14) bor (S1 bsl 7) bor S0, T100}.
-
-
-e_uintvar(I) when I < 128 -> <<I>>;
-e_uintvar(I) -> e_uintvar(I,[]).
-
-e_uintvar(0,Acc) -> 
-    list_to_binary(Acc);
-e_uintvar(I,[]) ->
-    e_uintvar(I bsr 7, [I band 16#7f]);
-e_uintvar(I,Acc) ->
-    e_uintvar(I bsr 7, [16#80 bor (I band 16#7f) | Acc]).
-
-
-e_value(B) ->
-    Sz = size(B),
-    if Sz =< 30 ->
-	    <<Sz:8, B/binary>>;
-       true ->
-	    <<31:8, (e_uintvar(Sz))/binary, B/binary >>
-    end.
-
-e_value(B1,B2) ->
-    Sz = size(B1)+size(B2),
-    if Sz =< 30 ->
-	    <<Sz:8, B1/binary, B2/binary>>;
-       true ->
-	    <<31:8, (e_uintvar(Sz))/binary, B1/binary, B2/binary >>
-    end.
-
-e_value(B1,B2,B3) ->
-    Sz = size(B1)+size(B2)+size(B3),
-    if Sz =< 30 ->
-	    <<Sz:8, B1/binary,B2/binary,B3/binary>>;
-       true ->
-	    <<31:8,(e_uintvar(Sz))/binary,B1/binary,B2/binary,B3/binary>>
-    end.
-
-e_value(B1,B2,B3,B4) ->
-    Sz = size(B1)+size(B2)+size(B3)+size(B4),
-    if Sz =< 30 ->
-	    <<Sz:8, B1/binary,B2/binary,B3/binary,B4/binary>>;
-       true ->
-	    <<31:8,(e_uintvar(Sz))/binary,B1/binary,
-	     B2/binary,B3/binary,B4/binary>>
-    end.
-
-%%
-%% Extened methods
-%%
-decode_extended_methods(<<PduType:8, Data/binary>>) ->
-    Type = decode_pdu_type(PduType),
-    {Method, Data1} = d_text_string(Data),
-    [{Type,Method} | decode_extended_methods(Data1)];
-decode_extended_methods(<<>>) ->
-    [].
-
-encode_extended_methods(Ms) ->
-    list_to_binary(encode_ext_methods(Ms)).
-
-encode_ext_methods([{Type,Method} | T]) ->
-    [ encode_pdu_type(Type), encode_text_string(Method) |
-      encode_ext_methods(T)];
-encode_ext_methods([]) ->
-    [].
-
-%%
-%% Address lists used by redirect-pdu and aliases-capability
-%%
-decode_address(D0) ->
-    [A] = decode_addresses(D0),
-    A.
-
-decode_addresses(D0) ->
-    case D0 of
-	<<1:1, 1:1,Len:6,B:8,P:16,Addr:Len/binary,D1/binary>> ->
-	    [#wdp_address { bearer = B, address = Addr, portnum=P } |
-	     decode_addresses(D1)];
-	<<1:1, 0:1,Len:6,B:8,Addr:Len/binary,D1/binary>> ->
-	    [#wdp_address { bearer = B, address = Addr } |
-	     decode_addresses(D1)];
-	<<0:1, 1:1,Len:6,P:16,Addr:Len/binary,D1/binary>> ->
-	    [#wdp_address { portnum=P, address=Addr } |
-	     decode_addresses(D1)];
-	<<0:1, 0:1,Len:6,Addr:Len/binary,D1/binary>> ->
-	    [#wdp_address { address=Addr } |
-	     decode_addresses(D1)];
-	<<>> ->
-	    []
-    end.
-
-encode_addresses(As) ->
-    encode_addresses(As, []).
-
-encode_addresses([A|As], Acc) ->
-    encode_addresses(As, [encode_address(A)|Acc]);
-encode_addresses([], Acc) ->
-    list_to_binary(lists:reverse(Acc)).
-
-encode_address(#wdp_address { bearer = B, address = Addr, portnum = P }) ->
-    BAddr = if tuple(Addr) ->
-		    list_to_binary(inet:ip_to_bytes(Addr));
-	       binary(Addr) ->
-		    Addr
-	    end,
-    Len = size(BAddr),
-    if B == undefined, P == undefined ->
-	    <<0:1, 0:1, Len:6, BAddr/binary>>;
-       B == undefined ->       
-	    <<0:1, 1:1, Len:6, P:16, BAddr/binary>>;
-       P == undefined ->
-	    <<1:1, 0:1, Len:6, B:8, BAddr/binary>>;
-       true ->
-	    <<1:1, 1:1, Len:6, B:8, P:16, BAddr/binary>>
-    end.
-	
-
-
-
--define(UNIX_TIME_OFFSET, 62167219200).
-
-d_date(Val) when integer(Val) ->
-    calendar:gregorian_seconds_to_datetime(Val+?UNIX_TIME_OFFSET);
-d_date({short,Data}) ->
-    Sz = size(Data)*8,
-    <<Sec:Sz>> = Data, 
-    calendar:gregorian_seconds_to_datetime(Sec+?UNIX_TIME_OFFSET).
-
-e_date(DateTime) ->
-    Sec = calendar:datetime_to_gregorian_seconds(DateTime),
-    encode_long_integer(Sec -  ?UNIX_TIME_OFFSET).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% decode http-date (RFC 2068). (MUST be send in RFC1123 date format)
-%%          HTTP-date    = rfc1123-date | rfc850-date | asctime-date
-%%          rfc1123-date = wkday "," SP date1 SP time SP "GMT"
-%%          rfc850-date  = weekday "," SP date2 SP time SP "GMT"
-%%          asctime-date = wkday SP date3 SP time SP 4DIGIT
-%%
-%%          date1        = 2DIGIT SP month SP 4DIGIT
-%%                         ; day month year (e.g., 02 Jun 1982)
-%%          date2        = 2DIGIT "-" month "-" 2DIGIT
-%%                         ; day-month-year (e.g., 02-Jun-82)
-%%          date3        = month SP ( 2DIGIT | ( SP 1DIGIT ))
-%%                         ; month day (e.g., Jun  2)
-%%
-%%          time         = 2DIGIT ":" 2DIGIT ":" 2DIGIT
-%%                         ; 00:00:00 - 23:59:59
-%%
-%%          wkday        = "Mon" | "Tue" | "Wed"
-%%                       | "Thu" | "Fri" | "Sat" | "Sun"
-%%
-%%
-%%          weekday      = "Monday" | "Tuesday" | "Wednesday"
-%%                       | "Thursday" | "Friday" | "Saturday" | "Sunday"
-%%
-%%          month        = "Jan" | "Feb" | "Mar" | "Apr"
-%%                       | "May" | "Jun" | "Jul" | "Aug"
-%%                       | "Sep" | "Oct" | "Nov" | "Dec"
-%%
-%% decode date or crash!
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-parse_http_date(Date) ->
-    parse_hdate(tolower(Date)).
-
-parse_hdate([$m,$o,$n,$d,$a,$y,$  | Cs]) -> date2(Cs);
-parse_hdate([$t,$u,$e,$s,$d,$a,$y,$  | Cs]) -> date2(Cs);
-parse_hdate([$w,$e,$d,$n,$s,$d,$a,$y,$  | Cs]) -> date2(Cs);
-parse_hdate([$t,$h,$u,$r,$s,$d,$a,$y,$  | Cs]) -> date2(Cs);
-parse_hdate([$f,$r,$i,$d,$a,$y,$  | Cs]) -> date2(Cs);
-parse_hdate([$s,$a,$t,$u,$r,$d,$a,$y,$   | Cs]) -> date2(Cs);
-parse_hdate([$s,$u,$n,$d,$a,$y,$  | Cs]) -> date2(Cs);
-parse_hdate([$m,$o,$n,X | Cs]) -> date13(X,Cs);
-parse_hdate([$t,$u,$e,X  | Cs]) -> date13(X,Cs);
-parse_hdate([$w,$e,$d,X  | Cs]) -> date13(X,Cs);
-parse_hdate([$t,$h,$u,X  | Cs]) -> date13(X,Cs);
-parse_hdate([$f,$r,$i,X  | Cs]) -> date13(X,Cs);
-parse_hdate([$s,$a,$t,X  | Cs]) -> date13(X,Cs);
-parse_hdate([$s,$u,$n,X  | Cs]) -> date13(X,Cs).
-
-date13($ , Cs) -> date3(Cs);
-date13($,, [$ |Cs]) -> date1(Cs).
-
-%% date1
-date1([D1,D2,$ ,M1,M2,M3,$ ,Y1,Y2,Y3,Y4,$  | Cs]) ->
-    M = parse_month([M1,M2,M3]),
-    D = list_to_integer([D1,D2]),
-    Y = list_to_integer([Y1,Y2,Y3,Y4]),
-    {Time,[$ ,$g,$m,$t|Cs1]} = parse_time(Cs),
-    { {{Y,M,D},Time}, Cs1}.
-
-%% date2
-date2([D1,D2,$-,M1,M2,M3,$-,Y1,Y2 | Cs]) ->
-    M = parse_month([M1,M2,M3]),
-    D = list_to_integer([D1,D2]),
-    Y = 1900 + list_to_integer([Y1,Y2]),
-    {Time, [$ ,$g,$m,$t|Cs1]} = parse_time(Cs),
-    {{{Y,M,D}, Time}, Cs1}.
-
-%% date3
-date3([M1,M2,M3,$ ,D1,D2,$ | Cs]) ->
-    M = parse_month([M1,M2,M3]),
-    D = if D1 == $  -> list_to_integer([D2]);
-	   true -> list_to_integer([D1,D2])
-	end,
-    {Time,[$ ,Y1,Y2,Y3,Y4|Cs1]} = parse_time(Cs),
-    Y = list_to_integer([Y1,Y2,Y3,Y4]),
-    { {{Y,M,D}, Time}, Cs1 }.
-
-%% decode lowercase month
-parse_month("jan") -> 1;
-parse_month("feb") -> 2;
-parse_month("mar") -> 3;
-parse_month("apr") -> 4;
-parse_month("may") -> 5;
-parse_month("jun") -> 6;
-parse_month("jul") -> 7;
-parse_month("aug") -> 8;
-parse_month("sep") -> 9;
-parse_month("oct") -> 10;
-parse_month("nov") -> 11;
-parse_month("dec") -> 12.
-
-%% decode time HH:MM:SS
-parse_time([H1,H2,$:,M1,M2,$:,S1,S2|Cs]) ->
-    { {list_to_integer([H1,H2]), 
-       list_to_integer([M1,M2]),
-       list_to_integer([S1,S2]) }, Cs}.
-
-%% encode date into rfc1123-date (must be a GMT time!!!)
-fmt_date({{Y,M,D},{TH,TM,TS}}) ->
-    WkDay = case calendar:day_of_the_week({Y,M,D}) of
-		1 -> "Mon";
-		2 -> "Tue";
-		3 -> "Wed";
-		4 -> "Thu";
-		5 -> "Fri";
-		6 -> "Sat";
-		7 -> "Sun"
-	    end,
-    lists:flatten(io_lib:format("~s, ~2..0w ~s ~4..0w "
-				"~2..0w:~2..0w:~2..0w GMT",
-				[WkDay, D, fmt_month(M), Y, TH, TM, TS])).
-
-fmt_current_date() ->
-    fmt_date(calendar:universal_time()).
-
-%% decode lowercase month
-fmt_month(1) -> "Jan";
-fmt_month(2) -> "Feb";
-fmt_month(3) -> "Mar";
-fmt_month(4) -> "Apr";
-fmt_month(5) -> "May";
-fmt_month(6) -> "Jun";
-fmt_month(7) -> "Jul";
-fmt_month(8) -> "Aug";
-fmt_month(9) -> "Sep";
-fmt_month(10) -> "Oct";
-fmt_month(11) -> "Nov";
-fmt_month(12) -> "Dec".
diff --git a/lib/docbuilder/doc/src/character_entities.xml b/lib/docbuilder/doc/src/character_entities.xml
index e78cf0ebec..0a4ae17fb5 100644
--- a/lib/docbuilder/doc/src/character_entities.xml
+++ b/lib/docbuilder/doc/src/character_entities.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -125,7 +125,7 @@
         <cell align="left" valign="middle">not sign</cell>
       </row>
       <row>
-        <cell align="left" valign="middle">&shy;</cell>
+        <cell align="left" valign="middle"></cell> <!-- a space is used instead of &shy; due to bug in fop 1.0 -->
         <cell align="left" valign="middle">&amp;shy;</cell>
         <cell align="left" valign="middle">soft hyphen</cell>
       </row>
diff --git a/lib/docbuilder/doc/src/inline_tags.xml b/lib/docbuilder/doc/src/inline_tags.xml
index 10afbf143f..5bcca54c05 100644
--- a/lib/docbuilder/doc/src/inline_tags.xml
+++ b/lib/docbuilder/doc/src/inline_tags.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -246,7 +246,10 @@
       bibliography file. Example:</p>
     <pre>
 [...,
- {"erlbook","Concurrent Programming in ERLANG","J. Armstrong, R. Virding, C. Wikstr&ouml;m, M. Williams, Concurrent Programming in ERLANG, Prentice Hall, 1996, ISBN 0-13-508301-X","jocke"},
+ {"erlbook",
+  "Concurrent Programming in ERLANG","J. Armstrong, R. Virding, C. Wikstr&ouml;m, "
+  "M. Williams, Concurrent Programming in ERLANG, Prentice Hall, 1996, ISBN 0-13-508301-X",
+  "jocke"},
  ...].
     </pre>
   </section>
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index c18a126264..630271b115 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2010</year>
+      <year>2007</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/edoc/src/edoc.hrl b/lib/edoc/src/edoc.hrl
index 43657b3b8f..31cf45ade9 100644
--- a/lib/edoc/src/edoc.hrl
+++ b/lib/edoc/src/edoc.hrl
@@ -37,7 +37,7 @@
 -define(SOURCE_DIR, "src").
 -define(EBIN_DIR, "ebin").
 -define(EDOC_DIR, "doc").
--define(REPORT_MISSING_TYPE, false).
+-define(REPORT_MISSING_TYPES, false).
 
 -include("edoc_doclet.hrl").
 
diff --git a/lib/edoc/src/edoc_specs.erl b/lib/edoc/src/edoc_specs.erl
index 45016ef85a..519ade726f 100644
--- a/lib/edoc/src/edoc_specs.erl
+++ b/lib/edoc/src/edoc_specs.erl
@@ -1,4 +1,4 @@
-%
+%%
 %% %CopyrightBegin%
 %%
 %% Copyright Ericsson AB 1996-2011. All Rights Reserved.
@@ -428,8 +428,8 @@ get_typevars(Ts) ->
 expand_records(Entries, TypeDefs, DT, Opts, File, Module) ->
     TypeList = [{type_name(T), T, not_seen} || T <- TypeDefs],
     true = ets:insert(DT, TypeList),
-    Warn = proplists:get_value(report_missing_type, Opts,
-                               ?REPORT_MISSING_TYPE) =:= true,
+    Warn = proplists:get_value(report_missing_types, Opts,
+                               ?REPORT_MISSING_TYPES) =:= true,
     P = #parms{tab = DT, warn = Warn, file = File, line = 0},
     ExportedTypes = [Name ||
                         {export_type,Ts} <- Module#module.attributes,
diff --git a/lib/edoc/src/edoc_tags.erl b/lib/edoc/src/edoc_tags.erl
index def39ee34c..8ee8f87b5f 100644
--- a/lib/edoc/src/edoc_tags.erl
+++ b/lib/edoc/src/edoc_tags.erl
@@ -331,8 +331,8 @@ parse_typedef(Data, Line, _Env, Where) ->
     NAs = length(As),
     case edoc_types:is_predefined(T, NAs) of
 	true ->
-            case 
-                edoc_types:is_new_predefined(T, NAs) 
+            case
+                edoc_types:is_new_predefined(T, NAs)
                 orelse edoc_types:is_predefined_otp_type(T, NAs)
             of
                 false ->
@@ -406,17 +406,20 @@ throw_error(L, D) ->
 
 -record(parms, {tab, warn, file, line}).
 
-check_types(Entries0, Opts, File) ->
-    Entries = edoc_data:hidden_filter(Entries0, Opts),
+check_types(Entries, Opts, File) ->
     Tags = edoc_data:get_all_tags(Entries),
+    TypeTags = [Tag || #tag{data = {#t_typedef{},_}}=Tag <- Tags],
+    Entries2 = edoc_data:hidden_filter(Entries, Opts),
+    Tags2 = edoc_data:get_all_tags(Entries2),
+    SpecTags = [Tag || #tag{data = #t_spec{}}=Tag <- Tags2],
     DT = ets:new(types, [bag]),
     _ = [add_type(DT, Name, As, File, Line) ||
             #tag{line = Line,
-                 data = {#t_typedef{name = Name, args = As},_}} <- Tags],
-    Warn = proplists:get_value(report_missing_type, Opts,
-                               ?REPORT_MISSING_TYPE) =:= true,
+                 data = {#t_typedef{name = Name, args = As},_}} <- TypeTags],
+    Warn = proplists:get_value(report_missing_types, Opts,
+                               ?REPORT_MISSING_TYPES) =:= true,
     P = #parms{tab = DT, warn = Warn, file = File, line = 0},
-    try check_types(Tags, P)
+    try check_types3(TypeTags++SpecTags, P, [])
     after true = ets:delete(DT)
     end.
 
@@ -431,60 +434,64 @@ add_type(DT, Name, Args, File, Line) ->
             ets:insert(DT, {Name, NArgs})
     end.
 
-check_types([], _P)->
+check_types3([], _P, _Ls)->
     ok;
-check_types([Tag | Tags], P) ->
-    check_type(Tag, P, Tags).
+check_types3([Tag | Tags], P, Ls) ->
+    check_type(Tag, P, Ls, Tags).
 
-check_type(#tag{line = L, data = Data}, P0, Ts) ->
+check_type(#tag{line = L, data = Data}, P0, Ls, Ts) ->
     P = P0#parms{line = L},
     case Data of
         {#t_typedef{type = Type, defs = Defs},_} ->
-            check_type(Type, P, Defs++Ts);
+            check_type(Type, P, Ls, Defs++Ts);
         #t_spec{type = Type, defs = Defs} ->
-            check_type(Type, P, Defs++Ts);
+            LocalTypes =
+                [{N,length(Args)} ||
+                    #t_def{name = #t_type{name = N, args = Args}} <- Defs],
+            check_type(Type, P, LocalTypes, Defs),
+            check_types3(Ts, P, Ls);
         _->
-            check_types(Ts, P0)
+            check_types3(Ts, P0, Ls)
     end;
-check_type(#t_def{type = Type}, P, Ts) ->
-    check_type(Type, P, Ts);
-check_type(#t_type{name = Name, args = Args}, P, Ts) ->
-    check_used_type(Name, Args, P),
-    check_types(Args++Ts, P);
-check_type(#t_var{}, P, Ts) ->
-    check_types(Ts, P);
-check_type(#t_fun{args = Args, range = Range}, P, Ts) ->
-    check_type(Range, P, Args++Ts);
-check_type(#t_tuple{types = Types}, P, Ts) ->
-    check_types(Types ++Ts, P);
-check_type(#t_list{type = Type}, P, Ts) ->
-    check_type(Type, P, Ts);
-check_type(#t_nil{}, P, Ts) ->
-    check_types(Ts, P);
-check_type(#t_paren{type = Type}, P, Ts) ->
-    check_type(Type, P, Ts);
-check_type(#t_nonempty_list{type = Type}, P, Ts) ->
-    check_type(Type, P, Ts);
-check_type(#t_atom{}, P, Ts) ->
-    check_types(Ts, P);
-check_type(#t_integer{}, P, Ts) ->
-    check_types(Ts, P);
-check_type(#t_integer_range{}, P, Ts) ->
-    check_types(Ts, P);
-check_type(#t_binary{}, P, Ts) ->
-    check_types(Ts, P);
-check_type(#t_float{}, P, Ts) ->
-    check_types(Ts, P);
-check_type(#t_union{types = Types}, P, Ts) ->
-    check_types(Types++Ts, P);
-check_type(#t_record{fields = Fields}, P, Ts) ->
-    check_types(Fields++Ts, P);
-check_type(#t_field{type = Type}, P, Ts) ->
-    check_type(Type, P, Ts);
-check_type(undefined, P, Ts) ->
-    check_types(Ts, P).
-
-check_used_type(#t_name{name = N, module = Mod}=Name, Args, P) ->
+check_type(#t_def{type = Type}, P, Ls, Ts) ->
+    check_type(Type, P, Ls, Ts);
+check_type(#t_type{name = Name, args = Args}, P, Ls, Ts) ->
+    check_used_type(Name, Args, P, Ls),
+    check_types3(Args++Ts, P, Ls);
+check_type(#t_var{}, P, Ls, Ts) ->
+    check_types3(Ts, P, Ls);
+check_type(#t_fun{args = Args, range = Range}, P, Ls, Ts) ->
+    check_type(Range, P, Ls, Args++Ts);
+check_type(#t_tuple{types = Types}, P, Ls, Ts) ->
+    check_types3(Types ++Ts, P, Ls);
+check_type(#t_list{type = Type}, P, Ls, Ts) ->
+    check_type(Type, P, Ls, Ts);
+check_type(#t_nil{}, P, Ls, Ts) ->
+    check_types3(Ts, P, Ls);
+check_type(#t_paren{type = Type}, P, Ls, Ts) ->
+    check_type(Type, P, Ls, Ts);
+check_type(#t_nonempty_list{type = Type}, P, Ls, Ts) ->
+    check_type(Type, P, Ls, Ts);
+check_type(#t_atom{}, P, Ls, Ts) ->
+    check_types3(Ts, P, Ls);
+check_type(#t_integer{}, P, Ls, Ts) ->
+    check_types3(Ts, P, Ls);
+check_type(#t_integer_range{}, P, Ls, Ts) ->
+    check_types3(Ts, P, Ls);
+check_type(#t_binary{}, P, Ls, Ts) ->
+    check_types3(Ts, P, Ls);
+check_type(#t_float{}, P, Ls, Ts) ->
+    check_types3(Ts, P, Ls);
+check_type(#t_union{types = Types}, P, Ls, Ts) ->
+    check_types3(Types++Ts, P, Ls);
+check_type(#t_record{fields = Fields}, P, Ls, Ts) ->
+    check_types3(Fields++Ts, P, Ls);
+check_type(#t_field{type = Type}, P, Ls, Ts) ->
+    check_type(Type, P, Ls, Ts);
+check_type(undefined, P, Ls, Ts) ->
+    check_types3(Ts, P, Ls).
+
+check_used_type(#t_name{name = N, module = Mod}=Name, Args, P, LocalTypes) ->
     NArgs = length(Args),
     TypeName = {Name, NArgs},
     DT = P#parms.tab,
@@ -493,6 +500,7 @@ check_used_type(#t_name{name = N, module = Mod}=Name, Args, P) ->
         orelse lists:member(TypeName, ets:lookup(DT, Name))
         orelse edoc_types:is_predefined(N, NArgs)
         orelse edoc_types:is_predefined_otp_type(N, NArgs)
+        orelse lists:member(TypeName, LocalTypes)
     of
         true ->
             ok;
diff --git a/lib/erl_docgen/priv/bin/specs_gen.escript b/lib/erl_docgen/priv/bin/specs_gen.escript
index 840fed6dd5..982afece7f 100644
--- a/lib/erl_docgen/priv/bin/specs_gen.escript
+++ b/lib/erl_docgen/priv/bin/specs_gen.escript
@@ -2,7 +2,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010. All Rights Reserved.
+%% Copyright Ericsson AB 2011. 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
@@ -29,7 +29,7 @@
 %%%  "-I<dir>" Directory to be searched when including a file.
 %%%  "-module Module"
 %%%            Module name to use when there is no File argument.
-%%%            A temporary file will be created.
+%%%            A empty specifications file will be created.
 %%%            Exactly one of -module Module and File must be given.
 %%%
 %%% The name of the generated file is "specs_<module>.xml". Its exact
@@ -67,34 +67,73 @@ usage() ->
     halt(1).
 
 call_edoc(FileSpec, InclFs, Dir) ->
-    Incl = [{includes, InclFs}],
-    Pre = [{preprocess, true}],
-    Choice = [{dialyzer_specs, all}],
-    DirOpt = [{dir, Dir}],
-    Pretty = [{pretty_print, erl_pp}],
-    Layout = [{layout, otp_specs},
-              {file_suffix, ".specs"},
-              {stylesheet, ""}],
-    Warn = [{report_missing_type, false},
-            {report_type_mismatch, false}],
-    OptionList = (DirOpt ++ Choice ++ Pre ++ Warn ++ Pretty ++ Layout ++ Incl),
-    {File, TmpFile} = case FileSpec of
-                          {file, File0} ->
-                              {File0, false};
-                          {module, Module} ->
-                              {create_tmp_file(Dir, Module), true}
-                      end,
-    try edoc:files([File], OptionList) of
-        ok ->
-            clean_up(Dir, File, TmpFile),
-            rename(Dir, File)
+    ReadOpts = [{includes, InclFs}, {preprocess, true}],
+    ExtractOpts = [{report_missing_type, false}],
+    LayoutOpts = [{pretty_printer, erl_pp}, {layout, otp_specs}],
+    File = case FileSpec of
+               {file, File0} -> File0;
+               {module, Module0} -> Module0
+           end,
+    try
+        Fs = case FileSpec of
+                 {file, _} ->
+                     Fs0 = read_file(File, ReadOpts),
+                     clauses(Fs0);
+                 {module, Module} ->
+                     [{attribute,0,module,list_to_atom(Module)}]
+             end,
+        Doc = extract(File, Fs, ExtractOpts),
+        Text = edoc:layout(Doc, LayoutOpts),
+        ok = write_text(Text, File, Dir),
+        rename(Dir, File)
     catch
         _:_ ->
             io:format("EDoc could not process file '~s'\n", [File]),
-            clean_up(Dir, File, TmpFile),
+            clean_up(Dir),
             halt(3)
     end.
 
+read_file(File, Opts) ->
+    edoc:read_source(File, Opts).
+
+extract(File, Forms, Opts) ->
+    Env = edoc_lib:get_doc_env([], [], [], _Opts=[]),
+    {_Module, Doc} = edoc_extract:source(Forms, File, Env, Opts),
+    Doc.
+
+clauses(Fs) ->
+    clauses(Fs, no).
+
+clauses([], no) ->
+    [];
+clauses([F | Fs], Spec) ->
+    case F of
+        {attribute,_,spec,_} ->
+            clauses(Fs, F);
+        {function,_,_N,_A,_Cls} when Spec =/= no->
+            {attribute,_,spec,{Name,FunTypes}} = Spec,
+            %% [throw({no,Name,{_N,_A}}) || Name =/= {_N,_A}],
+            %% EDoc doesn't care if a function appears more than once;
+            %% this is how overloaded specs are handled:
+            (lists:append([[setelement(4, Spec, {Name,[T]}),F] ||
+                              T <- FunTypes])
+             ++ clauses(Fs, no));
+        _ ->
+            [F | clauses(Fs, Spec)]
+    end.
+
+write_text(Text, File, Dir) ->
+    Base = filename:basename(File, ".erl"),
+    OutFile = filename:join(Dir, Base) ++ ".specs",
+    case file:write_file(OutFile, Text) of
+        ok ->
+            ok;
+        {error, R} ->
+            R1 = file:format_error(R),
+            io:format("could not write file '~s': ~s\n", [File, R1]),
+            halt(2)
+    end.
+
 rename(Dir, F) ->
     Mod = filename:basename(F, ".erl"),
     Old = filename:join(Dir, Mod ++ ".specs"),
@@ -108,22 +147,10 @@ rename(Dir, F) ->
             halt(2)
     end.
 
-clean_up(Dir, File, TmpFile) ->
-    [file:delete(File) || TmpFile],
+clean_up(Dir) ->
     _ = [file:delete(filename:join(Dir, F)) ||
             F <- ["packages-frame.html",
                   "overview-summary.html",
                   "modules-frame.html",
                   "index.html", "erlang.png", "edoc-info"]],
     ok.
-
-create_tmp_file(Dir, Module) ->
-    TmpFile = filename:join(Dir, Module++".erl"),
-    case file:write_file(TmpFile, "-module(" ++ Module ++ ").\n") of
-        ok ->
-            TmpFile;
-        {error, R} ->
-            R1 = file:format_error(R),
-            io:format("could not write file '~s': ~s\n", [TmpFile, R1]),
-            halt(2)
-    end.
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index c6375ea621..982572aeef 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -22,12 +22,15 @@
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:exsl="http://exslt.org/common"
+  extension-element-prefixes="exsl"
   xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
 
   <xsl:include href="db_html_params.xsl"/>
 
   <!-- Start of Dialyzer type/spec tags.
-       See also the template matching "name" and the template "menu.funcs"
+       See also the templates matching "name" and "seealso" as well as
+       the template "menu.funcs"
   -->
 
   <xsl:param name="specs_file" select="''"/>
@@ -38,49 +41,58 @@
   <xsl:key name="mod2app" match="module" use="@name"/>
 
   <xsl:template name="err">
+    <xsl:param name="f"/>
     <xsl:param name="m"/>
     <xsl:param name="n"/>
     <xsl:param name="a"/>
     <xsl:param name="s"/>
     <xsl:message terminate="yes">
-  Error <xsl:if test="$m != ''"><xsl:value-of select ="$m"/>:</xsl:if>
-	 <xsl:value-of
-		   select="$n"/>/<xsl:value-of
-		   select="$a"/>: <xsl:value-of select="$s"/>
+  Error <xsl:if test="$f != ''">in <xsl:value-of select ="$f"/>:</xsl:if>
+        <xsl:if test="$m != ''"><xsl:value-of select ="$m"/>:</xsl:if>
+        <xsl:value-of select="$n"/>
+        <xsl:if test="$a != ''">/<xsl:value-of
+             select ="$a"/></xsl:if>: <xsl:value-of select="$s"/>
     </xsl:message>
   </xsl:template>
 
-  <xsl:template name="spec_name">
+  <xsl:template name="find_spec">
     <xsl:variable name="curModule" select="ancestor::erlref/module"/>
     <xsl:variable name="mod" select="@mod"/>
     <xsl:variable name="name" select="@name"/>
     <xsl:variable name="arity" select="@arity"/>
-    <xsl:variable name="clause" select="@clause"/>
+    <xsl:variable name="clause_i" select="@clause_i"/>
     <xsl:variable name="spec0" select=
         "$i/specs/module[@name=$curModule]/spec
              [name=$name and arity=$arity
               and (string-length($mod) = 0 or module = $mod)]"/>
-    <xsl:variable name="spec" select="$spec0[string-length($clause) = 0
-                                             or position() = $clause]"/>
-    <xsl:if test="count($spec) = 0">
+    <xsl:variable name="spec" select="$spec0[string-length($clause_i) = 0
+                                             or position() = $clause_i]"/>
+
+    <xsl:if test="count($spec) != 1">
+      <xsl:variable name="why">
+        <xsl:choose>
+          <xsl:when test="count($spec) > 1">ambiguous spec</xsl:when>
+          <xsl:when test="count($spec) = 0">unknown spec</xsl:when>
+        </xsl:choose>
+      </xsl:variable>
       <xsl:call-template name="err">
+        <xsl:with-param name="f" select="$curModule"/>
 	<xsl:with-param name="m" select="$mod"/>
 	<xsl:with-param name="n" select="$name"/>
 	<xsl:with-param name="a" select="$arity"/>
-	<xsl:with-param name="s">unknown spec</xsl:with-param>
+        <xsl:with-param name="s" select="$why"/>
       </xsl:call-template>
     </xsl:if>
+    <xsl:copy-of select="$spec"/>
+  </xsl:template>
 
-    <xsl:variable name="arity_clause">
-      <xsl:choose>
-	<xsl:when test="string-length(@clause) > 0">
-	  <xsl:value-of select="@arity"/>/<xsl:value-of select="@clause"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="@arity"/>
-	</xsl:otherwise>
-      </xsl:choose>
+  <xsl:template name="spec_name">
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="spec0">
+      <xsl:call-template name="find_spec"/>
     </xsl:variable>
+    <xsl:variable name="spec" select="exsl:node-set($spec0)/spec"/>
 
     <xsl:choose>
       <xsl:when test="ancestor::cref">
@@ -89,72 +101,189 @@
 	</xsl:message>
       </xsl:when>
       <xsl:when test="ancestor::erlref">
-	<a name="{$name}-{$arity_clause}"></a>
-        <xsl:choose>
-          <xsl:when test="string(@with_guards) = 'no'">
-            <xsl:apply-templates select="$spec/contract/clause/head"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="contract">
-              <xsl:with-param name="contract" select="$spec/contract"/>
-            </xsl:call-template>
-          </xsl:otherwise>
+	<xsl:choose>
+	  <xsl:when test="preceding-sibling::name[position() = 1
+			  and @name = $name and @arity = $arity]">
+	    <!-- Avoid duplicated anchors.-->
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <a name="{$name}-{$arity}"></a>
+	  </xsl:otherwise>
         </xsl:choose>
+
+        <xsl:variable name="global_types" select="ancestor::erlref/datatypes"/>
+	<xsl:variable name="local_types"
+		      select="../type[string-length(@name) > 0]"/>
+	<xsl:apply-templates select="$spec/contract/clause/head">
+	  <xsl:with-param name="local_types" select="$local_types"/>
+	  <xsl:with-param name="global_types" select="$global_types"/>
+	</xsl:apply-templates>
       </xsl:when>
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template name="contract">
-    <xsl:param name="contract"/>
-    <xsl:call-template name="clause">
-      <xsl:with-param name="clause" select="$contract/clause"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="clause">
-    <xsl:param name="clause"/>
-    <xsl:variable name="type_desc" select="../type_desc"/>
-    <xsl:for-each select="$clause">
-      <xsl:apply-templates select="head"/>
-      <xsl:if test="count(guard) > 0">
-	<xsl:call-template name="guard">
-	  <xsl:with-param name="guard" select="guard"/>
-	  <xsl:with-param name="type_desc" select="$type_desc"/>
-	</xsl:call-template>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-
   <xsl:template match="head">
+    <xsl:param name="local_types"/>
+    <xsl:param name="global_types"/>
     <span class="bold_code">
-      <xsl:apply-templates/>
+      <xsl:apply-templates mode="local_type">
+        <xsl:with-param name="local_types" select="$local_types"/>
+        <xsl:with-param name="global_types" select="$global_types"/>
+      </xsl:apply-templates>
     </span>
     <br/>
   </xsl:template>
 
-  <xsl:template name="guard">
-    <xsl:param name="guard"/>
+  <!-- The *last* <name name="..." arity=".."/> -->
+  <xsl:template match="name" mode="types">
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="spec0">
+      <xsl:call-template name="find_spec"/>
+    </xsl:variable>
+    <xsl:variable name="spec" select="exsl:node-set($spec0)/spec"/>
+    <xsl:variable name="clause" select="$spec/contract/clause"/>
+
+    <xsl:variable name="global_types" select="ancestor::erlref/datatypes"/>
+    <xsl:variable name="type_desc" select="../type_desc"/>
+    <!-- $type is data types to be presented as guards ("local types") -->
+    <xsl:variable name="type"
+                  select="../type[string-length(@name) > 0
+                                  or string-length(@variable) > 0]"/>
+    <xsl:variable name="type_variables"
+                  select ="$type[string-length(@variable) > 0]"/>
+    <xsl:variable name="local_types"
+                  select ="$type[string-length(@name) > 0]"/>
+    <xsl:variable name="output_subtypes" select="count($type_variables) = 0"/>
+
+    <!-- It is assumed there is no support for overloaded specs
+         (there is no spec with more than one clause) -->
+    <xsl:if test="count($clause/guard) > 0 or count($type) > 0">
+      <div class="REFBODY"><p>Types:</p>
+
+        <xsl:choose>
+          <xsl:when test="$output_subtypes">
+            <xsl:call-template name="subtype">
+              <xsl:with-param name="subtype" select="$clause/guard/subtype"/>
+              <xsl:with-param name="type_desc" select="$type_desc"/>
+              <xsl:with-param name="local_types" select="$local_types"/>
+              <xsl:with-param name="global_types" select="$global_types"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="type_variables">
+              <xsl:with-param name="type_variables" select="$type_variables"/>
+              <xsl:with-param name="type_desc" select="$type_desc"/>
+              <xsl:with-param name="local_types" select="$local_types"/>
+              <xsl:with-param name="global_types" select="$global_types"/>
+	      <xsl:with-param name="fname" select="$name"/>
+	      <xsl:with-param name="arity" select="$arity"/>
+            </xsl:call-template>
+
+          </xsl:otherwise>
+        </xsl:choose>
+
+        <xsl:call-template name="local_type">
+          <xsl:with-param name="type_desc" select="$type_desc"/>
+          <xsl:with-param name="local_types" select="$local_types"/>
+          <xsl:with-param name="global_types" select="$global_types"/>
+        </xsl:call-template>
+      </div>
+
+    </xsl:if>
+  </xsl:template>
+
+  <!-- Handle <type variable="..." name_i="..."/> -->
+  <xsl:template name="type_variables">
+    <xsl:param name="type_variables"/>
     <xsl:param name="type_desc"/>
-    <div class="REFBODY"><p>Types:</p>
+    <xsl:param name="local_types"/>
+    <xsl:param name="global_types"/>
+    <xsl:param name="fname"/>
+    <xsl:param name="arity"/>
+
+    <xsl:variable name="names" select="../name[string-length(@arity) > 0]"/>
+    <xsl:for-each select="$type_variables">
+      <xsl:variable name="name_i">
+	<xsl:choose>
+          <xsl:when test="string-length(@name_i) > 0">
+	    <xsl:value-of select="@name_i"/>
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <xsl:value-of select="count($names)"/>
+	  </xsl:otherwise>
+	</xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="spec0">
+        <xsl:for-each select="$names[position() = $name_i]">
+          <xsl:call-template name="find_spec"/>
+        </xsl:for-each>
+      </xsl:variable>
+      <xsl:variable name="spec" select="exsl:node-set($spec0)/spec"/>
+      <xsl:variable name="clause" select="$spec/contract/clause"/>
+      <xsl:variable name="variable" select="@variable"/>
+      <xsl:variable name="subtype"
+                    select="$clause/guard/subtype[typename = $variable]"/>
+
+      <xsl:if test="count($subtype) = 0">
+	<xsl:call-template name="err">
+          <xsl:with-param name="f" select="ancestor::erlref/module"/>
+          <xsl:with-param name="n" select="$fname"/>
+          <xsl:with-param name="a" select="$arity"/>
+	  <xsl:with-param name="s">unknown type variable <xsl:value-of select="$variable"/>
+          </xsl:with-param>
+	</xsl:call-template>
+      </xsl:if>
+
       <xsl:call-template name="subtype">
-	<xsl:with-param name="subtype" select="$guard/subtype"/>
-	<xsl:with-param name="type_desc" select="$type_desc"/>
+        <xsl:with-param name="subtype" select="$subtype"/>
+        <xsl:with-param name="type_desc" select="$type_desc"/>
+        <xsl:with-param name="local_types" select="$local_types"/>
+        <xsl:with-param name="global_types" select="$global_types"/>
       </xsl:call-template>
-    </div>
+    </xsl:for-each>
   </xsl:template>
 
   <xsl:template name="subtype">
     <xsl:param name="subtype"/>
     <xsl:param name="type_desc"/>
+    <xsl:param name="local_types"/>
+    <xsl:param name="global_types"/>
+
     <xsl:for-each select="$subtype">
       <xsl:variable name="tname" select="typename"/>
-      <xsl:variable name="tdesc" select="$type_desc[@name = $tname]"/>
       <div class="REFTYPES">
 	<span class="bold_code">
-	  <xsl:apply-templates select="string"/>
+	  <xsl:apply-templates select="string" mode="local_type">
+	    <xsl:with-param name="local_types" select="$local_types"/>
+	    <xsl:with-param name="global_types" select="$global_types"/>
+	  </xsl:apply-templates>
 	</span>
       </div>
-      <xsl:apply-templates select="$type_desc[@name = $tname]"/>
+      <xsl:apply-templates select="$type_desc[@variable = $tname]"/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="local_type">
+    <xsl:param name="type_desc"/>
+    <xsl:param name="local_types"/>
+    <xsl:param name="global_types"/>
+
+    <xsl:for-each select="$local_types">
+      <div class="REFTYPES">
+	<xsl:call-template name="type_name">
+	  <xsl:with-param name="mode" select="'local_type'"/>
+	  <xsl:with-param name="local_types" select="$local_types"/>
+	  <xsl:with-param name="global_types" select="$global_types"/>
+	</xsl:call-template>
+      </div>
+      <xsl:variable name="tname" select="@name"/>
+      <xsl:variable name="tnvars" select="@n_vars"/>
+      <xsl:apply-templates select=
+	 "$type_desc[@name = $tname
+		     and (@n_vars = $tnvars
+			  or string-length(@n_vars) = 0 and
+			     string-length($tnvars) = 0)]"/>
     </xsl:for-each>
   </xsl:template>
 
@@ -193,130 +322,175 @@
     <xsl:apply-templates select="desc"/>
   </xsl:template>
 
-  <xsl:template match="typehead">
-    <span class="bold_code">
-      <xsl:apply-templates/>
-    </span><br/>
-  </xsl:template>
-
-  <!-- local_defs -->
-  <xsl:template match="local_defs">
-    <div class="REFBODY">
-      <xsl:apply-templates>
-      </xsl:apply-templates>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="local_def">
-    <div class="REFTYPES">
-      <span class="bold_code">
-        <xsl:apply-templates/>
-      </span>
-    </div>
-  </xsl:template>
+  <!-- The "mode" attribute of apply has been used to separate the case
+       when datatypes are copied into specifications' subtypes.
+       A local type has no anchor. There are no links to local types
+       from local types or guards/head of the same specification.
+  -->
 
   <xsl:template name="type_name">
+    <xsl:param name="mode"/> <!-- '' if <datatype> -->
+    <xsl:param name="local_types" select="/.."/>
+    <xsl:param name="global_types" select="/.."/>
     <xsl:variable name="curModule" select="ancestor::erlref/module"/>
     <xsl:variable name="mod" select="@mod"/>
     <xsl:variable name="name" select="@name"/>
-    <xsl:variable name="n_vars">
-      <xsl:choose>
-	<xsl:when test="string-length(@n_vars) > 0">
-	  <xsl:value-of select="@n_vars"/>
-	</xsl:when>
-	<xsl:otherwise>
-          <xsl:value-of select="0"/>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
+    <xsl:variable name="n_vars" select="@n_vars"/>
 
     <xsl:choose>
       <xsl:when test="string-length($name) > 0">
 	<xsl:variable name="type" select=
 	    "$i/specs/module[@name=$curModule]/type
-		 [name=$name and n_vars=$n_vars
+		 [name=$name
+		  and (string-length($n_vars) = 0 or n_vars = $n_vars)
 		  and (string-length($mod) = 0 or module = $mod)]"/>
 
 	<xsl:if test="count($type) != 1">
+	  <xsl:variable name="why">
+	    <xsl:choose>
+	      <xsl:when test="count($type) > 1">ambiguous type</xsl:when>
+	      <xsl:when test="count($type) = 0">unknown type</xsl:when>
+	    </xsl:choose>
+	  </xsl:variable>
 	  <xsl:call-template name="err">
+	    <xsl:with-param name="f" select="$curModule"/>
 	    <xsl:with-param name="m" select="$mod"/>
 	    <xsl:with-param name="n" select="$name"/>
 	    <xsl:with-param name="a" select="$n_vars"/>
-	    <xsl:with-param name="s">unknown type</xsl:with-param>
+	    <xsl:with-param name="s" select="$why"/>
 	  </xsl:call-template>
 	</xsl:if>
-	<xsl:apply-templates select="$type/typedecl"/>
+	<xsl:choose>
+	  <xsl:when test="$mode = ''">
+	    <xsl:apply-templates select="$type/typedecl"/>
+	  </xsl:when>
+	  <xsl:when test="$mode = 'local_type'">
+	    <xsl:apply-templates select="$type/typedecl" mode="local_type">
+	      <xsl:with-param name="local_types" select="$local_types"/>
+	      <xsl:with-param name="global_types" select="$global_types"/>
+	    </xsl:apply-templates>
+	  </xsl:when>
+	</xsl:choose>
       </xsl:when>
-      <xsl:otherwise>
+      <xsl:otherwise> <!-- <datatype> with <name> -->
 	<span class="bold_code">
-	  <xsl:value-of select="."/>
+          <xsl:apply-templates/>
 	</span>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template match="typehead">
+    <span class="bold_code">
+      <xsl:apply-templates/>
+    </span><br/>
+  </xsl:template>
+
+  <xsl:template match="typehead" mode="local_type">
+    <xsl:param name="local_types"/>
+    <xsl:param name="global_types"/>
+    <span class="bold_code">
+    <xsl:apply-templates mode="local_type">
+      <xsl:with-param name="local_types" select="$local_types"/>
+      <xsl:with-param name="global_types" select="$global_types"/>
+    </xsl:apply-templates>
+    </span><br/>
+  </xsl:template>
+
+  <!-- Not used right now -->
+  <!-- local_defs -->
+  <xsl:template match="local_defs">
+    <div class="REFBODY">
+      <xsl:apply-templates>
+      </xsl:apply-templates>
+    </div>
+  </xsl:template>
+
+  <!-- Not used right now -->
+  <xsl:template match="local_def">
+    <div class="REFTYPES">
+      <span class="bold_code">
+        <xsl:apply-templates/>
+      </span>
+    </div>
+  </xsl:template>
+
   <!-- Used both in <datatype> and in <func>! -->
   <xsl:template match="anno">
     <xsl:variable name="curModule" select="ancestor::erlref/module"/>
     <xsl:variable name="anno" select="normalize-space(text())"/>
     <xsl:variable name="namespec"
-                  select="ancestor::desc/preceding-sibling::name"/>
+                  select="ancestor::type_desc/preceding-sibling::name
+                          | ancestor::desc/preceding-sibling::name"/>
     <xsl:if test="count($namespec) = 0 and string-length($specs_file) > 0">
       <xsl:call-template name="err">
-	<xsl:with-param name="s">cannot find 'name' (<xsl:value-of select="$anno"/>)
+        <xsl:with-param name="f" select="$curModule"/>
+	<xsl:with-param name="s">cannot find tag 'name' (anno <xsl:value-of select="$anno"/>)
 	</xsl:with-param>
       </xsl:call-template>
     </xsl:if>
 
-    <xsl:variable name="mod" select="$namespec/@mod"/>
-    <xsl:variable name="name" select="$namespec/@name"/>
-    <xsl:variable name="arity" select="$namespec/@arity"/>
-    <xsl:variable name="clause" select="$namespec/@clause"/>
-    <xsl:variable name="tmp_n_vars" select="$namespec/@n_vars"/>
-    <xsl:variable name="n_vars">
-      <xsl:choose>
-	<xsl:when test="string-length($tmp_n_vars) > 0">
-	  <xsl:value-of select="$tmp_n_vars"/>
-	</xsl:when>
-	<xsl:otherwise>
-          <xsl:value-of select="0"/>
-	</xsl:otherwise>
-      </xsl:choose>
+    <!-- Search "local types" as well -->
+    <xsl:variable name="local_types"
+                select="ancestor::desc/preceding-sibling::type
+	                       [string-length(@name) > 0]"/>
+    <xsl:variable name="has_anno_in_local_type">
+      <xsl:for-each select="$local_types">
+	<xsl:call-template name="anno_name">
+	  <xsl:with-param name="curModule" select="$curModule"/>
+	  <xsl:with-param name="anno" select="$anno"/>
+	</xsl:call-template>
+      </xsl:for-each>
+    </xsl:variable>
+
+    <xsl:variable name="has_anno">
+      <xsl:for-each select="$namespec">
+	<xsl:call-template name="anno_name">
+	  <xsl:with-param name="curModule" select="$curModule"/>
+	  <xsl:with-param name="anno" select="$anno"/>
+	</xsl:call-template>
+      </xsl:for-each>
     </xsl:variable>
+
+    <xsl:if test="$has_anno = '' and $has_anno_in_local_type = ''">
+      <xsl:call-template name="err">
+        <xsl:with-param name="f" select="$curModule"/>
+	<xsl:with-param name="m" select="$namespec/@mod"/>
+	<xsl:with-param name="n" select="$namespec/@name"/>
+	<xsl:with-param name="a" select="'-'"/>
+	<xsl:with-param name="s">unknown annotation <xsl:value-of select="$anno"/>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:value-of select="$anno"/>
+  </xsl:template>
+
+  <xsl:template name="anno_name">
+    <xsl:param name="curModule"/>
+    <xsl:param name="anno"/>
+    <xsl:variable name="mod" select="@mod"/>
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="n_vars" select="@n_vars"/>
+    <xsl:variable name="clause_i" select="@clause_i"/>
+
     <xsl:variable name="spec0" select=
         "$i/specs/module[@name=$curModule]/spec
              [name=$name and arity=$arity
               and (string-length($mod) = 0 or module = $mod)]"/>
     <xsl:variable name="spec_annos" select=
-         "$spec0[string-length($clause) = 0
-                 or position() = $clause]/anno[.=$anno]"/>
+         "$spec0[string-length($clause_i) = 0
+                 or position() = $clause_i]/anno[.=$anno]"/>
     <xsl:variable name="type_annos" select=
         "$i/specs/module[@name=$curModule]/type
-             [name=$name and n_vars=$n_vars
+             [name=$name
+              and (string-length($n_vars) = 0 or n_vars=$n_vars)
               and (string-length($mod) = 0 or module = $mod)]/anno[.=$anno]"/>
-
-    <xsl:if test="count($spec_annos) = 0
-                  and count($type_annos) = 0
-	          and string-length($specs_file) > 0">
-      <xsl:variable name="n">
-        <xsl:choose>
-          <xsl:when test="string-length($arity) = 0">
-            <xsl:value-of select="$n_vars"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$arity"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:call-template name="err">
-	<xsl:with-param name="m" select="$mod"/>
-	<xsl:with-param name="n" select="$name"/>
-	<xsl:with-param name="a" select="$n"/>
-	<xsl:with-param name="s">unknown annotation <xsl:value-of select="$anno"/>
-	</xsl:with-param>
-      </xsl:call-template>
+    <xsl:if test="count($spec_annos) != 0
+                  or count($type_annos) != 0
+                  or string-length($specs_file) = 0">
+      <xsl:value-of select="true()"/>
     </xsl:if>
-    <xsl:value-of select="$anno"/>
   </xsl:template>
 
   <!-- Used for indentation of formatted types and specs -->
@@ -324,6 +498,50 @@
     <xsl:text>&#160;</xsl:text>
   </xsl:template>
 
+  <xsl:template match="nbsp" mode="local_type">
+    <xsl:apply-templates select="."/>
+  </xsl:template>
+
+  <xsl:template match="br" mode="local_type">
+    <xsl:apply-templates select="."/>
+  </xsl:template>
+
+  <xsl:template match="marker" mode="local_type">
+    <xsl:param name="local_types"/>
+    <xsl:param name="global_types"/>
+    <!-- Craete no anchor -->
+    <!-- It would be possible to create a link to the global type
+         (if there is one), but that would mean even more code...
+    -->
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <!-- Does not look at @n_vars -->
+  <xsl:template match="seealso" mode="local_type">
+    <xsl:param name="local_types"/>
+    <xsl:param name="global_types"/>
+
+    <xsl:variable name="filepart"><xsl:value-of select="substring-before(@marker, '#')"/></xsl:variable>
+    <xsl:variable name="linkpart"><xsl:value-of select="translate(substring-after(@marker, '#'), '/', '-')"/></xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="string-length($filepart) > 0">
+        <xsl:call-template name="seealso"/>
+      </xsl:when>
+      <xsl:when test="count($local_types[concat('type-', @name) = $linkpart]) = 0">
+        <xsl:call-template name="seealso"/>
+      </xsl:when>
+      <xsl:when test="count($global_types/datatype/name[concat('type-', @name) = $linkpart]) > 0">
+        <!-- The type is both local and global; link to the global type -->
+        <xsl:call-template name="seealso"/>
+      </xsl:when>
+      <xsl:otherwise>
+	<!-- No link to local type -->
+        <xsl:apply-templates/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
   <!-- End of Dialyzer type/spec tags -->
 
   <!-- Page layout -->
@@ -1178,14 +1396,7 @@
             <xsl:choose>
               <xsl:when test="string-length(@arity) > 0">
                 <!-- Dialyzer spec -->
-                <xsl:choose>
-                  <xsl:when test="string-length(@clause) > 0">
-                    <xsl:value-of select="@arity"/>/<xsl:value-of select="@clause"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="@arity"/>
-                  </xsl:otherwise>
-                </xsl:choose>
+                <xsl:value-of select="@arity"/>
               </xsl:when>
               <xsl:otherwise>
 		<xsl:call-template name="calc-arity">
@@ -1221,11 +1432,19 @@
             </xsl:choose>
           </xsl:variable>
 
-          <li title="{$fname}-{$arity}">
-            <a href="{$basename}.html#{$fname}-{$arity}">
-              <xsl:value-of select="$fname"/>/<xsl:value-of select="$arity"/>
-            </a>
-          </li>
+	  <xsl:choose>
+	    <xsl:when test="preceding-sibling::name[position() = 1
+                            and @name = $fname and @arity = $arity]">
+              <!-- Skip. Only works for Dialyzer specs. -->
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <li title="{$fname}-{$arity}">
+		<a href="{$basename}.html#{$fname}-{$arity}">
+		  <xsl:value-of select="$fname"/>/<xsl:value-of select="$arity"/>
+		</a>
+	      </li>
+	    </xsl:otherwise>
+	  </xsl:choose>
         </xsl:when>
       </xsl:choose>
 
@@ -1470,7 +1689,10 @@
   <xsl:template match="func">
     <xsl:param name="partnum"/>
 
-    <p><xsl:apply-templates select="name"/></p>
+    <p><xsl:apply-templates select="name"/>
+       <xsl:apply-templates
+           select="name[string-length(@arity) > 0 and position()=last()]"
+           mode="types"/></p>
 
     <xsl:apply-templates select="fsummary|type|desc">
       <xsl:with-param name="partnum" select="$partnum"/>
@@ -1478,7 +1700,6 @@
 
   </xsl:template>
 
-
   <xsl:template match="name">
     <xsl:choose>
       <!-- @arity is mandatory when referring to a specification -->
@@ -1488,6 +1709,11 @@
       <xsl:when test="ancestor::datatype">
         <xsl:call-template name="type_name"/>
       </xsl:when>
+      <xsl:when test="string-length(text()) = 0 and ancestor::erlref">
+	<xsl:message terminate="yes">
+          Error <xsl:value-of select="@name"/>: arity is mandatory when referring to specifications!
+	</xsl:message>
+      </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="name"/>
       </xsl:otherwise>
@@ -1556,12 +1782,17 @@
   <xsl:template match="type">
     <xsl:param name="partnum"/>
 
-    <div class="REFBODY"><p>Types:</p>
+    <!-- The case where @name != 0 is taken care of in "type_name" -->
+    <xsl:if test="string-length(@name) = 0 and string-length(@variable) = 0">
 
-      <xsl:apply-templates>
-        <xsl:with-param name="partnum" select="$partnum"/>
-      </xsl:apply-templates>
-    </div>
+      <div class="REFBODY"><p>Types:</p>
+
+	<xsl:apply-templates>
+	  <xsl:with-param name="partnum" select="$partnum"/>
+	</xsl:apply-templates>
+      </div>
+
+    </xsl:if>
 
   </xsl:template>
 
@@ -1612,7 +1843,10 @@
   </xsl:template>
 
   <xsl:template match="seealso">
+     <xsl:call-template name="seealso"/>
+  </xsl:template>
 
+  <xsl:template name="seealso">
     <xsl:variable name="filepart"><xsl:value-of select="substring-before(@marker, '#')"/></xsl:variable>
     <xsl:variable name="linkpart"><xsl:value-of select="translate(substring-after(@marker, '#'), '/', '-')"/></xsl:variable>
 
@@ -1633,16 +1867,16 @@
 		<xsl:variable name="app"
                               select="$m2a/mod2app/module[@name=$filepart]"/>
                 -->
-                <xsl:variable name="reftext" select="text()"/>
+                <xsl:variable name="this" select="."/>
                 <xsl:for-each select="$m2a">
                   <xsl:variable name="app" select="key('mod2app', $filepart)"/>
 		  <xsl:choose>
 		    <xsl:when test="string-length($app) > 0">
-		      <span class="bold_code"><a href="javascript:erlhref('{$topdocdir}/../','{$app}','{$filepart}.html');"><xsl:value-of select="$reftext"/></a></span>
+		      <span class="bold_code"><a href="javascript:erlhref('{$topdocdir}/../','{$app}','{$filepart}.html#{$linkpart}');"><xsl:value-of select="$this"/></a></span>
 		    </xsl:when>
 		    <xsl:otherwise>
 		      <!-- Unknown application; no link -->
-		      <xsl:value-of select="$reftext"/>
+		      <xsl:value-of select="$this"/>
 		    </xsl:otherwise>
 		  </xsl:choose>
                 </xsl:for-each>
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index 2a8fb9fe3e..25b62f68c5 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -3,7 +3,7 @@
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2010. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2011. 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
@@ -21,13 +21,16 @@
      -->
 
 <xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:exsl="http://exslt.org/common"
+  extension-element-prefixes="exsl">
 
   <xsl:preserve-space elements="code pre"/>
   <xsl:strip-space elements="*"/>
   <xsl:output method="text" encoding="UTF-8" indent="no"/>
 
-  <!-- Start of Dialyzer type/spec tags. See also the template matching "name"
+  <!-- Start of Dialyzer type/spec tags. See also the templates
+        matching "name" and "seealso"
   -->
 
   <!-- Note: specs data for *one* module (as opposed to html and pdf) -->
@@ -35,38 +38,58 @@
   <xsl:variable name="i" select="document($specs_file)"></xsl:variable>
 
   <xsl:template name="err">
+    <xsl:param name="f"/>
     <xsl:param name="m"/>
     <xsl:param name="n"/>
     <xsl:param name="a"/>
     <xsl:param name="s"/>
     <xsl:message terminate="yes">
-  Error <xsl:if test="$m != ''"><xsl:value-of select ="$m"/>:</xsl:if>
-	 <xsl:value-of
-		   select="$n"/>/<xsl:value-of
-		   select="$a"/>: <xsl:value-of select="$s"/>
+  Error <xsl:if test="$f != ''">in <xsl:value-of select ="$f"/>:</xsl:if>
+        <xsl:if test="$m != ''"><xsl:value-of select ="$m"/>:</xsl:if>
+        <xsl:value-of select="$n"/>
+        <xsl:if test="$a != ''">/<xsl:value-of
+             select ="$a"/></xsl:if>: <xsl:value-of select="$s"/>
     </xsl:message>
   </xsl:template>
 
-  <xsl:template name="spec_name">
+  <xsl:template name="find_spec">
     <xsl:variable name="curModule" select="ancestor::erlref/module"/>
     <xsl:variable name="mod" select="@mod"/>
     <xsl:variable name="name" select="@name"/>
     <xsl:variable name="arity" select="@arity"/>
-    <xsl:variable name="clause" select="@clause"/>
+    <xsl:variable name="clause_i" select="@clause_i"/>
     <xsl:variable name="spec0" select=
         "$i/module[@name=$curModule]/spec
              [name=$name and arity=$arity
               and (string-length($mod) = 0 or module = $mod)]"/>
-    <xsl:variable name="spec" select="$spec0[string-length($clause) = 0
-                                             or position() = $clause]"/>
-    <xsl:if test="count($spec) = 0">
+    <xsl:variable name="spec" select="$spec0[string-length($clause_i) = 0
+                                             or position() = $clause_i]"/>
+
+    <xsl:if test="count($spec) != 1">
+      <xsl:variable name="why">
+        <xsl:choose>
+          <xsl:when test="count($spec) > 1">ambiguous spec</xsl:when>
+          <xsl:when test="count($spec) = 0">unknown spec</xsl:when>
+        </xsl:choose>
+      </xsl:variable>
       <xsl:call-template name="err">
+        <xsl:with-param name="f" select="$curModule"/>
 	<xsl:with-param name="m" select="$mod"/>
 	<xsl:with-param name="n" select="$name"/>
 	<xsl:with-param name="a" select="$arity"/>
-	<xsl:with-param name="s">unknown spec</xsl:with-param>
+        <xsl:with-param name="s" select="$why"/>
       </xsl:call-template>
     </xsl:if>
+    <xsl:copy-of select="$spec"/>
+  </xsl:template>
+
+  <xsl:template name="spec_name">
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="spec0">
+      <xsl:call-template name="find_spec"/>
+    </xsl:variable>
+    <xsl:variable name="spec" select="exsl:node-set($spec0)/spec"/>
 
     <xsl:choose>
       <xsl:when test="ancestor::cref">
@@ -75,42 +98,12 @@
 	</xsl:message>
       </xsl:when>
       <xsl:when test="ancestor::erlref">
-	<xsl:choose>
-	  <xsl:when test="string(@with_guards) = 'no'">
-	     <xsl:apply-templates select="$spec/contract/clause/head"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-            <xsl:call-template name="contract">
-              <xsl:with-param name="contract" select="$spec/contract"/>
-            </xsl:call-template>
-	  </xsl:otherwise>
-	</xsl:choose>
+	<xsl:apply-templates select="$spec/contract/clause/head"/>
         <xsl:text>&#10;.br</xsl:text>
       </xsl:when>
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template name="contract">
-    <xsl:param name="contract"/>
-    <xsl:call-template name="clause">
-      <xsl:with-param name="clause" select="$contract/clause"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="clause">
-    <xsl:param name="clause"/>
-    <xsl:variable name="type_desc" select="../type_desc"/>
-    <xsl:for-each select="$clause">
-      <xsl:apply-templates select="head"/>
-      <xsl:if test="count(guard) > 0">
-	<xsl:call-template name="guard">
-	  <xsl:with-param name="guard" select="guard"/>
-	  <xsl:with-param name="type_desc" select="$type_desc"/>
-	</xsl:call-template>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-
   <xsl:template match="head">
     <xsl:text>&#10;.nf&#10;</xsl:text>
     <xsl:text>&#10;.B&#10;</xsl:text>
@@ -119,29 +112,141 @@
     <xsl:text>&#10;.fi</xsl:text>
   </xsl:template>
 
-  <xsl:template name="guard">
-    <xsl:param name="guard"/>
+  <!-- The *last* <name name="..." arity=".."/> -->
+  <xsl:template match="name" mode="types">
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="spec0">
+      <xsl:call-template name="find_spec"/>
+    </xsl:variable>
+    <xsl:variable name="spec" select="exsl:node-set($spec0)/spec"/>
+    <xsl:variable name="clause" select="$spec/contract/clause"/>
+
+    <xsl:variable name="type_desc" select="../type_desc"/>
+    <!-- $type is data types to be presented as guards ("local types") -->
+    <xsl:variable name="type"
+                  select="../type[string-length(@name) > 0
+                                  or string-length(@variable) > 0]"/>
+    <xsl:variable name="type_variables"
+                  select ="$type[string-length(@variable) > 0]"/>
+    <xsl:variable name="local_types"
+                  select ="$type[string-length(@name) > 0]"/>
+    <xsl:variable name="output_subtypes" select="count($type_variables) = 0"/>
+
+    <!-- It is assumed there is no support for overloaded specs
+         (there is no spec with more than one clause) -->
+    <xsl:if test="count($clause/guard) > 0 or count($type) > 0">
+      <xsl:text>&#10;.RS</xsl:text>
+      <xsl:text>&#10;.TP</xsl:text>
+      <xsl:text>&#10;Types</xsl:text>
+
+        <xsl:choose>
+          <xsl:when test="$output_subtypes">
+            <xsl:call-template name="subtype">
+              <xsl:with-param name="subtype" select="$clause/guard/subtype"/>
+              <xsl:with-param name="type_desc" select="$type_desc"/>
+              <xsl:with-param name="local_types" select="$local_types"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="type_variables">
+              <xsl:with-param name="type_variables" select="$type_variables"/>
+              <xsl:with-param name="type_desc" select="$type_desc"/>
+              <xsl:with-param name="local_types" select="$local_types"/>
+	      <xsl:with-param name="fname" select="$name"/>
+	      <xsl:with-param name="arity" select="$arity"/>
+            </xsl:call-template>
+
+          </xsl:otherwise>
+        </xsl:choose>
+
+        <xsl:call-template name="local_type">
+          <xsl:with-param name="type_desc" select="$type_desc"/>
+          <xsl:with-param name="local_types" select="$local_types"/>
+        </xsl:call-template>
+      <xsl:text>&#10;.RE</xsl:text>
+
+    </xsl:if>
+  </xsl:template>
+
+  <!-- Handle <type variable="..." name_i="..."/> -->
+  <xsl:template name="type_variables">
+    <xsl:param name="type_variables"/>
     <xsl:param name="type_desc"/>
-    <xsl:text>&#10;.RS</xsl:text>
-    <xsl:text>&#10;.TP</xsl:text>
-    <xsl:text>&#10;Types</xsl:text>
-    <xsl:call-template name="subtype">
-      <xsl:with-param name="subtype" select="$guard/subtype"/>
-      <xsl:with-param name="type_desc" select="$type_desc"/>
-    </xsl:call-template>
-    <xsl:text>&#10;.RE</xsl:text>
+    <xsl:param name="local_types"/>
+    <xsl:param name="fname"/>
+    <xsl:param name="arity"/>
+
+    <xsl:variable name="names" select="../name[string-length(@arity) > 0]"/>
+    <xsl:for-each select="$type_variables">
+      <xsl:variable name="name_i">
+	<xsl:choose>
+          <xsl:when test="string-length(@name_i) > 0">
+	    <xsl:value-of select="@name_i"/>
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <xsl:value-of select="count($names)"/>
+	  </xsl:otherwise>
+	</xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="spec0">
+        <xsl:for-each select="$names[position() = $name_i]">
+          <xsl:call-template name="find_spec"/>
+        </xsl:for-each>
+      </xsl:variable>
+      <xsl:variable name="spec" select="exsl:node-set($spec0)/spec"/>
+      <xsl:variable name="clause" select="$spec/contract/clause"/>
+      <xsl:variable name="variable" select="@variable"/>
+      <xsl:variable name="subtype"
+                    select="$clause/guard/subtype[typename = $variable]"/>
+
+      <xsl:if test="count($subtype) = 0">
+	<xsl:call-template name="err">
+          <xsl:with-param name="f" select="ancestor::erlref/module"/>
+          <xsl:with-param name="n" select="$fname"/>
+          <xsl:with-param name="a" select="$arity"/>
+	  <xsl:with-param name="s">unknown type variable <xsl:value-of select="$variable"/>
+          </xsl:with-param>
+	</xsl:call-template>
+      </xsl:if>
+
+      <xsl:call-template name="subtype">
+        <xsl:with-param name="subtype" select="$subtype"/>
+        <xsl:with-param name="type_desc" select="$type_desc"/>
+      </xsl:call-template>
+    </xsl:for-each>
   </xsl:template>
 
   <xsl:template name="subtype">
     <xsl:param name="subtype"/>
     <xsl:param name="type_desc"/>
+
     <xsl:for-each select="$subtype">
       <xsl:variable name="tname" select="typename"/>
-      <xsl:variable name="tdesc" select="$type_desc[@name = $tname]"/>
-        <xsl:text>&#10;</xsl:text>
-        <xsl:apply-templates select="string"/>
-        <xsl:text>&#10;.br</xsl:text>
-      <xsl:apply-templates select="$type_desc[@name = $tname]"/>
+      <xsl:text>&#10;</xsl:text>
+      <xsl:apply-templates select="string"/>
+      <xsl:text>&#10;.br</xsl:text>
+      <xsl:apply-templates select="$type_desc[@variable = $tname]"/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="local_type">
+    <xsl:param name="type_desc"/>
+    <xsl:param name="local_types"/>
+
+    <xsl:for-each select ="$local_types">
+      <xsl:text>&#10;</xsl:text>
+      <xsl:call-template name="type_name">
+	<xsl:with-param name="mode" select="'local_type'"/>
+      </xsl:call-template>
+      <xsl:text>&#10;.br</xsl:text>
+      <xsl:variable name="tname" select="@name"/>
+      <xsl:variable name="tnvars" select="@n_vars"/>
+      <xsl:apply-templates select=
+	 "$type_desc[@name = $tname
+		     and (@n_vars = $tnvars
+			  or string-length(@n_vars) = 0 and
+			     string-length($tnvars) = 0)]"/>
     </xsl:for-each>
   </xsl:template>
 
@@ -164,59 +269,46 @@
     <xsl:apply-templates/>
   </xsl:template>
 
-  <xsl:template match="typehead">
-    <xsl:text>&#10;.nf&#10;</xsl:text>
-    <xsl:text>&#10;.B&#10;</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&#10;.br</xsl:text>
-    <xsl:text>&#10;.fi</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="local_defs">
-    <xsl:text>&#10;.RS</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&#10;.RE</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="local_def">
-    <xsl:text>&#10;</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&#10;.br</xsl:text>
-  </xsl:template>
-
   <xsl:template name="type_name">
+    <xsl:param name="mode"/> <!-- '' if <datatype> -->
     <xsl:variable name="curModule" select="ancestor::erlref/module"/>
     <xsl:variable name="mod" select="@mod"/>
     <xsl:variable name="name" select="@name"/>
-    <xsl:variable name="n_vars">
-      <xsl:choose>
-	<xsl:when test="string-length(@n_vars) > 0">
-	  <xsl:value-of select="@n_vars"/>
-	</xsl:when>
-	<xsl:otherwise>
-          <xsl:value-of select="0"/>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
+    <xsl:variable name="n_vars" select="@n_vars"/>
 
     <xsl:choose>
       <xsl:when test="string-length($name) > 0">
 	<xsl:variable name="type" select=
 	    "$i/module[@name=$curModule]/type
-		 [name=$name and n_vars=$n_vars
+		 [name=$name
+		  and (string-length($n_vars) = 0 or n_vars = $n_vars)
 		  and (string-length($mod) = 0 or module = $mod)]"/>
 
 	<xsl:if test="count($type) != 1">
+	  <xsl:variable name="why">
+	    <xsl:choose>
+	      <xsl:when test="count($type) > 1">ambiguous type</xsl:when>
+	      <xsl:when test="count($type) = 0">unknown type</xsl:when>
+	    </xsl:choose>
+	  </xsl:variable>
 	  <xsl:call-template name="err">
+	    <xsl:with-param name="f" select="$curModule"/>
 	    <xsl:with-param name="m" select="$mod"/>
 	    <xsl:with-param name="n" select="$name"/>
 	    <xsl:with-param name="a" select="$n_vars"/>
-	    <xsl:with-param name="s">unknown type</xsl:with-param>
+	    <xsl:with-param name="s" select="$why"/>
 	  </xsl:call-template>
 	</xsl:if>
-	<xsl:apply-templates select="$type/typedecl"/>
+	<xsl:choose>
+	  <xsl:when test="$mode = ''">
+	    <xsl:apply-templates select="$type/typedecl"/>
+	  </xsl:when>
+	  <xsl:when test="$mode = 'local_type'">
+	    <xsl:apply-templates select="$type/typedecl" mode="local_type"/>
+	  </xsl:when>
+	</xsl:choose>
       </xsl:when>
-      <xsl:otherwise>
+      <xsl:otherwise> <!-- <datatype> with <name> -->
         <xsl:text>&#10;.nf&#10;</xsl:text>
         <xsl:text>&#10;.B&#10;</xsl:text>
         <xsl:apply-templates/>
@@ -226,68 +318,109 @@
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template match="typehead">
+    <xsl:text>&#10;.nf&#10;</xsl:text>
+    <xsl:text>&#10;.B&#10;</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>&#10;.br</xsl:text>
+    <xsl:text>&#10;.fi</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="typehead" mode="local_type">
+    <xsl:text>.nf&#10;</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>&#10;.fi</xsl:text>
+  </xsl:template>
+
+  <!-- Not used right now -->
+  <xsl:template match="local_defs">
+    <xsl:text>&#10;.RS</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>&#10;.RE</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="local_def">
+    <xsl:text>&#10;</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>&#10;.br</xsl:text>
+  </xsl:template>
+
   <!-- Used both in <datatype> and in <func>! -->
   <xsl:template match="anno">
     <xsl:variable name="curModule" select="ancestor::erlref/module"/>
     <xsl:variable name="anno" select="normalize-space(text())"/>
     <xsl:variable name="namespec"
-                  select="ancestor::desc/preceding-sibling::name"/>
+                  select="ancestor::type_desc/preceding-sibling::name
+                          | ancestor::desc/preceding-sibling::name"/>
     <xsl:if test="count($namespec) = 0 and string-length($specs_file) > 0">
       <xsl:call-template name="err">
-	<xsl:with-param name="s">cannot find 'name' (<xsl:value-of select="$anno"/>)
+        <xsl:with-param name="f" select="$curModule"/>
+	<xsl:with-param name="s">cannot find tag 'name' (anno <xsl:value-of select="$anno"/>)
 	</xsl:with-param>
       </xsl:call-template>
     </xsl:if>
 
-    <xsl:variable name="mod" select="$namespec/@mod"/>
-    <xsl:variable name="name" select="$namespec/@name"/>
-    <xsl:variable name="arity" select="$namespec/@arity"/>
-    <xsl:variable name="clause" select="$namespec/@clause"/>
-    <xsl:variable name="tmp_n_vars" select="$namespec/@n_vars"/>
-    <xsl:variable name="n_vars">
-      <xsl:choose>
-	<xsl:when test="string-length($tmp_n_vars) > 0">
-	  <xsl:value-of select="$tmp_n_vars"/>
-	</xsl:when>
-	<xsl:otherwise>
-          <xsl:value-of select="0"/>
-	</xsl:otherwise>
-      </xsl:choose>
+    <!-- Search "local types" as well -->
+    <xsl:variable name="local_types"
+                select="ancestor::desc/preceding-sibling::type
+	                       [string-length(@name) > 0]"/>
+    <xsl:variable name="has_anno_in_local_type">
+      <xsl:for-each select="$local_types">
+	<xsl:call-template name="anno_name">
+	  <xsl:with-param name="curModule" select="$curModule"/>
+	  <xsl:with-param name="anno" select="$anno"/>
+	</xsl:call-template>
+      </xsl:for-each>
+    </xsl:variable>
+
+    <xsl:variable name="has_anno">
+      <xsl:for-each select="$namespec">
+	<xsl:call-template name="anno_name">
+	  <xsl:with-param name="curModule" select="$curModule"/>
+	  <xsl:with-param name="anno" select="$anno"/>
+	</xsl:call-template>
+      </xsl:for-each>
     </xsl:variable>
+
+    <xsl:if test="$has_anno = '' and $has_anno_in_local_type = ''">
+      <xsl:call-template name="err">
+        <xsl:with-param name="f" select="$curModule"/>
+	<xsl:with-param name="m" select="$namespec/@mod"/>
+	<xsl:with-param name="n" select="$namespec/@name"/>
+	<xsl:with-param name="a" select="'-'"/>
+	<xsl:with-param name="s">unknown annotation <xsl:value-of select="$anno"/>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:value-of select="$anno"/>
+  </xsl:template>
+
+  <xsl:template name="anno_name">
+    <xsl:param name="curModule"/>
+    <xsl:param name="anno"/>
+    <xsl:variable name="mod" select="@mod"/>
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="n_vars" select="@n_vars"/>
+    <xsl:variable name="clause_i" select="@clause_i"/>
+
     <xsl:variable name="spec0" select=
         "$i/module[@name=$curModule]/spec
              [name=$name and arity=$arity
               and (string-length($mod) = 0 or module = $mod)]"/>
     <xsl:variable name="spec_annos" select=
-         "$spec0[string-length($clause) = 0
-                 or position() = $clause]/anno[.=$anno]"/>
+         "$spec0[string-length($clause_i) = 0
+                 or position() = $clause_i]/anno[.=$anno]"/>
     <xsl:variable name="type_annos" select=
         "$i/module[@name=$curModule]/type
-             [name=$name and n_vars=$n_vars
+             [name=$name
+              and (string-length($n_vars) = 0 or n_vars=$n_vars)
               and (string-length($mod) = 0 or module = $mod)]/anno[.=$anno]"/>
-
-    <xsl:if test="count($spec_annos) = 0
-                  and count($type_annos) = 0
-	          and string-length($specs_file) > 0">
-      <xsl:variable name="n">
-        <xsl:choose>
-          <xsl:when test="string-length($arity) = 0">
-            <xsl:value-of select="$n_vars"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$arity"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:call-template name="err">
-	<xsl:with-param name="m" select="$mod"/>
-	<xsl:with-param name="n" select="$name"/>
-	<xsl:with-param name="a" select="$n"/>
-	<xsl:with-param name="s">unknown annotation <xsl:value-of select="$anno"/>
-	</xsl:with-param>
-      </xsl:call-template>
+    <xsl:if test="count($spec_annos) != 0
+                  or count($type_annos) != 0
+                  or string-length($specs_file) = 0">
+      <xsl:value-of select="true()"/>
     </xsl:if>
-    <xsl:value-of select="$anno"/>
   </xsl:template>
 
   <!-- Used for indentation of formatted types and specs -->
@@ -542,6 +675,9 @@
   <xsl:template match="func">
     <xsl:text>&#10;.LP</xsl:text>
     <xsl:apply-templates select="name"/>
+    <xsl:apply-templates
+        select="name[string-length(@arity) > 0 and position()=last()]"
+        mode="types"/>
     <xsl:apply-templates select="fsummary|type|desc"/>
   </xsl:template>
 
@@ -554,6 +690,11 @@
       <xsl:when test="ancestor::datatype">
         <xsl:call-template name="type_name"/>
       </xsl:when>
+      <xsl:when test="string-length(text()) = 0 and ancestor::erlref">
+	<xsl:message terminate="yes">
+          Error <xsl:value-of select="@name"/>: arity is mandatory when referring to specifications!
+	</xsl:message>
+      </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="name"/>
       </xsl:otherwise>
@@ -569,11 +710,14 @@
 
   <!-- Type -->
   <xsl:template match="type">
-    <xsl:text>&#10;.RS</xsl:text>
-    <xsl:text>&#10;.TP</xsl:text>
-    <xsl:text>&#10;Types</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&#10;.RE</xsl:text>
+    <!-- The case where @name != 0 is taken care of in "type_name" -->
+    <xsl:if test="string-length(@name) = 0 and string-length(@variable) = 0">
+      <xsl:text>&#10;.RS</xsl:text>
+      <xsl:text>&#10;.TP</xsl:text>
+      <xsl:text>&#10;Types</xsl:text>
+      <xsl:apply-templates/>
+      <xsl:text>&#10;.RE</xsl:text>
+    </xsl:if>
   </xsl:template>
 
 
@@ -622,7 +766,7 @@
     <xsl:text>&gt;</xsl:text>
   </xsl:template>
 
-  <!-- Do not noramlize any text within pre and code tags. -->
+  <!-- Do not normalize any text within pre and code tags. -->
   <xsl:template match="pre/text()">
       <xsl:call-template name="replace-string">
         <xsl:with-param name="text" select="." />
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index f500cd3fee..5119e3e36a 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -21,6 +21,8 @@
      -->
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:exsl="http://exslt.org/common"
+  extension-element-prefixes="exsl"
   xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
   <xsl:output method="xml" indent="yes"/>
@@ -28,45 +30,66 @@
   <xsl:include href="db_pdf_params.xsl"/>
 
   <!-- Start of Dialyzer type/spec tags.
-       See also the template matching "name" and the template "bookmarks6"
+       See also the templates matching "name" and "seealso" as well as
+       the template "bookmarks6"
   -->
 
   <xsl:param name="specs_file" select="''"/>
   <xsl:variable name="i" select="document($specs_file)"></xsl:variable>
 
   <xsl:template name="err">
+    <xsl:param name="f"/>
     <xsl:param name="m"/>
     <xsl:param name="n"/>
     <xsl:param name="a"/>
     <xsl:param name="s"/>
     <xsl:message terminate="yes">
-  Error <xsl:if test="$m != ''"><xsl:value-of select ="$m"/>:</xsl:if>
-	 <xsl:value-of
-		   select="$n"/>/<xsl:value-of
-		   select="$a"/>: <xsl:value-of select="$s"/>
+  Error <xsl:if test="$f != ''">in <xsl:value-of select ="$f"/>:</xsl:if>
+        <xsl:if test="$m != ''"><xsl:value-of select ="$m"/>:</xsl:if>
+        <xsl:value-of select="$n"/>
+        <xsl:if test="$a != ''">/<xsl:value-of
+             select ="$a"/></xsl:if>: <xsl:value-of select="$s"/>
     </xsl:message>
   </xsl:template>
 
-  <xsl:template name="spec_name">
+  <xsl:template name="find_spec">
     <xsl:variable name="curModule" select="ancestor::erlref/module"/>
     <xsl:variable name="mod" select="@mod"/>
     <xsl:variable name="name" select="@name"/>
     <xsl:variable name="arity" select="@arity"/>
-    <xsl:variable name="clause" select="@clause"/>
+    <xsl:variable name="clause_i" select="@clause_i"/>
     <xsl:variable name="spec0" select=
         "$i/specs/module[@name=$curModule]/spec
              [name=$name and arity=$arity
               and (string-length($mod) = 0 or module = $mod)]"/>
-    <xsl:variable name="spec" select="$spec0[string-length($clause) = 0
-                                             or position() = $clause]"/>
-    <xsl:if test="count($spec) = 0">
+    <xsl:variable name="spec" select="$spec0[string-length($clause_i) = 0
+                                             or position() = $clause_i]"/>
+
+    <xsl:if test="count($spec) != 1">
+      <xsl:variable name="why">
+        <xsl:choose>
+          <xsl:when test="count($spec) > 1">ambiguous spec</xsl:when>
+          <xsl:when test="count($spec) = 0">unknown spec</xsl:when>
+        </xsl:choose>
+      </xsl:variable>
       <xsl:call-template name="err">
+        <xsl:with-param name="f" select="$curModule"/>
 	<xsl:with-param name="m" select="$mod"/>
 	<xsl:with-param name="n" select="$name"/>
 	<xsl:with-param name="a" select="$arity"/>
-	<xsl:with-param name="s">unknown spec</xsl:with-param>
+        <xsl:with-param name="s" select="$why"/>
       </xsl:call-template>
     </xsl:if>
+    <xsl:copy-of select="$spec"/>
+  </xsl:template>
+
+  <xsl:template name="spec_name">
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="spec0">
+      <xsl:call-template name="find_spec"/>
+    </xsl:variable>
+    <xsl:variable name="spec" select="exsl:node-set($spec0)/spec"/>
 
     <xsl:choose>
       <xsl:when test="ancestor::cref">
@@ -76,78 +99,175 @@
       </xsl:when>
       <xsl:when test="ancestor::erlref">
         <fo:block id="{generate-id()}">
-	  <xsl:choose>
-            <xsl:when test="string(@with_guards) = 'no'">
-               <xsl:apply-templates select="$spec/contract/clause/head"/>
-            </xsl:when>
-            <xsl:otherwise>
-	      <xsl:call-template name="contract">
-		<xsl:with-param name="contract" select="$spec/contract"/>
-	      </xsl:call-template>
-            </xsl:otherwise>
-          </xsl:choose>
+	  <xsl:apply-templates select="$spec/contract/clause/head"/>
         </fo:block>
       </xsl:when>
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template name="contract">
-    <xsl:param name="contract"/>
-    <xsl:call-template name="clause">
-      <xsl:with-param name="clause" select="$contract/clause"/>
-    </xsl:call-template>
+  <xsl:template match="head">
+    <fo:block xsl:use-attribute-sets="function-name">
+      <xsl:apply-templates/>
+    </fo:block>
   </xsl:template>
 
-  <xsl:template name="clause">
-    <xsl:param name="clause"/>
+  <!-- The *last* <name name="..." arity=".."/> -->
+  <xsl:template match="name" mode="types">
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="spec0">
+      <xsl:call-template name="find_spec"/>
+    </xsl:variable>
+    <xsl:variable name="spec" select="exsl:node-set($spec0)/spec"/>
+    <xsl:variable name="clause" select="$spec/contract/clause"/>
+
     <xsl:variable name="type_desc" select="../type_desc"/>
-    <xsl:for-each select="$clause">
-      <xsl:apply-templates select="head"/>
-      <xsl:if test="count(guard) > 0">
-	<xsl:call-template name="guard">
-	  <xsl:with-param name="guard" select="guard"/>
+    <!-- $type is data types to be presented as guards ("local types") -->
+    <xsl:variable name="type"
+                  select="../type[string-length(@name) > 0
+                                  or string-length(@variable) > 0]"/>
+    <xsl:variable name="type_variables"
+                  select ="$type[string-length(@variable) > 0]"/>
+    <xsl:variable name="local_types"
+                  select ="$type[string-length(@name) > 0]"/>
+    <xsl:variable name="output_subtypes" select="count($type_variables) = 0"/>
+
+    <!-- It is assumed there is no support for overloaded specs
+         (there is no spec with more than one clause) -->
+    <xsl:if test="count($clause/guard) > 0 or count($type) > 0">
+      <fo:block>
+	<xsl:text>Types:</xsl:text>
+      </fo:block>
+      <fo:list-block xsl:use-attribute-sets="type-listblock">
+	<xsl:choose>
+	  <xsl:when test="$output_subtypes">
+	    <xsl:call-template name="subtype">
+	      <xsl:with-param name="subtype" select="$clause/guard/subtype"/>
+	      <xsl:with-param name="type_desc" select="$type_desc"/>
+	      <xsl:with-param name="local_types" select="$local_types"/>
+	    </xsl:call-template>
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <xsl:call-template name="type_variables">
+	      <xsl:with-param name="type_variables" select="$type_variables"/>
+	      <xsl:with-param name="type_desc" select="$type_desc"/>
+	      <xsl:with-param name="local_types" select="$local_types"/>
+	      <xsl:with-param name="fname" select="$name"/>
+	      <xsl:with-param name="arity" select="$arity"/>
+	    </xsl:call-template>
+
+	  </xsl:otherwise>
+	</xsl:choose>
+
+	<xsl:call-template name="local_type">
 	  <xsl:with-param name="type_desc" select="$type_desc"/>
+	  <xsl:with-param name="local_types" select="$local_types"/>
 	</xsl:call-template>
-      </xsl:if>
-    </xsl:for-each>
+      </fo:list-block>
+    </xsl:if>
   </xsl:template>
 
-  <xsl:template match="head">
-    <fo:block xsl:use-attribute-sets="function-name">
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
+  <!-- Handle <type variable="..." name_i="..."/> -->
+  <xsl:template name="type_variables">
+    <xsl:param name="type_variables"/>
+    <xsl:param name="type_desc"/>
+    <xsl:param name="local_types"/>
+    <xsl:param name="fname"/>
+    <xsl:param name="arity"/>
+
+    <xsl:variable name="names" select="../name[string-length(@arity) > 0]"/>
+    <xsl:for-each select="$type_variables">
+      <xsl:variable name="name_i">
+	<xsl:choose>
+          <xsl:when test="string-length(@name_i) > 0">
+	    <xsl:value-of select="@name_i"/>
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <xsl:value-of select="count($names)"/>
+	  </xsl:otherwise>
+	</xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="spec0">
+        <xsl:for-each select="$names[position() = $name_i]">
+          <xsl:call-template name="find_spec"/>
+        </xsl:for-each>
+      </xsl:variable>
+      <xsl:variable name="spec" select="exsl:node-set($spec0)/spec"/>
+      <xsl:variable name="clause" select="$spec/contract/clause"/>
+      <xsl:variable name="variable" select="@variable"/>
+      <xsl:variable name="subtype"
+                    select="$clause/guard/subtype[typename = $variable]"/>
+
+      <xsl:if test="count($subtype) = 0">
+	<xsl:call-template name="err">
+          <xsl:with-param name="f" select="ancestor::erlref/module"/>
+          <xsl:with-param name="n" select="$fname"/>
+          <xsl:with-param name="a" select="$arity"/>
+	  <xsl:with-param name="s">unknown type variable <xsl:value-of select="$variable"/>
+          </xsl:with-param>
+	</xsl:call-template>
+      </xsl:if>
 
-  <xsl:template name="guard">
-    <fo:block>
-      <xsl:text>Types:</xsl:text>
-    </fo:block>
-    <fo:list-block xsl:use-attribute-sets="type-listblock">
       <xsl:call-template name="subtype">
-	<xsl:with-param name="subtype" select="$guard/subtype"/>
-	<xsl:with-param name="type_desc" select="$type_desc"/>
+        <xsl:with-param name="subtype" select="$subtype"/>
+        <xsl:with-param name="type_desc" select="$type_desc"/>
       </xsl:call-template>
-    </fo:list-block>
+    </xsl:for-each>
   </xsl:template>
 
+  <!-- Substituted
+       <fo:block xsl:use-attribute-sets="function-name">
+       for
+       <fo:block font-weight="bold">
+       to get proper indentation (a monospace font)
+  -->
   <xsl:template name="subtype">
     <xsl:param name="subtype"/>
     <xsl:param name="type_desc"/>
+
     <xsl:for-each select="$subtype">
       <xsl:variable name="tname" select="typename"/>
-      <xsl:variable name="tdesc" select="$type_desc[@name = $tname]"/>
       <fo:list-item xsl:use-attribute-sets="type-listitem">
 	<fo:list-item-label end-indent="label-end()">
 	  <fo:block>
 	  </fo:block>
 	</fo:list-item-label>
 	<fo:list-item-body start-indent="body-start()" format="justify">
-	  <fo:block font-weight="bold">
-            <xsl:apply-templates select="string"/>
+          <fo:block xsl:use-attribute-sets="function-name">
+	    <xsl:apply-templates select="string"/>
 	  </fo:block>
 	</fo:list-item-body>
       </fo:list-item>
-      <xsl:apply-templates select="$type_desc[@name = $tname]"/>
+      <xsl:apply-templates select="$type_desc[@variable = $tname]"/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="local_type">
+    <xsl:param name="type_desc"/>
+    <xsl:param name="local_types"/>
+
+    <xsl:for-each select="$local_types">
+      <fo:list-item xsl:use-attribute-sets="type-listitem">
+	<fo:list-item-label end-indent="label-end()">
+	  <fo:block>
+	  </fo:block>
+	</fo:list-item-label>
+	<fo:list-item-body start-indent="body-start()" format="justify">
+	  <!-- <fo:block font-weight="bold">
+               (use function-name in "typehead" instead) -->
+	    <xsl:call-template name="type_name">
+	      <xsl:with-param name="mode" select="'local_type'"/>
+	    </xsl:call-template>
+	  <!-- </fo:block> -->
+	</fo:list-item-body>
+      </fo:list-item>
+      <xsl:variable name="tname" select="@name"/>
+      <xsl:variable name="tnvars" select="@n_vars"/>
+      <xsl:apply-templates select=
+	 "$type_desc[@name = $tname
+		     and (@n_vars = $tnvars
+			  or string-length(@n_vars) = 0 and
+			     string-length($tnvars) = 0)]"/>
     </xsl:for-each>
   </xsl:template>
 
@@ -182,6 +302,53 @@
     <xsl:apply-templates select="desc"/>
   </xsl:template>
 
+  <xsl:template name="type_name">
+    <xsl:param name="mode"/> <!-- '' if <datatype> -->
+    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
+    <xsl:variable name="mod" select="@mod"/>
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="n_vars" select="@n_vars"/>
+
+    <xsl:choose>
+      <xsl:when test="string-length($name) > 0">
+	<xsl:variable name="type" select=
+	    "$i/specs/module[@name=$curModule]/type
+		 [name=$name
+		  and (string-length($n_vars) = 0 or n_vars = $n_vars)
+		  and (string-length($mod) = 0 or module = $mod)]"/>
+
+	<xsl:if test="count($type) != 1">
+	  <xsl:variable name="why">
+	    <xsl:choose>
+	      <xsl:when test="count($type) > 1">ambiguous type</xsl:when>
+	      <xsl:when test="count($type) = 0">unknown type</xsl:when>
+	    </xsl:choose>
+	  </xsl:variable>
+	  <xsl:call-template name="err">
+	    <xsl:with-param name="f" select="$curModule"/>
+	    <xsl:with-param name="m" select="$mod"/>
+	    <xsl:with-param name="n" select="$name"/>
+	    <xsl:with-param name="a" select="$n_vars"/>
+	    <xsl:with-param name="s" select="$why"/>
+	  </xsl:call-template>
+	</xsl:if>
+	<xsl:choose>
+	  <xsl:when test="$mode = ''">
+	    <xsl:apply-templates select="$type/typedecl"/>
+	  </xsl:when>
+	  <xsl:when test="$mode = 'local_type'">
+	    <xsl:apply-templates select="$type/typedecl" mode="local_type"/>
+	  </xsl:when>
+	</xsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+	<fo:inline font-weight="bold" xsl:use-attribute-sets="type-listitem">
+	<xsl:value-of select="."/>
+	</fo:inline>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
   <!-- Like <head>... -->
   <xsl:template match="typehead">
     <fo:block xsl:use-attribute-sets="function-name">
@@ -189,6 +356,20 @@
     </fo:block>
   </xsl:template>
 
+  <!-- Substituted
+       <fo:block xsl:use-attribute-sets="function-name">
+       for
+       <fo:block font-weight="bold">
+       to get proper indentation (a monospace font)
+  -->
+
+  <xsl:template match="typehead" mode="local_type">
+    <fo:block xsl:use-attribute-sets="function-name">
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+
+  <!-- Not used right now -->
   <!-- Like <guard>, except "Types:"... -->
   <xsl:template match="local_defs">
     <fo:list-block xsl:use-attribute-sets="type-listblock">
@@ -211,108 +392,82 @@
     </fo:list-item>
   </xsl:template>
 
-  <xsl:template name="type_name">
-    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
-    <xsl:variable name="mod" select="@mod"/>
-    <xsl:variable name="name" select="@name"/>
-    <xsl:variable name="n_vars">
-      <xsl:choose>
-	<xsl:when test="string-length(@n_vars) > 0">
-	  <xsl:value-of select="@n_vars"/>
-	</xsl:when>
-	<xsl:otherwise>
-          <xsl:value-of select="0"/>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:choose>
-      <xsl:when test="string-length($name) > 0">
-	<xsl:variable name="type" select=
-	    "$i/specs/module[@name=$curModule]/type
-		 [name=$name and n_vars=$n_vars
-		  and (string-length($mod) = 0 or module = $mod)]"/>
-
-	<xsl:if test="count($type) != 1">
-	  <xsl:call-template name="err">
-	    <xsl:with-param name="m" select="$mod"/>
-	    <xsl:with-param name="n" select="$name"/>
-	    <xsl:with-param name="a" select="$n_vars"/>
-	    <xsl:with-param name="s">unknown type</xsl:with-param>
-	  </xsl:call-template>
-	</xsl:if>
-	<xsl:apply-templates select="$type/typedecl"/>
-      </xsl:when>
-      <xsl:otherwise>
-	<fo:inline font-weight="bold" xsl:use-attribute-sets="type-listitem">
-	<xsl:value-of select="."/>
-	</fo:inline>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
   <!-- Used both in <datatype> and in <func>! -->
   <xsl:template match="anno">
     <xsl:variable name="curModule" select="ancestor::erlref/module"/>
     <xsl:variable name="anno" select="normalize-space(text())"/>
     <xsl:variable name="namespec"
-                  select="ancestor::desc/preceding-sibling::name"/>
+                  select="ancestor::type_desc/preceding-sibling::name
+                          | ancestor::desc/preceding-sibling::name"/>
     <xsl:if test="count($namespec) = 0 and string-length($specs_file) > 0">
       <xsl:call-template name="err">
-	<xsl:with-param name="s">cannot find 'name' (<xsl:value-of select="$anno"/>)
+        <xsl:with-param name="f" select="$curModule"/>
+	<xsl:with-param name="s">cannot find tag 'name' (anno <xsl:value-of select="$anno"/>)
 	</xsl:with-param>
       </xsl:call-template>
     </xsl:if>
 
-    <xsl:variable name="mod" select="$namespec/@mod"/>
-    <xsl:variable name="name" select="$namespec/@name"/>
-    <xsl:variable name="arity" select="$namespec/@arity"/>
-    <xsl:variable name="clause" select="$namespec/@clause"/>
-    <xsl:variable name="tmp_n_vars" select="$namespec/@n_vars"/>
-    <xsl:variable name="n_vars">
-      <xsl:choose>
-	<xsl:when test="string-length($tmp_n_vars) > 0">
-	  <xsl:value-of select="$tmp_n_vars"/>
-	</xsl:when>
-	<xsl:otherwise>
-          <xsl:value-of select="0"/>
-	</xsl:otherwise>
-      </xsl:choose>
+    <!-- Search "local types" as well -->
+    <xsl:variable name="local_types"
+                select="ancestor::desc/preceding-sibling::type
+	                       [string-length(@name) > 0]"/>
+    <xsl:variable name="has_anno_in_local_type">
+      <xsl:for-each select="$local_types">
+	<xsl:call-template name="anno_name">
+	  <xsl:with-param name="curModule" select="$curModule"/>
+	  <xsl:with-param name="anno" select="$anno"/>
+	</xsl:call-template>
+      </xsl:for-each>
+    </xsl:variable>
+
+    <xsl:variable name="has_anno">
+      <xsl:for-each select="$namespec">
+	<xsl:call-template name="anno_name">
+	  <xsl:with-param name="curModule" select="$curModule"/>
+	  <xsl:with-param name="anno" select="$anno"/>
+	</xsl:call-template>
+      </xsl:for-each>
     </xsl:variable>
+
+    <xsl:if test="$has_anno = '' and $has_anno_in_local_type = ''">
+      <xsl:call-template name="err">
+        <xsl:with-param name="f" select="$curModule"/>
+	<xsl:with-param name="m" select="$namespec/@mod"/>
+	<xsl:with-param name="n" select="$namespec/@name"/>
+	<xsl:with-param name="a" select="'-'"/>
+	<xsl:with-param name="s">unknown annotation <xsl:value-of select="$anno"/>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:value-of select="$anno"/>
+  </xsl:template>
+
+  <xsl:template name="anno_name">
+    <xsl:param name="curModule"/>
+    <xsl:param name="anno"/>
+    <xsl:variable name="mod" select="@mod"/>
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="n_vars" select="@n_vars"/>
+    <xsl:variable name="clause_i" select="@clause_i"/>
+
     <xsl:variable name="spec0" select=
         "$i/specs/module[@name=$curModule]/spec
              [name=$name and arity=$arity
               and (string-length($mod) = 0 or module = $mod)]"/>
     <xsl:variable name="spec_annos" select=
-         "$spec0[string-length($clause) = 0
-                 or position() = $clause]/anno[.=$anno]"/>
+         "$spec0[string-length($clause_i) = 0
+                 or position() = $clause_i]/anno[.=$anno]"/>
     <xsl:variable name="type_annos" select=
         "$i/specs/module[@name=$curModule]/type
-             [name=$name and n_vars=$n_vars
+             [name=$name
+              and (string-length($n_vars) = 0 or n_vars=$n_vars)
               and (string-length($mod) = 0 or module = $mod)]/anno[.=$anno]"/>
-
-    <xsl:if test="count($spec_annos) = 0
-                  and count($type_annos) = 0
-	          and string-length($specs_file) > 0">
-      <xsl:variable name="n">
-        <xsl:choose>
-          <xsl:when test="string-length($arity) = 0">
-            <xsl:value-of select="$n_vars"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$arity"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:call-template name="err">
-	<xsl:with-param name="m" select="$mod"/>
-	<xsl:with-param name="n" select="$name"/>
-	<xsl:with-param name="a" select="$n"/>
-	<xsl:with-param name="s">unknown annotation <xsl:value-of select="$anno"/>
-	</xsl:with-param>
-      </xsl:call-template>
+    <xsl:if test="count($spec_annos) != 0
+                  or count($type_annos) != 0
+                  or string-length($specs_file) = 0">
+      <xsl:value-of select="true()"/>
     </xsl:if>
-    <xsl:value-of select="$anno"/>
   </xsl:template>
 
   <!-- Used for indentation of formatted types and specs -->
@@ -1227,6 +1382,9 @@
     <xsl:param name="partnum"/>
 
     <xsl:apply-templates select="name"/>
+    <xsl:apply-templates
+        select="name[string-length(@arity) > 0 and position()=last()]"
+        mode="types"/>
 
     <xsl:apply-templates select="fsummary|type|desc">
       <xsl:with-param name="partnum" select="$partnum"/>
@@ -1245,6 +1403,11 @@
       <xsl:when test="ancestor::datatype">
         <xsl:call-template name="type_name"/>
       </xsl:when>
+      <xsl:when test="string-length(text()) = 0 and ancestor::erlref">
+	<xsl:message terminate="yes">
+          Error <xsl:value-of select="@name"/>: arity is mandatory when referring to specifications!
+	</xsl:message>
+      </xsl:when>
       <xsl:otherwise>
         <fo:block xsl:use-attribute-sets="function-name">
           <xsl:call-template name="name">
@@ -1276,15 +1439,20 @@
   <xsl:template match="type">
     <xsl:param name="partnum"/>
 
-    <fo:block>
-      <xsl:text>Types:</xsl:text>
-    </fo:block>
+    <!-- The case where @name != 0 is taken care of in "type_name" -->
+    <xsl:if test="string-length(@name) = 0 and string-length(@variable) = 0">
 
-    <fo:list-block xsl:use-attribute-sets="type-listblock">
-      <xsl:apply-templates>
-        <xsl:with-param name="partnum" select="$partnum"/>
-      </xsl:apply-templates>
-    </fo:list-block>
+      <fo:block>
+	<xsl:text>Types:</xsl:text>
+      </fo:block>
+
+      <fo:list-block xsl:use-attribute-sets="type-listblock">
+	<xsl:apply-templates>
+	  <xsl:with-param name="partnum" select="$partnum"/>
+	</xsl:apply-templates>
+      </fo:list-block>
+
+    </xsl:if>
 
   </xsl:template>
 
@@ -1431,6 +1599,7 @@
   </xsl:template>
 
 
+  <!-- Does not look at @n_vars -->
   <xsl:template match="seealso">
     <fo:inline font-style="italic">
      <xsl:apply-templates/>
diff --git a/lib/erl_docgen/src/otp_specs.erl b/lib/erl_docgen/src/otp_specs.erl
index 728ddb2e6e..edb437a942 100644
--- a/lib/erl_docgen/src/otp_specs.erl
+++ b/lib/erl_docgen/src/otp_specs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -380,6 +380,8 @@ t_type([E=#xmlElement{name = float}]) ->
     t_float(E);
 t_type([#xmlElement{name = nil}]) ->
     t_nil();
+t_type([#xmlElement{name = paren, content = Es}]) ->
+    t_paren(Es);
 t_type([#xmlElement{name = list, content = Es}]) ->
     t_list(Es);
 t_type([#xmlElement{name = nonempty_list, content = Es}]) ->
@@ -416,6 +418,9 @@ t_float(E) ->
 t_nil() ->
     ["[]"].
 
+t_paren(Es) ->
+    ["("] ++ t_utype(get_elem(type, Es)) ++ [")"].
+
 t_list(Es) ->
     ["["] ++ t_utype(get_elem(type, Es)) ++ ["]"].
 
@@ -532,6 +537,8 @@ ot_type([E=#xmlElement{name = float}]) ->
     ot_float(E);
 ot_type([#xmlElement{name = nil}]) ->
     ot_nil();
+ot_type([#xmlElement{name = paren, content = Es}]) ->
+    ot_paren(Es);
 ot_type([#xmlElement{name = list, content = Es}]) ->
     ot_list(Es);
 ot_type([#xmlElement{name = nonempty_list, content = Es}]) ->
@@ -582,6 +589,9 @@ ot_float(E) ->
 ot_nil() ->
     {nil,0}.
 
+ot_paren(Es) ->
+    {paren_type,0,[ot_utype(get_elem(type, Es))]}.
+
 ot_list(Es) ->
     {type,0,list,[ot_utype(get_elem(type, Es))]}.
 
@@ -697,5 +707,7 @@ annos_type([#xmlElement{name = union, content = Es}]) ->
     lists:flatmap(fun annos_elem/1, Es);
 annos_type([E=#xmlElement{name = typevar}]) ->
     annos_elem(E);
+annos_type([#xmlElement{name = paren, content = Es}]) ->
+    annos(get_elem(type, Es));
 annos_type(_) ->
     [].
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 784ba78d3e..d83a8307e4 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/src/epmd/epmd_port.c b/lib/erl_interface/src/epmd/epmd_port.c
index 698c75c217..6450f285cc 100644
--- a/lib/erl_interface/src/epmd/epmd_port.c
+++ b/lib/erl_interface/src/epmd/epmd_port.c
@@ -228,11 +228,8 @@ int ei_epmd_port (struct in_addr *addr, const char *alive, int *dist)
     return ei_epmd_port_tmo (addr, alive, dist, 0);
 }
 
-int ei_epmd_port_tmo (struct in_addr *addr, const char *alive, int *dist, 
-		       unsigned ms)
+int ei_epmd_port_tmo (struct in_addr *addr, const char *alive, int *dist, unsigned ms)
 {
-  int i;
-
-  return ei_epmd_r4_port(addr,alive,dist,ms);
+    return ei_epmd_r4_port(addr,alive,dist,ms);
 }
 
diff --git a/lib/erl_interface/src/legacy/erl_connect.c b/lib/erl_interface/src/legacy/erl_connect.c
index fdf689e191..41d4fa3138 100644
--- a/lib/erl_interface/src/legacy/erl_connect.c
+++ b/lib/erl_interface/src/legacy/erl_connect.c
@@ -293,8 +293,13 @@ static int erl_do_receive_msg(int fd, ei_x_buff* x, ErlMessage* emsg)
 	emsg->msg = NULL;
     if (msg.from.node[0] != '\0')
 	emsg->from = erl_mk_pid(msg.from.node, msg.from.num, msg.from.serial, msg.from.creation);
+    else
+	emsg->from = NULL;
     if (msg.to.node[0] != '\0')
 	emsg->to = erl_mk_pid(msg.to.node, msg.to.num, msg.to.serial, msg.to.creation);
+    else
+	emsg->to = NULL;
+    memcpy(emsg->to_name, msg.toname, MAXATOMLEN+1);
     return r;
 }
 
diff --git a/lib/erl_interface/src/legacy/erl_timeout.c b/lib/erl_interface/src/legacy/erl_timeout.c
index d9560eebc8..146a106e7c 100644
--- a/lib/erl_interface/src/legacy/erl_timeout.c
+++ b/lib/erl_interface/src/legacy/erl_timeout.c
@@ -43,6 +43,7 @@
 # endif
 #endif
 
+#include "erl_interface.h"
 #include "erl_timeout.h"
 
 typedef struct jmp_s {
diff --git a/lib/et/src/et_wx_contents_viewer.erl b/lib/et/src/et_wx_contents_viewer.erl
index aada184a76..86f46f25d0 100644
--- a/lib/et/src/et_wx_contents_viewer.erl
+++ b/lib/et/src/et_wx_contents_viewer.erl
@@ -464,7 +464,8 @@ create_window(S) ->
     wxFrame:setMenuBar(Frame,Bar),
     create_file_menu(Bar),
     Editor = wxTextCtrl:new(Panel, ?wxID_ANY, [{style, 0
-						bor  ?wxDEFAULT
+						bor ?wxDEFAULT
+						bor ?wxTE_RICH2 %% Needed on Windows
 						bor ?wxTE_MULTILINE
 						bor ?wxTE_READONLY
 						bor ?wxTE_DONTWRAP}]),
@@ -483,6 +484,7 @@ create_window(S) ->
     wxFrame:connect(Frame, close_window, [{skip,true}]),
     wxFrame:setFocus(Frame),
     wxPanel:setSizer(Panel, Sizer),
+    wxSizer:fit(Sizer, Panel),
     wxFrame:show(Frame),
     S2#state{menu_data = HideData++SearchData++FilterData, editor = Editor, frame = Frame}.
 
diff --git a/lib/et/src/et_wx_viewer.erl b/lib/et/src/et_wx_viewer.erl
index d42f8c0c86..7d4286ed9d 100644
--- a/lib/et/src/et_wx_viewer.erl
+++ b/lib/et/src/et_wx_viewer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -846,9 +846,6 @@ handle_info(#wx{event = #wxSize{size = {OldW, OldH}}} = Wx, S) ->
 		refresh_main_window(S4)
 	end,
     noreply(S6);
-handle_info(#wx{event = #wxFocus{}}, S) ->
-    wxWindow:setFocus(S#state.canvas), % Get keyboard focus
-    noreply(S);
 handle_info(#wx{event = #wxMouse{type = enter_window}}, S) ->
     wxWindow:setFocus(S#state.canvas), % Get keyboard focus
     noreply(S);
@@ -1252,7 +1249,6 @@ create_main_window(S) ->
 					     Self ! Ev
 				     end}]),
     wxPanel:connect(Canvas, key_down),
-    wxPanel:connect(Canvas, kill_focus),
     wxPanel:connect(Canvas, enter_window, [{skip, true}]), 
     wxFrame:connect(Frame, command_menu_selected),
     wxFrame:connect(Frame, close_window),
diff --git a/lib/eunit/src/eunit.erl b/lib/eunit/src/eunit.erl
index 4a86a108cf..da35c5c2ec 100644
--- a/lib/eunit/src/eunit.erl
+++ b/lib/eunit/src/eunit.erl
@@ -157,6 +157,7 @@ test_run(Reference, Listeners) ->
     receive
 	{done, Reference} ->
 	    cast(Listeners, {stop, Reference, self()}),
+            wait_until_listeners_have_terminated(Listeners),
 	    receive
 		{result, Reference, Result} ->
 		    Result
@@ -169,6 +170,15 @@ cast([P | Ps], Msg) ->
 cast([], _Msg) ->
     ok.
 
+wait_until_listeners_have_terminated([P | Ps]) ->
+    MRef = erlang:monitor(process, P),
+    receive
+        {'DOWN', MRef, process, P, _} ->
+            wait_until_listeners_have_terminated(Ps)
+    end;
+wait_until_listeners_have_terminated([]) ->
+    ok.
+
 %% TODO: functions that run tests on a given node, not a given server
 %% TODO: maybe some functions could check for a globally registered server?
 %% TODO: some synchronous but completely quiet interface function
diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl
index f289cd724a..dfb08c90b2 100644
--- a/lib/eunit/src/eunit_surefire.erl
+++ b/lib/eunit/src/eunit_surefire.erl
@@ -100,16 +100,10 @@ terminate({ok, _Data}, St) ->
     XmlDir = St#state.xmldir,
     write_report(TestSuite, XmlDir),
     ok;
-terminate({error, Reason}, _St) ->
-    io:fwrite("Internal error: ~P.\n", [Reason, 25]),
-    sync_end(error).
-
-sync_end(Result) ->
-    receive
-	{stop, Reference, ReplyTo} ->
-	    ReplyTo ! {result, Reference, Result},
-	    ok
-    end.
+terminate({error, _Reason}, _St) ->
+    %% Don't report any errors here, since eunit_tty takes care of that.
+    %% Just terminate.
+    ok.
 
 handle_begin(group, Data, St) ->
     NewId = proplists:get_value(id, Data),
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 30b911c41b..c009164f4c 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -45,6 +45,7 @@
 		    t_atom_vals/1,
 		    t_binary/0,
 		    t_bitstr/0,
+		    t_bitstrlist/0,
 		    t_boolean/0,
 		    t_byte/0,
 		    t_char/0,
@@ -3552,7 +3553,7 @@ arg_types(erlang, list_to_binary, 1) ->
 arg_types(erlang, list_to_bitstr, 1) ->	% XXX: TAKE OUT
   arg_types(erlang, list_to_bitstring, 1);
 arg_types(erlang, list_to_bitstring, 1) ->
-  [t_iolist()];
+  [t_bitstrlist()];
 arg_types(erlang, list_to_existing_atom, 1) ->
   [t_string()];
 arg_types(erlang, list_to_float, 1) ->
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 080d6936b2..1748c1cc16 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -59,6 +59,7 @@
 	 t_bitstr_concat/2,
 	 t_bitstr_match/2,
 	 t_bitstr_unit/1,
+	 t_bitstrlist/0,
 	 t_boolean/0,
 	 t_byte/0,
 	 t_char/0,
@@ -1457,11 +1458,11 @@ t_is_tuple(_) -> false.
 %% Non-primitive types, including some handy syntactic sugar types
 %%
 
--spec t_unicode_string() -> erl_type().
+-spec t_bitstrlist() -> erl_type().
+
+t_bitstrlist() ->
+  t_iolist(1, t_bitstr()).
 
-t_unicode_string() ->
-  t_list(t_unicode_char()).
-  
 -spec t_charlist() -> erl_type().
 
 t_charlist() ->
@@ -1551,15 +1552,16 @@ t_iodata() ->
 -spec t_iolist() -> erl_type().
 
 t_iolist() ->
-  t_iolist(1).
+  t_iolist(1, t_binary()).
 
--spec t_iolist(non_neg_integer()) -> erl_type().
+%% Added a second argument which currently is t_binary() | t_bitstr()
+-spec t_iolist(non_neg_integer(), erl_type()) -> erl_type().
 
-t_iolist(N) when N > 0 ->
-  t_maybe_improper_list(t_sup([t_iolist(N-1), t_binary(), t_byte()]),
-		        t_sup(t_binary(), t_nil()));
-t_iolist(0) ->
-  t_maybe_improper_list(t_any(), t_sup(t_binary(), t_nil())).
+t_iolist(N, T) when N > 0 ->
+  t_maybe_improper_list(t_sup([t_iolist(N-1, T), T, t_byte()]),
+		        t_sup(T, t_nil()));
+t_iolist(0, T) ->
+  t_maybe_improper_list(t_any(), t_sup(T, t_nil())).
 
 -spec t_parameterized_module() -> erl_type().
 
@@ -1581,6 +1583,11 @@ t_unicode_binary() ->
 t_unicode_char() ->
   t_integer(). % representing a valid unicode codepoint
 
+-spec t_unicode_string() -> erl_type().
+
+t_unicode_string() ->
+  t_list(t_unicode_char()).
+
 %%-----------------------------------------------------------------------------
 %% Some built-in opaque types
 %%
@@ -3220,16 +3227,16 @@ t_to_string(?atom(Set), _RecDict) ->
     _ ->
       set_to_string(Set)
   end;
-t_to_string(?bitstr(8, 0), _RecDict) ->
-  "binary()";
 t_to_string(?bitstr(0, 0), _RecDict) ->
   "<<>>";
+t_to_string(?bitstr(8, 0), _RecDict) ->
+  "binary()";
 t_to_string(?bitstr(0, B), _RecDict) ->
-  io_lib:format("<<_:~w>>", [B]);
+  lists:flatten(io_lib:format("<<_:~w>>", [B]));
 t_to_string(?bitstr(U, 0), _RecDict) ->
-  io_lib:format("<<_:_*~w>>", [U]);
+  lists:flatten(io_lib:format("<<_:_*~w>>", [U]));
 t_to_string(?bitstr(U, B), _RecDict) ->
-  io_lib:format("<<_:~w,_:_*~w>>", [B, U]);
+  lists:flatten(io_lib:format("<<_:~w,_:_*~w>>", [B, U]));
 t_to_string(?function(?any, ?any), _RecDict) ->
   "fun()";
 t_to_string(?function(?any, Range), RecDict) ->
@@ -3238,16 +3245,18 @@ t_to_string(?function(?product(ArgList), Range), RecDict) ->
   "fun((" ++ comma_sequence(ArgList, RecDict) ++ ") -> "
     ++ t_to_string(Range, RecDict) ++ ")";
 t_to_string(?identifier(Set), _RecDict) ->
-  if Set =:= ?any -> "identifier()";
-     true -> sequence([io_lib:format("~w()", [T]) 
-		       || T <- set_to_list(Set)], [], " | ")
+  case Set of
+    ?any -> "identifier()";
+    _ ->
+      string:join([io_lib:format("~w()", [T]) || T <- set_to_list(Set)], " | ")
   end;
 t_to_string(?opaque(Set), _RecDict) ->
-  sequence([case is_opaque_builtin(Mod, Name) of
-	      true  -> io_lib:format("~w()", [Name]);
-	      false -> io_lib:format("~w:~w()", [Mod, Name])
-	    end
-	    || #opaque{mod = Mod, name = Name} <- set_to_list(Set)], [], " | ");
+  string:join([case is_opaque_builtin(Mod, Name) of
+		 true  -> io_lib:format("~w()", [Name]);
+		 false -> io_lib:format("~w:~w()", [Mod, Name])
+	       end
+	       || #opaque{mod = Mod, name = Name} <- set_to_list(Set)],
+	      " | ");
 t_to_string(?matchstate(Pres, Slots), RecDict) ->
   io_lib:format("ms(~s,~s)", [t_to_string(Pres, RecDict),
 			      t_to_string(Slots,RecDict)]);
@@ -3321,14 +3330,15 @@ t_to_string(?number(?any, ?unknown_qual), _RecDict) -> "number()";
 t_to_string(?product(List), RecDict) -> 
   "<" ++ comma_sequence(List, RecDict) ++ ">";
 t_to_string(?remote(Set), RecDict) ->
-  sequence([case Args =:= [] of
-	      true  -> io_lib:format("~w:~w()", [Mod, Name]);
-	      false ->
-		ArgString = comma_sequence(Args, RecDict),
-		io_lib:format("~w:~w(~s)", [Mod, Name, ArgString])
-	    end
-	    || #remote{mod = Mod, name = Name, args = Args} <- set_to_list(Set)],
-	   [], " | ");
+  string:join([case Args =:= [] of
+		 true  -> io_lib:format("~w:~w()", [Mod, Name]);
+		 false ->
+		   ArgString = comma_sequence(Args, RecDict),
+		   io_lib:format("~w:~w(~s)", [Mod, Name, ArgString])
+	       end
+	       || #remote{mod = Mod, name = Name, args = Args} <-
+		    set_to_list(Set)],
+	      " | ");
 t_to_string(?tuple(?any, ?any, ?any), _RecDict) -> "tuple()";
 t_to_string(?tuple(Elements, _Arity, ?any), RecDict) ->   
   "{" ++ comma_sequence(Elements, RecDict) ++ "}";
@@ -3350,7 +3360,7 @@ t_to_string(?var(Id), _RecDict) when is_integer(Id) ->
 
 record_to_string(Tag, [_|Fields], FieldNames, RecDict) ->
   FieldStrings = record_fields_to_string(Fields, FieldNames, RecDict, []),
-  "#" ++ atom_to_list(Tag) ++ "{" ++ sequence(FieldStrings, [], ",") ++ "}".
+  "#" ++ atom_to_list(Tag) ++ "{" ++ string:join(FieldStrings, ",") ++ "}".
 
 record_fields_to_string([F|Fs], [{FName, _DefType}|FDefs], RecDict, Acc) ->
   NewAcc =
@@ -3376,7 +3386,7 @@ record_field_diffs_to_string(?tuple([_|Fs], Arity, Tag), RecDict) ->
   {ok, FieldNames} = lookup_record(TagAtom, Arity-1, RecDict),
   %% io:format("RecCElems = ~p\nRecTypes = ~p\n", [Fs, FieldNames]),
   FieldDiffs = field_diffs(Fs, FieldNames, RecDict, []),
-  sequence(FieldDiffs, [], " and ").
+  string:join(FieldDiffs, " and ").
 
 field_diffs([F|Fs], [{FName, DefType}|FDefs], RecDict, Acc) ->
   NewAcc =
@@ -3395,21 +3405,11 @@ comma_sequence(Types, RecDict) ->
 	    true -> "_";
 	    false -> t_to_string(T, RecDict)
 	  end || T <- Types],
-  sequence(List, ",").
+  string:join(List, ",").
 
 union_sequence(Types, RecDict) ->
   List = [t_to_string(T, RecDict) || T <- Types], 
-  sequence(List, " | ").
-
-sequence(List, Delimiter) ->
-  sequence(List, [], Delimiter).
-
-sequence([], [], _Delimiter) ->
-  [];
-sequence([T], Acc, _Delimiter) ->
-  lists:flatten(lists:reverse([T|Acc]));
-sequence([T|Ts], Acc, Delimiter) ->
-  sequence(Ts, [T ++ Delimiter|Acc], Delimiter).
+  string:join(List, " | ").
 
 %%=============================================================================
 %% 
@@ -3490,10 +3490,8 @@ t_from_form({type, _L, binary, []}, _TypeNames, _InOpaque, _RecDict,
 t_from_form({type, _L, binary, [Base, Unit]} = Type,
 	    _TypeNames, _InOpaque, _RecDict, _VarDict) ->
   case {erl_eval:partial_eval(Base), erl_eval:partial_eval(Unit)} of
-    {{integer, _, BaseVal},
-     {integer, _, UnitVal}}
-      when BaseVal >= 0, UnitVal >= 0 ->
-      {t_bitstr(UnitVal, BaseVal), []};
+    {{integer, _, B}, {integer, _, U}} when B >= 0, U >= 0 ->
+      {t_bitstr(U, B), []};
     _ -> throw({error, io_lib:format("Unable to evaluate type ~w\n", [Type])})
   end;
 t_from_form({type, _L, bitstring, []}, _TypeNames, _InOpaque, _RecDict,
@@ -3839,26 +3837,40 @@ t_form_to_string({integer, _L, Int}) -> integer_to_list(Int);
 t_form_to_string({op, _L, _Op, _Arg} = Op) ->
   case erl_eval:partial_eval(Op) of
     {integer, _, _} = Int -> t_form_to_string(Int);
-    _ -> io_lib:format("Bad formed type ~w",[Op])
+    _ -> io_lib:format("Badly formed type ~w", [Op])
   end;
 t_form_to_string({op, _L, _Op, _Arg1, _Arg2} = Op) ->
   case erl_eval:partial_eval(Op) of
     {integer, _, _} = Int -> t_form_to_string(Int);
-    _ -> io_lib:format("Bad formed type ~w",[Op])
+    _ -> io_lib:format("Badly formed type ~w", [Op])
   end;
 t_form_to_string({ann_type, _L, [Var, Type]}) ->
   t_form_to_string(Var) ++ "::" ++ t_form_to_string(Type);
 t_form_to_string({paren_type, _L, [Type]}) ->
   io_lib:format("(~s)", [t_form_to_string(Type)]);
 t_form_to_string({remote_type, _L, [{atom, _, Mod}, {atom, _, Name}, Args]}) ->
-  ArgString = "(" ++ sequence(t_form_to_string_list(Args), ",") ++ ")",
+  ArgString = "(" ++ string:join(t_form_to_string_list(Args), ",") ++ ")",
   io_lib:format("~w:~w", [Mod, Name]) ++ ArgString;
 t_form_to_string({type, _L, arity, []}) -> "arity()";
+t_form_to_string({type, _L, binary, []}) -> "binary()";
+t_form_to_string({type, _L, binary, [Base, Unit]} = Type) ->
+  case {erl_eval:partial_eval(Base), erl_eval:partial_eval(Unit)} of
+    {{integer, _, B}, {integer, _, U}} ->
+      %% the following mirrors the clauses of t_to_string/2
+      case {U, B} of
+	{0, 0} -> "<<>>";
+	{8, 0} -> "binary()";
+	{0, B} -> lists:flatten(io_lib:format("<<_:~w>>", [B]));
+	{U, 0} -> lists:flatten(io_lib:format("<<_:_*~w>>", [U]));
+	{U, B} -> lists:flatten(io_lib:format("<<_:~w,_:_*~w>>", [B, U]))
+      end;
+    _ -> io_lib:format("Badly formed bitstr type ~w", [Type])
+  end;
 t_form_to_string({type, _L, 'fun', []}) -> "fun()";
 t_form_to_string({type, _L, 'fun', [{type, _, any, []}, Range]}) -> 
   "fun(...) -> " ++ t_form_to_string(Range);
 t_form_to_string({type, _L, 'fun', [{type, _, product, Domain}, Range]}) ->
-  "fun((" ++ sequence(t_form_to_string_list(Domain), ",") ++ ") -> " 
+  "fun((" ++ string:join(t_form_to_string_list(Domain), ",") ++ ") -> "
     ++ t_form_to_string(Range) ++ ")";
 t_form_to_string({type, _L, iodata, []}) -> "iodata()";
 t_form_to_string({type, _L, iolist, []}) -> "iolist()";
@@ -3871,7 +3883,7 @@ t_form_to_string({type, _L, nonempty_list, [Type]}) ->
   "[" ++ t_form_to_string(Type) ++ ",...]";
 t_form_to_string({type, _L, nonempty_string, []}) -> "nonempty_string()";
 t_form_to_string({type, _L, product, Elements}) ->
-  "<" ++ sequence(t_form_to_string_list(Elements), ",") ++ ">";
+  "<" ++ string:join(t_form_to_string_list(Elements), ",") ++ ">";
 t_form_to_string({type, _L, range, [From, To]} = Type) ->
   case {erl_eval:partial_eval(From), erl_eval:partial_eval(To)} of
     {{integer, _, FromVal}, {integer, _, ToVal}} ->
@@ -3881,7 +3893,7 @@ t_form_to_string({type, _L, range, [From, To]} = Type) ->
 t_form_to_string({type, _L, record, [{atom, _, Name}]}) ->
   io_lib:format("#~w{}", [Name]);
 t_form_to_string({type, _L, record, [{atom, _, Name}|Fields]}) ->
-  FieldString = sequence(t_form_to_string_list(Fields), ","),
+  FieldString = string:join(t_form_to_string_list(Fields), ","),
   io_lib:format("#~w{~s}", [Name, FieldString]);
 t_form_to_string({type, _L, field_type, [{atom, _, Name}, Type]}) ->
   io_lib:format("~w::~s", [Name, t_form_to_string(Type)]);
@@ -3889,27 +3901,16 @@ t_form_to_string({type, _L, term, []}) -> "term()";
 t_form_to_string({type, _L, timeout, []}) -> "timeout()";
 t_form_to_string({type, _L, tuple, any}) -> "tuple()";
 t_form_to_string({type, _L, tuple, Args}) ->
-  "{" ++ sequence(t_form_to_string_list(Args), ",") ++ "}";
+  "{" ++ string:join(t_form_to_string_list(Args), ",") ++ "}";
 t_form_to_string({type, _L, union, Args}) ->
-  sequence(t_form_to_string_list(Args), " | ");
+  string:join(t_form_to_string_list(Args), " | ");
 t_form_to_string({type, _L, Name, []} = T) ->
   try t_to_string(t_from_form(T))
   catch throw:{error, _} -> atom_to_list(Name) ++ "()"
   end;
-t_form_to_string({type, _L, binary, [X,Y]} = Type) ->
-  case {erl_eval:partial_eval(X), erl_eval:partial_eval(Y)} of
-    {{integer, _, XVal}, {integer, _, YVal}} ->
-      case YVal of
-	0 ->
-	  case XVal of
-	    0 -> "<<>>";
-	    _ -> io_lib:format("<<_:~w>>", [XVal])
-	  end
-      end;
-    _ -> io_lib:format("Bad formed type ~w",[Type])
-  end;
 t_form_to_string({type, _L, Name, List}) -> 
-  io_lib:format("~w(~s)", [Name, sequence(t_form_to_string_list(List), ",")]).
+  io_lib:format("~w(~s)",
+		[Name, string:join(t_form_to_string_list(List), ",")]).
 
 t_form_to_string_list(List) ->
   t_form_to_string_list(List, []).
@@ -3917,8 +3918,8 @@ t_form_to_string_list(List) ->
 t_form_to_string_list([H|T], Acc) ->
   t_form_to_string_list(T, [t_form_to_string(H)|Acc]);
 t_form_to_string_list([], Acc) ->
-  lists:reverse(Acc).  
-  
+  lists:reverse(Acc).
+
 %%=============================================================================
 %% 
 %% Utilities
@@ -4057,7 +4058,7 @@ set_to_string(Set) ->
 	 true -> io_lib:write_string(atom_to_list(X), $'); % stupid emacs '
 	 false -> io_lib:format("~w", [X])
        end || X <- set_to_list(Set)],
-  sequence(L, [], " | ").
+  string:join(L, " | ").
 
 set_min([H|_]) -> H.
 
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index 434bfac64c..5c06e5e558 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2010</year>
+      <year>2006</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index 8f68087871..f6b6827e93 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -76,38 +76,37 @@ socket_opt() = See the Options used by gen_tcp(3) and
     <p>For more information about HTTP see rfc 2616</p>
 
     <code type="none"><![CDATA[
-method()        = head | get | put | post | trace | options | delete
-request()       = {url(), headers()} | 
-                  {url(), headers(), content_type(), body()}
-url()           = string() - Syntax according to the URI definition in rfc 2396, ex: "http://www.erlang.org"
-status_line()   = {http_version(), status_code(), reason_phrase()}
-http_version()  = string() ex: "HTTP/1.1"
-status_code()   = integer()
-reason_phrase() = string()
-content_type()  = string()
-headers()       = [header()]
-header()        = {field(), value()}
-field()         = string() 
-value()         = string() 
-body()          = string() | binary() 
-filename()      = string() 
+method()         = head | get | put | post | trace | options | delete
+request()        = {url(), headers()} | 
+                   {url(), headers(), content_type(), body()}
+url()            = string() - Syntax according to the URI definition in rfc 2396, ex: "http://www.erlang.org"
+status_line()    = {http_version(), status_code(), reason_phrase()}
+http_version()   = string() ex: "HTTP/1.1"
+status_code()    = integer()
+reason_phrase()  = string()
+content_type()   = string()
+headers()        = [header()]
+header()         = {field(), value()}
+field()          = string() 
+value()          = string() 
+body()           = string() | 
+                   binary() |
+                   {fun(accumulator()) -> body_processing_result(), 
+                    accumulator()} |
+                   {chunkify, 
+                    fun(accumulator()) -> body_processing_result(), 
+                    accumulator()}
+body_processing_result() = eof | {ok, iolist(), accumulator()}
+accumulator()    = term()
+filename()       = string() 
     ]]></code>
 
   </section>
   
   <section>
     <title>SSL DATA TYPES </title>
-    <p>Some type definitions relevant when using https,
-      for details <seealso marker="ssl:ssl">ssl(3)</seealso>: </p>
-    <code type="none"><![CDATA[
-ssl_options() = {verify,     code()}   | 
-                {depth,      depth()}  | 
-                {certfile,   path()}   | 
-                {keyfile,    path()}   | 
-                {password,   string()} | 
-                {cacertfile, path()}   | 
-                {ciphers,    string()} 
-    ]]></code>
+    <p>See <seealso marker="ssl:ssl">ssl(3)</seealso> for information
+    about ssl options (<c>ssloptions()</c>). </p>
   </section>
 
   <section>
@@ -142,8 +141,9 @@ ssl_options() = {verify,     code()}   |
       <fsummary>Sends a get HTTP-request</fsummary>
       <type>
         <v>Url = url() </v> 
-	<v>Result = {status_line(), headers(), body()} | 
-                    {status_code(), body()} | request_id() </v>
+	<v>Result = {status_line(), headers(), Body} | 
+                    {status_code(), Body} | request_id() </v>
+	<v>Body = string() | binary()</v>
 	<v>Profile = profile()</v>
 	<v>Reason = term() </v>
       </type>
@@ -166,9 +166,9 @@ ssl_options() = {verify,     code()}   |
         <v>http_options() = [http_option()]</v>
         <v>http_option() = {timeout,         timeout()} | 
                            {connect_timeout, timeout()} | 
-                           {ssl,             ssl_options()} | 
-                           {ossl,            ssl_options()} | 
-                           {essl,            ssl_options()} | 
+                           {ssl,             ssloptions()} | 
+                           {ossl,            ssloptions()} | 
+                           {essl,            ssloptions()} | 
                            {autoredirect,    boolean()} | 
                            {proxy_auth, {userstring(), passwordstring()}} | 
                            {version,         http_version()} | 
@@ -191,8 +191,9 @@ ssl_options() = {verify,     code()}   |
         <v>Function = atom() </v>
         <v>Args = list() </v>
 	<v>body_format() = string | binary </v>
-        <v>Result = {status_line(), headers(), body()} | 
-                    {status_code(), body()} | request_id() </v>
+        <v>Result = {status_line(), headers(), Body} | 
+                    {status_code(), Body} | request_id() </v>
+        <v>Body = string() | binary()</v>
         <v>Profile = profile() </v>
         <v>Reason = {connect_failed, term()} | 
                     {send_failed, term()} | term() </v>
@@ -226,7 +227,7 @@ ssl_options() = {verify,     code()}   |
           <tag><c><![CDATA[ssl]]></c></tag>
           <item>
             <p>This is the default ssl config option, currently defaults to 
-              <c>ossl</c>, see below. </p>
+              <c>essl</c>, see below. </p>
             <p>Defaults to <c>[]</c>. </p>
 	  </item>
 
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index 6470b6fac7..edacb73b65 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -154,7 +154,7 @@
           <c>ossl</c> specifically uses the OpenSSL based (old) SSL. 
           <c>essl</c> specifically uses the Erlang based (new) SSL. 
           When using <c>ssl</c> it <em>currently</em> defaults to 
-          <c>ossl</c>. </p>
+          <c>essl</c>. </p>
 	<p>Defaults to <c>ip_comm</c>. </p> 
       </item>
 
@@ -794,14 +794,14 @@ bytes
     <marker id="sdir_prop"></marker>
     <p> Here follows the valid properties for security directories</p>
     <taglist>
-      <tag>{security_data_file, path()}</tag>
+      <tag>{data_file, path()}</tag>
       
       <item>
 	Name of the security data file.  The filename can either
 	absolute or relative to the server_root. This file is used to
 	store persistent data for the mod_security module. </item>
 	  
-      <tag>{security_max_retries, integer()}</tag>
+      <tag>{max_retries, integer()}</tag>
 	  
       <item> Specifies the maximum number of tries to authenticate a
 	user has before the user is blocked out. If a user
@@ -811,13 +811,13 @@ bytes
 	server will return 401 (Unauthorized), for security
 	reasons. Defaults to 3 may also be set to infinity.</item>
 	
-      <tag>{security_block_time, integer()}</tag>
+      <tag>{block_time, integer()}</tag>
       
       <item> Specifies the number of minutes a user is blocked. After
 	this amount of time, he automatically regains access.
 	Defaults to 60</item>
       
-      <tag>{security_fail_expire_time, integer()}</tag>
+      <tag>{fail_expire_time, integer()}</tag>
       
       <item>
 	Specifies the number of minutes a failed user authentication
@@ -825,7 +825,7 @@ bytes
 	time, his previous failed authentications are
 	forgotten. Defaults to 30</item>
       
-      <tag>{security_auth_timeout, integer()}</tag>
+      <tag>{auth_timeout, integer()}</tag>
 
       <item>
 	Specifies the number of seconds a successful user
diff --git a/lib/inets/doc/src/inets.xml b/lib/inets/doc/src/inets.xml
index c367d7fa77..a2bf42320f 100644
--- a/lib/inets/doc/src/inets.xml
+++ b/lib/inets/doc/src/inets.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -32,8 +32,10 @@
   <modulesummary>The inets services API</modulesummary>
   <description>
     <p>This module provides the most basic API to the 
-      clients and servers, that are part of the Inets application,
-      such as start and stop. </p>
+    clients and servers, that are part of the Inets application,
+    such as start and stop. </p>
+
+    <marker id="common_data_types"></marker>
   </description>
 
   <section>
@@ -42,7 +44,10 @@
       this module: </p>
     <p><c> service() = ftpc | tftp | httpc | httpd</c></p>
     <p><c> property() = atom() </c></p>
+    <marker id="functions"></marker>
+    <marker id="services"></marker>
   </section>
+
   <funcs>
     <func>
       <name>services() -> [{Service, Pid}]</name>
@@ -54,11 +59,13 @@
       <desc>
         <p>Returns a list of currently running services.</p>
         <note>
-          <p>Services started as <c>stand_alone</c> will not
-            be listed.</p>
+	  <p>Services started as <c>stand_alone</c> will not be listed.</p>
         </note>
+
+	<marker id="services_info"></marker>
       </desc>
     </func>
+
     <func>
       <name>services_info() -> [{Service, Pid, Info}]</name>
       <fsummary>Returns a list of currently running services where
@@ -73,11 +80,13 @@
       </type>
       <desc>
         <p>Returns a list of currently running services where each
-          service is described by a [{Option, Value}] list. The
-          information given in the list is specific for each service
-          and it is probable that each service will have its own info
-          function that gives you even more details about the
-          service.</p>
+	service is described by a [{Option, Value}] list. The
+	information given in the list is specific for each service
+	and it is probable that each service will have its own info
+	function that gives you even more details about the
+	service.</p>
+
+	<marker id="service_names"></marker>
       </desc>
     </func>
     
@@ -89,6 +98,8 @@
       </type>
       <desc>
         <p>Returns a list of available service names.</p>
+
+	<marker id="start"></marker>
       </desc>
     </func>
     
@@ -101,18 +112,24 @@
       </type>
       <desc>
         <p>Starts the Inets application. Default type
-          is temporary. See also
-          <seealso marker="kernel:application">application(3)</seealso></p>
+	is temporary. See also
+	<seealso marker="kernel:application">application(3)</seealso>. </p>
+
+	<marker id="stop"></marker>
       </desc>
     </func>
+
     <func>
       <name>stop() -> ok </name>
       <fsummary>Stops the inets application.</fsummary>
       <desc>
         <p>Stops the inets application. See also
-          <seealso marker="kernel:application">application(3)</seealso></p>
+	<seealso marker="kernel:application">application(3)</seealso>. </p>
+	
+	<marker id="start2"></marker>
       </desc>
     </func>
+
     <func>
       <name>start(Service, ServiceConfig) -> {ok, Pid} | {error, Reason}</name>
       <name>start(Service, ServiceConfig, How) -> {ok, Pid} | {error, Reason}</name>
@@ -144,8 +161,11 @@
             some sense the calling process has now become the top
             supervisor.</p>
         </note>
+	
+	<marker id="stop2"></marker>
       </desc>
     </func>
+
     <func>
       <name>stop(Service, Reference) -> ok | {error, Reason} </name>
       <fsummary>Stops a started service of the inets application or takes
@@ -157,9 +177,11 @@
       </type>
       <desc>
         <p>Stops a started service of the inets application or takes
-          down a "stand_alone-service" gracefully. When the
-	  <c>stand_alone</c> option is used in start,
-	  only the pid is a valid argument to stop.</p>
+	down a "stand_alone-service" gracefully. When the
+	<c>stand_alone</c> option is used in start,
+	only the pid is a valid argument to stop.</p>
+	
+	<marker id="see_also"></marker>
       </desc>
     </func>
   </funcs>
diff --git a/lib/inets/doc/src/mod_esi.xml b/lib/inets/doc/src/mod_esi.xml
index e81308a502..9674cd9a88 100644
--- a/lib/inets/doc/src/mod_esi.xml
+++ b/lib/inets/doc/src/mod_esi.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,16 +32,19 @@
   <modulesummary>Erlang Server Interface </modulesummary>
   <description>
     <p>This module defines the API - Erlang Server Interface (ESI).
-      Which is a more efficient way of writing erlang scripts
-      for your Inets web server than writing them as common CGI scripts.</p>
+    Which is a more efficient way of writing erlang scripts
+    for your Inets web server than writing them as common CGI scripts.</p>
+
+    <marker id="deliver"></marker>
   </description>
+
   <funcs>
     <func>
       <name>deliver(SessionID, Data) -> ok | {error, Reason}</name>
       <fsummary>Sends Data back to client.</fsummary>
       <type>
         <v>SessionID = term()</v>
-        <v>Data = string() | io_list()</v>
+        <v>Data = string() | io_list() | binary()</v>
         <v>Reason = term()</v>
       </type>
       <desc>
@@ -51,13 +54,15 @@
 	parts of the content to the user.</p>
 	<p>Sends data from a Erl Scheme script back to the client.</p>
 	
-	<note><p>Note
-          that if any HTTP-header fields should be added by the
-          script they must be in the first call to deliver/2  and the
-          data in the call must be a string. Do not
-          assume anything about the data type of SessionID, the
-          SessionID must be the value given as input to the esi
-          call back function that you implemented.</p></note>
+	<note>
+	  <p>Note that if any HTTP-header fields should be added by the
+	  script they must be in the first call to deliver/2  and the
+	  data in the call must be a string. Calls after the headers
+	  are complete may contain binary data to reduce copying
+	  overhead.  Do not assume anything about the data type of 
+	  SessionID, the SessionID must be the value given as input to 
+	  the esi call back function that you implemented.</p>
+	</note>
       </desc>
     </func>
   </funcs>
diff --git a/lib/inets/doc/src/mod_security.xml b/lib/inets/doc/src/mod_security.xml
index 2a871d29d8..a3c91dca5b 100644
--- a/lib/inets/doc/src/mod_security.xml
+++ b/lib/inets/doc/src/mod_security.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2010</year>
+      <year>1998</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 5da9d98002..0926df8581 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,6 +32,140 @@
     <file>notes.xml</file>
   </header>
   
+  <section><title>Inets 5.6</title>
+
+    <section><title>Improvements and New Features</title>
+<!--
+    <p>-</p>
+-->
+      <list>
+        <item>
+          <p>[httpc] Add support for upload body streaming (PUT and POST).</p>
+	  <p>For more info, 
+	  see the definition of the <c>Body</c> argument of the 
+	  <seealso marker="httpc#request2">request/4,5</seealso> 
+	  function. </p>
+	  <p>Filipe David Manana</p>
+	  <p>Own Id: OTP-9094</p>
+        </item>
+
+        <item>
+          <p>[ftp] Added (type) spec for all exported functions.</p>
+          <p>Own Id: OTP-9114 Aux Id: seq11799</p>
+        </item>
+
+        <item>
+          <p>[httpd] 
+	  <seealso marker="mod_esi#deliver">mod_esi:deliver/2</seealso> 
+	  made to accept binary data. </p>
+          <p>Bernard Duggan</p>
+          <p>Own Id: OTP-9123</p>
+        </item>
+
+        <item>
+          <p>[httpd] Prevent XSS in error pages.
+	  Prevent user controlled input from being interpreted 
+	  as HTML in error pages by encoding the reserved HTML 
+	  characters. </p>
+	  <p>Michael Santos</p>
+          <p>Own Id: OTP-9124</p>
+        </item>
+
+        <item>
+          <p>[httpd] Improved error messages. </p>
+	  <p>Ricardo Catalinas Jim�nez</p>
+          <p>Own Id: OTP-9157</p>
+        </item>
+
+        <item>
+          <p>[httpd] Extended support for file descriptors. 
+	  In order to be able to bind to a privileged port 
+	  without running the erlang VM as root, the support 
+	  for using file descriptors has been improved. 
+	  It is now possible to add the file descriptor to the config 
+	  (option fd) when calling the 
+	  <seealso marker="inets#start2">inets:start(httpd, ...)</seealso> 
+	  function. </p>
+	  <p>Attila Rajmund Nohl</p>
+          <p>Own Id: OTP-9202</p>
+          <p>Aux Id: seq11819</p>
+        </item>
+
+        <item>
+          <p>The default ssl kind has now been changed to <c>essl</c>. </p>
+	  <p><c>ossl</c> will work for as long as the ssl application 
+	  supports it. </p>
+	  <p>See the httpd 
+	  <seealso marker="httpd#comm_prop">socket_type</seealso> 
+	  communication property or the httpc 
+	  <seealso marker="httpc#request2">request/4,5</seealso> function
+	  for more info. </p>
+	  <p>Own Id: OTP-9230</p>
+	  <p>*** POTENTIAL INCOMPATIBILITY ***</p>
+        </item>
+
+      </list>
+    </section>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+<!--
+    <p>-</p>
+-->
+
+      <list>
+        <item>
+          <p>[httpd] Wrong 
+	  <seealso marker="httpd#sec_prop">security property</seealso> 
+	  names used in documentation. </p>
+	  <p><c>security_data_file</c> used instead of <c>data_file</c>. </p>
+	  <p><c>security_max_retries</c> used instead of <c>max_retries</c>. </p>
+	  <p><c>security_block_time</c> used instead of <c>block_time</c>. </p>
+	  <p><c>security_fail_expire_time</c> used instead of <c>fail_expire_time</c>. </p>
+	  <p><c>security_auth_timeout</c> used instead of <c>auth_timeout</c>. </p>
+	  <p>Garrett Smith</p>
+	  <p>Own Id: OTP-9131</p>
+        </item>
+
+        <item>
+          <p>[httpd] Fix timeout message generated by mod_esi.
+	  When a mod_esi request times out, the code to send a 
+	  timeout response was incorrect and generated an 
+	  internal server error as well as an invalid response 
+	  line. </p>
+	  <p>Bernard Duggan</p>
+	  <p>Own Id: OTP-9158</p>
+        </item>
+
+        <item>
+          <p>[httpc] httpc manager crashes. 
+	  When a request results in a retry, the request id will be "reused" 
+	  in the previous implementation a race condition could occur causing 
+	  the manager to crash. </p>
+	  <p>This is now avoided by using proc_lib:init_ack and 
+	  gen_server:enter_loop to allow mor advanced initialization of 
+	  httpc_handlers without blocking the httpc_manger and eliminating 
+	  extra processes that can cause race conditions. </p>
+          <p>Own Id: OTP-9246</p>
+        </item>
+
+        <item>
+          <p>[httpc] Issuing a request (<c>httpc:request</c>) to an 
+	  host with the ssl option 
+	  <c>{ip, {127,0,0,1}}</c> results in an handler crash. 
+	  The reason was that the connect call resulted in an exit with 
+	  reason <c>badarg</c> 
+	  (this was the same for both <c>ssl</c> and <c>gen_tcp</c>). </p>
+	  <p>Exits was not catched. This has now been improved. </p>
+          <p>Own Id: OTP-9289</p>
+          <p>Aux Id: seq11845</p>
+        </item>
+
+      </list>
+    </section>
+
+  </section> <!-- 5.6 -->
+
+
   <section><title>Inets 5.5.2</title>
 
     <section><title>Improvements and New Features</title>
@@ -80,7 +214,8 @@
 	  are URL-encoded. Added support in http-client to use
 	  URL-encoding. Also added the missing include directory
 	  for the inets application.</p>
-          <p>Own Id: OTP-8940 Aux Id: seq11735 </p>
+          <p>Own Id: OTP-8940</p>
+          <p>Aux Id: seq11735</p>
         </item>
       </list>
     </section>
diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl
index 5ad74851c8..fe6cb0c191 100644
--- a/lib/inets/src/ftp/ftp.erl
+++ b/lib/inets/src/ftp/ftp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -92,6 +92,12 @@
 	 }).
 
 
+-type shortage_reason()  :: 'etnospc' | 'epnospc'.
+-type restriction_reason() :: 'epath' | 'efnamena' | 'elogin' | 'enotbinary'.
+-type common_reason() ::  'econn' | 'eclosed' | term().
+-type file_write_error_reason() :: term(). % See file:write for more info
+
+
 %%%=========================================================================
 %%%  API - CLIENT FUNCTIONS
 %%%=========================================================================
@@ -106,6 +112,9 @@
 %% Description:  Start an ftp client and connect to a host.
 %%--------------------------------------------------------------------------
 
+-spec open(Host :: string() | inet:ip_address()) ->
+    {'ok', Pid :: pid()} | {'error', Reason :: 'ehost' | term()}.
+
 %% <BACKWARD-COMPATIBILLITY>
 open({option_list, Options}) when is_list(Options) ->
     try
@@ -126,6 +135,9 @@ open({option_list, Options}) when is_list(Options) ->
 open(Host) ->
     open(Host, []).
 
+-spec open(Host :: string() | inet:ip_address(), Opts :: list()) ->
+    {'ok', Pid :: pid()} | {'error', Reason :: 'ehost' | term()}.
+
 %% <BACKWARD-COMPATIBILLITY>
 open(Host, Port) when is_integer(Port) ->
     open(Host, [{port, Port}]);
@@ -161,12 +173,24 @@ open(Host, Opts) when is_list(Opts) ->
 %%
 %% Description:  Login with or without a supplied account name.
 %%--------------------------------------------------------------------------
+-spec user(Pid  :: pid(), 
+	   User :: string(), 
+	   Pass :: string()) ->
+    'ok' | {'error', Reason :: 'euser' | common_reason()}.
+
 user(Pid, User, Pass) ->
     call(Pid, {user, User, Pass}, atom).
 
+-spec user(Pid  :: pid(), 
+	   User :: string(), 
+	   Pass :: string(), 
+	   Acc  :: string()) ->
+    'ok' | {'error', Reason :: 'euser' | common_reason()}.
+
 user(Pid, User, Pass, Acc) ->
     call(Pid, {user, User, Pass, Acc}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% account(Pid, Acc)  -> ok | {error, eacct}
 %%	Pid = pid()
@@ -174,9 +198,14 @@ user(Pid, User, Pass, Acc) ->
 %%
 %% Description:  Set a user Account.
 %%--------------------------------------------------------------------------
+
+-spec account(Pid :: pid(), Acc :: string()) ->
+    'ok' | {'error', Reason :: 'eacct' | common_reason()}.
+
 account(Pid, Acc) ->
     call(Pid, {account, Acc}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% pwd(Pid) -> {ok, Dir} | {error, elogin} | {error, econn} 
 %%	Pid = pid()
@@ -184,19 +213,30 @@ account(Pid, Acc) ->
 %%
 %% Description:  Get the current working directory at remote server.
 %%--------------------------------------------------------------------------
+
+-spec pwd(Pid :: pid()) ->
+    {'ok', Dir :: string()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
 pwd(Pid) ->
     call(Pid, pwd, ctrl).
 
+
 %%--------------------------------------------------------------------------
-%% lpwd(Pid) ->  {ok, Dir} | {error, elogin} 
+%% lpwd(Pid) ->  {ok, Dir} 
 %%	Pid = pid()
 %%      Dir = string()
 %%
 %% Description:  Get the current working directory at local server.
 %%--------------------------------------------------------------------------
+
+-spec lpwd(Pid :: pid()) ->
+    {'ok', Dir :: string()}.
+
 lpwd(Pid) ->
     call(Pid, lpwd, string).
 
+
 %%--------------------------------------------------------------------------
 %% cd(Pid, Dir) ->  ok | {error, epath} | {error, elogin} | {error, econn}
 %%	Pid = pid()
@@ -204,9 +244,14 @@ lpwd(Pid) ->
 %%
 %% Description:  Change current working directory at remote server.
 %%--------------------------------------------------------------------------
+
+-spec cd(Pid :: pid(), Dir :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
 cd(Pid, Dir) ->
     call(Pid, {cd, Dir}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% lcd(Pid, Dir) ->  ok | {error, epath}
 %%	Pid = pid()
@@ -214,9 +259,14 @@ cd(Pid, Dir) ->
 %%
 %% Description:  Change current working directory for the local client.
 %%--------------------------------------------------------------------------
+
+-spec lcd(Pid :: pid(), Dir :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason()}.
+
 lcd(Pid, Dir) ->
     call(Pid, {lcd, Dir}, string).
 
+
 %%--------------------------------------------------------------------------
 %% ls(Pid) -> Result
 %% ls(Pid, <Dir>) -> Result
@@ -229,11 +279,22 @@ lcd(Pid, Dir) ->
 %%
 %% Description: Returns a list of files in long format.
 %%--------------------------------------------------------------------------
+
+-spec ls(Pid :: pid()) ->
+    {'ok', Listing :: string()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
 ls(Pid) ->
   ls(Pid, "").
+
+-spec ls(Pid :: pid(), Dir :: string()) ->
+    {'ok', Listing :: string()} | 
+	{'error', Reason ::  restriction_reason() | common_reason()}.
+
 ls(Pid, Dir) ->
     call(Pid, {dir, long, Dir}, string).
 
+
 %%--------------------------------------------------------------------------
 %% nlist(Pid) -> Result
 %% nlist(Pid, Pathname) -> Result
@@ -246,21 +307,37 @@ ls(Pid, Dir) ->
 %%
 %% Description:  Returns a list of files in short format
 %%--------------------------------------------------------------------------
+
+-spec nlist(Pid :: pid()) ->
+    {'ok', Listing :: string()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
 nlist(Pid) ->
   nlist(Pid, "").
+
+-spec nlist(Pid :: pid(), Pathname :: string()) ->
+    {'ok', Listing :: string()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
 nlist(Pid, Dir) ->
     call(Pid, {dir, short, Dir}, string).
 
+
 %%--------------------------------------------------------------------------
-%% rename(Pid, CurrFile, NewFile) ->  ok | {error, epath} | {error, elogin} 
-%%                                    | {error, econn}
+%% rename(Pid, Old, New) ->  ok | {error, epath} | {error, elogin} 
+%%                              | {error, econn}
 %%	Pid = pid()
 %%	CurrFile = NewFile = string()
 %%
 %% Description:  Rename a file at remote server.
 %%--------------------------------------------------------------------------
-rename(Pid, CurrFile, NewFile) ->
-    call(Pid, {rename, CurrFile, NewFile}, string).
+
+-spec rename(Pid :: pid(), Old :: string(), New :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
+rename(Pid, Old, New) ->
+    call(Pid, {rename, Old, New}, string).
+
 
 %%--------------------------------------------------------------------------
 %% delete(Pid, File) ->  ok | {error, epath} | {error, elogin} | 
@@ -270,9 +347,14 @@ rename(Pid, CurrFile, NewFile) ->
 %%
 %% Description:  Remove file at remote server.
 %%--------------------------------------------------------------------------
+
+-spec delete(Pid :: pid(), File :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
 delete(Pid, File) ->
     call(Pid, {delete, File}, string).
 
+
 %%--------------------------------------------------------------------------
 %% mkdir(Pid, Dir) -> ok | {error, epath} | {error, elogin} | {error, econn}
 %%	Pid = pid(), 
@@ -280,9 +362,14 @@ delete(Pid, File) ->
 %%
 %% Description:  Make directory at remote server.
 %%--------------------------------------------------------------------------
+
+-spec mkdir(Pid :: pid(), Dir :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
 mkdir(Pid, Dir) ->
     call(Pid, {mkdir, Dir}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% rmdir(Pid, Dir) -> ok | {error, epath} | {error, elogin} | {error, econn}
 %%	Pid = pid(), 
@@ -290,9 +377,14 @@ mkdir(Pid, Dir) ->
 %%
 %% Description:  Remove directory at remote server.
 %%--------------------------------------------------------------------------
+
+-spec rmdir(Pid :: pid(), Dir :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
 rmdir(Pid, Dir) ->
     call(Pid, {rmdir, Dir}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% type(Pid, Type) -> ok | {error, etype} | {error, elogin} | {error, econn}
 %%	Pid = pid() 
@@ -300,23 +392,41 @@ rmdir(Pid, Dir) ->
 %%
 %% Description:  Set transfer type.
 %%--------------------------------------------------------------------------
+
+-spec type(Pid :: pid(), Type :: ascii | binary) ->
+    'ok' | 
+	{'error', Reason :: 'etype' | restriction_reason() | common_reason()}.
+
 type(Pid, Type) ->
     call(Pid, {type, Type}, atom).
 
+
 %%--------------------------------------------------------------------------
-%% recv(Pid, RemoteFileName <LocalFileName>) -> ok | {error, epath} |
+%% recv(Pid, RemoteFileName [, LocalFileName]) -> ok | {error, epath} |
 %%                                          {error, elogin} | {error, econn}
 %%	Pid = pid()
 %%	RemoteFileName = LocalFileName = string()
 %%
 %% Description:  Transfer file from remote server.
 %%--------------------------------------------------------------------------
+
+-spec recv(Pid :: pid(), RemoteFileName :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | 
+                               common_reason() | 
+                               file_write_error_reason()}.
+
 recv(Pid, RemotFileName) ->
   recv(Pid, RemotFileName, RemotFileName).
 
+-spec recv(Pid            :: pid(), 
+	   RemoteFileName :: string(), 
+	   LocalFileName  :: string()) ->
+    'ok' | {'error', Reason :: term()}.
+
 recv(Pid, RemotFileName, LocalFileName) ->
     call(Pid, {recv, RemotFileName, LocalFileName}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% recv_bin(Pid, RemoteFile) -> {ok, Bin} | {error, epath} | {error, elogin} 
 %%			   | {error, econn}
@@ -326,9 +436,16 @@ recv(Pid, RemotFileName, LocalFileName) ->
 %%
 %% Description:  Transfer file from remote server into binary.
 %%--------------------------------------------------------------------------
+
+-spec recv_bin(Pid        :: pid(), 
+	       RemoteFile :: string()) ->
+    {'ok', Bin :: binary()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
 recv_bin(Pid, RemoteFile) ->
     call(Pid, {recv_bin, RemoteFile}, bin).
 
+
 %%--------------------------------------------------------------------------
 %% recv_chunk_start(Pid, RemoteFile) -> ok | {error, elogin} | {error, epath} 
 %%                                 | {error, econn}
@@ -337,9 +454,15 @@ recv_bin(Pid, RemoteFile) ->
 %%
 %% Description:  Start receive of chunks of remote file.
 %%--------------------------------------------------------------------------
+
+-spec recv_chunk_start(Pid        :: pid(), 
+		       RemoteFile :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
 recv_chunk_start(Pid, RemoteFile) ->
     call(Pid, {recv_chunk_start, RemoteFile}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% recv_chunk(Pid, RemoteFile) ->  ok | {ok, Bin} | {error, Reason}
 %%	Pid = pid()
@@ -347,24 +470,47 @@ recv_chunk_start(Pid, RemoteFile) ->
 %%
 %% Description:  Transfer file from remote server into binary in chunks
 %%--------------------------------------------------------------------------
+
+-spec recv_chunk(Pid :: pid()) ->
+    'ok' | 
+	{'ok', Bin :: binary()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
 recv_chunk(Pid) ->
     call(Pid, recv_chunk, atom).
 
+
 %%--------------------------------------------------------------------------
-%% send(Pid, LocalFileName <RemotFileName>) -> ok | {error, epath} 
-%%                                                | {error, elogin} 
-%%                             | {error, econn}
+%% send(Pid, LocalFileName [, RemotFileName]) -> ok | {error, epath} 
+%%                                                  | {error, elogin} 
+%%                                                  | {error, econn}
 %%	Pid = pid()
 %%	LocalFileName = RemotFileName = string()
 %%
 %% Description:  Transfer file to remote server.
 %%--------------------------------------------------------------------------
+
+-spec send(Pid :: pid(), LocalFileName :: string()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
 send(Pid, LocalFileName) ->
   send(Pid, LocalFileName, LocalFileName).
 
+-spec send(Pid            :: pid(), 
+	   LocalFileName  :: string(), 
+	   RemoteFileName :: string()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
 send(Pid, LocalFileName, RemotFileName) ->
     call(Pid, {send, LocalFileName, RemotFileName}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% send_bin(Pid, Bin, RemoteFile) -> ok | {error, epath} | {error, elogin} 
 %%                             | {error, enotbinary} | {error, econn}
@@ -374,11 +520,19 @@ send(Pid, LocalFileName, RemotFileName) ->
 %%
 %% Description:  Transfer a binary to a remote file.
 %%--------------------------------------------------------------------------
+
+-spec send_bin(Pid :: pid(), Bin :: binary(), RemoteFile :: string()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
 send_bin(Pid, Bin, RemoteFile) when is_binary(Bin) ->
     call(Pid, {send_bin, Bin, RemoteFile}, atom);
 send_bin(_Pid, _Bin, _RemoteFile) ->
   {error, enotbinary}.
 
+
 %%--------------------------------------------------------------------------
 %% send_chunk_start(Pid, RemoteFile) -> ok | {error, elogin} | {error, epath} 
 %%                                 | {error, econn}
@@ -387,9 +541,14 @@ send_bin(_Pid, _Bin, _RemoteFile) ->
 %%
 %% Description:  Start transfer of chunks to remote file.
 %%--------------------------------------------------------------------------
+
+-spec send_chunk_start(Pid :: pid(), RemoteFile :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
 send_chunk_start(Pid, RemoteFile) ->
     call(Pid, {send_chunk_start, RemoteFile}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% append_chunk_start(Pid, RemoteFile) -> ok | {error, elogin} | 
 %%                                        {error, epath} | {error, econn}
@@ -398,9 +557,14 @@ send_chunk_start(Pid, RemoteFile) ->
 %%
 %% Description:  Start append chunks of data to remote file.
 %%--------------------------------------------------------------------------
+
+-spec append_chunk_start(Pid :: pid(), RemoteFile :: string()) ->
+    'ok' | {'error', Reason :: term()}.
+
 append_chunk_start(Pid, RemoteFile) ->
     call(Pid, {append_chunk_start, RemoteFile}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% send_chunk(Pid, Bin) -> ok | {error, elogin} | {error, enotbinary} 
 %%                       | {error, echunk} | {error, econn}
@@ -409,11 +573,19 @@ append_chunk_start(Pid, RemoteFile) ->
 %%
 %% Purpose:  Send chunk to remote file.
 %%--------------------------------------------------------------------------
+
+-spec send_chunk(Pid :: pid(), Bin :: binary()) ->
+    'ok' | 
+	{'error', Reason :: 'echunk' | 
+                            restriction_reason() | 
+                            common_reason()}.
+
 send_chunk(Pid, Bin) when is_binary(Bin) ->
     call(Pid, {transfer_chunk, Bin}, atom);
 send_chunk(_Pid, _Bin) ->
   {error, enotbinary}.
 
+
 %%--------------------------------------------------------------------------
 %% append_chunk(Pid, Bin) -> ok | {error, elogin} | {error, enotbinary} 
 %%			     | {error, echunk} | {error, econn}
@@ -422,11 +594,19 @@ send_chunk(_Pid, _Bin) ->
 %%
 %% Description:  Append chunk to remote file.
 %%--------------------------------------------------------------------------
+
+-spec append_chunk(Pid :: pid(), Bin :: binary()) ->
+    'ok' | 
+	{'error', Reason :: 'echunk' | 
+                            restriction_reason() | 
+                            common_reason()}.
+
 append_chunk(Pid, Bin) when is_binary(Bin) ->
     call(Pid, {transfer_chunk, Bin}, atom);
 append_chunk(_Pid, _Bin) ->
   {error, enotbinary}.
 
+
 %%--------------------------------------------------------------------------
 %% send_chunk_end(Pid) -> ok | {error, elogin} | {error, echunk} 
 %%			  | {error, econn}
@@ -434,9 +614,17 @@ append_chunk(_Pid, _Bin) ->
 %%
 %% Description:  End sending of chunks to remote file.
 %%--------------------------------------------------------------------------
+
+-spec send_chunk_end(Pid :: pid()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
 send_chunk_end(Pid) ->
     call(Pid, chunk_end, atom).
 
+
 %%--------------------------------------------------------------------------
 %% append_chunk_end(Pid) ->  ok | {error, elogin} | {error, echunk} 
 %%			     | {error, econn}
@@ -444,23 +632,47 @@ send_chunk_end(Pid) ->
 %%
 %% Description:  End appending of chunks to remote file.
 %%--------------------------------------------------------------------------
+
+-spec append_chunk_end(Pid :: pid()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
 append_chunk_end(Pid) ->
     call(Pid, chunk_end, atom).
 
+
 %%--------------------------------------------------------------------------
-%% append(Pid, LocalFileName, RemotFileName) -> ok | {error, epath} 
-%%                                          | {error, elogin} | {error, econn}
+%% append(Pid, LocalFileName [, RemotFileName]) -> ok | {error, epath} 
+%%                                                    | {error, elogin} 
+%%                                                    | {error, econn}
 %%	Pid = pid()
 %%	LocalFileName = RemotFileName = string()
 %%
 %% Description:  Append the local file to the remote file
 %%--------------------------------------------------------------------------
+
+-spec append(Pid :: pid(), LocalFileName :: string()) ->
+    'ok' | 
+	{'error', Reason :: 'epath'    | 
+                            'elogin'   | 
+                            'etnospc'  | 
+                            'epnospc'  | 
+                            'efnamena' | common_reason()}.
+
 append(Pid, LocalFileName) ->
     append(Pid, LocalFileName, LocalFileName).
 
+-spec append(Pid            :: pid(), 
+	     LocalFileName  :: string(), 
+	     RemoteFileName :: string()) ->
+    'ok' | {'error', Reason :: term()}.
+
 append(Pid, LocalFileName, RemotFileName) ->
     call(Pid, {append, LocalFileName, RemotFileName}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% append_bin(Pid, Bin, RemoteFile) -> ok | {error, epath} | {error, elogin} 
 %%				  | {error, enotbinary} | {error, econn}
@@ -470,27 +682,44 @@ append(Pid, LocalFileName, RemotFileName) ->
 %%
 %% Purpose:  Append a binary to a remote file.
 %%--------------------------------------------------------------------------
+
+-spec append_bin(Pid        :: pid(), 
+		 Bin        :: binary(), 
+		 RemoteFile :: string()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
 append_bin(Pid, Bin, RemoteFile) when is_binary(Bin) ->
     call(Pid, {append_bin, Bin, RemoteFile}, atom);
 append_bin(_Pid, _Bin, _RemoteFile) ->
     {error, enotbinary}.
 
+
 %%--------------------------------------------------------------------------
-%% quote(Pid, Cmd) -> ok
+%% quote(Pid, Cmd) -> list()
 %%	Pid = pid()
 %%	Cmd = string()
 %%
 %% Description: Send arbitrary ftp command.
 %%--------------------------------------------------------------------------
+
+-spec quote(Pid :: pid(), Cmd :: string()) -> list().
+
 quote(Pid, Cmd) when is_list(Cmd) ->
     call(Pid, {quote, Cmd}, atom).
 
+
 %%--------------------------------------------------------------------------
 %% close(Pid) -> ok
 %%	Pid = pid()
 %%
 %% Description:  End the ftp session.
 %%--------------------------------------------------------------------------
+
+-spec close(Pid :: pid()) -> 'ok'.
+
 close(Pid) ->
     cast(Pid, close),
     ok.
@@ -502,9 +731,13 @@ close(Pid) ->
 %%
 %% Description:  Return diagnostics.
 %%--------------------------------------------------------------------------
+
+-spec formaterror(Tag :: term()) -> string().
+
 formaterror(Tag) ->
   ftp_response:error_string(Tag).
 
+
 info(Pid) ->
     call(Pid, info, list).
 
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index 04fae13b20..b70b16f57f 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -126,7 +126,10 @@ request(Url, Profile) ->
 %%      Header = {Field, Value}
 %%	Field = string()
 %%	Value = string()
-%%	Body = string() | binary() - HTLM-code
+%%	Body = string() | binary() | {fun(SendAcc) -> SendFunResult, SendAcc} |
+%%              {chunkify, fun(SendAcc) -> SendFunResult, SendAcc} - HTLM-code
+%%      SendFunResult = eof | {ok, iolist(), NewSendAcc}
+%%      SendAcc = NewSendAcc = term()
 %%
 %% Description: Sends a HTTP-request. The function can be both
 %% syncronus and asynchronous in the later case the function will
@@ -426,26 +429,44 @@ service_info(Pid) ->
 
 handle_request(Method, Url, 
 	       {Scheme, UserInfo, Host, Port, Path, Query}, 
-	       Headers, ContentType, Body, 
+	       Headers0, ContentType, Body0,
 	       HTTPOptions0, Options0, Profile) ->
 
-    Started    = http_util:timestamp(), 
-    NewHeaders = [{http_util:to_lower(Key), Val} || {Key, Val} <- Headers],
+    Started     = http_util:timestamp(), 
+    NewHeaders0 = [{http_util:to_lower(Key), Val} || {Key, Val} <- Headers0],
 
     try
 	begin
+	    ?hcrt("begin processing", [{started,     Started}, 
+				       {new_headers, NewHeaders0}]),
+
+	    {NewHeaders, Body} = 
+		case Body0 of
+		    {chunkify, ProcessBody, Acc} 
+		      when is_function(ProcessBody, 1) ->
+			NewHeaders1 = ensure_chunked_encoding(NewHeaders0), 
+			Body1       = {mk_chunkify_fun(ProcessBody), Acc}, 
+			{NewHeaders1, Body1};
+		    {ProcessBody, _} 
+		      when is_function(ProcessBody, 1) ->
+			{NewHeaders0, Body0};
+		    _ when is_list(Body0) orelse is_binary(Body0) ->
+			{NewHeaders0, Body0};
+		    _ ->
+			throw({error, {bad_body, Body0}})
+		end,
+
 	    HTTPOptions   = http_options(HTTPOptions0),
 	    Options       = request_options(Options0), 
 	    Sync          = proplists:get_value(sync,   Options),
 	    Stream        = proplists:get_value(stream, Options),
 	    Host2         = header_host(Scheme, Host, Port), 
 	    HeadersRecord = header_record(NewHeaders, Host2, HTTPOptions),
-	    Receiver   = proplists:get_value(receiver, Options),
-	    SocketOpts = proplists:get_value(socket_opts, Options),
-	    UrlEncodeBool =  HTTPOptions#http_options.url_encode,
-	    MaybeEscPath = url_encode(Path, UrlEncodeBool),
-	    MaybeEscQuery = url_encode(Query, UrlEncodeBool),
-	    AbsUri  = url_encode(Url, UrlEncodeBool),
+	    Receiver      = proplists:get_value(receiver, Options),
+	    SocketOpts    = proplists:get_value(socket_opts, Options),
+	    MaybeEscPath  = maybe_encode_uri(HTTPOptions, Path),
+	    MaybeEscQuery = maybe_encode_uri(HTTPOptions, Query),
+	    AbsUri        = maybe_encode_uri(HTTPOptions, Url),
 
 	    Request = #request{from          = Receiver,
 			       scheme        = Scheme, 
@@ -458,38 +479,71 @@ handle_request(Method, Url,
 			       settings      = HTTPOptions, 
 			       abs_uri       = AbsUri,
 			       userinfo      = UserInfo, 
-			       stream        = Stream,
-			       headers_as_is = headers_as_is(Headers, Options),
+			       stream        = Stream, 
+			       headers_as_is = headers_as_is(Headers0, Options),
 			       socket_opts   = SocketOpts, 
 			       started       = Started},
+
 	    case httpc_manager:request(Request, profile_name(Profile)) of
 		{ok, RequestId} ->
 		    handle_answer(RequestId, Sync, Options);
 		{error, Reason} ->
+		    ?hcrd("request failed", [{reason, Reason}]),
 		    {error, Reason}
 	    end
 	end
     catch
 	error:{noproc, _} ->
+	    ?hcrv("noproc", [{profile, Profile}]),
 	    {error, {not_started, Profile}};
 	throw:Error ->
+	    ?hcrv("throw", [{error, Error}]),
 	    Error
     end.
 
-url_encode(URI, true) ->
+ensure_chunked_encoding(Hdrs) ->
+    Key = "transfer-encoding",
+    lists:keystore(Key, 1, Hdrs, {Key, "chunked"}).
+
+maybe_encode_uri(#http_options{url_encode = true}, URI) ->
     http_uri:encode(URI);
-url_encode(URI, false) ->
+maybe_encode_uri(_, URI) ->
     URI.
 
+mk_chunkify_fun(ProcessBody) ->
+    fun(eof_body) ->
+	    eof;
+       (Acc) ->
+	    case ProcessBody(Acc) of
+		eof ->
+		    {ok, <<"0\r\n\r\n">>, eof_body};
+		{ok, Data, NewAcc} ->
+		    {ok, mk_chunk_bin(Data), NewAcc}
+	    end
+    end.
+
+mk_chunk_bin(Data) ->
+    Bin = iolist_to_binary(Data),
+    iolist_to_binary([hex_size(Bin), "\r\n", Bin, "\r\n"]).
+
+hex_size(Bin) ->
+    hd(io_lib:format("~.16B", [size(Bin)])).
+
+
 handle_answer(RequestId, false, _) ->
     {ok, RequestId};
 handle_answer(RequestId, true, Options) ->
     receive
 	{http, {RequestId, saved_to_file}} ->
+	    ?hcrt("received saved-to-file", [{request_id, RequestId}]),
 	    {ok, saved_to_file};
 	{http, {RequestId, {_,_,_} = Result}} ->
+	    ?hcrt("received answer", [{request_id, RequestId}, 
+				      {result,     Result}]),
 	    return_answer(Options, Result);
 	{http, {RequestId, {error, Reason}}} ->
+	    ?hcrt("received error", [{request_id, RequestId}, 
+				     {reason,     Reason}]),
 	    {error, Reason}
     end.
 
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index cb6f3e2841..1f0e012e7e 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. 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
@@ -29,10 +29,10 @@
 %%--------------------------------------------------------------------
 %% Internal Application API
 -export([
-	 start_link/2, 
-	 connect_and_send/2, 
+	 start_link/4,
+	 %% connect_and_send/2,
 	 send/2, 
-	 cancel/2, 
+	 cancel/3,
 	 stream/3, 
 	 stream_next/1,
 	 info/1
@@ -51,7 +51,7 @@
 -record(state, 
 	{
 	  request,                   % #request{}
-	  session,                   % #tcp_session{} 
+	  session,                   % #session{}
 	  status_line,               % {Version, StatusCode, ReasonPharse}
 	  headers,                   % #http_response_h{}
 	  body,                      % binary()
@@ -94,13 +94,9 @@
 %%--------------------------------------------------------------------
 %%--------------------------------------------------------------------
 
-start_link(Options, ProfileName) ->
-    Args = [Options, ProfileName], 
-    gen_server:start_link(?MODULE, Args, []).
-
-connect_and_send(Request, HandlerPid) ->
-    call({connect_and_send, Request}, HandlerPid).
-
+start_link(Parent, Request, Options, ProfileName) ->
+    {ok, proc_lib:start_link(?MODULE, init, [[Parent, Request, Options,
+					      ProfileName]])}.
 
 %%--------------------------------------------------------------------
 %% Function: send(Request, Pid) -> ok 
@@ -122,8 +118,8 @@ send(Request, Pid) ->
 %% Description: Cancels a request. Intended to be called by the httpc
 %% manager process.
 %%--------------------------------------------------------------------
-cancel(RequestId, Pid) ->
-    cast({cancel, RequestId}, Pid).
+cancel(RequestId, Pid, From) ->
+    cast({cancel, RequestId, From}, Pid).
 
 
 %%--------------------------------------------------------------------
@@ -229,16 +225,27 @@ stream(BodyPart, Request,_) -> % only 200 and 206 responses can be streamed
 %% but we do not want that so errors will be handled by the process
 %% sending an init_error message to itself.
 %%--------------------------------------------------------------------
-init([Options, ProfileName]) ->
-    ?hcrv("init - starting", [{options, Options}, {profile, ProfileName}]),
+init([Parent, Request, Options, ProfileName]) ->
     process_flag(trap_exit, true),
-    handle_verbose(Options#options.verbose),
-    State = #state{status       = undefined,
-		   options      = Options, 
-		   profile_name = ProfileName},
-    ?hcrd("init - started", []),
-    {ok, State}.
 
+    %% Do not let initial tcp-connection block the manager-process
+    proc_lib:init_ack(Parent, self()),
+    handle_verbose(Options#options.verbose),
+    Address = handle_proxy(Request#request.address, Options#options.proxy),
+    {ok, State} =
+	case {Address /= Request#request.address, Request#request.scheme} of
+	    {true, https} ->
+		Error = https_through_proxy_is_not_currently_supported,
+		self() ! {init_error,
+			  Error, httpc_response:error(Request, Error)},
+		{ok, #state{request = Request, options = Options,
+			    status = ssl_tunnel}};
+	    {_, _} ->
+		connect_and_send_first_request(Address, Request,
+				   #state{options = Options,
+					  profile_name = ProfileName})
+	end,
+    gen_server:enter_loop(?MODULE, [], State).
 
 %%--------------------------------------------------------------------
 %% Function: handle_call(Request, From, State) -> {reply, Reply, State} |
@@ -249,41 +256,6 @@ init([Options, ProfileName]) ->
 %%          {stop, Reason, State}            (terminate/2 is called)
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
-
-
-%% This is the first request, the reason the proc was started
-handle_call({connect_and_send, #request{address = Address0,
-					scheme  = Scheme} = Request}, 
-	    _From, 
-	    #state{options = #options{proxy = Proxy}, 
-		   status  = undefined,
-		   session = undefined} = State) ->
-    ?hcrv("connect and send", [{address0, Address0}, {proxy, Proxy}]),
-    Address = handle_proxy(Address0, Proxy),
-    if
-	((Address =/= Address0) andalso (Scheme  =:= https)) ->
-	    %% This is what we should do if and when ssl supports 
-	    %% "socket upgrading"
-	    %%send_ssl_tunnel_request(Address, Request,
-	    %%		    #state{options = Options,
-	    %%		   status = ssl_tunnel});
-	    Reason = {failed_connecting, 
-		      https_through_proxy_is_not_currently_supported},
-	    %% Send a reply to the original caller
-	    ErrorResponse = httpc_response:error(Request, Reason), 
-	    httpc_response:send(Request#request.from, ErrorResponse),
-	    %% Reply to the manager
-	    ErrorReply    = {error, Reason},
-	    {stop, normal, ErrorReply, State};
-	true ->
-	    case connect_and_send_first_request(Address, Request, State) of
-		{ok, NewState} ->
-		    {reply, ok, NewState};
-		{stop, Error, NewState} ->
-		    {stop, normal, Error, NewState}
-	    end
-    end;
-	
 handle_call(#request{address = Addr} = Request, _, 
 	    #state{status  = Status,
 		   session = #session{type = pipeline} = Session,
@@ -445,25 +417,27 @@ handle_call(info, _, State) ->
 %% handle_keep_alive_queue/2 on the other hand will just skip the
 %% request as if it was never issued as in this case the request will
 %% not have been sent. 
-handle_cast({cancel, RequestId}, 
+handle_cast({cancel, RequestId, From},
 	    #state{request      = #request{id = RequestId} = Request,
 		   profile_name = ProfileName,
 		   canceled     = Canceled} = State) ->
     ?hcrv("cancel current request", [{request_id, RequestId}, 
 				     {profile,    ProfileName},
 				     {canceled,   Canceled}]),
-    httpc_manager:request_canceled(RequestId, ProfileName),
+    httpc_manager:request_canceled(RequestId, ProfileName, From),
     ?hcrv("canceled", []),
     {stop, normal, 
      State#state{canceled = [RequestId | Canceled],
 		 request  = Request#request{from = answer_sent}}};
-handle_cast({cancel, RequestId}, 
+handle_cast({cancel, RequestId, From},
 	    #state{profile_name = ProfileName,
+		   request      = #request{id = CurrId},
 		   canceled     = Canceled} = State) ->
-    ?hcrv("cancel", [{request_id, RequestId}, 
+    ?hcrv("cancel", [{request_id, RequestId},
+		     {curr_req_id, CurrId},
 		     {profile, ProfileName},
 		     {canceled,   Canceled}]),
-    httpc_manager:request_canceled(RequestId, ProfileName),
+    httpc_manager:request_canceled(RequestId, ProfileName, From),
     ?hcrv("canceled", []),
     {noreply, State#state{canceled = [RequestId | Canceled]}};
 
@@ -872,62 +846,55 @@ connect(SocketType, ToAddress,
 	    Opts3 = [IpFamily | Opts2], 
 	    http_transport:connect(SocketType, ToAddress, Opts3, Timeout)
     end.
-		
-connect_and_send_first_request(Address, 
-			       #request{settings    = Settings,
-					headers     = Headers,
-					address     = OrigAddress,
-					scheme      = Scheme} = Request, 
-			       #state{options = Options} = State) ->
-
-    ?hcrd("connect", 
-	  [{address, Address}, {request, Request}, {options, Options}]),
 
+connect_and_send_first_request(Address, Request, #state{options = Options} = State) ->
     SocketType  = socket_type(Request),
-    ConnTimeout = Settings#http_options.connect_timeout,
+    ConnTimeout = (Request#request.settings)#http_options.connect_timeout,
+    ?hcri("connect",
+	  [{address, Address}, {request, Request}, {options, Options}]),
     case connect(SocketType, Address, Options, ConnTimeout) of
 	{ok, Socket} ->
-	    Session = #session{id          = {OrigAddress, self()},
-			       scheme      = Scheme,
-			       socket      = Socket,
-			       socket_type = SocketType}, 
-	    ?hcrd("connected - now send first request", [{socket, Socket}]),
+	    ClientClose =
+			httpc_request:is_client_closing(
+			  Request#request.headers),
+	    SessionType = httpc_manager:session_type(Options),
+	    SocketType  = socket_type(Request),
+	    Session = #session{id = {Request#request.address, self()},
+			       scheme = Request#request.scheme,
+			       socket = Socket,
+			       socket_type = SocketType,
+			       client_close = ClientClose,
+			       type = SessionType},
+	    ?hcri("connected - now send first request", [{socket, Socket}]),
+
 	    case httpc_request:send(Address, Session, Request) of
 		ok ->
-		    ?hcrd("first request sent", []),
-		    ClientClose = 
-			httpc_request:is_client_closing(Headers),
-		    SessionType = httpc_manager:session_type(Options),
-		    Session2 =
-			Session#session{client_close = ClientClose,
-					type         = SessionType},
-		    TmpState = 
-			State#state{request     = Request, 
-				    session     = Session2, 
-				    mfa         = init_mfa(Request, State),
-				    status_line = init_status_line(Request),
-				    headers     = undefined,
-				    body        = undefined,
-				    status      = new},
-		    ?hcrt("activate socket", []),
-		    activate_once(Session),
+		    ?hcri("first request sent", []),
+		    TmpState = State#state{request = Request,
+					   session = Session,
+					   mfa = init_mfa(Request, State),
+					   status_line =
+					   init_status_line(Request),
+					   headers = undefined,
+					   body = undefined,
+					   status = new},
+		    http_transport:setopts(SocketType,
+					   Socket, [{active, once}]),
 		    NewState = activate_request_timeout(TmpState),
 		    {ok, NewState};
-
-		{error, Reason} = Error -> 
-		    ?hcrv("failed sending request", [{reason, Reason}]),
-		    {stop, Error, 
-		     State#state{session = {send_failed, Reason}, 
-				 request = Request}}
+		{error, Reason} ->
+		    self() ! {init_error, error_sending,
+			      httpc_response:error(Request, Reason)},
+		    {ok, State#state{request = Request,
+				     session =
+					 #session{socket = Socket}}}
 	    end;
-
-	{error, Reason} = Error -> 
-	    ?hcri("connect failed", [{reason, Reason}]),
-	    {stop, Error, State#state{session = {connect_failed, Reason},
-				       request = Request}}
+	{error, Reason} ->
+	    self() ! {init_error, error_connecting,
+		      httpc_response:error(Request, Reason)},
+	    {ok, State#state{request = Request}}
     end.
 
-
 handler_info(#state{request     = Request, 
 		    session     = Session, 
 		    status_line = _StatusLine, 
@@ -1167,12 +1134,12 @@ handle_response(#state{request      = Request,
 	{ok, Msg, Data} ->
 	    ?hcrd("handle response - ok", []),
 	    end_stream(StatusLine, Request),
-	    NewState = answer_request(Request, Msg, State),
+	    NewState = maybe_send_answer(Request, Msg, State),
 	    handle_queue(NewState, Data); 
 	{stop, Msg} ->
 	    ?hcrd("handle response - stop", [{msg, Msg}]),
 	    end_stream(StatusLine, Request),
-	    NewState = answer_request(Request, Msg, State),
+	    NewState = maybe_send_answer(Request, Msg, State),
 	    {stop, normal, NewState}
     end.
 
@@ -1242,7 +1209,8 @@ handle_pipeline(#state{status       = pipeline,
 		    %% See comment for handle_cast({cancel, RequestId})
 		    {stop, normal, 
 		     State#state{request = 
-				 NextRequest#request{from = answer_sent}}};
+				 NextRequest#request{from = answer_sent},
+				 pipeline = Pipeline}};
 		false ->
 		    ?hcrv("next request", [{request, NextRequest}]),
 		    NewSession = 
@@ -1443,6 +1411,7 @@ answer_request(#request{id = RequestId, from = From} = Request, Msg,
     Timer = {RequestId, TimerRef},
     cancel_timer(TimerRef, {timeout, Request#request.id}),
     httpc_manager:request_done(RequestId, ProfileName),
+
     State#state{request = Request#request{from = answer_sent},
 		timers = 
 		Timers#timers{request_timers =
@@ -1662,71 +1631,28 @@ handle_verbose(_) ->
     ok.    
 
 
-%%% Normaly I do not comment out code, I throw it away. But this might
-%%% actually be used one day if ssl is improved.
-%% send_ssl_tunnel_request(Address, Request = #request{address = {Host, Port}}, 
-%% 			State) ->
-%%     %% A ssl tunnel request is a special http request that looks like
-%%     %% CONNECT host:port HTTP/1.1
-%%     SslTunnelRequest = #request{method = connect, scheme = http,
-%% 				headers = 
-%% 				#http_request_h{
-%% 				  host = Host, 
-%% 				  address = Address, 
-%% 				  path = Host ++ ":",
-%% 				  pquery = integer_to_list(Port),
-%% 				  other = [{ "Proxy-Connection", "keep-alive"}]},
-%%     Ipv6 = (State#state.options)#options.ipv6,
-%%     SocketType = socket_type(SslTunnelRequest),
-%%     case http_transport:connect(SocketType, 
-%%                                 SslTunnelRequest#request.address, Ipv6) of
-%% 	{ok, Socket} ->
-%% 	    case httpc_request:send(Address, SslTunnelRequest, Socket) of
-%% 		ok ->
-%% 		    Session = #tcp_session{id = 
-%% 					   {SslTunnelRequest#request.address,
-%% 					    self()},
-%% 					   scheme = 
-%% 					   SslTunnelRequest#request.scheme,
-%% 					   socket = Socket},
-%% 		    NewState = State#state{mfa = 
-%% 					   {httpc_response, parse,
-%% 					    [State#state.max_header_size]},
-%% 					   request = Request,
-%% 					   session = Session},
-%% 		    http_transport:setopts(socket_type(
-%%                                           SslTunnelRequest#request.scheme), 
-%% 					   Socket, 
-%% 					   [{active, once}]),
-%% 		    {ok, NewState};
-%% 		{error, Reason} -> 
-%% 		    self() ! {init_error, error_sending, 
-%% 			      httpc_response:error(Request, Reason)},
-%% 		    {ok, State#state{request = Request,
-%% 				     session = #tcp_session{socket = 
-%% 							    Socket}}}
-%% 	    end;
-%% 	{error, Reason} ->
-%% 	    self() ! {init_error, error_connecting, 
-%% 		      httpc_response:error(Request, Reason)},
-%% 	    {ok, State#state{request = Request}}
-%%     end.
-
-%% d(F) ->
-%%    d(F, []).
-
-%% d(F, A) -> 
-%%     d(get(dbg), F, A).
-
-%% d(true, F, A) ->
-%%     io:format(user, "~w:~w:" ++ F ++ "~n", [self(), ?MODULE | A]);
-%% d(_, _, _) ->
-%%     ok.
-
 
+send_raw(#session{socket = Socket, socket_type = SocketType}, 
+	 {ProcessBody, Acc}) when is_function(ProcessBody, 1) ->
+    ?hcrt("send raw", [{acc, Acc}]),
+    send_raw(SocketType, Socket, ProcessBody, Acc);
 send_raw(#session{socket = Socket, socket_type = SocketType}, Body) ->
     http_transport:send(SocketType, Socket, Body).
 
+send_raw(SocketType, Socket, ProcessBody, Acc) ->
+    case ProcessBody(Acc) of
+        eof ->
+            ok;
+        {ok, Data, NewAcc} ->
+            DataBin = iolist_to_binary(Data),
+            ?hcrd("send", [{data, DataBin}]),
+            case http_transport:send(SocketType, Socket, DataBin) of
+                ok ->
+                    send_raw(SocketType, Socket, ProcessBody, NewAcc);
+                Error ->
+                    Error
+            end
+    end.
 
 
 call(Msg, Pid) ->
@@ -1738,11 +1664,5 @@ call(Msg, Pid, Timeout) ->
 cast(Msg, Pid) ->
     gen_server:cast(Pid, Msg).
 
-
-%% to(To, Start) when is_integer(Start) andalso (Start >= 0) ->
-%%     http_util:timeout(To, Start);
-%% to(To, _Start) ->
-%%     http_util:timeout(To, t()).
-
 t() ->
     http_util:timestamp().
diff --git a/lib/inets/src/http_client/httpc_handler_sup.erl b/lib/inets/src/http_client/httpc_handler_sup.erl
index 2a69fd15d0..f7a0b014b3 100644
--- a/lib/inets/src/http_client/httpc_handler_sup.erl
+++ b/lib/inets/src/http_client/httpc_handler_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -23,7 +23,7 @@
 
 %% API
 -export([start_link/0]).
--export([start_child/2]).
+-export([start_child/1]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -34,11 +34,9 @@
 start_link() ->
     supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 
-start_child(Options, Profile) ->
-    Args = [Options, Profile], 
+start_child(Args) ->
     supervisor:start_child(?MODULE, Args).
 
-
 %%%=========================================================================
 %%%  Supervisor callback
 %%%=========================================================================
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl
index 591cb78c29..7f66b477eb 100644
--- a/lib/inets/src/http_client/httpc_manager.erl
+++ b/lib/inets/src/http_client/httpc_manager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. 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
@@ -29,7 +29,7 @@
 	 start_link/3, 
 	 request/2, 
 	 cancel_request/2,
-	 request_canceled/2, 
+	 request_canceled/3,
 	 request_done/2, 
 	 retry_request/2, 
 	 redirect_request/2,
@@ -66,6 +66,7 @@
 	  state    % State of the handler: initiating | started | operational | canceled
 	 }).
 
+-define(DELAY, 500).
 
 %%====================================================================
 %% Internal Application API
@@ -158,7 +159,8 @@ cancel_request(RequestId, ProfileName) ->
 %% be called by the httpc handler process.
 %%--------------------------------------------------------------------
 
-request_canceled(RequestId, ProfileName) ->
+request_canceled(RequestId, ProfileName, From) ->
+    gen_server:reply(From, ok),
     cast(ProfileName, {request_canceled, RequestId}).
 
 
@@ -355,44 +357,32 @@ do_init(ProfileName, CookiesDir) ->
 %%          {stop, Reason, State}            (terminate/2 is called)
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
-handle_call({request, Request}, _From, State) ->
-    ?hcrv("request", [{request, Request}]),
+handle_call({request, Request}, _, State) ->
+    ?hcri("request", [{request, Request}]),
     case (catch handle_request(Request, State)) of
-	{ok, ReqId, NewState} ->
-	    {reply, {ok, ReqId}, NewState};
-	
+	{reply, Msg, NewState} ->
+	    {reply, Msg, NewState};
 	Error ->
-	    NewError = {error, {failed_process_request, Error}}, 
-	    {reply, NewError, State}
+	    {stop, Error, httpc_response:error(Request, Error), State}
     end;
-	
-handle_call({cancel_request, RequestId}, From, 
-	    #state{handler_db = HandlerDb} = State) ->
-    ?hcrv("cancel_request", [{request_id, RequestId}]),
+
+handle_call({cancel_request, RequestId}, From, State) ->
+    ?hcri("cancel_request", [{request_id, RequestId}]),
     case ets:lookup(State#state.handler_db, RequestId) of
 	[] ->
-	    ?hcrd("nothing to cancel", []),
-	    Reply = ok, %% Nothing to cancel
-	    {reply, Reply, State};
-
-	[#handler_info{handler = Pid}] when is_pid(Pid) ->
-	    ?hcrd("found operational handler for this request", 
-		  [{handler, Pid}]),
-	    httpc_handler:cancel(RequestId, Pid),
-	    {noreply, State#state{cancel = 
-				  [{RequestId, Pid, From} | 
-				   State#state.cancel]}};
-
-	[#handler_info{starter = Pid, state = HandlerState}] 
-	when is_pid(Pid) ->
-	    ?hcri("found *initiating* handler for this request", 
-		  [{starter, Pid}, {state, HandlerState}]),
-	    ets:update_element(HandlerDb, RequestId, 
-			       {#handler_info.state, canceled}),
+	    %% The request has allready compleated make sure
+	    %% it is deliverd to the client process queue so
+	    %% it can be thrown away by httpc:cancel_request
+	    %% This delay is hopfully a temporary workaround.
+	    %% Note that it will not not delay the manager,
+	    %% only the client that called httpc:cancel_request
+	    timer:apply_after(?DELAY, gen_server, reply, [From, ok]),
+	    {noreply, State};
+	[{_, Pid, _}] ->
+	    httpc_handler:cancel(RequestId, Pid, From),
 	    {noreply, State#state{cancel = 
-				  [{RequestId, Pid, From} | 
+				  [{RequestId, Pid, From} |
 				   State#state.cancel]}}
-
     end;
 
 handle_call(reset_cookies, _, #state{cookie_db = CookieDb} = State) ->
@@ -437,43 +427,16 @@ handle_call(Req, From, #state{profile_name = ProfileName} = State) ->
 %%--------------------------------------------------------------------
 handle_cast({retry_or_redirect_request, {Time, Request}}, 
 	    #state{profile_name = ProfileName} = State) ->
-    ?hcrv("retry or redirect request", [{time, Time}, {request, Request}]),
-    case timer:apply_after(Time, ?MODULE, retry_request, 
-			   [Request, ProfileName]) of
-	{ok, _} ->
-	    {noreply, State};
-	{error, Reason} ->
-	    error_report(ProfileName, 
-			 "failed scheduling retry/redirect request"
-			 "~n   Time:    ~p"
-			 "~n   Request: ~p"
-			 "~n   Reason:  ~p", [Time, Request, Reason]),
-	    {noreply, State}
-    end;
+    {ok, _} = timer:apply_after(Time, ?MODULE, retry_request, [Request, ProfileName]),
+    {noreply, State};
 
-handle_cast({retry_or_redirect_request, Request}, 
-	    #state{profile_name = Profile, 
-		   handler_db   = HandlerDb} = State) ->
-    ?hcrv("retry or redirect request", [{request, Request}]),
+handle_cast({retry_or_redirect_request, Request}, State) ->
     case (catch handle_request(Request, State)) of
-	{ok, _, NewState} ->
+	{reply, {ok, _}, NewState} ->
 	    {noreply, NewState};
-
 	Error  ->
-	    ReqId = Request#request.id, 
-	    error_report(Profile, 
-			 "failed to retry or redirect request ~p"
-			 "~n   Error: ~p", [ReqId, Error]),
-	    case ets:lookup(HandlerDb, ReqId) of
-		[#handler_info{from = From}] ->	
-		    Error2 = httpc_response:error(Request, Error), 
-		    httpc_response:send(From, Error2),
-		    ok;
-		
-		_ ->
-		    ok
-	    end,
-	    {noreply, State}
+	    httpc_response:error(Request, Error),
+	    {stop, Error, State}
     end;
 
 handle_cast({request_canceled, RequestId}, State) ->
@@ -482,7 +445,6 @@ handle_cast({request_canceled, RequestId}, State) ->
     case lists:keysearch(RequestId, 1, State#state.cancel) of
 	{value, Entry = {RequestId, _, From}} ->
 	    ?hcrt("found in cancel", [{from, From}]),
-	    gen_server:reply(From, ok),
 	    {noreply, 
 	     State#state{cancel = lists:delete(Entry, State#state.cancel)}};
 	Else ->
@@ -539,8 +501,6 @@ handle_cast(Msg, #state{profile_name = ProfileName} = State) ->
 		 "recived unknown message"
 		 "~n   Msg: ~p", [Msg]),
     {noreply, State}.
-
-
 	    
 %%--------------------------------------------------------------------
 %% Function: handle_info(Info, State) -> {noreply, State} |
@@ -548,39 +508,17 @@ handle_cast(Msg, #state{profile_name = ProfileName} = State) ->
 %%          {stop, Reason, State}            (terminate/2 is called)
 %% Description: Handling all non call/cast messages
 %%---------------------------------------------------------
-
-handle_info({started, StarterPid, ReqId, HandlerPid}, State) ->
-    handle_started(StarterPid, ReqId, HandlerPid, State),
-    {noreply, State};
-
-handle_info({connect_and_send, StarterPid, ReqId, HandlerPid, Res}, State) ->
-    handle_connect_and_send(StarterPid, ReqId, HandlerPid, Res, State),
-    {noreply, State};
-
-handle_info({failed_starting_handler, StarterPid, ReqId, Res}, State) ->
-    handle_failed_starting_handler(StarterPid, ReqId, Res, State),
-    {noreply, State};
-
-handle_info({'EXIT', Pid, Reason}, #state{handler_db = HandlerDb} = State) ->
-    maybe_handle_terminating_starter(Pid, Reason, HandlerDb), 
+handle_info({'EXIT', _, _}, State) ->
+    %% Handled in DOWN
     {noreply, State};
-
 handle_info({'DOWN', _, _, Pid, _}, State) ->
-    
-    %% 
-    %% Normally this should have been cleaned up already
-    %% (when receiving {request_done, PequestId}), but
-    %% just in case there is a glitch, cleanup anyway.
-    %% 
-
-    Pattern = #handler_info{handler = Pid, _ = '_'}, 
-    ets:match_delete(State#state.handler_db, Pattern),
+    ets:match_delete(State#state.handler_db, {'_', Pid, '_'}),
 
     %% If there where any canceled request, handled by the
     %% the process that now has terminated, the
     %% cancelation can be viewed as sucessfull!
-    NewCanceledList = 
-	lists:foldl(fun({_, HandlerPid, From} = Entry, Acc)  ->
+    NewCanceldList =
+	lists:foldl(fun(Entry = {_, HandlerPid, From}, Acc)  ->
 			    case HandlerPid of
 				Pid ->
 				    gen_server:reply(From, ok),
@@ -589,15 +527,13 @@ handle_info({'DOWN', _, _, Pid, _}, State) ->
 				    Acc
 			    end 
 		    end, State#state.cancel, State#state.cancel),
-    {noreply, State#state{cancel = NewCanceledList}};    
-
-handle_info(Info, #state{profile_name = ProfileName} = State) ->
-    error_report(ProfileName, 
-		 "received unknown info"
-		 "~n   Info: ~p", [Info]),
+    {noreply, State#state{cancel = NewCanceldList}};
+handle_info(Info, State) ->
+    Report = io_lib:format("Unknown message in "
+			   "httpc_manager:handle_info ~p~n", [Info]),
+    error_logger:error_report(Report),
     {noreply, State}. 
 
-
 %%--------------------------------------------------------------------
 %% Function: terminate(Reason, State) -> _  (ignored by gen_server)
 %% Description: Shutdown the httpc_handler
@@ -655,224 +591,79 @@ get_handler_info(Tab) ->
 		    {Pid, State} <- Handlers2],
     Handlers3.
 
-
-%% 
-%% The request handler process is started asynchronously by a 
-%% "starter process". When the handler has sucessfully been started,
-%% this message (started) is sent.
-%% 
-
-handle_started(StarterPid, ReqId, HandlerPid, 
-			#state{profile_name = Profile, 
-			       handler_db   = HandlerDb}) ->
-    case ets:lookup(HandlerDb, ReqId) of
-	[#handler_info{state = initiating} = HandlerInfo] ->
-	    ?hcri("received started ack for initiating handler", []),
-	    %% As a last resort, make sure we know when it exits,
-	    %% in case it forgets to notify us.
-	    %% We dont need to know the ref id?
-	    erlang:monitor(process, HandlerPid),
-	    HandlerInfo2 = HandlerInfo#handler_info{handler = HandlerPid,
-						    state   = started}, 
-	    ets:insert(HandlerDb, HandlerInfo2),
-	    ok;
-
-	[#handler_info{state = State}] ->
-	    error_report(Profile, 
-			 "unexpected (started) message for handler (~p) in state "
-			 "~p regarding request ~p - ignoring", [HandlerPid, State, ReqId]),
-	    ?hcri("received unexpected started message", [{state, State}]),
-	    ok;
-
-	[] ->
-	    error_report(Profile, 
-			 "unknown handler ~p (~p) started for request ~w - canceling",
-			 [HandlerPid, StarterPid, ReqId]),
-	    httpc_handler:cancel(ReqId, HandlerPid)
-    end.
-
-
-%% 
-%% The request handler process is started asynchronously by a 
-%% "starter process". When that process terminates it sends 
-%% one of two messages. These ara handled by the two functions
-%% below.
-%% 
-
-handle_connect_and_send(_StarterPid, ReqId, HandlerPid, Result, 
-			#state{profile_name = Profile, 
-			       handler_db   = HandlerDb}) ->
-    case ets:lookup(HandlerDb, ReqId) of
-	[#handler_info{state = started} = HandlerInfo] when Result =:= ok ->
-	    ?hcri("received connect-and-send ack for started handler", []),
-	    HandlerInfo2 = HandlerInfo#handler_info{starter = undefined, 
-						    handler = HandlerPid,
-						    state   = operational}, 
-	    ets:insert(HandlerDb, HandlerInfo2),
-	    ok;
-
-	[#handler_info{state = canceled} = HandlerInfo] when Result =:= ok ->
-	    ?hcri("received connect-and-send ack for canceled handler", []),
-	    httpc_handler:cancel(ReqId, HandlerPid),
-	    HandlerInfo2 = HandlerInfo#handler_info{starter = undefined, 
-						    handler = HandlerPid}, 
-	    ets:insert(HandlerDb, HandlerInfo2),
-	    ok;
-
-	[#handler_info{state = State}] when Result =/= ok ->
-	    error_report(Profile, 
-			 "handler (~p, ~w) failed to connect and/or "
-			 "send request ~p"
-			 "~n   Result: ~p", 
-			 [HandlerPid, State, ReqId, Result]),
-	    ?hcri("received connect-and-send error", 
-		  [{result, Result}, {state, State}]),
-	    %% We don't need to send a response to the original caller
-	    %% because the handler already sent one in its terminate
-	    %% function.
-	    ets:delete(HandlerDb, ReqId), 
-	    ok;
-
-	[] ->
-	    ?hcri("handler successfully started "
-		  "for unknown request => canceling",
-		  [{profile, Profile}, 
-		   {handler, HandlerPid}, 
-		   {request, ReqId}]),
-	    httpc_handler:cancel(ReqId, HandlerPid)
-    end.
-
-
-handle_failed_starting_handler(_StarterPid, ReqId, Error, 
-			       #state{profile_name = Profile, 
-				      handler_db = HandlerDb}) ->
-    case ets:lookup(HandlerDb, ReqId) of
-	[#handler_info{state = canceled}] ->
-	    error_report(Profile, 
-			 "failed starting handler for request ~p"
-			 "~n   Error: ~p", [ReqId, Error]),
-	    request_canceled(Profile, ReqId), % Fake signal from handler
-	    ets:delete(HandlerDb, ReqId), 
-	    ok;
-
-	[#handler_info{from = From}] ->
-	    error_report(Profile, 
-			 "failed starting handler for request ~p"
-			 "~n   Error: ~p", [ReqId, Error]),
-	    Reason2 = 
-		case Error of
-		    {error, Reason} ->
-			{failed_connecting, Reason};
-		    _ ->
-			{failed_connecting, Error}
-		end,
-	    DummyReq = #request{id = ReqId}, 
-	    httpc_response:send(From, httpc_response:error(DummyReq, Reason2)),
-	    ets:delete(HandlerDb, ReqId), 
-	    ok;
-
-	[] ->
-	    error_report(Profile, 
-			 "failed starting handler for unknown request ~p"
-			 "~n   Error: ~p", [ReqId, Error]),
-	    ok
-    end.
-
-
-maybe_handle_terminating_starter(MeybeStarterPid, Reason, HandlerDb) ->
-    Pattern = #handler_info{starter = MeybeStarterPid, _ = '_'}, 
-    case ets:match_object(HandlerDb, Pattern) of
-	[#handler_info{id = ReqId, from = From, state = initiating}] ->
-	    %% The starter process crashed before it could start the 
-	    %% the handler process, therefor we need to answer the 
-	    %% original caller.
-	    ?hcri("starter process crashed bfore starting handler", 
-		  [{starter, MeybeStarterPid}, {reason, Reason}]),
-	    Reason2 = 
-		case Reason of
-		    {error, Error} ->
-			{failed_connecting, Error};
-		    _ ->
-			{failed_connecting, Reason}
-		end,
-	    DummyReq = #request{id = ReqId}, 
-	    httpc_response:send(From, httpc_response:error(DummyReq, Reason2)),
-	    ets:delete(HandlerDb, ReqId),
-	    ok;
-
-	[#handler_info{state = State} = HandlerInfo] ->
-	    %% The starter process crashed after the handler was started. 
-	    %% The handler will answer to the original caller.
-	    ?hcri("starter process crashed after starting handler", 
-		  [{starter, MeybeStarterPid}, {reason, Reason}, {state, State}]),
-	    HandlerInfo2 = HandlerInfo#handler_info{starter = undefined}, 
-	    ets:insert(HandlerDb, HandlerInfo2),
-	    ok;
-
-	_ ->
-	    ok
-    end.
-
-
-%% -----
-%% Act as an HTTP/0.9 client that does not know anything
-%% about persistent connections
 handle_request(#request{settings = 
-			#http_options{version = "HTTP/0.9"}} = Request0, 
+			#http_options{version = "HTTP/0.9"}} = Request,
 	       State) ->
-    Request1 = handle_cookies(generate_request_id(Request0), State),
-    Hdrs0    = Request1#request.headers, 
-    Hdrs1    = Hdrs0#http_request_h{connection = undefined},
-    Request2 = Request1#request{headers = Hdrs1}, 
-    create_handler_starter(Request2, State),
-    {ok, Request2#request.id, State};
-
-%% -----
-%% Act as an HTTP/1.0 client that does not 
-%% use persistent connections
+    %% Act as an HTTP/0.9 client that does not know anything
+    %% about persistent connections
+
+    NewRequest = handle_cookies(generate_request_id(Request), State),
+    NewHeaders =
+	(NewRequest#request.headers)#http_request_h{connection
+						    = undefined},
+    start_handler(NewRequest#request{headers = NewHeaders}, State),
+    {reply, {ok, NewRequest#request.id}, State};
+
 handle_request(#request{settings = 
-			#http_options{version = "HTTP/1.0"}} = Request0, 
+			#http_options{version = "HTTP/1.0"}} = Request,
 	       State) ->
-    Request1 = handle_cookies(generate_request_id(Request0), State),
-    Hdrs0    = Request1#request.headers, 
-    Hdrs1    = Hdrs0#http_request_h{connection = "close"},
-    Request2 = Request1#request{headers = Hdrs1}, 
-    create_handler_starter(Request2, State),
-    {ok, Request2#request.id, State};
-
-
-%% -----
-handle_request(#request{method  = Method,
-			address = Address,
-			scheme  = Scheme} = Request0, 
-	       #state{options = Opts} = State) ->
-    Request1    = handle_cookies(generate_request_id(Request0), State),
-    SessionType = session_type(Opts),
-    case select_session(Method, Address, Scheme, SessionType, State) of
+    %% Act as an HTTP/1.0 client that does not
+    %% use persistent connections
+
+    NewRequest = handle_cookies(generate_request_id(Request), State),
+    NewHeaders =
+	(NewRequest#request.headers)#http_request_h{connection
+						    = "close"},
+    start_handler(NewRequest#request{headers = NewHeaders}, State),
+    {reply, {ok, NewRequest#request.id}, State};
+
+handle_request(Request, State = #state{options = Options}) ->
+
+    NewRequest = handle_cookies(generate_request_id(Request), State),
+    SessionType = session_type(Options),
+    case select_session(Request#request.method,
+			Request#request.address,
+			Request#request.scheme, SessionType, State) of
 	{ok, HandlerPid} ->
-	    pipeline_or_keep_alive(Request1, HandlerPid, State);
+	    pipeline_or_keep_alive(NewRequest, HandlerPid, State);
 	no_connection ->
-	    create_handler_starter(Request1, State);
-	{no_session, OpenSessions} 
-	when OpenSessions < Opts#options.max_sessions ->
-	    create_handler_starter(Request1, State);
+	    start_handler(NewRequest, State);
+	{no_session,  OpenSessions} when OpenSessions
+	< Options#options.max_sessions ->
+	    start_handler(NewRequest, State);
 	{no_session, _} ->
 	    %% Do not start any more persistent connections
 	    %% towards this server.
-	    Hdrs0    = Request1#request.headers, 
-	    Hdrs1    = Hdrs0#http_request_h{connection = "close"},
-	    Request2 = Request1#request{headers = Hdrs1}, 
-	    create_handler_starter(Request2, State)
+	    NewHeaders =
+		(NewRequest#request.headers)#http_request_h{connection
+							    = "close"},
+	    start_handler(NewRequest#request{headers = NewHeaders}, State)
     end,
-    {ok, Request1#request.id, State}.
+    {reply, {ok, NewRequest#request.id}, State}.
+
+
+start_handler(Request, State) ->
+    {ok, Pid} =
+	case is_inets_manager() of
+	    true ->
+		httpc_handler_sup:start_child([whereis(httpc_handler_sup),
+					       Request, State#state.options,
+					       State#state.profile_name]);
+	    false ->
+		httpc_handler:start_link(self(), Request, State#state.options,
+					 State#state.profile_name)
+	end,
+    ets:insert(State#state.handler_db, {Request#request.id,
+					Pid, Request#request.from}),
+    erlang:monitor(process, Pid).
 
 
 select_session(Method, HostPort, Scheme, SessionType, 
 	       #state{options = #options{max_pipeline_length   = MaxPipe,
 					 max_keep_alive_length = MaxKeepAlive},
 		      session_db = SessionDb}) ->
-    ?hcrd("select session", [{session_type,          SessionType}, 
-			     {max_pipeline_length,   MaxPipe}, 
+    ?hcrd("select session", [{session_type,          SessionType},
+			     {max_pipeline_length,   MaxPipe},
 			     {max_keep_alive_length, MaxKeepAlive}]),
     case httpc_request:is_idempotent(Method) orelse 
 	(SessionType =:= keep_alive) of
@@ -918,92 +709,17 @@ select_session(Candidates, Max) ->
 	    ?hcrd("select session - found one", [{handler, HandlerPid}]),
 	    {ok, HandlerPid}
     end.
-	    
-pipeline_or_keep_alive(#request{id = Id} = Request, HandlerPid, State) ->
-    ?hcrd("pipeline of keep-alive", [{id, Id}, {handler, HandlerPid}]),
+
+pipeline_or_keep_alive(Request, HandlerPid, State) ->
     case (catch httpc_handler:send(Request, HandlerPid)) of
 	ok ->
-	    ?hcrd("pipeline or keep-alive - successfully sent", []),
-	    Entry = #handler_info{id      = Id,
-				  handler = HandlerPid,
-				  state   = operational},
-	    ets:insert(State#state.handler_db, Entry); 
-		
-	_  -> %% timeout pipelining failed 
-	    ?hcrd("pipeline or keep-alive - failed sending -> "
-		  "start a new handler", []),
-	    create_handler_starter(Request, State)
+	    ets:insert(State#state.handler_db, {Request#request.id,
+						HandlerPid,
+						Request#request.from});
+	_  -> %timeout pipelining failed
+	    start_handler(Request, State)
     end.
 
-
-create_handler_starter(#request{socket_opts = SocketOpts} = Request, 
-		       #state{options = Options} = State) 
-  when is_list(SocketOpts) ->
-    %% The user provided us with (override) socket options
-    ?hcrt("create handler starter", [{socket_opts, SocketOpts}, {options, Options}]),
-    Options2 = Options#options{socket_opts = SocketOpts}, 
-    create_handler_starter(Request#request{socket_opts = undefined}, 
-			   State#state{options = Options2});
-
-create_handler_starter(#request{id          = Id, 
-				from        = From} = Request, 
-		       #state{profile_name = ProfileName,
-			      options      = Options,
-			      handler_db   = HandlerDb} = _State) ->
-    ?hcrv("create handler starter", [{id, Id}, {profile, ProfileName}]),
-    IsInetsManager = is_inets_manager(), 
-    ManagerPid = self(), 
-    StarterFun = 
-	fun() ->
-		?hcrd("handler starter - start", 
-		      [{id,            Id}, 
-		       {profile,       ProfileName}, 
-		       {inets_manager, IsInetsManager}]),
-		Result1 = 
-		    case IsInetsManager of
-			true ->
-			    httpc_handler_sup:start_child(Options, 
-							  ProfileName);
-			false ->
-			    httpc_handler:start_link(Options, 
-						     ProfileName)
-		    end,
-		?hcrd("handler starter - maybe connect and send", 
-		      [{id, Id}, {profile, ProfileName}, {result, Result1}]),
-		case Result1 of
-		    {ok, HandlerPid} ->
-			StartedMessage = 
-			    {started, self(), Id, HandlerPid}, 
-			ManagerPid ! StartedMessage, 
-			Result2 = httpc_handler:connect_and_send(Request, 
-								 HandlerPid),
-			?hcrd("handler starter - connected and sent", 
-			      [{id, Id}, {profile, ProfileName}, 
-			       {handler, HandlerPid}, {result, Result2}]),
-			ConnAndSendMessage = 
-			    {connect_and_send, 
-			     self(), Id, HandlerPid, Result2}, 
-			ManagerPid ! ConnAndSendMessage;
-		     {error, Reason} ->
-			StartFailureMessage = 
-			    {failed_starting_handler, self(), Id, Reason}, 
-			ManagerPid ! StartFailureMessage;
-		     _ ->
-			StartFailureMessage = 
-			    {failed_starting_handler, self(), Id, Result1}, 
-			ManagerPid ! StartFailureMessage
-		end
-	end,
-    Starter = erlang:spawn_link(StarterFun),
-    ?hcrd("create handler starter - started", [{id, Id}, {starter, Starter}]),
-    Entry = #handler_info{id      = Id,
-			  starter = Starter, 
-			  from    = From, 
-			  state   = initiating},
-    ets:insert(HandlerDb, Entry),
-    ok.
-		
-	
 is_inets_manager() ->
     case get('$ancestors') of
 	[httpc_profile_sup | _] ->
@@ -1045,8 +761,6 @@ do_store_cookies([Cookie | Cookies], #state{cookie_db = CookieDb} = State) ->
     ok = httpc_cookie:insert(CookieDb, Cookie),
     do_store_cookies(Cookies, State).
 
-
-
 session_db_name(ProfileName) ->
     make_db_name(ProfileName, "__session_db").
 
@@ -1074,7 +788,6 @@ cast(ProfileName, Msg) ->
    gen_server:cast(ProfileName, Msg).
 
 
-
 get_proxy(Opts, #options{proxy = Default}) ->
     proplists:get_value(proxy, Opts, Default).
 
@@ -1133,20 +846,6 @@ handle_verbose(trace) ->
 handle_verbose(_) ->
     ok.  
 
-
 error_report(Profile, F, A) ->
     Report = io_lib:format("HTTPC-MANAGER<~p> " ++ F ++ "~n", [Profile | A]), 
     error_logger:error_report(Report).
-
-
-%% d(F) ->
-%%    d(F, []).
-
-%% d(F, A) -> 
-%%     d(get(dbg), F, A).
-
-%% d(true, F, A) ->
-%%     io:format(user, "~w:~w:" ++ F ++ "~n", [self(), ?MODULE | A]);
-%% d(_, _, _) ->
-%%     ok.
-
diff --git a/lib/inets/src/http_client/httpc_request.erl b/lib/inets/src/http_client/httpc_request.erl
index d4df97ad40..879053f0f2 100644
--- a/lib/inets/src/http_client/httpc_request.erl
+++ b/lib/inets/src/http_client/httpc_request.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -79,36 +79,62 @@ send(SendAddr, Socket, SocketType,
 	   {settings,      HttpOptions}, 
 	   {userinfo,      UserInfo}]),
 
-    TmpHeaders = handle_user_info(UserInfo, Headers),
+    TmpHdrs = handle_user_info(UserInfo, Headers),
 
-    {TmpHeaders2, Body} = 
-	post_data(Method, TmpHeaders, Content, HeadersAsIs),
+    {TmpHdrs2, Body} = post_data(Method, TmpHdrs, Content, HeadersAsIs),
     
-    {NewHeaders, Uri} = case Address of
-			    SendAddr ->
-				{TmpHeaders2, Path ++ Query};
-			    _Proxy ->
-				TmpHeaders3 =
-				    handle_proxy(HttpOptions, TmpHeaders2),
-				{TmpHeaders3, AbsUri}
-			end,
-
-    FinalHeaders = case NewHeaders of
-		       HeaderList when is_list(HeaderList) ->
-			   http_headers(HeaderList, []);
-		       _  ->
-			   http_request:http_headers(NewHeaders)
-		   end,
+    {NewHeaders, Uri} = 
+	case Address of
+	    SendAddr ->
+		{TmpHdrs2, Path ++ Query};
+	    _Proxy ->
+		TmpHdrs3 = handle_proxy(HttpOptions, TmpHdrs2), 
+		{TmpHdrs3, AbsUri}
+	end,
+    
+    FinalHeaders = 
+	case NewHeaders of
+	    HeaderList when is_list(HeaderList) ->
+		http_headers(HeaderList, []);
+	    _  ->
+		http_request:http_headers(NewHeaders)
+	end,
     Version = HttpOptions#http_options.version,
 
-    Message = [method(Method), " ", Uri, " ", 
-	       version(Version), ?CRLF, 
-	       headers(FinalHeaders, Version), ?CRLF, Body],
+    do_send_body(SocketType, Socket, Method, Uri, Version, FinalHeaders, Body).
+
+
+do_send_body(SocketType, Socket, Method, Uri, Version, Headers, 
+	     {ProcessBody, Acc}) when is_function(ProcessBody, 1) ->
+    ?hcrt("send", [{acc, Acc}]),
+    case do_send_body(SocketType, Socket, Method, Uri, Version, Headers, []) of
+        ok ->
+            do_send_body(SocketType, Socket, ProcessBody, Acc);
+        Error ->
+            Error
+    end;
 
+do_send_body(SocketType, Socket, Method, Uri, Version, Headers, Body) ->
+    ?hcrt("create message", [{body, Body}]),
+    Message = [method(Method), " ", Uri, " ",
+	       version(Version), ?CRLF,
+	       headers(Headers, Version), ?CRLF, Body],
     ?hcrd("send", [{message, Message}]),
-    
-    http_transport:send(SocketType, Socket, lists:append(Message)).
+    http_transport:send(SocketType, Socket, Message).
+
 
+do_send_body(SocketType, Socket, ProcessBody, Acc) ->
+    case ProcessBody(Acc) of
+        eof ->
+            ok;
+        {ok, Data, NewAcc} ->
+            case http_transport:send(SocketType, Socket, Data) of
+                ok ->
+                    do_send_body(SocketType, Socket, ProcessBody, NewAcc);
+                Error ->
+                    Error
+            end
+    end.
 
 
 %%-------------------------------------------------------------------------
@@ -161,7 +187,6 @@ is_client_closing(Headers) ->
 %%%========================================================================
 post_data(Method, Headers, {ContentType, Body}, HeadersAsIs) 
   when (Method =:= post) orelse (Method =:= put) ->
-    ContentLength = body_length(Body),	      
     NewBody = case Headers#http_request_h.expect of
 		  "100-continue" ->
 		      "";
@@ -170,14 +195,22 @@ post_data(Method, Headers, {ContentType, Body}, HeadersAsIs)
 	      end,
     
     NewHeaders = case HeadersAsIs of
-		     [] ->
-			 Headers#http_request_h{'content-type' = 
-						ContentType, 
-						'content-length' = 
-						ContentLength};
-		     _ ->
-			 HeadersAsIs
-		 end,
+        [] ->
+            Headers#http_request_h{
+                'content-type' = ContentType,
+                'content-length' = case body_length(Body) of
+                    undefined ->
+                        % on upload streaming the caller must give a
+                        % value to the Content-Length header
+                        % (or use chunked Transfer-Encoding)
+                        Headers#http_request_h.'content-length';
+                    Len when is_list(Len) ->
+                        Len
+                    end
+            };
+        _ ->
+            HeadersAsIs
+    end,
     
     {NewHeaders, NewBody};
 
@@ -190,7 +223,10 @@ body_length(Body) when is_binary(Body) ->
    integer_to_list(size(Body));
 
 body_length(Body) when is_list(Body) ->
-  integer_to_list(length(Body)).
+  integer_to_list(length(Body));
+
+body_length({DataFun, _Acc}) when is_function(DataFun, 1) ->
+  undefined.
 
 method(Method) ->
     http_util:to_upper(atom_to_list(Method)).
diff --git a/lib/inets/src/http_lib/http_internal.hrl b/lib/inets/src/http_lib/http_internal.hrl
index 5440f214b5..2e924667c6 100644
--- a/lib/inets/src/http_lib/http_internal.hrl
+++ b/lib/inets/src/http_lib/http_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. 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
@@ -28,8 +28,8 @@
 -define(HTTP_MAX_URI_SIZE,    nolimit).
 
 -ifndef(HTTP_DEFAULT_SSL_KIND).
--define(HTTP_DEFAULT_SSL_KIND, ossl).
-%% -define(HTTP_DEFAULT_SSL_KIND, essl).
+%% -define(HTTP_DEFAULT_SSL_KIND, ossl).
+-define(HTTP_DEFAULT_SSL_KIND, essl).
 -endif. % -ifdef(HTTP_DEFAULT_SSL_KIND).
 
 
diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl
index 0024d19fc1..8cabfe3c71 100644
--- a/lib/inets/src/http_lib/http_transport.erl
+++ b/lib/inets/src/http_lib/http_transport.erl
@@ -23,7 +23,7 @@
 -export([
 	 start/1, 
 	 connect/3, connect/4, 
-	 listen/2, listen/3, 
+	 listen/2, listen/3, listen/4, 
 	 accept/2, accept/3, 
 	 close/2,
 	 send/3, 
@@ -110,7 +110,17 @@ connect(ip_comm = _SocketType, {Host, Port}, Opts0, Timeout)
     Opts = [binary, {packet, 0}, {active, false}, {reuseaddr, true} | Opts0],
     ?hlrt("connect using gen_tcp", 
 	  [{host, Host}, {port, Port}, {opts, Opts}, {timeout, Timeout}]),
-    gen_tcp:connect(Host, Port, Opts, Timeout);
+    try gen_tcp:connect(Host, Port, Opts, Timeout) of
+	{ok, _} = OK ->
+	    OK;
+	{error, _} = ERROR ->
+	    ERROR
+    catch 
+	exit:{badarg, _} ->
+	    {error, {eoptions, Opts}};
+	exit:badarg ->
+	    {error, {eoptions, Opts}}
+    end;
 
 %% Wrapper for backaward compatibillity
 connect({ssl, SslConfig}, Address, Opts, Timeout) ->
@@ -123,7 +133,14 @@ connect({ossl, SslConfig}, {Host, Port}, _, Timeout) ->
 	   {port,       Port}, 
 	   {ssl_config, SslConfig}, 
 	   {timeout,    Timeout}]),
-    ssl:connect(Host, Port, Opts, Timeout);
+    case (catch ssl:connect(Host, Port, Opts, Timeout)) of
+	{'EXIT', Reason} ->
+	    {error, {eoptions, Reason}};
+	{ok, _} = OK ->
+	    OK;
+	{error, _} = ERROR ->
+	    ERROR
+    end;
 
 connect({essl, SslConfig}, {Host, Port}, _, Timeout) ->
     Opts = [binary, {active, false}, {ssl_imp, new}] ++ SslConfig,
@@ -132,14 +149,22 @@ connect({essl, SslConfig}, {Host, Port}, _, Timeout) ->
 	   {port,       Port}, 
 	   {ssl_config, SslConfig}, 
 	   {timeout,    Timeout}]),
-    ssl:connect(Host, Port, Opts, Timeout).
+    case (catch ssl:connect(Host, Port, Opts, Timeout)) of
+	{'EXIT', Reason} ->
+	    {error, {eoptions, Reason}};
+	{ok, _} = OK ->
+	    OK;
+	{error, _} = ERROR ->
+	    ERROR
+    end.
 
 
 %%-------------------------------------------------------------------------
-%% listen(SocketType, Port) -> {ok, Socket} | {error, Reason}
+%% listen(SocketType, Addr, Port, Fd) -> {ok, Socket} | {error, Reason}
 %%      SocketType = ip_comm | {ssl, SSLConfig}  
 %%      Port = integer() 
-%%      Socket = socket()                            
+%%      Socket = socket()
+%%      Fd = undefined | fd()
 %%
 %% Description: Sets up socket to listen on the port Port on the local
 %% host using either gen_tcp or ssl. In the gen_tcp case the port
@@ -151,13 +176,8 @@ connect({essl, SslConfig}, {Host, Port}, _, Timeout) ->
 listen(SocketType, Port) ->
     listen(SocketType, undefined, Port).
 
-listen(ip_comm, Addr, Port) ->
-    case (catch listen_ip_comm(Addr, Port)) of
-	{'EXIT', Reason} ->
-	    {error, {exit, Reason}};
-	Else ->
-	    Else
-    end;
+listen(ip_comm = SocketType, Addr, Port) ->
+    listen(SocketType, Addr, Port, undefined);
 
 %% Wrapper for backaward compatibillity
 listen({ssl, SSLConfig}, Addr, Port) ->
@@ -186,9 +206,17 @@ listen({essl, SSLConfig} = Ssl, Addr, Port) ->
     Opt2 = [{ssl_imp, new}, {reuseaddr, true} | Opt], 
     ssl:listen(Port, Opt2).
 
+listen(ip_comm, Addr, Port, Fd) ->
+    case (catch listen_ip_comm(Addr, Port, Fd)) of
+	{'EXIT', Reason} ->
+	    {error, {exit, Reason}};
+	Else ->
+	    Else
+    end.
+
 
-listen_ip_comm(Addr, Port) ->
-    {NewPort, Opts, IpFamily} = get_socket_info(Addr, Port),
+listen_ip_comm(Addr, Port, Fd) ->
+    {NewPort, Opts, IpFamily} = get_socket_info(Addr, Port, Fd),
     case IpFamily of
 	inet6fb4 -> 
 	    Opts2 = [inet6 | Opts], 
@@ -223,29 +251,36 @@ listen_ip_comm(Addr, Port) ->
 ipfamily_default(Addr, Port) ->
     httpd_conf:lookup(Addr, Port, ipfamily, inet6fb4).
 
-get_socket_info(Addr, Port) ->
-    Key  = list_to_atom("httpd_" ++ integer_to_list(Port)),
-    BaseOpts =  [{backlog, 128}, {reuseaddr, true}], 
+get_socket_info(Addr, Port, Fd0) ->
+    BaseOpts        = [{backlog, 128}, {reuseaddr, true}], 
     IpFamilyDefault = ipfamily_default(Addr, Port), 
-    case init:get_argument(Key) of
-	{ok, [[Value]]} ->
-	    {Fd, IpFamily} = 
-		case string:tokens(Value, [$|]) of
-		    [FdStr, IpFamilyStr] ->
-			Fd0       = fd_of(FdStr),
-			IpFamily0 = ip_family_of(IpFamilyStr),
-			{Fd0, IpFamily0};
-		    [FdStr] ->
-			{fd_of(FdStr), IpFamilyDefault};
-		    _ ->
-			throw({error, {bad_descriptor, Value}})
-		end,
+    %% The presence of a file descriptor takes precedence
+    case get_fd(Port, Fd0, IpFamilyDefault) of
+	{Fd, IpFamily} -> 
 	    {0, sock_opt(ip_comm, Addr, [{fd, Fd} | BaseOpts]), IpFamily};
-	error ->
+	undefined ->
 	    {Port, sock_opt(ip_comm, Addr, BaseOpts), IpFamilyDefault}
     end.
 	    
+get_fd(Port, undefined = _Fd, IpFamilyDefault) ->
+    FdKey = list_to_atom("httpd_" ++ integer_to_list(Port)),
+    case init:get_argument(FdKey) of
+	{ok, [[Value]]} ->
+	    case string:tokens(Value, [$|]) of
+		[FdStr, IpFamilyStr] ->
+		    {fd_of(FdStr), ip_family_of(IpFamilyStr)};
+		[FdStr] ->
+		    {fd_of(FdStr), IpFamilyDefault};
+		_ ->
+		    throw({error, {bad_descriptor, Value}})
+	    end;
+	error ->
+	    undefined
+    end;
+get_fd(_Port, Fd, IpFamilyDefault) ->
+    {Fd, IpFamilyDefault}.
 
+    
 fd_of(FdStr) ->
     case (catch list_to_integer(FdStr)) of
 	Fd when is_integer(Fd) ->
diff --git a/lib/inets/src/http_lib/http_util.erl b/lib/inets/src/http_lib/http_util.erl
index 4f1147176c..5e6b69ac5e 100644
--- a/lib/inets/src/http_lib/http_util.erl
+++ b/lib/inets/src/http_lib/http_util.erl
@@ -25,7 +25,8 @@
 	 hexlist_to_integer/1, integer_to_hexlist/1, 
 	 convert_month/1, 
 	 is_hostname/1,
-	 timestamp/0, timeout/2
+	 timestamp/0, timeout/2,
+	 html_encode/1
 	]).
 
 
@@ -187,6 +188,13 @@ timeout(Timeout, Started) ->
     end.
     
 
+html_encode(Chars) ->
+    Reserved = sets:from_list([$&, $<, $>, $\", $', $/]),
+    lists:append(lists:map(fun(Char) ->
+	               char_to_html_entity(Char, Reserved)
+	           end, Chars)).
+
+
 %%%========================================================================
 %%% Internal functions
 %%%========================================================================
@@ -235,3 +243,11 @@ convert_to_ascii([Num | Reversed], Number)
 convert_to_ascii([Num | Reversed], Number) 
   when (Num > 9) andalso (Num < 16) ->
     convert_to_ascii(Reversed, [Num + 55 | Number]).
+
+char_to_html_entity(Char, Reserved) ->
+    case sets:is_element(Char, Reserved) of
+	true ->
+	    "&#" ++ integer_to_list(Char) ++ ";";
+	false ->
+	    [Char]
+    end.
diff --git a/lib/inets/src/http_server/httpd_file.erl b/lib/inets/src/http_server/httpd_file.erl
index 7e21d9e158..ccc1f7874a 100644
--- a/lib/inets/src/http_server/httpd_file.erl
+++ b/lib/inets/src/http_server/httpd_file.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. 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
@@ -26,22 +26,21 @@
 
 
 handle_error(eacces, Op, ModData, Path) ->
-    handle_error(403, Op, ModData, Path,"Forbidden");
+    handle_error(403, Op, ModData, Path, ": Forbidden");
 handle_error(enoent, Op, ModData, Path) ->
-    handle_error(404, Op, ModData, Path,"File not found");
+    handle_error(404, Op, ModData, Path, ": File not found");
 handle_error(enotdir, Op, ModData, Path) ->
     handle_error(404, Op, ModData, Path,
-	       ": A component of the file name is not a directory");
+	         ": A component of the file name is not a directory");
 handle_error(emfile, Op, _ModData, Path) ->
     handle_error(500, Op, none, Path, ": To many open files");
 handle_error({enfile,_}, Op, _ModData, Path) ->
     handle_error(500, Op, none, Path, ": File table overflow");
 handle_error(_Reason, Op, ModData, Path) ->
-    handle_error(404, Op, ModData, Path, "File not found").
-	    
-handle_error(StatusCode, Op, none, Path, Reason) ->
-    {StatusCode, none, ?NICE("Can't " ++ Op ++ Path ++ Reason)};
+    handle_error(404, Op, ModData, Path, ": File not found").
 
+handle_error(StatusCode, Op, none, Path, Reason) ->
+    {StatusCode, none, ?NICE("Can't " ++ Op ++ " " ++ Path ++ Reason)};
 handle_error(StatusCode, Op, ModData, Path, Reason) ->
     {StatusCode, ModData#mod.request_uri,
-     ?NICE("Can't " ++ Op ++ Path ++ Reason)}.
+     ?NICE("Can't " ++ Op ++ " " ++ Path ++ Reason)}.
diff --git a/lib/inets/src/http_server/httpd_log.erl b/lib/inets/src/http_server/httpd_log.erl
index f3ea3aa0e2..db1e2c627a 100644
--- a/lib/inets/src/http_server/httpd_log.erl
+++ b/lib/inets/src/http_server/httpd_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -113,7 +113,7 @@ do_error_entry(ConfigDB, RemoteHost, undefined, Date, Reason) ->
 do_error_entry(ConfigDB, RemoteHost, URI, Date, Reason) ->
     case httpd_util:lookup(ConfigDB, error_log_format, pretty) of
 	pretty ->
-	   io_lib:format("[~s] access to ~s failed for ~s reason: ~n~p~n",
+	   io_lib:format("[~s] access to ~s failed for ~s, reason: ~n~p~n",
 			 [Date, URI, RemoteHost, Reason]);
 	compact ->
 	   io_lib:format( "[~s] access to ~s failed for ~s, reason: ~w~n", 
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl
index a9db6e2058..c3b47ce390 100644
--- a/lib/inets/src/http_server/httpd_request_handler.erl
+++ b/lib/inets/src/http_server/httpd_request_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -240,13 +240,13 @@ handle_info({ssl_error, _, _} = Reason, State) ->
 
 %% Timeouts
 handle_info(timeout, #state{mod = ModData, mfa = {_, parse, _}} = State) ->
-    error_log("No request received on keep-alive connection" 
+    error_log("No request received on keep-alive connection "
 	      "before server side timeout", ModData),
     %% No response should be sent!
     {stop, normal, State#state{response_sent = true}}; 
 handle_info(timeout, #state{mod = ModData} = State) ->
     httpd_response:send_status(ModData, 408, "Request timeout"),
-    error_log("The client did not send the whole request before the"
+    error_log("The client did not send the whole request before the "
 	      "server side timeout", ModData),
     {stop, normal, State#state{response_sent = true}};
 
diff --git a/lib/inets/src/http_server/httpd_sup.erl b/lib/inets/src/http_server/httpd_sup.erl
index f94e5459c1..d028a19bf0 100644
--- a/lib/inets/src/http_server/httpd_sup.erl
+++ b/lib/inets/src/http_server/httpd_sup.erl
@@ -90,7 +90,7 @@ id(Address, Port) ->
 %%%  Supervisor callback
 %%%=========================================================================
 init([HttpdServices]) ->
-    ?hdrd("starting", []),
+    ?hdrd("starting", [{httpd_service, HttpdServices}]),
     RestartStrategy = one_for_one,
     MaxR = 10,
     MaxT = 3600,
@@ -182,24 +182,32 @@ httpd_child_spec(ConfigFile, AcceptTimeout, Debug) ->
 	    Error
     end.
 
-httpd_child_spec(Config, AcceptTimeout, Debug, Addr, 0) ->
-	case start_listen(Addr, 0, Config) of
-	    {Pid, {NewPort, NewConfig, ListenSocket}} ->
-		Name      = {httpd_instance_sup, Addr, NewPort},
-		StartFunc = {httpd_instance_sup, start_link,
-			     [NewConfig, AcceptTimeout, 
-			      {Pid, ListenSocket}, Debug]},
-		Restart   = permanent, 
-		Shutdown  = infinity,
-		Modules   = [httpd_instance_sup],
-		Type      = supervisor,
-		{Name, StartFunc, Restart, Shutdown, Type, Modules};
-	    {Pid, {error, Reason}}  ->
-		exit(Pid, normal),
-		{error, Reason}
-	end;
-		    
 httpd_child_spec(Config, AcceptTimeout, Debug, Addr, Port) ->
+    case Port == 0 orelse proplists:is_defined(fd, Config) of
+	true ->
+	    httpd_child_spec_listen(Config, AcceptTimeout, Debug, Addr, Port);
+	false ->
+	    httpd_child_spec_nolisten(Config, AcceptTimeout, Debug, Addr, Port)
+    end.
+
+httpd_child_spec_listen(Config, AcceptTimeout, Debug, Addr, Port) ->
+    case start_listen(Addr, Port, Config) of
+	{Pid, {NewPort, NewConfig, ListenSocket}} ->
+	    Name      = {httpd_instance_sup, Addr, NewPort},
+	    StartFunc = {httpd_instance_sup, start_link,
+			 [NewConfig, AcceptTimeout, 
+			  {Pid, ListenSocket}, Debug]},
+	    Restart   = permanent, 
+	    Shutdown  = infinity,
+	    Modules   = [httpd_instance_sup],
+	    Type      = supervisor,
+	    {Name, StartFunc, Restart, Shutdown, Type, Modules};
+	{Pid, {error, Reason}}  ->
+	    exit(Pid, normal),
+	    {error, Reason}
+    end.
+		    
+httpd_child_spec_nolisten(Config, AcceptTimeout, Debug, Addr, Port) ->
     Name = {httpd_instance_sup, Addr, Port},
     StartFunc = {httpd_instance_sup, start_link,
 		 [Config, AcceptTimeout, Debug]},
@@ -224,7 +232,8 @@ listen(Address, Port, Config)  ->
     SocketType = proplists:get_value(socket_type, Config, ip_comm), 
     case http_transport:start(SocketType) of
 	ok ->
-	    case http_transport:listen(SocketType, Address, Port) of
+	    Fd = proplists:get_value(fd, Config), 
+	    case http_transport:listen(SocketType, Address, Port, Fd) of
 		{ok, ListenSocket} ->
 		    NewConfig = proplists:delete(port, Config),
 		    {ok, NewPort} = inet:port(ListenSocket),
diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl
index 789f12652b..c1aff65d5e 100644
--- a/lib/inets/src/http_server/httpd_util.erl
+++ b/lib/inets/src/http_server/httpd_util.erl
@@ -181,7 +181,7 @@ message(304, _URL,_) ->
 message(400,none,_) ->
     "Your browser sent a query that this server could not understand.";
 message(400,Msg,_) ->
-    "Your browser sent a query that this server could not understand. "++ maybe_encode(Msg);
+    "Your browser sent a query that this server could not understand. "++ http_util:html_encode(Msg);
 message(401,none,_) ->
     "This server could not verify that you
 are authorized to access the document you
@@ -190,48 +190,48 @@ credentials (e.g., bad password), or your
 browser doesn't understand how to supply
 the credentials required.";
 message(403,RequestURI,_) ->
-    "You don't have permission to access "++ maybe_encode(RequestURI) ++" on this server.";
+    "You don't have permission to access "++ http_util:html_encode(RequestURI) ++" on this server.";
 message(404,RequestURI,_) ->
-    "The requested URL " ++ maybe_encode(RequestURI) ++ " was not found on this server.";
+    "The requested URL " ++ http_util:html_encode(RequestURI) ++ " was not found on this server.";
 message(408, Timeout, _) ->
     Timeout;
 message(412,none,_) ->
-    "The requested preconditions where false";
+    "The requested preconditions were false";
 message(413, Reason,_) ->
-    "Entity: " ++ Reason;
+    "Entity: " ++ http_util:html_encode(Reason);
 message(414,ReasonPhrase,_) ->
-    "Message "++ ReasonPhrase ++".";
+    "Message "++ http_util:html_encode(ReasonPhrase) ++".";
 message(416,ReasonPhrase,_) ->
-    ReasonPhrase;
+    http_util:html_encode(ReasonPhrase);
 
 message(500,_,ConfigDB) ->
     ServerAdmin=lookup(ConfigDB,server_admin,"unknown@unknown"),
     "The server encountered an internal error or "
 	"misconfiguration and was unable to complete "
 	"your request.<P>Please contact the server administrator "
-	++ ServerAdmin ++ ", and inform them of the time the error occurred "
+	++ http_util:html_encode(ServerAdmin) ++ ", and inform them of the time the error occurred "
 	"and anything you might have done that may have caused the error.";
 
 message(501,{Method, RequestURI, HTTPVersion}, _ConfigDB) ->
     if
 	is_atom(Method) ->
-	    atom_to_list(Method)++
-		" to "++ maybe_encode(RequestURI)++" ("++HTTPVersion++") not supported.";
+        http_util:html_encode(atom_to_list(Method))++
+		" to "++ http_util:html_encode(RequestURI)++" ("++ http_util:html_encode(HTTPVersion)++") not supported.";
 	is_list(Method) ->
-	    Method++
-		" to "++ maybe_encode(RequestURI)++" ("++HTTPVersion++") not supported."
+	    http_util:html_encode(Method)++
+		" to "++ http_util:html_encode(RequestURI)++" ("++ http_util:html_encode(HTTPVersion)++") not supported."
     end;
 
 message(503, String, _ConfigDB) ->
-    "This service in unavailable due to: "++String.
+    "This service in unavailable due to: "++ http_util:html_encode(String).
 
 maybe_encode(URI) ->
-    case lists:member($%, URI) of
-	true ->
-	    URI;
-	false ->
-	    http_uri:encode(URI)
-    end.
+    Decoded = try http_uri:decode(URI) of
+	N -> N
+    catch
+	error:_ -> URI
+    end,
+    http_uri:encode(Decoded).
 
 %%convert_rfc_date(Date)->{{YYYY,MM,DD},{HH,MIN,SEC}}
 
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl
index 929185a67a..e36c33b282 100644
--- a/lib/inets/src/http_server/mod_esi.erl
+++ b/lib/inets/src/http_server/mod_esi.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -415,7 +415,7 @@ deliver_webpage_chunk(#mod{config_db = Db} = ModData, Pid, Timeout) ->
 	    end;
 	timeout ->
 	    ?hdrv("deliver_webpage_chunk - timeout", []),
-	    send_headers(ModData, {504, "Timeout"},[{"connection", "close"}]),
+	    send_headers(ModData, 504, [{"connection", "close"}]),
 	    httpd_socket:close(ModData#mod.socket_type, ModData#mod.socket),
 	    process_flag(trap_exit,false),
 	    {proceed,[{response, {already_sent, 200, 0}} | ModData#mod.data]}
@@ -452,6 +452,10 @@ handle_body(Pid, ModData, Body, Timeout, Size, IsDisableChunkedSend) ->
     ?hdrt("handle_body - send chunk", [{timeout, Timeout}, {size, Size}]),
     httpd_response:send_chunk(ModData, Body, IsDisableChunkedSend),
     receive 
+	{esi_data, Data} when is_binary(Data) ->
+	    ?hdrt("handle_body - received binary data (esi)", []),
+	    handle_body(Pid, ModData, Data, Timeout, Size + byte_size(Data),
+			IsDisableChunkedSend);
 	{esi_data, Data} ->
 	    ?hdrt("handle_body - received data (esi)", []),
 	    handle_body(Pid, ModData, Data, Timeout, Size + length(Data),
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 07da8ca961..47f3fbba58 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,9 +18,14 @@
 
 {"%VSN%",
  [
+  {"5.5.2", 
+   [
+    {restart_application, inets}
+   ]
+  }, 
   {"5.5.1", 
    [
-    {load_module, http_chunk, soft_purge, soft_purge, []}
+    {restart_application, inets}
    ]
   }, 
   {"5.5",
@@ -34,10 +39,15 @@
    ]
   } 
  ],
- [	
+ [
+  {"5.5.2",
+   [
+    {restart_application, inets}
+   ]
+  },
   {"5.5.1", 
    [
-    {load_module, http_chunk, soft_purge, soft_purge, []}
+    {restart_application, inets}
    ]
   }, 
   {"5.5",
diff --git a/lib/inets/test/ftp_SUITE.erl b/lib/inets/test/ftp_SUITE.erl
index 4bafdbfef8..17e5f6777e 100644
--- a/lib/inets/test/ftp_SUITE.erl
+++ b/lib/inets/test/ftp_SUITE.erl
@@ -57,35 +57,42 @@
 %% Description: Returns documentation/test cases in this test suite
 %%		or a skip tuple if the platform is not supported.  
 %%--------------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() -> [{ct_hooks, [ts_install_cth]}].
 
 all() -> 
-    [{group, solaris8_test}, {group, solaris9_test},
-     {group, solaris10_test}, {group, linux_x86_test},
-     {group, linux_ppc_test}, {group, macosx_x86_test},
-     {group, macosx_ppc_test}, {group, openbsd_test},
-     {group, freebsd_test}, {group, netbsd_test},
+    [
+     {group, solaris8_test},   
+     {group, solaris9_test},
+     {group, solaris10_test}, 
+     {group, linux_x86_test},
+     {group, linux_ppc_test}, 
+     {group, macosx_x86_test},
+     {group, macosx_ppc_test}, 
+     {group, openbsd_test},
+     {group, freebsd_test}, 
+     {group, netbsd_test},
      {group, windows_xp_test},
      {group, windows_2003_server_test},
-     {group, ticket_tests}].
+     {group, ticket_tests}
+    ].
 
 groups() -> 
-    [{solaris8_test, [], [{ftp_solaris8_sparc_test, all}]},
-     {solaris9_test, [], [{ftp_solaris9_sparc_test, all}]},
-     {solaris10_test, [],
-      [{ftp_solaris10_sparc_test, all},
-       {ftp_solaris10_x86_test, all}]},
-     {linux_x86_test, [], [{ftp_linux_x86_test, all}]},
-     {linux_ppc_test, [], [{ftp_linux_ppc_test, all}]},
-     {macosx_x86_test, [], [{ftp_macosx_x86_test, all}]},
-     {macosx_ppc_test, [], [{ftp_macosx_ppc_test, all}]},
-     {openbsd_test, [], [{ftp_openbsd_x86_test, all}]},
-     {freebsd_test, [], [{ftp_freebsd_x86_test, all}]},
-     {netbsd_test, [], [{ftp_netbsd_x86_test, all}]},
-     {windows_xp_test, [], [{ftp_windows_xp_test, all}]},
-     {windows_2003_server_test, [],
-      [{ftp_windows_2003_server_test, all}]},
-     {ticket_tests, [], [{ftp_ticket_test, all}]}].
+    [
+     {solaris8_test,            [], [{ftp_solaris8_sparc_test, all}]},
+     {solaris9_test,            [], [{ftp_solaris9_sparc_test, all}]},
+     {solaris10_test,           [], [{ftp_solaris10_sparc_test, all},
+				     {ftp_solaris10_x86_test, all}]},
+     {linux_x86_test,           [], [{ftp_linux_x86_test, all}]},
+     {linux_ppc_test,           [], [{ftp_linux_ppc_test, all}]},
+     {macosx_x86_test,          [], [{ftp_macosx_x86_test, all}]},
+     {macosx_ppc_test,          [], [{ftp_macosx_ppc_test, all}]},
+     {openbsd_test,             [], [{ftp_openbsd_x86_test, all}]},
+     {freebsd_test,             [], [{ftp_freebsd_x86_test, all}]},
+     {netbsd_test,              [], [{ftp_netbsd_x86_test, all}]},
+     {windows_xp_test,          [], [{ftp_windows_xp_test, all}]},
+     {windows_2003_server_test, [], [{ftp_windows_2003_server_test, all}]},
+     {ticket_tests,             [], [{ftp_ticket_test, all}]}
+    ].
 
 init_per_group(_GroupName, Config) ->
 	Config.
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 2c8febf5ed..1998bd3950 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -28,6 +28,7 @@
 -include("test_server_line.hrl").
 
 -include_lib("kernel/include/file.hrl").
+-include("inets_test_lib.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -62,36 +63,84 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [proxy_options, proxy_head, proxy_get, proxy_trace,
-     proxy_post, proxy_put, proxy_delete, proxy_auth,
-     proxy_headers, proxy_emulate_lower_versions,
-     http_options, http_head, http_get, http_post,
-     http_dummy_pipe, http_inets_pipe, http_trace,
-     http_async, http_save_to_file, http_save_to_file_async,
-     http_headers, http_headers_dummy, http_bad_response,
-     ssl_head, ossl_head, essl_head, ssl_get, ossl_get,
-     essl_get, ssl_trace, ossl_trace, essl_trace,
-     http_redirect, http_redirect_loop,
-     http_internal_server_error, http_userinfo, http_cookie,
-     http_server_does_not_exist, http_invalid_http,
-     http_emulate_lower_versions, http_relaxed,
-     page_does_not_exist, proxy_page_does_not_exist,
-     proxy_https_not_supported, http_stream,
-     http_stream_once, proxy_stream, parse_url, options,
-     ipv6, headers_as_is, {group, tickets}].
+    [
+     proxy_options, 
+     proxy_head, 
+     proxy_get, 
+     proxy_trace,
+     proxy_post, 
+     proxy_put, 
+     proxy_delete, 
+     proxy_auth,
+     proxy_headers, 
+     proxy_emulate_lower_versions,
+     http_options, 
+     http_head, 
+     http_get, 
+     http_post,
+     http_post_streaming, 
+     http_dummy_pipe, 
+     http_inets_pipe, 
+     http_trace,
+     http_async, 
+     http_save_to_file, 
+     http_save_to_file_async,
+     http_headers, 
+     http_headers_dummy, 
+     http_bad_response,
+     ssl_head, 
+     ossl_head, 
+     essl_head, 
+     ssl_get, 
+     ossl_get,
+     essl_get, 
+     ssl_trace, 
+     ossl_trace, 
+     essl_trace,
+     http_redirect, 
+     http_redirect_loop,
+     http_internal_server_error, 
+     http_userinfo, http_cookie,
+     http_server_does_not_exist, 
+     http_invalid_http,
+     http_emulate_lower_versions, 
+     http_relaxed,
+     page_does_not_exist, 
+     proxy_page_does_not_exist,
+     proxy_https_not_supported, 
+     http_stream,
+     http_stream_once, 
+     proxy_stream, 
+     parse_url, 
+     options,
+     ipv6, 
+     headers_as_is, 
+     {group, tickets},
+     initial_server_connect
+    ].
 
 groups() -> 
-    [{tickets, [],
-      [hexed_query_otp_6191, empty_body_otp_6243,
-       empty_response_header_otp_6830,
-       transfer_encoding_otp_6807, proxy_not_modified_otp_6821,
-       no_content_204_otp_6982, missing_CR_otp_7304,
-       {group, otp_7883}, {group, otp_8154}, {group, otp_8106},
-       otp_8056, otp_8352, otp_8371, otp_8739]},
-     {otp_7883, [], [otp_7883_1, otp_7883_2]},
+    [{tickets, [], [hexed_query_otp_6191, 
+		    empty_body_otp_6243,
+		    empty_response_header_otp_6830,
+		    transfer_encoding_otp_6807, 
+		    proxy_not_modified_otp_6821,
+		    no_content_204_otp_6982, 
+		    missing_CR_otp_7304,
+		    {group, otp_7883}, 
+		    {group, otp_8154}, 
+		    {group, otp_8106},
+		    otp_8056, 
+		    otp_8352, 
+		    otp_8371, 
+		    otp_8739]},
+     {otp_7883, [], [otp_7883_1, 
+		     otp_7883_2]},
      {otp_8154, [], [otp_8154_1]},
-     {otp_8106, [],
-      [otp_8106_pid, otp_8106_fun, otp_8106_mfa]}].
+     {otp_8106, [], [otp_8106_pid, 
+		     otp_8106_fun, 
+		     otp_8106_mfa]}].
+
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -138,6 +187,7 @@ init_per_suite(Config) ->
      {local_port,     ?IP_PORT}, 
      {local_ssl_port, ?SSL_PORT} | Config].
 
+
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]
@@ -165,6 +215,20 @@ end_per_suite(Config) ->
 %%--------------------------------------------------------------------
 init_per_testcase(otp_8154_1 = Case, Config) ->
     init_per_testcase(Case, 5, Config);
+
+init_per_testcase(initial_server_connect, Config) ->
+    %% Try to check if crypto actually exist or not, 
+    %% this test case does not work unless it does
+    case (catch crypto:start()) of
+	ok ->
+	    application:start(public_key),
+	    application:start(ssl),
+	    inets:start(),
+	    Config;
+	_ ->
+	    {skip,"Could not start crypto"}
+    end;
+
 init_per_testcase(Case, Config) ->
     init_per_testcase(Case, 2, Config).
 
@@ -180,8 +244,8 @@ init_per_testcase_ssl(Tag, PrivDir, SslConfFile, Config) ->
     [{local_ssl_server, Server} | Config2].
 
 init_per_testcase(Case, Timeout, Config) ->
-    io:format(user, "~n~n*** INIT ~w:[~w][~w] ***~n~n", 
-	      [?MODULE, Timeout, Case]),
+    io:format(user, "~n~n*** INIT ~w:~w[~w] ***~n~n", 
+	      [?MODULE, Case, Timeout]),
     PrivDir     = ?config(priv_dir, Config),
     tsp("init_per_testcase -> stop inets"),
     application:stop(inets),
@@ -205,9 +269,10 @@ init_per_testcase(Case, Timeout, Config) ->
 	    [$e, $s, $s, $l | _] ->
 		init_per_testcase_ssl(essl, PrivDir, SslConfFile, [{watchdog, Dog} | TmpConfig]);
 
-	    "proxy" ++ Rest ->
+	    "proxy_" ++ Rest ->
+		io:format("init_per_testcase -> Rest: ~p~n", [Rest]),
 		case Rest of			       
-		    "_https_not_supported" ->	
+		    "https_not_supported" ->	
 			tsp("init_per_testcase -> [proxy case] start inets"),
 			inets:start(),
 			tsp("init_per_testcase -> [proxy case] start ssl"),
@@ -221,13 +286,39 @@ init_per_testcase(Case, Timeout, Config) ->
 				 | TmpConfig]
 			end;
 		    _ ->
+			%% We use erlang.org for the proxy tests 
+			%% and after the switch to erlang-web, many
+			%% of the test cases no longer work (erlang.org
+			%% previously run on Apache). 
+			%% Until we have had time to update inets
+			%% (and updated erlang.org to use that inets) 
+			%% and the test cases, we simply skip the 
+			%% problematic test cases. 
+			%% This is not ideal, but I am busy....
 			case is_proxy_available(?PROXY, ?PROXY_PORT) of
 			    true ->
-				inets:start(),
-				[{watchdog, Dog} | TmpConfig];
+				BadCases = 
+				    [
+				     "delete", 
+				     "get", 
+				     "head", 
+				     "not_modified_otp_6821", 
+				     "options", 
+				     "page_does_not_exist", 
+				     "post", 
+				     "put", 
+				     "stream"
+				    ],
+				case lists:member(Rest, BadCases) of
+				    true ->
+					[{skip, "TC and server not compatible"}|
+					 TmpConfig];
+				    false ->
+					inets:start(),
+					[{watchdog, Dog} | TmpConfig]
+				end;
 			    false ->
-				[{skip, "Failed to contact proxy"} | 
-				 TmpConfig]
+				[{skip, "proxy not responding"} | TmpConfig]
 			end
 		end;
 	    _ -> 
@@ -395,6 +486,53 @@ http_post(Config) when is_list(Config) ->
   end.  
 
 %%-------------------------------------------------------------------------
+http_post_streaming(doc) ->
+    ["Test streaming http post request against local server. "
+     "We only care about the client side of the the post. "
+     "The server script will not actually use the post data."];
+http_post_streaming(suite) ->
+    [];
+http_post_streaming(Config) when is_list(Config) ->
+    case ?config(local_server, Config) of
+        ok ->
+            Port = ?config(local_port, Config),
+            URL = case test_server:os_type() of
+                {win32, _} ->
+                    ?URL_START ++ integer_to_list(Port) ++
+                        "/cgi-bin/cgi_echo.exe";
+                 _ ->
+                    ?URL_START ++ integer_to_list(Port) ++
+                        "/cgi-bin/cgi_echo"
+            end,
+            %% Cgi-script expects the body length to be 100
+            BodyFun = fun(0) ->
+			      io:format("~w:http_post_streaming_fun -> "
+					"zero~n", [?MODULE]),
+			      eof;
+			 (LenLeft) ->
+			      io:format("~w:http_post_streaming_fun -> "
+					"LenLeft: ~p~n", [?MODULE, LenLeft]),
+			      {ok, lists:duplicate(10, "1"), LenLeft - 10}
+		      end,
+	    
+            {ok, {{_,200,_}, [_ | _], [_ | _]}} =
+		httpc:request(post, {URL,
+				     [{"expect", "100-continue"}, 
+				      {"content-length", "100"}],
+				     "text/plain", {BodyFun, 100}}, [], []),
+	    
+            {ok, {{_,504,_}, [_ | _], []}} =
+		httpc:request(post, {URL,
+				     [{"expect", "100-continue"}, 
+				      {"content-length", "10"}],
+				     "text/plain", {BodyFun, 10}}, [], []);
+	
+      _ ->
+          {skip, "Failed to start local http-server"}
+    end.
+
+
+%%-------------------------------------------------------------------------
 http_emulate_lower_versions(doc) ->
     ["Perform request as 0.9 and 1.0 clients."];
 http_emulate_lower_versions(suite) ->
@@ -478,34 +616,35 @@ http_inets_pipe(Config) when is_list(Config) ->
 	    {skip, "Failed to start local http-server"}
     end.
 
+
 test_pipeline(URL) ->
-    p("test_pipeline -> entry with"
-      "~n   URL: ~p", [URL]),
+     p("test_pipeline -> entry with"
+       "~n   URL: ~p", [URL]),
 
-    httpc:set_options([{pipeline_timeout, 50000}]),
-    
-    p("test_pipeline -> issue (async) request 1"), 
-    {ok, RequestId1} = 
+     httpc:set_options([{pipeline_timeout, 50000}]),
+
+     p("test_pipeline -> issue (async) request 1"),
+     {ok, RequestId1} =
 	httpc:request(get, {URL, []}, [], [{sync, false}]),
-    test_server:format("RequestId1: ~p~n", [RequestId1]),
-    p("test_pipeline -> RequestId1: ~p", [RequestId1]),
+     test_server:format("RequestId1: ~p~n", [RequestId1]),
+     p("test_pipeline -> RequestId1: ~p", [RequestId1]),
 
-    %% Make sure pipeline is initiated
-    p("test_pipeline -> sleep some", []),
-    test_server:sleep(4000),
+     %% Make sure pipeline is initiated
+     p("test_pipeline -> sleep some", []),
+     test_server:sleep(4000),
 
-    p("test_pipeline -> issue (async) request 2"),
-    {ok, RequestId2} = 
+     p("test_pipeline -> issue (async) request 2"),
+     {ok, RequestId2} =
 	httpc:request(get, {URL, []}, [], [{sync, false}]),
-    tsp("RequestId2: ~p", [RequestId2]),
-    p("test_pipeline -> RequestId2: ~p", [RequestId2]),
+     tsp("RequestId2: ~p", [RequestId2]),
+     p("test_pipeline -> RequestId2: ~p", [RequestId2]),
 
-    p("test_pipeline -> issue (sync) request 3"),
-    {ok, {{_,200,_}, [_ | _], [_ | _]}} = 
+     p("test_pipeline -> issue (sync) request 3"),
+     {ok, {{_,200,_}, [_ | _], [_ | _]}} =
 	httpc:request(get, {URL, []}, [], []),
 
     p("test_pipeline -> expect reply for (async) request 1 or 2"),
-    receive 
+    receive
 	{http, {RequestId1, {{_, 200, _}, _, _}}} ->
 	    p("test_pipeline -> received reply for (async) request 1 - now wait for 2"),
 	    receive
@@ -523,46 +662,46 @@ test_pipeline(URL) ->
 		    ok;
 		{http, Msg2} ->
 		    test_server:fail(Msg2)
-		    end; 
+	    end;
 	{http, Msg3} ->
 	    test_server:fail(Msg3)
-	after 60000 ->
-		receive Any1 ->
-			tsp("received crap after timeout: ~n   ~p", [Any1]),
-			test_server:fail({error, {timeout, Any1}})
-		end
+    after 60000 ->
+	    receive Any1 ->
+		    tsp("received crap after timeout: ~n   ~p", [Any1]),
+		    test_server:fail({error, {timeout, Any1}})
+	    end
     end,
-    
-    p("test_pipeline -> sleep some"),
-    test_server:sleep(4000),
 
-    p("test_pipeline -> issue (async) request 4"),
-    {ok, RequestId3} = 
-	httpc:request(get, {URL, []}, [], [{sync, false}]),
-    tsp("RequestId3: ~p", [RequestId3]),
-    p("test_pipeline -> RequestId3: ~p", [RequestId3]),
+     p("test_pipeline -> sleep some"),
+     test_server:sleep(4000),
 
-    p("test_pipeline -> issue (async) request 5"),
-    {ok, RequestId4} = 
+     p("test_pipeline -> issue (async) request 4"),
+     {ok, RequestId3} =
 	httpc:request(get, {URL, []}, [], [{sync, false}]),
-    tsp("RequestId4: ~p~n", [RequestId4]),
-    p("test_pipeline -> RequestId4: ~p", [RequestId4]),
-
-    p("test_pipeline -> cancel (async) request 4"),
-    ok = httpc:cancel_request(RequestId3),
-
-    p("test_pipeline -> expect *no* reply for cancelled (async) request 4 (for 3 secs)"),
-    receive 
-	{http, {RequestId3, _}} ->
-	    test_server:fail(http_cancel_request_failed)
-    after 3000 ->
-	    ok
-    end,
+     tsp("RequestId3: ~p", [RequestId3]),
+     p("test_pipeline -> RequestId3: ~p", [RequestId3]),
 
-    p("test_pipeline -> expect reply for (async) request 4"),
-    Body = 
-	receive 
-	   {http, {RequestId4, {{_, 200, _}, _, BinBody4}}} = Res ->
+     p("test_pipeline -> issue (async) request 5"),
+     {ok, RequestId4} =
+	httpc:request(get, {URL, []}, [], [{sync, false}]),
+     tsp("RequestId4: ~p~n", [RequestId4]),
+     p("test_pipeline -> RequestId4: ~p", [RequestId4]),
+
+     p("test_pipeline -> cancel (async) request 4"),
+     ok = httpc:cancel_request(RequestId3),
+
+     p("test_pipeline -> expect *no* reply for cancelled (async) request 4 (for 3 secs)"),
+     receive
+	 {http, {RequestId3, _}} ->
+	     test_server:fail(http_cancel_request_failed)
+     after 3000 ->
+	     ok
+     end,
+
+     p("test_pipeline -> expect reply for (async) request 4"),
+     Body =
+	receive
+	    {http, {RequestId4, {{_, 200, _}, _, BinBody4}}} = Res ->
 		p("test_pipeline -> received reply for (async) request 5"),
 		tsp("Receive : ~p", [Res]),
 		BinBody4;
@@ -577,9 +716,9 @@ test_pipeline(URL) ->
 
     p("test_pipeline -> check reply for (async) request 5"),
     inets_test_lib:check_body(binary_to_list(Body)),
-   
+
     p("test_pipeline -> ensure no unexpected incomming"),
-    receive 
+    receive
 	{http, Any} ->
 	    test_server:fail({unexpected_message, Any})
     after 500 ->
@@ -589,8 +728,6 @@ test_pipeline(URL) ->
     p("test_pipeline -> done"),
     ok.
 
-
-
 %%-------------------------------------------------------------------------
 http_trace(doc) ->
     ["Perform a TRACE request that goes through a proxy."];
@@ -1253,6 +1390,9 @@ proxy_options(doc) ->
 proxy_options(suite) ->
     [];
 proxy_options(Config) when is_list(Config) ->
+    %% As of 2011-03-24, erlang.org (which is used as server) 
+    %% does no longer run Apache, but instead runs inets, which 
+    %% do not implement "options".
     case ?config(skip, Config) of 
         undefined ->
 	    case httpc:request(options, {?PROXY_URL, []}, [], []) of
@@ -1277,6 +1417,8 @@ proxy_head(doc) ->
 proxy_head(suite) ->
     [];
 proxy_head(Config) when is_list(Config) ->
+    %% As of 2011-03-24, erlang.org (which is used as server) 
+    %% does no longer run Apache, but instead runs inets.
     case ?config(skip, Config) of 
 	undefined ->
 	    case httpc:request(head, {?PROXY_URL, []}, [], []) of
@@ -1372,6 +1514,8 @@ proxy_post(doc) ->
 proxy_post(suite) ->
     [];
 proxy_post(Config) when is_list(Config) ->
+    %% As of 2011-03-24, erlang.org (which is used as server) 
+    %% does no longer run Apache, but instead runs inets.
     case ?config(skip, Config) of 
 	undefined ->
 	    case httpc:request(post, {?PROXY_URL, [], 
@@ -1394,6 +1538,8 @@ proxy_put(doc) ->
 proxy_put(suite) ->
     [];
 proxy_put(Config) when is_list(Config) ->
+    %% As of 2011-03-24, erlang.org (which is used as server) 
+    %% does no longer run Apache, but instead runs inets.
     case ?config(skip, Config) of 
 	undefined -> 
 	    case httpc:request(put, {"http://www.erlang.org/foobar.html", [], 
@@ -1418,6 +1564,8 @@ proxy_delete(doc) ->
 proxy_delete(suite) ->
     [];
 proxy_delete(Config) when is_list(Config) ->
+    %% As of 2011-03-24, erlang.org (which is used as server) 
+    %% does no longer run Apache, but instead runs inets.
     case ?config(skip, Config) of 
 	undefined -> 
 	    URL = ?PROXY_URL ++ "/foobar.html",
@@ -1541,25 +1689,11 @@ proxy_https_not_supported(suite) ->
 proxy_https_not_supported(Config) when is_list(Config) ->
     Result = httpc:request(get, {"https://login.yahoo.com", []}, [], []),
     case Result of
-	{error, Reason} ->
-	    %% ok so far
-	    case Reason of
-		{failed_connecting, Why} ->
-		    %% ok, now check why
-		    case Why of
-			https_through_proxy_is_not_currently_supported ->
-			    ok;
-			_ ->
-			    tsf({unexpected_why, Why})
-		    end;
-		_ ->
-		    tsf({unexpected_reason, Reason})
-	    end;
+	{error, https_through_proxy_is_not_currently_supported} ->
+	    ok;
 	_ ->
-	    tsf({unexpected_result, Result})
-    end,
-    ok.
-
+	    tsf({unexpected_reason, Result})
+    end.
 
 %%-------------------------------------------------------------------------
 
@@ -2312,7 +2446,7 @@ otp_8106_fun(Config) when is_list(Config) ->
 	    ok;
 	_ ->
 	    {skip, "Failed to start local http-server"}
-    end.  
+    end.
 
 
 otp_8106_mfa(doc) ->
@@ -2538,7 +2672,7 @@ otp_8739(Config) when is_list(Config) ->
     Request     = {URL, []}, 
     HttpOptions = [{connect_timeout, 500}, {timeout, 1}], 
     Options     = [{sync, true}], 
-    case http:request(Method, Request, HttpOptions, Options) of
+    case httpc:request(Method, Request, HttpOptions, Options) of
 	{error, timeout} ->
 	    %% And now we check the size of the handler db
 	    Info = httpc:info(),
@@ -2573,7 +2707,7 @@ otp_8739_dummy_server_init(Parent) ->
     Parent ! {port, Port},
     otp_8739_dummy_server_main(Parent, ListenSocket).
 
-otp_8739_dummy_server_main(Parent, ListenSocket) ->
+otp_8739_dummy_server_main(_Parent, ListenSocket) ->
     case gen_tcp:accept(ListenSocket) of
 	{ok, Sock} ->
 	    %% Ignore the request, and simply wait for the socket to close
@@ -2595,7 +2729,31 @@ otp_8739_dummy_server_main(Parent, ListenSocket) ->
 	    exit(Error)
     end.
 
-		       
+%%-------------------------------------------------------------------------
+
+initial_server_connect(doc) ->
+    ["If this test cases times out the init of httpc_handler process is"
+     "blocking the manager/client process (implementation dependent which) but nither"
+     "should be blocked."];
+initial_server_connect(suite) ->
+    [];
+initial_server_connect(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    ok = httpc:set_options([{ipfamily, inet}]),
+
+    CertFile   = filename:join(DataDir, "ssl_server_cert.pem"),
+    SSLOptions = [{certfile, CertFile}, {keyfile, CertFile}],
+
+    {DummyServerPid, Port} = dummy_ssl_server_hang(self(), ipv4, SSLOptions),
+
+    URL = ?SSL_URL_START ++ integer_to_list(Port) ++ "/index.html",
+
+    httpc:request(get, {URL, []}, [{ssl,{essl,[]}}], [{sync, false}]),
+
+    [{session_cookies,[]}] = httpc:which_cookies(),
+
+    DummyServerPid ! stop,
+    ok = httpc:set_options([{ipfamily, inet6fb4}]).
     
 %%--------------------------------------------------------------------
 %% Internal functions
@@ -3108,11 +3266,9 @@ pick_header(Headers, Name) ->
 	    Val
     end.
 
-
 not_implemented_yet() ->
     exit(not_implemented_yet).
 
-
 p(F) ->
     p(F, []).
 
@@ -3126,3 +3282,37 @@ tsp(F, A) ->
 
 tsf(Reason) ->
     test_server:fail(Reason).
+
+
+dummy_ssl_server_hang(Caller, IpV, SslOpt) ->
+    Pid = spawn(httpc_SUITE, dummy_ssl_server_hang_init, [Caller, IpV, SslOpt]),
+    receive
+	{port, Port} ->
+	    {Pid, Port}
+    end.
+
+dummy_ssl_server_hang_init(Caller, IpV, SslOpt) ->
+    {ok, ListenSocket} =
+	case IpV of
+	    ipv4 ->
+		ssl:listen(0, [binary, inet, {packet, 0},
+			       {reuseaddr,true},
+			       {active, false}] ++ SslOpt);
+	    ipv6 ->
+		ssl:listen(0, [binary, inet6, {packet, 0},
+			       {reuseaddr,true},
+			       {active, false}] ++ SslOpt)
+	end,
+    {ok, {_,Port}} = ssl:sockname(ListenSocket),
+    tsp("dummy_ssl_server_hang_init -> Port: ~p", [Port]),
+    Caller ! {port, Port},
+    {ok, AcceptSocket} = ssl:transport_accept(ListenSocket),
+    dummy_ssl_server_hang_loop(AcceptSocket).
+
+dummy_ssl_server_hang_loop(_) ->
+    %% Do not do ssl:ssl_accept as we
+    %% want to time out the underlying gen_tcp:connect
+    receive
+	stop ->
+	    ok
+    end.
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index 3e29b68283..f23d0b4765 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -29,7 +29,11 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [uri_too_long_414, header_too_long_413, escaped_url_in_error_body].
+    [
+     uri_too_long_414, 
+     header_too_long_413, 
+     escaped_url_in_error_body
+    ].
 
 groups() -> 
     [].
@@ -40,6 +44,7 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
 %% Config - [tuple()]
@@ -50,6 +55,8 @@ end_per_group(_GroupName, Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
+    tsp("init_per_suite -> entry with"
+	"~n   Config: ~p", [Config]),
     ok = inets:start(),
     PrivDir = ?config(priv_dir, Config),
     HttpdConf = [{port, 0}, {ipfamily, inet}, 
@@ -64,6 +71,8 @@ init_per_suite(Config) ->
 %% Description: Cleanup after the whole suite
 %%--------------------------------------------------------------------
 end_per_suite(_Config) ->
+    tsp("end_per_suite -> entry with"
+	"~n   Config: ~p", [_Config]),
     inets:stop(),
     ok.
 
@@ -79,9 +88,12 @@ end_per_suite(_Config) ->
 %% Note: This function is free to add any key/value pairs to the Config
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
+init_per_testcase(Case, Config) ->
+    tsp("init_per_testcase(~w) -> entry with"
+	"~n   Config: ~p", [Case, Config]),
     Config.
 
+
 %%--------------------------------------------------------------------
 %% Function: end_per_testcase(Case, Config) -> _
 %% Case - atom()
@@ -90,9 +102,12 @@ init_per_testcase(_Case, Config) ->
 %%   A list of key/value pairs, holding the test case configuration.
 %% Description: Cleanup after each test case
 %%--------------------------------------------------------------------
-end_per_testcase(_, Config) ->
+end_per_testcase(Case, Config) ->
+    tsp("end_per_testcase(~w) -> entry with"
+	"~n   Config: ~p", [Case, Config]),
     Config.
 
+
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
@@ -142,22 +157,30 @@ escaped_url_in_error_body(doc) ->
 escaped_url_in_error_body(suite) ->
     [];
 escaped_url_in_error_body(Config) when is_list(Config) ->
-    HttpdConf =   ?config(httpd_conf, Config),
+    tsp("escaped_url_in_error_body -> entry with"
+	"~n   Config: ~p", [Config]),
+    HttpdConf = ?config(httpd_conf, Config),
     {ok, Pid} = inets:start(httpd, [{port, 0} | HttpdConf]),
     Info = httpd:info(Pid),
     Port = proplists:get_value(port, Info),
-    Address = proplists:get_value(bind_address, Info),
-    Path = "/<b>this_is_bold<b>",
+    _Address = proplists:get_value(bind_address, Info),
+    Path = "/<b>this_is_bold</b>",
     URL = ?URL_START ++ integer_to_list(Port) ++ Path,
     EscapedPath = http_uri:encode(Path),
-    {ok, {404, Body}} = httpc:request(get, {URL, []},
-				      [{url_encode, true}],
-				      [{version, "HTTP/1.0"}, {full_result, false}]),
-    EscapedPath = find_URL_path(string:tokens(Body, " ")),
-    {ok, {404, Body1}} = httpc:request(get, {URL, []}, [],
-				       [{version, "HTTP/1.0"}, {full_result, false}]),
+    {ok, {404, Body1}} = httpc:request(get, {URL, []},
+				       [{url_encode, true}, 
+					{version,    "HTTP/1.0"}],
+				      [{full_result, false}]),
     EscapedPath = find_URL_path(string:tokens(Body1, " ")),
-    inets:stop(httpd, Pid).
+    {ok, {404, Body2}} = httpc:request(get, {URL, []},
+				       [{url_encode,  false}, 
+					{version,     "HTTP/1.0"}], 
+				       [{full_result, false}]),
+    HTMLEncodedPath = http_util:html_encode(Path),
+    HTMLEncodedPath = find_URL_path(string:tokens(Body2, " ")),
+    inets:stop(httpd, Pid),
+    tsp("escaped_url_in_error_body -> done"),
+    ok.
 
 find_URL_path([]) ->
     "";
@@ -165,3 +188,10 @@ find_URL_path(["URL", URL | _]) ->
     URL;
 find_URL_path([_ | Rest]) ->
     find_URL_path(Rest).
+
+
+tsp(F) ->
+    tsp(F, []).
+tsp(F, A) ->
+    test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
+
diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl
index f2c1fd6a65..1754cec7bc 100644
--- a/lib/inets/test/httpd_mod.erl
+++ b/lib/inets/test/httpd_mod.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -19,7 +19,6 @@
 %%
 
 -module(httpd_mod).
--author('[email protected]').
 
 -include("test_server.hrl").
 -include("test_server_line.hrl").
@@ -815,6 +814,8 @@ esi(Type, Port, Host, Node) ->
 					[{statuscode, 302},
 					{version, "HTTP/1.0"}]),
     ok.
+
+
 %%--------------------------------------------------------------------
 get(Type, Port, Host, Node) ->
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
diff --git a/lib/inets/test/inets_app_test.erl b/lib/inets/test/inets_app_test.erl
index 11b507fa26..49ea18501f 100644
--- a/lib/inets/test/inets_app_test.erl
+++ b/lib/inets/test/inets_app_test.erl
@@ -241,6 +241,20 @@ undef_funcs(suite) ->
 undef_funcs(doc) ->
     [];
 undef_funcs(Config) when is_list(Config) ->
+    %% We need to check if there is a point to run this test.
+    %% On some platforms, crypto will not build, which in turn
+    %% causes ssl to not to not build (at this time, this will
+    %% change in the future).
+    %% So, we first check if we can start crypto, and if not, 
+    %% we skip this test case!
+    case (catch crypto:start()) of
+	ok ->
+	    ok;
+	{error, {already_started, crypto}} ->
+	    ok;
+	_ ->
+	    ?SKIP(crypto_start_check_failed)
+    end, 
     App            = inets,
     AppFile        = key1search(app_file, Config),
     Mods           = key1search(modules, AppFile),
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index c56a714f5a..c837326bb5 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -32,7 +32,7 @@
 -export([check_body/1]).
 -export([millis/0, millis_diff/2, hours/1, minutes/1, seconds/1, sleep/1]).
 -export([oscmd/1]).
--export([non_pc_tc_maybe_skip/4, os_based_skip/1]).
+-export([non_pc_tc_maybe_skip/4, os_based_skip/1, skip/3, fail/3]).
 -export([flush/0]).
 -export([start_node/1, stop_node/1]).
 
@@ -395,6 +395,13 @@ sleep(MSecs) ->
 skip(Reason, File, Line) ->
     exit({skipped, {Reason, File, Line}}).
 
+fail(Reason, File, Line) ->
+    String = lists:flatten(io_lib:format("Failure ~p(~p): ~p~n",
+                                         [File, Line, Reason])),
+    tsf(String).
+
+
+
 flush() ->
     receive
         Msg ->
@@ -407,7 +414,7 @@ flush() ->
 tsp(F) ->
     tsp(F, []).
 tsp(F, A) ->
-    test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
+    test_server:format("~p ~p ~p:" ++ F ++ "~n", [node(), self(), ?MODULE | A]).
 
 tsf(Reason) ->
     test_server:fail(Reason).
diff --git a/lib/inets/test/inets_test_lib.hrl b/lib/inets/test/inets_test_lib.hrl
index 0cdb04139c..cc83a309b5 100644
--- a/lib/inets/test/inets_test_lib.hrl
+++ b/lib/inets/test/inets_test_lib.hrl
@@ -72,7 +72,7 @@
 
 %% - Test case macros - 
 
--define(SKIP(Reason),   inets_test_lib:skip(Reason)).
+-define(SKIP(Reason),   inets_test_lib:skip(Reason, ?MODULE, ?LINE)).
 -define(FAIL(Reason),   inets_test_lib:fail(Reason, ?MODULE, ?LINE)).
 
 
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index b1de3fef43..c0e25a30e3 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 5.5.2
+INETS_VSN   = 5.6
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
 
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index 962be63968..11fcc5f387 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/specs/.gitignore b/lib/kernel/doc/specs/.gitignore
new file mode 100644
index 0000000000..322eebcb06
--- /dev/null
+++ b/lib/kernel/doc/specs/.gitignore
@@ -0,0 +1 @@
+specs_*.xml
diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile
index f8c1cac8b3..de10e31d36 100644
--- a/lib/kernel/doc/src/Makefile
+++ b/lib/kernel/doc/src/Makefile
@@ -1,19 +1,20 @@
-# ``The contents of this file are subject to the Erlang Public License,
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2011. 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 via the world wide web at http://www.erlang.org/.
-# 
+# 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.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id$
+#
+# %CopyrightEnd%
 #
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
@@ -94,19 +95,24 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
+
+TOP_SPECS_FILE = specs.xml
 
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
 XML_FLAGS += 
 
+SPECS_FLAGS = -I../../include
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-docs: pdf html man
+docs: man pdf html
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
@@ -125,8 +131,22 @@ clean clean_docs:
 	rm -f $(MAN4DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f $(SPECDIR)/*
 	rm -f errs core *~ 
 
+$(SPECDIR)/specs_erl_prim_loader_stub.xml:
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+                -o$(dir $@) -module erl_prim_loader_stub
+$(SPECDIR)/specs_erlang_stub.xml:
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+                -o$(dir $@) -module erlang_stub
+$(SPECDIR)/specs_init_stub.xml:
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+                -o$(dir $@) -module init_stub
+$(SPECDIR)/specs_zlib_stub.xml:
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+                -o$(dir $@) -module zlib_stub
+
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml
index 47d578a339..51a3311ec2 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -50,20 +50,27 @@
     <p>Refer to <seealso marker="doc/design_principles:des_princ">OTP Design Principles</seealso> for more information about
       applications and behaviours.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="start_type"/>
+    </datatype>
+    <datatype>
+      <name name="restart_type"/>
+    </datatype>
+    <datatype>
+      <!-- Parameterized opaque types are NYI: -->
+      <name><marker id="type-tuple_of">tuple_of(T)</marker></name>
+      <desc><p>A tuple where the elements are of type <c>T</c>.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>get_all_env() -> Env</name>
-      <name>get_all_env(Application) -> Env</name>
+      <name name="get_all_env" arity="0"/>
+      <name name="get_all_env" arity="1"/>
       <fsummary>Get the configuration parameters for an application</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Env = [{Par,Val}]</v>
-        <v>&nbsp;Par = atom()</v>
-        <v>&nbsp;Val = term()</v>
-      </type>
       <desc>
         <p>Returns the configuration parameters and their values for
-          <c>Application</c>. If the argument is omitted, it defaults to
+          <c><anno>Application</anno></c>. If the argument is omitted, it defaults to
           the application of the calling process.</p>
         <p>If the specified application is not loaded, or if the process
           executing the call does not belong to any application,
@@ -71,18 +78,12 @@
       </desc>
     </func>
     <func>
-      <name>get_all_key() -> {ok, Keys} | []</name>
-      <name>get_all_key(Application) -> {ok, Keys} | undefined </name>
+      <name name="get_all_key" arity="0"/>
+      <name name="get_all_key" arity="1"/>
       <fsummary>Get the application specification keys</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Keys = [{Key,Val}]</v>
-        <v>&nbsp;Key = atom()</v>
-        <v>&nbsp;Val = term()</v>
-      </type>
       <desc>
         <p>Returns the application specification keys and their values
-          for <c>Application</c>. If the argument is omitted, it
+          for <c><anno>Application</anno></c>. If the argument is omitted, it
           defaults to the application of the calling process.</p>
         <p>If the specified application is not loaded, the function
           returns <c>undefined</c>. If the process executing the call
@@ -91,17 +92,12 @@
       </desc>
     </func>
     <func>
-      <name>get_application() -> {ok, Application} | undefined</name>
-      <name>get_application(Pid | Module) -> {ok, Application} | undefined</name>
+      <name name="get_application" arity="0"/>
+      <name name="get_application" arity="1"/>
       <fsummary>Get the name of an application containing a certain process or module</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Module = atom()</v>
-        <v>Application = atom()</v>
-      </type>
       <desc>
         <p>Returns the name of the application to which the process
-          <c>Pid</c> or the module <c>Module</c> belongs. Providing no
+          <c><anno>Pid</anno></c> or the module <c><anno>Module</anno></c> belongs. Providing no
           argument is the same as calling
           <c>get_application(self())</c>.</p>
         <p>If the specified process does not belong to any application,
@@ -110,17 +106,12 @@
       </desc>
     </func>
     <func>
-      <name>get_env(Par) -> {ok, Val} | undefined</name>
-      <name>get_env(Application, Par) -> {ok, Val} | undefined</name>
+      <name name="get_env" arity="1"/>
+      <name name="get_env" arity="2"/>
       <fsummary>Get the value of a configuration parameter</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Par = atom()</v>
-        <v>Val = term()</v>
-      </type>
       <desc>
-        <p>Returns the value of the configuration parameter <c>Par</c>
-          for <c>Application</c>. If the application argument is
+        <p>Returns the value of the configuration parameter <c><anno>Par</anno></c>
+          for <c><anno>Application</anno></c>. If the application argument is
           omitted, it defaults to the application of the calling
           process.</p>
         <p>If the specified application is not loaded, or
@@ -130,17 +121,12 @@
       </desc>
     </func>
     <func>
-      <name>get_key(Key) -> {ok, Val} | undefined</name>
-      <name>get_key(Application, Key) -> {ok, Val} | undefined</name>
+      <name name="get_key" arity="1"/>
+      <name name="get_key" arity="2"/>
       <fsummary>Get the value of an application specification key</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Key = atom()</v>
-        <v>Val = term()</v>
-      </type>
       <desc>
         <p>Returns the value of the application specification key
-          <c>Key</c> for <c>Application</c>. If the application
+          <c><anno>Key</anno></c> for <c><anno>Application</anno></c>. If the application
           argument is omitted, it defaults to the application of
           the calling process.</p>
         <p>If the specified application is not loaded, or
@@ -150,45 +136,35 @@
       </desc>
     </func>
     <func>
-      <name>load(AppDescr) -> ok | {error, Reason}</name>
-      <name>load(AppDescr, Distributed) -> ok | {error, Reason}</name>
+      <name name="load" arity="1"/>
+      <name name="load" arity="2"/>
       <fsummary>Load an application</fsummary>
-      <type>
-        <v>AppDescr = Application | AppSpec</v>
-        <v>&nbsp;Application = atom()</v>
-        <v>&nbsp;AppSpec = {application,Application,AppSpecKeys}</v>
-        <v>&nbsp;&nbsp;AppSpec = [{Key,Val}]</v>
-        <v>&nbsp;&nbsp;&nbsp;Key = atom()</v>
-        <v>&nbsp;&nbsp;&nbsp;Val = term()</v>
-        <v>Distributed = {Application,Nodes} | {Application,Time,Nodes} | default</v>
-        <v>&nbsp;Nodes = [node() | {node(),..,node()}]</v>
-        <v>&nbsp;Time = integer() > 0</v>
-        <v>Reason = term()</v>
-      </type>
+      <type name="application_spec"/>
+      <type name="application_opt"/>
       <desc>
         <p>Loads the application specification for an application into
           the application controller. It will also load the application
           specifications for any included applications. Note that
           the function does not load the actual Erlang object code.</p>
-        <p>The application can be given by its name <c>Application</c>.
+        <p>The application can be given by its name <c><anno>Application</anno></c>.
           In this case the application controller will search the code
-          path for the application resource file <c>Application.app</c>
+          path for the application resource file <c><anno>Application</anno>.app</c>
           and load the specification it contains.</p>
         <p>The application specification can also be given directly as a
-          tuple <c>AppSpec</c>. This tuple should have the format and
+          tuple <c><anno>AppSpec</anno></c>. This tuple should have the format and
           contents as described in <c>app(4)</c>.</p>
-        <p>If <c>Distributed == {Application,[Time,]Nodes}</c>,
+        <p>If <c><anno>Distributed</anno> == {<anno>Application</anno>,[<anno>Time</anno>,]<anno>Nodes</anno>}</c>,
           the application will be distributed. The argument overrides
           the value for the application in the Kernel configuration
-          parameter <c>distributed</c>. <c>Application</c> must be
+          parameter <c>distributed</c>. <c><anno>Application</anno></c> must be
           the name of the application (same as in the first argument).
-          If a node crashes and <c>Time</c> has been specified, then
-          the application controller will wait for <c>Time</c>
+          If a node crashes and <c><anno>Time</anno></c> has been specified, then
+          the application controller will wait for <c><anno>Time</anno></c>
           milliseconds before attempting to restart the application on
-          another node. If <c>Time</c> is not specified, it will
+          another node. If <c><anno>Time</anno></c> is not specified, it will
           default to 0 and the application will be restarted
           immediately.</p>
-        <p><c>Nodes</c> is a list of node names where the application
+        <p><c><anno>Nodes</anno></c> is a list of node names where the application
           may run, in priority from left to right. Node names can be
           grouped using tuples to indicate that they have the same
           priority. Example:</p>
@@ -204,32 +180,22 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>loaded_applications() -> [{Application, Description, Vsn}]</name>
+      <name name="loaded_applications" arity="0"/>
       <fsummary>Get the currently loaded applications</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Description = string()</v>
-        <v>Vsn = string()</v>
-      </type>
       <desc>
         <p>Returns a list with information about the applications which
           have been loaded using <c>load/1,2</c>, also included
-          applications. <c>Application</c> is the application name.
-          <c>Description</c> and <c>Vsn</c> are the values of its
+          applications. <c><anno>Application</anno></c> is the application name.
+          <c><anno>Description</anno></c> and <c><anno>Vsn</anno></c> are the values of its
           <c>description</c> and <c>vsn</c> application specification
           keys, respectively.</p>
       </desc>
     </func>
     <func>
-      <name>permit(Application, Bool) -> ok | {error, Reason}</name>
+      <name name="permit" arity="2"/>
       <fsummary>Change an application's permission to run on a node.</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Bool = bool()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
-        <p>Changes the permission for <c>Application</c> to run at
+        <p>Changes the permission for <c><anno>Application</anno></c> to run at
           the current node. The application must have been loaded using
           <c>load/1,2</c> for the function to have effect.</p>
         <p>If the permission of a loaded, but not started, application
@@ -258,20 +224,14 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>set_env(Application, Par, Val) -> ok</name>
-      <name>set_env(Application, Par, Val, Timeout) -> ok</name>
+      <name name="set_env" arity="3"/>
+      <name name="set_env" arity="4"/>
       <fsummary>Set the value of a configuration parameter</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Par = atom()</v>
-        <v>Val = term()</v>
-        <v>Timeout = int() | infinity</v>
-      </type>
       <desc>
-        <p>Sets the value of the configuration parameter <c>Par</c> for
-          <c>Application</c>.</p>
+        <p>Sets the value of the configuration parameter <c><anno>Par</anno></c> for
+          <c><anno>Application</anno></c>.</p>
         <p><c>set_env/3</c> uses the standard <c>gen_server</c> timeout
-          value (5000 ms). A <c>Timeout</c> argument can be provided
+          value (5000 ms). A <c><anno>Timeout</anno></c> argument can be provided
           if another timeout value is useful, for example, in situations
           where the application controller is heavily loaded.</p>
         <warning>
@@ -285,20 +245,15 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>start(Application) -> ok | {error, Reason}</name>
-      <name>start(Application, Type) -> ok | {error, Reason}</name>
+      <name name="start" arity="1"/>
+      <name name="start" arity="2"/>
       <fsummary>Load and start an application</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Type = permanent | transient | temporary</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
-        <p>Starts <c>Application</c>. If it is not loaded,
+        <p>Starts <c><anno>Application</anno></c>. If it is not loaded,
           the application controller will first load it using
           <c>load/1</c>. It will make sure any included applications
           are loaded, but will not start them. That is assumed to be
-          taken care of in the code for <c>Application</c>.</p>
+          taken care of in the code for <c><anno>Application</anno></c>.</p>
         <p>The application controller checks the value of
           the application specification key <c>applications</c>, to
           ensure that all applications that should be started before
@@ -310,7 +265,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
           The application master starts the application by calling
           the application callback function <c>Module:start/2</c> as
           defined by the application specification key <c>mod</c>.</p>
-        <p>The <c>Type</c> argument specifies the type of
+        <p>The <c><anno>Type</anno></c> argument specifies the type of
           the application. If omitted, it defaults to <c>temporary</c>.</p>
         <list type="bulleted">
           <item>If a permanent application terminates, all other
@@ -331,19 +286,15 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>start_type() -> StartType | local | undefined</name>
+      <name name="start_type" arity="0"/>
       <fsummary>Get the start type of an ongoing application startup.</fsummary>
-      <type>
-        <v>StartType = normal | {takeover,Node} | {failover,Node}</v>
-        <v>&nbsp;Node = node()</v>
-      </type>
       <desc>
         <p>This function is intended to be called by a process belonging
           to an application, when the application is being started, to
-          determine the start type which is either <c>StartType</c> or
+          determine the start type which is either <c><anno>StartType</anno></c> or
           <c>local</c>.</p>
-        <p>See <c>Module:start/2</c> for a description of
-          <c>StartType</c>.</p>
+        <p>See <seealso marker="#start_type"><c>Module:start/2</c></seealso> for a description of
+          <c><anno>StartType</anno></c>.</p>
         <p><c>local</c> is returned if only parts of the application is
           being restarted (by a supervisor), or if the function is
           called outside a startup.</p>
@@ -352,14 +303,10 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>stop(Application) -> ok | {error, Reason}</name>
+      <name name="stop" arity="1"/>
       <fsummary>Stop an application</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
-        <p>Stops <c>Application</c>. The application master calls
+        <p>Stops <c><anno>Application</anno></c>. The application master calls
           <c>Module:prep_stop/1</c>, if such a function is defined, and
           then tells the top supervisor of the application to shutdown
           (see <c>supervisor(3)</c>). This means that the entire
@@ -384,16 +331,11 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>takeover(Application, Type) -> ok | {error, Reason}</name>
+      <name name="takeover" arity="2"/>
       <fsummary>Take over a distributed application</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Type = permanent | transient | temporary</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>Performs a takeover of the distributed application
-          <c>Application</c>, which executes at another node
+          <c><anno>Application</anno></c>, which executes at another node
           <c>Node</c>. At the current node, the application is
           restarted by calling
           <c>Module:start({takeover,Node},StartArgs)</c>. <c>Module</c>
@@ -413,14 +355,10 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>unload(Application) -> ok | {error, Reason}</name>
+      <name name="unload" arity="1"/>
       <fsummary>Unload an application</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
-        <p>Unloads the application specification for <c>Application</c>
+        <p>Unloads the application specification for <c><anno>Application</anno></c>
           from the application controller. It will also unload
           the application specifications for any included applications.
           Note that the function does not purge the actual Erlang
@@ -428,19 +366,14 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>unset_env(Application, Par) -> ok</name>
-      <name>unset_env(Application, Par, Timeout) -> ok</name>
+      <name name="unset_env" arity="2"/>
+      <name name="unset_env" arity="3"/>
       <fsummary>Unset the value of a configuration parameter</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Par = atom()</v>
-        <v>Timeout = int() | infinity</v>
-      </type>
       <desc>
-        <p>Removes the configuration parameter <c>Par</c> and its value
-          for <c>Application</c>.</p>
+        <p>Removes the configuration parameter <c><anno>Par</anno></c> and its value
+          for <c><anno>Application</anno></c>.</p>
         <p><c>unset_env/2</c> uses the standard <c>gen_server</c>
-          timeout value (5000 ms). A <c>Timeout</c> argument can be
+          timeout value (5000 ms). A <c><anno>Timeout</anno></c> argument can be
           provided if another timeout value is useful, for example, in
           situations where the application controller is heavily loaded.</p>
         <warning>
@@ -454,23 +387,17 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>which_applications() -> [{Application, Description, Vsn}]</name>
-      <name>which_applications(Timeout) -> [{Application, Description, Vsn}]</name>
+      <name name="which_applications" arity="0"/>
+      <name name="which_applications" arity="1"/>
       <fsummary>Get the currently running applications</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <v>Description = string()</v>
-        <v>Vsn = string()</v>
-        <v>Timeout = int() | infinity</v>
-      </type>
       <desc>
         <p>Returns a list with information about the applications which
-          are currently running. <c>Application</c> is the application
-          name. <c>Description</c> and <c>Vsn</c> are the values of its
+          are currently running. <c><anno>Application</anno></c> is the application
+          name. <c><anno>Description</anno></c> and <c><anno>Vsn</anno></c> are the values of its
           <c>description</c> and <c>vsn</c> application specification
           keys, respectively.</p>
         <p><c>which_applications/0</c> uses the standard
-          <c>gen_server</c> timeout value (5000 ms). A <c>Timeout</c>
+          <c>gen_server</c> timeout value (5000 ms). A <c><anno>Timeout</anno></c>
           argument can be provided if another timeout value is useful,
           for example, in situations where the application controller
           is heavily loaded.</p>
@@ -501,7 +428,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
           structured according to the OTP design principles as a
           supervision tree, this means starting the top supervisor of
           the tree.</p>
-        <p><c>StartType</c> defines the type of start:</p>
+        <p><marker id="start_type"/><c>StartType</c> defines the type of start:</p>
         <list type="bulleted">
           <item><c>normal</c> if it's a normal startup.</item>
           <item><c>normal</c> also if the application is distributed and
@@ -532,8 +459,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       <fsummary>Extended start of an application</fsummary>
       <type>
         <v>Phase = atom()</v>
-        <v>StartType = normal | {takeover,Node} | {failover,Node}</v>
-        <v>&nbsp;Node = node()</v>
+        <v>StartType = <seealso marker="#type-start_type">start_type()</seealso></v>
         <v>PhaseArgs = term()</v>
         <v>Pid = pid()</v>
         <v>State = state()</v>
diff --git a/lib/kernel/doc/src/auth.xml b/lib/kernel/doc/src/auth.xml
index f53fc8b29a..15d9ef0fe4 100644
--- a/lib/kernel/doc/src/auth.xml
+++ b/lib/kernel/doc/src/auth.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,29 +34,28 @@
       Cookie system, refer to
       <seealso marker="doc/reference_manual:distributed">Distributed Erlang</seealso> in the Erlang Reference Manual.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="cookie"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>is_auth(Node) -> yes | no</name>
+      <name name="is_auth" arity="1"/>
       <fsummary>Status of communication authorization (deprecated)</fsummary>
-      <type>
-        <v>Node = node()</v>
-      </type>
       <desc>
-        <p>Returns <c>yes</c> if communication with <c>Node</c> is
-          authorized. Note that a connection to <c>Node</c> will
-          be established in this case. Returns <c>no</c> if <c>Node</c>
+        <p>Returns <c>yes</c> if communication with <c><anno>Node</anno></c> is
+          authorized. Note that a connection to <c><anno>Node</anno></c> will
+          be established in this case. Returns <c>no</c> if <c><anno>Node</anno></c>
           does not exist or communication is not authorized (it has
           another cookie than <c>auth</c> thinks it has).</p>
-        <p>Use <seealso marker="net_adm#ping/1">net_adm:ping(Node)</seealso>
+        <p>Use <seealso marker="net_adm#ping/1">net_adm:ping(<anno>Node</anno>)</seealso>
           instead.</p>
       </desc>
     </func>
     <func>
-      <name>cookie() -> Cookie</name>
+      <name name="cookie" arity="0"/>
       <fsummary>Magic cookie for local node (deprecated)</fsummary>
-      <type>
-        <v>Cookie = atom()</v>
-      </type>
       <desc>
         <p>Use
           <seealso marker="erts:erlang#erlang:get_cookie/0">erlang:get_cookie()</seealso>
@@ -64,16 +63,14 @@
       </desc>
     </func>
     <func>
-      <name>cookie(TheCookie) -> true</name>
+      <name name="cookie" arity="1"/>
       <fsummary>Set the magic for the local node (deprecated)</fsummary>
-      <type>
-        <v>TheCookie = Cookie | [Cookie]</v>
-        <d>The cookie may also be given as a list with a single atom element</d>
-        <v>&nbsp;Cookie = atom()</v>
-      </type>
+      <type_desc variable="TheCookie">
+        The cookie may also be given as a list with a single atom element.
+      </type_desc>
       <desc>
         <p>Use
-          <seealso marker="erts:erlang#erlang:set_cookie/2">erlang:set_cookie(node(), Cookie)</seealso>
+          <seealso marker="erts:erlang#erlang:set_cookie/2">erlang:set_cookie(node(), <anno>Cookie</anno>)</seealso>
           instead.</p>
       </desc>
     </func>
@@ -82,7 +79,7 @@
       <fsummary>Set the magic cookie for a node and verify authorization (deprecated)</fsummary>
       <type>
         <v>Node = node()</v>
-        <v>Cookie = atom()</v>
+        <v>Cookie = <seealso marker="#type-cookie">cookie()</seealso></v>
       </type>
       <desc>
         <p>Equivalent to
@@ -90,18 +87,14 @@
       </desc>
     </func>
     <func>
-      <name>node_cookie(Node, Cookie) -> yes | no</name>
+      <name name="node_cookie" arity="2"/>
       <fsummary>Set the magic cookie for a node and verify authorization (deprecated)</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Cookie = atom()</v>
-      </type>
       <desc>
-        <p>Sets the magic cookie of <c>Node</c> to <c>Cookie</c>, and
+        <p>Sets the magic cookie of <c><anno>Node</anno></c> to <c><anno>Cookie</anno></c>, and
           verifies the status of the authorization.
           Equivalent to calling
-          <seealso marker="erts:erlang#erlang:set_cookie/2">erlang:set_cookie(Node, Cookie)</seealso>, followed by
-          <seealso marker="#is_auth/1">auth:is_auth(Node)</seealso>.</p>
+          <seealso marker="erts:erlang#erlang:set_cookie/2">erlang:set_cookie(<anno>Node</anno>, <anno>Cookie</anno>)</seealso>, followed by
+          <seealso marker="#is_auth/1">auth:is_auth(<anno>Node</anno>)</seealso>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index 4b8f934df1..6f85388c22 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -286,6 +286,12 @@
     given to <c>set_path/1</c>.</p>
   </section>
 
+  <datatypes>
+    <datatype>
+      <name name="load_error_rsn"/>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
       <name>set_path(Path) -> true | {error, What}</name>
diff --git a/lib/kernel/doc/src/disk_log.xml b/lib/kernel/doc/src/disk_log.xml
index 324d4264cf..9721907162 100644
--- a/lib/kernel/doc/src/disk_log.xml
+++ b/lib/kernel/doc/src/disk_log.xml
@@ -179,13 +179,48 @@
         reopen the log simultaneously.</p>
     </note>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="log"/>
+    </datatype>
+    <datatype>
+      <name name="dlog_size"/>
+    </datatype>
+    <datatype>
+      <name name="dlog_format"/>
+    </datatype>
+    <datatype>
+      <name name="dlog_head_opt"/>
+    </datatype>
+    <datatype>
+      <name name="dlog_byte"/>
+    </datatype>
+    <datatype>
+      <name name="dlog_mode"/>
+    </datatype>
+    <datatype>
+      <name name="dlog_type"/>
+    </datatype>
+    <datatype>
+      <name name="continuation"/>
+      <desc><p>Chunk continuation returned by
+         <c>chunk/2,3</c>, <c>bchunk/2,3</c>, or <c>chunk_step/3</c>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="bytes"/>
+    </datatype>
+    <datatype>
+      <name name="invalid_header"/>
+    </datatype>
+    <datatype>
+      <name name="file_error"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>accessible_logs() -> {[LocalLog], [DistributedLog]}</name>
+      <name name="accessible_logs" arity="0"/>
       <fsummary>Return the accessible disk logs on the  current node.</fsummary>
-      <type>
-        <v>LocalLog = DistributedLog = term()</v>
-      </type>
       <desc>
         <p>The <c>accessible_logs/0</c> function returns
           the names of the disk logs accessible on the current node.
@@ -195,16 +230,13 @@
       </desc>
     </func>
     <func>
-      <name>alog(Log, Term)</name>
-      <name>balog(Log, Bytes) -> ok | {error, Reason}</name>
+      <name name="alog" arity="2"/>
+      <name name="balog" arity="2"/>
+      <type variable="Log"/>
+      <type variable="Term" name_i="1"/>
+      <type variable="Bytes"/>
+      <type name="notify_ret"/>
       <fsummary>Asynchronously log an item onto a disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>Term = term()</v>
-        <v>Bytes = binary() | [Byte]</v>
-        <v>Byte = [Byte] | 0 =&lt; integer() =&lt; 255</v>
-        <v>Reason = no_such_log</v>
-      </type>
       <desc>
         <p>The <c>alog/2</c> and <c>balog/2</c> functions asynchronously
           append an item to a disk log. The function <c>alog/2</c> is 
@@ -225,17 +257,13 @@
       </desc>
     </func>
     <func>
-      <name>alog_terms(Log, TermList)</name>
-      <name>balog_terms(Log, BytesList) -> ok | {error, Reason}</name>
+      <name name="alog_terms" arity="2"/>
+      <name name="balog_terms" arity="2"/>
       <fsummary>Asynchronously log several items onto a disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>TermList = [term()]</v>
-        <v>BytesList = [Bytes]</v>
-        <v>Bytes = binary() | [Byte]</v>
-        <v>Byte = [Byte] | 0 =&lt; integer() =&lt; 255</v>
-        <v>Reason = no_such_log</v>
-      </type>
+      <type variable="Log"/>
+      <type variable="TermList" name_i="1"/>
+      <type variable="ByteList"/>
+      <type name="notify_ret"/>
       <desc>
         <p>The <c>alog_terms/2</c> and <c>balog_terms/2</c> functions 
           asynchronously append a list of items to a disk log. 
@@ -257,14 +285,10 @@
       </desc>
     </func>
     <func>
-      <name>block(Log)</name>
-      <name>block(Log, QueueLogRecords) -> ok | {error, Reason}</name>
+      <name name="block" arity="1"/>
+      <name name="block" arity="2"/>
+      <type name="block_error_rsn"/>
       <fsummary>Block a disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>QueueLogRecords = bool()</v>
-        <v>Reason = no_such_log | nonode | {blocked_log, Log}</v>
-      </type>
       <desc>
         <p>With a call to <c>block/1,2</c> a process can block a log.
           If the blocking process is not an owner of the log, a temporary
@@ -280,52 +304,32 @@
           affected by the block. Any other attempt than those hitherto
           mentioned to update or read a blocked log suspends the
           calling process until the log is unblocked or returns an
-          error message <c>{blocked_log, Log}</c>, depending on
-          whether the value of <c>QueueLogRecords</c> is <c>true</c>
-          or <c>false</c>. The default value of <c>QueueLogRecords</c>
+          error message <c>{blocked_log, <anno>Log</anno>}</c>, depending on
+          whether the value of <c><anno>QueueLogRecords</anno></c> is <c>true</c>
+          or <c>false</c>. The default value of <c><anno>QueueLogRecords</anno></c>
           is <c>true</c>, which is used by <c>block/1</c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>change_header(Log, Header) -> ok | {error, Reason}</name>
+      <name name="change_header" arity="2"/>
       <fsummary>Change the head or head_func option for an owner of  a disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>Header = {head, Head} | {head_func, {M,F,A}}</v>
-        <v>Head = none | term() | binary() | [Byte]</v>
-        <v>Byte = [Byte] | 0 =&lt; integer() =&lt; 255</v>
-        <v>Reason = no_such_log | nonode | {read_only_mode, Log}  | {blocked_log, Log} | {badarg, head}</v>
-      </type>
       <desc>
         <p>The <c>change_header/2</c> function changes the value of 
           the <c>head</c> or <c>head_func</c> option of a disk log.</p>
       </desc>
     </func>
     <func>
-      <name>change_notify(Log, Owner, Notify) -> ok | {error, Reason}</name>
+      <name name="change_notify" arity="3"/>
       <fsummary>Change the notify option for an owner of a  disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>Owner = pid()</v>
-        <v>Notify = bool()</v>
-        <v>Reason = no_such_log | nonode | {blocked_log, Log} | {badarg, notify} | {not_owner, Owner}</v>
-      </type>
       <desc>
         <p>The <c>change_notify/3</c> function changes the value of the
           <c>notify</c> option for an owner of a disk log. </p>
       </desc>
     </func>
     <func>
-      <name>change_size(Log, Size) -> ok | {error, Reason}</name>
+      <name name="change_size" arity="2"/>
       <fsummary>Change the size of an open disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>Size = integer() > 0 | infinity | {MaxNoBytes, MaxNoFiles}</v>
-        <v>MaxNoBytes = integer() > 0</v>
-        <v>MaxNoFiles = integer() > 0</v>
-        <v>Reason = no_such_log | nonode | {read_only_mode, Log}  | {blocked_log, Log}  | {new_size_too_small, CurrentSize} | {badarg, size} | {file_error, FileName, FileError}</v>
-      </type>
       <desc>
         <p>The <c>change_size/2</c> function changes the size of an open log. 
           For a halt log it is always possible to increase the size, 
@@ -363,21 +367,17 @@
       </desc>
     </func>
     <func>
-      <name>chunk(Log, Continuation)</name>
-      <name>chunk(Log, Continuation, N) -> {Continuation2, Terms}  | {Continuation2, Terms, Badbytes} | eof | {error, Reason}</name>
-      <name>bchunk(Log, Continuation)</name>
-      <name>bchunk(Log, Continuation, N) -> {Continuation2, Binaries}  | {Continuation2, Binaries, Badbytes} | eof | {error, Reason}</name>
+      <name name="chunk" arity="2"/>
+      <name name="chunk" arity="3"/>
+      <name name="bchunk" arity="2"/>
+      <name name="bchunk" arity="3"/>
       <fsummary>Read a chunk of items written to a disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>Continuation = start | cont()</v>
-        <v>N = integer() > 0 | infinity</v>
-        <v>Continuation2 = cont()</v>
-        <v>Terms = [term()]</v>
-        <v>Badbytes = integer()</v>
-        <v>Reason = no_such_log | {format_external, Log}  | {blocked_log, Log} | {badarg, continuation} | {not_internal_wrap, Log} | {corrupt_log_file, FileName} | {file_error, FileName, FileError}</v>
-        <v>Binaries = [binary()]</v>
-      </type>
+      <type variable="Log"/>
+      <type variable="Continuation"/>
+      <type variable="N"/>
+      <type name="chunk_ret"/>
+      <type name="bchunk_ret"/>
+      <type name="chunk_error_rsn"/>
       <desc>
         <p>The <c>chunk/2,3</c> and <c>bchunk/2,3</c> functions make
           it possible to efficiently read the terms which have been
@@ -394,31 +394,31 @@
           individual distributed log on some other node is chosen, if
           such a log exists.
           </p>
-        <p>When <c>chunk/3</c> is called, <c>N</c> controls the
+        <p>When <c>chunk/3</c> is called, <c><anno>N</anno></c> controls the
           maximum number of terms that are read from the log in each
           chunk. Default is <c>infinity</c>, which means that all the
           terms contained in the 64 kilobyte chunk are read. If less than
-          <c>N</c> terms are returned, this does not necessarily mean
+          <c><anno>N</anno></c> terms are returned, this does not necessarily mean
           that the end of the file has been reached.
           </p>
         <p>The <c>chunk</c> function returns a tuple
-          <c>{Continuation2, Terms}</c>, where <c>Terms</c> is a list
-          of terms found in the log. <c>Continuation2</c> is yet
+          <c>{<anno>Continuation2</anno>, <anno>Terms</anno>}</c>, where <c><anno>Terms</anno></c> is a list
+          of terms found in the log. <c><anno>Continuation2</anno></c> is yet
           another continuation which must be passed on to any
           subsequent calls to <c>chunk</c>. With a series of calls to
           <c>chunk</c> it is possible to extract all terms from a log.
           </p>
         <p>The <c>chunk</c> function returns a tuple
-          <c>{Continuation2, Terms, Badbytes}</c> if the log is opened
-          in read-only mode and the read chunk is corrupt. <c>Badbytes</c> 
+          <c>{<anno>Continuation2</anno>, <anno>Terms</anno>, <anno>Badbytes</anno>}</c> if the log is opened
+          in read-only mode and the read chunk is corrupt. <c><anno>Badbytes</anno></c>
           is the number of bytes in the file which were found not to be
           Erlang terms in the chunk. Note also that the log is not repaired.
           When trying to read chunks from a log opened in read-write mode,
-          the tuple <c>{corrupt_log_file, FileName}</c> is returned if the
+          the tuple <c>{corrupt_log_file, <anno>FileName</anno>}</c> is returned if the
           read chunk is corrupt.
           </p>
         <p><c>chunk</c> returns <c>eof</c> when the end of the log is
-          reached, or <c>{error, Reason}</c> if an error occurs. Should
+          reached, or <c>{error, <anno>Reason</anno>}</c> if an error occurs. Should
           a wrap log file be missing, a message is output on the error log.
           </p>
         <p>When <c>chunk/2,3</c> is used with wrap logs, the returned
@@ -431,12 +431,8 @@
       </desc>
     </func>
     <func>
-      <name>chunk_info(Continuation) -> InfoList | {error, Reason}</name>
+      <name name="chunk_info" arity="1"/>
       <fsummary>Return information about a chunk continuation of  a disk log.</fsummary>
-      <type>
-        <v>Continuation = cont()</v>
-        <v>Reason = {no_continuation, Continuation}</v>
-      </type>
       <desc>
         <p>The <c>chunk_info/1</c> function returns the following pair
           describing the chunk continuation returned by
@@ -444,29 +440,22 @@
           </p>
         <list type="bulleted">
           <item>
-            <p><c>{node, Node}</c>. Terms are read from
-              the disk log running on <c>Node</c>.</p>
+            <p><c>{node, <anno>Node</anno>}</c>. Terms are read from
+              the disk log running on <c><anno>Node</anno></c>.</p>
           </item>
         </list>
       </desc>
     </func>
     <func>
-      <name>chunk_step(Log, Continuation, Step) -> {ok, Continuation2} | {error, Reason}</name>
+      <name name="chunk_step" arity="3"/>
       <fsummary>Step forward or backward among the wrap log files  of a disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>Continuation = start | cont()</v>
-        <v>Step = integer()</v>
-        <v>Continuation2 = cont()</v>
-        <v>Reason = no_such_log | end_of_log | {format_external, Log}  | {blocked_log, Log}  | {badarg, continuation}  | {file_error, FileName, FileError}</v>
-      </type>
       <desc>
         <p>The function <c>chunk_step</c> can be used in conjunction
           with <c>chunk/2,3</c> and <c>bchunk/2,3</c> to search
           through an internally formatted wrap log. It takes as
           argument a continuation as returned by <c>chunk/2,3</c>,
           <c>bchunk/2,3</c>, or <c>chunk_step/3</c>, and steps forward
-          (or backward) <c>Step</c> files in the wrap log. The
+          (or backward) <c><anno>Step</anno></c> files in the wrap log. The
           continuation returned points to the first log item in the
           new current file.
           </p>
@@ -482,11 +471,9 @@
       </desc>
     </func>
     <func>
-      <name>close(Log) -> ok | {error, Reason}</name>
+      <name name="close" arity="1"/>
       <fsummary>Close a disk log.</fsummary>
-      <type>
-        <v>Reason = no_such_log | nonode | {file_error, FileName, FileError}</v>
-      </type>
+      <type name="close_error_rsn"/>
       <desc>
         <p>          <marker id="close_1"></marker>
 The function <c>close/1</c> closes a
@@ -511,11 +498,8 @@ The function <c>close/1</c> closes a
       </desc>
     </func>
     <func>
-      <name>format_error(Error) -> Chars</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Return an English description of a disk log  error reply.</fsummary>
-      <type>
-        <v>Chars = [char() | Chars]</v>
-      </type>
       <desc>
         <p>Given the error returned by any function in this module, 
           the function <c>format_error</c> returns a descriptive string
@@ -524,11 +508,10 @@ The function <c>close/1</c> closes a
       </desc>
     </func>
     <func>
-      <name>inc_wrap_file(Log) -> ok | {error, Reason}</name>
+      <name name="inc_wrap_file" arity="1"/>
       <fsummary>Change to the next wrap log file of a disk log.</fsummary>
-      <type>
-        <v>Reason = no_such_log | nonode | {read_only_mode, Log}  | {blocked_log, Log}  | {halt_log, Log} | {invalid_header, InvalidHeader}  | {file_error, FileName, FileError}</v>
-      </type>
+      <type name="inc_wrap_error_rsn"/>
+      <type name="invalid_header"/>
       <desc>
         <p>The <c>inc_wrap_file/1</c> function forces the internally formatted 
           disk log to start logging to the 
@@ -543,8 +526,9 @@ The function <c>close/1</c> closes a
       </desc>
     </func>
     <func>
-      <name>info(Log) -> InfoList | {error, no_such_log}</name>
+      <name name="info" arity="1"/>
       <fsummary>Return information about a disk log.</fsummary>
+      <type name="dlog_info"/>
       <desc>
         <p>The <c>info/1</c> function returns a list of <c>{Tag, Value}</c> 
           pairs describing the log. If there is a disk log process running
@@ -556,55 +540,55 @@ The function <c>close/1</c> closes a
           </p>
         <list type="bulleted">
           <item>
-            <p><c>{name, Log}</c>, where <c>Log</c> is the name of
+            <p><c>{name, <anno>Log</anno>}</c>, where <c><anno>Log</anno></c> is the name of
               the log as given by the <c>open/1</c> option <c>name</c>.</p>
           </item>
           <item>
-            <p><c>{file, File}</c>. For halt logs <c>File</c> is the
-              filename, and for wrap logs <c>File</c> is the base name.</p>
+            <p><c>{file, <anno>File</anno>}</c>. For halt logs <c><anno>File</anno></c> is the
+              filename, and for wrap logs <c><anno>File</anno></c> is the base name.</p>
           </item>
           <item>
-            <p><c>{type, Type}</c>, where <c>Type</c> is the type of
+            <p><c>{type, <anno>Type</anno>}</c>, where <c><anno>Type</anno></c> is the type of
               the log as given by the <c>open/1</c> option <c>type</c>.</p>
           </item>
           <item>
-            <p><c>{format, Format}</c>, where <c>Format</c> is the format
+            <p><c>{format, <anno>Format</anno>}</c>, where <c><anno>Format</anno></c> is the format
               of the log as given by the <c>open/1</c> option <c>format</c>.</p>
           </item>
           <item>
-            <p><c>{size, Size}</c>, where <c>Size</c> is the size
+            <p><c>{size, <anno>Size</anno>}</c>, where <c><anno>Size</anno></c> is the size
               of the log as given by the <c>open/1</c> option <c>size</c>,
               or the size set by <c>change_size/2</c>. The value set by 
               <c>change_size/2</c> is reflected immediately.</p>
           </item>
           <item>
-            <p><c>{mode, Mode}</c>, where <c>Mode</c> is the mode
+            <p><c>{mode, <anno>Mode</anno>}</c>, where <c><anno>Mode</anno></c> is the mode
               of the log as given by the <c>open/1</c> option <c>mode</c>.</p>
           </item>
           <item>
-            <p><c>{owners, [{pid(), Notify}]}</c> where <c>Notify</c>
+            <p><c>{owners, [{pid(), <anno>Notify</anno>}]}</c> where <c><anno>Notify</anno></c>
               is the value set by the <c>open/1</c> option <c>notify</c>
               or the function <c>change_notify/3</c> for the owners of 
               the log.</p>
           </item>
           <item>
-            <p><c>{users, Users}</c> where <c>Users</c> is the number
+            <p><c>{users, <anno>Users</anno>}</c> where <c><anno>Users</anno></c> is the number
               of anonymous users of the log, see the <c>open/1</c> option
               <seealso marker="#linkto">linkto</seealso>.</p>
           </item>
           <item>
-            <p><c>{status, Status}</c>, where <c>Status</c> is <c>ok</c>
-              or <c>{blocked, QueueLogRecords}</c> as set by the functions
+            <p><c>{status, <anno>Status</anno>}</c>, where <c><anno>Status</anno></c> is <c>ok</c>
+              or <c>{blocked, <anno>QueueLogRecords</anno>}</c> as set by the functions
               <c>block/1,2</c> and <c>unblock/1</c>.</p>
           </item>
           <item>
-            <p><c>{node, Node}</c>. The information returned by the
+            <p><c>{node, <anno>Node</anno>}</c>. The information returned by the
               current invocation of the <c>info/1</c> function has been
-              gathered from the disk log process running on <c>Node</c>.</p>
+              gathered from the disk log process running on <c><anno>Node</anno></c>.</p>
           </item>
           <item>
-            <p><c>{distributed, Dist}</c>. If the log is local on 
-              the current node, then <c>Dist</c> has the value <c>local</c>,
+            <p><c>{distributed, <anno>Dist</anno>}</c>. If the log is local on
+              the current node, then <c><anno>Dist</anno></c> has the value <c>local</c>,
               otherwise all nodes where the log is distributed
               are returned as a list.</p>
           </item>
@@ -614,16 +598,16 @@ The function <c>close/1</c> closes a
           </p>
         <list type="bulleted">
           <item>
-            <p><c>{head, Head}</c>. Depending of the value of
+            <p><c>{head, <anno>Head</anno>}</c>. Depending of the value of
               the <c>open/1</c> options <c>head</c> and <c>head_func</c>
               or set by the function <c>change_header/2</c>, the value
-              of <c>Head</c> is <c>none</c> (default), 
+              of <c><anno>Head</anno></c> is <c>none</c> (default),
               <c>{head, H}</c> (<c>head</c> option) or <c>{M,F,A}</c> 
               (<c>head_func</c> option).</p>
           </item>
           <item>
-            <p><c>{no_written_items, NoWrittenItems}</c>, where
-              <c>NoWrittenItems</c> is the number of items 
+            <p><c>{no_written_items, <anno>NoWrittenItems</anno>}</c>, where
+              <c><anno>NoWrittenItems</anno></c> is the number of items
               written to the log since the disk log process was created.</p>
           </item>
         </list>
@@ -632,7 +616,7 @@ The function <c>close/1</c> closes a
           </p>
         <list type="bulleted">
           <item>
-            <p><c>{full, Full}</c>, where <c>Full</c> is <c>true</c> or
+            <p><c>{full, <anno>Full</anno>}</c>, where <c><anno>Full</anno></c> is <c>true</c> or
               <c>false</c> depending on whether the halt log is full or not.</p>
           </item>
         </list>
@@ -660,8 +644,8 @@ The function <c>close/1</c> closes a
               <c>size</c> or set by <c>change_size/2</c>.</p>
           </item>
           <item>
-            <p><c>{no_overflows, {SinceLogWasOpened, SinceLastInfo}}</c>,
-              where <c>SinceLogWasOpened</c> (<c>SinceLastInfo</c>) is 
+            <p><c>{no_overflows, {<anno>SinceLogWasOpened</anno>, <anno>SinceLastInfo</anno>}}</c>,
+              where <c><anno>SinceLogWasOpened</anno></c> (<c><anno>SinceLastInfo</anno></c>) is
               the number of times a wrap log file has been filled up and a 
               new one opened or <c>inc_wrap_file/1</c> has been called since 
               the disk log was last opened (<c>info/1</c> 
@@ -677,21 +661,18 @@ The function <c>close/1</c> closes a
       </desc>
     </func>
     <func>
-      <name>lclose(Log)</name>
-      <name>lclose(Log, Node) -> ok | {error, Reason}</name>
+      <name name="lclose" arity="1"/>
+      <name name="lclose" arity="2"/>
+      <type name="lclose_error_rsn"/>
       <fsummary>Close a disk log on one node.</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Reason = no_such_log | {file_error, FileName, FileError}</v>
-      </type>
       <desc>
         <p>The function <c>lclose/1</c> closes a local log or an
           individual distributed log on the current node.
           The function <c>lclose/2</c> closes an individual
           distributed log on the specified node if the node
           is not the current one.
-          <c>lclose(Log)</c> is equivalent to
-          <c>lclose(Log,&nbsp;node())</c>. 
+          <c>lclose(<anno>Log</anno>)</c> is equivalent to
+          <c>lclose(<anno>Log</anno>,&nbsp;node())</c>.
           See also <seealso marker="#close_1">close/1</seealso>.
           </p>
         <p>If there is no log with the given name
@@ -700,20 +681,17 @@ The function <c>close/1</c> closes a
       </desc>
     </func>
     <func>
-      <name>log(Log, Term)</name>
-      <name>blog(Log, Bytes) -> ok | {error, Reason}</name>
+      <name name="log" arity="2"/>
+      <name name="blog" arity="2"/>
       <fsummary>Log an item onto a disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>Term = term()</v>
-        <v>Bytes = binary() | [Byte]</v>
-        <v>Byte = [Byte] | 0 =&lt; integer() =&lt; 255</v>
-        <v>Reason = no_such_log | nonode | {read_only_mode, Log}  | {format_external, Log}  | {blocked_log, Log} | {full, Log}  | {invalid_header, InvalidHeader}  | {file_error, FileName, FileError}</v>
-      </type>
+      <type variable="Log"/>
+      <type variable="Term" name_i="1"/>
+      <type variable="Bytes"/>
+      <type name="log_error_rsn"/>
       <desc>
         <p>The <c>log/2</c> and <c>blog/2</c> functions synchronously
           append a term to a disk log. They return <c>ok</c> or
-          <c>{error, Reason}</c> when the term has been written to
+          <c>{error, <anno>Reason</anno>}</c> when the term has been written to
           disk. If the log is distributed, <c>ok</c> is always
           returned, unless all nodes are down. Terms are written by
           means of the ordinary <c>write()</c> function of the
@@ -736,17 +714,13 @@ The function <c>close/1</c> closes a
       </desc>
     </func>
     <func>
-      <name>log_terms(Log, TermList)</name>
-      <name>blog_terms(Log, BytesList) -> ok | {error, Reason}</name>
+      <name name="log_terms" arity="2"/>
+      <name name="blog_terms" arity="2"/>
       <fsummary>Log several items onto a disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>TermList = [term()]</v>
-        <v>BytesList = [Bytes]</v>
-        <v>Bytes = binary() | [Byte]</v>
-        <v>Byte = [Byte] | 0 =&lt; integer() =&lt; 255</v>
-        <v>Reason = no_such_log | nonode | {read_only_mode, Log}  | {format_external, Log}  | {blocked_log, Log} | {full, Log}  | {invalid_header, InvalidHeader}  | {file_error, FileName, FileError}</v>
-      </type>
+      <type variable="Log"/>
+      <type variable="TermList" name_i="1"/>
+      <type variable="BytesList"/>
+      <type name="log_error_rsn"/>
       <desc>
         <p>The <c>log_terms/2</c> and <c>blog_terms/2</c> functions
           synchronously append a list of items to the log. The benefit
@@ -769,47 +743,33 @@ The function <c>close/1</c> closes a
       </desc>
     </func>
     <func>
-      <name>open(ArgL) -> OpenRet | DistOpenRet</name>
+      <name name="open" arity="1"/>
+      <type name="dlog_options"/>
+      <type name="dlog_option"/>
+      <type name="open_ret"/>
+      <type name="ret"/>
+      <type name="dist_open_ret"/>
+      <type name="dist_error_rsn"/>
+      <type name="open_error_rsn"/>
+      <type name="dlog_optattr"/>
+      <type name="dlog_size"/>
       <fsummary>Open a disk log file.</fsummary>
-      <type>
-        <v>ArgL = [Opt]</v>
-        <v>Opt = {name, term()} | {file, FileName}, {linkto, LinkTo}  | {repair, Repair} | {type, Type} | {format, Format} | {size, Size}  | {distributed, [Node]} | {notify, bool()} | {head, Head}  | {head_func, {M,F,A}} | {mode, Mode}</v>
-        <v>FileName = string() | atom()</v>
-        <v>LinkTo = pid() | none</v>
-        <v>Repair = true | false | truncate</v>
-        <v>Type = halt | wrap</v>
-        <v>Format = internal | external</v>
-        <v>Size = integer() > 0 | infinity | {MaxNoBytes, MaxNoFiles}</v>
-        <v>MaxNoBytes = integer() > 0</v>
-        <v>MaxNoFiles = 0 &lt; integer() &lt; 65000</v>
-        <v>Rec = integer()</v>
-        <v>Bad = integer()</v>
-        <v>Head = none | term() | binary() | [Byte]</v>
-        <v>Byte = [Byte] | 0 =&lt; integer() =&lt; 255</v>
-        <v>Mode = read_write | read_only</v>
-        <v>OpenRet = Ret | {error, Reason}</v>
-        <v>DistOpenRet = {[{Node, Ret}], [{BadNode, {error, DistReason}}]}</v>
-        <v>Node = BadNode = atom()</v>
-        <v>Ret = {ok, Log}  | {repaired, Log, {recovered, Rec}, {badbytes, Bad}}</v>
-        <v>DistReason = nodedown | Reason</v>
-        <v>Reason = no_such_log | {badarg, Arg} | {size_mismatch, CurrentSize, NewSize}  | {arg_mismatch, OptionName, CurrentValue, Value}  | {name_already_open, Log} | {open_read_write, Log} | {open_read_only, Log} | {need_repair, Log} | {not_a_log_file, FileName} | {invalid_index_file, FileName} | {invalid_header, InvalidHeader}  | {file_error, FileName, FileError} | {node_already_open, Log}</v>
-      </type>
       <desc>
-        <p>The <c>ArgL</c> parameter is a list of options which have
+        <p>The <c><anno>ArgL</anno></c> parameter is a list of options which have
           the following meanings:</p>
         <list type="bulleted">
           <item>
-            <p><c>{name, Log}</c> specifies the name of the log.
+            <p><c>{name, <anno>Log</anno>}</c> specifies the name of the log.
               This is the name which must be passed on as a parameter in
               all subsequent logging operations. A name must always
               be supplied.
               </p>
           </item>
           <item>
-            <p><c>{file, FileName}</c> specifies the name of the
+            <p><c>{file, <anno>FileName</anno>}</c> specifies the name of the
               file which will be used for logged terms. If this value is
               omitted and the name of the log is either an atom or a string, 
-              the file name will default to <c>lists:concat([Log, ".LOG"])</c> for halt logs. For wrap logs, this will be
+              the file name will default to <c>lists:concat([<anno>Log</anno>, ".LOG"])</c> for halt logs. For wrap logs, this will be
               the base name of the files. Each file in a wrap log
               will be called <c><![CDATA[<base_name>.N]]></c>, where <c>N</c> is an
               integer. Each wrap log will also have two files called
@@ -817,22 +777,22 @@ The function <c>close/1</c> closes a
               </p>
           </item>
           <item>
-            <p><c>{linkto, LinkTo}</c>.               <marker id="linkto"></marker>
+            <p><c>{linkto, <anno>LinkTo</anno>}</c>.               <marker id="linkto"></marker>
 If
-              <c>LinkTo</c> is a pid, that pid becomes an owner of the
-              log. If <c>LinkTo</c> is <c>none</c> the log records
+              <c><anno>LinkTo</anno></c> is a pid, that pid becomes an owner of the
+              log. If <c><anno>LinkTo</anno></c> is <c>none</c> the log records
               that it is used anonymously by some process by
               incrementing the <c>users</c> counter. By default, the
               process which calls <c>open/1</c> owns the log.
               </p>
           </item>
           <item>
-            <p><c>{repair, Repair}</c>. If <c>Repair</c> is <c>true</c>,
+            <p><c>{repair, <anno>Repair</anno>}</c>. If <c><anno>Repair</anno></c> is <c>true</c>,
               the current log file will be repaired, if needed. As the
               restoration is initiated, a message is output on the error log.
               If <c>false</c> is given,
               no automatic repair will be attempted. Instead, the
-              tuple <c>{error, {need_repair, Log}}</c> is returned if an
+              tuple <c>{error, {need_repair, <anno>Log</anno>}}</c> is returned if an
               attempt is made to open a corrupt log file. 
               If <c>truncate</c> is given, the log file will
               be truncated, creating an empty log. Default is 
@@ -841,41 +801,41 @@ If
               </p>
           </item>
           <item>
-            <p><c>{type, Type}</c> is the type of the log. Default
+            <p><c>{type, <anno>Type</anno>}</c> is the type of the log. Default
               is <c>halt</c>.
               </p>
           </item>
           <item>
-            <p><c>{format, Format}</c> specifies the format of the
+            <p><c>{format, <anno>Format</anno>}</c> specifies the format of the
               disk log. Default is <c>internal</c>. 
               </p>
           </item>
           <item>
-            <p><c>{size, Size}</c> specifies the size of the log.
+            <p><c>{size, <anno>Size</anno>}</c> specifies the size of the log.
               When a halt log has reached its maximum size, all attempts to 
               log more items are rejected. The default size is 
               <c>infinity</c>, which for halt implies that there is no
-              maximum size. For wrap logs, the <c>Size</c> parameter 
+              maximum size. For wrap logs, the <c><anno>Size</anno></c> parameter
               may be either a pair
-              <c>{MaxNoBytes, MaxNoFiles}</c> or <c>infinity</c>. In the
+              <c>{<anno>MaxNoBytes</anno>, <anno>MaxNoFiles</anno>}</c> or <c>infinity</c>. In the
               latter case, if the files of an already existing wrap log
               with the same name can be found, the size is read
               from the existing wrap log, otherwise an error is returned. 
-              Wrap logs write at most <c>MaxNoBytes</c> bytes on each file 
-              and use <c>MaxNoFiles</c> files before starting all over with
-              the first wrap log file. Regardless of <c>MaxNoBytes</c>,
+              Wrap logs write at most <c><anno>MaxNoBytes</anno></c> bytes on each file
+              and use <c><anno>MaxNoFiles</anno></c> files before starting all over with
+              the first wrap log file. Regardless of <c><anno>MaxNoBytes</anno></c>,
               at least the header (if there is one) and one
               item is written on each wrap log file before
               wrapping to the next file.
               When opening an existing wrap log, it is not
               necessary to supply a value for the option <c>Size</c>, but any
               supplied value must equal the current size of the log, otherwise
-              the tuple <c>{error, {size_mismatch, CurrentSize, NewSize}}</c>
+              the tuple <c>{error, {size_mismatch, <anno>CurrentSize</anno>, <anno>NewSize</anno>}}</c>
               is returned.
               </p>
           </item>
           <item>
-            <p><c>{distributed, Nodes}</c>. This option can be used for
+            <p><c>{distributed, <anno>Nodes</anno>}</c>. This option can be used for
               adding members to a distributed disk log. The
               default value is <c>[]</c>, which means that
               the log is local on the current node.
@@ -946,10 +906,10 @@ If
             </list>
           </item>
           <item>
-            <p><c>{head, Head}</c> specifies a header to be
+            <p><c>{head, <anno>Head</anno>}</c> specifies a header to be
               written first on the log file. If the log is a wrap
-              log, the item <c>Head</c> is written first in each new file.
-              <c>Head</c> should be a term if the format is
+              log, the item <c><anno>Head</anno></c> is written first in each new file.
+              <c><anno>Head</anno></c> should be a term if the format is
               <c>internal</c>, and a deep list of bytes (or a binary)
               otherwise. Default is <c>none</c>, which means that
               no header is written first on the file.
@@ -966,17 +926,17 @@ If
               </p>
           </item>
           <item>
-            <p><c>{mode, Mode}</c> specifies if the log is to be 
+            <p><c>{mode, <anno>Mode</anno>}</c> specifies if the log is to be
               opened in read-only or read-write mode. It defaults to
               <c>read_write</c>.
               </p>
           </item>
         </list>
-        <p>The <c>open/1</c> function returns <c>{ok, Log}</c> if the
+        <p>The <c>open/1</c> function returns <c>{ok, <anno>Log</anno>}</c> if the
           log file was successfully opened. If the file was
-          successfully repaired, the tuple <c>{repaired, Log, {recovered, Rec}, {badbytes, Bad}}</c> is returned, where
-          <c>Rec</c> is the number of whole Erlang terms found in the
-          file and <c>Bad</c> is the number of bytes in the file which
+          successfully repaired, the tuple <c>{repaired, <anno>Log</anno>, {recovered, <anno>Rec</anno>}, {badbytes, <anno>Bad</anno>}}</c> is returned, where
+          <c><anno>Rec</anno></c> is the number of whole Erlang terms found in the
+          file and <c><anno>Bad</anno></c> is the number of bytes in the file which
           were non-Erlang terms. If the <c>distributed</c> parameter
           was given, <c>open/1</c> returns a list of
           successful replies and a list of erroneous replies. Each
@@ -988,7 +948,7 @@ If
           position after the last logged item, and the logging of items
           will commence from there. If the format is <c>internal</c>
           and the existing file is not recognized as an internally
-          formatted log, a tuple <c>{error, {not_a_log_file, FileName}}</c>
+          formatted log, a tuple <c>{error, {not_a_log_file, <anno>FileName</anno>}}</c>
           is returned.
           </p>
         <p>The <c>open/1</c> function cannot be used for changing the
@@ -1000,15 +960,15 @@ If
           or <c>change_size/2</c>. As a consequence,
           none of the options except <c>name</c> is mandatory. If some
           given value differs from the current value, a tuple
-          <c>{error, {arg_mismatch, OptionName, CurrentValue, Value}}</c> 
+          <c>{error, {arg_mismatch, <anno>OptionName</anno>, <anno>CurrentValue</anno>, <anno>Value</anno>}}</c>
           is returned. Caution: an owner's attempt to open a log 
           as owner once again is acknowledged with the return value 
-          <c>{ok, Log}</c>, but the state of the disk log is not 
+          <c>{ok, <anno>Log</anno>}</c>, but the state of the disk log is not
           affected in any way.
           </p>
         <p>If a log with a given name is local on some node,
           and one tries to open the log distributed on the same node,
-          then the tuple <c>{error, {node_already_open, Name}}</c> is
+          then the tuple <c>{error, {node_already_open, <anno>Log</anno>}}</c> is
           returned. The same tuple is returned if the log is distributed on
           some node, and one tries to open the log locally on the same node.
           Opening individual distributed disk logs for the first time
@@ -1036,12 +996,8 @@ If
       </desc>
     </func>
     <func>
-      <name>pid2name(Pid) -> {ok, Log} | undefined</name>
+      <name name="pid2name" arity="1"/>
       <fsummary>Return the name of the disk log handled by a pid.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>Pid = pid()</v>
-      </type>
       <desc>
         <p>The <c>pid2name/1</c> function returns the name of the log
           given the pid of a disk log process on the current node, or
@@ -1052,26 +1008,23 @@ If
       </desc>
     </func>
     <func>
-      <name>reopen(Log, File)</name>
-      <name>reopen(Log, File, Head)</name>
-      <name>breopen(Log, File, BHead) -> ok | {error, Reason}</name>
+      <name name="reopen" arity="2"/>
+      <name name="reopen" arity="3"/>
+      <name name="breopen" arity="3"/>
       <fsummary>Reopen a disk log and save the old log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>File = string()</v>
-        <v>Head = term()</v>
-        <v>BHead = binary() | [Byte]</v>
-        <v>Byte = [Byte] | 0 =&lt; integer() =&lt; 255</v>
-        <v>Reason = no_such_log | nonode | {read_only_mode, Log}  | {blocked_log, Log}  | {same_file_name, Log} | {invalid_index_file, FileName} | {invalid_header, InvalidHeader}  | {file_error, FileName, FileError}</v>
-      </type>
+      <type variable="Log"/>
+      <type variable="File" name_i="1"/>
+      <type variable="Head" name_i="2"/>
+      <type variable="BHead"/>
+      <type name="reopen_error_rsn"/>
       <desc>
         <p>The <c>reopen</c> functions first rename the log file 
-          to <c>File</c> and then re-create a new log file.
-          In case of a wrap log, <c>File</c> is used as the base name
+          to <c><anno>File</anno></c> and then re-create a new log file.
+          In case of a wrap log, <c><anno>File</anno></c> is used as the base name
           of the renamed files.
           By default the header given to <c>open/1</c> is written first in
-          the newly opened log file, but if the <c>Head</c> or the 
-          <c>BHead</c> argument is given, this item is used instead.
+          the newly opened log file, but if the <c><anno>Head</anno></c> or the
+          <c><anno>BHead</anno></c> argument is given, this item is used instead.
           The header argument is used once only; next time a wrap log file
           is opened, the header given to <c>open/1</c> is used.
           </p>
@@ -1089,12 +1042,9 @@ If
       </desc>
     </func>
     <func>
-      <name>sync(Log) -> ok | {error, Reason}</name>
+      <name name="sync" arity="1"/>
+      <type name="sync_error_rsn"/>
       <fsummary>Flush the contents of a disk log to the disk.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>Reason = no_such_log | nonode  | {read_only_mode, Log} | {blocked_log, Log} | {file_error, FileName, FileError}</v>
-      </type>
       <desc>
         <p>The <c>sync/1</c> function ensures that the contents of the 
           log are actually written to the disk. 
@@ -1103,20 +1053,17 @@ If
       </desc>
     </func>
     <func>
-      <name>truncate(Log)</name>
-      <name>truncate(Log, Head)</name>
-      <name>btruncate(Log, BHead) -> ok | {error, Reason}</name>
+      <name name="truncate" arity="1"/>
+      <name name="truncate" arity="2"/>
+      <name name="btruncate" arity="2"/>
       <fsummary>Truncate a disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>Head = term()</v>
-        <v>BHead = binary() | [Byte]</v>
-        <v>Byte = [Byte] | 0 =&lt; integer() =&lt; 255</v>
-        <v>Reason = no_such_log | nonode | {read_only_mode, Log}  | {blocked_log, Log}  | {invalid_header, InvalidHeader}  | {file_error, FileName, FileError}</v>
-      </type>
+      <type variable="Log"/>
+      <type variable="Head" name_i="2"/>
+      <type variable="BHead"/>
+      <type name="trunc_error_rsn"/>
       <desc>
         <p>The <c>truncate</c> functions remove all items from a disk log.
-          If the <c>Head</c> or the <c>BHead</c> argument is
+          If the <c><anno>Head</anno></c> or the <c><anno>BHead</anno></c> argument is
           given, this item is written first in the newly truncated
           log, otherwise the header given to <c>open/1</c> is used.
           The header argument is only used once; next time a wrap log file 
@@ -1138,12 +1085,9 @@ If
       </desc>
     </func>
     <func>
-      <name>unblock(Log) -> ok | {error, Reason}</name>
+      <name name="unblock" arity="1"/>
+      <type name="unblock_error_rsn"/>
       <fsummary>Unblock a disk log.</fsummary>
-      <type>
-        <v>Log = term()</v>
-        <v>Reason = no_such_log | nonode | {not_blocked, Log}  | {not_blocked_by_pid, Log}</v>
-      </type>
       <desc>
         <p>The <c>unblock/1</c> function unblocks a log. 
           A log can only be unblocked by the blocking process.
@@ -1159,4 +1103,3 @@ If
       <seealso marker="wrap_log_reader">wrap_log_reader(3)</seealso></p>
   </section>
 </erlref>
-
diff --git a/lib/kernel/doc/src/erl_boot_server.xml b/lib/kernel/doc/src/erl_boot_server.xml
index 4e7533810e..472671a80e 100644
--- a/lib/kernel/doc/src/erl_boot_server.xml
+++ b/lib/kernel/doc/src/erl_boot_server.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -49,29 +49,17 @@
   </description>
   <funcs>
     <func>
-      <name>start(Slaves) -> {ok, Pid} | {error, What}</name>
+      <name name="start" arity="1"/>
       <fsummary>Start the boot server</fsummary>
-      <type>
-        <v>Slaves = [Host]</v>
-        <v>Host = atom()</v>
-        <v>Pid = pid()</v>
-        <v>What = term()</v>
-      </type>
       <desc>
-        <p>Starts the boot server. <c>Slaves</c> is a list of IP
+        <p>Starts the boot server. <c><anno>Slaves</anno></c> is a list of IP
           addresses for hosts which are allowed to use this server as a
           boot server.</p>
       </desc>
     </func>
     <func>
-      <name>start_link(Slaves) -> {ok, Pid} | {error, What}</name>
+      <name name="start_link" arity="1"/>
       <fsummary>Start the boot server and links the caller</fsummary>
-      <type>
-        <v>Slaves = [Host]</v>
-        <v>Host = atom()</v>
-        <v>Pid = pid()</v>
-        <v>What = term()()</v>
-      </type>
       <desc>
         <p>Starts the boot server and links to the caller. This function
           is used to start the server if it is included in a supervision
@@ -79,37 +67,23 @@
       </desc>
     </func>
     <func>
-      <name>add_slave(Slave) -> ok | {error, What}</name>
+      <name name="add_slave" arity="1"/>
       <fsummary>Add a slave to the list of allowed slaves</fsummary>
-      <type>
-        <v>Slave = Host</v>
-        <v>Host = atom()</v>
-        <v>What = term()</v>
-      </type>
       <desc>
-        <p>Adds a <c>Slave</c> node to the list of allowed slave hosts.</p>
+        <p>Adds a <c><anno>Slave</anno></c> node to the list of allowed slave hosts.</p>
       </desc>
     </func>
     <func>
-      <name>delete_slave(Slave) -> ok | {error, What}</name>
+      <name name="delete_slave" arity="1"/>
       <fsummary>Delete a slave from the list of allowed slaves</fsummary>
-      <type>
-        <v>Slave = Host</v>
-        <v>Host = atom()</v>
-        <v>What = void()</v>
-      </type>
       <desc>
-        <p>Deletes a <c>Slave</c> node from the list of allowed slave
+        <p>Deletes a <c><anno>Slave</anno></c> node from the list of allowed slave
           hosts.</p>
       </desc>
     </func>
     <func>
-      <name>which_slaves() -> Slaves</name>
+      <name name="which_slaves" arity="0"/>
       <fsummary>Return the current list of allowed slave hosts</fsummary>
-      <type>
-        <v>Slaves = [Host]</v>
-        <v>Host = atom()</v>
-      </type>
       <desc>
         <p>Returns the current list of allowed slave hosts.</p>
       </desc>
diff --git a/lib/kernel/doc/src/erl_ddll.xml b/lib/kernel/doc/src/erl_ddll.xml
index 9a62b45d63..f9514dda2f 100644
--- a/lib/kernel/doc/src/erl_ddll.xml
+++ b/lib/kernel/doc/src/erl_ddll.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -172,6 +172,14 @@
       </item>
     </taglist>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="driver"/>
+    </datatype>
+    <datatype>
+      <name name="path"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
       <name>demonitor(MonitorRef) -> ok</name>
@@ -189,37 +197,21 @@
       </desc>
     </func>
     <func>
-      <name>info() -> AllInfoList</name>
+      <name name="info" arity="0"/>
       <fsummary>Retrieve information about all drivers</fsummary>
-      <type>
-        <v>AllInfoList = [ DriverInfo ]</v>
-        <v>DriverInfo = {DriverName, InfoList}</v>
-        <v>DriverName = string()</v>
-        <v>InfoList = [ InfoItem ]</v>
-        <v>InfoItem = {Tag, Value}</v>
-        <v>Tag = atom()</v>
-        <v>Value = term()</v>
-      </type>
       <desc>
-        <p>Returns a list of tuples <c>{DriverName, InfoList}</c>, where
-          <c>InfoList</c> is the result of calling <seealso marker="#info/1">info/1</seealso> for that
-          <c>DriverName</c>. Only dynamically linked in drivers are
+        <p>Returns a list of tuples <c>{<anno>DriverName</anno>, <anno>InfoList</anno>}</c>, where
+          <c><anno>InfoList</anno></c> is the result of calling <seealso marker="#info/1">info/1</seealso> for that
+          <c><anno>DriverName</anno></c>. Only dynamically linked in drivers are
           included in the list.</p>
       </desc>
     </func>
     <func>
-      <name>info(Name) -> InfoList</name>
+      <name name="info" arity="1"/>
       <fsummary>Retrieve information about one driver</fsummary>
-      <type>
-        <v>Name = string() | atom()</v>
-        <v>InfoList = [ InfoItem ]</v>
-        <v>InfoItem = {Tag, Value}</v>
-        <v>Tag = atom()</v>
-        <v>Value = term()</v>
-      </type>
       <desc>
-        <p>Returns a list of tuples <c>{Tag, Value}</c>, where
-          <c>Tag</c> is the information item and <c>Value</c> is the result
+        <p>Returns a list of tuples <c>{<anno>Tag</anno>, <anno>Value</anno>}</c>, where
+          <c><anno>Tag</anno></c> is the information item and <c><anno>Value</anno></c> is the result
           of calling <seealso marker="#info/2">info/2</seealso> with this driver name and
           this tag. The result being a tuple list containing all
           information available about a driver. </p>
@@ -305,22 +297,18 @@
       </desc>
     </func>
     <func>
-      <name>load(Path, Name) -> ok | {error, ErrorDesc}</name>
+      <name name="load" arity="2"/>
       <fsummary>Load a driver</fsummary>
-      <type>
-        <v>Path = Name = string() | atom()</v>
-        <v>ErrorDesc = term()</v>
-      </type>
       <desc>
-        <p>Loads and links the dynamic driver <c>Name</c>. <c>Path</c>
+        <p>Loads and links the dynamic driver <c><anno>Name</anno></c>. <c><anno>Path</anno></c>
           is a file path to the directory containing the driver.
-          <c>Name</c> must be a sharable object/dynamic library. Two
-          drivers with different <c>Path</c> parameters cannot be
-          loaded under the same name. The <c>Name</c> is a string or
+          <c><anno>Name</anno></c> must be a sharable object/dynamic library. Two
+          drivers with different <c><anno>Path</anno></c> parameters cannot be
+          loaded under the same name. The <c><anno>Name</anno></c> is a string or
           atom containing at least one character.</p>
-        <p>The <c>Name</c> given should correspond to the filename
+        <p>The <c><anno>Name</anno></c> given should correspond to the filename
           of the actual dynamically loadable object file residing in
-          the directory given as <c>Path</c>, but <em>without</em> the
+          the directory given as <c><anno>Path</anno></c>, but <em>without</em> the
           extension (i.e. <c>.so</c>). The driver name provided in
           the driver initialization routine must correspond with the
           filename, in much the same way as erlang module names
@@ -328,14 +316,14 @@
         <p>If the driver has been previously unloaded, but is still
           present due to open ports against it, a call to
           <c>load/2</c> will stop the unloading and keep the driver
-          (as long as the <c>Path</c> is the same) and <c>ok</c> is
+          (as long as the <c><anno>Path</anno></c> is the same) and <c>ok</c> is
           returned. If one actually wants the object code to be
           reloaded, one uses <seealso marker="#reload/2">reload/2</seealso> or the low-level
           interface <seealso marker="#try_load/3">try_load/3</seealso>
           instead. Please refer to the description of <seealso marker="#scenarios">different scenarios</seealso> for
           loading/unloading in the introduction.</p>
         <p>If more than one process tries to load an already loaded
-          driver withe the same <c>Path</c>, or if the same process
+          driver withe the same <c><anno>Path</anno></c>, or if the same process
           tries to load it several times, the function will return
           <c>ok</c>.  The emulator will keep track of the
           <c>load/2</c> calls, so that a corresponding number of
@@ -349,16 +337,16 @@
           several drivers with the same name but with different
           <c>Path</c> parameters.</p>
         <note>
-          <p>Note especially that the <c>Path</c> is interpreted
+          <p>Note especially that the <c><anno>Path</anno></c> is interpreted
             literally, so that all loaders of the same driver needs to
-            give the same <em>literal</em><c>Path</c> string, even
+            give the same <em>literal</em><c><anno>Path</anno></c> string, even
             though different paths might point out the same directory
             in the filesystem (due to use of relative paths and
             links).</p>
         </note>
         <p>On success, the function returns <c>ok</c>. On
-          failure, the return value is <c>{error,ErrorDesc}</c>,
-          where <c>ErrorDesc</c> is an opaque term to be
+          failure, the return value is <c>{error,<anno>ErrorDesc</anno>}</c>,
+          where <c><anno>ErrorDesc</anno></c> is an opaque term to be
           translated into human readable form by the <seealso marker="#format_error/1">format_error/1</seealso>
           function.</p>
         <p>For more control over the error handling, again use the
@@ -369,20 +357,16 @@
       </desc>
     </func>
     <func>
-      <name>load_driver(Path, Name) -> ok | {error, ErrorDesc}</name>
+      <name name="load_driver" arity="2"/>
       <fsummary>Load a driver</fsummary>
-      <type>
-        <v>Path = Name = string() | atom()</v>
-        <v>ErrorDesc = term()</v>
-      </type>
       <desc>
         <p>Works essentially as <c>load/2</c>, but will load the driver
-          with options other options.  All ports that are using the
+          with other options.  All ports that are using the
           driver will get killed with the reason
           <c>driver_unloaded</c> when the driver is to be unloaded.</p>
         <p>The number of loads and unloads by different <seealso marker="#users">users</seealso> influence the actual loading
           and unloading of a driver file. The port killing will
-          therefore only happen when the <em>last</em><seealso marker="#users">user</seealso> unloads the driver, or the
+          therefore only happen when the <em>last</em> <seealso marker="#users">user</seealso> unloads the driver, or the
           last process having loaded the driver exits.</p>
         <p>This interface (or at least the name of the functions) is
           kept for backward compatibility.  Using <seealso marker="#try_load/3">try_load/3</seealso> with
@@ -551,16 +535,11 @@
       </desc>
     </func>
     <func>
-      <name>reload(Path, Name) -> ok | {error, ErrorDesc}</name>
+      <name name="reload" arity="2"/>
       <fsummary>Replace a driver</fsummary>
-      <type>
-        <v>Path = Name = string() | atom()</v>
-        <v>ErrorDesc = pending_process | OpaqueError</v>
-        <v>OpaqueError = term()</v>
-      </type>
       <desc>
-        <p>Reloads the driver named <c>Name</c> from a possibly
-          different <c>Path</c> than was previously used. This
+        <p>Reloads the driver named <c><anno>Name</anno></c> from a possibly
+          different <c><anno>Path</anno></c> than was previously used. This
           function is used in the code change <seealso marker="#scenarios">scenario</seealso> described in the
           introduction.</p>
         <p>If there are other <seealso marker="#users">users</seealso>
@@ -574,7 +553,7 @@
         <p>If one wants to avoid hanging on open ports, one should use
           the <seealso marker="#try_load/3">try_load/3</seealso>
           function instead.</p>
-        <p>The <c>Name</c> and <c>Path</c> parameters have exactly the
+        <p>The <c><anno>Name</anno></c> and <c><anno>Path</anno></c> parameters have exactly the
           same meaning as when calling the plain <seealso marker="#load/2">load/2</seealso> function.</p>
         <note>
           <p>Avoid mixing
@@ -594,13 +573,8 @@
       </desc>
     </func>
     <func>
-      <name>reload_driver(Path, Name) -> ok | {error, ErrorDesc}</name>
+      <name name="reload_driver" arity="2"/>
       <fsummary>Replace a driver</fsummary>
-      <type>
-        <v>Path = Name = string() | atom()</v>
-        <v>ErrorDesc = pending_process | OpaqueError</v>
-        <v>OpaqueError = term()</v>
-      </type>
       <desc>
         <p>Works exactly as <seealso marker="#reload/2">reload/2</seealso>, but for drivers
           loaded with the <seealso marker="#load_driver/2">load_driver/2</seealso> interface. </p>
@@ -1066,15 +1040,11 @@
       </desc>
     </func>
     <func>
-      <name>unload(Name) -> ok | {error, ErrorDesc}</name>
+      <name name="unload" arity="1"/>
       <fsummary>Unload a driver</fsummary>
-      <type>
-        <v>Name = string() | atom()</v>
-        <v>ErrorDesc = term()</v>
-      </type>
       <desc>
         <p>Unloads, or at least dereferences the driver named
-          <c>Name</c>. If the caller is the last <seealso marker="#users">user</seealso> of the driver, and there
+          <c><anno>Name</anno></c>. If the caller is the last <seealso marker="#users">user</seealso> of the driver, and there
           are no more open ports using the driver, the driver will
           actually get unloaded. In all other cases, actual unloading
           will be delayed until all ports are closed and there are no
@@ -1084,7 +1054,7 @@
           is no longer considered a user of the driver. For usage
           scenarios, see the <seealso marker="#scenarios">description</seealso> in the beginning
           of this document. </p>
-        <p>The <c>ErrorDesc</c> returned is an opaque value to be
+        <p>The <c><anno>ErrorDesc</anno></c> returned is an opaque value to be
           passed further on to the <seealso marker="#format_error/1">format_error/1</seealso>
           function. For more control over the operation, use the
           <seealso marker="#try_unload/2">try_unload/2</seealso>
@@ -1094,15 +1064,11 @@
       </desc>
     </func>
     <func>
-      <name>unload_driver(Name) -> ok | {error, ErrorDesc}</name>
+      <name name="unload_driver" arity="1"/>
       <fsummary>Unload a driver</fsummary>
-      <type>
-        <v>Name = string() | atom()</v>
-        <v>ErrorDesc = term()</v>
-      </type>
       <desc>
         <p>Unloads, or at least dereferences the driver named
-          <c>Name</c>. If the caller is the last <seealso marker="#users">user</seealso> of the driver, all
+          <c><anno>Name</anno></c>. If the caller is the last <seealso marker="#users">user</seealso> of the driver, all
           remaining open ports using the driver will get killed with
           the reason <c>driver_unloaded</c> and the driver will
           eventually get unloaded.</p>
@@ -1112,7 +1078,7 @@
           <seealso marker="#users">user</seealso>. For
           usage scenarios, see the <seealso marker="#scenarios">description</seealso> in the beginning
           of this document.</p>
-        <p>The <c>ErrorDesc</c> returned is an opaque value to be
+        <p>The <c><anno>ErrorDesc</anno></c> returned is an opaque value to be
           passed further on to the <seealso marker="#format_error/1">format_error/1</seealso>
           function. For more control over the operation, use the
           <seealso marker="#try_unload/2">try_unload/2</seealso>
@@ -1125,7 +1091,7 @@
       <name>loaded_drivers() -> {ok, Drivers}</name>
       <fsummary>List loaded drivers</fsummary>
       <type>
-        <v>Drivers = [Driver()]</v>
+        <v>Drivers = [Driver]</v>
         <v>Driver = string()</v>
       </type>
       <desc>
@@ -1138,13 +1104,10 @@
       </desc>
     </func>
     <func>
-      <name>format_error(ErrorDesc) -> string()</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Format an error descriptor</fsummary>
-      <type>
-        <v>ErrorDesc -- see below</v>
-      </type>
       <desc>
-        <p>Takes an <c>ErrorDesc</c> returned by load, unload or
+        <p>Takes an <c><anno>ErrorDesc</anno></c> returned by load, unload or
           reload functions and returns a string which
           describes the error or warning.</p>
         <note>
diff --git a/lib/kernel/doc/src/error_handler.xml b/lib/kernel/doc/src/error_handler.xml
index 7f78322472..acbf9a2c6e 100644
--- a/lib/kernel/doc/src/error_handler.xml
+++ b/lib/kernel/doc/src/error_handler.xml
@@ -37,48 +37,44 @@
   </description>
   <funcs>
     <func>
-      <name>undefined_function(Module, Function, Args) -> term()</name>
+      <name name="undefined_function" arity="3"/>
       <fsummary>Called when an undefined function is encountered</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <d>A (possibly empty) list of arguments <c>Arg1,..,ArgN</c></d>
-      </type>
+      <type_desc variable="Args">
+        A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
+      </type_desc>
       <desc>
         <p>This function is evaluated if a call is made to
-          <c>Module:Function(Arg1,.., ArgN)</c> and
-          <c>Module:Function/N</c> is undefined. Note that
+          <c><anno>Module</anno>:<anno>Function</anno>(Arg1,.., ArgN)</c> and
+          <c><anno>Module</anno>:<anno>Function</anno>/N</c> is undefined. Note that
           <c>undefined_function/3</c> is evaluated inside the process
           making the original call.</p>
-        <p>If <c>Module</c> is interpreted, the interpreter is invoked
+        <p>If <c><anno>Module</anno></c> is interpreted, the interpreter is invoked
           and the return value of the interpreted
-          <c>Function(Arg1,.., ArgN)</c> call is returned.</p>
+          <c><anno>Function</anno>(Arg1,.., ArgN)</c> call is returned.</p>
         <p>Otherwise, it returns, if possible, the value of
-          <c>apply(Module, Function, Args)</c> after an attempt has been
-          made to autoload <c>Module</c>. If this is not possible, the
-          call to <c>Module:Function(Arg1,.., ArgN)</c> fails with
+          <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> after an attempt has been
+          made to autoload <c><anno>Module</anno></c>. If this is not possible, the
+          call to <c><anno>Module</anno>:<anno>Function</anno>(Arg1,.., ArgN)</c> fails with
           exit reason <c>undef</c>.</p>
       </desc>
     </func>
     <func>
-      <name>undefined_lambda(Module, Fun, Args) -> term()</name>
+      <name name="undefined_lambda" arity="3"/>
       <fsummary>Called when an undefined lambda (fun) is encountered</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <d>A (possibly empty) list of arguments <c>Arg1,..,ArgN</c></d>
-      </type>
+      <type_desc variable="Args">
+        A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
+      </type_desc>
       <desc>
         <p>This function is evaluated if a call is made to
-          <c>Fun(Arg1,.., ArgN)</c> when the module defining the fun is
+          <c><anno>Fun</anno>(Arg1,.., ArgN)</c> when the module defining the fun is
           not loaded. The function is evaluated inside the process
           making the original call.</p>
-        <p>If <c>Module</c> is interpreted, the interpreter is invoked
+        <p>If <c><anno>Module</anno></c> is interpreted, the interpreter is invoked
           and the return value of the interpreted
-          <c>Fun(Arg1,.., ArgN)</c> call is returned.</p>
+          <c><anno>Fun</anno>(Arg1,.., ArgN)</c> call is returned.</p>
         <p>Otherwise, it returns, if possible, the value of
-          <c>apply(Fun, Args)</c> after an attempt has been made to
-          autoload <c>Module</c>. If this is not possible, the call
+          <c>apply(<anno>Fun</anno>, <anno>Args</anno>)</c> after an attempt has been made to
+          autoload <c><anno>Module</anno></c>. If this is not possible, the call
           fails with exit reason <c>undef</c>.</p>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/error_logger.xml b/lib/kernel/doc/src/error_logger.xml
index e107d9b746..2d95f96ac7 100644
--- a/lib/kernel/doc/src/error_logger.xml
+++ b/lib/kernel/doc/src/error_logger.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -65,19 +65,20 @@
       be tagged as warnings or info. Tagging them as warnings may
       require rewriting existing user defined event handlers.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="report"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>error_msg(Format) -> ok</name>
-      <name>error_msg(Format, Data) -> ok</name>
-      <name>format(Format, Data) -> ok</name>
+      <name name="error_msg" arity="1"/>
+      <name name="error_msg" arity="2"/>
+      <name name="format" arity="2"/>
       <fsummary>Send an standard error event to the error logger</fsummary>
-      <type>
-        <v>Format = string()</v>
-        <v>Data = [term()]</v>
-      </type>
       <desc>
         <p>Sends a standard error event to the error logger.
-          The <c>Format</c> and <c>Data</c> arguments are the same as
+          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments are the same as
           the arguments of <c>io:format/2</c>. The event is handled by
           the standard event handler.</p>
         <pre>
@@ -94,12 +95,8 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name>error_report(Report) -> ok</name>
+      <name name="error_report" arity="1"/>
       <fsummary>Send a standard error report event to the error logger</fsummary>
-      <type>
-        <v>Report = [{Tag, Data} | term()] | string() | term()</v>
-        <v>&nbsp;Tag = Data = term()</v>
-      </type>
       <desc>
         <p>Sends a standard error report event to the error logger.
           The event is handled by the standard event handler.</p>
@@ -119,18 +116,13 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name>error_report(Type, Report) -> ok</name>
+      <name name="error_report" arity="2"/>
       <fsummary>Send a user defined error report event to the error logger</fsummary>
-      <type>
-        <v>Type = term()</v>
-        <v>Report = [{Tag, Data} | term()] | string() | term()</v>
-        <v>&nbsp;Tag = Data = term()</v>
-      </type>
       <desc>
         <p>Sends a user defined error report event to the error logger.
           An event handler to handle the event is supposed to have been
           added. The event is ignored by the standard event handler.</p>
-        <p>It is recommended that <c>Report</c> follows the same
+        <p>It is recommended that <c><anno>Report</anno></c> follows the same
           structure as for <c>error_report/1</c>.</p>
       </desc>
     </func>
@@ -174,16 +166,12 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name>warning_msg(Format) -> ok</name>
-      <name>warning_msg(Format, Data) -> ok</name>
+      <name name="warning_msg" arity="1"/>
+      <name name="warning_msg" arity="2"/>
       <fsummary>Send a standard warning event to the error logger</fsummary>
-      <type>
-        <v>Format = string()</v>
-        <v>Data = [term()]</v>
-      </type>
       <desc>
         <p>Sends a standard warning event to the error logger.
-          The <c>Format</c> and <c>Data</c> arguments are the same as
+          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments are the same as
           the arguments of <c>io:format/2</c>. The event is handled by
           the standard event handler. It is tagged either as an error,
           warning or info, see
@@ -196,12 +184,8 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name>warning_report(Report) -> ok</name>
+      <name name="warning_report" arity="1"/>
       <fsummary>Send a standard warning report event to the error logger</fsummary>
-      <type>
-        <v>Report = [{Tag, Data} | term()] | string() | term()</v>
-        <v>&nbsp;Tag = Data = term()</v>
-      </type>
       <desc>
         <p>Sends a standard warning report event to the error logger.
           The event is handled by the standard event handler. It is
@@ -210,13 +194,8 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name>warning_report(Type, Report) -> ok</name>
+      <name name="warning_report" arity="2"/>
       <fsummary>Send a user defined warning report event to the error logger</fsummary>
-      <type>
-        <v>Type = term()</v>
-        <v>Report = [{Tag, Data} | term()] | string() | term()</v>
-        <v>&nbsp;Tag = Data = term()</v>
-      </type>
       <desc>
         <p>Sends a user defined warning report event to the error
           logger. An event handler to handle the event is supposed to
@@ -227,16 +206,12 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name>info_msg(Format) -> ok</name>
-      <name>info_msg(Format, Data) -> ok</name>
+      <name name="info_msg" arity="1"/>
+      <name name="info_msg" arity="2"/>
       <fsummary>Send a standard information event to the error logger</fsummary>
-      <type>
-        <v>Format = string()</v>
-        <v>Data = [term()]</v>
-      </type>
       <desc>
         <p>Sends a standard information event to the error logger.
-          The <c>Format</c> and <c>Data</c> arguments are the same as
+          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments are the same as
           the arguments of <c>io:format/2</c>. The event is handled by
           the standard event handler.</p>
         <pre>
@@ -253,12 +228,8 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name>info_report(Report) -> ok</name>
+      <name name="info_report" arity="1"/>
       <fsummary>Send a standard information report event to the error logger</fsummary>
-      <type>
-        <v>Report = [{Tag, Data} | term()] | string() | term()</v>
-        <v>&nbsp;Tag = Data = term()</v>
-      </type>
       <desc>
         <p>Sends a standard information report event to the error
           logger. The event is handled by the standard event handler.</p>
@@ -278,63 +249,49 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name>info_report(Type, Report) -> ok</name>
+      <name name="info_report" arity="2"/>
       <fsummary>Send a user defined information report event to the error logger</fsummary>
-      <type>
-        <v>Type = term()</v>
-        <v>Report = [{Tag, Data} | term()] | string() | term()</v>
-        <v>&nbsp;Tag = Data = term()</v>
-      </type>
       <desc>
         <p>Sends a user defined information report event to the error
           logger. An event handler to handle the event is supposed to
           have been added. The event is ignored by the standard event
           handler.</p>
-        <p>It is recommended that <c>Report</c> follows the same
+        <p>It is recommended that <c><anno>Report</anno></c> follows the same
           structure as for <c>info_report/1</c>.</p>
       </desc>
     </func>
     <func>
-      <name>add_report_handler(Handler) -> Result</name>
-      <name>add_report_handler(Handler, Args) -> Result</name>
+      <name name="add_report_handler" arity="1"/>
+      <name name="add_report_handler" arity="2"/>
       <fsummary>Add an event handler to the error logger</fsummary>
-      <type>
-        <v>Handler, Args, Result -- see gen_event:add_handler/3</v>
-      </type>
       <desc>
         <p>Adds a new event handler to the error logger. The event
           handler must be implemented as a <c>gen_event</c> callback
           module, see
           <seealso marker="stdlib:gen_event">gen_event(3)</seealso>.</p>
-        <p><c>Handler</c> is typically the name of the callback module
-          and <c>Args</c> is an optional term (defaults to []) passed
-          to the initialization callback function <c>Module:init/1</c>.
+        <p><c><anno>Handler</anno></c> is typically the name of the callback module
+          and <c><anno>Args</anno></c> is an optional term (defaults to []) passed
+          to the initialization callback function <c><anno>Handler</anno>:init/1</c>.
           The function returns <c>ok</c> if successful.</p>
         <p>The event handler must be able to handle the
           <seealso marker="#events">events</seealso> described below.</p>
       </desc>
     </func>
     <func>
-      <name>delete_report_handler(Handler) -> Result</name>
+      <name name="delete_report_handler" arity="1"/>
       <fsummary>Delete an event handler from the error logger</fsummary>
-      <type>
-        <v>Handler, Result -- see gen_event:delete_handler/3</v>
-      </type>
       <desc>
         <p>Deletes an event handler from the error logger by calling
-          <c>gen_event:delete_handler(error_logger, Handler, [])</c>,
+          <c>gen_event:delete_handler(error_logger, <anno>Handler</anno>, [])</c>,
           see <seealso marker="stdlib:gen_event">gen_event(3)</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>tty(Flag) -> ok</name>
+      <name name="tty" arity="1"/>
       <fsummary>Enable or disable printouts to the tty</fsummary>
-      <type>
-        <v>Flag = bool()</v>
-      </type>
       <desc>
-        <p>Enables (<c>Flag == true</c>) or disables
-          (<c>Flag == false</c>) printout of standard events to the tty.</p>
+        <p>Enables (<c><anno>Flag</anno> == true</c>) or disables
+          (<c><anno>Flag</anno> == false</c>) printout of standard events to the tty.</p>
         <p>This is done by adding or deleting the standard event handler
           for output to tty, thus calling this function overrides
           the value of the Kernel <c>error_logger</c> configuration
@@ -342,13 +299,15 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name>logfile(Request) -> ok | Filename | {error, What}</name>
+      <name name="logfile" arity="1" clause_i="1"/>
+      <name name="logfile" arity="1" clause_i="2"/>
+      <name name="logfile" arity="1" clause_i="3"/>
+      <type variable="Filename"/>
+      <type variable="OpenReason" name_i="1"/>
+      <type variable="CloseReason" name_i="2"/>
+      <type variable="FilenameReason" name_i="3"/>
+      <type name="open_error"/>
       <fsummary>Enable or disable error printouts to a file</fsummary>
-      <type>
-        <v>Request = {open, Filename} | close | filename</v>
-        <v>&nbsp;Filename = atom() | string()</v>
-        <v>What = allready_have_logfile | no_log_file | term()</v>
-      </type>
       <desc>
         <p>Enables or disables printout of standard events to a file.</p>
         <p>This is done by adding or deleting the standard event handler
@@ -361,22 +320,22 @@ ok</pre>
           There can only be one active log file at a time.</p>
         <p><c>Request</c> is one of:</p>
         <taglist>
-          <tag><c>{open, Filename}</c></tag>
+          <tag><c>{open, <anno>Filename</anno>}</c></tag>
           <item>
-            <p>Opens the log file <c>Filename</c>. Returns <c>ok</c> if
+            <p>Opens the log file <c><anno>Filename</anno></c>. Returns <c>ok</c> if
               successful, or <c>{error, allready_have_logfile}</c> if
               logging to file is already enabled, or an error tuple if
-              another error occurred. For example, if <c>Filename</c>
+              another error occurred. For example, if <c><anno>Filename</anno></c>
               could not be opened.</p>
           </item>
           <tag><c>close</c></tag>
           <item>
             <p>Closes the current log file. Returns <c>ok</c>, or
-              <c>{error, What}</c>.</p>
+              <c>{error, module_not_found}</c>.</p>
           </item>
           <tag><c>filename</c></tag>
           <item>
-            <p>Returns the name of the log file <c>Filename</c>, or
+            <p>Returns the name of the log file <c><anno>Filename</anno></c>, or
               <c>{error, no_log_file}</c> if logging to file is not
               enabled.</p>
           </item>
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 36fce464c5..e0feaf6ee7 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -93,47 +93,76 @@
     is UTF-8...</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-iodata() = iolist() | binary()
-  iolist() = [char() | binary() | iolist()]
-
-io_device()
-  as returned by file:open/2, a process handling IO protocols
-
-name() = string() | atom() | DeepList | RawFilename
-  DeepList = [char() | atom() | DeepList]
-  RawFilename = binary()
-  If VM is in unicode filename mode, string() and char() are allowed to be > 255.
-  RawFilename is a filename not subject to Unicode translation, meaning that it 
-  can contain characters not conforming to the Unicode encoding expected from the 
-  filesystem (i.e. non-UTF-8 characters although the VM is started in Unicode 
-  filename mode).
-
-posix()
-  an atom which is named from the POSIX error codes used in
-  Unix, and in the runtime libraries of most C compilers
-
-ext_posix() = posix() | badarg
+  <datatypes>
+    <datatype>
+      <name name="bindings"/>
+    </datatype>
+    <datatype>
+      <name name="deep_list"/>
+    </datatype>
+    <datatype>
+      <name name="fd"/>
+    </datatype>
+    <datatype>
+      <name name="filename"/>
+    </datatype>
+    <datatype>
+      <name name="io_device"/>
+      <desc>
+        <p>As returned by
+          <seealso marker="#open/2">file:open/2</seealso>,
+          a process handling IO protocols.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="name"/>
+      <desc>
+        <p>If VM is in Unicode filename mode, <c>string()</c> and <c>char()</c>
+          are allowed to be > 255.
+          <c><anno>RawFilename</anno></c> is a filename not subject to
+          Unicode translation,
+          meaning that it can contain characters not conforming to
+          the Unicode encoding expected from the filesystem
+          (i.e. non-UTF-8 characters although the VM is started
+          in Unicode filename mode).
+        </p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="posix"/>
+      <desc>
+        <p>An atom which is named from the POSIX error codes used in
+          Unix, and in the runtime libraries of most C compilers.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="date"/>
+    </datatype>
+    <datatype>
+      <name name="time"/>
+    </datatype>
+    <datatype>
+      <name name="date_time"/>
+      <desc>
+        <p>Must denote a valid date and time.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="file_info"/>
+    </datatype>
+    <datatype>
+      <name name="location"/>
+    </datatype>
+    <datatype>
+      <name name="mode"/>
+    </datatype>
+   </datatypes>
 
-time() = {{Year, Month, Day}, {Hour, Minute, Second}}
-  Year = Month = Day = Hour = Minute = Second = int()
-  Must denote a valid date and time</code>
-  </section>
   <funcs>
     <func>
-      <name>advise(IoDevice, Offset, Length, Advise) -> ok | {error, Reason}</name>
+      <name name="advise" arity="4"/>
       <fsummary>Predeclare an access pattern for file data</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Offset = int()</v>
-        <v>Length = int()</v>
-        <v>Advise = posix_file_advise()</v>
-        <v>posix_file_advise() = normal | sequential | random | no_reuse
-          | will_need | dont_need</v>
-        <v>Reason = ext_posix()</v>
-      </type>
+      <type name="posix_file_advise"/>
       <desc>
         <p><c>advise/4</c> can be used to announce an intention to access file
           data in a specific pattern in the future, thus allowing the
@@ -142,93 +171,58 @@ time() = {{Year, Month, Day}, {Hour, Minute, Second}}
       </desc>
     </func>
     <func>
-      <name>change_group(Filename, Gid) -> ok | {error, Reason}</name>
+      <name name="change_group" arity="2"/>
       <fsummary>Change group of a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Gid = int()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
         <p>Changes group of a file. See
           <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>change_mode(Filename, Mode) -> ok | {error, Reason}</name>
+      <name name="change_mode" arity="2"/>
       <fsummary>Change permissions of a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Mode = int()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
         <p>Changes permissions of a file. See
           <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>change_owner(Filename, Uid) -> ok | {error, Reason}</name>
+      <name name="change_owner" arity="2"/>
       <fsummary>Change owner of a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Uid = int()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
         <p>Changes owner of a file. See
           <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>change_owner(Filename, Uid, Gid) -> ok | {error, Reason}</name>
+      <name name="change_owner" arity="3"/>
       <fsummary>Change owner and group of a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Uid = int()</v>
-        <v>Gid = int()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
         <p>Changes owner and group of a file. See
           <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>change_time(Filename, Mtime) -> ok | {error, Reason}</name>
+      <name name="change_time" arity="2"/>
       <fsummary>Change the modification time of a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Mtime = time()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
         <p>Changes the modification and access times of a file. See
           <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>change_time(Filename, Mtime, Atime) -> ok | {error, Reason}</name>
+      <name name="change_time" arity="3"/>
       <fsummary>Change the modification and last access time of a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Mtime = Atime = time()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
         <p>Changes the modification and last access times of a file. See
           <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>close(IoDevice) -> ok | {error, Reason}</name>
+      <name name="close" arity="1"/>
       <fsummary>Close a file</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
-        <p>Closes the file referenced by <c>IoDevice</c>. It mostly
+        <p>Closes the file referenced by <c><anno>IoDevice</anno></c>. It mostly
           returns <c>ok</c>, expect for some severe errors such as out
           of memory.</p>
         <p>Note that if the option <c>delayed_write</c> was
@@ -238,20 +232,13 @@ time() = {{Year, Month, Day}, {Hour, Minute, Second}}
       </desc>
     </func>
     <func>
-      <name>consult(Filename) -> {ok, Terms} | {error, Reason}</name>
+      <name name="consult" arity="1"/>
       <fsummary>Read Erlang terms from a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Terms = [term()]</v>
-        <v>Reason = ext_posix() | terminated | system_limit
-                  | {Line, Mod, Term}</v>
-        <v>&nbsp;Line, Mod, Term -- see below</v>
-      </type>
       <desc>
-        <p>Reads Erlang terms, separated by '.', from <c>Filename</c>.
-          Returns one of the following:</p>
+        <p>Reads Erlang terms, separated by '.', from
+           <c><anno>Filename</anno></c>. Returns one of the following:</p>
         <taglist>
-          <tag><c>{ok, Terms}</c></tag>
+          <tag><c>{ok, <anno>Terms</anno>}</c></tag>
           <item>
             <p>The file was successfully read.</p>
           </item>
@@ -261,7 +248,8 @@ time() = {{Year, Month, Day}, {Hour, Minute, Second}}
               See <seealso marker="#open/2">open/2</seealso> for a list
               of typical error codes.</p>
           </item>
-          <tag><c>{error, {Line, Mod, Term}}</c></tag>
+          <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
+                           <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang terms in
               the file. Use <c>format_error/1</c> to convert
@@ -279,53 +267,46 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>copy(Source, Destination) -></name>
-      <name>copy(Source, Destination, ByteCount) -> {ok, BytesCopied} | {error, Reason}</name>
+      <name name="copy" arity="2"/>
+      <name name="copy" arity="3"/>
       <fsummary>Copy file contents</fsummary>
-      <type>
-        <v>Source = Destination = io_device() | Filename | {Filename, Modes}</v>
-        <v>&nbsp;Filename = name()</v>
-        <v>&nbsp;Modes = [Mode] -- see open/2</v>
-        <v>ByteCount = int() >= 0 | infinity</v>
-        <v>BytesCopied = int()</v>
-      </type>
       <desc>
-        <p>Copies <c>ByteCount</c> bytes from <c>Source</c> to
-          <c>Destination</c>. <c>Source</c> and <c>Destination</c> refer
+        <p>Copies <c><anno>ByteCount</anno></c> bytes from
+          <c><anno>Source</anno></c> to <c><anno>Destination</anno></c>.
+          <c><anno>Source</anno></c> and <c><anno>Destination</anno></c> refer
           to either filenames or IO devices from e.g. <c>open/2</c>.
-          <c>ByteCount</c> defaults <c>infinity</c>, denoting an
+          <c><anno>ByteCount</anno></c> defaults to <c>infinity</c>, denoting an
           infinite number of bytes.</p>
-        <p>The argument <c>Modes</c> is a list of possible modes, see
-          <seealso marker="#open/2">open/2</seealso>, and defaults to
+        <p>The argument <c><anno>Modes</anno></c> is a list of possible modes,
+          see <seealso marker="#open/2">open/2</seealso>, and defaults to
           [].</p>
-        <p>If both <c>Source</c> and <c>Destination</c> refer to
+        <p>If both <c><anno>Source</anno></c> and
+          <c><anno>Destination</anno></c> refer to
           filenames, the files are opened with <c>[read, binary]</c>
           and <c>[write, binary]</c> prepended to their mode lists,
           respectively, to optimize the copy.</p>
-        <p>If <c>Source</c> refers to a filename, it is opened with
+        <p>If <c><anno>Source</anno></c> refers to a filename, it is opened with
           <c>read</c> mode prepended to the mode list before the copy,
           and closed when done.</p>
-        <p>If <c>Destination</c> refers to a filename, it is opened
+        <p>If <c><anno>Destination</anno></c> refers to a filename, it is opened
           with <c>write</c> mode prepended to the mode list before
           the copy, and closed when done.</p>
-        <p>Returns <c>{ok, BytesCopied}</c> where <c>BytesCopied</c> is
+        <p>Returns <c>{ok, <anno>BytesCopied</anno>}</c> where
+          <c><anno>BytesCopied</anno></c> is
           the number of bytes that actually was copied, which may be
-          less than <c>ByteCount</c> if end of file was encountered on
-          the source. If the operation fails, <c>{error, Reason}</c> is
-          returned.</p>
+          less than <c><anno>ByteCount</anno></c> if end of file was
+          encountered on the source. If the operation fails,
+          <c>{error, <anno>Reason</anno>}</c> is returned.</p>
         <p>Typical error reasons: As for <c>open/2</c> if a file had to
           be opened, and as for <c>read/2</c> and <c>write/2</c>.</p>
       </desc>
     </func>
     <func>
-      <name>del_dir(Dir) -> ok | {error, Reason}</name>
+      <name name="del_dir" arity="1"/>
       <fsummary>Delete a directory</fsummary>
-      <type>
-        <v>Dir = name()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
-        <p>Tries to delete the directory <c>Dir</c>. The directory must
+        <p>Tries to delete the directory <c><anno>Dir</anno></c>.
+          The directory must
           be empty before it can be deleted. Returns <c>ok</c> if
           successful.</p>
         <p>Typical error reasons are:</p>
@@ -333,7 +314,7 @@ f.txt:  {person, "kalle", 25}.
           <tag><c>eacces</c></tag>
           <item>
             <p>Missing search or write permissions for the parent
-              directories of <c>Dir</c>.</p>
+              directories of <c><anno>Dir</anno></c>.</p>
           </item>
           <tag><c>eexist</c></tag>
           <item>
@@ -345,8 +326,8 @@ f.txt:  {person, "kalle", 25}.
           </item>
           <tag><c>enotdir</c></tag>
           <item>
-            <p>A component of <c>Dir</c> is not a directory. On some
-              platforms, <c>enoent</c> is returned instead.</p>
+            <p>A component of <c><anno>Dir</anno></c> is not a directory.
+              On some platforms, <c>enoent</c> is returned instead.</p>
           </item>
           <tag><c>einval</c></tag>
           <item>
@@ -357,15 +338,11 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>delete(Filename) -> ok | {error, Reason}</name>
+      <name name="delete" arity="1"/>
       <fsummary>Delete a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
-        <p>Tries to delete the file <c>Filename</c>. Returns <c>ok</c>
-          if successful.</p>
+        <p>Tries to delete the file <c><anno>Filename</anno></c>.
+          Returns <c>ok</c> if successful.</p>
         <p>Typical error reasons are:</p>
         <taglist>
           <tag><c>enoent</c></tag>
@@ -387,30 +364,25 @@ f.txt:  {person, "kalle", 25}.
           </item>
           <tag><c>einval</c></tag>
           <item>
-            <p><c>Filename</c> had an improper type, such as tuple.</p>
+            <p><c><anno>Filename</anno></c> had an improper type, such as tuple.</p>
           </item>
         </taglist>
         <warning>
-          <p>In a future release, a bad type for the <c>Filename</c>
-            argument will probably generate an exception.</p>
+          <p>In a future release, a bad type for the
+            <c><anno>Filename</anno></c> argument will probably generate
+            an exception.</p>
           <p></p>
         </warning>
       </desc>
     </func>
     <func>
-      <name>eval(Filename) -> ok | {error, Reason}</name>
+      <name name="eval" arity="1"/>
       <fsummary>Evaluate Erlang expressions in a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Reason = ext_posix() | terminated | system_limit 
-                  | {Line, Mod, Term}</v>
-        <v>&nbsp;Line, Mod, Term -- see below</v>
-      </type>
       <desc>
         <p>Reads and evaluates Erlang expressions, separated by '.' (or
           ',', a sequence of expressions is also an expression), from
-          <c>Filename</c>. The actual result of the evaluation is not
-          returned; any expression sequence in the file must be there
+          <c><anno>Filename</anno></c>. The actual result of the evaluation
+          is not returned; any expression sequence in the file must be there
           for its side effect. Returns one of the following:</p>
         <taglist>
           <tag><c>ok</c></tag>
@@ -422,7 +394,8 @@ f.txt:  {person, "kalle", 25}.
             <p>An error occurred when opening the file or reading it.
               See <c>open/2</c> for a list of typical error codes.</p>
           </item>
-          <tag><c>{error, {Line, Mod, Term}}</c></tag>
+          <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
+                           <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang
               expressions in the file. Use <c>format_error/1</c> to
@@ -433,18 +406,11 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>eval(Filename, Bindings) -> ok | {error, Reason}</name>
+      <name name="eval" arity="2"/>
       <fsummary>Evaluate Erlang expressions in a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Bindings -- see erl_eval(3)</v>
-        <v>Reason = ext_posix() | terminated | system_limit 
-                  | {Line, Mod, Term}</v>
-        <v>&nbsp;Line, Mod, Term -- see eval/1</v>
-      </type>
       <desc>
         <p>The same as <c>eval/1</c> but the variable bindings
-          <c>Bindings</c> are used in the evaluation. See
+          <c><anno>Bindings</anno></c> are used in the evaluation. See
           <seealso marker="stdlib:erl_eval">erl_eval(3)</seealso> about
           variable bindings.</p>
       </desc>
@@ -458,27 +424,19 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>format_error(Reason) -> Chars</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Return a descriptive string for an error reason</fsummary>
-      <type>
-        <v>Reason = atom() | {Line, Mod, Term}</v>
-        <v>&nbsp;Line, Mod, Term -- see eval/1</v>
-        <v>Chars = [char() | Chars]</v>
-      </type>
       <desc>
         <p>Given the error reason returned by any function in this
           module, returns a descriptive string of the error in English.</p>
       </desc>
     </func>
     <func>
-      <name>get_cwd() -> {ok, Dir} | {error, Reason}</name>
+      <name name="get_cwd" arity="0"/>
       <fsummary>Get the current working directory</fsummary>
-      <type>
-        <v>Dir = string()</v>
-        <v>Reason = posix()</v>
-      </type>
       <desc>
-        <p>Returns <c>{ok, Dir}</c>, where <c>Dir</c> is the current
+        <p>Returns <c>{ok, <anno>Dir</anno>}</c>, where <c><anno>Dir</anno></c>
+          is the current
           working directory of the file server.</p>
         <note>
           <p>In rare circumstances, this function can fail on Unix.
@@ -496,17 +454,14 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>get_cwd(Drive) -> {ok, Dir} | {error, Reason}</name>
+      <name name="get_cwd" arity="1"/>
       <fsummary>Get the current working directory for the drive specified</fsummary>
-      <type>
-        <v>Drive = string() -- see below</v>
-        <v>Dir = string()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
-        <p><c>Drive</c> should be of the form "<c>Letter</c><c>:</c>",
-          for example "c:". Returns <c>{ok, Dir}</c> or
-          <c>{error, Reason}</c>, where <c>Dir</c> is the current
+        <p><c><anno>Drive</anno></c> should be of the form
+          "<c>Letter</c><c>:</c>",
+          for example "c:". Returns <c>{ok, <anno>Dir</anno>}</c> or
+          <c>{error, <anno>Reason</anno>}</c>, where <c><anno>Dir</anno></c>
+          is the current
           working directory of the drive specified.</p>
         <p>This function returns <c>{error, enotsup}</c> on platforms
           which have no concept of current drive (Unix, for example).</p>
@@ -514,7 +469,7 @@ f.txt:  {person, "kalle", 25}.
         <taglist>
           <tag><c>enotsup</c></tag>
           <item>
-            <p>The operating system have no concept of drives.</p>
+            <p>The operating system has no concept of drives.</p>
           </item>
           <tag><c>eacces</c></tag>
           <item>
@@ -522,32 +477,27 @@ f.txt:  {person, "kalle", 25}.
           </item>
           <tag><c>einval</c></tag>
           <item>
-            <p>The format of <c>Drive</c> is invalid.</p>
+            <p>The format of <c><anno>Drive</anno></c> is invalid.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>list_dir(Dir) -> {ok, Filenames} | {error, Reason}</name>
+      <name name="list_dir" arity="1"/>
       <fsummary>List files in a directory</fsummary>
-      <type>
-        <v>Dir = name()</v>
-        <v>Filenames = [Filename]</v>
-        <v>&nbsp;Filename = string()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
         <p>Lists all the files in a directory. Returns
-          <c>{ok, Filenames}</c> if successful. Otherwise, it returns
-          <c>{error, Reason}</c>. <c>Filenames</c> is a list of
+          <c>{ok, <anno>Filenames</anno>}</c> if successful.
+          Otherwise, it returns <c>{error, <anno>Reason</anno>}</c>.
+          <c><anno>Filenames</anno></c> is a list of
           the names of all the files in the directory. The names are
           not sorted.</p>
         <p>Typical error reasons are:</p>
         <taglist>
           <tag><c>eacces</c></tag>
           <item>
-            <p>Missing search or write permissions for <c>Dir</c> or
-              one of its parent directories.</p>
+            <p>Missing search or write permissions for <c><anno>Dir</anno></c>
+              or one of its parent directories.</p>
           </item>
           <tag><c>enoent</c></tag>
           <item>
@@ -557,14 +507,10 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>make_dir(Dir) -> ok | {error, Reason}</name>
+      <name name="make_dir" arity="1"/>
       <fsummary>Make a directory</fsummary>
-      <type>
-        <v>Dir = name()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
-        <p>Tries to create the directory <c>Dir</c>. Missing parent
+        <p>Tries to create the directory <c><anno>Dir</anno></c>. Missing parent
           directories are <em>not</em> created. Returns <c>ok</c> if
           successful.</p>
         <p>Typical error reasons are:</p>
@@ -572,15 +518,15 @@ f.txt:  {person, "kalle", 25}.
           <tag><c>eacces</c></tag>
           <item>
             <p>Missing search or write permissions for the parent
-              directories of <c>Dir</c>.</p>
+              directories of <c><anno>Dir</anno></c>.</p>
           </item>
           <tag><c>eexist</c></tag>
           <item>
-            <p>There is already a file or directory named <c>Dir</c>.</p>
+            <p>There is already a file or directory named <c><anno>Dir</anno></c>.</p>
           </item>
           <tag><c>enoent</c></tag>
           <item>
-            <p>A component of <c>Dir</c> does not exist.</p>
+            <p>A component of <c><anno>Dir</anno></c> does not exist.</p>
           </item>
           <tag><c>enospc</c></tag>
           <item>
@@ -588,35 +534,33 @@ f.txt:  {person, "kalle", 25}.
           </item>
           <tag><c>enotdir</c></tag>
           <item>
-            <p>A component of <c>Dir</c> is not a directory. On some
-              platforms, <c>enoent</c> is returned instead.</p>
+            <p>A component of <c><anno>Dir</anno></c> is not a directory.
+              On some platforms, <c>enoent</c> is returned instead.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>make_link(Existing, New) -> ok | {error, Reason}</name>
+      <name name="make_link" arity="2"/>
       <fsummary>Make a hard link to a file</fsummary>
-      <type>
-        <v>Existing = New = name()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
-        <p>Makes a hard link from <c>Existing</c> to <c>New</c>, on
+        <p>Makes a hard link from <c><anno>Existing</anno></c> to
+          <c><anno>New</anno></c>, on
           platforms that support links (Unix). This function returns
           <c>ok</c> if the link was successfully created, or
-          <c>{error, Reason}</c>. On platforms that do not support
+          <c>{error, <anno>Reason</anno>}</c>. On platforms that do not support
           links, <c>{error,enotsup}</c> is returned.</p>
         <p>Typical error reasons:</p>
         <taglist>
           <tag><c>eacces</c></tag>
           <item>
             <p>Missing read or write permissions for the parent
-              directories of <c>Existing</c> or <c>New</c>.</p>
+              directories of <c><anno>Existing</anno></c> or
+              <c><anno>New</anno></c>.</p>
           </item>
           <tag><c>eexist</c></tag>
           <item>
-            <p><c>New</c> already exists.</p>
+            <p><c><anno>New</anno></c> already exists.</p>
           </item>
           <tag><c>enotsup</c></tag>
           <item>
@@ -626,30 +570,28 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>make_symlink(Name1, Name2) -> ok | {error, Reason}</name>
+      <name name="make_symlink" arity="2"/>
       <fsummary>Make a symbolic link to a file or directory</fsummary>
-      <type>
-        <v>Name1 = Name2 = name()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
-        <p>This function creates a symbolic link <c>Name2</c> to
-          the file or directory <c>Name1</c>, on platforms that support
-          symbolic links (most Unix systems). <c>Name1</c> need not
+        <p>This function creates a symbolic link <c><anno>Name2</anno></c> to
+          the file or directory <c><anno>Name1</anno></c>, on platforms that
+          support
+          symbolic links (most Unix systems). <c><anno>Name1</anno></c> need not
           exist. This function returns <c>ok</c> if the link was
-          successfully created, or <c>{error, Reason}</c>. On platforms
+          successfully created, or <c>{error, <anno>Reason</anno>}</c>.
+          On platforms
           that do not support symbolic links, <c>{error, enotsup}</c>
           is returned.</p>
         <p>Typical error reasons:</p>
         <taglist>
           <tag><c>eacces</c></tag>
           <item>
-            <p>Missing read or write permissions for the parent
-              directories of <c>Name1</c> or <c>Name2</c>.</p>
+            <p>Missing read or write permissions for the parent directories
+            of <c><anno>Name1</anno></c> or <c><anno>Name2</anno></c>.</p>
           </item>
           <tag><c>eexist</c></tag>
           <item>
-            <p><c>Name2</c> already exists.</p>
+            <p><c><anno>Name2</anno></c> already exists.</p>
           </item>
           <tag><c>enotsup</c></tag>
           <item>
@@ -668,22 +610,12 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>open(Filename, Modes) -> {ok, IoDevice} | {error, Reason}</name>
+      <name name="open" arity="2"/>
       <fsummary>Open a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Modes = [Mode]</v>
-        <v>&nbsp;Mode = read | write | append | exclusive | raw | binary | {delayed_write, Size, Delay} | delayed_write | {read_ahead, Size} | read_ahead | compressed | {encoding, Encoding}</v>
-        <v>&nbsp;&nbsp;Size = Delay = int()</v>
-	<v>&nbsp;&nbsp;Encoding = latin1 | unicode | utf8 | utf16 | {utf16, Endian} | utf32 | {utf32, Endian}</v>
-        <v>&nbsp;&nbsp;&nbsp;&nbsp;Endian = big | little</v>
-        <v>IoDevice = io_device()</v>
-        <v>Reason = ext_posix() | system_limit</v>
-      </type>
       <desc>
-        <p>Opens the file <c>Filename</c> in the mode determined by
-          <c>Modes</c>, which may contain one or more of the following
-          items:</p>
+        <p>Opens the file <c><anno>Filename</anno></c> in the mode determined
+          by <c><anno>Modes</anno></c>, which may contain one or more of the
+          following items:</p>
         <taglist>
           <tag><c>read</c></tag>
           <item>
@@ -841,23 +773,23 @@ f.txt:  {person, "kalle", 25}.
         </taglist>
         <p>Returns:</p>
         <taglist>
-          <tag><c>{ok, IoDevice}</c></tag>
+          <tag><c>{ok, <anno>IoDevice</anno>}</c></tag>
           <item>
             <p>The file has been opened in the requested mode.
-              <c>IoDevice</c> is a reference to the file.</p>
+              <c><anno>IoDevice</anno></c> is a reference to the file.</p>
           </item>
-          <tag><c>{error, Reason}</c></tag>
+          <tag><c>{error, <anno>Reason</anno>}</c></tag>
           <item>
             <p>The file could not be opened.</p>
           </item>
         </taglist>
-        <p><c>IoDevice</c> is really the pid of the process which
+        <p><c><anno>IoDevice</anno></c> is really the pid of the process which
           handles the file. This process is linked to the process
           which originally opened the file. If any process to which
-          the <c>IoDevice</c> is linked terminates, the file will be
-          closed and the process itself will be terminated.
-          An <c>IoDevice</c> returned from this call can be used as an
-          argument to the IO functions (see
+          the <c><anno>IoDevice</anno></c> is linked terminates, the file will
+          be closed and the process itself will be terminated.
+          An <c><anno>IoDevice</anno></c> returned from this call can be used
+          as an argument to the IO functions (see
           <seealso marker="stdlib:io">io(3)</seealso>).</p>
         <note>
           <p>In previous versions of <c>file</c>, modes were given
@@ -897,34 +829,25 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>path_consult(Path, Filename) -> {ok, Terms, FullName} | {error, Reason}</name>
+      <name name="path_consult" arity="2"/>
       <fsummary>Read Erlang terms from a file</fsummary>
-      <type>
-        <v>Path = [Dir]</v>
-        <v>&nbsp;Dir = name()</v>
-        <v>Filename = name()</v>
-        <v>Terms = [term()]</v>
-        <v>FullName = string()</v>
-        <v>Reason = ext_posix() | terminated | system_limit
-                  | {Line, Mod, Term}</v>
-        <v>&nbsp;Line, Mod, Term -- see below</v>
-      </type>
       <desc>
-        <p>Searches the path <c>Path</c> (a list of directory names)
-          until the file <c>Filename</c> is found. If <c>Filename</c>
-          is an absolute filename, <c>Path</c> is ignored.
+        <p>Searches the path <c><anno>Path</anno></c> (a list of directory
+          names) until the file <c><anno>Filename</anno></c> is found.
+          If <c><anno>Filename</anno></c>
+          is an absolute filename, <c><anno>Path</anno></c> is ignored.
           Then reads Erlang terms, separated by '.', from the file.
           Returns one of the following:</p>
         <taglist>
-          <tag><c>{ok, Terms, FullName}</c></tag>
+          <tag><c>{ok, <anno>Terms</anno>, <anno>FullName</anno>}</c></tag>
           <item>
-            <p>The file was successfully read. <c>FullName</c> is
+            <p>The file was successfully read. <c><anno>FullName</anno></c> is
               the full name of the file.</p>
           </item>
           <tag><c>{error, enoent}</c></tag>
           <item>
             <p>The file could not be found in any of the directories in
-              <c>Path</c>.</p>
+              <c><anno>Path</anno></c>.</p>
           </item>
           <tag><c>{error, atom()}</c></tag>
           <item>
@@ -932,7 +855,8 @@ f.txt:  {person, "kalle", 25}.
               See <seealso marker="#open/2">open/2</seealso> for a list
               of typical error codes.</p>
           </item>
-          <tag><c>{error, {Line, Mod, Term}}</c></tag>
+          <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
+                           <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang terms in
               the file. Use <c>format_error/1</c> to convert
@@ -943,36 +867,28 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>path_eval(Path, Filename) -> {ok, FullName} | {error, Reason}</name>
+      <name name="path_eval" arity="2"/>
       <fsummary>Evaluate Erlang expressions in a file</fsummary>
-      <type>
-        <v>Path = [Dir]</v>
-        <v>&nbsp;Dir = name()</v>
-        <v>Filename = name()</v>
-        <v>FullName = string()</v>
-        <v>Reason = ext_posix() | terminated | system_limit
-                  | {Line, Mod, Term}</v>
-        <v>&nbsp;Line, Mod, Term -- see below</v>
-      </type>
       <desc>
-        <p>Searches the path <c>Path</c> (a list of directory names)
-          until the file <c>Filename</c> is found. If <c>Filename</c>
-          is an absolute file name, <c>Path</c> is ignored. Then reads
+        <p>Searches the path <c><anno>Path</anno></c> (a list of directory
+          names) until the file <c><anno>Filename</anno></c> is found.
+          If <c><anno>Filename</anno></c> is an absolute file name,
+          <c><anno>Path</anno></c> is ignored. Then reads
           and evaluates Erlang expressions, separated by '.' (or ',', a
           sequence of expressions is also an expression), from the file.
           The actual result of evaluation is not returned; any
           expression sequence in the file must be there for its side
           effect. Returns one of the following:</p>
         <taglist>
-          <tag><c>{ok, FullName}</c></tag>
+          <tag><c>{ok, <anno>FullName</anno>}</c></tag>
           <item>
-            <p>The file was read and evaluated. <c>FullName</c> is
+            <p>The file was read and evaluated. <c><anno>FullName</anno></c> is
               the full name of the file.</p>
           </item>
           <tag><c>{error, enoent}</c></tag>
           <item>
             <p>The file could not be found in any of the directories in
-              <c>Path</c>.</p>
+              <c><anno>Path</anno></c>.</p>
           </item>
           <tag><c>{error, atom()}</c></tag>
           <item>
@@ -980,7 +896,8 @@ f.txt:  {person, "kalle", 25}.
               See <seealso marker="#open/2">open/2</seealso> for a list
               of typical error codes.</p>
           </item>
-          <tag><c>{error, {Line, Mod, Term}}</c></tag>
+          <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
+                           <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang
               expressions in the file. Use <c>format_error/1</c> to
@@ -991,34 +908,26 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>path_open(Path, Filename, Modes) -> {ok, IoDevice, FullName} | {error, Reason}</name>
+      <name name="path_open" arity="3"/>
       <fsummary>Open a file</fsummary>
-      <type>
-        <v>Path = [Dir]</v>
-        <v>&nbsp;Dir = name()</v>
-        <v>Filename = name()</v>
-        <v>Modes = [Mode] -- see open/2</v>
-        <v>IoDevice = io_device()</v>
-        <v>FullName = string()</v>
-        <v>Reason = ext_posix() | system_limit</v>
-      </type>
       <desc>
-        <p>Searches the path <c>Path</c> (a list of directory names)
-          until the file <c>Filename</c> is found. If <c>Filename</c>
-          is an absolute file name, <c>Path</c> is ignored.
-          Then opens the file in the mode determined by <c>Modes</c>.
+        <p>Searches the path <c><anno>Path</anno></c> (a list of directory
+          names) until the file <c><anno>Filename</anno></c> is found.
+          If <c><anno>Filename</anno></c>
+          is an absolute file name, <c><anno>Path</anno></c> is ignored.
+          Then opens the file in the mode determined by <c><anno>Modes</anno></c>.
           Returns one of the following:</p>
         <taglist>
-          <tag><c>{ok, IoDevice, FullName}</c></tag>
+          <tag><c>{ok, <anno>IoDevice</anno>, <anno>FullName</anno>}</c></tag>
           <item>
             <p>The file has been opened in the requested mode.
-              <c>IoDevice</c> is a reference to the file and
-              <c>FullName</c> is the full name of the file.</p>
+              <c><anno>IoDevice</anno></c> is a reference to the file and
+              <c><anno>FullName</anno></c> is the full name of the file.</p>
           </item>
           <tag><c>{error, enoent}</c></tag>
           <item>
             <p>The file could not be found in any of the directories in
-              <c>Path</c>.</p>
+              <c><anno>Path</anno></c>.</p>
           </item>
           <tag><c>{error, atom()}</c></tag>
           <item>
@@ -1028,36 +937,27 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>path_script(Path, Filename) -> {ok, Value, FullName} | {error, Reason}</name>
+      <name name="path_script" arity="2"/>
       <fsummary>Evaluate and return the value of Erlang expressions in a file</fsummary>
-      <type>
-        <v>Path = [Dir]</v>
-        <v>&nbsp;Dir = name()</v>
-        <v>Filename = name()</v>
-        <v>Value = term()</v>
-        <v>FullName = string()</v>
-        <v>Reason = ext_posix() | terminated | system_limit 
-                  | {Line, Mod, Term}</v>
-        <v>&nbsp;Line, Mod, Term -- see below</v>
-      </type>
       <desc>
-        <p>Searches the path <c>Path</c> (a list of directory names)
-          until the file <c>Filename</c> is found. If <c>Filename</c>
-          is an absolute file name, <c>Path</c> is ignored. Then reads
+        <p>Searches the path <c><anno>Path</anno></c> (a list of directory
+          names) until the file <c><anno>Filename</anno></c> is found.
+          If <c><anno>Filename</anno></c> is an absolute file name,
+          <c><anno>Path</anno></c> is ignored. Then reads
           and evaluates Erlang expressions, separated by '.' (or ',', a
           sequence of expressions is also an expression), from the file.
           Returns one of the following:</p>
         <taglist>
-          <tag><c>{ok, Value, FullName}</c></tag>
+          <tag><c>{ok, <anno>Value</anno>, <anno>FullName</anno>}</c></tag>
           <item>
-            <p>The file was read and evaluated. <c>FullName</c> is
-              the full name of the file and <c>Value</c> the value of
+            <p>The file was read and evaluated. <c><anno>FullName</anno></c> is
+              the full name of the file and <c><anno>Value</anno></c> the value of
               the last expression.</p>
           </item>
           <tag><c>{error, enoent}</c></tag>
           <item>
             <p>The file could not be found in any of the directories in
-              <c>Path</c>.</p>
+              <c><anno>Path</anno></c>.</p>
           </item>
           <tag><c>{error, atom()}</c></tag>
           <item>
@@ -1065,7 +965,8 @@ f.txt:  {person, "kalle", 25}.
               See <seealso marker="#open/2">open/2</seealso> for a list
               of typical error codes.</p>
           </item>
-          <tag><c>{error, {Line, Mod, Term}}</c></tag>
+          <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
+                           <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang
               expressions in the file. Use <c>format_error/1</c> to
@@ -1076,42 +977,28 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>path_script(Path, Filename, Bindings) -> {ok, Value, FullName} | {error, Reason}</name>
+      <name name="path_script" arity="3"/>
       <fsummary>Evaluate and return the value of Erlang expressions in a file</fsummary>
-      <type>
-        <v>Path = [Dir]</v>
-        <v>&nbsp;Dir = name()</v>
-        <v>Filename = name()</v>
-        <v>Bindings -- see erl_eval(3)</v>
-        <v>Value = term()</v>
-        <v>FullName = string()</v>
-        <v>Reason = posix() | terminated | system_limit
-                  | {Line, Mod, Term}</v>
-        <v>&nbsp;Line, Mod, Term -- see path_script/2</v>
-      </type>
       <desc>
         <p>The same as <c>path_script/2</c> but the variable bindings
-          <c>Bindings</c> are used in the evaluation. See
+          <c><anno>Bindings</anno></c> are used in the evaluation. See
           <seealso marker="stdlib:erl_eval">erl_eval(3)</seealso> about
           variable bindings.</p>
       </desc>
     </func>
     <func>
-      <name>pid2name(Pid) -> string() | undefined</name>
+      <name name="pid2name" arity="1"/>
       <fsummary>Return the name of the file handled by a pid</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-      </type>
       <desc>
-        <p>If <c>Pid</c> is an IO device, that is, a pid returned from
+        <p>If <c><anno>Pid</anno></c> is an IO device, that is, a pid returned from
           <c>open/2</c>, this function returns the filename, or rather:</p>
         <taglist>
-          <tag><c>{ok, Filename}</c></tag>
+          <tag><c>{ok, <anno>Filename</anno>}</c></tag>
           <item>
             <p>If this node's file server is not a slave, the file was
               opened by this node's file server, (this implies that
-              <c>Pid</c> must be a local pid) and the file is not
-              closed. <c>Filename</c> is the filename in flat string
+              <c><anno>Pid</anno></c> must be a local pid) and the file is not
+              closed. <c><anno>Filename</anno></c> is the filename in flat string
               format.</p>
           </item>
           <tag><c>undefined</c></tag>
@@ -1125,21 +1012,15 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>position(IoDevice, Location) -> {ok, NewPosition} | {error, Reason}</name>
+      <name name="position" arity="2"/>
       <fsummary>Set position in a file</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Location = Offset | {bof, Offset} | {cur, Offset} | {eof, Offset} | bof | cur | eof</v>
-        <v>&nbsp;Offset = int()</v>
-        <v>NewPosition = int()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
-        <p>Sets the position of the file referenced by <c>IoDevice</c>
-          to <c>Location</c>. Returns <c>{ok, NewPosition}</c> (as
+        <p>Sets the position of the file referenced by <c><anno>IoDevice</anno></c>
+          to <c><anno>Location</anno></c>. Returns
+          <c>{ok, <anno>NewPosition</anno>}</c> (as
           absolute offset) if successful, otherwise
-          <c>{error, Reason}</c>. <c>Location</c> is one of
-          the following:</p>
+          <c>{error, <anno>Reason</anno>}</c>. <c><anno>Location</anno></c> is
+          one of the following:</p>
         <taglist>
           <tag><c>Offset</c></tag>
           <item>
@@ -1167,7 +1048,8 @@ f.txt:  {person, "kalle", 25}.
         <taglist>
           <tag><c>einval</c></tag>
           <item>
-            <p>Either <c>Location</c> was illegal, or it evaluated to a
+            <p>Either <c><anno>Location</anno></c> was illegal, or it
+              evaluated to a
               negative offset in the file. Note that if the resulting
               position is a negative value, the result is an error, and
               after the call the file position is undefined.</p>
@@ -1176,22 +1058,14 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>pread(IoDevice, LocNums) -> {ok, DataL} | eof | {error, Reason}</name>
+      <name name="pread" arity="2"/>
       <fsummary>Read from a file at certain positions</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>LocNums = [{Location, Number}]</v>
-        <v>&nbsp;Location -- see position/2</v>
-        <v>&nbsp;Number = int()</v>
-        <v>DataL = [Data]</v>
-        <v>&nbsp;Data = [char()] | binary()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
         <p>Performs a sequence of <c>pread/3</c> in one operation, 
           which is more efficient than calling them one at a time.
-          Returns <c>{ok, [Data, ...]}</c> or <c>{error, Reason}</c>,
-          where each <c>Data</c>, the result of the corresponding
+          Returns <c>{ok, [<anno>Data</anno>, ...]}</c> or
+          <c>{error, <anno>Reason</anno>}</c>,
+          where each <c><anno>Data</anno></c>, the result of the corresponding
           <c>pread</c>, is either a list or a binary depending on
           the mode of the file, or <c>eof</c> if the requested position
           was beyond end of file.</p>
@@ -1199,76 +1073,53 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>pread(IoDevice, Location, Number) -> {ok, Data} | eof | {error, Reason}</name>
+      <name name="pread" arity="3"/>
       <fsummary>Read from a file at a certain position</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Location -- see position/2</v>
-        <v>Number = int()</v>
-        <v>Data = [char()] | binary()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
         <p>Combines <c>position/2</c> and <c>read/2</c> in one
           operation, which is more efficient than calling them one at a
-          time. If <c>IoDevice</c> has been opened in raw mode, some
-          restrictions apply: <c>Location</c> is only allowed to be an
+          time. If <c><anno>IoDevice</anno></c> has been opened in raw mode,
+          some restrictions apply: <c><anno>Location</anno></c> is only allowed
+          to be an
           integer; and the current position of the file is undefined
           after the operation.</p>
 	  <p>As the position is given as a byte-offset, special caution has to be taken when working with files where <c>encoding</c> is set to something else than <c>latin1</c>, as not every byte position will be a valid character boundary on such a file.</p>
         </desc>
     </func>
     <func>
-      <name>pwrite(IoDevice, LocBytes) -> ok | {error, {N, Reason}}</name>
+      <name name="pwrite" arity="2"/>
       <fsummary>Write to a file at certain positions</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>LocBytes = [{Location, Bytes}]</v>
-        <v>&nbsp;Location -- see position/2</v>
-        <v>&nbsp;Bytes = iodata()</v>
-        <v>N = int()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
         <p>Performs a sequence of <c>pwrite/3</c> in one operation, 
           which is more efficient than calling them one at a time.
-          Returns <c>ok</c> or <c>{error, {N, Reason}}</c>, where
-          <c>N</c> is the number of successful writes that was done
+          Returns <c>ok</c> or <c>{error, {<anno>N</anno>,
+          <anno>Reason</anno>}}</c>, where
+          <c><anno>N</anno></c> is the number of successful writes that was done
           before the failure.</p>
 	<p>When positioning in a file with other <c>encoding</c> than <c>latin1</c>, caution must be taken to set the position on a correct character boundary, see <seealso marker="#position/2">position/2</seealso> for details.</p>
       </desc>
     </func>
     <func>
-      <name>pwrite(IoDevice, Location, Bytes) -> ok | {error, Reason}</name>
+      <name name="pwrite" arity="3"/>
       <fsummary>Write to a file at a certain position</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Location -- see position/2</v>
-        <v>Bytes = iodata()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
         <p>Combines <c>position/2</c> and <c>write/2</c> in one
           operation, which is more efficient than calling them one at a
-          time. If <c>IoDevice</c> has been opened in raw mode, some
-          restrictions apply: <c>Location</c> is only allowed to be an
+          time. If <c><anno>IoDevice</anno></c> has been opened in raw mode,
+          some restrictions apply: <c><anno>Location</anno></c> is only allowed
+          to be an
           integer; and the current position of the file is undefined
           after the operation.</p>
 	<p>When positioning in a file with other <c>encoding</c> than <c>latin1</c>, caution must be taken to set the position on a correct character boundary, see <seealso marker="#position/2">position/2</seealso> for details.</p>
       </desc>
     </func>
     <func>
-      <name>read(IoDevice, Number) -> {ok, Data} | eof | {error, Reason}</name>
+      <name name="read" arity="2"/>
       <fsummary>Read from a file</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Number = int()</v>
-        <v>Data = [char()] | binary()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
-        <p>Reads <c>Number</c> bytes/characters from the file referenced by
-          <c>IoDevice</c>. The functions <c>read/2</c>, <c>pread/3</c>
+        <p>Reads <c><anno>Number</anno></c> bytes/characters from the file
+          referenced by <c><anno>IoDevice</anno></c>. The functions
+          <c>read/2</c>, <c>pread/3</c>
           and <c>read_line/1</c> are the only ways to read from a file
           opened in raw mode (although they work for normally opened
           files, too).</p>
@@ -1276,7 +1127,7 @@ f.txt:  {person, "kalle", 25}.
 	  <p>Also if <c>encoding</c> is set to something else than <c>latin1</c>, the <c>read/3</c> call will fail if the data contains characters larger than 255, why the <seealso marker="stdlib:io">io(3)</seealso> module is to be preferred when reading such a file.</p> 
 	  <p>The function returns:</p>
         <taglist>
-          <tag><c>{ok, Data}</c></tag>
+          <tag><c>{ok, <anno>Data</anno>}</c></tag>
           <item>
             <p>If the file was opened in binary mode, the read bytes are
               returned in a binary, otherwise in a list. The list or
@@ -1285,10 +1136,10 @@ f.txt:  {person, "kalle", 25}.
           </item>
           <tag><c>eof</c></tag>
           <item>
-            <p>Returned if <c>Number>0</c> and end of file was reached
-              before anything at all could be read.</p>
+            <p>Returned if <c><anno>Number</anno>>0</c> and end of file was
+              reached before anything at all could be read.</p>
           </item>
-          <tag><c>{error, Reason}</c></tag>
+          <tag><c>{error, <anno>Reason</anno>}</c></tag>
           <item>
             <p>An error occurred.</p>
           </item>
@@ -1307,17 +1158,14 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>read_file(Filename) -> {ok, Binary} | {error, Reason}</name>
+      <name name="read_file" arity="1"/>
       <fsummary>Read a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Binary = binary()</v>
-        <v>Reason = ext_posix() | terminated | system_limit</v>
-      </type>
       <desc>
-        <p>Returns <c>{ok, Binary}</c>, where <c>Binary</c> is a binary
-          data object that contains the contents of <c>Filename</c>, or
-          <c>{error, Reason}</c> if an error occurs.</p>
+        <p>Returns <c>{ok, <anno>Binary</anno>}</c>, where
+          <c><anno>Binary</anno></c> is a binary
+          data object that contains the contents of
+          <c><anno>Filename</anno></c>, or
+          <c>{error, <anno>Reason</anno>}</c> if an error occurs.</p>
         <p>Typical error reasons:</p>
         <taglist>
           <tag><c>enoent</c></tag>
@@ -1346,17 +1194,13 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>read_file_info(Filename) -> {ok, FileInfo} | {error, Reason}</name>
+      <name name="read_file_info" arity="1"/>
       <fsummary>Get information about a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>FileInfo = #file_info{}</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
         <p>Retrieves information about a file. Returns
-          <c>{ok, FileInfo}</c> if successful, otherwise
-          <c>{error, Reason}</c>. <c>FileInfo</c> is a record
+          <c>{ok, <anno>FileInfo</anno>}</c> if successful, otherwise
+          <c>{error, <anno>Reason</anno>}</c>. <c><anno>FileInfo</anno></c>
+          is a record
           <c>file_info</c>, defined in the Kernel include file
           <c>file.hrl</c>. Include the following directive in the module
           from which the function is called:</p>
@@ -1364,7 +1208,7 @@ f.txt:  {person, "kalle", 25}.
 -include_lib("kernel/include/file.hrl").</code>
         <p>The record <c>file_info</c> contains the following fields.</p>
         <taglist>
-          <tag><c>size = int()</c></tag>
+          <tag><c>size = integer()</c></tag>
           <item>
             <p>Size of file in bytes.</p>
           </item>
@@ -1391,7 +1235,7 @@ f.txt:  {person, "kalle", 25}.
               the file or the inode was changed. In Windows, it is
               the create time.</p>
           </item>
-          <tag><c>mode = int()</c></tag>
+          <tag><c>mode = integer()</c></tag>
           <item>
             <p>The file permissions as the sum of the following bit
               values:</p>
@@ -1422,33 +1266,33 @@ f.txt:  {person, "kalle", 25}.
             <p>On Unix platforms, other bits than those listed above
               may be set.</p>
           </item>
-          <tag><c>links = int()</c></tag>
+          <tag><c>links = integer()</c></tag>
           <item>
             <p>Number of links to the file (this will always be 1 for
               file systems which have no concept of links).</p>
           </item>
-          <tag><c>major_device = int()</c></tag>
+          <tag><c>major_device = integer()</c></tag>
           <item>
             <p>Identifies the file system where the file is located.
               In Windows, the number indicates a drive as follows:
               0 means A:, 1 means B:, and so on.</p>
           </item>
-          <tag><c>minor_device = int()</c></tag>
+          <tag><c>minor_device = integer()</c></tag>
           <item>
             <p>Only valid for character devices on Unix. In all other
               cases, this field is zero.</p>
           </item>
-          <tag><c>inode = int()</c></tag>
+          <tag><c>inode = integer()</c></tag>
           <item>
             <p>Gives the <c>inode</c> number. On non-Unix file systems,
               this field will be zero.</p>
           </item>
-          <tag><c>uid = int()</c></tag>
+          <tag><c>uid = integer()</c></tag>
           <item>
             <p>Indicates the owner of the file. Will be zero for
               non-Unix file systems.</p>
           </item>
-          <tag><c>gid = int()</c></tag>
+          <tag><c>gid = integer()</c></tag>
           <item>
             <p>Gives the group that the owner of the file belongs to.
               Will be zero for non-Unix file systems.</p>
@@ -1474,21 +1318,16 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>read_line(IoDevice) -> {ok, Data} | eof | {error, Reason}</name>
+      <name name="read_line" arity="1"/>
       <fsummary>Read a line from a file</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Data = [char()] | binary()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
         <p>Reads a line of bytes/characters from the file referenced by
-          <c>IoDevice</c>. Lines are defined to be delimited by the linefeed (LF, <c>\n</c>) character, but any carriage return (CR, <c>\r</c>) followed by a newline is also treated as a single LF character (the carriage return is silently ignored). The line is returned <em>including</em> the LF, but excluding any CR immediately followed by a LF. This behaviour is consistent with the behaviour of <seealso marker="stdlib:io#get_line/2">io:get_line/2</seealso>. If end of file is reached without any LF ending the last line, a line with no trailing LF is returned.</p> 
+          <c><anno>IoDevice</anno></c>. Lines are defined to be delimited by the linefeed (LF, <c>\n</c>) character, but any carriage return (CR, <c>\r</c>) followed by a newline is also treated as a single LF character (the carriage return is silently ignored). The line is returned <em>including</em> the LF, but excluding any CR immediately followed by a LF. This behaviour is consistent with the behaviour of <seealso marker="stdlib:io#get_line/2">io:get_line/2</seealso>. If end of file is reached without any LF ending the last line, a line with no trailing LF is returned.</p>
 	  <p>The function can be used on files opened in <c>raw</c> mode. It is however inefficient to use it on <c>raw</c> files if the file is not opened with the option <c>{read_ahead, Size}</c> specified, why combining <c>raw</c> and <c>{read_ahead, Size}</c> is highly recommended when opening a text file for raw line oriented reading.</p> 
 	  <p>If <c>encoding</c> is set to something else than <c>latin1</c>, the <c>read_line/1</c> call will fail if the data contains characters larger than 255, why the <seealso marker="stdlib:io">io(3)</seealso> module is to be preferred when reading such a file.</p> 
 	  <p>The function returns:</p>
         <taglist>
-          <tag><c>{ok, Data}</c></tag>
+          <tag><c>{ok, <anno>Data</anno>}</c></tag>
           <item>
 	    <p>One line from the file is returned, including the trailing LF, but with CRLF sequences replaced by a single LF (see above).</p>
             <p>If the file was opened in binary mode, the read bytes are
@@ -1499,7 +1338,7 @@ f.txt:  {person, "kalle", 25}.
             <p>Returned if end of file was reached
               before anything at all could be read.</p>
           </item>
-          <tag><c>{error, Reason}</c></tag>
+          <tag><c>{error, <anno>Reason</anno>}</c></tag>
           <item>
             <p>An error occurred.</p>
           </item>
@@ -1518,23 +1357,19 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>read_link(Name) -> {ok, Filename} | {error, Reason}</name>
+      <name name="read_link" arity="1"/>
       <fsummary>See what a link is pointing to</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Filename = string()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
-        <p>This function returns <c>{ok, Filename}</c> if <c>Name</c>
-          refers to a symbolic link or <c>{error, Reason}</c> otherwise.
+        <p>This function returns <c>{ok, <anno>Filename</anno>}</c> if
+          <c><anno>Name</anno></c> refers to a symbolic link or
+          <c>{error, <anno>Reason</anno>}</c> otherwise.
           On platforms that do not support symbolic links, the return
           value will be <c>{error,enotsup}</c>.</p>
         <p>Typical error reasons:</p>
         <taglist>
           <tag><c>einval</c></tag>
           <item>
-            <p><c>Linkname</c> does not refer to a symbolic link.</p>
+            <p><c><anno>Name</anno></c> does not refer to a symbolic link.</p>
           </item>
           <tag><c>enoent</c></tag>
           <item>
@@ -1548,34 +1383,26 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>read_link_info(Name) -> {ok, FileInfo} | {error, Reason}</name>
+      <name name="read_link_info" arity="1"/>
       <fsummary>Get information about a link or file</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>FileInfo = #file_info{}, see read_file_info/1</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
         <p>This function works like <c>read_file_info/1</c>, except that
-          if <c>Name</c> is a symbolic link, information about the link
-          will be returned in the <c>file_info</c> record and
+          if <c><anno>Name</anno></c> is a symbolic link, information about
+          the link will be returned in the <c>file_info</c> record and
           the <c>type</c> field of the record will be set to
           <c>symlink</c>.</p>
-        <p>If <c>Name</c> is not a symbolic link, this function returns
+        <p>If <c><anno>Name</anno></c> is not a symbolic link, this function returns
           exactly the same result as <c>read_file_info/1</c>.
           On platforms that do not support symbolic links, this function
           is always equivalent to <c>read_file_info/1</c>.</p>
       </desc>
     </func>
     <func>
-      <name>rename(Source, Destination) -> ok | {error, Reason}</name>
+      <name name="rename" arity="2"/>
       <fsummary>Rename a file</fsummary>
-      <type>
-        <v>Source = Destination = name()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
-        <p>Tries to rename the file <c>Source</c> to <c>Destination</c>.
+        <p>Tries to rename the file <c><anno>Source</anno></c> to
+          <c><anno>Destination</anno></c>.
           It can be used to move files (and directories) between
           directories, but it is not sufficient to specify
           the destination only. The destination file name must also be
@@ -1593,25 +1420,28 @@ f.txt:  {person, "kalle", 25}.
           <tag><c>eacces</c></tag>
           <item>
             <p>Missing read or write permissions for the parent
-              directories of <c>Source</c> or <c>Destination</c>. On
+              directories of <c><anno>Source</anno></c> or
+              <c><anno>Destination</anno></c>. On
               some platforms, this error is given if either
-              <c>Source</c> or <c>Destination</c> is open.</p>
+              <c><anno>Source</anno></c> or <c><anno>Destination</anno></c>
+              is open.</p>
           </item>
           <tag><c>eexist</c></tag>
           <item>
-            <p><c>Destination</c> is not an empty directory. On some
-              platforms, also given when <c>Source</c> and
-              <c>Destination</c> are not of the same type.</p>
+            <p><c><anno>Destination</anno></c> is not an empty directory.
+              On some platforms, also given when <c><anno>Source</anno></c> and
+              <c><anno>Destination</anno></c> are not of the same type.</p>
           </item>
           <tag><c>einval</c></tag>
           <item>
-            <p><c>Source</c> is a root directory, or <c>Destination</c>
-              is a sub-directory of <c>Source</c>.</p>
+            <p><c><anno>Source</anno></c> is a root directory, or
+              <c><anno>Destination</anno></c>
+              is a sub-directory of <c><anno>Source</anno></c>.</p>
           </item>
           <tag><c>eisdir</c></tag>
           <item>
-            <p><c>Destination</c> is a directory, but <c>Source</c> is
-              not.</p>
+            <p><c><anno>Destination</anno></c> is a directory, but
+              <c><anno>Source</anno></c> is not.</p>
           </item>
           <tag><c>enoent</c></tag>
           <item>
@@ -1619,35 +1449,28 @@ f.txt:  {person, "kalle", 25}.
           </item>
           <tag><c>enotdir</c></tag>
           <item>
-            <p><c>Source</c> is a directory, but <c>Destination</c> is
-              not.</p>
+            <p><c><anno>Source</anno></c> is a directory, but
+              <c><anno>Destination</anno></c> is not.</p>
           </item>
           <tag><c>exdev</c></tag>
           <item>
-            <p><c>Source</c> and <c>Destination</c> are on different
-              file systems.</p>
+            <p><c><anno>Source</anno></c> and <c><anno>Destination</anno></c>
+              are on different file systems.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>script(Filename) -> {ok, Value} | {error, Reason}</name>
+      <name name="script" arity="1"/>
       <fsummary>Evaluate and return the value of Erlang expressions in a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Value = term()</v>
-        <v>Reason = ext_posix() | terminated | system_limit 
-                  | {Line, Mod, Term}</v>
-        <v>&nbsp;Line, Mod, Term -- see below</v>
-      </type>
       <desc>
         <p>Reads and evaluates Erlang expressions, separated by '.' (or
           ',', a sequence of expressions is also an expression), from
           the file. Returns one of the following:</p>
         <taglist>
-          <tag><c>{ok, Value}</c></tag>
+          <tag><c>{ok, <anno>Value</anno>}</c></tag>
           <item>
-            <p>The file was read and evaluated. <c>Value</c> is
+            <p>The file was read and evaluated. <c><anno>Value</anno></c> is
               the value of the last expression.</p>
           </item>
           <tag><c>{error, atom()}</c></tag>
@@ -1656,7 +1479,8 @@ f.txt:  {person, "kalle", 25}.
               See <seealso marker="#open/2">open/2</seealso> for a list
               of typical error codes.</p>
           </item>
-          <tag><c>{error, {Line, Mod, Term}}</c></tag>
+          <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
+                           <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang
               expressions in the file. Use <c>format_error/1</c> to
@@ -1667,33 +1491,21 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>script(Filename, Bindings) -> {ok, Value} | {error, Reason}</name>
+      <name name="script" arity="2"/>
       <fsummary>Evaluate and return the value of Erlang expressions in a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Bindings -- see erl_eval(3)</v>
-        <v>Value = term()</v>
-        <v>Reason = ext_posix() | terminated | system_limit 
-                  | {Line, Mod, Term}</v>
-        <v>&nbsp;Line, Mod, Term -- see below</v>
-      </type>
       <desc>
         <p>The same as <c>script/1</c> but the variable bindings
-          <c>Bindings</c> are used in the evaluation. See
+          <c><anno>Bindings</anno></c> are used in the evaluation. See
           <seealso marker="stdlib:erl_eval">erl_eval(3)</seealso> about
           variable bindings.</p>
       </desc>
     </func>
     <func>
-      <name>set_cwd(Dir) -> ok | {error,Reason}</name>
+      <name name="set_cwd" arity="1"/>
       <fsummary>Set the current working directory</fsummary>
-      <type>
-        <v>Dir = name()</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
         <p>Sets the current working directory of the file server to
-          <c>Dir</c>. Returns <c>ok</c> if successful.</p>
+          <c><anno>Dir</anno></c>. Returns <c>ok</c> if successful.</p>
         <p>Typical error reasons are:</p>
         <taglist>
           <tag><c>enoent</c></tag>
@@ -1702,8 +1514,8 @@ f.txt:  {person, "kalle", 25}.
           </item>
           <tag><c>enotdir</c></tag>
           <item>
-            <p>A component of <c>Dir</c> is not a directory. On some
-              platforms, <c>enoent</c> is returned.</p>
+            <p>A component of <c><anno>Dir</anno></c> is not a directory.
+              On some platforms, <c>enoent</c> is returned.</p>
           </item>
           <tag><c>eacces</c></tag>
           <item>
@@ -1712,23 +1524,21 @@ f.txt:  {person, "kalle", 25}.
           </item>
           <tag><c>badarg</c></tag>
           <item>
-            <p><c>Filename</c> had an improper type, such as tuple.</p>
+            <p><c><anno>Dir</anno></c> had an improper type,
+              such as tuple.</p>
           </item>
         </taglist>
         <warning>
-          <p>In a future release, a bad type for the <c>Filename</c>
+          <p>In a future release, a bad type for the
+            <c><anno>Dir</anno></c>
             argument will probably generate an exception.</p>
           <p></p>
         </warning>
       </desc>
     </func>
     <func>
-      <name>sync(IoDevice) -> ok | {error, Reason}</name>
+      <name name="sync" arity="1"/>
       <fsummary>Synchronizes the in-memory state of a file with that on the physical medium</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
         <p>Makes sure that any buffers kept by the operating system
           (not by the Erlang runtime system) are written to disk. On
@@ -1743,12 +1553,8 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>datasync(IoDevice) -> ok | {error, Reason}</name>
+      <name name="datasync" arity="1"/>
       <fsummary>Synchronizes the in-memory data of a file, ignoring most of its metadata, with that on the physical medium</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
         <p>Makes sure that any buffers kept by the operating system
           (not by the Erlang runtime system) are written to disk. In
@@ -1770,32 +1576,23 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>truncate(IoDevice) -> ok | {error, Reason}</name>
+      <name name="truncate" arity="1"/>
       <fsummary>Truncate a file</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
-        <p>Truncates the file referenced by <c>IoDevice</c> at
+        <p>Truncates the file referenced by <c><anno>IoDevice</anno></c> at
           the current position.  Returns <c>ok</c> if successful,
-          otherwise <c>{error, Reason}</c>.</p>
+          otherwise <c>{error, <anno>Reason</anno>}</c>.</p>
       </desc>
     </func>
     <func>
-      <name>write(IoDevice, Bytes) -> ok | {error, Reason}</name>
+      <name name="write" arity="2"/>
       <fsummary>Write to a file</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Bytes = iodata()</v>
-        <v>Reason = ext_posix() | terminated</v>
-      </type>
       <desc>
-        <p>Writes <c>Bytes</c> to the file referenced by
-          <c>IoDevice</c>. This function is the only way to write to a
+        <p>Writes <c><anno>Bytes</anno></c> to the file referenced by
+          <c><anno>IoDevice</anno></c>. This function is the only way to write to a
           file opened in raw mode (although it works for normally
           opened files, too). Returns <c>ok</c> if successful, and
-          <c>{error, Reason}</c> otherwise.</p>
+          <c>{error, <anno>Reason</anno>}</c> otherwise.</p>
 	  <p>If the file is opened with <c>encoding</c> set to something else than <c>latin1</c>, each byte written might result in several bytes actually being written to the file, as the byte range 0..255 might represent anything between one and four bytes depending on value and UTF encoding type.</p>
         <p>Typical error reasons are:</p>
         <taglist>
@@ -1811,18 +1608,14 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>write_file(Filename, Bytes) -> ok | {error, Reason}</name>
+      <name name="write_file" arity="2"/>
       <fsummary>Write a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Bytes = iodata()</v>
-        <v>Reason = ext_posix() | terminated | system_limit</v>
-      </type>
       <desc>
-        <p>Writes the contents of the iodata term <c>Bytes</c> to the
-          file <c>Filename</c>. The file is created if it does not
+        <p>Writes the contents of the iodata term <c><anno>Bytes</anno></c>
+          to the file <c><anno>Filename</anno></c>.
+          The file is created if it does not
           exist. If it exists, the previous contents are
-          overwritten. Returns <c>ok</c>, or <c>{error, Reason}</c>.</p>
+          overwritten. Returns <c>ok</c>, or <c>{error, <anno>Reason</anno>}</c>.</p>
         <p>Typical error reasons are:</p>
         <taglist>
           <tag><c>enoent</c></tag>
@@ -1851,33 +1644,23 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name>write_file(Filename, Bytes, Modes) -> ok | {error, Reason}</name>
+      <name name="write_file" arity="3"/>
       <fsummary>Write a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Bytes = iodata()</v>
-        <v>Modes = [Mode] -- see open/2</v>
-        <v>Reason = ext_posix() | terminated | system_limit</v>
-      </type>
       <desc>
         <p>Same as <c>write_file/2</c>, but takes a third argument
-          <c>Modes</c>, a list of possible modes, see
+          <c><anno>Modes</anno></c>, a list of possible modes, see
           <seealso marker="#open/2">open/2</seealso>. The mode flags
           <c>binary</c> and <c>write</c> are implicit, so they should
           not be used.</p>
       </desc>
     </func>
     <func>
-      <name>write_file_info(Filename, FileInfo) -> ok | {error, Reason}</name>
+      <name name="write_file_info" arity="2"/>
       <fsummary>Change information about a file</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>FileInfo = #file_info{} -- see also read_file_info/1</v>
-        <v>Reason = ext_posix()</v>
-      </type>
       <desc>
         <p>Change file information. Returns <c>ok</c> if successful,
-          otherwise <c>{error, Reason}</c>. <c>FileInfo</c> is a record
+          otherwise <c>{error, <anno>Reason</anno>}</c>.
+          <c><anno>FileInfo</anno></c> is a record
           <c>file_info</c>, defined in the Kernel include file
           <c>file.hrl</c>. Include the following directive in the module
           from which the function is called:</p>
@@ -1901,7 +1684,7 @@ f.txt:  {person, "kalle", 25}.
               time). On Windows, this field is the new creation time to
               set for the file.</p>
           </item>
-          <tag><c>mode = int()</c></tag>
+          <tag><c>mode = integer()</c></tag>
           <item>
             <p>The file permissions as the sum of the following bit
               values:</p>
@@ -1932,12 +1715,12 @@ f.txt:  {person, "kalle", 25}.
             <p>On Unix platforms, other bits than those listed above
               may be set.</p>
           </item>
-          <tag><c>uid = int()</c></tag>
+          <tag><c>uid = integer()</c></tag>
           <item>
             <p>Indicates the owner of the file. Ignored for non-Unix
               file systems.</p>
           </item>
-          <tag><c>gid = int()</c></tag>
+          <tag><c>gid = integer()</c></tag>
           <item>
             <p>Gives the group that the owner of the file belongs to.
               Ignored non-Unix file systems.</p>
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index fb09092f1c..5ceb82ae41 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2010</year>
+      <year>2007</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -65,77 +65,71 @@
       <item><seealso marker="#seealso">SEE ALSO</seealso></item>
       <item><seealso marker="#authors">AUTHORS</seealso></item>
     </list>
+    <marker id="types"></marker>
   </section>
 
-  <section>
-    <marker id="types"></marker>
-    <title>DATA TYPES</title>
-    <marker id="type-assoc_id"></marker>
-    <taglist>
-      <tag><c>assoc_id()</c></tag>
-      <item>
+  <datatypes>
+    <datatype>
+      <name name="assoc_id"/>
+      <desc>
         <p>An opaque term returned in for example #sctp_paddr_change{}
           that identifies an association for an SCTP socket. The term
           is opaque except for the special value <c>0</c> that has a
-          meaning such as "the whole endpoint" or "all future associations".</p>
-        <marker id="type-charlist"></marker>
-      </item>
-      <tag><c>charlist() = [char()]</c></tag>
-      <item>      <marker id="type-iolist"></marker>
-</item>
-      <tag><c>iolist() = [char() | binary()]</c></tag>
-      <item>      <marker id="type-ip_address"></marker>
-</item>
-      <tag><c>ip_address()</c></tag>
-      <item>
+          meaning such as "the whole endpoint" or "all future associations".
+        </p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="hostname"/>
+    </datatype>
+    <datatype>
+      <name name="ip_address"/>
+      <desc>
         <p>Represents an address of an SCTP socket. 
           It is a tuple as explained in
           <seealso marker="inet">inet(3)</seealso>.</p>
-        <marker id="type-port_number"></marker>
-      </item>
-      <tag><c>port_number() = 0 .. 65535</c></tag>
-      <item>      <marker id="type-posix"></marker>
-</item>
-      <tag><c>posix()</c></tag>
-      <item>
-        <p>See 
-          <seealso marker="inet#error_codes">inet(3); POSIX Error Codes.</seealso></p>
-        <marker id="type-sctp_option"></marker>
-      </item>
-      <tag><c>sctp_option()</c></tag>
-      <item>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="port_number"/>
+    </datatype>
+    <datatype>
+      <name name="posix"/>
+      <desc>
+        <p>See <seealso marker="inet#error_codes">
+        inet(3); POSIX Error Codes</seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="sctp_option"/>
+      <desc>
         <p>One of the 
           <seealso marker="#options">SCTP Socket Options.</seealso></p>
         <marker id="type-sctp_socket"></marker>
-      </item>
-      <tag><c>sctp_socket()</c></tag>
-      <item>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="sctp_socket"/>
+      <desc>
         <p>Socket identifier returned from <c>open/*</c>.</p>
-        <marker id="type-timeout"></marker>
-      </item>
-      <tag><c>timeout() = int() | infinity</c></tag>
-      <item>
-        <p>Timeout used in SCTP connect and receive calls.</p>
-      </item>
-    </taglist>
-    <marker id="exports"></marker>
-  </section>
+        <marker id="exports"></marker>
+      </desc>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
-      <name>abort(sctp_socket(), Assoc) -&gt; ok | {error, posix()}</name>
+      <name name="abort" arity="2"/>
       <fsummary>Abnormally terminate the association given by Assoc, without flushing of unsent data</fsummary>
-      <type>
-        <v>Assoc = #sctp_assoc_change{}</v>
-      </type>
       <desc>
-        <p>Abnormally terminates the association given by <c>Assoc</c>, without
+        <p>Abnormally terminates the association given by <c><anno>Assoc</anno></c>, without
           flushing of unsent data. The socket itself remains open. Other
           associations opened on this socket are still valid, and it can be
           used in new associations.</p>
       </desc>
     </func>
     <func>
-      <name>close(sctp_socket()) -&gt; ok | {error, posix()}</name>
+      <name name="close" arity="1"/>
       <fsummary>Completely close the socket and all associations on it</fsummary>
       <desc>
         <p>Completely closes the socket and all associations on it. The unsent
@@ -148,35 +142,26 @@
       </desc>
     </func>
     <func>
-      <name>connect(Socket, Addr, Port, Opts) -&gt; {ok,Assoc} | {error, posix()}</name>
+      <name name="connect" arity="4"/>
       <fsummary>Same as <c>connect(Socket, Addr, Port, Opts, infinity)</c>.</fsummary>
       <desc>
-        <p>Same as <c>connect(Socket, Addr, Port, Opts, infinity)</c>.</p>
+        <p>Same as <c>connect(<anno>Socket</anno>, <anno>Addr</anno>, <anno>Port</anno>, <anno>Opts</anno>, infinity)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>connect(Socket, Addr, Port, [Opt], Timeout) -&gt; {ok, Assoc} | {error, posix()}</name>
+      <name name="connect" arity="5"/>
       <fsummary>Establish a new association for the socket <c>Socket</c>, with a peer (SCTP server socket)</fsummary>
-      <type>
-        <v>Socket  = sctp_socket()</v>
-        <v>Addr    = ip_address() | Host</v>
-        <v>Port    = port_number()</v>
-        <v>Opt     = sctp_option()</v>
-        <v>Timeout = timeout()</v>
-        <v>Host    = atom() | string()</v>
-        <v>Assoc   = #sctp_assoc_change{}</v>
-      </type>
       <desc>
-        <p>Establishes a new association for the socket <c>Socket</c>,
+        <p>Establishes a new association for the socket <c><anno>Socket</anno></c>,
           with the peer (SCTP server socket) given by
-          <c>Addr</c> and <c>Port</c>. The <c>Timeout</c>,
+          <c><anno>Addr</anno></c> and <c><anno>Port</anno></c>. The <c><anno>Timeout</anno></c>,
           is expressed in milliseconds. A socket can be associated with multiple peers.</p>
 
-        <p><b>WARNING:</b>Using a value of <c>Timeout</c> less than
+        <p><b>WARNING:</b>Using a value of <c><anno>Timeout</anno></c> less than
         the maximum time taken by the OS to establish an association (around 4.5 minutes
         if the default values from RFC 4960 are used) can result in
         inconsistent or incorrect return values. This is especially
-        relevant for associations sharing the same <c>Socket</c>
+        relevant for associations sharing the same <c><anno>Socket</anno></c>
         (i.e. source address and port) since the controlling process
         blocks until <c>connect/*</c> returns.
 	  <seealso marker="#connect_init/4">connect_init/*</seealso>
@@ -185,7 +170,7 @@
         <p><marker id="record-sctp_assoc_change"></marker>
           The result of <c>connect/*</c> is an <c>#sctp_assoc_change{}</c>
           event which contains, in particular, the new 
-          <seealso marker="#type-assoc_id">Association ID:</seealso></p>
+          <seealso marker="#type-assoc_id">Association ID</seealso>.</p>
         <pre>
   #sctp_assoc_change{
         state             = atom(),
@@ -198,13 +183,13 @@
           giving an <c>sctp_initmsg</c> option to <c>connect</c>
           as in:</p>
         <pre>
-  connect(Socket, Ip, Port,
+  connect(<anno>Socket</anno>, Ip, <anno>Port</anno>,
         [{sctp_initmsg,#sctp_initmsg{num_ostreams=OutStreams,
                                      max_instreams=MaxInStreams}}])        </pre>
-        <p>All options <c>Opt</c> are set on the socket before the 
+        <p>All options <c><anno>Opt</anno></c> are set on the socket before the
           association is attempted. If an option record has got undefined
           field values, the options record is first read from the socket
-          for those values. In effect, <c>Opt</c> option records only 
+          for those values. In effect, <c><anno>Opt</anno></c> option records only
           define field values to change before connecting.</p>
         <p>The returned <c>outbound_streams</c> and <c>inbound_streams</c>
           are the actual stream numbers on the socket, which may be different
@@ -242,27 +227,19 @@
       </desc>
     </func>
     <func>
-      <name>connect_init(Socket, Addr, Port, Opts) -&gt; ok | {error, posix()}</name>
+      <name name="connect_init" arity="4"/>
       <fsummary>Same as <c>connect_init(Socket, Addr, Port, Opts, infinity)</c>.</fsummary>
       <desc>
-        <p>Same as <c>connect_init(Socket, Addr, Port, Opts, infinity)</c>.</p>
+        <p>Same as <c>connect_init(<anno>Socket</anno>, <anno>Addr</anno>, <anno>Port</anno>, <anno>Opts</anno>, infinity)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>connect_init(Socket, Addr, Port, [Opt], Timeout) -&gt; ok | {error, posix()}</name>
+      <name name="connect_init" arity="5"/>
       <fsummary>Initiate a new association for the socket <c>Socket</c>, with a peer (SCTP server socket)</fsummary>
-      <type>
-        <v>Socket  = sctp_socket()</v>
-        <v>Addr    = ip_address() | Host</v>
-        <v>Port    = port_number()</v>
-        <v>Opt     = sctp_option()</v>
-        <v>Timeout = timeout()</v>
-        <v>Host    = atom() | string()</v>
-      </type>
       <desc>
-        <p>Initiates a new association for the socket <c>Socket</c>,
+        <p>Initiates a new association for the socket <c><anno>Socket</anno></c>,
           with the peer (SCTP server socket) given by
-          <c>Addr</c> and <c>Port</c>.</p>
+          <c><anno>Addr</anno></c> and <c><anno>Port</anno></c>.</p>
 	<p>The fundamental difference between this API
 	and <c>connect/*</c> is that the return value is that of the
 	underlying OS connect(2) system call. If <c>ok</c> is returned
@@ -275,64 +252,52 @@
 	active option.</p>
 	<p>The parameters are as described
 	in <seealso marker="#connect/5">connect/*</seealso>, with the
-	exception of the <c>Timeout</c> value.</p>
-	<p>The timer associated with <c>Timeout</c> only supervises
-	IP resolution of <c>Addr</c></p>
+	exception of the <c><anno>Timeout</anno></c> value.</p>
+	<p>The timer associated with <c><anno>Timeout</anno></c> only supervises
+	IP resolution of <c><anno>Addr</anno></c></p>
       </desc>
     </func>
     <func>
-      <name>controlling_process(sctp_socket(), pid()) -&gt; ok</name>
+      <name name="controlling_process" arity="2"/>
       <fsummary>Assign a new controlling process pid to the socket</fsummary>
       <desc>
-        <p>Assigns a new controlling process Pid to Socket. Same implementation
+        <p>Assigns a new controlling process <c><anno>Pid</anno></c> to <c><anno>Socket</anno></c>. Same implementation
           as <c>gen_udp:controlling_process/2</c>.</p>
       </desc>
     </func>
     <func>
-      <name>eof(Socket, Assoc) -&gt; ok | {error, Reason}</name>
+      <name name="eof" arity="2"/>
       <fsummary>Gracefully terminate the association given by Assoc, with flushing of all unsent data</fsummary>
-      <type>
-        <v>Socket = sctp_socket()</v>
-        <v>Assoc  = #sctp_assoc_change{}</v>
-      </type>
       <desc>
-        <p>Gracefully terminates the association given by <c>Assoc</c>, with
+        <p>Gracefully terminates the association given by <c><anno>Assoc</anno></c>, with
           flushing of all unsent data. The socket itself remains open. Other
           associations opened on this socket are still valid, and it can be
           used in new associations.</p>
       </desc>
     </func>
     <func>
-      <name>listen(Socket, IsServer) -&gt; ok | {error, Reason}</name>
+      <name name="listen" arity="2"/>
       <fsummary>Set up a socket to listen.</fsummary>
-      <type>
-        <v>Socket   = sctp_socket()</v>
-        <v>IsServer = bool()</v>
-      </type>
       <desc>
         <p>Sets up a socket to listen on the IP address and port number
-          it is bound to. IsServer must be 'true' or 'false'.
+          it is bound to. <c><anno>IsServer</anno></c> must be <c>true</c>
+          or <c>false</c>.
           In the contrast to TCP, in SCTP there is no listening queue length.
-          If IsServer is 'true' the socket accepts new associations, i.e.
+          If <c><anno>IsServer</anno></c> is <c>true</c> the socket accepts new associations, i.e.
           it will become an SCTP server socket.</p>
       </desc>
     </func>
     <func>
-      <name>open() -&gt; {ok, Socket} | {error, posix()}</name>
-      <name>open(Port) -&gt; {ok, Socket} | {error, posix()}</name>
-      <name>open([Opt]) -&gt; {ok, Socket} | {error, posix()}</name>
-      <name>open(Port, [Opt]) -&gt; {ok, Socket} | {error, posix()}</name>
+      <name name="open" arity="0"/>
+      <name name="open" arity="1" clause_i="1"/>
+      <name name="open" arity="1" clause_i="2"/>
+      <name name="open" arity="2"/>
       <fsummary>Create an SCTP socket and bind it to local addresses</fsummary>
-      <type>
-        <v>Opt  = {ip,IP} | {ifaddr,IP} | {port,Port} | sctp_option()</v>
-        <v>IP   = ip_address() | any | loopback</v>
-        <v>Port = port_number()</v>
-      </type>
       <desc>
         <p>Creates an SCTP socket and binds it to the local addresses 
-          specified by all <c>{ip,IP}</c> (or synonymously <c>{ifaddr,IP}</c>)
+          specified by all <c>{ip,<anno>IP</anno>}</c> (or synonymously <c>{ifaddr,<anno>IP</anno>}</c>)
           options (this feature is called SCTP multi-homing).
-          The default <c>IP</c> and <c>Port</c> are <c>any</c> 
+          The default <c><anno>IP</anno></c> and <c><anno>Port</anno></c> are <c>any</c>
           and <c>0</c>, meaning bind to all local addresses on any
           one free port.</p>
         <p>A default set of socket <seealso marker="#options">options</seealso>
@@ -345,27 +310,16 @@
       </desc>
     </func>
     <func>
-      <name>recv(sctp_socket()) -&gt; {ok, {FromIP, FromPort, AncData, BinMsg}} | {error, Reason}</name>
-      <name>recv(sctp_socket(), timeout()) -&gt; {ok, {FromIP, FromPort, AncData, Data}} | {error, Reason}</name>
+      <name name="recv" arity="1"/>
+      <name name="recv" arity="2"/>
       <fsummary>Receive a message from a socket</fsummary>
-      <type>
-        <v>FromIP   = ip_address()</v>
-        <v>FromPort = port_number()</v>
-        <v>AncData  = [#sctp_sndrcvinfo{}]</v>
-        <v>Data     = binary() | charlist() | #sctp_sndrcvinfo{} |
-                      #sctp_assoc_change{} | #sctp_paddr_change{} |
-                      #sctp_adaptation_event{} </v>
-        <v>Reason   = posix() | #sctp_send_failed{} | #scpt_paddr_change{} |
-                      #sctp_pdapi_event{} | #sctp_remote_error{} |
-                      #sctp_shutdown_event{}</v>
-      </type>
       <desc>
-        <p>Receives the <c>Data</c> message from any association of the socket.
+        <p>Receives the <c><anno>Data</anno></c> message from any association of the socket.
           If the receive times out <c>{error,timeout</c> is returned.
           The default timeout is <c>infinity</c>.
-          <c>FromIP</c> and <c>FromPort</c> indicate the sender's address.</p>
-        <p><c>AncData</c> is a list of Ancillary Data items which
-          may be received along with the main <c>Data</c>.
+          <c><anno>FromIP</anno></c> and <c><anno>FromPort</anno></c> indicate the sender's address.</p>
+        <p><c><anno>AncData</anno></c> is a list of Ancillary Data items which
+          may be received along with the main <c><anno>Data</anno></c>.
           This list can be empty, or contain a single
           <seealso marker="#record-sctp_sndrcvinfo">#sctp_sndrcvinfo{}</seealso>
           record, if receiving of such ancillary data is enabled
@@ -375,10 +329,10 @@
           provide an easy way of determining the association and stream
           over which the message has been received.
           (An alternative way would be to get the Association ID from the
-          <c>FromIP</c> and <c>FromPort</c> using the
+          <c><anno>FromIP</anno></c> and <c><anno>FromPort</anno></c> using the
           <seealso marker="#option-sctp_get_peer_addr_info">sctp_get_peer_addr_info</seealso> socket option,
           but this would still not produce the Stream number).</p>
-        <p>The actual <c>Data</c> received may be a <c>binary()</c>,
+        <p>The actual <c><anno>Data</anno></c> received may be a <c>binary()</c>,
           or <c>list()</c> of bytes (integers in the range 0 through 255)
           depending on the socket mode, or an SCTP Event.
                     <marker id="sctp_events"></marker>
@@ -476,15 +430,10 @@
       </desc>
     </func>
     <func>
-      <name>send(Socket, SndRcvInfo, Data) -&gt; ok | {error, Reason}</name>
+      <name name="send" arity="3"/>
       <fsummary>Send a message using an <c>#sctp_sndrcvinfo{}</c>record</fsummary>
-      <type>
-        <v>Socket     = sctp_socket()</v>
-        <v>SndRcvInfo = #sctp_sndrcvinfo{}</v>
-        <v>Data       = binary() | iolist()</v>
-      </type>
       <desc>
-        <p>Sends the <c>Data</c> message with all sending parameters from a
+        <p>Sends the <c><anno>Data</anno></c> message with all sending parameters from a
           <seealso marker="#record-sctp_sndrcvinfo">#sctp_sndrcvinfo{}</seealso> record.
           This way, the user can specify the PPID (passed to the remote end)
           and Context (passed to the local SCTP layer) which can be used
@@ -494,21 +443,15 @@
       </desc>
     </func>
     <func>
-      <name>send(Socket, Assoc, Stream, Data) -&gt; ok | {error, Reason}</name>
+      <name name="send" arity="4"/>
       <fsummary>Send a message over an existing association and given stream</fsummary>
-      <type>
-        <v>Socket = sctp_socket()</v>
-        <v>Assoc  = #sctp_assoc_change{} | assoc_id()</v>
-        <v>Stream = integer()</v>
-        <v>Data   = binary() | iolist()</v>
-      </type>
       <desc>
-        <p>Sends <c>Data</c> message over an existing association and given
+        <p>Sends <c><anno>Data</anno></c> message over an existing association and given
           stream.</p>
       </desc>
     </func>
     <func>
-      <name>error_string(integer()) -> ok | string() | undefined</name>
+      <name name="error_string" arity="1"/>
       <fsummary>Translate an SCTP error number into a string</fsummary>
       <desc>
         <p>Translates an SCTP error number from for example 
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index aa171c77c2..f1d42d9faa 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -63,36 +63,45 @@ do_recv(Sock, Bs) ->
     <p>For more examples, see the <seealso marker="#examples">examples</seealso> section.</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-ip_address()
-  see inet(3)
-
-posix()
-  see inet(3)
+  <datatypes>
+    <datatype>
+      <name name="hostname"/>
+    </datatype>
+    <datatype>
+      <name name="ip_address"/>
+      <desc>
+        <p>Represents an address of a TCP socket.
+          It is a tuple as explained in
+          <seealso marker="inet">inet(3)</seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="port_number"/>
+    </datatype>
+    <datatype>
+      <name name="posix"/>
+      <desc>
+        <p>See <seealso marker="inet#error_codes">
+        inet(3); POSIX Error Codes</seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name><marker id="type-socket">socket()</marker></name>
+      <desc>
+        <p>As returned by accept/1,2 and connect/3,4.</p>
+        <marker id="connect"></marker>
+      </desc>
+    </datatype>
+  </datatypes>
 
-socket()
-  as returned by accept/1,2 and connect/3,4</code>
-    <marker id="connect"></marker>
-  </section>
   <funcs>
     <func>
-      <name>connect(Address, Port, Options) -> {ok, Socket} | {error, Reason}</name>
-      <name>connect(Address, Port, Options, Timeout) -> {ok, Socket} | {error, Reason}</name>
+      <name name="connect" arity="3"/>
+      <name name="connect" arity="4"/>
       <fsummary>Connect to a TCP port</fsummary>
-      <type>
-        <v>Address = string() | atom() | ip_address()</v>
-        <v>Port = 0..65535</v>
-        <v>Options = [Opt]</v>
-        <v>&nbsp;Opt -- see below</v>
-        <v>Timeout = int() | infinity</v>
-        <v>Socket = socket()</v>
-        <v>Reason = posix()</v>
-      </type>
       <desc>
-        <p>Connects to a server on TCP port <c>Port</c> on the host
-          with IP address <c>Address</c>. The <c>Address</c> argument
+        <p>Connects to a server on TCP port <c><anno>Port</anno></c> on the host
+          with IP address <c><anno>Address</anno></c>. The <c><anno>Address</anno></c> argument
           can be either a hostname, or an IP address.</p>
         <p>The available options are:</p>
         <taglist>
@@ -127,13 +136,13 @@ socket()
           <item>
             <p>Set up the socket for IPv4.</p>
           </item>
-          <tag>Opt</tag>
+          <tag><c>Opt</c></tag>
           <item>
             <p>See
               <seealso marker="inet#setopts/2">inet:setopts/2</seealso>.</p>
           </item>
         </taglist>
-        <p>Packets can be sent to the returned socket <c>Socket</c>
+        <p>Packets can be sent to the returned socket <c><anno>Socket</anno></c>
           using <c>send/2</c>. Packets sent from the peer are delivered
           as messages:</p>
         <code type="none">
@@ -148,7 +157,7 @@ socket()
         <p>unless <c>{active, false}</c> is specified in the option list
           for the socket, in which case packets are retrieved by
           calling <c>recv/2</c>.</p>
-        <p>The optional <c>Timeout</c> parameter specifies a timeout in
+        <p>The optional <c><anno>Timeout</anno></c> parameter specifies a timeout in
           milliseconds. The default value is <c>infinity</c>.</p>
         <note>
           <p>The default values for options given to <c>connect</c> can
@@ -159,19 +168,12 @@ socket()
       </desc>
     </func>
     <func>
-      <name>listen(Port, Options) -> {ok, ListenSocket} | {error, Reason}</name>
+      <name name="listen" arity="2"/>
       <fsummary>Set up a socket to listen on a port</fsummary>
-      <type>
-        <v>Port = 0..65535</v>
-        <v>Options = [Opt]</v>
-        <v>&nbsp;Opt -- see below</v>
-        <v>ListenSocket -- see below</v>
-        <v>Reason = posix()</v>
-      </type>
       <desc>
-        <p>Sets up a socket to listen on the port <c>Port</c> on
+        <p>Sets up a socket to listen on the port <c><anno>Port</anno></c> on
           the local host.</p>
-        <p>If <c>Port == 0</c>, the underlying OS assigns an available
+        <p>If <c><anno>Port</anno> == 0</c>, the underlying OS assigns an available
           port number, use <c>inet:port/1</c> to retrieve it.</p>
         <p>The available options are:</p>
         <taglist>
@@ -214,7 +216,7 @@ socket()
               <seealso marker="inet#setopts/2">inet:setopts/2</seealso>.</p>
           </item>
         </taglist>
-        <p>The returned socket <c>ListenSocket</c> can only be used in
+        <p>The returned socket <c><anno>ListenSocket</anno></c> can only be used in
           calls to <c>accept/1,2</c>.</p>
         <note>
           <p>The default values for options given to <c>listen</c> can
@@ -225,27 +227,23 @@ socket()
       </desc>
     </func>
     <func>
-      <name>accept(ListenSocket) -> {ok, Socket} | {error, Reason}</name>
-      <name>accept(ListenSocket, Timeout) -> {ok, Socket} | {error, Reason}</name>
+      <name name="accept" arity="1"/>
+      <name name="accept" arity="2"/>
       <fsummary>Accept an incoming connection request on a listen socket</fsummary>
-      <type>
-        <v>ListenSocket -- see listen/2</v>
-        <v>Timeout = int() | infinity</v>
-        <v>Socket = socket()</v>
-        <v>Reason = closed | timeout | posix()</v>
-      </type>
+      <type_desc variable="ListenSocket">Returned by <c>listen/2</c>.
+      </type_desc>
       <desc>
         <p>Accepts an incoming connection request on a listen socket.
-          <c>Socket</c> must be a socket returned from <c>listen/2</c>.
-          <c>Timeout</c> specifies a timeout value in ms, defaults to
+          <c><anno>Socket</anno></c> must be a socket returned from <c>listen/2</c>.
+          <c><anno>Timeout</anno></c> specifies a timeout value in ms, defaults to
           <c>infinity</c>.</p>
-        <p>Returns <c>{ok, Socket}</c> if a connection is established,
-          or <c>{error, closed}</c> if <c>ListenSocket</c> is closed,
+        <p>Returns <c>{ok, <anno>Socket</anno>}</c> if a connection is established,
+          or <c>{error, closed}</c> if <c><anno>ListenSocket</anno></c> is closed,
           or <c>{error, timeout}</c> if no connection is established
           within the specified time. May also return a POSIX error
           value if something else goes wrong, see inet(3) for possible
           error values.</p>
-        <p>Packets can be sent to the returned socket <c>Socket</c>
+        <p>Packets can be sent to the returned socket <c><anno>Socket</anno></c>
           using <c>send/2</c>. Packets sent from the peer are delivered
           as messages:</p>
         <code type="none">
@@ -264,13 +262,8 @@ socket()
       </desc>
     </func>
     <func>
-      <name>send(Socket, Packet) -> ok | {error, Reason}</name>
+      <name name="send" arity="2"/>
       <fsummary>Send a packet</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>Packet = [char()] | binary()</v>
-        <v>Reason = posix()</v>
-      </type>
       <desc>
         <p>Sends a packet on a socket. </p>
         <p>There is no <c>send</c> call with timeout option, you use the
@@ -279,70 +272,52 @@ socket()
       </desc>
     </func>
     <func>
-      <name>recv(Socket, Length) -> {ok, Packet} | {error, Reason}</name>
-      <name>recv(Socket, Length, Timeout) -> {ok, Packet} | {error, Reason}</name>
+      <name name="recv" arity="2"/>
+      <name name="recv" arity="3"/>
       <fsummary>Receive a packet from a passive socket</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>Length  = int()</v>
-        <v>Packet = [char()] | binary() | HttpPacket</v>
-        <v>Timeout = int() | infinity</v>
-        <v>Reason = closed | posix()</v>
-        <v>HttpPacket = see the description of <c>HttpPacket</c> in <seealso marker="erts:erlang#decode_packet/3">erlang:decode_packet/3</seealso></v>
-      </type>
+      <type_desc variable="HttpPacket">See the description of
+         <c>HttpPacket</c> in <seealso marker="erts:erlang#decode_packet/3">
+         erlang:decode_packet/3</seealso>.
+      </type_desc>
       <desc>
         <p>This function receives a packet from a socket in passive
           mode. A closed socket is indicated by a return value
           <c>{error, closed}</c>.</p>
-        <p>The <c>Length</c> argument is only meaningful when
+        <p>The <c><anno>Length</anno></c> argument is only meaningful when
           the socket is in <c>raw</c> mode and denotes the number of
-          bytes to read. If <c>Length</c> = 0, all available bytes are
-          returned. If <c>Length</c> &gt; 0, exactly <c>Length</c>
+          bytes to read. If <c><anno>Length</anno></c> = 0, all available bytes are
+          returned. If <c><anno>Length</anno></c> &gt; 0, exactly <c><anno>Length</anno></c>
           bytes are returned, or an error; possibly discarding less
-          than <c>Length</c> bytes of data when the socket gets closed
+          than <c><anno>Length</anno></c> bytes of data when the socket gets closed
           from the other side.</p>
-        <p>The optional <c>Timeout</c> parameter specifies a timeout in
+        <p>The optional <c><anno>Timeout</anno></c> parameter specifies a timeout in
           milliseconds. The default value is <c>infinity</c>.</p>
       </desc>
     </func>
     <func>
-      <name>controlling_process(Socket, Pid) -> ok | {error, Reason}</name>
+      <name name="controlling_process" arity="2"/>
       <fsummary>Change controlling process of a socket</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>Pid = pid()</v>
-        <v>Reason = closed | not_owner | posix()</v>
-      </type>
       <desc>
-        <p>Assigns a new controlling process <c>Pid</c> to
-          <c>Socket</c>. The controlling process is the process which
+        <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
+          <c><anno>Socket</anno></c>. The controlling process is the process which
           receives messages from the socket. If called by any other
           process than the current controlling process,
           <c>{error, eperm}</c> is returned.</p>
       </desc>
     </func>
     <func>
-      <name>close(Socket) -> ok | {error, Reason}</name>
+      <name name="close" arity="1"/>
       <fsummary>Close a TCP socket</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>Reason = posix()</v>
-      </type>
       <desc>
         <p>Closes a TCP socket.</p>
       </desc>
     </func>
     <func>
-      <name>shutdown(Socket, How) -> ok | {error, Reason}</name>
+      <name name="shutdown" arity="2"/>
       <fsummary>Immediately close a socket</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>How = read | write | read_write</v>
-        <v>Reason = posix()</v>
-      </type>
       <desc>
         <p>Immediately close a socket in one or two directions.</p>
-        <p><c>How == write</c> means closing the socket for writing,
+        <p><c><anno>How</anno> == write</c> means closing the socket for writing,
           reading from it is still possible.</p>
         <p>To be able to handle that the peer has done a shutdown on
           the write side, the <c>{exit_on_close, false}</c> option
diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index 71f2e9bd83..c0e783f508 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,32 +34,43 @@
       with sockets using the UDP protocol.</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-ip_address()
-  see inet(3)
-
-posix()
-  see inet(3)
+  <datatypes>
+    <datatype>
+      <name name="hostname"/>
+    </datatype>
+    <datatype>
+      <name name="ip_address"/>
+      <desc>
+        <p>Represents an address of a TCP socket.
+          It is a tuple as explained in
+          <seealso marker="inet">inet(3)</seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="port_number"/>
+    </datatype>
+    <datatype>
+      <name name="posix"/>
+      <desc>
+        <p>See <seealso marker="inet#error_codes">
+        inet(3); POSIX Error Codes</seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name><marker id="type-socket">socket()</marker></name>
+      <desc>
+        <p>As returned by open/1,2.</p>
+      </desc>
+    </datatype>
+  </datatypes>
 
-socket()
-  as returned by open/1,2</code>
-  </section>
   <funcs>
     <func>
-      <name>open(Port) -> {ok, Socket} | {error, Reason}</name>
-      <name>open(Port, Options) -> {ok, Socket} | {error, Reason}</name>
+      <name name="open" arity="1"/>
+      <name name="open" arity="2"/>
       <fsummary>Associate a UDP port number with the process calling it</fsummary>
-      <type>
-        <v>Port = 0..65535</v>
-        <v>Options = [Opt]</v>
-        <v>&nbsp;Opt -- see below</v>
-        <v>Socket = socket()</v>
-        <v>Reason = posix()</v>
-      </type>
       <desc>
-        <p>Associates a UDP port number (<c>Port</c>) with the calling
+        <p>Associates a UDP port number (<c><anno>Port</anno></c>) with the calling
           process.</p>
         <p>The available options are:</p>
         <taglist>
@@ -96,7 +107,7 @@ socket()
               <seealso marker="inet#setopts/2">inet:setopts/2</seealso>.</p>
           </item>
         </taglist>
-        <p>The returned socket <c>Socket</c> is used to send packets
+        <p>The returned socket <c><anno>Socket</anno></c> is used to send packets
           from this port with <c>send/4</c>. When UDP packets arrive at
           the opened port, they are delivered as messages:</p>
         <code type="none">
@@ -110,66 +121,42 @@ socket()
           binary if the option <c>binary</c> was specified.</p>
         <p>Default value for the receive buffer option is
           <c>{recbuf, 8192}</c>.</p>
-        <p>If <c>Port == 0</c>, the underlying OS assigns a free UDP
+        <p>If <c><anno>Port</anno> == 0</c>, the underlying OS assigns a free UDP
           port, use <c>inet:port/1</c> to retrieve it.</p>
       </desc>
     </func>
     <func>
-      <name>send(Socket, Address, Port, Packet) -> ok | {error, Reason}</name>
+      <name name="send" arity="4"/>
       <fsummary>Send a packet</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>Address = string() | atom() | ip_address()</v>
-        <v>Port = 0..65535</v>
-        <v>Packet = [char()] | binary()</v>
-        <v>Reason = not_owner | posix()</v>
-      </type>
       <desc>
         <p>Sends a packet to the specified address and port.
-          The <c>Address</c> argument can be either a hostname, or an
+          The <c><anno>Address</anno></c> argument can be either a hostname, or an
           IP address.</p>
       </desc>
     </func>
     <func>
-      <name>recv(Socket, Length) -> {ok, {Address, Port, Packet}} | {error, Reason}</name>
-      <name>recv(Socket, Length, Timeout) -> {ok, {Address, Port, Packet}} | {error, Reason}</name>
+      <name name="recv" arity="2"/>
+      <name name="recv" arity="3"/>
       <fsummary>Receive a packet from a passive socket</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>Length  = int()</v>
-        <v>Address = ip_address()</v>
-        <v>Port = 0..65535</v>
-        <v>Packet = [char()] | binary()</v>
-        <v>Timeout = int() | infinity</v>
-        <v>Reason = not_owner | posix()</v>
-      </type>
       <desc>
         <p>This function receives a packet from a socket in passive
           mode.</p>
-        <p>The optional <c>Timeout</c> parameter specifies a timeout in
+        <p>The optional <c><anno>Timeout</anno></c> parameter specifies a timeout in
           milliseconds. The default value is <c>infinity</c>.</p>
       </desc>
     </func>
     <func>
-      <name>controlling_process(Socket, Pid) -> ok</name>
+      <name name="controlling_process" arity="2"/>
       <fsummary>Change controlling process of a socket</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>Pid = pid()</v>
-      </type>
       <desc>
-        <p>Assigns a new controlling process <c>Pid</c> to
-          <c>Socket</c>. The controlling process is the process which
+        <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
+          <c><anno>Socket</anno></c>. The controlling process is the process which
           receives messages from the socket.</p>
       </desc>
     </func>
     <func>
-      <name>close(Socket) -> ok | {error, Reason}</name>
+      <name name="close" arity="1"/>
       <fsummary>Close a UDP socket</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>Reason = not_owner | posix()</v>
-      </type>
       <desc>
         <p>Closes a UDP socket.</p>
       </desc>
diff --git a/lib/kernel/doc/src/global.xml b/lib/kernel/doc/src/global.xml
index 077109d6c9..304a9b1d88 100644
--- a/lib/kernel/doc/src/global.xml
+++ b/lib/kernel/doc/src/global.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -106,45 +106,37 @@
 
   </description>
 
+  <datatypes>
+    <datatype>
+      <name name="id"/>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
-      <name>del_lock(Id)</name>
-      <name>del_lock(Id, Nodes) -> void()</name>
+      <name name="del_lock" arity="1"/>
+      <name name="del_lock" arity="2"/>
       <fsummary>Delete a lock</fsummary>
-      <type>
-        <v>Id = {ResourceId, LockRequesterId}</v>
-        <v>&nbsp;ResourceId = term()</v>
-        <v>&nbsp;LockRequesterId = term()</v>
-        <v>Nodes = [node()]</v>
-      </type>
       <desc>
-        <p>Deletes the lock <c>Id</c> synchronously.</p>
+        <p>Deletes the lock <c><anno>Id</anno></c> synchronously.</p>
       </desc>
     </func>
 
     <func>
-      <name>notify_all_name(Name, Pid1, Pid2) -> none</name>
+      <name name="notify_all_name" arity="3"/>
       <fsummary>Name resolving function that notifies both pids</fsummary>
-      <type>
-        <v>Name = term()</v>
-        <v>Pid1 = Pid2 = pid()</v>
-      </type>
       <desc>
         <p>This function can be used as a name resolving function for
           <c>register_name/3</c> and <c>re_register_name/3</c>. It
           unregisters both pids, and sends the message
-          <c>{global_name_conflict, Name, OtherPid}</c> to both
+          <c>{global_name_conflict, <anno>Name</anno>, OtherPid}</c> to both
           processes.</p>
       </desc>
     </func>
 
     <func>
-      <name>random_exit_name(Name, Pid1, Pid2) -> Pid1 | Pid2</name>
+      <name name="random_exit_name" arity="3"/>
       <fsummary>Name resolving function that kills one pid</fsummary>
-      <type>
-        <v>Name = term()</v>
-        <v>Pid1 = Pid2 = pid()</v>
-      </type>
       <desc>
         <p>This function can be used as a name resolving function for
           <c>register_name/3</c> and <c>re_register_name/3</c>. It
@@ -154,33 +146,27 @@
     </func>
 
     <func>
-      <name>random_notify_name(Name, Pid1, Pid2) -> Pid1 | Pid2</name>
+      <name name="random_notify_name" arity="3"/>
       <fsummary>Name resolving function that notifies one pid</fsummary>
-      <type>
-        <v>Name = term()</v>
-        <v>Pid1 = Pid2 = pid()</v>
-      </type>
       <desc>
         <p>This function can be used as a name resolving function for
           <c>register_name/3</c> and <c>re_register_name/3</c>. It
           randomly chooses one of the pids for registration, and sends
-          the message <c>{global_name_conflict, Name}</c> to the other
+          the message <c>{global_name_conflict, <anno>Name</anno>}</c> to the other
           pid.</p>
       </desc>
     </func>
 
     <func>
-      <name>register_name(Name, Pid)</name>
-      <name>register_name(Name, Pid, Resolve) -> yes | no</name>
+      <name name="register_name" arity="2"/>
+      <name name="register_name" arity="3"/>
       <fsummary>Globally register a name for a pid</fsummary>
-      <type>
-        <v>Name = term()</v>
-        <v>Pid = pid()</v>
-        <v>Resolve = fun() or {Module, Function} where</v>
-        <v>&nbsp;&nbsp;Resolve(Name, Pid, Pid2) -> Pid | Pid2 | none</v>
-      </type>
+      <type name="method"/>
+      <type_desc name="method">{<c>Module</c>, <c>Function</c>}
+        is also allowed
+      </type_desc>
       <desc>
-        <p>Globally associates the name <c>Name</c> with a pid, that is,
+        <p>Globally associates the name <c><anno>Name</anno></c> with a pid, that is,
           Globally notifies all nodes of a new global name in a network
           of Erlang nodes.</p>
 
@@ -188,7 +174,7 @@
           of the globally registered names that already exist.
           The network is also informed of any global names in newly
           connected nodes. If any name clashes are discovered,
-          the <c>Resolve</c> function is called. Its purpose is to
+          the <c><anno>Resolve</anno></c> function is called. Its purpose is to
           decide which pid is correct. If the function crashes, or
           returns anything other than one of the pids, the name is
           unregistered. This function is called once for each name
@@ -196,7 +182,7 @@
 
         <p>There are three pre-defined resolve functions:
           <c>random_exit_name/3</c>, <c>random_notify_name/3</c>, and
-          <c>notify_all_name/3</c>. If no <c>Resolve</c> function is
+          <c>notify_all_name/3</c>. If no <c><anno>Resolve</anno></c> function is
           defined, <c>random_exit_name</c> is used. This means that one
           of the two registered processes will be selected as correct
           while the other is killed.</p>
@@ -225,78 +211,63 @@
     </func>
 
     <func>
-      <name>registered_names() -> [Name]</name>
+      <name name="registered_names" arity="0"/>
       <fsummary>All globally registered names</fsummary>
-      <type>
-        <v>Name = term()</v>
-      </type>
       <desc>
         <p>Returns a lists of all globally registered names.</p>
       </desc>
     </func>
 
     <func>
-      <name>re_register_name(Name, Pid)</name>
-      <name>re_register_name(Name, Pid, Resolve) -> void()</name>
+      <name name="re_register_name" arity="2"/>
+      <name name="re_register_name" arity="3"/>
       <fsummary>Atomically re-register a name</fsummary>
-      <type>
-        <v>Name = term()</v>
-        <v>Pid = pid()</v>
-        <v>Resolve = fun() or {Module, Function} where</v>
-        <v>&nbsp;&nbsp;Resolve(Name, Pid, Pid2) -> Pid | Pid2 | none</v>
-      </type>
+      <type name="method"/>
+      <type_desc name="method">{<c>Module</c>, <c>Function</c>}
+        is also allowed
+      </type_desc>
       <desc>
-        <p>Atomically changes the registered name <c>Name</c> on all
-          nodes to refer to <c>Pid</c>.</p>
+        <p>Atomically changes the registered name <c><anno>Name</anno></c> on all
+          nodes to refer to <c><anno>Pid</anno></c>.</p>
 
-        <p>The <c>Resolve</c> function has the same behavior as in
+        <p>The <c><anno>Resolve</anno></c> function has the same behavior as in
           <c>register_name/2,3</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>send(Name, Msg) -> Pid</name>
+      <name name="send" arity="2"/>
       <fsummary>Send a message to a globally registered pid</fsummary>
-      <type>
-        <v>Name = term()</v>
-        <v>Msg = term()</v>
-        <v>Pid = pid()</v>
-      </type>
       <desc>
-        <p>Sends the message <c>Msg</c> to the pid globally registered
-          as <c>Name</c>.</p>
+        <p>Sends the message <c><anno>Msg</anno></c> to the pid globally registered
+          as <c><anno>Name</anno></c>.</p>
 
-        <p>Failure: If <c>Name</c> is not a globally registered
+        <p>Failure: If <c><anno>Name</anno></c> is not a globally registered
           name, the calling function will exit with reason
-          <c>{badarg, {Name, Msg}}</c>.</p>
+          <c>{badarg, {<anno>Name</anno>, <anno>Msg</anno>}}</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>set_lock(Id)</name>
-      <name>set_lock(Id, Nodes)</name>
-      <name>set_lock(Id, Nodes, Retries) -> boolean()</name>
+      <name name="set_lock" arity="1"/>
+      <name name="set_lock" arity="2"/>
+      <name name="set_lock" arity="3"/>
       <fsummary>Set a lock on the specified nodes</fsummary>
-      <type>
-        <v>Id = {ResourceId, LockRequesterId}</v>
-        <v>&nbsp;ResourceId = term()</v>
-        <v>&nbsp;LockRequesterId = term()</v>
-        <v>Nodes = [node()]</v>
-        <v>Retries = int() >= 0 | infinity</v>
-      </type>
+      <type name="id"/>
+      <type name="retries"/>
       <desc>
         <p>Sets a lock on the specified nodes (or on all nodes if none
-          are specified) on <c>ResourceId</c> for
-          <c>LockRequesterId</c>. If a lock already exists on
-          <c>ResourceId</c> for another requester than
-          <c>LockRequesterId</c>, and <c>Retries</c> is not equal to 0,
+          are specified) on <c><anno>ResourceId</anno></c> for
+          <c><anno>LockRequesterId</anno></c>. If a lock already exists on
+          <c><anno>ResourceId</anno></c> for another requester than
+          <c><anno>LockRequesterId</anno></c>, and <c><anno>Retries</anno></c> is not equal to 0,
           the process sleeps for a while and will try to execute
-          the action later. When <c>Retries</c> attempts have been made,
+          the action later. When <c><anno>Retries</anno></c> attempts have been made,
           <c>false</c> is returned, otherwise <c>true</c>. If
-          <c>Retries</c> is <c>infinity</c>, <c>true</c> is eventually
+          <c><anno>Retries</anno></c> is <c>infinity</c>, <c>true</c> is eventually
           returned (unless the lock is never released).</p>
 
-        <p>If no value for <c>Retries</c> is given, <c>infinity</c> is
+        <p>If no value for <c><anno>Retries</anno></c> is given, <c>infinity</c> is
           used.</p>
 
         <p>This function is completely synchronous.</p>
@@ -315,7 +286,7 @@
           application to detect and rectify a deadlock.</p>
 
         <note>
-          <p>Some values of <c>ResourceId</c> should be avoided or
+          <p>Some values of <c><anno>ResourceId</anno></c> should be avoided or
             Erlang/OTP will not work properly. A list of resources to
             avoid: <c>global</c>, <c>dist_ac</c>,
             <c>mnesia_table_lock</c>, <c>mnesia_adjust_log_writes</c>,
@@ -326,7 +297,7 @@
     </func>
 
     <func>
-      <name>sync() -> void()</name>
+      <name name="sync" arity="0"/>
       <fsummary>Synchronize the global name server</fsummary>
       <desc>
         <p>Synchronizes the global name server with all nodes known to
@@ -335,56 +306,45 @@
           the global name server will receive global information from
           all nodes. This function can be called when new nodes are
           added to the network.</p>
+        <p>The only possible error reason <c>Reason</c> is
+          <c>{"global_groups definition error", Error}</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>trans(Id, Fun)</name>
-      <name>trans(Id, Fun, Nodes)</name>
-      <name>trans(Id, Fun, Nodes, Retries) -> Res | aborted</name>
+      <name name="trans" arity="2"/>
+      <name name="trans" arity="3"/>
+      <name name="trans" arity="4"/>
       <fsummary>Micro transaction facility</fsummary>
-      <type>
-        <v>Id = {ResourceId, LockRequesterId}</v>
-        <v>&nbsp;ResourceId = term()</v>
-        <v>&nbsp;LockRequesterId = term()</v>
-        <v>Fun = fun() | {M, F}</v>
-        <v>Nodes = [node()]</v>
-        <v>Retries = int() >= 0 | infinity</v>
-        <v>Res = term()</v>
-      </type>
+      <type name="retries"/>
+      <type name="trans_fun"/>
       <desc>
-        <p>Sets a lock on <c>Id</c> (using <c>set_lock/3</c>). If this
-          succeeds, <c>Fun()</c> is evaluated and the result <c>Res</c>
+        <p>Sets a lock on <c><anno>Id</anno></c> (using <c>set_lock/3</c>). If this
+          succeeds, <c><anno>Fun</anno>()</c> is evaluated and the result <c><anno>Res</anno></c>
           is returned.  Returns <c>aborted</c> if the lock attempt
-          failed. If <c>Retries</c> is set to <c>infinity</c>,
+          failed. If <c><anno>Retries</anno></c> is set to <c>infinity</c>,
           the transaction will not abort.</p>
 
         <p><c>infinity</c> is the default setting and will be used if 
-          no value is given for <c>Retries</c>.</p>
+          no value is given for <c><anno>Retries</anno></c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>unregister_name(Name) -> void()</name>
+      <name name="unregister_name" arity="1"/>
       <fsummary>Remove a globally registered name for a pid</fsummary>
-      <type>
-        <v>Name = term()</v>
-      </type>
       <desc>
-        <p>Removes the globally registered name <c>Name</c> from
+        <p>Removes the globally registered name <c><anno>Name</anno></c> from
           the network of Erlang nodes.</p>
       </desc>
     </func>
 
     <func>
-      <name>whereis_name(Name) -> pid() | undefined</name>
+      <name name="whereis_name" arity="1"/>
       <fsummary>Get the pid with a given globally registered name</fsummary>
-      <type>
-        <v>Name = term()</v>
-      </type>
       <desc>
         <p>Returns the pid with the globally registered name
-          <c>Name</c>. Returns <c>undefined</c> if the name is not
+          <c><anno>Name</anno></c>. Returns <c>undefined</c> if the name is not
           globally registered.</p>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/global_group.xml b/lib/kernel/doc/src/global_group.xml
index 4facf4a4aa..abf6178fc4 100644
--- a/lib/kernel/doc/src/global_group.xml
+++ b/lib/kernel/doc/src/global_group.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -42,26 +42,7 @@
       <seealso marker="kernel_app">kernel(6)</seealso>,
       <seealso marker="config">config(4)</seealso>:</p>
     <code type="none">
-{global_groups, [GroupTuple]}</code>
-    <p>Types:</p>
-    <list type="bulleted">
-      <item><c>GroupTuple = {GroupName, [Node]} | {GroupName, PublishType, [Node]}</c></item>
-      <item><c>GroupName = atom()</c> (naming a global group)</item>
-      <item><c>PublishType = normal | hidden</c></item>
-      <item><c>Node = atom()</c> (naming a node)</item>
-    </list>
-    <p>A <c>GroupTuple</c> without <c>PublishType</c> is the same as a
-      <c>GroupTuple</c> with <c>PublishType == normal</c>.</p>
-    <p>A node started with the command line flag <c>-hidden</c>, see
-      <seealso marker="erts:erl">erl(1)</seealso>, is said to be a
-      <em>hidden</em> node. A hidden node will establish hidden
-      connections to nodes not part of the same global group, but
-      normal (visible) connections to nodes part of the same global
-      group.</p>
-    <p>A global group defined with <c>PublishType == hidden</c>, is
-      said to be a hidden global group. All nodes in a hidden global
-      group are hidden nodes, regardless if they are started with
-      the <c>-hidden</c> command line flag or not.</p>
+{global_groups, [GroupTuple :: group_tuple()]}</code>
     <p>For the processes and nodes to run smoothly using the global
       group functionality, the following criteria must be met:</p>
     <list type="bulleted">
@@ -82,14 +63,44 @@
     <p>In the following description, a <em>group node</em> is a node
       belonging to the same global group as the local node.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="group_tuple"/>
+      <desc>
+        <p>A <c>GroupTuple</c> without <c>PublishType</c> is the same as a
+          <c>GroupTuple</c> with <c>PublishType == normal</c>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="group_name"/>
+    </datatype>
+    <datatype>
+      <name name="publish_type"/>
+      <desc>
+        <p>A node started with the command line flag <c>-hidden</c>, see
+          <seealso marker="erts:erl">erl(1)</seealso>, is said to be a
+          <em>hidden</em> node. A hidden node will establish hidden
+          connections to nodes not part of the same global group, but
+          normal (visible) connections to nodes part of the same global
+          group.</p>
+        <p>A global group defined with <c>PublishType == hidden</c>, is
+          said to be a hidden global group. All nodes in a hidden global
+          group are hidden nodes, regardless if they are started with
+          the <c>-hidden</c> command line flag or not.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="name"/>
+      <desc><p>A registered name.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="where"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>global_groups() -> {GroupName, GroupNames} | undefined</name>
+      <name name="global_groups" arity="0"/>
       <fsummary>Return the global group names</fsummary>
-      <type>
-        <v>GroupName = atom()</v>
-        <v>GroupNames = [GroupName]</v>
-      </type>
       <desc>
         <p>Returns a tuple containing the name of the global group
           the local node belongs to, and the list of all other known
@@ -98,53 +109,52 @@
       </desc>
     </func>
     <func>
-      <name>info() -> [{Item, Info}]</name>
+      <name name="info" arity="0"/>
       <fsummary>Information about global groups</fsummary>
-      <type>
-        <v>Item, Info -- see below</v>
-      </type>
+      <type name="info_item"/>
+      <type name="sync_state"/>
       <desc>
         <p>Returns a list containing information about the global
           groups. Each element of the list is a tuple. The order of
           the tuples is not defined.</p>
         <taglist>
-          <tag><c>{state, State}</c></tag>
+          <tag><c>{state, <anno>State</anno>}</c></tag>
           <item>
             <p>If the local node is part of a global group,
-              <c>State == synced</c>. If no global groups are defined,
-              <c>State == no_conf</c>.</p>
+              <c><anno>State</anno> == synced</c>. If no global groups are defined,
+              <c><anno>State</anno> == no_conf</c>.</p>
           </item>
-          <tag><c>{own_group_name, GroupName}</c></tag>
+          <tag><c>{own_group_name, <anno>GroupName</anno>}</c></tag>
           <item>
             <p>The name (atom) of the group that the local node belongs
               to.</p>
           </item>
-          <tag><c>{own_group_nodes, Nodes}</c></tag>
+          <tag><c>{own_group_nodes, <anno>Nodes</anno>}</c></tag>
           <item>
             <p>A list of node names (atoms), the group nodes.</p>
           </item>
-          <tag><c>{synced_nodes, Nodes}</c></tag>
+          <tag><c>{synced_nodes, <anno>Nodes</anno>}</c></tag>
           <item>
             <p>A list of node names, the group nodes currently
               synchronized with the local node.</p>
           </item>
-          <tag><c>{sync_error, Nodes}</c></tag>
+          <tag><c>{sync_error, <anno>Nodes</anno>}</c></tag>
           <item>
             <p>A list of node names, the group nodes with which
               the local node has failed to synchronize.</p>
           </item>
-          <tag><c>{no_contact, Nodes}</c></tag>
+          <tag><c>{no_contact, <anno>Nodes</anno>}</c></tag>
           <item>
             <p>A list of node names, the group nodes to which there are
               currently no connections.</p>
           </item>
-          <tag><c>{other_groups, Groups}</c></tag>
+          <tag><c>{other_groups, <anno>Groups</anno>}</c></tag>
           <item>
-            <p><c>Groups</c> is a list of tuples
-              <c>{GroupName, Nodes}</c>, specifying the name and nodes
+            <p><c><anno>Groups</anno></c> is a list of tuples
+              <c>{<anno>GroupName</anno>, <anno>Nodes</anno>}</c>, specifying the name and nodes
               of the other global groups.</p>
           </item>
-          <tag><c>{monitoring, Pids}</c></tag>
+          <tag><c>{monitoring, <anno>Pids</anno>}</c></tag>
           <item>
             <p>A list of pids, specifying the processes which have
               subscribed to <c>nodeup</c> and <c>nodedown</c> messages.</p>
@@ -153,73 +163,52 @@
       </desc>
     </func>
     <func>
-      <name>monitor_nodes(Flag) -> ok </name>
+      <name name="monitor_nodes" arity="1"/>
       <fsummary>Subscribe to node status changes</fsummary>
-      <type>
-        <v>Flag = bool()</v>
-      </type>
       <desc>
-        <p>Depending on <c>Flag</c>, the calling process starts
-          subscribing (<c>Flag == true</c>) or stops subscribing
-          (<c>Flag == false</c>) to node status change messages.</p>
+        <p>Depending on <c><anno>Flag</anno></c>, the calling process starts
+          subscribing (<c><anno>Flag</anno> == true</c>) or stops subscribing
+          (<c><anno>Flag</anno> == false</c>) to node status change messages.</p>
         <p>A process which has subscribed will receive the messages
           <c>{nodeup, Node}</c> and <c>{nodedown, Node}</c> when a
           group node connects or disconnects, respectively.</p>
       </desc>
     </func>
     <func>
-      <name>own_nodes() -> Nodes</name>
+      <name name="own_nodes" arity="0"/>
       <fsummary>Return the group nodes</fsummary>
-      <type>
-        <v>Nodes = [Node]</v>
-        <v>&nbsp;Node = node()</v>
-      </type>
       <desc>
         <p>Returns the names of all group nodes, regardless of their
           current status.</p>
       </desc>
     </func>
     <func>
-      <name>registered_names(Where) -> Names</name>
+      <name name="registered_names" arity="1"/>
       <fsummary>Return globally registered names</fsummary>
-      <type>
-        <v>Where = {node, Node} | {group, GroupName}</v>
-        <v>&nbsp;Node = node()</v>
-        <v>&nbsp;GroupName = atom()</v>
-        <v>Names = [Name]</v>
-        <v>&nbsp;Name = atom()</v>
-      </type>
       <desc>
         <p>Returns a list of all names which are globally registered
           on the specified node or in the specified global group.</p>
       </desc>
     </func>
     <func>
-      <name>send(Name, Msg) -> pid() | {badarg, {Name, Msg}}</name>
-      <name>send(Where, Name, Msg) -> pid() | {badarg, {Name, Msg}}</name>
+      <name name="send" arity="2"/>
+      <name name="send" arity="3"/>
       <fsummary>Send a message to a globally registered pid</fsummary>
-      <type>
-        <v>Where = {node, Node} | {group, GroupName}</v>
-        <v>&nbsp;Node = node()</v>
-        <v>&nbsp;GroupName = atom()</v>
-        <v>Name = atom()</v>
-        <v>Msg = term()</v>
-      </type>
       <desc>
-        <p>Searches for <c>Name</c>, globally registered on
+        <p>Searches for <c><anno>Name</anno></c>, globally registered on
           the specified node or in the specified global group, or --
-          if the <c>Where</c> argument is not provided -- in any global
+          if the <c><anno>Where</anno></c> argument is not provided -- in any global
           group. The global groups are searched in the order in which
           they appear in the value of the <c>global_groups</c>
           configuration parameter.</p>
-        <p>If <c>Name</c> is found, the message <c>Msg</c> is sent to
+        <p>If <c><anno>Name</anno></c> is found, the message <c><anno>Msg</anno></c> is sent to
           the corresponding pid. The pid is also the return value of
           the function. If the name is not found, the function returns
-          <c>{badarg, {Name, Msg}}</c>.</p>
+          <c>{badarg, {<anno>Name</anno>, <anno>Msg</anno>}}</c>.</p>
       </desc>
     </func>
     <func>
-      <name>sync() -> ok</name>
+      <name name="sync" arity="0"/>
       <fsummary>Synchronize the group nodes</fsummary>
       <desc>
         <p>Synchronizes the group nodes, that is, the global name
@@ -235,23 +224,17 @@
       </desc>
     </func>
     <func>
-      <name>whereis_name(Name) -> pid() | undefined</name>
-      <name>whereis_name(Where, Name) -> pid() | undefined</name>
+      <name name="whereis_name" arity="1"/>
+      <name name="whereis_name" arity="2"/>
       <fsummary>Get the pid with a given globally registered name</fsummary>
-      <type>
-        <v>Where = {node, Node} | {group, GroupName}</v>
-        <v>&nbsp;Node = node()</v>
-        <v>&nbsp;GroupName = atom()</v>
-        <v>Name = atom()</v>
-      </type>
       <desc>
-        <p>Searches for <c>Name</c>, globally registered on
+        <p>Searches for <c><anno>Name</anno></c>, globally registered on
           the specified node or in the specified global group, or -- if
-          the <c>Where</c> argument is not provided -- in any global
+          the <c><anno>Where</anno></c> argument is not provided -- in any global
           group. The global groups are searched in the order in which
           they appear in the value of the <c>global_groups</c>
           configuration parameter.</p>
-        <p>If <c>Name</c> is found, the corresponding pid is returned.
+        <p>If <c><anno>Name</anno></c> is found, the corresponding pid is returned.
           If the name is not found, the function returns
           <c>undefined</c>.</p>
       </desc>
diff --git a/lib/kernel/doc/src/heart.xml b/lib/kernel/doc/src/heart.xml
index 0df699572d..e2dbcbe63d 100644
--- a/lib/kernel/doc/src/heart.xml
+++ b/lib/kernel/doc/src/heart.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -76,11 +76,8 @@
   </description>
   <funcs>
     <func>
-      <name>set_cmd(Cmd) -> ok | {error, {bad_cmd, Cmd}}</name>
+      <name name="set_cmd" arity="1"/>
       <fsummary>Set a temporary reboot command</fsummary>
-      <type>
-        <v>Cmd = string()</v>
-      </type>
       <desc>
         <p>Sets a temporary reboot command. This command is used if 
           a <c>HEART_COMMAND</c> other than the one specified with
@@ -88,12 +85,12 @@
           the system. The new Erlang runtime system will (if it
           misbehaves) use the environment variable
           <c>HEART_COMMAND</c> to reboot.</p>
-        <p>Limitations: The length of the <c>Cmd</c> command string
+        <p>Limitations: The length of the <c><anno>Cmd</anno></c> command string
           must be less than 2047 characters.</p>
       </desc>
     </func>
     <func>
-      <name>clear_cmd() -> ok</name>
+      <name name="clear_cmd" arity="0"/>
       <fsummary>Clear the temporary boot command</fsummary>
       <desc>
         <p>Clears the temporary boot command. If the system terminates,
@@ -101,11 +98,8 @@
       </desc>
     </func>
     <func>
-      <name>get_cmd() -> {ok, Cmd}</name>
+      <name name="get_cmd" arity="0"/>
       <fsummary>Get the temporary reboot command</fsummary>
-      <type>
-        <v>Cmd = string()</v>
-      </type>
       <desc>
         <p>Get the temporary reboot command. If the command is cleared,
           the empty string will be returned.</p>
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index f05a224f33..fd843b00d9 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -54,33 +54,6 @@ $ <input>erl -sname test -kernel \</input>
 <input>inet_default_listen_options '[{delay_send,true}]'</input></pre>
     <p>Note that the default option <c>{active, true}</c> currently
       cannot be changed, for internal reasons.</p>
-  </description>
-
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-#hostent{h_addr_list = [ip_address()]  % list of addresses for this host
-         h_addrtype  = inet | inet6
-         h_aliases = [hostname()]      % list of aliases
-         h_length = int()              % length of address in bytes
-         h_name = hostname()           % official name for host
-  The record is defined in the Kernel include file "inet.hrl"
-  Add the following directive to the module:
-    -include_lib("kernel/include/inet.hrl").
-
-hostname() = atom() | string()
-
-ip_address() = {N1,N2,N3,N4}              % IPv4
-             | {K1,K2,K3,K4,K5,K6,K7,K8}  % IPv6
-  Ni = 0..255
-  Ki = 0..65535
-
-posix()
-  an atom which is named from the Posix error codes used in
-  Unix, and in the runtime libraries of most C compilers
-
-socket()
-  see gen_tcp(3), gen_udp(3)</code>
     <p>Addresses as inputs to functions can be either a string or a
       tuple. For instance, the IP address 150.236.20.73 can be passed to
       <c>gethostbyaddr/1</c> either as the string "150.236.20.73"
@@ -109,24 +82,58 @@ fe80::204:acff:fe17:bf38
 {ok,{192,168,42,2}}
 2> <input>inet_parse:address("FFFF::192.168.42.2").</input>
 {ok,{65535,0,0,0,0,0,49320,10754}}</pre>
-  </section>
+  </description>
+
+  <datatypes>
+    <datatype>
+      <name name="hostent"/>
+      <desc>
+        <p>The record is defined in the Kernel include file "inet.hrl".
+          Add the following directive to the module:</p>
+<code>-include_lib("kernel/include/inet.hrl").</code></desc>
+    </datatype>
+    <datatype>
+      <name name="hostname"/>
+    </datatype>
+    <datatype>
+      <name name="ip_address"/>
+    </datatype>
+    <datatype>
+      <name name="ip4_address"/>
+    </datatype>
+    <datatype>
+      <name name="ip6_address"/>
+    </datatype>
+    <datatype>
+      <name name="posix"/>
+      <desc><p>An atom which is named from the Posix error codes
+         used in Unix, and in the runtime libraries of most
+          C compilers. See
+          <seealso marker="#error_codes">POSIX Error Codes</seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name><marker id="type-socket">socket()</marker></name>
+      <desc><p>See <seealso marker="gen_tcp#type-socket">gen_tcp(3)</seealso>
+         and <seealso marker="gen_udp#type-socket">gen_udp(3)</seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="family_option"/>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
-      <name>close(Socket) -> ok</name>
+      <name name="close" arity="1"/>
       <fsummary>Close a socket of any type</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-      </type>
       <desc>
         <p>Closes a socket of any type.</p>
       </desc>
     </func>
     <func>
-      <name>get_rc() -> [{Par, Val}]</name>
+      <name name="get_rc" arity="0"/>
       <fsummary>Return a list of IP configuration parameters</fsummary>
-      <type>
-        <v>Par, Val -- see below</v>
-      </type>
       <desc>
         <p>Returns the state of the Inet configuration database in 
           form of a list of recorded configuration parameters. (See the
@@ -135,116 +142,74 @@ fe80::204:acff:fe17:bf38
       </desc>
     </func>
     <func>
-      <name>format_error(Posix) -> string()</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Return a descriptive string for an error reason</fsummary>
-      <type>
-        <v>Posix = posix()</v>
-      </type>
       <desc>
         <p>Returns a diagnostic error string. See the section below
-          for possible <c>Posix</c> values and the corresponding
+          for possible <c><anno>Posix</anno></c> values and the corresponding
           strings.</p>
       </desc>
     </func>
     <func>
-      <name>getaddr(Host, Family) -> {ok, Address} | {error, posix()}</name>
+      <name name="getaddr" arity="2"/>
       <fsummary>Return the IP-address for a host</fsummary>
-      <type>
-        <v>Host = ip_address() | string() | atom()</v>
-        <v>Family = inet | inet6</v>
-        <v>Address = ip_address()</v>
-        <v>posix() = term()</v>
-      </type>
       <desc>
-        <p>Returns the IP-address for <c>Host</c> as a tuple of
-          integers. <c>Host</c> can be an IP-address, a single hostname
+        <p>Returns the IP-address for <c><anno>Host</anno></c> as a tuple of
+          integers. <c><anno>Host</anno></c> can be an IP-address, a single hostname
           or a fully qualified hostname.</p>
       </desc>
     </func>
     <func>
-      <name>getaddrs(Host, Family) -> {ok, Addresses} | {error, posix()}</name>
+      <name name="getaddrs" arity="2"/>
       <fsummary>Return the IP-addresses for a host</fsummary>
-      <type>
-        <v>Host = ip_address() | string() | atom()</v>
-        <v>Addresses = [ip_address()]</v>
-        <v>Family = inet | inet6</v>
-      </type>
       <desc>
-        <p>Returns a list of all IP-addresses for <c>Host</c>.
-          <c>Host</c> can be an IP-address, a single hostname or a fully
+        <p>Returns a list of all IP-addresses for <c><anno>Host</anno></c>.
+          <c><anno>Host</anno></c> can be an IP-address, a single hostname or a fully
           qualified hostname.</p>
       </desc>
     </func>
     <func>
-      <name>gethostbyaddr(Address) -> {ok, Hostent} | {error, posix()}</name>
+      <name name="gethostbyaddr" arity="1"/>
       <fsummary>Return a hostent record for the host with the given address</fsummary>
-      <type>
-        <v>Address = string() | ip_address()</v>
-        <v>Hostent = #hostent{}</v>
-      </type>
       <desc>
         <p>Returns a <c>hostent</c> record given an address.</p>
       </desc>
     </func>
     <func>
-      <name>gethostbyname(Name) -> {ok, Hostent} | {error, posix()}</name>
+      <name name="gethostbyname" arity="1"/>
       <fsummary>Return a hostent record for the host with the given name</fsummary>
-      <type>
-        <v>Hostname = hostname()</v>
-        <v>Hostent = #hostent{}</v>
-      </type>
       <desc>
         <p>Returns a <c>hostent</c> record given a hostname.</p>
       </desc>
     </func>
     <func>
-      <name>gethostbyname(Name, Family) -> {ok, Hostent} | {error, posix()}</name>
+      <name name="gethostbyname" arity="2"/>
       <fsummary>Return a hostent record for the host with the given name</fsummary>
-      <type>
-        <v>Hostname = hostname()</v>
-        <v>Family = inet | inet6</v>
-        <v>Hostent = #hostent{}</v>
-      </type>
       <desc>
         <p>Returns a <c>hostent</c> record given a hostname, restricted
           to the given address family.</p>
       </desc>
     </func>
     <func>
-      <name>gethostname() -> {ok, Hostname}</name>
+      <name name="gethostname" arity="0"/>
       <fsummary>Return the local hostname</fsummary>
-      <type>
-        <v>Hostname = string()</v>
-      </type>
       <desc>
         <p>Returns the local hostname. Will never fail.</p>
       </desc>
     </func>
 
     <func>
-      <name>getifaddrs() -> {ok,Iflist} | {error,posix}</name>
+      <name name="getifaddrs" arity="0"/>
       <fsummary>Return a list of interfaces and their addresses</fsummary>
-      <type>
-	<v>Iflist = {Ifname,[Ifopt]}</v>
-	<v>Ifname = string()</v>
-	<v>Ifopt = {flag,[Flag]} | {addr,Addr} | {netmask,Netmask}
-	           | {broadaddr,Broadaddr} | {dstaddr,Dstaddr}
-	           | {hwaddr,Hwaddr}</v>
-	<v>Flag = up | broadcast | loopback | pointtopoint
-	          | running | multicast</v>
-	<v>Addr = Netmask = Broadadddr = Dstaddr = ip_address()</v>
-	<v>Hwaddr = [byte()]</v>
-      </type>
-    </func>
     <desc>
       <p>
 	Returns a list of 2-tuples containing interface names and the
-	interface's addresses. <c>Ifname</c> is a Unicode string.
-	<c>Hwaddr</c> is hardware dependent, e.g on Ethernet interfaces
+	interface's addresses. <c><anno>Ifname</anno></c> is a Unicode string.
+	<c><anno>Hwaddr</anno></c> is hardware dependent, e.g on Ethernet interfaces
 	it is the 6-byte Ethernet address (MAC address (EUI-48 address)).
       </p>
       <p>
-	The <c>{addr,Addr}</c>, <c>{netmask,_}</c> and <c>{broadaddr,_}</c>
+	The <c>{addr,<anno>Addr</anno>}</c>, <c>{netmask,_}</c> and <c>{broadaddr,_}</c>
 	tuples are repeated in the result list iff the interface has multiple
 	addresses. If you come across an interface that has
 	multiple <c>{flag,_}</c> or <c>{hwaddr,_}</c> tuples you have
@@ -252,8 +217,8 @@ fe80::204:acff:fe17:bf38
 	The <c>{flag,_}</c> tuple is mandatory, all other optional.
       </p>
       <p>
-	Do not rely too much on the order of <c>Flag</c> atoms or
-	<c>Ifopt</c> tuples. There are some rules, though:
+	Do not rely too much on the order of <c><anno>Flag</anno></c> atoms or
+	<c><anno>Ifopt</anno></c> tuples. There are some rules, though:
 	<list>
 	  <item>
 	    Immediately after <c>{addr,_}</c> follows <c>{netmask,_}</c>
@@ -261,7 +226,7 @@ fe80::204:acff:fe17:bf38
 	  <item>
 	    Immediately thereafter follows <c>{broadaddr,_}</c> if
 	    the <c>broadcast</c> flag is <em>not</em> set and the
-	    <c>pointtopoint</c>flag <em>is</em> set.
+	    <c>pointtopoint</c> flag <em>is</em> set.
 	  </item>
 	  <item>
 	    Any <c>{netmask,_}</c>, <c>{broadaddr,_}</c> or
@@ -277,11 +242,12 @@ fe80::204:acff:fe17:bf38
       </p>
       <p>
 	On Windows, the data is fetched from quite different OS API
-	functions, so the <c>Netmask</c> and <c>Broadaddr</c>
-	values may be calculated, just as some <c>Flag</c> values.
+	functions, so the <c><anno>Netmask</anno></c> and <c><anno>Broadaddr</anno></c>
+	values may be calculated, just as some <c><anno>Flag</anno></c> values.
 	You have been warned. Report flagrant bugs.
       </p>
     </desc>
+    </func>
 
     <func>
       <name>getopts(Socket, Options) -> {ok, OptionValues} | {error, posix()}</name>
@@ -291,13 +257,14 @@ fe80::204:acff:fe17:bf38
         <v>Options = [Opt | RawOptReq]</v>
         <v>Opt = atom()</v>
         <v>RawOptReq = {raw, Protocol, OptionNum, ValueSpec}</v>
-        <v>Protocol = int()</v>
-        <v>OptionNum = int()</v>
+        <v>Protocol = integer()</v>
+        <v>OptionNum = integer()</v>
         <v>ValueSpec = ValueSize | ValueBin</v>
-        <v>ValueSize = int()</v>
+        <v>ValueSize = integer()</v>
         <v>ValueBin = binary()</v>
         <v>OptionValues = [{Opt, Val} | {raw, Protocol, OptionNum,  ValueBin}]</v>
       </type>
+      <type name="socket_getopt"/>
       <desc>
         <p>Gets one or more options for a socket. 
           See <seealso marker="#setopts/2">setopts/2</seealso> 
@@ -419,13 +386,8 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name>peername(Socket) -> {ok, {Address, Port}} | {error, posix()}</name>
+      <name name="peername" arity="1"/>
       <fsummary>Return the address and port for the other end of a connection</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>Address = ip_address()</v>
-        <v>Port = int()</v>
-      </type>
       <desc>
         <p>Returns the address and port for the other end of a
           connection.</p>
@@ -436,20 +398,15 @@ fe80::204:acff:fe17:bf38
       <fsummary>Return the local port number for a socket</fsummary>
       <type>
         <v>Socket = socket()</v>
-        <v>Port = int()</v>
+        <v>Port = integer()</v>
       </type>
       <desc>
         <p>Returns the local port number for a socket.</p>
       </desc>
     </func>
     <func>
-      <name>sockname(Socket) -> {ok, {Address, Port}} | {error, posix()}</name>
+      <name name="sockname" arity="1"/>
       <fsummary>Return the local address and port number for a socket</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>Address = ip_address()</v>
-        <v>Port = int()</v>
-      </type>
       <desc>
         <p>Returns the local address and port number for a socket.</p>
       </desc>
@@ -460,8 +417,8 @@ fe80::204:acff:fe17:bf38
       <type>
         <v>Socket = term()</v>
         <v>Options = [{Opt, Val} | {raw, Protocol, Option, ValueBin}]</v>
-        <v>Protocol = int()</v>
-        <v>OptionNum = int()</v>
+        <v>Protocol = integer()</v>
+        <v>OptionNum = integer()</v>
         <v>ValueBin = binary()</v>
         <v>&nbsp;Opt, Val -- see below</v>
       </type>
diff --git a/lib/kernel/doc/src/inet_res.xml b/lib/kernel/doc/src/inet_res.xml
index d8fe23544b..bf73ccf13d 100644
--- a/lib/kernel/doc/src/inet_res.xml
+++ b/lib/kernel/doc/src/inet_res.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2009</year><year>2009</year>
+      <year>2009</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -76,64 +76,38 @@
       query is tried for the <c>alt_nameservers</c>.</p>
   </section>
 
-
-
-
-  <section>
-    <title>DATA TYPES</title>
-      <p>As defined in the module
-        <seealso marker="kernel:inet">inet</seealso>:</p>
-    <code type="none">
-hostent() = #hostent{}
-posix() = some atom()s
-ip_address() = tuple of integers of arity 4 or 8</code>
-
+  <datatypes>
     <p>Resolver types:</p>
-    <code type="none">These correspond to resolver options:
-
-res_option() =
-    [ {alt_nameservers, [ nameserver() ]}
-    | {edns, 0 | false}               % Use EDNS
-    | {inet6, bool()}                 % Return IPv6 addresses
-    | {nameservers, [ nameserver() ]} % List of nameservers
-    | {recurse, bool()}               % Request server recursion
-    | {retry, integer()}              % UDP retries
-    | {timeout, integer()}            % UDP query timeout
-    | {udp_payload_size, integer()}   % EDNS payload size
-    | {usevc, bool()} ]               % Use TCP (Virtual Circuit)
-
-nameserver() = {ip_address(),Port}
-    Port = integer(1..65535)
-
-res_error() =
-    formerr |
-    qfmterror |
-    servfail |
-    nxdomain |
-    notimp |
-    refused |
-    badvers |
-    timeout
-</code>
-
-    <p>DNS types:</p>
-    <marker id="dns_types"/>
-    <code type="none">dns_name() = string() with no adjacent dots
-
-rr_type() = a | aaaa | cname | gid | hinfo | ns | mb | md | mg | mf
-          | minfo | mx | naptr | null | ptr | soa | spf | srv | txt
-          | uid | uinfo | unspec | wks
-
-query_type() = axfr | mailb | maila | any | rr_type()
-
-dns_class() = in | chaos | hs | any
-
+    <datatype>
+      <name name="res_option"/>
+    </datatype>
+    <datatype>
+      <name name="nameserver"/>
+    </datatype>
+    <datatype>
+      <name name="res_error"/>
+    </datatype>
+
+    <p><marker id="dns_types"/>DNS types:</p>
+    <datatype>
+      <name name="dns_name"/>
+      <desc><p>A string with no adjacent dots.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="rr_type"/>
+    </datatype>
+    <datatype>
+      <name name="dns_class"/>
+    </datatype>
+    <datatype>
+      <name name="dns_msg"/>
+      <desc>
+        <p>This is the start of a hiearchy of opaque data structures
+          that can be examined with access functions in inet_dns that
+          return lists of {Field,Value} tuples. The arity 2 functions
+          just return the value for a given field.
+<pre>
 dns_msg() = DnsMsg
-    This is the start of a hiearchy of opaque data structures
-    that can be examined with access functions in inet_dns
-    that return lists of {Field,Value} tuples. The arity 2
-    functions just return the value for a given field.
-
     inet_dns:msg(DnsMsg) ->
         [ {header, dns_header()}
         | {qdlist, dns_query()}
@@ -143,19 +117,21 @@ dns_msg() = DnsMsg
     inet_dns:msg(DnsMsg, header) -> dns_header() % for example
     inet_dns:msg(DnsMsg, Field) -> Value
 
-dhs_header() = DnsHeader
+dns_header() = DnsHeader
     inet_dns:header(DnsHeader) ->
         [ {id, integer()}
-        | {qr, bool()}
+        | {qr, boolean()}
         | {opcode, 'query' | iquery | status | integer()}
-        | {aa, bool()}
-        | {tc, bool()}
-        | {rd, bool()}
-        | {ra, bool()}
-        | {pr, bool()}
+        | {aa, boolean()}
+        | {tc, boolean()}
+        | {rd, boolean()}
+        | {ra, boolean()}
+        | {pr, boolean()}
         | {rcode, integer(0..16)} ]
     inet_dns:header(DnsHeader, Field) -> Value
 
+query_type() = axfr | mailb | maila | any | rr_type()
+
 dns_query() = DnsQuery
     inet_dns:dns_query(DnsQuery) ->
         [ {domain, dns_name()}
@@ -179,32 +155,6 @@ dns_rr() = DnsRr
                      | {data, dns_data()} ]
     inet_dns:rr(DnsRr, Field) -> Value
 
-dns_data() =             % for dns_type()
-    [ dns_name()         % ns, md, mf, cname, mb, mg, mr, ptr
-    | ip_address(v4)     % a
-    | ip_address(v6)     % aaaa
-    | {MName,RName,Serial,Refresh,Retry,Expiry,Minimum} % soa
-    | {ip_address(v4),Proto,BitMap} % wks
-    | {CpuString,OsString} % hinfo
-    | {RM,EM}            % minfo
-    | {Prio,dns_name()}  % mx
-    | {Prio,Weight,Port,dns_name()} % srv
-    | {Order,Preference,Flags,Services,Regexp,dns_name()} % naptr
-    | [ string() ]         % txt, spf
-    | binary() ]           % null, integer()
-MName, RName = dns_name()
-Serial, Refresh, Retry, Expiry, Minimum = integer(),
-Proto = integer()
-BitMap = binary()
-CpuString, OsString = string()
-RM = EM = dns_name()
-Prio, Weight, Port = integer()
-Order, Preference = integer()
-Flags, Services = string(),
-Regexp = string(utf8)
-
-
-
 There is an info function for the types above:
 
 inet_dns:record_type(dns_msg()) -> msg;
@@ -214,26 +164,25 @@ inet_dns:record_type(dns_rr()) -> rr;
 inet_dns:record_type(_) -> undefined.
 
 So; inet_dns:(inet_dns:record_type(X))(X) will convert
-any of these data structures into a {Field,Value} list.</code>
-  </section>
-
+any of these data structures into a {Field,Value} list.</pre></p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="dns_data"/>
+      <desc><p><c><anno>Regexp</anno></c> is a string with characters encoded in the
+         UTF-8 coding standard.</p>
+      </desc>
+    </datatype>
+  </datatypes>
 
 
   <funcs>
 
     <func>
-      <name>getbyname(Name, Type) -> {ok,hostent()} | {error,Reason}</name>
-      <name>getbyname(Name, Type, Timeout) ->
-        {ok,hostent()} | {error,Reason}
-      </name>
+      <name name="getbyname" arity="2"/>
+      <name name="getbyname" arity="3"/>
       <fsummary>Resolve a DNS record of the given type for the given host
       </fsummary>
-      <type>
-        <v>Name = dns_name()</v>
-        <v>Type = rr_type()</v>
-        <v>Timeout = integer() >= 0 | infinity</v>
-        <v>Reason = posix() | res_error()</v>
-      </type>
       <desc>
         <p>Resolve a DNS record of the given type for the given host,
           of class <c>in</c>. On success returns a <c>hostent()</c> record with
@@ -252,17 +201,10 @@ any of these data structures into a {Field,Value} list.</code>
     </func>
 
     <func>
-      <name>gethostbyaddr(Address) -> {ok,hostent()} | {error,Reason}</name>
-      <name>gethostbyaddr(Address, Timeout) ->
-        {ok,hostent()} | {error,Reason}
-      </name>
+      <name name="gethostbyaddr" arity="1"/>
+      <name name="gethostbyaddr" arity="2"/>
       <fsummary>Return a hostent record for the host with the given address
       </fsummary>
-      <type>
-        <v>Address = ip_address()</v>
-        <v>Timeout = integer() >= 0 | infinity</v>
-        <v>Reason = posix() | res_error()</v>
-      </type>
       <desc>
         <p>Backend functions used by
           <seealso marker="kernel:inet#gethostbyaddr/1">
@@ -273,20 +215,11 @@ any of these data structures into a {Field,Value} list.</code>
     </func>
 
     <func>
-      <name>gethostbyname(Name) -> {ok,hostent()} | Reason}</name>
-      <name>gethostbyname(Name, Family) ->
-        {ok,hostent()} | {error,Reason}}
-      </name>
-      <name>gethostbyname(Name, Family, Timeout) ->
-        {ok,hostent()} | {error,Reason}
-      </name>
+      <name name="gethostbyname" arity="1"/>
+      <name name="gethostbyname" arity="2"/>
+      <name name="gethostbyname" arity="3"/>
       <fsummary>Return a hostent record for the host with the given name
       </fsummary>
-      <type>
-        <v>Name = dns_name()</v>
-        <v>Timeout = integer() >= 0 | infinity</v>
-        <v>Reason = posix() | res_error()</v>
-      </type>
       <desc>
         <p>Backend functions used by
           <seealso marker="kernel:inet#gethostbyname/1">
@@ -305,26 +238,16 @@ any of these data structures into a {Field,Value} list.</code>
     </func>
 
     <func>
-      <name>lookup(Name, Class, Type) -> [ dns_data() ]
-      </name>
-      <name>lookup(Name, Class, Type, Opts) -> [ dns_data() ]
-      </name>
-      <name>lookup(Name, Class, Type, Opts, Timeout) -> [ dns_data() ]
-      </name>
+      <name name="lookup" arity="3"/>
+      <name name="lookup" arity="4"/>
+      <name name="lookup" arity="5"/>
       <fsummary>Resolve the DNS data for the record of the given type and class
         for the given name
       </fsummary>
-      <type>
-        <v>Name = dns_name() | ip_address()</v>
-        <v>Type = rr_type()</v>
-        <v>Opts = res_option() | verbose</v>
-        <v>Timeout = integer() >= 0 | infinity</v>
-        <v>Reason = posix() | res_error()</v>
-      </type>
       <desc>
         <p>Resolve the DNS data for the record of the given type and class
           for the given name. On success filters out the answer records
-          with the correct <c>Class</c> and <c>Type</c> and returns
+          with the correct <c><anno>Class</anno></c> and <c><anno>Type</anno></c> and returns
           a list of their data fields. So a lookup for type <c>any</c>
           will give an empty answer since the answer records have
           specific types that are not <c>any</c>. An empty answer
@@ -332,44 +255,33 @@ any of these data structures into a {Field,Value} list.</code>
         </p><p>
           Calls <seealso marker="#resolve/3">resolve/2..4</seealso>
           with the same arguments and filters the result, so
-          <c>Opts</c> is explained there.
+          <c><anno>Opts</anno></c> is explained there.
         </p>
       </desc>      
     </func>
 
     <func>
-      <name>resolve(Name, Class, Type) -> {ok,dns_msg()} | Error
-      </name>
-      <name>resolve(Name, Class, Type, Opts) -> {ok,dns_msg()} | Error
-      </name>
-      <name>resolve(Name, Class, Type, Opts, Timeout) -> {ok,dns_msg()} | Error
-      </name>
+      <name name="resolve" arity="3"/>
+      <name name="resolve" arity="4"/>
+      <name name="resolve" arity="5"/>
       <fsummary>Resolve a DNS record of the given type and class
         for the given name
       </fsummary>
-      <type>
-        <v>Name = dns_name() | ip_address()</v>
-        <v>Type = rr_type()</v>
-        <v>Opts = res_option() | verbose | atom()</v>
-        <v>Timeout = integer() >= 0 | infinity</v>
-        <v>Error = {error,Reason} | {error,{Reason,dns_msg()}}</v>
-        <v>Reason = posix() | res_error()</v>
-      </type>
       <desc>
         <p>Resolve a DNS record of the given type and class for the given name.
           The returned <c>dns_msg()</c> can be examined using
           access functions in <c>inet_db</c> as described 
           in <seealso marker="#dns_types">DNS types</seealso>.
         </p><p>
-          If <c>Name</c> is an <c>ip_address()</c>, the domain name
+          If <c><anno>Name</anno></c> is an <c>ip_address()</c>, the domain name
           to query for is generated as the standard reverse
           ".IN-ADDR.ARPA." name for an IPv4 address, or the
           ".IP6.ARPA." name for an IPv6 address.
           In this case you most probably want to use
-          <c>Class = in</c> and <c>Type = ptr</c> but it
+          <c><anno>Class</anno> = in</c> and <c><anno>Type</anno> = ptr</c> but it
           is not done automatically.
         </p><p>
-          <c>Opts</c> override the corresponding resolver options.
+          <c><anno>Opts</anno></c> override the corresponding resolver options.
           If the option <c>nameservers</c> is given, it is
           also assumed that it is the complete list of nameserves,
           so the resolver option <c>alt_nameserves</c> is ignored.
@@ -382,14 +294,14 @@ any of these data structures into a {Field,Value} list.</code>
           of queries, replies retransmissions, etc, similar
           to from utilities like <c>dig</c>, <c>nslookup</c> et.al.
         </p><p>
-          If <c>Opt</c> is an arbitrary atom it is interpreted
-          as <c>{Opt,true}</c> unless the atom string starts with
-          <c>"no"</c> making the interpretation <c>{Opt,false}</c>.
+          If <c><anno>Opt</anno></c> is an arbitrary atom it is interpreted
+          as <c>{<anno>Opt</anno>,true}</c> unless the atom string starts with
+          <c>"no"</c> making the interpretation <c>{<anno>Opt</anno>,false}</c>.
           For example: <c>usevc</c> is an alias for <c>{usevc,true}</c>,
           and <c>nousevc</c> an alias for <c>{usevc,false}</c>.
         </p><p>
           The <c>inet6</c> option currently has no effect on this function.
-          You probably want to use <c>Type = a | aaaa</c> instead.
+          You probably want to use <c><anno>Type</anno> = a | aaaa</c> instead.
         </p>
       </desc>      
     </func>
@@ -430,24 +342,18 @@ any of these data structures into a {Field,Value} list.</code>
   <funcs>
 
     <func>
-      <name>nslookup(Name, Class, Type) -> {ok,dns_msg()} | {error,Reason}
-      </name>
-      <name>nslookup(Name, Class, Type, Timeout) ->
-        {ok,dns_msg()} | {error,Reason}
-      </name>
-      <name>nslookup(Name, Class, Type, Nameservers) ->
-        {ok,dns_msg()} | {error,Reason}
-      </name>
+      <name name="nslookup" arity="3"/>
+      <name name="nslookup" arity="4" clause_i="1"/>
+      <name name="nslookup" arity="4" clause_i="2"/>
       <fsummary>Resolve a DNS record of the given type and class
         for the given name
       </fsummary>
-      <type>
-        <v>Name = dns_name() | ip_address()</v>
-        <v>Type = rr_type()</v>
-        <v>Nameservers = [ nameserver() ]</v>
-        <v>Timeout = integer() >= 0 | infinity</v>
-        <v>Reason = posix() | res_error()</v>
-      </type>
+      <type variable="Name"/>
+      <type variable="Class"/>
+      <type variable="Type"/>
+      <type variable="Timeout" name_i="2"/>
+      <type variable="Nameservers"/>
+      <type variable="Reason"/>
       <desc>
         <p>Resolve a DNS record of the given type and class for the given name.
         </p>
@@ -455,22 +361,11 @@ any of these data structures into a {Field,Value} list.</code>
     </func>
 
     <func>
-      <name>nnslookup(Name, Class, Type, Nameservers) ->
-        {ok,dns_msg()} | {error,posix()}
-      </name>
-      <name>nnslookup(Name, Class, Type, Nameservers, Timeout) ->
-        {ok,dns_msg()} | {error,posix()}
-      </name>
+      <name name="nnslookup" arity="4"/>
+      <name name="nnslookup" arity="5"/>
       <fsummary>Resolve a DNS record of the given type and class
         for the given name
       </fsummary>
-      <type>
-        <v>Name = dns_name() | ip_address()</v>
-        <v>Type = rr_type()</v>
-        <v>Nameservers = [ nameserver() ]</v>
-        <v>Timeout = integer() >= 0 | infinity</v>
-        <v>Reason = posix() | res_error()</v>
-      </type>
       <desc>
         <p>Resolve a DNS record of the given type and class for the given name.
         </p>
diff --git a/lib/kernel/doc/src/net_adm.xml b/lib/kernel/doc/src/net_adm.xml
index 7ec4f7f0e7..f2aac9282c 100644
--- a/lib/kernel/doc/src/net_adm.xml
+++ b/lib/kernel/doc/src/net_adm.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,94 +34,70 @@
   </description>
   <funcs>
     <func>
-      <name>dns_hostname(Host) -> {ok, Name} | {error, Host}</name>
+      <name name="dns_hostname" arity="1"/>
       <fsummary>Official name of a host</fsummary>
-      <type>
-        <v>Host = atom() | string()</v>
-        <v>Name = string()</v>
-      </type>
       <desc>
-        <p>Returns the official name of <c>Host</c>, or
-          <c>{error, Host}</c> if no such name is found. See also
+        <p>Returns the official name of <c><anno>Host</anno></c>, or
+          <c>{error, <anno>Host</anno>}</c> if no such name is found. See also
           <c>inet(3)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>host_file() -> Hosts | {error, Reason}</name>
+      <name name="host_file" arity="0"/>
       <fsummary>Read the <c>.hosts.erlang</c>file</fsummary>
-      <type>
-        <v>Hosts = [Host]</v>
-        <v>&nbsp;Host = atom()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>Reads the <c>.hosts.erlang</c> file, see the section
           <em>Files</em> below. Returns the hosts in this file as a
-          list, or returns <c>{error, Reason}</c> if the file could not
-          be read. See <c>file(3)</c> for possible values of
-          <c>Reason</c>.</p>
+          list, or returns <c>{error, <anno>Reason</anno>}</c> if the file could not
+          be read or the Erlang terms on the file could not be interpreted.</p>
       </desc>
     </func>
     <func>
-      <name>localhost() -> Name</name>
+      <name name="localhost" arity="0"/>
       <fsummary>Name of the local host</fsummary>
-      <type>
-        <v>Name = string()</v>
-      </type>
       <desc>
         <p>Returns the name of the local host. If Erlang was started
-          with the <c>-name</c> command line flag, <c>Name</c> is
+          with the <c>-name</c> command line flag, <c><anno>Name</anno></c> is
           the fully qualified name.</p>
       </desc>
     </func>
     <func>
-      <name>names() -> {ok, [{Name, Port}]} | {error, Reason}</name>
-      <name>names(Host) -> {ok, [{Name, Port}]} | {error, Reason}</name>
+      <name name="names" arity="0"/>
+      <name name="names" arity="1"/>
       <fsummary>Names of Erlang nodes at a host</fsummary>
-      <type>
-        <v>Name = string()</v>
-        <v>Port = int()</v>
-        <v>Reason = address | term()</v>
-      </type>
       <desc>
         <p>Similar to <c>epmd -names</c>, see <c>epmd(1)</c>.
-          <c>Host</c> defaults to the local host. Returns the names and
+          <c><anno>Host</anno></c> defaults to the local host. Returns the names and
           associated port numbers of the Erlang nodes that <c>epmd</c>
           at the specified host has registered.</p>
         <p>Returns <c>{error, address}</c> if <c>epmd</c> is not
-          running. See <c>inet(3)</c> for other possible values of
-          <c>Reason</c>.</p>
+          running.</p>
         <pre>
 (arne@dunn)1> <input>net_adm:names().</input>
 {ok,[{"arne",40262}]}</pre>
       </desc>
     </func>
     <func>
-      <name>ping(Node) -> pong | pang</name>
+      <name name="ping" arity="1"/>
       <fsummary>Set up a connection to a node</fsummary>
-      <type>
-        <v>Node = node()</v>
-      </type>
       <desc>
-        <p>Tries to set up a connection to <c>Node</c>. Returns
+        <p>Tries to set up a connection to <c><anno>Node</anno></c>. Returns
           <c>pang</c> if it fails, or <c>pong</c> if it is successful.</p>
       </desc>
     </func>
     <func>
-      <name>world() -> [node()]</name>
-      <name>world(Arg) -> [node()]</name>
+      <name name="world" arity="0"/>
+      <name name="world" arity="1"/>
+      <type name="verbosity"/>
       <fsummary>Lookup and connect to all nodes at all hosts in <c>.hosts.erlang</c></fsummary>
-      <type>
-        <v>Arg = silent | verbose</v>
-      </type>
       <desc>
         <p>This function calls <c>names(Host)</c> for all hosts which
           are specified in the Erlang host file <c>.hosts.erlang</c>,
           collects the replies and then evaluates <c>ping(Node)</c> on
           all those nodes. Returns the list of all nodes that were,
 	  successfully pinged.</p>
-        <p><c>Arg</c> defaults to <c>silent</c>.
-	 If <c>Arg == verbose</c>, the function writes information about which
+        <p><c><anno>Arg</anno></c> defaults to <c>silent</c>.
+	 If <c><anno>Arg</anno> == verbose</c>, the function writes information about which
           nodes it is pinging to stdout.</p>
         <p>This function can be useful when a node is started, and
           the names of the other nodes in the network are not initially
@@ -131,14 +107,10 @@
       </desc>
     </func>
     <func>
-      <name>world_list(Hosts) -> [node()]</name>
-      <name>world_list(Hosts, Arg) -> [node()]</name>
+      <name name="world_list" arity="1"/>
+      <name name="world_list" arity="2"/>
+      <type name="verbosity"/>
       <fsummary>Lookup and connect to all nodes at specified hosts</fsummary>
-      <type>
-        <v>Hosts = [Host]</v>
-        <v>&nbsp;Host = atom()</v>
-        <v>Arg = silent | verbose</v>
-      </type>
       <desc>
         <p>As <c>world/0,1</c>, but the hosts are given as argument
           instead of being read from <c>.hosts.erlang</c>.</p>
diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml
index a18226e779..96e2aa665d 100644
--- a/lib/kernel/doc/src/net_kernel.xml
+++ b/lib/kernel/doc/src/net_kernel.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -64,50 +64,38 @@ $ <input>erl -sname foobar</input></pre>
   </description>
   <funcs>
     <func>
-      <name>allow(Nodes) -> ok | error</name>
+      <name name="allow" arity="1"/>
       <fsummary>Limit access to a specified set of nodes</fsummary>
-      <type>
-        <v>Nodes = [node()]</v>
-      </type>
       <desc>
         <p>Limits access to the specified set of nodes. Any access
-          attempts made from (or to) nodes not in <c>Nodes</c> will be
+          attempts made from (or to) nodes not in <c><anno>Nodes</anno></c> will be
           rejected.</p>
-        <p>Returns <c>error</c> if any element in <c>Nodes</c> is not
+        <p>Returns <c>error</c> if any element in <c><anno>Nodes</anno></c> is not
           an atom.</p>
       </desc>
     </func>
     <func>
-      <name>connect_node(Node) -> true | false | ignored</name>
+      <name name="connect_node" arity="1"/>
       <fsummary>Establish a connection to a node</fsummary>
-      <type>
-        <v>Node = node()</v>
-      </type>
       <desc>
-        <p>Establishes a connection to <c>Node</c>. Returns <c>true</c>
+        <p>Establishes a connection to <c><anno>Node</anno></c>. Returns <c>true</c>
           if successful, <c>false</c> if not, and <c>ignored</c> if
           the local node is not alive.</p>
       </desc>
     </func>
     <func>
-      <name>monitor_nodes(Flag) -> ok | Error</name>
-      <name>monitor_nodes(Flag, Options) -> ok | Error</name>
+      <name name="monitor_nodes" arity="1"/>
+      <name name="monitor_nodes" arity="2"/>
       <fsummary>Subscribe to node status change messages</fsummary>
-      <type>
-        <v>Flag = true | false</v>
-        <v>Options = [Option]</v>
-        <v>&nbsp;Option -- see below</v>
-        <v>Error = error | {error, term()}</v>
-      </type>
       <desc>
         <p>The calling process subscribes or unsubscribes to node
           status change messages. A <c>nodeup</c> message is delivered
           to all subscribing process when a new node is connected, and
           a <c>nodedown</c> message is delivered when a node is
           disconnected.</p>
-        <p>If <c>Flag</c> is <c>true</c>, a new subscription is started.
-          If <c>Flag</c> is <c>false</c>, all previous subscriptions --
-          started with the same <c>Options</c> -- are stopped. Two
+        <p>If <c><anno>Flag</anno></c> is <c>true</c>, a new subscription is started.
+          If <c><anno>Flag</anno></c> is <c>false</c>, all previous subscriptions --
+          started with the same <c><anno>Options</anno></c> -- are stopped. Two
           option lists are considered the same if they contain the same
           set of options.</p>
         <p>As of <c>kernel</c> version 2.11.4, and <c>erts</c> version
@@ -139,23 +127,23 @@ $ <input>erl -sname foobar</input></pre>
         <p>Note, that this is <em>not</em> guaranteed for <c>kernel</c>
           versions before 2.13.</p>
         <p>The format of the node status change messages depends on
-          <c>Options</c>. If <c>Options</c> is [], which is the default,
+          <c><anno>Options</anno></c>. If <c><anno>Options</anno></c> is [], which is the default,
           the format is:</p>
         <code type="none">
 {nodeup, Node} | {nodedown, Node}
   Node = node()</code>
-        <p>If <c>Options /= []</c>, the format is:</p>
+        <p>If <c><anno>Options</anno> /= []</c>, the format is:</p>
         <code type="none">
 {nodeup, Node, InfoList} | {nodedown, Node, InfoList}
   Node = node()
   InfoList = [{Tag, Val}]</code>
         <p><c>InfoList</c> is a list of tuples. Its contents depends on
-          <c>Options</c>, see below.</p>
+          <c><anno>Options</anno></c>, see below.</p>
         <p>Also, when <c>OptionList == []</c> only visible nodes, that
           is, nodes that appear in the result of
           <seealso marker="erts:erlang#nodes/0">nodes/0</seealso>, are
           monitored.</p>
-        <p><c>Option</c> can be any of the following:</p>
+        <p><c><anno>Option</anno></c> can be any of the following:</p>
         <taglist>
           <tag><c>{node_type, NodeType}</c></tag>
           <item>
@@ -209,61 +197,51 @@ $ <input>erl -sname foobar</input></pre>
       </desc>
     </func>
     <func>
-      <name>get_net_ticktime() -> Res</name>
+      <name name="get_net_ticktime" arity="0"/>
       <fsummary>Get <c>net_ticktime</c></fsummary>
-      <type>
-        <v>Res = NetTicktime | {ongoing_change_to, NetTicktime}</v>
-        <v>&nbsp;NetTicktime = int()</v>
-      </type>
       <desc>
         <p>Gets <c>net_ticktime</c> (see
           <seealso marker="kernel_app">kernel(6)</seealso>).</p>
-        <p>Currently defined return values (<c>Res</c>):</p>
+        <p>Currently defined return values (<c><anno>Res</anno></c>):</p>
         <taglist>
-          <tag><c>NetTicktime</c></tag>
+          <tag><c><anno>NetTicktime</anno></c></tag>
           <item>
-            <p><c>net_ticktime</c> is <c>NetTicktime</c> seconds.</p>
+            <p><c>net_ticktime</c> is <c><anno>NetTicktime</anno></c> seconds.</p>
           </item>
-          <tag><c>{ongoing_change_to, NetTicktime}</c></tag>
+          <tag><c>{ongoing_change_to, <anno>NetTicktime</anno>}</c></tag>
           <item>
             <p><c>net_kernel</c> is currently changing
-              <c>net_ticktime</c> to <c>NetTicktime</c> seconds.</p>
+              <c>net_ticktime</c> to <c><anno>NetTicktime</anno></c> seconds.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>set_net_ticktime(NetTicktime) -> Res</name>
-      <name>set_net_ticktime(NetTicktime, TransitionPeriod) -> Res</name>
+      <name name="set_net_ticktime" arity="1"/>
+      <name name="set_net_ticktime" arity="2"/>
       <fsummary>Set <c>net_ticktime</c></fsummary>
-      <type>
-        <v>NetTicktime = int() > 0</v>
-        <v>TransitionPeriod = int() >= 0</v>
-        <v>Res = unchanged | change_initiated | {ongoing_change_to, NewNetTicktime}</v>
-        <v>&nbsp;NewNetTicktime = int() > 0</v>
-      </type>
       <desc>
         <p>Sets <c>net_ticktime</c> (see
           <seealso marker="kernel_app">kernel(6)</seealso>) to
-          <c>NetTicktime</c> seconds. <c>TransitionPeriod</c> defaults
+          <c><anno>NetTicktime</anno></c> seconds. <c><anno>TransitionPeriod</anno></c> defaults
           to 60.</p>
         <p>Some definitions:</p>
         <p></p>
         <taglist>
           <tag>The minimum transition traffic interval (<c>MTTI</c>)</tag>
           <item>
-            <p><c>minimum(NetTicktime, PreviousNetTicktime)*1000 div 4</c> milliseconds.</p>
+            <p><c>minimum(<anno>NetTicktime</anno>, PreviousNetTicktime)*1000 div 4</c> milliseconds.</p>
           </item>
           <tag>The transition period</tag>
           <item>
             <p>The time of the least number of consecutive <c>MTTI</c>s
-              to cover <c>TransitionPeriod</c> seconds following
+              to cover <c><anno>TransitionPeriod</anno></c> seconds following
               the call to <c>set_net_ticktime/2</c> (i.e.
-              ((<c>TransitionPeriod*1000 - 1) div MTTI + 1)*MTTI</c>
+              ((<c><anno>TransitionPeriod</anno>*1000 - 1) div MTTI + 1)*MTTI</c>
               milliseconds).</p>
           </item>
         </taglist>
-        <p>If <c><![CDATA[NetTicktime < PreviousNetTicktime]]></c>, the actual
+        <p>If <c><![CDATA[<anno>NetTicktime</anno> < PreviousNetTicktime]]></c>, the actual
           <c>net_ticktime</c> change will be done at the end of
           the transition period; otherwise, at the beginning. During
           the transition period, <c>net_kernel</c> will ensure that
@@ -271,7 +249,7 @@ $ <input>erl -sname foobar</input></pre>
           every <c>MTTI</c> millisecond.</p>
         <note>
           <p>The <c>net_ticktime</c> changes have to be initiated on all
-            nodes in the network (with the same <c>NetTicktime</c>)
+            nodes in the network (with the same <c><anno>NetTicktime</anno></c>)
             before the end of any transition period on any node;
             otherwise, connections may erroneously be disconnected.</p>
         </note>
@@ -280,18 +258,18 @@ $ <input>erl -sname foobar</input></pre>
           <tag><c>unchanged</c></tag>
           <item>
             <p><c>net_ticktime</c> already had the value of
-              <c>NetTicktime</c> and was left unchanged.</p>
+              <c><anno>NetTicktime</anno></c> and was left unchanged.</p>
           </item>
           <tag><c>change_initiated</c></tag>
           <item>
             <p><c>net_kernel</c> has initiated the change of
-              <c>net_ticktime</c> to <c>NetTicktime</c> seconds.</p>
+              <c>net_ticktime</c> to <c><anno>NetTicktime</anno></c> seconds.</p>
           </item>
-          <tag><c>{ongoing_change_to, NewNetTicktime}</c></tag>
+          <tag><c>{ongoing_change_to, <anno>NewNetTicktime</anno>}</c></tag>
           <item>
             <p>The request was <em>ignored</em>; because,
               <c>net_kernel</c> was busy changing <c>net_ticktime</c> to
-              <c>NewTicktime</c> seconds.</p>
+              <c><anno>NewNetTicktime</anno></c> seconds.</p>
           </item>
         </taglist>
       </desc>
@@ -315,7 +293,7 @@ $ <input>erl -sname foobar</input></pre>
       </desc>
     </func>
     <func>
-      <name>stop() -> ok | {error, not_allowed | not_found}</name>
+      <name name="stop" arity="0"/>
       <fsummary>Turn a node into a non-distributed Erlang runtime system</fsummary>
       <desc>
         <p>Turns a distributed node into a non-distributed node. For
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 065b24c53d..f92837dfe5 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 2c9cc33eb7..56fc1834ec 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -38,13 +38,10 @@
   </description>
   <funcs>
     <func>
-      <name>cmd(Command) -> string()</name>
+      <name name="cmd" arity="1"/>
       <fsummary>Execute a command in a shell of the target OS</fsummary>
-      <type>
-        <v>Command = string() | atom()</v>
-      </type>
       <desc>
-        <p>Executes <c>Command</c> in a command shell of the target OS,
+        <p>Executes <c><anno>Command</anno></c> in a command shell of the target OS,
           captures the standard output of the command and returns this
           result as a string. This function is a replacement of
           the previous <c>unix:cmd/1</c>; on a Unix platform they are
@@ -60,23 +57,18 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
       </desc>
     </func>
     <func>
-      <name>find_executable(Name) -> Filename | false</name>
-      <name>find_executable(Name, Path) -> Filename | false</name>
+      <name name="find_executable" arity="1"/>
+      <name name="find_executable" arity="2"/>
       <fsummary>Absolute filename of a program</fsummary>
-      <type>
-        <v>Name = string()</v>
-        <v>Path = string()</v>
-        <v>Filename = string()</v>
-      </type>
       <desc>
         <p>These two functions look up an executable program given its
           name and a search path, in the same way as the underlying
           operating system. <c>find_executable/1</c> uses the current
           execution path (that is, the environment variable PATH on
           Unix and Windows).</p>
-        <p><c>Path</c>, if given, should conform to the syntax of
+        <p><c><anno>Path</anno></c>, if given, should conform to the syntax of
           execution paths on the operating system. The absolute
-          filename of the executable program <c>Name</c> is returned,
+          filename of the executable program <c><anno>Name</anno></c> is returned,
           or <c>false</c> if the program was not found.</p>
       </desc>
     </func>
@@ -137,7 +129,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
       <name>timestamp() -> {MegaSecs, Secs, MicroSecs}</name>
       <fsummary>Returna a timestamp from the OS in the erlang:now/0 format</fsummary>
       <type>
-        <v>MegaSecs = Secs = MicroSecs = int()</v>
+        <v>MegaSecs = Secs = MicroSecs = integer() >= 0</v>
       </type>
       <desc>
       <p>Returns a tuple in the same format as <seealso marker="erts:erlang#now/0">erlang:now/0</seealso>. The difference is that this function returns what the operating system thinks (a.k.a. the wall clock time) without any attempts at time correction. The result of two different calls to this function is <em>not</em> guaranteed to be different.</p>
@@ -165,19 +157,15 @@ format_utc_timestamp() ->
       </desc>
     </func>
     <func>
-      <name>type() -> {Osfamily, Osname} | Osfamily</name>
+      <name name="type" arity="0"/>
       <fsummary>Return the OS family and, in some cases, OS name of the current operating system</fsummary>
-      <type>
-        <v>Osfamily = win32 | unix | vxworks</v>
-        <v>Osname = atom()</v>
-      </type>
       <desc>
-        <p>Returns the <c>Osfamily</c> and, in some cases, <c>Osname</c>
+        <p>Returns the <c><anno>Osfamily</anno></c> and, in some cases, <c><anno>Osname</anno></c>
           of the current operating system.</p>
-        <p>On Unix, <c>Osname</c> will have same value as
+        <p>On Unix, <c><anno>Osname</anno></c> will have same value as
           <c>uname -s</c> returns, but in lower case. For example, on
           Solaris 1 and 2, it will be <c>sunos</c>.</p>
-        <p>In Windows, <c>Osname</c> will be either <c>nt</c> (on
+        <p>In Windows, <c><anno>Osname</anno></c> will be either <c>nt</c> (on
           Windows NT), or <c>windows</c> (on Windows 95).</p>
         <p>On VxWorks the OS family alone is returned, that is
           <c>vxworks</c>.</p>
@@ -185,17 +173,13 @@ format_utc_timestamp() ->
           <p>Think twice before using this function. Use the
             <c>filename</c> module if you want to inspect or build
             file names in a portable way.
-            Avoid matching on the <c>Osname</c> atom.</p>
+            Avoid matching on the <c><anno>Osname</anno></c> atom.</p>
         </note>
       </desc>
     </func>
     <func>
-      <name>version() -> {Major, Minor, Release} | VersionString</name>
+      <name name="version" arity="0"/>
       <fsummary>Return the Operating System version</fsummary>
-      <type>
-        <v>Major = Minor = Release = integer()</v>
-        <v>VersionString = string()</v>
-      </type>
       <desc>
         <p>Returns the operating system version.
           On most systems, this function returns a tuple, but a string
diff --git a/lib/kernel/doc/src/pg2.xml b/lib/kernel/doc/src/pg2.xml
index 7463fd10f5..d26ff0fc6b 100644
--- a/lib/kernel/doc/src/pg2.xml
+++ b/lib/kernel/doc/src/pg2.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -60,13 +60,16 @@
         to avoid name clashes.</p>
     </warning>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="name"/>
+      <desc><p>The name of a process group.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>create(Name) -> void()</name>
+      <name name="create" arity="1"/>
       <fsummary>Create a new, empty process group</fsummary>
-      <type>
-        <v>Name = term()</v>
-      </type>
       <desc>
         <p>Creates a new, empty process group. The group is globally
           visible on all nodes. If the group exists, nothing happens.
@@ -74,24 +77,16 @@
       </desc>
     </func>
     <func>
-      <name>delete(Name) -> void()</name>
+      <name name="delete" arity="1"/>
       <fsummary>Delete a process group</fsummary>
-      <type>
-        <v>Name = term()</v>
-      </type>
       <desc>
         <p>Deletes a process group.
           </p>
       </desc>
     </func>
     <func>
-      <name>get_closest_pid(Name) -> Pid | {error, Reason}</name>
+      <name name="get_closest_pid" arity="1"/>
       <fsummary>Common dispatch function</fsummary>
-      <type>
-        <v>Name = term()</v>
-	<v>Pid = pid()</v>
-	<v>Reason = {no_process, Name} | {no_such_group, Name}</v>
-      </type>
       <desc>
         <p>This is a useful dispatch function which can be used from
           client functions. It returns a process on the local node, if
@@ -100,13 +95,8 @@
       </desc>
     </func>
     <func>
-      <name>get_members(Name) -> [Pid] | {error, Reason}</name>
+      <name name="get_members" arity="1"/>
       <fsummary>Return all processes in a group</fsummary>
-      <type>
-        <v>Name = term()</v>
-	<v>Pid = pid()</v>
-	<v>Reason = {no_such_group, Name}</v>
-      </type>
       <desc>
         <p>Returns all processes in the group <c>Name</c>. This
           function should be used from within a client function that
@@ -115,13 +105,8 @@
       </desc>
     </func>
     <func>
-      <name>get_local_members(Name) -> [Pid] | {error, Reason}</name>
+      <name name="get_local_members" arity="1"/>
       <fsummary>Return all local processes in a group</fsummary>
-      <type>
-        <v>Name = term()</v>
-	<v>Pid = pid()</v>
-	<v>Reason = {no_such_group, Name}</v>
-      </type>
       <desc>
         <p>Returns all processes running on the local node in the
           group <c>Name</c>. This function should to be used from
@@ -131,13 +116,8 @@
       </desc>
     </func>
     <func>
-      <name>join(Name, Pid) -> ok | {error, Reason}</name>
+      <name name="join" arity="2"/>
       <fsummary>Join a process to a group</fsummary>
-      <type>
-        <v>Name = term()</v>
-	<v>Pid = pid()</v>
-	<v>Reason = {no_such_group, Name}</v>
-      </type>
       <desc>
         <p>Joins the process <c>Pid</c> to the group <c>Name</c>.
 	  A process can join a group several times; it must then
@@ -146,13 +126,8 @@
       </desc>
     </func>
     <func>
-      <name>leave(Name, Pid) -> ok | {error, Reason}</name>
+      <name name="leave" arity="2"/>
       <fsummary>Make a process leave a group</fsummary>
-      <type>
-        <v>Name = term()</v>
-	<v>Pid = pid()</v>
-	<v>Reason = {no_such_group, Name}</v>
-      </type>
       <desc>
         <p>Makes the process <c>Pid</c> leave the group <c>Name</c>.
 	  If the process is not a member of the group, <c>ok</c> is
@@ -161,24 +136,17 @@
       </desc>
     </func>
     <func>
-      <name>which_groups() -> [Name]</name>
+      <name name="which_groups" arity="0"/>
       <fsummary>Return a list of all known groups</fsummary>
-      <type>
-        <v>Name = term()</v>
-      </type>
       <desc>
         <p>Returns a list of all known groups.
           </p>
       </desc>
     </func>
     <func>
-      <name>start()</name>
-      <name>start_link() -> {ok, Pid} | {error, Reason}</name>
+      <name name="start" arity="0"/>
+      <name name="start_link" arity="0"/>
       <fsummary>Start the pg2 server</fsummary>
-      <type>
-	<v>Pid = pid()</v>
-	<v>Reason = term()</v>
-      </type>
       <desc>
         <p>Starts the pg2 server. Normally, the server does not need
           to be started explicitly, as it is started dynamically if it
diff --git a/lib/kernel/doc/src/rpc.xml b/lib/kernel/doc/src/rpc.xml
index 2b81de170d..b01ff16c85 100644
--- a/lib/kernel/doc/src/rpc.xml
+++ b/lib/kernel/doc/src/rpc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -37,40 +37,34 @@
       for collecting information on a remote node, or for running a
       function with some specific side effects on the remote node.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="key"/>
+      <desc>
+        <p>As returned by <seealso marker="#async_call/4">
+          <c>async_call/4</c>.</seealso></p>
+      </desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>call(Node, Module, Function, Args) -> Res | {badrpc, Reason}</name>
+      <name name="call" arity="4"/>
       <fsummary>Evaluate a function call on a node</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>Res = term()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
-        <p>Evaluates <c>apply(Module, Function, Args)</c> on the node
-          <c>Node</c> and returns the corresponding value <c>Res</c>, or
-          <c>{badrpc, Reason}</c> if the call fails.</p>
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on the node
+          <c><anno>Node</anno></c> and returns the corresponding value <c><anno>Res</anno></c>, or
+          <c>{badrpc, <anno>Reason</anno>}</c> if the call fails.</p>
       </desc>
     </func>
     <func>
-      <name>call(Node, Module, Function, Args, Timeout) -> Res | {badrpc, Reason}</name>
+      <name name="call" arity="5"/>
       <fsummary>Evaluate a function call on a node</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>Res = term()</v>
-        <v>Reason = timeout | term()</v>
-        <v>Timeout = int() | infinity</v>
-      </type>
       <desc>
-        <p>Evaluates <c>apply(Module, Function, Args)</c> on the node
-          <c>Node</c> and returns the corresponding value <c>Res</c>, or
-          <c>{badrpc, Reason}</c> if the call fails. <c>Timeout</c> is
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on the node
+          <c><anno>Node</anno></c> and returns the corresponding value <c><anno>Res</anno></c>, or
+          <c>{badrpc, <anno>Reason</anno>}</c> if the call fails. <c><anno>Timeout</anno></c> is
           a timeout value in milliseconds. If the call times out,
-          <c>Reason</c> is <c>timeout</c>.</p>
+          <c><anno>Reason</anno></c> is <c>timeout</c>.</p>
         <p>If the reply arrives after the call times out, no message
           will contaminate the caller's message queue, since this
           function spawns off a middleman process to act as (a void)
@@ -80,17 +74,10 @@
       </desc>
     </func>
     <func>
-      <name>block_call(Node, Module, Function, Args) -> Res | {badrpc, Reason}</name>
+      <name name="block_call" arity="4"/>
       <fsummary>Evaluate a function call on a node in the RPC server's context</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>Res = term()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
-        <p>Like <c>call/4</c>, but the RPC server at <c>Node</c> does
+        <p>Like <c>call/4</c>, but the RPC server at <c><anno>Node</anno></c> does
           not create a separate process to handle the call. Thus,
           this function can be used if the intention of the call is to
           block the RPC server from any other incoming requests until
@@ -101,50 +88,31 @@
       </desc>
     </func>
     <func>
-      <name>block_call(Node, Module, Function, Args, Timeout) -> Res | {badrpc, Reason}</name>
+      <name name="block_call" arity="5"/>
       <fsummary>Evaluate a function call on a node in the RPC server's context</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>Timeout = int() | infinity</v>
-        <v>Res = term()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>Like <c>block_call/4</c>, but with a timeout value in
           the same manner as <c>call/5</c>.</p>
       </desc>
     </func>
     <func>
-      <name>async_call(Node, Module, Function, Args) -> Key</name>
+      <name name="async_call" arity="4"/>
       <fsummary>Evaluate a function call on a node, asynchronous version</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>Key -- see below</v>
-      </type>
       <desc>
         <p>Implements <em>call streams with promises</em>, a type of
           RPC which does not suspend the caller until the result is
           finished. Instead, a key is returned which can be used at a
           later stage to collect the value. The key can be viewed as a
           promise to deliver the answer.</p>
-        <p>In this case, the key <c>Key</c> is returned, which can be
+        <p>In this case, the key <c><anno>Key</anno></c> is returned, which can be
           used in a subsequent call to <c>yield/1</c> or
           <c>nb_yield/1,2</c> to retrieve the value of evaluating
-          <c>apply(Module, Function, Args)</c> on the node <c>Node</c>.</p>
+          <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on the node <c><anno>Node</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>yield(Key) -> Res | {badrpc, Reason}</name>
+      <name name="yield" arity="1"/>
       <fsummary>Deliver the result of evaluating a function call on a node (blocking)</fsummary>
-      <type>
-        <v>Key -- see async_call/4</v>
-        <v>Res = term()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>Returns the promised answer from a previous
           <c>async_call/4</c>. If the answer is available, it is
@@ -153,87 +121,46 @@
       </desc>
     </func>
     <func>
-      <name>nb_yield(Key) -> {value, Val} | timeout</name>
+      <name name="nb_yield" arity="1"/>
       <fsummary>Deliver the result of evaluating a function call on a node (non-blocking)</fsummary>
-      <type>
-        <v>Key -- see async_call/4</v>
-        <v>Val = Res | {badrpc, Reason}</v>
-        <v>&nbsp;Res = term()</v>
-        <v>&nbsp;Reason = term()</v>
-      </type>
       <desc>
-        <p>Equivalent to <c>nb_yield(Key, 0)</c>.</p>
+        <p>Equivalent to <c>nb_yield(<anno>Key</anno>, 0)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>nb_yield(Key, Timeout) -> {value, Val} | timeout</name>
+      <name name="nb_yield" arity="2"/>
       <fsummary>Deliver the result of evaluating a function call on a node (non-blocking)</fsummary>
-      <type>
-        <v>Key -- see async_call/4</v>
-        <v>Timeout = int() | infinity</v>
-        <v>Val = Res | {badrpc, Reason}</v>
-        <v>&nbsp;Res = term()</v>
-        <v>&nbsp;Reason = term()</v>
-      </type>
       <desc>
         <p>This is a non-blocking version of <c>yield/1</c>. It returns
-          the tuple <c>{value, Val}</c> when the computation has
-          finished, or <c>timeout</c> when <c>Timeout</c> milliseconds
+          the tuple <c>{value, <anno>Val</anno>}</c> when the computation has
+          finished, or <c>timeout</c> when <c><anno>Timeout</anno></c> milliseconds
           has elapsed.</p>
       </desc>
     </func>
     <func>
-      <name>multicall(Module, Function, Args) -> {ResL, BadNodes}</name>
+      <name name="multicall" arity="3"/>
       <fsummary>Evaluate a function call on a number of nodes</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>ResL = [term()]</v>
-        <v>BadNodes = [node()]</v>
-      </type>
       <desc>
-        <p>Equivalent to <c>multicall([node()|nodes()], Module, Function, Args, infinity)</c>.</p>
+        <p>Equivalent to <c>multicall([node()|nodes()], <anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>, infinity)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>multicall(Nodes, Module, Function, Args) -> {ResL, BadNodes}</name>
+      <name name="multicall" arity="4" clause_i="1"/>
       <fsummary>Evaluate a function call on a number of nodes</fsummary>
-      <type>
-        <v>Nodes = [node()]</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>ResL = [term()]</v>
-        <v>BadNodes = [node()]</v>
-      </type>
       <desc>
-        <p>Equivalent to <c>multicall(Nodes, Module, Function, Args, infinity)</c>.</p>
+        <p>Equivalent to <c>multicall(<anno>Nodes</anno>, <anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>, infinity)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>multicall(Module, Function, Args, Timeout) -> {ResL, BadNodes}</name>
+      <name name="multicall" arity="4" clause_i="2"/>
       <fsummary>Evaluate a function call on a number of nodes</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>Timeout = int() | infinity</v>
-        <v>ResL = [term()]</v>
-        <v>BadNodes = [node()]</v>
-      </type>
       <desc>
-        <p>Equivalent to <c>multicall([node()|nodes()], Module, Function, Args, Timeout)</c>.</p>
+        <p>Equivalent to <c>multicall([node()|nodes()], <anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>, <anno>Timeout</anno>)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>multicall(Nodes, Module, Function, Args, Timeout) -> {ResL, BadNodes}</name>
+      <name name="multicall" arity="5"/>
       <fsummary>Evaluate a function call on a number of nodes</fsummary>
-      <type>
-        <v>Nodes = [node()]</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>Timeout = int() | infinity</v>
-        <v>ResL = [term()]</v>
-        <v>BadNodes = [node()]</v>
-      </type>
       <desc>
         <p>In contrast to an RPC, a multicall is an RPC which is sent
           concurrently from one client to multiple servers. This is
@@ -243,12 +170,12 @@
           making a series of RPCs on all the nodes, but the multicall
           is faster as all the requests are sent at the same time
           and are collected one by one as they come back.</p>
-        <p>The function evaluates <c>apply(Module, Function, Args)</c> 
+        <p>The function evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c>
           on the specified nodes and collects the answers. It returns 
-          <c>{ResL, Badnodes}</c>, where <c>Badnodes</c> is a list
+          <c>{<anno>ResL</anno>, <anno>BadNodes</anno>}</c>, where <c><anno>BadNodes</anno></c> is a list
           of the nodes that terminated or timed out during computation,
-          and <c>ResL</c> is a list of the return values.
-          <c>Timeout</c> is a time (integer) in milliseconds, or
+          and <c><anno>ResL</anno></c> is a list of the return values.
+          <c><anno>Timeout</anno></c> is a time (integer) in milliseconds, or
           <c>infinity</c>.</p>
         <p>The following example is useful when new object code is to
           be loaded on all nodes in the network, and also indicates
@@ -264,93 +191,60 @@
       </desc>
     </func>
     <func>
-      <name>cast(Node, Module, Function, Args) -> void()</name>
+      <name name="cast" arity="4"/>
       <fsummary>Run a function on a node ignoring the result</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
-        <p>Evaluates <c>apply(Module, Function, Args)</c> on the node
-          <c>Node</c>. No response is delivered and the calling
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on the node
+          <c><anno>Node</anno></c>. No response is delivered and the calling
           process is not suspended until the evaluation is complete, as
           is the case with <c>call/4,5</c>.</p>
       </desc>
     </func>
     <func>
-      <name>eval_everywhere(Module, Funtion, Args) -> void()</name>
+      <name name="eval_everywhere" arity="3"/>
       <fsummary>Run a function on all nodes, ignoring the result</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
-        <p>Equivalent to <c>eval_everywhere([node()|nodes()], Module, Function, Args)</c>.</p>
+        <p>Equivalent to <c>eval_everywhere([node()|nodes()], <anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>eval_everywhere(Nodes, Module, Function, Args) -> void()</name>
+      <name name="eval_everywhere" arity="4"/>
       <fsummary>Run a function on specific nodes, ignoring the result</fsummary>
-      <type>
-        <v>Nodes = [node()]</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
-        <p>Evaluates <c>apply(Module, Function, Args)</c> on
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on
           the specified nodes. No answers are collected.</p>
       </desc>
     </func>
     <func>
-      <name>abcast(Name, Msg) -> void()</name>
+      <name name="abcast" arity="2"/>
       <fsummary>Broadcast a message asynchronously to a registered process on all nodes</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>Msg = term()</v>
-      </type>
       <desc>
-        <p>Equivalent to <c>abcast([node()|nodes()], Name, Msg)</c>.</p>
+        <p>Equivalent to <c>abcast([node()|nodes()], <anno>Name</anno>, <anno>Msg</anno>)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>abcast(Nodes, Name, Msg) -> void()</name>
+      <name name="abcast" arity="3"/>
       <fsummary>Broadcast a message asynchronously to a registered process on specific nodes</fsummary>
-      <type>
-        <v>Nodes = [node()]</v>
-        <v>Name = atom()</v>
-        <v>Msg = term()</v>
-      </type>
       <desc>
-        <p>Broadcasts the message <c>Msg</c> asynchronously to
-          the registered process <c>Name</c> on the specified nodes.</p>
+        <p>Broadcasts the message <c><anno>Msg</anno></c> asynchronously to
+          the registered process <c><anno>Name</anno></c> on the specified nodes.</p>
       </desc>
     </func>
     <func>
-      <name>sbcast(Name, Msg) -> {GoodNodes, BadNodes}</name>
+      <name name="sbcast" arity="2"/>
       <fsummary>Broadcast a message synchronously to a registered process on all nodes</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>Msg = term()</v>
-        <v>GoodNodes = BadNodes = [node()]</v>
-      </type>
       <desc>
-        <p>Equivalent to <c>sbcast([node()|nodes()], Name, Msg)</c>.</p>
+        <p>Equivalent to <c>sbcast([node()|nodes()], <anno>Name</anno>, <anno>Msg</anno>)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>sbcast(Nodes, Name, Msg) -> {GoodNodes, BadNodes}</name>
+      <name name="sbcast" arity="3"/>
       <fsummary>Broadcast a message synchronously to a registered process on specific nodes</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>Msg = term()</v>
-        <v>Nodes = GoodNodes = BadNodes = [node()]</v>
-      </type>
       <desc>
-        <p>Broadcasts the message <c>Msg</c> synchronously to
-          the registered process <c>Name</c> on the specified nodes.</p>
-        <p>Returns <c>{GoodNodes, BadNodes}</c>, where <c>GoodNodes</c>
-          is the list of nodes which have <c>Name</c> as a registered
+        <p>Broadcasts the message <c><anno>Msg</anno></c> synchronously to
+          the registered process <c><anno>Name</anno></c> on the specified nodes.</p>
+        <p>Returns <c>{<anno>GoodNodes</anno>, <anno>BadNodes</anno>}</c>, where <c><anno>GoodNodes</anno></c>
+          is the list of nodes which have <c><anno>Name</anno></c> as a registered
           process.</p>
         <p>The function is synchronous in the sense that it is known
           that all servers have received the message when the call
@@ -362,67 +256,46 @@
       </desc>
     </func>
     <func>
-      <name>server_call(Node, Name, ReplyWrapper, Msg) -> Reply | {error, Reason}</name>
+      <name name="server_call" arity="4"/>
       <fsummary>Interact with a server on a node</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Name = atom()</v>
-        <v>ReplyWrapper = Msg = Reply = term()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>This function can be used when interacting with a server
-          called <c>Name</c> at node <c>Node</c>. It is assumed that
+          called <c><anno>Name</anno></c> at node <c><anno>Node</anno></c>. It is assumed that
           the server receives messages in the format
-          <c>{From, Msg}</c> and replies using <c>From ! {ReplyWrapper, Node, Reply}</c>. This function makes such
+          <c>{From, <anno>Msg</anno>}</c> and replies using <c>From ! {<anno>ReplyWrapper</anno>, <anno>Node</anno>, <anno>Reply</anno>}</c>. This function makes such
           a server call and ensures that the entire call is packed into
           an atomic transaction which either succeeds or fails. It
           never hangs, unless the server itself hangs.</p>
-        <p>The function returns the answer <c>Reply</c> as produced by
-          the server <c>Name</c>, or <c>{error, Reason}</c>.</p>
+        <p>The function returns the answer <c><anno>Reply</anno></c> as produced by
+          the server <c><anno>Name</anno></c>, or <c>{error, <anno>Reason</anno>}</c>.</p>
       </desc>
     </func>
     <func>
-      <name>multi_server_call(Name, Msg) -> {Replies, BadNodes}</name>
+      <name name="multi_server_call" arity="2"/>
       <fsummary>Interact with the servers on a number of nodes</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>Msg = term()</v>
-        <v>Replies = [Reply]</v>
-        <v>&nbsp;Reply = term()</v>
-        <v>BadNodes = [node()]</v>
-      </type>
       <desc>
-        <p>Equivalent to <c>multi_server_call([node()|nodes()], Name, Msg)</c>.</p>
+        <p>Equivalent to <c>multi_server_call([node()|nodes()], <anno>Name</anno>, <anno>Msg</anno>)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>multi_server_call(Nodes, Name, Msg) -> {Replies, BadNodes}</name>
+      <name name="multi_server_call" arity="3"/>
       <fsummary>Interact with the servers on a number of nodes</fsummary>
-      <type>
-        <v>Nodes = [node()]</v>
-        <v>Name = atom()</v>
-        <v>Msg = term()</v>
-        <v>Replies = [Reply]</v>
-        <v>&nbsp;Reply = term()</v>
-        <v>BadNodes = [node()]</v>
-      </type>
       <desc>
         <p>This function can be used when interacting with servers
-          called <c>Name</c> on the specified nodes. It is assumed that
-          the servers receive messages in the format <c>{From, Msg}</c>
-          and reply using <c>From ! {Name, Node, Reply}</c>, where
+          called <c><anno>Name</anno></c> on the specified nodes. It is assumed that
+          the servers receive messages in the format <c>{From, <anno>Msg</anno>}</c>
+          and reply using <c>From ! {<anno>Name</anno>, Node, <anno>Reply</anno>}</c>, where
           <c>Node</c> is the name of the node where the server is
-          located. The function returns <c>{Replies, Badnodes}</c>,
-          where <c>Replies</c> is a list of all <c>Reply</c> values and
-          <c>BadNodes</c> is a list of the nodes which did not exist, or
+          located. The function returns <c>{<anno>Replies</anno>, <anno>BadNodes</anno>}</c>,
+          where <c><anno>Replies</anno></c> is a list of all <c><anno>Reply</anno></c> values and
+          <c><anno>BadNodes</anno></c> is a list of the nodes which did not exist, or
           where the server did not exist, or where the server terminated
           before sending any reply.</p>
       </desc>
     </func>
     <func>
-      <name>safe_multi_server_call(Name, Msg) -> {Replies, BadNodes}</name>
-      <name>safe_multi_server_call(Nodes, Name, Msg) -> {Replies, BadNodes}</name>
+      <name name="safe_multi_server_call" arity="2"/>
+      <name name="safe_multi_server_call" arity="3"/>
       <fsummary>Interact with the servers on a number of nodes (deprecated)</fsummary>
       <desc>
         <warning>
@@ -432,66 +305,47 @@
         <p>In Erlang/OTP R6B and earlier releases,
           <c>multi_server_call/2,3</c> could not handle the case
           where the remote node exists, but there is no server called
-          <c>Name</c>. Instead this function had to be used. In
+          <c><anno>Name</anno></c>. Instead this function had to be used. In
           Erlang/OTP R7B and later releases, however, the functions are
           equivalent, except for this function being slightly slower.</p>
       </desc>
     </func>
     <func>
-      <name>parallel_eval(FuncCalls) -> ResL</name>
+      <name name="parallel_eval" arity="1"/>
       <fsummary>Evaluate several function calls on all nodes in parallel</fsummary>
-      <type>
-        <v>FuncCalls = [{Module, Function, Args}]</v>
-        <v>&nbsp;Module = Function = atom()</v>
-        <v>&nbsp;Args = [term()]</v>
-        <v>ResL = [term()]</v>
-      </type>
       <desc>
-        <p>For every tuple in <c>FuncCalls</c>, evaluates
-          <c>apply(Module, Function, Args)</c> on some node in
+        <p>For every tuple in <c><anno>FuncCalls</anno></c>, evaluates
+          <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on some node in
           the network. Returns the list of return values, in the same
-          order as in <c>FuncCalls</c>.</p>
+          order as in <c><anno>FuncCalls</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>pmap({Module, Function}, ExtraArgs, List1) -> List2</name>
+      <name name="pmap" arity="3"/>
       <fsummary>Parallell evaluation of mapping a function over a list </fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>ExtraArgs = [term()]</v>
-        <v>List1 = [Elem]</v>
-        <v>&nbsp;Elem = term()</v>
-        <v>List2 = [term()]</v>
-      </type>
       <desc>
-        <p>Evaluates <c>apply(Module, Function, [Elem|ExtraArgs])</c>,
-          for every element <c>Elem</c> in <c>List1</c>, in parallel.
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, [<anno>Elem</anno>|<anno>ExtraArgs</anno>])</c>,
+          for every element <c><anno>Elem</anno></c> in <c><anno>List1</anno></c>, in parallel.
           Returns the list of return values, in the same order as in
-          <c>List1</c>.</p>
+          <c><anno>List1</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>pinfo(Pid) -> [{Item, Info}] | undefined</name>
+      <name name="pinfo" arity="1"/>
       <fsummary>Information about a process</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Item, Info -- see erlang:process_info/1</v>
-      </type>
       <desc>
         <p>Location transparent version of the BIF
-          <c>process_info/1</c>.</p>
+          <seealso marker="erts:erlang#process_info/1">
+          <c>process_info/1</c></seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>pinfo(Pid, Item) -> {Item, Info} | undefined | []</name>
+      <name name="pinfo" arity="2"/>
       <fsummary>Information about a process</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Item, Info -- see erlang:process_info/1</v>
-      </type>
       <desc>
         <p>Location transparent version of the BIF
-          <c>process_info/2</c>.</p>
+          <seealso marker="erts:erlang#process_info/2">
+          <c>process_info/2</c></seealso>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/kernel/doc/src/seq_trace.xml b/lib/kernel/doc/src/seq_trace.xml
index 6c043dd767..1ab955bd8a 100644
--- a/lib/kernel/doc/src/seq_trace.xml
+++ b/lib/kernel/doc/src/seq_trace.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -47,17 +47,22 @@
         from users.</p>
     </note>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="token"/>
+      <desc>
+        <p>An opaque term (a tuple) representing a trace token.</p>
+      </desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>set_token(Token) -> PreviousToken</name>
+      <name name="set_token" arity="1"/>
       <fsummary>Set the trace token</fsummary>
-      <type>
-        <v>Token = PreviousToken = term() | []</v>
-      </type>
       <desc>
-        <p>Sets the trace token for the calling process to <c>Token</c>.
-          If <c>Token == []</c> then tracing is disabled, otherwise
-          <c>Token</c> should be an Erlang term returned from
+        <p>Sets the trace token for the calling process to <c><anno>Token</anno></c>.
+          If <c><anno>Token</anno> == []</c> then tracing is disabled, otherwise
+          <c><anno>Token</anno></c> should be an Erlang term returned from
           <c>get_token/0</c> or <c>set_token/1</c>. <c>set_token/1</c>
           can be used to temporarily exclude message passing from
           the trace by setting the trace token to empty like this:</p>
@@ -72,18 +77,16 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name>set_token(Component, Val) -> {Component, OldVal}</name>
+      <name name="set_token" arity="2"/>
       <fsummary>Set a component of the trace token</fsummary>
-      <type>
-        <v>Component = label | serial | Flag</v>
-        <v>&nbsp;Flag = send | 'receive' | print | timestamp </v>
-        <v>Val = OldVal -- see below</v>
-      </type>
+      <type name="component"/>
+      <type name="flag"/>
+      <type name="value"/>
       <desc>
-        <p>Sets the individual <c>Component</c> of the trace token to
-          <c>Val</c>. Returns the previous value of the component.</p>
+        <p>Sets the individual <c><anno>Component</anno></c> of the trace token to
+          <c><anno>Val</anno></c>. Returns the previous value of the component.</p>
         <taglist>
-          <tag><c>set_token(label, Int)</c></tag>
+          <tag><c>set_token(label, <anno>Integer</anno>)</c></tag>
           <item>
             <p>The <c>label</c> component is an integer which
               identifies all events belonging to the same sequential
@@ -93,31 +96,31 @@ seq_trace:set_token(OldToken), % activate the trace token again
           </item>
           <tag><c>set_token(serial, SerialValue)</c></tag>
           <item>
-            <p><c>SerialValue = {Previous, Current}</c>.
+            <p><c>SerialValue = {<anno>Previous</anno>, <anno>Current</anno>}</c>.
               The <c>serial</c> component contains counters which
               enables the traced messages to be sorted, should never be
               set explicitly by the user as these counters are updated
               automatically. Default is <c>{0, 0}</c>.</p>
           </item>
-          <tag><c>set_token(send, Bool)</c></tag>
+          <tag><c>set_token(send, <anno>Bool</anno>)</c></tag>
           <item>
             <p>A trace token flag (<c>true | false</c>) which
               enables/disables tracing on message sending. Default is
               <c>false</c>.</p>
           </item>
-          <tag><c>set_token('receive', Bool)</c></tag>
+          <tag><c>set_token('receive', <anno>Bool</anno>)</c></tag>
           <item>
             <p>A trace token flag (<c>true | false</c>) which
               enables/disables tracing on message reception. Default is
               <c>false</c>.</p>
           </item>
-          <tag><c>set_token(print, Bool)</c></tag>
+          <tag><c>set_token(print, <anno>Bool</anno>)</c></tag>
           <item>
             <p>A trace token flag (<c>true | false</c>) which
               enables/disables tracing on explicit calls to
               <c>seq_trace:print/1</c>. Default is <c>false</c>.</p>
           </item>
-          <tag><c>set_token(timestamp, Bool)</c></tag>
+          <tag><c>set_token(timestamp, <anno>Bool</anno>)</c></tag>
           <item>
             <p>A trace token flag (<c>true | false</c>) which
               enables/disables a timestamp to be generated for each
@@ -127,11 +130,8 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name>get_token() -> TraceToken</name>
+      <name name="get_token" arity="0"/>
       <fsummary>Return the value of the trace token</fsummary>
-      <type>
-        <v>TraceToken = term() | []</v>
-      </type>
       <desc>
         <p>Returns the value of the trace token for the calling process.
           If <c>[]</c> is returned, it means that tracing is not active.
@@ -141,13 +141,11 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name>get_token(Component) -> {Component, Val}</name>
+      <name name="get_token" arity="1"/>
       <fsummary>Return the value of a trace token component</fsummary>
-      <type>
-        <v>Component = label | serial | Flag</v>
-        <v>&nbsp;Flag = send | 'receive' | print | timestamp </v>
-        <v>Val -- see set_token/2</v>
-      </type>
+      <type name="component"/>
+      <type name="flag"/>
+      <type name="value"/>
       <desc>
         <p>Returns the value of the trace token component
           <c>Component</c>. See
@@ -156,33 +154,26 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name>print(TraceInfo) -> void()</name>
+      <name name="print" arity="1"/>
       <fsummary>Put the Erlang term <c>TraceInfo</c>into the sequential trace output</fsummary>
-      <type>
-        <v>TraceInfo = term()</v>
-      </type>
       <desc>
-        <p>Puts the Erlang term <c>TraceInfo</c> into the sequential
+        <p>Puts the Erlang term <c><anno>TraceInfo</anno></c> into the sequential
           trace output if the calling process currently is executing
           within a sequential trace and the <c>print</c> flag of
           the trace token is set.</p>
       </desc>
     </func>
     <func>
-      <name>print(Label, TraceInfo) -> void()</name>
+      <name name="print" arity="2"/>
       <fsummary>Put the Erlang term <c>TraceInfo</c>into the sequential trace output</fsummary>
-      <type>
-        <v>Label = int()</v>
-        <v>TraceInfo = term()</v>
-      </type>
       <desc>
         <p>Same as <c>print/1</c> with the additional condition that
-          <c>TraceInfo</c> is output only if <c>Label</c> is equal to
+          <c><anno>TraceInfo</anno></c> is output only if <c>Label</c> is equal to
           the label component of the trace token.</p>
       </desc>
     </func>
     <func>
-      <name>reset_trace() -> void()</name>
+      <name name="reset_trace" arity="0"/>
       <fsummary>Stop all sequential tracing on the local node</fsummary>
       <desc>
         <p>Sets the trace token to empty for all processes on the
@@ -194,26 +185,22 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name>set_system_tracer(Tracer) -> OldTracer</name>
+      <name name="set_system_tracer" arity="1"/>
       <fsummary>Set the system tracer</fsummary>
-      <type>
-        <v>Tracer = OldTracer = pid() | port() | false</v>
-      </type>
+      <type name="tracer"/>
       <desc>
         <p>Sets the system tracer. The system tracer can be either a
-          process or port denoted by <c>Tracer</c>. Returns the previous
+          process or port denoted by <c><anno>Tracer</anno></c>. Returns the previous
           value (which can be <c>false</c> if no system tracer is
           active).</p>
-        <p>Failure: <c>{badarg, Info}}</c> if <c>Pid</c> is not an
+        <p>Failure: <c>{badarg, Info}}</c> if <c><anno>Pid</anno></c> is not an
           existing local pid.</p>
       </desc>
     </func>
     <func>
-      <name>get_system_tracer() -> Tracer</name>
+      <name name="get_system_tracer" arity="0"/>
       <fsummary>Return the pid() or port() of the current system tracer.</fsummary>
-      <type>
-        <v>Tracer = pid() | port() | false</v>
-      </type>
+      <type name="tracer"/>
       <desc>
         <p>Returns the pid or port identifier of the current system
           tracer or <c>false</c> if no system tracer is activated.</p>
diff --git a/lib/kernel/doc/src/specs.xml b/lib/kernel/doc/src/specs.xml
new file mode 100644
index 0000000000..b41addaa0c
--- /dev/null
+++ b/lib/kernel/doc/src/specs.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="latin1" ?>
+<specs xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../specs/specs_application.xml"/>
+  <xi:include href="../specs/specs_auth.xml"/>
+  <xi:include href="../specs/specs_code.xml"/>
+  <xi:include href="../specs/specs_disk_log.xml"/>
+  <xi:include href="../specs/specs_erl_boot_server.xml"/>
+  <xi:include href="../specs/specs_erl_ddll.xml"/>
+  <xi:include href="../specs/specs_erl_prim_loader_stub.xml"/>
+  <xi:include href="../specs/specs_erlang_stub.xml"/>
+  <xi:include href="../specs/specs_error_handler.xml"/>
+  <xi:include href="../specs/specs_error_logger.xml"/>
+  <xi:include href="../specs/specs_file.xml"/>
+  <xi:include href="../specs/specs_gen_tcp.xml"/>
+  <xi:include href="../specs/specs_gen_udp.xml"/>
+  <xi:include href="../specs/specs_gen_sctp.xml"/>
+  <xi:include href="../specs/specs_global.xml"/>
+  <xi:include href="../specs/specs_global_group.xml"/>
+  <xi:include href="../specs/specs_heart.xml"/>
+  <xi:include href="../specs/specs_inet.xml"/>
+  <xi:include href="../specs/specs_inet_res.xml"/>
+  <xi:include href="../specs/specs_init_stub.xml"/>
+  <xi:include href="../specs/specs_net_adm.xml"/>
+  <xi:include href="../specs/specs_net_kernel.xml"/>
+  <xi:include href="../specs/specs_os.xml"/>
+  <xi:include href="../specs/specs_pg2.xml"/>
+  <xi:include href="../specs/specs_rpc.xml"/>
+  <xi:include href="../specs/specs_seq_trace.xml"/>
+  <xi:include href="../specs/specs_user.xml"/>
+  <xi:include href="../specs/specs_wrap_log_reader.xml"/>
+  <xi:include href="../specs/specs_zlib_stub.xml"/>
+  <xi:include href="../specs/specs_packages.xml"/>
+</specs>
diff --git a/lib/kernel/doc/src/wrap_log_reader.xml b/lib/kernel/doc/src/wrap_log_reader.xml
index 18664a029f..6cf480b532 100644
--- a/lib/kernel/doc/src/wrap_log_reader.xml
+++ b/lib/kernel/doc/src/wrap_log_reader.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -50,18 +50,20 @@
       the called node, it is entirely up to the user to be sure that all items are read.
       </p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="continuation"/>
+      <desc><p>Continuation returned by
+         <c>open/1,2</c> or <c>chunk/1,2</c>.</p>
+      </desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>chunk(Continuation)</name>
-      <name>chunk(Continuation, N) -> {Continuation2, Terms} |  {Continuation2, Terms, Badbytes} | {Continuation2, eof} | {error, Reason}</name>
+      <name name="chunk" arity="1"/>
+      <name name="chunk" arity="2"/>
       <fsummary>Read a chunk of objects written to a wrap log.</fsummary>
-      <type>
-        <v>Continuation = continuation()</v>
-        <v>N = int() > 0 | infinity</v>
-        <v>Continuation2 = continuation()</v>
-        <v>Terms= [term()]</v>
-        <v>Badbytes = integer()</v>
-      </type>
+      <type name="chunk_ret"/>
       <desc>
         <p>This function makes it possible to efficiently read the
           terms which have been appended to a log. It minimises disk
@@ -70,29 +72,29 @@
         <p>The first time <c>chunk</c> is called an initial
           continuation returned from the <c>open/1</c>, <c>open/2</c> must be provided.
           </p>
-        <p>When <c>chunk/3</c> is called, <c>N</c> controls the
+        <p>When <c>chunk/3</c> is called, <c><anno>N</anno></c> controls the
           maximum number of terms that are read from the log in each
           chunk.  Default is <c>infinity</c>, which means that all the
           terms contained in the 8K chunk are read. If less than
-          <c>N</c> terms are returned, this does not necessarily mean
+          <c><anno>N</anno></c> terms are returned, this does not necessarily mean
           that end of file is reached.
           </p>
         <p>The <c>chunk</c> function returns a tuple
-          <c>{Continuation2, Terms}</c>, where <c>Terms</c> is a list
-          of terms found in the log. <c>Continuation2</c> is yet
+          <c>{<anno>Continuation2</anno>, <anno>Terms</anno>}</c>, where <c><anno>Terms</anno></c> is a list
+          of terms found in the log. <c><anno>Continuation2</anno></c> is yet
           another continuation which must be passed on into any
           subsequent calls to <c>chunk</c>. With a series of calls to
           <c>chunk</c> it is then possible to extract all terms from a
           log.
           </p>
         <p>The <c>chunk</c> function returns a tuple
-          <c>{Continuation2, Terms, Badbytes}</c> if the log is opened
-          in read only mode and the read chunk is corrupt. <c>Badbytes</c> 
+          <c>{<anno>Continuation2</anno>, <anno>Terms</anno>, <anno>Badbytes</anno>}</c> if the log is opened
+          in read only mode and the read chunk is corrupt. <c><anno>Badbytes</anno></c>
           indicates the number of non-Erlang terms found in the chunk.
           Note also that the log is not repaired.
           </p>
-        <p><c>chunk</c> returns <c>{Continuation2, eof}</c> when the end of the log is
-          reached, and <c>{error, Reason}</c> if an error occurs.
+        <p><c>chunk</c> returns <c>{<anno>Continuation2</anno>, eof}</c> when the end of the log is
+          reached, and <c>{error, <anno>Reason</anno>}</c> if an error occurs.
           </p>
         <p>The returned continuation may or may not be valid in the next call to
           <c>chunk</c>.  This is because the log may wrap and delete
@@ -103,37 +105,29 @@
       </desc>
     </func>
     <func>
-      <name>close(Continuation) -> ok </name>
+      <name name="close" arity="1"/>
       <fsummary>Close a log</fsummary>
-      <type>
-        <v>Continuation = continuation()</v>
-      </type>
       <desc>
         <p>This function closes a log file properly.
           </p>
       </desc>
     </func>
     <func>
-      <name>open(Filename) -> OpenRet</name>
-      <name>open(Filename, N) -> OpenRet</name>
+      <name name="open" arity="1"/>
+      <name name="open" arity="2"/>
       <fsummary>Open a log file</fsummary>
-      <type>
-        <v>File = string() | atom()</v>
-        <v>N = integer()</v>
-        <v>OpenRet = {ok, Continuation} | {error, Reason} </v>
-        <v>Continuation = continuation()</v>
-      </type>
+      <type name="open_ret"/>
       <desc>
-        <p><c>Filename</c> specifies the name of the file which is to be read. </p>
-        <p><c>N</c> specifies the index of the file which is to be read. 
-          If <c>N</c> is omitted the whole wrap log file will be read; if it
+        <p><c><anno>Filename</anno></c> specifies the name of the file which is to be read. </p>
+        <p><c><anno>N</anno></c> specifies the index of the file which is to be read.
+          If <c><anno>N</anno></c> is omitted the whole wrap log file will be read; if it
           is specified only the specified index file will be read.
           </p>
-        <p>The <c>open</c> function returns <c>{ok, Continuation}</c> if the
-          log/index file was successfully opened. The <c>Continuation</c>
+        <p>The <c>open</c> function returns <c>{ok, <anno>Continuation</anno>}</c> if the
+          log/index file was successfully opened. The <c><anno>Continuation</anno></c>
           is to be used when chunking or closing the file. 
           </p>
-        <p>The function returns <c>{error, Reason}</c> for all errors.
+        <p>The function returns <c>{error, <anno>Reason</anno>}</c> for all errors.
           </p>
       </desc>
     </func>
diff --git a/lib/kernel/include/inet.hrl b/lib/kernel/include/inet.hrl
index 929b2ee294..3e64d4bb79 100644
--- a/lib/kernel/include/inet.hrl
+++ b/lib/kernel/include/inet.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -19,18 +19,11 @@
 %% This record is returned by inet:gethostbyaddr/2 and inet:gethostbyname/2.
 
 
--type hostname() :: atom() | string().
--type ip4_address() :: {0..255,0..255,0..255,0..255}.
--type ip6_address() :: {0..65535,0..65535,0..65535,0..65535,
-			0..65535,0..65535,0..65535,0..65535}.
--type ip_address() :: ip4_address() | ip6_address().
--type ip_port() :: 0..65535.
-
 -record(hostent,
 	{
-	 h_name		  :: hostname(),	%% offical name of host
-	 h_aliases = []   :: [hostname()],	%% alias list
+	 h_name		  :: inet:hostname(),	%% offical name of host
+	 h_aliases = []   :: [inet:hostname()],	%% alias list
 	 h_addrtype	  :: 'inet' | 'inet6',	%% host address type
 	 h_length	  :: non_neg_integer(),	%% length of address
-	 h_addr_list = [] :: [ip_address()]	%% list of addresses from name server
+	 h_addr_list = [] :: [inet:ip_address()]%% list of addresses from name server
 	}).
diff --git a/lib/kernel/src/application.erl b/lib/kernel/src/application.erl
index 2a193affd4..fa3a4c3d36 100644
--- a/lib/kernel/src/application.erl
+++ b/lib/kernel/src/application.erl
@@ -32,20 +32,30 @@
 
 %%%-----------------------------------------------------------------
 
+-type start_type() :: 'normal'
+                    | {'takeover', Node :: node()}
+                    | {'failover', Node :: node()}.
 -type restart_type() :: 'permanent' | 'transient' | 'temporary'.
--type application_opt() :: {'description', string()}
-                         | {'vsn', string()}
-                         | {'id', string()}
-                         | {'modules', [atom() | {atom(), any()}]} 
-                         | {'registered', [atom()]}
-                         | {'applications', [atom()]}
-                         | {'included_applications', [atom()]}
-                         | {'env', [{atom(), any()}]}
-                         | {'start_phases', [{atom(), any()}] | 'undefined'}
-                         | {'maxT', timeout()}                % max timeout
-                         | {'maxP', integer() | 'infinity'}   % max processes
-                         | {'mod', {atom(), any()}}.
--type application_spec() :: {'application', atom(), [application_opt()]}.
+-type application_opt() :: {'description', Description :: string()}
+                         | {'vsn', Vsn :: string()}
+                         | {'id', Id :: string()}
+                         | {'modules', [(Module :: module()) |
+                                        {Module :: module(), Version :: term()}]}
+                         | {'registered', Names :: [Name :: atom()]}
+                         | {'applications', [Application :: atom()]}
+                         | {'included_applications', [Application :: atom()]}
+                         | {'env', [{Par :: atom(), Val :: term()}]}
+                         | {'start_phases',
+                            [{Phase :: atom(), PhaseArgs :: term()}] | 'undefined'}
+                         | {'maxT', MaxT :: timeout()}          % max timeout
+                         | {'maxP',
+                            MaxP :: pos_integer() | 'infinity'} % max processes
+                         | {'mod', Start :: {Module :: module(), StartArgs :: term()}}.
+-type application_spec() :: {'application',
+                             Application :: atom(),
+                             AppSpecKeys :: [application_opt()]}.
+
+-type(tuple_of(_T) :: tuple()).
 
 %%------------------------------------------------------------------
 
@@ -61,16 +71,29 @@ behaviour_info(_Other) ->
 %%% application_master.
 %%%-----------------------------------------------------------------
 
--spec load(Application :: atom() | application_spec()) ->
-	     'ok' | {'error', term()}.
+-spec load(AppDescr) -> 'ok' | {'error', Reason} when
+      AppDescr :: Application | (AppSpec :: application_spec()),
+      Application :: atom(),
+      Reason :: term().
 
 load(Application) ->
-    load(Application, []).
-
--spec load(Application :: atom() | application_spec(),
-	   Distributed :: any()) -> 'ok' | {'error', term()}.
+    load1(Application, []).
+
+-spec load(AppDescr, Distributed) -> 'ok' | {'error', Reason} when
+      AppDescr :: Application | (AppSpec :: application_spec()),
+      Application :: atom(),
+      Distributed :: {Application,Nodes}
+                   | {Application,Time,Nodes}
+                   | 'default',
+      Nodes :: [node() | tuple_of(node())],
+      Time :: pos_integer(),
+      Reason :: term().
 
 load(Application, DistNodes) ->
+    load1(Application, DistNodes).
+
+%% Workaround due to specs.
+load1(Application, DistNodes) ->
     case application_controller:load_application(Application) of
 	ok when DistNodes =/= [] ->
 	    AppName = get_appl_name(Application),
@@ -85,18 +108,24 @@ load(Application, DistNodes) ->
 	    Else
     end.
 
--spec unload(Application :: atom()) -> 'ok' | {'error', term()}.
+-spec unload(Application) -> 'ok' | {'error', Reason} when
+      Application :: atom(),
+      Reason :: term().
 
 unload(Application) ->
     application_controller:unload_application(Application).
 
--spec start(Application :: atom()) -> 'ok' | {'error', term()}.
+-spec start(Application) -> 'ok' | {'error', Reason} when
+      Application :: atom(),
+      Reason :: term().
 
 start(Application) ->
     start(Application, temporary).
 
--spec start(Application :: atom() | application_spec(),
-	    RestartType :: restart_type()) -> any().
+-spec start(Application, Type) -> 'ok' | {'error', Reason} when
+      Application :: atom(),
+      Type :: restart_type(),
+      Reason :: term().
 
 start(Application, RestartType) ->
     case load(Application) of
@@ -120,12 +149,18 @@ start_boot(Application) ->
 start_boot(Application, RestartType) ->
     application_controller:start_boot_application(Application, RestartType).
 
--spec takeover(Application :: atom(), RestartType :: restart_type()) -> any().
+-spec takeover(Application, Type) -> 'ok' | {'error', Reason} when
+      Application :: atom(),
+      Type :: restart_type(),
+      Reason :: term().
 
 takeover(Application, RestartType) ->
     dist_ac:takeover_application(Application, RestartType).
 
--spec permit(Application :: atom(), Bool :: boolean()) -> 'ok' | {'error', term()}.
+-spec permit(Application, Permission) -> 'ok' | {'error', Reason} when
+      Application :: atom(),
+      Permission :: boolean(),
+      Reason :: term().
 
 permit(Application, Bool) ->
     case Bool of
@@ -142,105 +177,146 @@ permit(Application, Bool) ->
 	    LocalResult
     end.
 
--spec stop(Application :: atom()) -> 'ok' | {'error', term()}.
+-spec stop(Application) -> 'ok' | {'error', Reason} when
+      Application :: atom(),
+      Reason :: term().
 
 stop(Application) ->
     application_controller:stop_application(Application).
 
--spec which_applications() -> [{atom(), string(), string()}].
+-spec which_applications() -> [{Application, Description, Vsn}] when
+      Application :: atom(),
+      Description :: string(),
+      Vsn :: string().
 
 which_applications() ->
     application_controller:which_applications().
 
--spec which_applications(timeout()) -> [{atom(), string(), string()}].
+-spec which_applications(Timeout) -> [{Application, Description, Vsn}] when
+      Timeout :: timeout(),
+      Application :: atom(),
+      Description :: string(),
+      Vsn :: string().
 
 which_applications(infinity) ->
     application_controller:which_applications(infinity);
 which_applications(Timeout) when is_integer(Timeout), Timeout>=0 ->
     application_controller:which_applications(Timeout).
 
--spec loaded_applications() -> [{atom(), string(), string()}].
+-spec loaded_applications() -> [{Application, Description, Vsn}] when
+      Application :: atom(),
+      Description :: string(),
+      Vsn :: string().
 
 loaded_applications() -> 
     application_controller:loaded_applications().
 
--spec info() -> any().
+-spec info() -> term().
 
 info() -> 
     application_controller:info().
 
--spec set_env(Application :: atom(), Key :: atom(), Value :: any()) -> 'ok'.
+-spec set_env(Application, Par, Val) -> 'ok' when
+      Application :: atom(),
+      Par :: atom(),
+      Val :: term().
 
 set_env(Application, Key, Val) -> 
     application_controller:set_env(Application, Key, Val).
 
--spec set_env(Application :: atom(), Key :: atom(),
-	      Value :: any(), Timeout :: timeout()) -> 'ok'.
+-spec set_env(Application, Par, Val, Timeout) -> 'ok' when
+      Application :: atom(),
+      Par :: atom(),
+      Val :: term(),
+      Timeout :: timeout().
 
 set_env(Application, Key, Val, infinity) ->
     application_controller:set_env(Application, Key, Val, infinity);
 set_env(Application, Key, Val, Timeout) when is_integer(Timeout), Timeout>=0 ->
     application_controller:set_env(Application, Key, Val, Timeout).
 
--spec unset_env(atom(), atom()) -> 'ok'.
+-spec unset_env(Application, Par) -> 'ok' when
+      Application :: atom(),
+      Par :: atom().
 
 unset_env(Application, Key) -> 
     application_controller:unset_env(Application, Key).
 
--spec unset_env(atom(), atom(), timeout()) -> 'ok'.
+-spec unset_env(Application, Par, Timeout) -> 'ok' when
+      Application :: atom(),
+      Par :: atom(),
+      Timeout :: timeout().
 
 unset_env(Application, Key, infinity) ->
     application_controller:unset_env(Application, Key, infinity);
 unset_env(Application, Key, Timeout) when is_integer(Timeout), Timeout>=0 ->
     application_controller:unset_env(Application, Key, Timeout).
 
--spec get_env(atom()) -> 'undefined' | {'ok', term()}.
+-spec get_env(Par) -> 'undefined' | {'ok', Val} when
+      Par :: atom(),
+      Val :: term().
 
 get_env(Key) -> 
     application_controller:get_pid_env(group_leader(), Key).
 
--spec get_env(atom(), atom()) -> 'undefined' | {'ok', term()}.
+-spec get_env(Application, Par) -> 'undefined' | {'ok', Val} when
+      Application :: atom(),
+      Par :: atom(),
+      Val :: term().
 
 get_env(Application, Key) -> 
     application_controller:get_env(Application, Key).
 
--spec get_all_env() -> [{atom(), any()}].
+-spec get_all_env() -> Env when
+      Env :: [{Par :: atom(), Val :: term()}].
 
 get_all_env() -> 
     application_controller:get_pid_all_env(group_leader()).
 
--spec get_all_env(atom()) -> [{atom(), any()}].
+-spec get_all_env(Application) -> Env when
+      Application :: atom(),
+      Env :: [{Par :: atom(), Val :: term()}].
 
 get_all_env(Application) -> 
     application_controller:get_all_env(Application).
 
--spec get_key(atom()) -> 'undefined' | {'ok', term()}.
+-spec get_key(Key) -> 'undefined' | {'ok', Val} when
+      Key :: atom(),
+      Val :: term().
 
 get_key(Key) -> 
     application_controller:get_pid_key(group_leader(), Key).
 
--spec get_key(atom(), atom()) -> 'undefined' | {'ok', term()}.
+-spec get_key(Application, Key) -> 'undefined' | {'ok', Val} when
+      Application :: atom(),
+      Key :: atom(),
+      Val :: term().
 
 get_key(Application, Key) -> 
     application_controller:get_key(Application, Key).
 
--spec get_all_key() -> 'undefined' | [] | {'ok', [{atom(),any()},...]}.
+-spec get_all_key() -> [] | {'ok', Keys} when
+      Keys :: [{Key :: atom(),Val :: term()},...].
 
 get_all_key() ->
     application_controller:get_pid_all_key(group_leader()).
 
--spec get_all_key(atom()) -> 'undefined' | {'ok', [{atom(),any()},...]}.
+-spec get_all_key(Application) -> 'undefined' | Keys when
+      Application :: atom(),
+      Keys :: {'ok', [{Key :: atom(),Val :: term()},...]}.
 
 get_all_key(Application) -> 
     application_controller:get_all_key(Application).
 
--spec get_application() -> 'undefined' | {'ok', atom()}.
+-spec get_application() -> 'undefined' | {'ok', Application} when
+      Application :: atom().
 
 get_application() -> 
     application_controller:get_application(group_leader()).
 
--spec get_application(Pid :: pid()) -> 'undefined' | {'ok', atom()}
-		   ; (Module :: atom()) -> 'undefined' | {'ok', atom()}.
+-spec get_application(PidOrModule) -> 'undefined' | {'ok', Application} when
+      PidOrModule :: (Pid :: pid()) | (Module :: module()),
+      Application :: atom().
 
 get_application(Pid) when is_pid(Pid) ->
     case process_info(Pid, group_leader) of
@@ -252,8 +328,8 @@ get_application(Pid) when is_pid(Pid) ->
 get_application(Module) when is_atom(Module) ->
     application_controller:get_application_module(Module).
 
--spec start_type() -> 'undefined' | 'local' | 'normal'
-		    | {'takeover', node()} | {'failover', node()}.
+-spec start_type() -> StartType | 'undefined' | 'local' when
+      StartType :: start_type().
 
 start_type() ->
     application_controller:start_type(group_leader()).
diff --git a/lib/kernel/src/auth.erl b/lib/kernel/src/auth.erl
index 5c7fe2421d..25c88a4e1d 100644
--- a/lib/kernel/src/auth.erl
+++ b/lib/kernel/src/auth.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -57,7 +57,8 @@ start_link() ->
 
 %%--Deprecated interface------------------------------------------------
 
--spec is_auth(Node :: node()) -> 'yes' | 'no'.
+-spec is_auth(Node) -> 'yes' | 'no' when
+      Node :: Node :: node().
 
 is_auth(Node) ->
     case net_adm:ping(Node) of
@@ -65,12 +66,15 @@ is_auth(Node) ->
 	pang -> no
     end.
 
--spec cookie() -> cookie().
+-spec cookie() -> Cookie when
+      Cookie :: cookie().
 
 cookie() ->
     get_cookie().
 
--spec cookie(Cookies :: [cookie(),...] | cookie()) -> 'true'.
+-spec cookie(TheCookie) -> 'true' when
+      TheCookie :: Cookie | [Cookie],
+      Cookie :: cookie().
 
 cookie([Cookie]) ->
     set_cookie(Cookie);
@@ -82,7 +86,9 @@ cookie(Cookie) ->
 node_cookie([Node, Cookie]) ->
     node_cookie(Node, Cookie).
 
--spec node_cookie(Node :: node(), Cookie :: cookie()) -> 'yes' | 'no'.
+-spec node_cookie(Node, Cookie) -> 'yes' | 'no' when
+      Node :: node(),
+      Cookie :: cookie().
 
 node_cookie(Node, Cookie) ->
     set_cookie(Node, Cookie),
diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl
index 7f1b5f9ec6..9b8d2db437 100644
--- a/lib/kernel/src/disk_log.erl
+++ b/lib/kernel/src/disk_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -70,9 +70,10 @@
 %%% Contract type specifications
 %%%----------------------------------------------------------------------
 
+-opaque continuation() :: #continuation{}.
+
 -type bytes()          :: binary() | [byte()].
 
--type log()            :: term().  % XXX: refine
 -type file_error()     :: term().  % XXX: refine
 -type invalid_header() :: term().  % XXX: refine
 
@@ -87,27 +88,30 @@
 
 -type open_error_rsn() :: 'no_such_log'
                         | {'badarg', term()}
-                        | {'size_mismatch', dlog_size(), dlog_size()}
-                        | {'arg_mismatch', dlog_optattr(), term(), term()}
-                        | {'name_already_open', log()}
-                        | {'open_read_write', log()}
-                        | {'open_read_only', log()}
-                        | {'need_repair', log()}
-                        | {'not_a_log_file', string()}
-                        | {'invalid_index_file', string()}
+                        | {'size_mismatch', CurrentSize :: dlog_size(),
+                           NewSize :: dlog_size()}
+                        | {'arg_mismatch', OptionName :: dlog_optattr(),
+                           CurrentValue :: term(), Value :: term()}
+                        | {'name_already_open', Log :: log()}
+                        | {'open_read_write', Log :: log()}
+                        | {'open_read_only', Log :: log()}
+                        | {'need_repair', Log :: log()}
+                        | {'not_a_log_file', FileName :: file:filename()}
+                        | {'invalid_index_file', FileName :: file:filename()}
                         | {'invalid_header', invalid_header()}
                         | {'file_error', file:filename(), file_error()}
-                        | {'node_already_open', log()}.
+                        | {'node_already_open', Log :: log()}.
 -type dist_error_rsn() :: 'nodedown' | open_error_rsn().
--type ret()            :: {'ok', log()}
-                        | {'repaired', log(), {'recovered', non_neg_integer()},
-		                              {'badbytes', non_neg_integer()}}.
+-type ret()            :: {'ok', Log :: log()}
+                        | {'repaired', Log :: log(),
+                           {'recovered', Rec :: non_neg_integer()},
+                           {'badbytes', Bad :: non_neg_integer()}}.
 -type open_ret()       :: ret() | {'error', open_error_rsn()}.
 -type dist_open_ret()  :: {[{node(), ret()}],
 			   [{node(), {'error', dist_error_rsn()}}]}.
--type all_open_ret()   :: open_ret() | dist_open_ret().
 
--spec open(Args :: dlog_options()) -> all_open_ret().
+-spec open(ArgL) -> open_ret() | dist_open_ret() when
+      ArgL :: dlog_options().
 open(A) ->
     disk_log_server:open(check_arg(A, #arg{options = A})).
 
@@ -116,40 +120,57 @@ open(A) ->
                        | {'full', log()} | {'invalid_header', invalid_header()}
                        | {'file_error', file:filename(), file_error()}.
 
--spec log(Log :: log(), Term :: term()) -> 'ok' | {'error', log_error_rsn()}.
+-spec log(Log, Term) -> ok | {error, Reason :: log_error_rsn()} when
+      Log :: log(),
+      Term :: term().
 log(Log, Term) -> 
     req(Log, {log, term_to_binary(Term)}).
 
--spec blog(Log :: log(), Bytes :: bytes()) -> 'ok' | {'error', log_error_rsn()}.
+-spec blog(Log, Bytes) -> ok | {error, Reason :: log_error_rsn()} when
+      Log :: log(),
+      Bytes :: bytes().
 blog(Log, Bytes) ->
     req(Log, {blog, check_bytes(Bytes)}).
 
--spec log_terms(Log :: log(), Terms :: [term()]) -> 'ok' | {'error', term()}.
+-spec log_terms(Log, TermList) -> ok | {error, Resaon :: log_error_rsn()} when
+      Log :: log(),
+      TermList :: [term()].
 log_terms(Log, Terms) ->
     Bs = terms2bins(Terms),
     req(Log, {log, Bs}).
 
--spec blog_terms(Log :: log(), Bytes :: [bytes()]) -> 'ok' | {'error', term()}.
+-spec blog_terms(Log, BytesList) ->
+                        ok | {error, Reason :: log_error_rsn()} when
+      Log :: log(),
+      BytesList :: [bytes()].
 blog_terms(Log, Bytess) ->
     Bs = check_bytes_list(Bytess, Bytess),
     req(Log, {blog, Bs}).
 
 -type notify_ret() :: 'ok' | {'error', 'no_such_log'}.
 
--spec alog(Log :: log(), Term :: term()) -> notify_ret().
+-spec alog(Log, Term) -> notify_ret() when
+      Log :: log(),
+      Term :: term().
 alog(Log, Term) -> 
     notify(Log, {alog, term_to_binary(Term)}).
 
--spec alog_terms(Log :: log(), Terms :: [term()]) -> notify_ret().
+-spec alog_terms(Log, TermList) -> notify_ret() when
+      Log :: log(),
+      TermList :: [term()].
 alog_terms(Log, Terms) ->
     Bs = terms2bins(Terms),
     notify(Log, {alog, Bs}).
 
--spec balog(Log :: log(), Bytes :: bytes()) -> notify_ret().
+-spec balog(Log, Bytes) -> notify_ret() when
+      Log :: log(),
+      Bytes :: bytes().
 balog(Log, Bytes) ->
     notify(Log, {balog, check_bytes(Bytes)}).
 
--spec balog_terms(Log :: log(), Bytes :: [bytes()]) -> notify_ret().
+-spec balog_terms(Log, ByteList) -> notify_ret() when
+      Log :: log(),
+      ByteList :: [bytes()].
 balog_terms(Log, Bytess) ->
     Bs = check_bytes_list(Bytess, Bytess),
     notify(Log, {balog, Bs}).
@@ -157,18 +178,22 @@ balog_terms(Log, Bytess) ->
 -type close_error_rsn() ::'no_such_log' | 'nonode'
                          | {'file_error', file:filename(), file_error()}.
 
--spec close(Log :: log()) -> 'ok' | {'error', close_error_rsn()}.
+-spec close(Log) -> 'ok' | {'error', close_error_rsn()} when
+      Log :: log().
 close(Log) -> 
     req(Log, close).
 
 -type lclose_error_rsn() :: 'no_such_log'
                           | {'file_error', file:filename(), file_error()}.
 
--spec lclose(Log :: log()) -> 'ok' | {'error', lclose_error_rsn()}.
+-spec lclose(Log) -> 'ok' | {'error', lclose_error_rsn()} when
+      Log :: log().
 lclose(Log) ->
     lclose(Log, node()).
 
--spec lclose(Log :: log(), Node :: node()) -> 'ok' | {'error', lclose_error_rsn()}.
+-spec lclose(Log, Node) -> 'ok' | {'error', lclose_error_rsn()} when
+      Log :: log(),
+      Node :: node().
 lclose(Log, Node) ->
     lreq(Log, close, Node).
 
@@ -178,29 +203,49 @@ lclose(Log, Node) ->
                          | {'invalid_header', invalid_header()}
                          | {'file_error', file:filename(), file_error()}.
 
--spec truncate(Log :: log()) -> 'ok' | {'error', trunc_error_rsn()}.
+-spec truncate(Log) -> 'ok' | {'error', trunc_error_rsn()} when
+      Log :: log().
 truncate(Log) -> 
     req(Log, {truncate, none, truncate, 1}).
 
--spec truncate(Log :: log(), Head :: term()) -> 'ok' | {'error', trunc_error_rsn()}.
+-spec truncate(Log, Head) -> 'ok' | {'error', trunc_error_rsn()} when
+      Log :: log(),
+      Head :: term().
 truncate(Log, Head) ->
     req(Log, {truncate, {ok, term_to_binary(Head)}, truncate, 2}).
 
--spec btruncate(Log :: log(), Head :: bytes()) -> 'ok' | {'error', trunc_error_rsn()}.
+-spec btruncate(Log, BHead) -> 'ok' | {'error', trunc_error_rsn()} when
+      Log :: log(),
+      BHead :: bytes().
 btruncate(Log, Head) ->
     req(Log, {truncate, {ok, check_bytes(Head)}, btruncate, 2}).
 
--spec reopen(Log :: log(), Filename :: file:filename()) -> 'ok' | {'error', term()}.
+-type reopen_error_rsn() :: no_such_log
+                          | nonode
+                          | {read_only_mode, log()}
+                          | {blocked_log, log()}
+                          | {same_file_name, log()} |
+                            {invalid_index_file, file:filename()}
+                          | {invalid_header, invalid_header()}
+                          | {'file_error', file:filename(), file_error()}.
+
+-spec reopen(Log, File) -> 'ok' | {'error', reopen_error_rsn()} when
+      Log :: log(),
+      File :: file:filename().
 reopen(Log, NewFile) ->
     req(Log, {reopen, NewFile, none, reopen, 2}).
 
--spec reopen(Log :: log(), Filename :: file:filename(), Head :: term()) ->
-    'ok' | {'error', term()}.
+-spec reopen(Log, File, Head) -> 'ok' | {'error', reopen_error_rsn()} when
+      Log :: log(),
+      File :: file:filename(),
+      Head :: term().
 reopen(Log, NewFile, NewHead) ->
     req(Log, {reopen, NewFile, {ok, term_to_binary(NewHead)}, reopen, 3}).
 
--spec breopen(Log :: log(), Filename :: file:filename(), Head :: bytes()) ->
-    'ok' | {'error', term()}.
+-spec breopen(Log, File, BHead) -> 'ok' | {'error', reopen_error_rsn()} when
+      Log :: log(),
+      File :: file:filename(),
+      BHead :: bytes().
 breopen(Log, NewFile, NewHead) ->
     req(Log, {reopen, NewFile, {ok, check_bytes(NewHead)}, breopen, 3}).
 
@@ -210,21 +255,36 @@ breopen(Log, NewFile, NewHead) ->
                             | {'invalid_header', invalid_header()}
                             | {'file_error', file:filename(), file_error()}.
 
--spec inc_wrap_file(Log :: log()) -> 'ok' | {'error', inc_wrap_error_rsn()}.
+-spec inc_wrap_file(Log) -> 'ok' | {'error', inc_wrap_error_rsn()} when
+      Log :: log().
 inc_wrap_file(Log) -> 
     req(Log, inc_wrap_file).
 
--spec change_size(Log :: log(), Size :: dlog_size()) -> 'ok' | {'error', term()}.
+-spec change_size(Log, Size) -> 'ok' | {'error', Reason} when
+      Log :: log(),
+      Size :: dlog_size(),
+      Reason :: no_such_log | nonode | {read_only_mode, Log}
+              | {blocked_log, Log}
+              | {new_size_too_small, CurrentSize :: pos_integer()}
+              | {badarg, size}
+              | {file_error, file:filename(), file_error()}.
 change_size(Log, NewSize) -> 
     req(Log, {change_size, NewSize}).
 
--spec change_notify(Log :: log(), Pid :: pid(), Notify :: boolean()) ->
-    'ok' | {'error', term()}.
+-spec change_notify(Log, Owner, Notify) -> 'ok' | {'error', Reason} when
+      Log :: log(),
+      Owner :: pid(),
+      Notify :: boolean(),
+      Reason :: no_such_log | nonode | {blocked_log, Log}
+              | {badarg, notify} | {not_owner, Owner}.
 change_notify(Log, Pid, NewNotify) -> 
     req(Log, {change_notify, Pid, NewNotify}).
 
--spec change_header(Log :: log(), Head :: {atom(), term()}) ->
-    'ok' | {'error', term()}.
+-spec change_header(Log, Header) -> 'ok' | {'error', Reason} when
+      Log :: log(),
+      Header :: {head, dlog_head_opt()} | {head_func, mfa()},
+      Reason :: no_such_log | nonode | {read_only_mode, Log}
+              | {blocked_log, Log} | {badarg, head}.
 change_header(Log, NewHead) ->
     req(Log, {change_header, NewHead}).
 
@@ -232,17 +292,21 @@ change_header(Log, NewHead) ->
                         | {'blocked_log', log()}
                         | {'file_error', file:filename(), file_error()}.
 
--spec sync(Log :: log()) -> 'ok' | {'error', sync_error_rsn()}.
+-spec sync(Log) -> 'ok' | {'error', sync_error_rsn()} when
+      Log :: log().
 sync(Log) -> 
     req(Log, sync).
 
 -type block_error_rsn() :: 'no_such_log' | 'nonode' | {'blocked_log', log()}.
 
--spec block(Log :: log()) -> 'ok' | {'error', block_error_rsn()}.
+-spec block(Log) -> 'ok' | {'error', block_error_rsn()} when
+      Log :: log().
 block(Log) -> 
     block(Log, true).
 
--spec block(Log :: log(), QueueLogRecords :: boolean()) -> 'ok' | {'error', term()}.
+-spec block(Log, QueueLogRecords) -> 'ok' | {'error', block_error_rsn()} when
+      Log :: log(),
+      QueueLogRecords :: boolean().
 block(Log, QueueLogRecords) -> 
     req(Log, {block, QueueLogRecords}).
 
@@ -250,19 +314,46 @@ block(Log, QueueLogRecords) ->
                            | {'not_blocked', log()}
                            | {'not_blocked_by_pid', log()}.
 
--spec unblock(Log :: log()) -> 'ok' | {'error', unblock_error_rsn()}.
+-spec unblock(Log) -> 'ok' | {'error', unblock_error_rsn()} when
+      Log :: log().
 unblock(Log) ->
     req(Log, unblock).
 
--spec format_error(Error :: term()) -> string().
+-spec format_error(Error) -> io_lib:chars() when
+      Error :: term().
 format_error(Error) ->
     do_format_error(Error).
 
--spec info(Log :: log()) -> [{atom(), any()}] | {'error', term()}.
+-type dlog_info() :: {name, Log :: log()}
+                   | {file, File :: file:filename()}
+                   | {type, Type :: dlog_type()}
+                   | {format, Format :: dlog_format()}
+                   | {size, Size :: dlog_size()}
+                   | {mode, Mode :: dlog_mode()}
+                   | {owners, [{pid(), Notify :: boolean()}]}
+                   | {users, Users :: non_neg_integer()}
+                   | {status, Status ::
+                        ok | {blocked, QueueLogRecords :: boolean()}}
+                   | {node, Node :: node()}
+                   | {distributed, Dist :: local | [node()]}
+                   | {head, Head :: none | {head, term()} | mfa()}
+                   | {no_written_items, NoWrittenItems ::non_neg_integer()}
+                   | {full, Full :: boolean}
+                   | {no_current_bytes, non_neg_integer()}
+                   | {no_current_items, non_neg_integer()}
+                   | {no_items, non_neg_integer()}
+                   | {current_file, pos_integer()}
+                   | {no_overflows, {SinceLogWasOpened :: non_neg_integer(),
+                                     SinceLastInfo :: non_neg_integer()}}.
+-spec info(Log) -> InfoList | {'error', no_such_log} when
+      Log :: log(),
+      InfoList :: [dlog_info()].
 info(Log) -> 
     sreq(Log, info).
 
--spec pid2name(Pid :: pid()) -> {'ok', log()} | 'undefined'.
+-spec pid2name(Pid) -> {'ok', Log} | 'undefined' when
+      Pid :: pid(),
+      Log :: log().
 pid2name(Pid) ->
     disk_log_server:start(),
     case ets:lookup(?DISK_LOG_PID_TABLE, Pid) of
@@ -274,13 +365,31 @@ pid2name(Pid) ->
 %% It retuns a {Cont2, ObjList} | eof | {error, Reason}
 %% The initial continuation is the atom 'start'
 
--spec chunk(Log :: log(), Cont :: any()) ->
-    {'error', term()} | 'eof' | {any(), [any()]} | {any(), [any()], integer()}.
+-type chunk_error_rsn() :: no_such_log
+                         | {format_external, log()}
+                         | {blocked_log, log()}
+                         | {badarg, continuation}
+                         | {not_internal_wrap, log()}
+                         | {corrupt_log_file, FileName :: file:filename()}
+                         | {file_error, file:filename(), file_error()}.
+
+-type chunk_ret() :: {Continuation2 :: continuation(), Terms :: [term()]}
+                   | {Continuation2 :: continuation(),
+                      Terms :: [term()],
+                      Badbytes :: non_neg_integer()}
+                   | eof
+                   | {error, Reason :: chunk_error_rsn()}.
+
+-spec chunk(Log, Continuation) -> chunk_ret() when
+      Log :: log(),
+      Continuation :: start | continuation().
 chunk(Log, Cont) ->
     chunk(Log, Cont, infinity).
 
--spec chunk(Log :: log(), Cont :: any(), N :: pos_integer() | 'infinity') ->
-    {'error', term()} | 'eof' | {any(), [any()]} | {any(), [any()], integer()}.
+-spec chunk(Log, Continuation, N) -> chunk_ret() when
+      Log :: log(),
+      Continuation :: start | continuation(),
+      N :: pos_integer() | infinity.
 chunk(Log, Cont, infinity) ->
     %% There cannot be more than ?MAX_CHUNK_SIZE terms in a chunk.
     ichunk(Log, Cont, ?MAX_CHUNK_SIZE);
@@ -346,13 +455,24 @@ ichunk_bad_end([B | Bs], Mode, Log, C, Bad, A) ->
 	    ichunk_bad_end(Bs, Mode, Log, C, Bad, [T | A])
     end.
 
--spec bchunk(Log :: log(), Cont :: any()) ->
-    {'error', any()} | 'eof' | {any(), [binary()]} | {any(), [binary()], integer()}.
+-type bchunk_ret() :: {Continuation2 :: continuation(),
+                       Binaries :: [binary()]}
+                    | {Continuation2 :: continuation(),
+                       Binaries :: [binary()],
+                       Badbytes :: non_neg_integer()}
+                    | eof
+                    | {error, Reason :: chunk_error_rsn()}.
+
+-spec bchunk(Log, Continuation) -> bchunk_ret() when
+      Log :: log(),
+      Continuation :: start | continuation().
 bchunk(Log, Cont) ->
     bchunk(Log, Cont, infinity).
 
--spec bchunk(Log :: log(), Cont :: any(), N :: 'infinity' | pos_integer()) ->
-    {'error', any()} | 'eof' | {any(), [binary()]} | {any(), [binary()], integer()}.
+-spec bchunk(Log, Continuation, N) -> bchunk_ret() when
+      Log :: log(),
+      Continuation :: start | continuation(),
+      N :: pos_integer() | infinity.
 bchunk(Log, Cont, infinity) ->
     %% There cannot be more than ?MAX_CHUNK_SIZE terms in a chunk.
     bichunk(Log, Cont, ?MAX_CHUNK_SIZE);
@@ -375,8 +495,14 @@ bichunk_end({C = #continuation{}, R, Bad}) ->
 bichunk_end(R) ->
     R.
 
--spec chunk_step(Log :: log(), Cont :: any(), N :: integer()) ->
-    {'ok', any()} | {'error', term()}.
+-spec chunk_step(Log, Continuation, Step) ->
+                        {'ok', any()} | {'error', Reason} when
+      Log :: log(),
+      Continuation :: start | continuation(),
+      Step :: integer(),
+      Reason :: no_such_log | end_of_log | {format_external, Log}
+              | {blocked_log, Log}  | {badarg, continuation}
+              | {file_error, file:filename(), file_error()}.
 chunk_step(Log, Cont, N) when is_integer(N) ->
     ichunk_step(Log, Cont, N).
 
@@ -387,14 +513,18 @@ ichunk_step(_Log, More, N) when is_record(More, continuation) ->
 ichunk_step(_Log, _, _) ->
     {error, {badarg, continuation}}.
 
--spec chunk_info(More :: any()) ->
-    [{'node', node()},...] | {'error', {'no_continuation', any()}}.
+-spec chunk_info(Continuation) -> InfoList | {error, Reason} when
+      Continuation :: continuation(),
+      InfoList :: [{node, Node :: node()}, ...],
+      Reason :: {no_continuation, Continuation}.
 chunk_info(More = #continuation{}) ->
    [{node, node(More#continuation.pid)}];
 chunk_info(BadCont) ->
    {error, {no_continuation, BadCont}}.
 
--spec accessible_logs() -> {[_], [_]}.
+-spec accessible_logs() -> {[LocalLog], [DistributedLog]} when
+      LocalLog :: log(),
+      DistributedLog :: log().
 accessible_logs() ->
     disk_log_server:accessible_logs().
 
diff --git a/lib/kernel/src/disk_log.hrl b/lib/kernel/src/disk_log.hrl
index 9a94d4d3b9..259967650f 100644
--- a/lib/kernel/src/disk_log.hrl
+++ b/lib/kernel/src/disk_log.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -53,18 +53,34 @@
 %% Types -- alphabetically
 %%------------------------------------------------------------------------
 
+-type dlog_byte()        :: [dlog_byte()] | byte().
 -type dlog_format()      :: 'external' | 'internal'.
 -type dlog_format_type() :: 'halt_ext' | 'halt_int' | 'wrap_ext' | 'wrap_int'.
 -type dlog_head()        :: 'none' | {'ok', binary()} | mfa().
+-type dlog_head_opt()    :: none | term() | binary() | [dlog_byte()].
+-type log()              :: term().  % XXX: refine
 -type dlog_mode()        :: 'read_only' | 'read_write'.
 -type dlog_name()        :: atom() | string().
 -type dlog_optattr()     :: 'name' | 'file' | 'linkto' | 'repair' | 'type'
                           | 'format' | 'size' | 'distributed' | 'notify'
                           | 'head' | 'head_func' | 'mode'.
--type dlog_options()     :: [{dlog_optattr(), any()}].
+-type dlog_option()      :: {name, Log :: log()}
+                          | {file, FileName :: file:filename()}
+                          | {linkto, LinkTo :: none | pid()}
+                          | {repair, Repair :: true | false | truncate}
+                          | {type, Type :: dlog_type}
+                          | {format, Format :: dlog_format()}
+                          | {size, Size :: dlog_size()}
+                          | {distributed, Nodes :: [node()]}
+                          | {notify, boolean()}
+                          | {head, Head :: dlog_head_opt()}
+                          | {head_func, mfa()}
+                          | {mode, Mode :: dlog_mode()}.
+-type dlog_options()     :: [dlog_option()].
 -type dlog_repair()      :: 'truncate' | boolean().
 -type dlog_size()        :: 'infinity' | pos_integer()
-                          | {pos_integer(), pos_integer()}.
+                          | {MaxNoBytes :: pos_integer(),
+                             MaxNoFiles :: pos_integer()}.
 -type dlog_status()      :: 'ok' | {'blocked', 'false' | [_]}. %QueueLogRecords
 -type dlog_type()        :: 'halt' | 'wrap'.
 
@@ -75,7 +91,7 @@
 %% record of args for open
 -record(arg, {name = 0,
 	      version = undefined,
-	      file = none         :: 'none' | string(),
+	      file = none         :: 'none' | file:filename(),
 	      repair = true       :: dlog_repair(),
 	      size = infinity     :: dlog_size(),
 	      type = halt         :: dlog_type(),
diff --git a/lib/kernel/src/erl_boot_server.erl b/lib/kernel/src/erl_boot_server.erl
index b4c5f5e27c..0d68d3e198 100644
--- a/lib/kernel/src/erl_boot_server.erl
+++ b/lib/kernel/src/erl_boot_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -59,7 +59,11 @@
 
 -type ip4_address() :: {0..255,0..255,0..255,0..255}.
 
--spec start(Slaves :: [atom()]) -> {'ok', pid()} | {'error', any()}.
+-spec start(Slaves) -> {'ok', Pid} | {'error', What} when
+      Slaves :: [Host],
+      Host :: atom(),
+      Pid :: pid(),
+      What :: any().
 
 start(Slaves) ->
     case check_arg(Slaves) of
@@ -69,7 +73,11 @@ start(Slaves) ->
 	    {error, {badarg, Slaves}}
     end.
 
--spec start_link(Slaves :: [atom()]) -> {'ok', pid()} | {'error', any()}.
+-spec start_link(Slaves) -> {'ok', Pid} | {'error', What} when
+      Slaves :: [Host],
+      Host :: atom(),
+      Pid :: pid(),
+      What :: any().
 
 start_link(Slaves) ->
     case check_arg(Slaves) of
@@ -95,7 +103,10 @@ check_arg([], Result) ->
 check_arg(_, _Result) ->
     error.
 
--spec add_slave(Slave :: atom()) -> 'ok' | {'error', any()}.
+-spec add_slave(Slave) -> 'ok' | {'error', What} when
+      Slave :: Host,
+      Host :: atom(),
+      What :: any().
 
 add_slave(Slave) ->
     case inet:getaddr(Slave, inet) of
@@ -105,7 +116,10 @@ add_slave(Slave) ->
 	    {error, {badarg, Slave}}
     end.
 
--spec delete_slave(Slave :: atom()) -> 'ok' | {'error', any()}.
+-spec delete_slave(Slave) -> 'ok' | {'error', What} when
+      Slave :: Host,
+      Host :: atom(),
+      What :: any().
 
 delete_slave(Slave) ->
     case inet:getaddr(Slave, inet) of
@@ -131,7 +145,9 @@ add_subnet(Mask, Addr) when is_tuple(Mask), is_tuple(Addr) ->
 delete_subnet(Mask, Addr) when is_tuple(Mask), is_tuple(Addr) ->
     gen_server:call(boot_server, {delete, {Mask, Addr}}).
 
--spec which_slaves() -> [atom()].
+-spec which_slaves() -> Slaves when
+      Slaves :: [Host],
+      Host :: atom().
 
 which_slaves() ->
     gen_server:call(boot_server, which).
diff --git a/lib/kernel/src/erl_ddll.erl b/lib/kernel/src/erl_ddll.erl
index ce64589a29..646cac99c5 100644
--- a/lib/kernel/src/erl_ddll.erl
+++ b/lib/kernel/src/erl_ddll.erl
@@ -44,14 +44,18 @@ start() ->
 stop() ->
     ok.
 
--spec load_driver(Path :: path(), Driver :: driver()) ->
-	'ok' | {'error', any()}.
+-spec load_driver(Path, Name) -> 'ok' | {'error', ErrorDesc} when
+      Path :: path(),
+      Name :: driver(),
+      ErrorDesc :: term().
 
 load_driver(Path, Driver) ->
     do_load_driver(Path, Driver, [{driver_options,[kill_ports]}]).
 
--spec load(Path :: path(), Driver :: driver()) ->
-	'ok' | {'error', any()}.
+-spec load(Path, Name) -> 'ok' | {'error', ErrorDesc} when
+      Path :: path(),
+      Name :: driver(),
+      ErrorDesc ::term().
 
 load(Path, Driver) ->
     do_load_driver(Path, Driver, []).
@@ -100,30 +104,41 @@ do_unload_driver(Driver,Flags) ->
 	    end
     end.
 
--spec unload_driver(Driver :: driver()) -> 'ok' | {'error', any()}.
+-spec unload_driver(Name) -> 'ok' | {'error', ErrorDesc} when
+      Name :: driver(),
+      ErrorDesc :: term().
 
 unload_driver(Driver) ->
     do_unload_driver(Driver,[{monitor,pending_driver},kill_ports]).
 
--spec unload(Driver :: driver()) -> 'ok' | {'error', any()}.
+-spec unload(Name) -> 'ok' | {'error', ErrorDesc} when
+      Name :: driver(),
+      ErrorDesc :: term().
 
 unload(Driver) ->
     do_unload_driver(Driver,[]).
 
--spec reload(Path :: path(), Driver :: driver()) ->
-	'ok' | {'error', any()}.
+-spec reload(Path, Name) -> 'ok' | {'error', ErrorDesc} when
+      Path :: path(),
+      Name :: driver(),
+      ErrorDesc :: pending_process | OpaqueError,
+      OpaqueError :: term().
 
 reload(Path,Driver) ->
     do_load_driver(Path, Driver, [{reload,pending_driver}]).
 
--spec reload_driver(Path :: path(), Driver :: driver()) ->
-	'ok' | {'error', any()}.
+-spec reload_driver(Path, Name) -> 'ok' | {'error', ErrorDesc} when
+      Path :: path(),
+      Name :: driver(),
+      ErrorDesc :: pending_process | OpaqueError,
+      OpaqueError :: term().
 
 reload_driver(Path,Driver) ->
     do_load_driver(Path, Driver, [{reload,pending_driver},
 				  {driver_options,[kill_ports]}]).			    
 
--spec format_error(Code :: atom()) -> string().
+-spec format_error(ErrorDesc) -> string() when
+      ErrorDesc :: term().
 
 format_error(Code) ->
     case Code of
@@ -135,7 +150,10 @@ format_error(Code) ->
 	    erl_ddll:format_error_int(Code)
     end.
 
--spec info(Driver :: driver()) -> [{atom(), any()}, ...].
+-spec info(Name) -> InfoList when
+      Name :: driver(),
+      InfoList :: [InfoItem, ...],
+      InfoItem :: {Tag :: atom(), Value :: term()}.
  
 info(Driver) ->
     [{processes, erl_ddll:info(Driver,processes)},
@@ -146,7 +164,12 @@ info(Driver) ->
      {awaiting_load,  erl_ddll:info(Driver,awaiting_load)},
      {awaiting_unload, erl_ddll:info(Driver,awaiting_unload)}].
 
--spec info() -> [{string(), [{atom(), any()}]}].
+-spec info() -> AllInfoList when
+      AllInfoList :: [DriverInfo],
+      DriverInfo :: {DriverName, InfoList},
+      DriverName :: string(),
+      InfoList :: [InfoItem],
+      InfoItem :: {Tag :: atom(), Value :: term()}.
 
 info() ->
     {ok,DriverList} = erl_ddll:loaded_drivers(),
diff --git a/lib/kernel/src/error_handler.erl b/lib/kernel/src/error_handler.erl
index 6f69f4ccb9..e1f99bf417 100644
--- a/lib/kernel/src/error_handler.erl
+++ b/lib/kernel/src/error_handler.erl
@@ -28,8 +28,11 @@
 -export([undefined_function/3, undefined_lambda/3, stub_function/3,
 	 breakpoint/3]).
 
--spec undefined_function(Module :: atom(), Function :: atom(), Args :: [_]) ->
-	any().
+-spec undefined_function(Module, Function, Args) ->
+	any() when
+      Module :: atom(),
+      Function :: atom(),
+      Args :: list().
 
 undefined_function(Module, Func, Args) ->
     case ensure_loaded(Module) of
@@ -51,8 +54,10 @@ undefined_function(Module, Func, Args) ->
 	    crash(Module, Func, Args)
     end.
 
--spec undefined_lambda(Module :: atom(), Function :: fun(), Args :: [_]) ->
-	any().
+-spec undefined_lambda(Module, Fun, Args) -> term() when
+      Module :: atom(),
+      Fun :: fun(),
+      Args :: list().
 
 undefined_lambda(Module, Fun, Args) ->
     case ensure_loaded(Module) of
diff --git a/lib/kernel/src/error_logger.erl b/lib/kernel/src/error_logger.erl
index cafdc52e84..f94cca000f 100644
--- a/lib/kernel/src/error_logger.erl
+++ b/lib/kernel/src/error_logger.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -69,17 +69,22 @@ start_link() ->
 %% Used for simple messages; error or information.
 %%-----------------------------------------------------------------
 
--spec error_msg(Format :: string()) -> 'ok'.
+-spec error_msg(Format) -> 'ok' when
+      Format :: string().
 
 error_msg(Format) ->
     error_msg(Format,[]).
 
--spec error_msg(Format :: string(), Args :: list()) -> 'ok'.
+-spec error_msg(Format, Data) -> 'ok' when
+      Format :: string(),
+      Data :: list().
 
 error_msg(Format, Args) ->
     notify({error, group_leader(), {self(), Format, Args}}).
 
--spec format(Format :: string(), Args :: list()) -> 'ok'.
+-spec format(Format, Data) -> 'ok' when
+      Format :: string(),
+      Data :: list().
 
 format(Format, Args) ->
     notify({error, group_leader(), {self(), Format, Args}}).
@@ -90,12 +95,18 @@ format(Format, Args) ->
 %% The 'std_error' error_report type can always be used.
 %%-----------------------------------------------------------------
 
--spec error_report(Report :: any()) -> 'ok'.
+-type report() ::
+        [{Tag :: term(), Data :: term()} | term()] | string() | term().
+
+-spec error_report(Report) -> 'ok' when
+      Report :: report().
 
 error_report(Report) -> 
     error_report(std_error, Report).
 
--spec error_report(Type :: any(), Report :: any()) -> 'ok'.
+-spec error_report(Type, Report) -> 'ok' when
+      Type :: term(),
+      Report :: report().
 
 error_report(Type, Report) ->
     notify({error_report, group_leader(), {self(), Type, Report}}).
@@ -109,12 +120,15 @@ error_report(Type, Report) ->
 %% mapped to std_info or std_error accordingly.
 %%-----------------------------------------------------------------
 
--spec warning_report(Report :: any()) -> 'ok'.
+-spec warning_report(Report) -> 'ok' when
+      Report :: report().
 
 warning_report(Report) -> 
     warning_report(std_warning, Report).
 
--spec warning_report(Type :: any(), Report :: any()) -> 'ok'.
+-spec warning_report(Type, Report) -> 'ok' when
+      Type :: any(),
+      Report :: report().
 
 warning_report(Type, Report) ->
     {Tag, NType} = case error_logger:warning_map() of
@@ -143,12 +157,15 @@ warning_report(Type, Report) ->
 %% other types of reports.
 %%-----------------------------------------------------------------
 
--spec warning_msg(Format :: string()) -> 'ok'.
+-spec warning_msg(Format) -> 'ok' when
+      Format :: string().
 
 warning_msg(Format) ->
     warning_msg(Format,[]).
 
--spec warning_msg(Format :: string(), Args :: list()) -> 'ok'.
+-spec warning_msg(Format, Data) -> 'ok' when
+      Format :: string(),
+      Data :: list().
 
 warning_msg(Format, Args) ->
     Tag = case error_logger:warning_map() of
@@ -167,12 +184,15 @@ warning_msg(Format, Args) ->
 %% The 'std_info' info_report type can always be used.
 %%-----------------------------------------------------------------
 
--spec info_report(Report :: any()) -> 'ok'.
+-spec info_report(Report) -> 'ok' when
+      Report :: report().
 
 info_report(Report) -> 
     info_report(std_info, Report).
 
--spec info_report(Type :: any(), Report :: any()) -> 'ok'.
+-spec info_report(Type, Report) -> 'ok' when
+      Type :: any(),
+      Report :: report().
 
 info_report(Type, Report) ->
     notify({info_report, group_leader(), {self(), Type, Report}}).
@@ -182,12 +202,15 @@ info_report(Type, Report) ->
 %% information messages.
 %%-----------------------------------------------------------------
 
--spec info_msg(Format :: string()) -> 'ok'.
+-spec info_msg(Format) -> 'ok' when
+      Format :: string().
 
 info_msg(Format) ->
     info_msg(Format,[]).
 
--spec info_msg(Format :: string(), Args :: list()) -> 'ok'.
+-spec info_msg(Format, Data) -> 'ok' when
+      Format :: string(),
+      Data :: list().
 
 info_msg(Format, Args) ->
     notify({info_msg, group_leader(), {self(), Format, Args}}).
@@ -223,17 +246,23 @@ swap_handler(silent) ->
 swap_handler(false) ->
     ok. % keep primitive event handler as-is
 
--spec add_report_handler(Module :: atom()) -> any(). 
+-spec add_report_handler(Handler) -> any() when
+      Handler :: module().
 
 add_report_handler(Module) when is_atom(Module) ->
     gen_event:add_handler(error_logger, Module, []).
 
--spec add_report_handler(atom(), any()) -> any(). 
+-spec add_report_handler(Handler, Args) -> Result when
+      Handler :: module(),
+      Args :: gen_event:handler_args(),
+      Result :: gen_event:add_handler_ret().
 
 add_report_handler(Module, Args) when is_atom(Module) ->
     gen_event:add_handler(error_logger, Module, Args).
 
--spec delete_report_handler(Module :: atom()) -> any().
+-spec delete_report_handler(Handler) -> Result when
+      Handler :: module(),
+      Result :: gen_event:del_handler_ret().
 
 delete_report_handler(Module) when is_atom(Module) ->
     gen_event:delete_handler(error_logger, Module, []).
@@ -250,9 +279,16 @@ simple_logger() ->
 
 %% Log all errors to File for all eternity
 
--spec logfile(Request :: {'open', string()}) -> 'ok' | {'error',any()}
-           ; (Request :: 'close') -> 'ok' | {'error', any()}
-	   ; (Request :: 'filename') -> atom() | string() | {'error', any()}.
+-type open_error() :: file:posix() | badarg | system_limit.
+
+-spec logfile(Request :: {open, Filename}) -> ok | {error, OpenReason} when
+                  Filename ::file:name(),
+                  OpenReason :: allready_have_logfile | open_error()
+           ; (Request :: close) -> ok | {error, CloseReason} when
+                  CloseReason :: module_not_found
+	   ; (Request :: filename) -> Filename | {error, FilenameReason} when
+                  Filename :: file:name(),
+                  FilenameReason :: no_log_file.
 
 logfile({open, File}) ->
     case lists:member(error_logger_file_h,
@@ -280,7 +316,8 @@ logfile(filename) ->
 %% Possibly turn off all tty printouts, maybe we only want the errors
 %% to go to a file
 
--spec tty(Flag :: boolean()) -> 'ok'.
+-spec tty(Flag) -> 'ok' when
+      Flag :: boolean().
 
 tty(true) ->
     Hs = gen_event:which_handlers(error_logger),
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 88bcf9a9cc..f1a8aa9f77 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -79,15 +79,19 @@
 -type file_info() :: #file_info{}.
 -type fd()        :: #file_descriptor{}.
 -type io_device() :: pid() | fd().
--type location()  :: integer() | {'bof', integer()} | {'cur', integer()}
-		   | {'eof', integer()} | 'bof' | 'cur' | 'eof'.
+-type location()  :: integer() | {'bof', Offset :: integer()}
+                   | {'cur', Offset :: integer()}
+		   | {'eof', Offset :: integer()} | 'bof' | 'cur' | 'eof'.
 -type mode()      :: 'read' | 'write' | 'append'
                    | 'exclusive' | 'raw' | 'binary'
-		   | {'delayed_write', non_neg_integer(), non_neg_integer()}
-		   | 'delayed_write' | {'read_ahead', pos_integer()}
+		   | {'delayed_write',
+                      Size :: non_neg_integer(),
+                      Delay :: non_neg_integer()}
+		   | 'delayed_write' | {'read_ahead', Size :: pos_integer()}
 		   | 'read_ahead' | 'compressed'
 		   | {'encoding', unicode:encoding()}.
--type name()      :: string() | atom() | [name()] | binary().
+-type deep_list() :: [char() | atom() | deep_list()].
+-type name()      :: string() | atom() | deep_list() | (RawFilename :: binary()).
 -type posix()     :: 'eacces'  | 'eagain'  | 'ebadf'   | 'ebusy'  | 'edquot'
 		   | 'eexist'  | 'efault'  | 'efbig'   | 'eintr'  | 'einval'
 		   | 'eio'     | 'eisdir'  | 'eloop'   | 'emfile' | 'emlink'
@@ -96,10 +100,14 @@
 		   | 'enotblk' | 'enotdir' | 'enotsup' | 'enxio'  | 'eperm'
 		   | 'epipe'   | 'erofs'   | 'espipe'  | 'esrch'  | 'estale'
 		   | 'exdev'.
--type bindings()  :: any().
-
--type date()      :: {pos_integer(), pos_integer(), pos_integer()}.
--type time()      :: {non_neg_integer(), non_neg_integer(), non_neg_integer()}.
+-type bindings()  :: erl_eval:binding_struct().
+
+-type date()      :: {Year :: pos_integer(),
+                      Month :: pos_integer(),
+                      Day ::pos_integer()}.
+-type time()      :: {Hour :: non_neg_integer(),
+                      Minute :: non_neg_integer(),
+                      Second :: non_neg_integer()}.
 -type date_time() :: {date(), time()}.
 -type posix_file_advise() :: 'normal' | 'sequential' | 'random'
                            | 'no_reuse' | 'will_need' | 'dont_need'.
@@ -107,8 +115,10 @@
 %%%-----------------------------------------------------------------
 %%% General functions
 
--spec format_error(Reason :: posix() | {integer(), atom(), any()}) ->
-	string().	
+-spec format_error(Reason) -> Chars when
+      Reason :: posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()},
+      Chars :: string().
 
 format_error({_Line, ?MODULE, undefined_script}) ->
     "no value returned from script";
@@ -129,7 +139,9 @@ format_error(terminated) ->
 format_error(ErrorId) ->
     erl_posix_msg:message(ErrorId).
 
--spec pid2name(Pid :: pid()) -> {'ok', filename()} | 'undefined'.
+-spec pid2name(Pid) -> {ok, Filename} | undefined when
+      Filename :: filename(),
+      Pid :: pid().
 
 pid2name(Pid) when is_pid(Pid) ->
     case whereis(?FILE_SERVER) of
@@ -148,42 +160,61 @@ pid2name(Pid) when is_pid(Pid) ->
 %%% File server functions.
 %%% Functions that do not operate on a single open file.
 %%% Stateless.
--spec get_cwd() -> {'ok', filename()} | {'error', posix()}. 
+-spec get_cwd() -> {ok, Dir} | {error, Reason} when
+      Dir :: filename(),
+      Reason :: posix().
 
 get_cwd() ->
     call(get_cwd, []).
 
--spec get_cwd(Drive :: string()) -> {'ok', filename()} | {'error', posix()}.
+-spec get_cwd(Drive) -> {ok, Dir} | {error, Reason} when
+      Drive :: string(),
+      Dir :: filename(),
+      Reason :: posix() | badarg.
 
 get_cwd(Drive) ->
     check_and_call(get_cwd, [file_name(Drive)]).
 
--spec set_cwd(Dirname :: name()) -> 'ok' | {'error', posix()}.
+-spec set_cwd(Dir) -> ok | {error, Reason} when
+      Dir :: name(),
+      Reason :: posix() | badarg.
 
 set_cwd(Dirname) -> 
     check_and_call(set_cwd, [file_name(Dirname)]).
 
--spec delete(Name :: name()) -> 'ok' | {'error', posix()}.
+-spec delete(Filename) -> ok | {error, Reason} when
+      Filename :: name(),
+      Reason :: posix() | badarg.
 
 delete(Name) ->
     check_and_call(delete, [file_name(Name)]).
 
--spec rename(From :: name(), To :: name()) -> 'ok' | {'error', posix()}.
+-spec rename(Source, Destination) -> ok | {error, Reason} when
+      Source :: name(),
+      Destination :: name(),
+      Reason :: posix() | badarg.
 
 rename(From, To) ->
     check_and_call(rename, [file_name(From), file_name(To)]).
 
--spec make_dir(Name :: name()) -> 'ok' | {'error', posix()}.
+-spec make_dir(Dir) -> ok | {error, Reason} when
+      Dir :: name(),
+      Reason :: posix() | badarg.
 
 make_dir(Name) ->
     check_and_call(make_dir, [file_name(Name)]).
 
--spec del_dir(Name :: name()) -> 'ok' | {'error', posix()}.
+-spec del_dir(Dir) -> ok | {error, Reason} when
+      Dir :: name(),
+      Reason :: posix() | badarg.
 
 del_dir(Name) ->
     check_and_call(del_dir, [file_name(Name)]).
 
--spec read_file_info(Name :: name()) -> {'ok', file_info()} | {'error', posix()}.
+-spec read_file_info(Filename) -> {ok, FileInfo} | {error, Reason} when
+      Filename :: name(),
+      FileInfo :: file_info(),
+      Reason :: posix() | badarg.
 
 read_file_info(Name) ->
     check_and_call(read_file_info, [file_name(Name)]).
@@ -193,45 +224,66 @@ read_file_info(Name) ->
 altname(Name) ->
     check_and_call(altname, [file_name(Name)]).
 
--spec read_link_info(Name :: name()) -> {'ok', file_info()} | {'error', posix()}.
+-spec read_link_info(Name) -> {ok, FileInfo} | {error, Reason} when
+      Name :: name(),
+      FileInfo :: file_info(),
+      Reason :: posix() | badarg.
 
 read_link_info(Name) ->
     check_and_call(read_link_info, [file_name(Name)]).
 
--spec read_link(Name :: name()) -> {'ok', filename()} | {'error', posix()}.
+-spec read_link(Name) -> {ok, Filename} | {error, Reason} when
+      Name :: name(),
+      Filename :: filename(),
+      Reason :: posix() | badarg.
 
 read_link(Name) ->
     check_and_call(read_link, [file_name(Name)]).
 
--spec write_file_info(Name :: name(), Info :: file_info()) ->
-	'ok' | {'error', posix()}.
+-spec write_file_info(Filename, FileInfo) -> ok | {error, Reason} when
+      Filename :: name(),
+      FileInfo :: file_info(),
+      Reason :: posix() | badarg.
 
 write_file_info(Name, Info = #file_info{}) ->
     check_and_call(write_file_info, [file_name(Name), Info]).
 
--spec list_dir(Name :: name()) -> {'ok', [filename()]} | {'error', posix()}.
+-spec list_dir(Dir) -> {ok, Filenames} | {error, Reason} when
+      Dir :: name(),
+      Filenames :: [filename()],
+      Reason :: posix() | badarg.
 
 list_dir(Name) ->
     check_and_call(list_dir, [file_name(Name)]).
 
--spec read_file(Name :: name()) ->
-	{'ok', binary()} | {'error', posix() | 'terminated' | 'system_limit'}.
+-spec read_file(Filename) -> {ok, Binary} | {error, Reason} when
+      Filename :: name(),
+      Binary :: binary(),
+      Reason :: posix() | badarg | terminated | system_limit.
 
 read_file(Name) ->
     check_and_call(read_file, [file_name(Name)]).
 
--spec make_link(Old :: name(), New :: name()) -> 'ok' | {'error', posix()}.
+-spec make_link(Existing, New) -> ok | {error, Reason} when
+      Existing :: name(),
+      New :: name(),
+      Reason :: posix() | badarg.
 
 make_link(Old, New) ->
     check_and_call(make_link, [file_name(Old), file_name(New)]).
 
--spec make_symlink(Old :: name(), New :: name()) -> 'ok' | {'error', posix()}.
+-spec make_symlink(Name1, Name2) -> ok | {error, Reason} when
+      Name1 :: name(),
+      Name2 :: name(),
+      Reason :: posix() | badarg.
 
 make_symlink(Old, New) ->
     check_and_call(make_symlink, [file_name(Old), file_name(New)]).
 
--spec write_file(Name :: name(), Bin :: iodata()) ->
-	'ok' | {'error', posix() | 'terminated' | 'system_limit'}.
+-spec write_file(Filename, Bytes) -> ok | {error, Reason} when
+      Filename :: name(),
+      Bytes :: iodata(),
+      Reason :: posix() | badarg | terminated | system_limit.
 
 write_file(Name, Bin) ->
     check_and_call(write_file, [file_name(Name), make_binary(Bin)]).
@@ -240,8 +292,11 @@ write_file(Name, Bin) ->
 %% when it is time to change file server protocol again.
 %% Meanwhile, it is implemented here, slightly less efficient.
 
--spec write_file(Name :: name(), Bin :: iodata(), Modes :: [mode()]) ->
-	'ok' | {'error', posix()}.
+-spec write_file(Filename, Bytes, Modes) -> ok | {error, Reason} when
+      Filename :: name(),
+      Bytes :: iodata(),
+      Modes :: [mode()],
+      Reason :: posix() | badarg | terminated | system_limit.
 
 write_file(Name, Bin, ModeList) when is_list(ModeList) ->
     case make_binary(Bin) of
@@ -295,8 +350,11 @@ raw_write_file_info(Name, #file_info{} = Info) ->
 
 %% Contemporary mode specification - list of options
 
--spec open(Name :: name(), Modes :: [mode()]) ->
-	{'ok', io_device()} | {'error', posix() | 'system_limit'}.
+-spec open(Filename, Modes) -> {ok, IoDevice} | {error, Reason} when
+      Filename :: name(),
+      Modes :: [mode()],
+      IoDevice :: io_device(),
+      Reason :: posix() | badarg | system_limit.
 
 open(Item, ModeList) when is_list(ModeList) ->
     case lists:member(raw, ModeList) of
@@ -349,7 +407,9 @@ open(Item, Mode) ->
 %%% The File argument must be either a Pid or a handle 
 %%% returned from ?PRIM_FILE:open.
 
--spec close(File :: io_device()) -> 'ok' | {'error', posix() | 'terminated'}.
+-spec close(IoDevice) -> ok | {error, Reason} when
+      IoDevice :: io_device(),
+      Reason :: posix() | badarg | terminated.
 
 close(File) when is_pid(File) ->
     R = file_request(File, close),
@@ -367,9 +427,12 @@ close(#file_descriptor{module = Module} = Handle) ->
 close(_) ->
     {error, badarg}.
 
--spec advise(File :: io_device(), Offset :: integer(),
-	     Length :: integer(), Advise :: posix_file_advise()) ->
-	'ok' | {'error', posix()}.
+-spec advise(IoDevice, Offset, Length, Advise) -> ok | {error, Reason} when
+      IoDevice :: io_device(),
+      Offset :: integer(),
+      Length :: integer(),
+      Advise :: posix_file_advise(),
+      Reason :: posix() | badarg.
 
 advise(File, Offset, Length, Advise) when is_pid(File) ->
     R = file_request(File, {advise, Offset, Length, Advise}),
@@ -379,8 +442,11 @@ advise(#file_descriptor{module = Module} = Handle, Offset, Length, Advise) ->
 advise(_, _, _, _) ->
     {error, badarg}.
 
--spec read(File :: io_device() | atom(), Size :: non_neg_integer()) ->
-	'eof' | {'ok', [char()] | binary()} | {'error', posix()}.
+-spec read(IoDevice, Number) -> {ok, Data} | eof | {error, Reason} when
+      IoDevice :: io_device() | atom(),
+      Number :: non_neg_integer(),
+      Data :: string() | binary(),
+      Reason :: posix() | badarg | terminated.
 
 read(File, Sz) when (is_pid(File) orelse is_atom(File)), is_integer(Sz), Sz >= 0 ->
     case io:request(File, {get_chars, '', Sz}) of
@@ -395,8 +461,10 @@ read(#file_descriptor{module = Module} = Handle, Sz)
 read(_, _) ->
     {error, badarg}.
 
--spec read_line(File :: io_device() | atom()) ->
-	'eof' | {'ok', [char()] | binary()} | {'error', posix()}.
+-spec read_line(IoDevice) -> {ok, Data} | eof | {error, Reason} when
+      IoDevice :: io_device() | atom(),
+      Data :: string() | binary(),
+      Reason :: posix() | badarg | terminated.
 
 read_line(File) when (is_pid(File) orelse is_atom(File)) ->
     case io:request(File, {get_line, ''}) of
@@ -410,9 +478,12 @@ read_line(#file_descriptor{module = Module} = Handle) ->
 read_line(_) ->
     {error, badarg}.
 
--spec pread(File :: io_device(),
-	    LocationNumbers :: [{location(), non_neg_integer()}]) ->
-	{'ok', [string() | binary() | 'eof']} | {'error', posix()}.
+-spec pread(IoDevice, LocNums) -> {ok, DataL} | eof | {error, Reason} when
+      IoDevice :: io_device(),
+      LocNums :: [{Location :: location(), Number :: non_neg_integer()}],
+      DataL :: [Data],
+      Data :: string() | binary() | eof,
+      Reason :: posix() | badarg | terminated.
 
 pread(File, L) when is_pid(File), is_list(L) ->
     pread_int(File, L, []);
@@ -435,10 +506,13 @@ pread_int(File, [{At, Sz} | T], R) when is_integer(Sz), Sz >= 0 ->
 pread_int(_, _, _) ->
     {error, badarg}.
 
--spec pread(File :: io_device(),
-	    Location :: location(),
-	    Size :: non_neg_integer()) ->
-	'eof' | {'ok', string() | binary()} | {'error', posix()}.
+-spec pread(IoDevice, Location, Number) ->
+             {ok, Data} | eof | {error, Reason} when
+      IoDevice :: io_device(),
+      Location :: location(),
+      Number :: non_neg_integer(),
+      Data :: string() | binary(),
+      Reason :: posix() | badarg | terminated.
 
 pread(File, At, Sz) when is_pid(File), is_integer(Sz), Sz >= 0 ->
     R = file_request(File, {pread, At, Sz}),
@@ -449,8 +523,10 @@ pread(#file_descriptor{module = Module} = Handle, Offs, Sz)
 pread(_, _, _) ->
     {error, badarg}.
 
--spec write(File :: io_device() | atom(), Byte :: iodata()) ->
-	'ok' | {'error', posix() | 'terminated'}.
+-spec write(IoDevice, Bytes) -> ok | {error, Reason} when
+      IoDevice :: io_device() | atom(),
+      Bytes :: iodata(),
+      Reason :: posix() | badarg | terminated.
 
 write(File, Bytes) when (is_pid(File) orelse is_atom(File)) ->
     case make_binary(Bytes) of
@@ -464,8 +540,11 @@ write(#file_descriptor{module = Module} = Handle, Bytes) ->
 write(_, _) ->
     {error, badarg}.
 
--spec pwrite(File :: io_device(), L :: [{location(), iodata()}]) ->
-	'ok' | {'error', {non_neg_integer(), posix()}}.
+-spec pwrite(IoDevice, LocBytes) -> ok | {error, {N, Reason}} when
+      IoDevice :: io_device(),
+      LocBytes :: [{Location :: location(), Bytes :: iodata()}],
+      N :: non_neg_integer(),
+      Reason :: posix() | badarg | terminated.
 
 pwrite(File, L) when is_pid(File), is_list(L) ->
     pwrite_int(File, L, 0);
@@ -486,10 +565,11 @@ pwrite_int(File, [{At, Bytes} | T], R) ->
 pwrite_int(_, _, _) ->
     {error, badarg}.
 
--spec pwrite(File :: io_device(),
-	     Location :: location(),
-	     Bytes :: iodata()) ->
-	'ok' | {'error', posix()}.	
+-spec pwrite(IoDevice, Location, Bytes) -> ok | {error, Reason} when
+      IoDevice :: io_device(),
+      Location :: location(),
+      Bytes :: iodata(),
+      Reason :: posix() | badarg | terminated.
 
 pwrite(File, At, Bytes) when is_pid(File) ->
     R = file_request(File, {pwrite, At, Bytes}),
@@ -499,7 +579,9 @@ pwrite(#file_descriptor{module = Module} = Handle, Offs, Bytes) ->
 pwrite(_, _, _) ->
     {error, badarg}.
 
--spec datasync(File :: io_device()) -> 'ok' | {'error', posix()}.
+-spec datasync(IoDevice) -> ok | {error, Reason} when
+      IoDevice :: io_device(),
+      Reason :: posix() | badarg | terminated.
 
 datasync(File) when is_pid(File) ->
     R = file_request(File, datasync),
@@ -509,7 +591,9 @@ datasync(#file_descriptor{module = Module} = Handle) ->
 datasync(_) ->
     {error, badarg}.
 
--spec sync(File :: io_device()) -> 'ok' | {'error', posix()}.
+-spec sync(IoDevice) -> ok | {error, Reason} when
+      IoDevice :: io_device(),
+      Reason :: posix() | badarg | terminated.
 
 sync(File) when is_pid(File) ->
     R = file_request(File, sync),
@@ -519,8 +603,11 @@ sync(#file_descriptor{module = Module} = Handle) ->
 sync(_) ->
     {error, badarg}.
 
--spec position(File :: io_device(), Location :: location()) ->
-	{'ok',integer()} | {'error', posix()}.
+-spec position(IoDevice, Location) -> {ok, NewPosition} | {error, Reason} when
+      IoDevice :: io_device(),
+      Location :: location(),
+      NewPosition :: integer(),
+      Reason :: posix() | badarg | terminated.
 
 position(File, At) when is_pid(File) ->
     R = file_request(File, {position,At}),
@@ -530,7 +617,9 @@ position(#file_descriptor{module = Module} = Handle, At) ->
 position(_, _) ->
     {error, badarg}.
 
--spec truncate(File :: io_device()) -> 'ok' | {'error', posix()}.
+-spec truncate(IoDevice) -> ok | {error, Reason} when
+      IoDevice :: io_device(),
+      Reason :: posix() | badarg | terminated.
 
 truncate(File) when is_pid(File) ->
     R = file_request(File, truncate),
@@ -540,17 +629,26 @@ truncate(#file_descriptor{module = Module} = Handle) ->
 truncate(_) ->
     {error, badarg}.
 
--spec copy(Source :: io_device() | name() | {name(), [mode()]},
-	   Destination :: io_device() | name() | {name(), [mode()]}) ->
-	{'ok', non_neg_integer()} | {'error', posix()}.
+-spec copy(Source, Destination) -> {ok, BytesCopied} | {error, Reason} when
+      Source :: io_device() | Filename | {Filename, Modes},
+      Destination :: io_device() | Filename | {Filename, Modes},
+      Filename :: name(),
+      Modes :: [mode()],
+      BytesCopied :: non_neg_integer(),
+      Reason :: posix() | badarg | terminated.
 
 copy(Source, Dest) ->
     copy_int(Source, Dest, infinity).
 
--spec copy(Source :: io_device() | name() | {name(), [mode()]},
-	   Destination :: io_device() | name() | {name(), [mode()]},
-	   Length :: non_neg_integer() | 'infinity') ->
-	{'ok', non_neg_integer()} | {'error', posix()}.
+-spec copy(Source, Destination, ByteCount) ->
+             {ok, BytesCopied} | {error, Reason} when
+      Source :: io_device() | Filename | {Filename, Modes},
+      Destination :: io_device() | Filename | {Filename, Modes},
+      Filename :: name(),
+      Modes :: [mode()],
+      ByteCount :: non_neg_integer() | infinity,
+      BytesCopied :: non_neg_integer(),
+      Reason :: posix() | badarg | terminated.
 
 copy(Source, Dest, Length) 
   when is_integer(Length), Length >= 0;
@@ -772,8 +870,11 @@ ipread_s32bu_p32bu_2(File,
 %%% The following functions, built upon the other interface functions,
 %%% provide a higher-lever interface to files.
 
--spec consult(File :: name()) ->
-	{'ok', list()} | {'error', posix() | {integer(), atom(), any()}}.
+-spec consult(Filename) -> {ok, Terms} | {error, Reason} when
+      Filename :: name(),
+      Terms :: [term()],
+      Reason :: posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()}.
 
 consult(File) ->
     case open(File, [read]) of
@@ -785,8 +886,14 @@ consult(File) ->
 	    Error
     end.
 
--spec path_consult(Paths :: [name()], File :: name()) ->
-	{'ok', list(), filename()} | {'error', posix() | {integer(), atom(), any()}}.
+-spec path_consult(Path, Filename) -> {ok, Terms, FullName} | {error, Reason} when
+      Path :: [Dir],
+      Dir :: name(),
+      Filename :: name(),
+      Terms :: [term()],
+      FullName :: filename(),
+      Reason :: posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()}.
 
 path_consult(Path, File) ->
     case path_open(Path, File, [read]) of
@@ -803,13 +910,19 @@ path_consult(Path, File) ->
 	    E2
     end.
 
--spec eval(File :: name()) -> 'ok' | {'error', posix()}.
+-spec eval(Filename) -> ok | {error, Reason} when
+      Filename :: name(),
+      Reason :: posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()}.
 
 eval(File) ->
     eval(File, erl_eval:new_bindings()).
 
--spec eval(File :: name(), Bindings :: bindings()) ->
-	'ok' | {'error', posix()}.
+-spec eval(Filename, Bindings) -> ok | {error, Reason} when
+      Filename :: name(),
+      Bindings :: bindings(),
+      Reason :: posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()}.
 
 eval(File, Bs) ->
     case open(File, [read]) of
@@ -821,14 +934,24 @@ eval(File, Bs) ->
 	    Error
     end.
 
--spec path_eval(Paths :: [name()], File :: name()) ->
-	{'ok', filename()} | {'error', posix() | {integer(), atom(), any()}}.
+-spec path_eval(Path, Filename) -> {ok, FullName} | {error, Reason} when
+      Path :: [Dir :: name()],
+      Filename :: name(),
+      FullName :: filename(),
+      Reason :: posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()}.
 
 path_eval(Path, File) ->
     path_eval(Path, File, erl_eval:new_bindings()).
 
--spec path_eval(Paths :: [name()], File :: name(), Bindings :: bindings()) ->
-	{'ok', filename()} | {'error', posix() | {integer(), atom(), any()}}.
+-spec path_eval(Path, Filename, Bindings) ->
+             {ok, FullName} | {error, Reason} when
+      Path :: [Dir :: name()],
+      Filename :: name(),
+      Bindings :: bindings(),
+      FullName :: filename(),
+      Reason :: posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()}.
 
 path_eval(Path, File, Bs) ->
     case path_open(Path, File, [read]) of
@@ -845,14 +968,21 @@ path_eval(Path, File, Bs) ->
 	    E2
     end.
 
--spec script(File :: name()) ->
-	{'ok', any()} | {'error', posix() | {integer(), atom(), any()}}.
+-spec script(Filename) -> {ok, Value} | {error, Reason} when
+      Filename :: name(),
+      Value :: term(),
+      Reason :: posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()}.
 
 script(File) ->
     script(File, erl_eval:new_bindings()).
 
--spec script(File :: name(), Bindings :: bindings()) ->
-	{'ok', any()} | {'error', posix() | {integer(), atom(), any()}}.	
+-spec script(Filename, Bindings) -> {ok, Value} | {error, Reason} when
+      Filename :: name(),
+      Bindings :: bindings(),
+      Value :: term(),
+      Reason :: posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()}.
 
 script(File, Bs) ->
     case open(File, [read]) of
@@ -864,16 +994,27 @@ script(File, Bs) ->
 	    Error
     end.
 
--spec path_script/2 :: (Paths :: [name()], File :: name()) ->
-	{'ok', term(), filename()} | {'error', posix() | {integer(), atom(), _}}.
+-spec path_script(Path, Filename) ->
+             {ok, Value, FullName} | {error, Reason} when
+      Path :: [Dir :: name()],
+      Filename :: name(),
+      Value :: term(),
+      FullName :: filename(),
+      Reason :: posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()}.
 
 path_script(Path, File) ->
     path_script(Path, File, erl_eval:new_bindings()).
 
--spec path_script(Paths :: [name()],
-		  File :: name(),
-		  Bindings :: bindings()) ->
-	{'ok', term(), filename()} | {'error', posix() | {integer(), atom(), _}}.
+-spec path_script(Path, Filename, Bindings) ->
+          {ok, Value, FullName} | {error, Reason} when
+      Path :: [Dir :: name()],
+      Filename :: name(),
+      Bindings :: bindings(),
+      Value :: term(),
+      FullName :: filename(),
+      Reason :: posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()}.
 
 path_script(Path, File, Bs) ->
     case path_open(Path, File, [read]) of
@@ -898,8 +1039,14 @@ path_script(Path, File, Bs) ->
 %% Searches the Paths for file Filename which can be opened with Mode.
 %% The path list is ignored if Filename contains an absolute path.
 
--spec path_open(Paths :: [name()], Name :: name(), Modes :: [mode()]) ->
-	{'ok', io_device(), filename()} | {'error', posix()}.
+-spec path_open(Path, Filename, Modes) ->
+             {ok, IoDevice, FullName} | {error, Reason} when
+      Path :: [Dir :: name()],
+      Filename :: name(),
+      Modes :: [mode()],
+      IoDevice :: io_device(),
+      FullName :: filename(),
+      Reason :: posix() | badarg | system_limit.
 
 path_open(PathList, Name, Mode) ->
     case file_name(Name) of
@@ -919,47 +1066,57 @@ path_open(PathList, Name, Mode) ->
 	    end
     end.
 
--spec change_mode(Name :: name(), Mode :: integer()) ->
-	'ok' | {'error', posix()}.
+-spec change_mode(Filename, Mode) -> ok | {error, Reason} when
+      Filename :: name(),
+      Mode :: integer(),
+      Reason :: posix() | badarg.
 
 change_mode(Name, Mode) 
   when is_integer(Mode) ->
     write_file_info(Name, #file_info{mode=Mode}).
 
--spec change_owner(Name :: name(), OwnerId :: integer()) ->
-	'ok' | {'error', posix()}.
+-spec change_owner(Filename, Uid) -> ok | {error, Reason} when
+      Filename :: name(),
+      Uid :: integer(),
+      Reason :: posix() | badarg.
 
 change_owner(Name, OwnerId) 
   when is_integer(OwnerId) ->
     write_file_info(Name, #file_info{uid=OwnerId}).
 
--spec change_owner(Name :: name(),
-		   OwnerId :: integer(),
-		   GroupId :: integer()) ->
-	'ok' | {'error', posix()}.
+-spec change_owner(Filename, Uid, Gid) -> ok | {error, Reason} when
+      Filename :: name(),
+      Uid :: integer(),
+      Gid :: integer(),
+      Reason :: posix() | badarg.
 
 change_owner(Name, OwnerId, GroupId) 
   when is_integer(OwnerId), is_integer(GroupId) ->
     write_file_info(Name, #file_info{uid=OwnerId, gid=GroupId}).
 
--spec change_group(Name :: name(), GroupId :: integer()) ->
-	'ok' | {'error', posix()}.
+-spec change_group(Filename, Gid) -> ok | {error, Reason} when
+      Filename :: name(),
+      Gid :: integer(),
+      Reason :: posix() | badarg.
 
 change_group(Name, GroupId) 
   when is_integer(GroupId) ->
     write_file_info(Name, #file_info{gid=GroupId}).
 
--spec change_time(Name :: name(), Time :: date_time()) ->
-	'ok' | {'error', posix()}.
+-spec change_time(Filename, Mtime) -> ok | {error, Reason} when
+      Filename :: name(),
+      Mtime :: date_time(),
+      Reason :: posix() | badarg.
 
 change_time(Name, Time) 
   when is_tuple(Time) ->
     write_file_info(Name, #file_info{mtime=Time}).
 
--spec change_time(Name :: name(),
-		  ATime :: date_time(),
-		  MTime :: date_time()) ->
-	'ok' | {'error', posix()}.
+-spec change_time(Filename, Atime, Mtime) -> ok | {error, Reason} when
+      Filename :: name(),
+      Atime :: date_time(),
+      Mtime :: date_time(),
+      Reason :: posix() | badarg.
 
 change_time(Name, Atime, Mtime) 
   when is_tuple(Atime), is_tuple(Mtime) ->
diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl
index cccfa75005..004f03f231 100644
--- a/lib/kernel/src/gen_sctp.erl
+++ b/lib/kernel/src/gen_sctp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -33,11 +33,57 @@
 -export([error_string/1]).
 -export([controlling_process/2]).
 
-
+-opaque assoc_id() :: term().
+-type hostname() :: inet:hostname().
+-type ip_address() :: inet:ip_address().
+-type port_number() :: 0..65535.
+-type posix() :: inet:posix().
+-type sctp_option() ::
+        {mode, list | binary} | list | binary
+      | {active, true | false | once}
+      | {buffer, non_neg_integer()}
+      | {tos, integer()}
+      | {priority, integer()}
+      | {dontroute, boolean()}
+      | {reuseaddr, boolean()}
+      | {linger, {boolean(), non_neg_integer()}}
+      | {sndbuf, non_neg_integer()}
+      | {recbuf, non_neg_integer()}
+      | {sctp_rtoinfo, #sctp_rtoinfo{}}
+      | {sctp_associnfo, #sctp_assocparams{}}
+      | {sctp_initmsg, #sctp_initmsg{}}
+      | {sctp_autoclose, timeout()}
+      | {sctp_nodelay, boolean()}
+      | {sctp_disable_fragments, boolean()}
+      | {sctp_i_want_mapped_v4_addr, boolean()}
+      | {sctp_maxseg, non_neg_integer()}
+      | {sctp_primary_addr, #sctp_prim{}}
+      | {sctp_set_peer_primary_addr, #sctp_setpeerprim{}}
+      | {sctp_adaptation_layer, #sctp_setadaptation{}}
+      | {sctp_peer_addr_params, #sctp_paddrparams{}}
+      | {sctp_default_send_param, #sctp_sndrcvinfo{}}
+      | {sctp_events, #sctp_event_subscribe{}}
+      | {sctp_delayed_ack_time, #sctp_assoc_value{}}
+      | {sctp_status, #sctp_status{}}
+      | {sctp_get_peer_addr_info, #sctp_paddrinfo{}}.
+-opaque sctp_socket() :: port().
+
+-spec open() -> {ok, Socket} | {error, posix()} when
+      Socket :: sctp_socket().
 
 open() ->
     open([]).
 
+-spec open(Port) -> {ok, Socket} | {error, posix()} when
+              Port :: port_number(),
+              Socket :: sctp_socket();
+          (Opts) -> {ok, Socket} | {error, posix()} when
+              Opts :: [Opt],
+              Opt :: {ip,IP} | {ifaddr,IP} | {port,Port} | sctp_option(),
+              IP :: ip_address() | any | loopback,
+              Port :: port_number(),
+              Socket :: sctp_socket().
+
 open(Opts) when is_list(Opts) ->
     Mod = mod(Opts, undefined),
     case Mod:open(Opts) of
@@ -52,11 +98,21 @@ open(Port) when is_integer(Port) ->
 open(X) ->
     erlang:error(badarg, [X]).
 
+-spec open(Port, Opts) -> {ok, Socket} | {error, posix()} when
+      Opts :: [Opt],
+      Opt :: {ip,IP} | {ifaddr,IP} | {port,Port} | sctp_option(),
+      IP :: ip_address() | any | loopback,
+      Port :: port_number(),
+      Socket :: sctp_socket().
+
 open(Port, Opts) when is_integer(Port), is_list(Opts) ->
     open([{port,Port}|Opts]);
 open(Port, Opts) ->
     erlang:error(badarg, [Port,Opts]).
 
+-spec close(Socket) -> ok | {error, posix()} when
+      Socket :: sctp_socket().
+
 close(S) when is_port(S) ->
     case inet_db:lookup_socket(S) of
 	{ok,Mod} ->
@@ -68,6 +124,11 @@ close(S) ->
 
 
 
+-spec listen(Socket, IsServer) -> ok | {error, Reason} when
+      Socket :: sctp_socket(),
+      IsServer :: boolean(),
+      Reason :: term().
+
 listen(S, Flag) when is_port(S), is_boolean(Flag) ->
     case inet_db:lookup_socket(S) of
 	{ok,Mod} ->
@@ -77,9 +138,25 @@ listen(S, Flag) when is_port(S), is_boolean(Flag) ->
 listen(S, Flag) ->
     erlang:error(badarg, [S,Flag]).
 
+-spec connect(Socket, Addr, Port, Opts) -> {ok, Assoc} | {error, posix()} when
+      Socket :: sctp_socket(),
+      Addr :: ip_address() | hostname(),
+      Port :: port_number(),
+      Opts :: [Opt :: sctp_option()],
+      Assoc :: #sctp_assoc_change{}.
+
 connect(S, Addr, Port, Opts) ->
     connect(S, Addr, Port, Opts, infinity).
 
+-spec connect(Socket, Addr, Port, Opts, Timeout) ->
+                     {ok, Assoc} | {error, posix()} when
+      Socket :: sctp_socket(),
+      Addr :: ip_address() | hostname(),
+      Port :: port_number(),
+      Opts :: [Opt :: sctp_option()],
+      Timeout :: timeout(),
+      Assoc :: #sctp_assoc_change{}.
+
 connect(S, Addr, Port, Opts, Timeout) ->
     case do_connect(S, Addr, Port, Opts, Timeout, true) of
 	badarg ->
@@ -88,9 +165,24 @@ connect(S, Addr, Port, Opts, Timeout) ->
 	    Result
     end.
 
+-spec connect_init(Socket, Addr, Port, Opts) ->
+                          ok | {error, posix()} when
+      Socket :: sctp_socket(),
+      Addr :: ip_address() | hostname(),
+      Port :: port_number(),
+      Opts :: [sctp_option()].
+
 connect_init(S, Addr, Port, Opts) ->
     connect_init(S, Addr, Port, Opts, infinity).
 
+-spec connect_init(Socket, Addr, Port, Opts, Timeout) ->
+                          ok | {error, posix()} when
+      Socket :: sctp_socket(),
+      Addr :: ip_address() | hostname(),
+      Port :: port_number(),
+      Opts :: [sctp_option()],
+      Timeout :: timeout().
+
 connect_init(S, Addr, Port, Opts, Timeout) ->
     case do_connect(S, Addr, Port, Opts, Timeout, false) of
 	badarg ->
@@ -130,12 +222,20 @@ do_connect(_S, _Addr, _Port, _Opts, _Timeout, _ConnWait) ->
     badarg.
 
 
+-spec eof(Socket, Assoc) -> ok | {error, Reason} when
+      Socket :: sctp_socket(),
+      Assoc :: #sctp_assoc_change{},
+      Reason :: term().
 
 eof(S, #sctp_assoc_change{assoc_id=AssocId}) when is_port(S) ->
     eof_or_abort(S, AssocId, eof);
 eof(S, Assoc) ->
     erlang:error(badarg, [S,Assoc]).
 
+-spec abort(Socket, Assoc) -> ok | {error, posix()} when
+      Socket :: sctp_socket(),
+      Assoc :: #sctp_assoc_change{}.
+
 abort(S, #sctp_assoc_change{assoc_id=AssocId}) when is_port(S) ->
     eof_or_abort(S, AssocId, abort);
 abort(S, Assoc) ->
@@ -151,6 +251,11 @@ eof_or_abort(S, AssocId, Action) ->
     end.
 
 
+-spec send(Socket, SndRcvInfo, Data) -> ok | {error, Reason} when
+      Socket :: sctp_socket(),
+      SndRcvInfo :: #sctp_sndrcvinfo{},
+      Data :: binary | iolist(),
+      Reason :: term().
 
 %% Full-featured send. Rarely needed.
 send(S, #sctp_sndrcvinfo{}=SRI, Data) when is_port(S) ->
@@ -162,6 +267,13 @@ send(S, #sctp_sndrcvinfo{}=SRI, Data) when is_port(S) ->
 send(S, SRI, Data) ->
     erlang:error(badarg, [S,SRI,Data]).
 
+-spec send(Socket, Assoc, Stream, Data) -> ok | {error, Reason} when
+      Socket :: sctp_socket(),
+      Assoc :: #sctp_assoc_change{} | assoc_id(),
+      Stream :: integer(),
+      Data :: binary | iolist(),
+      Reason :: term().
+
 send(S, #sctp_assoc_change{assoc_id=AssocId}, Stream, Data)
   when is_port(S), is_integer(Stream) ->
     case inet_db:lookup_socket(S) of
@@ -179,9 +291,36 @@ send(S, AssocId, Stream, Data)
 send(S, AssocChange, Stream, Data) ->
     erlang:error(badarg, [S,AssocChange,Stream,Data]).
 
+-spec recv(Socket) -> {ok, {FromIP, FromPort, AncData, Data}}
+                          | {error, Reason} when
+      Socket :: sctp_socket(),
+      FromIP   :: ip_address(),
+      FromPort :: port_number(),
+      AncData  :: [#sctp_sndrcvinfo{}],
+      Data     :: binary() | string() | #sctp_sndrcvinfo{}
+                | #sctp_assoc_change{} | #sctp_paddr_change{}
+                | #sctp_adaptation_event{},
+      Reason   :: posix() | #sctp_send_failed{} | #sctp_paddr_change{}
+                | #sctp_pdapi_event{} | #sctp_remote_error{}
+                | #sctp_shutdown_event{}.
+
 recv(S) ->
     recv(S, infinity).
 
+-spec recv(Socket, Timeout) -> {ok, {FromIP, FromPort, AncData, Data}}
+                                   | {error, Reason} when
+      Socket :: sctp_socket(),
+      Timeout :: timeout(),
+      FromIP   :: ip_address(),
+      FromPort :: port_number(),
+      AncData  :: [#sctp_sndrcvinfo{}],
+      Data     :: binary() | string() | #sctp_sndrcvinfo{}
+                | #sctp_assoc_change{} | #sctp_paddr_change{}
+                | #sctp_adaptation_event{},
+      Reason   :: posix() | #sctp_send_failed{} | #sctp_paddr_change{}
+                | #sctp_pdapi_event{} | #sctp_remote_error{}
+                | #sctp_shutdown_event{}.
+
 recv(S, Timeout) when is_port(S) ->
     case inet_db:lookup_socket(S) of
 	{ok,Mod} ->
@@ -192,6 +331,8 @@ recv(S, Timeout) ->
     erlang:error(badarg, [S,Timeout]).
 
 
+-spec error_string(ErrorNumber) -> ok | string() | unknown_error when
+      ErrorNumber :: integer().
 
 error_string(0) ->
     ok;
@@ -224,6 +365,9 @@ error_string(X) ->
     erlang:error(badarg, [X]).
 
 
+-spec controlling_process(Socket, Pid) -> ok when
+      Socket :: sctp_socket(),
+      Pid :: pid().
 
 controlling_process(S, Pid) when is_port(S), is_pid(Pid) ->
     inet:udp_controlling_process(S, Pid);
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index 16a87d71b6..bee61ca84a 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -28,12 +28,35 @@
 
 -include("inet_int.hrl").
 
+-type hostname() :: inet:hostname().
+-type ip_address() :: inet:ip_address().
+-type port_number() :: 0..65535.
+-type posix() :: inet:posix().
+-type socket() :: port().
+
 %%
 %% Connect a socket
 %%
+
+-spec connect(Address, Port, Options) -> {ok, Socket} | {error, Reason} when
+      Address :: ip_address() | hostname(),
+      Port :: port_number(),
+      Options :: [Opt :: term()],
+      Socket :: socket(),
+      Reason :: posix().
+
 connect(Address, Port, Opts) -> 
     connect(Address,Port,Opts,infinity).
 
+-spec connect(Address, Port, Options, Timeout) ->
+                     {ok, Socket} | {error, Reason} when
+      Address :: ip_address() | hostname(),
+      Port :: port_number(),
+      Options :: [Opt :: term()],
+      Timeout :: timeout(),
+      Socket :: socket(),
+      Reason :: posix().
+
 connect(Address, Port, Opts, Time) ->
     Timer = inet:start_timer(Time),
     Res = (catch connect1(Address,Port,Opts,Timer)),
@@ -72,6 +95,13 @@ try_connect([], _Port, _Opts, _Timer, _Mod, Err) ->
 %%
 %% Listen on a tcp port
 %%
+
+-spec listen(Port, Options) -> {ok, ListenSocket} | {error, Reason} when
+      Port :: port_number(),
+      Options :: [Opt :: term()],
+      ListenSocket :: socket(),
+      Reason :: posix().
+
 listen(Port, Opts) ->
     Mod = mod(Opts, undefined),
     case Mod:getserv(Port) of
@@ -85,6 +115,12 @@ listen(Port, Opts) ->
 %%
 %% Generic tcp accept
 %%
+
+-spec accept(ListenSocket) -> {ok, Socket} | {error, Reason} when
+      ListenSocket :: socket(),
+      Socket :: socket(),
+      Reason :: closed | timeout | posix().
+
 accept(S) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
@@ -93,6 +129,12 @@ accept(S) ->
 	    Error
     end.
 
+-spec accept(ListenSocket, Timeout) -> {ok, Socket} | {error, Reason} when
+      ListenSocket :: socket(),
+      Timeout :: timeout(),
+      Socket :: socket(),
+      Reason :: closed | timeout | posix().
+
 accept(S, Time) when is_port(S) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
@@ -104,6 +146,12 @@ accept(S, Time) when is_port(S) ->
 %%
 %% Generic tcp shutdown
 %%
+
+-spec shutdown(Socket, How) -> ok | {error, Reason} when
+      Socket :: socket(),
+      How :: read | write | read_write,
+      Reason :: posix().
+
 shutdown(S, How) when is_port(S) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
@@ -115,12 +163,22 @@ shutdown(S, How) when is_port(S) ->
 %%
 %% Close
 %%
+
+-spec close(Socket) -> ok when
+      Socket :: socket().
+
 close(S) ->
     inet:tcp_close(S).
 
 %%
 %% Send
 %%
+
+-spec send(Socket, Packet) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Packet :: string() | binary(),
+      Reason :: posix().
+
 send(S, Packet) when is_port(S) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
@@ -132,6 +190,14 @@ send(S, Packet) when is_port(S) ->
 %%
 %% Receive data from a socket (passive mode)
 %%
+
+-spec recv(Socket, Length) -> {ok, Packet} | {error, Reason} when
+      Socket :: socket(),
+      Length :: non_neg_integer(),
+      Packet :: string() | binary() | HttpPacket,
+      Reason :: closed | posix(),
+      HttpPacket :: term().
+
 recv(S, Length) when is_port(S) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
@@ -140,6 +206,14 @@ recv(S, Length) when is_port(S) ->
 	    Error
     end.
 
+-spec recv(Socket, Length, Timeout) -> {ok, Packet} | {error, Reason} when
+      Socket :: socket(),
+      Length :: non_neg_integer(),
+      Timeout :: timeout(),
+      Packet :: string() | binary() | HttpPacket,
+      Reason :: closed | posix(),
+      HttpPacket :: term().
+
 recv(S, Length, Time) when is_port(S) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
@@ -159,6 +233,12 @@ unrecv(S, Data) when is_port(S) ->
 %%
 %% Set controlling process
 %%
+
+-spec controlling_process(Socket, Pid) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Pid :: pid(),
+      Reason :: closed | not_owner | posix().
+
 controlling_process(S, NewOwner) ->
     case inet_db:lookup_socket(S) of
 	{ok, _Mod} -> % Just check that this is an open socket
diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl
index 99020c7b6c..7d14615c04 100644
--- a/lib/kernel/src/gen_udp.erl
+++ b/lib/kernel/src/gen_udp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -25,17 +25,44 @@
 
 -include("inet_int.hrl").
 
+-type hostname() :: inet:hostname().
+-type ip_address() :: inet:ip_address().
+-type port_number() :: 0..65535.
+-type posix() :: inet:posix().
+-type socket() :: port().
+
+-spec open(Port) -> {ok, Socket} | {error, Reason} when
+      Port :: port_number(),
+      Socket :: socket(),
+      Reason :: posix().
+
 open(Port) -> 
     open(Port, []).
 
+-spec open(Port, Opts) -> {ok, Socket} | {error, Reason} when
+      Port :: port_number(),
+      Opts :: [Opt :: term()],
+      Socket :: socket(),
+      Reason :: posix().
+
 open(Port, Opts) ->
     Mod = mod(Opts, undefined),
     {ok,UP} = Mod:getserv(Port),
     Mod:open(UP, Opts).
 
+-spec close(Socket) -> ok when
+      Socket :: socket().
+
 close(S) ->
     inet:udp_close(S).
 
+-spec send(Socket, Address, Port, Packet) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Address :: ip_address() | hostname(),
+      Port :: port_number(),
+      Packet :: string() | binary(),
+      Reason :: not_owner | posix().
+
 send(S, Address, Port, Packet) when is_port(S) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
@@ -61,6 +88,15 @@ send(S, Packet) when is_port(S) ->
 	    Error
     end.
 
+-spec recv(Socket, Length) ->
+                  {ok, {Address, Port, Packet}} | {error, Reason} when
+      Socket :: socket(),
+      Length :: non_neg_integer(),
+      Address :: ip_address(),
+      Port :: port_number(),
+      Packet :: string() | binary(),
+      Reason :: not_owner | posix().
+
 recv(S,Len) when is_port(S), is_integer(Len) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
@@ -69,6 +105,16 @@ recv(S,Len) when is_port(S), is_integer(Len) ->
 	    Error
     end.
 
+-spec recv(Socket, Length, Timeout) ->
+                  {ok, {Address, Port, Packet}} | {error, Reason} when
+      Socket :: socket(),
+      Length :: non_neg_integer(),
+      Timeout :: timeout(),
+      Address :: ip_address(),
+      Port :: port_number(),
+      Packet :: string() | binary(),
+      Reason :: not_owner | posix().
+
 recv(S,Len,Time) when is_port(S) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
@@ -90,6 +136,10 @@ connect(S, Address, Port) when is_port(S) ->
 	    Error
     end.
 
+-spec controlling_process(Socket, Pid) -> ok when
+      Socket :: socket(),
+      Pid :: pid().
+
 controlling_process(S, NewOwner) ->
     inet:udp_controlling_process(S, NewOwner).
 
diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl
index 6343acd000..7d15f8bf83 100644
--- a/lib/kernel/src/global.erl
+++ b/lib/kernel/src/global.erl
@@ -166,7 +166,7 @@ start_link() ->
 stop() -> 
     gen_server:call(global_name_server, stop, infinity).
 
--spec sync() -> 'ok' | {'error', term()}.
+-spec sync() -> 'ok' | {'error', Reason :: term()}.
 sync() ->
     case check_sync_nodes() of
 	{error, _} = Error ->
@@ -175,7 +175,7 @@ sync() ->
 	    gen_server:call(global_name_server, {sync, SyncNodes}, infinity)
     end.
 
--spec sync([node()]) -> 'ok' | {'error', term()}.
+-spec sync([node()]) -> 'ok' | {'error', Reason :: term()}.
 sync(Nodes) ->
     case check_sync_nodes(Nodes) of
 	{error, _} = Error ->
@@ -184,7 +184,10 @@ sync(Nodes) ->
 	    gen_server:call(global_name_server, {sync, SyncNodes}, infinity)
     end.
 
--spec send(term(), term()) -> pid().
+-spec send(Name, Msg) -> Pid when
+      Name :: term(),
+      Msg :: term(),
+      Pid :: pid().
 send(Name, Msg) ->
     case whereis_name(Name) of
 	Pid when is_pid(Pid) ->
@@ -195,7 +198,8 @@ send(Name, Msg) ->
     end.
 
 %% See OTP-3737.
--spec whereis_name(term()) -> pid() | 'undefined'.
+-spec whereis_name(Name) -> pid() | 'undefined' when
+      Name :: term().
 whereis_name(Name) ->
     where(Name).
 
@@ -219,13 +223,19 @@ node_disconnected(Node) ->
 %% undefined which one of them is used.
 %% Method blocks the name registration, but does not affect global locking.
 %%-----------------------------------------------------------------
--spec register_name(term(), pid()) -> 'yes' | 'no'.
+-spec register_name(Name, Pid) -> 'yes' | 'no' when
+      Name :: term(),
+      Pid :: pid().
 register_name(Name, Pid) when is_pid(Pid) ->
     register_name(Name, Pid, fun random_exit_name/3).
 
--type method() :: fun((term(), pid(), pid()) -> pid() | 'none').
+-type method() :: fun((Name :: term(), Pid :: pid(), Pid2 :: pid()) ->
+                             pid() | 'none').
 
--spec register_name(term(), pid(), method()) -> 'yes' | 'no'.
+-spec register_name(Name, Pid, Resolve) -> 'yes' | 'no' when
+      Name :: term(),
+      Pid :: pid(),
+      Resolve :: method().
 register_name(Name, Pid, Method) when is_pid(Pid) ->
     Fun = fun(Nodes) ->
         case (where(Name) =:= undefined) andalso check_dupname(Name, Pid) of
@@ -257,7 +267,8 @@ check_dupname(Name, Pid) ->
             end
     end.
 
--spec unregister_name(term()) -> _.
+-spec unregister_name(Name) -> _ when
+      Name :: term().
 unregister_name(Name) ->
     case where(Name) of
 	undefined ->
@@ -273,11 +284,16 @@ unregister_name(Name) ->
             gen_server:call(global_name_server, {registrar, Fun}, infinity)
     end.
 
--spec re_register_name(term(), pid()) -> _.
+-spec re_register_name(Name, Pid) -> _ when
+      Name :: term(),
+      Pid :: pid().
 re_register_name(Name, Pid) when is_pid(Pid) ->
     re_register_name(Name, Pid, fun random_exit_name/3).
 
--spec re_register_name(term(), pid(), method()) -> _.
+-spec re_register_name(Name, Pid, Resolve) -> _ when
+      Name :: term(),
+      Pid :: pid(),
+      Resolve :: method().
 re_register_name(Name, Pid, Method) when is_pid(Pid) ->
     Fun = fun(Nodes) ->
 		  gen_server:multi_call(Nodes,
@@ -288,7 +304,8 @@ re_register_name(Name, Pid, Method) when is_pid(Pid) ->
     ?trace({re_register_name, self(), Name, Pid, Method}),
     gen_server:call(global_name_server, {registrar, Fun}, infinity).
 
--spec registered_names() -> [term()].
+-spec registered_names() -> [Name] when
+      Name :: term().
 registered_names() ->
     MS = ets:fun2ms(fun({Name,_Pid,_M,_RP,_R}) -> Name end),
     ets:select(global_names, MS).
@@ -329,19 +346,25 @@ register_name_external(Name, Pid, Method) when is_pid(Pid) ->
 unregister_name_external(Name) ->
     unregister_name(Name).
 
--type id() :: {term(), term()}.
+-type id() :: {ResourceId :: term(), LockRequesterId :: term()}.
 
--spec set_lock(id()) -> boolean().
+-spec set_lock(Id) -> boolean() when
+      Id :: id().
 set_lock(Id) ->
     set_lock(Id, [node() | nodes()], infinity, 1).
 
 -type retries() :: non_neg_integer() | 'infinity'.
 
--spec set_lock(id(), [node()]) -> boolean().
+-spec set_lock(Id, Nodes) -> boolean() when
+      Id :: id(),
+      Nodes :: [node()].
 set_lock(Id, Nodes) ->
     set_lock(Id, Nodes, infinity, 1).
 
--spec set_lock(id(), [node()], retries()) -> boolean().
+-spec set_lock(Id, Nodes, Retries) -> boolean() when
+      Id :: id(),
+      Nodes :: [node()],
+      Retries :: retries().
 set_lock(Id, Nodes, Retries) when is_integer(Retries), Retries >= 0 ->
     set_lock(Id, Nodes, Retries, 1);
 set_lock(Id, Nodes, infinity) ->
@@ -363,11 +386,14 @@ set_lock({_ResourceId, _LockRequesterId} = Id, Nodes, Retries, Times) ->
 	    set_lock(Id, Nodes, dec(Retries), Times+1)
     end.
 
--spec del_lock(id()) -> 'true'.
+-spec del_lock(Id) -> 'true' when
+      Id :: id().
 del_lock(Id) ->
     del_lock(Id, [node() | nodes()]).
 
--spec del_lock(id(), [node()]) -> 'true'.
+-spec del_lock(Id, Nodes) -> 'true' when
+      Id :: id(),
+      Nodes :: [node()].
 del_lock({_ResourceId, _LockRequesterId} = Id, Nodes) ->
     ?trace({del_lock, {me,self()}, Id, {nodes,Nodes}}),
     gen_server:multi_call(Nodes, global_name_server, {del_lock, Id}),
@@ -375,13 +401,25 @@ del_lock({_ResourceId, _LockRequesterId} = Id, Nodes) ->
 
 -type trans_fun() :: function() | {module(), atom()}.
 
--spec trans(id(), trans_fun()) -> term().
+-spec trans(Id, Fun) -> Res | aborted when
+      Id :: id(),
+      Fun :: trans_fun(),
+      Res :: term().
 trans(Id, Fun) -> trans(Id, Fun, [node() | nodes()], infinity).
 
--spec trans(id(), trans_fun(), [node()]) -> term().
+-spec trans(Id, Fun, Nodes) -> Res | aborted when
+      Id :: id(),
+      Fun :: trans_fun(),
+      Nodes :: [node()],
+      Res :: term().
 trans(Id, Fun, Nodes) -> trans(Id, Fun, Nodes, infinity).
 
--spec trans(id(), trans_fun(), [node()], retries()) -> term().
+-spec trans(Id, Fun, Nodes, Retries) -> Res | aborted when
+      Id :: id(),
+      Fun :: trans_fun(),
+      Nodes :: [node()],
+      Retries :: retries(),
+      Res :: term().
 trans(Id, Fun, Nodes, Retries) ->
     case set_lock(Id, Nodes, Retries) of
 	true ->
@@ -1928,7 +1966,10 @@ resolve_it(Method, Name, Pid1, Pid2) ->
 minmax(P1,P2) ->
     if node(P1) < node(P2) -> {P1, P2}; true -> {P2, P1} end.
 
--spec random_exit_name(term(), pid(), pid()) -> pid().
+-spec random_exit_name(Name, Pid1, Pid2) -> 'none' when
+      Name :: term(),
+      Pid1 :: pid(),
+      Pid2 :: pid().
 random_exit_name(Name, Pid, Pid2) ->
     {Min, Max} = minmax(Pid, Pid2),
     error_logger:info_msg("global: Name conflict terminating ~w\n",
@@ -1936,12 +1977,19 @@ random_exit_name(Name, Pid, Pid2) ->
     exit(Max, kill),
     Min.
 
+-spec random_notify_name(Name, Pid1, Pid2) -> 'none' when
+      Name :: term(),
+      Pid1 :: pid(),
+      Pid2 :: pid().
 random_notify_name(Name, Pid, Pid2) ->
     {Min, Max} = minmax(Pid, Pid2),
     Max ! {global_name_conflict, Name},
     Min.
 
--spec notify_all_name(term(), pid(), pid()) -> 'none'.
+-spec notify_all_name(Name, Pid1, Pid2) -> 'none' when
+      Name :: term(),
+      Pid1 :: pid(),
+      Pid2 :: pid().
 notify_all_name(Name, Pid, Pid2) ->
     Pid ! {global_name_conflict, Name, Pid2},
     Pid2 ! {global_name_conflict, Name, Pid},
diff --git a/lib/kernel/src/global_group.erl b/lib/kernel/src/global_group.erl
index 7e141ac5c7..025a9b8a5b 100644
--- a/lib/kernel/src/global_group.erl
+++ b/lib/kernel/src/global_group.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. 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
@@ -62,9 +62,10 @@
 -type sync_state()   :: 'no_conf' | 'synced'.
 
 -type group_name()  :: atom().
--type group_tuple() :: {group_name(), [node()]}
-                     | {group_name(), publish_type(), [node()]}.
-
+-type group_tuple() :: {GroupName :: group_name(), [node()]}
+                     | {GroupName :: group_name(),
+                        PublishType :: publish_type(),
+                        [node()]}.
 
 %%%====================================================================================
 %%% The state of the global_group process
@@ -97,11 +98,14 @@
 %%% External exported
 %%%====================================================================================
 
--spec global_groups() -> {group_name(), [group_name()]} | 'undefined'.
+-spec global_groups() -> {GroupName, GroupNames} | undefined when
+      GroupName :: group_name(),
+      GroupNames :: [GroupName].
 global_groups() ->
     request(global_groups).
 
--spec monitor_nodes(boolean()) -> 'ok'.
+-spec monitor_nodes(Flag) -> 'ok' when
+      Flag :: boolean().
 monitor_nodes(Flag) -> 
     case Flag of
 	true -> request({monitor_nodes, Flag});
@@ -109,30 +113,41 @@ monitor_nodes(Flag) ->
 	_ -> {error, not_boolean}
     end.
 
--spec own_nodes() -> [node()].
+-spec own_nodes() -> Nodes when
+      Nodes :: [Node :: node()].
 own_nodes() ->
     request(own_nodes).
 
 -type name()  :: atom().
 -type where() :: {'node', node()} | {'group', group_name()}.
 
--spec registered_names(where()) -> [name()].
+-spec registered_names(Where) -> Names when
+      Where :: where(),
+      Names :: [Name :: name()].
 registered_names(Arg) ->
     request({registered_names, Arg}).
 
--spec send(name(), term()) -> pid() | {'badarg', {name(), term()}}.
+-spec send(Name, Msg) -> pid() | {'badarg', {Name, Msg}} when
+      Name :: name(),
+      Msg :: term().
 send(Name, Msg) ->
     request({send, Name, Msg}).
 
--spec send(where(), name(), term()) -> pid() | {'badarg', {name(), term()}}.
+-spec send(Where, Name, Msg) -> pid() | {'badarg', {Name, Msg}} when
+      Where :: where(),
+      Name :: name(),
+      Msg :: term().
 send(Group, Name, Msg) ->
     request({send, Group, Name, Msg}).
 
--spec whereis_name(name()) -> pid() | 'undefined'.
+-spec whereis_name(Name) -> pid() | 'undefined' when
+      Name :: name().
 whereis_name(Name) ->
     request({whereis_name, Name}).
 
--spec whereis_name(where(), name()) -> pid() | 'undefined'.
+-spec whereis_name(Where, Name) -> pid() | 'undefined' when
+      Where :: where(),
+      Name :: name().
 whereis_name(Group, Name) ->
     request({whereis_name, Group, Name}).
 
@@ -155,14 +170,14 @@ ng_add_check(Node, OthersNG) ->
 ng_add_check(Node, PubType, OthersNG) ->
     request({ng_add_check, Node, PubType, OthersNG}).
 
--type info_item() :: {'state', sync_state()}
-                   | {'own_group_name', group_name()}
-                   | {'own_group_nodes', [node()]}
-                   | {'synched_nodes', [node()]}
-                   | {'sync_error', [node()]}
-                   | {'no_contact', [node()]}
-                   | {'other_groups', [group_tuple()]}
-                   | {'monitoring', [pid()]}.
+-type info_item() :: {'state', State :: sync_state()}
+                   | {'own_group_name', GroupName :: group_name()}
+                   | {'own_group_nodes', Nodes :: [node()]}
+                   | {'synched_nodes', Nodes :: [node()]}
+                   | {'sync_error', Nodes :: [node()]}
+                   | {'no_contact', Nodes :: [node()]}
+                   | {'other_groups', Groups :: [group_tuple()]}
+                   | {'monitoring', Pids :: [pid()]}.
 
 -spec info() -> [info_item()].
 info() ->
@@ -1012,6 +1027,7 @@ grp_tuple({Name, normal, Nodes}) ->
 %%% The special process which checks that all nodes in the own global group
 %%% agrees on the configuration.
 %%%====================================================================================
+-spec sync_init(_, _, _, _) -> no_return().
 sync_init(Type, Cname, PubType, Nodes) ->
     {Up, Down} = sync_check_node(lists:delete(node(), Nodes), [], []),
     sync_check_init(Type, Up, Cname, Nodes, Down, PubType).
@@ -1032,9 +1048,11 @@ sync_check_node([Node|Nodes], Up, Down) ->
 %%% Check that all nodes are in agreement of the global
 %%% group configuration.
 %%%-------------------------------------------------------------
+-spec sync_check_init(_, _, _, _, _, _) -> no_return().
 sync_check_init(Type, Up, Cname, Nodes, Down, PubType) ->
     sync_check_init(Type, Up, Cname, Nodes, 3, [], Down, PubType).
 
+-spec sync_check_init(_, _, _, _, _, _, _, _) -> no_return().
 sync_check_init(_Type, NoContact, _Cname, _Nodes, 0, ErrorNodes, Down, _PubType) ->
     case ErrorNodes of
 	[] -> 
diff --git a/lib/kernel/src/global_search.erl b/lib/kernel/src/global_search.erl
index b723e18a1b..0bf53e29b8 100644
--- a/lib/kernel/src/global_search.erl
+++ b/lib/kernel/src/global_search.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. 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
@@ -69,6 +69,7 @@ start(Flag, Arg) ->
 %%%====================================================================================
 %%%====================================================================================
 
+-spec init_send(_) -> no_return().
 init_send({any, NodesList, Name, Msg, From}) ->
     case whereis_any_loop(NodesList, Name) of
 	undefined ->
@@ -115,6 +116,7 @@ init_send({node, Node, Name, Msg, From}) ->
 %%%====================================================================================
 %%%====================================================================================
 
+-spec init_whereis(_) -> no_return().
 init_whereis({any, NodesList, Name, From}) ->
     R = whereis_any_loop(NodesList, Name),
     gen_server:cast(global_group, {find_name_res, R, self(), From}),
@@ -146,6 +148,7 @@ init_whereis({node, Node, Name, From}) ->
 %%%====================================================================================
 %%%====================================================================================
 %%%====================================================================================
+-spec init_names(_) -> no_return().
 init_names({group, Nodes, From}) ->
     case names_group_loop(Nodes) of
 	group_down ->
diff --git a/lib/kernel/src/heart.erl b/lib/kernel/src/heart.erl
index e78acfc7a6..255ae4e51b 100644
--- a/lib/kernel/src/heart.erl
+++ b/lib/kernel/src/heart.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -85,19 +85,21 @@ init(Starter, Parent) ->
 	    Starter ! {start_error, self()}
     end.
 
--spec set_cmd(string()) -> 'ok' | {'error', {'bad_cmd', string()}}.
+-spec set_cmd(Cmd) -> 'ok' | {'error', {'bad_cmd', Cmd}} when
+      Cmd :: string().
 
 set_cmd(Cmd) ->
     heart ! {self(), set_cmd, Cmd},
     wait().
 
--spec get_cmd() -> 'ok'.
+-spec get_cmd() -> {ok, Cmd} when
+      Cmd :: string().
 
 get_cmd() ->
     heart ! {self(), get_cmd},
     wait().
 
--spec clear_cmd() -> {'ok', string()}.
+-spec clear_cmd() -> ok.
 
 clear_cmd() ->
     heart ! {self(), clear_cmd},
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 327e0f93f1..5649188c38 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -63,7 +63,8 @@
 %% timer interface
 -export([start_timer/1, timeout/1, timeout/2, stop_timer/1]).
 
--export_type([ip_address/0, socket/0]).
+-export_type([family_option/0, hostent/0, hostname/0, ip4_address/0,
+              ip6_address/0, ip_address/0, posix/0, socket/0]).
 
 %% imports
 -import(lists, [append/1, duplicate/2, filter/2, foldl/3]).
@@ -79,8 +80,16 @@
 %%% ---------------------------------
 %%% Contract type definitions
 
+
+-type hostent() :: #hostent{}.
+-type hostname() :: atom() | string().
+-type ip4_address() :: {0..255,0..255,0..255,0..255}.
+-type ip6_address() :: {0..65535,0..65535,0..65535,0..65535,
+			0..65535,0..65535,0..65535,0..65535}.
+-type ip_address() :: ip4_address() | ip6_address().
+-type ip_port() :: 0..65535.
+-type posix() :: exbadport | exbadseq | file:posix().
 -type socket() :: port().
--type posix() :: atom().
 
 -type socket_setopt() ::
       {'raw', non_neg_integer(), non_neg_integer(), binary()} |
@@ -106,7 +115,7 @@
       {'packet',        
        0 | 1 | 2 | 4 | 'raw' | 'sunrm' |  'asn1' |
        'cdr' | 'fcgi' | 'line' | 'tpkt' | 'http' | 'httph' | 'http_bin' | 'httph_bin' } |
-      {'mode',           list() | binary()} |
+      {'mode',           'list' | 'binary'} |
       {'port',           'port', 'term'} |
       {'exit_on_close',   boolean()} |
       {'low_watermark',   non_neg_integer()} |
@@ -195,12 +204,13 @@
 
 %%% ---------------------------------
 
--spec get_rc() -> [{any(),any()}].
+-spec get_rc() -> [{Par :: any(), Val :: any()}].
 
 get_rc() ->
     inet_db:get_rc().
 
--spec close(Socket :: socket()) -> 'ok'.
+-spec close(Socket) -> 'ok' when
+      Socket :: socket().
 
 close(Socket) ->
     prim_inet:close(Socket),
@@ -211,8 +221,10 @@ close(Socket) ->
 	    ok
     end.
 
--spec peername(Socket :: socket()) -> 
-	{'ok', {ip_address(), non_neg_integer()}} | {'error', posix()}.
+-spec peername(Socket) ->  {ok, {Address, Port}} | {error, posix()} when
+      Socket :: socket(),
+      Address :: ip_address(),
+      Port :: non_neg_integer().
 
 peername(Socket) -> 
     prim_inet:peername(Socket).
@@ -226,8 +238,10 @@ setpeername(Socket, undefined) ->
     prim_inet:setpeername(Socket, undefined).
 
 
--spec sockname(Socket :: socket()) -> 
-	{'ok', {ip_address(), non_neg_integer()}} | {'error', posix()}.
+-spec sockname(Socket) -> {ok, {Address, Port}} | {error, posix()} when
+      Socket :: socket(),
+      Address :: ip_address(),
+      Port :: non_neg_integer().
 
 sockname(Socket) -> 
     prim_inet:sockname(Socket).
@@ -260,8 +274,10 @@ send(Socket, Packet) ->
 setopts(Socket, Opts) -> 
     prim_inet:setopts(Socket, Opts).
 
--spec getopts(Socket :: socket(), Opts :: [socket_getopt()]) ->	
-	{'ok', [socket_setopt()]} | {'error', posix()}.
+-spec getopts(Socket, Options) ->
+	{'ok', [socket_setopt()]} | {'error', posix()} when
+      Socket :: socket(),
+      Options :: [socket_getopt()].
 
 getopts(Socket, Opts) ->
     prim_inet:getopts(Socket, Opts).
@@ -272,7 +288,19 @@ getopts(Socket, Opts) ->
 getifaddrs(Socket) ->
     prim_inet:getifaddrs(Socket).
 
--spec getifaddrs() -> {'ok', [string()]} | {'error', posix()}.
+-spec getifaddrs() -> {ok, Iflist} | {error, posix()} when
+      Iflist :: [{Ifname,[Ifopt]}],
+      Ifname :: string(),
+      Ifopt :: {flag,[Flag]} | {addr,Addr} | {netmask,Netmask}
+             | {broadaddr,Broadaddr} | {dstaddr,Dstaddr}
+             | {hwaddr,Hwaddr},
+      Flag :: up | broadcast | loopback | pointtopoint
+            | running | multicast,
+      Addr :: ip_address(),
+      Netmask :: ip_address(),
+      Broadaddr :: ip_address(),
+      Dstaddr :: ip_address(),
+      Hwaddr :: [byte()].
 
 getifaddrs() ->
     withsocket(fun(S) -> prim_inet:getifaddrs(S) end).
@@ -371,7 +399,8 @@ popf(_Socket) ->
 % use of the DHCP-protocol
 % should never fail
 
--spec gethostname() -> {'ok', string()}.
+-spec gethostname() -> {'ok', Hostname} when
+      Hostname :: string().
 
 gethostname() ->
     case inet_udp:open(0,[]) of
@@ -402,19 +431,23 @@ getstat(Socket) ->
 getstat(Socket,What) ->
     prim_inet:getstat(Socket, What).
 
--spec gethostbyname(Name :: string() | atom()) ->
-	{'ok', #hostent{}} | {'error', posix()}.
+-spec gethostbyname(Hostname) -> {ok, Hostent} | {error, posix()} when
+      Hostname :: hostname(),
+      Hostent :: hostent().
 
 gethostbyname(Name) -> 
     gethostbyname_tm(Name, inet, false).
 
--spec gethostbyname(Name :: string() | atom(), Family :: family_option()) ->
-	{'ok', #hostent{}} | {'error', posix()}.
+-spec gethostbyname(Hostname, Family) ->
+                           {ok, Hostent} | {error, posix()} when
+      Hostname :: hostname(),
+      Family :: family_option(),
+      Hostent :: hostent().
 
 gethostbyname(Name,Family) -> 
     gethostbyname_tm(Name, Family, false).
 
--spec gethostbyname(Name :: string() | atom(),
+-spec gethostbyname(Name :: hostname(),
 	            Family :: family_option(),
 	            Timeout :: non_neg_integer() | 'infinity') ->
 	{'ok', #hostent{}} | {'error', posix()}.
@@ -439,8 +472,9 @@ gethostbyname_tm(Name,Family,Timer) ->
     gethostbyname_tm(Name, Family, Timer, Opts).
 
 
--spec gethostbyaddr(Address :: string() | ip_address()) ->
-	{'ok', #hostent{}} | {'error', posix()}.
+-spec gethostbyaddr(Address) -> {ok, Hostent} | {error, posix()} when
+      Address :: string() | ip_address(),
+      Hostent :: hostent().
 
 gethostbyaddr(Address) ->
     gethostbyaddr_tm(Address, false).
@@ -491,14 +525,15 @@ getfd(Socket) ->
 %% Lookup an ip address
 %%
 
--spec getaddr(Host :: ip_address() | string() | atom(),
-	      Family :: family_option()) ->
-	{'ok', ip_address()} | {'error', posix()}.
+-spec getaddr(Host, Family) -> {ok, Address} | {error, posix()} when
+      Host :: ip_address() | hostname(),
+      Family :: family_option(),
+      Address :: ip_address().
 
 getaddr(Address, Family) ->
     getaddr(Address, Family, infinity).
 
--spec getaddr(Host :: ip_address() | string() | atom(),
+-spec getaddr(Host :: ip_address() | hostname(),
 	      Family :: family_option(),
 	      Timeout :: non_neg_integer() | 'infinity') ->
 	{'ok', ip_address()} | {'error', posix()}.
@@ -515,9 +550,11 @@ getaddr_tm(Address, Family, Timer) ->
 	Error -> Error
     end.
 
--spec getaddrs(Host :: ip_address() | string() | atom(),
-	       Family :: family_option()) ->
-	{'ok', [ip_address()]} | {'error', posix()}.
+-spec getaddrs(Host, Family) ->
+	{ok, Addresses} | {error, posix()} when
+      Host :: ip_address() | hostname(),
+      Family :: family_option(),
+      Addresses :: [ip_address()].
 
 getaddrs(Address, Family) -> 
     getaddrs(Address, Family, infinity).
@@ -1237,7 +1274,8 @@ port_list(Name) ->
 %%  utils
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec format_error(posix()) -> string().
+-spec format_error(Posix) -> string() when
+      Posix :: posix().
 
 format_error(exbadport) -> "invalid port state";
 format_error(exbadseq) ->  "bad command sequence";
diff --git a/lib/kernel/src/inet_res.erl b/lib/kernel/src/inet_res.erl
index de0f23bf24..2276ddcd08 100644
--- a/lib/kernel/src/inet_res.erl
+++ b/lib/kernel/src/inet_res.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -47,18 +47,93 @@
 	    false -> ok
 	end).
 
+-type res_option() ::
+        {alt_nameservers, [nameserver()]}
+      | {edns, 0 | false}
+      | {inet6, boolean()}
+      | {nameservers, [nameserver()]}
+      | {recurse, boolean()}
+      | {retry, integer()}
+      | {timeout, integer()}
+      | {udp_payload_size, integer()}
+      | {usevc, boolean()}.
+
+-type nameserver() :: {inet:ip_address(), Port :: 1..65535}.
+
+-type res_error() :: formerr | qfmterror | servfail | nxdomain |
+                     notimp | refused | badvers | timeout.
+
+-type dns_name() :: string().
+
+-type rr_type() :: a | aaaa | cname | gid | hinfo | ns | mb | md | mg | mf
+                 | minfo | mx | naptr | null | ptr | soa | spf | srv | txt
+                 | uid | uinfo | unspec | wks.
+
+-type dns_class() :: in | chaos | hs | any.
+
+-opaque dns_msg() :: term().
+
+-type dns_data() ::
+        dns_name()
+      | inet:ip4_address()
+      | inet:ip6_address()
+      | {MName :: dns_name(),
+         RName :: dns_name(),
+         Serial :: integer(),
+         Refresh :: integer(),
+         Retry :: integer(),
+         Expiry :: integer(),
+         Minimum :: integer()}
+      | {inet:ip4_address(), Proto :: integer(), BitMap :: binary()}
+      | {CpuString :: string(), OsString :: string()}
+      | {RM :: dns_name(), EM :: dns_name()}
+      | {Prio :: integer(), dns_name()}
+      | {Prio :: integer(),Weight :: integer(),Port :: integer(),dns_name()}
+      | {Order :: integer(),Preference :: integer(),Flags :: string(),
+         Services :: string(),Regexp :: string(), dns_name()}
+      | [string()]
+      | binary().
+
 %% --------------------------------------------------------------------------
 %% resolve:
 %%
 %% Nameserver query
 %%
 
+-spec resolve(Name, Class, Type) -> {ok, dns_msg()} | Error when
+      Name :: dns_name() | inet:ip_address(),
+      Class :: dns_class(),
+      Type :: rr_type(),
+      Error :: {error, Reason} | {error,{Reason,dns_msg()}},
+      Reason :: inet:posix() | res_error().
+
 resolve(Name, Class, Type) ->
     resolve(Name, Class, Type, [], infinity).
 
+-spec resolve(Name, Class, Type, Opts) ->
+                     {ok, dns_msg()} | Error when
+      Name :: dns_name() | inet:ip_address(),
+      Class :: dns_class(),
+      Type :: rr_type(),
+      Opts :: [Opt],
+      Opt :: res_option() | verbose | atom(),
+      Error :: {error, Reason} | {error,{Reason,dns_msg()}},
+      Reason :: inet:posix() | res_error().
+
 resolve(Name, Class, Type, Opts) ->
     resolve(Name, Class, Type, Opts, infinity).
 
+-spec resolve(Name, Class, Type, Opts, Timeout) ->
+                     {ok, dns_msg()} | Error when
+      Name :: dns_name() | inet:ip_address(),
+      Class :: dns_class(),
+      Type :: rr_type(),
+      Opts :: [Opt],
+      Opt :: res_option() | verbose | atom(),
+      Timeout :: timeout(),
+      Error :: {error, Reason} | {error,{Reason,dns_msg()}},
+      Reason :: inet:posix() | res_error().
+
 resolve(Name, Class, Type, Opts, Timeout) ->
     case nsdname(Name) of
 	{ok, Nm} ->
@@ -76,12 +151,30 @@ resolve(Name, Class, Type, Opts, Timeout) ->
 %% Convenience wrapper to resolve/3,4,5 that filters out all answer data
 %% fields of the class and type asked for.
 
+-spec lookup(Name, Class, Type) -> [dns_data()] when
+      Name :: dns_name() | inet:ip_address(),
+      Class :: dns_class(),
+      Type :: rr_type().
+
 lookup(Name, Class, Type) ->
     lookup(Name, Class, Type, []).
 
+-spec lookup(Name, Class, Type, Opts) -> [dns_data()] when
+      Name :: dns_name() | inet:ip_address(),
+      Class :: dns_class(),
+      Type :: rr_type(),
+      Opts :: [res_option() | verbose].
+
 lookup(Name, Class, Type, Opts) ->
     lookup(Name, Class, Type, Opts, infinity).
 
+-spec lookup(Name, Class, Type, Opts, Timeout) -> [dns_data()] when
+      Name :: dns_name() | inet:ip_address(),
+      Class :: dns_class(),
+      Type :: rr_type(),
+      Opts :: [res_option() | verbose],
+      Timeout :: timeout().
+
 lookup(Name, Class, Type, Opts, Timeout) ->
     lookup_filter(resolve(Name, Class, Type, Opts, Timeout),
 		     Class, Type).
@@ -101,17 +194,55 @@ lookup_filter({error,_}, _, _) -> [].
 %%
 %% To be deprecated
 
+-spec nslookup(Name, Class, Type) -> {ok, dns_msg()} | {error, Reason} when
+      Name :: dns_name() | inet:ip_address(),
+      Class :: dns_class(),
+      Type :: rr_type(),
+      Reason :: inet:posix() | res_error().
+
 nslookup(Name, Class, Type) ->
     do_nslookup(Name, Class, Type, [], infinity).
 
+-spec nslookup(Name, Class, Type, Timeout) ->
+                      {ok, dns_msg()} | {error, Reason} when
+                  Name :: dns_name() | inet:ip_address(),
+                  Class :: dns_class(),
+                  Type :: rr_type(),
+                  Timeout :: timeout(),
+                  Reason :: inet:posix() | res_error();
+              (Name, Class, Type, Nameservers) ->
+                      {ok, dns_msg()} | {error, Reason} when
+                  Name :: dns_name() | inet:ip_address(),
+                  Class :: dns_class(),
+                  Type :: rr_type(),
+                  Nameservers :: [nameserver()],
+                  Reason :: inet:posix() | res_error().
+
 nslookup(Name, Class, Type, Timeout) when is_integer(Timeout), Timeout >= 0 ->
     do_nslookup(Name, Class, Type, [], Timeout);
 nslookup(Name, Class, Type, NSs) ->             % For backwards compatibility
     nnslookup(Name, Class, Type, NSs).          % with OTP R6B only
 
+-spec nnslookup(Name, Class, Type, Nameservers) ->
+                      {ok, dns_msg()} | {error, Reason} when
+      Name :: dns_name() | inet:ip_address(),
+      Class :: dns_class(),
+      Type :: rr_type(),
+      Nameservers :: [nameserver()],
+      Reason :: inet:posix().
+
 nnslookup(Name, Class, Type, NSs) ->
     nnslookup(Name, Class, Type, NSs, infinity).
 
+-spec nnslookup(Name, Class, Type, Nameservers, Timeout) ->
+                      {ok, dns_msg()} | {error, Reason} when
+      Name :: dns_name() | inet:ip_address(),
+      Class :: dns_class(),
+      Type :: rr_type(),
+      Timeout :: timeout(),
+      Nameservers :: [nameserver()],
+      Reason :: inet:posix().
+
 nnslookup(Name, Class, Type, NSs, Timeout) ->
     do_nslookup(Name, Class, Type, [{nameservers,NSs}], Timeout).
 
@@ -192,8 +323,19 @@ make_options(Opts, [Name|Names]) ->
 %%
 %% --------------------------------------------------------------------------
 
+-spec gethostbyaddr(Address) -> {ok, Hostent} | {error, Reason} when
+      Address :: inet:ip_address(),
+      Hostent :: inet:hostent(),
+      Reason :: inet:posix() | res_error().
+
 gethostbyaddr(IP) -> gethostbyaddr_tm(IP,false).
 
+-spec gethostbyaddr(Address, Timeout) -> {ok, Hostent} | {error, Reason} when
+      Address :: inet:ip_address(),
+      Timeout :: timeout(),
+      Hostent :: inet:hostent(),
+      Reason :: inet:posix() | res_error().
+
 gethostbyaddr(IP,Timeout) ->
     Timer = inet:start_timer(Timeout),
     Res = gethostbyaddr_tm(IP,Timer),
@@ -249,6 +391,11 @@ res_gethostbyaddr(Addr, IP, Timer) ->
 %% Caches the answer.
 %% --------------------------------------------------------------------------
 
+-spec gethostbyname(Name) -> {ok, Hostent} | {error, Reason} when
+      Name :: dns_name(),
+      Hostent :: inet:hostent(),
+      Reason :: inet:posix() | res_error().
+
 gethostbyname(Name) ->
     case inet_db:res_option(inet6) of
 	true ->
@@ -257,9 +404,23 @@ gethostbyname(Name) ->
 	    gethostbyname_tm(Name, inet, false)
     end.
 
+-spec gethostbyname(Name, Family) -> {ok, Hostent} | {error, Reason} when
+      Name :: dns_name(),
+      Hostent :: inet:hostent(),
+      Family :: inet:family_option(),
+      Reason :: inet:posix() | res_error().
+
 gethostbyname(Name,Family) ->
     gethostbyname_tm(Name,Family,false).
 
+-spec gethostbyname(Name, Family, Timeout) ->
+                           {ok, Hostent} | {error, Reason} when
+      Name :: dns_name(),
+      Hostent :: inet:hostent(),
+      Timeout :: timeout(),
+      Family :: inet:family_option(),
+      Reason :: inet:posix() | res_error().
+
 gethostbyname(Name,Family,Timeout) ->
     Timer = inet:start_timer(Timeout),    
     Res = gethostbyname_tm(Name,Family,Timer),
@@ -298,14 +459,27 @@ gethostbyname_tm(_Name, _Family, _Timer) ->
 %%
 %% getbyname(domain_name(), Type) => {ok, hostent()} | {error, Reason}
 %%
-%% where domain_name() is domain string or atom and Type is ?S_A, ?S_MX ...
+%% where domain_name() is domain string and Type is ?S_A, ?S_MX ...
 %%
 %% Caches the answer.
 %% --------------------------------------------------------------------------
 
+-spec getbyname(Name, Type) -> {ok, Hostent} | {error, Reason} when
+      Name :: dns_name(),
+      Type :: rr_type(),
+      Hostent :: inet:hostent(),
+      Reason :: inet:posix() | res_error().
+
 getbyname(Name, Type) -> 
     getbyname_tm(Name,Type,false).
 
+-spec getbyname(Name, Type, Timeout) -> {ok, Hostent} | {error, Reason} when
+      Name :: dns_name(),
+      Type :: rr_type(),
+      Timeout :: timeout(),
+      Hostent :: inet:hostent(),
+      Reason :: inet:posix() | res_error().
+
 getbyname(Name, Type, Timeout) ->
     Timer = inet:start_timer(Timeout),
     Res = getbyname_tm(Name, Type, Timer),
@@ -539,27 +713,41 @@ udp_send(#sock{inet=I}, {A,B,C,D}=IP, Port, Buffer)
   when ?ip(A,B,C,D), ?port(Port) ->
     gen_udp:send(I, IP, Port, Buffer).
 
-udp_recv(#sock{inet6=I}, {A,B,C,D,E,F,G,H}=IP, Port, Timeout)
+udp_recv(#sock{inet6=I}, {A,B,C,D,E,F,G,H}=IP, Port, Timeout, Decode)
   when ?ip6(A,B,C,D,E,F,G,H), ?port(Port) ->
-    do_udp_recv(fun(T) -> gen_udp:recv(I, 0, T) end, IP, Port, Timeout);
-udp_recv(#sock{inet=I}, {A,B,C,D}=IP, Port, Timeout)
+    do_udp_recv(I, IP, Port, Timeout, Decode, erlang:now(), Timeout);
+udp_recv(#sock{inet=I}, {A,B,C,D}=IP, Port, Timeout, Decode)
   when ?ip(A,B,C,D), ?port(Port) ->
-    do_udp_recv(fun(T) -> gen_udp:recv(I, 0, T) end, IP, Port, Timeout).
-
-do_udp_recv(Recv, IP, Port, Timeout) ->
-    do_udp_recv(Recv, IP, Port, Timeout, 
-		if Timeout =/= 0 -> erlang:now(); true -> undefined end).
-
-do_udp_recv(Recv, IP, Port, Timeout, Then) ->
-    case Recv(Timeout) of
-	{ok,{IP,Port,Answer}} ->
-	    {ok,Answer,erlang:max(0, Timeout - now_ms(erlang:now(), Then))};
-	{ok,_} when Timeout =:= 0 ->
-	    {error,timeout};
-	{ok,_} ->
-	    Now = erlang:now(),
-	    T = erlang:max(0, Timeout - now_ms(Now, Then)),
-	    do_udp_recv(Recv, IP, Port, T, Now);
+    do_udp_recv(I, IP, Port, Timeout, Decode, erlang:now(), Timeout).
+
+do_udp_recv(_I, _IP, _Port, 0, _Decode, _Start, _T) ->
+    timeout;
+do_udp_recv(I, IP, Port, Timeout, Decode, Start, T) ->
+    case gen_udp:recv(I, 0, T) of
+	{ok,Reply} ->
+	    case Decode(Reply) of
+		false when T =:= 0 ->
+		    %% This is a compromize between the hard way i.e
+		    %% in the clause below if NewT becomes 0 bailout
+		    %% immediately and risk that the right reply lies
+		    %% ahead after some bad id replies, and the
+		    %% forgiving way i.e go on with Timeout 0 until
+		    %% the right reply comes or no reply (timeout)
+		    %% which opens for a DOS attack by a malicious
+		    %% DNS server flooding with bad id replies causing
+		    %% an infinite loop here.
+		    %%
+		    %% Timeout is used as a sanity limit counter
+		    %% just to put an end to the loop.
+		    NewTimeout = erlang:max(0, Timeout - 50),
+		    do_udp_recv(I, IP, Port, NewTimeout, Decode, Start, T);
+		false ->
+		    Now = erlang:now(),
+		    NewT = erlang:max(0, Timeout - now_ms(Now, Start)),
+		    do_udp_recv(I, IP, Port, Timeout, Decode, Start, NewT);
+		Result ->
+		    Result
+	    end;
 	Error -> Error
     end.
 
@@ -580,6 +768,17 @@ udp_close(#sock{inet=I,inet6=I6}) ->
 %%     end
 %%  end
 %%
+%% But that man page also says dig always use num_servers = 1.
+%%
+%% Our man page says: timeout/retry, then double for next retry, i.e
+%%  for i = 0 to retry - 1
+%%     foreach nameserver
+%%        send query
+%%        wait((time * (2**i)) / retry)
+%%     end
+%%  end
+%%
+%% And that is what the code seems to do, now fixed, hopefully...
 
 do_query(_Q, [], _Timer) ->
     {error,nxdomain};
@@ -589,19 +788,16 @@ do_query(#q{options=#options{retry=Retry}}=Q, NSs, Timer) ->
 query_retries(_Q, _NSs, _Timer, Retry, Retry, S) ->
     udp_close(S),
     {error,timeout};
+query_retries(_Q, [], _Timer, _Retry, _I, S) ->
+    udp_close(S),
+    {error,timeout};
 query_retries(Q, NSs, Timer, Retry, I, S0) ->
-    Num = length(NSs),
-    if Num =:= 0 ->
-	    udp_close(S0),
-	    {error,timeout};
-       true ->
-	    case query_nss(Q, NSs, Timer, Retry, I, S0, []) of
-		{S,{noanswer,ErrNSs}} -> %% remove unreachable nameservers
-		    query_retries(Q, NSs--ErrNSs, Timer, Retry, I+1, S);
-		{S,Result} ->
-		    udp_close(S),
-		    Result
-	    end
+    case query_nss(Q, NSs, Timer, Retry, I, S0, []) of
+	{S,{noanswer,ErrNSs}} -> %% remove unreachable nameservers
+	    query_retries(Q, NSs--ErrNSs, Timer, Retry, I+1, S);
+	{S,Result} ->
+	    udp_close(S),
+	    Result
     end.
 
 query_nss(_Q, [], _Timer, _Retry, _I, S, ErrNSs) ->
@@ -611,13 +807,13 @@ query_nss(#q{edns=undefined}=Q, NSs, Timer, Retry, I, S, ErrNSs) ->
 query_nss(Q, NSs, Timer, Retry, I, S, ErrNSs) ->
     query_nss_edns(Q, NSs, Timer, Retry, I, S, ErrNSs).
 
-query_nss_edns(#q{options=#options{udp_payload_size=PSz}=Options,
-		  edns={Id,Buffer}}=Q,
-	       [{IP,Port}=NS|NSs]=NSs0, Timer, Retry, I, S0, ErrNSs) ->
-    {S,Res}=Reply = query_ns(S0, Id, Buffer, IP, Port, Timer,
-		       Retry, I, Options, PSz),
+query_nss_edns(
+  #q{options=#options{udp_payload_size=PSz}=Options,edns={Id,Buffer}}=Q,
+  [{IP,Port}=NS|NSs]=NSs0, Timer, Retry, I, S0, ErrNSs) ->
+    {S,Res}=Reply =
+	query_ns(S0, Id, Buffer, IP, Port, Timer, Retry, I, Options, PSz),
     case Res of
-	timeout -> {S,{error,timeout}};
+	timeout -> {S,{error,timeout}}; % Bailout timeout
 	{ok,_} -> Reply;
 	{error,{nxdomain,_}} -> Reply;
 	{error,{E,_}} when E =:= qfmterror; E =:= notimp; E =:= servfail;
@@ -629,17 +825,19 @@ query_nss_edns(#q{options=#options{udp_payload_size=PSz}=Options,
 	    query_nss(Q, NSs, Timer, Retry, I, S, ErrNSs)
     end.
 
-query_nss_dns(#q{dns=Qdns}=Q0, [{IP,Port}=NS|NSs],
-	      Timer, Retry, I, S0, ErrNSs) ->
+query_nss_dns(
+  #q{dns=Qdns}=Q0,
+  [{IP,Port}=NS|NSs], Timer, Retry, I, S0, ErrNSs) ->
     #q{options=Options,dns={Id,Buffer}}=Q =
 	if
 	    is_function(Qdns, 0) -> Q0#q{dns=Qdns()};
 	    true -> Q0
 	end,
-    {S,Res}=Reply = query_ns(S0, Id, Buffer, IP, Port, Timer,
-			Retry, I, Options, ?PACKETSZ),
+    {S,Res}=Reply =
+	query_ns(
+	  S0, Id, Buffer, IP, Port, Timer, Retry, I, Options, ?PACKETSZ),
     case Res of
-	timeout -> {S,{error,timeout}};
+	timeout -> {S,{error,timeout}}; % Bailout timeout
 	{ok,_} -> Reply;
 	{error,{E,_}} when E =:= nxdomain; E =:= qfmterror -> Reply;
 	{error,E} when E =:= fmt; E =:= enetunreach; E =:= econnrefused ->
@@ -653,48 +851,66 @@ query_ns(S0, Id, Buffer, IP, Port, Timer, Retry, I,
 	 PSz) ->
     case UseVC orelse iolist_size(Buffer) > PSz of
 	true ->
-	    {S0,query_tcp(Tm, Id, Buffer, IP, Port, Timer, Verbose)};
+	    TcpTimeout = inet:timeout(Tm*5, Timer),
+	    {S0,query_tcp(TcpTimeout, Id, Buffer, IP, Port, Verbose)};
 	false ->
 	    case udp_open(S0, IP) of
 		{ok,S} ->
-		    {S,case query_udp(S, Id, Buffer, IP, Port, Timer,
-					  Retry, I, Tm, Verbose) of
-			   {ok,#dns_rec{header=H}} when H#dns_header.tc ->
-			       query_tcp(Tm, Id, Buffer,
-					 IP, Port, Timer, Verbose);
-			   Reply -> Reply
-		       end};
+		    Timeout =
+			inet:timeout( (Tm * (1 bsl I)) div Retry, Timer),
+		    {S,
+		     case query_udp(
+			    S, Id, Buffer, IP, Port, Timeout, Verbose) of
+			 {ok,#dns_rec{header=H}} when H#dns_header.tc ->
+			     TcpTimeout = inet:timeout(Tm*5, Timer),
+			     query_tcp(
+			       TcpTimeout, Id, Buffer, IP, Port, Verbose);
+			 Reply -> Reply
+		     end};
 		Error ->
 		    {S0,Error}
 	    end
     end.
 
-query_udp(S, Id, Buffer, IP, Port, Timer, Retry, I, Tm, Verbose) ->
-    Timeout = inet:timeout( (Tm * (1 bsl I)) div Retry, Timer),
+query_udp(_S, _Id, _Buffer, _IP, _Port, 0, _Verbose) ->
+    timeout;
+query_udp(S, Id, Buffer, IP, Port, Timeout, Verbose) ->
     ?verbose(Verbose, "Try UDP server : ~p:~p (timeout=~w)\n",
-	     [IP, Port, Timeout]),
-    udp_connect(S, IP, Port),
-    udp_send(S, IP, Port, Buffer),
-    query_udp_recv(S, IP, Port, Id, Timeout, Verbose).
-
-query_udp_recv(S, IP, Port, Id, Timeout, Verbose) ->
-    case udp_recv(S, IP, Port, Timeout) of
-	{ok,Answer,T} ->
-	    case decode_answer(Answer, Id, Verbose) of
-		{error, badid} ->
-		    query_udp_recv(S, IP, Port, Id, T, Verbose);
-		Reply -> Reply
+	     [IP,Port,Timeout]),
+    case
+	case udp_connect(S, IP, Port) of
+	    ok ->
+		udp_send(S, IP, Port, Buffer);
+	    E1 ->
+		E1 end of
+	ok ->
+	    Decode =
+		fun ({RecIP,RecPort,Answer})
+		      when RecIP =:= IP, RecPort =:= Port ->
+			case decode_answer(Answer, Id, Verbose) of
+			    {error,badid} ->
+				false;
+			    Reply ->
+				Reply
+			end;
+		    ({_,_,_}) ->
+			false
+		end,
+	    case udp_recv(S, IP, Port, Timeout, Decode) of
+		{ok,_}=Result ->
+		    Result;
+		E2 ->
+		    ?verbose(Verbose, "UDP server error: ~p\n", [E2]),
+		    E2
 	    end;
-	{error, timeout} when Timeout =:= 0 ->
-	    ?verbose(Verbose, "UDP server timeout\n", []),
-	    timeout;
-	Error -> 
-	    ?verbose(Verbose, "UDP server error: ~p\n", [Error]),
-	    Error
+	E3 ->
+	    ?verbose(Verbose, "UDP send failed: ~p\n", [E3]),
+	    {error,econnrefused}
     end.
 
-query_tcp(Tm, Id, Buffer, IP, Port, Timer, Verbose) ->
-    Timeout = inet:timeout(Tm*5, Timer),
+query_tcp(0, _Id, _Buffer, _IP, _Port, _Verbose) ->
+    timeout;
+query_tcp(Timeout, Id, Buffer, IP, Port, Verbose) ->
     ?verbose(Verbose, "Try TCP server : ~p:~p (timeout=~w)\n",
 	     [IP, Port, Timeout]),
     Family = case IP of
@@ -716,19 +932,10 @@ query_tcp(Tm, Id, Buffer, IP, Port, Timer, Verbose) ->
 		    end;
 		Error ->
 		    gen_tcp:close(S),
-		    case Error of
-			{error, timeout} when Timeout =:= 0 ->
-			    ?verbose(Verbose, "TCP server recv timeout\n", []),
-			    timeout;
-			_ ->
-			    ?verbose(Verbose, "TCP server recv error: ~p\n",
-				    [Error]),
-			    Error
-		    end
+		    ?verbose(Verbose, "TCP server recv error: ~p\n",
+			     [Error]),
+		    Error
 	    end;
-	{error, timeout} when Timeout =:= 0 ->
-	    ?verbose(Verbose, "TCP server connect timeout\n", []),
-	    timeout;
 	Error ->
 	    ?verbose(Verbose, "TCP server error: ~p\n", [Error]),
 	    Error
diff --git a/lib/kernel/src/inet_udp.erl b/lib/kernel/src/inet_udp.erl
index 9a4089ab19..60bd96f332 100644
--- a/lib/kernel/src/inet_udp.erl
+++ b/lib/kernel/src/inet_udp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -39,8 +39,10 @@ getserv(Name) when is_atom(Name)    -> inet:getservbyname(Name,udp).
 getaddr(Address) -> inet:getaddr(Address, inet).
 getaddr(Address,Timer) -> inet:getaddr_tm(Address, inet, Timer).
 
+-spec open(_) -> {ok, inet:socket()} | {error, atom()}.
 open(Port) -> open(Port, []).
 
+-spec open(_, _) -> {ok, inet:socket()} | {error, atom()}.
 open(Port, Opts) ->
     case inet:udp_options(
 	   [{port,Port}, {recbuf, ?RECBUF} | Opts], 
@@ -69,6 +71,8 @@ recv(S,Len) ->
 recv(S,Len,Time) ->
     prim_inet:recvfrom(S, Len, Time).
 
+-spec close(inet:socket()) -> ok.
+
 close(S) ->
     inet:udp_close(S).
 
diff --git a/lib/kernel/src/net_adm.erl b/lib/kernel/src/net_adm.erl
index 737b1ecee9..9b2dac9544 100644
--- a/lib/kernel/src/net_adm.erl
+++ b/lib/kernel/src/net_adm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -35,7 +35,11 @@
 %% Try to read .hosts.erlang file in 
 %% 1. cwd , 2. $HOME 3. init:root_dir() 
 
--spec host_file() -> [atom()] | {'error',atom() | {integer(),atom(),_}}.
+-spec host_file() -> Hosts | {error, Reason} when
+      Hosts :: [Host :: atom()],
+      %% Copied from file:path_consult/2:
+      Reason :: file:posix() | badarg | terminated | system_limit
+              | {Line :: integer(), Mod :: module(), Term :: term()}.
 
 host_file() ->
     Home = case init:get_argument(home) of
@@ -50,7 +54,8 @@ host_file() ->
 %% Check whether a node is up or down
 %%  side effect: set up a connection to Node if there not yet is one.
 
--spec ping(atom()) -> 'pang' | 'pong'.
+-spec ping(Node) -> pong | pang when
+      Node :: atom().
 
 ping(Node) when is_atom(Node) ->
     case catch gen:call({net_kernel, Node},
@@ -63,7 +68,8 @@ ping(Node) when is_atom(Node) ->
 	    pang
     end.
 
--spec localhost() -> string().
+-spec localhost() -> Name when
+      Name :: string().
 
 localhost() ->
     {ok, Host} = inet:gethostname(),
@@ -73,12 +79,20 @@ localhost() ->
     end.
 
 
--spec names() -> {'ok', [{string(), integer()}]} | {'error', _}.
+-spec names() -> {ok, [{Name, Port}]} | {error, Reason} when
+      Name :: string(),
+      Port :: non_neg_integer(),
+      Reason :: address | file:posix().
 
 names() ->
     names(localhost()).
 
--spec names(atom() | string()) -> {'ok', [{string(), integer()}]} | {'error', _}.
+
+-spec names(Host) -> {ok, [{Name, Port}]} | {error, Reason} when
+      Host :: atom() | string(),
+      Name :: string(),
+      Port :: non_neg_integer(),
+      Reason :: address | file:posix().
 
 names(Hostname) ->
     case inet:gethostbyname(Hostname) of
@@ -88,8 +102,9 @@ names(Hostname) ->
 	    Else
     end.
 
--spec dns_hostname(atom() | string()) -> 
-			{'ok', string()} | {'error', atom() | string()}.
+-spec dns_hostname(Host) -> {ok, Name} | {error, Host} when
+      Host :: atom() | string(),
+      Name :: string().
 
 dns_hostname(Hostname) ->
     case inet:gethostbyname(Hostname) of
@@ -164,7 +179,8 @@ collect_new(Sofar, Nodelist) ->
 world() ->
     world(silent).
 
--spec world(verbosity()) -> [node()].
+-spec world(Arg) -> [node()] when
+      Arg :: verbosity().
 
 world(Verbose) ->
     case net_adm:host_file() of
@@ -172,12 +188,15 @@ world(Verbose) ->
         Hosts -> expand_hosts(Hosts, Verbose)
     end.
 
--spec world_list([atom()]) -> [node()].
+-spec world_list(Hosts) -> [node()] when
+      Hosts :: [atom()].
 
 world_list(Hosts) when is_list(Hosts) ->
     expand_hosts(Hosts, silent).
 
--spec world_list([atom()], verbosity()) -> [node()].
+-spec world_list(Hosts, Arg) -> [node()] when
+      Hosts :: [atom()],
+      Arg :: verbosity().
 
 world_list(Hosts, Verbose) when is_list(Hosts) ->
     expand_hosts(Hosts, Verbose).
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index 5228d4fe01..9e3d730cee 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -145,8 +145,15 @@
 %% Interface functions
 
 kernel_apply(M,F,A) ->         request({apply,M,F,A}).
+
+-spec allow(Nodes) -> ok | error when
+      Nodes :: [node()].
 allow(Nodes) ->                request({allow, Nodes}).
+
 longnames() ->                 request(longnames).
+
+-spec stop() -> ok | {error, Reason} when
+      Reason :: not_allowed | not_found.
 stop() ->                      erl_distribution:stop().
 
 node_info(Node) ->             get_node_info(Node).
@@ -158,10 +165,28 @@ i(Node) ->                     print_info(Node).
 verbose(Level) when is_integer(Level) ->
     request({verbose, Level}).
 
+-spec set_net_ticktime(NetTicktime, TransitionPeriod) -> Res when
+      NetTicktime :: pos_integer(),
+      TransitionPeriod :: non_neg_integer(),
+      Res :: unchanged
+           | change_initiated
+           | {ongoing_change_to, NewNetTicktime},
+      NewNetTicktime :: pos_integer().
 set_net_ticktime(T, TP) when is_integer(T), T > 0, is_integer(TP), TP >= 0 ->
     ticktime_res(request({new_ticktime, T*250, TP*1000})).
+
+-spec set_net_ticktime(NetTicktime) -> Res when
+      NetTicktime :: pos_integer(),
+      Res :: unchanged
+           | change_initiated
+           | {ongoing_change_to, NewNetTicktime},
+      NewNetTicktime :: pos_integer().
 set_net_ticktime(T) when is_integer(T) ->
     set_net_ticktime(T, ?DEFAULT_TRANSITION_PERIOD).
+
+-spec get_net_ticktime() -> Res when
+      Res :: NetTicktime | {ongoing_change_to, NetTicktime} | ignored,
+      NetTicktime :: pos_integer().
 get_net_ticktime() ->
     ticktime_res(request(ticktime)).
 
@@ -171,6 +196,9 @@ get_net_ticktime() ->
 %% flags (we may want to move it elsewhere later). In order to easily
 %% be backward compatible, errors are created here when process_flag()
 %% fails.
+-spec monitor_nodes(Flag) -> ok | Error when
+      Flag :: boolean(),
+      Error :: error | {error, term()}.
 monitor_nodes(Flag) ->
     case catch process_flag(monitor_nodes, Flag) of
 	true -> ok;
@@ -178,6 +206,13 @@ monitor_nodes(Flag) ->
 	_ -> mk_monitor_nodes_error(Flag, [])
     end.
 
+-spec monitor_nodes(Flag, Options) -> ok | Error when
+      Flag :: boolean(),
+      Options :: [Option],
+      Option :: {node_type, NodeType}
+              | nodedown_reason,
+      NodeType :: visible | hidden | all,
+      Error :: error | {error, term()}.
 monitor_nodes(Flag, Opts) ->
     case catch process_flag({monitor_nodes, Opts}, Flag) of
 	true -> ok;
@@ -209,6 +244,8 @@ publish_on_node(Node) when is_atom(Node) ->
 update_publish_nodes(Ns) ->
     request({update_publish_nodes, Ns}).
 
+-spec connect_node(Node) -> boolean() | ignored when
+      Node :: node().
 %% explicit connects
 connect_node(Node) when is_atom(Node) ->
     request({connect, normal, Node}).
diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index d1feae771d..f6769df585 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -24,7 +24,10 @@
 
 -include("file.hrl").
 
--spec type() -> 'vxworks' | {'unix',atom()} | {'win32',atom()} | {'ose',atom()}.
+-spec type() -> vxworks | {Osfamily, Osname} when
+      Osfamily :: unix | win32,
+      Osname :: atom().
+
 type() ->
     case erlang:system_info(os_type) of
 	{vxworks, _} ->
@@ -32,18 +35,27 @@ type() ->
 	Else -> Else
     end.
 
--spec version() -> string() | {non_neg_integer(),non_neg_integer(),non_neg_integer()}.
+-spec version() -> VersionString | {Major, Minor, Release} when
+      VersionString :: string(),
+      Major :: non_neg_integer(),
+      Minor :: non_neg_integer(),
+      Release :: non_neg_integer().
 version() ->
     erlang:system_info(os_version).
 
--spec find_executable(string()) -> string() | 'false'.
+-spec find_executable(Name) -> Filename | 'false' when
+      Name :: string(),
+      Filename :: string().
 find_executable(Name) ->
     case os:getenv("PATH") of
 	false -> find_executable(Name, []);
 	Path  -> find_executable(Name, Path)
     end.
 
--spec find_executable(string(), string()) -> string() | 'false'.
+-spec find_executable(Name, Path) -> Filename | 'false' when
+      Name :: string(),
+      Path :: string(),
+      Filename :: string().
 find_executable(Name, Path) ->
     Extensions = extensions(),
     case filename:pathtype(Name) of
@@ -147,7 +159,8 @@ extensions() ->
     end.
 
 %% Executes the given command in the default shell for the operating system.
--spec cmd(atom() | string() | [string()]) -> string().
+-spec cmd(Command) -> string() when
+      Command :: atom() | io_lib:chars().
 cmd(Cmd) ->
     validate(Cmd),
     case type() of
diff --git a/lib/kernel/src/pg2.erl b/lib/kernel/src/pg2.erl
index 956a900adc..0d5838716e 100644
--- a/lib/kernel/src/pg2.erl
+++ b/lib/kernel/src/pg2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -30,17 +30,19 @@
 %%% Exported functions
 %%%
 
--spec start_link() -> {'ok', pid()} | {'error', term()}.
+-spec start_link() -> {'ok', pid()} | {'error', any()}.
 
 start_link() ->
     gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
 
--spec start() -> {'ok', pid()} | {'error', term()}.
+-spec start() -> {'ok', pid()} | {'error', any()}.
 
 start() ->
     ensure_started().
 
--spec create(term()) -> 'ok'.
+-type name() :: any().
+
+-spec create(Name :: name()) -> 'ok'.
 
 create(Name) ->
     ensure_started(),
@@ -55,9 +57,7 @@ create(Name) ->
             ok
     end.
 
--type name() :: term().
-
--spec delete(name()) -> 'ok'.
+-spec delete(Name :: name()) -> 'ok'.
 
 delete(Name) ->
     ensure_started(),
@@ -67,7 +67,8 @@ delete(Name) ->
                  end),
     ok.
 
--spec join(name(), pid()) -> 'ok' | {'error', {'no_such_group', term()}}.
+-spec join(Name, Pid :: pid()) -> 'ok' | {'error', {'no_such_group', Name}}
+      when Name :: name().
 
 join(Name, Pid) when is_pid(Pid) ->
     ensure_started(),
@@ -83,7 +84,8 @@ join(Name, Pid) when is_pid(Pid) ->
             ok
     end.
 
--spec leave(name(), pid()) -> 'ok' | {'error', {'no_such_group', name()}}.
+-spec leave(Name, Pid :: pid()) -> 'ok' | {'error', {'no_such_group', Name}}
+      when Name :: name().
 
 leave(Name, Pid) when is_pid(Pid) ->
     ensure_started(),
@@ -99,10 +101,9 @@ leave(Name, Pid) when is_pid(Pid) ->
             ok
     end.
 
--type get_members_ret() :: [pid()] | {'error', {'no_such_group', name()}}.
+-spec get_members(Name) -> [pid()] | {'error', {'no_such_group', Name}}
+      when Name :: name().
 
--spec get_members(name()) -> get_members_ret().
-   
 get_members(Name) ->
     ensure_started(),
     case ets:member(pg2_table, {group, Name}) of
@@ -112,7 +113,8 @@ get_members(Name) ->
             {error, {no_such_group, Name}}
     end.
 
--spec get_local_members(name()) -> get_members_ret().
+-spec get_local_members(Name) -> [pid()] | {'error', {'no_such_group', Name}}
+      when Name :: name().
 
 get_local_members(Name) ->
     ensure_started(),
@@ -123,15 +125,15 @@ get_local_members(Name) ->
             {error, {no_such_group, Name}}
     end.
 
--spec which_groups() -> [name()].
+-spec which_groups() -> [Name :: name()].
 
 which_groups() ->
     ensure_started(),
     all_groups().
 
--type gcp_error_reason() :: {'no_process', term()} | {'no_such_group', term()}.
-
--spec get_closest_pid(term()) -> pid() | {'error', gcp_error_reason()}.
+-spec get_closest_pid(Name) ->  pid() | {'error', Reason} when
+      Name :: name(),
+      Reason ::  {'no_process', Name} | {'no_such_group', Name}.
 
 get_closest_pid(Name) ->
     case get_local_members(Name) of
@@ -157,7 +159,9 @@ get_closest_pid(Name) ->
 
 -record(state, {}).
 
--spec init([]) -> {'ok', #state{}}.
+-opaque state() :: #state{}.
+
+-spec init(Arg :: []) -> {'ok', state()}.
 
 init([]) ->
     Ns = nodes(),
@@ -169,13 +173,13 @@ init([]) ->
     pg2_table = ets:new(pg2_table, [ordered_set, protected, named_table]),
     {ok, #state{}}.
 
--type call() :: {'create', name()}
-              | {'delete', name()}
-              | {'join', name(), pid()}
-              | {'leave', name(), pid()}.
-
--spec handle_call(call(), _, #state{}) -> 
-        {'reply', 'ok', #state{}}.
+-spec handle_call(Call :: {'create', Name}
+                        | {'delete', Name}
+                        | {'join', Name, Pid :: pid()}
+                        | {'leave', Name, Pid :: pid()},
+                  From :: {pid(),Tag :: any()},
+                  State :: state()) -> {'reply', 'ok', state()}
+      when Name :: name().
 
 handle_call({create, Name}, _From, S) ->
     assure_group(Name),
@@ -195,11 +199,10 @@ handle_call(Request, From, S) ->
                              [Request, From]),
     {noreply, S}.
 
--type all_members() :: [[name(),...]].
--type cast() :: {'exchange', node(), all_members()}
-              | {'del_member', name(), pid()}.
-
--spec handle_cast(cast(), #state{}) -> {'noreply', #state{}}.
+-spec handle_cast(Cast :: {'exchange', node(), Names :: [[Name,...]]}
+                        | {'del_member', Name, Pid :: pid()},
+                  State :: state()) -> {'noreply', state()}
+      when Name :: name().
 
 handle_cast({exchange, _Node, List}, S) ->
     store(List),
@@ -208,7 +211,8 @@ handle_cast(_, S) ->
     %% Ignore {del_member, Name, Pid}.
     {noreply, S}.
 
--spec handle_info(tuple(), #state{}) -> {'noreply', #state{}}.
+-spec handle_info(Tuple :: tuple(), State :: state()) ->
+    {'noreply', state()}.
 
 handle_info({'DOWN', MonitorRef, process, _Pid, _Info}, S) ->
     member_died(MonitorRef),
@@ -222,7 +226,7 @@ handle_info({new_pg2, Node}, S) ->
 handle_info(_, S) ->
     {noreply, S}.
 
--spec terminate(term(), #state{}) -> 'ok'.
+-spec terminate(Reason :: any(), State :: state()) -> 'ok'.
 
 terminate(_Reason, _S) ->
     true = ets:delete(pg2_table),
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index e09acb5024..be35f99ed2 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -263,14 +263,28 @@ proxy_user_flush() ->
 
 %% THE rpc client interface
 
--spec call(node(), atom(), atom(), [term()]) -> term().
+-spec call(Node, Module, Function, Args) -> Res | {badrpc, Reason} when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Res :: term(),
+      Reason :: term().
 
 call(N,M,F,A) when node() =:= N ->  %% Optimize local call
     local_call(M, F, A);
 call(N,M,F,A) ->
     do_call(N, {call,M,F,A,group_leader()}, infinity).
 
--spec call(node(), atom(), atom(), [term()], timeout()) -> term().
+-spec call(Node, Module, Function, Args, Timeout) ->
+                  Res | {badrpc, Reason} when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Res :: term(),
+      Reason :: term(),
+      Timeout :: timeout().
 
 call(N,M,F,A,_Timeout) when node() =:= N ->  %% Optimize local call
     local_call(M,F,A);
@@ -279,14 +293,28 @@ call(N,M,F,A,infinity) ->
 call(N,M,F,A,Timeout) when is_integer(Timeout), Timeout >= 0 ->
     do_call(N, {call,M,F,A,group_leader()}, Timeout).
 
--spec block_call(node(), atom(), atom(), [term()]) -> term().
+-spec block_call(Node, Module, Function, Args) -> Res | {badrpc, Reason} when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Res :: term(),
+      Reason :: term().
 
 block_call(N,M,F,A) when node() =:= N -> %% Optimize local call
     local_call(M,F,A);
 block_call(N,M,F,A) ->
     do_call(N, {block_call,M,F,A,group_leader()}, infinity).
 
--spec block_call(node(), atom(), atom(), [term()], timeout()) -> term().
+-spec block_call(Node, Module, Function, Args, Timeout) ->
+                  Res | {badrpc, Reason} when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Res :: term(),
+      Reason :: term(),
+      Timeout :: timeout().
 
 block_call(N,M,F,A,_Timeout) when node() =:= N ->  %% Optimize local call
     local_call(M, F, A);
@@ -339,7 +367,13 @@ rpc_check(X) -> X.
 %% The entire call is packed into an atomic transaction which 
 %% either succeeds or fails, i.e. never hangs (unless the server itself hangs).
 
--spec server_call(node(), atom(), term(), term()) -> term() | {'error', 'nodedown'}.
+-spec server_call(Node, Name, ReplyWrapper, Msg) -> Reply | {error, Reason} when
+      Node :: node(),
+      Name :: atom(),
+      ReplyWrapper :: term(),
+      Msg :: term(),
+      Reply :: term(),
+      Reason :: nodedown.
 
 server_call(Node, Name, ReplyWrapper, Msg) 
   when is_atom(Node), is_atom(Name) ->
@@ -362,7 +396,11 @@ server_call(Node, Name, ReplyWrapper, Msg)
 	    end
     end.
 
--spec cast(node(), atom(), atom(), [term()]) -> 'true'.
+-spec cast(Node, Module, Function, Args) -> true when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
 
 cast(Node, Mod, Fun, Args) when Node =:= node() ->
     catch spawn(Mod, Fun, Args),
@@ -373,12 +411,17 @@ cast(Node, Mod, Fun, Args) ->
 
 
 %% Asynchronous broadcast, returns nothing, it's just send'n prey
--spec abcast(atom(), term()) -> 'abcast'.
+-spec abcast(Name, Msg) -> abcast when
+      Name :: atom(),
+      Msg :: term().
 
 abcast(Name, Mess) ->
     abcast([node() | nodes()], Name, Mess).
 
--spec abcast([node()], atom(), term()) -> 'abcast'.
+-spec abcast(Nodes, Name, Msg) -> abcast when
+      Nodes :: [node()],
+      Name :: atom(),
+      Msg :: term().
 
 abcast([Node|Tail], Name, Mess) ->
     Dest = {Name,Node},
@@ -396,23 +439,39 @@ abcast([], _,_) -> abcast.
 %% message when we return from the call, we can't know that they have
 %% processed the message though.
 
--spec sbcast(atom(), term()) -> {[node()], [node()]}.
+-spec sbcast(Name, Msg) -> {GoodNodes, BadNodes} when
+      Name :: atom(),
+      Msg :: term(),
+      GoodNodes :: [node()],
+      BadNodes :: [node()].
 
 sbcast(Name, Mess) ->
     sbcast([node() | nodes()], Name, Mess).
 
--spec sbcast([node()], atom(), term()) -> {[node()], [node()]}.
+-spec sbcast(Nodes, Name, Msg) -> {GoodNodes, BadNodes} when
+      Name :: atom(),
+      Msg :: term(),
+      Nodes :: [node()],
+      GoodNodes :: [node()],
+      BadNodes :: [node()].
 
 sbcast(Nodes, Name, Mess) ->
     Monitors = send_nodes(Nodes, ?NAME, {sbcast, Name, Mess}, []),
     rec_nodes(?NAME, Monitors).
 
--spec eval_everywhere(atom(), atom(), [term()]) -> 'abcast'.
+-spec eval_everywhere(Module, Function, Args) -> abcast when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
 
 eval_everywhere(Mod, Fun, Args) ->
     eval_everywhere([node() | nodes()] , Mod, Fun, Args).
 
--spec eval_everywhere([node()], atom(), atom(), [term()]) -> 'abcast'.
+-spec eval_everywhere(Nodes, Module, Function, Args) -> abcast when
+      Nodes :: [node()],
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
 
 eval_everywhere(Nodes, Mod, Fun, Args) ->
     gen_server:abcast(Nodes, ?NAME, {cast,Mod,Fun,Args,group_leader()}).
@@ -453,20 +512,45 @@ unmonitor(Ref) when is_reference(Ref) ->
 
 
 %% Call apply(M,F,A) on all nodes in parallel
--spec multicall(atom(), atom(), [term()]) -> {[_], [node()]}.
+-spec multicall(Module, Function, Args) -> {ResL, BadNodes} when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      ResL :: [term()],
+      BadNodes :: [node()].
 
 multicall(M, F, A) -> 
     multicall(M, F, A, infinity).
 
--spec multicall([node()], atom(), atom(), [term()])  -> {[_], [node()]}
-	     ; (atom(), atom(), [term()], timeout()) -> {[_], [node()]}.
+-spec multicall(Nodes, Module, Function, Args) -> {ResL, BadNodes} when
+                  Nodes :: [node()],
+                  Module :: module(),
+                  Function :: atom(),
+                  Args :: [term()],
+                  ResL :: [term()],
+                  BadNodes :: [node()];
+               (Module, Function, Args, Timeout) -> {ResL, BadNodes} when
+                  Module :: module(),
+                  Function :: atom(),
+                  Args :: [term()],
+                  Timeout :: timeout(),
+                  ResL :: [term()],
+                  BadNodes :: [node()].
 
 multicall(Nodes, M, F, A) when is_list(Nodes) ->
     multicall(Nodes, M, F, A, infinity);
 multicall(M, F, A, Timeout) ->
     multicall([node() | nodes()], M, F, A, Timeout).
 
--spec multicall([node()], atom(), atom(), [term()], timeout()) -> {[_], [node()]}.
+-spec multicall(Nodes, Module, Function, Args, Timeout) ->
+                       {ResL, BadNodes} when
+      Nodes :: [node()],
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Timeout :: timeout(),
+      ResL :: [term()],
+      BadNodes :: [node()].
 
 multicall(Nodes, M, F, A, infinity)
   when is_list(Nodes), is_atom(M), is_atom(F), is_list(A) ->
@@ -495,12 +579,21 @@ do_multicall(Nodes, M, F, A, Timeout) ->
 %%
 %% There is no apparent order among the replies.
 
--spec multi_server_call(atom(), term()) -> {[_], [node()]}.
+-spec multi_server_call(Name, Msg) -> {Replies, BadNodes} when
+      Name :: atom(),
+      Msg :: term(),
+      Replies :: [Reply :: term()],
+      BadNodes :: [node()].
 
 multi_server_call(Name, Msg) ->
     multi_server_call([node() | nodes()], Name, Msg).
 
--spec multi_server_call([node()], atom(), term()) -> {[_], [node()]}.
+-spec multi_server_call(Nodes, Name, Msg) -> {Replies, BadNodes} when
+      Nodes :: [node()],
+      Name :: atom(),
+      Msg :: term(),
+      Replies :: [Reply :: term()],
+      BadNodes :: [node()].
 
 multi_server_call(Nodes, Name, Msg) 
   when is_list(Nodes), is_atom(Name) ->
@@ -509,9 +602,22 @@ multi_server_call(Nodes, Name, Msg)
 
 %% Deprecated functions. Were only needed when communicating with R6 nodes.
 
+-spec safe_multi_server_call(Name, Msg) -> {Replies, BadNodes} when
+      Name :: atom(),
+      Msg :: term(),
+      Replies :: [Reply :: term()],
+      BadNodes :: [node()].
+
 safe_multi_server_call(Name, Msg) ->
     multi_server_call(Name, Msg).
 
+-spec safe_multi_server_call(Nodes, Name, Msg) -> {Replies, BadNodes} when
+      Nodes :: [node()],
+      Name :: atom(),
+      Msg :: term(),
+      Replies :: [Reply :: term()],
+      BadNodes :: [node()].
+
 safe_multi_server_call(Nodes, Name, Msg) ->
     multi_server_call(Nodes, Name, Msg).
 
@@ -539,7 +645,14 @@ rec_nodes(Name, [{N,R} | Tail], Badnodes, Replies) ->
 %% rpc's towards the same node. I.e. it returns immediately and 
 %% it returns a Key that can be used in a subsequent yield(Key).
 
--spec async_call(node(), atom(), atom(), [term()]) -> pid().
+-opaque key() :: pid().
+
+-spec async_call(Node, Module, Function, Args) -> Key when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Key :: key().
 
 async_call(Node, Mod, Fun, Args) ->
     ReplyTo = self(),
@@ -549,20 +662,27 @@ async_call(Node, Mod, Fun, Args) ->
 	      ReplyTo ! {self(), {promise_reply, R}}  %% self() is key
       end).
 
--spec yield(pid()) -> term().
+-spec yield(Key) -> {value, Val} | timeout when
+      Key :: key(),
+      Val :: (Res :: term()) | {badrpc, Reason :: term()}.
 
 yield(Key) when is_pid(Key) ->
     {value,R} = do_yield(Key, infinity),
     R.
 
--spec nb_yield(pid(), timeout()) -> {'value', _} | 'timeout'.
+-spec nb_yield(Key, Timeout) -> {value, Val} | timeout when
+      Key :: key(),
+      Timeout :: timeout(),
+      Val :: (Res :: term()) | {badrpc, Reason :: term()}.
 
 nb_yield(Key, infinity=Inf) when is_pid(Key) ->
     do_yield(Key, Inf);
 nb_yield(Key, Timeout) when is_pid(Key), is_integer(Timeout), Timeout >= 0 ->
     do_yield(Key, Timeout).
 
--spec nb_yield(pid()) -> {'value', _} | 'timeout'.
+-spec nb_yield(Key) -> {value, Val} | timeout when
+      Key :: key(),
+      Val :: (Res :: term()) | {badrpc, Reason :: term()}.
 
 nb_yield(Key) when is_pid(Key) ->
     do_yield(Key, 0).
@@ -582,7 +702,12 @@ do_yield(Key, Timeout) ->
 %% ArgL === [{M,F,Args},........]
 %% Returns a lists of the evaluations in the same order as 
 %% given to ArgL
--spec parallel_eval([{atom(), atom(), [_]}]) -> [_].
+-spec parallel_eval(FuncCalls) -> ResL when
+      FuncCalls :: [{Module, Function, Args}],
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      ResL :: [term()].
 
 parallel_eval(ArgL) ->
     Nodes = [node() | nodes()],
@@ -599,7 +724,13 @@ map_nodes([{M,F,A}|Tail],[Node|MoreNodes], Original) ->
 %% Parallel version of lists:map/3 with exactly the same 
 %% arguments and return value as lists:map/3,
 %% except that it calls exit/1 if a network error occurs.
--spec pmap({atom(),atom()}, [term()], [term()]) -> [term()].
+-spec pmap(FuncSpec, ExtraArgs, List1) -> List2 when
+      FuncSpec :: {Module,Function},
+      Module :: module(),
+      Function :: atom(),
+      ExtraArgs :: [term()],
+      List1 :: [Elem :: term()],
+      List2 :: [term()].
 
 pmap({M,F}, As, List) ->
     check(parallel_eval(build_args(M,F,As, List, [])), []).
@@ -616,15 +747,20 @@ check([], Ack) -> Ack.
 
 
 %% location transparent version of process_info
--spec pinfo(pid()) -> [{atom(), _}] | 'undefined'.
+-spec pinfo(Pid) -> [{Item, Info}] | undefined when
+      Pid :: pid(),
+      Item :: atom(),
+      Info :: term().
 
 pinfo(Pid) when node(Pid) =:= node() ->
     process_info(Pid);
 pinfo(Pid) ->
     call(node(Pid), erlang, process_info, [Pid]).
 
--spec pinfo(pid(), Item) -> {Item, _} | 'undefined' | []
-				when is_subtype(Item, atom()).
+-spec pinfo(Pid, Item) -> {Item, Info} | undefined | [] when
+      Pid :: pid(),
+      Item :: atom(),
+      Info :: term().
 
 pinfo(Pid, Item) when node(Pid) =:= node() ->
     process_info(Pid, Item);
diff --git a/lib/kernel/src/seq_trace.erl b/lib/kernel/src/seq_trace.erl
index 78c3040f21..ea5da2de1c 100644
--- a/lib/kernel/src/seq_trace.erl
+++ b/lib/kernel/src/seq_trace.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. 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
@@ -38,15 +38,17 @@
 
 -type flag()       :: 'send' | 'receive' | 'print' | 'timestamp'.
 -type component()  :: 'label' | 'serial' | flag().
--type value()      :: non_neg_integer()
-                    | {non_neg_integer(), non_neg_integer()}
-                    | boolean().
--type token_pair() :: {component(), value()}.
+-type value()      :: (Integer :: non_neg_integer())
+                    | {Previous :: non_neg_integer(),
+                       Current :: non_neg_integer()}
+                    | (Bool :: boolean()).
 
 %%---------------------------------------------------------------------------
 
--type token() :: [] | {integer(), boolean(), _, _, _}.
--spec set_token(token()) -> token() | 'ok'.
+-opaque token() :: {integer(), boolean(), _, _, _}.
+-spec set_token(Token) -> PreviousToken | 'ok' when
+      Token :: [] | token(),
+      PreviousToken :: [] | token().
 
 set_token([]) ->
     erlang:seq_trace(sequential_trace_token,[]);
@@ -58,28 +60,35 @@ set_token({Flags,Label,Serial,_From,Lastcnt}) ->
 %% expects that, the BIF can however "unofficially" handle atoms as well, and
 %% atoms can be used if only Erlang nodes are involved
 
--spec set_token(component(), value()) -> token_pair().
+-spec set_token(Component, Val) -> {Component, OldVal} when
+      Component :: component(),
+      Val :: value(),
+      OldVal :: value().
 
 set_token(Type, Val) ->
     erlang:seq_trace(Type, Val).
 
--spec get_token() -> term().
+-spec get_token() -> [] | token().
 
 get_token() ->
     element(2,process_info(self(),sequential_trace_token)).
 
--spec get_token(component()) -> token_pair().
-
+-spec get_token(Component) -> {Component, Val} when
+      Component :: component(),
+      Val :: value().
 get_token(Type) ->
     erlang:seq_trace_info(Type).
 
--spec print(term()) -> 'ok'.
+-spec print(TraceInfo) -> 'ok' when
+      TraceInfo :: term().
 
 print(Term) ->
     erlang:seq_trace_print(Term),
     ok.
 
--spec print(integer(), term()) -> 'ok'.
+-spec print(Label, TraceInfo) -> 'ok' when
+      Label :: integer(),
+      TraceInfo :: term().
 
 print(Label, Term) when is_atom(Label) ->
     erlang:error(badarg, [Label, Term]);
@@ -94,14 +103,17 @@ reset_trace() ->
 
 %% reset_trace(Pid) -> % this might be a useful function too
 
--type tracer() :: pid() | port() | 'false'.
+-type tracer() :: (Pid :: pid()) | port() | 'false'.
 
--spec set_system_tracer(tracer()) -> tracer().
+-spec set_system_tracer(Tracer) -> OldTracer when
+      Tracer :: tracer(),
+      OldTracer :: tracer().
 
 set_system_tracer(Pid) ->
     erlang:system_flag(sequential_tracer, Pid).
 
--spec get_system_tracer() -> tracer().
+-spec get_system_tracer() -> Tracer when
+      Tracer :: tracer().
 
 get_system_tracer() ->
     element(2, erlang:system_info(sequential_tracer)).
diff --git a/lib/kernel/src/wrap_log_reader.erl b/lib/kernel/src/wrap_log_reader.erl
index fabaa07752..c41e0091e4 100644
--- a/lib/kernel/src/wrap_log_reader.erl
+++ b/lib/kernel/src/wrap_log_reader.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. 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
@@ -41,6 +41,8 @@
 	 first_no :: non_neg_integer() | 'one' % first read file number
 	}).
 
+-opaque continuation() :: #wrap_reader{}.
+
 %%
 %%  Exported functions
 %%
@@ -50,9 +52,11 @@
 %% is not yet reached, we are on the first 'round' of filling the wrap
 %% files.
 
--type open_ret() :: {'ok', #wrap_reader{}} | {'error', tuple()}.
+-type open_ret() :: {'ok', Continuation :: continuation()}
+                  | {'error', Reason :: tuple()}.
 
--spec open(atom() | string()) -> open_ret().
+-spec open(Filename) -> open_ret() when
+      Filename :: string() | atom().
 
 open(File) when is_atom(File) ->
     open(atom_to_list(File));
@@ -77,7 +81,9 @@ open(File) when is_list(File) ->
 	    Error
     end.
 
--spec open(atom() | string(), integer()) -> open_ret().
+-spec open(Filename, N) -> open_ret() when
+      Filename :: string() | atom(),
+      N :: integer().
 
 open(File, FileNo) when is_atom(File), is_integer(FileNo) ->
     open(atom_to_list(File), FileNo);
@@ -100,22 +106,29 @@ open(File, FileNo) when is_list(File), is_integer(FileNo) ->
 	    Error
     end.
 
--spec close(#wrap_reader{}) -> 'ok' | {'error', atom()}.
+-spec close(Continuation) -> 'ok' | {'error', Reason} when
+      Continuation :: continuation(),
+      Reason :: file:posix().
 
 close(#wrap_reader{fd = FD}) ->
     file:close(FD).
 
--type chunk_ret() :: {#wrap_reader{}, [term()]}
-                   | {#wrap_reader{}, [term()], non_neg_integer()}
-                   | {#wrap_reader{}, 'eof'}
-                   | {'error', term()}.
+-type chunk_ret() :: {Continuation2, Terms :: [term()]}
+                   | {Continuation2,
+                      Terms :: [term()],
+                      Badbytes :: non_neg_integer()}
+                   | {Continuation2, 'eof'}
+                   | {'error', Reason :: term()}.
 
--spec chunk(#wrap_reader{}) -> chunk_ret().
+-spec chunk(Continuation) -> chunk_ret() when
+      Continuation :: continuation().
 
 chunk(WR = #wrap_reader{}) ->
     chunk(WR, ?MAX_CHUNK_SIZE, 0).
 
--spec chunk(#wrap_reader{}, 'infinity' | pos_integer()) -> chunk_ret().
+-spec chunk(Continuation, N) -> chunk_ret() when
+      Continuation :: continuation(),
+      N :: infinity | pos_integer().
 
 chunk(WR = #wrap_reader{}, infinity) ->
     chunk(WR, ?MAX_CHUNK_SIZE, 0);
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 8078c7d021..2f73394c4e 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -2055,6 +2055,10 @@ try_read_file_list(Fd) ->
     ?line Title = "Real Programmers Don't Use PASCAL</TITLE>\n",
     ?line Title = io:get_line(Fd, ''),
 
+    %% Seek past the end of the file.
+
+    ?line {ok, _} = ?FILE_MODULE:position(Fd, 25000),
+
     %% Done.
 
     ?line ?FILE_MODULE:close(Fd),
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl
index 5fc8df475d..6064a9b2d9 100644
--- a/lib/kernel/test/inet_res_SUITE.erl
+++ b/lib/kernel/test/inet_res_SUITE.erl
@@ -27,7 +27,8 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2, end_per_testcase/2]).
--export([basic/1, resolve/1, edns0/1, txt_record/1, files_monitor/1]).
+-export([basic/1, resolve/1, edns0/1, txt_record/1, files_monitor/1,
+	 last_ms_answer/1]).
 -export([
 	 gethostbyaddr/0, gethostbyaddr/1,
 	 gethostbyaddr_v6/0, gethostbyaddr_v6/1,
@@ -45,6 +46,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [basic, resolve, edns0, txt_record, files_monitor,
+     last_ms_answer,
      gethostbyaddr, gethostbyaddr_v6, gethostbyname,
      gethostbyname_v6, getaddr, getaddr_v6, ipv4_to_ipv6,
      host_and_addr].
@@ -64,16 +66,15 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-zone_dir(basic) ->
-    otptest;
-zone_dir(resolve) ->
-    otptest;
-zone_dir(edns0) ->
-    otptest;
-zone_dir(files_monitor) ->
-    otptest;
-zone_dir(_) ->
-    undefined.
+zone_dir(TC) ->
+    case TC of
+	basic -> otptest;
+	resolve -> otptest;
+	edns0 -> otptest;
+	files_monitor -> otptest;
+	last_ms_answer -> otptest;
+	_ -> undefined
+    end.
 
 init_per_testcase(Func, Config) ->
     PrivDir = ?config(priv_dir, Config),
@@ -184,6 +185,88 @@ ns_printlog(Fname) ->
 	    ok
     end.
 
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Behaviour modifying nameserver proxy
+
+proxy_start(TC, {NS,P}) ->
+    Tag = make_ref(),
+    Parent = self(),
+    Pid =
+	spawn_link(
+	  fun () ->
+		  try proxy_start(TC, NS, P, Parent, Tag)
+		  catch C:X ->
+			  io:format(
+			    "~w: ~w:~p ~p~n",
+			    [self(),C,X,erlang:get_stacktrace()])
+		  end
+	  end),
+    receive {started,Tag,Port} ->
+	    ProxyNS = {{127,0,0,1},Port},
+	    {proxy,Pid,Tag,ProxyNS}
+    end.
+
+proxy_start(TC, NS, P, Parent, Tag) ->
+    {ok,Outbound} = gen_udp:open(0, [binary]),
+    ok = gen_udp:connect(Outbound, NS, P),
+    {ok,Inbound} = gen_udp:open(0, [binary]),
+    {ok,Port} = inet:port(Inbound),
+    Parent ! {started,Tag,Port},
+    proxy(TC, Outbound, NS, P, Inbound).
+
+
+%% To provoke the last_ms_answer bug (OTP-9221) the proxy
+%% * Relays the query to the right nameserver
+%% * Intercepts the reply but holds it until the timer that
+%%   was started when receiving the query fires.
+%% * Repeats the reply with incorrect query ID a number of
+%%   times with a short interval.
+%% * Sends the correct reply, to give a correct test result
+%%   after bug correction.
+%%
+%% The repetition of an incorrect answer with tight interval will keep
+%% inet_res in an inner loop in the code that decrements the remaining
+%% time until it hits 0 which triggers a crash, if the outer timeout
+%% parameter to inet_res:resolve is so short that it runs out during
+%% these repetitions.
+proxy(last_ms_answer, Outbound, NS, P, Inbound) ->
+    receive
+	{udp,Inbound,SrcIP,SrcPort,Data} ->
+	    Time =
+		inet_db:res_option(timeout) div inet_db:res_option(retry),
+	    Tag = erlang:make_ref(),
+	    erlang:send_after(Time - 10, self(), {time,Tag}),
+	    ok = gen_udp:send(Outbound, NS, P, Data),
+	    receive
+		{udp,Outbound,NS,P,Reply} ->
+		    {ok,Msg} = inet_dns:decode(Reply),
+		    Hdr = inet_dns:msg(Msg, header),
+		    Id = inet_dns:header(Hdr, id),
+		    BadHdr =
+			inet_dns:make_header(Hdr, id, (Id+1) band 16#ffff),
+		    BadMsg = inet_dns:make_msg(Msg, header, BadHdr),
+		    BadReply = inet_dns:encode(BadMsg),
+		    receive
+			{time,Tag} ->
+			    proxy__last_ms_answer(
+			      Inbound, SrcIP, SrcPort, BadReply, Reply, 30)
+		    end
+	    end
+    end.
+
+proxy__last_ms_answer(Socket, IP, Port, _, Reply, 0) ->
+    ok = gen_udp:send(Socket, IP, Port, Reply);
+proxy__last_ms_answer(Socket, IP, Port, BadReply, Reply, N) ->
+    ok = gen_udp:send(Socket, IP, Port, BadReply),
+    receive after 1 -> ok end,
+    proxy__last_ms_answer(Socket, IP, Port, BadReply, Reply, N-1).
+
+proxy_wait({proxy,Pid,_,_}) ->
+    Mref = erlang:monitor(process, Pid),
+    receive {'DOWN',Mref,_,_,_} -> ok end.
+
+proxy_ns({proxy,_,_,ProxyNS}) -> ProxyNS.
+
 %%
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -204,7 +287,7 @@ basic(Config) when is_list(Config) ->
     {ok,Msg1} = inet_dns:decode(Bin1),
     %%
     %% resolve
-    {ok,Msg2} = inet_res:resolve(Name, in, a, [{nameservers,[NS]}]),
+    {ok,Msg2} = inet_res:resolve(Name, in, a, [{nameservers,[NS]},verbose]),
     io:format("~p~n", [Msg2]),
     [RR2] = inet_dns:msg(Msg2, anlist),
     IP = inet_dns:rr(RR2, data),
@@ -474,6 +557,26 @@ do_files_monitor(Config) ->
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+last_ms_answer(doc) ->
+    ["Answer just when timeout is triggered (OTP-9221)"];
+last_ms_answer(Config) when is_list(Config) ->
+    NS = ns(Config),
+    Name = "ns.otptest",
+    %%IP = {127,0,0,254},
+    Time = inet_db:res_option(timeout) div inet_db:res_option(retry),
+    PSpec = proxy_start(last_ms_answer, NS),
+    ProxyNS = proxy_ns(PSpec),
+    %%
+    %% resolve; whith short timeout to trigger Timeout =:= 0 in inet_res
+    {error,timeout} =
+	inet_res:resolve(
+	  Name, in, a, [{nameservers,[ProxyNS]},verbose], Time + 10),
+    %%
+    proxy_wait(PSpec),
+    ok.
+
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Compatibility tests. Call the inet_SUITE tests, but with
 %% lookup = [file,dns] instead of [native]
 
diff --git a/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc
index 7078499fbf..21174340d1 100644
--- a/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc
@@ -473,6 +473,13 @@ dets:close(N).      </pre>
       <c>mnesia:table_info(Tab, master_nodes)</c> may be used to
       obtain information about the potential master nodes.
       </p>
+    <p>Determining which data to keep after communication failure is outside
+    the scope of Mnesia. One approach would be to determine which "island"
+    contains a majority of the nodes. Using the <c>{majority,true}</c> option
+    for critical tables can be a way of ensuring that nodes that are not part
+    of a "majority island" are not able to update those tables. Note that this
+    constitutes a reduction in service on the minority nodes. This would be
+    a tradeoff in favour of higher consistency guarantees.</p>
     <p>The function <c>mnesia:force_load_table(Tab)</c> may be used to
       force load the table regardless of which table load mechanism
       is activated.
diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml
index 16e78ea0af..2a2c7d3a9f 100644
--- a/lib/mnesia/doc/src/mnesia.xml
+++ b/lib/mnesia/doc/src/mnesia.xml
@@ -161,6 +161,14 @@ If a new item is inserted with the same key as
           </p>
       </item>
       <item>
+	<p><c>majority</c> This attribute can be either <c>true</c> or
+	<c>false</c> (default is <c>false</c>). When <c>true</c>, a majority
+	of the table replicas must be available for an update to succeed.
+	Majority checking can be enabled on tables with mission-critical data,
+	where it is vital to avoid inconsistencies due to network splits.
+	</p>
+      </item>
+      <item>
         <p><c>snmp</c> Each (set based) Mnesia table can be
           automatically turned into an SNMP ordered table as well.
           This property specifies the types of the SNMP keys.
@@ -650,6 +658,17 @@ mnesia:change_table_copy_type(person, node(), disc_copies)
       </desc>
     </func>
     <func>
+      <name>change_table_majority(Tab, Majority) -> {aborted, R} | {atomic, ok}</name>
+      <fsummary>Change the majority check setting for the table.</fsummary>
+      <desc>
+        <p><c>Majority</c> must be a boolean; the default is <c>false</c>.
+	When <c>true</c>, a majority of the table's replicas must be available
+	for an update to succeed. When used on fragmented tables, <c>Tab</c>
+	must be the name base table. Directly changing the majority setting on
+	individual fragments is not allowed.</p>
+      </desc>
+    </func>
+    <func>
       <name>clear_table(Tab) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Deletes all entries in a table.</fsummary>
       <desc>
@@ -753,6 +772,14 @@ mnesia:change_table_copy_type(person, node(), disc_copies)
               priority will be loaded first at startup.
               </p>
           </item>
+	  <item>
+	    <p><c>{majority, Flag}</c>, where <c>Flag</c> must be a boolean.
+	    If <c>true</c>, any (non-dirty) update to the table will abort unless
+	    a majority of the table's replicas are available for the commit.
+	    When used on a fragmented table, all fragments will be given
+	    the same majority setting.
+	    </p>
+	  </item>
           <item>
             <p><c>{ram_copies, Nodelist}</c>, where
               <c>Nodelist</c> is a list of the nodes where this table
@@ -1737,7 +1764,10 @@ mnesia:create_table(person,
           <c>write</c> and <c>sticky_write</c> are supported.
           </p>
         <p>If the user wants to update the record it is more efficient to 
-          use  <c>write/sticky_write</c> as the LockKind.
+          use  <c>write/sticky_write</c> as the LockKind. If majority checking
+	  is active on the table, it will be checked as soon as a write lock is
+	  attempted. This can be used to quickly abort if the majority condition
+	  isn't met.
           </p>
       </desc>
     </func>
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 19574a1434..f1c362261a 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl
index 025b32f506..980a9c6213 100644
--- a/lib/mnesia/src/mnesia.erl
+++ b/lib/mnesia/src/mnesia.erl
@@ -39,6 +39,7 @@
 
 	 %% Access within an activity - Lock acquisition
 	 lock/2, lock/4,
+	 lock_table/2,
 	 read_lock_table/1, 
 	 write_lock_table/1,
 
@@ -92,7 +93,7 @@
 	 add_table_copy/3, del_table_copy/2, move_table_copy/3,
 	 add_table_index/2, del_table_index/2,
 	 transform_table/3, transform_table/4,
-	 change_table_copy_type/3,
+	 change_table_copy_type/3, change_table_majority/2,
 	 read_table_property/2, write_table_property/2, delete_table_property/2,
 	 change_table_frag/2,
 	 clear_table/1, clear_table/4,
@@ -415,6 +416,9 @@ lock(LockItem, LockKind) ->
 	    abort(no_transaction)
     end.
 
+lock_table(Tab, LockKind) ->
+    lock({table, Tab}, LockKind).
+
 lock(Tid, Ts, LockItem, LockKind) ->
     case element(1, Tid) of
 	tid ->
@@ -467,6 +471,8 @@ lock_table(Tid, Ts, Tab, LockKind) when is_atom(Tab) ->
 	    mnesia_locker:rlock_table(Tid, Store, Tab);
 	write ->
 	    mnesia_locker:wlock_table(Tid, Store, Tab);
+	load ->
+	    mnesia_locker:load_lock_table(Tid, Store, Tab);
 	sticky_write ->
 	    mnesia_locker:sticky_wlock_table(Tid, Store, Tab);
 	none ->
@@ -2455,6 +2461,9 @@ change_table_access_mode(T, Access) ->
 change_table_load_order(T, O) -> 
     mnesia_schema:change_table_load_order(T, O).
 
+change_table_majority(T, M) ->
+    mnesia_schema:change_table_majority(T, M).
+
 set_master_nodes(Nodes) when is_list(Nodes) ->
     UseDir = system_info(use_dir),
     IsRunning = system_info(is_running),
diff --git a/lib/mnesia/src/mnesia.hrl b/lib/mnesia/src/mnesia.hrl
index d488d9364a..26537815a3 100644
--- a/lib/mnesia/src/mnesia.hrl
+++ b/lib/mnesia/src/mnesia.hrl
@@ -62,6 +62,7 @@
 		  disc_only_copies = [],           % [Node]
 		  load_order = 0,                  % Integer
 		  access_mode = read_write,        % read_write | read_only
+		  majority = false,                % true | false
 		  index = [],                      % [Integer]
 		  snmp = [],                       % Snmp Ustruct
 		  local_content = false,           % true | false
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index 0254769758..d4b2c7b5cc 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -72,6 +72,7 @@
 	 add_active_replica/4,
 	 update/1,
 	 change_table_access_mode/1,
+	 change_table_majority/1,
 	 del_active_replica/2,
 	 wait_for_tables/2,
 	 get_network_copy/2,
@@ -690,7 +691,8 @@ handle_call({update_where_to_write, [add, Tab, AddNode], _From}, _Dummy, State)
 	case lists:member(AddNode, Current) and 
 	    (State#state.schema_is_merged == true) of
 	    true ->
-		mnesia_lib:add_lsort({Tab, where_to_write}, AddNode);
+		mnesia_lib:add_lsort({Tab, where_to_write}, AddNode),
+		update_where_to_wlock(Tab);
 	    false ->
 		ignore
 	end,
@@ -1690,6 +1692,8 @@ add_active_replica(Tab, Node, Storage, AccessMode) ->
 	    set(Var, mark_blocked_tab(Blocked, Del)),
 	    mnesia_lib:del({Tab, where_to_write}, Node)
     end,
+
+    update_where_to_wlock(Tab),
     add({Tab, active_replicas}, Node).
 
 del_active_replica(Tab, Node) ->
@@ -1699,7 +1703,8 @@ del_active_replica(Tab, Node) ->
     New = lists:sort(Del),
     set(Var, mark_blocked_tab(Blocked, New)),      % where_to_commit
     mnesia_lib:del({Tab, active_replicas}, Node),
-    mnesia_lib:del({Tab, where_to_write}, Node).
+    mnesia_lib:del({Tab, where_to_write}, Node),
+    update_where_to_wlock(Tab).
 
 change_table_access_mode(Cs) ->
     W = fun() -> 
@@ -1708,7 +1713,22 @@ change_table_access_mode(Cs) ->
 			      val({Tab, active_replicas}))
 	end,
     update(W).
-	    
+
+change_table_majority(Cs) ->
+    W = fun() ->
+		Tab = Cs#cstruct.name,
+		set({Tab, majority}, Cs#cstruct.majority),
+		update_where_to_wlock(Tab)
+	end,
+    update(W).
+
+update_where_to_wlock(Tab) ->
+    WNodes = val({Tab, where_to_write}),
+    Majority = case catch val({Tab, majority}) of
+		   true -> true;
+		   _    -> false
+	       end,
+    set({Tab, where_to_wlock}, {WNodes, Majority}).
 
 %% node To now has tab loaded, but this must be undone
 %% This code is rpc:call'ed from the tab_copier process
diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl
index 644133cf5d..92fd9dfade 100644
--- a/lib/mnesia/src/mnesia_dumper.erl
+++ b/lib/mnesia/src/mnesia_dumper.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -871,7 +871,11 @@ insert_op(Tid, _, {op, add_index, Pos, TabDef}, InPlace, InitBy) ->
 	startup ->
 	    ignore; 
 	_  ->
-	    mnesia_index:init_indecies(Tab, Storage, [Pos])
+	    case val({Tab,where_to_read}) of
+		nowhere -> ignore;
+		_ ->
+		    mnesia_index:init_indecies(Tab, Storage, [Pos])
+	    end
     end;
 
 insert_op(Tid, _, {op, del_index, Pos, TabDef}, InPlace, InitBy) ->
@@ -896,6 +900,14 @@ insert_op(Tid, _, {op, change_table_access_mode,TabDef, _OldAccess, _Access}, In
     end,
     insert_cstruct(Tid, Cs, true, InPlace, InitBy);
 
+insert_op(Tid, _, {op, change_table_majority,TabDef, _OldAccess, _Access}, InPlace, InitBy) ->
+    Cs = mnesia_schema:list2cs(TabDef),
+    case InitBy of
+	startup -> ignore;
+	_ -> mnesia_controller:change_table_majority(Cs)
+    end,
+    insert_cstruct(Tid, Cs, true, InPlace, InitBy);
+
 insert_op(Tid, _, {op, change_table_load_order, TabDef, _OldLevel, _Level}, InPlace, InitBy) ->
     Cs = mnesia_schema:list2cs(TabDef),
     insert_cstruct(Tid, Cs, true, InPlace, InitBy);
diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl
index 36bcfe8de9..7e926a6258 100644
--- a/lib/mnesia/src/mnesia_lib.erl
+++ b/lib/mnesia/src/mnesia_lib.erl
@@ -96,6 +96,8 @@
 	 exists/1,
 	 fatal/2,
 	 get_node_number/0,
+	 have_majority/2,
+	 have_majority/3,
 	 fix_error/1,
 	 important/2,
 	 incr_counter/1,
@@ -660,6 +662,14 @@ proc_info(_) -> false.
 get_node_number() ->
     {node(), self()}.
 
+have_majority(Tab, HaveNodes) ->
+    have_majority(Tab, val({Tab, all_nodes}), HaveNodes).
+
+have_majority(_Tab, AllNodes, HaveNodes) ->
+    Missing = AllNodes -- HaveNodes,
+    Present = AllNodes -- Missing,
+    length(Present) > length(Missing).
+
 read_log_files() ->
     [{F, catch file:read_file(F)} || F <- mnesia_log:log_files()].
 
diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl
index 3de329503e..e785b795d1 100644
--- a/lib/mnesia/src/mnesia_loader.erl
+++ b/lib/mnesia/src/mnesia_loader.erl
@@ -702,7 +702,7 @@ send_table(Pid, Tab, RemoteS) ->
 prepare_copy(Pid, Tab, Storage) ->
     Trans =
 	fun() ->
-		mnesia:write_lock_table(Tab),
+		mnesia:lock_table(Tab, load),
 		mnesia_subscr:subscribe(Pid, {table, Tab}),
 		update_where_to_write(Tab, node(Pid)),
 		mnesia_lib:db_fixtable(Storage, Tab, true),
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl
index ca0cc79c45..0492d794f3 100644
--- a/lib/mnesia/src/mnesia_locker.erl
+++ b/lib/mnesia/src/mnesia_locker.erl
@@ -40,7 +40,8 @@
 	 sticky_wlock_table/3,
 	 wlock/3,
 	 wlock_no_exist/4,
-	 wlock_table/3
+	 wlock_table/3,
+	 load_lock_table/3
 	]).
 
 %% sys callback functions
@@ -656,16 +657,17 @@ rwlock(Tid, Store, Oid) ->
 	    Lock = write,
 	    case need_lock(Store, Tab, Key, Lock)  of
 		yes ->
-		    Ns = w_nodes(Tab),
+		    {Ns, Majority} = w_nodes(Tab),
+		    check_majority(Majority, Tab, Ns),
 		    Res = get_rwlocks_on_nodes(Ns, rwlock, Node, Store, Tid, Oid),
 		    ?ets_insert(Store, {{locks, Tab, Key}, Lock}),
 		    Res;
 		no ->
 		    if
 			Key == ?ALL ->
-			    w_nodes(Tab);
+			    element(2, w_nodes(Tab));
 			Tab == ?GLOBAL ->
-			    w_nodes(Tab);
+			    element(2, w_nodes(Tab));
 			true ->
 			    dirty_rpc(Node, Tab, Key, Lock)
 		    end
@@ -677,12 +679,34 @@ rwlock(Tid, Store, Oid) ->
 %% in the local store under the key == nodes
 
 w_nodes(Tab) ->
-    Nodes = ?catch_val({Tab, where_to_write}),
-    case Nodes of
-	[_ | _] -> Nodes;
+    case ?catch_val({Tab, where_to_wlock}) of
+	{[_ | _], _} = Where -> Where;
 	_ ->  mnesia:abort({no_exists, Tab})
     end.
 
+%% If the table has the 'majority' flag set, we can
+%% only take a write lock if we see a majority of the
+%% nodes.
+
+
+check_majority(true, Tab, HaveNs) ->
+    check_majority(Tab, HaveNs);
+check_majority(false, _, _) ->
+    ok.
+
+check_majority(Tab, HaveNs) ->
+    case ?catch_val({Tab, majority}) of
+	true ->
+	    case mnesia_lib:have_majority(Tab, HaveNs) of
+		true ->
+		    ok;
+		false ->
+		    mnesia:abort({no_majority, Tab})
+	    end;
+	_ ->
+	    ok
+    end.
+
 %% aquire a sticky wlock, a sticky lock is a lock
 %% which remains at this node after the termination of the
 %% transaction.
@@ -708,12 +732,14 @@ sticky_lock(Tid, Store, {Tab, Key} = Oid, Lock) ->
     end.
 
 do_sticky_lock(Tid, Store, {Tab, Key} = Oid, Lock) ->
+    {WNodes, Majority} = w_nodes(Tab),
+    sticky_check_majority(Lock, Tab, Majority, WNodes),
     ?MODULE ! {self(), {test_set_sticky, Tid, Oid, Lock}},
     N = node(),
     receive
 	{?MODULE, N, granted} ->
 	    ?ets_insert(Store, {{locks, Tab, Key}, write}),
-	    [?ets_insert(Store, {nodes, Node}) || Node <- w_nodes(Tab)],
+	    [?ets_insert(Store, {nodes, Node}) || Node <- WNodes],
 	    granted;
 	{?MODULE, N, {granted, Val}} -> %% for rwlocks
 	    case opt_lookup_in_client(Val, Oid, write) of
@@ -721,7 +747,7 @@ do_sticky_lock(Tid, Store, {Tab, Key} = Oid, Lock) ->
 		    exit({aborted, C});
 		Val2 ->
 		    ?ets_insert(Store, {{locks, Tab, Key}, write}),
-		    [?ets_insert(Store, {nodes, Node}) || Node <- w_nodes(Tab)],
+		    [?ets_insert(Store, {nodes, Node}) || Node <- WNodes],
 		    Val2
 	    end;
 	{?MODULE, N, {not_granted, Reason}} ->
@@ -737,6 +763,16 @@ do_sticky_lock(Tid, Store, {Tab, Key} = Oid, Lock) ->
 	    dirty_sticky_lock(Tab, Key, [N], Lock)
     end.
 
+sticky_check_majority(W, Tab, true, WNodes) when W==write; W==read_write ->
+    case mnesia_lib:have_majority(Tab, WNodes) of
+	true ->
+	    ok;
+	false ->
+	    mnesia:abort({no_majority, Tab})
+    end;
+sticky_check_majority(_, _, _, _) ->
+    ok.
+
 not_stuck(Tid, Store, Tab, _Key, Oid, _Lock, N) ->
     rlock(Tid, Store, {Tab, ?ALL}),   %% needed?
     wlock(Tid, Store, Oid),           %% perfect sync
@@ -773,22 +809,33 @@ sticky_wlock_table(Tid, Store, Tab) ->
 %% local store when we have aquired the lock.
 %% 
 wlock(Tid, Store, Oid) ->
+    wlock(Tid, Store, Oid, _CheckMajority = true).
+
+wlock(Tid, Store, Oid, CheckMajority) ->
     {Tab, Key} = Oid,
     case need_lock(Store, Tab, Key, write) of
 	yes ->
-	    Ns = w_nodes(Tab),
+	    {Ns, Majority} = w_nodes(Tab),
+	    if CheckMajority ->
+		    check_majority(Majority, Tab, Ns);
+	       true ->
+		    ignore
+	    end,
 	    Op = {self(), {write, Tid, Oid}},
 	    ?ets_insert(Store, {{locks, Tab, Key}, write}),
 	    get_wlocks_on_nodes(Ns, Ns, Store, Op, Oid);
 	no when Key /= ?ALL, Tab /= ?GLOBAL ->
 	    [];
 	no ->
-	    w_nodes(Tab)
+	    element(2, w_nodes(Tab))
     end.
 
 wlock_table(Tid, Store, Tab) ->
     wlock(Tid, Store, {Tab, ?ALL}).
 
+load_lock_table(Tid, Store, Tab) ->
+    wlock(Tid, Store, {Tab, ?ALL}, _CheckMajority = false).
+
 %% Write lock even if the table does not exist
 
 wlock_no_exist(Tid, Store, Tab, Ns) ->
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index d1d892a387..fef72ad39c 100644
--- a/lib/mnesia/src/mnesia_schema.erl
+++ b/lib/mnesia/src/mnesia_schema.erl
@@ -37,6 +37,7 @@
          change_table_copy_type/3,
          change_table_access_mode/2,
          change_table_load_order/2,
+	 change_table_majority/2,
 	 change_table_frag/2,
 	 clear_table/1,
          create_table/1,
@@ -178,6 +179,8 @@ do_set_schema(Tab, Cs) ->
     set({Tab, disc_only_copies}, Cs#cstruct.disc_only_copies),
     set({Tab, load_order}, Cs#cstruct.load_order),
     set({Tab, access_mode}, Cs#cstruct.access_mode),
+    set({Tab, majority}, Cs#cstruct.majority),
+    set({Tab, all_nodes}, mnesia_lib:cs_to_nodes(Cs)),
     set({Tab, snmp}, Cs#cstruct.snmp),
     set({Tab, user_properties}, Cs#cstruct.user_properties),
     [set({Tab, user_property, element(1, P)}, P) || P <- Cs#cstruct.user_properties],
@@ -651,6 +654,7 @@ list2cs(List) when is_list(List) ->
     Snmp = pick(Name, snmp, List, []),
     LoadOrder = pick(Name, load_order, List, 0),
     AccessMode = pick(Name, access_mode, List, read_write),
+    Majority = pick(Name, majority, List, false),
     UserProps = pick(Name, user_properties, List, []),
     verify({alt, [nil, list]}, mnesia_lib:etype(UserProps),
 	   {bad_type, Name, {user_properties, UserProps}}),
@@ -676,6 +680,7 @@ list2cs(List) when is_list(List) ->
              snmp = Snmp,
              load_order = LoadOrder,
              access_mode = AccessMode,
+	     majority = Majority,
              local_content = LC,
 	     record_name = RecName,
              attributes = Attrs,
@@ -809,7 +814,16 @@ verify_cstruct(Cs) when is_record(Cs, cstruct) ->
     Access = Cs#cstruct.access_mode,
     verify({alt, [read_write, read_only]}, Access,
 	   {bad_type, Tab, {access_mode, Access}}),
-
+    Majority = Cs#cstruct.majority,
+    verify({alt, [true, false]}, Majority,
+	   {bad_type, Tab, {majority, Majority}}),
+    case Majority of
+	true ->
+	    verify(false, LC,
+		   {combine_error, Tab, [{local_content,true},{majority,true}]});
+	false ->
+	    ok
+    end,
     Snmp = Cs#cstruct.snmp,
     verify(true, mnesia_snmp_hook:check_ustruct(Snmp),
 	   {badarg, Tab, {snmp, Snmp}}),
@@ -1495,6 +1509,43 @@ make_change_table_load_order(Tab, LoadOrder) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+change_table_majority(Tab, Majority) when is_boolean(Majority) ->
+    schema_transaction(fun() -> do_change_table_majority(Tab, Majority) end).
+
+do_change_table_majority(schema, _Majority) ->
+    mnesia:abort({bad_type, schema});
+do_change_table_majority(Tab, Majority) ->
+    TidTs = get_tid_ts_and_lock(schema, write),
+    get_tid_ts_and_lock(Tab, none),
+    insert_schema_ops(TidTs, make_change_table_majority(Tab, Majority)).
+
+make_change_table_majority(Tab, Majority) ->
+    ensure_writable(schema),
+    Cs = incr_version(val({Tab, cstruct})),
+    ensure_active(Cs),
+    OldMajority = Cs#cstruct.majority,
+    Cs2 = Cs#cstruct{majority = Majority},
+    FragOps = case lists:keyfind(base_table, 1, Cs#cstruct.frag_properties) of
+		  {_, Tab} ->
+		      FragNames = mnesia_frag:frag_names(Tab) -- [Tab],
+		      lists:map(
+			fun(T) ->
+				get_tid_ts_and_lock(Tab, none),
+				CsT = incr_version(val({T, cstruct})),
+				ensure_active(CsT),
+				CsT2 = CsT#cstruct{majority = Majority},
+				verify_cstruct(CsT2),
+				{op, change_table_majority, cs2list(CsT2),
+				 OldMajority, Majority}
+			end, FragNames);
+		  false    -> [];
+		  {_, _}   -> mnesia:abort({bad_type, Tab})
+	      end,
+    verify_cstruct(Cs2),
+    [{op, change_table_majority, cs2list(Cs2), OldMajority, Majority} | FragOps].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 write_table_property(Tab, Prop) when is_tuple(Prop), size(Prop) >= 1 ->
     schema_transaction(fun() -> do_write_table_property(Tab, Prop) end);
 write_table_property(Tab, Prop) ->
@@ -1734,7 +1785,10 @@ prepare_op(_Tid, {op, announce_im_running, Node, SchemaDef, Running, RemoteRunni
 	Node == node() -> %% Announce has already run on local node 
 	    ignore;       %% from do_merge_schema
 	true ->
-	    NewNodes = mnesia_lib:uniq(Running++RemoteRunning) -- val({current,db_nodes}),
+	    %% If a node has restarted it may still linger in db_nodes,
+	    %% but have been removed from recover_nodes
+	    Current  = mnesia_lib:intersect(val({current,db_nodes}), [node()|val(recover_nodes)]),
+	    NewNodes = mnesia_lib:uniq(Running++RemoteRunning) -- Current,
 	    mnesia_lib:set(prepare_op, {announce_im_running,NewNodes}),
 	    announce_im_running(NewNodes, SchemaCs)
     end,
@@ -2971,6 +3025,7 @@ merge_versions(AnythingNew, Cs, RemoteCs, Force) ->
 	Cs#cstruct.index == RemoteCs#cstruct.index,
 	Cs#cstruct.snmp == RemoteCs#cstruct.snmp,
 	Cs#cstruct.access_mode == RemoteCs#cstruct.access_mode,
+	Cs#cstruct.majority == RemoteCs#cstruct.majority,
 	Cs#cstruct.load_order == RemoteCs#cstruct.load_order,
 	Cs#cstruct.user_properties == RemoteCs#cstruct.user_properties ->
 	    do_merge_versions(AnythingNew, Cs, RemoteCs);
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl
index bb8e788b40..f62f7cb7c8 100644
--- a/lib/mnesia/src/mnesia_tm.erl
+++ b/lib/mnesia/src/mnesia_tm.erl
@@ -64,7 +64,8 @@
 	       prev_tab = [], % initiate to a non valid table name
 	       prev_types,
 	       prev_snmp,
-	       types 
+	       types,
+	       majority = []
 	      }).
 
 -record(participant, {tid, pid, commit, disc_nodes = [], 
@@ -1100,9 +1101,12 @@ t_commit(Type) ->
 	    case arrange(Tid, Store, Type) of
 		{N, Prep} when N > 0 ->
 		    multi_commit(Prep#prep.protocol,
+				 majority_attr(Prep),
 				 Tid, Prep#prep.records, Store);
 		{0, Prep} ->
-		    multi_commit(read_only, Tid, Prep#prep.records, Store)
+		    multi_commit(read_only,
+				 majority_attr(Prep),
+				 Tid, Prep#prep.records, Store)
 	    end;
 	true ->
 	    %% nested commit
@@ -1117,6 +1121,10 @@ t_commit(Type) ->
 	    do_commit_nested
     end.
 
+majority_attr(#prep{majority = M}) ->
+    M.
+
+
 %% This function arranges for all objects we shall write in S to be
 %% in a list of {Node, CommitRecord}
 %% Important function for the performance of mnesia.
@@ -1222,11 +1230,13 @@ prepare_items(Tid, Tab, Key, Items, Prep) ->
 	{blocked, _} -> 
 	    unblocked = req({unblock_me, Tab}),
 	    prepare_items(Tid, Tab, Key, Items, Prep);
-	_ ->     
+	_ ->
+	    Majority = needs_majority(Tab, Prep),
 	    Snmp = val({Tab, snmp}),
 	    Recs2 = do_prepare_items(Tid, Tab, Key, Types, 
 				     Snmp, Items, Prep#prep.records),
 	    Prep2 = Prep#prep{records = Recs2, prev_tab = Tab, 
+			      majority = Majority,
 			      prev_types = Types, prev_snmp = Snmp},
 	    check_prep(Prep2, Types)
     end.
@@ -1235,6 +1245,33 @@ do_prepare_items(Tid, Tab, Key, Types, Snmp, Items, Recs) ->
     Recs2 = prepare_snmp(Tid, Tab, Key, Types, Snmp, Items, Recs), % May exit
     prepare_nodes(Tid, Types, Items, Recs2, normal).
 
+
+needs_majority(Tab, #prep{majority = M}) ->
+    case lists:keymember(Tab, 1, M) of
+	true ->
+	    M;
+	false ->
+	    case ?catch_val({Tab, majority}) of
+		{'EXIT', _} ->
+		    M;
+		false ->
+		    M;
+		true ->
+		    CopyHolders = val({Tab, all_nodes}),
+		    [{Tab, CopyHolders} | M]
+	    end
+    end.
+
+have_majority([], _) ->
+    ok;
+have_majority([{Tab, AllNodes} | Rest], Nodes) ->
+    case mnesia_lib:have_majority(Tab, AllNodes, Nodes) of
+	true ->
+	    have_majority(Rest, Nodes);
+	false ->
+	    {error, Tab}
+    end.
+
 prepare_snmp(Tab, Key, Items) ->
     case val({Tab, snmp}) of 
 	[] ->
@@ -1261,10 +1298,15 @@ prepare_snmp(Tid, Tab, Key, Types, Us, Items, Recs) ->
 	    prepare_nodes(Tid, Types, [{clear_table, Tab}], Recs, snmp)
     end.
 
-check_prep(Prep, Types) when Prep#prep.types == Types ->
+check_prep(#prep{majority = [], types = Types} = Prep, Types) ->
     Prep;
-check_prep(Prep, Types) when Prep#prep.types == undefined ->
-    Prep#prep{types = Types};
+check_prep(#prep{majority = M, types = undefined} = Prep, Types) ->
+    Protocol = if M == [] ->
+		       Prep#prep.protocol;
+		  true ->
+		       asym_trans
+	       end,
+    Prep#prep{protocol = Protocol, types = Types};
 check_prep(Prep, _Types) ->
     Prep#prep{protocol = asym_trans}.
 
@@ -1311,7 +1353,7 @@ prepare_node(_Node, _Storage, [], Rec, _Kind) ->
 
 %% multi_commit((Protocol, Tid, CommitRecords, Store)
 %% Local work is always performed in users process
-multi_commit(read_only, Tid, CR, _Store) ->
+multi_commit(read_only, _Maj = [], Tid, CR, _Store) ->
     %% This featherweight commit protocol is used when no 
     %% updates has been performed in the transaction.
 
@@ -1324,7 +1366,7 @@ multi_commit(read_only, Tid, CR, _Store) ->
     ?MODULE ! {delete_transaction, Tid},
     do_commit;
 
-multi_commit(sym_trans, Tid, CR, Store) ->
+multi_commit(sym_trans, _Maj = [], Tid, CR, Store) ->
     %% This lightweight commit protocol is used when all
     %% the involved tables are replicated symetrically.
     %% Their storage types must match on each node.
@@ -1376,7 +1418,7 @@ multi_commit(sym_trans, Tid, CR, Store) ->
 		    [{tid, Tid}, {outcome, Outcome}]),
     Outcome;
 
-multi_commit(sync_sym_trans, Tid, CR, Store) ->
+multi_commit(sync_sym_trans, _Maj = [], Tid, CR, Store) ->
     %%   This protocol is the same as sym_trans except that it
     %%   uses syncronized calls to disk_log and syncronized commits
     %%   when several nodes are involved.
@@ -1408,7 +1450,7 @@ multi_commit(sync_sym_trans, Tid, CR, Store) ->
 		    [{tid, Tid}, {outcome, Outcome}]),
     Outcome;
 
-multi_commit(asym_trans, Tid, CR, Store) ->
+multi_commit(asym_trans, Majority, Tid, CR, Store) ->
     %% This more expensive commit protocol is used when 
     %% table definitions are changed (schema transactions).
     %% It is also used when the involved tables are
@@ -1469,6 +1511,10 @@ multi_commit(asym_trans, Tid, CR, Store) ->
     {D2, CR2} = commit_decision(D, CR, [], []),
     DiscNs = D2#decision.disc_nodes,
     RamNs = D2#decision.ram_nodes,
+    case have_majority(Majority, DiscNs ++ RamNs) of
+	ok  -> ok;
+	{error, Tab} -> mnesia:abort({no_majority, Tab})
+    end,
     Pending = mnesia_checkpoint:tm_enter_pending(Tid, DiscNs, RamNs),
     ?ets_insert(Store, Pending),
     {WaitFor, Local} = ask_commit(asym_trans, Tid, CR2, DiscNs, RamNs),
diff --git a/lib/mnesia/test/.gitignore b/lib/mnesia/test/.gitignore
new file mode 100644
index 0000000000..1e9a9933ed
--- /dev/null
+++ b/lib/mnesia/test/.gitignore
@@ -0,0 +1,9 @@
+
+
+# Test generates
+MnesiaCore*
+Mnesia.*
+
+tempfile*
+mnesia_test_case_info
+test_log*
\ No newline at end of file
diff --git a/lib/mnesia/test/Makefile b/lib/mnesia/test/Makefile
index b165924ef2..ae4c9626c7 100644
--- a/lib/mnesia/test/Makefile
+++ b/lib/mnesia/test/Makefile
@@ -42,6 +42,7 @@ MODULES= \
 	mnesia_dirty_access_test \
 	mnesia_atomicity_test \
 	mnesia_consistency_test \
+	mnesia_majority_test \
 	mnesia_isolation_test \
 	mnesia_durability_test \
 	mnesia_recovery_test \
diff --git a/lib/mnesia/test/mnesia_SUITE.erl b/lib/mnesia/test/mnesia_SUITE.erl
index 8ba8427213..dc8f216c1c 100644
--- a/lib/mnesia/test/mnesia_SUITE.erl
+++ b/lib/mnesia/test/mnesia_SUITE.erl
@@ -142,6 +142,105 @@ silly() ->
     mnesia_install_test:silly().
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+light(doc) ->
+    ["The 'light' test suite runs a selected set of test suites and is",
+     "intended to be the smallest test suite that is meaningful",
+     "to run. It starts with an installation test (which in essence is the",
+     "'silly' test case) and then it covers all functions in the API in",
+     "various depths. All configuration parameters and examples are also",
+     "covered."];
+light(suite) ->
+    [
+     install,
+     nice,
+     evil,
+     {mnesia_frag_test, light},
+     qlc,
+     registry,
+     config,
+     examples
+    ].
+
+install(suite) ->
+    [{mnesia_install_test, all}].
+
+nice(suite) ->
+    [{mnesia_nice_coverage_test, all}].
+
+evil(suite) ->
+    [{mnesia_evil_coverage_test, all}].
+
+qlc(suite) ->
+    [{mnesia_qlc_test, all}].
+
+registry(suite) ->
+    [{mnesia_registry_test, all}].
+
+config(suite) ->
+    [{mnesia_config_test, all}].
+
+examples(suite) ->
+    [{mnesia_examples_test, all}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+medium(doc) ->
+    ["The 'medium' test suite verfies the ACID (atomicity, consistency",
+     "isolation and durability) properties and various recovery scenarios",
+     "These tests may take quite while to run."];
+medium(suite) ->
+    [
+     install,
+     atomicity,
+     isolation,
+     durability,
+     recovery,
+     consistency,
+     majority,
+     {mnesia_frag_test, medium}
+    ].
+
+atomicity(suite) ->
+     [{mnesia_atomicity_test, all}].
+
+isolation(suite) ->
+    [{mnesia_isolation_test, all}].
+
+durability(suite) ->
+    [{mnesia_durability_test, all}].
+
+recovery(suite) ->
+    [{mnesia_recovery_test, all}].
+
+consistency(suite) ->
+     [{mnesia_consistency_test, all}].
+
+majority(suite) ->
+    [{mnesia_majority_test, all}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+heavy(doc) ->
+    ["The 'heavy' test suite runs some resource consuming tests and",
+     "benchmarks"];
+heavy(suite) ->
+    [measure].
+
+measure(suite) ->
+    [{mnesia_measure_test, all}].
+
+prediction(suite) ->
+    [{mnesia_measure_test, prediction}].
+
+fairness(suite) ->
+    [{mnesia_measure_test, fairness}].
+
+benchmarks(suite) ->
+    [{mnesia_measure_test, benchmarks}].
+
+consumption(suite) ->
+    [{mnesia_measure_test, consumption}].
+
+scalability(suite) ->
+    [{mnesia_measure_test, scalability}].
 
 clean_up_suite(doc) -> ["Not a test case only kills mnesia and nodes, that where" 
 			"started during the tests"];
diff --git a/lib/mnesia/test/mnesia_durability_test.erl b/lib/mnesia/test/mnesia_durability_test.erl
index 55205d1222..2fee72f066 100644
--- a/lib/mnesia/test/mnesia_durability_test.erl
+++ b/lib/mnesia/test/mnesia_durability_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -119,8 +119,8 @@ load_latest_data(Config) when is_list(Config) ->
 
     ?match([], mnesia_test_lib:kill_mnesia([N2])),
     ?match(ok, mnesia:dirty_write(Rec1)),
-    ?match([], mnesia_test_lib:kill_mnesia([N1])),
     ?match([], mnesia_test_lib:kill_mnesia([N3])),
+    ?match([], mnesia_test_lib:kill_mnesia([N1])),
 
     ?match([], mnesia_test_lib:start_mnesia([N2], [])),   
     %% Should wait for N1
diff --git a/lib/mnesia/test/mnesia_majority_test.erl b/lib/mnesia/test/mnesia_majority_test.erl
new file mode 100644
index 0000000000..17d1d8bcdd
--- /dev/null
+++ b/lib/mnesia/test/mnesia_majority_test.erl
@@ -0,0 +1,188 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2009. 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(mnesia_majority_test).
+-author('[email protected]').
+-compile(export_all).
+-include("mnesia_test_lib.hrl").
+
+init_per_testcase(Func, Conf) ->
+    mnesia_test_lib:init_per_testcase(Func, Conf).
+
+fin_per_testcase(Func, Conf) ->
+    mnesia_test_lib:fin_per_testcase(Func, Conf).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+all(doc) ->
+    ["Verify that majority checking works"];
+all(suite) ->
+    [
+     write
+     , wread
+     , delete
+     , clear_table
+     , frag
+     , change_majority
+     , frag_change_majority
+    ].
+
+write(suite) -> [];
+write(Config) when is_list(Config) ->
+    [N1, N2, N3] = Nodes = ?acquire_nodes(3, Config),
+    Tab = t,
+    Schema = [{name, Tab}, {ram_copies, [N1,N2,N3]}, {majority,true}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match({[ok,ok,ok],[]},
+	   rpc:multicall([N1,N2,N3], mnesia, wait_for_tables, [[Tab], 3000])),
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    mnesia_test_lib:kill_mnesia([N3]),
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({aborted,{no_majority,Tab}},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)).
+
+wread(suite) -> [];
+wread(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = t,
+    Schema = [{name, Tab}, {ram_copies, [N1,N2]}, {majority,true}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match({[ok,ok],[]},
+	   rpc:multicall([N1,N2], mnesia, wait_for_tables, [[Tab], 3000])),
+    ?match({atomic,[]},
+	   mnesia:transaction(fun() -> mnesia:read(t,1,write) end)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({aborted,{no_majority,Tab}},
+	   mnesia:transaction(fun() -> mnesia:read(t,1,write) end)).
+
+delete(suite) -> [];
+delete(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = t,
+    Schema = [{name, Tab}, {ram_copies, [N1,N2]}, {majority,true}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match({[ok,ok],[]},
+	   rpc:multicall([N1,N2], mnesia, wait_for_tables, [[Tab], 3000])),
+    %% works as expected with majority of nodes present
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:delete({t,1}) end)),
+    ?match({atomic,[]},
+	   mnesia:transaction(fun() -> mnesia:read({t,1}) end)),
+    %% put the record back
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    ?match({atomic,[{t,1,a}]},
+	   mnesia:transaction(fun() -> mnesia:read({t,1}) end)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({aborted,{no_majority,Tab}},
+	   mnesia:transaction(fun() -> mnesia:delete({t,1}) end)).
+
+clear_table(suite) -> [];
+clear_table(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = t,
+    Schema = [{name, Tab}, {ram_copies, [N1,N2]}, {majority,true}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match({[ok,ok],[]},
+	   rpc:multicall([N1,N2], mnesia, wait_for_tables, [[Tab], 3000])),
+    %% works as expected with majority of nodes present
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    ?match({atomic,ok}, mnesia:clear_table(t)),
+    ?match({atomic,[]},
+	   mnesia:transaction(fun() -> mnesia:read({t,1}) end)),
+    %% put the record back
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    ?match({atomic,[{t,1,a}]},
+	   mnesia:transaction(fun() -> mnesia:read({t,1}) end)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({aborted,{no_majority,Tab}}, mnesia:clear_table(t)).
+
+frag(suite) -> [];
+frag(Config) when is_list(Config) ->
+    [N1] = Nodes = ?acquire_nodes(1, Config),
+    Tab = t,
+    Schema = [
+	      {name, Tab}, {ram_copies, [N1]},
+	      {majority,true},
+	      {frag_properties, [{n_fragments, 2}]}
+	     ],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match(true, mnesia:table_info(t, majority)),
+    ?match(true, mnesia:table_info(t_frag2, majority)).
+
+change_majority(suite) -> [];
+change_majority(Config) when is_list(Config) ->
+    [N1,N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = t,
+    Schema = [
+	      {name, Tab}, {ram_copies, [N1,N2]},
+	      {majority,false}
+	     ],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match(false, mnesia:table_info(t, majority)),
+    ?match({atomic, ok},
+	   mnesia:change_table_majority(t, true)),
+    ?match(true, mnesia:table_info(t, majority)),
+    ?match(ok,
+	   mnesia:activity(transaction, fun() ->
+						mnesia:write({t,1,a})
+					end)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({'EXIT',{aborted,{no_majority,_}}},
+	   mnesia:activity(transaction, fun() ->
+						mnesia:write({t,1,a})
+					end)).
+
+frag_change_majority(suite) -> [];
+frag_change_majority(Config) when is_list(Config) ->
+    [N1,N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = t,
+    Schema = [
+	      {name, Tab}, {ram_copies, [N1,N2]},
+	      {majority,false},
+	      {frag_properties,
+	       [{n_fragments, 2},
+		{n_ram_copies, 2},
+		{node_pool, [N1,N2]}]}
+	     ],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match(false, mnesia:table_info(t, majority)),
+    ?match(false, mnesia:table_info(t_frag2, majority)),
+    ?match({aborted,{bad_type,t_frag2}},
+	   mnesia:change_table_majority(t_frag2, true)),
+    ?match({atomic, ok},
+	   mnesia:change_table_majority(t, true)),
+    ?match(true, mnesia:table_info(t, majority)),
+    ?match(true, mnesia:table_info(t_frag2, majority)),
+    ?match(ok,
+	   mnesia:activity(transaction, fun() ->
+						mnesia:write({t,1,a})
+					end, mnesia_frag)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({'EXIT',{aborted,{no_majority,_}}},
+	   mnesia:activity(transaction, fun() ->
+						mnesia:write({t,1,a})
+					end, mnesia_frag)).
diff --git a/lib/mnesia/test/mnesia_qlc_test.erl b/lib/mnesia/test/mnesia_qlc_test.erl
index 141de71d01..5f46840ae9 100644
--- a/lib/mnesia/test/mnesia_qlc_test.erl
+++ b/lib/mnesia/test/mnesia_qlc_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -70,6 +70,7 @@ init_testcases(Type,Config) ->
 	    end,
     All = fun() -> [Write(Id) || Id <- lists:seq(1,10)], ok end,
     ?match({atomic, ok}, mnesia:sync_transaction(All)),
+    ?match({atomic, [{b, {b,100-1}, 1}]}, mnesia:transaction(fun() -> mnesia:read({b, {b, 99}}) end)),
     Nodes.
 
 %% Test cases       
diff --git a/lib/mnesia/test/mnesia_test_lib.erl b/lib/mnesia/test/mnesia_test_lib.erl
index 182c240084..9da45975d5 100644
--- a/lib/mnesia/test/mnesia_test_lib.erl
+++ b/lib/mnesia/test/mnesia_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -413,32 +413,28 @@ test_driver([T|TestCases], Config) ->
     [L1|L2];
 test_driver({Module, TestCases}, Config) when is_list(TestCases)->
     test_driver(default_module(Module, TestCases), Config);
-test_driver({_, {Module, TestCase}}, Config) ->
-    test_driver({Module, TestCase}, Config);
+test_driver({Module, all}, Config) ->
+    get_suite(Module, all, Config);
+test_driver({Module, G={group, _}}, Config) ->
+    get_suite(Module, G, Config);
+test_driver({_, {group, Module, Group}}, Config) ->
+    get_suite(Module, {group, Group}, Config);
+
 test_driver({Module, TestCase}, Config) ->
     Sec = timer:seconds(1) * 1000,
-    case get_suite(Module, TestCase) of
-	[] when Config == suite ->
+    case Config of
+	suite ->
 	    {Module, TestCase, 'IMPL'};
-	[] ->
+	_ ->
 	    log("Eval test case: ~w~n", [{Module, TestCase}]),
-	    {T, Res} =
-		timer:tc(?MODULE, eval_test_case, [Module, TestCase, Config]),
-	    log("Tested ~w in ~w sec~n", [TestCase, T div Sec]),
-	    {T div Sec, Res};
-	Suite when is_list(Suite), Config == suite ->
-	    Res = test_driver(default_module(Module, Suite), Config),
-	    {{Module, TestCase}, Res};
-	Suite when is_list(Suite) ->
-	    log("Expand test case ~w~n", [{Module, TestCase}]),
-	    Def = default_module(Module, Suite),
-	    {T, Res} = timer:tc(?MODULE, test_driver, [Def, Config]),
-	    {T div Sec, {{Module, TestCase}, Res}};
-	'NYI' when Config == suite ->
-	    {Module, TestCase, 'NYI'};
-	'NYI' ->
-      	    log("<WARNING> Test case ~w NYI~n", [{Module, TestCase}]),
-	    {0, {skip, {Module, TestCase}, "NYI"}}
+	    try timer:tc(?MODULE, eval_test_case, [Module, TestCase, Config]) of
+		{T, Res} -> 
+		    log("Tested ~w in ~w sec~n", [TestCase, T div Sec]),
+		    {T div Sec, Res}
+	    catch error:function_clause -> 
+		    log("<WARNING> Test case ~w NYI~n", [{Module, TestCase}]),
+		    {0, {skip, {Module, TestCase}, "NYI"}}
+	    end
     end;
 test_driver(TestCase, Config) ->
     DefaultModule = mnesia_SUITE,
@@ -449,18 +445,50 @@ test_driver(TestCase, Config) ->
 default_module(DefaultModule, TestCases) when is_list(TestCases) ->
     Fun = fun(T) ->
 		  case T of
+		      {group, _} -> {true, {DefaultModule, T}};
 		      {_, _} -> true;
 		      T -> {true, {DefaultModule, T}}
 		  end
 	  end,
     lists:zf(Fun, TestCases).
 
+get_suite(Module, TestCase, Config) ->
+    case get_suite(Module, TestCase) of
+	Suite when is_list(Suite), Config == suite ->
+	    Res = test_driver(default_module(Module, Suite), Config),
+	    {{Module, TestCase}, Res};
+	Suite when is_list(Suite) ->
+	    log("Expand test case ~w~n", [{Module, TestCase}]),
+	    Def = default_module(Module, Suite),
+	    {T, Res} = timer:tc(?MODULE, test_driver, [Def, Config]),
+	    Sec = timer:seconds(1) * 1000,
+	    {T div Sec, {{Module, TestCase}, Res}};
+	'NYI' when Config == suite ->
+	    {Module, TestCase, 'NYI'};
+	'NYI' ->
+      	    log("<WARNING> Test case ~w NYI~n", [{Module, TestCase}]),
+	    {0, {skip, {Module, TestCase}, "NYI"}}
+    end.
+
 %% Returns a list (possibly empty) or the atom 'NYI'
-get_suite(Mod, Fun) ->
-    case catch (apply(Mod, Fun, [suite])) of
+get_suite(Mod, {group, Suite}) ->
+    try 
+	Groups = Mod:groups(),
+	{_, _, TCList} = lists:keyfind(Suite, 1, Groups),
+	TCList
+    catch
+	_:Reason ->
+	    io:format("Not implemented ~p ~p (~p ~p)~n", 
+		      [Mod,Suite,Reason, erlang:get_stacktrace()]),
+	    'NYI'
+    end;
+get_suite(Mod, all) ->
+    case catch (apply(Mod, all, [])) of
 	{'EXIT', _} -> 'NYI';
 	List when is_list(List) -> List
-    end.
+    end;
+get_suite(_Mod, _Fun) -> 
+    [].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -503,9 +531,13 @@ wait_for_evaluator(Pid, Mod, Fun, Config) ->
 
 test_case_evaluator(Mod, Fun, [Config]) ->
     NewConfig = Mod:init_per_testcase(Fun, Config),
-    R = apply(Mod, Fun, [NewConfig]),
-    Mod:end_per_testcase(Fun, NewConfig),
-    exit({test_case_ok, R}).
+    try 
+	R = apply(Mod, Fun, [NewConfig]),
+	Mod:end_per_testcase(Fun, NewConfig),
+	exit({test_case_ok, R})
+    catch error:function_clause ->
+	    exit({skipped, 'NYI'})
+    end.
 
 activity_evaluator(Coordinator) ->
     activity_evaluator_loop(Coordinator),
diff --git a/lib/mnesia/test/mnesia_trans_access_test.erl b/lib/mnesia/test/mnesia_trans_access_test.erl
index 55ba4dd761..ca3f0fbf49 100644
--- a/lib/mnesia/test/mnesia_trans_access_test.erl
+++ b/lib/mnesia/test/mnesia_trans_access_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -1102,9 +1102,9 @@ create_live_table_index_disc_only(Config) when is_list(Config) ->
     create_live_table_index(Config, disc_only_copies).
 
 create_live_table_index(Config, Storage) ->
-    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    [N1,N2,N3] = Nodes = ?acquire_nodes(3, Config),
     Tab = create_live_table_index,
-    Schema = [{name, Tab}, {attributes, [k, v]}, {Storage, [Node1]}],
+    Schema = [{name, Tab}, {attributes, [k, v]}, {Storage, Nodes}],
     ?match({atomic, ok}, mnesia:create_table(Schema)),
     ValPos = 3,
     mnesia:dirty_write({Tab, 1, 2}),
@@ -1115,9 +1115,35 @@ create_live_table_index(Config, Storage) ->
           end,
     ?match({atomic, ok}, mnesia:transaction(Fun)),
     ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),
+    IRead = fun() -> lists:sort(mnesia:index_read(Tab, 2, ValPos)) end,
+    ?match({atomic, [{Tab, 1, 2},{Tab, 2, 2}]}, mnesia:transaction(IRead)),
+    ?match({atomic, ok}, mnesia:del_table_index(Tab, ValPos)),
+
+    %% Bug when adding index when table is still unloaded
+    %% By setting load order we hopefully will trigger the bug
+    mnesia:change_table_copy_type(Tab, N2, ram_copies),
+    mnesia:change_table_copy_type(Tab, N3, ram_copies),
+    ?match({atomic,ok}, mnesia:change_table_copy_type(schema, N2, ram_copies)),
+    ?match({atomic,ok}, mnesia:change_table_copy_type(schema, N3, ram_copies)),
+
+    Create = fun(N) ->
+		     TabN = list_to_atom("tab_" ++ integer_to_list(N)),
+		     Def = [{ram_copies, Nodes}, {load_order, N}],
+		     mnesia:create_table(TabN, Def)
+	     end,
+
+    ?match([{atomic,ok}|_], [Create(N) || N <- lists:seq(1,50)]),
+    
+    ?match([], mnesia_test_lib:stop_mnesia([N2,N3])),
+    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes,[N1]}]])),
+    ?match(ok, rpc:call(N3, mnesia, start, [[{extra_db_nodes,[N1]}]])),
+    
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),
+    
+    ?match({atomic, [{Tab, 1, 2},{Tab, 2, 2}]}, mnesia:transaction(IRead)),
     ?match({atomic, [{Tab, 1, 2},{Tab, 2, 2}]}, 
-	   mnesia:transaction(fun() -> lists:sort(mnesia:index_read(Tab, 2, ValPos)) 
-			      end)),
+	   rpc:call(N2, mnesia, transaction, [IRead])),
+    
     ?verify_mnesia(Nodes, []).
 
 %% Drop table index
diff --git a/lib/mnesia/test/mt.erl b/lib/mnesia/test/mt.erl
index f69c4a11fd..322bd52130 100644
--- a/lib/mnesia/test/mt.erl
+++ b/lib/mnesia/test/mt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -76,17 +76,24 @@ resolve(Suite0) when is_atom(Suite0) ->
 	Suite when is_atom(Suite) ->
 	    {Suite, all};
 	{Suite, Case} ->
-	    {Suite, Case}
+	    {Suite, is_group(Suite,Case)}
     end;
 resolve({Suite0, Case}) when is_atom(Suite0), is_atom(Case) ->
     case alias(Suite0) of
 	Suite when is_atom(Suite) ->
-	    {Suite, Case};
+	    {Suite, is_group(Suite,Case)};
 	{Suite, Case2} ->
-	    {Suite, Case2}
+	    {Suite, is_group(Suite,Case2)}
     end;
 resolve(List) when is_list(List) ->
     [resolve(Case) || Case <- List].
+
+is_group(Mod, Case) ->
+    try {_,_,_} = lists:keyfind(Case, 1, Mod:groups()),
+	 {group, Case}
+    catch _:{badmatch,_} ->
+	    Case
+    end.
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Run one or more test cases
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index b3b9937f1c..73eb992323 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index b88c7cf1cd..e15e7dea7d 100644
--- a/lib/odbc/doc/src/notes.xml
+++ b/lib/odbc/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/public_key/doc/src/Makefile b/lib/public_key/doc/src/Makefile
index 298c28a740..afb17399da 100644
--- a/lib/public_key/doc/src/Makefile
+++ b/lib/public_key/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2008-2010. All Rights Reserved.
+# Copyright Ericsson AB 2008-2011. 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
@@ -52,6 +52,7 @@ XML_CHAPTER_FILES = \
 	introduction.xml \
 	public_key_records.xml \
 	cert_records.xml \
+	using_public_key.xml \
 	notes.xml
 
 BOOK_FILES = book.xml
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 14b43041ce..30326da114 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2010</year>
+      <year>2011</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/public_key/doc/src/part.xml b/lib/public_key/doc/src/part.xml
index c338a71613..ea3123b5bd 100644
--- a/lib/public_key/doc/src/part.xml
+++ b/lib/public_key/doc/src/part.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -38,5 +38,6 @@
   <xi:include href="introduction.xml"/>
   <xi:include href="public_key_records.xml"/>
   <xi:include href="cert_records.xml"/>
+  <xi:include href="using_public_key.xml"/>
 </part>
 
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index c5f57214b1..d60d91cd83 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -43,7 +43,7 @@
     
     <note><p>All records used in this manual 
     <!--     except #policy_tree_node{}  -->
-    are generated from asn1 specifications
+    are generated from ASN.1 specifications
     and are documented in the User's Guide. See <seealso 
     marker="public_key_records">Public key records</seealso> and <seealso 
     marker="cert_records">X.509 Certificate records</seealso>. 
@@ -150,12 +150,12 @@
     <fsummary> Decodes a public key asn1 der encoded entity.</fsummary>
     <type>
       <v>Asn1Type = atom() -</v>
-      <d> Asn1 type present in the public_key applications
+      <d> ASN.1 type present in the public_key applications
       asn1 specifications.</d>
       <v>Der = der_encoded()</v>
     </type> 
     <desc> 
-      <p> Decodes a public key asn1 der encoded entity.</p> 
+      <p> Decodes a public key ASN.1 der encoded entity.</p>
     </desc> 
   </func>
     
@@ -165,25 +165,25 @@
     <type>
       <v>Asn1Type = atom()</v>
       <d> Asn1 type present in the public_key applications
-	 asn1 specifications.</d>
+	 ASN.1 specifications.</d>
       <v>Entity = term() - The erlang representation of <c> Asn1Type</c></v>
   </type> 
   <desc> 
-    <p> Encodes a public key entity with asn1 DER encoding.</p> 
+    <p> Encodes a public key entity with ASN.1 DER encoding.</p>
   </desc> 
   </func>
 
   <func>
     <name>pem_decode(PemBin) -> [pem_entry()]</name>
     <fsummary>Decode PEM binary data and return
-    entries as asn1 der encoded entities. </fsummary>
+    entries as ASN.1 der encoded entities. </fsummary>
     <type>
       <v>PemBin = binary()</v>
       <d>Example {ok, PemBin} = file:read_file("cert.pem").</d>
     </type> 
   <desc> 
     <p>Decode PEM binary data and return
-    entries as asn1 der encoded entities.</p> 
+    entries as ASN.1 der encoded entities.</p>
   </desc> 
   </func> 
     
@@ -258,13 +258,13 @@
   
   <func>
     <name>pkix_decode_cert(Cert, otp|plain) ->  #'Certificate'{} | #'OTPCertificate'{}</name>
-    <fsummary> Decodes an asn1 der encoded pkix x509 certificate.</fsummary>
+    <fsummary> Decodes an ASN.1 der encoded pkix x509 certificate.</fsummary>
     <type>
       <v>Cert = der_encoded()</v> 
   </type> 
   <desc> 
-    <p>Decodes an asn1 der encoded pkix certificate.  The otp option
-    will use the customized asn1 specification OTP-PKIX.asn1 for
+    <p>Decodes an ASN.1 der encoded pkix certificate.  The otp option
+    will use the customized ASN.1 specification OTP-PKIX.asn1 for
     decoding and also recursively decode most of the standard
     parts.</p>
   </desc> 
@@ -276,7 +276,7 @@
     certificate.</fsummary>
     <type>
       <v>Asn1Type = atom()</v>
-      <d>The asn1 type can be 'Certificate', 'OTPCertificate' or a subtype of either .</d>
+      <d>The ASN.1 type can be 'Certificate', 'OTPCertificate' or a subtype of either .</d>
   </type> 
   <desc> 
     <p>Der encodes a pkix x509 certificate or part of such a
@@ -394,7 +394,7 @@
        signed or in the case that digest type is <c>none</c>
        it is the hashed value of "plain text" i.e. the digest.</d>
        <v>DigestType = rsa_digest_type() | dsa_digest_type()</v>
-       <v>Key = rsa_public_key() | dsa_public_key()</v> 
+       <v>Key = rsa_private_key() | dsa_private_key()</v>
   </type> 
   <desc> 
     <p> Creates a digital signature.</p> 
diff --git a/lib/public_key/doc/src/using_public_key.xml b/lib/public_key/doc/src/using_public_key.xml
new file mode 100644
index 0000000000..f0eaeb8654
--- /dev/null
+++ b/lib/public_key/doc/src/using_public_key.xml
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2011</year><year>2011</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+    
+    </legalnotice>
+
+    <title>Using the public_key API</title>
+    <file>using_public_key.xml</file>
+  </header>
+
+  <section>
+    <title>General information</title>
+
+    <p> This chapter is dedicated to showing some
+    examples of how to use the public_key API. Keys and certificates
+    used in the following sections are generated only for the purpose
+    of testing the public key application.</p>
+
+    <p>Note that some shell printouts, in the following examples,
+    have been abbreviated for increased readability.</p>
+    
+  </section>
+    
+  <section>
+    <title>PEM files</title>
+    <p> Pulic key data (keys, certificates etc) may be stored in PEM format. PEM files
+    comes from the Private Enhanced Mail Internet standard and has a
+    structure that looks like this:</p>
+
+    <code>&lt;text&gt;
+	-----BEGIN &lt;SOMETHING&gt;-----
+	&lt;Attribute&gt; : &lt;Value&gt;
+	&lt;Base64 encoded DER data&gt;
+	-----END &lt;SOMETHING&gt;-----
+	&lt;text&gt;</code>
+
+    <p>A file can contain several BEGIN/END blocks. Text lines between
+    blocks are ignored.  Attributes, if present, are currently ignored except
+    for <c>Proc-Type</c> and <c>DEK-Info</c> that are used when the DER data is
+    encrypted.</p>
+
+    <section>
+      <title>DSA private key</title>
+      
+      <p>Note file handling is not done by the public_key application. </p>
+      <code>1> {ok, PemBin} = file:read_file("dsa.pem").
+{ok,&lt;&lt;"-----BEGIN DSA PRIVATE KEY-----\nMIIBuw"...&gt;&gt;}</code>
+      
+      <p>This PEM file only has one entry a private DSA key.</p>
+      <code>2> [DSAEntry] =  public_key:pem_decode(PemBin).
+[{'DSAPrivateKey',&lt;&lt;48,130,1,187,2,1,0,2,129,129,0,183,
+                    179,230,217,37,99,144,157,21,228,204,
+		    162,207,61,246,...&gt;&gt;,
+		    not_encrypted}]</code>
+      
+      <code>3> Key = public_key:pem_entry_decode(DSAEntry).
+#'DSAPrivateKey'{version = 0,
+                 p = 12900045185019966618...6593,
+                 q = 1216700114794736143432235288305776850295620488937,
+                 g = 10442040227452349332...47213,
+                 y = 87256807980030509074...403143,
+                 x = 510968529856012146351317363807366575075645839654}</code>
+    </section>
+
+    <section>
+      <title>RSA private key encrypted with a password.</title>
+      
+      <code>1> {ok, PemBin} = file:read_file("rsa.pem").
+{ok,&lt;&lt;"Bag Attribut"...&gt;&gt;}</code>
+
+    <p>This PEM file only has one entry a private RSA key.</p>
+    <code>2>[RSAEntry] = public_key:pem_decode(PemBin).
+[{'RSAPrivateKey',&lt;&lt;224,108,117,203,152,40,15,77,128,126,
+                    221,195,154,249,85,208,202,251,109,
+                    119,120,57,29,89,19,9,...&gt;&gt;,
+                  {"DES-EDE3-CBC",&lt;&lt;"k�e��p�L"&gt;&gt;}}]
+
+    </code>
+
+    <p>In this example the password is "abcd1234".</p>
+    <code>3> Key = public_key:pem_entry_decode(RSAEntry, "abcd1234").
+    #'RSAPrivateKey'{version = 'two-prime',
+                 modulus = 1112355156729921663373...2737107,
+                 publicExponent = 65537,
+                 privateExponent = 58064406231183...2239766033,
+                 prime1 = 11034766614656598484098...7326883017,
+                 prime2 = 10080459293561036618240...77738643771,
+                 exponent1 = 77928819327425934607...22152984217,
+                 exponent2 = 36287623121853605733...20588523793,
+                 coefficient = 924840412626098444...41820968343,
+                 otherPrimeInfos = asn1_NOVALUE}</code>
+    </section>
+  
+  <section>
+    <title>X509 Certificates</title>
+    
+      <code>1> {ok, PemBin} = file:read_file("cacerts.pem").
+{ok,&lt;&lt;"-----BEGIN CERTIFICATE-----\nMIIC7jCCAl"...&gt;&gt;}</code>
+
+      <p>This file includes two certificates</p>
+      <code>2> [CertEntry1, CertEntry2] = public_key:pem_decode(PemBin).
+[{'Certificate',&lt;&lt;48,130,2,238,48,130,2,87,160,3,2,1,2,2,
+                  9,0,230,145,97,214,191,2,120,150,48,13,
+                  ...&gt;&gt;,
+                not_encrypted},
+ {'Certificate',&lt;&lt;48,130,3,200,48,130,3,49,160,3,2,1,2,2,1,
+                  1,48,13,6,9,42,134,72,134,247,...&gt;&gt;>,
+                not_encrypted}]</code>
+      
+      <p>Certificates may of course be decoded as usual ... </p>
+      <code>2> Cert = public_key:pem_entry_decode(CertEntry1).
+#'Certificate'{
+    tbsCertificate =
+        #'TBSCertificate'{
+            version = v3,serialNumber = 16614168075301976214,
+            signature =
+                #'AlgorithmIdentifier'{
+                    algorithm = {1,2,840,113549,1,1,5},
+                    parameters = &lt;&lt;5,0&gt;&gt;},
+            issuer =
+                {rdnSequence,
+                    [[#'AttributeTypeAndValue'{
+                          type = {2,5,4,3},
+                          value = &lt;&lt;19,8,101,114,108,97,110,103,67,65&gt;&gt;}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,11},
+                          value = &lt;&lt;19,10,69,114,108,97,110,103,32,79,84,80&gt;&gt;}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,10},
+                          value = &lt;&lt;19,11,69,114,105,99,115,115,111,110,32,65,66&gt;&gt;}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,7},
+                          value = &lt;&lt;19,9,83,116,111,99,107,104,111,108,109&gt;&gt;}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,6},
+                          value = &lt;&lt;19,2,83,69&gt;&gt;}],
+                     [#'AttributeTypeAndValue'{
+                          type = {1,2,840,113549,1,9,1},
+                          value = &lt;&lt;22,22,112,101,116,101,114,64,101,114,...&gt;&gt;}]]},
+            validity =
+                #'Validity'{
+                    notBefore = {utcTime,"080109082929Z"},
+                    notAfter = {utcTime,"080208082929Z"}},
+            subject =
+                {rdnSequence,
+                    [[#'AttributeTypeAndValue'{
+                          type = {2,5,4,3},
+                          value = &lt;&lt;19,8,101,114,108,97,110,103,67,65&gt;&gt;}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,11},
+                          value = &lt;&lt;19,10,69,114,108,97,110,103,32,79,84,80&gt;&gt;}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,10},
+                          value = &lt;&lt;19,11,69,114,105,99,115,115,111,110,32,...&gt;&gt;}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,7},
+                          value = &lt;&lt;19,9,83,116,111,99,107,104,111,108,...&gt;&gt;}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,6},
+                          value = &lt;&lt;19,2,83,69&gt;&gt;}],
+                     [#'AttributeTypeAndValue'{
+                          type = {1,2,840,113549,1,9,1},
+                          value = &lt;&lt;22,22,112,101,116,101,114,64,...&gt;&gt;}]]},
+            subjectPublicKeyInfo =
+                #'SubjectPublicKeyInfo'{
+                    algorithm =
+                        #'AlgorithmIdentifier'{
+                            algorithm = {1,2,840,113549,1,1,1},
+                            parameters = &lt;&lt;5,0&gt;&gt;},
+                    subjectPublicKey =
+                        {0,&lt;&lt;48,129,137,2,129,129,0,203,209,187,77,73,231,90,...&gt;&gt;}},
+            issuerUniqueID = asn1_NOVALUE,
+            subjectUniqueID = asn1_NOVALUE,
+            extensions =
+                [#'Extension'{
+                     extnID = {2,5,29,19},
+                     critical = true,
+                     extnValue = [48,3,1,1,255]},
+                 #'Extension'{
+                     extnID = {2,5,29,15},
+                     critical = false,
+                     extnValue = [3,2,1,6]},
+                 #'Extension'{
+                     extnID = {2,5,29,14},
+                     critical = false,
+                     extnValue = [4,20,27,217,65,152,6,30,142|...]},
+                 #'Extension'{
+                     extnID = {2,5,29,17},
+                     critical = false,
+                     extnValue = [48,24,129,22,112,101,116,101|...]}]},
+    signatureAlgorithm =
+        #'AlgorithmIdentifier'{
+            algorithm = {1,2,840,113549,1,1,5},
+            parameters = &lt;&lt;5,0&gt;&gt;},
+    signature =
+        {0,
+         &lt;&lt;163,186,7,163,216,152,63,47,154,234,139,73,154,96,120,
+           165,2,52,196,195,109,167,192,...&gt;&gt;}}
+</code>
+
+      <p> Parts of certificates can be decoded with
+      public_key:der_decode/2 using that parts ASN.1 type.
+      Although application specific certificate
+      extension requires application specific ASN.1 decode/encode-functions.
+      Example, the first value of the rdnSequence above is of ASN.1 type
+      'X520CommonName'. ({2,5,4,3} = ?id-at-commonName)</p>
+      
+      <code>public_key:der_decode('X520CommonName', &lt;&lt;19,8,101,114,108,97,110,103,67,65&gt;&gt;).
+{printableString,"erlangCA"}</code>
+
+      <p>... but certificates can also be decode using the pkix_decode_cert/2 that
+      can customize and recursively decode standard parts of a certificate.</p>
+      <code>3>{_, DerCert, _} = CertEntry1.</code>
+      <code>4> public_key:pkix_decode_cert(DerCert, otp).
+#'OTPCertificate'{
+    tbsCertificate =
+        #'OTPTBSCertificate'{
+            version = v3,serialNumber = 16614168075301976214,
+            signature =
+                #'SignatureAlgorithm'{
+                    algorithm = {1,2,840,113549,1,1,5},
+                    parameters = 'NULL'},
+            issuer =
+                {rdnSequence,
+                    [[#'AttributeTypeAndValue'{
+                          type = {2,5,4,3},
+                          value = {printableString,"erlangCA"}}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,11},
+                          value = {printableString,"Erlang OTP"}}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,10},
+                          value = {printableString,"Ericsson AB"}}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,7},
+                          value = {printableString,"Stockholm"}}],
+                     [#'AttributeTypeAndValue'{type = {2,5,4,6},value = "SE"}],
+                     [#'AttributeTypeAndValue'{
+                          type = {1,2,840,113549,1,9,1},
+                          value = "[email protected]"}]]},
+            validity =
+                #'Validity'{
+                    notBefore = {utcTime,"080109082929Z"},
+                    notAfter = {utcTime,"080208082929Z"}},
+            subject =
+                {rdnSequence,
+                    [[#'AttributeTypeAndValue'{
+                          type = {2,5,4,3},
+                          value = {printableString,"erlangCA"}}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,11},
+                          value = {printableString,"Erlang OTP"}}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,10},
+                          value = {printableString,"Ericsson AB"}}],
+                     [#'AttributeTypeAndValue'{
+                          type = {2,5,4,7},
+                          value = {printableString,"Stockholm"}}],
+                     [#'AttributeTypeAndValue'{type = {2,5,4,6},value = "SE"}],
+                     [#'AttributeTypeAndValue'{
+                          type = {1,2,840,113549,1,9,1},
+                          value = "[email protected]"}]]},
+            subjectPublicKeyInfo =
+                #'OTPSubjectPublicKeyInfo'{
+                    algorithm =
+                        #'PublicKeyAlgorithm'{
+                            algorithm = {1,2,840,113549,1,1,1},
+                            parameters = 'NULL'},
+                    subjectPublicKey =
+                        #'RSAPublicKey'{
+                            modulus =
+                                1431267547247997...37419,
+                            publicExponent = 65537}},
+            issuerUniqueID = asn1_NOVALUE,
+            subjectUniqueID = asn1_NOVALUE,
+            extensions =
+                [#'Extension'{
+                     extnID = {2,5,29,19},
+                     critical = true,
+                     extnValue =
+                         #'BasicConstraints'{
+                             cA = true,pathLenConstraint = asn1_NOVALUE}},
+                 #'Extension'{
+                     extnID = {2,5,29,15},
+                     critical = false,
+                     extnValue = [keyCertSign,cRLSign]},
+                 #'Extension'{
+                     extnID = {2,5,29,14},
+                     critical = false,
+                     extnValue = [27,217,65,152,6,30,142,132,245|...]},
+                 #'Extension'{
+                     extnID = {2,5,29,17},
+                     critical = false,
+                     extnValue = [{rfc822Name,"[email protected]"}]}]},
+    signatureAlgorithm =
+        #'SignatureAlgorithm'{
+            algorithm = {1,2,840,113549,1,1,5},
+            parameters = 'NULL'},
+    signature =
+        {0,
+         &lt;&lt;163,186,7,163,216,152,63,47,154,234,139,73,154,96,120,
+           165,2,52,196,195,109,167,192,...&gt;&gt;}}
+</code>
+
+      <p>This call is equivalent to public_key:pem_entry_decode(CertEntry1)</p>
+      <code>5> public_key:pkix_decode_cert(DerCert, plain).
+#'Certificate'{ ...}
+</code>
+  </section>
+
+  <section>
+    <title>Encoding public key data to PEM format</title>
+
+    <p>If you have public key data and and want to create a PEM file
+    you can do that by calling the functions
+    public_key:pem_entry_encode/2 and pem_encode/1 and then saving the
+    result to a file. For example assume you have PubKey =
+    'RSAPublicKey'{} then you can create a PEM-"RSA PUBLIC KEY" file
+    (ASN.1 type 'RSAPublicKey') or a PEM-"PUBLIC KEY" file
+    ('SubjectPublicKeyInfo' ASN.1 type).</p>
+
+    <p> The second element of the PEM-entry will be the ASN.1 DER encoded
+    key data.</p>
+
+    <code>1> PemEntry = public_key:pem_entry_encode('RSAPublicKey', RSAPubKey).
+{'RSAPublicKey', &lt;&lt;48,72,...&gt;&gt;, not_encrypted}
+
+2> PemBin = public_key:pem_encode([PemEntry]).
+&lt;&lt;"-----BEGIN RSA PUBLIC KEY-----\nMEgC...&gt;&gt;
+
+3> file:write_file("rsa_pub_key.pem", PemBin).
+ok</code>
+
+    <p> or </p>
+
+    <code>1> PemBin = public_key:pem_entry_encode('SubjectPublicKeyInfo', RSAPubKey).
+{'SubjectPublicKeyInfo', &lt;&lt;48,92...&gt;&gt;, not_encrypted}
+
+2> PemBin = public_key:pem_encode([PemEntry]).
+&lt;&lt;"-----BEGIN PUBLIC KEY-----\nMFw...&gt;&gt;
+
+3> file:write_file("pub_key.pem", PemBin).
+ok</code>
+
+  </section>
+</section>
+
+<section>
+      <title>RSA public key cryptography </title>
+       <p> Suppose you have PrivateKey = #'RSAPrivateKey{}' and the
+       plaintext Msg = binary() and the corresponding public key
+       PublicKey = #'RSAPublicKey'{} then you can do the following.
+       Note that you normally will only do one of the encrypt or
+       decrypt operations and the peer will do the other.
+       </p>
+
+       <p>Encrypt with the private key </p>
+       <code>RsaEncrypted = public_key:encrypt_private(Msg, PrivateKey),
+Msg = public_key:decrypt_public(RsaEncrypted, PublicKey),</code>
+
+       <p>Encrypt with the public key </p>
+       <code>RsaEncrypted = public_key:encrypt_public(Msg, PublicKey),
+Msg = public_key:decrypt_private(RsaEncrypted, PrivateKey),</code>
+  </section>
+
+  <section>
+    <title>Digital signatures</title>
+
+    <p> Suppose you have PrivateKey = #'RSAPrivateKey{}'or
+    #'DSAPrivateKey'{} and the plaintext Msg = binary() and the
+    corresponding public key PublicKey = #'RSAPublicKey'{} or
+    {integer(), #'DssParams'{}} then you can do the following.  Note
+    that you normally will only do one of the sign or verify operations
+    and the peer will do the other. </p>
+
+    <code>Signature = public_key:sign(Msg, sha, PrivateKey),
+true = public_key:verify(Msg, sha, Signature, PublicKey),</code>
+
+    <p>It might be appropriate to calculate the message digest before
+    calling sign or verify and then you can use the none as second
+    argument.</p>
+
+    <code>Digest = crypto:sha(Msg),
+Signature = public_key:sign(Digest, none, PrivateKey),
+true = public_key:verify(Digest, none, Signature, PublicKey),
+    </code>
+    
+  </section>
+  
+  <section>
+    <title>SSH files</title>
+    
+    <p>SSH typically uses PEM files for private keys but has its
+    own file format for storing public keys. The erlang public_key
+    application can be used to parse the content of SSH public key files.</p>
+
+    <section>
+   <title> RFC 4716 SSH public key files </title>
+
+    <p>RFC 4716 SSH files looks confusingly like PEM files,
+       but there are some differences.</p>
+      <code>1> {ok, SshBin} = file:read_file("ssh2_rsa_pub").
+{ok, &lt;&lt;"---- BEGIN SSH2 PUBLIC KEY ----\nAAAA"...&gt;&gt;}</code>
+
+    <p>This is equivalent to calling public_key:ssh_decode(SshBin, rfc4716_public_key).
+    </p>
+      <code>2> public_key:ssh_decode(SshBin, public_key).
+[{#'RSAPublicKey'{modulus = 794430685...91663,
+                  publicExponent = 35}, []}]
+</code>
+
+ </section>
+
+ <section>
+   <title> Openssh public key format </title>
+      <code>1> {ok, SshBin} = file:read_file("openssh_dsa_pub").
+{ok,&lt;&lt;"ssh-dss AAAAB3Nza"...&gt;&gt;}</code>
+
+    <p>This is equivalent to calling public_key:ssh_decode(SshBin, openssh_public_key).
+    </p>
+    <code>2>  public_key:ssh_decode(SshBin, public_key).
+[{{15642692...694280725,
+   #'Dss-Parms'{p = 17291273936...696123221,
+                q = 1255626590179665817295475654204371833735706001853,
+                g = 10454211196...480338645}},
+  [{comment,"dhopson@VMUbuntu-DSH"}]}]
+</code>
+ </section>
+
+ <section>
+   <title> Known hosts - openssh format</title>
+
+      <code>1> {ok, SshBin} = file:read_file("known_hosts").
+{ok,&lt;&lt;"hostname.domain.com,192.168.0.1 ssh-rsa AAAAB...&gt;&gt;}</code>
+
+    <p>Returns a list of public keys and their related attributes
+    each pair of key and attributes corresponds to one entry in
+    the known hosts file.</p>
+    
+    <code>2>  public_key:ssh_decode(SshBin, known_hosts).
+[{#'RSAPublicKey'{modulus = 1498979460408...72721699,
+                  publicExponent = 35},
+  [{hostnames,["hostname.domain.com","192.168.0.1"]}]},
+ {#'RSAPublicKey'{modulus = 14989794604088...2721699,
+                  publicExponent = 35},
+  [{comment,"[email protected]"},
+   {hostnames,["|1|BWO5qDxk/cFH0wa05JLdHn+j6xQ=|rXQvIxh5cDD3C43k5DPDamawVNA="]}]}]
+</code>
+  </section>
+
+  <section>
+    <title> Authorized keys - openssh format</title>
+
+    <code>1> {ok, SshBin} = file:read_file("auth_keys").
+{ok, &lt;&lt;"command=\"dump /home\",no-pty,no-port-forwarding ssh-rsa AAA...&gt;&gt;}</code>
+
+    <p>Returns a list of public keys and their related attributes
+    each pair of key and attributes corresponds to one entry in
+    the authorized key file.</p>
+
+    <code>2> public_key:ssh_decode(SshBin, auth_keys).
+[{#'RSAPublicKey'{modulus = 794430685...691663,
+                  publicExponent = 35},
+  [{comment,"dhopson@VMUbuntu-DSH"},
+   {options,["command=\"dump/home\"","no-pty",
+             "no-port-forwarding"]}]},
+ {{1564269258491...607694280725,
+   #'Dss-Parms'{p = 17291273936185...763696123221,
+                q = 1255626590179665817295475654204371833735706001853,
+                g = 10454211195705...60511039590076780999046480338645}},
+  [{comment,"dhopson@VMUbuntu-DSH"}]}]
+</code>
+    </section>
+
+    <section>
+      <title> Creating an SSH file from public key data </title>
+
+      <p>If you got a public key <c>PubKey</c> and a related list of
+      attributes <c>Attributes</c> as returned
+      by ssh_decode/2 you can create a new ssh file for example</p>
+      <code>N> SshBin = public_key:ssh_encode([{PubKey, Attributes}], openssh_public_key),
+&lt;&lt;"ssh-rsa "...&gt;&gt;
+N+1> file:write_file("id_rsa.pub", SshBin).
+ok</code>
+    </section>
+  </section>
+</chapter>
diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl
index 660af4e8ab..a325a975e9 100644
--- a/lib/public_key/test/pkits_SUITE.erl
+++ b/lib/public_key/test/pkits_SUITE.erl
@@ -26,7 +26,6 @@
 -compile(export_all).
 
 -include_lib("public_key/include/public_key.hrl").
-%%-include("public_key.hrl").
 
 -define(error(Format,Args), error(Format,Args,?FILE,?LINE)).
 -define(warning(Format,Args), warning(Format,Args,?FILE,?LINE)).
@@ -42,18 +41,65 @@
 -define(NIST5, "2.16.840.1.101.3.2.1.48.5").
 -define(NIST6, "2.16.840.1.101.3.2.1.48.6").
 
+-record(verify_state, {
+	  certs_db,
+	  crl_info,
+	  revoke_state}).
 %%
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [signature_verification, validity_periods,
-     verifying_name_chaining,
-     verifying_paths_with_self_issued_certificates,
-     verifying_basic_constraints, key_usage,
-     name_constraints, private_certificate_extensions].
+    [{group, signature_verification},
+     {group, validity_periods},
+     {group, verifying_name_chaining},
+     {group, verifying_paths_with_self_issued_certificates},
+     %%{group, basic_certificate_revocation_tests},
+     %%{group, delta_crls},
+     %%{group, distribution_points},
+     {group, verifying_basic_constraints},
+     {group, key_usage},
+     {group, name_constraints},
+     {group, private_certificate_extensions}].
 
 groups() -> 
-    [].
+    [{signature_verification, [], [valid_rsa_signature,
+				   invalid_rsa_signature, valid_dsa_signature,
+				   invalid_dsa_signature]},
+     {validity_periods, [],
+      [not_before_invalid, not_before_valid, not_after_invalid, not_after_valid]},
+     {verifying_name_chaining, [],
+      [invalid_name_chain, whitespace_name_chain, capitalization_name_chain,
+       uid_name_chain, attrib_name_chain, string_name_chain]},
+     {verifying_paths_with_self_issued_certificates, [],
+      [basic_valid, basic_invalid, crl_signing_valid, crl_signing_invalid]},
+     %% {basic_certificate_revocation_tests, [],
+     %%  [missing_CRL, revoked_CA, revoked_peer, invalid_CRL_signature,
+     %%   invalid_CRL_issuer, invalid_CRL, valid_CRL,
+     %%   unknown_CRL_extension, old_CRL, fresh_CRL, valid_serial,
+     %%   invalid_serial, valid_seperate_keys, invalid_separate_keys]},
+     %% {delta_crls, [], [delta_without_crl, valid_delta_crls, invalid_delta_crls]},
+     %% {distribution_points, [], [valid_distribution_points,
+     %% 				valid_distribution_points_no_issuing_distribution_point,
+     %% 				invalid_distribution_points, valid_only_contains,
+     %% 				invalid_only_contains, valid_only_some_reasons,
+     %% 				invalid_only_some_reasons, valid_indirect_crl,
+     %% 				invalid_indirect_crl, valid_crl_issuer, invalid_crl_issuer]},
+     {verifying_basic_constraints,[],
+      [missing_basic_constraints, valid_basic_constraint, invalid_path_constraints,
+       valid_path_constraints]},
+     {key_usage, [],
+      [invalid_key_usage, valid_key_usage]},
+     {name_constraints, [],
+      [valid_DN_name_constraints, invalid_DN_name_constraints,
+       valid_rfc822_name_constraints,
+       invalid_rfc822_name_constraints, valid_DN_and_rfc822_name_constraints,
+       invalid_DN_and_rfc822_name_constraints, valid_dns_name_constraints,
+       invalid_dns_name_constraints, valid_uri_name_constraints,
+       invalid_uri_name_constraints]},
+     {private_certificate_extensions, [],
+      [unknown_critical_extension, unknown_not_critical_extension]}
+    ].
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -61,112 +107,706 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+init_per_testcase(_Func, Config) ->
+    Datadir = proplists:get_value(data_dir, Config),
+    put(datadir, Datadir),
+    Config.
+
+end_per_testcase(_Func, Config) ->
+    Config.
+
+init_per_suite(Config) ->
+    {skip, "PKIX Conformance test certificates expired 14 of April 2011,"
+     " new conformance test suite uses new format so skip until PKCS-12 support is implemented"}.
+    %% try crypto:start() of
+    %% 	ok ->
+    %% 	    Config
+    %% catch _:_ ->
+    %% 	    {skip, "Crypto did not start"}
+    %% end.
+
+end_per_suite(_Config) ->
+    application:stop(crypto).
+
+%%-----------------------------------------------------------------------------
+valid_rsa_signature(doc) ->
+    ["Test rsa signatur verification"];
+valid_rsa_signature(suite) ->
+    [];
+valid_rsa_signature(Config) when is_list(Config) ->
+    run([{ "4.1.1", "Valid Signatures Test1", ok}]).
+
+invalid_rsa_signature(doc) ->
+    ["Test rsa signatur verification"];
+invalid_rsa_signature(suite) ->
+    [];
+invalid_rsa_signature(Config) when is_list(Config) ->
+    run([{ "4.1.2", "Invalid CA Signature Test2", {bad_cert,invalid_signature}},
+	 { "4.1.3", "Invalid EE Signature Test3", {bad_cert,invalid_signature}}]).
+
+valid_dsa_signature(doc) ->
+    ["Test dsa signatur verification"];
+valid_dsa_signature(suite) ->
+    [];
+valid_dsa_signature(Config) when is_list(Config) ->
+    run([{ "4.1.4", "Valid DSA Signatures Test4", ok},
+	 { "4.1.5", "Valid DSA Parameter Inheritance Test5", ok}]).
+
+invalid_dsa_signature(doc) ->
+    ["Test dsa signatur verification"];
+invalid_dsa_signature(suite) ->
+    [];
+invalid_dsa_signature(Config) when is_list(Config) ->
+    run([{ "4.1.6", "Invalid DSA Signature Test6",{bad_cert,invalid_signature}}]).
+%%-----------------------------------------------------------------------------
+not_before_invalid(doc) ->
+    [""];
+not_before_invalid(suite) ->
+    [];
+not_before_invalid(Config) when is_list(Config) ->
+    run([{ "4.2.1", "Invalid CA notBefore Date Test1",{bad_cert, cert_expired}},
+	 { "4.2.2", "Invalid EE notBefore Date Test2",{bad_cert, cert_expired}}]).
+
+not_before_valid(doc) ->
+    [""];
+not_before_valid(suite) ->
+    [];
+not_before_valid(Config) when is_list(Config) ->
+    run([{ "4.2.3", "Valid pre2000 UTC notBefore Date Test3", ok},
+	 { "4.2.4", "Valid GeneralizedTime notBefore Date Test4", ok}]).
+
+not_after_invalid(doc) ->
+    [""];
+not_after_invalid(suite) ->
+    [];
+not_after_invalid(Config) when is_list(Config) ->
+    run([{ "4.2.5", "Invalid CA notAfter Date Test5", {bad_cert, cert_expired}},
+	 { "4.2.6", "Invalid EE notAfter Date Test6", {bad_cert, cert_expired}},
+	 { "4.2.7", "Invalid pre2000 UTC EE notAfter Date Test7",{bad_cert, cert_expired}}]).
+
+not_after_valid(doc) ->
+    [""];
+not_after_valid(suite) ->
+    [];
+not_after_valid(Config) when is_list(Config) ->
+    run([{ "4.2.8", "Valid GeneralizedTime notAfter Date Test8", ok}]).
+%%-----------------------------------------------------------------------------
+invalid_name_chain(doc) ->
+    [""];
+invalid_name_chain(suite) ->
+    [];
+invalid_name_chain(Config) when is_list(Config) ->
+    run([{ "4.3.1", "Invalid Name Chaining EE Test1", {bad_cert, invalid_issuer}},
+	 { "4.3.2", "Invalid Name Chaining Order Test2", {bad_cert, invalid_issuer}}]).
+
+whitespace_name_chain(doc) ->
+    [""];
+whitespace_name_chain(suite) ->
+    [];
+whitespace_name_chain(Config) when is_list(Config) ->
+    run([{ "4.3.3", "Valid Name Chaining Whitespace Test3", ok},
+	 { "4.3.4", "Valid Name Chaining Whitespace Test4", ok}]).
+
+capitalization_name_chain(doc) ->
+    [""];
+capitalization_name_chain(suite) ->
+    [];
+capitalization_name_chain(Config) when is_list(Config) ->
+    run([{ "4.3.5", "Valid Name Chaining Capitalization Test5",ok}]).
+
+uid_name_chain(doc) ->
+    [""];
+uid_name_chain(suite) ->
+    [];
+uid_name_chain(Config) when is_list(Config) ->
+    run([{ "4.3.6", "Valid Name Chaining UIDs Test6",ok}]).
+
+attrib_name_chain(doc) ->
+    [""];
+attrib_name_chain(suite) ->
+    [];
+attrib_name_chain(Config) when is_list(Config) ->
+    run([{ "4.3.7", "Valid RFC3280 Mandatory Attribute Types Test7", ok},
+	 { "4.3.8", "Valid RFC3280 Optional Attribute Types Test8",  ok}]).
+
+string_name_chain(doc) ->
+    [""];
+string_name_chain(suite) ->
+    [];
+string_name_chain(Config) when is_list(Config) ->
+    run([{ "4.3.9", "Valid UTF8String Encoded Names Test9", ok},
+	 { "4.3.10", "Valid Rollover from PrintableString to UTF8String Test10", ok},
+	 { "4.3.11", "Valid UTF8String Case Insensitive Match Test11", ok}]).
+
+%%-----------------------------------------------------------------------------
+
+basic_valid(doc) ->
+    [""];
+basic_valid(suite) ->
+    [];
+basic_valid(Config) when is_list(Config) ->
+    run([{ "4.5.1",  "Valid Basic Self-Issued Old With New Test1", ok},
+	 { "4.5.3",  "Valid Basic Self-Issued New With Old Test3", ok},
+	 { "4.5.4",  "Valid Basic Self-Issued New With Old Test4", ok}
+	]).
+
+basic_invalid(doc) ->
+    [""];
+basic_invalid(suite) ->
+    [];
+basic_invalid(Config) when is_list(Config) ->
+    run([{"4.5.2",  "Invalid Basic Self-Issued Old With New Test2",
+	  {bad_cert, {revoked, keyCompromise}}},
+	 {"4.5.5",  "Invalid Basic Self-Issued New With Old Test5",
+	  {bad_cert, {revoked, keyCompromise}}}
+	]).
+
+crl_signing_valid(doc) ->
+    [""];
+crl_signing_valid(suite) ->
+    [];
+crl_signing_valid(Config) when is_list(Config) ->
+    run([{ "4.5.6",  "Valid Basic Self-Issued CRL Signing Key Test6", ok}]).
+
+crl_signing_invalid(doc) ->
+    [""];
+crl_signing_invalid(suite) ->
+    [];
+crl_signing_invalid(Config) when is_list(Config) ->
+    run([{ "4.5.7",  "Invalid Basic Self-Issued CRL Signing Key Test7",
+	   {bad_cert, {revoked, keyCompromise}}},
+	 { "4.5.8",  "Invalid Basic Self-Issued CRL Signing Key Test8",
+	   {bad_cert, invalid_key_usage}}
+	]).
+
+%%-----------------------------------------------------------------------------
+missing_CRL(doc) ->
+    [""];
+missing_CRL(suite) ->
+    [];
+missing_CRL(Config) when is_list(Config) ->
+    run([{ "4.4.1", "Missing CRL Test1",{bad_cert,
+    revocation_status_undetermined}}]).
+
+revoked_CA(doc) ->
+    [""];
+revoked_CA(suite) ->
+    [];
+revoked_CA(Config) when is_list(Config) ->
+    run([{ "4.4.2", "Invalid Revoked CA Test2", {bad_cert,
+    {revoked, keyCompromise}}}]).
+
+revoked_peer(doc) ->
+    [""];
+revoked_peer(suite) ->
+    [];
+revoked_peer(Config) when is_list(Config) ->
+    run([{ "4.4.3", "Invalid Revoked EE Test3", {bad_cert,
+    {revoked, keyCompromise}}}]).
+
+invalid_CRL_signature(doc) ->
+    [""];
+invalid_CRL_signature(suite) ->
+    [];
+invalid_CRL_signature(Config) when is_list(Config) ->
+    run([{ "4.4.4", "Invalid Bad CRL Signature Test4",
+	   {bad_cert, revocation_status_undetermined}}]).
+
+invalid_CRL_issuer(doc) ->
+    [""];
+invalid_CRL_issuer(suite) ->
+    [];
+invalid_CRL_issuer(Config) when is_list(Config) ->
+    run({ "4.4.5", "Invalid Bad CRL Issuer Name Test5",
+	  {bad_cert, revocation_status_undetermined}}).
+
+invalid_CRL(doc) ->
+    [""];
+invalid_CRL(suite) ->
+    [];
+invalid_CRL(Config) when is_list(Config) ->
+    run([{ "4.4.6", "Invalid Wrong CRL Test6",
+	   {bad_cert, revocation_status_undetermined}}]).
+
+valid_CRL(doc) ->
+    [""];
+valid_CRL(suite) ->
+    [];
+valid_CRL(Config) when is_list(Config) ->
+    run([{ "4.4.7", "Valid Two CRLs Test7", ok}]).
+
+unknown_CRL_extension(doc) ->
+    [""];
+unknown_CRL_extension(suite) ->
+    [];
+unknown_CRL_extension(Config) when is_list(Config) ->
+    run([{ "4.4.8", "Invalid Unknown CRL Entry Extension Test8",
+	   {bad_cert, {revoked, keyCompromise}}},
+	 { "4.4.9", "Invalid Unknown CRL Extension Test9",
+	   {bad_cert, {revoked, keyCompromise}}},
+	 { "4.4.10", "Invalid Unknown CRL Extension Test10",
+	   {bad_cert, revocation_status_undetermined}}]).
+
+old_CRL(doc) ->
+    [""];
+old_CRL(suite) ->
+    [];
+old_CRL(Config) when is_list(Config) ->
+    run([{ "4.4.11", "Invalid Old CRL nextUpdate Test11",
+	   {bad_cert, revocation_status_undetermined}},
+	 { "4.4.12", "Invalid pre2000 CRL nextUpdate Test12",
+	   {bad_cert, revocation_status_undetermined}}]).
+
+fresh_CRL(doc) ->
+    [""];
+fresh_CRL(suite) ->
+    [];
+fresh_CRL(Config) when is_list(Config) ->
+    run([{ "4.4.13", "Valid GeneralizedTime CRL nextUpdate Test13", ok}]).
+
+valid_serial(doc) ->
+    [""];
+valid_serial(suite) ->
+    [];
+valid_serial(Config) when is_list(Config) ->
+    run([
+	 { "4.4.14", "Valid Negative Serial Number Test14",ok},
+	 { "4.4.16", "Valid Long Serial Number Test16", ok},
+	 { "4.4.17", "Valid Long Serial Number Test17", ok}
+	]).
+
+invalid_serial(doc) ->
+    [""];
+invalid_serial(suite) ->
+    [];
+invalid_serial(Config) when is_list(Config) ->
+    run([{ "4.4.15", "Invalid Negative Serial Number Test15",
+	   {bad_cert, {revoked, keyCompromise}}},
+	 { "4.4.18", "Invalid Long Serial Number Test18",
+	   {bad_cert, {revoked, keyCompromise}}}]).
+
+valid_seperate_keys(doc) ->
+    [""];
+valid_seperate_keys(suite) ->
+    [];
+valid_seperate_keys(Config) when is_list(Config) ->
+    run([{ "4.4.19", "Valid Separate Certificate and CRL Keys Test19",   ok}]).
+
+invalid_separate_keys(doc) ->
+    [""];
+invalid_separate_keys(suite) ->
+    [];
+invalid_separate_keys(Config) when is_list(Config) ->
+    run([{ "4.4.20", "Invalid Separate Certificate and CRL Keys Test20",
+	   {bad_cert, {revoked, keyCompromise}}},
+	 { "4.4.21", "Invalid Separate Certificate and CRL Keys Test21",
+	   {bad_cert, revocation_status_undetermined}}
+	]).
+%%-----------------------------------------------------------------------------
+missing_basic_constraints(doc) ->
+    [""];
+missing_basic_constraints(suite) ->
+    [];
+missing_basic_constraints(Config) when is_list(Config) ->
+    run([{ "4.6.1",  "Invalid Missing basicConstraints Test1",
+	   {bad_cert, missing_basic_constraint}},
+	 { "4.6.2",  "Invalid cA False Test2",
+	   {bad_cert, missing_basic_constraint}},
+	 { "4.6.3",  "Invalid cA False Test3",
+	   {bad_cert, missing_basic_constraint}}]).
+
+valid_basic_constraint(doc) ->
+    [""];
+valid_basic_constraint(suite) ->
+    [];
+valid_basic_constraint(Config) when is_list(Config) ->
+    run([{"4.6.4", "Valid basicConstraints Not Critical Test4", ok}]).
+
+invalid_path_constraints(doc) ->
+    [""];
+invalid_path_constraints(suite) ->
+    [];
+invalid_path_constraints(Config) when is_list(Config) ->
+    run([{ "4.6.5", "Invalid pathLenConstraint Test5", {bad_cert, max_path_length_reached}},
+	 { "4.6.6", "Invalid pathLenConstraint Test6", {bad_cert, max_path_length_reached}},
+	 { "4.6.9", "Invalid pathLenConstraint Test9", {bad_cert, max_path_length_reached}},
+	 { "4.6.10", "Invalid pathLenConstraint Test10", {bad_cert, max_path_length_reached}},
+	 { "4.6.11", "Invalid pathLenConstraint Test11", {bad_cert, max_path_length_reached}},
+	 { "4.6.12", "Invalid pathLenConstraint Test12", {bad_cert, max_path_length_reached}},
+	 { "4.6.16", "Invalid Self-Issued pathLenConstraint Test16",
+	   {bad_cert, max_path_length_reached}}]).
 
-signature_verification(doc) ->    [""];
-signature_verification(suite) -> [];
-signature_verification(Config) when is_list(Config) ->
-    run(signature_verification()).
-validity_periods(doc) ->    [""];
-validity_periods(suite) -> [];
-validity_periods(Config) when is_list(Config) ->
-    run(validity_periods()).
-verifying_name_chaining(doc) ->    [""];
-verifying_name_chaining(suite) -> [];
-verifying_name_chaining(Config) when is_list(Config) ->
-    run(verifying_name_chaining()).
-basic_certificate_revocation_tests(doc) ->    [""];
-basic_certificate_revocation_tests(suite) -> [];
-basic_certificate_revocation_tests(Config) when is_list(Config) ->
-    run(basic_certificate_revocation_tests()).
-verifying_paths_with_self_issued_certificates(doc) ->    [""];
-verifying_paths_with_self_issued_certificates(suite) -> [];
-verifying_paths_with_self_issued_certificates(Config) when is_list(Config) ->
-    run(verifying_paths_with_self_issued_certificates()).
-verifying_basic_constraints(doc) ->    [""];
-verifying_basic_constraints(suite) -> [];
-verifying_basic_constraints(Config) when is_list(Config) ->
-    run(verifying_basic_constraints()).
-key_usage(doc) ->    [""];
-key_usage(suite) -> [];
-key_usage(Config) when is_list(Config) ->
-    run(key_usage()).
+valid_path_constraints(doc) ->
+    [""];
+valid_path_constraints(suite) ->
+    [];
+valid_path_constraints(Config) when is_list(Config) ->
+    run([{ "4.6.7",  "Valid pathLenConstraint Test7", ok},
+	 { "4.6.8",  "Valid pathLenConstraint Test8", ok},
+	 { "4.6.13", "Valid pathLenConstraint Test13", ok},
+	 { "4.6.14", "Valid pathLenConstraint Test14", ok},
+	 { "4.6.15", "Valid Self-Issued pathLenConstraint Test15", ok},
+	 { "4.6.17", "Valid Self-Issued pathLenConstraint Test17", ok}]).
+
+%%-----------------------------------------------------------------------------
+invalid_key_usage(doc) ->
+    [""];
+invalid_key_usage(suite) ->
+    [];
+invalid_key_usage(Config) when is_list(Config) ->
+    run([{ "4.7.1",  "Invalid keyUsage Critical keyCertSign False Test1",
+	   {bad_cert,invalid_key_usage} },
+	 { "4.7.2",  "Invalid keyUsage Not Critical keyCertSign False Test2",
+	   {bad_cert,invalid_key_usage}},
+	{ "4.7.4",  "Invalid keyUsage Critical cRLSign False Test4",
+	  {bad_cert, revocation_status_undetermined}},
+	 { "4.7.5",  "Invalid keyUsage Not Critical cRLSign False Test5",
+	   {bad_cert, revocation_status_undetermined}}
+	]).
+
+valid_key_usage(doc) ->
+    [""];
+valid_key_usage(suite) ->
+    [];
+valid_key_usage(Config) when is_list(Config) ->
+    run([{ "4.7.3",  "Valid keyUsage Not Critical Test3", ok}]).
+
+%%-----------------------------------------------------------------------------
 certificate_policies(doc) ->    [""];
 certificate_policies(suite) -> [];
 certificate_policies(Config) when is_list(Config) ->
     run(certificate_policies()).
+%%-----------------------------------------------------------------------------
 require_explicit_policy(doc) ->    [""];
 require_explicit_policy(suite) -> [];
 require_explicit_policy(Config) when is_list(Config) ->
     run(require_explicit_policy()).
+%%-----------------------------------------------------------------------------
 policy_mappings(doc) ->     [""];
 policy_mappings(suite) -> [];
 policy_mappings(Config) when is_list(Config) ->
     run(policy_mappings()).
+%%-----------------------------------------------------------------------------
 inhibit_policy_mapping(doc) ->    [""];
 inhibit_policy_mapping(suite) -> [];
 inhibit_policy_mapping(Config) when is_list(Config) ->
     run(inhibit_policy_mapping()).
+%%-----------------------------------------------------------------------------
 inhibit_any_policy(doc) ->    [""];
 inhibit_any_policy(suite) -> [];
 inhibit_any_policy(Config) when is_list(Config) ->
     run(inhibit_any_policy()).
-name_constraints(doc) ->    [""];
-name_constraints(suite) -> [];
-name_constraints(Config) when is_list(Config) ->
-    run(name_constraints()).
-distribution_points(doc) ->    [""];
-distribution_points(suite) -> [];
-distribution_points(Config) when is_list(Config) ->
-    run(distribution_points()).
-delta_crls(doc) ->    [""];
-delta_crls(suite) -> [];
-delta_crls(Config) when is_list(Config) ->
-    run(delta_crls()).
-private_certificate_extensions(doc) ->    [""];
-private_certificate_extensions(suite) -> [];
-private_certificate_extensions(Config) when is_list(Config) ->
-    run(private_certificate_extensions()).
-    
-run() ->
-    Tests = 
-	[signature_verification(),
-	 validity_periods(),
-	 verifying_name_chaining(),
-	 %%basic_certificate_revocation_tests(),
-	 verifying_paths_with_self_issued_certificates(),
-	 verifying_basic_constraints(),
-	 key_usage(),
-	 %%certificate_policies(),
-	 %%require_explicit_policy(),
-	 %%policy_mappings(),
-	 %%inhibit_policy_mapping(),
-	 %%inhibit_any_policy(),
-	 name_constraints(),	     
-	 %distribution_points(),
-	 %delta_crls(),
-	 private_certificate_extensions()
-	],
-    run(lists:append(Tests)).
+%%-----------------------------------------------------------------------------
+
+valid_DN_name_constraints(doc) ->
+    [""];
+valid_DN_name_constraints(suite) ->
+    [];
+valid_DN_name_constraints(Config) when is_list(Config) ->
+    run([{ "4.13.1",  "Valid DN nameConstraints Test1", ok},
+	 { "4.13.4",  "Valid DN nameConstraints Test4", ok},
+	 { "4.13.5",  "Valid DN nameConstraints Test5", ok},
+	 { "4.13.6",  "Valid DN nameConstraints Test6", ok},
+	 { "4.13.11", "Valid DN nameConstraints Test11", ok},
+	 { "4.13.14", "Valid DN nameConstraints Test14", ok},
+	 { "4.13.18", "Valid DN nameConstraints Test18", ok},
+	 { "4.13.19", "Valid Self-Issued DN nameConstraints Test19", ok}]).
+
+invalid_DN_name_constraints(doc) ->
+    [""];
+invalid_DN_name_constraints(suite) ->
+    [];
+invalid_DN_name_constraints(Config) when is_list(Config) ->
+    run([{ "4.13.2", "Invalid DN nameConstraints Test2", {bad_cert, name_not_permitted}},
+	 { "4.13.3",  "Invalid DN nameConstraints Test3", {bad_cert, name_not_permitted}},
+	 { "4.13.7",  "Invalid DN nameConstraints Test7", {bad_cert, name_not_permitted}},
+	 { "4.13.8",  "Invalid DN nameConstraints Test8", {bad_cert, name_not_permitted}},
+	 { "4.13.9",  "Invalid DN nameConstraints Test9", {bad_cert, name_not_permitted}},
+	 { "4.13.10", "Invalid DN nameConstraints Test10",{bad_cert, name_not_permitted}},
+	 { "4.13.12", "Invalid DN nameConstraints Test12",{bad_cert, name_not_permitted}},
+	 { "4.13.13", "Invalid DN nameConstraints Test13",{bad_cert, name_not_permitted}},
+	 { "4.13.15", "Invalid DN nameConstraints Test15",{bad_cert, name_not_permitted}},
+	 { "4.13.16", "Invalid DN nameConstraints Test16",{bad_cert, name_not_permitted}},
+	 { "4.13.17", "Invalid DN nameConstraints Test17",{bad_cert, name_not_permitted}},
+	 { "4.13.20", "Invalid Self-Issued DN nameConstraints Test20",
+	   {bad_cert, name_not_permitted}}]).
+
+valid_rfc822_name_constraints(doc) ->
+    [""];
+valid_rfc822_name_constraints(suite) ->
+    [];
+valid_rfc822_name_constraints(Config) when is_list(Config) ->
+    run([{ "4.13.21", "Valid RFC822 nameConstraints Test21", ok},
+	 { "4.13.23", "Valid RFC822 nameConstraints Test23", ok},
+	 { "4.13.25", "Valid RFC822 nameConstraints Test25", ok}]).
+
+
+invalid_rfc822_name_constraints(doc) ->
+    [""];
+invalid_rfc822_name_constraints(suite) ->
+    [];
+invalid_rfc822_name_constraints(Config) when is_list(Config) ->
+    run([{ "4.13.22", "Invalid RFC822 nameConstraints Test22",
+	   {bad_cert, name_not_permitted}},
+	 { "4.13.24", "Invalid RFC822 nameConstraints Test24",
+	   {bad_cert, name_not_permitted}},
+	 { "4.13.26", "Invalid RFC822 nameConstraints Test26",
+	   {bad_cert, name_not_permitted}}]).
+
+valid_DN_and_rfc822_name_constraints(doc) ->
+    [""];
+valid_DN_and_rfc822_name_constraints(suite) ->
+    [];
+valid_DN_and_rfc822_name_constraints(Config) when is_list(Config) ->
+    run([{ "4.13.27", "Valid DN and RFC822 nameConstraints Test27", ok}]).
+
+invalid_DN_and_rfc822_name_constraints(doc) ->
+    [""];
+invalid_DN_and_rfc822_name_constraints(suite) ->
+    [];
+invalid_DN_and_rfc822_name_constraints(Config) when is_list(Config) ->
+    run([{ "4.13.28", "Invalid DN and RFC822 nameConstraints Test28",
+	   {bad_cert, name_not_permitted}},
+	 { "4.13.29", "Invalid DN and RFC822 nameConstraints Test29",
+	   {bad_cert, name_not_permitted}}]).
+
+valid_dns_name_constraints(doc) ->
+    [""];
+valid_dns_name_constraints(suite) ->
+    [];
+valid_dns_name_constraints(Config) when is_list(Config) ->
+    run([{ "4.13.30", "Valid DNS nameConstraints Test30", ok},
+	 { "4.13.32", "Valid DNS nameConstraints Test32", ok}]).
+
+invalid_dns_name_constraints(doc) ->
+    [""];
+invalid_dns_name_constraints(suite) ->
+    [];
+invalid_dns_name_constraints(Config) when is_list(Config) ->
+    run([{ "4.13.31", "Invalid DNS nameConstraints Test31", {bad_cert, name_not_permitted}},
+	 { "4.13.33", "Invalid DNS nameConstraints Test33", {bad_cert, name_not_permitted}},
+	 { "4.13.38", "Invalid DNS nameConstraints Test38", {bad_cert, name_not_permitted}}]).
+
+valid_uri_name_constraints(doc) ->
+    [""];
+valid_uri_name_constraints(suite) ->
+    [];
+valid_uri_name_constraints(Config) when is_list(Config) ->
+    run([{ "4.13.34", "Valid URI nameConstraints Test34", ok},
+	 { "4.13.36", "Valid URI nameConstraints Test36", ok}]).
+
+invalid_uri_name_constraints(doc) ->
+    [""];
+invalid_uri_name_constraints(suite) ->
+    [];
+invalid_uri_name_constraints(Config) when is_list(Config) ->
+    run([{ "4.13.35", "Invalid URI nameConstraints Test35",{bad_cert, name_not_permitted}},
+	 { "4.13.37", "Invalid URI nameConstraints Test37",{bad_cert, name_not_permitted}}]).
+
+%%-----------------------------------------------------------------------------
+delta_without_crl(doc) ->
+    [""];
+delta_without_crl(suite) ->
+    [];
+delta_without_crl(Config) when is_list(Config) ->
+  run([{ "4.15.1",  "Invalid deltaCRLIndicator No Base Test1",{bad_cert,
+							       revocation_status_undetermined}},
+       {"4.15.10", "Invalid delta-CRL Test10", {bad_cert,
+						revocation_status_undetermined}}]).
+
+valid_delta_crls(doc) ->
+    [""];
+valid_delta_crls(suite) ->
+    [];
+valid_delta_crls(Config) when is_list(Config) ->
+    run([{ "4.15.2",  "Valid delta-CRL Test2", ok},
+	 { "4.15.5",  "Valid delta-CRL Test5", ok},
+	 { "4.15.7",  "Valid delta-CRL Test7", ok},
+	 { "4.15.8",  "Valid delta-CRL Test8", ok}
+	]).
+
+invalid_delta_crls(doc) ->
+    [""];
+invalid_delta_crls(suite) ->
+    [];
+invalid_delta_crls(Config) when is_list(Config) ->
+    run([{ "4.15.3",  "Invalid delta-CRL Test3", {bad_cert,{revoked, keyCompromise}}},
+	 { "4.15.4",  "Invalid delta-CRL Test4", {bad_cert,{revoked, keyCompromise}}},
+	 { "4.15.6",  "Invalid delta-CRL Test6", {bad_cert,{revoked, keyCompromise}}},
+	 { "4.15.9",  "Invalid delta-CRL Test9", {bad_cert,{revoked, keyCompromise}}}]).
+
+%%-----------------------------------------------------------------------------
+
+valid_distribution_points(doc) ->
+    [""];
+valid_distribution_points(suite) ->
+    [];
+valid_distribution_points(Config) when is_list(Config) ->
+    run([{ "4.14.1",  "Valid distributionPoint Test1", ok},
+	 { "4.14.4",  "Valid distributionPoint Test4", ok},
+	 { "4.14.5",  "Valid distributionPoint Test5", ok},
+	 { "4.14.7",  "Valid distributionPoint Test7", ok}
+	]).
+
+valid_distribution_points_no_issuing_distribution_point(doc) ->
+    [""];
+valid_distribution_points_no_issuing_distribution_point(suite) ->
+    [];
+valid_distribution_points_no_issuing_distribution_point(Config) when is_list(Config) ->
+    run([{ "4.14.10", "Valid No issuingDistributionPoint Test10", ok}
+	]).
+
+invalid_distribution_points(doc) ->
+    [""];
+invalid_distribution_points(suite) ->
+    [];
+invalid_distribution_points(Config) when is_list(Config) ->
+    run([{ "4.14.2",  "Invalid distributionPoint Test2", {bad_cert,{revoked, keyCompromise}}},
+	 { "4.14.3",  "Invalid distributionPoint Test3", {bad_cert,
+							  revocation_status_undetermined}},
+	 { "4.14.6",  "Invalid distributionPoint Test6", {bad_cert,{revoked, keyCompromise}}},
+	 { "4.14.8",  "Invalid distributionPoint Test8", {bad_cert,
+							  revocation_status_undetermined}},
+	 { "4.14.9",  "Invalid distributionPoint Test9", {bad_cert,
+							  revocation_status_undetermined}}
+	]).
+
+valid_only_contains(doc) ->
+    [""];
+valid_only_contains(suite) ->
+    [];
+valid_only_contains(Config) when is_list(Config) ->
+    run([{ "4.14.13", "Valid onlyContainsCACerts CRL Test13", ok}]).
 
+
+invalid_only_contains(doc) ->
+    [""];
+invalid_only_contains(suite) ->
+    [];
+invalid_only_contains(Config) when is_list(Config) ->
+    run([{ "4.14.11", "Invalid onlyContainsUserCerts CRL Test11",
+	   {bad_cert, revocation_status_undetermined}},
+	 { "4.14.12", "Invalid onlyContainsCACerts CRL Test12",
+	   {bad_cert, revocation_status_undetermined}},
+	 { "4.14.14", "Invalid onlyContainsAttributeCerts Test14",
+	   {bad_cert, revocation_status_undetermined}}
+	]).
+
+valid_only_some_reasons(doc) ->
+    [""];
+valid_only_some_reasons(suite) ->
+    [];
+valid_only_some_reasons(Config) when is_list(Config) ->
+    run([{ "4.14.18", "Valid onlySomeReasons Test18", ok},
+	 { "4.14.19", "Valid onlySomeReasons Test19", ok}
+	]).
+
+invalid_only_some_reasons(doc) ->
+    [""];
+invalid_only_some_reasons(suite) ->
+    [];
+invalid_only_some_reasons(Config) when is_list(Config) ->
+    run([{ "4.14.15", "Invalid onlySomeReasons Test15",
+	   {bad_cert,{revoked, keyCompromise}}},
+	 { "4.14.16", "Invalid onlySomeReasons Test16",
+	   {bad_cert,{revoked, certificateHold}}},
+	 { "4.14.17", "Invalid onlySomeReasons Test17",
+	   {bad_cert, revocation_status_undetermined}},
+	 { "4.14.20", "Invalid onlySomeReasons Test20",
+	   {bad_cert,{revoked, keyCompromise}}},
+	 { "4.14.21", "Invalid onlySomeReasons Test21",
+	   {bad_cert,{revoked, affiliationChanged}}}
+	]).
+
+valid_indirect_crl(doc) ->
+    [""];
+valid_indirect_crl(suite) ->
+    [];
+valid_indirect_crl(Config) when is_list(Config) ->
+    run([{ "4.14.22", "Valid IDP with indirectCRL Test22", ok},
+	 { "4.14.24", "Valid IDP with indirectCRL Test24", ok},
+	 { "4.14.25", "Valid IDP with indirectCRL Test25", ok}
+	]).
+
+invalid_indirect_crl(doc) ->
+    [""];
+invalid_indirect_crl(suite) ->
+    [];
+invalid_indirect_crl(Config) when is_list(Config) ->
+    run([{ "4.14.23", "Invalid IDP with indirectCRL Test23",
+	   {bad_cert,{revoked, keyCompromise}}},
+	 { "4.14.26", "Invalid IDP with indirectCRL Test26",
+	   {bad_cert, revocation_status_undetermined}}
+	]).
+
+valid_crl_issuer(doc) ->
+    [""];
+valid_crl_issuer(suite) ->
+    [];
+valid_crl_issuer(Config) when is_list(Config) ->
+    run([{ "4.14.28", "Valid cRLIssuer Test28", ok}%%,
+	 %%{ "4.14.29", "Valid cRLIssuer Test29", ok},
+	 %%{ "4.14.33", "Valid cRLIssuer Test33", ok}
+	]).
+
+invalid_crl_issuer(doc) ->
+    [""];
+invalid_crl_issuer(suite) ->
+    [];
+invalid_crl_issuer(Config) when is_list(Config) ->
+    run([
+	 { "4.14.27", "Invalid cRLIssuer Test27", {bad_cert, revocation_status_undetermined}},
+	 { "4.14.31", "Invalid cRLIssuer Test31", {bad_cert,{revoked, keyCompromise}}},
+	 { "4.14.32", "Invalid cRLIssuer Test32", {bad_cert,{revoked, keyCompromise}}},
+	 { "4.14.34", "Invalid cRLIssuer Test34", {bad_cert,{revoked, keyCompromise}}},
+	 { "4.14.35", "Invalid cRLIssuer Test35", {bad_cert, revocation_status_undetermined}}
+	]).
+
+
+%%distribution_points() ->
+    %%{ "4.14",    "Distribution Points" },
+%%    [
+	 %% Although this test is valid it has a circular dependency. As a result
+	 %% an attempt is made to reursively checks a CRL path and rejected due to
+	 %% a CRL path validation error. PKITS notes suggest this test does not
+	 %% need to be run due to this issue.
+%%	 { "4.14.30", "Valid cRLIssuer Test30", 54 }].
+
+
+%%-----------------------------------------------------------------------------
+
+unknown_critical_extension(doc) ->
+    [""];
+unknown_critical_extension(suite) ->
+    [];
+unknown_critical_extension(Config) when is_list(Config) ->
+    run([{ "4.16.2",  "Invalid Unknown Critical Certificate Extension Test2",
+	   {bad_cert,unknown_critical_extension}}]).
+
+unknown_not_critical_extension(doc) ->
+    [""];
+unknown_not_critical_extension(suite) ->
+    [];
+unknown_not_critical_extension(Config) when is_list(Config) ->
+    run([{ "4.16.1",  "Valid Unknown Not Critical Certificate Extension Test1", ok}]).
+
+%%-----------------------------------------------------------------------------
 run(Tests) ->    
     File = file(?CERTS,"TrustAnchorRootCertificate.crt"),
     {ok, TA} = file:read_file(File),
     run(Tests, TA).
 
 run({Chap, Test, Result}, TA) ->
-    CertChain = sort_chain(read_certs(Test),TA, [], false),    
-    try public_key:pkix_path_validation(TA, CertChain, []) of	
-	{Result, _} -> ok;	
+    CertChain = sort_chain(read_certs(Test),TA, [], false, Chap),
+    Options = path_validation_options(TA, Chap,Test),
+    try public_key:pkix_path_validation(TA, CertChain, Options) of
+	{Result, _} -> ok;
 	{error,Result} when Result =/= ok ->
 	    ok;
-	{error,Error} when is_integer(Result) ->
-	    ?warning(" ~p~n  Got ~p expected ~p~n",[Test, Error, Result]);
-	{error,Error} when Result =/= ok ->
-	    ?error(" minor ~p~n  Got ~p expected ~p~n",[Test, Error, Result]);
 	{error, Error}  ->
 	    ?error(" ~p ~p~n  Expected ~p got ~p ~n", [Chap, Test, Result, Error]),
 	    fail;
-	{ok, _} when Result =/= ok ->
+	{ok, _OK} when Result =/= ok ->
 	    ?error(" ~p ~p~n  Expected ~p got ~p ~n", [Chap, Test, Result, ok]),
 	    fail
     catch Type:Reason ->
@@ -181,14 +821,318 @@ run([Test|Rest],TA) ->
     run(Rest,TA);
 run([],_) -> ok.
 
+path_validation_options(TA, Chap, Test) ->
+    case needs_crl_options(Chap) of
+	true ->
+	    crl_options(TA, Test);
+	false ->
+	     Fun =
+		fun(_,{bad_cert, _} = Reason, _) ->
+			{fail, Reason};
+		   (_,{extension, _}, UserState) ->
+			{unknown, UserState};
+		   (_, Valid, UserState) when Valid == valid;
+					      Valid == valid_peer ->
+			{valid, UserState}
+		 end,
+	    [{verify_fun, {Fun, []}}]
+    end.
+
+needs_crl_options("4.4" ++ _) ->
+    true;
+needs_crl_options("4.5" ++ _) ->
+    true;
+needs_crl_options("4.7.4" ++ _) ->
+    true;
+needs_crl_options("4.7.5" ++ _) ->
+    true;
+needs_crl_options("4.14" ++ _) ->
+    true;
+needs_crl_options("4.15" ++ _) ->
+    true;
+needs_crl_options(_) ->
+    false.
+
+crl_options(TA, Test) ->
+     case read_crls(Test) of
+	[] ->
+	    [];
+        CRLs ->
+	    Fun =
+		 fun(_,{bad_cert, _} = Reason, _) ->
+			 {fail, Reason};
+		   (_,{extension,
+		       #'Extension'{extnID = ?'id-ce-cRLDistributionPoints',
+				    extnValue = Value}}, UserState0) ->
+			UserState = update_crls(Value, UserState0),
+			{valid, UserState};
+		   (_,{extension, _}, UserState) ->
+			{unknown, UserState};
+		   (OtpCert, Valid, UserState) when Valid == valid;
+						    Valid == valid_peer ->
+			{ErlCerts, CRLs} = UserState#verify_state.crl_info,
+			CRLInfo0 =
+			    crl_info(OtpCert,
+				     ErlCerts,[{DerCRL, public_key:der_decode('CertificateList',
+									      DerCRL)} || DerCRL <- CRLs],
+				     []),
+			CRLInfo = lists:reverse(CRLInfo0),
+			Certs = UserState#verify_state.certs_db,
+			Fun = fun(DP, CRLtoValidate, Id, CertsDb) ->
+				      trusted_cert_and_path(DP, CRLtoValidate, Id, CertsDb)
+			      end,
+			Ignore = ignore_sign_test_when_building_path(Test),
+			case public_key:pkix_crls_validate(OtpCert, CRLInfo,
+							   [{issuer_fun,{Fun, {Ignore, Certs}}}]) of
+			    valid ->
+				{valid, UserState};
+			    Reason  ->
+				{fail, Reason}
+			end
+		end,
+
+	    Certs = read_certs(Test),
+	    ErlCerts = [public_key:pkix_decode_cert(Cert, otp) || Cert <- Certs],
+
+	    [{verify_fun, {Fun, #verify_state{certs_db = [TA| Certs],
+					      crl_info = {ErlCerts, CRLs}}}}]
+    end.
+
+crl_info(_, _, [], Acc) ->
+    Acc;
+crl_info(OtpCert, Certs, [{_, #'CertificateList'{tbsCertList =
+						     #'TBSCertList'{issuer = Issuer,
+								    crlExtensions = CRLExtensions}}}
+				= CRL | Rest], Acc) ->
+    OtpTBSCert =  OtpCert#'OTPCertificate'.tbsCertificate,
+    Extensions = OtpTBSCert#'OTPTBSCertificate'.extensions,
+    ExtList = pubkey_cert:extensions_list(CRLExtensions),
+    DPs  = case pubkey_cert:select_extension(?'id-ce-cRLDistributionPoints', Extensions) of
+	      #'Extension'{extnValue = Value} ->
+		   lists:map(fun(Point) -> pubkey_cert_records:transform(Point, decode) end, Value);
+	      _ ->
+		  case same_issuer(OtpCert, Issuer) of
+		      true ->
+			  [make_dp(ExtList, asn1_NOVALUE, Issuer)];
+		      false ->
+			  [make_dp(ExtList, Issuer, ignore)]
+		  end
+	   end,
+    DPsCRLs = lists:map(fun(DP) -> {DP, CRL} end, DPs),
+    crl_info(OtpCert, Certs, Rest, DPsCRLs ++ Acc).
+
+ignore_sign_test_when_building_path("Invalid Bad CRL Signature Test4") ->
+    true;
+ignore_sign_test_when_building_path(_) ->
+    false.
+
+same_issuer(OTPCert, Issuer) ->
+    DecIssuer = pubkey_cert_records:transform(Issuer, decode),
+    OTPTBSCert =  OTPCert#'OTPCertificate'.tbsCertificate,
+    CertIssuer =  OTPTBSCert#'OTPTBSCertificate'.issuer,
+    pubkey_cert:is_issuer(DecIssuer, CertIssuer).
+
+make_dp(Extensions, Issuer0, DpInfo) ->
+    {Issuer, Point} = mk_issuer_dp(Issuer0, DpInfo),
+    case pubkey_cert:select_extension('id-ce-cRLReason', Extensions) of
+	#'Extension'{extnValue = Reasons} ->
+	    #'DistributionPoint'{cRLIssuer = Issuer,
+				 reasons = Reasons,
+				 distributionPoint = Point};
+	_ ->
+	    #'DistributionPoint'{cRLIssuer = Issuer,
+				 reasons = [unspecified, keyCompromise,
+					    cACompromise, affiliationChanged, superseded,
+					    cessationOfOperation, certificateHold,
+					    removeFromCRL, privilegeWithdrawn, aACompromise],
+				 distributionPoint = Point}
+    end.
+
+mk_issuer_dp(asn1_NOVALUE, Issuer) ->
+    {asn1_NOVALUE, {fullName, [{directoryName, Issuer}]}};
+mk_issuer_dp(Issuer, _) ->
+    {[{directoryName, Issuer}], asn1_NOVALUE}.
+
+update_crls(_, State) ->
+    State.
+
+trusted_cert_and_path(DP, CRL, Id, {Ignore, CertsList}) ->
+    case crl_issuer(crl_issuer_name(DP), CRL, Id, CertsList, CertsList, Ignore) of
+	{ok, IssuerCert, DerIssuerCert} ->
+	    Certs = [{public_key:pkix_decode_cert(Cert, otp), Cert} || Cert <- CertsList],
+	    CertChain = build_chain(Certs, Certs, IssuerCert, Ignore, [DerIssuerCert]),
+	    {ok, public_key:pkix_decode_cert(hd(CertChain), otp), CertChain};
+	Other ->
+	    Other
+    end.
+
+crl_issuer_name(#'DistributionPoint'{cRLIssuer = asn1_NOVALUE}) ->
+    undefined;
+crl_issuer_name(#'DistributionPoint'{cRLIssuer = [{directoryName, Issuer}]}) ->
+    pubkey_cert_records:transform(Issuer, decode).
+
+build_chain([],_, _, _,Acc) ->
+    Acc;
+
+build_chain([{First, DerFirst}|Certs], All, Cert, Ignore, Acc) ->
+    case public_key:pkix_is_self_signed(Cert) andalso is_test_root(Cert) of
+	true ->
+	    Acc;
+	false ->
+	    case public_key:pkix_is_issuer(Cert, First)
+		%%andalso check_extension_cert_signer(First)
+		andalso is_signer(First, Cert, Ignore)
+	    of
+		true ->
+		    build_chain(All, All, First, Ignore, [DerFirst | Acc]);
+		false ->
+		    build_chain(Certs, All, Cert, Ignore, Acc)
+	    end
+    end.
+
+is_signer(_,_, true) ->
+    true;
+is_signer(Signer, #'OTPCertificate'{} = Cert,_) ->
+    TBSCert = Signer#'OTPCertificate'.tbsCertificate,
+    PublicKeyInfo = TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
+    PublicKey = PublicKeyInfo#'OTPSubjectPublicKeyInfo'.subjectPublicKey,
+    AlgInfo = PublicKeyInfo#'OTPSubjectPublicKeyInfo'.algorithm,
+    PublicKeyParams = AlgInfo#'PublicKeyAlgorithm'.parameters,
+    try pubkey_cert:validate_signature(Cert, public_key:pkix_encode('OTPCertificate',
+								Cert, otp),
+				   PublicKey, PublicKeyParams, true, ?DEFAULT_VERIFYFUN) of
+	true ->
+	    true
+    catch
+	_:_ ->
+	    false
+    end;
+is_signer(Signer, #'CertificateList'{} = CRL, _) ->
+    TBSCert = Signer#'OTPCertificate'.tbsCertificate,
+    PublicKeyInfo = TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
+    PublicKey = PublicKeyInfo#'OTPSubjectPublicKeyInfo'.subjectPublicKey,
+    AlgInfo = PublicKeyInfo#'OTPSubjectPublicKeyInfo'.algorithm,
+    PublicKeyParams = AlgInfo#'PublicKeyAlgorithm'.parameters,
+    pubkey_crl:verify_crl_signature(CRL, public_key:pkix_encode('CertificateList',
+								CRL, plain),
+				    PublicKey, PublicKeyParams).
+
+is_test_root(OtpCert) ->
+    TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
+    {rdnSequence, AtterList} = TBSCert#'OTPTBSCertificate'.issuer,
+    lists:member([{'AttributeTypeAndValue',{2,5,4,3},{printableString,"Trust Anchor"}}],
+			AtterList).
+
+check_extension_cert_signer(OtpCert) ->
+    TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
+     Extensions = TBSCert#'OTPTBSCertificate'.extensions,
+     case pubkey_cert:select_extension(?'id-ce-keyUsage', Extensions) of
+	#'Extension'{extnValue = KeyUse} ->
+	     lists:member(keyCertSign, KeyUse);
+	 _ ->
+	     true
+    end.
+
+check_extension_crl_signer(OtpCert) ->
+    TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
+     Extensions = TBSCert#'OTPTBSCertificate'.extensions,
+     case pubkey_cert:select_extension(?'id-ce-keyUsage', Extensions) of
+	#'Extension'{extnValue = KeyUse} ->
+	     lists:member(cRLSign, KeyUse);
+	 _ ->
+	     true
+    end.
+
+crl_issuer(undefined, CRL, issuer_not_found, _, CertsList, Ignore) ->
+    crl_issuer(CRL, CertsList, Ignore);
+
+crl_issuer(IssuerName, CRL, issuer_not_found, CertsList, CertsList, Ignore) ->
+    crl_issuer(IssuerName, CRL, IssuerName, CertsList, CertsList, Ignore);
+
+crl_issuer(undefined, CRL, Id, [Cert | Rest], All, false) ->
+    ErlCert = public_key:pkix_decode_cert(Cert, otp),
+    TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate,
+    SerialNumber = TBSCertificate#'OTPTBSCertificate'.serialNumber,
+    Issuer = public_key:pkix_normalize_name(
+		    TBSCertificate#'OTPTBSCertificate'.subject),
+    Bool = is_signer(ErlCert, CRL, false),
+    case {SerialNumber, Issuer} of
+	Id when Bool == true ->
+	    {ok, ErlCert, Cert};
+	_ ->
+	    crl_issuer(undefined, CRL, Id, Rest, All, false)
+    end;
+
+crl_issuer(IssuerName, CRL, Id, [Cert | Rest], All, false) ->
+    ErlCert = public_key:pkix_decode_cert(Cert, otp),
+    TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate,
+    SerialNumber = TBSCertificate#'OTPTBSCertificate'.serialNumber,
+    %%Issuer = public_key:pkix_normalize_name(
+    %%		    TBSCertificate#'OTPTBSCertificate'.subject),
+    Bool = is_signer(ErlCert, CRL, false),
+    case {SerialNumber, IssuerName} of
+	Id when Bool == true ->
+	    {ok, ErlCert, Cert};
+	{_, IssuerName}  when Bool == true ->
+	    {ok, ErlCert, Cert};
+	_ ->
+	    crl_issuer(IssuerName, CRL, Id, Rest, All, false)
+    end;
+
+crl_issuer(undefined, CRL, _, [], CertsList, Ignore) ->
+    crl_issuer(CRL, CertsList, Ignore);
+crl_issuer(CRLName, CRL, _, [], CertsList, Ignore) ->
+    crl_issuer(CRLName, CRL, CertsList, Ignore).
+
+
+crl_issuer(_, [],_) ->
+    {error, issuer_not_found};
+crl_issuer(CRL, [Cert | Rest], Ignore) ->
+    ErlCert = public_key:pkix_decode_cert(Cert, otp),
+    case public_key:pkix_is_issuer(CRL, ErlCert) andalso
+	check_extension_crl_signer(ErlCert) andalso
+	is_signer(ErlCert, CRL, Ignore)
+    of
+        true ->
+	    {ok, ErlCert,Cert};
+        false ->
+            crl_issuer(CRL, Rest, Ignore)
+    end.
+
+crl_issuer(_,_, [],_) ->
+    {error, issuer_not_found};
+crl_issuer(IssuerName, CRL, [Cert | Rest], Ignore) ->
+    ErlCert = public_key:pkix_decode_cert(Cert, otp),
+    TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate,
+    Issuer = public_key:pkix_normalize_name(
+		    TBSCertificate#'OTPTBSCertificate'.subject),
+
+    case
+	public_key:pkix_is_issuer(CRL, ErlCert) andalso
+	check_extension_crl_signer(ErlCert) andalso
+	is_signer(ErlCert, CRL, Ignore)
+    of
+        true ->
+	    case  pubkey_cert:is_issuer(Issuer, IssuerName) of
+		true ->
+		    {ok, ErlCert,Cert};
+		false ->
+		    crl_issuer(IssuerName, CRL, Rest, Ignore)
+	    end;
+	false ->
+            crl_issuer(IssuerName, CRL, Rest, Ignore)
+    end.
 
 read_certs(Test) ->
     File = test_file(Test),
-    %% io:format("Read ~p ",[File]),
     Ders = erl_make_certs:pem_to_der(File),
-    %% io:format("Ders ~p ~n",[length(Ders)]),
     [Cert || {'Certificate', Cert, not_encrypted} <- Ders].
 
+read_crls(Test) ->
+    File = test_file(Test),
+    Ders = erl_make_certs:pem_to_der(File),
+    [CRL || {'CertificateList', CRL, not_encrypted} <- Ders].
+
 test_file(Test) ->
     file(?CONV, lists:append(string:tokens(Test, " -")) ++ ".pem").
 
@@ -206,118 +1150,89 @@ file(Sub,File) ->
     end,
     AbsFile.
 
-sort_chain([First|Certs], TA, Try, Found) -> 
+sort_chain(Certs, TA, Acc, Bool, Chap) when Chap == "4.5.3"->
+     [CA, Entity, Self] = do_sort_chain(Certs, TA, Acc, Bool, Chap),
+     [CA, Self, Entity];
+sort_chain(Certs, TA, Acc, Bool, Chap) when Chap == "4.5.4";
+					    Chap == "4.5.5" ->
+     [CA, Entity, _Self] = do_sort_chain(Certs, TA, Acc, Bool, Chap),
+     [CA, Entity];
+
+sort_chain(Certs, TA, Acc, Bool, Chap) when Chap == "4.14.24";
+					    Chap == "4.14.25";
+					    Chap == "4.14.26";
+					    Chap == "4.14.27";
+					    Chap == "4.14.31";
+					    Chap == "4.14.32";
+					    Chap == "4.14.33" ->
+    [_OtherCA, Entity, CA] = do_sort_chain(Certs, TA, Acc, Bool, Chap),
+    [CA, Entity];
+
+sort_chain(Certs, TA, Acc, Bool, Chap) when Chap == "4.14.28";
+					    Chap == "4.14.29" ->
+    [CA, _OtherCA, Entity] = do_sort_chain(Certs, TA, Acc, Bool, Chap),
+    [CA, Entity];
+
+
+sort_chain(Certs, TA, Acc, Bool, Chap) when Chap == "4.14.33" ->
+    [Entity, CA, _OtherCA] = do_sort_chain(Certs, TA, Acc, Bool, Chap),
+    [CA, Entity];
+
+
+sort_chain(Certs, TA, Acc, Bool, Chap) ->
+    do_sort_chain(Certs, TA, Acc, Bool, Chap).
+
+do_sort_chain([First], TA, Try, Found, Chap) when Chap == "4.5.6";
+						  Chap == "4.5.7";
+						  Chap == "4.4.19";
+						  Chap == "4.4.20";
+						  Chap == "4.4.21"->
     case public_key:pkix_is_issuer(First,TA) of
 	true -> 
-	    [First|sort_chain(Certs,First,Try,true)];
+	    [First|do_sort_chain([],First,Try,true, Chap)];
 	false ->
-	    sort_chain(Certs,TA,[First|Try],Found)
+	    do_sort_chain([],TA,[First|Try],Found, Chap)
     end;
-sort_chain([], _, [],_) -> [];
-sort_chain([], Valid, Check, true) ->
-    sort_chain(lists:reverse(Check), Valid, [], false);
-sort_chain([], _Valid, Check, false) ->
+do_sort_chain([First|Certs], TA, Try, Found, Chap) when Chap == "4.5.6";
+							Chap == "4.5.7";
+							Chap == "4.4.19";
+							Chap  == "4.4.20";
+							Chap == "4.4.21"->
+%%    case check_extension_cert_signer(public_key:pkix_decode_cert(First, otp)) of
+%%	true ->
+    case public_key:pkix_is_issuer(First,TA) of
+	true ->
+	    [First|do_sort_chain(Certs,First,Try,true, Chap)];
+	false ->
+	    do_sort_chain(Certs,TA,[First|Try],Found, Chap)
+    end;
+%%	false ->
+%%	    do_sort_chain(Certs, TA, Try, Found, Chap)
+%%   end;
+
+do_sort_chain([First|Certs], TA, Try, Found, Chap) ->
+    case public_key:pkix_is_issuer(First,TA) of
+	true ->
+	    [First|do_sort_chain(Certs,First,Try,true, Chap)];
+	false ->
+	    do_sort_chain(Certs,TA,[First|Try],Found, Chap)
+    end;
+
+do_sort_chain([], _, [],_, _) -> [];
+do_sort_chain([], Valid, Check, true, Chap) ->
+    do_sort_chain(lists:reverse(Check), Valid, [], false, Chap);
+do_sort_chain([], _Valid, Check, false, _) ->
     Check.
 
-signature_verification() ->    
-    %%  "4.1", "Signature Verification" ,
-    [{ "4.1.1", "Valid Signatures Test1",                        ok},
-     { "4.1.2", "Invalid CA Signature Test2",                    {bad_cert,invalid_signature}},
-     { "4.1.3", "Invalid EE Signature Test3",                    {bad_cert,invalid_signature}},
-     { "4.1.4", "Valid DSA Signatures Test4",                    ok},
-     { "4.1.5", "Valid DSA Parameter Inheritance Test5",         ok},
-     { "4.1.6", "Invalid DSA Signature Test6",                   {bad_cert,invalid_signature}}].
-validity_periods() ->
-    %% { "4.2",   "Validity Periods" },
-    [{ "4.2.1", "Invalid CA notBefore Date Test1",               {bad_cert, cert_expired}},
-     { "4.2.2", "Invalid EE notBefore Date Test2",               {bad_cert, cert_expired}},
-     { "4.2.3", "Valid pre2000 UTC notBefore Date Test3",        ok},
-     { "4.2.4", "Valid GeneralizedTime notBefore Date Test4",    ok},
-     { "4.2.5", "Invalid CA notAfter Date Test5",                {bad_cert, cert_expired}},
-     { "4.2.6", "Invalid EE notAfter Date Test6",                {bad_cert, cert_expired}},
-     { "4.2.7", "Invalid pre2000 UTC EE notAfter Date Test7",    {bad_cert, cert_expired}},
-     { "4.2.8", "Valid GeneralizedTime notAfter Date Test8",     ok}].
-verifying_name_chaining() ->
-    %%{ "4.3",   "Verifying Name Chaining" },
-    [{ "4.3.1", "Invalid Name Chaining EE Test1",                {bad_cert, invalid_issuer}},
-     { "4.3.2", "Invalid Name Chaining Order Test2",             {bad_cert, invalid_issuer}},
-     { "4.3.3", "Valid Name Chaining Whitespace Test3",          ok},
-     { "4.3.4", "Valid Name Chaining Whitespace Test4",          ok},
-     { "4.3.5", "Valid Name Chaining Capitalization Test5",      ok},
-     { "4.3.6", "Valid Name Chaining UIDs Test6",                ok},
-     { "4.3.7", "Valid RFC3280 Mandatory Attribute Types Test7", ok},
-     { "4.3.8", "Valid RFC3280 Optional Attribute Types Test8",  ok},
-     { "4.3.9", "Valid UTF8String Encoded Names Test9",          ok},
-     { "4.3.10", "Valid Rollover from PrintableString to UTF8String Test10", ok},
-     { "4.3.11", "Valid UTF8String Case Insensitive Match Test11",           ok}].
-basic_certificate_revocation_tests() ->
-    %%{ "4.4",    "Basic Certificate Revocation Tests" },
-    [{ "4.4.1",  "Missing CRL Test1",                 3 },
-     { "4.4.2", "Invalid Revoked CA Test2",          23 },
-     { "4.4.3", "Invalid Revoked EE Test3",          23 },
-     { "4.4.4", "Invalid Bad CRL Signature Test4",   8 },
-     { "4.4.5", "Invalid Bad CRL Issuer Name Test5", 3 },
-     { "4.4.6", "Invalid Wrong CRL Test6",           3 },
-     { "4.4.7", "Valid Two CRLs Test7",              ok},
-
-     %% The test document suggests these should return certificate revoked...
-     %% Subsquent discussion has concluded they should not due to unhandle
-     %% critical CRL extensions.
-     { "4.4.8", "Invalid Unknown CRL Entry Extension Test8", 36 },
-     { "4.4.9", "Invalid Unknown CRL Extension Test9",       36 },
-
-     { "4.4.10", "Invalid Unknown CRL Extension Test10",             36 },
-     { "4.4.11", "Invalid Old CRL nextUpdate Test11",                12 },
-     { "4.4.12", "Invalid pre2000 CRL nextUpdate Test12",            12 },
-     { "4.4.13", "Valid GeneralizedTime CRL nextUpdate Test13",      ok},
-     { "4.4.14", "Valid Negative Serial Number Test14",              ok},
-     { "4.4.15", "Invalid Negative Serial Number Test15",            23 },
-     { "4.4.16", "Valid Long Serial Number Test16",                  ok},
-     { "4.4.17", "Valid Long Serial Number Test17",                  ok},
-     { "4.4.18", "Invalid Long Serial Number Test18",                23 },
-     { "4.4.19", "Valid Separate Certificate and CRL Keys Test19",   ok},
-     { "4.4.20", "Invalid Separate Certificate and CRL Keys Test20", 23 },
-
-     %% CRL path is revoked so get a CRL path validation error
-     { "4.4.21", "Invalid Separate Certificate and CRL Keys Test21",      54 }].
-verifying_paths_with_self_issued_certificates() ->
-    %%{ "4.5",    "Verifying Paths with Self-Issued Certificates" },
-    [{ "4.5.1",  "Valid Basic Self-Issued Old With New Test1",            ok},
-     %%{ "4.5.2",  "Invalid Basic Self-Issued Old With New Test2",          23 },
-     %%{ "4.5.3",  "Valid Basic Self-Issued New With Old Test3",            ok},
-     %%{ "4.5.4",  "Valid Basic Self-Issued New With Old Test4",            ok},
-     { "4.5.5",  "Invalid Basic Self-Issued New With Old Test5",          23 },
-     %%{ "4.5.6",  "Valid Basic Self-Issued CRL Signing Key Test6",         ok},
-     { "4.5.7",  "Invalid Basic Self-Issued CRL Signing Key Test7",       23 },
-     { "4.5.8",  "Invalid Basic Self-Issued CRL Signing Key Test8",       {bad_cert,invalid_key_usage} }].
-verifying_basic_constraints() ->
-    [%%{ "4.6",    "Verifying Basic Constraints" },
-     { "4.6.1",  "Invalid Missing basicConstraints Test1",                
-       {bad_cert, missing_basic_constraint} },
-     { "4.6.2",  "Invalid cA False Test2",                                {bad_cert, missing_basic_constraint}},
-     { "4.6.3",  "Invalid cA False Test3",                                {bad_cert, missing_basic_constraint}},
-     { "4.6.4",  "Valid basicConstraints Not Critical Test4",             ok},
-     { "4.6.5",  "Invalid pathLenConstraint Test5",                       {bad_cert, max_path_length_reached}},
-     { "4.6.6",  "Invalid pathLenConstraint Test6",                       {bad_cert, max_path_length_reached}},
-     { "4.6.7",  "Valid pathLenConstraint Test7",                         ok},
-     { "4.6.8",  "Valid pathLenConstraint Test8",                         ok},
-     { "4.6.9",  "Invalid pathLenConstraint Test9",                       {bad_cert, max_path_length_reached}},
-     { "4.6.10", "Invalid pathLenConstraint Test10",                      {bad_cert, max_path_length_reached}},
-     { "4.6.11", "Invalid pathLenConstraint Test11",                      {bad_cert, max_path_length_reached}},
-     { "4.6.12", "Invalid pathLenConstraint Test12",                      {bad_cert, max_path_length_reached}},
-     { "4.6.13", "Valid pathLenConstraint Test13",                        ok},
-     { "4.6.14", "Valid pathLenConstraint Test14",                        ok},
-     { "4.6.15", "Valid Self-Issued pathLenConstraint Test15",            ok},
-     { "4.6.16", "Invalid Self-Issued pathLenConstraint Test16",          {bad_cert, max_path_length_reached}},
-     { "4.6.17", "Valid Self-Issued pathLenConstraint Test17",            ok}].
-key_usage() ->
-    %%{ "4.7",    "Key Usage" },
-    [{ "4.7.1",  "Invalid keyUsage Critical keyCertSign False Test1",     {bad_cert,invalid_key_usage} },
-     { "4.7.2",  "Invalid keyUsage Not Critical keyCertSign False Test2", {bad_cert,invalid_key_usage} },
-     { "4.7.3",  "Valid keyUsage Not Critical Test3",                     ok}
-     %%,{ "4.7.4",  "Invalid keyUsage Critical cRLSign False Test4",         35 }
-     %%,{ "4.7.5",  "Invalid keyUsage Not Critical cRLSign False Test5",     35 }
-    ].
+error(Format, Args, File0, Line) ->
+    File = filename:basename(File0),
+    Pid = group_leader(),
+    Pid ! {failed, File, Line},
+    io:format(Pid, "~s(~p): ERROR"++Format, [File,Line|Args]).
+
+warning(Format, Args, File0, Line) ->
+    File = filename:basename(File0),
+    io:format("~s(~p): Warning "++Format, [File,Line|Args]).
 
 %% Certificate policy tests need special handling. They can have several
 %% sub tests and we need to check the outputs are correct.
@@ -425,182 +1340,3 @@ inhibit_any_policy() ->
      {"4.12.8",  "Invalid Self-Issued inhibitAnyPolicy Test8",    43 },
      {"4.12.9",  "Valid Self-Issued inhibitAnyPolicy Test9",      ok},
      {"4.12.10", "Invalid Self-Issued inhibitAnyPolicy Test10",   43 }].
-
-name_constraints() ->
-    %%{ "4.13",    "Name Constraints" },
-    [{ "4.13.1",  "Valid DN nameConstraints Test1",                ok},
-     { "4.13.2",  "Invalid DN nameConstraints Test2",              {bad_cert, name_not_permitted}},
-     { "4.13.3",  "Invalid DN nameConstraints Test3",              {bad_cert, name_not_permitted}},
-     { "4.13.4",  "Valid DN nameConstraints Test4",                ok},
-     { "4.13.5",  "Valid DN nameConstraints Test5",                ok},
-     { "4.13.6",  "Valid DN nameConstraints Test6",                ok},
-     { "4.13.7",  "Invalid DN nameConstraints Test7",              {bad_cert, name_not_permitted}},
-     { "4.13.8",  "Invalid DN nameConstraints Test8",              {bad_cert, name_not_permitted}},
-     { "4.13.9",  "Invalid DN nameConstraints Test9",              {bad_cert, name_not_permitted}},
-     { "4.13.10", "Invalid DN nameConstraints Test10",             {bad_cert, name_not_permitted}},
-     { "4.13.11", "Valid DN nameConstraints Test11",               ok},
-     { "4.13.12", "Invalid DN nameConstraints Test12",             {bad_cert, name_not_permitted}},
-     { "4.13.13", "Invalid DN nameConstraints Test13",             {bad_cert, name_not_permitted}},
-     { "4.13.14", "Valid DN nameConstraints Test14",               ok},
-     { "4.13.15", "Invalid DN nameConstraints Test15",             {bad_cert, name_not_permitted}},
-     { "4.13.16", "Invalid DN nameConstraints Test16",             {bad_cert, name_not_permitted}},
-     { "4.13.17", "Invalid DN nameConstraints Test17",             {bad_cert, name_not_permitted}},
-     { "4.13.18", "Valid DN nameConstraints Test18",               ok},
-     { "4.13.19", "Valid Self-Issued DN nameConstraints Test19",   ok},
-     { "4.13.20", "Invalid Self-Issued DN nameConstraints Test20", {bad_cert, name_not_permitted} },
-     { "4.13.21", "Valid RFC822 nameConstraints Test21",           ok},
-     { "4.13.22", "Invalid RFC822 nameConstraints Test22",         {bad_cert, name_not_permitted} },
-     { "4.13.23", "Valid RFC822 nameConstraints Test23",           ok},
-     { "4.13.24", "Invalid RFC822 nameConstraints Test24",         {bad_cert, name_not_permitted} },
-     { "4.13.25", "Valid RFC822 nameConstraints Test25",           ok},
-     { "4.13.26", "Invalid RFC822 nameConstraints Test26",         {bad_cert, name_not_permitted}},
-     { "4.13.27", "Valid DN and RFC822 nameConstraints Test27",    ok},
-     { "4.13.28", "Invalid DN and RFC822 nameConstraints Test28",  {bad_cert, name_not_permitted} },
-     { "4.13.29", "Invalid DN and RFC822 nameConstraints Test29",  {bad_cert, name_not_permitted} },
-     { "4.13.30", "Valid DNS nameConstraints Test30",              ok},
-     { "4.13.31", "Invalid DNS nameConstraints Test31",            {bad_cert, name_not_permitted} },
-     { "4.13.32", "Valid DNS nameConstraints Test32",              ok},
-     { "4.13.33", "Invalid DNS nameConstraints Test33",            {bad_cert, name_not_permitted}},
-     { "4.13.34", "Valid URI nameConstraints Test34",              ok},
-     { "4.13.35", "Invalid URI nameConstraints Test35",            {bad_cert, name_not_permitted} },
-     { "4.13.36", "Valid URI nameConstraints Test36",              ok},
-     { "4.13.37", "Invalid URI nameConstraints Test37",            {bad_cert, name_not_permitted}},
-     { "4.13.38", "Invalid DNS nameConstraints Test38",            {bad_cert, name_not_permitted} }].
-distribution_points() ->
-     %%{ "4.14",    "Distribution Points" },
-    [{ "4.14.1",  "Valid distributionPoint Test1",                 ok},
-     { "4.14.2",  "Invalid distributionPoint Test2",               23 },
-     { "4.14.3",  "Invalid distributionPoint Test3",               44 },
-     { "4.14.4",  "Valid distributionPoint Test4",                 ok},
-     { "4.14.5",  "Valid distributionPoint Test5",                 ok},
-     { "4.14.6",  "Invalid distributionPoint Test6",               23 },
-     { "4.14.7",  "Valid distributionPoint Test7",                 ok},
-     { "4.14.8",  "Invalid distributionPoint Test8",               44 },
-     { "4.14.9",  "Invalid distributionPoint Test9",               44 },
-     { "4.14.10", "Valid No issuingDistributionPoint Test10",      ok},
-     { "4.14.11", "Invalid onlyContainsUserCerts CRL Test11",      44 },
-     { "4.14.12", "Invalid onlyContainsCACerts CRL Test12",        44 },
-     { "4.14.13", "Valid onlyContainsCACerts CRL Test13",          ok},
-     { "4.14.14", "Invalid onlyContainsAttributeCerts Test14",     44 },
-     { "4.14.15", "Invalid onlySomeReasons Test15",                23 },
-     { "4.14.16", "Invalid onlySomeReasons Test16",                23 },
-     { "4.14.17", "Invalid onlySomeReasons Test17",                3 },
-     { "4.14.18", "Valid onlySomeReasons Test18",                  ok},
-     { "4.14.19", "Valid onlySomeReasons Test19",                  ok},
-     { "4.14.20", "Invalid onlySomeReasons Test20",                23 },
-     { "4.14.21", "Invalid onlySomeReasons Test21",                23 },
-     { "4.14.22", "Valid IDP with indirectCRL Test22",             ok},
-     { "4.14.23", "Invalid IDP with indirectCRL Test23",           23 },
-     { "4.14.24", "Valid IDP with indirectCRL Test24",             ok},
-     { "4.14.25", "Valid IDP with indirectCRL Test25",             ok},
-     { "4.14.26", "Invalid IDP with indirectCRL Test26",           44 },
-     { "4.14.27", "Invalid cRLIssuer Test27",                      3 },
-     { "4.14.28", "Valid cRLIssuer Test28",                        ok},
-     { "4.14.29", "Valid cRLIssuer Test29",                        ok},
-
-     %% Although this test is valid it has a circular dependency. As a result
-     %% an attempt is made to reursively checks a CRL path and rejected due to
-     %% a CRL path validation error. PKITS notes suggest this test does not
-     %% need to be run due to this issue.
-     { "4.14.30", "Valid cRLIssuer Test30",                                 54 },
-     { "4.14.31", "Invalid cRLIssuer Test31",                               23 },
-     { "4.14.32", "Invalid cRLIssuer Test32",                               23 },
-     { "4.14.33", "Valid cRLIssuer Test33",                                 ok},
-     { "4.14.34", "Invalid cRLIssuer Test34",                               23 },
-     { "4.14.35", "Invalid cRLIssuer Test35",                               44 }].
-delta_crls() ->
-    %%{ "4.15",    "Delta-CRLs" },
-    [{ "4.15.1",  "Invalid deltaCRLIndicator No Base Test1",                3 },
-     { "4.15.2",  "Valid delta-CRL Test2",                                  ok},
-     { "4.15.3",  "Invalid delta-CRL Test3",                                23 },
-     { "4.15.4",  "Invalid delta-CRL Test4",                                23 },
-     { "4.15.5",  "Valid delta-CRL Test5",                                  ok},
-     { "4.15.6",  "Invalid delta-CRL Test6",                                23 },
-     { "4.15.7",  "Valid delta-CRL Test7",                                  ok},
-     { "4.15.8",  "Valid delta-CRL Test8",                                  ok},
-     { "4.15.9",  "Invalid delta-CRL Test9",                                23 },
-     { "4.15.10", "Invalid delta-CRL Test10",                               12 }].
-private_certificate_extensions() ->
-    %%{ "4.16",    "Private Certificate Extensions" },
-    [{ "4.16.1",  "Valid Unknown Not Critical Certificate Extension Test1", ok},
-     { "4.16.2",  "Invalid Unknown Critical Certificate Extension Test2",   
-       {bad_cert,unknown_critical_extension}}].
-
-
-convert() ->
-    Tests = [signature_verification(),
-	     validity_periods(),
-	     verifying_name_chaining(),
-	     basic_certificate_revocation_tests(),
-	     verifying_paths_with_self_issued_certificates(),
-	     verifying_basic_constraints(),
-	     key_usage(),
-	     certificate_policies(),
-	     require_explicit_policy(),
-	     policy_mappings(),
-	     inhibit_policy_mapping(),
-	     inhibit_any_policy(),
-	     name_constraints(),	     
-	     distribution_points(),
-	     delta_crls(),
-	     private_certificate_extensions()],    
-    [convert(Test) || Test <- lists:flatten(Tests)].
-
-convert({_,Test,_}) ->
-    convert1(Test);
-convert({_,Test,_,_,_,_,_}) ->
-    convert1(Test).
-
-convert1(Test) ->
-    FName = lists:append(string:tokens(Test, " -")),
-    File = filename:join(?MIME, "Signed" ++ FName ++ ".eml"),
-    io:format("Convert ~p~n",[File]),
-    {ok, Mail} = file:read_file(File),
-    Base64  = skip_lines(Mail),
-    %%io:format("~s",[Base64]),
-    Tmp = base64:mime_decode(Base64),
-    file:write_file("pkits/smime-pem/tmp-pkcs7.der", Tmp),
-    Cmd = "openssl pkcs7 -inform der -in pkits/smime-pem/tmp-pkcs7.der"
-	" -print_certs -out pkits/smime-pem/" ++ FName ++ ".pem",
-    case os:cmd(Cmd) of
-	"" -> ok;
-	Err -> 
-	    io:format("~s",[Err]),
-	    erlang:error(bad_cmd)
-    end.
-
-skip_lines(<<"\r\n\r\n", Rest/binary>>) -> Rest;
-skip_lines(<<"\n\n", Rest/binary>>) -> Rest;
-skip_lines(<<_:8, Rest/binary>>) ->
-    skip_lines(Rest).
-
-init_per_testcase(_Func, Config) ->    
-    Datadir = proplists:get_value(data_dir, Config),
-    put(datadir, Datadir),
-    Config.
-
-end_per_testcase(_Func, Config) ->
-    %% Nodes = select_nodes(all, Config, ?FILE, ?LINE),
-    %% rpc:multicall(Nodes, mnesia, lkill, []),
-    Config.
-
-init_per_suite(Config) ->
-    try crypto:start() of
-	ok ->
-	    Config
-    catch _:_ ->
-	    {skip, "Crypto did not start"}
-    end.
-
-end_per_suite(_Config) ->
-    application:stop(crypto).
-
-error(Format, Args, File0, Line) ->
-    File = filename:basename(File0),
-    Pid = group_leader(),
-    Pid ! {failed, File, Line},
-    io:format(Pid, "~s(~p): ERROR"++Format, [File,Line|Args]).
-
-warning(Format, Args, File0, Line) ->
-    File = filename:basename(File0),
-    io:format("~s(~p): Warning "++Format, [File,Line|Args]).
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index 9743289ca6..692baea0a4 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -465,16 +465,16 @@ analyse(#state{common = C,
                 [MissingApp2 | Apps2]
         end,
     app_propagate_is_used_by(C, Apps3),
-    Apps4 = read_apps(C, Sys, Apps3, []),
+    {Apps4,Status4} = app_recap_dependencies(C, Sys, Apps3, [], Status3),
     %% io:format("Missing app: ~p\n",
     %%           [lists:keysearch(?MISSING_APP_NAME, #app.name, Apps4)]),
     Sys2 = Sys#sys{apps = Apps4},
 
-    case verify_config(RelApps2, Sys2, Status3) of
-	{ok, _Warnings} = Status4 ->
-	    {S#state{sys = Sys2}, Status4};
-	{error, _} = Status4 ->
-            {S, Status4}
+    case verify_config(RelApps2, Sys2, Status4) of
+	{ok, _Warnings} = Status5 ->
+	    {S#state{sys = Sys2}, Status5};
+	{error, _} = Status5 ->
+            {S, Status5}
     end.
 
 apps_in_rels(Rels, Apps, Status) ->
@@ -548,21 +548,24 @@ app_init_is_included(C,
             {derived, [_ | _]} -> % App is included in at least one rel
 		{true, undefined, true, Status}
         end,
-    A2 = A#app{is_pre_included = IsPreIncl,
+    {Mods2,Status3} = lists:mapfoldl(fun(Mod,Acc) ->
+					     mod_init_is_included(C,
+								  Mod,
+								  ModCond,
+								  AppCond,
+								  Default,
+								  Acc)
+				     end,
+				     Status2,
+				     Mods),
+    A2 = A#app{mods = Mods2,
+	       is_pre_included = IsPreIncl,
 	       is_included = IsIncl,
 	       rels = Rels},
     ets:insert(C#common.app_tab, A2),
-    lists:foreach(fun(Mod) ->
-			  mod_init_is_included(C,
-					       Mod,
-					       ModCond,
-					       AppCond,
-					       Default)
-		  end,
-		  Mods),
-    {A2, Status2}.
-
-mod_init_is_included(C, M, ModCond, AppCond, Default) ->
+    {A2, Status3}.
+
+mod_init_is_included(C, M, ModCond, AppCond, Default, Status) ->
     %% print(M#mod.name, hipe, "incl_cond -> ~p\n", [AppCond]),
     IsIncl =
         case AppCond of
@@ -595,9 +598,52 @@ mod_init_is_included(C, M, ModCond, AppCond, Default) ->
                         Default
                 end
         end,
+
     M2 = M#mod{is_pre_included = IsIncl, is_included = IsIncl},
+
+    Status2 =
+	case ets:lookup(C#common.mod_tab,M#mod.name) of
+	    [Existing] ->
+		case {Existing#mod.is_included,IsIncl} of
+		    {false,_} ->
+			Warning =
+			    lists:concat(
+			      ["Module ",M#mod.name,
+			       " exists in applications ", Existing#mod.app_name,
+			      " and ", M#mod.app_name,
+			       ". Using module from application ",
+			       M#mod.app_name, "."]),
+			ets:insert(C#common.mod_tab, M2),
+			reltool_utils:add_warning(Status,Warning);
+		    {_,false} ->
+			Warning =
+			    lists:concat(
+			      ["Module ",M#mod.name,
+			       " exists in applications ", Existing#mod.app_name,
+			      " and ", M#mod.app_name,
+			       ". Using module from application ",
+			       Existing#mod.app_name, "."]),
+
+			%% Don't insert in mod_tab - using Existing
+			reltool_utils:add_warning(Status,Warning);
+		    {_,_} ->
+			Error =
+			    lists:concat(
+			      ["Module ",M#mod.name,
+			       " potentially included by ",
+			       "two different applications: ",
+			       Existing#mod.app_name, " and ",
+			       M#mod.app_name, "."]),
+			%% Don't insert in mod_tab - using Existing
+			reltool_utils:return_first_error(Status,Error)
+		end;
+	    [] ->
+		ets:insert(C#common.mod_tab, M2),
+		Status
+	end,
+
     %% print(M#mod.name, hipe, "~p -> ~p\n", [M2, IsIncl]),
-    ets:insert(C#common.mod_tab, M2).
+    {M2,Status2}.
 
 false_to_undefined(Bool) ->
     case Bool of
@@ -612,21 +658,27 @@ app_propagate_is_included(_C, _Sys, [], Acc) ->
     Acc.
 
 mod_propagate_is_included(C, Sys, A, [#mod{name = ModName} | Mods], Acc) ->
-    [M2] = ets:lookup(C#common.mod_tab, ModName),
-    %% print(ModName, file, "Maybe Prop ~p -> ~p\n",
-    %%       [M2, M2#mod.is_included]),
-    %% print(ModName, filename, "Maybe Prop ~p -> ~p\n",
-    %%       [M2, M2#mod.is_included]),
     Acc2 =
-        case M2#mod.is_included of
-            true ->
-                %% Propagate include mark
-                mod_mark_is_included(C, Sys, ModName, M2#mod.uses_mods, Acc);
-            false ->
-                Acc;
-            undefined ->
-                Acc
-        end,
+	case ets:lookup(C#common.mod_tab, ModName) of
+	    [M2] when M2#mod.app_name=:=A#app.name ->
+		%% print(ModName, file, "Maybe Prop ~p -> ~p\n",
+		%%       [M2, M2#mod.is_included]),
+		%% print(ModName, filename, "Maybe Prop ~p -> ~p\n",
+		%%       [M2, M2#mod.is_included]),
+		case M2#mod.is_included of
+		    true ->
+			%% Propagate include mark
+			mod_mark_is_included(C,Sys,ModName,M2#mod.uses_mods,Acc);
+		    false ->
+			Acc;
+		    undefined ->
+			Acc
+		end;
+	    [_] ->
+		%% This module is currently used from a different application
+		%% Ignore
+		Acc
+	end,
     mod_propagate_is_included(C, Sys, A, Mods, Acc2);
 mod_propagate_is_included(_C, _Sys, _A, [], Acc) ->
     Acc.
@@ -740,9 +792,10 @@ mod_propagate_is_used_by(C, [#mod{name = ModName} | Mods]) ->
 mod_propagate_is_used_by(_C, []) ->
     ok.
 
-read_apps(C, Sys, [#app{mods = Mods, is_included = IsIncl} = A | Apps], Acc) ->
-    {Mods2, IsIncl2} = read_apps(C, Sys, A, Mods, [], IsIncl),
-    Status =
+app_recap_dependencies(C, Sys, [#app{mods = Mods, is_included = IsIncl} = A | Apps], Acc, Status) ->
+    {Mods2, IsIncl2, Status2} =
+	mod_recap_dependencies(C, Sys, A, Mods, [], IsIncl, Status),
+    AppStatus =
         case lists:keymember(missing, #mod.status, Mods2) of
             true  -> missing;
             false -> ok
@@ -759,34 +812,52 @@ read_apps(C, Sys, [#app{mods = Mods, is_included = IsIncl} = A | Apps], Acc) ->
     UsedByApps2 = lists:usort(UsedByApps),
 
     A2 = A#app{mods = Mods2,
-               status = Status,
+               status = AppStatus,
                uses_mods = UsesMods2,
                used_by_mods = UsedByMods2,
                uses_apps = UsesApps2,
                used_by_apps = UsedByApps2,
                is_included = IsIncl2},
-    read_apps(C, Sys, Apps, [A2 | Acc]);
-read_apps(_C, _Sys, [], Acc) ->
-    lists:reverse(Acc).
-
-read_apps(C, Sys, A, [#mod{name = ModName} | Mods], Acc, IsIncl) ->
-    [M2] = ets:lookup(C#common.mod_tab, ModName),
-    Status = do_get_status(M2),
-    %% print(M2#mod.name, hipe, "status -> ~p\n", [Status]),
-    {IsIncl2, M3} =
-        case M2#mod.is_included of
-            true ->
-                UsedByMods =
-		    [N || {_, N} <- ets:lookup(C#common.mod_used_by_tab,
-					       ModName)],
-                {true, M2#mod{status = Status, used_by_mods = UsedByMods}};
-            _    ->
-                {IsIncl, M2#mod{status = Status, used_by_mods = []}}
-        end,
-    ets:insert(C#common.mod_tab, M3),
-    read_apps(C, Sys, A, Mods, [M3 | Acc], IsIncl2);
-read_apps(_C, _Sys, _A, [], Acc, IsIncl) ->
-    {lists:reverse(Acc), IsIncl}.
+    ets:insert(C#common.app_tab,A2),
+    app_recap_dependencies(C, Sys, Apps, [A2 | Acc], Status2);
+app_recap_dependencies(_C, _Sys, [], Acc, Status) ->
+    {lists:reverse(Acc), Status}.
+
+mod_recap_dependencies(C, Sys, A, [#mod{name = ModName}=M1 | Mods], Acc, IsIncl, Status) ->
+    case ets:lookup(C#common.mod_tab, ModName) of
+	[M2] when M2#mod.app_name=:=A#app.name ->
+	    ModStatus = do_get_status(M2),
+	    %% print(M2#mod.name, hipe, "status -> ~p\n", [ModStatus]),
+	    {IsIncl2, M3} =
+		case M2#mod.is_included of
+		    true ->
+			UsedByMods =
+			    [N || {_, N} <- ets:lookup(C#common.mod_used_by_tab,
+						       ModName)],
+			{true, M2#mod{status = ModStatus, used_by_mods = UsedByMods}};
+		    _    ->
+			{IsIncl, M2#mod{status = ModStatus, used_by_mods = []}}
+		end,
+	    ets:insert(C#common.mod_tab, M3),
+	    mod_recap_dependencies(C, Sys, A, Mods, [M3 | Acc], IsIncl2, Status);
+	[_] when A#app.is_included==false; M1#mod.incl_cond==exclude ->
+	    %% App is explicitely excluded so it is ok that the module
+	    %% record does not exist for this module in this
+	    %% application.
+	    mod_recap_dependencies(C, Sys, A, Mods, [M1 | Acc], IsIncl, Status);
+	[M2] ->
+	    %% A module is potensially included by multiple
+	    %% applications. This is not allowed!
+	    Error =
+		lists:concat(
+		  ["Module ",ModName,
+		   " potentially included by two different applications: ",
+		   A#app.name, " and ", M2#mod.app_name, "."]),
+	    Status2 = reltool_utils:return_first_error(Status,Error),
+	    mod_recap_dependencies(C, Sys, A, Mods, [M1 | Acc], IsIncl, Status2)
+    end;
+mod_recap_dependencies(_C, _Sys, _A, [], Acc, IsIncl, Status) ->
+    {lists:reverse(Acc), IsIncl, Status}.
 
 do_get_status(M) ->
     if
diff --git a/lib/reltool/src/reltool_sys_win.erl b/lib/reltool/src/reltool_sys_win.erl
index dbb8e32aa2..76c064f1e7 100644
--- a/lib/reltool/src/reltool_sys_win.erl
+++ b/lib/reltool/src/reltool_sys_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2011. 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
@@ -1092,17 +1092,23 @@ move_app(S, {_ItemNo, AppBase}, Action) ->
     OldApp#app{incl_cond = AppCond}.
 
 do_set_app(#state{server_pid = ServerPid, app_wins = AppWins} = S, NewApp) ->
-    {ok, AnalysedApp, Warnings} = reltool_server:set_app(ServerPid, NewApp),
+    Result = reltool_server:set_app(ServerPid, NewApp),
     [ok = reltool_app_win:refresh(AW#app_win.pid) || AW <- AppWins],
     S2 = redraw_apps(S),
-    case Warnings of
-	[] ->
-	    ignore;
-	_ ->
-	    Msg = lists:flatten([[W, $\n] || W <- Warnings]),
-	    display_message(Msg, ?wxICON_WARNING)
-    end,
-    {ok, AnalysedApp, S2}.
+    ReturnApp =
+	case Result of
+	    {ok, AnalysedApp, []} ->
+		AnalysedApp;
+	    {ok, AnalysedApp, Warnings} ->
+		Msg = lists:flatten([[W, $\n] || W <- Warnings]),
+		display_message(Msg, ?wxICON_WARNING),
+		AnalysedApp;
+	    {error, Reason} ->
+		display_message(Reason, ?wxICON_ERROR),
+		{ok,OldApp} = reltool_server:get_app(ServerPid, NewApp#app.name),
+		OldApp
+	end,
+    {ok, ReturnApp, S2}.
 
 redraw_apps(#state{server_pid = ServerPid,
                    source = SourceCtrl,
diff --git a/lib/reltool/test/Makefile b/lib/reltool/test/Makefile
index 62fe05238b..767454b66a 100644
--- a/lib/reltool/test/Makefile
+++ b/lib/reltool/test/Makefile
@@ -76,8 +76,8 @@ release_tests_spec: opt
 	$(INSTALL_DATA) reltool.spec reltool.cover $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
 	$(INSTALL_SCRIPT) rtt $(INSTALL_PROGS) $(RELSYSDIR)
 	$(INSTALL_DATA) $(INSTALL_PROGS) $(RELSYSDIR)
-#	chmod -R u+w $(RELSYSDIR)
-#	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	chmod -R u+w $(RELSYSDIR)
+	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
 release_docs_spec:
 
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index b77560db94..9ed79e8c95 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -25,6 +25,7 @@
 -compile(export_all).
 
 -include("reltool_test_lib.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(NODE_NAME, '__RELTOOL__TEMPORARY_TEST__NODE__').
 -define(WORK_DIR, "reltool_work_dir").
@@ -53,7 +54,7 @@ all() ->
     [start_server, set_config, create_release,
      create_script, create_target, create_embedded,
      create_standalone, create_old_target,
-     otp_9135].
+     otp_9135, otp_9229_exclude_app, otp_9229_exclude_mod].
 
 groups() -> 
     [].
@@ -361,6 +362,114 @@ create_old_target(_Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% OTP-9229 - handle duplicated module names, i.e. same module name
+%% exists in two applications.
+
+%% Include on app, exclude the other
+otp_9229_exclude_app(Config) ->
+    DataDir =  ?config(data_dir,Config),
+    LibDir = filename:join(DataDir,"otp_9229"),
+
+    %% Configure the server
+    ExclApp =
+        {sys,
+         [
+          {root_dir, code:root_dir()},
+          {lib_dirs, [LibDir]},
+	  {incl_cond,exclude},
+	  {app,x,[{incl_cond,include}]},
+	  {app,y,[{incl_cond,exclude}]},
+	  {app,kernel,[{incl_cond,include}]},
+	  {app,stdlib,[{incl_cond,include}]},
+	  {app,sasl,[{incl_cond,include}]}
+         ]},
+
+    %% Generate target file
+    TargetDir = filename:join([?WORK_DIR, "target_dupl_mod_excl_app"]),
+    ?m(ok, reltool_utils:recursive_delete(TargetDir)),
+    ?m(ok, file:make_dir(TargetDir)),
+    ?log("SPEC: ~p\n", [reltool:get_target_spec([{config, ExclApp}])]),
+    {ok,["Module mylib exists in applications x and y. Using module from application x."]} = reltool:get_status([{config, ExclApp}]),
+    ?m(ok, reltool:create_target([{config, ExclApp}], TargetDir)),
+
+    Erl = filename:join([TargetDir, "bin", "erl"]),
+    {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)),
+
+    AbsTargetDir = filename:absname(TargetDir),
+    XArchive = "x-1.0.ez",
+    AbsXArchive = filename:join([AbsTargetDir,lib,XArchive]),
+    XEbin = ["ebin","x-1.0",XArchive],
+    YArchive = "y-1.0.ez",
+    AbsYArchive = filename:join([AbsTargetDir,lib,YArchive]),
+
+    ?m(true, filelib:is_file(AbsXArchive)),
+    ?m(XEbin, mod_path(Node,x)),
+    ?m(XEbin, mod_path(Node,mylib)),
+    ?m(false, filelib:is_file(AbsYArchive)),
+    ?m(non_existing, mod_path(Node,y)),
+
+    ?msym(ok, stop_node(Node)),
+
+    ok.
+
+%% Include both apps, but exclude common module from one app
+otp_9229_exclude_mod(Config) ->
+    DataDir =  ?config(data_dir,Config),
+    LibDir = filename:join(DataDir,"otp_9229"),
+
+    %% Configure the server
+    ExclMod =
+        {sys,
+         [
+          {root_dir, code:root_dir()},
+          {lib_dirs, [LibDir]},
+	  {incl_cond,exclude},
+	  {app,x,[{incl_cond,include}]},
+	  {app,y,[{incl_cond,include},{mod, mylib,[{incl_cond,exclude}]}]},
+	  {app,kernel,[{incl_cond,include}]},
+	  {app,stdlib,[{incl_cond,include}]},
+	  {app,sasl,[{incl_cond,include}]}
+         ]},
+
+    %% Generate target file
+    TargetDir = filename:join([?WORK_DIR, "target_dupl_mod_excl_mod"]),
+    ?m(ok, reltool_utils:recursive_delete(TargetDir)),
+    ?m(ok, file:make_dir(TargetDir)),
+    ?log("SPEC: ~p\n", [reltool:get_target_spec([{config, ExclMod}])]),
+    {ok,["Module mylib exists in applications x and y. Using module from application x."]} = reltool:get_status([{config, ExclMod}]),
+    ?m(ok, reltool:create_target([{config, ExclMod}], TargetDir)),
+
+    Erl = filename:join([TargetDir, "bin", "erl"]),
+    {ok, Node} = ?msym({ok, _}, start_node(?NODE_NAME, Erl)),
+
+    AbsTargetDir = filename:absname(TargetDir),
+    XArchive = "x-1.0.ez",
+    AbsXArchive = filename:join([AbsTargetDir,lib,XArchive]),
+    XEbin = ["ebin","x-1.0",XArchive],
+    YArchive = "y-1.0.ez",
+    AbsYArchive = filename:join([AbsTargetDir,lib,YArchive]),
+    YEbin = ["ebin","y-1.0",YArchive],
+
+    ?m(true, filelib:is_file(AbsXArchive)),
+    ?m(XEbin, mod_path(Node,x)),
+    ?m(XEbin, mod_path(Node,mylib)),
+    ?m(true, filelib:is_file(AbsYArchive)),
+    ?m(YEbin, mod_path(Node,y)),
+
+    %% Remove path to XEbin and check that mylib is not located in YEbin
+    Mylib = rpc:call(Node,code,which,[mylib]),
+    rpc:call(Node,code,del_path,[filename:dirname(Mylib)]),
+    ?m(non_existing, mod_path(Node,mylib)),
+
+    ?msym(ok, stop_node(Node)),
+
+    ok.
+
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Library functions
 
 erl_libs() ->
@@ -407,6 +516,20 @@ os_cmd(Cmd) when is_list(Cmd) ->
             end
     end.
 
+%% Returns the location (directory) of the given module. Split,
+%% reverted and relative to the lib dir.
+mod_path(Node,Mod) ->
+    case rpc:call(Node,code,which,[Mod]) of
+	Path when is_list(Path) ->
+	    lists:takewhile(
+	      fun("lib") -> false;
+		 (_) -> true
+	      end,
+	      lists:reverse(filename:split(filename:dirname(Path))));
+	Other ->
+	    Other
+    end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Node handling
 
diff --git a/lib/reltool/test/reltool_server_SUITE_data/Makefile.src b/lib/reltool/test/reltool_server_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..049e8dd6cc
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/Makefile.src
@@ -0,0 +1,19 @@
+EFLAGS=+debug_info
+
+OTP9229= \
+     otp_9229/x-1.0/ebin/x.@EMULATOR@ \
+     otp_9229/x-1.0/ebin/mylib.@EMULATOR@ \
+     otp_9229/y-1.0/ebin/y.@EMULATOR@ \
+     otp_9229/y-1.0/ebin/mylib.@EMULATOR@
+
+
+all: $(OTP9229)
+
+otp_9229/x-1.0/ebin/x.@EMULATOR@: otp_9229/x-1.0/src/x.erl
+	erlc $(EFLAGS) -ootp_9229/x-1.0/ebin otp_9229/x-1.0/src/x.erl
+otp_9229/x-1.0/ebin/mylib.@EMULATOR@: otp_9229/x-1.0/src/mylib.erl
+	erlc $(EFLAGS) -ootp_9229/x-1.0/ebin otp_9229/x-1.0/src/mylib.erl
+otp_9229/y-1.0/ebin/y.@EMULATOR@: otp_9229/y-1.0/src/y.erl
+	erlc $(EFLAGS) -ootp_9229/y-1.0/ebin otp_9229/y-1.0/src/y.erl
+otp_9229/y-1.0/ebin/mylib.@EMULATOR@: otp_9229/y-1.0/src/mylib.erl
+	erlc $(EFLAGS) -ootp_9229/y-1.0/ebin otp_9229/y-1.0/src/mylib.erl
diff --git a/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/ebin/x.app b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/ebin/x.app
new file mode 100644
index 0000000000..e597704b19
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/ebin/x.app
@@ -0,0 +1,7 @@
+%% -*- erlang -*-
+{application, x,
+ [{description, "X  CXC 138 11"},
+  {vsn, "1.0"},
+  {modules, [x, mylib]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/mylib.erl b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/mylib.erl
new file mode 100644
index 0000000000..c8603d1a8e
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/mylib.erl
@@ -0,0 +1,4 @@
+-module(mylib).
+-export([foo/0]).
+
+foo() -> erlang:time().
diff --git a/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/x.erl b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/x.erl
new file mode 100644
index 0000000000..17ff84f08f
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/x-1.0/src/x.erl
@@ -0,0 +1,4 @@
+-module(x).
+-export([x/0]).
+
+x() ->mylib:foo().
diff --git a/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/ebin/y.app b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/ebin/y.app
new file mode 100644
index 0000000000..5b327862e3
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/ebin/y.app
@@ -0,0 +1,7 @@
+%% -*- erlang -*-
+{application, y,
+ [{description, "Y  CXC 138 11"},
+  {vsn, "1.0"},
+  {modules, [y, mylib]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/mylib.erl b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/mylib.erl
new file mode 100644
index 0000000000..c8603d1a8e
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/mylib.erl
@@ -0,0 +1,4 @@
+-module(mylib).
+-export([foo/0]).
+
+foo() -> erlang:time().
diff --git a/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/y.erl b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/y.erl
new file mode 100644
index 0000000000..342e7da7d5
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/otp_9229/y-1.0/src/y.erl
@@ -0,0 +1,4 @@
+-module(y).
+-export([y/0]).
+
+y() ->mylib:foo().
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index b27a3a0996..599be62241 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/Makefile b/lib/sasl/Makefile
index 2affcf1e40..4073e5af85 100644
--- a/lib/sasl/Makefile
+++ b/lib/sasl/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2010. 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
@@ -23,7 +23,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 # Macros
 #
 
-SUB_DIRECTORIES = src doc/src
+SUB_DIRECTORIES = src doc/src examples/src
 
 include vsn.mk
 VSN = $(SASL_VSN)
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index 7941e371a0..73c4825458 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/sasl_app.xml b/lib/sasl/doc/src/sasl_app.xml
index a7fecfc440..446baccb08 100644
--- a/lib/sasl/doc/src/sasl_app.xml
+++ b/lib/sasl/doc/src/sasl_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -67,6 +67,11 @@
         <p>This error logger writes <em>all</em> events sent to
           the error logger to disk. It installs the <c>log_mf_h</c>
           event handler in the <c>error_logger</c> process.</p>
+        <p>To activate this event handler, the following three sasl
+          configuration parameters must be set:
+          <c>error_logger_mf_dir</c>, <c>error_logger_mf_maxbytes</c>
+          and <c>error_logger_mf_maxfiles</c>. See below for more
+          information about the configuration parameters.</p>
       </item>
     </taglist>
   </section>
diff --git a/lib/sasl/examples/ebin/.gitignore b/lib/sasl/examples/ebin/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/lib/sasl/examples/ebin/.gitignore
diff --git a/lib/sasl/examples/src/Makefile b/lib/sasl/examples/src/Makefile
new file mode 100644
index 0000000000..4a4e04a536
--- /dev/null
+++ b/lib/sasl/examples/src/Makefile
@@ -0,0 +1,78 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2010. 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%
+#
+
+#
+
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../../vsn.mk
+VSN=$(SASL_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/sasl-$(VSN)
+
+# ----------------------------------------------------
+# Common Macros
+# ----------------------------------------------------
+EXTRA_ERLC_FLAGS = +warn_unused_vars
+ERL_COMPILE_FLAGS += $(EXTRA_ERLC_FLAGS)
+
+
+MODULES = target_system
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+debug opt: $(TARGET_FILES)
+
+clean:
+	rm -fr $(TARGET_FILES) *~ *.beam 
+
+docs:
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/src
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/ebin
+	(cd ..; tar cf - src ebin  | (cd $(RELSYSDIR)/examples; tar xf -))
+	chmod -f -R ug+w $(RELSYSDIR)/examples
+
+release_docs_spec:
+
+
+
+
+
+
+
diff --git a/lib/sasl/examples/src/target_system.erl b/lib/sasl/examples/src/target_system.erl
new file mode 100644
index 0000000000..0e1e0b2324
--- /dev/null
+++ b/lib/sasl/examples/src/target_system.erl
@@ -0,0 +1,259 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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(target_system).
+-export([create/1, create/2, install/2]).
+
+%% Note: RelFileName below is the *stem* without trailing .rel,
+%% .script etc.
+%%
+
+%% create(RelFileName)
+%%
+create(RelFileName) ->
+    create(RelFileName,[]).
+
+create(RelFileName,SystoolsOpts) ->
+    RelFile = RelFileName ++ ".rel", 
+    Dir = filename:dirname(RelFileName),
+    PlainRelFileName = filename:join(Dir,"plain"),
+    PlainRelFile = PlainRelFileName ++ ".rel",
+    io:fwrite("Reading file: ~p ...~n", [RelFile]),
+    {ok, [RelSpec]} = file:consult(RelFile),
+    io:fwrite("Creating file: ~p from ~p ...~n", 
+              [PlainRelFile, RelFile]),
+    {release,
+     {RelName, RelVsn},
+     {erts, ErtsVsn},
+     AppVsns} = RelSpec,
+    PlainRelSpec = {release, 
+                    {RelName, RelVsn},
+                    {erts, ErtsVsn},
+                    lists:filter(fun({kernel, _}) -> 
+                                         true;
+                                    ({stdlib, _}) ->
+                                         true;
+                                    (_) ->
+                                         false
+                                 end, AppVsns)
+                   },
+    {ok, Fd} = file:open(PlainRelFile, [write]),
+    io:fwrite(Fd, "~p.~n", [PlainRelSpec]),
+    file:close(Fd),
+
+    io:fwrite("Making \"~s.script\" and \"~s.boot\" files ...~n",
+	      [PlainRelFileName,PlainRelFileName]),
+    make_script(PlainRelFileName,SystoolsOpts),
+
+    io:fwrite("Making \"~s.script\" and \"~s.boot\" files ...~n", 
+              [RelFileName, RelFileName]),
+    make_script(RelFileName,SystoolsOpts),
+
+    TarFileName = filename:join(Dir,RelFileName ++ ".tar.gz"),
+    io:fwrite("Creating tar file ~p ...~n", [TarFileName]),
+    make_tar(RelFileName,SystoolsOpts),
+
+    TmpDir = filename:join(Dir,"tmp"),
+    io:fwrite("Creating directory ~p ...~n",[TmpDir]),
+    file:make_dir(TmpDir), 
+
+    io:fwrite("Extracting ~p into directory ~p ...~n", [TarFileName,TmpDir]),
+    extract_tar(TarFileName, TmpDir),
+
+    TmpBinDir = filename:join([TmpDir, "bin"]),
+    ErtsBinDir = filename:join([TmpDir, "erts-" ++ ErtsVsn, "bin"]),
+    io:fwrite("Deleting \"erl\" and \"start\" in directory ~p ...~n", 
+              [ErtsBinDir]),
+    file:delete(filename:join([ErtsBinDir, "erl"])),
+    file:delete(filename:join([ErtsBinDir, "start"])),
+
+    io:fwrite("Creating temporary directory ~p ...~n", [TmpBinDir]),
+    file:make_dir(TmpBinDir),
+
+    io:fwrite("Copying file \"~s.boot\" to ~p ...~n", 
+              [PlainRelFileName, filename:join([TmpBinDir, "start.boot"])]),
+    copy_file(PlainRelFileName++".boot",filename:join([TmpBinDir, "start.boot"])),
+
+    io:fwrite("Copying files \"epmd\", \"run_erl\" and \"to_erl\" from \n"
+              "~p to ~p ...~n", 
+              [ErtsBinDir, TmpBinDir]),
+    copy_file(filename:join([ErtsBinDir, "epmd"]), 
+              filename:join([TmpBinDir, "epmd"]), [preserve]),
+    copy_file(filename:join([ErtsBinDir, "run_erl"]), 
+              filename:join([TmpBinDir, "run_erl"]), [preserve]),
+    copy_file(filename:join([ErtsBinDir, "to_erl"]), 
+              filename:join([TmpBinDir, "to_erl"]), [preserve]),
+
+    StartErlDataFile = filename:join([TmpDir, "releases", "start_erl.data"]),
+    io:fwrite("Creating ~p ...~n", [StartErlDataFile]),
+    StartErlData = io_lib:fwrite("~s ~s~n", [ErtsVsn, RelVsn]),
+    write_file(StartErlDataFile, StartErlData),
+    
+    io:fwrite("Recreating tar file ~p from contents in directory ~p ...~n", 
+	      [TarFileName,TmpDir]),
+    {ok, Tar} = erl_tar:open(TarFileName, [write, compressed]),
+    %% {ok, Cwd} = file:get_cwd(),
+    %% file:set_cwd("tmp"),
+    ErtsDir = "erts-"++ErtsVsn,
+    erl_tar:add(Tar, filename:join(TmpDir,"bin"), "bin", []),
+    erl_tar:add(Tar, filename:join(TmpDir,ErtsDir), ErtsDir, []),
+    erl_tar:add(Tar, filename:join(TmpDir,"releases"), "releases", []),
+    erl_tar:add(Tar, filename:join(TmpDir,"lib"), "lib", []),
+    erl_tar:close(Tar),
+    %% file:set_cwd(Cwd),
+    io:fwrite("Removing directory ~p ...~n",[TmpDir]),
+    remove_dir_tree(TmpDir),
+    ok.
+
+
+install(RelFileName, RootDir) ->
+    TarFile = RelFileName ++ ".tar.gz", 
+    io:fwrite("Extracting ~p ...~n", [TarFile]),
+    extract_tar(TarFile, RootDir),
+    StartErlDataFile = filename:join([RootDir, "releases", "start_erl.data"]),
+    {ok, StartErlData} = read_txt_file(StartErlDataFile),
+    [ErlVsn, _RelVsn| _] = string:tokens(StartErlData, " \n"),
+    ErtsBinDir = filename:join([RootDir, "erts-" ++ ErlVsn, "bin"]),
+    BinDir = filename:join([RootDir, "bin"]),
+    io:fwrite("Substituting in erl.src, start.src and start_erl.src to\n"
+              "form erl, start and start_erl ...\n"),
+    subst_src_scripts(["erl", "start", "start_erl"], ErtsBinDir, BinDir, 
+                      [{"FINAL_ROOTDIR", RootDir}, {"EMU", "beam"}],
+                      [preserve]),
+    io:fwrite("Creating the RELEASES file ...\n"),
+    create_RELEASES(RootDir, 
+                    filename:join([RootDir, "releases", RelFileName])).
+
+%% LOCALS 
+
+%% make_script(RelFileName,Opts)
+%%
+make_script(RelFileName,Opts) ->
+    systools:make_script(RelFileName, [no_module_tests,
+				       {outdir,filename:dirname(RelFileName)}
+				       |Opts]).
+
+%% make_tar(RelFileName,Opts)
+%%
+make_tar(RelFileName,Opts) ->
+    RootDir = code:root_dir(),
+    systools:make_tar(RelFileName, [{erts, RootDir},
+				    {outdir,filename:dirname(RelFileName)}
+				    |Opts]).
+
+%% extract_tar(TarFile, DestDir)
+%%
+extract_tar(TarFile, DestDir) ->
+    erl_tar:extract(TarFile, [{cwd, DestDir}, compressed]).
+
+create_RELEASES(DestDir, RelFileName) ->
+    release_handler:create_RELEASES(DestDir, RelFileName ++ ".rel").
+
+subst_src_scripts(Scripts, SrcDir, DestDir, Vars, Opts) -> 
+    lists:foreach(fun(Script) ->
+                          subst_src_script(Script, SrcDir, DestDir, 
+                                           Vars, Opts)
+                  end, Scripts).
+
+subst_src_script(Script, SrcDir, DestDir, Vars, Opts) -> 
+    subst_file(filename:join([SrcDir, Script ++ ".src"]),
+               filename:join([DestDir, Script]),
+               Vars, Opts).
+
+subst_file(Src, Dest, Vars, Opts) ->
+    {ok, Conts} = read_txt_file(Src),
+    NConts = subst(Conts, Vars),
+    write_file(Dest, NConts),
+    case lists:member(preserve, Opts) of
+        true ->
+            {ok, FileInfo} = file:read_file_info(Src),
+            file:write_file_info(Dest, FileInfo);
+        false ->
+            ok
+    end.
+
+%% subst(Str, Vars)
+%% Vars = [{Var, Val}]
+%% Var = Val = string()
+%% Substitute all occurrences of %Var% for Val in Str, using the list
+%% of variables in Vars.
+%%
+subst(Str, Vars) ->
+    subst(Str, Vars, []).
+
+subst([$%, C| Rest], Vars, Result) when $A =< C, C =< $Z ->
+    subst_var([C| Rest], Vars, Result, []);
+subst([$%, C| Rest], Vars, Result) when $a =< C, C =< $z ->
+    subst_var([C| Rest], Vars, Result, []);
+subst([$%, C| Rest], Vars, Result) when  C == $_ ->
+    subst_var([C| Rest], Vars, Result, []);
+subst([C| Rest], Vars, Result) ->
+    subst(Rest, Vars, [C| Result]);
+subst([], _Vars, Result) ->
+    lists:reverse(Result).
+
+subst_var([$%| Rest], Vars, Result, VarAcc) ->
+    Key = lists:reverse(VarAcc),
+    case lists:keysearch(Key, 1, Vars) of
+        {value, {Key, Value}} ->
+            subst(Rest, Vars, lists:reverse(Value, Result));
+        false ->
+            subst(Rest, Vars, [$%| VarAcc ++ [$%| Result]])
+    end;
+subst_var([C| Rest], Vars, Result, VarAcc) ->
+    subst_var(Rest, Vars, Result, [C| VarAcc]);
+subst_var([], Vars, Result, VarAcc) ->
+    subst([], Vars, [VarAcc ++ [$%| Result]]).
+
+copy_file(Src, Dest) ->
+    copy_file(Src, Dest, []).
+
+copy_file(Src, Dest, Opts) ->
+    {ok,_} = file:copy(Src, Dest),
+    case lists:member(preserve, Opts) of
+        true ->
+            {ok, FileInfo} = file:read_file_info(Src),
+            file:write_file_info(Dest, FileInfo);
+        false ->
+            ok
+    end.
+       
+write_file(FName, Conts) ->
+    {ok, Fd} = file:open(FName, [write]),
+    file:write(Fd, Conts),
+    file:close(Fd).
+
+read_txt_file(File) ->
+    {ok, Bin} = file:read_file(File),
+    {ok, binary_to_list(Bin)}.
+
+remove_dir_tree(Dir) ->
+    remove_all_files(".", [Dir]).
+
+remove_all_files(Dir, Files) ->
+    lists:foreach(fun(File) ->
+                          FilePath = filename:join([Dir, File]),
+                          case filelib:is_dir(FilePath) of
+                              true ->
+                                  {ok, DirFiles} = file:list_dir(FilePath), 
+                                  remove_all_files(FilePath, DirFiles),
+                                  file:del_dir(FilePath);
+                              _ ->
+                                  file:delete(FilePath)
+                          end
+                  end, Files).
diff --git a/lib/sasl/src/rb.erl b/lib/sasl/src/rb.erl
index 13753565d8..8004ef2c5a 100644
--- a/lib/sasl/src/rb.erl
+++ b/lib/sasl/src/rb.erl
@@ -53,8 +53,7 @@ start_link(Options) ->
     gen_server:start_link({local, rb_server}, rb, Options, []).
 
 stop() -> 
-    call(stop),
-    supervisor:delete_child(sasl_sup, rb_server).
+    supervisor:terminate_child(sasl_sup, rb_server).
 
 rescan() -> rescan([]).
 rescan(Options) ->
@@ -205,8 +204,6 @@ handle_call({rescan, Options}, _From, State) ->
     NewState = State#state{data = Data, max = Max, type = Type,
 			   device = Device, abort = Abort, log = Log1},
     {reply, ok, NewState};
-handle_call(stop, _From, State) ->
-    {stop, normal, stopped, State};
 handle_call(_, _From, #state{data = undefined}) ->
     {reply, {error, no_data}, #state{}};
 handle_call({list, Type}, _From, State) ->
@@ -312,11 +309,14 @@ scan_files(RptDir, Max, Type) ->
 	{ok, Fd} ->
 	    case catch file:read(Fd, 1) of
 		{ok, [LastWritten]} -> 
+		    file:close(Fd),
 		    Files = make_file_list(RptDir, LastWritten),
 		    scan_files(RptDir, Files, Max, Type);		
-		_ -> exit("cannot read the index file")
+		_X ->
+		    file:close(Fd),
+		    exit("cannot read the index file")
 	    end;
-	_ -> exit("cannot read the index file")
+	_X -> exit("cannot read the index file")
     end.
 
 make_file_list(Dir, FirstFileNo) ->
@@ -789,7 +789,7 @@ filter_report([{Key, RegExp, re}|T], Msg) ->
 filter_report([{Key, RegExp, re, no}|T], Msg) ->
     case proplists:get_value(Key, Msg) of
 	undefined ->
-	    false;
+	    true;
 	Value ->
 	    Subject = lists:flatten(io_lib:format("~p",[Value])),
 	    case run_re(Subject, RegExp) of
diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index d1babaffff..aed5f0da1f 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -81,27 +81,38 @@ get_mf() ->
     Dir = get_mf_dir(),
     MaxB = get_mf_maxb(),
     MaxF = get_mf_maxf(),
-    {Dir, MaxB, MaxF}.
+    case {Dir, MaxB, MaxF} of
+	{undefined,undefined,undefined} = R ->
+	    R;
+	{undefined,_,_} ->
+	    exit({missing_config, {sasl, error_logger_mf_dir}});
+	{_,undefined,_} ->
+	    exit({missing_config, {sasl, error_logger_mf_maxbytes}});
+	{_,_,undefined} ->
+	    exit({missing_config, {sasl, error_logger_mf_maxfiles}});
+	R ->
+	    R
+    end.
 
 get_mf_dir() ->
     case application:get_env(sasl, error_logger_mf_dir) of
-	{ok, false} -> throw(undefined);
+	{ok, false} -> undefined;
 	{ok, Dir} when is_list(Dir) -> Dir;
-	undefined -> throw(undefined);
+	undefined -> undefined;
 	{ok, Bad} -> exit({bad_config, {sasl, {error_logger_mf_dir, Bad}}})
     end.
 
 get_mf_maxb() ->
     case application:get_env(sasl, error_logger_mf_maxbytes) of
 	{ok, MaxB} when is_integer(MaxB) -> MaxB;
-	undefined -> throw(undefined);
+	undefined -> undefined;
 	{ok, Bad} -> exit({bad_config, {sasl, {error_logger_mf_maxbytes, Bad}}})
     end.
 
 get_mf_maxf() ->
     case application:get_env(sasl, error_logger_mf_maxfiles) of
 	{ok, MaxF} when is_integer(MaxF), MaxF > 0, MaxF < 256 -> MaxF;
-	undefined -> throw(undefined);
+	undefined -> undefined;
 	{ok, Bad} -> exit({bad_config, {sasl, {error_logger_mf_maxfiles, Bad}}})
     end.
 
diff --git a/lib/sasl/test/.gitignore b/lib/sasl/test/.gitignore
new file mode 100644
index 0000000000..76e706b874
--- /dev/null
+++ b/lib/sasl/test/.gitignore
@@ -0,0 +1,5 @@
+#
+# Don't ignore *.beam files in any sub-directory.
+#
+
+!*.beam
diff --git a/lib/sasl/test/Makefile b/lib/sasl/test/Makefile
new file mode 100644
index 0000000000..ad08c8136b
--- /dev/null
+++ b/lib/sasl/test/Makefile
@@ -0,0 +1,91 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2011. 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%
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+MODULES= \
+	sasl_SUITE \
+	alarm_handler_SUITE \
+	installer \
+	release_handler_SUITE \
+	systools_SUITE \
+	systools_rc_SUITE \
+	overload_SUITE \
+	rb_SUITE
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+INSTALL_PROGS= $(TARGET_FILES)
+
+EMAKEFILE=Emakefile
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/sasl_test
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+ERL_MAKE_FLAGS +=
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \
+		-I$(ERL_TOP)/lib/sasl/src
+
+EBIN = .
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+make_emakefile:
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make'\
+	> $(EMAKEFILE)
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
+	>> $(EMAKEFILE)
+
+tests debug opt: make_emakefile
+	erl $(ERL_MAKE_FLAGS) -make
+
+clean:
+	rm -f $(EMAKEFILE)
+	rm -f $(TARGET_FILES)
+	rm -f core
+
+docs:
+
+# ----------------------------------------------------
+# Release Target
+# ----------------------------------------------------
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+
+release_tests_spec: make_emakefile
+	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) sasl.spec sasl.cover $(EMAKEFILE) $(RELSYSDIR)
+	chmod -f -R u+w $(RELSYSDIR)
+	@tar cfh - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+
+release_docs_spec:
diff --git a/lib/sasl/test/alarm_handler_SUITE.erl b/lib/sasl/test/alarm_handler_SUITE.erl
new file mode 100644
index 0000000000..a98e8c9c67
--- /dev/null
+++ b/lib/sasl/test/alarm_handler_SUITE.erl
@@ -0,0 +1,179 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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(alarm_handler_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+
+%%-----------------------------------------------------------------
+%% We will add an own alarm handler in order to verify that the
+%% alarm_handler deliver the expected events.
+%%-----------------------------------------------------------------
+
+-export([init_per_suite/1, end_per_suite/1, all/0,groups/0,
+	 init_per_group/2,end_per_group/2,
+	 set_alarm/1, clear_alarm/1, swap/1]).
+
+-export([init/1, handle_event/2, handle_call/2, handle_info/2,
+	 terminate/2]).
+
+
+init_per_suite(Config) ->
+    application:start(sasl),
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+all() -> 
+    [set_alarm, clear_alarm, swap].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+%%-----------------------------------------------------------------
+
+set_alarm(suite) -> [];
+set_alarm(Config) when is_list(Config) ->
+    ?line gen_event:add_handler(alarm_handler, ?MODULE, self()),
+    Alarm1 = {alarm1, "this is the alarm"},
+    Alarm2 = {"alarm2", this_is_the_alarm},
+    Alarm3 = {{alarm3}, {this_is,"the_alarm"}},
+    ?line ok = alarm_handler:set_alarm(Alarm1),
+    reported(set_alarm, Alarm1),
+    ?line ok = alarm_handler:set_alarm(Alarm2),
+    reported(set_alarm, Alarm2),
+    ?line ok = alarm_handler:set_alarm(Alarm3),
+    reported(set_alarm, Alarm3),
+
+    ?line [Alarm3,Alarm2,Alarm1] = alarm_handler:get_alarms(),
+    alarm_handler:clear_alarm(alarm1),
+    alarm_handler:clear_alarm("alarm2"),
+    alarm_handler:clear_alarm({alarm3}),
+    ?line [] = alarm_handler:get_alarms(),
+
+    test_server:messages_get(),
+    ?line my_yes = gen_event:delete_handler(alarm_handler, ?MODULE, []),
+    ok.
+
+%%-----------------------------------------------------------------
+
+clear_alarm(suite) -> [];
+clear_alarm(Config) when is_list(Config) ->
+    ?line gen_event:add_handler(alarm_handler, ?MODULE, self()),
+    Alarm1 = {alarm1, "this is the alarm"},
+    Alarm2 = {"alarm2", this_is_the_alarm},
+    Alarm3 = {{alarm3}, {this_is,"the_alarm"}},
+    alarm_handler:set_alarm(Alarm1),
+    alarm_handler:set_alarm(Alarm2),
+    alarm_handler:set_alarm(Alarm3),
+    test_server:messages_get(),
+
+    ?line ok = alarm_handler:clear_alarm(alarm1),
+    reported(clear_alarm, alarm1),
+    ?line ok = alarm_handler:clear_alarm("alarm2"),
+    reported(clear_alarm, "alarm2"),
+    ?line ok = alarm_handler:clear_alarm({alarm3}),
+    reported(clear_alarm, {alarm3}),
+    ?line [] = alarm_handler:get_alarms(),
+
+    ?line my_yes = gen_event:delete_handler(alarm_handler, ?MODULE, []),
+    ok.
+
+%%-----------------------------------------------------------------
+
+swap(suite) -> [];
+swap(Config) when is_list(Config) ->
+    ?line Alarm1 = {alarm1, "this is the alarm"},
+    ?line Alarm2 = {"alarm2", this_is_the_alarm},
+    ?line Alarm3 = {{alarm3}, {this_is,"the_alarm"}},
+    ?line alarm_handler:set_alarm(Alarm1),
+    ?line alarm_handler:set_alarm(Alarm2),
+    ?line alarm_handler:set_alarm(Alarm3),
+
+    ?line foo,
+    case gen_event:which_handlers(alarm_handler) of
+	[alarm_handler] ->
+	    ?line ok = gen_event:swap_handler(alarm_handler,
+					      {alarm_handler, swap},
+					      {?MODULE, self()}),
+	    ?line [?MODULE] = gen_event:which_handlers(alarm_handler),
+	    Alarms = [Alarm3, Alarm2, Alarm1],
+	    reported(swap_alarms, Alarms),
+
+	    %% get_alarms is only valid with the default handler installed.
+	    ?line {error, _} = alarm_handler:get_alarms(),
+
+	    ?line my_yes = gen_event:delete_handler(alarm_handler,
+						    ?MODULE, []),
+	    ?line gen_event:add_handler(alarm_handler, alarm_handler, []),
+	    ok;
+	_ ->
+	    alarm_handler:clear_alarm(alarm1),
+            alarm_handler:clear_alarm("alarm2"),
+	    alarm_handler:clear_alarm({alarm3}),
+	    ok
+    end.
+
+%%-----------------------------------------------------------------
+%% Check that the alarm has been received.
+%%-----------------------------------------------------------------
+reported(Tag, Data) ->
+    receive
+	{Tag, Data} ->
+	    test_server:messages_get(),
+	    ok
+    after 1000 ->
+	    test_server:fail(no_alarm_received)
+    end.
+
+%%-----------------------------------------------------------------
+%% The error_logger handler (gen_event behaviour).
+%% Sends a notification to the Tester process about the events
+%% generated by the Tester process.
+%%-----------------------------------------------------------------
+init(Tester) when is_pid(Tester) ->
+    {ok, Tester};
+init({Tester, {alarm_handler,Alarms}}) -> % Swap from default handler.
+    Tester ! {swap_alarms, Alarms},
+    {ok, Tester}.
+
+handle_event({set_alarm, Alarm}, Tester) ->
+    Tester ! {set_alarm, Alarm},
+    {ok, Tester};
+handle_event({clear_alarm, AlarmId}, Tester) ->
+    Tester ! {clear_alarm, AlarmId},
+    {ok, Tester};
+handle_event(_Event, Tester) ->
+    {ok, Tester}.
+
+handle_info(_, Tester) ->
+    {ok, Tester}.
+
+handle_call(_Query, Tester) -> {ok, {error, bad_query}, Tester}.
+
+terminate(_Reason, _Tester) ->
+    my_yes.
diff --git a/lib/sasl/test/installer.erl b/lib/sasl/test/installer.erl
new file mode 100644
index 0000000000..a114c4b5c9
--- /dev/null
+++ b/lib/sasl/test/installer.erl
@@ -0,0 +1,778 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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(installer).
+
+%%-compile(export_all).
+-export([install_1/2]).
+-export([install_2/1]).
+-export([install_3/2]).
+-export([install_3a/1]).
+-export([install_4/1]).
+-export([install_5/1]).
+-export([install_5a/1]).
+-export([install_6/1]).
+-export([install_7/1]).
+-export([install_8/1]).
+-export([install_9/1]).
+-export([install_10/1]).
+-export([install_11/1]).
+-export([client1_1/4]).
+-export([client2/3]).
+-export([stop/1]).
+-export([unpack_p1h/2]).
+-export([permanent_p1h/1]).
+-export([reg_proc/1]).
+-export([registered_loop/1]).
+
+-define(print(List), {rh_print, TestNode} ! {print, {?MODULE, ?LINE}, List}).
+-define(print_line(Line,List), {rh_print, TestNode} ! {print, {?MODULE, Line}, List}).
+-define(fail(Term), exit({?MODULE, ?LINE, Term})).
+-define(fail_line(Line,Term), exit({?MODULE, Line, Term})).
+
+-define(check_release(Vsn,Status,Apps),
+	check_release(TestNode,node(),Vsn,Status,Apps,?LINE)).
+-define(check_release_client(Node,Vsn,Status,Apps),
+	check_release(TestNode,Node,Vsn,Status,Apps,?LINE)).
+
+-define(check_running_app(App,Vsn),
+	check_running_app(TestNode,node(),App,Vsn,?LINE)).
+-define(check_running_app_client(Node,App,Vsn),
+	check_running_app(TestNode,Node,App,Vsn,?LINE)).
+
+
+install_1(TestNode,PrivDir) ->
+    ?print([TestNode]),
+    ?print(["install_1 start"]),
+
+    % Unpack and install P1H
+    {ok, "P1H"} = unpack_release(PrivDir,"rel1"),
+    ?print(["unpack_release P1H ok"]),
+    ?check_release("P1H",unpacked,["a-1.0"]),
+    {ok,"P1G",[new_appl]} = release_handler:install_release("P1H"),
+    ?print(["install_release P1H ok"]),
+    ?check_release("P1H",current,["a-1.0"]),
+    ?check_running_app(a,"1.0"),
+    X = a:a(),
+    ?print(["X", X]),
+    {key2, val2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+    ?print(["install_1 end OK"]),
+    ok.
+    % release_handler_SUITE will reboot this node now!
+
+install_2(TestNode) ->
+    ?print(["install_2 start"]),
+
+    % Check that P1H is still unpacked, install it and make_permanent
+    ?check_release("P1H",unpacked,["a-1.0"]),
+    ?print(["install_2 P1H unpacked"]),
+    {ok,"P1G",[new_appl]} = release_handler:install_release("P1H"),
+    ?print(["install_2 install_release ok"]),
+    ?check_release("P1H",current,["a-1.0"]),
+    ?check_running_app(a,"1.0"),
+    ok = release_handler:make_permanent("P1H").
+    % release_handler_SUITE will reboot this node now!
+
+install_3(TestNode,PrivDir) ->
+    ?print(["install_3 start"]),
+
+    % Check that P1H is permanent
+    ?check_release("P1H",permanent,["a-1.0"]),
+    X = a:a(),
+    {key2, val2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+
+    % Unpack and install P1I
+    {ok, "P1I"} = unpack_release(PrivDir,"rel2"),
+    ?print(["install_3 unpack_release P1I ok"]),
+    ?check_release("P1I",unpacked,["a-1.1"]),
+    {ok,"P1H",[{extra, gott}]} = release_handler:check_install_release("P1I"),
+    {error,_} = release_handler:check_install_release("P1J"),
+    {ok,"P1H",[{extra, gott}]} = release_handler:install_release("P1I"),
+    ?print(["install_3 install_release P1I ok"]),
+    ?check_release("P1I",current,["a-1.1"]),
+    ?check_running_app(a,"1.1"),
+    X2 = a:a(),
+    {key2, newval2} = lists:keyfind(key2, 1, X2),
+    {key1, val1} = lists:keyfind(key1, 1, X2),
+    {ok, bval} = a:b(),
+
+    % Unpack and install P2A
+    {ok, "P2A"} = unpack_release(PrivDir,"rel3"),
+    ?print(["install_3 unpack_release P2A ok"]),
+    ?check_release("P2A",unpacked,["a-1.1"]),
+    {ok, "P1I", [new_emu]} = release_handler:check_install_release("P2A"),
+    ok = release_handler:make_permanent("P1I"),
+    ?print(["install_3 make_permanent P1I ok"]),
+    ?check_release("P1I",permanent,["a-1.1"]),
+    ok.
+
+install_3a(TestNode) ->
+    {ok, "P1I", [new_emu]} = release_handler:install_release("P2A"),
+    %% Node is rebooted by the release_handler:install_release
+    %% (init:reboot) because P2A includes a new erts vsn and the relup
+    %% file contains a 'restart_new_emulator' instruction.
+    ?print(["install_3 P2A installed"]),
+    ok.
+
+
+
+install_4(TestNode) ->
+    ?print(["install_4 start"]),
+
+    % Check that P2A is in use.
+    ?check_release("P2A",current,["a-1.1"]),
+    ?check_running_app(a,"1.1"),
+    X = a:a(),
+    {key2, newval2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+    {ok, bval} = a:b(),
+    ok.
+    % release_handler_SUITE will reboot this node now!
+
+install_5(TestNode) ->
+    ?print(["install_5 start"]),
+
+    % Check that P1I is used
+    {ok, "P1I", [new_emu]} = release_handler:check_install_release("P2A"),
+    ok.
+
+install_5a(TestNode) ->
+    % Install P2A again
+    {ok, "P1I", [new_emu]} = release_handler:install_release("P2A"),
+    %% Node is rebooted by the release_handler:install_release
+    %% (init:reboot) because P2A includes a new erts vsn and the relup
+    %% file contains a 'restart_new_emulator' instruction.
+    ?print(["install_5 P2A installed"]),
+    ok.
+
+install_6(TestNode) ->
+    ?print(["install_6 start"]),
+
+    % Check that P2A is used
+    ?check_release("P2A",current,["a-1.1"]),
+    ?check_running_app(a,"1.1"),
+    X = a:a(),
+    {key2, newval2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+    {ok, bval} = a:b(),
+    ok = release_handler:make_permanent("P2A").
+    % release_handler_SUITE will reboot this node now!
+
+
+install_7(TestNode) ->
+    ?print(["install_7 start"]),
+
+    % Check that P2A is used
+    ?check_release("P2A",permanent,["a-1.1"]),
+
+    % Install old P1H
+    ok = release_handler:reboot_old_release("P1H"),
+    ok.
+
+install_8(TestNode) ->
+    ?print(["install_8 start"]),
+
+    % Check that P1H is permanent
+    ?check_release("P1H",permanent,["a-1.0"]),
+    X = a:a(),
+    {key2, val2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+
+    %% Remove P1I and P2A and check that a-1.1 and erts-<latest> are removed
+    ok = release_handler:remove_release("P2A"),
+    ok = release_handler:remove_release("P1I"),
+    {ok, Libs} = file:list_dir(code:lib_dir()),
+    {_,_,StdlibVsn} = lists:keyfind(stdlib,1,application:which_applications()),
+    true = lists:member("stdlib-"++StdlibVsn, Libs),
+    true = lists:member("a-1.0", Libs),
+    false = lists:member("a-1.1", Libs),
+    {ok, Dirs} = file:list_dir(code:root_dir()),
+    ["erts-4.4"] = lists:filter(fun(Dir) -> lists:prefix("erts-",Dir) end, Dirs),
+    ok.
+    % release_handler_SUITE will reboot this node now!
+
+install_9(TestNode) ->
+    ?print(["install_9 start"]),
+
+    % Check that P1H is permanent
+    ?check_release("P1H",permanent,["a-1.0"]),
+    X = a:a(),
+    {key2, val2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+
+    % Install old P1G
+    ok = release_handler:reboot_old_release("P1G"),
+    ok.
+
+install_10(TestNode) ->
+    ?print(["install_10 start"]),
+
+    % Check that P1G is permanent
+    ?check_release("P1G",permanent,[]),
+    ?check_release("P1H",old,["a-1.0"]),
+
+    %% Remove P1H and check that both versions of application a is removed
+    ok = release_handler:remove_release("P1H"),
+    {ok, Libs} = file:list_dir(code:lib_dir()),
+    {_,_,StdlibVsn} = lists:keyfind(stdlib,1,application:which_applications()),
+    true = lists:member("stdlib-"++StdlibVsn, Libs),
+    false = lists:member("a-1.0", Libs),
+    false = lists:member("a-1.1", Libs),
+    ok.
+    % release_handler_SUITE will reboot this node now!
+
+install_11(TestNode) ->
+    ?print(["install_11 start"]),
+
+    % Check that P1G is permanent
+    ?check_release("P1G",permanent,[]),
+    ok.
+
+
+
+%%-----------------------------------------------------------------
+%% This test starts a client node which uses this node as master
+%% for the release_handler.
+%% The client node runs all tests as in installer/1 test case.
+%% Thus, the client node will be rebooted several times.
+%% The to_erl /tmp/NODENAME@HOSTNAME/ command can be used to connect
+%% to the client node.
+%% run_erl logs for the client can be found in the directory:
+%%   code:root_dir() ++ "/clients/type1/NODENAME@HOSTNAME/log
+%%-----------------------------------------------------------------
+
+
+client1_1(TestNode,PrivDir,MasterDir,ClientSname) ->
+    TestHost = test_host(),
+    ?print(["client1_1 start"]),
+
+    {ok,IP} = inet:getaddr(TestHost,inet),
+    erl_boot_server:start([IP]),
+
+    ok = net_kernel:monitor_nodes(true),
+    Node = start_client(TestNode,ClientSname),
+    trace_disallowed_calls(Node),
+
+    %% Check env var for SASL on client node
+    SaslEnv = rpc:call(Node, application, get_all_env, [sasl]),
+    {_,CliDir} = lists:keyfind(client_directory,1,SaslEnv),
+    {_,[Master]} = lists:keyfind(masters,1,SaslEnv),
+    {_,StartCli} = lists:keyfind(start_prg,1,SaslEnv),
+    Root = code:root_dir(),
+    true = (CliDir =:= filename:join([Root,"clients","type1",Node])),
+    true = (StartCli =:= filename:join([CliDir,"bin","start"])),
+    true = (Master =:= node()),
+
+    %% Unpack P1H on master
+    {ok, "P1H"} = unpack_release(PrivDir,"rel1"),
+
+    %% Unpack and install P1H on client
+    P1HDir = filename:join([Root, "releases", "P1H"]),
+
+    %% The AppDirs argument (last arg to set_unpacked) below is really
+    %% not necessary, it could just be [] since the path is the same
+    %% as default. But it is given here in order to force hitting the
+    %% release_handler:check_path function so it can be checked that
+    %% it does not use file:read_file_info on the client node, see
+    %% trace_disallowed_calls/1 and check_disallowed_calls/0 below.
+    %% (OTP-9142)
+    {ok, "P1H"} = rpc:call(Node, release_handler, set_unpacked,
+			   [filename:join(P1HDir, "rel1.rel"),
+			    [{a,"1.0",filename:join(MasterDir,lib)}]]),
+    
+    ?check_release_client(Node,"P1H",unpacked,["a-1.0"]),
+    
+    ok = rpc:call(Node, release_handler, install_file,
+		  ["P1H", filename:join(P1HDir, "start.boot")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  ["P1H", filename:join(P1HDir, "sys.config")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  ["P1H", filename:join(P1HDir, "relup")]),
+    ?print([{release_handler_state, Node}, 
+	    rpc:call(Node, sys, get_status, [release_handler])]),
+
+    {ok,"P1G",[new_appl]} = 
+	rpc:call(Node, release_handler, check_install_release, ["P1H"]),
+    
+    {ok,"P1G",[new_appl]} = 
+	rpc:call(Node, release_handler, install_release, ["P1H"]),
+
+    Apps = rpc:call(Node, application, which_applications, []),
+    {a,"A  CXC 138 11","1.0"} = lists:keyfind(a, 1, Apps),
+    X = rpc:call(Node, a, a, []),
+    {key2, val2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+
+    check_disallowed_calls(),
+    reboot(TestNode,Node),
+    trace_disallowed_calls(Node),
+
+    client1_2(TestNode,PrivDir,Node).
+
+client1_2(TestNode,PrivDir,Node) ->
+    ?print(["client1_2 start"]),
+
+    %% Check that P1H is still unpacked, install it and make_permanent
+    ?check_release_client(Node,"P1H",unpacked,["a-1.0"]),
+
+    {ok,"P1G",[new_appl]} = 
+	rpc:call(Node, release_handler, install_release, ["P1H"]),
+    ?check_release_client(Node,"P1H",current,["a-1.0"]),
+    ?check_running_app_client(Node,a,"1.0"),
+
+    ok = rpc:call(Node, release_handler, make_permanent, ["P1H"]),
+
+    check_disallowed_calls(),
+    reboot(TestNode,Node),
+    trace_disallowed_calls(Node),
+
+    client1_3(TestNode,PrivDir,Node).
+
+client1_3(TestNode,PrivDir,Node) ->
+    ?print(["client1_3 start"]),
+
+    %% Check that P1H is permanent
+    ?check_release_client(Node,"P1H",permanent,["a-1.0"]),
+    X = rpc:call(Node, a, a, []),
+    {key2, val2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+
+    %% Unpack P1I on master
+    {ok, "P1I"} = unpack_release(PrivDir,"rel2"),
+
+    MasterRoot = code:root_dir(),
+
+    %% Unpack and install P1I on client
+    P1IDir = filename:join([MasterRoot, "releases", "P1I"]),
+    {ok, "P1I"} = rpc:call(Node, release_handler, set_unpacked,
+			   [filename:join(P1IDir, "rel2.rel"),[]]),
+
+    ?check_release_client(Node,"P1I",unpacked,["a-1.1"]),
+
+    ok = rpc:call(Node, release_handler, install_file,
+                  ["P1I", filename:join(P1IDir, "start.boot")]),
+    ok = rpc:call(Node, release_handler, install_file,
+                  ["P1I", filename:join(P1IDir, "sys.config")]),
+    ok = rpc:call(Node, release_handler, install_file,
+                  ["P1I", filename:join(P1IDir, "relup")]),
+
+    {ok,"P1H",[{extra, gott}]} =
+        rpc:call(Node, release_handler, check_install_release, ["P1I"]),
+    {error,_} = rpc:call(Node, release_handler, check_install_release, ["P1J"]),
+    {ok,"P1H",[{extra, gott}]} =
+        rpc:call(Node, release_handler, install_release, ["P1I"]),
+
+    ?check_running_app_client(Node,a,"1.1"),
+    X2 = rpc:call(Node, a, a, []),
+    {key2, newval2} = lists:keyfind(key2, 1, X2),
+    {key1, val1} = lists:keyfind(key1, 1, X2),
+    {ok, bval} = rpc:call(Node, a, b, []),
+
+    %% Unpack P2A on master
+    {ok, "P2A"} = unpack_release(PrivDir,"rel3"),
+
+    %% Unpack and install P2A on client
+    P2ADir = filename:join([MasterRoot, "releases", "P2A"]),
+    {ok, "P2A"} =
+        rpc:call(Node, release_handler, set_unpacked,
+                 [filename:join(P2ADir, "rel3.rel"),[]]),
+
+    ok = rpc:call(Node, release_handler, install_file,
+                  ["P2A", filename:join(P2ADir, "start.boot")]),
+    ok = rpc:call(Node, release_handler, install_file,
+                  ["P2A", filename:join(P2ADir, "sys.config")]),
+    ok = rpc:call(Node, release_handler, install_file,
+                  ["P2A", filename:join(P2ADir, "relup")]),
+
+    {ok, "P1I", [new_emu]} = 
+	rpc:call(Node, release_handler, check_install_release, ["P2A"]),
+    ok = rpc:call(Node, release_handler, make_permanent, ["P1I"]),
+    ?check_release_client(Node,"P1I",permanent,["a-1.1"]),
+
+    %% since the install_release below reboot the node...
+    check_disallowed_calls(),
+    cover_client(TestNode,Node,stop_cover), 
+
+    {ok, "P1I", [new_emu]} = 
+	rpc:call(Node, release_handler, install_release, ["P2A"]),
+    %% Reboots the client !
+
+    check_reboot(TestNode,Node),
+    trace_disallowed_calls(Node),
+
+    client1_4(TestNode,Node).
+
+client1_4(TestNode,Node) ->
+    ?print(["client1_4 start"]),
+
+    %% Check that P2A is in use.
+    ?check_release_client(Node,"P2A",current,["a-1.1"]),
+    ?check_running_app_client(Node,a,"1.1"),
+    X = rpc:call(Node, a, a, []),
+    {key2, newval2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+    {ok, bval} = rpc:call(Node, a, b, []),
+
+    %% Reboot from P1I
+    check_disallowed_calls(),
+    reboot(TestNode,Node),
+    trace_disallowed_calls(Node),
+
+    client1_5(TestNode,Node).
+
+client1_5(TestNode,Node) ->
+    ?print(["client1_5 start"]),
+
+    %% Check that P1I is used
+    {ok, "P1I", [new_emu]} = 
+	rpc:call(Node, release_handler, check_install_release, ["P2A"]),
+
+    %% since the install_release below will reboot the node...
+    check_disallowed_calls(),
+    cover_client(TestNode,Node,stop_cover),
+
+    %% Install P2A again
+    {ok, "P1I", [new_emu]} = 
+	rpc:call(Node, release_handler, install_release, ["P2A"]),
+
+    %% We are rebooted again.
+    check_reboot(TestNode,Node),
+    trace_disallowed_calls(Node),
+
+    client1_6(TestNode,Node).
+
+client1_6(TestNode,Node) ->
+    ?print(["client1_6 start"]),
+
+    %% Check that P2A is used
+    ?check_release_client(Node,"P2A",current,["a-1.1"]),
+    ?check_running_app_client(Node,a,"1.1"),
+    X = rpc:call(Node, a, a, []),
+    {key2, newval2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+    {ok, bval} = rpc:call(Node, a, b, []),
+
+    %% Make P2A permanent
+    ok = rpc:call(Node, release_handler, make_permanent, ["P2A"]),
+
+    %% Reboot from P2A
+    check_disallowed_calls(),
+    reboot(TestNode,Node),
+    trace_disallowed_calls(Node),
+
+    client1_7(TestNode,Node).
+
+client1_7(TestNode,Node) ->
+    ?print(["client1_7 start"]),
+
+    %% Check that P2A is used
+    ?check_release_client(Node,"P2A",permanent,["a-1.1"]),
+
+    %% since the reboot_old_release below will reboot the node
+    check_disallowed_calls(),
+    cover_client(TestNode,Node,stop_cover),
+
+    %% Install old P1H
+    rpc:call(Node, release_handler, reboot_old_release, ["P1H"]),
+    %% We are rebooted.
+    check_reboot(TestNode,Node),
+    trace_disallowed_calls(Node),
+
+    client1_8(TestNode,Node).
+
+client1_8(TestNode,Node) ->
+    ?print(["client1_8 start"]),
+
+    %% Check that P1H is permanent
+    ?check_release_client(Node,"P1H",permanent,["a-1.0"]),
+    X = rpc:call(Node, a, a, []),
+    {key2, val2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+
+    %% Remove P1I and P2I from client
+    ok = rpc:call(Node, release_handler, set_removed, ["P2A"]),
+    ok = rpc:call(Node, release_handler, set_removed, ["P1I"]),
+
+    check_disallowed_calls(),
+    reboot(TestNode,Node),
+    trace_disallowed_calls(Node),
+
+    client1_9(TestNode,Node).
+
+client1_9(TestNode,Node) ->
+    ?print(["client1_9 start"]),
+
+    %% Check that P2A and P1I does not exists and that PiH is permanent.
+    Rels = rpc:call(Node, release_handler, which_releases, []),
+    false = lists:keysearch("P2A", 2, Rels),
+    false = lists:keysearch("P1I", 2, Rels),
+    ?check_release_client(Node,"P1H",permanent,["a-1.0"]),
+    X = rpc:call(Node, a, a, []),
+    {key2, val2} = lists:keyfind(key2, 1, X),
+    {key1, val1} = lists:keyfind(key1, 1, X),
+
+    %% since the reboot_old_release below will reboot the node
+    check_disallowed_calls(),
+    cover_client(TestNode,Node,stop_cover),
+
+    %% Install old P1G
+    rpc:call(Node, release_handler, reboot_old_release, ["P1G"]),
+    %% We are rebooted.
+    check_reboot(TestNode,Node),
+    trace_disallowed_calls(Node),
+
+    client1_10(TestNode,Node).
+
+client1_10(TestNode,Node) ->
+    ?print(["client1_10 start"]),
+
+    %% Check that P1G is permanent
+    ?check_release_client(Node,"P1G",permanent,[]),
+    ?check_release_client(Node,"P1H",old,["a-1.0"]),
+    {error,client_node} = rpc:call(Node,release_handler,remove_release,["P1H"]),
+    ok = rpc:call(Node, release_handler, set_removed, ["P1H"]),
+
+    check_disallowed_calls(),
+    reboot(TestNode,Node),
+    trace_disallowed_calls(Node),
+
+    client1_11(TestNode,Node).
+
+client1_11(TestNode,Node) ->
+    ?print(["client1_11 start"]),
+
+    %% Check that P1G is permanent
+    ?check_release_client(Node,"P1G",permanent,[]),
+
+    check_disallowed_calls(),
+    stop_client(TestNode,Node),  %% TEST IS OK !!
+    net_kernel:monitor_nodes(false),
+
+    ok = release_handler:remove_release("P2A"),
+    ok = release_handler:remove_release("P1I"),
+    ok = release_handler:remove_release("P1H"),
+    ok.
+
+%% Start tracing of the file module on the client node. This module
+%% shall never be called, since
+%% 1) the node is a client from the release_handler's point of view,
+%%    so all file access should be done via rpc calls to the master
+%% 2) it is started with erl_prim_loader loader set to 'inet' so all
+%%    code loading should be done via the inet to the master
+%% (OTP-9142)
+%% This function is called each time the client node is started and to
+%% check if a call has been made, call check_disallowed_node/0
+trace_disallowed_calls(Node) ->
+    MasterProc = self(),
+    rpc:call(Node,dbg,tracer,[process,{fun(T,_) -> MasterProc ! T end,[]}]),
+    rpc:call(Node,dbg,p,[all,call]),
+    rpc:call(Node,dbg,tp,[file,[]]).
+
+check_disallowed_calls() ->
+    receive
+	Trace when element(1,Trace)==trace ->
+	    exit({disallowed_function_call,Trace})
+    after 0 ->
+	    ok
+    end.
+
+start_client(TestNode,Client) ->
+    {Start, Node} = do_start_client(Client,test_host()),
+    Cmd = lists:concat(["env NODENAME=",Client," ",
+			filename:join(code:root_dir(), Start)]),
+    ?print([{start_client,Client},Cmd]),
+    Res = os:cmd(Cmd),
+    ?print([{start_client,result},Res]),
+    receive
+        {nodeup, Node} ->
+            wait_started(TestNode,Node)
+    after 30000 ->
+	    ?print([{start_client,failed,Node},net_adm:ping(Node)]),
+            ?fail({"can not start", Node})
+    end.
+
+do_start_client(Client, Host) ->
+    Node = list_to_atom(lists:concat([Client,"@",Host])),
+    Start = filename:join(["clients", "type1", Node, "bin", "start"]),
+    {Start, Node}.
+
+reboot(TestNode,Node) ->
+    cover_client(TestNode,Node,stop_cover),
+    rpc:call(Node, init, reboot, []),
+    check_reboot(TestNode,Node).
+
+%% This way of checking that the node is rebooted will only work if
+%% the nodes are automatically re-connected after the reboot. This
+%% happens for master/client (when sasl is started on the client).
+check_reboot(TestNode,Node) ->
+    receive
+        {nodedown, Node} ->
+            receive
+                {nodeup, Node} -> wait_started(TestNode,Node)
+            after 30000 ->
+                    ?fail({Node, "not rebooted",net_adm:ping(Node)})
+            end
+    after 30000 ->
+            ?fail({Node, "not closing down",net_adm:ping(Node)})
+    end.
+
+stop_client(TestNode,Node) ->
+    cover_client(TestNode,Node,stop_cover),
+    rpc:call(Node, init, stop, []),
+    receive
+        {nodedown, Node} -> ok
+    after 30000 ->
+            ?fail({Node, "not stopping"})
+    end.
+
+wait_started(TestNode,Node) ->
+    case rpc:call(Node, init, get_status, []) of
+        {started, _} ->
+	    cover_client(TestNode,Node,start_cover),
+            Node;
+        _ ->
+            timer:sleep(1000),
+            wait_started(TestNode,Node)
+    end.
+
+cover_client(TestNode,Node,Func) ->
+    R = rpc:call(TestNode,release_handler_SUITE,Func,[Node]),
+    ?print([{Func,Node,R}]).
+
+
+%%-----------------------------------------------------------------
+%% This test starts a client node which uses this node as master
+%% for the release_handler.
+%% The client node has the name cli2@HOSTNAME.
+%% The client node is not allowed to do ANY release updates
+%% as it also have another (non-existing) master node.
+%%
+%% The to_erl /tmp/cli2@HOSTNAME/ command can be used to connect
+%% to the client node.
+%% run_erl logs for the client can be found in the directory:
+%%   code:root_dir() ++ "/clients/type1/cli2@HOSTNAME/log
+%%-----------------------------------------------------------------
+client2(TestNode,PrivDir,ClientSname) ->
+    TestHost = test_host(),
+    ?print(["client2 start"]),
+    
+    %% Clean up if previous test case failed
+    release_handler:remove_release("P1H"), 
+
+    ok = net_kernel:monitor_nodes(true),
+    Node = start_client(TestNode,ClientSname),
+
+    %% Check env var for SASL on client node
+    ?print([{sasl_env, Node}, rpc:call(Node, application, get_all_env, [sasl])]),
+    SaslEnv = rpc:call(Node, application, get_all_env, [sasl]),
+    {_,CliDir} = lists:keyfind(client_directory,1,SaslEnv),
+    {_,[Master,Master2]} = lists:keyfind(masters,1,SaslEnv),
+    {_,StartCli} = lists:keyfind(start_prg,1,SaslEnv),
+    Root = code:root_dir(),
+    true = (CliDir =:= filename:join([Root,"clients","type1",Node])),
+    true = (StartCli =:= filename:join([CliDir,"bin","start"])),
+    true = (Master =:= node()),
+    true = (Master2 =:= list_to_atom("master2@"++TestHost)),
+
+    {ok, "P1H"} = unpack_release(PrivDir,"rel1"),
+
+    {error,{bad_masters,[Master2]}} =
+	rpc:call(Node, release_handler, set_unpacked,
+		 [filename:join([Root, "releases", "P1H", "rel1.rel"]),[]]),
+
+    {error,{no_such_release,"P1H"}} =
+	rpc:call(Node, release_handler, check_install_release, ["P1H"]),
+
+    stop_client(TestNode,Node),  %% TEST IS OK !!
+    net_kernel:monitor_nodes(false),
+
+    release_handler:remove_release("P1H"),
+    ok.
+
+
+stop(Now) ->
+    %% The timestamp is only used for debugging. It is printed by
+    %% release_handler_SUITE also.
+    R = init:stop(),
+    erlang:display({init_stop,Now,R}),
+    R.
+
+unpack_p1h(TestNode,PrivDir) ->
+    {ok, "P1H"} = unpack_release(PrivDir,"rel1"), 
+    ?check_release("P1H",unpacked,["a-1.0"]),
+    ok.
+
+permanent_p1h(TestNode) ->
+    ?check_release("P1H",unpacked,["a-1.0"]),
+    {ok,"P1G",[new_appl]} = release_handler:install_release("P1H"),
+    ?check_release("P1H",current,["a-1.0"]),
+    ok = release_handler:make_permanent("P1H"),
+    ?check_release("P1H",permanent,["a-1.0"]),
+    ok.
+
+
+reg_proc(Name) ->
+    catch unregister(Name),
+    Pid = spawn_link(?MODULE, registered_loop, [Name]),
+    global:register_name(Name, Pid),
+    ok.
+
+registered_loop(_Name) ->
+    receive
+        kill ->
+            exit(killed)
+    end.
+
+check_release(TestNode,Node,Vsn,Status,Apps,Line) ->
+    case rpc:call(Node,release_handler,which_releases,[]) of
+	{badrpc,_}=Error ->
+	    ?fail_line(Line,{check_release,Node,Vsn,Status,Error});
+	Rels ->
+	    ?print_line(Line,["check_release:", Rels]),
+	    {"SASL-test", Vsn, Libs, Status} = lists:keyfind(Vsn, 2, Rels),
+	    true = lists:all(fun(App) -> lists:member(App,Libs) end,Apps),
+	    ok
+    end.
+
+check_running_app(TestNode,Node,App,Vsn,Line) ->
+    case rpc:call(Node,application,which_applications,[]) of
+	{badrpc,_}=Error ->
+	    ?fail_line(Line,{check_running_app,Node,App,Vsn,Error});
+	Apps ->
+	    ?print_line(Line,["check_running_app:", Apps]),
+	    {App, _, Vsn} = lists:keyfind(a, 1, Apps),
+	    ok
+    end.
+
+test_host() ->
+    {ok,Host} = inet:gethostname(),
+    Host.
+
+unpack_release(PrivDir,Rel) ->
+    copy(filename:join([PrivDir,Rel,Rel++".tar.gz"]),
+	 filename:join(code:root_dir(),releases)),
+    release_handler:unpack_release(Rel).
+
+copy(Src, DestDir) ->
+    Dest = filename:join(DestDir, filename:basename(Src)),
+    {ok,_} = file:copy(Src, Dest),
+    ok.
+
diff --git a/lib/sasl/test/overload_SUITE.erl b/lib/sasl/test/overload_SUITE.erl
new file mode 100644
index 0000000000..92b1aaed6e
--- /dev/null
+++ b/lib/sasl/test/overload_SUITE.erl
@@ -0,0 +1,175 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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(overload_SUITE).
+-include("test_server.hrl").
+
+-compile(export_all).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+all() -> [info, set_config_data, set_env_vars, request, timeout].
+all(suite) -> all().
+
+init_per_testcase(_Case,Config) ->
+    restart_sasl(),
+    Config.
+
+end_per_testcase(Case,Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+%%%-----------------------------------------------------------------
+info(suite) -> [];
+info(_Config) ->
+    ?line Info = overload:get_overload_info(),
+    ?line [{total_intensity,0.0},
+	   {accept_intensity,0.0},
+	   {max_intensity,0.8},
+	   {weight,0.1},
+	   {total_requests,0},
+	   {accepted_requests,0}] = Info.
+
+%%%-----------------------------------------------------------------
+set_config_data(suite) -> [];
+set_config_data(_Config) ->
+    ?line InfoDefault = overload:get_overload_info(),
+    ?line ok = check_info(0.8,0.1,InfoDefault),
+    ?line ok = overload:set_config_data(0.5,0.4),
+    ?line Info1 = overload:get_overload_info(),
+    ?line ok = check_info(0.5,0.4,Info1),
+    ok.
+
+%%%-----------------------------------------------------------------
+set_env_vars(suite) -> [];
+set_env_vars(_Config) ->
+    ?line InfoDefault = overload:get_overload_info(),
+    ?line ok = check_info(0.8,0.1,InfoDefault),
+    ?line ok = application:set_env(sasl,overload_max_intensity,0.5),
+    ?line ok = application:set_env(sasl,overload_weight,0.4),
+    ?line ok = application:stop(sasl),
+    ?line ok = application:start(sasl),
+    ?line Info1 = overload:get_overload_info(),
+    ?line ok = check_info(0.5,0.4,Info1),
+    ok.
+set_env_vars(cleanup,_Config) ->
+    application:unset_env(sasl,overload_max_intensity),
+    application:unset_env(sasl,overload_weight),
+    ok.
+
+%%%-----------------------------------------------------------------
+request(suite) -> [];
+request(_Config) ->
+    %% Find number of request that can be done with default settings
+    %% and no delay
+    ?line overload:set_config_data(0.8, 0.1),
+    ?line NDefault = do_many_requests(0),
+    ?line restart_sasl(),
+    ?line ?t:format("NDefault: ~p",[NDefault]),
+ 
+    %% Check that the number of requests increases when max_intensity
+    %% increases
+    ?line overload:set_config_data(2, 0.1),
+    ?line NLargeMI = do_many_requests(0),
+    ?line restart_sasl(),
+    ?line ?t:format("NLargeMI: ~p",[NLargeMI]),
+    ?line true = NLargeMI > NDefault,
+
+    %% Check that the number of requests decreases when weight
+    %% increases
+    ?line overload:set_config_data(0.8, 1),
+    ?line NLargeWeight = do_many_requests(0),
+    ?line restart_sasl(),
+    ?line ?t:format("NLargeWeight: ~p",[NLargeWeight]),
+    ?line true = NLargeWeight < NDefault,
+
+    %% Check that number of requests increases when delay between
+    %% requests increases.
+    %% (Keeping same config and comparing to large weight in order to
+    %% minimize the time needed for this case.)
+    ?line overload:set_config_data(0.8, 1),
+    ?line NLargeTime = do_many_requests(500),
+    ?line restart_sasl(),
+    ?line ?t:format("NLargeTime: ~p",[NLargeTime]),
+    ?line true = NLargeTime > NLargeWeight,
+    ok.
+
+%%%-----------------------------------------------------------------
+timeout(suite) -> [];
+timeout(_Config) ->
+    ?line overload:set_config_data(0.8, 1),
+    ?line _N = do_many_requests(0),
+    
+    %% Check that the overload alarm is raised
+    ?line [{overload,_}] = alarm_handler:get_alarms(),
+
+    %% Fake a clear timeout in overload.erl and check that, since it
+    %% came very soon after the overload situation, the alarm is not
+    %% cleared
+    ?line overload ! timeout,
+    ?line timer:sleep(1000),
+    ?line [{overload,_}] = alarm_handler:get_alarms(),
+
+    %% A bit later, try again and check that this time the alarm is
+    %% cleared
+    ?line overload ! timeout,
+    ?line timer:sleep(1000),
+    ?line [] = alarm_handler:get_alarms(),
+
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% INTERNAL FUNCTIONS
+
+%%%-----------------------------------------------------------------
+%%% Call overload:request/0 up to 30 times with the given time delay
+%%% between. Stop when 'reject' is returned.
+do_many_requests(T) ->
+    30 - do_requests(30,T).
+
+do_requests(0,_) ->
+    ?t:fail(never_rejected);
+do_requests(N,T) ->
+    case overload:request() of
+	accept ->
+	    timer:sleep(T),
+	    do_requests(N-1,T);
+	reject ->
+	    N
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Restart the sasl application
+restart_sasl() ->
+    application:stop(sasl),
+    application:start(sasl),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Check that max_intensity and weight is set as expected
+check_info(MI,W,Info) -> 
+    case {lists:keyfind(max_intensity,1,Info), lists:keyfind(weight,1,Info)} of
+	{{_,MI},{_,W}} -> ok;
+	_ -> ?t:fail({unexpected_info,MI,W,Info})
+    end.
+    
+
diff --git a/lib/sasl/test/rb_SUITE.erl b/lib/sasl/test/rb_SUITE.erl
new file mode 100644
index 0000000000..b53c382609
--- /dev/null
+++ b/lib/sasl/test/rb_SUITE.erl
@@ -0,0 +1,606 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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(rb_SUITE).
+-include("test_server.hrl").
+
+-compile(export_all).
+
+-define(SUP,rb_SUITE_sup).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+all() ->
+    no_group_cases() ++ [{group,running_error_logger}].
+
+no_group_cases() ->
+    [help,
+     start_error_stop].
+
+groups() ->
+    [{running_error_logger,[shuffle],[show,
+				      list,
+				      rescan,
+				      start_stop_log,
+				      grep,
+				      filter_filter,
+				      filter_date,
+				      filter_filter_and_date,
+				      filter_re_no
+				     ]}].
+
+
+all(suite) -> 
+    no_group_cases() ++
+	[{conf, 
+	  install_mf_h, 
+	  element(3,lists:keyfind(running_error_logger,1,groups())), 
+	  remove_mf_h}
+	].
+
+
+init_per_suite(Config) ->
+    ?line PrivDir = ?config(priv_dir,Config),
+    ?line RbDir = filename:join(PrivDir,rb),
+    ?line ok = file:make_dir(RbDir),
+    NewConfig = [{rb_dir,RbDir}|Config],
+    reset_sasl(NewConfig),
+    NewConfig.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(running_error_logger,Config) ->
+    install_mf_h(Config).
+
+end_per_group(running_error_logger,Config) ->
+    remove_mf_h(Config).
+
+init_per_testcase(_Case,Config) ->
+    case whereis(?SUP) of
+	undefined -> ok;
+	Pid -> kill(Pid)
+    end,
+    empty_error_logs(Config),
+    Config.
+
+kill(Pid) ->
+    Ref = erlang:monitor(process,Pid),
+    exit(Pid,kill),
+    receive {'DOWN', Ref, process, Pid, _Info} -> ok end.
+
+end_per_testcase(Case,Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+
+%%%-----------------------------------------------------------------
+
+help() -> help(suite).
+help(suite) -> [];
+help(_Config) ->
+    ?line Help = capture(fun() -> rb:h() end),
+    ?line "Report Browser Tool - usage" = hd(Help),
+    ?line "rb:stop            - stop the rb_server" = lists:last(Help),
+    ok.
+
+
+start_error_stop() -> start_error_stop(suite).
+start_error_stop(suite) -> [];
+start_error_stop(Config) ->
+    ?line RbDir = ?config(rb_dir,Config),
+
+    ?line {error,{"cannot locate report directory",_}} = rb:start(),
+
+
+    ?line ok = application:set_env(sasl,error_logger_mf_dir,"invaliddir"),
+    ?line ok = application:set_env(sasl,error_logger_mf_maxbytes,1000),
+    ?line ok = application:set_env(sasl,error_logger_mf_maxfiles,2),
+    ?line restart_sasl(),
+    ?line {error,{"cannot read the index file",_}} = rb:start(),
+    ?line ok = application:set_env(sasl,error_logger_mf_dir,RbDir),
+    ?line restart_sasl(),
+    ?line {ok,_} = rb:start(),
+
+    ?line ok = rb:stop(),
+    ok.
+
+
+%% start_opts(suite) -> [];
+%% start_opts(Config) ->
+%%     PrivDir = ?config(priv_dir,Config),
+%%     RbDir = filename:join(PrivDir,rb_opts),
+%%     ok = file:make_dir(RbDir),
+       
+
+install_mf_h(Config) ->
+    ?line RbDir = ?config(rb_dir,Config),
+    ?line ok = application:set_env(sasl,error_logger_mf_dir,RbDir),
+    ?line ok = application:set_env(sasl,error_logger_mf_maxbytes,5000),
+    ?line ok = application:set_env(sasl,error_logger_mf_maxfiles,2),
+    ?line restart_sasl(),
+    Config.
+
+remove_mf_h(_Config) ->
+    ok.
+
+
+
+show() -> show(suite).
+show(suite) -> [];
+show(Config) ->
+    ?line PrivDir = ?config(priv_dir,Config),
+    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+    
+    %% Insert some reports in the error log and start rb
+    init_error_logs(),
+    ?line ok = start_rb(OutFile),
+
+    %% Show all reports
+    ?line All = check_report(fun() -> rb:show() end,OutFile),
+
+    %% Show by number
+    ?line [{_,First}] = check_report(fun() -> rb:show(1) end,OutFile),
+    ?line {1,First} = lists:keyfind(1,1,All),    
+
+    %% Show by type
+    ?line [{_,CR}] = check_report(fun() -> rb:show(crash_report) end,OutFile),
+    ?line true = contains(CR,"rb_test_crash"),
+    ?line [{_,EC},{_,EM}] = check_report(fun() -> rb:show(error) end,OutFile),
+    ?line true = contains(EC,"rb_test_crash"),
+    ?line true = contains(EM,"rb_test_error_msg"),
+    ?line [{_,ER}] = check_report(fun() -> rb:show(error_report) end,OutFile),
+    ?line true = contains(ER,"rb_test_error"),
+    ?line [{_,IR}] = check_report(fun() -> rb:show(info_report) end,OutFile),
+    ?line true = contains(IR,"rb_test_info"),
+    ?line [{_,IM}] = check_report(fun() -> rb:show(info_msg) end,OutFile),
+    ?line true = contains(IM,"rb_test_info_msg"),
+    ?line [_|_] = check_report(fun() -> rb:show(progress) end,OutFile),
+    ?line [{_,SR}] = check_report(fun() -> rb:show(supervisor_report) end,
+				   OutFile),
+    ?line true = contains(SR,"child_terminated"),
+    ?line true = contains(SR,"{rb_SUITE,rb_test_crash}"),
+
+    ok.
+
+list() -> list(suite).
+list(suite) -> [];
+list(Config) ->
+    ?line PrivDir = ?config(priv_dir,Config),
+    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+
+    %% Insert some reports in the error log and start rb
+    init_error_logs(),
+    ?line ok = start_rb(OutFile),
+
+    ?line All = capture(fun() -> rb:list() end),
+    ?line [{crash_report,[_]=CR},
+	   {error,[_,_]=EM},
+	   {error_report,[_]=ER},
+	   {info_msg,[_]=IM},
+	   {info_report,[_]=IR},
+	   {progress,[_|_]=P},
+	   {supervisor_report,[_]=SR}] = sort_list(All),
+
+    ?line [{crash_report,CR}] = 
+	sort_list(capture(fun() -> rb:list(crash_report) end)),
+    ?line [{error,EM}] = 
+	sort_list(capture(fun() -> rb:list(error) end)),
+    ?line [{error_report,ER}] = 
+	sort_list(capture(fun() -> rb:list(error_report) end)),
+    ?line [{info_msg,IM}] = 
+	sort_list(capture(fun() -> rb:list(info_msg) end)),
+    ?line [{info_report,IR}] = 
+	sort_list(capture(fun() -> rb:list(info_report) end)),
+    ?line [{progress,P}] = 
+	sort_list(capture(fun() -> rb:list(progress) end)),
+    ?line [{supervisor_report,SR}] = 
+	sort_list(capture(fun() -> rb:list(supervisor_report) end)),
+    
+    ok.
+
+
+grep() -> grep(suite).
+grep(suite) -> [];
+grep(Config) ->
+    ?line PrivDir = ?config(priv_dir,Config),
+    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+
+    %% Insert some reports in the error log and start rb
+    init_error_logs(),
+    ?line ok = start_rb(OutFile),
+
+    ?line [{_,S},
+	   {_,CR},
+	   {_,EC},
+	   {_,IM},
+	   {_,IR},
+	   {_,EM},
+	   {_,ER}]= check_report(fun() -> rb:grep("rb_test_") end,OutFile),
+    ?line true = contains(S, "rb_test_crash"),
+    ?line true = contains(CR, "rb_test_crash"),
+    ?line true = contains(EC, "rb_test_crash"),
+    ?line true = contains(IM, "rb_test_info_msg"),
+    ?line true = contains(IR, "rb_test_info"),
+    ?line true = contains(EM, "rb_test_error_msg"),
+    ?line true = contains(ER, "rb_test_error"),
+    ok.
+
+
+filter_filter() -> filter_filter(suite).
+filter_filter(suite) -> [];
+filter_filter(Config) ->
+    ?line PrivDir = ?config(priv_dir,Config),
+    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+
+    %% Insert some reports in the error log and start rb
+    init_error_logs(),
+    ?line ok = start_rb(OutFile),
+
+    ?line All = check_report(fun() -> rb:show() end,OutFile),
+
+    ?line ER = [_] = rb_filter([{rb_SUITE,rb_test_error}],OutFile),
+    ?line [] = rb_filter([{rb_SUITE,rb_test}],OutFile),
+    ?line _E = [_,_] = rb_filter([{rb_SUITE,"rb_test",re}],OutFile),
+    ?line AllButER = rb_filter([{rb_SUITE,rb_test_error,no}],OutFile),
+
+    {_,AllRep} = lists:unzip(All),
+    {_,ERRep} = lists:unzip(ER),
+    {_,AllButERRep} = lists:unzip(AllButER),
+    ?line AllButERRep = AllRep -- ERRep,
+
+    ok.
+
+filter_date() -> filter_date(suite).
+filter_date(suite) -> [];
+filter_date(Config) ->
+    ?line PrivDir = ?config(priv_dir,Config),
+    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+
+
+    %% Insert some reports in the error log and start rb
+    init_error_logs(),
+    Between1 = calendar:local_time(),
+    timer:sleep(1000),
+    Between2 = calendar:local_time(),
+    ?line ok = start_rb(OutFile),
+
+    ?line All = check_report(fun() -> rb:show() end,OutFile),
+
+    Before = calendar:gregorian_seconds_to_datetime(
+	      calendar:datetime_to_gregorian_seconds(calendar:local_time()) - 10),
+    After = calendar:gregorian_seconds_to_datetime(
+	      calendar:datetime_to_gregorian_seconds(calendar:local_time()) + 1),
+
+    ?line All = rb_filter([],{Before,from},OutFile),
+    ?line All = rb_filter([],{After,to},OutFile),
+    ?line [] = rb_filter([],{Before,to},OutFile),
+    ?line [] = rb_filter([],{After,from},OutFile),
+    ?line All = rb_filter([],{Before,After},OutFile),
+
+    %%?t:format("~p~n",[All]),
+    ?line AllButLast = [{N-1,R} || {N,R} <- tl(All)],
+    ?line AllButLast = rb_filter([],{Before,Between1},OutFile),
+
+    ?line Last = hd(All),
+    ?line [Last] = rb_filter([],{Between2,After},OutFile),
+
+    ok.
+
+filter_filter_and_date() -> filter_filter_and_date(suite).
+filter_filter_and_date(suite) -> [];
+filter_filter_and_date(Config) ->
+    ?line PrivDir = ?config(priv_dir,Config),
+    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+
+
+    %% Insert some reports in the error log and start rb
+    init_error_logs(),
+    Between1 = calendar:local_time(),
+    timer:sleep(1000),
+    Between2 = calendar:local_time(),
+    ?line error_logger:error_report([{rb_SUITE,rb_test_filter}]),    
+    ?line ok = start_rb(OutFile),
+
+    Before = calendar:gregorian_seconds_to_datetime(
+	      calendar:datetime_to_gregorian_seconds(calendar:local_time()) - 10),
+    After = calendar:gregorian_seconds_to_datetime(
+	      calendar:datetime_to_gregorian_seconds(calendar:local_time()) + 1),
+
+    ?line All = check_report(fun() -> rb:show() end,OutFile),
+    ?line Last = hd(All),
+
+    ?line [_,_,_] = rb_filter([{rb_SUITE,"rb_test",re}],{Before,After},OutFile),
+    ?line [_,_] = rb_filter([{rb_SUITE,"rb_test",re}],{Before,Between1},OutFile),
+    ?line [_] = rb_filter([{rb_SUITE,"rb_test",re}],{Between2,After},OutFile),
+    ?line [_] = rb_filter([{rb_SUITE,rb_test_filter}],{Before,After},OutFile),
+    ?line [] = rb_filter([{rb_SUITE,rb_test_filter}],{Before,Between1},OutFile),
+    ?line [Last] = rb_filter([{rb_SUITE,rb_test_filter,no}],{Between2,After},OutFile),
+    ?line {_,Str} = Last,
+    ?line false = contains(Str,"rb_test_filter"),
+
+    ok.
+
+
+filter_re_no() -> filter_re_no(suite).
+filter_re_no(suite) -> [];
+filter_re_no(Config) ->
+    ?line PrivDir = ?config(priv_dir,Config),
+    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+
+    %% Insert some reports in the error log and start rb
+    init_error_logs(),
+    ?line ok = start_rb(OutFile),
+
+    ?line All = check_report(fun() -> rb:show() end,OutFile),
+
+    ?line E = [_,_] = rb_filter([{rb_SUITE,"rb_test",re}],OutFile),
+    ?line AllButE = rb_filter([{rb_SUITE,"rb_test",re,no}],OutFile),
+
+    {_,AllRep} = lists:unzip(All),
+    {_,ERep} = lists:unzip(E),
+    {_,AllButERep} = lists:unzip(AllButE),
+    ?line AllButERep = AllRep -- ERep,
+
+    ok.
+
+
+rescan() -> rescan(suite).
+rescan(suite) -> [];
+rescan(Config) ->
+    ?line PrivDir = ?config(priv_dir,Config),
+    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+    
+    %% Start rb
+    ?line ok = start_rb(OutFile),
+
+    %% Insert one more report and check that the list is longer. Note
+    %% that there might be two more reports, since the progress report
+    %% from starting rb_server might not be included before the rescan.
+    ?line AllBefore = capture(fun() -> rb:list() end),
+    ?line error_logger:error_report([{rb_SUITE,rb_test_rescan}]),
+    ?line ok = rb:rescan(),
+    ?line AllAfter = capture(fun() -> rb:list() end),
+    ?line Diff = length(AllAfter) - length(AllBefore),
+    ?line true = (Diff >= 1),
+
+    ok.
+
+
+start_stop_log() -> start_stop_log(suite).
+start_stop_log(suite) -> [];
+start_stop_log(Config) ->
+    ?line PrivDir = ?config(priv_dir,Config),
+    ?line OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"),
+    ?line ok = file:write_file(OutFile,[]),
+
+    %% Start rb and check that show is printed to standard_io
+    ?line ok = start_rb(),
+    ?line StdioResult = [_|_] = capture(fun() -> rb:show(1) end),
+    ?line {ok,<<>>} = file:read_file(OutFile),
+    
+    %% Start log and check that show is printed to log and not to standad_io
+    ?line ok = rb:start_log(OutFile),
+    ?line [] = capture(fun() -> rb:show(1) end),
+    ?line {ok,Bin} = file:read_file(OutFile),
+    ?line true = (Bin =/= <<>>),
+
+    %% Stop log and check that show is printed to standard_io and not to log
+    ?line ok = rb:stop_log(),
+    ?line ok = file:write_file(OutFile,[]),
+    ?line StdioResult = capture(fun() -> rb:show(1) end),
+    ?line {ok,<<>>} = file:read_file(OutFile),
+
+    %% Test that standard_io is used if log file can not be opened
+    ?line ok = rb:start_log(filename:join(nonexistingdir,"newfile.txt")),
+    ?line StdioResult = capture(fun() -> rb:show(1) end),
+    ?line {ok,<<>>} = file:read_file(OutFile),    
+
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% INTERNAL FUNCTIONS
+
+restart_sasl() ->
+    application:stop(sasl),
+    ok = application:start(sasl),
+    wait_for_sasl().
+
+reset_sasl(Config) ->
+    application:unset_env(sasl,error_logger_mf_dir),
+    application:unset_env(sasl,error_logger_mf_maxbytes),
+    application:unset_env(sasl,error_logger_mf_maxfiles),
+    empty_error_logs(Config).
+
+empty_error_logs(Config) ->
+    application:stop(sasl),
+    catch delete_content(?config(rb_dir, Config)),
+    ok = application:start(sasl),
+    wait_for_sasl().
+    
+wait_for_sasl() ->
+    wait_for_sasl(50).
+wait_for_sasl(0) ->
+    ?t:fail("sasl application did not start within 5 seconds");
+wait_for_sasl(N) ->
+    case lists:keymember(sasl,1,application:which_applications()) of
+	true ->
+	    ok;
+	false ->
+	    timer:sleep(100),
+	    wait_for_sasl(N-1)
+    end.
+    
+start_rb(OutFile) ->
+    do_start_rb([{start_log,OutFile}]).
+start_rb() ->
+    do_start_rb([]).
+
+do_start_rb(Opts) ->
+    {ok,Pid} = rb:start(Opts),
+
+    %% Wait for process to started, then wait a little bit more
+    sys:get_status(Pid),
+    timer:sleep(500),
+
+    %% Make sure printouts (e.g. from rb:list(), come to the test log,
+    %% and that they can be captured.
+    group_leader(group_leader(),Pid),
+    ok.
+
+
+delete_tree(Dir) ->
+    case filelib:is_dir(Dir) of
+	true ->
+	    delete_content(Dir),
+	    file:del_dir(Dir);
+	false ->
+	    ok = file:delete(Dir)
+    end.
+
+delete_content(Dir) ->
+    {ok,Files} = file:list_dir(Dir),
+    lists:foreach(fun(File) -> delete_tree(filename:join(Dir,File)) end, 
+		  Files).
+
+init_error_logs() ->        
+    ?line error_logger:error_report([{rb_SUITE,rb_test_error}]),
+    ?line error_logger:error_msg("rb_test_error_msg"),
+    ?line error_logger:info_report([{rb_SUITE,rb_test_info}]),
+    ?line error_logger:info_msg("rb_test_info_msg"),
+    ?line _Pid = start(),
+    ?line Ref = erlang:monitor(process,?MODULE),
+    ?line gen_server:cast(?MODULE,crash),
+    ?line receive {'DOWN',Ref,process,_,{rb_SUITE,rb_test_crash}} -> ok 
+	  after 2000 -> 
+		  ?t:format("Got: ~p~n",[process_info(self(),messages)]),
+		  ?t:fail("rb_SUITE server never died")
+	  end,
+    ?line erlang:demonitor(Ref),
+    ?line wait_for_server(),
+    ok.
+
+wait_for_server() ->
+    case whereis(?MODULE) of
+	undefined ->
+	    wait_for_server();
+	Pid ->
+	    timer:sleep(100), % allow the supervisor report to be written
+	    Pid
+    end.
+
+capture(Fun) ->
+    ?t:capture_start(),
+    ok = Fun(),
+    timer:sleep(1000),
+    ?t:capture_stop(),
+    string:tokens(lists:append(?t:capture_get()),"\n").
+
+
+rb_filter(Filter,OutFile) ->
+    check_report(fun() -> rb:filter(Filter) end, OutFile).
+rb_filter(Filter,Dates,OutFile) ->
+    check_report(fun() -> rb:filter(Filter,Dates) end, OutFile).
+
+
+%% This function first empties the given report file, then executes
+%% the fun and returns a list of {N,Report}, where Report is a report
+%% read from the file and N is an integer. The newest report has the
+%% lowest number.
+%% If the fun was a call to rb:show() (i.e. with no arguments), then
+%% the numbering (N) will be the same as rb's own numbering (as shown
+%% by rb:list()).
+check_report(Fun,File) ->
+    file:delete(File),
+    rb:rescan([{start_log,File}]),
+    ok = Fun(),
+    {ok,Bin} = file:read_file(File),
+    Reports = split_reports(binary_to_list(Bin),[],[]),
+    lists:zip(lists:seq(1,length(Reports)),Reports).
+
+-define(report_header_line,"\n===============================================================================\n").
+split_reports([],Report,Reports) ->
+    add_report(Report,Reports);
+split_reports(Text,Report,Reports) ->
+    case Text of
+	?report_header_line++Rest ->
+	    {Heading,PrevReport} = lists:splitwith(fun($\n) -> false;
+						      (_) -> true
+						   end,
+						   Report),
+	    split_reports(Rest,
+			  ?report_header_line++Heading,
+			  add_report(PrevReport,Reports));
+	[Ch|Rest] ->
+	    split_reports(Rest,[Ch|Report],Reports)
+    end.
+
+add_report(Report,Reports) ->    
+    case string:strip(Report,both,$\n) of
+	[] -> Reports;
+	Report1 -> [lists:reverse(Report1)|Reports]
+    end.
+
+%% Returns true if Substr is a substring of Str.
+contains(Str,Substr) ->
+    0 =/= string:str(Str,Substr).
+
+%% Sort the result of rb_list after report type
+sort_list(List) ->
+    sort_list(List,dict:new()).
+sort_list([H|T],D) ->
+    case re:run(H,"\s+[0-9]+\s+([a-z_]+)",[{capture,all_but_first,list}]) of
+	nomatch ->
+	    sort_list(T,D);
+	{match,[TypeStr]} ->
+	    sort_list(T,dict:append(list_to_atom(TypeStr),H,D))
+    end;
+sort_list([],D) ->
+    lists:sort(dict:to_list(D)).
+
+
+%%%-----------------------------------------------------------------
+%%% A dummy supervisor and gen_server used for creating crash- and
+%%% supervisor reports
+start() ->
+    {ok,Pid} =
+	supervisor:start_link({local, ?SUP}, ?MODULE, i_am_supervisor),
+    unlink(Pid),
+    Pid.
+start_server() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, i_am_server, []).
+init(i_am_server) ->
+    {ok, state};
+init(i_am_supervisor) ->
+    AChild = {?SUP,{?MODULE,start_server,[]},
+	      permanent,2000,worker,[?MODULE]},
+    {ok,{{one_for_all,1,1}, [AChild]}}.
+handle_call(_Request, _From, State) ->
+    Reply = ok,
+    {reply, Reply, State}.
+handle_cast(crash, State) ->
+    exit({rb_SUITE,rb_test_crash}),
+    {noreply, State}.
+handle_info(_Info, State) ->
+    {noreply, State}.
+terminate(_Reason, _State) ->
+    ok.
+
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
new file mode 100644
index 0000000000..efa775f344
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -0,0 +1,1651 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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(release_handler_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+
+-compile(export_all).
+
+% Default timetrap timeout (set in init_per_testcase).
+%-define(default_timeout, ?t:minutes(40)).
+-define(default_timeout, ?t:minutes(10)).
+
+suite() ->
+    [{ct_hooks, [ts_install_cth]}].
+
+init_per_suite(Config) ->
+    application:start(sasl),
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+all() -> 
+    case os:type() of
+	{unix, _} -> unix_cases();
+	{win32, _} -> win32_cases()
+    end.
+
+unix_cases() -> 
+    RunErl = filename:join([code:root_dir(),"bin","run_erl"]),
+    RunErlCases = case filelib:is_file(RunErl) of
+		true ->  [{group, release}];
+		false -> [no_run_erl]
+	    end,
+    [target_system] ++ RunErlCases ++ cases().
+
+win32_cases() -> 
+    cases().
+
+%% Cases that can be run on all platforms
+cases() ->
+    [otp_2740, otp_2760, otp_5761, instructions, eval_appup].
+
+groups() ->
+    [{release,[],
+      [
+       {group,release_single},
+       {group,release_gg}
+      ]},
+     {release_single,[],
+      [
+       upgrade,
+       client1,
+       client2
+      ]},
+     {release_gg,[],
+      [
+       upgrade_gg
+      ]}].
+
+%% {group,release}
+%% Top group for all cases using run_erl
+init_per_group(release, Config) ->
+    Dog = ?t:timetrap(?default_timeout),
+    P1gInstall = filename:join(priv_dir(Config),p1g_install),
+    ok = do_create_p1g(Config,P1gInstall),
+    ok = create_p1h(Config),
+    ?t:timetrap_cancel(Dog);
+
+%% {group,release_single}
+%% Subgroup of {group,release}, contains all cases that are not
+%% related to global_group
+init_per_group(release_single, Config) ->
+    Dog = ?t:timetrap(?default_timeout),
+
+    %% Create some more releases to upgrade to
+    ok = create_p1i(Config),
+    ok = create_p2a(Config),
+
+    ?t:timetrap_cancel(Dog);
+
+%% {group,release_gg}
+%% Subgroup of {group,release}. global_group tests.
+init_per_group(release_gg, Config0) ->
+    Config = [{sname_prefix,release_gg}|Config0],
+
+    PrivDir = priv_dir(Config),
+    Dog = ?t:timetrap(?default_timeout),
+
+    reg_print_proc(), %% starts a printer process on this node
+
+    Snames = [Gg1Sname,Gg2Sname,Gg3Sname,Gg4Sname,Gg5Sname,Gg6Sname] =
+	gg_node_snames(Config),
+
+    %% kill all possible nodes which are to be used
+    ok = stop_nodes([node_name(Sname) || Sname <- Snames]),
+
+    %% For gg1, gg3, gg4 and gg5: create a target system running
+    %% P1G, and with P1H unpacked.
+    %% For gg2 and gg6: create a target system running P1H.
+    %% Use gg2 for unpacking and permanenting P1H.
+    ok = copy_installed(Config,p1g_install,[Gg2Sname]),
+    InstallNode = unpack_p1h(Config,Gg2Sname),
+    ok = copy_installed(Config,Gg2Sname,[Gg1Sname,Gg3Sname,Gg4Sname,Gg5Sname]),
+    ok = permanent_p1h(InstallNode),
+    ok = stop_nodes([InstallNode]),
+    ok = copy_installed(Config,Gg2Sname,[Gg6Sname]),
+
+    %% Replace the sys.config files
+    %% The reason for not creating the releases with these configs in
+    %% the first place (create_p1g, create_p1h) is that then the
+    %% InstallNode (gg2) will be very slow started since it will try
+    %% to synch with the other nodes in the global group.
+    %% Also, the rpc call for installing the P1H release (in
+    %% permanent_p1h/1) would return {rpc,nodedown} due to change of
+    %% global groups.
+    lists:foreach(
+      fun(Sname) ->
+	      ReleasesDir = filename:join([PrivDir,Sname,"releases"]),
+	      write_term_file(filename:join([ReleasesDir,"P1G","sys.config"]),
+			      gg_config([Gg1Sname,Gg3Sname,Gg4Sname,Gg5Sname])),
+	      write_term_file(filename:join([ReleasesDir,"P1H","sys.config"]),
+			      gg_config([Gg1Sname,Gg2Sname,Gg4Sname,
+					 Gg5Sname,Gg6Sname]))
+      end,
+      Snames),
+
+    ?t:timetrap_cancel(Dog),
+    [{snames,Snames}|Config].
+
+
+end_per_group(release, Config) ->
+    Dog = ?t:timetrap(?default_timeout),
+    stop_print_proc(),
+    delete_release(Config),
+    ?t:timetrap_cancel(Dog),
+    Config;
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(Case, Config0) ->
+    Dog = test_server:timetrap(?default_timeout),
+    Config = [{sname_prefix,Case},{watchdog, Dog}|Config0],
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ?t:format("~n======= init_per_testcase done =======~n",[]),
+    Config.
+
+end_per_testcase(Case, Config) ->
+    ?t:format("~n======= start end_per_testcase =======~n",[]),
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+
+    %% DEBUG
+    case ?config(tc_status,Config) of
+	ok ->
+	    ok;
+	_Fail ->
+	    %% save logs from master and client nodes
+	    PrivDir = priv_dir(Config),
+	    SaveDir = filename:join(PrivDir,save),
+	    FailDir = filename:join(SaveDir,lists:concat(["failed-",Case])),
+	    ok = filelib:ensure_dir(filename:join(FailDir,"*")),
+
+	    LogDirs = filelib:wildcard(filename:join([PrivDir,"*",log])),
+
+	    lists:foreach(
+	      fun(LogDir) ->
+		      ["log",Sname|_] = lists:reverse(filename:split(LogDir)),
+		      copy_tree(Config,LogDir,Sname,FailDir)
+	      end,
+	      LogDirs),
+
+	    case filelib:is_file("sasl_erl_crash.dump") of
+		true ->
+		    copy_file("sasl_erl_crash.dump",FailDir);
+		_ ->
+		    ok
+	    end
+
+    end,
+    %% End DEBUG
+
+    %% Remove any remaining sasl_erl_crash.dump
+    %% These can occur when a new master@<host> is started, before
+    %% the old usage of the name is unregistered, causing the node to
+    %% terminate. (This has no effect on the test case, as the node is
+    %% immediately restarted by heart and the test cases wait until
+    %% the node is actually up and running -- see wait_nodes_up/2)
+    file:delete("sasl_erl_crash.dump"),
+
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+gg_node_snames(Config) ->
+    [tc_sname(Config,X) || X <- [gg1,gg2,gg3,gg4,gg5,gg6]].
+
+
+%%%-----------------------------------------------------------------
+%%% TEST CASES
+
+
+%% Executed instead of release group when no run_erl program exists
+no_run_erl(Config) when is_list(Config) ->
+    {comment, "No run_erl program"}.
+
+
+
+%% Test upgrade and downgrade of erts
+upgrade(Conf) when is_list(Conf) ->
+    reg_print_proc(), %% starts a printer process on test_server node
+    ?t:format("upgrade ~p~n",[reg_print_proc]),
+    PrivDir = priv_dir(Conf),
+    Sname = tc_sname(Conf), % nodename for use in this testcase
+
+    %% Copy the P1G release to a directory for use in this testcase
+    ok = copy_installed(Conf,p1g_install,[Sname]),
+
+    %% start the test node
+    [TestNode] = start_nodes(Conf,[Sname],"upgrade start"),
+
+    %% unpack and install P1H
+    ok = rpc_inst(TestNode, install_1, [PrivDir]),
+    stop_cover(TestNode),
+    reboot_and_wait(TestNode,"install_1"),
+
+    %% reinstall P1H and make it permanent
+    ok = rpc_inst(TestNode, install_2, []),
+    stop_cover(TestNode),
+    reboot_and_wait(TestNode,"install_2",[a]),
+
+    %% check that P1H is permanent, unpack and install P1I, unpack and install P2A
+    TestNodeInit1 = rpc:call(TestNode,erlang,whereis,[init]),
+    ok = rpc_inst(TestNode, install_3, [PrivDir]),
+    stop_cover(TestNode),
+    ok = rpc_inst(TestNode, install_3a, []),
+    wait_nodes_up([{TestNode,TestNodeInit1}],"install_3",[a]),
+
+    %% check that P2A is used, reboot from P1I
+    ok = rpc_inst(TestNode, install_4, []),
+    stop_cover(TestNode),
+    reboot_and_wait(TestNode,"install_4",[a]),
+
+    %% check that P1I, reinstall P2A
+    TestNodeInit2 = rpc:call(TestNode,erlang,whereis,[init]),
+    ok = rpc_inst(TestNode, install_5, []),
+    stop_cover(TestNode),
+    ok = rpc_inst(TestNode, install_5a, []),
+    wait_nodes_up([{TestNode,TestNodeInit2}],"install_5",[a]),
+
+    %% check that P2A is used, make P2A permanent
+    ok = rpc_inst(TestNode, install_6, []),
+    stop_cover(TestNode),
+    reboot_and_wait(TestNode,"install_6",[a]),
+
+    %% check that P2A is permanent, install old P1H
+    TestNodeInit3 = rpc:call(TestNode,erlang,whereis,[init]),
+    stop_cover(TestNode),
+    ok = rpc_inst(TestNode, install_7, []),
+    wait_nodes_up([{TestNode,TestNodeInit3}],"install_7",[a]),
+
+    %% check that P1H is permanent, remove P1I and P2A
+    ok = rpc_inst(TestNode, install_8, []),
+    stop_cover(TestNode),
+    reboot_and_wait(TestNode,"install_8",[a]),
+
+    %% check that P1H is permanent, reboot old P1G
+    TestNodeInit4 = rpc:call(TestNode,erlang,whereis,[init]),
+    stop_cover(TestNode),
+    ok = rpc_inst(TestNode, install_9, []),
+    wait_nodes_up([{TestNode,TestNodeInit4}],"install_9"),
+
+    %% check that P1G is permanent, remove P1H
+    ok = rpc_inst(TestNode, install_10, []),
+    stop_cover(TestNode),
+    reboot_and_wait(TestNode,"install_10"),
+
+    %% check that P1G is permanent
+    ok = rpc_inst(TestNode, install_11, []),
+
+    ok.
+
+upgrade(cleanup,Config) ->
+    TestNode = tc_full_node_name(Config),
+    ok = stop_nodes([TestNode]).
+
+reboot_and_wait(Node,Tag) ->
+    reboot_and_wait(Node,Tag,[]).
+
+reboot_and_wait(Node,Tag,Apps) ->
+    InitPid = rpc:call(Node,erlang,whereis,[init]),
+    ok = rpc:call(Node,init,reboot,[]),
+    wait_nodes_up([{Node,InitPid}],Tag,Apps).
+
+
+%% Test upgrade and downgrade of erts, diskless
+client1(Conf) when is_list(Conf) ->
+    reg_print_proc(), %% starts a printer process on test_server node
+    PrivDir = priv_dir(Conf),
+    Master = tc_sname(Conf,master),
+    Client = tc_sname(Conf,client),
+    MasterDir = filename:join(PrivDir,Master),
+
+    %% Copy the P1G release to a directory for use in this testcase
+    ok = copy_installed(Conf,p1g_install,[Master]),
+    ok = copy_client(Conf,Master,Client,"start_cli1"),
+
+    %% start the master node
+    [TestNode] = start_nodes(Conf,[Master],"client1"),
+
+    ok = rpc_inst(TestNode, client1_1, [PrivDir,MasterDir,Client]),
+
+    ok.
+
+client1(cleanup,Config) ->
+    MasterNode = tc_full_node_name(Config,master),
+    ClientNode = tc_full_node_name(Config,client),
+    ok = stop_nodes([MasterNode,ClientNode]).
+
+
+
+%% Test diskless release handling when illegal master node
+client2(Conf) when is_list(Conf) ->
+    reg_print_proc(), %% starts a printer process on test_server node
+    PrivDir = priv_dir(Conf),
+    Master = tc_sname(Conf,master),
+    Client = tc_sname(Conf,client),
+
+    %% Copy the P1G release to a directory for use in this testcase
+    ok = copy_installed(Conf,p1g_install,[Master]),
+    ok = copy_client(Conf,Master,Client,"start_cli2"),
+
+    %% start the master node
+    [TestNode] = start_nodes(Conf,[Master],"client2"),
+
+    ok = rpc_inst(TestNode, client2, [PrivDir,Client]),
+
+    ok.
+
+client2(cleanup,Config) ->
+    MasterNode = tc_full_node_name(Config,master),
+    ClientNode = tc_full_node_name(Config,client),
+    ok = stop_nodes([MasterNode,ClientNode]).
+
+
+
+%% Test instructions _not_ tested by the installer module.
+instructions(Conf) when is_list(Conf) ->
+    DataDir = ?config(data_dir, Conf),
+
+    Dir = filename:join(DataDir, "c"),
+    true = code:add_path(Dir),
+    check_bstate("no", []),
+    ok = application:start(c),
+    ok = wait_for(bb),
+    check_bstate("first", []),
+    FirstBB = whereis(bb),
+
+    case whereis(cc) of
+        Pid when is_pid(Pid) -> ok;
+        _ -> ?t:fail("cc not started")
+    end,
+
+    %% Stop and start cc process
+    S1 = [point_of_no_return,
+          {stop, [aa]},
+          {apply, {?MODULE, no_cc, []}},
+          {start, [aa]}],
+    {ok, _} = release_handler_1:eval_script(S1, [], []),
+
+    case whereis(cc) of
+        Pid2 when is_pid(Pid2) -> ok;
+        _ -> ?t:fail("cc not started")
+    end,
+
+    %% Make bb run old version of b.
+    S2 = [point_of_no_return,
+          {remove, {b, soft_purge, soft_purge}}],
+    {ok, [{b, soft_purge}]} = release_handler_1:eval_script(S2, [], []),
+    check_bstate("first", [FirstBB]),
+
+    false = code:is_loaded(b),
+    {error,{old_processes,b}} = release_handler_1:eval_script(S2,[],[]),
+    check_bstate("first", [FirstBB]),
+
+    %% Let supervisor restart bb with new code
+    S3 = [point_of_no_return,
+          {purge, [b]}],
+    {ok, []} = release_handler_1:eval_script(S3, [], []),
+    ok = wait_for(bb),
+    check_bstate("second", []),
+    SecondBB = whereis(bb),
+
+    if
+        SecondBB =:= FirstBB -> ?t:fail("bb not killed");
+        true -> ok
+    end,
+
+    %% Restart bb yet another time
+    ok = application:stop(c),
+    ok = application:start(c),
+    ok = wait_for(bb),
+    check_bstate("third", []),
+    ThirdBB = whereis(bb),
+
+    case ThirdBB of
+        _ when is_pid(ThirdBB) -> ok;
+        undefined -> ?t:fail("bb not started")
+    end,
+
+    %% Make bb run old version of b.
+    %%c:l(b),
+    check_bstate("third", []),
+    false = code:purge(b),
+    check_bstate("third", []),
+    {module,b} = code:load_file(b),
+    check_bstate("third", [ThirdBB]),
+
+    %% Let supervisor restart bb yet another time
+    S4 = [point_of_no_return,
+          {remove, {b, brutal_purge, soft_purge}}],
+    {ok, HopefullyEmpty} = release_handler_1:eval_script(S4, [], []),
+    ok = wait_for(bb),
+    FourthBB = whereis(bb),
+
+    case HopefullyEmpty of
+	[{b, soft_purge}] ->
+	    %% The process managed to start between purge and delete
+	    check_bstate("fourth", [FourthBB]);
+	[] ->
+	    %% The process started after delete
+	    check_bstate("fourth", [])
+    end,
+
+    application:stop(c),
+    check_bstate("no", []),
+    ok.
+
+instructions(cleanup,Conf) ->
+    application:stop(c),
+    really_del_code([aa,b,c_sup]),
+    code:del_path(filename:join(?config(data_dir,Conf), "c")),
+    ok.
+
+really_del_code(Mods) ->
+    lists:foreach(fun(Mod) ->
+			  code:purge(Mod), % remove old code
+			  code:delete(Mod),% make current code old
+			  code:purge(Mod)  % remove old code
+		  end,
+		  Mods).
+
+check_bstate(Slogan,ExpectedProcs) ->
+    BB = whereis(bb),
+    ActualProcs = lists:sort([P || P <- processes(),
+				   erlang:check_process_code(P, b)]),
+    ExpectedProcs2 = lists:sort(ExpectedProcs),
+    ?t:format("check_bstate:~n~p~n~p~n",
+	      [{"bb process", Slogan, BB},
+	       {"Processes running old b code", ActualProcs}]),
+    if
+	Slogan =:= "no", BB =/= undefined ->
+	    ?t:fail("instructions failed; process bb is running");
+	Slogan =/= "no", BB =:= undefined ->
+	    ?t:fail("instructions failed; process bb is not running");
+	ExpectedProcs2 =:= [], ActualProcs =/= ExpectedProcs2 ->
+	    ?t:fail("instructions failed; old b processes are running");
+	ActualProcs =/= ExpectedProcs2 ->
+	    ?t:fail("instructions failed; wrong number of old b processes are running");
+	true ->
+	    ok
+    end.
+
+wait_for(Name) ->
+    case whereis(Name) of
+        undefined ->
+            timer:sleep(100),
+            wait_for(Name);
+        Pid when is_pid(Pid) ->
+            ok
+    end.
+
+no_cc() ->
+    case whereis(cc) of
+        Pid when is_pid(Pid) -> ?t:fail("cc not stopped");
+        _ -> ok
+    end.
+
+
+
+%%%-----------------------------------------------------------------
+%%% Testing of reported bugs and other tickets.
+%%%-----------------------------------------------------------------
+
+%%-----------------------------------------------------------------
+%% Ticket: OTP-2740
+%% Slogan: vsn not numeric doesn't work so good in release_handling
+%%-----------------------------------------------------------------
+%% Test vsn.
+otp_2740(Conf) ->
+    DataDir = ?config(data_dir, Conf),
+    Dir = filename:join(DataDir, "otp_2740"),
+    true = code:add_path(Dir),
+
+    {module, vsn_numeric} = c:l(vsn_numeric),
+    {module, vsn_tuple} = c:l(vsn_tuple),
+    {module, vsn_list} = c:l(vsn_list),
+    {module, vsn_atom} = c:l(vsn_atom),
+    {module, vsn_string} = c:l(vsn_string),
+
+    231894 = release_handler_1:get_current_vsn(vsn_numeric),
+    {tuple,["of",terms]} = release_handler_1:get_current_vsn(vsn_tuple),
+    [list,"of",{some,terms}] = release_handler_1:get_current_vsn(vsn_list),
+    atom = release_handler_1:get_current_vsn(vsn_atom),
+    "a string" = release_handler_1:get_current_vsn(vsn_string),
+
+    true = code:del_path(Dir),
+    ok.
+
+%%-----------------------------------------------------------------
+%% Ticket: OTP-2760
+%% Slogan: when an application is removed from a node it is not unloaded
+%%-----------------------------------------------------------------
+%% Test that when an application is removed from a node it is also unloaded.
+otp_2760(Conf) ->
+    PrivDir = priv_dir(Conf),
+    Dir = filename:join(PrivDir,"otp_2760"),
+    DataDir = ?config(data_dir,Conf),
+    LibDir = filename:join([DataDir,app1_app2,lib1]),
+
+    Rel1 = create_and_install_fake_first_release(Dir,[{app1,"1.0",LibDir}]),
+    Rel2 = create_fake_upgrade_release(Dir,"after",[],{Rel1,Rel1,[LibDir]}),
+    Rel2Dir = filename:dirname(Rel2),
+
+    %% Start a node with Rel1.boot and check that the app1 module is loaded
+    {ok, Node} = t_start_node(otp_2760, Rel1, []),
+    {file, _} = rpc:call(Node, code, is_loaded, [app1]),
+
+    %% Execute the relup script and check that app1 is unloaded
+    {ok, [{"after", [{_Rel1Vsn, _Descr, Script}], _}]} =
+	file:consult(filename:join(Rel2Dir, "relup")),
+    {ok, []} = rpc:call(Node, release_handler_1, eval_script,
+			      [Script, [], []]),
+    false = rpc:call(Node, code, is_loaded, [app1]),
+
+    true = stop_node(Node),
+    ok.
+
+%% Test upgrade using other filesystem than the defined in OTP and
+%% option {update_paths, true}
+otp_5761(Conf) when is_list(Conf) ->
+
+    %% In the following test case, the release upgrade is somewhat
+    %% simplified (since it is not this procedure in itself we want to
+    %% test, but that application code directories are set correctly.)
+    %% Existing Erlang release is used as base, instead of creating
+    %% a new one.
+
+    %% Set some paths
+    PrivDir = priv_dir(Conf),
+    Dir = filename:join(PrivDir,"otp_5761"),
+    RelDir = filename:join(?config(data_dir, Conf), "app1_app2"),
+    LibDir1 = filename:join(RelDir, "lib1"),
+    LibDir2 = filename:join(RelDir, "lib2"),
+
+    %% Create the releases
+    Rel1 = create_and_install_fake_first_release(Dir,
+						 [{app1,"1.0",LibDir1},
+						  {app2,"1.0",LibDir1}]),
+    Rel2 = create_fake_upgrade_release(Dir,
+				       "2",
+				       [{app1,"2.0",LibDir2},
+					{app2,"1.0",LibDir2}],
+				       {Rel1,Rel1,[LibDir1]}),
+    Rel1Dir = filename:dirname(Rel1),
+    Rel2Dir = filename:dirname(Rel2),
+    
+    %% Start a slave node
+    {ok, Node} = t_start_node(otp_5761, Rel1, filename:join(Rel1Dir,"sys.config")),
+
+    %% Bind some variable names that will be used in patternmatching below 
+    App11Dir = filename:join([LibDir1, "app1-1.0"]),
+    App12Dir = filename:join([LibDir2, "app1-2.0"]),
+    App2aDir = filename:join([LibDir1, "app2-1.0"]),
+    App2bDir = filename:join([LibDir2, "app2-1.0"]),
+
+    %% Make sure correct code paths are used
+    App11Dir = rpc:call(Node, code, lib_dir, [app1]),
+    App2aDir = rpc:call(Node, code, lib_dir, [app2]),
+
+    %% Unpack rel2 (make sure it does not work if an AppDir is bad)
+    LibDir3 = filename:join(RelDir, "lib3"),
+    {error, {no_such_directory, _}} =
+	rpc:call(Node, release_handler, set_unpacked,
+		 [Rel2++".rel", [{app1,"2.0",LibDir2}, {app2,"1.0",LibDir3}]]),
+    {ok, RelVsn2} =
+	rpc:call(Node, release_handler, set_unpacked,
+		 [Rel2++".rel", [{app1,"2.0",LibDir2}, {app2,"1.0",LibDir2}]]),
+    ok = rpc:call(Node, release_handler, install_file,
+			[RelVsn2, filename:join(Rel2Dir, "relup")]),
+    ok = rpc:call(Node, release_handler, install_file,
+			[RelVsn2, filename:join(Rel2Dir, "start.boot")]),
+    ok = rpc:call(Node, release_handler, install_file,
+			[RelVsn2, filename:join(Rel2Dir, "sys.config")]),
+
+    %% Install RelVsn2 without {update_paths, true} option
+    {ok, RelVsn1, []} =
+	rpc:call(Node, release_handler, install_release, [RelVsn2]),
+    App12Dir = rpc:call(Node, code, lib_dir, [app1]),
+    App2aDir = rpc:call(Node, code, lib_dir, [app2]),
+
+    %% Install RelVsn1 again
+    {ok, RelVsn1, []} =
+	rpc:call(Node, release_handler, install_release, [RelVsn1]),
+
+    %% Install RelVsn2 with {update_paths, true} option
+    {ok, RelVsn1, []} =
+	rpc:call(Node, release_handler, install_release,
+		 [RelVsn2, [{update_paths, true}]]),
+    App12Dir = rpc:call(Node, code, lib_dir, [app1]),
+    App2bDir = rpc:call(Node, code, lib_dir, [app2]),
+
+    %% Install RelVsn1 again
+    {ok, RelVsn1, []} =
+	rpc:call(Node, release_handler, install_release,
+		 [RelVsn1, [{update_paths, true}]]),
+    App11Dir = rpc:call(Node, code, lib_dir, [app1]),
+    App2aDir = rpc:call(Node, code, lib_dir, [app2]),
+
+    %% Stop the slave node
+    true = stop_node(Node),
+    ok.
+
+%% Test upgrade and downgrade of applications
+eval_appup(Conf) when is_list(Conf) ->
+
+    %% OTP-6162
+    %% Create an ETS table which is updated by app1 if there is any
+    %% change made to the application configuration parameter 'var'
+    %% (see config_change/3 in myrel/lib1|2/app1-1|2.0/src/app1.erl)
+    ets:new(otp_6162, [set, public, named_table]),
+
+    %% Set some paths
+    RelDir = filename:join(?config(data_dir, Conf), "app1_app2"),
+    App11Dir = filename:join([RelDir, "lib1", "app1-1.0"]),
+    App12Dir = filename:join([RelDir, "lib2", "app1-2.0"]),
+    EbinDir = filename:join(App11Dir, "ebin"),
+
+    %% Start app1-1.0
+    code:add_patha(EbinDir),
+    ok = application:start(app1),
+    App11Dir = code:lib_dir(app1),
+    ok = gen_server:call(harry, error),
+
+    %% Upgrade to app1-2.0
+    {ok, []} = release_handler:upgrade_app(app1, App12Dir),
+    App12Dir = code:lib_dir(app1),
+    error = gen_server:call(harry, error),
+
+    %% OTP-6162
+    %% Value of config parameter 'var' should now be 'val2'
+    %% (see myrel/lib2/app1-2.0/ebin/app1.app)
+    [{var,val2}] = ets:lookup(otp_6162, var),
+
+    %% Downgrade to app1-1.0
+    {ok, []} = release_handler:downgrade_app(app1,"1.0",App11Dir),
+    App11Dir = code:lib_dir(app1),
+    ok = gen_server:call(harry, error),
+
+    %% OTP-6162
+    %% Value of config parameter 'var' should now be 'val1'
+    %% (see myrel/lib1/app1-1.0/ebin/app1.app)
+    [{var,val1}] = ets:lookup(otp_6162, var),
+
+    ok = application:stop(app1),
+    ok = application:unload(app1),
+
+    true = code:del_path(EbinDir),
+    ok.
+
+
+%% Test the example/target_system.erl module
+target_system(Conf) when is_list(Conf) ->
+    PrivDir = priv_dir(Conf),
+    DataDir = ?config(data_dir,Conf),
+
+    TargetCreateDir = filename:join([PrivDir,"target_system","create"]),
+    TargetInstallDir = filename:join([PrivDir,"target_system","install"]),
+
+    ok = filelib:ensure_dir(filename:join(TargetCreateDir,"xx")),
+    ok = filelib:ensure_dir(filename:join(TargetInstallDir,"xx")),
+
+
+    %% Create the .rel file
+    ErtsVsn = erlang:system_info(version),
+    RelName = filename:join(TargetCreateDir,"ts-1.0"),
+    RelFile = RelName++".rel",
+    RelVsn = "R1A",
+    create_rel_file(RelFile,RelName,RelVsn,ErtsVsn,[{a, "1.0"}]),
+
+    %% Build the target_system module
+    ExamplesEbin = filename:join([code:lib_dir(sasl),examples,ebin]),
+    TSPath =
+	case filelib:is_file(filename:join(ExamplesEbin,"target_system.beam")) of
+	    true ->
+		ExamplesEbin;
+	    false ->
+		{ok,_} =
+		    compile:file(filename:join(DataDir,"target_system.erl"),
+				 [{outdir,TargetCreateDir}]),
+		TargetCreateDir
+    end,
+    code:add_path(TSPath),
+
+    %% Create the release
+    target_system:create(RelName,[{path,[filename:join([DataDir,
+							lib,
+							"a-1.0",
+							ebin])]}]),
+
+    %% Install the release
+    target_system:install(RelName,TargetInstallDir),
+
+    code:del_path(TSPath),
+
+    %% Check that all files exist in installation
+    true = filelib:is_dir(filename:join(TargetInstallDir,"erts-"++ErtsVsn)),
+    LibDir = filename:join(TargetInstallDir,lib),
+    {ok,KernelVsn} = application:get_key(kernel,vsn),
+    {ok,StdlibVsn} = application:get_key(stdlib,vsn),
+    {ok,SaslVsn} = application:get_key(sasl,vsn),
+    true = filelib:is_dir(filename:join(LibDir,"kernel-"++KernelVsn)),
+    true = filelib:is_dir(filename:join(LibDir,"stdlib-"++StdlibVsn)),
+    true = filelib:is_dir(filename:join(LibDir,"sasl-"++SaslVsn)),
+    true = filelib:is_dir(filename:join(LibDir,"a-1.0")),
+    RelDir = filename:join(TargetInstallDir,releases),
+    true = filelib:is_regular(filename:join(RelDir,"RELEASES")),
+    true = filelib:is_regular(filename:join(RelDir,"start_erl.data")),
+    true = filelib:is_regular(filename:join(RelDir,
+						  filename:basename(RelFile))),
+    true = filelib:is_dir(filename:join(RelDir,RelVsn)),
+    true = filelib:is_regular(filename:join([RelDir,RelVsn,"start.boot"])),
+    BinDir = filename:join(TargetInstallDir,bin),
+    true = filelib:is_regular(filename:join(BinDir,"start.boot")),
+    true = filelib:is_regular(filename:join(BinDir,erl)),
+    true = filelib:is_regular(filename:join(BinDir,start_erl)),
+    true = filelib:is_regular(filename:join(BinDir,start)),
+    true = filelib:is_regular(filename:join(BinDir,epmd)),
+    true = filelib:is_regular(filename:join(BinDir,run_erl)),
+    true = filelib:is_regular(filename:join(BinDir,to_erl)),
+
+    %% Check content of files
+    {ok,SED} = file:read_file(filename:join(RelDir,"start_erl.data")),
+    [ErtsVsn,RelVsn] = string:tokens(binary_to_list(SED),"\s\n"),
+    ok.
+
+
+
+%%%=================================================================
+%%% Testing global groups.
+%%%=================================================================
+
+%% This test case involves P1G and P1H with the sys.config as
+%% specified in gg_config/1. The test case checks that the global
+%% group information is correct before and after the upgrade and also
+%% after terminating one of the nodes. The flow is as follows:
+%% 1. Start all four nodes of global group gg1 with P1G
+%% 2. Terminate one of the nodes, and upgrade the others to P1H. P1H
+%%    config adds to more nodes to the global group.
+%% 3. Start the two remaining nodes with P1H
+upgrade_gg(Conf) ->
+    [Gg1Sname,Gg2Sname,Gg3Sname,Gg4Sname,Gg5Sname,Gg6Sname] =
+	?config(snames,Conf),
+
+    %% start gg1, gg3, gg4, gg5 and check that global group info is ok
+    Nodes1 = [Gg1,Gg3,Gg4,Gg5] =
+	start_nodes(Conf,[Gg1Sname,Gg3Sname,Gg4Sname,Gg5Sname],"upgrade_gg"),
+
+    %% Give some time to synch nodes, then check global group info.
+    timer:sleep(1000),
+    [check_gg_info(Node,Nodes1,[],Nodes1--[Node]) || Node <- Nodes1],
+
+    %% register a process on each of the nodes
+    ok = rpc:call(Gg1, installer, reg_proc, [reg1]),
+    ok = rpc:call(Gg3, installer, reg_proc, [reg3]),
+    ok = rpc:call(Gg4, installer, reg_proc, [reg4]),
+    ok = rpc:call(Gg5, installer, reg_proc, [reg5]),
+    are_names_reg_gg(Gg1, [reg1, reg3, reg4, reg5]),
+
+    %% Stop gg3, then upgrade gg1, gg4 and gg5 to P1H
+    ok = stop_nodes([Gg3]),
+
+    ok = install_release_changed_gg(Gg1,"P1H"),
+    ok = install_release_changed_gg(Gg4,"P1H"),
+    ok = install_release_changed_gg(Gg5,"P1H"),
+
+    %% Check global group info
+    Gg2 = node_name(Gg2Sname),
+    Gg6 = node_name(Gg6Sname),
+    Nodes2 = [Gg1,Gg4,Gg5],
+    [check_gg_info(Node,Nodes2,[Gg2,Gg6],Nodes2--[Node]) || Node <- Nodes2],
+
+    %% start gg2 and gg6
+    [Gg2,Gg6] = start_nodes(Conf,[Gg2Sname,Gg6Sname],"upgrade_gg start gg2/gg6"),
+
+    %% reg proc on each of the nodes
+    ok = rpc:call(Gg2, installer, reg_proc, [reg2]),
+    ok = rpc:call(Gg6, installer, reg_proc, [reg6]),
+    are_names_reg_gg(Gg1, [reg1, reg2, reg4, reg5, reg6]),
+
+    %% Check global group info
+    Nodes3 = [Gg1,Gg2,Gg4,Gg5,Gg6],
+    [check_gg_info(Node,Nodes3,[],Nodes3--[Node]) || Node <- Nodes3],
+
+    ok.
+
+upgrade_gg(cleanup,Config) ->
+    Snames = ?config(snames,Config),
+    NodeNames = [node_name(Sname) || Sname <- Snames],
+    ok = stop_nodes(NodeNames).
+
+
+
+
+%%%=================================================================
+%%% Misceleaneous functions
+%%%=================================================================
+stop_nodes(Nodes) ->
+    ?t:format("Stopping nodes: ~p~n",[Nodes]),
+    Running = 
+	lists:foldl(fun(Node,Acc) -> 
+			    Now = now(),
+			    stop_cover(Node),
+			    case rpc:call(Node,installer,stop,[Now]) of
+				{badrpc,nodedown} ->
+				    Acc;
+				Other ->
+				    ?t:format("Stop ~p(~p): ~p~n",
+					      [Node,Now,Other]),
+				    [Node|Acc]
+			    end
+		    end, [], Nodes),
+    wait_nodes_down(Running).
+
+
+wait_nodes_down(Nodes) ->
+    ?t:format( "wait_nodes_down ~p:",[Nodes]),
+    wait_nodes_down(Nodes, 30).
+
+wait_nodes_down(Nodes, 0) ->
+    test_server:fail({error, {"could not kill nodes", Nodes}});
+wait_nodes_down(Nodes, N) ->
+    Fun = fun(Node, A) ->
+		  case net_adm:ping(Node) of
+		      pong ->
+			  ?t:format( "  net_adm:ping(~p) = pong", [Node]),
+			  [Node|A];
+		      pang ->
+			  ?t:format( "  net_adm:ping(~p) = pang", [Node]),
+			  A
+		  end
+	  end,
+    Pang = lists:foldl(Fun, [], Nodes),
+    case Pang of
+	[] -> 
+	    ?t:format("",[]),
+	    ok;
+	_ ->
+	    timer:sleep(1000),
+	    wait_nodes_down(Pang, N-1)
+    end.
+
+
+
+wait_nodes_up(Nodes, Tag) ->
+    wait_nodes_up(Nodes, Tag, []).
+
+wait_nodes_up(Nodes0, Tag, Apps) ->
+    ?t:format("wait_nodes_up(~p, ~p, ~p):",[Nodes0, Tag, Apps]),
+    Nodes = fix_nodes(Nodes0),
+    wait_nodes_up(Nodes, Tag, lists:umerge(Apps,[kernel,stdlib,sasl]), 30).
+
+fix_nodes([{Node,InitPid}|Nodes]) ->
+    [{Node,InitPid} | fix_nodes(Nodes)];
+fix_nodes([Node|Nodes]) ->
+    [{Node,fake_init_pid} | fix_nodes(Nodes)];
+fix_nodes([]) ->
+    [].
+
+wait_nodes_up(Nodes, Tag, Apps, 0) ->
+    test_server:fail({error, {"nodes not started", Nodes, Tag, Apps}});
+wait_nodes_up(Nodes, Tag, Apps, N) ->
+    Fun = 
+	fun(NodeInfo={Node,OldInitPid}, A) ->
+		case rpc:call(Node, application, which_applications, []) of
+		    {badrpc, nodedown} ->
+			?t:format( "  ~p = {badarg, nodedown}",[Node]),
+			[NodeInfo | A];
+		    List when is_list(List)->
+			?t:format( "  ~p = [~p]",[Node, List]),
+			case lists:all(fun(App) -> 
+					       lists:keymember(App,1,List) 
+				       end, Apps) of
+			    true ->
+				case rpc:call(Node,erlang,whereis,[init]) of
+				    OldInitPid ->
+					[NodeInfo | A];
+				    _ ->
+					start_cover(Node),
+					A
+				end;
+			    false ->
+				[NodeInfo | A]
+			end
+		end
+	end,
+    Pang = lists:foldl(Fun,[],Nodes),
+    case Pang of
+	[] ->
+	    ?t:format("",[]),
+	    ok;
+	_ ->
+	    timer:sleep(1000),
+	    wait_nodes_up(Pang, Tag, Apps, N-1)
+    end.
+
+
+
+
+are_names_reg_gg(Node, Names) ->
+    ?t:format( "are_names_reg_gg ~p~n",[Names]),
+    are_names_reg_gg(Node, Names, 30).
+
+are_names_reg_gg(Node, Names, N) ->
+    case lists:sort(rpc:call(Node, global, registered_names, [])) of
+	Names ->
+	    ok;
+	Regs when N > 0 ->
+	    timer:sleep(1000),
+	    ?t:format( "are_names_reg_gg Regs ~p~n",[Regs]),
+	    are_names_reg_gg(Node, Names, N-1);
+	Regs ->
+	    ?t:fail({error, {"Names not registered",
+			     {{"should :", Names},
+			      {"was :", Regs}}}})
+    end.
+
+
+
+t_start_node(Name, Boot, SysConfig) ->
+    Args = 
+	case Boot of
+	    [] -> [];
+	    _ -> " -boot " ++ Boot
+	end ++
+	case SysConfig of
+	    [] -> [];
+	    _ -> " -config " ++ SysConfig
+	end,
+    test_server:start_node(Name, slave, [{args, Args}]).
+
+stop_node(Node) ->
+    ?t:stop_node(Node).
+
+
+copy_client(Conf,Master,Sname,StartScript) ->
+    io:format("copy_client(Conf)"),
+
+    DataDir = ?config(data_dir, Conf),
+    MasterDir = filename:join(priv_dir(Conf),Master),
+
+    {ok,Host} = inet:gethostname(),
+    {ok,IpTuple} = inet:getaddr(Host,inet),
+    IpAddr =  inet_parse:ntoa(IpTuple),
+
+    CliNode = node_name(Sname),
+
+    Cli = filename:join([MasterDir, "clients", "type1", CliNode]),
+    ok = filelib:ensure_dir(filename:join([Cli,"bin","."])),
+    ok = filelib:ensure_dir(filename:join([Cli,"releases","."])),
+    ok = filelib:ensure_dir(filename:join([Cli,"log","."])),
+
+    P1GOrig = filename:join([MasterDir, "releases", "P1G"]),
+    ok = copy_tree(Conf,P1GOrig,filename:join(Cli,"releases")),
+    
+    ok = subst_file(filename:join([DataDir, "clients", StartScript]),
+		    filename:join([Cli,"bin","start"]),
+		    [{"ROOT",MasterDir},
+		     {"MASTER",atom_to_list(Master)},
+		     {"IPADDR",IpAddr}],
+		    [{chmod,8#0755}]),
+    
+    StartErlData = filename:join([MasterDir, "releases", "start_erl.data"]),
+    CliRelDir = filename:join([Cli, "releases"]),
+    copy_file(StartErlData, CliRelDir),
+    
+    RR = filename:join([MasterDir, "releases", "RELEASES"]),
+    copy_file(RR, CliRelDir),
+
+    ok.
+
+
+delete_release(Conf) ->
+    PrivDir = priv_dir(Conf),
+
+    {ok, OrigWd} = file:get_cwd(),
+
+    ok = file:set_cwd(PrivDir),
+    ?t:format("========  current dir ~p~n",[PrivDir]),
+    {ok, Dirs} = file:list_dir(PrivDir),
+    ?t:format("========  deleting  ~p~n",[Dirs]),
+
+    ok = delete_release_os(Dirs),
+    ?t:format("========  remaining  ~p~n",[file:list_dir(PrivDir)]),
+    ok = file:set_cwd(OrigWd),
+    ok.
+
+
+delete_release_os(Dirs) ->
+    case os:type() of
+	      {unix, _} ->
+		  delete_release_unix(Dirs);
+	      {win32, _} ->
+		  delete_release_win32(Dirs);
+	      Os ->
+		  test_server:fail({error, {not_yet_implemented_os, Os}})
+	  end.
+
+
+delete_release_unix([]) ->
+    ok;
+delete_release_unix(["save"|Dirs]) ->
+    delete_release_unix(Dirs);
+delete_release_unix([Dir|Dirs]) ->
+    Rm = string:concat("rm -rf ", Dir),
+    ?t:format("============== COMMAND ~p~n",[Rm]),
+    case file:list_dir(Dir) of
+	{error, enotdir} ->
+	    ok;
+	X ->
+	    ?t:format("------- Dir ~p~n       ~p~n",[Dir, X])
+    end,
+    case os:cmd(Rm) of
+	      [] ->
+		  ?t:format("------- Result of COMMAND ~p~n",[ok]);
+	      Y ->
+		  ?t:format("!!!!!!! delete ERROR  Dir ~p Error ~p~n",[Dir, Y]),
+		  ?t:format("------- ls -al  ~p~n",[os:cmd("ls -al " ++ Dir)])
+	  end,
+
+    delete_release_unix(Dirs).
+
+delete_release_win32([]) ->
+    ok;
+delete_release_win32(["save"|Dirs]) ->
+    delete_release_win32(Dirs);
+delete_release_win32([Dir|Dirs]) ->
+    Rm = string:concat("rmdir /s ", Dir),
+    [] = os:cmd(Rm),
+    delete_release_win32(Dirs).
+
+
+node_name(Sname) when is_atom(Sname) ->
+    {ok,Host} = inet:gethostname(),
+    list_to_atom(atom_to_list(Sname) ++ "@" ++ Host).
+
+copy_file(Src, Dest) ->
+    copy_file(Src, Dest, []).
+copy_file(Src, Dest, Opts) ->
+    case file:copy(Src,Dest) of
+	{ok,_} ->
+	    preserve(Src,Dest,Opts),
+	    chmod(Dest,Opts),
+	    ok;
+	{error,eisdir} ->
+	    NewDest = filename:join(Dest, filename:basename(Src)),
+	    case file:copy(Src,NewDest) of
+		{ok,_} -> 
+		    preserve(Src,NewDest,Opts),
+		    chmod(NewDest,Opts);
+		{error,Reason} -> 
+		    copy_error(Src,Dest,Reason)
+	    end;
+	{error,Reason} ->
+	    copy_error(Src,Dest,Reason)
+    end.
+
+preserve(Src,Dest,Opts) ->
+    case lists:member(preserve, Opts) of
+	true ->
+	    {ok, FileInfo} = file:read_file_info(Src),
+	    ok = file:write_file_info(Dest, FileInfo);
+	false ->
+	    ok
+    end.
+
+chmod(Dest,Opts) ->
+    case lists:keyfind(chmod,1,Opts) of
+	{chmod,Mode} ->
+	    ok = file:change_mode(Dest, Mode);
+	false ->
+	    ok
+    end.
+
+
+
+copy_error(Src, Dest, Reason) ->
+    io:format("Copy ~s to ~s failed: ~s\n",
+	      [Src,Dest,file:format_error(Reason)]),
+    ?t:fail(file_copy_failed).
+
+copy_tree(Conf, Src, DestDir) ->
+    case catch copy_tree(Conf, Src, filename:basename(Src), DestDir) of
+	ok ->
+	    ok;
+	{'EXIT', {{badmatch,Error},_Stack}} ->
+	    %% Most probably, an erl_tar call has failed.
+	    %% Known to happen on some platforms (symbolic_link_too_long)
+	    Error;
+	{'EXIT', Reason} ->
+	    {error, Reason}
+    end.
+
+copy_tree(Conf, Src, NewName, DestDir) ->
+    PrivDir = priv_dir(Conf),
+    TempTarName = filename:join(PrivDir, "temp_tar_file.tar"),
+    %% Not compressing tar file here since that would increase test
+    %% suite time by almost 100%, and the tar file is deleted
+    %% imediately anyway.
+    {ok,Tar} = erl_tar:open(TempTarName, [write]),
+    ok = erl_tar:add(Tar, Src, NewName, []),
+    ok = erl_tar:close(Tar),
+    ok = erl_tar:extract(TempTarName, [{cwd,DestDir}]),
+    ok = file:delete(TempTarName),
+    ok.
+
+%% subst_file(Src, Dest, Vars)
+%% Src = Dest = string(), filename and path
+%% Vars = [{Var, Val}]
+%% Var = Val = string()
+%% Substitute all occurrences of %Var% for Val in Src, using the list
+%% of variables in Vars. Result is written to Dest.
+%%
+subst_file(Src, Dest, Vars) ->
+    subst_file(Src, Dest, Vars, []).
+subst_file(Src, Dest, Vars, Opts) ->
+    {ok, Bin} = file:read_file(Src),
+    Conts = binary_to_list(Bin),
+    NConts = subst(Conts, Vars),
+    ok = file:write_file(Dest, NConts),
+    preserve(Src,Dest,Opts),
+    chmod(Dest,Opts).
+
+subst(Str, Vars) ->
+    subst(Str, Vars, []).
+
+subst([$%, C| Rest], Vars, Result) when $A =< C, C =< $Z ->
+    subst_var([C| Rest], Vars, Result, []);
+subst([$%, C| Rest], Vars, Result) when $a =< C, C =< $z ->
+    subst_var([C| Rest], Vars, Result, []);
+subst([$%, C| Rest], Vars, Result) when  C == $_ ->
+    subst_var([C| Rest], Vars, Result, []);
+subst([C| Rest], Vars, Result) ->
+    subst(Rest, Vars, [C| Result]);
+subst([], _Vars, Result) ->
+    lists:reverse(Result).
+
+subst_var([$%| Rest], Vars, Result, VarAcc) ->
+    Key = lists:reverse(VarAcc),
+    case lists:keysearch(Key, 1, Vars) of
+        {value, {Key, Value}} ->
+            subst(Rest, Vars, lists:reverse(Value, Result));
+        false ->
+            subst(Rest, Vars, [$%| VarAcc ++ [$%| Result]])
+    end;
+subst_var([C| Rest], Vars, Result, VarAcc) ->
+    subst_var(Rest, Vars, Result, [C| VarAcc]);
+subst_var([], Vars, Result, VarAcc) ->
+    subst([], Vars, [VarAcc ++ [$%| Result]]).
+
+
+priv_dir(Conf) ->
+    filename:absname(?config(priv_dir, Conf)). % Get rid of trailing slash
+
+latest_version(Dir) ->
+    List = filelib:wildcard(Dir ++ "*"),
+    lists:last(lists:sort(List)).
+
+%% A printer process which receives messages from other nodes and
+%% prints in the log
+reg_print_proc() ->
+    catch unregister(rh_print),
+    Pid = spawn_link(?MODULE, rh_print, []),
+    register(rh_print, Pid),
+    ok.
+
+rh_print() ->
+    receive
+	{print, {Module,Line}, [H|T]} ->
+	    ?t:format("=== ~p:~p - ~p",[Module,Line,H]),
+	    lists:foreach(fun(Term) -> ?t:format("    ~p",[Term]) end, T),
+	    ?t:format("",[]),
+	    rh_print();
+	kill ->
+	    exit(normal)
+    end.
+
+stop_print_proc() ->
+    case whereis(rh_print) of %%removes the printer process
+	undefined ->
+	    ok;
+	Pid when is_pid(Pid) ->
+	    rh_print ! kill
+    end.
+
+%% Create the first target release, vsn P1G. This release is used for
+%% all test cases in {group,release}
+create_p1g(Conf,Sname) ->
+    do_create_p1g(Conf,filename:join(priv_dir(Conf),Sname)).
+
+do_create_p1g(Conf,TargetDir) ->
+    PrivDir = priv_dir(Conf),
+    DataDir = ?config(data_dir,Conf),
+    ErtsVsn = "4.4",
+    ErtsDir = "erts-"++ErtsVsn,
+
+    %% Create dirs
+    BinDir = filename:join(TargetDir,bin),
+    ReleasesDir = filename:join(TargetDir,releases),
+    LogDir = filename:join(TargetDir,log),
+    ok = filelib:ensure_dir(filename:join(BinDir,"*")),
+    ok = filelib:ensure_dir(filename:join(ReleasesDir,"*")),
+    ok = filelib:ensure_dir(filename:join(LogDir,"*")),
+
+    %% Copy stuff 
+    ErtsLatest = latest_version(filename:join(code:root_dir(),"erts")),
+    ok = copy_tree(Conf, ErtsLatest, ErtsDir, TargetDir),
+    ErtsBinDir = filename:join([TargetDir,ErtsDir,bin]),
+    copy_file(filename:join([ErtsBinDir, "epmd"]), BinDir, [preserve]),
+    copy_file(filename:join([ErtsBinDir, "run_erl"]), BinDir, [preserve]),
+    copy_file(filename:join([ErtsBinDir, "to_erl"]), BinDir, [preserve]),
+
+    copy_file(filename:join(DataDir, "../installer.beam"),
+	      filename:join([DataDir,lib,"installer-1.0",ebin])),
+
+    %% Create .rel, .script and .boot files
+    RelName = "rel0",
+    RelVsn = "P1G",
+    RelDir = filename:join(PrivDir,RelName),
+    RelFileName = filename:join(RelDir,RelName),
+    RelFile = RelFileName ++ ".rel",
+    ok = filelib:ensure_dir(RelFile),
+    LibPath = filename:join([DataDir,lib,"*",ebin]),
+
+    TarFile = create_basic_release(RelFile, RelVsn, {ErtsVsn,false},
+				   LibPath, [], [], [], []),
+
+    %% Extract tar file in target directory (i.e. same directory as erts etc.)
+    ok = erl_tar:extract(TarFile, [{cwd, TargetDir}, compressed]),
+
+    %% Create start_erl.data
+    StartErlDataFile = filename:join([ReleasesDir, "start_erl.data"]),
+    StartErlData = io_lib:fwrite("~s ~s~n", [ErtsVsn, RelVsn]),
+    ok = file:write_file(StartErlDataFile, StartErlData),
+
+    %% Create RELEASES
+    ok = release_handler:create_RELEASES(TargetDir,ReleasesDir,RelFile,[]),
+
+    %% Create start_erl
+    ok = subst_file(filename:join([ErtsBinDir,"start_erl.src"]),
+		    filename:join([BinDir,"start_erl"]),
+		    [{"EMU","beam"}],
+		    [{chmod,8#0755}]),
+    
+    %% Create start script
+    %% Using a customized start script from DataDir where some options
+    %% (heart and nodename) are added compared to the start.src in the
+    %% erlang distribution.
+    ok = subst_file(filename:join(DataDir, "start"),
+		    filename:join([BinDir, "start"]),
+		    [{"ROOT",TargetDir}],
+		    [preserve]),
+    ok.
+
+%% Create version P1H - which is P1G + a-1.0
+%% Must have run create_p1g first!!
+create_p1h(Conf) ->
+    create_upgrade_release(Conf,"rel1","P1H",{"4.4",false},[{a,"1.0"}],
+			   [{a,[{key2,val2}]}],{"rel0",[new_appl]}).
+
+%% Create version P1I - which is P1H, but with application a upgraded to a-1.1
+%% Must have run create_p1h first!!
+create_p1i(Conf) ->
+    create_upgrade_release(Conf,"rel2","P1I",{"4.4",false},[{a,"1.1"}],
+			   [{a,[{key2,newval2}]}],
+			   {"rel1",[{extra,gott}]}).
+
+%% Create version P2A - which is P1I, but with erts-<latest>
+%% Must have run create_p1i first!!
+create_p2a(Conf) ->
+    ErtsVsn = erlang:system_info(version),
+    create_upgrade_release(Conf,"rel3","P2A",{ErtsVsn,code:root_dir()},
+			   [{a,"1.1"}],[{a,[{key2,newval2}]}],
+			   {"rel2",[new_emu]}).
+
+%% Create a release tar package which can be installed on top of P1G
+create_upgrade_release(Conf,RelName,RelVsn,Erts,Apps,Config,{UpFromName,Descr}) ->
+    PrivDir = priv_dir(Conf),
+    DataDir = ?config(data_dir,Conf),
+
+    RelDir = filename:join(PrivDir,RelName),
+    RelFileName = filename:join(RelDir,RelName),
+    RelFile = RelFileName ++ ".rel",
+    ok = filelib:ensure_dir(RelFile),
+    LibPath = filename:join([DataDir,lib,"*",ebin]),
+
+    UpFrom = [{filename:join([PrivDir,UpFromName,UpFromName]),Descr}],
+
+    create_basic_release(RelFile, RelVsn, Erts, LibPath,
+			 Apps, Config, UpFrom, []),
+    ok.
+
+%% Create .rel, .script, .boot, sys.config and tar
+create_basic_release(RelFile,RelVsn,{ErtsVsn,ErtsDir},LibPath,ExtraApps,Config,UpFrom,DownTo) ->
+    RelDir = filename:dirname(RelFile),
+    RelFileName = filename:rootname(RelFile),
+
+    %% Create .rel file
+    create_installer_rel_file(RelFile,RelVsn,ErtsVsn,ExtraApps),
+
+    %% Generate .script and .boot
+    ok = systools:make_script(RelFileName,
+			      [{path,[LibPath]},
+			       {outdir,RelDir}]),
+
+    %% Generate relup
+    ok = systools:make_relup(RelFileName,UpFrom,DownTo,[{path,[LibPath]},
+							      {outdir,RelDir}]),
+
+    %% Create sys.config
+    ok = write_term_file(filename:join(RelDir,"sys.config"),Config),
+
+
+    %% Create tar file (i.e. collect all lib/app-*/* and system files)
+    ok = systools:make_tar(RelFileName,
+			   [{path,[LibPath]},
+			    {outdir,RelDir} |
+			    case ErtsDir of
+				false -> [];
+				_ -> [{erts,ErtsDir}]
+			    end]),
+    
+    RelFileName ++ ".tar.gz".
+
+%% Create a .rel file
+create_installer_rel_file(RelFile,RelVsn,ErtsVsn,ExtraApps) ->
+    create_rel_file(RelFile,"SASL-test",RelVsn,ErtsVsn,
+		    [{installer,"1.0"}|ExtraApps]).
+
+create_rel_file(RelFile,RelName,RelVsn,ErtsVsn,ExtraApps) ->
+    {ok,KernelVsn} = application:get_key(kernel,vsn),
+    {ok,StdlibVsn} = application:get_key(stdlib,vsn),
+    {ok,SaslVsn} = application:get_key(sasl,vsn),
+    application:load(tools),
+    {ok,ToolsVsn} = application:get_key(tools,vsn),
+    application:load(runtime_tools),
+    {ok,RuntimeToolsVsn} = application:get_key(runtime_tools,vsn),
+    
+    RelFileContent = {release,
+		      {RelName, RelVsn},
+		      {erts, ErtsVsn},
+		      [{kernel, KernelVsn},
+		       {stdlib, StdlibVsn},
+		       {sasl, SaslVsn},
+		       {runtime_tools, RuntimeToolsVsn},
+		       {tools, ToolsVsn} |
+		       ExtraApps]},
+    ok = write_term_file(RelFile,RelFileContent).
+
+%% Insert a term in a file, which can be read with file:consult/1.
+write_term_file(File,Term) ->
+    ok = file:write_file(File,io_lib:format("~p.~n",[Term])).
+    
+
+%% Check that global group info is correct
+check_gg_info(Node,OtherAlive,OtherDead,Synced) ->
+    GGI = rpc:call(Node, global_group, info, []),
+    GI = rpc:call(Node, global, info,[]),
+    try do_check_gg_info(OtherAlive,OtherDead,Synced,GGI,GI) 
+    catch _:E ->
+	    ?t:format("~ncheck_gg_info failed for ~p: ~p~nwhen GGI was: ~p~n"
+		      "and GI was: ~p~n",
+		      [Node,E,GGI,GI]),
+	    ?t:fail("check_gg_info failed")
+    end.
+
+do_check_gg_info(OtherAlive,OtherDead,Synced,GGI,GI) ->
+    {_,gg1} = lists:keyfind(own_group_name,1,GGI),
+    {_,synced} = lists:keyfind(state,1,GGI),
+    {_,AllNodes} = lists:keyfind(own_group_nodes,1,GGI),
+    true = lists:sort(AllNodes) =:= lists:sort(OtherAlive++OtherDead),
+    {_,[]} = lists:keyfind(sync_error,1,GGI),
+    {_,[{gg2,[_,_]}]} = lists:keyfind(other_groups,1,GGI),
+
+    %% There is a known bug in global_group (OTP-9177) which causes
+    %% the following to fail every now and then:
+    %% {_,SyncedNodes} = lists:keyfind(synced_nodes,1,GGI),
+    %% true = lists:sort(SyncedNodes) =:= lists:sort(Synced),
+    %% {_,NoContact} = lists:keyfind(no_contact,1,GGI),
+    %% true = lists:sort(NoContact) =:= lists:sort(OtherDead),
+
+    %% Therefore we use global:info instead for this part
+    {state,_,_,SyncedNodes,_,_,_,_,_,_,_} = GI,
+    true = lists:sort(SyncedNodes) =:= lists:sort(Synced),
+
+    %% .. and we only check that all OtherDead are listed as
+    %% no_contact (due to th bug there might be more nodes in this
+    %% list)
+    {_,NoContact} = lists:keyfind(no_contact,1,GGI),
+    true =
+	lists:sort(OtherDead) =:=
+	lists:sort([NC || NC <- NoContact,lists:member(NC,OtherDead)]),
+
+    ok.
+
+%% Return the configuration (to be inserted in sys.config) for global group tests
+gg_config(Snames) ->
+    Nodes = [node_name(Sname) || Sname <- Snames],
+    [{kernel, [{sync_nodes_optional, Nodes},
+	       {sync_nodes_timeout, 10000},
+	       {global_groups, 
+		[{gg1, Nodes},
+		 {gg2, [node_name(Sname) || Sname <- [ggq,ggw]]}]}]},
+     {a, [{key2, val2}]}].
+
+%% Start a node with short name SnameStr, and unpack P1H
+unpack_p1h(Conf,Sname) ->
+    PrivDir = priv_dir(Conf),
+    [Node] = start_nodes(Conf,[Sname],"create_p1h"),
+    ok = rpc_inst(Node, unpack_p1h, [PrivDir]),
+    Node.
+
+%% On the given node, install P1H and make it permanent
+%% This function is to be called after unpack_p1h/2, with the same node.
+permanent_p1h(Node) ->
+    ok = rpc_inst(Node, permanent_p1h, []).
+
+%% For each node in ToNodes, create a target installation which is
+%% indentical to the target installation for FromNode.
+copy_installed(Conf,FromNode,ToNodes) ->
+    PrivDir = priv_dir(Conf),
+    DataDir = ?config(data_dir,Conf),
+    lists:foreach(
+      fun(Node) ->
+	      ok = copy_tree(Conf,filename:join(PrivDir,FromNode),Node,PrivDir),
+	      NodeDir = filename:join(PrivDir,Node),
+	      ok = subst_file(filename:join(DataDir, "start"),
+			      filename:join([NodeDir, "bin", "start"]),
+			      [{"ROOT",NodeDir}]),
+	      LogDir = filename:join(NodeDir,log),
+	      {ok,Logs} = file:list_dir(LogDir),
+	      lists:foreach(fun(Log) ->
+				    file:delete(filename:join(LogDir,Log))
+			    end,
+			    Logs)
+      end,
+      ToNodes).
+
+start_nodes(Conf,Snames,Tag) ->
+    PrivDir = priv_dir(Conf),
+    Nodes = 
+	lists:map(
+	  fun(Sname) ->
+		  NodeDir = filename:join(PrivDir,Sname),
+		  Node = node_name(Sname),
+		  
+		  Script = filename:join([NodeDir,"bin","start"]),
+		  Cmd = "env NODENAME="++atom_to_list(Sname) ++ " " ++ Script,
+		  %% {ok,StartFile} = file:read_file(Cmd),
+		  %% io:format("~s:\n~s~n~n",[Start,binary_to_list(StartFile)]),
+		  Res = os:cmd(Cmd),
+		  io:format("Start ~p: ~p~n=>\t~p~n", [Sname,Cmd,Res]),
+		  Node
+	  end,
+	  Snames),
+    wait_nodes_up(Nodes,Tag),
+    Nodes.
+    
+tc_sname(Config) ->
+    tc_sname(Config,"").
+tc_sname(Config,Fix) when is_atom(Fix) ->
+    tc_sname(Config,atom_to_list(Fix));
+tc_sname(Config,Fix) when is_list(Fix) ->
+    list_to_atom(
+      atom_to_list(?MODULE)
+      ++ "-" ++ atom_to_list(?config(sname_prefix, Config)) ++
+	  case Fix of
+	      "" -> "";
+	      _ -> "-" ++ Fix
+	  end).
+
+tc_full_node_name(Config) ->
+    tc_full_node_name(Config,"").
+tc_full_node_name(Config,Fix) ->
+    node_name(tc_sname(Config,Fix)).
+
+
+%% When installing a release for which the sys.config includes added
+%% or changed global group(s), this node (test_sever@host) will be
+%% disconnected from the test node (Node) by global_group.erl. This
+%% will cause the rpc:call to terminate with {badrpc,nodedown} even if
+%% the installation succeeds. This function installs the release,
+%% accepts the faulty return value and then checks if the release was
+%% successfully installed.
+install_release_changed_gg(Node,RelVsn) ->
+    stop_cover(Node),
+    {badrpc,nodedown} = rpc:call(Node,release_handler,install_release,[RelVsn]),
+    timer:sleep(100),
+    wait_installed(Node,RelVsn,4).
+
+wait_installed(Node,RelVsn,0) ->
+    ?t:fail("install_release_changed_gg failed for " ++ RelVsn ++ 
+	    " on " ++ atom_to_list(Node));
+wait_installed(Node,RelVsn,N) ->
+    Rels = rpc:call(Node,release_handler,which_releases,[]),
+    case lists:keyfind(RelVsn, 2, Rels) of
+	{"SASL-test", RelVsn, _Libs, current} -> 
+	    start_cover(Node),
+	    ok;
+	_ -> 
+	    timer:sleep(500),
+	    wait_installed(Node,RelVsn,N-1)
+    end.
+
+%% Start/stop cover measurements on the given node
+start_cover(Node) ->
+    cover_fun(Node,start).
+stop_cover(Node) ->
+    cover_fun(Node,stop).
+
+cover_fun(Node,Func) ->
+    case ?t:is_cover() of
+	true ->
+	    cover:Func(Node);
+	false ->
+	    ok
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Create a fake release ....
+
+%% This function will create and install a release build on the
+%% current running OTP release. It includes kernel, stdlib and sasl,
+%% and possibly other applications if they are listed in AppDirs =
+%% [{App,Vsn,LibDir}]
+create_and_install_fake_first_release(Dir,AppDirs) ->
+    %% Create the first release
+    {RelName,RelVsn} = init:script_id(),
+    {Rel,_} = create_fake_release(Dir,RelName,RelVsn,AppDirs),
+    ReleasesDir = filename:join(Dir, "releases"),
+    RelDir = filename:dirname(Rel),
+
+    %% And install it
+    RelVsnDir = filename:join(ReleasesDir, RelVsn),
+    ok = filelib:ensure_dir(filename:join(RelVsnDir,"*")),
+
+    ok = copy_file(Rel++".rel",RelVsnDir),
+    ok = copy_file(Rel++".boot",filename:join(RelVsnDir, "start.boot")),
+    ok = copy_file(filename:join(RelDir,"sys.config"),RelVsnDir),
+
+    ok = release_handler:create_RELEASES(code:root_dir(),
+					 ReleasesDir,
+					 Rel++".rel",
+					 AppDirs),
+
+    Rel.
+    
+%% This function create a new release, including a relup file. It can
+%% be upgraded to from the release created by
+%% create_and_install_fake_first_release/2. Unpack first by calls to
+%% release_handler:set_unpacked and release_handler:install_file.
+create_fake_upgrade_release(Dir,RelVsn,AppDirs,{UpFrom,DownTo,ExtraLibs}) ->
+    %% Create a new release
+    {RelName,_} = init:script_id(),
+    {Rel,Paths} = create_fake_release(Dir,RelName,RelVsn,AppDirs),
+    RelDir = filename:dirname(Rel),
+
+    %% And a relup file so it can be upgraded to
+    RelupPath = Paths ++ [filename:join([Lib,"*","ebin"]) || Lib <- ExtraLibs],
+    ok = systools:make_relup(Rel,[UpFrom],[DownTo],
+				   [{path,RelupPath},
+				    {outdir,RelDir}]),
+    
+    Rel.
+
+
+create_fake_release(Dir,RelName,RelVsn,AppDirs) ->
+    %% Create .rel files
+    RelDir = filename:join(Dir,"rel_" ++ RelVsn),
+    Rel = filename:join([RelDir,"rel_" ++ RelVsn]),
+    ok = filelib:ensure_dir(Rel),
+    ErtsVsn = erlang:system_info(version),
+
+    {Apps,Paths} = 
+	lists:foldl(fun({App,Vsn,Lib},{As,Ps}) ->
+			    {[{App,Vsn}|As],
+			     lists:umerge([filename:join([Lib,"*",ebin])],Ps)}
+		    end,
+		    {[],[]},
+		    AppDirs),
+
+    create_rel_file(Rel++".rel",RelName,RelVsn,ErtsVsn,Apps),
+    
+    %% Generate boot scripts
+    ok = systools:make_script(Rel,[local,
+				   {path, Paths},
+				   {outdir,RelDir}]),
+    ok = copy_file(Rel++".boot", filename:join(RelDir,"start.boot")),
+
+    %% Use an own 'releases' directory - we don't want to change the
+    %% contents of $OTP_ROOT/releases
+    %% Inform SASL about this via sys.config
+    ReleasesDir = filename:join(Dir, "releases"),
+    Config = [{sasl,[{releases_dir,ReleasesDir}]}],
+    ok = write_term_file(filename:join(RelDir,"sys.config"), Config),
+    
+    {Rel,Paths}.
+    
+
+rpc_inst(Node,Func,Args) ->
+    rpc:call(Node,installer,Func,[node()|Args]).
diff --git a/lib/sasl/test/release_handler_SUITE_data/Makefile.src b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..85e25fdc2f
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
@@ -0,0 +1,108 @@
+EFLAGS=+debug_info
+
+P2B= \
+     P2B/a-2.0/ebin/a.beam \
+     P2B/a-2.0/ebin/a_sup.beam
+
+LIB= \
+     lib/a-1.1/ebin/a.beam \
+     lib/a-1.1/ebin/a_sup.beam \
+     lib/a-1.0/ebin/a.beam \
+     lib/a-1.0/ebin/a_sup.beam \
+
+APP= \
+     app1_app2/lib1/app1-1.0/ebin/app1_sup.@EMULATOR@ \
+     app1_app2/lib1/app1-1.0/ebin/app1_server.@EMULATOR@ \
+     app1_app2/lib1/app1-1.0/ebin/app1.@EMULATOR@ \
+     app1_app2/lib1/app2-1.0/ebin/app2_sup.@EMULATOR@ \
+     app1_app2/lib1/app2-1.0/ebin/app2_server.@EMULATOR@ \
+     app1_app2/lib1/app2-1.0/ebin/app2.@EMULATOR@ \
+     app1_app2/lib2/app1-2.0/ebin/app1_sup.@EMULATOR@ \
+     app1_app2/lib2/app1-2.0/ebin/app1_server.@EMULATOR@ \
+     app1_app2/lib2/app1-2.0/ebin/app1.@EMULATOR@ \
+     app1_app2/lib2/app2-1.0/ebin/app2_sup.@EMULATOR@ \
+     app1_app2/lib2/app2-1.0/ebin/app2_server.@EMULATOR@ \
+     app1_app2/lib2/app2-1.0/ebin/app2.@EMULATOR@
+
+OTP2740=  \
+     otp_2740/vsn_atom.@EMULATOR@ \
+     otp_2740/vsn_list.@EMULATOR@ \
+     otp_2740/vsn_numeric.@EMULATOR@ \
+     otp_2740/vsn_tuple.@EMULATOR@ \
+     otp_2740/vsn_string.@EMULATOR@
+
+C= \
+     c/aa.@EMULATOR@ \
+     c/b.@EMULATOR@ \
+     c/c_sup.@EMULATOR@
+    
+
+all: $(P2B) $(LIB) $(APP) $(OTP2740) $(C)
+
+P2B/a-2.0/ebin/a.@EMULATOR@: P2B/a-2.0/src/a.erl
+	erlc $(EFLAGS) -oP2B/a-2.0/ebin P2B/a-2.0/src/a.erl
+P2B/a-2.0/ebin/a_sup.@EMULATOR@: P2B/a-2.0/src/a_sup.erl
+	erlc $(EFLAGS) -oP2B/a-2.0/ebin P2B/a-2.0/src/a_sup.erl
+
+
+lib/a-1.0/ebin/a.@EMULATOR@: lib/a-1.0/src/a.erl
+	erlc $(EFLAGS) -olib/a-1.0/ebin lib/a-1.0/src/a.erl
+lib/a-1.0/ebin/a_sup.@EMULATOR@: lib/a-1.0/src/a_sup.erl
+	erlc $(EFLAGS) -olib/a-1.0/ebin lib/a-1.0/src/a_sup.erl
+
+
+lib/a-1.1/ebin/a.@EMULATOR@: lib/a-1.1/src/a.erl
+	erlc $(EFLAGS) -olib/a-1.1/ebin lib/a-1.1/src/a.erl
+lib/a-1.1/ebin/a_sup.@EMULATOR@: lib/a-1.1/src/a_sup.erl
+	erlc $(EFLAGS) -olib/a-1.1/ebin lib/a-1.1/src/a_sup.erl
+
+
+app1_app2/lib1/app1-1.0/ebin/app1_sup.@EMULATOR@: app1_app2/lib1/app1-1.0/src/app1_sup.erl
+	erlc $(EFLAGS) -oapp1_app2/lib1/app1-1.0/ebin app1_app2/lib1/app1-1.0/src/app1_sup.erl
+app1_app2/lib1/app1-1.0/ebin/app1_server.@EMULATOR@: app1_app2/lib1/app1-1.0/src/app1_server.erl
+	erlc $(EFLAGS) -oapp1_app2/lib1/app1-1.0/ebin app1_app2/lib1/app1-1.0/src/app1_server.erl
+app1_app2/lib1/app1-1.0/ebin/app1.@EMULATOR@: app1_app2/lib1/app1-1.0/src/app1.erl
+	erlc $(EFLAGS) -oapp1_app2/lib1/app1-1.0/ebin app1_app2/lib1/app1-1.0/src/app1.erl
+
+
+app1_app2/lib1/app2-1.0/ebin/app2_sup.@EMULATOR@: app1_app2/lib1/app2-1.0/src/app2_sup.erl
+	erlc $(EFLAGS) -oapp1_app2/lib1/app2-1.0/ebin app1_app2/lib1/app2-1.0/src/app2_sup.erl
+app1_app2/lib1/app2-1.0/ebin/app2_server.@EMULATOR@: app1_app2/lib1/app2-1.0/src/app2_server.erl
+	erlc $(EFLAGS) -oapp1_app2/lib1/app2-1.0/ebin app1_app2/lib1/app2-1.0/src/app2_server.erl
+app1_app2/lib1/app2-1.0/ebin/app2.@EMULATOR@: app1_app2/lib1/app2-1.0/src/app2.erl
+	erlc $(EFLAGS) -oapp1_app2/lib1/app2-1.0/ebin app1_app2/lib1/app2-1.0/src/app2.erl
+
+
+app1_app2/lib2/app1-2.0/ebin/app1_sup.@EMULATOR@: app1_app2/lib2/app1-2.0/src/app1_sup.erl
+	erlc $(EFLAGS) -oapp1_app2/lib2/app1-2.0/ebin app1_app2/lib2/app1-2.0/src/app1_sup.erl
+app1_app2/lib2/app1-2.0/ebin/app1_server.@EMULATOR@: app1_app2/lib2/app1-2.0/src/app1_server.erl
+	erlc $(EFLAGS) -oapp1_app2/lib2/app1-2.0/ebin app1_app2/lib2/app1-2.0/src/app1_server.erl
+app1_app2/lib2/app1-2.0/ebin/app1.@EMULATOR@: app1_app2/lib2/app1-2.0/src/app1.erl
+	erlc $(EFLAGS) -oapp1_app2/lib2/app1-2.0/ebin app1_app2/lib2/app1-2.0/src/app1.erl
+
+
+app1_app2/lib2/app2-1.0/ebin/app2_sup.@EMULATOR@: app1_app2/lib2/app2-1.0/src/app2_sup.erl
+	erlc $(EFLAGS) -oapp1_app2/lib2/app2-1.0/ebin app1_app2/lib2/app2-1.0/src/app2_sup.erl
+app1_app2/lib2/app2-1.0/ebin/app2_server.@EMULATOR@: app1_app2/lib2/app2-1.0/src/app2_server.erl
+	erlc $(EFLAGS) -oapp1_app2/lib2/app2-1.0/ebin app1_app2/lib2/app2-1.0/src/app2_server.erl
+app1_app2/lib2/app2-1.0/ebin/app2.@EMULATOR@: app1_app2/lib2/app2-1.0/src/app2.erl
+	erlc $(EFLAGS) -oapp1_app2/lib2/app2-1.0/ebin app1_app2/lib2/app2-1.0/src/app2.erl
+
+
+otp_2740/vsn_atom.@EMULATOR@: otp_2740/vsn_atom.erl
+	erlc $(EFLAGS) -ootp_2740 otp_2740/vsn_atom.erl
+otp_2740/vsn_list.@EMULATOR@: otp_2740/vsn_list.erl
+	erlc $(EFLAGS) -ootp_2740 otp_2740/vsn_list.erl
+otp_2740/vsn_numeric.@EMULATOR@: otp_2740/vsn_numeric.erl
+	erlc $(EFLAGS) -ootp_2740 otp_2740/vsn_numeric.erl
+otp_2740/vsn_tuple.@EMULATOR@: otp_2740/vsn_tuple.erl
+	erlc $(EFLAGS) -ootp_2740 otp_2740/vsn_tuple.erl
+otp_2740/vsn_string.@EMULATOR@: otp_2740/vsn_string.erl
+	erlc $(EFLAGS) -ootp_2740 otp_2740/vsn_string.erl
+
+c/aa.@EMULATOR@: c/aa.erl
+	erlc $(EFLAGS) -oc c/aa.erl
+c/b.@EMULATOR@: c/b.erl
+	erlc $(EFLAGS) -oc c/b.erl
+c/c_sup.@EMULATOR@: c/c_sup.erl
+	erlc $(EFLAGS) -oc c/c_sup.erl
diff --git a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/ebin/a.app b/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/ebin/a.app
new file mode 100644
index 0000000000..200cfcfe47
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/ebin/a.app
@@ -0,0 +1,8 @@
+{application, a,
+	     [{description, "A  CXC 138 11"},
+              {vsn, "2.0"},
+	      {modules, [{a, 1}, {a_sup,1}]},
+	      {registered, [a_sup]},
+	      {applications, [kernel, stdlib]},
+	      {env, [{key1, val1}]},
+	      {mod, {a_sup, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a.erl b/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a.erl
new file mode 100644
index 0000000000..cfe38b55ce
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a.erl
@@ -0,0 +1,47 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(a).
+
+
+-behaviour(gen_server).
+
+%% External exports
+-export([start_link/0, a/0]).
+%% Internal exports
+-export([init/1, handle_call/3, handle_info/2, terminate/2]).
+
+start_link() -> gen_server:start_link({local, aa}, a, [], []).
+
+a() -> gen_server:call(aa, a).
+
+%%-----------------------------------------------------------------
+%% Callback functions from gen_server
+%%-----------------------------------------------------------------
+init([]) ->
+    process_flag(trap_exit, true),
+    {ok, state}.
+
+handle_call(a, _From, State) ->
+    X = application:get_all_env(a),
+    {reply, X, State}.
+
+handle_info(_, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a_sup.erl b/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a_sup.erl
new file mode 100644
index 0000000000..a141c1767b
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a_sup.erl
@@ -0,0 +1,37 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(a_sup).
+
+
+-behaviour(supervisor).
+
+%% External exports
+-export([start/2]).
+
+%% Internal exports
+-export([init/1]).
+
+start(_, _) ->
+    supervisor:start_link({local, a_sup}, a_sup, []).
+
+init([]) ->
+    SupFlags = {one_for_one, 4, 3600},
+    Config = {a,
+	      {a, start_link, []},
+	      permanent, 2000, worker, [a]},
+    {ok, {SupFlags, [Config]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/ebin/app1.app b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/ebin/app1.app
new file mode 100644
index 0000000000..0489cb2595
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/ebin/app1.app
@@ -0,0 +1,9 @@
+{application, app1,
+ [{description, "very simple example application"},
+  {id, "app1"},
+  {vsn, "1.0"},
+  {modules, [app1, app1_sup, app1_server]},
+  {registered, [harry]},
+  {applications, [kernel, stdlib, sasl]},
+  {env, [{var,val1}]},
+  {mod, {app1, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1.erl
new file mode 100644
index 0000000000..f123c8f470
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1.erl
@@ -0,0 +1,22 @@
+-module(app1).
+
+-behaviour(application).
+
+%% Application callbacks
+-export([start/2, stop/1]).
+-export([config_change/3]).
+
+start(_Type, _StartArgs) ->
+    case app1_sup:start_link() of
+	{ok, Pid} ->
+	    {ok, Pid};
+	Error ->
+	    Error
+    end.
+
+stop(_State) ->
+    ok.
+
+config_change(Changed, _New, _Removed) ->
+    catch ets:insert(otp_6162, hd(Changed)),
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_server.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_server.erl
new file mode 100644
index 0000000000..9b49e772cc
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_server.erl
@@ -0,0 +1,32 @@
+-module(app1_server).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+start_link() ->
+    gen_server:start_link({local, harry}, ?MODULE, [], []).
+
+init([]) ->
+    {ok, []}.
+
+handle_call(_Request, _From, State) ->
+    Reply = ok,
+    {reply, Reply, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_sup.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_sup.erl
new file mode 100644
index 0000000000..e6ad9b6967
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app1-1.0/src/app1_sup.erl
@@ -0,0 +1,17 @@
+-module(app1_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callbacks
+-export([init/1]).
+
+start_link() ->
+    supervisor:start_link(?MODULE, []).
+
+init([]) ->
+    AChild = {harry,{app1_server,start_link,[]},
+	      permanent,2000,worker,[app1_server]},
+    {ok,{{one_for_all,0,1}, [AChild]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/ebin/app2.app b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/ebin/app2.app
new file mode 100644
index 0000000000..d48018cbda
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/ebin/app2.app
@@ -0,0 +1,9 @@
+{application, app2,
+ [{description, "very simple example application"},
+  {id, "app2"},
+  {vsn, "1.0"},
+  {modules, [app2, app2_sup, app2_server]},
+  {registered, [ginny]},
+  {applications, [kernel, stdlib, sasl]},
+  {env, []},
+  {mod, {app2, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2.erl
new file mode 100644
index 0000000000..a41c39730c
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2.erl
@@ -0,0 +1,17 @@
+-module(app2).
+
+-behaviour(application).
+
+%% Application callbacks
+-export([start/2, stop/1]).
+
+start(_Type, _StartArgs) ->
+    case app2_sup:start_link() of
+	{ok, Pid} ->
+	    {ok, Pid};
+	Error ->
+	    Error
+    end.
+
+stop(_State) ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_server.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_server.erl
new file mode 100644
index 0000000000..d8440230ff
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_server.erl
@@ -0,0 +1,32 @@
+-module(app2_server).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+start_link() ->
+    gen_server:start_link({local, ginny}, ?MODULE, [], []).
+
+init([]) ->
+    {ok, []}.
+
+handle_call(_Request, _From, State) ->
+    Reply = ok,
+    {reply, Reply, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_sup.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_sup.erl
new file mode 100644
index 0000000000..80b0952d4b
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib1/app2-1.0/src/app2_sup.erl
@@ -0,0 +1,17 @@
+-module(app2_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callbacks
+-export([init/1]).
+
+start_link() ->
+    supervisor:start_link(?MODULE, []).
+
+init([]) ->
+    AChild = {ginny,{app2_server,start_link,[]},
+	      permanent,2000,worker,[app2_server]},
+    {ok,{{one_for_all,0,1}, [AChild]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.app b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.app
new file mode 100644
index 0000000000..3c65adfbb3
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.app
@@ -0,0 +1,9 @@
+{application, app1,
+ [{description, "very simple example application"},
+  {id, "app1"},
+  {vsn, "2.0"},
+  {modules, [app1, app1_sup, app1_server]},
+  {registered, [harry]},
+  {applications, [kernel, stdlib, sasl]},
+  {env, [{var,val2}]},
+  {mod, {app1, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.appup b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.appup
new file mode 100644
index 0000000000..e5e0cbda0e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/ebin/app1.appup
@@ -0,0 +1,4 @@
+{"2.0",
+ [{"1.0", [{load_module, app1_server}]}],
+ [{"1.0", [{load_module, app1_server}]}]
+}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1.erl
new file mode 100644
index 0000000000..f123c8f470
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1.erl
@@ -0,0 +1,22 @@
+-module(app1).
+
+-behaviour(application).
+
+%% Application callbacks
+-export([start/2, stop/1]).
+-export([config_change/3]).
+
+start(_Type, _StartArgs) ->
+    case app1_sup:start_link() of
+	{ok, Pid} ->
+	    {ok, Pid};
+	Error ->
+	    Error
+    end.
+
+stop(_State) ->
+    ok.
+
+config_change(Changed, _New, _Removed) ->
+    catch ets:insert(otp_6162, hd(Changed)),
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_server.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_server.erl
new file mode 100644
index 0000000000..660d095ebf
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_server.erl
@@ -0,0 +1,35 @@
+-module(app1_server).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+start_link() ->
+    gen_server:start_link({local, harry}, ?MODULE, [], []).
+
+init([]) ->
+    {ok, []}.
+
+handle_call(error, _From, State) ->
+    Reply = error,
+    {reply, Reply, State};
+handle_call(_Request, _From, State) ->
+    Reply = ok,
+    {reply, Reply, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_sup.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_sup.erl
new file mode 100644
index 0000000000..e6ad9b6967
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app1-2.0/src/app1_sup.erl
@@ -0,0 +1,17 @@
+-module(app1_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callbacks
+-export([init/1]).
+
+start_link() ->
+    supervisor:start_link(?MODULE, []).
+
+init([]) ->
+    AChild = {harry,{app1_server,start_link,[]},
+	      permanent,2000,worker,[app1_server]},
+    {ok,{{one_for_all,0,1}, [AChild]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/ebin/app2.app b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/ebin/app2.app
new file mode 100644
index 0000000000..d48018cbda
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/ebin/app2.app
@@ -0,0 +1,9 @@
+{application, app2,
+ [{description, "very simple example application"},
+  {id, "app2"},
+  {vsn, "1.0"},
+  {modules, [app2, app2_sup, app2_server]},
+  {registered, [ginny]},
+  {applications, [kernel, stdlib, sasl]},
+  {env, []},
+  {mod, {app2, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2.erl
new file mode 100644
index 0000000000..a41c39730c
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2.erl
@@ -0,0 +1,17 @@
+-module(app2).
+
+-behaviour(application).
+
+%% Application callbacks
+-export([start/2, stop/1]).
+
+start(_Type, _StartArgs) ->
+    case app2_sup:start_link() of
+	{ok, Pid} ->
+	    {ok, Pid};
+	Error ->
+	    Error
+    end.
+
+stop(_State) ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_server.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_server.erl
new file mode 100644
index 0000000000..d8440230ff
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_server.erl
@@ -0,0 +1,32 @@
+-module(app2_server).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+start_link() ->
+    gen_server:start_link({local, ginny}, ?MODULE, [], []).
+
+init([]) ->
+    {ok, []}.
+
+handle_call(_Request, _From, State) ->
+    Reply = ok,
+    {reply, Reply, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_sup.erl b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_sup.erl
new file mode 100644
index 0000000000..80b0952d4b
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/app1_app2/lib2/app2-1.0/src/app2_sup.erl
@@ -0,0 +1,17 @@
+-module(app2_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callbacks
+-export([init/1]).
+
+start_link() ->
+    supervisor:start_link(?MODULE, []).
+
+init([]) ->
+    AChild = {ginny,{app2_server,start_link,[]},
+	      permanent,2000,worker,[app2_server]},
+    {ok,{{one_for_all,0,1}, [AChild]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/c/aa.erl b/lib/sasl/test/release_handler_SUITE_data/c/aa.erl
new file mode 100644
index 0000000000..1c853c85b2
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/c/aa.erl
@@ -0,0 +1,41 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(aa).
+
+
+-behaviour(gen_server).
+
+%% External exports
+-export([start_link/0]).
+%% Internal exports
+-export([init/1, handle_info/2, terminate/2]).
+
+start_link() -> gen_server:start_link({local, cc}, aa, [], []).
+
+%%-----------------------------------------------------------------
+%% Callback functions from gen_server
+%%-----------------------------------------------------------------
+init([]) ->
+    process_flag(trap_exit, true),
+    {ok, state}.
+
+handle_info(_, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/c/b.erl b/lib/sasl/test/release_handler_SUITE_data/c/b.erl
new file mode 100644
index 0000000000..d8426a515e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/c/b.erl
@@ -0,0 +1,38 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(b).
+
+
+%% External exports
+-export([start_link/0]).
+%% Internal exports
+-export([init/0]).
+
+start_link() -> {ok, proc_lib:spawn_link(b, init, [])}.
+
+%%-----------------------------------------------------------------
+%% Callback functions from gen_server
+%%-----------------------------------------------------------------
+init() ->
+    register(bb, self()),
+    loop().
+
+loop() ->
+    receive
+	hej -> ok
+    end.
diff --git a/lib/sasl/test/release_handler_SUITE_data/c/c.app b/lib/sasl/test/release_handler_SUITE_data/c/c.app
new file mode 100644
index 0000000000..908a94cf2d
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/c/c.app
@@ -0,0 +1,8 @@
+{application, c,
+	     [{description, "C  CXC 138 11"},
+              {vsn, "1.0"},
+	      {modules, [b, {aa, 1}, {c_sup,1}]},
+	      {registered, [cc,bb,c_sup]},
+	      {applications, [kernel, stdlib]},
+	      {env, [{key1, val1}]},
+	      {mod, {c_sup, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/c/c_sup.erl b/lib/sasl/test/release_handler_SUITE_data/c/c_sup.erl
new file mode 100644
index 0000000000..069eb3b99b
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/c/c_sup.erl
@@ -0,0 +1,40 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(c_sup).
+
+
+-behaviour(supervisor).
+
+%% External exports
+-export([start/2]).
+
+%% Internal exports
+-export([init/1]).
+
+start(_, _) ->
+    supervisor:start_link({local, c_sup}, c_sup, []).
+
+init([]) ->
+    SupFlags = {one_for_one, 4, 3600},
+    Config1 = {c,
+	       {aa, start_link, []},
+	       permanent, 2000, worker, [aa]},
+    Config2 = {b,
+	       {b, start_link, []},
+	       permanent, 2000, worker, [b]},
+    {ok, {SupFlags, [Config1, Config2]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/clients/start_cli1 b/lib/sasl/test/release_handler_SUITE_data/clients/start_cli1
new file mode 100755
index 0000000000..ee3d8c97cf
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/clients/start_cli1
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# This program invokes the erlang emulator by calling run_erl.
+# It should only be used at an embedded target system.
+# It should be modified to give the correct flags to erl (via start_erl),
+# e.g -mode embedded -sname XXX
+#
+# Usage: start [Data]
+#
+
+if [ "x${NODENAME}" = "x" ]
+then
+    echo "ERROR: Variable \$NODENAME is not set!!"
+    exit 1
+fi
+
+TESTHOST=`hostname | sed 's/[.].*//'`
+IPADDR=%IPADDR%
+
+ROOTDIR=%ROOT%
+CLIENTDIR=$ROOTDIR/clients/type1/$NODENAME@$TESTHOST
+
+RELDIR=$CLIENTDIR/releases
+
+# Note that this scripts is modified an copied to $CLIENTDIR/bin/start
+# in release_handler_SUITE:copy_client - therefore HEART_COMMAND is as follows:
+HEART_COMMAND=$CLIENTDIR/bin/start
+HW_WD_DISABLE=true
+export HW_WD_DISABLE HEART_COMMAND
+
+START_ERL_DATA=${1:-$RELDIR/start_erl.data}
+
+if [ ! -d /tmp/$NODENAME@$TESTHOST ]
+then
+        mkdir /tmp/$NODENAME@$TESTHOST
+fi
+
+$ROOTDIR/bin/run_erl /tmp/$NODENAME@$TESTHOST/ $CLIENTDIR/log "exec $ROOTDIR/bin/start_erl $ROOTDIR $RELDIR $START_ERL_DATA -heart -sname $NODENAME -sasl start_prg \\\"$CLIENTDIR/bin/start\\\" masters \[\\'%MASTER%@$TESTHOST\\'\] client_directory \\\"$CLIENTDIR\\\" -loader inet -id $NODENAME -hosts $IPADDR" > $CLIENTDIR/log/run_erl.out 2>&1 &
diff --git a/lib/sasl/test/release_handler_SUITE_data/clients/start_cli2 b/lib/sasl/test/release_handler_SUITE_data/clients/start_cli2
new file mode 100755
index 0000000000..88912cf884
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/clients/start_cli2
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# This program invokes the erlang emulator by calling run_erl.
+# It should only be used at an embedded target system.
+# It should be modified to give the correct flags to erl (via start_erl),
+# e.g -mode embedded -sname XXX
+#
+# Usage: start [Data]
+#
+
+if [ "x${NODENAME}" = "x" ]
+then
+    echo "ERROR: Variable \$NODENAME is not set!!"
+    exit 1
+fi
+
+TESTHOST=`hostname | sed 's/[.].*//'`
+
+ROOTDIR=%ROOT%
+CLIENTDIR=$ROOTDIR/clients/type1/$NODENAME@$TESTHOST
+
+RELDIR=$CLIENTDIR/releases
+
+# Note that this scripts is modified an copied to $CLIENTDIR/bin/start
+# in release_handler_SUITE:copy_client - therefore HEART_COMMAND is as follows:
+HEART_COMMAND=$CLIENTDIR/bin/start
+HW_WD_DISABLE=true
+export HW_WD_DISABLE HEART_COMMAND
+
+START_ERL_DATA=${1:-$RELDIR/start_erl.data}
+
+if [ ! -d /tmp/$NODENAME@$TESTHOST ]
+then
+        mkdir /tmp/$NODENAME@$TESTHOST
+fi
+
+$ROOTDIR/bin/run_erl /tmp/$NODENAME@$TESTHOST/ $CLIENTDIR/log "exec $ROOTDIR/bin/start_erl $ROOTDIR $RELDIR $START_ERL_DATA -heart -sname $NODENAME -sasl start_prg \\\"$CLIENTDIR/bin/start\\\" masters \[\\'%MASTER%@$TESTHOST\\',\\'master2@$TESTHOST\\'\] client_directory \\\"$CLIENTDIR\\\"" > /dev/null 2>&1 &
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app
new file mode 100644
index 0000000000..e938137f67
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app
@@ -0,0 +1,8 @@
+{application, a,
+	     [{description, "A  CXC 138 11"},
+              {vsn, "1.0"},
+	      {modules, [{a, 1}, {a_sup,1}]},
+	      {registered, [a_sup]},
+	      {applications, [kernel, stdlib]},
+	      {env, [{key1, val1}]},
+	      {mod, {a_sup, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a.app b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a.app
new file mode 100644
index 0000000000..e938137f67
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a.app
@@ -0,0 +1,8 @@
+{application, a,
+	     [{description, "A  CXC 138 11"},
+              {vsn, "1.0"},
+	      {modules, [{a, 1}, {a_sup,1}]},
+	      {registered, [a_sup]},
+	      {applications, [kernel, stdlib]},
+	      {env, [{key1, val1}]},
+	      {mod, {a_sup, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a.erl b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a.erl
new file mode 100644
index 0000000000..bb500bed69
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a.erl
@@ -0,0 +1,49 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(a).
+
+
+-behaviour(gen_server).
+
+-vsn(1).
+
+%% External exports
+-export([start_link/0, a/0]).
+%% Internal exports
+-export([init/1, handle_call/3, handle_info/2, terminate/2]).
+
+start_link() -> gen_server:start_link({local, aa}, a, [], []).
+
+a() -> gen_server:call(aa, a).
+
+%%-----------------------------------------------------------------
+%% Callback functions from gen_server
+%%-----------------------------------------------------------------
+init([]) ->
+    process_flag(trap_exit, true),
+    {ok, state}.
+
+handle_call(a, _From, State) ->
+    X = application:get_all_env(a),
+    {reply, X, State}.
+
+handle_info(_, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a_sup.erl b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a_sup.erl
new file mode 100644
index 0000000000..a141c1767b
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/src/a_sup.erl
@@ -0,0 +1,37 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(a_sup).
+
+
+-behaviour(supervisor).
+
+%% External exports
+-export([start/2]).
+
+%% Internal exports
+-export([init/1]).
+
+start(_, _) ->
+    supervisor:start_link({local, a_sup}, a_sup, []).
+
+init([]) ->
+    SupFlags = {one_for_one, 4, 3600},
+    Config = {a,
+	      {a, start_link, []},
+	      permanent, 2000, worker, [a]},
+    {ok, {SupFlags, [Config]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app
new file mode 100644
index 0000000000..1c3053b2fa
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app
@@ -0,0 +1,8 @@
+{application, a,
+	     [{description, "A  CXC 138 11"},
+              {vsn, "1.1"},
+	      {modules, [{a, 2}, {a_sup,1}]},
+	      {registered, [a_sup]},
+	      {applications, [kernel, stdlib]},
+	      {env, [{key1, val1}]},
+	      {mod, {a_sup, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.appup b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.appup
new file mode 100644
index 0000000000..05db4cb541
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.appup
@@ -0,0 +1,3 @@
+{"1.1",
+ [{"1.0",[{update,a,{advanced,extra_par}}]}],
+ []}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a.erl b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a.erl
new file mode 100644
index 0000000000..c082ad5339
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a.erl
@@ -0,0 +1,54 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(a).
+
+
+-behaviour(gen_server).
+
+%% External exports
+-export([start_link/0, a/0, b/0]).
+%% Internal exports
+-export([init/1, handle_call/3, handle_info/2, terminate/2, code_change/3]).
+
+start_link() -> gen_server:start_link({local, aa}, a, [], []).
+
+a() -> gen_server:call(aa, a).
+b() -> gen_server:call(aa, b).
+
+%%-----------------------------------------------------------------
+%% Callback functions from gen_server
+%%-----------------------------------------------------------------
+init([]) ->
+    process_flag(trap_exit, true),
+    {ok, {state, bval}}.
+
+handle_call(a, _From, State) ->
+    X = application:get_all_env(a),
+    {reply, X, State};
+
+handle_call(b, _From, State) ->
+    {reply, {ok, element(2, State)}, State}.
+
+handle_info(_, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(1, Extra, State) ->
+    {ok, {state, bval}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a_sup.erl b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a_sup.erl
new file mode 100644
index 0000000000..a141c1767b
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/src/a_sup.erl
@@ -0,0 +1,37 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+-module(a_sup).
+
+
+-behaviour(supervisor).
+
+%% External exports
+-export([start/2]).
+
+%% Internal exports
+-export([init/1]).
+
+start(_, _) ->
+    supervisor:start_link({local, a_sup}, a_sup, []).
+
+init([]) ->
+    SupFlags = {one_for_one, 4, 3600},
+    Config = {a,
+	      {a, start_link, []},
+	      permanent, 2000, worker, [a]},
+    {ok, {SupFlags, [Config]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/ebin/installer.app b/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/ebin/installer.app
new file mode 100644
index 0000000000..6f77317f6a
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/ebin/installer.app
@@ -0,0 +1,6 @@
+{application, installer,
+	     [{description, "Installer application"},
+              {vsn, "1.0"},
+	      {modules, [{installer, 1}]},
+	      {registered, []},
+	      {applications, [kernel, stdlib, sasl]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/src/installer.erl b/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/src/installer.erl
new file mode 120000
index 0000000000..c2f93b822d
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/src/installer.erl
@@ -0,0 +1 @@
+../../../../installer.erl
\ No newline at end of file
diff --git a/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_atom.erl b/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_atom.erl
new file mode 100644
index 0000000000..883688c231
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_atom.erl
@@ -0,0 +1,26 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+
+-module(vsn_atom).
+
+-vsn(atom).
+
+-export([ok/0]).
+
+ok() ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_list.erl b/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_list.erl
new file mode 100644
index 0000000000..34c38307ba
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_list.erl
@@ -0,0 +1,26 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+
+-module(vsn_list).
+
+-vsn([list, "of", {some, terms}]).
+
+-export([ok/0]).
+
+ok() ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_numeric.erl b/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_numeric.erl
new file mode 100644
index 0000000000..6bf52753fd
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_numeric.erl
@@ -0,0 +1,26 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+
+-module(vsn_numeric).
+
+-vsn(231894).
+
+-export([ok/0]).
+
+ok() ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_string.erl b/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_string.erl
new file mode 100644
index 0000000000..aa430a0bb3
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_string.erl
@@ -0,0 +1,26 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+
+-module(vsn_string).
+
+-vsn("a string").
+
+-export([ok/0]).
+
+ok() ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_tuple.erl b/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_tuple.erl
new file mode 100644
index 0000000000..3ff1018994
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/otp_2740/vsn_tuple.erl
@@ -0,0 +1,26 @@
+%% ``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 via the world wide web 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.
+%%
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+%% AB. All Rights Reserved.''
+%%
+%%     $Id$
+%%
+
+-module(vsn_tuple).
+
+-vsn({tuple, ["of", terms]}).
+
+-export([ok/0]).
+
+ok() ->
+    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/start b/lib/sasl/test/release_handler_SUITE_data/start
new file mode 100755
index 0000000000..45e526c15f
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/start
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# This program invokes the erlang emulator by calling run_erl.
+# It should only be used at an embedded target system.
+# It should be modified to give the correct flags to erl (via start_erl),
+# e.g -mode embedded -sname XXX
+#
+# Usage: start [Data]
+#
+ROOTDIR=%ROOT%
+
+if [ "x${NODENAME}" = "x" ]
+then
+    echo "ERROR: Variable \$NODENAME is not set!!"
+    exit 1
+fi
+
+if [ -z "$RELDIR" ]
+then
+   RELDIR=$ROOTDIR/releases
+fi
+
+HEART_COMMAND=$ROOTDIR/bin/start
+HW_WD_DISABLE=true
+export HW_WD_DISABLE HEART_COMMAND
+
+START_ERL_DATA=${1:-$RELDIR/start_erl.data}
+
+$ROOTDIR/bin/run_erl /tmp/ $ROOTDIR/log "exec $ROOTDIR/bin/start_erl $ROOTDIR $RELDIR $START_ERL_DATA -heart -sname $NODENAME" > $ROOTDIR/log/run_erl.out 2>&1  &
diff --git a/lib/sasl/test/release_handler_SUITE_data/target_system.erl b/lib/sasl/test/release_handler_SUITE_data/target_system.erl
new file mode 120000
index 0000000000..4d36c59632
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/target_system.erl
@@ -0,0 +1 @@
+../../examples/src/target_system.erl
\ No newline at end of file
diff --git a/lib/sasl/test/sasl.cover b/lib/sasl/test/sasl.cover
new file mode 100644
index 0000000000..d19d3d0180
--- /dev/null
+++ b/lib/sasl/test/sasl.cover
@@ -0,0 +1,2 @@
+{incl_app,sasl,details}.
+
diff --git a/lib/sasl/test/sasl.spec b/lib/sasl/test/sasl.spec
new file mode 100644
index 0000000000..f3de90c9aa
--- /dev/null
+++ b/lib/sasl/test/sasl.spec
@@ -0,0 +1 @@
+{suites,"../sasl_test",all}.
diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl
new file mode 100644
index 0000000000..454095db6a
--- /dev/null
+++ b/lib/sasl/test/sasl_SUITE.erl
@@ -0,0 +1,98 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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(sasl_SUITE).
+-include_lib("common_test/include/ct.hrl").
+
+
+% Default timetrap timeout (set in init_per_testcase).
+-define(default_timeout, ?t:minutes(1)).
+-define(application, sasl).
+
+% Test server specific exports
+-export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+% Test cases must be exported.
+-export([app_test/1,
+	 log_mf_h_env/1]).
+
+all() -> 
+    [app_test, log_mf_h_env].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(_Case, Config) ->
+    ?line Dog=test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+end_per_testcase(_Case, Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+app_test(Config) when is_list(Config) ->
+    ?line ?t:app_test(sasl, allow),
+    ok.
+
+%% OTP-9185 - fail sasl start if some but not all log_mf_h env vars
+%% are given.
+log_mf_h_env(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    LogDir = filename:join(PrivDir,sasl_SUITE_log_dir),
+    ok = file:make_dir(LogDir),
+    application:stop(sasl),
+    SaslEnv = application:get_all_env(sasl),
+    lists:foreach(fun({E,_V}) -> application:unset_env(sasl,E) end, SaslEnv),
+
+    ok = application:set_env(sasl,error_logger_mf_dir,LogDir),
+    match_error(missing_config,application:start(sasl)),
+
+    ok = application:set_env(sasl,error_logger_mf_maxbytes,"xx"),
+    match_error(bad_config,application:start(sasl)),
+
+    ok = application:set_env(sasl,error_logger_mf_maxbytes,50000),
+    match_error(missing_config,application:start(sasl)),
+
+    ok = application:set_env(sasl,error_logger_mf_maxfiles,"xx"),
+    match_error(bad_config,application:start(sasl)),
+
+    ok = application:set_env(sasl,error_logger_mf_maxfiles,2),
+    ok = application:unset_env(sasl,error_logger_mf_dir),
+    match_error(missing_config,application:start(sasl)),
+
+    ok = application:set_env(sasl,error_logger_mf_dir,xx),
+    match_error(bad_config,application:start(sasl)),
+
+    ok = application:set_env(sasl,error_logger_mf_dir,LogDir),
+    ok = application:start(sasl).
+
+
+%%-----------------------------------------------------------------
+%% Internal
+match_error(Expected,{error,{bad_return,{_,{'EXIT',{Expected,{sasl,_}}}}}}) ->
+    ok;
+match_error(Expected,Actual) ->
+    ?t:fail({unexpected_return,Expected,Actual}).
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
new file mode 100644
index 0000000000..9190b111ef
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -0,0 +1,2112 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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%
+%%
+%%
+%% Test suite for the systools module.
+%%
+%%	The systools module is a wrapper for a number of modules that
+%%	handle large parts of the release building functionality
+%%	(e.g. checking app files, building a tar file, building
+%%	release upgrad scripts.
+%%
+
+
+-module(systools_SUITE).
+
+%-define(debug, true).
+
+-include_lib("test_server/include/test_server.hrl").
+-define(format(S, A), ok).
+-define(datadir, ?config(data_dir, Config)).
+-define(privdir, ?config(priv_dir, Config)).
+-define(copydir, ?config(copy_dir, Config)).
+
+-include_lib("kernel/include/file.hrl").
+
+-export([all/0,suite/0,groups/0,init_per_group/2,end_per_group/2]).
+
+-export([ script_options/1, normal_script/1, no_mod_vsn_script/1,
+	  wildcard_script/1, variable_script/1,
+	  abnormal_script/1, src_tests_script/1, crazy_script/1,
+	  warn_shadow_script/1,
+	  included_script/1, included_override_script/1,
+	  included_fail_script/1, included_bug_script/1, exref_script/1]).
+-export([ tar_options/1, normal_tar/1, no_mod_vsn_tar/1, variable_tar/1,
+	  src_tests_tar/1, shadow_tar/1, var_tar/1,
+	  exref_tar/1, link_tar/1]).
+-export([ normal_relup/1, abnormal_relup/1, no_appup_relup/1,
+	  bad_appup_relup/1, app_start_type_relup/1, otp_3065/1]).
+-export([
+	 otp_6226/1]).
+-export([init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2]).
+
+-import(lists, [foldl/3]).
+
+-define(default_timeout, ?t:minutes(20)).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+suite() ->
+    [{ct_hooks, [ts_install_cth]}].
+
+all() -> 
+    [{group, script}, {group, tar}, {group, relup},
+     {group, tickets}].
+
+groups() -> 
+    [{script, [],
+      [script_options, normal_script, no_mod_vsn_script,
+       wildcard_script, variable_script, abnormal_script,
+       src_tests_script, crazy_script, warn_shadow_script,
+       included_script, included_override_script,
+       included_fail_script, included_bug_script, exref_script,
+       otp_3065]},
+     {tar, [],
+      [tar_options, normal_tar, no_mod_vsn_tar, variable_tar,
+       src_tests_tar, shadow_tar, var_tar,
+       exref_tar, link_tar]},
+     {relup, [],
+      [normal_relup, abnormal_relup, no_appup_relup,
+       bad_appup_relup, app_start_type_relup]},
+     {tickets, [], [otp_6226]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+init_per_suite(Config) when is_list(Config) ->
+    %% Make of copy of the data directory.
+    DataDir = ?datadir,
+    PrivDir = ?privdir,
+    ?line CopyDir = fname(PrivDir, "datacopy"),
+    ?line TarFile = fname(PrivDir, "datacopy.tgz"),
+    ?line {ok, Tar} = erl_tar:open(TarFile, [write, compressed]),
+    ?line ok = erl_tar:add(Tar, DataDir, CopyDir, [compressed]),
+    ?line ok = erl_tar:close(Tar),
+    ?line ok = erl_tar:extract(TarFile, [compressed]),
+    ?line ok = file:delete(TarFile),
+
+    %% Compile source files in the copy directory.
+    ?line Sources = filelib:wildcard(fname([CopyDir,'*','*','*','*','*.erl'])),
+    ?line lists:foreach(fun compile_source/1, Sources),
+
+    %% To use in end_per_testcase
+    Path = code:get_path(),
+    {ok,Cwd} = file:get_cwd(),
+
+    [{copy_dir, CopyDir}, {cwd,Cwd}, {path,Path} | Config].
+
+compile_source(File) ->
+    %% The compiler will no longer create a Beam file
+    %% with a module name that does not match the output
+    %% file, so we must compile to a binary and write
+    %% the output file ourselves.
+    U = filename:dirname(filename:dirname(File)),
+    Base = filename:rootname(filename:basename(File)),
+    OutFile = filename:join([U,"ebin",Base++".beam"]),
+    OutFileTemp = OutFile ++ "#",
+    {ok,_,Code} = compile:file(File, [binary]),
+    ok = file:write_file(OutFileTemp, Code),
+    file:rename(OutFileTemp, OutFile).
+
+end_per_suite(Conf) when is_list(Conf) ->
+    %% Nothing.
+    Conf.
+
+init_per_testcase(link_tar, Config) ->
+    case os:type() of
+	{unix, _} -> init_per_testcase(dummy, Config);
+	{win32, _} -> {skip, "Skip on windows"}
+    end;
+init_per_testcase(_Case, Config) ->
+    ?line Dog = test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    case {?config(path,Config),?config(cwd,Config)} of
+	{undefined,undefined} ->
+	    ok;
+	{Path,Cwd} ->
+	    true = code:set_path(Path),
+	    ok = file:set_cwd(Cwd)
+    end,
+    ok.
+
+
+
+%% Usage:
+%%    systools:make_script("RelName")
+%%                        Make a boot file from RelName.rel.
+%%                        Generates RelName.{script,boot}
+%%    systools:make_tar("RelName")
+%%                        Make a release package from RelName.rel.
+%%                        Generates RelName.tar,Z
+%%    systools:script2boot(File)
+%%                        File.script -> File.boot
+%%    systools:make_relup("Target", ["UpFromRel"...], ["DownToRel"...], Opts)
+%%			  Gather all appup scripts to the relup file
+%%
+
+
+%% make_script
+%%
+script_options(suite) -> [];
+script_options(doc) ->
+    ["Check illegal script options."];
+script_options(Config) when is_list(Config) ->
+    ?line {'EXIT',{{badarg,[{path,["Path",12,"Another"]}]}, _}} =
+       (catch systools:make_script("release", [{path,["Path",12,"Another"]}])),
+    ?line {'EXIT',{{badarg,[sillent]}, _}} =
+	(catch systools:make_script("release",
+				    [{path,["Path","Another"]},sillent])),
+    ?line {'EXIT',{{badarg,[locall]}, _}} =
+	(catch systools:make_script("release",
+				    [{path,["Path","Another"]},locall])),
+    ?line {'EXIT',{{badarg,[src_testsxx]}, _}} =
+	(catch systools:make_script("release",
+				    [{path,["Path"]},src_testsxx])),
+    ?line {'EXIT',{{badarg,[{variables, {"TEST", "/home/lib"}}]}, _}} =
+	(catch systools:make_script("release",
+				    [{variables, {"TEST", "/home/lib"}}])),
+    ?line {'EXIT',{{badarg,[{variables, [{a, b}, {"a", "b"}]}]}, _}} =
+	(catch systools:make_script("release",
+				    [{variables, [{a, b}, {"a", "b"}]}])),
+    ?line {'EXIT',{{badarg,[exreff]}, _}} =
+	(catch systools:make_script("release",
+				    [{path,["Path","Another"]},exreff])),
+    ?line {'EXIT',{{badarg,[{exref,["appl"]}]}, _}} =
+	(catch systools:make_script("release", [{exref,["appl"]}])),
+    ?line {'EXIT',{{badarg,[{machine, "appl"}]}, _}} =
+	(catch systools:make_script("release", [{machine,"appl"}])),
+    ok.
+
+
+%% make_script
+%%
+normal_script(suite) -> [];
+normal_script(doc) ->
+    ["Check that make_script handles normal case."];
+normal_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line PSAVE = code:get_path(),		% Save path
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line P1 = fname([LibDir, 'db-2.1', ebin]),
+    ?line P2 = fname([LibDir, 'fe-3.1', ebin]),
+
+    ?line true = code:add_patha(P1),
+    ?line true = code:add_patha(P2),
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line ok = systools:make_script(filename:basename(LatestName)),
+    ?line {ok, _} = read_script_file(LatestName),	% Check readabillity
+
+    %% Check the same but w. silent flag
+    ?line {ok, _, []} = systools:make_script(LatestName, [silent]),
+
+    %% Use the local option
+    ?line ok = systools:make_script(LatestName, [local]),
+    ?line ok = check_script_path(LatestName),
+
+    %% use the path option
+    ?line code:set_path(PSAVE),			% Restore path
+    %% Mess up std path:
+    ?line true = code:add_patha(fname([LibDir, 'db-1.0', ebin])),
+    ?line true = code:add_patha(fname([LibDir, 'fe-2.1', ebin])),
+
+    ?line error = systools:make_script(LatestName),	%should fail
+    ?line ok = systools:make_script(LatestName,[{path, [P1, P2]}]),
+
+    ?line ok = file:set_cwd(OldDir),
+    ?line code:set_path(PSAVE),			% Restore path
+    ok.
+
+
+%% make_script
+%%
+no_mod_vsn_script(suite) -> [];
+no_mod_vsn_script(doc) ->
+    ["Check that make_script handles normal case.",
+     "Modules specified without version in .app file (db-3.1)."
+     "Note that this is now the normal way - i.e. systools now "
+     "ignores the module versions in the .app file."];
+no_mod_vsn_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line PSAVE = code:get_path(),		% Save path
+
+    ?line {LatestDir, LatestName} = create_script(latest_no_mod_vsn,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line P1 = fname([LibDir, 'db-3.1', ebin]),
+    ?line P2 = fname([LibDir, 'fe-3.1', ebin]),
+
+    ?line true = code:add_patha(P1),
+    ?line true = code:add_patha(P2),
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line ok = systools:make_script(filename:basename(LatestName)),
+    ?line {ok, _} = read_script_file(LatestName),	% Check readabillity
+
+    %% Check the same but w. silent flag
+    ?line {ok, _, []} = systools:make_script(LatestName, [silent]),
+
+    %% Use the local option
+    ?line ok = systools:make_script(LatestName, [local]),
+    ?line ok = check_script_path(LatestName),
+
+    %% use the path option
+    ?line code:set_path(PSAVE),			% Restore path
+    %% Mess up std path:
+    ?line true = code:add_patha(fname([LibDir, 'db-1.0', ebin])),
+    ?line true = code:add_patha(fname([LibDir, 'fe-2.1', ebin])),
+
+    ?line error = systools:make_script(LatestName),	%should fail
+    ?line ok = systools:make_script(LatestName,
+				    [{path, [P1, P2]}]),
+
+    ?line ok = file:set_cwd(OldDir),
+    ?line code:set_path(PSAVE),			% Restore path
+    ok.
+
+
+%% make_script
+%%
+wildcard_script(suite) -> [];
+wildcard_script(doc) ->
+    ["Check that make_script handles wildcards in path."];
+wildcard_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line WildDir = fname([LibDir, '*', ebin]),
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line error = systools:make_script(filename:basename(LatestName)),
+
+    ?line ok = systools:make_script(LatestName,
+				    [{path, [WildDir]}]),
+
+    ?line {ok, _} = read_script_file(LatestName),	% Check readabillity
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+
+%% make_script
+%%
+variable_script(suite) -> [];
+variable_script(doc) ->
+    ["Add own installation dependent variable in script."];
+variable_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line P = [fname([LibDir, 'db-2.1', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line ok = systools:make_script(LatestName,
+				    [{path, P},
+				     {variables, [{"TEST", LibDir}]}]),
+
+    %% Check variables
+    ?line ok = check_var_script_file([fname(['$TEST', 'db-2.1', ebin]),
+				      fname(['$TEST', 'fe-3.1', ebin])],
+				     P,
+				     LatestName),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% make_script
+%%
+abnormal_script(suite) -> [];
+abnormal_script(doc) ->
+    ["Abnormal cases."];
+abnormal_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+
+    ?line ok = file:set_cwd(LatestDir),
+    ?line LibDir = fname([DataDir, d_bad_app_vsn, lib]),
+    ?line P = [fname([LibDir, 'db-2.1', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin])],
+
+    %% Check wrong app vsn
+    ?line error = systools:make_script(LatestName, [{path, P}]),
+    ?line {error,
+	   systools_make,
+	   [{error_reading, {db, {no_valid_version,
+				  {{"should be","2.1"},
+				   {"found file", _, "2.0"}}}}}]} =
+	systools:make_script(LatestName, [silent, {path, P}]),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+
+%% make_script
+%%
+src_tests_script(suite) -> [];
+src_tests_script(doc) ->
+    ["Do not check date of object file or that source code can be found."];
+src_tests_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line PSAVE = code:get_path(),		% Save path
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_missing_src, lib]),
+    ?line P1 = fname([LibDir, 'db-2.1', ebin]),
+    ?line P2 = fname([LibDir, 'fe-3.1', ebin]),
+    N = [P1, P2],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    %% Manipulate the modification date of a beam file so it seems
+    %% older than its .erl file
+    ?line Erl = filename:join([P1,"..","src","db1.erl"]),
+    ?line {ok, FileInfo=#file_info{mtime={{Y,M,D},T}}} = file:read_file_info(Erl),
+    ?line Beam = filename:join(P1,"db1.beam"),
+    ?line ok=file:write_file_info(Beam, FileInfo#file_info{mtime={{Y-1,M,D},T}}),
+
+    %% Remove a .erl file
+    ?line Erl2 = filename:join([P1,"..","src","db2.erl"]),
+    ?line file:delete(Erl2),
+
+    %% Then make script - two warnings should be issued when
+    %% src_tests is given
+    %% 1. old object code for db1.beam
+    %% 2. missing source code for db2.beam
+    ?line {ok, _, [{warning,{obj_out_of_date,_}},
+		   {warning,{source_not_found,_}}]} =
+	systools:make_script(LatestName, [silent, {path, N}, src_tests]),
+
+    %% Without the src_tests option, no warning should be issued
+    ?line {ok, _, []} =
+	systools:make_script(LatestName, [silent, {path, N}]),
+
+    %% Check that the old no_module_tests option (from the time when
+    %% it was default to do the src_test) is ignored
+    ?line {ok, _, [{warning,{obj_out_of_date,_}},
+		   {warning,{source_not_found,_}}]} =
+	systools:make_script(LatestName, [silent,
+					  {path, N},
+					  no_module_tests,
+					  src_tests]),
+
+    ?line ok = file:set_cwd(OldDir),
+    ?line code:set_path(PSAVE),
+    ok.
+
+%% make_script
+%%
+warn_shadow_script(suite) -> [];
+warn_shadow_script(doc) ->
+    ["Check that jam file out of date warning doesn't",
+     "shadow bad module version error."];
+warn_shadow_script(Config) when is_list(Config) ->
+    %% This test has been removed since the 'vsn' attribute is
+    %% not used any more, starting with R6. No warning
+    %% 'obj_out_of_date' seemed to be generated.
+    true.
+
+
+%% make_script
+%%
+crazy_script(suite) -> [];
+crazy_script(doc) ->
+    ["Do the crazy cases."];
+crazy_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest, Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line P = [fname([LibDir, 'db-2.1', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    %% Run with bad path
+    ?line error = systools:make_script(LatestName),
+    ?line {error, _, [{error_reading, _}, {error_reading, _}]} =
+	systools:make_script(LatestName, [silent]),
+
+    %% Run with .rel file lacking kernel
+    ?line {LatestDir2, LatestName2} = create_script(latest_nokernel, Config),
+    ?line ok = file:set_cwd(LatestDir2),
+
+    ?line error = systools:make_script(LatestName2),
+    ?line {error, _, {missing_mandatory_app,[kernel,stdlib]}} =
+	systools:make_script(LatestName2, [silent,{path,P}]),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% make_script
+%%
+included_script(suite) -> [];
+included_script(doc) ->
+    ["Check that make_script handles generation of script",
+     "for applications with included applications."];
+included_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line {LatestDir, LatestName} = create_include_files(inc1, Config),
+    ?line ok = file:set_cwd(LatestDir),
+    ?line ok = systools:make_script(LatestName),
+    ?line ok = check_include_script(LatestName,
+				    [t1, t2, t3, t5, t4, t6],
+				    [t1, t3, t6]),
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% make_script
+%%
+included_override_script(suite) -> [];
+included_override_script(doc) ->
+    ["Check that make_script handles generation of script",
+     "for applications with included applications which are override by",
+     "the .rel file."];
+included_override_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line {LatestDir, LatestName} = create_include_files(inc2, Config),
+    ?line ok = file:set_cwd(LatestDir),
+    ?line ok = systools:make_script(LatestName),
+    ?line ok = check_include_script(LatestName,
+				    [t1, t2, t3, t4, t6, t5],
+				    [t1, t3, t6, t5]),
+
+    ?line {_, LatestName1} = create_include_files(inc3, Config),
+    ?line ok = systools:make_script(LatestName1),
+    ?line ok = check_include_script(LatestName1,
+				    [t3, t5, t4, t6, t1, t2],
+				    [t3, t6, t1, t2]),
+
+    ?line {_, LatestName2} = create_include_files(inc4, Config),
+    ?line ok = systools:make_script(LatestName2),
+    ?line ok = check_include_script(LatestName2,
+				    [t3, t4, t6, t5, t1, t2],
+				    [t3, t6, t5, t1, t2]),
+
+    ?line {_, LatestName3} = create_include_files(inc5, Config),
+    ?line ok = systools:make_script(LatestName3),
+    ?line ok = check_include_script(LatestName3,
+				    [t3, t4, t6, t1, t2],
+				    [t3, t6, t1, t2]),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% make_script
+%%
+included_fail_script(suite) -> [];
+included_fail_script(doc) ->
+    ["Check that make_script handles errors then generating",
+     "script with included applications."];
+included_fail_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line {LatestDir, LatestName} = create_include_files(inc6, Config),
+    ?line ok = file:set_cwd(LatestDir),
+    ?line {error, _, {undefined_applications,[t2]}} =
+	systools:make_script(LatestName, [silent]),
+
+    ?line {_, LatestName1} = create_include_files(inc7, Config),
+    ?line {error, _, {duplicate_include,[{{t5,t7,_,_},{t5,t6,_,_}}]}} =
+	systools:make_script(LatestName1, [silent]),
+
+    ?line {_, LatestName3} = create_include_files(inc9, Config),
+    ?line {error, _, {circular_dependencies,[{t10,_},{t8,_}]}} =
+	systools:make_script(LatestName3, [silent]),
+
+    ?line {_, LatestName4} = create_include_files(inc10, Config),
+    ?line {error, _, [{error_reading,{t9,{override_include,[t7]}}}]} =
+	systools:make_script(LatestName4, [silent]),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% make_script
+%%
+included_bug_script(suite) -> [];
+included_bug_script(doc) ->
+    ["Check that make_script handles generation of script",
+     "with difficult dependency for included applications."];
+included_bug_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line {LatestDir, LatestName} = create_include_files(inc11, Config),
+    ?line ok = file:set_cwd(LatestDir),
+    ?line ok = systools:make_script(LatestName),
+    ?line ok = check_include_script(LatestName,
+				    [t13, t11, t12],
+				    [t11, t12]),
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+
+%% make_script
+%%
+otp_3065(suite) -> [];
+otp_3065(doc) ->
+    ["Circular dependencies in systools:make_script()."];
+otp_3065(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line {LatestDir, LatestName} = create_include_files(otp_3065, Config),
+    ?line ok = file:set_cwd(LatestDir),
+    ?line ok = systools:make_script(LatestName),
+    ?line ok = check_include_script(LatestName,
+				    [aa12, chAts, chTraffic],
+				    [chTraffic]),
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+
+%% make_script
+%%
+exref_script(suite) -> [];
+exref_script(doc) ->
+    ["Check that make_script exref option works."];
+exref_script(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line PSAVE = code:get_path(),		% Save path
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line P = [fname([LibDir, 'db-2.1', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line {ok, _, _} = systools:make_script(LatestName, [{path,P}, silent]),
+
+    %% Complete exref
+    ?line {ok, _, W1} = 
+	systools:make_script(LatestName, [exref, {path,P}, silent]),
+    ?line check_exref_warnings(with_db1, W1),
+    ?line {ok, _} = read_script_file(LatestName),	% Check readabillity
+
+    %% Only exref the db application.
+    ?line {ok, _, W2} =
+	systools:make_script(LatestName, [{exref,[db]}, {path,P}, silent]),
+    ?line check_exref_warnings(with_db1, W2),
+    ?line {ok, _} = read_script_file(LatestName),	% Check readabillity
+
+    %% Only exref the fe application.
+    ?line {ok, _, W3} =
+	systools:make_script(LatestName, [{exref,[fe]}, {path,P}, silent]),
+    ?line check_exref_warnings(without_db1, W3),
+    ?line {ok, _} = read_script_file(LatestName),	% Check readabillity
+
+    %% exref the db and stdlib applications.
+    ?line {ok, _, W4} =
+	systools:make_script(LatestName, [{exref,[db,stdlib]}, {path,P}, silent]),
+    ?line check_exref_warnings(with_db1, W4),
+    ?line {ok, _} = read_script_file(LatestName),	% Check readabillity
+    ?line ok = file:set_cwd(OldDir),
+    ?line code:set_path(PSAVE),			% Restore path
+    ok.
+
+check_exref_warnings(with_db1, W) ->
+    case get_exref(undef, W) of
+	{ok, [{db2,non_existing_func,0},
+	      {fe2,non_existing_func,0},
+	      {lists,non_existing_func,1}]} ->
+	    ok;
+	{ok, L} ->
+	    test_server:fail({exref_warning_undef, L});
+	_E ->
+	    test_server:fail({bad_undef,_E})
+    end;
+check_exref_warnings(without_db1, W) ->
+    case get_exref(undef, W) of
+	false ->
+	    ok;
+	{ok, L} ->
+	    test_server:fail({exref_warning_undef, L})
+    end.
+
+get_exref(undef, W)   -> filter(no_hipe(get_exref1(exref_undef, W))).
+
+filter(false) ->
+    false;
+filter({ok, W}) ->
+    {ok, filter(W)};
+filter(L) ->
+    lists:filter(fun%({hipe_consttab,_,_}) -> false;
+		    ({int,_,_}) -> false;
+		    ({i,_,_}) -> false;
+		    ({crypto,_,_}) -> false;
+		    (_) -> true
+		 end,
+		 L).
+
+get_exref1(T, [{warning, {T, Value}}|_]) -> {ok, Value};
+get_exref1(T, [_|W])                     -> get_exref1(T, W);
+get_exref1(_, [])                        -> false.
+
+no_hipe(false) ->
+    false;
+no_hipe({ok, Value}) ->
+    case erlang:system_info(hipe_architecture) of
+	undefined ->
+	    Hipe = "hipe",
+	    Fun = fun({M,_,_}) -> not lists:prefix(Hipe, atom_to_list(M)) end,
+	    NewValue = lists:filter(Fun, Value),
+	    {ok, NewValue};
+	_Arch ->
+	    {ok, Value}
+    end.
+
+%% tar_options
+%%
+tar_options(suite) -> [];
+tar_options(doc) ->
+    ["Check illegal tar options."];
+tar_options(Config) when is_list(Config) ->
+    ?line {'EXIT',{{badarg,[{path,["Path",12,"Another"]}]}, _}} =
+	(catch systools:make_tar("release", [{path,["Path",12,"Another"]}])),
+    ?line {'EXIT',{{badarg,[sillent]}, _}} =
+	(catch systools:make_tar("release",
+				 [{path,["Path","Another"]},sillent])),
+    ?line {'EXIT',{{badarg,[{dirs,["dirs"]}]}, _}} =
+	(catch systools:make_tar("release", [{dirs, ["dirs"]}])),
+    ?line {'EXIT',{{badarg,[{erts, illegal}]}, _}} =
+	(catch systools:make_tar("release", [{erts, illegal}])),
+    ?line {'EXIT',{{badarg,[src_testsxx]}, _}} =
+	(catch systools:make_tar("release",
+				 [{path,["Path"]},src_testsxx])),
+    ?line {'EXIT',{{badarg,[{variables, [{a, b}, {"a", "b"}]}]}, _}} =
+	(catch systools:make_tar("release",
+				 [{variables, [{a, b}, {"a", "b"}]}])),
+    ?line {'EXIT',{{badarg,[{var_tar, illegal}]}, _}} =
+	(catch systools:make_tar("release", [{var_tar, illegal}])),
+    ?line {'EXIT',{{badarg,[exreff]}, _}} =
+	(catch systools:make_tar("release",
+				 [{path,["Path","Another"]},exreff])),
+    ?line {'EXIT',{{badarg,[{exref,["appl"]}]}, _}} =
+	(catch systools:make_tar("release", [{exref,["appl"]}])),
+    ?line {'EXIT',{{badarg,[{machine, "appl"}]}, _}} =
+	(catch systools:make_tar("release", [{machine,"appl"}])),
+    ok.
+
+
+%% normal_tar
+%%
+normal_tar(suite) -> [];
+normal_tar(doc) ->
+    ["Check normal case"];
+normal_tar(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line P = [fname([LibDir, 'db-2.1', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line {ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
+    ?line ok = systools:make_tar(LatestName, [{path, P}]),
+    ?line ok = check_tar(fname([lib,'db-2.1',ebin,'db.app']), LatestName),
+    ?line {ok, _, _} = systools:make_tar(LatestName, [{path, P}, silent]),
+    ?line ok = check_tar(fname([lib,'fe-3.1',ebin,'fe.app']), LatestName),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% no_mod_vsn_tar
+%%
+no_mod_vsn_tar(suite) -> [];
+no_mod_vsn_tar(doc) ->
+    ["Check normal case",
+     "Modules specified without version in .app file (db-3.1)."
+     "Note that this is now the normal way - i.e. systools now "
+     "ignores the module versions in the .app file."];
+no_mod_vsn_tar(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest_no_mod_vsn,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line P = [fname([LibDir, 'db-3.1', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line {ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
+    ?line ok = systools:make_tar(LatestName, [{path, P}]),
+    ?line ok = check_tar(fname([lib,'db-3.1',ebin,'db.app']), LatestName),
+    ?line {ok, _, _} = systools:make_tar(LatestName, [{path, P}, silent]),
+    ?line ok = check_tar(fname([lib,'fe-3.1',ebin,'fe.app']), LatestName),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% variable_tar
+%%
+variable_tar(suite) -> [];
+variable_tar(doc) ->
+    ["Use variable and create separate tar (included in generated tar)."];
+variable_tar(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line P = [fname([LibDir, 'db-2.1', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line {ok, _, _} = systools:make_script(LatestName,
+					    [silent,
+					     {path, P},
+					     {variables,[{"TEST", LibDir}]}]),
+
+    ?line ok = systools:make_tar(LatestName, [{path, P},
+					      {variables,[{"TEST", LibDir}]}]),
+    ?line ok = check_var_tar("TEST", LatestName),
+
+    ?line {ok, _, _} = systools:make_tar(LatestName,
+					 [{path, P}, silent,
+					  {variables,[{"TEST", LibDir}]}]),
+    ?line ok = check_var_tar("TEST", LatestName),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% link_tar
+%%
+link_tar(suite) -> [];
+link_tar(doc) ->
+    ["Check that symlinks in applications are handled correctly"];
+link_tar(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_links, lib]),
+    ?line P = [fname([LibDir, 'db-2.1', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin])],
+
+    %% Make some links
+    ?line Db1Erl = fname(['db-2.1',src,'db1.erl']),
+    ?line NormalDb1Erl = fname([DataDir,d_normal,lib,Db1Erl]),
+    ?line LinkDb1Erl = fname([LibDir, Db1Erl]),
+    ?line ok = file:make_symlink(NormalDb1Erl, LinkDb1Erl),
+    ?line Db1Beam = fname(['db-2.1',ebin,'db1.beam']),
+    ?line NormalDb1Beam = fname([DataDir,d_normal,lib,Db1Beam]),
+    ?line LinkDb1Beam = fname([LibDir, Db1Beam]),
+    ?line ok = file:make_symlink(NormalDb1Beam, LinkDb1Beam),
+    ?line FeApp = fname(['fe-3.1',ebin,'fe.app']),
+    ?line NormalFeApp = fname([DataDir,d_normal,lib,FeApp]),
+    ?line LinkFeApp = fname([LibDir, FeApp]),
+    ?line ok = file:make_symlink(NormalFeApp, LinkFeApp),
+    
+    %% Create the tar and check that the linked files are included as
+    %% regular files
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line {ok,_,[]} = systools:make_script(LatestName, [{path, P},silent]),
+
+    ?line {ok, _, []} = systools:make_tar(LatestName, [{path, P}, silent]),
+    ?line ok = check_tar_regular(?privdir,
+				 [fname([lib,FeApp]),
+				  fname([lib,Db1Beam])],
+				 LatestName),
+    
+    ?line {ok, _, []} = systools:make_tar(LatestName, [{path, P}, silent,
+						       {dirs, [src]}]),
+    ?line ok = check_tar_regular(?privdir,
+				 [fname([lib,FeApp]),
+				  fname([lib,Db1Beam]),
+				  fname([lib,Db1Erl])],
+				 LatestName),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% src_tests_tar
+%%
+src_tests_tar(suite) -> [];
+src_tests_tar(doc) ->
+    ["Do not check date of object file or that source code can be found."];
+src_tests_tar(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_missing_src, lib]),
+    ?line P1 = fname([LibDir, 'db-2.1', ebin]),
+    ?line P2 = fname([LibDir, 'fe-3.1', ebin]),
+    P = [P1, P2],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    %% Manipulate the modification date of a beam file so it seems
+    %% older than the .erl file
+    Erl = filename:join([P1,"..","src","db1.erl"]),
+    {ok, FileInfo=#file_info{mtime={{Y,M,D},T}}} = file:read_file_info(Erl),
+    Beam = filename:join(P1,"db1.beam"),
+    ok = file:write_file_info(Beam, FileInfo#file_info{mtime={{Y-1,M,D},T}}),
+
+    %% Remove a .erl file
+    ?line Erl2 = filename:join([P1,"..","src","db2.erl"]),
+    ?line file:delete(Erl2),
+
+    ?line ok = systools:make_script(LatestName, [{path, P}]),
+
+    %% Then make tar - two warnings should be issued when
+    %% src_tests is given
+    %% 1. old object code for db1.beam
+    %% 2. missing source code for db2.beam
+    ?line {ok, _, [{warning,{obj_out_of_date,_}},
+    		   {warning,{source_not_found,_}}]} =
+	systools:make_tar(LatestName, [{path, P}, silent,
+				       {dirs, [src]},
+				       src_tests]),
+    ?line ok = check_tar(fname([lib,'db-2.1',src,'db1.erl']), LatestName),
+
+    %% Without the src_tests option, no warning should be issued
+    ?line {ok, _, []} = systools:make_tar(LatestName, [{path, P}, silent,
+						       {dirs, [src]}]),
+    ?line ok = check_tar(fname([lib,'db-2.1',src,'db1.erl']), LatestName),
+
+    %% Check that the old no_module_tests option (from the time when
+    %% it was default to do the src_test) is ignored
+    ?line {ok, _, [{warning,{obj_out_of_date,_}},
+    		   {warning,{source_not_found,_}}]} =
+	systools:make_tar(LatestName, [{path, P}, silent,
+				       {dirs, [src]},
+				       no_module_tests,
+				       src_tests]),
+    ?line ok = check_tar(fname([lib,'db-2.1',src,'db1.erl']), LatestName),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% shadow_tar
+%%
+shadow_tar(suite) -> [];
+shadow_tar(doc) ->
+    ["Check that jam file out of date warning doesn't",
+     "shadow bad module version error."];
+shadow_tar(Config) when is_list(Config) ->
+    % This test has been commented out since the 'vsn' attribute is not used
+    % any more, starting with R6. No warning 'obj_out_of_date' seemed to be
+    % generated.
+    true;
+shadow_tar(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line PSAVE = code:get_path(),		% Save path
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, 'd_bad_mod+warn', lib]),
+    ?line P = [fname([LibDir, 'db-2.1', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line {error, _, _} = systools:make_tar(LatestName, [{path, P}, silent]),
+    ?line {error, _, _} = systools:make_tar(LatestName, [{path, P}, silent,
+							 {dirs, [src]}]),
+    ?line ok = file:set_cwd(OldDir),
+    ?line code:set_path(PSAVE),
+    ok.
+
+
+%% var_tar
+%%
+var_tar(suite) -> [];
+var_tar(doc) ->
+    ["Check that make_tar handles generation and placement of tar",
+     "files for variables outside the main tar file.",
+     "Test the {var_tar, include | ownfile | omit} option."];
+var_tar(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line PSAVE = code:get_path(),		% Save path
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line P = [fname([LibDir, 'db-2.1', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line {ok, _, _} = systools:make_script(LatestName,
+					    [silent,
+					     {path, P},
+					     {variables,[{"TEST", LibDir}]}]),
+
+    ?line ok = systools:make_tar(LatestName, [{path, P},
+					      {var_tar, ownfile},
+					      {variables,[{"TEST", LibDir}]}]),
+
+    ?line true = exists_tar_file("TEST"), %% Also removes the file !
+    ?line {error, {not_generated, _}} = check_var_tar("TEST", LatestName),
+
+    ?line ok = systools:make_tar(LatestName, [{path, P},
+					      {var_tar, omit},
+					      {variables,[{"TEST", LibDir}]}]),
+
+    ?line {error, {not_generated, _}} = check_var_tar("TEST", LatestName),
+    ?line false = exists_tar_file("TEST"),
+
+    ?line ok = systools:make_tar(LatestName, [{path, P},
+					      {var_tar, include},
+					      {variables,[{"TEST", LibDir}]}]),
+
+    ?line ok = check_var_tar("TEST", LatestName),
+    ?line false = exists_tar_file("TEST"),
+
+    ?line ok = file:set_cwd(OldDir),
+    ?line code:set_path(PSAVE),
+    ok.
+
+
+%% exref_tar
+%%
+exref_tar(suite) -> [];
+exref_tar(doc) ->
+    ["Check exref option."];
+exref_tar(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line P = [fname([LibDir, 'db-2.1', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line {ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
+
+    %% Complete exref
+    ?line {ok, _, W1} =
+	systools:make_tar(LatestName, [exref, {path, P}, silent]),
+    ?line check_exref_warnings(with_db1, W1),
+    ?line ok = check_tar(fname([lib,'db-2.1',ebin,'db.app']), LatestName),
+
+    %% Only exref the db application.
+    ?line {ok, _, W2} =
+	systools:make_tar(LatestName, [{exref, [db]}, {path, P}, silent]),
+    ?line check_exref_warnings(with_db1, W2),
+    ?line ok = check_tar(fname([lib,'fe-3.1',ebin,'fe.app']), LatestName),
+
+    %% Only exref the fe application.
+    ?line {ok, _, W3} =
+	systools:make_tar(LatestName, [{exref, [fe]}, {path, P}, silent]),
+    ?line check_exref_warnings(without_db1, W3),
+    ?line ok = check_tar(fname([lib,'db-2.1',ebin,'db.app']), LatestName),
+
+    %% exref the db and stdlib applications.
+    ?line {ok, _, W4} =
+	systools:make_tar(LatestName, [{exref, [db, stdlib]},
+				       {path, P}, silent]),
+    ?line check_exref_warnings(with_db1, W4),
+    ?line ok = check_tar(fname([lib,'fe-3.1',ebin,'fe.app']), LatestName),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% The relup stuff.
+%%
+%%
+
+
+%% make_relup
+%%
+normal_relup(suite) -> [];
+normal_relup(doc) ->
+    ["Check normal case"];
+normal_relup(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir,LatestName}   = create_script(latest0,Config),
+    ?line {_LatestDir1,LatestName1} = create_script(latest1,Config),
+    ?line {_LatestDir2,LatestName2} = create_script(latest2,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = [fname([DataDir, d_normal, lib])],
+    ?line P = [fname([LibDir, '*', ebin]),
+	       fname([DataDir, lib, kernel, ebin]),
+	       fname([DataDir, lib, stdlib, ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    %% OTP-2561: Check that the option 'restart_emulator' generates a
+    %% "restart_new_emulator" instruction.
+    ?line {ok, _ , _, []} =
+         systools:make_relup(LatestName, [LatestName1], [LatestName1],
+			     [{path, P},restart_emulator,silent]),
+    ?line ok = check_relup([{db, "2.1"}], [{db, "1.0"}]),
+    ?line ok = check_restart_emulator(),
+
+    %% This is the ultra normal case
+    ?line ok = systools:make_relup(LatestName, [LatestName1], [LatestName1],
+				   [{path, P}]),
+    ?line ok = check_relup([{db, "2.1"}], [{db, "1.0"}]),
+    ?line {ok, _, _, []} =
+	systools:make_relup(LatestName, [LatestName1], [LatestName1],
+			    [{path, P}, silent]),
+    ?line ok = check_relup([{db, "2.1"}], [{db, "1.0"}]),
+
+    %% Check that warnings get through
+    ?line ok = systools:make_relup(LatestName, [LatestName2], [LatestName1],
+				   [{path, P}]),
+    ?line ok = check_relup([{fe, "3.1"}, {db, "2.1"}], [{db, "1.0"}]),
+    ?line {ok, _, _, [{erts_vsn_changed, _}]} =
+	systools:make_relup(LatestName, [LatestName2], [LatestName1],
+			    [{path, P}, silent]),
+    ?line ok = check_relup([{fe, "3.1"}, {db, "2.1"}], [{db, "1.0"}]),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+
+%% This test fails if wrong version numbers are seen in the relup file
+%% or if any application is missing. This was triggered by OTP-1360.
+check_relup(UpVsnL, DnVsnL) ->
+    {ok, [{_V1, [{_, _, Up}], [{_, _, Dn}]}]} = file:consult(relup),
+    [] = foldl(fun(X, Acc) ->
+		       true = lists:member(X, Acc),
+		       lists:delete(X, Acc) end,
+	       UpVsnL,
+	       [{App, Vsn} || {load_object_code,{App,Vsn,_}} <- Up]),
+    [] = foldl(fun(X, Acc) ->
+		       true = lists:member(X, Acc),
+		       lists:delete(X, Acc) end,
+	       DnVsnL,
+	       [{App, Vsn} || {load_object_code,{App,Vsn,_}} <- Dn]),
+    ok.
+
+check_restart_emulator() ->
+    {ok, [{_V1, [{_, _, Up}], [{_, _, Dn}]}]} = file:consult(relup),
+    restart_new_emulator = lists:last(Up),
+    restart_new_emulator = lists:last(Dn),
+    ok.
+
+%% make_relup
+%%
+no_appup_relup(suite) -> [];
+no_appup_relup(doc) ->
+    ["Check that appup files may be missing, but only if we don't need them."];
+no_appup_relup(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir,LatestName}   = create_script(latest_small,Config),
+    ?line {_LatestDir0,LatestName0} = create_script(latest_small0,Config),
+    ?line {_LatestDir1,LatestName1} = create_script(latest_small1,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line P1 = [fname([DataDir, d_no_appup, lib, 'fe-3.1', ebin]),
+		fname([DataDir, lib, kernel, ebin]),
+		fname([DataDir, lib, stdlib, ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    %% Check that appup might be missing
+    ?line ok =
+	systools:make_relup(LatestName, [LatestName], [], [{path, P1}]),
+    ?line {ok,_, _, []} =
+	systools:make_relup(LatestName, [LatestName], [],
+			    [silent, {path, P1}]),
+
+    %% Check that appup might NOT be missing when we need it
+    ?line error =
+	systools:make_relup(LatestName, [LatestName0], [], [{path, P1}]),
+    ?line {error,_,{file_problem, {_,{error,{open,_,_}}}}} =
+	systools:make_relup(LatestName, [], [LatestName0],
+			    [silent, {path, P1}]),
+
+    %% Check that appups missing vsn traps
+    ?line P2 = [fname([DataDir, d_no_appup, lib, 'fe-2.1', ebin]),
+		fname([DataDir, lib, kernel, ebin]),
+		fname([DataDir, lib, stdlib, ebin])],
+
+    ?line error =
+	systools:make_relup(LatestName0, [LatestName1], [], [{path, P2}]),
+    ?line {error,_,{no_relup, _, _, _}} =
+	systools:make_relup(LatestName0, [], [LatestName1],
+			    [silent, {path, P2}]),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% make_relup
+%%
+bad_appup_relup(suite) -> [];
+bad_appup_relup(doc) ->
+    ["Check that badly written appup files are detected"];
+bad_appup_relup(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir,LatestName}   = create_script(latest_small,Config),
+    ?line {_LatestDir0,LatestName0} = create_script(latest_small0,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line N2 = [fname([DataDir, d_bad_appup, lib, 'fe-3.1', ebin]),
+		fname([DataDir, lib, kernel, ebin]),
+		fname([DataDir, lib, stdlib, ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+    %% Check that bad appup is trapped
+    ?line error =
+	systools:make_relup(LatestName, [LatestName0], [], [{path, N2}]),
+    ?line {error,_,{file_problem, {_, {error, {parse,_, _}}}}} =
+	systools:make_relup(LatestName, [], [LatestName0],
+			    [silent, {path, N2}]),
+
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+%% make_relup
+%%
+abnormal_relup(suite) -> [];
+abnormal_relup(doc) ->
+    ["Check some abnormal cases"];
+abnormal_relup(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir,LatestName}   = create_script(latest0,Config),
+    ?line {_LatestDir1,LatestName1} = create_script(latest1,Config),
+
+    %% Check wrong app vsn
+    ?line DataDir = filename:absname(?copydir),
+    ?line P = [fname([DataDir, d_bad_app_vsn, lib, 'db-2.1', ebin]),
+	       fname([DataDir, d_bad_app_vsn, lib, 'fe-3.1', ebin]),
+	       fname([DataDir, lib, kernel, ebin]),
+	       fname([DataDir, lib, stdlib, ebin])],
+    
+    ?line ok = file:set_cwd(LatestDir),
+
+    ?line error = systools:make_relup(LatestName, [LatestName1], [LatestName1],
+				      [{path, P}]),
+    ?line R0 = systools:make_relup(LatestName, [LatestName1], [LatestName1],
+			      [silent, {path, P}]),
+    ?line {error,systools_make,
+	     [{error_reading,{db,{no_valid_version,
+				  {{"should be","2.1"},
+				   {"found file", _, "2.0"}}}}}]} = R0,
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+
+%% Check that application start type is used in relup
+app_start_type_relup(suite) ->
+    [];
+app_start_type_relup(doc) ->
+    ["Release upgrade file with various application start types"];
+app_start_type_relup(Config) when is_list(Config) ->
+    ?line PrivDir = ?config(priv_dir, Config),
+    ?line {Dir1,Name1} = create_script(latest_app_start_type1,Config),
+    ?line {Dir2,Name2} = create_script(latest_app_start_type2,Config),
+    ?line Release1 = filename:join(Dir1,Name1),
+    ?line Release2 = filename:join(Dir2,Name2),
+
+    ?line {ok, Release2Relup, systools_relup, []} = systools:make_relup(Release2, [Release1], [Release1], [{outdir, PrivDir}, silent]),
+    ?line {"2", [{"1",[], UpInstructions}], [{"1",[], DownInstructions}]} = Release2Relup,
+    %% ?t:format("Up: ~p",[UpInstructions]),
+    %% ?t:format("Dn: ~p",[DownInstructions]),
+    ?line [{load_object_code, {mnesia, _, _}},
+           {load_object_code, {sasl, _, _}},
+           {load_object_code, {webtool, _, _}},
+           {load_object_code, {snmp, _, _}},
+           {load_object_code, {xmerl, _, _}},
+           point_of_no_return
+           | UpInstructionsT] = UpInstructions,
+    ?line true = lists:member({apply,{application,start,[mnesia,permanent]}}, UpInstructionsT),
+    ?line true = lists:member({apply,{application,start,[sasl,transient]}}, UpInstructionsT),
+    ?line true = lists:member({apply,{application,start,[webtool,temporary]}}, UpInstructionsT),
+    ?line true = lists:member({apply,{application,load,[snmp]}}, UpInstructionsT),
+    ?line false = lists:any(fun({apply,{application,_,[xmerl|_]}}) -> true; (_) -> false end, UpInstructionsT),
+    ?line [point_of_no_return | DownInstructionsT] = DownInstructions,
+    ?line true = lists:member({apply,{application,stop,[mnesia]}}, DownInstructionsT),
+    ?line true = lists:member({apply,{application,stop,[sasl]}}, DownInstructionsT),
+    ?line true = lists:member({apply,{application,stop,[webtool]}}, DownInstructionsT),
+    ?line true = lists:member({apply,{application,stop,[snmp]}}, DownInstructionsT),
+    ?line true = lists:member({apply,{application,stop,[xmerl]}}, DownInstructionsT),
+    ?line true = lists:member({apply,{application,unload,[mnesia]}}, DownInstructionsT),
+    ?line true = lists:member({apply,{application,unload,[sasl]}}, DownInstructionsT),
+    ?line true = lists:member({apply,{application,unload,[webtool]}}, DownInstructionsT),
+    ?line true = lists:member({apply,{application,unload,[snmp]}}, DownInstructionsT),
+    ?line true = lists:member({apply,{application,unload,[xmerl]}}, DownInstructionsT),
+    ok.
+
+
+otp_6226(suite) ->
+    [];
+otp_6226(doc) ->
+    ["{outdir,Dir} option for systools:make_script()"];
+otp_6226(Config) when is_list(Config) ->
+    PrivDir = ?privdir,
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest0,Config),
+    ?line {_LatestDir, LatestName1} = create_script(latest1,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line P = [fname([LibDir, 'db-2.1', ebin]),
+	       fname([LibDir, 'db-1.0', ebin]),
+	       fname([LibDir, 'fe-3.1', ebin]),
+	       fname([DataDir, lib, kernel, ebin]),
+	       fname([DataDir, lib, stdlib, ebin])],
+
+    ?line ok = file:set_cwd(LatestDir),
+
+ 
+    %% Create an outdir1 directory
+    ?line ok = file:make_dir("outdir1"),
+
+    %% ==== Now test systools:make_script ====
+    %% a) badarg
+    ?line {'EXIT', {{badarg,[{outdir,outdir1}]}, _}} =
+	(catch systools:make_script(LatestName, [{outdir,outdir1},
+						 {path,P},silent])),
+
+    %% b) absolute path
+    Outdir1 = filename:join(PrivDir, "outdir1"),
+    ?line {ok,_,[]} = systools:make_script(LatestName, [{outdir,Outdir1},
+							{path,P},silent]),
+    ?line Script1 = filename:join(Outdir1, LatestName ++ ".script"),
+    ?line Boot1 = filename:join(Outdir1, LatestName ++ ".boot"),
+    ?line true = filelib:is_file(Script1),
+    ?line true = filelib:is_file(Boot1),
+    ?line ok = file:delete(Script1),
+    ?line ok = file:delete(Boot1),
+
+    %% c) relative path
+    ?line {ok,_,[]} = systools:make_script(LatestName, [{outdir,"./outdir1"},
+							{path,P},silent]),
+    ?line true = filelib:is_file(Script1),
+    ?line true = filelib:is_file(Boot1),
+    ?line ok = file:delete(Script1),
+    ?line ok = file:delete(Boot1),
+
+    %% d) absolute but incorrect path
+    ?line Outdir2 = filename:join(PrivDir, "outdir2"),
+    ?line Script2 = filename:join(Outdir2, LatestName ++ ".script"),
+    ?line {error,_,{open,Script2,_}} = 
+	systools:make_script(LatestName, [{outdir,Outdir2},{path,P},silent]),
+
+    %% e) relative but incorrect path
+    ?line {error,_,{open,_,_}} = 
+	systools:make_script(LatestName, [{outdir,"./outdir2"},{path,P},silent]),
+
+    %% f) with .rel in another directory than cwd
+    ?line ok = file:set_cwd(Outdir1),
+    ?line {ok,_,[]} = systools:make_script(filename:join(PrivDir, LatestName),
+					   [{outdir,"."},{path,P},silent]),
+    ?line true = filelib:is_file(LatestName ++ ".script"),
+    ?line true = filelib:is_file(LatestName ++ ".boot"),
+    ?line ok = file:delete(LatestName ++ ".script"),
+    ?line ok = file:delete(LatestName ++ ".boot"),
+    ?line ok = file:set_cwd(LatestDir),
+
+    %% ==== Now test systools:make_tar =====
+    ?line {ok,_,[]} = systools:make_script(LatestName, [{path,P},silent]),
+    %% a) badarg
+    ?line {'EXIT', {{badarg, [{outdir,outdir1}]}, _}} =
+    	(catch systools:make_tar(LatestName,[{outdir,outdir1},{path,P},silent])),
+
+    %% b) absolute path
+    ?line {ok,_,[]} = systools:make_tar(LatestName, [{outdir,Outdir1}, 
+						     {path,P},silent]),
+    ?line Tar1 = filename:join(Outdir1,LatestName++".tar.gz"),
+    ?line true = filelib:is_file(Tar1),
+    ?line ok = file:delete(Tar1),
+
+    %% c) relative path
+    ?line {ok,_,[]} = systools:make_tar(LatestName, [{outdir,"./outdir1"},
+						     {path,P},silent]),
+    ?line true = filelib:is_file(Tar1),
+    ?line ok = file:delete(Tar1),
+
+    %% d) absolute but incorrect path
+    ?line Tar2 = filename:join(Outdir2,LatestName++".tar.gz"),
+    ?line {error,_,{tar_error,{open,Tar2,{Tar2,enoent}}}} = 
+	systools:make_tar(LatestName, [{outdir,Outdir2},{path,P},silent]),
+    
+    %% e) relative but incorrect path
+    ?line {error,_,{tar_error,{open,_,_}}} = 
+	   systools:make_tar(LatestName, [{outdir,"./outdir2"},{path,P},silent]),
+
+    %% f) with .rel in another directory than cwd
+    ?line ok = file:set_cwd(Outdir1),
+    ?line {ok,_,[]} = systools:make_tar(filename:join(PrivDir, LatestName),
+					[{outdir,"."},{path,P},silent]),
+    ?line true = filelib:is_file(Tar1),
+    ?line ok = file:set_cwd(LatestDir),
+
+    %% ===== Now test systools:make_relup =====
+    %% a) badarg
+    ?line {'EXIT', {{badarg, [{outdir,outdir1}]}, _}} =
+    	(catch systools:make_relup(LatestName,[LatestName1],[LatestName1],
+    				   [{outdir,outdir1}, 
+				    {path,P},silent])),
+
+    %% b) absolute path
+    Relup = filename:join(Outdir1, "relup"),
+    ?line {ok,_,_,[]} = systools:make_relup(LatestName,[LatestName1],[LatestName1],
+					    [{outdir,Outdir1},
+					     {path,P},silent]),
+    ?line true = filelib:is_file(Relup),
+    ?line ok = file:delete(Relup),
+    
+    %% c) relative path
+    ?line {ok,_,_,[]} = systools:make_relup(LatestName,[LatestName1],[LatestName1],
+					    [{outdir,"./outdir1"},
+					     {path,P},silent]),
+    ?line true = filelib:is_file(Relup),
+    ?line ok = file:delete(Relup),
+    
+    %% d) absolute but incorrect path
+    ?line {error,_,{file_problem,{"relup",enoent}}} = 
+	systools:make_relup(LatestName,[LatestName1],[LatestName1],
+			    [{outdir,Outdir2},{path,P},silent]),
+    
+    %% e) relative but incorrect path
+    ?line {error,_,{file_problem,{"relup",enoent}}} = 
+	systools:make_relup(LatestName,[LatestName1],[LatestName1],
+			    [{outdir,"./outdir2"},{path,P},silent]),
+
+    %% f) with .rel in another directory than cwd
+    %% -- not necessary to test since relup by default is placed in
+    %%    cwd, not in the same directory as the .rel file --
+
+    %% Change back to previous working directory
+    ?line ok = file:set_cwd(OldDir),
+    ok.
+
+
+%%%%%%
+%%%%%% Utilities
+%%%%%%
+
+check_script_path(RelName) ->
+    {ok, [Conts]} = read_script_file(RelName),
+    {script, {_, _}, ListOfThings} = Conts,
+    case lists:keysearch(path, 1, ListOfThings) of
+	{value, {path, [$$,$R,$O,$O,$T | _]}} -> %"$ROOT..."
+	    false;
+	_ -> ok
+    end.
+
+check_var_script_file(VarDirs, NoExistDirs, RelName) ->
+    {ok, [Conts]} = read_script_file(RelName),
+    {script, {_, _}, ListOfThings} = Conts,
+    AllPaths = lists:append(lists:map(fun({path, P}) -> P;
+					 (_)         -> []
+				      end,
+				  ListOfThings)),
+    case lists:filter(fun(VarDir) -> lists:member(VarDir, AllPaths) end,
+		      VarDirs) of
+	VarDirs ->
+	    ok;
+	_ ->
+	    test_server:fail("All variable dirs not in generated script")
+    end,
+    case lists:filter(fun(NoExistDir) -> lists:member(NoExistDir, AllPaths) end,
+		      NoExistDirs) of
+	[] ->
+	    ok;
+	_ ->
+	    test_server:fail("Unexpected dirs in generated script")
+    end.
+
+check_include_script(RelName, ExpectedLoad, ExpectedStart) ->
+    {ok, [Conts]} = read_script_file(RelName),
+    {script, {_, _}, ListOfThings} = Conts,
+
+    %% Check that the applications are loaded in given order !
+    ActualLoad = 
+	[App || {apply,{application,load,[{application,App,_}]}} <- ListOfThings,
+		App=/=kernel,
+		App=/=stdlib],
+    
+    if ActualLoad =:= ExpectedLoad -> ok;
+       true -> test_server:fail({bad_load_order, ActualLoad, ExpectedLoad})
+    end,
+
+    %% Check that applications are started in given order !
+    ActualStart =
+	[App || {apply,{application,start_boot,[App|_]}} <- ListOfThings,
+		App =/= kernel,
+		App =/= stdlib],
+
+    if ActualStart =:= ExpectedStart -> ok;
+       true -> test_server:fail({bad_start_order, ActualStart,ExpectedStart})
+    end,
+
+    ok.
+
+read_script_file(RelName) ->
+    file:consult(RelName ++ ".script").
+
+check_var_tar(Variable, RelName) ->
+    Expected = tar_name(Variable),
+    case check_tar(Expected,RelName) of
+	ok ->
+	    ok;
+	{error, {erroneous_tar_file, _, missing, _}} ->
+	    {error, {not_generated, Expected}}
+    end.
+
+exists_tar_file(Name) ->
+    File = tar_name(Name),
+    case filelib:is_regular(File) of
+	true ->
+	    ok = file:delete(File),
+	    true;
+	_ ->
+	    false
+    end.
+
+%% Take a snap of the generated tar file and check if a certain
+%% file is included.
+%% This ensures at least that the tar file is generated.
+check_tar(File, RelName) ->
+    TarContents = tar_contents(RelName),
+    case lists:member(File,TarContents) of
+	true -> ok;
+	_    -> {error, {erroneous_tar_file, tar_name(RelName), missing, File}}
+    end.
+
+%% Check that the given files exist in the tar file, and that they are
+%% not symlinks
+check_tar_regular(PrivDir, Files, RelName) ->
+    TmpDir = fname(PrivDir,tmp),
+    ok = file:make_dir(TmpDir),
+    ok = erl_tar:extract(tar_name(RelName),
+			 [{files,Files},{cwd,TmpDir},compressed]),
+    R = lists:foldl(fun(File,Acc) ->
+			    case file:read_link_info(fname(TmpDir,File)) of 
+				{ok,#file_info{type=regular}} ->
+				    Acc;
+				{ok,#file_info{type=Other}} ->
+				    [{File,Other}|Acc];
+				_ ->
+				    [{File,missing}|Acc]
+			    end
+		    end,
+		    [],
+		    Files),
+    delete_tree(TmpDir),
+    case R of
+	[] ->
+	    ok;
+	NotThere ->
+	    {error,{erroneous_tar_file,tar_name(RelName),NotThere}}
+    end.
+	    
+delete_tree(Dir) ->
+    case filelib:is_dir(Dir) of
+	true ->
+	    {ok,Files} = file:list_dir(Dir),
+	    lists:foreach(fun(File) -> delete_tree(filename:join(Dir,File)) end, 
+			  Files),
+	    file:del_dir(Dir);
+	false ->
+	    ok = file:delete(Dir)
+    end.
+
+tar_contents(Name) ->
+    {ok, Cont} = erl_tar:table(Name ++ ".tar.gz", [compressed]),
+    Cont.
+
+tar_name(Name) ->
+    Name ++ ".tar.gz".
+
+create_script(latest,Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, latest),
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line io:format(Fd,
+		    "{release, {\"Test release 3\", \"LATEST\"}, \n"
+		    " {erts, \"4.4\"}, \n"
+		    " [{kernel, \"~s\"}, {stdlib, \"~s\"}, \n"
+		    "  {db, \"2.1\"}, {fe, \"3.1\"}]}.\n",
+		    [KernelVer,StdlibVer]),
+    ?line ok = file:close(Fd),
+    {filename:dirname(Name), filename:basename(Name)};
+create_script(latest_no_mod_vsn,Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, latest),
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line io:format(Fd,
+		    "{release, {\"Test release 3\", \"LATESTNOMOD\"}, \n"
+		    " {erts, \"4.4\"}, \n"
+		    " [{kernel, \"~s\"}, {stdlib, \"~s\"}, \n"
+		    "  {db, \"3.1\"}, {fe, \"3.1\"}]}.\n",
+		    [KernelVer,StdlibVer]),
+    ?line ok = file:close(Fd),
+    {filename:dirname(Name), filename:basename(Name)};
+create_script(latest0,Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, 'latest-1'),
+    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line io:format(Fd,
+		    "{release, {\"Test release 2\", \"LATEST0\"}, \n"
+		    " {erts, \"4.4\"}, \n"
+		    " [{kernel, \"1.0\"}, {stdlib, \"1.0\"}, \n"
+		    "  {db, \"2.1\"}, {fe, \"3.1\"}]}.\n",
+		    []),
+    ?line ok = file:close(Fd),
+    {filename:dirname(Name), filename:basename(Name)};
+create_script(latest1,Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, latest),
+    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line io:format(Fd,
+		    "{release, {\"Test release 2\", \"LATEST1\"}, \n"
+		    " {erts, \"4.4\"}, \n"
+		    " [{kernel, \"1.0\"}, {stdlib, \"1.0\"}, \n"
+		    "  {db, \"1.0\"}, {fe, \"3.1\"}]}.\n",
+		    []),
+    ?line ok = file:close(Fd),
+    {filename:dirname(Name), filename:basename(Name)};
+create_script(latest2,Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, 'latest-2'),
+    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line io:format(Fd,
+		    "{release, {\"Test release 1\", \"LATEST2\"}, \n"
+		    " {erts, \"4.3\"}, \n"
+		    " [{kernel, \"1.0\"}, {stdlib, \"1.0\"}, \n"
+		    "  {db, \"1.0\"}, {fe, \"2.1\"}]}.\n",
+		    []),
+    ?line ok = file:close(Fd),
+    {filename:dirname(Name), filename:basename(Name)};
+create_script(latest_small,Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, 'latest-small'),
+    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line io:format(Fd,
+		    "{release, {\"Test release 2\", \"LATEST_SMALL\"}, \n"
+		    " {erts, \"4.4\"}, \n"
+		    " [{kernel, \"1.0\"}, {stdlib, \"1.0\"}, \n"
+		    "  {fe, \"3.1\"}]}.\n",
+		    []),
+    ?line ok = file:close(Fd),
+    {filename:dirname(Name), filename:basename(Name)};
+create_script(latest_small0,Config) ->		%Differs in fe vsn
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, 'latest-small0'),
+    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line io:format(Fd,
+		    "{release, {\"Test release 2\", \"LATEST_SMALL0\"}, \n"
+		    " {erts, \"4.4\"}, \n"
+		    " [{kernel, \"1.0\"}, {stdlib, \"1.0\"}, \n"
+		    "  {fe, \"2.1\"}]}.\n",
+		    []),
+    ?line ok = file:close(Fd),
+    {filename:dirname(Name), filename:basename(Name)};
+create_script(latest_small1,Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, 'latest-small1'),
+    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line io:format(Fd,
+		    "{release, {\"Test release 2\", \"LATEST_SMALL1\"}, \n"
+		    " {erts, \"4.4\"}, \n"
+		    " [{kernel, \"1.0\"}, {stdlib, \"1.0\"}, \n"
+		    "  {fe, \"500.18.7\"}]}.\n",
+		    []),
+    ?line ok = file:close(Fd),
+    {filename:dirname(Name), filename:basename(Name)};
+create_script(latest_nokernel,Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, 'latest-nokernel'),
+    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line io:format(Fd,
+		    "{release, {\"Test release 3\", \"LATEST_NOKERNEL\"}, \n"
+		    " {erts, \"4.4\"}, \n"
+		    " [{db, \"2.1\"}, {fe, \"3.1\"}]}.\n",
+		    []),
+    ?line ok = file:close(Fd),
+    {filename:dirname(Name), filename:basename(Name)};
+create_script(latest_app_start_type1,Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, latest_app_start_type1),
+    ?line ErtsVer = erlang:system_info(version),
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line RelfileContent = 
+	{release,{"Test release", "1"},
+	 {erts,ErtsVer},
+	 [{kernel,KernelVer},
+	  {stdlib,StdlibVer}]},
+    ?line io:format(Fd,"~p.~n",[RelfileContent]),
+    ?line ok = file:close(Fd),
+    {filename:dirname(Name), filename:basename(Name)};
+create_script(latest_app_start_type2,Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, latest_app_start_type2),
+    ?line ErtsVer = erlang:system_info(version),
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+    ?line OtherApps = [{mnesia,permanent},
+		       {sasl,transient},
+		       {webtool,temporary},
+		       {snmp,load},
+		       {xmerl,none}],
+    ?line lists:foreach(fun({App,_}) -> application:load(App) end,
+			OtherApps),
+    ?line Loaded = application:loaded_applications(),
+    ?line OtherAppsRel = 
+	lists:map(fun({App,StartType}) -> 
+			  {_,_,Ver} = lists:keyfind(App,1,Loaded),
+			  {App,Ver,StartType}
+		  end,
+		  OtherApps),
+    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line RelfileContent = 
+	{release,{"Test release", "2"},
+	 {erts,ErtsVer},
+	 [{kernel,KernelVer},
+	  {stdlib,StdlibVer} | OtherAppsRel]},
+    ?line io:format(Fd,"~p.~n",[RelfileContent]),
+    ?line ok = file:close(Fd),
+    {filename:dirname(Name), filename:basename(Name)}.
+
+create_include_files(inc1, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, inc1),
+    create_apps(PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {t6, \"1.0\"}, {t5, \"1.0\"}, \n"
+          "  {t4, \"1.0\"}, {t3, \"1.0\"}, {t2, \"1.0\"}, \n"
+          "  {t1, \"1.0\"}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)};
+
+create_include_files(inc2, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, inc2),
+    create_apps(PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    %% t6 does not include t5 !
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {t6, \"1.0\", [t4]}, {t5, \"1.0\"}, \n"
+          "  {t4, \"1.0\"}, {t3, \"1.0\"}, {t2, \"1.0\"}, \n"
+          "  {t1, \"1.0\"}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)};
+
+create_include_files(inc3, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, inc3),
+    create_apps(PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    %% t3 does not include t2 !
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {t6, \"1.0\"}, {t5, \"1.0\"}, \n"
+          "  {t4, \"1.0\"}, {t3, \"1.0\", []}, {t2, \"1.0\"}, \n"
+          "  {t1, \"1.0\"}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)};
+
+create_include_files(inc4, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, inc4),
+    create_apps(PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    %% t3 does not include t2 !
+    %% t6 does not include t5 !
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {t6, \"1.0\", [t4]}, {t5, \"1.0\"}, \n"
+          "  {t4, \"1.0\"}, {t3, \"1.0\", []}, {t2, \"1.0\"}, \n"
+          "  {t1, \"1.0\"}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)};
+
+create_include_files(inc5, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, inc5),
+    create_apps(PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    %% t6 does not include t5 !
+    %% exclude t5.
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {t6, \"1.0\", [t4]}, \n"
+          "  {t4, \"1.0\"}, {t3, \"1.0\", []}, {t2, \"1.0\"}, \n"
+          "  {t1, \"1.0\"}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)};
+
+create_include_files(inc6, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, inc6),
+    create_apps(PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    %% t3 does include non existing t2 !
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {t6, \"1.0\"}, {t5, \"1.0\"}, \n"
+          "  {t4, \"1.0\"}, {t3, \"1.0\"}, \n"
+          "  {t1, \"1.0\"}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)};
+
+create_include_files(inc7, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, inc7),
+    create_apps(PrivDir),
+    create_app(t7, PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    %% t7 and t6 does include t5 !
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {t7, \"1.0\"}, {t6, \"1.0\"}, {t5, \"1.0\"}, \n"
+          "  {t4, \"1.0\"}, {t3, \"1.0\"}, {t2, \"1.0\"}, \n"
+          "  {t1, \"1.0\"}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)};
+
+create_include_files(inc8, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, inc8),
+    create_circular_apps(PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    %% t8 uses t9 and t10 includes t9 !
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {t8, \"1.0\"}, {t9, \"1.0\"}, {t10, \"1.0\"}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)};
+
+create_include_files(inc9, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, inc9),
+    create_circular_apps(PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    %% t8 uses t9, t9 uses t10 and t10 includes t8 ==> circular !!
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {t8, \"1.0\"}, {t9, \"1.0\"}, {t10, \"1.0\", [t8]}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)};
+
+create_include_files(inc10, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, inc10),
+    create_circular_apps(PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    %% t9 tries to include not specified (in .app file) application !
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {t8, \"1.0\"}, {t9, \"1.0\", [t7]}, {t10, \"1.0\"}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)};
+
+create_include_files(inc11, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, inc11),
+    create_apps2(PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {t11, \"1.0\"}, \n"
+          "  {t12, \"1.0\"}, \n"
+          "  {t13, \"1.0\"}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)};
+
+create_include_files(otp_3065, Config) ->
+    ?line PrivDir = ?privdir,
+    ?line Name = fname(PrivDir, otp_3065),
+    create_apps_3065(PrivDir),
+
+    ?line Apps = application_controller:which_applications(),
+    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+
+    Rel = "{release, {\"test\",\"R1A\"}, {erts, \"45\"},\n"
+          " [{kernel, \"" ++ KernelVer ++ "\"}, {stdlib, \""
+           ++ StdlibVer ++ "\"},\n"
+          "  {chAts, \"1.0\"}, {aa12, \"1.0\"}, \n"
+          "  {chTraffic, \"1.0\"}]}.\n",
+    file:write_file(Name ++ ".rel", list_to_binary(Rel)),
+    {filename:dirname(Name), filename:basename(Name)}.
+
+create_apps(Dir) ->
+    T1 = "{application, t1,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, [kernel, stdlib]},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't1.app'), list_to_binary(T1)),
+
+    T2 = "{application, t2,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, [t1]},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't2.app'), list_to_binary(T2)),
+
+    T3 = "{application, t3,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, []},\n"
+         "  {included_applications, [t2]},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't3.app'), list_to_binary(T3)),
+
+    T4 = "{application, t4,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, [t3]},\n"
+         "  {included_applications, []},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't4.app'), list_to_binary(T4)),
+
+    T5 = "{application, t5,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, [t3]},\n"
+         "  {included_applications, []},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't5.app'), list_to_binary(T5)),
+
+    T6 = "{application, t6,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, []},\n"
+         "  {included_applications, [t4, t5]},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't6.app'), list_to_binary(T6)).
+
+create_app(t7, Dir) ->
+    T7 = "{application, t7,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, []},\n"
+         "  {included_applications, [t5]},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't7.app'), list_to_binary(T7)).
+
+create_circular_apps(Dir) ->
+    T8 = "{application, t8,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, [t9]},\n"
+         "  {included_applications, []},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't8.app'), list_to_binary(T8)),
+
+    T9 = "{application, t9,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, [t10]},\n"
+         "  {included_applications, []},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't9.app'), list_to_binary(T9)),
+
+    T10 = "{application, t10,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, []},\n"
+         "  {included_applications, [t8, t9]},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't10.app'), list_to_binary(T10)).
+
+create_apps2(Dir) ->
+    T11 = "{application, t11,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, []},\n"
+         "  {included_applications, [t13]},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't11.app'), list_to_binary(T11)),
+
+    T12 = "{application, t12,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, [t11]},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't12.app'), list_to_binary(T12)),
+
+    T13 = "{application, t13,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, []},\n"
+         "  {included_applications, []},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 't13.app'), list_to_binary(T13)).
+
+
+
+create_apps_3065(Dir) ->
+    T11 = "{application, chTraffic,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, []},\n"
+         "  {included_applications, [chAts]},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 'chTraffic.app'), list_to_binary(T11)),
+
+    T12 = "{application, chAts,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, []},\n"
+         "  {included_applications, [aa12]},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 'chAts.app'), list_to_binary(T12)),
+
+    T13 = "{application, aa12,\n"
+         " [{vsn, \"1.0\"},\n"
+         "  {description, \"test\"},\n"
+	 "  {modules, []},\n"
+         "  {applications, [chAts]},\n"
+         "  {included_applications, []},\n"
+	 "  {registered, []}]}.\n",
+    file:write_file(fname(Dir, 'aa12.app'), list_to_binary(T13)).
+
+fname(N) ->
+    filename:join(N).
+
+fname(Dir, Basename) ->
+    filename:join(Dir, Basename).
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app
new file mode 100644
index 0000000000..d375768b99
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app
@@ -0,0 +1,8 @@
+{application, db,
+   [{description, "ERICSSON NR FOR DB"},
+    {vsn, "2.0"},
+    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {db1, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.appup b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.appup
new file mode 100644
index 0000000000..621838f0b4
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.appup
@@ -0,0 +1,20 @@
+%%
+%% Release upgrade script for db (data base)
+%%
+
+{
+ "2.1",
+%%% Upgrade from:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]},
+  {"1.1", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db1.erl b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db1.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db1.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db2.erl b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db2.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/src/db2.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app
new file mode 100644
index 0000000000..d3bd85cda6
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app
@@ -0,0 +1,8 @@
+{application, fe,
+   [{description, "ERICSSON NR FOR FE"},
+    {vsn, "3.1"},
+    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {fe2, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.appup b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.appup
new file mode 100644
index 0000000000..4ab13c1bae
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.appup
@@ -0,0 +1,27 @@
+%%
+%% Release upgrade script for fe (front end)
+%%
+
+{
+ "3.1",
+%%% Upgrade from:
+ [
+  {"2.1.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	     {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	     {update, fe3, {{advanced, extra}, soft_purge, soft_purge,
+	      [fe1, fe2]}
+	    ]},
+
+  {"2.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	   {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe1, fe2]}
+	  ]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"2.1", [{update, fe2, soft, soft_purge, soft_purge, []},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe2]}
+	  ]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe1.erl b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe1.erl
new file mode 100644
index 0000000000..aa5bfa8098
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe1.erl
@@ -0,0 +1,2 @@
+-module(fe1).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe2.erl b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe2.erl
new file mode 100644
index 0000000000..869f3b93c8
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe2.erl
@@ -0,0 +1,2 @@
+-module(fe2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe3.erl b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe3.erl
new file mode 100644
index 0000000000..6473342f52
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/src/fe3.erl
@@ -0,0 +1,2 @@
+-module(fe3).
+-vsn("2.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app
new file mode 100644
index 0000000000..0696e2494c
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app
@@ -0,0 +1,7 @@
+{application, fe,
+ [{description, "ERICSSON NR FOR FE"},
+  {vsn, "3.1"},
+  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {registered, []},
+  {applications, []},
+  {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.appup b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.appup
new file mode 100644
index 0000000000..dac4c00851
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.appup
@@ -0,0 +1,27 @@
+%%
+%% Release upgrade script for fe (front end)
+%%
+
+{
+ "3.1",
+%%% Upgrade from:
+ [
+  {"2.1.1" [{update, fe1, soft, soft_purge, soft_purge, []},
+	     {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	     {update, fe3, {advanced, extra}, soft_purge, soft_purge,
+	      [fe1, fe2]}
+	    ]},
+
+  {"2.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	   {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe1, fe2]}
+	  ]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"2.1", [{update, fe2, soft, soft_purge, soft_purge, []},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe2]}
+	  ]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app
new file mode 100644
index 0000000000..191919f8d3
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app
@@ -0,0 +1,8 @@
+{application, db,
+   [{description, "ERICSSON NR FOR DB"},
+    {vsn, "2.1"},
+    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {db1, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.appup b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.appup
new file mode 100644
index 0000000000..621838f0b4
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.appup
@@ -0,0 +1,20 @@
+%%
+%% Release upgrade script for db (data base)
+%%
+
+{
+ "2.1",
+%%% Upgrade from:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]},
+  {"1.1", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db1.erl b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db1.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db1.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db2.erl b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db2.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/src/db2.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app
new file mode 100644
index 0000000000..d3bd85cda6
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app
@@ -0,0 +1,8 @@
+{application, fe,
+   [{description, "ERICSSON NR FOR FE"},
+    {vsn, "3.1"},
+    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {fe2, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.appup b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.appup
new file mode 100644
index 0000000000..2db69eba76
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.appup
@@ -0,0 +1,27 @@
+%%
+%% Release upgrade script for fe (front end)
+%%
+
+{
+ "3.1",
+%%% Upgrade from:
+ [
+  {"2.1.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	     {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	     {update, fe3, {advanced, extra}, soft_purge, soft_purge,
+	      [fe1, fe2]}
+	    ]},
+
+  {"2.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	   {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe1, fe2]}
+	  ]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"2.1", [{update, fe2, soft, soft_purge, soft_purge, []},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe2]}
+	  ]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe1.erl b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe1.erl
new file mode 100644
index 0000000000..cdbb9ef532
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe1.erl
@@ -0,0 +1,2 @@
+-module(fe1).
+-vsn("1.1").
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe2.erl b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe2.erl
new file mode 100644
index 0000000000..869f3b93c8
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe2.erl
@@ -0,0 +1,2 @@
+-module(fe2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe3.erl b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe3.erl
new file mode 100644
index 0000000000..6473342f52
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/src/fe3.erl
@@ -0,0 +1,2 @@
+-module(fe3).
+-vsn("2.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app
new file mode 100644
index 0000000000..3e0ac3c3c9
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app
@@ -0,0 +1,8 @@
+{application, db,
+   [{description, "ERICSSON NR FOR DB"},
+    {vsn, "2.1"},
+    {modules, [{db1, "1.0"}, {db2, "1.0"}, {db3, "2.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {db1, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.appup b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.appup
new file mode 100644
index 0000000000..621838f0b4
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.appup
@@ -0,0 +1,20 @@
+%%
+%% Release upgrade script for db (data base)
+%%
+
+{
+ "2.1",
+%%% Upgrade from:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]},
+  {"1.1", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db2.erl b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db2.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db2.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db3.erl b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db3.erl
new file mode 100644
index 0000000000..6473342f52
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/src/db3.erl
@@ -0,0 +1,2 @@
+-module(fe3).
+-vsn("2.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/ebin/fe.appup b/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/ebin/fe.appup
new file mode 100644
index 0000000000..4ab13c1bae
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/ebin/fe.appup
@@ -0,0 +1,27 @@
+%%
+%% Release upgrade script for fe (front end)
+%%
+
+{
+ "3.1",
+%%% Upgrade from:
+ [
+  {"2.1.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	     {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	     {update, fe3, {{advanced, extra}, soft_purge, soft_purge,
+	      [fe1, fe2]}
+	    ]},
+
+  {"2.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	   {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe1, fe2]}
+	  ]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"2.1", [{update, fe2, soft, soft_purge, soft_purge, []},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe2]}
+	  ]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe1.erl b/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe1.erl
new file mode 100644
index 0000000000..aa5bfa8098
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe1.erl
@@ -0,0 +1,2 @@
+-module(fe1).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe2.erl b/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe2.erl
new file mode 100644
index 0000000000..869f3b93c8
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe2.erl
@@ -0,0 +1,2 @@
+-module(fe2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe3.erl b/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe3.erl
new file mode 100644
index 0000000000..6473342f52
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_links/lib/fe-3.1/src/fe3.erl
@@ -0,0 +1,2 @@
+-module(fe3).
+-vsn("2.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app
new file mode 100644
index 0000000000..191919f8d3
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app
@@ -0,0 +1,8 @@
+{application, db,
+   [{description, "ERICSSON NR FOR DB"},
+    {vsn, "2.1"},
+    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {db1, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.appup b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.appup
new file mode 100644
index 0000000000..621838f0b4
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.appup
@@ -0,0 +1,20 @@
+%%
+%% Release upgrade script for db (data base)
+%%
+
+{
+ "2.1",
+%%% Upgrade from:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]},
+  {"1.1", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db1.erl b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db1.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db1.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db2.erl b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db2.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/src/db2.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app
new file mode 100644
index 0000000000..d3bd85cda6
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app
@@ -0,0 +1,8 @@
+{application, fe,
+   [{description, "ERICSSON NR FOR FE"},
+    {vsn, "3.1"},
+    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {fe2, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.appup b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.appup
new file mode 100644
index 0000000000..4ab13c1bae
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.appup
@@ -0,0 +1,27 @@
+%%
+%% Release upgrade script for fe (front end)
+%%
+
+{
+ "3.1",
+%%% Upgrade from:
+ [
+  {"2.1.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	     {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	     {update, fe3, {{advanced, extra}, soft_purge, soft_purge,
+	      [fe1, fe2]}
+	    ]},
+
+  {"2.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	   {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe1, fe2]}
+	  ]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"2.1", [{update, fe2, soft, soft_purge, soft_purge, []},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe2]}
+	  ]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe1.erl b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe1.erl
new file mode 100644
index 0000000000..cdbb9ef532
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe1.erl
@@ -0,0 +1,2 @@
+-module(fe1).
+-vsn("1.1").
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe2.erl b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe2.erl
new file mode 100644
index 0000000000..869f3b93c8
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe2.erl
@@ -0,0 +1,2 @@
+-module(fe2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe3.erl b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe3.erl
new file mode 100644
index 0000000000..6473342f52
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/src/fe3.erl
@@ -0,0 +1,2 @@
+-module(fe3).
+-vsn("2.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app
new file mode 100644
index 0000000000..47ea248720
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app
@@ -0,0 +1,8 @@
+{application, fe,
+   [{description, "ERICSSON NR FOR FE"},
+    {vsn, "2.1"},
+    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {fe2, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.appup b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.appup
new file mode 100644
index 0000000000..2db69eba76
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.appup
@@ -0,0 +1,27 @@
+%%
+%% Release upgrade script for fe (front end)
+%%
+
+{
+ "3.1",
+%%% Upgrade from:
+ [
+  {"2.1.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	     {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	     {update, fe3, {advanced, extra}, soft_purge, soft_purge,
+	      [fe1, fe2]}
+	    ]},
+
+  {"2.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	   {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe1, fe2]}
+	  ]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"2.1", [{update, fe2, soft, soft_purge, soft_purge, []},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe2]}
+	  ]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app
new file mode 100644
index 0000000000..0696e2494c
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app
@@ -0,0 +1,7 @@
+{application, fe,
+ [{description, "ERICSSON NR FOR FE"},
+  {vsn, "3.1"},
+  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {registered, []},
+  {applications, []},
+  {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app
new file mode 100644
index 0000000000..22530ee335
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app
@@ -0,0 +1,8 @@
+{application, db,
+   [{description, "ERICSSON NR FOR DB"},
+    {vsn, "1.0"},
+    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {db1, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db1.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db1.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db1.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db2.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db2.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/src/db2.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app
new file mode 100644
index 0000000000..7243a0a96a
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app
@@ -0,0 +1,8 @@
+{application, db,
+   [{description, "ERICSSON NR FOR DB"},
+    {vsn, "1.1"},
+    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {db1, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db1.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db1.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db1.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db2.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db2.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/src/db2.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app
new file mode 100644
index 0000000000..202d7f1234
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app
@@ -0,0 +1,7 @@
+{application, db,
+ [{description, "ERICSSON NR FOR DB"},
+  {vsn, "2.1"},
+  {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+  {registered, []},
+  {applications, []},
+  {mod, {db1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.appup b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.appup
new file mode 100644
index 0000000000..621838f0b4
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.appup
@@ -0,0 +1,20 @@
+%%
+%% Release upgrade script for db (data base)
+%%
+
+{
+ "2.1",
+%%% Upgrade from:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]},
+  {"1.1", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db1.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db1.erl
new file mode 100644
index 0000000000..7cddf6bb63
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db1.erl
@@ -0,0 +1,13 @@
+-module(db1).
+-vsn("1.0").
+
+-export([a/0]).
+
+a() ->
+    lists:non_existing_func("dummy_list"),
+    b().
+
+b() ->
+    fe2:non_existing_func(),
+    db2:non_existing_func(),
+    fe1:a().
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db2.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db2.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/src/db2.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.app
new file mode 100644
index 0000000000..97643561eb
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.app
@@ -0,0 +1,7 @@
+{application, db,
+ [{description, "ERICSSON NR FOR DB"},
+  {vsn, "3.1"},
+  {modules, [db1, db2]},
+  {registered, []},
+  {applications, []},
+  {mod, {db1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.appup b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.appup
new file mode 100644
index 0000000000..e636eee158
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/ebin/db.appup
@@ -0,0 +1,20 @@
+%%
+%% Release upgrade script for db (data base)
+%%
+
+{
+ "3.1",
+%%% Upgrade from:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]},
+  {"1.1", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"1.0", [{update, db1, soft, soft_purge, soft_purge, []},
+	   {update, db2, soft, soft_purge, soft_purge, [db1]}]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db1.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db1.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db1.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db2.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db2.erl
new file mode 100644
index 0000000000..a17640316e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-3.1/src/db2.erl
@@ -0,0 +1,2 @@
+-module(db2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app
new file mode 100644
index 0000000000..c7ba1dfe91
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app
@@ -0,0 +1,8 @@
+{application, fe,
+   [{description, "ERICSSON NR FOR FE"},
+    {vsn, "2.1.1"},
+    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {fe2, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe1.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe1.erl
new file mode 100644
index 0000000000..aa5bfa8098
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe1.erl
@@ -0,0 +1,2 @@
+-module(fe1).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe2.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe2.erl
new file mode 100644
index 0000000000..869f3b93c8
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe2.erl
@@ -0,0 +1,2 @@
+-module(fe2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe3.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe3.erl
new file mode 100644
index 0000000000..6473342f52
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/src/fe3.erl
@@ -0,0 +1,2 @@
+-module(fe3).
+-vsn("2.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app
new file mode 100644
index 0000000000..47ea248720
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app
@@ -0,0 +1,8 @@
+{application, fe,
+   [{description, "ERICSSON NR FOR FE"},
+    {vsn, "2.1"},
+    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {fe2, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe1.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe1.erl
new file mode 100644
index 0000000000..aa5bfa8098
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe1.erl
@@ -0,0 +1,2 @@
+-module(fe1).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe2.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe2.erl
new file mode 100644
index 0000000000..869f3b93c8
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe2.erl
@@ -0,0 +1,2 @@
+-module(fe2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe3.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe3.erl
new file mode 100644
index 0000000000..6473342f52
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/src/fe3.erl
@@ -0,0 +1,2 @@
+-module(fe3).
+-vsn("2.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app
new file mode 100644
index 0000000000..0696e2494c
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app
@@ -0,0 +1,7 @@
+{application, fe,
+ [{description, "ERICSSON NR FOR FE"},
+  {vsn, "3.1"},
+  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {registered, []},
+  {applications, []},
+  {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.appup b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.appup
new file mode 100644
index 0000000000..2db69eba76
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.appup
@@ -0,0 +1,27 @@
+%%
+%% Release upgrade script for fe (front end)
+%%
+
+{
+ "3.1",
+%%% Upgrade from:
+ [
+  {"2.1.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	     {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	     {update, fe3, {advanced, extra}, soft_purge, soft_purge,
+	      [fe1, fe2]}
+	    ]},
+
+  {"2.1", [{update, fe1, soft, soft_purge, soft_purge, []},
+	   {update, fe2, soft, soft_purge, soft_purge, [fe1]},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe1, fe2]}
+	  ]}
+ ],
+
+%%% Downgrade to:
+ [
+  {"2.1", [{update, fe2, soft, soft_purge, soft_purge, []},
+	   {update, fe3, {advanced, extra}, soft_purge, soft_purge, [fe2]}
+	  ]}
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe1.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe1.erl
new file mode 100644
index 0000000000..8aca89b2c7
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe1.erl
@@ -0,0 +1,7 @@
+-module(fe1).
+-vsn("1.0").
+
+-export([a/0]).
+
+a() ->
+    ok.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe2.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe2.erl
new file mode 100644
index 0000000000..869f3b93c8
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe2.erl
@@ -0,0 +1,2 @@
+-module(fe2).
+-vsn("1.0").
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe3.erl b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe3.erl
new file mode 100644
index 0000000000..6473342f52
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/src/fe3.erl
@@ -0,0 +1,2 @@
+-module(fe3).
+-vsn("2.0").
diff --git a/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.app b/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.app
new file mode 100644
index 0000000000..e33314be7a
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.app
@@ -0,0 +1,6 @@
+{application, kernel,
+ [{description, "FAKE KERNEL"},
+  {vsn, "1.0"},
+  {modules, []},
+  {registered, []},
+  {applications, []}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.appup b/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.appup
new file mode 100644
index 0000000000..c53f07591f
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/lib/kernel/ebin/kernel.appup
@@ -0,0 +1,12 @@
+%%
+%% Fake release upgrade script for kernel
+%%
+
+{
+ "4.4.1",
+ [
+ ],
+
+ [
+ ]
+}.
diff --git a/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.app b/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.app
new file mode 100644
index 0000000000..288fcfe74e
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.app
@@ -0,0 +1,6 @@
+{application, stdlib,
+ [{description, "FAKE STDLIB"},
+  {vsn, "1.0"},
+  {modules, []},
+  {registered, []},
+  {applications, []}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.appup b/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.appup
new file mode 100644
index 0000000000..b521eb5d71
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/lib/stdlib/ebin/stdlib.appup
@@ -0,0 +1,12 @@
+%%
+%% Fake release upgrade script for stdlib
+%%
+
+{
+ "1.1",
+ [
+ ],
+
+ [
+ ]
+}.
diff --git a/lib/sasl/test/systools_rc_SUITE.erl b/lib/sasl/test/systools_rc_SUITE.erl
new file mode 100644
index 0000000000..bb93f38fa7
--- /dev/null
+++ b/lib/sasl/test/systools_rc_SUITE.erl
@@ -0,0 +1,488 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(systools_rc_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("sasl/src/systools.hrl").
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, 
+	 syntax_check/1, translate/1, translate_app/1]).
+
+%%-----------------------------------------------------------------
+%% erl -compile systools_rc_SUITE @i ../src/ @i ../../test_server/include/
+%% c(systools_rc_SUITE, [{i, "../src"}, {i, "../../test_server/include"}]).
+%%-----------------------------------------------------------------
+all() -> 
+    [syntax_check, translate, translate_app].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+syntax_check(suite) -> [];
+syntax_check(Config) when is_list(Config) ->
+    PreApps =
+	[#application{name = test,
+		      description = "TEST",
+		      vsn = "0.1",
+		      modules = [{foo,1},{bar,1},{baz,1},{old_mod,1}],
+		      regs = [],
+		      mod = {sasl, []}},
+	 #application{name = snmp,
+		      description = "SNMP",
+		      vsn = "1.0",
+		      modules = [snmp],
+		      regs = [],
+		      mod = {snmp, []}}],
+    Apps =
+	[#application{name = test,
+		      description = "TEST",
+		      vsn = "1.0",
+		      modules = [{foo,1},{bar,1},{baz,1},{new_mod,1}],
+		      regs = [],
+		      mod = {sasl, []}}],
+    S1 = [
+	  {update, bar, {advanced, extra}, brutal_purge, brutal_purge, []},
+	  {update, foo, soft, soft_purge, soft_purge, [bar]},
+	  {update, baz, 5000, soft, brutal_purge, brutal_purge, []},
+	  {add_module, new_mod},
+	  {remove_application, snmp}
+	  ],
+    ?line {ok, _} = systools_rc:translate_scripts([S1], Apps, PreApps),
+    S2 = [
+	  {apply, {m, f, [a]}},
+	  {load_object_code, {tst, "1.0", [new_mod]}},
+          point_of_no_return,
+	  {update, bar, {advanced, extra}, brutal_purge, brutal_purge, []},
+	  {update, foo, soft, soft_purge, soft_purge, [bar]},
+	  {load, {new_mod, soft_purge, soft_purge}},
+	  {remove, {old_mod, soft_purge, soft_purge}},
+	  {purge, [m1, m2]},
+	  {suspend, [m1]},
+	  {code_change, [{m1, extra}]},
+	  {resume, [m1]},
+	  {stop, [m3,m4]},
+	  {start, [m3,m4]},
+	  {sync_nodes, id1, {m, f, [a]}},
+	  {sync_nodes, id2, [cp1, cp2]},
+	  {apply, {m,f,[a]}},
+	  restart_new_emulator
+	  ],
+    ?line {ok, _} = systools_rc:translate_scripts([S2], Apps, []),
+    S3 = [{apply, {m, f, a}}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S3], Apps, []),
+    S3_1 = [{apply, {m, 3, a}}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S3_1], Apps, []),
+    S4 = [{apply, {m, f}}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S4], Apps, []),
+    S5 = [{load_object_code, hej}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S5], Apps, []),
+    S6 = [{load_object_code, {342, "1.0", [foo]}}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S6], Apps, []),
+    S7 = [{load_object_code, {tets, "1.0", foo}}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S7], Apps, []),
+    S8 = [{suspend, [m1]}, point_of_no_return],
+    ?line {error, _, _} = systools_rc:translate_scripts([S8], Apps, []),
+    S9 = [{update, ba, {advanced, extra}, brutal_purge, brutal_purge, []}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S9], Apps, []),
+    S10 = [{update, bar, {advanced, extra}, brutal_purge, brutal_purge, [baz]}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S10], Apps, []),
+    S11 = [{update, bar, {advanced, extra}, brutal_purge, brutal_purge, [ba]}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S11], Apps, []),
+    S12 = [{update, bar, advanced, brutal_purge, brutal_purge, []}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S12], Apps, []),
+    S13 = [{update, bar, {advanced, extra}, rutal_purge, brutal_purge, [ba]}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S13], Apps, []),
+    S14 = [{update, bar, {advanced, extra}, brutal_purge, rutal_purge, [ba]}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S14], Apps, []),
+    S15 = [{update, bar, {advanced, extra}, brutal_purge, brutal_purge, ba}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S15], Apps, []),
+    S16 = [{code_change, [module]}],
+    ?line {error, _, _} = systools_rc:translate_scripts([S16], Apps, []),
+    ?line ok.
+
+translate(suite) -> [];
+translate(Config) when is_list(Config) ->
+    Apps =
+	[#application{name = test,
+		      description = "TEST",
+		      vsn = "1.0",
+		      modules = [{foo,1},{bar,1},{baz,1},
+				 {x,1},{y,1},{z,1}],
+		      regs = [],
+		      mod = {sasl, []}}],
+    %% Simple translation (1)
+    Up1 = [{update, foo, soft, soft_purge, soft_purge, []}],
+    ?line {ok, X1} = systools_rc:translate_scripts([Up1], Apps, []),
+    ?line [{load_object_code, {test,"1.0",[foo]}},
+	   point_of_no_return,
+	   {suspend,[foo]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {resume,[foo]}] = X1,
+
+    %% Simple translation (2)
+    Up2 = [{update, foo, {advanced, extra}, soft_purge, soft_purge, []}],
+    ?line {ok, X2} = systools_rc:translate_scripts([Up2], Apps, []),
+    ?line [{load_object_code, {test,"1.0",[foo]}},
+	   point_of_no_return,
+	   {suspend,[foo]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {code_change, up, [{foo, extra}]},
+	   {resume,[foo]}] = X2,
+
+    ?line {ok, X22} = systools_rc:translate_scripts(dn,[Up2], Apps, []),
+    ?line [{load_object_code, {test,"1.0",[foo]}},
+	   point_of_no_return,
+	   {suspend,[foo]},
+	   {code_change, down, [{foo, extra}]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {resume,[foo]}] = X22,
+
+    Up2a = [{update, foo, static, default, {advanced,extra},
+	     soft_purge, soft_purge, []}],
+    ?line {ok, X2a} = systools_rc:translate_scripts([Up2a], Apps, []),
+    ?line [{load_object_code, {test,"1.0",[foo]}},
+	   point_of_no_return,
+	   {suspend,[foo]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {code_change, up, [{foo, extra}]},
+	   {resume,[foo]}] = X2a,
+
+    ?line {ok, X22a} = systools_rc:translate_scripts(dn,[Up2a], Apps, []),
+    ?line [{load_object_code, {test,"1.0",[foo]}},
+	   point_of_no_return,
+	   {suspend,[foo]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {code_change, down, [{foo, extra}]},
+	   {resume,[foo]}] = X22a,
+
+    %% Simple dependency (1)
+    Up3 = [{update, foo, soft, soft_purge, soft_purge, [bar]},
+	   {update, bar, soft, soft_purge, soft_purge, []}],
+    ?line {ok, X31} = systools_rc:translate_scripts([Up3], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,bar]},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {resume,[bar,foo]}] = X31,
+    ?line {ok, X32} = systools_rc:translate_scripts(dn,[Up3], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,bar]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {resume,[bar,foo]}] = X32,
+
+    Up3a = [{update, foo, static, default, soft, soft_purge, soft_purge, [bar]},
+	    {update, bar, static, default, soft, soft_purge, soft_purge, []}],
+    ?line {ok, X3a1} = systools_rc:translate_scripts([Up3a], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo, bar]},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {resume,[bar,foo]}] = X3a1,
+    ?line {ok, X3a2} = systools_rc:translate_scripts(dn,[Up3a], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,bar]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {resume,[bar,foo]}] = X3a2,
+
+    %%  Simple dependency (2)
+    Up4 = [{update, foo, soft, soft_purge, soft_purge, [bar]},
+	   {update, bar, {advanced, []}, soft_purge, soft_purge, []}],
+    ?line {ok, X4} = systools_rc:translate_scripts(up,[Up4], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,bar]},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {code_change,up,[{bar,[]}]},
+	   {resume,[bar,foo]}] = X4,
+
+    ?line {ok, X42} = systools_rc:translate_scripts(dn,[Up4], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,bar]},
+	   {code_change,down,[{bar,[]}]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {resume,[bar,foo]}] = X42,
+
+    Up4a = [{update, foo, soft, soft_purge, soft_purge, [bar]},
+	    {update, bar, static, infinity, {advanced, []},
+	     soft_purge, soft_purge, []}],
+    ?line {ok, X4a} = systools_rc:translate_scripts(up,[Up4a], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,{bar,infinity}]},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {code_change,up,[{bar,[]}]},
+	   {resume,[bar,foo]}] = X4a,
+
+    ?line {ok, X42a} = systools_rc:translate_scripts(dn,[Up4a], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,{bar,infinity}]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {code_change,down,[{bar,[]}]},
+	   {resume,[bar,foo]}] = X42a,
+
+    Up4b = [{update, foo, soft, soft_purge, soft_purge, [bar]},
+	    {update, bar, dynamic, infinity, {advanced, []},
+	     soft_purge, soft_purge, []}],
+    ?line {ok, X4b} = systools_rc:translate_scripts(up,[Up4b], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,{bar,infinity}]},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {code_change,up,[{bar,[]}]},
+	   {resume,[bar,foo]}] = X4b,
+
+    ?line {ok, X42b} = systools_rc:translate_scripts(dn,[Up4b], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,{bar,infinity}]},
+	   {code_change,down,[{bar,[]}]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {resume,[bar,foo]}] = X42b,
+
+    %% More complex dependency
+    Up5 = [{update, foo, soft, soft_purge, soft_purge, [bar, baz]},
+	   {update, bar, {advanced, []}, soft_purge, soft_purge, []},
+	   {update, baz, {advanced, baz}, soft_purge, soft_purge, [bar]}],
+    ?line {ok, X5} = systools_rc:translate_scripts([Up5], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,baz,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,baz,bar]},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {load,{baz,soft_purge,soft_purge}},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {code_change,up,[{baz,baz},{bar,[]}]},
+	   {resume,[bar,baz,foo]}] = X5,
+
+    ?line {ok, X52} = systools_rc:translate_scripts(dn,[Up5], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,baz,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,baz,bar]},
+	   {code_change,down,[{baz,baz},{bar,[]}]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {load,{baz,soft_purge,soft_purge}},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {resume,[bar,baz,foo]}] = X52,
+
+    Up5a = [{update, foo, dynamic, infinity, soft, soft_purge,
+	     soft_purge, [bar, baz]},
+	    {update, bar, static, 7000, {advanced, []}, soft_purge,
+	     soft_purge, []},
+	    {update, baz, dynamic, default, {advanced, baz}, soft_purge,
+	     soft_purge, [bar]}],
+    ?line {ok, X5a} = systools_rc:translate_scripts([Up5a], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,baz,bar]}},
+	   point_of_no_return,
+	   {suspend,[{foo,infinity},baz,{bar,7000}]},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {load,{baz,soft_purge,soft_purge}},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {code_change,up,[{baz,baz}, {bar,[]}]},
+	   {resume,[bar,baz,foo]}] = X5a,
+
+    ?line {ok, X52a} = systools_rc:translate_scripts(dn,[Up5a], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,baz,bar]}},
+	   point_of_no_return,
+	   {suspend,[{foo,infinity},baz,{bar,7000}]},
+	   {code_change,down,[{baz,baz}]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {load,{baz,soft_purge,soft_purge}},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {code_change,down,[{bar,[]}]},
+	   {resume,[bar,baz,foo]}] = X52a,
+
+    Up5b = [{update, foo, dynamic, infinity, soft, soft_purge,
+	     soft_purge, [bar, baz]},
+	    {update, bar, dynamic, 7000, {advanced, []}, soft_purge,
+	     soft_purge, []},
+	    {update, baz, static, default, {advanced, baz}, soft_purge,
+	     soft_purge, [bar]}],
+    ?line {ok, X5b} = systools_rc:translate_scripts([Up5b], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,baz,bar]}},
+	   point_of_no_return,
+	   {suspend,[{foo,infinity},baz,{bar,7000}]},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {load,{baz,soft_purge,soft_purge}},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {code_change,up,[{baz,baz},{bar,[]}]},
+	   {resume,[bar,baz,foo]}] = X5b,
+
+    ?line {ok, X52b} = systools_rc:translate_scripts(dn,[Up5b], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,baz,bar]}},
+	   point_of_no_return,
+	   {suspend,[{foo,infinity},baz,{bar,7000}]},
+	   {code_change,down,[{bar,[]}]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {load,{baz,soft_purge,soft_purge}},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {code_change,down,[{baz,baz}]},
+	   {resume,[bar,baz,foo]}] = X52b,
+
+    %% Simple circular dependency (1)
+    Up6 = [{update, foo, soft, soft_purge, soft_purge, [bar]},
+	   {update, bar, soft, soft_purge, soft_purge, [foo]}],
+    ?line {ok, X61} = systools_rc:translate_scripts([Up6], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,bar]},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {resume,[bar,foo]}] = X61,
+    ?line {ok, X62} = systools_rc:translate_scripts(dn,[Up6], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {suspend,[foo,bar]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {resume,[bar,foo]}] = X62,
+
+    %% Simple circular dependency (2)
+    Up7 = [{update, foo, soft, soft_purge, soft_purge, [bar, baz]},
+	   {update, bar, soft, soft_purge, soft_purge, [foo]},
+	   {update, baz, soft, soft_purge, soft_purge, [bar]}],
+    ?line {ok, X71} = systools_rc:translate_scripts([Up7], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+	   point_of_no_return,
+	   {suspend,[foo,bar,baz]},
+	   {load,{baz,soft_purge,soft_purge}},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {resume,[baz, bar, foo]}] = X71,
+    ?line {ok, X72} = systools_rc:translate_scripts(dn,[Up7], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+	   point_of_no_return,
+	   {suspend,[foo,bar,baz]},
+	   {load,{foo,soft_purge,soft_purge}},
+	   {load,{bar,soft_purge,soft_purge}},
+	   {load,{baz,soft_purge,soft_purge}},
+	   {resume,[baz,bar,foo]}] = X72,
+
+    %% Complex circular dependencies, check only order
+    %%
+    Up8 = [{update, foo, soft, soft_purge, soft_purge, [baz]},
+	   {update, y, soft, soft_purge, soft_purge, [bar]},
+	   {update, x, soft, soft_purge, soft_purge, [y, z]},
+	   {update, z, soft, soft_purge, soft_purge, [x]},
+	   {update, bar, soft, soft_purge, soft_purge, [baz]},
+	   {update, baz, soft, soft_purge, soft_purge, [bar]}],
+    ?line {ok, X8} = systools_rc:translate_scripts([Up8], Apps, []),
+    ?line {value, {suspend, Order}} = lists:keysearch(suspend, 1, X8),
+    ?line Rest = case lists:reverse(Order) of
+		     [bar, baz | R] -> R;
+		     [baz, bar | R] -> R
+		 end,
+    ?line case Rest of
+	      [y, z, x, foo] -> ok;
+	      [y, x, z, foo] -> ok;
+	      [foo, y, z, x] -> ok;
+	      [foo, y, x, z] -> ok;
+	      [y, foo, z, x] -> ok;
+	      [y, foo, x, z] -> ok
+	  end,
+
+    %% Check that order among other instructions isn't changed
+    Up9 = [{update, foo, soft, soft_purge, soft_purge, [baz]},
+	   {apply, {m, f, [1]}},
+	   {update, y, soft, soft_purge, soft_purge, [bar]},
+	   {apply, {m, f, [2]}},
+	   {update, x, soft, soft_purge, soft_purge, [y, z]},
+	   {apply, {m, f, [3]}},
+	   {update, z, soft, soft_purge, soft_purge, [x]},
+	   {apply, {m, f, [4]}},
+	   {update, bar, soft, soft_purge, soft_purge, [baz]},
+	   {apply, {m, f, [5]}},
+	   {update, baz, soft, soft_purge, soft_purge, [bar]},
+	   {apply, {m, f, [6]}}],
+    ?line {ok, X9} = systools_rc:translate_scripts([Up9], Apps, []),
+    Other2 = [X || {apply, {m, f, [X]}} <- X9],
+    ?line [1,2,3,4,5,6] = lists:sort(Other2),
+    ?line ok.
+
+
+translate_app(suite) -> [];
+translate_app(Config) when is_list(Config) ->
+    PreApps =
+	[#application{name = test,
+		      description = "TEST",
+		      vsn = "1.0",
+		      modules = [{foo,1},{bar,1},{baz,1}],
+		      regs = [],
+		      mod = {sasl, []}},
+	 #application{name = pelle,
+		      description = "PELLE",
+		      vsn = "1.0",
+		      modules = [pelle, kalle],
+		      regs = [],
+		      mod = {pelle, []}}],
+    Apps =
+	[#application{name = test,
+		      description = "TEST",
+		      vsn = "1.0",
+		      modules = [{foo,1},{bar,1},{baz,1}],
+		      regs = [],
+		      mod = {sasl, []}}],
+    %% Simple translation (1)
+    Up1 = [{add_module, foo},
+	   {add_module, bar}],
+    ?line {ok, X1} = systools_rc:translate_scripts([Up1], Apps, []),
+    ?line [{load_object_code,{test,"1.0",[foo,bar]}},
+	   point_of_no_return,
+	   {load,{foo,brutal_purge,brutal_purge}},
+	   {load,{bar,brutal_purge,brutal_purge}}] = X1,
+
+    %% Simple translation (2)
+    Up2 = [{add_application, test}],
+    ?line {ok, X2} = systools_rc:translate_scripts([Up2], Apps, []),
+io:format("X2=~p~n", [X2]),
+    ?line [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+	   point_of_no_return,
+	   {load,{foo,brutal_purge,brutal_purge}},
+	   {load,{bar,brutal_purge,brutal_purge}},
+	   {load,{baz,brutal_purge,brutal_purge}},
+	   {apply,{application,start,[test,permanent]}}] = X2,
+
+    %% Simple translation (3)
+    Up3 = [{remove_application, pelle}],
+    ?line {ok, X3} = systools_rc:translate_scripts([Up3], Apps, PreApps),
+    ?line [point_of_no_return,
+	   {apply,{application,stop,[pelle]}},
+	   {remove,{pelle,brutal_purge,brutal_purge}},
+	   {remove,{kalle,brutal_purge,brutal_purge}},
+	   {purge,[pelle,kalle]},
+	   {apply,{application,unload,[pelle]}}] = X3,
+    ?line ok.
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index af667b1a71..4f546a37ed 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,33 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 2.0.6</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            A memory leak has been fixed. I.e. per terminated connection the size of
+            a pid and the length of a user name string was not cleared.</p>
+          <p>
+            Own Id: OTP-9232</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+<section><title>Ssh 2.0.5</title>
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+            Strengthened random number generation. (Thanks to Geoff Cant)</p>
+          <p>
+            Own Id: OTP-9225</p>
+        </item>
+      </list>
+    </section>
+</section>
+
 <section><title>Ssh 2.0.4</title>
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 501da8ceb9..37f24e2463 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,34 +19,12 @@
 
 {"%VSN%",	
  [
-  {"2.0.3", [{load_module, ssh_file, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_rsa, soft_purge, soft_purge, []},
-             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
-             {load_module, ssh_transport, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
-  {"2.0.2", [{load_module, ssh_file, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_rsa, soft_purge, soft_purge, []},
-             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
-             {load_module, ssh_transport, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
-  {"2.0.1", [{restart_application, ssh}]}
+  {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]}
  ],
  [
-  {"2.0.3", [{load_module, ssh_file, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_rsa, soft_purge, soft_purge, []},
-             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
-             {load_module, ssh_transport, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
-  {"2.0.2", [{load_module, ssh_file, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_rsa, soft_purge, soft_purge, []},
-             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
-             {load_module, ssh_transport, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
-  {"2.0.1", [{restart_application, ssh}]}
+  {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]}
  ]
 }.
 
diff --git a/lib/ssh/src/ssh_bits.erl b/lib/ssh/src/ssh_bits.erl
index 399581a0fd..3f0a06575c 100755
--- a/lib/ssh/src/ssh_bits.erl
+++ b/lib/ssh/src/ssh_bits.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -34,7 +34,7 @@
 %% integer utils
 -export([isize/1]).
 -export([irandom/1, irandom/3]).
--export([random/1, random/3]).
+-export([random/1]).
 -export([xor_bits/2, fill_bits/2]).
 -export([i2bin/2, bin2i/1]).
 
@@ -401,9 +401,6 @@ xor_bits(XBits, YBits) ->
 irandom(Bits) ->
     irandom(Bits, 1, 0).
 
-%% irandom_odd(Bits) ->
-%%     irandom(Bits, 1, 1).
-
 %%
 %% irandom(N, Top, Bottom)
 %%
@@ -414,57 +411,16 @@ irandom(Bits) ->
 %%       Bot = 0 - do not set the least signifcant bit
 %%       Bot = 1 - set the least signifcant bit (i.e always odd)
 %%
-irandom(0, _Top, _Bottom) -> 
-    0;
-irandom(Bits, Top, Bottom) ->
-    Bytes = (Bits+7) div 8,
-    Skip  = (8-(Bits rem 8)) rem 8,
-    TMask = case Top of
-		  0 -> 0;
-		  1 -> 16#80;
-		  2 -> 16#c0
-	      end,
-    BMask = case Bottom of
-		0 -> 0;
-		1 -> (1 bsl Skip)
-	    end,
-    <<X:Bits/big-unsigned-integer, _:Skip>> = random(Bytes, TMask, BMask),
-    X.
+irandom(Bits, Top, Bottom) when is_integer(Top),
+                                0 =< Top, Top =< 2 ->
+    crypto:erlint(crypto:strong_rand_mpint(Bits, Top - 1, Bottom)).
 
 %%
 %% random/1
 %%   Generate N random bytes
 %%
 random(N) ->
-    random(N, 0, 0).
-
-random(N, TMask, BMask) ->
-    list_to_binary(rnd(N, TMask, BMask)).
-
-%% random/3
-%%   random(Bytes, TopMask, BotMask)
-%% where 
-%% Bytes is the number of bytes to generate
-%% TopMask is bitwised or'ed to the first byte
-%% BotMask is bitwised or'ed to the last byte
-%%
-rnd(0, _TMask, _BMask) ->
-    [];
-rnd(1, TMask, BMask) ->
-    [(rand8() bor TMask) bor BMask];
-rnd(N, TMask, BMask) ->
-    [(rand8() bor TMask) | rnd_n(N-1, BMask)].
-
-rnd_n(1, BMask) ->
-    [rand8() bor BMask];
-rnd_n(I, BMask) ->
-    [rand8() | rnd_n(I-1, BMask)].
-
-rand8() ->
-    (rand32() bsr 8) band 16#ff.
-
-rand32() ->
-    random:uniform(16#100000000) -1.
+    crypto:strong_rand_bytes(N).
 
 %%
 %% Base 64 encode/decode
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index cb78acb84c..781e01b9d1 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 0ba11b0a26..3193be2510 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -106,8 +106,6 @@ peer_address(ConnectionHandler) ->
 %% initialize. 
 %%--------------------------------------------------------------------
 init([Role, Manager, Socket, SshOpts]) ->
-    {A,B,C} = erlang:now(),
-    random:seed(A, B, C),
     {NumVsn, StrVsn} = ssh_transport:versions(Role, SshOpts),
     ssh_bits:install_messages(ssh_transport:transport_messages(NumVsn)),
     {Protocol, Callback, CloseTag} = 
@@ -580,7 +578,9 @@ handle_info({CloseTag, _Socket}, _StateName,
 %% Reason. The return value is ignored.
 %%--------------------------------------------------------------------
 terminate(normal, _, #state{transport_cb = Transport,
-			    socket = Socket}) ->
+			    socket = Socket,
+			    manager = Pid}) ->
+    (catch ssh_userreg:delete_user(Pid)),
     (catch Transport:close(Socket)),
     ok;
 
@@ -812,7 +812,7 @@ handle_disconnect(#ssh_msg_disconnect{} = Msg,
 		  #state{ssh_params = Ssh0, manager = Pid} = State) ->
     {SshPacket, Ssh} = ssh_transport:ssh_packet(Msg, Ssh0),
     try 
- 	send_msg(SshPacket, State),
+	send_msg(SshPacket, State),
  	ssh_connection_manager:event(Pid, Msg)
     catch
 	exit:{noproc, _Reason} ->
@@ -824,6 +824,7 @@ handle_disconnect(#ssh_msg_disconnect{} = Msg,
 				   [Msg, Exit]),
 	    error_logger:info_report(Report)
     end,
+    (catch ssh_userreg:delete_user(Pid)),
     {stop, normal, State#state{ssh_params = Ssh}}.
 
 counterpart_versions(NumVsn, StrVsn, #ssh{role = server} = Ssh) ->
diff --git a/lib/ssh/src/ssh_userreg.erl b/lib/ssh/src/ssh_userreg.erl
index 33c801f490..f901461aea 100644
--- a/lib/ssh/src/ssh_userreg.erl
+++ b/lib/ssh/src/ssh_userreg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -25,11 +25,18 @@
 -behaviour(gen_server).
 
 %% API
--export([start_link/0, register_user/2, lookup_user/1]).
+-export([start_link/0,
+	 register_user/2,
+	 lookup_user/1,
+	 delete_user/1]).
 
 %% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
+-export([init/1,
+	 handle_call/3,
+	 handle_cast/2,
+	 handle_info/2,
+	 terminate/2,
+	 code_change/3]).
 
 -record(state, {user_db = []}).
 
@@ -46,6 +53,9 @@ start_link() ->
 register_user(User, Cm) ->
     gen_server:cast(?MODULE, {register, {User, Cm}}).
 
+delete_user(Cm) ->
+    gen_server:cast(?MODULE, {delete, Cm}).
+
 lookup_user(Cm) ->
     gen_server:call(?MODULE, {get_user, Cm}, infinity).
 
@@ -82,9 +92,10 @@ handle_call({get_user, Cm}, _From, #state{user_db = Db} = State) ->
 %%                                      {stop, Reason, State}
 %% Description: Handling cast messages
 %%--------------------------------------------------------------------
-handle_cast({register, UserCm}, State0) ->
-    State = insert(UserCm, State0),
-    {noreply, State}.
+handle_cast({register, UserCm}, State) ->
+    {noreply, insert(UserCm, State)};
+handle_cast({delete, UserCm}, State) ->
+    {noreply, delete(UserCm, State)}.
 
 %%--------------------------------------------------------------------
 %% Function: handle_info(Info, State) -> {noreply, State} |
@@ -118,6 +129,9 @@ code_change(_OldVsn, State, _Extra) ->
 insert({User, Cm}, #state{user_db = Db} = State) ->
     State#state{user_db = [{User, Cm} | Db]}.
 
+delete(Cm, #state{user_db = Db} = State) ->
+    State#state{user_db = lists:keydelete(Cm, 2, Db)}.
+
 lookup(_, []) ->
     undefined;
 lookup(Cm, [{User, Cm} | _Rest]) ->
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 51f9f47446..d0861b3ddc 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 2.0.4
+SSH_VSN = 2.0.6
 APP_VSN    = "ssh-$(SSH_VSN)"
 
diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in
index 49a209f2eb..da716f7c40 100644
--- a/lib/ssl/c_src/Makefile.in
+++ b/lib/ssl/c_src/Makefile.in
@@ -28,6 +28,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 # ----------------------------------------------------
 SSL_LIBDIR = @SSL_LIBDIR@
 SSL_INCLUDE = @SSL_INCLUDE@
+SSL_CRYPTO_LIBNAME = @SSL_CRYPTO_LIBNAME@
+SSL_SSL_LIBNAME = @SSL_SSL_LIBNAME@
 
 # ----------------------------------------------------
 # Application version
@@ -134,7 +136,7 @@ ifeq ($(findstring @,$(SSL_CC_RUNTIME_LIBRARY_PATH)),@)
 SSL_CC_RUNTIME_LIBRARY_PATH = $(CC_R_OPT)
 endif
 
-SSL_LINK_LIB=-L$(SSL_LIBDIR) -lssl -lcrypto
+SSL_LINK_LIB=-L$(SSL_LIBDIR) -l$(SSL_SSL_LIBNAME) -l$(SSL_CRYPTO_LIBNAME)
 else 
 # not dynamic crypto lib (default from R11B-5)
 NEED_KERBEROS=@SSL_LINK_WITH_KERBEROS@
@@ -142,7 +144,7 @@ NEED_ZLIB=@SSL_LINK_WITH_ZLIB@
 SSL_MAKEFILE =
 CC_R_OPT =
 SSL_CC_RUNTIME_LIBRARY_PATH=
-SSL_LINK_LIB = $(SSL_LIBDIR)/libssl.a $(SSL_LIBDIR)/libcrypto.a 
+SSL_LINK_LIB = $(SSL_LIBDIR)/lib$(SSL_SSL_LIBNAME).a $(SSL_LIBDIR)/lib$(SSL_CRYPTO_LIBNAME).a 
 ifeq ($(NEED_KERBEROS),yes)
 SSL_LINK_LIB += @STATIC_KERBEROS_LIBS@
 endif
@@ -175,7 +177,7 @@ $(BINDIR)/ssl_esock: $(OBJS)
 
 # Win32/Cygwin
 $(BINDIR)/ssl_esock.exe: $(OBJS)
-	$(LD) $(SSL_CC_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -o $@ $^ -lwsock32 -llibeay32 -lssleay32
+	$(LD) $(SSL_CC_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -o $@ $^ -lwsock32 -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
 
 # Unix only, and only when linking statically
 $(SSL_MAKEFILE):
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 52ee9c086a..b2d17925fd 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -28,59 +28,47 @@
     <rev>G</rev>
     <file>notes.xml</file>
   </header>
-  <p>This document describes the changes made to the SSL application.
-    </p>
-
-    <section><title>SSL 4.1.4</title>
-
+  <p>This document describes the changes made to the SSL application.</p>
+  
+  <section>
+    <title>SSL 4.1.5</title>
+    
     <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Reduced memory footprint of an ssl connection.</p>
-          <p>
-	    Handshake hashes, premaster secret and "public_key_info"
-	    does not need to be saved when the connection has been
-	    established. The own certificate is no longer duplicated
-	    in the state.</p>
-          <p>
-	    Own Id: OTP-9021</p>
-        </item>
-        <item>
-          <p>
-	    Add the option {hibernate_after, int()} to ssl:connect
-	    and ssl:listen</p>
-          <p>
-	    Own Id: OTP-9106</p>
-        </item>
-      </list>
+    <list>
+      <item>
+	<p>Calling gen_tcp:connect with option {ip, {127,0,0,1}} results in 
+	an exit with reason badarg. Neither SSL nor INETS This was not 
+	catched, resulting in crashes with incomprehensible reasons.</p>
+	<p>Own Id: OTP-9289 Aux Id: seq11845</p>
+      </item>
+    </list>
     </section>
-
-</section>
-
-<section><title>SSL 4.1.3</title>
-
+    
+  </section>
+  
+  <section>
+    <title>SSL 4.1.3</title>
+  
     <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fixed error in cache-handling fix from ssl-4.1.2</p>
-          <p>
-	    Own Id: OTP-9018 Aux Id: seq11739 </p>
-        </item>
-        <item>
-          <p>
-	    Verification of a critical extended_key_usage-extension
-	    corrected</p>
-          <p>
-	    Own Id: OTP-9029 Aux Id: seq11541 </p>
-        </item>
-      </list>
+    <list>
+      <item>
+	<p>
+	Fixed error in cache-handling fix from ssl-4.1.2</p>
+	<p>
+	Own Id: OTP-9018 Aux Id: seq11739 </p>
+      </item>
+      <item>
+	<p>Verification of a critical extended_key_usage-extension
+	corrected</p>
+	<p>Own Id: OTP-9029 Aux Id: seq11541 </p>
+      </item>
+    </list>
     </section>
 
-</section>
+  </section>
 
-<section><title>SSL 4.1.2</title>
+  <section>
+    <title>SSL 4.1.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index cd5c9281cd..0da6bbee5b 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -53,13 +53,11 @@
     <p>The following data types are used in the functions below:
     </p>
 
-    <p><c>boolean() = true | false</c></p> 
-    
-    <p><c>property() = atom()</c></p>
-    
+    <p><c>boolean() = true | false</c></p>
+
     <p><c>option() = socketoption() | ssloption() | transportoption()</c></p>
 
-     <p><c>socketoption() = [{property(), term()}] - defaults to
+     <p><c>socketoption() = proplists:property() - The default socket options are
       [{mode,list},{packet, 0},{header, 0},{active, true}].
     </c></p>
 
@@ -266,7 +264,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
 
 <p>Possible path validation errors: </p>
 
-<p> {bad_cert, cert_expired}, {bad_cert, invalid_issuer}, {bad_cert, invalid_signature}, {bad_cert, unknown_ca}, {bad_cert, name_not_permitted}, {bad_cert, missing_basic_constraint}, {bad_cert, invalid_key_usage}</p>
+<p> {bad_cert, cert_expired}, {bad_cert, invalid_issuer}, {bad_cert, invalid_signature}, {bad_cert, unknown_ca},{bad_cert, selfsigned_peer}, {bad_cert, name_not_permitted}, {bad_cert, missing_basic_constraint}, {bad_cert, invalid_key_usage}</p>
       </item>
 
       <tag>{hibernate_after, integer()|undefined}</tag>
@@ -488,7 +486,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
       <fsummary>Get the value of the specified options.</fsummary>
       <type>
 	<v>Socket = sslsocket()</v>
-	<v>OptionNames = [property()]</v>
+	<v>OptionNames = [atom()]</v>
       </type>
       <desc>
 	<p>Get the value of the specified socket options, if no
@@ -583,7 +581,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
       <fsummary>Write data to a socket.</fsummary>
       <type>
         <v>Socket = sslsocket()</v>
-        <v>Data = iolist() | binary()</v>
+        <v>Data = iodata()</v>
       </type>
       <desc>
         <p>Writes <c>Data</c> to <c>Socket</c>. </p>
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index a0ecb4ac6f..cf8867245b 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -5,7 +5,7 @@
   {"4.1.3", [{restart_application, ssl}]},
   {"4.1.2", [{restart_application, ssl}]},
   {"4.1.1", [{restart_application, ssl}]},
-  {"4.1", [{restart_application, ssl}]},
+  {"4.1",   [{restart_application, ssl}]},
   {"4.0.1", [{restart_application, ssl}]}
  ], 
  [
@@ -13,7 +13,7 @@
   {"4.1.3", [{restart_application, ssl}]},
   {"4.1.2", [{restart_application, ssl}]},
   {"4.1.1", [{restart_application, ssl}]},
-  {"4.1", [{restart_application, ssl}]},
+  {"4.1",   [{restart_application, ssl}]},
   {"4.0.1", [{restart_application, ssl}]}
  ]}.
 
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 7b1fda4cf9..0ced6707eb 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -50,8 +50,7 @@
 		 cb                 %% Callback info
 		}).
 -type option()       :: socketoption() | ssloption() | transportoption().
--type socketoption() :: [{property(), term()}]. %% See gen_tcp and inet
--type property()     :: atom().
+-type socketoption() :: term(). %% See gen_tcp and inet, import spec later when there is one to import
 -type ssloption()    :: {verify, verify_type()} |
 			{verify_fun, {fun(), InitialUserState::term()}} |
                         {fail_if_no_peer_cert, boolean()} | {depth, integer()} |
@@ -264,7 +263,7 @@ close(Socket = #sslsocket{}) ->
     ssl_broker:close(Socket).
 
 %%--------------------------------------------------------------------
--spec send(#sslsocket{}, iolist()) -> ok | {error, reason()}.
+-spec send(#sslsocket{}, iodata()) -> ok | {error, reason()}.
 %% 
 %% Description: Sends data over the ssl connection
 %%--------------------------------------------------------------------
@@ -403,9 +402,9 @@ cipher_suites(openssl) ->
     [ssl_cipher:openssl_suite_name(S) || S <- ssl_cipher:suites(Version)].
 
 %%--------------------------------------------------------------------
--spec getopts(#sslsocket{}, [atom()]) -> {ok, [{atom(), term()}]}| {error, reason()}.
+-spec getopts(#sslsocket{}, [atom()]) -> {ok, [{atom(), term()}]} | {error, reason()}.
 %% 
-%% Description:
+%% Description: Gets options
 %%--------------------------------------------------------------------
 getopts(#sslsocket{fd = new_ssl, pid = Pid}, OptTags) when is_pid(Pid) ->
     ssl_connection:get_opts(Pid, OptTags);
@@ -416,9 +415,9 @@ getopts(#sslsocket{} = Socket, Options) ->
     ssl_broker:getopts(Socket, Options).
 
 %%--------------------------------------------------------------------
--spec setopts(#sslsocket{},  [{atom(), term()}]) -> ok | {error, reason()}.
+-spec setopts(#sslsocket{},  [proplist:property()]) -> ok | {error, reason()}.
 %% 
-%% Description:
+%% Description: Sets options
 %%--------------------------------------------------------------------
 setopts(#sslsocket{fd = new_ssl, pid = Pid}, Opts0) when is_pid(Pid) ->
     Opts = proplists:expand([{binary, [{mode, binary}]},
@@ -612,8 +611,10 @@ do_new_connect(Address, Port,
     catch
 	exit:{function_clause, _} ->
 	    {error, {eoptions, {cb_info, CbInfo}}};
+	exit:badarg ->
+	    {error, {eoptions, {inet_options, UserOpts}}};
 	exit:{badarg, _} ->
-	    {error,{eoptions, {inet_options, UserOpts}}}
+	    {error, {eoptions, {inet_options, UserOpts}}}
     end.
 
 old_connect(Address, Port, Options, Timeout) ->
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 574e1e9468..2c452837f8 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -107,12 +107,14 @@
 %%====================================================================	     
 
 %%--------------------------------------------------------------------
--spec send(pid(), iolist()) -> ok | {error, reason()}.
+-spec send(pid(), iodata()) -> ok | {error, reason()}.
 %%
 %% Description: Sends data over the ssl connection
 %%--------------------------------------------------------------------
 send(Pid, Data) -> 
     sync_send_all_state_event(Pid, {application_data, 
+				    %% iolist_to_binary should really
+				    %% be called iodata_to_binary()
 				    erlang:iolist_to_binary(Data)}, infinity).
 
 %%--------------------------------------------------------------------
@@ -939,17 +941,23 @@ handle_info({Protocol, _, Data}, StateName,
 
 handle_info({CloseTag, Socket}, _StateName,
             #state{socket = Socket, close_tag = CloseTag,
-		   negotiated_version = Version, host = Host,
-		   port = Port, socket_options = Opts, 
+		   negotiated_version = Version,
+		   socket_options = Opts,
 		   user_application = {_Mon,Pid}, from = From, 
-		   role = Role, session = Session} = State) ->
-    %% Debug option maybe, the user do NOT want to see these in their logs
-    %% error_logger:info_report("SSL: Peer did not send close notify alert."),
+		   role = Role} = State) ->
+    %% Note that as of TLS 1.1,
+    %% failure to properly close a connection no longer requires that a
+    %% session not be resumed.  This is a change from TLS 1.0 to conform
+    %% with widespread implementation practice.
     case Version of
 	{1, N} when N >= 1 ->
 	    ok;
 	_ ->
-	    invalidate_session(Role, Host, Port, Session)
+	    %% As invalidate_sessions here causes performance issues,
+	    %% we will conform to the widespread implementation
+	    %% practice and go aginst the spec
+	    %%invalidate_session(Role, Host, Port, Session)
+	    ok
     end,
     alert_user(Opts#socket_options.active, Pid, From,
 	       ?ALERT_REC(?WARNING, ?CLOSE_NOTIFY), Role),
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index f845b1ecc0..5a2d0c9496 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -57,6 +57,7 @@
 -define('24H_in_sec', 8640).
 -define(SESSION_VALIDATION_INTERVAL, 60000).
 -define(CERTIFICATE_CACHE_CLEANUP, 30000).
+-define(CLEAN_SESSION_DB, 60000).
 
 %%====================================================================
 %% API
@@ -70,7 +71,8 @@ start_link(Opts) ->
     gen_server:start_link({local, ?MODULE}, ?MODULE, [Opts], []).
 
 %%--------------------------------------------------------------------
--spec connection_init(string()| {der, list()}, client | server) -> {ok, reference(), cache_ref()}.
+-spec connection_init(string()| {der, list()}, client | server) ->
+			     {ok, reference(), cache_ref()}.
 %%			     
 %% Description: Do necessary initializations for a new connection.
 %%--------------------------------------------------------------------
@@ -101,7 +103,9 @@ lookup_trusted_cert(Ref, SerialNumber, Issuer) ->
     ssl_certificate_db:lookup_trusted_cert(Ref, SerialNumber, Issuer).
 %%--------------------------------------------------------------------
 -spec issuer_candidate(cert_key() | no_candidate) -> 
-			      {cert_key(), {der_cert(), #'OTPCertificate'{}}} | no_more_candidates.      
+			      {cert_key(),
+			       {der_cert(),
+				#'OTPCertificate'{}}} | no_more_candidates.
 %%
 %% Description: Return next issuer candidate.
 %%--------------------------------------------------------------------
@@ -117,7 +121,8 @@ client_session_id(Host, Port, SslOpts, OwnCert) ->
     call({client_session_id, Host, Port, SslOpts, OwnCert}).
 
 %%--------------------------------------------------------------------
--spec server_session_id(host(), port_num(), #ssl_options{}, der_cert()) -> session_id().
+-spec server_session_id(host(), port_num(), #ssl_options{},
+			der_cert()) -> session_id().
 %%
 %% Description: Select a session id for the server.
 %%--------------------------------------------------------------------
@@ -139,7 +144,9 @@ register_session(Port, Session) ->
 -spec invalidate_session(port_num(), #session{}) -> ok.
 -spec invalidate_session(host(), port_num(), #session{}) -> ok.
 %%
-%% Description: Make the session unavilable for reuse.
+%% Description: Make the session unavailable for reuse. After
+%% a the session has been marked "is_resumable = false" for some while
+%% it will be safe to remove the data from the session database.
 %%--------------------------------------------------------------------
 invalidate_session(Host, Port, Session) ->
     cast({invalidate_session, Host, Port, Session}).
@@ -259,23 +266,26 @@ handle_cast({register_session, Port, Session},
     {noreply, State};
 
 handle_cast({invalidate_session, Host, Port, 
-	     #session{session_id = ID}}, 
+	     #session{session_id = ID} = Session},
 	    #state{session_cache = Cache,
 		   session_cache_cb = CacheCb} = State) ->
-    CacheCb:delete(Cache, {{Host, Port}, ID}),
+    CacheCb:update(Cache, {{Host, Port}, ID}, Session#session{is_resumable = false}),
+    timer:apply_after(?CLEAN_SESSION_DB, CacheCb, delete, {{Host, Port}, ID}),
     {noreply, State};
 
-handle_cast({invalidate_session, Port, #session{session_id = ID}}, 
+handle_cast({invalidate_session, Port, #session{session_id = ID} = Session},
 	    #state{session_cache = Cache,
 		   session_cache_cb = CacheCb} = State) ->
-    CacheCb:delete(Cache, {Port, ID}),
+    CacheCb:update(Cache, {Port, ID}, Session#session{is_resumable = false}),
+    timer:apply_after(?CLEAN_SESSION_DB, CacheCb, delete, {Port, ID}),
     {noreply, State};
 
 handle_cast({recache_pem, File, LastWrite, Pid, From},
 	    #state{certificate_db = [_, FileToRefDb, _]} = State0) ->
     case ssl_certificate_db:lookup(File, FileToRefDb) of
 	undefined ->
-	    {reply, Msg, State} = handle_call({{cache_pem, File, LastWrite}, Pid}, From, State0),
+	    {reply, Msg, State} =
+		handle_call({{cache_pem, File, LastWrite}, Pid}, From, State0),
 	    gen_server:reply(From, Msg),
 	    {noreply, State};
 	_ -> %% Send message to self letting cleanup messages be handled
diff --git a/lib/stdlib/doc/specs/.gitignore b/lib/stdlib/doc/specs/.gitignore
new file mode 100644
index 0000000000..322eebcb06
--- /dev/null
+++ b/lib/stdlib/doc/specs/.gitignore
@@ -0,0 +1 @@
+specs_*.xml
diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile
index b558697d63..16e0a86e3b 100644
--- a/lib/stdlib/doc/src/Makefile
+++ b/lib/stdlib/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2010. All Rights Reserved.
+# Copyright Ericsson AB 1997-2011. 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
@@ -125,18 +125,24 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
+
+TOP_SPECS_FILE = specs.xml
+
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
 XML_FLAGS += 
 
+SPECS_FLAGS = -I../../include -I../../../kernel/include
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-docs: pdf html man
+docs: man pdf html
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
@@ -155,8 +161,13 @@ clean clean_docs:
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f $(SPECDIR)/*
 	rm -f errs core *~ 
 
+$(SPECDIR)/specs_erl_id_trans.xml:
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+		-o$(dir $@) -module erl_id_trans
+
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
diff --git a/lib/stdlib/doc/src/array.xml b/lib/stdlib/doc/src/array.xml
index 5c3ac6a2a9..a79fcd487e 100644
--- a/lib/stdlib/doc/src/array.xml
+++ b/lib/stdlib/doc/src/array.xml
@@ -3,7 +3,7 @@
 <erlref>
 <header>
     <copyright>
-      <year>2007</year><year>2009</year>
+      <year>2007</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -82,19 +82,35 @@ the default value cannot be confused with the values of set entries.</p>
   %% allow accesses beyond the last set entry
   {'EXIT',{badarg,_}} = (catch array:set(18, true, A3)).
   {'EXIT',{badarg,_}} = (catch array:get(18, A3)).</pre></description>
-<section><title>DATA TYPES</title><marker id="types"/>
-
-<taglist>
-<tag><c>array()</c></tag>
-<item><marker id="type-array"/>
-<p>A functional, extendible array. The representation is
-  not documented and is subject to change without notice. Note that
-  arrays cannot be directly compared for equality.</p>
-</item>
-</taglist></section>
+<datatypes>
+  <datatype>
+    <name><marker id="type-array">array()</marker></name>
+    <desc>
+      <p>A functional, extendible array. The representation is
+        not documented and is subject to change without notice. Note that
+        arrays cannot be directly compared for equality.</p>
+    </desc>
+  </datatype>
+  <datatype>
+    <name name="array_indx"/>
+  </datatype>
+  <datatype>
+    <name name="array_opts"/>
+  </datatype>
+  <datatype>
+    <name name="array_opt"/>
+  </datatype>
+  <datatype>
+    <name name="indx_pairs"/>
+  </datatype>
+  <datatype>
+    <name name="indx_pair"/>
+  </datatype>
+</datatypes>
+
 <funcs>
 <func>
-<name>default(Array::array()) -&gt; term()</name>
+<name name="default" arity="1"/>
 <fsummary>Get the value used for uninitialized entries.</fsummary>
 
 <desc><marker id="default-1"/>
@@ -104,7 +120,7 @@ the default value cannot be confused with the values of set entries.</p>
 <p><em>See also:</em> <seealso marker="#new-2">new/2</seealso>.</p>
 </desc></func>
 <func>
-<name>fix(Array::array()) -&gt; array()</name>
+<name name="fix" arity="1"/>
 <fsummary>Fix the size of the array.</fsummary>
 
 <desc><marker id="fix-1"/>
@@ -114,105 +130,100 @@ the default value cannot be confused with the values of set entries.</p>
 <p><em>See also:</em> <seealso marker="#relax-1">relax/1</seealso>.</p>
 </desc></func>
 <func>
-<name>foldl(Function, InitialAcc::term(), Array::array()) -&gt; term()</name>
+<name name="foldl" arity="3"/>
 <fsummary>Fold the elements of the array using the given function and
   initial accumulator value.</fsummary>
-<type>
-<v>Function = (Index::integer(), Value::term(), Acc::term()) -&gt; term()</v></type>
 <desc><marker id="foldl-3"/>
-
 <p>Fold the elements of the array using the given function and
   initial accumulator value. The elements are visited in order from the
-  lowest index to the highest. If <c>Function</c> is not a function, the
+  lowest index to the highest. If <c><anno>Function</anno></c> is not a function, the
   call fails with reason <c>badarg</c>.
  </p>
 <p><em>See also:</em> <seealso marker="#foldr-3">foldr/3</seealso>, <seealso marker="#map-2">map/2</seealso>, <seealso marker="#sparse_foldl-3">sparse_foldl/3</seealso>.</p>
 </desc></func>
 <func>
-<name>foldr(Function, InitialAcc::term(), Array::array()) -&gt; term()</name>
+<name name="foldr" arity="3"/>
 <fsummary>Fold the elements of the array right-to-left using the given
   function and initial accumulator value.</fsummary>
-<type>
-<v>Function = (Index::integer(), Value::term(), Acc::term()) -&gt; term()</v></type>
 <desc><marker id="foldr-3"/>
 
 <p>Fold the elements of the array right-to-left using the given
   function and initial accumulator value. The elements are visited in
-  order from the highest index to the lowest. If <c>Function</c> is not a
+  order from the highest index to the lowest. If <c><anno>Function</anno></c> is not a
   function, the call fails with reason <c>badarg</c>.
  </p>
 <p><em>See also:</em> <seealso marker="#foldl-3">foldl/3</seealso>, <seealso marker="#map-2">map/2</seealso>.</p>
 </desc></func>
 <func>
-<name>from_list(List::list()) -&gt; array()</name>
+<name name="from_list" arity="1"/>
 <fsummary>Equivalent to from_list(List, undefined).
 </fsummary>
 
 <desc><marker id="from_list-1"/>
-<p>Equivalent to <seealso marker="#from_list-2">from_list(List, undefined)</seealso>.</p>
+<p>Equivalent to <seealso marker="#from_list-2">from_list(<anno>List</anno>, undefined)</seealso>.</p>
 </desc></func>
 <func>
-<name>from_list(List::list(), Default::term()) -&gt; array()</name>
+<name name="from_list" arity="2"/>
 <fsummary>Convert a list to an extendible array.</fsummary>
 
 <desc><marker id="from_list-2"/>
 
-<p>Convert a list to an extendible array. <c>Default</c> is used as the value
-  for uninitialized entries of the array. If <c>List</c> is not a proper list,
+<p>Convert a list to an extendible array. <c><anno>Default</anno></c> is used as the value
+  for uninitialized entries of the array. If <c><anno>List</anno></c> is not a proper list,
   the call fails with reason <c>badarg</c>.
  </p>
 <p><em>See also:</em> <seealso marker="#new-2">new/2</seealso>, <seealso marker="#to_list-1">to_list/1</seealso>.</p>
 </desc></func>
 <func>
-<name>from_orddict(Orddict::list()) -&gt; array()</name>
+<name name="from_orddict" arity="1"/>
 <fsummary>Equivalent to from_orddict(Orddict, undefined).
 </fsummary>
 
 <desc><marker id="from_orddict-1"/>
-<p>Equivalent to <seealso marker="#from_orddict-2">from_orddict(Orddict, undefined)</seealso>.</p>
+<p>Equivalent to <seealso marker="#from_orddict-2">from_orddict(<anno>Orddict</anno>, undefined)</seealso>.</p>
 </desc></func>
 <func>
-<name>from_orddict(List::list(), Default::term()) -&gt; array()</name>
+<name name="from_orddict" arity="2"/>
 <fsummary>Convert an ordered list of pairs {Index, Value} to a
   corresponding extendible array.</fsummary>
 
 <desc><marker id="from_orddict-2"/>
 
 <p>Convert an ordered list of pairs <c>{Index, Value}</c> to a
-  corresponding extendible array. <c>Default</c> is used as the value for
-  uninitialized entries of the array. If <c>List</c> is not a proper,
+  corresponding extendible array. <c><anno>Default</anno></c> is used as the value for
+  uninitialized entries of the array. If <c><anno>Orddict</anno></c> is not a proper,
   ordered list of pairs whose first elements are nonnegative
   integers, the call fails with reason <c>badarg</c>.
  </p>
 <p><em>See also:</em> <seealso marker="#new-2">new/2</seealso>, <seealso marker="#to_orddict-1">to_orddict/1</seealso>.</p>
 </desc></func>
 <func>
-<name>get(I::integer(), Array::array()) -&gt; term()</name>
+<name name="get" arity="2"/>
 <fsummary>Get the value of entry I.</fsummary>
 
 <desc><marker id="get-2"/>
 
-<p>Get the value of entry <c>I</c>. If <c>I</c> is not a nonnegative
-  integer, or if the array has fixed size and <c>I</c> is larger than the
+<p>Get the value of entry <c><anno>I</anno></c>. If <c><anno>I</anno></c> is not a nonnegative
+  integer, or if the array has fixed size and <c><anno>I</anno></c> is larger than the
   maximum index, the call fails with reason <c>badarg</c>.</p>
  
   <p>If the array does not have fixed size, this function will return the
-  default value for any index <c>I</c> greater than <c>size(Array)-1</c>.</p>
+  default value for any index <c><anno>I</anno></c> greater than <c>size(<anno>Array</anno>)-1</c>.</p>
 <p><em>See also:</em> <seealso marker="#set-3">set/3</seealso>.</p>
 </desc></func>
 <func>
-<name>is_array(X::term()) -&gt; bool()</name>
+<name name="is_array" arity="1"/>
 <fsummary>Returns true if X appears to be an array, otherwise false.</fsummary>
 
 <desc><marker id="is_array-1"/>
 
-<p>Returns <c>true</c> if <c>X</c> appears to be an array, otherwise <c>false</c>.
-  Note that the check is only shallow; there is no guarantee that <c>X</c>
+<p>Returns <c>true</c> if <c><anno>X</anno></c> appears to be an array, otherwise <c>false</c>.
+  Note that the check is only shallow; there is no guarantee that <c><anno>X</anno></c>
   is a well-formed array representation even if this function returns
   <c>true</c>.</p>
 </desc></func>
 <func>
-<name>is_fix(Array::array()) -&gt; bool()</name>
+<name name="is_fix" arity="1"/>
 <fsummary>Check if the array has fixed size.</fsummary>
 
 <desc><marker id="is_fix-1"/>
@@ -222,20 +233,18 @@ the default value cannot be confused with the values of set entries.</p>
 <p><em>See also:</em> <seealso marker="#fix-1">fix/1</seealso>.</p>
 </desc></func>
 <func>
-<name>map(Function, Array::array()) -&gt; array()</name>
+<name name="map" arity="2"/>
 <fsummary>Map the given function onto each element of the array.</fsummary>
-<type>
-<v>Function = (Index::integer(), Value::term()) -&gt; term()</v></type>
 <desc><marker id="map-2"/>
 
 <p>Map the given function onto each element of the array. The
   elements are visited in order from the lowest index to the highest.
-  If <c>Function</c> is not a function, the call fails with reason <c>badarg</c>.
+  If <c><anno>Function</anno></c> is not a function, the call fails with reason <c>badarg</c>.
  </p>
 <p><em>See also:</em> <seealso marker="#foldl-3">foldl/3</seealso>, <seealso marker="#foldr-3">foldr/3</seealso>, <seealso marker="#sparse_map-2">sparse_map/2</seealso>.</p>
 </desc></func>
 <func>
-<name>new() -&gt; array()</name>
+<name name="new" arity="0"/>
 <fsummary>Create a new, extendible array with initial size zero.</fsummary>
 
 <desc><marker id="new-0"/>
@@ -244,7 +253,7 @@ the default value cannot be confused with the values of set entries.</p>
 <p><em>See also:</em> <seealso marker="#new-1">new/1</seealso>, <seealso marker="#new-2">new/2</seealso>.</p>
 </desc></func>
 <func>
-<name>new(Options::term()) -&gt; array()</name>
+<name name="new" arity="1"/>
 <fsummary>Create a new array according to the given options.</fsummary>
 
 <desc><marker id="new-1"/>
@@ -253,10 +262,10 @@ the default value cannot be confused with the values of set entries.</p>
 the array is extendible and has initial size zero. Array indices  
 start at 0.</p>
  
-  <p><c>Options</c> is a single term or a list of terms, selected from the
+  <p><c><anno>Options</anno></c> is a single term or a list of terms, selected from the
   following:
   </p><taglist>
-    <tag><c>N::integer()</c> or <c>{size, N::integer()}</c></tag>
+    <tag><c>N::integer() >= 0</c> or <c>{size, N::integer() >= 0}</c></tag>
     <item><p>Specifies the initial size of the array; this also implies
     <c>{fixed, true}</c>. If <c>N</c> is not a nonnegative integer, the call
     fails with reason <c>badarg</c>.</p></item>
@@ -283,19 +292,19 @@ cannot be changed once the array has been created.</p>
 <p><em>See also:</em> <seealso marker="#fix-1">fix/1</seealso>, <seealso marker="#from_list-2">from_list/2</seealso>, <seealso marker="#get-2">get/2</seealso>, <seealso marker="#new-0">new/0</seealso>, <seealso marker="#new-2">new/2</seealso>, <seealso marker="#set-3">set/3</seealso>.</p>
 </desc></func>
 <func>
-<name>new(Size::integer(), Options::term()) -&gt; array()</name>
+<name name="new" arity="2"/>
 <fsummary>Create a new array according to the given size and options.</fsummary>
 
 <desc><marker id="new-2"/>
 
 <p>Create a new array according to the given size and options. If
-  <c>Size</c> is not a nonnegative integer, the call fails with reason
+  <c><anno>Size</anno></c> is not a nonnegative integer, the call fails with reason
   <c>badarg</c>. By default, the array has fixed size. Note that any size
-  specifications in <c>Options</c> will override the <c>Size</c> parameter.</p>
+  specifications in <c><anno>Options</anno></c> will override the <c><anno>Size</anno></c> parameter.</p>
  
-  <p>If <c>Options</c> is a list, this is simply equivalent to <c>new([{size,
-  Size} | Options]</c>, otherwise it is equivalent to <c>new([{size, Size} |
-  [Options]]</c>. However, using this function directly is more efficient.</p>
+  <p>If <c><anno>Options</anno></c> is a list, this is simply equivalent to <c>new([{size,
+  <anno>Size</anno>} | <anno>Options</anno>]</c>, otherwise it is equivalent to <c>new([{size, <anno>Size</anno>} |
+  [<anno>Options</anno>]]</c>. However, using this function directly is more efficient.</p>
  
   <p>Example:
   </p><pre>     array:new(100, {default,0})</pre><p> creates a fixed-size array of size
@@ -304,7 +313,7 @@ cannot be changed once the array has been created.</p>
 <p><em>See also:</em> <seealso marker="#new-1">new/1</seealso>.</p>
 </desc></func>
 <func>
-<name>relax(Array::array()) -&gt; array()</name>
+<name name="relax" arity="1"/>
 <fsummary>Make the array resizable.</fsummary>
 
 <desc><marker id="relax-1"/>
@@ -313,24 +322,24 @@ cannot be changed once the array has been created.</p>
 <p><em>See also:</em> <seealso marker="#fix-1">fix/1</seealso>.</p>
 </desc></func>
 <func>
-<name>reset(I::integer(), Array::array()) -&gt; array()</name>
+<name name="reset" arity="2"/>
 <fsummary>Reset entry I to the default value for the array.</fsummary>
 
 <desc><marker id="reset-2"/>
 
-<p>Reset entry <c>I</c> to the default value for the array. 
-  If the value of entry <c>I</c> is the default value the array will be
+<p>Reset entry <c><anno>I</anno></c> to the default value for the array.
+  If the value of entry <c><anno>I</anno></c> is the default value the array will be
   returned unchanged. Reset will never change size of the array.   
   Shrinking can be done explicitly by calling <seealso marker="#resize-2">resize/2</seealso>.</p>
  
-  <p>If <c>I</c> is not a nonnegative integer, or if the array has fixed size
-  and <c>I</c> is larger than the maximum index, the call fails with reason
+  <p>If <c><anno>I</anno></c> is not a nonnegative integer, or if the array has fixed size
+  and <c><anno>I</anno></c> is larger than the maximum index, the call fails with reason
   <c>badarg</c>; cf. <seealso marker="#set-3">set/3</seealso>
  </p>
 <p><em>See also:</em> <seealso marker="#new-2">new/2</seealso>, <seealso marker="#set-3">set/3</seealso>.</p>
 </desc></func>
 <func>
-<name>resize(Array::array()) -&gt; array()</name>
+<name name="resize" arity="1"/>
 <fsummary>Change the size of the array to that reported by sparse_size/1.</fsummary>
 
 <desc><marker id="resize-1"/>
@@ -340,90 +349,84 @@ cannot be changed once the array has been created.</p>
 <p><em>See also:</em> <seealso marker="#resize-2">resize/2</seealso>, <seealso marker="#sparse_size-1">sparse_size/1</seealso>.</p>
 </desc></func>
 <func>
-<name>resize(Size::integer(), Array::array()) -&gt; array()</name>
+<name name="resize" arity="2"/>
 <fsummary>Change the size of the array.</fsummary>
 
 <desc><marker id="resize-2"/>
 
-<p>Change the size of the array. If <c>Size</c> is not a nonnegative
+<p>Change the size of the array. If <c><anno>Size</anno></c> is not a nonnegative
   integer, the call fails with reason <c>badarg</c>. If the given array has
   fixed size, the resulting array will also have fixed size.</p>
 </desc></func>
 <func>
-<name>set(I::integer(), Value::term(), Array::array()) -&gt; array()</name>
+<name name="set" arity="3"/>
 <fsummary>Set entry I of the array to Value.</fsummary>
 
 <desc><marker id="set-3"/>
 
-<p>Set entry <c>I</c> of the array to <c>Value</c>. If <c>I</c> is not a
-  nonnegative integer, or if the array has fixed size and <c>I</c> is larger
+<p>Set entry <c><anno>I</anno></c> of the array to <c><anno>Value</anno></c>. If <c><anno>I</anno></c> is not a
+  nonnegative integer, or if the array has fixed size and <c><anno>I</anno></c> is larger
   than the maximum index, the call fails with reason <c>badarg</c>.</p>
  
-  <p>If the array does not have fixed size, and <c>I</c> is greater than
-  <c>size(Array)-1</c>, the array will grow to size <c>I+1</c>.
+  <p>If the array does not have fixed size, and <c><anno>I</anno></c> is greater than
+  <c>size(<anno>Array</anno>)-1</c>, the array will grow to size <c><anno>I</anno>+1</c>.
  </p>
 <p><em>See also:</em> <seealso marker="#get-2">get/2</seealso>, <seealso marker="#reset-2">reset/2</seealso>.</p>
 </desc></func>
 <func>
-<name>size(Array::array()) -&gt; integer()</name>
+<name name="size" arity="1"/>
 <fsummary>Get the number of entries in the array.</fsummary>
 
 <desc><marker id="size-1"/>
 
 <p>Get the number of entries in the array. Entries are numbered
-  from 0 to <c>size(Array)-1</c>; hence, this is also the index of the first
+  from 0 to <c>size(<anno>Array</anno>)-1</c>; hence, this is also the index of the first
   entry that is guaranteed to not have been previously set.</p>
 <p><em>See also:</em> <seealso marker="#set-3">set/3</seealso>, <seealso marker="#sparse_size-1">sparse_size/1</seealso>.</p>
 </desc></func>
 <func>
-<name>sparse_foldl(Function, InitialAcc::term(), Array::array()) -&gt; term()</name>
+<name name="sparse_foldl" arity="3"/>
 <fsummary>Fold the elements of the array using the given function and
   initial accumulator value, skipping default-valued entries.</fsummary>
-<type>
-<v>Function = (Index::integer(), Value::term(), Acc::term()) -&gt; term()</v></type>
 <desc><marker id="sparse_foldl-3"/>
 
 <p>Fold the elements of the array using the given function and
   initial accumulator value, skipping default-valued entries. The
   elements are visited in order from the lowest index to the highest.
-  If <c>Function</c> is not a function, the call fails with reason <c>badarg</c>.
+  If <c><anno>Function</anno></c> is not a function, the call fails with reason <c>badarg</c>.
  </p>
 <p><em>See also:</em> <seealso marker="#foldl-3">foldl/3</seealso>, <seealso marker="#sparse_foldr-3">sparse_foldr/3</seealso>.</p>
 </desc></func>
 <func>
-<name>sparse_foldr(Function, InitialAcc::term(), Array::array()) -&gt; term()</name>
+<name name="sparse_foldr" arity="3"/>
 <fsummary>Fold the elements of the array right-to-left using the given
   function and initial accumulator value, skipping default-valued
   entries.</fsummary>
-<type>
-<v>Function = (Index::integer(), Value::term(), Acc::term()) -&gt; term()</v></type>
 <desc><marker id="sparse_foldr-3"/>
 
 <p>Fold the elements of the array right-to-left using the given
   function and initial accumulator value, skipping default-valued
   entries. The elements are visited in order from the highest index to
-  the lowest. If <c>Function</c> is not a function, the call fails with
+  the lowest. If <c><anno>Function</anno></c> is not a function, the call fails with
   reason <c>badarg</c>.
  </p>
 <p><em>See also:</em> <seealso marker="#foldr-3">foldr/3</seealso>, <seealso marker="#sparse_foldl-3">sparse_foldl/3</seealso>.</p>
 </desc></func>
 <func>
-<name>sparse_map(Function, Array::array()) -&gt; array()</name>
+<name name="sparse_map" arity="2"/>
 <fsummary>Map the given function onto each element of the array, skipping
   default-valued entries.</fsummary>
-<type>
-<v>Function = (Index::integer(), Value::term()) -&gt; term()</v></type>
 <desc><marker id="sparse_map-2"/>
 
 <p>Map the given function onto each element of the array, skipping
   default-valued entries. The elements are visited in order from the
-  lowest index to the highest. If <c>Function</c> is not a function, the
+  lowest index to the highest. If <c><anno>Function</anno></c> is not a function, the
   call fails with reason <c>badarg</c>.
  </p>
 <p><em>See also:</em> <seealso marker="#map-2">map/2</seealso>.</p>
 </desc></func>
 <func>
-<name>sparse_size(A::array()) -&gt; integer()</name>
+<name name="sparse_size" arity="1"/>
 <fsummary>Get the number of entries in the array up until the last
   non-default valued entry.</fsummary>
 
@@ -436,7 +439,7 @@ cannot be changed once the array has been created.</p>
 <p><em>See also:</em> <seealso marker="#resize-1">resize/1</seealso>, <seealso marker="#size-1">size/1</seealso>.</p>
 </desc></func>
 <func>
-<name>sparse_to_list(Array::array()) -&gt; list()</name>
+<name name="sparse_to_list" arity="1"/>
 <fsummary>Converts the array to a list, skipping default-valued entries.</fsummary>
 
 <desc><marker id="sparse_to_list-1"/>
@@ -446,7 +449,7 @@ cannot be changed once the array has been created.</p>
 <p><em>See also:</em> <seealso marker="#to_list-1">to_list/1</seealso>.</p>
 </desc></func>
 <func>
-<name>sparse_to_orddict(Array::array()) -&gt; [{Index::integer(), Value::term()}]</name>
+<name name="sparse_to_orddict" arity="1"/>
 <fsummary>Convert the array to an ordered list of pairs {Index, Value},
   skipping default-valued entries.</fsummary>
 
@@ -458,7 +461,7 @@ cannot be changed once the array has been created.</p>
 <p><em>See also:</em> <seealso marker="#to_orddict-1">to_orddict/1</seealso>.</p>
 </desc></func>
 <func>
-<name>to_list(Array::array()) -&gt; list()</name>
+<name name="to_list" arity="1"/>
 <fsummary>Converts the array to a list.</fsummary>
 
 <desc><marker id="to_list-1"/>
@@ -468,7 +471,7 @@ cannot be changed once the array has been created.</p>
 <p><em>See also:</em> <seealso marker="#from_list-2">from_list/2</seealso>, <seealso marker="#sparse_to_list-1">sparse_to_list/1</seealso>.</p>
 </desc></func>
 <func>
-<name>to_orddict(Array::array()) -&gt; [{Index::integer(), Value::term()}]</name>
+<name name="to_orddict" arity="1"/>
 <fsummary>Convert the array to an ordered list of pairs {Index, Value}.</fsummary>
 
 <desc><marker id="to_orddict-1"/>
diff --git a/lib/stdlib/doc/src/base64.xml b/lib/stdlib/doc/src/base64.xml
index d3fd7a843b..bfe8494a73 100644
--- a/lib/stdlib/doc/src/base64.xml
+++ b/lib/stdlib/doc/src/base64.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2009</year>
+      <year>2007</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,32 +33,33 @@
   <description>
     <p>Implements base 64 encode and decode, see RFC2045. </p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="ascii_string"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>encode(Data) -> Base64 </name>
-      <name>encode_to_string(Data) -> Base64String</name>
+      <name name="encode" arity="1"/>
+      <name name="encode_to_string" arity="1"/>
       <fsummary>Encodes data into base64. </fsummary>
-      <type>
-        <v>Data = string() | binary()</v>
-        <v>Base64 = binary()</v>
-        <v>Base64String = string()</v>
-      </type>
+      <type variable="Data"/>
+      <type variable="Base64" name_i="1"/>
+      <type variable="Base64String"/>
       <desc>
         <p>Encodes a plain ASCII string into base64. The result will
           be 33% larger than the data.</p>
       </desc>
     </func>
     <func>
-      <name>decode(Base64) -> Data</name>
-      <name>decode_to_string(Base64) -> DataString</name>
-      <name>mime_decode(Base64) -> Data</name>
-      <name>mime_decode_to_string(Base64) -> DataString</name>
+      <name name="decode" arity="1"/>
+      <name name="decode_to_string" arity="1"/>
+      <name name="mime_decode" arity="1"/>
+      <name name="mime_decode_to_string" arity="1"/>
       <fsummary>Decodes a base64 encoded string to data. </fsummary>
-      <type>
-        <v>Base64 = string() | binary()</v>
-        <v>Data = binary()</v>
-        <v>DataString = string()</v>
-      </type>
+      <type variable="Base64" name_i="1"/>
+      <type variable="Data" name_i="1"/>
+      <type variable="DataString" name_i="2"/>
       <desc>
         <p>Decodes a base64 encoded string to plain ASCII. See RFC4648.
           <c>mime_decode/1</c> and <c>mime_decode_to_string/1</c>
diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml
index adc411e272..013e94c393 100644
--- a/lib/stdlib/doc/src/beam_lib.xml
+++ b/lib/stdlib/doc/src/beam_lib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -154,70 +154,78 @@
     </section>
   </section>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-beam() -> Module | Filename | binary()
-  Module = atom()
-  Filename = string() | atom()</code>
-    <p>Each of the functions described below accept either the module
-      name, the filename, or a binary containing the beam module.</p>
-    <code type="none">
-chunkdata() = {ChunkId, DataB} | {ChunkName, DataT}
-  ChunkId = chunkid()
-  DataB = binary()
-  {ChunkName, DataT} =
-        {abstract_code, AbstractCode}
-      | {attributes, [{Attribute, [AttributeValue]}]}
-      | {compile_info, [{InfoKey, [InfoValue]}]}
-      | {exports, [{Function, Arity}]}
-      | {labeled_exports, [{Function, Arity, Label}]}
-      | {imports, [{Module, Function, Arity}]}
-      | {indexed_imports, [{Index, Module, Function, Arity}]}
-      | {locals, [{Function, Arity}]}]}
-      | {labeled_locals, [{Function, Arity, Label}]}]}
-      | {atoms, [{integer(), atom()}]}
-  AbstractCode = {AbstVersion, Forms} | no_abstract_code
-    AbstVersion = atom()
-  Attribute = atom()
-  AttributeValue = term()
-  Module = Function = atom()
-  Arity = int()
-  Label = int()</code>
-    <p>It is not checked that the forms conform to the abstract format
-      indicated by <c>AbstVersion</c>. <c>no_abstract_code</c> means
-      that the <c>"Abst"</c> chunk is present, but empty.</p>
-    <p>The list of attributes is sorted on <c>Attribute</c>, and each
-      attribute name occurs once in the list. The attribute values
-      occur in the same order as in the file. The lists of functions
-      are also sorted.</p>
-    <code type="none">
-chunkid() = "Abst" | "Attr" | "CInf"
-            | "ExpT" | "ImpT" | "LocT"
-            | "Atom"
+  <datatypes>
+    <datatype>
+      <name name="beam"/>
+      <desc>
+        <p>Each of the functions described below accept either the
+          module name, the filename, or a binary containing the beam
+          module.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="chunkdata"/>
+      <desc>
+        <p>The list of attributes is sorted on <c>Attribute</c>
+          (in attrib_entry()), and each
+          attribute name occurs once in the list. The attribute values
+          occur in the same order as in the file. The lists of functions
+          are also sorted.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="chunkid"/>
+      <desc>
+        <p>"Abst" | "Attr" | "CInf" | "ExpT" | "ImpT" | "LocT" | "Atom"</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="dataB"/>
+    </datatype>
+    <datatype>
+      <name name="abst_code"/>
+      <desc>
+        <p>It is not checked that the forms conform to the abstract format
+          indicated by <c><anno>AbstVersion</anno></c>. <c>no_abstract_code</c> means
+          that the <c>"Abst"</c> chunk is present, but empty.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="forms"/>
+    </datatype>
+    <datatype>
+      <name name="compinfo_entry"/>
+    </datatype>
+    <datatype>
+      <name name="attrib_entry"/>
+    </datatype>
+    <datatype>
+      <name name="labeled_entry"/>
+    </datatype>
+    <datatype>
+      <name name="index"/>
+    </datatype>
+    <datatype>
+      <name name="label"/>
+    </datatype>
+    <datatype>
+      <name name="chunkref"/>
+    </datatype>
+    <datatype>
+      <name name="chunkname"/>
+    </datatype>
+    <datatype>
+      <name name="chnk_rsn"/>
+    </datatype>
+    <datatype>
+      <name name="info_rsn"/>
+    </datatype>
+  </datatypes>
 
-chunkname() = abstract_code | attributes | compile_info
-            | exports | labeled_exports
-            | imports | indexed_imports
-            | locals | labeled_locals
-            | atoms
-      
-chunkref() = chunkname() | chunkid()</code>
-  </section>
   <funcs>
     <func>
-      <name>chunks(Beam, [ChunkRef]) ->  {ok, {Module, [ChunkData]}} | {error, beam_lib, Reason}</name>
+      <name name="chunks" arity="2"/>
       <fsummary>Read selected chunks from a BEAM file or binary</fsummary>
-      <type>
-        <v>Beam = beam()</v>
-        <v>ChunkRef = chunkref()</v>
-        <v>Module = atom()</v>
-        <v>ChunkData = chunkdata()</v>
-        <v>Reason = {unknown_chunk, Filename, atom()}</v>
-        <v>&nbsp;&nbsp;| {key_missing_or_invalid, Filename, abstract_code}</v>
-        <v>&nbsp;&nbsp;| Reason1 -- see info/1</v>
-        <v>&nbsp;Filename = string()</v>
-      </type>
       <desc>
         <p>Reads chunk data for selected chunks refs. The order of
           the returned list of chunk data is determined by the order
@@ -225,43 +233,26 @@ chunkref() = chunkname() | chunkid()</code>
       </desc>
     </func>
     <func>
-      <name>chunks(Beam, [ChunkRef], [Option]) ->  {ok, {Module, [ChunkResult]}} | {error, beam_lib, Reason}</name>
+      <name name="chunks" arity="3"/>
       <fsummary>Read selected chunks from a BEAM file or binary</fsummary>
-      <type>
-        <v>Beam = beam()</v>
-        <v>ChunkRef = chunkref()</v>
-        <v>Module = atom()</v>
-        <v>Option = allow_missing_chunks</v>
-        <v>ChunkResult = {chunkref(), ChunkContents} | {chunkref(), missing_chunk}</v>
-        <v>Reason = {missing_chunk, Filename, atom()}</v>
-        <v>&nbsp;&nbsp;| {key_missing_or_invalid, Filename, abstract_code}</v>
-        <v>&nbsp;&nbsp;| Reason1 -- see info/1</v>
-        <v>&nbsp;Filename = string()</v>
-      </type>
       <desc>
         <p>Reads chunk data for selected chunks refs. The order of
           the returned list of chunk data is determined by the order
           of the list of chunks references.</p>
-        <p>By default, if any requested chunk is missing in <c>Beam</c>,
+        <p>By default, if any requested chunk is missing in <c><anno>Beam</anno></c>,
           an <c>error</c> tuple is returned.
           However, if the option <c>allow_missing_chunks</c> has been given,
           a result will be returned even if chunks are missing.
           In the result list, any missing chunks will be represented as
-          <c>{ChunkRef,missing_chunk}</c>.
+          <c>{<anno>ChunkRef</anno>,missing_chunk}</c>.
           Note, however, that if the <c>"Atom"</c> chunk if missing, that is
           considered a fatal error and the return value will be an <c>error</c>
           tuple.</p>
       </desc>
     </func>
     <func>
-      <name>version(Beam) -> {ok, {Module, [Version]}} | {error, beam_lib, Reason}</name>
+      <name name="version" arity="1"/>
       <fsummary>Read the BEAM file's module version</fsummary>
-      <type>
-        <v>Beam = beam()</v>
-        <v>Module = atom()</v>
-        <v>Version = term()</v>
-        <v>Reason -- see chunks/2</v>
-      </type>
       <desc>
         <p>Returns the module version(s). A version is defined by
           the module attribute <c>-vsn(Vsn)</c>. If this attribute is
@@ -282,51 +273,30 @@ chunkref() = chunkname() | chunkid()</code>
       </desc>
     </func>
     <func>
-      <name>md5(Beam) -> {ok, {Module, MD5}} | {error, beam_lib, Reason}</name>
+      <name name="md5" arity="1"/>
       <fsummary>Read the BEAM file's module version</fsummary>
-      <type>
-        <v>Beam = beam()</v>
-        <v>Module = atom()</v>
-        <v>MD5 = binary()</v>
-        <v>Reason -- see chunks/2</v>
-      </type>
       <desc>
         <p>Calculates an MD5 redundancy check for the code of the module
           (compilation date and other attributes are not included).</p>
       </desc>
     </func>
     <func>
-      <name>info(Beam) -> [{Item, Info}] | {error, beam_lib, Reason1}</name>
+      <name name="info" arity="1"/>
       <fsummary>Information about a BEAM file</fsummary>
-      <type>
-        <v>Beam = beam()</v>
-        <v>Item, Info -- see below</v>
-        <v>Reason1 = {chunk_too_big, Filename, ChunkId, ChunkSize, FileSize}</v>
-        <v>&nbsp;&nbsp;| {invalid_beam_file, Filename, Pos}</v>
-        <v>&nbsp;&nbsp;| {invalid_chunk, Filename, ChunkId}</v>
-        <v>&nbsp;&nbsp;| {missing_chunk, Filename, ChunkId}</v>
-        <v>&nbsp;&nbsp;| {not_a_beam_file, Filename}</v>
-        <v>&nbsp;&nbsp;| {file_error, Filename, Posix}</v>
-        <v>&nbsp;Filename = string()</v>
-        <v>&nbsp;ChunkId = chunkid()</v>
-        <v>&nbsp;ChunkSize = FileSize = int()</v>
-        <v>&nbsp;Pos = int()</v>
-        <v>&nbsp;Posix = posix() -- see file(3)</v>
-      </type>
       <desc>
         <p>Returns a list containing some information about a BEAM file
           as tuples <c>{Item, Info}</c>:</p>
         <taglist>
-          <tag><c>{file, Filename} | {binary, Binary}</c></tag>
+          <tag><c>{file, <anno>Filename</anno>} | {binary, <anno>Binary</anno>}</c></tag>
           <item>
             <p>The name (string) of the BEAM file, or the binary from
               which the information was extracted.</p>
           </item>
-          <tag><c>{module, Module}</c></tag>
+          <tag><c>{module, <anno>Module</anno>}</c></tag>
           <item>
             <p>The name (atom) of the module.</p>
           </item>
-          <tag><c>{chunks, [{ChunkId, Pos, Size}]}</c></tag>
+          <tag><c>{chunks, [{<anno>ChunkId</anno>, <anno>Pos</anno>, <anno>Size</anno>}]}</c></tag>
           <item>
             <p>For each chunk, the identifier (string) and the position
               and size of the chunk data, in bytes.</p>
@@ -335,17 +305,9 @@ chunkref() = chunkname() | chunkid()</code>
       </desc>
     </func>
     <func>
-      <name>cmp(Beam1, Beam2) -> ok | {error, beam_lib, Reason}</name>
+      <name name="cmp" arity="2"/>
       <fsummary>Compare two BEAM files</fsummary>
-      <type>
-        <v>Beam1 = Beam2 = beam()</v>
-        <v>Reason = {modules_different, Module1, Module2}</v>
-        <v>&nbsp;&nbsp;| {chunks_different, ChunkId}</v>
-        <v>&nbsp;&nbsp;| different_chunks</v>
-        <v>&nbsp;&nbsp;| Reason1 -- see info/1</v>
-        <v>&nbsp;Module1 = Module2 = atom()</v>
-        <v>&nbsp;ChunkId = chunkid()</v>
-      </type>
+      <type name="cmp_rsn"/>
       <desc>
         <p>Compares the contents of two BEAM files. If the module names
           are the same, and all chunks except for the <c>"CInf"</c> chunk
@@ -356,34 +318,23 @@ chunkref() = chunkname() | chunkid()</code>
       </desc>
     </func>
     <func>
-      <name>cmp_dirs(Dir1, Dir2) ->  {Only1, Only2, Different} | {error, beam_lib, Reason1}</name>
+      <name name="cmp_dirs" arity="2"/>
       <fsummary>Compare the BEAM files in two directories</fsummary>
-      <type>
-        <v>Dir1 = Dir2 = string() | atom()</v>
-        <v>Different = [{Filename1, Filename2}]</v>
-        <v>Only1 = Only2 = [Filename]</v>
-        <v>Filename = Filename1 = Filename2 = string()</v>
-        <v>Reason1 = {not_a_directory, term()} | -- see info/1</v>
-      </type>
       <desc>
         <p>The <c>cmp_dirs/2</c> function compares the BEAM files in
           two directories. Only files with extension <c>".beam"</c> are
-          compared. BEAM files that exist in directory <c>Dir1</c>
-          (<c>Dir2</c>) only are returned in <c>Only1</c>
-          (<c>Only2</c>). BEAM files that exist on both directories but
+          compared. BEAM files that exist in directory <c><anno>Dir1</anno></c>
+          (<c><anno>Dir2</anno></c>) only are returned in <c><anno>Only1</anno></c>
+          (<c><anno>Only2</anno></c>). BEAM files that exist on both directories but
           are considered different by <c>cmp/2</c> are returned as
-          pairs {<c>Filename1</c>, <c>Filename2</c>} where
-          <c>Filename1</c> (<c>Filename2</c>) exists in directory
-          <c>Dir1</c> (<c>Dir2</c>).</p>
+          pairs {<c><anno>Filename1</anno></c>, <c><anno>Filename2</anno></c>} where
+          <c><anno>Filename1</anno></c> (<c><anno>Filename2</anno></c>) exists in directory
+          <c><anno>Dir1</anno></c> (<c><anno>Dir2</anno></c>).</p>
       </desc>
     </func>
     <func>
-      <name>diff_dirs(Dir1, Dir2) -> ok | {error, beam_lib, Reason1}</name>
+      <name name="diff_dirs" arity="2"/>
       <fsummary>Compare the BEAM files in two directories</fsummary>
-      <type>
-        <v>Dir1 = Dir2 = string() | atom()</v>
-        <v>Reason1 = {not_a_directory, term()} | -- see info/1</v>
-      </type>
       <desc>
         <p>The <c>diff_dirs/2</c> function compares the BEAM files in
           two directories the way <c>cmp_dirs/2</c> does, but names of
@@ -392,13 +343,8 @@ chunkref() = chunkname() | chunkid()</code>
       </desc>
     </func>
     <func>
-      <name>strip(Beam1) -> {ok, {Module, Beam2}} | {error, beam_lib, Reason1}</name>
+      <name name="strip" arity="1"/>
       <fsummary>Removes chunks not needed by the loader from a BEAM file</fsummary>
-      <type>
-        <v>Beam1 = Beam2 = beam()</v>
-        <v>Module = atom()</v>
-        <v>Reason1 -- see info/1</v>
-      </type>
       <desc>
         <p>The <c>strip/1</c> function removes all chunks from a BEAM
           file except those needed by the loader. In particular,
@@ -406,15 +352,8 @@ chunkref() = chunkname() | chunkid()</code>
       </desc>
     </func>
     <func>
-      <name>strip_files(Files) ->  {ok, [{Module, Beam2}]} | {error, beam_lib, Reason1}</name>
+      <name name="strip_files" arity="1"/>
       <fsummary>Removes chunks not needed by the loader from BEAM files</fsummary>
-      <type>
-        <v>Files = [Beam1]</v>
-        <v>&nbsp;Beam1 = beam()</v>
-        <v>Module = atom()</v>
-        <v>Beam2 = beam()</v>
-        <v>Reason1 -- see info/1</v>
-      </type>
       <desc>
         <p>The <c>strip_files/1</c> function removes all chunks except
           those needed by the loader from BEAM files. In particular,
@@ -424,30 +363,20 @@ chunkref() = chunkname() | chunkid()</code>
       </desc>
     </func>
     <func>
-      <name>strip_release(Dir) ->  {ok, [{Module, Filename]}} | {error, beam_lib, Reason1}</name>
+      <name name="strip_release" arity="1"/>
       <fsummary>Removes chunks not needed by the loader from all BEAM files of a release</fsummary>
-      <type>
-        <v>Dir = string() | atom()</v>
-        <v>Module = atom()</v>
-        <v>Filename = string()</v>
-        <v>Reason1 = {not_a_directory, term()} | -- see info/1</v>
-      </type>
       <desc>
         <p>The <c>strip_release/1</c> function removes all chunks
           except those needed by the loader from the BEAM files of a
-          release. <c>Dir</c> should be the installation root
+          release. <c><anno>Dir</anno></c> should be the installation root
           directory. For example, the current OTP release can be
           stripped with the call
           <c>beam_lib:strip_release(code:root_dir())</c>.</p>
       </desc>
     </func>
     <func>
-      <name>format_error(Reason) -> Chars</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Return an English description of a BEAM read error reply</fsummary>
-      <type>
-        <v>Reason -- see other functions</v>
-        <v>Chars = [char() | Chars]</v>
-      </type>
       <desc>
         <p>Given the error returned by any function in this module, 
           the function <c>format_error</c> returns a descriptive string
@@ -456,12 +385,11 @@ chunkref() = chunkname() | chunkid()</code>
       </desc>
     </func>
     <func>
-      <name>crypto_key_fun(CryptoKeyFun) -> ok | {error, Reason}</name>
+      <name name="crypto_key_fun" arity="1"/>
       <fsummary>Register a fun that provides a crypto key</fsummary>
-      <type>
-        <v>CryptoKeyFun = fun() -- see below</v>
-        <v>Reason = badfun | exists | term()</v>
-      </type>
+      <type name="crypto_fun"/>
+      <type name="crypto_fun_arg"/>
+      <type name="mode"/>
       <desc>
         <p>The <c>crypto_key_fun/1</c> function registers a unary fun
           that will be called if <c>beam_lib</c> needs to read an
@@ -495,11 +423,8 @@ chunkref() = chunkname() | chunkid()</code>
       </desc>
     </func>
     <func>
-      <name>clear_crypto_key_fun() -> {ok, Result}</name>
+      <name name="clear_crypto_key_fun" arity="0"/>
       <fsummary>Unregister the current crypto key fun</fsummary>
-      <type>
-        <v>Result = undefined | term()</v>
-      </type>
       <desc>
         <p>Unregisters the crypto key fun and terminates the process
           holding it, started by <c>crypto_key_fun/1</c>.</p>
diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml
index c81023862e..88ce77e0d0 100644
--- a/lib/stdlib/doc/src/binary.xml
+++ b/lib/stdlib/doc/src/binary.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2009</year>
-      <year>2010</year>
+      <year>2011</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -53,37 +53,35 @@
       module.
       </p>
     </note>
-
-
   </description>
-  <section>
-      <title>DATA TYPES</title>
-      <code type="none">
-    cp()
-     - Opaque data-type representing a compiled search-pattern. Guaranteed to be a tuple()
-       to allow programs to distinguish it from non precompiled search patterns.
-      </code>
-      <code type="none">
-    part() = {Start,Length}
-    Start = int()
-    Length = int()
-      - A representaion of a part (or range) in a binary. Start is a
+  <datatypes>
+    <datatype>
+      <name name="cp"/>
+      <desc><p>Opaque data-type representing a compiled
+        search-pattern. Guaranteed to be a tuple() to allow programs to
+        distinguish it from non precompiled search patterns.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="part"/>
+      <desc><p>A representaion of a part (or range) in a binary. Start is a
         zero-based offset into a binary() and Length is the length of
         that part. As input to functions in this module, a reverse
         part specification is allowed, constructed with a negative
         Length, so that the part of the binary begins at Start +
         Length and is -Length long. This is useful for referencing the
         last N bytes of a binary as {size(Binary), -N}. The functions
-        in this module always return part()'s with positive Length.
-      </code>
-  </section>
+        in this module always return part()'s with positive Length.</p>
+      </desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>at(Subject, Pos) -> int()</name>
+      <name>at(Subject, Pos) -> byte()</name>
       <fsummary>Returns the byte at a specific position in a binary</fsummary>
       <type>
         <v>Subject = binary()</v>
-        <v>Pos = int() >= 0</v>
+        <v>Pos = integer() >= 0</v>
       </type>
       <desc>
 
@@ -95,7 +93,7 @@
       </desc>
     </func>
     <func>
-      <name>bin_to_list(Subject) -> list()</name>
+      <name>bin_to_list(Subject) -> [byte()]</name>
       <fsummary>Convert a binary to a list of integers</fsummary>
       <type>
         <v>Subject = binary()</v>
@@ -105,7 +103,7 @@
       </desc>
     </func>
     <func>
-      <name>bin_to_list(Subject, PosLen) -> list()</name>
+      <name>bin_to_list(Subject, PosLen) -> [byte()]</name>
       <fsummary>Convert a binary to a list of integers</fsummary>
       <type>
         <v>Subject = binary()</v>
@@ -113,7 +111,7 @@
       </type>
       <desc>
 
-      <p>Converts <c>Subject</c> to a list of <c>int()</c>s, each representing
+      <p>Converts <c>Subject</c> to a list of <c>byte()</c>s, each representing
       the value of one byte. The <c>part()</c> denotes which part of the
       <c>binary()</c> to convert. Example:</p>
 
@@ -126,12 +124,12 @@
       </desc>
     </func>
     <func>
-      <name>bin_to_list(Subject, Pos, Len) -> list()</name>
+      <name>bin_to_list(Subject, Pos, Len) -> [byte()]</name>
       <fsummary>Convert a binary to a list of integers</fsummary>
       <type>
         <v>Subject = binary()</v>
-        <v>Pos = int()</v>
-        <v>Len = int()</v>
+        <v>Pos = integer() >= 0</v>
+        <v>Len = integer() >= 0</v>
       </type>
       <desc>
       <p>The same as<c> bin_to_list(Subject,{Pos,Len})</c>.</p>
@@ -185,7 +183,7 @@
       <fsummary>Duplicates a binary N times and creates a new</fsummary>
       <type>
         <v>Subject = binary()</v>
-        <v>N = int() >= 0</v>
+        <v>N = integer() >= 0</v>
       </type>
       <desc>
       <p>Creates a binary with the content of <c>Subject</c> duplicated <c>N</c> times.</p>
@@ -211,7 +209,7 @@
       <fsummary>Decode a whole binary into an integer of arbitrary size</fsummary>
       <type>
         <v>Subject = binary()</v>
-        <v>Unsigned = int() >= 0</v>
+        <v>Unsigned = integer() >= 0</v>
       </type>
       <desc>
       <p>The same as <c>decode_unsigned(Subject,big)</c>.</p>
@@ -223,12 +221,12 @@
       <type>
         <v>Subject = binary()</v>
         <v>Endianess = big | little</v>
-        <v>Unsigned = int() >= 0</v>
+        <v>Unsigned = integer() >= 0</v>
       </type>
       <desc>
 
       <p>Converts the binary digit representation, in big or little
-      endian, of a positive integer in <c>Subject</c> to an Erlang <c>int()</c>.</p>
+      endian, of a positive integer in <c>Subject</c> to an Erlang <c>integer()</c>.</p>
 
       <p>Example:</p>
 
@@ -242,7 +240,7 @@
       <name>encode_unsigned(Unsigned) -> binary()</name>
       <fsummary>Encodes an unsigned integer into the minimal binary</fsummary>
       <type>
-        <v>Unsigned = int() >= 0</v>
+        <v>Unsigned = integer() >= 0</v>
       </type>
       <desc>
       <p>The same as <c>encode_unsigned(Unsigned,big)</c>.</p>
@@ -252,7 +250,7 @@
       <name>encode_unsigned(Unsigned,Endianess) -> binary()</name>
       <fsummary>Encodes an unsigned integer into the minimal binary</fsummary>
       <type>
-        <v>Unsigned = int() >= 0</v>
+        <v>Unsigned = integer() >= 0</v>
         <v>Endianess = big | little</v>
       </type>
       <desc>
@@ -270,7 +268,7 @@
       </desc>
     </func>
     <func>
-      <name>first(Subject) -> int()</name>
+      <name>first(Subject) -> byte()</name>
       <fsummary>Returns the first byte of a binary</fsummary>
       <type>
         <v>Subject = binary()</v>
@@ -283,7 +281,7 @@
       </desc>
     </func>
     <func>
-      <name>last(Subject) -> int()</name>
+      <name>last(Subject) -> byte()</name>
       <fsummary>Returns the last byte of a binary</fsummary>
       <type>
         <v>Subject = binary()</v>
@@ -306,7 +304,7 @@
       </desc>
     </func>
     <func>
-      <name>longest_common_prefix(Binaries) -> int()</name>
+      <name>longest_common_prefix(Binaries) -> integer() >= 0</name>
       <fsummary>Returns length of longest common prefix for a set of binaries</fsummary>
       <type>
         <v>Binaries = [ binary() ]</v>
@@ -327,7 +325,7 @@
       </desc>
     </func>
     <func>
-      <name>longest_common_suffix(Binaries) -> int()</name>
+      <name>longest_common_suffix(Binaries) -> integer() >= 0</name>
       <fsummary>Returns length of longest common suffix for a set of binaries</fsummary>
       <type>
         <v>Binaries = [ binary() ]</v>
@@ -450,7 +448,7 @@
 [{1,4}]
 </code>
 
-       <p>The result shows that &lt;&lt;bcde"&gt;&gt; is selected instead of the
+       <p>The result shows that &lt;&lt;"bcde"&gt;&gt; is selected instead of the
        shorter match &lt;&lt;"bc"&gt;&gt; (which would have given raise to one
        more match,&lt;&lt;"de"&gt;&gt;). This corresponds to the behavior of posix
        regular expressions (and programs like awk), but is not
@@ -506,15 +504,15 @@
       <fsummary>Extracts a part of a binary</fsummary>
       <type>
         <v>Subject = binary()</v>
-        <v>Pos = int()</v>
-        <v>Len = int()</v>
+        <v>Pos = integer() >= 0</v>
+        <v>Len = integer() >= 0</v>
       </type>
       <desc>
       <p>The same as <c>part(Subject, {Pos, Len})</c>.</p>
       </desc>
     </func>
     <func>
-      <name>referenced_byte_size(binary()) -> int()</name>
+      <name>referenced_byte_size(binary()) -> integer() >= 0</name>
       <fsummary>Determines the size of the actual binary pointed out by a sub-binary</fsummary>
       <desc>
 
@@ -581,42 +579,28 @@ store(Binary, GBSet) ->
       </desc>
     </func>
     <func>
-      <name>replace(Subject,Pattern,Replacement) -> Result</name>
+      <name name="replace" arity="3"/>
       <fsummary>Replaces bytes in a binary according to a pattern</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>Pattern = binary() | [ binary() ] | cp()</v>
-        <v>Replacement = binary()</v>
-        <v>Result = binary()</v>
-      </type>
       <desc>
-      <p>The same as <c>replace(Subject,Pattern,Replacement,[])</c>.</p>
+      <p>The same as <c>replace(<anno>Subject</anno>,<anno>Pattern</anno>,<anno>Replacement</anno>,[])</c>.</p>
       </desc>
     </func>
     <func>
-      <name>replace(Subject,Pattern,Replacement,Options) -> Result</name>
+      <name name="replace" arity="4"/>
       <fsummary>Replaces bytes in a binary according to a pattern</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>Pattern = binary() | [ binary() ] | cp()</v>
-        <v>Replacement = binary()</v>
-        <v>Result = binary()</v>
-        <v>Options = [ Option ]</v>
-        <v>Option = global | {scope, part()} | {insert_replaced, InsPos}</v>
-        <v>InsPos = OnePos | [ OnePos ]</v>
-        <v>OnePos = int() =&lt; byte_size(Replacement)</v>
-      </type>
+      <type_desc variable="OnePos">An integer() =&lt; byte_size(<anno>Replacement</anno>)
+      </type_desc>
       <desc>
 
       <p>Constructs a new binary by replacing the parts in
-      <c>Subject</c> matching <c>Pattern</c> with the content of
-      <c>Replacement</c>.</p>
+      <c><anno>Subject</anno></c> matching <c><anno>Pattern</anno></c> with the content of
+      <c><anno>Replacement</anno></c>.</p>
 
-      <p>If the matching sub-part of <c>Subject</c> giving raise to the
+      <p>If the matching sub-part of <c><anno>Subject</anno></c> giving raise to the
       replacement is to be inserted in the result, the option
-      <c>{insert_replaced, InsPos}</c> will insert the matching part into
-      <c>Replacement</c> at the given position (or positions) before actually
-      inserting <c>Replacement</c> into the <c>Subject</c>. Example:</p>
+      <c>{insert_replaced, <anno>InsPos</anno>}</c> will insert the matching part into
+      <c><anno>Replacement</anno></c> at the given position (or positions) before actually
+      inserting <c><anno>Replacement</anno></c> into the <c><anno>Subject</anno></c>. Example:</p>
 
 <code>
 1> binary:replace(&lt;&lt;"abcde"&gt;&gt;,&lt;&lt;"b"&gt;&gt;,&lt;&lt;"[]"&gt;&gt;,[{insert_replaced,1}]).
@@ -632,42 +616,30 @@ store(Binary, GBSet) ->
 &lt;&lt;"a[b-b]c[d-d]e"&gt;&gt;
 </code>
 
-        <p>If any position given in <c>InsPos</c> is greater than the size of the replacement binary, a <c>badarg</c> exception is raised.</p>
+        <p>If any position given in <c><anno>InsPos</anno></c> is greater than the size of the replacement binary, a <c>badarg</c> exception is raised.</p>
 
 	<p>The options <c>global</c> and <c>{scope, part()}</c> work as for <seealso marker="#split-3">split/3</seealso>. The return type is always a <c>binary()</c>.</p>
 
-	<p>For a description of <c>Pattern</c>, see <seealso marker="#compile_pattern-1">compile_pattern/1</seealso>.</p>
+	<p>For a description of <c><anno>Pattern</anno></c>, see <seealso marker="#compile_pattern-1">compile_pattern/1</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>split(Subject,Pattern) -> Parts</name>
+      <name name="split" arity="2"/>
       <fsummary>Splits a binary according to a pattern</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>Pattern = binary() | [ binary() ] | cp()</v>
-        <v>Parts = [ binary() ]</v>
-      </type>
       <desc>
-      <p>The same as <c>split(Subject, Pattern, [])</c>.</p>
+      <p>The same as <c>split(<anno>Subject</anno>, <anno>Pattern</anno>, [])</c>.</p>
       </desc>
     </func>
     <func>
-      <name>split(Subject,Pattern,Options) -> Parts</name>
+      <name name="split" arity="3"/>
       <fsummary>Splits a binary according to a pattern</fsummary>
-      <type>
-        <v>Subject = binary()</v>
-        <v>Pattern = binary() | [ binary() ] | cp()</v>
-        <v>Parts = [ binary() ]</v>
-        <v>Options = [ Option ]</v>
-        <v>Option = {scope, part()} | trim | global</v>
-      </type>
       <desc>
 
-      <p>Splits Binary into a list of binaries based on Pattern. If
+      <p>Splits <c><anno>Subject</anno></c> into a list of binaries based on <c><anno>Pattern</anno></c>. If
       the option global is not given, only the first occurrence of
-      Pattern in Subject will give rise to a split.</p>
+      <c><anno>Pattern</anno></c> in <c><anno>Subject</anno></c> will give rise to a split.</p>
 
-      <p>The parts of Pattern actually found in Subject are not included in the result.</p>
+      <p>The parts of <c><anno>Pattern</anno></c> actually found in <c><anno>Subject</anno></c> are not included in the result.</p>
 
       <p>Example:</p>
 
@@ -696,7 +668,7 @@ store(Binary, GBSet) ->
 
       <tag>global</tag>
 
-      <item><p>Repeats the split until the <c>Subject</c> is
+      <item><p>Repeats the split until the <c><anno>Subject</anno></c> is
       exhausted. Conceptually the global option makes split work on
       the positions returned by <seealso marker="#matches-3">matches/3</seealso>,
       while it normally
@@ -716,12 +688,12 @@ store(Binary, GBSet) ->
 </code>
 
       <p>The return type is always a list of binaries that are all
-      referencing <c>Subject</c>. This means that the data in <c>Subject</c> is not
-      actually copied to new binaries and that <c>Subject</c> cannot be
+      referencing <c><anno>Subject</anno></c>. This means that the data in <c><anno>Subject</anno></c> is not
+      actually copied to new binaries and that <c><anno>Subject</anno></c> cannot be
       garbage collected until the results of the split are no longer
       referenced.</p>
 
-      <p>For a description of <c>Pattern</c>, see <seealso marker="#compile_pattern-1">compile_pattern/1</seealso>.</p>
+      <p>For a description of <c><anno>Pattern</anno></c>, see <seealso marker="#compile_pattern-1">compile_pattern/1</seealso>.</p>
 
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml
index 19e3ac1f08..ddae388a1b 100644
--- a/lib/stdlib/doc/src/c.xml
+++ b/lib/stdlib/doc/src/c.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -39,43 +39,33 @@
   </description>
   <funcs>
     <func>
-      <name>bt(Pid) -> void()</name>
+      <name name="bt" arity="1"/>
       <fsummary>Stack backtrace for a process</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-      </type>
       <desc>
         <p>Stack backtrace for a process. Equivalent to
-          <c>erlang:process_display(Pid, backtrace)</c>.</p>
+          <c>erlang:process_display(<anno>Pid</anno>, backtrace)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>c(File) -> {ok, Module} | error</name>
-      <name>c(File, Options) -> {ok, Module} | error</name>
+      <name name="c" arity="1"/>
+      <name name="c" arity="2"/>
       <fsummary>Compile and load code in a file</fsummary>
-      <type>
-        <v>File = name() -- see filename(3)</v>
-        <v>Options = [Opt] -- see compile:file/2</v>
-      </type>
       <desc>
         <p><c>c/1,2</c> compiles and then purges and loads the code for
-          a file. <c>Options</c> defaults to []. Compilation is
+          a file. <c><anno>Options</anno></c> defaults to []. Compilation is
           equivalent to:</p>
         <code type="none">
-compile:file(File, Options ++ [report_errors, report_warnings])</code>
+compile:file(<anno>File</anno>, <anno>Options</anno> ++ [report_errors, report_warnings])</code>
         <p>Note that purging the code means that any processes
           lingering in old code for the module are killed without
           warning. See <c>code/3</c> for more information.</p>
       </desc>
     </func>
     <func>
-      <name>cd(Dir) -> void()</name>
+      <name name="cd" arity="1"/>
       <fsummary>Change working directory</fsummary>
-      <type>
-        <v>Dir = name() -- see filename(3)</v>
-      </type>
       <desc>
-        <p>Changes working directory to <c>Dir</c>, which may be a
+        <p>Changes working directory to <c><anno>Dir</anno></c>, which may be a
           relative name, and then prints the name of the new working
           directory.</p>
         <pre>
@@ -84,14 +74,14 @@ compile:file(File, Options ++ [report_errors, report_warnings])</code>
       </desc>
     </func>
     <func>
-      <name>flush() -> void()</name>
+      <name name="flush" arity="0"/>
       <fsummary>Flush any messages sent to the shell</fsummary>
       <desc>
         <p>Flushes any messages sent to the shell.</p>
       </desc>
     </func>
     <func>
-      <name>help() -> void()</name>
+      <name name="help" arity="0"/>
       <fsummary>Help information</fsummary>
       <desc>
         <p>Displays help information: all valid shell internal commands,
@@ -99,8 +89,8 @@ compile:file(File, Options ++ [report_errors, report_warnings])</code>
       </desc>
     </func>
     <func>
-      <name>i() -> void()</name>
-      <name>ni() -> void()</name>
+      <name name="i" arity="0"/>
+      <name name="ni" arity="0"/>
       <fsummary>Information about the system</fsummary>
       <desc>
         <p><c>i/0</c> displays information about the system, listing
@@ -109,26 +99,20 @@ compile:file(File, Options ++ [report_errors, report_warnings])</code>
       </desc>
     </func>
     <func>
-      <name>i(X, Y, Z) -> void()</name>
+      <name name="i" arity="3"/>
       <fsummary>Information about pid &lt;X.Y.Z&gt;</fsummary>
-      <type>
-        <v>X = Y = Z = int()</v>
-      </type>
       <desc>
         <p>Displays information about a process, Equivalent to
-          <c>process_info(pid(X, Y, Z))</c>, but location transparent.</p>
+          <c>process_info(pid(<anno>X</anno>, <anno>Y</anno>, <anno>Z</anno>))</c>, but location transparent.</p>
       </desc>
     </func>
     <func>
-      <name>l(Module) -> void()</name>
+      <name name="l" arity="1"/>
       <fsummary>Load or reload module</fsummary>
-      <type>
-        <v>Module = atom()</v>
-      </type>
       <desc>
         <p>Purges and loads, or reloads, a module by calling
-          <c>code:purge(Module)</c> followed by
-          <c>code:load_file(Module)</c>.</p>
+          <c>code:purge(<anno>Module</anno>)</c> followed by
+          <c>code:load_file(<anno>Module</anno>)</c>.</p>
         <p>Note that purging the code means that any processes
           lingering in old code for the module are killed without
           warning. See <c>code/3</c> for more information.</p>
@@ -136,35 +120,33 @@ compile:file(File, Options ++ [report_errors, report_warnings])</code>
     </func>
     <func>
       <name>lc(Files) -> ok</name>
-      <fsummary>Compile a list of files</fsummary>
       <type>
         <v>Files = [File]</v>
-        <v>&nbsp;File = name() -- see filename(3)</v>
+        <v>File = <seealso marker="file#type-filename">file:filename()
+          </seealso></v>
       </type>
+      <fsummary>Compile a list of files</fsummary>
       <desc>
         <p>Compiles a list of files by calling <c>compile:file(File, [report_errors, report_warnings])</c> for each <c>File</c>
           in <c>Files</c>.</p>
       </desc>
     </func>
     <func>
-      <name>ls() -> void()</name>
+      <name name="ls" arity="0"/>
       <fsummary>List files in the current directory</fsummary>
       <desc>
         <p>Lists files in the current directory.</p>
       </desc>
     </func>
     <func>
-      <name>ls(Dir) -> void()</name>
+      <name name="ls" arity="1"/>
       <fsummary>List files in a directory</fsummary>
-      <type>
-        <v>Dir = name() -- see filename(3)</v>
-      </type>
       <desc>
-        <p>Lists files in directory <c>Dir</c>.</p>
+        <p>Lists files in directory <c><anno>Dir</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>m() -> void()</name>
+      <name name="m" arity="0"/>
       <fsummary>Which modules are loaded</fsummary>
       <desc>
         <p>Displays information about the loaded modules, including
@@ -172,84 +154,67 @@ compile:file(File, Options ++ [report_errors, report_warnings])</code>
       </desc>
     </func>
     <func>
-      <name>m(Module) -> void()</name>
+      <name name="m" arity="1"/>
       <fsummary>Information about a module</fsummary>
-      <type>
-        <v>Module = atom()</v>
-      </type>
       <desc>
-        <p>Displays information about <c>Module</c>.</p>
+        <p>Displays information about <c><anno>Module</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>memory() -> [{Type, Size}]</name>
+      <name name="memory" arity="0"/>
       <fsummary>Memory allocation information</fsummary>
-      <type>
-        <v>Type, Size -- see erlang:memory/0</v>
-      </type>
       <desc>
         <p>Memory allocation information. Equivalent to
-          <c>erlang:memory/0</c>.</p>
+          <seealso marker="erts:erlang#memory/0"><c>erlang:memory/0</c>
+          </seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>memory(Type) -> Size</name>
-      <name>memory([Type]) -> [{Type, Size}]</name>
+      <name name="memory" arity="1" clause_i="1"/>
+      <name name="memory" arity="1" clause_i="2"/>
       <fsummary>Memory allocation information</fsummary>
-      <type>
-        <v>Type, Size -- see erlang:memory/0</v>
-      </type>
       <desc>
         <p>Memory allocation information. Equivalent to
-          <c>erlang:memory/1</c>.</p>
+          <seealso marker="erts:erlang#memory/1"><c>erlang:memory/1</c>
+          </seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>nc(File) -> {ok, Module} | error</name>
-      <name>nc(File, Options) -> {ok, Module} | error</name>
+      <name name="nc" arity="1"/>
+      <name name="nc" arity="2"/>
       <fsummary>Compile and load code in a file on all nodes</fsummary>
-      <type>
-        <v>File = name() -- see filename(3)</v>
-        <v>Options = [Opt] -- see compile:file/2</v>
-      </type>
       <desc>
         <p>Compiles and then loads the code for a file on all nodes.
-          <c>Options</c> defaults to []. Compilation is equivalent to:</p>
+          <c><anno>Options</anno></c> defaults to []. Compilation is equivalent to:</p>
         <code type="none">
-compile:file(File, Opts ++ [report_errors, report_warnings])</code>
+compile:file(<anno>File</anno>, <anno>Options</anno> ++ [report_errors, report_warnings])</code>
       </desc>
     </func>
     <func>
-      <name>nl(Module) -> void()</name>
+      <name name="nl" arity="1"/>
       <fsummary>Load module on all nodes</fsummary>
-      <type>
-        <v>Module = atom()</v>
-      </type>
       <desc>
-        <p>Loads <c>Module</c> on all nodes.</p>
+        <p>Loads <c><anno>Module</anno></c> on all nodes.</p>
       </desc>
     </func>
     <func>
-      <name>pid(X, Y, Z) -> pid()</name>
+      <name name="pid" arity="3"/>
       <fsummary>Convert X,Y,Z to a pid</fsummary>
-      <type>
-        <v>X = Y = Z = int()</v>
-      </type>
       <desc>
-        <p>Converts <c>X</c>, <c>Y</c>, <c>Z</c> to the pid
+        <p>Converts <c><anno>X</anno></c>, <c><anno>Y</anno></c>, <c><anno>Z</anno></c> to the pid
           <c><![CDATA[<X.Y.Z>]]></c>. This function should only be used when
           debugging.</p>
       </desc>
     </func>
     <func>
-      <name>pwd() -> void()</name>
+      <name name="pwd" arity="0"/>
       <fsummary>Print working directory</fsummary>
       <desc>
         <p>Prints the name of the working directory.</p>
       </desc>
     </func>
     <func>
-      <name>q() -> void()</name>
+      <name name="q" arity="0"/>
       <fsummary>Quit - shorthand for <c>init:stop()</c></fsummary>
       <desc>
         <p>This function is shorthand for <c>init:stop()</c>, that is,
@@ -257,8 +222,8 @@ compile:file(File, Opts ++ [report_errors, report_warnings])</code>
       </desc>
     </func>
     <func>
-      <name>regs() -> void()</name>
-      <name>nregs() -> void()</name>
+      <name name="regs" arity="0"/>
+      <name name="nregs" arity="0"/>
       <fsummary>Information about registered processes</fsummary>
       <desc>
         <p><c>regs/0</c> displays information about all registered
diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml
index 075c7f9c78..4876b37127 100644
--- a/lib/stdlib/doc/src/calendar.xml
+++ b/lib/stdlib/doc/src/calendar.xml
@@ -73,100 +73,125 @@
       week number.</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-date() = {Year, Month, Day}
-  Year = int()
-  Month = 1..12
-  Day = 1..31
-Year cannot be abbreviated. Example: 93 denotes year 93, not 1993.
-Valid range depends on the underlying OS.
-The date tuple must denote a valid date.
+  <datatypes>
+    <datatype>
+      <name name="t_datetime"/>
+    </datatype>
+    <datatype>
+      <name name="t_datetime1970"/>
+    </datatype>
+    <datatype>
+      <name name="t_date"/>
+    </datatype>
+    <datatype>
+      <name name="year"/>
+      <desc><p>Year cannot be abbreviated. Example: 93 denotes year
+        93, not 1993. Valid range depends on the underlying OS. The
+        date tuple must denote a valid date.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="year1970"/>
+    </datatype>
+    <datatype>
+      <name name="month"/>
+    </datatype>
+    <datatype>
+      <name name="day"/>
+    </datatype>
+    <datatype>
+      <name name="t_time"/>
+    </datatype>
+    <datatype>
+      <name name="hour"/>
+    </datatype>
+    <datatype>
+      <name name="minute"/>
+    </datatype>
+    <datatype>
+      <name name="second"/>
+    </datatype>
+    <datatype>
+      <name name="daynum"/>
+    </datatype>
+    <datatype>
+      <name name="ldom"/>
+    </datatype>
+    <datatype>
+      <name name="t_now"/>
+      <desc><p>See <seealso marker="erts:erlang#now/0">erlang:now/0</seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="t_yearweeknum"/>
+    </datatype>
+    <datatype>
+      <name name="weeknum"/>
+    </datatype>
+  </datatypes>
 
-time() = {Hour, Minute, Second}
-  Hour = 0..23
-  Minute = Second = 0..59</code>
-  </section>
   <funcs>
     <func>
-      <name>date_to_gregorian_days(Date) -> Days</name>
-      <name>date_to_gregorian_days(Year, Month, Day) -> Days</name>
+      <name name="date_to_gregorian_days" arity="1"/>
+      <name name="date_to_gregorian_days" arity="3"/>
+      <type variable="Date" name_i="1"/>
+      <type variable="Year"/>
+      <type variable="Month"/>
+      <type variable="Day"/>
       <fsummary>Compute the number of days from year 0 up to the given date</fsummary>
-      <type>
-        <v>Date = date()</v>
-        <v>Days = int()</v>
-      </type>
       <desc>
         <p>This function computes the number of gregorian days starting
           with year 0 and ending at the given date.</p>
       </desc>
     </func>
     <func>
-      <name>datetime_to_gregorian_seconds({Date, Time}) -> Seconds</name>
+      <name name="datetime_to_gregorian_seconds" arity="1"/>
       <fsummary>Compute the number of seconds from year 0 up to the given date and time</fsummary>
-      <type>
-        <v>Date = date()</v>
-        <v>Time = time()</v>
-        <v>Seconds = int()</v>
-      </type>
       <desc>
         <p>This function computes the number of gregorian seconds
           starting with year 0 and ending at the given date and time.</p>
       </desc>
     </func>
     <func>
-      <name>day_of_the_week(Date) -> DayNumber</name>
-      <name>day_of_the_week(Year, Month, Day) -> DayNumber</name>
+      <name name="day_of_the_week" arity="1"/>
+      <name name="day_of_the_week" arity="3"/>
       <fsummary>Compute the day of the week</fsummary>
-      <type>
-        <v>Date = date()</v>
-        <v>DayNumber = 1..7</v>
-      </type>
+      <type variable="Date" name_i="1"/>
+      <type variable="Year"/>
+      <type variable="Month"/>
+      <type variable="Day"/>
       <desc>
-        <p>This function computes the day of the week given <c>Year</c>,
-          <c>Month</c> and <c>Day</c>. The return value denotes the day
+        <p>This function computes the day of the week given <c><anno>Year</anno></c>,
+          <c><anno>Month</anno></c> and <c><anno>Day</anno></c>. The return value denotes the day
           of the week as <c>1</c>: Monday, <c>2</c>: Tuesday, and so on.</p>
       </desc>
     </func>
     <func>
-      <name>gregorian_days_to_date(Days) -> Date</name>
+      <name name="gregorian_days_to_date" arity="1"/>
       <fsummary>Compute the date given the number of gregorian days</fsummary>
-      <type>
-        <v>Days = int()</v>
-        <v>Date = date()</v>
-      </type>
       <desc>
         <p>This function computes the date given the number of
           gregorian days.</p>
       </desc>
     </func>
     <func>
-      <name>gregorian_seconds_to_datetime(Seconds) -> {Date, Time}</name>
+      <name name="gregorian_seconds_to_datetime" arity="1"/>
       <fsummary>Compute the date given the number of gregorian days</fsummary>
-      <type>
-        <v>Seconds = int()</v>
-        <v>Date = date()</v>
-        <v>Time = time()</v>
-      </type>
       <desc>
         <p>This function computes the date and time from the given
           number of gregorian seconds.</p>
       </desc>
     </func>
     <func>
-      <name>is_leap_year(Year) -> bool()</name>
+      <name name="is_leap_year" arity="1"/>
       <fsummary>Check if a year is a leap year</fsummary>
       <desc>
         <p>This function checks if a year is a leap year.</p>
       </desc>
     </func>
     <func>
-      <name>iso_week_number() -> IsoWeekNumber</name>
+      <name name="iso_week_number" arity="0"/>
       <fsummary>Compute the iso week number for the actual date</fsummary>
-      <type>
-        <v>IsoWeekNumber = {int(), int()}</v>
-      </type>
       <desc>
         <p>This function returns the tuple {Year, WeekNum} representing
           the iso week number for the actual date. For determining the
@@ -174,42 +199,34 @@ time() = {Hour, Minute, Second}
       </desc>
     </func>
     <func>
-      <name>iso_week_number(Date) -> IsoWeekNumber</name>
+      <name name="iso_week_number" arity="1"/>
       <fsummary>Compute the iso week number for the given date</fsummary>
-      <type>
-        <v>Date = date()</v>
-        <v>IsoWeekNumber = {int(), int()}</v>
-      </type>
       <desc>
         <p>This function returns the tuple {Year, WeekNum} representing
           the iso week number for the given date.</p>
       </desc>
     </func>
     <func>
-      <name>last_day_of_the_month(Year, Month) -> int()</name>
+      <name name="last_day_of_the_month" arity="2"/>
       <fsummary>Compute the number of days in a month</fsummary>
       <desc>
         <p>This function computes the number of days in a month.</p>
       </desc>
     </func>
     <func>
-      <name>local_time() -> {Date, Time}</name>
+      <name name="local_time" arity="0"/>
       <fsummary>Compute local time</fsummary>
-      <type>
-        <v>Date = date()</v>
-        <v>Time = time()</v>
-      </type>
       <desc>
         <p>This function returns the local time reported by
           the underlying operating system.</p>
       </desc>
     </func>
     <func>
-      <name>local_time_to_universal_time({Date1, Time1}) -> {Date2, Time2}</name>
+      <name name="local_time_to_universal_time" arity="1"/>
       <fsummary>Convert from local time to universal time (deprecated)</fsummary>
       <desc>
         <p>This function converts from local time to Universal 
-          Coordinated Time (UTC). <c>Date1</c> must refer to a local
+          Coordinated Time (UTC). <c><anno>DateTime1</anno></c> must refer to a local
           date after Jan 1, 1970.</p>
         <warning>
           <p>This function is deprecated. Use
@@ -222,15 +239,11 @@ time() = {Hour, Minute, Second}
       </desc>
     </func>
     <func>
-      <name>local_time_to_universal_time_dst({Date1, Time1}) -> [{Date, Time}]</name>
+      <name name="local_time_to_universal_time_dst" arity="1"/>
       <fsummary>Convert from local time to universal time(s)</fsummary>
-      <type>
-        <v>Date1 = Date = date()</v>
-        <v>Time1 = Time = time()</v>
-      </type>
       <desc>
         <p>This function converts from local time to Universal
-          Coordinated Time (UTC). <c>Date1</c> must refer to a local
+          Coordinated Time (UTC). <c><anno>DateTime1</anno></c> must refer to a local
           date after Jan 1, 1970.</p>
         <p>The return value is a list of 0, 1 or 2 possible UTC times:</p>
         <taglist>
@@ -258,65 +271,48 @@ time() = {Hour, Minute, Second}
       </desc>
     </func>
     <func>
-      <name>now_to_local_time(Now) -> {Date, Time}</name>
+      <name name="now_to_local_time" arity="1"/>
       <fsummary>Convert now to local date and time</fsummary>
-      <type>
-        <v>Now -- see erlang:now/0</v>
-        <v>Date = date()</v>
-        <v>Time = time()</v>
-      </type>
       <desc>
         <p>This function returns local date and time converted from
           the return value from <c>erlang:now()</c>.</p>
       </desc>
     </func>
     <func>
-      <name>now_to_universal_time(Now) -> {Date, Time}</name>
-      <name>now_to_datetime(Now) -> {Date, Time}</name>
+      <name name="now_to_universal_time" arity="1"/>
+      <name name="now_to_datetime" arity="1"/>
       <fsummary>Convert now to date and time</fsummary>
-      <type>
-        <v>Now -- see erlang:now/0</v>
-        <v>Date = date()</v>
-        <v>Time = time()</v>
-      </type>
       <desc>
         <p>This function returns Universal Coordinated Time (UTC)
           converted from the return value from <c>erlang:now()</c>.</p>
       </desc>
     </func>
     <func>
-      <name>seconds_to_daystime(Seconds) -> {Days, Time}</name>
+      <name name="seconds_to_daystime" arity="1"/>
       <fsummary>Compute days and time from seconds</fsummary>
-      <type>
-        <v>Seconds = Days = int()</v>
-        <v>Time = time()</v>
-      </type>
       <desc>
         <p>This function transforms a given number of seconds into days,
-          hours, minutes, and seconds. The <c>Time</c> part is always
-          non-negative, but <c>Days</c> is negative if the argument
-          <c>Seconds</c> is.</p>
+          hours, minutes, and seconds. The <c><anno>Time</anno></c> part is always
+          non-negative, but <c><anno>Days</anno></c> is negative if the argument
+          <c><anno>Seconds</anno></c> is.</p>
       </desc>
     </func>
     <func>
-      <name>seconds_to_time(Seconds) -> Time</name>
+      <name name="seconds_to_time" arity="1"/>
       <fsummary>Compute time from seconds</fsummary>
-      <type>
-        <v>Seconds = int() &lt; 86400</v>
-        <v>Time = time()</v>
-      </type>
+      <type name="secs_per_day"/>
       <desc>
         <p>This function computes the time from the given number of
-          seconds. <c>Seconds</c> must be less than the number of
+          seconds. <c><anno>Seconds</anno></c> must be less than the number of
           seconds per day (86400).</p>
       </desc>
     </func>
     <func>
-      <name>time_difference(T1, T2) -> {Days, Time}</name>
+      <name name="time_difference" arity="2"/>
       <fsummary>Compute the difference between two times (deprecated)</fsummary>
       <desc>
-        <p>This function returns the difference between two <c>{Date, Time}</c> tuples. <c>T2</c> should refer to an epoch later
-          than <c>T1</c>.</p>
+        <p>This function returns the difference between two <c>{Date, Time}</c> tuples. <c><anno>T2</anno></c> should refer to an epoch later
+          than <c><anno>T1</anno></c>.</p>
         <warning>
           <p>This function is obsolete. Use the conversion functions for
             gregorian days and seconds instead.</p>
@@ -324,24 +320,17 @@ time() = {Hour, Minute, Second}
       </desc>
     </func>
     <func>
-      <name>time_to_seconds(Time) -> Seconds</name>
+      <name name="time_to_seconds" arity="1"/>
       <fsummary>Compute the number of seconds since midnight up to  the given time</fsummary>
-      <type>
-        <v>Time = time()</v>
-        <v>Seconds = int()</v>
-      </type>
+      <type name="secs_per_day"/>
       <desc>
         <p>This function computes the number of seconds since midnight
           up to the specified time.</p>
       </desc>
     </func>
     <func>
-      <name>universal_time() -> {Date, Time}</name>
+      <name name="universal_time" arity="0"/>
       <fsummary>Compute universal time</fsummary>
-      <type>
-        <v>Date = date()</v>
-        <v>Time = time()</v>
-      </type>
       <desc>
         <p>This function returns the Universal Coordinated Time (UTC)
           reported by the underlying operating system. Local time is
@@ -349,25 +338,22 @@ time() = {Hour, Minute, Second}
       </desc>
     </func>
     <func>
-      <name>universal_time_to_local_time({Date1, Time1}) -> {Date2, Time2}</name>
+      <name name="universal_time_to_local_time" arity="1"/>
       <fsummary>Convert from universal time to local time</fsummary>
-      <type>
-        <v>Date1 = Date2 = date()</v>
-        <v>Time1 = Time2 = time()</v>
-      </type>
       <desc>
         <p>This function converts from Universal Coordinated Time (UTC)
-          to local time. <c>Date1</c> must refer to a date after Jan 1, 
+          to local time. <c><anno>DateTime</anno></c> must refer to a date after Jan 1,
           1970.</p>
       </desc>
     </func>
     <func>
-      <name>valid_date(Date) -> bool()</name>
-      <name>valid_date(Year, Month, Day) -> bool()</name>
+      <name name="valid_date" arity="1"/>
+      <name name="valid_date" arity="3"/>
+      <type variable="Date" name_i="1"/>
+      <type variable="Year"/>
+      <type variable="Month"/>
+      <type variable="Day"/>
       <fsummary>Check if a date is valid</fsummary>
-      <type>
-        <v>Date = date()</v>
-      </type>
       <desc>
         <p>This function checks if a date is a valid.</p>
       </desc>
diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml
index b002af6616..2512c84e18 100644
--- a/lib/stdlib/doc/src/dets.xml
+++ b/lib/stdlib/doc/src/dets.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -100,50 +100,99 @@
       the process with the error tuple). If given badly formed
       arguments, all functions exit the process with a <c>badarg</c>
       message.</p>
-    <p><em>Types</em></p>
-    <pre>
-access() = read | read_write
-auto_save() = infinity | int()
-bindings_cont() = tuple()
-bool() = true | false
-file() = string()
-int() = integer() >= 0
-keypos() = integer() >= 1
-name() = atom() | reference()
-no_slots() = integer() >= 0 | default
-object() = tuple()
-object_cont() = tuple()
-select_cont() = tuple()
-type() = bag | duplicate_bag | set
-version() = 8 | 9 | default    </pre>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="access"/>
+    </datatype>
+    <datatype>
+      <name name="auto_save"/>
+    </datatype>
+    <datatype>
+      <name name="bindings_cont"/>
+      <desc>
+        <p>Opaque continuation used by <seealso marker="#match/1">
+          <c>match/1</c></seealso> and <seealso marker="#match/3">
+          <c>match/3</c></seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="cont"/>
+      <desc>
+        <p>Opaque continuation used by <seealso marker="#bchunk/2">
+          <c>bchunk/2</c></seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="keypos"/>
+    </datatype>
+    <datatype>
+      <name name="match_spec"/>
+      <desc>
+        <p>Match&nbsp;specifications, see the <seealso
+          marker="erts:match_spec">match specification</seealso>
+          documentation in the ERTS User's Guide and <seealso
+          marker="ms_transform">ms_transform(3).</seealso></p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="no_slots"/>
+    </datatype>
+    <datatype>
+      <name name="object"/>
+    </datatype>
+    <datatype>
+      <name name="object_cont"/>
+      <desc>
+        <p>Opaque continuation used by <seealso marker="#match_object/1">
+          <c>match_object/1</c></seealso> and <seealso marker="#match_object/3">
+          <c>match_object/3</c></seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="pattern"/>
+      <desc>
+        <p>See <seealso marker="ets#match/2">ets:match/2</seealso> for a
+          description of patterns.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="select_cont"/>
+      <desc>
+        <p>Opaque continuation used by <seealso marker="#select/1">
+          <c>select/1</c></seealso> and <seealso marker="#select/3">
+          <c>select/3</c></seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="tab_name"/>
+    </datatype>
+    <datatype>
+      <name name="type"/>
+    </datatype>
+    <datatype>
+      <name name="version"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>all() -> [Name]</name>
+      <name name="all" arity="0"/>
       <fsummary>Return a list of the names of all open Dets tables on this node.</fsummary>
-      <type>
-        <v>Name = name()</v>
-      </type>
       <desc>
         <p>Returns a list of the names of all open tables on this
           node.</p>
       </desc>
     </func>
     <func>
-      <name>bchunk(Name, Continuation) -> {Continuation2, Data} | '$end_of_table' | {error, Reason}</name>
+      <name name="bchunk" arity="2"/>
       <fsummary>Return a chunk of objects stored in a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Continuation = start | cont()</v>
-        <v>Continuation2 = cont()</v>
-        <v>Data = binary() | tuple()</v>
-      </type>
       <desc>
         <p>Returns a list of objects stored in a table. The exact
           representation of the returned objects is not public. The
           lists of data can be used for initializing a table by giving
           the value <c>bchunk</c> to the <c>format</c> option of the
-          <c>init_table/3</c> function. The Mnesia application uses this
+          <seealso marker="#init_table/3"><c>init_table/3</c></seealso>
+          function. The Mnesia application uses this
           function for copying open tables.</p>
         <p>Unless the table is protected using <c>safe_fixtable/2</c>,
           calls to <c>bchunk/2</c> may not work as expected if
@@ -151,24 +200,23 @@ version() = 8 | 9 | default    </pre>
         <p>The first time <c>bchunk/2</c> is called, an initial
           continuation, the atom <c>start</c>, must be provided.</p>
         <p>The <c>bchunk/2</c> function returns a tuple
-          <c>{Continuation2, Data}</c>, where <c>Data</c> is a list of
-          objects. <c>Continuation2</c> is another continuation which is
+          <c>{<anno>Continuation2</anno>, <anno>Data</anno>}</c>,
+          where <c><anno>Data</anno></c> is a list of
+          objects. <c><anno>Continuation2</anno></c> is another continuation
+          which is
           to be passed on to a subsequent call to <c>bchunk/2</c>. With
           a series of calls to <c>bchunk/2</c> it is possible to extract
           all objects of the table.
           </p>
         <p><c>bchunk/2</c> returns <c>'$end_of_table'</c> when all
-          objects have been returned, or <c>{error, Reason}</c> if an
-          error occurs.
+          objects have been returned, or <c>{error, <anno>Reason</anno>}</c>
+          if an error occurs.
           </p>
       </desc>
     </func>
     <func>
-      <name>close(Name) -> ok | {error, Reason} </name>
+      <name name="close" arity="1"/>
       <fsummary>Close a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-      </type>
       <desc>
         <p>Closes a table. Only processes that have opened a table are
           allowed to close it.
@@ -180,22 +228,16 @@ version() = 8 | 9 | default    </pre>
       </desc>
     </func>
     <func>
-      <name>delete(Name, Key) -> ok | {error, Reason}</name>
+      <name name="delete" arity="2"/>
       <fsummary>Delete all objects with a given key from a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-      </type>
       <desc>
-        <p>Deletes all objects with the key <c>Key</c> from the table
-          <c>Name</c>.</p>
+        <p>Deletes all objects with the key <c><anno>Key</anno></c> from
+          the table <c><anno>Name</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>delete_all_objects(Name) -> ok | {error, Reason}</name>
+      <name name="delete_all_objects" arity="1"/>
       <fsummary>Delete all objects from a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-      </type>
       <desc>
         <p>Deletes all objects from a table in almost constant time.
           However, if the table if fixed, <c>delete_all_objects(T)</c>
@@ -203,12 +245,8 @@ version() = 8 | 9 | default    </pre>
       </desc>
     </func>
     <func>
-      <name>delete_object(Name, Object) -> ok | {error, Reason}</name>
+      <name name="delete_object" arity="2"/>
       <fsummary>Delete a given object from a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Object = object()</v>
-      </type>
       <desc>
         <p>Deletes all instances of a given object from a table. If a
           table is of type <c>bag</c> or <c>duplicate_bag</c>, the
@@ -218,18 +256,15 @@ version() = 8 | 9 | default    </pre>
       </desc>
     </func>
     <func>
-      <name>first(Name) -> Key | '$end_of_table'</name>
+      <name name="first" arity="1"/>
       <fsummary>Return the first key stored in a Dets table.</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Name = name()</v>
-      </type>
       <desc>
-        <p>Returns the first key stored in the table <c>Name</c>
+        <p>Returns the first key stored in the table <c><anno>Name</anno></c>
           according to the table's internal order, or
           <c>'$end_of_table'</c> if the table is empty.</p>
         <p>Unless the table is protected using <c>safe_fixtable/2</c>,
-          subsequent calls to <c>next/2</c> may not work as expected if
+          subsequent calls to <seealso marker="#next/2"><c>next/2</c></seealso>
+          may not work as expected if
           concurrent updates are made to the table.</p>
         <p>Should an error occur, the process is exited with an error
           tuple <c>{error, Reason}</c>. The reason for not returning the
@@ -243,107 +278,78 @@ version() = 8 | 9 | default    </pre>
       </desc>
     </func>
     <func>
-      <name>foldl(Function, Acc0, Name) -> Acc1 | {error, Reason}</name>
-      <fsummary>Fold a function over a Dets table.</fsummary>
-      <type>
-        <v>Function = fun(Object, AccIn) -> AccOut</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>Name = name()</v>
-        <v>Object = object()</v>
-      </type>
-      <desc>
-        <p>Calls <c>Function</c> on successive elements of the table
-          <c>Name</c> together with an extra argument <c>AccIn</c>. The
-          order in which the elements of the table are traversed is
-          unspecified. <c>Function</c> must return a new accumulator
-          which is passed to the next call. <c>Acc0</c> is returned if
-          the table is empty.</p>
-      </desc>
-    </func>
-    <func>
-      <name>foldr(Function, Acc0, Name) -> Acc1 | {error, Reason}</name>
+      <name name="foldl" arity="3"/>
+      <name name="foldr" arity="3"/>
       <fsummary>Fold a function over a Dets table.</fsummary>
-      <type>
-        <v>Function = fun(Object, AccIn) -> AccOut</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>Name = name()</v>
-        <v>Object = object()</v>
-      </type>
       <desc>
-        <p>Calls <c>Function</c> on successive elements of the table
-          <c>Name</c> together with an extra argument <c>AccIn</c>. The
+        <p>Calls <c><anno>Function</anno></c> on successive elements of
+          the table <c><anno>Name</anno></c> together with an extra argument
+          <c>AccIn</c>. The
           order in which the elements of the table are traversed is
-          unspecified. <c>Function</c> must return a new accumulator
-          which is passed to the next call. <c>Acc0</c> is returned if
+          unspecified. <c><anno>Function</anno></c> must return a new
+          accumulator which is passed to the next call.
+          <c><anno>Acc0</anno></c> is returned if
           the table is empty.</p>
       </desc>
     </func>
     <func>
-      <name>from_ets(Name, EtsTab) -> ok | {error, Reason}</name>
+      <name name="from_ets" arity="2"/>
       <fsummary>Replace the objects of a Dets table with the objects of an Ets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>EtsTab = -&nbsp;see ets(3)&nbsp;-</v>
-      </type>
       <desc>
-        <p>Deletes all objects of the table <c>Name</c> and then
-          inserts all the objects of the Ets table <c>EtsTab</c>. The
-          order in which the objects are inserted is not specified.
+        <p>Deletes all objects of the table <c><anno>Name</anno></c> and then
+          inserts all the objects of the Ets table <c><anno>EtsTab</anno></c>.
+          The order in which the objects are inserted is not specified.
           Since <c>ets:safe_fixtable/2</c> is called the Ets table must
           be public or owned by the calling process.</p>
       </desc>
     </func>
     <func>
-      <name>info(Name) -> InfoList | undefined</name>
+      <name name="info" arity="1"/>
       <fsummary>Return information about a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>InfoList = [{Item, Value}]</v>
-      </type>
       <desc>
-        <p>Returns information about the table <c>Name</c> as a list of
-          <c>{Item, Value}</c> tuples:</p>
+        <p>Returns information about the table <c><anno>Name</anno></c>
+           as a list of tuples:</p>
         <list type="bulleted">
           <item>
-            <p><c>{file_size, int()}</c>, the size of the file in
+            <p><c>{file_size, integer() >= 0}</c>, the size of the file in
               bytes.</p>
           </item>
           <item>
-            <p><c>{filename, file()}</c>, the name of the file
-              where objects are stored.</p>
+            <p><c>{filename, <seealso marker="file#type-name">file:name()</seealso>}</c>,
+              the name of the file where objects are stored.</p>
           </item>
           <item>
-            <p><c>{keypos, keypos()}</c>, the position of the
-              key.</p>
+            <p><c>{keypos, <seealso marker="#type-keypos">keypos()</seealso>}
+              </c>, the position of the key.</p>
           </item>
           <item>
-            <p><c>{size, int()}</c>, the number of objects stored
+            <p><c>{size, integer() >= 0}</c>, the number of objects stored
               in the table.</p>
           </item>
           <item>
-            <p><c>{type, type()}</c>, the type of the table.</p>
+            <p><c>{type, <seealso marker="#type-type">type()</seealso>}</c>,
+            the type of the table.</p>
           </item>
         </list>
       </desc>
     </func>
     <func>
-      <name>info(Name, Item) -> Value | undefined</name>
+      <name name="info" arity="2"/>
       <fsummary>Return the information associated with a given item for a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-      </type>
       <desc>
-        <p>Returns the information associated with <c>Item</c> for the
-          table <c>Name</c>. In addition to the <c>{Item, Value}</c>
+        <p>Returns the information associated with <c><anno>Item</anno></c>
+          for the table <c><anno>Name</anno></c>.
+          In addition to the <c>{<anno>Item</anno>, <anno>Value</anno>}</c>
           pairs defined for <c>info/1</c>, the following items are
           allowed:</p>
         <list type="bulleted">
           <item>
-            <p><c>{access, access()}</c>, the access mode.</p>
+            <p><c>{access, <seealso marker="#type-access">access()</seealso>}
+            </c>, the access mode.</p>
           </item>
           <item>
-            <p><c>{auto_save, auto_save()}</c>, the auto save
-              interval.</p>
+            <p><c>{auto_save, <seealso marker="#type-auto_save">
+              auto_save()</seealso>}</c>, the auto save interval.</p>
           </item>
           <item>
             <p><c>{bchunk_format, binary()}</c>, an opaque binary
@@ -362,21 +368,22 @@ version() = 8 | 9 | default    </pre>
               <c>erlang:phash2/1</c> BIF is used.</p>
           </item>
           <item>
-            <p><c>{memory, int()}</c>, the size of the file in
+            <p><c>{memory, integer() >= 0}</c>, the size of the file in
               bytes. The same value is associated with the item
               <c>file_size</c>.</p>
           </item>
           <item>
-            <p><c>{no_keys, int()}</c>, the number of different
+            <p><c>{no_keys, integer >= 0()}</c>, the number of different
               keys stored in the table. Only available for version 9
               tables.</p>
           </item>
           <item>
-            <p><c>{no_objects, int()}</c>, the number of objects
+            <p><c>{no_objects, integer >= 0()}</c>, the number of objects
               stored in the table.</p>
           </item>
           <item>
-            <p><c>{no_slots, {Min, Used, Max}}</c>, the number of
+            <p><c>{no_slots, {</c>Min<c>, </c>Used<c>, </c>Max<c>}}</c>,
+              the number of
               slots of the table. <c>Min</c> is the minimum number of
               slots, <c>Used</c> is the number of currently used slots,
               and <c>Max</c> is the maximum number of slots. Only
@@ -387,7 +394,7 @@ version() = 8 | 9 | default    </pre>
               handles requests to the Dets table.</p>
           </item>
           <item>
-            <p><c>{ram_file, bool()}</c>, whether the table is
+            <p><c>{ram_file, boolean()}</c>, whether the table is
               kept in RAM.</p>
           </item>
           <item>
@@ -399,32 +406,28 @@ version() = 8 | 9 | default    </pre>
               table is not fixed, SafeFixed is the atom <c>false</c>.</p>
           </item>
           <item>
-            <p><c>{version, int()}</c>, the version of the format
-              of the table.</p>
+            <p><c>{version, integer()</c>, the version of the format of
+              the table.</p>
           </item>
         </list>
       </desc>
     </func>
     <func>
-      <name>init_table(Name, InitFun [, Options]) -> ok  | {error, Reason}</name>
+      <name name="init_table" arity="2"/>
+      <name name="init_table" arity="3"/>
       <fsummary>Replace all objects of a Dets table.</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>InitFun = fun(Arg) -> Res</v>
-        <v>Arg = read | close</v>
-        <v>Res = end_of_input | {[object()], InitFun} | {Data, InitFun}  | term()</v>
-        <v>Data = binary() | tuple()</v>
-      </type>
       <desc>
-        <p>Replaces the existing objects of the table <c>Name</c> with
-          objects created by calling the input function <c>InitFun</c>,
+        <p>Replaces the existing objects of the table <c><anno>Name</anno></c>
+          with objects created by calling the input function
+          <c><anno>InitFun</anno></c>,
           see below. The reason for using this function rather than
           calling <c>insert/2</c> is that of efficiency. It should be
           noted that the input functions are called by the process that
           handles requests to the Dets table, not by the calling
           process.</p>
         <p>When called with the argument <c>read</c> the function
-          <c>InitFun</c> is assumed to return <c>end_of_input</c> when
+          <c><anno>InitFun</anno></c> is assumed to return
+          <c>end_of_input</c> when
           there is no more input, or <c>{Objects, Fun}</c>, where
           <c>Objects</c> is a list of objects and <c>Fun</c> is a new
           input function. Any other value Value is returned as an error
@@ -448,7 +451,8 @@ version() = 8 | 9 | default    </pre>
           item <c>no_slots</c>. See also the <c>min_no_slots</c> option
           below.
           </p>
-        <p>The <c>Options</c> argument is a list of <c>{Key, Val}</c>
+        <p>The <c><anno>Options</anno></c> argument is a list of
+          <c>{Key, Val}</c>
           tuples where the following values are allowed:</p>
         <list type="bulleted">
           <item>
@@ -461,87 +465,68 @@ version() = 8 | 9 | default    </pre>
           </item>
           <item>
             <p><c>{format, Format}</c>. Specifies the format of the
-              objects returned by the function <c>InitFun</c>. If
+              objects returned by the function <c><anno>InitFun</anno></c>. If
               <c>Format</c> is <c>term</c> (the default),
-              <c>InitFun</c> is assumed to return a list of tuples. If
-              <c>Format</c> is <c>bchunk</c>, <c>InitFun</c> is
-              assumed to return <c>Data</c> as returned by
-              <c>bchunk/2</c>. This option overrides the
+              <c><anno>InitFun</anno></c> is assumed to return a list of tuples. If
+              <c>Format</c> is <c>bchunk</c>, <c><anno>InitFun</anno></c> is
+              assumed to return <c><anno>Data</anno></c> as returned by
+              <seealso marker="#bchunk/2"><c>bchunk/2</c></seealso>.
+              This option overrides the
               <c>min_no_slots</c> option.</p>
           </item>
         </list>
       </desc>
     </func>
     <func>
-      <name>insert(Name, Objects) -> ok | {error, Reason}</name>
+      <name name="insert" arity="2"/>
       <fsummary>Insert one or more objects into a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Objects = object() | [object()]</v>
-      </type>
       <desc>
-        <p>Inserts one or more objects into the table <c>Name</c>. If
-          there already exists an object with a key matching the key of
+        <p>Inserts one or more objects into the table <c><anno>Name</anno></c>.
+          If there already exists an object with a key matching the key of
           some of the given objects and the table type is <c>set</c>,
           the old object will be replaced.</p>
       </desc>
     </func>
     <func>
-      <name>insert_new(Name, Objects) -> Bool</name>
+      <name name="insert_new" arity="2"/>
       <fsummary>Insert one or more objects into a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Objects = object() | [object()]</v>
-        <v>Bool = bool()</v>
-      </type>
       <desc>
-        <p>Inserts one or more objects into the table <c>Name</c>. If
-          there already exists some object with a key matching the key
+        <p>Inserts one or more objects into the table <c><anno>Name</anno></c>.
+          If there already exists some object with a key matching the key
           of any of the given objects the table is not updated and
           <c>false</c> is returned, otherwise the objects are inserted
           and <c>true</c> returned.</p>
       </desc>
     </func>
     <func>
-      <name>is_compatible_bchunk_format(Name, BchunkFormat) -> Bool</name>
+      <name name="is_compatible_bchunk_format" arity="2"/>
       <fsummary>Test compatibility of a table's chunk data.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>BchunkFormat = binary()</v>
-        <v>Bool = bool()</v>
-      </type>
       <desc>
         <p>Returns <c>true</c> if it would be possible to initialize
-          the table <c>Name</c>, using <c>init_table/3</c> with the
+          the table <c><anno>Name</anno></c>, using
+          <seealso marker="#init_table/3"><c>init_table/3</c></seealso>
+          with the
           option <c>{format,&nbsp;bchunk}</c>, with objects read with
-          <c>bchunk/2</c> from some table <c>T</c> such that calling
+          <seealso marker="#bchunk/2"><c>bchunk/2</c></seealso> from some
+          table <c>T</c> such that calling
           <c>info(T,&nbsp;bchunk_format)</c> returns
           <c>BchunkFormat</c>.</p>
       </desc>
     </func>
     <func>
-      <name>is_dets_file(FileName) -> Bool | {error, Reason}</name>
+      <name name="is_dets_file" arity="1"/>
       <fsummary>Test for a Dets table.</fsummary>
-      <type>
-        <v>FileName = file()</v>
-        <v>Bool = bool()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if the file <c>FileName</c> is a Dets
-          table, <c>false</c> otherwise.</p>
+        <p>Returns <c>true</c> if the file <c><anno>Filename</anno></c>
+          is a Dets table, <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>lookup(Name, Key) -> [Object] | {error, Reason}</name>
+      <name name="lookup" arity="2"/>
       <fsummary>Return all objects with a given key stored in a Dets table.</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Name = name()</v>
-        <v>Object = object()</v>
-      </type>
       <desc>
-        <p>Returns a list of all objects with the key <c>Key</c>
-          stored in the table <c>Name</c>. For example:</p>
+        <p>Returns a list of all objects with the key <c><anno>Key</anno></c>
+          stored in the table <c><anno>Name</anno></c>. For example:</p>
         <pre>
 2> <input>dets:open_file(abc, [{type, bag}]).</input>
 {ok,abc}
@@ -562,71 +547,57 @@ ok
       </desc>
     </func>
     <func>
-      <name>match(Continuation) -> {[Match], Continuation2} | '$end_of_table' | {error, Reason}</name>
+      <name name="match" arity="1"/>
       <fsummary>Match a chunk of objects stored in a Dets table and return a list of variable bindings.</fsummary>
-      <type>
-        <v>Continuation = Continuation2 = bindings_cont()</v>
-        <v>Match = [term()]</v>
-      </type>
       <desc>
         <p>Matches some objects stored in a table and returns a
           non-empty list of the bindings that match a given pattern in
           some unspecified order. The table, the pattern, and the number
           of objects that are matched are all defined by
-          <c>Continuation</c>, which has been returned by a prior call
-          to <c>match/1</c> or <c>match/3</c>.</p>
+          <c><anno>Continuation</anno></c>, which has been returned by a prior
+          call to <c>match/1</c> or <c>match/3</c>.</p>
         <p>When all objects of the table have been matched,
           <c>'$end_of_table'</c> is returned.</p>
       </desc>
     </func>
     <func>
-      <name>match(Name, Pattern) -> [Match] | {error, Reason}</name>
+      <name name="match" arity="2"/>
       <fsummary>Match the objects stored in a Dets table and return a list of variable bindings.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Pattern = tuple()</v>
-        <v>Match = [term()]</v>
-      </type>
       <desc>
-        <p>Returns for each object of the table <c>Name</c> that
-          matches <c>Pattern</c> a list of bindings in some unspecified
-          order. See <seealso marker="ets">ets(3)</seealso> for a
+        <p>Returns for each object of the table <c><anno>Name</anno></c> that
+          matches <c><anno>Pattern</anno></c> a list of bindings in some unspecified
+          order. See <seealso marker="ets#match/2">ets:match/2</seealso> for a
           description of patterns. If the keypos'th element of
-          <c>Pattern</c> is unbound, all objects of the table are
+          <c><anno>Pattern</anno></c> is unbound, all objects of the table are
           matched. If the keypos'th element is bound, only the
           objects with the right key are matched.</p>
       </desc>
     </func>
     <func>
-      <name>match(Name, Pattern, N) -> {[Match], Continuation}  | '$end_of_table' | {error, Reason}</name>
+      <name name="match" arity="3"/>
       <fsummary>Match the first chunk of objects stored in a Dets table and return a list of variable bindings.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Pattern = tuple()</v>
-        <v>N = default | int()</v>
-        <v>Match = [term()]</v>
-        <v>Continuation = bindings_cont()</v>
-      </type>
       <desc>
-        <p>Matches some or all objects of the table <c>Name</c> and
+        <p>Matches some or all objects of the table <c><anno>Name</anno></c> and
           returns a non-empty list of the bindings that match
-          <c>Pattern</c> in some unspecified order. See <seealso marker="ets">ets(3)</seealso> for a description of
-          patterns.</p>
+          <c><anno>Pattern</anno></c> in some unspecified order.
+          See <seealso marker="ets#match/2">ets:match/2</seealso> for a
+          description of patterns.</p>
         <p>A tuple of the bindings and a continuation is returned,
           unless the table is empty, in which case
           <c>'$end_of_table'</c> is returned. The continuation is to be
           used when matching further objects by calling
-          <c>match/1</c>.</p>
-        <p>If the keypos'th element of <c>Pattern</c> is bound, all
-          objects of the table are matched. If the keypos'th element is
-          unbound, all objects of the table are matched, <c>N</c>
+          <seealso marker="#match/1"><c>match/1</c></seealso>.</p>
+        <p>If the keypos'th element of <c><anno>Pattern</anno></c> is bound,
+          all objects of the table are matched. If the keypos'th element is
+          unbound, all objects of the table are matched, <c><anno>N</anno></c>
           objects at a time, until at least one object matches or the
           end of the table has been reached. The default, indicated by
-          giving <c>N</c> the value <c>default</c>, is to let the number
+          giving <c><anno>N</anno></c> the value <c>default</c>,
+          is to let the number
           of objects vary depending on the sizes of the objects. If
-          <c>Name</c> is a version 9 table, all objects with the same
+          <c><anno>Name</anno></c> is a version 9 table, all objects with the same
           key are always matched at the same time which implies that
-          more than N objects may sometimes be matched.
+          more than <anno>N</anno> objects may sometimes be matched.
           </p>
         <p>The table should always be protected using
           <c>safe_fixtable/2</c> before calling <c>match/3</c>, or
@@ -634,15 +605,11 @@ ok
       </desc>
     </func>
     <func>
-      <name>match_delete(Name, Pattern) -> ok | {error, Reason}</name>
+      <name name="match_delete" arity="2"/>
       <fsummary>Delete all objects that match a given pattern from a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Pattern = tuple()</v>
-      </type>
       <desc>
-        <p>Deletes all objects that match <c>Pattern</c> from the
-          table <c>Name</c>. 
+        <p>Deletes all objects that match <c><anno>Pattern</anno></c> from the
+          table <c><anno>Name</anno></c>.
           See <seealso marker="ets#match/2">ets:match/2</seealso> for a
           description of patterns.</p>
         <p>If the keypos'th element of <c>Pattern</c> is bound,
@@ -650,17 +617,13 @@ ok
       </desc>
     </func>
     <func>
-      <name>match_object(Continuation) -> {[Object], Continuation2}  | '$end_of_table' | {error, Reason}</name>
+      <name name="match_object" arity="1"/>
       <fsummary>Match a chunk of objects stored in a Dets table and return a list of objects.</fsummary>
-      <type>
-        <v>Continuation = Continuation2 = object_cont()</v>
-        <v>Object = object()</v>
-      </type>
       <desc>
         <p>Returns a non-empty list of some objects stored in a table
           that match a given pattern in some unspecified order. The
           table, the pattern, and the number of objects that are matched
-          are all defined by <c>Continuation</c>, which has been
+          are all defined by <c><anno>Continuation</anno></c>, which has been
           returned by a prior call to <c>match_object/1</c> or
           <c>match_object/3</c>.</p>
         <p>When all objects of the table have been matched,
@@ -668,20 +631,17 @@ ok
       </desc>
     </func>
     <func>
-      <name>match_object(Name, Pattern) -> [Object] | {error, Reason}</name>
+      <name name="match_object" arity="2"/>
       <fsummary>Match the objects stored in a Dets table and return a list of objects.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Pattern = tuple()</v>
-        <v>Object = object()</v>
-      </type>
       <desc>
-        <p>Returns a list of all objects of the table <c>Name</c> that
-          match <c>Pattern</c> in some unspecified order. See <seealso marker="ets">ets(3)</seealso> for a description of patterns.
+        <p>Returns a list of all objects of the table <c><anno>Name</anno></c> that
+          match <c><anno>Pattern</anno></c> in some unspecified order.
+          See <seealso marker="ets#match/2">ets:match/2</seealso> for a
+          description of patterns.
           </p>
-        <p>If the keypos'th element of <c>Pattern</c> is
+        <p>If the keypos'th element of <c><anno>Pattern</anno></c> is
           unbound, all objects of the table are matched. If the
-          keypos'th element of <c>Pattern</c> is bound, only the
+          keypos'th element of <c><anno>Pattern</anno></c> is bound, only the
           objects with the right key are matched.</p>
         <p>Using the <c>match_object</c> functions for traversing all
           objects of a table is more efficient than calling
@@ -689,34 +649,28 @@ ok
       </desc>
     </func>
     <func>
-      <name>match_object(Name, Pattern, N) -> {[Object], Continuation}  | '$end_of_table' | {error, Reason}</name>
+      <name name="match_object" arity="3"/>
       <fsummary>Match the first chunk of objects stored in a Dets table and return a list of objects.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Pattern = tuple()</v>
-        <v>N = default | int()</v>
-        <v>Object = object()</v>
-        <v>Continuation = object_cont()</v>
-      </type>
       <desc>
-        <p>Matches some or all objects stored in the table <c>Name</c>
+        <p>Matches some or all objects stored in the table <c><anno>Name</anno></c>
           and returns a non-empty list of the objects that match
-          <c>Pattern</c> in some unspecified order. See <seealso marker="ets">ets(3)</seealso> for a description of
-          patterns.</p>
+          <c><anno>Pattern</anno></c> in some unspecified order.
+          See <seealso marker="ets#match/2">ets:match/2</seealso> for a
+          description of patterns.</p>
         <p>A list of objects and a continuation is returned, unless
           the table is empty, in which case <c>'$end_of_table'</c>
           is returned. The continuation is to be used when matching
           further objects by calling <c>match_object/1</c>.</p>
-        <p>If the keypos'th element of <c>Pattern</c> is bound, all
+        <p>If the keypos'th element of <c><anno>Pattern</anno></c> is bound, all
           objects of the table are matched. If the keypos'th element is
-          unbound, all objects of the table are matched, <c>N</c>
+          unbound, all objects of the table are matched, <c><anno>N</anno></c>
           objects at a time, until at least one object matches or the
           end of the table has been reached. The default, indicated by
-          giving <c>N</c> the value <c>default</c>, is to let the number
+          giving <c><anno>N</anno></c> the value <c>default</c>, is to let the number
           of objects vary depending on the sizes of the objects. If
-          <c>Name</c> is a version 9 table, all matching objects with
+          <c><anno>Name</anno></c> is a version 9 table, all matching objects with
           the same key are always returned in the same reply which
-          implies that more than N objects may sometimes be returned.
+          implies that more than <anno>N</anno> objects may sometimes be returned.
           </p>
         <p>The table should always be protected using
           <c>safe_fixtable/2</c> before calling <c>match_object/3</c>,
@@ -724,43 +678,31 @@ ok
       </desc>
     </func>
     <func>
-      <name>member(Name, Key) -> Bool | {error, Reason}</name>
+      <name name="member" arity="2"/>
       <fsummary>Test for occurrence of a key in a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Key = term()</v>
-        <v>Bool = bool()</v>
-      </type>
       <desc>
         <p>Works like <c>lookup/2</c>, but does not return the
           objects. The function returns <c>true</c> if one or more
-          elements of the table has the key <c>Key</c>, <c>false</c>
+          elements of the table has the key <c><anno>Key</anno></c>, <c>false</c>
           otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>next(Name, Key1) -> Key2 | '$end_of_table'</name>
+      <name name="next" arity="2"/>
       <fsummary>Return the next key in a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Key1 = Key2 = term()</v>
-      </type>
       <desc>
-        <p>Returns the key following <c>Key1</c> in the table
-          <c>Name</c> according to the table's internal order, or
+        <p>Returns the key following <c><anno>Key1</anno></c> in the table
+          <c><anno>Name</anno></c> according to the table's internal order, or
           <c>'$end_of_table'</c> if there is no next key.</p>
         <p>Should an error occur, the process is exited with an error
           tuple <c>{error, Reason}</c>.</p>
-        <p>Use <c>first/1</c> to find the first key in the table.</p>
+        <p>Use <seealso marker="#first/1"><c>first/1</c></seealso> to find
+          the first key in the table.</p>
       </desc>
     </func>
     <func>
-      <name>open_file(Filename) -> {ok, Reference} | {error, Reason}</name>
+      <name name="open_file" arity="1"/>
       <fsummary>Open an existing Dets table.</fsummary>
-      <type>
-        <v>FileName = file()</v>
-        <v>Reference = reference()</v>
-      </type>
       <desc>
         <p>Opens an existing table. If the table has not been properly
           closed, it will be repaired. The returned reference is to be
@@ -769,15 +711,12 @@ ok
       </desc>
     </func>
     <func>
-      <name>open_file(Name, Args) -> {ok, Name} | {error, Reason}</name>
+      <name name="open_file" arity="2"/>
       <fsummary>Open a Dets table.</fsummary>
-      <type>
-        <v>Name = atom()</v>
-      </type>
       <desc>
         <p>Opens a table. An empty Dets table is created if no file
           exists.</p>
-        <p>The atom <c>Name</c> is the name of the table. The table
+        <p>The atom <c><anno>Name</anno></c> is the name of the table. The table
           name must be provided in all subsequent operations on the
           table. The name can be used by other processes as well, and
           several process can share one table.
@@ -786,18 +725,20 @@ ok
           name and arguments, then the table will have two users. If one
           user closes the table, it still remains open until the second
           user closes the table.</p>
-        <p>The <c>Args</c> argument is a list of <c>{Key, Val}</c>
+        <p>The <c><anno>Args</anno></c> argument is a list of <c>{Key, Val}</c>
           tuples where the following values are allowed:</p>
         <list type="bulleted">
           <item>
-            <p><c>{access, access()}</c>. It is possible to open
+            <p><c>{access, <seealso marker="#type-access">
+              access()</seealso>}</c>. It is possible to open
               existing tables in read-only mode. A table which is opened
               in read-only mode is not subjected to the automatic file
               reparation algorithm if it is later opened after a crash.
               The default value is <c>read_write</c>.</p>
           </item>
           <item>
-            <p><c>{auto_save, auto_save()}</c>, the auto save
+            <p><c>{auto_save, <seealso marker="#type-auto_save">
+              auto_save()</seealso>}</c>, the auto save
               interval. If the interval is an integer <c>Time</c>, the
               table is flushed to disk whenever it is not accessed for
               <c>Time</c> milliseconds. A table that has been flushed
@@ -807,15 +748,18 @@ ok
               is 180000 (3 minutes).</p>
           </item>
           <item>
-            <p><c>{estimated_no_objects, int()}</c>. Equivalent to the
+            <p><c>{estimated_no_objects, <seealso marker="#type-no_slots">
+              no_slots()</seealso>}</c>. Equivalent to the
               <c>min_no_slots</c> option.</p>
           </item>
           <item>
-            <p><c>{file, file()}</c>, the name of the file to be
+            <p><c>{file, <seealso marker="file#type-name">
+              file:name()</seealso>}</c>, the name of the file to be
               opened. The default value is the name of the table.</p>
           </item>
           <item>
-            <p><c>{max_no_slots, no_slots()}</c>, the maximum number
+            <p><c>{max_no_slots, <seealso marker="#type-no_slots">
+              no_slots()</seealso>}</c>, the maximum number
               of slots that will be used. The default value as well as
               the maximal value is 32 M. Note that a higher value may
               increase the fragmentation of the table, and conversely,
@@ -824,14 +768,16 @@ ok
               9 tables.</p>
           </item>
           <item>
-            <p><c>{min_no_slots, no_slots()}</c>. Application
+            <p><c>{min_no_slots, <seealso marker="#type-no_slots">
+              no_slots()</seealso>}</c>. Application
               performance can be enhanced with this flag by specifying,
               when the table is created, the estimated number of
               different keys that will be stored in the table. The
               default value as well as the minimum value is 256.</p>
           </item>
           <item>
-            <p><c>{keypos, keypos()}</c>, the position of the
+            <p><c>{keypos, <seealso marker="#type-keypos">
+              keypos()</seealso>}</c>, the position of the
               element of each object to be used as key. The default
               value is 1. The ability to explicitly state the key
               position is most convenient when we want to store Erlang
@@ -839,7 +785,7 @@ ok
               name of the record type.</p>
           </item>
           <item>
-            <p><c>{ram_file, bool()}</c>, whether the table is to
+            <p><c>{ram_file, boolean()}</c>, whether the table is to
               be kept in RAM. Keeping the table in RAM may sound like an
               anomaly, but can enhance the performance of applications
               which open a table, insert a set of objects, and then
@@ -849,7 +795,7 @@ ok
           </item>
           <item>
             <p><c>{repair, Value}</c>. <c>Value</c> can be either
-              a <c>bool()</c> or the atom <c>force</c>. The flag
+              a <c>boolean()</c> or the atom <c>force</c>. The flag
               specifies whether the Dets server should invoke the
               automatic file reparation algorithm. The default is
               <c>true</c>. If <c>false</c> is specified, there is no
@@ -868,11 +814,12 @@ ok
               already open.</p>
           </item>
           <item>
-            <p><c>{type, type()}</c>, the type of the table. The
-              default value is <c>set</c>.</p>
+            <p><c>{type, <seealso marker="#type-type">type()</seealso>}</c>,
+              the type of the table. The default value is <c>set</c>.</p>
           </item>
           <item>
-            <p><c>{version, version()}</c>, the version of the format
+            <p><c>{version, <seealso marker="#type-version">
+              version()</seealso>}</c>, the version of the format
               used for the table. The default value is <c>9</c>. Tables
               on the format used before OTP R8 can be created by giving
               the value <c>8</c>. A version 8 table can be converted to
@@ -883,12 +830,8 @@ ok
       </desc>
     </func>
     <func>
-      <name>pid2name(Pid) -> {ok, Name} | undefined</name>
+      <name name="pid2name" arity="1"/>
       <fsummary>Return the name of the Dets table handled by a pid.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Pid = pid()</v>
-      </type>
       <desc>
         <p>Returns the name of the table given the pid of a process
           that handles requests to a table, or <c>undefined</c> if
@@ -897,12 +840,8 @@ ok
       </desc>
     </func>
     <func>
-      <name>repair_continuation(Continuation, MatchSpec) -> Continuation2</name>
+      <name name="repair_continuation" arity="2"/>
       <fsummary>Repair a continuation from select/1 or select/3.</fsummary>
-      <type>
-        <v>Continuation = Continuation2 = select_cont()</v>
-        <v>MatchSpec = match_spec()</v>
-      </type>
       <desc>
         <p>This function can be used to restore an opaque continuation
           returned by <c>select/3</c> or <c>select/1</c> if the
@@ -932,14 +871,11 @@ ok
       </desc>
     </func>
     <func>
-      <name>safe_fixtable(Name, Fix)</name>
+      <name name="safe_fixtable" arity="2"/>
       <fsummary>Fix a Dets table for safe traversal.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Fix = bool()</v>
-      </type>
       <desc>
-        <p>If <c>Fix</c> is <c>true</c>, the table <c>Name</c> is
+        <p>If <c><anno>Fix</anno></c> is <c>true</c>, the table
+          <c><anno>Name</anno></c> is
           fixed (once more) by the calling process, otherwise the table
           is released. The table is also released when a fixing process
           terminates.
@@ -961,17 +897,13 @@ ok
       </desc>
     </func>
     <func>
-      <name>select(Continuation) -> {Selection, Continuation2}  | '$end_of_table' | {error, Reason}</name>
+      <name name="select" arity="1"/>
       <fsummary>Apply a match specification to some objects stored in a Dets table.</fsummary>
-      <type>
-        <v>Continuation = Continuation2 = select_cont()</v>
-        <v>Selection = [term()]</v>
-      </type>
       <desc>
         <p>Applies a match specification to some objects stored in a
           table and returns a non-empty list of the results. The
           table, the match specification, and the number of objects
-          that are matched are all defined by <c>Continuation</c>,
+          that are matched are all defined by <c><anno>Continuation</anno></c>,
           which has been returned by a prior call to <c>select/1</c>
           or <c>select/3</c>.</p>
         <p>When all objects of the table have been matched,
@@ -979,20 +911,15 @@ ok
       </desc>
     </func>
     <func>
-      <name>select(Name, MatchSpec) -> Selection | {error, Reason}</name>
+      <name name="select" arity="2"/>
       <fsummary>Apply a match specification to all objects stored in a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>MatchSpec = match_spec()</v>
-        <v>Selection = [term()]</v>
-      </type>
       <desc>
         <p>Returns the results of applying the match specification
-          <c>MatchSpec</c> to all or some objects stored in the table
-          <c>Name</c>. The order of the objects is not specified. See
+          <c><anno>MatchSpec</anno></c> to all or some objects stored in the table
+          <c><anno>Name</anno></c>. The order of the objects is not specified. See
           the ERTS User's Guide for a description of match
           specifications.</p>
-        <p>If the keypos'th element of <c>MatchSpec</c> is
+        <p>If the keypos'th element of <c><anno>MatchSpec</anno></c> is
           unbound, the match specification is applied to all objects of
           the table. If the keypos'th element is bound, the match
           specification is applied to the objects with the right key(s)
@@ -1004,19 +931,12 @@ ok
       </desc>
     </func>
     <func>
-      <name>select(Name, MatchSpec, N) -> {Selection, Continuation}  | '$end_of_table' | {error, Reason}</name>
+      <name name="select" arity="3"/>
       <fsummary>Apply a match specification to the first chunk of objects stored in a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>MatchSpec = match_spec()</v>
-        <v>N = default | int()</v>
-        <v>Selection = [term()]</v>
-        <v>Continuation = select_cont()</v>
-      </type>
       <desc>
         <p>Returns the results of applying the match specification
-          <c>MatchSpec</c> to some or all objects stored in the table
-          <c>Name</c>. The order of the objects is not specified. See
+          <c><anno>MatchSpec</anno></c> to some or all objects stored in the table
+          <c><anno>Name</anno></c>. The order of the objects is not specified. See
           the ERTS User's Guide for a description of match
           specifications.</p>
         <p>A tuple of the results of applying the match specification
@@ -1024,18 +944,18 @@ ok
           in which case <c>'$end_of_table'</c> is returned. The
           continuation is to be used when matching further objects by
           calling <c>select/1</c>.</p>
-        <p>If the keypos'th element of <c>MatchSpec</c> is bound, the
+        <p>If the keypos'th element of <c><anno>MatchSpec</anno></c> is bound, the
           match specification is applied to all objects of the table
           with the right key(s). If the keypos'th element of
-          <c>MatchSpec</c> is unbound, the match specification is
-          applied to all objects of the table, <c>N</c> objects at a
+          <c><anno>MatchSpec</anno></c> is unbound, the match specification is
+          applied to all objects of the table, <c><anno>N</anno></c> objects at a
           time, until at least one object matches or the end of the
           table has been reached. The default, indicated by giving
-          <c>N</c> the value <c>default</c>, is to let the number of
+          <c><anno>N</anno></c> the value <c>default</c>, is to let the number of
           objects vary depending on the sizes of the objects. If
-          <c>Name</c> is a version 9 table, all objects with the same
+          <c><anno>Name</anno></c> is a version 9 table, all objects with the same
           key are always handled at the same time which implies that the
-          match specification may be applied to more than N objects.
+          match specification may be applied to more than <anno>N</anno> objects.
           </p>
         <p>The table should always be protected using
           <c>safe_fixtable/2</c> before calling <c>select/3</c>, or
@@ -1043,48 +963,35 @@ ok
       </desc>
     </func>
     <func>
-      <name>select_delete(Name, MatchSpec) -> N | {error, Reason}</name>
+      <name name="select_delete" arity="2"/>
       <fsummary>Delete all objects that match a given pattern from a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>MatchSpec = match_spec()</v>
-        <v>N = int()</v>
-      </type>
       <desc>
-        <p>Deletes each object from the table <c>Name</c> such that
-          applying the match specification <c>MatchSpec</c> to the
+        <p>Deletes each object from the table <c><anno>Name</anno></c> such that
+          applying the match specification <c><anno>MatchSpec</anno></c> to the
           object returns the value <c>true</c>. See the ERTS
           User's Guide for a description of match
           specifications. Returns the number of deleted objects.</p>
-        <p>If the keypos'th element of <c>MatchSpec</c> is
+        <p>If the keypos'th element of <c><anno>MatchSpec</anno></c> is
           bound, the match specification is applied to the objects
           with the right key(s) only.</p>
       </desc>
     </func>
     <func>
-      <name>slot(Name, I) -> '$end_of_table' | [Object] | {error, Reason}</name>
+      <name name="slot" arity="2"/>
       <fsummary>Return the list of objects associated with a slot of a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>I = int()</v>
-        <v>Object = object()</v>
-      </type>
       <desc>
         <p>The objects of a table are distributed among slots,
           starting with slot <c>0</c> and ending with slot n. This
           function returns the list of objects associated with slot
-          <c>I</c>. If <c>I</c> is greater than n <c>'$end_of_table'</c>
-          is returned.</p>
+          <c><anno>I</anno></c>. If <c><anno>I</anno></c> is greater than n
+          <c>'$end_of_table'</c> is returned.</p>
       </desc>
     </func>
     <func>
-      <name>sync(Name) -> ok | {error, Reason}</name>
+      <name name="sync" arity="1"/>
       <fsummary>Ensure that all updates made to a Dets table are written to disk.</fsummary>
-      <type>
-        <v>Name = name()</v>
-      </type>
       <desc>
-        <p>Ensures that all updates made to the table <c>Name</c> are
+        <p>Ensures that all updates made to the table <c><anno>Name</anno></c> are
           written to disk. This also applies to tables which have been
           opened with the <c>ram_file</c> flag set to <c>true</c>. In
           this case, the contents of the RAM file are flushed to
@@ -1095,25 +1002,17 @@ ok
       </desc>
     </func>
     <func>
-      <name>table(Name [, Options]) -> QueryHandle</name>
+      <name name="table" arity="1"/>
+      <name name="table" arity="2"/>
       <fsummary>Return a QLC query handle.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>QueryHandle = -&nbsp;a query handle, see qlc(3)&nbsp;-</v>
-        <v>Options = [Option] | Option</v>
-        <v>Option = {n_objects, Limit} | {traverse, TraverseMethod}</v>
-        <v>Limit = default | integer() >= 1</v>
-        <v>TraverseMethod = first_next | select | {select, MatchSpec}</v>
-        <v>MatchSpec = match_spec()</v>
-      </type>
       <desc>
-        <p>          <marker id="qlc_table"></marker>
-Returns a QLC (Query List
+        <p><marker id="qlc_table"></marker>
+          Returns a QLC (Query List
           Comprehension) query handle. The module <c>qlc</c>
           implements a query language aimed mainly at Mnesia but Ets
           tables, Dets tables, and lists are also recognized by <c>qlc</c>
           as sources of data. Calling <c>dets:table/1,2</c> is the
-          means to make the Dets table <c>Name</c> usable to <c>qlc</c>.</p>
+          means to make the Dets table <c><anno>Name</anno></c> usable to <c>qlc</c>.</p>
         <p>When there are only simple restrictions on the key position
           <c>qlc</c> uses <c>dets:lookup/2</c> to look up the keys, but when
           that is not possible the whole table is traversed. The
@@ -1137,7 +1036,8 @@ Returns a QLC (Query List
               specification that matches all objects.</p>
           </item>
           <item>
-            <p><c>{select, MatchSpec}</c>. As for <c>select</c>
+            <p><c>{select, <seealso marker="#type-match_spec">
+              match_spec()}</seealso></c>. As for <c>select</c>
               the table is traversed by calling <c>dets:select/3</c>
               and <c>dets:select/1</c>. The difference is that the
               match specification is explicitly given. This is how to
@@ -1166,35 +1066,23 @@ true        </pre>
       </desc>
     </func>
     <func>
-      <name>to_ets(Name, EtsTab) -> EtsTab | {error, Reason}</name>
+      <name name="to_ets" arity="2"/>
       <fsummary>Insert all objects of a Dets table into an Ets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>EtsTab = -&nbsp;see ets(3)&nbsp;-</v>
-      </type>
       <desc>
-        <p>Inserts the objects of the Dets table <c>Name</c> into the
-          Ets table <c>EtsTab</c>. The order in which the objects are
+        <p>Inserts the objects of the Dets table <c><anno>Name</anno></c> into the
+          Ets table <c><anno>EtsTab</anno></c>. The order in which the objects are
           inserted is not specified. The existing objects of the Ets
           table are kept unless overwritten.</p>
       </desc>
     </func>
     <func>
-      <name>traverse(Name, Fun) -> Return | {error, Reason}</name>
+      <name name="traverse" arity="2"/>
       <fsummary>Apply a function to all or some objects stored in a Dets table.</fsummary>
-      <type>
-        <v>Fun = fun(Object) -> FunReturn</v>
-        <v>FunReturn = continue | {continue, Val} | {done, Value}</v>
-        <v>Val = Value = term()</v>
-        <v>Name = name()</v>
-        <v>Object = object()</v>
-        <v>Return = [term()]</v>
-      </type>
       <desc>
-        <p>Applies <c>Fun</c> to each object stored in the table
-          <c>Name</c> in some unspecified order. Different actions are
-          taken depending on the return value of <c>Fun</c>. The
-          following <c>Fun</c> return values are allowed:</p>
+        <p>Applies <c><anno>Fun</anno></c> to each object stored in the table
+          <c><anno>Name</anno></c> in some unspecified order. Different actions are
+          taken depending on the return value of <c><anno>Fun</anno></c>. The
+          following <c><anno>Fun</anno></c> return values are allowed:</p>
         <taglist>
           <tag><c>continue</c></tag>
           <item>
@@ -1206,35 +1094,31 @@ fun(X) -> io:format("~p~n", [X]), continue end.            </pre>
           </item>
           <tag><c>{continue, Val}</c></tag>
           <item>
-            <p>Continue the traversal and accumulate <c>Val</c>. The
+            <p>Continue the traversal and accumulate <c><anno>Val</anno></c>. The
               following function is supplied in order to collect all
               objects of a table in a list: </p>
             <pre>
 fun(X) -> {continue, X} end.            </pre>
           </item>
-          <tag><c>{done, Value}</c></tag>
+          <tag><c>{done, <anno>Value</anno>}</c></tag>
           <item>
-            <p>Terminate the traversal and return <c>[Value | Acc]</c>.</p>
+            <p>Terminate the traversal and return <c>[<anno>Value</anno> | Acc]</c>.</p>
           </item>
         </taglist>
-        <p>Any other value returned by <c>Fun</c> terminates the
+        <p>Any other value returned by <c><anno>Fun</anno></c> terminates the
           traversal and is immediately returned.
           </p>
       </desc>
     </func>
     <func>
-      <name>update_counter(Name, Key, Increment) -> Result</name>
+      <name name="update_counter" arity="3"/>
       <fsummary>Update a counter object stored in a Dets table.</fsummary>
-      <type>
-        <v>Name = name()</v>
-        <v>Key = term()</v>
-        <v>Increment = {Pos, Incr} | Incr</v>
-        <v>Pos = Incr = Result = integer()</v>
-      </type>
       <desc>
-        <p>Updates the object with key <c>Key</c> stored in the table
-          <c>Name</c> of type <c>set</c> by adding <c>Incr</c> to the
-          element at the <c>Pos</c>:th position. The new counter value
+        <p>Updates the object with key <c><anno>Key</anno></c> stored in the
+          table <c><anno>Name</anno></c> of type <c>set</c> by adding
+          <c><anno>Incr</anno></c> to the
+          element at the <c><anno>Pos</anno></c>:th position.
+          The new counter value
           is returned. If no position is specified, the element directly
           following the key is updated.</p>
         <p>This functions provides a way of updating a counter,
@@ -1252,4 +1136,3 @@ fun(X) -> {continue, X} end.            </pre>
       <seealso marker="qlc">qlc(3)</seealso></p>
   </section>
 </erlref>
-
diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml
index 0cc76e0c78..b01acd02bf 100644
--- a/lib/stdlib/doc/src/dict.xml
+++ b/lib/stdlib/doc/src/dict.xml
@@ -39,174 +39,120 @@
       they do not compare equal (<c>==</c>).</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-dictionary()
-  as returned by new/0</code>
-  </section>
+  <datatypes>
+    <datatype>
+      <name><marker id="type-dict">dict()</marker></name>
+      <desc><p>Dictionary as returned by <c>new/0</c>.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>append(Key, Value, Dict1) -> Dict2</name>
+      <name name="append" arity="3"/>
       <fsummary>Append a value to keys in a dictionary</fsummary>
-      <type>
-        <v>Key = Value = term()</v>
-        <v>Dict1 = Dict2 = dictionary()</v>
-      </type>
       <desc>
-        <p>This function appends a new <c>Value</c> to the current list
-			  of values associated with <c>Key</c>.</p>
-     </desc>
+        <p>This function appends a new <c><anno>Value</anno></c> to the current list
+          of values associated with <c><anno>Key</anno></c>.</p>
+      </desc>
     </func>
     <func>
-      <name>append_list(Key, ValList, Dict1) -> Dict2</name>
+      <name name="append_list" arity="3"/>
       <fsummary>Append new values to keys in a dictionary</fsummary>
-      <type>
-        <v>ValList = [Value]</v>
-        <v>Key = Value = term()</v>
-        <v>Dict1 = Dict2 = dictionary()</v>
-      </type>
       <desc>
-        <p>This function appends a list of values <c>ValList</c> to
-          the current list of values associated with <c>Key</c>. An
+        <p>This function appends a list of values <c><anno>ValList</anno></c> to
+          the current list of values associated with <c><anno>Key</anno></c>. An
           exception is generated if the initial value associated with
-          <c>Key</c> is not a list of values.</p>
+          <c><anno>Key</anno></c> is not a list of values.</p>
       </desc>
     </func>
     <func>
-      <name>erase(Key, Dict1) -> Dict2</name>
+      <name name="erase" arity="2"/>
       <fsummary>Erase a key from a dictionary</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Dict1 = Dict2 = dictionary()</v>
-      </type>
       <desc>
         <p>This function erases all items with a given key from a
           dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>fetch(Key, Dict) -> Value</name>
+      <name name="fetch" arity="2"/>
       <fsummary>Look-up values in a dictionary</fsummary>
-      <type>
-        <v>Key = Value = term()</v>
-        <v>Dict = dictionary()</v>
-      </type>
       <desc>
-        <p>This function returns the value associated with <c>Key</c>
-          in the dictionary <c>Dict</c>. <c>fetch</c> assumes that
-          the <c>Key</c> is present in the dictionary and an exception
-          is generated if <c>Key</c> is not in the dictionary.</p>
+        <p>This function returns the value associated with <c><anno>Key</anno></c>
+          in the dictionary <c><anno>Dict</anno></c>. <c>fetch</c> assumes that
+          the <c><anno>Key</anno></c> is present in the dictionary and an exception
+          is generated if <c><anno>Key</anno></c> is not in the dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>fetch_keys(Dict) -> Keys</name>
+      <name name="fetch_keys" arity="1"/>
       <fsummary>Return all keys in a dictionary</fsummary>
-      <type>
-        <v>Dict = dictionary()</v>
-        <v>Keys = [term()]</v>
-      </type>
       <desc>
         <p>This function returns a list of all keys in the dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>filter(Pred, Dict1) -> Dict2</name>
+      <name name="filter" arity="2"/>
       <fsummary>Choose elements which satisfy a predicate</fsummary>
-      <type>
-        <v>Pred = fun(Key, Value) -> bool()</v>
-        <v>&nbsp;Key = Value = term()</v>
-        <v>Dict1 = Dict2 = dictionary()</v>
-      </type>
       <desc>
-        <p><c>Dict2</c> is a dictionary of all keys and values in
-          <c>Dict1</c> for which <c>Pred(Key, Value)</c> is <c>true</c>.</p>
+        <p><c><anno>Dict2</anno></c> is a dictionary of all keys and values in
+          <c><anno>Dict1</anno></c> for which <c><anno>Pred</anno>(<anno>Key</anno>, <anno>Value</anno>)</c> is <c>true</c>.</p>
       </desc>
     </func>
     <func>
-      <name>find(Key, Dict) -> {ok, Value} | error</name>
+      <name name="find" arity="2"/>
       <fsummary>Search for a key in a dictionary</fsummary>
-      <type>
-        <v>Key = Value = term()</v>
-        <v>Dict = dictionary()</v>
-      </type>
       <desc>
         <p>This function searches for a key in a dictionary. Returns
-          <c>{ok, Value}</c> where <c>Value</c> is the value associated
-          with <c>Key</c>, or <c>error</c> if the key is not present in
+          <c>{ok, <anno>Value</anno>}</c> where <c><anno>Value</anno></c> is the value associated
+          with <c><anno>Key</anno></c>, or <c>error</c> if the key is not present in
           the dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>fold(Fun, Acc0, Dict) -> Acc1</name>
+      <name name="fold" arity="3"/>
       <fsummary>Fold a function over a dictionary</fsummary>
-      <type>
-        <v>Fun = fun(Key, Value, AccIn) -> AccOut</v>
-        <v>Key = Value = term()</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>Dict = dictionary()</v>
-      </type>
       <desc>
-        <p>Calls <c>Fun</c> on successive keys and values of
-          <c>Dict</c> together with an extra argument <c>Acc</c>
-          (short for accumulator). <c>Fun</c> must return a new
-          accumulator which is passed to the next call. <c>Acc0</c> is
+        <p>Calls <c><anno>Fun</anno></c> on successive keys and values of
+          <c><anno>Dict</anno></c> together with an extra argument <c>Acc</c>
+          (short for accumulator). <c><anno>Fun</anno></c> must return a new
+          accumulator which is passed to the next call. <c><anno>Acc0</anno></c> is
           returned if the list is empty. The evaluation order is
           undefined.</p>
       </desc>
     </func>
     <func>
-      <name>from_list(List) -> Dict</name>
+      <name name="from_list" arity="1"/>
       <fsummary>Convert a list of pairs to a dictionary</fsummary>
-      <type>
-        <v>List = [{Key, Value}]</v>
-        <v>Dict = dictionary()</v>
-      </type>
       <desc>
-        <p>This function converts the <c>Key</c> - <c>Value</c> list
-          <c>List</c> to a dictionary.</p>
+        <p>This function converts the <c><anno>Key</anno></c> - <c><anno>Value</anno></c> list
+          <c><anno>List</anno></c> to a dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>is_key(Key, Dict) -> bool()</name>
+      <name name="is_key" arity="2"/>
       <fsummary>Test if a key is in a dictionary</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Dict = dictionary()</v>
-      </type>
       <desc>
-        <p>This function tests if <c>Key</c> is contained in
-          the dictionary <c>Dict</c>.</p>
+        <p>This function tests if <c><anno>Key</anno></c> is contained in
+          the dictionary <c><anno>Dict</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>map(Fun, Dict1) -> Dict2</name>
+      <name name="map" arity="2"/>
       <fsummary>Map a function over a dictionary</fsummary>
-      <type>
-        <v>Fun = fun(Key, Value1) -> Value2</v>
-        <v>&nbsp;Key = Value1 = Value2 = term()</v>
-        <v>Dict1 = Dict2 = dictionary()</v>
-      </type>
       <desc>
-        <p><c>map</c> calls <c>Func</c> on successive keys and values
-          of <c>Dict</c> to return a new value for each key.
+        <p><c>map</c> calls <c><anno>Fun</anno></c> on successive keys and values
+          of <c><anno>Dict1</anno></c> to return a new value for each key.
           The evaluation order is undefined.</p>
       </desc>
     </func>
     <func>
-      <name>merge(Fun, Dict1, Dict2) -> Dict3</name>
+      <name name="merge" arity="3"/>
       <fsummary>Merge two dictionaries</fsummary>
-      <type>
-        <v>Fun = fun(Key, Value1, Value2) -> Value</v>
-        <v>&nbsp;Key = Value1 = Value2 = Value3 = term()</v>
-        <v>Dict1 = Dict2 = Dict3 = dictionary()</v>
-      </type>
       <desc>
-        <p><c>merge</c> merges two dictionaries, <c>Dict1</c> and
-          <c>Dict2</c>, to create a new dictionary.  All the <c>Key</c>
-          - <c>Value</c> pairs from both dictionaries are included in
+        <p><c>merge</c> merges two dictionaries, <c><anno>Dict1</anno></c> and
+          <c><anno>Dict2</anno></c>, to create a new dictionary.  All the <c><anno>Key</anno></c>
+          - <c><anno>Value</anno></c> pairs from both dictionaries are included in
           the new dictionary.  If a key occurs in both dictionaries then
-          <c>Fun</c> is called with the key and both values to return a
+          <c><anno>Fun</anno></c> is called with the key and both values to return a
           new value. <c>merge</c> could be defined as:</p>
         <code type="none">
 merge(Fun, D1, D2) ->
@@ -217,75 +163,52 @@ merge(Fun, D1, D2) ->
       </desc>
     </func>
     <func>
-      <name>new() -> dictionary()</name>
+      <name name="new" arity="0"/>
       <fsummary>Create a dictionary</fsummary>
       <desc>
         <p>This function creates a new dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>size(Dict) -> int()</name>
+      <name name="size" arity="1"/>
       <fsummary>Return the number of elements in a dictionary</fsummary>
-      <type>
-        <v>Dict = dictionary()</v>
-      </type>
       <desc>
-        <p>Returns the number of elements in a <c>Dict</c>.</p>
+        <p>Returns the number of elements in a <c><anno>Dict</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>store(Key, Value, Dict1) -> Dict2</name>
+      <name name="store" arity="3"/>
       <fsummary>Store a value in a dictionary</fsummary>
-      <type>
-        <v>Key = Value = term()</v>
-        <v>Dict1 = Dict2 = dictionary()</v>
-      </type>
       <desc>
-        <p>This function stores a <c>Key</c> - <c>Value</c> pair in a
-          dictionary. If the <c>Key</c> already exists in <c>Dict1</c>,
-          the associated value is replaced by <c>Value</c>.</p>
+        <p>This function stores a <c><anno>Key</anno></c> - <c><anno>Value</anno></c> pair in a
+          dictionary. If the <c><anno>Key</anno></c> already exists in <c><anno>Dict1</anno></c>,
+          the associated value is replaced by <c><anno>Value</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>to_list(Dict) -> List</name>
+      <name name="to_list" arity="1"/>
       <fsummary>Convert a dictionary to a list of pairs</fsummary>
-      <type>
-        <v>Dict = dictionary()</v>
-        <v>List = [{Key, Value}]</v>
-      </type>
       <desc>
         <p>This function converts the dictionary to a list
           representation.</p>
       </desc>
     </func>
     <func>
-      <name>update(Key, Fun, Dict1) -> Dict2</name>
+      <name name="update" arity="3"/>
       <fsummary>Update a value in a dictionary</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Fun = fun(Value1) -> Value2</v>
-        <v>&nbsp;Value1 = Value2 = term()</v>
-        <v>Dict1 = Dict2 = dictionary()</v>
-      </type>
       <desc>
-        <p>Update a value in a dictionary by calling <c>Fun</c> on
+        <p>Update a value in a dictionary by calling <c><anno>Fun</anno></c> on
           the value to get a new value.  An exception is generated if
-          <c>Key</c> is not present in the dictionary.</p>
+          <c><anno>Key</anno></c> is not present in the dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>update(Key, Fun, Initial, Dict1) -> Dict2</name>
+      <name name="update" arity="4"/>
       <fsummary>Update a value in a dictionary</fsummary>
-      <type>
-        <v>Key = Initial = term()</v>
-        <v>Fun = fun(Value1) -> Value2</v>
-        <v>&nbsp;Value1 = Value2 = term()</v>
-        <v>Dict1 = Dict2 = dictionary()</v>
-      </type>
       <desc>
-        <p>Update a value in a dictionary by calling <c>Fun</c> on
-          the value to get a new value.  If <c>Key</c> is not present
-          in the dictionary then <c>Initial</c> will be stored as
+        <p>Update a value in a dictionary by calling <c><anno>Fun</anno></c> on
+          the value to get a new value.  If <c><anno>Key</anno></c> is not present
+          in the dictionary then <c><anno>Initial</anno></c> will be stored as
           the first value. For example <c>append/3</c> could be defined
           as:</p>
         <code type="none">
@@ -294,17 +217,12 @@ append(Key, Val, D) ->
       </desc>
     </func>
     <func>
-      <name>update_counter(Key, Increment, Dict1) -> Dict2</name>
+      <name name="update_counter" arity="3"/>
       <fsummary>Increment a value in a dictionary</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Increment = number()</v>
-        <v>Dict1 = Dict2 = dictionary()</v>
-      </type>
       <desc>
-        <p>Add <c>Increment</c> to the value associated with <c>Key</c>
-          and store this value.  If <c>Key</c> is not present in
-          the dictionary then <c>Increment</c> will be stored as
+        <p>Add <c><anno>Increment</anno></c> to the value associated with <c><anno>Key</anno></c>
+          and store this value.  If <c><anno>Key</anno></c> is not present in
+          the dictionary then <c><anno>Increment</anno></c> will be stored as
           the first value.</p>
         <p>This could be defined as:</p>
         <code type="none">
diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml
index ad256e671f..0afc70ebe0 100644
--- a/lib/stdlib/doc/src/digraph.xml
+++ b/lib/stdlib/doc/src/digraph.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -87,67 +87,79 @@
       is a digraph that has no cycles.
       </p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="d_type"/>
+    </datatype>
+    <datatype>
+      <name name="d_cyclicity"/>
+    </datatype>
+    <datatype>
+      <name name="d_protection"/>
+    </datatype>
+    <datatype>
+      <name><marker id="type-digraph">digraph()</marker></name>
+      <desc><p>A digraph as returned by <c>new/0,1</c>.</p></desc>
+    </datatype>
+    <datatype>
+      <name><marker id="type-edge">edge()</marker></name>
+    </datatype>
+    <datatype>
+      <name name="label"/>
+    </datatype>
+    <datatype>
+      <name><marker id="type-vertex">vertex()</marker></name>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>add_edge(G, E, V1, V2, Label) -> edge() | {error, Reason}</name>
-      <name>add_edge(G, V1, V2, Label) -> edge() | {error, Reason}</name>
-      <name>add_edge(G, V1, V2) -> edge() | {error, Reason}</name>
+      <name name="add_edge" arity="3"/>
+      <name name="add_edge" arity="4"/>
+      <name name="add_edge" arity="5"/>
       <fsummary>Add an edge to a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>E = edge()</v>
-        <v>V1 = V2 = vertex()</v>
-        <v>Label = label()</v>
-        <v>Reason = {bad_edge, Path} | {bad_vertex, V}</v>
-        <v>Path = [vertex()]</v>
-      </type>
+      <type name="add_edge_err_rsn"/>
       <desc>
-        <p><c>add_edge/5</c> creates (or modifies) the edge <c>E</c>
-          of the digraph <c>G</c>, using <c>Label</c> as the (new)
+        <p><c>add_edge/5</c> creates (or modifies) the edge <c><anno>E</anno></c>
+          of the digraph <c><anno>G</anno></c>, using <c><anno>Label</anno></c> as the (new)
           <seealso marker="#label">label</seealso> of the edge. The
           edge is <seealso marker="#emanate">emanating</seealso> from
-          <c>V1</c> and <seealso marker="#incident">incident</seealso>
-          on <c>V2</c>. Returns <c>E</c>.
+          <c><anno>V1</anno></c> and <seealso marker="#incident">incident</seealso>
+          on <c><anno>V2</anno></c>. Returns <c><anno>E</anno></c>.
           </p>
-        <p><c>add_edge(G,&nbsp;V1,&nbsp;V2,&nbsp;Label)</c> is
+        <p><c>add_edge(<anno>G</anno>,&nbsp;<anno>V1</anno>,&nbsp;<anno>V2</anno>,&nbsp;<anno>Label</anno>)</c> is
           equivalent to
-          <c>add_edge(G,&nbsp;E,&nbsp;V1,&nbsp;V2,&nbsp;Label)</c>,
-          where <c>E</c> is a created edge. The created edge is
+          <c>add_edge(<anno>G</anno>,&nbsp;<anno>E</anno>,&nbsp;<anno>V1</anno>,&nbsp;<anno>V2</anno>,&nbsp;<anno>Label</anno>)</c>,
+          where <c><anno>E</anno></c> is a created edge. The created edge is
           represented by the term <c>['$e'&nbsp;|&nbsp;N]</c>, where N
           is an integer&nbsp;&gt;=&nbsp;0.
           </p>
-        <p><c>add_edge(G,&nbsp;V1,&nbsp;V2)</c> is equivalent to
-          <c>add_edge(G,&nbsp;V1,&nbsp;V2,&nbsp;[])</c>.
+        <p><c>add_edge(<anno>G</anno>,&nbsp;<anno>V1</anno>,&nbsp;<anno>V2</anno>)</c> is equivalent to
+          <c>add_edge(<anno>G</anno>,&nbsp;<anno>V1</anno>,&nbsp;<anno>V2</anno>,&nbsp;[])</c>.
           </p>
         <p>If the edge would create a cycle in 
 	  an <seealso marker="#acyclic_digraph">acyclic digraph</seealso>,
-	  then <c>{error,&nbsp;{bad_edge,&nbsp;Path}}</c> is returned. If
-          either of <c>V1</c> or <c>V2</c> is not a vertex of the
-          digraph <c>G</c>, then
-          <c>{error,&nbsp;{bad_vertex,&nbsp;</c>V<c>}}</c> is
-          returned, V&nbsp;=&nbsp;<c>V1</c> or
-          V&nbsp;=&nbsp;<c>V2</c>.
+	  then <c>{error,&nbsp;{bad_edge,&nbsp;<anno>Path</anno>}}</c> is returned. If
+          either of <c><anno>V1</anno></c> or <c><anno>V2</anno></c> is not a vertex of the
+          digraph <c><anno>G</anno></c>, then
+          <c>{error,&nbsp;{bad_vertex,&nbsp;</c><anno>V</anno><c>}}</c> is
+          returned, <anno>V</anno>&nbsp;=&nbsp;<c><anno>V1</anno></c> or
+          <anno>V</anno>&nbsp;=&nbsp;<c><anno>V2</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>add_vertex(G, V, Label) -> vertex()</name>
-      <name>add_vertex(G, V) -> vertex()</name>
-      <name>add_vertex(G) -> vertex()</name>
+      <name name="add_vertex" arity="1"/>
+      <name name="add_vertex" arity="2"/>
+      <name name="add_vertex" arity="3"/>
       <fsummary>Add or modify a vertex of a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V = vertex()</v>
-        <v>Label = label()</v>
-      </type>
       <desc>
-        <p><c>add_vertex/3</c> creates (or modifies) the vertex <c>V</c>
-          of the digraph <c>G</c>, using <c>Label</c> as the (new)
+        <p><c>add_vertex/3</c> creates (or modifies) the vertex <c><anno>V</anno></c>
+          of the digraph <c><anno>G</anno></c>, using <c><anno>Label</anno></c> as the (new)
           <seealso marker="#label">label</seealso> of the
-          vertex. Returns <c>V</c>.
+          vertex. Returns <c><anno>V</anno></c>.
           </p>
-        <p><c>add_vertex(G,&nbsp;V)</c> is equivalent to
-          <c>add_vertex(G,&nbsp;V,&nbsp;[])</c>.
+        <p><c>add_vertex(<anno>G</anno>,&nbsp;<anno>V</anno>)</c> is equivalent to
+          <c>add_vertex(<anno>G</anno>,&nbsp;<anno>V</anno>,&nbsp;[])</c>.
           </p>
         <p><c>add_vertex/1</c> creates a vertex using the empty list
           as label, and returns the created vertex. The created vertex
@@ -157,304 +169,227 @@
       </desc>
     </func>
     <func>
-      <name>del_edge(G, E) -> true</name>
+      <name name="del_edge" arity="2"/>
       <fsummary>Delete an edge from a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>E = edge()</v>
-      </type>
       <desc>
-        <p>Deletes the edge <c>E</c> from the digraph <c>G</c>.
+        <p>Deletes the edge <c><anno>E</anno></c> from the digraph <c><anno>G</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>del_edges(G, Edges) -> true</name>
+      <name name="del_edges" arity="2"/>
       <fsummary>Delete edges from a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>Edges = [edge()]</v>
-      </type>
       <desc>
-        <p>Deletes the edges in the list <c>Edges</c> from the digraph
-          <c>G</c>.
+        <p>Deletes the edges in the list <c><anno>Edges</anno></c> from the digraph
+          <c><anno>G</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>del_path(G, V1, V2) -> true</name>
+      <name name="del_path" arity="3"/>
       <fsummary>Delete paths from a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V1 = V2 = vertex()</v>
-      </type>
       <desc>
-        <p>Deletes edges from the digraph <c>G</c> until there are no
+        <p>Deletes edges from the digraph <c><anno>G</anno></c> until there are no
           <seealso marker="#path">paths</seealso> from the vertex
-          <c>V1</c> to the vertex <c>V2</c>.
+          <c><anno>V1</anno></c> to the vertex <c><anno>V2</anno></c>.
           </p>
         <p>A sketch of the procedure employed: Find an arbitrary
           <seealso marker="#simple_path">simple path</seealso>
-          v[1],&nbsp;v[2],&nbsp;...,&nbsp;v[k] from <c>V1</c> to
-          <c>V2</c> in <c>G</c>. Remove all edges of 
-	  <c>G</c> <seealso marker="#emanate">emanating</seealso> from v[i] 
+          v[1],&nbsp;v[2],&nbsp;...,&nbsp;v[k] from <c><anno>V1</anno></c> to
+          <c><anno>V2</anno></c> in <c><anno>G</anno></c>. Remove all edges of
+	  <c><anno>G</anno></c> <seealso marker="#emanate">emanating</seealso> from v[i]
 	  and <seealso marker="#incident">incident</seealso> to v[i+1] for
           1&nbsp;&lt;=&nbsp;i&nbsp;&lt;&nbsp;k (including multiple
-          edges). Repeat until there is no path between <c>V1</c> and
-          <c>V2</c>.
+          edges). Repeat until there is no path between <c><anno>V1</anno></c> and
+          <c><anno>V2</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>del_vertex(G, V) -> true</name>
+      <name name="del_vertex" arity="2"/>
       <fsummary>Delete a vertex from a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V = vertex()</v>
-      </type>
       <desc>
-        <p>Deletes the vertex <c>V</c> from the digraph <c>G</c>. Any
+        <p>Deletes the vertex <c><anno>V</anno></c> from the digraph <c><anno>G</anno></c>. Any
           edges <seealso marker="#emanate">emanating</seealso> from
-          <c>V</c> or <seealso marker="#incident">incident</seealso>
-          on <c>V</c> are also deleted.
+          <c><anno>V</anno></c> or <seealso marker="#incident">incident</seealso>
+          on <c><anno>V</anno></c> are also deleted.
           </p>
       </desc>
     </func>
     <func>
-      <name>del_vertices(G, Vertices) -> true</name>
+      <name name="del_vertices" arity="2"/>
       <fsummary>Delete vertices from a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
-        <p>Deletes the vertices in the list <c>Vertices</c> from the
-          digraph <c>G</c>.
+        <p>Deletes the vertices in the list <c><anno>Vertices</anno></c> from the
+          digraph <c><anno>G</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>delete(G) -> true</name>
+      <name name="delete" arity="1"/>
       <fsummary>Delete a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-      </type>
       <desc>
-        <p>Deletes the digraph <c>G</c>. This call is important
-          because digraphs are implemented with <c>Ets</c>. There is
-          no garbage collection of <c>Ets</c> tables. The digraph
+        <p>Deletes the digraph <c><anno>G</anno></c>. This call is important
+          because digraphs are implemented with <c>ETS</c>. There is
+          no garbage collection of <c>ETS</c> tables. The digraph
           will, however, be deleted if the process that created the
           digraph terminates.
           </p>
       </desc>
     </func>
     <func>
-      <name>edge(G, E) -> {E, V1, V2, Label} | false</name>
+      <name name="edge" arity="2"/>
       <fsummary>Return the vertices and the label of an edge  of a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>E = edge()</v>
-        <v>V1 = V2 = vertex()</v>
-        <v>Label = label()</v>
-      </type>
       <desc>
-        <p>Returns <c>{E,&nbsp;V1,&nbsp;V2,&nbsp;Label}</c> where
-          <c>Label</c> is the <seealso marker="#label">label</seealso>
+        <p>Returns <c>{<anno>E</anno>,&nbsp;<anno>V1</anno>,&nbsp;<anno>V2</anno>,&nbsp;<anno>Label</anno>}</c> where
+          <c><anno>Label</anno></c> is the <seealso marker="#label">label</seealso>
           of the edge 
-	  <c>E</c> <seealso marker="#emanate">emanating</seealso> from 
-	  <c>V1</c> and <seealso marker="#incident">incident</seealso> on 
-	  <c>V2</c> of the digraph <c>G</c>.
-	  If there is no edge <c>E</c> of the
-          digraph <c>G</c>, then <c>false</c> is returned.
+	  <c><anno>E</anno></c> <seealso marker="#emanate">emanating</seealso> from
+	  <c><anno>V1</anno></c> and <seealso marker="#incident">incident</seealso> on
+	  <c><anno>V2</anno></c> of the digraph <c><anno>G</anno></c>.
+	  If there is no edge <c><anno>E</anno></c> of the
+          digraph <c><anno>G</anno></c>, then <c>false</c> is returned.
           </p>
       </desc>
     </func>
     <func>
-      <name>edges(G) -> Edges</name>
+      <name name="edges" arity="1"/>
       <fsummary>Return all edges of a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>Edges = [edge()]</v>
-      </type>
       <desc>
-        <p>Returns a list of all edges of the digraph <c>G</c>, in
+        <p>Returns a list of all edges of the digraph <c><anno>G</anno></c>, in
           some unspecified order.
           </p>
       </desc>
     </func>
     <func>
-      <name>edges(G, V) -> Edges</name>
+      <name name="edges" arity="2"/>
       <fsummary>Return the edges emanating from or incident on  a vertex of a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V = vertex()</v>
-        <v>Edges = [edge()]</v>
-      </type>
       <desc>
         <p>Returns a list of all 
 	edges <seealso marker="#emanate">emanating</seealso> from 
-	or <seealso marker="#incident">incident</seealso> on <c>V</c> 
-	of the digraph <c>G</c>, in some unspecified order.</p>
+	or <seealso marker="#incident">incident</seealso> on <c><anno>V</anno></c>
+	of the digraph <c><anno>G</anno></c>, in some unspecified order.</p>
       </desc>
     </func>
     <func>
-      <name>get_cycle(G, V) -> Vertices | false</name>
+      <name name="get_cycle" arity="2"/>
       <fsummary>Find one cycle in a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V1 = V2 = vertex()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>If there is 
 	  a <seealso marker="#simple_cycle">simple cycle</seealso> of 
 	  length two or more through the vertex
-          <c>V</c>, then the cycle is returned as a list
-          <c>[V,&nbsp;...,&nbsp;V]</c> of vertices, otherwise if there
+          <c><anno>V</anno></c>, then the cycle is returned as a list
+          <c>[<anno>V</anno>,&nbsp;...,&nbsp;<anno>V</anno>]</c> of vertices, otherwise if there
           is a <seealso marker="#loop">loop</seealso> through
-          <c>V</c>, then the loop is returned as a list <c>[V]</c>. If
-          there are no cycles through <c>V</c>, then <c>false</c> is
+          <c><anno>V</anno></c>, then the loop is returned as a list <c>[<anno>V</anno>]</c>. If
+          there are no cycles through <c><anno>V</anno></c>, then <c>false</c> is
           returned.
           </p>
         <p><c>get_path/3</c> is used for finding a simple cycle
-          through <c>V</c>.
+          through <c><anno>V</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>get_path(G, V1, V2) -> Vertices | false</name>
+      <name name="get_path" arity="3"/>
       <fsummary>Find one path in a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V1 = V2 = vertex()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>Tries to find 
 	  a <seealso marker="#simple_path">simple path</seealso> from 
-	  the vertex <c>V1</c> to the vertex
-          <c>V2</c> of the digraph <c>G</c>. Returns the path as a
-          list <c>[V1,&nbsp;...,&nbsp;V2]</c> of vertices, or
-          <c>false</c> if no simple path from <c>V1</c> to <c>V2</c>
+	  the vertex <c><anno>V1</anno></c> to the vertex
+          <c><anno>V2</anno></c> of the digraph <c><anno>G</anno></c>. Returns the path as a
+          list <c>[<anno>V1</anno>,&nbsp;...,&nbsp;<anno>V2</anno>]</c> of vertices, or
+          <c>false</c> if no simple path from <c><anno>V1</anno></c> to <c><anno>V2</anno></c>
           of length one or more exists.
           </p>
-        <p>The digraph <c>G</c> is traversed in a depth-first manner,
+        <p>The digraph <c><anno>G</anno></c> is traversed in a depth-first manner,
           and the first path found is returned.
           </p>
       </desc>
     </func>
     <func>
-      <name>get_short_cycle(G, V) -> Vertices | false</name>
+      <name name="get_short_cycle" arity="2"/>
       <fsummary>Find one short cycle in a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V1 = V2 = vertex()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>Tries to find an as short as 
 	  possible <seealso marker="#simple_cycle">simple cycle</seealso> through
-	  the vertex <c>V</c> of the digraph <c>G</c>. Returns the cycle
-          as a list <c>[V,&nbsp;...,&nbsp;V]</c> of vertices, or
-          <c>false</c> if no simple cycle through <c>V</c> exists.
+	  the vertex <c><anno>V</anno></c> of the digraph <c>G</c>. Returns the cycle
+          as a list <c>[<anno>V</anno>,&nbsp;...,&nbsp;<anno>V</anno>]</c> of vertices, or
+          <c>false</c> if no simple cycle through <c><anno>V</anno></c> exists.
           Note that a <seealso marker="#loop">loop</seealso> through
-          <c>V</c> is returned as the list <c>[V,&nbsp;V]</c>.
+          <c><anno>V</anno></c> is returned as the list <c>[<anno>V</anno>,&nbsp;<anno>V</anno>]</c>.
           </p>
         <p><c>get_short_path/3</c> is used for finding a simple cycle
-          through <c>V</c>.
+          through <c><anno>V</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>get_short_path(G, V1, V2) -> Vertices | false</name>
+      <name name="get_short_path" arity="3"/>
       <fsummary>Find one short path in a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V1 = V2 = vertex()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>Tries to find an as short as 
 	  possible <seealso marker="#simple_path">simple path</seealso> from
-	  the vertex <c>V1</c> to the vertex <c>V2</c> of the digraph <c>G</c>.
-          Returns the path as a list <c>[V1,&nbsp;...,&nbsp;V2]</c> of
-          vertices, or <c>false</c> if no simple path from <c>V1</c>
-          to <c>V2</c> of length one or more exists.
+	  the vertex <c><anno>V1</anno></c> to the vertex <c><anno>V2</anno></c> of the digraph <c><anno>G</anno></c>.
+          Returns the path as a list <c>[<anno>V1</anno>,&nbsp;...,&nbsp;<anno>V2</anno>]</c> of
+          vertices, or <c>false</c> if no simple path from <c><anno>V1</anno></c>
+          to <c><anno>V2</anno></c> of length one or more exists.
           </p>
-        <p>The digraph <c>G</c> is traversed in a breadth-first
+        <p>The digraph <c><anno>G</anno></c> is traversed in a breadth-first
           manner, and the first path found is returned.
           </p>
       </desc>
     </func>
     <func>
-      <name>in_degree(G, V) -> integer()</name>
+      <name name="in_degree" arity="2"/>
       <fsummary>Return the in-degree of a vertex of a digraph.</fsummary>
-      <type>
-        <v>G= digraph()</v>
-        <v>V = vertex()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#in_degree">in-degree</seealso> of the vertex
-          <c>V</c> of the digraph <c>G</c>.
+          <c><anno>V</anno></c> of the digraph <c><anno>G</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>in_edges(G, V) -> Edges</name>
+      <name name="in_edges" arity="2"/>
       <fsummary>Return all edges incident on a vertex of  a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V = vertex()</v>
-        <v>Edges = [edge()]</v>
-      </type>
       <desc>
         <p>Returns a list of all 
 	  edges <seealso marker="#incident">incident</seealso> on
-	  <c>V</c> of the digraph <c>G</c>, in some unspecified order.
+	  <c><anno>V</anno></c> of the digraph <c><anno>G</anno></c>, in some unspecified order.
           </p>
       </desc>
     </func>
     <func>
-      <name>in_neighbours(G, V) -> Vertices</name>
+      <name name="in_neighbours" arity="2"/>
       <fsummary>Return all in-neighbours of a vertex of  a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V = vertex()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>Returns a list of 
 	  all <seealso marker="#in_neighbour">in-neighbours</seealso> of 
-	  <c>V</c> of the digraph <c>G</c>, in some unspecified order.
+	  <c><anno>V</anno></c> of the digraph <c><anno>G</anno></c>, in some unspecified order.
           </p>
       </desc>
     </func>
     <func>
-      <name>info(G) -> InfoList</name>
+      <name name="info" arity="1"/>
       <fsummary>Return information about a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>InfoList = [{cyclicity, Cyclicity}, {memory, NoWords}, {protection, Protection}]</v>
-        <v>Cyclicity = cyclic | acyclic</v>
-        <v>Protection = protected | private</v>
-        <v>NoWords = integer() >= 0</v>
-      </type>
+      <type name="d_cyclicity"/>
+      <type name="d_protection"/>
       <desc>
         <p>Returns a list of <c>{Tag, Value}</c> pairs describing the
-          digraph <c>G</c>. The following pairs are returned:
+          digraph <c><anno>G</anno></c>. The following pairs are returned:
           </p>
         <list type="bulleted">
           <item>
-            <p><c>{cyclicity, Cyclicity}</c>, where <c>Cyclicity</c>
+            <p><c>{cyclicity, <anno>Cyclicity</anno>}</c>, where <c><anno>Cyclicity</anno></c>
               is <c>cyclic</c> or <c>acyclic</c>, according to the
               options given to <c>new</c>.</p>
           </item>
           <item>
-            <p><c>{memory, NoWords}</c>, where <c>NoWords</c> is 
-              the number of words allocated to the <c>ets</c> tables.</p>
+            <p><c>{memory, <anno>NoWords</anno>}</c>, where <c><anno>NoWords</anno></c> is
+              the number of words allocated to the <c>ETS</c> tables.</p>
           </item>
           <item>
-            <p><c>{protection, Protection}</c>, where <c>Protection</c>
+            <p><c>{protection, <anno>Protection</anno>}</c>, where <c><anno>Protection</anno></c>
               is <c>protected</c> or <c>private</c>, according
               to the options given to <c>new</c>.</p>
           </item>
@@ -462,7 +397,7 @@
       </desc>
     </func>
     <func>
-      <name>new() -> digraph()</name>
+      <name name="new" arity="0"/>
       <fsummary>Return a protected empty digraph, where cycles  are allowed.</fsummary>
       <desc>
         <p>Equivalent to <c>new([])</c>.
@@ -470,15 +405,16 @@
       </desc>
     </func>
     <func>
-      <name>new(Type) -> digraph()</name>
+      <name name="new" arity="1"/>
       <fsummary>Create a new empty digraph.</fsummary>
-      <type>
-        <v>Type = [cyclic | acyclic | private | protected]</v>
-      </type>
+      <type variable="Type"/>
+      <type name="d_type"/>
+      <type name="d_cyclicity"/>
+      <type name="d_protection"/>
       <desc>
         <p>Returns 
 	  an <seealso marker="#empty_digraph">empty digraph</seealso> with 
-	  properties according to the options in <c>Type</c>:</p>
+	  properties according to the options in <c><anno>Type</anno></c>:</p>
         <taglist>
           <tag><c>cyclic</c></tag>
           <item>Allow <seealso marker="#cycle">cycles</seealso> in the
@@ -491,101 +427,72 @@
           <item>The digraph can be read and modified by the creating
            process only.</item>
         </taglist>
-        <p>If an unrecognized type option <c>T</c> is given or <c>Type</c>
+        <p>If an unrecognized type option <c>T</c> is given or <c><anno>Type</anno></c>
 	   is not a proper list, there will be a <c>badarg</c> exception.
           </p>
       </desc>
     </func>
     <func>
-      <name>no_edges(G) -> integer() >= 0</name>
+      <name name="no_edges" arity="1"/>
       <fsummary>Return the number of edges of the a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-      </type>
       <desc>
-        <p>Returns the number of edges of the digraph <c>G</c>.
+        <p>Returns the number of edges of the digraph <c><anno>G</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>no_vertices(G) -> integer() >= 0</name>
+      <name name="no_vertices" arity="1"/>
       <fsummary>Return the number of vertices of a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-      </type>
       <desc>
-        <p>Returns the number of vertices of the digraph <c>G</c>.
+        <p>Returns the number of vertices of the digraph <c><anno>G</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>out_degree(G, V) -> integer()</name>
+      <name name="out_degree" arity="2"/>
       <fsummary>Return the out-degree of a vertex of a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V = vertex()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#out_degree">out-degree</seealso> of the vertex
-          <c>V</c> of the digraph <c>G</c>.
+          <c><anno>V</anno></c> of the digraph <c><anno>G</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>out_edges(G, V) -> Edges</name>
+      <name name="out_edges" arity="2"/>
       <fsummary>Return all edges emanating from a vertex of  a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V = vertex()</v>
-        <v>Edges = [edge()]</v>
-      </type>
       <desc>
         <p>Returns a list of all 
 	  edges <seealso marker="#emanate">emanating</seealso> from 
-          <c>V</c> of the digraph <c>G</c>, in some unspecified order.
+          <c><anno>V</anno></c> of the digraph <c><anno>G</anno></c>, in some unspecified order.
           </p>
       </desc>
     </func>
     <func>
-      <name>out_neighbours(G, V) -> Vertices</name>
+      <name name="out_neighbours" arity="2"/>
       <fsummary>Return all out-neighbours of a vertex of  a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V = vertex()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>Returns a list of 
 	  all <seealso marker="#out_neighbour">out-neighbours</seealso> of 
-	  <c>V</c> of the digraph <c>G</c>, in some unspecified order.
+	  <c><anno>V</anno></c> of the digraph <c><anno>G</anno></c>, in some unspecified order.
           </p>
       </desc>
     </func>
     <func>
-      <name>vertex(G, V) -> {V, Label} | false</name>
+      <name name="vertex" arity="2"/>
       <fsummary>Return the label of a vertex of a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>V = vertex()</v>
-        <v>Label = label()</v>
-      </type>
       <desc>
-        <p>Returns <c>{V,&nbsp;Label}</c> where <c>Label</c> is the
+        <p>Returns <c>{<anno>V</anno>,&nbsp;<anno>Label</anno>}</c> where <c><anno>Label</anno></c> is the
           <seealso marker="#label">label</seealso> of the vertex
-          <c>V</c> of the digraph <c>G</c>, or <c>false</c> if there
-          is no vertex <c>V</c> of the digraph <c>G</c>.
+          <c><anno>V</anno></c> of the digraph <c><anno>G</anno></c>, or <c>false</c> if there
+          is no vertex <c><anno>V</anno></c> of the digraph <c><anno>G</anno></c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>vertices(G) -> Vertices</name>
+      <name name="vertices" arity="1"/>
       <fsummary>Return all vertices of a digraph.</fsummary>
-      <type>
-        <v>G = digraph()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
-        <p>Returns a list of all vertices of the digraph <c>G</c>, in
+        <p>Returns a list of all vertices of the digraph <c><anno>G</anno></c>, in
           some unspecified order.
           </p>
       </desc>
diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml
index 4b137456b3..e44632bfd2 100644
--- a/lib/stdlib/doc/src/digraph_utils.xml
+++ b/lib/stdlib/doc/src/digraph_utils.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -119,49 +119,43 @@
       considering all edges undirected.</p>
   </description>
 
+  <datatypes>
+    <datatype>
+      <name><marker id="type-digraph">digraph()</marker></name>
+      <desc><p>A digraph as returned by <c>digraph:new/0,1</c>.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>arborescence_root(Digraph) -> no | {yes, Root}</name>
+      <name name="arborescence_root" arity="1"/>
       <fsummary>Check if a digraph is an arborescence.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-	<v>Root = vertex()</v>
-      </type>
       <desc>
-
-        <p>Returns <c>{yes, Root}</c> if <c>Root</c> is 
+        <p>Returns <c>{yes, <anno>Root</anno>}</c> if <c><anno>Root</anno></c> is
 	  the <seealso marker="#root">root</seealso> of the arborescence
-	  <c>Digraph</c>, <c>no</c> otherwise.
+	  <c><anno>Digraph</anno></c>, <c>no</c> otherwise.
 	  </p>
       </desc>
     </func>
     <func>
-      <name>components(Digraph) -> [Component]</name>
+      <name name="components" arity="1"/>
       <fsummary>Return the components of a digraph.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-        <v>Component = [vertex()]</v>
-      </type>
       <desc>
         <p>Returns a list 
 	  of <seealso marker="#components">connected components</seealso>. 
 	  Each component is represented by its
           vertices. The order of the vertices and the order of the
           components are arbitrary. Each vertex of the digraph
-          <c>Digraph</c> occurs in exactly one component.
+          <c><anno>Digraph</anno></c> occurs in exactly one component.
           </p>
       </desc>
     </func>
     <func>
-      <name>condensation(Digraph) -> CondensedDigraph</name>
+      <name name="condensation" arity="1"/>
       <fsummary>Return a condensed graph of a digraph.</fsummary>
-      <type>
-        <v>Digraph = CondensedDigraph = digraph()</v>
-      </type>
       <desc>
         <p>Creates a digraph where the vertices are 
   	  the <seealso marker="#strong_components">strongly connected 
-	  components</seealso> of <c>Digraph</c> as returned by
+	  components</seealso> of <c><anno>Digraph</anno></c> as returned by
           <c>strong_components/1</c>. If X and Y are strongly
           connected components, and there exist vertices x and y in X
           and Y respectively such that there is an 
@@ -169,7 +163,7 @@
 	  and <seealso marker="#incident">incident</seealso> on y, then 
 	  an edge emanating from X and incident on Y is created.
           </p>
-        <p>The created digraph has the same type as <c>Digraph</c>.
+        <p>The created digraph has the same type as <c><anno>Digraph</anno></c>.
           All vertices and edges have the 
 	  default <seealso marker="#label">label</seealso> <c>[]</c>.
           </p>
@@ -181,12 +175,8 @@
       </desc>
     </func>
     <func>
-      <name>cyclic_strong_components(Digraph) -> [StrongComponent]</name>
+      <name name="cyclic_strong_components" arity="1"/>
       <fsummary>Return the cyclic strong components of a digraph.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-        <v>StrongComponent = [vertex()]</v>
-      </type>
       <desc>
         <p>Returns a list of <seealso marker="#strong_components">strongly 
 	  connected components</seealso>. 
@@ -194,67 +184,50 @@
           by its vertices. The order of the vertices and the order of
           the components are arbitrary. Only vertices that are
           included in some <seealso marker="#cycle">cycle</seealso> in
-          <c>Digraph</c> are returned, otherwise the returned list is
+          <c><anno>Digraph</anno></c> are returned, otherwise the returned list is
           equal to that returned by <c>strong_components/1</c>.
           </p>
       </desc>
     </func>
     <func>
-      <name>is_acyclic(Digraph) -> bool()</name>
+      <name name="is_acyclic" arity="1"/>
       <fsummary>Check if a digraph is acyclic.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-      </type>
       <desc>
         <p>Returns <c>true</c> if and only if the digraph
-          <c>Digraph</c> is <seealso marker="#acyclic_digraph">acyclic</seealso>.</p>
+          <c><anno>Digraph</anno></c> is <seealso marker="#acyclic_digraph">acyclic</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>is_arborescence(Digraph) -> bool()</name>
+      <name name="is_arborescence" arity="1"/>
       <fsummary>Check if a digraph is an arborescence.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-      </type>
       <desc>
         <p>Returns <c>true</c> if and only if the digraph
-          <c>Digraph</c> is 
+          <c><anno>Digraph</anno></c> is
 	  an <seealso marker="#arborescence">arborescence</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>is_tree(Digraph) -> bool()</name>
+      <name name="is_tree" arity="1"/>
       <fsummary>Check if a digraph is a tree.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-      </type>
       <desc>
         <p>Returns <c>true</c> if and only if the digraph
-          <c>Digraph</c> is 
+          <c><anno>Digraph</anno></c> is
 	  a <seealso marker="#tree">tree</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>loop_vertices(Digraph) -> Vertices</name>
+      <name name="loop_vertices" arity="1"/>
       <fsummary>Return the vertices of a digraph included in  some loop.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
-        <p>Returns a list of all vertices of <c>Digraph</c> that are
+        <p>Returns a list of all vertices of <c><anno>Digraph</anno></c> that are
           included in some <seealso marker="#loop">loop</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>postorder(Digraph) -> Vertices</name>
+      <name name="postorder" arity="1"/>
       <fsummary>Return the vertices of a digraph in post-order.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
-        <p>Returns all vertices of the digraph <c>Digraph</c>. The
+        <p>Returns all vertices of the digraph <c><anno>Digraph</anno></c>. The
           order is given by 
 	  a <seealso marker="#depth_first_traversal">depth-first 
 	  traversal</seealso> of the digraph, collecting visited
@@ -266,14 +239,10 @@
       </desc>
     </func>
     <func>
-      <name>preorder(Digraph) -> Vertices</name>
+      <name name="preorder" arity="1"/>
       <fsummary>Return the vertices of a digraph in pre-order.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
-        <p>Returns all vertices of the digraph <c>Digraph</c>. The
+        <p>Returns all vertices of the digraph <c><anno>Digraph</anno></c>. The
           order is given by 
 	  a <seealso marker="#depth_first_traversal">depth-first 
 	  traversal</seealso> of the digraph, collecting visited
@@ -281,119 +250,94 @@
       </desc>
     </func>
     <func>
-      <name>reachable(Vertices, Digraph) -> Vertices</name>
+      <name name="reachable" arity="2"/>
       <fsummary>Return the vertices reachable from some vertices of  a digraph.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>Returns an unsorted list of digraph vertices such that for
           each vertex in the list, there is 
-	  a <seealso marker="#path">path</seealso> in <c>Digraph</c> from some
-          vertex of <c>Vertices</c> to the vertex. In particular,
+	  a <seealso marker="#path">path</seealso> in <c><anno>Digraph</anno></c> from some
+          vertex of <c><anno>Vertices</anno></c> to the vertex. In particular,
           since paths may have length zero, the vertices of
-          <c>Vertices</c> are included in the returned list.
+          <c><anno>Vertices</anno></c> are included in the returned list.
           </p>
       </desc>
     </func>
     <func>
-      <name>reachable_neighbours(Vertices, Digraph) -> Vertices</name>
+      <name name="reachable_neighbours" arity="2"/>
       <fsummary>Return the neighbours reachable from some vertices of  a digraph.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>Returns an unsorted list of digraph vertices such that for
           each vertex in the list, there is 
-	  a <seealso marker="#path">path</seealso> in <c>Digraph</c> of length
-          one or more from some vertex of <c>Vertices</c> to the
+	  a <seealso marker="#path">path</seealso> in <c><anno>Digraph</anno></c> of length
+          one or more from some vertex of <c><anno>Vertices</anno></c> to the
           vertex. As a consequence, only those vertices 
-	  of <c>Vertices</c> that are included in 
+	  of <c><anno>Vertices</anno></c> that are included in
 	  some <seealso marker="#cycle">cycle</seealso> are returned.
           </p>
       </desc>
     </func>
     <func>
-      <name>reaching(Vertices, Digraph) -> Vertices</name>
+      <name name="reaching" arity="2"/>
       <fsummary>Return the vertices that reach some vertices of  a digraph.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>Returns an unsorted list of digraph vertices such that for
           each vertex in the list, there is 
 	  a <seealso marker="#path">path</seealso> from the vertex to some 
-	  vertex of <c>Vertices</c>. In particular, since paths may have
-          length zero, the vertices of <c>Vertices</c> are included in
+	  vertex of <c><anno>Vertices</anno></c>. In particular, since paths may have
+          length zero, the vertices of <c><anno>Vertices</anno></c> are included in
           the returned list.
           </p>
       </desc>
     </func>
     <func>
-      <name>reaching_neighbours(Vertices, Digraph) -> Vertices</name>
+      <name name="reaching_neighbours" arity="2"/>
       <fsummary>Return the neighbours that reach some vertices of  a digraph.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>Returns an unsorted list of digraph vertices such that for
           each vertex in the list, there is 
 	  a <seealso marker="#path">path</seealso> of length one or more 
-	  from the vertex to some vertex of <c>Vertices</c>. As a consequence,
-          only those vertices of <c>Vertices</c> that are included in
+	  from the vertex to some vertex of <c><anno>Vertices</anno></c>. As a consequence,
+          only those vertices of <c><anno>Vertices</anno></c> that are included in
           some <seealso marker="#cycle">cycle</seealso> are returned.
           </p>
       </desc>
     </func>
     <func>
-      <name>strong_components(Digraph) -> [StrongComponent]</name>
+      <name name="strong_components" arity="1"/>
       <fsummary>Return the strong components of a digraph.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-        <v>StrongComponent = [vertex()]</v>
-      </type>
       <desc>
         <p>Returns a list of <seealso marker="#strong_components">strongly 
 	  connected components</seealso>. 
 	  Each strongly component is represented
           by its vertices. The order of the vertices and the order of
           the components are arbitrary. Each vertex of the digraph
-          <c>Digraph</c> occurs in exactly one strong component.
+          <c><anno>Digraph</anno></c> occurs in exactly one strong component.
           </p>
       </desc>
     </func>
     <func>
-      <name>subgraph(Digraph, Vertices [, Options]) ->  Subgraph</name>
+      <name name="subgraph" arity="2"/>
+      <name name="subgraph" arity="3"/>
       <fsummary>Return a subgraph of a digraph.</fsummary>
-      <type>
-        <v>Digraph = Subgraph = digraph()</v>
-        <v>Options = [{type, SubgraphType}, {keep_labels, bool()}]</v>
-        <v>SubgraphType = inherit | type()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>Creates a maximal <seealso marker="#subgraph">subgraph</seealso> of <c>Digraph</c> having
-          as vertices those vertices of <c>Digraph</c> that are
-          mentioned in <c>Vertices</c>.
+          as vertices those vertices of <c><anno>Digraph</anno></c> that are
+          mentioned in <c><anno>Vertices</anno></c>.
           </p>
         <p>If the value of the option <c>type</c> is <c>inherit</c>,
-          which is the default, then the type of <c>Digraph</c> is used 
+          which is the default, then the type of <c><anno>Digraph</anno></c> is used
           for the subgraph as well. Otherwise the option value of <c>type</c>
           is used as argument to <c>digraph:new/1</c>.
           </p>
         <p>If the value of the option <c>keep_labels</c> is <c>true</c>,
           which is the default, then 
 	  the <seealso marker="#label">labels</seealso> of vertices and edges
-          of <c>Digraph</c> are used for the subgraph as well. If the value
+          of <c><anno>Digraph</anno></c> are used for the subgraph as well. If the value
           is <c>false</c>, then the default label, <c>[]</c>, is used
           for the subgraph's vertices and edges.
           </p>
-        <p><c>subgraph(Digraph, Vertices)</c> is equivalent to
-          <c>subgraph(Digraph, Vertices, [])</c>.
+        <p><c>subgraph(<anno>Digraph</anno>, <anno>Vertices</anno>)</c> is equivalent to
+          <c>subgraph(<anno>Digraph</anno>, <anno>Vertices</anno>, [])</c>.
           </p>
        	<p>There will be a <c>badarg</c> exception if any of the arguments
 	  are invalid.
@@ -401,16 +345,12 @@
       </desc>
     </func>
     <func>
-      <name>topsort(Digraph) -> Vertices | false</name>
+      <name name="topsort" arity="1"/>
       <fsummary>Return a topological sorting of the vertices of  a digraph.</fsummary>
-      <type>
-        <v>Digraph = digraph()</v>
-        <v>Vertices = [vertex()]</v>
-      </type>
       <desc>
         <p>Returns a <seealso marker="#topsort">topological 
 	  ordering</seealso> of the vertices of the digraph
-          <c>Digraph</c> if such an ordering exists, <c>false</c>
+          <c><anno>Digraph</anno></c> if such an ordering exists, <c>false</c>
           otherwise. For each vertex in the returned list, there are
           no <seealso marker="#out_neighbour">out-neighbours</seealso>
           that occur earlier in the list.</p>
diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml
index e6b48b270a..488499581f 100644
--- a/lib/stdlib/doc/src/epp.xml
+++ b/lib/stdlib/doc/src/epp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -38,65 +38,61 @@
       by <c>compile</c> to preprocess macros and include files before
       the actual parsing takes place.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="macros"></name>
+    </datatype>
+    <datatype>
+      <name name="epp_handle"></name>
+      <desc><p>Handle to the epp server.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>open(FileName, IncludePath) -> {ok,Epp} | {error, ErrorDescriptor}</name>
-      <name>open(FileName, IncludePath, PredefMacros) -> {ok,Epp} | {error, ErrorDescriptor}</name>
+      <name name="open" arity="2"/>
+      <name name="open" arity="3"/>
       <fsummary>Open a file for preprocessing</fsummary>
-      <type>
-        <v>FileName = atom() | string()</v>
-        <v>IncludePath = [DirectoryName]</v>
-        <v>DirectoryName = atom() | string()</v>
-        <v>PredefMacros = [{atom(),term()}]</v>
-        <v>Epp = pid() -- handle to the epp server</v>
-        <v>ErrorDescriptor = term()</v>
-      </type>
       <desc>
         <p>Opens a file for preprocessing.</p>
       </desc>
     </func>
     <func>
-      <name>close(Epp) -> ok</name>
+      <name name="close" arity="1"/>
       <fsummary>Close the preprocessing of the file associated with <c>Epp</c></fsummary>
-      <type>
-        <v>Epp = pid() -- handle to the epp server</v>
-      </type>
       <desc>
         <p>Closes the preprocessing of a file.</p>
       </desc>
     </func>
     <func>
-      <name>parse_erl_form(Epp) -> {ok, AbsForm} | {eof, Line} | {error, ErrorInfo}</name>
+      <name name="parse_erl_form" arity="1"/>
       <fsummary>Return the next Erlang form from the opened Erlang source file</fsummary>
-      <type>
-        <v>Epp = pid()</v>
-        <v>AbsForm = term()</v>
-        <v>Line = integer()</v>
-        <v>ErrorInfo = see separate description below.</v>
-      </type>
       <desc>
         <p>Returns the next Erlang form from the opened Erlang source file.
-          The tuple <c>{eof, Line}</c> is returned at end-of-file. The first
+          The tuple <c>{eof, <anno>Line</anno>}</c> is returned at end-of-file. The first
           form corresponds to an implicit attribute <c>-file(File,1).</c>, where
           <c>File</c> is the name of the file.</p>
       </desc>
     </func>
     <func>
-      <name>parse_file(FileName,IncludePath,PredefMacro) -> {ok,[Form]} | {error,OpenError}</name>
-      <fsummary>Preprocesse and parse an Erlang source file</fsummary>
-      <type>
-        <v>FileName = atom() | string()</v>
-        <v>IncludePath = [DirectoryName]</v>
-        <v>DirectoryName = atom() | string()</v>
-        <v>PredefMacros = [{atom(),term()}]</v>
-        <v>Form = term() -- same as returned by erl_parse:parse_form</v>
-      </type>
+      <name name="parse_file" arity="3"/>
+      <fsummary>Preprocess and parse an Erlang source file</fsummary>
       <desc>
         <p>Preprocesses and parses an Erlang source file.
-          Note that the tuple <c>{eof, Line}</c> returned at end-of-file is
+          Note that the tuple <c>{eof, <anno>Line</anno>}</c> returned at end-of-file is
           included as a "form".</p>
       </desc>
     </func>
+    <func>
+      <name name="format_error" arity="1"/>
+      <fsummary>Format an error descriptor</fsummary>
+      <desc>
+        <p>Takes an <c><anno>ErrorDescriptor</anno></c> and returns
+          a string which
+          describes the error or warning. This function is usually
+          called implicitly when processing an <c>ErrorInfo</c>
+          structure (see below).</p>
+      </desc>
+    </func>
   </funcs>
 
   <section>
diff --git a/lib/stdlib/doc/src/erl_eval.xml b/lib/stdlib/doc/src/erl_eval.xml
index 62af23c5eb..c95494bf25 100644
--- a/lib/stdlib/doc/src/erl_eval.xml
+++ b/lib/stdlib/doc/src/erl_eval.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -36,63 +36,108 @@
   <description>
     <p>This module provides an interpreter for Erlang expressions. The
       expressions are in the abstract syntax as returned by
-      <c>erl_parse</c>, the Erlang parser, or a call to
-      <c>io:parse_erl_exprs/2</c>.</p>
+      <seealso marker="erl_parse"><c>erl_parse</c></seealso>,
+      the Erlang parser, or <seealso marker="io">
+      <c>io</c></seealso>.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="bindings"/>
+    </datatype>
+    <datatype>
+      <name name="binding_struct"/>
+      <desc>A binding structure.</desc>
+    </datatype>
+    <datatype>
+      <name name="expression"/>
+    </datatype>
+    <datatype>
+      <name name="expressions"/>
+      <desc><p>As returned by <seealso marker="erl_parse#parse_exprs/1">
+        <c>erl_parse:parse_exprs/1</c></seealso> or
+        <seealso marker="io#parse_erl_exprs/2">
+        <c>io:parse_erl_exprs/2</c></seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="expression_list"/>
+    </datatype>
+    <datatype>
+      <name name="func_spec"/>
+    </datatype>
+    <datatype>
+      <name name="lfun_eval_handler"/>
+    </datatype>
+    <datatype>
+      <name name="lfun_value_handler"/>
+    </datatype>
+    <datatype>
+      <name name="local_function_handler"/>
+      <desc><p>Further described
+        <seealso marker="#local_function_handler">below.</seealso></p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="name"/>
+    </datatype>
+    <datatype>
+      <name name="nlfun_handler"/>
+    </datatype>
+    <datatype>
+      <name name="non_local_function_handler"/>
+      <desc><p>Further described
+        <seealso marker="#non_local_function_handler">below.</seealso></p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="value"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>exprs(Expressions, Bindings) -> {value, Value, NewBindings}</name>
-      <name>exprs(Expressions, Bindings, LocalFunctionHandler) ->  {value, Value, NewBindings}</name>
-      <name>exprs(Expressions, Bindings, LocalFunctionHandler, NonlocalFunctionHandler) -> {value, Value, NewBindings}</name>
+      <name name="exprs" arity="2"/>
+      <name name="exprs" arity="3"/>
+      <name name="exprs" arity="4"/>
       <fsummary>Evaluate expressions</fsummary>
-      <type>
-        <v>Expressions = as returned by erl_parse or io:parse_erl_exprs/2</v>
-        <v>Bindings = as returned by bindings/1</v>
-        <v>LocalFunctionHandler = {value, Func} | {eval, Func} | none</v>
-        <v>NonlocalFunctionHandler = {value, Func} | none</v>
-      </type>
       <desc>
-        <p>Evaluates <c>Expressions</c> with the set of bindings
-          <c>Bindings</c>, where <c>Expressions</c> is a sequence of
+        <p>Evaluates <c><anno>Expressions</anno></c> with the set of bindings
+          <c><anno>Bindings</anno></c>, where <c><anno>Expressions</anno></c>
+          is a sequence of
           expressions (in abstract syntax) of a type which may be
-          returned by <c>io:parse_erl_exprs/2</c>. See below for an
+          returned by <seealso marker="io#parse_erl_exprs/2">
+        <c>io:parse_erl_exprs/2</c></seealso>. See below for an
           explanation of how and when to use the arguments
-          <c>LocalFunctionHandler</c> and <c>NonlocalFunctionHandler</c>.
+          <c><anno>LocalFunctionHandler</anno></c> and
+          <c><anno>NonLocalFunctionHandler</anno></c>.
           </p>
-        <p>Returns <c>{value, Value, NewBindings}</c></p>
+        <p>Returns <c>{value, <anno>Value</anno>, <anno>NewBindings</anno>}</c>
+        </p>
       </desc>
     </func>
     <func>
-      <name>expr(Expression, Bindings) -> { value, Value, NewBindings }</name>
-      <name>expr(Expression, Bindings, LocalFunctionHandler) -> { value, Value, NewBindings }</name>
-      <name>expr(Expression, Bindings, LocalFunctionHandler, NonlocalFunctionHandler) -> { value, Value, NewBindings }</name>
-      <name>expr(Expression, Bindings, LocalFunctionHandler, NonlocalFunctionHandler, ReturnFormat) -> { value, Value, NewBindings } | Value</name>
+      <name name="expr" arity="2"/>
+      <name name="expr" arity="3"/>
+      <name name="expr" arity="4"/>
+      <name name="expr" arity="5"/>
       <fsummary>Evaluate expression</fsummary>
-      <type>
-        <v>Expression = as returned by io:parse_erl_form/2, for example</v>
-        <v>Bindings = as returned by bindings/1</v>
-        <v>LocalFunctionHandler = {value, Func} | {eval, Func} | none</v>
-        <v>NonlocalFunctionHandler = {value, Func} | none</v>
-        <v>ReturnFormat = value | none</v>
-      </type>
       <desc>
-        <p>Evaluates <c>Expression</c> with the set of bindings
-          <c>Bindings</c>. <c>Expression</c> is an expression (in
-          abstract syntax) of a type which may be returned by
-          <c>io:parse_erl_form/2</c>. See below for an explanation of
+        <p>Evaluates <c><anno>Expression</anno></c> with the set of bindings
+          <c><anno>Bindings</anno></c>. <c><anno>Expression</anno></c>
+          is an expression in
+          abstract syntax. See below for an explanation of
           how and when to use the arguments
-          <c>LocalFunctionHandler</c> and
-          <c>NonlocalFunctionHandler</c>.
+          <c><anno>LocalFunctionHandler</anno></c> and
+          <c><anno>NonLocalFunctionHandler</anno></c>.
           </p>
-        <p>Returns <c>{value, Value, NewBindings}</c> by default. But
-        if the <c>ReturnFormat</c> is <c>value</c> only the <c>Value</c> 
-        is returned.</p>
+        <p>Returns <c>{value, <anno>Value</anno>,
+        <anno>NewBindings</anno>}</c> by default. But if the
+        <c><anno>ReturnFormat</anno></c> is <c>value</c> only
+        the <c><anno>Value</anno></c> is returned.</p>
       </desc>
     </func>
     <func>
-      <name>expr_list(ExpressionList, Bindings) ->  {ValueList, NewBindings}</name>
-      <name>expr_list(ExpressionList, Bindings, LocalFunctionHandler) ->  {ValueList, NewBindings}</name>
-      <name>expr_list(ExpressionList, Bindings, LocalFunctionHandler,  NonlocalFunctionHandler) -> {ValueList, NewBindings}</name>
+      <name name="expr_list" arity="2"/>
+      <name name="expr_list" arity="3"/>
+      <name name="expr_list" arity="4"/>
       <fsummary>Evaluate a list of expressions</fsummary>
       <desc>
         <p>Evaluates a list of expressions in parallel, using the same
@@ -100,18 +145,19 @@
           merge the bindings returned from each evaluation.  This
           function is useful in the <c>LocalFunctionHandler</c>. See below.
           </p>
-        <p>Returns <c>{ValueList, NewBindings}</c>.</p>
+        <p>Returns <c>{<anno>ValueList</anno>, <anno>NewBindings</anno>}</c>.
+        </p>
       </desc>
     </func>
     <func>
-      <name>new_bindings() -> BindingStruct</name>
+      <name name="new_bindings" arity="0"/>
       <fsummary>Return a bindings structure</fsummary>
       <desc>
         <p>Returns an empty binding structure.</p>
       </desc>
     </func>
     <func>
-      <name>bindings(BindingStruct) -> Bindings</name>
+      <name name="bindings" arity="1"/>
       <fsummary>Return bindings</fsummary>
       <desc>
         <p>Returns the list of bindings contained in the binding
@@ -119,25 +165,28 @@
       </desc>
     </func>
     <func>
-      <name>binding(Name, BindingStruct) -> Binding</name>
+      <name name="binding" arity="2"/>
       <fsummary>Return bindings</fsummary>
       <desc>
-        <p>Returns the binding of <c>Name</c> in <c>BindingStruct</c>.</p>
+        <p>Returns the binding of <c><anno>Name</anno></c>
+          in <c><anno>BindingStruct</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>add_binding(Name, Value, Bindings) -> BindingStruct</name>
+      <name name="add_binding" arity="3"/>
       <fsummary>Add a binding</fsummary>
       <desc>
-        <p>Adds the binding <c>Name = Value</c> to <c>Bindings</c>.
+        <p>Adds the binding <c><anno>Name</anno> = <anno>Value</anno></c>
+          to <c><anno>BindingStruct</anno></c>.
           Returns an updated binding structure.</p>
       </desc>
     </func>
     <func>
-      <name>del_binding(Name, Bindings) -> BindingStruct</name>
+      <name name="del_binding" arity="2"/>
       <fsummary>Delete a binding</fsummary>
       <desc>
-        <p>Removes the binding of <c>Name</c> in <c>Bindings</c>.
+        <p>Removes the binding of <c><anno>Name</anno></c>
+          in <c><anno>BindingStruct</anno></c>.
           Returns an updated binding structure.</p>
       </desc>
     </func>
@@ -145,7 +194,8 @@
 
   <section>
     <title>Local Function Handler</title>
-    <p>During evaluation of a function, no calls can be made to local
+    <p><marker id="local_function_handler"></marker>
+      During evaluation of a function, no calls can be made to local
       functions. An undefined function error would be
       generated. However, the optional argument
       <c>LocalFunctionHandler</c> may be used to define a function
@@ -191,7 +241,8 @@ Func(Name, Arguments, Bindings)        </code>
 
   <section>
     <title>Non-local Function Handler</title>
-    <p>The optional argument <c>NonlocalFunctionHandler</c> may be
+    <p><marker id="non_local_function_handler"></marker>
+      The optional argument <c>NonlocalFunctionHandler</c> may be
       used to define a function which is called in the following
       cases: a functional object (fun) is called; a built-in function
       is called; a function is called using the M:F syntax, where M
diff --git a/lib/stdlib/doc/src/erl_expand_records.xml b/lib/stdlib/doc/src/erl_expand_records.xml
index c93248493f..8ead438b31 100644
--- a/lib/stdlib/doc/src/erl_expand_records.xml
+++ b/lib/stdlib/doc/src/erl_expand_records.xml
@@ -39,12 +39,8 @@
   </description>
   <funcs>
     <func>
-      <name>module(AbsForms, CompileOptions) -> AbsForms</name>
+      <name name="module" arity="2"/>
       <fsummary>Expand all records in a module</fsummary>
-      <type>
-        <v>AbsForms = [term()]</v>
-        <v>CompileOptions = [term()]</v>
-      </type>
       <desc>
         <p>Expands all records in a module. The returned module has no
           references to records, neither attributes nor code.</p>
diff --git a/lib/stdlib/doc/src/erl_id_trans.xml b/lib/stdlib/doc/src/erl_id_trans.xml
index cfb18ec131..18cc2460f9 100644
--- a/lib/stdlib/doc/src/erl_id_trans.xml
+++ b/lib/stdlib/doc/src/erl_id_trans.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1996</year>
-      <year>2010</year>
+      <year>2011</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -48,8 +48,8 @@
       <name>parse_transform(Forms, Options) -> Forms</name>
       <fsummary>Transform Erlang forms</fsummary>
       <type>
-        <v>Forms = [erlang_form()]</v>
-        <v>Options = [compiler_options()]</v>
+        <v>Forms = [<seealso marker="erl_parse#type-abstract_form">erl_parse:abstract_form()</seealso>]</v>
+        <v>Options = [<seealso marker="compile#type-option">compile:option()</seealso>]</v>
       </type>
       <desc>
         <p>Performs an identity transformation on Erlang forms, as an example.</p>
diff --git a/lib/stdlib/doc/src/erl_internal.xml b/lib/stdlib/doc/src/erl_internal.xml
index 732d77c3ae..b8d5ad73b3 100644
--- a/lib/stdlib/doc/src/erl_internal.xml
+++ b/lib/stdlib/doc/src/erl_internal.xml
@@ -42,112 +42,75 @@
   </description>
   <funcs>
     <func>
-      <name>bif(Name, Arity) -> bool()</name>
+      <name name="bif" arity="2"/>
       <fsummary>Test for an Erlang BIF</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>Arity = integer()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Name/Arity</c> is an Erlang BIF
+        <p>Returns <c>true</c> if <c><anno>Name</anno>/<anno>Arity</anno></c> is an Erlang BIF
           which is automatically recognized by the compiler, otherwise
           <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>guard_bif(Name, Arity) -> bool()</name>
+      <name name="guard_bif" arity="2"/>
       <fsummary>Test for an Erlang BIF allowed in guards</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>Arity = integer()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Name/Arity</c> is an Erlang BIF
+        <p>Returns <c>true</c> if <c><anno>Name</anno>/<anno>Arity</anno></c> is an Erlang BIF
           which is allowed in guards, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>type_test(Name, Arity) -> bool()</name>
+      <name name="type_test" arity="2"/>
       <fsummary>Test for a valid type test</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>Arity = integer()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Name/Arity</c> is a valid Erlang
+        <p>Returns <c>true</c> if <c><anno>Name</anno>/<anno>Arity</anno></c> is a valid Erlang
           type test, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>arith_op(OpName, Arity) -> bool()</name>
+      <name name="arith_op" arity="2"/>
       <fsummary>Test for an arithmetic operator</fsummary>
-      <type>
-        <v>OpName = atom()</v>
-        <v>Arity = integer()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>OpName/Arity</c> is an arithmetic
+        <p>Returns <c>true</c> if <c><anno>OpName</anno>/<anno>Arity</anno></c> is an arithmetic
           operator, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>bool_op(OpName, Arity) -> bool()</name>
+      <name name="bool_op" arity="2"/>
       <fsummary>Test for a Boolean operator</fsummary>
-      <type>
-        <v>OpName = atom()</v>
-        <v>Arity = integer()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>OpName/Arity</c> is a Boolean
+        <p>Returns <c>true</c> if <c><anno>OpName</anno>/<anno>Arity</anno></c> is a Boolean
           operator, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>comp_op(OpName, Arity) -> bool()</name>
+      <name name="comp_op" arity="2"/>
       <fsummary>Test for a comparison operator</fsummary>
-      <type>
-        <v>OpName = atom()</v>
-        <v>Arity = integer()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>OpName/Arity</c> is a comparison
+        <p>Returns <c>true</c> if <c><anno>OpName</anno>/<anno>Arity</anno></c> is a comparison
           operator, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>list_op(OpName, Arity) -> bool()</name>
+      <name name="list_op" arity="2"/>
       <fsummary>Test for a list operator</fsummary>
-      <type>
-        <v>OpName = atom()</v>
-        <v>Arity = integer()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>OpName/Arity</c> is a list
+        <p>Returns <c>true</c> if <c><anno>OpName</anno>/<anno>Arity</anno></c> is a list
           operator, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>send_op(OpName, Arity) -> bool()</name>
+      <name name="send_op" arity="2"/>
       <fsummary>Test for a send operator</fsummary>
-      <type>
-        <v>OpName = atom()</v>
-        <v>Arity = integer()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>OpName/Arity</c> is a send
+        <p>Returns <c>true</c> if <c><anno>OpName</anno>/<anno>Arity</anno></c> is a send
           operator, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>op_type(OpName, Arity) -> Type</name>
+      <name name="op_type" arity="2"/>
       <fsummary>Return operator type</fsummary>
-      <type>
-        <v>OpName = atom()</v>
-        <v>Arity = integer()</v>
-        <v>Type = arith | bool | comp | list | send</v>
-      </type>
       <desc>
-        <p>Returns the <c>Type</c> of operator that <c>OpName/Arity</c> 
+        <p>Returns the <c><anno>Type</anno></c> of operator that <c><anno>OpName</anno>/<anno>Arity</anno></c>
           belongs to, 
           or generates a <c>function_clause</c> error if it is not an 
           operator at all.</p>
diff --git a/lib/stdlib/doc/src/erl_lint.xml b/lib/stdlib/doc/src/erl_lint.xml
index 8639d678fa..b7fbdd8799 100644
--- a/lib/stdlib/doc/src/erl_lint.xml
+++ b/lib/stdlib/doc/src/erl_lint.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -60,29 +60,30 @@
       functions separately unless you have written your own Erlang
       compiler.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="error_info"/>
+    </datatype>
+    <datatype>
+      <name name="error_description"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>module(AbsForms) -> {ok,Warnings}  | {error,Errors,Warnings}</name>
-      <name>module(AbsForms, FileName) -> {ok,Warnings}  | {error,Errors,Warnings}</name>
-      <name>module(AbsForms, FileName, CompileOptions) ->  {ok,Warnings} | {error,Errors,Warnings}</name>
+      <name name="module" arity="1"/>
+      <name name="module" arity="2"/>
+      <name name="module" arity="3"/>
       <fsummary>Check a module for errors</fsummary>
-      <type>
-        <v>AbsForms = [term()]</v>
-        <v>FileName = FileName2 = atom() | string()</v>
-        <v>Warnings = Errors = [{Filename2,[ErrorInfo]}]</v>
-        <v>ErrorInfo = see separate description below.</v>
-        <v>CompileOptions = [term()]</v>
-      </type>
       <desc>
         <p>This function checks all the forms in a module for errors.
           It returns:
           </p>
         <taglist>
-          <tag><c>{ok,Warnings}</c></tag>
+          <tag><c>{ok,<anno>Warnings</anno>}</c></tag>
           <item>
             <p>There were no errors in the module.</p>
           </item>
-          <tag><c>{error,Errors,Warnings}</c></tag>
+          <tag><c>{error,<anno>Errors</anno>,<anno>Warnings</anno>}</c></tag>
           <item>
             <p>There were errors in the module.</p>
           </item>
@@ -93,14 +94,14 @@
           elements of <c>Options</c> that control the warnings are
           only described in <seealso marker="compiler:compile#erl_lint_options">compile(3)</seealso>.
           </p>
-        <p>The <c>AbsForms</c> of a module which comes from a file
+        <p>The <c><anno>AbsForms</anno></c> of a module which comes from a file
           that is read through <c>epp</c>, the Erlang pre-processor,
           can come from many files. This means that any references to
           errors must include the file name (see <seealso marker="epp">epp(3)</seealso>, or parser <seealso marker="erl_parse">erl_parse(3)</seealso>).
           The warnings and errors returned have the following format:
           </p>
         <code type="none">
-    [{FileName2,[ErrorInfo]}]        </code>
+    [{<anno>FileName2</anno>,[<anno>ErrorInfo</anno>]}]        </code>
         <p>The errors and warnings are listed in the order in which
           they are encountered in the forms. This means that the
           errors from one file may be split into different entries in
@@ -108,27 +109,20 @@
       </desc>
     </func>
     <func>
-      <name>is_guard_test(Expr) -> bool()</name>
+      <name name="is_guard_test" arity="1"/>
       <fsummary>Test for a guard test</fsummary>
-      <type>
-        <v>Expr = term()</v>
-      </type>
       <desc>
-        <p>This function tests if <c>Expr</c> is a legal guard test.
-          <c>Expr</c> is an Erlang term representing the abstract form
+        <p>This function tests if <c><anno>Expr</anno></c> is a legal guard test.
+          <c><anno>Expr</anno></c> is an Erlang term representing the abstract form
           for the expression. <c>erl_parse:parse_exprs(Tokens)</c> can
-          be used to generate a list of <c>Expr</c>.</p>
+          be used to generate a list of <c><anno>Expr</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>format_error(ErrorDescriptor) -> Chars</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Format an error descriptor</fsummary>
-      <type>
-        <v>ErrorDescriptor = errordesc()</v>
-        <v>Chars = [char() | Chars]</v>
-      </type>
       <desc>
-        <p>Takes an <c>ErrorDescriptor</c> and returns a string which
+        <p>Takes an <c><anno>ErrorDescriptor</anno></c> and returns a string which
           describes the error or warning. This function is usually
           called implicitly when processing an <c>ErrorInfo</c>
           structure (see below).</p>
diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml
index 18b592deea..bafc2e0746 100644
--- a/lib/stdlib/doc/src/erl_parse.xml
+++ b/lib/stdlib/doc/src/erl_parse.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -36,31 +36,51 @@
   <description>
     <p>This module is the basic Erlang parser which converts tokens into
       the abstract form of either forms (i.e., top-level constructs),
-      expressions, or terms. The Abstract Format is described in the ERTS
-      User's Guide.
+      expressions, or terms. The Abstract Format is described in the
+      <seealso marker="erts:absform">ERTS User's Guide</seealso>.
       Note that a token list must end with the <em>dot</em> token in order
       to be acceptable to the parse functions (see <seealso marker="erl_scan">erl_scan(3)</seealso>).</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="abstract_clause"></name>
+      <desc><p>Parse tree for Erlang clause.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="abstract_expr"></name>
+      <desc><p>Parse tree for Erlang expression.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="abstract_form"></name>
+      <desc><p>Parse tree for Erlang form.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="error_description"></name>
+    </datatype>
+    <datatype>
+      <name name="error_info"></name>
+    </datatype>
+    <datatype>
+      <name name="token"></name>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>parse_form(Tokens) -> {ok, AbsForm} | {error, ErrorInfo}</name>
+      <name name="parse_form" arity="1"/>
       <fsummary>Parse an Erlang form</fsummary>
-      <type>
-        <v>Tokens = [Token]</v>
-        <v>Token = {Tag,Line} | {Tag,Line,term()}</v>
-        <v>Tag = atom()</v>
-        <v>AbsForm = term()</v>
-        <v>ErrorInfo = see section Error Information below.</v>
-      </type>
       <desc>
-        <p>This function parses <c>Tokens</c> as if it were a form. It returns:</p>
+        <p>This function parses <c><anno>Tokens</anno></c> as if it were
+          a form. It returns:</p>
         <taglist>
-          <tag><c>{ok, AbsForm}</c></tag>
+          <tag><c>{ok, <anno>AbsForm</anno>}</c></tag>
           <item>
-            <p>The parsing was successful. <c>AbsForm</c> is the
+            <p>The parsing was successful. <c><anno>AbsForm</anno></c> is the
               abstract form of the parsed form.</p>
           </item>
-          <tag><c>{error, ErrorInfo}</c></tag>
+          <tag><c>{error, <anno>ErrorInfo</anno>}</c></tag>
           <item>
             <p>An error occurred.</p>
           </item>
@@ -68,25 +88,18 @@
       </desc>
     </func>
     <func>
-      <name>parse_exprs(Tokens) -> {ok, Expr_list} | {error, ErrorInfo}</name>
+      <name name="parse_exprs" arity="1"/>
       <fsummary>Parse Erlang expressions</fsummary>
-      <type>
-        <v>Tokens = [Token]</v>
-        <v>Token = {Tag,Line} | {Tag,Line,term()}</v>
-        <v>Tag = atom()</v>
-        <v>Expr_list = [AbsExpr]</v>
-        <v>AbsExpr = term()</v>
-        <v>ErrorInfo = see section Error Information below.</v>
-      </type>
       <desc>
-        <p>This function parses <c>Tokens</c> as if it were a list of expressions. It returns:</p>
+        <p>This function parses <c><anno>Tokens</anno></c> as if it were
+          a list of expressions. It returns:</p>
         <taglist>
-          <tag><c>{ok, Expr_list}</c></tag>
+          <tag><c>{ok, <anno>ExprList</anno>}</c></tag>
           <item>
-            <p>The parsing was successful. <c>Expr_list</c> is a
+            <p>The parsing was successful. <c><anno>ExprList</anno></c> is a
               list of the abstract forms of the parsed expressions.</p>
           </item>
-          <tag><c>{error, ErrorInfo}</c></tag>
+          <tag><c>{error, <anno>ErrorInfo</anno>}</c></tag>
           <item>
             <p>An error occurred.</p>
           </item>
@@ -94,21 +107,15 @@
       </desc>
     </func>
     <func>
-      <name>parse_term(Tokens) -> {ok, Term} | {error, ErrorInfo}</name>
+      <name name="parse_term" arity="1"/>
       <fsummary>Parse an Erlang term</fsummary>
-      <type>
-        <v>Tokens = [Token]</v>
-        <v>Token = {Tag,Line} | {Tag,Line,term()}</v>
-        <v>Tag = atom()</v>
-        <v>Term = term()</v>
-        <v>ErrorInfo = see section Error Information below.</v>
-      </type>
       <desc>
-        <p>This function parses <c>Tokens</c> as if it were a term. It returns:</p>
+        <p>This function parses <c><anno>Tokens</anno></c> as if it were
+          a term. It returns:</p>
         <taglist>
-          <tag><c>{ok, Term}</c></tag>
+          <tag><c>{ok, <anno>Term</anno>}</c></tag>
           <item>
-            <p>The parsing was successful. <c>Term</c> is
+            <p>The parsing was successful. <c><anno>Term</anno></c> is
               the Erlang term corresponding to the token list.</p>
           </item>
           <tag><c>{error, ErrorInfo}</c></tag>
@@ -122,7 +129,8 @@
       <name>format_error(ErrorDescriptor) -> Chars</name>
       <fsummary>Format an error descriptor</fsummary>
       <type>
-        <v>ErrorDescriptor = errordesc()</v>
+        <v>ErrorDescriptor = <seealso
+          marker="#type-error_info">error_description()</seealso></v>
         <v>Chars = [char() | Chars]</v>
       </type>
       <desc>
@@ -133,44 +141,32 @@
       </desc>
     </func>
     <func>
-      <name>tokens(AbsTerm) -> Tokens</name>
-      <name>tokens(AbsTerm, MoreTokens) -> Tokens</name>
+      <name name="tokens" arity="1"/>
+      <name name="tokens" arity="2"/>
       <fsummary>Generate a list of tokens for an expression</fsummary>
-      <type>
-        <v>Tokens = MoreTokens = [Token]</v>
-        <v>Token = {Tag,Line} | {Tag,Line,term()}</v>
-        <v>Tag = atom()</v>
-        <v>AbsTerm = term()</v>
-        <v>ErrorInfo = see section Error Information below.</v>
-      </type>
       <desc>
         <p>This function generates a list of tokens representing the abstract
-          form <c>AbsTerm</c> of an expression. Optionally, it appends
-          <c>Moretokens</c>.</p>
+          form <c><anno>AbsTerm</anno></c> of an expression. Optionally, it
+          appends <c><anno>MoreTokens</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>normalise(AbsTerm) -> Data</name>
+      <name name="normalise" arity="1"/>
       <fsummary>Convert abstract form to an Erlang term</fsummary>
-      <type>
-        <v>AbsTerm = Data = term()</v>
-      </type>
       <desc>
-        <p>Converts the abstract form <c>AbsTerm</c> of a term into a
+        <p>Converts the abstract form <c><anno>AbsTerm</anno></c> of a
+          term into a
           conventional Erlang data structure (i.e., the term itself).
           This is the inverse of <c>abstract/1</c>.</p>
       </desc>
     </func>
     <func>
-      <name>abstract(Data) -> AbsTerm</name>
+      <name name="abstract" arity="1"/>
       <fsummary>Convert an Erlang term into an abstract form</fsummary>
-      <type>
-        <v>Data = AbsTerm = term()</v>
-      </type>
       <desc>
-        <p>Converts the Erlang data structure <c>Data</c> into an
-          abstract form of type <c>AbsTerm</c>. This is the inverse of
-          <c>normalise/1</c>.</p>
+        <p>Converts the Erlang data structure <c><anno>Data</anno></c> into an
+          abstract form of type <c><anno>AbsTerm</anno></c>.
+          This is the inverse of <c>normalise/1</c>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/erl_pp.xml b/lib/stdlib/doc/src/erl_pp.xml
index 1fdda48893..57b5828bcd 100644
--- a/lib/stdlib/doc/src/erl_pp.xml
+++ b/lib/stdlib/doc/src/erl_pp.xml
@@ -43,93 +43,82 @@
     <p>All functions can have an optional argument which specifies a hook
       that is called if an attempt is made to print an unknown form.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="hook_function"/>
+      <desc>
+        <p>The optional argument <marker id="hook_function">
+          <c>HookFunction</c></marker>, shown in the functions described below,
+          defines a function which is called when an unknown form occurs where there
+          should be a valid expression.</p>
+
+        <p>If <c>HookFunction</c> is equal to <c>none</c> there is no hook
+           function.</p>
+
+        <p>The called hook function should return a (possibly deep) list
+          of characters. <seealso marker="#expr/4"><c>expr/4</c></seealso>
+          is useful in a hook.
+          </p>
+        <p>If <c><anno>CurrentIndentation</anno></c> is negative, there will be no line
+          breaks and only a space is used as a separator.</p>
+      </desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>form(Form) -> DeepCharList</name>
-      <name>form(Form, HookFunction) -> DeepCharList</name>
+      <name name="form" arity="1"/>
+      <name name="form" arity="2"/>
       <fsummary>Pretty print a form</fsummary>
-      <type>
-        <v>Form = term()</v>
-        <v>HookFunction = see separate description below.</v>
-        <v>DeepCharList = [char()|DeepCharList]</v>
-      </type>
       <desc>
         <p>Pretty prints a 
-          <c>Form</c> which is an abstract form of a type which is
-          returned by <c>erl_parse:parse_form</c>.</p>
+          <c><anno>Form</anno></c> which is an abstract form of a type which is
+          returned by <seealso marker="erl_parse#parse_form/1">
+          <c>erl_parse:parse_form/1</c></seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>attribute(Attribute) -> DeepCharList</name>
-      <name>attribute(Attribute, HookFunction) -> DeepCharList</name>
+      <name name="attribute" arity="1"/>
+      <name name="attribute" arity="2"/>
       <fsummary>Pretty print an attribute</fsummary>
-      <type>
-        <v>Attribute = term()</v>
-        <v>HookFunction = see separate description below.</v>
-        <v>DeepCharList = [char()|DeepCharList]</v>
-      </type>
       <desc>
         <p>The same as <c>form</c>, but only for the attribute
-          <c>Attribute</c>.</p>
+          <c><anno>Attribute</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>function(Function) -> DeepCharList</name>
-      <name>function(Function, HookFunction) -> DeepCharList</name>
+      <name name="function" arity="1"/>
+      <name name="function" arity="2"/>
       <fsummary>Pretty print a function</fsummary>
-      <type>
-        <v>Function = term()</v>
-        <v>HookFunction = see separate description below.</v>
-        <v>DeepCharList = [char()|DeepCharList]</v>
-      </type>
       <desc>
         <p>The same as <c>form</c>, but only for the function
-          <c>Function</c>.</p>
+          <c><anno>Function</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>guard(Guard) -> DeepCharList</name>
-      <name>guard(Guard, HookFunction) -> DeepCharList</name>
+      <name name="guard" arity="1"/>
+      <name name="guard" arity="2"/>
       <fsummary>Pretty print a guard</fsummary>
-      <type>
-        <v>Form = term()</v>
-        <v>HookFunction = see separate description below.</v>
-        <v>DeepCharList = [char()|DeepCharList]</v>
-      </type>
       <desc>
         <p>The same as <c>form</c>, but only for the guard test
-          <c>Guard</c>.</p>
+          <c><anno>Guard</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>exprs(Expressions) -> DeepCharList</name>
-      <name>exprs(Expressions, HookFunction) -> DeepCharList</name>
-      <name>exprs(Expressions, Indent, HookFunction) -> DeepCharList</name>
+      <name name="exprs" arity="1"/>
+      <name name="exprs" arity="2"/>
+      <name name="exprs" arity="3"/>
       <fsummary>Pretty print <c>Expressions</c></fsummary>
-      <type>
-        <v>Expressions = term()</v>
-        <v>HookFunction = see separate description below.</v>
-        <v>Indent = integer()</v>
-        <v>DeepCharList = [char()|DeepCharList]</v>
-      </type>
       <desc>
         <p>The same as <c>form</c>, but only for the sequence of
-          expressions in <c>Expressions</c>.</p>
+          expressions in <c><anno>Expressions</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>expr(Expression) -> DeepCharList</name>
-      <name>expr(Expression, HookFunction) -> DeepCharList</name>
-      <name>expr(Expression, Indent, HookFunction) -> DeepCharList</name>
-      <name>expr(Expression, Indent, Precedence, HookFunction) ->-> DeepCharList</name>
+      <name name="expr" arity="1"/>
+      <name name="expr" arity="2"/>
+      <name name="expr" arity="3"/>
+      <name name="expr" arity="4"/>
       <fsummary>Pretty print one <c>Expression</c></fsummary>
-      <type>
-        <v>Expression = term()</v>
-        <v>HookFunction = see separate description below.</v>
-        <v>Indent = integer()</v>
-        <v>Precedence = </v>
-        <v>DeepCharList = [char()|DeepCharList]</v>
-      </type>
       <desc>
         <p>This function prints one expression. It is useful for implementing hooks (see below).</p>
       </desc>
@@ -137,32 +126,6 @@
   </funcs>
 
   <section>
-    <title>Unknown Expression Hooks</title>
-    <p>The optional argument <c>HookFunction</c>, shown in the functions described above,  defines a function which is called when an unknown form occurs where there
-      should be a valid expression. It can have the following formats:</p>
-    <taglist>
-      <tag><c>Function</c></tag>
-      <item>
-        <p>The hook function is called by:</p>
-        <code type="none">
-Function(Expr, 
-         CurrentIndentation,
-         CurrentPrecedence,
-         HookFunction)        </code>
-      </item>
-      <tag><c>none</c></tag>
-      <item>
-        <p>There is no hook function</p>
-      </item>
-    </taglist>
-    <p>The called hook function should return a (possibly deep) list
-      of characters. <c>expr/4</c> is useful in a hook.
-      </p>
-    <p>If <c>CurrentIndentation</c> is negative, there will be no line
-      breaks and only a space is used as a separator.</p>
-  </section>
-
-  <section>
     <title>Bugs</title>
     <p>It should be possible to have hook functions for unknown forms
       at places other than expressions.</p>
diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml
index 1199c34f0f..54240dea19 100644
--- a/lib/stdlib/doc/src/erl_scan.xml
+++ b/lib/stdlib/doc/src/erl_scan.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -37,56 +37,96 @@
     <p>This module contains functions for tokenizing characters into
       Erlang tokens.</p>
   </description>
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-category() = atom()
-column() = integer() > 0
-line() = integer()
-location() = line() | {line(), column()}
-reserved_word_fun() -> fun(atom()) -> bool()
-set_attribute_fun() -> fun(term()) -> term()
-symbol() = atom() | float() | integer() | string()
-token() = {category(), attributes()} | {category(), attributes(), symbol()}
-attributes() = line() | list() | tuple()</code>
-  </section>
+  <datatypes>
+    <datatype>
+      <name name="attribute_info"></name>
+    </datatype>
+    <datatype>
+      <name name="attributes"></name>
+    </datatype>
+    <datatype>
+      <name name="attributes_data"></name>
+    </datatype>
+    <datatype>
+      <name name="category"></name>
+    </datatype>
+    <datatype>
+      <name name="column"></name>
+    </datatype>
+    <datatype>
+      <name name="error_description"></name>
+    </datatype>
+    <datatype>
+      <name name="error_info"></name>
+    </datatype>
+    <datatype>
+      <name name="info_line"></name>
+    </datatype>
+    <datatype>
+      <name name="info_location"></name>
+    </datatype>
+    <datatype>
+      <name name="line"></name>
+    </datatype>
+    <datatype>
+      <name name="location"></name>
+    </datatype>
+    <datatype>
+      <name name="option"></name>
+    </datatype>
+    <datatype>
+      <name name="options"></name>
+    </datatype>
+    <datatype>
+      <name name="symbol"></name>
+    </datatype>
+    <datatype>
+      <name name="resword_fun"></name>
+    </datatype>
+    <datatype>
+      <name name="token"></name>
+    </datatype>
+    <datatype>
+      <name name="token_info"></name>
+    </datatype>
+    <datatype>
+      <name name="tokens"></name>
+    </datatype>
+    <datatype>
+      <name name="tokens_result"></name>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>string(String) -> Return</name>
-      <name>string(String, StartLocation) -> Return</name>
-      <name>string(String, StartLocation, Options) -> Return</name>
+      <name name="string" arity="1"/>
+      <name name="string" arity="2"/>
+      <name name="string" arity="3"/>
       <fsummary>Scan a string and return the Erlang tokens</fsummary>
-      <type>
-        <v>String = string()</v>
-        <v>Return = {ok, Tokens, EndLocation} | Error</v>
-        <v>Tokens = [token()]</v>
-        <v>Error = {error, ErrorInfo, EndLocation}</v>
-        <v>StartLocation = EndLocation = location()</v>
-        <v>Options = Option | [Option]</v>
-        <v>Option = {reserved_word_fun,reserved_word_fun()}
-                  | return_comments | return_white_spaces | return
-                  | text</v>
-      </type>
       <desc>
-        <p>Takes the list of characters <c>String</c> and tries to
-          scan (tokenize) them. Returns <c>{ok, Tokens, EndLocation}</c>,
-          where <c>Tokens</c> are the Erlang tokens from
-          <c>String</c>. <c>EndLocation</c> is the first location
-          after the last token.</p>
-        <p><c>{error, ErrorInfo, EndLocation}</c> is returned if an
-          error occurs. <c>EndLocation</c> is the first location after
+        <p>Takes the list of characters <c><anno>String</anno></c> and tries to
+          scan (tokenize) them. Returns <c>{ok, <anno>Tokens</anno>,
+           <anno>EndLocation</anno>}</c>,
+          where <c><anno>Tokens</anno></c> are the Erlang tokens from
+          <c><anno>String</anno></c>. <c><anno>EndLocation</anno></c>
+          is the first location after the last token.</p>
+        <p><c>{error, <anno>ErrorInfo</anno>, <anno>ErrorLocation</anno>}</c>
+          is returned if an error occurs.
+          <c><anno>ErrorLocation</anno></c> is the first location after
           the erroneous token.</p>
-        <p><c>string(String)</c> is equivalent to
-          <c>string(String, 1)</c>, and <c>string(String,
-          StartLocation)</c> is equivalent to <c>string(String,
-          StartLocation, [])</c>.</p>
-        <p><c>StartLocation</c> indicates the initial location when
-          scanning starts. If <c>StartLocation</c> is a line
-          <c>attributes()</c> as well as <c>EndLocation</c> and
-          <c>ErrorLocation</c> will be lines. If
-          <c>StartLocation</c> is a pair of a line and a column
+        <p><c>string(<anno>String</anno>)</c> is equivalent to
+          <c>string(<anno>String</anno>, 1)</c>, and
+          <c>string(<anno>String</anno>,
+          <anno>StartLocation</anno>)</c> is equivalent to
+          <c>string(<anno>String</anno>,
+          <anno>StartLocation</anno>, [])</c>.</p>
+        <p><c><anno>StartLocation</anno></c> indicates the initial location
+          when scanning starts. If <c><anno>StartLocation</anno></c> is a line
+          <c>attributes()</c> as well as <c><anno>EndLocation</anno></c> and
+          <c><anno>ErrorLocation</anno></c> will be lines. If
+          <c><anno>StartLocation</anno></c> is a pair of a line and a column
           <c>attributes()</c> takes the form of an opaque compound
-          data type, and <c>EndLocation</c> and <c>ErrorLocation</c>
+          data type, and <c><anno>EndLocation</anno></c> and
+          <c><anno>ErrorLocation</anno></c>
           will be pairs of a line and a column. The <em>token
           attributes</em> contain information about the column and the
           line where the token begins, as well as the text of the
@@ -134,148 +174,130 @@ attributes() = line() | list() | tuple()</code>
       </desc>
     </func>
     <func>
-      <name>tokens(Continuation, CharSpec, StartLocation) -> Return</name>
-      <name>tokens(Continuation, CharSpec, StartLocation, Options) -> Return</name>
+      <name name="tokens" arity="3"/>
+      <name name="tokens" arity="4"/>
+      <type name="char_spec"/>
+      <type name="return_cont"/>
+      <type_desc name="return_cont">An opaque continuation</type_desc>
       <fsummary>Re-entrant scanner</fsummary>
-      <type>
-        <v>Continuation = [] | Continuation1</v>
-        <v>Return = {done, Result, LeftOverChars} | {more, Continuation1}</v>
-        <v>LeftOverChars = CharSpec</v>
-        <v>CharSpec = string() | eof</v>
-        <v>Continuation1 = tuple()</v>
-        <v>Result = {ok, Tokens, EndLocation} | {eof, EndLocation} | Error</v>
-        <v>Tokens = [token()]</v>
-        <v>Error = {error, ErrorInfo, EndLocation}</v>
-        <v>StartLocation = EndLocation = location()</v>
-        <v>Options = Option | [Option]</v>
-        <v>Option = {reserved_word_fun,reserved_word_fun()}
-                  | return_comments | return_white_spaces | return
-                  | text</v>
-      </type>
       <desc>
         <p>This is the re-entrant scanner which scans characters until
           a <em>dot</em> ('.' followed by a white space) or
           <c>eof</c> has been reached. It returns:</p>
         <taglist>
-          <tag><c>{done, Result, LeftOverChars}</c></tag>
+          <tag><c>{done, <anno>Result</anno>, <anno>LeftOverChars</anno>}</c>
+          </tag>
           <item>
             <p>This return indicates that there is sufficient input
-              data to get a result. <c>Result</c> is:</p>
+              data to get a result. <c><anno>Result</anno></c> is:</p>
             <taglist>
-              <tag><c>{ok, Tokens, EndLocation}</c></tag>
+              <tag><c>{ok, Tokens, EndLocation}</c>
+              </tag>
               <item>
-                <p>The scanning was successful. <c>Tokens</c> is the
-                  list of tokens including <em>dot</em>.</p>
+                <p>The scanning was successful. <c>Tokens</c>
+                  is the list of tokens including <em>dot</em>.</p>
               </item>
               <tag><c>{eof, EndLocation}</c></tag>
               <item>
                 <p>End of file was encountered before any more tokens.</p>
               </item>
-              <tag><c>{error, ErrorInfo, EndLocation}</c></tag>
+              <tag><c>{error, ErrorInfo, EndLocation}</c>
+              </tag>
               <item>
-                <p>An error occurred. <c>LeftOverChars</c> is the remaining
-                  characters of the input data,
+                <p>An error occurred. <c><anno>LeftOverChars</anno></c>
+                  is the remaining characters of the input data,
                   starting from <c>EndLocation</c>.</p>
               </item>
             </taglist>
           </item>
-          <tag><c>{more, Continuation1}</c></tag>
+          <tag><c>{more, <anno>Continuation1</anno>}</c></tag>
           <item>
             <p>More data is required for building a term.
-              <c>Continuation1</c> must be passed in a new call to
+              <c><anno>Continuation1</anno></c> must be passed in a new call to
               <c>tokens/3,4</c> when more data is available.</p>
           </item>
         </taglist>
-        <p>The <c>CharSpec</c> <c>eof</c> signals end of file.
-        <c>LeftOverChars</c> will then take the value <c>eof</c> as
-          well.</p>
-        <p><c>tokens(Continuation, CharSpec, StartLocation)</c> is
-          equivalent to <c>tokens(Continuation, CharSpec,
-          StartLocation, [])</c>.</p>
+        <p>The <c><anno>CharSpec</anno></c> <c>eof</c> signals end of file.
+        <c><anno>LeftOverChars</anno></c> will then take the value <c>eof</c>
+          as well.</p>
+        <p><c>tokens(<anno>Continuation</anno>, <anno>CharSpec</anno>,
+          <anno>StartLocation</anno>)</c> is equivalent to
+          <c>tokens(<anno>Continuation</anno>, <anno>CharSpec</anno>,
+          <anno>StartLocation</anno>, [])</c>.</p>
         <p>See <seealso marker="#string/3">string/3</seealso> for a
           description of the various options.</p>
       </desc>
     </func>
     <func>
-      <name>reserved_word(Atom) -> bool()</name>
+      <name name="reserved_word" arity="1"/>
       <fsummary>Test for a reserved word</fsummary>
-      <type>
-        <v>Atom = atom()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Atom</c> is an Erlang reserved
-          word, otherwise <c>false</c>.</p>
+        <p>Returns <c>true</c> if <c><anno>Atom</anno></c> is an Erlang
+         reserved word, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>token_info(Token) -> TokenInfo</name>
+      <name name="token_info" arity="1"/>
       <fsummary>Return information about a token</fsummary>
-      <type>
-        <v>Token = token()</v>
-        <v>TokenInfo = [TokenInfoTuple]</v>
-        <v>TokenInfoTuple = {TokenItem, Info}</v>
-        <v>TokenItem = atom()</v>
-        <v>Info = term()</v>
-      </type>
       <desc>
         <p>Returns a list containing information about the token
-          <c>Token</c>. The order of the <c>TokenInfoTuple</c>s is not
-          defined. The following <c>TokenItem</c>s are returned:
-          <c>category</c>, <c>column</c>, <c>length</c>,
-          <c>line</c>, <c>symbol</c>, and <c>text</c>. See <seealso
+          <c><anno>Token</anno></c>. The order of the
+          <c><anno>TokenInfoTuple</anno></c>s is not
+          defined. See <seealso
           marker="#token_info/2">token_info/2</seealso> for
           information about specific
-          <c>TokenInfoTuple</c>s.</p>
+          <c><anno>TokenInfoTuple</anno></c>s.</p>
         <p>Note that if <c>token_info(Token, TokenItem)</c> returns
-          <c>undefined</c> for some <c>TokenItem</c> in the list above, the
-          item is not included in <c>TokenInfo</c>.</p>
+          <c>undefined</c> for some <c>TokenItem</c>, the
+          item is not included in <c><anno>TokenInfo</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>token_info(Token, TokenItemSpec) -> TokenInfo</name>
+      <name name="token_info" arity="2" clause_i="1"/>
+      <name name="token_info" arity="2" clause_i="2"/>
+      <type name="token_item"/>
+      <type name="attribute_item"/>
       <fsummary>Return information about a token</fsummary>
-      <type>
-        <v>Token = token()</v>
-        <v>TokenItemSpec = TokenItem | [TokenItem]</v>
-        <v>TokenInfo = TokenInfoTuple | undefined | [TokenInfoTuple]</v>
-        <v>TokenInfoTuple = {TokenItem, Info}</v>
-        <v>TokenItem = atom()</v>
-        <v>Info = term()</v>
-      </type>
       <desc>
         <p>Returns a list containing information about the token
-          <c>Token</c>. If <c>TokenItemSpec</c> is a single
-          <c>TokenItem</c>, the returned value is the corresponding
+          <c><anno>Token</anno></c>. If one single
+          <c><anno>TokenItem</anno></c> is given the returned value is
+          the corresponding
           <c>TokenInfoTuple</c>, or <c>undefined</c> if the
-          <c>TokenItem</c> has no value. If <c>TokenItemSpec</c> is a
-          list of
-          <c>TokenItem</c>, the result is a list of
-          <c>TokenInfoTuple</c>. The <c>TokenInfoTuple</c>s will
-          appear with the corresponding
-	  <c>TokenItem</c>s in the same order as the <c>TokenItem</c>s
-	  appeared in the list of <c>TokenItem</c>s. <c>TokenItem</c>s
-	  with no value are not included in the list of
-	  <c>TokenInfoTuple</c>.</p>
-	<p>The following <c>TokenInfoTuple</c>s with corresponding
-	   <c>TokenItem</c>s are valid:</p>
+          <c>TokenItem</c> has no value. If a list of
+          <c><anno>TokenItem</anno></c>s is given the result is a list of
+          <c><anno>TokenInfoTuple</anno></c>. The
+          <c><anno>TokenInfoTuple</anno></c>s will
+          appear with the corresponding <c><anno>TokenItem</anno></c>s in
+          the same order as the <c><anno>TokenItem</anno></c>s
+	  appear in the list of <c>TokenItem</c>s.
+          <c><anno>TokenItem</anno></c>s with no value are not included
+          in the list of <c><anno>TokenInfoTuple</anno></c>.</p>
+	<p>The following <c><anno>TokenInfoTuple</anno></c>s with corresponding
+	   <c><anno>TokenItem</anno></c>s are valid:</p>
         <taglist>
-          <tag><c>{category, category()}</c></tag>
+          <tag><c>{category, <seealso marker="#type-category">
+            category()</seealso>}</c></tag>
           <item><p>The category of the token.</p>
           </item>
-          <tag><c>{column, column()}</c></tag>
+          <tag><c>{column, <seealso marker="#type-column">
+            column()</seealso>}</c></tag>
           <item><p>The column where the token begins.</p>
           </item>
           <tag><c>{length, integer() > 0}</c></tag>
           <item><p>The length of the token's text.</p>
           </item>
-          <tag><c>{line, line()}</c></tag>
+          <tag><c>{line, <seealso marker="#type-line">
+            line()</seealso>}</c></tag>
           <item><p>The line where the token begins.</p>
           </item>
-          <tag><c>{location, location()}</c></tag>
+          <tag><c>{location, <seealso marker="#type-location">
+            location()</seealso>}</c></tag>
           <item><p>The line and column where the token begins, or
             just the line if the column unknown.</p>
           </item>
-          <tag><c>{symbol, symbol()}</c></tag>
+          <tag><c>{symbol, <seealso marker="#type-symbol">
+            symbol()</seealso>}</c></tag>
           <item><p>The token's symbol.</p>
           </item>
           <tag><c>{text, string()}</c></tag>
@@ -285,70 +307,59 @@ attributes() = line() | list() | tuple()</code>
       </desc>
     </func>
     <func>
-      <name>attributes_info(Attributes) -> AttributesInfo</name>
+      <name name="attributes_info" arity="1"/>
       <fsummary>Return information about token attributes</fsummary>
-      <type>
-        <v>Attributes = attributes()</v>
-        <v>AttributesInfo = [AttributeInfoTuple]</v>
-        <v>AttributeInfoTuple = {AttributeItem, Info}</v>
-        <v>AttributeItem = atom()</v>
-        <v>Info = term()</v>
-      </type>
       <desc>
         <p>Returns a list containing information about the token
-          attributes <c>Attributes</c>. The order of the
-          <c>AttributeInfoTuple</c>s is not defined. The following
-          <c>AttributeItem</c>s are returned:
-          <c>column</c>, <c>length</c>, <c>line</c>, and <c>text</c>.
+          attributes <c><anno>Attributes</anno></c>. The order of the
+          <c><anno>AttributeInfoTuple</anno></c>s is not defined.
           See <seealso
           marker="#attributes_info/2">attributes_info/2</seealso> for
           information about specific
-          <c>AttributeInfoTuple</c>s.</p>
+          <c><anno>AttributeInfoTuple</anno></c>s.</p>
         <p>Note that if <c>attributes_info(Token, AttributeItem)</c>
           returns <c>undefined</c> for some <c>AttributeItem</c> in
           the list above, the item is not included in
-          <c>AttributesInfo</c>.</p>
+          <c><anno>AttributesInfo</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>attributes_info(Attributes, AttributeItemSpec) -> AttributesInfo</name>
+      <name name="attributes_info" arity="2" clause_i="1"/>
+      <name name="attributes_info" arity="2" clause_i="2"/>
       <fsummary>Return information about a token attributes</fsummary>
-      <type>
-        <v>Attributes = attributes()</v>
-        <v>AttributeItemSpec = AttributeItem | [AttributeItem]</v>
-        <v>AttributesInfo = AttributeInfoTuple | undefined
-                          | [AttributeInfoTuple]</v>
-        <v>AttributeInfoTuple = {AttributeItem, Info}</v>
-        <v>AttributeItem = atom()</v>
-        <v>Info = term()</v>
-      </type>
+      <type name="attribute_item"/>
       <desc>
         <p>Returns a list containing information about the token
-          attributes <c>Attributes</c>. If <c>AttributeItemSpec</c> is
-          a single <c>AttributeItem</c>, the returned value is the
-          corresponding <c>AttributeInfoTuple</c>, or <c>undefined</c>
-          if the <c>AttributeItem</c> has no value. If
-          <c>AttributeItemSpec</c> is a list of
-          <c>AttributeItem</c>, the result is a list of
-          <c>AttributeInfoTuple</c>. The <c>AttributeInfoTuple</c>s
-          will appear with the corresponding <c>AttributeItem</c>s in
-          the same order as the <c>AttributeItem</c>s appeared in the
-          list of <c>AttributeItem</c>s. <c>AttributeItem</c>s with no
+          attributes <c><anno>Attributes</anno></c>. If one single
+          <c><anno>AttributeItem</anno></c> is given the returned value is the
+          corresponding <c><anno>AttributeInfoTuple</anno></c>,
+          or <c>undefined</c> if the <c><anno>AttributeItem</anno></c>
+          has no value. If a list of <c><anno>AttributeItem</anno></c>
+          is given the result is a list of
+          <c><anno>AttributeInfoTuple</anno></c>.
+          The <c><anno>AttributeInfoTuple</anno></c>s
+          will appear with the corresponding <c><anno>AttributeItem</anno></c>s
+          in the same order as the <c><anno>AttributeItem</anno></c>s
+          appear in the list of <c><anno>AttributeItem</anno></c>s.
+          <c><anno>AttributeItem</anno></c>s with no
           value are not included in the list of
-	  <c>AttributeInfoTuple</c>.</p>
-	<p>The following <c>AttributeInfoTuple</c>s with corresponding
-	   <c>AttributeItem</c>s are valid:</p>
+	  <c><anno>AttributeInfoTuple</anno></c>.</p>
+	<p>The following <c><anno>AttributeInfoTuple</anno></c>s with
+          corresponding <c><anno>AttributeItem</anno></c>s are valid:</p>
         <taglist>
-          <tag><c>{column, column()}</c></tag>
+          <tag><c>{column, <seealso marker="#type-column">
+            column()</seealso>}</c></tag>
           <item><p>The column where the token begins.</p>
           </item>
           <tag><c>{length, integer() > 0}</c></tag>
           <item><p>The length of the token's text.</p>
           </item>
-          <tag><c>{line, line()}</c></tag>
+          <tag><c>{line, <seealso marker="#type-line">
+            line()</seealso>}</c></tag>
           <item><p>The line where the token begins.</p>
           </item>
-          <tag><c>{location, location()}</c></tag>
+          <tag><c>{location, <seealso marker="#type-location">
+            location()</seealso>}</c></tag>
           <item><p>The line and column where the token begins, or
             just the line if the column unknown.</p>
           </item>
@@ -359,29 +370,22 @@ attributes() = line() | list() | tuple()</code>
       </desc>
     </func>
     <func>
-      <name>set_attribute(AttributeItem, Attributes, SetAttributeFun) -> AttributesInfo</name>
+      <name name="set_attribute" arity="3"/>
       <fsummary>Set a token attribute value</fsummary>
-      <type>
-        <v>AttributeItem = line</v>
-        <v>Attributes = attributes()</v>
-        <v>SetAttributeFun = set_attribute_fun()</v>
-      </type>
       <desc>
         <p>Sets the value of the <c>line</c> attribute of the token
-          attributes <c>Attributes</c>.</p>
-        <p>The <c>SetAttributeFun</c> is called with the value of
+          attributes <c><anno>Attributes</anno></c>.</p>
+        <p>The <c><anno>SetAttributeFun</anno></c> is called with the value of
           the <c>line</c> attribute, and is to return the new value of
           the <c>line</c> attribute.</p>
       </desc>
     </func>
     <func>
-      <name>format_error(ErrorDescriptor) -> string()</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Format an error descriptor</fsummary>
-      <type>
-        <v>ErrorDescriptor = errordesc()</v>
-      </type>
       <desc>
-        <p>Takes an <c>ErrorDescriptor</c> and returns a string which
+        <p>Takes an <c><anno>ErrorDescriptor</anno></c> and returns
+          a string which
           describes the error or warning. This function is usually
           called implicitly when processing an <c>ErrorInfo</c>
           structure (see below).</p>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 746f94d3f4..8c952708c5 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -126,15 +126,30 @@
       <em>ERTS User's Guide</em>.</p>
   </section>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-match_spec()
-  a match specification, see above
-
-tid()
-  a table identifier, as returned by new/2</code>
-  </section>
+  <datatypes>
+    <datatype>
+      <name><marker id="type-continuation">continuation()</marker></name>
+      <desc>
+        <p>Opaque continuation used by <seealso marker="#select/1">
+          <c>select/1</c></seealso> and <seealso marker="#select/3">
+          <c>select/3</c></seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="match_spec"/>
+      <desc><p>A match specification, see above.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="match_pattern"/>
+    </datatype>
+    <datatype>
+      <name name="tab"/>
+    </datatype>
+    <datatype>
+      <name name="tid"/>
+      <desc><p>A table identifier, as returned by new/2.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
       <name>all() -> [Tab]</name>
@@ -197,37 +212,25 @@ tid()
       </desc>
     </func>
     <func>
-      <name>file2tab(Filename) -> {ok,Tab} | {error,Reason}</name>
+      <name name="file2tab" arity="1"/>
       <fsummary>Read an ETS table from a file.</fsummary>
-      <type>
-        <v>Filename = string() | atom()</v>
-        <v>Tab = tid() | atom()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>Reads a file produced by <seealso
           marker="#tab2file/2">tab2file/2</seealso> or 
 	  <seealso marker="#tab2file/3">tab2file/3</seealso> and creates the
-          corresponding table <c>Tab</c>.</p>
-	<p>Equivalent to <c>file2tab(Filename,[])</c>.</p>
+          corresponding table <c><anno>Tab</anno></c>.</p>
+	<p>Equivalent to <c>file2tab(<anno>Filename</anno>, [])</c>.</p>
       </desc>
     </func>
     <func>
-      <name>file2tab(Filename,Options) -> {ok,Tab} | {error,Reason}</name>
+      <name name="file2tab" arity="2"/>
       <fsummary>Read an ETS table from a file.</fsummary>
-      <type>
-        <v>Filename = string() | atom()</v>
-        <v>Tab = tid() | atom()</v>
-	<v>Options = [Option]</v>
-	<v>Option = {verify, bool()}</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>Reads a file produced by <seealso
           marker="#tab2file/2">tab2file/2</seealso> or 
 	  <seealso marker="#tab2file/3">tab2file/3</seealso> and creates the
-          corresponding table <c>Tab</c>.</p>
-	<p>The currently only supported option is <c>{verify,bool()}</c>. If 
+          corresponding table <c><anno>Tab</anno></c>.</p>
+	<p>The currently only supported option is <c>{verify,boolean()}</c>. If
 	verification is turned on (by means of specifying 
 	<c>{verify,true}</c>), the function utilizes whatever
 	information is present in the file to assert that the
@@ -271,70 +274,52 @@ tid()
       </desc>
     </func>
     <func>
-      <name>foldl(Function, Acc0, Tab) -> Acc1</name>
+      <name name="foldl" arity="3"/>
       <fsummary>Fold a function over an ETS table</fsummary>
-      <type>
-        <v>Function = fun(A, AccIn) -> AccOut</v>
-        <v>Tab = tid() | atom()</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-      </type>
       <desc>
-        <p><c>Acc0</c> is returned if the table is empty.
+        <p><c><anno>Acc0</anno></c> is returned if the table is empty.
           This function is similar to <c>lists:foldl/3</c>. The order in
           which the elements of the table are traversed is unspecified,
           except for tables of type <c>ordered_set</c>, for which they
           are traversed first to last.</p>
 
-	 <p>If <c>Function</c> inserts objects into the table, or another
+	 <p>If <c><anno>Function</anno></c> inserts objects into the table, or another
 	 process inserts objects into the table, those objects <em>may</em>
 	 (depending on key ordering) be included in the traversal.</p>
       </desc>
     </func>
     <func>
-      <name>foldr(Function, Acc0, Tab) -> Acc1</name>
+      <name name="foldr" arity="3"/>
       <fsummary>Fold a function over an ETS table</fsummary>
-      <type>
-        <v>Function = fun(A, AccIn) -> AccOut</v>
-        <v>Tab = tid() | atom()</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-      </type>
       <desc>
-        <p><c>Acc0</c> is returned if the table is empty.
+        <p><c><anno>Acc0</anno></c> is returned if the table is empty.
           This function is similar to <c>lists:foldr/3</c>. The order in
           which the elements of the table are traversed is unspecified,
           except for tables of type <c>ordered_set</c>, for which they
           are traversed last to first.</p>
 
-	 <p>If <c>Function</c> inserts objects into the table, or another
+	 <p>If <c><anno>Function</anno></c> inserts objects into the table, or another
 	 process inserts objects into the table, those objects <em>may</em>
 	 (depending on key ordering) be included in the traversal.</p>
       </desc>
     </func>
     <func>
-      <name>from_dets(Tab, DetsTab) -> true</name>
+      <name name="from_dets" arity="2"/>
       <fsummary>Fill an ETS table with objects from a Dets table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>DetsTab = atom()</v>
-      </type>
       <desc>
         <p>Fills an already created ETS table with the objects in the
-          already opened Dets table named <c>DetsTab</c>. The existing
+          already opened Dets table named <c><anno>DetsTab</anno></c>. The existing
           objects of the ETS table are kept unless overwritten.</p>
 	<p>Throws a badarg error if any of the tables does not exist or the 
 	  dets table is not open.</p>
       </desc>
     </func>
     <func>
-      <name>fun2ms(LiteralFun) -> MatchSpec</name>
+      <name name="fun2ms" arity="1"/>
       <fsummary>Pseudo function that transforms fun syntax to a match_spec.</fsummary>
-      <type>
-        <v>LiteralFun -- see below</v>
-        <v>MatchSpec = match_spec()</v>
-      </type>
       <desc>
         <p>Pseudo function that by means of a <c>parse_transform</c>
-          translates <c>LiteralFun</c> typed as parameter in the
+          translates <c><anno>LiteralFun</anno></c> typed as parameter in the
           function call to a
           <seealso marker="#match_spec">match_spec</seealso>. With
           "literal" is meant that the fun needs to textually be written
@@ -342,7 +327,7 @@ tid()
           variable which in turn is passed to the function).</p>
         <p>The parse transform is implemented in the module
           <c>ms_transform</c> and the source <em>must</em> include the
-          file <c>ms_transform.hrl</c> in <c>stdlib</c> for this
+          file <c>ms_transform.hrl</c> in STDLIB for this
           pseudo function to work. Failing to include the hrl file in
           the source will result in a runtime error, not a compile
           time ditto. The include file is easiest included by adding
@@ -422,20 +407,17 @@ Error: fun containing local Erlang function calls
       </desc>
     </func>
     <func>
-      <name>i() -> ok</name>
+      <name name="i" arity="0"/>
       <fsummary>Display information about all ETS tables on tty.</fsummary>
       <desc>
         <p>Displays information about all ETS tables on tty.</p>
       </desc>
     </func>
     <func>
-      <name>i(Tab) -> ok</name>
+      <name name="i" arity="1"/>
       <fsummary>Browse an ETS table on tty.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-      </type>
       <desc>
-        <p>Browses the table <c>Tab</c> on tty.</p>
+        <p>Browses the table <c><anno>Tab</anno></c> on tty.</p>
       </desc>
     </func>
     <func>
@@ -454,7 +436,7 @@ Error: fun containing local Erlang function calls
 	  correct type, this function fails with reason <c>badarg</c>.</p>
 
         <list type="bulleted">
-          <item><c>Item=memory, Value=int()</c>          <br></br>
+          <item><c>Item=memory, Value=integer()</c>          <br></br>
 
            The number of words allocated to the table.</item>
           <item><c>Item=owner, Value=pid()</c>          <br></br>
@@ -466,7 +448,7 @@ Error: fun containing local Erlang function calls
           <item><c>Item=name, Value=atom()</c>          <br></br>
 
            The name of the table.</item>
-          <item><c>Item=size, Value=int()</c>          <br></br>
+          <item><c>Item=size, Value=integer()</c>          <br></br>
 
            The number of objects inserted in the table.</item>
           <item><c>Item=node, Value=atom()</c>          <br></br>
@@ -479,7 +461,7 @@ Error: fun containing local Erlang function calls
           <item><c>Item=type, Value=set|ordered_set|bag|duplicate_bag</c>          <br></br>
 
            The table type.</item>
-          <item><c>Item=keypos, Value=int()</c>          <br></br>
+          <item><c>Item=keypos, Value=integer()</c>          <br></br>
 
            The key position.</item>
           <item><c>Item=protection, Value=public|protected|private</c>          <br></br>
@@ -536,25 +518,19 @@ Error: fun containing local Erlang function calls
       </desc>
     </func>
     <func>
-      <name>init_table(Name, InitFun) -> true</name>
+      <name name="init_table" arity="2"/>
       <fsummary>Replace all objects of an ETS table.</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>InitFun = fun(Arg) -> Res</v>
-        <v>Arg = read | close</v>
-        <v>Res = end_of_input | {[object()], InitFun} | term()</v>
-      </type>
       <desc>
-        <p>Replaces the existing objects of the table <c>Tab</c> with
-          objects created by calling the input function <c>InitFun</c>,
+        <p>Replaces the existing objects of the table <c><anno>Tab</anno></c> with
+          objects created by calling the input function <c><anno>InitFun</anno></c>,
           see below. This function is provided for compatibility with
           the <c>dets</c> module, it is not more efficient than filling
           a table by using <c>ets:insert/2</c>.
           </p>
         <p>When called with the argument <c>read</c> the function
-          <c>InitFun</c> is assumed to return <c>end_of_input</c> when
-          there is no more input, or <c>{Objects, Fun}</c>, where
-          <c>Objects</c> is a list of objects and <c>Fun</c> is a new
+          <c><anno>InitFun</anno></c> is assumed to return <c>end_of_input</c> when
+          there is no more input, or <c>{<anno>Objects</anno>, Fun}</c>, where
+          <c><anno>Objects</anno></c> is a list of objects and <c>Fun</c> is a new
           input function. Any other value Value is returned as an error
           <c>{error, {init_fun, Value}}</c>. Each input function will be
           called exactly once, and should an error occur, the last
@@ -594,7 +570,7 @@ Error: fun containing local Erlang function calls
       </desc>
     </func>
     <func>
-      <name>insert_new(Tab, ObjectOrObjects) -> bool()</name>
+      <name>insert_new(Tab, ObjectOrObjects) -> boolean()</name>
       <fsummary>Insert an object into an ETS table if the key is not already present.</fsummary>
       <type>
         <v>Tab = tid() | atom()</v>
@@ -615,7 +591,7 @@ Error: fun containing local Erlang function calls
       </desc>
     </func>
     <func>
-      <name>is_compiled_ms(Term) -> bool()</name>
+      <name>is_compiled_ms(Term) -> boolean()</name>
       <fsummary>Checks if an Erlang term is the result of ets:match_spec_compile</fsummary>
       <type>
         <v>Term = term()</v>
@@ -708,7 +684,7 @@ ets:is_compiled_ms(Broken).</code>
       <type>
         <v>Tab = tid() | atom()</v>
         <v>Key = term()</v>
-        <v>Pos = int()</v>
+        <v>Pos = integer()</v>
         <v>Elem = term() | [term()]</v>
       </type>
       <desc>
@@ -802,15 +778,11 @@ ets:is_compiled_ms(Broken).</code>
       </desc>
     </func>
     <func>
-      <name>match_delete(Tab, Pattern) -> true</name>
+      <name name="match_delete" arity="2"/>
       <fsummary>Delete all objects which match a given pattern from an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Pattern = tuple()</v>
-      </type>
       <desc>
-        <p>Deletes all objects which match the pattern <c>Pattern</c>
-          from the table <c>Tab</c>. See <c>match/2</c> for a
+        <p>Deletes all objects which match the pattern <c><anno>Pattern</anno></c>
+          from the table <c><anno>Tab</anno></c>. See <c>match/2</c> for a
           description of patterns.</p>
       </desc>
     </func>
@@ -957,8 +929,8 @@ ets:select(Table,MatchSpec),</code>
         <v>&nbsp;Option = Type | Access | named_table | {keypos,Pos} | {heir,pid(),HeirData} | {heir,none} | Tweaks</v>
         <v>&nbsp;&nbsp;Type = set | ordered_set | bag | duplicate_bag</v>
         <v>&nbsp;&nbsp;Access = public | protected | private</v>
-        <v>&nbsp;&nbsp;Tweaks = {write_concurrency,bool()} | {read_concurrency,bool()} | compressed</v>
-        <v>&nbsp;&nbsp;Pos = int()</v>
+        <v>&nbsp;&nbsp;Tweaks = {write_concurrency,boolean()} | {read_concurrency,boolean()} | compressed</v>
+        <v>&nbsp;&nbsp;Pos = integer()</v>
         <v>&nbsp;&nbsp;HeirData = term()</v>
       </type>
       <desc>
@@ -1050,7 +1022,7 @@ ets:select(Table,MatchSpec),</code>
           </item>
           <item>
             <marker id="new_2_write_concurrency"></marker>
-            <p><c>{write_concurrency,bool()}</c>
+            <p><c>{write_concurrency,boolean()}</c>
               Performance tuning. Default is <c>false</c>, in which case an operation that
               mutates (writes to) the table will obtain exclusive access,
               blocking any concurrent access of the same table until finished.
@@ -1074,7 +1046,7 @@ ets:select(Table,MatchSpec),</code>
           </item>
           <item>
             <marker id="new_2_read_concurrency"></marker>
-	    <p><c>{read_concurrency,bool()}</c>
+	    <p><c>{read_concurrency,boolean()}</c>
               Performance tuning. Default is <c>false</c>. When set to
 	      <c>true</c>, the table is optimized for concurrent read
 	      operations. When this option is enabled on a runtime system with
@@ -1160,12 +1132,8 @@ ets:select(Table,MatchSpec),</code>
       </desc>
     </func>
     <func>
-      <name>repair_continuation(Continuation, MatchSpec) -> Continuation</name>
+      <name name="repair_continuation" arity="2"/>
       <fsummary>Repair a continuation from ets:select/1 or ets:select/3 that has passed through external representation</fsummary>
-      <type>
-        <v>Continuation = term()</v>
-        <v>MatchSpec = match_spec()</v>
-      </type>
       <desc>
         <p>This function can be used to restore an opaque continuation
           returned by <c>ets:select/3</c> or <c>ets:select/1</c> if the
@@ -1551,7 +1519,7 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       <fsummary>Return all objects in a given slot of an ETS table.</fsummary>
       <type>
         <v>Tab = tid() | atom()</v>
-        <v>I = int()</v>
+        <v>I = integer()</v>
         <v>Object = tuple()</v>
       </type>
       <desc>
@@ -1572,32 +1540,19 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
-      <name>tab2file(Tab, Filename) -> ok | {error,Reason}</name>
+      <name name="tab2file" arity="2"/>
       <fsummary>Dump an ETS table to a file.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Filename = string() | atom()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
-        <p>Dumps the table <c>Tab</c> to the file <c>Filename</c>.</p>
-	<p>Equivalent to <c>tab2file(Tab, Filename,[])</c></p>
+        <p>Dumps the table <c><anno>Tab</anno></c> to the file <c><anno>Filename</anno></c>.</p>
+	<p>Equivalent to <c>tab2file(<anno>Tab</anno>, <anno>Filename</anno>,[])</c></p>
 
       </desc>
     </func>
     <func>
-      <name>tab2file(Tab, Filename, Options) -> ok | {error,Reason}</name>
+      <name name="tab2file" arity="3"/>
       <fsummary>Dump an ETS table to a file.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Filename = string() | atom()</v>
-	<v>Options = [Option]</v>
-	<v>Option = {extended_info, [ExtInfo]}</v>
-	<v>ExtInfo = object_count | md5sum</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
-        <p>Dumps the table <c>Tab</c> to the file <c>Filename</c>.</p>
+        <p>Dumps the table <c><anno>Tab</anno></c> to the file <c><anno>Filename</anno></c>.</p>
 	<p>When dumping the table, certain information about the table
 	is dumped to a header at the beginning of the dump. This
 	information contains data about the table type,
@@ -1634,26 +1589,15 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
-      <name>tab2list(Tab) -> [Object]</name>
+      <name name="tab2list" arity="1"/>
       <fsummary>Return a list of all objects in an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>Object = tuple()</v>
-      </type>
       <desc>
-        <p>Returns a list of all objects in the table <c>Tab</c>.</p>
+        <p>Returns a list of all objects in the table <c><anno>Tab</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>tabfile_info(Filename) -> {ok, TableInfo} | {error, Reason}</name>
+      <name name="tabfile_info" arity="1"/>
       <fsummary>Return a list of all objects in an ETS table.</fsummary>
-      <type>
-      <v>Filename = string() | atom()</v>
-      <v>TableInfo = [InfoItem]</v>
-      <v>InfoItem = {InfoTag, term()}</v>
-      <v>InfoTag = name | type | protection | named_table | keypos | size | extended_info | version</v>
-      <v>Reason = term()</v>
-      </type>
       <desc>
         <p>Returns information about the table dumped to file by 
         <seealso marker="#tab2file/2">tab2file/2</seealso> or 
@@ -1699,7 +1643,7 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
 	one or more of the atoms <c>object_count</c> and
 	<c>md5sum</c>.</item>
 	<tag>version</tag>
-	<item>A tuple <c>{Major,Minor}</c> containing the major and
+	<item>A tuple <c>{<anno>Major</anno>,<anno>Minor</anno>}</c> containing the major and
 	minor version of the file format for ets table dumps. This
 	version field was added beginning with stdlib-1.5.1, files
 	dumped with older versions will return <c>{0,0}</c> in this
@@ -1712,20 +1656,11 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
-      <name>table(Tab [, Options]) -> QueryHandle</name>
+      <name name="table" arity="1"/>
+      <name name="table" arity="2"/>
       <fsummary>Return a QLC query handle.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>QueryHandle = -&nbsp;a query handle, see qlc(3)&nbsp;-</v>
-        <v>Options = [Option] | Option</v>
-        <v>Option = {n_objects, NObjects} | {traverse, TraverseMethod}</v>
-        <v>NObjects = default | integer() > 0</v>
-        <v>TraverseMethod = first_next | last_prev | select | {select, MatchSpec}</v>
-        <v>MatchSpec = match_spec()</v>
-      </type>
       <desc>
-        <p>          <marker id="qlc_table"></marker>
-Returns a QLC (Query List
+        <p><marker id="qlc_table"></marker>Returns a QLC (Query List
           Comprehension) query handle. The module <c>qlc</c> implements
           a query language aimed mainly at Mnesia but ETS tables, Dets
           tables, and lists are also recognized by QLC as sources of
@@ -1760,7 +1695,7 @@ Returns a QLC (Query List
               that matches all objects.</p>
           </item>
           <item>
-            <p><c>{select, MatchSpec}</c>. As for <c>select</c>
+            <p><c>{select, <anno>MatchSpec</anno>}</c>. As for <c>select</c>
               the table is traversed by calling <c>ets:select/3</c> and
               <c>ets:select/1</c>. The difference is that the
               match_spec is explicitly given. This is how to state
@@ -1788,41 +1723,31 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>test_ms(Tuple, MatchSpec) -> {ok, Result} | {error, Errors}</name>
+      <name name="test_ms" arity="2"/>
       <fsummary>Test a match_spec for use in ets:select/2.</fsummary>
-      <type>
-        <v>Tuple = tuple()</v>
-        <v>MatchSpec = match_spec()</v>
-        <v>Result = term()</v>
-        <v>Errors = [{warning|error, string()}]</v>
-      </type>
       <desc>
         <p>This function is a utility to test a
           <seealso marker="#match_spec">match_spec</seealso> used in
           calls to <c>ets:select/2</c>. The function both tests
-          <c>MatchSpec</c> for "syntactic" correctness and runs the
-          match_spec against the object <c>Tuple</c>. If the match_spec
-          contains errors, the tuple <c>{error, Errors}</c> is returned
-          where <c>Errors</c> is a list of natural language
+          <c><anno>MatchSpec</anno></c> for "syntactic" correctness and runs the
+          match_spec against the object <c><anno>Tuple</anno></c>. If the match_spec
+          contains errors, the tuple <c>{error, <anno>Errors</anno>}</c> is returned
+          where <c><anno>Errors</anno></c> is a list of natural language
           descriptions of what was wrong with the match_spec. If the
           match_spec is syntactically OK, the function returns
-          <c>{ok,Term}</c> where <c>Term</c> is what would have been
+          <c>{ok,<anno>Result</anno>}</c> where <c><anno>Result</anno></c> is what would have been
           the result in a real <c>ets:select/2</c> call or <c>false</c>
-          if the match_spec does not match the object <c>Tuple</c>.</p>
+          if the match_spec does not match the object <c><anno>Tuple</anno></c>.</p>
         <p>This is a useful debugging and test tool, especially when
           writing complicated <c>ets:select/2</c> calls.</p>
       </desc>
     </func>
     <func>
-      <name>to_dets(Tab, DetsTab) -> DetsTab</name>
+      <name name="to_dets" arity="2"/>
       <fsummary>Fill a Dets table with objects from an ETS table.</fsummary>
-      <type>
-        <v>Tab = tid() | atom()</v>
-        <v>DetsTab = atom()</v>
-      </type>
       <desc>
         <p>Fills an already created/opened Dets table with the objects
-          in the already opened ETS table named <c>Tab</c>. The Dets
+          in the already opened ETS table named <c><anno>Tab</anno></c>. The Dets
           table is emptied before the objects are inserted.</p>
       </desc>
     </func>
@@ -1835,7 +1760,7 @@ true</pre>
         <v>Tab = tid() | atom()</v>
         <v>Key = term()</v> 
         <v>UpdateOp = {Pos,Incr} | {Pos,Incr,Threshold,SetValue}</v>
-        <v>Pos = Incr = Threshold = SetValue = Result = int()</v>
+        <v>Pos = Incr = Threshold = SetValue = Result = integer()</v>
       </type>
       <desc>
         <p>This function provides an efficient way to update one or more 
@@ -1897,7 +1822,7 @@ true</pre>
       <type>
         <v>Tab = tid() | atom()</v>
         <v>Key = Value = term()</v>
-        <v>Pos = int()</v>
+        <v>Pos = integer()</v>
       </type>
       <desc>
         <p>This function provides an efficient way to update one or more 
diff --git a/lib/stdlib/doc/src/file_sorter.xml b/lib/stdlib/doc/src/file_sorter.xml
index ccb32659a0..a6b3633066 100644
--- a/lib/stdlib/doc/src/file_sorter.xml
+++ b/lib/stdlib/doc/src/file_sorter.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2010</year>
+      <year>2001</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -89,7 +89,7 @@
        considerably. The <c>keysort</c>, <c>keymerge</c> and
        <c>keycheck</c> functions do not accept ordering functions.
       </item>
-      <item><c>{unique, bool()}</c>. When sorting or merging files,
+      <item><c>{unique, boolean()}</c>. When sorting or merging files,
        only the first of a sequence of terms that compare equal (<c>==</c>)
        is output if this option is set to <c>true</c>. The default
        value is <c>false</c> which implies that all terms that
@@ -112,7 +112,7 @@
        overwritten. Temporary files are deleted unless some
        uncaught EXIT signal occurs.
       </item>
-      <item><c>{compressed, bool()}</c>. Temporary files and the
+      <item><c>{compressed, boolean()}</c>. Temporary files and the
        output file may be compressed. The default value
       <c>false</c> implies that written files are not
        compressed. Regardless of the value of the <c>compressed</c>
@@ -128,39 +128,6 @@
        merged at a time. This option should rarely be needed.
       </item>
     </list>
-    <p>To summarize, here is the syntax of the options:</p>
-    <list type="bulleted">
-      <item>
-        <p><c>Options = [Option] | Option</c></p>
-      </item>
-      <item>
-        <p><c>Option = {header, HeaderLength} | {format, Format} | {order, Order} | {unique, bool()} | {tmpdir, TempDirectory} | {compressed, bool()} | {size, Size} | {no_files, NoFiles}</c></p>
-      </item>
-      <item>
-        <p><c>HeaderLength = int() > 0</c></p>
-      </item>
-      <item>
-        <p><c>Format = binary_term | term | binary | FormatFun</c></p>
-      </item>
-      <item>
-        <p><c>FormatFun = fun(Binary) -> Term</c></p>
-      </item>
-      <item>
-        <p><c>Order = ascending | descending | OrderFun</c></p>
-      </item>
-      <item>
-        <p><c>OrderFun = fun(Term, Term) -> bool()</c></p>
-      </item>
-      <item>
-        <p><c>TempDirectory = "" | file_name()</c></p>
-      </item>
-      <item>
-        <p><c>Size = int() >= 0</c></p>
-      </item>
-      <item>
-        <p><c>NoFiles = int() > 1</c></p>
-      </item>
-    </list>
     <p>As an alternative to sorting files, a function of one argument
       can be given as input. When called with the argument <c>read</c>
       the function is assumed to return <c>end_of_input</c> or
@@ -234,8 +201,8 @@ output(L) ->
       occurs are:</p>
     <list type="bulleted">
       <item>
-        <p><c>bad_object</c>, <c>{bad_object, FileName}</c>. 
-          Applying the format function failed for some binary, 
+        <p><c>bad_object</c>, <c>{bad_object, FileName}</c>.
+          Applying the format function failed for some binary,
           or the key(s) could not be extracted from some term.</p>
       </item>
       <item>
@@ -243,148 +210,181 @@ output(L) ->
           to read some term.</p>
       </item>
       <item>
-        <p><c>{file_error, FileName, Reason2}</c>. See
-          <c>file(3)</c> for an explanation of <c>Reason2</c>.</p>
+        <p><c>{file_error, FileName, file:posix()}</c>. See
+          <c>file(3)</c> for an explanation of <c>file:posix()</c>.</p>
       </item>
       <item>
-        <p><c>{premature_eof, FileName}</c>. End-of-file was 
+        <p><c>{premature_eof, FileName}</c>. End-of-file was
           encountered inside some binary term.</p>
       </item>
     </list>
-    <p><em>Types</em></p>
-    <pre>
-Binary = binary()
-FileName = file_name()
-FileNames = [FileName]
-ICommand = read | close
-IReply = end_of_input | {end_of_input, Value} | {[Object], Infun} | InputReply
-Infun = fun(ICommand) -> IReply
-Input = FileNames | Infun
-InputReply = Term
-KeyPos = int() > 0 | [int() > 0]
-OCommand = {value, Value} | [Object] | close
-OReply = Outfun | OutputReply
-Object = Term | Binary
-Outfun = fun(OCommand) -> OReply
-Output = FileName | Outfun
-OutputReply = Term
-Term = term()
-Value = Term</pre>
   </description>
+
+  <datatypes>
+    <datatype>
+      <name name="file_name"/><br/>
+    </datatype>
+    <datatype>
+      <name name="file_names"/><br/>
+    </datatype>
+    <datatype>
+      <name name="i_command"/><br/>
+    </datatype>
+    <datatype>
+      <name name="i_reply"/><br/>
+    </datatype>
+    <datatype>
+      <name name="infun"/><br/>
+    </datatype>
+    <datatype>
+      <name name="input"/><br/>
+    </datatype>
+    <datatype>
+      <name name="input_reply"/><br/>
+    </datatype>
+    <datatype>
+      <name name="o_command"/><br/>
+    </datatype>
+    <datatype>
+      <name name="o_reply"/><br/>
+    </datatype>
+    <datatype>
+      <name name="object"/><br/>
+    </datatype>
+    <datatype>
+      <name name="outfun"/><br/>
+    </datatype>
+    <datatype>
+      <name name="output"/><br/>
+    </datatype>
+    <datatype>
+      <name name="output_reply"/><br/>
+    </datatype>
+    <datatype>
+      <name name="value"/><br/>
+    </datatype>
+    <datatype>
+      <name name="options"/><br/>
+    </datatype>
+    <datatype>
+      <name name="option"/><br/>
+    </datatype>
+    <datatype>
+      <name name="format"/><br/>
+    </datatype>
+    <datatype>
+      <name name="format_fun"/><br/>
+    </datatype>
+    <datatype>
+      <name name="header_length"/><br/>
+    </datatype>
+    <datatype>
+      <name name="key_pos"/><br/>
+    </datatype>
+    <datatype>
+      <name name="no_files"/><br/>
+    </datatype>
+    <datatype>
+      <name name="order"/><br/>
+    </datatype>
+    <datatype>
+      <name name="order_fun"/><br/>
+    </datatype>
+    <datatype>
+      <name name="size"/><br/>
+    </datatype>
+    <datatype>
+      <name name="tmp_directory"/><br/>
+    </datatype>
+    <datatype>
+      <name name="reason"/><br/>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
-      <name>sort(FileName) -> Reply</name>
-      <name>sort(Input, Output) -> Reply</name>
-      <name>sort(Input, Output, Options) -> Reply</name>
+      <name name="sort" arity="1"/>
       <fsummary>Sort terms on files.</fsummary>
-      <type>
-        <v>Reply = ok | {error, Reason} | InputReply | OutputReply</v>
-      </type>
       <desc>
-        <p>Sorts terms on files. 
-          </p>
-        <p><c>sort(FileName)</c> is equivalent to
-          <c>sort([FileName], FileName)</c>.
-          </p>
-        <p><c>sort(Input, Output)</c> is equivalent to
-          <c>sort(Input, Output, [])</c>.
-          </p>
-        <p></p>
+        <p>Sorts terms on files. <c>sort(FileName)</c> is equivalent
+          to <c>sort([FileName], FileName)</c>.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="sort" arity="2"/>
+      <name name="sort" arity="3"/>
+      <fsummary>Sort terms on files.</fsummary>
+      <desc>
+        <p>Sorts terms on files. <c>sort(Input, Output)</c> is
+          equivalent to <c>sort(Input, Output, [])</c>.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="keysort" arity="2"/>
+      <fsummary>Sort terms on files by key.</fsummary>
+      <desc>
+        <p>Sorts tuples on files. <c>keysort(N, FileName)</c> is
+          equivalent to <c>keysort(N, [FileName], FileName)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>keysort(KeyPos, FileName) -> Reply</name>
-      <name>keysort(KeyPos, Input, Output) -> Reply</name>
-      <name>keysort(KeyPos, Input, Output, Options) -> Reply</name>
+      <name name="keysort" arity="3"/>
+      <name name="keysort" arity="4"/>
       <fsummary>Sort terms on files by key.</fsummary>
-      <type>
-        <v>Reply = ok | {error, Reason} | InputReply | OutputReply</v>
-      </type>
       <desc>
         <p>Sorts tuples on files. The sort is performed on the
-          element(s) mentioned in <c>KeyPos</c>. If two tuples
-          compare equal (<c>==</c>) on one element, next element according to
-          <c>KeyPos</c> is compared. The sort is stable.
-          </p>
-        <p><c>keysort(N, FileName)</c> is equivalent to
-          <c>keysort(N, [FileName], FileName)</c>.
-          </p>
+          element(s) mentioned in <c><anno>KeyPos</anno></c>. If two
+          tuples compare equal (<c>==</c>) on one element, next
+          element according to <c><anno>KeyPos</anno></c>
+          is compared. The sort is stable.</p>
         <p><c>keysort(N, Input, Output)</c> is equivalent to
-          <c>keysort(N, Input, Output, [])</c>.
-          </p>
-        <p></p>
+          <c>keysort(N, Input, Output, [])</c>.</p>
       </desc>
     </func>
     <func>
-      <name>merge(FileNames, Output) -> Reply</name>
-      <name>merge(FileNames, Output, Options) -> Reply</name>
+      <name name="merge" arity="2"/>
+      <name name="merge" arity="3"/>
       <fsummary>Merge terms on files.</fsummary>
-      <type>
-        <v>Reply = ok | {error, Reason} | OutputReply</v>
-      </type>
       <desc>
         <p>Merges terms on files. Each input file is assumed to be
-          sorted.
-          </p>
+          sorted.</p>
         <p><c>merge(FileNames, Output)</c> is equivalent to
-          <c>merge(FileNames, Output, [])</c>.
-          </p>
+          <c>merge(FileNames, Output, [])</c>.</p>
       </desc>
     </func>
     <func>
-      <name>keymerge(KeyPos, FileNames, Output) -> Reply</name>
-      <name>keymerge(KeyPos, FileNames, Output, Options) -> Reply</name>
+      <name name="keymerge" arity="3"/>
+      <name name="keymerge" arity="4"/>
       <fsummary>Merge terms on files by key.</fsummary>
-      <type>
-        <v>Reply = ok | {error, Reason} | OutputReply</v>
-      </type>
       <desc>
         <p>Merges tuples on files. Each input file is assumed to be
-          sorted on key(s).
-          </p>
+          sorted on key(s).</p>
         <p><c>keymerge(KeyPos, FileNames, Output)</c> is equivalent
-          to <c>keymerge(KeyPos, FileNames, Output, [])</c>.
-          </p>
-        <p></p>
+          to <c>keymerge(KeyPos, FileNames, Output, [])</c>.</p>
       </desc>
     </func>
     <func>
-      <name>check(FileName) -> Reply</name>
-      <name>check(FileNames, Options) -> Reply</name>
+      <name name="check" arity="1"/>
+      <name name="check" arity="2"/>
       <fsummary>Check whether terms on files are sorted.</fsummary>
-      <type>
-        <v>Reply = {ok, [Result]} | {error, Reason}</v>
-        <v>Result = {FileName, TermPosition, Term}</v>
-        <v>TermPosition = int() > 1</v>
-      </type>
       <desc>
         <p>Checks files for sortedness. If a file is not sorted, the
           first out-of-order element is returned. The first term on a
-          file has position 1.
-          </p>
+          file has position 1.</p>
         <p><c>check(FileName)</c> is equivalent to
-          <c>check([FileName], [])</c>.
-          </p>
+          <c>check([FileName], [])</c>.</p>
       </desc>
     </func>
     <func>
-      <name>keycheck(KeyPos, FileName) -> CheckReply</name>
-      <name>keycheck(KeyPos, FileNames, Options) -> Reply</name>
+      <name name="keycheck" arity="2"/>
+      <name name="keycheck" arity="3"/>
       <fsummary>Check whether terms on files are sorted by key.</fsummary>
-      <type>
-        <v>Reply = {ok, [Result]} | {error, Reason}</v>
-        <v>Result = {FileName, TermPosition, Term}</v>
-        <v>TermPosition = int() > 1</v>
-      </type>
       <desc>
         <p>Checks files for sortedness. If a file is not sorted, the
           first out-of-order element is returned. The first term on a
-          file has position 1.
-          </p>
+          file has position 1.</p>
         <p><c>keycheck(KeyPos, FileName)</c> is equivalent
-          to <c>keycheck(KeyPos, [FileName], [])</c>.
-          </p>
-        <p></p>
+          to <c>keycheck(KeyPos, [FileName], [])</c>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml
index fab68ae77c..f3079c7337 100644
--- a/lib/stdlib/doc/src/filelib.xml
+++ b/lib/stdlib/doc/src/filelib.xml
@@ -41,62 +41,46 @@
     <p>For more information about raw file names, see the <seealso marker="kernel:file">file</seealso> module.</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-filename() = string() | atom() | DeepList | RawFilename
-  DeepList = [char() | atom() | DeepList]
-  RawFilename = binary()
-  If VM is in unicode filename mode, string() and char() are allowed to be > 255.
-  RawFilename is a filename not subject to Unicode translation, meaning that it 
-  can contain characters not conforming to the Unicode encoding expected from the 
-  filesystem (i.e. non-UTF-8 characters although the VM is started in Unicode 
-  filename mode).
-dirname() = filename()</code>
-  </section>
+  <datatypes>
+    <datatype>
+      <name name="filename"/>
+    </datatype>
+    <datatype>
+      <name name="dirname"/>
+    </datatype>
+  </datatypes>
 
   <funcs>
     <func>
-      <name>ensure_dir(Name) -> ok | {error, Reason}</name>
+      <name name="ensure_dir" arity="1"/>
       <fsummary>Ensure that all parent directories for a file or directory exist.</fsummary>
-      <type>
-        <v>Name = filename() | dirname()</v>
-        <v>Reason = posix() -- see file(3)</v>
-      </type>
       <desc>
         <p>The <c>ensure_dir/1</c> function ensures that all parent
-          directories for the given file or directory name <c>Name</c>
+          directories for the given file or directory name <c><anno>Name</anno></c>
           exist, trying to create them if necessary.</p>
         <p>Returns <c>ok</c> if all parent directories already exist
-          or could be created, or <c>{error, Reason}</c> if some parent
+          or could be created, or <c>{error, <anno>Reason</anno>}</c> if some parent
           directory does not exist and could not be created for some
           reason.</p>
       </desc>
     </func>
     <func>
-      <name>file_size(Filename) -> integer()</name>
+      <name name="file_size" arity="1"/>
       <fsummary>Return the size in bytes of the file.</fsummary>
       <desc>
         <p>The <c>file_size</c> function returns the size of the given file.</p>
       </desc>
     </func>
     <func>
-      <name>fold_files(Dir, RegExp, Recursive, Fun, AccIn) -> AccOut   </name>
+      <name name="fold_files" arity="5"/>
       <fsummary>Fold over all files matching a regular expression.</fsummary>
-      <type>
-        <v>Dir = dirname()</v>
-        <v>RegExp = regular_expression_string()</v>
-        <v>Recursive = true|false</v>
-        <v>Fun = fun(F, AccIn) -> AccOut</v>
-        <v>AccIn = AccOut = term()</v>
-      </type>
       <desc>
         <p>The <c>fold_files/5</c> function folds the function
-          <c>Fun</c> over all (regular) files <c>F</c> in the
-          directory <c>Dir</c> that match the regular expression <c>RegExp</c>
+          <c><anno>Fun</anno></c> over all (regular) files <c><anno>F</anno></c> in the
+          directory <c><anno>Dir</anno></c> that match the regular expression <c><anno>RegExp</anno></c>
 	  (see the <seealso marker="re">re</seealso> module for a description
 	  of the allowed regular expressions).
-          If <c>Recursive</c> is true all sub-directories to <c>Dir</c>
+          If <c><anno>Recursive</anno></c> is true all sub-directories to <c>Dir</c>
           are processed. The regular expression matching is done on just
 	  the filename without the directory part.</p>
 
@@ -114,44 +98,32 @@ dirname() = filename()</code>
       </desc>
     </func>
     <func>
-      <name>is_dir(Name) -> true | false</name>
+      <name name="is_dir" arity="1"/>
       <fsummary>Test whether Name refer to a directory or not</fsummary>
-      <type>
-        <v>Name = filename() | dirname()</v>
-      </type>
       <desc>
-        <p>The <c>is_dir/1</c> function returns <c>true</c> if <c>Name</c>
+        <p>The <c>is_dir/1</c> function returns <c>true</c> if <c><anno>Name</anno></c>
           refers to a directory, and <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>is_file(Name) -> true | false</name>
+      <name name="is_file" arity="1"/>
       <fsummary>Test whether Name refer to a file or directory.</fsummary>
-      <type>
-        <v>Name = filename() | dirname()</v>
-      </type>
       <desc>
-        <p>The <c>is_file/1</c> function returns <c>true</c> if <c>Name</c>
+        <p>The <c>is_file/1</c> function returns <c>true</c> if <c><anno>Name</anno></c>
           refers to a file or a directory, and <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>is_regular(Name) -> true | false</name>
+      <name name="is_regular" arity="1"/>
       <fsummary>Test whether Name refer to a (regular) file.</fsummary>
-      <type>
-        <v>Name = filename()</v>
-      </type>
       <desc>
-        <p>The <c>is_regular/1</c> function returns <c>true</c> if <c>Name</c>
+        <p>The <c>is_regular/1</c> function returns <c>true</c> if <c><anno>Name</anno></c>
           refers to a file (regular file), and <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>last_modified(Name) -> {{Year,Month,Day},{Hour,Min,Sec}} | 0</name>
+      <name name="last_modified" arity="1"/>
       <fsummary>Return the local date and time when a file was last modified.</fsummary>
-      <type>
-        <v>Name = filename() | dirname()</v>
-      </type>
       <desc>
         <p>The <c>last_modified/1</c> function returns the date and time the
           given file or directory was last modified, or 0 if the file
@@ -159,14 +131,11 @@ dirname() = filename()</code>
       </desc>
     </func>
     <func>
-      <name>wildcard(Wildcard) -> list()</name>
+      <name name="wildcard" arity="1"/>
       <fsummary>Match filenames using Unix-style wildcards.</fsummary>
-      <type>
-        <v>Wildcard = filename() | dirname()</v>
-      </type>
       <desc>
         <p>The <c>wildcard/1</c> function returns a list of all files
-          that match Unix-style wildcard-string <c>Wildcard</c>.</p>
+          that match Unix-style wildcard-string <c><anno>Wildcard</anno></c>.</p>
         <p>The wildcard string looks like an ordinary filename, except
           that certain "wildcard characters" are interpreted in a special
           way. The following characters are special:
@@ -226,15 +195,11 @@ dirname() = filename()</code>
       </desc>
     </func>
     <func>
-      <name>wildcard(Wildcard, Cwd) -> list()</name>
+      <name name="wildcard" arity="2"/>
       <fsummary>Match filenames using Unix-style wildcards starting at a specified directory.</fsummary>
-      <type>
-        <v>Wildcard = filename() | dirname()</v>
-        <v>Cwd = dirname()</v>
-      </type>
       <desc>
         <p>The <c>wildcard/2</c> function works like <c>wildcard/1</c>,
-          except that instead of the actual working directory, <c>Cwd</c>
+          except that instead of the actual working directory, <c><anno>Cwd</anno></c>
           will be used.</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml
index cdee6e4a81..bc3a616d39 100644
--- a/lib/stdlib/doc/src/filename.xml
+++ b/lib/stdlib/doc/src/filename.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -47,28 +47,12 @@
     <seealso marker="kernel:file#native_name_encoding/0">file:native_name_encoding/0</seealso>, a raw file name will also be returned. For example filename:join/1 provided with a path component being a binary (and also not being possible to interpret under the current native file name encoding) will result in a raw file name being returned (the join operation will have been performed of course). For more information about raw file names, see the <seealso marker="kernel:file">file</seealso> module.</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-name() = string() | atom() | DeepList | RawFilename
-  DeepList = [char() | atom() | DeepList]
-  RawFilename = binary()
-  If VM is in unicode filename mode, string() and char() are allowed to be > 255.
-  RawFilename is a filename not subject to Unicode translation, meaning that it 
-  can contain characters not conforming to the Unicode encoding expected from the 
-  filesystem (i.e. non-UTF-8 characters although the VM is started in Unicode 
-  filename mode).
-    </code>
-  </section>
   <funcs>
     <func>
-      <name>absname(Filename) -> string()</name>
+      <name name="absname" arity="1"/>
       <fsummary>Convert a filename to an absolute name, relative the working directory</fsummary>
-      <type>
-        <v>Filename = name()</v>
-      </type>
       <desc>
-        <p>Converts a relative <c>Filename</c> and returns an absolute
+        <p>Converts a relative <c><anno>Filename</anno></c> and returns an absolute
           name. No attempt is made to create the shortest absolute name,
           because this can give incorrect results on file systems which
           allow links.</p>
@@ -95,44 +79,33 @@ name() = string() | atom() | DeepList | RawFilename
       </desc>
     </func>
     <func>
-      <name>absname(Filename, Dir) -> string()</name>
+      <name name="absname" arity="2"/>
       <fsummary>Convert a filename to an absolute name, relative a specified directory</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Dir = string()</v>
-      </type>
       <desc>
         <p>This function works like <c>absname/1</c>, except that
           the directory to which the file name should be made relative
-          is given explicitly in the <c>Dir</c> argument.</p>
+          is given explicitly in the <c><anno>Dir</anno></c> argument.</p>
       </desc>
     </func>
     <func>
-      <name>absname_join(Dir, Filename) -> string()</name>
+      <name name="absname_join" arity="2"/>
       <fsummary>Join an absolute directory with a relative filename</fsummary>
-      <type>
-        <v>Dir = string()</v>
-        <v>Filename = name()</v>
-      </type>
       <desc>
         <p>Joins an absolute directory with a relative filename.
           Similar to <c>join/2</c>, but on platforms with tight
           restrictions on raw filename length and no support for
           symbolic links (read: VxWorks), leading parent directory
-          components in <c>Filename</c> are matched against trailing
-          directory components in <c>Dir</c> so they can be removed
+          components in <c><anno>Filename</anno></c> are matched against trailing
+          directory components in <c><anno>Dir</anno></c> so they can be removed
           from the result - minimizing its length.</p>
       </desc>
     </func>
     <func>
-      <name>basename(Filename) -> string()</name>
+      <name name="basename" arity="1"/>
       <fsummary>Return the last component of a filename</fsummary>
-      <type>
-        <v>Filename = name()</v>
-      </type>
       <desc>
-        <p>Returns the last component of <c>Filename</c>, or
-          <c>Filename</c> itself if it does not contain any directory
+        <p>Returns the last component of <c><anno>Filename</anno></c>, or
+          <c><anno>Filename</anno></c> itself if it does not contain any directory
           separators.</p>
         <pre>
 5> <input>filename:basename("foo").</input>
@@ -144,14 +117,11 @@ name() = string() | atom() | DeepList | RawFilename
       </desc>
     </func>
     <func>
-      <name>basename(Filename, Ext) -> string()</name>
+      <name name="basename" arity="2"/>
       <fsummary>Return the last component of a filename, stripped of the specified extension</fsummary>
-      <type>
-        <v>Filename = Ext = name()</v>
-      </type>
       <desc>
-        <p>Returns the last component of <c>Filename</c> with the
-          extension <c>Ext</c> stripped. This function should be used
+        <p>Returns the last component of <c><anno>Filename</anno></c> with the
+          extension <c><anno>Ext</anno></c> stripped. This function should be used
           to remove a specific extension which might, or might not, be
           there. Use <c>rootname(basename(Filename))</c> to remove an
           extension that exists, but you are not sure which one it is.</p>
@@ -169,13 +139,10 @@ name() = string() | atom() | DeepList | RawFilename
       </desc>
     </func>
     <func>
-      <name>dirname(Filename) -> string()</name>
+      <name name="dirname" arity="1"/>
       <fsummary>Return the directory part of a path name</fsummary>
-      <type>
-        <v>Filename = name()</v>
-      </type>
       <desc>
-        <p>Returns the directory part of <c>Filename</c>.</p>
+        <p>Returns the directory part of <c><anno>Filename</anno></c>.</p>
         <pre>
 13> <input>filename:dirname("/usr/src/kalle.erl").</input>
 "/usr/src"
@@ -187,13 +154,10 @@ name() = string() | atom() | DeepList | RawFilename
       </desc>
     </func>
     <func>
-      <name>extension(Filename) -> string()</name>
+      <name name="extension" arity="1"/>
       <fsummary>Return the file extension</fsummary>
-      <type>
-        <v>Filename = name()</v>
-      </type>
       <desc>
-        <p>Returns the file extension of <c>Filename</c>, including
+        <p>Returns the file extension of <c><anno>Filename</anno></c>, including
           the period. Returns an empty string if there is no extension.</p>
         <pre>
 15> <input>filename:extension("foo.erl").</input>
@@ -203,11 +167,8 @@ name() = string() | atom() | DeepList | RawFilename
       </desc>
     </func>
     <func>
-      <name>flatten(Filename) -> string()</name>
+      <name name="flatten" arity="1"/>
       <fsummary>Convert a filename to a flat string</fsummary>
-      <type>
-        <v>Filename = name()</v>
-      </type>
       <desc>
         <p>Converts a possibly deep list filename consisting of
           characters and atoms into the corresponding flat string
@@ -215,14 +176,11 @@ name() = string() | atom() | DeepList | RawFilename
       </desc>
     </func>
     <func>
-      <name>join(Components) -> string()</name>
+      <name name="join" arity="1"/>
       <fsummary>Join a list of filename components with directory separators</fsummary>
-      <type>
-        <v>Components = [string()]</v>
-      </type>
       <desc>
-        <p>Joins a list of file name <c>Components</c> with directory
-          separators. If one of the elements of <c>Components</c>
+        <p>Joins a list of file name <c><anno>Components</anno></c> with directory
+          separators. If one of the elements of <c><anno>Components</anno></c>
           includes an absolute path, for example <c>"/xxx"</c>,
           the preceding elements, if any, are removed from the result.</p>
         <p>The result is "normalized":</p>
@@ -242,24 +200,18 @@ name() = string() | atom() | DeepList | RawFilename
       </desc>
     </func>
     <func>
-      <name>join(Name1, Name2) -> string()</name>
+      <name name="join" arity="2"/>
       <fsummary>Join two filename components with directory separators</fsummary>
-      <type>
-        <v>Name1 = Name2 = string()</v>
-      </type>
       <desc>
         <p>Joins two file name components with directory separators. 
-          Equivalent to <c>join([Name1, Name2])</c>.</p>
+          Equivalent to <c>join([<anno>Name1</anno>, <anno>Name2</anno>])</c>.</p>
       </desc>
     </func>
     <func>
-      <name>nativename(Path) -> string()</name>
+      <name name="nativename" arity="1"/>
       <fsummary>Return the native form of a file path</fsummary>
-      <type>
-        <v>Path = string()</v>
-      </type>
       <desc>
-        <p>Converts <c>Path</c> to a form accepted by the command shell
+        <p>Converts <c><anno>Path</anno></c> to a form accepted by the command shell
           and native applications on the current platform. On Windows,
           forward slashes is converted to backward slashes. On all
           platforms, the name is normalized as done by <c>join/1</c>.</p>
@@ -272,7 +224,7 @@ name() = string() | atom() | DeepList | RawFilename
       </desc>
     </func>
     <func>
-      <name>pathtype(Path) -> absolute | relative | volumerelative</name>
+      <name name="pathtype" arity="1"/>
       <fsummary>Return the type of a path</fsummary>
       <desc>
         <p>Returns the type of path, one of <c>absolute</c>,
@@ -302,16 +254,13 @@ name() = string() | atom() | DeepList | RawFilename
       </desc>
     </func>
     <func>
-      <name>rootname(Filename) -> string()</name>
-      <name>rootname(Filename, Ext) -> string()</name>
+      <name name="rootname" arity="1"/>
+      <name name="rootname" arity="2"/>
       <fsummary>Remove a filename extension</fsummary>
-      <type>
-        <v>Filename = Ext = name()</v>
-      </type>
       <desc>
         <p>Remove a filename extension. <c>rootname/2</c> works as
           <c>rootname/1</c>, except that the extension is removed only
-          if it is <c>Ext</c>.</p>
+          if it is <c><anno>Ext</anno></c>.</p>
         <pre>
 20> <input>filename:rootname("/beam.src/kalle").</input>
 /beam.src/kalle"
@@ -324,15 +273,11 @@ name() = string() | atom() | DeepList | RawFilename
       </desc>
     </func>
     <func>
-      <name>split(Filename) -> Components</name>
+      <name name="split" arity="1"/>
       <fsummary>Split a filename into its path components</fsummary>
-      <type>
-        <v>Filename = name()</v>
-        <v>Components = [string()]</v>
-      </type>
       <desc>
         <p>Returns a list whose elements are the path components of
-          <c>Filename</c>.</p>
+          <c><anno>Filename</anno></c>.</p>
         <pre>
 24> <input>filename:split("/usr/local/bin").</input>
 ["/","usr","local","bin"]
@@ -343,47 +288,38 @@ name() = string() | atom() | DeepList | RawFilename
       </desc>
     </func>
     <func>
-      <name>find_src(Beam) -> {SourceFile, Options} | {error,{ErrorReason,Module}}</name>
-      <name>find_src(Beam, Rules) -> {SourceFile, Options} | {error,{ErrorReason,Module}}</name>
+      <name name="find_src" arity="1"/>
+      <name name="find_src" arity="2"/>
       <fsummary>Find the filename and compiler options for a module</fsummary>
-      <type>
-        <v>Beam = Module | Filename</v>
-        <v>&nbsp;Module = atom()</v>
-        <v>&nbsp;Filename = string() | atom()</v>
-        <v>SourceFile = string()</v>
-        <v>Options = [Opt]</v>
-        <v>&nbsp;Opt = {i, string()} | {outdir, string()} | {d, atom()}</v>
-	<v>ErrorReason = non_existing | preloaded | interpreted</v>
-      </type>
       <desc>
         <p>Finds the source filename and compiler options for a module.
           The result can be fed to <c>compile:file/2</c> in order to
           compile the file again.</p>
-        <p>The <c>Beam</c> argument, which can be a string or an atom,
+        <p>The <c><anno>Beam</anno></c> argument, which can be a string or an atom,
           specifies either the module name or the path to the source
           code, with or without the <c>".erl"</c> extension. In either
           case, the module must be known by the code server, i.e.
-          <c>code:which(Module)</c> must succeed.</p>
-        <p><c>Rules</c> describes how the source directory can be found,
+          <c>code:which(<anno>Module</anno>)</c> must succeed.</p>
+        <p><c><anno>Rules</anno></c> describes how the source directory can be found,
           when the object code directory is known. It is a list of
-          tuples <c>{BinSuffix, SourceSuffix}</c> and is interpreted
+          tuples <c>{<anno>BinSuffix</anno>, <anno>SourceSuffix</anno>}</c> and is interpreted
           as follows: If the end of the directory name where the object
-          is located matches <c>BinSuffix</c>, then the source code
-          directory has the same name, but with <c>BinSuffix</c>
-          replaced by <c>SourceSuffix</c>. <c>Rules</c> defaults to:</p>
+          is located matches <c><anno>BinSuffix</anno></c>, then the source code
+          directory has the same name, but with <c><anno>BinSuffix</anno></c>
+          replaced by <c><anno>SourceSuffix</anno></c>. <c><anno>Rules</anno></c> defaults to:</p>
         <code type="none">
 [{"", ""}, {"ebin", "src"}, {"ebin", "esrc"}]</code>
         <p>If the source file is found in the resulting directory, then
           the function returns that location together with
-          <c>Options</c>. Otherwise, the next rule is tried, and so on.</p>
+          <c><anno>Options</anno></c>. Otherwise, the next rule is tried, and so on.</p>
 
-        <p>The function returns <c>{SourceFile, Options}</c> if it succeeds.
-          <c>SourceFile</c> is the absolute path to the source file
-          without the <c>".erl"</c> extension. <c>Options</c> include
+        <p>The function returns <c>{<anno>SourceFile</anno>, <anno>Options</anno>}</c> if it succeeds.
+          <c><anno>SourceFile</anno></c> is the absolute path to the source file
+          without the <c>".erl"</c> extension. <c><anno>Options</anno></c> include
           the options which are necessary to recompile the file with
           <c>compile:file/2</c>, but excludes options such as
           <c>report</c> or <c>verbose</c> which do not change the way
-          code is generated. The paths in the <c>{outdir, Path}</c>
+          code is generated. The paths in the <c>{outdir, <anno>Path</anno>}</c>
           and <c>{i, Path}</c> options are guaranteed to be
           absolute.</p>
 
diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml
index 60d8bcbfa3..38de51322f 100644
--- a/lib/stdlib/doc/src/gb_sets.xml
+++ b/lib/stdlib/doc/src/gb_sets.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2010</year>
+      <year>2001</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -114,34 +114,32 @@
     </list>
   </section>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-gb_set() = a GB set</code>
-  </section>
+  <datatypes>
+    <datatype>
+      <name><marker id="type-gb_set">gb_set()</marker></name>
+      <desc><p>A GB set.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="iter"/>
+      <desc><p>A GB set iterator.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>add(Element, Set1) -> Set2</name>
-      <name>add_element(Element, Set1) -> Set2</name>
+      <name name="add" arity="2"/>
+      <name name="add_element" arity="2"/>
       <fsummary>Add a (possibly existing) element to a gb_set</fsummary>
-      <type>
-        <v>Element = term()</v>
-        <v>Set1 = Set2 = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns a new gb_set formed from <c>Set1</c> with
-          <c>Element</c> inserted. If <c>Element</c> is already an
-          element in <c>Set1</c>, nothing is changed.</p>
+        <p>Returns a new gb_set formed from <c><anno>Set1</anno></c> with
+          <c><anno>Element</anno></c> inserted. If <c><anno>Element</anno></c> is already an
+          element in <c><anno>Set1</anno></c>, nothing is changed.</p>
       </desc>
     </func>
     <func>
-      <name>balance(Set1) -> Set2</name>
+      <name name="balance" arity="1"/>
       <fsummary>Rebalance tree representation of a gb_set</fsummary>
-      <type>
-        <v>Set1 = Set2 = gb_set()</v>
-      </type>
       <desc>
-        <p>Rebalances the tree representation of <c>Set1</c>. Note that
+        <p>Rebalances the tree representation of <c><anno>Set1</anno></c>. Note that
           this is rarely necessary, but may be motivated when a large
           number of elements have been deleted from the tree without
           further insertions. Rebalancing could then be forced in order
@@ -150,208 +148,144 @@ gb_set() = a GB set</code>
       </desc>
     </func>
     <func>
-      <name>delete(Element, Set1) -> Set2</name>
+      <name name="delete" arity="2"/>
       <fsummary>Remove an element from a gb_set</fsummary>
-      <type>
-        <v>Element = term()</v>
-        <v>Set1 = Set2 = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns a new gb_set formed from <c>Set1</c> with
-          <c>Element</c> removed. Assumes that <c>Element</c> is present
-          in <c>Set1</c>.</p>
+        <p>Returns a new gb_set formed from <c><anno>Set1</anno></c> with
+          <c><anno>Element</anno></c> removed. Assumes that <c><anno>Element</anno></c> is present
+          in <c><anno>Set1</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>delete_any(Element, Set1) -> Set2</name>
-      <name>del_element(Element, Set1) -> Set2</name>
+      <name name="delete_any" arity="2"/>
+      <name name="del_element" arity="2"/>
       <fsummary>Remove a (possibly non-existing) element from a gb_set</fsummary>
-      <type>
-        <v>Element = term()</v>
-        <v>Set1 = Set2 = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns a new gb_set formed from <c>Set1</c> with
-          <c>Element</c> removed. If <c>Element</c> is not an element
-          in <c>Set1</c>, nothing is changed.</p>
+        <p>Returns a new gb_set formed from <c><anno>Set1</anno></c> with
+          <c><anno>Element</anno></c> removed. If <c><anno>Element</anno></c> is not an element
+          in <c><anno>Set1</anno></c>, nothing is changed.</p>
       </desc>
     </func>
     <func>
-      <name>difference(Set1, Set2) -> Set3</name>
-      <name>subtract(Set1, Set2) -> Set3</name>
+      <name name="difference" arity="2"/>
+      <name name="subtract" arity="2"/>
       <fsummary>Return the difference of two gb_sets</fsummary>
-      <type>
-        <v>Set1 = Set2 = Set3 = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns only the elements of <c>Set1</c> which are not also
-          elements of <c>Set2</c>.</p>
+        <p>Returns only the elements of <c><anno>Set1</anno></c> which are not also
+          elements of <c><anno>Set2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>empty() -> Set</name>
-      <name>new() -> Set</name>
+      <name name="empty" arity="0"/>
+      <name name="new" arity="0"/>
       <fsummary>Return an empty gb_set</fsummary>
-      <type>
-        <v>Set = gb_set()</v>
-      </type>
       <desc>
         <p>Returns a new empty gb_set.</p>
       </desc>
     </func>
     <func>
-      <name>filter(Pred, Set1) -> Set2</name>
+      <name name="filter" arity="2"/>
       <fsummary>Filter gb_set elements</fsummary>
-      <type>
-        <v>Pred = fun (E) -> bool()</v>
-        <v>&nbsp;E = term()</v>
-        <v>Set1 = Set2 = gb_set()</v>
-      </type>
       <desc>
-        <p>Filters elements in <c>Set1</c> using predicate function
-          <c>Pred</c>.</p>
+        <p>Filters elements in <c><anno>Set1</anno></c> using predicate function
+          <c><anno>Pred</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>fold(Function, Acc0, Set) -> Acc1</name>
+      <name name="fold" arity="3"/>
       <fsummary>Fold over gb_set elements</fsummary>
-      <type>
-        <v>Function = fun (E, AccIn) -> AccOut</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>&nbsp;E = term()</v>
-        <v>Set = gb_set()</v>
-      </type>
       <desc>
-        <p>Folds <c>Function</c> over every element in <c>Set</c>
+        <p>Folds <c><anno>Function</anno></c> over every element in <c><anno>Set</anno></c>
           returning the final value of the accumulator.</p>
       </desc>
     </func>
     <func>
-      <name>from_list(List) -> Set</name>
+      <name name="from_list" arity="1"/>
       <fsummary>Convert a list into a gb_set</fsummary>
-      <type>
-        <v>List = [term()]</v>
-        <v>Set = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns a gb_set of the elements in <c>List</c>, where
-          <c>List</c> may be unordered and contain duplicates.</p>
+        <p>Returns a gb_set of the elements in <c><anno>List</anno></c>, where
+          <c><anno>List</anno></c> may be unordered and contain duplicates.</p>
       </desc>
     </func>
     <func>
-      <name>from_ordset(List) -> Set</name>
+      <name name="from_ordset" arity="1"/>
       <fsummary>Make a gb_set from an ordset list</fsummary>
-      <type>
-        <v>List = [term()]</v>
-        <v>Set = gb_set()</v>
-      </type>
       <desc>
-        <p>Turns an ordered-set list <c>List</c> into a gb_set. The list
+        <p>Turns an ordered-set list <c><anno>List</anno></c> into a gb_set. The list
           must not contain duplicates.</p>
       </desc>
     </func>
     <func>
-      <name>insert(Element, Set1) -> Set2</name>
+      <name name="insert" arity="2"/>
       <fsummary>Add a new element to a gb_set</fsummary>
-      <type>
-        <v>Element = term()</v>
-        <v>Set1 = Set2 = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns a new gb_set formed from <c>Set1</c> with
-          <c>Element</c> inserted. Assumes that <c>Element</c> is not
-          present in <c>Set1</c>.</p>
+        <p>Returns a new gb_set formed from <c><anno>Set1</anno></c> with
+          <c><anno>Element</anno></c> inserted. Assumes that <c><anno>Element</anno></c> is not
+          present in <c><anno>Set1</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>intersection(Set1, Set2) -> Set3</name>
+      <name name="intersection" arity="2"/>
       <fsummary>Return the intersection of two gb_sets</fsummary>
-      <type>
-        <v>Set1 = Set2 = Set3 = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns the intersection of <c>Set1</c> and <c>Set2</c>.</p>
+        <p>Returns the intersection of <c><anno>Set1</anno></c> and <c><anno>Set2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>intersection(SetList) -> Set</name>
+      <name name="intersection" arity="1"/>
       <fsummary>Return the intersection of a list of gb_sets</fsummary>
-      <type>
-        <v>SetList = [gb_set()]</v>
-        <v>Set = gb_set()</v>
-      </type>
       <desc>
         <p>Returns the intersection of the non-empty list of gb_sets.</p>
       </desc>
     </func>
     <func>
-      <name>is_disjoint(Set1, Set2) -> bool()</name>
+      <name name="is_disjoint" arity="2"/>
       <fsummary>Check whether two gb_sets are disjoint</fsummary>
-      <type>
-        <v>Set1 = Set2 = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Set1</c> and
-          <c>Set2</c> are disjoint (have no elements in common),
+        <p>Returns <c>true</c> if <c><anno>Set1</anno></c> and
+          <c><anno>Set2</anno></c> are disjoint (have no elements in common),
 	  and <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>is_empty(Set) -> bool()</name>
+      <name name="is_empty" arity="1"/>
       <fsummary>Test for empty gb_set</fsummary>
-      <type>
-        <v>Set = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Set</c> is an empty set, and
+        <p>Returns <c>true</c> if <c><anno>Set</anno></c> is an empty set, and
           <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>is_member(Element, Set) -> bool()</name>
-      <name>is_element(Element, Set) -> bool()</name>
+      <name name="is_member" arity="2"/>
+      <name name="is_element" arity="2"/>
       <fsummary>Test for membership of a gb_set</fsummary>
-      <type>
-        <v>Element = term()</v>
-        <v>Set = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Element</c> is an element of
-          <c>Set</c>, otherwise <c>false</c>.</p>
+        <p>Returns <c>true</c> if <c><anno>Element</anno></c> is an element of
+          <c><anno>Set</anno></c>, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>is_set(Term) -> bool()</name>
+      <name name="is_set" arity="1"/>
       <fsummary>Test for a gb_set</fsummary>
-      <type>
-        <v>Term = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Set</c> appears to be a gb_set,
+        <p>Returns <c>true</c> if <c><anno>Term</anno></c> appears to be a gb_set,
           otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>is_subset(Set1, Set2) -> bool()</name>
+      <name name="is_subset" arity="2"/>
       <fsummary>Test for subset</fsummary>
-      <type>
-        <v>Set1 = Set2 = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> when every element of <c>Set1</c> is
-          also a member of <c>Set2</c>, otherwise <c>false</c>.</p>
+        <p>Returns <c>true</c> when every element of <c><anno>Set1</anno></c> is
+          also a member of <c><anno>Set2</anno></c>, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>iterator(Set) -> Iter</name>
+      <name name="iterator" arity="1"/>
       <fsummary>Return an iterator for a gb_set</fsummary>
-      <type>
-        <v>Set = gb_set()</v>
-        <v>Iter = term()</v>
-      </type>
       <desc>
         <p>Returns an iterator that can be used for traversing the
-          entries of <c>Set</c>; see <c>next/1</c>. The implementation
+          entries of <c><anno>Set</anno></c>; see <c>next/1</c>. The implementation
           of this is very efficient; traversing the whole set using
           <c>next/1</c> is only slightly slower than getting the list
           of all elements using <c>to_list/1</c> and traversing that.
@@ -361,118 +295,84 @@ gb_set() = a GB set</code>
       </desc>
     </func>
     <func>
-      <name>largest(Set) -> term()</name>
+      <name name="largest" arity="1"/>
       <fsummary>Return largest element</fsummary>
-      <type>
-        <v>Set = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns the largest element in <c>Set</c>. Assumes that
-          <c>Set</c> is nonempty.</p>
+        <p>Returns the largest element in <c><anno>Set</anno></c>. Assumes that
+          <c><anno>Set</anno></c> is nonempty.</p>
       </desc>
     </func>
     <func>
-      <name>next(Iter1) -> {Element, Iter2} | none</name>
+      <name name="next" arity="1"/>
       <fsummary>Traverse a gb_set with an iterator</fsummary>
-      <type>
-        <v>Iter1 = Iter2 = Element = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>{Element, Iter2}</c> where <c>Element</c> is the
-          smallest element referred to by the iterator <c>Iter1</c>,
-          and <c>Iter2</c> is the new iterator to be used for
+        <p>Returns <c>{<anno>Element</anno>, <anno>Iter2</anno>}</c> where <c><anno>Element</anno></c> is the
+          smallest element referred to by the iterator <c><anno>Iter1</anno></c>,
+          and <c><anno>Iter2</anno></c> is the new iterator to be used for
           traversing the remaining elements, or the atom <c>none</c> if
           no elements remain.</p>
       </desc>
     </func>
     <func>
-      <name>singleton(Element) -> gb_set()</name>
+      <name name="singleton" arity="1"/>
       <fsummary>Return a gb_set with one element</fsummary>
-      <type>
-        <v>Element = term()</v>
-      </type>
       <desc>
-        <p>Returns a gb_set containing only the element <c>Element</c>.</p>
+        <p>Returns a gb_set containing only the element <c><anno>Element</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>size(Set) -> int()</name>
+      <name name="size" arity="1"/>
       <fsummary>Return the number of elements in a gb_set</fsummary>
-      <type>
-        <v>Set = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns the number of elements in <c>Set</c>.</p>
+        <p>Returns the number of elements in <c><anno>Set</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>smallest(Set) -> term()</name>
+      <name name="smallest" arity="1"/>
       <fsummary>Return smallest element</fsummary>
-      <type>
-        <v>Set = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns the smallest element in <c>Set</c>. Assumes that
-          <c>Set</c> is nonempty.</p>
+        <p>Returns the smallest element in <c><anno>Set</anno></c>. Assumes that
+          <c><anno>Set</anno></c> is nonempty.</p>
       </desc>
     </func>
     <func>
-      <name>take_largest(Set1) -> {Element, Set2}</name>
+      <name name="take_largest" arity="1"/>
       <fsummary>Extract largest element</fsummary>
-      <type>
-        <v>Set1 = Set2 = gb_set()</v>
-        <v>Element = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>{Element, Set2}</c>, where <c>Element</c> is the
-          largest element in <c>Set1</c>, and <c>Set2</c> is this set
-          with <c>Element</c> deleted. Assumes that <c>Set1</c> is
+        <p>Returns <c>{<anno>Element</anno>, <anno>Set2</anno>}</c>, where <c><anno>Element</anno></c> is the
+          largest element in <c><anno>Set1</anno></c>, and <c><anno>Set2</anno></c> is this set
+          with <c><anno>Element</anno></c> deleted. Assumes that <c><anno>Set1</anno></c> is
           nonempty.</p>
       </desc>
     </func>
     <func>
-      <name>take_smallest(Set1) -> {Element, Set2}</name>
+      <name name="take_smallest" arity="1"/>
       <fsummary>Extract smallest element</fsummary>
-      <type>
-        <v>Set1 = Set2 = gb_set()</v>
-        <v>Element = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>{Element, Set2}</c>, where <c>Element</c> is the
-          smallest element in <c>Set1</c>, and <c>Set2</c> is this set
-          with <c>Element</c> deleted. Assumes that <c>Set1</c> is
+        <p>Returns <c>{<anno>Element</anno>, <anno>Set2</anno>}</c>, where <c><anno>Element</anno></c> is the
+          smallest element in <c><anno>Set1</anno></c>, and <c><anno>Set2</anno></c> is this set
+          with <c><anno>Element</anno></c> deleted. Assumes that <c><anno>Set1</anno></c> is
           nonempty.</p>
       </desc>
     </func>
     <func>
-      <name>to_list(Set) -> List</name>
+      <name name="to_list" arity="1"/>
       <fsummary>Convert a gb_set into a list</fsummary>
-      <type>
-        <v>Set = gb_set()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns the elements of <c>Set</c> as a list.</p>
+        <p>Returns the elements of <c><anno>Set</anno></c> as a list.</p>
       </desc>
     </func>
     <func>
-      <name>union(Set1, Set2) -> Set3</name>
+      <name name="union" arity="2"/>
       <fsummary>Return the union of two gb_sets</fsummary>
-      <type>
-        <v>Set1 = Set2 = Set3 = gb_set()</v>
-      </type>
       <desc>
-        <p>Returns the merged (union) gb_set of <c>Set1</c> and
-          <c>Set2</c>.</p>
+        <p>Returns the merged (union) gb_set of <c><anno>Set1</anno></c> and
+          <c><anno>Set2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>union(SetList) -> Set</name>
+      <name name="union" arity="1"/>
       <fsummary>Return the union of a list of gb_sets</fsummary>
-      <type>
-        <v>SetList = [gb_set()]</v>
-        <v>Set = gb_set()</v>
-      </type>
       <desc>
         <p>Returns the merged (union) gb_set of the list of gb_sets.</p>
       </desc>
diff --git a/lib/stdlib/doc/src/gb_trees.xml b/lib/stdlib/doc/src/gb_trees.xml
index 94f40c28bd..65c866efbe 100644
--- a/lib/stdlib/doc/src/gb_trees.xml
+++ b/lib/stdlib/doc/src/gb_trees.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2010</year>
+      <year>2001</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -57,20 +57,22 @@
       trees. Behaviour is logarithmic (as it should be).</p>
   </section>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-gb_tree() = a GB tree</code>
-  </section>
+  <datatypes>
+    <datatype>
+      <name><marker id="type-gb_tree">gb_tree()</marker></name>
+      <desc><p>A GB tree.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="iter"/>
+      <desc><p>A GB tree iterator.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>balance(Tree1) -> Tree2</name>
+      <name name="balance" arity="1"/>
       <fsummary>Rebalance a tree</fsummary>
-      <type>
-        <v>Tree1 = Tree2 = gb_tree()</v>
-      </type>
       <desc>
-        <p>Rebalances <c>Tree1</c>. Note that this is rarely necessary,
+        <p>Rebalances <c><anno>Tree1</anno></c>. Note that this is rarely necessary,
           but may be motivated when a large number of nodes have been
           deleted from the tree without further insertions. Rebalancing
           could then be forced in order to minimise lookup times, since
@@ -78,139 +80,97 @@ gb_tree() = a GB tree</code>
       </desc>
     </func>
     <func>
-      <name>delete(Key, Tree1) -> Tree2</name>
+      <name name="delete" arity="2"/>
       <fsummary>Remove a node from a tree</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Tree1 = Tree2 = gb_tree()</v>
-      </type>
       <desc>
-        <p>Removes the node with key <c>Key</c> from <c>Tree1</c>;
+        <p>Removes the node with key <c><anno>Key</anno></c> from <c><anno>Tree1</anno></c>;
           returns new tree. Assumes that the key is present in the tree,
           crashes otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>delete_any(Key, Tree1) -> Tree2</name>
+      <name name="delete_any" arity="2"/>
       <fsummary>Remove a (possibly non-existing) node from a tree</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Tree1 = Tree2 = gb_tree()</v>
-      </type>
       <desc>
-        <p>Removes the node with key <c>Key</c> from <c>Tree1</c> if
+        <p>Removes the node with key <c><anno>Key</anno></c> from <c><anno>Tree1</anno></c> if
           the key is present in the tree, otherwise does nothing;
           returns new tree.</p>
       </desc>
     </func>
     <func>
-      <name>empty() -> Tree</name>
+      <name name="empty" arity="0"/>
       <fsummary>Return an empty tree</fsummary>
-      <type>
-        <v>Tree = gb_tree()</v>
-      </type>
       <desc>
         <p>Returns a new empty tree</p>
       </desc>
     </func>
     <func>
-      <name>enter(Key, Val, Tree1) -> Tree2</name>
+      <name name="enter" arity="3"/>
       <fsummary>Insert or update key with value in a tree</fsummary>
-      <type>
-        <v>Key = Val = term()</v>
-        <v>Tree1 = Tree2 = gb_tree()</v>
-      </type>
       <desc>
-        <p>Inserts <c>Key</c> with value <c>Val</c> into <c>Tree1</c> if
+        <p>Inserts <c><anno>Key</anno></c> with value <c><anno>Val</anno></c> into <c><anno>Tree1</anno></c> if
           the key is not present in the tree, otherwise updates
-          <c>Key</c> to value <c>Val</c> in <c>Tree1</c>. Returns the
+          <c><anno>Key</anno></c> to value <c><anno>Val</anno></c> in <c><anno>Tree1</anno></c>. Returns the
           new tree.</p>
       </desc>
     </func>
     <func>
-      <name>from_orddict(List) -> Tree</name>
+      <name name="from_orddict" arity="1"/>
       <fsummary>Make a tree from an orddict</fsummary>
-      <type>
-        <v>List = [{Key, Val}]</v>
-        <v>&nbsp;Key = Val = term()</v>
-        <v>Tree = gb_tree()</v>
-      </type>
       <desc>
-        <p>Turns an ordered list <c>List</c> of key-value tuples into a
+        <p>Turns an ordered list <c><anno>List</anno></c> of key-value tuples into a
           tree. The list must not contain duplicate keys.</p>
       </desc>
     </func>
     <func>
-      <name>get(Key, Tree) -> Val</name>
+      <name name="get" arity="2"/>
       <fsummary>Look up a key in a tree, if present</fsummary>
-      <type>
-        <v>Key = Val = term()</v>
-        <v>Tree = gb_tree()</v>
-      </type>
       <desc>
-        <p>Retrieves the value stored with <c>Key</c> in <c>Tree</c>.
+        <p>Retrieves the value stored with <c><anno>Key</anno></c> in <c><anno>Tree</anno></c>.
           Assumes that the key is present in the tree, crashes
           otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>lookup(Key, Tree) -> {value, Val} | none</name>
+      <name name="lookup" arity="2"/>
       <fsummary>Look up a key in a tree</fsummary>
-      <type>
-        <v>Key = Val = term()</v>
-        <v>Tree = gb_tree()</v>
-      </type>
       <desc>
-        <p>Looks up <c>Key</c> in <c>Tree</c>; returns
-          <c>{value, Val}</c>, or <c>none</c> if <c>Key</c> is not
+        <p>Looks up <c><anno>Key</anno></c> in <c><anno>Tree</anno></c>; returns
+          <c>{value, <anno>Val</anno>}</c>, or <c>none</c> if <c><anno>Key</anno></c> is not
           present.</p>
       </desc>
     </func>
     <func>
-      <name>insert(Key, Val, Tree1) -> Tree2</name>
+      <name name="insert" arity="3"/>
       <fsummary>Insert a new key and value in a tree</fsummary>
-      <type>
-        <v>Key = Val = term()</v>
-        <v>Tree1 = Tree2 = gb_tree()</v>
-      </type>
       <desc>
-        <p>Inserts <c>Key</c> with value <c>Val</c> into <c>Tree1</c>;
+        <p>Inserts <c><anno>Key</anno></c> with value <c><anno>Val</anno></c> into <c><anno>Tree1</anno></c>;
           returns the new tree. Assumes that the key is not present in
           the tree, crashes otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>is_defined(Key, Tree) -> bool()</name>
+      <name name="is_defined" arity="2"/>
       <fsummary>Test for membership of a tree</fsummary>
-      <type>
-        <v>Tree = gb_tree()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Key</c> is present in <c>Tree</c>,
+        <p>Returns <c>true</c> if <c><anno>Key</anno></c> is present in <c><anno>Tree</anno></c>,
           otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>is_empty(Tree) -> bool()</name>
+      <name name="is_empty" arity="1"/>
       <fsummary>Test for empty tree</fsummary>
-      <type>
-        <v>Tree = gb_tree()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Tree</c> is an empty tree, and
+        <p>Returns <c>true</c> if <c><anno>Tree</anno></c> is an empty tree, and
           <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>iterator(Tree) -> Iter</name>
+      <name name="iterator" arity="1"/>
       <fsummary>Return an iterator for a tree</fsummary>
-      <type>
-        <v>Tree = gb_tree()</v>
-        <v>Iter = term()</v>
-      </type>
       <desc>
         <p>Returns an iterator that can be used for traversing the
-          entries of <c>Tree</c>; see <c>next/1</c>. The implementation
+          entries of <c><anno>Tree</anno></c>; see <c>next/1</c>. The implementation
           of this is very efficient; traversing the whole tree using
           <c>next/1</c> is only slightly slower than getting the list
           of all elements using <c>to_list/1</c> and traversing that.
@@ -220,141 +180,99 @@ gb_tree() = a GB tree</code>
       </desc>
     </func>
     <func>
-      <name>keys(Tree) -> [Key]</name>
+      <name name="keys" arity="1"/>
       <fsummary>Return a list of the keys in a tree</fsummary>
-      <type>
-        <v>Tree = gb_tree()</v>
-        <v>Key = term()</v>
-      </type>
       <desc>
-        <p>Returns the keys in <c>Tree</c> as an ordered list.</p>
+        <p>Returns the keys in <c><anno>Tree</anno></c> as an ordered list.</p>
       </desc>
     </func>
     <func>
-      <name>largest(Tree) -> {Key, Val}</name>
+      <name name="largest" arity="1"/>
       <fsummary>Return largest key and value</fsummary>
-      <type>
-        <v>Tree = gb_tree()</v>
-        <v>Key = Val = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>{Key, Val}</c>, where <c>Key</c> is the largest
-          key in <c>Tree</c>, and <c>Val</c> is the value associated
+        <p>Returns <c>{<anno>Key</anno>, <anno>Val</anno>}</c>, where <c><anno>Key</anno></c> is the largest
+          key in <c><anno>Tree</anno></c>, and <c><anno>Val</anno></c> is the value associated
           with this key. Assumes that the tree is nonempty.</p>
       </desc>
     </func>
     <func>
-      <name>map(Function, Tree1) -> Tree2</name>
+      <name name="map" arity="2"/>
       <fsummary>Return largest key and value</fsummary>
-      <type>
-        <v>Function = fun(K, V1) -> V2</v>
-        <v>Tree1 = Tree2 = gb_tree()</v>
-      </type>
-         <desc><p>maps the function F(K, V1) -> V2 to all key-value pairs
-	    of the tree Tree1 and returns a new tree Tree2 with the same set of keys
-	    as Tree1 and the new set of values V2.</p>
+         <desc><p>Maps the function F(<anno>K</anno>, <anno>V1</anno>) -> <anno>V2</anno> to all key-value pairs
+	    of the tree <c><anno>Tree1</anno></c> and returns a new tree <c><anno>Tree2</anno></c> with the same set of keys
+	    as <c><anno>Tree1</anno></c> and the new set of values <c><anno>V2</anno></c>.</p>
          </desc>
     </func>
     <func>
-      <name>next(Iter1) -> {Key, Val, Iter2} | none</name>
+      <name name="next" arity="1"/>
       <fsummary>Traverse a tree with an iterator</fsummary>
-      <type>
-        <v>Iter1 = Iter2 = Key = Val = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>{Key, Val, Iter2}</c> where <c>Key</c> is the
-          smallest key referred to by the iterator <c>Iter1</c>, and
-          <c>Iter2</c> is the new iterator to be used for
+        <p>Returns <c>{<anno>Key</anno>, <anno>Val</anno>, <anno>Iter2</anno>}</c> where <c><anno>Key</anno></c> is the
+          smallest key referred to by the iterator <c><anno>Iter1</anno></c>, and
+          <c><anno>Iter2</anno></c> is the new iterator to be used for
           traversing the remaining nodes, or the atom <c>none</c> if no
           nodes remain.</p>
       </desc>
     </func>
     <func>
-      <name>size(Tree) -> int()</name>
+      <name name="size" arity="1"/>
       <fsummary>Return the number of nodes in a tree</fsummary>
-      <type>
-        <v>Tree = gb_tree()</v>
-      </type>
       <desc>
-        <p>Returns the number of nodes in <c>Tree</c>.</p>
+        <p>Returns the number of nodes in <c><anno>Tree</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>smallest(Tree) -> {Key, Val}</name>
+      <name name="smallest" arity="1"/>
       <fsummary>Return smallest key and value</fsummary>
-      <type>
-        <v>Tree = gb_tree()</v>
-        <v>Key = Val = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>{Key, Val}</c>, where <c>Key</c> is the smallest
-          key in <c>Tree</c>, and <c>Val</c> is the value associated
+        <p>Returns <c>{<anno>Key</anno>, <anno>Val</anno>}</c>, where <c><anno>Key</anno></c> is the smallest
+          key in <c><anno>Tree</anno></c>, and <c><anno>Val</anno></c> is the value associated
           with this key. Assumes that the tree is nonempty.</p>
       </desc>
     </func>
     <func>
-      <name>take_largest(Tree1) -> {Key, Val, Tree2}</name>
+      <name name="take_largest" arity="1"/>
       <fsummary>Extract largest key and value</fsummary>
-      <type>
-        <v>Tree1 = Tree2 = gb_tree()</v>
-        <v>Key = Val = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>{Key, Val, Tree2}</c>, where <c>Key</c> is the
-          largest key in <c>Tree1</c>, <c>Val</c> is the value
-          associated with this key, and <c>Tree2</c> is this tree with
+        <p>Returns <c>{<anno>Key</anno>, <anno>Val</anno>, <anno>Tree2</anno>}</c>, where <c><anno>Key</anno></c> is the
+          largest key in <c><anno>Tree1</anno></c>, <c><anno>Val</anno></c> is the value
+          associated with this key, and <c><anno>Tree2</anno></c> is this tree with
           the corresponding node deleted. Assumes that the tree is
           nonempty.</p>
       </desc>
     </func>
     <func>
-      <name>take_smallest(Tree1) -> {Key, Val, Tree2}</name>
+      <name name="take_smallest" arity="1"/>
       <fsummary>Extract smallest key and value</fsummary>
-      <type>
-        <v>Tree1 = Tree2 = gb_tree()</v>
-        <v>Key = Val = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>{Key, Val, Tree2}</c>, where <c>Key</c> is the
-          smallest key in <c>Tree1</c>, <c>Val</c> is the value
-          associated with this key, and <c>Tree2</c> is this tree with
+        <p>Returns <c>{<anno>Key</anno>, <anno>Val</anno>, <anno>Tree2</anno>}</c>, where <c><anno>Key</anno></c> is the
+          smallest key in <c><anno>Tree1</anno></c>, <c><anno>Val</anno></c> is the value
+          associated with this key, and <c><anno>Tree2</anno></c> is this tree with
           the corresponding node deleted. Assumes that the tree is
           nonempty.</p>
       </desc>
     </func>
     <func>
-      <name>to_list(Tree) -> [{Key, Val}]</name>
+      <name name="to_list" arity="1"/>
       <fsummary>Convert a tree into a list</fsummary>
-      <type>
-        <v>Tree = gb_tree()</v>
-        <v>Key = Val = term()</v>
-      </type>
       <desc>
         <p>Converts a tree into an ordered list of key-value tuples.</p>
       </desc>
     </func>
     <func>
-      <name>update(Key, Val, Tree1) -> Tree2</name>
+      <name name="update" arity="3"/>
       <fsummary>Update a key to new value in a tree</fsummary>
-      <type>
-        <v>Key = Val = term()</v>
-        <v>Tree1 = Tree2 = gb_tree()</v>
-      </type>
       <desc>
-        <p>Updates <c>Key</c> to value <c>Val</c> in <c>Tree1</c>;
+        <p>Updates <c><anno>Key</anno></c> to value <c><anno>Val</anno></c> in <c><anno>Tree1</anno></c>;
           returns the new tree. Assumes that the key is present in the
           tree.</p>
       </desc>
     </func>
     <func>
-      <name>values(Tree) -> [Val]</name>
+      <name name="values" arity="1"/>
       <fsummary>Return a list of the values in a tree</fsummary>
-      <type>
-        <v>Tree = gb_tree()</v>
-        <v>Val = term()</v>
-      </type>
       <desc>
-        <p>Returns the values in <c>Tree</c> as an ordered list, sorted
+        <p>Returns the values in <c><anno>Tree</anno></c> as an ordered list, sorted
           by their corresponding keys. Duplicates are not removed.</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml
index 2234a62ac3..24bcb419fe 100644
--- a/lib/stdlib/doc/src/gen_event.xml
+++ b/lib/stdlib/doc/src/gen_event.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -100,6 +100,20 @@ gen_event:stop             ----->  Module:terminate/2
       the specified event manager does not exist or if bad arguments are
       given.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="handler"/>
+    </datatype>
+    <datatype>
+      <name name="handler_args"/>
+    </datatype>
+    <datatype>
+      <name name="add_handler_ret"/>
+    </datatype>
+    <datatype>
+      <name name="del_handler_ret"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
       <name>start_link() -> Result</name>
diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml
index 41e3e92c59..af9c75d546 100644
--- a/lib/stdlib/doc/src/io.xml
+++ b/lib/stdlib/doc/src/io.xml
@@ -43,7 +43,7 @@
 
     <p>As of R13A, data supplied to the <seealso
     marker="#put_chars/2">put_chars</seealso> function should be in the
-    <c>chardata()</c> format described below. This means that programs
+    <seealso marker="unicode#type-chardata"><c>unicode:chardata()</c></seealso> format. This means that programs
     supplying binaries to this function need to convert them to UTF-8
     before trying to output the data on an
     <c>io_device()</c>.</p>
@@ -64,76 +64,84 @@
 
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-io_device()
-  as returned by file:open/2, a process handling IO protocols</code>
-
-    <code type="none">
-unicode_binary() = binary() with characters encoded in UTF-8 coding standard
-unicode_char() = integer() representing valid unicode codepoint
-
-chardata() = charlist() | unicode_binary()
+  <datatypes>
+    <datatype>
+      <name name="device"/>
+      <desc>
+        <p>Either <c>standard_io</c>, <c>standard_error</c>, a
+          registered name, or a pid handling IO protocols (returned from
+            <seealso marker="file#open/2">file:open/2</seealso>).</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="opt_pair"/>
+    </datatype>
+    <datatype>
+      <name name="expand_fun"/>
+    </datatype>
+    <datatype>
+      <name name="encoding"/>
+    </datatype>
+    <datatype>
+      <name name="setopt"/>
+    </datatype>
+    <datatype>
+      <name name="format"/>
+    </datatype>
+    <datatype>
+      <name name="line"/>
+    </datatype>
+    <datatype>
+      <name name="prompt"/>
+    </datatype>
+    <datatype>
+      <name name="request_error"/>
+    </datatype>
+    <datatype>
+      <name name="error_description"/>
+      <desc><p>Whatever the I/O-server sends.</p></desc>
+    </datatype>
+  </datatypes>
 
-charlist() = [unicode_char() | unicode_binary() | charlist()]
-  a unicode_binary is allowed as the tail of the list</code>
-  </section>
   <funcs>
     <func>
-      <name>columns() -> {ok,int()} | {error, enotsup}</name>
-      <name>columns(IoDevice) -> {ok,int()} | {error, enotsup}</name>
+      <name name="columns" arity="0"/>
+      <name name="columns" arity="1"/>
       <fsummary>Get the number of columns of a device</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-      </type>
       <desc>
           <p>Retrieves the number of columns of the 
-          <c>IoDevice</c> (i.e. the width of a terminal). The function
+          <c><anno>IoDevice</anno></c> (i.e. the width of a terminal). The function
           only succeeds for terminal devices, for all other devices
           the function returns <c>{error, enotsup}</c></p>
       </desc>
     </func>
     <func>
-      <name>put_chars(IoData) -> ok</name>
-      <name>put_chars(IoDevice, IoData) -> ok</name>
+      <name name="put_chars" arity="1"/>
+      <name name="put_chars" arity="2"/>
       <fsummary>Write a list of characters</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>IoData = chardata()</v>
-      </type>
       <desc>
-        <p>Writes the characters of <c>IoData</c> to the io_server()
-          (<c>IoDevice</c>).</p>
+        <p>Writes the characters of <c><anno>CharData</anno></c> to the io_server()
+          (<c><anno>IoDevice</anno></c>).</p>
       </desc>
     </func>
     <func>
-      <name>nl() -> ok</name>
-      <name>nl(IoDevice) -> ok</name>
+      <name name="nl" arity="0"/>
+      <name name="nl" arity="1"/>
       <fsummary>Write a newline</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-      </type>
       <desc>
-        <p>Writes new line to the standard output (<c>IoDevice</c>).</p>
+        <p>Writes new line to the standard output (<c><anno>IoDevice</anno></c>).</p>
       </desc>
     </func>
     <func>
-      <name>get_chars(Prompt, Count) -> Data | eof</name>
-      <name>get_chars(IoDevice, Prompt, Count) -> Data | eof</name>
+      <name name="get_chars" arity="2"/>
+      <name name="get_chars" arity="3"/>
       <fsummary>Read a specified number of characters</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Prompt = atom() | string()</v>
-        <v>Count = int()</v>
-	<v>Data = [ unicode_char() ] | unicode_binary()</v>
-      </type>
       <desc>
-        <p>Reads <c>Count</c> characters from standard input
-          (<c>IoDevice</c>), prompting it with <c>Prompt</c>. It
+        <p>Reads <c><anno>Count</anno></c> characters from standard input
+          (<c><anno>IoDevice</anno></c>), prompting it with <c><anno>Prompt</anno></c>. It
           returns:</p>
         <taglist>
-          <tag><c>Data</c></tag>
+          <tag><c><anno>Data</anno></c></tag>
           <item>
             <p>The input characters. If the device supports Unicode,
             the data may represent codepoints larger than 255 (the
@@ -145,7 +153,7 @@ charlist() = [unicode_char() | unicode_binary() | charlist()]
           <item>
             <p>End of file was encountered.</p>
           </item>
-	  <tag><c>{error,Reason}</c></tag>
+	  <tag><c>{error,<anno>Reason</anno>}</c></tag>
 	  <item>
 	    <p>Other (rare) error condition, for instance <c>{error,estale}</c>
 	    if reading from an NFS file system.</p>
@@ -154,19 +162,14 @@ charlist() = [unicode_char() | unicode_binary() | charlist()]
       </desc>
     </func>
     <func>
-      <name>get_line(Prompt) -> Data | eof | {error,Reason}</name>
-      <name>get_line(IoDevice, Prompt) -> Data | eof | {error,Reason}</name>
+      <name name="get_line" arity="1"/>
+      <name name="get_line" arity="2"/>
       <fsummary>Read a line</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Prompt = atom() | string()</v>
-	<v>Data = [ unicode_char() ] | unicode_binary()</v>
-      </type>
       <desc>
-        <p>Reads a line from the standard input (<c>IoDevice</c>),
-          prompting it with <c>Prompt</c>. It returns:</p>
+        <p>Reads a line from the standard input (<c><anno>IoDevice</anno></c>),
+          prompting it with <c><anno>Prompt</anno></c>. It returns:</p>
         <taglist>
-          <tag><c>Data</c></tag>
+          <tag><c><anno>Data</anno></c></tag>
           <item>
             <p>The characters in the line terminated by a LF (or end of
               file). If the device supports Unicode,
@@ -179,7 +182,7 @@ charlist() = [unicode_char() | unicode_binary() | charlist()]
           <item>
             <p>End of file was encountered.</p>
           </item>
-	  <tag><c>{error,Reason}</c></tag>
+	  <tag><c>{error,<anno>Reason</anno>}</c></tag>
 	  <item>
 	    <p>Other (rare) error condition, for instance <c>{error,estale}</c>
 	    if reading from an NFS file system.</p>
@@ -188,15 +191,9 @@ charlist() = [unicode_char() | unicode_binary() | charlist()]
       </desc>
     </func>
     <func>
-      <name>getopts() -> Opts</name>
-      <name>getopts(IoDevice) -> Opts</name>
+      <name name="getopts" arity="0"/>
+      <name name="getopts" arity="1"/>
       <fsummary>Get the supported options and values from an I/O-server</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Opts = [Opt]</v>
-        <v>&nbsp;&nbsp;Opt = {atom(),Value}</v>
-	<v>&nbsp;&nbsp;Value = term()</v>
-      </type>
       <desc>
       <p>This function requests all available options and their current values for a specific io_device(). Example:</p>
 <pre>
@@ -216,18 +213,11 @@ charlist() = [unicode_char() | unicode_binary() | charlist()]
       </desc>
     </func>
     <func>
-      <name>setopts(Opts) -> ok | {error, Reason}</name>
-      <name>setopts(IoDevice, Opts) -> ok | {error, Reason}</name>
+      <name name="setopts" arity="1"/>
+      <name name="setopts" arity="2"/>
       <fsummary>Set options</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Opts = [Opt]</v>
-        <v>&nbsp;&nbsp;Opt = atom() | {atom(),Value}</v>
-	<v>&nbsp;&nbsp;Value = term()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
-        <p>Set options for the io_device() (<c>IoDevice</c>).</p>
+        <p>Set options for the io_device() (<c><anno>IoDevice</anno></c>).</p>
 
         <p>Possible options and values vary depending on the actual
         io_device(). For a list of supported options and their current values
@@ -236,17 +226,17 @@ charlist() = [unicode_char() | unicode_binary() | charlist()]
 
 	<p>The options and values supported by the current OTP io_devices are:</p>
         <taglist>
-          <tag><c>binary, list or {binary, bool()}</c></tag>
+          <tag><c>binary, list or {binary, boolean()}</c></tag>
           <item>
             <p>If set in binary mode (binary or {binary,true}), the io_server() sends binary data (encoded in UTF-8) as answers to the get_line, get_chars and, if possible, get_until requests (see the I/O protocol description in STDLIB User's Guide for details). The immediate effect is that <c>get_chars/2,3</c> and <c>get_line/1,2</c> return UTF-8 binaries instead of lists of chars for the affected device.</p>
 	    <p>By default, all io_devices in OTP are set in list mode, but the io functions can handle any of these modes and so should other, user written, modules behaving as clients to I/O-servers.</p>
 	    <p>This option is supported by the standard shell (group.erl), the 'oldshell' (user.erl) and the file I/O servers.</p>
           </item>
-          <tag><c>{echo, bool()}</c></tag>
+          <tag><c>{echo, boolean()}</c></tag>
 	  <item>
 	  <p>Denotes if the terminal should echo input. Only supported for the standard shell I/O-server (group.erl)</p>
 	  </item>
-          <tag><c>{expand_fun, fun()}</c></tag>
+          <tag><c>{expand_fun, expand_fun()}</c></tag>
           <item>
             <p>Provide a function for tab-completion (expansion)
               like the erlang shell. This function is called
@@ -288,35 +278,24 @@ charlist() = [unicode_char() | unicode_binary() | charlist()]
       </desc>
     </func>
     <func>
-      <name>write(Term) -> ok</name>
-      <name>write(IoDevice, Term) -> ok</name>
+      <name name="write" arity="1"/>
+      <name name="write" arity="2"/>
       <fsummary>Write a term</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Term = term()</v>
-      </type>
       <desc>
-        <p>Writes the term <c>Term</c> to the standard output
-          (<c>IoDevice</c>).</p>
+        <p>Writes the term <c><anno>Term</anno></c> to the standard output
+          (<c><anno>IoDevice</anno></c>).</p>
       </desc>
     </func>
     <func>
-      <name>read(Prompt) -> Result</name>
-      <name>read(IoDevice, Prompt) -> Result</name>
+      <name name="read" arity="1"/>
+      <name name="read" arity="2"/>
       <fsummary>Read a term</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Prompt = atom() | string()</v>
-        <v>Result = {ok, Term} | eof | {error, ErrorInfo}</v>
-        <v>&nbsp;Term = term()</v>
-        <v>&nbsp;ErrorInfo -- see section Error Information below</v>
-      </type>
       <desc>
-        <p>Reads a term <c>Term</c> from the standard input
-          (<c>IoDevice</c>), prompting it with <c>Prompt</c>. It
+        <p>Reads a term <c><anno>Term</anno></c> from the standard input
+          (<c><anno>IoDevice</anno></c>), prompting it with <c><anno>Prompt</anno></c>. It
           returns:</p>
         <taglist>
-          <tag><c>{ok, Term}</c></tag>
+          <tag><c>{ok, <anno>Term</anno>}</c></tag>
           <item>
             <p>The parsing was successful.</p>
           </item>
@@ -324,7 +303,7 @@ charlist() = [unicode_char() | unicode_binary() | charlist()]
           <item>
             <p>End of file was encountered.</p>
           </item>
-          <tag><c>{error, ErrorInfo}</c></tag>
+          <tag><c>{error, <anno>ErrorInfo</anno>}</c></tag>
           <item>
             <p>The parsing failed.</p>
           </item>
@@ -332,31 +311,22 @@ charlist() = [unicode_char() | unicode_binary() | charlist()]
       </desc>
     </func>
     <func>
-      <name>read(IoDevice, Prompt, StartLine) -> Result</name>
+      <name name="read" arity="3"/>
       <fsummary>Read a term</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Prompt = atom() | string()</v>
-        <v>StartLine = int()</v>
-        <v>Result = {ok, Term, EndLine} | {eof, EndLine} |  {error, ErrorInfo, EndLine}</v>
-        <v>&nbsp;Term = term()</v>
-        <v>&nbsp;EndLine = int()</v>
-        <v>&nbsp;ErrorInfo -- see section Error Information below</v>
-      </type>
       <desc>
-        <p>Reads a term <c>Term</c> from <c>IoDevice</c>, prompting it
-          with <c>Prompt</c>. Reading starts at line number
-          <c>StartLine</c>. It returns:</p>
+        <p>Reads a term <c><anno>Term</anno></c> from <c><anno>IoDevice</anno></c>, prompting it
+          with <c><anno>Prompt</anno></c>. Reading starts at line number
+          <c><anno>StartLine</anno></c>. It returns:</p>
         <taglist>
-          <tag><c>{ok, Term, EndLine}</c></tag>
+          <tag><c>{ok, Term, <anno>EndLine</anno>}</c></tag>
           <item>
             <p>The parsing was successful.</p>
           </item>
-          <tag><c>{eof, EndLine}</c></tag>
+          <tag><c>{eof, <anno>EndLine</anno>}</c></tag>
           <item>
             <p>End of file was encountered.</p>
           </item>
-          <tag><c>{error, ErrorInfo, EndLine}</c></tag>
+          <tag><c>{error, <anno>ErrorInfo</anno>, <anno>ErrorLine</anno>}</c></tag>
           <item>
             <p>The parsing failed.</p>
           </item>
@@ -364,24 +334,19 @@ charlist() = [unicode_char() | unicode_binary() | charlist()]
       </desc>
     </func>
     <func>
-      <name>fwrite(Format) -></name>
-      <name>fwrite(Format, Data) -> ok</name>
-      <name>fwrite(IoDevice, Format, Data) -> ok</name>
-      <name>format(Format) -></name>
-      <name>format(Format, Data) -> ok</name>
-      <name>format(IoDevice, Format, Data) -> ok</name>
+      <name name="fwrite" arity="1"/>
+      <name name="fwrite" arity="2"/>
+      <name name="fwrite" arity="3"/>
+      <name name="format" arity="1"/>
+      <name name="format" arity="2"/>
+      <name name="format" arity="3"/>
       <fsummary>Write formatted output</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Format = atom() | string() | binary()</v>
-        <v>Data = [term()]</v>
-      </type>
       <desc>
-        <p>Writes the items in <c>Data</c> (<c>[]</c>) on the standard
-          output (<c>IoDevice</c>) in accordance with <c>Format</c>.
-          <c>Format</c> contains plain characters which are copied to
+        <p>Writes the items in <c><anno>Data</anno></c> (<c>[]</c>) on the standard
+          output (<c><anno>IoDevice</anno></c>) in accordance with <c><anno>Format</anno></c>.
+          <c><anno>Format</anno></c> contains plain characters which are copied to
           the output device, and control sequences for formatting, see
-          below. If <c>Format</c> is an atom or a binary, it is first 
+          below. If <c><anno>Format</anno></c> is an atom or a binary, it is first
           converted to a list with the aid of <c>atom_to_list/1</c>
           or <c>binary_to_list/1</c>.</p>
         <pre>
@@ -474,7 +439,7 @@ ok</pre>
           <item>
             <p>Prints the argument with the <c>string</c> syntax. The
               argument is, if no Unicode translation modifier is present, an 
-	      <seealso marker="erts:erlang#iolist_definition">I/O list</seealso>, a binary, or an atom. If the Unicode translation modifier ('t') is in effect, the argument is chardata(), meaning that binaries are in UTF-8. The characters
+	      <seealso marker="erts:erlang#iolist_definition">I/O list</seealso>, a binary, or an atom. If the Unicode translation modifier ('t') is in effect, the argument is unicode:chardata(), meaning that binaries are in UTF-8. The characters
               are printed without quotes. The string is first truncated
 	      by the given precision and then padded and justified
 	      to the given field width. The default precision is the field width.</p>
@@ -673,23 +638,15 @@ ok
       </desc>
     </func>
     <func>
-      <name>fread(Prompt, Format) -> Result</name>
-      <name>fread(IoDevice, Prompt, Format) -> Result</name>
+      <name name="fread" arity="2"/>
+      <name name="fread" arity="3"/>
       <fsummary>Read formatted input</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Prompt = atom() | string()</v>
-        <v>Format = string()</v>
-        <v>Result = {ok, Terms} | eof | {error, What}</v>
-        <v>&nbsp;Terms = [term()]</v>
-        <v>&nbsp;What = term()</v>
-      </type>
       <desc>
-        <p>Reads characters from the standard input (<c>IoDevice</c>),
-          prompting it with <c>Prompt</c>. Interprets the characters in
-          accordance with <c>Format</c>. <c>Format</c> contains control
+        <p>Reads characters from the standard input (<c><anno>IoDevice</anno></c>),
+          prompting it with <c><anno>Prompt</anno></c>. Interprets the characters in
+          accordance with <c><anno>Format</anno></c>. <c><anno>Format</anno></c> contains control
           sequences which directs the interpretation of the input.</p>
-        <p><c>Format</c> may contain:</p>
+        <p><c><anno>Format</anno></c> may contain:</p>
         <list type="bulleted">
           <item>
             <p>White space characters (SPACE, TAB and NEWLINE) which
@@ -803,19 +760,19 @@ Prompt> <input>&lt;Character beyond latin1 range not printable in this medium&gt
             </taglist>
             <p>It returns:</p>
             <taglist>
-              <tag><c>{ok, Terms}</c></tag>
+              <tag><c>{ok, <anno>Terms</anno>}</c></tag>
               <item>
-                <p>The read was successful and <c>Terms</c> is the list
+                <p>The read was successful and <c><anno>Terms</anno></c> is the list
                   of successfully matched and read items.</p>
               </item>
               <tag><c>eof</c></tag>
               <item>
                 <p>End of file was encountered.</p>
               </item>
-              <tag><c>{error, What}</c></tag>
+              <tag><c>{error, <anno>What</anno>}</c></tag>
               <item>
                 <p>The read operation failed and the parameter
-                  <c>What</c> gives a hint about the error.</p>
+                  <c><anno>What</anno></c> gives a hint about the error.</p>
               </item>
             </taglist>
           </item>
@@ -834,33 +791,21 @@ enter><input>:</input>   <input>alan</input>   <input>:</input>   <input>joe</in
       </desc>
     </func>
     <func>
-      <name>rows() -> {ok,int()} | {error, enotsup}</name>
-      <name>rows(IoDevice) -> {ok,int()} | {error, enotsup}</name>
+      <name name="rows" arity="0"/>
+      <name name="rows" arity="1"/>
       <fsummary>Get the number of rows of a device</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-      </type>
       <desc>
           <p>Retrieves the number of rows of the 
-          <c>IoDevice</c> (i.e. the height of a terminal). The function
+          <c><anno>IoDevice</anno></c> (i.e. the height of a terminal). The function
           only succeeds for terminal devices, for all other devices
           the function returns <c>{error, enotsup}</c></p>
       </desc>
     </func>
     <func>
-      <name>scan_erl_exprs(Prompt) -></name>
-      <name>scan_erl_exprs(Prompt, StartLine) -> Result</name>
-      <name>scan_erl_exprs(IoDevice, Prompt, StartLine) -> Result</name>
+      <name name="scan_erl_exprs" arity="1"/>
+      <name name="scan_erl_exprs" arity="2"/>
+      <name name="scan_erl_exprs" arity="3"/>
       <fsummary>Read and tokenize Erlang expressions</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Prompt = atom() | string()</v>
-        <v>StartLine = int()</v>
-        <v>Result = {ok, Tokens, EndLine} | {eof, EndLine} | {error, ErrorInfo, EndLine}</v>
-        <v>&nbsp;Tokens -- see erl_scan(3)</v>
-        <v>&nbsp;EndLine = int()</v>
-        <v>&nbsp;ErrorInfo -- see section Error Information below</v>
-      </type>
       <desc>
         <p>Reads data from the standard input (<c>IoDevice</c>),
           prompting it with <c>Prompt</c>. Reading starts at line number
@@ -876,7 +821,7 @@ enter><input>:</input>   <input>alan</input>   <input>:</input>   <input>joe</in
           <item>
             <p>End of file was encountered.</p>
           </item>
-          <tag><c>{error, ErrorInfo, EndLine}</c></tag>
+          <tag><c>{error, ErrorInfo, ErrorLine}</c></tag>
           <item>
             <p>An error occurred.</p>
           </item>
@@ -892,23 +837,14 @@ enter><input>1.0er.</input>
       </desc>
     </func>
     <func>
-      <name>scan_erl_form(Prompt) -></name>
-      <name>scan_erl_form(Prompt, StartLine) -> Result</name>
-      <name>scan_erl_form(IoDevice, Prompt, StartLine) -> Result</name>
+      <name name="scan_erl_form" arity="1"/>
+      <name name="scan_erl_form" arity="2"/>
+      <name name="scan_erl_form" arity="3"/>
       <fsummary>Read and tokenize an Erlang form</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Prompt = atom() | string()</v>
-        <v>StartLine = int()</v>
-        <v>Result = {ok, Tokens, EndLine} | {eof, EndLine} | {error, ErrorInfo, EndLine}</v>
-        <v>&nbsp;Tokens -- see erl_scan(3)</v>
-        <v>&nbsp;EndLine = int()</v>
-        <v>&nbsp;ErrorInfo -- see section Error Information below</v>
-      </type>
       <desc>
-        <p>Reads data from the standard input (<c>IoDevice</c>),
-          prompting it with <c>Prompt</c>. Starts reading at line number
-          <c>StartLine</c> (1). The data is tokenized as if it were an
+        <p>Reads data from the standard input (<c><anno>IoDevice</anno></c>),
+          prompting it with <c><anno>Prompt</anno></c>. Starts reading at line number
+          <c><anno>StartLine</anno></c> (1). The data is tokenized as if it were an
           Erlang form - one of the valid Erlang expressions in an
           Erlang source file - until a final <c>'.'</c> is reached.
           This last token is also returned. The return values are the
@@ -916,27 +852,19 @@ enter><input>1.0er.</input>
       </desc>
     </func>
     <func>
-      <name>parse_erl_exprs(Prompt) -></name>
-      <name>parse_erl_exprs(Prompt, StartLine) -> Result</name>
-      <name>parse_erl_exprs(IoDevice, Prompt, StartLine) -> Result</name>
+      <name name="parse_erl_exprs" arity="1"/>
+      <name name="parse_erl_exprs" arity="2"/>
+      <name name="parse_erl_exprs" arity="3"/>
+      <type name="parse_ret"/>
       <fsummary>Read, tokenize and parse Erlang expressions</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Prompt = atom() | string()</v>
-        <v>StartLine = int()</v>
-        <v>Result = {ok, Expr_list, EndLine} | {eof, EndLine} | {error, ErrorInfo, EndLine}</v>
-        <v>&nbsp;Expr_list -- see erl_parse(3)</v>
-        <v>&nbsp;EndLine = int()</v>
-        <v>&nbsp;ErrorInfo -- see section Error Information below</v>
-      </type>
       <desc>
-        <p>Reads data from the standard input (<c>IoDevice</c>),
-          prompting it with <c>Prompt</c>. Starts reading at line number
-          <c>StartLine</c> (1). The data is tokenized and parsed as if
+        <p>Reads data from the standard input (<c><anno>IoDevice</anno></c>),
+          prompting it with <c><anno>Prompt</anno></c>. Starts reading at line number
+          <c><anno>StartLine</anno></c> (1). The data is tokenized and parsed as if
           it were a sequence of Erlang expressions until a final '.' is
           reached. It returns:</p>
         <taglist>
-          <tag><c>{ok, Expr_list, EndLine}</c></tag>
+          <tag><c>{ok, ExprList, EndLine}</c></tag>
           <item>
             <p>The parsing was successful.</p>
           </item>
@@ -944,7 +872,7 @@ enter><input>1.0er.</input>
           <item>
             <p>End of file was encountered.</p>
           </item>
-          <tag><c>{error, ErrorInfo, EndLine}</c></tag>
+          <tag><c>{error, ErrorInfo, ErrorLine}</c></tag>
           <item>
             <p>An error occurred.</p>
           </item>
@@ -960,23 +888,15 @@ enter><input>abc("hey".</input>
       </desc>
     </func>
     <func>
-      <name>parse_erl_form(Prompt) -></name>
-      <name>parse_erl_form(Prompt, StartLine) -> Result</name>
-      <name>parse_erl_form(IoDevice, Prompt, StartLine) -> Result</name>
+      <name name="parse_erl_form" arity="1"/>
+      <name name="parse_erl_form" arity="2"/>
+      <name name="parse_erl_form" arity="3"/>
+      <type name="parse_form_ret"/>
       <fsummary>Read, tokenize and parse an Erlang form</fsummary>
-      <type>
-        <v>IoDevice = io_device()</v>
-        <v>Prompt = atom() | string()</v>
-        <v>StartLine = int()</v>
-        <v>Result = {ok, AbsForm, EndLine} | {eof, EndLine} | {error, ErrorInfo, EndLine}</v>
-        <v>&nbsp;AbsForm -- see erl_parse(3)</v>
-        <v>&nbsp;EndLine = int()</v>
-        <v>&nbsp;ErrorInfo -- see section Error Information below</v>
-      </type>
       <desc>
-        <p>Reads data from the standard input (<c>IoDevice</c>),
-          prompting it with <c>Prompt</c>. Starts reading at line number
-          <c>StartLine</c> (1). The data is tokenized and parsed as if
+        <p>Reads data from the standard input (<c><anno>IoDevice</anno></c>),
+          prompting it with <c><anno>Prompt</anno></c>. Starts reading at line number
+          <c><anno>StartLine</anno></c> (1). The data is tokenized and parsed as if
           it were an Erlang form - one of the valid Erlang expressions
           in an Erlang source file - until a final '.' is reached. It
           returns:</p>
@@ -989,7 +909,7 @@ enter><input>abc("hey".</input>
           <item>
             <p>End of file was encountered.</p>
           </item>
-          <tag><c>{error, ErrorInfo, EndLine}</c></tag>
+          <tag><c>{error, ErrorInfo, ErrorLine}</c></tag>
           <item>
             <p>An error occurred.</p>
           </item>
diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml
index 399f968c5f..506c1792f1 100644
--- a/lib/stdlib/doc/src/io_lib.xml
+++ b/lib/stdlib/doc/src/io_lib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -38,14 +38,22 @@
       flattening deep lists.</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-chars() = [char() | chars()]</code>
-  </section>
+  <datatypes>
+    <datatype>
+      <name name="chars"/>
+    </datatype>
+    <datatype>
+      <name name="continuation"/>
+      <desc><p>A continuation as returned by <seealso marker="#fread/3"><c>fread/3</c></seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="depth"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>nl() -> chars()</name>
+      <name name="nl" arity="0"/>
       <fsummary>Write a newline</fsummary>
       <desc>
         <p>Returns a character list which represents a new line
@@ -53,16 +61,12 @@ chars() = [char() | chars()]</code>
       </desc>
     </func>
     <func>
-      <name>write(Term) -></name>
-      <name>write(Term, Depth) -> chars()</name>
+      <name name="write" arity="1"/>
+      <name name="write" arity="2"/>
       <fsummary>Write a term</fsummary>
-      <type>
-        <v>Term = term()</v>
-        <v>Depth = int()</v>
-      </type>
       <desc>
-        <p>Returns a character list which represents <c>Term</c>. The
-          <c>Depth</c> (-1) argument controls the depth of the
+        <p>Returns a character list which represents <c><anno>Term</anno></c>. The
+          <c><anno>Depth</anno></c> (-1) argument controls the depth of the
           structures written. When the specified depth is reached,
           everything below this level is replaced by "...". For
           example:</p>
@@ -74,36 +78,26 @@ chars() = [char() | chars()]</code>
       </desc>
     </func>
     <func>
-      <name>print(Term) -></name>
-      <name>print(Term, Column, LineLength, Depth) -> chars()</name>
+      <name name="print" arity="1"/>
+      <name name="print" arity="4"/>
       <fsummary>Pretty print a term</fsummary>
-      <type>
-        <v>Term = term()</v>
-        <v>Column = LineLenght = Depth = int()</v>
-      </type>
       <desc>
         <p>Also returns a list of characters which represents
-          <c>Term</c>, but breaks representations which are longer than
+          <c><anno>Term</anno></c>, but breaks representations which are longer than
           one line into many lines and indents each line sensibly. It
           also tries to detect and output lists of printable characters 
-          as strings. <c>Column</c> is the starting column (1),
-          <c>LineLength</c> the maximum line length (80), and
-          <c>Depth</c> (-1) the maximum print depth.</p>
+          as strings. <c><anno>Column</anno></c> is the starting column (1),
+          <c><anno>LineLength</anno></c> the maximum line length (80), and
+          <c><anno>Depth</anno></c> (-1) the maximum print depth.</p>
       </desc>
     </func>
     <func>
-      <name>fwrite(Format, Data) -></name>
-      <name>format(Format, Data) -> chars() | UnicodeList</name>
+      <name name="fwrite" arity="2"/>
+      <name name="format" arity="2"/>
       <fsummary>Write formatted output</fsummary>
-      <type>
-        <v>Format = atom() | string() | binary()</v>
-        <v>Data = [term()]</v>
-	<v>UnicodeList = [Unicode]</v>
-	<v>Unicode = int() representing valid unicode codepoint</v>
-      </type>
       <desc>
-        <p>Returns a character list which represents <c>Data</c>
-          formatted in accordance with <c>Format</c>. See
+        <p>Returns a character list which represents <c><anno>Data</anno></c>
+          formatted in accordance with <c><anno>Format</anno></c>. See
           <seealso marker="io#fwrite/1">io:fwrite/1,2,3</seealso> for a detailed
           description of the available formatting options. A fault is
           generated if there is an error in the format string or
@@ -119,42 +113,32 @@ chars() = [char() | chars()]</code>
       </desc>
     </func>
     <func>
-      <name>fread(Format, String) -> Result</name>
+      <name name="fread" arity="2"/>
       <fsummary>Read formatted input</fsummary>
-      <type>
-        <v>Format = String = string()</v>
-        <v>Result = {ok, InputList, LeftOverChars} | {more, RestFormat, Nchars, InputStack} | {error, What}</v>
-        <v>&nbsp;InputList = chars()</v>
-        <v>&nbsp;LeftOverChars = string()</v>
-        <v>&nbsp;RestFormat = string()</v>
-        <v>&nbsp;Nchars = int()</v>
-        <v>&nbsp;InputStack = chars()</v>
-        <v>&nbsp;What = term()</v>
-      </type>
       <desc>
-        <p>Tries to read <c>String</c> in accordance with the control
-          sequences in <c>Format</c>. See
+        <p>Tries to read <c><anno>String</anno></c> in accordance with the control
+          sequences in <c><anno>Format</anno></c>. See
           <seealso marker="io#fread/3">io:fread/3</seealso> for a detailed
           description of the available formatting options. It is
-          assumed that <c>String</c> contains whole lines. It returns:</p>
+          assumed that <c><anno>String</anno></c> contains whole lines. It returns:</p>
         <taglist>
-          <tag><c>{ok, InputList, LeftOverChars}</c></tag>
+          <tag><c>{ok, <anno>InputList</anno>, <anno>LeftOverChars</anno>}</c></tag>
           <item>
-            <p>The string was read. <c>InputList</c> is the list of
+            <p>The string was read. <c><anno>InputList</anno></c> is the list of
               successfully matched and read items, and
-              <c>LeftOverChars</c> are the input characters not used.</p>
+              <c><anno>LeftOverChars</anno></c> are the input characters not used.</p>
           </item>
-          <tag><c>{more, RestFormat, Nchars, InputStack}</c></tag>
+          <tag><c>{more, <anno>RestFormat</anno>, <anno>Nchars</anno>, <anno>InputStack</anno>}</c></tag>
           <item>
             <p>The string was read, but more input is needed in order
-              to complete the original format string. <c>RestFormat</c>
-              is the remaining format string, <c>NChars</c> the number
-              of characters scanned, and <c>InputStack</c> is the
+              to complete the original format string. <c><anno>RestFormat</anno></c>
+              is the remaining format string, <c><anno>Nchars</anno></c> the number
+              of characters scanned, and <c><anno>InputStack</anno></c> is the
               reversed list of inputs matched up to that point.</p>
           </item>
-          <tag><c>{error, What}</c></tag>
+          <tag><c>{error, <anno>What</anno>}</c></tag>
           <item>
-            <p>The read operation failed and the parameter <c>What</c>
+            <p>The read operation failed and the parameter <c><anno>What</anno></c>
               gives a hint about the error.</p>
           </item>
         </taglist>
@@ -165,17 +149,8 @@ chars() = [char() | chars()]</code>
       </desc>
     </func>
     <func>
-      <name>fread(Continuation, String, Format) -> Return</name>
+      <name name="fread" arity="3"/>
       <fsummary>Re-entrant formatted reader</fsummary>
-      <type>
-        <v>Continuation = see below</v>
-        <v>String = Format = string()</v>
-        <v>Return = {done, Result, LeftOverChars} | {more, Continuation}</v>
-        <v>&nbsp;Result = {ok, InputList} | eof | {error, What}</v>
-        <v>&nbsp;&nbsp;InputList = chars()</v>
-        <v>&nbsp;&nbsp;What = term()()</v>
-        <v>&nbsp;LeftOverChars = string()</v>
-      </type>
       <desc>
         <p>This is the re-entrant formatted reader. The continuation of
           the first call to the functions must be <c>[]</c>. Refer to
@@ -184,114 +159,92 @@ chars() = [char() | chars()]</code>
           re-entrant input scheme works.</p>
         <p>The function returns:</p>
         <taglist>
-          <tag><c>{done, Result, LeftOverChars}</c></tag>
+          <tag><c>{done, <anno>Result</anno>, <anno>LeftOverChars</anno>}</c></tag>
           <item>
             <p>The input is complete. The result is one of the
               following:</p>
             <taglist>
-              <tag><c>{ok, InputList}</c></tag>
+              <tag><c>{ok, <anno>InputList</anno>}</c></tag>
               <item>
-                <p>The string was read. <c>InputList</c> is the list of
+                <p>The string was read. <c><anno>InputList</anno></c> is the list of
                   successfully matched and read items, and
-                  <c>LeftOverChars</c> are the remaining characters.</p>
+                  <c><anno>LeftOverChars</anno></c> are the remaining characters.</p>
               </item>
               <tag><c>eof</c></tag>
               <item>
                 <p>End of file has been encountered.
-                  <c>LeftOverChars</c> are the input characters not
+                  <c><anno>LeftOverChars</anno></c> are the input characters not
                   used.</p>
               </item>
-              <tag><c>{error, What}</c></tag>
+              <tag><c>{error, <anno>What</anno>}</c></tag>
               <item>
-                <p>An error occurred and the parameter <c>What</c> gives
+                <p>An error occurred and the parameter <c><anno>What</anno></c> gives
                   a hint about the error.</p>
               </item>
             </taglist>
           </item>
-          <tag><c>{more, Continuation}</c></tag>
+          <tag><c>{more, <anno>Continuation</anno>}</c></tag>
           <item>
             <p>More data is required to build a term.
-              <c>Continuation</c> must be passed to <c>fread/3</c>,
+              <c><anno>Continuation</anno></c> must be passed to <c>fread/3</c>,
               when more data becomes available.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>write_atom(Atom) -> chars()</name>
+      <name name="write_atom" arity="1"/>
       <fsummary>Write an atom</fsummary>
-      <type>
-        <v>Atom = atom()</v>
-      </type>
       <desc>
         <p>Returns the list of characters needed to print the atom
-          <c>Atom</c>.</p>
+          <c><anno>Atom</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>write_string(String) -> chars()</name>
+      <name name="write_string" arity="1"/>
       <fsummary>Write a string</fsummary>
-      <type>
-        <v>String = string()</v>
-      </type>
       <desc>
-        <p>Returns the list of characters needed to print <c>String</c>
+        <p>Returns the list of characters needed to print <c><anno>String</anno></c>
           as a string.</p>
       </desc>
     </func>
     <func>
-      <name>write_char(Integer) -> chars()</name>
+      <name name="write_char" arity="1"/>
       <fsummary>Write a character</fsummary>
-      <type>
-        <v>Integer = int()</v>
-      </type>
       <desc>
         <p>Returns the list of characters needed to print a character
           constant in the ISO-latin-1 character set.</p>
       </desc>
     </func>
     <func>
-      <name>indentation(String, StartIndent) -> int()</name>
+      <name name="indentation" arity="2"/>
       <fsummary>Indentation after printing string</fsummary>
-      <type>
-        <v>String = string()</v>
-        <v>StartIndent = int()</v>
-      </type>
       <desc>
-        <p>Returns the indentation if <c>String</c> has been printed,
-          starting at <c>StartIndent</c>.</p>
+        <p>Returns the indentation if <c><anno>String</anno></c> has been printed,
+          starting at <c><anno>StartIndent</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>char_list(Term) -> bool()</name>
+      <name name="char_list" arity="1"/>
       <fsummary>Test for a list of characters</fsummary>
-      <type>
-        <v>Term = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Term</c> is a flat list of
+        <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
           characters in the ISO-latin-1 range, otherwise it returns <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>deep_char_list(Term) -> bool()</name>
+      <name name="deep_char_list" arity="1"/>
       <fsummary>Test for a deep list of characters</fsummary>
-      <type>
-        <v>Term = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Term</c> is a, possibly deep, list
+        <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a, possibly deep, list
           of characters in the ISO-latin-1 range, otherwise it returns <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>printable_list(Term) -> bool()</name>
+      <name name="printable_list" arity="1"/>
       <fsummary>Test for a list of printable ISO-latin-1 characters</fsummary>
-      <type>
-        <v>Term = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Term</c> is a flat list of
+        <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
           printable ISO-latin-1 characters, otherwise it returns <c>false</c>.</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/lib.xml b/lib/stdlib/doc/src/lib.xml
index 046add48e8..19fb827cbf 100644
--- a/lib/stdlib/doc/src/lib.xml
+++ b/lib/stdlib/doc/src/lib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -37,27 +37,23 @@
   </description>
   <funcs>
     <func>
-      <name>flush_receive() -> void()</name>
+      <name name="flush_receive" arity="0"/>
       <fsummary>Flush messages</fsummary>
       <desc>
         <p>Flushes the message buffer of the current process.</p>
       </desc>
     </func>
     <func>
-      <name>error_message(Format, Args) -> ok</name>
+      <name name="error_message" arity="2"/>
       <fsummary>Print error message</fsummary>
-      <type>
-        <v>Format = atom() | string() | binary()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
-        <p>Prints error message <c>Args</c> in accordance with
-          <c>Format</c>. Similar to <c>io:format/2</c>, see
+        <p>Prints error message <c><anno>Args</anno></c> in accordance with
+          <c><anno>Format</anno></c>. Similar to <c>io:format/2</c>, see
           <seealso marker="io#fwrite/1">io(3)</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>progname() -> atom()</name>
+      <name name="progname" arity="0"/>
       <fsummary>Return name of Erlang start script</fsummary>
       <desc>
         <p>Returns the name of the script that started the current
@@ -65,37 +61,24 @@
       </desc>
     </func>
     <func>
-      <name>nonl(String1) -> String2</name>
+      <name name="nonl" arity="1"/>
       <fsummary>Remove last newline</fsummary>
-      <type>
-        <v>String1 = String2 = string()</v>
-      </type>
       <desc>
         <p>Removes the last newline character, if any, in
-          <c>String1</c>.</p>
+          <c><anno>String1</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>send(To, Msg)</name>
+      <name name="send" arity="2"/>
       <fsummary>Send a message</fsummary>
-      <type>
-        <v>To = pid() | Name | {Name,Node}</v>
-        <v>&nbsp;Name = Node = atom()</v>
-        <v>Msg = term()</v>
-      </type>
       <desc>
         <p>This function to makes it possible to send a message using
           the <c>apply/3</c> BIF.</p>
       </desc>
     </func>
     <func>
-      <name>sendw(To, Msg)</name>
+      <name name="sendw" arity="2"/>
       <fsummary>Send a message and wait for an answer</fsummary>
-      <type>
-        <v>To = pid() | Name | {Name,Node}</v>
-        <v>&nbsp;Name = Node = atom()</v>
-        <v>Msg = term()</v>
-      </type>
       <desc>
         <p>As <c>send/2</c>, but waits for an answer. It is implemented
           as follows:</p>
diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml
index 92c4eb4f4c..6f3ed7af98 100644
--- a/lib/stdlib/doc/src/lists.xml
+++ b/lib/stdlib/doc/src/lists.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -60,58 +60,41 @@
   </description>
   <funcs>
     <func>
-      <name>all(Pred, List) -> bool()</name>
+      <name name="all" arity="2"/>
       <fsummary>Return true if all elements in the list satisfy<c>Pred</c></fsummary>
-      <type>
-        <v>Pred = fun(Elem) -> bool()</v>
-        <v>&nbsp;Elem = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Pred(Elem)</c> returns
-          <c>true</c> for all elements <c>Elem</c> in <c>List</c>,
+        <p>Returns <c>true</c> if <c><anno>Pred</anno>(<anno>Elem</anno>)</c> returns
+          <c>true</c> for all elements <c><anno>Elem</anno></c> in <c><anno>List</anno></c>,
           otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>any(Pred, List) -> bool()</name>
+      <name name="any" arity="2"/>
       <fsummary>Return true if any of the elements in the list satisfies<c>Pred</c></fsummary>
-      <type>
-        <v>Pred = fun(Elem) -> bool()</v>
-        <v>&nbsp;Elem = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Pred(Elem)</c> returns
-          <c>true</c> for at least one element <c>Elem</c> in
-          <c>List</c>.</p>
+        <p>Returns <c>true</c> if <c><anno>Pred</anno>(<anno>Elem</anno>)</c> returns
+          <c>true</c> for at least one element <c><anno>Elem</anno></c> in
+          <c><anno>List</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>append(ListOfLists) -> List1</name>
+      <name name="append" arity="1"/>
       <fsummary>Append a list of lists</fsummary>
-      <type>
-        <v>ListOfLists = [List]</v>
-        <v>List = List1 = [term()]</v>
-      </type>
       <desc>
         <p>Returns a list in which all the sub-lists of
-          <c>ListOfLists</c> have been appended. For example:</p>
+          <c><anno>ListOfLists</anno></c> have been appended. For example:</p>
         <pre>
 > <input>lists:append([[1, 2, 3], [a, b], [4, 5, 6]]).</input>
 [1,2,3,a,b,4,5,6]</pre>
       </desc>
     </func>
     <func>
-      <name>append(List1, List2) -> List3</name>
+      <name name="append" arity="2"/>
       <fsummary>Append two lists</fsummary>
-      <type>
-        <v>List1 = List2 = List3 = [term()]</v>
-      </type>
       <desc>
-        <p>Returns a new list <c>List3</c> which is made from
-          the elements of <c>List1</c> followed by the elements of
-          <c>List2</c>. For example:</p>
+        <p>Returns a new list <c><anno>List3</anno></c> which is made from
+          the elements of <c><anno>List1</anno></c> followed by the elements of
+          <c><anno>List2</anno></c>. For example:</p>
         <pre>
 > <input>lists:append("abc", "def").</input>
 "abcdef"</pre>
@@ -119,15 +102,11 @@
       </desc>
     </func>
     <func>
-      <name>concat(Things) -> string()</name>
+      <name name="concat" arity="1"/>
       <fsummary>Concatenate a list of atoms</fsummary>
-      <type>
-        <v>Things = [Thing]</v>
-        <v>&nbsp;Thing = atom() | integer() | float() | string()</v>
-      </type>
       <desc>
         <p>Concatenates the text representation of the elements
-          of <c>Things</c>. The elements of <c>Things</c> can be atoms,
+          of <c><anno>Things</anno></c>. The elements of <c><anno>Things</anno></c> can be atoms,
           integers, floats or strings.</p>
         <pre>
 > <input>lists:concat([doc, '/', file, '.', 3]).</input>
@@ -135,87 +114,59 @@
       </desc>
     </func>
     <func>
-      <name>delete(Elem, List1) -> List2</name>
+      <name name="delete" arity="2"/>
       <fsummary>Delete an element from a list</fsummary>
-      <type>
-        <v>Elem = term()</v>
-        <v>List1 = List2 = [term()]</v>
-      </type>
       <desc>
-        <p>Returns a copy of <c>List1</c> where the first element
-          matching <c>Elem</c> is deleted, if there is such an
+        <p>Returns a copy of <c><anno>List1</anno></c> where the first element
+          matching <c><anno>Elem</anno></c> is deleted, if there is such an
           element.</p>
       </desc>
     </func>
     <func>
-      <name>dropwhile(Pred, List1) -> List2</name>
+      <name name="dropwhile" arity="2"/>
       <fsummary>Drop elements from a list while a predicate is true</fsummary>
-      <type>
-        <v>Pred = fun(Elem) -> bool()</v>
-        <v>&nbsp;Elem = term()</v>
-        <v>List1 = List2 = [term()]</v>
-      </type>
       <desc>
-        <p>Drops elements <c>Elem</c> from <c>List1</c> while
-          <c>Pred(Elem)</c> returns <c>true</c> and returns
+        <p>Drops elements <c><anno>Elem</anno></c> from <c><anno>List1</anno></c> while
+          <c><anno>Pred</anno>(<anno>Elem</anno>)</c> returns <c>true</c> and returns
           the remaining list.</p>
       </desc>
     </func>
     <func>
-      <name>duplicate(N, Elem) -> List</name>
+      <name name="duplicate" arity="2"/>
       <fsummary>Make N copies of element</fsummary>
-      <type>
-        <v>N = int()</v>
-        <v>Elem = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns a list which contains N copies of the term
-          <c>Elem</c>. For example:</p>
+        <p>Returns a list which contains <c><anno>N</anno></c> copies of the term
+          <c><anno>Elem</anno></c>. For example:</p>
         <pre>
 > <input>lists:duplicate(5, xx).</input>
 [xx,xx,xx,xx,xx]</pre>
       </desc>
     </func>
     <func>
-      <name>filter(Pred, List1) -> List2</name>
+      <name name="filter" arity="2"/>
       <fsummary>Choose elements which satisfy a predicate</fsummary>
-      <type>
-        <v>Pred = fun(Elem) -> bool()</v>
-        <v>&nbsp;Elem = term()</v>
-        <v>List1 = List2 = [term()]</v>
-      </type>
       <desc>
-        <p><c>List2</c> is a list of all elements <c>Elem</c> in
-          <c>List1</c> for which <c>Pred(Elem)</c> returns
+        <p><c><anno>List2</anno></c> is a list of all elements <c><anno>Elem</anno></c> in
+          <c><anno>List1</anno></c> for which <c><anno>Pred</anno>(<anno>Elem</anno>)</c> returns
           <c>true</c>.</p>
       </desc>
     </func>
     <func>
-      <name>flatlength(DeepList) -> int()</name>
+      <name name="flatlength" arity="1"/>
       <fsummary>Length of flattened deep list</fsummary>
-      <type>
-        <v>DeepList = [term() | DeepList]</v>
-      </type>
       <desc>
-        <p>Equivalent to <c>length(flatten(DeepList))</c>, but more
+        <p>Equivalent to <c>length(flatten(<anno>DeepList</anno>))</c>, but more
           efficient.</p>
       </desc>
     </func>
     <func>
-      <name>flatmap(Fun, List1) -> List2</name>
+      <name name="flatmap" arity="2"/>
       <fsummary>Map and flatten in one pass</fsummary>
-      <type>
-        <v>Fun = fun(A) -> [B]</v>
-        <v>List1 = [A]</v>
-        <v>List2 = [B]</v>
-        <v>&nbsp;A = B = term()</v>
-      </type>
       <desc>
-        <p>Takes a function from <c>A</c>s to lists of <c>B</c>s, and a
-          list of <c>A</c>s (<c>List1</c>) and produces a list of
-          <c>B</c>s by applying the function to every element in
-          <c>List1</c> and appending the resulting lists.</p>
+        <p>Takes a function from <c><anno>A</anno></c>s to lists of <c><anno>B</anno></c>s, and a
+          list of <c><anno>A</anno></c>s (<c><anno>List1</anno></c>) and produces a list of
+          <c><anno>B</anno></c>s by applying the function to every element in
+          <c><anno>List1</anno></c> and appending the resulting lists.</p>
         <p>That is, <c>flatmap</c> behaves as if it had been defined as
           follows:</p>
         <code type="none">
@@ -228,43 +179,29 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>flatten(DeepList) -> List</name>
+      <name name="flatten" arity="1"/>
       <fsummary>Flatten a deep list</fsummary>
-      <type>
-        <v>DeepList = [term() | DeepList]</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns a flattened version of <c>DeepList</c>.</p>
+        <p>Returns a flattened version of <c><anno>DeepList</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>flatten(DeepList, Tail) -> List</name>
+      <name name="flatten" arity="2"/>
       <fsummary>Flatten a deep list</fsummary>
-      <type>
-        <v>DeepList = [term() | DeepList]</v>
-        <v>Tail = List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns a flattened version of <c>DeepList</c> with the tail
-          <c>Tail</c> appended.</p>
+        <p>Returns a flattened version of <c><anno>DeepList</anno></c> with the tail
+          <c><anno>Tail</anno></c> appended.</p>
       </desc>
     </func>
     <func>
-      <name>foldl(Fun, Acc0, List) -> Acc1</name>
+      <name name="foldl" arity="3"/>
       <fsummary>Fold a function over a list</fsummary>
-      <type>
-        <v>Fun = fun(Elem, AccIn) -> AccOut</v>
-        <v>&nbsp;Elem = term()</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Calls <c>Fun(Elem, AccIn)</c> on successive elements <c>A</c>
-          of <c>List</c>, starting with <c>AccIn == Acc0</c>.
-          <c>Fun/2</c> must return a new accumulator which is passed to
+        <p>Calls <c><anno>Fun</anno>(<anno>Elem</anno>, <anno>AccIn</anno>)</c> on successive elements <c>A</c>
+          of <c><anno>List</anno></c>, starting with <c><anno>AccIn</anno> == <anno>Acc0</anno></c>.
+          <c><anno>Fun</anno>/2</c> must return a new accumulator which is passed to
           the next call. The function returns the final value of
-          the accumulator. <c>Acc0</c> is returned if the list is empty.
+          the accumulator. <c><anno>Acc0</anno></c> is returned if the list is empty.
           For example:</p>
         <pre>
 > <input>lists:foldl(fun(X, Sum) -> X + Sum end, 0, [1,2,3,4,5]).</input>
@@ -274,14 +211,8 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>foldr(Fun, Acc0, List) -> Acc1</name>
+      <name name="foldr" arity="3"/>
       <fsummary>Fold a function over a list</fsummary>
-      <type>
-        <v>Fun = fun(Elem, AccIn) -> AccOut</v>
-        <v>&nbsp;Elem = term()</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
         <p>Like <c>foldl/3</c>, but the list is traversed from right to
           left. For example:</p>
@@ -297,33 +228,23 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>foreach(Fun, List) -> void()</name>
+      <name name="foreach" arity="2"/>
       <fsummary>Apply a function to each element of a list</fsummary>
-      <type>
-        <v>Fun = fun(Elem) -> void()</v>
-        <v>&nbsp;Elem = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Calls <c>Fun(Elem)</c> for each element <c>Elem</c> in
-          <c>List</c>. This function is used for its side effects and
+        <p>Calls <c><anno>Fun</anno>(<anno>Elem</anno>)</c> for each element <c><anno>Elem</anno></c> in
+          <c><anno>List</anno></c>. This function is used for its side effects and
           the evaluation order is defined to be the same as the order
           of the elements in the list.</p>
       </desc>
     </func>
     <func>
-      <name>keydelete(Key, N, TupleList1) -> TupleList2</name>
+      <name name="keydelete" arity="3"/>
       <fsummary>Delete an element from a list of tuples</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList1 = TupleList2 = [Tuple]</v>
-        <v>&nbsp;Tuple = tuple()</v>
-      </type>
+      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
       <desc>
-        <p>Returns a copy of <c>TupleList1</c> where the first
-          occurrence of a tuple whose <c>N</c>th element compares equal to
-          <c>Key</c> is deleted, if there is such a tuple.</p>
+        <p>Returns a copy of <c><anno>TupleList1</anno></c> where the first
+          occurrence of a tuple whose <c><anno>N</anno></c>th element compares equal to
+          <c><anno>Key</anno></c> is deleted, if there is such a tuple.</p>
       </desc>
     </func>
     <func>
@@ -343,19 +264,14 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>keymap(Fun, N, TupleList1) -> TupleList2</name>
+      <name name="keymap" arity="3"/>
       <fsummary>Map a function over a list of tuples</fsummary>
-      <type>
-        <v>Fun = fun(Term1) -> Term2</v>
-        <v>&nbsp;Term1 = Term2 = term()</v>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList1 = TupleList2 = [tuple()]</v>
-      </type>
+      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
       <desc>
         <p>Returns a list of tuples where, for each tuple in
-          <c>TupleList1</c>, the <c>N</c>th element <c>Term1</c> of the tuple
+          <c><anno>TupleList1</anno></c>, the <c><anno>N</anno></c>th element <c><anno>Term1</anno></c> of the tuple
           has been replaced with the result of calling
-          <c>Fun(Term1)</c>.</p>
+          <c><anno>Fun</anno>(<anno>Term1</anno>)</c>.</p>
         <p>Examples:</p>
         <pre>
 > <input>Fun = fun(Atom) -> atom_to_list(Atom) end.</input>
@@ -365,7 +281,7 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>keymember(Key, N, TupleList) -> bool()</name>
+      <name>keymember(Key, N, TupleList) -> boolean()</name>
       <fsummary>Test for membership of a list of tuples</fsummary>
       <type>
         <v>Key = term()</v>
@@ -380,37 +296,28 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>keymerge(N, TupleList1, TupleList2) -> TupleList3</name>
+      <name name="keymerge" arity="3"/>
       <fsummary>Merge two key-sorted lists of tuples</fsummary>
-      <type>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList1 = TupleList2 = TupleList3 = [Tuple]</v>
-        <v>&nbsp;Tuple = tuple()</v>
-      </type>
+      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
       <desc>
-        <p>Returns the sorted list formed by merging <c>TupleList1</c>
-          and <c>TupleList2</c>. The merge is performed on
-          the <c>N</c>th element of each tuple. Both <c>TupleList1</c> and
-          <c>TupleList2</c> must be key-sorted prior to evaluating this
+        <p>Returns the sorted list formed by merging <c><anno>TupleList1</anno></c>
+          and <c><anno>TupleList2</anno></c>. The merge is performed on
+          the <c><anno>N</anno></c>th element of each tuple. Both <c><anno>TupleList1</anno></c> and
+          <c><anno>TupleList2</anno></c> must be key-sorted prior to evaluating this
           function. When two tuples compare equal, the tuple from
-          <c>TupleList1</c> is picked before the tuple from
-          <c>TupleList2</c>.</p>
+          <c><anno>TupleList1</anno></c> is picked before the tuple from
+          <c><anno>TupleList2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>keyreplace(Key, N, TupleList1, NewTuple) -> TupleList2</name>
+      <name name="keyreplace" arity="4"/>
       <fsummary>Replace an element in a list of tuples</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList1 = TupleList2 = [Tuple]</v>
-        <v>NewTuple = Tuple = tuple()</v>
-      </type>
+      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
       <desc>
-        <p>Returns a copy of <c>TupleList1</c> where the first
-          occurrence of a <c>T</c> tuple whose <c>N</c>th element
-          compares equal to <c>Key</c> is replaced with
-          <c>NewTuple</c>, if there is such a tuple <c>T</c>.</p>
+        <p>Returns a copy of <c><anno>TupleList1</anno></c> where the first
+          occurrence of a <c>T</c> tuple whose <c><anno>N</anno></c>th element
+          compares equal to <c><anno>Key</anno></c> is replaced with
+          <c><anno>NewTuple</anno></c>, if there is such a tuple <c>T</c>.</p>
       </desc>
     </func>
     <func>
@@ -433,95 +340,63 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>keysort(N, TupleList1) -> TupleList2</name>
+      <name name="keysort" arity="2"/>
       <fsummary>Sort a list of tuples</fsummary>
-      <type>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList1 = TupleList2 = [Tuple]</v>
-        <v>&nbsp;Tuple = tuple()</v>
-      </type>
+      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
       <desc>
         <p>Returns a list containing the sorted elements of the list
-          <c>TupleList1</c>. Sorting is performed on the <c>N</c>th
+          <c><anno>TupleList1</anno></c>. Sorting is performed on the <c><anno>N</anno></c>th
           element of the tuples. The sort is stable.</p>
       </desc>
     </func>
     <func>
-      <name>keystore(Key, N, TupleList1, NewTuple) -> TupleList2</name>
+      <name name="keystore" arity="4"/>
       <fsummary>Store an element in a list of tuples</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList1 = TupleList2 = [Tuple]</v>
-        <v>NewTuple = Tuple = tuple()</v>
-      </type>
-      <desc>
-        <p>Returns a copy of <c>TupleList1</c> where the first
-          occurrence of a tuple <c>T</c> whose <c>N</c>th element
-          compares equal to <c>Key</c> is replaced with
-          <c>NewTuple</c>, if there is such a tuple <c>T</c>. If there
-          is no such tuple <c>T</c> a copy of <c>TupleList1</c> where
-          [<c>NewTuple</c>] has been appended to the end is
+      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
+      <desc>
+        <p>Returns a copy of <c><anno>TupleList1</anno></c> where the first
+          occurrence of a tuple <c>T</c> whose <c><anno>N</anno></c>th element
+          compares equal to <c><anno>Key</anno></c> is replaced with
+          <c><anno>NewTuple</anno></c>, if there is such a tuple <c>T</c>. If there
+          is no such tuple <c>T</c> a copy of <c><anno>TupleList1</anno></c> where
+          [<c><anno>NewTuple</anno></c>] has been appended to the end is
           returned.</p>
       </desc>
     </func>
     <func>
-      <name>keytake(Key, N, TupleList1) -> {value, Tuple, TupleList2}
-             | false</name>
+      <name name="keytake" arity="3"/>
       <fsummary>Extract an element from a list of tuples</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList1 = TupleList2 = [Tuple]</v>
-        <v>Tuple = tuple()</v>
-      </type>
+      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
       <desc>
-        <p>Searches the list of tuples <c>TupleList1</c> for a tuple
-          whose <c>N</c>th element compares equal to <c>Key</c>.
-          Returns <c>{value, Tuple, TupleList2}</c> if such a tuple is
-          found, otherwise <c>false</c>. <c>TupleList2</c> is a copy
-          of <c>TupleList1</c> where the first occurrence of
-          <c>Tuple</c> has been removed.</p>
+        <p>Searches the list of tuples <c><anno>TupleList1</anno></c> for a tuple
+          whose <c><anno>N</anno></c>th element compares equal to <c><anno>Key</anno></c>.
+          Returns <c>{value, <anno>Tuple</anno>, <anno>TupleList2</anno>}</c> if such a tuple is
+          found, otherwise <c>false</c>. <c><anno>TupleList2</anno></c> is a copy
+          of <c><anno>TupleList1</anno></c> where the first occurrence of
+          <c><anno>Tuple</anno></c> has been removed.</p>
       </desc>
     </func>
     <func>
-      <name>last(List) -> Last</name>
+      <name name="last" arity="1"/>
       <fsummary>Return last element in a list</fsummary>
-      <type>
-        <v>List = [term()], length(List) > 0</v>
-        <v>Last = term()</v>
-      </type>
       <desc>
-        <p>Returns the last element in <c>List</c>.</p>
+        <p>Returns the last element in <c><anno>List</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>map(Fun, List1) -> List2</name>
+      <name name="map" arity="2"/>
       <fsummary>Map a function over a list</fsummary>
-      <type>
-        <v>Fun = fun(A) -> B</v>
-        <v>List1 = [A]</v>
-        <v>List2 = [B]</v>
-        <v>&nbsp;A = B = term()</v>
-      </type>
       <desc>
-        <p>Takes a function from <c>A</c>s to <c>B</c>s, and a list of
-          <c>A</c>s and produces a list of <c>B</c>s by applying
+        <p>Takes a function from <c><anno>A</anno></c>s to <c><anno>B</anno></c>s, and a list of
+          <c><anno>A</anno></c>s and produces a list of <c><anno>B</anno></c>s by applying
           the function to every element in the list. This function is
           used to obtain the return values. The evaluation order is
           implementation dependent.</p>
       </desc>
     </func>
     <func>
-      <name>mapfoldl(Fun, Acc0, List1) -> {List2, Acc1}</name>
+      <name name="mapfoldl" arity="3"/>
       <fsummary>Map and fold in one pass</fsummary>
-      <type>
-        <v>Fun = fun(A, AccIn) -> {B, AccOut}</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>List1 = [A]</v>
-        <v>List2 = [B]</v>
-        <v>&nbsp;A = B = term()</v>
-      </type>
       <desc>
         <p><c>mapfoldl</c> combines the operations of <c>map/2</c> and
           <c>foldl/3</c> into one pass. An example, summing
@@ -533,35 +408,24 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>mapfoldr(Fun, Acc0, List1) -> {List2, Acc1}</name>
+      <name name="mapfoldr" arity="3"/>
       <fsummary>Map and fold in one pass</fsummary>
-      <type>
-        <v>Fun = fun(A, AccIn) -> {B, AccOut}</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>List1 = [A]</v>
-        <v>List2 = [B]</v>
-        <v>&nbsp;A = B = term()</v>
-      </type>
       <desc>
         <p><c>mapfoldr</c> combines the operations of <c>map/2</c> and
           <c>foldr/3</c> into one pass.</p>
       </desc>
     </func>
     <func>
-      <name>max(List) -> Max</name>
+      <name name="max" arity="1"/>
       <fsummary>Return maximum element of a list</fsummary>
-      <type>
-        <v>List = [term()], length(List) > 0</v>
-        <v>Max = term()</v>
-      </type>
       <desc>
-        <p>Returns the first element of <c>List</c> that compares
+        <p>Returns the first element of <c><anno>List</anno></c> that compares
           greater than or equal to all other elements of
-          <c>List</c>.</p>
+          <c><anno>List</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>member(Elem, List) -> bool()</name>
+      <name>member(Elem, List) -> boolean()</name>
       <fsummary>Test for membership of a list</fsummary>
       <type>
         <v>Elem = term()</v>
@@ -573,112 +437,84 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name>merge(ListOfLists) -> List1</name>
+      <name name="merge" arity="1"/>
       <fsummary>Merge a list of sorted lists</fsummary>
-      <type>
-        <v>ListOfLists = [List]</v>
-        <v>List = List1 = [term()]</v>
-      </type>
       <desc>
         <p>Returns the sorted list formed by merging all the sub-lists
-          of <c>ListOfLists</c>. All sub-lists must be sorted prior to
+          of <c><anno>ListOfLists</anno></c>. All sub-lists must be sorted prior to
           evaluating this function. When two elements compare equal,
           the element from the sub-list with the lowest position in
-          <c>ListOfLists</c> is picked before the other element.</p>
+          <c><anno>ListOfLists</anno></c> is picked before the other element.</p>
       </desc>
     </func>
     <func>
-      <name>merge(List1, List2) -> List3</name>
+      <name name="merge" arity="2"/>
       <fsummary>Merge two sorted lists</fsummary>
-      <type>
-        <v>List1 = List2 = List3 = [term()]</v>
-      </type>
       <desc>
-        <p>Returns the sorted list formed by merging <c>List1</c> and
-          <c>List2</c>. Both <c>List1</c> and <c>List2</c> must be
+        <p>Returns the sorted list formed by merging <c><anno>List1</anno></c> and
+          <c><anno>List2</anno></c>. Both <c><anno>List1</anno></c> and <c><anno>List2</anno></c> must be
           sorted prior to evaluating this function. When two elements
-          compare equal, the element from <c>List1</c> is picked
-          before the element from <c>List2</c>.</p>
+          compare equal, the element from <c><anno>List1</anno></c> is picked
+          before the element from <c><anno>List2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>merge(Fun, List1, List2) -> List3</name>
+      <name name="merge" arity="3"/>
       <fsummary>Merge two sorted list</fsummary>
-      <type>
-        <v>Fun = fun(A, B) -> bool()</v>
-        <v>List1 = [A]</v>
-        <v>List2 = [B]</v>
-        <v>List3 = [A | B]</v>
-        <v>&nbsp;A = B = term()</v>
-      </type>
       <desc>
-        <p>Returns the sorted list formed by merging <c>List1</c> and
-          <c>List2</c>. Both <c>List1</c> and <c>List2</c> must be
+        <p>Returns the sorted list formed by merging <c><anno>List1</anno></c> and
+          <c><anno>List2</anno></c>. Both <c><anno>List1</anno></c> and <c><anno>List2</anno></c> must be
           sorted according to the <seealso
           marker="#ordering_function">ordering function</seealso>
-          <c>Fun</c> prior to evaluating this function. <c>Fun(A,
-          B)</c> should return <c>true</c> if <c>A</c> compares less
-          than or equal to <c>B</c> in the ordering, <c>false</c>
+          <c><anno>Fun</anno></c> prior to evaluating this function. <c><anno>Fun</anno>(<anno>A</anno>,
+          <anno>B</anno>)</c> should return <c>true</c> if <c><anno>A</anno></c> compares less
+          than or equal to <c><anno>B</anno></c> in the ordering, <c>false</c>
           otherwise. When two elements compare equal, the element from
-          <c>List1</c> is picked before the element from
-          <c>List2</c>.</p>
+          <c><anno>List1</anno></c> is picked before the element from
+          <c><anno>List2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>merge3(List1, List2, List3) -> List4</name>
+      <name name="merge3" arity="3"/>
       <fsummary>Merge three sorted lists</fsummary>
-      <type>
-        <v>List1 = List2 = List3 = List4 = [term()]</v>
-      </type>
       <desc>
-        <p>Returns the sorted list formed by merging <c>List1</c>,
-          <c>List2</c> and <c>List3</c>. All of <c>List1</c>,
-          <c>List2</c> and <c>List3</c> must be sorted prior to
+        <p>Returns the sorted list formed by merging <c><anno>List1</anno></c>,
+          <c><anno>List2</anno></c> and <c><anno>List3</anno></c>. All of <c><anno>List1</anno></c>,
+          <c><anno>List2</anno></c> and <c><anno>List3</anno></c> must be sorted prior to
           evaluating this function. When two elements compare equal,
-          the element from <c>List1</c>, if there is such an element,
+          the element from <c><anno>List1</anno></c>, if there is such an element,
           is picked before the other element, otherwise the element
-          from <c>List2</c> is picked before the element from
-          <c>List3</c>.</p>
+          from <c><anno>List2</anno></c> is picked before the element from
+          <c><anno>List3</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>min(List) -> Min</name>
+      <name name="min" arity="1"/>
       <fsummary>Return minimum element of a list</fsummary>
-      <type>
-        <v>List = [term()], length(List) > 0</v>
-        <v>Min = term()</v>
-      </type>
       <desc>
-        <p>Returns the first element of <c>List</c> that compares
+        <p>Returns the first element of <c><anno>List</anno></c> that compares
           less than or equal to all other elements of
-          <c>List</c>.</p>
+          <c><anno>List</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>nth(N, List) -> Elem</name>
+      <name name="nth" arity="2"/>
       <fsummary>Return the Nth element of a list</fsummary>
-      <type>
-        <v>N = 1..length(List)</v>
-        <v>List = [term()]</v>
-        <v>Elem = term()</v>
-      </type>
+      <type_desc variable="N">1..length(List)</type_desc>
       <desc>
-        <p>Returns the <c>N</c>th element of <c>List</c>. For example:</p>
+        <p>Returns the <c><anno>N</anno></c>th element of <c><anno>List</anno></c>. For example:</p>
         <pre>
 > <input>lists:nth(3, [a, b, c, d, e]).</input>
 c</pre>
       </desc>
     </func>
     <func>
-      <name>nthtail(N, List1) -> Tail</name>
+      <name name="nthtail" arity="2"/>
       <fsummary>Return the Nth tail of a list</fsummary>
-      <type>
-        <v>N = 0..length(List1)</v>
-        <v>List1 = Tail = [term()]</v>
-      </type>
+      <type_desc variable="N">0..length(List)</type_desc>
       <desc>
-        <p>Returns the <c>N</c>th tail of <c>List</c>, that is, the sublist of
-          <c>List</c> starting at <c>N+1</c> and continuing up to
+        <p>Returns the <c><anno>N</anno></c>th tail of <c><anno>List</anno></c>, that is, the sublist of
+          <c><anno>List</anno></c> starting at <c><anno>N</anno>+1</c> and continuing up to
           the end of the list. For example:</p>
         <pre>
 > <input>lists:nthtail(3, [a, b, c, d, e]).</input>
@@ -692,18 +528,13 @@ c</pre>
       </desc>
     </func>
     <func>
-      <name>partition(Pred, List) -> {Satisfying, NonSatisfying}</name>
+      <name name="partition" arity="2"/>
       <fsummary>Partition a list into two lists based on a predicate</fsummary>
-      <type>
-        <v>Pred = fun(Elem) -> bool()</v>
-        <v>&nbsp;Elem = term()</v>
-        <v>List = Satisfying = NonSatisfying = [term()]</v>
-      </type>
       <desc>
-        <p>Partitions <c>List</c> into two lists, where the first list
-          contains all elements for which <c>Pred(Elem)</c> returns
+        <p>Partitions <c><anno>List</anno></c> into two lists, where the first list
+          contains all elements for which <c><anno>Pred</anno>(<anno>Elem</anno>)</c> returns
           <c>true</c>, and the second list contains all elements for
-          which <c>Pred(Elem)</c> returns <c>false</c>.</p>
+          which <c><anno>Pred</anno>(<anno>Elem</anno>)</c> returns <c>false</c>.</p>
         <p>Examples:</p>
         <pre>
 > <input>lists:partition(fun(A) -> A rem 2 == 1 end, [1,2,3,4,5,6,7]).</input>
@@ -715,24 +546,18 @@ c</pre>
       </desc>
     </func>
     <func>
-      <name>prefix(List1, List2) -> bool()</name>
+      <name name="prefix" arity="2"/>
       <fsummary>Test for list prefix</fsummary>
-      <type>
-        <v>List1 = List2 = [term()]</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>List1</c> is a prefix of
-          <c>List2</c>, otherwise <c>false</c>.</p>
+        <p>Returns <c>true</c> if <c><anno>List1</anno></c> is a prefix of
+          <c><anno>List2</anno></c>, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>reverse(List1) -> List2</name>
+      <name name="reverse" arity="1"/>
       <fsummary>Reverse a list</fsummary>
-      <type>
-        <v>List1 = List2 = [term()]</v>
-      </type>
       <desc>
-        <p>Returns a list with the top level elements in <c>List1</c>
+        <p>Returns a list with the elements in <c><anno>List1</anno></c>
           in reverse order.</p>
       </desc>
     </func>
@@ -743,7 +568,7 @@ c</pre>
         <v>List1 = Tail = List2 = [term()]</v>
       </type>
       <desc>
-        <p>Returns a list with the top level elements in <c>List1</c>
+        <p>Returns a list with the elements in <c>List1</c>
           in reverse order, with the tail <c>Tail</c> appended. For
           example:</p>
         <pre>
@@ -752,22 +577,18 @@ c</pre>
       </desc>
     </func>
     <func>
-      <name>seq(From, To) -> Seq</name>
-      <name>seq(From, To, Incr) -> Seq</name>
+      <name name="seq" arity="2"/>
+      <name name="seq" arity="3"/>
       <fsummary>Generate a sequence of integers</fsummary>
-      <type>
-        <v>From = To = Incr = int()</v>
-        <v>Seq = [int()]</v>
-      </type>
       <desc>
-        <p>Returns a sequence of integers which starts with <c>From</c>
-          and contains the successive results of adding <c>Incr</c> to
-          the previous element, until <c>To</c> has been reached or
-          passed (in the latter case, <c>To</c> is not an element of
-          the sequence). <c>Incr</c> defaults to 1.</p>
-        <p>Failure: If <c><![CDATA[To<From-Incr]]></c> and <c>Incr</c>
-          is positive, or if <c>To>From-Incr</c> and <c>Incr</c> is
-          negative, or if <c>Incr==0</c> and <c>From/=To</c>.</p>
+        <p>Returns a sequence of integers which starts with <c><anno>From</anno></c>
+          and contains the successive results of adding <c><anno>Incr</anno></c> to
+          the previous element, until <c><anno>To</anno></c> has been reached or
+          passed (in the latter case, <c><anno>To</anno></c> is not an element of
+          the sequence). <c><anno>Incr</anno></c> defaults to 1.</p>
+        <p>Failure: If <c><anno>To</anno>&lt;<anno>From</anno>-<anno>Incr</anno></c> and <c><anno>Incr</anno></c>
+          is positive, or if <c><anno>To</anno>><anno>From</anno>-<anno>Incr</anno></c> and <c><anno>Incr</anno></c> is
+          negative, or if <c><anno>Incr</anno>==0</c> and <c><anno>From</anno>/=<anno>To</anno></c>.</p>
         <p>The following equalities hold for all sequences:</p>
         <code type="none">
 length(lists:seq(From, To)) == To-From+1
@@ -787,57 +608,41 @@ length(lists:seq(From, To, Incr)) == (To-From+Incr) div Incr</code>
       </desc>
     </func>
     <func>
-      <name>sort(List1) -> List2</name>
+      <name name="sort" arity="1"/>
       <fsummary>Sort a list</fsummary>
-      <type>
-        <v>List1 = List2 = [term()]</v>
-      </type>
       <desc>
         <p>Returns a list containing the sorted elements of
-          <c>List1</c>.</p>
+          <c><anno>List1</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>sort(Fun, List1) -> List2</name>
+      <name name="sort" arity="2"/>
       <fsummary>Sort a list</fsummary>
-      <type>
-        <v>Fun = fun(Elem1, Elem2) -> bool()</v>
-        <v>&nbsp;Elem1 = Elem2 = term()</v>
-        <v>List1 = List2 = [term()]</v>
-      </type>
       <desc>
         <p>Returns a list containing the sorted elements of
-          <c>List1</c>, according to the <seealso
+          <c><anno>List1</anno></c>, according to the <seealso
           marker="#ordering_function">ordering function</seealso>
-          <c>Fun</c>. <c>Fun(A, B)</c> should return <c>true</c> if
-          <c>A</c> compares less than or equal to <c>B</c> in the
+          <c><anno>Fun</anno></c>. <c><anno>Fun</anno>(<anno>A</anno>, <anno>B</anno>)</c> should return <c>true</c> if
+          <c><anno>A</anno></c> compares less than or equal to <c><anno>B</anno></c> in the
           ordering, <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>split(N, List1) -> {List2, List3}</name>
+      <name name="split" arity="2"/>
       <fsummary>Split a list into two lists</fsummary>
-      <type>
-        <v>N = 0..length(List1)</v>
-        <v>List1 = List2 = List3 = [term()]</v>
-      </type>
+      <type_desc variable="N">0..length(List1)</type_desc>
       <desc>
-        <p>Splits <c>List1</c> into <c>List2</c> and <c>List3</c>.
-          <c>List2</c> contains the first <c>N</c> elements and
-          <c>List3</c> the rest of the elements (the <c>N</c>th tail).</p>
+        <p>Splits <c><anno>List1</anno></c> into <c><anno>List2</anno></c> and <c><anno>List3</anno></c>.
+          <c><anno>List2</anno></c> contains the first <c><anno>N</anno></c> elements and
+          <c><anno>List3</anno></c> the rest of the elements (the <c><anno>N</anno></c>th tail).</p>
       </desc>
     </func>
     <func>
-      <name>splitwith(Pred, List) -> {List1, List2}</name>
+      <name name="splitwith" arity="2"/>
       <fsummary>Split a list into two lists based on a predicate</fsummary>
-      <type>
-        <v>Pred = fun(Elem) -> bool()</v>
-        <v>&nbsp;Elem = term()</v>
-        <v>List = List1 = List2 = [term()]</v>
-      </type>
       <desc>
-        <p>Partitions <c>List</c> into two lists according to
-          <c>Pred</c>. <c>splitwith/2</c> behaves as if it is defined
+        <p>Partitions <c><anno>List</anno></c> into two lists according to
+          <c><anno>Pred</anno></c>. <c>splitwith/2</c> behaves as if it is defined
           as follows:</p>
         <code type="none">
 splitwith(Pred, List) ->
@@ -853,31 +658,23 @@ splitwith(Pred, List) ->
       </desc>
     </func>
     <func>
-      <name>sublist(List1, Len) -> List2</name>
+      <name name="sublist" arity="2"/>
       <fsummary>Return a sub-list of a certain length, starting at the first position</fsummary>
-      <type>
-        <v>List1 = List2 = [term()]</v>
-        <v>Len = int()</v>
-      </type>
       <desc>
-        <p>Returns the sub-list of <c>List1</c> starting at position 1
-          and with (max) <c>Len</c> elements. It is not an error for
-          <c>Len</c> to exceed the length of the list -- in that case
+        <p>Returns the sub-list of <c><anno>List1</anno></c> starting at position 1
+          and with (max) <c><anno>Len</anno></c> elements. It is not an error for
+          <c><anno>Len</anno></c> to exceed the length of the list -- in that case
           the whole list is returned.</p>
       </desc>
     </func>
     <func>
-      <name>sublist(List1, Start, Len) -> List2</name>
+      <name name="sublist" arity="3"/>
       <fsummary>Return a sub-list starting at a given position and with a given number of elements</fsummary>
-      <type>
-        <v>List1 = List2 = [term()]</v>
-        <v>Start = 1..(length(List1)+1)</v>
-        <v>Len = int()</v>
-      </type>
+      <type_desc variable="Start">1..(length(List1)+1)</type_desc>
       <desc>
-        <p>Returns the sub-list of <c>List1</c> starting at <c>Start</c>
-          and with (max) <c>Len</c> elements. It is not an error for
-          <c>Start+Len</c> to exceed the length of the list.</p>
+        <p>Returns the sub-list of <c><anno>List1</anno></c> starting at <c><anno>Start</anno></c>
+          and with (max) <c><anno>Len</anno></c> elements. It is not an error for
+          <c><anno>Start</anno>+<anno>Len</anno></c> to exceed the length of the list.</p>
         <pre>
 > <input>lists:sublist([1,2,3,4], 2, 2).</input>
 [2,3]
@@ -888,15 +685,12 @@ splitwith(Pred, List) ->
       </desc>
     </func>
     <func>
-      <name>subtract(List1, List2) -> List3</name>
+      <name name="subtract" arity="2"/>
       <fsummary>Subtract the element in one list from another list</fsummary>
-      <type>
-        <v>List1 = List2 = List3 = [term()]</v>
-      </type>
       <desc>
-        <p>Returns a new list <c>List3</c> which is a copy of
-          <c>List1</c>, subjected to the following procedure: for each
-          element in <c>List2</c>, its first occurrence in <c>List1</c>
+        <p>Returns a new list <c><anno>List3</anno></c> which is a copy of
+          <c><anno>List1</anno></c>, subjected to the following procedure: for each
+          element in <c><anno>List2</anno></c>, its first occurrence in <c><anno>List1</anno></c>
           is deleted. For example:</p>
         <pre>
 > <input>lists:subtract("123212", "212").</input>
@@ -911,151 +705,112 @@ splitwith(Pred, List) ->
       </desc>
     </func>
     <func>
-      <name>suffix(List1, List2) -> bool()</name>
+      <name name="suffix" arity="2"/>
       <fsummary>Test for list suffix</fsummary>
       <desc>
-        <p>Returns <c>true</c> if <c>List1</c> is a suffix of
-          <c>List2</c>, otherwise <c>false</c>.</p>
+        <p>Returns <c>true</c> if <c><anno>List1</anno></c> is a suffix of
+          <c><anno>List2</anno></c>, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>sum(List) -> number()</name>
+      <name name="sum" arity="1"/>
       <fsummary>Return sum of elements in a list</fsummary>
-      <type>
-        <v>List = [number()]</v>
-      </type>
       <desc>
-        <p>Returns the sum of the elements in <c>List</c>.</p>
+        <p>Returns the sum of the elements in <c><anno>List</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>takewhile(Pred, List1) -> List2</name>
+      <name name="takewhile" arity="2"/>
       <fsummary>Take elements from a list while a predicate is true</fsummary>
-      <type>
-        <v>Pred = fun(Elem) -> bool()</v>
-        <v>&nbsp;Elem = term()</v>
-        <v>List1 = List2 = [term()]</v>
-      </type>
       <desc>
-        <p>Takes elements <c>Elem</c> from <c>List1</c> while
-          <c>Pred(Elem)</c> returns <c>true</c>, that is,
+        <p>Takes elements <c><anno>Elem</anno></c> from <c><anno>List1</anno></c> while
+          <c><anno>Pred</anno>(<anno>Elem</anno>)</c> returns <c>true</c>, that is,
           the function returns the longest prefix of the list for which
           all elements satisfy the predicate.</p>
       </desc>
     </func>
     <func>
-      <name>ukeymerge(N, TupleList1, TupleList2) -> TupleList3</name>
+      <name name="ukeymerge" arity="3"/>
       <fsummary>Merge two key-sorted lists of tuples, removing duplicates</fsummary>
-      <type>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList1 = TupleList2 = TupleList3 = [Tuple]</v>
-        <v>&nbsp;Tuple = tuple()</v>
-      </type>
+      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
       <desc>
-        <p>Returns the sorted list formed by merging <c>TupleList1</c>
-          and <c>TupleList2</c>. The merge is performed on the
-          <c>N</c>th element of each tuple. Both <c>TupleList1</c> and
-          <c>TupleList2</c> must be key-sorted without duplicates
+        <p>Returns the sorted list formed by merging <c><anno>TupleList1</anno></c>
+          and <c><anno>TupleList2</anno></c>. The merge is performed on the
+          <c><anno>N</anno></c>th element of each tuple. Both <c><anno>TupleList1</anno></c> and
+          <c><anno>TupleList2</anno></c> must be key-sorted without duplicates
           prior to evaluating this function. When two tuples compare
-          equal, the tuple from <c>TupleList1</c> is picked and the
-          one from <c>TupleList2</c> deleted.</p>
+          equal, the tuple from <c><anno>TupleList1</anno></c> is picked and the
+          one from <c><anno>TupleList2</anno></c> deleted.</p>
       </desc>
     </func>
     <func>
-      <name>ukeysort(N, TupleList1) -> TupleList2</name>
+      <name name="ukeysort" arity="2"/>
       <fsummary>Sort a list of tuples, removing duplicates</fsummary>
-      <type>
-        <v>N = 1..tuple_size(Tuple)</v>
-        <v>TupleList1 = TupleList2 = [Tuple]</v>
-        <v>&nbsp;Tuple = tuple()</v>
-      </type>
+      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
       <desc>
         <p>Returns a list containing the sorted elements of the list
-          <c>TupleList1</c> where all but the first tuple of the
+          <c><anno>TupleList1</anno></c> where all but the first tuple of the
           tuples comparing equal have been deleted. Sorting is
-          performed on the <c>N</c>th element of the tuples.</p>
+          performed on the <c><anno>N</anno></c>th element of the tuples.</p>
       </desc>
     </func>
     <func>
-      <name>umerge(ListOfLists) -> List1</name>
+      <name name="umerge" arity="1"/>
       <fsummary>Merge a list of sorted lists, removing duplicates</fsummary>
-      <type>
-        <v>ListOfLists = [List]</v>
-        <v>List = List1 = [term()]</v>
-      </type>
       <desc>
         <p>Returns the sorted list formed by merging all the sub-lists
-          of <c>ListOfLists</c>. All sub-lists must be sorted and
+          of <c><anno>ListOfLists</anno></c>. All sub-lists must be sorted and
           contain no duplicates prior to evaluating this function.
           When two elements compare equal, the element from the
-          sub-list with the lowest position in <c>ListOfLists</c> is
+          sub-list with the lowest position in <c><anno>ListOfLists</anno></c> is
           picked and the other one deleted.</p>
       </desc>
     </func>
     <func>
-      <name>umerge(List1, List2) -> List3</name>
+      <name name="umerge" arity="2"/>
       <fsummary>Merge two sorted lists, removing duplicates</fsummary>
-      <type>
-        <v>List1 = List2 = List3 = [term()]</v>
-      </type>
       <desc>
-        <p>Returns the sorted list formed by merging <c>List1</c> and
-          <c>List2</c>. Both <c>List1</c> and <c>List2</c> must be
+        <p>Returns the sorted list formed by merging <c><anno>List1</anno></c> and
+          <c><anno>List2</anno></c>. Both <c><anno>List1</anno></c> and <c><anno>List2</anno></c> must be
           sorted and contain no duplicates prior to evaluating this
           function. When two elements compare equal, the element from
-          <c>List1</c> is picked and the one from <c>List2</c>
+          <c><anno>List1</anno></c> is picked and the one from <c><anno>List2</anno></c>
           deleted.</p>
       </desc>
     </func>
     <func>
-      <name>umerge(Fun, List1, List2) -> List3</name>
+      <name name="umerge" arity="3"/>
       <fsummary>Merge two sorted lists, removing duplicates</fsummary>
-      <type>
-        <v>Fun = fun(A, B) -> bool()</v>
-        <v>List1 = [A]</v>
-        <v>List2 = [B]</v>
-        <v>List3 = [A | B]</v>
-        <v>&nbsp;A = B = term()</v>
-      </type>
       <desc>
-        <p>Returns the sorted list formed by merging <c>List1</c> and
-          <c>List2</c>. Both <c>List1</c> and <c>List2</c> must be
+        <p>Returns the sorted list formed by merging <c><anno>List1</anno></c> and
+          <c><anno>List2</anno></c>. Both <c><anno>List1</anno></c> and <c><anno>List2</anno></c> must be
           sorted according to the <seealso
           marker="#ordering_function">ordering function</seealso>
           <c>Fun</c> and contain no duplicates prior to evaluating
-          this function. <c>Fun(A, B)</c> should return <c>true</c> if
-          <c>A</c> compares less than or equal to <c>B</c> in the
+          this function. <c><anno>Fun</anno>(<anno>A</anno>, <anno>B</anno>)</c> should return <c>true</c> if
+          <c><anno>A</anno></c> compares less than or equal to <c><anno>B</anno></c> in the
           ordering, <c>false</c> otherwise. When two elements compare
           equal, the element from
-          <c>List1</c> is picked and the one from <c>List2</c>
+          <c><anno>List1</anno></c> is picked and the one from <c><anno>List2</anno></c>
           deleted.</p>
       </desc>
     </func>
     <func>
-      <name>umerge3(List1, List2, List3) -> List4</name>
+      <name name="umerge3" arity="3"/>
       <fsummary>Merge three sorted lists, removing duplicates</fsummary>
-      <type>
-        <v>List1 = List2 = List3 = List4 = [term()]</v>
-      </type>
       <desc>
-        <p>Returns the sorted list formed by merging <c>List1</c>,
-          <c>List2</c> and <c>List3</c>. All of <c>List1</c>,
-          <c>List2</c> and <c>List3</c> must be sorted and contain no
+        <p>Returns the sorted list formed by merging <c><anno>List1</anno></c>,
+          <c><anno>List2</anno></c> and <c><anno>List3</anno></c>. All of <c><anno>List1</anno></c>,
+          <c><anno>List2</anno></c> and <c><anno>List3</anno></c> must be sorted and contain no
           duplicates prior to evaluating this function. When two
-          elements compare equal, the element from <c>List1</c> is
+          elements compare equal, the element from <c><anno>List1</anno></c> is
           picked if there is such an element, otherwise the element
-          from <c>List2</c> is picked, and the other one deleted.</p>
+          from <c><anno>List2</anno></c> is picked, and the other one deleted.</p>
       </desc>
     </func>
     <func>
-      <name>unzip(List1) -> {List2, List3}</name>
+      <name name="unzip" arity="1"/>
       <fsummary>Unzip a list of two-tuples into two lists</fsummary>
-      <type>
-        <v>List1 = [{X, Y}]</v>
-        <v>List2 = [X]</v>
-        <v>List3 = [Y]</v>
-        <v>&nbsp;X = Y = term()</v>
-      </type>
       <desc>
         <p>"Unzips" a list of two-tuples into two lists, where the first
           list contains the first element of each tuple, and the second
@@ -1063,15 +818,8 @@ splitwith(Pred, List) ->
       </desc>
     </func>
     <func>
-      <name>unzip3(List1) -> {List2, List3, List4}</name>
+      <name name="unzip3" arity="1"/>
       <fsummary>Unzip a list of three-tuples into three lists</fsummary>
-      <type>
-        <v>List1 = [{X, Y, Z}]</v>
-        <v>List2 = [X]</v>
-        <v>List3 = [Y]</v>
-        <v>List4 = [Z]</v>
-        <v>&nbsp;X = Y = Z = term()</v>
-      </type>
       <desc>
         <p>"Unzips" a list of three-tuples into three lists, where
           the first list contains the first element of each tuple,
@@ -1080,44 +828,30 @@ splitwith(Pred, List) ->
       </desc>
     </func>
     <func>
-      <name>usort(List1) -> List2</name>
+      <name name="usort" arity="1"/>
       <fsummary>Sort a list, removing duplicates</fsummary>
-      <type>
-        <v>List1 = List2 = [term()]</v>
-      </type>
       <desc>
         <p>Returns a list containing the sorted elements of
-          <c>List1</c> where all but the first element of the elements
+          <c><anno>List1</anno></c> where all but the first element of the elements
           comparing equal have been deleted.</p>
       </desc>
     </func>
     <func>
-      <name>usort(Fun, List1) -> List2</name>
+      <name name="usort" arity="2"/>
       <fsummary>Sort a list, removing duplicates</fsummary>
-      <type>
-        <v>Fun = fun(Elem1, Elem2) -> bool()</v>
-        <v>&nbsp;Elem1 = Elem2 = term()</v>
-        <v>List1 = List2 = [term()]</v>
-      </type>
       <desc>
         <p>Returns a list which contains the sorted elements of
-          <c>List1</c> where all but the first element of the elements
+          <c><anno>List1</anno></c> where all but the first element of the elements
           comparing equal according to the <seealso
           marker="#ordering_function">ordering function</seealso>
-          <c>Fun</c> have been deleted. <c>Fun(A, B)</c> should return
+          <c><anno>Fun</anno></c> have been deleted. <c><anno>Fun</anno>(A, B)</c> should return
           <c>true</c> if <c>A</c> compares less than or equal to
           <c>B</c> in the ordering, <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>zip(List1, List2) -> List3</name>
+      <name name="zip" arity="2"/>
       <fsummary>Zip two lists into a list of two-tuples</fsummary>
-      <type>
-        <v>List1 = [X]</v>
-        <v>List2 = [Y]</v>
-        <v>List3 = [{X, Y}]</v>
-        <v>&nbsp;X = Y = term()</v>
-      </type>
       <desc>
         <p>"Zips" two lists of equal length into one list of two-tuples,
           where the first element of each tuple is taken from the first
@@ -1126,15 +860,8 @@ splitwith(Pred, List) ->
       </desc>
     </func>
     <func>
-      <name>zip3(List1, List2, List3) -> List4</name>
+      <name name="zip3" arity="3"/>
       <fsummary>Zip three lists into a list of three-tuples</fsummary>
-      <type>
-        <v>List1 = [X]</v>
-        <v>List2 = [Y]</v>
-        <v>List3 = [Z]</v>
-        <v>List3 = [{X, Y, Z}]</v>
-        <v>&nbsp;X = Y = Z = term()</v>
-      </type>
       <desc>
         <p>"Zips" three lists of equal length into one list of
           three-tuples, where the first element of each tuple is taken
@@ -1145,20 +872,13 @@ splitwith(Pred, List) ->
       </desc>
     </func>
     <func>
-      <name>zipwith(Combine, List1, List2) -> List3</name>
+      <name name="zipwith" arity="3"/>
       <fsummary>Zip two lists into one list according to a fun</fsummary>
-      <type>
-        <v>Combine = fun(X, Y) -> T</v>
-        <v>List1 = [X]</v>
-        <v>List2 = [Y]</v>
-        <v>List3 = [T]</v>
-        <v>&nbsp;X = Y = T = term()</v>
-      </type>
       <desc>
         <p>Combine the elements of two lists of equal length into one
-          list. For each pair <c>X, Y</c> of list elements from the two
+          list. For each pair <c><anno>X</anno>, <anno>Y</anno></c> of list elements from the two
           lists, the element in the result list will be
-          <c>Combine(X, Y)</c>.</p>
+          <c><anno>Combine</anno>(<anno>X</anno>, <anno>Y</anno>)</c>.</p>
         <p><c>zipwith(fun(X, Y) -> {X,Y} end, List1, List2)</c> is
           equivalent to <c>zip(List1, List2)</c>.</p>
         <p>Example:</p>
@@ -1168,21 +888,13 @@ splitwith(Pred, List) ->
       </desc>
     </func>
     <func>
-      <name>zipwith3(Combine, List1, List2, List3) -> List4</name>
+      <name name="zipwith3" arity="4"/>
       <fsummary>Zip three lists into one list according to a fun</fsummary>
-      <type>
-        <v>Combine = fun(X, Y, Z) -> T</v>
-        <v>List1 = [X]</v>
-        <v>List2 = [Y]</v>
-        <v>List3 = [Z]</v>
-        <v>List4 = [T]</v>
-        <v>&nbsp;X = Y = Z = T = term()</v>
-      </type>
       <desc>
         <p>Combine the elements of three lists of equal length into one
-          list. For each triple <c>X, Y, Z</c> of list elements from
+          list. For each triple <c><anno>X</anno>, <anno>Y</anno>, <anno>Z</anno></c> of list elements from
           the three lists, the element in the result list will be
-          <c>Combine(X, Y, Z)</c>.</p>
+          <c><anno>Combine</anno>(<anno>X</anno>, <anno>Y</anno>, <anno>Z</anno>)</c>.</p>
         <p><c>zipwith3(fun(X, Y, Z) -> {X,Y,Z} end, List1, List2, List3)</c> is equivalent to <c>zip3(List1, List2, List3)</c>.</p>
         <p>Examples:</p>
         <pre>
diff --git a/lib/stdlib/doc/src/log_mf_h.xml b/lib/stdlib/doc/src/log_mf_h.xml
index f8e11339a7..f2b09b58eb 100644
--- a/lib/stdlib/doc/src/log_mf_h.xml
+++ b/lib/stdlib/doc/src/log_mf_h.xml
@@ -43,28 +43,27 @@
       report files <c>1, 2, ....</c>.
       </p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="args"/>
+      <desc><p>Term to be sent to <seealso marker="gen_event#add_handler/3">
+        gen_event:add_handler/3</seealso>.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>init(Dir, MaxBytes, MaxFiles)</name>
-      <name>init(Dir, MaxBytes, MaxFiles, Pred) -> Args</name>
+      <name name="init" arity="3"/>
+      <name name="init" arity="4"/>
       <fsummary>Initiate the event handler</fsummary>
-      <type>
-        <v>Dir = string()</v>
-        <v>MaxBytes = integer()</v>
-        <v>MaxFiles = 0 &lt; integer() &lt; 256</v>
-        <v>Pred = fun(Event) -> boolean()</v>
-        <v>Event = term()</v>
-        <v>Args = args()</v>
-      </type>
       <desc>
         <p>Initiates the event handler. This function returns
-          <c>Args</c>, which should be used in a call to
-          <c>gen_event:add_handler(EventMgr, log_mf_h, Args)</c>.
+          <c><anno>Args</anno></c>, which should be used in a call to
+          <c>gen_event:add_handler(EventMgr, log_mf_h, <anno>Args</anno>)</c>.
           </p>
-        <p><c>Dir</c> specifies which directory to use for the log
-          files. <c>MaxBytes</c> specifies the size of each individual
-          file. <c>MaxFiles</c> specifies how many files are
-          used. <c>Pred</c> is a predicate function used to filter the
+        <p><c><anno>Dir</anno></c> specifies which directory to use for the log
+          files. <c><anno>MaxBytes</anno></c> specifies the size of each individual
+          file. <c><anno>MaxFiles</anno></c> specifies how many files are
+          used. <c><anno>Pred</anno></c> is a predicate function used to filter the
           events. If no predicate function is specified, all events are
           logged.</p>
       </desc>
diff --git a/lib/stdlib/doc/src/math.xml b/lib/stdlib/doc/src/math.xml
index 02e4d6e495..518457d5d8 100644
--- a/lib/stdlib/doc/src/math.xml
+++ b/lib/stdlib/doc/src/math.xml
@@ -45,7 +45,7 @@
   </description>
   <funcs>
     <func>
-      <name>pi() -> float()</name>
+      <name name="pi" arity="0"/>
       <fsummary>A useful number</fsummary>
       <desc>
         <p>A useful number.</p>
diff --git a/lib/stdlib/doc/src/ms_transform.xml b/lib/stdlib/doc/src/ms_transform.xml
index ba9f89685b..f81f8bda96 100644
--- a/lib/stdlib/doc/src/ms_transform.xml
+++ b/lib/stdlib/doc/src/ms_transform.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -599,12 +599,9 @@ ets:select(Table, [{{'$1',test,'$2'},[],['$_']}]).</code>
   </description>
   <funcs>
     <func>
-      <name>parse_transform(Forms,_Options) -> Forms</name>
+      <name name="parse_transform" arity="2"/>
       <fsummary>Transforms Erlang abstract format containing calls to ets/dbg:fun2ms into literal match specifications.</fsummary>
-      <type>
-        <v>Forms = Erlang abstract code format, see the erl_parse module description </v>
-        <v>_Options = Option list, required but not used</v>
-      </type>
+      <type_desc variable="Options">Option list, required but not used.</type_desc>
       <desc>
         <p>Implements the actual transformation at compile time. This
           function is called by the compiler to do the source code
@@ -617,29 +614,21 @@ ets:select(Table, [{{'$1',test,'$2'},[],['$_']}]).</code>
       </desc>
     </func>
     <func>
-      <name>transform_from_shell(Dialect,Clauses,BoundEnvironment) -> term()</name>
+      <name name="transform_from_shell" arity="3"/>
       <fsummary>Used when transforming fun's created in the shell into match_specifications.</fsummary>
-      <type>
-        <v>Dialect = ets | dbg</v>
-        <v>Clauses = Erlang abstract form for a single fun</v>
-        <v>BoundEnvironment = [{atom(), term()}, ...], list of variable bindings in the shell environment</v>
-      </type>
+      <type_desc variable="BoundEnvironment">List of variable bindings in the shell environment.</type_desc>
       <desc>
         <p>Implements the actual transformation when the <c>fun2ms</c>
           functions are called from the shell. In this case the abstract
           form is for one single fun (parsed by the Erlang shell), and
           all imported variables should be in the key-value list passed
-          as <c>BoundEnvironment</c>. The result is a term, normalized,
+          as <c><anno>BoundEnvironment</anno></c>. The result is a term, normalized,
           i.e. not in abstract format.</p>
       </desc>
     </func>
     <func>
-      <name>format_error(Errcode) -> ErrMessage</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Error formatting function as required by the parse_transform interface.</fsummary>
-      <type>
-        <v>Errcode = term()</v>
-        <v>ErrMessage = string()</v>
-      </type>
       <desc>
         <p>Takes an error code returned by one of the other functions
           in the module and creates a textual description of the
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 8cd499f960..c2676b1de5 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/orddict.xml b/lib/stdlib/doc/src/orddict.xml
index 1b8b74534b..319083d35b 100644
--- a/lib/stdlib/doc/src/orddict.xml
+++ b/lib/stdlib/doc/src/orddict.xml
@@ -46,176 +46,123 @@
       (<c>==</c>).</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-ordered_dictionary()
-  as returned by new/0</code>
-  </section>
+  <datatypes>
+    <datatype>
+      <name name="orddict"/>
+      <desc><p>As returned by new/0.</p></desc>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
-      <name>append(Key, Value, Orddict1) -> Orddict2</name>
+      <name name="append" arity="3"/>
       <fsummary>Append a value to keys in a dictionary</fsummary>
-      <type>
-        <v>Key = Value = term()</v>
-        <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p>This function appends a new <c>Value</c> to the current list
-          of values associated with <c>Key</c>.  An exception is
-          generated if the initial value associated with <c>Key</c> is
+        <p>This function appends a new <c><anno>Value</anno></c> to the current list
+          of values associated with <c><anno>Key</anno></c>.  An exception is
+          generated if the initial value associated with <c><anno>Key</anno></c> is
           not a list of values.</p>
       </desc>
     </func>
     <func>
-      <name>append_list(Key, ValList, Orddict1) -> Orddict2</name>
+      <name name="append_list" arity="3"/>
       <fsummary>Append new values to keys in a dictionary</fsummary>
-      <type>
-        <v>ValList = [Value]</v>
-        <v>Key = Value = term()</v>
-        <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p>This function appends a list of values <c>ValList</c> to
-          the current list of values associated with <c>Key</c>. An
+        <p>This function appends a list of values <c><anno>ValList</anno></c> to
+          the current list of values associated with <c><anno>Key</anno></c>. An
           exception is generated if the initial value associated with
-          <c>Key</c> is not a list of values.</p>
+          <c><anno>Key</anno></c> is not a list of values.</p>
       </desc>
     </func>
     <func>
-      <name>erase(Key, Orddict1) -> Orddict2</name>
+      <name name="erase" arity="2"/>
       <fsummary>Erase a key from a dictionary</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
-      </type>
       <desc>
         <p>This function erases all items with a given key from a
           dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>fetch(Key, Orddict) -> Value</name>
+      <name name="fetch" arity="2"/>
       <fsummary>Look-up values in a dictionary</fsummary>
-      <type>
-        <v>Key = Value = term()</v>
-        <v>Orddict = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p>This function returns the value associated with <c>Key</c>
-          in the dictionary <c>Orddict</c>. <c>fetch</c> assumes that
-          the <c>Key</c> is present in the dictionary and an exception
-          is generated if <c>Key</c> is not in the dictionary.</p>
+        <p>This function returns the value associated with <c><anno>Key</anno></c>
+          in the dictionary <c><anno>Orddict</anno></c>. <c>fetch</c> assumes that
+          the <c><anno>Key</anno></c> is present in the dictionary and an exception
+          is generated if <c><anno>Key</anno></c> is not in the dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>fetch_keys(Orddict) -> Keys</name>
+      <name name="fetch_keys" arity="1"/>
       <fsummary>Return all keys in a dictionary</fsummary>
-      <type>
-        <v>Orddict = ordered_dictionary()</v>
-        <v>Keys = [term()]</v>
-      </type>
       <desc>
         <p>This function returns a list of all keys in the dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>filter(Pred, Orddict1) -> Orddict2</name>
+      <name name="filter" arity="2"/>
       <fsummary>Choose elements which satisfy a predicate</fsummary>
-      <type>
-        <v>Pred = fun(Key, Value) -> bool()</v>
-        <v>&nbsp;Key = Value = term()</v>
-        <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p><c>Orddict2</c> is a dictionary of all keys and values in
-          <c>Orddict1</c> for which <c>Pred(Key, Value)</c> is <c>true</c>.</p>
+        <p><c><anno>Orddict2</anno></c> is a dictionary of all keys and values in
+          <c><anno>Orddict1</anno></c> for which <c><anno>Pred</anno>(<anno>Key</anno>, <anno>Value</anno>)</c> is <c>true</c>.</p>
       </desc>
     </func>
     <func>
-      <name>find(Key, Orddict) -> {ok, Value} | error</name>
+      <name name="find" arity="2"/>
       <fsummary>Search for a key in a dictionary</fsummary>
-      <type>
-        <v>Key = Value = term()</v>
-        <v>Orddict = ordered_dictionary()</v>
-      </type>
       <desc>
         <p>This function searches for a key in a dictionary. Returns
-          <c>{ok, Value}</c> where <c>Value</c> is the value associated
-          with <c>Key</c>, or <c>error</c> if the key is not present in
+          <c>{ok, <anno>Value</anno>}</c> where <c><anno>Value</anno></c> is the value associated
+          with <c><anno>Key</anno></c>, or <c>error</c> if the key is not present in
           the dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>fold(Fun, Acc0, Orddict) -> Acc1</name>
+      <name name="fold" arity="3"/>
       <fsummary>Fold a function over a dictionary</fsummary>
-      <type>
-        <v>Fun = fun(Key, Value, AccIn) -> AccOut</v>
-        <v>Key = Value = term()</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>Orddict = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p>Calls <c>Fun</c> on successive keys and values of
-          <c>Orddict</c> together with an extra argument <c>Acc</c>
-          (short for accumulator). <c>Fun</c> must return a new
-          accumulator which is passed to the next call. <c>Acc0</c> is
+        <p>Calls <c><anno>Fun</anno></c> on successive keys and values of
+          <c><anno>Orddict</anno></c> together with an extra argument <c>Acc</c>
+          (short for accumulator). <c><anno>Fun</anno></c> must return a new
+          accumulator which is passed to the next call. <c><anno>Acc0</anno></c> is
           returned if the list is empty. The evaluation order is
           undefined.</p>
       </desc>
     </func>
     <func>
-      <name>from_list(List) -> Orddict</name>
+      <name name="from_list" arity="1"/>
       <fsummary>Convert a list of pairs to a dictionary</fsummary>
-      <type>
-        <v>List = [{Key, Value}]</v>
-        <v>Orddict = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p>This function converts the <c>Key</c> - <c>Value</c> list
-          <c>List</c> to a dictionary.</p>
+        <p>This function converts the <c><anno>Key</anno></c> - <c><anno>Value</anno></c> list
+          <c><anno>List</anno></c> to a dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>is_key(Key, Orddict) -> bool()</name>
+      <name name="is_key" arity="2"/>
       <fsummary>Test if a key is in a dictionary</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Orddict = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p>This function tests if <c>Key</c> is contained in
-          the dictionary <c>Orddict</c>.</p>
+        <p>This function tests if <c><anno>Key</anno></c> is contained in
+          the dictionary <c><anno>Orddict</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>map(Fun, Orddict1) -> Orddict2</name>
+      <name name="map" arity="2"/>
       <fsummary>Map a function over a dictionary</fsummary>
-      <type>
-        <v>Fun = fun(Key, Value1) -> Value2</v>
-        <v>&nbsp;Key = Value1 = Value2 = term()</v>
-        <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p><c>map</c> calls <c>Func</c> on successive keys and values
-          of <c>Orddict</c> to return a new value for each key.
+        <p><c>map</c> calls <c><anno>Fun</anno></c> on successive keys and values
+          of <c><anno>Orddict1</anno></c> to return a new value for each key.
           The evaluation order is undefined.</p>
       </desc>
     </func>
     <func>
-      <name>merge(Fun, Orddict1, Orddict2) -> Orddict3</name>
+      <name name="merge" arity="3"/>
       <fsummary>Merge two dictionaries</fsummary>
-      <type>
-        <v>Fun = fun(Key, Value1, Value2) -> Value</v>
-        <v>&nbsp;Key = Value1 = Value2 = Value3 = term()</v>
-        <v>Orddict1 = Orddict2 = Orddict3 = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p><c>merge</c> merges two dictionaries, <c>Orddict1</c> and
-          <c>Orddict2</c>, to create a new dictionary.  All the <c>Key</c>
-          - <c>Value</c> pairs from both dictionaries are included in
+        <p><c>merge</c> merges two dictionaries, <c><anno>Orddict1</anno></c> and
+          <c><anno>Orddict2</anno></c>, to create a new dictionary.  All the <c><anno>Key</anno></c>
+          - <c><anno>Value</anno></c> pairs from both dictionaries are included in
           the new dictionary.  If a key occurs in both dictionaries then
-          <c>Fun</c> is called with the key and both values to return a
+          <c><anno>Fun</anno></c> is called with the key and both values to return a
           new value. <c>merge</c> could be defined as:</p>
         <code type="none">
 merge(Fun, D1, D2) ->
@@ -226,75 +173,52 @@ merge(Fun, D1, D2) ->
       </desc>
     </func>
     <func>
-      <name>new() -> ordered_dictionary()</name>
+      <name name="new" arity="0"/>
       <fsummary>Create a dictionary</fsummary>
       <desc>
         <p>This function creates a new dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>size(Orddict) -> int()</name>
+      <name name="size" arity="1"/>
       <fsummary>Return the number of elements in an ordered dictionary</fsummary>
-      <type>
-        <v>Orddict = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p>Returns the number of elements in an <c>Orddict</c>.</p>
+        <p>Returns the number of elements in an <c><anno>Orddict</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>store(Key, Value, Orddict1) -> Orddict2</name>
+      <name name="store" arity="3"/>
       <fsummary>Store a value in a dictionary</fsummary>
-      <type>
-        <v>Key = Value = term()</v>
-        <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p>This function stores a <c>Key</c> - <c>Value</c> pair in a
-          dictionary. If the <c>Key</c> already exists in <c>Orddict1</c>,
-          the associated value is replaced by <c>Value</c>.</p>
+        <p>This function stores a <c><anno>Key</anno></c> - <c><anno>Value</anno></c> pair in a
+          dictionary. If the <c><anno>Key</anno></c> already exists in <c><anno>Orddict1</anno></c>,
+          the associated value is replaced by <c><anno>Value</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>to_list(Orddict) -> List</name>
+      <name name="to_list" arity="1"/>
       <fsummary>Convert a dictionary to a list of pairs</fsummary>
-      <type>
-        <v>Orddict = ordered_dictionary()</v>
-        <v>List = [{Key, Value}]</v>
-      </type>
       <desc>
         <p>This function converts the dictionary to a list
           representation.</p>
       </desc>
     </func>
     <func>
-      <name>update(Key, Fun, Orddict1) -> Orddict2</name>
+      <name name="update" arity="3"/>
       <fsummary>Update a value in a dictionary</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Fun = fun(Value1) -> Value2</v>
-        <v>&nbsp;Value1 = Value2 = term()</v>
-        <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p>Update a value in a dictionary by calling <c>Fun</c> on
+        <p>Update a value in a dictionary by calling <c><anno>Fun</anno></c> on
           the value to get a new value.  An exception is generated if
-          <c>Key</c> is not present in the dictionary.</p>
+          <c><anno>Key</anno></c> is not present in the dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>update(Key, Fun, Initial, Orddict1) -> Orddict2</name>
+      <name name="update" arity="4"/>
       <fsummary>Update a value in a dictionary</fsummary>
-      <type>
-        <v>Key = Initial = term()</v>
-        <v>Fun = fun(Value1) -> Value2</v>
-        <v>&nbsp;Value1 = Value2 = term()</v>
-        <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p>Update a value in a dictionary by calling <c>Fun</c> on
-          the value to get a new value.  If <c>Key</c> is not present
-          in the dictionary then <c>Initial</c> will be stored as
+        <p>Update a value in a dictionary by calling <c><anno>Fun</anno></c> on
+          the value to get a new value.  If <c><anno>Key</anno></c> is not present
+          in the dictionary then <c><anno>Initial</anno></c> will be stored as
           the first value. For example <c>append/3</c> could be defined
           as:</p>
         <code type="none">
@@ -303,17 +227,12 @@ append(Key, Val, D) ->
       </desc>
     </func>
     <func>
-      <name>update_counter(Key, Increment, Orddict1) -> Orddict2</name>
+      <name name="update_counter" arity="3"/>
       <fsummary>Increment a value in a dictionary</fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Increment = number()</v>
-        <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
-      </type>
       <desc>
-        <p>Add <c>Increment</c> to the value associated with <c>Key</c>
-          and store this value.  If <c>Key</c> is not present in
-          the dictionary then <c>Increment</c> will be stored as
+        <p>Add <c><anno>Increment</anno></c> to the value associated with <c><anno>Key</anno></c>
+          and store this value.  If <c><anno>Key</anno></c> is not present in
+          the dictionary then <c><anno>Increment</anno></c> will be stored as
           the first value.</p>
         <p>This could be defined as:</p>
         <code type="none">
diff --git a/lib/stdlib/doc/src/ordsets.xml b/lib/stdlib/doc/src/ordsets.xml
index a20ab2d879..1e26fc2022 100644
--- a/lib/stdlib/doc/src/ordsets.xml
+++ b/lib/stdlib/doc/src/ordsets.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -45,202 +45,141 @@
       different if and only if they do not compare equal (<c>==</c>).</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-ordered_set()
-  as returned by new/0</code>
-  </section>
+  <datatypes>
+    <datatype>
+      <name name="ordset" n_vars="1"/>
+      <desc><p>As returned by new/0.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>new() -> Ordset</name>
+      <name name="new" arity="0"/>
       <fsummary>Return an empty set</fsummary>
-      <type>
-        <v>Ordset = ordered_set()</v>
-      </type>
       <desc>
         <p>Returns a new empty ordered set.</p>
       </desc>
     </func>
     <func>
-      <name>is_set(Ordset) -> bool()</name>
+      <name name="is_set" arity="1"/>
       <fsummary>Test for an <c>Ordset</c></fsummary>
-      <type>
-        <v>Ordset = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Ordset</c> is an ordered set of
+        <p>Returns <c>true</c> if <c><anno>Ordset</anno></c> is an ordered set of
           elements, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>size(Ordset) -> int()</name>
+      <name name="size" arity="1"/>
       <fsummary>Return the number of elements in a set</fsummary>
-      <type>
-        <v>Ordset = term()</v>
-      </type>
       <desc>
-        <p>Returns the number of elements in <c>Ordset</c>.</p>
+        <p>Returns the number of elements in <c><anno>Ordset</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>to_list(Ordset) -> List</name>
+      <name name="to_list" arity="1"/>
       <fsummary>Convert an <c>Ordset</c>into a list</fsummary>
-      <type>
-        <v>Ordset = ordered_set()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns the elements of <c>Ordset</c> as a list.</p>
+        <p>Returns the elements of <c><anno>Ordset</anno></c> as a list.</p>
       </desc>
     </func>
     <func>
-      <name>from_list(List) -> Ordset</name>
+      <name name="from_list" arity="1"/>
       <fsummary>Convert a list into an <c>Ordset</c></fsummary>
-      <type>
-        <v>List = [term()]</v>
-        <v>Ordset = ordered_set()</v>
-      </type>
       <desc>
-        <p>Returns an ordered set of the elements in <c>List</c>.</p>
+        <p>Returns an ordered set of the elements in <c><anno>List</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>is_element(Element, Ordset) -> bool()</name>
+      <name name="is_element" arity="2"/>
       <fsummary>Test for membership of an <c>Ordset</c></fsummary>
-      <type>
-        <v>Element = term()</v>
-        <v>Ordset = ordered_set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Element</c> is an element of
-          <c>Ordset</c>, otherwise <c>false</c>.</p>
+        <p>Returns <c>true</c> if <c><anno>Element</anno></c> is an element of
+          <c><anno>Ordset</anno></c>, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>add_element(Element, Ordset1) -> Ordset2</name>
+      <name name="add_element" arity="2"/>
       <fsummary>Add an element to an <c>Ordset</c></fsummary>
-      <type>
-        <v>Element = term()</v>
-        <v>Ordset1 = Ordset2 = ordered_set()</v>
-      </type>
       <desc>
-        <p>Returns a new ordered set formed from <c>Ordset1</c> with
-          <c>Element</c> inserted.</p>
+        <p>Returns a new ordered set formed from <c><anno>Ordset1</anno></c> with
+          <c><anno>Element</anno></c> inserted.</p>
       </desc>
     </func>
     <func>
-      <name>del_element(Element, Ordset1) -> Ordset2</name>
+      <name name="del_element" arity="2"/>
       <fsummary>Remove an element from an <c>Ordset</c></fsummary>
-      <type>
-        <v>Element = term()</v>
-        <v>Ordset1 = Ordset2 = ordered_set()</v>
-      </type>
       <desc>
-        <p>Returns <c>Ordset1</c>, but with <c>Element</c> removed.</p>
+        <p>Returns <c><anno>Ordset1</anno></c>, but with <c><anno>Element</anno></c> removed.</p>
       </desc>
     </func>
     <func>
-      <name>union(Ordset1, Ordset2) -> Ordset3</name>
+      <name name="union" arity="2"/>
       <fsummary>Return the union of two <c>Ordsets</c></fsummary>
-      <type>
-        <v>Ordset1 = Ordset2 = Ordset3 = ordered_set()</v>
-      </type>
       <desc>
-        <p>Returns the merged (union) set of <c>Ordset1</c> and
-          <c>Ordset2</c>.</p>
+        <p>Returns the merged (union) set of <c><anno>Ordset1</anno></c> and
+          <c><anno>Ordset2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>union(OrdsetList) -> Ordset</name>
+      <name name="union" arity="1"/>
       <fsummary>Return the union of a list of <c>Ordsets</c></fsummary>
-      <type>
-        <v>OrdsetList = [ordered_set()]</v>
-        <v>Ordset = ordered_set()</v>
-      </type>
       <desc>
         <p>Returns the merged (union) set of the list of sets.</p>
       </desc>
     </func>
     <func>
-      <name>intersection(Ordset1, Ordset2) -> Ordset3</name>
+      <name name="intersection" arity="2"/>
       <fsummary>Return the intersection of two <c>Ordsets</c></fsummary>
-      <type>
-        <v>Ordset1 = Ordset2 = Ordset3 = ordered_set()</v>
-      </type>
       <desc>
-        <p>Returns the intersection of <c>Ordset1</c> and
-          <c>Ordset2</c>.</p>
+        <p>Returns the intersection of <c><anno>Ordset1</anno></c> and
+          <c><anno>Ordset2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>intersection(OrdsetList) -> Ordset</name>
+      <name name="intersection" arity="1"/>
       <fsummary>Return the intersection of a list of <c>Ordsets</c></fsummary>
-      <type>
-        <v>OrdsetList = [ordered_set()]</v>
-        <v>Ordset = ordered_set()</v>
-      </type>
       <desc>
         <p>Returns the intersection of the non-empty list of sets.</p>
       </desc>
     </func>
     <func>
-      <name>is_disjoint(Ordset1, Ordset2) -> bool()</name>
+      <name name="is_disjoint" arity="2"/>
       <fsummary>Check whether two <c>Ordsets</c> are disjoint</fsummary>
-      <type>
-        <v>Ordset1 = Ordset2 = ordered_set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Ordset1</c> and
-          <c>Ordset2</c> are disjoint (have no elements in common),
+        <p>Returns <c>true</c> if <c><anno>Ordset1</anno></c> and
+          <c><anno>Ordset2</anno></c> are disjoint (have no elements in common),
 	  and <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>subtract(Ordset1, Ordset2) -> Ordset3</name>
+      <name name="subtract" arity="2"/>
       <fsummary>Return the difference of two <c>Ordsets</c></fsummary>
-      <type>
-        <v>Ordset1 = Ordset2 = Ordset3 = ordered_set()</v>
-      </type>
       <desc>
-        <p>Returns only the elements of <c>Ordset1</c> which are not
-          also elements of <c>Ordset2</c>.</p>
+        <p>Returns only the elements of <c><anno>Ordset1</anno></c> which are not
+          also elements of <c><anno>Ordset2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>is_subset(Ordset1, Ordset2) -> bool()</name>
+      <name name="is_subset" arity="2"/>
       <fsummary>Test for subset</fsummary>
-      <type>
-        <v>Ordset1 = Ordset2 = ordered_set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> when every element of <c>Ordset</c>1 is
-          also a member of <c>Ordset2</c>, otherwise <c>false</c>.</p>
+        <p>Returns <c>true</c> when every element of <c><anno>Ordset1</anno></c> is
+          also a member of <c><anno>Ordset2</anno></c>, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>fold(Function, Acc0, Ordset) -> Acc1</name>
+      <name name="fold" arity="3"/>
       <fsummary>Fold over set elements</fsummary>
-      <type>
-        <v>Function = fun (E, AccIn) -> AccOut</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>Ordset = ordered_set()</v>
-      </type>
       <desc>
-        <p>Fold <c>Function</c> over every element in <c>Ordset</c>
+        <p>Fold <c><anno>Function</anno></c> over every element in <c><anno>Ordset</anno></c>
           returning the final value of the accumulator.</p>
       </desc>
     </func>
     <func>
-      <name>filter(Pred, Ordset1) -> Set2</name>
+      <name name="filter" arity="2"/>
       <fsummary>Filter set elements</fsummary>
-      <type>
-        <v>Pred = fun (E) -> bool()</v>
-        <v>Set1 = Set2 = ordered_set()</v>
-      </type>
       <desc>
-        <p>Filter elements in <c>Set1</c> with boolean function
-          <c>Fun</c>.</p>
+        <p>Filter elements in <c><anno>Ordset1</anno></c> with boolean function
+          <c><anno>Pred</anno></c>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/pg.xml b/lib/stdlib/doc/src/pg.xml
index b174d4f7d4..c56db8c6e6 100644
--- a/lib/stdlib/doc/src/pg.xml
+++ b/lib/stdlib/doc/src/pg.xml
@@ -51,77 +51,56 @@
   </description>
   <funcs>
     <func>
-      <name>create(PgName) -> ok | {error, Reason}</name>
+      <name name="create" arity="1"/>
       <fsummary>Create an empty group</fsummary>
-      <type>
-        <v>PgName = term()</v>
-        <v>Reason = already_created | term()</v>
-      </type>
       <desc>
-        <p>Creates an empty group named <c>PgName</c> on the current
+        <p>Creates an empty group named <c><anno>PgName</anno></c> on the current
           node.</p>
       </desc>
     </func>
     <func>
-      <name>create(PgName, Node) -> ok | {error, Reason}</name>
+      <name name="create" arity="2"/>
       <fsummary>Create an empty group on another node</fsummary>
-      <type>
-        <v>PgName = term()</v>
-        <v>Node = node()</v>
-        <v>Reason = already_created | term()</v>
-      </type>
       <desc>
-        <p>Creates an empty group named <c>PgName</c> on the node
-          <c>Node</c>.</p>
+        <p>Creates an empty group named <c><anno>PgName</anno></c> on the node
+          <c><anno>Node</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>join(PgName, Pid) -> Members</name>
+      <name name="join" arity="2"/>
       <fsummary>Join a pid to a process group</fsummary>
-      <type>
-        <v>PgName = term()</v>
-        <v>Pid = pid()</v>
-        <v>Members = [pid()]</v>
-      </type>
       <desc>
-        <p>Joins the pid <c>Pid</c> to the process group <c>PgName</c>.
+        <p>Joins the pid <c><anno>Pid</anno></c> to the process group
+          <c><anno>PgName</anno></c>.
           Returns a list of all old members of the group.</p>
       </desc>
     </func>
     <func>
-      <name>send(PgName, Msg) -> void()</name>
+      <name name="send" arity="2"/>
       <fsummary>Send a message to all members of a process group</fsummary>
-      <type>
-        <v>PgName = Msg = term()</v>
-      </type>
       <desc>
         <p>Sends the tuple <c>{pg_message, From, PgName, Msg}</c> to
-          all members of the process group <c>PgName</c>.</p>
-        <p>Failure: <c>{badarg, {PgName, Msg}}</c> if <c>PgName</c> is
+          all members of the process group <c><anno>PgName</anno></c>.</p>
+        <p>Failure: <c>{badarg, {<anno>PgName</anno>, <anno>Msg</anno>}}</c>
+          if <c><anno>PgName</anno></c> is
           not a process group (a globally registered name).</p>
       </desc>
     </func>
     <func>
-      <name>esend(PgName, Msg) -> void()</name>
+      <name name="esend" arity="2"/>
       <fsummary>Send a message to all members of a process group, except ourselves</fsummary>
-      <type>
-        <v>PgName = Msg = term()</v>
-      </type>
       <desc>
         <p>Sends the tuple <c>{pg_message, From, PgName, Msg}</c> to
-          all members of the process group <c>PgName</c>, except
+          all members of the process group <c><anno>PgName</anno></c>, except
           ourselves.</p>
-        <p>Failure: <c>{badarg, {PgName, Msg}}</c> if <c>PgName</c> is
+        <p>Failure: <c>{badarg, {<anno>PgName</anno>, <anno>Msg</anno>}}</c>
+          if <c><anno>PgName</anno></c> is
           not a process group (a globally registered name).</p>
       </desc>
     </func>
     <func>
-      <name>members(PgName) -> Members</name>
+      <name name="members" arity="1"/>
       <fsummary>Return a list of all members of a process group</fsummary>
-      <type>
-        <v>PgName = term()</v>
-        <v>Members = [pid()]</v>
-      </type>
       <desc>
         <p>Returns a list of all members of the process group
           <c>PgName</c>.</p>
diff --git a/lib/stdlib/doc/src/pool.xml b/lib/stdlib/doc/src/pool.xml
index 2b890352eb..39a79e5dc5 100644
--- a/lib/stdlib/doc/src/pool.xml
+++ b/lib/stdlib/doc/src/pool.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -48,23 +48,19 @@
   </description>
   <funcs>
     <func>
-      <name>start(Name) -></name>
-      <name>start(Name, Args) -> Nodes</name>
+      <name name="start" arity="1"/>
+      <name name="start" arity="2"/>
       <fsummary>>Start a new pool</fsummary>
-      <type>
-        <v>Name = atom()</v>
-        <v>Args = string()</v>
-        <v>Nodes = [node()]</v>
-      </type>
       <desc>
         <p>Starts a new pool. The file <c>.hosts.erlang</c> is read to
           find host names where the pool nodes can be started. See
           section <seealso marker="#files">Files</seealso> below. The
           start-up procedure fails if the file is not found.</p>
         <p>The slave nodes are started with <c>slave:start/2,3</c>,
-          passing along <c>Name</c> and, if provided, <c>Args</c>.
-          <c>Name</c> is used as the first part of the node names,
-          <c>Args</c> is used to specify command line arguments. See
+          passing along <c><anno>Name</anno></c> and, if provided,
+          <c><anno>Args</anno></c>.
+          <c><anno>Name</anno></c> is used as the first part of the node names,
+          <c><anno>Args</anno></c> is used to specify command line arguments. See
           <seealso marker="slave#start/2">slave(3)</seealso>.</p>
         <p>Access rights must be set so that all nodes in the pool have
           the authority to access each other.</p>
@@ -73,59 +69,45 @@
       </desc>
     </func>
     <func>
-      <name>attach(Node) -> already_attached | attached</name>
+      <name name="attach" arity="1"/>
       <fsummary>Ensure that a pool master is running</fsummary>
-      <type>
-        <v>Node = node()</v>
-      </type>
       <desc>
         <p>This function ensures that a pool master is running and
-          includes <c>Node</c> in the pool master's pool of nodes.</p>
+          includes <c><anno>Node</anno></c> in the pool master's pool of nodes.</p>
       </desc>
     </func>
     <func>
-      <name>stop() -> stopped</name>
+      <name name="stop" arity="0"/>
       <fsummary>Stop the pool and kill all the slave nodes</fsummary>
       <desc>
         <p>Stops the pool and kills all the slave nodes.</p>
       </desc>
     </func>
     <func>
-      <name>get_nodes() -> Nodes</name>
+      <name name="get_nodes" arity="0"/>
       <fsummary>Return a list of the current member nodes of the pool</fsummary>
-      <type>
-        <v>Nodes = [node()]</v>
-      </type>
       <desc>
         <p>Returns a list of the current member nodes of the pool.</p>
       </desc>
     </func>
     <func>
-      <name>pspawn(Mod, Fun, Args) -> pid()</name>
+      <name name="pspawn" arity="3"/>
       <fsummary>Spawn a process on the pool node with expected lowest future load</fsummary>
-      <type>
-        <v>Mod = Fun = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
         <p>Spawns a process on the pool node which is expected to have
           the lowest future load.</p>
       </desc>
     </func>
     <func>
-      <name>pspawn_link(Mod, Fun, Args) -> pid()</name>
+      <name name="pspawn_link" arity="3"/>
       <fsummary>Spawn and link to a process on the pool node with expected lowest future load</fsummary>
-      <type>
-        <v>Mod = Fun = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
         <p>Spawn links a process on the pool node which is expected to
           have the lowest future load.</p>
       </desc>
     </func>
     <func>
-      <name>get_node() -> node()</name>
+      <name name="get_node" arity="0"/>
       <fsummary>Return the node with the expected lowest future load</fsummary>
       <desc>
         <p>Returns the node with the expected lowest future load.</p>
diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml
index 791001cb52..abc17c4a91 100644
--- a/lib/stdlib/doc/src/proc_lib.xml
+++ b/lib/stdlib/doc/src/proc_lib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -60,19 +60,33 @@
       information regarding other processes which terminate as a result
       of this process terminating.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="spawn_option"/>
+      <desc>
+        <p>See <seealso marker="erts:erlang#spawn_opt/4">
+          erlang:spawn_opt/2,3,4,5</seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="priority_level"/>
+    </datatype>
+    <datatype>
+      <name name="dict_or_pid"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>spawn(Fun) -> pid()</name>
-      <name>spawn(Node, Fun) -> pid()</name>
-      <name>spawn(Module, Function, Args) -> pid()</name>
-      <name>spawn(Node, Module, Function, Args) -> pid()</name>
+      <name name="spawn" arity="1"/>
+      <name name="spawn" arity="2"/>
+      <name name="spawn" arity="3"/>
+      <name name="spawn" arity="4"/>
       <fsummary>Spawn a new process.</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Fun = fun() -> void()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
+      <type variable="Node"/>
+      <type variable="Fun" name_i="1"/>
+      <type variable="Module"/>
+      <type variable="Function"/>
+      <type variable="Args"/>
       <desc>
         <p>Spawns a new process and initializes it as described above.
           The process is spawned using the
@@ -80,17 +94,16 @@
       </desc>
     </func>
     <func>
-      <name>spawn_link(Fun) -> pid()</name>
-      <name>spawn_link(Node, Fun) -> pid()</name>
-      <name>spawn_link(Module, Function, Args) -> pid()</name>
-      <name>spawn_link(Node, Module, Function, Args) -> pid()</name>
+      <name name="spawn_link" arity="1"/>
+      <name name="spawn_link" arity="2"/>
+      <name name="spawn_link" arity="3"/>
+      <name name="spawn_link" arity="4"/>
       <fsummary>Spawn and link to a new process.</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Fun = fun() -> void()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
+      <type variable="Node"/>
+      <type variable="Fun" name_i="1"/>
+      <type variable="Module"/>
+      <type variable="Function"/>
+      <type variable="Args"/>
       <desc>
         <p>Spawns a new process and initializes it as described above.
           The process is spawned using the
@@ -99,18 +112,17 @@
       </desc>
     </func>
     <func>
-      <name>spawn_opt(Fun, SpawnOpts) -> pid()</name>
-      <name>spawn_opt(Node, Fun, SpawnOpts) -> pid()</name>
-      <name>spawn_opt(Module, Function, Args, SpawnOpts) -> pid()</name>
-      <name>spawn_opt(Node, Module, Func, Args, SpawnOpts) -> pid()</name>
+      <name name="spawn_opt" arity="2"/>
+      <name name="spawn_opt" arity="3"/>
+      <name name="spawn_opt" arity="4"/>
+      <name name="spawn_opt" arity="5"/>
       <fsummary>Spawn a new process with given options.</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Fun = fun() -> void()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>SpawnOpts -- see erlang:spawn_opt/2,3,4,5</v>
-      </type>
+      <type variable="Node"/>
+      <type variable="Fun" name_i="1"/>
+      <type variable="Module"/>
+      <type variable="Function"/>
+      <type variable="Args"/>
+      <type variable="SpawnOpts"/>
       <desc>
         <p>Spawns a new process and initializes it as described above.
           The process is spawned using the
@@ -124,20 +136,13 @@
       </desc>
     </func>
     <func>
-      <name>start(Module, Function, Args) -> Ret</name>
-      <name>start(Module, Function, Args, Time) -> Ret</name>
-      <name>start(Module, Function, Args, Time, SpawnOpts) -> Ret</name>
-      <name>start_link(Module, Function, Args) -> Ret</name>
-      <name>start_link(Module, Function, Args, Time) -> Ret</name>
-      <name>start_link(Module, Function, Args, Time, SpawnOpts) -> Ret</name>
+      <name name="start" arity="3"/>
+      <name name="start" arity="4"/>
+      <name name="start" arity="5"/>
+      <name name="start_link" arity="3"/>
+      <name name="start_link" arity="4"/>
+      <name name="start_link" arity="5"/>
       <fsummary>Start a new process synchronously.</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <v>Time = int() >= 0 | infinity</v>
-        <v>SpawnOpts -- see erlang:spawn_opt/2,3,4,5</v>
-        <v>Ret = term() | {error, Reason}</v>
-      </type>
       <desc>
         <p>Starts a new process synchronously. Spawns the process and
           waits for it to start.  When the process has started, it
@@ -148,13 +153,13 @@
           function.  At this time, <c>Ret</c> is returned.</p>
         <p>If the <c>start_link/3,4,5</c> function is used and
           the process crashes before it has called <c>init_ack/1,2</c>,
-          <c>{error, Reason}</c> is returned if the calling process
+          <c>{error, <anno>Reason</anno>}</c> is returned if the calling process
           traps exits.</p>
-        <p>If <c>Time</c> is specified as an integer, this function
-          waits for <c>Time</c> milliseconds for the new process to call
+        <p>If <c><anno>Time</anno></c> is specified as an integer, this function
+          waits for <c><anno>Time</anno></c> milliseconds for the new process to call
           <c>init_ack</c>, or <c>{error, timeout}</c> is returned, and
           the process is killed.</p>
-        <p>The <c>SpawnOpts</c> argument, if given, will be passed
+        <p>The <c><anno>SpawnOpts</anno></c> argument, if given, will be passed
           as the last argument to the <c>spawn_opt/2,3,4,5</c> BIF.</p>
         <note>
           <p>Using the spawn option <c>monitor</c> is currently not
@@ -164,17 +169,13 @@
       </desc>
     </func>
     <func>
-      <name>init_ack(Parent, Ret) -> void()</name>
-      <name>init_ack(Ret) -> void()</name>
+      <name name="init_ack" arity="1"/>
+      <name name="init_ack" arity="2"/>
       <fsummary>Used by a process when it has started.</fsummary>
-      <type>
-        <v>Parent = pid()</v>
-        <v>Ret = term()</v>
-      </type>
       <desc>
         <p>This function must used by a process that has been started by
           a <seealso marker="#start/3">start[_link]/3,4,5</seealso>
-          function. It tells <c>Parent</c> that the process has
+          function. It tells <c><anno>Parent</anno></c> that the process has
           initialized itself, has started, or has failed to initialize
           itself.</p>
         <p>The <c>init_ack/1</c> function uses the parent value
@@ -205,40 +206,30 @@ init(Parent) ->
       </desc>
     </func>
     <func>
-      <name>format(CrashReport) -> string()</name>
+      <name name="format" arity="1"/>
       <fsummary>Format a crash report.</fsummary>
-      <type>
-        <v>CrashReport = term()</v>
-      </type>
       <desc>
         <p>This function can be used by a user defined event handler to
           format a crash report. The crash report is sent using
-          <c>error_logger:error_report(crash_report, CrashReport)</c>.
+          <c>error_logger:error_report(crash_report, <anno>CrashReport</anno>)</c>.
           That is, the event to be handled is of the format
-          <c>{error_report, GL, {Pid, crash_report, CrashReport}}</c>
+          <c>{error_report, GL, {Pid, crash_report, <anno>CrashReport</anno>}}</c>
           where <c>GL</c> is the group leader pid of the process
           <c>Pid</c> which sent the crash report.</p>
       </desc>
     </func>
     <func>
-      <name>initial_call(Process) -> {Module,Function,Args} | false</name>
+      <name name="initial_call" arity="1"/>
       <fsummary>Extract the initial call of a <c>proc_lib</c>spawned process.</fsummary>
-      <type>
-        <v>Process = pid() | {X,Y,Z} | ProcInfo</v>
-        <v>&nbsp;X = Y = Z = int()</v>
-        <v>&nbsp;ProcInfo = term()</v>
-        <v>Module = Function = atom()</v>
-        <v>Args = [atom()]</v>
-      </type>
       <desc>
         <p>Extracts the initial call of a process that was started
           using one of the spawn or start functions described above.
-          <c>Process</c> can either be a pid, an integer tuple (from
+          <c><anno>Process</anno></c> can either be a pid, an integer tuple (from
           which a pid can be created), or the process information of a
           process <c>Pid</c> fetched through an
           <c>erlang:process_info(Pid)</c> function call.</p>
 
-	<note><p>The list <c>Args</c> no longer contains the actual arguments,
+	<note><p>The list <c><anno>Args</anno></c> no longer contains the actual arguments,
 	but the same number of atoms as the number of arguments; the first atom
 	is always <c>'Argument__1'</c>, the second <c>'Argument__2'</c>, and
 	so on. The reason is that the argument list could waste a significant
@@ -256,23 +247,15 @@ init(Parent) ->
       </desc>
     </func>
     <func>
-      <name>translate_initial_call(Process) -> {Module,Function,Arity} | Fun</name>
+      <name name="translate_initial_call" arity="1"/>
       <fsummary>Extract and translate the initial call of a <c>proc_lib</c>spawned process.</fsummary>
-      <type>
-        <v>Process = pid() | {X,Y,Z} | ProcInfo</v>
-        <v>&nbsp;X = Y = Z = int()</v>
-        <v>&nbsp;ProcInfo = term()</v>
-        <v>Module = Function = atom()</v>
-        <v>Arity = int()</v>
-        <v>Fun = fun() -> void()</v>
-      </type>
       <desc>
         <p>This function is used by the <c>c:i/0</c> and
           <c>c:regs/0</c> functions in order to present process
           information.</p>
         <p>Extracts the initial call of a process that was started
           using one of the spawn or start functions described above,
-          and translates it to more useful information. <c>Process</c>
+          and translates it to more useful information. <c><anno>Process</anno></c>
           can either be a pid, an integer tuple (from which a pid can
           be created), or the process information of a process
           <c>Pid</c> fetched through an <c>erlang:process_info(Pid)</c>
@@ -280,15 +263,15 @@ init(Parent) ->
         <p>If the initial call is to one of the system defined behaviors
           such as <c>gen_server</c> or <c>gen_event</c>, it is
           translated to more useful information. If a <c>gen_server</c>
-          is spawned, the returned <c>Module</c> is the name of
-          the callback module and <c>Function</c> is <c>init</c>
+          is spawned, the returned <c><anno>Module</anno></c> is the name of
+          the callback module and <c><anno>Function</anno></c> is <c>init</c>
           (the function that initiates the new server).</p>
         <p>A <c>supervisor</c> and a <c>supervisor_bridge</c> are also
           <c>gen_server</c> processes. In order to return information
           that this process is a supervisor and the name of the
-          call-back module, <c>Module</c> is <c>supervisor</c> and
-          <c>Function</c> is the name of the supervisor callback
-          module. <c>Arity</c> is <c>1</c> since the <c>init/1</c>
+          call-back module, <c><anno>Module</anno></c> is <c>supervisor</c> and
+          <c><anno>Function</anno></c> is the name of the supervisor callback
+          module. <c><anno>Arity</anno></c> is <c>1</c> since the <c>init/1</c>
           function is called initially in the callback module.</p>
         <p>By default, <c>{proc_lib,init_p,5}</c> is returned if no
           information about the initial call can be found. It is
@@ -297,12 +280,8 @@ init(Parent) ->
       </desc>
     </func>
     <func>
-      <name>hibernate(Module, Function, Args)</name>
+      <name name="hibernate" arity="3"/>
       <fsummary>Hibernate a process until a message is sent to it</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
         <p>This function does the same as (and does call) the BIF
           <seealso marker="erts:erlang#erlang:hibernate/3">hibernate/3</seealso>,
diff --git a/lib/stdlib/doc/src/proplists.xml b/lib/stdlib/doc/src/proplists.xml
index 9f1c5b24ad..225c5e97eb 100644
--- a/lib/stdlib/doc/src/proplists.xml
+++ b/lib/stdlib/doc/src/proplists.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -48,14 +48,15 @@
       words, numbers are compared literally rather than by value, so that,
       for instance, <c>1</c> and <c>1.0</c> are different keys.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="property"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>append_values(Key, List) -> List</name>
+      <name name="append_values" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
         <p>Similar to <c>get_all_values/2</c>, but each value is
           wrapped in a list unless it is already itself a list, and the
@@ -65,11 +66,8 @@
       </desc>
     </func>
     <func>
-      <name>compact(List) -> List</name>
+      <name name="compact" arity="1"/>
       <fsummary></fsummary>
-      <type>
-        <v>List = [term()]</v>
-      </type>
       <desc>
         <p>Minimizes the representation of all entries in the list. This is
           equivalent to <c><![CDATA[[property(P) || P <- List]]]></c>.</p>
@@ -77,33 +75,24 @@
       </desc>
     </func>
     <func>
-      <name>delete(Key, List) -> List</name>
+      <name name="delete" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Deletes all entries associated with <c>Key</c> from
-          <c>List</c>.</p>
+        <p>Deletes all entries associated with <c><anno>Key</anno></c> from
+          <c><anno>List</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>expand(Expansions, List) -> List</name>
+      <name name="expand" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Expansions = [{Property,[term()]}]</v>
-        <v>Property = atom() | tuple()</v>
-      </type>
       <desc>
         <p>Expands particular properties to corresponding sets of
-          properties (or other terms). For each pair <c>{Property, Expansion}</c> in <c>Expansions</c>, if <c>E</c> is
-          the first entry in <c>List</c> with the same key as
-          <c>Property</c>, and <c>E</c> and <c>Property</c>
+          properties (or other terms). For each pair <c>{<anno>Property</anno>, <anno>Expansion</anno>}</c> in <c><anno>Expansions</anno></c>, if <c>E</c> is
+          the first entry in <c><anno>List</anno></c> with the same key as
+          <c><anno>Property</anno></c>, and <c>E</c> and <c><anno>Property</anno></c>
           have equivalent normal forms, then <c>E</c> is replaced with
-          the terms in <c>Expansion</c>, and any following entries with
-          the same key are deleted from <c>List</c>.</p>
+          the terms in <c><anno>Expansion</anno></c>, and any following entries with
+          the same key are deleted from <c><anno>List</anno></c>.</p>
         <p>For example, the following expressions all return <c>[fie, bar, baz, fum]</c>:</p>
         <code type="none">
           expand([{foo, [bar, baz]}],
@@ -120,103 +109,75 @@
         <p>Note that if the original property term is to be preserved in the
           result when expanded, it must be included in the expansion list. The
           inserted terms are not expanded recursively. If
-          <c>Expansions</c> contains more than one property with the same
+          <c><anno>Expansions</anno></c> contains more than one property with the same
           key, only the first occurrence is used.</p>
         <p>See also: <c>normalize/2</c>.</p>
       </desc>
     </func>
     <func>
-      <name>get_all_values(Key, List) -> [term()]</name>
+      <name name="get_all_values" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
         <p>Similar to <c>get_value/2</c>, but returns the list of
           values for <em>all</em> entries <c>{Key, Value}</c> in
-          <c>List</c>. If no such entry exists, the result is the empty
+          <c><anno>List</anno></c>. If no such entry exists, the result is the empty
           list.</p>
         <p>See also: <c>get_value/2</c>.</p>
       </desc>
     </func>
     <func>
-      <name>get_bool(Key, List) -> bool()</name>
+      <name name="get_bool" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
         <p>Returns the value of a boolean key/value option. If
-          <c>lookup(Key, List)</c> would yield <c>{Key, true}</c>,
+          <c>lookup(<anno>Key</anno>, <anno>List</anno>)</c> would yield <c>{<anno>Key</anno>, true}</c>,
           this function returns <c>true</c>; otherwise <c>false</c>
           is returned.</p>
         <p>See also: <c>get_value/2</c>, <c>lookup/2</c>.</p>
       </desc>
     </func>
     <func>
-      <name>get_keys(List) -> [term()]</name>
+      <name name="get_keys" arity="1"/>
       <fsummary></fsummary>
-      <type>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns an unordered list of the keys used in <c>List</c>,
+        <p>Returns an unordered list of the keys used in <c><anno>List</anno></c>,
           not containing duplicates.</p>
       </desc>
     </func>
     <func>
-      <name>get_value(Key, List) -> term()</name>
+      <name name="get_value" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Equivalent to <c>get_value(Key, List, undefined)</c>.</p>
+        <p>Equivalent to <c>get_value(<anno>Key</anno>, <anno>List</anno>, undefined)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>get_value(Key, List, Default) -> term()</name>
+      <name name="get_value" arity="3"/>
       <fsummary></fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Default = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
         <p>Returns the value of a simple key/value property in
-          <c>List</c>. If <c>lookup(Key, List)</c> would yield
-          <c>{Key, Value}</c>, this function returns the corresponding
-          <c>Value</c>, otherwise <c>Default</c> is returned.</p>
+          <c><anno>List</anno></c>. If <c>lookup(<anno>Key</anno>, <anno>List</anno>)</c> would yield
+          <c>{<anno>Key</anno>, Value}</c>, this function returns the corresponding
+          <c>Value</c>, otherwise <c><anno>Default</anno></c> is returned.</p>
         <p>See also: <c>get_all_values/2</c>, <c>get_bool/2</c>,
           <c>get_value/2</c>, <c>lookup/2</c>.</p>
       </desc>
     </func>
     <func>
-      <name>is_defined(Key, List) -> bool()</name>
+      <name name="is_defined" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>List</c> contains at least
-          one entry associated with <c>Key</c>, otherwise
+        <p>Returns <c>true</c> if <c><anno>List</anno></c> contains at least
+          one entry associated with <c><anno>Key</anno></c>, otherwise
           <c>false</c> is returned.</p>
       </desc>
     </func>
     <func>
-      <name>lookup(Key, List) -> none | tuple()</name>
+      <name name="lookup" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns the first entry associated with <c>Key</c> in
-          <c>List</c>, if one exists, otherwise returns
+        <p>Returns the first entry associated with <c><anno>Key</anno></c> in
+          <c><anno>List</anno></c>, if one exists, otherwise returns
           <c>none</c>. For an atom <c>A</c> in the list, the tuple
           <c>{A, true}</c> is the entry associated with <c>A</c>.</p>
         <p>See also: <c>get_bool/2</c>, <c>get_value/2</c>,
@@ -224,34 +185,20 @@
       </desc>
     </func>
     <func>
-      <name>lookup_all(Key, List) -> [tuple()]</name>
+      <name name="lookup_all" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns the list of all entries associated with <c>Key</c>
-          in <c>List</c>. If no such entry exists, the result is the
+        <p>Returns the list of all entries associated with <c><anno>Key</anno></c>
+          in <c><anno>List</anno></c>. If no such entry exists, the result is the
           empty list.</p>
         <p>See also: <c>lookup/2</c>.</p>
       </desc>
     </func>
     <func>
-      <name>normalize(List, Stages) -> List</name>
+      <name name="normalize" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>List = [term()]</v>
-        <v>Stages = [Operation]</v>
-        <v>Operation = {aliases, Aliases} | {negations, Negations} |  {expand, Expansions}</v>
-        <v>Aliases = [{Key, Key}]</v>
-        <v>Negations = [{Key, Key}]</v>
-        <v>Key = term()</v>
-        <v>Expansions = [{Property, [term()]}]</v>
-        <v>Property = atom() | tuple()</v>
-      </type>
       <desc>
-        <p>Passes <c>List</c> through a sequence of
+        <p>Passes <c><anno>List</anno></c> through a sequence of
           substitution/expansion stages. For an <c>aliases</c> operation,
           the function <c>substitute_aliases/2</c> is applied using the
           given list of aliases; for a <c>negations</c> operation,
@@ -270,51 +217,37 @@
       </desc>
     </func>
     <func>
-      <name>property(Property) -> Property</name>
+      <name name="property" arity="1"/>
       <fsummary></fsummary>
-      <type>
-        <v>Property = atom() | tuple()</v>
-      </type>
       <desc>
         <p>Creates a normal form (minimal) representation of a property. If
-          <c>Property</c> is <c>{Key, true}</c> where <c>Key</c> is
+          <c><anno>Property</anno></c> is <c>{Key, true}</c> where <c>Key</c> is
           an atom, this returns <c>Key</c>, otherwise the whole term
-          <c>Property</c> is returned.</p>
+          <c><anno>Property</anno></c> is returned.</p>
         <p>See also: <c>property/2</c>.</p>
       </desc>
     </func>
     <func>
-      <name>property(Key, Value) -> Property</name>
+      <name name="property" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Key = term()</v>
-        <v>Value = term()</v>
-        <v>Property = atom() | tuple()</v>
-      </type>
       <desc>
         <p>Creates a normal form (minimal) representation of a simple
-          key/value property. Returns <c>Key</c> if <c>Value</c> is
-          <c>true</c> and <c>Key</c> is an atom, otherwise a tuple
-          <c>{Key, Value}</c> is returned.</p>
+          key/value property. Returns <c><anno>Key</anno></c> if <c><anno>Value</anno></c> is
+          <c>true</c> and <c><anno>Key</anno></c> is an atom, otherwise a tuple
+          <c>{<anno>Key</anno>, <anno>Value</anno>}</c> is returned.</p>
         <p>See also: <c>property/1</c>.</p>
       </desc>
     </func>
     <func>
-      <name>split(List, Keys) -> {Lists, Rest}</name>
+      <name name="split" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>List = [term()]</v>
-        <v>Keys = [term()]</v>
-        <v>Lists = [[term()]]</v>
-        <v>Rest = [term()]</v>
-      </type>
       <desc>
-        <p>Partitions <c>List</c> into a list of sublists and a
-          remainder. <c>Lists</c> contains one sublist for each key in
-          <c>Keys</c>, in the corresponding order. The relative order of
+        <p>Partitions <c><anno>List</anno></c> into a list of sublists and a
+          remainder. <c><anno>Lists</anno></c> contains one sublist for each key in
+          <c><anno>Keys</anno></c>, in the corresponding order. The relative order of
           the elements in each sublist is preserved from the original
-          <c>List</c>. <c>Rest</c> contains the elements in
-          <c>List</c> that are not associated with any of the given keys,
+          <c><anno>List</anno></c>. <c><anno>Rest</anno></c> contains the elements in
+          <c><anno>List</anno></c> that are not associated with any of the given keys,
           also with their original relative order preserved.</p>
         <p>Example:
           split([{c, 2}, {e, 1}, a, {c, 3, 4}, d, {b, 5}, b], [a, b, c])</p>
@@ -323,19 +256,14 @@
       </desc>
     </func>
     <func>
-      <name>substitute_aliases(Aliases, List) -> List</name>
+      <name name="substitute_aliases" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Aliases = [{Key, Key}]</v>
-        <v>Key = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
         <p>Substitutes keys of properties. For each entry in
-          <c>List</c>, if it is associated with some key <c>K1</c>
-          such that <c>{K1, K2}</c> occurs in <c>Aliases</c>, the
-          key of the entry is changed to <c>Key2</c>. If the same
-          <c>K1</c> occurs more than once in <c>Aliases</c>, only
+          <c><anno>List</anno></c>, if it is associated with some key <c>K1</c>
+          such that <c>{K1, K2}</c> occurs in <c><anno>Aliases</anno></c>, the
+          key of the entry is changed to <c>K2</c>. If the same
+          <c>K1</c> occurs more than once in <c><anno>Aliases</anno></c>, only
           the first occurrence is used.</p>
         <p>Example: <c>substitute_aliases([{color, colour}], L)</c>
           will replace all tuples <c>{color, ...}</c> in <c>L</c>
@@ -345,24 +273,19 @@
       </desc>
     </func>
     <func>
-      <name>substitute_negations(Negations, List) -> List</name>
+      <name name="substitute_negations" arity="2"/>
       <fsummary></fsummary>
-      <type>
-        <v>Negations = [{Key, Key}]</v>
-        <v>Key = term()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
         <p>Substitutes keys of boolean-valued properties and
           simultaneously negates their values. For each entry in
-          <c>List</c>, if it is associated with some key <c>K1</c>
-          such that <c>{K1, K2}</c> occurs in <c>Negations</c>, then
+          <c><anno>List</anno></c>, if it is associated with some key <c>K1</c>
+          such that <c>{K1, K2}</c> occurs in <c><anno>Negations</anno></c>, then
           if the entry was <c>{K1, true}</c> it will be replaced with
           <c>{K2, false}</c>, otherwise it will be replaced with
           <c>{K2, true}</c>, thus changing the name of the option and
           simultaneously negating the value given by
           <c>get_bool(List)</c>. If the same <c>K1</c> occurs more
-          than once in <c>Negations</c>, only the first occurrence is
+          than once in <c><anno>Negations</anno></c>, only the first occurrence is
           used.</p>
         <p>Example: <c>substitute_negations([{no_foo, foo}], L)</c>
           will replace any atom <c>no_foo</c> or tuple
@@ -374,13 +297,10 @@
       </desc>
     </func>
     <func>
-      <name>unfold(List) -> List</name>
+      <name name="unfold" arity="1"/>
       <fsummary></fsummary>
-      <type>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Unfolds all occurrences of atoms in <c>List</c> to tuples
+        <p>Unfolds all occurrences of atoms in <c><anno>List</anno></c> to tuples
           <c>{Atom, true}</c>.</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/qlc.xml b/lib/stdlib/doc/src/qlc.xml
index da24ee9914..6a45ade447 100644
--- a/lib/stdlib/doc/src/qlc.xml
+++ b/lib/stdlib/doc/src/qlc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -45,7 +45,9 @@
       tables</em>. Typical QLC tables are ETS, Dets, and Mnesia
       tables. There is also support for user defined tables, see the
       <seealso marker="#implementing_a_qlc_table">Implementing a QLC
-      table</seealso> section. A <em>query</em> is stated using
+      table</seealso> section. <marker
+      id="query_list_comprehension"></marker>
+      A <em>query</em> is stated using
       <em>Query List Comprehensions</em> (QLCs). The answers to a
       query are determined by data in QLC tables that fulfill the
       constraints expressed by the QLCs of the query. QLCs are similar
@@ -55,10 +57,11 @@
       fact, in the absence of optimizations and options such as
       <c>cache</c> and <c>unique</c> (see below), every QLC free of
       QLC tables evaluates to the same list of answers as the
-      identical ordinary list comprehension. </p>
+      identical ordinary list comprehension.</p>
 
     <p>While ordinary list comprehensions evaluate to lists, calling
-      <seealso marker="#q">qlc:q/1,2</seealso> returns a <em>Query
+      <seealso marker="#q">qlc:q/1,2</seealso> returns a <marker
+      id="query_handle"></marker><em> Query
       Handle</em>. To obtain all the answers to a query, <seealso
       marker="#eval">qlc:eval/1,2</seealso> should be called with the
       query handle as first argument. Query handles are essentially
@@ -69,7 +72,8 @@
       Code replacement is described in the <seealso
       marker="doc/reference_manual:code_loading">Erlang Reference
       Manual</seealso>. The list of answers can also be traversed in
-      chunks by use of a <em>Query Cursor</em>. Query cursors are
+      chunks by use of a <marker
+      id="query_cursor"></marker><em>Query Cursor</em>. Query cursors are
       created by calling <seealso
       marker="#cursor">qlc:cursor/1,2</seealso> with a query handle as
       first argument. Query cursors are essentially Erlang processes.
@@ -226,75 +230,6 @@
 
   </section>
 
-  <section><title>Common data types</title>
-
-    <list type="bulleted">
-      <item><p><c>QueryCursor = {qlc_cursor, term()}</c></p>
-      </item>
-      <item><p><c>QueryHandle = {qlc_handle, term()}</c></p>
-      </item>
-      <item><p><c>QueryHandleOrList = QueryHandle | list()</c></p>
-      </item>
-      <item><p><c>Answers = [Answer]</c></p>
-      </item>
-      <item><p><c>Answer = term()</c></p>
-      </item>
-      <item><p><c>AbstractExpression =&nbsp;</c> -&nbsp;parse trees
-          for Erlang expressions, see the <seealso
-          marker="erts:absform">abstract format</seealso>
-          documentation in the ERTS User's Guide&nbsp;-</p>
-      </item>
-      <item><p><c>MatchExpression =&nbsp;</c>
-          -&nbsp;match&nbsp;specifications, see the <seealso
-          marker="erts:match_spec">match specification</seealso>
-          documentation in the ERTS User's Guide and <seealso
-          marker="ms_transform">ms_transform(3)</seealso>&nbsp;-</p>
-      </item>
-      <item><p><c>SpawnOptions = default | spawn_options()</c></p>
-      </item>
-      <item><p><c>SortOptions = [SortOption] | SortOption</c></p>
-      </item>
-      <item><p><c>SortOption = {compressed, bool()}
-            | {no_files, NoFiles} 
-            | {order, Order} 
-            | {size, Size} 
-            | {tmpdir, TempDirectory} 
-            | {unique, bool()}&nbsp;</c>
-            -&nbsp;see <seealso
-            marker="file_sorter">file_sorter(3)</seealso>&nbsp;-</p>
-      </item>
-      <item><p><c>Order = ascending | descending | OrderFun</c></p>
-      </item>
-      <item><p><c>OrderFun = fun(term(), term()) -> bool()</c></p>
-      </item>
-      <item><p><c>TempDirectory = "" | filename()</c></p>
-      </item>
-      <item><p><c>Size = int() > 0</c></p>
-      </item>
-      <item><p><c>NoFiles = int() > 1</c></p>
-      </item>
-      <item><p><c>KeyPos = int() > 0 | [int() > 0]</c></p>
-      </item>
-      <item><p><c>MaxListSize = int() >= 0</c></p>
-      </item>
-      <item><p><c>bool() = true | false</c></p>
-      </item>
-      <item><p><c>Cache = ets | list | no</c></p>
-      </item>
-      <item><p><c>TmpFileUsage = allowed | not_allowed | info_msg 
-            | warning_msg | error_msg</c></p>
-      </item>
-      <item><p><c>filename() =&nbsp;</c> -&nbsp;see <seealso
-            marker="filename">filename(3)</seealso>&nbsp;-</p>
-      </item>
-      <item><p><c>spawn_options() =&nbsp;</c> -&nbsp;see <seealso
-          marker="erts:erlang">erlang(3)</seealso>&nbsp;-</p>
-      </item>
-
-    </list>
-
-  </section>
-
   <section><title>Getting started</title>
 
     <p><marker id="getting_started"></marker> As already mentioned
@@ -679,34 +614,105 @@ ets:match_spec_run(ets:lookup(86033, {2,2}),
 
   </section>
 
+  <datatypes>
+    <datatype>
+      <name name="abstract_expr"></name>
+      <desc><p>Parse trees for Erlang expression, see the <seealso
+        marker="erts:absform">abstract format</seealso>
+        documentation in the ERTS User's Guide.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="answer"></name>
+    </datatype>
+    <datatype>
+      <name name="answers"></name>
+    </datatype>
+    <datatype>
+      <name name="cache"></name>
+    </datatype>
+    <datatype>
+      <name name="match_expression"></name>
+      <desc><p>Match&nbsp;specification, see the <seealso
+          marker="erts:match_spec">match specification</seealso>
+          documentation in the ERTS User's Guide and <seealso
+          marker="ms_transform">ms_transform(3).</seealso></p></desc>
+    </datatype>
+    <datatype>
+      <name name="no_files"></name>
+      <desc><p>Actually an integer > 1.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="key_pos"></name>
+    </datatype>
+    <datatype>
+      <name name="max_list_size"></name>
+    </datatype>
+    <datatype>
+      <name name="order"></name>
+    </datatype>
+    <datatype>
+      <name name="order_fun"></name>
+    </datatype>
+    <datatype>
+      <name name="query_cursor"></name>
+      <desc><p>A <seealso marker="#query_cursor">query cursor</seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="query_handle"></name>
+      <desc><p>A <seealso marker="#query_handle">query handle</seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="query_handle_or_list"></name>
+    </datatype>
+    <datatype>
+      <name name="query_list_comprehension"></name>
+      <desc><p>A literal
+        <seealso marker="#query_list_comprehension">query
+         list comprehension</seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="spawn_options"></name>
+    </datatype>
+    <datatype>
+      <name name="sort_options"></name>
+    </datatype>
+    <datatype>
+      <name name="sort_option"></name>
+      <desc><p>See <seealso
+        marker="file_sorter">file_sorter(3)</seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="tmp_directory"></name>
+    </datatype>
+    <datatype>
+      <name name="tmp_file_usage"></name>
+      <desc><p></p></desc>
+    </datatype>
+  </datatypes>
+
   <funcs>
 
     <func>
-      <name>append(QHL) -> QH</name>
+      <name name="append" arity="1"/>
       <fsummary>Return a query handle.</fsummary>
-      <type>
-        <v>QHL = [QueryHandleOrList]</v>
-        <v>QH = QueryHandle</v>
-      </type>
       <desc>
         <p>Returns a query handle. When evaluating the query handle
-          <c>QH</c> all answers to the first query handle in
-          <c>QHL</c> is returned followed by all answers to the rest
-          of the query handles in <c>QHL</c>.</p>
+          <c><anno>QH</anno></c> all answers to the first query handle in
+          <c><anno>QHL</anno></c> are returned followed by all answers
+          to the rest of the query handles in <c><anno>QHL</anno></c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>append(QH1, QH2) -> QH3</name>
+      <name name="append" arity="2"/>
       <fsummary>Return a query handle.</fsummary>
-      <type>
-        <v>QH1 = QH2 = QueryHandleOrList</v>
-        <v>QH3 = QueryHandle</v>
-      </type>
       <desc>
         <p>Returns a query handle. When evaluating the query handle
-          <c>QH3</c> all answers to <c>QH1</c> are returned followed
-          by all answers to <c>QH2</c>.</p>
+          <c><anno>QH3</anno></c> all answers to
+          <c><anno>QH1</anno></c> are returned followed by all answers
+          to <c><anno>QH2</anno></c>.</p>
 
         <p><c>append(QH1,&nbsp;QH2)</c> is equivalent to
           <c>append([QH1,&nbsp;QH2])</c>.</p>
@@ -714,17 +720,9 @@ ets:match_spec_run(ets:lookup(86033, {2,2}),
     </func>
 
     <func>
-      <name>cursor(QueryHandleOrList [, Options]) -> QueryCursor</name>
+      <name name="cursor" arity="1"/>
+      <name name="cursor" arity="2"/>
       <fsummary>Create a query cursor.</fsummary>
-      <type>
-        <v>Options = [Option] | Option</v>
-        <v>Option = {cache_all, Cache} | cache_all
-                  | {max_list_size, MaxListSize}
-                  | {spawn_options, SpawnOptions}
-                  | {tmpdir_usage, TmpFileUsage}
-                  | {tmpdir, TempDirectory}
-                  | {unique_all, bool()} | unique_all</v>
-      </type>
       <desc>
         <p><marker id="cursor"></marker>Creates a query cursor and
           makes the calling process the owner of the cursor. The
@@ -746,11 +744,13 @@ ets:match_spec_run(ets:lookup(86033, {2,2}),
 [{b,1},{b,2}]
 4> <input>qlc:delete_cursor(QC).</input>
 ok</pre>
+        <p><c>cursor(<anno>QH</anno>)</c> is equivalent to
+          <c>cursor(<anno>QH</anno>, [])</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>delete_cursor(QueryCursor) -> ok</name>
+      <name name="delete_cursor" arity="1"/>
       <fsummary>Delete a query cursor.</fsummary>
       <desc>
         <p>Deletes a query cursor. Only the owner of the cursor can
@@ -759,19 +759,11 @@ ok</pre>
     </func>
 
     <func>
-      <name>eval(QueryHandleOrList [, Options]) -> Answers | Error</name>
-      <name>e(QueryHandleOrList [, Options]) -> Answers</name>
+      <name name="eval" arity="1"/>
+      <name name="eval" arity="2"/>
+      <name name="e" arity="1"/>
+      <name name="e" arity="2"/>
       <fsummary>Return all answers to a query.</fsummary>
-      <type>
-        <v>Options = [Option] | Option</v>
-        <v>Option = {cache_all, Cache} | cache_all
-                  | {max_list_size, MaxListSize}
-                  | {tmpdir_usage, TmpFileUsage}
-                  | {tmpdir, TempDirectory}
-                  | {unique_all, bool()} | unique_all</v>
-        <v>Error = {error, module(), Reason}</v>
-        <v>Reason =&nbsp;-&nbsp;as returned by file_sorter(3)&nbsp;-</v>
-      </type>
       <desc>
         <p><marker id="eval"></marker>Evaluates a query handle in the
           calling process and collects all answers in a list.</p>
@@ -780,47 +772,39 @@ ok</pre>
 1> <input>QH = qlc:q([{X,Y} || X &lt;- [a,b], Y &lt;- [1,2]]),</input>
 <input>qlc:eval(QH).</input>
 [{a,1},{a,2},{b,1},{b,2}]</pre>
+        <p><c>eval(<anno>QH</anno>)</c> is equivalent to
+          <c>eval(<anno>QH</anno>, [])</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>fold(Function, Acc0, QueryHandleOrList [, Options]) -> 
-               Acc1 | Error</name>
+      <name name="fold" arity="3"/>
+      <name name="fold" arity="4"/>
       <fsummary>Fold a function over the answers to a query.</fsummary>
-      <type>
-        <v>Function = fun(Answer, AccIn) -> AccOut</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>Options = [Option] | Option</v>
-        <v>Option = {cache_all, Cache} | cache_all
-                  | {max_list_size, MaxListSize}
-                  | {tmpdir_usage, TmpFileUsage}
-                  | {tmpdir, TempDirectory}
-                  | {unique_all, bool()} | unique_all</v>
-        <v>Error = {error, module(), Reason}</v>
-        <v>Reason =&nbsp;-&nbsp;as returned by file_sorter(3)&nbsp;-</v>
-      </type>
       <desc>
-        <p>Calls <c>Function</c> on successive answers to the query
-          handle together with an extra argument <c>AccIn</c>. The
-          query handle and the function are evaluated in the calling
-          process. <c>Function</c> must return a new accumulator which
-          is passed to the next call. <c>Acc0</c> is returned if there
-          are no answers to the query handle.</p>
+        <p>Calls <c><anno>Function</anno></c> on successive answers to
+          the query handle together with an extra argument
+          <c><anno>AccIn</anno></c>. The query handle and the function
+          are evaluated in the calling process.
+          <c><anno>Function</anno></c> must return a new accumulator
+          which is passed to the next call.
+          <c><anno>Acc0</anno></c> is returned if there are no answers
+          to the query handle.</p>
 
         <pre>
 1> <input>QH = [1,2,3,4,5,6],</input>
 <input>qlc:fold(fun(X, Sum) -> X + Sum end, 0, QH).</input>
 21</pre>
+        <p><c>fold(<anno>Function</anno>, <anno>Acc0</anno>,
+          <anno>QH</anno>)</c> is equivalent to
+          <c>fold(<anno>Function</anno>, <anno>Acc0</anno>,
+          <anno>QH</anno>, [])</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>format_error(Error) -> Chars</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Return an English description of a an error tuple.</fsummary>
-      <type>
-        <v>Error = {error, module(), term()}</v>
-        <v>Chars = [char() | Chars]</v>
-      </type>
       <desc>
         <p>Returns a descriptive string in English of an error tuple
           returned by some of the functions of the <c>qlc</c> module
@@ -830,25 +814,9 @@ ok</pre>
     </func>
 
     <func>
-      <name>info(QueryHandleOrList [, Options]) -> Info</name>
+      <name name="info" arity="1"/>
+      <name name="info" arity="2"/>
       <fsummary>Return code describing a query handle.</fsummary>
-      <type>
-        <v>Options = [Option] | Option</v>
-        <v>Option = EvalOption | ReturnOption</v>
-        <v>EvalOption = {cache_all, Cache} | cache_all
-                      | {max_list_size, MaxListSize}
-                      | {tmpdir_usage, TmpFileUsage}
-                      | {tmpdir, TempDirectory}
-                      | {unique_all, bool()} | unique_all</v>
-        <v>ReturnOption = {depth, Depth}
-                        | {flat, bool()}
-                        | {format, Format}
-                        | {n_elements, NElements}</v>
-        <v>Depth = infinity | int() >= 0</v>
-        <v>Format = abstract_code | string</v>
-        <v>NElements = infinity | int() > 0</v>
-        <v>Info = AbstractExpression | string()</v>
-      </type>
       <desc>
         <p><marker id="info"></marker>Returns information about a
           query handle. The information describes the simplifications
@@ -879,18 +847,18 @@ ok</pre>
 <input>io:format("~s~n", [qlc:info(QH, unique_all)]).</input>
 begin
     V1 =
-        qlc:q([ 
+        qlc:q([
                SQV ||
                    SQV &lt;- [x,y]
               ],
               [{unique,true}]),
     V2 =
-        qlc:q([ 
+        qlc:q([
                SQV ||
                    SQV &lt;- [a,b]
               ],
               [{unique,true}]),
-    qlc:q([ 
+    qlc:q([
            {X,Y} ||
                X &lt;- V1,
                Y &lt;- V2
@@ -913,19 +881,19 @@ end</pre>
 <input>io:format("~s~n", [qlc:info(Q)]).</input>
 begin
     V1 =
-        qlc:q([ 
+        qlc:q([
                P0 ||
                    P0 = {W,Y} &lt;- ets:table(17)
               ]),
     V2 =
-        qlc:q([ 
+        qlc:q([
                [G1|G2] ||
                    G2 &lt;- V1,
                    G1 &lt;- ets:table(16),
                    element(2, G1) =:= element(1, G2)
               ],
               [{join,lookup}]),
-    qlc:q([ 
+    qlc:q([
            {X,Z,W} ||
                [{X,Z}|{W,Y}] &lt;- V2
           ])
@@ -936,44 +904,43 @@ end</pre>
           method chosen. A convention is used for lookup join: the
           first generator (<c>G2</c>) is the one traversed, the second
           one (<c>G1</c>) is the table where constants are looked up.</p>
+
+        <p><c>info(<anno>QH</anno>)</c> is equivalent to
+          <c>info(<anno>QH</anno>, [])</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>keysort(KeyPos, QH1 [, SortOptions]) -> QH2</name>
+      <name name="keysort" arity="2"/>
+      <name name="keysort" arity="3"/>
       <fsummary>Return a query handle.</fsummary>
-      <type>
-        <v>QH1 = QueryHandleOrList</v>
-        <v>QH2 = QueryHandle</v>
-      </type>
       <desc>
         <p>Returns a query handle. When evaluating the query handle
-          <c>QH2</c> the answers to the query handle <c>QH1</c> are
-          sorted by <seealso
+          <c><anno>QH2</anno></c> the answers to the query handle
+          <c><anno>QH1</anno></c> are sorted by <seealso
           marker="file_sorter">file_sorter:keysort/4</seealso>
           according to the options.</p>
 
-        <p>The sorter will use temporary files only if <c>QH1</c> does
-          not evaluate to a list and the size of the binary
-          representation of the answers exceeds <c>Size</c> bytes,
-          where <c>Size</c> is the value of the <c>size</c> option.</p>
+        <p>The sorter will use temporary files only if
+          <c><anno>QH1</anno></c> does not evaluate to a list and the
+          size of the binary representation of the answers exceeds
+          <c>Size</c> bytes, where <c>Size</c> is the value of the
+          <c>size</c> option.</p>
+
+        <p><c>keysort(<anno>KeyPos</anno>, <anno>QH1</anno>)</c>
+          is equivalent to
+          <c>keysort(<anno>KeyPos</anno>, <anno>QH1</anno>, [])</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>next_answers(QueryCursor [, NumberOfAnswers]) ->  
-            Answers | Error</name>
+      <name name="next_answers" arity="1"/>
+      <name name="next_answers" arity="2"/>
       <fsummary>Return some or all answers to a query.</fsummary>
-      <type>
-        <v>NumberOfAnswers = all_remaining | int() > 0</v>
-        <v>Error = {error, module(), Reason}</v>
-        <v>Reason =&nbsp;-&nbsp;as returned by file_sorter(3)&nbsp;-</v>
-      </type>
       <desc>
         <p>Returns some or all of the remaining answers to a query
-          cursor. Only the owner of <c>Cursor</c> can retrieve
-          answers.</p>
-
+          cursor. Only the owner of <c><anno>QueryCursor</anno></c> can
+          retrieve answers.</p>
         <p>The optional argument <c>NumberOfAnswers</c>determines the
           maximum number of answers returned. The default value is
           <c>10</c>. If less than the requested number of answers is
@@ -983,21 +950,9 @@ end</pre>
     </func>
 
     <func>
-      <name>q(QueryListComprehension [, Options]) -> QueryHandle</name>
+      <name name="q" arity="1"/>
+      <name name="q" arity="2"/>
       <fsummary>Return a handle for a query list comprehension.</fsummary>
-      <type>
-        <v>QueryListComprehension =&nbsp;
-               -&nbsp;literal query listcomprehension&nbsp;-</v>
-        <v>Options = [Option] | Option</v>
-        <v>Option = {max_lookup, MaxLookup}
-                  | {cache, Cache} | cache
-                  | {join, Join}
-                  | {lookup, Lookup}
-                  | {unique, bool()} | unique</v>
-        <v>MaxLookup = int() >= 0 | infinity</v>
-        <v>Join = any | lookup | merge | nested_loop</v>
-        <v>Lookup = bool() | any</v>
-      </type>
       <desc>
         <p><marker id="q"></marker>Returns a query handle for a query
           list comprehension. The query list comprehension must be the
@@ -1024,7 +979,7 @@ end</pre>
 
         <pre>
 ...
-A = [X || {X} &lt;- [{1},{2}]], 
+A = [X || {X} &lt;- [{1},{2}]],
 QH = qlc:q(A),
 ...</pre>
 
@@ -1034,6 +989,9 @@ QH = qlc:q(A),
           list comprehension"); the shell process stops with a
           <c>badarg</c> reason.</p>
 
+        <p><c>q(<anno>QLC</anno>)</c> is equivalent to
+          <c>q(<anno>QLC</anno>, [])</c>.</p>
+
         <p>The <c>{cache,&nbsp;ets}</c> option can be used to cache
           the answers to a query list comprehension. The answers are
           stored in one ETS table for each cached query list
@@ -1092,26 +1050,26 @@ QH = qlc:q(A),
 <input>io:format("~s~n", [qlc:info(Q)]).</input>
 begin
     V1 =
-        qlc:q([ 
+        qlc:q([
                P0 ||
                    P0 = {X,Z} &lt;-
                        qlc:keysort(1, [{a,1},{b,4},{c,6}], [])
               ]),
     V2 =
-        qlc:q([ 
+        qlc:q([
                P0 ||
                    P0 = {W,Y} &lt;-
                        qlc:keysort(2, [{2,a},{3,b},{4,c}], [])
               ]),
     V3 =
-        qlc:q([ 
+        qlc:q([
                [G1|G2] ||
                    G1 &lt;- V1,
                    G2 &lt;- V2,
                    element(1, G1) == element(2, G2)
               ],
               [{join,merge},{cache,list}]),
-    qlc:q([ 
+    qlc:q([
            {A,X,Z,W} ||
                A &lt;- [a,b,c],
                [{X,Z}|{W,Y}] &lt;- V3,
@@ -1170,7 +1128,7 @@ ets:match_spec_run(
           elements of the key {X,&nbsp;Y} are compared separately.</p>
 
         <p>The <c>{lookup,&nbsp;true}</c> option can be used to ensure
-          that the <c>qlc</c> module will look up constants in some 
+          that the <c>qlc</c> module will look up constants in some
           QLC table. If there
           are more than one QLC table among the generators' list
           expressions, constants have to be looked up in at least one
@@ -1190,7 +1148,7 @@ ets:match_spec_run(
           <c>{join,&nbsp;nested_loop}</c> invokes the method of
           matching every pair of objects from two handles. The last
           method is mostly very slow. The evaluation of the query
-          fails if the <c>qlc</c> module cannot carry out the chosen 
+          fails if the <c>qlc</c> module cannot carry out the chosen
           join method. The
           default value is <c>any</c> which means that some fast join
           method will be used if possible.</p>
@@ -1198,47 +1156,33 @@ ets:match_spec_run(
     </func>
 
     <func>
-      <name>sort(QH1 [, SortOptions]) -> QH2</name>
+      <name name="sort" arity="1"/>
+      <name name="sort" arity="2"/>
       <fsummary>Return a query handle.</fsummary>
-      <type>
-        <v>QH1 = QueryHandleOrList</v>
-        <v>QH2 = QueryHandle</v>
-      </type>
       <desc>
         <p>Returns a query handle. When evaluating the query handle
-          <c>QH2</c> the answers to the query handle <c>QH1</c> are
-          sorted by <seealso
+          <c><anno>QH2</anno></c> the answers to the query handle
+          <c><anno>QH1</anno></c> are sorted by <seealso
           marker="file_sorter">file_sorter:sort/3</seealso> according
           to the options.</p>
 
-        <p>The sorter will use temporary files only if <c>QH1</c> does
-          not evaluate to a list and the size of the binary
-          representation of the answers exceeds <c>Size</c> bytes,
-          where <c>Size</c> is the value of the <c>size</c> option.</p>
+        <p>The sorter will use temporary files only if
+          <c><anno>QH1</anno></c> does not evaluate to a list and the
+          size of the binary representation of the answers exceeds
+          <c>Size</c> bytes, where <c>Size</c> is the value of the
+          <c>size</c> option.</p>
+
+        <p><c>sort(<anno>QH1</anno>)</c> is equivalent to
+          <c>sort(<anno>QH1</anno>, [])</c>.</p>
+
       </desc>
     </func>
 
     <func>
-      <name>string_to_handle(QueryString [, Options [, Bindings]]) ->
-            QueryHandle | Error</name>
+      <name name="string_to_handle" arity="1"/>
+      <name name="string_to_handle" arity="2"/>
+      <name name="string_to_handle" arity="3"/>
       <fsummary>Return a handle for a query list comprehension.</fsummary>
-      <type>
-        <v>QueryString = string()</v>
-        <v>Options = [Option] | Option</v>
-        <v>Option = {max_lookup, MaxLookup}
-                  | {cache, Cache} | cache
-                  | {join, Join}
-                  | {lookup, Lookup}
-                  | {unique, bool()} | unique</v>
-        <v>MaxLookup = int() >= 0 | infinity</v>
-        <v>Join = any | lookup | merge | nested_loop</v>
-        <v>Lookup = bool() | any</v>
-        <v>Bindings =&nbsp;-&nbsp;as returned by
-        erl_eval:bindings/1&nbsp;-</v>
-        <v>Error = {error, module(), Reason}</v>
-        <v>Reason = &nbsp;-&nbsp;ErrorInfo as returned by
-        erl_scan:string/1 or erl_parse:parse_exprs/1&nbsp;-</v>
-      </type>
       <desc>
         <p>A string version of <c>qlc:q/1,2</c>. When the query handle
           is evaluated the fun created by the parse transform is
@@ -1253,57 +1197,24 @@ ets:match_spec_run(
 <input>qlc:eval(QH).</input>
 [2,3,4]</pre>
 
+        <p><c>string_to_handle(<anno>QueryString</anno>)</c>
+          is equivalent to
+          <c>string_to_handle(<anno>QueryString</anno>, [])</c>.</p>
+
+        <p><c>string_to_handle(<anno>QueryString</anno>,
+          <anno>Options</anno>)</c>
+          is equivalent to
+          <c>string_to_handle(<anno>QueryString</anno>,
+          <anno>Options</anno>, erl_eval:new_bindings())</c>.</p>
+
         <p>This function is probably useful mostly when called from
           outside of Erlang, for instance from a driver written in C.</p>
       </desc>
     </func>
 
     <func>
-      <name>table(TraverseFun, Options) -> QueryHandle</name>
+      <name name="table" arity="2"/>
       <fsummary>Return a query handle for a table.</fsummary>
-      <type>
-        <v>TraverseFun = TraverseFun0 | TraverseFun1</v>
-        <v>TraverseFun0 = fun() -> TraverseResult</v>
-        <v>TraverseFun1 = fun(MatchExpression) -> TraverseResult</v>
-        <v>TraverseResult = Objects | term()</v>
-        <v>Objects = [] | [term() | ObjectList]</v>
-        <v>ObjectList = TraverseFun0 | Objects</v>
-        <v>Options = [Option] | Option</v>
-        <v>Option = {format_fun, FormatFun}
-                  | {info_fun, InfoFun}
-                  | {lookup_fun, LookupFun}
-                  | {parent_fun, ParentFun}
-                  | {post_fun, PostFun}
-                  | {pre_fun, PreFun}
-                  | {key_equality, KeyComparison}</v>
-        <v>FormatFun = undefined  | fun(SelectedObjects) -> FormatedTable</v>
-        <v>SelectedObjects = all
-                           | {all, NElements, DepthFun}
-                           | {match_spec, MatchExpression}
-                           | {lookup, Position, Keys}
-                           | {lookup, Position, Keys, NElements, DepthFun}</v>
-        <v>NElements = infinity | int() > 0</v>
-        <v>DepthFun = fun(term()) -> term()</v>
-        <v>FormatedTable = {Mod, Fun, Args}
-                         | AbstractExpression
-                         | character_list()</v>
-        <v>InfoFun = undefined  | fun(InfoTag) -> InfoValue</v>
-        <v>InfoTag = indices | is_unique_objects | keypos | num_of_objects</v>
-        <v>InfoValue = undefined  | term()</v>
-        <v>LookupFun = undefined  | fun(Position, Keys) -> LookupResult</v>
-        <v>LookupResult = [term()] | term()</v>
-        <v>ParentFun = undefined  | fun() -> ParentFunValue</v>
-        <v>PostFun = undefined  | fun() -> void()</v>
-        <v>PreFun = undefined  | fun([PreArg]) -> void()</v>
-        <v>PreArg = {parent_value, ParentFunValue}  | {stop_fun, StopFun}</v>
-        <v>ParentFunValue = undefined  | term()</v>
-        <v>StopFun = undefined  | fun() -> void()</v>
-        <v>KeyComparison = '=:=' | '=='</v>
-        <v>Position = int() > 0</v>
-        <v>Keys = [term()]</v>
-        <v>Mod = Fun = atom()</v>
-        <v>Args = [term()]</v>
-      </type>
       <desc>
         <p><marker id="table"></marker>Returns a query handle for a
           QLC table. In Erlang/OTP there is support for ETS, Dets and
@@ -1315,77 +1226,90 @@ ets:match_spec_run(
           as well as properties of the table are handled by callback
           functions provided as options to <c>qlc:table/2</c>.</p>
 
-        <p>The callback function <c>TraverseFun</c> is used for
-          traversing the table. It is to return a list of objects
-          terminated by either <c>[]</c> or a nullary fun to be used
-          for traversing the not yet traversed objects of the table.
-          Any other return value is immediately returned as value of
-          the query evaluation. Unary <c>TraverseFun</c>s are to
-          accept a match specification as argument. The match
-          specification is created by the parse transform by analyzing
-          the pattern of the generator calling <c>qlc:table/2</c> and
-          filters using variables introduced in the pattern. If the
-          parse transform cannot find a match specification equivalent
-          to the pattern and filters, <c>TraverseFun</c> will be
-          called with a match specification returning every object.
-          Modules that can utilize match specifications for optimized
+        <p>The callback function <c><anno>TraverseFun</anno></c> is
+          used for traversing the table. It is to return a list of
+          objects terminated by either <c>[]</c> or a nullary fun to
+          be used for traversing the not yet traversed objects of the
+          table. Any other return value is immediately returned as
+          value of the query evaluation. Unary
+          <c><anno>TraverseFun</anno></c>s are to accept a match
+          specification as argument. The match specification is
+          created by the parse transform by analyzing the pattern of
+          the generator calling <c>qlc:table/2</c> and filters using
+          variables introduced in the pattern. If the parse transform
+          cannot find a match specification equivalent to the pattern
+          and filters, <c><anno>TraverseFun</anno></c> will be called
+          with a match specification returning every object. Modules
+          that can utilize match specifications for optimized
           traversal of tables should call <c>qlc:table/2</c> with a
-          unary <c>TraverseFun</c> while other modules can provide a
-          nullary <c>TraverseFun</c>. <c>ets:table/2</c> is an example
-          of the former; <c>gb_table:table/1</c> in the <seealso
-          marker="#implementing_a_qlc_table">Implementing a QLC
-          table</seealso> section is an example of the latter.</p>
-
-        <p><c>PreFun</c> is a unary callback function that is called
-          once before the table is read for the first time. If the
-          call fails, the query evaluation fails. Similarly, the
-          nullary callback function <c>PostFun</c> is called once
-          after the table was last read. The return value, which is
-          caught, is ignored. If <c>PreFun</c> has been called for a
-          table, <c>PostFun</c> is guaranteed to be called for that
-          table, even if the evaluation of the query fails for some
-          reason. The order in which pre (post) functions for
+          unary
+          <c><anno>TraverseFun</anno></c> while other modules can
+          provide a nullary
+          <c><anno>TraverseFun</anno></c>. <c>ets:table/2</c> is an
+          example of the former; <c>gb_table:table/1</c> in the
+          <seealso marker="#implementing_a_qlc_table">Implementing a
+          QLC table</seealso> section is an example of the latter.</p>
+
+        <p><c><anno>PreFun</anno></c> is a unary callback function
+          that is called once before the table is read for the first
+          time. If the call fails, the query evaluation fails.
+          Similarly, the nullary callback function
+          <c><anno>PostFun</anno></c> is called once after the table
+          was last read. The return value, which is caught, is
+          ignored. If <c><anno>PreFun</anno></c> has been called for a
+          table,
+          <c><anno>PostFun</anno></c> is guaranteed to be called for
+          that table, even if the evaluation of the query fails for
+          some reason. The order in which pre (post) functions for
           different tables are evaluated is not specified. Other table
-          access than reading, such as calling <c>InfoFun</c>, is
-          assumed to be OK at any time. The argument <c>PreArgs</c> is
-          a list of tagged values. Currently there are two tags,
+          access than reading, such as calling
+          <c><anno>InfoFun</anno></c>, is assumed to be OK at any
+          time. The argument <c><anno>PreArgs</anno></c> is a list of
+          tagged values. Currently there are two tags,
           <c>parent_value</c> and <c>stop_fun</c>, used by Mnesia for
           managing transactions. The value of <c>parent_value</c> is
-          the value returned by <c>ParentFun</c>, or <c>undefined</c>
-          if there is no <c>ParentFun</c>. <c>ParentFun</c> is called
-          once just before the call of <c>PreFun</c> in the context of
-          the process calling <c>eval</c>, <c>fold</c>, or
+          the value returned by <c><anno>ParentFun</anno></c>, or
+          <c>undefined</c> if there is no <c>ParentFun</c>.
+          <c><anno>ParentFun</anno></c> is called once just before the
+          call of
+          <c><anno>PreFun</anno></c> in the context of the process
+          calling
+          <c>eval</c>, <c>fold</c>, or
           <c>cursor</c>. The value of <c>stop_fun</c> is a nullary fun
           that deletes the cursor if called from the parent, or
           <c>undefined</c> if there is no cursor.</p>
 
         <p><marker id="lookup_fun"></marker>The binary callback
-          function <c>LookupFun</c> is used for looking up objects in
-          the table. The first argument <c>Position</c> is the key
-          position or an indexed position and the second argument
-          <c>Keys</c> is a sorted list of unique values. The return
-          value is to be a list of all objects (tuples) such that the
-          element at <c>Position</c> is a member of <c>Keys</c>. Any
-          other return value is immediately returned as value of the
-          query evaluation. <c>LookupFun</c> is called instead of
+          function <c><anno>LookupFun</anno></c> is used for looking
+          up objects in the table. The first argument
+          <c><anno>Position</anno></c> is the key position or an
+          indexed position and the second argument
+          <c><anno>Keys</anno></c> is a sorted list of unique values.
+          The return value is to be a list of all objects (tuples)
+          such that the element at <c>Position</c> is a member of
+          <c><anno>Keys</anno></c>. Any other return value is
+          immediately returned as value of the query evaluation.
+          <c><anno>LookupFun</anno></c> is called instead of
           traversing the table if the parse transform at compile time
           can find out that the filters match and compare the element
-          at <c>Position</c> in such a way that only <c>Keys</c> need
-          to be looked up in order to find all potential answers. The
-          key position is obtained by calling <c>InfoFun(keypos)</c>
-          and the indexed positions by calling
-          <c>InfoFun(indices)</c>. If the key position can be used for
-          lookup it is always chosen, otherwise the indexed position
-          requiring the least number of lookups is chosen. If there is
-          a tie between two indexed positions the one occurring first
-          in the list returned by <c>InfoFun</c> is chosen. Positions
-          requiring more than <seealso
-          marker="#max_lookup">max_lookup</seealso> lookups are
-          ignored.</p>
-
-        <p>The unary callback function <c>InfoFun</c> is to return
-          information about the table. <c>undefined</c> should be
-          returned if the value of some tag is unknown:</p>
+          at <c><anno>Position</anno></c> in such a way that only
+          <c><anno>Keys</anno></c> need to be looked up in order to
+          find all potential answers. The key position is obtained by
+          calling
+          <c><anno>InfoFun</anno>(keypos)</c> and the indexed
+          positions by calling
+          <c><anno>InfoFun</anno>(indices)</c>. If the key position
+          can be used for lookup it is always chosen, otherwise the
+          indexed position requiring the least number of lookups is
+          chosen. If there is a tie between two indexed positions the
+          one occurring first in the list returned by
+          <c><anno>InfoFun</anno></c> is chosen. Positions requiring
+          more than <seealso marker="#max_lookup">max_lookup</seealso>
+          lookups are ignored.</p>
+
+        <p>The unary callback function <c><anno>InfoFun</anno></c> is
+          to return information about the table. <c>undefined</c>
+          should be returned if the value of some tag is unknown:</p>
 
         <list type="bulleted">
           <item><c>indices</c>. Returns a list of indexed
@@ -1406,20 +1330,22 @@ ets:match_spec_run(
           </item>
         </list>
 
-        <p>The unary callback function <c>FormatFun</c> is used by
-          <seealso marker="#info">qlc:info/1,2</seealso> for
-          displaying the call that created the table's query handle.
-          The default value, <c>undefined</c>, means that
+        <p>The unary callback function <c><anno>FormatFun</anno></c>
+          is used by <seealso marker="#info">qlc:info/1,2</seealso>
+          for displaying the call that created the table's query
+          handle. The default value, <c>undefined</c>, means that
           <c>info/1,2</c> displays a call to <c>'$MOD':'$FUN'/0</c>.
-          It is up to <c>FormatFun</c> to present the selected objects
-          of the table in a suitable way. However, if a character list
-          is chosen for presentation it must be an Erlang expression
-          that can be scanned and parsed (a trailing dot will be added
-          by <c>qlc:info</c> though). <c>FormatFun</c> is called with
-          an argument that describes the selected objects based on
-          optimizations done as a result of analyzing the filters of
-          the QLC where the call to <c>qlc:table/2</c> occurs. The
-          possible values of the argument are:</p>
+          It is up to <c><anno>FormatFun</anno></c> to present the
+          selected objects of the table in a suitable way. However, if
+          a character list is chosen for presentation it must be an
+          Erlang expression that can be scanned and parsed (a trailing
+          dot will be added by <c>qlc:info</c> though).
+          <c><anno>FormatFun</anno></c> is called with an argument
+          that describes the selected objects based on optimizations
+          done as a result of analyzing the filters of the QLC where
+          the call to
+          <c>qlc:table/2</c> occurs. The possible values of the
+          argument are:</p>
 
         <list type="bulleted">
           <item><c>{lookup, Position, Keys, NElements, DepthFun}</c>.
@@ -1443,10 +1369,12 @@ ets:match_spec_run(
           can be used for limiting the size of terms; calling
           <c>DepthFun(Term)</c> substitutes <c>'...'</c> for parts of
           <c>Term</c> below the depth specified by the <c>info/1,2</c>
-          option <c>depth</c>. If calling <c>FormatFun</c> with an
-          argument including <c>NElements</c> and <c>DepthFun</c>
-          fails, <c>FormatFun</c> is called once again with an
-          argument excluding <c>NElements</c> and <c>DepthFun</c>
+          option <c>depth</c>. If calling
+          <c><anno>FormatFun</anno></c> with an argument including
+          <c>NElements</c> and <c>DepthFun</c> fails,
+          <c><anno>FormatFun</anno></c> is called once again with an
+          argument excluding
+          <c>NElements</c> and <c>DepthFun</c>
           (<c>{lookup,&nbsp;Position,&nbsp;Keys}</c> or
           <c>all</c>).</p>
 
@@ -1458,7 +1386,7 @@ ets:match_spec_run(
 
         <p>See <seealso marker="ets#qlc_table">ets(3)</seealso>,
           <seealso marker="dets#qlc_table">dets(3)</seealso> and
-          <seealso marker="mnesia:mnesia#qlc_table">mnesia(3)</seealso> 
+          <seealso marker="mnesia:mnesia#qlc_table">mnesia(3)</seealso>
           for the various options recognized by <c>table/1,2</c> in
           respective module.</p>
       </desc>
@@ -1472,12 +1400,12 @@ ets:match_spec_run(
       <seealso marker="doc/reference_manual:users_guide">
            Erlang Reference Manual</seealso>,
       <seealso marker="erl_eval">erl_eval(3)</seealso>,
-      <seealso marker="erts:erlang">erlang(3)</seealso>, 
+      <seealso marker="erts:erlang">erlang(3)</seealso>,
       <seealso marker="ets">ets(3)</seealso>,
-      <seealso marker="kernel:file">file(3)</seealso>, 
-      <seealso marker="error_logger:file">error_logger(3)</seealso>, 
+      <seealso marker="kernel:file">file(3)</seealso>,
+      <seealso marker="error_logger:file">error_logger(3)</seealso>,
       <seealso marker="file_sorter">file_sorter(3)</seealso>,
-      <seealso marker="mnesia:mnesia">mnesia(3)</seealso>, 
+      <seealso marker="mnesia:mnesia">mnesia(3)</seealso>,
       <seealso marker="doc/programming_examples:users_guide">
            Programming Examples</seealso>,
       <seealso marker="shell">shell(3)</seealso></p>
diff --git a/lib/stdlib/doc/src/queue.xml b/lib/stdlib/doc/src/queue.xml
index 5ada1c2c57..383f52d10d 100644
--- a/lib/stdlib/doc/src/queue.xml
+++ b/lib/stdlib/doc/src/queue.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -88,122 +88,94 @@
     <title>Original API</title>
   </section>
 
+  <datatypes>
+    <datatype>
+      <name><marker id="type-queue">queue()</marker></name>
+      <desc><p>As returned by <c>new/0</c>.</p></desc>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
-      <name>new() -> Q</name>
+      <name name="new" arity="0"/>
       <fsummary>Create an empty queue</fsummary>
-      <type>
-        <v>Q = queue()</v>
-      </type>
       <desc>
         <p>Returns an empty queue.</p>
       </desc>
     </func>
     <func>
-      <name>is_queue(Term) -> true | false</name>
+      <name name="is_queue" arity="1"/>
       <fsummary>Test if a term is a queue</fsummary>
-      <type>
-        <v>Term = term()</v>
-      </type>
       <desc>
-        <p>Tests if <c>Q</c> is a queue and returns <c>true</c> if so and
+        <p>Tests if <c><anno>Term</anno></c> is a queue and returns <c>true</c> if so and
           <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>is_empty(Q) -> true | false</name>
+      <name name="is_empty" arity="1"/>
       <fsummary>Test if a queue is empty</fsummary>
-      <type>
-        <v>Q = queue()</v>
-      </type>
       <desc>
-        <p>Tests if <c>Q</c> is empty and returns <c>true</c> if so and
+        <p>Tests if <c><anno>Q</anno></c> is empty and returns <c>true</c> if so and
           <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>len(Q) -> N</name>
+      <name name="len" arity="1"/>
       <fsummary>Get the length of a queue</fsummary>
-      <type>
-        <v>Q = queue()</v>
-        <v>N = integer()</v>
-      </type>
       <desc>
-        <p>Calculates and returns the length of queue <c>Q</c>.</p>
+        <p>Calculates and returns the length of queue <c><anno>Q</anno></c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>in(Item, Q1) -> Q2</name>
+      <name name="in" arity="2"/>
       <fsummary>Insert an item at the rear of a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Inserts <c>Item</c> at the rear of queue <c>Q1</c>.
-          Returns the resulting queue <c>Q2</c>.</p>
+        <p>Inserts <c><anno>Item</anno></c> at the rear of queue <c><anno>Q1</anno></c>.
+          Returns the resulting queue <c><anno>Q2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>in_r(Item, Q1) -> Q2</name>
+      <name name="in_r" arity="2"/>
       <fsummary>Insert an item at the front of a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Inserts <c>Item</c> at the front of queue <c>Q1</c>.
-          Returns the resulting queue <c>Q2</c>.</p>
+        <p>Inserts <c><anno>Item</anno></c> at the front of queue <c><anno>Q1</anno></c>.
+          Returns the resulting queue <c><anno>Q2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>out(Q1) -> Result</name>
+      <name name="out" arity="1"/>
       <fsummary>Remove the front item from a queue</fsummary>
-      <type>
-        <v>Result = {{value, Item}, Q2} | {empty, Q1}</v>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Removes the item at the front of queue <c>Q1</c>. Returns the
-          tuple <c>{{value, Item}, Q2}</c>, where <c>Item</c> is the
-          item removed and <c>Q2</c> is the resulting queue. If <c>Q1</c> is
-          empty, the tuple <c>{empty, Q1}</c> is returned.</p>
+        <p>Removes the item at the front of queue <c><anno>Q1</anno></c>. Returns the
+          tuple <c>{{value, <anno>Item</anno>}, <anno>Q2</anno>}</c>, where <c><anno>Item</anno></c> is the
+          item removed and <c><anno>Q2</anno></c> is the resulting queue. If <c><anno>Q1</anno></c> is
+          empty, the tuple <c>{empty, <anno>Q1</anno>}</c> is returned.</p>
       </desc>
     </func>
     <func>
-      <name>out_r(Q1) -> Result</name>
+      <name name="out_r" arity="1"/>
       <fsummary>Remove the rear item from a queue</fsummary>
-      <type>
-        <v>Result = {{value, Item}, Q2} | {empty, Q1}</v>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Removes the item at the rear of the queue <c>Q1</c>. Returns the
-          tuple <c>{{value, Item}, Q2}</c>, where <c>Item</c> is the 
-          item removed and <c>Q2</c> is the new queue. If <c>Q1</c> is
-          empty, the tuple <c>{empty, Q1}</c> is returned.  </p>
+        <p>Removes the item at the rear of the queue <c><anno>Q1</anno></c>. Returns the
+          tuple <c>{{value, <anno>Item</anno>}, <anno>Q2</anno>}</c>, where <c><anno>Item</anno></c> is the
+          item removed and <c><anno>Q2</anno></c> is the new queue. If <c><anno>Q1</anno></c> is
+          empty, the tuple <c>{empty, <anno>Q1</anno>}</c> is returned.  </p>
       </desc>
     </func>
 
     <func>
-      <name>from_list(L) -> queue()</name>
+      <name name="from_list" arity="1"/>
       <fsummary>Convert a list to a queue</fsummary>
-      <type>
-        <v>L = list()</v>
-      </type>
       <desc>
-        <p>Returns a queue containing the items in <c>L</c> in the
+        <p>Returns a queue containing the items in <c><anno>L</anno></c> in the
           same order; the head item of the list will become the front
           item of the queue.</p>
       </desc>
     </func>
     <func>
-      <name>to_list(Q) -> list()</name>
+      <name name="to_list" arity="1"/>
       <fsummary>Convert a queue to a list</fsummary>
-      <type>
-        <v>Q = queue()</v>
-      </type>
       <desc>
         <p>Returns a list of the items in the queue in the same order;
           the front item of the queue will become the head of the list.</p>
@@ -211,57 +183,43 @@
     </func>
 
     <func>
-      <name>reverse(Q1) -> Q2</name>
+      <name name="reverse" arity="1"/>
       <fsummary>Reverse a queue</fsummary>
-      <type>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Returns a queue <c>Q2</c> that contains the items of
-          <c>Q1</c> in the reverse order.</p>
+        <p>Returns a queue <c><anno>Q2</anno></c> that contains the items of
+          <c><anno>Q1</anno></c> in the reverse order.</p>
       </desc>
     </func>
     <func>
-      <name>split(N, Q1) -> {Q2,Q3}</name>
+      <name name="split" arity="2"/>
       <fsummary>Split a queue in two</fsummary>
-      <type>
-        <v>N = integer()</v>
-        <v>Q1 = Q2 = Q3 = queue()</v>
-      </type>
       <desc>
-        <p>Splits <c>Q1</c> in two. The <c>N</c> front items
-          are put in <c>Q2</c> and the rest in <c>Q3</c></p>
+        <p>Splits <c><anno>Q1</anno></c> in two. The <c><anno>N</anno></c> front items
+          are put in <c><anno>Q2</anno></c> and the rest in <c><anno>Q3</anno></c></p>
       </desc>
     </func>
     <func>
-      <name>join(Q1, Q2) -> Q3</name>
+      <name name="join" arity="2"/>
       <fsummary>Join two queues</fsummary>
-      <type>
-        <v>Q1 = Q2 = Q3 = queue()</v>
-      </type>
       <desc>
-        <p>Returns a queue <c>Q3</c> that is the result of joining
-          <c>Q1</c> and <c>Q2</c> with <c>Q1</c> in front of
-          <c>Q2</c>.</p>
+        <p>Returns a queue <c><anno>Q3</anno></c> that is the result of joining
+          <c><anno>Q1</anno></c> and <c><anno>Q2</anno></c> with <c><anno>Q1</anno></c> in front of
+          <c><anno>Q2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>filter(Fun, Q1) -> Q2</name>
+      <name name="filter" arity="2"/>
       <fsummary>Filter a queue</fsummary>
-      <type>
-        <v>Fun = fun(Item) -> bool() | list()</v>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Returns a queue <c>Q2</c> that is the result of calling
-          <c>Fun(Item)</c> on all items in <c>Q1</c>,
+        <p>Returns a queue <c><anno>Q2</anno></c> that is the result of calling
+          <c><anno>Fun</anno>(<anno>Item</anno>)</c> on all items in <c><anno>Q1</anno></c>,
           in order from front to rear.</p>
-        <p>If <c>Fun(Item)</c> returns <c>true</c>, <c>Item</c>
+        <p>If <c><anno>Fun</anno>(<anno>Item</anno>)</c> returns <c>true</c>, <c>Item</c>
           is copied to the result queue. If it returns <c>false</c>,
-          <c>Item</c> is not copied. If it returns a list
+          <c><anno>Item</anno></c> is not copied. If it returns a list
           the list elements are inserted instead of <c>Item</c> in the
           result queue.</p>
-        <p>So, <c>Fun(Item)</c> returning <c>[Item]</c> is thereby
+        <p>So, <c><anno>Fun</anno>(<anno>Item</anno>)</c> returning <c>[<anno>Item</anno>]</c> is thereby
           semantically equivalent to returning <c>true</c>, just
           as returning <c>[]</c> is semantically equivalent to
           returning <c>false</c>. But returning a list builds
@@ -269,15 +227,11 @@
       </desc>
     </func>
     <func>
-      <name>member(Item, Q) -> bool()</name>
+      <name name="member" arity="2"/>
       <fsummary>Test if an item is in a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q = queue()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Item</c> matches some element
-          in <c>Q</c>, otherwise <c>false</c>.</p>
+        <p>Returns <c>true</c> if <c><anno>Item</anno></c> matches some element
+          in <c><anno>Q</anno></c>, otherwise <c>false</c>.</p>
       </desc>
     </func>
   </funcs>
@@ -290,77 +244,53 @@
 
   <funcs>
     <func>
-      <name>get(Q) -> Item</name>
+      <name name="get" arity="1"/>
       <fsummary>Return the front item of a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q = queue()</v>
-      </type>
       <desc>
-        <p>Returns <c>Item</c> at the front of queue <c>Q</c>.</p>
-        <p>Fails with reason <c>empty</c> if <c>Q</c> is empty.</p>
+        <p>Returns <c><anno>Item</anno></c> at the front of queue <c><anno>Q</anno></c>.</p>
+        <p>Fails with reason <c>empty</c> if <c><anno>Q</anno></c> is empty.</p>
       </desc>
     </func>
     <func>
-      <name>get_r(Q) -> Item</name>
+      <name name="get_r" arity="1"/>
       <fsummary>Return the rear item of a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q = queue()</v>
-      </type>
       <desc>
-        <p>Returns <c>Item</c> at the rear of queue <c>Q</c>.</p>
-        <p>Fails with reason <c>empty</c> if <c>Q</c> is empty.</p>
+        <p>Returns <c><anno>Item</anno></c> at the rear of queue <c><anno>Q</anno></c>.</p>
+        <p>Fails with reason <c>empty</c> if <c><anno>Q</anno></c> is empty.</p>
       </desc>
     </func>
     <func>
-      <name>drop(Q1) -> Q2</name>
+      <name name="drop" arity="1"/>
       <fsummary>Remove the front item from a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Returns a queue <c>Q2</c> that is the result of removing
-          the front item from <c>Q1</c>.</p>
-        <p>Fails with reason <c>empty</c> if <c>Q1</c> is empty.</p>
+        <p>Returns a queue <c><anno>Q2</anno></c> that is the result of removing
+          the front item from <c><anno>Q1</anno></c>.</p>
+        <p>Fails with reason <c>empty</c> if <c><anno>Q1</anno></c> is empty.</p>
       </desc>
     </func>
     <func>
-      <name>drop_r(Q1) -> Q2</name>
+      <name name="drop_r" arity="1"/>
       <fsummary>Remove the rear item from a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Returns a queue <c>Q2</c> that is the result of removing
-          the rear item from <c>Q1</c>.</p>
-        <p>Fails with reason <c>empty</c> if <c>Q1</c> is empty.</p>
+        <p>Returns a queue <c><anno>Q2</anno></c> that is the result of removing
+          the rear item from <c><anno>Q1</anno></c>.</p>
+        <p>Fails with reason <c>empty</c> if <c><anno>Q1</anno></c> is empty.</p>
       </desc>
     </func>
     <func>
-      <name>peek(Q) -> {value,Item} | empty</name>
+      <name name="peek" arity="1"/>
       <fsummary>Return the front item of a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q = queue()</v>
-      </type>
       <desc>
-        <p>Returns the tuple <c>{value, Item}</c> where <c>Item</c> is the
-          front item of <c>Q</c>, or <c>empty</c> if <c>Q1</c> is empty.</p>
+        <p>Returns the tuple <c>{value, <anno>Item</anno>}</c> where <c><anno>Item</anno></c> is the
+          front item of <c><anno>Q</anno></c>, or <c>empty</c> if <c><anno>Q</anno></c> is empty.</p>
       </desc>
     </func>
     <func>
-      <name>peek_r(Q) -> {value,Item} | empty</name>
+      <name name="peek_r" arity="1"/>
       <fsummary>Return the rear item of a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q = queue()</v>
-      </type>
       <desc>
-        <p>Returns the tuple <c>{value, Item}</c> where <c>Item</c> is the
-          rear item of <c>Q</c>, or <c>empty</c> if <c>Q1</c> is empty.</p>
+        <p>Returns the tuple <c>{value, <anno>Item</anno>}</c> where <c><anno>Item</anno></c> is the
+          rear item of <c><anno>Q</anno></c>, or <c>empty</c> if <c><anno>Q</anno></c> is empty.</p>
       </desc>
     </func>
   </funcs>
@@ -372,80 +302,56 @@
 
   <funcs>
     <func>
-      <name>cons(Item, Q1) -> Q2</name>
+      <name name="cons" arity="2"/>
       <fsummary>Insert an item at the head of a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Inserts <c>Item</c> at the head of queue <c>Q1</c>. Returns
-          the new queue <c>Q2</c>.</p>
+        <p>Inserts <c><anno>Item</anno></c> at the head of queue <c><anno>Q1</anno></c>. Returns
+          the new queue <c><anno>Q2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>head(Q) -> Item</name>
+      <name name="head" arity="1"/>
       <fsummary>Return the item at the head of a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q = queue()</v>
-      </type>
       <desc>
-        <p>Returns <c>Item</c> from the head of queue <c>Q</c>.</p>
-        <p>Fails with reason <c>empty</c> if <c>Q</c> is empty.</p>
+        <p>Returns <c><anno>Item</anno></c> from the head of queue <c><anno>Q</anno></c>.</p>
+        <p>Fails with reason <c>empty</c> if <c><anno>Q</anno></c> is empty.</p>
       </desc>
     </func>
     <func>
-      <name>tail(Q1) -> Q2</name>
+      <name name="tail" arity="1"/>
       <fsummary>Remove the head item from a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Returns a queue <c>Q2</c> that is the result of removing
-          the head item from <c>Q1</c>.</p>
-        <p>Fails with reason <c>empty</c> if <c>Q1</c> is empty.</p>
+        <p>Returns a queue <c><anno>Q2</anno></c> that is the result of removing
+          the head item from <c><anno>Q1</anno></c>.</p>
+        <p>Fails with reason <c>empty</c> if <c><anno>Q1</anno></c> is empty.</p>
       </desc>
     </func>
     <func>
-      <name>snoc(Q1, Item) -> Q2</name>
+      <name name="snoc" arity="2"/>
       <fsummary>Insert an item at the tail of a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Inserts <c>Item</c> as the tail item of queue <c>Q1</c>. Returns
-          the new queue <c>Q2</c>.</p>
+        <p>Inserts <c><anno>Item</anno></c> as the tail item of queue <c><anno>Q1</anno></c>. Returns
+          the new queue <c><anno>Q2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>daeh(Q) -> Item</name>
-      <name>last(Q) -> Item</name>
+      <name name="daeh" arity="1"/>
+      <name name="last" arity="1"/>
       <fsummary>Return the tail item of a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q = queue()</v>
-      </type>
       <desc>
-        <p>Returns the tail item of queue <c>Q</c>.</p>
-        <p>Fails with reason <c>empty</c> if <c>Q</c> is empty.</p>
+        <p>Returns the tail item of queue <c><anno>Q</anno></c>.</p>
+        <p>Fails with reason <c>empty</c> if <c><anno>Q</anno></c> is empty.</p>
       </desc>
     </func>
     <func>
-      <name>liat(Q1) -> Q2</name>
-      <name>init(Q1) -> Q2</name>
-      <name>lait(Q1) -> Q2</name>
+      <name name="liat" arity="1"/>
+      <name name="init" arity="1"/>
+      <name name="lait" arity="1"/>
       <fsummary>Remove the tail item from a queue</fsummary>
-      <type>
-        <v>Item = term()</v>
-        <v>Q1 = Q2 = queue()</v>
-      </type>
       <desc>
-        <p>Returns a queue <c>Q2</c> that is the result of removing
-          the tail item from <c>Q1</c>.</p>
-        <p>Fails with reason <c>empty</c> if <c>Q1</c> is empty.</p>
+        <p>Returns a queue <c><anno>Q2</anno></c> that is the result of removing
+          the tail item from <c><anno>Q1</anno></c>.</p>
+        <p>Fails with reason <c>empty</c> if <c><anno>Q1</anno></c> is empty.</p>
         <p>The name <c>lait/1</c> is a misspelling - do not use it anymore.</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml
index dcc6d756e1..93affc3191 100644
--- a/lib/stdlib/doc/src/random.xml
+++ b/lib/stdlib/doc/src/random.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -49,9 +49,15 @@
       strong. If a strong cryptographic random number generator is needed for
       example <c>crypto:rand_bytes/1</c> could be used instead.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="ran"/>
+      <desc><p>The state.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>seed() -> ran()</name>
+      <name name="seed" arity="0"/>
       <fsummary>Seeds random number generation with default values</fsummary>
       <desc>
         <p>Seeds random number generation with default (fixed) values
@@ -59,11 +65,8 @@
       </desc>
     </func>
    <func>
-      <name>seed(A1, A2, A3) -> undefined | ran()</name>
+      <name name="seed" arity="3"/>
       <fsummary>Seeds random number generator</fsummary>
-      <type>
-        <v>A1 = A2 = A3 = integer()</v>
-      </type>
       <desc>
         <p>Seeds random number generation with integer values in the process
           dictionary, and returns the old state.</p>
@@ -76,26 +79,23 @@
       </desc>
     </func>
     <func>
-      <name>seed({A1, A2, A3}) -> undefined | ran()</name>
+      <name name="seed" arity="1"/>
       <fsummary>Seeds random number generator</fsummary>
-      <type>
-        <v>A1 = A2 = A3 = integer()</v>
-      </type>
       <desc>
         <p>
-	<c>seed({A1, A2, A3})</c> is equivalent to <c>seed(A1, A2, A3)</c>.
+	<c>seed({<anno>A1</anno>, <anno>A2</anno>, <anno>A3</anno>})</c> is equivalent to <c>seed(<anno>A1</anno>, <anno>A2</anno>, <anno>A3</anno>)</c>.
 	</p>
       </desc>
     </func>
     <func>
-      <name>seed0() -> ran()</name>
+      <name name="seed0" arity="0"/>
       <fsummary>Return default state for random number generation</fsummary>
       <desc>
         <p>Returns the default state.</p>
       </desc>
     </func>
     <func>
-      <name>uniform()-> float()</name>
+      <name name="uniform" arity="0"/>
       <fsummary>Return a random float</fsummary>
       <desc>
         <p>Returns a random float uniformly distributed between <c>0.0</c>
@@ -103,39 +103,29 @@
       </desc>
     </func>
     <func>
-      <name>uniform(N) -> integer()</name>
+      <name name="uniform" arity="1"/>
       <fsummary>Return a random integer</fsummary>
-      <type>
-        <v>N = integer()</v>
-      </type>
       <desc>
-        <p>Given an integer <c>N >= 1</c>, <c>uniform/1</c> returns a
+        <p>Given an integer <c><anno>N</anno> >= 1</c>, <c>uniform/1</c> returns a
           random integer uniformly distributed between <c>1</c> and
-          <c>N</c>, updating the state in the process dictionary.</p>
+          <c><anno>N</anno></c>, updating the state in the process dictionary.</p>
       </desc>
     </func>
     <func>
-      <name>uniform_s(State0) -> {float(), State1}</name>
+      <name name="uniform_s" arity="1"/>
       <fsummary>Return a random float</fsummary>
-      <type>
-        <v>State0 = State1 = ran()</v>
-      </type>
       <desc>
         <p>Given a state, <c>uniform_s/1</c>returns a random float uniformly
           distributed between <c>0.0</c> and <c>1.0</c>, and a new state.</p>
       </desc>
     </func>
     <func>
-      <name>uniform_s(N, State0) -> {integer(), State1}</name>
+      <name name="uniform_s" arity="2"/>
       <fsummary>Return a random integer</fsummary>
-      <type>
-        <v>N = integer()</v>
-        <v>State0 = State1 = ran()</v>
-      </type>
       <desc>
-        <p>Given an integer <c>N >= 1</c> and a state, <c>uniform_s/2</c>
+        <p>Given an integer <c><anno>N</anno> >= 1</c> and a state, <c>uniform_s/2</c>
           returns a random integer uniformly distributed between <c>1</c> and
-          <c>N</c>, and a new state.</p>
+          <c><anno>N</anno></c>, and a new state.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml
index 9091035392..8c9e08ac3a 100644
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
@@ -59,28 +59,24 @@
 
 
   </description>
-  <section>
-      <title>DATA TYPES</title>
-      <code type="none">
-    iodata() = iolist() | binary()
-    iolist() = [char() | binary() | iolist()]
-      - a binary is allowed as the tail of the list</code>
-      <code type="none">
-    unicode_binary() = binary() with characters encoded in UTF-8 coding standard
-    unicode_char() = integer() representing a valid unicode codepoint
-
-    chardata() = charlist() | unicode_binary()
-
-    charlist() = [unicode_char() | unicode_binary() | charlist()]
-      - a unicode_binary is allowed as the tail of the list</code>
-    
-      <code type="none">
-    mp() = Opaque datatype containing a compiled regular expression.
-      - The mp() is guaranteed to be a tuple() having the atom
+  <datatypes>
+    <datatype>
+      <name name="mp"/>
+      <desc>
+        <p>Opaque datatype containing a compiled regular expression.
+        The mp() is guaranteed to be a tuple() having the atom
 	're_pattern' as its first element, to allow for matching in
         guards. The arity of the tuple() or the content of the other fields
-	may change in future releases.</code>
-  </section>
+	may change in future releases.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="nl_spec"/>
+    </datatype>
+    <datatype>
+      <name name="compile_option"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
       <name>compile(Regexp) -> {ok, MP} | {error, ErrSpec}</name>
@@ -96,14 +92,14 @@
       <name>compile(Regexp,Options) -> {ok, MP} | {error, ErrSpec}</name>
       <fsummary>Compile a regular expression into a match program</fsummary>
       <type>
-        <v>Regexp = iodata() | charlist()</v>
+        <v>Regexp = iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
 	<v>Options = [ Option ]</v>
 	<v>Option = unicode | anchored | caseless | dollar_endonly | dotall | extended | firstline | multiline | no_auto_capture | dupnames | ungreedy | {newline, NLSpec}| bsr_anycrlf | bsr_unicode</v>
-	<v>NLSpec = cr | crlf | lf | anycrlf | any </v>
-	<v>MP = mp()</v>
+	<v>NLSpec = <seealso marker="#type-nl_spec">nl_spec()</seealso></v>
+	<v>MP = <seealso marker="#type-mp">mp()</seealso></v>
 	<v>ErrSpec = {ErrString, Position}</v>
 	<v>ErrString = string()</v>
-	<v>Position = int()</v> 	
+	<v>Position = non_neg_integer()</v>
       </type>
       <desc>
       <p>This function compiles a regular expression with the syntax
@@ -116,7 +112,7 @@
       time one wants to match.</p>
       <p>When the unicode option is given, the regular expression should be given as a valid unicode <c>charlist()</c>, otherwise as any valid <c>iodata()</c>.</p>
 
-      <p>The options have the following meanings:</p>
+      <p><marker id="compile_options"/>The options have the following meanings:</p>
       <taglist>
       <tag><c>unicode</c></tag>
       <item>The regular expression is given as a unicode <c>charlist()</c> and the resulting regular expression code is to be run against a valid unicode <c>charlist()</c> subject.</item>
@@ -137,7 +133,7 @@ This option makes it possible to include comments inside complicated patterns. N
       <tag><c>multiline</c></tag>
       <item><p>By default, PCRE treats the subject string as consisting of a single line of characters (even if it actually contains newlines). The "start of line" metacharacter (^) matches only at the start of the string, while the "end of line" metacharacter ($) matches only at the end of the string, or before a terminating newline (unless <c>dollar_endonly</c> is given). This is the same as Perl.</p>
 
-<p>When <c>multiline</c> it is given, the "start of line" and "end of line" constructs match immediately following or immediately before internal newlines in the subject string, respectively, as well as at the very start and end. This is equivalent to Perl's /m option, and it can be changed within a pattern by a (?m) option setting. If there are no newlines in a subject string, or no occurrences of ^ or $ in a pattern, setting <c>multiline</c> has no effect.</p> </item>
+<p>When <c>multiline</c> is given, the "start of line" and "end of line" constructs match immediately following or immediately before internal newlines in the subject string, respectively, as well as at the very start and end. This is equivalent to Perl's /m option, and it can be changed within a pattern by a (?m) option setting. If there are no newlines in a subject string, or no occurrences of ^ or $ in a pattern, setting <c>multiline</c> has no effect.</p> </item>
       <tag><c>no_auto_capture</c></tag>
       <item>Disables the use of numbered capturing parentheses in the pattern. Any opening parenthesis that is not followed by ? behaves as if it were followed by ?: but named parentheses can still be used for capturing (and they acquire numbers in the usual way). There is no equivalent of this option in Perl.
 </item>
@@ -173,10 +169,10 @@ This option makes it possible to include comments inside complicated patterns. N
       <name>run(Subject,RE) -> {match, Captured} | nomatch</name>
       <fsummary>Match a subject against regular expression and capture subpatterns</fsummary>
       <type>
-	<v>Subject = iodata() | charlist()</v> 
-        <v>RE = mp() | iodata() | charlist()</v>
+	<v>Subject = iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
+        <v>RE = <seealso marker="#type-mp">mp()</seealso> | iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
 	<v>Captured = [ CaptureData ]</v>
-	<v>CaptureData = {int(),int()}</v>
+	<v>CaptureData = {integer(),integer()}</v>
       </type>
       <desc>
       <p>The same as <c>run(Subject,RE,[])</c>.</p>
@@ -186,18 +182,19 @@ This option makes it possible to include comments inside complicated patterns. N
       <name>run(Subject,RE,Options) -> {match, Captured} | match | nomatch</name>
       <fsummary>Match a subject against regular expression and capture subpatterns</fsummary>
       <type>
-	<v>Subject = iodata() | charlist()</v> 
-        <v>RE = mp() | iodata() | charlist()</v>
+	<v>Subject = iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
+        <v>RE = <seealso marker="#type-mp">mp()</seealso> | iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
 	<v>Options = [ Option ]</v>
-	<v>Option = anchored | global | notbol | noteol | notempty | {offset, int()} | {newline, NLSpec} | bsr_anycrlf | bsr_unicode | {capture, ValueSpec} | {capture, ValueSpec, Type} | CompileOpt</v>
+	<v>Option = anchored | global | notbol | noteol | notempty | {offset, integer() >= 0} | {newline, NLSpec} | bsr_anycrlf | bsr_unicode | {capture, ValueSpec} | {capture, ValueSpec, Type} | CompileOpt</v>
 	<v>Type = index | list | binary</v>
 	<v>ValueSpec = all | all_but_first | first | none | ValueList</v>
 	<v>ValueList = [ ValueID ]</v>
-	<v>ValueID = int() | string() | atom()</v>
-	<v>CompileOpt = see compile/2 above</v>
-	<v>NLSpec = cr | crlf | lf | anycrlf | any</v>
+	<v>ValueID = integer() | string() | atom()</v>
+	<v>CompileOpt = <seealso marker="#type-compile_option">compile_option()</seealso></v>
+        <d>See <seealso marker="#compile_options">compile/2</seealso> above.</d>
+	<v>NLSpec = <seealso marker="#type-nl_spec">nl_spec()</seealso></v>
 	<v>Captured = [ CaptureData ] | [ [ CaptureData ] ... ]</v>
-	<v>CaptureData = {int(),int()} | ListConversionData | binary()</v>
+	<v>CaptureData = {integer(),integer()} | ListConversionData | binary()</v>
 	<v>ListConversionData = string() | {error, string(), binary()} | {incomplete, string(), binary()}</v>
       </type>
       <desc>
@@ -217,7 +214,7 @@ This option makes it possible to include comments inside complicated patterns. N
       <p>If the regular expression is previously compiled, the option
       list can only contain the options <c>anchored</c>,
       <c>global</c>, <c>notbol</c>, <c>noteol</c>,
-      <c>notempty</c>, <c>{offset, int()}</c>, <c>{newline,
+      <c>notempty</c>, <c>{offset, integer() >= 0}</c>, <c>{newline,
       NLSpec}</c> and <c>{capture, ValueSpec}/{capture, ValueSpec,
       Type}</c>.  Otherwise all options valid for the
       <c>re:compile/2</c> function are allowed as well. Options
@@ -360,7 +357,7 @@ This option makes it possible to include comments inside complicated patterns. N
       behavior of the dollar metacharacter. It does not affect \Z or
       \z.</item>
 
-      <tag><c>{offset, int()}</c></tag>
+      <tag><c>{offset, integer() >= 0}</c></tag>
 
       <item>Start matching at the offset (position) given in the
       subject string. The offset is zero-based, so that the default is
@@ -503,42 +500,27 @@ This option makes it possible to include comments inside complicated patterns. N
       </desc>
     </func>
    <func>
-      <name>replace(Subject,RE,Replacement) -> iodata() | charlist()</name>
+      <name name="replace" arity="3"/>
       <fsummary>Match a subject against regular expression and replace matching elements with Replacement</fsummary>
-      <type>
-	<v>Subject = iodata() | charlist()</v> 
-        <v>RE = mp() | iodata()</v>
-	<v>Replacement = iodata() | charlist()</v> 
-      </type>
       <desc>
-      <p>The same as <c>replace(Subject,RE,Replacement,[])</c>.</p>
+      <p>The same as <c>replace(<anno>Subject</anno>,<anno>RE</anno>,<anno>Replacement</anno>,[])</c>.</p>
       </desc>
     </func> 
     <func>
-      <name>replace(Subject,RE,Replacement,Options) -> iodata() | charlist() | binary() | list()</name>
+      <name name="replace" arity="4"/>
       <fsummary>Match a subject against regular expression and replace matching elements with Replacement</fsummary>
-      <type>
-	<v>Subject = iodata() | charlist()</v> 
-        <v>RE = mp() | iodata() | charlist()</v>
-	<v>Replacement = iodata() | charlist()</v> 
-	<v>Options = [ Option ]</v>
-	<v>Option = anchored | global | notbol | noteol | notempty | {offset, int()} | {newline, NLSpec} | bsr_anycrlf | bsr_unicode | {return, ReturnType} | CompileOpt</v>
-	<v>ReturnType = iodata | list | binary</v>
-	<v>CompileOpt = see compile/2 above</v>
-	<v>NLSpec = cr | crlf | lf | anycrlf | any </v>
-      </type>
       <desc>
-      <p>Replaces the matched part of the <c>Subject</c> string with the contents of <c>Replacement</c>.</p>
+      <p>Replaces the matched part of the <c><anno>Subject</anno></c> string with the contents of <c><anno>Replacement</anno></c>.</p>
       <p>The permissible options are the same as for <c>re:run/3</c>, except that the <c>capture</c> option is not allowed.
-      Instead a <c>{return, ReturnType}</c> is present. The default return type is <c>iodata</c>, constructed in a 
+      Instead a <c>{return, <anno>ReturnType</anno>}</c> is present. The default return type is <c>iodata</c>, constructed in a
       way to minimize copying. The <c>iodata</c> result can be used directly in many i/o-operations. If a flat <c>list()</c> is
       desired, specify <c>{return, list}</c> and if a binary is preferred, specify <c>{return, binary}</c>.</p>
 
       <p>As in the <c>re:run/3</c> function, an <c>mp()</c> compiled
-      with the <c>unicode</c> option requires the <c>Subject</c> to be
+      with the <c>unicode</c> option requires the <c><anno>Subject</anno></c> to be
       a Unicode <c>charlist()</c>. If compilation is done implicitly
       and the <c>unicode</c> compilation option is given to this
-      function, both the regular expression and the <c>Subject</c>
+      function, both the regular expression and the <c><anno>Subject</anno></c>
       should be given as valid Unicode <c>charlist()</c>s.</p>
 
       <p>The replacement string can contain the special character
@@ -565,34 +547,17 @@ This option makes it possible to include comments inside complicated patterns. N
       </desc>
     </func>
     <func>
-      <name>split(Subject,RE) -> SplitList</name>
+      <name name="split" arity="2"/>
       <fsummary>Split a string by tokens specified as a regular expression</fsummary>
-      <type>
-	<v>Subject = iodata() | charlist()</v> 
-        <v>RE = mp() | iodata()</v>
-	<v>SplitList = [ iodata() | charlist() ]</v>
-      </type>
       <desc>
-      <p>The same as <c>split(Subject,RE,[])</c>.</p>
+      <p>The same as <c>split(<anno>Subject</anno>,<anno>RE</anno>,[])</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>split(Subject,RE,Options) -> SplitList</name>
+      <name name="split" arity="3"/>
       <fsummary>Split a string by tokens specified as a regular expression</fsummary>
-      <type>
-	<v>Subject = iodata() | charlist()</v> 
-        <v>RE = mp() | iodata() | charlist()</v>
-	<v>Options = [ Option ]</v>
-	<v>Option = anchored | global | notbol | noteol | notempty | {offset, int()} | {newline, NLSpec} | bsr_anycrlf | bsr_unicode | {return, ReturnType} | {parts, NumParts} | group | trim | CompileOpt</v>
-	<v>NumParts = int() | infinity</v>
-	<v>ReturnType = iodata | list | binary</v>
-	<v>CompileOpt = see compile/2 above</v>
-	<v>NLSpec = cr | crlf | lf | anycrlf | any </v>
-	<v>SplitList = [ RetData ] | [ GroupedRetData ]</v>
-	<v>GroupedRetData = [ RetData ]</v>
-	<v>RetData = iodata() | charlist() | binary() | list()</v>
-      </type>
+      <type_desc variable="CompileOpt">See <seealso marker="#compile_options">compile/2</seealso> above.</type_desc>
       <desc>
       <p>This function splits the input into parts by finding tokens
       according to the regular expression supplied.</p>
@@ -602,10 +567,10 @@ This option makes it possible to include comments inside complicated patterns. N
       of the string is removed from the output.</p>
 
       <p>As in the <c>re:run/3</c> function, an <c>mp()</c> compiled
-      with the <c>unicode</c> option requires the <c>Subject</c> to be
+      with the <c>unicode</c> option requires the <c><anno>Subject</anno></c> to be
       a Unicode <c>charlist()</c>. If compilation is done implicitly
       and the <c>unicode</c> compilation option is given to this
-      function, both the regular expression and the <c>Subject</c>
+      function, both the regular expression and the <c><anno>Subject</anno></c>
       should be given as valid Unicode <c>charlist()</c>s.</p>
 
       <p>The result is given as a list of &quot;strings&quot;, the
@@ -722,7 +687,7 @@ This option makes it possible to include comments inside complicated patterns. N
 
       <p>Summary of options not previously described for the <c>re:run/3</c> function:</p>
       <taglist>
-      <tag>{return,ReturnType}</tag>
+      <tag>{return,<anno>ReturnType</anno>}</tag>
       <item><p>Specifies how the parts of the original string are presented in the result list. The possible types are:</p>
       <taglist>
         <tag>iodata</tag>
diff --git a/lib/stdlib/doc/src/regexp.xml b/lib/stdlib/doc/src/regexp.xml
index 8c4191c88f..35d8e1c3f8 100644
--- a/lib/stdlib/doc/src/regexp.xml
+++ b/lib/stdlib/doc/src/regexp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -40,176 +40,150 @@
     <p>This module contains functions for regular expression
       matching and substitution.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="errordesc"></name>
+    </datatype>
+    <datatype>
+      <name name="regexp"></name>
+      <desc><p>Internal representation of a regular expression.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>match(String, RegExp) -> MatchRes</name>
+      <name name="match" arity="2"/>
       <fsummary>Match a regular expression</fsummary>
-      <type>
-        <v>String = RegExp = string()</v>
-        <v>MatchRes = {match,Start,Length} | nomatch | {error,errordesc()}</v>
-        <v>Start = Length = integer()</v>
-      </type>
       <desc>
-        <p>Finds the first, longest match of the regular expression <c>RegExp</c> in <c>String</c>. This function searches for the longest possible match and returns the first one found if there are several expressions of the same length. It returns as follows:</p>
+        <p>Finds the first, longest match of the regular expression <c><anno>RegExp</anno></c> in <c><anno>String</anno></c>. This function searches for the longest possible match and returns the first one found if there are several expressions of the same length. It returns as follows:</p>
         <taglist>
-          <tag><c>{match,Start,Length}</c></tag>
+          <tag><c>{match,<anno>Start</anno>,<anno>Length</anno>}</c></tag>
           <item>
-            <p>if the match succeeded. <c>Start</c> is the starting
-              position of the match, and <c>Length</c> is the length of
+            <p>if the match succeeded. <c><anno>Start</anno></c> is the starting
+              position of the match, and <c><anno>Length</anno></c> is the length of
               the matching string.</p>
           </item>
           <tag><c>nomatch</c></tag>
           <item>
             <p>if there were no matching characters.</p>
           </item>
-          <tag><c>{error,Error}</c></tag>
+          <tag><c>{error,<anno>Error</anno>}</c></tag>
           <item>
-            <p>if there was an error in <c>RegExp</c>.</p>
+            <p>if there was an error in <c><anno>RegExp</anno></c>.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>first_match(String, RegExp) -> MatchRes</name>
+      <name name="first_match" arity="2"/>
       <fsummary>Match a regular expression</fsummary>
-      <type>
-        <v>String = RegExp = string()</v>
-        <v>MatchRes = {match,Start,Length} | nomatch | {error,errordesc()}</v>
-        <v>Start = Length = integer()</v>
-      </type>
       <desc>
-        <p>Finds the first match of the regular expression <c>RegExp</c> in <c>String</c>. This call is
+        <p>Finds the first match of the regular expression <c><anno>RegExp</anno></c> in <c><anno>String</anno></c>. This call is
           usually faster than <c>match</c> and it is also a useful way to ascertain that a match exists. It returns as follows:</p>
         <taglist>
-          <tag><c>{match,Start,Length}</c></tag>
+          <tag><c>{match,<anno>Start</anno>,<anno>Length</anno>}</c></tag>
           <item>
-            <p>if the match succeeded. <c>Start</c> is the starting
-              position of the match and <c>Length</c> is the length of
+            <p>if the match succeeded. <c><anno>Start</anno></c> is the starting
+              position of the match and <c><anno>Length</anno></c> is the length of
               the matching string.</p>
           </item>
           <tag><c>nomatch</c></tag>
           <item>
             <p>if there were no matching characters.</p>
           </item>
-          <tag><c>{error,Error}</c></tag>
+          <tag><c>{error,<anno>Error</anno>}</c></tag>
           <item>
-            <p>if there was an error in <c>RegExp</c>.</p>
+            <p>if there was an error in <c><anno>RegExp</anno></c>.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>matches(String, RegExp) -> MatchRes</name>
+      <name name="matches" arity="2"/>
       <fsummary>Match a regular expression</fsummary>
-      <type>
-        <v>String = RegExp = string()</v>
-        <v>MatchRes = {match, Matches} | {error, errordesc()}</v>
-        <v>Matches = list()</v>
-      </type>
       <desc>
         <p>Finds all non-overlapping matches of the
-          expression <c>RegExp</c> in <c>String</c>.
+          expression <c><anno>RegExp</anno></c> in <c><anno>String</anno></c>.
           It returns as follows:</p>
         <taglist>
-          <tag><c>{match, Matches}</c></tag>
+          <tag><c>{match, <anno>Matches</anno>}</c></tag>
           <item>
             <p>if the regular expression was correct.
-              The list will be empty if there was no match. Each element in the list looks like <c>{Start, Length}</c>, where <c>Start</c> is the starting position of the match, and <c>Length</c> is the length of the matching string.</p>
+              The list will be empty if there was no match. Each element in the list looks like <c>{<anno>Start</anno>, <anno>Length</anno>}</c>, where <c><anno>Start</anno></c> is the starting position of the match, and <c><anno>Length</anno></c> is the length of the matching string.</p>
           </item>
-          <tag><c>{error,Error}</c></tag>
+          <tag><c>{error,<anno>Error</anno>}</c></tag>
           <item>
-            <p>if there was an error in <c>RegExp</c>.</p>
+            <p>if there was an error in <c><anno>RegExp</anno></c>.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>sub(String, RegExp, New) -> SubRes</name>
+      <name name="sub" arity="3"/>
       <fsummary>Substitute the first occurrence of a regular expression</fsummary>
-      <type>
-        <v>String = RegExp = New = string()</v>
-        <v>SubRes = {ok,NewString,RepCount} | {error,errordesc()}</v>
-        <v>RepCount = integer()</v>
-      </type>
       <desc>
-        <p>Substitutes the first occurrence of a substring matching <c>RegExp</c> in <c>String</c> with the string <c>New</c>. A <c><![CDATA[&]]></c> in the string <c>New</c> is replaced by the matched substring of <c>String</c>.  <c><![CDATA[\&]]></c> puts a literal <c><![CDATA[&]]></c> into the replacement string. It returns as follows:</p>
+        <p>Substitutes the first occurrence of a substring matching <c><anno>RegExp</anno></c> in <c><anno>String</anno></c> with the string <c><anno>New</anno></c>. A <c><![CDATA[&]]></c> in the string <c><anno>New</anno></c> is replaced by the matched substring of <c><anno>String</anno></c>.  <c><![CDATA[\&]]></c> puts a literal <c><![CDATA[&]]></c> into the replacement string. It returns as follows:</p>
         <taglist>
-          <tag><c>{ok,NewString,RepCount}</c></tag>
+          <tag><c>{ok,<anno>NewString</anno>,<anno>RepCount</anno>}</c></tag>
           <item>
-            <p>if <c>RegExp</c> is correct. <c>RepCount</c> is the number of replacements which have been made
+            <p>if <c><anno>RegExp</anno></c> is correct. <c><anno>RepCount</anno></c> is the number of replacements which have been made
               (this will be either 0 or 1).</p>
           </item>
-          <tag><c>{error, Error}</c></tag>
+          <tag><c>{error, <anno>Error</anno>}</c></tag>
           <item>
-            <p>if there is an error in <c>RegExp</c>.</p>
+            <p>if there is an error in <c><anno>RegExp</anno></c>.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>gsub(String, RegExp, New) -> SubRes</name>
+      <name name="gsub" arity="3"/>
       <fsummary>Substitute all occurrences of a regular expression</fsummary>
-      <type>
-        <v>String = RegExp = New = string()</v>
-        <v>SubRes = {ok,NewString,RepCount} | {error,errordesc()}</v>
-        <v>RepCount = integer()</v>
-      </type>
       <desc>
         <p>The same as <c>sub</c>, except that all non-overlapping
           occurrences of a substring matching
-          <c>RegExp</c> in <c>String</c> are replaced by the string <c>New</c>. It returns:</p>
+          <c><anno>RegExp</anno></c> in <c><anno>String</anno></c> are replaced by the string <c><anno>New</anno></c>. It returns:</p>
         <taglist>
-          <tag><c>{ok,NewString,RepCount}</c></tag>
+          <tag><c>{ok,<anno>NewString</anno>,<anno>RepCount</anno>}</c></tag>
           <item>
-            <p>if <c>RegExp</c> is correct. <c>RepCount</c> is the number of replacements which have been made.</p>
+            <p>if <c><anno>RegExp</anno></c> is correct. <c><anno>RepCount</anno></c> is the number of replacements which have been made.</p>
           </item>
-          <tag><c>{error, Error}</c></tag>
+          <tag><c>{error, <anno>Error</anno>}</c></tag>
           <item>
-            <p>if there is an error in <c>RegExp</c>.</p>
+            <p>if there is an error in <c><anno>RegExp</anno></c>.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>split(String, RegExp) -> SplitRes</name>
+      <name name="split" arity="2"/>
       <fsummary>Split a string into fields</fsummary>
-      <type>
-        <v>String = RegExp = string()</v>
-        <v>SubRes = {ok,FieldList} | {error,errordesc()}</v>
-        <v>Fieldlist = [string()]</v>
-      </type>
       <desc>
-        <p><c>String</c> is split into fields (sub-strings) by the
-          regular expression <c>RegExp</c>.</p>
+        <p><c><anno>String</anno></c> is split into fields (sub-strings) by the
+          regular expression <c><anno>RegExp</anno></c>.</p>
         <p>If the separator expression is <c>" "</c> (a single space),
           then the fields are separated by blanks and/or tabs and
           leading and trailing blanks and tabs are discarded. For all
           other values of the separator, leading and trailing blanks
           and tabs are not discarded. It returns:</p>
         <taglist>
-          <tag><c>{ok, FieldList}</c></tag>
+          <tag><c>{ok, <anno>FieldList</anno>}</c></tag>
           <item>
             <p>to indicate that the string has been split up into the fields of
-              <c>FieldList</c>.</p>
+              <c><anno>FieldList</anno></c>.</p>
           </item>
-          <tag><c>{error, Error}</c></tag>
+          <tag><c>{error, <anno>Error</anno>}</c></tag>
           <item>
-            <p>if there is an error in <c>RegExp</c>.</p>
+            <p>if there is an error in <c><anno>RegExp</anno></c>.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>sh_to_awk(ShRegExp) -> AwkRegExp</name>
+      <name name="sh_to_awk" arity="1"/>
       <fsummary>Convert an <c>sh</c>regular expression into an <c>AWK</c>one</fsummary>
-      <type>
-        <v>ShRegExp AwkRegExp = string()</v>
-        <v>SubRes = {ok,NewString,RepCount} | {error,errordesc()}</v>
-        <v>RepCount = integer()</v>
-      </type>
       <desc>
         <p>Converts the <c>sh</c> type regular expression
-          <c>ShRegExp</c> into a full <c>AWK</c> regular
+          <c><anno>ShRegExp</anno></c> into a full <c>AWK</c> regular
           expression. Returns the converted regular expression
           string. <c>sh</c> expressions are used in the shell for
           matching file names and have the following special
@@ -236,40 +210,32 @@
       </desc>
     </func>
     <func>
-      <name>parse(RegExp) -> ParseRes</name>
+      <name name="parse" arity="1"/>
       <fsummary>Parse a regular expression</fsummary>
-      <type>
-        <v>RegExp = string()</v>
-        <v>ParseRes = {ok,RE} | {error,errordesc()}</v>
-      </type>
       <desc>
-        <p>Parses the regular expression <c>RegExp</c> and builds the
+        <p>Parses the regular expression <c><anno>RegExp</anno></c> and builds the
           internal representation used in the other regular expression
           functions. Such representations can be used in all of the
           other functions instead of a regular expression string. This
           is more efficient when the same regular expression is used
           in many strings. It returns:</p>
         <taglist>
-          <tag><c>{ok, RE}</c>if <c>RegExp</c>is correct and <c>RE</c>is the internal representation.</tag>
+          <tag><c>{ok, <anno>RE</anno>}</c></tag>
           <item>
-            <p></p>
+            <p>if <c>RegExp</c> is correct and <c><anno>RE</anno></c> is the internal representation.</p>
           </item>
-          <tag><c>{error, Error}</c>if there is an error in <c>RegExpString</c>.</tag>
+          <tag><c>{error, <anno>Error</anno>}</c></tag>
           <item>
-            <p></p>
+            <p>if there is an error in <c><anno>RegExp</anno></c>.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>format_error(ErrorDescriptor) -> Chars</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Format an error descriptor</fsummary>
-      <type>
-        <v>ErrorDescriptor = errordesc()</v>
-        <v>Chars = [char() | Chars]</v>
-      </type>
       <desc>
-        <p>Returns a string which describes the error <c>ErrorDescriptor</c>
+        <p>Returns a string which describes the error <c><anno>ErrorDescriptor</anno></c>
           returned when there is an error in a regular expression.</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml
index 3610bb0184..071ee437cb 100644
--- a/lib/stdlib/doc/src/sets.xml
+++ b/lib/stdlib/doc/src/sets.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -43,202 +43,141 @@
       different if and only if they do not compare equal (<c>==</c>).</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-set()
-  as returned by new/0</code>
-  </section>
+  <datatypes>
+    <datatype>
+      <name><marker id="type-dict">set()</marker></name>
+      <desc><p>As returned by <c>new/0</c>.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>new() -> Set</name>
+      <name name="new" arity="0"/>
       <fsummary>Return an empty set</fsummary>
-      <type>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns a new empty set.</p>
       </desc>
     </func>
     <func>
-      <name>is_set(Set) -> bool()</name>
+      <name name="is_set" arity="1"/>
       <fsummary>Test for an <c>Set</c></fsummary>
-      <type>
-        <v>Set = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Set</c> is a set of
+        <p>Returns <c>true</c> if <c><anno>Set</anno></c> is a set of
           elements, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>size(Set) -> int()</name>
+      <name name="size" arity="1"/>
       <fsummary>Return the number of elements in a set</fsummary>
-      <type>
-        <v>Set = term()</v>
-      </type>
       <desc>
-        <p>Returns the number of elements in <c>Set</c>.</p>
+        <p>Returns the number of elements in <c><anno>Set</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>to_list(Set) -> List</name>
+      <name name="to_list" arity="1"/>
       <fsummary>Convert an <c>Set</c>into a list</fsummary>
-      <type>
-        <v>Set = set()</v>
-        <v>List = [term()]</v>
-      </type>
       <desc>
-        <p>Returns the elements of <c>Set</c> as a list.</p>
+        <p>Returns the elements of <c><anno>Set</anno></c> as a list.</p>
       </desc>
     </func>
     <func>
-      <name>from_list(List) -> Set</name>
+      <name name="from_list" arity="1"/>
       <fsummary>Convert a list into an <c>Set</c></fsummary>
-      <type>
-        <v>List = [term()]</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
-        <p>Returns an set of the elements in <c>List</c>.</p>
+        <p>Returns an set of the elements in <c><anno>List</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>is_element(Element, Set) -> bool()</name>
+      <name name="is_element" arity="2"/>
       <fsummary>Test for membership of an <c>Set</c></fsummary>
-      <type>
-        <v>Element = term()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Element</c> is an element of
-          <c>Set</c>, otherwise <c>false</c>.</p>
+        <p>Returns <c>true</c> if <c><anno>Element</anno></c> is an element of
+          <c><anno>Set</anno></c>, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>add_element(Element, Set1) -> Set2</name>
+      <name name="add_element" arity="2"/>
       <fsummary>Add an element to an <c>Set</c></fsummary>
-      <type>
-        <v>Element = term()</v>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
-        <p>Returns a new set formed from <c>Set1</c> with
-          <c>Element</c> inserted.</p>
+        <p>Returns a new set formed from <c><anno>Set1</anno></c> with
+          <c><anno>Element</anno></c> inserted.</p>
       </desc>
     </func>
     <func>
-      <name>del_element(Element, Set1) -> Set2</name>
+      <name name="del_element" arity="2"/>
       <fsummary>Remove an element from an <c>Set</c></fsummary>
-      <type>
-        <v>Element = term()</v>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
-        <p>Returns <c>Set1</c>, but with <c>Element</c> removed.</p>
+        <p>Returns <c><anno>Set1</anno></c>, but with <c><anno>Element</anno></c> removed.</p>
       </desc>
     </func>
     <func>
-      <name>union(Set1, Set2) -> Set3</name>
+      <name name="union" arity="2"/>
       <fsummary>Return the union of two <c>Sets</c></fsummary>
-      <type>
-        <v>Set1 = Set2 = Set3 = set()</v>
-      </type>
       <desc>
-        <p>Returns the merged (union) set of <c>Set1</c> and
-          <c>Set2</c>.</p>
+        <p>Returns the merged (union) set of <c><anno>Set1</anno></c> and
+          <c><anno>Set2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>union(SetList) -> Set</name>
+      <name name="union" arity="1"/>
       <fsummary>Return the union of a list of <c>Sets</c></fsummary>
-      <type>
-        <v>SetList = [set()]</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the merged (union) set of the list of sets.</p>
       </desc>
     </func>
     <func>
-      <name>intersection(Set1, Set2) -> Set3</name>
+      <name name="intersection" arity="2"/>
       <fsummary>Return the intersection of two <c>Sets</c></fsummary>
-      <type>
-        <v>Set1 = Set2 = Set3 = set()</v>
-      </type>
       <desc>
-        <p>Returns the intersection of <c>Set1</c> and
-          <c>Set2</c>.</p>
+        <p>Returns the intersection of <c><anno>Set1</anno></c> and
+          <c><anno>Set2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>intersection(SetList) -> Set</name>
+      <name name="intersection" arity="1"/>
       <fsummary>Return the intersection of a list of <c>Sets</c></fsummary>
-      <type>
-        <v>SetList = [set()]</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the intersection of the non-empty list of sets.</p>
       </desc>
     </func>
     <func>
-      <name>is_disjoint(Set1, Set2) -> bool()</name>
+      <name name="is_disjoint" arity="2"/>
       <fsummary>Check whether two <c>Sets</c> are disjoint</fsummary>
-      <type>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if <c>Set1</c> and
-          <c>Set2</c> are disjoint (have no elements in common),
+        <p>Returns <c>true</c> if <c><anno>Set1</anno></c> and
+          <c><anno>Set2</anno></c> are disjoint (have no elements in common),
 	  and <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>subtract(Set1, Set2) -> Set3</name>
+      <name name="subtract" arity="2"/>
       <fsummary>Return the difference of two <c>Sets</c></fsummary>
-      <type>
-        <v>Set1 = Set2 = Set3 = set()</v>
-      </type>
       <desc>
-        <p>Returns only the elements of <c>Set1</c> which are not
-          also elements of <c>Set2</c>.</p>
+        <p>Returns only the elements of <c><anno>Set1</anno></c> which are not
+          also elements of <c><anno>Set2</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>is_subset(Set1, Set2) -> bool()</name>
+      <name name="is_subset" arity="2"/>
       <fsummary>Test for subset</fsummary>
-      <type>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> when every element of <c>Set</c>1 is
-          also a member of <c>Set2</c>, otherwise <c>false</c>.</p>
+        <p>Returns <c>true</c> when every element of <c><anno>Set1</anno></c>1 is
+          also a member of <c><anno>Set2</anno></c>, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>fold(Function, Acc0, Set) -> Acc1</name>
+      <name name="fold" arity="3"/>
       <fsummary>Fold over set elements</fsummary>
-      <type>
-        <v>Function = fun (E, AccIn) -> AccOut</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
-        <p>Fold <c>Function</c> over every element in <c>Set</c>
+        <p>Fold <c><anno>Function</anno></c> over every element in <c><anno>Set</anno></c>
           returning the final value of the accumulator.</p>
       </desc>
     </func>
     <func>
-      <name>filter(Pred, Set1) -> Set2</name>
+      <name name="filter" arity="2"/>
       <fsummary>Filter set elements</fsummary>
-      <type>
-        <v>Pred = fun (E) -> bool()</v>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
-        <p>Filter elements in <c>Set1</c> with boolean function
-          <c>Fun</c>.</p>
+        <p>Filter elements in <c><anno>Set1</anno></c> with boolean function
+          <c><anno>Pred</anno></c>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/shell.xml b/lib/stdlib/doc/src/shell.xml
index 73cc1b33bd..bc2120c37d 100644
--- a/lib/stdlib/doc/src/shell.xml
+++ b/lib/stdlib/doc/src/shell.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -763,26 +763,20 @@ loop(N) ->
 
   <funcs>
     <func>
-      <name>history(N) -> integer()</name>
+      <name name="history" arity="1"/>
       <fsummary>Sets the number of previous commands to keep</fsummary>
-      <type>
-        <v>N = integer()</v>
-      </type>
       <desc>
         <p>Sets the number of previous commands to keep in the
-          history list to <c>N</c>. The previous number is returned.
+          history list to <c><anno>N</anno></c>. The previous number is returned.
           The default number is 20.</p>
       </desc>
     </func>
     <func>
-      <name>results(N) -> integer()</name>
+      <name name="results" arity="1"/>
       <fsummary>Sets the number of previous results to keep</fsummary>
-      <type>
-        <v>N = integer()</v>
-      </type>
       <desc>
         <p>Sets the number of results from previous commands to keep in
-          the history list to <c>N</c>. The previous number is returned.
+          the history list to <c><anno>N</anno></c>. The previous number is returned.
           The default number is 20.</p>
       </desc>
     </func>
@@ -790,7 +784,7 @@ loop(N) ->
       <name>catch_exception(Bool) -> Bool</name>
       <fsummary>Sets the exception handling of the shell</fsummary>
       <type>
-        <v>Bool = bool()</v>
+        <v>Bool = boolean()</v>
       </type>
       <desc>
         <p>Sets the exception handling of the evaluator process. The
@@ -804,38 +798,29 @@ loop(N) ->
       </desc>
     </func>
     <func>
-      <name>prompt_func(PromptFunc) -> prompt_func()</name>
+      <name name="prompt_func" arity="1"/>
       <fsummary>Sets the shell prompt</fsummary>
-      <type>
-        <v>PromptFunc = prompt_func()</v>
-        <v>prompt_func() = default | {Mod, Func}</v>
-        <v>Mod = Func = atom()</v>
-      </type>
       <desc>
         <p>Sets the shell prompt function to <c>PromptFunc</c>. The
           previous prompt function is returned.</p>
       </desc>
     </func>
     <func>
-      <name>start_restricted(Module) -> ok | {error, Reason}</name>
+      <name name="start_restricted" arity="1"/>
       <fsummary>Exits a normal shell and starts a restricted shell.</fsummary>
-      <type>
-        <v>Module = atom()</v>
-        <v>Reason = atom()</v>
-      </type>
       <desc>
         <p>Exits a normal shell and starts a restricted
-          shell. <c>Module</c> specifies the callback module for the
+          shell. <c><anno>Module</anno></c> specifies the callback module for the
           functions <c>local_allowed/3</c> and <c>non_local_allowed/3</c>.
           The function is meant to be called from the shell.</p>
         <p>If the callback module cannot be loaded, an error tuple is
-          returned. The <c>Reason</c> in the error tuple is the one
+          returned. The <c><anno>Reason</anno></c> in the error tuple is the one
           returned by the code loader when trying to load the code of the callback
           module.</p>
       </desc>
     </func>
     <func>
-      <name>stop_restricted() -> ok</name>
+      <name name="stop_restricted" arity="0"/>
       <fsummary>Exits a restricted shell and starts a normal shell.</fsummary>
       <desc>
         <p>Exits a restricted shell and starts a normal shell. The function
diff --git a/lib/stdlib/doc/src/slave.xml b/lib/stdlib/doc/src/slave.xml
index 168d83f301..15b6711731 100644
--- a/lib/stdlib/doc/src/slave.xml
+++ b/lib/stdlib/doc/src/slave.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -56,22 +56,16 @@
   </description>
   <funcs>
     <func>
-      <name>start(Host) -></name>
-      <name>start(Host, Name) -></name>
-      <name>start(Host, Name, Args) -> {ok, Node} | {error, Reason}</name>
+      <name name="start" arity="1"/>
+      <name name="start" arity="2"/>
+      <name name="start" arity="3"/>
       <fsummary>Start a slave node on a host</fsummary>
-      <type>
-        <v>Host = Name = atom()</v>
-        <v>Args = string()</v>
-        <v>Node = node()</v>
-        <v>Reason = timeout | no_rsh | {already_running, Node}</v>
-      </type>
       <desc>
-        <p>Starts a slave node on the host <c>Host</c>. Host names need
+        <p>Starts a slave node on the host <c><anno>Host</anno></c>. Host names need
           not necessarily be specified as fully qualified names; short
           names can also be used. This is the same condition that
           applies to names of distributed Erlang nodes.</p>
-        <p>The name of the started node will be <c>Name@Host</c>. If no
+        <p>The name of the started node will be <c><anno>Name</anno>@<anno>Host</anno></c>. If no
           name is provided, the name will be the same as the node which
           executes the call (with the exception of the host name part of
           the node name).</p>
@@ -79,7 +73,7 @@
           terminal I/O which is produced at the slave is automatically 
           relayed to the master. Also, the file process will be relayed
           to the master.</p>
-        <p>The <c>Args</c> argument is used to set <c>erl</c> command
+        <p>The <c><anno>Args</anno></c> argument is used to set <c>erl</c> command
           line arguments. If provided, it is passed to the new node and
           can be used for a variety of purposes. See
           <seealso marker="erts:erl#erl">erl(1)</seealso></p>
@@ -103,9 +97,9 @@
 E = " -env DISPLAY " ++ net_adm:localhost() ++ ":0 ",
 Arg = "-mnesia_dir " ++ M ++ " -pa " ++ Dir ++ E,
 slave:start(H, Name, Arg).</code>
-        <p>If successful, the function returns <c>{ok, Node}</c>,
-          where <c>Node</c> is the name of the new node. Otherwise it
-          returns <c>{error, Reason}</c>, where <c>Reason</c> can be
+        <p>If successful, the function returns <c>{ok, <anno>Node</anno>}</c>,
+          where <c><anno>Node</anno></c> is the name of the new node. Otherwise it
+          returns <c>{error, <anno>Reason</anno>}</c>, where <c><anno>Reason</anno></c> can be
           one of:</p>
         <taglist>
           <tag><c>timeout</c></tag>
@@ -123,24 +117,18 @@ slave:start(H, Name, Arg).</code>
           <item>
             <p>There is no <c>rsh</c> program on the computer.</p>
           </item>
-          <tag><c>{already_running, Node}</c></tag>
+          <tag><c>{already_running, <anno>Node</anno>}</c></tag>
           <item>
-            <p>A node with the name <c>Name@Host</c> already exists.</p>
+            <p>A node with the name <c><anno>Name</anno>@<anno>Host</anno></c> already exists.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>start_link(Host) -></name>
-      <name>start_link(Host, Name) -></name>
-      <name>start_link(Host, Name, Args) -> {ok, Node} | {error, Reason}</name>
+      <name name="start_link" arity="1"/>
+      <name name="start_link" arity="2"/>
+      <name name="start_link" arity="3"/>
       <fsummary>Start and link to a slave node on a host</fsummary>
-      <type>
-        <v>Host = Name = atom()</v>
-        <v>Args = string()</v>
-        <v>Node = node()</v>
-        <v>Reason = timeout | no_rsh | {already_running, Node}</v>
-      </type>
       <desc>
         <p>Starts a slave node in the same way as <c>start/1,2,3</c>,
           except that the slave node is linked to the currently
@@ -151,11 +139,8 @@ slave:start(H, Name, Arg).</code>
       </desc>
     </func>
     <func>
-      <name>stop(Node) -> ok</name>
+      <name name="stop" arity="1"/>
       <fsummary>Stop (kill) a node</fsummary>
-      <type>
-        <v>Node = node()</v>
-      </type>
       <desc>
         <p>Stops (kills) a node.</p>
       </desc>
@@ -177,12 +162,8 @@ slave:start(H, Name, Arg).</code>
       </desc>
     </func>
     <func>
-      <name>pseudo(Master, ServerList) -> ok</name>
+      <name name="pseudo" arity="2"/>
       <fsummary>Start a number of pseudo servers</fsummary>
-      <type>
-        <v>Master = node()</v>
-        <v>ServerList = [atom()]</v>
-      </type>
       <desc>
         <p>Starts a number of pseudo servers. A pseudo server is a
           server with a registered name which does absolutely nothing
@@ -198,16 +179,13 @@ rpc:call(N, slave, pseudo, [node(), [pxw_server]]).</code>
       </desc>
     </func>
     <func>
-      <name>relay(Pid)</name>
+      <name name="relay" arity="1"/>
       <fsummary>Run a pseudo server</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-      </type>
       <desc>
         <p>Runs a pseudo server. This function never returns any value
           and the process which executes the function will receive
           messages. All messages received will simply be passed on to
-          <c>Pid</c>.</p>
+          <c><anno>Pid</anno></c>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml
index 729df1e678..2e7768a1df 100644
--- a/lib/stdlib/doc/src/sofs.xml
+++ b/lib/stdlib/doc/src/sofs.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2010</year>
+      <year>2001</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -181,10 +181,11 @@
       the <marker id="canonical_map"></marker><em>canonical map</em> is
       the function that maps every element of X onto its equivalence class.
       </p>
-    <p>Relations as defined above (as sets of ordered pairs) will from
-      now on be referred to as <em>binary relations</em>. We call a
-      set of ordered sets (x[1],&nbsp;...,&nbsp;x[n]) 
-      an <em>(n-ary) relation</em>, and say that the relation is a subset of
+    <p><marker id="binary_relation"></marker>Relations as defined above
+      (as sets of ordered pairs) will from now on be referred to as
+      <em>binary relations</em>. We call a set of ordered sets
+      (x[1],&nbsp;...,&nbsp;x[n]) an <marker id="n_ary_relation"></marker>
+      <em>(n-ary) relation</em>, and say that the relation is a subset of
       the <marker id="Cartesian_product_tuple"></marker>Cartesian product
       X[1]&nbsp;&times;&nbsp;...&nbsp;&times;&nbsp;X[n] where x[i] is
       an element of X[i], 1&nbsp;&lt;=&nbsp;i&nbsp;&lt;=&nbsp;n. 
@@ -293,7 +294,8 @@
       <c>partition_family/2</c>, <c>projection/2</c>,
       <c>restriction/3</c>, <c>substitution/2</c>) accept an Erlang
       function as a means to modify each element of a given unordered
-      set. Such a function, called SetFun in the following, can be
+      set. <marker id="set_fun"></marker>Such a function, called
+      SetFun in the following, can be
       specified as a functional object (fun), a tuple
       <c>{external,&nbsp;Fun}</c>, or an integer. If SetFun is
       specified as a fun, the fun is applied to each element of the
@@ -337,34 +339,73 @@ fun(S) -> sofs:partition(1, S) end
       message when given badly formed arguments or sets the types of
       which are not compatible.</p>
     <p>When comparing external sets the operator <c>==/2</c> is used.</p>
-    <p><em>Types</em></p>
-    <pre>
-anyset() = -&nbsp;an unordered, ordered or atomic set&nbsp;-
-binary_relation() = -&nbsp;a binary relation&nbsp;-
-bool() = true | false
-external_set() = -&nbsp;an external set&nbsp;-
-family() = -&nbsp;a family (of subsets)&nbsp;-
-function() = -&nbsp;a function&nbsp;-
-ordset() = -&nbsp;an ordered set&nbsp;-
-relation() = -&nbsp;an n-ary relation&nbsp;-
-set() = -&nbsp;an unordered set&nbsp;-
-set_of_sets() = -&nbsp;an unordered set of set()&nbsp;-
-set_fun() = integer() >= 1
-          | {external, fun(external_set()) -> external_set()}
-          | fun(anyset()) -> anyset()
-spec_fun() = {external, fun(external_set()) -> bool()}
-           | fun(anyset()) -> bool()
-type() = -&nbsp;a type&nbsp;- </pre>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="anyset"></name>
+      <desc><p>Any kind of set (also included are the atomic sets).</p></desc>
+    </datatype>
+    <datatype>
+      <name name="binary_relation"></name>
+      <desc><p>A <seealso marker="#binary_relation">binary
+        relation</seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="external_set"></name>
+      <desc><p>An <seealso marker="#external_set">external
+        set</seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="family"></name>
+      <desc><p>A <seealso marker="#family">family</seealso> (of subsets).</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="a_function"></name>
+      <desc><p>A <seealso marker="#function">function</seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="ordset"></name>
+      <desc><p>An <seealso marker="#sets_definition">ordered
+        set</seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="relation"></name>
+      <desc><p>An <seealso marker="#n_ary_relation">n-ary relation</seealso>.
+      </p></desc>
+    </datatype>
+    <datatype>
+      <name name="a_set"></name>
+      <desc><p>An <seealso marker="#sets_definition">unordered
+        set</seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="set_of_sets"></name>
+      <desc><p>An <seealso marker="#sets_definition">unordered
+        set</seealso> of unordered sets.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="set_fun"></name>
+      <desc><p>A <seealso marker="#set_fun">SetFun</seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="spec_fun"></name>
+    </datatype>
+    <datatype>
+      <name name="type"></name>
+      <desc><p>A <seealso marker="#type">type</seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <!-- Parameterized opaque types are NYI: -->
+      <name><marker id="type-tuple_of">tuple_of(T)</marker></name>
+      <desc><p>A tuple where the elements are of type <c>T</c>.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>a_function(Tuples [, Type]) -> Function</name>
+      <name name="a_function" arity="1"/>
+      <name name="a_function" arity="2"/>
       <fsummary>Create a function.</fsummary>
-      <type>
-        <v>Function = function()</v>
-        <v>Tuples = [tuple()]</v>
-        <v>Type = type()</v>
-      </type>
       <desc>
         <p>Creates a <seealso marker="#function">function</seealso>.
           <c>a_function(F,&nbsp;T)</c> is equivalent to
@@ -375,16 +416,12 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>canonical_relation(SetOfSets) -> BinRel</name>
+      <name name="canonical_relation" arity="1"/>
       <fsummary>Return the canonical map.</fsummary>
-      <type>
-        <v>BinRel = binary_relation()</v>
-        <v>SetOfSets = set_of_sets()</v>
-      </type>
       <desc>
         <p>Returns the binary relation containing the elements
-          (E,&nbsp;Set) such that Set belongs to SetOfSets and E
-          belongs to Set. If SetOfSets is 
+          (E,&nbsp;Set) such that Set belongs to <anno>SetOfSets</anno> and E
+          belongs to Set. If SetOfSets is
 	  a <seealso marker="#partition">partition</seealso> of a set X and
 	  R is the equivalence relation in X induced by SetOfSets, then the
           returned relation is 
@@ -398,14 +435,12 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>composite(Function1, Function2) -> Function3</name>
+      <name name="composite" arity="2"/>
       <fsummary>Return the composite of two functions.</fsummary>
-      <type>
-        <v>Function1 = Function2 = Function3 = function()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#composite">composite</seealso> of 
-	  the functions Function1 and Function2.</p>
+	  the functions <anno>Function1</anno> and
+	  <anno>Function2</anno>.</p>
         <pre>
 1> <input>F1 = sofs:a_function([{a,1},{b,2},{c,2}]),</input>
 <input>F2 = sofs:a_function([{1,x},{2,y},{3,z}]),</input>
@@ -415,14 +450,9 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>constant_function(Set, AnySet) -> Function</name>
+      <name name="constant_function" arity="2"/>
       <fsummary>Create the function that maps each element of a 
         set onto another set.</fsummary>
-      <type>
-        <v>AnySet = anyset()</v>
-        <v>Function = function()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Creates the <seealso marker="#function">function</seealso>
           that maps each element of the set Set onto AnySet.</p>
@@ -435,14 +465,11 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>converse(BinRel1) -> BinRel2</name>
+      <name name="converse" arity="1"/>
       <fsummary>Return the converse of a binary relation.</fsummary>
-      <type>
-        <v>BinRel1 = BinRel2 = binary_relation()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#converse">converse</seealso>
-          of the binary relation BinRel1.</p>
+          of the binary relation <anno>BinRel1</anno>.</p>
         <pre>
 1> <input>R1 = sofs:relation([{1,a},{2,b},{3,a}]),</input>
 <input>R2 = sofs:converse(R1),</input>
@@ -451,31 +478,25 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>difference(Set1, Set2) -> Set3</name>
+      <name name="difference" arity="2"/>
       <fsummary>Return the difference of two sets.</fsummary>
-      <type>
-        <v>Set1 = Set2 = Set3 = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#difference">difference</seealso> of 
-	  the sets Set1 and Set2.</p>
+	  the sets <anno>Set1</anno> and <anno>Set2</anno>.</p>
       </desc>
     </func>
     <func>
-      <name>digraph_to_family(Graph [, Type]) -> Family</name>
+      <name name="digraph_to_family" arity="1"/>
+      <name name="digraph_to_family" arity="2"/>
       <fsummary>Create a family from a directed graph.</fsummary>
-      <type>
-        <v>Graph = digraph() -&nbsp;see digraph(3)&nbsp;-</v>
-        <v>Family = family()</v>
-        <v>Type = type()</v>
-      </type>
       <desc>
         <p>Creates a <seealso marker="#family">family</seealso> from
-          the directed graph Graph. Each vertex a of Graph is
+          the directed graph <anno>Graph</anno>. Each vertex a of
+          <anno>Graph</anno> is
           represented by a pair (a,&nbsp;{b[1],&nbsp;...,&nbsp;b[n]})
           where the b[i]'s are the out-neighbours of a. If no type is
           explicitly given, [{atom,&nbsp;[atom]}] is used as type of
-          the family. It is assumed that Type is 
+          the family. It is assumed that <anno>Type</anno> is
 	  a <seealso marker="#valid_type">valid type</seealso> of the 
 	  external set of the family.</p>
         <p>If G is a directed graph, it holds that the vertices and
@@ -484,15 +505,11 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>domain(BinRel) -> Set</name>
+      <name name="domain" arity="1"/>
       <fsummary>Return the domain of a binary relation.</fsummary>
-      <type>
-        <v>BinRel = binary_relation()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#domain">domain</seealso> of 
-	  the binary relation BinRel.</p>
+	  the binary relation <anno>BinRel</anno>.</p>
         <pre>
 1> <input>R = sofs:relation([{1,a},{1,b},{2,b},{2,c}]),</input>
 <input>S = sofs:domain(R),</input>
@@ -501,16 +518,13 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>drestriction(BinRel1, Set) -> BinRel2</name>
+      <name name="drestriction" arity="2"/>
       <fsummary>Return a restriction of a binary relation.</fsummary>
-      <type>
-        <v>BinRel1 = BinRel2 = binary_relation()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
-        <p>Returns the difference between the binary relation BinRel1
+        <p>Returns the difference between the binary relation
+          <anno>BinRel1</anno>
           and the <seealso marker="#restriction">restriction</seealso>
-          of BinRel1 to Set.</p>
+          of <anno>BinRel1</anno> to <anno>Set</anno>.</p>
         <pre>
 1> <input>R1 = sofs:relation([{1,a},{2,b},{3,c}]),</input>
 <input>S = sofs:set([2,4,6]),</input>
@@ -522,16 +536,13 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>drestriction(SetFun, Set1, Set2) -> Set3</name>
+      <name name="drestriction" arity="3"/>
       <fsummary>Return a restriction of a relation.</fsummary>
-      <type>
-        <v>SetFun = set_fun()</v>
-        <v>Set1 = Set2 = Set3 = set()</v>
-      </type>
-      <desc>
-        <p>Returns a subset of Set1 containing those elements that do
-          not yield an element in Set2 as the result of applying
-          SetFun.</p>
+      <desc>
+        <p>Returns a subset of <anno>Set1</anno> containing those elements
+          that do
+          not yield an element in <anno>Set2</anno> as the result of applying
+          <anno>SetFun</anno>.</p>
         <pre>
 1> <input>SetFun = {external, fun({_A,B,C}) -> {B,C} end},</input>
 <input>R1 = sofs:relation([{a,aa,1},{b,bb,2},{c,cc,3}]),</input>
@@ -544,11 +555,8 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>empty_set() -> Set</name>
+      <name name="empty_set" arity="0"/>
       <fsummary>Return the untyped empty set.</fsummary>
-      <type>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#sets_definition">untyped empty 
           set</seealso>. <c>empty_set()</c> is equivalent to
@@ -556,19 +564,14 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>extension(BinRel1, Set, AnySet) -> BinRel2</name>
+      <name name="extension" arity="3"/>
       <fsummary>Extend the domain of a binary relation.</fsummary>
-      <type>
-        <v>AnySet = anyset()</v>
-        <v>BinRel1 = BinRel2 = binary_relation()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#extension">extension</seealso> of 
-	  BinRel1 such that
-          for each element E in Set that does not belong to the
-          <seealso marker="#domain">domain</seealso> of BinRel1,
-          BinRel2 contains the pair (E,&nbsp;AnySet).</p>
+	  <anno>BinRel1</anno> such that
+          for each element E in <anno>Set</anno> that does not belong to the
+          <seealso marker="#domain">domain</seealso> of <anno>BinRel1</anno>,
+          <anno>BinRel2</anno> contains the pair (E,&nbsp;AnySet).</p>
         <pre>
 1> <input>S = sofs:set([b,c]),</input>
 <input>A = sofs:empty_set(),</input>
@@ -579,13 +582,9 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family(Tuples [, Type]) -> Family</name>
+      <name name="family" arity="1"/>
+      <name name="family" arity="2"/>
       <fsummary>Create a family of subsets.</fsummary>
-      <type>
-        <v>Family = family()</v>
-        <v>Tuples = [tuple()]</v>
-        <v>Type = type()</v>
-      </type>
       <desc>
         <p>Creates a <seealso marker="#family">family of subsets</seealso>. 
 	  <c>family(F,&nbsp;T)</c> is equivalent to
@@ -596,18 +595,17 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_difference(Family1, Family2) -> Family3</name>
+      <name name="family_difference" arity="2"/>
       <fsummary>Return the difference of two families.</fsummary>
-      <type>
-        <v>Family1 = Family2 = Family3 = family()</v>
-      </type>
       <desc>
-        <p>If Family1 and Family2 
+        <p>If <anno>Family1</anno> and <anno>Family2</anno>
 	  are <seealso marker="#family">families</seealso>, then 
-	  Family3 is the family
+	  <anno>Family3</anno> is the family
           such that the index set is equal to the index set of
-          Family1, and Family3[i] is the difference between Family1[i]
-          and Family2[i] if Family2 maps i, Family1[i] otherwise.</p>
+          <anno>Family1</anno>, and <anno>Family3</anno>[i] is the
+          difference between <anno>Family1</anno>[i]
+          and <anno>Family2</anno>[i] if <anno>Family2</anno> maps i,
+          <anno>Family1</anno>[i] otherwise.</p>
         <pre>
 1> <input>F1 = sofs:family([{a,[1,2]},{b,[3,4]}]),</input>
 <input>F2 = sofs:family([{b,[4,5]},{c,[6,7]}]),</input>
@@ -617,17 +615,18 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_domain(Family1) -> Family2</name>
+      <name name="family_domain" arity="1"/>
       <fsummary>Return a family of domains.</fsummary>
-      <type>
-        <v>Family1 = Family2 = family()</v>
-      </type>
-      <desc>
-        <p>If Family1 is a <seealso marker="#family">family</seealso>
-          and Family1[i] is a binary relation for every i in the index
-          set of Family1, then Family2 is the family with the same
-          index set as Family1 such that Family2[i] is 
-	  the <seealso marker="#domain">domain</seealso> of Family1[i].</p>
+      <desc>
+        <p>If <anno>Family1</anno> is
+          a <seealso marker="#family">family</seealso>
+          and <anno>Family1</anno>[i] is a binary relation for every i
+          in the index set of <anno>Family1</anno>,
+          then <anno>Family2</anno> is the family with the same index
+          set as <anno>Family1</anno> such
+          that <anno>Family2</anno>[i] is
+          the <seealso marker="#domain">domain</seealso> of
+          <anno>Family1</anno>[i].</p>
         <pre>
 1> <input>FR = sofs:from_term([{a,[{1,a},{2,b},{3,c}]},{b,[]},{c,[{4,d},{5,e}]}]),</input>
 <input>F = sofs:family_domain(FR),</input>
@@ -636,17 +635,18 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_field(Family1) -> Family2</name>
+      <name name="family_field" arity="1"/>
       <fsummary>Return a family of fields.</fsummary>
-      <type>
-        <v>Family1 = Family2 = family()</v>
-      </type>
-      <desc>
-        <p>If Family1 is a <seealso marker="#family">family</seealso>
-          and Family1[i] is a binary relation for every i in the index
-          set of Family1, then Family2 is the family with the same
-          index set as Family1 such that Family2[i] is 
-	  the <seealso marker="#field">field</seealso> of Family1[i].</p>
+      <desc>
+        <p>If <anno>Family1</anno> is
+          a <seealso marker="#family">family</seealso>
+          and <anno>Family1</anno>[i] is a binary relation for every i
+          in the index set of <anno>Family1</anno>,
+          then <anno>Family2</anno> is the family with the same index
+          set as <anno>Family1</anno> such
+          that <anno>Family2</anno>[i] is
+          the <seealso marker="#field">field</seealso> of
+          <anno>Family1</anno>[i].</p>
         <pre>
 1> <input>FR = sofs:from_term([{a,[{1,a},{2,b},{3,c}]},{b,[]},{c,[{4,d},{5,e}]}]),</input>
 <input>F = sofs:family_field(FR),</input>
@@ -657,21 +657,21 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_intersection(Family1) -> Family2</name>
+      <name name="family_intersection" arity="1"/>
       <fsummary>Return the intersection of a family
          of sets of sets.</fsummary>
-      <type>
-        <v>Family1 = Family2 = family()</v>
-      </type>
-      <desc>
-        <p>If Family1 is a <seealso marker="#family">family</seealso>
-          and Family1[i] is a set of sets for every i in the index set
-          of Family1, then Family2 is the family with the same index
-          set as Family1 such that Family2[i] is 
-	  the <seealso marker="#intersection_n">intersection</seealso> of
-          Family1[i].</p>
-        <p>If Family1[i] is an empty set for some i, then the process
-          exits with a <c>badarg</c> message.</p>
+      <desc>
+        <p>If <anno>Family1</anno> is
+          a <seealso marker="#family">family</seealso>
+          and <anno>Family1</anno>[i] is a set of sets for every i in
+          the index set of <anno>Family1</anno>,
+          then <anno>Family2</anno> is the family with the same index
+          set as <anno>Family1</anno> such
+          that <anno>Family2</anno>[i] is
+          the <seealso marker="#intersection_n">intersection</seealso>
+          of <anno>Family1</anno>[i].</p>
+        <p>If <anno>Family1</anno>[i] is an empty set for some i, then
+          the process exits with a <c>badarg</c> message.</p>
         <pre>
 1> <input>F1 = sofs:from_term([{a,[[1,2,3],[2,3,4]]},{b,[[x,y,z],[x,y]]}]),</input>
 <input>F2 = sofs:family_intersection(F1),</input>
@@ -680,17 +680,16 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_intersection(Family1, Family2) -> Family3</name>
+      <name name="family_intersection" arity="2"/>
       <fsummary>Return the intersection of two families.</fsummary>
-      <type>
-        <v>Family1 = Family2 = Family3 = family()</v>
-      </type>
-      <desc>
-        <p>If Family1 and Family2 
-	  are <seealso marker="#family">families</seealso>, then Family3 
-	  is the family such that the index set is the intersection of
-          Family1's and Family2's index sets, and Family3[i] is the
-          intersection of Family1[i] and Family2[i].</p>
+      <desc>
+        <p>If <anno>Family1</anno> and <anno>Family2</anno>
+	  are <seealso marker="#family">families</seealso>,
+	  then <anno>Family3</anno> is the family such that the index
+	  set is the intersection of <anno>Family1</anno>'s and
+	  <anno>Family2</anno>'s index sets,
+	  and <anno>Family3</anno>[i] is the intersection of
+	  <anno>Family1</anno>[i] and <anno>Family2</anno>[i].</p>
         <pre>
 1> <input>F1 = sofs:family([{a,[1,2]},{b,[3,4]},{c,[5,6]}]),</input>
 <input>F2 = sofs:family([{b,[4,5]},{c,[7,8]},{d,[9,10]}]),</input>
@@ -700,18 +699,16 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_projection(SetFun, Family1) -> Family2</name>
+      <name name="family_projection" arity="2"/>
       <fsummary>Return a family of modified subsets.</fsummary>
-      <type>
-        <v>SetFun = set_fun()</v>
-        <v>Family1 = Family2 = family()</v>
-        <v>Set = set()</v>
-      </type>
-      <desc>
-        <p>If Family1 is a <seealso marker="#family">family</seealso>
-          then Family2 is the family with the same index set as
-          Family1 such that Family2[i] is the result of calling SetFun
-          with Family1[i] as argument.</p>
+      <desc>
+        <p>If <anno>Family1</anno> is
+          a <seealso marker="#family">family</seealso>
+          then <anno>Family2</anno> is the family with the same index
+          set as <anno>Family1</anno> such
+          that <anno>Family2</anno>[i] is the result of
+          calling <anno>SetFun</anno> with <anno>Family1</anno>[i] as
+          argument.</p>
         <pre>
 1> <input>F1 = sofs:from_term([{a,[[1,2],[2,3]]},{b,[[]]}]),</input>
 <input>F2 = sofs:family_projection({sofs, union}, F1),</input>
@@ -720,17 +717,18 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_range(Family1) -> Family2</name>
+      <name name="family_range" arity="1"/>
       <fsummary>Return a family of ranges.</fsummary>
-      <type>
-        <v>Family1 = Family2 = family()</v>
-      </type>
-      <desc>
-        <p>If Family1 is a <seealso marker="#family">family</seealso>
-          and Family1[i] is a binary relation for every i in the index
-          set of Family1, then Family2 is the family with the same
-          index set as Family1 such that Family2[i] is 
-	  the <seealso marker="#range">range</seealso> of Family1[i].</p>
+      <desc>
+        <p>If <anno>Family1</anno> is
+          a <seealso marker="#family">family</seealso>
+          and <anno>Family1</anno>[i] is a binary relation for every i
+          in the index set of <anno>Family1</anno>,
+          then <anno>Family2</anno> is the family with the same index
+          set as <anno>Family1</anno> such
+          that <anno>Family2</anno>[i] is
+          the <seealso marker="#range">range</seealso> of
+          <anno>Family1</anno>[i].</p>
         <pre>
 1> <input>FR = sofs:from_term([{a,[{1,a},{2,b},{3,c}]},{b,[]},{c,[{4,d},{5,e}]}]),</input>
 <input>F = sofs:family_range(FR),</input>
@@ -739,22 +737,21 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_specification(Fun, Family1) -> Family2</name>
+      <name name="family_specification" arity="2"/>
       <fsummary>Select a subset of a family using a predicate.</fsummary>
-      <type>
-        <v>Fun = spec_fun()</v>
-        <v>Family1 = Family2 = family()</v>
-      </type>
-      <desc>
-        <p>If Family1 is a <seealso marker="#family">family</seealso>,
-          then Family2 is 
-	  the <seealso marker="#restriction">restriction</seealso> of 
-	  Family1 to those elements i of the
-          index set for which Fun applied to Family1[i] returns
-          <c>true</c>. If Fun is a tuple <c>{external,&nbsp;Fun2}</c>,
-          Fun2 is applied to 
-	  the <seealso marker="#external_set">external set</seealso> of 
-	  Family1[i], otherwise Fun is applied to Family1[i].</p>
+      <desc>
+        <p>If <anno>Family1</anno> is
+          a <seealso marker="#family">family</seealso>,
+          then <anno>Family2</anno> is
+          the <seealso marker="#restriction">restriction</seealso> of
+          <anno>Family1</anno> to those elements i of the index set
+          for which <anno>Fun</anno> applied
+          to <anno>Family1</anno>[i] returns
+          <c>true</c>. If <anno>Fun</anno> is a
+          tuple <c>{external,&nbsp;Fun2}</c>, Fun2 is applied to
+          the <seealso marker="#external_set">external set</seealso>
+          of <anno>Family1</anno>[i], otherwise <anno>Fun</anno> is
+          applied to <anno>Family1</anno>[i].</p>
         <pre>
 1> <input>F1 = sofs:family([{a,[1,2,3]},{b,[1,2]},{c,[1]}]),</input>
 <input>SpecFun = fun(S) -> sofs:no_elements(S) =:= 2 end,</input>
@@ -764,24 +761,22 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_to_digraph(Family [, GraphType]) -> Graph</name>
+      <name name="family_to_digraph" arity="1"/>
+      <name name="family_to_digraph" arity="2"/>
       <fsummary>Create a directed graph from a family.</fsummary>
-      <type>
-        <v>Graph = digraph()</v>
-        <v>Family = family()</v>
-        <v>GraphType = -&nbsp;see digraph(3)&nbsp;-</v>
-      </type>
       <desc>
         <p>Creates a directed graph from 
-	  the <seealso marker="#family">family</seealso> Family. For each 
-	  pair (a,&nbsp;{b[1],&nbsp;...,&nbsp;b[n]}) of Family, the vertex
+	  the <seealso marker="#family">family</seealso> <anno>Family</anno>.
+          For each pair (a,&nbsp;{b[1],&nbsp;...,&nbsp;b[n]})
+          of <anno>Family</anno>, the vertex
           a as well the edges (a,&nbsp;b[i]) for
           1&nbsp;&lt;=&nbsp;i&nbsp;&lt;=&nbsp;n are added to a newly
           created directed graph.</p>
-        <p>If no graph type is given, <c>digraph:new/1</c> is used for
-          creating the directed graph, otherwise the GraphType
+        <p>If no graph type is given <seealso marker="digraph#new/0">
+          digraph:new/0</seealso> is used for
+          creating the directed graph, otherwise the <anno>GraphType</anno>
           argument is passed on as second argument to
-          <c>digraph:new/2</c>.</p>
+          <seealso marker="digraph#new/1">digraph:new/1</seealso>.</p>
         <p>It F is a family, it holds that F is a subset of
           <c>digraph_to_family(family_to_digraph(F),&nbsp;type(F))</c>.
           Equality holds if <c>union_of_family(F)</c> is a subset of
@@ -791,17 +786,15 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_to_relation(Family) -> BinRel</name>
+      <name name="family_to_relation" arity="1"/>
       <fsummary>Create a binary relation from a family.</fsummary>
-      <type>
-        <v>Family = family()</v>
-        <v>BinRel = binary_relation()</v>
-      </type>
-      <desc>
-        <p>If Family is a <seealso marker="#family">family</seealso>,
-          then BinRel is the binary relation containing all pairs
-          (i,&nbsp;x) such that i belongs to the index set of Family
-          and x belongs to Family[i].</p>
+      <desc>
+        <p>If <anno>Family</anno> is
+          a <seealso marker="#family">family</seealso>,
+          then <anno>BinRel</anno> is the binary relation containing
+          all pairs (i,&nbsp;x) such that i belongs to the index set
+          of <anno>Family</anno> and x belongs
+          to <anno>Family</anno>[i].</p>
         <pre>
 1> <input>F = sofs:family([{a,[]}, {b,[1]}, {c,[2,3]}]),</input>
 <input>R = sofs:family_to_relation(F),</input>
@@ -810,17 +803,18 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_union(Family1) -> Family2</name>
+      <name name="family_union" arity="1"/>
       <fsummary>Return the union of a family of sets of sets.</fsummary>
-      <type>
-        <v>Family1 = Family2 = family()</v>
-      </type>
-      <desc>
-        <p>If Family1 is a <seealso marker="#family">family</seealso>
-          and Family1[i] is a set of sets for each i in the index set
-          of Family1, then Family2 is the family with the same index
-          set as Family1 such that Family2[i] is 
-	  the <seealso marker="#union_n">union</seealso> of Family1[i].</p>
+      <desc>
+        <p>If <anno>Family1</anno> is
+          a <seealso marker="#family">family</seealso>
+          and <anno>Family1</anno>[i] is a set of sets for each i in
+          the index set of <anno>Family1</anno>,
+          then <anno>Family2</anno> is the family with the same index
+          set as <anno>Family1</anno> such
+          that <anno>Family2</anno>[i] is
+          the <seealso marker="#union_n">union</seealso> of
+          <anno>Family1</anno>[i].</p>
         <pre>
 1> <input>F1 = sofs:from_term([{a,[[1,2],[2,3]]},{b,[[]]}]),</input>
 <input>F2 = sofs:family_union(F1),</input>
@@ -831,18 +825,18 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>family_union(Family1, Family2) -> Family3</name>
+      <name name="family_union" arity="2"/>
       <fsummary>Return the union of two families.</fsummary>
-      <type>
-        <v>Family1 = Family2 = Family3 = family()</v>
-      </type>
-      <desc>
-        <p>If Family1 and Family2 
-	  are <seealso marker="#family">families</seealso>, then Family3 
-	  is the family such that the index set is the union of Family1's 
-	  and Family2's index sets, and Family3[i] is the union of
-          Family1[i] and Family2[i] if both maps i, Family1[i] or
-          Family2[i] otherwise.</p>
+      <desc>
+        <p>If <anno>Family1</anno> and <anno>Family2</anno>
+	  are <seealso marker="#family">families</seealso>,
+	  then <anno>Family3</anno> is the family such that the index
+	  set is the union of <anno>Family1</anno>'s
+	  and <anno>Family2</anno>'s index sets,
+	  and <anno>Family3</anno>[i] is the union
+	  of <anno>Family1</anno>[i] and <anno>Family2</anno>[i] if
+	  both maps i, <anno>Family1</anno>[i]
+	  or <anno>Family2</anno>[i] otherwise.</p>
         <pre>
 1> <input>F1 = sofs:family([{a,[1,2]},{b,[3,4]},{c,[5,6]}]),</input>
 <input>F2 = sofs:family([{b,[4,5]},{c,[7,8]},{d,[9,10]}]),</input>
@@ -852,15 +846,11 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>field(BinRel) -> Set</name>
+      <name name="field" arity="1"/>
       <fsummary>Return the field of a binary relation.</fsummary>
-      <type>
-        <v>BinRel = binary_relation()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#field">field</seealso> of the
-          binary relation BinRel.</p>
+          binary relation <anno>BinRel</anno>.</p>
         <pre>
 1> <input>R = sofs:relation([{1,a},{1,b},{2,b},{2,c}]),</input>
 <input>S = sofs:field(R),</input>
@@ -871,31 +861,24 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>from_external(ExternalSet, Type) -> AnySet</name>
+      <name name="from_external" arity="2"/>
       <fsummary>Create a set.</fsummary>
-      <type>
-        <v>ExternalSet = external_set()</v>
-        <v>AnySet = anyset()</v>
-        <v>Type = type()</v>
-      </type>
       <desc>
         <p>Creates a set from the <seealso marker="#external_set">external 
-	  set</seealso> ExternalSet
-          and the <seealso marker="#type">type</seealso> Type. It is
-          assumed that Type is a <seealso marker="#valid_type">valid 
-	  type</seealso> of ExternalSet.</p>
+	  set</seealso> <anno>ExternalSet</anno>
+          and the <seealso marker="#type">type</seealso> <anno>Type</anno>.
+          It is assumed that <anno>Type</anno> is
+          a <seealso marker="#valid_type">valid
+	  type</seealso> of <anno>ExternalSet</anno>.</p>
       </desc>
     </func>
     <func>
-      <name>from_sets(ListOfSets) -> Set</name>
+      <name name="from_sets" arity="1" clause_i="1"/>
       <fsummary>Create a set out of a list of sets.</fsummary>
-      <type>
-        <v>Set = set()</v>
-        <v>ListOfSets = [anyset()]</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#sets_definition">unordered 
-	  set</seealso> containing the sets of the list ListOfSets.</p>
+          set</seealso> containing the sets of the list
+          <anno>ListOfSets</anno>.</p>
         <pre>
 1> <input>S1 = sofs:relation([{a,1},{b,2}]),</input>
 <input>S2 = sofs:relation([{x,3},{y,4}]),</input>
@@ -905,38 +888,33 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>from_sets(TupleOfSets) -> Ordset</name>
+      <name name="from_sets" arity="1" clause_i="2"/>
       <fsummary>Create an ordered set out of a tuple of sets.</fsummary>
-      <type>
-        <v>Ordset = ordset()</v>
-        <v>TupleOfSets = tuple-of(anyset())</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#sets_definition">ordered 
 	  set</seealso> containing the sets of the non-empty tuple 
-	  TupleOfSets.</p>
+	  <anno>TupleOfSets</anno>.</p>
       </desc>
     </func>
     <func>
-      <name>from_term(Term [, Type]) -> AnySet</name>
+      <name name="from_term" arity="1"/>
+      <name name="from_term" arity="2"/>
       <fsummary>Create a set.</fsummary>
-      <type>
-        <v>AnySet = anyset()</v>
-        <v>Term = term()</v>
-        <v>Type = type()</v>
-      </type>
       <desc>
         <p><marker id="from_term"></marker>Creates an element 
 	  of <seealso marker="#sets_definition">Sets</seealso> by 
-	  traversing the term Term, sorting lists, removing duplicates and
+	  traversing the term <anno>Term</anno>, sorting lists,
+          removing duplicates and
 	  deriving or verifying a <seealso marker="#valid_type">valid 
 	  type</seealso> for the so obtained external set. An
-          explicitly given <seealso marker="#type">type</seealso> Type
+          explicitly given <seealso marker="#type">type</seealso>
+          <anno>Type</anno>
           can be used to limit the depth of the traversal; an atomic
           type stops the traversal, as demonstrated by this example
           where "foo" and {"foo"} are left unmodified:</p>
         <pre>
-1> <input>S = sofs:from_term([{{"foo"},[1,1]},{"foo",[2,2]}], [{atom,[atom]}]),</input>
+1> <input>S = sofs:from_term([{{"foo"},[1,1]},{"foo",[2,2]}],
+[{atom,[atom]}]),</input>
 <input>sofs:to_external(S).</input>
 [{{"foo"},[1]},{"foo",[2]}]</pre>
         <p><c>from_term</c> can be used for creating atomic or ordered
@@ -963,15 +941,12 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>image(BinRel, Set1) -> Set2</name>
+      <name name="image" arity="2"/>
       <fsummary>Return the image of a set under a binary relation.</fsummary>
-      <type>
-        <v>BinRel = binary_relation()</v>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#image">image</seealso> of the
-          set Set1 under the binary relation BinRel.</p>
+          set <anno>Set1</anno> under the binary
+          relation <anno>BinRel</anno>.</p>
         <pre>
 1> <input>R = sofs:relation([{1,a},{2,b},{2,c},{3,d}]),</input>
 <input>S1 = sofs:set([1,2]),</input>
@@ -981,42 +956,32 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>intersection(SetOfSets) -> Set</name>
+      <name name="intersection" arity="1"/>
       <fsummary>Return the intersection of a set of sets.</fsummary>
-      <type>
-        <v>Set = set()</v>
-        <v>SetOfSets = set_of_sets()</v>
-      </type>
       <desc>
         <p>Returns 
 	  the <seealso marker="#intersection_n">intersection</seealso> of 
-	  the set of sets SetOfSets.</p>
+	  the set of sets <anno>SetOfSets</anno>.</p>
         <p>Intersecting an empty set of sets exits the process with a
           <c>badarg</c> message.</p>
       </desc>
     </func>
     <func>
-      <name>intersection(Set1, Set2) -> Set3</name>
+      <name name="intersection" arity="2"/>
       <fsummary>Return the intersection of two sets.</fsummary>
-      <type>
-        <v>Set1 = Set2 = Set3 = set()</v>
-      </type>
       <desc>
         <p>Returns 
 	  the <seealso marker="#intersection">intersection</seealso> of 
-	  Set1 and Set2.</p>
+	  <anno>Set1</anno> and <anno>Set2</anno>.</p>
       </desc>
     </func>
     <func>
-      <name>intersection_of_family(Family) -> Set</name>
+      <name name="intersection_of_family" arity="1"/>
       <fsummary>Return the intersection of a family.</fsummary>
-      <type>
-        <v>Family = family()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the intersection of 
-	  the <seealso marker="#family">family</seealso> Family.</p>
+	  the <seealso marker="#family">family</seealso> <anno>Family</anno>.
+        </p>
         <p>Intersecting an empty family exits the process with a
           <c>badarg</c> message.</p>
         <pre>
@@ -1027,14 +992,11 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>inverse(Function1) -> Function2</name>
+      <name name="inverse" arity="1"/>
       <fsummary>Return the inverse of a function.</fsummary>
-      <type>
-        <v>Function1 = Function2 = function()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#inverse">inverse</seealso>
-          of the function Function1.</p>
+          of the function <anno>Function1</anno>.</p>
         <pre>
 1> <input>R1 = sofs:relation([{1,a},{2,b},{3,c}]),</input>
 <input>R2 = sofs:inverse(R1),</input>
@@ -1043,16 +1005,13 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>inverse_image(BinRel, Set1) -> Set2</name>
+      <name name="inverse_image" arity="2"/>
       <fsummary>Return the inverse image of a set under 
         a binary relation.</fsummary>
-      <type>
-        <v>BinRel = binary_relation()</v>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
-        <p>Returns the <seealso marker="#inverse_image">inverse 
-	  image</seealso> of Set1 under the binary relation BinRel.</p>
+        <p>Returns the <seealso marker="#inverse_image">inverse
+	  image</seealso> of <anno>Set1</anno> under the binary
+	  relation <anno>BinRel</anno>.</p>
         <pre>
 1> <input>R = sofs:relation([{1,a},{2,b},{2,c},{3,d}]),</input>
 <input>S1 = sofs:set([c,d,e]),</input>
@@ -1062,52 +1021,38 @@ type() = -&nbsp;a type&nbsp;- </pre>
       </desc>
     </func>
     <func>
-      <name>is_a_function(BinRel) -> Bool</name>
+      <name name="is_a_function" arity="1"/>
       <fsummary>Test for a function.</fsummary>
-      <type>
-        <v>Bool = bool()</v>
-        <v>BinRel = binary_relation()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if the binary relation BinRel is a
-          <seealso marker="#function">function</seealso> or the
+        <p>Returns <c>true</c> if the binary relation <anno>BinRel</anno>
+          is a <seealso marker="#function">function</seealso> or the
           untyped empty set, <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>is_disjoint(Set1, Set2) -> Bool</name>
+      <name name="is_disjoint" arity="2"/>
       <fsummary>Test for disjoint sets.</fsummary>
-      <type>
-        <v>Bool = bool()</v>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if Set1 and Set2 
+        <p>Returns <c>true</c> if <anno>Set1</anno>
+	  and <anno>Set2</anno>
 	  are <seealso marker="#disjoint">disjoint</seealso>, <c>false</c>
           otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>is_empty_set(AnySet) -> Bool</name>
+      <name name="is_empty_set" arity="1"/>
       <fsummary>Test for an empty set.</fsummary>
-      <type>
-        <v>AnySet = anyset()</v>
-        <v>Bool = bool()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if Set is an empty unordered set,
-          <c>false</c> otherwise.</p>
+        <p>Returns <c>true</c> if <anno>AnySet</anno> is an empty
+          unordered set, <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>is_equal(AnySet1, AnySet2) -> Bool</name>
+      <name name="is_equal" arity="2"/>
       <fsummary>Test two sets for equality.</fsummary>
-      <type>
-        <v>AnySet1 = AnySet2 = anyset()</v>
-        <v>Bool = bool()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if the AnySet1 and AnySet2 
+        <p>Returns <c>true</c> if the <anno>AnySet1</anno>
+	  and <anno>AnySet2</anno>
 	  are <seealso marker="#equal">equal</seealso>, <c>false</c> 
 	  otherwise. This example shows that <c>==/2</c> is used when
           comparing sets for equality:</p>
@@ -1119,67 +1064,49 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>is_set(AnySet) -> Bool</name>
+      <name name="is_set" arity="1"/>
       <fsummary>Test for an unordered set.</fsummary>
-      <type>
-        <v>AnySet = anyset()</v>
-        <v>Bool = bool()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if AnySet is 
+        <p>Returns <c>true</c> if <anno>AnySet</anno> is
 	  an <seealso marker="#sets_definition">unordered set</seealso>, and
-          <c>false</c> if AnySet is an ordered set or an atomic set.</p>
+          <c>false</c> if <anno>AnySet</anno> is an ordered set or an
+          atomic set.</p>
       </desc>
     </func>
     <func>
-      <name>is_sofs_set(Term) -> Bool</name>
+      <name name="is_sofs_set" arity="1"/>
       <fsummary>Test for an unordered set.</fsummary>
-      <type>
-        <v>Bool = bool()</v>
-        <v>Term = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if Term is 
+        <p>Returns <c>true</c> if <anno>Term</anno> is
           an <seealso marker="#sets_definition">unordered set</seealso>, an
           ordered set or an atomic set, <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>is_subset(Set1, Set2) -> Bool</name>
+      <name name="is_subset" arity="2"/>
       <fsummary>Test two sets for subset.</fsummary>
-      <type>
-        <v>Bool = bool()</v>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if Set1 is 
-	  a <seealso marker="#subset">subset</seealso> of Set2, <c>false</c>
-          otherwise.</p>
+        <p>Returns <c>true</c> if <anno>Set1</anno> is
+	  a <seealso marker="#subset">subset</seealso>
+	  of <anno>Set2</anno>, <c>false</c> otherwise.</p>
       </desc>
     </func>
     <func>
-      <name>is_type(Term) -> Bool</name>
+      <name name="is_type" arity="1"/>
       <fsummary>Test for a type.</fsummary>
-      <type>
-        <v>Bool = bool()</v>
-        <v>Term = term()</v>
-      </type>
       <desc>
-        <p>Returns <c>true</c> if the term Term is 
+        <p>Returns <c>true</c> if the term <anno>Term</anno> is
 	  a <seealso marker="#type">type</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>join(Relation1, I, Relation2, J) -> Relation3</name>
+      <name name="join" arity="4"/>
       <fsummary>Return the join of two relations.</fsummary>
-      <type>
-        <v>Relation1 = Relation2 = Relation3 = relation()</v>
-        <v>I = J = integer() > 0</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#natural_join">natural 
-	  join</seealso> of the relations Relation1 and Relation2 on
-          coordinates I and J.</p>
+	  join</seealso> of the relations <anno>Relation1</anno>
+	  and <anno>Relation2</anno> on coordinates <anno>I</anno> and
+	  <anno>J</anno>.</p>
         <pre>
 1> <input>R1 = sofs:relation([{a,x,1},{b,y,2}]),</input>
 <input>R2 = sofs:relation([{1,f,g},{1,h,i},{2,3,4}]),</input>
@@ -1189,20 +1116,17 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>multiple_relative_product(TupleOfBinRels, BinRel1) -> BinRel2</name>
+      <name name="multiple_relative_product" arity="2"/>
       <fsummary>Return the multiple relative product of a tuple of binary 
         relations and a relation.</fsummary>
-      <type>
-        <v>TupleOfBinRels = tuple-of(BinRel)</v>
-        <v>BinRel = BinRel1 = BinRel2 = binary_relation()</v>
-      </type>
-      <desc>
-        <p>If TupleOfBinRels is a non-empty tuple
-          {R[1],&nbsp;...,&nbsp;R[n]} of binary relations and BinRel1
-          is a binary relation, then BinRel2 is 
+      <desc>
+        <p>If <anno>TupleOfBinRels</anno> is a non-empty tuple
+          {R[1],&nbsp;...,&nbsp;R[n]} of binary relations
+          and <anno>BinRel1</anno> is a binary relation,
+          then <anno>BinRel2</anno> is
 	  the <seealso marker="#multiple_relative_product">multiple relative 
 	  product</seealso> of the ordered set
-          (R[i],&nbsp;...,&nbsp;R[n]) and BinRel1.</p>
+          (R[i],&nbsp;...,&nbsp;R[n]) and <anno>BinRel1</anno>.</p>
         <pre>
 1> <input>Ri = sofs:relation([{a,1},{b,2},{c,3}]),</input>
 <input>R = sofs:relation([{a,b},{b,c},{c,a}]),</input>
@@ -1212,29 +1136,21 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>no_elements(ASet) -> NoElements</name>
+      <name name="no_elements" arity="1"/>
       <fsummary>Return the number of elements of a set.</fsummary>
-      <type>
-        <v>ASet = set() | ordset()</v>
-        <v>NoElements = integer() >= 0 </v>
-      </type>
       <desc>
         <p>Returns the number of elements of the ordered or unordered
-          set ASet.</p>
+          set <anno>ASet</anno>.</p>
       </desc>
     </func>
     <func>
-      <name>partition(SetOfSets) -> Partition</name>
+      <name name="partition" arity="1"/>
       <fsummary>Return the coarsest partition given a set of sets.</fsummary>
-      <type>
-        <v>SetOfSets = set_of_sets()</v>
-        <v>Partition = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#partition">partition</seealso> of 
-	  the union of the set of sets SetOfSets such that two
+	  the union of the set of sets <anno>SetOfSets</anno> such that two
 	  elements are considered equal if they belong to the same
-	  elements of SetOfSets.</p>
+	  elements of <anno>SetOfSets</anno>.</p>
         <pre>
 1> <input>Sets1 = sofs:from_term([[a,b,c],[d,e,f],[g,h,i]]),</input>
 <input>Sets2 = sofs:from_term([[b,c,d],[e,f,g],[h,i,j]]),</input>
@@ -1244,17 +1160,12 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>partition(SetFun, Set) -> Partition</name>
+      <name name="partition" arity="2"/>
       <fsummary>Return a partition of a set.</fsummary>
-      <type>
-        <v>SetFun = set_fun()</v>
-        <v>Partition = set()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#partition">partition</seealso> of 
-          Set such that two elements are considered equal if the
-          results of applying SetFun are equal.</p>
+          <anno>Set</anno> such that two elements are considered equal
+          if the results of applying <anno>SetFun</anno> are equal.</p>
         <pre>
 1> <input>Ss = sofs:from_term([[a],[b],[c,d],[e,f]]),</input>
 <input>SetFun = fun(S) -> sofs:from_term(sofs:no_elements(S)) end,</input>
@@ -1264,19 +1175,16 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>partition(SetFun, Set1, Set2) -> {Set3, Set4}</name>
+      <name name="partition" arity="3"/>
       <fsummary>Return a partition of a set.</fsummary>
-      <type>
-        <v>SetFun = set_fun()</v>
-        <v>Set1 = Set2 = Set3 = Set4 = set()</v>
-      </type>
       <desc>
         <p>Returns a pair of sets that, regarded as constituting a
           set, forms a <seealso marker="#partition">partition</seealso> of 
-	  Set1. If the
-          result of applying SetFun to an element of Set1 yields an
-          element in Set2, the element belongs to Set3, otherwise the
-          element belongs to Set4.</p>
+	  <anno>Set1</anno>. If the
+          result of applying <anno>SetFun</anno> to an element
+          of <anno>Set1</anno> yields an element in <anno>Set2</anno>,
+          the element belongs to <anno>Set3</anno>, otherwise the
+          element belongs to <anno>Set4</anno>.</p>
         <pre>
 1> <input>R1 = sofs:relation([{1,a},{2,b},{3,c}]),</input>
 <input>S = sofs:set([2,4,6]),</input>
@@ -1289,21 +1197,17 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>partition_family(SetFun, Set) -> Family</name>
+      <name name="partition_family" arity="2"/>
       <fsummary>Return a family indexing a partition.</fsummary>
-      <type>
-        <v>Family = family()</v>
-        <v>SetFun = set_fun()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#family">family</seealso>
-          Family where the indexed set is 
-	  a <seealso marker="#partition">partition</seealso> of Set 
-	  such that two elements are considered equal if the results
-          of applying SetFun are the same value i. This i is the index
-          that Family maps onto 
-	  the <seealso marker="#equivalence_class">equivalence 
+          <anno>Family</anno> where the indexed set is
+	  a <seealso marker="#partition">partition</seealso>
+	  of <anno>Set</anno> such that two elements are considered
+	  equal if the results of applying <anno>SetFun</anno> are the
+	  same value i. This i is the index that <anno>Family</anno>
+	  maps onto
+	  the <seealso marker="#equivalence_class">equivalence
 	  class</seealso>.</p>
         <pre>
 1> <input>S = sofs:relation([{a,a,a,a},{a,a,b,b},{a,b,b,b}]),</input>
@@ -1314,18 +1218,15 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>product(TupleOfSets) -> Relation</name>
+      <name name="product" arity="1"/>
       <fsummary>Return the Cartesian product of a tuple of sets.</fsummary>
-      <type>
-        <v>Relation = relation()</v>
-        <v>TupleOfSets = tuple-of(set())</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#Cartesian_product_tuple">Cartesian 
 	  product</seealso> of the non-empty tuple of sets
-          TupleOfSets. If (x[1],&nbsp;...,&nbsp;x[n]) is an element of
-          the n-ary relation Relation, then x[i] is drawn from element
-          i of TupleOfSets.</p>
+          <anno>TupleOfSets</anno>. If (x[1],&nbsp;...,&nbsp;x[n]) is
+          an element of the n-ary relation <anno>Relation</anno>, then
+          x[i] is drawn from element i
+          of <anno>TupleOfSets</anno>.</p>
         <pre>
 1> <input>S1 = sofs:set([a,b]),</input>
 <input>S2 = sofs:set([1,2]),</input>
@@ -1336,15 +1237,12 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>product(Set1, Set2) -> BinRel</name>
+      <name name="product" arity="2"/>
       <fsummary>Return the Cartesian product of two sets.</fsummary>
-      <type>
-        <v>BinRel = binary_relation()</v>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#Cartesian_product">Cartesian 
-          product</seealso> of Set1 and Set2.</p>
+          product</seealso> of <anno>Set1</anno>
+          and <anno>Set2</anno>.</p>
         <pre>
 1> <input>S1 = sofs:set([1,2]),</input>
 <input>S2 = sofs:set([a,b]),</input>
@@ -1356,19 +1254,16 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>projection(SetFun, Set1) -> Set2</name>
+      <name name="projection" arity="2"/>
       <fsummary>Return a set of substituted elements.</fsummary>
-      <type>
-        <v>SetFun = set_fun()</v>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
         <p>Returns the set created by substituting each element of
-          Set1 by the result of applying SetFun to the element.</p>
-        <p>If SetFun is a number i&nbsp;&gt;=&nbsp;1 and Set1 is a
-          relation, then the returned set is 
-	  the <seealso marker="#projection">projection</seealso> of Set1 
-	  onto coordinate i.</p>
+          <anno>Set1</anno> by the result of
+          applying <anno>SetFun</anno> to the element.</p>
+        <p>If <anno>SetFun</anno> is a number i&nbsp;&gt;=&nbsp;1 and
+          <anno>Set1</anno> is a relation, then the returned set is
+          the <seealso marker="#projection">projection</seealso> of
+          <anno>Set1</anno> onto coordinate i.</p>
         <pre>
 1> <input>S1 = sofs:from_term([{1,a},{2,b},{3,a}]),</input>
 <input>S2 = sofs:projection(2, S1),</input>
@@ -1377,15 +1272,11 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>range(BinRel) -> Set</name>
+      <name name="range" arity="1"/>
       <fsummary>Return the range of a binary relation.</fsummary>
-      <type>
-        <v>BinRel = binary_relation()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#range">range</seealso> of the
-          binary relation BinRel.</p>
+          binary relation <anno>BinRel</anno>.</p>
         <pre>
 1> <input>R = sofs:relation([{1,a},{1,b},{2,b},{2,c}]),</input>
 <input>S = sofs:range(R),</input>
@@ -1394,41 +1285,33 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>relation(Tuples [, Type]) -> Relation</name>
+      <name name="relation" arity="1"/>
+      <name name="relation" arity="2"/>
       <fsummary>Create a relation.</fsummary>
-      <type>
-        <v>N = integer()</v>
-        <v>Type = N | type()</v>
-        <v>Relation = relation()</v>
-        <v>Tuples = [tuple()]</v>
-      </type>
       <desc>
         <p>Creates a <seealso marker="#relation">relation</seealso>.
           <c>relation(R,&nbsp;T)</c> is equivalent to
           <c>from_term(R,&nbsp;T)</c>, if T is 
 	  a <seealso marker="#type">type</seealso> and the result is a
-	  relation. If Type is an integer N, then
+	  relation. If <anno>Type</anno> is an integer N, then
           <c>[{atom,&nbsp;...,&nbsp;atom}])</c>, where the size of the
           tuple is N, is used as type of the relation. If no type is
-          explicitly given, the size of the first tuple of Tuples is
+          explicitly given, the size of the first tuple of
+          <anno>Tuples</anno> is
           used if there is such a tuple. <c>relation([])</c> is
           equivalent to <c>relation([],&nbsp;2)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>relation_to_family(BinRel) -> Family</name>
+      <name name="relation_to_family" arity="1"/>
       <fsummary>Create a family from a binary relation.</fsummary>
-      <type>
-        <v>Family = family()</v>
-        <v>BinRel = binary_relation()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#family">family</seealso>
-          Family such that the index set is equal to 
+          <anno>Family</anno> such that the index set is equal to
 	  the <seealso marker="#domain">domain</seealso> of the binary
-	  relation BinRel, and Family[i] is 
+	  relation <anno>BinRel</anno>, and <anno>Family</anno>[i] is
 	  the <seealso marker="#image">image</seealso> of the set of i 
-	  under BinRel.</p>
+	  under <anno>BinRel</anno>.</p>
         <pre>
 1> <input>R = sofs:relation([{b,1},{c,2},{c,3}]),</input>
 <input>F = sofs:relation_to_family(R),</input>
@@ -1437,63 +1320,57 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>relative_product(TupleOfBinRels [, BinRel1]) -> BinRel2</name>
-      <fsummary>Return the relative product of a tuple of binary relations
+      <name name="relative_product" arity="1"/>
+      <name name="relative_product" arity="2" clause_i="1"/>
+      <fsummary>Return the relative product of a list of binary relations
          and a binary relation.</fsummary>
-      <type>
-        <v>TupleOfBinRels = tuple-of(BinRel)</v>
-        <v>BinRel = BinRel1 = BinRel2 = binary_relation()</v>
-      </type>
-      <desc>
-        <p>If TupleOfBinRels is a non-empty tuple
-          {R[1],&nbsp;...,&nbsp;R[n]} of binary relations and BinRel1
-          is a binary relation, then BinRel2 is 
-	  the <seealso marker="#tuple_relative_product">relative 
-	  product</seealso> of the ordered set (R[i],&nbsp;...,&nbsp;R[n]) 
-	  and BinRel1.</p>
-        <p>If BinRel1 is omitted, the relation of equality between the
-          elements of 
-	  the <seealso marker="#Cartesian_product_tuple">Cartesian 
-	  product</seealso> of the ranges of R[i],
+      <desc>
+        <p>If <anno>ListOfBinRels</anno> is a non-empty list
+          [R[1],&nbsp;...,&nbsp;R[n]] of binary relations and
+          <anno>BinRel1</anno>
+          is a binary relation, then <anno>BinRel2</anno> is the <seealso
+          marker="#tuple_relative_product">relative product</seealso>
+          of the ordered set (R[i],&nbsp;...,&nbsp;R[n]) and
+          <anno>BinRel1</anno>.</p>
+        <p>If <anno>BinRel1</anno> is omitted, the relation of equality
+          between the elements of
+          the <seealso marker="#Cartesian_product_tuple">Cartesian
+          product</seealso> of the ranges of R[i],
           range&nbsp;R[1]&nbsp;&times;&nbsp;...&nbsp;&times;&nbsp;range&nbsp;R[n],
           is used instead (intuitively, nothing is "lost").</p>
         <pre>
 1> <input>TR = sofs:relation([{1,a},{1,aa},{2,b}]),</input>
 <input>R1 = sofs:relation([{1,u},{2,v},{3,c}]),</input>
-<input>R2 = sofs:relative_product({TR, R1}),</input>
+<input>R2 = sofs:relative_product([TR, R1]),</input>
 <input>sofs:to_external(R2).</input>
 [{1,{a,u}},{1,{aa,u}},{2,{b,v}}]</pre>
-        <p>Note that <c>relative_product({R1},&nbsp;R2)</c> is
+        <p>Note that <c>relative_product([R1],&nbsp;R2)</c> is
           different from <c>relative_product(R1,&nbsp;R2)</c>; the
-          tuple of one element is not identified with the element
+          list of one element is not identified with the element
           itself.</p>
       </desc>
     </func>
     <func>
-      <name>relative_product(BinRel1, BinRel2) -> BinRel3</name>
+      <name name="relative_product" arity="2" clause_i="2"/>
       <fsummary>Return the relative product of 
         two binary relations.</fsummary>
-      <type>
-        <v>BinRel1 = BinRel2 = BinRel3 = binary_relation()</v>
-      </type>
       <desc>
         <p><marker id="relprod_impl"></marker>Returns
           the <seealso marker="#relative_product">relative 
-	  product</seealso> of the binary relations BinRel1 and BinRel2.</p>
+	  product</seealso> of the binary relations <anno>BinRel1</anno>
+          and <anno>BinRel2</anno>.</p>
       </desc>
     </func>
     <func>
-      <name>relative_product1(BinRel1, BinRel2) -> BinRel3</name>
+      <name name="relative_product1" arity="2"/>
       <fsummary>Return the relative_product of 
         two binary relations.</fsummary>
-      <type>
-        <v>BinRel1 = BinRel2 = BinRel3 = binary_relation()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#relative_product">relative 
 	  product</seealso> of 
 	  the <seealso marker="#converse">converse</seealso> of the
-	  binary relation BinRel1 and the binary relation BinRel2.</p>
+	  binary relation <anno>BinRel1</anno> and the binary
+	  relation <anno>BinRel2</anno>.</p>
         <pre>
 1> <input>R1 = sofs:relation([{1,a},{1,aa},{2,b}]),</input>
 <input>R2 = sofs:relation([{1,u},{2,v},{3,c}]),</input>
@@ -1505,15 +1382,12 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>restriction(BinRel1, Set) -> BinRel2</name>
+      <name name="restriction" arity="2"/>
       <fsummary>Return a restriction of a binary relation.</fsummary>
-      <type>
-        <v>BinRel1 = BinRel2 = binary_relation()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#restriction">restriction</seealso> of
-          the binary relation BinRel1 to Set.</p>
+          the binary relation <anno>BinRel1</anno>
+          to <anno>Set</anno>.</p>
         <pre>
 1> <input>R1 = sofs:relation([{1,a},{2,b},{3,c}]),</input>
 <input>S = sofs:set([1,2,4]),</input>
@@ -1523,15 +1397,12 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>restriction(SetFun, Set1, Set2) -> Set3</name>
+      <name name="restriction" arity="3"/>
       <fsummary>Return a restriction of a set.</fsummary>
-      <type>
-        <v>SetFun = set_fun()</v>
-        <v>Set1 = Set2 = Set3 = set()</v>
-      </type>
       <desc>
-        <p>Returns a subset of Set1 containing those elements that
-          yield an element in Set2 as the result of applying SetFun.</p>
+        <p>Returns a subset of <anno>Set1</anno> containing those
+          elements that yield an element in <anno>Set2</anno> as the
+          result of applying <anno>SetFun</anno>.</p>
         <pre>
 1> <input>S1 = sofs:relation([{1,a},{2,b},{3,c}]),</input>
 <input>S2 = sofs:set([b,c,d]),</input>
@@ -1541,13 +1412,9 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>set(Terms [, Type]) -> Set</name>
+      <name name="set" arity="1"/>
+      <name name="set" arity="2"/>
       <fsummary>Create a set of atoms or any type of sets.</fsummary>
-      <type>
-        <v>Set = set()</v>
-        <v>Terms = [term()]</v>
-        <v>Type = type()</v>
-      </type>
       <desc>
         <p>Creates an <seealso marker="#sets_definition">unordered 
 	  set</seealso>. <c>set(L,&nbsp;T)</c> is equivalent to
@@ -1557,18 +1424,16 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>specification(Fun, Set1) -> Set2</name>
+      <name name="specification" arity="2"/>
       <fsummary>Select a subset using a predicate.</fsummary>
-      <type>
-        <v>Fun = spec_fun()</v>
-        <v>Set1 = Set2 = set()</v>
-      </type>
       <desc>
-        <p>Returns the set containing every element of Set1 for which
-          Fun returns <c>true</c>. If Fun is a tuple
+        <p>Returns the set containing every element
+          of <anno>Set1</anno> for which <anno>Fun</anno>
+          returns <c>true</c>. If <anno>Fun</anno> is a tuple
           <c>{external,&nbsp;Fun2}</c>, Fun2 is applied to the
           <seealso marker="#external_set">external set</seealso> of
-          each element, otherwise Fun is applied to each element.</p>
+          each element, otherwise <anno>Fun</anno> is applied to each
+          element.</p>
         <pre>
 1> <input>R1 = sofs:relation([{a,1},{b,2}]),</input>
 <input>R2 = sofs:relation([{x,1},{x,2},{y,3}]),</input>
@@ -1579,15 +1444,13 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>strict_relation(BinRel1) -> BinRel2</name>
+      <name name="strict_relation" arity="1"/>
       <fsummary>Return the strict relation corresponding to 
         a given relation.</fsummary>
-      <type>
-        <v>BinRel1 = BinRel2 = binary_relation()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#strict_relation">strict 
-          relation</seealso> corresponding to the binary relation BinRel1.</p>
+          relation</seealso> corresponding to the binary
+          relation <anno>BinRel1</anno>.</p>
         <pre>
 1> <input>R1 = sofs:relation([{1,1},{1,2},{2,1},{2,2}]),</input>
 <input>R2 = sofs:strict_relation(R1),</input>
@@ -1596,16 +1459,13 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>substitution(SetFun, Set1) -> Set2</name>
+      <name name="substitution" arity="2"/>
       <fsummary>Return a function with a given set as domain.</fsummary>
-      <type>
-        <v>SetFun = set_fun()</v>
-        <v>Set1 = Set2 = set()</v>
-      </type>
-      <desc>
-        <p>Returns a function, the domain of which is Set1. The value
-          of an element of the domain is the result of applying SetFun
-          to the element.</p>
+      <desc>
+        <p>Returns a function, the domain of which
+          is <anno>Set1</anno>. The value of an element of the domain
+          is the result of applying <anno>SetFun</anno> to the
+          element.</p>
         <pre>
 1> <input>L = [{a,1},{b,2}].</input>
 [{a,1},{b,2}]
@@ -1647,14 +1507,12 @@ images2(SetOfSets, BinRel) ->
       </desc>
     </func>
     <func>
-      <name>symdiff(Set1, Set2) -> Set3</name>
+      <name name="symdiff" arity="2"/>
       <fsummary>Return the symmetric difference of two sets.</fsummary>
-      <type>
-        <v>Set1 = Set2 = Set3 = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#symmetric_difference">symmetric 
-          difference</seealso> (or the Boolean sum) of Set1 and Set2.</p>
+          difference</seealso> (or the Boolean sum)
+          of <anno>Set1</anno> and <anno>Set2</anno>.</p>
         <pre>
 1> <input>S1 = sofs:set([1,2,3]),</input>
 <input>S2 = sofs:set([2,3,4]),</input>
@@ -1664,88 +1522,67 @@ images2(SetOfSets, BinRel) ->
       </desc>
     </func>
     <func>
-      <name>symmetric_partition(Set1, Set2) -> {Set3, Set4, Set5}</name>
+      <name name="symmetric_partition" arity="2"/>
       <fsummary>Return a partition of two sets.</fsummary>
-      <type>
-        <v>Set1 = Set2 = Set3 = Set4 = Set5 = set()</v>
-      </type>
       <desc>
-        <p>Returns a triple of sets: Set3 contains the elements
-          of Set1 that do not belong to Set2; Set4 contains the
-          elements of Set1 that belong to Set2; Set5 contains the
-          elements of Set2 that do not belong to Set1.</p>
+        <p>Returns a triple of sets: <anno>Set3</anno> contains the
+          elements of <anno>Set1</anno> that do not belong
+          to <anno>Set2</anno>; <anno>Set4</anno> contains the
+          elements of <anno>Set1</anno> that belong
+          to <anno>Set2</anno>; <anno>Set5</anno> contains the
+          elements of <anno>Set2</anno> that do not belong
+          to <anno>Set1</anno>.</p>
       </desc>
     </func>
     <func>
-      <name>to_external(AnySet) -> ExternalSet</name>
+      <name name="to_external" arity="1"/>
       <fsummary>Return the elements of a set.</fsummary>
-      <type>
-        <v>ExternalSet = external_set()</v>
-        <v>AnySet = anyset()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#external_set">external 
           set</seealso> of an atomic, ordered or unordered set.</p>
       </desc>
     </func>
     <func>
-      <name>to_sets(ASet) -> Sets</name>
+      <name name="to_sets" arity="1"/>
       <fsummary>Return a list or a tuple of the elements of set.</fsummary>
-      <type>
-        <v>ASet = set() | ordset()</v>
-        <v>Sets = tuple_of(AnySet) | [AnySet]</v>
-      </type>
       <desc>
-        <p>Returns the elements of the ordered set ASet as a tuple of
-          sets, and the elements of the unordered set ASet as a sorted
-          list of sets without duplicates.</p>
+        <p>Returns the elements of the ordered set <anno>ASet</anno>
+          as a tuple of sets, and the elements of the unordered set
+          <anno>ASet</anno> as a sorted list of sets without
+          duplicates.</p>
       </desc>
     </func>
     <func>
-      <name>type(AnySet) -> Type</name>
+      <name name="type" arity="1"/>
       <fsummary>Return the type of a set.</fsummary>
-      <type>
-        <v>AnySet = anyset()</v>
-        <v>Type = type()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#type">type</seealso> of an
           atomic, ordered or unordered set.</p>
       </desc>
     </func>
     <func>
-      <name>union(SetOfSets) -> Set</name>
+      <name name="union" arity="1"/>
       <fsummary>Return the union of a set of sets.</fsummary>
-      <type>
-        <v>Set = set()</v>
-        <v>SetOfSets = set_of_sets()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#union_n">union</seealso> of the
-          set of sets SetOfSets.</p>
+          set of sets <anno>SetOfSets</anno>.</p>
       </desc>
     </func>
     <func>
-      <name>union(Set1, Set2) -> Set3</name>
+      <name name="union" arity="2"/>
       <fsummary>Return the union of two sets.</fsummary>
-      <type>
-        <v>Set1 = Set2 = Set3 = set()</v>
-      </type>
       <desc>
         <p>Returns the <seealso marker="#union">union</seealso> of
-          Set1 and Set2.</p>
+          <anno>Set1</anno> and <anno>Set2</anno>.</p>
       </desc>
     </func>
     <func>
-      <name>union_of_family(Family) -> Set</name>
+      <name name="union_of_family" arity="1"/>
       <fsummary>Return the union of a family.</fsummary>
-      <type>
-        <v>Family = family()</v>
-        <v>Set = set()</v>
-      </type>
       <desc>
         <p>Returns the union of 
-          the <seealso marker="#family">family</seealso> Family.</p>
+          the <seealso marker="#family">family</seealso> <anno>Family</anno>.
+        </p>
         <pre>
 1> <input>F = sofs:family([{a,[0,2,4]},{b,[0,1,2]},{c,[2,3]}]),</input>
 <input>S = sofs:union_of_family(F),</input>
@@ -1754,17 +1591,15 @@ images2(SetOfSets, BinRel) ->
       </desc>
     </func>
     <func>
-      <name>weak_relation(BinRel1) -> BinRel2</name>
+      <name name="weak_relation" arity="1"/>
       <fsummary>Return the weak relation corresponding to 
         a given relation.</fsummary>
-      <type>
-        <v>BinRel1 = BinRel2 = binary_relation()</v>
-      </type>
       <desc>
         <p>Returns a subset S of the <seealso marker="#weak_relation">weak
           relation</seealso> W
-          corresponding to the binary relation BinRel1. Let F be the
-          <seealso marker="#field">field</seealso> of BinRel1. The
+          corresponding to the binary relation <anno>BinRel1</anno>.
+          Let F be the <seealso marker="#field">field</seealso> of
+          <anno>BinRel1</anno>. The
           subset S is defined so that x S y if x W y for some x in F
           and for some y in F.</p>
         <pre>
diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml
new file mode 100644
index 0000000000..98338b5ec2
--- /dev/null
+++ b/lib/stdlib/doc/src/specs.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="latin1" ?>
+<specs xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../specs/specs_array.xml"/>
+  <xi:include href="../specs/specs_base64.xml"/>
+  <xi:include href="../specs/specs_beam_lib.xml"/>
+  <xi:include href="../specs/specs_binary.xml"/>
+  <xi:include href="../specs/specs_c.xml"/>
+  <xi:include href="../specs/specs_calendar.xml"/>
+  <xi:include href="../specs/specs_dets.xml"/>
+  <xi:include href="../specs/specs_dict.xml"/>
+  <xi:include href="../specs/specs_digraph.xml"/>
+  <xi:include href="../specs/specs_digraph_utils.xml"/>
+  <xi:include href="../specs/specs_epp.xml"/>
+  <xi:include href="../specs/specs_erl_eval.xml"/>
+  <xi:include href="../specs/specs_erl_expand_records.xml"/>
+  <xi:include href="../specs/specs_erl_id_trans.xml"/>
+  <xi:include href="../specs/specs_erl_internal.xml"/>
+  <xi:include href="../specs/specs_erl_lint.xml"/>
+  <xi:include href="../specs/specs_erl_parse.xml"/>
+  <xi:include href="../specs/specs_erl_pp.xml"/>
+  <xi:include href="../specs/specs_erl_scan.xml"/>
+  <xi:include href="../specs/specs_erl_tar.xml"/>
+  <xi:include href="../specs/specs_ets.xml"/>
+  <xi:include href="../specs/specs_file_sorter.xml"/>
+  <xi:include href="../specs/specs_filelib.xml"/>
+  <xi:include href="../specs/specs_filename.xml"/>
+  <xi:include href="../specs/specs_gb_sets.xml"/>
+  <xi:include href="../specs/specs_gb_trees.xml"/>
+  <xi:include href="../specs/specs_gen_event.xml"/>
+  <xi:include href="../specs/specs_gen_fsm.xml"/>
+  <xi:include href="../specs/specs_gen_server.xml"/>
+  <xi:include href="../specs/specs_io.xml"/>
+  <xi:include href="../specs/specs_io_lib.xml"/>
+  <xi:include href="../specs/specs_lib.xml"/>
+  <xi:include href="../specs/specs_lists.xml"/>
+  <xi:include href="../specs/specs_log_mf_h.xml"/>
+  <xi:include href="../specs/specs_math.xml"/>
+  <xi:include href="../specs/specs_ms_transform.xml"/>
+  <xi:include href="../specs/specs_orddict.xml"/>
+  <xi:include href="../specs/specs_ordsets.xml"/>
+  <xi:include href="../specs/specs_pg.xml"/>
+  <xi:include href="../specs/specs_pool.xml"/>
+  <xi:include href="../specs/specs_proc_lib.xml"/>
+  <xi:include href="../specs/specs_proplists.xml"/>
+  <xi:include href="../specs/specs_qlc.xml"/>
+  <xi:include href="../specs/specs_queue.xml"/>
+  <xi:include href="../specs/specs_random.xml"/>
+  <xi:include href="../specs/specs_re.xml"/>
+  <xi:include href="../specs/specs_regexp.xml"/>
+  <xi:include href="../specs/specs_sets.xml"/>
+  <xi:include href="../specs/specs_shell.xml"/>
+  <xi:include href="../specs/specs_shell_default.xml"/>
+  <xi:include href="../specs/specs_slave.xml"/>
+  <xi:include href="../specs/specs_sofs.xml"/>
+  <xi:include href="../specs/specs_string.xml"/>
+  <xi:include href="../specs/specs_supervisor.xml"/>
+  <xi:include href="../specs/specs_supervisor_bridge.xml"/>
+  <xi:include href="../specs/specs_sys.xml"/>
+  <xi:include href="../specs/specs_timer.xml"/>
+  <xi:include href="../specs/specs_unicode.xml"/>
+  <xi:include href="../specs/specs_win32reg.xml"/>
+  <xi:include href="../specs/specs_zip.xml"/>
+</specs>
diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml
index de1b99a2d5..48867ffe72 100644
--- a/lib/stdlib/doc/src/string.xml
+++ b/lib/stdlib/doc/src/string.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -38,65 +38,46 @@
   </description>
   <funcs>
     <func>
-      <name>len(String) -> Length</name>
+      <name name="len" arity="1"/>
       <fsummary>Return the length of a string</fsummary>
-      <type>
-        <v>String = string()</v>
-        <v>Length = integer()</v>
-      </type>
       <desc>
         <p>Returns the number of characters in the string.</p>
       </desc>
     </func>
     <func>
-      <name>equal(String1, String2) -> bool()</name>
+      <name name="equal" arity="2"/>
       <fsummary>Test string equality</fsummary>
-      <type>
-        <v>String1 = String2 = string()</v>
-      </type>
       <desc>
         <p>Tests whether two strings are equal. Returns <c>true</c> if
           they are, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
-      <name>concat(String1, String2) -> String3</name>
+      <name name="concat" arity="2"/>
       <fsummary>Concatenate two strings</fsummary>
-      <type>
-        <v>String1 = String2 = String3 = string()</v>
-      </type>
       <desc>
         <p>Concatenates two strings to form a new string. Returns the
           new string.</p>
       </desc>
     </func>
     <func>
-      <name>chr(String, Character) -> Index</name>
-      <name>rchr(String, Character) -> Index</name>
+      <name name="chr" arity="2"/>
+      <name name="rchr" arity="2"/>
       <fsummary>Return the index of the first/last occurrence of<c>Character</c>in <c>String</c></fsummary>
-      <type>
-        <v>String = string()</v>
-        <v>Character = char()</v>
-        <v>Index = integer()</v>
-      </type>
       <desc>
         <p>Returns the index of the first/last occurrence of
-          <c>Character</c> in <c>String</c>. <c>0</c> is returned if <c>Character</c> does not
+          <c><anno>Character</anno></c> in <c><anno>String</anno></c>. <c>0</c> is returned if <c><anno>Character</anno></c> does not
           occur.</p>
       </desc>
     </func>
     <func>
-      <name>str(String, SubString) -> Index</name>
-      <name>rstr(String, SubString) -> Index</name>
+      <name name="str" arity="2"/>
+      <name name="rstr" arity="2"/>
       <fsummary>Find the index of a substring</fsummary>
-      <type>
-        <v>String = SubString = string()</v>
-        <v>Index = integer()</v>
-      </type>
       <desc>
         <p>Returns the position where the first/last occurrence of
-          <c>SubString</c> begins in <c>String</c>. <c>0</c> is returned if <c>SubString</c>
-          does not exist in <c>String</c>.
+          <c><anno>SubString</anno></c> begins in <c><anno>String</anno></c>. <c>0</c> is returned if <c><anno>SubString</anno></c>
+          does not exist in <c><anno>String</anno></c>.
           For example:</p>
         <code type="none">
 > string:str(" Hello Hello World World ", "Hello World").
@@ -104,17 +85,13 @@
       </desc>
     </func>
     <func>
-      <name>span(String, Chars) -> Length </name>
-      <name>cspan(String, Chars) -> Length</name>
+      <name name="span" arity="2"/>
+      <name name="cspan" arity="2"/>
       <fsummary>Span characters at start of string</fsummary>
-      <type>
-        <v>String = Chars = string()</v>
-        <v>Length = integer()</v>
-      </type>
       <desc>
         <p>Returns the length of the maximum initial segment of
-          String, which consists entirely of characters from (not
-          from) Chars.</p>
+          <c><anno>String</anno></c>, which consists entirely of characters from (not
+          from) <c><anno>Chars</anno></c>.</p>
         <p>For example:</p>
         <code type="none">
 > string:span("\t    abcdef", " \t").
@@ -124,17 +101,13 @@
       </desc>
     </func>
     <func>
-      <name>substr(String, Start) -> SubString</name>
-      <name>substr(String, Start, Length) -> Substring</name>
+      <name name="substr" arity="2"/>
+      <name name="substr" arity="3"/>
       <fsummary>Return a substring of <c>String</c></fsummary>
-      <type>
-        <v>String = SubString = string()</v>
-        <v>Start = Length = integer()</v>
-      </type>
       <desc>
-        <p>Returns a substring of <c>String</c>, starting at the
-          position <c>Start</c>, and ending at the end of the string or
-          at length <c>Length</c>.</p>
+        <p>Returns a substring of <c><anno>String</anno></c>, starting at the
+          position <c><anno>Start</anno></c>, and ending at the end of the string or
+          at length <c><anno>Length</anno></c>.</p>
         <p>For example:</p>
         <code type="none">
 > substr("Hello World", 4, 5).
@@ -142,15 +115,11 @@
       </desc>
     </func>
     <func>
-      <name>tokens(String, SeparatorList) -> Tokens</name>
+      <name name="tokens" arity="2"/>
       <fsummary>Split string into tokens</fsummary>
-      <type>
-        <v>String = SeparatorList = string()</v>
-        <v>Tokens = [string()]</v>
-      </type>
       <desc>
-        <p>Returns a list of tokens in <c>String</c>, separated by the
-          characters in <c>SeparatorList</c>.</p>
+        <p>Returns a list of tokens in <c><anno>String</anno></c>, separated by the
+          characters in <c><anno>SeparatorList</anno></c>.</p>
         <p>For example:</p>
         <code type="none">
 > tokens("abc defxxghix jkl", "x ").
@@ -158,15 +127,11 @@
       </desc>
     </func>
     <func>
-      <name>join(StringList, Separator) -> String</name>
+      <name name="join" arity="2"/>
       <fsummary>Join a list of strings with separator</fsummary>
-      <type>
-	<v>StringList = [string()]</v>
-	<v>Separator = string()</v>
-      </type>
       <desc>
-	<p>Returns a string with the elements of <c>StringList</c>
-	  separated by the string in <c>Seperator</c>.</p>
+	<p>Returns a string with the elements of <c><anno>StringList</anno></c>
+	  separated by the string in <c><anno>Separator</anno></c>.</p>
 	<p>For example:</p>
 	<code type="none">
 > join(["one", "two", "three"], ", ").
@@ -174,44 +139,30 @@
       </desc>
     </func>
     <func>
-      <name>chars(Character, Number) -> String</name>
-      <name>chars(Character, Number, Tail) -> String</name>
+      <name name="chars" arity="2"/>
+      <name name="chars" arity="3"/>
       <fsummary>Returns a string consisting of numbers of characters</fsummary>
-      <type>
-        <v>Character = char()</v>
-        <v>Number = integer()</v>
-        <v>String = string()</v>
-      </type>
       <desc>
-        <p>Returns a string consisting of <c>Number</c> of characters
-          <c>Character</c>. Optionally, the string can end with the
-          string <c>Tail</c>.</p>
+        <p>Returns a string consisting of <c><anno>Number</anno></c> of characters
+          <c><anno>Character</anno></c>. Optionally, the string can end with the
+          string <c><anno>Tail</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>copies(String, Number) -> Copies</name>
+      <name name="copies" arity="2"/>
       <fsummary>Copy a string</fsummary>
-      <type>
-        <v>String = Copies = string()</v>
-        <v>Number = integer()</v>
-      </type>
       <desc>
-        <p>Returns a string containing <c>String</c> repeated
-          <c>Number</c> times.</p>
+        <p>Returns a string containing <c><anno>String</anno></c> repeated
+          <c><anno>Number</anno></c> times.</p>
       </desc>
     </func>
     <func>
-      <name>words(String) -> Count</name>
-      <name>words(String, Character) -> Count</name>
+      <name name="words" arity="1"/>
+      <name name="words" arity="2"/>
       <fsummary>Count blank separated words</fsummary>
-      <type>
-        <v>String = string()</v>
-        <v>Character = char()</v>
-        <v>Count = integer()</v>
-      </type>
       <desc>
-        <p>Returns the number of words in <c>String</c>, separated by
-          blanks or <c>Character</c>.</p>
+        <p>Returns the number of words in <c><anno>String</anno></c>, separated by
+          blanks or <c><anno>Character</anno></c>.</p>
         <p>For example:</p>
         <code type="none">
 > words(" Hello old boy!", $o).
@@ -219,17 +170,12 @@
       </desc>
     </func>
     <func>
-      <name>sub_word(String, Number) -> Word</name>
-      <name>sub_word(String, Number, Character) -> Word</name>
+      <name name="sub_word" arity="2"/>
+      <name name="sub_word" arity="3"/>
       <fsummary>Extract subword</fsummary>
-      <type>
-        <v>String = Word = string()</v>
-        <v>Character = char()</v>
-        <v>Number = integer()</v>
-      </type>
       <desc>
-        <p>Returns the word in position <c>Number</c> of <c>String</c>.
-          Words are separated by blanks or <c>Character</c>s.</p>
+        <p>Returns the word in position <c><anno>Number</anno></c> of <c><anno>String</anno></c>.
+          Words are separated by blanks or <c><anno>Character</anno></c>s.</p>
         <p>For example:</p>
         <code type="none">
 > string:sub_word(" Hello old boy !",3,$o).
@@ -237,19 +183,14 @@
       </desc>
     </func>
     <func>
-      <name>strip(String) -> Stripped</name>
-      <name>strip(String, Direction) -> Stripped</name>
-      <name>strip(String, Direction, Character) -> Stripped</name>
+      <name name="strip" arity="1"/>
+      <name name="strip" arity="2"/>
+      <name name="strip" arity="3"/>
       <fsummary>Strip leading or trailing characters</fsummary>
-      <type>
-        <v>String = Stripped = string()</v>
-        <v>Direction = left | right | both</v>
-        <v>Character = char()</v>
-      </type>
       <desc>
         <p>Returns a string, where leading and/or trailing blanks or a
-          number of <c>Character</c> have been removed.
-          <c>Direction</c> can be <c>left</c>, <c>right</c>, or
+          number of <c><anno>Character</anno></c> have been removed.
+          <c><anno>Direction</anno></c> can be <c>left</c>, <c>right</c>, or
           <c>both</c> and indicates from which direction blanks are to be
           removed. The function <c>strip/1</c> is equivalent to
           <c>strip(String, both)</c>.</p>
@@ -260,19 +201,14 @@
       </desc>
     </func>
     <func>
-      <name>left(String, Number) -> Left</name>
-      <name>left(String, Number, Character) -> Left</name>
+      <name name="left" arity="2"/>
+      <name name="left" arity="3"/>
       <fsummary>Adjust left end of string</fsummary>
-      <type>
-        <v>String = Left = string()</v>
-        <v>Character = char</v>
-        <v>Number = integer()</v>
-      </type>
       <desc>
-        <p>Returns the <c>String</c> with the length adjusted in
-          accordance with <c>Number</c>. The left margin is
-          fixed. If the <c>length(String)</c> &lt; <c>Number</c>,
-          <c>String</c> is padded with blanks or <c>Character</c>s.</p>
+        <p>Returns the <c><anno>String</anno></c> with the length adjusted in
+          accordance with <c><anno>Number</anno></c>. The left margin is
+          fixed. If the <c>length(<anno>String</anno>)</c> &lt; <c><anno>Number</anno></c>,
+          <c><anno>String</anno></c> is padded with blanks or <c><anno>Character</anno></c>s.</p>
         <p>For example:</p>
         <code type="none">
 > string:left("Hello",10,$.).
@@ -280,19 +216,14 @@
       </desc>
     </func>
     <func>
-      <name>right(String, Number) -> Right</name>
-      <name>right(String, Number, Character) -> Right</name>
+      <name name="right" arity="2"/>
+      <name name="right" arity="3"/>
       <fsummary>Adjust right end of string</fsummary>
-      <type>
-        <v>String = Right = string()</v>
-        <v>Character = char</v>
-        <v>Number = integer()</v>
-      </type>
       <desc>
-        <p>Returns the <c>String</c> with the length adjusted in
-          accordance with <c>Number</c>. The right margin is
-          fixed. If the length of <c>(String)</c> &lt; <c>Number</c>,
-          <c>String</c> is padded with blanks or <c>Character</c>s.</p>
+        <p>Returns the <c><anno>String</anno></c> with the length adjusted in
+          accordance with <c><anno>Number</anno></c>. The right margin is
+          fixed. If the length of <c>(<anno>String</anno>)</c> &lt; <c><anno>Number</anno></c>,
+          <c><anno>String</anno></c> is padded with blanks or <c><anno>Character</anno></c>s.</p>
         <p>For example:</p>
         <code type="none">
 > string:right("Hello", 10, $.).
@@ -300,32 +231,23 @@
       </desc>
     </func>
     <func>
-      <name>centre(String, Number) -> Centered</name>
-      <name>centre(String, Number, Character) -> Centered</name>
+      <name name="centre" arity="2"/>
+      <name name="centre" arity="3"/>
       <fsummary>Center a string</fsummary>
-      <type>
-        <v>String = Centered = string()</v>
-        <v>Character = char</v>
-        <v>Number = integer()</v>
-      </type>
       <desc>
-        <p>Returns a string, where <c>String</c> is centred in the
+        <p>Returns a string, where <c><anno>String</anno></c> is centred in the
           string and surrounded by blanks or characters. The resulting
-          string will have the length <c>Number</c>.</p>
+          string will have the length <c><anno>Number</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>sub_string(String, Start) -> SubString</name>
-      <name>sub_string(String, Start, Stop) -> SubString</name>
+      <name name="sub_string" arity="2"/>
+      <name name="sub_string" arity="3"/>
       <fsummary>Extract a substring</fsummary>
-      <type>
-        <v>String = SubString = string()</v>
-        <v>Start = Stop = integer()</v>
-      </type>
       <desc>
-        <p>Returns a substring of <c>String</c>, starting at the
-          position <c>Start</c> to the end of the string, or to and
-          including the <c>Stop</c> position.</p>
+        <p>Returns a substring of <c><anno>String</anno></c>, starting at the
+          position <c><anno>Start</anno></c> to the end of the string, or to and
+          including the <c><anno>Stop</anno></c> position.</p>
         <p>For example:</p>
         <code type="none">
 sub_string("Hello World", 4, 8).
@@ -383,15 +305,15 @@ sub_string("Hello World", 4, 8).
       </desc>
     </func>
     <func>
-      <name>to_lower(String) -> Result</name>
-      <name>to_lower(Char) -> CharResult</name>
-      <name>to_upper(String) -> Result</name>
-      <name>to_upper(Char) -> CharResult</name>
+      <name name="to_lower" arity="1" clause_i="1"/>
+      <name name="to_lower" arity="1" clause_i="2"/>
+      <name name="to_upper" arity="1" clause_i="1"/>
+      <name name="to_upper" arity="1" clause_i="2"/>
       <fsummary>Convert case of string (ISO/IEC 8859-1)</fsummary>
-      <type>
-        <v>String = Result = string()</v>
-        <v>Char = CharResult = integer()</v>
-      </type>
+      <type variable="String" name_i="1"/>
+      <type variable="Result" name_i="1"/>
+      <type variable="Char"/>
+      <type variable="CharResult"/>
       <desc>
         <p>The given string or character is case-converted. Note that
           the supported character set is ISO/IEC 8859-1 (a.k.a. Latin 1),
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index 45fa0847a8..009aa60faa 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -83,11 +83,17 @@
           supervisor, where all child processes are dynamically added
           instances of the same process type, i.e. running the same
           code.</p>
-        <p>The functions <c>terminate_child/2</c>, <c>delete_child/2</c>
+        <p>The functions <c>delete_child/2</c>
           and <c>restart_child/2</c> are invalid for
           <c>simple_one_for_one</c> supervisors and will return
           <c>{error,simple_one_for_one}</c> if the specified supervisor
           uses this restart strategy.</p>
+        <p>The function <c>terminate_child/2</c> can be used for
+          children under <c>simple_one_for_one</c> supervisors by
+          giving the child's <c>pid()</c> as the second argument. If
+          instead the child specification identifier is used,
+          <c>terminate_child/2</c> will return
+          <c>{error,simple_one_for_one}</c>.</p>
       </item>
     </list>
     <p>To prevent a supervisor from getting into an infinite loop of
@@ -193,51 +199,81 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
       </item>
     </list>
   </section>
+  <datatypes>
+    <datatype>
+      <name name="child"/>
+    </datatype>
+    <datatype>
+      <name name="child_id"/>
+      <desc><p>Not a <c>pid()</c>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="child_spec"/>
+    </datatype>
+    <datatype>
+      <name name="mfargs"/>
+      <desc><p><c>A</c> (the argument list) has the value
+         <c>undefined</c> if <c>Restart</c> is <c>temporary</c>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="modules"/>
+    </datatype>
+    <datatype>
+      <name name="restart"/>
+    </datatype>
+    <datatype>
+      <name name="shutdown"/>
+    </datatype>
+    <datatype>
+      <name name="strategy"/>
+    </datatype>
+    <datatype>
+      <name name="sup_ref"/>
+    </datatype>
+    <datatype>
+      <name name="worker"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>start_link(Module, Args) -> Result</name>
-      <name>start_link(SupName, Module, Args) -> Result</name>
+      <name name="start_link" arity="2"/>
+      <name name="start_link" arity="3"/>
       <fsummary>Create a supervisor process.</fsummary>
-      <type>
-        <v>SupName = {local,Name} | {global,Name}</v>
-        <v>&nbsp;Name = atom()</v>
-        <v>Module = atom()</v>
-        <v>Args = term()</v>
-        <v>Result = {ok,Pid} | ignore | {error,Error}</v>
-        <v>&nbsp;Pid = pid()</v>
-        <v>&nbsp;Error = {already_started,Pid}} | shutdown | term()</v>
-      </type>
+      <type name="startlink_ret"/>
+      <type name="startlink_err"/>
+      <type name="sup_name"/>
       <desc>
         <p>Creates a supervisor process as part of a supervision tree.
           The function will, among other things, ensure that
           the supervisor is linked to the calling process (its
           supervisor).</p>
-        <p>The created supervisor process calls <c>Module:init/1</c> to
+        <p>The created supervisor process calls <c><anno>Module</anno>:init/1</c> to
           find out about restart strategy, maximum restart frequency
           and child processes. To ensure a synchronized start-up
           procedure, <c>start_link/2,3</c> does not return until
-          <c>Module:init/1</c> has returned and all child processes
+          <c><anno>Module</anno>:init/1</c> has returned and all child processes
           have been started.</p>
-        <p>If <c>SupName={local,Name}</c> the supervisor is registered
+        <p>If <c><anno>SupName</anno>={local,Name}</c> the supervisor is registered
           locally as <c>Name</c> using <c>register/2</c>. If
-          <c>SupName={global,Name}</c> the supervisor is registered
+          <c><anno>SupName</anno>={global,Name}</c> the supervisor is registered
           globally as <c>Name</c> using <c>global:register_name/2</c>.
           If no name is provided, the supervisor is not registered.</p>
-        <p><c>Module</c> is the name of the callback module.</p>
-        <p><c>Args</c> is an arbitrary term which is passed as
-          the argument to <c>Module:init/1</c>.</p>
+        <p><c><anno>Module</anno></c> is the name of the callback module.</p>
+        <p><c><anno>Args</anno></c> is an arbitrary term which is passed as
+          the argument to <c><anno>Module</anno>:init/1</c>.</p>
         <p>If the supervisor and its child processes are successfully
           created (i.e. if all child process start functions return
           <c>{ok,Child}</c>, <c>{ok,Child,Info}</c>, or <c>ignore</c>)
           the function returns <c>{ok,Pid}</c>, where <c>Pid</c> is
           the pid of the supervisor. If there already exists a process
-          with the specified <c>SupName</c> the function returns
+          with the specified <c><anno>SupName</anno></c> the function returns
           <c>{error,{already_started,Pid}}</c>, where <c>Pid</c> is
           the pid of that process.</p>
-        <p>If <c>Module:init/1</c> returns <c>ignore</c>, this function
+        <p>If <c><anno>Module</anno>:init/1</c> returns <c>ignore</c>, this function
           returns <c>ignore</c> as well and the supervisor terminates
           with reason <c>normal</c>.
-          If <c>Module:init/1</c> fails or returns an incorrect value,
+          If <c><anno>Module</anno>:init/1</c> fails or returns an incorrect value,
           this function returns <c>{error,Term}</c> where <c>Term</c>
           is a term with information about the error, and the supervisor
           terminates with reason <c>Term</c>.</p>
@@ -249,21 +285,15 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
       </desc>
     </func>
     <func>
-      <name>start_child(SupRef, ChildSpec) -> Result</name>
+      <name name="start_child" arity="2"/>
       <fsummary>Dynamically add a child process to a supervisor.</fsummary>
-      <type>
-        <v>SupRef = Name | {Name,Node} | {global,Name} | pid()</v>
-        <v>&nbsp;Name = Node = atom()</v>
-        <v>ChildSpec = child_spec() | [term()]</v>
-        <v>Result = {ok,Child} | {ok,Child,Info} | {error,Error}</v>
-        <v>&nbsp;Child = pid() | undefined</v>
-        <v>&nbsp;Info = term()</v>
-        <v>&nbsp;Error = already_present | {already_started,Child} | term()</v>
-      </type>
+      <type name="child_spec"/>
+      <type name="startchild_ret"/>
+      <type name="startchild_err"/>
       <desc>
         <p>Dynamically adds a child specification to the supervisor
-          <c>SupRef</c> which starts the corresponding child process.</p>
-        <p><c>SupRef</c> can be:</p>
+          <c><anno>SupRef</anno></c> which starts the corresponding child process.</p>
+        <p><marker id="SupRef"><c><anno>SupRef</anno></c></marker> can be:</p>
         <list type="bulleted">
           <item>the pid,</item>
           <item><c>Name</c>, if the supervisor is locally registered,</item>
@@ -272,26 +302,26 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           <item><c>{global,Name}</c>, if the supervisor is globally
            registered.</item>
         </list>
-        <p><c>ChildSpec</c> should be a valid child specification
+        <p><c><anno>ChildSpec</anno></c> should be a valid child specification
           (unless the supervisor is a <c>simple_one_for_one</c>
           supervisor, see below). The child process will be started by
           using the start function as defined in the child
           specification.</p>
         <p>If the case of a <c>simple_one_for_one</c> supervisor,
           the child specification defined in <c>Module:init/1</c> will
-          be used and <c>ChildSpec</c> should instead be an arbitrary
-          list of terms <c>List</c>. The child process will then be
-          started by appending <c>List</c> to the existing start
+          be used and <c><anno>ChildSpec</anno></c> should instead be an arbitrary
+          list of terms <c><anno>List</anno></c>. The child process will then be
+          started by appending <c><anno>List</anno></c> to the existing start
           function arguments, i.e. by calling
-          <c>apply(M, F, A++List)</c> where <c>{M,F,A}</c> is the start
+          <c>apply(M, F, A++<anno>List</anno>)</c> where <c>{M,F,A}</c> is the start
           function defined in the child specification.</p>
         <p>If there already exists a child specification with
-          the specified <c>Id</c>, <c>ChildSpec</c> is discarded and
+          the specified <c><anno>Id</anno></c>, <c><anno>ChildSpec</anno></c> is discarded and
           the function returns <c>{error,already_present}</c> or
-          <c>{error,{already_started,Child}}</c>, depending on if
+          <c>{error,{already_started,<anno>Child</anno>}}</c>, depending on if
           the corresponding child process is running or not.</p>
-        <p>If the child process start function returns <c>{ok,Child}</c>
-          or <c>{ok,Child,Info}</c>, the child specification and pid is
+        <p>If the child process start function returns <c>{ok,<anno>Child</anno>}</c>
+          or <c>{ok,<anno>Child</anno>,<anno>Info</anno>}</c>, the child specification and pid is
           added to the supervisor and the function returns the same
           value.</p>
         <p>If the child process start function returns <c>ignore</c>,
@@ -306,138 +336,114 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
       </desc>
     </func>
     <func>
-      <name>terminate_child(SupRef, Id) -> Result</name>
+      <name name="terminate_child" arity="2"/>
       <fsummary>Terminate a child process belonging to a supervisor.</fsummary>
-      <type>
-        <v>SupRef = Name | {Name,Node} | {global,Name} | pid()</v>
-        <v>&nbsp;Name = Node = atom()</v>
-        <v>Id = term()</v>
-        <v>Result = ok | {error,Error}</v>
-        <v>&nbsp;Error = not_found | simple_one_for_one</v>
-      </type>
       <desc>
-        <p>Tells the supervisor <c>SupRef</c> to terminate the child
-          process corresponding to the child specification identified
-          by <c>Id</c>. The process, if there is one, is terminated but
-          the child specification is kept by the supervisor. This means
-          that the child process may be later be restarted by
-          the supervisor. The child process can also be restarted
-          explicitly by calling <c>restart_child/2</c>. Use
-          <c>delete_child/2</c> to remove the child specification.</p>
-        <p>See <c>start_child/2</c> for a description of
-          <c>SupRef</c>.</p>
+        <p>Tells the supervisor <c><anno>SupRef</anno></c> to terminate the given
+          child.</p>
+        <p>If the supervisor is not <c>simple_one_for_one</c>,
+          <c><anno>Id</anno></c> must be the child specification identifier. The
+          process, if there is one, is terminated but the child
+          specification is kept by the supervisor. The child process
+          may later be restarted by the supervisor. The child process
+          can also be restarted explicitly by calling
+          <c>restart_child/2</c>. Use <c>delete_child/2</c> to remove
+          the child specification.</p>
+        <p>If the supervisor is <c>simple_one_for_one</c>, <c><anno>Id</anno></c>
+          must be the child process' <c>pid()</c>. I the specified
+          process is alive, but is not a child of the given
+          supervisor, the function will return
+          <c>{error,not_found}</c>. If the child specification
+          identifier is given instead instead of a <c>pid()</c>, the
+          function will return <c>{error,simple_one_for_one}</c>.</p>
         <p>If successful, the function returns <c>ok</c>. If there is
-          no child specification with the specified <c>Id</c>,
-          the function returns <c>{error,not_found}</c>.</p>
+          no child specification with the specified <c><anno>Id</anno></c>, the
+          function returns <c>{error,not_found}</c>.</p>
+        <p>See <c>start_child/2</c> for a description of
+          <c><anno>SupRef</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>delete_child(SupRef, Id) -> Result</name>
+      <name name="delete_child" arity="2"/>
       <fsummary>Delete a child specification from a supervisor.</fsummary>
-      <type>
-        <v>SupRef = Name | {Name,Node} | {global,Name} | pid()</v>
-        <v>&nbsp;Name = Node = atom()</v>
-        <v>Id = term()</v>
-        <v>Result = ok | {error,Error}</v>
-        <v>&nbsp;Error = running | not_found | simple_one_for_one</v>
-      </type>
       <desc>
-        <p>Tells the supervisor <c>SupRef</c> to delete the child
-          specification identified by <c>Id</c>. The corresponding child
+        <p>Tells the supervisor <c><anno>SupRef</anno></c> to delete the child
+          specification identified by <c><anno>Id</anno></c>. The corresponding child
           process must not be running, use <c>terminate_child/2</c> to
           terminate it.</p>
-        <p>See <c>start_child/2</c> for a description of <c>SupRef</c>.</p>
+        <p>See <seealso marker="#SupRef"><c>start_child/2</c></seealso> for a description of
+          <c>SupRef</c>.</p>
         <p>If successful, the function returns <c>ok</c>. If the child
-          specification identified by <c>Id</c> exists but
+          specification identified by <c><anno>Id</anno></c> exists but
           the corresponding child process is running, the function
           returns <c>{error,running}</c>. If the child specification
-          identified by <c>Id</c> does not exist, the function returns
+          identified by <c><anno>Id</anno></c> does not exist, the function returns
           <c>{error,not_found}</c>.</p>
       </desc>
     </func>
     <func>
-      <name>restart_child(SupRef, Id) -> Result</name>
+      <name name="restart_child" arity="2"/>
       <fsummary>Restart a terminated child process belonging to a supervisor.</fsummary>
-      <type>
-        <v>SupRef = Name | {Name,Node} | {global,Name} | pid()</v>
-        <v>&nbsp;Name = Node = atom()</v>
-        <v>Id = term()</v>
-        <v>Result = {ok,Child} | {ok,Child,Info} | {error,Error}</v>
-        <v>&nbsp;Child = pid() | undefined</v>
-        <v>&nbsp;Error = running | not_found | simple_one_for_one | term()</v>
-      </type>
       <desc>
-        <p>Tells the supervisor <c>SupRef</c> to restart a child process
+        <p>Tells the supervisor <c><anno>SupRef</anno></c> to restart a child process
           corresponding to the child specification identified by
-          <c>Id</c>. The child specification must exist and
+          <c><anno>Id</anno></c>. The child specification must exist and
           the corresponding child process must not be running.</p>
-        <p>See <c>start_child/2</c> for a description of <c>SupRef</c>.</p>
-        <p>If the child specification identified by <c>Id</c> does not
+        <p>See <seealso marker="#SupRef"><c>start_child/2</c></seealso> for a description of
+          <c>SupRef</c>.</p>
+        <p>If the child specification identified by <c><anno>Id</anno></c> does not
           exist, the function returns <c>{error,not_found}</c>. If
           the child specification exists but the corresponding process
           is already running, the function returns
           <c>{error,running}</c>.</p>
-        <p>If the child process start function returns <c>{ok,Child}</c>
-          or <c>{ok,Child,Info}</c>, the pid is added to the supervisor
+        <p>If the child process start function returns <c>{ok,<anno>Child</anno>}</c>
+          or <c>{ok,<anno>Child</anno>,<anno>Info</anno>}</c>, the pid is added to the supervisor
           and the function returns the same value.</p>
         <p>If the child process start function returns <c>ignore</c>,
           the pid remains set to <c>undefined</c> and the function
           returns <c>{ok,undefined}</c>.</p>
         <p>If the child process start function returns an error tuple or
           an erroneous value, or if it fails, the function returns
-          <c>{error,Error}</c> where <c>Error</c> is a term containing
+          <c>{error,<anno>Error</anno>}</c> where <c><anno>Error</anno></c> is a term containing
           information about the error.</p>
       </desc>
     </func>
     <func>
-      <name>which_children(SupRef) -> [{Id,Child,Type,Modules}]</name>
+      <name name="which_children" arity="1"/>
       <fsummary>Return information about all children specifications and child processes belonging to a supervisor.</fsummary>
-      <type>
-        <v>SupRef = Name | {Name,Node} | {global,Name} | pid()</v>
-        <v>&nbsp;Name = Node = atom()</v>
-        <v>Id = term() | undefined</v>
-        <v>Child = pid() | undefined</v>
-        <v>Type = worker | supervisor</v>
-        <v>Modules = [Module] | dynamic</v>
-        <v>&nbsp;Module = atom()</v>
-      </type>
       <desc>
         <p>Returns a newly created list with information about all child
           specifications and child processes belonging to
-          the supervisor <c>SupRef</c>.</p>
+          the supervisor <c><anno>SupRef</anno></c>.</p>
         <p>Note that calling this function when supervising a large
           number of children under low memory conditions can cause an
           out of memory exception.</p>
-        <p>See <c>start_child/2</c> for a description of <c>SupRef</c>.</p>
+        <p>See <seealso marker="#SupRef"><c>start_child/2</c></seealso> for a description of
+          <c>SupRef</c>.</p>
         <p>The information given for each child specification/process
           is:</p>
         <list type="bulleted">
           <item>
-            <p><c>Id</c> - as defined in the child specification or
+            <p><c><anno>Id</anno></c> - as defined in the child specification or
               <c>undefined</c> in the case of a
               <c>simple_one_for_one</c> supervisor.</p>
           </item>
           <item>
-            <p><c>Child</c> - the pid of the corresponding child
+            <p><c><anno>Child</anno></c> - the pid of the corresponding child
               process, or <c>undefined</c> if there is no such process.</p>
           </item>
           <item>
-            <p><c>Type</c> - as defined in the child specification.</p>
+            <p><c><anno>Type</anno></c> - as defined in the child specification.</p>
           </item>
           <item>
-            <p><c>Modules</c> - as defined in the child specification.</p>
+            <p><c><anno>Modules</anno></c> - as defined in the child specification.</p>
           </item>
         </list>
       </desc>
     </func>
     <func>
-      <name>count_children(SupRef) -> PropListOfCounts</name>
+      <name name="count_children" arity="1"/>
       <fsummary>Return counts for the number of childspecs, active children, supervisors and workers.</fsummary>
-      <type>
-        <v>SupRef = Name | {Name,Node} | {global,Name} | pid()</v>
-        <v>&nbsp;Name = Node = atom()</v>
-        <v>PropListOfCounts = [{specs, ChildSpecCount}, {active, ActiveProcessCount}, {supervisors, ChildSupervisorCount}, {workers, ChildWorkerCount}]</v>
-      </type>
       <desc>
         <p>Returns a property list (see <c>proplists</c>) containing the
           counts for each of the following elements of the supervisor's
@@ -464,17 +470,12 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
       </desc>
     </func>
     <func>
-      <name>check_childspecs([ChildSpec]) -> Result</name>
+      <name name="check_childspecs" arity="1"/>
       <fsummary>Check if children specifications are syntactically correct.</fsummary>
-      <type>
-        <v>ChildSpec = child_spec()</v>
-        <v>Result = ok | {error,Error}</v>
-        <v>&nbsp;Error = term()</v>
-      </type>
       <desc>
         <p>This function takes a list of child specification as argument
           and returns <c>ok</c> if all of them are syntactically
-          correct, or <c>{error,Error}</c> otherwise.</p>
+          correct, or <c>{error,<anno>Error</anno>}</c> otherwise.</p>
       </desc>
     </func>
   </funcs>
@@ -491,9 +492,9 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
       <type>
         <v>Args = term()</v>
         <v>Result = {ok,{{RestartStrategy,MaxR,MaxT},[ChildSpec]}} | ignore</v>
-        <v>&nbsp;RestartStrategy = one_for_all | one_for_one | rest_for_one | simple_one_for_one</v>
-        <v>&nbsp;MaxR = MaxT = int()>=0</v>
-        <v>&nbsp;ChildSpec = child_spec()</v>
+        <v>&nbsp;RestartStrategy = <seealso marker="#type-strategy">strategy()</seealso></v>
+        <v>&nbsp;MaxR = MaxT = integer()>=0</v>
+        <v>&nbsp;ChildSpec = <seealso marker="#type-child_spec">child_spec()</seealso></v>
       </type>
       <desc>
         <p>Whenever a supervisor is started using
diff --git a/lib/stdlib/doc/src/supervisor_bridge.xml b/lib/stdlib/doc/src/supervisor_bridge.xml
index cbd0d9230b..c1a5e7947f 100644
--- a/lib/stdlib/doc/src/supervisor_bridge.xml
+++ b/lib/stdlib/doc/src/supervisor_bridge.xml
@@ -50,46 +50,37 @@
   </description>
   <funcs>
     <func>
-      <name>start_link(Module, Args) -> Result</name>
-      <name>start_link(SupBridgeName, Module, Args) -> Result</name>
+      <name name="start_link" arity="2"/>
+      <name name="start_link" arity="3"/>
       <fsummary>Create a supervisor bridge process.</fsummary>
-      <type>
-        <v>SupBridgeName = {local,Name} | {global,Name}</v>
-        <v>&nbsp;Name = atom()</v>
-        <v>Module = atom()</v>
-        <v>Args = term()</v>
-        <v>Result = {ok,Pid} | ignore | {error,Error}</v>
-        <v>&nbsp;Pid = pid()</v>
-        <v>&nbsp;Error = {already_started,Pid} | term()</v>
-      </type>
       <desc>
         <p>Creates a supervisor_bridge process, linked to the calling
-          process, which calls <c>Module:init/1</c> to start the subsystem.
+          process, which calls <c><anno>Module</anno>:init/1</c> to start the subsystem.
           To ensure a synchronized start-up procedure, this function does
-          not return until <c>Module:init/1</c> has returned.</p>
-        <p>If <c>SupBridgeName={local,Name}</c> the supervisor_bridge is
-          registered locally as <c>Name</c> using <c>register/2</c>.
-          If <c>SupBridgeName={global,Name}</c> the supervisor_bridge is
-          registered globally as <c>Name</c> using
+          not return until <c><anno>Module</anno>:init/1</c> has returned.</p>
+        <p>If <c><anno>SupBridgeName</anno>={local,<anno>Name</anno>}</c> the supervisor_bridge is
+          registered locally as <c><anno>Name</anno></c> using <c>register/2</c>.
+          If <c><anno>SupBridgeName</anno>={global,<anno>Name</anno>}</c> the supervisor_bridge is
+          registered globally as <c><anno>Name</anno></c> using
           <c>global:register_name/2</c>.
           If no name is provided, the supervisor_bridge is not registered.
           If there already exists a process with the specified
-          <c>SupBridgeName</c> the function returns
-          <c>{error,{already_started,Pid}}</c>, where <c>Pid</c> is the pid
+          <c><anno>SupBridgeName</anno></c> the function returns
+          <c>{error,{already_started,<anno>Pid</anno>}}</c>, where <c><anno>Pid</anno></c> is the pid
           of that process.</p>
-        <p><c>Module</c> is the name of the callback module.</p>
-        <p><c>Args</c> is an arbitrary term which is passed as the argument
-          to <c>Module:init/1</c>.</p>
+        <p><c><anno>Module</anno></c> is the name of the callback module.</p>
+        <p><c><anno>Args</anno></c> is an arbitrary term which is passed as the argument
+          to <c><anno>Module</anno>:init/1</c>.</p>
         <p>If the supervisor_bridge and the subsystem are successfully
-          started the function returns <c>{ok,Pid}</c>, where <c>Pid</c> is
+          started the function returns <c>{ok,<anno>Pid</anno>}</c>, where <c><anno>Pid</anno></c> is
           is the pid of the supervisor_bridge.</p>
-        <p>If <c>Module:init/1</c> returns <c>ignore</c>, this function
+        <p>If <c><anno>Module</anno>:init/1</c> returns <c>ignore</c>, this function
           returns <c>ignore</c> as well and the supervisor_bridge terminates
           with reason <c>normal</c>.
-          If <c>Module:init/1</c> fails or returns an error tuple or an
-          incorrect value, this function returns <c>{error,Term}</c> where
-          <c>Term</c> is a term with information about the error, and
-          the supervisor_bridge terminates with reason <c>Term</c>.</p>
+          If <c><anno>Module</anno>:init/1</c> fails or returns an error tuple or an
+          incorrect value, this function returns <c>{error,<anno>Error</anno>r}</c> where
+          <c><anno>Error</anno></c> is a term with information about the error, and
+          the supervisor_bridge terminates with reason <c><anno>Error</anno></c>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml
index efa8922a9d..073faf2df2 100644
--- a/lib/stdlib/doc/src/sys.xml
+++ b/lib/stdlib/doc/src/sys.xml
@@ -39,24 +39,12 @@
     <p>Functions used for implementation of processes 
       should also understand system messages such as debugging
       messages and code change. These functions must be used to implement the use of system messages for a process; either directly, or through standard behaviours, such as <c>gen_server</c>.</p>
-    <p>The following types are used in the functions defined below:</p>
-    <list type="bulleted">
-      <item>
-        <p><c>Name = pid() | atom() | {global, atom()}</c></p>
-      </item>
-      <item>
-        <p><c>Timeout = int() >= 0 | infinity</c></p>
-      </item>
-      <item>
-        <p><c>system_event() = {in, Msg} | {in, Msg, From} | {out, Msg, To} | term()</c></p>
-      </item>
-    </list>
     <p>The default timeout is 5000 ms, unless otherwise specified. The
       <c>timeout</c> defines the time period to wait for the process to
       respond to a request. If the process does not respond, the
       function evaluates <c>exit({timeout, {M, F, A}})</c>.
       </p>
-    <p>The functions make reference to a debug structure.
+    <p><marker id="dbg_opt"/>The functions make reference to a debug structure.
       The debug structure is a list of <c>dbg_opt()</c>.
       <c>dbg_opt()</c> is an internal data type used by the
       <c>handle_system_msg/6</c> function. No debugging is performed if it is an empty list.
@@ -113,20 +101,31 @@
       own system events. It is always up to the process itself
       to format these events.</p>
   </section>
+  <datatypes>
+    <datatype>
+      <name name="name"/>
+    </datatype>
+    <datatype>
+      <name name="system_event"/>
+    </datatype>
+    <datatype>
+      <name name="dbg_opt"/>
+      <desc><p>See <seealso marker="#dbg_opt">above</seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="dbg_fun"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>log(Name,Flag)</name>
-      <name>log(Name,Flag,Timeout) -> ok | {ok, [system_event()]}</name>
+      <name name="log" arity="2"/>
+      <name name="log" arity="3"/>
       <fsummary>Log system events in memory</fsummary>
-      <type>
-        <v>Flag = true | {true, N} | false | get | print</v>
-        <v>N = integer() > 0</v>
-      </type>
       <desc>
         <p>Turns the logging of system events On or Off. If On, a
-          maximum of <c>N</c>  events are kept in the
-          debug structure (the default is 10). If <c>Flag</c> is <c>get</c>, a list of all
-          logged events is returned. If <c>Flag</c> is <c>print</c>, the
+          maximum of <c><anno>N</anno></c>  events are kept in the
+          debug structure (the default is 10). If <c><anno>Flag</anno></c> is <c>get</c>, a list of all
+          logged events is returned. If <c><anno>Flag</anno></c> is <c>print</c>, the
           logged events are printed to <c>standard_io</c>. The events are
           formatted with a function that is defined by the process that
           generated the event (with a call to
@@ -134,13 +133,9 @@
       </desc>
     </func>
     <func>
-      <name>log_to_file(Name,Flag)</name>
-      <name>log_to_file(Name,Flag,Timeout) -> ok | {error, open_file}</name>
+      <name name="log_to_file" arity="2"/>
+      <name name="log_to_file" arity="3"/>
       <fsummary>Log system events to the specified file</fsummary>
-      <type>
-        <v>Flag = FileName | false</v>
-        <v>FileName = string()</v>
-      </type>
       <desc>
         <p>Enables or disables the logging of all system events in textual
           format to the file. The events are formatted with a function that is 
@@ -149,27 +144,18 @@
       </desc>
     </func>
     <func>
-      <name>statistics(Name,Flag)</name>
-      <name>statistics(Name,Flag,Timeout) -> ok | {ok, Statistics} </name>
+      <name name="statistics" arity="2"/>
+      <name name="statistics" arity="3"/>
       <fsummary>Enable or disable the collections of statistics</fsummary>
-      <type>
-        <v>Flag = true | false | get</v>
-        <v>Statistics = [{start_time, {Date1, Time1}}, {current_time, {Date, Time2}}, {reductions, integer()}, {messages_in, integer()}, {messages_out, integer()}]</v>
-        <v>Date1 = Date2 = {Year, Month, Day}</v>
-        <v>Time1 = Time2 = {Hour, Min, Sec}</v>
-      </type>
       <desc>
-        <p>Enables or disables the collection of statistics. If <c>Flag</c> is
+        <p>Enables or disables the collection of statistics. If <c><anno>Flag</anno></c> is
           <c>get</c>, the statistical collection is returned.</p>
       </desc>
     </func>
     <func>
-      <name>trace(Name,Flag)</name>
-      <name>trace(Name,Flag,Timeout) -> void()</name>
+      <name name="trace" arity="2"/>
+      <name name="trace" arity="3"/>
       <fsummary>Print all system events on <c>standard_io</c></fsummary>
-      <type>
-        <v>Flag = boolean()</v>
-      </type>
       <desc>
         <p>Prints all system events on <c>standard_io</c>. The events are
           formatted with a function that is defined by the process that
@@ -178,8 +164,8 @@
       </desc>
     </func>
     <func>
-      <name>no_debug(Name)</name>
-      <name>no_debug(Name,Timeout) -> void()</name>
+      <name name="no_debug" arity="1"/>
+      <name name="no_debug" arity="2"/>
       <fsummary>Turn off debugging</fsummary>
       <desc>
         <p>Turns off all debugging for the process. This includes
@@ -188,8 +174,8 @@
       </desc>
     </func>
     <func>
-      <name>suspend(Name)</name>
-      <name>suspend(Name,Timeout) -> void()</name>
+      <name name="suspend" arity="1"/>
+      <name name="suspend" arity="2"/>
       <fsummary>Suspend the process</fsummary>
       <desc>
         <p>Suspends the process. When the process is suspended, it
@@ -198,49 +184,37 @@
       </desc>
     </func>
     <func>
-      <name>resume(Name)</name>
-      <name>resume(Name,Timeout) -> void()</name>
+      <name name="resume" arity="1"/>
+      <name name="resume" arity="2"/>
       <fsummary>Resume a suspended process</fsummary>
       <desc>
         <p>Resumes a suspended process.</p>
       </desc>
     </func>
     <func>
-      <name>change_code(Name, Module, OldVsn, Extra)</name>
-      <name>change_code(Name, Module, OldVsn, Extra, Timeout) -> ok | {error, Reason}</name>
+      <name name="change_code" arity="4"/>
+      <name name="change_code" arity="5"/>
       <fsummary>Send the code change system message to the process</fsummary>
-      <type>
-        <v>OldVsn = undefined | term()</v>
-        <v>Module = atom()</v>
-        <v>Extra = term()</v>
-      </type>
       <desc>
         <p>Tells the process to change code. The process must be
-          suspended to handle this message. The <c>Extra</c> argument is
+          suspended to handle this message. The <c><anno>Extra</anno></c> argument is
           reserved for each process to use as its own. The function
-          <c>Mod:system_code_change/4</c> is called. <c>OldVsn</c> is
-          the old version of the <c>Module</c>.</p>
+          <c><anno>Module</anno>:system_code_change/4</c> is called. <c><anno>OldVsn</anno></c> is
+          the old version of the <c><anno>Module</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>get_status(Name)</name>
-      <name>get_status(Name,Timeout) -> {status, Pid, {module, Mod}, [PDict, SysState, Parent, Dbg, Misc]}</name>
+      <name name="get_status" arity="1"/>
+      <name name="get_status" arity="2"/>
       <fsummary>Get the status of the process</fsummary>
-      <type>
-        <v>PDict = [{Key, Value}]</v>
-        <v>SysState = running | suspended</v>
-        <v>Parent = pid()</v>
-        <v>Dbg = [dbg_opt()]</v>
-        <v>Misc = term()</v>
-      </type>
       <desc>
         <p>Gets the status of the process.</p>
-        <p>The value of <c>Misc</c> varies for different types of
+        <p>The value of <c><anno>Misc</anno></c> varies for different types of
           processes. For example, a <c>gen_server</c> process returns
           the callback module's state, and a <c>gen_fsm</c> process
           returns information such as its current state name. Callback
           modules for <c>gen_server</c> and <c>gen_fsm</c> can also
-          customise the value of <c>Misc</c> by exporting
+          customise the value of <c><anno>Misc</anno></c> by exporting
           a <c>format_status/2</c> function that contributes
           module-specific information;
           see <seealso marker="gen_server#Module:format_status/2">gen_server:format_status/2</seealso>
@@ -249,17 +223,9 @@
       </desc>
     </func>
     <func>
-      <name>install(Name,{Func,FuncState})</name>
-      <name>install(Name,{Func,FuncState},Timeout)</name>
+      <name name="install" arity="2"/>
+      <name name="install" arity="3"/>
       <fsummary>Install a debug function in the process</fsummary>
-      <type>
-        <v>Func = dbg_fun()</v>
-        <v>dbg_fun() = fun(FuncState, Event, ProcState) -> done | NewFuncState</v>
-        <v>FuncState = term()</v>
-        <v>Event = system_event()</v>
-        <v>ProcState = term()</v>
-        <v>NewFuncState = term()</v>
-      </type>
       <desc>
         <p>This function makes it possible to install other debug
           functions than the ones defined above. An example of such a
@@ -267,22 +233,19 @@
           special event and performs some action when the event is
           generated. This could, for example, be turning on low level tracing.
           </p>
-        <p><c>Func</c> is called whenever a system event is
+        <p><c><anno>Func</anno></c> is called whenever a system event is
           generated. This function should return <c>done</c>, or a new
           func state. In the first case, the function is removed. It is removed 
           if the function fails.</p>
       </desc>
     </func>
     <func>
-      <name>remove(Name,Func)</name>
-      <name>remove(Name,Func,Timeout) -> void()</name>
+      <name name="remove" arity="2"/>
+      <name name="remove" arity="3"/>
       <fsummary>Remove a debug function from the process</fsummary>
-      <type>
-        <v>Func = dbg_fun()</v>
-      </type>
       <desc>
         <p>Removes a previously installed debug function from the
-          process. <c>Func</c> must be the same as previously
+          process. <c><anno>Func</anno></c> must be the same as previously
           installed.</p>
       </desc>
     </func>
@@ -296,86 +259,65 @@
   </section>
   <funcs>
     <func>
-      <name>debug_options(Options) -> [dbg_opt()]</name>
+      <name name="debug_options" arity="1"/>
       <fsummary>Convert a list of options to a debug structure</fsummary>
-      <type>
-        <v>Options = [Opt]</v>
-        <v>Opt = trace | log | statistics | {log_to_file, FileName} | {install, {Func, FuncState}}</v>
-        <v>Func = dbg_fun()</v>
-        <v>FuncState = term()</v>
-      </type>
       <desc>
         <p>This function can be used by a process that initiates a debug
           structure from a list of options. The values of the
-          <c>Opt</c> argument are the same as the corresponding
+          <c><anno>Opt</anno></c> argument are the same as the corresponding
           functions.</p>
       </desc>
     </func>
     <func>
-      <name>get_debug(Item,Debug,Default) -> term()</name>
+      <name name="get_debug" arity="3"/>
       <fsummary>Get the data associated with a debug option</fsummary>
-      <type>
-        <v>Item = log | statistics</v>
-        <v>Debug = [dbg_opt()]</v>
-        <v>Default = term()</v>
-      </type>
       <desc>
-        <p>This function gets the data associated with a debug option. <c>Default</c> is returned if the
-          <c>Item</c> is not found.  Can be
+        <p>This function gets the data associated with a debug option. <c><anno>Default</anno></c> is returned if the
+          <c><anno>Item</anno></c> is not found.  Can be
           used by the process to retrieve debug data for printing
           before it terminates.</p>
       </desc>
     </func>
     <func>
-      <name>handle_debug([dbg_opt()],FormFunc,Extra,Event) -> [dbg_opt()]</name>
+      <name name="handle_debug" arity="4"/>
       <fsummary>Generate a system event</fsummary>
-      <type>
-        <v>FormFunc = dbg_fun()</v>
-        <v>Extra = term()</v>
-        <v>Event = system_event()</v>
-      </type>
       <desc>
-        <p>This function is called by a process when it generates a system event. <c>FormFunc</c> is a formatting function which is called as <c>FormFunc(Device, Event, Extra)</c> in order to print the events, which is necessary if tracing is activated. <c>Extra</c> is any
-          extra information which the process needs in the format function, for example the name of the process.</p>
+        <p>This function is called by a process when it generates a
+           system event. <c><anno>FormFunc</anno></c> is a formatting
+           function which is called as <c><anno>FormFunc</anno>(Device,
+           <anno>Event</anno>, <anno>Extra</anno>)</c> in order to print
+           the events, which is necessary if tracing is activated.
+           <c><anno>Extra</anno></c> is any extra information which the
+           process needs in the format function, for example the name
+           of the process.</p>
       </desc>
     </func>
     <func>
-      <name>handle_system_msg(Msg,From,Parent,Module,Debug,Misc)</name>
+      <name name="handle_system_msg" arity="6"/>
       <fsummary>Take care of system messages</fsummary>
-      <type>
-        <v>Msg = term()</v>
-        <v>From = pid()</v>
-        <v>Parent = pid()</v>
-        <v>Module = atom()</v>
-        <v>Debug = [dbg_opt()]</v>
-        <v>Misc = term()</v>
-      </type>
       <desc>
         <p>This function is used by a process module that wishes to take care of system
-          messages. The process receives a <c>{system, From, Msg}</c>
-          message and passes the <c>Msg</c> and <c>From</c> to this
+          messages. The process receives a <c>{system, <anno>From</anno>, <anno>Msg</anno>}</c>
+          message and passes the <c><anno>Msg</anno></c> and <c><anno>From</anno></c> to this
           function.
           </p>
         <p>This function <em>never</em> returns. It calls the function
-          <c>Module:system_continue(Parent, NDebug, Misc)</c> where the
+          <c><anno>Module</anno>:system_continue(<anno>Parent</anno>, NDebug, <anno>Misc</anno>)</c> where the
           process continues the execution, or
-          <c>Module:system_terminate(Reason, Parent, Debug, Misc)</c> if
-          the process should terminate. The <c>Module</c> must export
+          <c><anno>Module</anno>:system_terminate(Reason, <anno>Parent</anno>, <anno>Debug</anno>, <anno>Misc</anno>)</c> if
+          the process should terminate. The <c><anno>Module</anno></c> must export
           <c>system_continue/3</c>, <c>system_terminate/4</c>, and
           <c>system_code_change/4</c> (see below).
           </p>
-        <p>The <c>Misc</c> argument can be used to save internal data
+        <p>The <c><anno>Misc</anno></c> argument can be used to save internal data
           in a process, for example its state. It is sent to
-          <c>Module:system_continue/3</c> or
-          <c>Module:system_terminate/4</c></p>
+          <c><anno>Module</anno>:system_continue/3</c> or
+          <c><anno>Module</anno>:system_terminate/4</c></p>
       </desc>
     </func>
     <func>
-      <name>print_log(Debug) -> void()</name>
+      <name name="print_log" arity="1"/>
       <fsummary>Print the logged events in the debug structure</fsummary>
-      <type>
-        <v>Debug = [dbg_opt()]</v>
-      </type>
       <desc>
         <p>Prints the logged system events in the debug structure
           using <c>FormFunc</c> as defined when the event was
@@ -383,11 +325,11 @@
       </desc>
     </func>
     <func>
-      <name>Mod:system_continue(Parent, Debug, Misc)</name>
+      <name>Mod:system_continue(Parent, Debug, Misc) -> none()</name>
       <fsummary>Called when the process should continue its execution</fsummary>
       <type>
         <v>Parent = pid()</v>
-        <v>Debug = [dbg_opt()]</v>
+        <v>Debug = [<seealso marker="#type-dbg_opt">dbg_opt()</seealso>]</v>
         <v>Misc = term()</v>
       </type>
       <desc>
@@ -397,12 +339,12 @@
       </desc>
     </func>
     <func>
-      <name>Mod:system_terminate(Reason, Parent, Debug, Misc)</name>
+      <name>Mod:system_terminate(Reason, Parent, Debug, Misc) -> none()</name>
       <fsummary>Called when the process should terminate</fsummary>
       <type>
         <v>Reason = term()</v>
         <v>Parent = pid()</v>
-        <v>Debug = [dbg_opt()]</v>
+        <v>Debug = [<seealso marker="#type-dbg_opt">dbg_opt()</seealso>]</v>
         <v>Misc = term()</v>
       </type>
       <desc>
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index cae655f801..b741ab7db1 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -49,9 +49,19 @@
       as requested.
       </p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="time"/>
+      <desc><p>Time in milliseconds.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="tref"/>
+      <desc><p>A timer reference.</p></desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>start() -> ok</name>
+      <name name="start" arity="0"/>
       <fsummary>Start a global timer server (named <c>timer_server</c>).</fsummary>
       <desc>
         <p>Starts the timer server. Normally, the server does not need
@@ -62,214 +72,181 @@
       </desc>
     </func>
     <func>
-      <name>apply_after(Time, Module, Function, Arguments) -> {ok, Tref} |  {error, Reason}</name>
+      <name name="apply_after" arity="4"/>
       <fsummary>Apply <c>Module:Function(Arguments)</c>after a  specified <c>Time</c>.</fsummary>
-      <type>
-        <v>Time = integer() in Milliseconds</v>
-        <v>Module = Function = atom()</v>
-        <v>Arguments = [term()]</v>
-      </type>
       <desc>
-        <p>Evaluates <c>apply(M, F, A)</c> after <c>Time</c> amount of time
-          has elapsed. Returns <c>{ok, TRef}</c>, or <c>{error, Reason}</c>.</p>
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Arguments</anno>)</c> after <c><anno>Time</anno></c> amount of time
+          has elapsed. Returns <c>{ok, <anno>TRef</anno>}</c>, or <c>{error, <anno>Reason</anno>}</c>.</p>
       </desc>
     </func>
     <func>
-      <name>send_after(Time, Pid, Message) -> {ok, TRef} | {error,Reason}</name>
-      <name>send_after(Time, Message) -> {ok, TRef} | {error,Reason}</name>
+      <name name="send_after" arity="2"/>
+      <name name="send_after" arity="3"/>
       <fsummary>Send <c>Message</c>to <c>Pid</c>after a specified <c>Time</c>.</fsummary>
-      <type>
-        <v>Time = integer() in Milliseconds</v>
-        <v>Pid = pid() | atom()</v>
-        <v>Message = term()</v>
-        <v>Result = {ok, TRef} | {error, Reason}</v>
-      </type>
       <desc>
         <p></p>
         <taglist>
           <tag><c>send_after/3</c></tag>
           <item>
-            <p>Evaluates <c>Pid ! Message</c> after <c>Time</c> amount
-              of time has elapsed. (<c>Pid</c> can also be an atom of a 
-              registered name.) Returns <c>{ok, TRef}</c>, or 
-              <c>{error, Reason}</c>.</p>
+            <p>Evaluates <c><anno>Pid</anno> ! <anno>Message</anno></c> after <c><anno>Time</anno></c> amount
+              of time has elapsed. (<c><anno>Pid</anno></c> can also be an atom of a
+              registered name.) Returns <c>{ok, <anno>TRef</anno>}</c>, or
+              <c>{error, <anno>Reason</anno>}</c>.</p>
           </item>
           <tag><c>send_after/2</c></tag>
           <item>
-            <p>Same as <c>send_after(Time, self(), Message)</c>.</p>
+            <p>Same as <c>send_after(<anno>Time</anno>, self(), <anno>Message</anno>)</c>.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>exit_after(Time, Pid, Reason1) -> {ok, TRef} | {error,Reason2}</name>
-      <name>exit_after(Time, Reason1) -> {ok, TRef} | {error,Reason2}</name>
-      <name>kill_after(Time, Pid)-> {ok, TRef} | {error,Reason2}</name>
-      <name>kill_after(Time) -> {ok, TRef} | {error,Reason2}</name>
+      <name name="kill_after" arity="1"/>
+      <name name="kill_after" arity="2"/>
+      <name name="exit_after" arity="2"/>
+      <name name="exit_after" arity="3"/>
       <fsummary>Send an exit signal with <c>Reason</c>after a specified <c>Time</c>.</fsummary>
-      <type>
-        <v>Time = integer() in milliseconds</v>
-        <v>Pid = pid() | atom()</v>
-        <v>Reason1 = Reason2  = term()</v>
-      </type>
       <desc>
         <p></p>
         <taglist>
           <tag><c>exit_after/3</c></tag>
           <item>
-            <p>Send an exit signal with reason <c>Reason1</c> to Pid 
-              <c>Pid</c>. Returns <c>{ok, TRef}</c>, or 
-              <c>{error, Reason2}</c>.</p>
+            <p>Send an exit signal with reason <c><anno>Reason1</anno></c> to Pid
+              <c><anno>Pid</anno></c>. Returns <c>{ok, <anno>TRef</anno>}</c>, or
+              <c>{error, <anno>Reason2</anno>}</c>.</p>
           </item>
           <tag><c>exit_after/2</c></tag>
           <item>
-            <p>Same as <c>exit_after(Time, self(), Reason1)</c>.     </p>
+            <p>Same as <c>exit_after(<anno>Time</anno>, self(), <anno>Reason1</anno>)</c>.     </p>
           </item>
           <tag><c>kill_after/2</c></tag>
           <item>
-            <p>Same as <c>exit_after(Time, Pid, kill)</c>.     </p>
+            <p>Same as <c>exit_after(<anno>Time</anno>, <anno>Pid</anno>, kill)</c>.     </p>
           </item>
           <tag><c>kill_after/1</c></tag>
           <item>
-            <p>Same as <c>exit_after(Time, self(), kill)</c>.     </p>
+            <p>Same as <c>exit_after(<anno>Time</anno>, self(), kill)</c>.     </p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>apply_interval(Time, Module, Function, Arguments) -> {ok, TRef} | {error, Reason}</name>
+      <name name="apply_interval" arity="4"/>
       <fsummary>Evaluate <c>Module:Function(Arguments)</c>repeatedly at  intervals of <c>Time</c>.</fsummary>
-      <type>
-        <v>Time = integer() in milliseconds</v>
-        <v>Module = Function = atom()</v>
-        <v>Arguments = [term()]</v>
-      </type>
       <desc>
-        <p>Evaluates <c>apply(Module, Function, Arguments)</c> repeatedly at
-          intervals of  <c>Time</c>. Returns <c>{ok, TRef}</c>, or 
-          <c>{error, Reason}</c>.</p>
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Arguments</anno>)</c> repeatedly at
+          intervals of  <c><anno>Time</anno></c>. Returns <c>{ok, <anno>TRef</anno>}</c>, or
+          <c>{error, <anno>Reason</anno>}</c>.</p>
       </desc>
     </func>
     <func>
-      <name>send_interval(Time, Pid, Message) -> {ok, TRef} | {error, Reason}</name>
-      <name>send_interval(Time, Message) -> {ok, TRef} | {error, Reason}</name>
+      <name name="send_interval" arity="2"/>
+      <name name="send_interval" arity="3"/>
       <fsummary>Send <c>Message</c>repeatedly at intervals of <c>Time</c>.</fsummary>
-      <type>
-        <v>Time = integer() in milliseconds</v>
-        <v>Pid = pid() | atom()</v>
-        <v>Message = term()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p></p>
         <taglist>
           <tag><c>send_interval/3</c></tag>
           <item>
-            <p>Evaluates <c>Pid ! Message</c> repeatedly after <c>Time</c>
-              amount of time has elapsed. (<c>Pid</c> can also be an atom of
-              a registered name.) Returns <c>{ok, TRef}</c> or 
-              <c>{error, Reason}</c>.</p>
+            <p>Evaluates <c><anno>Pid</anno> ! <anno>Message</anno></c> repeatedly after <c><anno>Time</anno></c>
+              amount of time has elapsed. (<c><anno>Pid</anno></c> can also be an atom of
+              a registered name.) Returns <c>{ok, <anno>TRef</anno>}</c> or
+              <c>{error, <anno>Reason</anno>}</c>.</p>
           </item>
           <tag><c>send_interval/2</c></tag>
           <item>
-            <p>Same as <c>send_interval(Time, self(), Message)</c>.</p>
+            <p>Same as <c>send_interval(<anno>Time</anno>, self(), <anno>Message</anno>)</c>.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
-      <name>cancel(TRef) -> {ok, cancel} | {error, Reason}</name>
+      <name name="cancel" arity="1"/>
       <fsummary>Cancel a previously requested timeout identified by <c>TRef</c>.</fsummary>
       <desc>
-        <p>Cancels a previously requested timeout. <c>TRef</c> is a unique 
+        <p>Cancels a previously requested timeout. <c><anno>TRef</anno></c> is a unique
           timer reference returned by the timer function in question. Returns
-          <c>{ok, cancel}</c>, or <c>{error, Reason}</c> when <c>TRef</c>
+          <c>{ok, cancel}</c>, or <c>{error, <anno>Reason</anno>}</c> when <c><anno>TRef</anno></c>
           is not a timer reference.</p>
       </desc>
     </func>
     <func>
-      <name>sleep(Time) -> ok</name>
+      <name name="sleep" arity="1"/>
       <fsummary>Suspend the calling process for <c>Time</c>amount of milliseconds.</fsummary>
-      <type>
-        <v>Time = integer() in milliseconds or the atom infinity</v>
-      </type>
       <desc>
-        <p>Suspends the process calling this function for <c>Time</c> amount
+        <p>Suspends the process calling this function for <c><anno>Time</anno></c> amount
           of milliseconds and then returns <c>ok</c>, or suspend the process
-	  forever if <c>Time</c> is the atom <c>infinity</c>. Naturally, this 
+	  forever if <c><anno>Time</anno></c> is the atom <c>infinity</c>. Naturally, this
           function does <em>not</em> return immediately.</p>
       </desc>
     </func>
     <func>
-      <name>tc(Module, Function, Arguments) -> {Time, Value}</name>
-      <name>tc(Fun, Arguments) -> {Time, Value}</name>
+      <name name="tc" arity="1"/>
+      <name name="tc" arity="2"/>
+      <name name="tc" arity="3"/>
       <fsummary>Measure the real time it takes to evaluate <c>apply(Module,
       Function, Arguments)</c> or <c>apply(Fun, Arguments)</c></fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Fun = fun()</v>
-        <v>Arguments = [term()]</v>
-        <v>Time = integer() in microseconds</v>
-        <v>Value = term()</v>
-      </type>
+      <type_desc variable="Time">In microseconds</type_desc>
       <desc>
         <p></p>
         <taglist>
           <tag><c>tc/3</c></tag>
           <item>
-            <p>Evaluates <c>apply(Module, Function, Arguments)</c> and measures
-              the elapsed real time as reported by <c>now/0</c>.
-              Returns <c>{Time, Value}</c>, where
-              <c>Time</c> is the elapsed real time in <em>microseconds</em>,
-              and <c>Value</c> is what is returned from the apply.</p>
+            <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Arguments</anno>)</c> and measures
+              the elapsed real time as reported by <c>os:timestamp/0</c>.
+              Returns <c>{<anno>Time</anno>, <anno>Value</anno>}</c>, where
+              <c><anno>Time</anno></c> is the elapsed real time in <em>microseconds</em>,
+              and <c><anno>Value</anno></c> is what is returned from the apply.</p>
           </item>
           <tag><c>tc/2</c></tag>
           <item>
-            <p>Evaluates <c>apply(Fun, Arguments)</c>. Otherwise works
+            <p>Evaluates <c>apply(<anno>Fun</anno>, <anno>Arguments</anno>)</c>. Otherwise works
             like <c>tc/3</c>.</p>
           </item>
+          <tag><c>tc/1</c></tag>
+          <item>
+            <p>Evaluates <c><anno>Fun</anno>()</c>. Otherwise works like <c>tc/2</c>.</p>
+          </item>
+
         </taglist>
       </desc>
     </func>
     <func>
-      <name>now_diff(T2, T1) -> Tdiff</name>
+      <name name="now_diff" arity="2"/>
       <fsummary>Calculate time difference between <c>now/0</c>timestamps</fsummary>
-      <type>
-        <v>T1 = T2 = {MegaSecs, Secs, MicroSecs}</v>
-        <v>Tdiff = MegaSecs = Secs = MicroSecs = integer()</v>
-      </type>
+      <type_desc variable="Tdiff">In microseconds</type_desc>
       <desc>
-        <p>Calculates the time difference <c>Tdiff = T2 - T1</c> in
-          <em>microseconds</em>, where <c>T1</c> and <c>T2</c> probably
+        <p>Calculates the time difference <c><anno>Tdiff</anno> = <anno>T2</anno> - <anno>T1</anno></c> in
+          <em>microseconds</em>, where <c><anno>T1</anno></c> and <c><anno>T2</anno></c> probably
           are timestamp tuples returned from <c>erlang:now/0</c>.</p>
       </desc>
     </func>
     <func>
-      <name>seconds(Seconds) -> Milliseconds</name>
+      <name name="seconds" arity="1"/>
       <fsummary>Convert <c>Seconds</c>to <c>Milliseconds</c>.</fsummary>
       <desc>
-        <p>Returns the number of milliseconds in <c>Seconds</c>.</p>
+        <p>Returns the number of milliseconds in <c><anno>Seconds</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>minutes(Minutes) -> Milliseconds</name>
+      <name name="minutes" arity="1"/>
       <fsummary>Converts <c>Minutes</c>to <c>Milliseconds</c>.</fsummary>
       <desc>
-        <p>Return the number of milliseconds in <c>Minutes</c>.</p>
+        <p>Return the number of milliseconds in <c><anno>Minutes</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>hours(Hours) -> Milliseconds</name>
+      <name name="hours" arity="1"/>
       <fsummary>Convert <c>Hours</c>to <c>Milliseconds</c>.</fsummary>
       <desc>
-        <p>Returns the number of milliseconds in <c>Hours</c>.</p>
+        <p>Returns the number of milliseconds in <c><anno>Hours</anno></c>.</p>
       </desc>
     </func>
     <func>
-      <name>hms(Hours, Minutes, Seconds) -> Milliseconds</name>
+      <name name="hms" arity="3"/>
       <fsummary>Convert <c>Hours</c>+<c>Minutes</c>+<c>Seconds</c>to <c>Milliseconds</c>.</fsummary>
       <desc>
-        <p>Returns the number of milliseconds in <c>Hours + Minutes + Seconds</c>.</p>
+        <p>Returns the number of milliseconds in <c><anno>Hours</anno> + <anno>Minutes</anno> + <anno>Seconds</anno></c>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml
index e3a25a407b..d02763f75c 100644
--- a/lib/stdlib/doc/src/unicode.xml
+++ b/lib/stdlib/doc/src/unicode.xml
@@ -38,50 +38,83 @@
   <p>It is recommended to only use external encodings for communication with external entities where this is required. When working inside the Erlang/OTP environment, it is recommended to keep binaries in UTF-8 when representing Unicode characters. Latin1 encoding is supported both for backward compatibility and for communication with external entities not supporting Unicode character sets.</p>
   </description>
 
-  <section>
-    <title>DATA TYPES</title>
-    <marker id="type-charlist"></marker>
-    <code type="none">
-unicode_binary() = binary() with characters encoded in UTF-8 coding standard
-unicode_char() = integer() representing valid unicode codepoint
-
-chardata() = charlist() | unicode_binary()
-
-charlist() = [unicode_char() | unicode_binary() | charlist()]
-  a unicode_binary is allowed as the tail of the list</code>
-
-    <code type="none">
-external_unicode_binary() = binary() 
-  with characters coded in a user specified Unicode encoding other 
-  than UTF-8 (UTF-16 or UTF-32)
-
-external_chardata() = external_charlist() | external_unicode_binary()
-
-external_charlist() = [unicode_char() | external_unicode_binary() | external_charlist()]
-  an external_unicode_binary is allowed as the tail of the list</code>
-
-    <code type="none">
-latin1_binary() = binary() with characters coded in iso-latin-1
-latin1_char() = integer() representing valid latin1 character (0-255)
-
-latin1_chardata() = latin1_charlist() | latin1_binary()
+  <datatypes>
+    <datatype>
+      <name name="encoding"/>
+    </datatype>
+    <datatype>
+      <name name="endian"/>
+    </datatype>
+    <datatype>
+      <name name="unicode_binary"/>
+      <desc>
+        <p>A binary() with characters encoded in the UTF-8 coding standard.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="unicode_char"/>
+      <desc>
+        <p>An integer() representing a valid unicode codepoint.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="chardata"/>
+    </datatype>
+    <datatype>
+      <name name="charlist"/>
+      <desc>
+        <p>A unicode_binary is allowed as the tail of the list.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="external_unicode_binary"/>
+      <desc>
+        <p>A <c>binary()</c> with characters coded in a user specified Unicode
+           encoding other than UTF-8 (UTF-16 or UTF-32).</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="external_chardata"/>
+    </datatype>
+    <datatype>
+      <name name="external_charlist"/>
+      <desc>
+        <p>An <c>external_unicode_binary()</c> is allowed as the tail
+           of the list.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="latin1_binary"/>
+      <desc><p>A <c>binary()</c> with characters coded in iso-latin-1.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="latin1_char"/>
+      <desc><p>An <c>integer()</c> representing valid latin1
+         character (0-255).</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="latin1_chardata"/>
+    </datatype>
+    <datatype>
+      <name name="latin1_charlist"/>
+      <desc><p>A <c>latin1_binary()</c> is allowed as the tail of
+        the list.</p>
+      </desc>
+    </datatype>
+  </datatypes>
 
-latin1_charlist() = [latin1_char() | latin1_binary() | latin1_charlist()]
-  a latin1_binary is allowed as the tail of the list</code>
-  </section>
   <funcs>
     <func>
-      <name>bom_to_encoding(Bin) -> {Encoding,Length}</name>
+      <name name="bom_to_encoding" arity="1"/>
       <fsummary>Identify UTF byte order marks in a binary.</fsummary>
-      <type>
-        <v>Bin = binary() of byte_size 4 or more</v>
-        <v>Encoding = latin1 | utf8 | {utf16,little} | {utf16,big} | {utf32,little} | {utf32,big}</v>
-	<v>Length = int()</v>
-      </type>
+      <type name="endian"/>
+      <type_desc variable="Bin">A binary() of byte_size 4 or more.</type_desc>
       <desc>
 
       <p>Check for a UTF byte order mark (BOM) in the beginning of a
-      binary.  If the supplied binary <c>Bin</c> begins with a valid
+      binary.  If the supplied binary <c><anno>Bin</anno></c> begins with a valid
       byte order mark for either UTF-8, UTF-16 or UTF-32, the function
       returns the encoding identified along with the length of the BOM
       in bytes.</p>
@@ -90,23 +123,24 @@ latin1_charlist() = [latin1_char() | latin1_binary() | latin1_charlist()]
       </desc>
     </func>
     <func>
-      <name>characters_to_list(Data) -> list() | {error, list(), RestData} | {incomplete, list(), binary()} </name>
+      <name name="characters_to_list" arity="1"/>
       <fsummary>Convert a collection of characters to list of Unicode characters</fsummary>
-      <type>
-        <v>Data = latin1_chardata() | chardata() | external_chardata()</v>
-        <v>RestData = latin1_chardata() | chardata() | external_chardata()</v>
-      </type>
       <desc>
-      <p>Same as characters_to_list(Data,unicode).</p>
+      <p>Same as characters_to_list(<anno>Data</anno>,unicode).</p>
       </desc>
     </func>
     <func>
-      <name>characters_to_list(Data, InEncoding) -> list() | {error, list(), RestData} | {incomplete, list(), binary()} </name>
+      <name>characters_to_list(Data, InEncoding) -> Result</name>
       <fsummary>Convert a collection of characters to list of Unicode characters</fsummary>
       <type>
-        <v>Data = latin1_chardata() | chardata() | external_chardata()</v>
-        <v>RestData = latin1_chardata() | chardata() | external_chardata()</v>
-        <v>InEncoding = latin1 | unicode | utf8 | utf16 | utf32 | {utf16,little} | {utf16,big} | {utf32,little} | {utf32,big}</v>
+        <v>Data = <seealso marker="#type-latin1_chardata">latin1_chardata()</seealso>
+                | <seealso marker="#type-chardata">chardata()</seealso>
+                | <seealso marker="#type-external_chardata">external_chardata()</seealso></v>
+        <v>Result = list() | {error, list(), RestData} | {incomplete, list(), binary()}</v>
+        <v>RestData = <seealso marker="#type-latin1_chardata">latin1_chardata()</seealso>
+                    | <seealso marker="#type-chardata">chardata()</seealso>
+                    | <seealso marker="#type-external_chardata">external_chardata()</seealso></v>
+        <v>InEncoding = <seealso marker="#type-encoding">encoding()</seealso></v>
       </type>
       <desc>
 
@@ -164,10 +198,16 @@ latin1_charlist() = [latin1_char() | latin1_binary() | latin1_charlist()]
            <item>Integers out of range - If <c>InEncoding</c> is
 	   <c>latin1</c>, an error occurs whenever an integer greater
 	   than 255 is found in the lists. If <c>InEncoding</c> is
-	   of a Unicode type, error occurs whenever an integer greater than
-	   <c>16#10FFFF</c> (the maximum unicode character) or in the
-	   range <c>16#D800</c> to <c>16#DFFF</c> (invalid unicode
-	   range) is found.</item>
+	   of a Unicode type, an error occurs whenever an integer
+	   <list type="bulleted">
+	     <item>greater than <c>16#10FFFF</c>
+	     (the maximum unicode character),</item>
+	     <item>in the range <c>16#D800</c> to <c>16#DFFF</c>
+	     (invalid unicode range)</item>
+	     <item>or equal to 16#FFFE or 16#FFFF (non characters)</item>
+	   </list>
+	   is found.
+	   </item>
 
 	   <item>UTF encoding incorrect - If <c>InEncoding</c> is
 	   one of the UTF types, the bytes in any binaries have to be valid
@@ -228,44 +268,42 @@ latin1_charlist() = [latin1_char() | latin1_binary() | latin1_charlist()]
       </desc>
     </func>
     <func>
-     <name>characters_to_binary(Data) ->  binary() | {error, binary(), RestData} | {incomplete, binary(), binary()} </name>
-      <fsummary>Convert a collection of characters to an UTF-8 binary</fsummary>      <type>
-        <v>Data = latin1_chardata() | chardata() | external_chardata()</v>
-        <v>RestData = latin1_chardata() | chardata() | external_chardata()</v>
-       </type>
+     <name name="characters_to_binary" arity="1"/>
+      <fsummary>Convert a collection of characters to an UTF-8 binary</fsummary>
       <desc>
       <p>Same as characters_to_binary(Data, unicode, unicode).</p>
       </desc>
     </func>
     <func>    
-     <name>characters_to_binary(Data,InEncoding) ->  binary() | {error, binary(), RestData} | {incomplete, binary(), binary()} </name>
-      <fsummary>Convert a collection of characters to an UTF-8 binary</fsummary>      <type>
-        <v>Data = latin1_chardata() | chardata() | external_chardata()</v>
-        <v>RestData = latin1_chardata() | chardata() | external_chardata()</v>
-        <v>InEncoding = latin1 | unicode | utf8 | utf16 | utf32 | {utf16,little} | {utf16,big} | {utf32,little} | {utf32,big}</v>
+     <name>characters_to_binary(Data,InEncoding) -> Result</name>
+      <fsummary>Convert a collection of characters to an UTF-8 binary</fsummary>
+
+      <type>
+        <v>Data = <seealso marker="#type-latin1_chardata">latin1_chardata()</seealso>
+                | <seealso marker="#type-chardata">chardata()</seealso>
+                | <seealso marker="#type-external_chardata">external_chardata()</seealso></v>
+        <v>Result = binary() | {error, binary(), RestData} | {incomplete, binary(), binary()}</v>
+        <v>RestData = <seealso marker="#type-latin1_chardata">latin1_chardata()</seealso>
+                    | <seealso marker="#type-chardata">chardata()</seealso>
+                    | <seealso marker="#type-external_chardata">external_chardata()</seealso></v>
+        <v>InEncoding = <seealso marker="#type-encoding">encoding()</seealso></v>
       </type>
       <desc>
       <p>Same as characters_to_binary(Data, InEncoding, unicode).</p>
       </desc>
     </func>    
     <func>
-      <name>characters_to_binary(Data, InEncoding, OutEncoding) -> binary() | {error, binary(), RestData} | {incomplete, binary(), binary()} </name>
+      <name name="characters_to_binary" arity="3"/>
       <fsummary>Convert a collection of characters to an UTF-8 binary</fsummary>
-      <type>
-        <v>Data = latin1_chardata() | chardata() | external_chardata()</v>
-        <v>RestData = latin1_chardata() | chardata() | external_chardata()</v>
-        <v>InEncoding = latin1 | unicode | utf8 | utf16 | utf32 | {utf16,little} | {utf16,big} | {utf32,little} | {utf32,big}</v>
-	<v>OutEncoding = latin1 | unicode | utf8 | utf16 | utf32| {utf16,little} | {utf16,big} | {utf32,little} | {utf32,big}</v>	
-      </type>
       <desc>
 
       <p>This function behaves as <seealso
       marker="#characters_to_list/2">
       characters_to_list/2</seealso>, but produces an binary
       instead of a unicode list. The
-      <c>InEncoding</c> defines how input is to be interpreted if
+      <c><anno>InEncoding</anno></c> defines how input is to be interpreted if
       binaries are present in the <c>Data</c>, while
-      <c>OutEncoding</c> defines in what format output is to be
+      <c><anno>OutEncoding</anno></c> defines in what format output is to be
       generated.</p>
 
       <p>The option <c>unicode</c> is an alias for <c>utf8</c>, as this is the
@@ -285,17 +323,13 @@ latin1_charlist() = [latin1_char() | latin1_binary() | latin1_charlist()]
       </desc>
     </func>
     <func>
-      <name>encoding_to_bom(InEncoding) -> Bin</name>
+      <name name="encoding_to_bom" arity="1"/>
       <fsummary>Create a binary UTF byte order mark from encoding.</fsummary>
-      <type>
-        <v>Bin = binary() of byte_size 4 or less</v>
-        <v>InEncoding = latin1 | unicode | utf8 | utf16 | utf32 | {utf16,little} | {utf16,big} | {utf32,little} | {utf32,big}</v>
-	<v>Length = int()</v>
-      </type>
+      <type_desc variable="Bin">A binary() of byte_size 4 or more.</type_desc>
       <desc>
 
       <p>Create an UTF byte order mark (BOM) as a binary from the
-      supplied <c>InEncoding</c>. The BOM is, if supported at all,
+      supplied <c><anno>InEncoding</anno></c>. The BOM is, if supported at all,
       expected to be placed first in UTF encoded files or
       messages.</p>
 
diff --git a/lib/stdlib/doc/src/win32reg.xml b/lib/stdlib/doc/src/win32reg.xml
index 28960cd098..99fd7fdeb6 100644
--- a/lib/stdlib/doc/src/win32reg.xml
+++ b/lib/stdlib/doc/src/win32reg.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -85,14 +85,22 @@ hkdd             HKEY_DYN_DATA</pre>
     <p>For additional information on the Windows registry consult the Win32
       Programmer's Reference.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="reg_handle"/>
+      <desc><p>As returned by <seealso marker="#open/1">open/1</seealso>.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="name"/>
+    </datatype>
+    <datatype>
+      <name name="value"/>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>change_key(RegHandle, Key) -> ReturnValue</name>
+      <name name="change_key" arity="2"/>
       <fsummary>Move to a key in the registry</fsummary>
-      <type>
-        <v>RegHandle = term()</v>
-        <v>Key = string()</v>
-      </type>
       <desc>
         <p>Changes the current key to another key. Works like cd.
           The key can be specified as a relative path or as an
@@ -100,12 +108,8 @@ hkdd             HKEY_DYN_DATA</pre>
       </desc>
     </func>
     <func>
-      <name>change_key_create(RegHandle, Key) -> ReturnValue</name>
+      <name name="change_key_create" arity="2"/>
       <fsummary>Move to a key, create it if it is not there</fsummary>
-      <type>
-        <v>RegHandle = term()</v>
-        <v>Key = string()</v>
-      </type>
       <desc>
         <p>Creates a key, or just changes to it, if it is already there. Works
           like a combination of <c>mkdir</c> and <c>cd</c>. Calls the Win32 API function
@@ -114,23 +118,16 @@ hkdd             HKEY_DYN_DATA</pre>
       </desc>
     </func>
     <func>
-      <name>close(RegHandle)-> ReturnValue</name>
+      <name name="close" arity="1"/>
       <fsummary>Close the registry.</fsummary>
-      <type>
-        <v>RegHandle = term()</v>
-      </type>
       <desc>
-        <p>Closes the registry. After that, the <c>RegHandle</c> cannot
+        <p>Closes the registry. After that, the <c><anno>RegHandle</anno></c> cannot
           be used.</p>
       </desc>
     </func>
     <func>
-      <name>current_key(RegHandle) -> ReturnValue</name>
+      <name name="current_key" arity="1"/>
       <fsummary>Return the path to the current key.</fsummary>
-      <type>
-        <v>RegHandle = term()</v>
-        <v>ReturnValue = {ok, string()}</v>
-      </type>
       <desc>
         <p>Returns the path to the current key. This is the equivalent of <c>pwd</c>.</p>
         <p>Note that the current key is stored in the driver, and might be
@@ -138,12 +135,8 @@ hkdd             HKEY_DYN_DATA</pre>
       </desc>
     </func>
     <func>
-      <name>delete_key(RegHandle) -> ReturnValue</name>
+      <name name="delete_key" arity="1"/>
       <fsummary>Delete the current key</fsummary>
-      <type>
-        <v>RegHandle = term()</v>
-        <v>ReturnValue = ok | {error, ErrorId}</v>
-      </type>
       <desc>
         <p>Deletes the current key, if it is valid. Calls the Win32 API
           function <c>RegDeleteKey()</c>. Note that this call does not change the current key,
@@ -152,12 +145,8 @@ hkdd             HKEY_DYN_DATA</pre>
       </desc>
     </func>
     <func>
-      <name>delete_value(RegHandle, Name) -> ReturnValue</name>
+      <name name="delete_value" arity="2"/>
       <fsummary>Delete the named value on the current key.</fsummary>
-      <type>
-        <v>RegHandle = term()</v>
-        <v>ReturnValue = ok | {error, ErrorId}</v>
-      </type>
       <desc>
         <p>Deletes a named value on the current key. The atom <c>default</c> is
           used for the the default value.</p>
@@ -165,12 +154,8 @@ hkdd             HKEY_DYN_DATA</pre>
       </desc>
     </func>
     <func>
-      <name>expand(String) -> ExpandedString</name>
+      <name name="expand" arity="1"/>
       <fsummary>Expand a string with environment variables</fsummary>
-      <type>
-        <v>String = string()</v>
-        <v>ExpandedString = string()</v>
-      </type>
       <desc>
         <p>Expands a string containing environment variables between percent
           characters. Anything between two % is taken for a environment
@@ -180,23 +165,15 @@ hkdd             HKEY_DYN_DATA</pre>
       </desc>
     </func>
     <func>
-      <name>format_error(ErrorId) -> ErrorString</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Convert an POSIX errorcode to a string</fsummary>
-      <type>
-        <v>ErrorId = atom()</v>
-        <v>ErrorString = string()</v>
-      </type>
       <desc>
         <p>Convert an POSIX errorcode to a string (by calling <c>erl_posix_msg:message</c>).</p>
       </desc>
     </func>
     <func>
-      <name>open(OpenModeList)-> ReturnValue</name>
+      <name name="open" arity="1"/>
       <fsummary>Open the registry for reading or writing</fsummary>
-      <type>
-        <v>OpenModeList = [OpenMode]</v>
-        <v>OpenMode = read | write</v>
-      </type>
       <desc>
         <p>Opens the registry for reading or writing. The current key will be the root
           (<c>HKEY_CLASSES_ROOT</c>). The <c>read</c> flag in the mode list can be omitted.</p>
@@ -204,12 +181,8 @@ hkdd             HKEY_DYN_DATA</pre>
       </desc>
     </func>
     <func>
-      <name>set_value(RegHandle, Name, Value) -> ReturnValue</name>
+      <name name="set_value" arity="3"/>
       <fsummary>Set value at the current registry key with specified name.</fsummary>
-      <type>
-        <v>Name = string() | default</v>
-        <v>Value = string() | integer() | binary()</v>
-      </type>
       <desc>
         <p>Sets the named (or default) value to value. Calls the Win32
           API function <c>RegSetValueEx()</c>. The value can be of three types, and
@@ -221,13 +194,8 @@ hkdd             HKEY_DYN_DATA</pre>
       </desc>
     </func>
     <func>
-      <name>sub_keys(RegHandle) -> ReturnValue</name>
+      <name name="sub_keys" arity="1"/>
       <fsummary>Get subkeys to the current key.</fsummary>
-      <type>
-        <v>ReturnValue = {ok, SubKeys} | {error, ErrorId}</v>
-        <v>SubKeys = [SubKey]</v>
-        <v>SubKey = string()</v>
-      </type>
       <desc>
         <p>Returns a list of subkeys to the current key. Calls the Win32
           API function <c>EnumRegKeysEx()</c>.</p>
@@ -235,13 +203,8 @@ hkdd             HKEY_DYN_DATA</pre>
       </desc>
     </func>
     <func>
-      <name>value(RegHandle, Name) -> ReturnValue</name>
+      <name name="value" arity="2"/>
       <fsummary>Get the named value on the current key.</fsummary>
-      <type>
-        <v>Name = string() | default</v>
-        <v>ReturnValue = {ok, Value}</v>
-        <v>Value = string() | integer() | binary()</v>
-      </type>
       <desc>
         <p>Retrieves the named value (or default) on the current key.
           Registry values of type <c>REG_SZ</c>, are returned as strings. Type <c>REG_DWORD</c>
@@ -249,15 +212,8 @@ hkdd             HKEY_DYN_DATA</pre>
       </desc>
     </func>
     <func>
-      <name>values(RegHandle) -> ReturnValue</name>
+      <name name="values" arity="1"/>
       <fsummary>Get all values on the current key.</fsummary>
-      <type>
-        <v>ReturnValue = {ok, ValuePairs} | {ok, ErrorId}</v>
-        <v>ValuePairs = [ValuePair]</v>
-        <v>ValuePair = {Name, Value}</v>
-        <v>Name = string | default</v>
-        <v>Value = string() | integer() | binary()</v>
-      </type>
       <desc>
         <p>Retrieves a list of all values on the current key. The values
           have types corresponding to the registry types, see <c>value</c>.
diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml
index 529a70a23d..b03fc7f4e2 100644
--- a/lib/stdlib/doc/src/zip.xml
+++ b/lib/stdlib/doc/src/zip.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2006</year><year>2010</year>
+      <year>2006</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -85,67 +85,55 @@
       recreated.</p>
   </section>
 
-  <section>
-    <title>DATA TYPES</title>
-    <code type="none">
-zip_file()    </code>
-    <p>The record <c>zip_file</c> contains the following fields.</p>
-    <taglist>
-      <tag><c>name = string()</c></tag>
-      <item>
-        <p>the name of the file</p>
-      </item>
-      <tag><c>info = file_info()</c></tag>
-      <item>
-        <p>file info as in
-          <seealso marker="erts:file#read_file_info/1">file:read_file_info/1</seealso></p>
-      </item>
-      <tag><c>comment = string()</c></tag>
-      <item>
-        <p>the comment for the file in the zip archive</p>
-      </item>
-      <tag><c>offset = integer()</c></tag>
-      <item>
-        <p>the offset of the file in the zip archive (used internally)</p>
-      </item>
-      <tag><c>comp_size = integer()</c></tag>
-      <item>
-        <p>the compressed size of the file (the uncompressed size is found
-          in <c>info</c>)</p>
-      </item>
-    </taglist>
-    <code type="none">zip_comment</code>
-    <p>The record <c>zip_comment</c> just contains the archive comment for
-      a zip archive</p>
-    <taglist>
-      <tag><c>comment = string()</c></tag>
-      <item>
-        <p>the comment for the zip archive</p>
-      </item>
-    </taglist>
-  </section>
+  <datatypes>
+    <datatype>
+      <name name="zip_comment"/>
+      <desc>
+        <p>The record <c>zip_comment</c> just contains the archive comment for
+          a zip archive</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="zip_file"/>
+      <desc>
+        <p>The record <c>zip_file</c> contains the following fields.</p>
+        <taglist>
+          <tag><c>name</c></tag>
+          <item>
+            <p>the name of the file</p>
+          </item>
+          <tag><c>info</c></tag>
+          <item>
+            <p>file info as in
+              <seealso marker="kernel:file#read_file_info/1">file:read_file_info/1</seealso></p>
+          </item>
+          <tag><c>comment</c></tag>
+          <item>
+            <p>the comment for the file in the zip archive</p>
+          </item>
+          <tag><c>offset</c></tag>
+          <item>
+            <p>the offset of the file in the zip archive (used internally)</p>
+          </item>
+          <tag><c>comp_size</c></tag>
+          <item>
+            <p>the compressed size of the file (the uncompressed size is found
+              in <c>info</c>)</p>
+          </item>
+        </taglist>
+      </desc>
+    </datatype>
+  </datatypes>
   <funcs>
     <func>
-      <name>zip(Name, FileList) -> RetValue</name>
-      <name>zip(Name, FileList, Options) -> RetValue</name>
-      <name>create(Name, FileList) -> RetValue</name>
-      <name>create(Name, FileList, Options) -> RetValue</name>
+      <name name="zip" arity="2"/>
+      <name name="zip" arity="3"/>
+      <name name="create" arity="2"/>
+      <name name="create" arity="3"/>
       <fsummary>Create a zip archive with options</fsummary>
-      <type>
-        <v>Name = filename()</v>
-        <v>FileList = [FileSpec]</v>
-        <v>FileSpec = filename() | {filename(), binary()} | {filename(), binary(), #file_info{}}</v>
-        <v>Options = [Option]</v>
-        <v>Option = memory | cooked | verbose | {comment, Comment} | {cwd, CWD} | {compress, What} | {uncompress, What}</v>
-        <v>What = all | [Extension] | {add, [Extension]} | {del, [Extension]}</v>
-        <v>Extension = string()</v>
-        <v>Comment = CWD = string()</v>
-        <v>RetValue = {ok, Name} | {ok, {Name, binary()}} | {error, Reason}</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>The <marker id="zip_2"></marker><c>zip</c> function creates a
-          zip archive containing the files specified in <c>FileList</c>.</p>
+          zip archive containing the files specified in <c><anno>FileList</anno></c>.</p>
         <p>As synonyms, the functions <c>create/2</c> and <c>create/3</c>
           are provided, to make it resemble the <c>erl_tar</c> module.</p>
         <p>The file-list is a list of files, with paths relative to the
@@ -161,9 +149,9 @@ zip_file()    </code>
           <c>.Z</c>, <c>.zip</c>, <c>.zoo</c>, <c>.arc</c>, <c>.lzh</c>,
           <c>.arj</c>.</p>
         <p>It is possible to override the default behavior and
-        explicitly control what types of files should be
-        compressed by using the <c>{compress, What}</c> and
-        <c>{uncompress, What}</c> options. It is possible to have
+        explicitly control what types of files that should be
+        compressed by using the <c>{compress, <anno>What</anno>}</c> and
+        <c>{uncompress, <anno>What</anno>}</c> options. It is possible to have
         several <c>compress</c> and <c>uncompress</c> options. In
         order to trigger compression of a file, its extension must
         match with the
@@ -191,22 +179,22 @@ zip_file()    </code>
           <tag><c>memory</c></tag>
           <item>
             <p>The output will not be to a file, but instead as a tuple
-              <c>{FileName, binary()}</c>. The binary will be a full zip
+              <c>{<anno>FileName</anno>, binary()}</c>. The binary will be a full zip
               archive with header, and can be extracted with for instance
               <c>unzip/2</c>.</p>
           </item>
-          <tag><c>{comment, Comment}</c></tag>
+          <tag><c>{comment, <anno>Comment</anno>}</c></tag>
           <item>
             <p>Add a comment to the zip-archive.</p>
           </item>
-          <tag><c>{cwd, CWD}</c></tag>
+          <tag><c>{cwd, <anno>CWD</anno>}</c></tag>
           <item>
             <p>Use the given directory as current directory, it will be
               prepended to file names when adding them, although it will not
               be in the zip-archive. (Acting like a file:set_cwd/1, but
               without changing the global cwd property.)</p>
           </item>
-          <tag><c>{compress, What}</c></tag>
+          <tag><c>{compress, <anno>What</anno>}</c></tag>
           <item>
             <p>Controls what types of files will be
             compressed. It is by default set to <c>all</c>. The
@@ -215,18 +203,18 @@ zip_file()    </code>
 	            <tag><c>all</c></tag>
 		    <item><p> means that all files will be compressed (as long
 		       as they pass the <c>uncompress</c> condition).</p></item>
-		    <tag><c>[Extension]</c></tag>
+		    <tag><c>[<anno>Extension</anno>]</c></tag>
 		    <item><p>means that only files with exactly these extensions
 		     will be compressed.</p></item>
-	            <tag><c>{add,[Extension]}</c></tag>
+	            <tag><c>{add,[<anno>Extension</anno>]}</c></tag>
 		    <item><p>adds these extensions to the list of compress
 		     extensions.</p></item>
-	            <tag><c>{del,[Extension]}</c></tag>
+	            <tag><c>{del,[<anno>Extension</anno>]}</c></tag>
 		    <item><p>deletes these extensions from the list of compress
 		     extensions.</p></item>
 	      </taglist>
 	  </item>
-          <tag><c>{uncompress, What}</c></tag>
+          <tag><c>{uncompress, <anno>What</anno>}</c></tag>
           <item>
             <p>Controls what types of files will be uncompressed. It is by
             default set to <c>[".Z",".zip",".zoo",".arc",".lzh",".arj"]</c>.
@@ -234,13 +222,13 @@ zip_file()    </code>
 	      <taglist>
 	            <tag><c>all</c></tag>
 		    <item><p> means that no files will be compressed.</p></item>
-		    <tag><c>[Extension]</c></tag>
+		    <tag><c>[<anno>Extension</anno>]</c></tag>
 		    <item><p>means that files with these extensions will be
 		    uncompressed.</p></item>
-	            <tag><c>{add,[Extension]}</c></tag>
+	            <tag><c>{add,[<anno>Extension</anno>]}</c></tag>
 		    <item><p>adds these extensions to the list of uncompress
 		     extensions.</p></item>
-	            <tag><c>{del,[Extension]}</c></tag>
+	            <tag><c>{del,[<anno>Extension</anno>]}</c></tag>
 		    <item><p>deletes these extensions from the list of uncompress
 		     extensions.</p></item>
 	      </taglist>
@@ -249,23 +237,11 @@ zip_file()    </code>
       </desc>
     </func>
     <func>
-      <name>unzip(Archive) -> RetValue</name>
-      <name>unzip(Archive, Options) -> RetValue</name>
-      <name>extract(Archive) -> RetValue</name>
-      <name>extract(Archive, Options) -> RetValue</name>
+      <name name="unzip" arity="1"/>
+      <name name="unzip" arity="2"/>
+      <name name="extract" arity="1"/>
+      <name name="extract" arity="2"/>
       <fsummary>Extract files from a zip archive</fsummary>
-      <type>
-        <v>Archive = filename() | binary()</v>
-        <v>Options = [Option]</v>
-        <v>Option = {file_list, FileList} | keep_old_files | verbose | memory | {file_filter, FileFilter} | {cwd, CWD}</v>
-        <v>FileList = [filename()]</v>
-        <v>FileBinList = [{filename(),binary()}]</v>
-        <v>FileFilter = fun(ZipFile) -> true | false</v>
-        <v>CWD = string()</v>
-        <v>ZipFile = zip_file()</v>
-        <v>RetValue = {ok,FileList} | {ok,FileBinList} | {error, Reason} | {error, {Name, Reason}}</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>The           <marker id="unzip_1"></marker>
 <c>unzip/1</c> function extracts
@@ -273,17 +249,17 @@ zip_file()    </code>
                     <marker id="unzip_2"></marker>
 <c>unzip/2</c> function provides options
           to extract some files, and more.</p>
-        <p>If the <c>Archive</c> argument is given as a binary,
+        <p>If the <c><anno>Archive</anno></c> argument is given as a binary,
           the contents of the binary is assumed to be a zip archive,
           otherwise it should be a filename.</p>
         <p>The following options are available:</p>
         <taglist>
-          <tag><c>{file_list, FileList}</c></tag>
+          <tag><c>{file_list, <anno>FileList</anno>}</c></tag>
           <item>
             <p>By default, all files will be extracted from the zip
-              archive. With the <c>{file_list,FileList}</c> option,
+              archive. With the <c>{file_list, <anno>FileList</anno>}</c> option,
               the <c>unzip/2</c> function will only extract the files
-              whose names are included in <c>FileList</c>. The full
+              whose names are included in <c><anno>FileList</anno></c>. The full
               paths, including the names of all sub directories within
               the zip archive, must be specified.</p>
           </item>
@@ -329,29 +305,29 @@ zip_file()    </code>
       </desc>
     </func>
     <func>
-      <name>foldl(Fun, Acc0, Archive) -> {ok, Acc1} | {error, Reason}</name>
+      <name name="foldl" arity="3"/>
       <fsummary>Fold a function over all files in a zip archive</fsummary>
-      <type>
-        <v>Fun = fun(FileInArchive, GetInfo, GetBin, AccIn) -> AccOut</v>
-        <v>FileInArchive = filename()</v>
-        <v>GetInfo = fun() -> #file_info{}</v>
-        <v>GetBin = fun() -> binary()</v>
-        <v>Acc0 = Acc1 = AccIn = AccOut = term()</v>
-        <v>Archive = filename() | {filename(), binary()}</v>
-      </type>
       <desc>
         <p>The <marker id="foldl_3"></marker> <c>foldl/3</c> function
-        calls <c>Fun(FileInArchive, GetInfo, GetBin, AccIn)</c> on
-        successive files in the <c>Archive</c>, starting with <c>AccIn
-        == Acc0</c>. <c>FileInArchive</c> is the name that the file
-        has in the archive. <c>GetInfo</c> is a fun that returns info
-        about the the file. <c>GetBin</c> returns the contents of the
-        file. Both <c>GetInfo</c> and <c>GetBin</c> must be called
-        within the <c>Fun</c>. Their behavior is undefined if they are
-        called outside the context of the <c>Fun</c>. The <c>Fun</c>
+        calls <c><anno>Fun</anno>(<anno>FileInArchive</anno>, <anno>GetInfo
+        </anno>, <anno>GetBin</anno>, <anno>AccIn</anno>)</c> on
+        successive files in the <c>Archive</c>, starting with
+        <c><anno>AccIn</anno>
+        == <anno>Acc0</anno></c>. <c><anno>FileInArchive</anno></c> is
+        the name that the file
+        has in the archive. <c><anno>GetInfo</anno></c> is a fun that
+        returns info
+        about the the file. <c><anno>GetBin</anno></c> returns the contents
+        of the
+        file. Both <c><anno>GetInfo</anno></c> and <c><anno>GetBin</anno></c>
+        must be called
+        within the <c><anno>Fun</anno></c>. Their behavior is undefined if
+        they are
+        called outside the context of the <c><anno>Fun</anno></c>.
+        The <c><anno>Fun</anno></c>
         must return a new accumulator which is passed to the next
         call. <c>foldl/3</c> returns the final value of the
-        accumulator. <c>Acc0</c> is returned if the archive is
+        accumulator. <c><anno>Acc0</anno></c> is returned if the archive is
         empty. It is not necessary to iterate over all files in the
         archive. The iteration may be ended prematurely in a
         controlled manner by throwing an exception.</p>
@@ -387,26 +363,16 @@ zip_file()    </code>
       </desc>
     </func>
     <func>
-      <name>list_dir(Archive) -> RetValue</name>
-      <name>list_dir(Archive, Options)</name>
-      <name>table(Archive) -> RetValue</name>
-      <name>table(Archive, Options)</name>
+      <name name="list_dir" arity="1"/>
+      <name name="list_dir" arity="2"/>
+      <name name="table" arity="1" />
+      <name name="table" arity="2"/>
       <fsummary>Retrieve the name of all files in a zip archive</fsummary>
-      <type>
-        <v>Archive = filename() | binary()</v>
-        <v>RetValue = {ok, [Comment, Files]} | {error, Reason}</v>
-        <v>Comment = zip_comment()</v>
-        <v>Files = [zip_file()]</v>
-        <v>Options = [Option]</v>
-        <v>Option = cooked</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
-        <p>The           <marker id="list_dir_1"></marker>
-<c>list_dir/1</c> function retrieves
-          the names of all files in the zip archive <c>Archive</c>. The
-                    <marker id="list_dir_2"></marker>
-<c>list_dir/2</c> function provides options.</p>
+        <p>The <marker id="list_dir_1"></marker><c>list_dir/1</c>
+          function retrieves the names of all files in the zip archive
+          <c><anno>Archive</anno></c>. The <marker id="list_dir_2"></marker>
+          <c>list_dir/2</c> function provides options.</p>
         <p>As synonyms, the functions <c>table/2</c> and <c>table/3</c>
           are provided, to make it resemble the <c>erl_tar</c> module.</p>
         <p>The result value is the tuple <c>{ok, List}</c>, where <c>List</c>
@@ -425,43 +391,27 @@ zip_file()    </code>
       </desc>
     </func>
     <func>
-      <name>t(Archive)</name>
+      <name name="t" arity="1"/>
       <fsummary>Print the name of each file in a zip archive</fsummary>
-      <type>
-        <v>Archive = filename() | binary() | ZipHandle</v>
-        <v>ZipHandle = pid()</v>
-      </type>
       <desc>
-        <p>The           <marker id="t_1"></marker>
-<c>t/1</c> function prints the names
-          of all files in the zip archive <c>Archive</c> to the Erlang shell.
+        <p>The <marker id="t_1"></marker><c>t/1</c> function prints the names
+          of all files in the zip archive <c><anno>Archive</anno></c> to the Erlang shell.
           (Similar to "<c>tar&nbsp;t</c>".)</p>
       </desc>
     </func>
     <func>
-      <name>tt(Archive)</name>
+      <name name="tt" arity="1"/>
       <fsummary>Print name and information for each file in a zip archive</fsummary>
-      <type>
-        <v>Archive = filename() | binary()</v>
-      </type>
       <desc>
-        <p>The           <marker id="tt_1"></marker>
-<c>tt/1</c> function prints names and
-          information about all files in the zip archive <c>Archive</c> to
+        <p>The <marker id="tt_1"></marker><c>tt/1</c> function prints names and
+          information about all files in the zip archive <c><anno>Archive</anno></c> to
           the Erlang shell. (Similar to "<c>tar tv</c>".)</p>
       </desc>
     </func>
     <func>
-      <name>zip_open(Archive) -> {ok, ZipHandle} | {error, Reason}</name>
-      <name>zip_open(Archive, Options) -> {ok, ZipHandle} | {error, Reason}</name>
+      <name name="zip_open" arity="1"/>
+      <name name="zip_open" arity="2"/>
       <fsummary>Open an archive and return a handle to it</fsummary>
-      <type>
-        <v>Archive = filename() | binary()</v>
-        <v>Options = [Option]</v>
-        <v>Options = cooked | memory | {cwd, CWD}</v>
-        <v>CWD = string()</v>
-        <v>ZipHandle = pid()</v>
-      </type>
       <desc>
         <p>The           <marker id="zip_open"></marker>
 <c>zip_open</c> function opens a
@@ -472,29 +422,19 @@ zip_file()    </code>
       </desc>
     </func>
     <func>
-      <name>zip_list_dir(ZipHandle) -> Result | {error, Reason}</name>
+      <name name="zip_list_dir" arity="1"/>
       <fsummary>Return a table of files in open zip archive</fsummary>
-      <type>
-        <v>Result = [ZipComment, ZipFile...]</v>
-        <v>ZipComment = #zip_comment{}</v>
-        <v>ZipFile = #zip_file{}</v>
-        <v>ZipHandle = pid()</v>
-      </type>
       <desc>
-        <p>The           <marker id="zip_list_dir"></marker>
-<c>zip_list_dir/1</c> function
-          returns the file list of an open zip archive.</p>
+        <p>The <marker id="zip_list_dir"></marker>
+          <c>zip_list_dir/1</c> function
+          returns the file list of an open zip archive. The first returned
+          element is the zip archive comment.</p>
       </desc>
     </func>
     <func>
-      <name>zip_get(ZipHandle) -> {ok, [Result]} | {error, Reason}</name>
-      <name>zip_get(FileName, ZipHandle) -> {ok, Result} | {error, Reason}</name>
+      <name name="zip_get" arity="1"/>
+      <name name="zip_get" arity="2"/>
       <fsummary>Extract files from an open archive</fsummary>
-      <type>
-        <v>FileName = filename()</v>
-        <v>ZipHandle = pid()</v>
-        <v>Result = filename() | {filename(), binary()}</v>
-      </type>
       <desc>
         <p>The           <marker id="zip_get"></marker>
 <c>zip_get</c> function extracts
@@ -505,11 +445,8 @@ zip_file()    </code>
       </desc>
     </func>
     <func>
-      <name>zip_close(ZipHandle) -> ok | {error, einval}</name>
+      <name name="zip_close" arity="1"/>
       <fsummary>Close an open archive</fsummary>
-      <type>
-        <v>ZipHandle = pid()</v>
-      </type>
       <desc>
         <p>The           <marker id="zip_close"></marker>
 <c>zip_close/1</c> function closes
diff --git a/lib/stdlib/include/zip.hrl b/lib/stdlib/include/zip.hrl
index 2b5ddc1dfe..6e3ed9c78a 100644
--- a/lib/stdlib/include/zip.hrl
+++ b/lib/stdlib/include/zip.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. 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
@@ -19,7 +19,7 @@
 
 -record(zip_file, {
 	  name      :: string(),	  % file name
-	  info	    :: #file_info{},
+	  info	    :: file:file_info(),
 	  comment   :: string(),	  % zip file comment
 	  offset    :: non_neg_integer(), % offset of file's local header in archive
 	  comp_size :: non_neg_integer()  % compressed size
diff --git a/lib/stdlib/src/array.erl b/lib/stdlib/src/array.erl
index 83576c9fd3..2f69e2b0a4 100644
--- a/lib/stdlib/src/array.erl
+++ b/lib/stdlib/src/array.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -163,17 +163,17 @@
 
 -type array_indx() :: non_neg_integer().
 
--type array_opt()  :: 'fixed' | non_neg_integer()
-                    | {'default', term()} | {'fixed', boolean()}
-                    | {'size', non_neg_integer()}.
+-type array_opt()  :: {'fixed', boolean()} | 'fixed'
+                    | {'default', Value :: term()}
+                    | {'size', N :: non_neg_integer()}
+                    | (N :: non_neg_integer()).
 -type array_opts() :: array_opt() | [array_opt()].
 
--type indx_pair()  :: {array_indx(), term()}.
+-type indx_pair()  :: {Index :: array_indx(), Value :: term()}.
 -type indx_pairs() :: [indx_pair()].
 
 %%--------------------------------------------------------------------------
 
-%% @spec () -> array()
 %% @doc Create a new, extendible array with initial size zero.
 %% @equiv new([])
 %%
@@ -185,7 +185,6 @@
 new() ->
     new([]).
 
-%% @spec (Options::term()) -> array()
 %% @doc Create a new array according to the given options. By default,
 %% the array is extendible and has initial size zero. Array indices
 %% start at 0.
@@ -224,12 +223,11 @@ new() ->
 %% @see from_list/2
 %% @see fix/1
 
--spec new(array_opts()) -> array().
+-spec new(Options :: array_opts()) -> array().
 
 new(Options) ->
     new_0(Options, 0, false).
 
-%% @spec (Size::integer(), Options::term()) -> array()
 %% @doc Create a new array according to the given size and options. If
 %% `Size' is not a nonnegative integer, the call fails with reason
 %% `badarg'. By default, the array has fixed size. Note that any size
@@ -245,7 +243,7 @@ new(Options) ->
 %%
 %% @see new/1
 
--spec new(non_neg_integer(), array_opts()) -> array().
+-spec new(Size :: non_neg_integer(), Options :: array_opts()) -> array().
 
 new(Size, Options) when is_integer(Size), Size >= 0 ->
     new_0(Options, Size, true);
@@ -293,13 +291,12 @@ find_max(_I, M) ->
     M.
 
 
-%% @spec (X::term()) -> boolean()
 %% @doc Returns `true' if `X' appears to be an array, otherwise `false'.
 %% Note that the check is only shallow; there is no guarantee that `X'
 %% is a well-formed array representation even if this function returns
 %% `true'.
 
--spec is_array(term()) -> boolean().
+-spec is_array(X :: term()) -> boolean().
 
 is_array(#array{size = Size, max = Max})
   when is_integer(Size), is_integer(Max) ->
@@ -308,25 +305,23 @@ is_array(_) ->
     false.
 
 
-%% @spec (array()) -> integer()
 %% @doc Get the number of entries in the array. Entries are numbered
 %% from 0 to `size(Array)-1'; hence, this is also the index of the first
 %% entry that is guaranteed to not have been previously set.
 %% @see set/3
 %% @see sparse_size/1
 
--spec size(array()) -> non_neg_integer().
+-spec size(Array :: array()) -> non_neg_integer().
 
 size(#array{size = N}) -> N;
 size(_) -> erlang:error(badarg).
 
 
-%% @spec (array()) -> term()
 %% @doc Get the value used for uninitialized entries.
 %%
 %% @see new/2
 
--spec default(array()) -> term().
+-spec default(Array :: array()) -> term().
 
 default(#array{default = D}) -> D;
 default(_) -> erlang:error(badarg).
@@ -405,23 +400,21 @@ new_test_() ->
 -endif.
 
 
-%% @spec (array()) -> array()
 %% @doc Fix the size of the array. This prevents it from growing
 %% automatically upon insertion; see also {@link set/3}.
 %% @see relax/1
 
--spec fix(array()) -> array().
+-spec fix(Array :: array()) -> array().
 
 fix(#array{}=A) ->
     A#array{max = 0}.
 
 
-%% @spec (array()) -> boolean()
 %% @doc Check if the array has fixed size. 
 %% Returns `true' if the array is fixed, otherwise `false'.
 %% @see fix/1
 
--spec is_fix(array()) -> boolean().
+-spec is_fix(Array :: array()) -> boolean().
 
 is_fix(#array{max = 0}) -> true;
 is_fix(#array{}) -> false.
@@ -455,12 +448,11 @@ fix_test_() ->
 -endif.
 
 
-%% @spec (array()) -> array()
 %% @doc Make the array resizable. (Reverses the effects of {@link
 %% fix/1}.)
 %% @see fix/1
 
--spec relax(array()) -> array().
+-spec relax(Array :: array()) -> array().
 
 relax(#array{size = N}=A) ->
     A#array{max = find_max(N-1, ?LEAFSIZE)}.
@@ -481,12 +473,11 @@ relax_test_() ->
 -endif.
 
 
-%% @spec (integer(), array()) -> array()
 %% @doc Change the size of the array. If `Size' is not a nonnegative
 %% integer, the call fails with reason `badarg'. If the given array has
 %% fixed size, the resulting array will also have fixed size.
 
--spec resize(non_neg_integer(), array()) -> array().
+-spec resize(Size :: non_neg_integer(), Array :: array()) -> array().
 
 resize(Size, #array{size = N, max = M, elements = E}=A)
   when is_integer(Size), Size >= 0 ->
@@ -510,8 +501,6 @@ resize(_Size, _) ->
     erlang:error(badarg).
 
 
-%% @spec (array()) -> array()
-
 %% @doc Change the size of the array to that reported by {@link
 %% sparse_size/1}. If the given array has fixed size, the resulting
 %% array will also have fixed size.
@@ -519,7 +508,7 @@ resize(_Size, _) ->
 %% @see resize/2
 %% @see sparse_size/1
 
--spec resize(array()) -> array().
+-spec resize(Array :: array()) -> array().
 
 resize(Array) ->
     resize(sparse_size(Array), Array).
@@ -559,7 +548,6 @@ resize_test_() ->
 -endif.
 
 
-%% @spec (integer(), term(), array()) -> array()
 %% @doc Set entry `I' of the array to `Value'. If `I' is not a
 %% nonnegative integer, or if the array has fixed size and `I' is larger
 %% than the maximum index, the call fails with reason `badarg'.
@@ -570,7 +558,7 @@ resize_test_() ->
 %% @see get/2
 %% @see reset/2
 
--spec set(array_indx(), term(), array()) -> array().
+-spec set(I :: array_indx(), Value :: term(), Array :: array()) -> array().
 
 set(I, Value, #array{size = N, max = M, default = D, elements = E}=A)
   when is_integer(I), I >= 0 ->
@@ -624,7 +612,6 @@ expand(I, _S, X, D) ->
     setelement(I+1, ?NEW_LEAF(D), X).
 
 
-%% @spec (integer(), array()) -> term()
 %% @doc Get the value of entry `I'. If `I' is not a nonnegative
 %% integer, or if the array has fixed size and `I' is larger than the
 %% maximum index, the call fails with reason `badarg'.
@@ -634,7 +621,7 @@ expand(I, _S, X, D) ->
  
 %% @see set/3
 
--spec get(array_indx(), array()) -> term().
+-spec get(I :: array_indx(), Array :: array()) -> term().
 
 get(I, #array{size = N, max = M, elements = E, default = D})
   when is_integer(I), I >= 0 ->
@@ -660,7 +647,6 @@ get_1(I, E, _D) ->
     element(I+1, E).
 
 
-%% @spec (integer(), array()) -> array()
 %% @doc Reset entry `I' to the default value for the array. 
 %% If the value of entry `I' is the default value the array will be
 %% returned unchanged. Reset will never change size of the array. 
@@ -675,7 +661,7 @@ get_1(I, E, _D) ->
 
 %% TODO: a reset_range function
 
--spec reset(array_indx(), array()) -> array().
+-spec reset(I :: array_indx(), Array :: array()) -> array().
 
 reset(I, #array{size = N, max = M, default = D, elements = E}=A) 
     when is_integer(I), I >= 0 ->
@@ -756,13 +742,12 @@ set_get_test_() ->
 -endif.
 
 
-%% @spec (array()) -> list()
 %% @doc Converts the array to a list.
 %%
 %% @see from_list/2
 %% @see sparse_to_list/1
 
--spec to_list(array()) -> list().
+-spec to_list(Array :: array()) -> list().
 
 to_list(#array{size = 0}) ->
     [];
@@ -831,12 +816,11 @@ to_list_test_() ->
 -endif.
 
 
-%% @spec (array()) -> list()
 %% @doc Converts the array to a list, skipping default-valued entries.
 %%
 %% @see to_list/1
 
--spec sparse_to_list(array()) -> list().
+-spec sparse_to_list(Array :: array()) -> list().
 
 sparse_to_list(#array{size = 0}) ->
     [];
@@ -901,15 +885,13 @@ sparse_to_list_test_() ->
 -endif.
 
 
-%% @spec (list()) -> array()
 %% @equiv from_list(List, undefined)
 
--spec from_list(list()) -> array().
+-spec from_list(List :: list()) -> array().
 
 from_list(List) ->
     from_list(List, undefined).
 
-%% @spec (list(), term()) -> array()
 %% @doc Convert a list to an extendible array. `Default' is used as the value
 %% for uninitialized entries of the array. If `List' is not a proper list,
 %% the call fails with reason `badarg'.
@@ -917,7 +899,7 @@ from_list(List) ->
 %% @see new/2
 %% @see to_list/1
 
--spec from_list(list(), term()) -> array().
+-spec from_list(List :: list(), Default :: term()) -> array().
 
 from_list([], Default) ->
     new({default,Default});
@@ -1011,13 +993,12 @@ from_list_test_() ->
 -endif.
 
 
-%% @spec (array()) -> [{Index::integer(), Value::term()}]
 %% @doc Convert the array to an ordered list of pairs `{Index, Value}'.
 %%
 %% @see from_orddict/2
 %% @see sparse_to_orddict/1
 
--spec to_orddict(array()) -> indx_pairs().
+-spec to_orddict(Array :: array()) -> indx_pairs().
 
 to_orddict(#array{size = 0}) ->
     [];
@@ -1104,13 +1085,12 @@ to_orddict_test_() ->
 -endif.
 
 
-%% @spec (array()) -> [{Index::integer(), Value::term()}]
 %% @doc Convert the array to an ordered list of pairs `{Index, Value}',
 %% skipping default-valued entries.
 %% 
 %% @see to_orddict/1
 
--spec sparse_to_orddict(array()) -> indx_pairs().
+-spec sparse_to_orddict(Array :: array()) -> indx_pairs().
 
 sparse_to_orddict(#array{size = 0}) ->
     [];
@@ -1188,15 +1168,13 @@ sparse_to_orddict_test_() ->
 -endif.
 
 
-%% @spec (list()) -> array()
 %% @equiv from_orddict(Orddict, undefined)
 
--spec from_orddict(indx_pairs()) -> array().
+-spec from_orddict(Orddict :: indx_pairs()) -> array().
 
 from_orddict(Orddict) ->
     from_orddict(Orddict, undefined).
 
-%% @spec (list(), term()) -> array() 
 %% @doc Convert an ordered list of pairs `{Index, Value}' to a
 %% corresponding extendible array. `Default' is used as the value for
 %% uninitialized entries of the array. If `List' is not a proper,
@@ -1206,7 +1184,7 @@ from_orddict(Orddict) ->
 %% @see new/2
 %% @see to_orddict/1
 
--spec from_orddict(indx_pairs(), term()) -> array().
+-spec from_orddict(Orddict :: indx_pairs(), Default :: term()) -> array().
 
 from_orddict([], Default) ->
     new({default,Default});
@@ -1392,7 +1370,6 @@ from_orddict_test_() ->
 -endif.
 
 
-%% @spec (Function, array()) -> array()
 %%    Function = (Index::integer(), Value::term()) -> term()
 %% @doc Map the given function onto each element of the array. The
 %% elements are visited in order from the lowest index to the highest.
@@ -1402,7 +1379,8 @@ from_orddict_test_() ->
 %% @see foldr/3
 %% @see sparse_map/2
 
--spec map(fun((array_indx(), _) -> _), array()) -> array().
+-spec map(Function, Array :: array()) -> array() when
+      Function :: fun((Index :: array_indx(), Value :: _) -> _).
 
 map(Function, Array=#array{size = N, elements = E, default = D})
   when is_function(Function, 2) ->
@@ -1485,7 +1463,6 @@ map_test_() ->
 -endif.
 
 
-%% @spec (Function, array()) -> array()
 %%    Function = (Index::integer(), Value::term()) -> term()
 %% @doc Map the given function onto each element of the array, skipping
 %% default-valued entries. The elements are visited in order from the
@@ -1494,7 +1471,8 @@ map_test_() ->
 %%
 %% @see map/2
 
--spec sparse_map(fun((array_indx(), _) -> _), array()) -> array().
+-spec sparse_map(Function, Array :: array()) -> array() when
+      Function :: fun((Index :: array_indx(), Value :: _) -> _).
 
 sparse_map(Function, Array=#array{size = N, elements = E, default = D})
   when is_function(Function, 2) ->
@@ -1580,9 +1558,6 @@ sparse_map_test_() ->
 -endif.
 
 
-%% @spec (Function, InitialAcc::term(), array()) -> term()
-%%    Function = (Index::integer(), Value::term(), Acc::term()) ->
-%%               term()
 %% @doc Fold the elements of the array using the given function and
 %% initial accumulator value. The elements are visited in order from the
 %% lowest index to the highest. If `Function' is not a function, the
@@ -1592,7 +1567,8 @@ sparse_map_test_() ->
 %% @see map/2
 %% @see sparse_foldl/3
 
--spec foldl(fun((array_indx(), _, A) -> B), A, array()) -> B.
+-spec foldl(Function, InitialAcc :: A, Array :: array()) -> B when
+      Function :: fun((Index :: array_indx(), Value :: _, Acc :: A) -> B).
 
 foldl(Function, A, #array{size = N, elements = E, default = D})
   when is_function(Function, 3) ->
@@ -1656,9 +1632,6 @@ foldl_test_() ->
 -endif.
 
 
-%% @spec (Function, InitialAcc::term(), array()) -> term()
-%%    Function = (Index::integer(), Value::term(), Acc::term()) ->
-%%               term()
 %% @doc Fold the elements of the array using the given function and
 %% initial accumulator value, skipping default-valued entries. The
 %% elements are visited in order from the lowest index to the highest.
@@ -1667,7 +1640,8 @@ foldl_test_() ->
 %% @see foldl/3
 %% @see sparse_foldr/3
 
--spec sparse_foldl(fun((array_indx(), _, A) -> B), A, array()) -> B.
+-spec sparse_foldl(Function, InitialAcc :: A, Array :: array()) -> B when
+      Function :: fun((Index :: array_indx(), Value :: _, Acc :: A) -> B).
 
 sparse_foldl(Function, A, #array{size = N, elements = E, default = D})
   when is_function(Function, 3) ->
@@ -1735,9 +1709,6 @@ sparse_foldl_test_() ->
 -endif.
 
 
-%% @spec (Function, InitialAcc::term(), array()) -> term()
-%%    Function = (Index::integer(), Value::term(), Acc::term()) ->
-%%               term()
 %% @doc Fold the elements of the array right-to-left using the given
 %% function and initial accumulator value. The elements are visited in
 %% order from the highest index to the lowest. If `Function' is not a
@@ -1746,7 +1717,8 @@ sparse_foldl_test_() ->
 %% @see foldl/3
 %% @see map/2
 
--spec foldr(fun((array_indx(), _, A) -> B), A, array()) -> B.
+-spec foldr(Function, InitialAcc :: A, Array :: array()) -> B when
+      Function :: fun((Index :: array_indx(), Value :: _, Acc :: A) -> B).
 
 foldr(Function, A, #array{size = N, elements = E, default = D})
   when is_function(Function, 3) ->
@@ -1815,9 +1787,6 @@ foldr_test_() ->
 -endif.
 
 
-%% @spec (Function, InitialAcc::term(), array()) -> term()
-%%    Function = (Index::integer(), Value::term(), Acc::term()) ->
-%%               term()
 %% @doc Fold the elements of the array right-to-left using the given
 %% function and initial accumulator value, skipping default-valued
 %% entries. The elements are visited in order from the highest index to
@@ -1827,7 +1796,8 @@ foldr_test_() ->
 %% @see foldr/3
 %% @see sparse_foldl/3
 
--spec sparse_foldr(fun((array_indx(), _, A) -> B), A, array()) -> B.
+-spec sparse_foldr(Function, InitialAcc :: A, Array :: array()) -> B when
+      Function :: fun((Index :: array_indx(), Value :: _, Acc :: A) -> B).
 
 sparse_foldr(Function, A, #array{size = N, elements = E, default = D})
   when is_function(Function, 3) ->
@@ -1870,7 +1840,6 @@ sparse_foldr_3(I, T, Ix, A, F, D) ->
     end.
 
 
-%% @spec (array()) -> integer()
 %% @doc Get the number of entries in the array up until the last
 %% non-default valued entry. In other words, returns `I+1' if `I' is the
 %% last non-default valued entry in the array, or zero if no such entry
@@ -1878,7 +1847,7 @@ sparse_foldr_3(I, T, Ix, A, F, D) ->
 %% @see size/1
 %% @see resize/1
 
--spec sparse_size(array()) -> non_neg_integer().
+-spec sparse_size(Array :: array()) -> non_neg_integer().
 
 sparse_size(A) ->
     F = fun (I, _V, _A) -> throw({value, I}) end,
diff --git a/lib/stdlib/src/base64.erl b/lib/stdlib/src/base64.erl
index a14a72ac6d..5d800e87b8 100644
--- a/lib/stdlib/src/base64.erl
+++ b/lib/stdlib/src/base64.erl
@@ -38,7 +38,9 @@
 %% Description: Encodes a plain ASCII string (or binary) into base64.
 %%-------------------------------------------------------------------------
 
--spec encode_to_string(string() | binary()) -> ascii_string().
+-spec encode_to_string(Data) -> Base64String when
+      Data :: string() | binary(),
+      Base64String :: ascii_string().
 
 encode_to_string(Bin) when is_binary(Bin) ->
     encode_to_string(binary_to_list(Bin));
@@ -53,7 +55,9 @@ encode_to_string(List) when is_list(List) ->
 %% Description: Encodes a plain ASCII string (or binary) into base64.
 %%-------------------------------------------------------------------------
 
--spec encode(string() | binary()) -> binary().
+-spec encode(Data) -> Base64 when
+      Data :: string() | binary(),
+      Base64 :: binary().
 
 encode(Bin) when is_binary(Bin) ->
     encode_binary(Bin);
@@ -102,14 +106,18 @@ encode_binary(Bin) ->
 %% whereas decode crashes if an illegal character is found
 %%-------------------------------------------------------------------------
 
--spec decode(string() | binary()) -> binary().
+-spec decode(Base64) -> Data when
+      Base64 :: string() | binary(),
+      Data :: binary().
 
 decode(Bin) when is_binary(Bin) ->
     decode_binary(<<>>, Bin);
 decode(List) when is_list(List) ->
     list_to_binary(decode_l(List)).
 
--spec mime_decode(string() | binary()) -> binary().
+-spec mime_decode(Base64) -> Data when
+      Base64 :: string() | binary(),
+      Data :: binary().
 
 mime_decode(Bin) when is_binary(Bin) ->
     mime_decode_binary(<<>>, Bin);
@@ -139,14 +147,18 @@ mime_decode_l(List) ->
 %% whereas decode crashes if an illegal character is found
 %%-------------------------------------------------------------------------
 
--spec decode_to_string(string() | binary()) -> string().
+-spec decode_to_string(Base64) -> DataString when
+      Base64 :: string() | binary(),
+      DataString :: string().
 
 decode_to_string(Bin) when is_binary(Bin) ->
     decode_to_string(binary_to_list(Bin));
 decode_to_string(List) when is_list(List) ->
     decode_l(List).
 
--spec mime_decode_to_string(string() | binary()) -> string().
+-spec mime_decode_to_string(Base64) -> DataString when
+      Base64 :: string() | binary(),
+      DataString :: string().
 
 mime_decode_to_string(Bin) when is_binary(Bin) ->
     mime_decode_to_string(binary_to_list(Bin));
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index 74d4ad3da7..d9c645d787 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -54,13 +54,9 @@
 
 -type beam() :: module() | file:filename() | binary().
 
-%% XXX: THE FOLLOWING SHOULD BE IMPORTED FROM SOMEWHERE ELSE
--type forms()     :: term().
+-type forms()     :: [erl_parse:abstract_form()].
 
--type abst_vsn()  :: atom().
--type abst_code() :: {abst_vsn(), forms()} | 'no_abstract_code'.
--type attribute() :: atom().
--type attrvalue() :: term().
+-type abst_code() :: {AbstVersion :: atom(), forms()} | 'no_abstract_code'.
 -type dataB()     :: binary().
 -type index()     :: non_neg_integer().
 -type label()     :: integer().
@@ -74,9 +70,9 @@
                    | 'atoms'.
 -type chunkref()  :: chunkname() | chunkid().
 
--type attrib_entry()   :: {attribute(), [attrvalue()]}.
--type compinfo_entry() :: {atom(), term()}.
--type labeled_entry()  :: {atom(), arity(), label()}.
+-type attrib_entry()   :: {Attribute :: atom(), [AttributeValue :: term()]}.
+-type compinfo_entry() :: {InfoKey :: atom(), term()}.
+-type labeled_entry()  :: {Function :: atom(), arity(), label()}.
 
 -type chunkdata() :: {chunkid(), dataB()}
                    | {'abstract_code', abst_code()}
@@ -85,20 +81,17 @@
                    | {'exports', [{atom(), arity()}]}
                    | {'labeled_exports', [labeled_entry()]}
                    | {'imports', [mfa()]}
-                   | {'indexed_imports', [{index(), module(), atom(), arity()}]}
+                   | {'indexed_imports', [{index(), module(), Function :: atom(), arity()}]}
                    | {'locals', [{atom(), arity()}]}
                    | {'labeled_locals', [labeled_entry()]}
                    | {'atoms', [{integer(), atom()}]}.
 
--type info_pair() :: {'file', file:filename()}
-                   | {'binary', binary()}
-                   | {'module', module()}
-                   | {'chunks', [{chunkid(), integer(), integer()}]}.
-
 %% Error reasons
 -type info_rsn()  :: {'chunk_too_big', file:filename(),
-		      chunkid(), integer(), integer()}
-                   | {'invalid_beam_file', file:filename(), integer()}
+		      chunkid(), ChunkSize :: non_neg_integer(),
+                      FileSize :: non_neg_integer()}
+                   | {'invalid_beam_file', file:filename(),
+                      Position :: non_neg_integer()}
                    | {'invalid_chunk', file:filename(), chunkid()}
                    | {'missing_chunk', file:filename(), chunkid()}
                    | {'not_a_beam_file', file:filename()}
@@ -118,20 +111,34 @@
 %%  Exported functions
 %%
 
--spec info(beam()) -> [info_pair()] | {'error', 'beam_lib', info_rsn()}.
+-spec info(Beam) -> [InfoPair] | {'error', 'beam_lib', info_rsn()} when
+      Beam :: beam(),
+      InfoPair :: {'file', Filename :: file:filename()}
+                | {'binary', Binary :: binary()}
+                | {'module', Module :: module()}
+                | {'chunks', [{ChunkId :: chunkid(),
+                               Pos :: non_neg_integer(),
+                               Size :: non_neg_integer()}]}.
 
 info(File) ->
     read_info(beam_filename(File)).
 
--spec chunks(beam(), [chunkref()]) ->
-        {'ok', {module(), [chunkdata()]}} | {'error', 'beam_lib', chnk_rsn()}.
+-spec chunks(Beam, ChunkRefs) ->
+                    {'ok', {module(), [chunkdata()]}} |
+                    {'error', 'beam_lib', chnk_rsn()} when
+      Beam :: beam(),
+      ChunkRefs :: [chunkref()].
 
 chunks(File, Chunks) ->
     read_chunk_data(File, Chunks).
 
--spec chunks(beam(), [chunkref()], ['allow_missing_chunks']) ->
-        {'ok', {module(), [{chunkref(), chunkdata() | 'missing_chunk'}]}}
-      | {'error', 'beam_lib', chnk_rsn()}.
+-spec chunks(Beam, ChunkRefs, Options) ->
+                    {'ok', {module(), [ChunkResult]}} |
+                    {'error', 'beam_lib', chnk_rsn()} when
+      Beam :: beam(),
+      ChunkRefs :: [chunkref()],
+      Options :: ['allow_missing_chunks'],
+      ChunkResult :: chunkdata() | {ChunkRef :: chunkref(), 'missing_chunk'}.
 
 chunks(File, Chunks, Options) ->
     try read_chunk_data(File, Chunks, Options)
@@ -142,49 +149,65 @@ chunks(File, Chunks, Options) ->
 all_chunks(File) ->
     read_all_chunks(File).
 
--spec cmp(beam(), beam()) -> 'ok' | {'error', 'beam_lib', cmp_rsn()}.
+-spec cmp(Beam1, Beam2) -> 'ok' | {'error', 'beam_lib', cmp_rsn()} when
+      Beam1 :: beam(),
+      Beam2 :: beam().
 
 cmp(File1, File2) ->
     try cmp_files(File1, File2)
     catch Error -> Error end.
 
--spec cmp_dirs(atom() | file:filename(), atom() | file:filename()) ->
-        {[file:filename()], [file:filename()],
-	 [{file:filename(), file:filename()}]}
-      | {'error', 'beam_lib', {'not_a_directory', term()} | info_rsn()}.
+-spec cmp_dirs(Dir1, Dir2) ->
+           {Only1, Only2, Different} | {'error', 'beam_lib', Reason} when
+      Dir1 :: atom() | file:filename(),
+      Dir2 :: atom() | file:filename(),
+      Only1 :: [file:filename()],
+      Only2 :: [file:filename()],
+      Different :: [{Filename1 :: file:filename(), Filename2 :: file:filename()}],
+      Reason :: {'not_a_directory', term()} | info_rsn().
 
 cmp_dirs(Dir1, Dir2) ->
     catch compare_dirs(Dir1, Dir2).
 
--spec diff_dirs(atom() | file:filename(), atom() | file:filename()) ->
-        'ok' | {'error', 'beam_lib', {'not_a_directory', term()} | info_rsn()}.
+-spec diff_dirs(Dir1, Dir2) -> 'ok' | {'error', 'beam_lib', Reason} when
+      Dir1 :: atom() | file:filename(),
+      Dir2 :: atom() | file:filename(),
+      Reason :: {'not_a_directory', term()} | info_rsn().
 
 diff_dirs(Dir1, Dir2) ->
     catch diff_directories(Dir1, Dir2).
 
--spec strip(beam()) ->
-        {'ok', {module(), beam()}} | {'error', 'beam_lib', info_rsn()}.
+-spec strip(Beam1) ->
+        {'ok', {module(), Beam2}} | {'error', 'beam_lib', info_rsn()} when
+      Beam1 :: beam(),
+      Beam2 :: beam().
 
 strip(FileName) ->
     try strip_file(FileName)
     catch Error -> Error end.
     
--spec strip_files([beam()]) ->
-        {'ok', [{module(), beam()}]} | {'error', 'beam_lib', info_rsn()}.
+-spec strip_files(Files) ->
+        {'ok', [{module(), Beam}]} | {'error', 'beam_lib', info_rsn()} when
+      Files :: [beam()],
+      Beam :: beam().
 
 strip_files(Files) when is_list(Files) ->
     try strip_fils(Files)
     catch Error -> Error end.
 
--spec strip_release(atom() | file:filename()) ->
+-spec strip_release(Dir) ->
         {'ok', [{module(), file:filename()}]}
-      | {'error', 'beam_lib', {'not_a_directory', term()} | info_rsn()}.
+      | {'error', 'beam_lib', Reason} when
+      Dir :: atom() | file:filename(),
+      Reason :: {'not_a_directory', term()} | info_rsn().
 
 strip_release(Root) ->
     catch strip_rel(Root).
 
--spec version(beam()) ->
-        {'ok', {module(), [term()]}} | {'error', 'beam_lib', chnk_rsn()}.
+-spec version(Beam) ->
+                     {'ok', {module(), [Version :: term()]}} |
+                     {'error', 'beam_lib', chnk_rsn()} when
+      Beam :: beam().
 
 version(File) ->
     case catch read_chunk_data(File, [attributes]) of
@@ -195,8 +218,10 @@ version(File) ->
 	    Error
     end.
 
--spec md5(beam()) ->
-        {'ok', {module(), binary()}} | {'error', 'beam_lib', chnk_rsn()}.
+-spec md5(Beam) ->
+        {'ok', {module(), MD5}} | {'error', 'beam_lib', chnk_rsn()} when
+      Beam :: beam(),
+      MD5 :: binary().
 
 md5(File) ->
     case catch read_significant_chunks(File) of
@@ -207,7 +232,8 @@ md5(File) ->
 	    Error
     end.
 
--spec format_error(term()) -> [char() | string()].
+-spec format_error(Reason) -> io_lib:chars() when
+      Reason :: term().
 
 format_error({error, Error}) ->
     format_error(Error);
@@ -260,12 +286,15 @@ format_error(E) ->
                         | {'debug_info', mode(), module(), file:filename()}.
 -type crypto_fun()     :: fun((crypto_fun_arg()) -> term()).
 
--spec crypto_key_fun(crypto_fun()) -> 'ok' | {'error', term()}.
+-spec crypto_key_fun(CryptoKeyFun) -> 'ok' | {'error', Reason} when
+      CryptoKeyFun :: crypto_fun(),
+      Reason :: badfun | exists | term().
 
 crypto_key_fun(F) ->
     call_crypto_server({crypto_key_fun, F}).
 
--spec clear_crypto_key_fun() -> 'undefined' | {'ok', term()}.
+-spec clear_crypto_key_fun() -> 'undefined' | {'ok', Result} when
+      Result :: 'undefined' | term().
 
 clear_crypto_key_fun() ->
     call_crypto_server(clear_crypto_key_fun).
diff --git a/lib/stdlib/src/binary.erl b/lib/stdlib/src/binary.erl
index f6489788b2..cb1e12ae46 100644
--- a/lib/stdlib/src/binary.erl
+++ b/lib/stdlib/src/binary.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2011. 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
@@ -38,11 +38,28 @@
 %% Implemented in this module:
 -export([split/2,split/3,replace/3,replace/4]).
 
+-opaque cp() :: tuple().
+-type part() :: {Start :: non_neg_integer(), Length :: integer()}.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% split
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-spec split(Subject, Pattern) -> Parts when
+      Subject :: binary(),
+      Pattern :: binary() | [binary()] | cp(),
+      Parts :: [binary()].
+
 split(H,N) ->
     split(H,N,[]).
+
+-spec split(Subject, Pattern, Options) -> Parts when
+      Subject :: binary(),
+      Pattern :: binary() | [binary()] | cp(),
+      Options :: [Option],
+      Option :: {scope, part()} | trim | global,
+      Parts :: [binary()].
+
 split(Haystack,Needles,Options) ->
     try
 	{Part,Global,Trim} = get_opts_split(Options,{no,false,false}),
@@ -89,8 +106,26 @@ do_split(H,[{A,B}|T],N,Trim) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% replace
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-spec replace(Subject, Pattern, Replacement) -> Result when
+      Subject :: binary(),
+      Pattern :: binary() | [ binary() ] | cp(),
+      Replacement :: binary(),
+      Result :: binary().
+
 replace(H,N,R) ->
     replace(H,N,R,[]).
+
+-spec replace(Subject, Pattern, Replacement, Options) -> Result when
+      Subject :: binary(),
+      Pattern :: binary() | [ binary() ] | cp(),
+      Replacement :: binary(),
+      Options :: [Option],
+      Option :: global | {scope, part()} | {insert_replaced, InsPos},
+      InsPos :: OnePos | [ OnePos ],
+      OnePos :: non_neg_integer(),
+      Result :: binary().
+
 replace(Haystack,Needles,Replacement,Options) ->
     try
 	true = is_binary(Replacement), % Make badarg instead of function clause
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index 235ea939a8..febfdd6285 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -71,11 +71,16 @@ help() ->
 %% c(FileName)
 %%  Compile a file/module.
 
--spec c(file:name()) -> {'ok', module()} | 'error'.
+-spec c(File) -> {'ok', Module} | 'error' when
+      File :: file:name(),
+      Module :: module().
 
 c(File) -> c(File, []).
 
--spec c(file:name(), [compile:option()]) -> {'ok', module()} | 'error'.
+-spec c(File, Options) -> {'ok', Module} | 'error' when
+      File :: file:name(),
+      Options :: [compile:option()],
+      Module :: module().
 
 c(File, Opts0) when is_list(Opts0) ->
     Opts = [report_errors,report_warnings|Opts0],
@@ -140,7 +145,8 @@ check_load(_, Mod) -> {ok, Mod}.
 %% with constant c2 defined, c1=v1 (v1 must be a term!), include dir
 %% IDir, outdir ODir.
 
--spec lc([erl_compile:cmd_line_arg()]) -> 'ok' | 'error'.
+-spec lc(Files) -> 'ok' | 'error' when
+      Files :: [File :: erl_compile:cmd_line_arg()].
 
 lc(Args) ->
     case catch split(Args, [], []) of
@@ -205,12 +211,17 @@ make_term(Str) ->
 	    throw(error)
     end.
 
--spec nc(file:name()) -> {'ok', module()} | 'error'.
+-spec nc(File) -> {'ok', Module} | 'error' when
+      File :: file:name(),
+      Module :: module().
 
 nc(File) -> nc(File, []).
 
--spec nc(file:name(), [compile:option()] | compile:option()) ->
-        {'ok', module} | 'error'.
+-spec nc(File, Options) -> {'ok', Module} | 'error' when
+      File :: file:name(),
+      Options :: [Option] | Option,
+      Option:: compile:option(),
+      Module :: module().
 
 nc(File, Opts0) when is_list(Opts0) ->
     Opts = Opts0 ++ [report_errors, report_warnings],
@@ -234,14 +245,17 @@ nc(File, Opt) when is_atom(Opt) ->
 
 %% l(Mod)
 %%  Reload module Mod from file of same name
--spec l(module()) -> code:load_ret().
+-spec l(Module) -> code:load_ret() when
+      Module :: module().
 
 l(Mod) ->
     code:purge(Mod),
     code:load_file(Mod).
 
 %% Network version of l/1
-%%-spec nl(module()) ->
+-spec nl(Module) -> abcast | error when
+      Module :: module().
+
 nl(Mod) ->
     case code:get_object_code(Mod) of
 	{_Module, Bin, Fname} ->
@@ -396,15 +410,20 @@ fetch(Key, Info) ->
 	false -> 0
     end.
 
--spec pid(non_neg_integer(), non_neg_integer(), non_neg_integer()) -> pid().
+-spec pid(X, Y, Z) -> pid() when
+      X :: non_neg_integer(),
+      Y :: non_neg_integer(),
+      Z :: non_neg_integer().
 
 pid(X, Y, Z) ->
     list_to_pid("<" ++ integer_to_list(X) ++ "." ++
 		integer_to_list(Y) ++ "." ++
 		integer_to_list(Z) ++ ">").
 
--spec i(non_neg_integer(), non_neg_integer(), non_neg_integer()) ->
-        [{atom(), term()}].
+-spec i(X, Y, Z) -> [{atom(), term()}] when
+      X :: non_neg_integer(),
+      Y :: non_neg_integer(),
+      Z :: non_neg_integer().
 
 i(X, Y, Z) -> pinfo(pid(X, Y, Z)).
 
@@ -413,7 +432,8 @@ i(X, Y, Z) -> pinfo(pid(X, Y, Z)).
 q() ->
     init:stop().
 
--spec bt(pid()) -> 'ok' | 'undefined'.
+-spec bt(Pid) -> 'ok' | 'undefined' when
+      Pid :: pid().
 
 bt(Pid) ->
     case catch erlang:process_display(Pid, backtrace) of
@@ -476,7 +496,8 @@ bi(I) ->
 %%
 %% Short and nice form of module info
 %%
--spec m(module()) -> 'ok'.
+-spec m(Module) -> 'ok' when
+      Module :: module().
 
 m(M) ->
     L = M:module_info(),
@@ -664,7 +685,8 @@ pwd() ->
 	    ok = io:format("Cannot determine current directory\n")
     end.
 
--spec cd(file:name()) -> 'ok'.
+-spec cd(Dir) -> 'ok' when
+      Dir :: file:name().
 
 cd(Dir) ->
     file:set_cwd(Dir),
@@ -679,7 +701,8 @@ cd(Dir) ->
 ls() ->
     ls(".").
 
--spec ls(file:name()) -> 'ok'.
+-spec ls(Dir) -> 'ok' when
+      Dir :: file:name().
 
 ls(Dir) ->
     case file:list_dir(Dir) of
@@ -729,12 +752,19 @@ w(X) ->
 %% memory/[0,1]
 %%
 
--spec memory() -> [{atom(), non_neg_integer()}].
+-spec memory() -> [{Type, Size}] when
+      Type :: atom(),
+      Size :: non_neg_integer().
 
 memory() -> erlang:memory().
 
--spec memory(atom()) -> non_neg_integer()
-          ; ([atom()]) -> [{atom(), non_neg_integer()}].
+-spec memory(Type) -> Size when
+               Type :: atom(),
+               Size :: non_neg_integer()
+          ; (Types) -> [{Type, Size}] when
+               Types :: [Type],
+               Type :: atom(),
+               Size :: non_neg_integer().
 
 memory(TypeSpec) -> erlang:memory(TypeSpec).
 
diff --git a/lib/stdlib/src/calendar.erl b/lib/stdlib/src/calendar.erl
index 33725d999c..8d1071209e 100644
--- a/lib/stdlib/src/calendar.erl
+++ b/lib/stdlib/src/calendar.erl
@@ -63,6 +63,8 @@
 %% Types
 %%----------------------------------------------------------------------
 
+-export_type([t_now/0]).
+
 -type year()     :: non_neg_integer().
 -type year1970() :: 1970..10000.	% should probably be 1970..
 -type month()    :: 1..12.
@@ -74,7 +76,9 @@
 -type ldom()     :: 28 | 29 | 30 | 31. % last day of month
 -type weeknum()  :: 1..53.
 
--type t_now()    :: {non_neg_integer(),non_neg_integer(),non_neg_integer()}.
+-type t_now()    :: {MegaSecs :: non_neg_integer(),
+                     Secs :: non_neg_integer(),
+                     MicroSecs :: non_neg_integer()}.
 
 -type t_date()         :: {year(),month(),day()}.
 -type t_time()         :: {hour(),minute(),second()}.
@@ -106,7 +110,11 @@
 %% January 1st.
 %%
 %% df/2 catches the case Year<0
--spec date_to_gregorian_days(year(),month(),day()) -> non_neg_integer().
+-spec date_to_gregorian_days(Year, Month, Day) -> Days when
+      Year :: year(),
+      Month :: month(),
+      Day :: day(),
+      Days :: non_neg_integer().
 date_to_gregorian_days(Year, Month, Day) when is_integer(Day), Day > 0 ->
     Last = last_day_of_the_month(Year, Month),
     if
@@ -114,7 +122,9 @@ date_to_gregorian_days(Year, Month, Day) when is_integer(Day), Day > 0 ->
 	    dy(Year) + dm(Month) + df(Year, Month) + Day - 1
     end.
 
--spec date_to_gregorian_days(t_date()) -> non_neg_integer().
+-spec date_to_gregorian_days(Date) -> Days when
+      Date :: t_date(),
+      Days :: non_neg_integer().
 date_to_gregorian_days({Year, Month, Day}) ->
     date_to_gregorian_days(Year, Month, Day).
 
@@ -124,7 +134,9 @@ date_to_gregorian_days({Year, Month, Day}) ->
 %% Computes the total number of seconds starting from year 0,
 %% January 1st.
 %%
--spec datetime_to_gregorian_seconds(t_datetime()) -> non_neg_integer().
+-spec datetime_to_gregorian_seconds(DateTime) -> Seconds when
+      DateTime :: t_datetime(),
+      Seconds :: non_neg_integer().
 datetime_to_gregorian_seconds({Date, Time}) ->
     ?SECONDS_PER_DAY*date_to_gregorian_days(Date) +
 	time_to_seconds(Time).
@@ -135,18 +147,23 @@ datetime_to_gregorian_seconds({Date, Time}) ->
 %%
 %% Returns: 1 | .. | 7. Monday = 1, Tuesday = 2, ..., Sunday = 7.
 %%
--spec day_of_the_week(year(), month(), day()) -> daynum().
+-spec day_of_the_week(Year, Month, Day) -> daynum() when
+      Year :: year(),
+      Month :: month(),
+      Day :: day().
 day_of_the_week(Year, Month, Day) ->
     (date_to_gregorian_days(Year, Month, Day) + 5) rem 7 + 1.
 
--spec day_of_the_week(t_date()) -> daynum().
+-spec day_of_the_week(Date) -> daynum() when
+      Date:: t_date().
 day_of_the_week({Year, Month, Day}) ->
     day_of_the_week(Year, Month, Day).
 
 
 %% gregorian_days_to_date(Days) = {Year, Month, Day}
 %%
--spec gregorian_days_to_date(non_neg_integer()) -> t_date().
+-spec gregorian_days_to_date(Days) -> t_date() when
+      Days :: non_neg_integer().
 gregorian_days_to_date(Days) ->
     {Year, DayOfYear} = day_to_year(Days),
     {Month, DayOfMonth} = year_day_to_date(Year, DayOfYear),
@@ -155,7 +172,8 @@ gregorian_days_to_date(Days) ->
 
 %% gregorian_seconds_to_datetime(Secs)
 %%
--spec gregorian_seconds_to_datetime(non_neg_integer()) -> t_datetime().
+-spec gregorian_seconds_to_datetime(Seconds) -> t_datetime() when
+      Seconds :: non_neg_integer().
 gregorian_seconds_to_datetime(Secs) when Secs >= 0 ->
     Days = Secs div ?SECONDS_PER_DAY,
     Rest = Secs rem ?SECONDS_PER_DAY,
@@ -164,7 +182,8 @@ gregorian_seconds_to_datetime(Secs) when Secs >= 0 ->
 
 %% is_leap_year(Year) = true | false
 %%
--spec is_leap_year(year()) -> boolean().
+-spec is_leap_year(Year) -> boolean() when
+      Year :: year().
 is_leap_year(Y) when is_integer(Y), Y >= 0 ->
     is_leap_year1(Y).
 
@@ -188,7 +207,8 @@ iso_week_number() ->
 %%
 %% Calculates the iso week number for the given date.
 %%
--spec iso_week_number(t_date()) -> t_yearweeknum().
+-spec iso_week_number(Date) -> t_yearweeknum() when
+      Date :: t_date().
 iso_week_number({Year, Month, Day}) ->
     D = date_to_gregorian_days({Year, Month, Day}),
     W01_1_Year = gregorian_days_of_iso_w01_1(Year),
@@ -216,7 +236,10 @@ iso_week_number({Year, Month, Day}) ->
 %%
 %% Returns the number of days in a month.
 %%
--spec last_day_of_the_month(year(), month()) -> ldom().
+-spec last_day_of_the_month(Year, Month) -> LastDay when
+      Year :: year(),
+      Month :: month(),
+      LastDay :: ldom().
 last_day_of_the_month(Y, M) when is_integer(Y), Y >= 0 ->
     last_day_of_the_month1(Y, M).
 
@@ -244,7 +267,9 @@ local_time() ->
 
 %% local_time_to_universal_time(DateTime)
 %%
--spec local_time_to_universal_time(t_datetime1970()) -> t_datetime1970().
+-spec local_time_to_universal_time(DateTime1) -> DateTime2 when
+      DateTime1 :: t_datetime1970(),
+      DateTime2 :: t_datetime1970().
 local_time_to_universal_time(DateTime) ->
     erlang:localtime_to_universaltime(DateTime).
 
@@ -254,7 +279,9 @@ local_time_to_universal_time(DateTime) ->
 local_time_to_universal_time(DateTime, IsDst) ->
     erlang:localtime_to_universaltime(DateTime, IsDst).
 
--spec local_time_to_universal_time_dst(t_datetime1970()) -> [t_datetime1970()].
+-spec local_time_to_universal_time_dst(DateTime1) -> [DateTime] when
+      DateTime1 :: t_datetime1970(),
+      DateTime :: t_datetime1970().
 local_time_to_universal_time_dst(DateTime) ->
     UtDst = erlang:localtime_to_universaltime(DateTime, true),
     Ut    = erlang:localtime_to_universaltime(DateTime, false),
@@ -282,12 +309,14 @@ local_time_to_universal_time_dst(DateTime) ->
 %% = MilliSec = integer() 
 %% Returns: {date(), time()}, date() = {Y, M, D}, time() = {H, M, S}.
 %% 
--spec now_to_datetime(t_now()) -> t_datetime1970().
+-spec now_to_datetime(Now) -> t_datetime1970() when
+      Now :: t_now().
 now_to_datetime({MSec, Sec, _uSec}) ->
     Sec0 = MSec*1000000 + Sec + ?DAYS_FROM_0_TO_1970*?SECONDS_PER_DAY,
     gregorian_seconds_to_datetime(Sec0).
 
--spec now_to_universal_time(t_now()) -> t_datetime1970().
+-spec now_to_universal_time(Now) -> t_datetime1970() when
+      Now :: t_now().
 now_to_universal_time(Now) ->
     now_to_datetime(Now).
 
@@ -296,7 +325,8 @@ now_to_universal_time(Now) ->
 %%
 %% Args: Now = now()
 %%
--spec now_to_local_time(t_now()) -> t_datetime1970().
+-spec now_to_local_time(Now) -> t_datetime1970() when
+      Now :: t_now().
 now_to_local_time({MSec, Sec, _uSec}) ->
     erlang:universaltime_to_localtime(
       now_to_universal_time({MSec, Sec, _uSec})).
@@ -305,7 +335,10 @@ now_to_local_time({MSec, Sec, _uSec}) ->
 
 %% seconds_to_daystime(Secs) = {Days, {Hour, Minute, Second}}
 %%
--spec seconds_to_daystime(integer()) -> {integer(), t_time()}.
+-spec seconds_to_daystime(Seconds) -> {Days, Time} when
+      Seconds :: integer(),
+      Days :: integer(),
+      Time :: t_time().
 seconds_to_daystime(Secs) ->
     Days0 = Secs div ?SECONDS_PER_DAY,
     Secs0 = Secs rem ?SECONDS_PER_DAY,
@@ -323,7 +356,8 @@ seconds_to_daystime(Secs) ->
 %% Wraps.
 %%
 -type secs_per_day() :: 0..?SECONDS_PER_DAY.
--spec seconds_to_time(secs_per_day()) -> t_time().
+-spec seconds_to_time(Seconds) -> t_time() when
+      Seconds :: secs_per_day().
 seconds_to_time(Secs) when Secs >= 0, Secs < ?SECONDS_PER_DAY ->
     Secs0 = Secs rem ?SECONDS_PER_DAY,
     Hour = Secs0 div ?SECONDS_PER_HOUR,
@@ -340,8 +374,11 @@ seconds_to_time(Secs) when Secs >= 0, Secs < ?SECONDS_PER_DAY ->
 %% Date = {Year, Month, Day}, Time = {Hour, Minute, Sec},
 %% Year = Month = Day = Hour = Minute = Sec = integer()
 %%
--type timediff() :: {integer(), t_time()}.
--spec time_difference(t_datetime(), t_datetime()) -> timediff().
+-spec time_difference(T1, T2) -> {Days, Time} when
+      T1 :: t_datetime(),
+      T2 :: t_datetime(),
+      Days :: integer(),
+      Time :: t_time().
 time_difference({{Y1, Mo1, D1}, {H1, Mi1, S1}}, 
 		{{Y2, Mo2, D2}, {H2, Mi2, S2}}) ->
     Secs = datetime_to_gregorian_seconds({{Y2, Mo2, D2}, {H2, Mi2, S2}}) -
@@ -352,7 +389,8 @@ time_difference({{Y1, Mo1, D1}, {H1, Mi1, S1}},
 %%
 %% time_to_seconds(Time)
 %%
--spec time_to_seconds(t_time()) -> secs_per_day().
+-spec time_to_seconds(Time) -> secs_per_day() when
+      Time :: t_time().
 time_to_seconds({H, M, S}) when is_integer(H), is_integer(M), is_integer(S) ->
     H * ?SECONDS_PER_HOUR +
 	M * ?SECONDS_PER_MINUTE + S.
@@ -368,7 +406,8 @@ universal_time() ->
 
 %% universal_time_to_local_time(DateTime)
 %%
--spec universal_time_to_local_time(t_datetime()) -> t_datetime().
+-spec universal_time_to_local_time(DateTime) -> t_datetime() when
+      DateTime :: t_datetime1970().
 universal_time_to_local_time(DateTime) ->
     erlang:universaltime_to_localtime(DateTime).
 
@@ -376,7 +415,10 @@ universal_time_to_local_time(DateTime) ->
 %% valid_date(Year, Month, Day) = true | false
 %% valid_date({Year, Month, Day}) = true | false
 %%
--spec valid_date(integer(), integer(), integer()) -> boolean().
+-spec valid_date(Year, Month, Day) -> boolean() when
+      Year :: integer(),
+      Month :: integer(),
+      Day :: integer().
 valid_date(Y, M, D) when is_integer(Y), is_integer(M), is_integer(D) ->
     valid_date1(Y, M, D).
 
@@ -386,7 +428,8 @@ valid_date1(Y, M, D) when Y >= 0, M > 0, M < 13, D > 0 ->
 valid_date1(_, _, _) ->
     false.
 
--spec valid_date({integer(),integer(),integer()}) -> boolean().
+-spec valid_date(Date) -> boolean() when
+      Date :: t_date().
 valid_date({Y, M, D}) ->
     valid_date(Y, M, D).
 
diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index 6c91f1efb7..671b5a9dd4 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -97,10 +97,6 @@
 
 -include("dets.hrl").
 
--type object()   :: tuple().
--type pattern()  :: atom() | tuple().
--type tab_name() :: atom() | reference().
-
 %%% This is the implementation of the mnesia file storage. Each (non
 %%% ram-copy) table is maintained in a corresponding .DAT file. The
 %%% dat file is organized as a segmented linear hashlist. The head of
@@ -179,6 +175,21 @@
 %%-define(PROFILE(C), C).
 -define(PROFILE(C), void).
 
+-type access()    :: 'read' | 'read_write'.
+-type auto_save() :: 'infinity' | non_neg_integer().
+-opaque bindings_cont() :: #dets_cont{}.
+-opaque cont()    :: #dets_cont{}.
+-type keypos()    :: pos_integer().
+-type match_spec()  :: ets:match_spec().
+-type object()    :: tuple().
+-type no_slots()  :: non_neg_integer() | 'default'.
+-opaque object_cont() :: #dets_cont{}.
+-type pattern()   :: atom() | tuple().
+-opaque select_cont() :: #dets_cont{}.
+-type tab_name() :: term().
+-type type()      :: 'bag' | 'duplicate_bag' | 'set'.
+-type version()   :: 8 | 9 | 'default'.
+
 %%% Some further debug code was added in R12B-1 (stdlib-1.15.1):
 %%% - there is a new open_file() option 'debug';
 %%% - there is a new OS environment variable 'DETS_DEBUG';
@@ -203,9 +214,13 @@ add_user(Pid, Tab, Args) ->
 all() ->
     dets_server:all().
 
--type cont() :: #dets_cont{}.
--spec bchunk(tab_name(), 'start' | cont()) ->
-    {cont(), binary() | tuple()} | '$end_of_table' | {'error', term()}.
+-spec bchunk(Name, Continuation) ->
+    {Continuation2, Data} | '$end_of_table' | {'error', Reason} when
+      Name :: tab_name(),
+      Continuation :: 'start' | cont(),
+      Continuation2 :: cont(),
+      Data :: binary() | tuple(),
+      Reason :: term().
 
 bchunk(Tab, start) ->
     badarg(treq(Tab, {bchunk_init, Tab}), [Tab, start]);
@@ -214,7 +229,9 @@ bchunk(Tab, #dets_cont{what = bchunk, tab = Tab} = State) ->
 bchunk(Tab, Term) ->
     erlang:error(badarg, [Tab, Term]).
 
--spec close(tab_name()) -> 'ok' | {'error', term()}.
+-spec close(Name) -> 'ok' | {'error', Reason} when
+      Name :: tab_name(),
+      Reason :: term().
 
 close(Tab) ->  
     case dets_server:close(Tab) of
@@ -224,12 +241,17 @@ close(Tab) ->
             Reply
     end.
 
--spec delete(tab_name(), term()) -> 'ok' | {'error', term()}.
+-spec delete(Name, Key) -> 'ok' | {'error', Reason} when
+      Name :: tab_name(),
+      Key :: term(),
+      Reason :: term().
 
 delete(Tab, Key) ->
     badarg(treq(Tab, {delete_key, [Key]}), [Tab, Key]).
 
--spec delete_all_objects(tab_name()) -> 'ok' | {'error', term()}.
+-spec delete_all_objects(Name) -> 'ok' | {'error', Reason} when
+      Name :: tab_name(),
+      Reason :: term().
 
 delete_all_objects(Tab) ->
     case treq(Tab, delete_all_objects) of
@@ -241,7 +263,10 @@ delete_all_objects(Tab) ->
 	    Reply
     end.
 
--spec delete_object(tab_name(), object()) -> 'ok' | {'error', term()}.
+-spec delete_object(Name, Object) -> 'ok' | {'error', Reason} when
+      Name :: tab_name(),
+      Object :: object(),
+      Reason :: term().
 
 delete_object(Tab, O) ->
     badarg(treq(Tab, {delete_object, [O]}), [Tab, O]).
@@ -264,23 +289,42 @@ fsck(Fname, Version) ->
       end
     end.
 
--spec first(tab_name()) -> term() | '$end_of_table'.
+-spec first(Name) -> Key | '$end_of_table' when
+      Name :: tab_name(),
+      Key :: term().
 
 first(Tab) ->
     badarg_exit(treq(Tab, first), [Tab]).
 
--spec foldr(fun((object(), Acc) -> Acc), Acc, tab_name()) -> Acc | {'error', term()}.
+-spec foldr(Function, Acc0, Name) -> Acc | {'error', Reason} when
+      Name :: tab_name(),
+      Function :: fun((Object :: object(), AccIn) -> AccOut),
+      Acc0 :: term(),
+      Acc :: term(),
+      AccIn :: term(),
+      AccOut :: term(),
+      Reason :: term().
 
 foldr(Fun, Acc, Tab) ->
     foldl(Fun, Acc, Tab).
 
--spec foldl(fun((object(), Acc) -> Acc), Acc, tab_name()) -> Acc | {'error', term()}.
+-spec foldl(Function, Acc0, Name) -> Acc | {'error', Reason} when
+      Name :: tab_name(),
+      Function :: fun((Object :: object(), AccIn) -> AccOut),
+      Acc0 :: term(),
+      Acc :: term(),
+      AccIn :: term(),
+      AccOut :: term(),
+      Reason :: term().
 
 foldl(Fun, Acc, Tab) ->
     Ref = make_ref(),
     do_traverse(Fun, Acc, Tab, Ref).
 
--spec from_ets(tab_name(), ets:tab()) -> 'ok' | {'error', term()}.
+-spec from_ets(Name, EtsTab) -> 'ok' | {'error', Reason} when
+      Name :: tab_name(),
+      EtsTab :: ets:tab(),
+      Reason :: term().
 
 from_ets(DTab, ETab) ->
     ets:safe_fixtable(ETab, true),
@@ -304,6 +348,15 @@ from_ets_fun(LC, ETab) ->
             {L, from_ets_fun(ets:select(C), ETab)}
     end.
 
+-spec info(Name) -> InfoList | 'undefined' when
+      Name :: tab_name(),
+      InfoList :: [InfoTuple],
+      InfoTuple :: {'file_size', non_neg_integer()}
+                 | {'filename', file:name()}
+                 | {'keypos', keypos()}
+                 | {'size', non_neg_integer()}
+                 | {'type', type()}.
+
 info(Tab) ->
     case catch dets_server:get_pid(Tab) of
 	{'EXIT', _Reason} ->
@@ -312,6 +365,14 @@ info(Tab) ->
 	    undefined(req(Pid, info))
     end.
 
+-spec info(Name, Item) -> Value | 'undefined' when
+      Name :: tab_name(),
+      Item :: 'access' | 'auto_save' | 'bchunk_format'
+            | 'hash' | 'file_size' | 'filename' | 'keypos' | 'memory'
+            | 'no_keys' | 'no_objects' | 'no_slots' | 'owner' | 'ram_file'
+            | 'safe_fixed' | 'size' | 'type' | 'version',
+      Value :: term().
+
 info(Tab, owner) ->
     case catch dets_server:get_pid(Tab) of
 	Pid when is_pid(Pid) ->
@@ -334,9 +395,26 @@ info(Tab, Tag) ->
 	    undefined(req(Pid, {info, Tag}))
     end.
 
+-spec init_table(Name, InitFun) -> ok | {'error', Reason} when
+      Name :: tab_name(),
+      InitFun :: fun((Arg) -> Res),
+      Arg :: read | close,
+      Res :: end_of_input | {[object()], InitFun} | {Data, InitFun} | term(),
+      Reason :: term(),
+      Data :: binary() | tuple().
+
 init_table(Tab, InitFun) ->
     init_table(Tab, InitFun, []).
 
+-spec init_table(Name, InitFun, Options) -> ok | {'error', Reason} when
+      Name :: tab_name(),
+      InitFun :: fun((Arg) -> Res),
+      Arg :: read | close,
+      Res :: end_of_input | {[object()], InitFun} | {Data, InitFun} | term(),
+      Options :: [{min_no_slots,no_slots()} | {format,term | bchunk}],
+      Reason :: term(),
+      Data :: binary() | tuple().
+
 init_table(Tab, InitFun, Options) when is_function(InitFun) ->
     case options(Options, [format, min_no_slots]) of
 	{badarg,_} -> 
@@ -350,11 +428,20 @@ init_table(Tab, InitFun, Options) when is_function(InitFun) ->
 init_table(Tab, InitFun, Options) ->
     erlang:error(badarg, [Tab, InitFun, Options]).
 
+-spec insert(Name, Objects) -> 'ok' | {'error', Reason} when
+      Name :: tab_name(),
+      Objects :: object() | [object()],
+      Reason :: term().
+
 insert(Tab, Objs) when is_list(Objs) ->
     badarg(treq(Tab, {insert, Objs}), [Tab, Objs]);
 insert(Tab, Obj) ->
     badarg(treq(Tab, {insert, [Obj]}), [Tab, Obj]).
 
+-spec insert_new(Name, Objects) -> boolean() when
+      Name :: tab_name(),
+      Objects :: object() | [object()].
+
 insert_new(Tab, Objs) when is_list(Objs) ->
     badarg(treq(Tab, {insert_new, Objs}), [Tab, Objs]);
 insert_new(Tab, Obj) ->
@@ -366,9 +453,17 @@ internal_close(Pid) ->
 internal_open(Pid, Ref, Args) ->
     req(Pid, {internal_open, Ref, Args}).
 
+-spec is_compatible_bchunk_format(Name, BchunkFormat) -> boolean() when
+      Name :: tab_name(),
+      BchunkFormat :: binary().
+
 is_compatible_bchunk_format(Tab, Term) ->
     badarg(treq(Tab, {is_compatible_bchunk_format, Term}), [Tab, Term]).
 
+-spec is_dets_file(Filename) -> boolean() | {'error', Reason} when
+      Filename :: file:name(),
+      Reason :: term().
+
 is_dets_file(FileName) ->
     case catch read_file_header(FileName, read, false) of
 	{ok, Fd, FH} ->
@@ -382,6 +477,12 @@ is_dets_file(FileName) ->
 	    Other
     end.
 
+-spec lookup(Name, Key) -> Objects | {'error', Reason} when
+      Name :: tab_name(),
+      Key :: term(),
+      Objects :: [object()],
+      Reason :: term().
+
 lookup(Tab, Key) ->
     badarg(treq(Tab, {lookup_keys, [Key]}), [Tab, Key]).
 
@@ -394,19 +495,43 @@ lookup_keys(Tab, Keys) ->
 	    erlang:error(badarg, [Tab, Keys])
     end.
 
+-spec match(Name, Pattern) -> [Match] | {'error', Reason} when
+      Name :: tab_name(),
+      Pattern :: pattern(),
+      Match :: [term()],
+      Reason :: term().
+
 match(Tab, Pat) ->
     badarg(safe_match(Tab, Pat, bindings), [Tab, Pat]).
 
+-spec match(Name, Pattern, N) ->
+          {[Match], Continuation} | '$end_of_table' | {'error', Reason} when
+      Name :: tab_name(),
+      Pattern :: pattern(),
+      N :: 'default' | non_neg_integer(),
+      Continuation :: bindings_cont(),
+      Match :: [term()],
+      Reason :: term().
+
 match(Tab, Pat, N) ->
     badarg(init_chunk_match(Tab, Pat, bindings, N), [Tab, Pat, N]).
     
+-spec match(Continuation) ->
+          {[Match], Continuation2} | '$end_of_table' | {'error', Reason} when
+      Continuation :: bindings_cont(),
+      Continuation2 :: bindings_cont(),
+      Match :: [term()],
+      Reason :: term().
+
 match(State) when State#dets_cont.what =:= bindings ->
     badarg(chunk_match(State), [State]);
 match(Term) ->
     erlang:error(badarg, [Term]).
 
--spec match_delete(tab_name(), pattern()) ->
-	non_neg_integer() | 'ok' | {'error', term()}.
+-spec match_delete(Name, Pattern) -> 'ok' | {'error', Reason} when
+      Name :: tab_name(),
+      Pattern :: pattern(),
+      Reason :: term().
 
 match_delete(Tab, Pat) ->
     badarg(match_delete(Tab, Pat, delete), [Tab, Pat]).
@@ -434,23 +559,60 @@ do_match_delete(Tab, _Proc, Error, _What, _N) ->
     safe_fixtable(Tab, false),
     Error.
 
+-spec match_object(Name, Pattern) -> Objects | {'error', Reason} when
+      Name :: tab_name(),
+      Pattern :: pattern(),
+      Objects :: [object()],
+      Reason :: term().
+
 match_object(Tab, Pat) ->
     badarg(safe_match(Tab, Pat, object), [Tab, Pat]).
 
+-spec match_object(Name, Pattern, N) ->
+           {Objects, Continuation} | '$end_of_table' | {'error', Reason} when
+      Name :: tab_name(),
+      Pattern :: pattern(),
+      N :: 'default' | non_neg_integer(),
+      Continuation :: object_cont(),
+      Objects :: [object()],
+      Reason :: term().
+
 match_object(Tab, Pat, N) ->
     badarg(init_chunk_match(Tab, Pat, object, N), [Tab, Pat, N]).
     
+-spec match_object(Continuation) ->
+           {Objects, Continuation2} | '$end_of_table' | {'error', Reason} when
+      Continuation :: object_cont(),
+      Continuation2 :: object_cont(),
+      Objects :: [object()],
+      Reason :: term().
+
 match_object(State) when State#dets_cont.what =:= object ->
     badarg(chunk_match(State), [State]);
 match_object(Term) ->
     erlang:error(badarg, [Term]).
 
+-spec member(Name, Key) -> boolean() | {'error', Reason} when
+      Name :: tab_name(),
+      Key :: term(),
+      Reason :: term().
+
 member(Tab, Key) ->
     badarg(treq(Tab, {member, Key}), [Tab, Key]).    
 
+-spec next(Name, Key1) -> Key2 | '$end_of_table' when
+      Name :: tab_name(),
+      Key1 :: term(),
+      Key2 :: term().
+
 next(Tab, Key) ->
     badarg_exit(treq(Tab, {next, Key}), [Tab, Key]).
 
+-spec open_file(Filename) -> {'ok', Reference} | {'error', Reason} when
+      Filename :: file:name(),
+      Reference :: reference(),
+      Reason :: term().
+
 %% Assuming that a file already exists, open it with the
 %% parameters as already specified in the file itself.
 %% Return a ref leading to the file.
@@ -462,6 +624,22 @@ open_file(File) ->
             einval(Reply, [File])
     end.
 
+-spec open_file(Name, Args) -> {'ok', Name} | {'error', Reason} when
+      Name :: tab_name(),
+      Args :: [OpenArg],
+      OpenArg  :: {'access', access()}
+                | {'auto_save', auto_save()}
+                | {'estimated_no_objects', non_neg_integer()}
+                | {'file', file:name()}
+                | {'max_no_slots', no_slots()}
+                | {'min_no_slots', no_slots()}
+                | {'keypos', keypos()}
+                | {'ram_file', boolean()}
+                | {'repair', boolean() | 'force'}
+                | {'type', type()}
+                | {'version', version()},
+      Reason :: term().
+
 open_file(Tab, Args) when is_list(Args) ->
     case catch defaults(Tab, Args) of
         OpenArgs when is_record(OpenArgs, open_args) ->
@@ -477,12 +655,21 @@ open_file(Tab, Args) when is_list(Args) ->
 open_file(Tab, Arg) ->
     open_file(Tab, [Arg]).
 
+-spec pid2name(Pid) -> {'ok', Name} | 'undefined' when
+      Pid :: pid(),
+      Name :: tab_name().
+
 pid2name(Pid) ->
     dets_server:pid2name(Pid).
 
 remove_user(Pid, From) ->
     req(Pid, {close, From}).
 
+-spec repair_continuation(Continuation, MatchSpec) -> Continuation2 when
+      Continuation :: select_cont(),
+      Continuation2 :: select_cont(),
+      MatchSpec :: match_spec().
+
 repair_continuation(#dets_cont{match_program = B}=Cont, MS) 
     when is_binary(B) ->
     case ets:is_compiled_ms(B) of
@@ -496,25 +683,63 @@ repair_continuation(#dets_cont{}=Cont, _MS) ->
 repair_continuation(T, MS) ->
     erlang:error(badarg, [T, MS]).
 
+-spec safe_fixtable(Name, Fix) -> 'ok' when
+      Name :: tab_name(),
+      Fix :: boolean().
+
 safe_fixtable(Tab, Bool) when Bool; not Bool ->
     badarg(treq(Tab, {safe_fixtable, Bool}), [Tab, Bool]);
 safe_fixtable(Tab, Term) ->
     erlang:error(badarg, [Tab, Term]).
 
+-spec select(Name, MatchSpec) -> Selection | {'error', Reason} when
+      Name :: tab_name(),
+      MatchSpec :: match_spec(),
+      Selection :: [term()],
+      Reason :: term().
+
 select(Tab, Pat) ->
     badarg(safe_match(Tab, Pat, select), [Tab, Pat]).
 
+-spec select(Name, MatchSpec, N) ->
+          {Selection, Continuation} | '$end_of_table' | {'error', Reason} when
+      Name :: tab_name(),
+      MatchSpec :: match_spec(),
+      N :: 'default' | non_neg_integer(),
+      Continuation :: select_cont(),
+      Selection :: [term()],
+      Reason :: term().
+
 select(Tab, Pat, N) ->
     badarg(init_chunk_match(Tab, Pat, select, N), [Tab, Pat, N]).
     
+-spec select(Continuation) ->
+          {Selection, Continuation2} | '$end_of_table' | {'error', Reason} when
+      Continuation :: select_cont(),
+      Continuation2 :: select_cont(),
+      Selection :: [term()],
+      Reason :: term().
+
 select(State) when State#dets_cont.what =:= select ->
     badarg(chunk_match(State), [State]);
 select(Term) ->
     erlang:error(badarg, [Term]).
 
+-spec select_delete(Name, MatchSpec) -> N | {'error', Reason} when
+      Name :: tab_name(),
+      MatchSpec :: match_spec(),
+      N :: non_neg_integer(),
+      Reason :: term().
+
 select_delete(Tab, Pat) ->
     badarg(match_delete(Tab, Pat, select), [Tab, Pat]).
 
+-spec slot(Name, I) -> '$end_of_table' | Objects | {'error', Reason} when
+      Name :: tab_name(),
+      I :: non_neg_integer(),
+      Objects :: [object()],
+      Reason :: term().
+
 slot(Tab, Slot) when is_integer(Slot), Slot >= 0 ->
     badarg(treq(Tab, {slot, Slot}), [Tab, Slot]);
 slot(Tab, Term) ->
@@ -529,12 +754,29 @@ stop() ->
 istart_link(Server) ->
     {ok, proc_lib:spawn_link(dets, init, [self(), Server])}.
 
+-spec sync(Name) -> 'ok' | {'error', Reason} when
+      Name :: tab_name(),
+      Reason :: term().
+
 sync(Tab) ->
     badarg(treq(Tab, sync), [Tab]).
 
+-spec table(Name) -> QueryHandle when
+      Name :: tab_name(),
+      QueryHandle :: qlc:query_handle().
+
 table(Tab) ->
     table(Tab, []).
 
+-spec table(Name, Options) -> QueryHandle when
+      Name :: tab_name(),
+      Options :: Option | [Option],
+      Option :: {'n_objects', Limit}
+              | {'traverse', TraverseMethod},
+      Limit :: 'default' | pos_integer(),
+      TraverseMethod :: 'first_next' | 'select' | {'select', match_spec()},
+      QueryHandle :: qlc:query_handle().
+
 table(Tab, Opts) ->
     case options(Opts, [traverse, n_objects]) of
         {badarg,_} ->
@@ -612,6 +854,11 @@ table_info(_Tab, _) ->
 
 %% End of table/2.
 
+-spec to_ets(Name, EtsTab) -> EtsTab | {'error', Reason} when
+      Name :: tab_name(),
+      EtsTab :: ets:tab(),
+      Reason :: term().
+
 to_ets(DTab, ETab) ->
     case ets:info(ETab, protection) of
 	undefined ->
@@ -621,6 +868,16 @@ to_ets(DTab, ETab) ->
 	    foldl(Fun, ETab, DTab)
     end.
 
+-spec traverse(Name, Fun) -> Return | {'error', Reason} when
+      Name :: tab_name(),
+      Fun :: fun((Object) -> FunReturn),
+      FunReturn :: 'continue' | {'continue', Val} | {'done', Value},
+      Val :: term(),
+      Value :: term(),
+      Object :: object(),
+      Return :: [term()],
+      Reason :: term().
+
 traverse(Tab, Fun) ->
     Ref = make_ref(),
     TFun = 
@@ -638,6 +895,14 @@ traverse(Tab, Fun) ->
 	end,
     do_traverse(TFun, [], Tab, Ref).
 
+-spec update_counter(Name, Key, Increment) -> Result when
+      Name :: tab_name(),
+      Key :: term(),
+      Increment :: {Pos, Incr} | Incr,
+      Pos :: integer(),
+      Incr :: integer(),
+      Result :: integer().
+
 update_counter(Tab, Key, C) ->
     badarg(treq(Tab, {update_counter, Key, C}), [Tab, Key, C]).
 
diff --git a/lib/stdlib/src/dict.erl b/lib/stdlib/src/dict.erl
index 7e51141098..2e9eba4bfa 100644
--- a/lib/stdlib/src/dict.erl
+++ b/lib/stdlib/src/dict.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -80,7 +80,9 @@ new() ->
     Empty = mk_seg(?seg_size),
     #dict{empty=Empty,segs={Empty}}.
 
--spec is_key(term(), dict()) -> boolean().
+-spec is_key(Key, Dict) -> boolean() when
+      Key :: term(),
+      Dict :: dict().
 
 is_key(Key, D) ->
     Slot = get_slot(D, Key),
@@ -91,21 +93,29 @@ find_key(K, [?kv(K,_Val)|_]) -> true;
 find_key(K, [_|Bkt]) -> find_key(K, Bkt);
 find_key(_, []) -> false.
 
--spec to_list(dict()) -> [{term(), term()}].
+-spec to_list(Dict) -> List when
+      Dict :: dict(),
+      List :: [{Key :: term(), Value :: term()}].
 
 to_list(D) ->
     fold(fun (Key, Val, List) -> [{Key,Val}|List] end, [], D).
 
--spec from_list([{term(), term()}]) -> dict().
+-spec from_list(List) -> Dict when
+      List :: [{Key :: term(), Value :: term()}],
+      Dict :: dict().
 
 from_list(L) ->
     lists:foldl(fun ({K,V}, D) -> store(K, V, D) end, new(), L).
 
--spec size(dict()) -> non_neg_integer().
+-spec size(Dict) -> non_neg_integer() when
+      Dict :: dict().
 
 size(#dict{size=N}) when is_integer(N), N >= 0 -> N. 
 
--spec fetch(term(), dict()) -> term().
+-spec fetch(Key, Dict) -> Value when
+      Key :: term(),
+      Dict :: dict(),
+      Value :: term().
 
 fetch(Key, D) ->
     Slot = get_slot(D, Key),
@@ -119,7 +129,10 @@ fetch_val(K, [?kv(K,Val)|_]) -> Val;
 fetch_val(K, [_|Bkt]) -> fetch_val(K, Bkt);
 fetch_val(_, []) -> throw(badarg).
 
--spec find(term(), dict()) -> {'ok', term()} | 'error'.
+-spec find(Key, Dict) -> {'ok', Value} | 'error' when
+      Key :: term(),
+      Dict :: dict(),
+      Value :: term().
 
 find(Key, D) ->
     Slot = get_slot(D, Key),
@@ -130,12 +143,17 @@ find_val(K, [?kv(K,Val)|_]) -> {ok,Val};
 find_val(K, [_|Bkt]) -> find_val(K, Bkt);
 find_val(_, []) -> error.
 
--spec fetch_keys(dict()) -> [term()].
+-spec fetch_keys(Dict) -> Keys when
+      Dict :: dict(),
+      Keys :: [term()].
 
 fetch_keys(D) ->
     fold(fun (Key, _Val, Keys) -> [Key|Keys] end, [], D).
 
--spec erase(term(), dict()) -> dict().
+-spec erase(Key, Dict1) -> Dict2 when
+      Key :: term(),
+      Dict1 :: dict(),
+      Dict2 :: dict().
 %%  Erase all elements with key Key.
 
 erase(Key, D0) -> 
@@ -150,7 +168,11 @@ erase_key(Key, [E|Bkt0]) ->
     {[E|Bkt1],Dc};
 erase_key(_, []) -> {[],0}.
 
--spec store(term(), term(), dict()) -> dict().
+-spec store(Key, Value, Dict1) -> Dict2 when
+      Key :: term(),
+      Value :: term(),
+      Dict1 :: dict(),
+      Dict2 :: dict().
 
 store(Key, Val, D0) ->
     Slot = get_slot(D0, Key),
@@ -166,7 +188,11 @@ store_bkt_val(Key, New, [Other|Bkt0]) ->
     {[Other|Bkt1],Ic};
 store_bkt_val(Key, New, []) -> {[?kv(Key,New)],1}.
 
--spec append(term(), term(), dict()) -> dict().
+-spec append(Key, Value, Dict1) -> Dict2 when
+      Key :: term(),
+      Value :: term(),
+      Dict1 :: dict(),
+      Dict2 :: dict().
 
 append(Key, Val, D0) ->
     Slot = get_slot(D0, Key),
@@ -182,7 +208,11 @@ append_bkt(Key, Val, [Other|Bkt0]) ->
     {[Other|Bkt1],Ic};
 append_bkt(Key, Val, []) -> {[?kv(Key,[Val])],1}.
 
--spec append_list(term(), [term()], dict()) -> dict().
+-spec append_list(Key, ValList, Dict1) -> Dict2 when
+      Key :: term(),
+      ValList :: [Value :: term()],
+      Dict1 :: dict(),
+      Dict2 :: dict().
 
 append_list(Key, L, D0) ->
     Slot = get_slot(D0, Key),
@@ -252,7 +282,11 @@ app_list_bkt(Key, L, []) -> {[?kv(Key,L)],1}.
 %%     {Bkt1,Dc} = on_key_bkt(Key, F, Bkt0),
 %%     {[Other|Bkt1],Dc}.
 
--spec update(term(), fun((term()) -> term()), dict()) -> dict().
+-spec update(Key, Fun, Dict1) -> Dict2 when
+      Key :: term(),
+      Fun :: fun((Value1 :: term()) -> Value2 :: term()),
+      Dict1 :: dict(),
+      Dict2 :: dict().
 
 update(Key, F, D0) ->
     Slot = get_slot(D0, Key),
@@ -271,7 +305,12 @@ update_bkt(Key, F, [Other|Bkt0]) ->
 update_bkt(_Key, _F, []) ->
     throw(badarg).
 
--spec update(term(), fun((term()) -> term()), term(), dict()) -> dict().
+-spec update(Key, Fun, Initial, Dict1) -> Dict2 when
+      Key :: term(),
+      Initial :: term(),
+      Fun :: fun((Value1 :: term()) -> Value2 :: term()),
+      Dict1 :: dict(),
+      Dict2 :: dict().
 
 update(Key, F, Init, D0) ->
     Slot = get_slot(D0, Key),
@@ -286,7 +325,11 @@ update_bkt(Key, F, I, [Other|Bkt0]) ->
     {[Other|Bkt1],Ic};
 update_bkt(Key, F, I, []) when is_function(F, 1) -> {[?kv(Key,I)],1}.
 
--spec update_counter(term(), number(), dict()) -> dict().
+-spec update_counter(Key, Increment, Dict1) -> Dict2 when
+      Key :: term(),
+      Increment :: number(),
+      Dict1 :: dict(),
+      Dict2 :: dict().
 
 update_counter(Key, Incr, D0) when is_number(Incr) ->
     Slot = get_slot(D0, Key),
@@ -301,20 +344,38 @@ counter_bkt(Key, I, [Other|Bkt0]) ->
     {[Other|Bkt1],Ic};
 counter_bkt(Key, I, []) -> {[?kv(Key,I)],1}.
 
--spec fold(fun((term(), term(), term()) -> term()), term(), dict()) -> term().
+-spec fold(Fun, Acc0, Dict) -> Acc1 when
+      Fun :: fun((Key, Value, AccIn) -> AccOut),
+      Key :: term(),
+      Value :: term(),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term(),
+      Dict :: dict().
 %%  Fold function Fun over all "bags" in Table and return Accumulator.
 
 fold(F, Acc, D) -> fold_dict(F, Acc, D).
 
--spec map(fun((term(), term()) -> term()), dict()) -> dict().
+-spec map(Fun, Dict1) -> Dict2 when
+      Fun :: fun((Key :: term(), Value1 :: term()) -> Value2 :: term()),
+      Dict1 :: dict(),
+      Dict2 :: dict().
 
 map(F, D) -> map_dict(F, D).
 
--spec filter(fun((term(), term()) -> boolean()), dict()) -> dict().
+-spec filter(Pred, Dict1) -> Dict2 when
+      Pred :: fun((Key :: term(), Value :: term()) -> boolean()),
+      Dict1 :: dict(),
+      Dict2 :: dict().
 
 filter(F, D) -> filter_dict(F, D).
 
--spec merge(fun((term(), term(), term()) -> term()), dict(), dict()) -> dict().
+-spec merge(Fun, Dict1, Dict2) -> Dict3 when
+      Fun :: fun((Key :: term(), Value1 :: term(), Value2 :: term()) -> Value :: term()),
+      Dict1 :: dict(),
+      Dict2 :: dict(),
+      Dict3 :: dict().
 
 merge(F, D1, D2) when D1#dict.size < D2#dict.size ->
     fold_dict(fun (K, V1, D) ->
diff --git a/lib/stdlib/src/digraph.erl b/lib/stdlib/src/digraph.erl
index 5edc868a94..e3f87d2c57 100644
--- a/lib/stdlib/src/digraph.erl
+++ b/lib/stdlib/src/digraph.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -53,7 +53,8 @@
 -type label()   :: term().
 -type vertex()  :: term().
 
--type add_edge_err_rsn() :: {'bad_edge', [vertex()]} | {'bad_vertex', vertex()}.
+-type add_edge_err_rsn() :: {'bad_edge', Path :: [vertex()]}
+                          | {'bad_vertex', V :: vertex()}.
 
 %%
 %% Type is a list of
@@ -70,7 +71,8 @@
 
 new() -> new([]).
 
--spec new([d_type()]) -> digraph().
+-spec new(Type) -> digraph() when
+      Type :: [d_type()].
 
 new(Type) ->
     case check_type(Type, protected, []) of
@@ -113,16 +115,20 @@ set_type([], G) -> G.
 
 %% Data access functions
 
--spec delete(digraph()) -> 'true'.
+-spec delete(G) -> 'true' when
+      G :: digraph().
 
 delete(G) ->
     ets:delete(G#digraph.vtab),
     ets:delete(G#digraph.etab),
     ets:delete(G#digraph.ntab).
 
--spec info(digraph()) -> [{'cyclicity', d_cyclicity()} |
-			  {'memory', non_neg_integer()} |
-			  {'protection', d_protection()}].
+-spec info(G) -> InfoList when
+      G :: digraph(),
+      InfoList :: [{'cyclicity', Cyclicity :: d_cyclicity()} |
+                   {'memory', NoWords :: non_neg_integer()} |
+                   {'protection', Protection :: d_protection()}].
+
 info(G) ->
     VT = G#digraph.vtab,
     ET = G#digraph.etab,
@@ -135,32 +141,45 @@ info(G) ->
     Memory = ets:info(VT, memory) + ets:info(ET, memory) + ets:info(NT, memory),
     [{cyclicity, Cyclicity}, {memory, Memory}, {protection, Protection}].
 
--spec add_vertex(digraph()) -> vertex().
+-spec add_vertex(G) -> vertex() when
+      G :: digraph().
 
 add_vertex(G) ->
     do_add_vertex({new_vertex_id(G), []}, G).
 
--spec add_vertex(digraph(), vertex()) -> vertex().
+-spec add_vertex(G, V) -> vertex() when
+      G :: digraph(),
+      V :: vertex().
 
 add_vertex(G, V) ->
     do_add_vertex({V, []}, G).
 
--spec add_vertex(digraph(), vertex(), label()) -> vertex().
+-spec add_vertex(G, V, Label) -> vertex() when
+      G :: digraph(),
+      V :: vertex(),
+      Label :: label().
 
 add_vertex(G, V, D) ->
     do_add_vertex({V, D}, G).
 
--spec del_vertex(digraph(), vertex()) -> 'true'.
+-spec del_vertex(G, V) -> 'true' when
+      G :: digraph(),
+      V :: vertex().
 
 del_vertex(G, V) ->
     do_del_vertex(V, G).
 
--spec del_vertices(digraph(), [vertex()]) -> 'true'.
+-spec del_vertices(G, Vertices) -> 'true' when
+      G :: digraph(),
+      Vertices :: [vertex()].
 
 del_vertices(G, Vs) -> 
     do_del_vertices(Vs, G).
 
--spec vertex(digraph(), vertex()) -> {vertex(), label()} | 'false'.
+-spec vertex(G, V) -> {V, Label} | 'false' when
+      G :: digraph(),
+      V :: vertex(),
+      Label :: label().
 
 vertex(G, V) ->
     case ets:lookup(G#digraph.vtab, V) of
@@ -168,12 +187,15 @@ vertex(G, V) ->
 	[Vertex] -> Vertex
     end.
 
--spec no_vertices(digraph()) -> non_neg_integer().
+-spec no_vertices(G) -> non_neg_integer() when
+      G :: digraph().
 
 no_vertices(G) ->
     ets:info(G#digraph.vtab, size).
 
--spec vertices(digraph()) -> [vertex()].
+-spec vertices(G) -> Vertices when
+      G :: digraph(),
+      Vertices :: [vertex()].
 
 vertices(G) ->
     ets:select(G#digraph.vtab, [{{'$1', '_'}, [], ['$1']}]).
@@ -188,85 +210,125 @@ source_vertices(G) ->
 sink_vertices(G) ->
     collect_vertices(G, out).
 
--spec in_degree(digraph(), vertex()) -> non_neg_integer().
+-spec in_degree(G, V) -> non_neg_integer() when
+      G :: digraph(),
+      V :: vertex().
 
 in_degree(G, V) ->
     length(ets:lookup(G#digraph.ntab, {in, V})).
 
--spec in_neighbours(digraph(), vertex()) -> [vertex()].
+-spec in_neighbours(G, V) -> Vertex when
+      G :: digraph(),
+      V :: vertex(),
+      Vertex :: [vertex()].
 
 in_neighbours(G, V) ->
     ET = G#digraph.etab,
     NT = G#digraph.ntab,
     collect_elems(ets:lookup(NT, {in, V}), ET, 2).
 
--spec in_edges(digraph(), vertex()) -> [edge()].
+-spec in_edges(G, V) -> Edges when
+      G :: digraph(),
+      V :: vertex(),
+      Edges :: [edge()].
 
 in_edges(G, V) ->
     ets:select(G#digraph.ntab, [{{{in, V}, '$1'}, [], ['$1']}]).
 
--spec out_degree(digraph(), vertex()) -> non_neg_integer().
+-spec out_degree(G, V) -> non_neg_integer() when
+      G :: digraph(),
+      V :: vertex().
 
 out_degree(G, V) ->
     length(ets:lookup(G#digraph.ntab, {out, V})).
 
--spec out_neighbours(digraph(), vertex()) -> [vertex()].
+-spec out_neighbours(G, V) -> Vertices when
+      G :: digraph(),
+      V :: vertex(),
+      Vertices :: [vertex()].
 
 out_neighbours(G, V) ->
     ET = G#digraph.etab,
     NT = G#digraph.ntab,
     collect_elems(ets:lookup(NT, {out, V}), ET, 3).
 
--spec out_edges(digraph(), vertex()) -> [edge()].
+-spec out_edges(G, V) -> Edges when
+      G :: digraph(),
+      V :: vertex(),
+      Edges :: [edge()].
 
 out_edges(G, V) ->
     ets:select(G#digraph.ntab, [{{{out, V}, '$1'}, [], ['$1']}]).
 
--spec add_edge(digraph(), vertex(), vertex()) ->
-	 edge() | {'error', add_edge_err_rsn()}.
+-spec add_edge(G, V1, V2) -> edge() | {'error', add_edge_err_rsn()} when
+      G :: digraph(),
+      V1 :: vertex(),
+      V2 :: vertex().
 
 add_edge(G, V1, V2) ->
     do_add_edge({new_edge_id(G), V1, V2, []}, G).
 
--spec add_edge(digraph(), vertex(), vertex(), label()) ->
-	 edge() | {'error', add_edge_err_rsn()}.
+-spec add_edge(G, V1, V2, Label) -> edge() | {'error', add_edge_err_rsn()} when
+      G :: digraph(),
+      V1 :: vertex(),
+      V2 :: vertex(),
+      Label :: label().
 
 add_edge(G, V1, V2, D) ->
     do_add_edge({new_edge_id(G), V1, V2, D}, G).
 
--spec add_edge(digraph(), edge(), vertex(), vertex(), label()) ->
-	 edge() | {'error', add_edge_err_rsn()}.
+-spec add_edge(G, E, V1, V2, Label) -> edge() | {'error', add_edge_err_rsn()} when
+      G :: digraph(),
+      E :: edge(),
+      V1 :: vertex(),
+      V2 :: vertex(),
+      Label :: label().
 
 add_edge(G, E, V1, V2, D) ->
     do_add_edge({E, V1, V2, D}, G).
 
--spec del_edge(digraph(), edge()) -> 'true'.
+-spec del_edge(G, E) -> 'true' when
+      G :: digraph(),
+      E :: edge().
 
 del_edge(G, E) ->
     do_del_edges([E], G).
 
--spec del_edges(digraph(), [edge()]) -> 'true'.
+-spec del_edges(G, Edges) -> 'true' when
+      G :: digraph(),
+      Edges :: [edge()].
 
 del_edges(G, Es) ->
     do_del_edges(Es, G).
 
--spec no_edges(digraph()) -> non_neg_integer().
+-spec no_edges(G) -> non_neg_integer() when
+      G :: digraph().
 
 no_edges(G) ->
     ets:info(G#digraph.etab, size).
 
--spec edges(digraph()) -> [edge()].
+-spec edges(G) -> Edges when
+      G :: digraph(),
+      Edges :: [edge()].
 
 edges(G) ->
     ets:select(G#digraph.etab, [{{'$1', '_', '_', '_'}, [], ['$1']}]).
 
--spec edges(digraph(), vertex()) -> [edge()].
+-spec edges(G, V) -> Edges when
+      G :: digraph(),
+      V :: vertex(),
+      Edges :: [edge()].
 
 edges(G, V) ->
     ets:select(G#digraph.ntab, [{{{out, V},'$1'}, [], ['$1']},
 				{{{in, V}, '$1'}, [], ['$1']}]).
 
--spec edge(digraph(), edge()) -> {edge(),vertex(),vertex(),label()} | 'false'.
+-spec edge(G, E) -> {E, V1, V2, Label} | 'false' when
+      G :: digraph(),
+      E :: edge(),
+      V1 :: vertex(),
+      V2 :: vertex(),
+      Label :: label().
 
 edge(G, E) ->
     case ets:lookup(G#digraph.etab,E) of
@@ -277,7 +339,7 @@ edge(G, E) ->
 %%
 %% Generate a "unique" edge identifier (relative to this graph)
 %%
--spec new_edge_id(digraph()) -> nonempty_improper_list('$e', non_neg_integer()).
+-spec new_edge_id(digraph()) -> edge().
 
 new_edge_id(G) ->
     NT = G#digraph.ntab,
@@ -289,7 +351,7 @@ new_edge_id(G) ->
 %%
 %% Generate a "unique" vertex identifier (relative to this graph)
 %%
--spec new_vertex_id(digraph()) -> nonempty_improper_list('$v', non_neg_integer()).
+-spec new_vertex_id(digraph()) -> vertex().
 
 new_vertex_id(G) ->
     NT = G#digraph.ntab,
@@ -444,7 +506,10 @@ acyclic_add_edge(E, V1, V2, Label, G) ->
 %% Delete all paths from vertex V1 to vertex V2
 %%
 
--spec del_path(digraph(), vertex(), vertex()) -> 'true'.
+-spec del_path(G, V1, V2) -> 'true' when
+      G :: digraph(),
+      V1 :: vertex(),
+      V2 :: vertex().
 
 del_path(G, V1, V2) ->
     case get_path(G, V1, V2) of
@@ -463,7 +528,10 @@ del_path(G, V1, V2) ->
 %% been searched.
 %%
 
--spec get_cycle(digraph(), vertex()) -> [vertex(),...] | 'false'.
+-spec get_cycle(G, V) -> Vertices | 'false' when
+      G :: digraph(),
+      V :: vertex(),
+      Vertices :: [vertex(),...].
 
 get_cycle(G, V) ->
     case one_path(out_neighbours(G, V), V, [], [V], [V], 2, G, 1) of
@@ -481,7 +549,11 @@ get_cycle(G, V) ->
 %% if no path exists false is returned
 %%
 
--spec get_path(digraph(), vertex(), vertex()) -> [vertex(),...] | 'false'.
+-spec get_path(G, V1, V2) -> Vertices | 'false' when
+      G :: digraph(),
+      V1 :: vertex(),
+      V2 :: vertex(),
+      Vertices :: [vertex(),...].
 
 get_path(G, V1, V2) ->
     one_path(out_neighbours(G, V1), V2, [], [V1], [V1], 1, G, 1).
@@ -516,7 +588,10 @@ one_path([], _, [], _, _, _, _, _Counter) -> false.
 %% Like get_cycle/2, but a cycle of length one is preferred.
 %%
 
--spec get_short_cycle(digraph(), vertex()) -> [vertex(),...] | 'false'.
+-spec get_short_cycle(G, V) -> Vertices | 'false' when
+      G :: digraph(),
+      V :: vertex(),
+      Vertices :: [vertex(),...].
 
 get_short_cycle(G, V) ->
     get_short_path(G, V, V).
@@ -526,7 +601,11 @@ get_short_cycle(G, V) ->
 %% to find a short path.
 %%
 
--spec get_short_path(digraph(), vertex(), vertex()) -> [vertex(),...] | 'false'.
+-spec get_short_path(G, V1, V2) -> Vertices | 'false' when
+      G :: digraph(),
+      V1 :: vertex(),
+      V2 :: vertex(),
+      Vertices :: [vertex(),...].
 
 get_short_path(G, V1, V2) ->
     T = new(),
diff --git a/lib/stdlib/src/digraph_utils.erl b/lib/stdlib/src/digraph_utils.erl
index 080cae4742..e221be15a1 100644
--- a/lib/stdlib/src/digraph_utils.erl
+++ b/lib/stdlib/src/digraph_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -38,48 +38,66 @@
 %%  A convenient type alias
 %%
 
--type vertices() :: [digraph:vertex()].
-
 %%
 %%  Exported functions
 %%
 
--spec components(digraph()) -> vertices().
+-spec components(Digraph) -> [Component] when
+      Digraph :: digraph(),
+      Component :: [digraph:vertex()].
 
 components(G) ->
     forest(G, fun inout/3).
 
--spec strong_components(digraph()) -> vertices().
+-spec strong_components(Digraph) -> [StrongComponent] when
+      Digraph :: digraph(),
+      StrongComponent :: [digraph:vertex()].
 
 strong_components(G) ->
     forest(G, fun in/3, revpostorder(G)).
 
--spec cyclic_strong_components(digraph()) -> vertices().
+-spec cyclic_strong_components(Digraph) -> [StrongComponent] when
+      Digraph :: digraph(),
+      StrongComponent :: [digraph:vertex()].
 
 cyclic_strong_components(G) ->
     remove_singletons(strong_components(G), G, []).
 
--spec reachable(vertices(), digraph()) -> vertices().
+-spec reachable(Vertices, Digraph) -> Reachable when
+      Digraph :: digraph(),
+      Vertices :: [digraph:vertex()],
+      Reachable :: [digraph:vertex()].
 
 reachable(Vs, G) when is_list(Vs) ->
     lists:append(forest(G, fun out/3, Vs, first)).
 
--spec reachable_neighbours(vertices(), digraph()) -> vertices().
+-spec reachable_neighbours(Vertices, Digraph) -> Reachable when
+      Digraph :: digraph(),
+      Vertices :: [digraph:vertex()],
+      Reachable :: [digraph:vertex()].
 
 reachable_neighbours(Vs, G) when is_list(Vs) ->
     lists:append(forest(G, fun out/3, Vs, not_first)).
 
--spec reaching(vertices(), digraph()) -> vertices().
+-spec reaching(Vertices, Digraph) -> Reaching when
+      Digraph :: digraph(),
+      Vertices :: [digraph:vertex()],
+      Reaching :: [digraph:vertex()].
 
 reaching(Vs, G) when is_list(Vs) ->
     lists:append(forest(G, fun in/3, Vs, first)).
 
--spec reaching_neighbours(vertices(), digraph()) -> vertices().
+-spec reaching_neighbours(Vertices, Digraph) -> Reaching when
+      Digraph :: digraph(),
+      Vertices :: [digraph:vertex()],
+      Reaching :: [digraph:vertex()].
 
 reaching_neighbours(Vs, G) when is_list(Vs) ->
     lists:append(forest(G, fun in/3, Vs, not_first)).
 
--spec topsort(digraph()) -> vertices() | 'false'.
+-spec topsort(Digraph) -> Vertices | 'false' when
+      Digraph :: digraph(),
+      Vertices :: [digraph:vertex()].
 
 topsort(G) ->
     L = revpostorder(G),
@@ -88,12 +106,15 @@ topsort(G) ->
 	false -> false
     end.
 
--spec is_acyclic(digraph()) -> boolean().
+-spec is_acyclic(Digraph) -> boolean() when
+      Digraph :: digraph().
 
 is_acyclic(G) ->
     loop_vertices(G) =:= [] andalso topsort(G) =/= false.
 
--spec arborescence_root(digraph()) -> 'no' | {'yes', digraph:vertex()}.
+-spec arborescence_root(Digraph) -> 'no' | {'yes', Root} when
+      Digraph :: digraph(),
+      Root :: digraph:vertex().
 
 arborescence_root(G) ->
     case digraph:no_edges(G) =:= digraph:no_vertices(G) - 1 of
@@ -114,23 +135,30 @@ arborescence_root(G) ->
             no
     end.
 
--spec is_arborescence(digraph()) -> boolean().
+-spec is_arborescence(Digraph) -> boolean() when
+      Digraph :: digraph().
 
 is_arborescence(G) ->
     arborescence_root(G) =/= no.
 
--spec is_tree(digraph()) -> boolean().
+-spec is_tree(Digraph) -> boolean() when
+      Digraph :: digraph().
 
 is_tree(G) ->
     (digraph:no_edges(G) =:= digraph:no_vertices(G) - 1)
     andalso (length(components(G)) =:= 1).
 
--spec loop_vertices(digraph()) -> vertices().
+-spec loop_vertices(Digraph) -> Vertices when
+      Digraph :: digraph(),
+      Vertices :: [digraph:vertex()].
 
 loop_vertices(G) ->
     [V || V <- digraph:vertices(G), is_reflexive_vertex(V, G)].
 
--spec subgraph(digraph(), vertices()) -> digraph().
+-spec subgraph(Digraph, Vertices) -> SubGraph when
+      Digraph :: digraph(),
+      Vertices :: [digraph:vertex()],
+      SubGraph :: digraph().
 
 subgraph(G, Vs) ->
     try
@@ -140,10 +168,12 @@ subgraph(G, Vs) ->
 	    erlang:error(badarg)
     end.
 
--type option() :: {'type', 'inherit' | [digraph:d_type()]}
-                | {'keep_labels', boolean()}.
-
--spec subgraph(digraph(), vertices(), [option()]) -> digraph().
+-spec subgraph(Digraph, Vertices, Options) -> SubGraph when
+      Digraph :: digraph(),
+      SubGraph :: digraph(),
+      Vertices :: [digraph:vertex()],
+      Options :: [{'type', SubgraphType} | {'keep_labels', boolean()}],
+      SubgraphType :: 'inherit' | [digraph:d_type()].
 
 subgraph(G, Vs, Opts) ->
     try
@@ -153,7 +183,9 @@ subgraph(G, Vs, Opts) ->
 	    erlang:error(badarg)
     end.
 
--spec condensation(digraph()) -> digraph().
+-spec condensation(Digraph) -> CondensedDigraph when
+      Digraph :: digraph(),
+      CondensedDigraph :: digraph().
 
 condensation(G) ->
     SCs = strong_components(G),
@@ -176,12 +208,16 @@ condensation(G) ->
     ets:delete(I2C),
     SCG.
 
--spec preorder(digraph()) -> vertices().
+-spec preorder(Digraph) -> Vertices when
+      Digraph :: digraph(),
+      Vertices :: [digraph:vertex()].
 
 preorder(G) ->
     lists:reverse(revpreorder(G)).
 
--spec postorder(digraph()) -> vertices().
+-spec postorder(Digraph) -> Vertices when
+      Digraph :: digraph(),
+      Vertices :: [digraph:vertex()].
 
 postorder(G) ->
     lists:reverse(revpostorder(G)).
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index e5ccaddbb4..d804c1dee5 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -29,6 +29,7 @@
 %%------------------------------------------------------------------------
 
 -type macros() :: [{atom(), term()}].
+-type epp_handle() :: pid().
 
 %% Epp state record.
 -record(epp, {file,				%Current file
@@ -61,14 +62,23 @@
 %% parse_file(FileName, IncludePath, PreDefMacros)
 %% macro_defs(Epp)
 
--spec open(file:name(), [file:name()]) ->
-	{'ok', pid()} | {'error', term()}.
+-spec open(FileName, IncludePath) ->
+	{'ok', Epp} | {'error', ErrorDescriptor} when
+      FileName :: file:name(),
+      IncludePath :: [DirectoryName :: file:name()],
+      Epp :: epp_handle(),
+      ErrorDescriptor :: term().
 
 open(Name, Path) ->
     open(Name, Path, []).
 
--spec open(file:name(), [file:name()], macros()) ->
-	{'ok', pid()} | {'error', term()}.
+-spec open(FileName, IncludePath, PredefMacros) ->
+	{'ok', Epp} | {'error', ErrorDescriptor} when
+      FileName :: file:name(),
+      IncludePath :: [DirectoryName :: file:name()],
+      PredefMacros :: macros(),
+      Epp :: epp_handle(),
+      ErrorDescriptor :: term().
 
 open(Name, Path, Pdm) ->
     Self = self(),
@@ -80,7 +90,8 @@ open(Name, File, StartLocation, Path, Pdm) ->
     Epp = spawn(fun() -> server(Self, Name, File, StartLocation,Path,Pdm) end),
     epp_request(Epp).
 
--spec close(pid()) -> 'ok'.
+-spec close(Epp) -> 'ok' when
+      Epp :: epp_handle().
 
 close(Epp) ->
     %% Make sure that close is synchronous as a courtesy to test
@@ -93,6 +104,13 @@ close(Epp) ->
 scan_erl_form(Epp) ->
     epp_request(Epp, scan_erl_form).
 
+-spec parse_erl_form(Epp) ->
+        {'ok', AbsForm} | {'eof', Line} | {error, ErrorInfo} when
+      Epp :: epp_handle(),
+      AbsForm :: erl_parse:abstract_form(),
+      Line :: erl_scan:line(),
+      ErrorInfo :: erl_scan:error_info() | erl_parse:error_info().
+
 parse_erl_form(Epp) ->
     case epp_request(Epp, scan_erl_form) of
 	{ok,Toks} ->
@@ -107,6 +125,9 @@ macro_defs(Epp) ->
 %% format_error(ErrorDescriptor) -> String
 %%  Return a string describing the error.
 
+-spec format_error(ErrorDescriptor) -> io_lib:chars() when
+      ErrorDescriptor :: term().
+
 format_error(cannot_parse) ->
     io_lib:format("cannot parse file, giving up", []);
 format_error({bad,W}) ->
@@ -146,6 +167,16 @@ format_error(E) -> file:format_error(E).
 %% parse_file(FileName, IncludePath, [PreDefMacro]) ->
 %%	{ok,[Form]} | {error,OpenError}
 
+-spec parse_file(FileName, IncludePath, PredefMacros) ->
+                {'ok', [Form]} | {error, OpenError} when
+      FileName :: file:name(),
+      IncludePath :: [DirectoryName :: file:name()],
+      Form :: erl_parse:abstract_form() | {'error', ErrorInfo} | {'eof',Line},
+      PredefMacros :: macros(),
+      Line :: erl_scan:line(),
+      ErrorInfo :: erl_scan:error_info() | erl_parse:error_info(),
+      OpenError :: file:posix() | badarg | system_limit.
+
 parse_file(Ifile, Path, Predefs) ->
     case open(Ifile, Path, Predefs) of
 	{ok,Epp} ->
diff --git a/lib/stdlib/src/erl_eval.erl b/lib/stdlib/src/erl_eval.erl
index ea1b179ee5..46288cf467 100644
--- a/lib/stdlib/src/erl_eval.erl
+++ b/lib/stdlib/src/erl_eval.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -34,6 +34,37 @@
 
 -import(lists, [reverse/1,foldl/3,member/2]).
 
+-export_type([binding_struct/0]).
+
+-type(expression() :: erl_parse:abstract_expr()).
+-type(expressions() :: [erl_parse:abstract_expr()]).
+-type(expression_list() :: [expression()]).
+-type(clauses() :: [erl_parse:abstract_clause()]).
+-type(name() :: term()).
+-type(value() :: term()).
+-type(bindings() :: [{name(), value()}]).
+-opaque(binding_struct() :: orddict:orddict()).
+
+-type(lfun_value_handler() :: fun((Name :: atom(),
+                                   Arguments :: [term()]) ->
+                                         Value :: value())).
+-type(lfun_eval_handler() :: fun((Name :: atom(),
+                                  Arguments :: expression_list(),
+                                  Bindings :: binding_struct()) ->
+                                        {value,
+                                         Value :: value(),
+                                         NewBindings :: binding_struct()})).
+-type(local_function_handler() :: {value, lfun_value_handler()}
+                                | {eval, lfun_eval_handler()}
+                                | none).
+
+-type(func_spec() :: {Module :: module(), Function :: atom()} | function()).
+-type(nlfun_handler() :: fun((FuncSpec :: func_spec(),
+                              Arguments :: [term()]) ->
+                                    term())).
+-type(non_local_function_handler() :: {value, nlfun_handler()}
+                                    | none).
+
 %% exprs(ExpressionSeq, Bindings)
 %% exprs(ExpressionSeq, Bindings, LocalFuncHandler)
 %% exprs(ExpressionSeq, Bindings, LocalFuncHandler, ExternalFuncHandler)
@@ -45,6 +76,11 @@
 %% that there are valid constructs in Expression to be taken care of
 %% by a function handler but considerad errors by erl_lint.
 
+-spec(exprs(Expressions, Bindings) -> {value, Value, NewBindings} when
+      Expressions :: expressions(),
+      Bindings :: binding_struct(),
+      Value :: value(),
+      NewBindings :: binding_struct()).
 exprs(Exprs, Bs) ->
     case check_command(Exprs, Bs) of
         ok -> 
@@ -53,9 +89,25 @@ exprs(Exprs, Bs) ->
 	    erlang:raise(error, Error, [{?MODULE,exprs,2}])
     end.
 
+-spec(exprs(Expressions, Bindings, LocalFunctionHandler) ->
+             {value, Value, NewBindings} when
+      Expressions :: expressions(),
+      Bindings :: binding_struct(),
+      LocalFunctionHandler :: local_function_handler(),
+      Value :: value(),
+      NewBindings :: binding_struct()).
 exprs(Exprs, Bs, Lf) ->
     exprs(Exprs, Bs, Lf, none, none).
 
+-spec(exprs(Expressions, Bindings, LocalFunctionHandler,
+            NonLocalFunctionHandler) ->
+             {value, Value, NewBindings} when
+      Expressions :: expressions(),
+      Bindings :: binding_struct(),
+      LocalFunctionHandler :: local_function_handler(),
+      NonLocalFunctionHandler :: non_local_function_handler(),
+      Value :: value(),
+      NewBindings :: binding_struct()).
 exprs(Exprs, Bs, Lf, Ef) ->
     exprs(Exprs, Bs, Lf, Ef, none).
 
@@ -75,6 +127,11 @@ exprs([E|Es], Bs0, Lf, Ef, RBs) ->
 %%
 %% Only expr/2 checks the command by calling erl_lint. See exprs/2.
 
+-spec(expr(Expression, Bindings) -> {value, Value, NewBindings} when
+      Expression :: expression(),
+      Bindings :: binding_struct(),
+      Value :: value(),
+      NewBindings :: binding_struct()).
 expr(E, Bs) ->
     case check_command([E], Bs) of
         ok -> 
@@ -83,9 +140,25 @@ expr(E, Bs) ->
 	    erlang:raise(error, Error, [{?MODULE,expr,2}])
     end.
 
+-spec(expr(Expression, Bindings, LocalFunctionHandler) ->
+             {value, Value, NewBindings} when
+      Expression :: expression(),
+      Bindings :: binding_struct(),
+      LocalFunctionHandler :: local_function_handler(),
+      Value :: value(),
+      NewBindings :: binding_struct()).
 expr(E, Bs, Lf) ->
     expr(E, Bs, Lf, none, none).
 
+-spec(expr(Expression, Bindings, LocalFunctionHandler,
+           NonLocalFunctionHandler) ->
+             {value, Value, NewBindings} when
+      Expression :: expression(),
+      Bindings :: binding_struct(),
+      LocalFunctionHandler :: local_function_handler(),
+      NonLocalFunctionHandler :: non_local_function_handler(),
+      Value :: value(),
+      NewBindings :: binding_struct()).
 expr(E, Bs, Lf, Ef) ->
     expr(E, Bs, Lf, Ef, none).
 
@@ -114,6 +187,16 @@ fun_data(F) when is_function(F) ->
 fun_data(_T) ->
     false.
 
+-spec(expr(Expression, Bindings, LocalFunctionHandler,
+           NonLocalFunctionHandler, ReturnFormat) ->
+             {value, Value, NewBindings} | Value when
+      Expression :: expression(),
+      Bindings :: binding_struct(),
+      LocalFunctionHandler :: local_function_handler(),
+      NonLocalFunctionHandler :: non_local_function_handler(),
+      ReturnFormat :: none | value,
+      Value :: value(),
+      NewBindings :: binding_struct()).
 expr({var,_,V}, Bs, _Lf, _Ef, RBs) ->
     case binding(V, Bs) of
 	{value,Val} ->
@@ -384,12 +467,9 @@ local_func(Func, As0, Bs0, {value,F}, value) ->
 local_func(Func, As0, Bs0, {value,F}, RBs) ->
     {As1,Bs1} = expr_list(As0, Bs0, {value,F}),
     ret_expr(F(Func, As1), Bs1, RBs);
-local_func(Func, As0, Bs0, {value,F,Eas}, value) ->
-    {As1,_Bs1} = expr_list(As0, Bs0, {value,F,Eas}),
-    apply(F, [Func,As1|Eas]);
 local_func(Func, As0, Bs0, {value,F,Eas}, RBs) ->
-    {As1,Bs1} = expr_list(As0, Bs0, {value,F,Eas}),
-    ret_expr(apply(F, [Func,As1|Eas]), Bs1, RBs);
+    Fun = fun(Name, Args) -> apply(F, [Name,Args|Eas]) end,
+    local_func(Func, As0, Bs0, {value, Fun}, RBs);
 local_func(Func, As, Bs, {eval,F}, RBs) ->
     local_func2(F(Func, As, Bs), RBs);
 local_func(Func, As, Bs, {eval,F,Eas}, RBs) ->
@@ -613,12 +693,33 @@ eval_fun([], As, _Bs, _Lf, _Ef, _RBs) ->
 %% expr_list(ExpressionList, Bindings, LocalFuncHandler, ExternalFuncHandler)
 %%  Evaluate a list of expressions "in parallel" at the same level.
 
+-spec(expr_list(ExpressionList, Bindings) -> {ValueList, NewBindings} when
+      ExpressionList :: expression_list(),
+      Bindings :: binding_struct(),
+      ValueList :: [value()],
+      NewBindings :: binding_struct()).
 expr_list(Es, Bs) ->
     expr_list(Es, Bs, none, none).
 
+-spec(expr_list(ExpressionList, Bindings, LocalFunctionHandler) ->
+             {ValueList, NewBindings} when
+      ExpressionList :: expression_list(),
+      Bindings :: binding_struct(),
+      LocalFunctionHandler :: local_function_handler(),
+      ValueList :: [value()],
+      NewBindings :: binding_struct()).
 expr_list(Es, Bs, Lf) ->
     expr_list(Es, Bs, Lf, none).
 
+-spec(expr_list(ExpressionList, Bindings, LocalFunctionHandler,
+                NonLocalFunctionHandler) ->
+             {ValueList, NewBindings} when
+      ExpressionList :: expression_list(),
+      Bindings :: binding_struct(),
+      LocalFunctionHandler :: local_function_handler(),
+      NonLocalFunctionHandler :: non_local_function_handler(),
+      ValueList :: [value()],
+      NewBindings :: binding_struct()).
 expr_list(Es, Bs, Lf, Ef) ->
     expr_list(Es, [], Bs, Bs, Lf, Ef).    
 
@@ -757,6 +858,15 @@ send_all([], _) -> true.
 
 %% match_clause -> {Body, Bindings} or nomatch
 
+-spec(match_clause(Clauses, ValueList, Bindings, LocalFunctionHandler) ->
+             {Body, NewBindings} | nomatch when
+      Clauses :: clauses(),
+      ValueList :: [value()],
+      Bindings :: binding_struct(),
+      LocalFunctionHandler :: local_function_handler(),
+      Body :: expression_list(),
+      NewBindings :: binding_struct()).
+
 match_clause(Cs, Vs, Bs, Lf) ->
     match_clause(Cs, Vs, Bs, Lf, none).
 
@@ -973,18 +1083,30 @@ match_list(_, _, _Bs, _BBs) ->
 %% add_binding(Name, Value, Bindings)
 %% del_binding(Name, Bindings)
 
+-spec(new_bindings() -> binding_struct()).
 new_bindings() -> orddict:new().
 
+-spec(bindings(BindingStruct :: binding_struct()) -> bindings()).
 bindings(Bs) -> orddict:to_list(Bs).
 
+-spec(binding(Name, BindingStruct) -> {value, value()} | unbound when
+      Name :: name(),
+      BindingStruct :: binding_struct()).
 binding(Name, Bs) ->
     case orddict:find(Name, Bs) of
 	{ok,Val} -> {value,Val};
 	error -> unbound
     end.
 
+-spec(add_binding(Name, Value, BindingStruct) -> binding_struct() when
+      Name :: name(),
+      Value :: value(),
+      BindingStruct :: binding_struct()).
 add_binding(Name, Val, Bs) -> orddict:store(Name, Val, Bs).
 
+-spec(del_binding(Name, BindingStruct) -> binding_struct() when
+      Name :: name(),
+      BindingStruct :: binding_struct()).
 del_binding(Name, Bs) -> orddict:erase(Name, Bs).
 
 add_bindings(Bs1, Bs2) ->
diff --git a/lib/stdlib/src/erl_expand_records.erl b/lib/stdlib/src/erl_expand_records.erl
index 61ce41f714..eada563914 100644
--- a/lib/stdlib/src/erl_expand_records.erl
+++ b/lib/stdlib/src/erl_expand_records.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -38,6 +38,10 @@
                  checked_ra=[]        % succesfully accessed records
                 }).
 
+-spec(module(AbsForms, CompileOptions) -> AbsForms when
+      AbsForms :: [erl_parse:abstract_form()],
+      CompileOptions :: [compile:option()]).
+
 %% Is is assumed that Fs is a valid list of forms. It should pass
 %% erl_lint without errors.
 module(Fs0, Opts0) ->
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index b30b02a96f..478f05e792 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. 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
@@ -54,7 +54,9 @@
 %%---------------------------------------------------------------------------
 
 %%  Erlang builtin functions allowed in guards.
--spec guard_bif(Name::atom(), Arity::arity()) -> boolean().
+-spec guard_bif(Name, Arity) -> boolean() when
+      Name :: atom(),
+      Arity :: arity().
 
 guard_bif(abs, 1) -> true;
 guard_bif(float, 1) -> true;
@@ -92,7 +94,9 @@ guard_bif(binary_part, 3) -> true;
 guard_bif(Name, A) when is_atom(Name), is_integer(A) -> false.
 
 %%  Erlang type tests.
--spec type_test(Name::atom(), Arity::arity()) -> boolean().
+-spec type_test(Name, Arity) -> boolean() when
+      Name :: atom(),
+      Arity :: arity().
 
 type_test(Name, Arity) ->
     new_type_test(Name, Arity) orelse old_type_test(Name, Arity).
@@ -135,7 +139,9 @@ old_type_test(record, 2) -> true;
 old_type_test(function, 1) -> true;
 old_type_test(Name, A) when is_atom(Name), is_integer(A) -> false.
 
--spec arith_op(Op::atom(), Arity::arity()) -> boolean().
+-spec arith_op(OpName, Arity) -> boolean() when
+      OpName :: atom(),
+      Arity :: arity().
 
 arith_op('+', 1) -> true;
 arith_op('-', 1) -> true;
@@ -153,7 +159,9 @@ arith_op('bsl', 2) -> true;
 arith_op('bsr', 2) -> true;
 arith_op(Op, A) when is_atom(Op), is_integer(A) -> false.
 
--spec bool_op(Op::atom(), Arity::arity()) -> boolean().
+-spec bool_op(OpName, Arity) -> boolean() when
+      OpName :: atom(),
+      Arity :: arity().
 
 bool_op('not', 1) -> true;
 bool_op('and', 2) -> true;
@@ -161,7 +169,9 @@ bool_op('or', 2) -> true;
 bool_op('xor', 2) -> true;
 bool_op(Op, A) when is_atom(Op), is_integer(A) -> false.
 
--spec comp_op(Op::atom(), Arity::arity()) -> boolean().
+-spec comp_op(OpName, Arity) -> boolean() when
+      OpName :: atom(),
+      Arity :: arity().
 
 comp_op('==', 2) -> true;
 comp_op('/=', 2) -> true;
@@ -173,18 +183,25 @@ comp_op('=:=', 2) -> true;
 comp_op('=/=', 2) -> true;
 comp_op(Op, A) when is_atom(Op), is_integer(A) -> false.
 
--spec list_op(Op::atom(), Arity::arity()) -> boolean().
+-spec list_op(OpName, Arity) -> boolean() when
+      OpName :: atom(),
+      Arity :: arity().
 
 list_op('++', 2) -> true;
 list_op('--', 2) -> true;
 list_op(Op, A) when is_atom(Op), is_integer(A) -> false.
 
--spec send_op(Op::atom(), Arity::arity()) -> boolean().
+-spec send_op(OpName, Arity) -> boolean() when
+      OpName :: atom(),
+      Arity :: arity().
 
 send_op('!', 2) -> true;
 send_op(Op, A) when is_atom(Op), is_integer(A) -> false.
 
--spec op_type(atom(), arity()) -> 'arith' | 'bool' | 'comp' | 'list' | 'send'.
+-spec op_type(OpName, Arity) -> Type when
+      OpName :: atom(),
+      Arity :: arity(),
+      Type :: 'arith' | 'bool' | 'comp' | 'list' | 'send'.
 
 op_type('+', 1) -> arith;
 op_type('-', 1) -> arith;
@@ -221,7 +238,9 @@ op_type('!', 2) -> send.
 bif(erlang, Name, Arity) -> bif(Name, Arity);
 bif(M, F, A) when is_atom(M), is_atom(F), is_integer(A) -> false.
 
--spec bif(Name::atom(), Arity::arity()) -> boolean().
+-spec bif(Name, Arity) -> boolean() when
+      Name :: atom(),
+      Arity::arity().
 %%   Returns true if erlang:Name/Arity is an auto-imported BIF, false otherwise.
 %%   Use erlang:is_bultin(Mod, Name, Arity) to find whether a function is a BIF
 %%   (meaning implemented in C) or not.
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index cfb9f0ca98..dd0b9bc2ab 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -128,10 +128,15 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
               }).
 
 -type lint_state() :: #lint{}.
+-type error_description() :: term().
+-type error_info() :: {erl_scan:line(), module(), error_description()}.
 
 %% format_error(Error)
 %%  Return a string describing the error.
 
+-spec format_error(ErrorDescriptor) -> io_lib:chars() when
+      ErrorDescriptor :: error_description().
+
 format_error(undefined_module) ->
     "no module definition";
 format_error({bad_module_name, M}) ->
@@ -419,16 +424,39 @@ used_vars(Exprs, BindingsList) ->
 %%  apply_lambda/2 has been called to shut lint up. N.B. these lists are
 %%  really all ordsets!
 
+-spec(module(AbsForms) -> {ok, Warnings} | {error, Errors, Warnings} when
+      AbsForms :: [erl_parse:abstract_form()],
+      Warnings :: [{file:filename(),[ErrorInfo]}],
+      Errors :: [{FileName2 :: file:filename(),[ErrorInfo]}],
+      ErrorInfo :: error_info()).
+
 module(Forms) ->
     Opts = compiler_options(Forms),
     St = forms(Forms, start("nofile", Opts)),
     return_status(St).
 
+-spec(module(AbsForms, FileName) ->
+             {ok, Warnings} | {error, Errors, Warnings} when
+      AbsForms :: [erl_parse:abstract_form()],
+      FileName :: atom() | string(),
+      Warnings :: [{file:filename(),[ErrorInfo]}],
+      Errors :: [{FileName2 :: file:filename(),[ErrorInfo]}],
+      ErrorInfo :: error_info()).
+
 module(Forms, FileName) ->
     Opts = compiler_options(Forms),
     St = forms(Forms, start(FileName, Opts)),
     return_status(St).
 
+-spec(module(AbsForms, FileName, CompileOptions) ->
+             {ok, Warnings} | {error, Errors, Warnings} when
+      AbsForms :: [erl_parse:abstract_form()],
+      FileName :: atom() | string(),
+      CompileOptions :: [compile:option()],
+      Warnings :: [{file:filename(),[ErrorInfo]}],
+      Errors :: [{FileName2 :: file:filename(),[ErrorInfo]}],
+      ErrorInfo :: error_info()).
+
 module(Forms, FileName, Opts0) ->
     %% We want the options given on the command line to take
     %% precedence over options in the module.
@@ -1877,6 +1905,9 @@ gexpr_list(Es, Vt, St) ->
 
 %% is_guard_test(Expression) -> boolean().
 %%  Test if a general expression is a guard test.
+-spec is_guard_test(Expr) -> boolean() when
+      Expr :: erl_parse:abstract_expr().
+
 is_guard_test(E) ->
     is_guard_test2(E, dict:new()).
 
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index 15b45d72f4..bd5d65a1e1 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -511,6 +511,15 @@ Erlang code.
 %% of the generated .erl file by the HiPE compiler.  Please do not remove.
 -compile([{hipe,[{regalloc,linear_scan}]}]).
 
+-export_type([abstract_clause/0, abstract_expr/0, abstract_form/0,
+              error_info/0]).
+
+-type abstract_clause() :: term().
+-type abstract_expr() :: term().
+-type abstract_form() :: term().
+-type error_description() :: term().
+-type error_info() :: {erl_scan:line(), module(), error_description()}.
+-type token() :: {Tag :: atom(), Line :: erl_scan:line()}.
 
 %% mkop(Op, Arg) -> {op,Line,Op,Arg}.
 %% mkop(Left, Op, Right) -> {op,Line,Op,Left,Right}.
@@ -534,11 +543,19 @@ Erlang code.
 %% These really suck and are only here until Calle gets multiple
 %% entry points working.
 
+-spec parse_form(Tokens) -> {ok, AbsForm} | {error, ErrorInfo} when
+      Tokens :: [token()],
+      AbsForm :: abstract_form(),
+      ErrorInfo :: error_info().
 parse_form([{'-',L1},{atom,L2,spec}|Tokens]) ->
     parse([{'-',L1},{'spec',L2}|Tokens]);
 parse_form(Tokens) ->
     parse(Tokens).
 
+-spec parse_exprs(Tokens) -> {ok, ExprList} | {error, ErrorInfo} when
+      Tokens :: [token()],
+      ExprList :: [abstract_expr()],
+      ErrorInfo :: error_info().
 parse_exprs(Tokens) ->
     case parse([{atom,0,f},{'(',0},{')',0},{'->',0}|Tokens]) of
 	{ok,{function,_Lf,f,0,[{clause,_Lc,[],[],Exprs}]}} ->
@@ -546,6 +563,10 @@ parse_exprs(Tokens) ->
 	{error,_} = Err -> Err
     end.
 
+-spec parse_term(Tokens) -> {ok, Term} | {error, ErrorInfo} when
+      Tokens :: [token()],
+      Term :: term(),
+      ErrorInfo :: error_info().
 parse_term(Tokens) ->
     case parse([{atom,0,f},{'(',0},{')',0},{'->',0}|Tokens]) of
 	{ok,{function,_Lf,f,0,[{clause,_Lc,[],[],[Expr]}]}} ->
@@ -830,6 +851,7 @@ check_clauses(Cs, Name, Arity) ->
 build_try(L,Es,Scs,{Ccs,As}) ->
     {'try',L,Es,Scs,Ccs,As}.
 
+-spec ret_err(_, _) -> no_return().
 ret_err(L, S) ->
     {location,Location} = get_attribute(L, location),
     return_error(Location, S).
@@ -846,10 +868,11 @@ mapl(F, [H|T]) ->
 mapl(_, []) ->
 	[].
 
-%% normalise(AbsTerm)
-%% abstract(Term)
 %%  Convert between the abstract form of a term and a term.
 
+-spec normalise(AbsTerm) -> Data when
+      AbsTerm :: abstract_expr(),
+      Data :: term().
 normalise({char,_,C}) -> C;
 normalise({integer,_,I}) -> I;
 normalise({float,_,F}) -> F;
@@ -887,6 +910,9 @@ normalise_list([H|T]) ->
 normalise_list([]) ->
     [].
 
+-spec abstract(Data) -> AbsTerm when
+      Data :: term(),
+      AbsTerm :: abstract_expr().
 abstract(T) when is_integer(T) -> {integer,0,T};
 abstract(T) when is_float(T) -> {float,0,T};
 abstract(T) when is_atom(T) -> {atom,0,T};
@@ -955,13 +981,18 @@ abstract_list([H|T], Line) ->
 abstract_list([], _Line) ->
     [].
 
-%% tokens(AbsTerm) -> [Token]
-%% tokens(AbsTerm, More) -> [Token]
 %%  Generate a list of tokens representing the abstract term.
 
+-spec tokens(AbsTerm) -> Tokens when
+      AbsTerm :: abstract_expr(),
+      Tokens :: [token()].
 tokens(Abs) ->
     tokens(Abs, []).
 
+-spec tokens(AbsTerm, MoreTokens) -> Tokens when
+      AbsTerm :: abstract_expr(),
+      MoreTokens :: [token()],
+      Tokens :: [token()].
 tokens({char,L,C}, More) -> [{char,L,C}|More];
 tokens({integer,L,N}, More) -> [{integer,L,N}|More];
 tokens({float,L,F}, More) -> [{float,L,F}|More];
diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl
index 66c80a45cb..7dc19f2e9b 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -31,25 +31,53 @@
 
 -define(MAXLINE, 72).
 
+-type(hook_function() :: none
+                       | fun((Expr :: erl_parse:abstract_expr(),
+                              CurrentIndentation :: integer(),
+                              CurrentPrecedence :: non_neg_integer(),
+                              HookFunction :: hook_function()) ->
+                                    io_lib:chars())).
+
 %%%
 %%% Exported functions
 %%%
 
+-spec(form(Form) -> io_lib:chars() when
+      Form :: erl_parse:abstract_form()).
+
 form(Thing) ->
     form(Thing, none).
 
+-spec(form(Form, HookFunction) -> io_lib:chars() when
+      Form :: erl_parse:abstract_form(),
+      HookFunction :: hook_function()).
+
 form(Thing, Hook) ->
     frmt(lform(Thing, Hook)).
 
+-spec(attribute(Attribute) -> io_lib:chars() when
+      Attribute :: erl_parse:abstract_form()).
+
 attribute(Thing) ->
     attribute(Thing, none).
 
+-spec(attribute(Attribute, HookFunction) -> io_lib:chars() when
+      Attribute :: erl_parse:abstract_form(),
+      HookFunction :: hook_function()).
+
 attribute(Thing, Hook) ->
     frmt(lattribute(Thing, Hook)).
 
+-spec(function(Function) -> io_lib:chars() when
+      Function :: erl_parse:abstract_form()).
+
 function(F) ->
     function(F, none).
 
+-spec(function(Function, HookFunction) -> io_lib:chars() when
+      Function :: erl_parse:abstract_form(),
+      HookFunction :: hook_function()).
+
 function(F, Hook) ->
     frmt(lfunction(F, Hook)).
 
@@ -59,30 +87,67 @@ rule(R) ->
 rule(R, Hook) ->
     frmt(lrule(R, Hook)).
 
+-spec(guard(Guard) -> io_lib:chars() when
+      Guard :: [erl_parse:abstract_expr()]).
+
 guard(Gs) ->
     guard(Gs, none).
 
+-spec(guard(Guard, HookFunction) -> io_lib:chars() when
+      Guard :: [erl_parse:abstract_expr()],
+      HookFunction :: hook_function()).
+
 guard(Gs, Hook) ->
     frmt(lguard(Gs, Hook)).
 
+-spec(exprs(Expressions) -> io_lib:chars() when
+      Expressions :: [erl_parse:abstract_expr()]).
+
 exprs(Es) ->
     exprs(Es, 0, none).
 
+-spec(exprs(Expressions, HookFunction) -> io_lib:chars() when
+      Expressions :: [erl_parse:abstract_expr()],
+      HookFunction :: hook_function()).
+
 exprs(Es, Hook) ->
     exprs(Es, 0, Hook).
 
+-spec(exprs(Expressions, Indent, HookFunction) -> io_lib:chars() when
+      Expressions :: [erl_parse:abstract_expr()],
+      Indent :: integer(),
+      HookFunction :: hook_function()).
+
 exprs(Es, I, Hook) ->
     frmt({seq,[],[],[$,],lexprs(Es, Hook)}, I).
 
+-spec(expr(Expression) -> io_lib:chars() when
+      Expression :: erl_parse:abstract_expr()).
+
 expr(E) ->
     frmt(lexpr(E, 0, none)).
 
+-spec(expr(Expression, HookFunction) -> io_lib:chars() when
+      Expression :: erl_parse:abstract_expr(),
+      HookFunction :: hook_function()).
+
 expr(E, Hook) ->
     frmt(lexpr(E, 0, Hook)).
 
+-spec(expr(Expression, Indent, HookFunction) -> io_lib:chars() when
+      Expression :: erl_parse:abstract_expr(),
+      Indent :: integer(),
+      HookFunction :: hook_function()).
+
 expr(E, I, Hook) ->
     frmt(lexpr(E, 0, Hook), I).
 
+-spec(expr(Expression, Indent, Precedence, HookFunction) -> io_lib:chars() when
+      Expression :: erl_parse:abstract_expr(),
+      Indent :: integer(),
+      Precedence :: non_neg_integer(),
+      HookFunction :: hook_function()).
+
 expr(E, I, P, Hook) ->
     frmt(lexpr(E, P, Hook), I).
 
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index 18f64c46d0..718ca2e91a 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -99,7 +99,8 @@
 
 %%----------------------------------------------------------------------------
 
--spec format_error(Error :: term()) -> string().
+-spec format_error(ErrorDescriptor) -> string() when
+      ErrorDescriptor :: error_description().
 format_error({string,Quote,Head}) ->
     lists:flatten(["unterminated " ++ string_thing(Quote) ++
                    " starting with " ++
@@ -112,20 +113,33 @@ format_error({base,Base}) ->
 format_error(Other) ->
     lists:flatten(io_lib:write(Other)).
 
--type string_return() :: {'ok', tokens(), location()}
-                       | {'error', error_info(), location()}.
-
--spec string(String :: string()) -> string_return().
+-spec string(String) -> Return when
+      String :: string(),
+      Return :: {'ok', Tokens :: tokens(), EndLocation}
+              | {'error', ErrorInfo :: error_info(), ErrorLocation},
+      EndLocation :: location(),
+      ErrorLocation :: location().
 string(String) ->
     string(String, 1, []).
 
--spec string(String :: string(), StartLocation :: location()) ->
-                   string_return().
+-spec string(String, StartLocation) -> Return when
+      String :: string(),
+      Return :: {'ok', Tokens :: tokens(), EndLocation}
+              | {'error', ErrorInfo :: error_info(), ErrorLocation},
+      StartLocation :: location(),
+      EndLocation :: location(),
+      ErrorLocation :: location().
 string(String, StartLocation) ->
     string(String, StartLocation, []).
 
--spec string(String :: string(), StartLocation :: location(),
-             Options :: options()) -> string_return().
+-spec string(String, StartLocation, Options) -> Return when
+      String :: string(),
+      Options :: options(),
+      Return :: {'ok', Tokens :: tokens(), EndLocation}
+              | {'error', ErrorInfo :: error_info(), ErrorLocation},
+      StartLocation :: location(),
+      EndLocation :: location(),
+      ErrorLocation :: location().
 string(String, Line, Options) when ?STRING(String), ?ALINE(Line) ->
     string1(String, options(Options), Line, no_col, []);
 string(String, {Line,Column}, Options) when ?STRING(String),
@@ -136,29 +150,37 @@ string(String, {Line,Column}, Options) when ?STRING(String),
 -type char_spec() :: string() | 'eof'.
 -type cont_fun() :: fun((char_spec(), #erl_scan{}, line(), column(),
                          tokens(), any()) -> any()).
--opaque return_cont() :: {string(), column(), tokens(), line(),
-                          #erl_scan{}, cont_fun(), any()}.
--type cont() :: return_cont() | [].
--type tokens_result() :: {'ok', tokens(), location()}
-                       | {'eof', location()}
-                       | {'error', error_info(), location()}.
--type tokens_return() :: {'done', tokens_result(), char_spec()}
-                       | {'more', return_cont()}.
-
--spec tokens(Cont :: cont(), CharSpec :: char_spec(),
-             StartLocation :: location()) -> tokens_return().
+-opaque return_cont() :: {erl_scan_continuation,
+                          string(), column(), tokens(), line(),
+                          #erl_scan{}, any(), cont_fun()}.
+-type tokens_result() :: {'ok', Tokens :: tokens(), EndLocation :: location()}
+                       | {'eof', EndLocation :: location()}
+                       | {'error', ErrorInfo :: error_info(),
+                          EndLocation :: location()}.
+
+-spec tokens(Continuation, CharSpec, StartLocation) -> Return when
+      Continuation :: return_cont() | [],
+      CharSpec :: char_spec(),
+      StartLocation :: location(),
+      Return :: {'done',Result :: tokens_result(),LeftOverChars :: char_spec()}
+              | {'more', Continuation1 :: return_cont()}.
 tokens(Cont, CharSpec, StartLocation) ->
     tokens(Cont, CharSpec, StartLocation, []).
 
--spec tokens(Cont :: cont(), CharSpec :: char_spec(),
-             StartLocation :: location(), Options :: options()) ->
-          tokens_return().
+-spec tokens(Continuation, CharSpec, StartLocation, Options) -> Return when
+      Continuation :: return_cont() | [],
+      CharSpec :: char_spec(),
+      StartLocation :: location(),
+      Options :: options(),
+      Return :: {'done',Result :: tokens_result(),LeftOverChars :: char_spec()}
+              | {'more', Continuation1 :: return_cont()}.
 tokens([], CharSpec, Line, Options) when ?ALINE(Line) ->
     tokens1(CharSpec, options(Options), Line, no_col, [], fun scan/6, []);
 tokens([], CharSpec, {Line,Column}, Options) when ?ALINE(Line),
                                                   ?COLUMN(Column) ->
     tokens1(CharSpec, options(Options), Line, Column, [], fun scan/6, []);
-tokens({Cs,Col,Toks,Line,St,Any,Fun}, CharSpec, _Loc, _Opts) ->
+tokens({erl_scan_continuation,Cs,Col,Toks,Line,St,Any,Fun},
+       CharSpec, _Loc, _Opts) ->
     tokens1(Cs++CharSpec, St, Line, Col, Toks, Fun, Any).
 
 -type attribute_item() :: 'column' | 'length' | 'line'
@@ -172,13 +194,22 @@ tokens({Cs,Col,Toks,Line,St,Any,Fun}, CharSpec, _Loc, _Opts) ->
 -type token_info() :: {'category', category()} | {'symbol', symbol()}
                     | attribute_info().
 
--spec token_info(token()) -> [token_info()].
+-spec token_info(Token) -> TokenInfo when
+      Token :: token(),
+      TokenInfo :: [TokenInfoTuple :: token_info()].
 token_info(Token) ->
     Items = [category,column,length,line,symbol,text], % undefined order
     token_info(Token, Items).
 
--spec token_info(token(), token_item()) -> token_info() | 'undefined';
-                (token(), [token_item()]) -> [token_info()].
+-spec token_info(Token, TokenItem) -> TokenInfo | 'undefined' when
+      Token :: token(),
+      TokenItem :: token_item(),
+      TokenInfo :: TokenInfoTuple :: token_info();
+                (Token, TokenItems) -> [TokenInfo] when
+      Token :: token(),
+      TokenItems :: [TokenItem],
+      TokenItem :: token_item(),
+      TokenInfo :: [TokenInfoTuple :: token_info()].
 token_info(_Token, []) ->
     [];
 token_info(Token, [Item|Items]) when is_atom(Item) ->
@@ -201,14 +232,23 @@ token_info({_Category,Attrs}, Item) ->
 token_info({_Category,Attrs,_Symbol}, Item) ->
     attributes_info(Attrs, Item).
 
--spec attributes_info(attributes()) -> [attribute_info()].
+-spec attributes_info(Attributes) -> AttributesInfo when
+      Attributes :: attributes(),
+      AttributesInfo :: [AttributeInfoTuple :: attribute_info()].
 attributes_info(Attributes) ->
     Items = [column,length,line,text], % undefined order
     attributes_info(Attributes, Items).
 
--spec attributes_info(attributes(), attribute_item()) ->
-                        attribute_info() | 'undefined';
-                     (attributes(), [attribute_item()]) -> [attribute_info()].
+-spec attributes_info(Attributes, AttributeItem) ->
+                        AttributeInfo | 'undefined' when
+      Attributes :: attributes(),
+      AttributeItem :: attribute_item(),
+      AttributeInfo :: AttributeInfoTuple :: attribute_info();
+                     (Attributes, AttributeItems) -> [AttributeInfo] when
+      Attributes :: attributes(),
+      AttributeItems :: [AttributeItem],
+      AttributeItem :: attribute_item(),
+      AttributeInfo :: [AttributeInfoTuple :: attribute_info()].
 attributes_info(_Attrs, []) ->
     [];
 attributes_info(Attrs, [A|As]) when is_atom(A) ->
@@ -265,9 +305,10 @@ attributes_info(Attrs, text=Item) ->
 attributes_info(T1, T2) ->
     erlang:error(badarg, [T1,T2]).
 
--type setlineattr_fun() :: fun((info_line()) -> info_line()).
-
--spec set_attribute('line', attributes(), setlineattr_fun()) -> attributes().
+-spec set_attribute(AttributeItem, Attributes, SetAttributeFun) -> Attributes when
+      AttributeItem :: 'line',
+      Attributes :: attributes(),
+      SetAttributeFun :: fun((info_line()) -> info_line()).
 set_attribute(Tag, Attributes, Fun) when ?SETATTRFUN(Fun) ->
     set_attr(Tag, Attributes, Fun).
 
@@ -374,7 +415,7 @@ set_attr(T1, T2, T3) ->
 tokens1(Cs, St, Line, Col, Toks, Fun, Any) when ?STRING(Cs); Cs =:= eof ->
     case Fun(Cs, St, Line, Col, Toks, Any) of
         {more,{Cs0,Ncol,Ntoks,Nline,Nany,Nfun}} ->
-            {more,{Cs0,Ncol,Ntoks,Nline,St,Nany,Nfun}};
+            {more,{erl_scan_continuation,Cs0,Ncol,Ntoks,Nline,St,Nany,Nfun}};
         {ok,Toks0,eof,Nline,Ncol} ->
             Res = case Toks0 of
                       [] ->
@@ -1285,7 +1326,7 @@ tabs(8)  ->  "\t\t\t\t\t\t\t\t";
 tabs(9)  ->  "\t\t\t\t\t\t\t\t\t";
 tabs(10) ->  "\t\t\t\t\t\t\t\t\t\t".
 
--spec reserved_word(atom()) -> boolean().
+-spec reserved_word(Atom :: atom()) -> boolean().
 reserved_word('after') -> true;
 reserved_word('begin') -> true;
 reserved_word('case') -> true;
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index 6e6e949e2c..afa914a456 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -42,7 +42,7 @@
 
 -export([i/0, i/1, i/2, i/3]).
 
--export_type([tab/0, tid/0]).
+-export_type([tab/0, tid/0, match_spec/0]).
 
 %%-----------------------------------------------------------------------------
 
@@ -51,22 +51,9 @@
 %% a similar definition is also in erl_types
 -opaque tid()      :: integer().
 
--type ext_info()   :: 'md5sum' | 'object_count'.
--type protection() :: 'private' | 'protected' | 'public'.
--type type()       :: 'bag' | 'duplicate_bag' | 'ordered_set' | 'set'.
-
--type table_info() :: {'name', atom()}
-		    | {'type', type()}
-		    | {'protection', protection()}
-		    | {'named_table', boolean()}
-		    | {'keypos', non_neg_integer()}
-		    | {'size', non_neg_integer()}
-		    | {'extended_info', [ext_info()]}
-		    | {'version', {non_neg_integer(), non_neg_integer()}}.
-
 %% these ones are also defined in erl_bif_types
 -type match_pattern() :: atom() | tuple().
--type match_specs()   :: [{match_pattern(), [_], [_]}].
+-type match_spec()    :: [{match_pattern(), [_], [_]}].
 
 %%-----------------------------------------------------------------------------
 
@@ -86,6 +73,7 @@
 %% insert/2
 %% is_compiled_ms/1
 %% last/1
+%% member/2
 %% next/2
 %% prev/2
 %% rename/2
@@ -101,11 +89,14 @@
 %% select/1
 %% select/2
 %% select/3
+%% select_count/2
 %% select_reverse/1
 %% select_reverse/2
 %% select_reverse/3
 %% select_delete/2
+%% setopts/2
 %% update_counter/3
+%% update_element/3
 %%
 
 -opaque comp_match_spec() :: any().  %% this one is REALLY opaque
@@ -119,7 +110,9 @@ match_spec_run(List, CompiledMS) ->
                       | {tab(),integer(),integer(),binary(),list(),integer()}
                       | {tab(),_,_,integer(),binary(),list(),integer(),integer()}.
 
--spec repair_continuation(continuation(), match_specs()) -> continuation().
+-spec repair_continuation(Continuation, MatchSpec) -> Continuation when
+      Continuation :: continuation(),
+      MatchSpec :: match_spec().
 
 %% $end_of_table is an allowed continuation in ets...
 repair_continuation('$end_of_table', _) ->
@@ -153,7 +146,9 @@ repair_continuation(Untouched = {Table,N1,N2,Bin,L,N3}, MS)
 	    {Table,N1,N2,ets:match_spec_compile(MS),L,N3}
     end.
 
--spec fun2ms(function()) -> match_specs().
+-spec fun2ms(LiteralFun) -> MatchSpec when
+      LiteralFun :: function(),
+      MatchSpec :: match_spec().
 
 fun2ms(ShellFun) when is_function(ShellFun) ->
     %% Check that this is really a shell fun...
@@ -177,7 +172,13 @@ fun2ms(ShellFun) when is_function(ShellFun) ->
                            shell]}})
     end.
 
--spec foldl(fun((_, term()) -> term()), term(), tab()) -> term().
+-spec foldl(Function, Acc0, Tab) -> Acc1 when
+      Function :: fun((Element :: term(), AccIn) -> AccOut),
+      Tab :: tab(),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term().
 
 foldl(F, Accu, T) ->
     ets:safe_fixtable(T, true),
@@ -198,7 +199,13 @@ do_foldl(F, Accu0, Key, T) ->
 		     ets:next(T, Key), T)
     end.
 
--spec foldr(fun((_, term()) -> term()), term(), tab()) -> term().
+-spec foldr(Function, Acc0, Tab) -> Acc1 when
+      Function :: fun((Element :: term(), AccIn) -> AccOut),
+      Tab :: tab(),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term().
 
 foldr(F, Accu, T) ->
     ets:safe_fixtable(T, true),
@@ -219,7 +226,9 @@ do_foldr(F, Accu0, Key, T) ->
 		     ets:prev(T, Key), T)
     end.
 
--spec from_dets(tab(), dets:tab_name()) -> 'true'.
+-spec from_dets(Tab, DetsTab) -> 'true' when
+      Tab :: tab(),
+      DetsTab :: dets:tab_name().
 
 from_dets(EtsTable, DetsTable) ->
     case (catch dets:to_ets(DetsTable, EtsTable)) of
@@ -235,7 +244,9 @@ from_dets(EtsTable, DetsTable) ->
 	    erlang:error(Unexpected,[EtsTable,DetsTable])
     end.
 
--spec to_dets(tab(), dets:tab_name()) -> dets:tab_name().
+-spec to_dets(Tab, DetsTab) -> DetsTab when
+      Tab :: tab(),
+      DetsTab :: dets:tab_name().
 
 to_dets(EtsTable, DetsTable) ->
     case (catch dets:from_ets(DetsTable, EtsTable)) of
@@ -251,8 +262,11 @@ to_dets(EtsTable, DetsTable) ->
 	    erlang:error(Unexpected,[EtsTable,DetsTable])
     end.
 
--spec test_ms(tuple(), match_specs()) ->
-	{'ok', term()} | {'error', [{'warning'|'error', string()}]}.
+-spec test_ms(Tuple, MatchSpec) -> {'ok', Result} | {'error', Errors} when
+      Tuple :: tuple(),
+      MatchSpec :: match_spec(),
+      Result :: term(),
+      Errors :: [{'warning'|'error', string()}].
 
 test_ms(Term, MS) ->
     case erlang:match_spec_test(Term, MS, table) of
@@ -262,7 +276,11 @@ test_ms(Term, MS) ->
 	    Error
     end.
 
--spec init_table(tab(), fun(('read' | 'close') -> term())) -> 'true'.
+-spec init_table(Tab, InitFun) -> 'true' when
+      Tab :: tab(),
+      InitFun :: fun((Arg) -> Res),
+      Arg :: 'read' | 'close',
+      Res :: 'end_of_input' | {Objects :: [term()], InitFun} | term().
 
 init_table(Table, Fun) ->
     ets:delete_all_objects(Table),
@@ -287,7 +305,9 @@ init_table_sub(Table, [H|T]) ->
     ets:insert(Table, H),
     init_table_sub(Table, T).
 
--spec match_delete(tab(), match_pattern()) -> 'true'.
+-spec match_delete(Tab, Pattern) -> 'true' when
+      Tab :: tab(),
+      Pattern :: match_pattern().
 
 match_delete(Table, Pattern) ->
     ets:select_delete(Table, [{Pattern,[],[true]}]),
@@ -295,7 +315,9 @@ match_delete(Table, Pattern) ->
 
 %% Produce a list of tuples from a table
 
--spec tab2list(tab()) -> [tuple()].
+-spec tab2list(Tab) -> [Object] when
+      Tab :: tab(),
+      Object :: tuple().
 
 tab2list(T) ->
     ets:match_object(T, '_').
@@ -334,15 +356,21 @@ do_filter(Tab, Key, F, A, Ack) ->
 	  md5sum       = false :: boolean()     
 	 }).
 
--type fname()      :: string() | atom().
--type t2f_option() :: {'extended_info', [ext_info()]}.
-
--spec tab2file(tab(), fname()) -> 'ok' | {'error', term()}.
+-spec tab2file(Tab, Filename) -> 'ok' | {'error', Reason} when
+      Tab :: tab(),
+      Filename :: file:name(),
+      Reason :: term().
 
 tab2file(Tab, File) ->
     tab2file(Tab, File, []).
 
--spec tab2file(tab(), fname(), [t2f_option()]) -> 'ok' | {'error', term()}.
+-spec tab2file(Tab, Filename, Options) -> 'ok' | {'error', Reason} when
+      Tab :: tab(),
+      Filename :: file:name(),
+      Options :: [Option],
+      Option :: {'extended_info', [ExtInfo]},
+      ExtInfo :: 'md5sum' | 'object_count',
+      Reason :: term().
 
 tab2file(Tab, File, Options) ->
     try
@@ -501,14 +529,20 @@ parse_ft_info_options(_,Malformed) ->
 %% Opt := {verify,boolean()}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--type f2t_option() :: {'verify', boolean()}.
-
--spec file2tab(fname()) -> {'ok', tab()} | {'error', term()}.
+-spec file2tab(Filename) -> {'ok', Tab} | {'error', Reason} when
+      Filename :: file:name(),
+      Tab :: tab(),
+      Reason :: term().
 
 file2tab(File) ->
     file2tab(File, []).
 
--spec file2tab(fname(), [f2t_option()]) -> {'ok', tab()} | {'error', term()}.
+-spec file2tab(Filename, Options) -> {'ok', Tab} | {'error', Reason} when
+      Filename :: file:name(),
+      Tab :: tab(),
+      Options :: [Option],
+      Option :: {'verify', boolean()},
+      Reason :: term().
 
 file2tab(File, Opts) ->
     try
@@ -895,7 +929,22 @@ named_table(false) -> [].
 %% information
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec tabfile_info(fname()) -> {'ok', [table_info()]} | {'error', term()}.
+-spec tabfile_info(Filename) -> {'ok', TableInfo} | {'error', Reason} when
+      Filename :: file:name(),
+      TableInfo :: [InfoItem],
+      InfoItem :: {'name', atom()}
+                | {'type', Type}
+                | {'protection', Protection}
+                | {'named_table', boolean()}
+                | {'keypos', non_neg_integer()}
+                | {'size', non_neg_integer()}
+                | {'extended_info', [ExtInfo]}
+                | {'version', {Major :: non_neg_integer(),
+                               Minor :: non_neg_integer()}},
+      ExtInfo :: 'md5sum' | 'object_count',
+      Type :: 'bag' | 'duplicate_bag' | 'ordered_set' | 'set',
+      Protection :: 'private' | 'protected' | 'public',
+      Reason :: term().
 
 tabfile_info(File) when is_list(File) ; is_atom(File) ->
     try
@@ -932,20 +981,22 @@ tabfile_info(File) when is_list(File) ; is_atom(File) ->
 	    {error,ExReason}
     end.
 
--type qlc__query_handle() :: term().  %% XXX: belongs in 'qlc'
-
--type num_objects()  :: 'default' | pos_integer().
--type trav_method()  :: 'first_next' | 'last_prev'
-                      | 'select' | {'select', match_specs()}.
--type table_option() :: {'n_objects', num_objects()}
-                      | {'traverse', trav_method()}.
-
--spec table(tab()) -> qlc__query_handle().
+-spec table(Tab) -> QueryHandle when
+      Tab :: tab(),
+      QueryHandle :: qlc:query_handle().
 
 table(Tab) ->
     table(Tab, []).
 
--spec table(tab(), table_option() | [table_option()]) -> qlc__query_handle().
+-spec table(Tab, Options) -> QueryHandle when
+      Tab :: tab(),
+      QueryHandle :: qlc:query_handle(),
+      Options :: [Option] | Option,
+      Option :: {'n_objects', NObjects}
+              | {'traverse', TraverseMethod},
+      NObjects :: 'default' | pos_integer(),
+      TraverseMethod :: 'first_next' | 'last_prev'
+                      | 'select' | {'select', MatchSpec :: match_spec()}.
 
 table(Tab, Opts) ->
     case options(Opts, [traverse, n_objects]) of
@@ -1135,7 +1186,8 @@ to_string(X) ->
     lists:flatten(io_lib:format("~p", [X])).
 
 %% view a specific table
--spec i(tab()) -> 'ok'.
+-spec i(Tab) -> 'ok' when
+      Tab :: tab().
 
 i(Tab) ->
     i(Tab, 40).
diff --git a/lib/stdlib/src/file_sorter.erl b/lib/stdlib/src/file_sorter.erl
index 2a5b08b581..3f31852afc 100644
--- a/lib/stdlib/src/file_sorter.erl
+++ b/lib/stdlib/src/file_sorter.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -50,12 +50,68 @@
 %%% Exported functions
 %%%
 
+-export_type([reason/0]).
+
+-type(file_name() :: file:name()).
+-type(file_names() :: [file:name()]).
+-type(i_command() :: read | close).
+-type(i_reply() :: end_of_input | {end_of_input, value()}
+                 | {[object()], infun()} | input_reply()).
+-type(infun() :: fun((i_command()) -> i_reply())).
+-type(input() :: file_names() | infun()).
+-type(input_reply() :: term()).
+-type(o_command() :: {value, value()} | [object()] | close).
+-type(o_reply() :: outfun() | output_reply()).
+-type(object() :: term() | binary()).
+-type(outfun() :: fun((o_command()) -> o_reply())).
+-type(output() :: file_name() | outfun()).
+-type(output_reply() :: term()).
+-type(value() :: term()).
+
+-type(options() :: [option()] | option()).
+-type(option() :: {compressed, boolean()}
+                | {header, header_length()}
+                | {format, format()}
+                | {no_files, no_files()}
+                | {order, order()}
+                | {size, size()}
+                | {tmpdir, tmp_directory()}
+                | {unique, boolean()}).
+-type(format() :: binary_term | term | binary | format_fun()).
+-type(format_fun() :: fun((binary()) -> term())).
+-type(header_length() :: pos_integer()).
+-type(key_pos() :: pos_integer() | [pos_integer()]).
+-type(no_files() :: pos_integer()). % > 1
+-type(order() :: ascending | descending | order_fun()).
+-type(order_fun() :: fun((term(), term()) -> boolean())).
+-type(size() :: non_neg_integer()).
+-type(tmp_directory() :: [] | file:name()).
+
+-type(reason() :: bad_object
+                | {bad_object, file_name()}
+                | {bad_term, file_name()}
+                | {file_error, file_name(),
+                   file:posix() | badarg | system_limit}
+                | {premature_eof, file_name()}).
+
+-spec(sort(FileName) -> Reply when
+      FileName :: file_name(),
+      Reply :: ok | {error, reason()} | input_reply() | output_reply()).
 sort(FileName) ->
     sort([FileName], FileName).
 
+-spec(sort(Input, Output) -> Reply when
+      Input :: input(),
+      Output :: output(),
+      Reply :: ok | {error, reason()} | input_reply() | output_reply()).
 sort(Input, Output) ->
     sort(Input, Output, []).
 
+-spec(sort(Input, Output, Options) -> Reply when
+      Input :: input(),
+      Output :: output(),
+      Options :: options(),
+      Reply :: ok | {error, reason()} | input_reply() | output_reply()).
 sort(Input0, Output0, Options) ->
     case {is_input(Input0), maybe_output(Output0), options(Options)}  of
         {{true,Input}, {true,Output}, #opts{}=Opts} -> 
@@ -64,12 +120,27 @@ sort(Input0, Output0, Options) ->
             badarg(culprit(tuple_to_list(T)), [Input0, Output0, Options])
     end.
 
+-spec(keysort(KeyPos, FileName) -> Reply when
+      KeyPos :: key_pos(),
+      FileName :: file_name(),
+      Reply :: ok | {error, reason()} | input_reply() | output_reply()).
 keysort(KeyPos, FileName) ->
     keysort(KeyPos, [FileName], FileName).
 
+-spec(keysort(KeyPos, Input, Output) -> Reply when
+      KeyPos :: key_pos(),
+      Input :: input(),
+      Output :: output(),
+      Reply :: ok | {error, reason()} | input_reply() | output_reply()).
 keysort(KeyPos, Input, Output) ->
     keysort(KeyPos, Input, Output, []).
 
+-spec(keysort(KeyPos, Input, Output, Options) -> Reply when
+      KeyPos :: key_pos(),
+      Input :: input(),
+      Output :: output(),
+      Options :: options(),
+      Reply :: ok | {error, reason()} | input_reply() | output_reply()).
 keysort(KeyPos, Input0, Output0, Options) ->
     R = case {is_keypos(KeyPos), is_input(Input0), 
               maybe_output(Output0), options(Options)} of
@@ -89,9 +160,18 @@ keysort(KeyPos, Input0, Output0, Options) ->
             badarg(culprit(O), [KeyPos, Input0, Output0, Options])
     end.
 
+-spec(merge(FileNames, Output) -> Reply when
+      FileNames :: file_names(),
+      Output :: output(),
+      Reply :: ok | {error, reason()} | output_reply()).
 merge(Files, Output) ->
     merge(Files, Output, []).
 
+-spec(merge(FileNames, Output, Options) -> Reply when
+      FileNames :: file_names(),
+      Output :: output(),
+      Options :: options(),
+      Reply :: ok | {error, reason()} | output_reply()).
 merge(Files0, Output0, Options) ->
     case {is_files(Files0), maybe_output(Output0), options(Options)} of
         %% size not used
@@ -101,9 +181,20 @@ merge(Files0, Output0, Options) ->
             badarg(culprit(tuple_to_list(T)), [Files0, Output0, Options])
     end.
 
+-spec(keymerge(KeyPos, FileNames, Output) -> Reply when
+      KeyPos :: key_pos(),
+      FileNames :: file_names(),
+      Output :: output(),
+      Reply :: ok | {error, reason()} | output_reply()).
 keymerge(KeyPos, Files, Output) ->
     keymerge(KeyPos, Files, Output, []).
 
+-spec(keymerge(KeyPos, FileNames, Output, Options) -> Reply when
+      KeyPos :: key_pos(),
+      FileNames :: file_names(),
+      Output :: output(),
+      Options :: options(),
+      Reply :: ok | {error, reason()} | output_reply()).
 keymerge(KeyPos, Files0, Output0, Options) ->
     R = case {is_keypos(KeyPos), is_files(Files0), 
               maybe_output(Output0), options(Options)} of
@@ -123,9 +214,21 @@ keymerge(KeyPos, Files0, Output0, Options) ->
             badarg(culprit(O), [KeyPos, Files0, Output0, Options])
     end.
 
+-spec(check(FileName) -> Reply when
+      FileName :: file_name(),
+      Reply :: {ok, [Result]} | {error, reason()},
+      Result :: {FileName, TermPosition, term()},
+      TermPosition :: pos_integer()).
 check(FileName) ->
     check([FileName], []).
 
+-spec(check(FileNames, Options) -> Reply when
+      FileNames :: file_names(),
+      Options :: options(),
+      Reply :: {ok, [Result]} | {error, reason()},
+      Result :: {FileName, TermPosition, term()},
+      FileName :: file_name(),
+      TermPosition :: pos_integer()).
 check(Files0, Options) ->
     case {is_files(Files0), options(Options)} of
         {{true,Files}, #opts{}=Opts} ->
@@ -134,9 +237,23 @@ check(Files0, Options) ->
             badarg(culprit(tuple_to_list(T)), [Files0, Options])
     end.
 
+-spec(keycheck(KeyPos, FileName) -> Reply when
+      KeyPos :: key_pos(),
+      FileName :: file_name(),
+      Reply :: {ok, [Result]} | {error, reason()},
+      Result :: {FileName, TermPosition, term()},
+      TermPosition :: pos_integer()).
 keycheck(KeyPos, FileName) ->
     keycheck(KeyPos, [FileName], []).
 
+-spec(keycheck(KeyPos, FileNames, Options) -> Reply when
+      KeyPos :: key_pos(),
+      FileNames :: file_names(),
+      Options :: options(),
+      Reply :: {ok, [Result]} | {error, reason()},
+      Result :: {FileName, TermPosition, term()},
+      FileName :: file_name(),
+      TermPosition :: pos_integer()).
 keycheck(KeyPos, Files0, Options) ->
     R = case {is_keypos(KeyPos), is_files(Files0), options(Options)} of
             {_, _, #opts{format = binary}} -> 
diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl
index c845b61204..d532cea187 100644
--- a/lib/stdlib/src/filelib.erl
+++ b/lib/stdlib/src/filelib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -40,13 +40,19 @@
 		erlang:error(UnUsUalVaRiAbLeNaMe)
 	end).
 
+-type filename() :: file:name().
+-type dirname() :: filename().
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec wildcard(file:name()) -> [file:filename()].
+-spec wildcard(Wildcard) -> [file:filename()] when
+      Wildcard :: filename() | dirname().
 wildcard(Pattern) when is_list(Pattern) ->
     ?HANDLE_ERROR(do_wildcard(Pattern, file)).
 
--spec wildcard(file:name(), file:name() | atom()) -> [file:filename()].
+-spec wildcard(Wildcard, Cwd) -> [file:filename()] when
+      Wildcard :: filename() | dirname(),
+      Cwd :: dirname().
 wildcard(Pattern, Cwd) when is_list(Pattern), (is_list(Cwd) or is_binary(Cwd)) ->
     ?HANDLE_ERROR(do_wildcard(Pattern, Cwd, file));
 wildcard(Pattern, Mod) when is_list(Pattern), is_atom(Mod) ->
@@ -57,7 +63,8 @@ wildcard(Pattern, Cwd, Mod)
   when is_list(Pattern), (is_list(Cwd) or is_binary(Cwd)), is_atom(Mod) ->
     ?HANDLE_ERROR(do_wildcard(Pattern, Cwd, Mod)).
 
--spec is_dir(file:name()) -> boolean().
+-spec is_dir(Name) -> boolean() when
+      Name :: filename() | dirname().
 is_dir(Dir) ->
     do_is_dir(Dir, file).
 
@@ -65,7 +72,8 @@ is_dir(Dir) ->
 is_dir(Dir, Mod) when is_atom(Mod) ->
     do_is_dir(Dir, Mod).
 
--spec is_file(file:name()) -> boolean().
+-spec is_file(Name) -> boolean() when
+      Name :: filename() | dirname().
 is_file(File) ->
     do_is_file(File, file).
 
@@ -73,7 +81,8 @@ is_file(File) ->
 is_file(File, Mod) when is_atom(Mod) ->
     do_is_file(File, Mod).
 
--spec is_regular(file:name()) -> boolean().
+-spec is_regular(Name) -> boolean() when
+      Name :: filename().
 is_regular(File) ->
     do_is_regular(File, file).
     
@@ -81,7 +90,13 @@ is_regular(File) ->
 is_regular(File, Mod) when is_atom(Mod) ->
     do_is_regular(File, Mod).
     
--spec fold_files(file:name(), string(), boolean(), fun((_,_) -> _), _) -> _.
+-spec fold_files(Dir, RegExp, Recursive, Fun, AccIn) -> AccOut when
+      Dir :: dirname(),
+      RegExp :: string(),
+      Recursive :: boolean(),
+      Fun :: fun((F :: file:filename(), AccIn) -> AccOut),
+      AccIn :: term(),
+      AccOut :: term().
 fold_files(Dir, RegExp, Recursive, Fun, Acc) ->
     do_fold_files(Dir, RegExp, Recursive, Fun, Acc, file).
 
@@ -89,7 +104,8 @@ fold_files(Dir, RegExp, Recursive, Fun, Acc) ->
 fold_files(Dir, RegExp, Recursive, Fun, Acc, Mod) when is_atom(Mod) ->
     do_fold_files(Dir, RegExp, Recursive, Fun, Acc, Mod).
 
--spec last_modified(file:name()) -> file:date_time() | 0.
+-spec last_modified(Name) -> file:date_time() | 0 when
+      Name :: filename() | dirname().
 last_modified(File) ->
     do_last_modified(File, file).
 
@@ -97,7 +113,8 @@ last_modified(File) ->
 last_modified(File, Mod) when is_atom(Mod) ->
     do_last_modified(File, Mod).
 
--spec file_size(file:name()) -> non_neg_integer().
+-spec file_size(Filename) -> non_neg_integer() when
+      Filename :: filename().
 file_size(File) ->
     do_file_size(File, file).
 
@@ -237,7 +254,9 @@ do_file_size(File, Mod) ->
 %% +type X = filename() | dirname()
 %% ensures that the directory name required to create D exists
 
--spec ensure_dir(file:name()) -> 'ok' | {'error', file:posix()}.
+-spec ensure_dir(Name) -> 'ok' | {'error', Reason} when
+      Name :: filename() | dirname(),
+      Reason :: file:posix().
 ensure_dir("/") ->
     ok;
 ensure_dir(F) ->
diff --git a/lib/stdlib/src/filename.erl b/lib/stdlib/src/filename.erl
index 24abf1e977..1cb9e4a25e 100644
--- a/lib/stdlib/src/filename.erl
+++ b/lib/stdlib/src/filename.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -61,12 +61,15 @@
 %% (for WIN32): absname("/") -> "D:/"
 
 
--spec absname(file:name()) -> file:filename().
+-spec absname(Filename) -> file:filename() when
+      Filename :: file:name().
 absname(Name) ->
     {ok, Cwd} = file:get_cwd(),
     absname(Name, Cwd).
 
--spec absname(file:name(), file:filename()) -> file:filename().
+-spec absname(Filename, Dir) -> file:filename() when
+      Filename :: file:name(),
+      Dir :: file:filename().
 absname(Name, AbsBase) when is_binary(Name), is_list(AbsBase) ->
     absname(Name,filename_string_to_binary(AbsBase));
 absname(Name, AbsBase) when is_list(Name), is_binary(AbsBase) ->
@@ -119,7 +122,9 @@ absname_vr([[X, $:]|Name], _, _AbsBase) ->
 %% This is just a join/2, but assumes that 
 %% AbsBase must be absolute and Name must be relative.
 
--spec absname_join(file:filename(), file:name()) -> file:filename().
+-spec absname_join(Dir, Filename) -> file:filename() when
+      Dir :: file:filename(),
+      Filename :: file:name().
 absname_join(AbsBase, Name) ->
     join(AbsBase, flatten(Name)).
 
@@ -131,7 +136,8 @@ absname_join(AbsBase, Name) ->
 %%           basename("/usr/foo/") -> "foo"  (trailing slashes ignored)
 %%           basename("/") -> []
 
--spec basename(file:name()) -> file:filename().
+-spec basename(Filename) -> file:filename() when
+      Filename :: file:name().
 basename(Name) when is_binary(Name) ->
     case os:type() of
 	{win32,_} ->
@@ -192,7 +198,9 @@ skip_prefix(Name, _) ->
 %%	    rootname(basename("xxx.jam")) -> "xxx"
 %%	    rootname(basename("xxx.erl")) -> "xxx"
 
--spec basename(file:name(), file:name()) -> file:filename().
+-spec basename(Filename, Ext) -> file:filename() when
+      Filename :: file:name(),
+      Ext :: file:name().
 basename(Name, Ext) when is_binary(Name), is_list(Ext) ->
     basename(Name,filename_string_to_binary(Ext));
 basename(Name, Ext) when is_list(Name), is_binary(Ext) ->
@@ -240,7 +248,8 @@ basename([], _Ext, Tail, _DrvSep2) ->
 %% Example: dirname("/usr/src/kalle.erl") -> "/usr/src",
 %%	    dirname("kalle.erl") -> "."
 
--spec dirname(file:name()) -> file:filename().
+-spec dirname(Filename) -> file:filename() when
+      Filename :: file:name().
 dirname(Name) when is_binary(Name) ->
     {Dsep,Drivesep} = separators(),
     SList = case Dsep of
@@ -332,7 +341,8 @@ dirjoin1([H|T],Acc,Sep) ->
 %%
 %% On Windows:  fn:dirname("\\usr\\src/kalle.erl") -> "/usr/src"
 
--spec extension(file:name()) -> file:filename().
+-spec extension(Filename) -> file:filename() when
+      Filename :: file:name().
 extension(Name) when is_binary(Name) ->
     {Dsep,_} = separators(),
     SList = case Dsep of
@@ -374,7 +384,8 @@ extension([], Result, _OsType) ->
 
 %% Joins a list of filenames with directory separators.
 
--spec join([file:filename()]) -> file:filename().
+-spec join(Components) -> file:filename() when
+      Components :: [file:filename()].
 join([Name1, Name2|Rest]) ->
     join([join(Name1, Name2)|Rest]);
 join([Name]) when is_list(Name) ->
@@ -386,7 +397,9 @@ join([Name]) when is_atom(Name) ->
 
 %% Joins two filenames with directory separators.
 
--spec join(file:filename(), file:filename()) -> file:filename().
+-spec join(Name1, Name2) -> file:filename() when
+      Name1 :: file:filename(),
+      Name2 :: file:filename().
 join(Name1, Name2) when is_list(Name1), is_list(Name2) ->
     OsType = major_os_type(),
     case pathtype(Name2) of
@@ -494,7 +507,8 @@ append(Dir, Name) ->
 %%		current working volume.  (Windows only)
 %%		Example: a:bar.erl, /temp/foo.erl
 
--spec pathtype(file:name()) -> 'absolute' | 'relative' | 'volumerelative'.
+-spec pathtype(Path) -> 'absolute' | 'relative' | 'volumerelative' when
+      Path :: file:name().
 pathtype(Atom) when is_atom(Atom) ->
     pathtype(atom_to_list(Atom));
 pathtype(Name) when is_list(Name) or is_binary(Name) ->
@@ -547,7 +561,8 @@ win32_pathtype(_) 		  -> relative.
 %% Examples: rootname("/jam.src/kalle") -> "/jam.src/kalle"
 %%           rootname("/jam.src/foo.erl") -> "/jam.src/foo"
 
--spec rootname(file:name()) -> file:filename().
+-spec rootname(Filename) -> file:filename() when
+      Filename :: file:name().
 rootname(Name) when is_binary(Name) ->
     list_to_binary(rootname(binary_to_list(Name))); % No need to handle unicode, . is < 128
 rootname(Name0) ->
@@ -576,7 +591,9 @@ rootname([], Root, _Ext, _OsType) ->
 %% Examples: rootname("/jam.src/kalle.jam", ".erl") -> "/jam.src/kalle.jam"
 %%           rootname("/jam.src/foo.erl", ".erl") -> "/jam.src/foo"
 
--spec rootname(file:name(), file:name()) -> file:filename().
+-spec rootname(Filename, Ext) -> file:filename() when
+      Filename :: file:name(),
+      Ext :: file:name().
 rootname(Name, Ext) when is_binary(Name), is_binary(Ext) ->
     list_to_binary(rootname(binary_to_list(Name),binary_to_list(Ext)));
 rootname(Name, Ext) when is_binary(Name) ->
@@ -602,7 +619,9 @@ rootname2([Char|Rest], Ext, Result) when is_integer(Char) ->
 %% split("foo/bar") -> ["foo", "bar"]
 %% split("a:\\msdev\\include") -> ["a:/", "msdev", "include"]
 
--spec split(file:name()) -> [file:filename()].
+-spec split(Filename) -> Components when
+      Filename :: file:name(),
+      Components :: [file:filename()].
 split(Name) when is_binary(Name) ->
     case os:type() of
 	{win32, _} -> win32_splitb(Name);
@@ -695,7 +714,8 @@ split([], Comp, Components, OsType) ->
 %% will be converted to backslashes.  On all platforms, the
 %% name will be normalized as done by join/1.
 
--spec nativename(file:filename()) -> file:filename().
+-spec nativename(Path) -> file:filename() when
+      Path :: file:filename().
 nativename(Name0) ->
     Name = join([Name0]),			%Normalize.
     case os:type() of
@@ -747,12 +767,17 @@ separators() ->
 %% The paths in the {outdir, Path} and {i, Path} options are guaranteed
 %% to be absolute.
 
--type rule()   :: {string(), string()}.
--type ecode()  :: 'non_existing' | 'preloaded' | 'interpreted'.
--type option() :: {'i', string()} | {'outdir', string()} | {'d', atom()}.
-
--spec find_src(atom() | string()) ->
-	     {string(), [option()]} | {'error', {ecode(), atom()}}.
+-spec find_src(Beam) -> {SourceFile, Options}
+                      | {error, {ErrorReason, Module}} when
+      Beam :: Module | Filename,
+      Filename :: atom() | string(),
+      Module :: module(),
+      SourceFile :: string(),
+      Options :: [Option],
+      Option :: {'i', Path :: string()}
+              | {'outdir', Path :: string()}
+              | {'d', atom()},
+      ErrorReason :: 'non_existing' | 'preloaded' | 'interpreted'.
 find_src(Mod) ->
     Default = [{"", ""}, {"ebin", "src"}, {"ebin", "esrc"}],
     Rules = 
@@ -763,8 +788,18 @@ find_src(Mod) ->
 	end,
     find_src(Mod, Rules).
 
--spec find_src(atom() | string(), [rule()]) ->
-	     {string(), [option()]} | {'error', {ecode(), atom()}}.
+-spec find_src(Beam, Rules) -> {SourceFile, Options}
+                             | {error, {ErrorReason, Module}} when
+      Beam :: Module | Filename,
+      Filename :: atom() | string(),
+      Rules :: [{BinSuffix :: string(), SourceSuffix :: string()}],
+      Module :: module(),
+      SourceFile :: string(),
+      Options :: [Option],
+      Option :: {'i', Path :: string()}
+              | {'outdir', Path :: string()}
+              | {'d', atom()},
+      ErrorReason :: 'non_existing' | 'preloaded' | 'interpreted'.
 find_src(Mod, Rules) when is_atom(Mod) ->
     find_src(atom_to_list(Mod), Rules);
 find_src(File0, Rules) when is_list(File0) ->
@@ -890,7 +925,8 @@ major_os_type() ->
 %% flatten(List)
 %%  Flatten a list, also accepting atoms.
 
--spec flatten(file:name()) -> file:filename().
+-spec flatten(Filename) -> file:filename() when
+      Filename :: file:name().
 flatten(Bin) when is_binary(Bin) ->
     Bin;
 flatten(List) ->
diff --git a/lib/stdlib/src/gb_sets.erl b/lib/stdlib/src/gb_sets.erl
index fc5beb28b0..91d21d869c 100644
--- a/lib/stdlib/src/gb_sets.erl
+++ b/lib/stdlib/src/gb_sets.erl
@@ -197,6 +197,7 @@
 %% Some types.
 
 -type gb_set_node() :: 'nil' | {term(), _, _}.
+-opaque iter() :: [gb_set_node()].
 
 %% A declaration equivalent to the following is currently hard-coded
 %% in erl_types.erl
@@ -205,38 +206,47 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec empty() -> gb_set().
+-spec empty() -> Set when
+      Set :: gb_set().
 
 empty() ->
     {0, nil}.
 
--spec new() -> gb_set().
+-spec new() -> Set when
+      Set :: gb_set().
 
 new() -> empty().
 
--spec is_empty(gb_set()) -> boolean().
+-spec is_empty(Set) -> boolean() when
+      Set :: gb_set().
 
 is_empty({0, nil}) ->
     true;
 is_empty(_) ->
     false.
 
--spec size(gb_set()) -> non_neg_integer().
+-spec size(Set) -> non_neg_integer() when
+      Set :: gb_set().
 
 size({Size, _}) ->
     Size.
 
--spec singleton(term()) -> gb_set().
+-spec singleton(Element) -> gb_set() when
+      Element :: term().
 
 singleton(Key) ->
     {1, {Key, nil, nil}}.
 
--spec is_element(term(), gb_set()) -> boolean().
+-spec is_element(Element, Set) -> boolean() when
+      Element :: term(),
+      Set :: gb_set().
 
 is_element(Key, S) ->
     is_member(Key, S).
 
--spec is_member(term(), gb_set()) -> boolean().
+-spec is_member(Element, Set) -> boolean() when
+      Element :: term(),
+      Set :: gb_set().
 
 is_member(Key, {_, T}) ->
     is_member_1(Key, T).
@@ -250,7 +260,10 @@ is_member_1(_, {_, _, _}) ->
 is_member_1(_, nil) ->
     false.
 
--spec insert(term(), gb_set()) -> gb_set().
+-spec insert(Element, Set1) -> Set2 when
+      Element :: term(),
+      Set1 :: gb_set(),
+      Set2 :: gb_set().
 
 insert(Key, {S, T}) ->
     S1 = S + 1,
@@ -306,7 +319,9 @@ count({_, Sm, Bi}) ->
 count(nil) ->
     {1, 0}.
 
--spec balance(gb_set()) -> gb_set().
+-spec balance(Set1) -> Set2 when
+      Set1 :: gb_set(),
+      Set2 :: gb_set().
 
 balance({S, T}) ->
     {S, balance(T, S)}.
@@ -331,12 +346,18 @@ balance_list_1([Key | L], 1) ->
 balance_list_1(L, 0) ->
     {nil, L}.
 
--spec add_element(term(), gb_set()) -> gb_set().
+-spec add_element(Element, Set1) -> Set2 when
+      Element :: term(),
+      Set1 :: gb_set(),
+      Set2 :: gb_set().
 
 add_element(X, S) ->
     add(X, S).
 
--spec add(term(), gb_set()) -> gb_set().
+-spec add(Element, Set1) -> Set2 when
+      Element :: term(),
+      Set1 :: gb_set(),
+      Set2 :: gb_set().
 
 add(X, S) ->
     case is_member(X, S) of
@@ -346,23 +367,33 @@ add(X, S) ->
 	    insert(X, S)
     end.
 
--spec from_list([term()]) -> gb_set().
+-spec from_list(List) -> Set when
+      List :: [term()],
+      Set :: gb_set().
 
 from_list(L) ->
     from_ordset(ordsets:from_list(L)).
 
--spec from_ordset([term()]) -> gb_set().
+-spec from_ordset(List) -> Set when
+      List :: [term()],
+      Set :: gb_set().
 
 from_ordset(L) ->
     S = length(L),
     {S, balance_list(L, S)}.
 
--spec del_element(term(), gb_set()) -> gb_set().
+-spec del_element(Element, Set1) -> Set2 when
+      Element :: term(),
+      Set1 :: gb_set(),
+      Set2 :: gb_set().
 
 del_element(Key, S) ->
     delete_any(Key, S).
 
--spec delete_any(term(), gb_set()) -> gb_set().
+-spec delete_any(Element, Set1) -> Set2 when
+      Element :: term(),
+      Set1 :: gb_set(),
+      Set2 :: gb_set().
 
 delete_any(Key, S) ->
     case is_member(Key, S) of
@@ -372,7 +403,10 @@ delete_any(Key, S) ->
  	    S
     end.
 
--spec delete(term(), gb_set()) -> gb_set().
+-spec delete(Element, Set1) -> Set2 when
+      Element :: term(),
+      Set1 :: gb_set(),
+      Set2 :: gb_set().
 
 delete(Key, {S, T}) ->
     {S - 1, delete_1(Key, T)}.
@@ -394,7 +428,10 @@ merge(Smaller, Larger) ->
     {Key, Larger1} = take_smallest1(Larger),
     {Key, Smaller, Larger1}.
 
--spec take_smallest(gb_set()) -> {term(), gb_set()}.
+-spec take_smallest(Set1) -> {Element, Set2} when
+      Set1 :: gb_set(),
+      Set2 :: gb_set(),
+      Element :: term().
 
 take_smallest({S, T}) ->
     {Key, Larger} = take_smallest1(T),
@@ -406,7 +443,8 @@ take_smallest1({Key, Smaller, Larger}) ->
     {Key1, Smaller1} = take_smallest1(Smaller),
     {Key1, {Key, Smaller1, Larger}}.
 
--spec smallest(gb_set()) -> term().
+-spec smallest(Set) -> term() when
+      Set :: gb_set().
 
 smallest({_, T}) ->
     smallest_1(T).
@@ -416,7 +454,10 @@ smallest_1({Key, nil, _Larger}) ->
 smallest_1({_Key, Smaller, _Larger}) ->
     smallest_1(Smaller).
 
--spec take_largest(gb_set()) -> {term(), gb_set()}.
+-spec take_largest(Set1) -> {Element, Set2} when
+      Set1 :: gb_set(),
+      Set2 :: gb_set(),
+      Element :: term().
 
 take_largest({S, T}) ->
     {Key, Smaller} = take_largest1(T),
@@ -428,7 +469,8 @@ take_largest1({Key, Smaller, Larger}) ->
     {Key1, Larger1} = take_largest1(Larger),
     {Key1, {Key, Smaller, Larger1}}.
 
--spec largest(gb_set()) -> term().
+-spec largest(Set) -> term() when
+      Set :: gb_set().
 
 largest({_, T}) ->
     largest_1(T).
@@ -438,7 +480,9 @@ largest_1({Key, _Smaller, nil}) ->
 largest_1({_Key, _Smaller, Larger}) ->
     largest_1(Larger).
 
--spec to_list(gb_set()) -> [term()].
+-spec to_list(Set) -> List when
+      Set :: gb_set(),
+      List :: [term()].
 
 to_list({_, T}) ->
     to_list(T, []).
@@ -449,7 +493,9 @@ to_list({Key, Small, Big}, L) ->
     to_list(Small, [Key | to_list(Big, L)]);
 to_list(nil, L) -> L.
 
--spec iterator(gb_set()) -> [term()].
+-spec iterator(Set) -> Iter when
+      Set :: gb_set(),
+      Iter :: iter().
 
 iterator({_, T}) ->
     iterator(T, []).
@@ -464,7 +510,10 @@ iterator({_, L, _} = T, As) ->
 iterator(nil, As) ->
     As.
 
--spec next([term()]) -> {term(), [term()]} | 'none'.
+-spec next(Iter1) -> {Element, Iter2} | 'none' when
+      Iter1 :: iter(),
+      Iter2 :: iter(),
+      Element :: term().
 
 next([{X, _, T} | As]) ->
     {X, iterator(T, As)};
@@ -494,7 +543,10 @@ next([]) ->
 %% traversing the elements can be devised, but they all have higher
 %% overhead.
 
--spec union(gb_set(), gb_set()) -> gb_set().
+-spec union(Set1, Set2) -> Set3 when
+      Set1 :: gb_set(),
+      Set2 :: gb_set(),
+      Set3 :: gb_set().
 
 union({N1, T1}, {N2, T2}) when N2 < N1 ->
     union(to_list_1(T2), N2, T1, N1);
@@ -596,7 +648,9 @@ balance_revlist_1([Key | L], 1) ->
 balance_revlist_1(L, 0) ->
     {nil, L}.
 
--spec union([gb_set()]) -> gb_set().
+-spec union(SetList) -> Set when
+      SetList :: [gb_set(),...],
+      Set :: gb_set().
 
 union([S | Ss]) ->
     union_list(S, Ss);
@@ -609,7 +663,10 @@ union_list(S, []) -> S.
 
 %% The rest is modelled on the above.
 
--spec intersection(gb_set(), gb_set()) -> gb_set().
+-spec intersection(Set1, Set2) -> Set3 when
+      Set1 :: gb_set(),
+      Set2 :: gb_set(),
+      Set3 :: gb_set().
 
 intersection({N1, T1}, {N2, T2}) when N2 < N1 ->
     intersection(to_list_1(T2), N2, T1, N1);
@@ -657,7 +714,9 @@ intersection_2([], _, As, S) ->
 intersection_2(_, [], As, S) ->
     {S, balance_revlist(As, S)}.
 
--spec intersection([gb_set(),...]) -> gb_set().
+-spec intersection(SetList) -> Set when
+      SetList :: [gb_set(),...],
+      Set :: gb_set().
 
 intersection([S | Ss]) ->
     intersection_list(S, Ss).
@@ -666,7 +725,9 @@ intersection_list(S, [S1 | Ss]) ->
     intersection_list(intersection(S, S1), Ss);
 intersection_list(S, []) -> S.
 
--spec is_disjoint(gb_set(), gb_set()) -> boolean().
+-spec is_disjoint(Set1, Set2) -> boolean() when
+      Set1 :: gb_set(),
+      Set2 :: gb_set().
 
 is_disjoint({N1, T1}, {N2, T2}) when N1 < N2 ->
     is_disjoint_1(T1, T2);
@@ -694,12 +755,18 @@ is_disjoint_1(_, nil) ->
 %% the sets. Therefore, we always build a new tree, and thus we need to
 %% traverse the whole element list of the left operand.
 
--spec subtract(gb_set(), gb_set()) -> gb_set().
+-spec subtract(Set1, Set2) -> Set3 when
+      Set1 :: gb_set(),
+      Set2 :: gb_set(),
+      Set3 :: gb_set().
 
 subtract(S1, S2) ->
     difference(S1, S2).
 
--spec difference(gb_set(), gb_set()) -> gb_set().
+-spec difference(Set1, Set2) -> Set3 when
+      Set1 :: gb_set(),
+      Set2 :: gb_set(),
+      Set3 :: gb_set().
 
 difference({N1, T1}, {N2, T2}) ->
     difference(to_list_1(T1), N1, T2, N2).
@@ -747,7 +814,9 @@ difference_2(Xs, [], As, S) ->
 %% Subset testing is much the same thing as set difference, but
 %% without the construction of a new set.
 
--spec is_subset(gb_set(), gb_set()) -> boolean().
+-spec is_subset(Set1, Set2) -> boolean() when
+      Set1 :: gb_set(),
+      Set2 :: gb_set().
 
 is_subset({N1, T1}, {N2, T2}) ->
     is_subset(to_list_1(T1), N1, T2, N2).
@@ -788,18 +857,28 @@ is_subset_2(_, []) ->
 
 %% For compatibility with `sets':
 
--spec is_set(term()) -> boolean().
+-spec is_set(Term) -> boolean() when
+      Term :: term().
 
 is_set({0, nil}) -> true;
 is_set({N, {_, _, _}}) when is_integer(N), N >= 0 -> true;
 is_set(_) -> false.
 
--spec filter(fun((term()) -> boolean()), gb_set()) -> gb_set().
+-spec filter(Pred, Set1) -> Set2 when
+      Pred :: fun((E :: term()) -> boolean()),
+      Set1 :: gb_set(),
+      Set2 :: gb_set().
 
 filter(F, S) ->
     from_ordset([X || X <- to_list(S), F(X)]).
 
--spec fold(fun((term(), term()) -> term()), term(), gb_set()) -> term().
+-spec fold(Function, Acc0, Set) -> Acc1 when
+      Function :: fun((E :: term(), AccIn) -> AccOut),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term(),
+      Set :: gb_set().
 
 fold(F, A, {_, T}) when is_function(F, 2) ->
     fold_1(F, A, T).
diff --git a/lib/stdlib/src/gb_trees.erl b/lib/stdlib/src/gb_trees.erl
index d37786a100..6ad861ff5b 100644
--- a/lib/stdlib/src/gb_trees.erl
+++ b/lib/stdlib/src/gb_trees.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -153,6 +153,7 @@
 %% Some types.
 
 -type gb_tree_node() :: 'nil' | {_, _, _, _}.
+-opaque iter() :: [gb_tree_node()].
 
 %% A declaration equivalent to the following is currently hard-coded
 %% in erl_types.erl
@@ -166,21 +167,26 @@
 empty() ->
     {0, nil}.
 
--spec is_empty(gb_tree()) -> boolean().
+-spec is_empty(Tree) -> boolean() when
+      Tree :: gb_tree().
 
 is_empty({0, nil}) ->
     true;
 is_empty(_) ->
     false.
 
--spec size(gb_tree()) -> non_neg_integer().
+-spec size(Tree) -> non_neg_integer() when
+      Tree :: gb_tree().
 
 size({Size, _}) when is_integer(Size), Size >= 0 ->
     Size.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec lookup(term(), gb_tree()) -> 'none' | {'value', term()}.
+-spec lookup(Key, Tree) -> 'none' | {'value', Val} when
+      Key :: term(),
+      Val :: term(),
+      Tree :: gb_tree().
 
 lookup(Key, {_, T}) ->
     lookup_1(Key, T).
@@ -205,7 +211,9 @@ lookup_1(_, nil) ->
 
 %% This is a specialized version of `lookup'.
 
--spec is_defined(term(), gb_tree()) -> boolean().
+-spec is_defined(Key, Tree) -> boolean() when
+      Key :: term(),
+      Tree :: gb_tree().
 
 is_defined(Key, {_, T}) ->
     is_defined_1(Key, T).
@@ -223,7 +231,10 @@ is_defined_1(_, nil) ->
 
 %% This is a specialized version of `lookup'.
 
--spec get(term(), gb_tree()) -> term().
+-spec get(Key, Tree) -> Val when
+      Key :: term(),
+      Tree :: gb_tree(),
+      Val :: term().
 
 get(Key, {_, T}) ->
     get_1(Key, T).
@@ -237,7 +248,11 @@ get_1(_, {_, Value, _, _}) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec update(term(), term(), gb_tree()) -> gb_tree().
+-spec update(Key, Val, Tree1) -> Tree2 when
+      Key :: term(),
+      Val :: term(),
+      Tree1 :: gb_tree(),
+      Tree2 :: gb_tree().
 
 update(Key, Val, {S, T}) ->
     T1 = update_1(Key, Val, T),
@@ -254,7 +269,11 @@ update_1(Key, Value, {_, _, Smaller, Bigger}) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec insert(term(), term(), gb_tree()) -> gb_tree().
+-spec insert(Key, Val, Tree1) -> Tree2 when
+      Key :: term(),
+      Val :: term(),
+      Tree1 :: gb_tree(),
+      Tree2 :: gb_tree().
 
 insert(Key, Val, {S, T}) when is_integer(S) ->
     S1 = S+1,
@@ -303,7 +322,11 @@ insert_1(Key, _, _, _) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec enter(term(), term(), gb_tree()) -> gb_tree().
+-spec enter(Key, Val, Tree1) -> Tree2 when
+      Key :: term(),
+      Val :: term(),
+      Tree1 :: gb_tree(),
+      Tree2 :: gb_tree().
 
 enter(Key, Val, T) ->
     case is_defined(Key, T) of
@@ -326,7 +349,9 @@ count(nil) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec balance(gb_tree()) -> gb_tree().
+-spec balance(Tree1) -> Tree2 when
+      Tree1 :: gb_tree(),
+      Tree2 :: gb_tree().
 
 balance({S, T}) ->
     {S, balance(T, S)}.
@@ -351,7 +376,9 @@ balance_list_1([{Key, Val} | L], 1) ->
 balance_list_1(L, 0) ->
     {nil, L}.
 
--spec from_orddict([{_,_}]) -> gb_tree().
+-spec from_orddict(List) -> Tree when
+      List :: [{Key :: term(), Val :: term()}],
+      Tree :: gb_tree().
 
 from_orddict(L) ->
     S = length(L),
@@ -359,7 +386,10 @@ from_orddict(L) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec delete_any(term(), gb_tree()) -> gb_tree().
+-spec delete_any(Key, Tree1) -> Tree2 when
+      Key :: term(),
+      Tree1 :: gb_tree(),
+      Tree2 :: gb_tree().
 
 delete_any(Key, T) ->
     case is_defined(Key, T) of
@@ -371,7 +401,10 @@ delete_any(Key, T) ->
 
 %%% delete. Assumes that key is present.
 
--spec delete(term(), gb_tree()) -> gb_tree().
+-spec delete(Key, Tree1) -> Tree2 when
+      Key :: term(),
+      Tree1 :: gb_tree(),
+      Tree2 :: gb_tree().
 
 delete(Key, {S, T}) when is_integer(S), S >= 0 ->
     {S - 1, delete_1(Key, T)}.
@@ -397,7 +430,11 @@ merge(Smaller, Larger) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec take_smallest(gb_tree()) -> {term(), term(), gb_tree()}.
+-spec take_smallest(Tree1) -> {Key, Val, Tree2} when
+      Tree1 :: gb_tree(),
+      Tree2 :: gb_tree(),
+      Key :: term(),
+      Val :: term().
 
 take_smallest({Size, Tree}) when is_integer(Size), Size >= 0 ->
     {Key, Value, Larger} = take_smallest1(Tree),
@@ -409,7 +446,10 @@ take_smallest1({Key, Value, Smaller, Larger}) ->
     {Key1, Value1, Smaller1} = take_smallest1(Smaller),
     {Key1, Value1, {Key, Value, Smaller1, Larger}}.
 
--spec smallest(gb_tree()) -> {term(), term()}.
+-spec smallest(Tree) -> {Key, Val} when
+      Tree :: gb_tree(),
+      Key :: term(),
+      Val :: term().
 
 smallest({_, Tree}) ->
     smallest_1(Tree).
@@ -419,7 +459,11 @@ smallest_1({Key, Value, nil, _Larger}) ->
 smallest_1({_Key, _Value, Smaller, _Larger}) ->
     smallest_1(Smaller).
 
--spec take_largest(gb_tree()) -> {term(), term(), gb_tree()}.
+-spec take_largest(Tree1) -> {Key, Val, Tree2} when
+      Tree1 :: gb_tree(),
+      Tree2 :: gb_tree(),
+      Key :: term(),
+      Val :: term().
 
 take_largest({Size, Tree}) when is_integer(Size), Size >= 0 ->
     {Key, Value, Smaller} = take_largest1(Tree),
@@ -431,7 +475,10 @@ take_largest1({Key, Value, Smaller, Larger}) ->
     {Key1, Value1, Larger1} = take_largest1(Larger),
     {Key1, Value1, {Key, Value, Smaller, Larger1}}.
 
--spec largest(gb_tree()) -> {term(), term()}.
+-spec largest(Tree) -> {Key, Val} when
+      Tree :: gb_tree(),
+      Key :: term(),
+      Val :: term().
 
 largest({_, Tree}) ->
     largest_1(Tree).
@@ -443,7 +490,10 @@ largest_1({_Key, _Value, _Smaller, Larger}) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec to_list(gb_tree()) -> [{term(), term()}].
+-spec to_list(Tree) -> [{Key, Val}] when
+      Tree :: gb_tree(),
+      Key :: term(),
+      Val :: term().
 			   
 to_list({_, T}) ->
     to_list(T, []).
@@ -456,7 +506,9 @@ to_list(nil, L) -> L.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec keys(gb_tree()) -> [term()].
+-spec keys(Tree) -> [Key] when
+      Tree :: gb_tree(),
+      Key :: term().
 
 keys({_, T}) ->
     keys(T, []).
@@ -467,7 +519,9 @@ keys(nil, L) -> L.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec values(gb_tree()) -> [term()].
+-spec values(Tree) -> [Val] when
+      Tree :: gb_tree(),
+      Val :: term().
 
 values({_, T}) ->
     values(T, []).
@@ -478,7 +532,9 @@ values(nil, L) -> L.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec iterator(gb_tree()) -> [gb_tree_node()].
+-spec iterator(Tree) -> Iter when
+      Tree :: gb_tree(),
+      Iter :: iter().
 
 iterator({_, T}) ->
     iterator_1(T).
@@ -496,7 +552,11 @@ iterator({_, _, L, _} = T, As) ->
 iterator(nil, As) ->
     As.
 
--spec next([gb_tree_node()]) -> 'none' | {term(), term(), [gb_tree_node()]}.
+-spec next(Iter1) -> 'none' | {Key, Val, Iter2} when
+      Iter1 :: iter(),
+      Iter2 :: iter(),
+      Key :: term(),
+      Val :: term().
 
 next([{X, V, _, T} | As]) ->
     {X, V, iterator(T, As)};
@@ -505,7 +565,10 @@ next([]) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec map(fun((term(), term()) -> term()), gb_tree()) -> gb_tree().
+-spec map(Function, Tree1) -> Tree2 when
+      Function :: fun((K :: term(), V1 :: term()) -> V2 :: term()),
+      Tree1 :: gb_tree(),
+      Tree2 :: gb_tree().
 
 map(F, {Size, Tree}) when is_function(F, 2) ->
     {Size, map_1(F, Tree)}.
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl
index b00910771f..1c4a73680b 100644
--- a/lib/stdlib/src/gen_event.erl
+++ b/lib/stdlib/src/gen_event.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -44,6 +44,9 @@
 	 system_code_change/4,
 	 format_status/2]).
 
+-export_type([handler/0, handler_args/0, add_handler_ret/0,
+              del_handler_ret/0]).
+
 -import(error_logger, [error_msg/2]).
 
 -define(reply(X), From ! {element(2,Tag), X}).
@@ -113,7 +116,11 @@ behaviour_info(_Other) ->
 
 %%---------------------------------------------------------------------------
 
--type handler()   :: atom() | {atom(), term()}.
+-type handler()          :: atom() | {atom(), term()}.
+-type handler_args()     :: term().
+-type add_handler_ret()  :: ok | term() | {'EXIT',term()}.
+-type del_handler_ret()  :: ok | term() | {'EXIT',term()}.
+
 -type emgr_name() :: {'local', atom()} | {'global', atom()}.
 -type emgr_ref()  :: atom() | {atom(), atom()} |  {'global', atom()} | pid().
 -type start_ret() :: {'ok', pid()} | {'error', term()}.
diff --git a/lib/stdlib/src/io.erl b/lib/stdlib/src/io.erl
index 6aeb076a0b..9f65bbfa3a 100644
--- a/lib/stdlib/src/io.erl
+++ b/lib/stdlib/src/io.erl
@@ -41,6 +41,7 @@
 
 -type error_description() :: term(). % Whatever the io-server sends.
 -type request_error() :: {'error',error_description()}.
+
 %% XXX: Some uses of line() in this file may need to read erl_scan:location()
 -type line()   :: pos_integer().
 
@@ -66,12 +67,15 @@ o_request(Io, Request, Func) ->
     end.
 
 %% Put chars takes mixed *unicode* list from R13 onwards.
--spec put_chars(iodata()) -> 'ok'.
+-spec put_chars(CharData) -> 'ok' when
+      CharData :: unicode:chardata().
 
 put_chars(Chars) ->
     put_chars(default_output(), Chars).
 
--spec put_chars(device(), iodata()) -> 'ok'.
+-spec put_chars(IoDevice, IoData) -> 'ok' when
+      IoDevice :: device(),
+      IoData :: unicode:chardata().
 
 put_chars(Io, Chars) ->
     o_request(Io, {put_chars,unicode,Chars}, put_chars).
@@ -81,7 +85,8 @@ put_chars(Io, Chars) ->
 nl() ->
     nl(default_output()).
 
--spec nl(device()) -> 'ok'.
+-spec nl(IoDevice) -> 'ok' when
+      IoDevice :: device().
 
 nl(Io) ->
 %    o_request(Io, {put_chars,io_lib:nl()}).
@@ -92,7 +97,8 @@ nl(Io) ->
 columns() ->
     columns(default_output()).
 
--spec columns(device()) -> {'ok', pos_integer()} | {'error', 'enotsup'}.
+-spec columns(IoDevice) -> {'ok', pos_integer()} | {'error', 'enotsup'} when
+      IoDevice :: device().
 
 columns(Io) ->
     case request(Io, {get_geometry,columns}) of
@@ -107,7 +113,8 @@ columns(Io) ->
 rows() ->
     rows(default_output()).
 
--spec rows(device()) -> {'ok', pos_integer()} | {'error', 'enotsup'}.
+-spec rows(IoDevice) -> {'ok', pos_integer()} | {'error', 'enotsup'} when
+      IoDevice :: device().
 
 rows(Io) ->
     case request(Io,{get_geometry,rows}) of
@@ -117,22 +124,36 @@ rows(Io) ->
 	    {error,enotsup}
     end.    
 
--spec get_chars(prompt(), non_neg_integer()) -> iodata() | 'eof'.
+-spec get_chars(Prompt, Count) -> Data | 'eof' when
+      Prompt :: prompt(),
+      Count :: non_neg_integer(),
+      Data :: [unicode:unicode_char()] | unicode:unicode_binary().
 
 get_chars(Prompt, N) ->
     get_chars(default_input(), Prompt, N).
 
--spec get_chars(device(), prompt(), non_neg_integer()) -> iodata() | 'eof'.
+-spec get_chars(IoDevice, Prompt, Count) -> Data | 'eof' | {error, Reason} when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      Count :: non_neg_integer(),
+      Reason :: term(),
+      Data :: [unicode:unicode_char()] | unicode:unicode_binary().
 
 get_chars(Io, Prompt, N) when is_integer(N), N >= 0 ->
     request(Io, {get_chars,unicode,Prompt,N}).
 
--spec get_line(prompt()) -> iodata() | 'eof' | {'error', term()}.
+-spec get_line(Prompt) -> Data | 'eof' | {'error', Reason} when
+      Prompt :: prompt(),
+      Reason :: term(),
+      Data :: [unicode:unicode_char()] | unicode:unicode_binary().
 
 get_line(Prompt) ->
     get_line(default_input(), Prompt).
 
--spec get_line(device(), prompt()) -> iodata() | 'eof' | {'error', term()}.
+-spec get_line(IoDevice, Prompt) -> Data | 'eof' | {'error', term()} when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      Data :: [unicode:unicode_char()] | unicode:unicode_binary().
 
 get_line(Io, Prompt) ->
     request(Io, {get_line,unicode,Prompt}).
@@ -156,46 +177,62 @@ get_password(Io) ->
 getopts() ->
     getopts(default_input()).
 
--spec getopts(device()) -> [opt_pair()].
+-spec getopts(IoDevice) -> [opt_pair()] when
+      IoDevice :: device().
 
 getopts(Io) ->
     request(Io, getopts).
 
 -type setopt() :: 'binary' | 'list' | opt_pair().
 
--spec setopts([setopt()]) -> 'ok' | {'error', term()}.
+-spec setopts(Opts) -> 'ok' | {'error', Reason} when
+      Opts :: [setopt()],
+      Reason :: term().
 
 setopts(Opts) ->
     setopts(default_input(), Opts).
 
--spec setopts(device(), [setopt()]) -> 'ok' | {'error', term()}.
+-spec setopts(IoDevice, Opts) -> 'ok' | {'error', Reason} when
+      IoDevice :: device(),
+      Opts :: [setopt()],
+      Reason :: term().
 
 setopts(Io, Opts) ->
     request(Io, {setopts, Opts}).
 
 %% Writing and reading Erlang terms.
 
--spec write(term()) -> 'ok'.
+-spec write(Term) -> 'ok' when
+      Term :: term().
 
 write(Term) ->
     write(default_output(), Term).
 
--spec write(device(), term()) -> 'ok'.
+-spec write(IoDevice, Term) -> 'ok' when
+      IoDevice :: device(),
+      Term :: term().
 
 write(Io, Term) ->
     o_request(Io, {write,Term}, write).
 
 
--spec read(prompt()) -> 
-    {'ok', term()} | 'eof' | {'error', erl_scan:error_info()}.
+-spec read(Prompt) -> Result when
+      Prompt :: prompt(),
+      Result :: {'ok', Term :: term()}
+              | 'eof'
+              | {'error', ErrorInfo :: erl_scan:error_info()}.
 
 % Read does not use get_until as erl_scan does not work with unicode
 % XXX:PaN fixme?
 read(Prompt) ->
     read(default_input(), Prompt).
 
--spec read(device(), prompt()) ->
-    {'ok', term()} | 'eof' | {'error', erl_scan:error_info()}.
+-spec read(IoDevice, Prompt) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      Result :: {'ok', Term :: term()}
+              | 'eof'
+              | {'error', ErrorInfo :: erl_scan:error_info()}.
 
 read(Io, Prompt) ->
     case request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[1]}) of
@@ -211,9 +248,13 @@ read(Io, Prompt) ->
 	    Other
     end.
 
--spec read(device(), prompt(), line()) ->
-    {'ok', term(), line()} | {'eof', line()} |
-    {'error', erl_scan:error_info(), line()}.
+-spec read(IoDevice, Prompt, StartLine) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      StartLine :: line(),
+      Result :: {'ok', Term :: term(), EndLine :: line()}
+              | {'eof', EndLine :: line()}
+              | {'error', ErrorInfo :: erl_scan:error_info(), ErrorLine :: line()}.
 
 read(Io, Prompt, StartLine) when is_integer(StartLine) ->
     case request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[StartLine]}) of
@@ -239,28 +280,40 @@ conv_reason(_, _Reason) -> badarg.
 
 -type format() :: atom() | string() | binary().
 
--spec fwrite(format()) -> 'ok'.
+-spec fwrite(Format) -> 'ok' when
+      Format :: format().
 
 fwrite(Format) ->
     format(Format).
 
--spec fwrite(format(), [term()]) -> 'ok'.
+-spec fwrite(Format, Data) -> 'ok' when
+      Format :: format(),
+      Data :: [term()].
 
 fwrite(Format, Args) ->
     format(Format, Args).
 
--spec fwrite(device(), format(), [term()]) -> 'ok'.
+-spec fwrite(IoDevice, Format, Data) -> 'ok' when
+      IoDevice :: device(),
+      Format :: format(),
+      Data :: [term()].
 
 fwrite(Io, Format, Args) ->
     format(Io, Format, Args).
 
--spec fread(prompt(), format()) -> {'ok', [term()]} | 'eof' | {'error',term()}.
+-spec fread(Prompt, Format) -> Result when
+      Prompt :: prompt(),
+      Format :: format(),
+      Result :: {'ok', Terms :: [term()]} | 'eof' | {'error', What :: term()}.
 
 fread(Prompt, Format) ->
     fread(default_input(), Prompt, Format).
 
--spec fread(device(), prompt(), format()) -> 
-    {'ok', [term()]} | 'eof' | {'error',term()}.
+-spec fread(IoDevice, Prompt, Format) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      Format :: format(),
+      Result :: {'ok', Terms :: [term()]} | 'eof' | {'error', What :: term()}.
 
 fread(Io, Prompt, Format) ->
     case request(Io, {fread,Prompt,Format}) of
@@ -270,73 +323,104 @@ fread(Io, Prompt, Format) ->
 	    Other
     end.
 
--spec format(format()) -> 'ok'.
+-spec format(Format) -> 'ok' when
+      Format :: format().
 
 format(Format) ->
     format(Format, []).
 
--spec format(format(), [term()]) -> 'ok'.
+-spec format(Format, Data) -> 'ok' when
+      Format :: format(),
+      Data :: [term()].
 
 format(Format, Args) ->
     format(default_output(), Format, Args).
 
--spec format(device(), format(), [term()]) -> 'ok'.
+-spec format(IoDevice, Format, Data) -> 'ok' when
+      IoDevice :: device(),
+      Format :: format(),
+      Data :: [term()].
 
 format(Io, Format, Args) ->
     o_request(Io, {format,Format,Args}, format).
 
 %% Scanning Erlang code.
 
--spec scan_erl_exprs(prompt()) -> erl_scan:tokens_result() | request_error().
+-spec scan_erl_exprs(Prompt) -> Result when
+      Prompt :: prompt(),
+      Result :: erl_scan:tokens_result() | request_error().
  
 scan_erl_exprs(Prompt) ->
     scan_erl_exprs(default_input(), Prompt, 1).
 
--spec scan_erl_exprs(device(), prompt()) -> erl_scan:tokens_result() | request_error().
+-spec scan_erl_exprs(Device, Prompt) -> Result when
+      Device :: device(),
+      Prompt :: prompt(),
+      Result :: erl_scan:tokens_result() | request_error().
 
 scan_erl_exprs(Io, Prompt) ->
     scan_erl_exprs(Io, Prompt, 1).
 
--spec scan_erl_exprs(device(), prompt(), line()) -> erl_scan:tokens_result() | request_error().
+-spec scan_erl_exprs(Device, Prompt, StartLine) -> Result when
+      Device :: device(),
+      Prompt :: prompt(),
+      StartLine :: line(),
+      Result :: erl_scan:tokens_result() | request_error().
 
 scan_erl_exprs(Io, Prompt, Pos0) ->
     request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0]}).
 
--spec scan_erl_form(prompt()) -> erl_scan:tokens_result() | request_error().
+-spec scan_erl_form(Prompt) -> Result when
+      Prompt :: prompt(),
+      Result :: erl_scan:tokens_result() | request_error().
 
 scan_erl_form(Prompt) ->
     scan_erl_form(default_input(), Prompt, 1).
 
--spec scan_erl_form(device(), prompt()) -> erl_scan:tokens_result() | request_error().
+-spec scan_erl_form(IoDevice, Prompt) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      Result :: erl_scan:tokens_result() | request_error().
 
 scan_erl_form(Io, Prompt) ->
     scan_erl_form(Io, Prompt, 1).
 
--spec scan_erl_form(device(), prompt(), line()) -> erl_scan:tokens_result() | request_error().
+-spec scan_erl_form(IoDevice, Prompt, StartLine) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      StartLine :: line(),
+      Result :: erl_scan:tokens_result() | request_error().
 
 scan_erl_form(Io, Prompt, Pos0) ->
     request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0]}).
 
 %% Parsing Erlang code.
 
--type erl_parse_expr_list() :: [_]. %% XXX: should be imported from erl_parse
-
--type parse_ret() :: {'ok', erl_parse_expr_list(), line()}
-                   | {'eof', line()}
-                   | {'error', erl_scan:error_info(), line()}
+-type parse_ret() :: {'ok', ExprList :: erl_parse:abstract_expr(), EndLine :: line()}
+                   | {'eof', EndLine :: line()}
+                   | {'error', ErrorInfo :: erl_scan:error_info(), ErrorLine :: line()}
                    | request_error().
 
--spec parse_erl_exprs(prompt()) -> parse_ret().
+-spec parse_erl_exprs(Prompt) -> Result when
+      Prompt :: prompt(),
+      Result :: parse_ret().
 
 parse_erl_exprs(Prompt) ->
     parse_erl_exprs(default_input(), Prompt, 1).
 
--spec parse_erl_exprs(device(), prompt()) -> parse_ret().
+-spec parse_erl_exprs(IoDevice, Prompt) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      Result :: parse_ret().
 
 parse_erl_exprs(Io, Prompt) ->
     parse_erl_exprs(Io, Prompt, 1).
 
--spec parse_erl_exprs(device(), prompt(), line()) -> parse_ret().
+-spec parse_erl_exprs(IoDevice, Prompt, StartLine) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      StartLine :: line(),
+      Result :: parse_ret().
 
 parse_erl_exprs(Io, Prompt, Pos0) ->
     case request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0]}) of
@@ -349,24 +433,31 @@ parse_erl_exprs(Io, Prompt, Pos0) ->
 	    Other
     end.
 
--type erl_parse_absform() :: _. %% XXX: should be imported from erl_parse
-
--type parse_form_ret() :: {'ok', erl_parse_absform(), line()}
-                        | {'eof', line()}
-                        | {'error', erl_scan:error_info(), line()}
+-type parse_form_ret() :: {'ok', AbsForm :: erl_parse:abstract_form(), EndLine :: line()}
+                        | {'eof', EndLine :: line()}
+                        | {'error', ErrorInfo :: erl_scan:error_info(), ErrorLine :: line()}
                         | request_error().
 
--spec parse_erl_form(prompt()) -> parse_form_ret().
+-spec parse_erl_form(Prompt) -> Result when
+      Prompt :: prompt(),
+      Result :: parse_form_ret().
 
 parse_erl_form(Prompt) ->
     parse_erl_form(default_input(), Prompt, 1).
 
--spec parse_erl_form(device(), prompt()) -> parse_form_ret().
+-spec parse_erl_form(IoDevice, Prompt) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      Result :: parse_form_ret().
 
 parse_erl_form(Io, Prompt) ->
     parse_erl_form(Io, Prompt, 1).
 
--spec parse_erl_form(device(), prompt(), line()) -> parse_form_ret().
+-spec parse_erl_form(IoDevice, Prompt, StartLine) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      StartLine :: line(),
+      Result :: parse_form_ret().
 
 parse_erl_form(Io, Prompt, Pos0) ->
     case request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0]}) of
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 4ca9d079b7..54c7283abf 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -75,35 +75,57 @@
 	 collect_line/2, collect_line/3, collect_line/4,
 	 get_until/3, get_until/4]).
 
--export_type([chars/0]).
+-export_type([chars/0, continuation/0]).
 
 %%----------------------------------------------------------------------
 
- %% XXX: overapproximates a deep list of (unicode) characters
--type chars() :: [_].
+-type chars() :: [char() | chars()].
 -type depth() :: -1 | non_neg_integer().
 
+-opaque continuation() :: {_, _, _, _}.  % XXX: refine
+
 %%----------------------------------------------------------------------
 
 %% Interface calls to sub-modules.
 
--spec fwrite(io:format(), [term()]) -> chars().
+-spec fwrite(Format, Data) -> chars() | UnicodeList when
+      Format :: io:format(),
+      Data :: [term()],
+      UnicodeList :: [unicode:unicode_char()],
+      Data :: [term()].
 
 fwrite(Format, Args) ->
     format(Format, Args).
 
--spec fread(string(), string()) -> io_lib_fread:fread_2_ret().
+-spec fread(Format, String) -> Result when
+      Format :: string(),
+      String :: string(),
+      Result :: {'ok', InputList :: chars(), LeftOverChars :: string()}
+              | {'more', RestFormat :: string(),
+                 Nchars :: non_neg_integer(),
+                 InputStack :: chars()}
+              | {'error', What :: term()}.
 
 fread(Chars, Format) ->
     io_lib_fread:fread(Chars, Format).
 
--spec fread(io_lib_fread:continuation(), string(), string()) ->
-        io_lib_fread:fread_3_ret().
+-spec fread(Continuation, String, Format) -> Return when
+      Continuation :: continuation() | [],
+      String :: string(),
+      Format :: string(),
+      Return :: {'more', Continuation1 :: continuation()}
+              | {'done', Result, LeftOverChars :: string()},
+      Result :: {'ok', InputList :: chars()}
+              | 'eof'
+              | {'error', What :: term()}.
 
 fread(Cont, Chars, Format) ->
     io_lib_fread:fread(Cont, Chars, Format).
 
--spec format(io:format(), [term()]) -> chars().
+-spec format(Format, Data) -> chars() | UnicodeList when
+      Format :: io:format(),
+      Data :: [term()],
+      UnicodeList :: [unicode:unicode_char()].
 
 format(Format, Args) ->
     case catch io_lib_format:fwrite(Format, Args) of
@@ -113,17 +135,24 @@ format(Format, Args) ->
 	    Other
     end.
 
--spec print(term()) -> chars().
+-spec print(Term) -> chars() when
+      Term :: term().
 
 print(Term) ->
     io_lib_pretty:print(Term).
 
--spec print(term(), non_neg_integer(), non_neg_integer(), depth()) -> chars().
+-spec print(Term, Column, LineLength, Depth) -> chars() when
+      Term :: term(),
+      Column :: non_neg_integer(),
+      LineLength :: non_neg_integer(),
+      Depth :: depth().
 
 print(Term, Column, LineLength, Depth) ->
     io_lib_pretty:print(Term, Column, LineLength, Depth).
 
--spec indentation(string(), integer()) -> integer().
+-spec indentation(String, StartIndent) -> integer() when
+      String :: string(),
+      StartIndent :: integer().
 
 indentation(Chars, Current) ->
     io_lib_format:indentation(Chars, Current).
@@ -158,7 +187,8 @@ format_prompt(Format, Args) ->
 %%  Return a (non-flattened) list of characters giving a printed
 %%  representation of the term. write/3 is for backward compatibility.
 
--spec write(term()) -> chars().
+-spec write(Term) -> chars() when
+      Term :: term().
 
 write(Term) -> write(Term, -1).
 
@@ -169,7 +199,9 @@ write(Term, D, true) ->
 write(Term, D, false) ->
     write(Term, D).
 
--spec write(term(), depth()) -> chars().
+-spec write(Term, Depth) -> chars() when
+      Term :: term(),
+      Depth :: depth().
 
 write(_Term, 0) -> "...";
 write(Term, _D) when is_integer(Term) -> integer_to_list(Term);
@@ -234,7 +266,8 @@ write_binary_body(B, _D) ->
 %% write_atom(Atom) -> [Char]
 %%  Generate the list of characters needed to print an atom.
 
--spec write_atom(atom()) -> chars().
+-spec write_atom(Atom) -> chars() when
+      Atom :: atom().
 
 write_atom(Atom) ->
     Chars = atom_to_list(Atom),
@@ -283,7 +316,8 @@ name_char(_) -> false.
 %% write_string([Char]) -> [Char]
 %%  Generate the list of characters needed to print a string.
 
--spec write_string(string()) -> chars().
+-spec write_string(String) -> chars() when
+      String :: string().
 
 write_string(S) ->
     write_string(S, $").   %"
@@ -330,7 +364,8 @@ string_char(_,C, _, Tail) when C < $\240->	%Other control characters.
 %%  Generate the list of characters needed to print a character constant.
 %%  Must special case SPACE, $\s, here.
 
--spec write_char(char()) -> chars().
+-spec write_char(Char) -> chars() when
+      Char :: char().
 
 write_char($\s) -> "$\\s";			%Must special case this.
 write_char(C) when is_integer(C), C >= $\000, C =< $\377 ->
@@ -346,7 +381,8 @@ write_unicode_char(Uni) ->
 %%  Return true if CharList is a (possibly deep) list of characters, else
 %%  false.
 
--spec char_list(term()) -> boolean().
+-spec char_list(Term) -> boolean() when
+      Term :: term().
 
 char_list([C|Cs]) when is_integer(C), C >= $\000, C =< $\377 ->
     char_list(Cs);
@@ -362,7 +398,8 @@ unicode_char_list([C|Cs]) when is_integer(C), C >= 0, C < 16#D800;
 unicode_char_list([]) -> true;
 unicode_char_list(_) -> false.			%Everything else is false
 
--spec deep_char_list(term()) -> boolean().
+-spec deep_char_list(Term) -> boolean() when
+      Term :: term().
 
 deep_char_list(Cs) ->
     deep_char_list(Cs, []).
@@ -399,7 +436,8 @@ deep_unicode_char_list(_, _More) ->		%Everything else is false
 %%  Return true if CharList is a list of printable characters, else
 %%  false.
 
--spec printable_list(term()) -> boolean().
+-spec printable_list(Term) -> boolean() when
+      Term :: term().
 
 printable_list([C|Cs]) when is_integer(C), C >= $\040, C =< $\176 ->
     printable_list(Cs);
diff --git a/lib/stdlib/src/io_lib_fread.erl b/lib/stdlib/src/io_lib_fread.erl
index 33553692bc..52aa4d073c 100644
--- a/lib/stdlib/src/io_lib_fread.erl
+++ b/lib/stdlib/src/io_lib_fread.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -22,36 +22,24 @@
 
 -export([fread/2,fread/3]).
 
--export_type([continuation/0, fread_2_ret/0, fread_3_ret/0]).
-
 -import(lists, [reverse/1,reverse/2]).
 
 %%-----------------------------------------------------------------------
-%% Local types
-%%-----------------------------------------------------------------------
-
--type done_arg2() :: {'ok', io_lib:chars()} | 'eof' | {'error', term()}.
-
-%%-----------------------------------------------------------------------
-%% Types also used in other files
-%%-----------------------------------------------------------------------
-
--type continuation() :: [] | {_, _, _, _}.  % XXX: refine
-
--type fread_2_ret()  :: {'ok', io_lib:chars(), string()}
-	              | {'more', string(), non_neg_integer(), io_lib:chars()}
-                      | {'error', term()}.
--type fread_3_ret()  :: {'more', continuation()}
-                      | {'done', done_arg2(), string()}.
-
-%%-----------------------------------------------------------------------
 
 %% fread(Continuation, CharList, FormatString)
 %%  This is the main function into the re-entrant formatted reader. It
 %%  repeatedly collects lines and calls fread/2 to format the input until
 %%  all the format string has been used. And it counts the characters.
 
--spec fread(io_lib_fread:continuation(), string(), string()) -> fread_3_ret().
+-spec fread(Continuation, String, Format) -> Return when
+      Continuation :: io_lib:continuation() |  [],
+      String :: string(),
+      Format :: string(),
+      Return :: {'more', Continuation1 :: io_lib:continuation()}
+              | {'done', Result, LeftOverChars :: string()},
+      Result :: {'ok', InputList :: io_lib:chars()}
+              | 'eof'
+              | {'error', What :: term()}.
 
 fread([], Chars, Format) ->
     %%io:format("FREAD: ~w `~s'~n", [Format,Chars]),
@@ -106,7 +94,14 @@ fread_line(Format0, Line, N0, Results0, More, Newline) ->
 %%   WHITE      Skip white space
 %%   X          Literal X
 
--spec fread(string(), string()) -> fread_2_ret().
+-spec fread(Format, String) -> Result when
+      Format :: string(),
+      String :: string(),
+      Result :: {'ok', InputList :: io_lib:chars(), LeftOverChars :: string()}
+              | {'more', RestFormat :: string(),
+                 Nchars :: non_neg_integer(),
+                 InputStack :: io_lib:chars()}
+              | {'error', What :: term()}.
 
 fread(Format, Line) ->
     fread(Format, Line, 0, []).
diff --git a/lib/stdlib/src/lib.erl b/lib/stdlib/src/lib.erl
index b2cfb00de9..c303ae60b5 100644
--- a/lib/stdlib/src/lib.erl
+++ b/lib/stdlib/src/lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -38,7 +38,9 @@ flush_receive() ->
 %%
 %% Functions for doing standard system format i/o.
 %%
--spec error_message(atom() | string() | binary(), [term()]) -> 'ok'.
+-spec error_message(Format, Args) -> 'ok' when
+      Format :: io:format(),
+      Args :: [term()].
 
 error_message(Format, Args) ->
     io:format(<<"** ~s **\n">>, [io_lib:format(Format, Args)]).
@@ -55,17 +57,23 @@ progname() ->
 	    no_prog_name
     end.
 
--spec nonl(string()) -> string().
+-spec nonl(String1) -> String2 when
+      String1 :: string(),
+      String2 :: string().
 
 nonl([10]) -> [];
 nonl([]) -> [];
 nonl([H|T]) -> [H|nonl(T)].
 
--spec send(pid() | atom() | {atom(), node()}, term()) -> term().
+-spec send(To, Msg) -> Msg when
+      To :: pid() | atom() | {atom(), node()},
+      Msg :: term().
 
 send(To, Msg) -> To ! Msg.
 
--spec sendw(pid() | atom() | {atom(), node()}, term()) -> term().
+-spec sendw(To, Msg) -> Msg when
+      To :: pid() | atom() | {atom(), node()},
+      Msg :: term().
 
 sendw(To, Msg) ->
     To ! {self(), Msg},
@@ -89,7 +97,7 @@ eval_str(Str) when is_list(Str) ->
 		true ->
 		    case erl_parse:parse_exprs(Toks) of
 			{ok, Exprs} ->
-			    case catch erl_eval:exprs(Exprs, []) of
+			    case catch erl_eval:exprs(Exprs, erl_eval:new_bindings()) of
 				{value, Val, _} ->
 				    {ok, Val};
 				Other ->
diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl
index c669c1f7c1..bba46e4cb6 100644
--- a/lib/stdlib/src/lists.erl
+++ b/lib/stdlib/src/lists.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -54,13 +54,21 @@
 
 %% append(X, Y) appends lists X and Y
 
--spec append([T], [T]) -> [T].
+-spec append(List1, List2) -> List3 when
+      List1 :: [T],
+      List2 :: [T],
+      List3 :: [T],
+      T :: term().
 
 append(L1, L2) -> L1 ++ L2.
 
 %% append(L) appends the list of lists L
 
--spec append([[T]]) -> [T].
+-spec append(ListOfLists) -> List1 when
+      ListOfLists :: [List],
+      List :: [T],
+      List1 :: [T],
+      T :: term().
 
 append([E]) -> E;
 append([H|T]) -> H ++ append(T);
@@ -68,13 +76,20 @@ append([]) -> [].
 
 %% subtract(List1, List2) subtract elements in List2 form List1.
 
--spec subtract([T], [T]) -> [T].
+-spec subtract(List1, List2) -> List3 when
+      List1 :: [T],
+      List2 :: [T],
+      List3 :: [T],
+      T :: term().
 
 subtract(L1, L2) -> L1 -- L2.
 
 %% reverse(L) reverse all elements in the list L. Is now a BIF!
 
--spec reverse([T]) -> [T].
+-spec reverse(List1) -> List2 when
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 reverse([] = L) ->
     L;
@@ -93,13 +108,21 @@ reverse([A, B | L]) ->
 %% nth(N, L) returns the N`th element of the list L
 %% nthtail(N, L) returns the N`th tail of the list L
 
--spec nth(pos_integer(), [T,...]) -> T.
+-spec nth(N, List) -> Elem when
+      N :: pos_integer(),
+      List :: [T,...],
+      Elem :: T,
+      T :: term().
 
 nth(1, [H|_]) -> H;
 nth(N, [_|T]) when N > 1 ->
     nth(N - 1, T).
 
--spec nthtail(non_neg_integer(), [T,...]) -> [T].
+-spec nthtail(N, List) -> Tail when
+      N :: non_neg_integer(),
+      List :: [T,...],
+      Tail :: [T],
+      T :: term().
 
 nthtail(1, [_|T]) -> T;
 nthtail(N, [_|T]) when N > 1 ->
@@ -108,7 +131,10 @@ nthtail(0, L) when is_list(L) -> L.
 
 %% prefix(Prefix, List) -> (true | false)
 
--spec prefix([T], [T]) -> boolean().
+-spec prefix(List1, List2) -> boolean() when
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 prefix([X|PreTail], [X|Tail]) ->
     prefix(PreTail, Tail);
@@ -117,7 +143,10 @@ prefix([_|_], List) when is_list(List) -> false.
 
 %% suffix(Suffix, List) -> (true | false)
 
--spec suffix([T], [T]) -> boolean().
+-spec suffix(List1, List2) -> boolean() when
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 suffix(Suffix, List) ->
     Delta = length(List) - length(Suffix),
@@ -125,7 +154,10 @@ suffix(Suffix, List) ->
 
 %% last(List) returns the last element in a list.
 
--spec last([T,...]) -> T.
+-spec last(List) -> Last when
+      List :: [T,...],
+      Last :: T,
+      T :: term().
 
 last([E|Es]) -> last(E, Es).
 
@@ -137,7 +169,10 @@ last(E, []) -> E.
 %%  returns the sequence Min..Max
 %%  Min <= Max and Min and Max must be integers
 
--spec seq(integer(), integer()) -> [integer()].
+-spec seq(From, To) -> Seq when
+      From :: integer(),
+      To :: integer(),
+      Seq :: [integer()].
 
 seq(First, Last)
     when is_integer(First), is_integer(Last), First-1 =< Last -> 
@@ -152,7 +187,11 @@ seq_loop(1, X, L) ->
 seq_loop(0, _, L) ->
      L.
 
--spec seq(integer(), integer(), integer()) -> [integer()].
+-spec seq(From, To, Incr) -> Seq when
+      From :: integer(),
+      To :: integer(),
+      Incr :: integer(),
+      Seq :: [integer()].
 
 seq(First, Last, Inc) 
     when is_integer(First), is_integer(Last), is_integer(Inc) -> 
@@ -178,7 +217,8 @@ seq_loop(0, _, _, L) ->
 
 %% sum(L) returns the sum of the elements in L
 
--spec sum([number()]) -> number().
+-spec sum(List) -> number() when
+      List :: [number()].
 
 sum(L)          -> sum(L, 0).
 
@@ -188,7 +228,11 @@ sum([], Sum)    -> Sum.
 %% duplicate(N, X) -> [X,X,X,.....,X]  (N times)
 %%   return N copies of X
 
--spec duplicate(non_neg_integer(), T) -> [T].
+-spec duplicate(N, Elem) -> List when
+      N :: non_neg_integer(),
+      Elem :: T,
+      List :: [T],
+      T :: term().
 
 duplicate(N, X) when is_integer(N), N >= 0 -> duplicate(N, X, []).
 
@@ -197,7 +241,10 @@ duplicate(N, X, L) -> duplicate(N-1, X, [X|L]).
 
 %% min(L) -> returns the minimum element of the list L
 
--spec min([T,...]) -> T.
+-spec min(List) -> Min when
+      List :: [T,...],
+      Min :: T,
+      T :: term().
 
 min([H|T]) -> min(T, H).
 
@@ -207,7 +254,10 @@ min([],    Min)              -> Min.
 
 %% max(L) -> returns the maximum element of the list L
 
--spec max([T,...]) -> T.
+-spec max(List) -> Max when
+      List :: [T,...],
+      Max :: T,
+      T :: term().
 
 max([H|T]) -> max(T, H).
 
@@ -218,12 +268,21 @@ max([],    Max)              -> Max.
 %% sublist(List, Start, Length)
 %%  Returns the sub-list starting at Start of length Length.
 
--spec sublist([T], pos_integer(), non_neg_integer()) -> [T].
+-spec sublist(List1, Start, Len) -> List2 when
+      List1 :: [T],
+      List2 :: [T],
+      Start :: pos_integer(),
+      Len :: non_neg_integer(),
+      T :: term().
 
 sublist(List, S, L) when is_integer(L), L >= 0 ->
     sublist(nthtail(S-1, List), L).
 
--spec sublist([T], non_neg_integer()) -> [T].
+-spec sublist(List1, Len) -> List2 when
+      List1 :: [T],
+      List2 :: [T],
+      Len :: non_neg_integer(),
+      T :: term().
 
 sublist(List, L) when is_integer(L), is_list(List) ->
     sublist_2(List, L).
@@ -238,7 +297,11 @@ sublist_2(List, L) when is_list(List), L > 0 ->
 %% delete(Item, List) -> List'
 %%  Delete the first occurrence of Item from the list L.
 
--spec delete(T, [T]) -> [T].
+-spec delete(Elem, List1) -> List2 when
+      Elem :: T,
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 delete(Item, [Item|Rest]) -> Rest;
 delete(Item, [H|Rest]) -> 
@@ -248,7 +311,12 @@ delete(_, []) -> [].
 %% Return [{X0, Y0}, {X1, Y1}, ..., {Xn, Yn}] for lists [X0, X1, ...,
 %% Xn] and [Y0, Y1, ..., Yn].
 
--spec zip([A], [B]) -> [{A, B}].
+-spec zip(List1, List2) -> List3 when
+      List1 :: [A],
+      List2 :: [B],
+      List3 :: [{A, B}],
+      A :: term(),
+      B :: term().
 
 zip([X | Xs], [Y | Ys]) -> [{X, Y} | zip(Xs, Ys)];
 zip([], []) -> [].
@@ -256,7 +324,12 @@ zip([], []) -> [].
 %% Return {[X0, X1, ..., Xn], [Y0, Y1, ..., Yn]}, for a list [{X0, Y0},
 %% {X1, Y1}, ..., {Xn, Yn}].
 
--spec unzip([{A, B}]) -> {[A], [B]}.
+-spec unzip(List1) -> {List2, List3} when
+      List1 :: [{A, B}],
+      List2 :: [A],
+      List3 :: [B],
+      A :: term(),
+      B :: term().
 
 unzip(Ts) -> unzip(Ts, [], []).
 
@@ -266,7 +339,14 @@ unzip([], Xs, Ys) -> {reverse(Xs), reverse(Ys)}.
 %% Return [{X0, Y0, Z0}, {X1, Y1, Z1}, ..., {Xn, Yn, Zn}] for lists [X0,
 %% X1, ..., Xn], [Y0, Y1, ..., Yn] and [Z0, Z1, ..., Zn].
 
--spec zip3([A], [B], [C]) -> [{A, B, C}].
+-spec zip3(List1, List2, List3) -> List4 when
+      List1 :: [A],
+      List2 :: [B],
+      List3 :: [C],
+      List4 :: [{A, B, C}],
+      A :: term(),
+      B :: term(),
+      C :: term().
 
 zip3([X | Xs], [Y | Ys], [Z | Zs]) -> [{X, Y, Z} | zip3(Xs, Ys, Zs)];
 zip3([], [], []) -> [].
@@ -274,7 +354,14 @@ zip3([], [], []) -> [].
 %% Return {[X0, X1, ..., Xn], [Y0, Y1, ..., Yn], [Z0, Z1, ..., Zn]}, for
 %% a list [{X0, Y0, Z0}, {X1, Y1, Z1}, ..., {Xn, Yn, Zn}].
 
--spec unzip3([{A, B, C}]) -> {[A], [B], [C]}.
+-spec unzip3(List1) -> {List2, List3, List4} when
+      List1 :: [{A, B, C}],
+      List2 :: [A],
+      List3 :: [B],
+      List4 :: [C],
+      A :: term(),
+      B :: term(),
+      C :: term().
 
 unzip3(Ts) -> unzip3(Ts, [], [], []).
 
@@ -286,7 +373,14 @@ unzip3([], Xs, Ys, Zs) ->
 %% Return [F(X0, Y0), F(X1, Y1), ..., F(Xn, Yn)] for lists [X0, X1, ...,
 %% Xn] and [Y0, Y1, ..., Yn].
 
--spec zipwith(fun((X, Y) -> R), [X], [Y]) -> [R].
+-spec zipwith(Combine, List1, List2) -> List3 when
+      Combine :: fun((X, Y) -> T),
+      List1 :: [X],
+      List2 :: [Y],
+      List3 :: [T],
+      X :: term(),
+      Y :: term(),
+      T :: term().
 
 zipwith(F, [X | Xs], [Y | Ys]) -> [F(X, Y) | zipwith(F, Xs, Ys)];
 zipwith(F, [], []) when is_function(F, 2) -> [].
@@ -294,7 +388,16 @@ zipwith(F, [], []) when is_function(F, 2) -> [].
 %% Return [F(X0, Y0, Z0), F(X1, Y1, Z1), ..., F(Xn, Yn, Zn)] for lists
 %% [X0, X1, ..., Xn], [Y0, Y1, ..., Yn] and [Z0, Z1, ..., Zn].
 
--spec zipwith3(fun((X, Y, Z) -> R), [X], [Y], [Z]) -> [R].
+-spec zipwith3(Combine, List1, List2, List3) -> List4 when
+      Combine :: fun((X, Y, Z) -> T),
+      List1 :: [X],
+      List2 :: [Y],
+      List3 :: [Z],
+      List4 :: [T],
+      X :: term(),
+      Y :: term(),
+      Z :: term(),
+      T :: term().
 
 zipwith3(F, [X | Xs], [Y | Ys], [Z | Zs]) ->
     [F(X, Y, Z) | zipwith3(F, Xs, Ys, Zs)];
@@ -303,7 +406,10 @@ zipwith3(F, [], [], []) when is_function(F, 3) -> [].
 %% sort(List) -> L
 %%  sorts the list L
 
--spec sort([T]) -> [T].
+-spec sort(List1) -> List2 when
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 sort([X, Y | L] = L0) when X =< Y ->
     case L of
@@ -350,7 +456,11 @@ sort_1(X, [], R) ->
 %% merge(List) -> L
 %%  merges a list of sorted lists
 
--spec merge([[T]]) -> [T].
+-spec merge(ListOfLists) -> List1 when
+      ListOfLists :: [List],
+      List :: [T],
+      List1 :: [T],
+      T :: term().
 
 merge(L) ->
     mergel(L, []).
@@ -358,7 +468,14 @@ merge(L) ->
 %% merge3(X, Y, Z) -> L
 %%  merges three sorted lists X, Y and Z
 
--spec merge3([X], [Y], [Z]) -> [(X | Y | Z)].
+-spec merge3(List1, List2, List3) -> List4 when
+      List1 :: [X],
+      List2 :: [Y],
+      List3 :: [Z],
+      List4 :: [(X | Y | Z)],
+      X :: term(),
+      Y :: term(),
+      Z :: term().
 
 merge3(L1, [], L3) ->
    merge(L1, L3);
@@ -382,7 +499,12 @@ rmerge3(L1, [H2 | T2], [H3 | T3]) ->
 %% merge(X, Y) -> L
 %%  merges two sorted lists X and Y
 
--spec merge([X], [Y]) -> [(X | Y)].
+-spec merge(List1, List2) -> List3 when
+      List1 :: [X],
+      List2 :: [Y],
+      List3 :: [(X | Y)],
+      X :: term(),
+      Y :: term().
 
 merge(T1, []) ->
     T1;
@@ -405,8 +527,9 @@ rmerge(T1, [H2 | T2]) ->
 %%  in L - the elements in L can be atoms, numbers of strings.
 %%  Returns a list of characters.
 
--type concat_thing() :: atom() | integer() | float() | string().
--spec concat([concat_thing()]) -> string().
+-spec concat(Things) -> string() when
+      Things :: [Thing],
+      Thing :: atom() | integer() | float() | string().
 
 concat(List) ->
     flatmap(fun thing_to_list/1, List).
@@ -420,12 +543,17 @@ thing_to_list(X) when is_list(X)    -> X.	%Assumed to be a string
 %% flatten(List, Tail)
 %%  Flatten a list, adding optional tail.
 
--spec flatten([term()]) -> [term()].
+-spec flatten(DeepList) -> List when
+      DeepList :: [term() | DeepList],
+      List :: [term()].
 
 flatten(List) when is_list(List) ->
     do_flatten(List, []).
 
--spec flatten([term()], [term()]) -> [term()].
+-spec flatten(DeepList, Tail) -> List when
+      DeepList :: [term() | DeepList],
+      Tail :: [term()],
+      List :: [term()].
 
 flatten(List, Tail) when is_list(List), is_list(Tail) ->
     do_flatten(List, Tail).
@@ -440,7 +568,8 @@ do_flatten([], Tail) ->
 %% flatlength(List)
 %%  Calculate the length of a list of lists.
 
--spec flatlength([term()]) -> non_neg_integer().
+-spec flatlength(DeepList) -> non_neg_integer() when
+      DeepList :: [term() | DeepList].
 
 flatlength(List) ->
     flatlength(List, 0).
@@ -481,7 +610,12 @@ flatlength([], L) -> L.
 %    keysearch3(Key, N, T);
 %keysearch3(Key, N, []) -> false.
 
--spec keydelete(term(), pos_integer(), [T]) -> [T] when T :: tuple().
+-spec keydelete(Key, N, TupleList1) -> TupleList2 when
+      Key :: term(),
+      N :: pos_integer(),
+      TupleList1 :: [Tuple],
+      TupleList2 :: [Tuple],
+      Tuple :: tuple().
 
 keydelete(K, N, L) when is_integer(N), N > 0 ->
     keydelete3(K, N, L).
@@ -491,7 +625,12 @@ keydelete3(Key, N, [H|T]) ->
     [H|keydelete3(Key, N, T)];
 keydelete3(_, _, []) -> [].
 
--spec keyreplace(term(), pos_integer(), [tuple()], tuple()) -> [tuple()].
+-spec keyreplace(Key, N, TupleList1, NewTuple) -> TupleList2 when
+      Key :: term(),
+      N :: pos_integer(),
+      TupleList1 :: [tuple()],
+      TupleList2 :: [tuple()],
+      NewTuple :: tuple().
 
 keyreplace(K, N, L, New) when is_integer(N), N > 0, is_tuple(New) ->
     keyreplace3(K, N, L, New).
@@ -502,8 +641,12 @@ keyreplace3(Key, Pos, [H|T], New) ->
     [H|keyreplace3(Key, Pos, T, New)];
 keyreplace3(_, _, [], _) -> [].
 
--spec keytake(term(), pos_integer(), [tuple()]) ->
-	{'value', tuple(), [tuple()]} | 'false'.
+-spec keytake(Key, N, TupleList1) -> {value, Tuple, TupleList2} | false when
+      Key :: term(),
+      N :: pos_integer(),
+      TupleList1 :: [tuple()],
+      TupleList2 :: [tuple()],
+      Tuple :: tuple().
 
 keytake(Key, N, L) when is_integer(N), N > 0 ->
     keytake(Key, N, L, []).
@@ -514,7 +657,12 @@ keytake(Key, N, [H|T], L) ->
     keytake(Key, N, T, [H|L]);
 keytake(_K, _N, [], _L) -> false.
 
--spec keystore(term(), pos_integer(), [tuple()], tuple()) -> [tuple(),...].
+-spec keystore(Key, N, TupleList1, NewTuple) -> TupleList2 when
+      Key :: term(),
+      N :: pos_integer(),
+      TupleList1 :: [tuple()],
+      TupleList2 :: [tuple(), ...],
+      NewTuple :: tuple().
 
 keystore(K, N, L, New) when is_integer(N), N > 0, is_tuple(New) ->
     keystore2(K, N, L, New).
@@ -526,7 +674,11 @@ keystore2(Key, N, [H|T], New) ->
 keystore2(_Key, _N, [], New) ->
     [New].
 
--spec keysort(pos_integer(), [T]) -> [T] when T :: tuple().
+-spec keysort(N, TupleList1) -> TupleList2 when
+      N :: pos_integer(),
+      TupleList1 :: [Tuple],
+      TupleList2 :: [Tuple],
+      Tuple :: tuple().
 
 keysort(I, L) when is_integer(I), I > 0 ->
     case L of
@@ -583,8 +735,13 @@ keysort_1(I, X, EX, [Y | L], R) ->
 keysort_1(_I, X, _EX, [], R) ->
     lists:reverse(R, [X]).
 
--spec keymerge(pos_integer(), [X], [Y]) ->
-	[R] when X :: tuple(), Y :: tuple(), R :: tuple().
+-spec keymerge(N, TupleList1, TupleList2) -> TupleList3 when
+      N :: pos_integer(),
+      TupleList1 :: [T1],
+      TupleList2 :: [T2],
+      TupleList3 :: [(T1 | T2)],
+      T1 :: tuple(),
+      T2 :: tuple().
 
 keymerge(Index, T1, L2) when is_integer(Index), Index > 0 -> 
     case L2 of
@@ -611,7 +768,11 @@ rkeymerge(Index, T1, L2) when is_integer(Index), Index > 0 ->
 	    lists:reverse(M, [])
     end.
 
--spec ukeysort(pos_integer(), [T]) -> [T] when T :: tuple().
+-spec ukeysort(N, TupleList1) -> TupleList2 when
+      N :: pos_integer(),
+      TupleList1 :: [Tuple],
+      TupleList2 :: [Tuple],
+      Tuple :: tuple().
 
 ukeysort(I, L) when is_integer(I), I > 0 ->
     case L of
@@ -676,8 +837,13 @@ ukeysort_1(I, X, EX, [Y | L]) ->
 ukeysort_1(_I, X, _EX, []) ->
     [X].
 
--spec ukeymerge(pos_integer(), [X], [Y]) ->
-	[(X | Y)] when X :: tuple(), Y :: tuple().
+-spec ukeymerge(N, TupleList1, TupleList2) -> TupleList3 when
+      N :: pos_integer(),
+      TupleList1 :: [T1],
+      TupleList2 :: [T2],
+      TupleList3 :: [(T1 | T2)],
+      T1 :: tuple(),
+      T2 :: tuple().
 
 ukeymerge(Index, L1, T2) when is_integer(Index), Index > 0 ->
     case L1 of
@@ -704,7 +870,11 @@ rukeymerge(Index, T1, L2) when is_integer(Index), Index > 0 ->
 	    lists:reverse(M, [])
     end.
 
--spec keymap(fun((term()) -> term()), pos_integer(), [tuple()]) -> [tuple()].
+-spec keymap(Fun, N, TupleList1) -> TupleList2 when
+      Fun :: fun((Term1 :: term()) -> Term2 :: term()),
+      N :: pos_integer(),
+      TupleList1 :: [tuple()],
+      TupleList2 :: [tuple()].
 
 keymap(Fun, Index, [Tup|Tail]) ->
    [setelement(Index, Tup, Fun(element(Index, Tup)))|keymap(Fun, Index, Tail)];
@@ -713,7 +883,11 @@ keymap(Fun, Index, []) when is_integer(Index), Index >= 1,
 
 %%% Suggestion from OTP-2948: sort and merge with Fun.
 
--spec sort(fun((T, T) -> boolean()), [T]) -> [T].
+-spec sort(Fun, List1) -> List2 when
+      Fun :: fun((A :: T, B :: T) -> boolean()),
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 sort(Fun, []) when is_function(Fun, 2) ->
     [];
@@ -727,7 +901,13 @@ sort(Fun, [X, Y | T]) ->
 	    fsplit_2(Y, X, Fun, T, [], [])
     end.
 
--spec merge(fun((X, Y) -> boolean()), [X], [Y]) -> [(X | Y)].
+-spec merge(Fun, List1, List2) -> List3 when
+      Fun :: fun((A, B) -> boolean()),
+      List1 :: [A],
+      List2 :: [B],
+      List3 :: [(A | B)],
+      A :: term(),
+      B :: term().
 
 merge(Fun, T1, [H2 | T2]) when is_function(Fun, 2) ->
     lists:reverse(fmerge2_1(T1, H2, Fun, T2, []), []);
@@ -743,7 +923,11 @@ rmerge(Fun, T1, [H2 | T2]) when is_function(Fun, 2) ->
 rmerge(Fun, T1, []) when is_function(Fun, 2) ->
     T1.
 
--spec usort(fun((T, T) -> boolean()), [T]) -> [T].
+-spec usort(Fun, List1) -> List2 when
+      Fun :: fun((T, T) -> boolean()),
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 usort(Fun, [_] = L) when is_function(Fun, 2) ->
     L;
@@ -770,7 +954,13 @@ usort_1(Fun, X, [Y | L]) ->
 	    ufsplit_2(Y, L, Fun, [X])
     end.
                     
--spec umerge(fun((X, Y) -> boolean()), [X], [Y]) -> [(X | Y)].
+-spec umerge(Fun, List1, List2) -> List3 when
+      Fun :: fun((A, B) -> boolean()),
+      List1 :: [A],
+      List2 :: [B],
+      List3 :: [(A | B)],
+      A :: term(),
+      B :: term().
 
 umerge(Fun, [], T2) when is_function(Fun, 2) ->
     T2;
@@ -789,7 +979,10 @@ rumerge(Fun, T1, [H2 | T2]) when is_function(Fun, 2) ->
 %% usort(List) -> L
 %%  sorts the list L, removes duplicates
 
--spec usort([T]) -> [T].
+-spec usort(List1) -> List2 when
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 usort([X, Y | L] = L0) when X < Y ->
     case L of
@@ -844,7 +1037,11 @@ usort_1(X, []) ->
 %% umerge(List) -> L
 %%  merges a list of sorted lists without duplicates, removes duplicates
 
--spec umerge([[T]]) -> [T].
+-spec umerge(ListOfLists) -> List1 when
+      ListOfLists :: [List],
+      List :: [T],
+      List1 :: [T],
+      T :: term().
 
 umerge(L) ->
     umergel(L).
@@ -853,7 +1050,14 @@ umerge(L) ->
 %%  merges three sorted lists X, Y and Z without duplicates, 
 %%  removes duplicates
 
--spec umerge3([X], [Y], [Z]) -> [(X | Y | Z)].
+-spec umerge3(List1, List2, List3) -> List4 when
+      List1 :: [X],
+      List2 :: [Y],
+      List3 :: [Z],
+      List4 :: [(X | Y | Z)],
+      X :: term(),
+      Y :: term(),
+      Z :: term().
 
 umerge3(L1, [], L3) ->
    umerge(L1, L3);
@@ -878,7 +1082,12 @@ rumerge3(L1, [H2 | T2], [H3 | T3]) ->
 %% umerge(X, Y) -> L
 %%  merges two sorted lists X and Y without duplicates, removes duplicates
 
--spec umerge([X], [Y]) -> [(X | Y)].
+-spec umerge(List1, List2) -> List3 when
+      List1 :: [X],
+      List2 :: [Y],
+      List3 :: [(X | Y)],
+      X :: term(),
+      Y :: term().
 
 umerge([], T2) ->
     T2;
@@ -924,7 +1133,10 @@ rumerge(T1, [H2 | T2]) ->
 %%  There are also versions with an extra argument, ExtraArgs, which is a
 %%  list of extra arguments to each call.
 
--spec all(fun((T) -> boolean()), [T]) -> boolean().
+-spec all(Pred, List) -> boolean() when
+      Pred :: fun((Elem :: T) -> boolean()),
+      List :: [T],
+      T :: term().
 
 all(Pred, [Hd|Tail]) ->
     case Pred(Hd) of
@@ -933,7 +1145,10 @@ all(Pred, [Hd|Tail]) ->
     end;
 all(Pred, []) when is_function(Pred, 1) -> true. 
 
--spec any(fun((T) -> boolean()), [T]) -> boolean().
+-spec any(Pred, List) -> boolean() when
+      Pred :: fun((Elem :: T) -> boolean()),
+      List :: [T],
+      T :: term().
 
 any(Pred, [Hd|Tail]) ->
     case Pred(Hd) of
@@ -942,31 +1157,59 @@ any(Pred, [Hd|Tail]) ->
     end;
 any(Pred, []) when is_function(Pred, 1) -> false. 
 
--spec map(fun((D) -> R), [D]) -> [R].
+-spec map(Fun, List1) -> List2 when
+      Fun :: fun((A) -> B),
+      List1 :: [A],
+      List2 :: [B],
+      A :: term(),
+      B :: term().
 
 map(F, [H|T]) ->
     [F(H)|map(F, T)];
 map(F, []) when is_function(F, 1) -> [].
 
--spec flatmap(fun((D) -> [R]), [D]) -> [R].
+-spec flatmap(Fun, List1) -> List2 when
+      Fun :: fun((A) -> [B]),
+      List1 :: [A],
+      List2 :: [B],
+      A :: term(),
+      B :: term().
 
 flatmap(F, [Hd|Tail]) ->
     F(Hd) ++ flatmap(F, Tail);
 flatmap(F, []) when is_function(F, 1) -> [].
 
--spec foldl(fun((T, term()) -> term()), term(), [T]) -> term().
+-spec foldl(Fun, Acc0, List) -> Acc1 when
+      Fun :: fun((Elem :: T, AccIn) -> AccOut),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term(),
+      List :: [T],
+      T :: term().
 
 foldl(F, Accu, [Hd|Tail]) ->
     foldl(F, F(Hd, Accu), Tail);
 foldl(F, Accu, []) when is_function(F, 2) -> Accu.
 
--spec foldr(fun((T, term()) -> term()), term(), [T]) -> term().
+-spec foldr(Fun, Acc0, List) -> Acc1 when
+      Fun :: fun((Elem :: T, AccIn) -> AccOut),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term(),
+      List :: [T],
+      T :: term().
 
 foldr(F, Accu, [Hd|Tail]) ->
     F(Hd, foldr(F, Accu, Tail));
 foldr(F, Accu, []) when is_function(F, 2) -> Accu.
 
--spec filter(Pred :: fun((T) -> boolean()), List :: [T]) -> [T].
+-spec filter(Pred, List1) -> List2 when
+      Pred :: fun((Elem :: T) -> boolean()),
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 filter(Pred, List) when is_function(Pred, 1) ->
     [ E || E <- List, Pred(E) ].
@@ -974,7 +1217,12 @@ filter(Pred, List) when is_function(Pred, 1) ->
 %% Equivalent to {filter(F, L), filter(NotF, L)}, if NotF = 'fun(X) ->
 %% not F(X) end'.
 
--spec partition(Pred :: fun((T) -> boolean()), List :: [T]) -> {[T], [T]}.
+-spec partition(Pred, List) -> {Satisfying, NotSatisfying} when
+      Pred :: fun((Elem :: T) -> boolean()),
+      List :: [T],
+      Satisfying :: [T],
+      NotSatisfying :: [T],
+      T :: term().
 
 partition(Pred, L) ->
     partition(Pred, L, [], []).
@@ -1000,14 +1248,26 @@ zf(F, [Hd|Tail]) ->
     end;
 zf(F, []) when is_function(F, 1) -> [].
 
--spec foreach(F :: fun((T) -> term()), List :: [T]) -> 'ok'.
+-spec foreach(Fun, List) -> ok when
+      Fun :: fun((Elem :: T) -> term()),
+      List :: [T],
+      T :: term().
 
 foreach(F, [Hd|Tail]) ->
     F(Hd),
     foreach(F, Tail);
 foreach(F, []) when is_function(F, 1) -> ok.
 
--spec mapfoldl(fun((A, term()) -> {B, term()}), term(), [A]) -> {[B], term()}.
+-spec mapfoldl(Fun, Acc0, List1) -> {List2, Acc1} when
+      Fun :: fun((A, AccIn) -> {B, AccOut}),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term(),
+      List1 :: [A],
+      List2 :: [B],
+      A :: term(),
+      B :: term().
 
 mapfoldl(F, Accu0, [Hd|Tail]) ->
     {R,Accu1} = F(Hd, Accu0),
@@ -1015,7 +1275,16 @@ mapfoldl(F, Accu0, [Hd|Tail]) ->
     {[R|Rs],Accu2};
 mapfoldl(F, Accu, []) when is_function(F, 2) -> {[],Accu}.
 
--spec mapfoldr(fun((A, term()) -> {B, term()}), term(), [A]) -> {[B], term()}.
+-spec mapfoldr(Fun, Acc0, List1) -> {List2, Acc1} when
+      Fun :: fun((A, AccIn) -> {B, AccOut}),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term(),
+      List1 :: [A],
+      List2 :: [B],
+      A :: term(),
+      B :: term().
 
 mapfoldr(F, Accu0, [Hd|Tail]) ->
     {Rs,Accu1} = mapfoldr(F, Accu0, Tail),
@@ -1023,7 +1292,11 @@ mapfoldr(F, Accu0, [Hd|Tail]) ->
     {[R|Rs],Accu2};
 mapfoldr(F, Accu, []) when is_function(F, 2) -> {[],Accu}.
 
--spec takewhile(fun((T) -> boolean()), [T]) -> [T].
+-spec takewhile(Pred, List1) -> List2 when
+      Pred :: fun((Elem :: T) -> boolean()),
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 takewhile(Pred, [Hd|Tail]) ->
     case Pred(Hd) of
@@ -1032,7 +1305,11 @@ takewhile(Pred, [Hd|Tail]) ->
     end;
 takewhile(Pred, []) when is_function(Pred, 1) -> [].
 
--spec dropwhile(fun((T) -> boolean()), [T]) -> [T].
+-spec dropwhile(Pred, List1) -> List2 when
+      Pred :: fun((Elem :: T) -> boolean()),
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 dropwhile(Pred, [Hd|Tail]=Rest) ->
     case Pred(Hd) of
@@ -1041,7 +1318,12 @@ dropwhile(Pred, [Hd|Tail]=Rest) ->
     end;
 dropwhile(Pred, []) when is_function(Pred, 1) -> [].
 
--spec splitwith(fun((T) -> boolean()), [T]) -> {[T], [T]}.
+-spec splitwith(Pred, List) -> {List1, List2} when
+      Pred :: fun((T) -> boolean()),
+      List :: [T],
+      List1 :: [T],
+      List2 :: [T],
+      T :: term().
 
 splitwith(Pred, List) when is_function(Pred, 1) ->
     splitwith(Pred, List, []).
@@ -1054,7 +1336,12 @@ splitwith(Pred, [Hd|Tail], Taken) ->
 splitwith(Pred, [], Taken) when is_function(Pred, 1) ->
     {reverse(Taken),[]}.
 
--spec split(non_neg_integer(), [T]) -> {[T], [T]}.
+-spec split(N, List1) -> {List2, List3} when
+      N :: non_neg_integer(),
+      List1 :: [T],
+      List2 :: [T],
+      List3 :: [T],
+      T :: term().
 
 split(N, List) when is_integer(N), N >= 0, is_list(List) ->
     case split(N, List, []) of
diff --git a/lib/stdlib/src/log_mf_h.erl b/lib/stdlib/src/log_mf_h.erl
index 5fa5360fa1..f7f128dac7 100644
--- a/lib/stdlib/src/log_mf_h.erl
+++ b/lib/stdlib/src/log_mf_h.erl
@@ -27,14 +27,13 @@
 
 %%-----------------------------------------------------------------
 
--type dir()  :: file:filename().
 -type b()    :: non_neg_integer().
 -type f()    :: 1..255.
 -type pred() :: fun((term()) -> boolean()).
 
 %%-----------------------------------------------------------------
 
--record(state, {dir    :: dir(),
+-record(state, {dir    :: file:filename(),
 		maxB   :: b(),
 		maxF   :: f(),
 		curB   :: b(),
@@ -67,11 +66,23 @@
 %%              EventMgr = pid() | atom().
 %%-----------------------------------------------------------------
 
--spec init(dir(), b(), f()) -> {dir(), b(), f(), pred()}.
+-opaque args() :: {file:filename(), b(), f(), pred()}.
+
+
+-spec init(Dir, MaxBytes, MaxFiles) -> Args when
+      Dir :: file:filename(),
+      MaxBytes :: non_neg_integer(), % b()
+      MaxFiles :: 1..255, % f()
+      Args :: args().
 
 init(Dir, MaxB, MaxF) -> init(Dir, MaxB, MaxF, fun(_) -> true end).
 
--spec init(dir(), b(), f(), pred()) -> {dir(), b(), f(), pred()}.
+-spec init(Dir, MaxBytes, MaxFiles, Pred) -> Args when
+      Dir :: file:filename(),
+      MaxBytes :: non_neg_integer(), % b()
+      MaxFiles :: 1..255, % f()
+      Pred :: fun((Event :: term()) -> boolean()), % pred()
+      Args :: args().
 
 init(Dir, MaxB, MaxF, Pred) -> {Dir, MaxB, MaxF, Pred}.
 
@@ -79,7 +90,7 @@ init(Dir, MaxB, MaxF, Pred) -> {Dir, MaxB, MaxF, Pred}.
 %% Call-back functions from gen_event
 %%-----------------------------------------------------------------
 
--spec init({dir(), b(), f(), pred()}) -> {'ok', #state{}} | {'error', term()}.
+-spec init({file:filename(), non_neg_integer(), f(), pred()}) -> {'ok', #state{}} | {'error', term()}.
 
 init({Dir, MaxB, MaxF, Pred}) when is_integer(MaxF), MaxF > 0, MaxF < 256 -> 
     First = 
diff --git a/lib/stdlib/src/ms_transform.erl b/lib/stdlib/src/ms_transform.erl
index b565eb20f4..48e22e53fa 100644
--- a/lib/stdlib/src/ms_transform.erl
+++ b/lib/stdlib/src/ms_transform.erl
@@ -66,6 +66,11 @@
 %%
 %% Called by compiler or ets/dbg:fun2ms when errors/warnings occur
 %%
+
+-spec(format_error(Error) -> Chars when
+      Error :: {error, module(), term()},
+      Chars :: io_lib:chars()).
+
 format_error({?WARN_SHADOW_VAR,Name}) ->
     lists:flatten(
       io_lib:format("variable ~p shadowed in ms_transform fun head",
@@ -186,6 +191,12 @@ format_error(Else) ->
 %%
 %% Called when translating in shell
 %%
+
+-spec transform_from_shell(Dialect, Clauses, BoundEnvironment) -> term() when
+      Dialect :: ets | dbg,
+      Clauses :: [erl_parse:abstract_clause()],
+      BoundEnvironment :: erl_eval:binding_struct().
+
 transform_from_shell(Dialect, Clauses, BoundEnvironment) ->
     SaveFilename = setup_filename(),
     case catch ms_clause_list(1,Clauses,Dialect,gb_sets:new()) of
@@ -211,6 +222,11 @@ transform_from_shell(Dialect, Clauses, BoundEnvironment) ->
 %%
 %% Called when translating during compiling
 %%
+
+-spec parse_transform(Forms, Options) -> Forms when
+      Forms :: [erl_parse:abstract_form()],
+      Options :: term().
+
 parse_transform(Forms, _Options) ->
     SaveFilename = setup_filename(),
     %io:format("Forms: ~p~n",[Forms]),
diff --git a/lib/stdlib/src/orddict.erl b/lib/stdlib/src/orddict.erl
index 4e30c9eefd..45d3c84b3e 100644
--- a/lib/stdlib/src/orddict.erl
+++ b/lib/stdlib/src/orddict.erl
@@ -25,9 +25,11 @@
 -export([store/3,append/3,append_list/3,update/3,update/4,update_counter/3]).
 -export([fold/3,map/2,filter/2,merge/3]).
 
+-export_type([orddict/0]).
+
 %%---------------------------------------------------------------------------
 
--type orddict() :: [{term(), term()}].
+-type orddict() :: [{Key :: term(), Value :: term()}].
 
 %%---------------------------------------------------------------------------
 
@@ -35,45 +37,63 @@
 
 new() -> [].
 
--spec is_key(Key::term(), Dictionary::orddict()) -> boolean().
+-spec is_key(Key, Orddict) -> boolean() when
+      Key :: term(),
+      Orddict :: orddict().
 
 is_key(Key, [{K,_}|_]) when Key < K -> false;
 is_key(Key, [{K,_}|Dict]) when Key > K -> is_key(Key, Dict);
 is_key(_Key, [{_K,_Val}|_]) -> true;		%Key == K
 is_key(_, []) -> false.
 
--spec to_list(orddict()) -> [{term(), term()}].
+-spec to_list(Orddict) -> List when
+      Orddict :: orddict(),
+      List :: [{Key :: term(), Value :: term()}].
 
 to_list(Dict) -> Dict.
 
--spec from_list([{term(), term()}]) -> orddict().
+-spec from_list(List) -> Orddict when
+      List :: [{Key :: term(), Value :: term()}],
+      Orddict :: orddict().
 
 from_list(Pairs) ->
     lists:foldl(fun ({K,V}, D) -> store(K, V, D) end, [], Pairs).
 
--spec size(orddict()) -> non_neg_integer().
+-spec size(Orddict) -> non_neg_integer() when
+      Orddict :: orddict().
 
 size(D) -> length(D).
 
--spec fetch(Key::term(), Dictionary::orddict()) -> term().
+-spec fetch(Key, Orddict) -> Value when
+      Key :: term(),
+      Value :: term(),
+      Orddict :: orddict().
 
 fetch(Key, [{K,_}|D]) when Key > K -> fetch(Key, D);
 fetch(Key, [{K,Value}|_]) when Key == K -> Value.
 
--spec find(Key::term(), Dictionary::orddict()) -> {'ok', term()} | 'error'.
+-spec find(Key, Orddict) -> {'ok', Value} | 'error' when
+      Key :: term(),
+      Orddict :: orddict(),
+      Value :: term().
 
 find(Key, [{K,_}|_]) when Key < K -> error;
 find(Key, [{K,_}|D]) when Key > K -> find(Key, D);
 find(_Key, [{_K,Value}|_]) -> {ok,Value};	%Key == K
 find(_, []) -> error.
 
--spec fetch_keys(Dictionary::orddict()) -> [term()].
+-spec fetch_keys(Orddict) -> Keys when
+      Orddict :: orddict(),
+      Keys :: [term()].
 
 fetch_keys([{Key,_}|Dict]) ->
     [Key|fetch_keys(Dict)];
 fetch_keys([]) -> [].
 
--spec erase(Key::term(), Dictionary::orddict()) -> orddict().
+-spec erase(Key, Orddict1) -> Orddict2 when
+      Key :: term(),
+      Orddict1 :: orddict(),
+      Orddict2 :: orddict().
 
 erase(Key, [{K,_}=E|Dict]) when Key < K -> [E|Dict];
 erase(Key, [{K,_}=E|Dict]) when Key > K ->
@@ -81,7 +101,11 @@ erase(Key, [{K,_}=E|Dict]) when Key > K ->
 erase(_Key, [{_K,_Val}|Dict]) -> Dict;		%Key == K
 erase(_, []) -> [].
 
--spec store(Key::term(), Value::term(), Dictionary::orddict()) -> orddict().
+-spec store(Key, Value, Orddict1) -> Orddict2 when
+      Key :: term(),
+      Value :: term(),
+      Orddict1 :: orddict(),
+      Orddict2 :: orddict().
 
 store(Key, New, [{K,_}=E|Dict]) when Key < K ->
     [{Key,New},E|Dict];
@@ -91,7 +115,11 @@ store(Key, New, [{_K,_Old}|Dict]) ->		%Key == K
     [{Key,New}|Dict];
 store(Key, New, []) -> [{Key,New}].
 
--spec append(Key::term(), Value::term(), Dictionary::orddict()) -> orddict().
+-spec append(Key, Value, Orddict1) -> Orddict2 when
+      Key :: term(),
+      Value :: term(),
+      Orddict1 :: orddict(),
+      Orddict2 :: orddict().
 
 append(Key, New, [{K,_}=E|Dict]) when Key < K ->
     [{Key,[New]},E|Dict];
@@ -101,7 +129,11 @@ append(Key, New, [{_K,Old}|Dict]) ->		%Key == K
     [{Key,Old ++ [New]}|Dict];
 append(Key, New, []) -> [{Key,[New]}].
 
--spec append_list(Key::term(), ValueList::[term()], orddict()) -> orddict().
+-spec append_list(Key, ValList, Orddict1) -> Orddict2 when
+      Key :: term(),
+      ValList :: [Value :: term()],
+      Orddict1 :: orddict(),
+      Orddict2 :: orddict().
 
 append_list(Key, NewList, [{K,_}=E|Dict]) when Key < K ->
     [{Key,NewList},E|Dict];
@@ -112,14 +144,23 @@ append_list(Key, NewList, [{_K,Old}|Dict]) ->		%Key == K
 append_list(Key, NewList, []) ->
     [{Key,NewList}].
 
--spec update(Key::term(), Fun::fun((term()) -> term()), orddict()) -> orddict().
+-spec update(Key, Fun, Orddict1) -> Orddict2 when
+      Key :: term(),
+      Fun :: fun((Value1 :: term()) -> Value2 :: term()),
+      Orddict1 :: orddict(),
+      Orddict2 :: orddict().
 
 update(Key, Fun, [{K,_}=E|Dict]) when Key > K ->
     [E|update(Key, Fun, Dict)];
 update(Key, Fun, [{K,Val}|Dict]) when Key == K ->
     [{Key,Fun(Val)}|Dict].
 
--spec update(term(), fun((term()) -> term()), term(), orddict()) -> orddict().
+-spec update(Key, Fun, Initial, Orddict1) -> Orddict2 when
+      Key :: term(),
+      Initial :: term(),
+      Fun :: fun((Value1 :: term()) -> Value2 :: term()),
+      Orddict1 :: orddict(),
+      Orddict2 :: orddict().
 
 update(Key, _, Init, [{K,_}=E|Dict]) when Key < K ->
     [{Key,Init},E|Dict];
@@ -129,7 +170,11 @@ update(Key, Fun, _Init, [{_K,Val}|Dict]) ->		%Key == K
     [{Key,Fun(Val)}|Dict];
 update(Key, _, Init, []) -> [{Key,Init}].
 
--spec update_counter(Key::term(), Incr::number(), orddict()) -> orddict().
+-spec update_counter(Key, Increment, Orddict1) -> Orddict2 when
+      Key :: term(),
+      Increment :: number(),
+      Orddict1 :: orddict(),
+      Orddict2 :: orddict().
 
 update_counter(Key, Incr, [{K,_}=E|Dict]) when Key < K ->
     [{Key,Incr},E|Dict];
@@ -139,19 +184,29 @@ update_counter(Key, Incr, [{_K,Val}|Dict]) ->		%Key == K
     [{Key,Val+Incr}|Dict];
 update_counter(Key, Incr, []) -> [{Key,Incr}].
 
--spec fold(fun((term(),term(),term()) -> term()), term(), orddict()) -> term().
+-spec fold(Fun, Acc0, Orddict) -> Acc1 when
+      Fun :: fun((Key :: term(), Value :: term(), AccIn :: term()) -> AccOut :: term()),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      Orddict :: orddict().
 
 fold(F, Acc, [{Key,Val}|D]) ->
     fold(F, F(Key, Val, Acc), D);
 fold(F, Acc, []) when is_function(F, 3) -> Acc.
 
--spec map(fun((term(), term()) -> term()), orddict()) -> orddict().
+-spec map(Fun, Orddict1) -> Orddict2 when
+      Fun :: fun((Key :: term(), Value1 :: term()) -> Value2 :: term()),
+      Orddict1 :: orddict(),
+      Orddict2 :: orddict().
 
 map(F, [{Key,Val}|D]) ->
     [{Key,F(Key, Val)}|map(F, D)];
 map(F, []) when is_function(F, 2) -> [].
 
--spec filter(fun((term(), term()) -> boolean()), orddict()) -> orddict().
+-spec filter(Pred, Orddict1) -> Orddict2 when
+      Pred :: fun((Key :: term(), Value :: term()) -> boolean()),
+      Orddict1 :: orddict(),
+      Orddict2 :: orddict().
 
 filter(F, [{Key,Val}=E|D]) ->
     case F(Key, Val) of
@@ -160,8 +215,11 @@ filter(F, [{Key,Val}=E|D]) ->
     end;
 filter(F, []) when is_function(F, 2) -> [].
 
--spec merge(fun((term(), term(), term()) -> term()), orddict(), orddict()) ->
-    orddict().
+-spec merge(Fun, Orddict1, Orddict2) -> Orddict3 when
+      Fun :: fun((Key :: term(), Value1 :: term(), Value2 :: term()) -> Value :: term()),
+      Orddict1 :: orddict(),
+      Orddict2 :: orddict(),
+      Orddict3 :: orddict().
 
 merge(F, [{K1,_}=E1|D1], [{K2,_}=E2|D2]) when K1 < K2 ->
     [E1|merge(F, D1, [E2|D2])];
diff --git a/lib/stdlib/src/ordsets.erl b/lib/stdlib/src/ordsets.erl
index 5a1c260703..4a8b1275b2 100644
--- a/lib/stdlib/src/ordsets.erl
+++ b/lib/stdlib/src/ordsets.erl
@@ -40,7 +40,8 @@ new() -> [].
 %% is_set(Term) -> boolean().
 %%  Return 'true' if Set is an ordered set of elements, else 'false'.
 
--spec is_set(term()) -> boolean().
+-spec is_set(Ordset) -> boolean() when
+      Ordset :: term().
 
 is_set([E|Es]) -> is_set(Es, E);
 is_set([]) -> true;
@@ -54,21 +55,26 @@ is_set([], _) -> true.
 %% size(OrdSet) -> int().
 %%  Return the number of elements in OrdSet.
 
--spec size(ordset(_)) -> non_neg_integer().
+-spec size(Ordset) -> non_neg_integer() when
+      Ordset :: ordset(_).
 
 size(S) -> length(S).
 
 %% to_list(OrdSet) -> [Elem].
 %%  Return the elements in OrdSet as a list.
 
--spec to_list(ordset(T)) -> [T].
+-spec to_list(Ordset) -> List when
+      Ordset :: ordset(T),
+      List :: [T].
 
 to_list(S) -> S.
 
 %% from_list([Elem]) -> Set.
 %%  Build an ordered set from the elements in List.
 
--spec from_list([T]) -> ordset(T).
+-spec from_list(List) -> Ordset when
+      List :: [T],
+      Ordset :: ordset(T).
 
 from_list(L) ->
     lists:usort(L).
@@ -76,7 +82,9 @@ from_list(L) ->
 %% is_element(Element, OrdSet) -> boolean().
 %%  Return 'true' if Element is an element of OrdSet, else 'false'.
 
--spec is_element(term(), ordset(_)) -> boolean().
+-spec is_element(Element, Ordset) -> boolean() when
+      Element :: term(),
+      Ordset :: ordset(_).
 
 is_element(E, [H|Es]) when E > H -> is_element(E, Es);
 is_element(E, [H|_]) when E < H -> false;
@@ -86,7 +94,12 @@ is_element(_, []) -> false.
 %% add_element(Element, OrdSet) -> OrdSet.
 %%  Return OrdSet with Element inserted in it.
 
--spec add_element(E, ordset(T)) -> [T | E,...].
+-spec add_element(Element, Ordset1) -> Ordset2 when
+      Element :: E,
+      Ordset1 :: ordset(T),
+      Ordset2 :: ordset(T | E).
+
+%-spec add_element(E, ordset(T)) -> [T | E,...].
 
 add_element(E, [H|Es]) when E > H -> [H|add_element(E, Es)];
 add_element(E, [H|_]=Set) when E < H -> [E|Set];
@@ -96,7 +109,10 @@ add_element(E, []) -> [E].
 %% del_element(Element, OrdSet) -> OrdSet.
 %%  Return OrdSet but with Element removed.
 
--spec del_element(term(), ordset(T)) -> ordset(T).
+-spec del_element(Element, Ordset1) -> Ordset2 when
+      Element :: term(),
+      Ordset1 :: ordset(T),
+      Ordset2 :: ordset(T).
 
 del_element(E, [H|Es]) when E > H -> [H|del_element(E, Es)];
 del_element(E, [H|_]=Set) when E < H -> Set;
@@ -106,7 +122,10 @@ del_element(_, []) -> [].
 %% union(OrdSet1, OrdSet2) -> OrdSet
 %%  Return the union of OrdSet1 and OrdSet2.
 
--spec union(ordset(T1), ordset(T2)) -> ordset(T1 | T2).
+-spec union(Ordset1, Ordset2) -> Ordset3 when
+      Ordset1 :: ordset(T1),
+      Ordset2 :: ordset(T2),
+      Ordset3 :: ordset(T1 | T2).
 
 union([E1|Es1], [E2|_]=Set2) when E1 < E2 ->
     [E1|union(Es1, Set2)];
@@ -120,7 +139,9 @@ union(Es1, []) -> Es1.
 %% union([OrdSet]) -> OrdSet
 %%  Return the union of the list of ordered sets.
 
--spec union([ordset(T)]) -> ordset(T).
+-spec union(OrdsetList) -> Ordset when
+      OrdsetList :: [ordset(T)],
+      Ordset :: ordset(T).
 
 union([S1,S2|Ss]) ->
     union1(union(S1, S2), Ss);
@@ -133,7 +154,10 @@ union1(S1, []) -> S1.
 %% intersection(OrdSet1, OrdSet2) -> OrdSet.
 %%  Return the intersection of OrdSet1 and OrdSet2.
 
--spec intersection(ordset(_), ordset(_)) -> ordset(_).
+-spec intersection(Ordset1, Ordset2) -> Ordset3 when
+      Ordset1 :: ordset(_),
+      Ordset2 :: ordset(_),
+      Ordset3 :: ordset(_).
 
 intersection([E1|Es1], [E2|_]=Set2) when E1 < E2 ->
     intersection(Es1, Set2);
@@ -149,7 +173,9 @@ intersection(_, []) ->
 %% intersection([OrdSet]) -> OrdSet.
 %%  Return the intersection of the list of ordered sets.
 
--spec intersection([ordset(_),...]) -> ordset(_).
+-spec intersection(OrdsetList) -> Ordset when
+      OrdsetList :: [ordset(_),...],
+      Ordset :: ordset(_).
 
 intersection([S1,S2|Ss]) ->
     intersection1(intersection(S1, S2), Ss);
@@ -162,7 +188,9 @@ intersection1(S1, []) -> S1.
 %% is_disjoint(OrdSet1, OrdSet2) -> boolean().
 %%  Check whether OrdSet1 and OrdSet2 are disjoint.
 
--spec is_disjoint(ordset(_), ordset(_)) -> boolean().
+-spec is_disjoint(Ordset1, Ordset2) -> boolean() when
+      Ordset1 :: ordset(_),
+      Ordset2 :: ordset(_).
 
 is_disjoint([E1|Es1], [E2|_]=Set2) when E1 < E2 ->
     is_disjoint(Es1, Set2);
@@ -179,7 +207,10 @@ is_disjoint(_, []) ->
 %%  Return all and only the elements of OrdSet1 which are not also in
 %%  OrdSet2.
 
--spec subtract(ordset(_), ordset(_)) -> ordset(_).
+-spec subtract(Ordset1, Ordset2) -> Ordset3 when
+      Ordset1 :: ordset(_),
+      Ordset2 :: ordset(_),
+      Ordset3 :: ordset(_).
 
 subtract([E1|Es1], [E2|_]=Set2) when E1 < E2 ->
     [E1|subtract(Es1, Set2)];
@@ -194,7 +225,9 @@ subtract(Es1, []) -> Es1.
 %%  Return 'true' when every element of OrdSet1 is also a member of
 %%  OrdSet2, else 'false'.
 
--spec is_subset(ordset(_), ordset(_)) -> boolean().
+-spec is_subset(Ordset1, Ordset2) -> boolean() when
+      Ordset1 :: ordset(_),
+      Ordset2 :: ordset(_).
 
 is_subset([E1|_], [E2|_]) when E1 < E2 ->	%E1 not in Set2
     false;
@@ -208,7 +241,11 @@ is_subset(_, []) -> false.
 %% fold(Fun, Accumulator, OrdSet) -> Accumulator.
 %%  Fold function Fun over all elements in OrdSet and return Accumulator.
 
--spec fold(fun((T, term()) -> term()), term(), ordset(T)) -> term().
+-spec fold(Function, Acc0, Ordset) -> Acc1 when
+      Function :: fun((Element :: T, AccIn :: term()) -> AccOut :: term()),
+      Ordset :: ordset(T),
+      Acc0 :: term(),
+      Acc1 :: term().
 
 fold(F, Acc, Set) ->
     lists:foldl(F, Acc, Set).
@@ -216,7 +253,10 @@ fold(F, Acc, Set) ->
 %% filter(Fun, OrdSet) -> OrdSet.
 %%  Filter OrdSet with Fun.
 
--spec filter(fun((T) -> boolean()), ordset(T)) -> ordset(T).
+-spec filter(Pred, Ordset1) -> Ordset2 when
+      Pred :: fun((Element :: T) -> boolean()),
+      Ordset1 :: ordset(T),
+      Ordset2 :: ordset(T).
 
 filter(F, Set) ->
     lists:filter(F, Set).
diff --git a/lib/stdlib/src/pg.erl b/lib/stdlib/src/pg.erl
index 503654e706..ee177e4e0b 100644
--- a/lib/stdlib/src/pg.erl
+++ b/lib/stdlib/src/pg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -35,7 +35,9 @@
 %% Create a brand new empty process group with the master residing 
 %% at the local node
 
--spec create(term()) -> 'ok' | {'error', term()}.
+-spec create(PgName) -> 'ok' | {'error', Reason} when
+      PgName :: term(),
+      Reason :: 'already_created' | term().
 
 create(PgName) -> 
     catch begin check(PgName),
@@ -46,7 +48,10 @@ create(PgName) ->
 %% Create a brand new empty process group with the master 
 %% residing at Node
 
--spec create(term(), node()) -> 'ok' | {'error', term()}.
+-spec create(PgName, Node) -> 'ok' | {'error', Reason} when
+      PgName :: term(),
+      Node :: node(),
+      Reason :: 'already_created' | term().
 
 create(PgName, Node) ->
     catch begin check(PgName),
@@ -66,7 +71,10 @@ standby(_PgName, _Node) ->
 %% Tell process group PgName that Pid is a new member of the group
 %% synchronously return a list of all old members in the group
 
--spec join(atom(), pid()) -> [pid()].
+-spec join(PgName, Pid) -> Members when
+      PgName :: term(),
+      Pid :: pid(),
+      Members :: [pid()].
 
 join(PgName, Pid) when is_atom(PgName) -> 
     global:send(PgName, {join,self(),Pid}),
@@ -77,7 +85,9 @@ join(PgName, Pid) when is_atom(PgName) ->
 
 %% Multi cast Mess to all members in the group
 
--spec send(atom() | pid(), term()) -> 'ok'.
+-spec send(PgName, Msg) -> 'ok' when
+      PgName :: term(),
+      Msg :: term().
 
 send(PgName, Mess) when is_atom(PgName) ->
     global:send(PgName, {send, self(), Mess}),
@@ -89,7 +99,9 @@ send(Pg, Mess) when is_pid(Pg) ->
 %% multi cast a message to all members in the group but ourselves
 %% If we are a member
 
--spec esend(atom() | pid(), term()) -> 'ok'.
+-spec esend(PgName, Msg) -> 'ok' when
+      PgName :: term(),
+      Msg :: term().
 
 esend(PgName, Mess) when is_atom(PgName) ->
     global:send(PgName, {esend,self(),Mess}),
@@ -100,7 +112,9 @@ esend(Pg, Mess) when is_pid(Pg) ->
 
 %% Return the members of the group
 
--spec members(atom() | pid()) -> [pid()].
+-spec members(PgName) -> Members when
+      PgName :: term(),
+      Members :: [pid()].
 
 members(PgName) when is_atom(PgName) ->
     global:send(PgName, {self() ,members}),
diff --git a/lib/stdlib/src/pool.erl b/lib/stdlib/src/pool.erl
index 7f5f23e26d..a5eb191ab2 100644
--- a/lib/stdlib/src/pool.erl
+++ b/lib/stdlib/src/pool.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -52,11 +52,16 @@
 
 %% Start up using the .hosts.erlang file
 
--spec start(atom()) -> [node()].
+-spec start(Name) -> Nodes when
+      Name :: atom(),
+      Nodes :: [node()].
 start(Name) ->
     start(Name,[]).
 
--spec start(atom(), string()) -> [node()].
+-spec start(Name, Args) -> Nodes when
+      Name :: atom(),
+      Args :: string(),
+      Nodes :: [node()].
 start(Name, Args) when is_atom(Name) ->
     gen_server:start({global, pool_master}, pool, [], []),
     Hosts = net_adm:host_file(),
@@ -71,7 +76,8 @@ start(Name, Args) when is_atom(Name) ->
 get_nodes() ->
     get_elements(2, get_nodes_and_load()).
 
--spec attach(node()) -> 'already_attached' | 'attached'.
+-spec attach(Node) -> 'already_attached' | 'attached' when
+      Node :: node().
 attach(Node) ->
     gen_server:call({global, pool_master}, {attach, Node}).
 
@@ -82,11 +88,17 @@ get_nodes_and_load() ->
 get_node() ->
     gen_server:call({global, pool_master}, get_node).
 
--spec pspawn(module(), atom(), [term()]) -> pid().
+-spec pspawn(Mod, Fun, Args) -> pid() when
+      Mod :: module(),
+      Fun :: atom(),
+      Args :: [term()].
 pspawn(M, F, A) ->
     gen_server:call({global, pool_master}, {spawn, group_leader(), M, F, A}).
 
--spec pspawn_link(module(), atom(), [term()]) -> pid().
+-spec pspawn_link(Mod, Fun, Args) -> pid() when
+      Mod :: module(),
+      Fun :: atom(),
+      Args :: [term()].
 pspawn_link(M, F, A) ->
     P = pspawn(M, F, A),
     link(P),
@@ -95,6 +107,9 @@ pspawn_link(M, F, A) ->
 start_nodes([], _, _) -> [];
 start_nodes([Host|Tail], Name, Args) -> 
     case slave:start(Host, Name, Args) of 
+	{error, {already_running, Node}} ->
+	    io:format("Can't start node on host ~w due to ~w~n",[Host, {already_running, Node}]),
+	    [Node | start_nodes(Tail, Name, Args)];
 	{error, R} ->
 	    io:format("Can't start node on host ~w due to ~w~n",[Host, R]),
 	    start_nodes(Tail, Name, Args);
diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
index 4fb64a3353..02bcbb5a60 100644
--- a/lib/stdlib/src/proc_lib.erl
+++ b/lib/stdlib/src/proc_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -40,77 +40,108 @@
 
 -type priority_level() :: 'high' | 'low' | 'max' | 'normal'.
 -type spawn_option()   :: 'link'
+                        | 'monitor'
                         | {'priority', priority_level()}
                         | {'min_heap_size', non_neg_integer()}
+                        | {'min_bin_vheap_size', non_neg_integer()}
                         | {'fullsweep_after', non_neg_integer()}.
 
--type dict_or_pid()    :: pid() | [_] | {integer(), integer(), integer()}.
+-type dict_or_pid()    :: pid()
+                        | (ProcInfo :: [_])
+                        | {X :: integer(), Y :: integer(), Z :: integer()}.
 
 %%-----------------------------------------------------------------------------
 
--spec spawn(function()) -> pid().
+-spec spawn(Fun) -> pid() when
+      Fun :: function().
 
 spawn(F) when is_function(F) ->
     Parent = get_my_name(),
     Ancestors = get_ancestors(),
     erlang:spawn(?MODULE, init_p, [Parent,Ancestors,F]).
 
--spec spawn(atom(), atom(), [term()]) -> pid().
+-spec spawn(Module, Function, Args) -> pid() when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
 
 spawn(M,F,A) when is_atom(M), is_atom(F), is_list(A) ->
     Parent = get_my_name(),
     Ancestors = get_ancestors(),
     erlang:spawn(?MODULE, init_p, [Parent,Ancestors,M,F,A]).
 
--spec spawn_link(function()) -> pid().
+-spec spawn_link(Fun) -> pid() when
+      Fun :: function().
 
 spawn_link(F) when is_function(F) ->
     Parent = get_my_name(),
     Ancestors = get_ancestors(),
     erlang:spawn_link(?MODULE, init_p, [Parent,Ancestors,F]).
 
--spec spawn_link(atom(), atom(), [term()]) -> pid().
+-spec spawn_link(Module, Function, Args) -> pid() when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
 
 spawn_link(M,F,A) when is_atom(M), is_atom(F), is_list(A) ->
     Parent = get_my_name(),
     Ancestors = get_ancestors(),
     erlang:spawn_link(?MODULE, init_p, [Parent,Ancestors,M,F,A]).
 
--spec spawn(node(), function()) -> pid().
+-spec spawn(Node, Fun) -> pid() when
+      Node :: node(),
+      Fun :: function().
 
 spawn(Node, F) when is_function(F) ->
     Parent = get_my_name(),
     Ancestors = get_ancestors(),
     erlang:spawn(Node, ?MODULE, init_p, [Parent,Ancestors,F]).
 
--spec spawn(node(), atom(), atom(), [term()]) -> pid().
+-spec spawn(Node, Module, Function, Args) -> pid() when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
+
 spawn(Node, M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
     Parent = get_my_name(),
     Ancestors = get_ancestors(),
     erlang:spawn(Node, ?MODULE, init_p, [Parent,Ancestors,M,F,A]).
 
--spec spawn_link(node(), function()) -> pid().
+-spec spawn_link(Node, Fun) -> pid() when
+      Node :: node(),
+      Fun :: function().
 
 spawn_link(Node, F) when is_function(F) ->
     Parent = get_my_name(),
     Ancestors = get_ancestors(),
     erlang:spawn_link(Node, ?MODULE, init_p, [Parent,Ancestors,F]).
 
--spec spawn_link(node(), atom(), atom(), [term()]) -> pid().
+-spec spawn_link(Node, Module, Function, Args) -> pid() when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
 
 spawn_link(Node, M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
     Parent = get_my_name(),
     Ancestors = get_ancestors(),
     erlang:spawn_link(Node, ?MODULE, init_p, [Parent,Ancestors,M,F,A]).
 
--spec spawn_opt(function(), [spawn_option()]) -> pid().
+-spec spawn_opt(Fun, SpawnOpts) -> pid() when
+      Fun :: function(),
+      SpawnOpts :: [spawn_option()].
+
 spawn_opt(F, Opts) when is_function(F) ->
     Parent = get_my_name(),
     Ancestors = get_ancestors(),
     check_for_monitor(Opts),
     erlang:spawn_opt(?MODULE, init_p, [Parent,Ancestors,F],Opts).
 
--spec spawn_opt(node(), function(), [spawn_option()]) -> pid().
+-spec spawn_opt(Node, Function, SpawnOpts) -> pid() when
+      Node :: node(),
+      Function :: function(),
+      SpawnOpts :: [spawn_option()].
 
 spawn_opt(Node, F, Opts) when is_function(F) ->
     Parent = get_my_name(),
@@ -118,7 +149,11 @@ spawn_opt(Node, F, Opts) when is_function(F) ->
     check_for_monitor(Opts),
     erlang:spawn_opt(Node, ?MODULE, init_p, [Parent,Ancestors,F], Opts).
 
--spec spawn_opt(atom(), atom(), [term()], [spawn_option()]) -> pid().
+-spec spawn_opt(Module, Function, Args, SpawnOpts) -> pid() when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      SpawnOpts :: [spawn_option()].
 
 spawn_opt(M, F, A, Opts) when is_atom(M), is_atom(F), is_list(A) ->
     Parent = get_my_name(),
@@ -126,7 +161,12 @@ spawn_opt(M, F, A, Opts) when is_atom(M), is_atom(F), is_list(A) ->
     check_for_monitor(Opts),
     erlang:spawn_opt(?MODULE, init_p, [Parent,Ancestors,M,F,A], Opts).
 
--spec spawn_opt(node(), atom(), atom(), [term()], [spawn_option()]) -> pid().
+-spec spawn_opt(Node, Module, Function, Args, SpawnOpts) -> pid() when
+      Node :: node(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      SpawnOpts :: [spawn_option()].
 
 spawn_opt(Node, M, F, A, Opts) when is_atom(M), is_atom(F), is_list(A) ->
     Parent = get_my_name(),
@@ -144,7 +184,10 @@ check_for_monitor(SpawnOpts) ->
 	    false
     end.
 
--spec hibernate(module(), atom(), [term()]) -> no_return().
+-spec hibernate(Module, Function, Args) -> no_return() when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()].
 
 hibernate(M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
     erlang:hibernate(?MODULE, wake_up, [M, F, A]).
@@ -210,35 +253,65 @@ exit_p(Class, Reason) ->
 	    exit(Reason)
     end.
 
--spec start(atom(), atom(), [term()]) -> term().
+-spec start(Module, Function, Args) -> Ret when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Ret :: term() | {error, Reason :: term()}.
 
 start(M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
     start(M, F, A, infinity).
 
--spec start(atom(), atom(), [term()], timeout()) -> term().
+-spec start(Module, Function, Args, Time) -> Ret when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Time :: timeout(),
+      Ret :: term() | {error, Reason :: term()}.
 
 start(M, F, A, Timeout) when is_atom(M), is_atom(F), is_list(A) ->
     Pid = ?MODULE:spawn(M, F, A),
     sync_wait(Pid, Timeout).
 
--spec start(atom(), atom(), [term()], timeout(), [spawn_option()]) -> term().
+-spec start(Module, Function, Args, Time, SpawnOpts) -> Ret when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Time :: timeout(),
+      SpawnOpts :: [spawn_option()],
+      Ret :: term() | {error, Reason :: term()}.
 
 start(M, F, A, Timeout, SpawnOpts) when is_atom(M), is_atom(F), is_list(A) ->
     Pid = ?MODULE:spawn_opt(M, F, A, SpawnOpts),
     sync_wait(Pid, Timeout).
 
--spec start_link(atom(), atom(), [term()]) -> term().
+-spec start_link(Module, Function, Args) -> Ret when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Ret :: term() | {error, Reason :: term()}.
 
 start_link(M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
     start_link(M, F, A, infinity).
 
--spec start_link(atom(), atom(), [term()], timeout()) -> term().
+-spec start_link(Module, Function, Args, Time) -> Ret when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Time :: timeout(),
+      Ret :: term() | {error, Reason :: term()}.
 
 start_link(M, F, A, Timeout) when is_atom(M), is_atom(F), is_list(A) ->
     Pid = ?MODULE:spawn_link(M, F, A),
     sync_wait(Pid, Timeout).
 
--spec start_link(atom(),atom(),[term()],timeout(),[spawn_option()]) -> term().
+-spec start_link(Module, Function, Args, Time, SpawnOpts) -> Ret when
+      Module :: module(),
+      Function :: atom(),
+      Args :: [term()],
+      Time :: timeout(),
+      SpawnOpts :: [spawn_option()],
+      Ret :: term() | {error, Reason :: term()}.
 
 start_link(M,F,A,Timeout,SpawnOpts) when is_atom(M), is_atom(F), is_list(A) ->
     Pid = ?MODULE:spawn_opt(M, F, A, ensure_link(SpawnOpts)),
@@ -267,13 +340,17 @@ flush(Pid) ->
 	    true
     end.
 
--spec init_ack(pid(), term()) -> 'ok'.
+-spec init_ack(Parent, Ret) -> 'ok' when
+      Parent :: pid(),
+      Ret :: term().
 
 init_ack(Parent, Return) ->
     Parent ! {ack, self(), Return},
     ok.
 
--spec init_ack(term()) -> 'ok'.
+-spec init_ack(Ret) -> 'ok' when
+      Ret :: term().
+
 init_ack(Return) ->
     [Parent|_] = get('$ancestors'),
     init_ack(Parent, Return).
@@ -282,7 +359,11 @@ init_ack(Return) ->
 %% Fetch the initial call of a proc_lib spawned process.
 %% -----------------------------------------------------
 
--spec initial_call(dict_or_pid()) -> {atom(), atom(), [atom()]} | 'false'.
+-spec initial_call(Process) -> {Module, Function, Args} | 'false' when
+      Process :: dict_or_pid(),
+      Module :: module(),
+      Function :: atom(),
+      Args :: [atom()].
 
 initial_call(DictOrPid) ->
     case raw_initial_call(DictOrPid) of
@@ -305,7 +386,11 @@ make_dummy_args(N, Acc) ->
 %% This function is typically called from c:i() and c:regs().
 %% -----------------------------------------------------
 
--spec translate_initial_call(dict_or_pid()) -> mfa().
+-spec translate_initial_call(Process) -> {Module, Function, Arity} when
+      Process :: dict_or_pid(),
+      Module :: module(),
+      Function :: atom(),
+      Arity :: byte().
 
 translate_initial_call(DictOrPid) ->
     case raw_initial_call(DictOrPid) of
@@ -577,7 +662,8 @@ check(Res)               -> Res.
 %%% Format (and write) a generated crash info structure.
 %%% -----------------------------------------------------------
 
--spec format([term()]) -> string().
+-spec format(CrashReport) -> string() when
+      CrashReport :: [term()].
 
 format([OwnReport,LinkReport]) ->
     OwnFormat = format_report(OwnReport),
diff --git a/lib/stdlib/src/proplists.erl b/lib/stdlib/src/proplists.erl
index 6a45e0f868..68697d0da2 100644
--- a/lib/stdlib/src/proplists.erl
+++ b/lib/stdlib/src/proplists.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -37,7 +37,7 @@
 %% overriding the default settings, object properties, annotations,
 %% etc.</p>
 %%
-%% @type property() = atom() | tuple()
+%% % @type property() = atom() | tuple()
 
 -module(proplists).
 
@@ -53,14 +53,8 @@
 
 -type property()   :: atom() | tuple().
 
--type aliases()    :: [{any(), any()}].
--type negations()  :: [{any(), any()}].
--type expansions() :: [{property(), [any()]}].
-
 %% ---------------------------------------------------------------------
 
-%% @spec property(P::property()) -> property()
-%%
 %% @doc Creates a normal form (minimal) representation of a property. If
 %% <code>P</code> is <code>{Key, true}</code> where <code>Key</code> is
 %% an atom, this returns <code>Key</code>, otherwise the whole term
@@ -68,7 +62,8 @@
 %%
 %% @see property/2
 
--spec property(property()) -> property().
+-spec property(Property) -> Property when
+      Property :: property().
 
 property({Key, true}) when is_atom(Key) ->
     Key;
@@ -76,8 +71,6 @@ property(Property) ->
     Property.
 
 
-%% @spec property(Key::term(), Value::term()) -> property()
-%%
 %% @doc Creates a normal form (minimal) representation of a simple
 %% key/value property. Returns <code>Key</code> if <code>Value</code> is
 %% <code>true</code> and <code>Key</code> is an atom, otherwise a tuple
@@ -85,7 +78,10 @@ property(Property) ->
 %%
 %% @see property/1
 
--spec property(Key::term(), Value::term()) -> atom() | {term(), term()}.
+-spec property(Key, Value) -> Property when
+      Key :: term(),
+      Value :: term(),
+      Property :: atom() | {term(), term()}.
 
 property(Key, true) when is_atom(Key) ->
     Key;
@@ -95,14 +91,13 @@ property(Key, Value) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec unfold(List::[term()]) -> [term()]
-%%
 %% @doc Unfolds all occurences of atoms in <code>List</code> to tuples
 %% <code>{Atom, true}</code>.
 %%
 %% @see compact/1
 
--spec unfold(List::[term()]) -> [term()].
+-spec unfold(List) -> List when
+      List :: [term()].
 
 unfold([P | Ps]) ->
     if is_atom(P) ->
@@ -113,15 +108,14 @@ unfold([P | Ps]) ->
 unfold([]) ->
     [].
 
-%% @spec compact(List::[term()]) -> [term()]
-%%
 %% @doc Minimizes the representation of all entries in the list. This is
 %% equivalent to <code>[property(P) || P &lt;- List]</code>.
 %%
 %% @see unfold/1
 %% @see property/1
 
--spec compact(List::[property()]) -> [property()].
+-spec compact(List) -> List when
+      List :: [property()].
 
 compact(List) ->
     [property(P) || P <- List].
@@ -129,8 +123,6 @@ compact(List) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec lookup(Key::term(), List::[term()]) -> none | tuple()
-%%
 %% @doc Returns the first entry associated with <code>Key</code> in
 %% <code>List</code>, if one exists, otherwise returns
 %% <code>none</code>. For an atom <code>A</code> in the list, the tuple
@@ -140,7 +132,9 @@ compact(List) ->
 %% @see get_value/2
 %% @see get_bool/2
 
--spec lookup(Key::term(), List::[term()]) -> 'none' | tuple().
+-spec lookup(Key, List) -> 'none' | tuple() when
+      Key :: term(),
+      List :: [term()].
 
 lookup(Key, [P | Ps]) ->
     if is_atom(P), P =:= Key ->
@@ -154,15 +148,15 @@ lookup(Key, [P | Ps]) ->
 lookup(_Key, []) ->
     none.
 
-%% @spec lookup_all(Key::term(), List::[term()]) -> [tuple()]
-%%
 %% @doc Returns the list of all entries associated with <code>Key</code>
 %% in <code>List</code>. If no such entry exists, the result is the
 %% empty list.
 %%
 %% @see lookup/2
 
--spec lookup_all(Key::term(), List::[term()]) -> [tuple()].
+-spec lookup_all(Key, List) -> [tuple()] when
+      Key :: term(),
+      List :: [term()].
 
 lookup_all(Key, [P | Ps]) ->
     if is_atom(P), P =:= Key ->
@@ -178,13 +172,13 @@ lookup_all(_Key, []) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec is_defined(Key::term(), List::[term()]) -> boolean()
-%%
 %% @doc Returns <code>true</code> if <code>List</code> contains at least
 %% one entry associated with <code>Key</code>, otherwise
 %% <code>false</code> is returned.
 
--spec is_defined(Key::term(), List::[term()]) -> boolean().
+-spec is_defined(Key, List) -> boolean() when
+      Key :: term(),
+      List :: [term()].
 
 is_defined(Key, [P | Ps]) ->
     if is_atom(P), P =:= Key ->
@@ -200,17 +194,15 @@ is_defined(_Key, []) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec get_value(Key::term(), List::[term()]) -> term()
 %% @equiv get_value(Key, List, undefined)
 
--spec get_value(Key::term(), List::[term()]) -> term().
+-spec get_value(Key, List) -> term() when
+      Key :: term(),
+      List :: List::[term()].
 
 get_value(Key, List) ->
     get_value(Key, List, undefined).
 
-%% @spec get_value(Key::term(), List::[term()], Default::term()) ->
-%%         term()
-%%
 %% @doc Returns the value of a simple key/value property in
 %% <code>List</code>. If <code>lookup(Key, List)</code> would yield
 %% <code>{Key, Value}</code>, this function returns the corresponding
@@ -221,7 +213,10 @@ get_value(Key, List) ->
 %% @see get_all_values/2
 %% @see get_bool/2
 
--spec get_value(Key::term(), List::[term()], Default::term()) -> term().
+-spec get_value(Key, List, Default) -> term() when
+      Key :: term(),
+      List :: [term()],
+      Default :: term().
 
 get_value(Key, [P | Ps], Default) ->
     if is_atom(P), P =:= Key ->
@@ -240,8 +235,6 @@ get_value(Key, [P | Ps], Default) ->
 get_value(_Key, [], Default) ->
     Default.
 
-%% @spec get_all_values(Key, List) -> [term()]
-%%
 %% @doc Similar to <code>get_value/2</code>, but returns the list of
 %% values for <em>all</em> entries <code>{Key, Value}</code> in
 %% <code>List</code>. If no such entry exists, the result is the empty
@@ -249,7 +242,9 @@ get_value(_Key, [], Default) ->
 %%
 %% @see get_value/2
 
--spec get_all_values(Key::term(), List::[term()]) -> [term()].
+-spec get_all_values(Key, List) -> [term()] when
+      Key :: term(),
+      List :: [term()].
 
 get_all_values(Key, [P | Ps]) ->
     if is_atom(P), P =:= Key ->
@@ -267,8 +262,6 @@ get_all_values(Key, [P | Ps]) ->
 get_all_values(_Key, []) ->
     [].
 
-%% @spec append_values(Key::term(), List::[term()]) -> [term()]
-%%
 %% @doc Similar to <code>get_all_values/2</code>, but each value is
 %% wrapped in a list unless it is already itself a list, and the
 %% resulting list of lists is concatenated. This is often useful for
@@ -278,7 +271,9 @@ get_all_values(_Key, []) ->
 %%
 %% @see get_all_values/2
 
--spec append_values(Key::term(), List::[term()]) -> [term()].
+-spec append_values(Key, List) -> List when
+      Key :: term(),
+      List :: [term()].
 
 append_values(Key, [P | Ps]) ->
     if is_atom(P), P =:= Key ->
@@ -301,8 +296,6 @@ append_values(_Key, []) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec get_bool(Key::term(), List::[term()]) -> boolean()
-%%
 %% @doc Returns the value of a boolean key/value option. If
 %% <code>lookup(Key, List)</code> would yield <code>{Key, true}</code>,
 %% this function returns <code>true</code>; otherwise <code>false</code>
@@ -311,7 +304,9 @@ append_values(_Key, []) ->
 %% @see lookup/2
 %% @see get_value/2
 
--spec get_bool(Key::term(), List::[term()]) -> boolean().
+-spec get_bool(Key, List) -> boolean() when
+      Key :: term(),
+      List :: [term()].
 
 get_bool(Key, [P | Ps]) ->
     if is_atom(P), P =:= Key ->
@@ -333,12 +328,11 @@ get_bool(_Key, []) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec get_keys(List::[term()]) -> [term()]
-%%
 %% @doc Returns an unordered list of the keys used in <code>List</code>,
 %% not containing duplicates.
 
--spec get_keys(List::[term()]) -> [term()].
+-spec get_keys(List) -> [term()] when
+      List :: [term()].
 
 get_keys(Ps) ->
     sets:to_list(get_keys(Ps, sets:new())).
@@ -357,12 +351,12 @@ get_keys([], Keys) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec delete(Key::term(), List::[term()]) -> [term()]
-%%
 %% @doc Deletes all entries associated with <code>Key</code> from
 %% <code>List</code>.
 
--spec delete(Key::term(), List::[term()]) -> [term()].
+-spec delete(Key, List) -> List when
+      Key :: term(),
+      List::[term()].
 
 delete(Key, [P | Ps]) ->
     if is_atom(P), P =:= Key ->
@@ -378,11 +372,6 @@ delete(_, []) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec substitute_aliases(Aliases, List::[term()]) -> [term()]
-%%
-%%	    Aliases = [{Key, Key}]
-%%	    Key = term()
-%%
 %% @doc Substitutes keys of properties. For each entry in
 %% <code>List</code>, if it is associated with some key <code>K1</code>
 %% such that <code>{K1, K2}</code> occurs in <code>Aliases</code>, the
@@ -398,7 +387,10 @@ delete(_, []) ->
 %% @see substitute_negations/2
 %% @see normalize/2
 
--spec substitute_aliases(aliases(), List::[term()]) -> [term()].
+-spec substitute_aliases(Aliases, List) -> List when
+      Aliases :: [{Key, Key}],
+      Key :: term(),
+      List::[term()].
 
 substitute_aliases(As, Props) ->
     [substitute_aliases_1(As, P) || P <- Props].
@@ -417,11 +409,6 @@ substitute_aliases_1([], P) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec substitute_negations(Negations, List::[term()]) -> [term()]
-%%
-%%	    Negations = [{Key, Key}]
-%%	    Key = term()
-%%
 %% @doc Substitutes keys of boolean-valued properties and simultaneously
 %% negates their values. For each entry in <code>List</code>, if it is
 %% associated with some key <code>K1</code> such that <code>{K1,
@@ -443,7 +430,10 @@ substitute_aliases_1([], P) ->
 %% @see substitute_aliases/2
 %% @see normalize/2
 
--spec substitute_negations(negations(), List::[term()]) -> [term()].
+-spec substitute_negations(Negations, List) -> List when
+      Negations :: [{Key, Key}],
+      Key :: term(),
+      List :: [term()].
 
 substitute_negations(As, Props) ->
     [substitute_negations_1(As, P) || P <- Props].
@@ -472,10 +462,6 @@ substitute_negations_1([], P) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec expand(Expansions, List::[term()]) -> [term()]
-%%
-%%	    Expansions = [{property(), [term()]}]
-%%
 %% @doc Expands particular properties to corresponding sets of
 %% properties (or other terms). For each pair <code>{Property,
 %% Expansion}</code> in <code>Expansions</code>, if <code>E</code> is
@@ -510,7 +496,9 @@ substitute_negations_1([], P) ->
 %%
 %% @see normalize/2
 
--spec expand(Expansions::expansions(), [term()]) -> [term()].
+-spec expand(Expansions, List) -> List when
+      Expansions :: [{Property :: property(), Expansion :: [term()]}],
+      List :: [term()].
 
 expand(Es, Ps) when is_list(Ps) ->
     Es1 = [{property(P), V} || {P, V} <- Es],
@@ -589,15 +577,6 @@ flatten([]) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec normalize(List::[term()], Stages::[Operation]) -> [term()]
-%%
-%%	    Operation = {aliases, Aliases} | {negations, Negations}
-%%                    | {expand, Expansions}
-%%	    Aliases = [{Key, Key}]
-%%	    Negations = [{Key, Key}]
-%%	    Key = term()
-%%	    Expansions = [{property(), [term()]}]
-%%
 %% @doc Passes <code>List</code> through a sequence of
 %% substitution/expansion stages. For an <code>aliases</code> operation,
 %% the function <code>substitute_aliases/2</code> is applied using the
@@ -619,11 +598,15 @@ flatten([]) ->
 %% @see expand/2
 %% @see compact/1
 
--type operation() :: {'aliases', aliases()}
-                   | {'negations', negations()}
-                   | {'expand', expansions()}.
-
--spec normalize(List::[term()], Stages::[operation()]) -> [term()].
+-spec normalize(List, Stages) -> List when
+      List :: [term()],
+      Stages :: [Operation],
+      Operation :: {'aliases', Aliases}
+                 | {'negations', Negations}
+                 | {'expand', Expansions},
+      Aliases :: [{Key, Key}],
+      Negations :: [{Key, Key}],
+      Expansions :: [{Property :: property(), Expansion :: [term()]}].
 
 normalize(L, [{aliases, As} | Xs]) ->
     normalize(substitute_aliases(As, L), Xs);
@@ -636,10 +619,6 @@ normalize(L, []) ->
 
 %% ---------------------------------------------------------------------
 
-%% @spec split(List::[term()], Keys::[term()]) -> {Lists, Rest}
-%%           Lists = [[term()]]
-%%           Rest = [term()]
-%%
 %% @doc Partitions <code>List</code> into a list of sublists and a
 %% remainder. <code>Lists</code> contains one sublist for each key in
 %% <code>Keys</code>, in the corresponding order. The relative order of
@@ -654,7 +633,11 @@ normalize(L, []) ->
 %% {[[a], [{b, 5}, b],[{c, 2}, {c, 3, 4}]], [{e, 1}, d]}</pre>
 %% </p>
 
--spec split(List::[term()], Keys::[term()]) -> {[[term()]], [term()]}.
+-spec split(List, Keys) -> {Lists, Rest} when
+      List :: [term()],
+      Keys :: [term()],
+      Lists :: [[term()]],
+      Rest :: [term()].
 
 split(List, Keys) ->
     {Store, Rest} = split(List, dict:from_list([{K, []} || K <- Keys]), []),
diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index bc6944e520..5ca04ff023 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -60,7 +60,7 @@
 
 -record(qlc_table,   % qlc:table/2
         {trav_fun,   % traverse fun
-         trav_MS,    % bool(); true iff traverse fun takes a match spec
+         trav_MS,    % boolean(); true iff traverse fun takes a match spec
          pre_fun,
          post_fun,
          info_fun,
@@ -110,12 +110,12 @@
 -record(qlc_cursor, {c}).
 
 -record(qlc_opt,
-        {unique = false,      % bool()
-         cache = false,       % bool() | list (true~ets, false~no)
+        {unique = false,      % boolean()
+         cache = false,       % boolean() | list (true~ets, false~no)
          max_lookup = -1,     % int() >= 0 | -1 (represents infinity)
          join = any,          % any | nested_loop | merge | lookup
          tmpdir = "",         % global tmpdir
-         lookup = any,        % any | bool()
+         lookup = any,        % any | boolean()
          max_list = ?MAX_LIST_SIZE,  % int() >= 0
          tmpdir_usage = allowed    % allowed | not_allowed 
                                    %  | warning_msg | error_msg | info_msg
@@ -125,6 +125,8 @@
 
 -define(THROWN_ERROR, {?MODULE, throw_error, _}).
 
+-export_type([query_handle/0]).
+
 %%% A query handle is a tuple {qlc_handle, Handle} where Handle is one
 %%% of #qlc_append, #qlc_table, #qlc_sort, and #qlc_lc.
 
@@ -144,6 +146,35 @@ get_handle(_) ->
 %%% Exported functions
 %%%
 
+-type(query_list_comprehension() :: term()).
+-opaque(query_cursor() :: {qlc_cursor, term()}).
+-opaque(query_handle() :: {qlc_handle, term()}).
+-type(query_handle_or_list() :: query_handle() | list()).
+-type(answers() :: [answer()]).
+-type(answer() :: term()).
+-type(abstract_expr() :: erl_parse:abstract_expr()).
+-type(match_expression() :: ets:match_spec()).
+-type(spawn_options() :: default | [proc_lib:spawn_option()]).
+-type(sort_options() :: [sort_option()] | sort_option()).
+-type(sort_option() :: {compressed, boolean()}
+                     | {no_files, no_files()}
+                     | {order, order()}
+                     | {size, pos_integer()}
+                     | {tmpdir, tmp_directory()}
+                     | {unique, boolean()}).
+-type(order() :: ascending | descending | order_fun()).
+-type(order_fun() :: fun((term(), term()) -> boolean())).
+-type(tmp_directory() :: [] | file:name()).
+-type(no_files() :: pos_integer()). % > 1
+-type(key_pos() :: pos_integer() | [pos_integer()]).
+-type(max_list_size() :: non_neg_integer()).
+-type(cache() :: ets | list | no).
+-type(tmp_file_usage() :: allowed | not_allowed | info_msg
+                        | warning_msg  | error_msg).
+
+-spec(append(QHL) -> QH when
+      QHL :: [query_handle_or_list()],
+      QH :: query_handle()).
 append(QHs) ->
     Hs = [case get_handle(QH) of
               badarg -> erlang:error(badarg, [QHs]);
@@ -151,6 +182,10 @@ append(QHs) ->
           end || QH <- QHs],
     #qlc_handle{h = #qlc_append{hl = Hs}}.
 
+-spec(append(QH1, QH2) -> QH3 when
+      QH1 :: query_handle_or_list(),
+      QH2 :: query_handle_or_list(),
+      QH3 :: query_handle()).
 append(QH1, QH2) ->
     Hs = [case get_handle(QH) of
               badarg -> erlang:error(badarg, [QH1, QH2]);
@@ -158,9 +193,22 @@ append(QH1, QH2) ->
           end || QH <- [QH1, QH2]],
     #qlc_handle{h = #qlc_append{hl = Hs}}.
 
+-spec(cursor(QH) -> Cursor when
+      QH :: query_handle_or_list(),
+      Cursor :: query_cursor()).
 cursor(QH) ->
     cursor(QH, []).
 
+-spec(cursor(QH, Options) -> Cursor when
+      QH :: query_handle_or_list(),
+      Options :: [Option] | Option,
+      Option :: {cache_all, cache()} | cache_all
+              | {max_list_size, max_list_size()}
+              | {spawn_options, spawn_options()}
+              | {tmpdir_usage, tmp_file_usage()}
+              | {tmpdir, tmp_directory()}
+              | {unique_all, boolean()} | unique_all,
+      Cursor :: query_cursor()).
 cursor(QH, Options) ->
     case {options(Options, [unique_all, cache_all, tmpdir, 
                             spawn_options, max_list_size, 
@@ -179,6 +227,8 @@ cursor(QH, Options) ->
             end
     end.
 
+-spec(delete_cursor(QueryCursor) -> ok when
+      QueryCursor :: query_cursor()).
 delete_cursor(#qlc_cursor{c = {_, Owner}}=C) when Owner =/= self() ->
     erlang:error(not_cursor_owner, [C]);
 delete_cursor(#qlc_cursor{c = {Pid, _}}) ->
@@ -186,15 +236,47 @@ delete_cursor(#qlc_cursor{c = {Pid, _}}) ->
 delete_cursor(T) ->
     erlang:error(badarg, [T]).
 
+-spec(e(QH) -> Answers | Error when
+      QH :: query_handle_or_list(),
+      Answers :: answers(),
+      Error :: {error, module(), Reason},
+      Reason :: file_sorter:reason()).
 e(QH) ->
     eval(QH, []).
 
+-spec(e(QH, Options) -> Answers | Error when
+      QH :: query_handle_or_list(),
+      Options :: [Option] | Option,
+      Option :: {cache_all, cache()} | cache_all
+              | {max_list_size, max_list_size()}
+              | {tmpdir_usage, tmp_file_usage()}
+              | {tmpdir, tmp_directory()}
+              | {unique_all, boolean()} | unique_all,
+      Answers :: answers(),
+      Error :: {error, module(), Reason},
+      Reason :: file_sorter:reason()).
 e(QH, Options) ->
     eval(QH, Options).
 
+-spec(eval(QH) -> Answers | Error when
+      QH :: query_handle_or_list(),
+      Answers :: answers(),
+      Error :: {error, module(), Reason},
+      Reason :: file_sorter:reason()).
 eval(QH) ->
     eval(QH, []).
 
+-spec(eval(QH, Options) -> Answers | Error when
+      QH :: query_handle_or_list(),
+      Answers :: answers(),
+      Options :: [Option] | Option,
+      Option :: {cache_all, cache()} | cache_all
+              | {max_list_size, max_list_size()}
+              | {tmpdir_usage, tmp_file_usage()}
+              | {tmpdir, tmp_directory()}
+              | {unique_all, boolean()} | unique_all,
+      Error :: {error, module(), Reason},
+      Reason :: file_sorter:reason()).
 eval(QH, Options) ->
     case {options(Options, [unique_all, cache_all, tmpdir, max_list_size,
                             tmpdir_usage]),
@@ -226,9 +308,35 @@ eval(QH, Options) ->
             end
     end.
 
+-spec(fold(Function, Acc0, QH) ->
+               Acc1 | Error when
+      QH :: query_handle_or_list(),
+      Function :: fun((answer(), AccIn) -> AccOut),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term(),
+      Error :: {error, module(), Reason},
+      Reason :: file_sorter:reason()).
 fold(Fun, Acc0, QH) ->
     fold(Fun, Acc0, QH, []).
 
+-spec(fold(Function, Acc0, QH, Options) ->
+               Acc1 | Error when
+      QH :: query_handle_or_list(),
+      Function :: fun((answer(), AccIn) -> AccOut),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term(),
+      Options :: [Option] | Option,
+      Option :: {cache_all, cache()} | cache_all
+              | {max_list_size, max_list_size()}
+              | {tmpdir_usage, tmp_file_usage()}
+              | {tmpdir, tmp_directory()}
+              | {unique_all, boolean()} | unique_all,
+      Error :: {error, module(), Reason},
+      Reason :: file_sorter:reason()).
 fold(Fun, Acc0, QH, Options) ->
     case {options(Options, [unique_all, cache_all, tmpdir, max_list_size,
                             tmpdir_usage]), 
@@ -258,6 +366,9 @@ fold(Fun, Acc0, QH, Options) ->
             end
     end.
 
+-spec(format_error(Error) -> Chars when
+      Error :: {error, module(), term()},
+      Chars :: io_lib:chars()).
 format_error(not_a_query_list_comprehension) ->
     io_lib:format("argument is not a query list comprehension", []);
 format_error({used_generator_variable, V}) ->
@@ -295,9 +406,29 @@ format_error({error, Module, Reason}) ->
 format_error(E) ->
     io_lib:format("~p~n", [E]).
 
+-spec(info(QH) -> Info when
+      QH :: query_handle_or_list(),
+      Info :: abstract_expr() | string()).
 info(QH) ->
     info(QH, []).
 
+-spec(info(QH, Options) -> Info when
+      QH :: query_handle_or_list(),
+      Options :: [Option] | Option,
+      Option :: EvalOption | ReturnOption,
+      EvalOption :: {cache_all, cache()} | cache_all
+                  | {max_list_size, max_list_size()}
+                  | {tmpdir_usage, tmp_file_usage()}
+                  | {tmpdir, tmp_directory()}
+                  | {unique_all, boolean()} | unique_all,
+      ReturnOption :: {depth, Depth}
+                    | {flat, boolean()}
+                    | {format, Format}
+                    | {n_elements, NElements},
+      Depth :: infinity | non_neg_integer(),
+      Format :: abstract_code | string,
+      NElements :: infinity | pos_integer(),
+      Info :: abstract_expr() | string()).
 info(QH, Options) ->
     case {options(Options, [unique_all, cache_all, flat, format, n_elements, 
                             depth, tmpdir, max_list_size, tmpdir_usage]),
@@ -333,9 +464,18 @@ info(QH, Options) ->
             end
     end.
 
+-spec(keysort(KeyPos, QH1) -> QH2 when
+      KeyPos :: key_pos(),
+      QH1 :: query_handle_or_list(),
+      QH2 :: query_handle()).
 keysort(KeyPos, QH) ->
     keysort(KeyPos, QH, []).
 
+-spec(keysort(KeyPos, QH1, SortOptions) -> QH2 when
+      KeyPos :: key_pos(),
+      SortOptions :: sort_options(),
+      QH1 :: query_handle_or_list(),
+      QH2 :: query_handle()).
 keysort(KeyPos, QH, Options) ->
     case {is_keypos(KeyPos), 
           options(Options, [tmpdir, order, unique, compressed, 
@@ -354,9 +494,22 @@ keysort(KeyPos, QH, Options) ->
 
 -define(DEFAULT_NUM_OF_ANSWERS, 10).
 
+-spec(next_answers(QueryCursor) ->
+            Answers | Error when
+      QueryCursor :: query_cursor(),
+      Answers :: answers(),
+      Error :: {error, module(), Reason},
+      Reason :: file_sorter:reason()).
 next_answers(C) ->
     next_answers(C, ?DEFAULT_NUM_OF_ANSWERS).
 
+-spec(next_answers(QueryCursor, NumberOfAnswers) ->
+            Answers | Error when
+      QueryCursor :: query_cursor(),
+      Answers :: answers(),
+      NumberOfAnswers :: all_remaining | pos_integer(),
+      Error :: {error, module(), Reason},
+      Reason :: file_sorter:reason()).
 next_answers(#qlc_cursor{c = {_, Owner}}=C, 
              NumOfAnswers) when Owner =/= self() ->
     erlang:error(not_cursor_owner, [C, NumOfAnswers]);
@@ -370,14 +523,35 @@ next_answers(#qlc_cursor{c = {Pid, _}}=C, NumOfAnswers) ->
 next_answers(T1, T2) ->
     erlang:error(badarg, [T1, T2]).
 
+-spec(parse_transform(Forms, Options) -> Forms2 when
+      Forms :: [erl_parse:abstract_form()],
+      Forms2 :: [erl_parse:abstract_form()],
+      Options :: [Option],
+      Option :: type_checker | compile:option()).
+
 parse_transform(Forms, Options) ->
     qlc_pt:parse_transform(Forms, Options).
 
 %% The funcspecs qlc:q/1 and qlc:q/2 are known by erl_eval.erl and
 %% erl_lint.erl.
+-spec(q(QLC) -> QH when
+      QLC :: query_list_comprehension(),
+      QH :: query_handle()).
 q(QLC_lc) ->
     q(QLC_lc, []).
 
+-spec(q(QLC, Options) -> QH when
+      QH :: query_handle(),
+      Options :: [Option] | Option,
+      Option :: {max_lookup, MaxLookup}
+              | {cache, cache()} | cache
+              | {join, Join}
+              | {lookup, Lookup}
+              | {unique, boolean()} | unique,
+      MaxLookup :: non_neg_integer() | infinity,
+      Join :: any | lookup | merge | nested_loop,
+      Lookup :: boolean() | any,
+      QLC :: query_list_comprehension()).
 q(#qlc_lc{}=QLC_lc, Options) ->
     case options(Options, [unique, cache, max_lookup, join, lookup]) of
         [Unique, Cache, Max, Join, Lookup] ->
@@ -390,9 +564,16 @@ q(#qlc_lc{}=QLC_lc, Options) ->
 q(T1, T2) ->
     erlang:error(badarg, [T1, T2]).
 
+-spec(sort(QH1) -> QH2 when
+      QH1 :: query_handle_or_list(),
+      QH2 :: query_handle()).
 sort(QH) ->
     sort(QH, []).
 
+-spec(sort(QH1, SortOptions) -> QH2 when
+      SortOptions :: sort_options(),
+      QH1 :: query_handle_or_list(),
+      QH2 :: query_handle()).
 sort(QH, Options) ->
     case {options(Options, [tmpdir, order, unique, compressed, 
                             size, no_files]), get_handle(QH)} of
@@ -406,14 +587,47 @@ sort(QH, Options) ->
     end.
 
 %% Note that the generated code is evaluated by (the slow) erl_eval.
+-spec(string_to_handle(QueryString) -> QH | Error when
+      QueryString :: string(),
+      QH :: query_handle(),
+      Error :: {error, module(), Reason},
+      Reason :: erl_parse:error_info() | erl_scan:error_info()).
 string_to_handle(Str) ->
     string_to_handle(Str, []).
 
+-spec(string_to_handle(QueryString, Options) -> QH | Error when
+      QueryString :: string(),
+      Options :: [Option] | Option,
+      Option :: {max_lookup, MaxLookup}
+              | {cache, cache()} | cache
+              | {join, Join}
+              | {lookup, Lookup}
+              | {unique, boolean()} | unique,
+      MaxLookup :: non_neg_integer() | infinity,
+      Join :: any | lookup | merge | nested_loop,
+      Lookup :: boolean() | any,
+      QH :: query_handle(),
+      Error :: {error, module(), Reason},
+      Reason :: erl_parse:error_info() | erl_scan:error_info()).
 string_to_handle(Str, Options) ->
-    string_to_handle(Str, Options, []).
-
-string_to_handle(Str, Options, Bindings) when is_list(Str), 
-                                              is_list(Bindings) ->
+    string_to_handle(Str, Options, erl_eval:new_bindings()).
+
+-spec(string_to_handle(QueryString, Options, Bindings) -> QH | Error when
+      QueryString :: string(),
+      Options :: [Option] | Option,
+      Option :: {max_lookup, MaxLookup}
+              | {cache, cache()} | cache
+              | {join, Join}
+              | {lookup, Lookup}
+              | {unique, boolean()} | unique,
+      MaxLookup :: non_neg_integer() | infinity,
+      Join :: any | lookup | merge | nested_loop,
+      Lookup :: boolean() | any,
+      Bindings :: erl_eval:binding_struct(),
+      QH :: query_handle(),
+      Error :: {error, module(), Reason},
+      Reason :: erl_parse:error_info() | erl_scan:error_info()).
+string_to_handle(Str, Options, Bindings) when is_list(Str) ->
     case options(Options, [unique, cache, max_lookup, join, lookup]) of
         badarg ->
             erlang:error(badarg, [Str, Options, Bindings]);
@@ -447,6 +661,51 @@ string_to_handle(Str, Options, Bindings) when is_list(Str),
 string_to_handle(T1, T2, T3) ->    
     erlang:error(badarg, [T1, T2, T3]).
 
+-spec(table(TraverseFun, Options) -> QH when
+      TraverseFun :: TraverseFun0 | TraverseFun1,
+      TraverseFun0 :: fun(() -> TraverseResult),
+      TraverseFun1 :: fun((match_expression()) -> TraverseResult),
+      TraverseResult :: Objects | term(),
+      Objects :: [] | [term() | ObjectList],
+      ObjectList :: TraverseFun0 | Objects,
+      Options :: [Option] | Option,
+      Option :: {format_fun, FormatFun}
+              | {info_fun, InfoFun}
+              | {lookup_fun, LookupFun}
+              | {parent_fun, ParentFun}
+              | {post_fun, PostFun}
+              | {pre_fun, PreFun}
+              | {key_equality, KeyComparison},
+      FormatFun :: undefined  | fun((SelectedObjects) -> FormatedTable),
+      SelectedObjects :: all
+                       | {all, NElements, DepthFun}
+                       | {match_spec, match_expression()}
+                       | {lookup, Position, Keys}
+                       | {lookup, Position, Keys, NElements, DepthFun},
+      NElements :: infinity | pos_integer(),
+      DepthFun :: fun((term()) -> term()),
+      FormatedTable :: {Mod, Fun, Args}
+                     | abstract_expr()
+                     | string(),
+      InfoFun :: undefined  | fun((InfoTag) -> InfoValue),
+      InfoTag :: indices | is_unique_objects | keypos | num_of_objects,
+      InfoValue :: undefined  | term(),
+      LookupFun :: undefined  | fun((Position, Keys) -> LookupResult),
+      LookupResult :: [term()] | term(),
+      ParentFun :: undefined  | fun(() -> ParentFunValue),
+      PostFun :: undefined  | fun(() -> term()),
+      PreFun :: undefined  | fun((PreArgs) -> term()),
+      PreArgs :: [PreArg],
+      PreArg :: {parent_value, ParentFunValue}  | {stop_fun, StopFun},
+      ParentFunValue :: undefined  | term(),
+      StopFun :: undefined  | fun(() -> term()),
+      KeyComparison :: '=:=' | '==',
+      Position :: pos_integer(),
+      Keys :: [term()],
+      Mod :: atom(),
+      Fun :: atom(),
+      Args :: [term()],
+      QH :: query_handle()).
 table(TraverseFun, Options) when is_function(TraverseFun) ->
     case {is_function(TraverseFun, 0), 
           IsFun1 = is_function(TraverseFun, 1)} of
@@ -472,6 +731,11 @@ table(TraverseFun, Options) when is_function(TraverseFun) ->
 table(T1, T2) ->
     erlang:error(badarg, [T1, T2]).
 
+-spec(transform_from_evaluator(LC, Bs) -> Expr when
+      LC :: abstract_expr(),
+      Expr :: abstract_expr(),
+      Bs :: erl_eval:binding_struct()).
+
 transform_from_evaluator(LC, Bs0) ->
     qlc_pt:transform_from_evaluator(LC, Bs0).
 
@@ -722,8 +986,8 @@ listify(T) ->
 
 %% Optimizations to be carried out.
 -record(optz,
-        {unique = false,    % bool()
-         cache = false,     % bool() | list
+        {unique = false,    % boolean()
+         cache = false,     % boolean() | list
          join_option = any, % constraint set by the 'join' option
          fast_join = no,    % no | #qlc_join. 'no' means nested loop.
          opt                % #qlc_opt
@@ -756,8 +1020,8 @@ listify(T) ->
          lu_skip_quals = [], % qualifiers to skip due to lookup
          join = {[],[]},  % {Lookup, Merge}
          n_objs = undefined,   % for join (not used yet)
-         is_unique_objects = false, % bool()
-         is_cached = false          % bool() (true means 'ets' or 'list')
+         is_unique_objects = false, % boolean()
+         is_cached = false          % boolean() (true means 'ets' or 'list')
         }).
 
 %%% Cursor process functions.
@@ -1143,20 +1407,20 @@ monitor_request(Pid, Req) ->
 %% QueryDesc = {qlc, TemplateDesc, [QualDesc], [QueryOpt]} 
 %%           | {table, TableDesc}
 %%           | {append, [QueryDesc]}
-%%           | {sort, QueryDesc, [SortOption]}
-%%           | {keysort, KeyPos, QueryDesc, [SortOption]}
+%%           | {sort, QueryDesc, [sort_option()]}
+%%           | {keysort, key_pos(), QueryDesc, [sort_option()]}
 %%           | {list, list()}
-%%           | {list, QueryDesc, MatchExpression}
+%%           | {list, QueryDesc, match_expression()}
 %% TableDesc = {Mod, Fun, Args}
-%%           | AbstractExpression
-%%           | character_list()
+%%           | erl_parse:abstract_expr()
+%%           | string()
 %% Mod = module()
 %% Fun = atom()
 %% Args = [term()]
 %% QualDesc = FilterDesc
 %%          | {generate, PatternDesc, QueryDesc}
-%% QueryOpt = {cache, bool()} | cache 
-%%          | {unique, bool()} | unique
+%% QueryOpt = {cache, boolean()} | cache
+%%          | {unique, boolean()} | unique
 %% FilterDesc = PatternDesc = TemplateDesc = binary()
 
 le_info(#prepared{qh = #simple_qlc{le = LE, p = P, line = L, optz = Optz}},
diff --git a/lib/stdlib/src/qlc_pt.erl b/lib/stdlib/src/qlc_pt.erl
index 24378a0698..21504d707b 100644
--- a/lib/stdlib/src/qlc_pt.erl
+++ b/lib/stdlib/src/qlc_pt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -63,6 +63,12 @@
 %%% Exported functions
 %%%
 
+-spec(parse_transform(Forms, Options) -> Forms2 when
+      Forms :: [erl_parse:abstract_form()],
+      Forms2 :: [erl_parse:abstract_form()],
+      Options :: [Option],
+      Option :: type_checker | compile:option()).
+
 parse_transform(Forms, Options) ->
     ?DEBUG("qlc Parse Transform~n", []),
     State = #state{imp = is_qlc_q_imported(Forms),
@@ -96,10 +102,20 @@ parse_transform(Forms, Options) ->
             end
     end.
 
+-spec(transform_from_evaluator(LC, Bs) -> Expr when
+      LC :: erl_parse:abstract_expr(),
+      Expr :: erl_parse:abstract_expr(),
+      Bs :: erl_eval:binding_struct()).
+
 transform_from_evaluator(LC, Bindings) ->
     ?DEBUG("qlc Parse Transform (Evaluator Version)~n", []),
     transform_expression(LC, Bindings, false).
 
+-spec(transform_expression(LC, Bs) -> Expr when
+      LC :: erl_parse:abstract_expr(),
+      Expr :: erl_parse:abstract_expr(),
+      Bs :: erl_eval:binding_struct()).
+
 transform_expression(LC, Bindings) ->
     transform_expression(LC, Bindings, true).
 
diff --git a/lib/stdlib/src/queue.erl b/lib/stdlib/src/queue.erl
index c09079e8d2..4c6b4d710b 100644
--- a/lib/stdlib/src/queue.erl
+++ b/lib/stdlib/src/queue.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -56,14 +56,16 @@
 new() -> {[],[]}. %{RearList,FrontList}
 
 %% O(1)
--spec is_queue(term()) -> boolean().
+-spec is_queue(Term) -> boolean() when
+      Term :: term().
 is_queue({R,F}) when is_list(R), is_list(F) ->
     true;
 is_queue(_) ->
     false.
 
 %% O(1)
--spec is_empty(queue()) -> boolean().
+-spec is_empty(Q) -> boolean() when
+      Q :: queue().
 is_empty({[],[]}) ->
     true;
 is_empty({In,Out}) when is_list(In), is_list(Out) ->
@@ -72,14 +74,16 @@ is_empty(Q) ->
     erlang:error(badarg, [Q]).
 
 %% O(len(Q))
--spec len(queue()) -> non_neg_integer().
+-spec len(Q) -> non_neg_integer() when
+      Q :: queue().
 len({R,F}) when is_list(R), is_list(F) ->
     length(R)+length(F);
 len(Q) ->
     erlang:error(badarg, [Q]).
 
 %% O(len(Q))
--spec to_list(queue()) -> list().
+-spec to_list(Q) -> list() when
+      Q :: queue().
 to_list({In,Out}) when is_list(In), is_list(Out) ->
     Out++lists:reverse(In, []);
 to_list(Q) ->
@@ -88,7 +92,8 @@ to_list(Q) ->
 %% Create queue from list
 %%
 %% O(length(L))
--spec from_list(list()) -> queue().
+-spec from_list(L) -> queue() when
+      L :: list().
 from_list(L) when is_list(L) ->
     f2r(L);
 from_list(L) ->
@@ -97,7 +102,9 @@ from_list(L) ->
 %% Return true or false depending on if element is in queue
 %% 
 %% O(length(Q)) worst case
--spec member(term(), queue()) -> boolean().
+-spec member(Item, Q) -> boolean() when
+      Item :: term(),
+      Q :: queue().
 member(X, {R,F}) when is_list(R), is_list(F) ->
     lists:member(X, R) orelse lists:member(X, F);
 member(X, Q) ->
@@ -110,7 +117,10 @@ member(X, Q) ->
 %% Put at least one element in each list, if it is cheap
 %%
 %% O(1)
--spec in(term(), queue()) -> queue().
+-spec in(Item, Q1) -> Q2 when
+      Item :: term(),
+      Q1 :: queue(),
+      Q2 :: queue().
 in(X, {[_]=In,[]}) ->
     {[X], In};
 in(X, {In,Out}) when is_list(In), is_list(Out) ->
@@ -122,7 +132,10 @@ in(X, Q) ->
 %% Put at least one element in each list, if it is cheap
 %%
 %% O(1)
--spec in_r(term(), queue()) -> queue().
+-spec in_r(Item, Q1) -> Q2 when
+      Item :: term(),
+      Q1 :: queue(),
+      Q2 :: queue().
 in_r(X, {[],[_]=F}) ->
     {F,[X]};
 in_r(X, {R,F}) when is_list(R), is_list(F) ->
@@ -133,7 +146,10 @@ in_r(X, Q) ->
 %% Take from head/front
 %%
 %% O(1) amortized, O(len(Q)) worst case
--spec out(queue()) -> {'empty' | {'value',term()}, queue()}.
+-spec out(Q1) -> Result when
+      Q1 :: queue(),
+      Q2 :: queue(),
+      Result :: {{value, Item :: term()}, Q2} | {empty, Q1}.
 out({[],[]}=Q) ->
     {empty,Q};
 out({[V],[]}) ->
@@ -151,7 +167,10 @@ out(Q) ->
 %% Take from tail/rear
 %%
 %% O(1) amortized, O(len(Q)) worst case
--spec out_r(queue()) -> {'empty' | {'value',term()}, queue()}.
+-spec out_r(Q1) -> Result when
+      Q1 :: queue(),
+      Q2 :: queue(),
+      Result :: {{value, Item :: term()}, Q2} | {empty, Q1}.
 out_r({[],[]}=Q) ->
     {empty,Q};
 out_r({[],[V]}) ->
@@ -172,7 +191,9 @@ out_r(Q) ->
 %% Return the first element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec get(queue()) -> term().
+-spec get(Q) -> Item when
+      Q :: queue(),
+      Item :: term().
 get({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 get({R,F}) when is_list(R), is_list(F) ->
@@ -191,7 +212,9 @@ get([_|R], []) -> % malformed queue -> O(len(Q))
 %% Return the last element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec get_r(queue()) -> term().
+-spec get_r(Q) -> Item when
+      Q :: queue(),
+      Item :: term().
 get_r({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 get_r({[H|_],F}) when is_list(F) ->
@@ -206,7 +229,9 @@ get_r(Q) ->
 %% Return the first element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec peek(queue()) -> 'empty' | {'value',term()}.
+-spec peek(Q) -> 'empty' | {'value',Item} when
+      Q :: queue(),
+      Item :: term().
 peek({[],[]}) ->
     empty;
 peek({R,[H|_]}) when is_list(R) ->
@@ -221,7 +246,9 @@ peek(Q) ->
 %% Return the last element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec peek_r(queue()) -> 'empty' | {'value',term()}.
+-spec peek_r(Q) -> 'empty' | {'value',Item} when
+      Q :: queue(),
+      Item :: term().
 peek_r({[],[]}) ->
     empty;
 peek_r({[H|_],F}) when is_list(F) ->
@@ -236,7 +263,9 @@ peek_r(Q) ->
 %% Remove the first element and return resulting queue
 %%
 %% O(1) amortized
--spec drop(queue()) -> queue().
+-spec drop(Q1) -> Q2 when
+      Q1 :: queue(),
+      Q2 :: queue().
 drop({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 drop({[_],[]}) ->
@@ -254,7 +283,9 @@ drop(Q) ->
 %% Remove the last element and return resulting queue
 %%
 %% O(1) amortized
--spec drop_r(queue()) -> queue().
+-spec drop_r(Q1) -> Q2 when
+      Q1 :: queue(),
+      Q2 :: queue().
 drop_r({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 drop_r({[],[_]}) ->
@@ -275,7 +306,9 @@ drop_r(Q) ->
 %% Return reversed queue
 %%
 %% O(1)
--spec reverse(queue()) -> queue().
+-spec reverse(Q1) -> Q2 when
+      Q1 :: queue(),
+      Q2 :: queue().
 reverse({R,F}) when is_list(R), is_list(F) ->
     {F,R};
 reverse(Q) ->
@@ -285,7 +318,10 @@ reverse(Q) ->
 %%
 %% Q2 empty: O(1)
 %% else:     O(len(Q1))
--spec join(queue(), queue()) -> queue().
+-spec join(Q1, Q2) -> Q3 when
+      Q1 :: queue(),
+      Q2 :: queue(),
+      Q3 :: queue().
 join({R,F}=Q, {[],[]}) when is_list(R), is_list(F) ->
     Q;
 join({[],[]}, {R,F}=Q) when is_list(R), is_list(F) ->
@@ -299,7 +335,11 @@ join(Q1, Q2) ->
 %%
 %% N = 0..len(Q)
 %% O(max(N, len(Q)))
--spec split(non_neg_integer(), queue()) -> {queue(),queue()}.
+-spec split(N, Q1) -> {Q2,Q3} when
+      N :: non_neg_integer(),
+      Q1 :: queue(),
+      Q2 :: queue(),
+      Q3 :: queue().
 split(0, {R,F}=Q) when is_list(R), is_list(F) ->
     {{[],[]},Q};
 split(N, {R,F}=Q) when is_integer(N), N >= 1, is_list(R), is_list(F) ->
@@ -340,7 +380,10 @@ split_r1_to_f2(N, [X|R1], F1, R2, F2) ->
 %% 
 %% Fun(_) -> List: O(length(List) * len(Q))
 %% else:           O(len(Q)
--spec filter(fun((term()) -> boolean() | list()), queue()) -> queue().
+-spec filter(Fun, Q1) -> Q2 when
+      Fun :: fun((Item :: term()) -> boolean() | list()),
+      Q1 :: queue(),
+      Q2 :: queue().
 filter(Fun, {R0,F0}) when is_function(Fun, 1), is_list(R0), is_list(F0) ->
     F = filter_f(Fun, F0),
     R = filter_r(Fun, R0),
@@ -416,7 +459,10 @@ filter_r(Fun, [X|R0]) ->
 
 %% Cons to head
 %%
--spec cons(term(), queue()) -> queue().
+-spec cons(Item, Q1) -> Q2 when
+      Item :: term(),
+      Q1 :: queue(),
+      Q2 :: queue().
 cons(X, Q) ->
     in_r(X, Q).
 
@@ -425,7 +471,9 @@ cons(X, Q) ->
 %% Return the first element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec head(queue()) -> term().
+-spec head(Q) -> Item when
+      Q :: queue(),
+      Item :: term().
 head({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 head({R,F}) when is_list(R), is_list(F) ->
@@ -435,7 +483,9 @@ head(Q) ->
 
 %% Remove head element and return resulting queue
 %%
--spec tail(queue()) -> queue().
+-spec tail(Q1) -> Q2 when
+      Q1 :: queue(),
+      Q2 :: queue().
 tail(Q) ->
     drop(Q).
 
@@ -443,22 +493,35 @@ tail(Q) ->
 
 %% Cons to tail
 %%
--spec snoc(queue(), term()) -> queue().
+-spec snoc(Q1, Item) -> Q2 when
+      Q1 :: queue(),
+      Q2 :: queue(),
+      Item :: term().
 snoc(Q, X) ->
     in(X, Q).
 
 %% Return last element
--spec daeh(queue()) -> term().
+-spec daeh(Q) -> Item when
+      Q :: queue(),
+      Item :: term().
 daeh(Q) -> get_r(Q).
--spec last(queue()) -> term().
+-spec last(Q) -> Item when
+      Q :: queue(),
+      Item :: term().
 last(Q) -> get_r(Q).
 
 %% Remove last element and return resulting queue
--spec liat(queue()) -> queue().
+-spec liat(Q1) -> Q2 when
+      Q1 :: queue(),
+      Q2 :: queue().
 liat(Q) -> drop_r(Q).
--spec lait(queue()) -> queue().
+-spec lait(Q1) -> Q2 when
+      Q1 :: queue(),
+      Q2 :: queue().
 lait(Q) -> drop_r(Q). %% Oops, mis-spelled 'tail' reversed. Forget this one.
--spec init(queue()) -> queue().
+-spec init(Q1) -> Q2 when
+      Q1 :: queue(),
+      Q2 :: queue().
 init(Q) -> drop_r(Q).
 
 %%--------------------------------------------------------------------------
diff --git a/lib/stdlib/src/random.erl b/lib/stdlib/src/random.erl
index 01227c29b4..dbb524cc74 100644
--- a/lib/stdlib/src/random.erl
+++ b/lib/stdlib/src/random.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -49,7 +49,10 @@ seed() ->
 %% seed({A1, A2, A3}) 
 %%  Seed random number generation 
 
--spec seed({integer(), integer(), integer()}) -> 'undefined' | ran().
+-spec seed({A1, A2, A3}) -> 'undefined' | ran() when
+      A1 :: integer(),
+      A2 :: integer(),
+      A3 :: integer().
 
 seed({A1, A2, A3}) ->
     seed(A1, A2, A3).
@@ -57,7 +60,10 @@ seed({A1, A2, A3}) ->
 %% seed(A1, A2, A3) 
 %%  Seed random number generation 
 
--spec seed(integer(), integer(), integer()) -> 'undefined' | ran().
+-spec seed(A1, A2, A3) -> 'undefined' | ran() when
+      A1 :: integer(),
+      A2 :: integer(),
+      A3 :: integer().
 
 seed(A1, A2, A3) ->
     put(random_seed, 
@@ -93,7 +99,8 @@ uniform() ->
 %%  Given an integer N >= 1, uniform(N) returns a random integer
 %%  between 1 and N.
 
--spec uniform(pos_integer()) -> pos_integer().
+-spec uniform(N) -> pos_integer() when
+      N :: pos_integer().
 
 uniform(N) when is_integer(N), N >= 1 ->
     trunc(uniform() * N) + 1.
@@ -104,7 +111,9 @@ uniform(N) when is_integer(N), N >= 1 ->
 %% uniform_s(State) -> {F, NewState}
 %%  Returns a random float between 0 and 1.
 
--spec uniform_s(ran()) -> {float(), ran()}.
+-spec uniform_s(State0) -> {float(), State1} when
+      State0 :: ran(),
+      State1 :: ran().
 
 uniform_s({A1, A2, A3}) ->
     B1 = (A1*171) rem 30269,
@@ -117,7 +126,10 @@ uniform_s({A1, A2, A3}) ->
 %%  Given an integer N >= 1, uniform(N) returns a random integer
 %%  between 1 and N.
 
--spec uniform_s(pos_integer(), ran()) -> {integer(), ran()}.
+-spec uniform_s(N, State0) -> {integer(), State1} when
+      N :: pos_integer(),
+      State0 :: ran(),
+      State1 :: ran().
 
 uniform_s(N, State0) when is_integer(N), N >= 1 ->
     {F, State1} = uniform_s(State0),
diff --git a/lib/stdlib/src/re.erl b/lib/stdlib/src/re.erl
index e2cc9f57ce..02dbe60741 100644
--- a/lib/stdlib/src/re.erl
+++ b/lib/stdlib/src/re.erl
@@ -19,15 +19,46 @@
 -module(re).
 -export([grun/3,urun/3,ucompile/2,replace/3,replace/4,split/2,split/3]).
 
+%-opaque mp() :: {re_pattern, _, _, _}.
+-type mp() :: {re_pattern, _, _, _}.
+
+-type nl_spec() :: cr | crlf | lf | anycrlf | any.
+
+-type compile_option() :: unicode | anchored | caseless | dollar_endonly
+                        | dotall | extended | firstline | multiline
+                        | no_auto_capture | dupnames | ungreedy
+                        | {newline, nl_spec()}| bsr_anycrlf
+                        | bsr_unicode.
+
 %% Emulator builtins in this module:
 %% re:compile/1
 %% re:compile/2
 %% re:run/2
 %% re:run/3
 
+-spec split(Subject, RE) -> SplitList when
+      Subject :: iodata() | unicode:charlist(),
+      RE :: mp() | iodata(),
+      SplitList :: [iodata() | unicode:charlist()].
+
 split(Subject,RE) ->
     split(Subject,RE,[]).
 
+-spec split(Subject, RE, Options) -> SplitList when
+      Subject :: iodata() | unicode:charlist(),
+      RE :: mp() | iodata(),
+      Options :: [ Option ],
+      Option :: anchored | global | notbol | noteol | notempty
+              | {offset, non_neg_integer()} | {newline, nl_spec()}
+              | bsr_anycrlf | bsr_unicode | {return, ReturnType}
+              | {parts, NumParts} | group | trim | CompileOpt,
+      NumParts :: non_neg_integer() | infinity,
+      ReturnType :: iodata | list | binary,
+      CompileOpt :: compile_option(),
+      SplitList :: [RetData] | [GroupedRetData],
+      GroupedRetData :: [RetData],
+      RetData :: iodata() | unicode:charlist() | binary() | list().
+
 split(Subject,RE,Options) ->
     try
     {NewOpt,Convert,Unicode,Limit,Strip,Group} =
@@ -197,10 +228,26 @@ compile_split(Pat,Options0) when not is_tuple(Pat) ->
 compile_split(_,_) ->
     throw(badre).
     
+-spec replace(Subject, RE, Replacement) -> iodata() | unicode:charlist() when
+      Subject :: iodata() | unicode:charlist(),
+      RE :: mp() | iodata(),
+      Replacement :: iodata() | unicode:charlist().
 
 replace(Subject,RE,Replacement) ->
     replace(Subject,RE,Replacement,[]).
 
+-spec replace(Subject, RE, Replacement, Options) -> iodata() | unicode:charlist() when
+      Subject :: iodata() | unicode:charlist(),
+      RE :: mp() | iodata(),
+      Replacement :: iodata() | unicode:charlist(),
+      Options :: [Option],
+      Option :: anchored | global | notbol | noteol | notempty
+              | {offset, non_neg_integer()} | {newline, NLSpec} | bsr_anycrlf
+              | bsr_unicode | {return, ReturnType} | CompileOpt,
+      ReturnType :: iodata | list | binary,
+      CompileOpt :: compile_option(),
+      NLSpec :: cr | crlf | lf | anycrlf | any.
+
 replace(Subject,RE,Replacement,Options) ->
     try
     {NewOpt,Convert,Unicode} =
diff --git a/lib/stdlib/src/regexp.erl b/lib/stdlib/src/regexp.erl
index 8f5994bbee..65f9ca247d 100644
--- a/lib/stdlib/src/regexp.erl
+++ b/lib/stdlib/src/regexp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -37,6 +37,9 @@
 -import(string, [substr/2,substr/3]).
 -import(lists, [reverse/1]).
 
+-type errordesc() :: term().
+-opaque regexp() :: term().
+
 %% -type matchres() = {match,Start,Length} | nomatch | {error,E}.
 %% -type subres() = {ok,RepString,RepCount} | {error,E}.
 %% -type splitres() = {ok,[SubString]} | {error,E}.
@@ -287,6 +290,10 @@ re_apply_or(R1, nomatch) -> R1.
 %%  Convert a sh style regexp into a full AWK one. The main difficulty is
 %%  getting character sets right as the conventions are different.
 
+-spec sh_to_awk(ShRegExp) -> AwkRegExp when
+      ShRegExp :: string(),
+      AwkRegExp :: string().
+
 sh_to_awk(Sh) -> "^(" ++ sh_to_awk_1(Sh).	%Fix the beginning
 
 sh_to_awk_1([$*|Sh]) ->				%This matches any string
@@ -336,6 +343,12 @@ special_char(_C) -> false.
 %% parse(RegExp) -> {ok,RE} | {error,E}.
 %%  Parse the regexp described in the string RegExp.
 
+-spec parse(RegExp) -> ParseRes when
+      RegExp :: string(),
+      ParseRes :: {ok, RE} | {error, Error},
+      RE :: regexp(),
+      Error :: errordesc().
+
 parse(S) ->
     case catch reg(S) of
 	{R,[]} -> {ok,R};
@@ -345,6 +358,10 @@ parse(S) ->
 
 %% format_error(Error) -> String.
 
+-spec format_error(ErrorDescriptor) -> Chars when
+      ErrorDescriptor :: errordesc(),
+      Chars :: io_lib:chars().
+
 format_error({illegal,What}) -> ["illegal character `",What,"'"];
 format_error({unterminated,What}) -> ["unterminated `",What,"'"];
 format_error({char_class,What}) ->
@@ -353,6 +370,14 @@ format_error({char_class,What}) ->
 %% -type match(String, RegExp) -> matchres().
 %%  Find the longest match of RegExp in String.
 
+-spec match(String, RegExp) -> MatchRes when
+      String :: string(),
+      RegExp :: string() | regexp(),
+      MatchRes :: {match, Start, Length} | nomatch | {error, Error},
+      Start :: pos_integer(),
+      Length :: pos_integer(),
+      Error :: errordesc().
+
 match(S, RegExp) when is_list(RegExp) ->
     case parse(RegExp) of
 	{ok,RE} -> match(S, RE);
@@ -378,6 +403,14 @@ match(RE, S, St, Pos, L) ->
 %% -type first_match(String, RegExp) -> matchres().
 %%  Find the first match of RegExp in String.
 
+-spec first_match(String, RegExp) -> MatchRes when
+      String :: string(),
+      RegExp :: string() | regexp(),
+      MatchRes :: {match, Start, Length} | nomatch | {error, Error},
+      Start :: pos_integer(),
+      Length :: pos_integer(),
+      Error :: errordesc().
+
 first_match(S, RegExp) when is_list(RegExp) ->
     case parse(RegExp) of
 	{ok,RE} -> first_match(S, RE);
@@ -400,6 +433,15 @@ first_match(_RE, [], _St) -> nomatch.
 %% -type matches(String, RegExp) -> {match,[{Start,Length}]} | {error,E}.
 %%  Return the all the non-overlapping matches of RegExp in String.
 
+-spec matches(String, RegExp) -> MatchRes when
+      String :: string(),
+      RegExp :: string() | regexp(),
+      MatchRes :: {match, Matches} | {error, Error},
+      Matches :: [{Start, Length}],
+      Start :: pos_integer(),
+      Length :: pos_integer(),
+      Error :: errordesc().
+
 matches(S, RegExp) when is_list(RegExp) ->
     case parse(RegExp) of
 	{ok,RE} -> matches(S, RE);
@@ -420,6 +462,15 @@ matches(S, RE, St) ->
 %%  the string Replace in String. Accept pre-parsed regular
 %%  expressions.
 
+-spec sub(String, RegExp, New) -> SubRes when
+      String :: string(),
+      RegExp :: string() | regexp(),
+      New :: string(),
+      NewString :: string(),
+      SubRes :: {ok, NewString, RepCount} | {error, Error},
+      RepCount :: 0 | 1,
+      Error :: errordesc().
+
 sub(String, RegExp, Rep) when is_list(RegExp) ->
     case parse(RegExp) of
 	{ok,RE} -> sub(String, RE, Rep);
@@ -449,6 +500,15 @@ sub_repl([], _M, Rest) -> Rest.
 %%  Substitute every match of the regular expression RegExp with the
 %%  string New in String. Accept pre-parsed regular expressions.
 
+-spec gsub(String, RegExp, New) -> SubRes when
+      String :: string(),
+      RegExp :: string() | regexp(),
+      New :: string(),
+      NewString :: string(),
+      SubRes :: {ok, NewString, RepCount} | {error, Error},
+      RepCount :: non_neg_integer(),
+      Error :: errordesc().
+
 gsub(String, RegExp, Rep) when is_list(RegExp) ->
     case parse(RegExp) of
 	{ok,RE} -> gsub(String, RE, Rep);
@@ -462,6 +522,13 @@ gsub(String, RE, Rep) ->
 %%  Split a string into substrings where the RegExp describes the
 %%  field seperator. The RegExp " " is specially treated.
 
+-spec split(String, RegExp) -> SplitRes when
+      String :: string(),
+      RegExp :: string() | regexp(),
+      SplitRes :: {ok, FieldList} | {error, Error},
+      FieldList :: [string()],
+      Error :: errordesc().
+
 split(String, " ") ->				%This is really special
     {ok,RE} = parse("[ \t]+"),
     case split_apply(String, RE, true) of
diff --git a/lib/stdlib/src/sets.erl b/lib/stdlib/src/sets.erl
index bcddca2567..3fd6c81e5f 100644
--- a/lib/stdlib/src/sets.erl
+++ b/lib/stdlib/src/sets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -84,30 +84,38 @@ new() ->
 
 %% is_set(Set) -> boolean().
 %%  Return 'true' if Set is a set of elements, else 'false'.
--spec is_set(term()) -> boolean().
+-spec is_set(Set) -> boolean() when
+      Set :: term().
 is_set(#set{}) -> true;
 is_set(_) -> false.
 
 %% size(Set) -> int().
 %%  Return the number of elements in Set.
--spec size(set()) -> non_neg_integer().
+-spec size(Set) -> non_neg_integer() when
+      Set :: set().
 size(S) -> S#set.size. 
 
 %% to_list(Set) -> [Elem].
 %%  Return the elements in Set as a list.
--spec to_list(set()) -> [term()].
+-spec to_list(Set) -> List when
+      Set :: set(),
+      List :: [term()].
 to_list(S) ->
     fold(fun (Elem, List) -> [Elem|List] end, [], S).
 
 %% from_list([Elem]) -> Set.
 %%  Build a set from the elements in List.
--spec from_list([term()]) -> set().
+-spec from_list(List) -> Set when
+      List :: [term()],
+      Set :: set().
 from_list(L) ->
     lists:foldl(fun (E, S) -> add_element(E, S) end, new(), L).
 
 %% is_element(Element, Set) -> boolean().
 %%  Return 'true' if Element is an element of Set, else 'false'.
--spec is_element(term(), set()) -> boolean().
+-spec is_element(Element, Set) -> boolean() when
+      Element :: term(),
+      Set :: set().
 is_element(E, S) ->
     Slot = get_slot(S, E),
     Bkt = get_bucket(S, Slot),
@@ -115,7 +123,10 @@ is_element(E, S) ->
 
 %% add_element(Element, Set) -> Set.
 %%  Return Set with Element inserted in it.
--spec add_element(term(), set()) -> set().
+-spec add_element(Element, Set1) -> Set2 when
+      Element :: term(),
+      Set1 :: set(),
+      Set2 :: set().
 add_element(E, S0) ->
     Slot = get_slot(S0, E),
     {S1,Ic} = on_bucket(fun (B0) -> add_bkt_el(E, B0, B0) end, S0, Slot),
@@ -129,7 +140,10 @@ add_bkt_el(E, [], Bkt) -> {[E|Bkt],1}.
 
 %% del_element(Element, Set) -> Set.
 %%  Return Set but with Element removed.
--spec del_element(term(), set()) -> set().
+-spec del_element(Element, Set1) -> Set2 when
+      Element :: term(),
+      Set1 :: set(),
+      Set2 :: set().
 del_element(E, S0) ->
     Slot = get_slot(S0, E),
     {S1,Dc} = on_bucket(fun (B0) -> del_bkt_el(E, B0) end, S0, Slot),
@@ -144,7 +158,10 @@ del_bkt_el(_, []) -> {[],0}.
 
 %% union(Set1, Set2) -> Set
 %%  Return the union of Set1 and Set2.
--spec union(set(), set()) -> set().
+-spec union(Set1, Set2) -> Set3 when
+      Set1 :: set(),
+      Set2 :: set(),
+      Set3 :: set().
 union(S1, S2) when S1#set.size < S2#set.size ->
     fold(fun (E, S) -> add_element(E, S) end, S2, S1);
 union(S1, S2) ->
@@ -152,7 +169,9 @@ union(S1, S2) ->
 
 %% union([Set]) -> Set
 %%  Return the union of the list of sets.
--spec union([set()]) -> set().
+-spec union(SetList) -> Set when
+      SetList :: [set()],
+      Set :: set().
 union([S1,S2|Ss]) ->
     union1(union(S1, S2), Ss);
 union([S]) -> S;
@@ -165,7 +184,10 @@ union1(S1, []) -> S1.
 
 %% intersection(Set1, Set2) -> Set.
 %%  Return the intersection of Set1 and Set2.
--spec intersection(set(), set()) -> set().
+-spec intersection(Set1, Set2) -> Set3 when
+      Set1 :: set(),
+      Set2 :: set(),
+      Set3 :: set().
 intersection(S1, S2) when S1#set.size < S2#set.size ->
     filter(fun (E) -> is_element(E, S2) end, S1);
 intersection(S1, S2) ->
@@ -173,7 +195,9 @@ intersection(S1, S2) ->
 
 %% intersection([Set]) -> Set.
 %%  Return the intersection of the list of sets.
--spec intersection([set(),...]) -> set().
+-spec intersection(SetList) -> Set when
+      SetList :: [set(),...],
+      Set :: set().
 intersection([S1,S2|Ss]) ->
     intersection1(intersection(S1, S2), Ss);
 intersection([S]) -> S.
@@ -185,7 +209,9 @@ intersection1(S1, []) -> S1.
 
 %% is_disjoint(Set1, Set2) -> boolean().
 %%  Check whether Set1 and Set2 are disjoint.
--spec is_disjoint(set(), set()) -> boolean().
+-spec is_disjoint(Set1, Set2) -> boolean() when
+      Set1 :: set(),
+      Set2 :: set().
 is_disjoint(S1, S2) when S1#set.size < S2#set.size ->
     fold(fun (_, false) -> false;
 	     (E, true) -> not is_element(E, S2)
@@ -198,25 +224,39 @@ is_disjoint(S1, S2) ->
 %% subtract(Set1, Set2) -> Set.
 %%  Return all and only the elements of Set1 which are not also in
 %%  Set2.
--spec subtract(set(), set()) -> set().
+-spec subtract(Set1, Set2) -> Set3 when
+      Set1 :: set(),
+      Set2 :: set(),
+      Set3 :: set().
 subtract(S1, S2) ->
     filter(fun (E) -> not is_element(E, S2) end, S1).
 
 %% is_subset(Set1, Set2) -> boolean().
 %%  Return 'true' when every element of Set1 is also a member of
 %%  Set2, else 'false'.
--spec is_subset(set(), set()) -> boolean().
+-spec is_subset(Set1, Set2) -> boolean() when
+      Set1 :: set(),
+      Set2 :: set().
 is_subset(S1, S2) ->
     fold(fun (E, Sub) -> Sub andalso is_element(E, S2) end, true, S1).
 
 %% fold(Fun, Accumulator, Set) -> Accumulator.
 %%  Fold function Fun over all elements in Set and return Accumulator.
--spec fold(fun((_,_) -> _), T, set()) -> T.
+-spec fold(Function, Acc0, Set) -> Acc1 when
+      Function :: fun((E :: term(),AccIn) -> AccOut),
+      Set :: set(),
+      Acc0 :: T,
+      Acc1 :: T,
+      AccIn :: T,
+      AccOut :: T.
 fold(F, Acc, D) -> fold_set(F, Acc, D).
 
 %% filter(Fun, Set) -> Set.
 %%  Filter Set with Fun.
--spec filter(fun((_) -> boolean()), set()) -> set().
+-spec filter(Pred, Set1) -> Set2 when
+      Pred :: fun((E :: term()) -> boolean()),
+      Set1 :: set(),
+      Set2 :: set().
 filter(F, D) -> filter_set(F, D).
 
 %% get_slot(Hashdb, Key) -> Slot.
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index ebb221c151..e3e23e09bc 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -115,7 +115,9 @@ whereis_evaluator(Shell) ->
 
 %% Call this function to start a user restricted shell 
 %% from a normal shell session.
--spec start_restricted(module()) -> {'error', code:load_error_rsn()}.
+-spec start_restricted(Module) -> {'error', Reason} when
+      Module :: module(),
+      Reason :: code:load_error_rsn().
 
 start_restricted(RShMod) when is_atom(RShMod) ->
     case code:ensure_loaded(RShMod) of
@@ -465,7 +467,7 @@ getc(N) ->
     {get({command,N}), get({result,N}), N}.
 
 get_cmd(Num, C) ->
-    case catch erl_eval:expr(Num, []) of
+    case catch erl_eval:expr(Num, erl_eval:new_bindings()) of
 	{value,N,_} when N < 0 -> getc(C+N);
 	{value,N,_} -> getc(N);
 	_Other -> {undefined,undefined,undefined}
@@ -1184,6 +1186,8 @@ expr(E, Bs, Lf, Ef) ->
 expr_list(Es, Bs, Lf, Ef) ->
     erl_eval:expr_list(Es, strip_bindings(Bs), Lf, Ef).
 
+-spec strip_bindings(erl_eval:binding_struct()) -> erl_eval:binding_struct().
+
 strip_bindings(Bs) ->
     Bs -- [B || {{module,_},_}=B <- Bs].
 
@@ -1468,23 +1472,26 @@ set_env(App, Name, Val, Default) ->
     application_controller:set_env(App, Name, Val),
     Prev.
 
--spec history(non_neg_integer()) -> non_neg_integer().
+-spec history(N) -> non_neg_integer() when
+      N :: non_neg_integer().
 
 history(L) when is_integer(L), L >= 0 ->
     set_env(stdlib, shell_history_length, L, ?DEF_HISTORY).
 
--spec results(non_neg_integer()) -> non_neg_integer().
+-spec results(N) -> non_neg_integer() when
+      N :: non_neg_integer().
 
 results(L) when is_integer(L), L >= 0 ->
     set_env(stdlib, shell_saved_results, L, ?DEF_RESULTS).
 
--spec catch_exception(boolean()) -> boolean().
+-spec catch_exception(Bool) -> Bool when
+      Bool :: boolean().
 
 catch_exception(Bool) ->
     set_env(stdlib, shell_catch_exception, Bool, ?DEF_CATCH_EXCEPTION).
 
--type prompt_func() :: 'default' | {module(),atom()}.
--spec prompt_func(prompt_func()) -> prompt_func().
+-spec prompt_func(PromptFunc) -> PromptFunc when
+      PromptFunc :: 'default' | {module(),atom()}.
 
 prompt_func(String) ->
     set_env(stdlib, shell_prompt_func, String, ?DEF_PROMPT_FUNC).
diff --git a/lib/stdlib/src/slave.erl b/lib/stdlib/src/slave.erl
index 196b659938..d79ee676d9 100644
--- a/lib/stdlib/src/slave.erl
+++ b/lib/stdlib/src/slave.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -54,6 +54,10 @@ pseudo([Master | ServerList]) ->
 pseudo(_) ->
     error_msg("No master node given to slave:pseudo/1~n",[]).
 
+-spec pseudo(Master, ServerList) -> ok when
+      Master :: node(),
+      ServerList :: [atom()].
+
 pseudo(_, []) -> ok;
 pseudo(Master, [S|Tail]) ->
     start_pseudo(S, whereis(S), Master),
@@ -68,6 +72,9 @@ start_pseudo(_,_,_) -> ok.  %% It's already there
 
 %% This relay can be used to relay all messages directed to a process.
 
+-spec relay(Pid) -> none() when
+      Pid :: pid().
+
 relay({badrpc,Reason}) ->
     error_msg(" ** exiting relay server ~w :~w  **~n", [self(),Reason]),
     exit(Reason);
@@ -120,25 +127,61 @@ relay1(Pid) ->
 %%          {error, no_rsh} |
 %%	    {error, {already_running, Name@Host}}
 
+-spec start(Host) -> {ok, Node} | {error, Reason} when
+      Host :: atom(),
+      Node :: node(),
+      Reason :: timeout | no_rsh | {already_running, Node}.
+
 start(Host) ->
     L = atom_to_list(node()),
     Name = upto($@, L),
-    start(Host, Name).
+    start(Host, Name, [], no_link).
+
+-spec start(Host, Name) -> {ok, Node} | {error, Reason} when
+      Host :: atom(),
+      Name :: atom(),
+      Node :: node(),
+      Reason :: timeout | no_rsh | {already_running, Node}.
 
 start(Host, Name) ->
     start(Host, Name, []).
 
+-spec start(Host, Name, Args) -> {ok, Node} | {error, Reason} when
+      Host :: atom(),
+      Name :: atom(),
+      Args :: string(),
+      Node :: node(),
+      Reason :: timeout | no_rsh | {already_running, Node}.
+
 start(Host, Name, Args) ->
     start(Host, Name, Args, no_link).
 
+-spec start_link(Host) -> {ok, Node} | {error, Reason} when
+      Host :: atom(),
+      Node :: node(),
+      Reason :: timeout | no_rsh | {already_running, Node}.
+
 start_link(Host) ->
     L = atom_to_list(node()),
     Name = upto($@, L),
-    start_link(Host, Name).
+    start(Host, Name, [], self()).
+
+-spec start_link(Host, Name) -> {ok, Node} | {error, Reason} when
+      Host :: atom(),
+      Name :: atom(),
+      Node :: node(),
+      Reason :: timeout | no_rsh | {already_running, Node}.
 
 start_link(Host, Name) ->
     start_link(Host, Name, []).
 
+-spec start_link(Host, Name, Args) -> {ok, Node} | {error, Reason} when
+      Host :: atom(),
+      Name :: atom(),
+      Args :: string(),
+      Node :: node(),
+      Reason :: timeout | no_rsh | {already_running, Node}.
+
 start_link(Host, Name, Args) ->
     start(Host, Name, Args, self()).
 
@@ -163,6 +206,9 @@ start(Host0, Name, Args, LinkTo, Prog) ->
 
 %% Stops a running node.
 
+-spec stop(Node) -> ok when
+      Node :: node().
+
 stop(Node) ->
 %    io:format("stop(~p)~n", [Node]),
     rpc:call(Node, erlang, halt, []),
diff --git a/lib/stdlib/src/sofs.erl b/lib/stdlib/src/sofs.erl
index a83f803330..d38b8ab37a 100644
--- a/lib/stdlib/src/sofs.erl
+++ b/lib/stdlib/src/sofs.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2011. 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(sofs).
@@ -40,11 +40,11 @@
          substitution/2, projection/2, partition/1, partition/2,
          partition/3, multiple_relative_product/2, join/4]).
 
--export([family_to_relation/1, family_specification/2, 
+-export([family_to_relation/1, family_specification/2,
          union_of_family/1, intersection_of_family/1,
          family_union/1, family_intersection/1,
          family_domain/1, family_range/1, family_field/1,
-         family_union/2, family_intersection/2, family_difference/2, 
+         family_union/2, family_intersection/2, family_difference/2,
          partition_family/2, family_projection/2]).
 
 -export([family_to_digraph/1, family_to_digraph/2,
@@ -64,9 +64,9 @@
 
 -compile({inline, [{external_fun,1},{element_type,1}]}).
 
--compile({inline, 
+-compile({inline,
           [{unify_types,2}, {match_types,2},
-           {test_rel,3}, {symdiff,3}, 
+           {test_rel,3}, {symdiff,3},
            {subst,3}]}).
 
 -compile({inline, [{fam_binop,3}]}).
@@ -80,13 +80,13 @@
 -define(TAG, 'Set').
 -define(ORDTAG, 'OrdSet').
 
--record(?TAG, {data = [], type = type}).
--record(?ORDTAG, {orddata = {}, ordtype = type}).
+-record(?TAG, {data = [] :: list(), type = type :: term()}).
+-record(?ORDTAG, {orddata = {} :: tuple(), ordtype = type :: term()}).
 
 -define(LIST(S), (S)#?TAG.data).
 -define(TYPE(S), (S)#?TAG.type).
-%%-define(SET(L, T), 
-%%       case is_type(T) of 
+%%-define(SET(L, T),
+%%       case is_type(T) of
 %%           true -> #?TAG{data = L, type = T};
 %%           false -> erlang:error(badtype, [T])
 %%       end
@@ -113,14 +113,40 @@
 -define(IS_SET_OF(X), is_list(X)).
 -define(FAMILY(X, Y), ?BINREL(X, ?SET_OF(Y))).
 
+-export_type([anyset/0, binary_relation/0, external_set/0, a_function/0,
+              family/0, relation/0, set_of_sets/0, set_fun/0, spec_fun/0,
+              type/0]).
+-export_type([ordset/0, a_set/0]).
+
+-type(anyset() :: ordset() | a_set()).
+-type(binary_relation() :: relation()).
+-type(external_set() :: term()).
+-type(a_function() :: relation()).
+-type(family() :: a_function()).
+-opaque(ordset() :: #?ORDTAG{}).
+-type(relation() :: a_set()).
+-opaque(a_set() :: #?TAG{}).
+-type(set_of_sets() :: a_set()).
+-type(set_fun() :: pos_integer()
+                 | {external, fun((external_set()) -> external_set())}
+                 | fun((anyset()) -> anyset())).
+-type(spec_fun() :: {external, fun((external_set()) -> boolean())}
+                  | fun((anyset()) -> boolean())).
+-type(type() :: term()).
+
+-type(tuple_of(_T) :: tuple()).
+
 %%
 %%  Exported functions
 %%
 
-%%% 
+%%%
 %%% Create sets
-%%% 
+%%%
 
+-spec(from_term(Term) -> AnySet when
+      AnySet :: anyset(),
+      Term :: term()).
 from_term(T) ->
     Type = case T of
                _ when is_list(T) -> [?ANYTYPE];
@@ -133,6 +159,10 @@ from_term(T) ->
             Set
     end.
 
+-spec(from_term(Term, Type) -> AnySet when
+      AnySet :: anyset(),
+      Term :: term(),
+      Type :: type()).
 from_term(L, T) ->
     case is_type(T) of
         true ->
@@ -146,14 +176,23 @@ from_term(L, T) ->
             erlang:error(badarg, [L, T])
     end.
 
+-spec(from_external(ExternalSet, Type) -> AnySet when
+      ExternalSet :: external_set(),
+      AnySet :: anyset(),
+      Type :: type()).
 from_external(L, ?SET_OF(Type)) ->
     ?SET(L, Type);
 from_external(T, Type) ->
     ?ORDSET(T, Type).
 
+-spec(empty_set() -> Set when
+      Set :: a_set()).
 empty_set() ->
     ?SET([], ?ANYTYPE).
 
+-spec(is_type(Term) -> Bool when
+      Bool :: boolean(),
+      Term :: term()).
 is_type(Atom) when ?IS_ATOM_TYPE(Atom), Atom =/= ?ANYTYPE ->
     true;
 is_type(?SET_OF(T)) ->
@@ -163,19 +202,26 @@ is_type(T) when tuple_size(T) > 0 ->
 is_type(_T) ->
     false.
 
+-spec(set(Terms) -> Set when
+      Set :: a_set(),
+      Terms :: [term()]).
 set(L) ->
     case catch usort(L) of
         {'EXIT', _} ->
             erlang:error(badarg, [L]);
-        SL -> 
+        SL ->
             ?SET(SL, ?ATOM_TYPE)
     end.
 
+-spec(set(Terms, Type) -> Set when
+      Set :: a_set(),
+      Terms :: [term()],
+      Type :: type()).
 set(L, ?SET_OF(Type) = T) when ?IS_ATOM_TYPE(Type), Type =/= ?ANYTYPE ->
     case catch usort(L) of
         {'EXIT', _} ->
             erlang:error(badarg, [L, T]);
-        SL -> 
+        SL ->
             ?SET(SL, Type)
     end;
 set(L, ?SET_OF(_) = T) ->
@@ -188,6 +234,12 @@ set(L, ?SET_OF(_) = T) ->
 set(L, T) ->
     erlang:error(badarg, [L, T]).
 
+-spec(from_sets(ListOfSets) -> Set when
+      Set :: a_set(),
+      ListOfSets :: [anyset()];
+               (TupleOfSets) -> Ordset when
+      Ordset :: ordset(),
+      TupleOfSets :: tuple_of(anyset())).
 from_sets(Ss) when is_list(Ss) ->
     case set_of_sets(Ss, [], ?ANYTYPE) of
         {error, Error} ->
@@ -205,6 +257,9 @@ from_sets(Tuple) when is_tuple(Tuple) ->
 from_sets(T) ->
     erlang:error(badarg, [T]).
 
+-spec(relation(Tuples) -> Relation when
+      Relation :: relation(),
+      Tuples :: [tuple()]).
 relation([]) ->
     ?SET([], ?BINREL(?ATOM_TYPE, ?ATOM_TYPE));
 relation(Ts = [T | _]) when is_tuple(T) ->
@@ -217,6 +272,11 @@ relation(Ts = [T | _]) when is_tuple(T) ->
 relation(E) ->
     erlang:error(badarg, [E]).
 
+-spec(relation(Tuples, Type) -> Relation when
+      N :: integer(),
+      Type :: N | type(),
+      Relation :: relation(),
+      Tuples :: [tuple()]).
 relation(Ts, TS) ->
     case catch rel(Ts, TS) of
         {'EXIT', _} ->
@@ -225,6 +285,9 @@ relation(Ts, TS) ->
 	    Set
     end.
 
+-spec(a_function(Tuples) -> Function when
+      Function :: a_function(),
+      Tuples :: [tuple()]).
 a_function(Ts) ->
     case catch func(Ts, ?BINREL(?ATOM_TYPE, ?ATOM_TYPE)) of
         {'EXIT', _} ->
@@ -235,6 +298,10 @@ a_function(Ts) ->
 	    Set
     end.
 
+-spec(a_function(Tuples, Type) -> Function when
+      Function :: a_function(),
+      Tuples :: [tuple()],
+      Type :: type()).
 a_function(Ts, T) ->
     case catch a_func(Ts, T) of
 	{'EXIT', _} ->
@@ -245,6 +312,9 @@ a_function(Ts, T) ->
 	    Set
     end.
 
+-spec(family(Tuples) -> Family when
+      Family :: family(),
+      Tuples :: [tuple()]).
 family(Ts) ->
     case catch fam2(Ts, ?FAMILY(?ATOM_TYPE, ?ATOM_TYPE)) of
         {'EXIT', _} ->
@@ -255,6 +325,10 @@ family(Ts) ->
 	    Set
     end.
 
+-spec(family(Tuples, Type) -> Family when
+      Family :: family(),
+      Tuples :: [tuple()],
+      Type :: type()).
 family(Ts, T) ->
     case catch fam(Ts, T) of
 	{'EXIT', _} ->
@@ -265,20 +339,30 @@ family(Ts, T) ->
 	    Set
     end.
 
-%%% 
+%%%
 %%% Functions on sets.
-%%% 
+%%%
 
+-spec(to_external(AnySet) -> ExternalSet when
+      ExternalSet :: external_set(),
+      AnySet :: anyset()).
 to_external(S) when ?IS_SET(S) ->
     ?LIST(S);
 to_external(S) when ?IS_ORDSET(S) ->
     ?ORDDATA(S).
 
+-spec(type(AnySet) -> Type when
+      AnySet :: anyset(),
+      Type :: type()).
 type(S) when ?IS_SET(S) ->
     ?SET_OF(?TYPE(S));
 type(S) when ?IS_ORDSET(S) ->
     ?ORDTYPE(S).
 
+-spec(to_sets(ASet) -> Sets when
+      ASet :: a_set() | ordset(),
+      Sets :: tuple_of(AnySet) | [AnySet],
+      AnySet :: anyset()).
 to_sets(S) when ?IS_SET(S) ->
     case ?TYPE(S) of
         ?SET_OF(Type) -> list_of_sets(?LIST(S), Type, []);
@@ -289,6 +373,9 @@ to_sets(S) when ?IS_ORDSET(S), is_tuple(?ORDTYPE(S)) ->
 to_sets(S) when ?IS_ORDSET(S) ->
     erlang:error(badarg, [S]).
 
+-spec(no_elements(ASet) -> NoElements when
+      ASet :: a_set() | ordset(),
+      NoElements :: pos_integer()).
 no_elements(S) when ?IS_SET(S) ->
     length(?LIST(S));
 no_elements(S) when ?IS_ORDSET(S), is_tuple(?ORDTYPE(S)) ->
@@ -296,6 +383,10 @@ no_elements(S) when ?IS_ORDSET(S), is_tuple(?ORDTYPE(S)) ->
 no_elements(S) when ?IS_ORDSET(S) ->
     erlang:error(badarg, [S]).
 
+-spec(specification(Fun, Set1) -> Set2 when
+      Fun :: spec_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
 specification(Fun, S) when ?IS_SET(S) ->
     Type = ?TYPE(S),
     R = case external_fun(Fun) of
@@ -311,36 +402,62 @@ specification(Fun, S) when ?IS_SET(S) ->
 	    erlang:error(Bad, [Fun, S])
     end.
 
+-spec(union(Set1, Set2) -> Set3 when
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
 union(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
     case unify_types(?TYPE(S1), ?TYPE(S2)) of
         [] -> erlang:error(type_mismatch, [S1, S2]);
         Type ->  ?SET(umerge(?LIST(S1), ?LIST(S2)), Type)
     end.
 
+-spec(intersection(Set1, Set2) -> Set3 when
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
 intersection(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
     case unify_types(?TYPE(S1), ?TYPE(S2)) of
         [] -> erlang:error(type_mismatch, [S1, S2]);
         Type ->  ?SET(intersection(?LIST(S1), ?LIST(S2), []), Type)
     end.
 
+-spec(difference(Set1, Set2) -> Set3 when
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
 difference(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
     case unify_types(?TYPE(S1), ?TYPE(S2)) of
         [] -> erlang:error(type_mismatch, [S1, S2]);
         Type ->  ?SET(difference(?LIST(S1), ?LIST(S2), []), Type)
     end.
 
+-spec(symdiff(Set1, Set2) -> Set3 when
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
 symdiff(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
     case unify_types(?TYPE(S1), ?TYPE(S2)) of
         [] -> erlang:error(type_mismatch, [S1, S2]);
         Type ->  ?SET(symdiff(?LIST(S1), ?LIST(S2), []), Type)
     end.
 
+-spec(symmetric_partition(Set1, Set2) -> {Set3, Set4, Set5} when
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set(),
+      Set4 :: a_set(),
+      Set5 :: a_set()).
 symmetric_partition(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
     case unify_types(?TYPE(S1), ?TYPE(S2)) of
         [] -> erlang:error(type_mismatch, [S1, S2]);
         Type ->  sympart(?LIST(S1), ?LIST(S2), [], [], [], Type)
     end.
 
+-spec(product(Set1, Set2) -> BinRel when
+      BinRel :: binary_relation(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
 product(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
     if
         ?TYPE(S1) =:= ?ANYTYPE -> S1;
@@ -351,6 +468,9 @@ product(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
 	    ?SET(relprod(map(F, ?LIST(S1)), map(F, ?LIST(S2))), T)
     end.
 
+-spec(product(TupleOfSets) -> Relation when
+      Relation :: relation(),
+      TupleOfSets :: tuple_of(a_set())).
 product({S1, S2}) ->
     product(S1, S2);
 product(T) when is_tuple(T) ->
@@ -365,11 +485,15 @@ product(T) when is_tuple(T) ->
             case member([], L) of
                 true ->
 		    empty_set();
-                false -> 
+                false ->
                     ?SET(reverse(prod(L, [], [])), Type)
             end
     end.
 
+-spec(constant_function(Set, AnySet) -> Function when
+      AnySet :: anyset(),
+      Function :: a_function(),
+      Set :: a_set()).
 constant_function(S, E) when ?IS_SET(S) ->
     case {?TYPE(S), is_sofs_set(E)} of
 	{?ANYTYPE, true} -> S;
@@ -381,6 +505,10 @@ constant_function(S, E) when ?IS_SET(S) ->
 constant_function(S, E) when ?IS_ORDSET(S) ->
     erlang:error(badarg, [S, E]).
 
+-spec(is_equal(AnySet1, AnySet2) -> Bool when
+      AnySet1 :: anyset(),
+      AnySet2 :: anyset(),
+      Bool :: boolean()).
 is_equal(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
     case match_types(?TYPE(S1), ?TYPE(S2)) of
         true  -> ?LIST(S1) == ?LIST(S2);
@@ -396,12 +524,19 @@ is_equal(S1, S2) when ?IS_SET(S1), ?IS_ORDSET(S2) ->
 is_equal(S1, S2) when ?IS_ORDSET(S1), ?IS_SET(S2) ->
     erlang:error(type_mismatch, [S1, S2]).
 
+-spec(is_subset(Set1, Set2) -> Bool when
+      Bool :: boolean(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
 is_subset(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
     case match_types(?TYPE(S1), ?TYPE(S2)) of
         true  -> subset(?LIST(S1), ?LIST(S2));
         false -> erlang:error(type_mismatch, [S1, S2])
     end.
 
+-spec(is_sofs_set(Term) -> Bool when
+      Bool :: boolean(),
+      Term :: term()).
 is_sofs_set(S) when ?IS_SET(S) ->
     true;
 is_sofs_set(S) when ?IS_ORDSET(S) ->
@@ -409,16 +544,26 @@ is_sofs_set(S) when ?IS_ORDSET(S) ->
 is_sofs_set(_S) ->
     false.
 
+-spec(is_set(AnySet) -> Bool when
+      AnySet :: anyset(),
+      Bool :: boolean()).
 is_set(S) when ?IS_SET(S) ->
     true;
 is_set(S) when ?IS_ORDSET(S) ->
     false.
 
-is_empty_set(S) when ?IS_SET(S) -> 
+-spec(is_empty_set(AnySet) -> Bool when
+      AnySet :: anyset(),
+      Bool :: boolean()).
+is_empty_set(S) when ?IS_SET(S) ->
     ?LIST(S) =:= [];
 is_empty_set(S) when ?IS_ORDSET(S) ->
     false.
 
+-spec(is_disjoint(Set1, Set2) -> Bool when
+      Bool :: boolean(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
 is_disjoint(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
     case match_types(?TYPE(S1), ?TYPE(S2)) of
         true ->
@@ -433,6 +578,9 @@ is_disjoint(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
 %%% Functions on set-of-sets.
 %%%
 
+-spec(union(SetOfSets) -> Set when
+      Set :: a_set(),
+      SetOfSets :: set_of_sets()).
 union(Sets) when ?IS_SET(Sets) ->
     case ?TYPE(Sets) of
         ?SET_OF(Type) -> ?SET(lunion(?LIST(Sets)), Type);
@@ -440,6 +588,9 @@ union(Sets) when ?IS_SET(Sets) ->
         _ -> erlang:error(badarg, [Sets])
     end.
 
+-spec(intersection(SetOfSets) -> Set when
+      Set :: a_set(),
+      SetOfSets :: set_of_sets()).
 intersection(Sets) when ?IS_SET(Sets) ->
     case ?LIST(Sets) of
         [] -> erlang:error(badarg, [Sets]);
@@ -451,32 +602,41 @@ intersection(Sets) when ?IS_SET(Sets) ->
             end
     end.
 
+-spec(canonical_relation(SetOfSets) -> BinRel when
+      BinRel :: binary_relation(),
+      SetOfSets :: set_of_sets()).
 canonical_relation(Sets) when ?IS_SET(Sets) ->
     ST = ?TYPE(Sets),
     case ST of
         ?SET_OF(?ANYTYPE) -> empty_set();
-        ?SET_OF(Type) -> 
+        ?SET_OF(Type) ->
             ?SET(can_rel(?LIST(Sets), []), ?BINREL(Type, ST));
         ?ANYTYPE -> Sets;
         _ -> erlang:error(badarg, [Sets])
     end.
 
-%%% 
+%%%
 %%% Functions on binary relations only.
-%%% 
+%%%
 
 rel2fam(R) ->
     relation_to_family(R).
 
+-spec(relation_to_family(BinRel) -> Family when
+      Family :: family(),
+      BinRel :: binary_relation()).
 %% Inlined.
 relation_to_family(R) when ?IS_SET(R) ->
     case ?TYPE(R) of
-        ?BINREL(DT, RT) -> 
+        ?BINREL(DT, RT) ->
             ?SET(rel2family(?LIST(R)), ?FAMILY(DT, RT));
         ?ANYTYPE -> R;
         _Else    -> erlang:error(badarg, [R])
     end.
 
+-spec(domain(BinRel) -> Set when
+      BinRel :: binary_relation(),
+      Set :: a_set()).
 domain(R) when ?IS_SET(R) ->
     case ?TYPE(R) of
         ?BINREL(DT, _)  -> ?SET(dom(?LIST(R)), DT);
@@ -484,6 +644,9 @@ domain(R) when ?IS_SET(R) ->
         _Else    -> erlang:error(badarg, [R])
     end.
 
+-spec(range(BinRel) -> Set when
+      BinRel :: binary_relation(),
+      Set :: a_set()).
 range(R) when ?IS_SET(R) ->
     case ?TYPE(R) of
         ?BINREL(_, RT)  -> ?SET(ran(?LIST(R),  []), RT);
@@ -491,35 +654,63 @@ range(R) when ?IS_SET(R) ->
         _ -> erlang:error(badarg, [R])
     end.
 
+-spec(field(BinRel) -> Set when
+      BinRel :: binary_relation(),
+      Set :: a_set()).
 %% In "Introduction to LOGIC", Suppes defines the field of a binary
 %% relation to be the union of the domain and the range (or
 %% counterdomain).
 field(R) ->
     union(domain(R), range(R)).
 
+-spec(relative_product(ListOfBinRels) -> BinRel2 when
+      ListOfBinRels :: [BinRel, ...],
+      BinRel :: binary_relation(),
+      BinRel2 :: binary_relation()).
+%% The following clause is kept for backward compatibility.
+%% The list is due to Dialyzer's specs.
 relative_product(RT) when is_tuple(RT) ->
-    case relprod_n(RT, foo, false, false) of
-        {error, Reason} -> 
-            erlang:error(Reason, [RT]);
+    relative_product(tuple_to_list(RT));
+relative_product(RL) when is_list(RL) ->
+    case relprod_n(RL, foo, false, false) of
+        {error, Reason} ->
+            erlang:error(Reason, [RL]);
         Reply ->
             Reply
     end.
 
+-spec(relative_product(ListOfBinRels, BinRel1) -> BinRel2 when
+      ListOfBinRels :: [BinRel, ...],
+      BinRel :: binary_relation(),
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation();
+                      (BinRel1, BinRel2) -> BinRel3 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation(),
+      BinRel3 :: binary_relation()).
 relative_product(R1, R2) when ?IS_SET(R1), ?IS_SET(R2) ->
     relative_product1(converse(R1), R2);
+%% The following clause is kept for backward compatibility.
+%% The list is due to Dialyzer's specs.
 relative_product(RT, R) when is_tuple(RT), ?IS_SET(R) ->
+    relative_product(tuple_to_list(RT), R);
+relative_product(RL, R) when is_list(RL), ?IS_SET(R) ->
     EmptyR = case ?TYPE(R) of
                  ?BINREL(_, _) -> ?LIST(R) =:= [];
                  ?ANYTYPE -> true;
-                 _ -> erlang:error(badarg, [RT, R])
+                 _ -> erlang:error(badarg, [RL, R])
              end,
-    case relprod_n(RT, R, EmptyR, true) of
-        {error, Reason} -> 
-            erlang:error(Reason, [RT, R]);
+    case relprod_n(RL, R, EmptyR, true) of
+        {error, Reason} ->
+            erlang:error(Reason, [RL, R]);
         Reply ->
             Reply
     end.
 
+-spec(relative_product1(BinRel1, BinRel2) -> BinRel3 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation(),
+      BinRel3 :: binary_relation()).
 relative_product1(R1, R2) when ?IS_SET(R1), ?IS_SET(R2) ->
     {DTR1, RTR1} = case ?TYPE(R1) of
                      ?BINREL(_, _) = R1T -> R1T;
@@ -538,16 +729,23 @@ relative_product1(R1, R2) when ?IS_SET(R1), ?IS_SET(R2) ->
         false -> erlang:error(type_mismatch, [R1, R2])
     end.
 
+-spec(converse(BinRel1) -> BinRel2 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation()).
 converse(R) when ?IS_SET(R) ->
     case ?TYPE(R) of
         ?BINREL(DT, RT) -> ?SET(converse(?LIST(R), []), ?BINREL(RT, DT));
         ?ANYTYPE -> R;
         _ -> erlang:error(badarg, [R])
     end.
-    
+
+-spec(image(BinRel, Set1) -> Set2 when
+      BinRel :: binary_relation(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
 image(R, S) when ?IS_SET(R), ?IS_SET(S) ->
     case ?TYPE(R) of
-        ?BINREL(DT, RT) -> 
+        ?BINREL(DT, RT) ->
 	    case match_types(DT, ?TYPE(S)) of
 		true ->
 		    ?SET(usort(restrict(?LIST(S), ?LIST(R))), RT);
@@ -558,9 +756,13 @@ image(R, S) when ?IS_SET(R), ?IS_SET(S) ->
         _ -> erlang:error(badarg, [R, S])
     end.
 
+-spec(inverse_image(BinRel, Set1) -> Set2 when
+      BinRel :: binary_relation(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
 inverse_image(R, S) when ?IS_SET(R), ?IS_SET(S) ->
     case ?TYPE(R) of
-        ?BINREL(DT, RT) -> 
+        ?BINREL(DT, RT) ->
 	    case match_types(RT, ?TYPE(S)) of
 		true ->
 		    NL = restrict(?LIST(S), converse(?LIST(R), [])),
@@ -572,17 +774,23 @@ inverse_image(R, S) when ?IS_SET(R), ?IS_SET(S) ->
         _ -> erlang:error(badarg, [R, S])
     end.
 
+-spec(strict_relation(BinRel1) -> BinRel2 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation()).
 strict_relation(R) when ?IS_SET(R) ->
     case ?TYPE(R) of
-        Type = ?BINREL(_, _) -> 
+        Type = ?BINREL(_, _) ->
             ?SET(strict(?LIST(R), []), Type);
         ?ANYTYPE -> R;
         _ -> erlang:error(badarg, [R])
     end.
-    
+
+-spec(weak_relation(BinRel1) -> BinRel2 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation()).
 weak_relation(R) when ?IS_SET(R) ->
     case ?TYPE(R) of
-        ?BINREL(DT, RT) -> 
+        ?BINREL(DT, RT) ->
             case unify_types(DT, RT) of
                 [] ->
                     erlang:error(badarg, [R]);
@@ -592,7 +800,12 @@ weak_relation(R) when ?IS_SET(R) ->
         ?ANYTYPE -> R;
         _ -> erlang:error(badarg, [R])
     end.
-    
+
+-spec(extension(BinRel1, Set, AnySet) -> BinRel2 when
+      AnySet :: anyset(),
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation(),
+      Set :: a_set()).
 extension(R, S, E) when ?IS_SET(R), ?IS_SET(S) ->
     case {?TYPE(R), ?TYPE(S), is_sofs_set(E)} of
 	{T=?BINREL(DT, RT), ST, true} ->
@@ -621,9 +834,12 @@ extension(R, S, E) when ?IS_SET(R), ?IS_SET(S) ->
 	    erlang:error(badarg, [R, S, E])
     end.
 
+-spec(is_a_function(BinRel) -> Bool when
+      Bool :: boolean(),
+      BinRel :: binary_relation()).
 is_a_function(R) when ?IS_SET(R) ->
     case ?TYPE(R) of
-        ?BINREL(_, _) -> 
+        ?BINREL(_, _) ->
             case ?LIST(R) of
                 [] -> true;
                 [{V,_} | Es] -> is_a_func(Es, V)
@@ -632,16 +848,28 @@ is_a_function(R) when ?IS_SET(R) ->
         _ -> erlang:error(badarg, [R])
     end.
 
+-spec(restriction(BinRel1, Set) -> BinRel2 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation(),
+      Set :: a_set()).
 restriction(Relation, Set) ->
     restriction(1, Relation, Set).
 
+-spec(drestriction(BinRel1, Set) -> BinRel2 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation(),
+      Set :: a_set()).
 drestriction(Relation, Set) ->
     drestriction(1, Relation, Set).
 
-%%% 
+%%%
 %%% Functions on functions only.
-%%% 
+%%%
 
+-spec(composite(Function1, Function2) -> Function3 when
+      Function1 :: a_function(),
+      Function2 :: a_function(),
+      Function3 :: a_function()).
 composite(Fn1, Fn2) when ?IS_SET(Fn1), ?IS_SET(Fn2) ->
     ?BINREL(DTF1, RTF1) = case ?TYPE(Fn1)of
 			      ?BINREL(_, _) = F1T -> F1T;
@@ -656,7 +884,7 @@ composite(Fn1, Fn2) when ?IS_SET(Fn1), ?IS_SET(Fn2) ->
     case match_types(RTF1, DTF2) of
         true when DTF1 =:= ?ANYTYPE -> Fn1;
         true when DTF2 =:= ?ANYTYPE -> Fn2;
-        true -> 
+        true ->
 	    case comp(?LIST(Fn1), ?LIST(Fn2)) of
 		SL when is_list(SL) ->
 		    ?SET(sort(SL), ?BINREL(DTF1, RTF2));
@@ -666,9 +894,12 @@ composite(Fn1, Fn2) when ?IS_SET(Fn1), ?IS_SET(Fn2) ->
         false -> erlang:error(type_mismatch, [Fn1, Fn2])
     end.
 
+-spec(inverse(Function1) -> Function2 when
+      Function1 :: a_function(),
+      Function2 :: a_function()).
 inverse(Fn) when ?IS_SET(Fn) ->
     case ?TYPE(Fn) of
-        ?BINREL(DT, RT) -> 
+        ?BINREL(DT, RT) ->
 	    case inverse1(?LIST(Fn)) of
 		SL when is_list(SL) ->
 		    ?SET(SL, ?BINREL(RT, DT));
@@ -678,11 +909,16 @@ inverse(Fn) when ?IS_SET(Fn) ->
         ?ANYTYPE -> Fn;
         _ -> erlang:error(badarg, [Fn])
     end.
-    
-%%% 
+
+%%%
 %%% Functions on relations (binary or other).
-%%% 
+%%%
 
+-spec(restriction(SetFun, Set1, Set2) -> Set3 when
+      SetFun :: set_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
 %% Equivalent to range(restriction(inverse(substitution(Fun, S1)), S2)).
 restriction(I, R, S) when is_integer(I), ?IS_SET(R), ?IS_SET(S) ->
     RT = ?TYPE(R),
@@ -747,6 +983,11 @@ restriction(SetFun, S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
 	    end
     end.
 
+-spec(drestriction(SetFun, Set1, Set2) -> Set3 when
+      SetFun :: set_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
 drestriction(I, R, S) when is_integer(I), ?IS_SET(R), ?IS_SET(S) ->
     RT = ?TYPE(R),
     ST = ?TYPE(S),
@@ -812,6 +1053,10 @@ drestriction(SetFun, S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
 	    end
     end.
 
+-spec(projection(SetFun, Set1) -> Set2 when
+      SetFun :: set_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
 projection(I, Set) when is_integer(I), ?IS_SET(Set) ->
     Type = ?TYPE(Set),
     case check_for_sort(Type, I) of
@@ -827,6 +1072,10 @@ projection(I, Set) when is_integer(I), ?IS_SET(Set) ->
 projection(Fun, Set) ->
     range(substitution(Fun, Set)).
 
+-spec(substitution(SetFun, Set1) -> Set2 when
+      SetFun :: set_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
 substitution(I, Set) when is_integer(I), ?IS_SET(Set) ->
     Type = ?TYPE(Set),
     case check_for_sort(Type, I) of
@@ -867,11 +1116,18 @@ substitution(SetFun, Set) when ?IS_SET(Set) ->
 	    end
     end.
 
+-spec(partition(SetOfSets) -> Partition when
+      SetOfSets :: set_of_sets(),
+      Partition :: a_set()).
 partition(Sets) ->
     F1 = relation_to_family(canonical_relation(Sets)),
     F2 = relation_to_family(converse(F1)),
     range(F2).
 
+-spec(partition(SetFun, Set) -> Partition when
+      SetFun :: set_fun(),
+      Partition :: a_set(),
+      Set :: a_set()).
 partition(I, Set) when is_integer(I), ?IS_SET(Set) ->
     Type = ?TYPE(Set),
     case check_for_sort(Type, I) of
@@ -887,6 +1143,12 @@ partition(I, Set) when is_integer(I), ?IS_SET(Set) ->
 partition(Fun, Set) ->
     range(partition_family(Fun, Set)).
 
+-spec(partition(SetFun, Set1, Set2) -> {Set3, Set4} when
+      SetFun :: set_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set(),
+      Set4 :: a_set()).
 partition(I, R, S) when is_integer(I), ?IS_SET(R), ?IS_SET(S) ->
     RT = ?TYPE(R),
     ST = ?TYPE(S),
@@ -954,21 +1216,32 @@ partition(SetFun, S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
 	    end
     end.
 
+-spec(multiple_relative_product(TupleOfBinRels, BinRel1) -> BinRel2 when
+      TupleOfBinRels :: tuple_of(BinRel),
+      BinRel :: binary_relation(),
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation()).
 multiple_relative_product(T, R) when is_tuple(T), ?IS_SET(R) ->
     case test_rel(R, tuple_size(T), eq) of
 	true when ?TYPE(R) =:= ?ANYTYPE ->
 	    empty_set();
-        true -> 
+        true ->
 	    MProd = mul_relprod(tuple_to_list(T), 1, R),
-	    relative_product(list_to_tuple(MProd));
-        false -> 
+	    relative_product(MProd);
+        false ->
 	    erlang:error(badarg, [T, R])
     end.
 
-join(R1, I1, R2, I2) 
+-spec(join(Relation1, I, Relation2, J) -> Relation3 when
+      Relation1 :: relation(),
+      Relation2 :: relation(),
+      Relation3 :: relation(),
+      I :: pos_integer(),
+      J :: pos_integer()).
+join(R1, I1, R2, I2)
   when ?IS_SET(R1), ?IS_SET(R2), is_integer(I1), is_integer(I2) ->
     case test_rel(R1, I1, lte) and test_rel(R2, I2, lte) of
-        false -> 
+        false ->
 	    erlang:error(badarg, [R1, I1, R2, I2]);
         true when ?TYPE(R1) =:= ?ANYTYPE -> R1;
         true when ?TYPE(R2) =:= ?ANYTYPE -> R2;
@@ -980,8 +1253,8 @@ join(R1, I1, R2, I2)
 		    true ->
 			fun({X,Y}) -> join_element(X, Y) end;
 		    false ->
-			fun({X,Y}) -> 
-				list_to_tuple(join_element(X, Y, I2)) 
+			fun({X,Y}) ->
+				list_to_tuple(join_element(X, Y, I2))
 			end
 		end,
 	    ?SET(replace(T, F, []), F({?TYPE(R1), ?TYPE(R2)}))
@@ -1001,9 +1274,15 @@ test_rel(R, I, C) ->
 %%% Family functions
 %%%
 
+-spec(fam2rel(Family) -> BinRel when
+      Family :: family(),
+      BinRel :: binary_relation()).
 fam2rel(F) ->
     family_to_relation(F).
 
+-spec(family_to_relation(Family) -> BinRel when
+      Family :: family(),
+      BinRel :: binary_relation()).
 %% Inlined.
 family_to_relation(F) when ?IS_SET(F) ->
     case ?TYPE(F) of
@@ -1013,6 +1292,10 @@ family_to_relation(F) when ?IS_SET(F) ->
         _ -> erlang:error(badarg, [F])
     end.
 
+-spec(family_specification(Fun, Family1) -> Family2 when
+      Fun :: spec_fun(),
+      Family1 :: family(),
+      Family2 :: family()).
 family_specification(Fun, F) when ?IS_SET(F) ->
     case ?TYPE(F) of
         ?FAMILY(_DT, Type) = FType ->
@@ -1032,6 +1315,9 @@ family_specification(Fun, F) when ?IS_SET(F) ->
         _ -> erlang:error(badarg, [Fun, F])
     end.
 
+-spec(union_of_family(Family) -> Set when
+      Family :: family(),
+      Set :: a_set()).
 union_of_family(F) when ?IS_SET(F) ->
     case ?TYPE(F) of
         ?FAMILY(_DT, Type) ->
@@ -1040,6 +1326,9 @@ union_of_family(F) when ?IS_SET(F) ->
         _ -> erlang:error(badarg, [F])
     end.
 
+-spec(intersection_of_family(Family) -> Set when
+      Family :: family(),
+      Set :: a_set()).
 intersection_of_family(F) when ?IS_SET(F) ->
     case ?TYPE(F) of
         ?FAMILY(_DT, Type) ->
@@ -1052,6 +1341,9 @@ intersection_of_family(F) when ?IS_SET(F) ->
         _ -> erlang:error(badarg, [F])
     end.
 
+-spec(family_union(Family1) -> Family2 when
+      Family1 :: family(),
+      Family2 :: family()).
 family_union(F) when ?IS_SET(F) ->
     case ?TYPE(F) of
         ?FAMILY(DT, ?SET_OF(Type)) ->
@@ -1060,6 +1352,9 @@ family_union(F) when ?IS_SET(F) ->
         _ -> erlang:error(badarg, [F])
     end.
 
+-spec(family_intersection(Family1) -> Family2 when
+      Family1 :: family(),
+      Family2 :: family()).
 family_intersection(F) when ?IS_SET(F) ->
     case ?TYPE(F) of
         ?FAMILY(DT, ?SET_OF(Type)) ->
@@ -1073,6 +1368,9 @@ family_intersection(F) when ?IS_SET(F) ->
         _ -> erlang:error(badarg, [F])
     end.
 
+-spec(family_domain(Family1) -> Family2 when
+      Family1 :: family(),
+      Family2 :: family()).
 family_domain(F) when ?IS_SET(F) ->
     case ?TYPE(F) of
         ?FAMILY(FDT, ?BINREL(DT, _)) ->
@@ -1082,6 +1380,9 @@ family_domain(F) when ?IS_SET(F) ->
         _ -> erlang:error(badarg, [F])
     end.
 
+-spec(family_range(Family1) -> Family2 when
+      Family1 :: family(),
+      Family2 :: family()).
 family_range(F) when ?IS_SET(F) ->
     case ?TYPE(F) of
         ?FAMILY(DT, ?BINREL(_, RT)) ->
@@ -1091,15 +1392,30 @@ family_range(F) when ?IS_SET(F) ->
         _ -> erlang:error(badarg, [F])
     end.
 
+-spec(family_field(Family1) -> Family2 when
+      Family1 :: family(),
+      Family2 :: family()).
 family_field(F) ->
     family_union(family_domain(F), family_range(F)).
 
+-spec(family_union(Family1, Family2) -> Family3 when
+      Family1 :: family(),
+      Family2 :: family(),
+      Family3 :: family()).
 family_union(F1, F2) ->
     fam_binop(F1, F2, fun fam_union/3).
 
+-spec(family_intersection(Family1, Family2) -> Family3 when
+      Family1 :: family(),
+      Family2 :: family(),
+      Family3 :: family()).
 family_intersection(F1, F2) ->
     fam_binop(F1, F2, fun fam_intersect/3).
 
+-spec(family_difference(Family1, Family2) -> Family3 when
+      Family1 :: family(),
+      Family2 :: family(),
+      Family3 :: family()).
 family_difference(F1, F2) ->
     fam_binop(F1, F2, fun fam_difference/3).
 
@@ -1108,13 +1424,17 @@ fam_binop(F1, F2, FF) when ?IS_SET(F1), ?IS_SET(F2) ->
     case unify_types(?TYPE(F1), ?TYPE(F2)) of
         [] ->
             erlang:error(type_mismatch, [F1, F2]);
-        ?ANYTYPE -> 
+        ?ANYTYPE ->
             F1;
-        Type = ?FAMILY(_, _) -> 
+        Type = ?FAMILY(_, _) ->
 	    ?SET(FF(?LIST(F1), ?LIST(F2), []), Type);
         _ ->  erlang:error(badarg, [F1, F2])
     end.
 
+-spec(partition_family(SetFun, Set) -> Family when
+      Family :: family(),
+      SetFun :: set_fun(),
+      Set :: a_set()).
 partition_family(I, Set) when is_integer(I), ?IS_SET(Set) ->
     Type = ?TYPE(Set),
     case check_for_sort(Type, I) of
@@ -1159,8 +1479,12 @@ partition_family(SetFun, Set) when ?IS_SET(Set) ->
 	    end
     end.
 
+-spec(family_projection(SetFun, Family1) -> Family2 when
+      SetFun :: set_fun(),
+      Family1 :: family(),
+      Family2 :: family()).
 family_projection(SetFun, F) when ?IS_SET(F) ->
-    case ?TYPE(F) of 
+    case ?TYPE(F) of
         ?FAMILY(_, _) when [] =:= ?LIST(F) ->
 	    empty_set();
         ?FAMILY(DT, Type) ->
@@ -1172,7 +1496,7 @@ family_projection(SetFun, F) when ?IS_SET(F) ->
 			Bad ->
 			    erlang:error(Bad, [SetFun, F])
 		    end;
-		_ -> 
+		_ ->
 		    erlang:error(badarg, [SetFun, F])
 	    end;
 	?ANYTYPE -> F;
@@ -1183,6 +1507,9 @@ family_projection(SetFun, F) when ?IS_SET(F) ->
 %%% Digraph functions
 %%%
 
+-spec(family_to_digraph(Family) -> Graph when
+      Graph :: digraph(),
+      Family :: family()).
 family_to_digraph(F) when ?IS_SET(F) ->
     case ?TYPE(F) of
         ?FAMILY(_, _) -> fam2digraph(F, digraph:new());
@@ -1190,6 +1517,10 @@ family_to_digraph(F) when ?IS_SET(F) ->
         _Else -> erlang:error(badarg, [F])
     end.
 
+-spec(family_to_digraph(Family, GraphType) -> Graph when
+      Graph :: digraph(),
+      Family :: family(),
+      GraphType :: [digraph:d_type()]).
 family_to_digraph(F, Type) when ?IS_SET(F) ->
     case ?TYPE(F) of
         ?FAMILY(_, _) -> ok;
@@ -1208,12 +1539,19 @@ family_to_digraph(F, Type) when ?IS_SET(F) ->
         error:badarg -> erlang:error(badarg, [F, Type])
     end.
 
+-spec(digraph_to_family(Graph) -> Family when
+      Graph :: digraph(),
+      Family :: family()).
 digraph_to_family(G) ->
     case catch digraph_family(G) of
         {'EXIT', _} -> erlang:error(badarg, [G]);
         L -> ?SET(L, ?FAMILY(?ATOM_TYPE, ?ATOM_TYPE))
     end.
 
+-spec(digraph_to_family(Graph, Type) -> Family when
+      Graph :: digraph(),
+      Family :: family(),
+      Type :: type()).
 digraph_to_family(G, T) ->
     case {is_type(T), T} of
         {true, ?SET_OF(?FAMILY(_,_) = Type)} ->
@@ -1284,7 +1622,7 @@ rel(Ts, [Type]) ->
     end;
 rel(Ts, Sz) ->
     rel(Ts, Sz, erlang:make_tuple(Sz, ?ATOM_TYPE)).
-    
+
 atoms_only(Type, I) when ?IS_ATOM_TYPE(?REL_TYPE(I, Type)) ->
     atoms_only(Type, I+1);
 atoms_only(Type, I) when I > tuple_size(Type), ?IS_RELATION(Type) ->
@@ -1312,7 +1650,7 @@ rel_type([], SL, Type) when ?IS_RELATION(Type) ->
 %% Inlined.
 a_func(Ts, T) ->
     case {T, is_type(T)} of
-	{[?BINREL(DT, RT) = Type], true} when ?IS_ATOM_TYPE(DT), 
+	{[?BINREL(DT, RT) = Type], true} when ?IS_ATOM_TYPE(DT),
 					      ?IS_ATOM_TYPE(RT)  ->
 	    func(Ts, Type);
 	{[Type], true} ->
@@ -1333,16 +1671,16 @@ func([], _X0, L, Type) ->
 %% Inlined.
 fam(Ts, T) ->
     case {T, is_type(T)} of
-	{[?FAMILY(DT, RT) = Type], true} when ?IS_ATOM_TYPE(DT), 
+	{[?FAMILY(DT, RT) = Type], true} when ?IS_ATOM_TYPE(DT),
 					      ?IS_ATOM_TYPE(RT)  ->
 	    fam2(Ts, Type);
 	{[Type], true} ->
 	    func_type(Ts, [], Type, fun(?FAMILY(_,_)) -> true end)
     end.
 
-fam2([], Type) -> 
+fam2([], Type) ->
     ?SET([], Type);
-fam2(Ts, Type) -> 
+fam2(Ts, Type) ->
     fam2(sort(Ts), Ts, [], Type).
 
 fam2([{I,L} | T], I0, SL, Type) when I /= I0 ->
@@ -1383,7 +1721,7 @@ setify(E, Type0) ->
     {Type, OrdSet} = make_element(E, Type0, Type0),
     ?ORDSET(OrdSet, Type).
 
-is_no_lists(T) when is_tuple(T) -> 
+is_no_lists(T) when is_tuple(T) ->
    Sz = tuple_size(T),
    is_no_lists(T, Sz, Sz, []).
 
@@ -1404,7 +1742,7 @@ create([], T, _T0, L) ->
 
 make_element(C, ?ANYTYPE, _T0) ->
     make_element(C);
-make_element(C, Atom, ?ANYTYPE) when ?IS_ATOM_TYPE(Atom), 
+make_element(C, Atom, ?ANYTYPE) when ?IS_ATOM_TYPE(Atom),
                                      not is_list(C), not is_tuple(C) ->
     {Atom, C};
 make_element(C, Atom, Atom) when ?IS_ATOM_TYPE(Atom) ->
@@ -1585,12 +1923,12 @@ sympart([H1 | T1], [H2 | T2], L1, L12, L2, T) when H1 == H2 ->
 sympart([H1 | T1], [H2 | T2], L1, L12, L2, T) ->
     sympart2(T1, T2, L1, L12, [H2 | L2], T, H1);
 sympart(S1, [], L1, L12, L2, T) ->
-    {?SET(reverse(L1, S1), T), 
-     ?SET(reverse(L12), T), 
+    {?SET(reverse(L1, S1), T),
+     ?SET(reverse(L12), T),
      ?SET(reverse(L2), T)};
 sympart(_, S2, L1, L12, L2, T) ->
-    {?SET(reverse(L1), T), 
-     ?SET(reverse(L12), T), 
+    {?SET(reverse(L1), T),
+     ?SET(reverse(L12), T),
      ?SET(reverse(L2, S2), T)}.
 
 sympart1([H1 | T1], T2, L1, L12, L2, T, H2) when H1 < H2 ->
@@ -1600,8 +1938,8 @@ sympart1([H1 | T1], T2, L1, L12, L2, T, H2) when H1 == H2 ->
 sympart1([H1 | T1], T2, L1, L12, L2, T, H2) ->
     sympart2(T1, T2, L1, L12, [H2 | L2], T, H1);
 sympart1(_, T2, L1, L12, L2, T, H2) ->
-    {?SET(reverse(L1), T), 
-     ?SET(reverse(L12), T), 
+    {?SET(reverse(L1), T),
+     ?SET(reverse(L12), T),
      ?SET(reverse(L2, [H2 | T2]), T)}.
 
 sympart2(T1, [H2 | T2], L1, L12, L2, T, H1) when H1 > H2 ->
@@ -1611,8 +1949,8 @@ sympart2(T1, [H2 | T2], L1, L12, L2, T, H1) when H1 == H2 ->
 sympart2(T1, [H2 | T2], L1, L12, L2, T, H1) ->
     sympart1(T1, T2, [H1 | L1], L12, L2, T, H2);
 sympart2(T1, _, L1, L12, L2, T, H1) ->
-    {?SET(reverse(L1, [H1 | T1]), T), 
-     ?SET(reverse(L12), T), 
+    {?SET(reverse(L1, [H1 | T1]), T),
+     ?SET(reverse(L12), T),
      ?SET(reverse(L2), T)}.
 
 prod([[E | Es] | Xs], T, L) ->
@@ -1660,7 +1998,7 @@ lunion([[] | Ls]) ->
     lunion(Ls);
 lunion([S | Ss]) ->
     umerge(lunion(Ss, last(S), [S], []));
-lunion([]) -> 
+lunion([]) ->
     [].
 
 lunion([[E] = S | Ss], Last, SL, Ls) when E > Last -> % optimization
@@ -1669,7 +2007,7 @@ lunion([S | Ss], Last, SL, Ls) when hd(S) > Last ->
     lunion(Ss, last(S), [S | SL], Ls);
 lunion([S | Ss], _Last, SL, Ls) ->
     lunion(Ss, last(S), [S], [append(reverse(SL)) | Ls]);
-lunion([], _Last, SL, Ls) -> 
+lunion([], _Last, SL, Ls) ->
     [append(reverse(SL)) | Ls].
 
 %% The empty list is always the first list, if present.
@@ -1752,18 +2090,17 @@ relprod(B0, Bx0, By0, A0, L, Ax, [{Bx,By} | B], Ay) when Ay == Bx ->
 relprod(B0, Bx0, By0, A0, L, _Ax, _B, _Ay) ->
     relprod2(B0, Bx0, By0, A0, L).
 
-relprod_n({}, _R, _EmptyG, _IsR) ->
+relprod_n([], _R, _EmptyG, _IsR) ->
     {error, badarg};
-relprod_n(RT, R, EmptyR, IsR) ->
-    RL = tuple_to_list(RT),
+relprod_n(RL, R, EmptyR, IsR) ->
     case domain_type(RL, ?ANYTYPE) of
-        Error = {error, _Reason} -> 
+        Error = {error, _Reason} ->
             Error;
         DType ->
             Empty = any(fun is_empty_set/1, RL) or EmptyR,
             RType = range_type(RL, []),
             Type = ?BINREL(DType, RType),
-            Prod = 
+            Prod =
                 case Empty of
                     true when DType =:= ?ANYTYPE; RType =:= ?ANYTYPE ->
                         empty_set();
@@ -1771,7 +2108,7 @@ relprod_n(RT, R, EmptyR, IsR) ->
                         ?SET([], Type);
                     false ->
                         TL = ?LIST((relprod_n(RL))),
-                        Sz = tuple_size(RT),
+                        Sz = length(RL),
                         Fun = fun({X,A}) -> {X, flat(Sz, A, [])} end,
                         ?SET(map(Fun, TL), Type)
                 end,
@@ -1799,12 +2136,12 @@ flat(N, {T,A}, L) ->
 
 domain_type([T | Ts], T0) when ?IS_SET(T) ->
     case ?TYPE(T) of
-        ?BINREL(DT, _RT) -> 
+        ?BINREL(DT, _RT) ->
             case unify_types(DT, T0) of
                 [] -> {error, type_mismatch};
                 T1 -> domain_type(Ts, T1)
             end;
-        ?ANYTYPE -> 
+        ?ANYTYPE ->
             domain_type(Ts, T0);
         _ -> {error, badarg}
     end;
@@ -1813,12 +2150,12 @@ domain_type([], T0) ->
 
 range_type([T | Ts], L) ->
     case ?TYPE(T) of
-        ?BINREL(_DT, RT) -> 
+        ?BINREL(_DT, RT) ->
             range_type(Ts, [RT | L]);
-        ?ANYTYPE -> 
+        ?ANYTYPE ->
             ?ANYTYPE
     end;
-range_type([], L) -> 
+range_type([], L) ->
     list_to_tuple(reverse(L)).
 
 converse([{A,B} | X], L) ->
@@ -1861,7 +2198,7 @@ weak1([E={X,_Y} | Es], Ys, L, X0) when X == X0 -> % when X < Y
 weak1(Es, Ys, L, X) ->
     weak(Es, Ys, [{X,X} | L]).
 
-weak2([E={X,_Y} | Es], Ys, L, X0) when X == X0 -> % when X < _Y 
+weak2([E={X,_Y} | Es], Ys, L, X0) when X == X0 -> % when X < _Y
     weak2(Es, Ys, [E | L], X);
 weak2(Es, Ys, L, _X) ->
     weak(Es, Ys, L).
@@ -1910,7 +2247,7 @@ restrict_n(I, [T | Ts], Key, Keys, L) ->
     end;
 restrict_n(_I, _Ts, _Key, _Keys, L) ->
     L.
-    
+
 restrict_n(I, K, Ts, [Key | Keys], L, E) when K > Key ->
     restrict_n(I, K, Ts, Keys, L, E);
 restrict_n(I, K, Ts, [Key | Keys], L, E) when K == Key ->
@@ -1933,7 +2270,7 @@ restrict([{K,E} | Ts], _Key, Keys, L) ->
     restrict(Ts, K, Keys, L, E);
 restrict(_Ts, _Key, _Keys, L) ->
     L.
-    
+
 restrict(Ts, K, [Key | Keys], L, E) when K > Key ->
     restrict(Ts, K, Keys, L, E);
 restrict(Ts, K, [Key | Keys], L, E) when K == Key ->
@@ -1956,7 +2293,7 @@ diff_restrict_n(I, _Ts, _Key, _Keys, L) when I =:= 1 ->
     reverse(L);
 diff_restrict_n(_I, _Ts, _Key, _Keys, L) ->
     sort(L).
-    
+
 diff_restrict_n(I, K, Ts, [Key | Keys], L, T) when K > Key ->
     diff_restrict_n(I, K, Ts, Keys, L, T);
 diff_restrict_n(I, K, Ts, [Key | Keys], L, _T) when K == Key ->
@@ -1981,7 +2318,7 @@ diff_restrict([{K,E} | Ts], _Key, Keys, L) ->
     diff_restrict(Ts, K, Keys, L, E);
 diff_restrict(_Ts, _Key, _Keys, L) ->
     L.
-    
+
 diff_restrict(Ts, K, [Key | Keys], L, E) when K > Key ->
     diff_restrict(Ts, K, Keys, L, E);
 diff_restrict(Ts, K, [Key | Keys], L, _E) when K == Key ->
@@ -2041,7 +2378,7 @@ external_fun({external, Function}) when is_atom(Function) ->
     false;
 external_fun({external, Fun}) ->
     Fun;
-external_fun(_) -> 
+external_fun(_) ->
     false.
 
 %% Inlined.
@@ -2121,7 +2458,7 @@ partition3_n(I, _Ts, _Key, _Keys, L1, L2) when I =:= 1 ->
     [reverse(L1) | reverse(L2)];
 partition3_n(_I, _Ts, _Key, _Keys, L1, L2) ->
     [sort(L1) | sort(L2)].
-    
+
 partition3_n(I, K, Ts, [Key | Keys], L1, L2, T) when K > Key ->
     partition3_n(I, K, Ts, Keys, L1, L2, T);
 partition3_n(I, K, Ts, [Key | Keys], L1, L2, T) when K == Key ->
@@ -2146,7 +2483,7 @@ partition3([{K,E} | Ts], _Key, Keys, L1, L2) ->
     partition3(Ts, K, Keys, L1, L2, E);
 partition3(_Ts, _Key, _Keys, L1, L2) ->
     [L1 | L2].
-    
+
 partition3(Ts, K, [Key | Keys], L1, L2, E) when K > Key ->
     partition3(Ts, K, Keys, L1, L2, E);
 partition3(Ts, K, [Key | Keys], L1, L2, E) when K == Key ->
@@ -2192,7 +2529,7 @@ join_element(E1, E2, I2) ->
 
 join_element2([B | Bs], C, I2) when C =/= I2 ->
     [B | join_element2(Bs, C+1, I2)];
-join_element2([_ | Bs], _C, _I2) -> 
+join_element2([_ | Bs], _C, _I2) ->
     Bs.
 
 family2rel([{X,S} | F], L) ->
@@ -2297,7 +2634,7 @@ check_function([{X,_} | XL], R) ->
     check_function(X, XL, R);
 check_function([], R) ->
     R.
-    
+
 check_function(X0, [{X,_} | XL], R) when X0 /= X ->
     check_function(X, XL, R);
 check_function(X0, [{X,_} | _XL], _R) when X0 == X ->
@@ -2371,14 +2708,14 @@ term2set(T, Type) ->
     ?ORDSET(T, Type).
 
 fam2digraph(F, G) ->
-    Fun = fun({From, ToL}) -> 
+    Fun = fun({From, ToL}) ->
                   digraph:add_vertex(G, From),
                   Fun2 = fun(To) ->
                                  digraph:add_vertex(G, To),
                                  case digraph:add_edge(G, From, To) of
-                                     {error, {bad_edge, _}} -> 
+                                     {error, {bad_edge, _}} ->
                                          throw({error, cyclic});
-                                     _ -> 
+                                     _ ->
                                          true
                                  end
                          end,
@@ -2397,7 +2734,7 @@ digraph_fam([V | Vs], V0, G, L) when V /= V0 ->
 digraph_fam([], _V0, _G, L) ->
     reverse(L).
 
-%% -> bool()
+%% -> boolean()
 check_fun(T, F, FunT) ->
     true = is_type(FunT),
     {NT, _MaxI} = number_tuples(T, 1),
@@ -2424,7 +2761,7 @@ check_for_sort(T, _I) when T =:= ?ANYTYPE ->
 check_for_sort(T, I) when ?IS_RELATION(T), I =< ?REL_ARITY(T), I >= 1 ->
     I > 1;
 check_for_sort(_T, _I) ->
-    error. 
+    error.
 
 inverse_substitution(L, Fun, Sort) ->
     %% One easily sees that the inverse of the tuples created by
@@ -2477,11 +2814,11 @@ match_types(Type1, Type2) -> match_types1(Type1, Type2).
 
 match_types1(Atom, Atom) when ?IS_ATOM_TYPE(Atom) ->
     true;
-match_types1(?ANYTYPE, _) -> 
+match_types1(?ANYTYPE, _) ->
     true;
-match_types1(_, ?ANYTYPE) -> 
+match_types1(_, ?ANYTYPE) ->
     true;
-match_types1(?SET_OF(Type1), ?SET_OF(Type2)) -> 
+match_types1(?SET_OF(Type1), ?SET_OF(Type2)) ->
     match_types1(Type1, Type2);
 match_types1(T1, T2) when tuple_size(T1) =:= tuple_size(T2) ->
     match_typesl(tuple_size(T1), T1, T2);
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index 264348180f..30eac4f07d 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -29,23 +29,23 @@
 
 %%---------------------------------------------------------------------------
 
--type direction() :: 'left' | 'right' | 'both'.
-
-%%---------------------------------------------------------------------------
-
 %% Robert's bit
 
 %% len(String)
 %%  Return the length of a string.
 
--spec len(string()) -> non_neg_integer().
+-spec len(String) -> Length when
+      String :: string(),
+      Length :: non_neg_integer().
 
 len(S) -> length(S).
 
 %% equal(String1, String2)
 %%  Test if 2 strings are equal.
 
--spec equal(string(), string()) -> boolean().
+-spec equal(String1, String2) -> boolean() when
+      String1 :: string(),
+      String2 :: string().
 
 equal(S, S) -> true;
 equal(_, _) -> false.
@@ -53,7 +53,10 @@ equal(_, _) -> false.
 %% concat(String1, String2)
 %%  Concatenate 2 strings.
 
--spec concat(string(), string()) -> string().
+-spec concat(String1, String2) -> String3 when
+      String1 :: string(),
+      String2 :: string(),
+      String3 :: string().
 
 concat(S1, S2) -> S1 ++ S2.
 
@@ -61,7 +64,10 @@ concat(S1, S2) -> S1 ++ S2.
 %% rchr(String, Char)
 %%  Return the first/last index of the character in a string.
 
--spec chr(string(), char()) -> non_neg_integer().
+-spec chr(String, Character) -> Index when
+      String :: string(),
+      Character :: char(),
+      Index :: non_neg_integer().
 
 chr(S, C) when is_integer(C) -> chr(S, C, 1).
 
@@ -69,7 +75,10 @@ chr([C|_Cs], C, I) -> I;
 chr([_|Cs], C, I) -> chr(Cs, C, I+1);
 chr([], _C, _I) -> 0.
 
--spec rchr(string(), char()) -> non_neg_integer().
+-spec rchr(String, Character) -> Index when
+      String :: string(),
+      Character :: char(),
+      Index :: non_neg_integer().
 
 rchr(S, C) when is_integer(C) -> rchr(S, C, 1, 0).
 
@@ -85,7 +94,10 @@ rchr([], _C, _I, L) -> L.
 %%  Return the first/last index of the sub-string in a string.
 %%  index/2 is kept for backwards compatibility.
 
--spec str(string(), string()) -> non_neg_integer().
+-spec str(String, SubString) -> Index when
+      String :: string(),
+      SubString :: string(),
+      Index :: non_neg_integer().
 
 str(S, Sub) when is_list(Sub) -> str(S, Sub, 1).
 
@@ -97,7 +109,10 @@ str([C|S], [C|Sub], I) ->
 str([_|S], Sub, I) -> str(S, Sub, I+1);
 str([], _Sub, _I) -> 0.
 
--spec rstr(string(), string()) -> non_neg_integer().
+-spec rstr(String, SubString) -> Index when
+      String :: string(),
+      SubString :: string(),
+      Index :: non_neg_integer().
 
 rstr(S, Sub) when is_list(Sub) -> rstr(S, Sub, 1, 0).
 
@@ -116,7 +131,10 @@ prefix(Pre, String) when is_list(Pre), is_list(String) -> false.
 %% span(String, Chars) -> Length.
 %% cspan(String, Chars) -> Length.
 
--spec span(string(), string()) -> non_neg_integer().
+-spec span(String, Chars) -> Length when
+      String :: string(),
+      Chars :: string(),
+      Length :: non_neg_integer().
 
 span(S, Cs) when is_list(Cs) -> span(S, Cs, 0).
 
@@ -127,7 +145,10 @@ span([C|S], Cs, I) ->
     end;
 span([], _Cs, I) -> I.
 
--spec cspan(string(), string()) -> non_neg_integer().
+-spec cspan(String, Chars) -> Length when
+      String :: string(),
+      Chars :: string(),
+      Length :: non_neg_integer().
 
 cspan(S, Cs) when is_list(Cs) -> cspan(S, Cs, 0).
 
@@ -142,14 +163,21 @@ cspan([], _Cs, I) -> I.
 %% substr(String, Start, Length)
 %%  Extract a sub-string from String.
 
--spec substr(string(), pos_integer()) -> string().
+-spec substr(String, Start) -> SubString when
+      String :: string(),
+      SubString :: string(),
+      Start :: pos_integer().
 
 substr(String, 1) when is_list(String) -> 
     String;
 substr(String, S) when is_integer(S), S > 1 ->
     substr2(String, S).
 
--spec substr(string(), pos_integer(), non_neg_integer()) -> string().
+-spec substr(String, Start, Length) -> SubString when
+      String :: string(),
+      SubString :: string(),
+      Start :: pos_integer(),
+      Length :: non_neg_integer().
 
 substr(String, S, L) when is_integer(S), S >= 1, is_integer(L), L >= 0 ->
     substr1(substr2(String, S), L).
@@ -163,7 +191,10 @@ substr2([_|String], S) -> substr2(String, S-1).
 %% tokens(String, Seperators).
 %%  Return a list of tokens seperated by characters in Seperators.
 
--spec tokens(string(), string()) -> [[char(),...]].
+-spec tokens(String, SeparatorList) -> Tokens when
+      String :: string(),
+      SeparatorList :: string(),
+      Tokens :: [Token :: nonempty_string()].
 
 tokens(S, Seps) ->
     tokens1(S, Seps, []).
@@ -184,11 +215,18 @@ tokens2([C|S], Seps, Toks, Cs) ->
 tokens2([], _Seps, Toks, Cs) ->
     reverse([reverse(Cs)|Toks]).
 
--spec chars(char(), non_neg_integer()) -> string().
+-spec chars(Character, Number) -> String when
+      Character :: char(),
+      Number :: non_neg_integer(),
+      String :: string().
 
 chars(C, N) -> chars(C, N, []).
 
--spec chars(char(), non_neg_integer(), string()) -> string().
+-spec chars(Character, Number, Tail) -> String when
+      Character :: char(),
+      Number :: non_neg_integer(),
+      Tail :: string(),
+      String :: string().
 
 chars(C, N, Tail) when N > 0 ->
     chars(C, N-1, [C|Tail]);
@@ -199,7 +237,10 @@ chars(C, 0, Tail) when is_integer(C) ->
 
 %%% COPIES %%%
 
--spec copies(string(), non_neg_integer()) -> string().
+-spec copies(String, Number) -> Copies when
+      String :: string(),
+      Copies :: string(),
+      Number :: non_neg_integer().
 
 copies(CharList, Num) when is_list(CharList), is_integer(Num), Num >= 0 ->
     copies(CharList, Num, []).
@@ -211,11 +252,16 @@ copies(CharList, Num, R) ->
 
 %%% WORDS %%%
 
--spec words(string()) -> pos_integer().
+-spec words(String) -> Count when
+      String :: string(),
+      Count :: pos_integer().
 
 words(String) -> words(String, $\s).
 
--spec words(string(), char()) -> pos_integer().
+-spec words(String, Character) -> Count when
+      String :: string(),
+      Character :: char(),
+      Count :: pos_integer().
 
 words(String, Char) when is_integer(Char) ->
     w_count(strip(String, both, Char), Char, 0).
@@ -226,11 +272,18 @@ w_count([_H|T], Char, Num) -> w_count(T, Char, Num).
 
 %%% SUB_WORDS %%%
 
--spec sub_word(string(), integer()) -> string().
+-spec sub_word(String, Number) -> Word when
+      String :: string(),
+      Word :: string(),
+      Number :: integer().
 
 sub_word(String, Index) -> sub_word(String, Index, $\s).
 
--spec sub_word(string(), integer(), char()) -> string().
+-spec sub_word(String, Number, Character) -> Word when
+      String :: string(),
+      Word :: string(),
+      Number :: integer(),
+      Character :: char().
 
 sub_word(String, Index, Char) when is_integer(Index), is_integer(Char) ->
     case words(String, Char) of
@@ -254,14 +307,21 @@ s_word([_|T],Stop,Char,Index,Res) when Index < Stop ->
 
 strip(String) -> strip(String, both).
 
--spec strip(string(), direction()) -> string().
+-spec strip(String, Direction) -> Stripped when
+      String :: string(),
+      Stripped :: string(),
+      Direction :: left | right | both.
 
 strip(String, left) -> strip_left(String, $\s);
 strip(String, right) -> strip_right(String, $\s);
 strip(String, both) ->
     strip_right(strip_left(String, $\s), $\s).
 
--spec strip(string(), direction(), char()) -> string().
+-spec strip(String, Direction, Character) -> Stripped when
+      String :: string(),
+      Stripped :: string(),
+      Direction :: left | right | both,
+      Character :: char().
 
 strip(String, right, Char) -> strip_right(String, Char);
 strip(String, left, Char) -> strip_left(String, Char);
@@ -285,11 +345,18 @@ strip_right([], Sc) when is_integer(Sc) ->
 
 %%% LEFT %%%
 
--spec left(string(), non_neg_integer()) -> string().
+-spec left(String, Number) -> Left when
+      String :: string(),
+      Left :: string(),
+      Number :: non_neg_integer().
 
 left(String, Len) when is_integer(Len) -> left(String, Len, $\s).
 
--spec left(string(), non_neg_integer(), char()) -> string().
+-spec left(String, Number, Character) -> Left when
+      String :: string(),
+      Left :: string(),
+      Number :: non_neg_integer(),
+      Character :: char().
 
 left(String, Len, Char) when is_integer(Char) ->
     Slen = length(String),
@@ -303,11 +370,18 @@ l_pad(String, Num, Char) -> String ++ chars(Char, Num).
 
 %%% RIGHT %%%
 
--spec right(string(), non_neg_integer()) -> string().
+-spec right(String, Number) -> Right when
+      String :: string(),
+      Right :: string(),
+      Number :: non_neg_integer().
 
 right(String, Len) when is_integer(Len) -> right(String, Len, $\s).
 
--spec right(string(), non_neg_integer(), char()) -> string().
+-spec right(String, Number, Character) -> Right when
+      String :: string(),
+      Right :: string(),
+      Number :: non_neg_integer(),
+      Character :: char().
 
 right(String, Len, Char) when is_integer(Char) ->
     Slen = length(String),
@@ -321,11 +395,18 @@ r_pad(String, Num, Char) -> chars(Char, Num, String).
 
 %%% CENTRE %%%
 
--spec centre(string(), non_neg_integer()) -> string().
+-spec centre(String, Number) -> Centered when
+      String :: string(),
+      Centered :: string(),
+      Number :: non_neg_integer().
 
 centre(String, Len) when is_integer(Len) -> centre(String, Len, $\s).
 
--spec centre(string(), non_neg_integer(), char()) -> string().
+-spec centre(String, Number, Character) -> Centered when
+      String :: string(),
+      Centered :: string(),
+      Number :: non_neg_integer(),
+      Character :: char().
 
 centre(String, 0, Char) when is_list(String), is_integer(Char) ->
     [];                       % Strange cases to centre string
@@ -341,11 +422,18 @@ centre(String, Len, Char) when is_integer(Char) ->
 
 %%% SUB_STRING %%%
 
--spec sub_string(string(), pos_integer()) -> string().
+-spec sub_string(String, Start) -> SubString when
+      String :: string(),
+      SubString :: string(),
+      Start :: pos_integer().
 
 sub_string(String, Start) -> substr(String, Start).
 
--spec sub_string(string(), pos_integer(), pos_integer()) -> string().
+-spec sub_string(String, Start, Stop) -> SubString when
+      String :: string(),
+      SubString :: string(),
+      Start :: pos_integer(),
+      Stop :: pos_integer().
 
 sub_string(String, Start, Stop) -> substr(String, Start, Stop - Start + 1).
 
@@ -370,23 +458,34 @@ to_upper_char(C) when is_integer(C), 16#F8 =< C, C =< 16#FE ->
 to_upper_char(C) ->
     C.
 
--spec to_lower(string()) -> string()
-	    ; (char()) -> char().
+-spec to_lower(String) -> Result when
+                  String :: string(),
+                  Result :: string()
+	    ; (Char) -> CharResult when
+                  Char :: char(),
+                  CharResult :: char().
 
 to_lower(S) when is_list(S) ->
     [to_lower_char(C) || C <- S];
 to_lower(C) when is_integer(C) ->
     to_lower_char(C).
 
--spec to_upper(string()) -> string()
-	    ; (char()) -> char().
+-spec to_upper(String) -> Result when
+                  String :: string(),
+                  Result :: string()
+	    ; (Char) -> CharResult when
+                  Char :: char(),
+                  CharResult :: char().
 
 to_upper(S) when is_list(S) ->
     [to_upper_char(C) || C <- S];
 to_upper(C) when is_integer(C) ->
     to_upper_char(C).
 
--spec join([string()], string()) -> string().
+-spec join(StringList, Separator) -> String when
+      StringList :: [string()],
+      Separator :: string(),
+      String :: string().
 
 join([], Sep) when is_list(Sep) ->
     [];
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index 368dc2e3e5..e60706ed05 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -35,19 +35,28 @@
 
 %%--------------------------------------------------------------------------
 
--export_type([child_spec/0, del_err/0, startchild_ret/0, strategy/0]).
+-export_type([child_spec/0, startchild_ret/0, strategy/0]).
 
 %%--------------------------------------------------------------------------
 
--type child_id() :: pid() | 'undefined'.
--type mfargs()   :: {module(), atom(), [term()] | undefined}.
+-type child()    :: pid() | 'undefined'.
+-type child_id() :: term().
+-type mfargs()   :: {M :: module(), F :: atom(), A :: [term()] | undefined}.
 -type modules()  :: [module()] | 'dynamic'.
 -type restart()  :: 'permanent' | 'transient' | 'temporary'.
 -type shutdown() :: 'brutal_kill' | timeout().
 -type worker()   :: 'worker' | 'supervisor'.
--type sup_name() :: {'local', atom()} | {'global', atom()}.
--type sup_ref()  :: atom() | {atom(), atom()} | {'global', atom()} | pid().
--type child_spec() :: {term(),mfargs(),restart(),shutdown(),worker(),modules()}.
+-type sup_name() :: {'local', Name :: atom()} | {'global', Name :: atom()}.
+-type sup_ref()  :: (Name :: atom())
+                  | {Name :: atom(), Node :: node()}
+                  | {'global', Name :: atom()}
+                  | pid().
+-type child_spec() :: {Id :: child_id(),
+                       StartFunc :: mfargs(),
+                       Restart :: restart(),
+                       Shutdown :: shutdown(),
+                       Type :: worker(),
+                       Modules :: modules()}.
 
 -type strategy() :: 'one_for_all' | 'one_for_one'
                   | 'rest_for_one' | 'simple_one_for_one'.
@@ -55,21 +64,23 @@
 %%--------------------------------------------------------------------------
 
 -record(child, {% pid is undefined when child is not running
-	        pid = undefined :: child_id(),
+	        pid = undefined :: child(),
 		name,
 		mfargs          :: mfargs(),
 		restart_type    :: restart(),
 		shutdown        :: shutdown(),
 		child_type      :: worker(),
 		modules = []    :: modules()}).
--type child() :: #child{}.
+-type child_rec() :: #child{}.
 
 -define(DICT, dict).
+-define(SETS, sets).
+-define(SET, set).
 
 -record(state, {name,
 		strategy               :: strategy(),
-		children = []          :: [child()],
-		dynamics               :: ?DICT() | list(),
+		children = []          :: [child_rec()],
+		dynamics               :: ?DICT() | ?SET(),
 		intensity              :: non_neg_integer(),
 		period                 :: pos_integer(),
 		restarts = [],
@@ -97,11 +108,16 @@ behaviour_info(_Other) ->
 -type startlink_err() :: {'already_started', pid()} | 'shutdown' | term().
 -type startlink_ret() :: {'ok', pid()} | 'ignore' | {'error', startlink_err()}.
 
--spec start_link(module(), term()) -> startlink_ret().
+-spec start_link(Module, Args) -> startlink_ret() when
+      Module :: module(),
+      Args :: term().
 start_link(Mod, Args) ->
     gen_server:start_link(supervisor, {self, Mod, Args}, []).
  
--spec start_link(sup_name(), module(), term()) -> startlink_ret().
+-spec start_link(SupName, Module, Args) -> startlink_ret() when
+      SupName :: sup_name(),
+      Module :: module(),
+      Args :: term().
 start_link(SupName, Mod, Args) ->
     gen_server:start_link(SupName, supervisor, {SupName, Mod, Args}, []).
  
@@ -109,24 +125,33 @@ start_link(SupName, Mod, Args) ->
 %%% Interface functions.
 %%% ---------------------------------------------------
 
--type info()	       :: term().
 -type startchild_err() :: 'already_present'
-			| {'already_started', child_id()} | term().
--type startchild_ret() :: {'ok', child_id()} | {'ok', child_id(), info()}
+			| {'already_started', Child :: child()} | term().
+-type startchild_ret() :: {'ok', Child :: child()}
+                        | {'ok', Child :: child(), Info :: term()}
 			| {'error', startchild_err()}.
 
--spec start_child(sup_ref(), child_spec() | [term()]) -> startchild_ret().
+-spec start_child(SupRef, ChildSpec) -> startchild_ret() when
+      SupRef :: sup_ref(),
+      ChildSpec :: child_spec() | (List :: [term()]).
 start_child(Supervisor, ChildSpec) ->
     call(Supervisor, {start_child, ChildSpec}).
 
--type restart_err() :: 'running' | 'not_found' | 'simple_one_for_one' | term().
--spec restart_child(sup_ref(), term()) ->
-    {'ok', child_id()} | {'ok', child_id(), info()} | {'error', restart_err()}.
+-spec restart_child(SupRef, Id) -> Result when
+      SupRef :: sup_ref(),
+      Id :: child_id(),
+      Result :: {'ok', Child :: child()}
+              | {'ok', Child :: child(), Info :: term()}
+              | {'error', Error},
+      Error :: 'running' | 'not_found' | 'simple_one_for_one' | term().
 restart_child(Supervisor, Name) ->
     call(Supervisor, {restart_child, Name}).
 
--type del_err() :: 'running' | 'not_found' | 'simple_one_for_one'.
--spec delete_child(sup_ref(), term()) -> 'ok' | {'error', del_err()}.
+-spec delete_child(SupRef, Id) -> Result when
+      SupRef :: sup_ref(),
+      Id :: child_id(),
+      Result :: 'ok' | {'error', Error},
+      Error :: 'running' | 'not_found' | 'simple_one_for_one'.
 delete_child(Supervisor, Name) ->
     call(Supervisor, {delete_child, Name}).
 
@@ -137,22 +162,39 @@ delete_child(Supervisor, Name) ->
 %%          way (maybe killed).
 %%-----------------------------------------------------------------
 
--type term_err() :: 'not_found' | 'simple_one_for_one'.
--spec terminate_child(sup_ref(), term()) -> 'ok' | {'error', term_err()}.
+-spec terminate_child(SupRef, Id) -> Result when
+      SupRef :: sup_ref(),
+      Id :: pid() | child_id(),
+      Result :: 'ok' | {'error', Error},
+      Error :: 'not_found' | 'simple_one_for_one'.
 terminate_child(Supervisor, Name) ->
     call(Supervisor, {terminate_child, Name}).
 
--spec which_children(sup_ref()) -> [{term(), child_id(), worker(), modules()}].
+-spec which_children(SupRef) -> [{Id,Child,Type,Modules}] when
+      SupRef :: sup_ref(),
+      Id :: child_id() | undefined,
+      Child :: child(),
+      Type :: worker(),
+      Modules :: modules().
 which_children(Supervisor) ->
     call(Supervisor, which_children).
 
+-spec count_children(SupRef) -> PropListOfCounts when
+      SupRef :: sup_ref(),
+      PropListOfCounts :: [Count],
+      Count :: {specs, ChildSpecCount :: non_neg_integer()}
+             | {active, ActiveProcessCount :: non_neg_integer()}
+             | {supervisors, ChildSupervisorCount :: non_neg_integer()}
+             |{workers, ChildWorkerCount :: non_neg_integer()}.
 count_children(Supervisor) ->
     call(Supervisor, count_children).
 
 call(Supervisor, Req) ->
     gen_server:call(Supervisor, Req, infinity).
 
--spec check_childspecs([child_spec()]) -> 'ok' | {'error', term()}.
+-spec check_childspecs(ChildSpecs) -> Result when
+      ChildSpecs :: [child_spec()],
+      Result :: 'ok' | {'error', Error :: term()}.
 check_childspecs(ChildSpecs) when is_list(ChildSpecs) ->
     case check_startspec(ChildSpecs) of
 	{ok, _} -> ok;
@@ -220,12 +262,12 @@ init_dynamic(_State, StartSpec) ->
 
 %%-----------------------------------------------------------------
 %% Func: start_children/2
-%% Args: Children = [child()] in start order
+%% Args: Children = [child_rec()] in start order
 %%       SupName = {local, atom()} | {global, atom()} | {pid(), Mod}
 %% Purpose: Start all children.  The new list contains #child's 
 %%          with pids.
 %% Returns: {ok, NChildren} | {error, NChildren}
-%%          NChildren = [child()] in termination order (reversed
+%%          NChildren = [child_rec()] in termination order (reversed
 %%                        start order)
 %%-----------------------------------------------------------------
 start_children(Children, SupName) -> start_children(Children, [], SupName).
@@ -297,8 +339,26 @@ handle_call({start_child, EArgs}, _From, State) when ?is_simple(State) ->
 	    {reply, What, State}
     end;
 
-%%% The requests terminate_child, delete_child and restart_child are 
-%%% invalid for simple_one_for_one supervisors.
+%% terminate_child for simple_one_for_one can only be done with pid
+handle_call({terminate_child, Name}, _From, State) when not is_pid(Name),
+							?is_simple(State) ->
+    {reply, {error, simple_one_for_one}, State};
+
+handle_call({terminate_child, Name}, _From, State) ->
+    case get_child(Name, State, ?is_simple(State)) of
+	{value, Child} ->
+	    case do_terminate(Child, State#state.name) of
+		#child{restart_type=RT} when RT=:=temporary; ?is_simple(State) ->
+		    {reply, ok, state_del_child(Child, State)};
+		NChild ->
+		    {reply, ok, replace_child(NChild, State)}
+		end;
+	false ->
+	    {reply, {error, not_found}, State}
+    end;
+
+%%% The requests delete_child and restart_child are invalid for
+%%% simple_one_for_one supervisors.
 handle_call({_Req, _Data}, _From, State) when ?is_simple(State) ->
     {reply, {error, simple_one_for_one}, State};
 
@@ -341,25 +401,12 @@ handle_call({delete_child, Name}, _From, State) ->
 	    {reply, {error, not_found}, State}
     end;
 
-handle_call({terminate_child, Name}, _From, State) ->
-    case get_child(Name, State) of
-	{value, Child} ->
-	    case do_terminate(Child, State#state.name) of
-		#child{restart_type = temporary} = NChild ->
-		    {reply, ok, state_del_child(NChild, State)};
-		NChild ->
-		    {reply, ok, replace_child(NChild, State)}
-		end;
-	_ ->
-	    {reply, {error, not_found}, State}
-    end;
-
 handle_call(which_children, _From, #state{children = [#child{restart_type = temporary,
 							     child_type = CT,
 							     modules = Mods}]} =
 		State) when ?is_simple(State) ->
-    Reply = lists:map(fun(Pid) -> {undefined, Pid, CT, Mods} end, dynamics_db(temporary,
-									      State#state.dynamics)),
+    Reply = lists:map(fun(Pid) -> {undefined, Pid, CT, Mods} end,
+                      ?SETS:to_list(dynamics_db(temporary, State#state.dynamics))),
     {reply, Reply, State};
 
 handle_call(which_children, _From, #state{children = [#child{restart_type = RType,
@@ -384,7 +431,7 @@ handle_call(count_children, _From, #state{children = [#child{restart_type = temp
 							     child_type = CT}]} = State)
   when ?is_simple(State) ->
     {Active, Count} =
-	lists:foldl(fun(Pid, {Alive, Tot}) ->
+	?SETS:fold(fun(Pid, {Alive, Tot}) ->
 			   if is_pid(Pid) -> {Alive+1, Tot +1};
 			      true -> {Alive, Tot + 1} end
 		   end, {0, 0}, dynamics_db(temporary, State#state.dynamics)),
@@ -680,9 +727,9 @@ restart(one_for_all, Child, State) ->
 
 %%-----------------------------------------------------------------
 %% Func: terminate_children/2
-%% Args: Children = [child()] in termination order
+%% Args: Children = [child_rec()] in termination order
 %%       SupName = {local, atom()} | {global, atom()} | {pid(),Mod}
-%% Returns: NChildren = [child()] in
+%% Returns: NChildren = [child_rec()] in
 %%          startup order (reversed termination order)
 %%-----------------------------------------------------------------
 terminate_children(Children, SupName) ->
@@ -795,24 +842,27 @@ save_child(Child, #state{children = Children} = State) ->
     State#state{children = [Child |Children]}.
 
 save_dynamic_child(temporary, Pid, _, #state{dynamics = Dynamics} = State) ->
-    State#state{dynamics = [Pid | dynamics_db(temporary, Dynamics)]};
+    State#state{dynamics = ?SETS:add_element(Pid, dynamics_db(temporary, Dynamics))};
 save_dynamic_child(RestartType, Pid, Args, #state{dynamics = Dynamics} = State) ->
     State#state{dynamics = ?DICT:store(Pid, Args, dynamics_db(RestartType, Dynamics))}.
 
 dynamics_db(temporary, undefined) ->
-    [];
+    ?SETS:new();
 dynamics_db(_, undefined) ->
     ?DICT:new();
 dynamics_db(_,Dynamics) ->
     Dynamics.
 
-dynamic_child_args(_, Dynamics) when is_list(Dynamics)->
-    {ok, undefined};
 dynamic_child_args(Pid, Dynamics) ->
-    ?DICT:find(Pid, Dynamics).
+    case ?SETS:is_set(Dynamics) of
+        true ->
+            {ok, undefined};
+        false ->
+            ?DICT:find(Pid, Dynamics)
+    end.
 
 state_del_child(#child{pid = Pid, restart_type = temporary}, State) when ?is_simple(State) ->
-    NDynamics = lists:delete(Pid, dynamics_db(temporary, State#state.dynamics)),
+    NDynamics = ?SETS:del_element(Pid, dynamics_db(temporary, State#state.dynamics)),
     State#state{dynamics = NDynamics};
 state_del_child(#child{pid = Pid, restart_type = RType}, State) when ?is_simple(State) ->
     NDynamics = ?DICT:erase(Pid, dynamics_db(RType, State#state.dynamics)),
@@ -849,7 +899,31 @@ split_child(_, [], After) ->
     {lists:reverse(After), []}.
 
 get_child(Name, State) ->
+    get_child(Name, State, false).
+get_child(Pid, State, AllowPid) when AllowPid, is_pid(Pid) ->
+    get_dynamic_child(Pid, State);
+get_child(Name, State, _) ->
     lists:keysearch(Name, #child.name, State#state.children).
+
+get_dynamic_child(Pid, #state{children=[Child], dynamics=Dynamics}) ->
+    case is_dynamic_pid(Pid, dynamics_db(Child#child.restart_type, Dynamics)) of
+	true ->
+	    {value, Child#child{pid=Pid}};
+	false ->
+	    case erlang:is_process_alive(Pid) of
+		true -> false;
+		false -> {value, Child}
+	    end
+    end.
+
+is_dynamic_pid(Pid, Dynamics) ->
+    case ?SETS:is_set(Dynamics) of
+	true ->
+	    ?SETS:is_element(Pid, Dynamics);
+	false ->
+	    ?DICT:is_key(Pid, Dynamics)
+    end.
+
 replace_child(Child, State) ->
     Chs = do_replace_child(Child, State#state.children),
     State#state{children = Chs}.
@@ -924,7 +998,7 @@ supname(N, _)      -> N.
 %%%       Shutdown = integer() | infinity | brutal_kill
 %%%       ChildType = supervisor | worker
 %%%       Modules = [atom()] | dynamic
-%%% Returns: {ok, [child()]} | Error
+%%% Returns: {ok, [child_rec()]} | Error
 %%% ------------------------------------------------------
 
 check_startspec(Children) -> check_startspec(Children, []).
diff --git a/lib/stdlib/src/supervisor_bridge.erl b/lib/stdlib/src/supervisor_bridge.erl
index 3d2bd2c9a5..555cb5a66f 100644
--- a/lib/stdlib/src/supervisor_bridge.erl
+++ b/lib/stdlib/src/supervisor_bridge.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -49,9 +49,25 @@ behaviour_info(_Other) ->
 %%%-----------------------------------------------------------------
 -record(state, {mod, pid, child_state, name}).
 
+-spec start_link(Module, Args) -> Result when
+      Module :: module(),
+      Args :: term(),
+      Result :: {ok, Pid} | ignore | {error, Error},
+      Error :: {already_started, Pid} | term(),
+      Pid :: pid().
+
 start_link(Mod, StartArgs) ->
     gen_server:start_link(supervisor_bridge, [Mod, StartArgs, self], []).
 
+-spec start_link(SupBridgeName, Module, Args) -> Result when
+      SupBridgeName :: {local, Name} | {global, Name},
+      Name :: atom(),
+      Module :: module(),
+      Args :: term(),
+      Result :: {ok, Pid} | ignore | {error, Error},
+      Error :: {already_started, Pid} | term(),
+      Pid :: pid().
+
 start_link(Name, Mod, StartArgs) ->
     gen_server:start_link(Name, supervisor_bridge, [Mod, StartArgs, Name], []).
 
diff --git a/lib/stdlib/src/sys.erl b/lib/stdlib/src/sys.erl
index 12209c16d7..8ab72c9b50 100644
--- a/lib/stdlib/src/sys.erl
+++ b/lib/stdlib/src/sys.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -33,22 +33,74 @@
 %%-----------------------------------------------------------------
 
 -type name()         :: pid() | atom() | {'global', atom()}.
--type system_event() :: {'in', _Msg} | {'in', _Msg, _From} | {'out', _Msg, _To}.
+-type system_event() :: {'in', Msg :: _}
+                      | {'in', Msg :: _, From :: _}
+                      | {'out', Msg :: _, To :: _}
+                        | term().
+-opaque dbg_opt()    :: list().
+-type dbg_fun()      :: fun((FuncState :: _,
+                             Event :: system_event(),
+                             ProcState :: _) -> 'done' | (NewFuncState :: _)).
 
 %%-----------------------------------------------------------------
 %% System messages
 %%-----------------------------------------------------------------
+-spec suspend(Name) -> Void when
+      Name :: name(),
+      Void :: term().
 suspend(Name) -> send_system_msg(Name, suspend).
+-spec suspend(Name, Timeout) -> Void when
+      Name :: name(),
+      Timeout :: timeout(),
+      Void :: term().
 suspend(Name, Timeout) -> send_system_msg(Name, suspend, Timeout).
 
+-spec resume(Name) -> Void when
+      Name :: name(),
+      Void :: term().
 resume(Name) -> send_system_msg(Name, resume).
+-spec resume(Name, Timeout) -> Void when
+      Name :: name(),
+      Timeout :: timeout(),
+      Void :: term().
 resume(Name, Timeout) -> send_system_msg(Name, resume, Timeout).
 
+-spec get_status(Name) -> Status when
+      Name :: name(),
+      Status :: {status, Pid :: pid(), {module, Module :: module()}, [SItem]},
+      SItem :: (PDict :: [{Key :: term(), Value :: term()}])
+             | (SysState :: 'running' | 'suspended')
+             | (Parent :: pid())
+             | (Dbg :: dbg_opt())
+             | (Misc :: term()).
 get_status(Name) -> send_system_msg(Name, get_status).
+-spec get_status(Name, Timeout) -> Status when
+      Name :: name(),
+      Timeout :: timeout(),
+      Status :: {status, Pid :: pid(), {module, Module :: module()}, [SItem]},
+      SItem :: (PDict :: [{Key :: term(), Value :: term()}])
+             | (SysState :: 'running' | 'suspended')
+             | (Parent :: pid())
+             | (Dbg :: dbg_opt())
+             | (Misc :: term()).
 get_status(Name, Timeout) -> send_system_msg(Name, get_status, Timeout).
 
+-spec change_code(Name, Module, OldVsn, Extra) -> 'ok' | {error, Reason} when
+      Name :: name(),
+      Module :: module(),
+      OldVsn :: 'undefined' | term(),
+      Extra :: term(),
+      Reason :: term().
 change_code(Name, Mod, Vsn, Extra) ->
     send_system_msg(Name, {change_code, Mod, Vsn, Extra}).
+-spec change_code(Name, Module, OldVsn, Extra, Timeout) ->
+                         'ok' | {error, Reason} when
+      Name :: name(),
+      Module :: module(),
+      OldVsn :: 'undefined' | term(),
+      Extra :: term(),
+      Timeout :: timeout(),
+      Reason :: term().
 change_code(Name, Mod, Vsn, Extra, Timeout) ->
     send_system_msg(Name, {change_code, Mod, Vsn, Extra}, Timeout).
 
@@ -56,52 +108,116 @@ change_code(Name, Mod, Vsn, Extra, Timeout) ->
 %% Debug commands
 %%-----------------------------------------------------------------
 
--type log_flag() :: 'true' | {'true',pos_integer()} | 'false' | 'get' | 'print'.
-
--spec log(name(), log_flag()) -> 'ok' | {'ok', [system_event()]}.
+-spec log(Name, Flag) -> 'ok' | {'ok', [system_event()]} when
+      Name :: name(),
+      Flag :: 'true' |
+              {'true', N :: pos_integer()}
+            | 'false' | 'get' | 'print'.
 log(Name, Flag) ->
     send_system_msg(Name, {debug, {log, Flag}}).
 
--spec log(name(), log_flag(), timeout()) -> 'ok' | {'ok', [system_event()]}.
+-spec log(Name, Flag, Timeout) -> 'ok' | {'ok', [system_event()]} when
+      Name :: name(),
+      Flag :: 'true' |
+              {'true', N :: pos_integer()}
+            | 'false' | 'get' | 'print',
+      Timeout :: timeout().
 log(Name, Flag, Timeout) ->
     send_system_msg(Name, {debug, {log, Flag}}, Timeout).
 
--spec trace(name(), boolean()) -> 'ok'.
+-spec trace(Name, Flag) -> 'ok' when
+      Name :: name(),
+      Flag :: boolean().
 trace(Name, Flag) ->
     send_system_msg(Name, {debug, {trace, Flag}}).
 
--spec trace(name(), boolean(), timeout()) -> 'ok'.
+-spec trace(Name, Flag, Timeout) -> 'ok' when
+      Name :: name(),
+      Flag :: boolean(),
+      Timeout :: timeout().
 trace(Name, Flag, Timeout) ->
     send_system_msg(Name, {debug, {trace, Flag}}, Timeout).
 
--type l2f_fname() :: string() | 'false'.
-
--spec log_to_file(name(), l2f_fname()) -> 'ok' | {'error','open_file'}.
+-spec log_to_file(Name, Flag) -> 'ok' | {'error','open_file'} when
+      Name :: name(),
+      Flag :: (FileName :: string()) | 'false'.
 log_to_file(Name, FileName) ->
     send_system_msg(Name, {debug, {log_to_file, FileName}}).
 
--spec log_to_file(name(), l2f_fname(), timeout()) -> 'ok' | {'error','open_file'}.
+-spec log_to_file(Name, Flag, Timeout) -> 'ok' | {'error','open_file'} when
+      Name :: name(),
+      Flag :: (FileName :: string()) | 'false',
+      Timeout :: timeout().
 log_to_file(Name, FileName, Timeout) ->
     send_system_msg(Name, {debug, {log_to_file, FileName}}, Timeout).
 
+-spec statistics(Name, Flag) -> 'ok' | {'ok', Statistics} when
+      Name :: name(),
+      Flag :: 'true' | 'false' | 'get',
+      Statistics :: [StatisticsTuple],
+      StatisticsTuple :: {'start_time', DateTime1}
+                       | {'current_time', DateTime2}
+                       | {'reductions', non_neg_integer()}
+                       | {'messages_in', non_neg_integer()}
+                       | {'messages_out', non_neg_integer()},
+      DateTime1 :: file:date_time(),
+      DateTime2 :: file:date_time().
 statistics(Name, Flag) ->
     send_system_msg(Name, {debug, {statistics, Flag}}).
+
+-spec statistics(Name, Flag, Timeout) -> 'ok' | {'ok', Statistics} when
+      Name :: name(),
+      Flag :: 'true' | 'false' | 'get',
+      Statistics :: [StatisticsTuple],
+      StatisticsTuple :: {'start_time', DateTime1}
+                       | {'current_time', DateTime2}
+                       | {'reductions', non_neg_integer()}
+                       | {'messages_in', non_neg_integer()}
+                       | {'messages_out', non_neg_integer()},
+      DateTime1 :: file:date_time(),
+      DateTime2 :: file:date_time(),
+      Timeout :: timeout().
 statistics(Name, Flag, Timeout) ->
     send_system_msg(Name, {debug, {statistics, Flag}}, Timeout).
 
--spec no_debug(name()) -> 'ok'.
+-spec no_debug(Name) -> 'ok' when
+      Name :: name().
 no_debug(Name) -> send_system_msg(Name, {debug, no_debug}).
 
--spec no_debug(name(), timeout()) -> 'ok'.
+-spec no_debug(Name, Timeout) -> 'ok' when
+      Name :: name(),
+      Timeout :: timeout().
 no_debug(Name, Timeout) -> send_system_msg(Name, {debug, no_debug}, Timeout).
 
+-spec install(Name, FuncSpec) -> Void when
+      Name :: name(),
+      FuncSpec :: {Func, FuncState},
+      Func :: dbg_fun(),
+      FuncState :: term(),
+      Void :: term().
 install(Name, {Func, FuncState}) ->
     send_system_msg(Name, {debug, {install, {Func, FuncState}}}).
+-spec install(Name, FuncSpec, Timeout) -> Void when
+      Name :: name(),
+      FuncSpec :: {Func, FuncState},
+      Func :: dbg_fun(),
+      FuncState :: term(),
+      Timeout :: timeout(),
+      Void :: term().
 install(Name, {Func, FuncState}, Timeout) ->
     send_system_msg(Name, {debug, {install, {Func, FuncState}}}, Timeout).
 
+-spec remove(Name, Func) -> Void when
+      Name :: name(),
+      Func :: dbg_fun(),
+      Void :: term().
 remove(Name, Func) ->
     send_system_msg(Name, {debug, {remove, Func}}).
+-spec remove(Name, Func, Timeout) -> Void when
+      Name :: name(),
+      Func :: dbg_fun(),
+      Timeout :: timeout(),
+      Void :: term().
 remove(Name, Func, Timeout) ->
     send_system_msg(Name, {debug, {remove, Func}}, Timeout).
 
@@ -150,6 +266,14 @@ mfa(Name, Req, Timeout) ->
 %%          The Module must export system_continue/3, system_terminate/4
 %%          and format_status/2 for status information.
 %%-----------------------------------------------------------------
+-spec handle_system_msg(Msg, From, Parent, Module, Debug, Misc) -> Void when
+      Msg :: term(),
+      From :: {pid(), Tag :: _},
+      Parent :: pid(),
+      Module :: module(),
+      Debug :: [dbg_opt()],
+      Misc :: term(),
+      Void :: term().
 handle_system_msg(Msg, From, Parent, Module, Debug, Misc) ->
     handle_system_msg(running, Msg, From, Parent, Module, Debug, Misc, false).
 
@@ -176,6 +300,11 @@ handle_system_msg(SysState, Msg, From, Parent, Mod, Debug, Misc, Hib) ->
 %%          Func is a formatting function, called as Func(Device, Event).
 %% Returns: [debug_opts()]
 %%-----------------------------------------------------------------
+-spec handle_debug(Debug, FormFunc, Extra, Event) -> [dbg_opt()] when
+      Debug :: [dbg_opt()],
+      FormFunc :: dbg_fun(),
+      Extra :: term(),
+      Event :: system_event().
 handle_debug([{trace, true} | T], FormFunc, State, Event) ->
     print_event({Event, State, FormFunc}),
     [{trace, true} | handle_debug(T, FormFunc, State, Event)];
@@ -341,24 +470,36 @@ trim(N, LogData) ->
 %% Debug structure manipulating functions
 %%-----------------------------------------------------------------
 install_debug(Item, Data, Debug) ->
-    case get_debug(Item, Debug, undefined) of
+    case get_debug2(Item, Debug, undefined) of
 	undefined -> [{Item, Data} | Debug];
 	_ -> Debug
     end.
 remove_debug(Item, Debug) -> lists:keydelete(Item, 1, Debug).
+
+-spec get_debug(Item, Debug, Default) -> term() when
+      Item :: 'log' | 'statistics',
+      Debug :: [dbg_opt()],
+      Default :: term().
 get_debug(Item, Debug, Default) -> 
+    get_debug2(Item, Debug, Default).
+
+%% Workaround: accepts more Item types than get_debug/3.
+get_debug2(Item, Debug, Default) ->
     case lists:keysearch(Item, 1, Debug) of
 	{value, {Item, Data}} -> Data;
 	_ -> Default
     end.
 
+-spec print_log(Debug) -> Void when
+      Debug :: [dbg_opt()],
+      Void :: term().
 print_log(Debug) ->
     {_N, Logs} = get_debug(log, Debug, {0, []}),
     lists:foreach(fun print_event/1,
 		  lists:reverse(Logs)).
     
 close_log_file(Debug) ->
-    case get_debug(log_to_file, Debug, []) of
+    case get_debug2(log_to_file, Debug, []) of
 	[] ->
 	    Debug;
 	Fd -> 
@@ -375,6 +516,15 @@ close_log_file(Debug) ->
 %%          system messages.
 %% Returns: [debug_opts()]
 %%-----------------------------------------------------------------
+
+-spec debug_options(Options) -> [dbg_opt()] when
+      Options :: [Opt],
+      Opt :: 'trace' | 'log' | 'statistics' | {'log_to_file', FileName}
+           | {'install', FuncSpec},
+      FileName :: file:name(),
+      FuncSpec :: {Func, FuncState},
+      Func :: dbg_fun(),
+      FuncState :: term().
 debug_options(Options) ->
     debug_options(Options, []).
 debug_options([trace | T], Debug) ->
diff --git a/lib/stdlib/src/timer.erl b/lib/stdlib/src/timer.erl
index b456c5d6c1..89fae05e4f 100644
--- a/lib/stdlib/src/timer.erl
+++ b/lib/stdlib/src/timer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -22,7 +22,7 @@
 	 send_after/3, send_after/2,
 	 exit_after/3, exit_after/2, kill_after/2, kill_after/1,
 	 apply_interval/4, send_interval/3, send_interval/2,
-	 cancel/1, sleep/1, tc/2, tc/3, now_diff/2,
+	 cancel/1, sleep/1, tc/1, tc/2, tc/3, now_diff/2,
 	 seconds/1, minutes/1, hours/1, hms/3]).
 
 -export([start_link/0, start/0, 
@@ -46,103 +46,189 @@
 %%
 -opaque tref()    :: {integer(), reference()}.
 -type time()      :: non_neg_integer().
--type timestamp() :: {non_neg_integer(), non_neg_integer(), non_neg_integer()}.
 
 %%
 %% Interface functions
 %%
--spec apply_after(time(), atom(), atom(), [term()]) -> {'ok', tref()} | {'error', term()}.
+-spec apply_after(Time, Module, Function, Arguments) ->
+                         {'ok', TRef} | {'error', Reason} when
+      Time :: time(),
+      Module :: module(),
+      Function :: atom(),
+      Arguments :: [term()],
+      TRef :: tref(),
+      Reason :: term().
+
 apply_after(Time, M, F, A) ->
     req(apply_after, {Time, {M, F, A}}).
 
--spec send_after(time(), pid() | atom(), term()) -> {'ok', tref()} | {'error', term()}.
+-spec send_after(Time, Pid, Message) -> {'ok', TRef} | {'error', Reason} when
+      Time :: time(),
+      Pid :: pid() | (RegName :: atom()),
+      Message :: term(),
+      TRef :: tref(),
+      Reason :: term().
 send_after(Time, Pid, Message) ->
     req(apply_after, {Time, {?MODULE, send, [Pid, Message]}}).
 
--spec send_after(time(), term()) -> {'ok', tref()} | {'error', term()}.
+-spec send_after(Time, Message) -> {'ok', TRef} | {'error', Reason} when
+      Time :: time(),
+      Message :: term(),
+      TRef :: tref(),
+      Reason :: term().
 send_after(Time, Message) ->
     send_after(Time, self(), Message).
 
--spec exit_after(time(), pid() | atom(), term()) -> {'ok', tref()} | {'error', term()}.
+-spec exit_after(Time, Pid, Reason1) -> {'ok', TRef} | {'error', Reason2} when
+      Time :: time(),
+      Pid :: pid() | (RegName :: atom()),
+      TRef :: tref(),
+      Reason1 :: term(),
+      Reason2 :: term().
 exit_after(Time, Pid, Reason) ->
     req(apply_after, {Time, {erlang, exit, [Pid, Reason]}}).
 
--spec exit_after(time(), term()) -> {'ok', tref()} | {'error', term()}.
+-spec exit_after(Time, Reason1) -> {'ok', TRef} | {'error', Reason2} when
+      Time :: time(),
+      TRef :: tref(),
+      Reason1 :: term(),
+      Reason2 :: term().
 exit_after(Time, Reason) ->
     exit_after(Time, self(), Reason).
 
--spec kill_after(time(), pid() | atom()) -> {'ok', tref()} | {'error', term()}.
+-spec kill_after(Time, Pid) -> {'ok', TRef} | {'error', Reason2} when
+      Time :: time(),
+      Pid :: pid() | (RegName :: atom()),
+      TRef :: tref(),
+      Reason2 :: term().
 kill_after(Time, Pid) ->
     exit_after(Time, Pid, kill).
 
--spec kill_after(time()) -> {'ok', tref()} | {'error', term()}.
+-spec kill_after(Time) -> {'ok', TRef} | {'error', Reason2} when
+      Time :: time(),
+      TRef :: tref(),
+      Reason2 :: term().
 kill_after(Time) ->
     exit_after(Time, self(), kill).
 
--spec apply_interval(time(), atom(), atom(), [term()]) -> {'ok', tref()} | {'error', term()}.
+-spec apply_interval(Time, Module, Function, Arguments) ->
+                            {'ok', TRef} | {'error', Reason} when
+      Time :: time(),
+      Module :: module(),
+      Function :: atom(),
+      Arguments :: [term()],
+      TRef :: tref(),
+      Reason :: term().
 apply_interval(Time, M, F, A) ->
     req(apply_interval, {Time, self(), {M, F, A}}).
 
--spec send_interval(time(), pid() | atom(), term()) -> {'ok', tref()} | {'error', term()}.
+-spec send_interval(Time, Pid, Message) ->
+                           {'ok', TRef} | {'error', Reason} when
+      Time :: time(),
+      Pid :: pid() | (RegName :: atom()),
+      Message :: term(),
+      TRef :: tref(),
+      Reason :: term().
 send_interval(Time, Pid, Message) ->
     req(apply_interval, {Time, Pid, {?MODULE, send, [Pid, Message]}}).
 
--spec send_interval(time(), term()) -> {'ok', tref()} | {'error', term()}.
+-spec send_interval(Time, Message) -> {'ok', TRef} | {'error', Reason} when
+      Time :: time(),
+      Message :: term(),
+      TRef :: tref(),
+      Reason :: term().
 send_interval(Time, Message) ->
     send_interval(Time, self(), Message).
 
--spec cancel(tref()) -> {'ok', 'cancel'} | {'error', term()}.
+-spec cancel(TRef) -> {'ok', 'cancel'} | {'error', Reason} when
+      TRef :: tref(),
+      Reason :: term().
 cancel(BRef) ->
     req(cancel, BRef).
 
--spec sleep(timeout()) -> 'ok'.
+-spec sleep(Time) -> 'ok' when
+      Time :: timeout().
 sleep(T) ->
     receive
     after T -> ok
     end.
 
+%%
+%% Measure the execution time (in microseconds) for Fun().
+%%
+-spec tc(Fun) -> {Time, Value} when
+      Fun :: function(),
+      Time :: integer(),
+      Value :: term().
+tc(F) ->
+    Before = os:timestamp(),
+    Val = F(),
+    After = os:timestamp(),
+    {now_diff(After, Before), Val}.
 
 %%
 %% Measure the execution time (in microseconds) for Fun(Args).
 %%
--spec tc(function(), [_]) -> {time(), term()}.
+-spec tc(Fun, Arguments) -> {Time, Value} when
+      Fun :: function(),
+      Arguments :: [term()],
+      Time :: integer(),
+      Value :: term().
 tc(F, A) ->
-    Before = erlang:now(),
-    Val = (catch apply(F, A)),
-    After = erlang:now(),
+    Before = os:timestamp(),
+    Val = apply(F, A),
+    After = os:timestamp(),
     {now_diff(After, Before), Val}.
 
 %%
 %% Measure the execution time (in microseconds) for an MFA.
 %%
--spec tc(atom(), atom(), [term()]) -> {time(), term()}.
+-spec tc(Module, Function, Arguments) -> {Time, Value} when
+      Module :: module(),
+      Function :: atom(),
+      Arguments :: [term()],
+      Time :: integer(),
+      Value :: term().
 tc(M, F, A) ->
-    Before = erlang:now(),
-    Val = (catch apply(M, F, A)),
-    After = erlang:now(),
+    Before = os:timestamp(),
+    Val = apply(M, F, A),
+    After = os:timestamp(),
     {now_diff(After, Before), Val}.
 
 %%
 %% Calculate the time difference (in microseconds) of two
 %% erlang:now() timestamps, T2-T1.
 %%
--spec now_diff(timestamp(), timestamp()) -> integer().
+-spec now_diff(T1, T2) -> Tdiff when
+      T1 :: calendar:t_now(),
+      T2 :: calendar:t_now(),
+      Tdiff :: integer().
 now_diff({A2, B2, C2}, {A1, B1, C1}) ->
     ((A2-A1)*1000000 + B2-B1)*1000000 + C2-C1.
 
 %%
 %% Convert seconds, minutes etc. to milliseconds.    
 %%
--spec seconds(non_neg_integer()) -> non_neg_integer().
+-spec seconds(Seconds) -> MilliSeconds when
+      Seconds :: non_neg_integer(),
+      MilliSeconds :: non_neg_integer().
 seconds(Seconds) ->
     1000*Seconds.
--spec minutes(non_neg_integer()) -> non_neg_integer().
+-spec minutes(Minutes) -> MilliSeconds when
+      Minutes :: non_neg_integer(),
+      MilliSeconds :: non_neg_integer().
 minutes(Minutes) ->
     1000*60*Minutes.
--spec hours(non_neg_integer()) -> non_neg_integer().
+-spec hours(Hours) -> MilliSeconds when
+      Hours :: non_neg_integer(),
+      MilliSeconds :: non_neg_integer().
 hours(Hours) ->
     1000*60*60*Hours.
--spec hms(non_neg_integer(), non_neg_integer(), non_neg_integer()) -> non_neg_integer().
+-spec hms(Hours, Minutes, Seconds) -> MilliSeconds when
+      Hours :: non_neg_integer(),
+      Minutes :: non_neg_integer(),
+      Seconds :: non_neg_integer(),
+      MilliSeconds :: non_neg_integer().
 hms(H, M, S) ->
     hours(H) + minutes(M) + seconds(S).
 
diff --git a/lib/stdlib/src/unicode.erl b/lib/stdlib/src/unicode.erl
index 12bc60623d..a5d9965ca2 100644
--- a/lib/stdlib/src/unicode.erl
+++ b/lib/stdlib/src/unicode.erl
@@ -30,12 +30,34 @@
 	 characters_to_binary/3,
 	 bom_to_encoding/1, encoding_to_bom/1]).
 
--export_type([encoding/0]).
+-export_type([chardata/0, charlist/0, encoding/0, external_chardata/0,
+              external_charlist/0, latin1_chardata/0,
+              latin1_charlist/0, unicode_binary/0, unicode_char/0]).
 
 -type encoding()  :: 'latin1' | 'unicode' | 'utf8'
                    | 'utf16' | {'utf16', endian()}
                    | 'utf32' | {'utf32', endian()}.
 -type endian()    :: 'big' | 'little'.
+-type unicode_binary() :: binary().
+-type unicode_char() :: non_neg_integer().
+-type charlist() :: [unicode_char() | unicode_binary() | charlist()].
+-type chardata() :: charlist() | unicode_binary().
+-type external_unicode_binary() :: binary().
+-type external_chardata() :: external_charlist() | external_unicode_binary().
+-type external_charlist() :: [unicode_char() | external_unicode_binary()
+                              | external_charlist()].
+-type latin1_binary() :: binary().
+-type latin1_char() :: byte().
+-type latin1_chardata() :: latin1_charlist() | latin1_binary().
+-type latin1_charlist() :: [latin1_char() | latin1_binary()
+                            | latin1_charlist()].
+
+-spec characters_to_list(Data) -> Result when
+      Data :: latin1_chardata() | chardata() | external_chardata(),
+      Result :: list()
+              | {error, list(), RestData}
+              | {incomplete, list(), binary()},
+      RestData :: latin1_chardata() | chardata() | external_chardata().
 
 characters_to_list(ML) ->
     unicode:characters_to_list(ML,unicode).
@@ -69,6 +91,13 @@ do_characters_to_list(ML, Encoding) ->
     end.
 
 
+-spec characters_to_binary(Data) -> Result when
+      Data :: latin1_chardata() | chardata() | external_chardata(),
+      Result :: binary()
+              | {error, binary(), RestData}
+              | {incomplete, binary(), binary()},
+      RestData :: latin1_chardata() | chardata() | external_chardata().
+
 characters_to_binary(ML) ->
     try
 	unicode:characters_to_binary(ML,unicode)
@@ -104,6 +133,15 @@ characters_to_binary_int(ML,InEncoding) ->
 	    erlang:raise(error,TheError,[{Mod,characters_to_binary,L}|Rest])
     end.
 
+-spec characters_to_binary(Data, InEncoding, OutEncoding) -> Result when
+      Data :: latin1_chardata() | chardata() | external_chardata(),
+      InEncoding :: encoding(),
+      OutEncoding :: encoding(),
+      Result :: binary()
+              | {error, binary(), RestData}
+              | {incomplete, binary(), binary()},
+      RestData :: latin1_chardata() | chardata() | external_chardata().
+
 characters_to_binary(ML, latin1, latin1) when is_binary(ML) ->
     ML;
 characters_to_binary(ML, latin1, Uni) when is_binary(ML) and ((Uni =:= utf8) or   (Uni =:= unicode)) ->
@@ -215,6 +253,13 @@ characters_to_binary_int(ML, InEncoding, OutEncoding) ->
 	    Res
     end.
 
+-spec bom_to_encoding(Bin) -> {Encoding, Length} when
+      Bin :: binary(),
+      Encoding ::  'latin1' | 'utf8'
+                 | {'utf16', endian()}
+                 | {'utf32', endian()},
+      Length :: non_neg_integer().
+
 bom_to_encoding(<<239,187,191,_/binary>>) ->
     {utf8,3};
 bom_to_encoding(<<0,0,254,255,_/binary>>) ->
@@ -228,6 +273,10 @@ bom_to_encoding(<<255,254,_/binary>>) ->
 bom_to_encoding(Bin) when is_binary(Bin) ->
     {latin1,0}.
 
+-spec encoding_to_bom(InEncoding) -> Bin when
+      Bin :: binary(),
+      InEncoding :: encoding().
+
 encoding_to_bom(unicode) ->
     <<239,187,191>>;
 encoding_to_bom(utf8) ->
diff --git a/lib/stdlib/src/win32reg.erl b/lib/stdlib/src/win32reg.erl
index ee0d17bc94..598e77ffdc 100644
--- a/lib/stdlib/src/win32reg.erl
+++ b/lib/stdlib/src/win32reg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -52,14 +52,17 @@
 -define(reg_dword, 4).
 
 %% Basic types internal to this file.
--type open_mode()  :: 'read' | 'write'.
--type reg_handle() :: {'win32reg',port()}.
+-opaque reg_handle() :: {'win32reg',port()}.
 -type name()       :: string() | 'default'.
 -type value()      :: string() | integer() | binary().
 
 %%% Exported functions.
 
--spec open([open_mode()]) -> {'ok', reg_handle()} | {'error', 'enotsup'}.
+-spec open(OpenModeList) -> ReturnValue when
+      OpenModeList :: [OpenMode],
+      OpenMode :: 'read' | 'write',
+      ReturnValue :: {'ok', RegHandle} | {'error', ErrorId :: 'enotsup'},
+      RegHandle :: reg_handle().
 
 open(Modes) ->
     case os:type() of
@@ -75,14 +78,17 @@ open(Modes) ->
 	    {error, enotsup}
     end.
 
--spec close(reg_handle()) -> 'ok'.
+-spec close(RegHandle) -> 'ok' when
+      RegHandle :: reg_handle().
 
 close({win32reg, Reg}) when is_port(Reg) ->
     unlink(Reg),
     exit(Reg, die),
     ok.
 
--spec current_key(reg_handle()) -> {'ok', string()}.
+-spec current_key(RegHandle) -> ReturnValue when
+      RegHandle :: reg_handle(),
+      ReturnValue :: {'ok', string()}.
 
 current_key({win32reg, Reg}) when is_port(Reg) ->
     Cmd = [?cmd_get_current],
@@ -94,12 +100,18 @@ current_key({win32reg, Reg}) when is_port(Reg) ->
 	     _  -> Root ++ [$\\|Name]
 	 end}.
 
--spec change_key(reg_handle(), string()) -> 'ok' | {'error', atom()}.
+-spec change_key(RegHandle, Key) -> ReturnValue when
+      RegHandle :: reg_handle(),
+      Key :: string(),
+      ReturnValue :: 'ok' | {'error', ErrorId :: atom()}.
 
 change_key({win32reg, Reg}, Key) when is_port(Reg) ->
     change_key(Reg, ?cmd_open_key, Key).
 
--spec change_key_create(reg_handle(), string()) -> 'ok' | {'error', atom()}.
+-spec change_key_create(RegHandle, Key) -> ReturnValue when
+      RegHandle :: reg_handle(),
+      Key :: string(),
+      ReturnValue :: 'ok' | {'error', ErrorId :: atom()}.
 
 change_key_create({win32reg, Reg}, Key) when is_port(Reg) ->
     change_key(Reg, ?cmd_create_key, Key).
@@ -113,21 +125,30 @@ change_key(Reg, Cmd, Key) ->
 	    {error, Reason}
     end.
 
--spec sub_keys(reg_handle()) -> {'ok', [string()]} | {'error', atom()}.
+-spec sub_keys(RegHandle) -> ReturnValue when
+      RegHandle :: reg_handle(),
+      ReturnValue :: {'ok', [SubKey]} | {'error', ErrorId :: atom()},
+      SubKey :: string().
 
 sub_keys({win32reg, Reg}) when is_port(Reg) ->
     Cmd = [?cmd_get_all_subkeys],
     Reg ! {self(), {command, Cmd}},
     collect_keys(Reg, []).
 
--spec delete_key(reg_handle()) -> 'ok' | {'error', atom()}.
+-spec delete_key(RegHandle) -> ReturnValue when
+      RegHandle :: reg_handle(),
+      ReturnValue :: 'ok' | {'error', ErrorId :: atom()}.
 
 delete_key({win32reg, Reg}) when is_port(Reg) ->
     Cmd = [?cmd_delete_key],
     Reg ! {self(), {command, Cmd}},
     get_result(Reg).
 
--spec set_value(reg_handle(), name(), value()) -> 'ok' | {'error', atom()}.
+-spec set_value(RegHandle, Name, Value) -> ReturnValue when
+      RegHandle :: reg_handle(),
+      Name :: name(),
+      Value :: value(),
+      ReturnValue :: 'ok' | {'error', ErrorId :: atom()}.
 
 set_value({win32reg, Reg}, Name0, Value) when is_port(Reg) ->
     Name =
@@ -140,7 +161,10 @@ set_value({win32reg, Reg}, Name0, Value) when is_port(Reg) ->
     Reg ! {self(), {command, Cmd}},
     get_result(Reg).
 
--spec value(reg_handle(), name()) -> {'ok', value()} | {'error', atom()}.
+-spec value(RegHandle, Name) -> ReturnValue when
+      RegHandle :: reg_handle(),
+      Name :: name(),
+      ReturnValue :: {'ok', Value :: value()} | {'error', ErrorId :: atom()}.
 
 value({win32reg, Reg}, Name) when is_port(Reg) ->
     Cmd = [?cmd_get_value, Name, 0],
@@ -152,14 +176,20 @@ value({win32reg, Reg}, Name) when is_port(Reg) ->
 	    {error, Reason}
     end.
     
--spec values(reg_handle()) -> {'ok', [{name(), value()}]} | {'error', atom()}.
+-spec values(RegHandle) -> ReturnValue when
+      RegHandle :: reg_handle(),
+      ReturnValue :: {'ok', [ValuePair]} | {'error', ErrorId :: atom()},
+      ValuePair :: {Name :: name(), Value :: value()}.
 
 values({win32reg, Reg}) when is_port(Reg) ->
     Cmd = [?cmd_get_all_values],
     Reg ! {self(), {command, Cmd}},
     collect_values(Reg, []).
 
--spec delete_value(reg_handle(), name()) -> 'ok' | {'error', atom()}.
+-spec delete_value(RegHandle, Name) -> ReturnValue when
+      RegHandle :: reg_handle(),
+      Name :: name(),
+      ReturnValue :: 'ok' | {'error', ErrorId :: atom()}.
 
 delete_value({win32reg, Reg}, Name0) when is_port(Reg) ->
     Name =
@@ -171,7 +201,9 @@ delete_value({win32reg, Reg}, Name0) when is_port(Reg) ->
     Reg ! {self(), {command, Cmd}},
     get_result(Reg).
 
--spec expand(string()) -> string().
+-spec expand(String) -> ExpandedString when
+      String :: string(),
+      ExpandedString :: string().
 
 expand(Value) ->
     expand(Value, [], []).
@@ -195,7 +227,9 @@ expand([C|Rest], Env, Result) ->
 expand([], [], Result) ->
     lists:reverse(Result).
 
--spec format_error(atom()) -> string().
+-spec format_error(ErrorId) -> ErrorString when
+      ErrorId :: atom(),
+      ErrorString :: string().
 
 format_error(ErrorId) ->
     erl_posix_msg:message(ErrorId).
@@ -203,7 +237,7 @@ format_error(ErrorId) ->
 %%% Implementation.
 
 -spec collect_values(port(), [{name(), value()}]) -> 
-        {'ok', [{name(), value()}]} | {'error', atom()}.
+        {'ok', [{name(), value()}]} | {'error', ErrorId :: atom()}.
 
 collect_values(P, Result) ->
     case get_result(P) of
@@ -215,7 +249,7 @@ collect_values(P, Result) ->
 	    {error, Reason}
     end.
 
--spec collect_keys(port(), string()) -> {'ok', [string()]} | {'error', atom()}.
+-spec collect_keys(port(), string()) -> {'ok', [string()]} | {'error', ErrorId :: atom()}.
 
 collect_keys(P, Result) ->
     case get_result(P) of
diff --git a/lib/stdlib/src/zip.erl b/lib/stdlib/src/zip.erl
index d41aeefa59..524d709431 100644
--- a/lib/stdlib/src/zip.erl
+++ b/lib/stdlib/src/zip.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. 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
@@ -203,6 +203,9 @@
 	       zip_comment_length}).
 
 
+-type zip_file() :: #zip_file{}.
+-type zip_comment() :: #zip_comment{}.
+
 %% Open a zip archive with options
 %%
 
@@ -323,8 +326,33 @@ openzip_close(_) ->
 %% Accepted options:
 %% verbose, cooked, file_list, keep_old_files, file_filter, memory
 
+-spec(unzip(Archive) -> RetValue when
+      Archive :: file:name() | binary(),
+      RetValue :: {ok, FileList}
+                | {ok, FileBinList}
+                | {error, Reason :: term()}
+                | {error, {Name :: file:name(), Reason :: term()}},
+      FileList :: [file:name()],
+      FileBinList :: [{file:name(),binary()}]).
+
 unzip(F) -> unzip(F, []).
 
+-spec(unzip(Archive, Options) -> RetValue when
+      Archive :: file:name() | binary(),
+      Options :: [Option],
+      Option  :: {file_list, FileList}
+               | keep_old_files | verbose | memory |
+                 {file_filter, FileFilter} | {cwd, CWD},
+      FileList :: [file:name()],
+      FileBinList :: [{file:name(),binary()}],
+      FileFilter :: fun((ZipFile) -> boolean()),
+      CWD :: string(),
+      ZipFile :: zip_file(),
+      RetValue :: {ok, FileList}
+                | {ok, FileBinList}
+                | {error, Reason :: term()}
+                | {error, {Name :: file:name(), Reason :: term()}}).
+
 unzip(F, Options) ->
     case ?CATCH do_unzip(F, Options) of
 	{ok, R} -> {ok, R};
@@ -345,6 +373,18 @@ do_unzip(F, Options) ->
     {ok, Files}.
 
 %% Iterate over all files in a zip archive
+-spec(foldl(Fun, Acc0, Archive) -> {ok, Acc1} | {error, Reason} when
+      Fun :: fun((FileInArchive, GetInfo, GetBin, AccIn) -> AccOut),
+      FileInArchive :: file:name(),
+      GetInfo :: fun(() -> file:file_info()),
+      GetBin :: fun(() -> binary()),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term(),
+      Archive :: file:name() | {file:name(), binary()},
+      Reason :: term()).
+
 foldl(Fun, Acc0, Archive) when is_function(Fun, 4) ->
     ZipFun =
 	fun({Name, GetInfo, GetBin}, A) ->
@@ -368,8 +408,33 @@ foldl(_,_, _) ->
 %% Accepted options:
 %% verbose, cooked, memory, comment
 
+-spec(zip(Name, FileList) -> RetValue when
+      Name     :: file:name(),
+      FileList :: [FileSpec],
+      FileSpec :: file:name() | {file:name(), binary()}
+                | {file:name(), binary(), file:file_info()},
+      RetValue :: {ok, FileName :: file:name()}
+                | {ok, {FileName :: file:name(), binary()}}
+                | {error, Reason :: term()}).
+
 zip(F, Files) -> zip(F, Files, []).
 
+-spec(zip(Name, FileList, Options) -> RetValue when
+      Name     :: file:name(),
+      FileList :: [FileSpec],
+      FileSpec :: file:name() | {file:name(), binary()}
+                | {file:name(), binary(), file:file_info()},
+      Options  :: [Option],
+      Option   :: memory | cooked | verbose | {comment, Comment}
+                | {cwd, CWD} | {compress, What} | {uncompress, What},
+      What     :: all | [Extension] | {add, [Extension]} | {del, [Extension]},
+      Extension :: string(),
+      Comment  :: string(),
+      CWD      :: string(),
+      RetValue :: {ok, FileName :: file:name()}
+                | {ok, {FileName :: file:name(), binary()}}
+                | {error, Reason :: term()}).
+
 zip(F, Files, Options) ->
     case ?CATCH do_zip(F, Files, Options) of
 	{ok, R} -> {ok, R};
@@ -392,8 +457,20 @@ do_zip(F, Files, Options) ->
 %% Accepted options:
 %% cooked, file_filter, file_output (latter 2 undocumented)
 
+-spec(list_dir(Archive) -> RetValue when
+      Archive :: file:name() | binary(),
+      RetValue :: {ok, CommentAndFiles} | {error, Reason :: term()},
+      CommentAndFiles :: [zip_comment() | zip_file()]).
+
 list_dir(F) -> list_dir(F, []).
 
+-spec(list_dir(Archive, Options) -> RetValue when
+      Archive :: file:name() | binary(),
+      RetValue :: {ok, CommentAndFiles} | {error, Reason :: term()},
+      CommentAndFiles :: [zip_comment() | zip_file()],
+      Options :: [Option],
+      Option :: cooked).
+
 list_dir(F, Options) ->
     case ?CATCH do_list_dir(F, Options) of
 	{ok, R} -> {ok, R};
@@ -411,6 +488,10 @@ do_list_dir(F, Options) ->
 
 %% Print zip directory in short form
 
+-spec(t(Archive) -> ok when
+      Archive :: file:name() | binary | ZipHandle,
+      ZipHandle :: pid()).
+
 t(F) when is_pid(F) -> zip_t(F);
 t(F) when is_record(F, openzip) -> openzip_t(F);
 t(F) -> t(F, fun raw_short_print_info_etc/5).
@@ -431,6 +512,10 @@ do_t(F, RawPrint) ->
 
 %% Print zip directory in long form (like ls -l)
 
+-spec(tt(Archive) -> ok when
+      Archive :: file:name() | binary | ZipHandle,
+      ZipHandle :: pid()).
+
 tt(F) when is_pid(F) -> zip_tt(F);
 tt(F) when is_record(F, openzip) -> openzip_tt(F);
 tt(F) -> t(F, fun raw_long_print_info_etc/5).
@@ -605,11 +690,78 @@ get_list_dir_options(F, Options) ->
     get_list_dir_opt(Options, Opts).
 
 %% aliases for erl_tar compatibility
+-spec(table(Archive) -> RetValue when
+      Archive :: file:name() | binary(),
+      RetValue :: {ok, CommentAndFiles} | {error, Reason :: term()},
+      CommentAndFiles :: [zip_comment() | zip_file()]).
+
 table(F) -> list_dir(F).
+
+-spec(table(Archive, Options) -> RetValue when
+      Archive :: file:name() | binary(),
+      RetValue :: {ok, CommentAndFiles} | {error, Reason :: term()},
+      CommentAndFiles :: [zip_comment() | zip_file()],
+
+      Options :: [Option],
+      Option :: cooked).
+
 table(F, O) -> list_dir(F, O).
+
+-spec(create(Name, FileList) -> RetValue when
+      Name     :: file:name(),
+      FileList :: [FileSpec],
+      FileSpec :: file:name() | {file:name(), binary()}
+                | {file:name(), binary(), file:file_info()},
+      RetValue :: {ok, FileName :: file:name()}
+                | {ok, {FileName :: file:name(), binary()}}
+                | {error, Reason :: term()}).
+
 create(F, Fs) -> zip(F, Fs).
+
+-spec(create(Name, FileList, Options) -> RetValue when
+      Name     :: file:name(),
+      FileList :: [FileSpec],
+      FileSpec :: file:name() | {file:name(), binary()}
+                | {file:name(), binary(), file:file_info()},
+      Options  :: [Option],
+      Option   :: memory | cooked | verbose | {comment, Comment}
+                | {cwd, CWD} | {compress, What} | {uncompress, What},
+      What     :: all | [Extension] | {add, [Extension]} | {del, [Extension]},
+      Extension :: string(),
+      Comment  :: string(),
+      CWD      :: string(),
+      RetValue :: {ok, FileName :: file:name()}
+                | {ok, {FileName :: file:name(), binary()}}
+                | {error, Reason :: term()}).
 create(F, Fs, O) -> zip(F, Fs, O).
+
+-spec(extract(Archive) -> RetValue when
+      Archive :: file:name() | binary(),
+      RetValue :: {ok, FileList}
+                | {ok, FileBinList}
+                | {error, Reason :: term()}
+                | {error, {Name :: file:name(), Reason :: term()}},
+      FileList :: [file:name()],
+      FileBinList :: [{file:name(),binary()}]).
+
 extract(F) -> unzip(F).
+
+-spec(extract(Archive, Options) -> RetValue when
+      Archive :: file:name() | binary(),
+      Options :: [Option],
+      Option  :: {file_list, FileList}
+               | keep_old_files | verbose | memory |
+                 {file_filter, FileFilter} | {cwd, CWD},
+      FileList :: [file:name()],
+      FileBinList :: [{file:name(),binary()}],
+      FileFilter :: fun((ZipFile) -> boolean()),
+      CWD :: string(),
+      ZipFile :: zip_file(),
+      RetValue :: {ok, FileList}
+                | {ok, FileBinList}
+                | {error, Reason :: term()}
+                | {error, {Name :: file:name(), Reason :: term()}}).
+
 extract(F, O) -> unzip(F, O).
 
 
@@ -990,21 +1142,52 @@ server_loop(OpenZip) ->
 	    {error, bad_msg}
     end.
 
+-spec(zip_open(Archive) -> {ok, ZipHandle} | {error, Reason} when
+      Archive :: file:name() | binary(),
+      ZipHandle :: pid(),
+      Reason :: term()).
+
 zip_open(Archive) -> zip_open(Archive, []).
 
+-spec(zip_open(Archive, Options) -> {ok, ZipHandle} | {error, Reason} when
+      Archive :: file:name() | binary(),
+      ZipHandle :: pid(),
+      Options :: [Option],
+      Option :: cooked | memory | {cwd, CWD :: string()},
+      Reason :: term()).
+
 zip_open(Archive, Options) ->
     Pid = spawn(fun() -> server_loop(not_open) end),
     request(self(), Pid, {open, Archive, Options}).
 
+-spec(zip_get(ZipHandle) -> {ok, [Result]} | {error, Reason} when
+      ZipHandle :: pid(),
+      Result :: file:name() | {file:name(), binary()},
+      Reason :: term()).
+
 zip_get(Pid) when is_pid(Pid) ->
     request(self(), Pid, get).
 
+-spec(zip_close(ZipHandle) -> ok | {error, einval} when
+      ZipHandle :: pid()).
+
 zip_close(Pid) when is_pid(Pid) ->
     request(self(), Pid, close).
 
+-spec(zip_get(FileName, ZipHandle) -> {ok, [Result]} | {error, Reason} when
+      FileName :: file:name(),
+      ZipHandle :: pid(),
+      Result :: file:name() | {file:name(), binary()},
+      Reason :: term()).
+
 zip_get(FileName, Pid) when is_pid(Pid) ->
     request(self(), Pid, {get, FileName}).
 
+-spec(zip_list_dir(ZipHandle) -> Result | {error, Reason} when
+      Result :: [zip_comment() | zip_file()],
+      ZipHandle :: pid(),
+      Reason :: term()).
+
 zip_list_dir(Pid) when is_pid(Pid) ->
     request(self(), Pid, list_dir).
 
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index 9fcc9e6aaf..698070368f 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -53,7 +53,7 @@
          simultaneous_open/1, insert_new/1, repair_continuation/1,
          otp_5487/1, otp_6206/1, otp_6359/1, otp_4738/1, otp_7146/1,
          otp_8070/1, otp_8856/1, otp_8898/1, otp_8899/1, otp_8903/1,
-         otp_8923/1]).
+         otp_8923/1, otp_9282/1]).
 
 -export([dets_dirty_loop/0]).
 
@@ -112,7 +112,7 @@ all() ->
 	     many_clients, otp_4906, otp_5402, simultaneous_open,
 	     insert_new, repair_continuation, otp_5487, otp_6206,
 	     otp_6359, otp_4738, otp_7146, otp_8070, otp_8856, otp_8898,
-	     otp_8899, otp_8903, otp_8923]
+	     otp_8899, otp_8903, otp_8923, otp_9282]
     end.
 
 groups() -> 
@@ -3857,6 +3857,28 @@ otp_8923(Config) when is_list(Config) ->
     file:delete(File),
     ok.
 
+otp_9282(doc) ->
+    ["OTP-9282. The name of a table can be an arbitrary term"];
+otp_9282(suite) ->
+    [];
+otp_9282(Config) when is_list(Config) ->
+    some_calls(make_ref(), Config),
+    some_calls({a,typical,name}, Config),
+    some_calls(fun() -> a_funny_name end, Config),
+    ok.
+
+some_calls(Tab, Config) ->
+    File = filename(ref, Config),
+    ?line {ok,T} = dets:open_file(Tab, [{file,File}]),
+    ?line T = Tab,
+    ?line false = dets:info(T, safe_fixed),
+    ?line File = dets:info(T, filename),
+    ?line ok = dets:insert(Tab, [{3,0}]),
+    ?line [{3,0}] = dets:lookup(Tab, 3),
+    ?line [{3,0}] = dets:traverse(Tab, fun(X) -> {continue, X} end),
+    ?line ok = dets:close(T),
+    file:delete(File).
+
 %%
 %% Parts common to several test cases
 %% 
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index 4b59cee99e..0bcf3c5b71 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -1199,7 +1199,7 @@ local_func(F, As0, Bs0) when is_atom(F) ->
 
 lfh_value_extra() ->
     %% Not documented.
-    {value, fun(F, As) -> local_func_value(F, As) end, []}.
+    {value, fun(F, As, a1, a2) -> local_func_value(F, As) end, [a1, a2]}.
 
 lfh_value() ->
     {value, fun(F, As) -> local_func_value(F, As) end}.
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index bc811355ab..280c95b1aa 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -1161,7 +1161,7 @@ parse_forms2(String, Cont0, Line, Forms) ->
         {done, {ok, Tokens, EndLine}, Chars} ->
             {ok, Form} = erl_parse:parse_form(Tokens),
             parse_forms2(Chars, [], EndLine, [Form | Forms]);
-        {more, Cont} when element(3, Cont) =:= [] ->
+        {more, Cont} when element(4, Cont) =:= [] ->
             %% extra spaces after forms...
             parse_forms2([], Cont, Line, Forms);
         {more, Cont} ->
diff --git a/lib/stdlib/test/sofs_SUITE.erl b/lib/stdlib/test/sofs_SUITE.erl
index 01de1f0600..d6f88a655e 100644
--- a/lib/stdlib/test/sofs_SUITE.erl
+++ b/lib/stdlib/test/sofs_SUITE.erl
@@ -1602,19 +1602,15 @@ relative_product_2(Conf) when is_list(Conf) ->
 				 from_term([{{a},b}])}, ER)),
 
     ?line {'EXIT', {badarg, _}} = (catch relative_product({}, ER)),
-    ?line eval(relative_product({relation([{a,b}])}, 
-				from_term([],[{{atom},atom}])), 
-               ER),
-    ?line eval(relative_product({relation([{a,b}]),relation([{a,1}])}, 
-				from_term([{{b,1},{tjo,hej,sa}}])),
-               from_term([{a,{tjo,hej,sa}}])),
-    ?line eval(relative_product({relation([{a,b}]), ER}, 
-				from_term([{{a,b},b}])), 
-               ER),
-    ?line eval(relative_product({relation([{a,b},{c,a}]), 
-				 relation([{a,1},{a,2}])},
-				from_term([{{b,1},b1},{{b,2},b2}])),
-               relation([{a,b1},{a,b2}])),
+    ?line relprod2({relation([{a,b}])}, from_term([],[{{atom},atom}]), ER),
+    ?line relprod2({relation([{a,b}]),relation([{a,1}])},
+                   from_term([{{b,1},{tjo,hej,sa}}]),
+                   from_term([{a,{tjo,hej,sa}}])),
+    ?line relprod2({relation([{a,b}]), ER}, from_term([{{a,b},b}]), ER),
+    ?line relprod2({relation([{a,b},{c,a}]),
+                    relation([{a,1},{a,2}])},
+                   from_term([{{b,1},b1},{{b,2},b2}]),
+                   relation([{a,b1},{a,b2}])),
     ?line eval(relative_product({relation([{a,b}]), ER}), 
                from_term([],[{atom,{atom,atom}}])),
     ?line eval(relative_product({from_term([{{a,[a,b]},[a]}]),
@@ -1622,6 +1618,11 @@ relative_product_2(Conf) when is_list(Conf) ->
                from_term([{{a,[a,b]},{[a],[[a,b]]}}])),
     ok.
 
+relprod2(A1T, A2, R) ->
+    %% A tuple as first argument is the old interface:
+    eval(relative_product(A1T, A2), R),
+    eval(relative_product(tuple_to_list(A1T), A2), R).
+
 product_1(suite) -> [];
 product_1(doc) -> [""];
 product_1(Conf) when is_list(Conf) ->
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index f9ceed8f84..c79a5002fb 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -20,7 +20,7 @@
 
 -module(supervisor_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(TIMEOUT, 1000).
 
 %% Testserver specific export
@@ -28,8 +28,8 @@
 	 init_per_group/2,end_per_group/2, init_per_testcase/2,
 	 end_per_testcase/2]).
 
-%% Indirect spawn export
--export([init/1]).
+%% Internal export
+-export([init/1, terminate_all_children/1]).
 
 %% API tests
 -export([ sup_start_normal/1, sup_start_ignore_init/1, 
@@ -55,7 +55,8 @@
 %% Misc tests
 -export([child_unlink/1, tree/1, count_children_memory/1,
 	 do_not_save_start_parameters_for_temporary_children/1,
-	 do_not_save_child_specs_for_temporary_children/1]).
+	 do_not_save_child_specs_for_temporary_children/1,
+	 simple_one_for_one_scale_many_temporary_children/1]).
 
 %%-------------------------------------------------------------------------
 
@@ -72,7 +73,8 @@ all() ->
      {group, normal_termination},
      {group, abnormal_termination}, child_unlink, tree,
      count_children_memory, do_not_save_start_parameters_for_temporary_children,
-     do_not_save_child_specs_for_temporary_children].
+     do_not_save_child_specs_for_temporary_children,
+     simple_one_for_one_scale_many_temporary_children].
 
 groups() -> 
     [{sup_start, [],
@@ -349,8 +351,7 @@ child_adm(Config) when is_list(Config) ->
     ok = supervisor:terminate_child(sup_test, child1),
 
     %% Start of already existing but not running process 
-    {error,already_present} =
-	supervisor:start_child(sup_test, Child),
+    {error,already_present} = supervisor:start_child(sup_test, Child),
 
     %% Restart
     {ok, CPid2} = supervisor:restart_child(sup_test, child1),
@@ -377,6 +378,11 @@ child_adm(Config) when is_list(Config) ->
     [{child1, CPid3, worker, []}] = supervisor:which_children(sup_test),
     [1,1,0,1] = get_child_counts(sup_test),
 
+    %% Terminate with Pid not allowed when not simple_one_for_one
+    {error,not_found} = supervisor:terminate_child(sup_test, CPid3),
+    [{child1, CPid3, worker, []}] = supervisor:which_children(sup_test),
+    [1,1,0,1] = get_child_counts(sup_test),
+
     {'EXIT',{noproc,{gen_server,call,[foo,which_children,infinity]}}}
 	= (catch supervisor:which_children(foo)),
     {'EXIT',{noproc,{gen_server,call,[foo,count_children,infinity]}}}
@@ -412,16 +418,26 @@ child_adm_simple(Config) when is_list(Config) ->
     [1,2,0,2] = get_child_counts(sup_test),
 
     %% Termination
-    {error, simple_one_for_one} =
-	supervisor:terminate_child(sup_test, child1),
+    {error, simple_one_for_one} = supervisor:terminate_child(sup_test, child1),
+    [1,2,0,2] = get_child_counts(sup_test),
+    ok = supervisor:terminate_child(sup_test,CPid1),
+    [_] = supervisor:which_children(sup_test),
+    [1,1,0,1] = get_child_counts(sup_test),
+    false = erlang:is_process_alive(CPid1),
+    %% Terminate non-existing proccess is ok
+    ok = supervisor:terminate_child(sup_test,CPid1),
+    [_] = supervisor:which_children(sup_test),
+    [1,1,0,1] = get_child_counts(sup_test),
+    %% Terminate pid which is not a child of this supervisor is not ok
+    NoChildPid = spawn_link(fun() -> receive after infinity -> ok end end),
+    {error, not_found} = supervisor:terminate_child(sup_test, NoChildPid),
+    true = erlang:is_process_alive(NoChildPid),
 
     %% Restart
-    {error, simple_one_for_one} =
-	supervisor:restart_child(sup_test, child1),
+    {error, simple_one_for_one} = supervisor:restart_child(sup_test, child1),
 
     %% Deletion
-    {error, simple_one_for_one} =
-	supervisor:delete_child(sup_test, child1),
+    {error, simple_one_for_one} = supervisor:delete_child(sup_test, child1),
     ok.
 
 %%-------------------------------------------------------------------------
@@ -1187,6 +1203,47 @@ restarted(Sup, {Id,_,_,_,_,_} = ChildSpec, TerminateHow) ->
     {error, {already_started, _}} = supervisor:start_child(Sup, ChildSpec).
 
 
+%%-------------------------------------------------------------------------
+%% OTP-9242: Pids for dynamic temporary children were saved as a list,
+%% which caused bad scaling when adding/deleting many processes.
+simple_one_for_one_scale_many_temporary_children(_Config) ->
+    process_flag(trap_exit, true),
+    Child = {child, {supervisor_1, start_child, []}, temporary, 1000,
+	     worker, []},
+    {ok, _SupPid} = start_link({ok, {{simple_one_for_one, 2, 3600}, [Child]}}),
+
+    C1 = [begin 
+		 {ok,P} = supervisor:start_child(sup_test,[]), 
+		 P
+	     end || _<- lists:seq(1,1000)],
+    {T1,done} = timer:tc(?MODULE,terminate_all_children,[C1]),
+    
+    C2 = [begin 
+		 {ok,P} = supervisor:start_child(sup_test,[]), 
+		 P
+	     end || _<- lists:seq(1,10000)],
+    {T2,done} = timer:tc(?MODULE,terminate_all_children,[C2]),
+    
+    Scaling = T2 div T1,
+    if Scaling > 20 ->
+	    %% The scaling shoul be linear (i.e.10, really), but we
+	    %% give some extra here to avoid failing the test
+	    %% unecessarily.
+	    ?t:fail({bad_scaling,Scaling});
+       true ->
+	    ok
+    end.
+    
+
+terminate_all_children([C|Cs]) ->
+    ok = supervisor:terminate_child(sup_test,C),
+    terminate_all_children(Cs);
+terminate_all_children([]) ->
+    done.
+
+
+
+%%-------------------------------------------------------------------------
 terminate(Pid, Reason) when Reason =/= supervisor ->
     terminate(dummy, Pid, dummy, Reason).
 
diff --git a/lib/stdlib/test/timer_simple_SUITE.erl b/lib/stdlib/test/timer_simple_SUITE.erl
index 852afa1a4d..dc751aad16 100644
--- a/lib/stdlib/test/timer_simple_SUITE.erl
+++ b/lib/stdlib/test/timer_simple_SUITE.erl
@@ -229,7 +229,7 @@ cancel2(Config) when is_list(Config) ->
 tc(doc) -> "Test sleep/1 and tc/3.";
 tc(suite) -> [];
 tc(Config) when is_list(Config) ->
-    % This should both sleep and tc/3
+    %% This should test both sleep and tc/3
     ?line {Res1, ok} = timer:tc(timer, sleep, [500]),
     ?line ok = 	if
 		    Res1 < 500*1000 -> {too_early, Res1}; % Too early
@@ -237,13 +237,40 @@ tc(Config) when is_list(Config) ->
 		    true -> ok
 		end,
 
-    % This should both sleep and tc/2
+    %% tc/2
     ?line {Res2, ok} = timer:tc(fun(T) -> timer:sleep(T) end, [500]),
     ?line ok = 	if
 		    Res2 < 500*1000 -> {too_early, Res2}; % Too early
 		    Res2 > 800*1000 -> {too_late, Res2};  % Too much time
 		    true -> ok
 		end,
+    
+    %% tc/1
+    ?line {Res3, ok} = timer:tc(fun() -> timer:sleep(500) end),
+    ?line ok = 	if
+    		    Res3 < 500*1000 -> {too_early, Res3}; % Too early
+    		    Res3 > 800*1000 -> {too_late, Res3};  % Too much time
+    		    true -> ok
+    		end,
+
+    %% Check that timer:tc don't catch errors
+    ?line ok = try timer:tc(erlang, exit, [foo]) 
+	       catch exit:foo -> ok
+	       end,
+    
+    ?line ok = try timer:tc(fun(Reason) -> 1 = Reason end, [foo]) 
+	       catch error:{badmatch,_} -> ok
+	       end,
+    
+    ?line ok = try timer:tc(fun() -> throw(foo) end) 
+	       catch foo -> ok
+	       end,
+    
+    %% Check that return values are propageted
+    Self = self(),
+    ?line {_, Self} = timer:tc(erlang, self, []),
+    ?line {_, Self} = timer:tc(fun(P) -> P end, [self()]),
+    ?line {_, Self} = timer:tc(fun() -> self() end),
 
     ?line Sec = timer:seconds(4),
     ?line Min = timer:minutes(4),
diff --git a/lib/test_server/doc/src/notes.xml b/lib/test_server/doc/src/notes.xml
index 9c62b0fcf6..3a10bb209d 100644
--- a/lib/test_server/doc/src/notes.xml
+++ b/lib/test_server/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 7f0011bd68..591329b361 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -36,7 +36,7 @@
 -export([capture_start/0,capture_stop/0,capture_get/0]).
 -export([messages_get/0]).
 -export([hours/1,minutes/1,seconds/1,sleep/1,adjusted_sleep/1,timecall/3]).
--export([timetrap_scale_factor/0,timetrap/1,timetrap_cancel/1]).
+-export([timetrap_scale_factor/0,timetrap/1,timetrap_cancel/1,timetrap_cancel/0]).
 -export([m_out_of_n/3,do_times/4,do_times/2]).
 -export([call_crash/3,call_crash/4,call_crash/5]).
 -export([temp_name/1]).
@@ -1077,7 +1077,7 @@ run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
 
     {{Time,Value},Loc,Opts} =
 	case test_server_sup:framework_call(init_tc,[?pl2a(Mod),Func,Args0],
-					    {ok, Args0}) of
+					    {ok,Args0}) of
 	    {ok,Args} ->
 		run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback);
 	    Error = {error,_Reason} ->
@@ -1085,18 +1085,17 @@ run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
 					   {skip,{failed,Error}}),
 		{{0,NewResult},{Mod,Func},[]};
 	    {fail,Reason} ->
-		[Conf] = Args0,
-		Conf1 = [{tc_status,{failed,Reason}} | Conf],
+		Conf = [{tc_status,{failed,Reason}} | hd(Args0)],
 		fw_error_notify(Mod, Func, Conf, Reason),
-		NewResult = do_end_tc_call(Mod,Func, {{error,Reason},[Conf1]},
-					   {fail, Reason}),
+		NewResult = do_end_tc_call(Mod,Func, {{error,Reason},[Conf]},
+					   {fail,Reason}),
 		{{0,NewResult},{Mod,Func},[]};
 	    Skip = {skip,_Reason} ->
 		NewResult = do_end_tc_call(Mod,Func,{Skip,Args0},Skip),
 		{{0,NewResult},{Mod,Func},[]};
 	    {auto_skip,Reason} ->
 		NewResult = do_end_tc_call(Mod, Func, {{skip,Reason},Args0},
-					   {skip, {fw_auto_skip,Reason}}),
+					   {skip,{fw_auto_skip,Reason}}),
 		{{0,NewResult},{Mod,Func},[]}
 	end,
     exit({Ref,Time,Value,Loc,Opts}).
@@ -1116,9 +1115,15 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 		{skip_and_save,Reason,SaveCfg} ->
 		    Line = get_loc(),
 		    Conf = [{tc_status,{skipped,Reason}},{save_config,SaveCfg}],
-		    NewRes = do_end_tc_call(Mod, Func, {{skip, Reason}, [Conf]},
+		    NewRes = do_end_tc_call(Mod, Func, {{skip,Reason},[Conf]},
 					    {skip, Reason}),
 		    {{0,NewRes},Line,[]};
+		FailTC = {fail,Reason} ->       % user fails the testcase
+		    EndConf = [{tc_status,{failed,Reason}} | hd(Args)],
+		    fw_error_notify(Mod, Func, EndConf, Reason),
+		    NewRes = do_end_tc_call(Mod, Func, {{error,Reason},[EndConf]},
+					    FailTC),
+		    {{0,NewRes},{Mod,Func},[]};
 		{ok,NewConf} ->
 		    put(test_server_init_or_end_conf,undefined),
 		    %% call user callback function if defined
@@ -1153,8 +1158,9 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 		    {FWReturn1,TSReturn1,EndConf2} =
 			case end_per_testcase(Mod, Func, EndConf1) of
 			    SaveCfg1={save_config,_} ->
-				{FWReturn,TSReturn,[SaveCfg1|lists:keydelete(save_config, 1, EndConf1)]};
-			    {fail,ReasonToFail} ->                       % user has failed the testcase
+				{FWReturn,TSReturn,[SaveCfg1|lists:keydelete(save_config,1,
+									     EndConf1)]};
+			    {fail,ReasonToFail} ->                % user has failed the testcase
 				fw_error_notify(Mod, Func, EndConf1, ReasonToFail),
 				{{error,ReasonToFail},{failed,ReasonToFail},EndConf1};
 			    {failed,{_,end_per_testcase,_}} = Failure -> % unexpected termination
@@ -1193,11 +1199,10 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 
 do_end_tc_call(M,F,Res,Return) ->
     Ref = make_ref(),
-    case test_server_sup:framework_call(
-	   end_tc, [?pl2a(M),F,Res], Ref) of
-	{fail,FWReason} ->
-	    {failed,FWReason};
-	Ref ->
+    case os:getenv("TEST_SERVER_FRAMEWORK") of
+	FW when FW == "ct_framework";
+		FW == "undefined";
+		FW == false ->
 	    case test_server_sup:framework_call(
 		   end_tc, [?pl2a(M),F,Res, Return], ok) of
 		{fail,FWReason} ->
@@ -1212,8 +1217,14 @@ do_end_tc_call(M,F,Res,Return) ->
 		NewReturn ->
 		    NewReturn
 	    end;
-	_ ->
-	    Return
+	Other ->
+	    case test_server_sup:framework_call(
+		   end_tc, [Other,F,Res], Ref) of
+		{fail,FWReason} ->
+		    {failed,FWReason};
+		_Else ->
+		    Return
+	    end
     end.
 
 %% the return value is a list and we have to check if it contains
@@ -1296,7 +1307,7 @@ init_per_testcase(Mod, Func, Args) ->
 	false -> code:load_file(Mod);
 	_ -> ok
     end,
-%% init_per_testcase defined, returns new configuration
+    %% init_per_testcase defined, returns new configuration
     case erlang:function_exported(Mod,init_per_testcase,2) of
 	true ->
 	    case catch my_apply(Mod, init_per_testcase, [Func|Args]) of
@@ -1316,6 +1327,8 @@ init_per_testcase(Mod, Func, Args) ->
 					      "bad elements in Config: ~p\n",[Bad]},
 			    {skip,{failed,{Mod,init_per_testcase,bad_return}}}
 		    end;
+		{'$test_server_ok',Res={fail,_Reason}} ->
+		    Res;
 		{'$test_server_ok',_Other} ->
 		    group_leader() ! {printout,12,
 				      "ERROR! init_per_testcase did not return "
@@ -1690,7 +1703,7 @@ fail() ->
 break(Comment) ->
     case erase(test_server_timetraps) of
 	undefined -> ok;
-	List -> lists:foreach(fun(Ref) -> timetrap_cancel(Ref) end,List)
+	List -> lists:foreach(fun({Ref,_}) -> timetrap_cancel(Ref) end, List)
     end,
     io:format(user,
 	      "\n\n\n--- SEMIAUTOMATIC TESTING ---"
@@ -1771,14 +1784,16 @@ timetrap(Timeout0) ->
 	{undefined,false} -> timetrap1(Timeout, false);
 	{undefined,_} -> timetrap1(Timeout, true);
 	{infinity,_} -> infinity;
+	{_Int,_Scale} when Timeout == infinity -> infinity;
 	{Int,Scale} -> timetrap1(Timeout*Int, Scale)
     end.
 
 timetrap1(Timeout, Scale) ->
-    Ref = spawn_link(test_server_sup,timetrap,[Timeout,Scale,self()]),
+    TCPid = self(),
+    Ref = spawn_link(test_server_sup,timetrap,[Timeout,Scale,TCPid]),
     case get(test_server_timetraps) of
-	undefined -> put(test_server_timetraps,[Ref]);
-	List -> put(test_server_timetraps,[Ref|List])
+	undefined -> put(test_server_timetraps,[{Ref,TCPid}]);
+	List -> put(test_server_timetraps,[{Ref,TCPid}|List])
     end,
     Ref.
 
@@ -1791,14 +1806,16 @@ ensure_timetrap(Config) ->
 		undefined -> ok;
 		Garbage ->
 		    erase(test_server_default_timetrap),
-		    format("=== WARNING: garbage in test_server_default_timetrap: ~p~n",
+		    format("=== WARNING: garbage in "
+			   "test_server_default_timetrap: ~p~n",
 			   [Garbage])
 	    end,
 	    DTmo = case lists:keysearch(default_timeout,1,Config) of
 		       {value,{default_timeout,Tmo}} -> Tmo;
 		       _ -> ?DEFAULT_TIMETRAP_SECS
 		   end,
-	    format("=== test_server setting default timetrap of ~p seconds~n",
+	    format("=== test_server setting default "
+		   "timetrap of ~p seconds~n",
 		   [DTmo]),
 	    put(test_server_default_timetrap, timetrap(seconds(DTmo)))
     end.
@@ -1810,11 +1827,13 @@ cancel_default_timetrap() ->
 	TimeTrap when is_pid(TimeTrap) ->
 	    timetrap_cancel(TimeTrap),
 	    erase(test_server_default_timetrap),
-	    format("=== test_server canceled default timetrap since another timetrap was set~n"),
+	    format("=== test_server canceled default timetrap "
+		   "since another timetrap was set~n"),
 	    ok;
 	Garbage ->
 	    erase(test_server_default_timetrap),
-	    format("=== WARNING: garbage in test_server_default_timetrap: ~p~n",
+	    format("=== WARNING: garbage in "
+		   "test_server_default_timetrap: ~p~n",
 		   [Garbage]),
 	    error
     end.
@@ -1828,6 +1847,7 @@ time_ms({Other,_N}) ->
 	   "Should be seconds, minutes, or hours.~n", [Other]),
     exit({invalid_time_spec,Other});
 time_ms(Ms) when is_integer(Ms) -> Ms;
+time_ms(infinity) -> infinity;
 time_ms(Other) -> exit({invalid_time_spec,Other}).
 
 
@@ -1841,11 +1861,29 @@ timetrap_cancel(infinity) ->
 timetrap_cancel(Handle) ->
     case get(test_server_timetraps) of
 	undefined -> ok;
-	[Handle] -> erase(test_server_timetraps);
-	List -> put(test_server_timetraps,lists:delete(Handle,List))
+	[{Handle,_}] -> erase(test_server_timetraps);
+	Timers -> put(test_server_timetraps,
+		      lists:keydelete(Handle, 1, Timers))
     end,
     test_server_sup:timetrap_cancel(Handle).
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% timetrap_cancel() -> ok
+%%
+%% Cancels timetrap for current test case.
+timetrap_cancel() ->
+    case get(test_server_timetraps) of
+	undefined ->
+	    ok;
+	Timers ->
+	    case lists:keysearch(self(), 2, Timers) of
+		{value,{Handle,_}} ->
+		    timetrap_cancel(Handle);
+		_ ->
+		    ok
+	    end
+    end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% hours(N) -> Milliseconds
 %% minutes(N) -> Milliseconds
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 30d7314058..de9b962dfc 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -1812,6 +1812,9 @@ start_log_file() ->
     ok = file:make_dir(PrivDir),
     put(test_server_priv_dir,PrivDir++"/"),
     print_timestamp(13,"Suite started at "),
+
+    LogInfo = [{topdir,Dir},{rundir,lists:flatten(TestDir)}],
+    test_server_sup:framework_call(report, [loginfo,LogInfo]),
     ok.
 
 make_html_link(LinkName, Target, Explanation) ->
@@ -1925,7 +1928,6 @@ html_convert_modules(TestSpec, _Config) ->
     copy_html_files(get(test_server_dir), get(test_server_log_dir_base)).
 
 %% Retrieve a list of modules out of the test spec.
-
 html_isolate_modules(List) -> html_isolate_modules(List, sets:new()).
 
 html_isolate_modules([], Set) -> sets:to_list(Set);
@@ -1939,37 +1941,56 @@ html_isolate_modules([{Mod,_Case,_Args}|Cases], Set) ->
     html_isolate_modules(Cases, sets:add_element(Mod, Set)).
 
 %% Given a list of modules, convert each module's source code to HTML.
-
 html_convert_modules([Mod|Mods]) ->
     case code:which(Mod) of
 	Path when is_list(Path) ->
 	    SrcFile = filename:rootname(Path) ++ ".erl",
-	    DestDir = get(test_server_dir),
-	    Name = atom_to_list(Mod),
-	    DestFile = filename:join(DestDir, downcase(Name) ++ ?src_listing_ext),
-	    html_possibly_convert(SrcFile, DestFile),
-	    html_convert_modules(Mods);
-	_Other -> ok
+	    FoundSrcFile =
+		case file:read_file_info(SrcFile) of
+		    {ok,SInfo} ->
+			{SrcFile,SInfo};
+		    {error,_} ->
+			ModInfo = Mod:module_info(compile),
+			case proplists:get_value(source, ModInfo) of
+			    undefined ->
+				undefined;
+			    OtherSrcFile ->
+				case file:read_file_info(OtherSrcFile) of
+				    {ok,SInfo} ->
+					{OtherSrcFile,SInfo};
+				    {error,_} ->
+					undefined
+				end
+			end
+		end,
+	    case FoundSrcFile of
+		undefined ->
+		    html_convert_modules(Mods);
+		{SrcFile1,SrcFileInfo} ->
+		    DestDir = get(test_server_dir),
+		    Name = atom_to_list(Mod),
+		    DestFile = filename:join(DestDir,
+					     downcase(Name)++?src_listing_ext),
+		    html_possibly_convert(SrcFile1, SrcFileInfo, DestFile),
+		    html_convert_modules(Mods)
+	    end;
+	_Other ->
+	    html_convert_modules(Mods)
     end;
 html_convert_modules([]) -> ok.
 
 %% Convert source code to HTML if possible and needed.
-
-html_possibly_convert(Src, Dest) ->
-    case file:read_file_info(Src) of
-	{ok,SInfo} ->
-	    case file:read_file_info(Dest) of
-		{error,_Reason} ->		% no dest file
-		    erl2html2:convert(Src, Dest);
-		{ok,DInfo} when DInfo#file_info.mtime < SInfo#file_info.mtime ->
-		    erl2html2:convert(Src, Dest);
-		{ok,_DInfo} -> ok		% dest file up to date
-	    end;
-	{error,_Reason} -> ok			% no source code found
+html_possibly_convert(Src, SrcInfo, Dest) ->
+    case file:read_file_info(Dest) of
+	{error,_Reason} ->			% no dest file
+	    erl2html2:convert(Src, Dest);
+	{ok,DestInfo} when DestInfo#file_info.mtime < SrcInfo#file_info.mtime ->
+	    erl2html2:convert(Src, Dest);
+	{ok,_DestInfo} ->
+	    ok					% dest file up to date
     end.
 
 %% Copy all HTML files in InDir to OutDir.
-
 copy_html_files(InDir, OutDir) ->
     Files = filelib:wildcard(filename:join(InDir, "*" ++ ?src_listing_ext)),
     lists:foreach(fun (Src) -> copy_html_file(Src, OutDir) end, Files).
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index 1a614d74d5..53dfb45e3a 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -83,13 +83,13 @@ timetrap(Timeout0, Scale, Pid) ->
 %% Handle = term()
 %%
 %% Cancels a time trap.
-
 timetrap_cancel(Handle) ->
     unlink(Handle),
     MonRef = erlang:monitor(process, Handle),
     exit(Handle, kill),
     receive {'DOWN',MonRef,_,_,_} -> ok after 2000 -> ok end.
 
+
 capture_get(Msgs) ->
     receive
 	{captured,Msg} ->
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl
index 2ddffccf5b..8332ccfb40 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/test_server/src/ts_install.erl
@@ -22,6 +22,7 @@
 -export([install/2, platform_id/1]).
 
 -include("ts.hrl").
+-include_lib("kernel/include/file.hrl").
 
 install(install_local, Options) ->
     install(os:type(), Options);
@@ -150,11 +151,17 @@ add_vars(Vars0, Opts0) ->
 	end,
     {PlatformId, PlatformLabel, PlatformFilename, Version} =
 	platform([{longnames, LongNames}|Vars0]),
+    NetDir = lists:concat(["/net", hostname()]),
+    Mounted = case file:read_file_info(NetDir) of
+		  {ok, #file_info{type = directory}} -> NetDir;
+		  _ -> ""
+	      end,
     {Opts, [{longnames, LongNames},
 	    {platform_id, PlatformId},
 	    {platform_filename, PlatformFilename},
 	    {rsh_name, get_rsh_name()},
 	    {platform_label, PlatformLabel},
+	    {ts_net_dir, Mounted},
 	    {erl_flags, []},
 	    {erl_release, Version},
 	    {ts_testcase_callback, get_testcase_callback()} | Vars0]}.
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl
index 067961a216..885a3c9b96 100644
--- a/lib/test_server/src/ts_run.erl
+++ b/lib/test_server/src/ts_run.erl
@@ -212,6 +212,12 @@ make_command(Vars, Spec, State) ->
 	false -> 
 	    ok
     end,
+
+    %% If Common Test specific variables are needed, add them here
+    %% on form: "{key1,value1}" "{key2,value2}" ...
+    NetDir = ts_lib:var(ts_net_dir, Vars),
+    TestVars = [ "\"{net_dir,\\\"",NetDir,"\\\"}\"" ],
+
     %% NOTE: Do not use ' in these commands as it wont work on windows
     Cmd = [Erl, Naming, "test_server"
 	   " -rsh ", ts_lib:var(rsh_name, Vars),
@@ -224,6 +230,7 @@ make_command(Vars, Spec, State) ->
 	   %%	   " -test_server_format_exception false",
 	   " -boot start_sasl -sasl errlog_type error",
 	   " -pz ",Cwd,
+	   " -ct_test_vars ",TestVars,
 	   " -eval \"file:set_cwd(\\\"",TestDir,"\\\")\" "
 	   " -eval \"ct:run_test(", 
 	   backslashify(lists:flatten(State#state.test_server_args)),")\""
@@ -358,6 +365,14 @@ make_common_test_args(Args0, Options, _Vars) ->
 		      [{logdir,"../test_server"}]
 	     end,
 
+    TimeTrap = case test_server:timetrap_scale_factor() of
+		   1 ->
+		       [];
+		   Scale ->
+		       [{multiply_timetraps, Scale},
+			{scale_timetraps, true}]
+	       end,
+
     ConfigPath = case {os:getenv("TEST_CONFIG_PATH"),
 		       lists:keysearch(config, 1, Options)} of
 		     {false,{value, {config, Path}}} ->
@@ -369,9 +384,8 @@ make_common_test_args(Args0, Options, _Vars) ->
 		 end,
     ConfigFiles = [{config,[filename:join(ConfigPath,File)
 			    || File <- get_config_files()]}],
-
     io_lib:format("~100000p",[Args0++Trace++Cover++Logdir++
-				  ConfigFiles++Options]).
+				  ConfigFiles++Options++TimeTrap]).
 
 to_list(X) when is_atom(X) ->
     atom_to_list(X);
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 118800e44a..93bb6b71c9 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index e1c0d31371..6728bef2a4 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -386,7 +386,8 @@ then no prototype is inserted.
 The test is performed by the function `erlang-test-criteria-list'.")
 
 (defvar erlang-electric-arrow-criteria
-  '(erlang-next-lines-empty-p
+  '(erlang-stop-when-in-type-spec
+    erlang-next-lines-empty-p
     erlang-at-end-of-function-p)
   "*List of functions controlling the arrow aspect of `erlang-electric-gt'.
 The functions in this list are called, in order, whenever a `>'
@@ -4045,6 +4046,16 @@ This function is designed to be a member of a criteria list."
       nil)))
 
 
+(defun erlang-stop-when-in-type-spec ()
+  "Return `stop' when in a type spec line.
+
+This function is designed to be a member of a criteria list."
+  (save-excursion
+    (beginning-of-line)
+    (when (save-match-data (looking-at "-\\(spec\\|type\\)"))
+      'stop)))
+
+
 (defun erlang-next-lines-empty-p ()
   "Return non-nil if next lines are empty.
 
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 73a736f0e8..905ad895c9 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -662,6 +662,7 @@ main_process_loop(State) ->
 		    Imported = do_import_to_table(Fd,File,
 						  State#main_state.imported),
 		    reply(From, ok),
+		    file:close(Fd),
 		    main_process_loop(State#main_state{imported=Imported});
 		{error,Reason} ->
 		    reply(From, {error, {cant_open_file,File,Reason}}),
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index b5c8e8a1b7..fe7f92de78 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -395,6 +395,7 @@ export_import(suite) -> [];
 export_import(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
     ?line ok = file:set_cwd(DataDir),
+    ?line PortCount = length(erlang:ports()),
 
     %% Export one module
     ?line {ok,f} = cover:compile(f),
@@ -484,6 +485,9 @@ export_import(Config) when is_list(Config) ->
     ?line ?t:capture_stop(),
     ?line check_f_calls(1,0),
 
+    %% Check no raw files are left open
+    ?line PortCount = length(erlang:ports()),
+
     %% Cleanup
     ?line ok = cover:stop(),
     ?line Files = lsfiles(),
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 3d27cf671b..4282e19769 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2009</year><year>2010</year>
+      <year>2009</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/xmerl/doc/examples/Makefile b/lib/xmerl/doc/examples/Makefile
new file mode 100644
index 0000000000..2768ee1985
--- /dev/null
+++ b/lib/xmerl/doc/examples/Makefile
@@ -0,0 +1,61 @@
+ERLC = erlc
+EMULATOR = beam
+EBIN = .
+HTML = .
+XML = ./xml
+RM = rm -f
+
+# ----------------------------------------------------
+# Common Macros
+# ----------------------------------------------------
+include ../../vsn.mk
+VSN = $(XMERL_VSN)
+
+
+MODULES = \
+	xmerl_test \
+	test_html \
+	xserl_test \
+        mkdocs \
+        sdocbook2xhtml
+
+
+
+DOC_FILES = $(DOCS:%=$(HTML)/%.html) 
+
+ERL_COMPILE_FLAGS += $(DEBUG) -I ../../include +warn_unused_wars +debug_info
+
+SUB_DIRECTORIES =
+
+#all:   $(MODULES:%=$(EBIN)/%.$(EMULATOR)) xsm $(DOC_FILES)
+all opt:   $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(DOC_FILES)
+
+info:
+	@echo "DOC_FILES: $(DOC_FILES)"
+
+clean:
+#	@for d in $(SUB_DIRECTORIES); do \
+#	  	cd $$d; $(MAKE) clean; \
+#	done
+	$(RM) $(HTML)/*.html
+	$(RM) $(EBIN)/*.beam
+	$(RM) core *~
+
+debug:  xsmdebug $(DOC_FILES)
+
+xsm:
+	@for d in $(SUB_DIRECTORIES); do \
+	  	cd $$d; $(MAKE); \
+	done
+
+xsmdebug:
+	@for d in $(SUB_DIRECTORIES); do \
+	  	cd $$d; $(MAKE) DEBUG=-Ddebug=1; \
+	done
+
+$(HTML)/%.html:	$(XML)/%.xml
+	erl -noshell -pa ../../ebin -run mkdocs run $< $@ -s erlang halt
+
+$(EBIN)/%.beam:	%.erl
+	$(ERLC)  $(ERL_COMPILE_FLAGS) -o $(EBIN) $<
+
diff --git a/lib/xmerl/doc/examples/mkdocs.erl b/lib/xmerl/doc/examples/mkdocs.erl
new file mode 100644
index 0000000000..9faa12685b
--- /dev/null
+++ b/lib/xmerl/doc/examples/mkdocs.erl
@@ -0,0 +1,9 @@
+-module(mkdocs).
+-author('[email protected]').
+
+-export([run/1]).
+
+run([InFile, OutFile])->
+    {A,_}=xmerl_scan:file(InFile,[{fetch_fun, fun(DTDSpec,S) -> {ok,S} end}]),
+      B = sdocbook2xhtml:process_xml(A),
+      file:write_file(OutFile,[B]).
diff --git a/lib/xmerl/doc/examples/sdocbook2xhtml.erl b/lib/xmerl/doc/examples/sdocbook2xhtml.erl
new file mode 100644
index 0000000000..f96bf51963
--- /dev/null
+++ b/lib/xmerl/doc/examples/sdocbook2xhtml.erl
@@ -0,0 +1,823 @@
+%%%----------------------------------------------------------------------
+%%% File         : sdocbook2xhtml.erl
+%%% Description  : Erlang XSLT like "stylesheet" for exporting 
+%%%                Simplified Docbook XML to XHTML.
+%%% 
+%%% Modules used : lists, io_lib, xmerl, xmerl_lib, xmerl_xs
+%%% 
+%%%----------------------------------------------------------------------
+
+-module(sdocbook2xhtml).
+-author('[email protected]').
+
+
+-include("xmerl.hrl").
+-import(xmerl_lib, [markup/3,mapxml/2, foldxml/3, mapfoldxml/3]).
+-import(xmerl_xs, [ xslapply/2, value_of/1, select/2, built_in_rules/2]).
+
+-export([ process_xml/1 ]).
+
+-export([abbrev/4,
+	 abstract/4,
+	 acronym/4,
+	 address/4,
+	 anchor/4,
+	 appendix/4,
+	 appendixinfo/4,
+	 article/4,
+	 articleinfo/4,
+	 audiodata/4,
+	 audioobject/4,
+	 author/4,
+	 authorgroup/4,
+	 authorinitials/4,
+	 bibliography/4,
+	 bibliomixed/4,
+	 bibliomisc/4,
+	 bibliomset/4,
+	 biblioset/4,
+	 blockquote/4,
+	 caption/4,
+	 citetitle/4,
+	 city/4,
+	 colspec/4,
+	 command/4,
+	 computeroutput/4,
+	 copyright/4,
+	 corpauthor/4,
+	 country/4,
+	 date/4,
+	 edition/4,
+	 editor/4,
+	 email/4,
+	 emphasis/4,
+	 entry/4,
+	 example/4,
+	 fax/4,
+	 figure/4,
+	 filename/4,
+	 firstname/4,
+	 footnote/4,
+	 holder/4,
+	 honorific/4,
+	 imagedata/4,
+	 imageobject/4,
+	 informaltable/4,
+	 inlinemediaobject/4,
+	 isbn/4,
+	 issn/4,
+	 issuenum/4,
+	 legalnotice/4,
+	 lineage/4,
+	 link/4,
+	 literal/4,
+	 itemizedlist/4,
+	 listitem/4,
+	 mediaobject/4,
+	 member/4,
+	 note/4,
+	 orderedlist/4,
+	 othercredit/4,
+	 othername/4,
+	 para/4,
+	 phone/4,
+	 phrase/4,
+	 programlisting/4,
+	 publishername/4,
+	 quote/4,
+	 replaceable/4,
+	 revhistory/4,
+	 revision/4,
+	 revnumber/4,
+	 revremark/4,
+	 row/4,
+	 section/4,
+	 sectioninfo/4,
+	 simplelist/4,
+	 subtitle/4,
+	 surname/4,
+	 systemitem/4,
+	 table/4,
+	 tbody/4,
+	 term/4,
+	 tfoot/4,
+	 tgroup/4,
+	 thead/4,
+	 title/4,
+	 titleabbrev/4,
+	 trademark/4,
+	 ulink/4,
+	 userinput/4,
+	 variablelist/4,
+	 varlistentry/4,
+	 xref/4,
+	 year/4
+	 ]).
+
+
+xmlhead() -> "<\?xml version=\"1.0\" encoding=\"iso-8859-1\"\?>".
+doctype() ->"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\
+ \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd \">\n".
+
+style() ->
+    "<style type=\"text/css\"> body {margin-left:10%; margin-right:5%;} \
+.logo{float:right;} 
+.toc UL {
+    list-style-type:     none;
+    border:              solid;
+    border-width:        thin;
+    padding-left:        10px;
+    padding-right:       10px;
+    padding-top:         5px;
+    padding-bottom:      5px;
+    background:          #f0f0f0;
+    letter-spacing:      2px;
+    line-height:         20px;
+}
+</style>".
+
+process_xml(E)->
+%%    lists:flatten(template( E )).
+    template( E ).
+
+%% article is the root element
+template(E0 = #xmlElement{name=article})->
+
+    E = changetitle(E0), %% Add section numbering to titles
+
+    [ xmlhead(), doctype(),
+      "<html xmlns=\"http://www.w3.org/1999/xhtml\" >"
+      "<head>"
+      "<title>",
+      value_of(select("articleinfo/title",E)),
+      "</title>",
+      style(),
+      "</head>"
+     "<body>",
+%%  "<img src=\"/logo.png\" alt=\"no logo\" class=\"logo\" </img>",
+     xslapply( fun template/1, select("articleinfo",E)),
+     process_toc(E), %% Insert toc between info and main part of article
+     xslapply( fun template/1, select("section",E)),
+     xslapply( fun template/1, select("appendix",E)),
+     "</body></html>"];
+
+template(E = #xmlElement{name=Name})->
+    A = xslapply( fun template/1, E),
+    case catch
+	sdocbook2xhtml:Name(A, E#xmlElement.attributes, E#xmlElement.parents,E)
+	of
+	{'EXIT', {undef, _}} ->
+	    A;
+	{'EXIT', Reason} ->
+	    exit(Reason);
+	Res ->
+	    Res
+    end;
+
+template(E) ->
+    built_in_rules( fun template/1, E).
+
+%% -------------------------------------------------------------------
+%% simple serialize tags
+
+abbrev(Data, Attrs, [{bibliomset,_}|_], E)->
+    ["<dt><abbr>", Data, "</abbr></dt><dd>"];
+abbrev(Data, Attrs, Parents, E)->
+    markup("abbr",Attrs, Data).
+
+
+abstract(Data, Attrs, Parents, E)->
+    ["<h3>Abstract</h3><blockquote>", Data, "</blockquote>"].
+
+acronym(Data, Attrs, Parents, E)->
+    markup("acronym",Attrs, Data).
+
+address(Data, Attrs, Parents, E)->
+    markup("address", Attrs, Data).
+				     
+anchor(Data, Attrs, Parents, E)->
+    case find_attribute(id, Attrs) of
+	{value,ID} -> 
+	    ["<a name=\"" ++ ID ++ "\">", Data, "</a>"];
+	false ->
+	    Data
+    end.
+
+appendix(Data, Attrs, Parents, E)->
+    ["<h1>Appendix</h1>", Data].
+
+appendixinfo(Data,_,_,_)->
+    Data.
+
+article(Data, Attrs, Parents, E)->
+    ["<body>"
+     "<img src=\"/logga2.jpg\" alt=\"no logo\" class=\"logo\" 
+width=\"50\"</img>",
+     Data, 
+     "</body>"].
+
+articleinfo(Data,_,_,_)->
+    Data.
+
+audiodata(Data, Attrs, Parents, E)->Data.
+
+audioobject(_,_,_,_)->
+    [].
+
+author(Data, Attrs, [{authorgroup,_} | _], E)->
+    markup("dd", Attrs, Data);
+author(Data, Attrs, Parents, E)->
+    Data.
+
+authorgroup(Data,_,_,_)-> 
+    ["<dl><dt>Author</dt>",Data,"</dl>"].
+
+authorinitials(Data,_,_,_)-> Data.
+
+bibliography(Data, Attrs, Parents, E)->
+    ["<h3>Bibliography</h3>" ,Data].
+
+bibliomisc(Data,_,_,_)-> Data.
+bibliomixed(Data,_,_,_)-> ["<dl>",Data, "</dl>"].
+bibliomset(Data,_,_,_)-> [Data, "</dd>"].
+
+biblioset(Data,_,_,_)-> Data.
+
+blockquote(Data, Attrs, Parents, E)->
+    markup("blockquote",Attrs, Data).
+
+caption(Data, Attrs, Parents, E)-> Data.
+
+citetitle(Data,_,_,_)-> ["<i>",Data,"</i>"].
+
+city(Data,_,_,_)->
+	    Data.
+
+%% Fix Me is it "col" element in html?
+colspec(_, Attrs,_,_)->
+    [].
+
+command(Data,_,_,_)->
+    ["<b><tt>", Data, "</tt></b>"].
+
+computeroutput(Data,_,_,_)->
+    ["<tt>", Data, "</tt>"].
+
+copyright(Data,_,_,_)->
+    [ "&copy; ", Data].
+
+corpauthor(Data,_,_,_)->
+    Data.
+
+country(Data,_,_,_)->
+    Data.
+
+date(Data,_,[{revision,_}|_],_)->
+    ["<td>", Data, "</td>"];
+date(Data,_,_,_)->
+    Data.
+
+edition(Data,_,_,_)->
+    Data.
+
+editor(Data,_,_,_)->
+    Data.
+
+email(Data,_,_,_)->
+    ["<i><a href=\"mailto:", Data,"\">",Data,"</a></i>"].
+
+emphasis(Data, Attrs, Parents, E)->
+    ["<em>", Data, "</em>"].
+
+%% Cell in a table
+entry(Data, Attrs, [{row,_}, {thead,_} | _], E)->
+    ["<th>", Data, "</th>"];
+entry(Data, Attrs, Parents, E)->
+    ["<td>", Data, "</td>"].
+
+example(Data, Attrs, Parents, E)->
+    ["<hr />", Data, "<hr />"].
+
+fax(Data, Attrs, Parents, E)->
+    ["<address>", Data, "</address>"].
+
+%% May contain ulink to image, resolved by ulink type
+figure(Data, _, _, _)->
+    Data.
+
+filename(Data, _, _, _)->
+    ["<i>", Data, "</i>"].
+
+firstname(Data, _, _, _)->
+    [Data , " " ].
+
+footnote(Data, _, _, _)->
+    Data.
+
+holder(Data, _, _, _)->
+    [" ",Data].
+
+honorific(Data, _, _, _)->
+    Data.
+
+imagedata(Data, Attrs, Parents, E)->
+    SRC =
+	case find_attribute(fileref, Attrs) of
+	    {value,AS} -> 
+		" src=" ++  AS ++ " ";
+	    false ->
+		[]
+	end,
+    ALT = 
+	case SRC of
+	    [] ->
+		" alt=\"No image!\" ";
+	    _ ->" alt=\"" ++ SRC ++ "\" "
+	end,
+    WIDTH = 
+	case find_attribute(width, Attrs) of
+	    false ->
+		 [];
+	    {value,A} ->" width=" ++ A ++ " "
+	end,
+
+    ["<img " ++ SRC ++ ALT ++ WIDTH ++ "></img>"].
+
+
+imageobject(Data, Attrs, Parents, E)->
+    Data.
+
+informaltable(Data, Attrs, Parents, E)->
+    ["<table border=\"1\" >", Data, "</table>"].
+
+
+inlinemediaobject(Data, Attrs, Parents, E)->
+    Data.
+
+isbn(Data, Attrs, Parents, E)->
+    Data.
+
+issn(Data, Attrs, Parents, E)->
+    Data.
+
+issuenum(Data, Attrs, Parents, E)->
+    Data.
+
+itemizedlist(Data, Attrs, Parents, _)->
+    markup("ul", Attrs, Data).
+
+%keyword
+%{
+%  display: inline;
+%}
+
+%keywordset
+%{
+%  display: inline;
+%}
+
+legalnotice(Data, Attrs, Parents, _)->
+    markup("small", Attrs, Data).
+
+lineage(Data, Attrs, Parents, _)->
+    Data.
+
+%lineannotation
+%{
+%  display: inline;
+%}
+
+% Hypertext link
+link(Data, Attrs, Parents, _)->
+    case find_attribute(linkend, Attrs) of
+	{value,LINK} -> 
+	    ["<a href=\"#" ++ LINK ++ "\">", Data, "</a>"];
+	false ->
+	    Data
+    end.
+    
+listitem(Data, Attrs, [{varlistentry,_} | _], E) ->
+    markup("dd", Attrs, Data);
+listitem(Data, Attrs, Parents, _)->
+    markup("li", Attrs, Data).
+
+literal(Data, Attrs, Parents, _)->
+    markup("tt", Attrs, Data).
+
+%literallayout
+%{
+%  display: inline;
+%}
+
+mediaobject(Data, Attrs, Parents, _)->
+    Data.
+
+%% simplelist member
+member(Data, Attrs, Parents, _)->
+    [Data,"<br></br>"].
+
+note(Data, Attrs, Parents, _)->
+["<table border=\"1\" cellspacing=\"0\" cellpadding=\"5\" width=\"80%\"
+bgcolor=\"#CCCCCC\"><tr><td>NOTE</td><td><i>", Data, "</i></td></tr></table>"].
+    
+%objectinfo
+%{
+%  display: inline;
+%}
+
+%option
+%{
+%  display: inline;
+%}
+
+orderedlist(Data, Attrs, Parents, _)->
+    markup("ol",Attrs,Data).
+ 
+%% Hmm otheraddr not in DTD   
+%otheraddr
+%{
+%  display: inline;
+%}
+
+othercredit(Data, Attrs, Parents, _)->Data.
+
+othername(Data, Attrs, Parents, E)->Data.
+
+%% IGNORE
+%pagenums
+%{
+%  display: inline;
+%}
+
+para(Data, Attrs, [{listitem,_}|_], E)->
+    Data;
+para(Data, Attrs, [{note,_}|_], E)->
+    Data;
+para(Data, Attrs, Parents, E)->
+    markup("p", Attrs, Data).
+
+phone(Data, Attrs, Parents, E)->Data.
+
+phrase(Data, Attrs, Parents, E)->Data.
+
+%pob
+%{
+%  display: inline;
+%}
+
+%postcode
+%{
+%  display: inline;
+%}
+
+%printhistory
+%{
+%  display: inline;
+%}
+
+%procedure
+%{
+%  display: inline;
+%}
+
+programlisting(Data, Attrs, Parents, E)->
+["<table border=\"1\" cellspacing=\"0\" cellpadding=\"5\" width=\"100%\"
+bgcolor=\"#CCCCCC\"><tr><td><pre><code>", Data, 
+"</code></pre></td></tr></table>"].
+
+%pubdate
+%{
+%  display: inline;
+%}
+
+%publisher
+%{
+%  display: inline;
+%}
+
+publishername(Data, Attrs, Parents, E)->
+    Data.
+
+quote(Data, Attrs, Parents, _)->
+    markup("q", Attrs, Data).
+
+replaceable(Data, Attrs, Parents,_)->
+    markup("i", Attrs, Data).
+
+revhistory(Data, Attrs, Parents,E)->
+      {A,B,C} = case E#xmlElement.language of
+	      "en" -> {"Revision history","Date","Comment"};
+	      "sv" -> {"Revisionshistoria","Datum","Kommentar"};
+	      _ ->{"lang is undefined","lang is undefined","lang is undefined"}
+	  end,
+
+    ["<h4>",A,"</h4>","<table><thead>"
+    "<tr><th>Rev.</th><th>",B,"</th><th>",C,"</th></tr></thead>", Data,
+    "</table>"].
+
+revision(Data, Attrs, Parents,_)->
+    markup("tr", Attrs, Data).
+
+revnumber(Data, Attrs, Parents,_)->
+    markup("td", Attrs, Data).
+
+revremark(Data, Attrs, Parents,_)->
+    markup("td", Attrs, Data).
+
+row(Data, Attrs, Parents, E)->
+    markup("tr", Attrs, Data).
+
+section(Data, Attrs, Parents, E)->
+    Data.
+
+sectioninfo(Data, Attrs, Parents, E)->Data.
+
+%sidebar
+%{
+%  display: block;
+%}
+
+simplelist(Data, Attrs, Parents, E)->
+    ["<table border=\"1\" cellspacing=\"0\" cellpadding=\"5\" 
+width=\"100%\"><tr><td>", Data, "</td></tr></table>"].
+
+
+%state
+%{
+%  display: inline;
+%}
+
+%step
+%{
+%  display: inline;
+%}
+
+%street
+%{
+%  display: inline;
+%}
+
+%substeps
+%{
+%  display: inline;
+%}
+
+subtitle(Data, Attrs, Parents, E)->
+    ["<h3>", Data, "</h3>"].
+
+surname(Data, Attrs, Parents, E)->Data.
+
+systemitem(Data, Attrs, Parents, E)->
+    markup("b", Attrs, Data).
+
+table(Data, Attrs, Parents, E)->
+    ["<table border=\"1\" cellspacing=\"0\" cellpadding=\"4\" >", 
+     Data, "</table>"].
+
+%% Fix me alot
+tbody(Data, Attrs, Parents, E)->
+    markup("tbody", Attrs, Data).
+%{
+%  display: table-row-group;
+%}
+
+term(Data, Attrs, [{varlistentry,_} | _], E) ->
+    markup("dt", Attrs, Data).
+
+
+%textobject
+%{
+%  display: inline;
+%}
+
+tfoot(Data, Attrs, Parents, E)->
+    markup("tfoot",Attrs, Data).
+
+%% Fixme alot
+tgroup(Data, Attrs, Parents, E)->
+    markup("colgroup", Attrs, Data).
+%{
+%  display: table;
+%}
+
+thead(Data, Attrs, Parents, E)->
+    markup("thead",Attrs, Data).
+%{
+%  display: table-row-group;
+%}
+
+title(Data, Attrs, Parents, E)->
+%%    io:fwrite("Parents ~p~n", [Parents]),
+    title1(Data, Attrs, Parents, E).
+
+title1(Data, Attrs, [{section,_}, {section,_}, {section,_}, 
+		    {section,_}, {section,_}, {appendix,_} | _], E) ->
+    ["<h6>", Data, "</h6>"];
+title1(Data, Attrs, [{section,_}, {section,_}, {section,_}, 
+		    {section,_}, {appendix,_} | _], E) ->
+    ["<h5>", Data, "</h5>"];
+title1(Data, Attrs, [{section,_}, {section,_}, {section,_}, 
+		    {apendix,_} | _], E) ->
+    ["<h4>", Data, "</h4>"];
+title1(Data, Attrs, [{section,_}, {section,_}, {appendix,_} | _], E) ->
+    ["<h3>", Data, "</h3>"];
+title1(Data, Attrs, [{section,_}, {appendix,_} | _], E) ->
+    ["<h2>", Data,  "</h2>"];
+title1(Data, Attrs, [{appendix,_} | _], E) ->
+    ["<h1>", Data, "</h1>"];
+
+title1(Data, Attrs, [{section,_}, {section,_}, {section,_}, 
+		    {section,_}, {section,_}, {section,_} | _], E) ->
+    ["<h6>", Data, "</h6>"];
+title1(Data, Attrs, [{section,_}, {section,_}, {section,_}, 
+		    {section,_}, {section,_} | _], E) ->
+    ["<h6>", Data, "</h6>"];
+title1(Data, Attrs, [{section,_}, {section,_}, {section,_}, 
+		    {section,_} | _], E) ->
+    ["<h5>", Data, "</h5>"];
+title1(Data, Attrs, [{section,C}, {section,B}, {section,A} | _], E) ->
+    {value, Id} = find_attribute(id,Attrs),
+    ["<h4 id=\"", Id, "\">", Data, "</h4>"];
+title1(Data, Attrs, [{section,B}, {section,A} | _], E) ->
+    {value, Id} = find_attribute(id,Attrs),
+    ["<h3 id=\"", Id, "\">", Data,  "</h3>"];
+title1(Data, Attrs, [{section,A} | _], E) ->
+    {value, Id} = find_attribute(id,Attrs),
+    ["<h2 id=\"", Id, "\">", Data, "</h2>"];
+title1(Data, Attrs, [{articleinfo,_} | _], E) ->
+    ["<h1>", Data, "</h1>"];
+title1(Data, Attrs, [{table,_} | _], E) ->
+    ["<caption>", Data, "</caption>"];
+title1(Data, Attrs, [{bibliomset,_} | _], E) ->
+    ["<i><b>", Data, "</b></i>"];
+title1(Data, Attrs, Parents, E)->
+    ["<h4>", Data, "</h4>"].
+
+titleabbrev(Data, Attrs, Parents, E)->[].
+
+trademark(Data, Attrs, Parents, E)->
+    [ Data, " &reg; "].
+
+ulink(Data, Attrs, Parents, E)->
+    case find_attribute(url, Attrs) of
+	{value,LINK} -> 
+	    ["<a href="++ LINK ++ ">", Data, "</a>"];
+	false ->
+	    Data
+    end.
+
+
+%% User input is Constant Bold
+userinput(Data, Attrs, Parents, E)->
+    ["<tt><b>", Data, "</b></tt>"].
+
+variablelist(Data, Attrs, Parents, E)->
+    markup("dl", Attrs, Data).
+
+varlistentry(Data, Attrs, Parents, E)->Data.
+
+%videodata
+%{
+%  display: inline;
+%}
+
+%videoobject
+%{
+%  display: inline;
+%}
+
+%volumenum
+%{
+%  display: inline;
+%}
+
+xref(Data, Attrs, Parents, E)->
+    case find_attribute(linkend, Attrs) of
+	{value,LINK} -> 
+	    ["<a href=\"#" ++ LINK ++ "\" />"];
+	false ->
+	    Data
+    end.
+
+year(Data, Attrs, Parents, E)->Data.
+
+%% ----------------------------------------------------------
+%% Utils find_attribute copied from Ulf Wigers xmerl distribution
+
+find_attribute(Name, Attrs) ->
+    case lists:keysearch(Name, #xmlAttribute.name, Attrs) of
+	{value, #xmlAttribute{value = V}} ->
+	    {value, V};
+	false ->
+	    false
+    end.
+%% ------------
+
+changetitle(A) ->
+    Afun = fun changecount/2,
+    {E, Acc} = mapfoldxml(Afun, {0,0,0,0,0,0}, A),
+    E.
+
+changecount(#xmlElement{name=title}=E, {A,B,C,Ex,Fig,Tab})->
+    case E#xmlElement.parents of
+	[{example,_} |_] -> 
+	    {addexhead(E,{A,Ex+1}), {A,B,C,Ex+1,Fig,Tab} };
+	[{figure,_} |_] -> 
+	    {addfighead(E,{A,Fig+1}), {A,B,C,Ex,Fig+1,Tab} };
+	[{table,_} |_] -> 
+	    {addtablehead(E,{A,Tab+1}), {A,B,C,Ex,Fig,Tab+1} };
+	[{section,_},{section,_},{section,_},{article,_} |_] -> 
+	    {addheader(E,{A,B,C+1}), {A,B,C+1,Ex,Fig,Tab} }; 
+	[{section,_},{section,_},{article,_} |_] -> 
+	    { addheader(E,{A,B+1,0}), {A,B+1,0,Ex,Fig,Tab} }; 
+	[{section,_},{article,_} |_] -> 
+	    {addheader(E,{A+1,0,0}),{A+1,0,0,0,0,0}}; 
+	_ -> 
+	    {E,{A,B,C,Ex,Fig,Tab}}
+    end;
+changecount(E, Acc)->{E,Acc}.
+
+addexhead(#xmlElement{name=title,content=[#xmlText{}=T1|_]}= E, {Ch,No})->
+    NewHeader = "Example " ++ 
+	integer_to_list(Ch)++" - "++ integer_to_list(No) ++ 
+	" " ++ T1#xmlText.value,
+    E#xmlElement{content=[T1#xmlText{value=NewHeader}]}.
+addfighead(#xmlElement{name=title,content=[#xmlText{}=T1|_]}= E, {Ch,No})->
+    NewHeader = "Figure " ++ 
+	integer_to_list(Ch)++" - "++ integer_to_list(No) ++ 
+	" " ++ T1#xmlText.value,
+    E#xmlElement{content=[T1#xmlText{value=NewHeader}]}.
+addtablehead(#xmlElement{name=title,content=[#xmlText{}=T1|_]}= E, {Ch,No})->
+    NewHeader = "Table " ++ 
+	integer_to_list(Ch)++" - "++ integer_to_list(No) ++ 
+	" " ++ T1#xmlText.value,
+    E#xmlElement{content=[T1#xmlText{value=NewHeader}]}.
+
+addheader(#xmlElement{name=title,content=[#xmlText{}=T1|_]}= E, Chapters)->
+    NewHeader = chapterstring(Chapters)++ " " ++ T1#xmlText.value,
+    NewAtts = addid(E#xmlElement.attributes, Chapters),
+    E#xmlElement{content=[T1#xmlText{value=NewHeader}],
+		 attributes = NewAtts}.
+
+chapterstring({A,0,0})->integer_to_list(A);
+chapterstring({A,B,0})->integer_to_list(A)++"."++ integer_to_list(B);
+chapterstring({A,B,C})->integer_to_list(A) ++ "." ++
+			    integer_to_list(B) ++ "." ++
+			    integer_to_list(C).
+
+%% addid add id attribute if it not already exists
+addid(OldAtts, Chapters)->
+    case find_attribute(id, OldAtts) of
+	{value,_} ->
+	    OldAtts;
+	false ->
+	    add_attribute(id,"sect_"++ chapterstring(Chapters),
+			  OldAtts)
+    end.
+
+add_attribute(Name, Value, OldAtts)->
+    [#xmlAttribute{ name=Name, value = Value}| OldAtts ].
+
+
+process_toc(E)->
+    AFun = fun chapindex/2,
+    TOCR = foldxml(AFun, [], E),
+%    Str = case find_attribute(lang, E#xmlElement.attributes) of
+%	      {value,"en"} -> "Table of Contents";
+%	      {value,"sv"} -> "Inneh�llsf�rtecking";
+%	      _ ->"lang is undefined"
+%	  end,
+    Str = case E#xmlElement.language of
+	      "en" -> "Table of Contents";
+	      "sv" -> "Inneh�llsf�rtecking";
+	      _ ->"lang is undefined"
+	  end,
+    TOC = ["<div class=\"toc\"><h3>",Str,"</h3><ul>", 
+lists:reverse(TOCR), "</ul></div>"].
+
+chapindex(#xmlElement{name=title}=E, Accu)->
+    case E#xmlElement.parents of
+	[{section,_},{section,_},{section,_},{article,_} |_] -> 
+	    ["<li>"++spind(3)++ addlink(E,"toc_level_3") ++"</li>"| Accu]; 
+	[{section,_},{section,_},{article,_} |_] -> 
+	    ["<li>"++spind(2)++ addlink(E,"toc_level_2") ++ "</li>"| Accu]; 
+	[{section,_},{article,_} |_] -> 
+	    ["<li>"++spind(1)++ addlink(E,"toc_level_1") ++"</li>"| Accu]; 
+	_ -> 
+	    Accu
+    end;
+chapindex(E, Accu) ->
+    Accu.
+
+spind(0) ->"";
+spind(X)->
+    "&#160;&#160;" ++ spind(X-1).
+
+addlink(E, TocLevel)->
+    {value,LINK} = find_attribute(id,E#xmlElement.attributes),
+    [#xmlText{value=Title}|_] = E#xmlElement.content, %% Pfuii
+    "<a href=\"#" ++ LINK ++ 
+	"\" class=\"" ++ TocLevel ++ "\">" ++ 
+    Title ++ "</a>".
+
+
diff --git a/lib/xmerl/doc/examples/test_html.erl b/lib/xmerl/doc/examples/test_html.erl
new file mode 100755
index 0000000000..3ca15f30f8
--- /dev/null
+++ b/lib/xmerl/doc/examples/test_html.erl
@@ -0,0 +1,225 @@
+%%% The contents of this file are subject to the Erlang Public License,
+%%% Version 1.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.erlang.org/license/EPL1_0.txt
+%%%
+%%% 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.
+%%%
+%%% The Original Code is xmerl-0.7
+%%%
+%%% The Initial Developer of the Original Code is Ericsson Telecom
+%%% AB. Portions created by Ericsson are Copyright (C), 1998, Ericsson
+%%% Telecom AB. All Rights Reserved.
+%%%
+%%% Contributor(s): ______________________________________.
+%%%
+%%%----------------------------------------------------------------------
+%%% #0.    BASIC INFORMATION
+%%%----------------------------------------------------------------------
+%%% File:        test_html.erl
+%%% Author       : Ulf Wiger <[email protected]>
+
+%%% Description  : Callback module for exporting XML to HTML with support
+%%%                for special Erlang-related tags. (Experimental)
+%%% 
+%%% Modules used : lists, io_lib
+%%% 
+%%%----------------------------------------------------------------------
+
+-module(test_html).
+-author('[email protected]').
+
+
+-export(['#xml-inheritance#'/0]).
+
+%%% special Erlang forms
+-export(['EXIT'/4,
+	 'tuple_list'/4]).
+
+-export(['#root#'/4,
+	 title/4,
+	 heading/4,
+	 section/4,
+	 table/4,
+	 row/4,
+	 col/4,
+	 data/4,
+	 p/4, para/4, 'P'/4,
+	 emphasis/4]).
+
+-include("xmerl.hrl").
+
+
+'#xml-inheritance#'() -> [xmerl_xml].
+
+
+
+%% The '#root#' tag is called when the entire structure has been exported.
+%% It does not appear in the structure itself.
+'#root#'(Data, Attrs, [], E) ->
+    Title = 
+	case find_attribute(title, Attrs) of
+	    {value, T} ->
+		["<title>", T, "</title>"];
+	    false ->
+		[]
+	end,
+    ["<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n"
+     "<html>\n",
+     "<head>\n", Title, "</head>\n"
+     "<body>\n", Data, "</body>\n"].
+
+
+
+
+%%% Special token: EXIT
+'EXIT'(Reason, Attrs = [], Parents = [], E) ->
+    %% This happens e.g. if a request function crashes completely.
+    ["<pre>\n", mk_string({'EXIT', Reason}), "</pre>"].
+
+
+title(Str, Attrs, Parents, E) ->
+    ["<h1>", Str, "</h1>\n"].
+
+
+%%% section/3 is to be used instead of headings.
+section(Data, Attrs, [{section,_}, {section,_}, {section,_} | _], E) ->
+    opt_heading(Attrs, "<h4>", "</h4>", Data);
+section(Data, Attrs, [{section,_}, {section,_} | _], E) ->
+    opt_heading(Attrs, "<h3>", "</h3>", Data);
+section(Data, Attrs, [{section,_} | _], E) ->
+    opt_heading(Attrs, "<h2>", "</h2>", Data);
+section(Data, Attrs, Parents, E) ->
+    opt_heading(Attrs, "<h1>", "</h1>", Data).
+
+opt_heading(Attrs, StartTag, EndTag, Data) ->
+    case find_attribute(heading, Attrs) of
+	{value, Text} ->
+	    [StartTag, Text, EndTag, "\n" | Data];
+	false ->
+	    Data
+    end.
+
+
+%% tables
+%% e.g. {table, [{heading, [{col, H1}, {col, H2}]},
+%%		 {row, [{col, C11}, {col, C12}]},
+%%		 {row, [{col, C21}, {col, C22}]}]}.
+                             
+table(Data, Attrs, Parents, E) ->
+    Border = case find_attribute(border, Attrs) of
+		 false ->
+		     " border=1";
+		 {value, N} ->
+		     [" border=", mk_string(N)]
+	     end,
+    ["<table", Border, ">\n", Data, "\n</table>\n"].
+
+row(Data, Attrs, [{table,_}|_], E) ->
+    ["<tr>", Data, "</tr>\n"].
+
+heading(Data, Attrs, [{table,_}|_], E) ->
+    ["<tr>", Data, "</tr>\n"].
+
+
+%% Context-sensitive columns (heading- or row columns)
+col(Data, Attrs, [{heading,_}, {table,_} | _], E) ->
+    ["<th>", nbsp_if_empty(Data), "</th>\n"];
+col(Data, Attrs, [{row,_}, {table,_} | _], E) ->
+    ["<td>", nbsp_if_empty(Data), "</td>\n"].
+
+
+tuple_list(List, Attrs, Parents, E) ->
+    Elems = case find_attribute(elements, Attrs) of
+		{value, Es} -> 
+		    Es;
+		false ->
+		    case List of
+			[H|_] ->
+			    lists:seq(1,size(H));
+			[] ->
+			    []
+		    end
+	    end,
+    TableData = [{row, [{col, {element(P, Rec)}} || P <- Elems]} ||
+		    Rec <- List],
+    Table = case find_attribute(heading, Attrs) of
+		{value, Cols} ->
+		    Head = {heading, [{col, C} || C <- Cols]},
+		    {table, [Head | TableData]};
+		false ->
+		    {table, TableData}
+	    end,
+    {'#xml-redefine#', Table}.
+
+
+data(Data, Pos, Attrs, Parents) ->
+    mk_string(Data).
+
+
+
+p(Data, Pos, Attrs, Parents) ->
+    {'#xml-alias#', 'P'}.
+
+para(Data, Pos, Attrs, Parents) ->
+    {'#xml-alias#', 'P'}.
+
+'P'(Data, Pos, Attrs, Parents) ->
+    ["<p>", mk_string(Data), "</p>\n"].
+
+
+emphasis(Str, Pos, Attrs, Parents) ->
+    ["<strong>", Str, "</strong>"].
+
+
+nbsp_if_empty(Data) when binary(Data), size(Data) == 0 ->
+    "&nbsp;";
+nbsp_if_empty(Data) when list(Data) ->
+    case catch list_to_binary(Data) of
+	{'EXIT', _} ->
+	    nbsp_if_empty_term(Data);
+	B when size(B) == 0 ->
+	    "&nbsp;";
+	_ ->
+	    Data
+    end;
+nbsp_if_empty(Data) ->
+    nbsp_if_empty_term(Data).
+
+nbsp_if_empty_term(Data) ->
+    Str = io_lib:format("~p", [Data]),
+    case list_to_binary(Str) of
+	B when size(B) == 0 ->
+	    "&nbsp;";
+	_ ->
+	    Str
+    end.
+
+
+mk_string(I) when integer(I) ->
+    integer_to_list(I);
+mk_string(A) when atom(A) ->
+    atom_to_list(A);
+mk_string(L) when list(L) ->
+    %% again, we can't regognize a string without "parsing" it
+    case catch list_to_binary(L) of
+	{'EXIT',_} ->
+	    io_lib:format("~p", [L]);
+	_ ->
+	    L
+    end;
+mk_string(Term) ->
+    io_lib:format("~p", [Term]).
+
+
+
+find_attribute(Name, Attrs) ->
+    case lists:keysearch(Name, #xmlAttribute.name, Attrs) of
+	{value, #xmlAttribute{value = V}} ->
+	    {value, V};
+	false ->
+	    false
+    end.
diff --git a/lib/xmerl/doc/examples/xmerl_test.erl b/lib/xmerl/doc/examples/xmerl_test.erl
new file mode 100644
index 0000000000..b4288431f2
--- /dev/null
+++ b/lib/xmerl/doc/examples/xmerl_test.erl
@@ -0,0 +1,522 @@
+-module(xmerl_test).
+
+-compile(export_all).
+%%-export([Function/Arity, ...]).
+
+-define(XMERL_APP,).
+
+-include("xmerl.hrl").
+
+%% Export to HTML from "simple" format
+test1() ->
+    xmerl:export_simple(simple(), xmerl_html, [{title, "Doc Title"}]).
+
+
+%% Export to XML from "simple" format
+test2() ->
+    xmerl:export_simple(simple(), xmerl_xml, [{title, "Doc Title"}]).
+
+
+%% Parse XHTML, and export result to HTML and text
+test3() ->
+    FetchFun = fun(_DTDSpec, S) -> {ok, not_fetched,S} end,
+    {A, _} = xmerl_scan:string(html(),
+			    [{fetch_fun,FetchFun}]),
+    io:format("From xmerl_scan:string/2~n ~p~n", [A]),
+    B = xmerl:export([A], xmerl_html),
+    io:format("From xmerl:export/2 xmerl_html filter~n ~p~n", [B]),
+    C = xmerl:export([A], xmerl_text),
+    io:format("From xmerl:export/2 xmerl_text filter~n ~p~n", [C]).
+    
+
+test4() ->
+    FetchFun = fun(_DTDSpec, S) -> {ok, not_fetched, S} end,
+    {A,_} = xmerl_scan:string(xml_namespace(),
+			    [{fetch_fun,FetchFun},
+			     {namespace_conformant,true}]),
+    io:format("From xmerl_scan:string/2~n ~p~n", [A]).
+
+test5() ->
+    {ok, Cwd} = file:get_cwd(), % Assume we are in the examples dir...
+    File = Cwd ++ "/xml/xmerl.xml",
+    FetchFun = fun(_DTDSpec, S) -> {ok, not_fetched, S} end,
+%    {Resp0,Rest0}=xmerl_eventp:stream(File,[]),
+%    io:format("Tree: ~p~n",[Resp0]),
+    {Resp1, _Rest1}=xmerl_eventp:file_sax(File, ?MODULE, undefined,
+					[{fetch_fun, FetchFun}]),
+    io:format("Using file_sax: counted ~p  paragraphs~n", [Resp1]),
+    {Resp2, _Rest2} = xmerl_eventp:stream_sax(File, ?MODULE, undefined, []),
+    io:format("Using stream_sax: counted ~p paragraphs~n", [Resp2]).
+
+test6() ->
+    FetchFun = fun(_DTDSpec, S) -> {ok, {string,""}, S} end,
+    {Doc, _} = xmerl_scan:string(xml_namespace(),
+				 [{fetch_fun, FetchFun},
+				  {namespace_conformant, true}]),
+    E = xmerl_xpath:string("child::title[position()=1]", Doc),
+    io:format("From xmerl_scan:string/2~n E=~p~n", [E]).
+
+
+simple() ->
+    [{document, 
+      [{title, ["Doc Title"]},
+       {author, ["Ulf Wiger"]},
+       {section,[{heading, ["heading1"]},
+		 {'P', ["This is a paragraph of text."]},
+		 {section,[{heading, ["heading2"]},
+			   {'P', ["This is another paragraph."]},
+			   {table,[{border, ["1"]}, 
+				   {heading,[{col, ["head1"]},
+					     {col, ["head2"]}]},
+				   {row, [{col, ["col11"]},
+					  {col, ["col12"]}]},
+				   {row, [{col, ["col21"]},
+					  {col, ["col22"]}]}
+				  ]}
+			  ]}
+		]}
+      ]}
+    ].
+
+
+html() ->
+    "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"DTD/xhtml1-strict.dtd\"><html>"
+	"<head><title>Doc Title</title><author>Ulf Wiger</author></head>"
+	"<h1>heading1</h1>"
+	"<p>This is a paragraph of text.</p>"
+	"<h2>heading2</h2>"
+	"<p>This is another paragraph.</p>"
+	"<table>"
+	"<thead><tr><td>head1</td><td>head2</td></tr></thead>"
+	"<tr><td>col11</td><td>col122</td></tr>"
+	"<tr><td>col21</td><td>col122</td></tr>"
+	"</table>"
+	"</html>".
+
+xml_namespace() ->
+    "<?xml version=\"1.0\"?>"
+	"<!-- initially, the default namespace is \"books\" -->"
+	"<book xmlns='urn:loc.gov:books' xmlns:isbn='urn:ISBN:0-395-36341-6'>"
+	"<title>Cheaper by the Dozen</title>"
+	"<isbn:number>1568491379</isbn:number>"
+	"<notes>"
+	"<!-- make HTML the default namespace for some comments -->"
+	"<p xmlns='urn:w3-org-ns:HTML'>"
+	"This is a <i>funny</i> book!"
+	"</p>"
+	"</notes>"
+	"</book>".
+
+
+%%% ============================================================================
+%%% Generic callbacks
+
+%'#text#'(Text) ->
+%    [].
+
+'#root#'(Data, Attrs, [], _E) ->
+    io:format("root... Data=~p Attrs=~p E=~p~n",[Data,Attrs,_E]),
+    [].
+
+'#element#'(Tag, Data, Attrs, _Parents, _E) ->
+    io:format("Tag=~p~n Data=~p~n Attrs=~p~n Parents=~p~n E=~p~n",
+	      [Tag, Data, Attrs, _Parents, _E]),
+    [].
+
+'#element#'(_Tag, _Data, _Attrs, CBstate) ->
+%    io:format("Tag=~p~n Data=~p~n Attrs=~p~n CBstate=~p~n",
+%	      [Tag, Data, Attrs, CBstate]),
+    CBstate.
+
+'#text#'(Text, CBstate) ->
+    io:format("Text=~p~n CBstate=~p~n",
+	      [Text, CBstate]),
+    CBstate.
+
+
+'#xml-inheritance#'() ->
+    [xmerl_html].
+
+
+
+
+%%% ============================================================================
+%%% To run these tests you must first download the testsuite from www.w3c.org
+%%% xmlconf.xml is the main test file that contains references to all the tests.
+%%% Thus parse this, export result and execute tests in the call-back functions.
+%%% Note:
+%%% - xmerl assumes all characters are represented with a single integer.
+w3cvalidate() ->
+    Tests = filename:join(filename:dirname(filename:absname(code:which(xmerl))),
+			  "../w3c/xmlconf/xmlconf.xml"),
+    TestDir = filename:dirname(Tests),
+    io:format("Looking for W3C tests at ~p~n", [Tests]),
+    {ok, Bin} = file:read_file(Tests),
+
+%    String = ucs:to_unicode(binary_to_list(Bin), 'utf-8'),
+%    case xmerl_scan:string(String, [{xmlbase, TestDir}]) of
+    case xmerl_scan:string(binary_to_list(Bin), [{xmlbase, TestDir}]) of
+	{error, Reason} ->
+	    io:format("ERROR xmerl:scan_file/2 Reason=~w~n", [Reason]);
+	{A, _Res} ->
+%     io:format("From xmerl:scan_file/2 ~n A=~p~n Res=~w~n", [A,Res]),
+	    C = xmerl:export([A], xmerl_test),
+	    io:format("From xmerl:export/2 xmerl_text filter~n ~p~n", [C])
+    end.
+    
+
+'TESTSUITE'(_Data, Attrs, _Parents, _E) ->
+    _Profile = find_attribute('PROFILE', Attrs),
+%    io:format("testsuite Profile=~p~n", [Profile]),
+    [].
+
+'TESTCASES'(_Data, Attrs, _Parents, _E) ->
+    Profile = find_attribute('PROFILE', Attrs),
+    XMLbase = find_attribute('xml:base', Attrs),
+    io:format("testsuite Profile=~p~n xml:base=~p~n", [Profile, XMLbase]),
+    [].
+
+%% More info on Canonical Forms can be found at:
+%%  http://dev.w3.org/cvsweb/~checkout~/2001/XML-Test-Suite/xmlconf/sun/cxml.html?content-type=text/html;%20charset=iso-8859-1
+'TEST'(Data, Attrs, _Parents, E) ->
+%    io:format("test Attrs=~p~n Parents=~p~n E=~p~n",[Attrs, _Parents, E]),
+    Id = find_attribute('ID', Attrs),
+    io:format("Test: ~p ",[Id]),
+    Entities = find_attribute('ENTITIES', Attrs), % Always handle all entities
+    Output1 = find_attribute('OUTPUT', Attrs), % 
+    Output3 = find_attribute('OUTPUT3', Attrs), % FIXME!
+    Sections = find_attribute('SECTIONS', Attrs),
+    Recommendation = find_attribute('RECOMMENDATION', Attrs), % FIXME!
+    Type = find_attribute('TYPE', Attrs), % Always handle all entities
+    Version = find_attribute('VERSION', Attrs), % FIXME!
+    URI = find_attribute('URI', Attrs),
+    Namespace = find_attribute('NAMESPACE', Attrs), % FIXME!
+
+    OutputForm=
+	if
+	    Output1 =/= undefined -> Output1;
+	    true -> Output3
+	end,
+    Test = filename:join(E#xmlElement.xmlbase, URI),
+%    io:format("TEST URI=~p~n E=~p~n",[Test,E]),
+    case Type of
+	"valid" ->
+%	    io:format("Data=~p~n Attrs=~p~n Parents=~p~n Path=~p~n",
+%		      [Data, Attrs, _Parents, Test]),
+	    test_valid(Test, Data, Sections, Entities, OutputForm, Recommendation,
+		       Version, Namespace);
+	"invalid" ->
+	    test_invalid(Test, Data, Sections, Entities, OutputForm, Recommendation,
+			 Version, Namespace);
+	"not-wf" ->
+	    test_notwf(Test, Data, Sections, Entities, OutputForm, Recommendation,
+		       Version, Namespace);
+	"error" ->
+	    test_error(Test, Data, Sections, Entities, OutputForm, Recommendation,
+		       Version, Namespace)
+    end,
+    [].
+
+%% Really basic HTML font tweaks, to support highlighting
+%% some aspects of test descriptions ...
+'EM'(Data, _Attrs, _Parents, _E) ->
+    [$" |Data ++ [$"]].
+
+'B'(Data, _Attrs, _Parents, _E) ->
+   [$" |Data ++ [$"]].
+
+
+
+find_attribute(Tag,Attrs) ->
+    case xmerl_lib:find_attribute(Tag, Attrs) of
+	{value, Id} -> Id;
+	false -> undefined
+    end.
+
+
+-define(CONT, false).
+
+%%% All parsers must accept "valid" testcases.
+test_valid(URI, Data, Sections, Entities, OutputForm, Recommendation, Version,
+	   Namespace) ->
+    io:format("nonvalidating ", []),
+    case nonvalidating_parser_q(URI) of
+	{Res, Tail} when is_record(Res, xmlElement) ->
+	    case is_whitespace(Tail) of
+		true ->
+		    io:format("OK ", []),
+		    ok;
+		false ->
+		    print_error({Res, Tail}, URI, Sections, Entities, OutputForm,
+				Recommendation,
+				Version, Namespace, Data),
+		    if
+			?CONT == false -> throw({'EXIT', failed_test});
+			true -> error
+		    end
+	    end;
+	Error ->
+	    print_error(Error, URI, Sections, Entities, OutputForm, Recommendation,
+			Version, Namespace, Data),
+	    if
+		?CONT == false -> throw({'EXIT', failed_test});
+		true -> error
+	    end
+    end,
+    io:format("validating ", []),
+    case validating_parser_q(URI) of
+	{Res2, Tail2} when is_record(Res2, xmlElement) ->
+	    case is_whitespace(Tail2) of
+		true ->
+		    io:format("OK~n", []),
+		    ok;
+		false ->
+		    print_error({Res2, Tail2}, URI, Sections, Entities, OutputForm,
+				Recommendation,
+				Version, Namespace, Data),
+		    if
+			?CONT == false -> throw({'EXIT', failed_test});
+			true -> error
+		    end
+	    end;
+	Error2 ->
+	    print_error(Error2, URI, Sections, Entities, OutputForm, Recommendation,
+			Version, Namespace, Data),
+	    if
+		?CONT == false -> throw({'EXIT', failed_test});
+		true -> error
+	    end
+    end.
+
+
+%%% Nonvalidating parsers must accept "invalid" testcases, but validating ones
+%%% must reject them.
+test_invalid(URI, Data, Sections, Entities, OutputForm, Recommendation, Version,
+	     Namespace) ->
+    io:format("nonvalidating ", []),
+    case nonvalidating_parser_q(URI) of
+	{Res,Tail} when is_record(Res, xmlElement) ->
+	    case is_whitespace(Tail) of
+		true ->
+		    io:format("OK ", []),
+		    ok;
+		false ->
+		    print_error({Res, Tail}, URI, Sections, Entities, OutputForm,
+				Recommendation,
+				Version, Namespace, Data),
+		    if
+			?CONT == false -> throw({'EXIT', failed_test});
+			true -> error
+		    end
+	    end;
+	Error ->
+	    print_error(Error, URI, Sections, Entities, OutputForm, Recommendation,
+			Version, Namespace, Data),
+	    if
+		?CONT == false -> throw({'EXIT', failed_test});
+		true -> error
+	    end
+    end,
+    io:format("validating ", []),
+    case validating_parser_q(URI) of
+	{Res2, Tail2} when is_record(Res2, xmlElement) ->
+	    case is_whitespace(Tail2) of
+		false ->
+		    io:format("OK~n", []),
+		    ok;
+		true ->
+		    print_error({Res2, Tail2}, URI, Sections, Entities, OutputForm,
+				Recommendation,
+				Version, Namespace, Data),
+		    if
+			?CONT == false -> throw({'EXIT', failed_test});
+			true -> error
+		    end
+	    end;
+	{error, enoent} ->
+	    print_error("Testfile not found", URI, Sections, Entities, OutputForm,
+			Recommendation, Version, Namespace, Data),
+	    if
+		?CONT == false -> throw({'EXIT', failed_test});
+		true -> error
+	    end;
+	_Error2 ->
+	    io:format("OK~n", []),
+	    ok
+    end.
+
+%%% No parser should accept a "not-wf" testcase unless it's a nonvalidating
+%%% parser and the test contains external entities that the parser doesn't read
+test_notwf(URI, Data, Sections, Entities, OutputForm, Recommendation, Version,
+	   Namespace) ->
+    io:format("nonvalidating ", []),
+    case nonvalidating_parser_q(URI) of
+	{Res, Tail} when is_record(Res, xmlElement) ->
+	    case is_whitespace(Tail) of
+		false ->
+		    io:format("OK ", []),
+		    ok;
+		true ->
+		    print_error({Res, Tail}, URI, Sections, Entities, OutputForm,
+				Recommendation,
+				Version, Namespace, Data),
+		    if
+			?CONT == false -> throw({'EXIT', failed_test});
+			true -> error
+		    end
+	    end;
+	{error,enoent} ->
+	    print_error("Testfile not found",URI,Sections,Entities,OutputForm,
+			Recommendation,Version,Namespace,Data),
+	    if
+		?CONT==false -> throw({'EXIT', failed_test});
+		true -> error
+	    end;
+	_Error ->
+	    io:format("OK ",[]),
+	    ok
+    end,
+    io:format("validating ",[]),
+    case validating_parser_q(URI) of
+	{Res2, Tail2} when is_record(Res2, xmlElement) ->
+	    case is_whitespace(Tail2) of
+		false ->
+		    io:format("OK~n", []),
+		    ok;
+		true ->
+		    print_error({Res2, Tail2}, URI, Sections, Entities, OutputForm,
+				Recommendation,
+				Version, Namespace, Data),
+		    if
+			?CONT == false -> throw({'EXIT', failed_test});
+			true -> error
+		    end
+	    end;
+	{error,enoent} ->
+	    print_error("Testfile not found", URI, Sections, Entities, OutputForm,
+			Recommendation, Version, Namespace, Data),
+	    if
+		?CONT == false -> throw({'EXIT', failed_test});
+		true -> error
+	    end;
+	_Error2 ->
+	    io:format("OK~n", []),
+	    ok
+    end.
+
+%%% Parsers are not required to report "errors", but xmerl will always...
+test_error(URI, Data, Sections, Entities, OutputForm, Recommendation, Version,
+	   Namespace) ->
+    io:format("nonvalidating ", []),
+    case nonvalidating_parser_q(URI) of
+	{'EXIT', _Reason} ->
+	    io:format("OK ", []),
+	    ok;
+	{error, enoent} ->
+	    print_error("Testfile not found", URI, Sections, Entities, OutputForm,
+			Recommendation, Version, Namespace, Data),
+	    if
+		?CONT == false -> throw({'EXIT', failed_test});
+		true -> error
+	    end;
+	Res ->
+	    print_error(Res, URI, Sections, Entities, OutputForm, Recommendation,
+			Version, Namespace, Data),
+	    if
+		?CONT == false -> throw({'EXIT', failed_test});
+		true -> error
+	    end
+    end,
+    io:format("validating ", []),
+    case validating_parser_q(URI) of
+	{'EXIT', _Reason2} ->
+	    io:format("OK~n", []),
+	    ok;
+	{error, enoent} ->
+	    print_error("Testfile not found", URI, Sections, Entities, OutputForm,
+			Recommendation, Version, Namespace, Data),
+	    if
+		?CONT == false -> throw({'EXIT', failed_test});
+		true -> error
+	    end;
+	Res2 ->
+	    print_error(Res2, URI, Sections, Entities, OutputForm, Recommendation,
+			Version, Namespace, Data),
+	    if
+		?CONT == false -> throw({'EXIT', failed_test});
+		true -> error
+	    end
+    end.
+
+
+%%% Use xmerl as nonvalidating XML parser
+nonvalidating_parser(URI) ->
+    (catch xmerl_scan:file(URI, [])).
+
+
+%%% Use xmerl as nonvalidating XML parser
+nonvalidating_parser_q(URI) ->
+    (catch xmerl_scan:file(URI, [{quiet, true}])).
+
+
+%%% Use xmerl as validating XML parser
+validating_parser(URI) ->
+    (catch xmerl_scan:file(URI, [{validation, true}])).
+
+
+%%% Use xmerl as validating XML parser
+validating_parser_q(URI) ->
+    (catch xmerl_scan:file(URI, [{validation, true}, {quiet, true}])).
+
+
+is_whitespace([]) ->
+    true;
+is_whitespace([H |Rest]) when ?whitespace(H) ->
+    is_whitespace(Rest);
+is_whitespace(_) ->
+    false.
+
+
+print_error(Error, URI, Sections, Entities, OutputForm, Recommendation, Version,
+	    Namespace, Data) ->
+    io:format("ERROR ~p~n URI=~p~n See Section ~s~n",[Error, URI, Sections]),
+    if
+	Entities == undefined -> ok;
+	true -> io:format(" Entities  =~s~n",[Entities])
+    end,
+    if
+	OutputForm == undefined -> ok;
+	true -> io:format(" OutputForm=~s FIXME!~n",[OutputForm])
+    end,
+    if
+	Recommendation == undefined -> ok;
+	true -> io:format(" Recommendation=~s~n",[Recommendation])
+    end,
+    if
+	Version == undefined -> ok;
+	true -> io:format(" Version   =~s~n",[Version])
+    end,
+    if
+	Namespace == undefined -> ok;
+	true -> io:format(" Namespace =~s~n",[Namespace])
+    end,
+    io:format(Data).
+
+
+    
+    
+    
+	
+
+
+
+%%% ============================================================================
+%%% Callbacks for parsing of Simplified DocBook XML
+
+para(_Data, _Attrs, US) ->
+    case US of
+	Int when is_integer(Int) -> Int+1;
+	undefined -> 1
+    end.
+
+
diff --git a/lib/xmerl/doc/examples/xml/test.xml b/lib/xmerl/doc/examples/xml/test.xml
new file mode 100755
index 0000000000..e803a83560
--- /dev/null
+++ b/lib/xmerl/doc/examples/xml/test.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" ?>
+<People>
+  <Person Type = "Personal">
+  </Person>
+</People>
+  
diff --git a/lib/xmerl/doc/examples/xml/test2.xml b/lib/xmerl/doc/examples/xml/test2.xml
new file mode 100755
index 0000000000..0cb11194fc
--- /dev/null
+++ b/lib/xmerl/doc/examples/xml/test2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding = "ISO-8859-1" ?>
+<People>
+  <!-- This is a real comment -->
+  <comment>This is a comment</comment>
+  <Person Type = "Personal">
+  </Person>
+</People>
+  
diff --git a/lib/xmerl/doc/examples/xml/test3.xml b/lib/xmerl/doc/examples/xml/test3.xml
new file mode 100755
index 0000000000..dbdc1e62c2
--- /dev/null
+++ b/lib/xmerl/doc/examples/xml/test3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding = 'ISO-8859-1' ?>
+<People>
+  <!-- This is a real comment -->
+  <comment>This is a comment</comment>
+  <Person Type = "Personal">
+  </Person>
+</People>
+  
diff --git a/lib/xmerl/doc/examples/xml/test4.xml b/lib/xmerl/doc/examples/xml/test4.xml
new file mode 100755
index 0000000000..e9d85b8d8f
--- /dev/null
+++ b/lib/xmerl/doc/examples/xml/test4.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding = 'ISO-8859-1' ?>
+<People>
+  <!-- This is a real comment -->
+  <comment>
+	This is a comment
+  </comment>
+  <Person Type = "Personal">
+  </Person>
+</People>
diff --git a/lib/xmerl/doc/examples/xml/test5.xml b/lib/xmerl/doc/examples/xml/test5.xml
new file mode 100755
index 0000000000..e9d85b8d8f
--- /dev/null
+++ b/lib/xmerl/doc/examples/xml/test5.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding = 'ISO-8859-1' ?>
+<People>
+  <!-- This is a real comment -->
+  <comment>
+	This is a comment
+  </comment>
+  <Person Type = "Personal">
+  </Person>
+</People>
diff --git a/lib/xmerl/doc/examples/xml/testdtd.dtd b/lib/xmerl/doc/examples/xml/testdtd.dtd
new file mode 100755
index 0000000000..2ce1c513a6
--- /dev/null
+++ b/lib/xmerl/doc/examples/xml/testdtd.dtd
@@ -0,0 +1,17 @@
+<!ELEMENT PARAMETER ( #PCDATA | PARAMETER )* >
+<!ATTLIST PARAMETER NR ( 1000024 | 1000025 | 1000101 | 1000102 | 1000103 
+| 1000105 | 1000110 | 1000115 | 1000198 ) #REQUIRED >
+<!ATTLIST PARAMETER UNIT CDATA #REQUIRED >
+
+<!ELEMENT PRODUCT ( USER_DEF, PRODUCTELEMENT+ ) >
+<!ATTLIST PRODUCT CUSTOMER CDATA #REQUIRED >
+<!ATTLIST PRODUCT DESCRIPTION CDATA #REQUIRED >
+<!ATTLIST PRODUCT GENERATOR NMTOKEN #REQUIRED >
+<!ATTLIST PRODUCT PRODUCTID NMTOKEN #REQUIRED >
+
+<!ELEMENT PRODUCTELEMENT ( PARAMETER+ ) >
+<!ATTLIST PRODUCTELEMENT ELEMENTID CDATA #REQUIRED >
+<!ATTLIST PRODUCTELEMENT TYPE NMTOKEN #REQUIRED >
+
+<!ELEMENT USER_DEF ( #PCDATA ) >
+
diff --git a/lib/xmerl/doc/examples/xml/xmerl.xml b/lib/xmerl/doc/examples/xml/xmerl.xml
new file mode 100755
index 0000000000..f02282dbef
--- /dev/null
+++ b/lib/xmerl/doc/examples/xml/xmerl.xml
@@ -0,0 +1,523 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article
+      PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
+      "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
+
+<article  lang="en" xml:lang="en" >
+  <articleinfo>
+    <title>XMerL - XML processing tools for Erlang</title>
+    <subtitle>Reference Manual</subtitle>
+    <authorgroup>
+      <author>
+	<firstname>Ulf</firstname>
+	<surname>Wiger</surname>
+      </author>
+    </authorgroup>
+    <revhistory>
+      <revision>
+      <revnumber>1.0</revnumber><date>2003-02-04</date>
+      <revremark>Converted xml from html</revremark>
+      </revision>
+    </revhistory>
+    <abstract>
+      <para>XMerL tools contains xmerl_scan; a non-validating XML
+      processor, xmerl_xpath; a XPath implementation, xmerl for export
+      of XML trees to HTML, XML or text and xmerl_xs for XSLT like
+      transforms in erlang. 
+      </para>
+    </abstract>
+  </articleinfo>
+  
+  <section>
+    <title>xmerl_scan - the XML processor</title>
+    <para>The (non-validating) XML processor is activated through 
+    <computeroutput>xmerl_scan:string/[1,2]</computeroutput> or 
+    <computeroutput>xmerl_scan:file/[1,2]</computeroutput>.
+    It returns records of the type defined in xmerl.hrl.
+    </para>
+  
+    <para>As far as I can tell, xmerl_scan implements the complete XML
+    1.0 spec, including:</para>
+    <itemizedlist>
+      <listitem><para>entity expansion</para></listitem>
+      <listitem><para>fetching and parsing external DTDs</para></listitem>
+      <listitem><para>contitional processing</para></listitem>
+      <listitem><para>UniCode</para></listitem>
+      <listitem><para>XML Names</para></listitem>
+    </itemizedlist>
+    <programlisting>
+xmerl_scan:string(Text [ , Options ]) -> #xmlElement{}.
+xmerl_scan:file(Filename [ , Options ]) -> #xmlElement{}. </programlisting>
+    
+    <para>The Options are basically to specify the behaviour of the
+    scanner.  See the source code for details, but you can specify
+    funs to handle scanner events (event_fun), process the document
+    entities once identified (hook_fun), and decide what to do if the
+    scanner runs into eof before the document is complete
+    (continuation_fun).</para>
+
+    <para>You can also specify a path (fetch_path) as a list of
+    directories to search when fetching files. If the file in question
+    is not in the fetch_path, the URI will be used as a file
+    name.</para>
+
+
+    <section>
+      <title>Customization functions</title>
+      <para>The XML processor offers a number of hooks for
+      customization. These hooks are defined as function objects, and
+      can be provided by the caller.</para>
+      
+      <para>The following customization functions are available. If
+      they also have access to their own state variable, the access
+      function for this state is identified within parentheses:</para>
+
+      <itemizedlist>
+
+	<listitem><para>event function (<computeroutput>
+	xmerl_scan:event_state/[1,2]
+	</computeroutput>)</para></listitem>
+
+	<listitem><para>hook function (<computeroutput>
+	xmerl_scan:hook_state/[1,2]
+	</computeroutput>)</para></listitem>
+
+	<listitem><para>fetch function (<computeroutput>
+	xmerl_scan:fetch_state/[1,2] </computeroutput>)
+	</para></listitem>
+
+	<listitem><para>continuation function (<computeroutput>
+	xmerl_scan:cont_state/[1,2] </computeroutput>)
+	</para></listitem>
+
+	<listitem><para>rules function (<computeroutput>
+      xmerl_scan:rules_state/[1,2] </computeroutput>)
+      </para></listitem>
+
+	<listitem><para>accumulator function</para></listitem>
+
+	<listitem><para>close function</para></listitem>
+
+      </itemizedlist>
+
+      <para>For all of the above state access functions, the function
+      with one argument
+      (e.g. <computeroutput>event_fun(GlobalState)</computeroutput>)
+      will read the state variable, while the function with two
+      arguments (e.g.: <computeroutput>event_fun(NewStateData,
+      GlobalState)</computeroutput>) will modify it.</para>
+
+      <para>For each function, the description starts with the syntax
+      for specifying the function in the
+      <computeroutput>Options</computeroutput> list. The general forms
+      are <computeroutput>{Tag, Fun}</computeroutput>, or
+      <computeroutput>{Tag, Fun, LocalState}</computeroutput>. The
+      second form can be used to initialize the state variable in
+      question.</para>
+
+      <section>
+	<title>User State</title>
+
+	<para>All customization functions are free to access a
+	&quot;User state&quot; variable. Care must of course be taken
+	to coordinate the use of this state. It is recommended that
+	functions, which do not really have anything to contribute to
+	the &quot;global&quot; user state, use their own state
+	variable instead. Another option (used in
+	e.g. <computeroutput>xmerl_eventp.erl</computeroutput>) is for
+	customization functions to share one of the local states (in
+	<computeroutput>xmerl_eventp.erl</computeroutput>, the
+	continuation function and the fetch function both acces the
+	<computeroutput>cont_state</computeroutput>.)</para>
+
+	<para>Functions to access user state:</para>
+
+	<itemizedlist>
+
+	  <listitem><para><computeroutput>
+	  xmerl_scan:user_state(GlobalState) </computeroutput>
+	  </para></listitem>
+
+	  <listitem><para><computeroutput>xmerl_scan:user_state(UserState',
+	  GlobalState) </computeroutput></para></listitem>
+
+	</itemizedlist>
+
+      </section>
+      <section>
+	<title>Event Function</title>
+
+	<para><computeroutput>{event_fun, fun()} | {event_fun, fun(),
+	LocalState}</computeroutput></para>
+
+	<para>The event function is called at the beginning and at the
+	end of a parsed entity. It has the following format and
+	semantics:</para>
+
+<programlisting>
+<![CDATA[
+fun(Event, GlobalState) ->
+   EventState = xmerl_scan:event_state(GlobalState),
+   EventState' = foo(Event, EventState),
+   GlobalState' = xmerl_scan:event_state(EventState', GlobalState)
+end.
+]]></programlisting>
+
+      </section>
+      <section>
+	<title>Hook Function</title>
+	<para> <computeroutput>{hook_fun, fun()} | {hook_fun, fun(),
+	LocalState}</computeroutput></para>
+
+
+
+<para>The hook function is called when the processor has parsed a complete
+entity. Format and semantics:</para>
+
+<programlisting>
+<![CDATA[
+fun(Entity, GlobalState) ->
+   HookState = xmerl_scan:hook_state(GlobalState),
+   {TransformedEntity, HookState'} = foo(Entity, HookState),
+   GlobalState' = xmerl_scan:hook_state(HookState', GlobalState),
+   {TransformedEntity, GlobalState'}
+end.
+]]></programlisting>
+
+	<para>The relationship between the event function, the hook
+	function and the accumulator function is as follows:</para>
+
+	<orderedlist>
+	  <listitem><para>The event function is first called with an
+	  'ended' event for the parsed entity.</para></listitem>
+
+	  <listitem><para>The hook function is called, possibly
+	  re-formatting the entity.</para></listitem>
+
+	  <listitem><para>The acc function is called in order to
+	  (optionally) add the re-formatted entity to the contents of
+	  its parent element.</para></listitem>
+
+    </orderedlist>
+
+      </section>
+      <section>
+	<title>Fetch Function</title>
+<para>
+<computeroutput>{fetch_fun, fun()} | {fetch_fun, fun(), LocalState}</computeroutput>
+</para>
+<para>The fetch function is called in order to fetch an external resource
+(e.g. a DTD).</para>
+
+<para>The fetch function can respond with three different return values:</para>
+
+    <programlisting>
+<![CDATA[
+    Result ::=
+      {ok, GlobalState'} |
+      {ok, {file, Filename}, GlobalState'} |
+      {ok, {string, String}, GlobalState'}
+]]></programlisting>
+
+<para>Format and semantics:</para>
+
+    <programlisting>
+<![CDATA[
+fun(URI, GlobalState) ->
+   FetchState = xmerl_scan:fetch_state(GlobalState),
+   Result = foo(URI, FetchState).  % Result being one of the above
+end.
+]]></programlisting>
+
+      </section>
+      <section>
+	<title>Continuation Function</title>
+<para>
+<computeroutput>{continuation_fun, fun()} | {continuation_fun, fun(), LocalState}</computeroutput>
+</para>
+<para>The continuation function is called when the parser encounters the end
+of the byte stream. Format and semantics:</para>
+
+    <programlisting>
+<![CDATA[
+fun(Continue, Exception, GlobalState) ->
+   ContState = xmerl_scan:cont_state(GlobalState),
+   {Result, ContState'} = get_more_bytes(ContState),
+   GlobalState' = xmerl_scan:cont_state(ContState', GlobalState),
+   case Result of
+      [] ->
+         GlobalState' = xmerl_scan:cont_state(ContState', GlobalState),
+         Exception(GlobalState');
+      MoreBytes ->
+         {MoreBytes', Rest} = end_on_whitespace_char(MoreBytes),
+         ContState'' = update_cont_state(Rest, ContState'),
+         GlobalState' = xmerl_scan:cont_state(ContState'', GlobalState),
+         Continue(MoreBytes', GlobalState')
+   end
+end.
+]]></programlisting>
+      </section>
+      <section>
+	<title>Rules Functions</title>
+	<para>
+<computeroutput>
+{rules, ReadFun : fun(), WriteFun : fun(), LocalState} |
+{rules, Table : ets()}</computeroutput>
+</para>
+	<para>The rules functions take care of storing scanner
+	information in a rules database. User-provided rules functions
+	may opt to store the information in mnesia, or perhaps in the
+	user_state(LocalState).</para>
+
+	<para>The following modes exist:</para>
+
+	<itemizedlist>
+
+	  <listitem><para>If the user doesn't specify an option, the
+	  scanner creates an ets table, and uses built-in functions to
+	  read and write data to it. When the scanner is done, the ets
+	  table is deleted.</para></listitem>
+
+	  <listitem><para>If the user specifies an ets table via the 
+	<computeroutput>{rules, Table}</computeroutput> option, the
+	scanner uses this table. When the scanner is done, it does
+	<emphasis>not</emphasis> delete the table.</para></listitem>
+	  
+	  <listitem><para>If the user specifies read and write
+	  functions, the scanner will use them instead.</para></listitem>
+
+	</itemizedlist>
+	
+	<para>The format for the read and write functions are as
+	follows:</para>
+
+
+<programlisting>
+<![CDATA[
+WriteFun(Context, Name, Definition, ScannerState) -> NewScannerState.
+ReadFun(Context, Name, ScannerState) -> Definition | undefined.
+]]></programlisting>
+
+	<para>Here is a summary of the data objects currently being
+	written by the scanner:</para>
+	
+	<table>
+	  <title>Scanner data objects</title>
+	  <tgroup cols="3">
+	    <thead>
+	      <row>
+		<entry>Context</entry>
+		<entry>Key Value</entry>
+		<entry>Definition</entry>
+	      </row>
+	    </thead>
+	    <tbody>
+	      <row>
+		<entry>notation</entry>
+		<entry>NotationName</entry>
+		<entry><computeroutput>{system, SL} | {public, PIDL, SL}</computeroutput></entry>
+	      </row>
+	      <row>
+		<entry>elem_def</entry>
+		<entry>ElementName</entry>
+		<entry><computeroutput>#xmlElement{content = ContentSpec}</computeroutput></entry>
+	      </row>
+	      <row>
+		<entry>parameter_entity</entry>
+		<entry>PEName</entry>
+		<entry><computeroutput>PEDef</computeroutput></entry>
+	      </row>
+	      <row>
+		<entry>entity</entry>
+		<entry>EntityName</entry>
+	  <entry><computeroutput>EntityDef</computeroutput></entry>
+	      </row>
+	    </tbody>
+	  </tgroup>
+	</table>
+      
+	
+<programlisting>
+<![CDATA[
+ContentSpec ::= empty | any | ElemContent
+ElemContent ::= {Mode, Elems}
+Mode        ::= seq | choice
+Elems       ::= [Elem]
+Elem        ::= '#PCDATA' | Name | ElemContent | {Occurrence, Elems}
+Occurrence  ::= '*' | '?' | '+'
+]]></programlisting>
+	<note><para>When &lt;Elem&gt; is not wrapped with
+&lt;Occurrence&gt;, (Occurrence = once) is implied.</para></note>
+
+      </section>
+      <section>
+	<title>Accumulator Function</title>
+	<para><computeroutput>{acc_fun, fun()} | {acc_fun, fun(),
+	LocalState}</computeroutput></para>
+
+	<para>The accumulator function is called to accumulate the
+	contents of an entity.When parsing very large files, it may
+	not be desireable to do so.In this case, an acc function can
+	be provided that simply doesn't accumulate.</para>
+
+	<para>Note that it is possible to even modify the parsed
+	entity before accumulating it, but this must be done with
+	care. <computeroutput>xmerl_scan</computeroutput> performs
+	post-processing of the element for namespace management. Thus,
+	the element must keep its original structure for this to
+	work.</para>
+
+	<para>The acc function has the following format and
+	semantics:</para>
+
+	<programlisting>
+<![CDATA[
+%% default accumulating acc fun
+fun(ParsedEntity, Acc, GlobalState) ->
+   {[X|Acc], GlobalState}.
+
+%% non-accumulating acc fun
+fun(ParsedEntity, Acc, GlobalState) ->
+   {Acc, GlobalState}.
+]]></programlisting>
+      </section>
+      <section>
+	<title>Close Function</title>
+
+	<para>The close function is called when a document (either the
+	main document or an external DTD) has been completely
+	parsed. When xmerl_scan was started using
+	<computeroutput>xmerl_scan:file/[1,2]</computeroutput>, the
+	file will be read in full, and closed immediately, before the
+	parsing starts, so when the close function is called, it will
+	not need to actually close the file. In this case, the close
+	function will be a good place to modify the state
+	variables.</para>
+
+	<para>Format and semantics:</para>
+
+	<programlisting>
+<![CDATA[
+fun(GlobalState) ->
+   GlobalState' = ....  % state variables may be altered
+]]></programlisting>
+      </section>
+
+    </section>
+
+  </section>
+
+  <section>
+    <title>XPATH</title>
+
+    <programlisting>
+<![CDATA[
+xmerl_xpath:string(QueryString, #xmlElement{}) ->
+	[DocEntity]
+
+DocEntity :	#xmlElement{} 
+		| #xmlAttribute{} 
+		| #xmlText{} 
+		| #xmlPI{}
+		| #xmlComment{}
+]]></programlisting>
+
+    <para>The xmerl_xpath module does seem to handle the entire XPATH
+    1.0 spec, but I haven't tested that much yet. The grammar is
+    defined in
+    <computeroutput>xmerl_xpath_parse.yrl</computeroutput>.  The core
+    functions are defined in
+    <computeroutput>xmerl_xpath_pred.erl</computeroutput>.</para>
+  </section>
+  <section>
+    <title>Some useful shell commands for debugging the XPath parser</title>
+<para>
+    <command>
+<![CDATA[
+c(xmerl_xpath_scan).
+yecc:yecc("xmerl_xpath_parse.yrl", "xmerl_xpath_parse", true, []).
+c(xmerl_xpath_parse).
+
+xmerl_xpath_parse:parse(xmerl_xpath_scan:tokens("position() > -1")).
+xmerl_xpath_parse:parse(xmerl_xpath_scan:tokens("5 * 6 div 2")).
+xmerl_xpath_parse:parse(xmerl_xpath_scan:tokens("5 + 6 mod 2")).
+xmerl_xpath_parse:parse(xmerl_xpath_scan:tokens("5 * 6")).
+xmerl_xpath_parse:parse(xmerl_xpath_scan:tokens("5 * 6")).
+xmerl_xpath_parse:parse(xmerl_xpath_scan:tokens("-----6")).
+xmerl_xpath_parse:parse(xmerl_xpath_scan:tokens("parent::node()")).
+xmerl_xpath_parse:parse(xmerl_xpath_scan:tokens("descendant-or-self::node()")).
+xmerl_xpath_parse:parse(xmerl_xpath_scan:tokens("parent::processing-instruction('foo')")).]]></command></para>
+  </section>
+  <section>
+    <title>Erlang Data Structure Export</title>
+
+    <para>The idea as follows:</para>
+
+    <para>The Erlang data structure should look like this:</para>
+    <programlisting>
+<![CDATA[
+Element:	{Tag, Attributes, Content}
+Tag :		atom()
+Attributes:	[{Key, Value}]
+Content:	[String | Element]
+String:		[char() | binary() | String]
+]]></programlisting>
+
+    <para>Some short forms are allowed:</para>
+    <programlisting>
+<![CDATA[
+{Tag, Content}	-> {Tag, [], Content}
+Tag		-> {Tag, [], []}
+]]></programlisting>
+
+    <para>Note that content lists must be flat, but strings can be
+    deep.</para>
+
+    <para>It is also allowed to include normal
+    <computeroutput>#xml...</computeroutput> elements in the simple
+    format.</para>
+
+    <para><computeroutput>xmerl:export_simple(Data,
+    Callback)</computeroutput> takes the above data structure and
+    exports it, using the callback module
+    <computeroutput>Callback</computeroutput>.</para>
+
+    <para>The callback module should contain hook functions for all
+    tags present in the data structure. The hook function must have
+    the format:</para>
+    <para><computeroutput> Tag(Data, Attrs, Parents, E)
+    </computeroutput></para>
+
+    <para>where E is an <computeroutput>#xmlElement{}</computeroutput>
+    record  (see <computeroutput>xmerl.hrl</computeroutput>).</para>
+
+    <para>Attrs is converted from the simple <computeroutput>[{Key,
+    Value}]</computeroutput> to
+    <computeroutput>[#xmlAttribute{}]</computeroutput></para>
+
+    <para>Parents is a list of <computeroutput>[{ParentTag,
+    ParentTagPosition}]</computeroutput>.</para>
+
+    <para>The hook function should return either the Data to be
+    exported, or the tuple <computeroutput>{'#xml-redefine#',
+    NewStructure}</computeroutput>, where
+    <computeroutput>NewStructure</computeroutput> is an element (which
+    can be simple), or a (simple-) content list wrapped in a 1-tuple
+    as <computeroutput>{NewContent}</computeroutput>.</para>
+
+    <para>The callback module can inherit definitions from other
+    callback modules, through the required function
+    <computeroutput>'#xml-interitance#() ->
+    [ModuleName]</computeroutput>. </para>
+
+    <para>As long as a tag is represented in one of the callback
+    modules, things will work. It is of course also possible to
+    redefine a tag.</para>
+      <section>
+      <title>XSLT like transforms</title>
+	<para>See separate document <ulink url="xmerl_xs.html" >xmerl_xs.html
+	</ulink></para>.
+      </section>
+  </section>
+
+</article>
diff --git a/lib/xmerl/doc/examples/xml/xmerl_xs.xml b/lib/xmerl/doc/examples/xml/xmerl_xs.xml
new file mode 100644
index 0000000000..9a798808b9
--- /dev/null
+++ b/lib/xmerl/doc/examples/xml/xmerl_xs.xml
@@ -0,0 +1,541 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article
+      PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
+      "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
+
+<article  lang="en" xml:lang="en" >
+  <articleinfo>
+    <title>XSLT like transformations in Erlang </title>
+    <subtitle>User Guide</subtitle>
+    <authorgroup>
+      <author>
+	<firstname>Mikael</firstname>
+	<surname>Karlsson</surname>
+      </author>
+    </authorgroup>
+    <revhistory>
+      <revision>
+      <revnumber>1.0</revnumber><date>2002-10-25</date>
+      <revremark>First Draft</revremark>
+      </revision>
+      <revision>
+      <revnumber>1.1</revnumber><date>2003-02-05</date>
+      <revremark>Moved module xserl to xmerl application, renamed to 
+	  xmerl_xs</revremark>
+      </revision>
+    </revhistory>
+    <abstract>
+      <para>Erlang has similarities to XSLT since both languages
+	have a functional programming approach. Using the xpath implementation
+	in the existing xmerl application it is possible to write XSLT
+	like transforms in Erlang. One can also combine the
+	transformations with the erlang scripting possibility
+	in the yaws webserver to implement "on the fly" html
+	conversions of xml documents. 
+      </para>
+    </abstract>
+  </articleinfo>
+
+
+  <section>
+    <title>Terminology</title>
+    <variablelist>
+      <varlistentry>
+	<term>XML</term>
+	<listitem>
+	  <para>Extensible Markup Language</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term>XSLT</term>
+	<listitem>
+	  <para>Extensible Stylesheet Language: Transformations</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+  <section>
+    <title>Introduction</title>
+    <para>XSLT stylesheets are often used when transforming XML
+      documents, to other XML documents or (X)HTML for presentation.
+      There are a number of brick-sized books written on the
+      topic. XSLT contains quite many
+      functions and learning them all may take some effort, which
+      could be a reason why the author only has reached a basic level of
+      understanding. This document assumes a basic level of
+      understanding of XSLT.
+    </para>
+    <para>Since XSLT is based on a functional programming approach
+      with pattern matching and recursion it is possible to write
+      similar style sheets in Erlang. At least for basic
+      transforms. XPath which is used in XSLT is also already
+      implemented in the xmerl application written i Erlang. This
+      document describes how to use the XPath implementation together
+      with Erlangs pattern matching and a couple of functions to write
+      XSLT like transforms.</para>
+    <para>This approach is probably easier for an Erlanger but
+      if you need to use real XSLT stylesheets in order to "comply to
+      the standard" there is an adapter available to the Sablotron
+      XSLT package which is written i C++.
+    </para>
+    <para>
+      This document is written in the Simplified Docbook DTD which is
+      a subset of the complete one and converted to xhtml using a
+      stylesheet written in Erlang.
+    </para>
+  </section>
+
+  <section>
+    <title>Tools</title>
+    <section>
+      <title>xmerl</title>
+      <para><ulink url="http://sowap.sourceforge.net/" >xmerl</ulink>
+      is a xml parser written in Erlang</para>
+      <section>
+	<title>xmerl_xpath</title>
+	<para>XPath is in important part of XSLT and is implemented in
+	xmerl</para>
+      </section>
+      <section>
+	<title>xmerl_xs</title>
+	<para>
+	  <ulink url="xmerl_xs.yaws" >xmerl_xs</ulink> is a very small
+	  module acting as "syntactic sugar" for the XSLT lookalike 
+	  transforms. It uses xmerl_xpath.
+	</para>
+      </section>
+    </section>
+
+    <section>
+      <title>yaws</title>
+      <para>
+	<ulink url="http://yaws.hyber.org/" >Yaws</ulink>, Yet Another
+	Webserver, is a web server written in Erlang that support dynamic
+	content generation using embedded scripts, also written in Erlang.
+      </para>
+<!--
+      <figure>
+	<title>The Yaws logo</title>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="yaws_pb.gif" format="GIF" scale="50%"/>
+	  </imageobject>
+	</mediaobject>
+      </figure>
+-->
+      <para>Yaws is not needed to make the XSLT like transformations, but
+	combining yaws and xmerl it is possible to do transformations
+	of XML documents to HTML in realtime, when clients requests a
+	web page. As an example I am able to edit this document using 
+	emacs with psgml tools, save the document and just do a reload
+	in my browser to see the result. The parse/transform time is not
+	visually different compared to loading any other document in the
+	browser.
+      </para>
+    </section>
+    
+  </section>
+  
+  <section>
+    <title>Transformations</title>
+<para>
+ When xmerl_scan parses an xml string/file it returns a record of:
+</para>
+ <programlisting>
+<![CDATA[ 
+  -record(xmlElement, {
+      name,
+      parents = [],
+      pos,
+      attributes = [],
+      content = [],
+      language = [],
+      expanded_name = [],
+      nsinfo = [],% {Prefix, Local} | []
+      namespace = #xmlNamespace{}
+     }).
+ ]]> 
+</programlisting>
+<para>
+ Were content is a mixed list of yet other xmlElement records and/or
+ xmlText  (or other node types).
+</para>
+    <section>
+      <title>xmerl_xs functions</title>
+      <para>
+	Functions used:
+      </para>
+      <variablelist>
+	<varlistentry>
+	  <term>xslapply/2</term>
+	  <listitem>
+	    <para>function to make things look similar 
+	      to xsl:apply-templates. 
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term>value_of/1</term>
+	  <listitem>
+	    <para>Conatenates all text nodes within a tree.</para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term>select/2</term>
+	  <listitem>
+	    <para>select(Str, E) extracts nodes from the XML tree using
+	      xmerl_xpath.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term>built_in_rules/2</term>
+	  <listitem>
+	    <para>The default fallback behaviour, template funs should
+	      end with:
+	      <computeroutput>template(E)->built_in_rules(fun
+	      template/1, E).
+</computeroutput>
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+<note><para>Text is escaped using xmerl_lib:export_text/1 for 
+	"&lt;", "&gt;" and other relevant xml
+	characters when exported. So the value_of/1 and built_in_rules/2
+	functions should be replaced when not exporting to xml or html.
+</para></note>
+    </section>
+    
+
+<section><title>Examples</title>
+      <example>
+	<title>Using xslapply</title>
+	<para>original XSLT:</para>
+	<programlisting>
+<![CDATA[
+  <xsl:template match="doc/title">
+      <h1>
+        <xsl:apply-templates/>
+      </h1>
+  </xsl:template>
+ ]]> 
+	    </programlisting>
+	    <para>
+	      becomes in Erlang:</para>
+	    <programlisting>
+<![CDATA[
+  template(E = #xmlElement{ parents=[{'doc',_}|_], name='title'}) ->
+      ["<h1>",
+           xslapply(fun template/1, E),
+       "</h1>"];
+ ]]> 
+	    </programlisting>
+
+      </example>
+      <example>
+	<title>Using value_of and select</title>
+	<programlisting>
+<![CDATA[
+  <xsl:template match="title">
+    <div align="center"><h1><xsl:value-of select="." /></h1></div>
+  </xsl:template>
+ ]]> 
+	</programlisting>
+	<para>
+	  becomes:
+	</para>
+	<programlisting>
+<![CDATA[
+template(E = #xmlElement{name='title'}) ->
+    ["<div align=\"center\"><h1>", value_of(select(".", E)), "</h1></div>"];
+ ]]> 
+	    </programlisting>
+      </example>
+    <example>
+      <title>Simple xsl stylesheet</title>
+<para>
+ A complete example with the XSLT sheet in the xmerl distribution. 
+</para>
+ <programlisting>
+<![CDATA[
+
+<xsl:stylesheet version="1.0"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns="http://www.w3.org/TR/xhtml1/strict">
+
+  <xsl:strip-space elements="doc chapter section"/>
+  <xsl:output
+	method="xml"
+	indent="yes"
+	encoding="iso-8859-1"
+  />
+
+  <xsl:template match="doc">
+    <html>
+      <head>
+        <title>
+          <xsl:value-of select="title"/>
+        </title>
+      </head>
+      <body>
+        <xsl:apply-templates/>
+      </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template match="doc/title">
+    <h1>
+      <xsl:apply-templates/>
+    </h1>
+  </xsl:template>
+
+  <xsl:template match="chapter/title">
+    <h2>
+      <xsl:apply-templates/>
+    </h2>
+  </xsl:template>
+
+  <xsl:template match="section/title">
+    <h3>
+      <xsl:apply-templates/>
+    </h3>
+  </xsl:template>
+
+  <xsl:template match="para">
+    <p>
+      <xsl:apply-templates/>
+    </p>
+  </xsl:template>
+
+  <xsl:template match="note">
+    <p class="note">
+      <b>NOTE: </b>
+      <xsl:apply-templates/>
+    </p>
+  </xsl:template>
+
+  <xsl:template match="emph">
+    <em>
+      <xsl:apply-templates/>
+    </em>
+  </xsl:template>
+
+</xsl:stylesheet>
+ ]]>
+      </programlisting>
+    </example>
+    <example>
+      <title>Erlang version</title>
+      <para>
+	Erlang transformation of previous example:
+      </para>
+      <programlisting>
+<![CDATA[
+
+-include("xmerl.hrl").
+
+-import(xmerl_xs, 
+	[ xslapply/2, value_of/1, select/2, built_in_rules/2 ]).
+
+doctype()->
+    "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\
+ \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd \">".
+
+process_xml(Doc)->
+	template(Doc).
+
+template(E = #xmlElement{name='doc'})->
+    [ "<\?xml version=\"1.0\" encoding=\"iso-8859-1\"\?>",
+      doctype(),
+      "<html xmlns=\"http://www.w3.org/1999/xhtml\" >"
+      "<head>"
+      "<title>", value_of(select("title",E)), "</title>"
+      "</head>"
+      "<body>",
+      xslapply( fun template/1, E),
+      "</body>"
+      "</html>" ];
+
+
+template(E = #xmlElement{ parents=[{'doc',_}|_], name='title'}) ->
+    ["<h1>", 
+     xslapply( fun template/1, E), 
+     "</h1>"];
+
+template(E = #xmlElement{ parents=[{'chapter',_}|_], name='title'}) ->
+    ["<h2>", 
+     xslapply( fun template/1, E),
+     "</h2>"];
+
+template(E = #xmlElement{ parents=[{'section',_}|_], name='title'}) ->
+    ["<h3>", 
+     xslapply( fun template/1, E),
+     "</h3>"];
+
+template(E = #xmlElement{ name='para'}) ->
+    ["<p>", xslapply( fun template/1, E), "</p>"];
+
+template(E = #xmlElement{ name='note'}) ->
+    ["<p class=\"note\">"
+     "<b>NOTE: </b>",
+     xslapply( fun template/1, E),
+     "</p>"];
+
+template(E = #xmlElement{ name='emph'}) ->
+    ["<em>", xslapply( fun template/1, E), "</em>"];
+
+template(E)->
+    built_in_rules( fun template/1, E).
+ ]]>
+      </programlisting>
+      <para>
+	It is important to end with a call to
+	<computeroutput>xmerl_xs:built_in_rules/2</computeroutput>
+	if you want any text to be written in "push" transforms. 
+	That are the ones using a lot <computeroutput>xslapply( fun
+	template/1, E )</computeroutput> instead of
+	<computeroutput>value_of(select("xpath",E))</computeroutput>,
+	which is pull...
+      </para>
+    </example>
+<para>The largest example is the stylesheet to transform this document
+	from the Simplified Docbook XML format to xhtml. The source
+	file is <computeroutput>sdocbook2xhtml.erl</computeroutput>.
+</para>
+</section>
+  <section>
+    <title>Tips and tricks</title>
+      <section>
+	<title>for-each</title>
+	<para>The function for-each is quite common in XSLT stylesheets.
+	  It can often be rewritten and replaced by select/1. Since
+	select/1 returns a list of #xmlElements and xslapply/2
+	traverses them it is more or less the same as to loop over all
+	the elements. 
+	</para>
+      </section>
+      <section>
+	<title>position()</title>
+	<para>The XSLT position() and #xmlElement.pos are not the
+	same. One has to make an own position in Erlang.</para>
+	<example>
+	  <title>Counting positions</title>
+	  <programlisting>
+<![CDATA[
+<xsl:template match="stanza">
+  <p><xsl:apply-templates select="line" /></p>
+</xsl:template>
+
+<xsl:template match="line">
+  <xsl:if test="position() mod 2 = 0">&#160;&#160;</xsl:if>
+  <xsl:value-of select="." /><br />
+</xsl:template>
+ ]]>
+	  </programlisting>
+<para>Can be written as</para>
+	  <programlisting>
+<![CDATA[
+template(E = #xmlElement{name='stanza'}) ->
+    {Lines,LineNo} = lists:mapfoldl(fun template_pos/2, 1, select("line", E)),
+    ["<p>", Lines, "</p>"].
+
+template_pos(E = #xmlElement{name='line'}, P) ->
+    {[indent_line(P rem 2), value_of(E#xmlElement.content), "<br />"], P + 1 }.
+
+indent_line(0)->"&#160;&#160;";
+indent_line(_)->"".
+ ]]>
+	  </programlisting>
+	</example>
+      </section>
+      <section>
+	<title>Global tree awareness</title>
+	<para>In XSLT you have "root" access to the top of the tree
+	with XPath, even though you are somewhere deep in your
+	tree.</para>
+	<para>The xslapply/2 function only carries back the child part
+	  of the tree to the template fun. But it is quite easy to write
+	  template funs that handles both the child and top tree.</para>
+	<example>
+	  <title>Passing the root tree</title>
+	  <para>The following example piece will prepend the article 
+	    title to any section title</para>
+	  <programlisting>
+<![CDATA[
+template(E = #xmlElement{name='title'}, ETop ) ->
+    ["<h3>", value_of(select("title", ETop))," - ",
+     xslapply( fun(A) -> template(A, ETop) end, E),
+     "</h3>"];
+ ]]>
+	  </programlisting>
+	</example>
+      </section>
+    </section>
+
+  </section>
+  
+
+  <section>
+    <title>Utility functions</title>
+    <para>
+      The module xmerl_xs contains the functions 
+      <computeroutput>mapxml/2, foldxml/3</computeroutput> and 
+      <computeroutput> mapfoldxml/3</computeroutput> to traverse 
+      <literal>#xmlElement</literal> trees. They can be used in order
+      to build cross-references, see sdocbook2xhtml.erl for instance
+      where <computeroutput>foldxml/3</computeroutput> and
+      <computeroutput> mapfoldxml/3</computeroutput> are used to 
+      number chapters, examples and figures and to build the Table of
+      contents for the document.
+    </para>
+  </section>
+
+
+  <section>
+    <title>Future enhancements</title>
+    <para>
+      More wish- than task-list at the moment.
+    </para>
+    <itemizedlist>
+      <listitem>
+	<para>More stylesheets</para>
+      </listitem>
+      <listitem>
+	<para>On the fly exports to PDF for printing and also more 
+	  "polished" presentations.
+	</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section>
+    <title>References</title>
+    <orderedlist>
+      <listitem>
+	<para><ulink url="../xml/xmerl_xs.xml" >XML source
+	file</ulink> for this document.
+	</para>
+      </listitem>
+      <listitem>
+	<para><ulink url="../xs/sdocbook2xhtml.erl" >Erlang style
+	sheet</ulink> used for this document. (Simplified Docbook DTD).</para>
+      </listitem>
+      <listitem>
+	    <para><ulink url="http://www.erlang.org/" >Open Source Erlang</ulink>
+    </para>
+      </listitem>
+    </orderedlist>
+
+  </section>
+</article>
+
+<!-- 
+Local Variables:
+mode: xml
+sgml-indent-step: 2
+sgml-indent-data: t
+sgml-set-face: t
+sgml-insert-missing-element-comment: nil
+End:
+--> 
diff --git a/lib/xmerl/doc/examples/xserl_test.erl b/lib/xmerl/doc/examples/xserl_test.erl
new file mode 100644
index 0000000000..69db75cfe8
--- /dev/null
+++ b/lib/xmerl/doc/examples/xserl_test.erl
@@ -0,0 +1,85 @@
+-module(xserl_test).
+-include("xmerl.hrl").
+-import(xserl,[ xslapply/2, value_of/1, select/2, built_in_rules/2 ]).
+-export([process_xml/1,test/0]).
+
+doctype()->
+    "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\
+ \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd \">".
+
+test() ->
+    Str=    "<?xml version=\"1.0\"?>"
+	"<doc xmlns='urn:loc.gov:books' xmlns:isbn='urn:ISBN:0-395-36341-6'>"
+	"<title>Cheaper by the Dozen</title>"
+	"<isbn:number>1568491379</isbn:number>"
+	"<note>"
+	"<!-- make HTML the default namespace for some commentary -->"
+	"<p xmlns='urn:w3-org-ns:HTML'>"
+	"This is a <i>funny</i> book!"
+	"</p>"
+	"</note>"
+	"</doc>",
+    {Doc,_}=xmerl_scan:string(Str,[{fetch_fun, fun(DTDSpec,S) -> {ok,S} end}]),
+
+    process_xml(Doc).
+    
+process_xml(Doc)->
+	template(Doc).
+
+template(E = #xmlElement{name='doc'})->
+    [ "<\?xml version=\"1.0\" encoding=\"iso-8859-1\"\?>",
+      doctype(),
+      "<html xmlns=\"http://www.w3.org/1999/xhtml\" >"
+      "<head>"
+      "<title>", xserl:value_of(select("title",E)), "</title>"
+      "</head>"
+      "<body>",
+      xslapply( fun template/1, E),
+      "</body>"
+      "</html>" ];
+
+
+template(E = #xmlElement{ parents=[{'doc',_}|_], name='title'}) ->
+    ["<h1>",
+%%     xslapply( fun template/1, E),
+%%   same as
+     lists:map( fun template/1, E#xmlElement.content ),
+     "</h1>"];
+
+template(E = #xmlElement{ parents=[{'chapter',_}|_], name='title'}) ->
+    ["<h2>",
+     xslapply( fun template/1, E),
+     "</h2>"];
+
+template(E = #xmlElement{ parents=[{'section',_}|_], name='title'}) ->
+    ["<h3>",
+     xslapply( fun template/1, E),
+     "</h3>"];
+
+template(E = #xmlElement{ name='para'}) ->
+    ["<p>",
+     xslapply( fun template/1, E),
+     "</p>"];
+
+template(E = #xmlElement{ name='note'}) ->
+    ["<p class=\"note\">"
+     "<b>NOTE: </b>",
+     xslapply( fun template/1, E),
+     "</p>"];
+
+template(E = #xmlElement{ name='emph'}) ->
+    ["<em>",
+     xslapply( fun template/1, E),
+     "</em>"];
+
+template(E)->
+    built_in_rules( fun template/1, E).
+
+%% It is important to end with a call to xserl:built_in_rules/2
+%% if you want any text to be written in "push" transforms.
+%% That are the ones using a lot xslapply( fun template/1, E )
+%% instead of value_of(select("xpath",E)), which is pull...
+%% Could maybe be caught as an exception in xslapply instead,
+%% but I think that could degrade performance - having an
+%% exception for every #xmlText element.
+
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 8542435456..654bbbc05d 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/xmerl/src/xmerl_sax_parser.erl b/lib/xmerl/src/xmerl_sax_parser.erl
index eb9f8deec6..571feabee0 100644
--- a/lib/xmerl/src/xmerl_sax_parser.erl
+++ b/lib/xmerl/src/xmerl_sax_parser.erl
@@ -263,11 +263,11 @@ detect_charset_1(<<16#3C, 16#3F, 16#78, 16#6D, 16#6C, Xml2/binary>> = Xml, State
 			    {Xml, State#xmerl_sax_parser_state{encoding=Enc}}
 		    end;
 		_ ->
-		    {Xml, State#xmerl_sax_parser_state{encoding=utf8}}
+		    {Xml, State}
 	    end
     end;
 detect_charset_1(Xml, State) ->
-    {Xml, State#xmerl_sax_parser_state{encoding=utf8}}.
+    {Xml, State}.
 
 %%----------------------------------------------------------------------
 %% Function: convert_encoding(Enc)
@@ -278,6 +278,7 @@ detect_charset_1(Xml, State) ->
 convert_encoding(Enc) -> %% Just for 7,8 bit + utf8
     case string:to_lower(Enc) of
 	"utf-8" -> utf8;
+	"us-ascii" -> utf8;
 	"iso-8859-1" -> latin1; % Handle all iso-8859 as latin1
 	"iso-8859-2" -> latin1;
 	"iso-8859-3" -> latin1;
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index e07d495fc7..22eb641a02 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -102,6 +102,7 @@
 %%    declaration. </dd>
 %% </dl>
 
+
 -module(xmerl_scan).
 -vsn('0.20').
 -date('03-09-16').
@@ -2283,8 +2284,16 @@ scan_att_chars("&" ++ T, S0, Delim, Acc, TmpAcc,AT,IsNorm) -> % Reference
 	true ->
 	    scan_att_chars(T1,S1,Delim,[ExpRef|Acc],[ExpRef|TmpAcc],AT,IsNorm);
 	_ ->
-	    scan_att_chars(string_to_char_set(S#xmerl_scanner.encoding,ExpRef)
-			   ++ T1, S1, Delim, Acc,TmpAcc, AT,IsNorm)
+            Ch = string_to_char_set(S#xmerl_scanner.encoding, ExpRef),
+            case T of
+                "#" ++ _ ->
+                    %% normalization rules (sec 3.3.3) require that for
+                    %% character references, the referenced character be
+                    %% added directly to the normalized value
+                    scan_att_chars(T1, S1, Delim, Ch ++ Acc,TmpAcc, AT,IsNorm);
+                _ ->
+                    scan_att_chars(Ch ++ T1, S1, Delim, Acc,TmpAcc, AT,IsNorm)
+            end
     end;
 scan_att_chars("<" ++ _T, S0, _Delim, _Acc,_, _,_) -> % Tags not allowed here
     ?fatal(unexpected_char, S0);
@@ -3909,7 +3918,7 @@ schemaLocations(#xmlElement{attributes=Atts,xmlbase=_Base}) ->
     case lists:dropwhile(Pred,Atts) of
 	[#xmlAttribute{value=Paths}|_] ->
 	    
-	    case string:tokens(Paths," ") of
+	    case string:tokens(Paths," \n\t\r") of
 		L when length(L) > 0 ->
 		    case length(L) rem 2 of
 			0 ->
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index c0923520c2..1f0793bc58 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -2420,8 +2420,8 @@ validate_xml(XMLEl=#xmlElement{},SEl=#schema_element{},S) ->
 %% 2 often
 check_element_type(XML=[XMLTxt=#xmlText{}|Rest],CM=[CMEl|CMRest],Env,
 		   Block,S,Checked) ->
-    %% XMLTxt ��r det f��rsta av content i element,
-    %% CMEl ��r den till��tna typen enligt schemat
+    %% XMLTxt is the first part of the elements content,
+    %% CMEl is the allowed type according to the schema
     case is_whitespace(XMLTxt) of
 	true -> %% Ignore XMLEl
 	    check_element_type(Rest,CM,Env,Block,S,[XMLTxt|Checked]);
@@ -2453,7 +2453,7 @@ check_element_type(XML=[#xmlElement{}|_],[{choice,{CM,Occ}}|_CMRest],
 check_element_type(XML=[#xmlElement{}|_],[{all,{CM,Occ}}|_CMRest],
 		   Env,_Block,S,Checked) ->
     ?debug("calling choice/6~n",[]),
-    check_all(XML,CM,Occ,Env,S,Checked,XML);
+    check_all(XML,CM,Occ,Env,set_num_el(S,0),Checked,XML); %%LTH
 %% 3 often. CMEL may be ((simpleType | complexType)?, (unique | key | keyref)*))
 check_element_type(XML=[XMLEl=#xmlElement{}|_],[CMEl|CMRest],Env,
 		   Block,S,Checked) ->
@@ -2921,7 +2921,7 @@ schemaLocations(El=#xmlElement{attributes=Atts},S) ->
 	[] ->
 	    S;
 	[#xmlAttribute{value=Paths}|_] ->
-	    case string:tokens(Paths," ") of
+	    case string:tokens(Paths," \n\t\r") of
 		L when length(L) > 0 ->
 		    case length(L) rem 2 of
 			0 ->
@@ -3393,8 +3393,12 @@ qualified_node_set(Paths,[QN|QNs],El,S,Acc) ->
 		  end
 	  end,
     {KeySequence,S2} = mapfoldl(Fun,S,Paths),
-    qualified_node_set(Paths,QNs,El,S2,[flatten(KeySequence)|Acc]).
-
+    case flatten(KeySequence) of
+	[] ->
+	    qualified_node_set(Paths,QNs,El,S2,Acc);
+	KS ->
+	    qualified_node_set(Paths,QNs,El,S2,[KS|Acc])
+    end.
 
 apply_field(F,El,S) ->
     %% xmerl_xpath:string returns a list
diff --git a/lib/xmerl/src/xmerl_xsd_type.erl b/lib/xmerl/src/xmerl_xsd_type.erl
index 19951f030f..9352f4185d 100644
--- a/lib/xmerl/src/xmerl_xsd_type.erl
+++ b/lib/xmerl/src/xmerl_xsd_type.erl
@@ -612,7 +612,7 @@ check_NMTOKEN2([H|T]) ->
     check_NMTOKEN2(T).
 
 check_NMTOKENS(Value) ->
-    TokList = string:tokens(Value," "),
+    TokList = string:tokens(Value," \n\t\r"),
     lists:foreach(fun check_NMTOKEN/1,TokList),
     {ok,Value}.
 
@@ -645,7 +645,7 @@ check_ENTITIES(Value) ->
     check_list_type(Value,fun check_ENTITY/1).
 
 check_list_type(Value,BaseTypeFun) ->
-    Tokens = string:tokens(Value," "),
+    Tokens = string:tokens(Value," \n\t\r"),
     lists:foreach(BaseTypeFun,Tokens),
     {ok,Value}.
 
diff --git a/lib/xmerl/test/Makefile b/lib/xmerl/test/Makefile
new file mode 100644
index 0000000000..0f8cd88c13
--- /dev/null
+++ b/lib/xmerl/test/Makefile
@@ -0,0 +1,127 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2004-2010. 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%
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Common Macros
+# ----------------------------------------------------
+
+include ../vsn.mk
+VSN = $(XMERL_VSN)
+
+RM = rm -f
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+HRL_DIR= $(ERL_TOP)/lib/xmerl/include/
+HRL_MODULES= $(HRL_DIR)xmerl $(HRL_DIR)xmerl_xsd
+HRL_FILES= $(HRL_MODULES:%=%.hrl)
+
+
+MODULES= \
+	xmerl_test \
+	xmerl_app_test \
+	xmerl_appup_test \
+	xmerl_test_lib \
+	xmerl_xsd_lib
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+SUITE_FILES= \
+	xmerl_SUITE.erl \
+	xmerl_std_SUITE.erl \
+	xmerl_sax_SUITE.erl \
+	xmerl_sax_std_SUITE.erl \
+	xmerl_xsd_SUITE.erl \
+	xmerl_xsd_MS2002-01-16_SUITE.erl \
+	xmerl_xsd_NIST2002-01-16_SUITE.erl \
+	xmerl_xsd_Sun2002-01-16_SUITE.erl
+
+XML_FILES= \
+	testcases.dtd \
+	xmlconformance.msxsl \
+	xmlconformance.xsl
+
+
+TARGET_FILES= $(MODULES:%=%.$(EMULATOR))
+
+
+INSTALL_PROGS= $(TARGET_FILES)
+
+ifndef XMERL_PRESERV
+XMERL_PRESERV_TEST_DIRS=
+else
+XMERL_PRESERV_TEST_DIRS= -Ddont_rm_test_dirs
+endif
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+
+RELSYSDIR = $(RELEASE_PATH)/xmerl_test
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+
+#ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include -I$(ERL_TOP)/lib/xmerl/include/ $(XMERL_PRESERV_TEST_DIRS)
+
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+tests debug opt:  xmerl_test.erl
+
+info:
+	@echo "HRL_FILES: $(HRL_FILES)"
+
+clean:
+	$(RM) *.beam
+	$(RM) xmerl_test.erl
+	$(RM) core *~
+
+xmerl_test.erl: ../doc/examples/xmerl_test.erl
+	cp $< $@
+	chmod u+w $@
+
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+
+release_tests_spec: opt
+	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA)  $(SUITE_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) xmerl.spec xmerl.cover $(RELSYSDIR)
+	cp $(XML_FILES) $(RELSYSDIR)
+	@tar cfh - xmerl_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	@tar cfh - xmerl_std_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	@tar cfh - xmerl_xsd_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	@tar cfh - xmerl_xsd_MS2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	@tar cfh - xmerl_xsd_NIST2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	@tar cfh - xmerl_xsd_Sun2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	chmod -f -R u+w $(RELSYSDIR)
diff --git a/lib/xmerl/test/ReadMe b/lib/xmerl/test/ReadMe
new file mode 100644
index 0000000000..effcff6fc4
--- /dev/null
+++ b/lib/xmerl/test/ReadMe
@@ -0,0 +1,24 @@
+
+W3C conformance tests
+=====================
+
+The xmerl tests contains a large number of conformance tests from W3C, which are located in the following 
+directories.
+
+xmerl_std_SUITE_data:
+  These tests are fetched from http://www.w3.org/XML/Test/ and repackaged as four tgz files.
+  The W3C Copyright notice is located in the file xmerl_std_SUITE_data/w3c-copyright-19980720.html.
+
+xmerl_xsd_MS2002-01-16_SUITE_data:
+  These tests are fetched from http://www.w3.org/XML/2004/xml-schema-test-suite/index.html
+  The W3C Copyright notice is located in the file xmerl_xsd_MS2002-01-16_SUITE_data/w3c-copyright-19990405.html.
+
+xmerl_xsd_NIST2002-01-16_SUITE_data:
+  These tests are fetched from http://www.w3.org/XML/2004/xml-schema-test-suite/index.html
+  The W3C Copyright notice is located in the file xmerl_xsd_NIST2002-01-16_SUITE_data/w3c-copyright-19990405.html.
+
+xmerl_xsd_Sun2002-01-16_SUITE_data:
+  These tests are fetched from http://www.w3.org/XML/2004/xml-schema-test-suite/index.html
+  The W3C Copyright notice is located in the file xmerl_xsd_Sun2002-01-16_SUITE_data/w3c-copyright-19990405.html.
+
+
diff --git a/lib/xmerl/test/testcases.dtd b/lib/xmerl/test/testcases.dtd
new file mode 100644
index 0000000000..448d362991
--- /dev/null
+++ b/lib/xmerl/test/testcases.dtd
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    @(#)testcases.dtd	1.6 99/01/21

+    Original version copyright 1998 by Sun Microsystems, Inc.

+    All Rights Reserved.

+    Modifications copyright 1999 by OASIS.

+

+    1999-06-09 00:20

+

+    DTD describing a database of XML tests.

+

+    NOTE:  the OASIS/NIST test effort also has a DTD for its test

+    environment, but that DTD is not yet suited for automated test

+    processing.  (Among other issues, it doesn't record information

+    putting any test case into the test matrix.)  If that gets fixed,

+    it may be useful to switch over to that DTD.

+-->

+

+<!--

+    The root element of the whole collection is TESTSUITE.  While not

+    very different from TESTCASES, it must be distinguished due to

+    improper processing by IE5.

+-->

+<!ELEMENT TESTSUITE ( TESTCASES+ )>

+<!ATTLIST TESTSUITE 

+    PROFILE	CDATA		#IMPLIED

+    >

+

+<!--

+    The root element of a collection should be "TESTCASES".  It groups 

+    a set of tests in a particular "PROFILE", which is descriptive.  For

+    example, a "Japanese" profile might group tests with documents

+    in standard Japanese encodings, using Japanese characters used

+    inside names and name tokens as well as inside text.  Or the

+    profile might be associated with the test supplier.

+-->

+

+<!ELEMENT TESTCASES (TEST|TESTCASES)*>

+<!ATTLIST TESTCASES

+    PROFILE	CDATA		#IMPLIED

+    >

+

+<!--

+    The body of each TEST element is its description, used

+    to evaluate the diagnostic produced on negative tests.

+    People will generally read this to evaluate whether the

+    test failed for the correct reason.

+

+    The type of (external) ENTITIES required affect the results

+    permitted for certain types of nonvalidating parsers.  In

+    some cases, errors (even well-formedness errors) can't be seen

+    without reading external parameter or general entities.

+

+    Each test has a unique ID used in diagnostics.

+

+    Tests with an OUTPUT attribute do dual duty:  not only must parsers

+    accept the test, but the data they report must also have "Second

+    Canonical Form" as found in the specified output file.  (This is

+    what James Clark titled "Canonical XML", with the addition of the

+    NOTATION declarations that all XML parsers are required to report.)

+

+    The OUTPUT3 attribute is like OUTPUT, but when sent through a

+    validating parser the data reported must have the "Third Canonical

+    Form" as found in the specified output file.  (This is Second

+    Canonical form, with declarations of unparsed ENTITY values and

+    with all ignorable whitespace removed.)

+

+    Tests apply to one or more particular SECTIONS.

+

+    Each test has a TYPE:

+    * All parsers must accept "valid" testcases.

+    * Nonvalidating parsers must also accept "invalid" testcases,

+      but validating ones must reject them.

+    * No parser should accept a "not-wf" testcase unless it's a

+      nonvalidating parser and the test contains external entities

+      that the parser doesn't read.

+    * Parsers are not required to report "errors".

+

+    Each test is in a particular XML document, with a URI.  If these

+    tests are accessed over a network, the path will be relative to

+    the base URI of the document holding the testcase.

+-->

+

+<!ELEMENT TEST (#PCDATA | EM | B)*>

+<!ATTLIST TEST

+    ENTITIES    (both|none|parameter|general)   "none"

+    ID          ID                              #REQUIRED

+    OUTPUT	CDATA				#IMPLIED

+    OUTPUT3	CDATA				#IMPLIED

+    SECTIONS    CDATA                           #REQUIRED

+    TYPE        (valid|invalid|not-wf|error)    #REQUIRED

+    URI         CDATA                           #REQUIRED

+    NAMESPACE   (yes|no)			"yes"
+    >

+

+<!--

+    Really basic HTML font tweaks, to support highlighting

+    some aspects of test descriptions ...

+    EM == emphasis (e.g. italics, fun colors)

+    B == bold

+-->

+<!ELEMENT EM (#PCDATA | B)*>

+<!ELEMENT B (#PCDATA | EM)*>

diff --git a/lib/xmerl/test/xmerl.cover b/lib/xmerl/test/xmerl.cover
new file mode 100644
index 0000000000..d0155946ea
--- /dev/null
+++ b/lib/xmerl/test/xmerl.cover
@@ -0,0 +1,2 @@
+{incl_app,xmerl,details}.
+
diff --git a/lib/xmerl/test/xmerl.spec b/lib/xmerl/test/xmerl.spec
new file mode 100644
index 0000000000..89ab31c755
--- /dev/null
+++ b/lib/xmerl/test/xmerl.spec
@@ -0,0 +1 @@
+{suites,"../xmerl_test",all}.
diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
new file mode 100644
index 0000000000..9b65232fe7
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -0,0 +1,634 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2010. 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%
+%%
+%%
+%%% Purpose : Test suite for the ASN.1 application
+
+-module(xmerl_SUITE).
+
+-compile(export_all).
+
+%%----------------------------------------------------------------------
+%% Include files
+%%----------------------------------------------------------------------
+-include_lib("test_server/include/test_server.hrl").
+%%-include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
+-include_lib("kernel/include/file.hrl").
+
+
+%%======================================================================
+%% Tests
+%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Test groups
+%%----------------------------------------------------------------------
+all() -> 
+    [{group, cpd_tests}, xpath_text1, xpath_main,
+     xpath_abbreviated_syntax, xpath_functions,
+     {group, misc}, {group, eventp_tests},
+     {group, ticket_tests}, {group, app_test},
+     {group, appup_test}].
+
+groups() -> 
+    [{cpd_tests, [],
+      [cpd_invalid1, cpd_invalid1_index, cpd_invalid2_index,
+       cpd_invalid_index3, cpd_invalid_is_layer,
+       cpd_expl_provided_DTD]},
+     {misc, [],
+      [latin1_alias, syntax_bug1, syntax_bug2, syntax_bug3,
+       pe_ref1, copyright, testXSEIF, export_simple1, export]},
+     {eventp_tests, [], [sax_parse_and_export]},
+     {ticket_tests, [],
+      [ticket_5998, ticket_7211, ticket_7214, ticket_7430,
+       ticket_6873, ticket_7496, ticket_8156, ticket_8697]},
+     {app_test, [], [{xmerl_app_test, all}]},
+     {appup_test, [], [{xmerl_appup_test, all}]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+%%----------------------------------------------------------------------
+%% Initializations
+%%----------------------------------------------------------------------
+init_per_suite(doc) ->
+    ["Starts the test suite"];
+init_per_suite(Config) ->
+    Dog=test_server:timetrap({minutes,10}),
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line ok=erl_tar:extract("cpd.tar.gz",[compressed]),
+    ?line ok=erl_tar:extract("misc.tar.gz",[compressed]),
+    ?line ok = change_mode(["cpd", "misc"]),
+    ?line file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    TestServerIncludeDir=filename:join(filename:dirname(code:priv_dir(test_server)), "include"),
+    ?line {ok, xpath_lib} = compile:file(xpath_lib, [{i, TestServerIncludeDir}]),
+    ?line {ok, xpath_text} = compile:file(xpath_text, [{i, TestServerIncludeDir}]),
+    ?line {ok, xpath_abbrev} = compile:file(xpath_abbrev, [{i, TestServerIncludeDir}]),
+    [{watchdog, Dog}|Config].
+
+
+-ifndef(dont_rm_test_dirs).
+end_per_suite(doc) ->
+    ["Stops the test suite"];
+end_per_suite(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line ok=rm_files(["cpd", "misc"]),
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    lists:keydelete(watchdog,1,Config).
+
+-else.
+end_per_suite(doc) ->
+    ["Stops the test suite"];
+end_per_suite(Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    lists:keydelete(watchdog,1,Config).
+-endif.
+
+
+%% initialization before each testcase
+init_per_testcase(_TestCase,Config) ->
+    io:format("Config:~n~p",[Config]),
+    ?line {ok, _} = file:read_file_info(filename:join([?config(priv_dir,Config)])),
+    ?line code:add_patha(?config(priv_dir,Config)),
+    Dog=test_server:timetrap({minutes,10}),
+    [{watchdog, Dog}|Config].
+
+
+%% clean up after each testcase
+end_per_testcase(_Func,Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+
+%%----------------------------------------------------------------------
+%% Test cases
+%%----------------------------------------------------------------------
+cpd_invalid1(suite) -> [];
+cpd_invalid1(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line case catch xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"cpd_test.xml"]),[]) of
+	      {'EXIT',{fatal,Reason}} ->
+		  case Reason of
+		      {expected_markup,_Path,28,32} -> ok;
+		      _ -> {comment,"parsing changed behaviour"}
+		  end
+	  end.
+
+cpd_invalid1_index(suite) -> [];
+cpd_invalid1_index(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line case catch xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"cpd_index.xml"]),[]) of
+	      {'EXIT',{fatal,Reason}} ->
+		  case Reason of
+		      {{error,{whitespace_was_expected}},_Path,1,19} -> ok;
+		      _ -> {comment,"parsing changed behaviour"}
+		  end
+	  end.
+
+cpd_invalid2_index(suite) -> [];
+cpd_invalid2_index(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line case catch xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"cpd_index2.xml"]),[]) of
+	      {'EXIT',{fatal,Reason}} ->
+		  case Reason of
+		      {{invalid_target_name,_Ver},_Path,2,3} ->ok;
+		      _ -> {comment,"parsing changed behaviour"}
+		  end
+	  end.
+
+cpd_invalid_index3(suite) -> [];
+cpd_invalid_index3(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line case catch xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"cpd_index3.xml"]),[]) of
+	      {'EXIT',{fatal,Reason}} ->
+		  case Reason of
+		      {expected_markup,_Path,1,2} -> ok;
+		      _ -> {comment,"parsing changed behaviour"}
+		  end
+	  end.
+
+cpd_invalid_is_layer(suite) -> [];
+cpd_invalid_is_layer(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line case catch xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"is_layer2.xml"]),[]) of
+	      {'EXIT',{fatal,_Reason}} -> ok
+	  end.
+
+cpd_expl_provided_DTD(suite) -> [];
+cpd_expl_provided_DTD(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line {#xmlElement{},[]} = xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"file_wo_DTD.xml"]),[{validation,true},{doctype_DTD,"separate_DTD.dtd"}]).
+
+%%----------------------------------------------------------------------
+
+xpath_text1(suite) -> [];
+xpath_text1(Config) ->
+    ?line file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    ?line ok = xpath_text:one().
+
+xpath_main(suite) -> [];
+xpath_main(Config) ->
+    ?line file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    ?line ok = xpath_lib:test().
+
+xpath_abbreviated_syntax(suite) -> [];
+xpath_abbreviated_syntax(Config) ->
+    ?line file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    ?line ok = xpath_abbrev:test().
+
+xpath_functions(suite) -> [];
+xpath_functions(Config) ->
+    ?line file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    ?line ok = xpath_abbrev:functions().
+
+%%----------------------------------------------------------------------
+
+latin1_alias(suite) -> [];
+latin1_alias(Config) ->
+%    ?line file:set_cwd(filename:join(?config(data_dir,Config),misc)),
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line {_Elements,[]}=
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       misc,"motorcycles.xml"]),
+			[{validation,true},
+			 {encoding,'iso-8859-1'}]).
+
+syntax_bug1(suite) -> [];
+syntax_bug1(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line {fatal,{"expected one of: ?>, standalone, encoding",
+		  {file,'misc/syntax_bug1.xml'},{line,1},{col,21}}} =
+	case catch xmerl_scan:file('misc/syntax_bug1.xml') of
+	    {'EXIT',Reason} ->
+		Reason;
+	    Err -> Err
+	end.
+
+syntax_bug2(suite) -> [];
+syntax_bug2(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line {fatal,{"expected one of: ?>, whitespace_character",
+		  {file,'misc/syntax_bug2.xml'},{line,1},{col,20}}} =
+	case catch xmerl_scan:file('misc/syntax_bug2.xml') of
+	    {'EXIT',Reason} ->
+		Reason;
+	    Err -> Err
+	end.
+
+syntax_bug3(suite) -> [];
+syntax_bug3(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line {fatal,{{endtag_does_not_match,{was,obj,should_have_been,int}},
+			  {file,'misc/syntax_bug3.xml'},{line,4},{col,3}}} =
+	case catch xmerl_scan:file('misc/syntax_bug3.xml') of
+	    {'EXIT',Reason} ->
+		Reason;
+	    Err -> Err
+	end.
+
+pe_ref1(suite) -> [];
+pe_ref1(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line {#xmlElement{},[]} = xmerl_scan:file(filename:join([?config(data_dir,Config), misc,"PE_ref1.xml"]),[{validation,true}]).
+
+copyright(suite) -> [];
+copyright(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line {#xmlElement{},[]} = xmerl_scan:file(filename:join([?config(data_dir,Config), misc,"cprght.xml"]),[{validation,true}]).
+
+testXSEIF(suite) -> [];
+testXSEIF(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line {#xmlElement{},[]} = xmerl_scan:file(filename:join([?config(data_dir,Config), misc,"ReplBoard_1_1543-CNA11313Uen.xml"]),[{validation,true}]).
+
+export_simple1(suite) -> [];
+export_simple1(Config) ->
+    Simple = simple(),
+    Res = xmerl:export_simple(Simple,xmerl_xml,[{title, "Doc Title"}]),
+    ?line "<?xml version="++_ = lists:flatten(Res),
+
+    %% Use of fun in simple content OTP-6679
+    Simple2 = simple2(),
+    Res2 = xmerl:export_simple(Simple2,xmerl_xml,[{title,"Doc Title"}]),
+    ?line true = (Res2 =:= Res),
+    ok.
+
+export(suite) -> [];
+export(Config) ->
+    DataDir = ?config(data_dir,Config),
+    Prolog = ["<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<!DOCTYPE motorcycles SYSTEM \"motorcycles.dtd\">\n"],
+    TestFile = filename:join([DataDir,"misc","motorcycles.xml"]),
+    ?line {E,_} = xmerl_scan:file(TestFile),
+    ?line Exported = xmerl:export([E],xmerl_xml,[{prolog,Prolog}]),
+    B = list_to_binary(Exported++"\n"),
+    ?line {ok,B} = file:read_file(TestFile),
+    ok.
+
+%%----------------------------------------------------------------------
+
+sax_parse_and_export(suite) -> [];
+sax_parse_and_export(Config) ->
+    ?line ok = sax_parse_export_xml_big(Config),
+    ?line ok = sax_parse_export_xml_small(Config).
+
+%%----------------------------------------------------------------------
+
+sax_parse_export_xml_big(Config) ->
+    DataDir = ?config(data_dir,Config),
+    OutDir = ?config(priv_dir,Config),
+    io:format("DataDir: ~p~n,OutDir:~p~n",[DataDir,OutDir]),
+    CMOMxml = filename:join([DataDir,"eventp","CMOM.xml"]),
+    ?line {Ex,[]} = xmerl_eventp:file_sax(CMOMxml, xmerl_xml,[],[]),
+    OutFile = filename:join([OutDir,"cmom"]),
+    file:delete(OutFile),
+    StubFile = filename:join([DataDir,"eventp","CelloMOM.stub"]),
+    ?line {ok,Bin} = file:read_file(StubFile),
+    ?line {ok,IO} = file:open(OutFile,[write,append]),
+    ?line ok = file:write(IO,Bin),
+    ?line ok = io:format(IO,"~s~n~n",[lists:flatten(Ex)]),
+    Cmd = lists:flatten(io_lib:format("cmp ~s ~s",[OutFile,CMOMxml])),
+    ?line [] = os:cmd(Cmd),
+    ok.
+
+sax_parse_export_xml_small(Config) ->
+    DataDir = ?config(data_dir,Config),
+    OutDir = ?config(priv_dir,Config),
+    Wurfl_xml = filename:join([DataDir,"eventp","wurfl.xml"]),
+    ?line {Ex,[]} = xmerl_eventp:file_sax(Wurfl_xml, xmerl_xml,[],[]),
+    OutFile = filename:join([OutDir,"wrfl"]),
+    file:delete(OutFile),
+    StubFile = filename:join([DataDir,"eventp","wurfl.stub"]),
+    ?line {ok,Bin} = file:read_file(StubFile),
+    ?line {ok,IO} = file:open(OutFile,[write,append]),
+    ?line ok = file:write(IO,Bin),
+    ?line ok = io:format(IO,"~s~n",[lists:flatten(Ex)]),
+    Cmd = lists:flatten(io_lib:format("cmp ~s ~s",[OutFile,Wurfl_xml])),
+    ?line [] = os:cmd(Cmd),
+    ok.
+
+
+simple() ->
+    [{document, 
+      [{title, "Doc Title"}, {author, "Ulf Wiger"}],
+      [{section, 
+	[{heading, "heading1"}],
+	[{'P', ["This is a paragraph of text."]},
+	 {section, 
+	  [{heading, "heading2"}],
+	  [{'P', ["This is another paragraph."]},
+	   {table, 
+	    [{border, 1}],
+	    [{heading,
+	      [{col, ["head1"]},
+	       {col, ["head2"]}]},
+	     {row,
+	      [{col, ["col11"]},
+	       {col, ["col12"]}]},
+	     {row,
+	      [{col, ["col21"]},
+	       {col, ["col22"]}]}]}]}]}]}].
+
+
+simple2() ->
+    GenC = fun ?MODULE:generate_section/1,
+    GenA = fun ?MODULE:generate_attr_title/1,
+    [{document,[{GenA,2}],[{GenC,1}]}].
+
+generate_attr_title(0) ->
+    done;
+generate_attr_title(1) ->
+    {{title,"Doc Title"},0};
+generate_attr_title(2) ->
+    {{author, "Ulf Wiger"},1}.
+generate_section(0) ->
+    done;
+generate_section(N) ->
+    GenC = fun ?MODULE:generate_section_content/1,
+    GenA = fun ?MODULE:generate_section_attribute/1,
+    {{section,[{GenA,1}],[{GenC,2}]},N-1}.
+
+generate_section_attribute(0) ->
+    done;
+generate_section_attribute(N) ->
+    {{heading, "heading1"},N-1}.
+
+    
+generate_subsection_content(0) ->
+    done;
+generate_subsection_content(1) ->
+    {{'P',["This is another paragraph."]},0};
+generate_subsection_content(N) ->
+    {{table,[{fun ?MODULE:generate_border_attribute/1,1}],
+      [{fun ?MODULE:generate_table_content/1,2}]},N-1}.
+generate_section_content(0) ->
+    done;
+generate_section_content(1) ->
+    {{'P',["This is a paragraph of text."]},0};
+generate_section_content(N) ->
+    {{section,[{heading,"heading2"}],
+      [{fun ?MODULE:generate_subsection_content/1,2}]},N-1}.
+generate_border_attribute(0) ->
+    done;
+generate_border_attribute(N) ->
+    {{border,N},N-1}.
+generate_table_content(0) ->
+    done;
+generate_table_content(1) ->
+    {{fun ?MODULE:generate_heading/1,1},0};
+generate_table_content(N) ->
+    {{fun ?MODULE:generate_row/1, {2,2}},N-1}.
+generate_row({0,_}) ->
+    done;
+generate_row(N) ->
+    UpdateS = fun({2,_}) -> {1,2};(_) -> {0,0} end,
+    {{row,[{fun ?MODULE:generate_row_col/1, N}]},UpdateS(N)}.
+generate_row_col({_,0}) ->
+    done;
+generate_row_col(N={C,R}) ->
+    UpdateS = fun({X,Y}) -> {X,Y-1} end,
+    {{col,[lists:concat(["col",C,R])]},UpdateS(N)}.
+generate_heading(0) ->
+    done;
+generate_heading(N) ->
+    {{heading,[{fun ?MODULE:generate_heading_col/1,2}]},N-1}.
+generate_heading_col(0) ->
+    done;
+generate_heading_col(N) ->
+    {{col,[lists:concat(["head",N])]},N-1}.
+
+%%----------------------------------------------------------------------
+%% Ticket Tests
+%%----------------------------------------------------------------------
+
+%%
+%% ticket_5998
+%%
+%% A Kleene Closure child in a sequence consumed all following
+%% childs. This problem has been fixed.
+%%
+ticket_5998(suite) -> [];
+ticket_5998(Config) ->
+    DataDir = ?config(data_dir,Config),
+    %% First fix is tested by case syntax_bug2.
+    
+    ?line case catch xmerl_scan:file(filename:join([DataDir,misc,
+						    "ticket_5998_2.xml"])) of
+	      {'EXIT',{fatal,Reason1}} ->
+		  case Reason1 of
+		      {{endtag_does_not_match,
+			{was,obj,should_have_been,int}},
+		       _,_,_} -> ok;
+		      _ -> {comment,"parsing changed behaviour"}
+		  end
+	  end,
+
+    ?line case catch xmerl_scan:file(filename:join([DataDir,misc,
+						    "ticket_5998_3.xml"])) of
+	      {'EXIT',{fatal,Reason2}} ->
+		  case Reason2 of
+		      {"expected one of: ?>, standalone, encoding",
+		       _,_,_} -> ok;
+		      _ -> {comment,"parsing changed behaviour"}
+		  end
+	  end.    
+
+
+%%
+%% ticket_7211
+%%
+%% A Kleene Closure child in a sequence consumed all following
+%% childs. This problem has been fixed.
+%%
+ticket_7211(suite) -> [];
+ticket_7211(Config) ->
+    DataDir = ?config(data_dir,Config),
+    ?line {E,[]} = 
+	xmerl_scan:file(filename:join([DataDir,misc,"notes2.xml"]),
+			[{fetch_path,[filename:join([DataDir,misc,erlang_docs_dtd])]},
+			 {validation,dtd}]),
+    
+    ?line ok = case E of
+		   Rec when is_record(Rec,xmlElement) ->
+		       ok;
+		   _ ->
+		       E
+	       end,
+		       
+    ?line {E2,[]} = 
+	xmerl_scan:file(filename:join([DataDir,misc,"XS.xml"]),
+			[{fetch_path,[filename:join([DataDir,misc,erlang_docs_dtd])]},
+			 {validation,dtd}]),
+    
+    ?line ok = case E2 of
+		   Rec2 when is_record(Rec2,xmlElement) ->
+		       ok;
+		   _ ->
+		       E2
+	       end.
+
+%%
+%% ticket_7214
+%%
+%% Now validating xhtml1-transitional.dtd.
+%% A certain contentspec with a succeding choice, that didn't match
+%% all content, followed by other child elements caused a
+%% failure. This is now corrected.
+%%
+ticket_7214(suite) -> [];
+ticket_7214(Config) ->
+    DataDir = ?config(data_dir,Config),
+
+    ?line {E,[]} = 
+	xmerl_scan:file(filename:join([DataDir,misc,'block_tags.html']),
+			[{validation,dtd},
+			 {fetch_path,[filename:join([DataDir,misc,erlang_docs_dtd])]}]),
+    
+    ?line ok = case E of
+		   Rec when is_record(Rec,xmlElement) ->
+		       ok;
+		   _ ->
+		       E
+	       end.
+
+%%
+%% ticket_7430
+%%
+%% Problem with contents of numeric character references followed by 
+%% UTF-8 characters..
+%%
+ticket_7430(suite) -> [];
+ticket_7430(Config) ->
+    DataDir = ?config(data_dir,Config),
+
+    ?line {E,[]} = 
+	xmerl_scan:string("<a>\303\251&#xD;\303\251</a>",
+			  [{encoding, 'utf-8'}]),
+
+    ?line ok = case E of
+		   {xmlElement,a,a,[],
+		    {xmlNamespace,[],[]},
+		    [],1,[],
+		    [{xmlText,[{a,1}],1,[],"�",text},
+		     {xmlText,[{a,1}],2,[],"\n�",text}],
+		    [],_,undeclared} ->
+		       ok;
+		   _ ->
+		       E
+	       end.
+
+ticket_6873(suite) -> [];
+ticket_6873(Config) ->
+    ?line file:set_cwd(filename:join(?config(data_dir,Config),xpath)),    
+    ?line ok = xpath_abbrev:ticket_6873(),
+    ?line ok = xpath_lib:ticket_6873().
+
+ticket_7496(suite) -> [];
+ticket_7496(Config) ->
+    ?line file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    ?line ok = xpath_abbrev:ticket_7496().
+
+ticket_8156(suite) -> [];
+ticket_8156(Config) ->
+    ?line {ftp,{[],[]},"testmachine1",21,"/w.erl"} = xmerl_uri:parse("ftp://testmachine1/w.erl"),
+    ?line {ftp,{"user",[]},"testmachine1",21,"/w.erl"} = xmerl_uri:parse("ftp://user@testmachine1/w.erl"),
+    ?line {ftp,{"user","hello"},"testmachine1",21,"/w.erl"} = 
+	xmerl_uri:parse("ftp://user:hello@testmachine1/w.erl"),
+    ?line {ftp,{[],[]},"testmachine1",3000,"/w.erl"} = xmerl_uri:parse("ftp://testmachine1:3000/w.erl"),
+    ?line {ftp,{"user","hello"},"testmachine1",3000,"/w.erl"} = 
+	xmerl_uri:parse("ftp://user:hello@testmachine1:3000/w.erl"),
+    ok.
+
+ticket_8697(suite) -> [];
+ticket_8697(doc) -> 
+    ["Test that xmerl_scan can decode unicode entities properly"];
+ticket_8697(Config) ->
+    ?line {UTF8Output, []} = xmerl_scan:string("<?xml version=\"1\" ?>\n<text>" ++ [229, 145, 156] ++ "</text>"),
+    ?line #xmlElement{content = [#xmlText{value = UTF8Text}]} = UTF8Output,
+    ?line [16#545C] = UTF8Text,
+    ?line {DecEntityOutput, []} = xmerl_scan:string("<?xml version=\"1\" ?>\n<text>&#21596;</text>"),
+    ?line #xmlElement{content = [#xmlText{value = DecEntityText}]} = DecEntityOutput,
+    ?line [21596] = DecEntityText,
+    ?line {HexEntityOutput, []} = xmerl_scan:string("<?xml version=\"1\" ?>\n<text>&#x545C;</text>"),
+    ?line #xmlElement{content = [#xmlText{value = HexEntityText}]} = HexEntityOutput,
+    ?line [16#545C] = HexEntityText,
+    ok.
+
+
+
+
+
+%%======================================================================
+%% Support Functions
+%%======================================================================
+
+%% Dir is a directory
+rm_f_(Dir) ->
+    ?line {ok,CWD} = file:get_cwd(),
+    ?line {ok,FileList} = file:list_dir(Dir),
+    ?line file:set_cwd(filename:join([CWD,Dir])),
+    rm_files(FileList),
+    ?line file:set_cwd(CWD),
+    ? line ok = file:del_dir(Dir).
+
+rm_files([])->
+    ok;
+rm_files([F|Fs]) ->
+    case filelib:is_dir(F) of
+	true ->
+	    rm_f_(F);
+	_ ->
+	    ?line ok = file:delete(F)
+    end,
+    rm_files(Fs).
+
+change_mode(Files) ->
+    change_mode3(Files).
+change_mode2(Dir)->
+    ?line {ok,CWD} = file:get_cwd(),
+    ?line {ok,FileList} = file:list_dir(Dir),
+    ?line file:set_cwd(filename:join([CWD,Dir])),
+    change_mode3(FileList),
+    ?line file:set_cwd(CWD).
+change_mode3([]) ->
+    ok;
+change_mode3([F|Fs]) ->
+    case filelib:is_dir(F) of
+	true ->
+	    chmod(F),
+	    change_mode2(F);
+	_ ->
+	    chmod(F)
+    end,
+    change_mode3(Fs).
+    
+chmod(F) ->
+    case file:read_file_info(F) of
+	{ok,FileInfo} ->
+	    Mode= FileInfo#file_info.mode,
+	    file:write_file_info(F,FileInfo#file_info{mode=8#00777 bor Mode});
+	_ ->
+	    ok
+    end.
+    
diff --git a/lib/xmerl/test/xmerl_SUITE_data/cpd.tar.gz b/lib/xmerl/test/xmerl_SUITE_data/cpd.tar.gz
new file mode 100644
index 0000000000..c750e14adf
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/cpd.tar.gz
diff --git a/lib/xmerl/test/xmerl_SUITE_data/eventp/CMOM.xml b/lib/xmerl/test/xmerl_SUITE_data/eventp/CMOM.xml
new file mode 100644
index 0000000000..7c64046897
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/eventp/CMOM.xml
@@ -0,0 +1,30261 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- 
+     Document no:     1551-1/CSX10109
+     Revision:        MOM-CELLO_4.3.1
+     Date:            12-17-2003
+     Author:          Ake Pappila/Hsiang-Ling Teng
+
+     Generated from UML by uml2xml version 3.0 (based on DTD file rev. F)
+     Rational Rose model used: /vobs/cello/cma/cma_uml/CelloMOM.mdl
+-->
+
+<!DOCTYPE models SYSTEM "mp.dtd">
+
+<models>
+<mim name="MOM-CELLO_4.3.1-1" version="5" release="1">
+    <exception name="AttributeMissingException">
+        <description>Exception thrown when an attribute is missing during upgrade.</description>
+    </exception>
+
+    <exception name="EnableExistingProgramException">
+        <description>Exception thrown when enabling of existing programs fails.</description>
+    </exception>
+
+    <exception name="ExtraIdentifiersOfNonExistingLoadModulesException">
+    </exception>
+
+    <exception name="FileCopyException">
+        <description>Exception thrown when copying of files fails.</description>
+    </exception>
+
+    <exception name="FileNotExistException">
+        <description>Exception thrown when the specified file does not exist.</description>
+    </exception>
+
+    <exception name="FindAndReplaceException">
+    </exception>
+
+    <exception name="HeapPoolSettingsException">
+        <description>Exception thrown when the heap or pool setting is incorrect.</description>
+    </exception>
+
+    <exception name="AttributeValueOutOfRangeException">
+        <description>Exception thrown when an attribute value is out of range.</description>
+    </exception>
+
+    <exception name="CancelInstallRequestException">
+        <description>Exception thrown when a cancel install equest for some reason fails.</description>
+    </exception>
+
+    <exception name="ChecksumhandlerException">
+        <description>Exception thrown when the control of checksum for loadmodules has been rejaected due to 'null' recieved from resource layer.</description>
+    </exception>
+
+    <exception name="ClearAllPiuTypesReferencedByPlugInUnitException">
+        <description>Exception thrown when its not possible to clear all PiuTypes referenced by PlugInUnit.</description>
+    </exception>
+
+    <exception name="ConditionallyMandatoryAttributeOrElementMissingException">
+        <description>Exception thrown when an conditional mandatory attribute (or element) is missing.</description>
+    </exception>
+
+    <exception name="ConfigurationVersionMO_HandlerException">
+        <description>Exception thrown when the creation of a CV during upgrade fails.</description>
+    </exception>
+
+    <exception name="ControlFileDocumentHandlerException">
+    </exception>
+
+    <exception name="CreateLoadModuleException">
+        <description>Exception thrown when the creation of a load module fails.</description>
+    </exception>
+
+    <exception name="DisableExistingProgramsException">
+        <description>Exception thrown when disabling of existing programs for some reason fails.</description>
+    </exception>
+
+    <exception name="DocumentObjectProxyException">
+    </exception>
+
+    <exception name="ExplicitReplacementInInformationForRPUsException">
+        <description>Exception thrown when replacement of existing RPU information fails.</description>
+    </exception>
+
+    <exception name="InstallOfLoadModulesCancelledException">
+        <description>Exception thrown when the installation of Load Modules is cancelled.</description>
+    </exception>
+
+    <exception name="InstallOfLoadModulesPartlyExcecutedException">
+        <description>Exception thrown when the installment of Load Modules is only partly executed.</description>
+    </exception>
+
+    <exception name="InstallOfLoadModulesRejectedException">
+        <description>Exception thrown when the install of Load Modules is rejected.</description>
+    </exception>
+
+    <exception name="InstallRejectedFTP_ServerNotAccessibleException">
+        <description>Exception thrown when the install is rejected due to FTP server is not accessible.</description>
+    </exception>
+
+    <exception name="InstallRejectedGetLoadModuleFileException">
+        <description>Exception thrown when the install is rejected due to error when trying to retreive Load Module.</description>
+    </exception>
+
+    <exception name="InstallRejectedIP_AddressException">
+        <description>Exception thrown when install is rejected due to erronous IP address.</description>
+    </exception>
+
+    <exception name="InstallRejectedInsufficientDiskSpaceException">
+        <description>Exception thrown when the install is rejected due to insufficient disk space.</description>
+    </exception>
+
+    <exception name="InstallRejectedLoadListFileException">
+    </exception>
+
+    <exception name="InstallRequestException">
+        <description>Exception thrown when the installation of a Load Module fails.</description>
+    </exception>
+
+    <exception name="InsufficientDiskSpaceException">
+        <description>Exception thrown when the disk space is insufficient.</description>
+    </exception>
+
+    <exception name="JvmMO_HandlerException">
+    </exception>
+
+    <exception name="LoadModuleFIlePathLengthOutOfRangeException">
+        <description>Exception thrown when file path for the Load Module is out of length.</description>
+    </exception>
+
+    <exception name="LoadModuleMO_HandlerException">
+    </exception>
+
+    <exception name="ManagedElementDataMO_HandlerException">
+    </exception>
+
+    <exception name="MandatoryElementIsMissingException">
+    </exception>
+
+    <exception name="MergeControlFileException">
+        <description>Exception thrown when the merger of control files fails.</description>
+    </exception>
+
+    <exception name="PIU_MO_HandlerException">
+    </exception>
+
+    <exception name="ParseException">
+    </exception>
+
+    <exception name="ParserFactoryException">
+    </exception>
+
+    <exception name="PiuTypeDefinitionMissingInUpgradeControlFileException">
+        <description>Exception thrown when PiuType definitions is missing in the UCF file.</description>
+    </exception>
+
+    <exception name="PiuTypeMO_HandlerException">
+    </exception>
+
+    <exception name="ProductNumberAndRevisionAlreadyInUseException">
+        <description>Exception thrown when the product number and revision is already used.</description>
+    </exception>
+
+    <exception name="ProgramConfigurationException">
+    </exception>
+
+    <exception name="ReconfigureProgramsException">
+        <description>Exception thrown when reconfiguration of programs fails.</description>
+    </exception>
+
+    <exception name="ReferencedElementMissingException">
+        <description>Exception thrown when the referenced element is missing.</description>
+    </exception>
+
+    <exception name="RepertoireMO_HandlerException">
+    </exception>
+
+    <exception name="ReplaceConfigSupportMOsOpException">
+    </exception>
+
+    <exception name="ReserveLoadModulesException">
+        <description>Exception thrown when reserving a Load Module fails.</description>
+    </exception>
+
+    <exception name="SelectiveInstallFailureException">
+        <description>Exception thrown when a selective install fails.</description>
+    </exception>
+
+    <exception name="SlotMO_HandlerException">
+    </exception>
+
+    <exception name="SwAllocationMO_HandlerException">
+    </exception>
+
+    <exception name="UnexpectedAttributeException">
+        <description>Exception thrown when an unexpected attribute occurs at upgrade.</description>
+    </exception>
+
+    <exception name="UnexpectedAttributeFormatException">
+        <description>Exception thrown when an unexpected format of the attribute occurs.</description>
+    </exception>
+
+    <exception name="UnexpectedElementException">
+        <description>Exception thrown when </description>
+    </exception>
+
+    <exception name="UpgradeControlFileDataException">
+    </exception>
+
+    <exception name="UpgradeControlFileNotFoundException">
+    </exception>
+
+    <exception name="UpgradeControlFileParserException">
+    </exception>
+
+    <exception name="UpgradePackageDeleteException">
+        <description>Exception thrown when its not possible to delete the upgrade package.</description>
+    </exception>
+
+    <exception name="UpgradePackageDeleteNotAllowedException">
+        <description>Exception thrown when its not allowed to delete the upgrade package.</description>
+    </exception>
+
+    <exception name="UpgradePackageDoesNotExistException">
+        <description>Exception thrown when the specified upgrade package does not exist.</description>
+    </exception>
+
+    <exception name="UpgradePackageFileSystemErrorException">
+        <description>Exception thrown when an error in the file system occurs.</description>
+    </exception>
+
+    <exception name="UpgradeRejectedException">
+        <description>Exception thrown when the upgrade is rejected.</description>
+    </exception>
+
+    <exception name="ValidateException">
+    </exception>
+
+    <exception name="VerifyChecksumException">
+        <description>Exception thrown when the checksum is incorrect.</description>
+    </exception>
+
+    <exception name="VerifyCreationOfCVsException">
+        <description>Exception thrown when its not possible to verify the creation of CV's.</description>
+    </exception>
+
+    <exception name="VerifyOperationalPIUsException">
+    </exception>
+
+    <exception name="VerifyRejectedException">
+    </exception>
+
+    <exception name="VerifyRequestException">
+    </exception>
+
+    <exception name="VerifySupportedPIUsException">
+    </exception>
+
+    <exception name="VerifyUpgradeHandlerException">
+    </exception>
+
+    <exception name="VerifyUpgradeWindowException">
+    </exception>
+
+    <exception name="UpgradeLogFileNotAccessibleException">
+        <description>The upgrade trace log file is not accessible i.e. the log file exists but it is not possible to access it with write permission.</description>
+    </exception>
+
+    <exception name="UpgradeControlFileException">
+        <description>The file parser has found that the UpgradeControlFile is incorrect.</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="UpgradeNotPossibleException">
+        <description>Before an upgrade is started it was found that the upgrade can not take place. A possible reason is that the upgrade package that is running in the node is not in the upgrade window of this upgrade package. </description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="UpgradeLogFileNotInUseException">
+        <description>The upgrade trace output is currently not directed to a file. 
+
+This is a property that can be changed in the trace property file (Trace_01.prop).
+</description>
+    </exception>
+
+    <enum name="UpgradePackageState">
+        <enumMember name="NOT_INSTALLED">
+            <description>The upgrade package is not installed.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="INSTALL_COMPLETED">
+            <description>The upgrade package is completely installed.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="UPGRADE_EXECUTING">
+            <description>Upgrade is executing. </description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="AWAITING_CONFIRMATION">
+            <description>The execution of upgrade needs confirmation before it proceeds.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="ONLY_DELETEABLE">
+            <description>In this state an Upgrade Package can only be deleted. Its actions, when invoked, will throw the exception ActionNotAllowed. </description>
+            <value>4</value>
+        </enumMember>
+        <enumMember name="INSTALL_EXECUTING">
+            <description>Installation of the upgrade package is executing.</description>
+            <value>5</value>
+        </enumMember>
+        <enumMember name="INSTALL_NOT_COMPLETED">
+            <description>The upgrade package is not completely installed i.e. parts of it has been installed. </description>
+            <value>6</value>
+        </enumMember>
+        <enumMember name="UPGRADE_COMPLETED">
+            <description>The upgrade has been successfully executed.</description>
+            <value>7</value>
+        </enumMember>
+    </enum>
+
+    <enum name="UpgradeProgressInformation">
+        <enumMember name="IDLE">
+            <description>No action is in progress. </description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="DOWNLOADING_FILES">
+            <description>Downloading of files (load modules) in progress.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="SAVING_CV">
+            <description>Saving a Configuration Version.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="RECONFIGURING_MOS">
+            <description>Operation ReplaceConfigSupportMOs detected in upgrade.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="INITIATING_LOADER_INFO">
+            <description>Trigger Initiate detected in upgrade sequence.</description>
+            <value>4</value>
+        </enumMember>
+        <enumMember name="PRELOADING">
+            <description>Trigger Preload detected in upgrade sequence.</description>
+            <value>5</value>
+        </enumMember>
+        <enumMember name="CONVERSION_OF_PERSISTENT_DATA">
+            <value>6</value>
+        </enumMember>
+        <enumMember name="APPLICATION_SPECIFIC_ACTION">
+            <description>'Unique trigger' for an application detected in upgrade sequence.</description>
+            <value>7</value>
+        </enumMember>
+        <enumMember name="SHUTDOWN_WAIT">
+            <value>8</value>
+        </enumMember>
+        <enumMember name="TAKING_NEW_SOFTWARE_INTO_SERVICE">
+            <value>9</value>
+        </enumMember>
+        <enumMember name="FINISH_AND_CLEANING_UP">
+            <description>The error handling is switched back to normal.</description>
+            <value>10</value>
+        </enumMember>
+        <enumMember name="RESTORING_SYSTEM_STATE">
+            <value>11</value>
+        </enumMember>
+        <enumMember name="EXECUTION_FAILED">
+            <description>Indicates that the execution of an install or an upgrade action has failed.</description>
+            <value>12</value>
+        </enumMember>
+        <enumMember name="CANCEL_OF_INSTALLATION_IS_EXECUTING">
+            <description>Indicates that cancellation of an ongoing installation is in progress.</description>
+            <value>13</value>
+        </enumMember>
+        <enumMember name="CANCEL_OF_INSTALLATION_FAILED">
+            <description>Indicates that the execution of a cancel install action failed.</description>
+            <value>14</value>
+        </enumMember>
+        <enumMember name="VERIFICATION_INITIATED">
+            <value>15</value>
+        </enumMember>
+        <enumMember name="VERIFYING_UPGRADE_FROM_VERSION">
+            <value>16</value>
+        </enumMember>
+        <enumMember name="VERIFYING_POSSIBLE_TO_CREATE_REQ_NO_CVS">
+            <value>17</value>
+        </enumMember>
+        <enumMember name="VERIFYING_PIUS_SUPPORTED">
+            <value>18</value>
+        </enumMember>
+        <enumMember name="VERIFYING_CHECKSUM_FOR_LM">
+            <value>19</value>
+        </enumMember>
+        <enumMember name="VERIFYING_PIUS_NOT_FAULTY">
+            <value>20</value>
+        </enumMember>
+        <enumMember name="VERIFICATION_FINISHED">
+            <value>21</value>
+        </enumMember>
+        <enumMember name="VERIFICATION_FAILED">
+            <value>22</value>
+        </enumMember>
+    </enum>
+
+    <enum name="InvokedAction">
+        <enumMember name="VERIFY_UPGRADE">
+            <description>The verifyUpgrade action has been invoked.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="UPGRADE">
+            <description>An upgrade action (one of the variants) has been invoked.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="INSTALL">
+            <description>An install action (one of the variants) has been invoked.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="CANCEL_INSTALL">
+            <description>The cancelInstall action has been invoked.</description>
+            <value>4</value>
+        </enumMember>
+    </enum>
+
+    <struct name="ActionResultData">
+        <structMember name="time">
+            <description>A timestamp. 
+
+Format: "Date:   2003-04-24, Time: 20:52:11.182"</description>
+            <string>
+                <defaultValue>""</defaultValue>
+            </string>
+        </structMember>
+        <structMember name="typeOfInvokedAction">
+            <enumRef name="InvokedAction">
+                <defaultValue>VERIFY_UPGRADE</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="info">
+            <enumRef name="Information">
+                <defaultValue>EXECUTED</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="actionId">
+            <description>This id is used to link more than one result to one action</description>
+            <long>
+                <defaultValue>1</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="additionalInfo">
+            <string>
+                <defaultValue>""</defaultValue>
+            </string>
+        </structMember>
+    </struct>
+
+    <enum name="Information">
+        <enumMember name="EXECUTED">
+            <description>The invoked action has been successfully executed without warnings.One of three possible main results of executed action.
+
+Value valid for type of invoked action:
+INSTALL
+CANCEL_INSTALL
+VERIFY_UPGRADE
+UPGRADE</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="UNSPECIFIED">
+            <description>A not specified error/ warning has been detected (see additional info for further details)
+
+Value valid for type of invoked action:
+INSTALL
+CANCEL_INSTALL
+VERIFY_UPGRADE
+UPGRADE</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="LM_CHECKSUM_VER_FAILED">
+            <description>A load module checksum verification has failed.
+
+Value valid for type of invoked action:
+INSTALL
+VERIFY_UPGRADE
+UPGRADE</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="NOT_ENOUGH_AVAIL_DISK_SPACE">
+            <description> There is not enough available disk space for the required number of new CVs (configuration versions) to be created automatically during an upgrade.
+
+Value valid for type of invoked action:
+VERIFY_UPGRADE
+UPGRADE</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="MAX_NO_CV_WILL_BE_EXCEEDED">
+            <description>The maximum number of allowed CVs (configuration versions) will be exceeded if the required number of new CVs is created automatically during an upgrade.
+
+Value valid for type of invoked action:
+VERIFY_UPGRADE
+UPGRADE</description>
+            <value>4</value>
+        </enumMember>
+        <enumMember name="UPGRADE_FROM_CURRENT_UP_NOT_ALLOWED">
+            <description>The Upgrade Window element in the Upgrade Control File does not specify the current Upgrade Package as a valid 'upgrade from' version.
+
+Value valid for type of invoked action:
+VERIFY_UPGRADE
+UPGRADE</description>
+            <value>5</value>
+        </enumMember>
+        <enumMember name="NON_SUPPORTED_PIU">
+            <description>A non supported Plug In Unit (PIU) has been detected i.e. the PIU in the node is not defined in the Upgrade Control File.    
+This is not a fault that prevents an upgrade from being executed.
+
+Value valid for type of invoked action:
+VERIFY_UPGRADE
+UPGRADE</description>
+            <value>6</value>
+        </enumMember>
+        <enumMember name="FAULTY_PIU">
+            <description>A faulty Plug In Unit (PIU) has been detected.       
+This is not a fault that prevents an upgrade from being executed.
+
+Value valid for type of invoked action:
+VERIFY_UPGRADE
+UPGRADE</description>
+            <value>7</value>
+        </enumMember>
+        <enumMember name="CREATION_OF_CV_FAILED">
+            <description>The auto-creation of an install CV failed.
+
+Value valid for type of invoked action:
+INSTALL
+</description>
+            <value>8</value>
+        </enumMember>
+        <enumMember name="ACTION_NOT_ALLOWED">
+            <description>The requested action is not allowed due to an other action already is in progress for an other UP MO.
+
+Value valid for type of invoked action:
+INSTALL
+CANCEL_INSTALL
+VERIFY_UPGRADE
+UPGRADE</description>
+            <value>9</value>
+        </enumMember>
+        <enumMember name="INSTALLATION_MANUALLY_CANCELLED">
+            <description>An ongoing installation has been cancelled (aborted) due to request from client.
+
+Value valid for type of invoked action:
+INSTALL</description>
+            <value>10</value>
+        </enumMember>
+        <enumMember name="FTP_SERVER_NOT_ACCESSIBLE">
+            <description>The FTP server to be used for downloads of load modules is not accessible.
+
+Value valid for type of invoked action:
+INSTALL</description>
+            <value>11</value>
+        </enumMember>
+        <enumMember name="INSUFFICIENT_DISK_SPACE_FOR_LOAD_MODULES">
+            <description>The required disk space for load modules to be installed is insufficient.
+
+Value valid for type of invoked action:
+INSTALL</description>
+            <value>12</value>
+        </enumMember>
+        <enumMember name="FTP_SERVER_IP_ADDRESS_ERROR">
+            <description>Error detected in the IP address of the FTP server.
+
+Value valid for type of invoked action:
+INSTALL</description>
+            <value>13</value>
+        </enumMember>
+        <enumMember name="DELTA_INSTALL_MERGE_ERROR">
+            <description>The install of the delta Upgrade Control File (UCF) failed i.e. the analysis of the delta UCF together with current active UP's UCF failed.
+
+Value valid for type of invoked action:
+INSTALL</description>
+            <value>14</value>
+        </enumMember>
+        <enumMember name="SELECTIVE_INSTALL_ERROR">
+            <description>Error detected during the selection phase of an install.
+
+Value valid for type of invoked action:
+INSTALL
+
+</description>
+            <value>15</value>
+        </enumMember>
+        <enumMember name="EXECUTION_FAILED">
+            <description>The execution of invoked action failed.One of three possible main results of executed action.
+
+Value valid for type of invoked action:
+INSTALL
+CANCEL_INSTALL
+VERIFY_UPGRADE
+UPGRADE</description>
+            <value>16</value>
+        </enumMember>
+        <enumMember name="EXECUTED_WITH_WARNINGS">
+            <description>The action has been successfully executed but with warnings.One of three possible main results of executed action.
+
+Value valid for type of invoked action:
+INSTALL
+CANCEL_INSTALL
+VERIFY_UPGRADE</description>
+            <value>17</value>
+        </enumMember>
+    </enum>
+
+    <exception name="FtpServerNotAccessibleException">
+        <description>Ftp server is not accessible. This may depend on erroneous IP address, username, password, or that the IP communication with the Ftp server is down, or that the Ftp server itself is malfunctioning. </description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="GetFileException">
+        <description>An error was encountered during FTP get file. A filePath in the upgradeControlFile may be inconsistent with a filepath on the Ftp server. </description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <struct name="PiuTypeProgramConfiguration">
+        <structMember name="tag">
+            <description>The tag is used as a reference between the PiuType MO and the Repertoire MO to find out how to create the program object under a PlugInUnit MO.</description>
+            <string/>
+        </structMember>
+        <structMember name="subParentLDN">
+            <description>Local distinguished name of the program parent from the PlugInUnit.
+
+Example:
+1.  "Spu=1,Spm=2" (the program is to be created under: ...PlugInUnit=2,Spu=1,Spm=2")
+2.  "" (empty string - the program is to be created directly under the PlugInUnit)</description>
+            <string/>
+        </structMember>
+        <structMember name="programMoTypeName">
+            <description>The name of the Program MO that will be created.</description>
+            <string/>
+        </structMember>
+        <structMember name="loadableProcessorName">
+            <description>The loadableProcessorName is a user friendly name of the processor.</description>
+            <string/>
+        </structMember>
+    </struct>
+
+    <struct name="RepertoireLoadModuleData">
+        <description>This structure contains load module data that belongs to a piu type.
+</description>
+        <structMember name="loadModuleDN">
+            <description>The distinguished name of the load module, which is needed and sufficient to convert the load module to a real object reference.</description>
+            <string/>
+        </structMember>
+        <structMember name="tag">
+            <description>The tag is used as a reference between the PiuType MO and the Repertoire MO to find out how to create the program object under a PlugInUnit MO.</description>
+            <string/>
+        </structMember>
+    </struct>
+
+    <struct name="ConfigurationVersionAttributes">
+        <structMember name="name">
+            <string>
+            </string>
+        </structMember>
+        <structMember name="identity">
+            <string>
+            </string>
+        </structMember>
+        <structMember name="type">
+            <string/>
+        </structMember>
+        <structMember name="upgradePackageId">
+            <string/>
+        </structMember>
+        <structMember name="operatorName">
+            <string>
+            </string>
+        </structMember>
+        <structMember name="operatorComment">
+            <string>
+            </string>
+        </structMember>
+        <structMember name="date">
+            <string/>
+        </structMember>
+        <structMember name="status">
+            <string/>
+        </structMember>
+    </struct>
+
+    <enum name="ConfigurationVersionType">
+        <enumMember name="standard">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="upgrade">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="minimal">
+            <value>2</value>
+        </enumMember>
+        <enumMember name="test">
+            <value>3</value>
+        </enumMember>
+        <enumMember name="autocreate">
+            <value>4</value>
+        </enumMember>
+        <enumMember name="other">
+            <value>5</value>
+        </enumMember>
+    </enum>
+
+    <enum name="LoadModuleLoaderType">
+        <enumMember name="OseLoader">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="SpmLoader">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="Jvm">
+            <value>2</value>
+        </enumMember>
+        <enumMember name="WebServer">
+            <value>3</value>
+        </enumMember>
+        <enumMember name="Other">
+            <value>99</value>
+        </enumMember>
+        <enumMember name="SpmFpgaLoader">
+            <value>4</value>
+        </enumMember>
+        <enumMember name="XpLoader">
+            <value>5</value>
+        </enumMember>
+    </enum>
+
+    <enum name="LoadModulePreLoadType">
+        <enumMember name="no">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="must">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="wish">
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="RPUSwitchOverMode">
+        <description>This attribute can have the following values:
+
+AtPiuFault = Indicates the MP (where the normal RPU is configured) is faulty (HW error). This is the default value.
+
+AtPiuRestart = Indicates the MP (where the normal RPU is configured) is restarted.</description>
+        <enumMember name="AtPiuFault">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="AtPiuRestart">
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="RPUNormalisationMode">
+        <description>This enumeration can have the following values:
+
+Manual = Indicates that no normalisation is performed by cello until the operator issues a "switch" action.
+
+Automatic = Indicates that Cello performs the normalisation automatically, after the failed RPU is available again. This is the default value.</description>
+        <enumMember name="Manual">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="Automatic">
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="RPUReplicationMode">
+        <description>This enumaration contains the following values:
+
+Always = Data replication is always performed. This overrides the characteristics set on the each container ( that is associated with the RPU ).
+
+Never = Data replication is never performed. This overrides the characteristics set on the each container ( that is associated with the RPU ).
+
+AtShutdown = Each time the RSH (which handles the RPU) is shut down, a complete snapshot is taken and replicated to the other MP, if necessary. Otherwise, the replication is performed according to the characteristics set on each container ( that is associated with the RPU ).
+
+ApplControlled = The data replication is made according to the characteristics set on each container ( that is associated with the RPU ). This is the default value.</description>
+        <enumMember name="Always">
+            <description>Always = Data replication is always performed. This overrides the characteristics set on the each container ( that is associated with the RPU ).</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="Never">
+            <description>Data replication is never performed. This overrides the characteristics set on the each container ( that is associated with the RPU ).</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="AtShutdown">
+            <description>AtShutdown = Each time the RSH (which handles the RPU) is shut down, a complete snapshot is taken and replicated to the other MP, if necessary. Otherwise, the replication is performed according to the characteristics set on each container ( that is associated with the RPU ).</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="ApplControlled">
+            <description>ApplControlled = The data replication is made according to the characteristics set on each container ( that is associated with the RPU ). This is the default value.</description>
+            <value>4</value>
+        </enumMember>
+    </enum>
+
+    <enum name="RPUOperationalMode">
+        <description>This enumeration contains the following values:
+
+AsConfigured = The RSHs runs as the RPU is configured.
+SwitchOver = The RSHs has been switched over.
+Unavailable = No RSHs, that uses this RPU, are running.</description>
+        <enumMember name="AsConfigured">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="SwitchedOver">
+            <value>2</value>
+        </enumMember>
+        <enumMember name="Unavailable">
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <struct name="PiuTypeMOConfiguration">
+        <structMember name="subParentLDN">
+            <string/>
+        </structMember>
+        <structMember name="moTypeName">
+            <string/>
+        </structMember>
+        <structMember name="identity">
+            <string/>
+        </structMember>
+    </struct>
+
+    <struct name="AirFlowData">
+        <description>Control value for the fan unit. Needed by cooling function.
+</description>
+        <structMember name="normalLowTempAirFlow">
+            <description>Control value for the fan unit running in normal autonomous mode. 
+This parameter is the subrack/fanunit airflow value that is required to achieve sufficient cooling at 20 degree
+centigrade or lower ambient temperature of the most demanding plug in unit (PIU) in the subrack. This airflow value
+shall be sufficient (but not unnecessarily large) to secure that no "normal overtemp" fault indication is issued.
+Default values = 250 m3/h.  (value &gt;=0) 
+</description>
+            <float>
+                <defaultValue>250</defaultValue>
+            </float>
+        </structMember>
+        <structMember name="normalHighTempAirFlow">
+            <description>Control value for the fan unit running in normal autonomous mode. This parameter is the subrack/fanunit airflow
+value that is required to achieve sufficient cooling at 50 degree centigrade ambient temperature of the most
+demanding plug in unit (PIU) in the subrack. This airflow value shall be sufficient (but not unnecessarily large) to
+secure that no "normal overtemp" fault indication is issued.
+Default values = 400 m3/h. (value &gt;=0)</description>
+            <float>
+                <defaultValue>400</defaultValue>
+            </float>
+        </structMember>
+        <structMember name="noiseReducedLowTempAirFlow">
+            <description>Control value for the fan unit running in noise reduction mode.  This parameter is the subrack/fanunit airflow value
+that is required to achieve sufficient cooling at 20 degree centigrade or lower ambient temperature of the most
+demanding plug in unit (PIU) in the subrack. This airflow value shall be sufficient (but not unnecessarily large) to
+secure that no "exceptional overtemp" fault indication is issued
+Default values = 250 m3/h. (value &gt;=0)</description>
+            <float>
+                <defaultValue>250</defaultValue>
+            </float>
+        </structMember>
+        <structMember name="noiseReducedHighTempAirFlow">
+            <description>Control value for the fan unit running in noise reduction mode. This parameter is the subrack/fanunit airflow value
+that is required to achieve sufficient cooling at 50 degree centigrade ambient temperature of the most demanding
+plug in unit (PIU) in the subrack. This airflow value shall be sufficient (but not unnecessarily large) to secure
+that no "exceptional overtemp" fault indication is issued.
+Default values = 400 m3/h. (value &gt;=0)</description>
+            <float>
+                <defaultValue>400</defaultValue>
+            </float>
+        </structMember>
+    </struct>
+
+    <exception name="IpAddressException">
+        <description>Erroneous Ip Address Format</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="AueFailureException">
+        <description>An application upgrade engine has reported a failure. </description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="ActionNotAllowedException">
+        <description>The action is not allowed, the UpgradePackage MO is in wrong state. 
+
+For example if you try 'upgrade()' before an 'install()' or 'forcedInstall()' has been done.</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="CVFileSystemErrorException">
+        <description>Exception thrown upon file system Error.</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="CVDBErrorException">
+        <description>Data Base Error Exception (error when creating database backup).</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="CVLLPErrorException">
+        <description>LLP Error Exception (error when creating ARMAMENT and LLP.LMID files).</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="CVAlreadyExistsException">
+        <description>The configuration version already exists (e.g. message at create).</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="CVDoesNotExistsException">
+        <description>The configuration version does not exist (e.g. message at setCVAsStartable).</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="CVDeleteNotAllowedException">
+        <description>It is not allowed to delete the configuration version, because it is in use (used as startable or in rollback list).</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="CVInvalidCVException">
+        <description>The configuration version is not valid (due to missing files).
+
+</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="CVFormatErrorException">
+        <description>Format Error in given configuration version name. 
+
+The following characters are allowed within the name:
+[0-9], [A-Z], [a-z] and '&amp;','%',':','.','_', '-'
+
+Note! For comment and operatorName spaces (' ') are also allowed within the strings.</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="CVErrorException">
+        <description>Error Exception.</description>
+        <exceptionParameter name="message">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="InstallException">
+        <description>Indicates that an error in an installation has occurred.</description>
+        <exceptionParameter name="install">
+            <description>The message of the exception.</description>
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="LogActivationException">
+        <description>Exception thrown when a database error occurs.</description>
+    </exception>
+
+    <exception name="InvalidDriveNameException">
+        <description>Exception thrown when an invalid drive name is specified or when a data base error occurs.</description>
+    </exception>
+
+    <exception name="VerifyUpgradeException">
+    </exception>
+
+    <exception name="CVActivityLogFilePathErrorException">
+        <description>Exception thrown when the log file path is wrong.</description>
+    </exception>
+
+    <exception name="CV_MaxNumberOfInstancesException">
+        <description>Exception thrown when max number of CV's in the system has been reached.</description>
+    </exception>
+
+    <exception name="Aal2PathIdNotUniqueException">
+        <exceptionParameter name="message">
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="PathAlreadyRegisteredException">
+        <exceptionParameter name="message">
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="NotInGroupException">
+    </exception>
+
+    <exception name="InvalidReferenceException">
+    </exception>
+
+    <exception name="InvalidPriorityException">
+        <description>Indicates an invalid priority level, i.e. the priority in question is out of the defined range.</description>
+        <exceptionParameter name="invalidPriority">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <struct name="QoSProfileClassA">
+        <description>This struct contains the values applicable for QoS Class A.</description>
+        <structMember name="boundOnProbOfDelay">
+            <description>Represents the upper bound on the probability that the delay in the node exceeds the delay limit given by the attribute "boundOnNodeDelay".
+
+Unit is 1/1000000000.
+</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1000000000</max>
+                </range>
+                <defaultValue>500000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="boundOnProbOfLoss">
+            <description>Represents the upper bound of the cell loss probability in the current node.
+
+Unit is 1/1000000000.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1000000000</max>
+                </range>
+                <defaultValue>500000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="boundOnNodeDelay">
+            <description>The upper bound on the delay (delay=queueing and serving of Aal2 packets in an Aal2 mux + delay on ATM layer) through the current node.
+Unit is micro seconds.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>10000</max>
+                </range>
+                <defaultValue>5000</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <struct name="QoSProfileClassB">
+        <description>This struct contains the values applicable for QoS Class B.</description>
+        <structMember name="boundOnProbOfDelay">
+            <description>Represents the upper bound on the probability that the delay in the node exceeds the delay limit given by the attribute "boundOnNodeDelay".
+
+Unit is 1/1000000000.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1000000000</max>
+                </range>
+                <defaultValue>500000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="boundOnProbOfLoss">
+            <description>Represents the upper bound of the cell loss probability in the current node.
+
+Unit is 1/1000000000.
+</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1000000000</max>
+                </range>
+                <defaultValue>500000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="boundOnNodeDelay">
+            <description>The upper bound on the delay (delay=queueing and serving of Aal2 packets in an Aal2 mux + delay on ATM layer) through the current node.
+Unit is micro seconds.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>20000</max>
+                </range>
+                <defaultValue>15000</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <struct name="QoSProfileClassC">
+        <description>This struct contains the values applicable for QoS Class C.
+
+NOTE: The attribute 'boundONodeDelay' is not applicable for QoS Class C so setting of this attribute will have no effect.</description>
+        <structMember name="boundOnProbOfDelay">
+            <description>Represents the upper bound on the probability that the delay in the node exceeds the delay limit given by the attribute "boundOnNodeDelay".
+
+Unit is 1/1000000000.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1000000000</max>
+                </range>
+                <defaultValue>1000000000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="boundOnProbOfLoss">
+            <description>Represents the upper bound of the cell loss probability in the current node.
+
+Unit is 1/1000000000.
+</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1000000000</max>
+                </range>
+                <defaultValue>1000000000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="boundOnNodeDelay">
+            <description>The upper bound on the delay (delay=queueing and serving of Aal2 packets in an Aal2 mux + delay on ATM layer) through the current node.
+Unit is micro seconds.</description>
+            <long>
+                <defaultValue>25000</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <struct name="QoSProfileClassD">
+        <description>This struct contains the values applicable for QoS Class D.
+
+NOTE: The attribute 'boundONodeDelay' is not applicable for QoS Class D so setting of this attribute will have no effect.</description>
+        <structMember name="boundOnProbOfDelay">
+            <description>Represents the upper bound on the probability that the delay in the node exceeds the delay limit given by the attribute "boundOnNodeDelay".
+
+Unit is 1/1000000000.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>1000000000</max>
+                </range>
+                <defaultValue>1000000000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="boundOnProbOfLoss">
+            <description>Represents the upper bound of the cell loss probability in the current node.
+
+Unit is 1/1000000000.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1000000000</max>
+                </range>
+                <defaultValue>1000000000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="boundOnNodeDelay">
+            <description>The upper bound on the delay (delay=queueing and serving of Aal2 packets in an Aal2 mux + delay on ATM layer) through the current node.
+Unit is micro seconds.</description>
+            <long>
+                <defaultValue>50000</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <enum name="SupportedQoSClasses">
+        <enumMember name="NO_CLASS_SUPPORTED">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="CLASS_A">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="CLASS_B">
+            <value>2</value>
+        </enumMember>
+        <enumMember name="CLASS_A_B">
+            <value>3</value>
+        </enumMember>
+        <enumMember name="CLASS_C">
+            <value>4</value>
+        </enumMember>
+        <enumMember name="CLASS_A_C">
+            <value>5</value>
+        </enumMember>
+        <enumMember name="CLASS_B_C">
+            <value>6</value>
+        </enumMember>
+        <enumMember name="CLASS_A_B_C">
+            <value>7</value>
+        </enumMember>
+        <enumMember name="CLASS_D">
+            <value>8</value>
+        </enumMember>
+        <enumMember name="CLASS_A_D">
+            <value>9</value>
+        </enumMember>
+        <enumMember name="CLASS_B_D">
+            <value>10</value>
+        </enumMember>
+        <enumMember name="CLASS_A_B_D">
+            <value>11</value>
+        </enumMember>
+        <enumMember name="CLASS_C_D">
+            <value>12</value>
+        </enumMember>
+        <enumMember name="CLASS_A_C_D">
+            <value>13</value>
+        </enumMember>
+        <enumMember name="CLASS_B_C_D">
+            <value>14</value>
+        </enumMember>
+        <enumMember name="CLASS_A_B_C_D">
+            <value>15</value>
+        </enumMember>
+    </enum>
+
+    <exception name="IsReservedCanNotSetPathIdException">
+        <description>Exception thrown when an attempt is made to set or change the aal2PathId of an Aal2PathVccTp while its reserved by an other Aal2PathGrp</description>
+    </exception>
+
+    <exception name="IsUnlockedCanNotSetPathOwnerException">
+        <description>Exception thrown when an attempt is made to set or change the aal2PathOwner of an Aal2PathVccTp while its not LOCKED.</description>
+    </exception>
+
+    <enum name="SlotState">
+        <description>
+</description>
+        <enumMember name="free">
+            <description>It is free to be pre-configured with a new PlugInUnit. </description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="used">
+            <description>A PlugInUnit is inserted in the slot or the slot is pre-configured with a PlugInUnit.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="coveredByPiu">
+            <description>Currently not supported.</description>
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <struct name="AdminProductData">
+        <structMember name="productNumber">
+            <description>The product number of the product or document.
+
+Examples: ABC 101 001, CXC 123 456, 1/BFD 101 999
+
+In the case of UpgradePackage this is the document number of the upgrade package.</description>
+            <string>
+                <lengthRange>
+                    <min>1</min> <max>24</max>
+                </lengthRange>
+            </string>
+        </structMember>
+        <structMember name="productRevision">
+            <description>The revision of the product number.
+
+Examples: R1, r1a, R1A02, P7B</description>
+            <string>
+                <lengthRange>
+                    <min>1</min> <max>7</max>
+                </lengthRange>
+            </string>
+        </structMember>
+        <structMember name="productName">
+            <description>A user-friendly name of the product.</description>
+            <string>
+                <lengthRange>
+                    <min>1</min> <max>12</max>
+                </lengthRange>
+                <defaultValue>""</defaultValue>
+            </string>
+        </structMember>
+        <structMember name="productInfo">
+            <description>User-friendly information about the product.</description>
+            <string>
+                <defaultValue>""</defaultValue>
+            </string>
+        </structMember>
+        <structMember name="productionDate">
+            <description>The production date can be represented in two ways. 
+
+1) The preferable syntax is a four-digit representation of the year, and a two-digit representation of the month and a two-digit representation of the day. The numbers of characters in this case, is eight.
+Example:
+19991231
+
+2) The date can also consist of two digits for the year, followed by the letter W for week and two digits for the number of week. The numbers of characters in this case, is five.
+Example:
+99W12
+</description>
+            <string>
+                <lengthRange>
+                    <min>1</min> <max>8</max>
+                </lengthRange>
+                <defaultValue>""</defaultValue>
+            </string>
+        </structMember>
+    </struct>
+
+    <struct name="OperProductData">
+        <structMember name="productName">
+            <description>A user-friendly name of the product.
+
+
+
+</description>
+            <string>
+                <lengthRange>
+                    <min>1</min> <max>12</max>
+                </lengthRange>
+            </string>
+        </structMember>
+        <structMember name="productNumber">
+            <description>Unique identity for each product, which is constituted by the Ericsson product number (ABC number).
+
+The maximum number of characters for a product number is 24 including 2 slashes, 2 spaces and 2 characters for origination notation.
+
+Example of product number: 
+ABC 101 001
+(1/ABC 101 01/1234)
+123/ABCDE 101 1010/12345
+
+.</description>
+            <string>
+                <lengthRange>
+                    <min>1</min> <max>24</max>
+                </lengthRange>
+            </string>
+        </structMember>
+        <structMember name="productRevision">
+            <description>Indicates the revision state of the product. It consists of a letter R or P, one or two digits and/or one or two letters. The maximum number of characters is four inclusive R or P.
+Example: R1A, R1A02, P7B
+
+A suffix may be added to the revision state. The suffix may consists of one or two digits or one letter. 
+
+
+</description>
+            <string>
+                <lengthRange>
+                    <min>1</min> <max>7</max>
+                </lengthRange>
+            </string>
+        </structMember>
+        <structMember name="serialNumber">
+            <description>The serial number consists of 13 alphanumerical characters grouped as 6 plus 7 characters. The first 6 characters are to be used for factory codes and the last 7 characters are used for an individual number or batch number.
+
+</description>
+            <string/>
+        </structMember>
+        <structMember name="productionDate">
+            <description>The production date can be represented in two ways. 
+
+1) The preferable syntax is a four-digit representation of the year, and a two-digit representation of the month and a two-digit representation of the day. The numbers of characters in this case, is eight.
+Example:
+19991231
+
+2) The date can also consist of two digits for the year, followed by the letter W for week and two digits for the number of week. The numbers of characters in this case, is five.
+Example:
+99W12
+
+</description>
+            <string>
+                <lengthRange>
+                    <min>5</min> <max>8</max>
+                </lengthRange>
+            </string>
+        </structMember>
+    </struct>
+
+    <enum name="LoadClass">
+        <description>Defines the phase in the load and start sequence.
+</description>
+        <enumMember name="coreOs">
+            <value>10</value>
+        </enumMember>
+        <enumMember name="coreDevice">
+            <value>50</value>
+        </enumMember>
+        <enumMember name="loadListProvider">
+            <value>100</value>
+        </enumMember>
+        <enumMember name="coreEarly">
+            <value>200</value>
+        </enumMember>
+        <enumMember name="coreLate">
+            <value>300</value>
+        </enumMember>
+        <enumMember name="networkAndConnectionHandling">
+            <value>400</value>
+        </enumMember>
+        <enumMember name="application">
+            <value>500</value>
+        </enumMember>
+        <enumMember name="upgrade">
+            <value>600</value>
+        </enumMember>
+    </enum>
+
+    <enum name="StartState">
+        <enumMember name="disabled">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="enabled">
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="SubrackType">
+        <enumMember name="hub">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="device">
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="PiuRole">
+        <enumMember name="mp">
+            <description>The board is a Main processor.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="bp">
+            <description>The board is a device board.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="others">
+            <description>The board is not a Main processor or a device board. </description>
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <enum name="RestartCause">
+        <description>This attribute indicates the restart cause of plugInUnit. The defined values are: 
+1. piuRestartError: restart because of error.
+2. piuRestartUpgrade: restart because of system upgrade.
+</description>
+        <enumMember name="piuRestartUpgrade">
+            <description>This attributes indicates that the Piu restart cause is upgrade.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="piuRestartError">
+            <description>This attributes indicates that the Piu restart cause is error.</description>
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="FanState">
+        <description>The Fan can be in one of three controlling state:
+- standalone: not manageable, full speed fans
+- autonomous: manageable, air-flow control
+- noiseReduced: time-limited low speed fan</description>
+        <enumMember name="standalone">
+            <description>It's running on itself, not manageable.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="autonomous">
+            <description>Manageable state.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="noiseReduced">
+            <description>Temporary state with reduced cooling.</description>
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <enum name="SeqRestarts">
+        <enumMember name="RESTARTS_WITH_NO_LIMITS">
+            <description>This attributes indicates unlimited restarts and no faulty marking of the PIU. Used for critical PIU's such as TUBs, SCBs and some ET-boards.
+</description>
+            <value>-1</value>
+        </enumMember>
+        <enumMember name="RESTARTS_WITH_WARM">
+            <description>This attributes indicates the following sequential restarts:
+-warm
+-refresh
+-cold
+-cold with fault marked (not loaded). Alarm sent.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="RESTARTS_WITH_REFRESH">
+            <description>This attributes indicates the following sequential restarts:
+-refresh
+-cold
+-cold with fault marked (not loaded). Alarm sent.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="RESTARTS_WITH_COLD">
+            <description>This attributes indicates the following sequential restarts:
+-cold
+-cold with fault marked (not loaded). Alarm sent.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="RESTARTS_WITH_FAULT_MARKED">
+            <description>This attributes indicates the following sequential restarts:
+-cold with fault marked (not loaded). Alarm sent.</description>
+            <value>0</value>
+        </enumMember>
+    </enum>
+
+    <exception name="RepertoireNotFoundException">
+        <description>This class is an exception class thrown when a equipment specific error occurs.
+</description>
+    </exception>
+
+    <exception name="SwAllocationNotFoundException">
+        <description>This class is an exception class thrown when a equipment specific error occurs.
+</description>
+    </exception>
+
+    <exception name="WebServerPathConfigurationException">
+        <description>This class is an exception class thrown when failed to configure the webserver root path
+</description>
+    </exception>
+
+    <exception name="FroLocationFailedException">
+    </exception>
+
+    <exception name="FroShutdownException">
+    </exception>
+
+    <exception name="NotUniqueLineNoException">
+    </exception>
+
+    <exception name="WrongPhysPathTermTypeException">
+    </exception>
+
+    <enum name="OperState">
+        <enumMember name="disabled">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="enabled">
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="AdmState">
+        <enumMember name="locked">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="unlocked">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="shuttingDown">
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <exception name="OccupiedException">
+    </exception>
+
+    <exception name="NotReservedException">
+    </exception>
+
+    <exception name="NotSupportedException">
+    </exception>
+
+    <enum name="SilPortState">
+        <description>Indication of Switch Internal Link port status.</description>
+        <enumMember name="portActive">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="portPassive">
+            <value>2</value>
+        </enumMember>
+        <enumMember name="portNotConnected">
+            <value>3</value>
+        </enumMember>
+        <enumMember name="portLocked">
+            <value>4</value>
+        </enumMember>
+        <enumMember name="portNotInstalled">
+            <value>5</value>
+        </enumMember>
+    </enum>
+
+    <exception name="InvalidIndexException">
+        <description>Index specified is invalid, i.e. it is out of the range of valid indices.</description>
+        <exceptionParameter name="invalidIndex">
+            <description>The exception message.</description>
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="TransactionException">
+    </exception>
+
+    <exception name="UndeletableMoException">
+        <description>Exception thrown when MO is not possible to delete.</description>
+    </exception>
+
+    <exception name="FroNotAccessibleException">
+        <description>Exception that is thrown when a FRO (Facade Resource Object in the resource layer) cannot be accessed.</description>
+    </exception>
+
+    <exception name="FroRequestFailedException">
+        <description>Exception that is thrown when the result of a request to a FRO (Facade Resource Object in the resource layer) is not ok.</description>
+    </exception>
+
+    <exception name="MoReservedByOtherUserException">
+        <description>Exception thrown when the MO is already reserved by another user (MO).</description>
+    </exception>
+
+    <exception name="MoHasChildrenException">
+        <description>Exception class thrown when an MO is requested to be deleted, but the MO has children, which must be deleted first.</description>
+    </exception>
+
+    <exception name="MoReservedNotDeletableException">
+        <description>Exception thrown when trying to delete an MO that is reserved by another MO (user).</description>
+    </exception>
+
+    <exception name="MaxNumberExceededException">
+        <description>Exception thrown when the maximum number of childrens for an MO is exceeded.</description>
+    </exception>
+
+    <exception name="AttrValueNotUniqueException">
+        <description>Exception thrown when a value of an attribute is not unique.</description>
+    </exception>
+
+    <exception name="EquipException">
+    </exception>
+
+    <exception name="IpFormatException">
+    </exception>
+
+    <exception name="IpException">
+    </exception>
+
+    <exception name="TransactionRequiredException">
+        <description>Exception class thrown when an MO is accessed outside a transaction but the access method requires a transaction.</description>
+    </exception>
+
+    <exception name="ValueOutOfRangeException">
+        <description>Exception thrown when an MO attribute is requested to be set, but the requested value is not accepted.</description>
+    </exception>
+
+    <exception name="WrongAttributeTypeException">
+        <description>Exception thrown when an MO attribute is requested to be set, but the requested value is of the wrong type. </description>
+    </exception>
+
+    <exception name="NotHandledAttributeTypeException">
+        <description>Exception class thrown when an attribute of not handled type is requested. </description>
+    </exception>
+
+    <exception name="NoSuchFieldException">
+        <description>Exception class thrown when a Struct is accessed but the reqested Struct element is not found. </description>
+    </exception>
+
+    <exception name="MoCanNotBeCreatedException">
+    </exception>
+
+    <exception name="NoSuchAttributeException">
+        <description>Exception thrown when an MO attribute is requested to be accessed but the access 
+method for the is not defined (the attribute can not be accessed)</description>
+    </exception>
+
+    <exception name="MoCardinalityViolationException">
+        <description>Exception class thrown when the creation of an MO fails due to child - parent 
+cardinality violation. The cardinality is specified in the MIM. </description>
+    </exception>
+
+    <exception name="IllegalParentException">
+        <description>Exception thrown when the parent of the MO is of the wrong type.</description>
+    </exception>
+
+    <exception name="AttrNotSettableAtCreateException">
+        <description>Exception thrown when a create is ordered with 
+attribute values that are not settable at create.</description>
+    </exception>
+
+    <exception name="AttrMissingAtCreateException">
+        <description>Exception thrown when an attribute that is mandatory at create is missing.</description>
+    </exception>
+
+    <exception name="MoNameAlreadyTakenException">
+        <description>Exception thrown when an MO is created and the distinguished name of the MO is already in use.</description>
+    </exception>
+
+    <exception name="IllegalArgumentTypeException">
+        <description>Exception thrown if the argument supplied is of the wrong type, for example in an action.</description>
+    </exception>
+
+    <exception name="IllegalAttributeValueException">
+        <description>Exception thrown if the value of the attribute is not valid.</description>
+    </exception>
+
+    <enum name="RestartRank">
+        <enumMember name="RESTART_WARM">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="RESTART_REFRESH">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="RESTART_COLD">
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="AvailabilityStatus">
+        <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+        <enumMember name="IN_TEST">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="FAILED">
+            <value>2</value>
+        </enumMember>
+        <enumMember name="POWER_OFF">
+            <value>4</value>
+        </enumMember>
+        <enumMember name="OFF_LINE">
+            <value>8</value>
+        </enumMember>
+        <enumMember name="OFF_DUTY">
+            <value>16</value>
+        </enumMember>
+        <enumMember name="DEGRADED">
+            <value>64</value>
+        </enumMember>
+        <enumMember name="NOT_INSTALLED">
+            <value>128</value>
+        </enumMember>
+        <enumMember name="LOG_FULL">
+            <value>256</value>
+        </enumMember>
+        <enumMember name="DEPENDENCY_LOCKED">
+            <value>544</value>
+        </enumMember>
+        <enumMember name="DEPENDENCY_FAILED">
+            <value>1056</value>
+        </enumMember>
+        <enumMember name="DEPENDENCY_SHUTTINGDOWN">
+            <value>2080</value>
+        </enumMember>
+        <enumMember name="NO_STATUS">
+            <value>0</value>
+        </enumMember>
+    </enum>
+
+    <exception name="InvalidMoReferenceException">
+        <description>Exception thrown when the submitted MO reference is invalid.</description>
+    </exception>
+
+    <exception name="FroNotLockedException">
+        <description>Exception thrown when a fRo cannot be accessed.</description>
+    </exception>
+
+    <exception name="GeneralErrorException">
+        <description>Exception thrown by an MO when there is a general error.</description>
+    </exception>
+
+    <exception name="IdentityNotAllowedException">
+        <description>Exception thrown when an identity (LDN) specified at create is not allowed.</description>
+    </exception>
+
+    <exception name="IllegalMoTypeException">
+        <description>Exception thrown when a reference to an MO is of a unexpected/wrong MO type.</description>
+    </exception>
+
+    <exception name="ImpossibleCollectAtmInfoException">
+        <description>Exception thrown when gathering of ATM info fails.</description>
+    </exception>
+
+    <exception name="MoCanNotBeDeletedException">
+        <description>Exception thrown when its not possible to delete an MO.</description>
+    </exception>
+
+    <exception name="MoNotPossibleToReserveException">
+        <description>Exception thrown when by an MO if its not possible to reserve the MO.</description>
+    </exception>
+
+    <exception name="MoNotReservedByUserException">
+        <description>Exception thrown when a user tries to release an MO that is not reserved by this user.</description>
+    </exception>
+
+    <exception name="NoDiskException">
+        <description>Exception thrown when there is no hard disk.</description>
+    </exception>
+
+    <exception name="RemovalFailedException">
+        <description>Exception thrown when an element cannot be removed from a sequence.</description>
+    </exception>
+
+    <exception name="RestartRejectedException">
+        <description>Exception thrown when restart of the PlugInUnit is not allowed.</description>
+    </exception>
+
+    <enum name="SyncMode">
+        <description>The Sync Mode Operation of the node.</description>
+        <enumMember name="NOT_USED">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="CDMA">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="WCDMA">
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <struct name="Mtp2ProfileDataAnsi">
+        <structMember name="suermT">
+            <description>SUERM parameter T.
+Measured in SU units.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>511</max>
+                </range>
+                <defaultValue>64</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="suermD">
+            <description>SUREM parameter D.
+Measurement units are in SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>256</max>
+                </range>
+                <defaultValue>256</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="suermN">
+            <description>SUERM parameter N.
+Measurement units are in SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>256</max>
+                </range>
+                <defaultValue>16</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="tin">
+            <description>Normal AERM threshold, Tin. Number of signal errors that cause abortion of a normal proving peroid.
+
+Measurement units are SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>7</max>
+                </range>
+                <defaultValue>4</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="tie">
+            <description>Emergency AERM threshold, Tie. Number of signal units errors that cause abortion of an emergency proving period.
+
+Measurement units are SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>7</max>
+                </range>
+                <defaultValue>1</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="provings">
+            <description>Proving abort limit. Number of consecutive aborted proving periods that will cause a return to the Out Of Service state.
+
+Measurement units are the number of proving periods.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>7</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT1">
+            <description>Maximum time to stay in Aligned Ready state before signalling link failure. 
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>16300</max>
+                </range>
+                <defaultValue>12900</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT2">
+            <description>Maximum time to stay in Not Aligned state before signalling link failure.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>32700</max>
+                </range>
+                <defaultValue>5000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT3">
+            <description>Maximum time to stay in Aligned state before signalling link failure. 
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>16300</max>
+                </range>
+                <defaultValue>11500</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT4n">
+            <description>Length of the normal proving period.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>4000</max>
+                </range>
+                <defaultValue>2300</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT4e">
+            <description>Length of the emergengcy proving period. 
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>4000</max>
+                </range>
+                <defaultValue>600</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT5">
+            <description>Time between sending Status Indication "B" while in the Congested state. 
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>255</max>
+                </range>
+                <defaultValue>80</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT6">
+            <description>Maximum time a remote site may remain in the congestated state before signalling link failure. 
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>8100</max>
+                </range>
+                <defaultValue>1000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT7">
+            <description>Maximum time to wait for an expected acknowledgement of an MSU before signalling link failure. 
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>2000</max>
+                </range>
+                <defaultValue>500</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="bitRate">
+            <description>The speed of the link. Only supported values are 64 and 56 kbit/s.
+0 = 64 kbit/s.
+1 = 56 kbit/s.
+
+</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1</max>
+                </range>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="errorCorrection">
+            <description>The error correction algorithm to use. Only Basic Error Correction (BEC) is supported.
+0 = BEC
+</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1</max>
+                </range>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionOnSet1">
+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 1 messages towards client.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>70</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionOnSet2">
+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 2 messages towards client.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>80</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionOnSet3">
+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 3 messages towards client.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>90</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionAbatement1">
+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 1 messages.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>60</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionAbatement2">
+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 2 messages.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>70</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionAbatement3">
+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 3 messages.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>80</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionDiscardLevel1">
+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 1 is discarded by MTP2.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionDiscardLevel2">
+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 2 is discarded by MTP2.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionDiscardLevel3">
+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 3 is discarded by MTP2.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="n1Onset">
+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.
+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.
+This value is ignored otherwise.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>60</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="n2Onset">
+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.
+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.
+This value is ignored otherwise.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>70</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <struct name="Mtp2ProfileDataItu">
+        <structMember name="suermT">
+            <description>SUERM parameter T.
+Measured in SU units.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>64</max>
+                </range>
+                <defaultValue>64</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="suermD">
+            <description>SUREM parameter D.
+Measurement units are in SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>256</max>
+                </range>
+                <defaultValue>256</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="suermN">
+            <description>SUERM parameter N.
+Measurement units are in SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>256</max>
+                </range>
+                <defaultValue>16</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="tin">
+            <description>Normal AERM threshold, Tin. Number of signal errors that cause abortion of a normal proving peroid.
+
+Measurement units are SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>7</max>
+                </range>
+                <defaultValue>4</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="tie">
+            <description>Emergency AERM threshold, Tie. Number of signal units errors that cause abortion of an emergency proving period.
+
+Measurement units are SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>7</max>
+                </range>
+                <defaultValue>1</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="provings">
+            <description>Proving abort limit. Number of consecutive aborted proving periods that will cause a return to the Out Of Service state.
+
+Measurement units are the number of proving periods.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>7</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT1">
+            <description>Maximum time to stay in Aligned Ready state before signalling link failure.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>65500</max>
+                </range>
+                <defaultValue>40000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT2">
+            <description>Maximum time to stay in Not Aligned state before signalling link failure.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>262000</max>
+                </range>
+                <defaultValue>5000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT3">
+            <description>Maximum time to stay in Aligned state before signalling link failure.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>2000</max>
+                </range>
+                <defaultValue>1000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT4n">
+            <description>Length of the normal proving period.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>16300</max>
+                </range>
+                <defaultValue>7500</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT4e">
+            <description>Length of the emergengcy proving period.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>16300</max>
+                </range>
+                <defaultValue>400</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT5">
+            <description>Time between sending Status Indication "B" while in the Congested state.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>255</max>
+                </range>
+                <defaultValue>80</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT6">
+            <description>Maximum time a remote site may remain in the congestated state before signalling link failure. 
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>8100</max>
+                </range>
+                <defaultValue>3000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT7">
+            <description>Maximum time to wait for an expected acknowledgement of an MSU before signalling link failure.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>2000</max>
+                </range>
+                <defaultValue>500</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="bitRate">
+            <description>The speed of the link. Only supported values are 64 and 56 kbit/s.
+0 = 64 kbit/s.
+1 = 56 kbit/s.
+
+</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1</max>
+                </range>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="errorCorrection">
+            <description>The error correction algorithm to use. Only Basic Error Correction (BEC) is supported.
+0 = BEC
+</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1</max>
+                </range>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionOnSet1">
+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 1 messages towards client.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>70</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionOnSet2">
+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 2 messages towards client.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>80</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionOnSet3">
+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 3 messages towards client.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>90</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionAbatement1">
+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 1 messages.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>60</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionAbatement2">
+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 2 messages.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>70</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionAbatement3">
+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 3 messages.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>80</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionDiscardLevel1">
+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 1 is discarded by MTP2.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionDiscardLevel2">
+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 2 is discarded by MTP2.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionDiscardLevel3">
+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 3 is discarded by MTP2.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="n1Onset">
+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.
+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.
+This value is ignored otherwise.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>60</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="n2Onset">
+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.
+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.
+This value is ignored otherwise.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>70</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <struct name="Mtp2ProfileDataChina">
+        <structMember name="bitRate">
+            <description>The speed of the link. Only supported values are 64 and 56 kbit/s.
+0 = 64 kbit/s.
+1 = 56 kbit/s.
+
+</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1</max>
+                </range>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="errorCorrection">
+            <description>The error correction algorithm to use. Only Basic Error Correction (BEC) is supported.
+0 = BEC</description>
+            <long>
+                <range>
+                    <min>0</min> <max>1</max>
+                </range>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="provings">
+            <description>Proving abort limit. Number of consecutive aborted proving periods that will cause a return to the Out Of Service state.
+
+Measurement units are the number of proving periods.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>7</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="suermD">
+            <description>SUERM parameter D.
+Measurement units are in SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>256</max>
+                </range>
+                <defaultValue>256</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="suermN">
+            <description>SUERM parameter N.
+Measurement units are in SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>256</max>
+                </range>
+                <defaultValue>16</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="suermT">
+            <description>SUERM parameter T.
+Measured in SU units.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>64</max>
+                </range>
+                <defaultValue>64</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="tie">
+            <description>Emergency AERM threshold, Tie. Number of signal units errors that cause abortion of an emergency proving period.
+
+Measurement units are SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>7</max>
+                </range>
+                <defaultValue>1</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT1">
+            <description>Maximum time to stay in Aligned Ready state before signalling link failure.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>65500</max>
+                </range>
+                <defaultValue>45000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT2">
+            <description>Maximum time to stay in Not Aligned state before signalling link failure.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>262000</max>
+                </range>
+                <defaultValue>132000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT3">
+            <description>Maximum time to stay in Aligned state before signalling link failure.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>2000</max>
+                </range>
+                <defaultValue>1000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT4e">
+            <description>Length of the emergengcy proving period.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>16300</max>
+                </range>
+                <defaultValue>500</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT4n">
+            <description>Length of the normal proving period.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>16300</max>
+                </range>
+                <defaultValue>8200</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT5">
+            <description>Time between sending Status Indication "B" while in the Congested state.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>255</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT6">
+            <description>Maximum time a remote site may remain in the congestated state before signalling link failure. 
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>8100</max>
+                </range>
+                <defaultValue>5000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT7">
+            <description>Maximum time to wait for an expected acknowledgement of an MSU before signalling link failure.
+
+Measurement units are milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>2000</max>
+                </range>
+                <defaultValue>2000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="tin">
+            <description>Normal AERM threshold, Tin. Number of signal errors that cause abortion of a normal proving peroid.
+
+Measurement units are SUs.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>7</max>
+                </range>
+                <defaultValue>4</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionOnSet1">
+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 1 messages towards client.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>70</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionOnSet2">
+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 2 messages towards client.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>80</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionOnSet3">
+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 3 messages towards client.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>90</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionAbatement1">
+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 1 messages.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>60</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionAbatement2">
+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 2 messages.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>70</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionAbatement3">
+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 3 messages.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>80</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionDiscardLevel1">
+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 1 is discarded by MTP2.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionDiscardLevel2">
+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 2 is discarded by MTP2.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionDiscardLevel3">
+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 3 is discarded by MTP2.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="n1Onset">
+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.
+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.
+This value is ignored otherwise.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>60</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="n2Onset">
+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.
+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.
+This value is ignored otherwise.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>100</max>
+                </range>
+                <defaultValue>70</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <enum name="EmergencyStatus">
+        <description>This enumeration specifies the different stages of the emergency state.</description>
+        <enumMember name="NEVER_USED">
+            <description>Emergency state has not been activated since installation of license key file.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="ACTIVE">
+            <description>All capacity restrictions removed and all features enabled. The maximum time in this state is 7 days.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="USE_DEGRADED">
+            <description>A new license key file has to be istalled in order not to jopardize future use and performance.
+The maximum time in this state is 7 days.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="ACTIVE_AGAIN">
+            <description>All features enabled again for a maximum period of 7 days then a new license key file has to be installed in order to be able to use this node.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="USE_DISABLED">
+            <description>Use of the node is no longer allowed since no new license key file has been installed.</description>
+            <value>4</value>
+        </enumMember>
+    </enum>
+
+    <struct name="EmergencyInfo">
+        <description>This attribute provides information about the current EmergencyState.
+
+Note: for the states NEVER_USED and USE_DISABLED the return value for time is insignificant.</description>
+        <structMember name="state">
+            <description>The current emergency state of the license server.</description>
+            <enumRef name="EmergencyStatus">
+                <defaultValue>NEVER_USED</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="time">
+            <description>This attribute holds information on the time elapsed in this state.
+
+Note: The time out values for the states ALL_OPEN, DEGADED and PROLONGED is 7 days. The unit for this attribute is seconds.
+1 day = 86400 seconds
+7 days = 604800 seconds.</description>
+            <long>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <enum name="NodeRestartType">
+        <enumMember name="WARM_AT_PIU_RESTART">
+            <description>Warm node restart at restart of the last PIU.</description>
+            <value>4</value>
+        </enumMember>
+        <enumMember name="COLD_AT_PIU_RESTART">
+            <description>Cold node restart at restart of the last PIU.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="WARM_AT_PIU_FAULT">
+            <description>Warm node restart at fault mark of the last PIU.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="COLD_AT_PIU_FAULT">
+            <description>Cold node restart at fault mark of the last PIU.</description>
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <struct name="UniSaalProfileData">
+        <structMember name="maxPD">
+            <description>Maximum number of SD PDUs before a poll is sent.
+
+maxPD &lt; initialCredit</description>
+            <long>
+                <range>
+                    <min>10</min> <max>10000</max>
+                </range>
+                <defaultValue>25</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="maxStat">
+            <description>Maximum number, odd integer value, of list elements placed in a STAT PDU.
+
+Note: The maxStat attribute is dependent on the AAL5 maximum SDU size defined in the Aal5TpVccTp MO. The maxStat times 4 (octets) plus additional 12 octets (for header) must not exceed the AAL5 maximum SDU size (lower of the two directions, fromUserMaxSduSize and toUserMaxSduSize). 
+The consistency control is not performed until the UniSaalTp MO is created since there is no relation between the UniSaalProfile MO and the Aal5TpVccTp MO.</description>
+            <long>
+                <range>
+                    <min>3</min> <max>1001</max>
+                </range>
+                <defaultValue>67</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="initialCredit">
+            <description>Initial number of credits.
+
+Note: For 64 kbit/s use 30.
+
+Note! The value for initialCredit must be larger than the value of maxPD.
+</description>
+            <long>
+                <range>
+                    <min>10</min> <max>1000</max>
+                </range>
+                <defaultValue>250</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerKeepAlive">
+            <description>Timer to be used during a period of no outstanding acknowledgements or new data pending receipt of credit. At timeout the peer is polled to see if it is alive. The timer determines the interval between polls in transient phase. This timer should be greater than the roundtripdelay and also greater than timerpoll. Time unit = milliseconds.
+</description>
+            <long>
+                <range>
+                    <min>10</min> <max>10000</max>
+                </range>
+                <defaultValue>2000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerNoResponse">
+            <description>Timer to determine the maximum time interval during which at least one STAT PDU reception is expected as a response to a poll. This timer should be equal to timerKeepAlive+roundtripdelay. Time unit = milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>100000</max>
+                </range>
+                <defaultValue>7000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerIdle">
+            <description>Timer running when there are no PDUs to transmit and there are no outstanding acknowledgements or data pending for credit. When this timer is running, no POLL PDUs are sent. This timer should be significantly greater than timerKeepAlive value. Time unit = milliseconds.</description>
+            <long>
+                <range>
+                    <min>1000</min> <max>600000</max>
+                </range>
+                <defaultValue>15000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerCC">
+            <description>Timer determining the time between re-transmission of PDUs: BGN, END, ER, RS. Should be slightly more than the roundtripdelay. Time unit = milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>10000</max>
+                </range>
+                <defaultValue>1000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerPoll">
+            <description>Timer that specifies the maximum time between sending of POLL PDUs to the peer receiver during other traffic (active phase). Time unit = milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>100000</max>
+                </range>
+                <defaultValue>750</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="maxCC">
+            <description>Maximum number of re-transmissions of PDUs: BGN, END, ER, RS. Time unit = milliseconds.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>100</max>
+                </range>
+                <defaultValue>4</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionOnSet">
+            <description>Attribute specifying the percentage of the buffer that must be filled in order to cause congestion. Congestion is notified to the users of this protocol layer. The part of the buffer above the congestion level is used to take care of messages that were sent before the users stopped sending.
+
+This attribute should follow the rule 0 &lt;= congestationAbatement &lt; congestationOnSet &lt;= 100.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>100</max>
+                </range>
+                <defaultValue>70</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionAbatement">
+            <description>Attribute specifying the percentage of the buffer for which congestion is stopped. If the congestionAbatement level is lesser but almost equal to congestionOnSet, congestion alarms might be raised and ceased very often.
+
+This attribute should follow the rule 0 &lt;= congestationAbatement &lt; congestationOnSet &lt;= 100.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>100</max>
+                </range>
+                <defaultValue>60</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <struct name="NniSaalProfileData">
+        <description>Struct holding the values for an NniSaalProfile.
+
+NOTE: Congestition Level 1 - 3 is supported.</description>
+        <structMember name="timerPoll">
+            <description>Timer that specifies the maximum time between sending of POLL PDUs to the peer receiver during other traffic (active phase). Time unit = milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>100000</max>
+                </range>
+                <defaultValue>50</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="maxCC">
+            <description>Maximum number of re-transmissions of PDUs: BGN, END, ER, RS.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>100</max>
+                </range>
+                <defaultValue>4</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="maxPD">
+            <description>Maximum number of SD PDUs before a poll is sent.
+
+maxPD &lt; initialCredit</description>
+            <long>
+                <range>
+                    <min>0</min> <max>10000</max>
+                </range>
+                <defaultValue>25</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="maxStat">
+            <description>Maximum number, odd integer value, of list elements placed in a STAT PDU.
+
+Note: The maxStat attribute is controlled by the AAL5 maximum SDU size defined in the Aal5TpVccTp MO. The maxStat times 4 (octets) plus additional 12 octets (for header) must not exceed the AAL5 maximum SDU size (lower of the two directions, fromUserMaxSduSize and toUserMaxSduSize).
+
+The consistency control is not performed until the NniSaalTp MO is created since there is no relation between the NniSaalProfile MO and the Aal5TpVccTp MO.</description>
+            <long>
+                <range>
+                    <min>3</min> <max>1001</max>
+                </range>
+                <defaultValue>67</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="initialCredit">
+            <description>Initial number of credits.
+
+Note: For 64 kbit/s use 30.
+
+Note! The value for initialCredit must be larger than the value of maxPD.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>1000</max>
+                </range>
+                <defaultValue>250</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerKeepAlive">
+            <description>Timer to be used during a period of no outstanding acknowledgements or new data pending receipt of credit. At timeout the peer is polled to see if it is alive. The timer determines the interval between polls in transient phase. This timer should be greater than the roundtripdelay and also greater than timerpoll. Time unit = milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>10000</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerNoResponse">
+            <description>Timer to determine the maximum time interval during which at least one STAT PDU reception is expected as a response to a poll.This timer should be equal to timerKeepAlive+roundtripdelay. Time unit = milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>100000</max>
+                </range>
+                <defaultValue>500</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerIdle">
+            <description>Timer running when there are no PDUs to transmit and there are no outstanding acknowledgements or data pending for credit. When this timer is running, no POLL PDUs are sent. This timer should be significantly greater than timerKeepAlive value. Time unit = milliseconds.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>10000</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerCC">
+            <description>Timer determining the time between re-transmission of PDUs: BGN, END, ER, RS. Time unit = milliseconds.
+Should be more than the roundtrip delay.</description>
+            <long>
+                <range>
+                    <min>10</min> <max>10000</max>
+                </range>
+                <defaultValue>200</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="mps">
+            <description>Management Proving Status which is used to decide if proving is done or not during SAAL connection setup.
+</description>
+            <long>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionLevel1OnSet">
+            <description>Attribute specifying the percentage of the buffer that must be filled in order to cause congestion. 
+Congestion is notified to the users of this protocol layer. The part of the buffer above the congestion 
+level is used to take care of messages that were sent before the users stopped sending.
+
+Attribute specifying the percentage of the buffer that must be filled in order to cause congestion. 
+Congestion is notified to the users of this protocol layer. The part of the buffer above the congestion 
+level is used to take care of messages that were sent before the users stopped sending.
+
+This attribute should follow the rule 0 &lt;= congestationLevel1OnSet &lt;= congestationLevel2OnSet &lt;= congestationLevel3OnSet &lt;= 100.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>100</max>
+                </range>
+                <defaultValue>70</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionLevel2OnSet">
+            <description>Attribute specifying the percentage of the buffer that must be filled in order to cause congestion. 
+Congestion is notified to the users of this protocol layer. The part of the buffer above the congestion 
+level is used to take care of messages that were sent before the users stopped sending.
+
+This attribute should follow the rule 0 &lt;= congestationLevel1OnSet &lt;= congestationLevel2OnSet &lt;= congestationLevel3OnSet &lt;= 100.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>100</max>
+                </range>
+                <defaultValue>80</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionLevel3OnSet">
+            <description>Attribute specifying the percentage of the buffer that must be filled in order to cause congestion. 
+Congestion is notified to the users of this protocol layer. The part of the buffer above the congestion 
+level is used to take care of messages that were sent before the users stopped sending.
+
+This attribute should follow the rule 0 &lt;= congestationLevel1OnSet &lt;= congestationLevel2OnSet &lt;= congestationLevel3OnSet &lt;= 100.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>100</max>
+                </range>
+                <defaultValue>90</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="congestionLevel1Abatement">
+            <description>Attribute specifying the percentage of the buffer for which congestionLevel1 is stopped. If the congestionAbatement level is lesser but almost equal to congestionOnSet, congestion alarms might be raised and ceased very often.
+</description>
+            <long>
+                <range>
+                    <min>0</min> <max>100</max>
+                </range>
+                <defaultValue>60</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="nrOfPDUsDuringProving">
+            <description>The length of proving in terms of number of transmitted PDUs (n1).
+noOfPDUsDuringProving x T3 &lt; T2
+
+For the TTC standard the only allowed value is 0 (which means no proving).</description>
+            <long>
+                <range>
+                    <min>0</min> <max>100000</max>
+                </range>
+                <defaultValue>1000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="maxNRP">
+            <description>State variable which defines max number of retransmissions of PDUs during proving to consider proving successful.
+</description>
+            <long>
+                <range>
+                    <min>0</min> <max>100</max>
+                </range>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerNoCredit">
+            <description>Maximum time of no credit. If the timer expires, the assured data transfer mode is released.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>100000</max>
+                </range>
+                <defaultValue>1500</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerRepeatSrec">
+            <description>Timer which is set whenever a report of SSCOP recovery is received from the SSCF. If the timer is running when another report of recovery is received, the assured data transfer mode is released. If the timer expires, nothing is done. Time unit = milliseconds.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>86400000</max>
+                </range>
+                <defaultValue>3600000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT1">
+            <description>Timer between the link release action and the next link re-establish action during the alignment. At expiry of timer T1, a new attempt to setup assured data transfer mode to the peer is done. Time unit = milliseconds.
+</description>
+            <long>
+                <range>
+                    <min>10</min> <max>100000</max>
+                </range>
+                <defaultValue>5000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT2">
+            <description>Total time that SSCF will attempt alignment. At expiry of timer T2, the alignment procedure will be interrupted.
+ Time unit = milliseconds.
+</description>
+            <long>
+                <range>
+                    <min>10</min> <max>200000</max>
+                </range>
+                <defaultValue>30000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT3">
+            <description>Time between proving PDUs. The timer is set such that loading of the signalling link is approximately 50% of its nominal rate.  
+Time unit = milliseconds.</description>
+            <long>
+                <range>
+                    <min>5</min> <max>1000</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <exception name="ListOfTimeSlotsNotUniqueException">
+        <description>Exception thrown when a time slot appears more than once in the time slot list.</description>
+    </exception>
+
+    <enum name="RefActivity">
+        <description>RefActivity can have the following values:
+
+inactive = Synchronization reference is currently not used in system clock generation.
+active = Synchronization is used in system clock generation.
+</description>
+        <enumMember name="inactive">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="active">
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="RefState">
+        <description>RefState can have the following values:
+failed = synchronization reference is not capable to perform its required tasks.
+degraded = capability of synchronization reference to perform its required tasks is degraded e.g. because of signal level degradation. This value is only applicable for traffic carrying (ET physical path termination) synchronization references. Note: attribute degradationIsFault controls whether synchronization reference degradation is interpreted as a synchronization reference fault or not.
+lossOfTracking = system clock regulation algorithm on TU board can not follow the 8kHz synchronization reference signal either because of the poor quality of the signal or because of a HW fault at TU board. If all synchronization references repeatedly end up to state lossOfTracking, fault is likely in TU HW.
+ok = synchronization reference is capable of performing its required tasks.
+</description>
+        <enumMember name="failed">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="degraded">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="lossOfTracking">
+            <value>2</value>
+        </enumMember>
+        <enumMember name="ok">
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <enum name="FaultCriteria">
+        <description>FaultCriteria can have the following values:
+degrNotFault = synchronization reference degradation is NOT interpreted as a synchronization reference fault.
+degrIsFault = synchronization reference degradation is interpreted as a synchronization reference fault.</description>
+        <enumMember name="degrNotFault">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="degrIsFault">
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="ClockState">
+        <description>ClockState can have the following values:
+startUp = 
+locked = system clock signal on Timing Unit is locked: a synchronization reference is used in the system clock generation, clock accuracy is 50 ppb or better.
+holdOver = system clock signal on Timing Unit is hold-over: no synchronization reference is used in system clock generation, clock accuracy is 50 ppb or better.
+freeRunning = system clock signal on Timing Unit is free running: no synchronization reference is used in system clock generation, clock accuracy is 4.6 ppm or better.
+failed = system clock signal on Timing Unit is failed: fault in system clock generation function, no quarantee of clock accuracy level.
+not Applicable = system clock signal on Timing Unit is not applicable: TU board not present.</description>
+        <enumMember name="unknownMode">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="startupMode">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="lockedMode">
+            <value>2</value>
+        </enumMember>
+        <enumMember name="holdOverMode">
+            <value>3</value>
+        </enumMember>
+        <enumMember name="freeRunningMode">
+            <value>4</value>
+        </enumMember>
+        <enumMember name="failedMode">
+            <value>5</value>
+        </enumMember>
+        <enumMember name="lossOfTrackingMode">
+            <value>6</value>
+        </enumMember>
+        <enumMember name="notApplicable">
+            <value>7</value>
+        </enumMember>
+    </enum>
+
+    <exception name="AlreadyRegisteredException">
+        <description>Exception thrown when an object is already registered.</description>
+    </exception>
+
+    <exception name="MaxNoOfRefRegisteredException">
+        <description>Exception thrown when the maximum number of references is reached.</description>
+    </exception>
+
+    <exception name="PriorityAlreadyInUseException">
+        <description>Exception thrown when a priority is already in use.</description>
+    </exception>
+
+    <exception name="PriorityOutOfRangeException">
+        <description>Exception thrown when the priority is out of range.</description>
+    </exception>
+
+    <exception name="NotPermittedException">
+        <description>Exception thrown when an reference is not valid, null or of incorrect type.</description>
+    </exception>
+
+    <exception name="NotRegisteredException">
+        <description>Exception thrown when trying to de-register an object that is not registered in the database.</description>
+    </exception>
+
+    <enum name="SystemClockRedundancy">
+        <enumMember name="SYSTEM_CLOCK_USERS_USE_PLANE_A">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="SYSTEM_CLOCK_USERS_USE_PLANE_B">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="SYSTEM_CLOCK_USERS_USE_PLANE_A_AND_B">
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <exception name="NotUniqueFroIdException">
+        <description>Exception thrown when a fro Id is not unique.</description>
+    </exception>
+
+    <enum name="ActiveSwitchPlane">
+        <enumMember name="switchPlaneA">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="switchPlaneB">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="switchPlaneBoth">
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="SwitchReliableGroup">
+        <description>A predefined group consisting of working links and their corresponding protecting links.  These links  form the n+m link redundancy.  </description>
+        <enumMember name="physicalLinkStatusWorking">
+            <description>Defines physical link status. 
+</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="physicalLinkStatusProtecting">
+            <description>Defines physical link status. 
+</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="physicalLinkStatusUndefined">
+            <description>Defines physical link status. 
+</description>
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <struct name="GlobalTitleData">
+        <structMember name="indicator">
+            <description>Global title indicator should have following values for both ITU and TTC:
+
+The values for the GT Indicator 
+
+Value    Comment
+
+0            No new global title
+2            TT only
+3            TT-NP-ES
+4            TT-NP-ES-NOA
+
+Explanation: 
+
+TT = translation type 
+NP = numbering plan 
+ES = encoding scheme 
+NOA = nature of address indication</description>
+            <long>
+                <range>
+                    <min>0</min> <max>4</max>
+                </range>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="natureOfAddress">
+            <description>Indicates number type, i.e. national or international number.
+Coding of the Nature Address:
+
+0 = "unknown"
+1 = "Subscriber number"
+2 = "Reserved for national use"
+3 = "National significant number"
+4 = "International number"</description>
+            <long>
+                <range>
+                    <min>0</min> <max>4</max>
+                </range>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="numberingPlan">
+            <description>Indicates which numbering plan that is used.
+
+Coding of the Numbering Plan:
+
+0 = "Unknown"
+1 = "ISDN/Telephony Numbering Plan"
+3 = "Data Numbering Plan"
+4 = "Telex Numbering Plan"
+5 = "Maritime Mobile Numbering Plan"
+6 = "Land Mobile Numbering Plan"
+7 = "ISDN/Mobile Numbering Plan"
+</description>
+            <long>
+                <range>
+                    <min>0</min> <max>7</max>
+                </range>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="translationType">
+            <description>Used to direct the message to the appropriate Global Title translation function.</description>
+            <long>
+                <range>
+                    <min>0</min> <max>254</max>
+                </range>
+            </long>
+        </structMember>
+        <structMember name="addressInformation">
+            <description>Digit string of 1-37 digits, where each digit is 0-9, and B, C. B and C are for Code 11 and Code 12.
+The addressInformation may also contain wild card symbols: "*" or "?". Wild cards are only allowed for defining Global Title Translations, they are not allowed for specifying SCCP SAPs (built with SPC and Global Title or SPC + SSN + Global Title).</description>
+            <string>
+                <lengthRange>
+                    <min>1</min> <max>37</max>
+                </lengthRange>
+            </string>
+        </structMember>
+        <structMember name="encodingScheme">
+            <description>Indicates if the number of address signals are an odd or even number, and is coded as follows:
+
+0 = "Unknown"
+1 = "BCD, odd number of digits"
+2 = "BCD, even number of digits"
+
+Other values in the encoding scheme will result in the error "Wrong Nature Of Address", (Routing failure reason=No translation for an address of such nature).</description>
+            <long>
+                <range>
+                    <min>0</min> <max>2</max>
+                </range>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <enum name="SharingMode">
+        <enumMember name="loadShare">
+            <description>The when sharing mode is set to loadShare the SCCP traffic is load shared between the two entities (access points).</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="dupliDominant">
+            <description>When the sharing mode is set to dupliDominant the second entity (access point) is a backup for the first entity.</description>
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="EncodingScheme">
+        <description>Possible values for number signalling.</description>
+        <enumMember name="UNKNOWN">
+            <description>Unkown encoding scheme.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="ODD_NUMBER">
+            <description>BCD, odd number of digits.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="EVEN_NUMBER">
+            <description>BCD, even number of digits.</description>
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="GlobalTitleIndicator">
+        <description>Global title indicator values for China, ITU, TTC and ANSI.
+
+Note: China,  ITU and TCC will use TT_ONLY, TT_NP_ES, TT_NP_ES_NOA, NOA_ONLY.
+
+ANSI will use: 
+ANSI_TT_NP_ES = 5
+ANSI_TT_ONLY = 6 
+</description>
+        <enumMember name="TT_ONLY">
+            <description>Translation Type only. 
+
+Only valid for China, ITU and TTC.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="TT_NP_ES">
+            <description>Translation Type, Numbering Plan and Encoding Scheme.
+
+Only valid for China, ITU and TTC.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="TT_NP_ES_NOA">
+            <description>Translation Type, Numbering Plan, Encoding Scheme, and Nature Of Address indication.
+
+Only valid for China, ITU and TTC.</description>
+            <value>4</value>
+        </enumMember>
+        <enumMember name="NOA_ONLY">
+            <description>Nature of Address indicator only.
+
+Only valid for China, ITU and TTC.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="ANSI_TT_NP_ES">
+            <description>Translation Type, Numbering Plan and Encoding Scheme.
+
+Only valid for ANSI.
+</description>
+            <value>5</value>
+        </enumMember>
+        <enumMember name="ANSI_TT_ONLY">
+            <description>Translation Type only.
+
+Only valid for ANSI.
+</description>
+            <value>6</value>
+        </enumMember>
+    </enum>
+
+    <enum name="NatureOfAddress">
+        <description>Phone number types.</description>
+        <enumMember name="UNKNOWN">
+            <description>Unknown number type.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="SN">
+            <description>Subscriber number type.
+</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="RN">
+            <description>Reserved for national use, number type.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="NSN">
+            <description>National Significant Number type.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="IN">
+            <description>International number type.</description>
+            <value>4</value>
+        </enumMember>
+    </enum>
+
+    <enum name="NumberingPlan">
+        <description>Numbering plans.</description>
+        <enumMember name="UNKNOWN">
+            <description>Unknown numbering plan.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="TELEPHONY">
+            <description>ISDN/Telephony numbering plan.
+</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="DATA">
+            <description>Data numbering plan.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="TELEX">
+            <description>Telex numbering plan.
+</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="MOBILE_MARITIME">
+            <description>Maritime mobile numering plan.
+</description>
+            <value>4</value>
+        </enumMember>
+        <enumMember name="MOBILE_LAND">
+            <description>Land mobile numbering plan.
+</description>
+            <value>5</value>
+        </enumMember>
+        <enumMember name="MOBILE">
+            <description>ISDN/Mobile numbering plan.</description>
+            <value>6</value>
+        </enumMember>
+    </enum>
+
+    <enum name="SccpCountType">
+        <enumMember name="MESSAGES">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="OCTETS">
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <struct name="Scmg">
+        <structMember name="sendSST">
+            <description>Controls when to send SST (SCCP Subsystem Test message).
+
+0 = Wait for tStatInfo timer to expire once after MTP_RESUME before sending SST. 
+1 = Send SST immediately after MTP_RESUME, then start tStatInfo timer.</description>
+            <long>
+                <defaultValue>1</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="sendSSA">
+            <description>Controls when to send SSA (SCCP Subsystem Allowed message).
+
+0 = Do not send SSA when client attaches, wait  until SST is received. (default for ANSI/CHINA/ITU/TTC)
+1 = Send SSA immediately when client attaches.</description>
+            <long>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="sendSSP">
+            <description>Controls whether to send SSP (SCCP Subsystem Prohibited message).
+
+0 = Do not send SSP when client detaches. (default for TTC)
+1 = Send SSP immediately when client detaches. (default for ANSI/CHINA/ITU)</description>
+            <long>
+                <defaultValue>1</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="useSST">
+            <description>Controls whether to send SST messages or not (SCCP Subsystem Test message).
+
+0 = Send SST as indicated by sendSST. (default for ANSI/CHINA/ITU)
+1 = (not used)
+2 = (not used)
+3 = Do not initiate SST messages at all, ie. do not start timer tStatInfo nor send any SST at MTP_RESUME. (default for TTC)</description>
+            <long>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="allowRemoteBroadcast">
+            <description>Controls the remote broadcast.
+
+0 = allow remote broadcast. (default for ANSI/CHINA/ITU/TTC)
+1 = do not allow remote broadcast</description>
+            <long>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="initiateTimerTcon">
+            <description>Controls whether to initiate hardcoded congestion timer or not.
+
+0 = start timer when SSC is received. (default for CHINA/ITU/TTC)
+1 = do not start timer
+
+Note! This attribute is not valid for the ANSI standard.</description>
+            <long>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <enum name="DiscardReturnServiceMsg">
+        <enumMember name="DISCARD">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="RETURN">
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <exception name="WrongUserTypeException">
+    </exception>
+
+    <exception name="UsageNotPermittedException">
+    </exception>
+
+    <enum name="J1Type">
+        <description>J1Type can have the following values:
+J1_G = 0 according to  TTC JT-G703/G704
+J1_I = 1 according to TCC JT-I431</description>
+        <enumMember name="j1_G">
+            <description>J1 according to  TTC JT-G703/G704</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="j1_I">
+            <description>J1 according to TCC JT-I431</description>
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="StandardMode">
+        <description>Indicates what standard the MAO is operating to.</description>
+        <enumMember name="TTC">
+            <description>The standard mode is Telecommunication Technology Committee (TTC).</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="ANSI">
+            <description>The standard mode ANSI.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="ETSI">
+            <description>The standard mode is ETSI.</description>
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="MuxMode">
+        <description>Indicates what multiplexing is being used.</description>
+        <enumMember name="STANDBY">
+            <description>Standby for protection.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="E1_J1_T1_LEVEL">
+            <description>Multiplexing terminated at the E1/J1/T1 level.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="VC4_STS3CSPE_LEVEL">
+            <description>Multiplexing terminated at the VC-4/STS3CSPE level.</description>
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="Os155LoopBack">
+        <description>The loopback method available for use by the Os155SpiTtp MO.</description>
+        <enumMember name="NONE">
+            <description>No loopback in use.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="LINE">
+            <description>Loopingback using line.</description>
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="SwitchModes">
+        <description>The switch modes.</description>
+        <enumMember name="AUTOMATIC">
+            <description>Automatic switching.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="LOCKED">
+            <description>Locked for swtiching.</description>
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <exception name="FailedResourceException">
+    </exception>
+
+    <exception name="LockedResourceException">
+    </exception>
+
+    <exception name="UnknownReasonException">
+    </exception>
+
+    <exception name="AlreadyLockedException">
+    </exception>
+
+    <exception name="IncorrectOsi155SpiIdException">
+    </exception>
+
+    <enum name="PathTraceFormat">
+        <description>Path Trace Formats.</description>
+        <enumMember name="ITU_T_G707">
+            <description>16 byte path trace format according to ITU-T G707 table 4.</description>
+            <value>16</value>
+        </enumMember>
+        <enumMember name="GR_253_CORE">
+            <description>64 byte path trace format according to section 3.3.2.3, Telecordia GR-253-CORE.</description>
+            <value>64</value>
+        </enumMember>
+    </enum>
+
+    <enum name="Crc4Mode">
+        <description>Cyclical Redundancy Checks 4 modes.</description>
+        <enumMember name="OFF">
+            <description>CRC 4  is off.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="ON">
+            <description>CRC 4 is on.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="AUTOMATIC">
+            <description>CRC 4 is automatic.</description>
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="IdlePattern">
+        <description>Idle patterns.</description>
+        <enumMember name="A_LAW">
+            <description>A law idle pattern.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="U_LAW">
+            <description>Micro law  idle pattern.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="UNDEFINED">
+            <description>Undefined idle pattern.</description>
+            <value>0</value>
+        </enumMember>
+    </enum>
+
+    <enum name="LoopbackState">
+        <description>The possible loopback states for E1/J1/T1/E3/T3PhysPathTerm MOs.</description>
+        <enumMember name="none">
+            <description>This is the normal state, no loop back is preformed (and ordinary traffic is running).</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="line">
+            <description>The phyiscal path is looped on the line side, the external incoming path is looped back to the external outgoing path.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="system">
+            <description>The physical path is looped on the system side, the (node-) internal incoming path is looped back to the internal outgoing path.</description>
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="TransmissionMode">
+        <description>L stands for long haul interface and S stands for short haul interface.
+The subsequent figure specifies the cable distance in feets.</description>
+        <enumMember name="L_6000">
+            <description>Long Haul 6000 ft, -0 dB</description>
+            <value>8</value>
+        </enumMember>
+        <enumMember name="L_4000">
+            <description>Long Haul 4000 ft, -7 dB</description>
+            <value>7</value>
+        </enumMember>
+        <enumMember name="L_2000">
+            <description>Long Haul 2000 ft, -15 dB</description>
+            <value>6</value>
+        </enumMember>
+        <enumMember name="L_0">
+            <description>Long Haul 0 ft, -22 dB</description>
+            <value>5</value>
+        </enumMember>
+        <enumMember name="S_133">
+            <description>Short Haul 0..133 ft</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="S_266">
+            <description>Short Haul 134..266 ft</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="S_399">
+            <description>Short Haul 267..399 ft</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="S_533">
+            <description>Short Haul 400..533 ft</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="S_655">
+            <description>Short Haul 534..655 ft</description>
+            <value>4</value>
+        </enumMember>
+    </enum>
+
+    <struct name="Mtp3bSpItuPriorityData">
+        <description>Priority attributes for MTP3b SP of the ITU standard.</description>
+        <structMember name="prioSlt">
+            <description>The prioSlt attribute sets the priority for the
+ Signalling Link Test  Message and Acknowledge (SLTM / SLTA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioCo">
+            <description>The prioCo attribute sets the priority for the ChangeOver Order and Acknowledge (COO/COA) or eXtended Change over Order and Acknowledge (XCO/XCA) messages  when  issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet)
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioCb">
+            <description>The prioCb attribute sets the priority for the
+ Change Back Declaration and Acknowledge (CBD / CBA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioEc">
+            <description>The prioEc attribute sets the priority for the
+Emergency Change over Order and Acknowledge (ECO / ECA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).	
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioRst">
+            <description>The prioRst attribute sets the priority for the
+signalling Route Set Test (RST) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioTra">
+            <description>The prioTra attribute sets the priority for the
+Traffic Restart Allowed signal (TRA) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioUpu">
+            <description>The prioUpu attribute sets the priority for the
+ User Part Unavailable (UPU) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioLink">
+            <description>The prioLink attribute sets the priority for link related messages when issued by the MTP3b itself. The messages are :
+
+Link INhibit (LIN), Link UNinhibit (LUN),
+Link Inhibit Denied (LID),
+Link Inhibit Acknowledge (LIA),
+Link Uninhibit Acknowledge (LUA),
+Link Forced Uninhibit (LFU), 
+Link Local inhibit Test (LLT) and
+Link Remote inhibit Test (LRT)
+
+When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+    </struct>
+
+    <struct name="Mtp3bSpItuTimerData">
+        <description>ITU timers for MTP3bSpItu. Timervalues in 1/10 s (deciseconds).</description>
+        <structMember name="timerT1">
+            <description>Delay to avoid message mis-sequencing on changeover.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT2">
+            <description>Timer for waiting for a COO or a COA.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT3">
+            <description>Delay to avoid message mis-sequencing  on a time controlled diversion change back.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT4">
+            <description>Timer for waiting for CBA, first attempt.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT5">
+            <description>Timer for waiting for CBA, second attempt
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT6">
+            <description>Timer for delay to avoid message mis-sequencing on controlled rerouting.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>9</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT8">
+            <description>Timer for delay to prohibit sending of TFP messages via the response method. This is a STP specific parameter, which is ignored when configured as an endpoint.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT10">
+            <description>Timer for waiting to repeat sending of RST periodically.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>400</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT12">
+            <description>Waiting for uninhibit acknowledgement.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT13">
+            <description>Timer for waiting for force uninhibit.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT14">
+            <description>Timer for waiting for inhibition acknowledgement.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>30</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT17">
+            <description>Delay to avoid oscillation of initial alignment failure and link restart.
+
+The value for this timer should be less than the value for timerT2.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>9</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTBsnt">
+            <description>Waiting for BSNT value from MTP-2 or SAAL (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTRetrieval">
+            <description>Timer for waiting for completion of buffer retrieval from MTP-2 or SAAL (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTStart">
+            <description>Timer for retransmission of DL_START_req if no answer received. Started when timerT17 expires. (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>1200</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTc">
+            <description>Controlling the period a route set is considered congested when a Transfer Controlled message has been received. 
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>50</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT18">
+            <description>Supervision timer for the first phase of a restarting STP. This is an STP specific parameter, which is ignored when configured as an endpoint.
+
+The value for this timer should be less than the value for timerT2.
+
+Unit: deciseconds (1/10 second).
+</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>550</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT19">
+            <description>Controlling the response of the receipt of a traffic restart message from an adjacent node.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>680</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT20">
+            <description>Overall MTP restart timer at the restarting MTP.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>600</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT21">
+            <description>Overall MTP restart timer at an adjacent signalling point to a restarting MTP.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>640</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT22">
+            <description>Local inhibit test timer.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>2500</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT23">
+            <description>Remote inhibit test timer.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>2500</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerSlta">
+            <description>Supervision timer for SLTA message (time within SLTA should arrive).
+
+Timer T1 in ITU Q.707 standard.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerSltm">
+            <description>Timer for sending SLTM periodically.
+
+Timer T2 in ITU Q.707 standard.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>400</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaTack">
+            <description>Timer used for message acknowledgement.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaPeriodicAudit">
+            <description>Timer used for audit procedure.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>300</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT1">
+            <description>Delay to avoid mis-sequencing of messages when an association fails.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT3">
+            <description>Delay to avoid mis-sequencing of messages when an association becomes active.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT6">
+            <description>Delay to avoid mis-sequencing on controlled rerouting.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT8">
+            <description>Delay to prohibit sending of DUNA messages via the response method.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT40">
+            <description>Delay to avoid message mis-sequencing on controlled/forced rerouting.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT41">
+            <description>Timer controlloing the traffic activation delay during restart phase.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT42">
+            <description>The forever interval period for trying association after an unsiccessfull trial.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaTc">
+            <description>Timer controlling the period a route set is considered congested when a SCON message has been received.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>50</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT15">
+            <description>Timer waiting to start signaling route set congestiontest. Used only if the Route Set 
+Congestion Test Selectoption is set to "Use Route Set Congestion test".
+
+Guiding value 20 - 30.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT16">
+            <description>Timer waiting for route set congestion status update. Used only if the Route Set 
+Congestion Test Selectoption is set to "Use Route Set Congestion test"
+
+Guiding value 14 - 22.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>14</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTDlack">
+            <description>Timer pending an acknowledge from the network layer for a DL_ACK_REQ.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaTassocack">
+            <description>Timer used for SCTP_ASSOCIATE_REQ message acknowledgement. This is the maximum time to wait for the SCTP_COMMUP_IND mesage before considering it to be an error.
+It should be longer than the time a message spends to reach the most distant destination, be processed and returned.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <enum name="CongestLevel">
+        <description>The supported congestion levels.</description>
+        <enumMember name="level_0">
+            <description>No Congestion.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="level_1">
+            <description>Congestion level low.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="level_2">
+            <description>Congestion level medium.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="level_3">
+            <description>Congestion level high.</description>
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <exception name="ActivationFailedException">
+    </exception>
+
+    <exception name="NoAvailRouteException">
+    </exception>
+
+    <enum name="Mtp3bCongestLevel">
+        <enumMember name="notCongested">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="congested">
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="Mtp3bNetworkInd">
+        <description>Indicates which type of geographical network, e.g. national, international, etc..
+
+Note: Not applicable for TTC.</description>
+        <enumMember name="INTERNATIONAL_NETWORK">
+            <description>International Network.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="SPARE">
+            <description>Spare (for international use only).</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="NATIONAL_NETWORK">
+            <description>National network.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="RESERVED_FOR_NATIONAL_USE">
+            <description>Reserved for national use.</description>
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <enum name="Mtp3bTfrHandling">
+        <description>Indicates how a TransFer Restricted (TFR) signal is handled.</description>
+        <enumMember name="HANDLE_AS_TFA">
+            <description>Treat the TransFer Restricted (FTR) signal as a TransFer Allowed (TFA) signal.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="IGNORED">
+            <description>Ignore the TransFer Restricted (TFR) signal.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="HANDLE_BY_STANDARD">
+            <description>Handle the incoming TRF messages according to the standard.</description>
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="Mtp3bSioSpareBitsUse">
+        <description>Indicates whether the two spare bits in the Service Information Octet (SIO) should be treated as spare or for indicating a priority level. </description>
+        <enumMember name="SPARE">
+            <description>The two spare bits in the SIO are treated as spare.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="PRIO">
+            <description>The two spare bits in the SIO are to be used for indicating a priority level.</description>
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="Mtp3bItuVersion">
+        <description>Indicates which version of the ITU standard.</description>
+        <enumMember name="ITU_T_88">
+            <description>ITU-T -88.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="ITU_T_03_93">
+            <description>ITU-T 03/93.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="ITU_T_07_96">
+            <description>ITU-T 07/96</description>
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <struct name="Mtp3bSpAnsiTimerData">
+        <description>ANSI timers for MTP3bSpAnsi. Timervalues in 1/10 s (deciseconds).</description>
+        <structMember name="timerT1">
+            <description>Delay to avoid message mis-sequencing on changeover.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT2">
+            <description>Timer for waiting for a COO or a COA.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT3">
+            <description>Delay to avoid message mis-sequencing  on a time controlled diversion change back.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT4">
+            <description>Timer for waiting for CBA, first attempt.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT5">
+            <description>Timer for waiting for CBA, second attempt
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT6">
+            <description>Timer for delay to avoid message mis-sequencing on controlled rerouting.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>9</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT8">
+            <description>Timer for delay to prohibit sending of TFP messages via the response method. This is a STP specific parameter, which is ignored when configured as an endpoint.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT10">
+            <description>Timer for waiting to repeat sending of RST periodically.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>400</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT12">
+            <description>Waiting for uninhibit acknowledgement.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT13">
+            <description>Timer for waiting for force uninhibit.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT14">
+            <description>Timer for waiting for inhibition acknowledgement.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>30</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT15">
+            <description>Timer waiting to start signaling route set congestiontest. Used only if the Route Set 
+Congestion Test Selectoption is set to "Use Route Set Congestion test".
+
+Guiding value 20 - 30.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT16">
+            <description>Timer waiting for route set congestion status update. Used only if the Route Set 
+Congestion Test Selectoption is set to "Use Route Set Congestion test"
+
+Guiding value 14 - 22.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>14</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT17">
+            <description>Delay to avoid oscillation of initial alignment failure and link restart.
+
+The value for this timer should be less than the value for timerT2.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>9</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTBsnt">
+            <description>Waiting for BSNT value from MTP-2 or SAAL (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTRetrieval">
+            <description>Timer for waiting for completion of buffer retrieval from MTP-2 or SAAL (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTStart">
+            <description>Timer for retransmission of DL_START_req if no answer received. Started when timerT17 expires. (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>1200</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTc">
+            <description>Controlling the period a route set is considered congested when a Transfer Controlled message has been received. 
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>50</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT30">
+            <description>Timer to limit sending of TFPs and TFRs in response to unexpected TRA and TRW. This timer is specific for STP functionality and is ignored when configured as an endpoint.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>300</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT25">
+            <description>Delay extension timer invoked on reciept of a Traffic Restart Waiting message from an adjacent SP which is restarting.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>300</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT26">
+            <description>Controlling the periodic resend of Traffic Restart Waiting messages during restart of the local node.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>120</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT27">
+            <description>Timer enforcing a minimum node unavailablility period during MTP restart.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT28">
+            <description>Delay timer controlling a timed reaction of the restart of an adjacent node.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>30</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT29">
+            <description>Timer controlling the response of the receipt of Traffic Restart messages from an adjacent node.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>600</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT20">
+            <description>Controlling the periodic resend of Local Inhibit Change Message.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>1000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT21">
+            <description>Controlling the periodic resend of Remote Inhibit Test Message.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>1000</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT22">
+            <description>Delay on commencement of MTP Restart to allow the node to rebuild an accurate routing table based on messages for adjacent nodes.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>600</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT23">
+            <description>Supervision timer for routing updates on MTP Restart.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>40</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT31">
+            <description>Timer controlling the detection of false link congestion.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTDlack">
+            <description>Timer pending an acknowledge from the network layer for a DL_ACK_REQ.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerSltm">
+            <description>Timer for sending SLTM periodically.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>400</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerSlta">
+            <description>Supervision timer for SLTA message (time within SLTA should arrive).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaTack">
+            <description>Timer used for message acknowledgement.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaPeriodicAudit">
+            <description>Timer used for audit procedure.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>300</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT1">
+            <description>Delay to avoid mis-sequencing of messages when an association fails.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT3">
+            <description>Delay to avoid mis-sequencing of messages when an association becomes active.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT6">
+            <description>Delay to avoid mis-sequencing on controlled rerouting.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT8">
+            <description>Delay to prohibit sending of DUNA messages via the response method.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT40">
+            <description>Delay to avoid message mis-sequencing on controlled/forced rerouting.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT41">
+            <description>Timer controlloing the traffic activation delay during restart phase.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT42">
+            <description>The forever interval period for trying association after an unsiccessfull trial.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaTc">
+            <description>Timer controlling the period a route set is considered congested when a SCON message has been received.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>50</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaTassocack">
+            <description>Timer used for SCTP_ASSOCIATE_REQ message acknowledgement. This is the maximum time to wait for the SCTP_COMMUP_IND mesage before considering it to be an error.
+It should be longer than the time a message spends to reach the most distant destination, be processed and returned.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <struct name="Mtp3bSpTtcTimerData">
+        <description>TTC timers for MTP3bSpTtc. Timervalues in 1/10 s (deciseconds).</description>
+        <structMember name="timerT1">
+            <description>Delay to avoid message mis-sequencing on changeover.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT2">
+            <description>Timer for waiting for a COO or a COA.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT3">
+            <description>Delay to avoid message mis-sequencing  on a time controlled diversion change back.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT4">
+            <description>Timer for waiting for CBA, first attempt.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT6">
+            <description>Timer for delay to avoid message mis-sequencing on controlled rerouting.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>9</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT8">
+            <description>Timer for delay to prohibit sending of TFP messages via the response method. This is a STP specific parameter, which is ignored when configured as an endpoint.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT10">
+            <description>Timer for waiting to repeat sending of RST periodically.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>400</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT17">
+            <description>Delay to avoid oscillation of initial alignment failure and link restart.
+
+The value for this timer should be less than the value for timerT2.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>9</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerSrt">
+            <description>Timer pending a Signalling Route Test Acknowledgement.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTBsnt">
+            <description>Waiting for BSNT value from MTP-2 or SAAL (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTRetrieval">
+            <description>Timer for waiting for completion of buffer retrieval from MTP-2 or SAAL (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTStart">
+            <description>Timer for retransmission of DL_START_req if no answer received. Started when timerT17 expires. (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>1200</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTc">
+            <description>Controlling the period a route set is considered congested when a Transfer Controlled message has been received. 
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>50</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT15">
+            <description>Timer waiting to start signaling route set congestiontest. Used only if the Route Set 
+Congestion Test Selectoption is set to "Use Route Set Congestion test".
+
+Guiding value 20 - 30.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT16">
+            <description>Timer waiting for route set congestion status update. Used only if the Route Set 
+Congestion Test Selectoption is set to "Use Route Set Congestion test"
+
+Guiding value 14 - 22.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>14</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTDlack">
+            <description>Timer pending an acknowledge from the network layer for a DL_ACK_REQ.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <struct name="Mtp3bSpAnsiPriorityData">
+        <description>Priority attributes for MTP3b SP of the ANSI standard.</description>
+        <structMember name="prioSlt">
+            <description>The prioSlt attribute sets the priority for the
+ Signalling Link Test  Message and Acknowledge (SLTM / SLTA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioCo">
+            <description>The prioCo attribute sets the priority for the ChangeOver Order and Acknowledge (COO/COA) or eXtended Change over Order and Acknowledge (XCO/XCA) messages  when  issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet)
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioCb">
+            <description>The prioCb attribute sets the priority for the
+ Change Back Declaration and Acknowledge (CBD / CBA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioEc">
+            <description>The prioEc attribute sets the priority for the
+Emergency Change over Order and Acknowledge (ECO / ECA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).	
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioRst">
+            <description>The prioRst attribute sets the priority for the
+signalling Route Set Test (RST) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioTra">
+            <description>The prioTra attribute sets the priority for the
+Traffic Restart Allowed signal (TRA) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioUpu">
+            <description>The prioUpu attribute sets the priority for the
+ User Part Unavailable (UPU) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioLink">
+            <description>The prioLink attribute sets the priority for link related messages when issued by the MTP3b itself. The messages are :
+
+Link INhibit (LIN), Link UNinhibit (LUN),
+Link Inhibit Denied (LID),
+Link Inhibit Acknowledge (LIA),
+Link Uninhibit Acknowledge (LUA),
+Link Forced Uninhibit (LFU), 
+Link Local inhibit Test (LLT) and
+Link Remote inhibit Test (LRT)
+
+When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+    </struct>
+
+    <struct name="Mtp3bSpTtcPriorityData">
+        <description>Priority attributes for MTP3b SP of the TTC standard.</description>
+        <structMember name="prioCo">
+            <description>The prioCo attribute sets the priority for the ChangeOver Order and Acknowledge (COO/COA) or eXtended Change over Order and Acknowledge (XCO/XCA) messages  when  issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet)
+.</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioCb">
+            <description>The prioCb attribute sets the priority for the
+ Change Back Declaration and Acknowledge (CBD / CBA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioEc">
+            <description>The prioEc attribute sets the priority for the
+Emergency Change over Order and Acknowledge (ECO / ECA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).	
+
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioRst">
+            <description>The prioRst attribute sets the priority for the
+signalling Route Set Test (RST) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioTfa">
+            <description>The prioTfa attribute sets the priority for the Transfer Allowed, TFA, messages.	
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioRt">
+            <description>The priority indicator used for indicating message priority for signalling route test messages (SRT/SRA).
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioTfc">
+            <description>The priority indicator used for indicating the message prioirity for TFC.
+</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+    </struct>
+
+    <enum name="Mtp3bSpPriorityLevel">
+        <description>Indicates the priority level for MTP 3.</description>
+        <enumMember name="LOWEST">
+            <description>Lowest priority setting.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="LOW">
+            <description>Low priority setting.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="HIGH">
+            <description>High priority setting.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="HIGHEST">
+            <description>Highest priority setting.</description>
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <struct name="Mtp3bSpChinaTimerData">
+        <description>China timers for MTP3bSpChina. Timervalues in 1/10 s (deciseconds).</description>
+        <structMember name="timerSlta">
+            <description>Supervision timer for SLTA message (time within SLTA should arrive).
+
+Timer T1 in ITU Q.707 standard.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>100</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerSltm">
+            <description>Timer for sending SLTM periodically.
+
+Timer T2 in ITU Q.707 standard.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>400</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT1">
+            <description>Delay to avoid message mis-sequencing on changeover.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT10">
+            <description>Timer for waiting to repeat sending of RST periodically.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>400</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT12">
+            <description>Waiting for uninhibit acknowledgement.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT13">
+            <description>Timer for waiting for force uninhibit.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT14">
+            <description>Timer for waiting for inhibition acknowledgement.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>30</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT17">
+            <description>Delay to avoid oscillation of initial alignment failure and link restart.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>9</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT18">
+            <description>Supervision timer for the first phase of a restarting STP. This is an STP specific parameter, which is ignored when configured as an endpoint.
+
+Unit: deciseconds (1/10 second).
+</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>200</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT19">
+            <description>Controlling the response of the receipt of a traffic restart message from an adjacent node.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>40</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT2">
+            <description>Timer for waiting for a COO or a COA.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT20">
+            <description>Overall MTP restart timer at the restarting MTP.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>40</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT21">
+            <description>Overall MTP restart timer at an adjacent signalling point to a restarting MTP.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>300</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT22">
+            <description>Local inhibit test timer.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>2500</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT23">
+            <description>Remote inhibit test timer.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>2500</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT3">
+            <description>Delay to avoid message mis-sequencing  on a time controlled diversion change back.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT4">
+            <description>Timer for waiting for CBA, first attempt.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT5">
+            <description>Timer for waiting for CBA, second attempt
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT6">
+            <description>Timer for delay to avoid message mis-sequencing on controlled rerouting.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>9</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT8">
+            <description>Timer for delay to prohibit sending of TFP messages via the response method. This is a STP specific parameter, which is ignored when configured as an endpoint.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTBsnt">
+            <description>Waiting for BSNT value from MTP-2 or SAAL (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTc">
+            <description>Controlling the period a route set is considered congested when a Transfer Controlled message has been received. 
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>50</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTRetrieval">
+            <description>Timer for waiting for completion of buffer retrieval from MTP-2 or SAAL (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>10</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTStart">
+            <description>Timer for retransmission of DL_START_req if no answer received. Started when timerT17 expires. (not standard timer).
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>1200</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaTack">
+            <description>Timer used for message acknowledgement.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaPeriodicAudit">
+            <description>Timer used for audit procedure.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>300</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT1">
+            <description>Delay to avoid mis-sequencing of messages when an association fails.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT3">
+            <description>Delay to avoid mis-sequencing of messages when an association becomes active.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT6">
+            <description>Delay to avoid mis-sequencing on controlled rerouting.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>5</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT8">
+            <description>Delay to prohibit sending of DUNA messages via the response method.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT40">
+            <description>Delay to avoid message mis-sequencing on controlled/forced rerouting.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT41">
+            <description>Timer controlloing the traffic activation delay during restart phase.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaT42">
+            <description>The forever interval period for trying association after an unsiccessfull trial.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>8</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaTc">
+            <description>Timer controlling the period a route set is considered congested when a SCON message has been received.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>50</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT15">
+            <description>Timer waiting to start signaling route set congestiontest. Used only if the Route Set 
+Congestion Test Selectoption is set to "Use Route Set Congestion test".
+
+Guiding value 20 - 30.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerT16">
+            <description>Timer waiting for route set congestion status update. Used only if the Route Set 
+Congestion Test Selectoption is set to "Use Route Set Congestion test"
+
+Guiding value 14 - 22.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>14</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerTDlack">
+            <description>Timer pending an acknowledge from the network layer for a DL_ACK_REQ.
+
+Unit: deciseconds (1/10 second).</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="timerM3uaTassocack">
+            <description>Timer used for SCTP_ASSOCIATE_REQ message acknowledgement. This is the maximum time to wait for the SCTP_COMMUP_IND mesage before considering it to be an error.
+It should be longer than the time a message spends to reach the most distant destination, be processed and returned.</description>
+            <long>
+                <range>
+                    <min>1</min> <max>65535</max>
+                </range>
+                <defaultValue>20</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <enum name="Mtp3bNetworkIndTtc">
+        <description>Indicates which type of geographical network, e.g. national, international, etc..
+
+Note: Only for TTC.</description>
+        <enumMember name="NATIONAL_NETWORK">
+            <description>National network.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="SPARE">
+            <description>Spare (for international use only).</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="INTERNATIONAL_NETWORK">
+            <description>International Network.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="SPARE_1">
+            <description>Spare.</description>
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <enum name="Mtp3bUsageState">
+        <description>There are three possible states for the usageState attribute:
+
+- idle, the Mtp3bSl carries no traffic.
+- active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.
+- busy, the Mtp3bSl is working but is congested (traffic is routed on other links).</description>
+        <enumMember name="IDLE">
+            <description>idle, the Mtp3bSl carries no traffic.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="ACTIVE">
+            <description>active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="BUSY">
+            <description>busy, the Mtp3bSl is working but is congested (traffic is routed on other links).</description>
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="Mtp3bProceduralState">
+        <description>The procedural state of the link.
+
+0 - not initialized
+1 - initialized</description>
+        <enumMember name="NOT_INITIALIZED">
+            <description>0 - not initialized.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="INITIALIZED">
+            <description>1 - initialized.</description>
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="NodeBehaviourType">
+        <description>The nodeBehaviorType attribute represents the MTP3b node type.</description>
+        <enumMember name="SEP">
+            <description>Signaling End Point.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="SEP_STP">
+            <description>Signalling Transfer and End Point, i.e the signalling point is of both type Signalling End Point (SEP) and Signalling Transfer Point (STP).</description>
+            <value>4</value>
+        </enumMember>
+        <enumMember name="SGW_STP_SEP">
+            <description>Signaling GateWay, Signaling End Point and Signalling Transfer Point, i.e the signalling point is of both type Signalling Transfer Point (STP), Signaling End Point (SEP) and Signaling GateWay (SGW).</description>
+            <value>5</value>
+        </enumMember>
+    </enum>
+
+    <struct name="Mtp3bSpChinaPriorityData">
+        <description>Priority attributes for MTP3b SP of the China standard.</description>
+        <structMember name="prioSlt">
+            <description>The prioSlt attribute sets the priority for the
+ Signalling Link Test  Message and Acknowledge (SLTM / SLTA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioCo">
+            <description>The prioCo attribute sets the priority for the ChangeOver Order and Acknowledge (COO/COA) or eXtended Change over Order and Acknowledge (XCO/XCA) messages  when  issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet)
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioCb">
+            <description>The prioCb attribute sets the priority for the
+ Change Back Declaration and Acknowledge (CBD / CBA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioEc">
+            <description>The prioEc attribute sets the priority for the
+Emergency Change over Order and Acknowledge (ECO / ECA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).	
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioRst">
+            <description>The prioRst attribute sets the priority for the
+signalling Route Set Test (RST) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioTra">
+            <description>The prioTra attribute sets the priority for the
+Traffic Restart Allowed signal (TRA) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioUpu">
+            <description>The prioUpu attribute sets the priority for the
+ User Part Unavailable (UPU) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+        <structMember name="prioLink">
+            <description>The prioLink attribute sets the priority for link related messages when issued by the MTP3b itself. The messages are :
+
+Link INhibit (LIN), Link UNinhibit (LUN),
+Link Inhibit Denied (LID),
+Link Inhibit Acknowledge (LIA),
+Link Uninhibit Acknowledge (LUA),
+Link Forced Uninhibit (LFU), 
+Link Local inhibit Test (LLT) and
+Link Remote inhibit Test (LRT)
+
+When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).
+
+lowest:0
+low:1
+high:2
+highest:3</description>
+            <enumRef name="Mtp3bSpPriorityLevel">
+                <defaultValue>HIGHEST</defaultValue>
+            </enumRef>
+        </structMember>
+    </struct>
+
+    <enum name="Mtp3bRouteType">
+        <description>The type of Signalling Route.</description>
+        <enumMember name="TDM_ATM">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="IP">
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="HomingState">
+        <enumMember name="SINGLE_HOMED_1">
+            <description>Single-homed with ipAddress1.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="SINGLE_HOMED_2">
+            <description>Single-homed with ipAddress2.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="MULTI_HOMED">
+            <description>Multihomed association with ipAddress1 and 
+ipAddress2
+</description>
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <enum name="RouteState">
+        <description>The state of the signaling route.</description>
+        <enumMember name="NOT_BLOCKED">
+            <description>The signaling route is not blocked.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="BLOCKED">
+            <description>The signaling route is blocked.</description>
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="WorkingMode">
+        <enumMember name="hostMode">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="routerMode">
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="OspfMetricType">
+        <description>Open Shortest Path First metric type.</description>
+        <enumMember name="comparableCost">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="nonComparable">
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="RouteType">
+        <description>The types of the routes found in the IP routing table.</description>
+        <enumMember name="INET_RTPROTO_OTHER">
+            <description>The source of information is unknown.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="INET_RTPROTO_LOCAL">
+            <description>Route created from local configuration data (both static and interface routes).
+Each interface created gets an entry in the routing table of the RO.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="INET_RTPROTO_NETMGMT">
+            <description>Route added by SNMP.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="INET_RTPROTO_OSPF">
+            <description>Route added by OSPF.</description>
+            <value>13</value>
+        </enumMember>
+        <enumMember name="INET_RTPROTR_ICMP">
+            <description>Route added by ICMP redirect message.</description>
+            <value>4</value>
+        </enumMember>
+    </enum>
+
+    <exception name="RouteNotFoundException">
+        <description>Invalid IP route has been given as a parameter to an action.</description>
+        <exceptionParameter name="routeNotFound">
+            <description>Exception message.</description>
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <exception name="InvalidRouteException">
+        <description>Invalid IP route has been given as a parameter to an action.</description>
+        <exceptionParameter name="invalidRoute">
+            <dataType>
+                <string/>
+            </dataType>
+        </exceptionParameter>
+    </exception>
+
+    <enum name="MauDuplexMode">
+        <enumMember name="HALF_DUPLEX">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="FULL_DUPLEX">
+            <value>1</value>
+        </enumMember>
+    </enum>
+
+    <enum name="ControllerMode">
+        <description>The controller mode of a physical interface.</description>
+        <enumMember name="CONTROLLER_E1">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="CONTROLLER_T1">
+            <value>2</value>
+        </enumMember>
+        <enumMember name="CONTROLLER_J1">
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <struct name="OspfAreaRange">
+        <description>ipAddress - the subnet address of the range.
+subnetMask - IP subnet mask of the range to be added.
+advertise - indicates whether the area range should be advertised into OSPF.
+</description>
+        <structMember name="ipAddress">
+            <string/>
+        </structMember>
+        <structMember name="subnetMask">
+            <description>Note! The subnet has to be contigious. That is, has the LSB set to 0 (zero).
+
+Example:
+
+255.255.255.X
+
+Contiguous subnet mask:
+11111111.11111111.11111111.11111110 (X = 254)
+11111111.11111111.11111111.11111100 (X = 252)
+
+Not-contiguous subnet mask:
+11111111.11111111.11111111.11111010 (X = 250)
+</description>
+            <string/>
+        </structMember>
+        <structMember name="advertise">
+            <boolean/>
+        </structMember>
+    </struct>
+
+    <struct name="RoutingTableEntry">
+        <description>IP routing table entry.</description>
+        <structMember name="destinationIpAddr">
+            <description>The destination IP address.</description>
+            <string/>
+        </structMember>
+        <structMember name="destinationNetworkMask">
+            <description>The destination IP network mask.</description>
+            <string/>
+        </structMember>
+        <structMember name="nextHopIpAddr">
+            <description>The next hop IP address.</description>
+            <string/>
+        </structMember>
+        <structMember name="routeMetric">
+            <description>The route metric.</description>
+            <long/>
+        </structMember>
+        <structMember name="routeType">
+            <description>The route type.</description>
+            <enumRef name="RouteType">
+            </enumRef>
+        </structMember>
+        <structMember name="interfaceName">
+            <description>The interface name.</description>
+            <string/>
+        </structMember>
+        <structMember name="redistribute">
+            <description>Indicates if the route should be redistributed.</description>
+            <boolean/>
+        </structMember>
+        <structMember name="active">
+            <description>Indicates if the route is active.</description>
+            <boolean/>
+        </structMember>
+    </struct>
+
+    <enum name="AutoConfigurationMode">
+        <description>Denotes whether the autoConfiguration mode for the IpAccessHost is turned on or off.</description>
+        <enumMember name="ON">
+            <value>1</value>
+        </enumMember>
+        <enumMember name="OFF">
+            <value>2</value>
+        </enumMember>
+    </enum>
+
+    <enum name="Aal5TpSelectionModes">
+        <description>In case 'NO_PREFERENCE', 'LOCAL_MP_SELECT_VCC_AT_LINK_UP', LOCAL_MP_PEER_SELECTION_VCC' or 'LOCAL_MP_ACTIVE_RESELECTION' is selected the IpAtmLink MO will prefer Aal5TpVccTp on local MP (i.e. Aal5TpVccTp executing on the same MP as the IpAtmLink), but other Aal5TpVccTp will be accepted if needed.
+
+In case 'ONLY_LOCAL_MP' is selected, the ipAtmLink (Inet Link) will consider Aal5TpVccTp residing on other MPs as a malfunction and discard the usage of them. No InvArp sending will be performed on them and all incomming trafic on them will be discarded. If no local Aal5TpVccTp exists the operational state of the link will be changed to disabled.</description>
+        <enumMember name="NO_PREFERENCE">
+            <value>0</value>
+        </enumMember>
+        <enumMember name="LOCAL_MP_SELECT_VCC_AT_LINK_UP">
+            <description>Prefer termination on local MP, select Vcc when link goes up.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="LOCAL_MP_PEER_SELECTION_VCC">
+            <description>Prefer termination on local MP, follow peer selection of Vcc.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="LOCAL_MP_ACTIVE_RESELECTION">
+            <description>Prefer termination on local MP, active reselection to new Aal5TpVccTp as soon as a better choice exists.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="ONLY_LOCAL_MP">
+            <description>Restricted to local MP, follow peer selection if termination is on local MP.
+</description>
+            <value>4</value>
+        </enumMember>
+    </enum>
+
+    <enum name="AlarmReport">
+        <description>Alarm report for the Virtual path connection termination point.
+RDI - Remote defect indication
+LOC - Loss of continuity 
+AIS - Alarm indication signal</description>
+        <enumMember name="ALARM_LOC">
+            <description>For alarms of type Loss of continuity.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="ALARM_LOC_RDI">
+            <description>For alarms of type Loss of continuity and Remote defect indication.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="ALARM_AIS_LOC">
+            <description>For alarms of type Alarm indication signal and Loss of continuity.</description>
+            <value>6</value>
+        </enumMember>
+        <enumMember name="ALARM_AIS_RDI_LOC">
+            <description>For alarms of type Alarm indication signal, Remote defect indication and Loss of continuity.</description>
+            <value>7</value>
+        </enumMember>
+    </enum>
+
+    <enum name="AtmCounterMode">
+        <enumMember name="PM_MODE_OFF">
+            <description>Performance monitoring is turned off. PM counters give irrelevant values.</description>
+            <value>0</value>
+        </enumMember>
+        <enumMember name="PM_MODE_ONLYCOUNT">
+            <description>Performance monitoring counters are active
+</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="PM_MODE_FPM">
+            <description>FPM, Forward Performance Monitoring activated.
+
+Performance monitoring counters are active
+</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="PM_MODE_BR">
+            <description>Backward reporting, BR, cells are generated.
+
+Performance monitoring counters are active
+</description>
+            <value>4</value>
+        </enumMember>
+        <enumMember name="PM_MODE_FPM_BR">
+            <description>FPM, Forward Performance Monitoring activated.
+
+Backward reporting, BR, cells are generated.
+
+Performance monitoring counters are active
+</description>
+            <value>6</value>
+        </enumMember>
+    </enum>
+
+    <enum name="AtmNomPmBlkSize">
+        <description>Nominal performance monitoring, PM, blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.</description>
+        <enumMember name="NOM_PM_BLKSIZE_2_7">
+            <description>Nominal performance monitoring, PM, block size, 2e7 (2 to the power of 7).</description>
+            <value>128</value>
+        </enumMember>
+        <enumMember name="NOM_PM_BLKSIZE_2_8">
+            <description>Nominal performance monitoring, PM, block size, 2e8 (2 to the power of 8).</description>
+            <value>256</value>
+        </enumMember>
+        <enumMember name="NOM_PM_BLKSIZE_2_9">
+            <description>Nominal performance monitoring, PM, block size, 2e9 (2 to the power of 9).</description>
+            <value>512</value>
+        </enumMember>
+        <enumMember name="NOM_PM_BLKSIZE_2_10">
+            <description>Nominal performance monitoring, PM, block size, 2e10 (2 to the power of 10).</description>
+            <value>1024</value>
+        </enumMember>
+        <enumMember name="NOM_PM_BLKSIZE_2_11">
+            <description>Nominal performance monitoring, PM, block size, 2e11 (2 to the power of 11).</description>
+            <value>2048</value>
+        </enumMember>
+        <enumMember name="NOM_PM_BLKSIZE_2_12">
+            <description>Nominal performance monitoring, PM, block size, 2e12 (2 to the power of 12).</description>
+            <value>4096</value>
+        </enumMember>
+        <enumMember name="NOM_PM_BLKSIZE_2_13">
+            <description>Nominal performance monitoring, PM, block size, 2e13 (2 to the power of 13).</description>
+            <value>8192</value>
+        </enumMember>
+        <enumMember name="NOM_PM_BLKSIZE_2_14">
+            <description>Nominal performance monitoring, PM, block size, 2e14 (2 to the power of 14).</description>
+            <value>16384</value>
+        </enumMember>
+        <enumMember name="NOM_PM_BLKSIZE_2_15">
+            <description>Nominal performance monitoring, PM, block size, 2e15 (2 to the power of 15).</description>
+            <value>32768</value>
+        </enumMember>
+    </enum>
+
+    <enum name="ServiceCategory">
+        <enumMember name="SERVICE_CATEGORY_CBR">
+            <description>Service category Constant Bit rate, CBR.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="SERVICE_CATEGORY_UBR">
+            <description>Service category Unspecified Bit rate, UBR.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="SERVICE_CATEGORY_UBR_PLUS">
+            <description>Service category Unspecified Bit rate+, UBR+. UBR+ guarantees a certain bandwidth. If higher bandwidth is used it will be handled as UBR.</description>
+            <value>3</value>
+        </enumMember>
+    </enum>
+
+    <enum name="AtmQos">
+        <description>ATM's Quality of Service classes.
+
+The ATM layer system provides four QoS classes, numbered 1 to 4, where CLASS_ONE gives the best QoS in regards to Cell Loss Ratio &lt;CLR&gt; and Cell Delay Variation &lt;CDV&gt; and CLASS_FOUR doesn't give any QoS guarantees. CLASS_ONE and CLASS_TWO are the only classes applicable for real time traffic.</description>
+        <enumMember name="CLASS_ONE">
+            <description>CDV &lt; 1 ms (milliseconds), CLR &lt; 10e-8. Typically used by timing unit.</description>
+            <value>1</value>
+        </enumMember>
+        <enumMember name="CLASS_TWO">
+            <description>CDV &lt; 1 ms, CLR &lt; 10e-7. Typically used for speech.</description>
+            <value>2</value>
+        </enumMember>
+        <enumMember name="CLASS_THREE">
+            <description>CLR &lt; 10e-5. Typically used for signalling.</description>
+            <value>3</value>
+        </enumMember>
+        <enumMember name="CLASS_FOUR">
+            <description>Typically used for IP.</description>
+            <value>4</value>
+        </enumMember>
+    </enum>
+
+    <struct name="ValueOfUnex">
+        <description>The attributes in this struct represents the ATM header, (vpi, vci, pti), of the last recieved unexpected cell.</description>
+        <structMember name="vpi">
+            <description>The ATM header vpi.</description>
+            <long>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="vci">
+            <description>The ATM header vci.</description>
+            <long>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+        <structMember name="pti">
+            <description>The ATM header pti.</description>
+            <long>
+                <defaultValue>0</defaultValue>
+            </long>
+        </structMember>
+    </struct>
+
+    <class name="TransportNetwork">
+        <description>This MO structures the transport network of the managed element. It is created automatically and cannot be deleted.
+
+The local distinguished name of this MO is ManagedElement=1, TransportNetwork=1.</description>
+        <systemCreated/>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="TransportNetworkId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="getAal5ForNniSaal">
+            <description>This action returns a sequnce of Aal5TpVccTp MOs that is unreserved and executes on an MP.
+
+Also the following condition has to be fullfilled:
+
+MinAal5Sdu = min (fromUserMaxSduSize, toUserMaxSduSize)
+
+roundedDownSdu = (MinAal5Sdu - (MinAal5Sdu modulo 4) +4)
+
+roundedDownSdu &gt; low boundry for maxSduSize (in NniSaalTp)
+
+Note that the values for fromUserMaxSduSize and toUserMaxSduSize is the actual values set in the Aal5TpVccTp MO.
+Also note that the attributes minAal5Sdu and roundedDownSdu is used internaly in this action.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <sequence>
+                        <moRef name="ManagedObject"/>
+                    </sequence>
+            </returnType>
+        </action>
+        <action name="getAal5ForUniSaal">
+            <description>This action returns a sequnce of Aal5TpVccTp MOs that is unreserved and executes on an MP.
+
+Also the following condition has to be fullfilled:
+
+MinAal5Sdu = min (fromUserMaxSduSize, toUserMaxSduSize)
+
+roundedDownSdu = (MinAal5Sdu - (MinAal5Sdu modulo 4) +4)
+
+roundedDownSdu &gt; low boundry for maxSduSize (in UniSaalTp)
+
+Note that the values for fromUserMaxSduSize and toUserMaxSduSize is the actual values set in the Aal5TpVccTp MO.
+Also note that the attributes minAal5Sdu and roundedDownSdu is used internaly in this action.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <sequence>
+                        <moRef name="ManagedObject"/>
+                    </sequence>
+            </returnType>
+        </action>
+        <action name="getAal2PathForAal2Pdu">
+            <description>This action returns a sequence of all unreserved Aal2PathVccTp's that have an Aal2PathId that has not been
+used by another Aal2PathDistributionUnit under the same parent (Aal2Ap).
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <sequence>
+                        <moRef name="ManagedObject"/>
+                    </sequence>
+            </returnType>
+            <parameter name="aal2Ap">
+                <in/>
+                <dataType>
+                    <moRef name="ManagedObject"/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="getRpuForAal2Pdu">
+            <description>This action returns a sequence of all ReliableProgramUniters that has not reached the maximun number of possible reservations 
+and has not already been used by other Aal2PathDistributionUnit MO's (if exists) under the same parent (Aal2Ap MO).
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <sequence>
+                        <moRef name="ManagedObject"/>
+                    </sequence>
+            </returnType>
+            <parameter name="aal2Ap">
+                <in/>
+                <dataType>
+                    <moRef name="ManagedObject"/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="getUnreservedPluginUnits">
+            <description>This action returns a sequence of PlugInUnits that is unreserved.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <sequence>
+                        <moRef name="ManagedObject"/>
+                    </sequence>
+            </returnType>
+        </action>
+        <action name="getDs0BundlesForMtp2">
+            <description>This action returns a sequence of Ds0Bundle MOs that is unreserved and only has one (1) timeSlot set in the listOfTimeSlots.
+The attribute tdmMode in these Ds0Bundles must be enabled.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <sequence>
+                        <moRef name="ManagedObject"/>
+                    </sequence>
+            </returnType>
+        </action>
+    </class>
+
+    <class name="Slot">
+        <description>The Slot MO is used to represent a slot in a subrack. A slot can hold a plug-in-unit, a board, (represented by PlugInUnit MOs).
+
+The number of slots in a subrack is specified when defining the subrack.
+
+The system will automatically create the right number of Slot MOs in the subrack at creation of the Subrack MO. 
+This MO cannot be deleted by an operator.
+
+The local distinguished names of this MO's are select with identity Slot=1 in the leftmost slot with incremental numbering towards the right in the subrack.. </description>
+        <systemCreated/>
+        <attribute name="userLabel">
+            <description>A user friendly name associated to the managed object
+
+</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="slotState">
+            <description>Gives the state of the slot.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="SlotState">
+                    <defaultValue>free</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="slotNumber">
+            <description>The number of the position from the left side, starting from 1.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long/>
+            </dataType>
+        </attribute>
+        <attribute name="SlotId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="productData">
+            <description>This product data describes the plug-in-unit that is presently inserted. The information is only available when slotState = used.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <structRef name="OperProductData"/>
+            </dataType>
+        </attribute>
+        <attribute name="upgradeGroupId">
+            <description>The upgradeGroupId is able to group a number of PIUs, all in the group can be upgraded at the same time.
+
+If upgradeGroupTypeName is "", this attribute is not used. 
+</description>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="upgradeGroupTypeName">
+            <description>The upgradeGroupTypeName, together with the upgradeGroupId,  define an upgrade group.
+</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="ManagedObject">
+        <description>The Managed Object MO is not part of the model. It is only used to have valid reference types for certain attributes. </description>
+        <attribute name="ManagedObjectId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="getType">
+            <returnType>
+                    <string/>
+            </returnType>
+        </action>
+        <action name="getId">
+            <returnType>
+                    <string/>
+            </returnType>
+        </action>
+        <action name="getParent">
+            <returnType>
+                    <moRef name="ManagedObject"/>
+            </returnType>
+        </action>
+        <action name="getChildren">
+            <returnType>
+                    <long/>
+            </returnType>
+        </action>
+        <action name="getFullDistinguishedName">
+            <returnType>
+                    <string/>
+            </returnType>
+        </action>
+        <action name="delete">
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="MoHasChildrenException"/>
+            <raisesException name="MoReservedByOtherUserException"/>
+            <raisesException name="FroRequestFailedException"/>
+            <raisesException name="FroNotAccessibleException"/>
+            <raisesException name="UndeletableMoException"/>
+            <raisesException name="TransactionRequiredException"/>
+        </action>
+        <action name="getLocalDistinguishedName">
+            <returnType>
+                    <string/>
+            </returnType>
+        </action>
+        <action name="create">
+            <returnType>
+                    <moRef name="ManagedObject"/>
+            </returnType>
+            <raisesException name="MoNameAlreadyTakenException"/>
+            <raisesException name="AttrMissingAtCreateException"/>
+            <raisesException name="AttrNotSettableAtCreateException"/>
+            <raisesException name="IllegalParentException"/>
+            <raisesException name="MoCardinalityViolationException"/>
+            <raisesException name="NoSuchAttributeException"/>
+            <raisesException name="MoCanNotBeCreatedException"/>
+            <raisesException name="NoSuchFieldException"/>
+            <raisesException name="NotHandledAttributeTypeException"/>
+            <raisesException name="WrongAttributeTypeException"/>
+            <raisesException name="ValueOutOfRangeException"/>
+            <raisesException name="FroRequestFailedException"/>
+            <raisesException name="FroNotAccessibleException"/>
+            <raisesException name="TransactionRequiredException"/>
+            <raisesException name="IpException"/>
+            <raisesException name="IpFormatException"/>
+            <raisesException name="EquipException"/>
+            <raisesException name="AttrValueNotUniqueException"/>
+            <raisesException name="MaxNumberExceededException"/>
+            <raisesException name="MoReservedNotDeletableException"/>
+        </action>
+    </class>
+
+    <class name="VclTp">
+        <description>This MO is used to represent the termination of an external VC link in the node.
+
+Note that a maximum of 10 000 MO of this kind may be configured in a node.
+
+Note! The performance monitoring counters in the VclTp MO is set to 0 (zero) at start or restart of the node.
+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.</description>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="externalVci">
+            <description>Virtual Channel Idenitifier, VCI, value for this Virtual Channel Link, VCL.
+
+Range: 32 - 65535.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>32</min> <max>65535</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="atmTrafficDescriptorId">
+            <description>Reference to the AtmTrafficDescriptor profile.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="AtmTrafficDescriptor"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>User that have reserved this VclTp.
+
+</description>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the VclTp.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmReceivedAtmCells">
+            <description>Performance monitoring counter for number of received ATM cells.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmTransmittedAtmCells">
+            <description>Performance monitoring counter for number of transmitted ATM cells.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status of the VclTp.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="VclTpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="eteLoopBack">
+            <description>Used by VclTp to inforce a Virtual Channel end-to-end loopback.
+false=Failed, true=Succeded.
+
+Note! This action requires a transaction.
+
+</description>
+            <returnType>
+                    <boolean/>
+            </returnType>
+        </action>
+    </class>
+
+    <class name="ManagedElement">
+        <description>The Managed Element MO is the top MO in the MOM. A management application will communicate with the Managed Element MO for the purpose of monitoring it and controlling it.
+
+The ManagedElement MO is automatically created and cannot be deleted.
+
+The local distinguished name of this MO is ManagedElement=1.</description>
+        <systemCreated/>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="site">
+            <description>This attribute gives information about geographical location (e.g. place name).</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>255</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="logicalName">
+            <description>This attribute gives a logical name of a site.
+
+</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>255</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="productType">
+            <description>This attribute describes the product type and is always set to the value "Node".</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <defaultValue>Node</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="productName">
+            <description>This attribute describes the implemented functionality. </description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>12</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="productNumber">
+            <description>This attribute uniquely identifies the product (e.g. ROF123).</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>24</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="productRevision">
+            <description>This attribute identifies the version of the product (e.g. R2A).</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>7</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ManagedElementId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="restart">
+            <description>Restart the node with an unconditional reload.
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="restartRank">
+                <in/>
+                <dataType>
+                    <enumRef name="RestartRank">
+                    </enumRef>
+                </dataType>
+            </parameter>
+        </action>
+    </class>
+
+    <class name="Equipment">
+        <description>This Managed Object is used as a structural element for the network element, i.e. it only acts as a container for other MO:s. This MO structures the equipment of the network element.
+
+The local distinguished name of this MO is ManagedElement=1, Equipment=1.</description>
+        <systemCreated/>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="EquipmentId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Subrack">
+        <description>This MO is used to represent a subrack.
+</description>
+        <attribute name="userLabel">
+            <description>A free tag that a user can associated to the this managed object. The value has no relevance for the managed system.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="switchModule">
+            <description>A reference to a SwitchModule ManagedObject, from which the SwitchModule number can be retrived.  That number describes how the subrack is connected to the node, i.e. how the subracks cables are connected to the hub subrack. (The hub subrack has switch module number 0).</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="SwitchModule"/>
+            </dataType>
+        </attribute>
+        <attribute name="subrackType">
+            <description>There can only be one hub subrack in the node. The hub subrack is used to control switching and synchronization for the complete node.
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="SubrackType">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="productType">
+            <description>This attribute describes the product type and is always set to the value "HW".</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>"HW"</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeProductData">
+            <description>This product data describes the subrack that is configured to be installed.
+
+</description>
+            <mandatory/>
+            <dataType>
+                <structRef name="AdminProductData"/>
+            </dataType>
+        </attribute>
+        <attribute name="subrackPosition">
+            <description>The position of this subrack within a cabinet.
+The purpose of this attribute is to help an operator locate the source of an error by letting the system put this 
+information in alarms. The system does not use this information in any other way i.e. it does not affect the
+operation of the system.
+The subrack position is an integer (1-n) stating the cabinet Id, starting from the left and a letter (A-Z) stating
+the Subrack vertical position starting from the ground, e.g. 5C.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="cabinetPosition">
+            <description>The position of the cabinet (within a group of other cabinets) in which this subrack is placed.
+The purpose of this attribute is to help an operator locate the source of an error by letting the system put this information in alarms. The system does not use this information in any other way i.e. it does not affect the operation of the system.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="SubrackId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="numberOfSlots">
+            <description>Defines the number of slot in the subrack. The default value is 28.
+
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>28</max>
+                    </range>
+                    <defaultValue>28</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="operationalProductData">
+            <description>The operational product data describes the subrack that is actually installed.
+
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <structRef name="OperProductData"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>A reference to the SwAllocation MO that has reserved this Subrack for Fan MO upgrades..
+The attribute is set/cleared by internal actions.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <action name="removeSlots">
+            <description>Removes the given number of Slot MOs from the model. The Slots with the highest slotNumber are removed. After the action no Slot will have apn = 0.
+The attribute numberOfSlots will be udated. 
+
+If there is a child MO the action will fail and the MOHasChildrenException is thrown.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="numberOfSlotsToRemove">
+                <description>The number of slots to remove.</description>
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+        </action>
+    </class>
+
+    <class name="LoadModule">
+        <description>This MO is used to represent software installed in the file system.
+
+LoadModule MO can represent files with executable code, files with text information
+(COI) or directories in Cello file system.
+
+MOs of this type are created automatically during system upgrade.
+MOs of this type are possible to create manually but a system upgrade
+is recommended to create them.
+
+Note! In order for a program to be reliable the following conditions must be fulfilled:
+
+1. The attribute 'loaderType' must be set to 'OseLoader'.
+2. The attribute 'oseProgramLoadClass' must be set to a value &gt; 100.
+3. The program must execute on a MP (Main Processor).
+
+</description>
+        <attribute name="userLabel">
+            <description>Free tag for marking this managed object.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="productData">
+            <description>Product information data.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="AdminProductData"/>
+            </dataType>
+        </attribute>
+        <attribute name="loadModuleFilePath">
+            <description>The path to this load module in the file system, including the file name.
+
+Example: /c/load_modules/CXC112874R1A01
+where /c/load_modules/ is the directory and CXC112874R1A01 is the file name.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="loaderType">
+            <description>The type of the program loader.
+
+Note! This corresponds to LoaderName in the Upgrade Control File (UCF).</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="LoadModuleLoaderType">
+                    <defaultValue>OseLoader</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="otherLoaderName">
+            <description>This attribute must have a value if the loaderType attribute equals other.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="preLoad">
+            <description>A recommendation to the system to (if possible) cache this load module close to where its program(s) execute(s), e.g. in a flash file system. The purpose of this attribute is to enable faster loading at restart of programs referring to this load module.
+
+
+
+
+</description>
+            <dataType>
+                <enumRef name="LoadModulePreLoadType">
+                    <defaultValue>no</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="fileFormat">
+            <description>The file format (RPDOUT, html, java, fpga, ...).</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="oseProgramLoadClass">
+            <description>Specifies in which load phase programs of this load module should be started.
+
+Note: If the LoadModule is a java archive file (.jar) it will be loaded in the load phase of the java machine rather than according to its own oseProgramLoadClass.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="LoadClass">
+                    <defaultValue>application</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reliableProgramLabel">
+            <description>Reliable program identity.
+Compare this to the reliableProgramLabel in ReliableProgramUniter MO.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="isDirectory">
+            <description>Indicates if the load module is a file or directory.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="oseProgramPoolSize">
+            <description>This attribute sets the size of the program pool size. In the referenced loadModule there is 
+possible to set this value at create. 
+This value will then be fetched by program and used at create if no value is submitted at 
+create of the program Mo. 
+The referenced load module has a default size defined at compile time which is used if no 
+value is submitted at create of loadModule or the program Mo. 
+
+Note! The value of this attribute is overwritten during Software Upgrade.
+
+Unit is byte.
+
+</description>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="oseProgramHeapSize">
+            <description>This attribute sets the size of the program heap size. In the referenced loadModule there is possible to set this value at create. This value will then be fetched by program and used at create if no value is submitted at create of the program Mo. 
+The referenced load module has a default size defined at compile time which is used if no value is submitted at create of loadModule or the program Mo. 
+
+Note! The value of this attribute is overwritten during Software Upgrade.
+
+Unit is byte.
+
+</description>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="programMustBeSingleton">
+            <description>Indicator whether the (OSE) program must be a singleton or not.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="moppletEntries">
+            <description>Contains all class  that are to be initialised and started when the JVM restarts. 
+Technical note: The class name must specify the full package and class name in standard Java syntax, e.g. "se.ericsson.cello.X" ; must implement the se.ericsson.cello.moframework.Mopplet interface and be found in this LoadModule.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <sequence>
+                    <string>
+                        <defaultValue/>
+                    </string>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="LoadModuleId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedByUpgradePackage">
+            <description>Indicates whether this MO has been reserved by the UpgradePackage MO or not.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Synchronization">
+        <description>This MO is used to administer synchronization references for the network synchronization function and to view the system clock state of Timing Unit boards.
+
+Synchronization can have 0 to 8 relations to other MOs. The only valid MOs where relations can exist are E1Physpathterm, J1Physpathterm, T1Physpathterm, Os155SpiTtp, TU Synchronization Reference, and ManagedObject (for the  non-Cello RXI820 MO) MOs. Note that maximum number of relations to these MOs is 8 all together. 
+
+The synchronization MO is automatically created and cannot be deleted.
+
+Note: An external ManagedObject that wishes to be connected to the Synchronization MO must implement the following interface se.ericsson.cello.equipment.SyncReservable!
+
+The local distinguished name of this MO is ManagedElement=1,TransportNetwork=1,Synchronization=1
+
+.</description>
+        <systemCreated/>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="degradationIsFault">
+            <description>Controls whether synchronization reference degradation (e.g. signal level degradation) is interpreted as a synchronization reference fault or not. Attribute value is only applicable for traffic carrying synchronization references</description>
+            <dataType>
+                <enumRef name="FaultCriteria">
+                    <defaultValue>degrNotFault</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="systemClockA">
+            <description>State of system clock signal on Timing Unit A.
+Note that system clock generated by TU A (TU in slot 4) has higher priority than TU B (TU in slot 5) system clock, i.e. each device board uses system clocks according to this priority order.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="ClockState">
+                    <defaultValue>unknownMode</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="systemClockB">
+            <description>State of system clock signal on Timing Unit B. Note that system clock generated by TU A (TU in slot 4) has higher priority than TU B (TU in slot 5) system clock, i.e. each device board uses system clocks according to this priority order.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="ClockState">
+                    <defaultValue>unknownMode</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="syncReference">
+            <description>Set of synchronization reference physical resources. An MO reference to an TU synchronization reference MO implementation.
+A synchronization reference in added to the system by using action AddSyncRefResource.
+Note: if this attributes has value "Non-existing MO reference" then all the respective attributes of type sequence of 8 are not applicable.
+
+Note: The length of this sequence is always 8.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                    <length>8</length>
+                    <nonUnique/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="syncRefPriority">
+            <description>Synchronization reference priority.
+1 represents the highest and 8 the lowest priority. Every synchronization reference must have unique priority value. Value 0 means not applicable, that no synchronization with this priority is defined.
+This attribute is mandatory when adding a synchronization reference to the system (by using action addSyncRefResource).
+A priority value can be changed with the changeSyncRefPriority action provided that the priority is not already assigned to some other SyncRefResource.
+
+Note: The length of this sequence is always 8.</description>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <long>
+                        <range>
+                            <min>0</min> <max>8</max>
+                        </range>
+                        <defaultValue>0</defaultValue>
+                    </long>
+                    <length>8</length>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="syncRefActivity">
+            <description>Set of synchronization reference activity attributes.
+
+Note: The length of this sequence is always 8.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <enumRef name="RefActivity">
+                        <defaultValue>inactive</defaultValue>
+                    </enumRef>
+                    <length>8</length>
+                    <nonUnique/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="syncRefStatus">
+            <description>Set of synchronization reference status attributes.
+
+Note: The length of this sequence is always 8.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <enumRef name="RefState">
+                        <defaultValue>failed</defaultValue>
+                    </enumRef>
+                    <length>8</length>
+                    <nonUnique/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="SynchronizationId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="systemClockRedundancy">
+            <description>Indicates if the node is redundant from Network Synchronization functions point of view.</description>
+            <dataType>
+                <enumRef name="SystemClockRedundancy">
+                    <defaultValue>SYSTEM_CLOCK_USERS_USE_PLANE_A</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <action name="addSyncRefResource">
+            <description>This action adds one synchronization reference to the system. As a result of successful action, one set of attributes (attributes of type sequence of 8) is added to Synchronization MO.
+Parameters:
+syncReference: Managed object implementation, to which a mo-reference is to be added. See description of attribute SyncReference.
+syncPriority: Priority of synchronization reference. Each synchronization reference must have unique priority value, this must be checked by synchronization MO.
+
+Description of exceptions:
+- AlreadyRegistered: this reference is already registered
+- MaxNoOfRefRegistered: maximum number (8) of synchronization references already present
+- PriorityAlreadyInUse: syncPriority is identical with an existing synchronization reference priority
+- PriorityOutOfRange: invalid syncPriority value
+- InvalidMoReference: invalid syncReference for registration as a synchronization reference (invalid MO type)
+- NotPermitted: syncReference does not allow SyncReserve to be performed
+
+Note: An external ManagedObject that wishes to be connected to the Synchronization MO must implement the following interface se.ericsson.cello.equipment.SyncReservable!
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="syncReference">
+                <in/>
+                <dataType>
+                    <moRef name="ManagedObject"/>
+                </dataType>
+            </parameter>
+            <parameter name="syncPriority">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="AlreadyRegisteredException"/>
+            <raisesException name="MaxNoOfRefRegisteredException"/>
+            <raisesException name="PriorityAlreadyInUseException"/>
+            <raisesException name="PriorityOutOfRangeException"/>
+            <raisesException name="InvalidMoReferenceException"/>
+            <raisesException name="NotPermittedException"/>
+        </action>
+        <action name="removeSyncRefResource">
+            <description>This action removes one synchronization reference that has previously been added.
+(In future releases, this action should include a check whether the synchronization reference to be removed is the only existing synchronization reference. In that case, the user is asked for a confirmation to remove the last synchronization reference.)
+Parameters:
+syncReference: Managed object implementation, to which a mo-reference currently exists, but is now to be removed. See description of attribute SyncReference.
+
+Description of exceptions:
+- NotRegistered: synchronization reference is not registered
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="syncReference">
+                <in/>
+                <dataType>
+                    <moRef name="ManagedObject"/>
+                </dataType>
+            </parameter>
+            <raisesException name="NotRegisteredException"/>
+        </action>
+        <action name="changeSyncRefPriority">
+            <description>This action changes the synchronization priority of one previously registered synchronization reference resource.
+Parameters:
+syncReference: Managed object implementation, for which the synchronization priority is to be changed. See description of attribute syncReference.
+syncPriority: The new priority of synchronization reference. Each synchronization reference must have unique priority value, this must be checked by synchronization MO.
+
+Description of exceptions:
+- PriorityAlreadyInUse: syncPriority is identical with an existing synchronization reference priority
+- PriorityOutOfRange: invalid syncPriority value
+- NotRegistered: synchronization reference is not registered
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="syncReference">
+                <in/>
+                <dataType>
+                    <moRef name="ManagedObject"/>
+                </dataType>
+            </parameter>
+            <parameter name="syncPriority">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="PriorityAlreadyInUseException"/>
+            <raisesException name="PriorityOutOfRangeException"/>
+            <raisesException name="NotRegisteredException"/>
+        </action>
+        <action name="resetLossOfTracking">
+            <description>This action resets the detected Loss of Tracking error condition of one synchronization reference. After reset the synchronization reference is usable again.
+Parameters:
+syncReference: Specifies the synchronization reference for which the Loss of Tracking status is to be reset.
+
+Description of exceptions:
+- NotRegistered: synchronization reference is not registered
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="syncReference">
+                <in/>
+                <dataType>
+                    <moRef name="ManagedObject"/>
+                </dataType>
+            </parameter>
+            <raisesException name="NotRegisteredException"/>
+        </action>
+    </class>
+
+    <class name="SccpApLocal">
+        <description>This Managed Object represents an SCCP Local Access Point. An SCCP AP instance is a logical point in the SCCP network at which an SCCP user can access the services provided by the SCCP and the SCCP can deliver its services to the SCCP user. The SCCP Access Point is identified by a SubSystem Number (SSN).
+
+A local SccpAp represents an access point in the own node. 
+
+The performance monitoring counters found in SccpApLocal MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is a shutdown request from the CLI (Cluster Interface).</description>
+        <attribute name="SccpApLocalId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the SCCP AP. The operability of the SCCP AP is described by this attribute which has two possible values: 
+
+Disabled: The SCCP AP is totally inoperable and unable to provide the service to the user.
+
+Enabled: The SCCP AP is partly or fully  operable and available for use.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="ssN">
+            <description>The sub system number, SSN, of the SCCP Access Point. Note that this has to be a unique number.
+
+If the SccpAp is local then the SSN has to be unique among all other SccpAp MOs under the same SccpSp MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>2</min> <max>255</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxConn">
+            <description>The maxConn attribute specifies the max number of connections allowed for this SCCP Access Point. It is only valid for local SCCP Access Points.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>524288</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="useS1">
+            <description>Controls adding of OPC from routing label to Calling Party Address if absent.
+
+False = Do not add OPC to Calling Part Address.
+True = Add OPC to Calling Part Address.
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="SccpSp">
+        <description>The Signalling Connection Control Part, SCCP, Signalling Point, SP, MO is the placeholder for all SCCP related managed objects. 
+
+Startime for accounting is set by attributes accountDateFileOutput and accountTimeFileOutput.
+The attribute accountPeriodFileOutput sets period for the accounting record to be stored on the /c file system.
+The accounting is stopped by setting the accountPeriodFileOutput to zero (0).
+NOTE: The SRP function and SccpAccountingCriteria MO's should only be created for one signalling stack, i.e one PIU.
+
+Note! The guiding values that can be found for some attributes is to be regarded as a recommendation for these attributes.
+Depending on the size of the network, traffic load, use and so forth it might be neccesary to set values for these attributes outside the guiding values.</description>
+        <attribute name="SccpSpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the SCCP SP. The operability of the SCCP SP is described by this attribute which has two possible values:
+
+Disabled: The SCCP SP is totally inoperable and unable to provide the service to the user (e.g. if the processor  is not usable).
+
+Enabled: The SCCP SP is partly or fully  operable and available for use.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="mtp3bSpId">
+            <description>The identity of the L3 Signaling Point used by this MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="prioSST">
+            <description>This attribute sets the priority for the Subsystem Test message when issued by the SCCP itself. When a message is transferred from the SCCP the message priority uses the two spare bits in the SIO.
+Coding of the message priority:
+0 	Lowest priority
+1
+2
+3	 Highest priority</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>3</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="prioIT">
+            <description>This attribute sets the priority for the Inactivity Test message when  issued by the SCCP itself. When a message is transferred from the SCCP the message priority uses the two spare bits in the SIO.
+Coding of the message priority:
+0 	Lowest priority
+1
+2
+3	 Highest priority</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>3</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="prioRLSD">
+            <description>This attribute sets the priority for the connection release message when issued by the SCCP itself. When a message is transferred from the SCCP the message priority uses the two spare bits in the SIO.
+Coding of the message priority:
+0 	Lowest priority
+1
+2
+3	 Highest priority</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>3</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="prioGeneral">
+            <description>This attribute sets the priority for all the other  messages which are issued by the SCCP itself. When a message is transferred from the SCCP the message priority uses the two spare bits in the SIO.
+
+Coding of the message priority:
+
+0 	Lowest priority
+1
+2
+3	 Highest priority</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>3</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="accountDateFileOutput">
+            <description>Date for accounting file output.
+Format in ASCI-code: yyyymmdd
+yyyy = 0000-9999
+mm = 01-12
+dd = 01-31
+
+Note! This is the start date for the output.</description>
+            <dataType>
+                <string>
+                    <defaultValue>"00000000"</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="accountTimeFileOutput">
+            <description>Time for accounting file output.
+Format in ASCI-code: hhmm
+hh = 00-23
+mm = 00-59</description>
+            <dataType>
+                <string>
+                    <defaultValue>"0000"</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="accountPeriodFileOutput">
+            <description>Period for accounting file output.
+Format: number of half hour.
+Range = 0, 1, 2, 4, 6, 8, 12, 16, 24, 48
+
+Note! if set to 0 (zero) the output will be stopped.</description>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="upperConnThres">
+            <description>The upper connection threshold allow the user to specify the level at which the upper connection threshold notification is triggered. The thresholds must be given as a percentage of the maximum number of connection resources made available for the entire SCCP.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100</max>
+                    </range>
+                    <defaultValue>80</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="lowerConnThres">
+            <description>The lower connection threshold allow the user to specify the level at which the lower  connection threshold notification is triggered. The thresholds must be given as a percentage of the maximum number of connection resources made available for the entire SCCP. The value must be less then UpperConnThres.
+
+The maximum value is less or equal to the upper connection threshold</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100</max>
+                    </range>
+                    <defaultValue>50</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="swapUDTPointer">
+            <description>There are two ways to construct a UDTS from a UDT, the XUDTS will be constructed in the same way. One way is to only swap the pointers to Called Party Address and Calling Party Address in a UDT message when constructing a UDTS. The other way is to swap data. How this is done in the SCCP is configurable. The coding and interpretation is as follows:
+0, swap data Called party Address will be sent before Calling party Address
+1, swap pointers Called party Address will be sent after Calling party Address.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>1</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="hopCounterSclc">
+            <description>The SCLC hop counter is a parameter that is decremented for each performed GT translation for SCLC messages on the way to the end destination. If decrementing the counter results in the value of zero in a non-end destination node, the SCCP initiates the appropriate error procedure.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>15</max>
+                    </range>
+                    <defaultValue>8</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="hopCounterScoc">
+            <description>The SCOC hop counter is a parameter that is decremented for each performed GT translation for SCOC messages on the way to the end destination. If decrementing the counter results in the value of zero in no end destination node, the SCCP initiates the appropriate error procedure.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>15</max>
+                    </range>
+                    <defaultValue>8</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tconnEst">
+            <description>Connection establishment control timer.
+
+Unit: deciseconds (0.1 seconds).
+
+Guiding values;
+Range 600 - 1200, Default 600
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>600</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tIas">
+            <description>Send inactivity control timer.
+
+Unit: deciseconds (0.1 seconds).
+
+Guiding values;
+Range 3000-6000
+Default 3000</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>3000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tIar">
+            <description>Receive inactivity control timer.
+
+Unit: deciseconds (0.1 seconds).
+
+Guiding values;
+Range 6600-12600
+Default 6600</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>6600</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tRel">
+            <description>Connection release timer.
+
+Unit: deciseconds (0.1 seconds).
+
+Guiding values;
+Range 100-200
+Default 100</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>100</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tCong">
+            <description>Congestion timer.
+
+Unit: deciseconds (0.1 seconds).
+
+Guiding values;
+Range 10-2550
+Default 300</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>300</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tStatInfo">
+            <description>Subsystem Status Test timer.
+
+Unit: deciseconds (0.1 seconds).
+
+Guiding values;
+Range 10-2550
+Default 300</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>300</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tconnResp">
+            <description>Connection response waiting timer.
+
+Unit: deciseconds (0.1 seconds).
+
+Guiding values;
+Range 100-200
+Default 150</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>150</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tReass">
+            <description>Reassembly timer.
+
+Unit: deciseconds (0.1 seconds).
+
+Guiding values;
+Range 100-200
+Default 150</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>150</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tGuard">
+            <description>Guard timer for program restart not applicable for this CPP version. Instead a  restart counter is used to improve restart performance.
+
+Unit: deciseconds (0.1 seconds).
+
+Guiding values;
+Range 13800-15000 (23-25 minutes)
+Default 1380 (23 minutes)
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>13800</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="smiValue">
+            <description>The SMI (Subsystem Multiplicity Indicator) is always ignored for incoming messages. This SCCP can however be configured to insert a specific SMI value in outgoing messages. The coding and interpretation is as follows:
+
+Coding                             Comment
+   0          |      Affected Subsystem multiplicity unknown.
+   1          |      Affected Subsystem is solitary.
+   2          |      Affected Subsystem is duplicated.
+   3          |      Spare.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>3</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="useSCMG">
+            <description>The use of SCMG functions.
+
+SST = SCCP Subsystem Test message.
+SSA = SCCP Subsystem Allowed message.
+SSP = SCCP Subsystem Prohibited message.
+SSC = SCCP Subsystem Congested message.
+
+The attributes contained in the struct is:
+initiateTimerTcon,
+allowRemoteBroadcast,
+useSST,
+useSSP,
+sendSSA,
+sendSST
+
+</description>
+            <dataType>
+                <structRef name="Scmg"/>
+            </dataType>
+        </attribute>
+        <attribute name="maxRelayedConn">
+            <description>Connection Oriented SCCP Signaling Relay Point (SRP-CO) and Maximum number of Relayed Connections is not used in this CPP version.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>524288</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUDTSent">
+            <description>Performance monitoring counter for number of sent UDT's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUDTRec">
+            <description>Performance monitoring counter for number of received UDT's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUDTSSent">
+            <description>Performance monitoring counter for number of sent UDTS's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUDTSRec">
+            <description>Performance monitoring counter for number of received UDTS's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfXUDTSent">
+            <description>Performance monitoring counter for number of sent XUDT's.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfXUDTRec">
+            <description>Performance management counter for number of received XUDT's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfXUDTSSent">
+            <description>Performance monitoring counter for number of sent XUDTS's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfXUDTSRec">
+            <description>Performance monitoring counter for number of received XUDTS's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCRSent">
+            <description>Performance monitoring counter for number of sent CR's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCRRec">
+            <description>Performance monitoring counter for number of received CR's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDT1Sent">
+            <description>Performance monitoring counter for number of sent DT1's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDT1Rec">
+            <description>Performance monitoring counter for number of received DT1's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfERRSent">
+            <description>Performance monitoring counter for number of sent ERR's.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfERRRec">
+            <description>Performance monitoring counter for number of received ERR's.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSubsysAllowedSent">
+            <description>Performance monitoring counter for number of sent SSA's, subsystem allowed.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCREFRecFromNL">
+            <description>Performance monitoring counter for number of CREF messages received from NL.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCREFSentToNL">
+            <description>Performance monitoring counter for number of CREF messages sent to NL.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRLSDRecFromNL">
+            <description>Performance monitoring counter for number of RLSD messages received from NL.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRLSDSentToNL">
+            <description>Performance monitoring counter for number of RLSD messages sent to NL.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfConInUseExceedHighWaterMark">
+            <description>Performance monitoring counter for number of connections in use that has exceeded the high watermark threshold.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfConInUseReceededLowWaterMark">
+            <description>Performance monitoring counter for number of connections in use that has receded the low watermark threshold.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLUDTRec">
+            <description>Performance monitoring counter for number of received LUDT messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLUDTSSent">
+            <description>Performance monitoring counter for number of sent LUDTS messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="SccpScrc">
+        <description>The Signalling Connection Control Part Routing Control (SCCP SCRC)  MO holds information about the SCCP routing control.</description>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="SccpScrcId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRoutingFailure">
+            <description>Performance monitoring counter for number of routing failures.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfConnectFailure">
+            <description>Performance monitoring counter for number of connect failures.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfHopCounterViolation">
+            <description>Performance monitoring counter for number of Hop counter violations.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRoutingFailNoTransAddrOfSuchNature">
+            <description>Performance monitoring counter for number of routing failures due to no translation for Nature of Address field.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRoutingFailNoTransSpecificAddr">
+            <description>Performance monitoring counter for number of routing failures due to no translation of specific address.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRoutingFailurePointCodeUnAvail">
+            <description>Performance monitoring counter for number of routing failures due to destination point code not available.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRoutingFailNetworkCongest">
+            <description>Performance monitoring counter for number of routing failures due to network congestion.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRoutingFailSubsysUnavail">
+            <description>Performance monitoring counter for number of routing failures due to destination subsystem unavailable.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRoutingFailReasonUnknown">
+            <description>Performance monitoring counter for number of routing failures due to unknown reason.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRoutingFailUnequippedSubsys">
+            <description>Performance monitoring counter for number of routing failures due to unequipped subsystem.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Program">
+        <description>The Program MO represent the executable software on the target hardware.
+
+MOs of this type are created automatically during system upgrade.
+MOs of this type are possible to create manually but a system upgrade
+is recommended to create them.
+
+Note! Some programs are not possible to restart or can take part in an RPU. For more information please refer to the LoadModule MO.
+
+</description>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="loadModule">
+            <description>This attribute gives information about which load module the program is instantiated from.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="LoadModule"/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>This attribute shows whether the program has normal performance capability or not.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="startState">
+            <description>This attribute shows whether the program is permitted to enter operational state enabled or not after a PIU restart. The default state is disabled in order to avoid that an operating program and a new version of the same program have its startState enabled at the same time.
+ 
+It is used on all types of node restarts and restart of PlugInUnit with restartCause = piuRestartUpgrade.</description>
+            <dataType>
+                <enumRef name="StartState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="heapSize">
+            <description>This attribute sets the size of the program heap size. 
+
+The value in the referenced LoadModule is fetched by program and used at create if no value is submitted at create of the program MO.
+
+The referenced load module has a default size defined at compile time wich is used if no value is submitted at create of loadModule or the program Mo.
+
+Note! The value of this attribute is overwritten during Software Upgrade.
+
+Note: If the program is a child to a Fan Mo this attribute is irrelevant.
+
+Note: Setting of this attribute will have no effect until the program is restarted.</description>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="poolSize">
+            <description>This attribute sets the size of the program pool size. In the referenced LoadModule there is possible to set this value at create. 
+
+The value in the referenced LoadModule is fetched by program and used at create if no value is submitted at create of the program MO.
+
+The referenced load module has a default size defined at compile time wich is used if no value is submitted at create of 
+LoadModule or the Program Mo.
+
+Note! The value of this attribute is overwritten during Software Upgrade.
+
+Only working for MP-Program
+
+Unit is bytes.
+
+Note: If the program is a child to a Fan Mo this attribute is irrelevant.
+
+Note: Setting of this attribute will not have any effect until the program is restarted.
+
+</description>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="restartTimer">
+            <description>This type specifies the time that a program have to execute without faults, until the restart counter is reset. The time value is interpreted as seconds.
+
+restartTimer= -1 :  Forever,  implies that the restart counter is only reset when the PIU is restarted.
+
+Note: If the program is a child to a Fan Mo this attribute is irrelevant.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>-1</min>
+                    </range>
+                    <defaultValue>60</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="restartCounterLimit">
+            <description>This attribute specifies the number of times that a program can restart, without escalation to a PIU restart.  The possible values are:
+
+restartCounterLimit = -1 : Unlimited,  means never restart PIU, regardless of the number of times the specific program restarts.
+
+Note: If the program is a child to a Fan Mo this attribute is irrelevant.
+
+Note! The value 3 means 3 restarts, hot, warm and finally as a last resort PIU restart.
+
+Note! The program escalates to a PIU restart when the number of restarts reaches the value set for this attribute.
+I.e. if for example the value is set to 5, escalation to PIU restart will occur at the fifth restart.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>-1</min>
+                    </range>
+                    <defaultValue>3</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="ProgramId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="restart">
+            <description>Request to restart the program.
+Only valid for MP programs.
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+    </class>
+
+    <class name="UniSaalProfile">
+        <description>The UniSaal Profile MO represent and keeps attribute values used by one or more UNI SAAL termination point MOs.</description>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="UniSaalTp"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="profileData">
+            <description>See structure UniSaalProfileData</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="UniSaalProfileData"/>
+            </dataType>
+        </attribute>
+        <attribute name="UniSaalProfileId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="UniSaalTp">
+        <description>The MO represents an access point for a user where a UNI SAAL connection is terminated. The access point depends 
+on an AAL5 connection termination located on the same processor.
+
+UniSaalTp can only terminate on a Mp processor.
+
+Note! The performance monitoring counters found in NniSaalTp MO is set to zero when the Mo and its RO is created.
+These counters are not reset unless there occurs a fault situation that demands a restart and recreation of the ROs.
+Also note that some of these counters are reset based on other conditions. For more details please refer to the 
+descriptions of the performance monitoring counters in this MO.</description>
+        <attribute name="UniSaalTpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the UniSaalTp MO.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving MO.
+
+</description>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="uniSaalProfileId">
+            <description>Reference to a UniSaalProfile MO.
+
+The maxStat attribute defined in the UniSaalProfile MO is dependent on the AAL5 SDU size defined in the Aal5TpVccTp MO. See the description of the maxStat attribute in the UniSaalProfile MO.
+
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="UniSaalProfile"/>
+            </dataType>
+        </attribute>
+        <attribute name="aal5TpVccTpId">
+            <description>Reference to an Aal5TpVccTpMo.
+
+Note: The Aal5 termination point must terminate on a main processor, MP.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Aal5TpVccTp"/>
+            </dataType>
+        </attribute>
+        <attribute name="maxSduSize">
+            <description>Maximum SAAL SDU size. The attribute is dependent on the AAL5 maximum SDU size defined in the Aal5TpVccTp MO. The 'maxSduSize' may not exceed the AAL5 maximum SDU size (the lower of the two directions, fromUserMaxSduSize and toUserMaxSduSize).
+
+Example: If 'fromUserMaxSduSize' is set to 256 and 'toUserMaxSduSize' is set to 512 in the Aal5TpVccTp MO, the ' maxSduSize' in the UniSaalTp MO may not exceed 252.
+
+(i.e. maxSduSize &lt;= the aal5MaxSduSize - 4 bytes)
+
+Note! When setting the value of 'maxSduSize' the 4 bytes used by the SAAL layer for the SAAL header has to be considered.
+
+Note! The upper limit of 2044 (2048 including the SAAL header) is due to limitations on the AAL5 layer.
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>128</min> <max>2044</max>
+                    </range>
+                    <defaultValue>128</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSentSDUs">
+            <description>Number of successfully sent SDUs.
+Counts the number of successfully sent messages to the
+application using SAAL. Reset when the link goes InService or the counter "overflows".</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfReceivedSDUs">
+            <description>Number of successfully received SDUs.
+Counts the number of successfully received messages from 
+ the application using SAAL. Reset when the link goes
+ InService or the counter "overflows".</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLinkInServiceTime">
+            <description>The accumulated time (in seconds) the signalling link has
+ been in service (in assured data transfer mode) since it was created. If the link is down the value 0 is returned.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAllSLFailures">
+            <description>Number of all Signalling Link failures.
+Is a total sum of the error counters:
+        - Number of protocol errors
+        - Number of unsuccessfully retransmissions
+        - Number of NoResponses
+        - Number of other errors</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfNoResponses">
+            <description>Number of no response. This counter is increased when SSCOP (Service Specific Connection Oriented Protocol)
+send an MaaError with error code P. 
+For details refer to ITU-T Q.2110 - B-ISDN AATM Adaptation Layer - Service Specific Connection Oriented Protocol (SSCOP); (7/94).
+Counts the number of no responses detected the last 30 minutes.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLocalCongestions">
+            <description>Number of local congestions. 
+This counter is increased when the sum of SAAL send and retransmission buffers are filled to more than 90%.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRemoteCongestions">
+            <description>Number of remote congestions. 
+This counter is increased when the remote side gives SAAL no credit. Reset when the link goes InService or the counter "overflows".</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSequenceDataLosses">
+            <description>Number of sequences data loss. 
+Counts the number of SD loss detected the last 30 minutes</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfProtocolErrors">
+            <description>Number of unsolicited or inappropriate PDUs.  This counter is increased when SSCOP (Service Specific Connection Oriented Protocol)
+send an MaaError with error code Q.
+For details refer to ITU-T Q.2110 - B-ISDN AATM Adaptation Layer - Service Specific Connection Oriented Protocol (SSCOP); (7/94).
+Counts the number of protocol errors detected the last 30 minutes.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccReTransmissions">
+            <description>Number of unsuccessful retransmissions. 
+Counts the number of unsuccessfully retransmissions detected the last 30 minutes.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfOtherErrors">
+            <description>Number of other list element errors. This counter is increased when SSCOP (Service Specific Connection Oriented Protocol)
+send an MaaError with error code Q-U. 
+For details refer to ITU-T Q.2110 - B-ISDN AATM Adaptation Layer - Service Specific Connection Oriented Protocol (SSCOP); (7/94).
+Counts the number of other errors detected the last 30 minutes. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="E1PhysPathTerm">
+        <description>This MO represents an E1 (i.e. 2 Mbit/s) physical interface in the node. The E1PhysPathTerm MO does not define which type of traffic (TDM or ATM) that the interface should support. 
+Please refer to the Ds0Bundle, AtmPort, IMALink and IMAGroup objects for details about configuration of traffic type.
+
+Note! The performance monitoring counters in the E1PhysPathTerm MO is set to 0 (zero) at start or restart of the node.
+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.
+</description>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>enabled or disabled according to the actual operational state of the Physical Line Termination. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="lineNo">
+            <description>The actual Line number on the board.
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>8</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedByTraffic">
+            <description>The identity of the reserving AtmPort MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="AtmPort"/>
+            </dataType>
+        </attribute>
+        <attribute name="loopback">
+            <description>This attribute describes the current Loopback State of this physical path termination.
+
+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>
+            <dataType>
+                <enumRef name="LoopbackState">
+                    <defaultValue>none</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmEs">
+            <description>Performance Monitoring counter for ES, Errored Seconds.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSes">
+            <description>Performance Monitoring counter for Severely Errored Seconds, SES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="E1PhysPathTermId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="crc4Mode">
+            <description>Indicates what Cyclical Redundancy Check 4 Mode that is being used.</description>
+            <dataType>
+                <enumRef name="Crc4Mode">
+                    <defaultValue>AUTOMATIC</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="idlePattern">
+            <description>The idle pattern.
+
+NOTE: Going from A_LAW or U_LAW to UNDEFINED is always allowed but setting up one ET board with 
+both U_LAW and A_LAW is not allowed.
+E.g. If you want to change from A_LAW to U_LAW on one ET board you have to change idlePattern
+on each physical port belonging to the board to UNDEFINED first.
+A_LAW -&gt; UNDEFINED -&gt; U_LAW or U_LAW -&gt; UNDEFINED -&gt; A_LAW</description>
+            <dataType>
+                <enumRef name="IdlePattern">
+                    <defaultValue>UNDEFINED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="degDegThr">
+            <description>The threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.
+
+This is a percentage value.
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100</max>
+                    </range>
+                    <defaultValue>30</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="degDegM">
+            <description>How many bad seconds in a row that causes a Degraded Signal alarm.
+
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>2</min> <max>10</max>
+                    </range>
+                    <defaultValue>7</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="rdiReporting">
+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="aisReporting">
+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="shutDownTimeout">
+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.
+
+Value in seconds, must be a positive value.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100000</max>
+                    </range>
+                    <defaultValue>1800</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBySync">
+            <description>The identity of the reserving Synchronization MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Synchronization"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedByImaLink">
+            <description>The identity of the reserving ImaLink MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ImaLink"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="J1PhysPathTerm">
+        <description>This MO represents an J1 (i.e. 1.5 Mbit/s) physical interface in the node. The J1PhysPathTerm MO does not define which type of traffic (TDM or ATM) that the interface should support. 
+Please refer to the Ds0Bundle, AtmPort, IMALink and IMAGroup objects for details about configuration of traffic type.
+
+The performance monitoring counters in the J1PhysPathTerm MO is set to 0 (zero) at start or restart of the node.
+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.
+</description>
+        <attribute name="J1PhysPathTermId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="lineNo">
+            <description>The actual Line number on the board.
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>8</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>enabled or disabled according to the actual operational state of the Physical Line Termination. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="physicalLineType">
+            <description>Supported interfaces is defined in J1Types</description>
+            <dataType>
+                <enumRef name="J1Type">
+                    <defaultValue>j1_G</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedByTraffic">
+            <description>The identity of the reserving AtmPort MO.
+
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="AtmPort"/>
+            </dataType>
+        </attribute>
+        <attribute name="degThreshold">
+            <description>Maximum allowed BER(Bit Error Rate). Degraded signal (DEG) if BER &gt; degThreshold. The attribute gives a maximum BER of 10e-X, where X ranges from 5 to 9 (default 6)
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>3</min> <max>9</max>
+                    </range>
+                    <defaultValue>6</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="loopback">
+            <description>Possible values
+
+none - This is the normal state, no loop back is performed (and ordinary traffic is running).
+
+line - The physical path is looped on the line side, the external incoming path is looped back to the external outgoing path.
+
+system - The physical path is looped on the system side, the (node-) internal incoming path is looped back to the internal outgoing path.
+
+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>
+            <dataType>
+                <enumRef name="LoopbackState">
+                    <defaultValue>none</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmEs">
+            <description>Performance monitoring counter for Errored Seconds, ES.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSes">
+            <description>Performance monitoring counter for Severly Errored Seconds, SES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="idlePattern">
+            <description>The idle pattern.
+
+NOTE: Going from A_LAW or U_LAW to UNDEFINED is always allowed but setting up one ET board with 
+both U_LAW and A_LAW is not allowed.
+E.g. If you want to change from A_LAW to U_LAW on one ET board you have to change idlePattern
+on each physical port belonging to the board to UNDEFINED first.
+A_LAW -&gt; UNDEFINED -&gt; U_LAW or U_LAW -&gt; UNDEFINED -&gt; A_LAW</description>
+            <dataType>
+                <enumRef name="IdlePattern">
+                    <defaultValue>UNDEFINED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="rdiReporting">
+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="aisReporting">
+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="shutDownTimeout">
+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.
+
+Value in seconds, must be a positive value.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100000</max>
+                    </range>
+                    <defaultValue>1800</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBySync">
+            <description>The identity of the reserving Synchronization MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Synchronization"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedByImaLink">
+            <description>The identity of the reserving ImaLink MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ImaLink"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Aal0TpVccTp">
+        <description>This MO is used to represent the point in the node where an AAL0 connection is terminated. At this point the user exchange SDUs with its peer at the remote end of the AAL0 connection.
+
+Note! The performance monitoring counters in this MO is set to 0 when counterMode is set to PM_MODE_ON.
+In PM_MODE_OFF no information at all is retrived. So any value for pm-monitoring is measured from the time
+of setting counterMode to PM_MODE_ON. 
+At node restart these performance monitoring counters is reset to 0.
+
+</description>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="processorId">
+            <description>This attribute specifies on what processor the termination point resides. It could either be a board processor or main processor (MO type PlugInUnit), or a SP processor (MO type Spm).</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational State reflects the operational state of the end points and the belonging node connections.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving MO.
+</description>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="vclTpId">
+            <description>The virtual channel to which this MO is termination.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="VclTp"/>
+            </dataType>
+        </attribute>
+        <attribute name="Aal0TpVccTpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="continuityCheck">
+            <description>Continuitiy checking means that a cell is sent downstream when no user cell has been sent for a period of nominally 1 second.
+
+Activates VC end to end continuityCheck according to ITU.T rec I.610.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="nomPmBlkSize">
+            <description>Nominal performance monitoring (PM) blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.</description>
+            <dataType>
+                <enumRef name="AtmNomPmBlkSize">
+                    <defaultValue>NOM_PM_BLKSIZE_2_10</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="counterMode">
+            <description>PM mode is set to indicate type of performance monitoring mode (i.e. activation of bidirectional PM measurements).
+
+</description>
+            <dataType>
+                <enumRef name="AtmCounterMode">
+                    <defaultValue>PM_MODE_OFF</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwLostCells">
+            <description>Performance monitoring counter for forwarded lost cells.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwMissinsCells">
+            <description>Performance monitoring counter for number of forwarded missinserted cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwErrBlocks">
+            <description>Performance monitoring counter for number of forwarded errored blocks.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLostFpmCells">
+            <description>Performance monitoring counter for number of lost Forward Performance Monitoring, FPM cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwLostCells">
+            <description>Performance monitoring counter for number of lost backward cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwMissinsCells">
+            <description>Performance monitoring counter for number of backward missinserted cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwErrBlocks">
+            <description>Performance monitoring counter for number of backward errored blocks.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLostBrCells">
+            <description>Performance monitoring counter for number of lost Backward Reporting, BR, cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="alarmReport">
+            <description>Attribute to decide what type of alarms to be reported.</description>
+            <dataType>
+                <enumRef name="AlarmReport">
+                    <defaultValue>ALARM_LOC</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Aal5TpVccTp">
+        <description>This MO is used to represent the point in the node where an AAL5 connection is terminated. At this point the user exchanges SDUs with its peer at the remote end of the AAL5 connection.
+
+Note! The 'mtuSize' on the IpAtmLink MO does not include 8 bytes required for the LLC/SNAP header and this should be taken into consideration when setting the SduSize on the Aal5TpVccTp MO.
+
+Note! The performance monitoring counters in this MO is set to 0 when counterMode is set to PM_MODE_ON.
+In PM_MODE_OFF no information at all is retrived. So any value for pm-monitoring is measured from the time
+of setting counterMode to PM_MODE_ON. 
+At node restart these performance monitoring counters is reset to 0..</description>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="processorId">
+            <description>This attribute specifies on what processor the protocol is terminated. It could either be a board processor or main processor (PlugInUnit) or a SP processor (Spm).</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="vclTpId">
+            <description>The virtual channel to which this MO is termination.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="VclTp"/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational State reflects the operational state of the end points and the belonging node connections.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="fromUserMaxSduSize">
+            <description>The maximum SDU size in number of octets received from the user (called maxIngressSduSize in the FRO domain). 
+
+The allowed range is dependent on the processorType.
+SP: LowestMaxSduSize =1, HighestMaxSduSize=1600
+BP: LowestMaxSduSize =1, HighestMaxSduSize=1600
+MP:LowestMaxSduSize =1, HighestMaxSduSize=2048</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>2048</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="toUserMaxSduSize">
+            <description>The maximum SDU size in number of octets sent to the user (called maxEgressSduSize in the FRO domain). This attribute is controlled by the processor type.
+
+The allowed range is dependent on the processorType.
+SP: LowestMaxSduSize =1, HighestMaxSduSize=1600
+BP: LowestMaxSduSize =1, HighestMaxSduSize=1600
+MP:LowestMaxSduSize =1, HighestMaxSduSize=2048</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>2048</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The attribute is set by the action reserve from a user of Aal5TpVccTp. It could either be a Cello user like IpAtmLink/UniSaalTp or a node application.
+
+</description>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="Aal5TpVccTpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="alarmReport">
+            <description>Attribute to decide what type of alarms to be reported.</description>
+            <dataType>
+                <enumRef name="AlarmReport">
+                    <defaultValue>ALARM_LOC</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="continuityCheck">
+            <description>Continuitiy checking means that a cell is sent downstream when no user cell has been sent for a period of nominally 1 second. Continuity check both enables generation of CC cells as well as detection of LOC
+</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="nomPmBlkSize">
+            <description>Nominal performance monitoring (PM) blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.
+</description>
+            <dataType>
+                <enumRef name="AtmNomPmBlkSize">
+                    <defaultValue>NOM_PM_BLKSIZE_2_10</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="counterMode">
+            <description>PM mode is set to indicate type of performance monitoring mode (i.e. activation of bidirectional PM measurements).
+
+</description>
+            <dataType>
+                <enumRef name="AtmCounterMode">
+                    <defaultValue>PM_MODE_OFF</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwLostCells">
+            <description>Performance monitoring counter for number of lost forward cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwMissinsCells">
+            <description>Performance monitoring counter for number of forward missinserted cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwErrBlocks">
+            <description>Performance monitoring counter for number of forward errored blocks.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLostFpmCells">
+            <description>Performance monitoring counter for number of lost Forward Performance Monitoring, FPM, cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwLostCells">
+            <description>Performance monitoring counter for number of lost backward cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwMissinsCells">
+            <description>Performance monitoring counter for number of backward missinserted cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwErrBlocks">
+            <description>Performance monitoring counter for number of backward errored blocks.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLostBrCells">
+            <description>Performance monitoring counter for number of lost Backward Reporting, BR, cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="AtmPort">
+        <description>The AtmPort MO is used to configure a physical port for ATM traffic.
+ATM can be transported accross the physical layer in three distinct and different ways:
+
+- Normal mode
+
+An AtmPort MO is created with a reference to physical layer object (any of E1PhysPathTerm,
+J1PhysPathTerm, T1PhysPathTerm, E3PhysPathTerm, T3PhysPathTerm, Sts3CspeTtp, E1Ttp, T1Ttp or Vc4Ttp).
+The payload of that physical layer object is used to transport the ATM traffic.
+
+- Fractional ATM mode
+
+An AtmPort MO is created with a reference to a Ds0Bundle object. The Ds0Bundle specifies
+in this case the timeslots on the physical layer (any of E1PhysPathTerm,J1PhysPathTerm, 
+T1PhysPathTerm, T1Ttp or E1Ttp) that should be used for ATM traffic. The remaining timeslots
+are not used at all.
+I.e. when fractional ATM is used only one Ds0Bundle can exist as a child to a physical port MO.
+
+- IMA mode
+
+In IMA mode, a number of physical ports are grouped together to form one "virtual" physical 
+ATM pipe. In this mode the AtmPort MO is created with a reference to an IMAGroup MO.
+Please refer to the ImaGroup MO for further details.
+
+Note! The performance monitoring counters in the AtmPort MO is set to 0 (zero) at start or restart of the node.
+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again..
+
+
+</description>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="AtmPortId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the ATM port.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status of the AtmPort.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmTransmittedAtmCells">
+            <description>Performance monitoring counter for number of transmitted ATM cells through the ATM port. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmReceivedAtmCells">
+            <description>Performance monitoring counter for number of received ATM cells through the ATM port.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="valueOfLastCellWithUnexp">
+            <description>This attribute returns the ATM header, (vpi, vci, pti), of the last received unexpected cell.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <structRef name="ValueOfUnex"/>
+            </dataType>
+        </attribute>
+        <attribute name="uses">
+            <description>Reference to the physical port, IMA Group or Ds0Bundle used by the ATM port.
+
+The possible MOs are: 
+E1PhysPathTerm, J1PhysPathTerm, T1PhysPathTerm, E3PhysPathTerm, T3PhysPathTerm, Sts3CspeTtp, Sts1SpeTtp, Vc4Ttp, E1Ttp, T1Ttp, Ds0Bundle and ImaGroup.
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="pmSecondsWithUnexp">
+            <description>Performance monitoring counter for errored seconds with discarded cells due to protocol errors (unexpected, UNEX, events).
+
+I.610: With protcol errors is meant the reception of cells with either a non-standardized or a non-currently allocated header value.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="hecCorrectionMode">
+            <description>Header Error Correction.
+
+This attribute specifies if the AtmPort should detect and correct single bit errors or detect multiple bit errors in the ATM header.
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mtp3bAp">
+        <description>This MO represents an MTP3b Access Point (in a remote node). An MTP3b AP is a logical point in the MTP network at which an 
+MTP3b user can access the services provided by MTP3b and the MTP3b can deliver its services to the MTP3b user.
+
+The performance monitoring counters found in Mtp3Ap MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).
+
+</description>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="routeSetId">
+            <description>The routeSetId attribute points out the MTP3b Signalling Route Set (SRS) to which the Mtp3bAp MO is connected. </description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Mtp3bSrs"/>
+            </dataType>
+        </attribute>
+        <attribute name="serviceInd">
+            <description>The serviceInd attribute (Service Indicator, SI) is used by traffic handling functions to perform message distribution.
+Only SI=3 for SCCP usage and SI=12 for Q.2630.1 usage and SI=14 for GCP (H.248) usage have any meaning in this case.
+
+Full range of values for attribute SI:
+0 = Signalling network management messages
+1 = Signalling network testing &amp; maintenance regular messages
+2 = Signalling network testing &amp; maintenance special messages*
+3 = SCCP 
+4 = Telephone User Part (TUP)
+5 = ISDN User Part (ISUP)
+6 = Data User Part, call and circuit related messages
+7 = Data User Part, facility registration and cancellation messages
+8 = MTP Testing User Part
+9 = Broadband ISDN User Part
+10 = Satellite ISDN User Part
+11 = Spare
+12 = Q.2630.1
+13 = Spare
+14 = H.248
+15 = Spare
+
+Note! The serviceIndicator has to be unique for each Mtp3bAp witin the same Mtp3bSrs.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>15</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operationalState attribute determines the operational status of the MTP3b AP . 
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="Mtp3bApId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUserPartUnavailRec">
+            <description>A performance management counter for number of received User Part Unavailable messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAdjacentSPNotAccessible">
+            <description>Performance management counter for number of Adjacent SP's that are not accessible via direct links.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="NniSaalProfile">
+        <description>The NniSaal Profile MO represents and keeps attribute values used by one or more NNI SAAL termination point MOs.</description>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of NniSaalTps that have reserved this NniSaalProfile.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="NniSaalTp"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="profileData">
+            <description>See structure NniSaalProfileData.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="NniSaalProfileData"/>
+            </dataType>
+        </attribute>
+        <attribute name="NniSaalProfileId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="NniSaalTp">
+        <description>The MO represents an access point for a user where a NNI SAAL connection is terminated. The access point depends 
+on an AAL5 connection termination located on the same processor.
+
+NniSaalTp can only terminate on a Mp processor.
+
+Note! The performance monitoring counters found in NniSaalTp MO is set to zero when the Mo and its RO is created.
+These counters are not reset unless there occurs a fault situation that demands a restart and recreation of the ROs.
+Also note that some of these counters are reset based on other conditions. For more details please refer to the 
+descriptions of the performance monitoring counters in this MO.</description>
+        <attribute name="NniSaalTpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the NniSaalTp MO.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="nniSaalProfileId">
+            <description>Reference to a NniSaalProfile MO.
+
+The maxStat attribute defined in the NniSaalProfile MO is controlled by the AAL5 SDU size defined in the Aal5TpVccTp MO. See the description of the maxStat attribute in the NniSaalProfile MO.
+
+Note! The consistency check of the attributes in the two MOs mentioned above could not be performed until the NniSaalTp MO was created since there is no direct relation between the objects. It is therefore the responsibility of NniSaalTp to verify the consistency.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="NniSaalProfile"/>
+            </dataType>
+        </attribute>
+        <attribute name="aal5TpVccTpId">
+            <description>Reference to a Aal5TpVccTp MO.
+
+Note: The Aal5 termination point must terminate on a main processor, MP.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Aal5TpVccTp"/>
+            </dataType>
+        </attribute>
+        <attribute name="maxSduSize">
+            <description>Maximum SAAL SDU size. The attribute is dependent on the AAL5 maximum SDU size defined in the Aal5TpVccTp MO. The 'maxSduSize' may not exceed the AAL5 maximum SDU size (the lower of the two directions, fromUserMaxSduSize and toUserMaxSduSize).
+
+Example: If 'fromUserMaxSduSize' is set to 256 and 'toUserMaxSduSize' is set to 512 in the Aal5TpVccTp MO, the ' maxSduSize' in the NniSaalTp MO may not exceed 252.
+
+(i.e. maxSduSize &lt;= the aal5MaxSduSize - 4 bytes)
+
+Note! When setting the value of 'maxSduSize' the 4 bytes used by the SAAL layer for the SAAL header has to be considered.
+
+Note! The upper limit of 2044 (2048 including the SAAL header) is due to limitations on the AAL5 layer.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>128</min> <max>2044</max>
+                    </range>
+                    <defaultValue>128</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSentSDUs">
+            <description>Number of successfully sent SDUs.
+Counts the number of successfully sent messages to the
+application using SAAL. Reset when the link goes InService or the counter "overflows".</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfReceivedSDUs">
+            <description>Number of successfully received SDUs.
+Counts the number of successfully received messages from 
+ the application using SAAL. Reset when the link goes
+ InService or the counter "overflows".</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLinkInServiceTime">
+            <description>The accumulated time (in seconds) the signalling link has
+ been in service (in assured data transfer mode) since it was created. If the link is down the value 0 is returned.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAllSLFailures">
+            <description>Number of all Signalling Link failures.
+Is a total sum of the error counters:
+        - Number of protocol errors
+        - Number of unsuccessfully retransmissions
+        - Number of NoResponses
+        - Number of other errors</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfNoResponses">
+            <description>Number of no response. 
+Counts the number of no responses detected the last 30 minutes.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLocalCongestions">
+            <description>Number of local congestions. 
+This counter is increased when the sum of SAAL send and retransmission buffers are filled to more than the congestionOnSet attribute is configured to..</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRemoteCongestions">
+            <description>Number of remote congestions. 
+This counter is increased when the remote side gives SAAL no credit. Reset when the link goes InService or the counter "overflows".</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAlignmentFailures">
+            <description>Number of alignment or proving failures. This counter is
+increased when "alignment not successful". 
+The counter is reset when the link is created or the counter "overflows".</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSequenceDataLosses">
+            <description>Number of sequences data loss. 
+Counts the number of SD loss detected the last 30 minutes</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfProtocolErrors">
+            <description>Number of unsolicited or inappropriate PDUs. 
+Counts the number of protocol errors detected the last 30 minutes.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccReTransmissions">
+            <description>Number of unsuccessful retransmissions. 
+Counts the number of unsuccessfully retransmissions detected the last 30 minutes.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfOtherErrors">
+            <description>Number of other list element errors. 
+Counts the number of other errors detected the last 30 minutes. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="AtmTrafficDescriptor">
+        <description>This MO specifies traffic and QoS parameters for virtual channel connections.
+
+The attributes can only be set in certain combinations:
+
+CBR:
+ingressAtmQos /egressAtmQos:
+1, 2 
+
+ingressAtmPcr /egressAtmPcr:
+mandatory (must be specified)
+
+ingressAtmMcr /egressAtmMcr:
+optional (not used, any value submitted will be ignored)
+
+UBR+:
+ingressAtmQos /egressAtmQos:
+3 
+
+ingressAtmPcr /egressAtmPcr:
+optional (if shaping is used the desired rate is specified, 0 means no shaping)
+
+ingressAtmMcr /egressAtmMcr:
+mandatory (must be specified)
+
+UBR:
+ingressAtmQos /egressAtmQos:
+4 
+
+ingressAtmPcr /egressAtmPcr:
+optional (not used, any value submitted will be ignored)
+
+ingressAtmMcr /egressAtmMcr:
+optional (not used, any value submitted will be ignored)
+
+Note that the VP sub layer only supports ServiceCategory = CBR  and QoS = 1.
+
+Note! The performance monitoring counters in the AtmTrafficDescriptor MO is set to 0 (zero) at start or restart of the node.
+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.
+</description>
+        <attribute name="AtmTrafficDescriptorId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>This MO's user label.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ingressAtmPcr">
+            <description>Ingress ATM Peak cell rate (cells/s).
+
+Only positive values are allowed. This attribute is only mandatory when serviceCategory is CBR or UBR_PLUS.
+
+Note! When 'serviceCategory' is set to UBR this attribute has no relevance and the value submitted is ignored by the system.
+
+Note! When 'serviceCategory' is set to UBR+ the value 0 (zero) means that shaping is not used. A value larger than the minimum desired cell rate enables shaping to the rate specified.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="ingressAtmQos">
+            <description>Ingress ATM quality of service.
+
+This attribute can be set to Class 1 and 2 if attribute serviceCategory is set to CBR.
+
+This attribute can be set to Class 3 if attribute serviceCategory is set to UBR+.
+
+This attribute can be set to Class 4 if attribute serviceCategory is set to UBR.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="AtmQos">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="egressAtmPcr">
+            <description>Egress ATM Peak cell rate (cells/s).
+
+Only positive values allowed.
+
+This attribute is only mandatory when serviceCategory is CBR or UBR_PLUS.
+
+Note! When 'serviceCategory' is set to UBR this attribute has no relevance and the value submitted is ignored by the system.
+
+Note! When 'serviceCategory' is set to UBR+ the value 0 (zero) means that shaping is not used. A value larger than the minimum desired cell rate enables shaping to the rate specified.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="egressAtmQos">
+            <description>Egress ATM quality of service.
+
+This attribute can be set to Class 1 and 2 if attribute serviceCategory is set to CBR.
+
+This attribute can be set to Class 3 if attribute serviceCategory is set to UBR+.
+
+This attribute can be set to Class 4 if attribute serviceCategory is set to UBR.
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="AtmQos">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Sequence of Users that are using this AtmTrafficDescriptor.
+
+
+</description>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="egressAtmMcr">
+            <description>Egress ATM minimum desired cell rate.
+
+Only positive values allowed. The attribute is only mandatory when serviceCategory is UBR+.
+
+Note! When 'serviceCategory' is set to CBR or UBR this attribute has no relevance and the value submitted is ignored by the system.
+
+Note! This attribute cannot have a value larger than for 'egressAtmPcr'.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="ingressAtmMcr">
+            <description>Ingress minimum desired cell rate (cells/s).
+
+Only positive vaues allowed. This attribute is mandatory only when serviceCategory is UBR+.
+
+Note! When 'serviceCategory' is set to CBR or UBR this attribute has no relevance and the value submitted is ignored by the system.
+
+Note! This attribute cannot have a value larger than for 'ingressAtmPcr'.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="serviceCategory">
+            <description>The service category.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="ServiceCategory">
+                </enumRef>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mtp3bSrs">
+        <description>This MO represents/models a MTP3b Signalling Route Set.
+
+The performance monitoring counters found in Mtp3Srs MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).</description>
+        <attribute name="Mtp3bSrsId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the Mtp3bSrs MO.
+
+There are two possible states for the  operationalState attribute:
+
+- enabled, the MO is partly or fully operational.
+- disabled, the MO is not operational.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The attribute is set by the local action Reserve.
+
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="autoReroute">
+            <description>This flag indicates Whether automatic rerouting is performed(true) or not(false), between IP and ATM/TDM 
+routes when configuration is made. If set to 'false', it has to be done manually, for ex. by management actions(orders).
+
+Note! The attribute 'autoReroute' will always be set to 'false' regardless of value submitted. This attribute is to be removed in coming releases.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <boolean/>
+            </dataType>
+        </attribute>
+        <attribute name="destPointCode">
+            <description>The destPointCode attribute (destination point code, DPC) represents the point code of this Mtp3b SRS MO.
+The Destination Point Code in a Route Set has to be unique within each Signaling Point.
+
+Note! The format of destPointCode must correspond to the signallingPointCode format in the Mtp3bSp, i.e. ITU, ANSI, TTC or China.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>16777215</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="congestedLevel">
+            <description>There are two possible states for the congestedLevel attribute:
+
+- notCongested, no change in congestion level.
+- congested, change in congestion level has occurred.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bCongestLevel">
+                    <defaultValue>notCongested</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDiscardedMsgFromBroadToNarrow">
+            <description>Performance management counter for number of messages discarded from broadband to narrowband.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTransferControlledRec">
+            <description>Performance monitoring counter for number of received Transfer Control (TFC) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTransferProhibitedRec">
+            <description>Performance monitoring counter for number of received Transfer Prohibited (TFP) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTransferAllowedRec">
+            <description>Performance monitoring counter for number of received Transfer Allowed (TFA) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <action name="routeSetTestAnyRoute">
+            <description>The route set test is only available for the Japanese Mtp3b, TTC.
+
+See JT-Q.707 for details.
+
+The test selects a route in the route set and tests it.
+
+Possible return codes are:
+
+0   : successful test
+48  : unsuccessful test
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                    <long/>
+            </returnType>
+        </action>
+        <action name="routeSetTestSpecificRoute">
+            <description>The route set test is only available for the Japanese Mtp3b, TTC.
+
+See JT-Q.707 for details.
+
+The test tests the specified route.
+
+Possible return codes are:
+
+0   : successful test
+48 : unsuccessful test
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <parameter name="routeId">
+                <in/>
+                <dataType>
+                    <moRef name="Mtp3bSr"/>
+                </dataType>
+            </parameter>
+        </action>
+    </class>
+
+    <class name="PlugInUnit">
+        <description>This MO is used to represent a plug-in-unit, that is a board inserted in a slot in a subrack.
+
+Note! Before deleting the PlugInUnit MO, administrativeState must be set to locked.</description>
+        <attribute name="PlugInUnitId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>A free tag that a user can associated to the this managed object. The value has no relevance for the managed system.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state of the PlugInUnit.
+
+The possibility to rollback the setting of this attribute is limited.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state is set to 'enabled' when the plug-in-unit has loaded and started its 'Basic' load module.</description>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="productType">
+            <description>This attribute describes the product type and is always set to the value "HW".</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>"HW"</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="piuType">
+            <description>A reference to an available PiuType at create of a PIU.
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="PiuType"/>
+            </dataType>
+        </attribute>
+        <attribute name="piuGroupNumber">
+            <description>Indicates which restart group the plug-in unit belongs to.
+Such a group consists of a number of plug-in units where at least one must be enabled (working) or performing recovery. When all plug-in units in a group are out of function, the node is restarted. 
+
+Must have a positive value.
+
+Zero indicates no group.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>65536</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. It is a bit mapped CORBA long, where one or more of the bits may be set. If none of the bits are set then the availability status  is considered to be undefined.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of managed objects depending on PlugInUnit</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="pmProcessorLoad">
+            <description>The measurement is done over 100 ms, and returns the sum of load on processes up to, and including process priority 23. The sum is expressed in %
+
+Supported on MP, BP and SP boards.
+
+In case of SP boards the returned processor load is the load of the BP.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="allowedSeqRestarts">
+            <description>The number of automatic (do not require intervention from a human operator) sequential restarts that are allowed for a PIU. When this number of automatic restarts has been exceeded, the automatic restarting halts and the PIU is faulty marked.
+
+The time limit between two restarts is 5 minutes. This means that if the time between two restarts
+is less then 5 minutes the restarts are counted, otherwise the restart counter is reset.
+
+For example,  3 means 3 restarts with time limit &lt; 5 minutes are accepted but when the 4:th occurs within 5 minutes the board is considered faulty and an alarm is generated.</description>
+            <dataType>
+                <enumRef name="SeqRestarts">
+                    <defaultValue>RESTARTS_WITH_WARM</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <action name="restart">
+            <description>
+Note! The restartCause can have the following values:
+1 = restart error
+2 = restart upgrade
+
+Note! The restartCause piuRestartUpgrade overrides the restartRank value and gives mainly restartRank=warm (or restartRank=refresh in some upgrade situations.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="restartRank">
+                <in/>
+                <dataType>
+                    <enumRef name="RestartRank">
+                    </enumRef>
+                </dataType>
+            </parameter>
+            <parameter name="restartCause">
+                <in/>
+                <dataType>
+                    <enumRef name="RestartCause">
+                    </enumRef>
+                </dataType>
+            </parameter>
+            <raisesException name="ValueOutOfRangeException"/>
+            <raisesException name="FroNotAccessibleException"/>
+        </action>
+    </class>
+
+    <class name="Mtp3bSls">
+        <description>This MO represents the SS7 Signalling Link Set as defined in Recommendation Q.704 Ver. 3, April 28 1992 (ITU) T1.111-1996 (ANSI), JT-Q.704 Ver. 3, April 28 1992 (TTC) or GF001-9001 1990 (China).
+
+It provides information about a set of signalling links between an OPC/Adjacent PC pair. A link set is constructed from between 1 to16 Signalling Links (for China, Itu, Ttc and the ANSI standard), all of which have the same two end points (signalling points) as the Signalling Link Set. A Signalling LInk Set may be part of many routes.</description>
+        <attribute name="Mtp3bSlsId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Use label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the MTP3B SLS.
+
+The operability of the MTP3B SLS is described by the operationalState attribute which has two possible values:
+
+- Enabled: The MTP3B SLS is partly or fully operable and available for use. At least one of the belonging links (SL) is enabled.
+- Disabled: The MTP3B SLS is totally inoperable and unable to provide service to the user.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="usageState">
+            <description>The usageState reflects the usage state of the links in the link set. There are three possible values:
+
+- Active: At least one of the belonging  SLs of  the SLS is Active and no link is Busy.
+- Busy: If one of the belonging links is Busy.
+- Idle: All SLs of the SLS are Unavailable.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bUsageState">
+                    <defaultValue>IDLE</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="periodicLinkTestFlag">
+            <description>The periodicLinkTestFlag indicates if periodic sending of SLTM/SLTA messages are used or not. The SLTM message will be sent on every link which is "aligned" at an interval of (SLTM timer). The answer, SLTA is supposed to arrive within (SLTA timer). If this doesnt happen, or if the received SLTA doesnt match the sent SLTM a second SLTM will be sent. If this SLTM also fail then the link will be considered 'out-of-service' and a restart of that link will begin.
+
+ANSI: true is default.
+ITU: true is default.
+China: true is default.
+TTC: false is default.
+
+Note that TTC does not use this feature.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="mtp3bSrsId">
+            <description>The mtp3bSrsId attribute points out the corresponding MTP3b Signalling Route Set MO (adjacentDPC).</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Mtp3bSrs"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="Mtp3bSr"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <action name="deactivateLinkSet">
+            <description>This action deactivates a link set, which means the containing signalling links are taken out of service.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+            <raisesException name="FroNotAccessibleException"/>
+        </action>
+        <action name="activateLinkSet">
+            <description>A linkset containing signalling links which are all out of service, is called a deactivated linkset. In order to start up the signalling links and get them into service, there is an Activate Link Set action, or rather, there are two similar actions for activation of a link set.
+
+If the action fails to activate a link the ActivationFailed exception is raised.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+            <raisesException name="FroNotAccessibleException"/>
+        </action>
+        <action name="emergencyActivateLinkSet">
+            <description>This action activates the signalling link with emergency alignment.
+It will also set autoStartLink = true
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+            <raisesException name="FroNotAccessibleException"/>
+        </action>
+    </class>
+
+    <class name="Mtp3bSr">
+        <description>This MO represents a MTP3b Signalling Route. A Signalling Route is used to convey MTP3b User messages from a origin SP to a destination SP (Signalling Point). This MO is multiple instansiated and is contained in the MO MTP3b Signalling Route Set. A Signalling Route is from a network point of view the sequence of link sets from a originating signalling point to a destination signalling point.
+
+Note! At least one signalling route in the signalling route set must have priority = 1.
+If lower priorities are defined the next level must be priority=2. (e.g. routes with priority =1 and =3 in a route set will not work).
+
+Note! Signalling Routes belonging to the same route set with the same priority must have the same type of bearer (Broad Band or Narrow Band).</description>
+        <attribute name="Mtp3bSrId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="linkSetM3uId">
+            <description>The MTP3b Signalling Link Set (MTP3bSls) or M3uAssociation to which the MTP3bSr MO is connected.
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Operational state notification.There are two possible states for the operationalState attribute:
+- enabled, possible to perform operations on the MTP3b SR.
+- disabled, not possible to perform operations on the MTP3b SR.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="usageState">
+            <description>There are three possible states  for the usageState attribute:
+
+-active, route is active.
+-busy, route is congested.
+-idle, route not in use.
+
+(idle=0, active=1, busy=2)
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bUsageState">
+                    <defaultValue>IDLE</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="priority">
+            <description>The priority of the alternative route. The traffic is directed to the highest priority route(s) available in the route set. If more than one route has the same priority within a route set then loadsharing is permitted between these routes.
+The value 1 is considered as the highest priority.</description>
+            <mandatory/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>5</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="routeType">
+            <description>The type of the route.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="Mtp3bRouteType">
+                    <defaultValue>TDM_ATM</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="RouteBlockingState">
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="RouteState">
+                    <defaultValue>NOT_BLOCKED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSecondsAccumulatedRouteUnavailable">
+            <description>The number of seconds (accumulated) route unavailable.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <action name="blockSignalingRoute">
+            <description>This action blocks the Signaling Route.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="deBlockSignalingRoute">
+            <description>This action deblocks the Signaling Route.
+
+Note! This action requires antransaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+    </class>
+
+    <class name="IpSystem">
+        <description>The IP System MO constitutes the top structure level for IP related MOs in a Cello node.
+
+The IpSystem MO is automatically created and cannot be deleted.
+
+The local distinguished name of this MO is ManagedElement=1, IpSystem=1.
+</description>
+        <systemCreated/>
+        <attribute name="userLabel">
+            <description>An operator defined label.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="IpSystemId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="ping">
+            <description>Ping - used to call a host or router to find out if it is present in the network. The following input parameter is used by the Ping action:
+The domain name or IP address to the host that shall be called.
+
+The following parameter is returned:
+Ping result: 'IP address/domain name' - is alive or no answer.
+
+Note! This action requires a transaction.
+</description>
+            <returnType>
+                    <string/>
+            </returnType>
+            <parameter name="host">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="traceRoute">
+            <description>Trace route - used to get information about the route through the IP network that is used for a destination with a specific IP address.
+
+The following input parameter is used by the trace route action:
+The domain name or IP address to a host that shall be trace-routed.
+
+The following parameter is returned:
+Trace result - list of IP addresses/domain names or path not found.
+
+Note! This action requires a transaction.
+</description>
+            <returnType>
+                    <string/>
+            </returnType>
+            <parameter name="host">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+        </action>
+    </class>
+
+    <class name="IpAtmLink">
+        <description>This MO represents an Internet Protocol over ATM link. LLC/SNAP encapsulated packets over Atm Adaptation Layer 5, AAL5, ATM PVCs are used.
+
+Note: The performance monitoring counters in the IpAtmLink MO has a "Wrap-around time" of approximately 2 hours.
+
+Note! When setting the 'fromUserMaxSduSize' and 'toUserMaxSduSize' on the Aal5TpVccTp MO the defined SduSize should be 8 bytes larger then the 'mtuSize' on the IpAtmLink.
+
+Note! Only Aal5TpVccTp's that terminates on an MP (Main Processor) may be used when setting up IpAtmLink's.</description>
+        <attribute name="IpAtmLinkId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>The User Label attribute gives the operator the possibility to label the links.
+</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the IP over ATM link is dependent of the operational states of the underlying AAL5 termination points that are used to transport IP datagrams. If at least one operational AAL5 termination point   (MO: AAL5 TP VCC TP) exists, the operational state of the IP over ATM Link is set to "ENABLED"</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. It is a bit mapped CORBA long, where one or more of the bits may be set. If none of the bits are set then the availability status  is considered to be undefined.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>If set, indicates that this IpAtmLink is reserved by the OspfInterface represented by this attribute.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="OspfInterface"/>
+            </dataType>
+        </attribute>
+        <attribute name="ipAddress">
+            <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits. 
+
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="subnetMask">
+            <description>The attribute subnetMask states the subnet mask of the IP over ATM link (point to point link).
+
+The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits. 
+For a point to point link, the subnetmask 255.255.255.252 is very likely.
+
+Note! The subnet mask has to be contiguos. That is, it has the LSB's set to 0 (zero).
+
+Example:
+
+255.255.255.X
+
+Contiguous subnet mask:
+11111111.11111111.11111111.11111110 (X = 254)
+11111111.11111111.11111111.11111100 (X = 252)
+
+Not-contiguous subnet mask:
+11111111.11111111.11111111.11111010 (X = 250)
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="mtuSize">
+            <description>The attribute mtuSize states the maximum IP datagram size that may be sent on the IP over ATM link in bytes, without fragmentation. Recommended MTU size is 1500 bytes to prevent IP fragmentation.
+
+Note that the size of the IP datagram does not include the 8 Bytes added for the LLC/SNAP header before putting the IP datagram in AAL5 SDU.
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>576</min> <max>2040</max>
+                    </range>
+                    <defaultValue>1500</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="metric">
+            <description>The attribute metric states the metric "cost" of the IP over ATM link. The metric value is calculated as 10^8 /link bit speed.
+
+For example:
+Metric for 10 Mbps Ethernet = 10^8/10^7 = 10
+Metric for 100 Mbps Ethernet = 10^8/10^8 = 1</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>32767</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="monitor">
+            <description>This attribute indicates whether InvATMARP monitor is turned on or off.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="monitorInterval">
+            <description>The interval between sending monitor packets.
+Unit is seconds.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>60</max>
+                    </range>
+                    <defaultValue>10</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="monitorRetries">
+            <description>The number of retries when sending monitor packets.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>255</max>
+                    </range>
+                    <defaultValue>10</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="interfaceName">
+            <description>The interface name.
+
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="aal5TpVccTpSelectionMode">
+            <description>The selection mode for the Aal5TpVccTp's used by the IpAtmLink MO. Determines how the IpAtmLink MO selects the Aal5 termination points used.
+
+In case 'NO_PREFERENCE', 'LOCAL_MP_SELECT_VCC_AT_LINK_UP', LOCAL_MP_PEER_SELECTION_VCC' or 'LOCAL_MP_ACTIVE_RESELECTION' is selected the IpAtmLink MO will prefer Aal5TpVccTp on local MP (i.e. Aal5TpVccTp MOs executing on the same MP as the IpAtmLink), but other Aal5TpVccTp will be accepted if needed.
+
+In case 'ONLY_LOCAL_MP' is selected, the ipAtmLink (Inet Link) will consider Aal5TpVccTp residing on other MPs as a malfunction and discard the usage of them. No InvArp sending will be performed on them and all incomming trafic on them will be discarded. If no local Aal5TpVccTp exists the operational state of the link will be changed to disabled.
+
+  </description>
+            <dataType>
+                <enumRef name="Aal5TpSelectionModes">
+                    <defaultValue>NO_PREFERENCE</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="Aal5TpVccTpIdList">
+            <description>References to MOs of type Aal5TpVccTp representing the underlying AAL5 termination points (of a AAL5 PVC:s) for the IP over Atm link. 
+
+The operator gives a list of relative distinguished names of the Aal5TpVccTp MO's to be used by the IP over ATM link. 
+An Aal5TpVccTp MO may only be specified once in the list.
+
+To change in the set of Aal5TpVccTp MO's related to the IP over ATM link the link has to be deleted and then created with the desired set of AAL5 TP.
+
+Note! Only Aal5TpVccTp's that terminates on an MP (Main Processor) may be used when setting up IpAtmLink's.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <sequence>
+                    <moRef name="Aal5TpVccTp"/>
+                    <length>4</length>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInUcastPkts">
+            <description>Performance monitoring counter for the number of input unicast packets deliverred to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInNUcastPkts">
+            <description>Performance monitoring counter for the number of input broadcast/multicast packets deliverred to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfOutUcastPkts">
+            <description>Performance monitoring counter for the number of out unicast packets deliverred to higher layer</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfOutNUcastPkts">
+            <description>Performance monitoring counter for the number of output broadcast/multicast packets deliverred to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInErrors">
+            <description>Performance monitoring counter for the number of input packets discarded due to any error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInDiscards">
+            <description>Performance monitoring counter for the number of input packets discarded due to resource limitations.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfifOutDiscards">
+            <description>Performance monitoring counter for the number of outbound packets discarded due to resource limitations.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <action name="assignIpAddress">
+            <description>This action sets the IP address and the subnet mask. 
+
+The changing of the IP address with the operation assignIpAddress, it might cause an interruption of the communication between the node and the network management tool. If an incorrect or erroneous IP address is configured, the communication with the node might be lost until the node is restarted or the IP address is changed to the correct value.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="ipAddress">
+                <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.</description>
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="subnetMask">
+                <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.</description>
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+        </action>
+    </class>
+
+    <class name="EthernetLink">
+        <description>The Ethernet Link MO represents the Internet Protocol over Ethernet link. There is only one Ethernet link MO per Cello node.
+
+The changing of the IP address with operation assignIpAddress might cause interruption of the communication if the network management tool is connected via the ethernet link.
+
+Note: The EthernetLink MO can not be deleted!
+
+Note: The performance monitoring counters in the EthernetLink MO has a "Wrap-around time" of approximately 2 hours.
+</description>
+        <attribute name="userLabel">
+            <description>The User Label attribute gives the operator the possibility to label the links.
+
+</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ipAddress">
+            <description>The attribute ipAddress states the IP address of the Ethernet link, it is also the IP address for the O&amp;M host..
+
+The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits. 
+It must not be a broadcast or multicast address.
+
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="subnetMask">
+            <description>The attribute subnetMask states the subnet mask of the Ethernet link.
+
+The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.
+
+Note! The subnet mask has to contiguos. That is, it has the LSB set to 0 (zero).
+
+Example:
+
+255.255.255.X
+
+Contiguous subnet mask:
+11111111.11111111.11111111.11111110 (X = 254)
+11111111.11111111.11111111.11111100 (X = 252)
+
+Not-contiguous subnet mask:
+11111111.11111111.11111111.11111010 (X = 250)
+
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="broadcastAddress">
+            <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.</description>
+            <mandatory/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="mtuSize">
+            <description>The IP layer expects the Ethernet link to have an MTU size (maximum Ethernet frame size without fragmentization) of 1500 bytes.
+
+The value is always the default value. 
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>1500</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="metric">
+            <description>The attribute metric states the metric of the Ethernet link. The metric value is calculated as 10^8/link bit speed.
+
+For example:
+Metric for 10 Mbps Ethernet = 10^8/10^7 = 10
+Metric for 100 Mbps Ethernet = 10^8/10^8 = 1</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>32767</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the Ethernet link is dependent of the operational states of the underlying MAU:s that represents the Ethernet transceiver function. If at least one operational MAU exists, the operational state of the Ethernet Link is set to "ENABLED"</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="interfaceName">
+            <description>The interface name.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="macAddress">
+            <description>The mac address is persistently stored in flash prom on the MP where the IP stack resides. It is stored there  at manufacturing. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <long/>
+                    <length>6</length>
+                    <nonUnique/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>If set, indicates that this EthernetLink is reserved by the OspfInterface MAO represented by this attribute.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="OspfInterface"/>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="EthernetLinkId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInUcastPkts">
+            <description>Performance monitoring counter for the number of input unicast packets deliverred to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInNUcastPkts">
+            <description>Performance monitoring counter for the number of input broadcast/multicast packets deliverred to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfOutUcastPkts">
+            <description>Performance monitoring counter for the number of out unicast packets deliverred to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInErrors">
+            <description>Performance monitoring counter for the number of input packets discarded due to any error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInDiscards">
+            <description>Performance monitoring counter for the number of input packets discarded due to resource limitations.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfOutNUcastPkts">
+            <description>Performance monitoring counter for the number of output broadcast/multicast packets deliverred to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfifOutDiscards">
+            <description>Performance monitoring counter for the number of outbound packets discarded due to resource limitations.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <action name="assignIpAddress">
+            <description>This action sets the IP address and the subnet mask. 
+
+The changing of the IP address with the operation assignIpAddress, 
+causes an interruption of the communication between the node and 
+the network management tool. If an incorrect or erroneous IP address
+is configured, the communication with the node might be lost until 
+the node is restarted or the IP address is changed to the correct 
+value.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="ipAddress">
+                <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.</description>
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="subnetMask">
+                <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.</description>
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+        </action>
+    </class>
+
+    <class name="IpRoutingTable">
+        <description>This MO holds the IP routing table.
+
+The IpRoutingTable MO is automatically created when the Ip MO is created.
+The IpRoutingTable MO can not be created manually.
+The IpRoutingTable MO can not be deleted.
+</description>
+        <systemCreated/>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="indexOfDeletableStaticRoutes">
+            <description>This attribute gives the indexes for the static routes that are possible to delete by the operator.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <long>
+                        <defaultValue>0</defaultValue>
+                    </long>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="IpRoutingTableId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="addStaticRoute">
+            <description>Used to add a new static route to the routing table. It can be
+indicated if the static route should be redistributed by OSPF.
+When adding a static route with an ipaddress, which is not a subnet
+address, the ipaddress is recalculated to the corresponding subnet
+address, based on the ipaddress and the subnet mask. So when looking
+for this route using the action 'getRoutingTableEntry' it is in fact
+the recalculated ipaddress, that is displayed and not the ip address
+entered with addStaticRoute. This is an automatic correction.
+
+Note! If an attempt is made to add a static route with  hopIpAddress starting with 0.0 an exception will be thrown.
+
+Note! This action requires a transaction.
+
+
+</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="ipAddress">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="subnetMask">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="hopIpAddress">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="routeMetric">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <parameter name="redistribute">
+                <in/>
+                <dataType>
+                    <boolean/>
+                </dataType>
+            </parameter>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="listRoutes">
+            <description>List routes actions is used to list all routes in the routing table. It requires no input parameters.
+
+The output is a formatted string, indicating the number of routes in the table followed by route information for each of these routes.
+
+The number of routes in the table is found at the very start of the returned string. Immediately following this is the information on each route in the list in turn. The route information for each route begins with a new line character ("\n") and is followed by the following data items (in the order written below), which are separated from each other by a SPACE character:
+
+- Destination IP address
+- Destination Network mask
+- Next hop IP address/Interface index of connected networks in dot-decimal format
+- Route metric
+- Route type
+- Interface name
+- Redistribute
+- Active
+
+Note that the next hop ipaddress is not an ipaddress per se, it is the subnet on wich the host/router to route to resides.
+
+Below is an example list of routes that could be returned from this action:
+
+"\n123.123.123.123 234.234.234.234 0.0.0.7 10 13 LE0 FALSE active\n122.122.122.122 233.233.233.233 0.0.0.6 2 8 LE0 TRUE active\n132.132.132.132 243.243.243.243. 0.0.0.7 9 13 LE0 TRUE inactive"
+
+In this case, there are three routes in the routing table. The first route has destination IP address of 123.123.123.123, the second route has it set to 122.122.122.122, while finally the third has it set to 132.132.132.132.
+
+NOTE that the route types can be of the following types:
+
+INET_RTPROTO_OTHER          1
+INET_RTPROTO_LOCAL          2
+INET_RTPROTO_NETMGMT     3
+INET_RTPROTO_ICMP             4
+INET_RTPROTO_OSPF            13
+
+The types listed above also denote the origin of the routing entry.
+
+Note! This action does not require a transaction.
+</description>
+            <returnType>
+                    <string/>
+            </returnType>
+        </action>
+        <action name="getRoutingTableEntry">
+            <description>Returns a RoutingTableEntry according to the specified index. 
+
+Should be used with action 'numberOfRoutes' within a transaction. To refresh the routing table stored in the MO, invoke the action 'numberOfRoutes'.
+
+Precondition: 0 &lt;= index &lt;= numberOfRoutes() - 1
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                    <structRef name="RoutingTableEntry"/>
+            </returnType>
+            <parameter name="index">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="InvalidIndexException"/>
+        </action>
+        <action name="numberOfRoutes">
+            <description>Returns the number of entries in the routing table.
+
+Each time this action is invoked, the MO retrieves routing table information from the resource layer and then builds a new array of RoutingTable structs to store this information.
+
+This action along with getRoutingTableEntry(), which allows one to iterate through the array stored in the MO, should be used together with a transaction.</description>
+            <returnType>
+                    <long/>
+            </returnType>
+        </action>
+        <action name="deleteStaticRoute">
+            <description>Removes the RoutingTableEntry submitted as a parameter from the Routing Table, if it is found in the table.
+
+Note that only static roues, previously added, can be deleted with this action.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="routingTableEntry">
+                <in/>
+                <dataType>
+                    <structRef name="RoutingTableEntry"/>
+                </dataType>
+            </parameter>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+    </class>
+
+    <class name="Ip">
+        <description>The Ip MO represents the IP protocol layer with IP forwarding functionality.
+
+Note: The performance monitoring counters in the Ip MO has a "Wrap-around time" of approximately 2 hours.
+
+</description>
+        <attribute name="IpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="workingMode">
+            <description>The workingMode of the IP MO controls if the IP stack in the node will work as a combined host/router (routerMode) or only as a host (hostMode).</description>
+            <mandatory/>
+            <dataType>
+                <enumRef name="WorkingMode">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="retransInterval">
+            <description>The retransmission interval. The units are seconds.
+Must be a value &gt; 0.</description>
+            <dataType>
+                <long>
+                    <defaultValue>4</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="noOfRetrans">
+            <description>The number of retransmissions.
+Must be a value &gt; 0.</description>
+            <dataType>
+                <long>
+                    <defaultValue>5</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="dnsServer">
+            <description>The Domain Name Server IP address.
+
+The IP address must be a Unicast IP address.
+</description>
+            <dataType>
+                <string>
+                    <defaultValue>"127.0.0.1"</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="isRecursiveSearch">
+            <description>Holds information about how the DNS client wants the DNS server do the search for the IP address in the network .  It can be either Recursive search or Non-recursive search.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="isSubDomainName">
+            <description>Holds information about whether to use subsets of the fully qualified domain name to reach the simple domain name.  It can be either Use subsets of domain name or Not use subsets of domain name.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="isDefDomainName">
+            <description>Holds information about whether the default domain name is present.  It can be Present or Not present.
+
+</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="defDomainName">
+            <description>Contains default domain name. 
+If 'isDefDomainName' is set to 'true' the domain name found in this attribute is used by the DNS resolver and there is no need to submit the complete domain name. If the domain name is for example 'ws5741.uab.ericsson.se' then the default domain name would be '.uab.ericsson.se'. If 'isDefDomainName' is set to true the there is no need for using '.uab.ericsson.se'. If set to false then the complete domain name has to be used.
+A valid domain name consists of 1 or more labels separated by dots (".").
+Valid characters for a label shall be limited to letters 'a' - 'z', 'A' - 'Z', digits '0' - '9', the character '-' ("dash").
+Character case shall be preserved. Labels shall start with a letter. Total length of a label shall not exceed 255 characters.
+
+Note! The first and last character in the domain name has to be within the following alphabet: letters  'a' - 'z', 'A' - 'Z' and digits '0' - '9'. For more information refer to RFC 952 and 1101.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the IP MO is ENABLED if at least one link is operational.
+
+Shows whether the MO is OK (enabled) or failed (disabled).  The values are set by the system.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="numberOfLinks">
+            <description>Represents the number of interfaces (Ethernet and IP over
+ATM links) which has registered to the IP MO.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>If set, indicates that this Ip is reserved by the Ospf represented by this attribute.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Ospf"/>
+            </dataType>
+        </attribute>
+        <attribute name="useHostFile">
+            <description>Indicates if the hosts file should be used or not. The hostFile is used by the resolver and
+chosen as a source of information before querying a DNS server.
+
+true - use the host file.
+false - do not use the host file.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="dscp">
+            <description>The DiffServ CodePoint.
+The code point values are used by DiffServ enabled hosts and router to identify different service levels.
+When set, the DSCPs are mapped to PHBs (Per Hop Behaviours) by forwarding devices along the path
+between the source and destination. PHBs dictates how each packet will be handled i.e. what type of
+service that is applied to the packet when it is forwarded.
+
+Note! Only traffic originated from the node is tagged with the dscp value. The Cello router does not implement functionality for handling different service levels when routing IP traffic.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>63</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="icmpRedirect">
+            <description>Indicates if ICMP redirects is sent out or not.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="udpChecksumState">
+            <description>Enable/Disable generation of UDP checksum.
+0 = disabled
+1 = enabled
+
+The UDP checksum is used for verifying that the UDP header has not been damaged during transmit.</description>
+            <dataType>
+                <long>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="connectionAttemptTimer">
+            <description>The time that elapses before a connection (TCP) attempt times out.
+
+Unit is seconds.</description>
+            <dataType>
+                <long>
+                    <defaultValue>75</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxRetransmissionAttempts">
+            <description>The maximum number of retransmission attempts before a TCP connection is dropped.
+The default value is 10 attempts, which is around 5 minutes.
+Setting this attribute value to -1 means infinity, and TCP will never give up in trying 
+to establish a connection.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>-1</min>
+                    </range>
+                    <defaultValue>10</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIpInReceives">
+            <description>Performance monitoring counter for total number of datagrams received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfHdrErrors">
+            <description>Performance monitoring counter for the number of datagrams discarded due to format error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIpAddrErrors">
+            <description>Performance monitoring counter for the number of datagrams discarded due to misdelivery.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIpForwDatagrams">
+            <description>Performance monitoring counter for the number of  datagrams forwarded.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIpInDiscards">
+            <description>Performance monitoring counter for the number of datagrams dascarded due to resource limitations.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIpOutDiscards">
+            <description>Performance monitoring counter for the number of datagrams discarded due to lack of resources.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIpReasmReqds">
+            <description>Performance monitoring counter for the number of fragments received needing reassembly.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIpReasmOKs">
+            <description>Performance monitoring counter for the number of datagrams successfully reassembled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="SccpEntitySet">
+        <description>This MO represents an SCCP EntitySet which is made of one SCCP Entity. An SCCP Entity is a local MTP-SAP + a DPC + possibly an SSN, i.e an SCCP EntitySet identifies the set of access points that result from a global title translation. An SCCP EntitySet may also be made of two SCCP Entities of the same type (if an SSN is present in one SCCP Entity, then an SSN shall also be present in the other). In the latter case the two SCCP entities may be considered either as a "primary" SCCP Entity and a "backup" SCCP Entity (dupli-dominant mode) or may be interpreted as two equal SCCP entities that can be used for outgoing loadsharing purpose. In this implementation they can only be considered as "primary" and "backup".The Routing Indicator (RI) in the Called Party Address is normally not set by the SCCP for outgoing messages and should therefore be set by the user. This means that if the user has set "Route on SSN" this will be the case after the GTT also even if the set consist of MTP-3b Access Points. However, if the set consists of SCCP Access Points the RI is implicitly set to "Route on SSN" by SCCP.
+
+DPC	Destination Point Code
+GTT	Global Title Translation
+MTP	Message Transfer Part 
+SAP	Signalling Access Point
+SSN	Subsystem Number
+
+Note: the SccpEntitySet MO depends either on MAOs of type SccpApLocal OR SccpApRemote, not on a mixture of these MAO types.</description>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="routeIds">
+            <description>The Entity Set routeId is an array of maximum two instances of Sccp ApLocal MO's OR two instances of SccpApRemote MO's OR two instances of Mtp3bAp MO's OR one instance of SccpSP MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                    <length>2</length>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="sharingMode">
+            <description>The sharingMode attribute controls the distribution of SCCP traffic over the entities (Access Points) in the set.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="SharingMode">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="newSubSystemNumber">
+            <description>The new sub system number attribute is only valid if the Mtp3b Access Points are used in the set. In that case the SSN attribute allows to optionally set the subsystem number in the Called Party Address as a result of a Global Title Translation. If the set consists of SCCP Access Points the subsystem number in the Called Party Address is always implicitly set to the SCCP Access Point SAP (SSN) as a result of a Global Title Translation.
+This attribute is controlled by the type of AP(s) that the EntitySet refers to.
+
+The default value 0 means no new subsystem number.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>254</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="newGlobalTitle">
+            <description>The New Global Title attribute allows to optionally replace the global title in the Called Party Address as a result of a Global Title Translation (GTT). If the GT resulting from a GTT is different from the GT previously included in the Called Party Address, the newly produced GT replaces the existing one. The gtIndicator attribute is read-only and is derived from the combination of Nature Of Address, the Translation Type and Numbering Plan used.
+
+Default value is considered as no new Global Title.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="GlobalTitleData"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Holds a list of the reserving MO's.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="SccpEntitySetId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="SccpGlobalTitle">
+        <description>The SCCP Global Title MO represents a combination of a global title translator and a global title rule. If no Destination Point Code (DPC) is present in the Called Party Address, a Global Title (GT) is needed. Then a global title must be present in the Called Party Address, otherwise a routing error occurs. A global title translator is selected by SCCP based on a combination of the values of the Nature Of Address (NA), the translation type (TT), and the Numbering Plan (NP) if available, in this MO matched with the same information in the Called Party Address provided by an SCCP user. A global title translation rule is selected by SCCP by matching the Global Title Address Information and possibly the Encoding Scheme in this MO, with the same information in the Called Party Address provided by an SCCP user. A global title translation rule points to the SCCP Entity Set resulting from the global title translation (GTT).
+The translation results in a DPC and possibly a new Sub System Number (SSN) or GT or both (decided by the SCCP Entity Set it refers to). If the GT and/or SSN resulting from a GTT is different from the GT and/or SSN previously included in the Called Party Address, the newly produced GT and/or SSN replaces the existing one.
+
+GT - Global Title
+SCCP - Signalling Connection Control Part
+SSN - Sub System Number
+DPC - Destination Point Code
+TT - Translation Type
+GTT - Global Title Translation</description>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="gtIndicator">
+            <description>Global title indicator for China, ITU, TTC and ANSI.
+
+
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="GlobalTitleIndicator">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="natureOfAddress">
+            <description>Indicates number type, i.e. national or international number.
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="NatureOfAddress">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="numberingPlan">
+            <description>Indicates which numbering plan that is used.
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="NumberingPlan">
+                    <defaultValue>UNKNOWN</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="translationType">
+            <description>Used to direct the message to the appropriate Global Title translation function.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>254</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="addressInformation">
+            <description>Digit string of 1-37 digits, where each digit is 0-9, and "B", "C". "B" and "C" are for Code 11 and Code 12.
+The addressInformation may also contain wild card symbols: "*" or "?". Wild cards are only allowed for defining Global Title Translations, they are not allowed for specifying SCCP SAPs (built with SPC and Global Title or SPC + SSN + Global Title).</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>1</min> <max>37</max>
+                    </lengthRange>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="encodingScheme">
+            <description>Indicates if the number of address signals are an odd or even number.
+
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="EncodingScheme">
+                    <defaultValue>UNKNOWN</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="sccpEntitySetId">
+            <description>The sccpEntitySetId attribute points out the corresponding SccpEntitySet MO.
+
+Note! This attribute is only optional if this MO is used by Policing. In all other cases it has to be set.</description>
+            <noNotification/>
+            <dataType>
+                <moRef name="SccpEntitySet"/>
+            </dataType>
+        </attribute>
+        <attribute name="SccpGlobalTitleId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Aal2PathVccTp">
+        <description>This MO is used to represent an AAL2 Path, i.e. an ATM VC connection that carries multiplexed AAL2 links.
+
+VCC TP - Virtual Channel Connection Termination Point.
+
+The total number of Aal2PathVccTps associated to an Aal2Ap, by connecting them to Aal2PathDistributionUnits under that Aal2Ap, must not exceed 632.
+
+The total number of Aal2PathVccTps associated to a ReliableProgramUniter, by connecting them to Aal2PathDistributionUnits associated to the ReliableProgramUniter, must not exceed 280.
+
+Note! The performance monitoring counters in this MO is set to 0 when counterMode is set to PM_MODE_ON.
+In PM_MODE_OFF no information at all is retrived. So any value for pm-monitoring is measured from the time of setting counterMode to PM_MODE_ON. 
+At node restart these performance monitoring counters is reset to 0.
+</description>
+        <attribute name="Aal2PathVccTpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="vclTpId">
+            <description>Reference to the VclTp to be used by this Aal2PathVccTp.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="VclTp"/>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state of the termination point. </description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>unlocked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Operational state of the termination point.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving Aal2PathDistribution MO.
+
+</description>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status of Aal2PathVccTp.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="continuityCheck">
+            <description>Continuitiy checking means that a cell is sent downstream when no user cell has been sent for a period of nominally 1 second.
+
+Activates VC end to end continuityCheck according to ITU.T rec I.610.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="counterMode">
+            <description>PM mode is set to indicate type of performance monitoring mode (ie. activation of bidirectional PM measurements).
+
+</description>
+            <dataType>
+                <enumRef name="AtmCounterMode">
+                    <defaultValue>PM_MODE_OFF</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="nomPmBlocksize">
+            <description>Nominal performance monitoring (PM) blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.</description>
+            <dataType>
+                <enumRef name="AtmNomPmBlkSize">
+                    <defaultValue>NOM_PM_BLKSIZE_2_10</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="timerCu">
+            <description>Timer that assures that CPS-packets with one or more octets already packed in the ATM cell wait at most the duration of timerCu before being scheduled for transmission.
+
+Units for timerCu is 10 to the power of -4 seconds. This value can be set in steps of 10 to the power of -4.
+
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>100</max>
+                    </range>
+                    <defaultValue>10</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="aal2PathId">
+            <description>This attribute is used to identify the path in the Q.2630.1 protocol.
+
+The pathId value must be unique within all Aal2PathDistributionUnits under the same Aal2Ap
+
+All integers &gt; 0 are allowed (not 0).
+
+The Aal2PathId is used by the Aal2 connection control function in two Aal2 nodes to uniquely identify an AAL2 path between the two nodes. This means that the value of the attribute Aal2PathId for an Aal2 path must be the same in each of the two nodes.
+
+In order to set this attribute, the Aal2PathVccTp may not be reserved. If an attempt is made, an "IsReservedCanNotSetPathId" exception is thrown.
+
+Note! Setting of this attribute will not have any effect until 'actionAddPath' in Aal2PathDistributionUnit MO' is called adding this MO to the list of Aal2PathVccTp MO's.</description>
+            <mandatory/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>2147483647</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="aal2PathOwner">
+            <description>This attribute indicates whether this Aal2 Path VCC Termination Point is considered the owner of the Aal2 Path in order to decide channel selection procedure in the Q.2630.1 protocol.
+
+Note! In order to set this attribute, the Aal2PathVccTp may not be reserved. If an attempt is made, an "IsReservedCanNotSetPathId" exception is thrown.
+
+Note! The administrativeState has to be LOCKED when this attribute is set, if not the "IsUnlockedCanNotSetPathOwner" exception is thrown.
+
+Note! Setting of this attribute will not have any effect until 'actionAddPath' in Aal2PathDistributionUnit MO' is called adding this MO to the list of Aal2PathVccTp MO's.</description>
+            <mandatory/>
+            <dataType>
+                <boolean/>
+            </dataType>
+        </attribute>
+        <attribute name="alarmReport">
+            <description>Attribute to decide what type of alarms to be reported.</description>
+            <dataType>
+                <enumRef name="AlarmReport">
+                    <defaultValue>ALARM_LOC</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="aal2QoSProfileId">
+            <description>The identity of the QosProfile used by the Aal2PathVccTp.</description>
+            <mandatory/>
+            <dataType>
+                <moRef name="Aal2QosProfile"/>
+            </dataType>
+        </attribute>
+        <attribute name="aal2QoSAvailableProfiles">
+            <description>This attribute specifies which QoSClass that can be supported by this Aal2Path.
+</description>
+            <dataType>
+                <enumRef name="SupportedQoSClasses">
+                    <defaultValue>CLASS_A_B_C_D</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwLostCells">
+            <description>Performance monitoring counter for forwarded lost cells.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwMissinsCells">
+            <description>Performance monitoring counter for number of forwarded missinserted cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwErrBlocks">
+            <description>Performance monitoring counter for number of forwarded errored blocks.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLostFpmCells">
+            <description>Performance monitoring counter for number of lost Forward Performance Monitoring, FPM cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwLostCells">
+            <description>Performance monitoring counter for number of lost backward cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwMissinsCells">
+            <description>Performance monitoring counter for number of backward missinserted cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwErrBlocks">
+            <description>Performance monitoring counter for number of backward errored blocks.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLostBrCells">
+            <description>Performance monitoring counter for number of lost Backward Reporting, BR, cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Aal2RoutingCase">
+        <description>This MO represents a AAL2 routing case which points out an AAL2 access point. </description>
+        <attribute name="Aal2RoutingCaseId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>For free use</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="routeList">
+            <description>An array of alternative routes identified by the concerned Aal2Ap MOs. A routeList can have 0 to 5 Aal2Aps.
+The Aal2Ap must be unique.
+Note! if this attribute is set, the routePriorityList also must be se with the same number of values ( if the routeList
+contains 3 routes, the routePriorityList must contain 3 prioritys).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <restricted/>
+            <dataType>
+                <sequence>
+                    <moRef name="Aal2Ap"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="routePriorityList">
+            <description>A list of all the Aal2Ap priorities.
+The priority values can be in the range 1 to 5, one beeing the highest priority. 
+The Aal2Aps can have the same priorities.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <restricted/>
+            <dataType>
+                <sequence>
+                    <long>
+                        <range>
+                            <min>0</min> <max>5</max>
+                        </range>
+                    </long>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="numberDirection">
+            <description>Defines the possible set of AAL type 2 Service Endpoint Addresses (A2EA) that match the routing case.
+
+The number direction of a routing case shall be interpreted as all AAL type 2 Service Endpoint Addresses 
+starting with the string of numbers defined in the number direction. For example, the AAL2 End System 
+Addresses "12340" and "123400" will both match the number direction "1234".
+
+The AAL2 routing function uses a longest match comparison to select between routing cases with overlapping 
+number directions. For example, given two routing cases A with the number direction "1234" and B with the number 
+direction "12345" the AAL2 End System Address "12345" will be routed using routing case B, whereas the AAL 
+type 2 Service Endpoint Addresses "12344" and "12346" will be routed using routing case A.
+
+NOTE: It is not allowed to use leading zeros when configuring this attribute.
+
+NOTE: It is not possible to replace an existing routing case by creating routing cases with number directions that 
+completely overlap the number direction of the existing routing case.
+
+NOTE: It is not possible to create two routing cases with the exact same number directions in a node.
+
+NOTE: It is possible to create one or more routing cases with number directions that partially overlap the number 
+direction of an existing routing case. 
+
+Length range 1..15
+Alphabet: "0123456789"
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>1</min> <max>15</max>
+                    </lengthRange>
+                </string>
+            </dataType>
+        </attribute>
+        <action name="addAal2ApToRc">
+            <description>Adds the identified (and existing) Aal2Ap MO to the routeList. This action should also be used when changing the priority for an existing Aal2Ap MO. When submitting an existing Aal2Ap MO with a new priority the routing list will be updated with the new priority for the specified Aal2Ap MO.
+
+Note! In order to be able to update the priority for a routing entry, the routing entry first has to be deleted and then submitted with the new priority.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="priority">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <parameter name="route">
+                <in/>
+                <dataType>
+                    <moRef name="Aal2Ap"/>
+                </dataType>
+            </parameter>
+            <raisesException name="InvalidPriorityException"/>
+            <raisesException name="IllegalArgumentTypeException"/>
+            <raisesException name="IllegalAttributeValueException"/>
+        </action>
+        <action name="removeAal2ApFromRc">
+            <description>Removes the identified Aal2Ap MO from the routeList.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="route">
+                <in/>
+                <dataType>
+                    <moRef name="Aal2Ap"/>
+                </dataType>
+            </parameter>
+            <raisesException name="IllegalAttributeValueException"/>
+            <raisesException name="IllegalArgumentTypeException"/>
+        </action>
+    </class>
+
+    <class name="Aal2Sp">
+        <description>The Aal2Sp (AAL2 Signalling Point) MO is used to represent the AAL type 2 Service Endpoint Address of the node in the AAL2 network. 
+There is one and only one instance of this MO in the ATM NE system.</description>
+        <attribute name="userLabel">
+            <description>For free use</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="a2ea">
+            <description>An E.164 format number that specifies the AAL type 2 Service Endpoint Address of the node.
+
+Length Range: 1..15
+Alphabet: "0123456789"
+
+Note! It is not allowed to use leading zeros when configuring this attribute.</description>
+            <mandatory/>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>1</min> <max>15</max>
+                    </lengthRange>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="Aal2SpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="pmUnsuccessfulConnsInternal">
+            <description>Performance monitoring counter for the number of unsuccessful attempts to establish connections due to node internal problems.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Aal2Ap">
+        <description>This MO represents a AAL2 Access Point signalling function associated with a single AAL2 signalling relationship to a remote peer AAL2 acess point signalling function. An AAL2 access point is either a high rate access point that uses MTP-3B for signalling or a low rate access point that uses UNI-SAAL for signalling.
+
+Aal2Ap - Aal2 Access Point
+
+Note! The performance monitoring counters in the AalAp MO is set to 0 (zero) at start or restart of the node.
+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.</description>
+        <attribute name="Aal2ApId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Free for use</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>This attribute holds a list of the reserving MOs.
+</description>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Operational state of the AAL2 AP.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status of the Aal2Ap.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="timerErq">
+            <description>Q.2630.2 establishment request timer. Unit is milli seconds.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>5000</min> <max>30000</max>
+                    </range>
+                    <defaultValue>5000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="timerRel">
+            <description>Q.2630.2 release request timer. Unit is milli seconds.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>2000</min> <max>60000</max>
+                    </range>
+                    <defaultValue>2000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="sigLinkId">
+            <description>Reference to a UniSaalTp or Mtp3bAp MO that provides a signalling link for the Aal2Ap.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="secondarySigLinkId">
+            <description>Reference to a secondary signalling link MO of type UniSaalTp. This attribute can only be set when sigLinkId is of type UniSaalTp.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="rpuId">
+            <description>The physical location of an AP (Access Point) LR/HR (Low Rate/ High Rate) program represented by a reference to a RPU (ReliableProgramUniter) MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ReliableProgramUniter"/>
+            </dataType>
+        </attribute>
+        <attribute name="aal2QoSCodePointProfileId">
+            <description>The identity of the QoSCodePointProfile used by this MO.</description>
+            <dataType>
+                <moRef name="Aal2QosCodePointProfile"/>
+            </dataType>
+        </attribute>
+        <attribute name="pmExisOrigConns">
+            <description>Performance monitoring counter pmExisOrigConns.
+Number of existing connections for the AP originating in this node.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="nrOfConfiguredAal2Paths">
+            <description>The total number of Aal2PathVccTp MOs configured on this Aal2 Ap.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="nrOfUnavailableAal2Paths">
+            <description>The total number of unavailable Aal2PathVccTp's on this Aal2 Ap, i.e. the number of Aal2PathVccTp MOs connectected to this Aal2Ap with 'administrativeState' LOCKED.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmExisTermConns">
+            <description>Performance monitoring counter pmExisTermConns.
+Number of existing connections for the AP terminating in this node.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmExisTransConns">
+            <description>Performance monitoring counter pmExisTransConns.
+Number of existing connections for the AP transiting in this node.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSuccOutConnsRemote">
+            <description>Performance monitoring counter pmSuccOutConnsRemote.
+Number of successful establishment of outgoing connections on this AP</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSuccInConnsRemote">
+            <description>Performance monitoring counter pmSuccInConnsRemote.
+Number of successful establishment of incoming connections on this AP.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUnSuccInConnsRemote">
+            <description>Performance monitoring counter pmUnSuccInConnsRemote.
+
+Number of unsuccessful establishment of incoming connections on this AP caused by reject from beyond this node.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUnSuccOutConnsRemote">
+            <description>Performance monitoring counter pmUnSuccOutConnsRemote.
+
+Number of unsuccessful establishment of outgoing connections on this AP caused by reject from remote side, reset from remote side, no reply or signalling link failure.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUnSuccInConnsLocal">
+            <description>Performance monitoring counter pmUnSuccInConnsLocal.
+Number of unsuccessful attempts to allocate Common Part Sublayer, CPS, resources during establishment of incoming connections on this AP caused by Channel Identifier, CID, and/or bandwidth collision or mismatch of Call Admission Control, CAC, between peers.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUnSuccOutConnsLocal">
+            <description>Performance monitoring counter pmUnSuccOutConnsLocal.
+
+Number of unsuccessful attempts to allocate CPS resources during establishment of outgoing connections on this AP. Caused by rejects in CAC (Connections Admission Control).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUnRecMessages">
+            <description>Performance monitoring counter pmUnRecMessages.
+
+Number of received unrecognized Q.2630.1 messages on this AP.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUnRecParams">
+            <description>Performance monitoring counter pmUnRecParams.
+
+Number of received Q.2630.1 messages with unrecognized parameters on this AP.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Etm1">
+        <description>This MO represents the hardware of the ET-M1 board type. It only represents the ET specific hardware, while the DBM module of the board is represented by the PlugInUnit MO.
+
+The ET-M1 board contains 8 physical ports that can be configured as either E1 (ETSI), J1 (TTC) or T1(ANSI). The board does not allow for a mix of E1, J1 and T1 ports, thus all configured ports on the board must be configured to the same standard.
+
+Each of the ports on the ET-M1 board can be used to carry either ATM traffic or circuit orientated (Nx64 Kbits/s connections) traffic.
+
+Each port can support up to 30 ATM VC connections. Two of these connections  are reserved for AAL2 paths, and therefore two AAL2 multiplexers per port are available.
+
+Each port can support up to 2 VP connections. 
+
+The ET-M1 board supports 1 bidirectional F4/F5 PM flow per port.
+
+Other restrictions:
+- All ports (configured for ATM) on the board must have the same value for the hecCorrection attribute (ATM Port MO).
+- It is possible to configure UBR+ traffic, but there is no guarantee on the minimum cell rate.
+- VP shaping is not supported (it is recommended to configure at most one VP per physical port).
+- VC shaping is not supported with an exception for AAL2 path traffic. This is shaped to the peak bandwidth on the VC connection.
+- When using the Etm1 board the performance monitoring counters in the transmit direction found on the AtmPort MO does not show the following cells: CC cells and OAM FPM cells.
+
+Note! IMA is not applicable for the ETM1 board.
+
+Note! When using fractional atm, timeslot 1 must be a part of the fraction.
+
+Note! ETM1 does not support EPD and PPD
+
+Note! ETM1 does not have a proper buffer management. Thus fairness of UBR+ traffic can not be guaranteed and shaping on UBR+ traffic is not possible.
+
+Note! The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 1 per port.
+</description>
+        <attribute name="userLabel">
+            <description>user label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Enabled or disabled according to the actual operational state of the Etm1 board.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="Etm1Id">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="TuSyncRef">
+        <description>This MO is used to administer synchronization reference (a synchronization input with support for 2MHz and 10MHz signals) on Timing Unit board.</description>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Operational state of TU synchronization reference</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>Administrative state of TU synchronization reference</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status of the TuSyncRef.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>When the TU synchronization reference is registered in the system as an usable synchronization reference, this MO reference is set by using "local" operation syncReserve(). When synchronization reference is de registered, "local" operation syncRelease is used. Note that the only valid user of these operations is Synchronization MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Synchronization"/>
+            </dataType>
+        </attribute>
+        <attribute name="TuSyncRefId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Spm">
+        <description>The Special purpose Processor Module MO, Spm, represents one of the Special Purpose Processors and its connected hardware. This object is used for SW management and restart. Hardware failure indications are sent to Spu.
+
+Note! If the board is of type SPB1 the maximum number of Spm MO's that is possible to create under the Spu MO is 3.  
+If the board is of type SPB2 the maximum number of Spm MO's that is possible to create under the Spu MO is 5.</description>
+        <attribute name="SpmId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>user label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the SPM</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="switchModuleNumber">
+            <description>Switch Module Number</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="asciPortNumber">
+            <description>ASCI Port Number</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="executionResourceNumber">
+            <description>The identity of the SPM on the Special purpose Processor Unit (SPU).
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="runningResourceIdList">
+            <description>The list of identities of running Spm's
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <long/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="installedResourceIdList">
+            <description>The list of identities of installed Spm's in the system.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <long/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="spLinkName">
+            <description>The uniqe name of the link between  the SP and BP.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <action name="restart">
+            <description>Restarts the SP.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+    </class>
+
+    <class name="Spu">
+        <description>The Special purpose Processor Unit MO, Spu, represents the board specific HW on SPB. This objects collects HW failure indications on the board and issues/ceases alarms.</description>
+        <attribute name="userLabel">
+            <description>user label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the SPB board.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="spLinkName">
+            <description>The special purpose processor link name.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="SpuId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="restart">
+            <description>Restarts all SPs on the board (but not the BP).
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroNotAccessibleException"/>
+        </action>
+    </class>
+
+    <class name="AtmCrossConnection">
+        <description>This MO is used to represent the point-to-point ATM cross-connect relationship between two VCL termination points.</description>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Operational state for the cross connection.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="vclTpAId">
+            <description>Identifies the VclTp managed object involved in the A side of the cross connection (which consists of an A and B side).
+
+Must not be the same as vclTpBId.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="VclTp"/>
+            </dataType>
+        </attribute>
+        <attribute name="vclTpBId">
+            <description>Identifies the VclTp managed object involved in the B side of the cross connection (which consists of an A and B side).
+
+Must not be the same as vclTpAId.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="VclTp"/>
+            </dataType>
+        </attribute>
+        <attribute name="AtmCrossConnectionId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="ConfigurationVersion">
+        <description>The Configuration Version, CV, is an MO managing all on disk saved node configuration. This MO keeps all administrative data about the CV's including path and file-names of the configuration files. There may be more than one CV on the disk but only one is used at the time. A CV is always based on one Upgrade Package.
+
+The local distinguished name of this MO is ManagedElement=1, SwManagement=1, ConfigurationVersion=1.</description>
+        <systemCreated/>
+        <attribute name="ConfigurationVersionId">
+            <description>Configuration version MO's id.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="storedConfigurationVersions">
+            <description>List of stored configuration versions in the node. 
+
+Stored in and read from the file system. 
+
+List of stored configuration versions (CV) in the node.
+
+The list is a sequence of CVs.
+Each CV is presented as structure.  A CV structure has following fields:
+        1. Name
+        2. Identity
+        3. Type
+        4. UpgradePackageId
+        5. Operator name
+        6. Comment
+        7. Date
+        8. Status
+
+The CV list is formatted as a sequence of ConfigurationVersionAttributes.
+Each struct contains one CV. 
+
+The following characters are allowed within the struct members below.
+
+[0-9], [A-Z], [a-z] and '&amp;' , '%' , ':' , '.' , '_' ,  '-'
+
+Note! For comment and operatorName spaces (' ') are also allowed within the strings.
+
+Struct element description :
+-Name is in string format, max length is 40.
+-Identity  is in string format, max length is 40.
+-Type is in string format, max length is 40.
+-UpgradePackageId is in string format, max length is 40.
+-Operator name is in string format, max length is 40.
+-Comment is in string format, max length is 40.
+-Date is in string format, max length is 40. Format for date is: weekday month date hour:min:seconds year.
+-Status is in string format, max length is 40.
+
+Note! The identity can not be the same as name. Identity should contain the product identity.
+
+
+</description>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <structRef name="ConfigurationVersionAttributes"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="currentLoadedConfigurationVersion">
+            <description>The name of the current loaded configuration version.
+
+Stored in and read from the file system. 
+
+This is the configuration version that the system started with, i.e. the configuration version that was startable at the last node restart. </description>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="startableConfigurationVersion">
+            <description>The name of the configuration version that will be used at next node restart.
+
+Stored in and read from the file system.
+
+This attribute is set by the action "setStartable( name of cv)". 
+Also set at rollback by the system. The first CV in the rollback list is then used.</description>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="rollbackList">
+            <description>A list of configuration versions to rollback to (configuration version name). 
+
+The configuration version on the first line is used at the next rollback. That line is then automatically removed from the rollback list.
+
+This attribute is modified by actions setFirstRollbackList() and removeFromRollbackList()</description>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <string>
+                        <defaultValue>""</defaultValue>
+                    </string>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="currentUpgradePackage">
+            <description>A reference to current executing upgrade package.</description>
+            <readOnly/>
+            <dataType>
+                <moRef name="UpgradePackage"/>
+            </dataType>
+        </attribute>
+        <attribute name="autoCreatedCVIsTurnedOn">
+            <description>Flag that indicates that a configuration version will be created automatically once a day.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="timeForAutoCreatedCV">
+            <description>Time for the automatic creation of configuration versions once a day. 
+
+The string must be specified as "HH:MM" to be accepted at set. 
+
+See also Class Attribute autoCreatedCVIsTurnedOn.
+The time is UTC time.
+
+Note! If changing the clock on the node, this attribute must be set or
+the JVM MP must be reastarted.
+
+
+</description>
+            <dataType>
+                <string>
+                    <defaultValue>"04:00"</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="rollbackOn">
+            <description>Flag that indicates if rollback is enabled or not. 
+When true the system will automatically set the rollback counter. In case of cyclic restarts a rollback will be issued after x restarts. x is defined by the rollbackInitCounterValue.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="rollbackInitTimerValue">
+            <description>Used by the system when rollback is switched on (autoRollbackOn=true). After the given time the node is considered not in a cyclic restart mode. The rollback counter will then be reset to its initial value (rollbackInitCounterValue).
+
+Timer value in minutes.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>10000</max>
+                    </range>
+                    <defaultValue>30</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="rollbackInitCounterValue">
+            <description>Initial value for the rollback counter. Used when rollback is switched on (autoRollbackOn=true).
+
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>10000</max>
+                    </range>
+                    <defaultValue>5</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="commandlogStatus">
+            <description>An attribute to indicate status of  command log.
+It can be ON/OFF(true/false). </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="executingCv">
+            <description>The name of the executing Configuration Version, CV.
+
+Same as 'currentLoadedConfigurationVersion' after a node restart, changed to the value of lastCreatedCv when a CV is created.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="lastCreatedCv">
+            <description>The name of the last created Configuration Version, CV.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <action name="setStartable">
+            <description>The CV given will be the one used at the normal node restarts. Only A CV with status = OK can be set as startable.
+
+This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="configurationVersionName">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="create">
+            <description>A new CV  directory will be created. A DB backup from the current RAM CV, 
+an ARMAMENT file and the file LLP:LMid is created at the directory. The current 
+command log file is copied to the CV directory first, then it removes the file from 
+the current directory. 
+
+Note: The file cmdlog.properties under /c/ will not be saved to the CV.
+
+The following characters are allowed in the Strings: 
+
+[0-9], [A-Z], [a-z] and '&amp;' , '%' , ':' , '.' , '_' ,  '-'
+
+Note! For comment and operatorName spaces (' ') are also allowed within the strings
+
+-configurationVersionName is in string format, max length is 40 characters.
+-identity is in string format, max length is 40 characters.
+-operatorName  is in string format, max length is 40 characters.
+-comment  is in string format, max length is 40 characters.
+
+This action does not require a transaction.
+
+Note! The configurationVersionName and identity can not be the same. The identity should be the product identity.
+</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="configurationVersionName">
+                <description>One ASCII text string. It must be possible to create a directory with string. Do not use string "autocreated1" and "autocreated2"  as cv name. They are used by the system.</description>
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="identity">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="type">
+                <description>Type of the configuration version [ standard | test | other ].</description>
+                <in/>
+                <dataType>
+                    <enumRef name="ConfigurationVersionType">
+                        <defaultValue>other</defaultValue>
+                    </enumRef>
+                </dataType>
+            </parameter>
+            <parameter name="operatorName">
+                <description>The operator's name.</description>
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="comment">
+                <description>The operator's comment.</description>
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <raisesException name="ValueOutOfRangeException"/>
+        </action>
+        <action name="delete">
+            <description>Delete a configuration version (CV) permanently. 
+
+If CV is referenced in the startable or in the rollback list, the action is not performed (an exception is thrown instead).
+
+Note! The latest created CV is not deletable until a node restart is performed or a new CV is created. Also note that a CV is not possible to delete when it has one of the folowing properties:
+- "loaded"
+- "startable"
+- The CV is found in the "rollbacklist"
+
+This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="configurationVersionName">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="removeFromRollbackList">
+            <description>Removes a Configuration Version (CV) from the rollback list. 
+
+This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="configurationVersionName">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="setFirstRollbackList">
+            <description>Adds a Configuration Version (CV) first in the rollback list. This will cause the node to chose this CV at the next rollback. A CV with status NOK, can't be put in the rollback list.
+
+This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="configurationVersionName">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="activateCommandLog">
+            <description>This action activates the log.
+
+The inparameter is the drive name (where the command log file should be stored).
+
+Default command log is drive  /c/.
+
+Note! Invoking this action affects the attribute'commandLogStatus'.
+
+Note! This action does not require a transaction.
+</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="cmdlogdriveName">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <raisesException name="InvalidDriveNameException"/>
+            <raisesException name="LogActivationException"/>
+        </action>
+        <action name="deactivateCommandLog">
+            <description>This action deactivates the logging of configuration commands.
+
+Please note that uncommited data will be lost.
+
+Note! Invoking this action affects the attribute'commandLogStatus'.
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="LogActivationException"/>
+        </action>
+    </class>
+
+    <class name="SwManagement">
+        <description>This MO is used as a structural element for the SW managed object. The MO structures the software resources of the node.
+
+Note that the SwManagement MO is automatically created and cannot be deleted.
+
+The local distinguished name of this MO is ManagedElement=1, SwManagement=1.</description>
+        <systemCreated/>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="SwManagementId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="normalizeRPU">
+            <description>This action will normalize all RPUs in the node.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+    </class>
+
+    <class name="UpgradePackage">
+        <description>The UpgradePackage, UP, represents an upgrade package as stored in the node file system and as stored on the ftp server that it is/shall be fetched from. 
+
+There may be more than one UP at the same time on the disk. One UP represents the running system issue in the node. That one is pointed out by the Configuration Version MO. 
+
+The actions on an UpgradePackage MO, are actions that can be called to take that particular UpgradePackage into operation on the node.
+
+The deletion of the Upgrade Package on disk is performed when the associated Upgrade Package MO is deleted. The Upgrade Package's unique LoadModule MOs and files are deleted. ConfigurationVersions in otherReferringCVs are deleted. 
+
+
+The UP MO refers to all load modules used in the UP. One load module may by used in more than one UP.
+
+Note at the start-up of the system/database/loading of a Configuration Version, special Upgrade Package MOs are created to represent Upgrade Packages that are stored on the disk but do not have an MO in the current Configuration Version. These special Upgrade Package MOs have are in the "onlyDeletable" state. In this state, the MO will throw ActionNotAllowedException on all its actions!
+
+MOs of this type are created automatically during system upgrade.
+MOs of this type are possible to create manually but a system upgrade
+is recommended to create them.</description>
+        <attribute name="UpgradePackageId">
+            <description>The identity of the MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free of use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="loadModuleList">
+            <description>List of references to load modules that belong to this upgrade package. 
+
+The list will be null until a successful install has been performed.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="LoadModule"/>
+                    <nonUnique/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="upgradeControlFilePath">
+            <description>Path to the .xml file on the node once it has been fetched from the FTP server.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="state">
+            <description>Contains the state of this upgrade package.
+
+The management system and/or operator need to act on some changes in the state attribute. 
+
+This attribute is used to accept/reject and modify behavior of actions. For example action 'upgrade' is not allowed in state notInstalled. Furthermore, action 'upgrade' does not behave the same if state == 'Installed' compared to if state == 'executingUpgrade' or 'awaitingConfirm'. 
+
+To continue and conclude the upgrade sequence when in state == 'awaitingConfirm', action 'confirmUpgrade()' must be called. In this state it is also advisable to check attribute 'confirmationDeadline' to see how much time it is left before automatic rollback is done.
+
+Upgrade Package MOs that are stored on disk but do not have an MO in the current Configuration Version are in state "onlyDeletable". An MO in this state will throw the exception ActionNotAllowedException on all its actions.
+
+</description>
+            <readOnly/>
+            <dataType>
+                <enumRef name="UpgradePackageState">
+                    <defaultValue>NOT_INSTALLED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="progressHeader">
+            <description>Header enum describing the current progress indication. 
+Note that this is only progress information, that should be shown to a human operator, because some operations may take time. 
+
+Changes in the progress header NEVER entails that the operator or management system need to perform any particular actions. </description>
+            <readOnly/>
+            <dataType>
+                <enumRef name="UpgradeProgressInformation">
+                    <defaultValue>IDLE</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="progressTotal">
+            <description>
+This notification attribute is used to indicate progress for different steps in the upgrade sequence. The value gives the total number of steps that is to be performed in current step.
+
+This attribute is changed whenever 'progressHeader' is changed and indicates a maximum count for the progress of the progress counter. What items that are counted is specific for each case. For some cases, the counter is not yet implemented. In these cases, the progressTotal is set to zero (0) when the progressHeader is set.
+
+</description>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="progressCount">
+            <description>This attribute is used to indicate progress for different steps in the upgrade sequence. The value is separated in increments from 0 to progressTotal.
+
+The value of progressCount never exceeds the value of 'progressTotal'. 
+
+For some cases, the counter is not yet implemented. In these cases, the progressCount is set to zero (0) when the progressHeader is set.</description>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeData">
+            <description>Contains product data for this upgrade package. This information is extracted from the upgrade control file. </description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <structRef name="AdminProductData"/>
+            </dataType>
+        </attribute>
+        <attribute name="confirmationDeadline">
+            <description>This attribute contains the deadline date and time for an operator confirmation. If the deadline is not met, then an automatic rollback to a previous configuration is issued by the system.
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ftpServerIpAddress">
+            <description>Ip address to the ftp server where the upgrade package is stored.
+
+The input format used by the operator is four fields of digits, separated by a dot.
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="upFilePathOnFtpServer">
+            <description>File path on the FTP server to the upgrade control file. </description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="user">
+            <description>User id. to be used for logging in to the FTP server.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <defaultValue>anonymous</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="password">
+            <description>Password to the FTP server. This attribute is only supplied at create and is not readable.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <defaultValue>anonymous</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="upgradePackageDocumentId">
+            <description>The document number and revision of the uppgrade package where the white spaces has been removed and underscore between the document number and revision has been inserted e.g. 19089-CSX10901/1_A.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="deletePreventingCVs">
+            <description>The list containing the names of the Configuration Versions that stop the Upgrade Package MO from being deleted.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <string/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="otherReferringCVs">
+            <description>The list of names of Configuration Versions that refer to the Upgarde Package MO, but do not affect the deletable status of the Upgrade Package MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <string/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="isDeletable">
+            <description>Indicates if the Upgrade Package MO can be deleted.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="basedOnUpgradePackages">
+            <description>This attribute is only valid for Upgrade Packages of type Delta.It contains the merge history of this upgrade package.
+
+Example: [Product Data for normal UP (non Delta UP), Product Data for Delta UP1, Product Data for Delta UP2]. </description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <structRef name="AdminProductData"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="upCompatibilityIndex">
+            <description>This attribute states a compatibility index.
+
+If specified, it may be used when verifying that an upgrade 'from' state is valid for this Upgrade Package.
+
+Note: It is only used when the Upgrade Control File element upgrade window contains this type of information.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="cppUpVersion">
+            <description>This attribute states the CPP upgrade package version of this Upgrade Package</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <structRef name="AdminProductData"/>
+            </dataType>
+        </attribute>
+        <attribute name="actionResult">
+            <description>The attribute contains the result from the latest four invoked actions.
+
+This attribute is only valid for actions::
+- install (all variants)
+- cancelInstall
+- verifyUpgrade
+- upgrade (all variants, Note that the attribute is only valid when the verification phase discovers that upgrade is not possible').</description>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <structRef name="ActionResultData"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <action name="install">
+            <description>Load modules defined in the Upgrade Package Control file will only be downloaded to the node if the Load Module MO representing the load module file doesn't already exist.
+The result of this action is indicated in the attribute ActionResult. In case the installation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'InstallationExecutionFailed'.Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure. 
+
+
+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.
+             
+Note! This action will be removed in a later version.              
+Note! This action does not require a transaction. </description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <raisesException name="FtpServerNotAccessibleException"/>
+            <raisesException name="GetFileException"/>
+            <raisesException name="IpAddressException"/>
+            <raisesException name="UpgradeControlFileException"/>
+            <raisesException name="ActionNotAllowedException"/>
+            <raisesException name="InstallException"/>
+        </action>
+        <action name="verifyUpgrade">
+            <description>Verifies that an upgrade is possible. 
+
+The operation is not blocked while the verification is executing i.e. after basic controls the operation initiates the verification and returns 'void'.
+
+The progress of this action is indicated in the attribute ProgressHeader.The result of this action is indicated in the attribute ActionResult.
+
+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.
+
+Note: This action does not require a transaction.
+
+
+
+</description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <raisesException name="VerifyUpgradeException"/>
+            <raisesException name="ActionNotAllowedException"/>
+        </action>
+        <action name="upgrade">
+            <description>Upgrades the node. The operation is not blocked while upgrade is executing i.e. after basic controls the operation initiates the upgrade and returns 'void'. 
+
+Before the real upgrade is started a verification phase is executed. 
+
+The progress of this action is indicated in the attribute ProgressHeader.
+
+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.
+
+The result of this action is only indicated in attribute ActionResult in case the verification phase discovers that upgrade is not possible.
+
+Note: This action does not require a transaction.
+
+</description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <raisesException name="UpgradeNotPossibleException"/>
+            <raisesException name="ActionNotAllowedException"/>
+        </action>
+        <action name="rebootNodeUpgrade">
+            <description>The same as upgrade except that the hard upgrade sequence is always chosen. 
+
+It could be helpful to use this method if the application has start- or upgrade- synchronization problems when using a soft upgrade sequence.
+
+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.
+
+The result of this action is only indicated in attribute ActionResult in case the verification phase discovers that upgrade is not possible.
+
+Note: This action does not require a transaction. </description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <raisesException name="UpgradeNotPossibleException"/>
+            <raisesException name="ActionNotAllowedException"/>
+        </action>
+        <action name="confirmUpgrade">
+            <description>The operator invokes this method when the trial period is over. 
+The operation is not blocked while upgrade is executing i.e. after basic controls the operation initiates the upgrade and returns 'void'.In case the upgrade fails after 'void' has been returned the attribute ProgressHeader will be set to 'UpgradeExecutionFailed'.
+
+Note! This action does not require a transaction. </description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="UpgradeNotPossibleException"/>
+            <raisesException name="ActionNotAllowedException"/>
+        </action>
+        <action name="cancelUpgrade">
+            <description>Cancels an executing upgrade or an upgrade that is awaiting confirm. 
+
+Note: This action performs a node restart so that the CV pointed out in the ConfigurationVersion MO is rolled back.
+
+Note! This action does not require a transaction. </description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="ActionNotAllowedException"/>
+        </action>
+        <action name="forcedInstall">
+            <description>All load modules defined in the Upgrade Package Control file will be downloaded to the node even if the Load Module MO representing the load module already exists i.e. existing load module files are replaced. 
+The result of this action is indicated in the attribute ActionResult.In case the installation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'InstallationExecutionFailed'.Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure.
+
+
+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.
+
+Note! This action will be removed in a later version.
+Note! This action does not require a transaction. </description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <raisesException name="FtpServerNotAccessibleException"/>
+            <raisesException name="GetFileException"/>
+            <raisesException name="IpAddressException"/>
+            <raisesException name="UpgradeControlFileException"/>
+            <raisesException name="ActionNotAllowedException"/>
+            <raisesException name="InstallException"/>
+        </action>
+        <action name="nonBlockingInstall">
+            <description>Load modules defined in the Upgrade Package Control file will only be downloaded to the node if the Load Module MO representing the load module doesn't already exist.
+
+This action is non-blocking i.e. the action initiates the installation and returns 'void' immediately without waiting for the installation to be completed. 
+
+In case the installation fails after 'void' has been returned, this will be indicated by change of the value of attribute 'ProgressHeader' to 'ExecutionFailed'. Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure.
+
+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.
+
+Note! This action does not require a transaction.
+</description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <raisesException name="ActionNotAllowedException"/>
+            <raisesException name="InstallException"/>
+        </action>
+        <action name="nonBlockingForcedInstall">
+            <description>All load modules defined in the Upgrade Package Control file will be downloaded to the node even if the Load Module MO representing the load module already exists i.e. existing load module files are replaced.
+This action is non-blocking i.e. the action initiates the installation and returns 'void' immediately without waiting for the installation to be completed.
+The result of this action is indicated in the attribute ActionResult.In case the installation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'InstallationExecutionFailed'. Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure.
+
+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.
+
+Note! This action does not require a transaction. </description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <raisesException name="ActionNotAllowedException"/>
+            <raisesException name="InstallException"/>
+        </action>
+        <action name="nonBlockingSelectiveForcedInstall">
+            <description>This action only installs the load modules that are required in this node i.e. the load modules required after successful execution of action upgrade on this upgrade package.
+
+A load module is considered to be required if one of the following criteria is fulfilled:
+a) The load module is included in a Repertoire MO where the Repertoire MO is connected to a SwAllocation MO and the SwAllocation MO is connected to a Slot MO, a Fan MO, a Jvm MO, a Webserver MO or an applicable type of application MO. 
+b) The load module is of type 'other'.
+
+All required load modules will be downloaded to the node even if the Load Module MO representing the load module already exists i.e. existing load module files are replaced.
+
+This operation is non-blocking i.e. the action initiates the installation and returns "void" immediately without waiting for the installation to be completed.
+The result of this action is indicated in the attribute ActionResult.In case the installation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'InstallationExecutionFailed'. Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure.
+
+Note. The behaviour described for this action is also obtained for the other installation actions if the Upgrade Control File indicates that the upgrade package is of type selective (which is recommended).
+
+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.
+
+Note! This action does not require a transaction. </description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <raisesException name="ActionNotAllowedException"/>
+            <raisesException name="InstallException"/>
+        </action>
+        <action name="nonBlockingSelectiveInstall">
+            <description>This action only installs the load modules defined in the Upgrade Package Control file that are required in this node i.e. the load modules required after successful execution of action upgrade on this upgrade package.
+
+A load module is considered to be required if one of the following criteria is fulfilled:
+a) The load module is included in a Repertoire MO where the Repertoire MO is connected to a SwAllocation MO and the SwAllocation MO is connected to a Slot MO, a Fan MO, a Jvm MO, a Webserver MO or an applicable type of application MO. 
+b) The load module is of type 'other'. 
+
+Returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute
+actionResult.
+
+The required load modules will only be downloaded to the node if the Load Module MO representing the load module doesn't already exist.
+
+This action is non-blocking i.e. the action initiates the installation and returns 'void' immediately without waiting for the installation to be completed. 
+
+The result of this action is indicated in the attribute ActionResult. In case the installation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'InstallationExecutionFailed'. Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure.long
+
+Note. The behaviour described for this action is also obtained for the other installation actions if the Upgrade Control File indicates that the upgrade package is of type selective (which is recommended).
+Note! This action does not require a transaction. </description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <raisesException name="ActionNotAllowedException"/>
+            <raisesException name="InstallException"/>
+        </action>
+        <action name="cancelInstall">
+            <description>This action interrupts an ongoing installation of an upgrade package.
+
+Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at execution of this action. 
+
+This action is non-blocking i.e. the action initiates the cancel of the installation and returns 'void' immediately without waiting for the cancellation to be completed.
+
+During execution of this action the value of attribute 'ProgressHeader' is set to 'CancelOfInstallationIsExecuting'.
+
+In case the cancellation fails after 'void' has been returned this will be indicated by change of the value of attribute 'ProgressHeader' to 'CancelOfInstallationFailed'.
+
+Note! This action does not require a transaction.
+
+This action interrupts an ongoing installation of an upgrade package.
+Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at execution of this action. 
+This action is non-blocking i.e. the action initiates the cancel of the installation and returns 'void' immediately without waiting for the cancellation to be completed.
+During execution of this action the value of attribute 'ProgressHeader' is set to 'CancelOfInstallationIsExecuting'.The result of this action is indicated in the attribute ActionResult.In case the cancellation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'CancelOfInstallationFailed'.
+
+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.
+
+Note! This action does not require a transaction. </description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <raisesException name="ActionNotAllowedException"/>
+        </action>
+        <action name="clearUpgradeLogFile">
+            <description>Is used to clear the contents of current upgrade log file.
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="UpgradeLogFileNotInUseException"/>
+            <raisesException name="UpgradeLogFileNotAccessibleException"/>
+        </action>
+    </class>
+
+    <class name="Repertoire">
+        <description>The Repertoire is an abstraction of a functionality represented by a plug in unit type (PiuType MO) and one or more load modules (LoadModule MO). The repertoire also provides rules for PiuType/ Load Module combinations valid for a specific function where one function can be provided by one or many PiuType-Load Module combinations. 
+These rules are used to load the correct software (Load Modules) to a PlugInUnit. This could be used as operator configuration support and/or in situations where automatic re-configuration is required (hot repair).
+
+MOs of this type are created automatically during system upgrade.
+MOs of this type are possible to create manually but a system upgrade is recommended to create them.</description>
+        <attribute name="userLabel">
+            <description>A user friendly name associated to the managed object. </description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="name">
+            <description>A function friendly name associated to the repertoire. The value must be unique with respect to all repertoires with the same install state.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="info">
+            <description>Information regarding the function.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="piuTypeList">
+            <description>A list containing all PiuType references that has been added to this repertoire.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="PiuType"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="RepertoireId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving SwAllocation MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="SwAllocation"/>
+                </sequence>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="OspfInterface">
+        <description>The OSPF Interface MO represents an interface that is used by the OSPF protocol to communicate with a neighbour node. By connecting an OSPF interface to a Link MO that Link is defined as a link to be used by OSPF.
+
+Each OspfInterface MO must always be connected to a OspfArea MO.
+</description>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ospfAreaRelated">
+            <description>The identity of the OspfArea connected to this OspfInterface. The default value is the default OspfArea MO.</description>
+            <dataType>
+                <moRef name="OspfArea"/>
+            </dataType>
+        </attribute>
+        <attribute name="lsaTransmissionInterval">
+            <description>The time, in seconds, between LSA re-transmissions over the interface - default value 5 seconds.</description>
+            <dataType>
+                <long>
+                    <defaultValue>5</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="helloInterval">
+            <description>The time, in seconds, between sending OSPF Hello-packets over the interface. Default value 10 seconds.
+
+Note! Must be a positive value.</description>
+            <dataType>
+                <long>
+                    <defaultValue>10</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="routerDeadInterval">
+            <description>The time, in seconds, after which a neighbor router is declared dead when not heard from.
+</description>
+            <dataType>
+                <long>
+                    <defaultValue>40</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="interfaceTransitDelay">
+            <description>Estimated delay, in seconds, for the transmission of a link state update package over the interface.
+</description>
+            <dataType>
+                <long>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="interfacePriority">
+            <description>The interface priority.  Each router is configured with a priority configured from 0 - 255 where 0 is the lowest priority and 255 the highest.
+
+Note! Must be a positive value.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="relatedLink">
+            <description>Each OSPF interface is connected to one IP link.
+The relatedLink can be either an IpAtmLink or an EthernetLink MO
+reference.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="OspfInterfaceId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfOspfIfEvents">
+            <description>Performance monitoring counter for the number of times this OSPF interface has changed its state or an error has occured.
+
+See RFC 1850.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Ospf">
+        <description>The Ospf MO represents an instance of the Open Shortest Path First (OSPF) routing protocol running in a Cello node.
+
+When the Ospf MO is created a default OspfArea MO is also created. This OspfArea has the areaId 000.000.000.000.
+
+The attribute range0 in the default OspfArea will contain the following values:
+advertise = false
+ipAddress = 000.000.000.000
+subnetMask = 000.000.000.000
+</description>
+        <attribute name="OspfId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ospfRouterId">
+            <description>The ospfRouterId attribute is in the form of an IP address.
+In order to able to set ospfRouterId the attribute
+administrativeState has to be set to locked. The ospfRouterId
+is uniquely identifying the router in the Autonomous System. By 
+convention to ensure uniqueness, this should be configured to the
+value of one of the routers IP interface addresses.</description>
+            <mandatory/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="ospfASBdrRtrStatus">
+            <description>The ospfASBdrRtrStatus attribute controls, whether this router is configured as an Autonomous System border router (Routers connected to multiple areas are called area border routers). The attribute must be set to 'True' if the user wants to configure static routes, which should be distributed to other OSPF routes as external routes. Configuration of static routes is the same as adding and deleting static routes to the IpRoutingTable Mo.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the MO.
+The operationalState can only be enabled when the IP MO is in workingMode routerMode.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state of the MO.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="ospfAreaBdrRtrStatus">
+            <description>Area border router flag - indicates whether the router is acting as an area border router or not.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="ipMo">
+            <description>The name of the Ip MO that the Ospf MO is to use</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Ip"/>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. It is a bit mapped CORBA long, where one or more of the bits may be set. If none of the bits are set then the availability status  is considered to be undefined.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfOspfOriginateNewLsas">
+            <description>The number of new link-state advertisments that have been originated. This number is incremented each time the router originates a new LSA.
+
+For more detailed information, see RFC 1850.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfOspfRxNewLsas">
+            <description>The number of link-state advertisments received determined to be new instantiations. This number does not include newer instantiations of self-originated link-state advertisments. 
+
+For more detailed information, see RFC 1850.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="recoverTopoDb">
+            <description>Indicates whether the topology database is to be recovered from the database at restart.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="topoDbStoreInterv">
+            <description>The interval, in seconds, with which the topology database will be stored.</description>
+            <dataType>
+                <long>
+                    <defaultValue>60</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="OspfArea">
+        <description>An OSPF autonomous system is divided into OSPF areas. The OSPF Area MO represents such OSPF areas.
+
+A default OspfArea MO is automatically created when the Ospf MO is created.
+It has the identity = 1, so LDN of this MO will be
+ManagedElement=1,IpSystem=1,Ospf=1,OspfArea=1.
+
+Note! A maximum of 4 OspfAreas can be configured each with a maximum of 8 interfaces.</description>
+        <attribute name="OspfAreaId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="stubArea">
+            <description>Indicates whether the OSPF area is a stub area or not.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="importExternalLsa">
+            <description>Indicates whether importing Autonomous System external LSA's is supported.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="sendAreaSummary">
+            <description>Import Area summary - indicates whether the router will originate and propagate summary LSAs into a stub-area.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="stubAreaMetric">
+            <description>Cost for default route that the router advertises into the area if the area is a stub area and the router is an area border router. By default set to the least metric among the interfaces to other areas.</description>
+            <dataType>
+                <long>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="stubAreaMetricType">
+            <description>Stub Area metric type.
+
+RFC 1850 (OSPF V2 MIB):
+
+comparableCost (external type 1)
+nonComparable (external type 2)</description>
+            <dataType>
+                <enumRef name="OspfMetricType">
+                    <defaultValue>comparableCost</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="areaLsaChecksum">
+            <description>Area Lsa checksum - 32-bit unsigned sum of the link-state advertisements LS check sums contained in this area's link-state database.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="areaId">
+            <description>The OSPF area identity in form of an IP address. This areId uniquely identifies the area.
+AreaId 0.0.0.0 is used for the OSPF backbone.
+Range: 000.000.000.000 to 255.255.255.255.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="range0">
+            <description>OspfArea IP address range zero (0).</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="OspfAreaRange"/>
+            </dataType>
+        </attribute>
+        <attribute name="range1">
+            <description>OspfArea IP address range one (1).</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <structRef name="OspfAreaRange"/>
+            </dataType>
+        </attribute>
+        <attribute name="range2">
+            <description>OspfArea IP address range two (2).</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <structRef name="OspfAreaRange"/>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfOspfSpfRuns">
+            <description>The number of times that the intra-area route table has been calculated using this area's link-state database. This is typically done using Dijkstra's algorithm.
+
+For more detailed information, see RFC 1850.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Holds a list of the reserving OspfInterface MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="OspfInterface"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <action name="addAreaRange">
+            <description>Add aggregation range. Used to add a range of IP addresses to an OSPF area. 
+
+Note! This action requires a transaction.
+</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="range">
+                <description>The area range aggregation.</description>
+                <in/>
+                <dataType>
+                    <structRef name="OspfAreaRange"/>
+                </dataType>
+            </parameter>
+            <parameter name="rangeIndex">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="AttrMissingAtCreateException"/>
+            <raisesException name="FroNotAccessibleException"/>
+            <raisesException name="FroRequestFailedException"/>
+            <raisesException name="NoSuchFieldException"/>
+            <raisesException name="ValueOutOfRangeException"/>
+            <raisesException name="WrongAttributeTypeException"/>
+        </action>
+        <action name="deleteAreaRange">
+            <description>Delete an IP address range. Used to remove a range of IP addresses from an OSPF area. 
+
+Input is the area aggregation range index.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="rangeIndex">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="FroNotAccessibleException"/>
+            <raisesException name="FroRequestFailedException"/>
+            <raisesException name="ValueOutOfRangeException"/>
+        </action>
+    </class>
+
+    <class name="SwitchCoreUnit">
+        <description>The Switch Core Unit MO, SCU, represents the board specific HW on the SCB. This object collects HW failure on the board and sends alarms. It is also used for configuration of board specific FW.
+This board can only be fitted in slot 1 and 28 in a standards subrack.
+The board has a number of switch internal link ports.</description>
+        <notificationTypes>alarm</notificationTypes>
+        <attribute name="userLabel">
+            <description>user label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeStateSili">
+            <description>The administrative state of the switch internal link ports on the switch board. The attribute refers to all ports (locking will lock all ports, unlocking unlock all ports).
+SILI -switch internal link interface.
+</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalStateSil">
+            <description>Operational state indicates the the traffic handling capability of all ports as a group on the board, i.e it is enabled if one or more of the eight ports is enabled. The purpose of this attribute is only for test.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalStateSync">
+            <description>Operational State for network synchronization distribution.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatusSil">
+            <description>The availability status of the switch internal link (SIL) ports..
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatusSync">
+            <description>Availability state for network synchronization distribution.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="SwitchCoreUnitId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>A list of the reserving MO's.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="silPorts">
+            <description>The attribute provides a list of port numbers. 
+The port number is between 0-7 and is used to read state of the switch internal port.
+See action getSilPortState, getOperState and getAvailState.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <long/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <action name="getSilPortState">
+            <description>Returns status of the switch internal link port, which is the same as the LEDs on the unit.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <enumRef name="SilPortState">
+                    </enumRef>
+            </returnType>
+            <parameter name="portNr">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="getSilOperState">
+            <description>Returns operational status of the switch internal link port.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <enumRef name="OperState">
+                    </enumRef>
+            </returnType>
+            <parameter name="portNr">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="getSilAvailState">
+            <description>Returns availability status of the switch internal link port.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <parameter name="portNr">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+    </class>
+
+    <class name="GeneralProcessorUnit">
+        <description>The General purpose Processor Unit MO, GPU, represents the board specific HW on the GPB; hard disk, ethernet and serial port etc.
+
+Note! The 'availabilityStatus' for the GeneralProcessorUnit MO is retreived from the PlugInUnit MO.</description>
+        <attribute name="GeneralProcessorUnitId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Indicates if the function provided by the managed object is capable of performing its normal functions or not.
+
+Note! The value for operationalState is retrived from the GeneralProcessorUnit's parent, i.e. the PlugInUnit.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="hdVolumeDSize">
+            <description>The total size in bytes of the D volume.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="hdVolumeDFreespace">
+            <description>The amount in bytes of freespace available on the D volume.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="hdVolumePSize">
+            <description>The total size in bytes of the P volume.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="hdVolumePFreespace">
+            <description>The amount in bytes of freespace available on the P volume.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Holds the identity of the reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Jvm">
+        <description>The JVM MO is used to represent the Java Virtual Machine. This object is used for configuration JVM parameters, including SW management of Java class libraries used in the machine.
+
+The local distinguished name of this MO is ManagedElement=1, Equipment=1, JVM=1.</description>
+        <systemCreated/>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="classpath">
+            <description>Current classpath, the JVM is using</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="admClasspath">
+            <description>New classpath that will be activated at next restart of JVM. The classpath has a directory, which contains the load module, i.e. the classpath references the load module.</description>
+            <dataType>
+                <sequence>
+                    <moRef name="LoadModule"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="freeMemory">
+            <description>Free memory in the java machine, in bytes.
+
+NOTE: Before this value is read from the system the action 'garbageCollect' is invoked.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="totalMemory">
+            <description>Total amount of memory allocated to the java machine, in bytes.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="mopplets">
+            <description>Contains all classes that are to be initilised and started when the JVM restarts.
+
+Technical note: The specified classes must implement the se.ericsson.cello.moframework.Mopplet interface and be found in a jar/zip-file pointed out by the classpath.
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <string/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="main">
+            <description>Defines the start class name.
+e.g. "se.ericsson.cello.oms.Oms"</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="options">
+            <description>Current options:
+ -D&lt;property&gt;=&lt;value&gt;  Set a system property value. Commonly java.class.path
+-Xms&lt;size&gt;                  Specify the size, in bytes, of the memory allocation pool.
+-Xss&lt;size&gt;                   Set thread stack size in bytes.
+-Xverify:[all | remote | none]  Verify classes according to the suboption. 
+        -Xverify:all verifies all classes. 
+        -Xverify:remote verifies remote classes only. 
+        -Xverify:none turns off class verification.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="JvmId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="properties">
+            <description>Determines the current system properties. 
+
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <string/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="reliableProgramUniter">
+            <description>A reference to the ReliableProgramUniter that refers to the programs in the which the JVM executes.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ReliableProgramUniter"/>
+            </dataType>
+        </attribute>
+        <attribute name="admMain">
+            <description>New start class that will be activated at next restart of the JVM.
+e.g. "se.ericsson.cello.oms.Oms"</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="admOptions">
+            <description>This attribute is used when setting one or more administrative options.
+
+A set option is operational after the next Java Machine restart.
+
+See also attribute 'options'
+
+One or more options can be set, one option in each string of the
+sequence according to description below:
+
+Current options:
+ -D&lt;property&gt;=&lt;value&gt;  Set a system property value. Commonly java.class.path
+-Xms&lt;size&gt;                  Specify the size, in bytes, of the memory allocation pool.
+-Xss&lt;size&gt;                   Set thread stack size in bytes.
+-Xverify:[all | remote | none]  Verify classes according to the suboption. 
+        -Xverify:all verifies all classes. 
+        -Xverify:remote verifies remote classes only. 
+        -Xverify:none turns off class verification.</description>
+            <dataType>
+                <sequence>
+                    <string/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBySwAllocation">
+            <description>This attribute holds the identity of the reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="SwAllocation"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <action name="garbageCollect">
+            <description>Runs the garbage collector. 
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="setProperty">
+            <description>Sets a system property (i.e. propertys in the operating system).
+Note! The valeus set with this action is not saved in the database.
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="name">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="value">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="restart">
+            <description>Restart of executing JVM instance.
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+    </class>
+
+    <class name="SwitchFabric">
+        <description>This MO represents the switch of a Cello node. It is used for general switch configuration.
+
+The system creates automatically one instance of this MO at restart.
+
+Today, only a maximum of 32 Switch Modules MOs and 2 SwitchInternalLinks MOs per InternalLinkGroup MOs are allowed in a Cello node. However, in theory the switch addressing space in the system allows up to 256 SwitchModules MOs. This would then mean there are 255 InternalLinkGroup MOs, each of which is allowed 256 SwitchInternalLink MOs by the addressing.
+
+The local distinguished name of this MO is ManagedElement=1, SwitchFabric=1.
+
+</description>
+        <systemCreated/>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="SwitchFabricId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="SwitchModule">
+        <description>This MO represents two switch planes of one sub-rack, i.e. either the main switch or an external switch. 
+
+Note! In a non-redundant system the administrativeStateSwitchPlaneA/B has to be set to locked for the non-present plane. </description>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="switchModuleNumber">
+            <description>Indicates the number of the switch module, SMN.
+
+switchModuleNumber &amp;gt;= 0
+
+The main switch module, with one or two TimingUnits, is given SMN = 0. SMN for extension switch modules depends on the port pair that the extension switch module is connected to in the main switch module.
+
+The SMN is calculated according to the following formula:
+
+Switch module number [1..255] = int (APN/2)*8 + ISL-port in main [1..8]
+
+APN - ASCC port number
+ISL - inter-switch link</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="secondSmnEvaluation">
+            <description>secondSmnEvaluation - There are two cables that
+are relevant for Switch Module Number (smn) numbering
+If the cabling is wrong secondSmnEvaluation
+will show the second opinion about smn.
+Under normal conditions secondSmnEvaluation = smn.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state of the switch module.
+
+Note! When setting the 'administrativeState' to shutting down a notification about that the state has changed to 'locked' will be sent towards the operator. There is however no guarantee that this operation has been succesful despite the notification and state change due to limitations in the resource layer
+</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>unlocked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeStateSwitchPlaneA">
+            <description>The administrative state of switch plane A.
+It is not allowed to lock both switch plane A and B.
+
+Note! When setting the 'administrativeState' to shutting down a notification about that the state has changed to 'locked' will be sent towards the operator. There is however no guarantee that this operation has been succesful despite the notification and state change due to limitations in the resource layer</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>unlocked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeStateSwitchPlaneB">
+            <description>The administrative state of switch plane B.
+It is not allowed to lock both switch plane A and B.
+
+Note! When setting the 'administrativeState' to shutting down a notification about that the state has changed to 'locked' will be sent towards the operator. There is however no guarantee that this operation has been succesful despite the notification and state change due to limitations in the resource layer</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>unlocked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the Switch Module. At least one of switch plane is enabled. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalStateSwitchPlaneA">
+            <description>The operational state of Switch Module plane A. The state is disabled if any switch ports is faulty. But switch may still be used.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalStateSwitchPlaneB">
+            <description>The operational state of Switch Module plane B. The state is disabled if any switch ports is faulty. But switch may still be used.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status of the Switch Module.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatusSwitchPlaneA">
+            <description>The availability status of the Switch Plane A.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatusSwitchPlaneB">
+            <description>The availability status of the Switch Plane B.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="activeSwitchPlane">
+            <description>The active switch plane: A, B. During multiple faults,  both plan A and B may be used.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="ActiveSwitchPlane">
+                    <defaultValue>switchPlaneA</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="SwitchModuleId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="InternalLinkGroup">
+        <description>The Internal Link Group MO represents all switch internal links connecting the main switch to an external switch.
+
+Switch internal links are automatically grouped in Reliable Groups for redundancy.</description>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="switchModuleNumber1">
+            <description>Reference to the SwitchModule MO that is interconnected by the link in the InternalLinkGroup.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="SwitchModule"/>
+            </dataType>
+        </attribute>
+        <attribute name="switchModuleNumber2">
+            <description>Reference to the SwitchModule MO that is interconnected by the link in the InternalLinkGroup.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="SwitchModule"/>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative status of internal link group.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>unlocked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational status of internal link group.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="InternalLinkGroupId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="getRlgLinks">
+            <description>Returns a  list of  resource instance identities of the switch internal links in the specified Reliable Group.
+
+The existing Reliable Groups are listed with action getReliableLinkGroups.
+
+Note! This action is transactional.</description>
+            <returnType>
+                    <sequence>
+                        <longlong/>
+                    </sequence>
+            </returnType>
+            <parameter name="rlgNumber">
+                <description>Reliable link group number.</description>
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="getLinkStatus">
+            <description>Returns the status of the specified switch internal link, within the specified Reliable Group.
+
+Note! This action is transactional.</description>
+            <returnType>
+                    <enumRef name="SwitchReliableGroup">
+                    </enumRef>
+            </returnType>
+            <parameter name="instanceId">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <parameter name="rlgNumber">
+                <description>Reliable link group number.</description>
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="getReliableLinkGroups">
+            <description>Returns a sequence of Reliable Group numbers.
+
+Each Reliable Group is identified by a unique number which can be used to read out the identities of the switch internal links that are allocated to the Reliable Group. This is done with action getRlgLinks.
+
+The allocation of switch internal links to Reliable Groups is automatic.
+
+Note! This action is transactional.
+</description>
+            <returnType>
+                    <sequence>
+                        <long/>
+                    </sequence>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+    </class>
+
+    <class name="SwitchInternalLink">
+        <description>This MO represents a link interconnecting the from either a SCB or SXB port on the main switch to a SCB on an external switch.
+
+The main switch is located in the hub subrack.
+
+The SCB is represented by the SwitchCoreUnit MO, while the SXB is represented by the SwitchExtensionUnit MO.
+
+Switch internal links are automatically grouped in Reliable Groups for redundancy.</description>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="SwitchInternalLinkId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="plugInUnit1">
+            <description>The reference of one connection point for a SwitchCoreUnit or SwitchExtensionUnit.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="plugInUnit2">
+            <description>The reference of one connection point for a SwitchCoreUnit or SwitchExtensionUnit.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="siliport1">
+            <description>Switch internal port number on PlugInUnit1.
+
+Note! 
+On a standard SCB/SXB board, the ports are labeled from the bottom to the top.
+
+Port nr -&gt; label:
+   '0'          'D'   
+   '1'          'C'   
+   '2'          'B'   
+   '3'          'A'   
+
+Also note that his mapping will change when adding/removing a board.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>3</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="siliport2">
+            <description>Switch internal port number on PlugInUnit2.
+
+Note! 
+On a standard SCB/SXB board, the ports are labeled from the bottom to the top.
+
+Port nr -&gt; label:
+   '0'          'D'   
+   '1'          'C'   
+   '2'          'B'   
+   '3'          'A'   
+
+Also note that his mapping will change when adding/removing a board.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>3</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state of switch internal link.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>unlocked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalStateTraffic">
+            <description>The operational state of switch internal link. There is no traffic if the link is disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatusTraffic">
+            <description>The availabilityl status of switch internal link.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalStateSync">
+            <description>The operational state of sync link. There is no clock distribution if the link is disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatusSync">
+            <description>The availability state of sync link.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Etm4">
+        <description>This MO represents the hardware of the ET-M4 board type. It only represents the ET specific hardware, while the DBM module of the board is represented by the PlugInUnit MO.
+
+The ET-M4 board contains 2 physical ports that can be configured as either STM1(ETSI/TTC) or OC3C (ANSI). The board supports unchannelised ATM access (i.e. it maps ATMs cells directly into an SDH VC4 container).
+
+The board supports up to 1800 ATM VC connections. 
+The number of terminated VPs are limited to 48/board.
+The board supports up to 750  VC UBR+ connections.
+
+The ET-M4 board contains 128 AAL2 multiplexers.
+The ET-M4 board supports up to 256 bidirectional F4/F5 PM flow per port.
+
+Note! IMA is not applicable for the ETM4 board.
+
+Note! The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 256 per board.
+
+Note! When using the Etm4 board the performance monitoring counters in the transmit direction found on the AtmPort MO does not show the following cells: CC cells and OAM FPM cells.</description>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Enabled or disabled according to the actual operational state of the hardware ETM4. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="Etm4Id">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="VpcTp">
+        <description>Virtual path connection termination point, VpcTp, is used to represent the point where the VPC and associated overhead (F4 OAM cells) are terminated/originated.
+
+Note! The performance monitoring counters in this MO is set to 0 when counterMode is set to PM_MODE_ON.
+In PM_MODE_OFF no information at all is retrived. So any value for pm-monitoring is measured from the time
+of setting counterMode to PM_MODE_ON. 
+At node restart these performance monitoring counters is reset to 0.</description>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="VpcTpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>enabled or disabled according to the actual operational state of the VpcTp</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="continuityCheck">
+            <description>Continuity checking means that a cell is sent downstream when no user cell has been sent for a period of nominally 1 second. Continuity check both enables generation of CC cells as well as detection of LOC</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="counterMode">
+            <description>PM mode is set to indicate type of performance monitoring mode (i.e. activation of bidirectional PM measurements).
+
+</description>
+            <dataType>
+                <enumRef name="AtmCounterMode">
+                    <defaultValue>PM_MODE_OFF</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="nomPmBlkSize">
+            <description>Nominal performance monitoring (PM) blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.
+</description>
+            <dataType>
+                <enumRef name="AtmNomPmBlkSize">
+                    <defaultValue>NOM_PM_BLKSIZE_2_10</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwLostCells">
+            <description>Performance monitoring counter for number of lost forward cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwMissinsCells">
+            <description>Performance monitoring counter for number of forward missinserted cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwErrBlocks">
+            <description>Performance monitoring counter for number of forward errored blocks.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLostFpmCells">
+            <description>Performance monitoring counter for number of lost Forward Performance Monitoring, FPM, cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwLostCells">
+            <description>Performance monitoring counter for number of lost backward cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwMissinsCells">
+            <description>Performance monitoring counter for number of backward missinserted cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwErrBlocks">
+            <description>Performance monitoring counter for number of backward errored blocks.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLostBrCells">
+            <description>Performance monitoring counter for number of lost Backward Reporting, BR, cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="alarmReport">
+            <description>Attribute to decide what type of alarms to be reported.</description>
+            <dataType>
+                <enumRef name="AlarmReport">
+                    <defaultValue>ALARM_LOC</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <action name="eteLoopBack">
+            <description>This action performs VC end to end loopback from this VpcTp.
+false=Failed, true=Succeded
+
+Note! This action requires a transaction.
+</description>
+            <returnType>
+                    <boolean/>
+            </returnType>
+        </action>
+    </class>
+
+    <class name="VplTp">
+        <description>This MO is used to represent the termination of a VP link.
+
+Note that a maximum of 999 MO's of this type may be configured.
+
+Note! For information on how many VplTp's that can be configured under the AtmPort MO please refer to the board that is parent to the termination reserved by the AtmPort MO.
+
+The performance monitoring counters in the VplTp MO is set to 0 (zero) at start or restart of the node.
+When the value is to large to fit in to a long (31bit) the counter turns over and starts from 0 again.</description>
+        <attribute name="userLabel">
+            <description>This MOs user label.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="atmTrafficDescriptor">
+            <description>Reference to the Atm Traffic Descriptor.</description>
+            <mandatory/>
+            <dataType>
+                <moRef name="AtmTrafficDescriptor"/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>enabled or disabled according to the actual operational state of the VplTp.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="externalVpi">
+            <description>This is the virtual path identifier for the external ATM cells.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmReceivedAtmCells">
+            <description>Performance monitoring counter for number of received ATM cells for the VplTp.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmTransmittedAtmCells">
+            <description>Performance monitoring counter for number of transmitted ATM cells.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="VplTpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="TimingUnit">
+        <description>This MO represents a timing unit (reference clock) in the node.
+
+The corresponding Program shall be of LoadModuleLoaderType, SpmFpgaLoader.</description>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Operational state of TimingUnit</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status of the TimingUnit.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="TimingUnitId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="PiuType">
+        <description>The PiuType is an MO that holds product information about a PlugInUnit and the execution resources of the PlugInUnit. It is created/deleted during a software upgrade.
+The PiuType is used when creating execution MOs connected to a PlugInUnit and when allocating software to this resource.
+
+MOs of this type are created automatically during system upgrade.
+MOs of this type are possible to create manually but a system upgrade
+is recommended to create them.
+ 
+
+</description>
+        <attribute name="userLabel">
+            <description>A user friendly name associated to the managed object. </description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="productData">
+            <description>The productData describes the product number, short product revision, product name and product information of the PlugInUnit. The production date is not used.
+
+Trailing letters in the revision is recommended to be excluded in the PiuType. Example: R2B will be R2 without trailing letter, R2B/3 must be R2B/3 in the PiuType, R2B/A should be R2 in the PiuType. 
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="AdminProductData"/>
+            </dataType>
+        </attribute>
+        <attribute name="boardWidth">
+            <description>The width of the PlugInUnit board in steps of 5 mm.
+A PlugInUnit can use/cover more than the slot that it occupies.
+
+Example: boardWidth=3 corresponds to 3*5 = 15 mm.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long/>
+            </dataType>
+        </attribute>
+        <attribute name="airFlowData">
+            <description>Control value m3/h for the fan unit. Needed by cooling function.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="AirFlowData"/>
+            </dataType>
+        </attribute>
+        <attribute name="PiuTypeId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="role">
+            <description>The value will be MP if a board has the role of a Main processor.
+The value will be BP if a board has the role of a device board
+Otherwise the value will be OTHERS.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="PiuRole">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity's of the reserving MO's.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <action name="numberOfMoConfigurations">
+            <description>Returns the number of entries in the PIUTypeConfigurationArray.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <long/>
+            </returnType>
+        </action>
+        <action name="getMoConfiguration">
+            <description>Returns a struct of a specific MoConfiguration at a given index.
+The moConfiguration holds information about how to create the 
+subordinate objects for a specific piu type. 
+
+Precondition: 0 &lt;= index &lt;= numberOfMoConfigurations() - 1
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <structRef name="PiuTypeMOConfiguration"/>
+            </returnType>
+            <parameter name="index">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="InvalidIndexException"/>
+        </action>
+    </class>
+
+    <class name="SwAllocation">
+        <description>This MO is primarily used to handle data for automatic configuration of load modules. Automatic in the meaning that the system selects the appropriate load module and revision. A SWA may be related to a slot, indicating that a specific functionality is requested at this location. The SWA is manually created by the operator.
+
+The SWA object is related to (one or more) repertoires, which hold information on possible PIU-type/revisions and load module combinations.
+
+In some cases (e.g multi-purpose boards, boards with processor/FPGA-pools) it may not be possible to completely configure the PIU without instructions from the operator (e.g which load module runs on which processor/FPGA). In these cases a specialization of the SWA has to be designed in such a way that it can be manually configured.
+
+When a SwAllocation MO depends on a ManagedObject MO, this ManagedObject actually represents a RBS Fan.
+
+MOs of this type are created automatically during system upgrade.
+MOs of this type are possible to create manually but a system upgrade is recommended to create them.</description>
+        <attribute name="userLabel">
+            <description>Free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="role">
+            <description>The role of a slot/PIU. The role must be unique with respect to other SwAllocations in the node. 
+
+This is a preparation to introduce predefined SwAllocation in  future upgrade packages.</description>
+            <mandatory/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="repertoireList">
+            <description>A list of references to repertoires.</description>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="Repertoire"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="slotList">
+            <description>A list of references to mainly slots in a subrack, e.g. Slot or Fan MO. It may also refer to other objects handling auxiliary units, e.g. RBS Fan.</description>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="SwAllocationId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="addRepertoire">
+            <description>Adds the specifed repertoire to this list. 
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="aRepertoire">
+                <in/>
+                <dataType>
+                    <moRef name="Repertoire"/>
+                </dataType>
+            </parameter>
+            <raisesException name="IllegalArgumentTypeException"/>
+        </action>
+        <action name="deleteRepertoire">
+            <description>Removes the first occurrence of the specified repertoire from this list.
+
+Notw! This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="aRepertoire">
+                <in/>
+                <dataType>
+                    <moRef name="Repertoire"/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="addSlot">
+            <description>Adds the specified Slot to the slotList. 
+The slot can only be of type Slot MO, Fan MO, WebServer MO, JVM MO or an applicable type of application MO (e.g. for "RBS Fans").
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="aSlot">
+                <in/>
+                <dataType>
+                    <moRef name="ManagedObject"/>
+                </dataType>
+            </parameter>
+            <raisesException name="IllegalArgumentTypeException"/>
+        </action>
+        <action name="deleteSlot">
+            <description>Removes the first occurrence of the specified slot from this list. 
+The slot can only be of type Slot MO, Fan MO, WebServer MO or an 
+applicable type of application MO (e.g. for "RBS Fans").
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="aSlot">
+                <in/>
+                <dataType>
+                    <moRef name="ManagedObject"/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="deleteAllRepertoires">
+            <description>Removes all repertoires from this list and sets its size to zero.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="deleteAllSlots">
+            <description>Removes all slots from this list and sets its size to zero.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="addSlots">
+            <description>Adds the specified Slot to the slotList. 
+The slot can only be of type Slot MO, Fan MO, WebServer MO, JVM MO or an applicable type of application MO (e.g. for "RBS Fans").
+If the slot exists in the list, the object is ignored.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="managedObjects">
+                <in/>
+                <dataType>
+                    <sequence>
+                        <moRef name="ManagedObject"/>
+                    </sequence>
+                </dataType>
+            </parameter>
+            <raisesException name="IllegalArgumentTypeException"/>
+        </action>
+        <action name="addRepertoires">
+            <description>Adds the specifed repertoire to this list. 
+
+If the repertoires exist in the list the repertoire is ignored.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="repertoire">
+                <in/>
+                <dataType>
+                    <sequence>
+                        <moRef name="Repertoire"/>
+                    </sequence>
+                </dataType>
+            </parameter>
+            <raisesException name="IllegalArgumentTypeException"/>
+        </action>
+    </class>
+
+    <class name="MediumAccessUnit">
+        <description>The Medium Access Unit (MAU) MO represents the Ethernet transceiver function on a General Processor Board (GPB).
+
+Note! Ethernet links which are modelled by a MediumAccessUnit MO are used for O&amp;M IP traffic only. MediumAccessUnit MOs must not be configured under a GeneralProcessorUnit MO which have a IpAccessHostGpb referring to it.
+
+Note! This object is known in standards as "MediumAttachmentUnit".
+</description>
+        <attribute name="userLabel">
+            <description>Label for free use.
+</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Description of operational state which has an enumerated datatype</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="MediumAccessUnitId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="connectorLabel">
+            <description>This attribute is used by a management system to show the label on the port the connector is attached to.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <defaultValue>Eth</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDot3StatsLateCollisions">
+            <description>Performance management counter for the number of times that a collision was detected on the interface after the minimum length of a frame.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDot3StatsFCSErrors">
+            <description>Performance management counter for the number of frames that did not pass the FCS check.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="linkSpeed">
+            <description>The Link Speed, measurment unit is Mb/s..</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="duplexMode">
+            <description>The duplex mode used.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="MauDuplexMode">
+                    <defaultValue>FULL_DUPLEX</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="ReliableProgramUniter">
+        <description>A Reliable Program Uniter (RPU) is a controlling and addressing entity providing one common addressing unit for two Reliable Programs. Or more correctly for parts of two Reliable Programs, each part is called a Resource Suite Handler (RSH). The RSH is implemented and owned by the application. It is not a function or a concept within Cello.
+
+MOs of this type are created automatically during system upgrade.
+MOs of this type are possible to create manually but a system upgrade
+is recommended to create them.</description>
+        <attribute name="userLabel">
+            <description>For free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="reliableProgramLabel">
+            <description>Reliable Program Label.
+Compare this to the reliableProgramLabel in LoadModule MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="admActiveSlot">
+            <description>Reference to slot, contains the running "Normal" relation to a slot. If the reference is set to the passive slot, the passive slot will be cleared and only one relation will be set.</description>
+            <mandatory/>
+            <dataType>
+                <moRef name="Slot"/>
+            </dataType>
+        </attribute>
+        <attribute name="admPassiveSlot">
+            <description>Reference to slot, contains the running "Stand-by" relation to a slot. If the reference is set to the active slot or a null value, the passive slot will be cleared. </description>
+            <dataType>
+                <moRef name="Slot"/>
+            </dataType>
+        </attribute>
+        <attribute name="switchOver">
+            <description>This attribute controls when to switchover the RPU, if a certain type error situation occurs.</description>
+            <dataType>
+                <enumRef name="RPUSwitchOverMode">
+                    <defaultValue>AtPiuFault</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="normalisation">
+            <description>This attribute controls when to switch back the RPU, after error recovery has been done.</description>
+            <dataType>
+                <enumRef name="RPUNormalisationMode">
+                    <defaultValue>Automatic</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="replication">
+            <description>This attribute indicates that which level of data replication that is associated with the RPU.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="RPUReplicationMode">
+                    <defaultValue>ApplControlled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalMode">
+            <description>This attribute indicates if the RSH execution mode (active/passive) in the two Reliable Program, matches the normal/stand-by relations set on the corresponding RPU.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="RPUOperationalMode">
+                    <defaultValue>Unavailable</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="ReliableProgramUniterId">
+            <mandatory/>
+            <noNotification/>
+            <nonPersistent/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <action name="switch">
+            <description>This action  will force the two corresponding RSHs to change their execution mode (active/passive). It will lead either to a switchover or to a switchback, depending of what value the operational Mode attribute is showing.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="ActionNotAllowedException"/>
+        </action>
+    </class>
+
+    <class name="ManagedElementData">
+        <description>This object contains attributes and actions on Cello node-level.
+
+The ManagedElementData MO is automatically created and cannot be deleted.
+
+The local distinguished name of this MO is ManagedElement=1, ManagedElementData=1.</description>
+        <systemCreated/>
+        <attribute name="ManagedElementDataId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="autoConfigurationAllowed">
+            <description>This attribute specifies if the system is allowed to auto create detected objects. Note that slots will always be auto created.
+
+Note! When setting this attribute from true to false the system creates a new CV.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="documentServerAddress">
+            <description>The base URL for the documentation server (ALEX). The attribute is read by Element Management application to find the documentation server in the network.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="logonServerAddress">
+            <description>A list of node names or IP addresses of the single logon servers (SLSs). The list uses commas to seperate the single logon server addresses, e.g. "https://SLS1,https://SLS2,https://SLS3", these addresses consists of the URLs to the concerned SLS servers. The attribute is read by Element Management application to find the single logon server in the network.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="dhcpServerAddresses">
+            <description>IP addresses to the DHCP server, used by the DHCP Relay Agent.
+
+Default is an empty array.
+
+Adding and removing addresses is done through the actions addDhcpServerAddress() and removeDhcpServerAddress().
+
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <string>
+                        <defaultValue>empty</defaultValue>
+                    </string>
+                    <length>10</length>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="performanceDataPath">
+            <description>This attribute is used by the internal performance management service 
+to know where to store it's data files. The attribute is the name of 
+a path in the node.
+ 
+Example: /c/public_html/cello/XML_files/</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ntpServerAddressPrimary">
+            <description>This is the IP address to the NTP server</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ntpServiceActivePrimary">
+            <description>This is a boolean that controls if the node should poll the primary NTP server for information.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="ntpMinPollPrimary">
+            <description>This value states the minimum interval (in seconds) for polling the primary NTP server.
+
+Note! This value has to be &gt; 0.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>16</min> <max>131072</max>
+                    </range>
+                    <defaultValue>64</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="ntpMaxPollPrimary">
+            <description>This value states the maximum interval (in seconds) for polling the primary NTP server.
+
+Note! This value has to be &gt; 0.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>16</min> <max>131072</max>
+                    </range>
+                    <defaultValue>1024</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="ntpBurstFlagPrimary">
+            <description>This is the burst flag used towards the primary NTP server.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="ntpServerAddressSecondary">
+            <description>This is an alternative IP address to a NTP server</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ntpServiceActiveSecondary">
+            <description>This is a boolean that controls if the node should poll the secondary NTP server for information.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="ntpMinPollSecondary">
+            <description>This value states the minimum interval (in seconds) for polling the secondary NTP server.
+
+Note! This value has to be &gt; 0.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>16</min> <max>131072</max>
+                    </range>
+                    <defaultValue>64</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="ntpMaxPollSecondary">
+            <description>This value states the maximum interval (in seconds) for polling the secondary NTP server.
+
+Note! This value has to be &gt; 0.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>16</min> <max>131072</max>
+                    </range>
+                    <defaultValue>1024</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="ntpBurstFlagSecondary">
+            <description>This is the burst flag used towards the secondary NTP server.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="nodeUTCTime">
+            <description>This attribute specifies the UTC time used in the node. The attribute value is milliseconds since epoch (January 1, 1970, 00:00:00 GMT).
+The value may only be set while ntpServiceActive both for primary and secondary is false.</description>
+            <dataType>
+                <longlong>
+                    <defaultValue>0</defaultValue>
+                </longlong>
+            </dataType>
+        </attribute>
+        <attribute name="nodeLocalTimeZone">
+            <description>This value states in what time zone the node is located. This attribute is needed by management application to convert UTC time from a log or NTP service to local time.
+It will not change the real time clock on the node.
+
+The timeZone is represented by three characters, example GMT.
+
+Available options are:
+
+TimeZone ID                                              Offset
+GMT  (Greenwich Mean Time)                         0
+UTC   (Coordinated Universal Time)                  0
+ECT   ( Central European Standard Time)        + 1
+EET   (Eastern European Time)                      + 2
+ART   (Eastern European Time)                      + 2
+EAT   (Eastern African Time)                          + 3
+MET   (Iran Time)                                          + 3.5
+NET   (Armenia Time)                                    + 4
+PLT   (Pakistan Time)                                    + 5
+IST    (India Standard Time)                           + 5.5
+BST   (Bangladesh Time)                               + 6
+VST   (Indochina Time)                                  + 7
+CTT   (China Standard Time)                          + 8
+JST   (Japan Standard Time)                          + 9
+CST   (Central Standard Time)                        + 9.5
+EST   (Eastern Standard Time)                       + 10
+AET   (Eastern Standard Time)                       + 10
+SST   (Solomon Is. Time)                                + 11
+NST   (New Zealand Standard Time)               + 12
+CAT   (Central Alaska Time)                          - 1
+AGT   (Argentina Time)                                 - 3
+BET   (Brazil Time)                                        - 3
+CNT   (Newfoundland Standard Time)             - 3.5
+PRT   (Atlantic Standard Time)                       - 4
+IET   (Eastern Standard Time)                        - 5
+ACT   (Central Standard Time)                       - 6
+PNT   (Mountain Standard Time)                    - 7
+MST   (Mountain Standard Time)                    - 7
+PST   (Pacific Standard Time)                        - 8
+AST   (Alaska Standard Time)                        - 9
+HST   (Hawaii Standard Time)                        - 10
+MIT   (West Saoma Time)                              - 11
+--
+
+Reference: http://www.greenwichmeantime.com
+</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="daylightSavingTime">
+            <description>This attribute states weather daylight saving time is used on this node. It is used to by the management application  and will not change the real time clock on the node.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="hdVolumeCSize">
+            <description>The total size of the C volume on the Cello node in bytes. The C volume may be replicated on several hard disks.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="hdVolumeCFreespace">
+            <description>The number of bytes of free space available on the C volume. The C volume may be replicated on several hard disks in a Cello node.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="nodeUniqueID">
+            <description>This is a unique node identity to be set only in the factory.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="swServerUrlList">
+            <description>A list of URLs of  external server for downloading of software. A comma-separated list or URLs, complete with path and name of property file.
+
+Note: For downloading of software for system upgrade, see attribute ftpServerIpAddress in MO UpdradePackage.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="piuGroupEscalationType">
+            <description>The type of node restart when it is a problem with the last PIU in a PIU group.</description>
+            <dataType>
+                <enumRef name="NodeRestartType">
+                    <defaultValue>WARM_AT_PIU_RESTART</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="syncModeOperation">
+            <description>The sync mode operation of the node. Note that this attribute is only relevant when the node contains CBU board. For all other cases the value shall be set to NOT_USED.</description>
+            <dataType>
+                <enumRef name="SyncMode">
+                    <defaultValue>NOT_USED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <action name="createNtpPrimary">
+            <description>This action creates the primary Network Time Protocol. There can only exist one primary and one secondary ntp.
+
+Once the ntp is created it is possible to change the attributes, i.e ip address, burst flag, max- and min poll and which is the active one.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="ntpServerAddressPrimary">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="ntpMinPollPrimary">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <parameter name="ntpMaxPollPrimary">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <parameter name="ntpBurstFlagPrimary">
+                <in/>
+                <dataType>
+                    <boolean/>
+                </dataType>
+            </parameter>
+            <parameter name="ntpServiceActivePrimary">
+                <in/>
+                <dataType>
+                    <boolean/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="createNtpSecondary">
+            <description>This action creates the secondary/alterative Network Time Protocol. 
+There can only exist one primary and one secondary ntp.
+
+Once the ntp is created it is possible to change the attributes, i.e ip address, burst flag, max- and min poll and which is the active one.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="ntpServerAddressSecondary">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="ntpMinPollSecondary">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <parameter name="ntpMaxPollSecondary">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <parameter name="ntpBurstFlagSecondary">
+                <in/>
+                <dataType>
+                    <boolean/>
+                </dataType>
+            </parameter>
+            <parameter name="ntpServiceActiveSecondary">
+                <in/>
+                <dataType>
+                    <boolean/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="deleteNtpPrimary">
+            <description>This action deletes the primary NTP.
+
+An exception will be thrown if the primary attributes are accessed (set and get).
+
+Note! This action requires a transaction.
+</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="deleteNtpSecondary">
+            <description>This action deletes the secondary NTP.
+
+An exception will be thrown if the secondary attributes are accessed (set and get).
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="addDhcpServerAddress">
+            <description>Takes an array of Ip addresses (Strings), and adds them to the list held by the Dhcp Relay Agent fRO.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="ipAddressArray">
+                <description>Elements are assumed to have the format of a String with 4 fields of numerics, each field separated with a dot. E.g. 123.322.34.123. An empty array or empty string in first element is not allowed. Max 10 elements.</description>
+                <in/>
+                <dataType>
+                    <sequence>
+                        <string/>
+                    </sequence>
+                </dataType>
+            </parameter>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="removeDhcpServerAddress">
+            <description>Takes an array of Ip addresses (Strings), and removes them from the list held by the Dhcp Relay Agent fRO.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="ipAddressArray">
+                <description>Elements are assumed to have the format of a String with 4 fields of numerics, each field separated with a dot. E.g. 123.322.34.123. An empty array or empty string in first element is not allowed. Max 10 elements.</description>
+                <in/>
+                <dataType>
+                    <sequence>
+                        <string/>
+                    </sequence>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="setNodeUniqueId">
+            <description>Used for setting the nodeUniqueId attribute. This method should only be used in the factory, i.e. it is not for general use by the operator.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="nodeUniqueId">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+        </action>
+    </class>
+
+    <class name="SwitchExtensionUnit">
+        <description>This MO represents the Switch Extension Unit, SXU, board. The board may only be inserted in slot 2-27 (in a standard subrack).
+If redundant links are used, two boards must be inserted next to each other.
+The board has a number of switch internal link ports.</description>
+        <attribute name="SwitchExtensionUnitId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>This attribute is used to hold a user friendly name of the object if needed.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeStateSil">
+            <description>The administrative state of switch internal link ports on the switch board.
+The attribute refers to all ports (locking will lock all ports, unlocking will unlock all ports).
+SIL- switch internal link.
+
+</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>unlocked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalStateSil">
+            <description>Operational State for all ports. Operational state is enabled if one of  the eight ports is enabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalStateSync">
+            <description>Operational State for network synchronization distribution</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatusSil">
+            <description>The availability state of switch internal link (sil) ports.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatusSync">
+            <description>The availability state of the sync link.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The attribute is set by the action Reserve.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="SilPorts">
+            <description>The attribute provides a list of port numbers. 
+The port number is between 0-7 and is used to read state of  the switch internal port.
+Se action getSilPortState, getSilOperState and getSilAvailState.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <long/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <action name="getSilPortState">
+            <description>Returns status of the switch internal link port.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <enumRef name="SilPortState">
+                    </enumRef>
+            </returnType>
+            <parameter name="portNr">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="getSilOperState">
+            <description>Returns operational status of the switch internal link port.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <enumRef name="OperState">
+                    </enumRef>
+            </returnType>
+            <parameter name="portNr">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="getSilAvailState">
+            <description>Returns availability status of the switch internal link port.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                    <long/>
+            </returnType>
+            <parameter name="portNr">
+                <in/>
+                <dataType>
+                    <long/>
+                </dataType>
+            </parameter>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+    </class>
+
+    <class name="Aal2PathDistributionUnit">
+        <description>This MO is used to represent an AAL2 Path Distribution Unit. Such a unit handles a set of Aal2PathVccTps that belong to the same Aal2 AP and that are handled by the same Path Resource Handling Program.
+This Path Resource Handling Program is referenced by the rpuId attribute.</description>
+        <attribute name="Aal2PathDistributionUnitId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="rpuId">
+            <description>The physical location of a CPS RC (Common Part Sub-Layer Resource Control) program represented by a reference to a ReliableProgramUniter.
+
+Note that one ReliableProgramUniter MO may only be referenced once under one Aal2Ap. That means all Aal2PathDistributionUnits must reference different ReliableProgramUniter MO's.
+
+Two Aal2PathDistributionUnits under different Aal2Ap's may however reference the same ReliableProgramUniter MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ReliableProgramUniter"/>
+            </dataType>
+        </attribute>
+        <attribute name="aal2PathVccTpList">
+            <description>List of references to Aal2PathVccTp MO:s.
+Note that setting of this attribute removes the current list of Aal2PathVccTp's.
+Each reference must be unique among all paths within all Aal2PathDistributionUnit's belonging to the same Aal2Ap.</description>
+            <dataType>
+                <sequence>
+                    <moRef name="Aal2PathVccTp"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <action name="addPath">
+            <description>This action adds a list of Aal2PathVccTps to an Aal2PathDistributionUnit.
+
+If the data contains a reference to a non existing path, the exception InvalidReference is raised.
+
+If the path list contains a path that has a non-unique aal2PathId value, then the exception Aal2PathIdNotUnique is raised. The pathId value must be unique within all Aal2PathDistributionUnits under the same Aal2Ap.
+
+If the path list contains a path that already belongs to a Aal2PathDistributionUnit, then the exception PathAlreadyRegistered is raised.
+
+Note! Adding one or more Aal2PathVccTps using this action updates the attribute 'Aal2PathVccTpList'.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="aal2PathVccTpId">
+                <in/>
+                <dataType>
+                    <sequence>
+                        <moRef name="Aal2PathVccTp"/>
+                    </sequence>
+                </dataType>
+            </parameter>
+            <raisesException name="InvalidReferenceException"/>
+            <raisesException name="Aal2PathIdNotUniqueException"/>
+            <raisesException name="PathAlreadyRegisteredException"/>
+        </action>
+        <action name="removePath">
+            <description>This action removes a list (sequence) of AAL2 path's from the Aal2PathDistributionUnit.
+
+If the path list contains a path that is not in this Aal2PathDistributionUnit, the exception NotInGroup is raised.
+
+Note! Removing one or more Aal2PathVccTps using this action updates the attribute 'Aal2PathVccTpList'.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="aal2PathList">
+                <in/>
+                <dataType>
+                    <sequence>
+                        <moRef name="Aal2PathVccTp"/>
+                    </sequence>
+                </dataType>
+            </parameter>
+            <raisesException name="NotInGroupException"/>
+        </action>
+    </class>
+
+    <class name="Fan">
+        <description>The Fan is used for cooling the Cello-subrack and is connected to one or two
+SCU (switch core board). This MO is used for controlling and sending alarm from
+the Fan.
+
+Note, either the fan can be supplied by Cello and Fan MO is used, or alternatively the fan can supplied by a source external to Cello and therefore a ManagedObject MO is used to represent the fan.
+
+</description>
+        <attribute name="FanId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>user label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrativeState of Fan MO.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="connectedToScu">
+            <description>A Fan must always be connected to a Switch Core unit that mediates the communication with a main processor.
+
+In this attribute it is possible to see which SwichCoreUnit that the fan is connected to.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="SwitchCoreUnit"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state is set to 'enabled' when the Fan has loaded and started its load module.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="piuType">
+            <description>A reference to an available PiuType at create of a Fan.
+</description>
+            <mandatory/>
+            <dataType>
+                <moRef name="PiuType"/>
+            </dataType>
+        </attribute>
+        <attribute name="controllingState">
+            <description>The application that controls the Fan has three main states:
+- standalone: running on itself, not manageable
+- autonomous: manageable state
+- noiseReduced: temporary state with reduced cooling 
+
+NOTE: This attribute is not supported in CPP 4.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="FanState">
+                    <defaultValue>standalone</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="hdlcAddress">
+            <description>The physical address of the RS-485 communication link.
+Incorrect setting of the address can cause collision with other connected auxiliary units or lost connection. The default value should be suitable for most configurations.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>255</max>
+                    </range>
+                    <defaultValue>7</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving MO. </description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <action name="restartFan">
+            <description>A restart will cause the Fan to be initiated, re-booted and all load modules to be reloaded from persistent memory. This is also known as a forced reload.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="restartCause">
+                <in/>
+                <dataType>
+                    <enumRef name="RestartCause">
+                    </enumRef>
+                </dataType>
+            </parameter>
+            <raisesException name="EquipException"/>
+            <raisesException name="ValueOutOfRangeException"/>
+        </action>
+    </class>
+
+    <class name="Mtp2TpItu">
+        <description>This MO represents a MTP2 Termination Point for the ITU standard, as defined in Recommendation Q.703 07/96.
+
+The performance monitoring counters found in Mtp2Itu MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is a hardware fault, aal1 server/adm restart or node restart.
+
+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard 
+which is NOT the ITU standard.
+
+NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.</description>
+        <attribute name="userLabel">
+            <description>Free tag for marking this managed object.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="Mtp2TpItuId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the MTP2 Signalling Terminal.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="mtp2ProfileItuId">
+            <description>Reference to a Mtp2ProfileItu MO.
+
+Note: The bitRate can not be changed.</description>
+            <mandatory/>
+            <noNotification/>
+            <dataType>
+                <moRef name="Mtp2ProfileItu"/>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfReTransmittedOctets">
+            <description>Number of re-transmitted octets.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfNacks">
+            <description>Number of negative acknowledgements received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuReceivedInError">
+            <description>Number of signal units received in error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfStartedRBCongestion">
+            <description>Number of started local RB congestions.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSendBufferOctets">
+            <description>Number of octets in send buffer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLocalSIBTime">
+            <description>Total time in local  SIB (Sending).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmRemoteSIBTime">
+            <description>Total time in remote SIB (Receiving).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSIOSIFTransmitted">
+            <description>Number of SIO &amp; SIF octets transmitted.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The attribute is set by the list of reserving MO's.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Mtp3bSlItu"/>
+            </dataType>
+        </attribute>
+        <attribute name="ds0BundleId">
+            <description>The Ds0Bundle MO that this MO references.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Ds0Bundle"/>
+            </dataType>
+        </attribute>
+        <attribute name="plugInUnitId">
+            <description>The PlugInUnit MO that this MO references.
+It indicates on which processor the Termination Point will be.
+
+Note: The PlugInUnit must be of type GPB.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="PlugInUnit"/>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSUTransmitted">
+            <description>Number of MSUs transmitted.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSIOSIFReceived">
+            <description>Number of SIO and SIF octets received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSUReceived">
+            <description>Number of MSUs received..</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mtp2TpAnsi">
+        <description>This MO represents a MTP2 Termination Point for the ANSI standard , as defined in T1.111-1996.
+
+The performance monitoring counters found in Mtp2Ansi MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is a hardware fault, aal1 server/adm restart or node restart.
+
+NOTE: This MO cannot in anyway be related (either contained by or dependent on) an MO that belongs to a 
+standard which is NOT the ANSI standard.
+
+NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.</description>
+        <attribute name="userLabel">
+            <description>Free tag for marking this managed object.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="Mtp2TpAnsiId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the MTP2 Signalling Terminal.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="mtp2ProfileAnsiId">
+            <description>Reference to a Mtp2ProfileAnsi MO.
+
+Note: The bitRate can not be changed.</description>
+            <mandatory/>
+            <noNotification/>
+            <dataType>
+                <moRef name="Mtp2ProfileAnsi"/>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfReTransmittedOctets">
+            <description>Number of re-transmitted octets.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfNacks">
+            <description>Number of negative acknowledgements received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuReceivedInError">
+            <description>Number of signal units received in error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfStartedRBCongestion">
+            <description>Number of started local RB congestions.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSendBufferOctets">
+            <description>Number of octets in send buffer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLocalSIBTime">
+            <description>Total time in local  SIB (Sending).
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmRemoteSIBTime">
+            <description>Total time in remote SIB (Receiving).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSIOSIFTransmitted">
+            <description>Number of SIO &amp; SIF octets transmitted.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSUReceived">
+            <description>Number of MSUs received..</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Mtp3bSlAnsi"/>
+            </dataType>
+        </attribute>
+        <attribute name="ds0BundleId">
+            <description>The Ds0Bundle MO that this MO references.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Ds0Bundle"/>
+            </dataType>
+        </attribute>
+        <attribute name="plugInUnitId">
+            <description>The PlugInUnit MO that this MO references.
+It indicates on which processor the Termination Point will be.
+
+Note: The PlugInUnit must be of type GPB.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="PlugInUnit"/>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSUTransmitted">
+            <description>Number of MSUs transmitted.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSIOSIFReceived">
+            <description>Number of SIO and SIF octets received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Ds0Bundle">
+        <description>The Ds0Bundle, Digital Signalling Level 0, MO represents a number of timeslots on a physical port.
+Any of E1PhysPathTerm, J1PhysPathTerm, T1PhysPathTerm, E1Ttp or T1Ttp.
+The Ds0Bundle can be used in three different ways:
+
+- Fractional ATM
+
+Please refer to the AtmPort MO for details. Note that the TdmMode attribute
+must be disabled.
+
+-Circuit emulation
+
+Please refer to Aal1VccTp MO for details.  Note that the TdmMode attribute
+must be disabled. Note that only 4 Ds0Bundle's per port can be configured
+when running circuit emulation.
+
+- TDM Switching
+
+The Ds0Bundle is reserved for switching node internal Ds0 connections. In
+this mode, the tdmMode attribute should be enabled.
+
+
+</description>
+        <attribute name="Ds0BundleId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Free tag for marking this managed object.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availabiltity status of Ds0Bundle.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of Ds0Bundle.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="listOfTimeSlots">
+            <description>The list gives the time slots (within ATM traffic fraction) that are to be allocated to the Ds0Bundle.
+
+When a Ds0Bundle is contained by a E1PhysPathTerm the slots that can be placed in this list are 1 to 31. 
+When a Ds0Bundle is contained by a J1PhysPathTerm then the slots that can be placed in this list are 1 to 24.
+When a Ds0Bundle is contained by a T1PhysPathTerm then the slots that can be placed in this list are 1 to 24.
+When a Ds0Bundle is contained by a E1Ttp the slots that can be placed in this list are 1 to 31. 
+
+Note: the same timeslot cannot appear more than once in the list! If a E1/J/T1PhysPathTerm contains more than 
+one Ds0Bundle, then the Ds0Bundles listOfTimeSlots must be mutually exclusive (i.e. slots in one list cannot be used in another list).
+
+Note! If the Ds0Bundle is used for carrying SS7 traffic, the listOfTimeSlots can only contain 1 (one) time slot.
+In this case that is if the Ds0Bundle is reserved by an Mtp2TpAnsi, Mtp2TpItu or Mtp2TpChina.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <sequence>
+                    <long>
+                        <range>
+                            <min>0</min> <max>31</max>
+                        </range>
+                    </long>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="tdmMode">
+            <description>The state of tdmMode (Time Division Multiplexing), can be disabled/enabled.
+
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <boolean/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Aal1TpVccTp">
+        <description>The Aal1TpVccTp MO represents the Aal1 interworking function in a circuit emulation. The object refers to a Ds0Bundle which represents one end of the circuit emulation, and a VclTp which represents the other end.
+
+Note! The performance monitoring counters in this MO is set to 0 when counterMode is set to PM_MODE_ON.
+In PM_MODE_OFF no information at all is retrived. So any value for pm-monitoring is measured from the time
+of setting counterMode to PM_MODE_ON. 
+At node restart these performance monitoring counters is reset to 0.</description>
+        <attribute name="userLabel">
+            <description>Free tag for marking this managed object.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ds0BundleId">
+            <description>The Ds0Bundle MO that this MO references.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Ds0Bundle"/>
+            </dataType>
+        </attribute>
+        <attribute name="partialFill">
+            <description>Indicates how many bytes are filled in each ATM cell. The value 47 indicates that the partial filled cells is not used, i.e. all the cells are filled completely.
+
+Partial filling of cells in used in circuit emulation. It is used to reduce packetisation delay. Refer to the ATM Forum specifications for more details.
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>23</min> <max>47</max>
+                    </range>
+                    <defaultValue>47</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="cdvt">
+            <description>Specifies the cell delay variation tolerance. Refer to ATM Forum specifications for more details.
+
+Unit is micro seconds.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>100</min> <max>4000</max>
+                    </range>
+                    <defaultValue>1000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of Aal1TpVccTp.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="continuityCheck">
+            <description>Continuitiy checking means that a cell is sent downstream when no user cell has been sent for a period of nominally 1 second.
+
+Activates VC end to end continuityCheck according to ITU.T rec I.610.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="counterMode">
+            <description>Controls the activation of PM counters and F5 PM flow on the VC connection.</description>
+            <dataType>
+                <enumRef name="AtmCounterMode">
+                    <defaultValue>PM_MODE_OFF</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="nomPmBlockSize">
+            <description>Nominal performance monitoring (PM) blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.</description>
+            <dataType>
+                <enumRef name="AtmNomPmBlkSize">
+                    <defaultValue>NOM_PM_BLKSIZE_2_10</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwLostCells">
+            <description>Performance monitoring counter for forwarded lost cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwMissinsCells">
+            <description>Performance monitoring counter for number of forwarded missinserted cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmFwErrBlocks">
+            <description>Performance monitoring counter for number of forwarded errored blocks.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLostFpmCells">
+            <description>Performance monitoring counter for number of lost Forward Performance Monitoring, FPM cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwLostCells">
+            <description>Performance monitoring counter for number of lost backward cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwMissinsCells">
+            <description>Performance monitoring counter for number of backward missinserted cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmBwErrBlocks">
+            <description>Performance monitoring counter for number of backward errored blocks.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmLostBrCells">
+            <description>Performance monitoring counter for number of lost Backward Reporting, BR, cells.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="Aal1TpVccTpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="vclTpId">
+            <description>The VclTp MO that this MO references.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="VclTp"/>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="alarmReport">
+            <description>Attribute to decide what type of alarms to be reported.</description>
+            <dataType>
+                <enumRef name="AlarmReport">
+                    <defaultValue>ALARM_LOC</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mtp3bSpAnsi">
+        <description>Mtp3b Signalling Point for the ANSI standard.
+
+This MO represents/models the MTP3b Signaling Point characteristics/functions according to the Ansi standard. 
+A signaling point is a logical node in the signaling network. The combination of signaling points and their interconnecting 
+signaling links form the SS No. 7 signaling network. The signaling point represented by this object is a Local Signaling Point.
+
+The performance monitoring counters found in Mtp3SpAnsi MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).
+
+NOTE: IT IS NOT POSSIBLE TO CREATE SIGNALLING POINTS OF DIFFERENT STANDARDS!
+
+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the ANSI standard.
+
+NOTE: The combination of network indicator (networkInd) and Signalling Point Code (signallingPointCode) has to be unique for each Signalling Point.
+
+NOTE: A maximum of 15 instances of this MO can be created on (referencing) the same PlugInUnit.
+
+NOTE: The maximum number of Signalling Points that can be created in a CPP based node is 24.
+
+NOTE: Deleting a singel L3 Signal Point is not possible, if it necessary to delete a Signal Point then all Signal Points has to be deleted. This also has to be done whitin the same transaction. 
+
+NOTE: Any object created under a certain SP (Signaling Point) cannot refer to an object created under another SP. Nor can it refer to an object created under another SP.</description>
+        <attribute name="Mtp3bSpAnsiId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="rpuId">
+            <description>Holds a reference to the Reliable Program Uniter. 
+The RPU is at the server.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ReliableProgramUniter"/>
+            </dataType>
+        </attribute>
+        <attribute name="networkInd">
+            <description>The network indicator, NI, is used for discrimination of messages between functionally different networks.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="Mtp3bNetworkInd">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="signallingPointCode">
+            <description>The signallingPointCode (Local Point Code) attribute (SPC) is used together with the network indicator (NI, networkInd attribute) to uniquely identify the MTP Signalling Point, SP.
+SP = NI-SPC.
+Size (2 exp 24)-1 (16777215). 
+The SignallingPointCode (SPC) is normally grouped together as three numbers wich correspond to network identifier, network cluster, network cluster member. The three numbers are coded as 8-8-8 bits in the total SPC. To enter the SPC-value, you have to convert the 3 numbers to their binary code and then convert the whole 24-bit  patterna as an integer. Sometimes the SPC is used as a whole uniqe number (no internal structure).
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>16777215</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="testPatternSltm">
+            <description>The testPatternSltm attribute represents a string testpattern in the Signalling Link Test Message.
+
+Minimum string length 2 characters, maximum 30 characters. Allowed characters are 0-9, A-F.
+Only even number of characters is allowed.</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>2</min> <max>30</max>
+                    </lengthRange>
+                    <defaultValue>"A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5"</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="nodeBehaviour">
+            <description>The nodeBehaviour attribute represents the MTP3b node type.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="NodeBehaviourType">
+                    <defaultValue>SEP</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="maxSizeReroutBuf">
+            <description>The maxSizeReroutBuf attribute represents the maximum size (in kB) of the rerouting buffer.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>5000</max>
+                    </range>
+                    <defaultValue>2000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxSizeChangeBuf">
+            <description>The maxSizeChangeBuf attribute represents the maximum size (in kB) of the changeover buffer.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>5000</max>
+                    </range>
+                    <defaultValue>2000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="transFrHandler">
+            <description>Determines how a TransFer Restricted signal (TFR) should be treated.
+</description>
+            <dataType>
+                <enumRef name="Mtp3bTfrHandling">
+                    <defaultValue>IGNORED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="sioSpare">
+            <description>The sioSpare2 attribute determines if the two spare bits in the SIO (Service Information Octet) should be treated as spare.</description>
+            <dataType>
+                <enumRef name="Mtp3bSioSpareBitsUse">
+                    <defaultValue>PRIO</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="m3uaNoOfAttempsOfDauds">
+            <description>For M3UA, number of attempts to send the DAUD message.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>5</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="noOfAttempsOfAssociationEstablishment">
+            <description>Number of attempts to send the SCTP_ASSOCIATE_REQ message.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>65535</max>
+                    </range>
+                    <defaultValue>4</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="statusIndInterval">
+            <description>The statusIndInterval attribute sets the interval for sending MTP-STATUS indication, i.e. send indication every Nth message .</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                    <defaultValue>4</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="resendTfcInterval">
+            <description>Send TFC back to originating signalling point code for every n:th message when 
+the destination is congested. Set to 0 will suppress sending of TFC.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                    <defaultValue>8</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="sendSltmBefLink">
+            <description>The sendSltmBefLink attribute determines if the SLTM (Signalling Link Test Message) should be sent and a SLTA received before the link is considered to be in service.
+
+Note! It is not recommended nor is it in accordance with standard to set the value of this attribute to 'false' </description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="spPriority">
+            <description>Struct containing the ANSI priority attributes.
+</description>
+            <dataType>
+                <structRef name="Mtp3bSpAnsiPriorityData"/>
+            </dataType>
+        </attribute>
+        <attribute name="noOfCongestLevelForNI">
+            <description>Defines the number of congestion levels for NI.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>3</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="routeSetCongestTestFlag">
+            <description>Selection of which procedure to use during congestion handling if the national option with priorities is used.
+
+0, use TcTimer as described by the TTC standard.
+1, use Route Set Congestion Test as described by the ANSI, ITU and China Standard.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>1</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operationalState attribute reflects the operational status of the MTP3b SP.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="spTimer">
+            <description>Struct containing ANSI specific timer data.</description>
+            <dataType>
+                <structRef name="Mtp3bSpAnsiTimerData"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Holds a list of the reserving MO's. Can be of type SccpSp.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfForcedRerouteSuccessPerf">
+            <description>Performance monitoring counter for number of successfully performed forced rerouting.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfControlledRerouteSuccessPerf">
+            <description>Performance monitoring counter for number of successfully performed controlled rerouting.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfEmergencyChangeOverRec">
+            <description>Performance management counter for number of received emergency changeOver orders (ECO) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfChangeOverRec">
+            <description>Performance counter for number of changeOver order messages (COO/XCO) received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfChangeBackDeclRec">
+            <description>Performance management counter for number of received change Back Declarations (CBD) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSLTAFirstTimeOutRec">
+            <description>Performance management counter for number of SLTA first time out received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSLTASecondTimeOutRec">
+            <description>Performance management counter for number of SLTA second time out received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUPMsgDiscardedDueToRoutingErr">
+            <description>Performance monitoring counter for number of UP (user part) messages (MTP_TRANSFER_req) discarded due to routing error.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOAXCASent">
+            <description>Performance management counter for number of sent COA/XCA messages.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECOSent">
+            <description>Performance management counter for number of sent ECO messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECASent">
+            <description>Performance management counter for number of sent ECA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOAXCARec">
+            <description>Performance management counter for number of  received COA/XCA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBARec">
+            <description>Performance management counter for number of received CBA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECARec">
+            <description>Performance management counter for number of received ECA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTRARec">
+            <description>Performance management counter for number of received TRA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTRASent">
+            <description>Performance management counter for number of sent TRA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTimerT21WasStarted">
+            <description>Performance monitoring counter for number of times the timer T21 was started (i.e. how many times the remote inhibit test message has been sent).
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBASent">
+            <description>Performance management counter for number of sent CBA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessForcedRerouting">
+            <description>Performance monitoring counter for number of unsuccessfully performed forced reroutings.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessControlledRerouting">
+            <description>Performance monitoring counter for number of unsuccessfully performed controlled reroutings.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuccessAssocEstablish">
+            <description>Performance management counter for number of successful association establishment.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessAssocEstablish">
+            <description>Performance management counter for number of unsuccessful association establishment.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpCommunicationErr">
+            <description>Performance management counter for number of SCTP communication error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpSendFailure">
+            <description>Performance management counter for number of SCTP send failure.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpBufOverflow">
+            <description>Performance management counter for number of SCTP stop sending data.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpResumeSending">
+            <description>Performance management counter for number of SCTP resume sending data.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpNetworkStatusChange">
+            <description>Performance management counter for number of SCTP network status change.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpAssociationRestart">
+            <description>Performance management counter for number of SCTP association restart.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuccessAssocAbort">
+            <description>The number of successful abortions of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuccessAssocShutDown">
+            <description>The number of succesful shutdowns of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessAssocAbort">
+            <description>The number of unsuccessful abortions of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessAssocShutDown">
+            <description>The number of unsuccesful shutdowns of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIncomingAssocEstabRequestInStateDownWhenStateEstabIsBlocked">
+            <description>The number of incoming request for association establishment when state on the association is 'DOWN' and  establishment of associations is blocked. </description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMaxTrialsForAssocEstabReached">
+            <description>The number of times that the max limit for trying to establish an association has been reached.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMaxTrialsForAssocActivReached">
+            <description>The number of times that the max limit for trying to activate an association has been reached.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLowerPrioMsgDiscarded">
+            <description>The number of messages with low priority that has been discarded.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mtp3bSpItu">
+        <description>Mtp3b Signalling Point for the ITU standard.
+
+This MO represents/models the MTP3b Signaling Point characteristics/functions according to the ITU standard. 
+A signaling point is a logical node in the signaling network. The combination of signaling points and their interconnecting 
+signaling links form the SS No. 7 signaling network. The signaling point represented by this object is a Local Signaling Point.
+
+The performance monitoring counters found in Mtp3SpItu MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).
+
+NOTE: IT IS NOT POSSIBLE TO CREATE SIGNALLING POINTS OF DIFFERENT STANDARDS!
+
+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the ITU standard.
+
+NOTE: The combination of network indicator (networkInd) and Signalling Point Code (signallingPointCode) has to be unique for each Signalling Point.
+
+NOTE: A maximum of 15 instances of this MO can be created on (referencing) the same PlugInUnit.
+
+NOTE: The maximum number of Signalling Points that can be created in a CPP based node is 24.
+
+NOTE: Deleting a singel L3 Signal Point is not possible, if it necessary to delete a Signal Point then all Signal Points has to be deleted. This also has to be done whitin the same transaction.
+
+NOTE: Any object created under a certain SP (Signaling Point) cannot refer to an object created under another SP. Nor can it refer to an object created under another SP.
+
+NOTE: The value of the attribute 'version' is valid for all SPs (Mtp3bSpItu MOs) and the value of the last created or changed SP will be used for all SPs.</description>
+        <attribute name="Mtp3bSpItuId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="networkInd">
+            <description>The networkInd attribute (NI) is used by signalling message handling functions in MTP3b 
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="Mtp3bNetworkInd">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="signallingPointCode">
+            <description>The signallingPointCode (Local Point Code) attribute (SPC) is used together with the network indicator (NI, networkInd attribute) to uniquely identify the MTP Signalling Point, SP.
+SP = NI-SPC.
+Size (2 exp 14)-1 (16383).
+The SignallingPointCode (SPC) is normally used as a whole unique number (no internal structure). But sometimes the SPC is grouped together as three numbers which corresponds to zone, area/network, signalling point. If this is the case the three numbers are coded as 3-8-3 bits in the total SPC. To enter the SPC-value then you have to convert the three numbers to their binary code and then convert the whole 14-bit pattern as an integer.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>16383</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="version">
+            <description>This attribute shows what MTP3b ITU standard the system follows. With ITU, it is possible using this attribute to set which of the ITU standard versions that shall be followed.
+
+Note! Setting of another value than 'ITU_T_07_96' at create will have no effect. The Signaling Point will always be created with the value 'ITU_T_07_96'.
+
+Note! It is not possible to hav signaling points with different versions in the node so setting of this attribute will effect all signaling points. The value for the last created or changed signaling point will be used for all signaling points.</description>
+            <dataType>
+                <enumRef name="Mtp3bItuVersion">
+                    <defaultValue>ITU_T_07_96</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="nodeBehaviour">
+            <description>The nodeBehaviour attribute represents the MTP3b node type.
+
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="NodeBehaviourType">
+                    <defaultValue>SEP</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="noOfCongestLevelForNI">
+            <description>Defines the number of congestion levels for NI.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>3</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="routeSetCongestTestFlag">
+            <description>Selection of which procedure to use during congestion handling if the national option with priorities is used.
+
+0, use TcTimer as described by the TTC standard.
+1, use Route Set Congestion Test as described by the ANSI, ITU and China Standard.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>1</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="resendTfcInterval">
+            <description>Send TFC back to originating signalling point code for every n:th message when 
+the destination is congested. Set to 0 will suppress sending of TFC.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                    <defaultValue>8</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxSizeReroutBuf">
+            <description>The maxSizeReroutBuf attribute represents the maximum size (in kB) of the rerouting buffer.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>5000</max>
+                    </range>
+                    <defaultValue>2000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxSizeChangeBuf">
+            <description>The maxSizeChangeBuf attribute represents the maximum size (in kB) of the changeover buffer.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>5000</max>
+                    </range>
+                    <defaultValue>2000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="transFrHandler">
+            <description>Determines if a TransFer Restricted signal (TFR) should be treated as a TFA (TransFer Allowed signal) or be ignored.
+</description>
+            <dataType>
+                <enumRef name="Mtp3bTfrHandling">
+                    <defaultValue>IGNORED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="sioSpare">
+            <description>The sioSpare2 attribute determines if the two spare bits in the SIO (Service Information Octet) should be treated as spare.</description>
+            <dataType>
+                <enumRef name="Mtp3bSioSpareBitsUse">
+                    <defaultValue>PRIO</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="statusIndInterval">
+            <description>The statusIndInterval attribute sets the interval for sending MTP-STATUS indication, i.e. send indication every Nth message .</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                    <defaultValue>4</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="sendSltmBefLink">
+            <description>The sendSltmBefLink attribute determines if the SLTM (Signalling Link Test Message) should be sent and a SLTA received before the link is considered to be in service.
+
+Note! It is not recommended nor is it in accordance with standard to set the value of this attribute to 'false' </description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="testPatternSltm">
+            <description>The testPatternSltm attribute represents a string testpattern in the Signalling Link Test Message.
+
+Minimum string length 2 characters, maximum 30 characters. Allowed characters are 0-9, A-F.
+Only even number of characters is allowed.
+
+</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>2</min> <max>30</max>
+                    </lengthRange>
+                    <defaultValue>"A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5"</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="spPriority">
+            <description>Struct containing the priority attributes.
+</description>
+            <dataType>
+                <structRef name="Mtp3bSpItuPriorityData"/>
+            </dataType>
+        </attribute>
+        <attribute name="spTimer">
+            <description>Struct containing ITU specific timer attributes</description>
+            <dataType>
+                <structRef name="Mtp3bSpItuTimerData"/>
+            </dataType>
+        </attribute>
+        <attribute name="rpuId">
+            <description>Holds a reference to the Reliable Program Uniter.
+The RPU is at the server.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ReliableProgramUniter"/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operationalState attribute reflects the operational status of the MTP3b SP.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="m3uaNoOfAttempsOfDauds">
+            <description>For M3UA, number of attempts to send the DAUD message.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>5</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="noOfAttempsOfAssociationEstablishment">
+            <description>Number of attempts to send the SCTP_ASSOCIATE_REQ message.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>65535</max>
+                    </range>
+                    <defaultValue>4</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Holds a list of the reserving MO's. Can be of type SccpSp.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfForcedRerouteSuccessPerf">
+            <description>Performance monitoring counter for number of successfully performed forced rerouting.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfControlledRerouteSuccessPerf">
+            <description>Performance monitoring counter for number of successfully performed controlled rerouting.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfEmergencyChangeOverRec">
+            <description>Performance management counter for number of received emergency changeOver orders (ECO) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfChangeOverRec">
+            <description>Performance counter for number of changeOver order messages (COO/XCO) received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfChangeBackDeclRec">
+            <description>Performance management counter for number of received change Back Declarations (CBD) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSLTAFirstTimeOutRec">
+            <description>Performance management counter for number of SLTA first time out received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSLTASecondTimeOutRec">
+            <description>Performance management counter for number of SLTA second time out received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUPMsgDiscardedDueToRoutingErr">
+            <description>Performance monitoring counter for number of UP (user part) messages (MTP_TRANSFER_req) discarded due to routing error.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOAXCASent">
+            <description>Performance management counter for number of sent COA/XCA messages.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECOSent">
+            <description>Performance management counter for number of sent ECO messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECASent">
+            <description>Performance management counter for number of sent ECA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOAXCARec">
+            <description>Performance management counter for number of  received COA/XCA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBARec">
+            <description>Performance management counter for number of received CBA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECARec">
+            <description>Performance management counter for number of received ECA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTRARec">
+            <description>Performance management counter for number of received TRA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTRASent">
+            <description>Performance management counter for number of sent TRA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTimerT21WasStarted">
+            <description>Performance monitoring counter for number of times the timer T21 was started (i.e. adjacent SP restarted).
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBASent">
+            <description>Performance management counter for number of sent CBA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessForcedRerouting">
+            <description>Performance monitoring counter for number of unsuccessfully performed forced reroutings.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessControlledRerouting">
+            <description>Performance monitoring counter for number of unsuccessfully performed controlled reroutings.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuccessAssocEstablish">
+            <description>Performance management counter for number of successful association establishment.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessAssocEstablish">
+            <description>Performance management counter for number of unsuccessful association establishment.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpCommunicationErr">
+            <description>Performance management counter for number of SCTP communication error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpSendFailure">
+            <description>Performance management counter for number of SCTP send failure.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpBufOverflow">
+            <description>Performance management counter for number of SCTP stop sending data.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpResumeSending">
+            <description>Performance management counter for number of SCTP resume sending data.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpNetworkStatusChange">
+            <description>Performance management counter for number of SCTP network status change.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpAssociationRestart">
+            <description>Performance management counter for number of SCTP association restart.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuccessAssocAbort">
+            <description>The number of successful abortions of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuccessAssocShutDown">
+            <description>The number of succesful shutdowns of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessAssocAbort">
+            <description>The number of unsuccessful abortions of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessAssocShutDown">
+            <description>The number of unsuccesful shutdowns of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIncomingAssocEstabRequestInStateDownWhenStateEstabIsBlocked">
+            <description>The number of incoming request for association establishment when state on the association is 'DOWN' and  establishment of associations is blocked. </description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMaxTrialsForAssocEstabReached">
+            <description>The number of times that the max limit for trying to establish an association has been reached.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMaxTrialsForAssocActivReached">
+            <description>The number of times that the max limit for trying to activate an association has been reached.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLowerPrioMsgDiscarded">
+            <description>The number of messages with low priority that has been discarded.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mtp3bSpTtc">
+        <description>Mtp3b Signalling Point for the TTC standard.
+
+This MO represents/models the MTP3b Signaling Point characteristics/functions according to the TTC standard. 
+A signaling point is a logical node in the signaling network. The combination of signaling points and their interconnecting 
+signaling links form the SS No. 7 signaling network. The signaling point represented by this object is a Local Signaling Point.
+
+The performance monitoring counters found in Mtp3SpTtc MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).
+
+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a 
+standard which is NOT the TTC standard.
+
+NOTE: IT IS NOT POSSIBLE TO CREATE SIGNALLING POINTS OF DIFFERENT STANDARDS!
+
+NOTE: The combination of network indicator (networkInd) and Signalling Point Code (signallingPointCode) has to be unique for each Signalling Point.
+
+NOTE: A maximum of 15 instances of this MO can be created on (referencing) the same PlugInUnit.
+
+NOTE: The maximum number of Signalling Points that can be created in a CPP based node is 24.
+
+NOTE: Deleting a singel L3 Signal Point is not possible, if it necessary to delete a Signal Point then all Signal Points has to be deleted. This also has to be done whitin the same transaction.
+
+NOTE: Any object created under a certain SP (Signaling Point) cannot refer to an object created under another SP. Nor can it refer to an object created under another SP.</description>
+        <attribute name="Mtp3bSpTtcId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="networkInd">
+            <description>The networkInd attribute (NI) is used by signalling message handling functions in MTP3b.
+ 
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="Mtp3bNetworkIndTtc">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="signallingPointCode">
+            <description>The signallingPointCode (Local Point Code) attribute (SPC) is used together with the network indicator (NI, networkInd attribute) to uniquely identify the MTP Signalling Point, SP.
+SP = NI-SPC.
+Size (2 exp 16)-1 (65535).
+The SignallingPointCode (SPC) is always used as a whole unique number (no internal structure).</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="nodeBehaviour">
+            <description>The nodeBehaviour attribute represents the MTP3b node type.
+
+Note! Only SEP and STP is supported for the Ttc standard.
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="NodeBehaviourType">
+                    <defaultValue>SEP</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="routeSetCongestTestFlag">
+            <description>Selection of which procedure to use during congestion handling if the national option with priorities is used.
+
+0, use TcTimer as described by the TTC standard.
+1, use Route Set Congestion Test as described by the ANSI, ITU and China Standard.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>1</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="resendTfcInterval">
+            <description>Send TFC back to originating signalling point code for every n:th message when 
+the destination is congested. Set to 0 will suppress sending of TFC.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                    <defaultValue>8</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxSizeReroutBuf">
+            <description>The maxSizeReroutBuf attribute represents the maximum size (in kB) of the rerouting buffer.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>5000</max>
+                    </range>
+                    <defaultValue>2000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxSizeChangeBuf">
+            <description>The maxSizeChangeBuf attribute represents the maximum size (in kB) of the changeover buffer.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>5000</max>
+                    </range>
+                    <defaultValue>2000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="statusIndInterval">
+            <description>The statusIndInterval attribute sets the interval for sending MTP-STATUS indication, i.e. send indication every Nth message .</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                    <defaultValue>4</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="testPatternSltm">
+            <description>The testPatternSltm attribute represents a string testpattern in the Signalling Link Test Message.
+
+String length 4 characters. Allowed characters are 0-9, A-F.
+
+</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>4</min> <max>4</max>
+                    </lengthRange>
+                    <defaultValue>"7711"</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="spPriority">
+            <description>Struct containing the TTC priority attributes.
+</description>
+            <dataType>
+                <structRef name="Mtp3bSpTtcPriorityData"/>
+            </dataType>
+        </attribute>
+        <attribute name="rpuId">
+            <description>Holds a reference to the Reliable Program Uniter.
+The RPU is at the server.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ReliableProgramUniter"/>
+            </dataType>
+        </attribute>
+        <attribute name="spTimer">
+            <description>Struct containing TTC timer attributes.</description>
+            <noNotification/>
+            <dataType>
+                <structRef name="Mtp3bSpTtcTimerData"/>
+            </dataType>
+        </attribute>
+        <attribute name="noOfCongestLevelForNI">
+            <description>Defines the number of congestion levels for NI.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>3</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operationalState attribute reflects the operational status of the MTP3b SP.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Holds a list of the reserving MO's. Can be of type SccpSp.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfForcedRerouteSuccessPerf">
+            <description>Performance monitoring counter for number of successfully performed forced rerouting.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfControlledRerouteSuccessPerf">
+            <description>Performance monitoring counter for number of successfully performed controlled rerouting.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfEmergencyChangeOverRec">
+            <description>Performance management counter for number of received emergency changeOver orders (ECO) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfChangeOverRec">
+            <description>Performance counter for number of changeOver order messages (COO/XCO) received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfChangeBackDeclRec">
+            <description>Performance management counter for number of received change Back Declarations (CBD) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSLTAFirstTimeOutRec">
+            <description>Performance management counter for number of SLTA first time out received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSLTASecondTimeOutRec">
+            <description>Performance management counter for number of SLTA second time out received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUPMsgDiscardedDueToRoutingErr">
+            <description>Performance monitoring counter for number of UP (user part) messages (MTP_TRANSFER_req) discarded due to routing error.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOAXCASent">
+            <description>Performance management counter for number of sent COA/XCA messages.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECOSent">
+            <description>Performance management counter for number of sent ECO messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECASent">
+            <description>Performance management counter for number of sent ECA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOAXCARec">
+            <description>Performance management counter for number of received COA/XCA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBARec">
+            <description>Performance management counter for number of received CBA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECARec">
+            <description>Performance management counter for number of received ECA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTRARec">
+            <description>Performance management counter for number of received TRA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTRASent">
+            <description>Performance management counter for number of sent TRA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBASent">
+            <description>Performance management counter for number of sent CBA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessForcedRerouting">
+            <description>Performance monitoring counter for number of unsuccessfully performed forced reroutings.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessControlledRerouting">
+            <description>Performance monitoring counter for number of unsuccessfully performed controlled reroutings.
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuccessAssocEstablish">
+            <description>Performance management counter for number of successful association establishment.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessAssocEstablish">
+            <description>Performance management counter for number of unsuccessful association establishment.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpCommunicationErr">
+            <description>Performance management counter for number of SCTP communication error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpSendFailure">
+            <description>Performance management counter for number of SCTP send failure.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpBufOverflow">
+            <description>Performance management counter for number of SCTP stop sending data.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpResumeSending">
+            <description>Performance management counter for number of SCTP resume sending data.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpNetworkStatusChange">
+            <description>Performance management counter for number of SCTP network status change.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpAssociationRestart">
+            <description>Performance management counter for number of SCTP association restart.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mtp3bSlAnsi">
+        <description>This MO represents  an MTP3b Signalling Link for the ANSI standard. It represents the termination of the signalling link within the signalling point as defined in T1.111-1996.
+
+The total amount of links between any two specific nodes in the network shall not be more than 80 independent on how many linksets that are defined between the two nodes. The signalLinkCode for a link must be unique between the nodes, independent on which linkSet the link belongs to. A maximum of five linksets with a maximum of 16 links in each linkset can be configured. A maximum of 16 links between two adjacent nodes can be configured.
+
+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the ANSI standard.
+
+The performance monitoring counters found in Mtp3SlAnsi MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).</description>
+        <attribute name="Mtp3bSlAnsiId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>This attribute reflects the operational status of the Mtp3bSlAnsi.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="tpId">
+            <description>The tpId attribute points out the termination point of the lower layer protocol.
+
+For narrowband this signalling link will be connected to an MTP L2 termination point (Mtp2Tp MO). And for broadband it will be connected to a NNI SAAL termination point (NniSaalTp Mo).</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="linkState">
+            <description>The link state of the Mtp3bSlAnsi.
+
+The link state is a bit map which contains a combination of the following values: (in hexadecimal format)
+
+0x00 Available
+0x01 Failed 
+0x02 Remotely blocked
+0x04 Locally blocked
+0x08 Remotely inhibited
+0x10 Locally inhibited
+0x20 Deactivated</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="usageState">
+            <description>There are three possible states for the usageState attribute:
+
+- idle, the Mtp3bSl carries no traffic.
+- active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.
+- busy, the Mtp3bSl is working but is congested (traffic is routed on other links).
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bUsageState">
+                    <defaultValue>IDLE</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="signLinkCode">
+            <description>The signalling link code, SLC, used for this link.
+The signLinkCode for a link must be unique between the nodes,
+independent on in which linkSet the link belongs.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>15</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="proceduralState">
+            <description>The procedural state of the link.
+
+0 - not initialized
+1 - initialized
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bProceduralState">
+                    <defaultValue>NOT_INITIALIZED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="linkCongestLevel">
+            <description>The congestion level of the link.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="CongestLevel">
+                    <defaultValue>level_0</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="autoStartLink">
+            <description>Controls if the Mtp3bSL should be activated at create.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAALINServiceInd">
+            <description>Performance management counter for number of received link-in-service indications.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAALOUTInd">
+            <description>Performance management counter for number of received link-out-of-service indications.
+
+Note! This counter is incremented every time a link out of service indication is received for the link.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOOXCOSent">
+            <description>Performance management counter for number of sent change over order (COO/XCO) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBDSent">
+            <description>Performance management counter for number of sent CBD messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLocalLinkCongestRec">
+            <description>Performance monitoring counter for number of local link congestion primitives received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLocalLinkCongestCeaseRec">
+            <description>Performance monitoring counter for number of local link congestion ceased primitives received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSURec">
+            <description>Performance monitoring counter for number of received MSU's on this signalling link.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSUSent">
+            <description>Performance monitoring counter for number of sent MSU's on this signalling link.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <action name="deactivate">
+            <description>This action deactivates the signalling link.
+ It will also set autoStartLink = false.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="activate">
+            <description>This action activates the signalling link with normal alignment. It will also set autoStartLink = true.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="emergencyActivate">
+            <description>This action activates the signalling link with emergency alignment.
+ It will also set autoStartLink = true
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="localInhibit">
+            <description>This action inhibits the Mtp3bSlAnsi. Signalling link management inhibiting is requested by management when it becomes necessary, e.g for maintenance or testing purposes to make or keep a signalling link unavailable to User Part-generated signalling traffic.
+Inhibiting of a signalling link may be requested by management function at either end of the link. The request is granted, provided that the inhibiting action does not cause any previously accessible destinations to become inaccessible at either end of the signalling link. The request may also be refused under certain circumstances such as congestion.
+Exception FroRequestFailed if it was not possible to inhibit.
+
+Note! This action requires a transaction.
+</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="localUninhibit">
+            <description>This action uninhibits the Mtp3bSlAnsi.
+
+Exception FrorequestFailed if it was not possible to uninhibit.
+
+Note! This action requires a transaction.
+</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+    </class>
+
+    <class name="Mtp3bSlItu">
+        <description>This MO represents  an MTP3b Signalling Link for the ITU standard. It represents the termination of the signalling link within the signalling point as defined in Q.704 and Q.2210 (07/96).
+
+The total amount of links between any two specific nodes in the network shall not be more than 16, independent on how many linksets that are defined between the two nodes. The signalLinkCode for a link must be unique between the nodes, independent on which linkSet the link belongs to. 
+
+The performance monitoring counters found in Mtp3SlItu MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).
+
+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the ITU standard.</description>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="tpId">
+            <description>The tpId attribute points out the termination point of the lower layer protocol.
+
+For narrowband this signalling link will be connected to an MTP L2 termination point (Mtp2Tp MO). And for broadband it will be connected to a NNI SAAL termination point (NniSaalTp Mo).</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>This attribute reflects the operational status of the Mtp3bSl.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="linkState">
+            <description>The link state of the Mtp3bSl.
+
+The link state is a bit map which contains a combination of the following values: (in hexadecimal format)
+
+0x00 Available
+0x01 Failed 
+0x02 Remotely blocked
+0x04 Locally blocked
+0x08 Remotely inhibited
+0x10 Locally inhibited
+0x20 Deactivated</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="usageState">
+            <description>There are three possible states for the usageState attribute:
+
+- idle, the Mtp3bSl carries no traffic.
+- active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.
+- busy, the Mtp3bSl is working but is congested (traffic is routed on other links).
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bUsageState">
+                    <defaultValue>IDLE</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="signLinkCode">
+            <description>The signalling link code, SLC, used for this link.
+The signLinkCode for a link must be unique between the nodes,
+independent on in which linkSet the link belongs.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>15</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="proceduralState">
+            <description>The procedural state of the link.
+
+0 - not initialized
+1 - initialized
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bProceduralState">
+                    <defaultValue>NOT_INITIALIZED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="linkCongestLevel">
+            <description>The congestion level of the link.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="CongestLevel">
+                    <defaultValue>level_0</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="autoStartLink">
+            <description>Controls if the Mtp3b Signalling Link should be activated at create.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="prioBeforeSio">
+            <description>This Boolean tells if the message priority shall be inserted in an octet before the Service Indicator Octet (SIO).
+
+ITU default is false.
+</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAALINServiceInd">
+            <description>Performance management counter for number of received link-in-service indications.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAALOUTInd">
+            <description>Performance management counter for number of received link-out-of-service indications.
+
+Note! This counter is incremented every time a link out of service indication is received for the link.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOOXCOSent">
+            <description>Performance management counter for number of sent change over order (COO/XCO) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBDSent">
+            <description>Performance management counter for number of sent CBD messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLocalLinkCongestRec">
+            <description>Performance monitoring counter for number of local link congestion primitives received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLocalLinkCongestCeaseRec">
+            <description>Performance monitoring counter for number of local link congestion ceased primitives received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSURec">
+            <description>Performance monitoring counter for number of received MSU's on this signalling link.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSUSent">
+            <description>Performance monitoring counter for number of sent MSU's on this signalling link.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="Mtp3bSlItuId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="localInhibit">
+            <description>This action inhibits the Mtp3bSlItu. Signalling link management inhibiting is requested by management when it becomes necessary, e.g for maintenance or testing purposes to make or keep a signalling link unavailable to User Part-generated signalling traffic.
+Inhibiting of a signalling link may be requested by management function at either end of the link. The request is granted, provided that the inhibiting action does not cause any previously accessible destinations to become inaccessible at either end of the signalling link. The request may also be refused under certain circumstances such as congestion.
+Exception FroRequestFailed if it was not possible to inhibit.
+
+Note! This action requires a transaction.
+</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="localUninhibit">
+            <description>This action uninhibits the Mtp3bSlItu.
+
+Exception FrorequestFailed if it was not possible to uninhibit.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="deactivate">
+            <description>This action deactivates the Mtp3bSl.
+It will also set autoStartLink = false.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="activate">
+            <description>This action activates the Mtp3bSl with normal alignment. It will also set autoStartLink = true.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="emergencyActivate">
+            <description>This action activates the Mtp3bSl with emergency alignment.
+It will also set autoStartLink = true
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+    </class>
+
+    <class name="Mtp3bSlTtc">
+        <description>This MO represents  an MTP3b Signalling Link for the TTC standard. It represents the termination of the signalling link within the signalling point as defined in JT-Q.704 Ver. 3, April 28 1992 and JT-Q.2210 Ver.1 April 24 1996.
+
+The total amount of links between any two specific nodes in the network shall not be more than 16, independent on how many linksets that are defined between the two nodes. The signalLinkCode for a link must be unique between the nodes, independent on which linkSet the link belongs to. 
+
+The performance monitoring counters found in Mtp3SlTtc MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).
+
+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the TTC standard.</description>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="tpId">
+            <description>The tpId attribute points out the termination point of the lower layer protocol. Only BroadBand is supported for TTC. The MO will be connected to a NNI SAAL termination point (NniSaalTp Mo).</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>This attribute reflects the operational status of the Mtp3bSl.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="linkState">
+            <description>The link state of the Mtp3bSl.
+
+The link state is a bit map which contains a combination of the following values: (in hexadecimal format)
+
+0x00 Available
+0x01 Failed 
+0x02 Remotely blocked
+0x04 Locally blocked
+0x08 Remotely inhibited
+0x10 Locally inhibited
+0x20 Deactivated</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="usageState">
+            <description>There are three possible states for the usageState attribute:
+
+- idle, the Mtp3bSl carries no traffic.
+- active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.
+- busy, the Mtp3bSl is working but is congested (traffic is routed on other links).
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bUsageState">
+                    <defaultValue>IDLE</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="signLinkCode">
+            <description>The signalling link code, SLC, used for this link.
+The code have to be uniqe in this signal link set, i.e the signallingLinkCode for 
+all the Mtp3bSl that belongs to the same Mtp3bSls must be unique(mutual exclusive). </description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>15</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="proceduralState">
+            <description>The procedural state of the link.
+
+0 - not initialized
+1 - initialized
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bProceduralState">
+                    <defaultValue>NOT_INITIALIZED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="linkCongestLevel">
+            <description>The congestion level of the link.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="CongestLevel">
+                    <defaultValue>level_0</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="autoStartLink">
+            <description>Controls if the Mtp3b Signalling Link should be activated at create.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="prioBeforeSio">
+            <description>This Boolean tells if the message priority shall be inserted in an octet before the Service Indicator Octet (SIO).
+
+</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAALINServiceInd">
+            <description>Performance management counter for number of received link-in-service indications.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAALOUTInd">
+            <description>Performance management counter for number of received link-out-of-service indications.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOOXCOSent">
+            <description>Performance management counter for number of sent change over order (COO/XCO) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBDSent">
+            <description>Performance management counter for number of sent CBD messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLocalLinkCongestRec">
+            <description>Performance monitoring counter for number of local link congestion primitives received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLocalLinkCongestCeaseRec">
+            <description>Performance monitoring counter for number of local link congestion ceased primitives received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSURec">
+            <description>Performance monitoring counter for number of received MSU's on this signalling link.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSUSent">
+            <description>Performance monitoring counter for number of sent MSU's on this signalling link.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="Mtp3bSlTtcId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <action name="deactivate">
+            <description>This action deactivates the Mtp3bSl.
+It will also set autoStartLink = false.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+            <raisesException name="FroNotAccessibleException"/>
+        </action>
+        <action name="activate">
+            <description>This action activates the signalling link with normal alignment. It will also set autoStartLink = true.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+            <raisesException name="FroNotAccessibleException"/>
+        </action>
+        <action name="emergencyActivate">
+            <description>This action activates the signalling link with emergency alignment.
+It will also set autoStartLink = true
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+            <raisesException name="FroNotAccessibleException"/>
+        </action>
+    </class>
+
+    <class name="Mtp2ProfileAnsi">
+        <description>The MTP 2 Profile MO represents and keeps attribute values used by one or more MTP 2 ANSI termination point MOs.</description>
+        <attribute name="userLabel">
+            <description>This MOs user label.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="Mtp2ProfileAnsiId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="profileData">
+            <description>Struct containing profile data.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="Mtp2ProfileDataAnsi"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of Mtp2TpAnsi MOs that have reserved this Mtp2TpProfileAnsi MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="Mtp2TpAnsi"/>
+                </sequence>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mtp2ProfileItu">
+        <description>The MTP 2 Profile MO represents and keeps attribute values used by one or more MTP 2 ITU termination point MOs.</description>
+        <attribute name="userLabel">
+            <description>The MOs user label.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="Mtp2ProfileItuId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="profileData">
+            <description>Struct containing profile data.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="Mtp2ProfileDataItu"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of Mtp2TpItu MOs that have reserved this Mtp2TpProfileItu MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="Mtp2TpItu"/>
+                </sequence>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="E1Ttp">
+        <description>This MO represents a channelised E1 interface in the node. The E1Ttp (Trail Termination Point) MO
+does not define which type of traffic (TDM or ATM) that the interface should support. Please refer to 
+the Ds0Bundle, AtmPort, IMALink and IMAGroup objects for details about configuration of traffic type.
+
+The performance monitoring counters in the E1Ttp MO is set to 0 (zero) at start or restart of the node.
+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.
+
+Note! This MO is automatically created as a consequence of creating an Os155SpiTtpMo
+Please refer to the Os155SpiTtpMo for more details.
+
+</description>
+        <systemCreated/>
+        <attribute name="degDegThr">
+            <description>The threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.
+
+This is a percentage value.
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100</max>
+                    </range>
+                    <defaultValue>30</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="degDegM">
+            <description>How many bad seconds in a row that causes a Degraded Signal alarm.
+
+
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>2</min> <max>10</max>
+                    </range>
+                    <defaultValue>7</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="aisReporting">
+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="rdiReporting">
+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="crc4Mode">
+            <description>Indicates what Cyclical Redundancy Check 4 Mode that is being used.</description>
+            <dataType>
+                <enumRef name="Crc4Mode">
+                    <defaultValue>AUTOMATIC</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="idlePattern">
+            <description>The idle pattern.
+
+NOTE: Going from A_LAW or U_LAW to UNDEFINED is always allowed but setting up one ET board with 
+both U_LAW and A_LAW is not allowed.
+E.g. If you want to change from A_LAW to U_LAW on one ET board you have to change idlePattern
+on each physical port belonging to the board to UNDEFINED first.
+A_LAW -&gt; UNDEFINED -&gt; U_LAW or U_LAW -&gt; UNDEFINED -&gt; A_LAW</description>
+            <dataType>
+                <enumRef name="IdlePattern">
+                    <defaultValue>UNDEFINED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmEs">
+            <description>Performance monitoring counter of Errored Seconds (ES).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSes">
+            <description>Performance monitoring counter for Severely Errored Seconds.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="E1TtpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identityof the reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="AtmPort"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedByImaLink">
+            <description>The identity of the reserving ImaLink MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ImaLink"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Vc4Ttp">
+        <description>This MO is automatically created as a consequence of creating an Os155SpiTtp object if any of the following conditions are true:
+a) standardmode = ETSI or
+b) standardmode = TTC and muxmode = VC4_STS3CSPE_LEVEL.
+
+It represents the termination of the SDH VC-4 path layer. The VC-4 can either be used for channelised access, in which case VC-12 MOs are created as children to the Vc4Ttp MO, or be used to carry ATM traffic, in which case there is a relationship between the AtmPort MO and the Vc4Ttp MO.
+
+Note! The performance monitoring counters in the Vc4TtpMO is set to 0 (zero) at start or restart of the node.
+When the value is to large to fit in to a long (31bit) the counter turns over and starts from 0 again.
+</description>
+        <systemCreated/>
+        <attribute name="pathTraceFormat">
+            <description>Indicates the format of the expectedPathtrace and transmittedPathtrace attributes. The format may be in 16 or 64 characters. Usually 16 is used for ETSI and 64 for ANSI/TTC.
+
+ITU_T_G707=16
+GR_253_CORE=64
+
+Note that the 16 characters format requires the operator to specify 15 characters where no character contains the null character (the 16th character is added automatically).
+
+Note that the 64 characters format requires the operator to specify 62 ASCII characters all different from null followed by CR/LF.</description>
+            <dataType>
+                <enumRef name="PathTraceFormat">
+                    <defaultValue>ITU_T_G707</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="transmittedPathTrace">
+            <description>The transmitted path trace. 
+Can be defined in two formats. The format may be in 16 or 64 characters. Usually 16 is used for ETSI and 64 for ANSI/TTC.
+
+Note: The string must be of 15 or 62 characters length, or empty string ("").
+
+</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>64</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="expectedPathTrace">
+            <description>Expected path trace. 
+
+The string can be of 15 or 62 characters length, or empty string ("").
+
+Note: An empty string for this attribute means that the detection of Trace Identifier Mismatch (TIM) should be disabled. This attribute is set to empty string every time attribute pathTraceFormat is set.
+
+</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>64</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="timConsequentAction">
+            <description>Trace Identifier Mismatch (TIM) consequent action, i.e. for generation of Alarm Indication Signal (AIS) downstream and Remote Defect Indication (RDI) upstream as a consequence of the TIM detection. 
+
+True - enabled.
+False - disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="vcDegThreshold">
+            <description>This threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.
+
+The attribute value is in unit of % (percent).</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100</max>
+                    </range>
+                    <defaultValue>30</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="vcDegM">
+            <description>Indicates how many bad seconds in a row that causes a Degraded Signal alarm.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>2</min> <max>10</max>
+                    </range>
+                    <defaultValue>7</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="auAisReporting">
+            <description>AU AIS reporting.
+
+True - enable reporting.
+False - disable reporting.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="vcRdiReporting">
+            <description>VC RDI reporting.
+
+True - enable reporting.
+False - disable reporting.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmVcEs">
+            <description>Performance monitoring counter for Virtual Container 4, VC4, Errored Seconds, ES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmVcSes">
+            <description>Performance monitoring counter for Virtual Container 4, VC4, Severely Errored Seconds, SES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="Vc4TtpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="AtmPort"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Os155SpiTtp">
+        <description>This MO represents the physical interface and the termination of the SDH Regenerator and Multiplexer Section Layers.
+
+When creating the Os155SpiTtp a number of additional objects will be created. Depending on the values of standardmode and muxmode different objects will be created as described below:
+
+muxmode = standby
+standardmode =  ETSI, TTC, ANSI
+No objects under the Os155SpiTtp is created.
+
+muxmode = VC4_STS3CSPE_LEVEL
+standardmode =  ETSI, TTC
+A Vc4 MO is created under the Os155SpiTtp MO.
+
+muxmode = VC4_STS3CSPE_LEVEL
+standardmode =  ANSI
+A Sts3CspeTtp MO is created under the Os155SpiTtp MO.
+
+The following two configurations is only applicable for the ET-MC41 board.
+
+muxmode = E1_J1_T1_LEVEL
+standardmode =  ETSI
+A Vc4 MO, 63 Vc12Ttp MO's and 63 E1Ttp MO's is created under the Os155SpiTtp MO
+
+muxmode = E1_J1_T1_LEVEL
+standardmode =  ANSI
+3 Sts1CspeTtp MO's, 3*28 Vt15Ttp MO's and 3*28 TiTtp MO's is created under the Os155SpiTtp MO.
+
+The performance monitoring counters in the Os155SpiTtp MO is set to 0 (zero) at start or restart of the node.
+When the value is too large too fit in to a long (31bit) the counter turns over and starts from 0 again.
+
+Note! If the Os155SpiTtp is configured as part of an Mspg protection group and is configured as standby, muxMode set to standby, no children's to this MO will be created.</description>
+        <attribute name="Os155SpiTtpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="lineNo">
+            <description>The actual line number. 
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>2</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="standardMode">
+            <description>The standard that this MO is operating to.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="StandardMode">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="shutDownTimeout">
+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.
+
+Value in seconds, must be a positive value.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100000</max>
+                    </range>
+                    <defaultValue>1800</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="muxMode">
+            <description>The level at which the STM-1/OC3 signal is demultiplexed.
+
+If parent is of type Etmc41, the valid muxMode is STANDBY or E1_J1_T1_LEVEL.
+If parent is of type Etm4, the valid muxMode is STANDBY or VC4_STS3CSPE_LEVEL.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="MuxMode">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="msDegThreshold">
+            <description>MS - multiplexer section.
+
+The threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.
+
+This is a percentage value. 
+
+Note: When operating to the ANSI standard, this attribute has no meaning.
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100</max>
+                    </range>
+                    <defaultValue>30</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="msDegM">
+            <description>MS - multiplexer section. 
+
+How many bad seconds in a row that causes a Degraded Signal alarm.
+
+Note: When operating to the ANSI standard, this attribute has no meaning.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>2</min> <max>10</max>
+                    </range>
+                    <defaultValue>7</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="msRdiReporting">
+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="msAisReporting">
+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="loopBack">
+            <description>Enables or disables line loopback, i.e. the received signal is returned in the transmitted direction.
+
+none - This is the normal state, no loop back is performed (and ordinary traffic is running).
+
+line - The physical path is looped on the line side, the external incoming path is looped back to the external outgoing path.
+
+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>
+            <dataType>
+                <enumRef name="Os155LoopBack">
+                    <defaultValue>NONE</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmMsEs">
+            <description>Performance monitoring counter for Multiplexer Section, MS, Errored Seconds, ES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmMsSes">
+            <description>Performance monitoring counter for Multiplexer Section, MS, Severely Errored Seconds, SES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBySync">
+            <description>The identity of the reserving Synchronization MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Synchronization"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Vc12Ttp">
+        <description>This MO is automatically created when the configuring the Os155SpiTtp. It represents the termination of the SDH VC-12  path layer. 
+
+Note: This MO is only valid when the ETSI standard is in use.
+
+The performance monitoring counters in the Vc12TtpMO is set to 0 (zero) at start or restart of the node.
+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.</description>
+        <systemCreated/>
+        <attribute name="Vc12TtpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="transmittedPathTrace">
+            <description>The transmitted path trace. 
+
+Note: when 16 byte tracing is used, only 15 bytes should be used in the set action for this attribute. 
+
+
+</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>64</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="expectedPathTrace">
+            <description>Expected path trace. 
+
+Note: when 16 byte tracing is used, only 15 bytes should be used in the set action for this attribute. 
+
+Note: An empty string for this attribute means that the detection of Trace Identifier Mismatch (TIM) should be disabled. 
+</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>64</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="timConsequentAction">
+            <description>Trace Identifier Mismatch (TIM) consequent action, i.e. for generation of Alarm Indication Signal (AIS) downstream and Remote Defect Indication (RDI) upstream as a consequence of the TIM detection. 
+
+True - enabled.
+False - disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="vcDegThreshold">
+            <description>This threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.
+
+The attribute value is in unit of % (percent).</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100</max>
+                    </range>
+                    <defaultValue>30</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="vcDegM">
+            <description>Indicates how many bad seconds in a row that causes a Degraded Signal alarm.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>2</min> <max>10</max>
+                    </range>
+                    <defaultValue>7</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tuAisReporting">
+            <description>Timing Unit Alarm Indication Signal (TU AIS) reporting.  
+
+True - enable reporting.
+False - disable reporting.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="vcRdiReporting">
+            <description>VC RDI reporting.
+
+True - enable reporting.
+False - disable reporting.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmVcEs">
+            <description>Performance monitoring counter for Virtual Container 12, VC12, Errored Seconds, ES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmVcSes">
+            <description>Performance monitoring counter for Virtual Container 12, VC12, Severely Errored Seconds, SES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="shutDownTimeout">
+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.
+
+Value in seconds, must be a positive value.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100000</max>
+                    </range>
+                    <defaultValue>1800</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Etmc1">
+        <description>This MO represents the hardware of the ET-MC1 board type. It only represents the ET specific hardware, the DBM module of the board is represented by the PlugInUnit MO.
+
+The ET-MC1 board contains 8 phyiscal ports that can be configured as either E1 (ETSI), J1 (TTC)  or T1(ANSI). The board does not allow for a mix of E1, J1 and T1 ports, thus all configured ports on the board must be configured to the same standard.
+
+Each port on the ET-MC1 board can be used to carry either ATM traffic or circuit orientated (Nx64 Kbits/s connections) traffic.
+
+Each port can support up to 30 ATM VC connections. Two of these connections  are reserved for AAL2 paths, and therefore two AAL2 multiplexers per port are available.
+
+Each port can support up to 2 VP connections. 
+
+The ET-MC1 port supports one bidirectional F4/F5 PM flow per port.
+
+At the VP/VC endpoints, the Lost FPM/BR cells counters are not available.
+
+Note! The ETMC1 supports IMA.
+
+For more details on restrictions please refer to 155 17-21/CSX 101 09 Uen.
+
+Note! When the Etmc1 is part of the Cbu it is only possible to configure 4 physical ports of type E1, J1 or T1 on the Etmc1 board.</description>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Enabled or disabled according to the actual operational state of the ETMC1 board.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="Etmc1Id">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Etmc41">
+        <description>This MO represents the hardware of the ET-MC41 board type. It only represents the ET specific hardware, while the DBM module of the board is represented by the PlugInUnit MO.
+
+The ET-MC41 board contains a 155 Mbits/s physical optical port. The board can be configured as a E1 channelised board providing 63 logical E1 interfaces.
+
+Each E1 logical channel on the ET-MC41 can be used to carry either ATM traffic or circuit oriented (Nx64 kbit/s) traffic.
+
+Each E1 logical channel can support up to 30 ATM VC connections. Two of these connections are reserved for aal2 paths, and therefore two AAL2 multiplexers per E1/DS1/J1 channel  are available.
+
+Each E1/DS1/J1 channel can suport up to 2 VP connections.
+
+The ET-MC41 board support one biderectional F4/F5 PM flow per E1 channel.
+
+Note! The ETMC41 supports IMA. However the E1 ports being part of the same IMA group can not be selected randomly.
+
+Note! The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 1 / port
+
+For more details on restrictions please refer to 155 17-21/CSX 101 09 Uen.</description>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Enabled or disabled according to the actual operational state of the ET-MC41 board.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="Etmc41Id">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mtp2ProfileChina">
+        <description>The MTP2 Profile MO represents and keeps attribute values used by one or more MTP2 China termination point MOs.</description>
+        <attribute name="Mtp2ProfileChinaId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="profileData">
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="Mtp2ProfileDataChina"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of Mtp2TpChina MOs that have reserved this Mtp2TpProfileChina MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="Mtp2TpChina"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>The MOs user label.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mtp2TpChina">
+        <description>This MO represents a MTP 2 termination point for the China standard, as defined in GF001-9001, plus supplement 1-3.
+
+The performance monitoring counters found in Mtp2China MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is a hardware fault, aal1 server/adm restart or node restart.
+
+NOTE: This MO cannot in anyway be related (either contained by or dependent on) an MO that belongs to a standard 
+which is NOT the China standard.
+
+NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.
+
+</description>
+        <attribute name="ds0BundleId">
+            <description>The Ds0Bundle MO that this MO references.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Ds0Bundle"/>
+            </dataType>
+        </attribute>
+        <attribute name="mtp2ProfileChinaId">
+            <description>Reference to a Mtp2ProfileChina MO.
+
+Note: The bitRate can not be changed.</description>
+            <mandatory/>
+            <noNotification/>
+            <dataType>
+                <moRef name="Mtp2ProfileChina"/>
+            </dataType>
+        </attribute>
+        <attribute name="Mtp2TpChinaId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the MTP2 Signalling Terminal.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmLocalSIBTime">
+            <description>Total time in local  SIB (Sending).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSUTransmitted">
+            <description>Number of MSUs transmitted.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfNacks">
+            <description>Number of negative acknowledgements received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuReceivedInError">
+            <description>Number of signal units received in error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfReTransmittedOctets">
+            <description>Number of re-transmitted octets.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSendBufferOctets">
+            <description>Number of octets in send buffer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSIOSIFReceived">
+            <description>Number of SIO and SIF octets received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSIOSIFTransmitted">
+            <description>Number of SIO &amp; SIF octets transmitted.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfStartedRBCongestion">
+            <description>Number of started local RB congestions.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmRemoteSIBTime">
+            <description>Total time in remote SIB (Receiving).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Mtp3bSlChina"/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Free tag for marking this managed object.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="plugInUnitId">
+            <description>The PlugInUnit  MO that this MO references.
+It indicates on which processor the Termination Point will be.
+
+Note: The PlugInUnit must be of type GPB.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="PlugInUnit"/>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSUReceived">
+            <description>Number of MSUs received..</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mtp3bSlChina">
+        <description>This MO represents  an MTP3b Signalling Link for the China standard. It represents the termination of the signalling link within the signalling point as defined in GF001-9001, plus supplement 1-3.
+
+The total amount of links between any two specific nodes in the network shall not be more than 16, independent on how many linksets that are defined between the two nodes. The signalLinkCode for a link must be unique between the nodes, independent on which linkSet the link belongs to. 
+
+The performance monitoring counters found in Mtp3SlChina MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).
+
+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard that is NOT the China standard.</description>
+        <attribute name="Mtp3bSlChinaId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>This attribute reflects the operational status of the Mtp3bSl.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="autoStartLink">
+            <description>Controls if the Mtp3b Signalling Link should be activated at create.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="linkCongestLevel">
+            <description>The congestion level of the link.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="CongestLevel">
+                    <defaultValue>level_0</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="linkState">
+            <description>The link state of the Mtp3bSl.
+
+The link state is a bit map which contains a combination of the following values: (in hexadecimal format)
+
+0x00 Available
+0x01 Failed 
+0x02 Remotely blocked
+0x04 Locally blocked
+0x08 Remotely inhibited
+0x10 Locally inhibited
+0x20 Deactivated</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="prioBeforeSio">
+            <description>This Boolean tells if the message priority shall be inserted in an octet before the Service Indicator Octet (SIO).
+
+China default is false.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="proceduralState">
+            <description>The procedural state of the link.
+
+0 - not initialized
+1 - initialized
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bProceduralState">
+                    <defaultValue>NOT_INITIALIZED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="signLinkCode">
+            <description>The signalling link code, SLC, used for this link.
+The signLinkCode for a link must be unique between the nodes,
+independent on in which linkSet the link belongs.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>15</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tpId">
+            <description>The tpId attribute points out the termination point of the lower layer protocol. 
+
+For narrowband this signalling link will be connected to an MTP L2 termination point (Mtp2Tp MO). And for broadband it will be connected to a NNI SAAL termination point (NniSaalTp Mo).</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="usageState">
+            <description>There are three possible states for the usageState attribute:
+
+- idle, the Mtp3bSl carries no traffic.
+- active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.
+- busy, the Mtp3bSl is working but is congested (traffic is routed on other links).
+
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bUsageState">
+                    <defaultValue>IDLE</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAALINServiceInd">
+            <description>Performance management counter for number of received link-in-service indications.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAALOUTInd">
+            <description>Performance management counter for number of received link-out-of-service indications.
+
+Note! This counter is incremented every time a link out of service indication is received for the link.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBDSent">
+            <description>Performance management counter for number of sent CBD messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOOXCOSent">
+            <description>Performance management counter for number of sent change over order (COO/XCO) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLocalLinkCongestCeaseRec">
+            <description>Performance monitoring counter for number of local link congestion ceased primitives received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLocalLinkCongestRec">
+            <description>Performance monitoring counter for number of local link congestion primitives received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSURec">
+            <description>Performance monitoring counter for number of received MSU's on this signalling link.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMSUSent">
+            <description>Performance monitoring counter for number of sent MSU's on this signalling link.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <action name="activate">
+            <description>This action activates the Mtp3bSl with normal alignment. It will also set autoStartLink = true.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="deactivate">
+            <description>This action deactivates the Mtp3bSl.
+It will also set autoStartLink = false.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="emergencyActivate">
+            <description>This action activates the Mtp3bSl with emergency alignment.
+It will also set autoStartLink = true
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="localInhibit">
+            <description>This action inhibits the Mtp3bSlChina. Signalling link management inhibiting is requested by management when it becomes necessary, e.g for maintenance or testing purposes to make or keep a signalling link unavailable to User Part-generated signalling traffic.
+Inhibiting of a signalling link may be requested by management function at either end of the link. The request is granted, provided that the inhibiting action does not cause any previously accessible destinations to become inaccessible at either end of the signalling link. The request may also be refused under certain circumstances such as congestion.
+Exception FroRequestFailed if it was not possible to inhibit.
+
+Note! This action requires a transaction.
+</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+        <action name="localUninhibit">
+            <description>This action uninhibits the Mtp3bSlItu.
+
+Exception FrorequestFailed if it was not possible to uninhibit.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FroRequestFailedException"/>
+        </action>
+    </class>
+
+    <class name="Mtp3bSpChina">
+        <description>Mtp3b Signalling Point for the China standard.
+
+This MO represents/models the MTP3b Signaling Point characteristics/functions according to the China standard. 
+A signaling point is a logical node in the signaling network. The combination of signaling points and their interconnecting 
+signaling links form the SS No. 7 signaling network. The signaling point represented by this object is a Local Signaling Point.
+
+The performance monitoring counters found in Mtp3SpChina MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).
+
+NOTE: IT IS NOT POSSIBLE TO CREATE SIGNALLING POINTS OF DIFFERENT STANDARDS!
+
+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the China standard.
+
+NOTE: The combination of network indicator (networkInd) and Signalling Point Code (signallingPointCode) has to be unique for each Signalling Point.
+
+NOTE: A maximum of 15 instances of this MO can be created on (referencing) the same PlugInUnit.
+
+NOTE: The maximum number of Signalling Points that can be created in a CPP based node is 24.
+
+NOTE: Deleting a singel L3 Signal Point is not possible, if it necessary to delete a Signal Point then all Signal Points has to be deleted. This also has to be done whitin the same transaction. 
+
+NOTE: Any object created under a certain SP (Signaling Point) cannot refer to an object created under another SP. Nor can it refer to an object created under another SP.</description>
+        <attribute name="Mtp3bSpChinaId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="maxSizeChangeBuf">
+            <description>The maxSizeChangeBuf attribute represents the maximum size (in kB) of the changeover buffer.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>5000</max>
+                    </range>
+                    <defaultValue>2000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxSizeReroutBuf">
+            <description>The maxSizeReroutBuf attribute represents the maximum size (in kB) of the rerouting buffer.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>5000</max>
+                    </range>
+                    <defaultValue>2000</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="networkInd">
+            <description>The network indicator, NI, is used for discrimination of messages between functionally different networks.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="Mtp3bNetworkInd">
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operationalState attribute reflects the operational status of the MTP3b SP.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Holds a list of the reserving MO's. Can be of type SccpSp.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="sendSltmBefLink">
+            <description>The sendSltmBefLink attribute determines if the SLTM (Signalling Link Test Message) should be sent and a SLTA received before the link is considered to be in service.
+
+Note! It is not recommended nor is it in accordance with standard to set the value of this attribute to 'false' </description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="signallingPointCode">
+            <description>The signallingPointCode (Local Point Code) attribute (SPC) is used together with the network indicator (NI, networkInd attribute) to uniquely identify the MTP Signalling Point, SP.
+SP = NI-SPC.
+Size (2 exp 24)-1 (16777215).
+The SignallingPointCode (SPC) is nornally used as a whole unique number (no internal structure). But sometimes the SPC is grouped together as three numbers which corresponds to zone, area/network, signalling point. If this is the case the three numbers are coded as 8-8-8 bits in the total SPC. To enter the SPC-value then you have to convert the three numbers to their binary code and then convert the whole 24-bit pattern as an integer.
+ </description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>16777215</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="nodeBehaviour">
+            <description>The nodeBehaviour attribute represents the MTP3b node type.
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="NodeBehaviourType">
+                    <defaultValue>SEP</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="noOfCongestLevelForNI">
+            <description>Defines the number of congestion levels for NI.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>3</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="routeSetCongestTestFlag">
+            <description>Selection of which procedure to use during congestion handling if the national option with priorities is used.
+
+0, use TcTimer as described by the TTC standard.
+1, use Route Set Congestion Test as described by the ANSI, ITU and China Standard.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>1</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="resendTfcInterval">
+            <description>Send TFC back to originating signalling point code for every n:th message when 
+the destination is congested. Set to 0 will suppress sending of TFC.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                    <defaultValue>8</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="sioSpare">
+            <description>The sioSpare attribute determines if the two spare bits in the SIO (Service Information Octet) should be treated as spare.</description>
+            <dataType>
+                <enumRef name="Mtp3bSioSpareBitsUse">
+                    <defaultValue>SPARE</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="spPriority">
+            <description>Struct containing the priority attributes.
+
+Note: The China and ITU priorityData is identical so the ItuPriorityData is used for China to avoid duplication of data.</description>
+            <dataType>
+                <structRef name="Mtp3bSpChinaPriorityData"/>
+            </dataType>
+        </attribute>
+        <attribute name="spTimer">
+            <description>Struct containing China specific timer attributes</description>
+            <dataType>
+                <structRef name="Mtp3bSpChinaTimerData"/>
+            </dataType>
+        </attribute>
+        <attribute name="statusIndInterval">
+            <description>The statusIndInterval attribute sets the interval for sending MTP-STATUS indication, i.e. send indication every Nth message .</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                    <defaultValue>4</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="testPatternSltm">
+            <description>The testPatternSltm attribute represents a string testpattern in the Signalling Link Test Message.
+
+Minimum string length 2 characters, maximum 30 characters. Allowed characters are 0-9, A-F.
+Only even number of characters is allowed.
+
+</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>2</min> <max>30</max>
+                    </lengthRange>
+                    <defaultValue>"A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5"</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="transFrHandler">
+            <description>Determines if a TransFer Restricted signal (TFR) should be treated as a TFA (TransFer Allowed signal) or be ignored.
+</description>
+            <dataType>
+                <enumRef name="Mtp3bTfrHandling">
+                    <defaultValue>IGNORED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="rpuId">
+            <description>Holds a reference to the Reliable Program Uniter.
+The RPU is at the server.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ReliableProgramUniter"/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="m3uaNoOfAttempsOfDauds">
+            <description>For M3UA, number of attempts to send the DAUD message.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>5</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="noOfAttempsOfAssociationEstablishment">
+            <description>Number of attempts to send the SCTP_ASSOCIATE_REQ message.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>65535</max>
+                    </range>
+                    <defaultValue>4</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="version">
+            <description>This attribute shows what MTP3b ITU standard the system follows. With ITU, it is possible using this attribute to set which of the ITU standard versions that shall be followed.
+
+Note! Setting of another value than 'ITU_T_07_96' at create will have no effect. The Signaling Point will always be created with the value 'ITU_T_07_96'.
+
+Note! It is not possible to hav signaling points with different versions in the node so setting of this attribute will effect all signaling points. The value for the last created or changed signaling point will be used for all signaling points.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="Mtp3bItuVersion">
+                    <defaultValue>ITU_T_07_96</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBARec">
+            <description>Performance management counter for number of received CBA messages.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCBASent">
+            <description>Performance management counter for number of sent CBA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfChangeBackDeclRec">
+            <description>Performance management counter for number of received change Back Declarations (CBD) messages.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfChangeOverRec">
+            <description>Performance counter for number of changeOver order messages (COO/XCO) received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOAXCARec">
+            <description>Performance management counter for number of  received COA/XCA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCOAXCASent">
+            <description>Performance management counter for number of sent COA/XCA messages.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfControlledRerouteSuccessPerf">
+            <description>Performance monitoring counter for number of successfully performed controlled rerouting.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECASent">
+            <description>Performance management counter for number of sent ECA messages.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECARec">
+            <description>Performance management counter for number of received ECA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfECOSent">
+            <description>Performance management counter for number of sent ECO messages.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfEmergencyChangeOverRec">
+            <description>Performance management counter for number of received emergency changeOver orders (ECO) messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfForcedRerouteSuccessPerf">
+            <description>Performance monitoring counter for number of successfully performed forced rerouting.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSLTAFirstTimeOutRec">
+            <description>Performance management counter for number of SLTA first time out received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSLTASecondTimeOutRec">
+            <description>Performance management counter for number of SLTA second time out received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTimerT21WasStarted">
+            <description>Performance monitoring counter for number of times the timer T21 was started (i.e. adjacent SP restarted).
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTRARec">
+            <description>Performance management counter for number of received TRA messages.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfTRASent">
+            <description>Performance management counter for number of sent TRA messages.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessControlledRerouting">
+            <description>Performance monitoring counter for number of unsuccessfully performed controlled reroutings.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessForcedRerouting">
+            <description>Performance monitoring counter for number of unsuccessfully performed forced reroutings.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUPMsgDiscardedDueToRoutingErr">
+            <description>Performance monitoring counter for number of UP (user part) messages (MTP_TRANSFER_req) discarded due to routing error.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuccessAssocEstablish">
+            <description>Performance management counter for number of successful association establishment.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessAssocEstablish">
+            <description>Performance management counter for number of unsuccessful association establishment.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpCommunicationErr">
+            <description>Performance management counter for number of SCTP communication error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpSendFailure">
+            <description>Performance management counter for number of SCTP send failure.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpBufOverflow">
+            <description>Performance management counter for number of SCTP stop sending data.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpResumeSending">
+            <description>Performance management counter for number of SCTP resume sending data.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpNetworkStatusChange">
+            <description>Performance management counter for number of SCTP network status change.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSctpAssociationRestart">
+            <description>Performance management counter for number of SCTP association restart.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuccessAssocAbort">
+            <description>The number of successful abortions of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSuccessAssocShutDown">
+            <description>The number of succesful shutdowns of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessAssocAbort">
+            <description>The number of unsuccessful abortions of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfUnsuccessAssocShutDown">
+            <description>The number of unsuccesful shutdowns of signalling associations.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIncomingAssocEstabRequestInStateDownWhenStateEstabIsBlocked">
+            <description>The number of incoming request for association establishment when state on the association is 'DOWN' and  establishment of associations is blocked. </description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMaxTrialsForAssocEstabReached">
+            <description>The number of times that the max limit for trying to establish an association has been reached.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMaxTrialsForAssocActivReached">
+            <description>The number of times that the max limit for trying to activate an association has been reached.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfLowerPrioMsgDiscarded">
+            <description>The number of messages with low priority that has been discarded.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Mspg">
+        <description>The MSPG (Multiplex Section Protection Group) object enables two different protection mechanism in Cello. First it enables a standard 1+1 MSP mechanism. A failure on the working line will thus cause a sub 50 ms switch to the standby line.
+Secondly the MSPG is used to enable equipment protection, whereas a failure of the working board will cause a switch to the standby board. While executing an equipment protection switch, the node on the other end of the multiplexer section, will experience a standard 1+1 MSP switch.
+   
+It is possible to force traffic to one port/board by using administrative state.
+Setting administrative state to locked on the working board, will automatically cause an equipment switch to the standby board. Similarily setting administrative state to locked on the working port, will cause an MSP switch to the standby port.
+
+The process of configuring a MSP protection interface is as follows:
+1) Create the working interface as normal.
+2) Create the standby interface by creating an Os155SpiTtp with mux mode set to STANDBY (standby for protection).
+3) Create a MSPG object with references to the two Os155SpiTtp objects.
+
+Note! The ports selected for MSPG must be have the attribute standardMode configured in exactly the same way.
+
+Note! The Os155SpiTtp created for standby will not create any children, i.e no Vc4Ttp or Vc4Ttp, Vc12Ttp and E1Ttp will be created. Nor will object of type Sts1SpeTtp, Vt15Ttp or T1Ttp be created.</description>
+        <attribute name="os155SpiWorkingId">
+            <description>The working OS155 pyhiscal path termination.
+This is the administrative value.
+
+To retrive the Id of the current working port, use the selectedPort.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Os155SpiTtp"/>
+            </dataType>
+        </attribute>
+        <attribute name="os155SpiStandbyId">
+            <description>The standby OS155 physical path termination.
+This is the administrative value.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Os155SpiTtp"/>
+            </dataType>
+        </attribute>
+        <attribute name="switchMode">
+            <description>The switching mode.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="SwitchModes">
+                    <defaultValue>AUTOMATIC</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the Mspg.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="MspgId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="selectedPort">
+            <description>The port currently selected by the MSPG. The selected port can only
+change due to a MSP or equipment switch.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Os155SpiTtp"/>
+            </dataType>
+        </attribute>
+        <attribute name="selectedBoard">
+            <description>The board currently providing the user traffic interface to the Cello switch.
+The only action that can change the selected board is an equipment switch.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="degCauseMsp">
+            <description>If set to true, then a swith is performed upon detection of DEG.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <action name="manualMspSwitch">
+            <description>Initiates a switch when there does not exist a defect. 
+
+This action can fail for the following reasons:
+FailedResource  - the switch was not possible due to a traffic affecting fault on the port to which the switch was requested (i.e. the one not currently selected).
+LockedResource - the port to which the switch is intended is administratively locked.
+UnknownReason - there exists another fault that prevents the action.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <raisesException name="FailedResourceException"/>
+            <raisesException name="LockedResourceException"/>
+            <raisesException name="UnknownReasonException"/>
+        </action>
+    </class>
+
+    <class name="T1PhysPathTerm">
+        <description>This MO represents an T1 (i.e. 1.5 Mbit/s) physical interface in the node. The T1PhysPathTerm MO does not define which type of traffic (TDM or ATM) that the interface should support. 
+Please refer to the Ds0Bundle, AtmPort, IMALink and IMAGroup objects for details about configuration of traffic type.
+
+</description>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="T1PhysPathTermId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="lineNo">
+            <description>The actual Line number on the board.
+</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>8</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="loopback">
+            <description>Possible values
+
+none - This is the normal state, no loop back is performed (and ordinary traffic is running).
+
+line - The physical path is looped on the line side, the external incoming path is looped back to the external outgoing path.
+
+system - The physical path is looped on the system side, the (node-) internal incoming path is looped back to the internal outgoing path.
+
+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>
+            <dataType>
+                <enumRef name="LoopbackState">
+                    <defaultValue>none</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmEs">
+            <description>Performance monitoring counter for Errored Seconds, ES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSes">
+            <description>Performance monitoring counter for Severly Errored Seconds, SES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedByTraffic">
+            <description>The identity of the reserving AtmPort MO. </description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="AtmPort"/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Enabled or disabled according to the actual operational state of the Physical Line Termination. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="rdiReporting">
+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="aisReporting">
+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="shutDownTimeout">
+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.
+
+Value in seconds, must be a positive value.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100000</max>
+                    </range>
+                    <defaultValue>1800</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="idlePattern">
+            <description>The idle pattern.
+
+NOTE: Going from A_LAW or U_LAW to UNDEFINED is always allowed but setting up one ET board with 
+both U_LAW and A_LAW is not allowed.
+E.g. If you want to change from A_LAW to U_LAW on one ET board you have to change idlePattern
+on each physical port belonging to the board to UNDEFINED first.
+A_LAW -&gt; UNDEFINED -&gt; U_LAW or U_LAW -&gt; UNDEFINED -&gt; A_LAW</description>
+            <dataType>
+                <enumRef name="IdlePattern">
+                    <defaultValue>UNDEFINED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="transmissionMode">
+            <description>The type of transmission media.
+Refer to the TransmissionMode enumeration for details.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="TransmissionMode">
+                    <defaultValue>S_133</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBySync">
+            <description>The identity of the reserving Synchronization MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Synchronization"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedByImaLink">
+            <description>The identity of the reserving ImaLink MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ImaLink"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="ImaGroup">
+        <description>IMA, Inverse Multiplexing for ATM, makes it possible to group several physical 
+interfaces together to form a virtual physical pipe for atm. The capacity of this
+pipe is equal to the sum of each of the physical interfaces included in the
+group.
+  
+When IMA should be configured, an ATMPort MO is created with reference to an 
+IMAGroup MO rather than a pure physical interface MO.
+The IMAGroup MO in turn is created with a list of the physical port MO's that 
+are included in the group.  The physical port MO's must be of the same type 
+and be located on the same ET board.
+  
+For each of the physical port MO's included in the IMAGroup, an IMALink object 
+is automatically created. The IMALink object is responsible for handling link
+specific performance and fault management related to IMA.
+
+The ports can be of type E1PhysPathTerm, J1PhysPathTerm, T1PhysPathTerm, E1Ttp, T1Ttp.
+
+The performance monitoring counters in the ImaGroup MO is set to 0 (zero) at start or restart of the node.
+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.
+
+Note! A general restriction in Cello is that ports being part of the same IMA group
+must be located on the same board.
+
+Note! Only termination points on Etmc1 and Etmc41 boards are allowed as ImaLinks.
+
+Note! At least two links has to be configured in an Ima Group.</description>
+        <attribute name="ImaGroupId">
+            <description>The identity of the MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="physicalPortList">
+            <description>Holds a list of the physical ports connected to the ImaGroup.
+Can be of type:
+E1PhysPathTerm,
+J1PhysPathTerm,
+T1PhysPathTerm,
+E1Ttp,
+T1Ttp.</description>
+            <mandatory/>
+            <noNotification/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="requiredNumberOfLinks">
+            <description>The required number of links specifies the number of IMALinks that needs to be
+operational in order for the complete group to be operational. The bandwidth
+available for the ATMPort (and thus for creating VP/VC connections) is defined
+by this number. 
+Setting the requiredNumberOfLinks field to K less than the number of physical 
+links included in the IMAGroup, will reduce the bandwidth available to the atmport 
+with the corresponding bandwidth but will also give the effect that K links 
+failures can be tolerated with virtually no traffic disturbance.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>8</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="activeLinks">
+            <description>The number of active links in the ImaGroup.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Enabled or disabled according to the actual operational state of the ImaGroup.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmGrUasIma">
+            <description>This performance counter reflects the GrUasLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmGrFc">
+            <description>This performance counter reflects the GrFc attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmGrFcFe">
+            <description>This performance counter reflects the GrFcFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="AtmPort"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="ImaLink">
+        <description>This MO is automatically created as a consequence of creating an IMAGroup or 
+adding links to an IMAGroup.
+It provides IMA Link specific performance and fault management information.
+
+The links can be of type E1PhysPathTerm, J1PhysPathTerm, T1PhysPathTerm, E1Ttp or T1Ttp.
+
+The performance monitoring counters in the ImaLink MO is set to 0 (zero) at start or restart of the node.
+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.
+
+Note! A general restriction in Cello is that ports being part of the same IMA group
+must be located on the same board.</description>
+        <attribute name="operationalState">
+            <description>Enabled or disabled according to the actual operational state of the ImaLink.
+If the operationalState is disabled the ImaLink will be blocked for traffic.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmIvIma">
+            <description>This performance counter reflects the LvLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ImaLinkId">
+            <description>The identity of the MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="pmOifIma">
+            <description>This performance counter reflects the OifLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSesIma">
+            <description>This performance counter reflects the SesLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSesImaFe">
+            <description>This performance counter reflects the SesLmaFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUasIma">
+            <description>This performance counter reflects the UasLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUasImaFe">
+            <description>This performance counter reflects the UasLmaFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmTxUusIma">
+            <description>This performance counter reflects the TxUusLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmRxUusIma">
+            <description>This performance counter reflects the RxUusLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmTxUusImaFe">
+            <description>This performance counter reflects the TxUusLmaFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmRxUusImaFe">
+            <description>This performance counter reflects the RxUusLmaFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmTxFc">
+            <description>This performance counter reflects the TxFc attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmRxFc">
+            <description>This performance counter reflects the RxFc attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmTxFcFe">
+            <description>This performance counter reflects the TxFcFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmRxFcFe">
+            <description>This performance counter reflects the RxFcFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmTxStuffIma">
+            <description>This performance counter reflects the TxStuffLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmRxStuffIma">
+            <description>This performance counter reflects the RxStuffLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="uses">
+            <description>Reference to the physical port represented by this MO.
+Can be of types E1PhysPathTerm, J1PhysPathTerm, T1PhysPathTerm, E1Ttp or T1Ttp.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Sts3CspeTtp">
+        <description>This MO represents the termination of the SONET higher order paths.
+This MO is automatically created when creating the OS155SPITTP with mux mode
+set to VC4_STS3CSPE_LEVEL and standardMode set to ANSI.
+
+The performance monitoring counters in the Sts3CspeTtp MO is set to 0 (zero) at start or restart of the node.
+When the value is to large to fit in to a long (31bit) the counter turns over and starts from 0 again.</description>
+        <attribute name="Sts3CspeTtpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>User label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>enabled or disabled according to the actual operational state of the Sts3CspeTtp.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="aisPReporting">
+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="rdiPReporting">
+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="timConsequentAction">
+            <description>Trace Identifier Mismatch (TIM) consequent action, i.e. for generation of Alarm Indication Signal (AIS) downstream and Remote Defect Indication (RDI) upstream as a consequence of the TIM detection. 
+
+True - enabled.
+False - disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="expectedPathTrace">
+            <description>Expected path trace. 
+
+The string can be of 64 characters length, or empty string ("").
+The string shall consist of 62 ASCII characters followed by CR/LF.
+The empty string shall be coded with the first character equal to ASCII null (i.e. byte value 0) and the rest dummy  or non-existing.
+
+Note: An empty string for this attribute means that the detection of Trace Identifier Mismatch (TIM) should be disabled. This attribute is set to empty string every time attribute pathTraceFormat is set.</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>64</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="transmittedPathTrace">
+            <description>The transmitted path trace. 
+
+The string shall consist of 62 ASCII characters followed by CR/LF.
+The empty string shall be coded with the first character equal to ASCII null (i.e. byte value 0) and the rest dummy  or non-existing.</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>64</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Identity of the AtmPort reserving this MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="AtmPort"/>
+            </dataType>
+        </attribute>
+        <attribute name="pmEsp">
+            <description>Performance Monitoring counter for ES, Errored Seconds.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSesp">
+            <description>Performance Monitoring counter for Severely Errored Seconds, SES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="WebServer">
+        <description>The WebServer MO represents the WebServer in the node.
+
+This object is used for configuration of the WebServer paths. By connecting this object to a
+SwAllocation MO that is connected to a Repertoire MO the WebServer paths will be
+automatically configured during system upgrade.
+
+The local distinguished name of this MO is ManagedElement=1, WebServer=1.
+
+The WebServer MO is created automatically by the system.</description>
+        <systemCreated/>
+        <attribute name="WebServerId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="webServerPaths">
+            <description>Paths that shall be used by the WebServer separated by the delimiter character ":".</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBySwAllocation">
+            <description>List of reserving MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="SwAllocation"/>
+                </sequence>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="IpAccessAutoConfig">
+        <description>This MO represents the Auto Configuration feature for the IpAccessHost's in Cello.
+
+</description>
+        <attribute name="IpAccessAutoConfigId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Hold a list of the identitys of the reserving IpAccessHost's.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="networkPrefix">
+            <description>The network prefix.
+
+The prefix denotes how many bits that are used for calculating the subnet mask.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>32</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="nrOfUnusedAdresses">
+            <description>The number of addresses in the range that are not used.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="totalNrOfAddresses">
+            <description>The total number of addresses in the range.
+
+Note that the first address in the range will be the same one as the one for networkAddress.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="minIpAddress">
+            <description>The lowest value that can be used as host IP address. If autoConfig=ON for an IpAccessHost,  the operator does not explicitly have to assign an Ip Address and prefixLength to the host. This is done by the Control Plane, based on the IpAccesAutoConfig identity specified for the IpAccessHost.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="maxIpAddress">
+            <description>The highest value that can be used as host IP address. If autoConfig=ON for an IpAccessHost,  the operator does not explicitly have to assign an Ip Address and prefixLength to the host. This is done by the Control Plane, based on the IpAccesAutoConfig identity specified for the IpAccessHost.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="IpAccessHostMsb">
+        <description>This MO represents the Ip Access Host used for payload. This host type executes on a MSB board (Media Stream Board used by Media Gateway).
+
+Note! If autoConfig is set to ON, the Ip Addresses and the Prefixes for this MO is set by the IpAccessAutoConfig MO.
+
+Note! There can be a maximum of 128 host's in the node.
+
+Note! The references to Aal5TpVccTp MO's has to be set in pairs.
+
+Note! The IpAccessMsbHost must execute on the sam MP as the Aal5TpVccTp that are defined in the attributes 'aal5TpVccTpRef1' and 'aal5TpVccTpRef2'.
+
+Note! The 'administrativeState' has to be set to LOCKED in order to be able to delete this host.</description>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the Ip Access Host.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>DEGRADED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state of the Ip Access Host.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="shutDownTimer">
+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.
+
+Value in seconds, must be a positive value.</description>
+            <dataType>
+                <long>
+                    <defaultValue>10</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="dspId">
+            <description>The identity of the DSP (Digital Signalling Processor) on a MSB board.
+
+Note! The value of this attribute has to be unique among the host's that execute on the same board.</description>
+            <mandatory/>
+            <noNotification/>
+            <nonPersistent/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>16</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="aal5TpVccTpRef1">
+            <description>Holds a reference to an Aal5 termination point (Aal5TpVccTp MO).
+
+Note! The Aal5TpVccTp references are mutually exclusive.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Aal5TpVccTp"/>
+            </dataType>
+        </attribute>
+        <attribute name="aal5TpVccTpRef2">
+            <description>Holds a reference to an Aal5 termination point (Aal5TpVccTp MO).
+
+Note! The Aal5TpVccTp references are mutually exclusive.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Aal5TpVccTp"/>
+            </dataType>
+        </attribute>
+        <attribute name="autoConfig">
+            <description>This attribute specifies whether the auto configuration feature for the Ip Access Host is used or not.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="AutoConfigurationMode">
+                    <defaultValue>OFF</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="autoConfigIdentity">
+            <description>The identity of the IpAccessAutoConfig MO used by this host.
+
+Note! This attribute can only be set if 'autoConfig' is set to 'ON'.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="IpAccessAutoConfig"/>
+            </dataType>
+        </attribute>
+        <attribute name="ipAddress">
+            <description>The IpAddress.
+
+Note! If autoConfig = OFF this attribute is mandatory.
+
+Note! If the autoConfiguration is used for this IpAccessHost (autoConfig = ON) this attribute cannot be set. This attribute is then set by the 'IpAccessAutoConfig MO'.
+
+Note! The IpAddress has to be unique within the node.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="networkPrefix">
+            <description>The network prefix.
+
+The prefix denotes how many bits that are used for calculating the subnet mask.
+
+Note! If auto configuration is used (autoConfig = ON) this attribute cannot be set, the networkPrefix is then set in the ipAccessAutoConfig MO class. 
+
+Note! If auto configuration is not used (autoConfig = OFF) this attribute must be set.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>32</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="linkStatusAddress">
+            <description>The link Status for Ip Address.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="mtu">
+            <description>The maximum transfer unit.
+
+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.
+
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>72</min> <max>2048</max>
+                    </range>
+                    <defaultValue>1024</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="ipDefaultTtl">
+            <description>The default value inserted into the Time-To-Live field of the IP header of datagrams originated at this entity,
+whenever a TTL value is not supplied by the transport layer protocol.
+
+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>255</max>
+                    </range>
+                    <defaultValue>50</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInReceives">
+            <description>The total number of input datagrams received from interfaces, including those received in error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInHdrErrors">
+            <description>The number of input datagrams discarded due to errors in their IP headers, including bad checksums, version number
+mismatch, other format errors, time-to-live exceeded, errors discovered in processing their IP options, etc.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInAddrErrors">
+            <description>The number of input datagrams discarded because the IP address in their IP header's destination field was not a
+valid address to be received at this entity.  This count includes invalid addresses (e.g., 0.0.0.0) and addresses of
+unsupported Classes (e.g., Class E).  For entities which are not IP routers and therefore do not forward datagrams, 
+this counter includes datagrams discarded because the destination address was not a local address.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInUnknownProtos">
+            <description>The number of locally-addressed datagrams received successfully but discarded because of an unknown or
+unsupported protocol.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInDiscards">
+            <description>The number of input IP datagrams for which no problems were encountered to prevent their continued processing, but which
+were discarded (e.g., for lack of buffer space).  Note that this counter does not include any datagrams discarded while
+awaiting re-assembly.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInDelivers">
+            <description>The total number of input datagrams successfully delivered to IP user-protocols (including ICMP).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpOutRequests">
+            <description>The total number of IP datagrams which local IP user-protocols (including ICMP) supplied to IP in requests for
+transmission.  Note that this counter does not include any datagrams counted in ipForwDatagrams</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpOutDiscards">
+            <description>The number of output IP datagrams for which no problem was encountered to prevent their transmission to their
+destination, but which were discarded (e.g., for lack of buffer space).  Note that this counter would include
+datagrams counted in ipForwDatagrams if any such packets met this (discretionary) discard criterion.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInMsgs">
+            <description>The total number of ICMP messages which the entity received.
+Note that this counter includes all those counted by icmpInErrors</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInErrors">
+            <description>The number of ICMP messages which the entity received but determined as having
+ICMP-specific errors (bad ICMP checksums, bad length, etc.).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInDestUnreachs">
+            <description>The number of ICMP Destination Unreachable messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInTimeExcds">
+            <description>The number of ICMP Time Exceeded messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInParamProbs">
+            <description>The number of ICMP Parameter Problem messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInSrcQuenchs">
+            <description>The number of ICMP Source Quench messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInRedirects">
+            <description>The number of ICMP Redirect messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInEchos">
+            <description>The number of ICMP Echo (request) messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInEchoReps">
+            <description>The number of ICMP Echo Reply messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutMsgs">
+            <description>The total number of ICMP messages which this entity attempted to send.
+Note that this counter includes all those counted by icmpOutErrors.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutErrors">
+            <description>The number of ICMP messages which this entity did not send due to problems discovered within ICMP such as a lack of
+buffers.  This value should not include errors discovered outside the ICMP layer such as the inability of IP to route the 
+resultant datagram.  In some implementations there may be no types of error which contribute to this counter's value.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutDestUnreachs">
+            <description>The number of ICMP Destination Unreachable messages sent.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutParmProbs">
+            <description>The number of ICMP Parameter Problem messages sent.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutEchos">
+            <description>The number of ICMP Echo (request) messages sent.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutEchoReps">
+            <description>The number of ICMP Echo Reply messages sent.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUdpInDatagrams">
+            <description>The total number of UDP datagrams delivered to UDP users.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUdpNoPorts">
+            <description>The total number of received UDP datagrams for which there was no application at the destination port.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUdpInErrors">
+            <description>The number of received UDP datagrams that could not be delivered for 
+reasons other than the lack of an application at the destination port.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUdpOutDatagrams">
+            <description>The total number of UDP datagrams sent from this entity.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="IpAccessHostMsbId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="plugInUnitId">
+            <description>Holds a reference to the PlugInUnit.
+
+Note that the 'plugInUnitId has to be the same as the one defined in the attribute 'processorId' found on the Aal5TpVccTpMo.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="PlugInUnit"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Aal2QosProfile">
+        <description>This MO represents the definitions of properties for a set of Aal2 quality of service classes.</description>
+        <attribute name="Aal2QosProfileId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="profileClassA">
+            <description>This attribute holds the values applicable for QoS Class A.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="QoSProfileClassA"/>
+            </dataType>
+        </attribute>
+        <attribute name="profileClassB">
+            <description>This attribute holds the values applicable for QoS Class B.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="QoSProfileClassB"/>
+            </dataType>
+        </attribute>
+        <attribute name="profileClassC">
+            <description>This attribute holds the values applicable for QoS Class C.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="QoSProfileClassC"/>
+            </dataType>
+        </attribute>
+        <attribute name="profileClassD">
+            <description>This attribute holds the values applicable for QoS Class D.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="QoSProfileClassD"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>List of reserving Aal2PathVccTp MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="Aal2PathVccTp"/>
+                </sequence>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Aal2QosCodePointProfile">
+        <description>This MO represents the QoS CodePoints for the different Aal2 QoS classes.</description>
+        <attribute name="Aal2QosCodePointProfileId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="qualityOfServiceCodePointA">
+            <description>The Code Point for Class A.
+
+Recommended value for Class A, 128.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="qualityOfServiceCodePointB">
+            <description>The Code Point for Class B.
+
+Recommended value for Class B, 129.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="qualityOfServiceCodePointC">
+            <description>The Code Point for Class C.
+
+Recommended value for Class C, 130.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="qualityOfServiceCodePointD">
+            <description>The Code Point for Class D.
+
+Recommended value for Class D, 131.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Holds the identity of the reserving Aal2Ap Mo.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="Aal2Ap"/>
+                </sequence>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="M3uAssociation">
+        <description>This MO represents the M3UA Association part of the M3UA (MTP3-User Adaptaion Layer) that is a protocol 
+for the transport of  any SS7 MTP3-User signalling (e.g., ISUP and SCCP messages) over IP using the services 
+of the Stream Control Transmission Protocol.
+
+Note that the local port number is hard coded to 2905.
+
+
+</description>
+        <attribute name="M3uAssociationId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Holds a list of the reserving Signaling Route's (Mtp3bSr MO). 
+</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="Mtp3bSr"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The Operational State of the M3Ua</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="mtp3bSrsId">
+            <description>The identity of the Signalling Route Set used.</description>
+            <mandatory/>
+            <noNotification/>
+            <nonPersistent/>
+            <restricted/>
+            <dataType>
+                <moRef name="Mtp3bSrs"/>
+            </dataType>
+        </attribute>
+        <attribute name="sctpId">
+            <description>The SctpHost used by this association.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Sctp"/>
+            </dataType>
+        </attribute>
+        <attribute name="dscp">
+            <description>The DSCP, DiffServCodePoint, for the internal M3UA user.
+Only one DSCP value is valid and set by the first defined MO 'instance'.
+
+NOTE: The value set for the 'dscp' when creating the first M3uAssociation under a signaling point will also be used for all other M3uAssociation MO's that are created under this signaling point. So setting the value for the 'dscp' on other instances than the first one created will have no effect. Note that associations created under a different signaling point can have a different dscp-value. </description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>63</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="associationState">
+            <description>The possible states of an M3Ua association.
+
+Bit 1 = 1 indicates INACTIVE
+Bit 2 = 1 indicates ACTIVE
+Bit 3 = 1 indicates ESTABLISHED
+Bit 4 = 1 indicates DOWN
+
+These values are mutually exclusive.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>15</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="localIpMask">
+            <description>This attribute denotes whether single or multi homing is used.
+
+Note! that all M3uAssociations that refers to the same SCTP MO must have this attribute set to the same value.
+
+Note! If localipMask=2 or localipMask=3 . the attribute ipAddress2 or  autoConfigIdentity2 in IpAccessHostGpb MO must be defined.
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="HomingState">
+                    <defaultValue>SINGLE_HOMED_1</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="autoStartAssociation">
+            <description>If true, the M3ua layer in the stack will after a restart, start up all signalling associations.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="remotePortNumber">
+            <description>The port number of the remote signalling point (SP).</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>65535</max>
+                    </range>
+                    <defaultValue>2905</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="remoteIpAddress1">
+            <description>Remote IpAddress 1, if not used the value should be an empty string.
+Range is 0.0.0.0 - 255.255.255.255
+
+Note! This address is concidered as the primary IP-address. In case of association establisment failure 'remoteIpAddress2' will be used.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="remoteIpAddress2">
+            <description>Remote IpAddress 2, if not used the value should be an empty string.
+Range is 0.0.0.0 - 255.255.255.255
+
+Note! This address cannot be the same as remoteIpAddress1. This address is used when trying to establish association in case association attempt using 'remoteIpAddress1' fails.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCommunicationLost">
+            <description>Number of communication losses.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfCongestions">
+            <description>Number of congestions.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDunaRec">
+            <description>Number of DUNA messages received through the association.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDavaRec">
+            <description>Number of DAVA messages received through the association.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSconRec">
+            <description>Number of SCON messages received through the association.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDupuRec">
+            <description>Number of DUPU messages received through the association.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDataMsgSent">
+            <description>The number of data messages sent on the associations related to this signalling point.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDunaSent">
+            <description>Number of DUNA messages sent through the association.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDavaSent">
+            <description>Number of DAVA messages sent through the association.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfSconSent">
+            <description>Number of SCON messages sent through the association.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDupuSent">
+            <description>Number of DUPU messages sent through the association.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDataMsgRec">
+            <description>Number of DATA (payload data) messages received through the association.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfErrorMsgRec">
+            <description>Number of ERROR messages received through the association.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfErrorMsgSent">
+            <description>Number of ERROR messages sent through the association.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfNotifyMsgRec">
+            <description>Number of NOTIFY messages received through the association.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDaudMsgSent">
+            <description>The number of daud messages sent on the associations related to this signalling point.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfDaudMsgRec">
+            <description>The number of daud messages received on the associations related to this signalling point.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspupSent">
+            <description>The number of ASPUP sent.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspupReceived">
+            <description>The number of ASPUP received.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspdnSent">
+            <description>The number of ASPDN sent.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspdnReceived">
+            <description>The number of ASPDN received.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspacSent">
+            <description>The number of ASPAC sent.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspacReceived">
+            <description>The number of ASPAC received.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspiaSent">
+            <description>The number of ASPIA sent.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspiaReceived">
+            <description>The number of ASPIA received.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspupAckSent">
+            <description>The number of ASPUP_Ack sent.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspupAckReceived">
+            <description>The number of ASPUP_Ack received.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspdnAckSent">
+            <description>The number of ASPDN_Ack sent.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspdnAckReceived">
+            <description>The number of ASPDN_Ack received.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspacAckSent">
+            <description>The number of ASPAC_Ack sent.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspacAckReceived">
+            <description>The number of ASPAC_Ack received.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspiaAckSent">
+            <description>The number of ASPIA_Ack sent.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfAspiaAckReceived">
+            <description>The number of ASPIA_Ack received.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfM3uaDataMsgDiscarded">
+            <description>The number of data Messages discarded.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <action name="setAutoActivate">
+            <description>This action starts the association.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+        <action name="setAutoDown">
+            <description>This action stops the association.
+
+Note! This action requires a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+    </class>
+
+    <class name="Sctp">
+        <description>This MO represents the SCTP, Stream Control Transmission Protocol in Cello.
+SCTP is designed to transport signaling messages over IP networks.</description>
+        <attribute name="SctpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the Ip Access Host.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="numberOfAssociations">
+            <description>The maximum number of M3uAssociations that can be handled by this SCTP MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>512</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Holds a list of the M3Ua's handled by the SCTP.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="M3uAssociation"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="ipAccessHostGpbId">
+            <description>The identity of the IpAccessHostGbp reserved by this MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="IpAccessHostGpb"/>
+            </dataType>
+        </attribute>
+        <attribute name="minimumRto">
+            <description>The minimum value for RTO (Retransmission time-out).
+The minimumRto shall be larger than tSack + expected Round Trip Time.
+
+Unit is second/100. 
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>4</min> <max>500</max>
+                    </range>
+                    <defaultValue>8</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maximumRto">
+            <description>The maximum value for RTO (Retransmission time-out).
+
+Unit is second/100.
+
+maximumRto must be larger than minimumRto.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>4</min> <max>180000</max>
+                    </range>
+                    <defaultValue>15</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="initialRto">
+            <description>The initial value that the RTO (Retransmission time-out) will take prior to the first RTT (Round Trip Time) measure.
+
+Note that the value for 'initialRto' has to be equal to or greater than 'minimumRto'.
+
+Unit is seconds/100.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>4</min> <max>180000</max>
+                    </range>
+                    <defaultValue>8</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="rtoAlphaIndex">
+            <description>This parameter is used for computing the value of the SRTT (Smoothed Round Trip Time) for a specific destination
+address. Is is used to weight the RTT values, and it's value must be between 0 and 1 (0 &lt; rtoAlpha &lt; 1). A value
+close to 1 gives a higher importance to the last RTT measurement.
+The range of possible values in the configuration file and the actual value given to this parameter within the module
+are the following:
+
+rtoAlphaIndex = 1 -&gt; RTO-Alpha = 1/2
+rtoAlphaIndex = 2 -&gt; RTO-Alpha = 1/4
+rtoAlphaIndex = 3 -&gt; RTO-Alpha = 1/8
+rtoAlphaIndex = 4 -&gt; RTO-Alpha = 1/16</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>4</max>
+                    </range>
+                    <defaultValue>3</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="rtoBetaIndex">
+            <description>This parameter is used for computing the the value of RTTVar (Round Trip Time Variation) of a destination
+address. 
+It's value must be between 0 and 1 (0 &lt; rtoBetaIndex &lt; 1). A value close to 1 gives more importance to the
+last observed variation.
+The range of possible values in the configuration file and the actual value given to this parameter within the module
+are the following:
+
+rtoBetaIndex = 1 -&gt; RTO-Beta = 1/2
+rtoBetaIndex = 2 -&gt; RTO-Beta = 1/4
+rtoBetaIndex = 3 -&gt; RTO-Beta = 1/8
+rtoBetaIndex = 4 -&gt; RTO-Beta = 1/16
+</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>4</max>
+                    </range>
+                    <defaultValue>2</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="validCookieLife">
+            <description>This parameter sets up the lifespan of the State Cookie sent in the INIT_ACK chunk. It is used for limiting the
+the valid amount of time between sending the INIT_ACK and the reception of a COOKIE_ECHO chunk when
+establishing an association.
+If a COOKIE_ECHO chunk arrives after 'validCookieLife' has expired when sending an INIT_ACK chunk, the
+COOKIE_ECHO shall be discarded and no association will be established.
+
+Unit is seconds.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>180</max>
+                    </range>
+                    <defaultValue>60</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="allowedIncrementCookieLife">
+            <description>The sender of an INIT chunk may request to the remote endpoint a cookie life-span increase (for example, if a previous attempt to
+connect failed due to a state-cookie error). If the value sent in the "Cookie Preservative field" of the INIT chunk is less or equal to
+this parameter, the reciver of the INIT chunk will increase the 'validCookieLife' with the number of seconds specified. If the value
+present in the "Cookie Preservative field" is higher than this parameter, the cookie life should be incremented with the number of
+seconds specified by the parameter.
+
+Unit is seconds.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>180</max>
+                    </range>
+                    <defaultValue>30</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="keyChangePeriod">
+            <description>Defines how often the secret key used for computing the MAC (Message Authentication Code) on the State Cookie is changed.
+
+Unit is seconds.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>180</max>
+                    </range>
+                    <defaultValue>4</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="associationMaxRtx">
+            <description>This is the maximum number of consecutive retransmissions to a remote peer (on all the destination transport addresses of the peer, if it's multi homed). If the number of retransmissions becomes higher than this value, the remote peer shall be considered unreachable and the association shall be closed down.
+
+The value of this attribute should be greater than, or equal to the value of the attribute 'pathMaxRtx'.
+
+Note that for a specific association, it might happen that all the remote addresses (if the the remote end is multi homed) becomes unreachable without exceeding the 'associationMaxRtx'. In such a case the association will be closed down.
+
+Note! The value need to be increased to avoid frequent CommLost's in case of an unstable network.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>20</max>
+                    </range>
+                    <defaultValue>2</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pathMaxRtx">
+            <description>Maximum number of consecutive retransmissions to a remote transport address. If the number of retransmissions becomes higher than this value, the remote transport address shall be considered as "inactive" and no data shall be sent to it. If all of the remote transport addresses becomes "inactive", tha association will be closed down.
+
+Note! The value need to be increased to avoid frequent CommLost's in case of an unstable network.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>20</max>
+                    </range>
+                    <defaultValue>2</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxInitialRtrAtt">
+            <description>The maximum nimber of retransmissions allowed for both INIT and COOKIE_ECHO chunks. If the number of retransmissions
+exceeds this value, then the SCTP must abort the initialization of the association and report the error to the user.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>16</max>
+                    </range>
+                    <defaultValue>8</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxShutDownRtrAtt">
+            <description>The maximum number of retransmission during the shutdown phase of an association.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>16</max>
+                    </range>
+                    <defaultValue>5</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="heartbeatInterval">
+            <description>The amount of time added to the RTO (Retransmission Time Out) of a specific address when setting up the period of
+time between sending heartbeats. Small values can lead to an earlier detection of unreachable addresses than higher
+values. Note that sendig often might lead to performace penalty.
+
+Unit is seconds.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>1800</max>
+                    </range>
+                    <defaultValue>30</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="heartbeatStatus">
+            <description>This attribute enables/disables heartbeats for associations.
+
+True = Enables</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>true</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="maxIncomingStream">
+            <description>This is the maximum incoming streams (MIS) for an association. Established associations might have an IS less or equal to
+this, but it's MIS can never be higher than the value of this attribute.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>16384</max>
+                    </range>
+                    <defaultValue>17</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxOutgoingStream">
+            <description>The maximum number of outgonig streams for an association.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>16384</max>
+                    </range>
+                    <defaultValue>17</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxUserDataSize">
+            <description>The maximum number of bytes a user is allowed to pass as a non fragmentable user data in a SCTP_SEND_REQ message
+(fixed user MTU):
+The values for this attribute is 'user' data and do not include IP header (20 bytes), SCTP header (12 bytes) or DATA chunk
+header (16 bytes).
+
+Unit is bytes.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>528</min> <max>65484</max>
+                    </range>
+                    <defaultValue>1432</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="mBuffer">
+            <description>This attribute sets the size of the buffer used for storing user data pending to be sent or retransmitted in an association. I.e. establish the maximum amount of user data that SCTP shall buffer before discarding user messages.
+
+The Unit is in kilo bytes.
+
+Note! The restriction on this attribute is:
+mBuffer x number of M3uAssociation MOs connected to this Sctp + 20 Mb &lt;= the heap for Sctp program.
+
+Note! The value may need to be increased to ensure stable dataflow at high load.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>2048</max>
+                    </range>
+                    <defaultValue>128</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="nThreshold">
+            <description>This attribute sets the value of the threshold used by SCTP to stop the delivery of data on anassociation.
+Once nThreshold or more bytes are queued and pending to be sent, the SCTP layer shall issue an indication to the user.
+The value of nThreshold should be less than mBuffer in order to be effective. A normal value for nThreshold is 3/4 * mBuffer.
+
+Unit is kilo bytes.
+
+Note! The value may need to be increased to ensure stable dataflow at high load.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>2048</max>
+                    </range>
+                    <defaultValue>96</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="tSack">
+            <description>The delay of sending the SACK. I.e. the time from DATA chunk reception to Sack chunk sending.
+
+Unit is second/100</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>2</min> <max>50</max>
+                    </range>
+                    <defaultValue>4</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxDataSizeIp">
+            <description>The maximum number of bytes SCTP shall be able to fetch every time it reads from the socket.
+
+Note! This value includes the Ip header, 20 bytes.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1500</min> <max>65535</max>
+                    </range>
+                    <defaultValue>8192</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="initialAdRecWin">
+            <description>The value of the initial advertised reciver window.
+
+Note! The range is 1500 to maxDataSizeIp.
+
+Unit is bytes.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1500</min> <max>65535</max>
+                    </range>
+                    <defaultValue>8192</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="intervalOobPkts">
+            <description>The number of seconds for the interval for which the counter for out of the blue chunks will be reset.
+
+Unit is seconds.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>6500</max>
+                    </range>
+                    <defaultValue>3600</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="intervalLostUser">
+            <description>The number of seconds for the interval for which the SCTP will decide that the SCTP user that lost the
+connection is dead. After the time specified in this attribute has elapsed, all associations related to the
+SCTP user will be destroyed.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>3600</max>
+                    </range>
+                    <defaultValue>5</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="maxBurst">
+            <description>The number of packages that will be sent during the fast retransmit phase when a SACK is processed.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>16384</max>
+                    </range>
+                    <defaultValue>4</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="nPercentage">
+            <description>The size of 'n' inpercentage when SCTP_CONGESTION_CEASE_IND is sent. At 100 percent the
+primitive will buffer usage goes below 'nThreshold'.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>100</max>
+                    </range>
+                    <defaultValue>85</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="bundlingActivated">
+            <description>This attribute enables/disables the use of bundling.
+Valid values:
+1: enabled.
+0: disabled.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>1</max>
+                    </range>
+                    <defaultValue>1</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="bundlingTimer">
+            <description>This attribute specifies maximum SCTP bundling delay.
+Value=0 means that SCTP will only bundle what is available and send directly (no delay).
+Unit is milliseconds</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>1000</max>
+                    </range>
+                    <defaultValue>10</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpCurrEstab">
+            <description>Number of SCTP associations for which the current state is either ESTABLISHED, SHUTDOWN-PENDING, or SHUTDOWN-RECEIVED.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpActiveEstab">
+            <description>Number of times that SCTP associations have made a direct transition to the ESTABLISHED state from the COOKIE-ECHOED state.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpPassiveEstab">
+            <description>Number of times that SCTP associations have made a direct transition to the ESTABLISHED state from the CLOSED state.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpAborted">
+            <description>Number of times that SCTP associations have made a direct transition to the CLOSED state from any state using the primitive ABORT.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpShutdowns">
+            <description>Number of times that SCTP associations have made a direct transition to the CLOSED state from either the SHUTDOWN-SENT state or the SHUTDOWN-ACK-SENT state.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatAssocOutOfBlue">
+            <description>Number of out of the blue packets (SCTP packet correctly formed-right checksum- but the receiver is not able to identify the association to which this packet belongs) received by the host.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatSentChunks">
+            <description>Number of complete data chunks sent to the peers (no retransmissions included).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatRecChunks">
+            <description>Number of complete data chunks received from the peers (no retransmissions included).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatOutOfOrderSendChunks">
+            <description>Number of unordered chunks sent to the peers.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatOutOfOrderRecChunks">
+            <description>Number of unordered chunks received from the peers.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatChecksumErrorCounter">
+            <description>Number of SCTP packets received from the peers with an invalid checksum.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatRetransChunks">
+            <description>Number of data chunks retransmitted to the peers.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatSentControlChunks">
+            <description>Number of datagrams sent with chunk type id &gt; 0.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatReceivedControlChunks">
+            <description>Number of datagrams Receivedwith chunk type id &gt; 0.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatFragmentedUserMsg">
+            <description>Number of fragmented user messages, incremented when the first data chunk of a fragmented message is sent.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatReassembledUserMsg">
+            <description>Number of reassembled user messages, incremented when the first data chunk of a fragmented message is received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatSentPackages">
+            <description>Number of SCTP packages sent.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatReceivedPackages">
+            <description>Number of SCTP packages Received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatCommStop">
+            <description>Number of times the SCTP has sent a communication stop indication to the user.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatCommResume">
+            <description>Number of times SCTP has sent a communication resume indication to the user.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatSentChunksDropped">
+            <description>Number of sent chunks that SCTP has been forced to drop due to buffer overflow in the sending buffer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSctpStatRecChunksDropped">
+            <description>Number of received chunks that SCTP has been forced to drop due to buffer overflow in the receiving buffer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Sts1SpeTtp">
+        <description>This MO represents the termination of the SONET higher order paths.
+This MO is automatically created when creating the OS155SPITTP with mux mode
+set to E1_J1_T1_LEVEL and standardmode set to ANSI.
+
+The performance monitoring counters in the Sts1SpeTtp MO is set to 0 (zero) at start or restart of the node.
+When the value is to large to fit in to a long (31bit) the counter turns over and starts from 0 again.</description>
+        <attribute name="Sts1SpeTtpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>enabled or disabled according to the actual operational state of the Sts3CspeTtp.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="aisPReporting">
+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="rdiPReporting">
+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="timConsequentAction">
+            <description>Trace Identifier Mismatch (TIM) consequent action, i.e. for generation of Alarm Indication Signal (AIS) downstream and Remote Defect Indication (RDI) upstream as a consequence of the TIM detection. 
+
+True - enabled.
+False - disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="expectedPathTrace">
+            <description>Expected path trace. 
+
+The string can be of 64 characters length, or empty string ("").
+
+Note: An empty string for this attribute means that the detection of Trace Identifier Mismatch (TIM) should be disabled. This attribute is set to empty string every time attribute pathTraceFormat is set.</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>64</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="transmittedPathTrace">
+            <description>The transmitted path trace. 
+Can be defined in two formats. The format may be in 16 or 64 characters. Usually 16 is used for ETSI and 64 for ANSI/TTC.
+
+Note: The string must be of 15 or 62 characters length, or empty string ("").</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>64</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="pmEsp">
+            <description>Performance Monitoring counter for ES, Errored Seconds.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSesp">
+            <description>Performance Monitoring counter for Severely Errored Seconds, SES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Vt15Ttp">
+        <description>This MO is automatically created when the configuring the Os155SpiTtp. It represents the termination of the SONET VP 1.5 path layer. 
+
+This MO is automatically created when creating the Os155SpiTtp MO with the following conditions:
+muxmode = E1_J1_T1_LEVEL
+standardmode =  ANSI
+
+The performance monitoring counters in the Vt15Ttp is set to 0 (zero) at start or restart of the node.
+When the value is too large too fit in to a long (31bit) the counter turns over and starts from 0 again.
+</description>
+        <systemCreated/>
+        <attribute name="Vt15TtpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="aisVreporting">
+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="rdiVreporting">
+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="shutDownTimer">
+            <description>This timer defines the time that elapses before shut down when administrativeState is se to 'shuttingDown'.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>100000</max>
+                    </range>
+                    <defaultValue>1800</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the Vt15Ttp MO.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state of the Vt15Ttp MO.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmEs">
+            <description>Performance monitoring counter of Errored Seconds (ES).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSes">
+            <description>Performance monitoring counter for Serverely Errored Seconds.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="T1Ttp">
+        <description>This MO represents a channelised T1 interface in the node. The T1Ttp MO does not define which type of traffic (TDM or ATM) that the interface should support. Please refer to the Ds0Bundle, AtmPort, IMALink and IMAGroup objects for details about configuration of traffic type.
+
+The performance monitoring counters in the T1Ttp MO is set to 0 (zero) at start or restart of the node.
+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.
+
+Note! This MO is automatically created as a consequence of creating an Os155SpiTtpMo
+Please refer to the Os155SpiTtpMo for more details.</description>
+        <systemCreated/>
+        <attribute name="T1TtpId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="aisReporting">
+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="rdiReporting">
+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the T1Ttp MO.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmEs">
+            <description>Performance monitoring counter of Errored Seconds (ES).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSes">
+            <description>Performance monitoring counter for Serverely Errored Seconds.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving AtmPort MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="AtmPort"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedByImaLink">
+            <description>The identity of the reserving ImaLink MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ImaLink"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="E3PhysPathTerm">
+        <description>This MO represents an E3 (i.e. 34 Mbit/s) physical interface in the node. Please refer to the AtmPort object for details about configuration of traffic type.
+
+Note! The performance monitoring counters in the E3PhysPathTerm MO is set to 0 (zero) at start or restart of the node.
+When the value is too large too fit in to a long (31bit) the counter turns over and starts from 0 again.</description>
+        <attribute name="E3PhysPathTermId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state of the E3PhysPathTerm.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="shutDownTimeout">
+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.
+
+Value in seconds, must be a positive value.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100000</max>
+                    </range>
+                    <defaultValue>1800</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>enabled or disabled according to the actual operational state of the Physical Line Termination. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="lineNo">
+            <description>The actual Line number on the board.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>2</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="loopback">
+            <description>Possible values
+
+none - This is the normal state, no loop back is performed (and ordinary traffic is running).
+
+line - The physical path is looped on the line side, the external incoming path is looped back to the external outgoing path.
+
+system - The physical path is looped on the system side, the (node-) internal incoming path is looped back to the internal outgoing path.
+
+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>
+            <dataType>
+                <enumRef name="LoopbackState">
+                    <defaultValue>none</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="degDegThr">
+            <description>The threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.
+
+This is a percentage value.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100</max>
+                    </range>
+                    <defaultValue>30</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="degDegM">
+            <description>How many bad seconds in a row that causes a Degraded Signal alarm.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>2</min> <max>10</max>
+                    </range>
+                    <defaultValue>7</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="aisReporting">
+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="rdiReporting">
+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="pmEs">
+            <description>Performance Monitoring counter for ES, Errored Seconds.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSes">
+            <description>Performance Monitoring counter for Severely Errored Seconds, SES.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedByTraffic">
+            <description>The identity of the reserving AtmPort MO. </description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="AtmPort"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBySync">
+            <description>The identity of the reserving Synchronization MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Synchronization"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="T3PhysPathTerm">
+        <description>This MO represents an T3 (i.e. 45 Mbit/s) physical interface in the node. Please refer to the AtmPort object for details about configuration of traffic type.
+
+Note! The performance monitoring counters in the T3PhysPathTerm MO is set to 0 (zero) at start or restart of the node.
+When the value is too large too fit in to a long (31bit) the counter turns over and starts from 0 again.</description>
+        <attribute name="T3PhysPathTermId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>enabled or disabled according to the actual operational state of the Physical Line Termination. </description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state of the T3PhysPathTerm MO.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="shutDownTimeout">
+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.
+
+Value in seconds, must be a positive value.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>100000</max>
+                    </range>
+                    <defaultValue>1800</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="lineNo">
+            <description>The actual Line number on the board.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>2</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="loopback">
+            <description>Possible values
+
+none - This is the normal state, no loop back is performed (and ordinary traffic is running).
+
+line - The physical path is looped on the line side, the external incoming path is looped back to the external outgoing path.
+
+system - The physical path is looped on the system side, the (node-) internal incoming path is looped back to the internal outgoing path.
+
+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>
+            <dataType>
+                <enumRef name="LoopbackState">
+                    <defaultValue>none</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="aisReporting">
+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="rdiReporting">
+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.
+
+true - reporting enabled.
+false - reporting disabled.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="pmEsCpp">
+            <description>Performance Monitoring counter for ES, Errored Seconds based on C-bit parity.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmSesCpp">
+            <description>Performance Monitoring counter for Severely Errored Seconds, SES based on C-bit parity.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="reservedByTraffic">
+            <description>The identity of the reserving AtmPort MO. </description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="AtmPort"/>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBySync">
+            <description>The identity of the reserving Synchronization MO.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="Synchronization"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Etm3">
+        <description>This MO represents the hardware of the ET-M3 board type. It only represents the ET specific hardware, while the DBM module of the board is represented by the PlugInUnit MO.
+
+The ET-M3 board contains 2 physical ports that can be configured as either E3 (ETSI) or T3(ANSI). 
+
+Each port on the ET-M3 board can be used to carry ATM traffic. 
+
+At the VP/VC endpoints, the Lost FPM/BR cells counters are not available. 
+
+IMA is not applicable for theETM3 board.
+
+The ET-M3 board supports eight bidirectional F4/F5 PM flow per port.
+
+The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 8/port. 
+
+Each port can support up to 240 ATM VC connections. Sixteen of these connections are reserved for AAL2 paths, and therefore sixteen AAL2 multiplexers per port are available.
+
+Each port can support up to 16 VP connections. </description>
+        <attribute name="Etm3Id">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Enabled or disabled according to the actual operational state of the Etm3 board.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="SccpApRemote">
+        <description>This Managed Object represents an SCCP Remote Access Point. An SCCP AP instance is a logical point in the SCCP network at which an SCCP user can access the services provided by the SCCP and the SCCP can deliver its services to the SCCP user. The SCCP Remote Access Point is identified by a SubSystem Number (SSN).
+
+A remote SccpAp represents an access point in another node and is related to a Mtp3bAp MO. 
+
+The performance monitoring counters found in SccpAp MO is reset, set to zero, when the object is created. 
+These counters will not be reset again unless there is a shutdown request from the CLI (Cluster Interface).</description>
+        <attribute name="SccpApRemoteId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the SCCP AP. The operability of the SCCP AP is described by this attribute which has two possible values: 
+
+Disabled: The SCCP AP is totally inoperable and unable to provide the service to the user (e.g. if the MTP-3b AP is not usable).
+
+Enabled: The SCCP AP is partly or fully  operable and available for use.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>Holds a list of the reserving MOs.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <sequence>
+                    <moRef name="ManagedObject"/>
+                </sequence>
+            </dataType>
+        </attribute>
+        <attribute name="mtp3bApId">
+            <description>The identity of the Mtp3bAp used by this MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="Mtp3bAp"/>
+            </dataType>
+        </attribute>
+        <attribute name="ssN">
+            <description>The sub system number, SSN, of the SCCP Access Point. Note that this has to be a unique number.
+
+The SSN has to be unique among all other SccpApRemote MOs that has the same DPC in their corresponding Mtp3bSrs MOs.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>2</min> <max>255</max>
+                    </range>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="IpAccessHostGpb">
+        <description>This MO represents the Ip Access Host used for payload. This host type executes on a GPB board (GeneralPocessorUnit).
+
+Note! If autoConfig is set to ON, the Ip Addresses and the Prefixes for this MO is set by the IpAccessAutoConfig MO.
+
+Note! There can be a maximum of 128 host's in the node, and only one host on each main processor.
+
+Note! The host cannot be configured on a MP which have a MediumAccessUnit-child MO. They are exclusive.
+
+Note! The 'administrativeState' has to be set to LOCKED in order to be able to delete this host.</description>
+        <attribute name="IpAccessHostGpbId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="reservedBy">
+            <description>The identity of the reserving MO, can be of type Sctp.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>The operational state of the Ip Access Host.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>DEGRADED</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="administrativeState">
+            <description>The administrative state of the Ip Access Host.</description>
+            <dataType>
+                <enumRef name="AdmState">
+                    <defaultValue>locked</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="shutDownTimer">
+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.
+
+Value in seconds, must be a positive value.</description>
+            <dataType>
+                <long>
+                    <defaultValue>10</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="linkStatusAddress1">
+            <description>The link status for IpAddress1.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="linkStatusAddress2">
+            <description>The link status for IpAddress2, only valid if 2 IpAddresses are configured for this host.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="generalProcessorUnitId">
+            <description>Holds a reference to the GPU (GenerelProcessorUnit).</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="GeneralProcessorUnit"/>
+            </dataType>
+        </attribute>
+        <attribute name="autoConfig">
+            <description>This attribute specifies whether the auto configuration feature for the Ip AccessHost is used or not.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="AutoConfigurationMode">
+                    <defaultValue>OFF</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="autoConfigIdentity">
+            <description>The identity of the IpAccessAutoConfig MO used by this host.
+
+Note! This attribute is mandatory if 'autoConfig' is set to ON.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="IpAccessAutoConfig"/>
+            </dataType>
+        </attribute>
+        <attribute name="autoConfigIdentity2">
+            <description>The identity of the IpAccessAutoConfig MO used by this host.
+
+Note! This attribute can only be set if 'autoConfig' is set to 'ON'. This attribute is not neccesary to set if 'autoConfig' is set to ON, unless the host shall have two Ip Addresses automatically assigned.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="IpAccessAutoConfig"/>
+            </dataType>
+        </attribute>
+        <attribute name="ipAddress">
+            <description>The IpAddress.
+
+Note! If autoConfig = OFF this attribute is mandatory.
+Note! If the autoConfiguration is used for this IpAccessHostGpb (autoConfig = ON) this attribute cannot be set. This attribute is then set by the 'IpAccessAutoConfig MO'.
+Note! If the attribute is set, its value must not be the same as for attribute ipAddress2.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="ipAddress2">
+            <description>The second IpAddress.
+
+Note! If autoConfig = OFF this attribute is possible to set. This attribute should only be set if multi-homing is used for this host (i.e. two addresses defined).
+Note! If the autoConfiguration is used for this IpAccessHostGpb (autoConfig = ON) this attribute cannot be set. This attribute is then set by the 'IpAccessAutoConfig MO'.
+Note! If the attribute is set, its value must not be the same as for attribute 'ipAddress'.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="pathMTUDiscovery">
+            <description>Specifies whether path MTU discovery should be used by this host.
+
+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.</description>
+            <dataType>
+                <boolean>
+                    <defaultValue>false</defaultValue>
+                </boolean>
+            </dataType>
+        </attribute>
+        <attribute name="mtu">
+            <description>The maximum transfer unit.
+
+The MTU has a initial value of 1452 if pathMTUDiscovery is set to false.
+If pathMTUDiscovery is set to true, the initial value of MTU is 1452.
+
+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>72</min> <max>2048</max>
+                    </range>
+                    <defaultValue>1452</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="ipDefaultTtl">
+            <description>The default value inserted into the Time-To-Live field of the IP header of datagrams originated at this entity,
+whenever a TTL value is not supplied by the transport layer protocol.
+
+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.</description>
+            <dataType>
+                <long>
+                    <range>
+                        <min>1</min> <max>255</max>
+                    </range>
+                    <defaultValue>50</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="ipReasmTimeout">
+            <description>The maximum number of seconds which received fragments are 
+held while they are awaiting reassembly at this entity.
+
+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.
+
+Note! The value for this attribute has to be positive.</description>
+            <dataType>
+                <long>
+                    <defaultValue>300</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="nextHopIpAddr">
+            <description>The next hop IP address.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="nextHopIpAddr2">
+            <description>The secondary next hop IP address.
+
+Note! This attribute must only be set if one of the following conditions are fulfilled:
+1. Attribute 'ipAddress2' is set.
+2. Attribute 'autoConfig' = 'ON' and attribute 'autoConfigIdentity2' is set.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="networkPrefix">
+            <description>The network prefix.
+
+The prefix denotes how many bits that are used for calculating the subnet mask.
+
+Note! The default value 0 (zero) is most likely not possible to use and an other value should be submitted if this attribute is configured manually. 
+Note! If auto configuration is not used (autoConfig = OFF) this attribute must be set (i.e. this attribute is then 'mandatory').
+Note! If auto configuration is used (autoConfig = ON) this attribute cannot be set, networkPrefix is then set by the ipAccessAutoConfig MO class. 
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>32</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="networkPrefix2">
+            <description>The second network prefix.
+
+The prefix denotes how many bits that are used for calculating the subnet mask.
+
+Note! The default value 0 (zero) is most likely not possible to use and an other value should be submitted if this attribute is configured manually. 
+Note! If auto configuration is not used (autoConfig = OFF) and ipAddress2 is set this attribute must be set (i.e. this attribute is then 'mandatory').
+Note! If auto configuration is used (autoConfig = ON) this attribute cannot be set, networkPrefix2 is then set by the ipAccessAutoConfig MO class. </description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>32</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInReceives">
+            <description>The total number of input datagrams received from interfaces, including those received in error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInHdrErrors">
+            <description>The number of input datagrams discarded due to errors in their IP headers, including bad checksums, version number
+mismatch, other format errors, time-to-live exceeded, errors discovered in processing their IP options, etc.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInAddrErrors">
+            <description>The number of input datagrams discarded because the IP address in their IP header's destination field was not a
+valid address to be received at this entity.  This count includes invalid addresses (e.g., 0.0.0.0) and addresses of
+unsupported Classes (e.g., Class E).  For entities which are not IP routers and therefore do not forward datagrams, 
+this counter includes datagrams discarded because the destination address was not a local address.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInUnknownProtos">
+            <description>The number of locally-addressed datagrams received successfully but discarded because of an unknown or
+unsupported protocol.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInDiscards">
+            <description>The number of input IP datagrams for which no problems were encountered to prevent their continued processing, but which
+were discarded (e.g., for lack of buffer space).  Note that this counter does not include any datagrams discarded while
+awaiting re-assembly.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpInDelivers">
+            <description>The total number of input datagrams successfully delivered to IP user-protocols (including ICMP).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpOutRequests">
+            <description>The total number of IP datagrams which local IP user-protocols (including ICMP) supplied to IP in requests for
+transmission.  Note that this counter does not include any datagrams counted in ipForwDatagrams</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpOutDiscards">
+            <description>The number of output IP datagrams for which no problem was encountered to prevent their transmission to their
+destination, but which were discarded (e.g., for lack of buffer space).  Note that this counter would include
+datagrams counted in ipForwDatagrams if any such packets met this (discretionary) discard criterion.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpReasmReqds">
+            <description>The number of IP fragments received which needed to be reassembled at this entity.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpReasmOKs">
+            <description>The number of IP datagrams successfully re-assembled.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpReasmFails">
+            <description>The number of failures detected by the IP re-assembly algorithm (for whatever reason: timed out, errors, etc).
+Note that this is not necessarily a count of discarded IP fragments since some algorithms (notably the algorithm 
+in RFC 815) can lose track of the number of fragments by combining them as they are received.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpFragOKs">
+            <description>The number of IP datagrams that have been successfully fragmented at this entity.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpFragFails">
+            <description>The number of IP datagrams that have been discarded because they needed to be fragmented 
+at this entity but could not be, e.g., because their Don't Fragment flag was set.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIpFragCreates">
+            <description>The number of IP datagram fragments that have been generated as a result of fragmentation at this entity.
+</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInMsgs">
+            <description>The total number of ICMP messages which the entityreceived.
+Note that this counter includes all those counted by icmpInErrors</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInErrors">
+            <description>The number of ICMP messages which the entity received but determined as having
+ICMP-specific errors (bad ICMP checksums, bad length, etc.).</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInDestUnreachs">
+            <description>The number of ICMP Destination Unreachable messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInTimeExcds">
+            <description>The number of ICMP Time Exceeded messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInParamProbs">
+            <description>The number of ICMP Parameter Problem messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInSrcQuenchs">
+            <description>The number of ICMP Source Quench messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInRedirects">
+            <description>The number of ICMP Redirect messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInEchos">
+            <description>The number of ICMP Echo (request) messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpInEchoReps">
+            <description>The number of ICMP Echo Reply messages received.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutMsgs">
+            <description>The total number of ICMP messages which this entity attempted to send.
+Note that this counter includes all those counted by icmpOutErrors.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutErrors">
+            <description>The number of ICMP messages which this entity did not send due to problems discovered within ICMP such as a lack of
+buffers.  This value should not include errors discovered outside the ICMP layer such as the inability of IP to route the 
+resultant datagram.  In some implementations there may be no types of error which contribute to this counter's value.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutDestUnreachs">
+            <description>The number of ICMP Destination Unreachable messages sent.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutParmProbs">
+            <description>The number of ICMP Parameter Problem messages sent.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutEchos">
+            <description>The number of ICMP Echo (request) messages sent.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmIcmpOutEchoReps">
+            <description>The number of ICMP Echo Reply messages sent.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUdpInDatagrams">
+            <description>The total number of UDP datagrams delivered to UDP users.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUdpNoPorts">
+            <description>The total number of received UDP datagrams for which there was no application at the destination port.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUdpInErrors">
+            <description>The number of received UDP datagrams that could not be delivered for 
+reasons other than the lack of an application at the destination port.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmUdpOutDatagrams">
+            <description>The total number of UDP datagrams sent from this entity.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInUcastPkts">
+            <description>Performance monitoring counter for the number of input unicast packets delivered to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfOutUcastPkts">
+            <description>Performance monitoring counter for the number of out unicast packets delivered to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInErrors">
+            <description>Performance monitoring counter for the number of input packets discarded due to any error.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInDiscards">
+            <description>Performance monitoring counter for the number of input packets discarded due to resource limitations.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInBroadcastPkts">
+            <description>Performance monitoring counter for the number of input broadcast packets delivered to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfInMulticastPkts">
+            <description>Performance monitoring counter for the number of input multicast packets delivered to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfOutBroadcastPkts">
+            <description>Performance monitoring counter for the number of output broadcast packets delivered to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfIfOutMulticastPkts">
+            <description>Performance monitoring counter for the number of output multicast packets delivered to higher layer.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="SystemFunctions">
+        <description>This MO structures the SystemFunctions of the managed element. It is created automatically and cannot be deleted.
+
+The local distinguished name of this MO is ManagedElement=1, SystemFunctions=1.</description>
+        <systemCreated/>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="SystemFunctionsId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Licensing">
+        <description>This MO represents the Licensing (Software Keys) functions in Cello.</description>
+        <systemCreated/>
+        <attribute name="LicensingId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="emergencyStateInfo">
+            <description>This attribute holds information about the emergency status and the time remaining in the current state.
+
+Note! If the node is in emergency state USE_DEGRADED, or the emergency state is USE_DISABLED, the the value of'time' is insignificant.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <structRef name="EmergencyInfo"/>
+            </dataType>
+        </attribute>
+        <attribute name="licenseFileUrl">
+            <description>This attribute returns the URL to the License Key File so it can be viewed with an XML capable web browser
+in case this is a licensed node.
+
+Note! In case the node is not licensed, an empty string will be returned.</description>
+            <noNotification/>
+            <readOnly/>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>256</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <action name="updateLicenseKeyFile">
+            <description>This action sends a request to the FTP/SFTP server to update the license key file.
+
+User Id for login to FTP/SFTP server  where license key files are located.
+If a null string userId is given, anonymous FTP/SFTP transfer is assumed.
+Max length is 20 characters.
+
+Password for login to the FTP/SFTP server  where license key files are located.
+Max length is 20 characters.
+
+The IpAddress of the FTP/SFTP server where license key files are located.
+Max length is 16 characters.
+
+Source name and path of the license key file on the FTP/SFTP server.
+Max length is 256 charcters.
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+            <parameter name="userId">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="password">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="ipAddress">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+            <parameter name="sFile">
+                <in/>
+                <dataType>
+                    <string/>
+                </dataType>
+            </parameter>
+        </action>
+        <action name="setEmergencyState">
+            <description>This action sets the license server into emergency state.
+I.e. opens up all licensed features and capacity restrictions.
+Disabling emergency state is done by loading a new license key file.
+
+Note! This action does not require a transaction.</description>
+            <returnType>
+                <void/>
+            </returnType>
+        </action>
+    </class>
+
+    <class name="TimingUnit2">
+        <description>This MO represents a timing unit2 (reference clock) in the node.
+
+The corresponding Program shall be of LoadModuleLoaderType, SpmFpgaLoader.</description>
+        <attribute name="userLabel">
+            <description>Label for free use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Operational state of TimingUnit</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatus">
+            <description>The availability status of the TimingUnit.
+
+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="TimingUnit2Id">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="SccpPolicing">
+        <description>The SccpPolicing MO represents the policing function in CPP.
+
+The originatingMtp3bSpc  is a madatory attribute for policing in one local node (i.e. a SRP in one NI).
+For policing between two local nodes (i.e. a SRP between two NIs) the originatingMtp3bSpc can be replaced by the originatingSccpSpId.
+Optional attributes for policing in one local node (i.e a SRP in one NI) are destinationMtp3bSpc, destinationSccpSsn, originatingSccpSsn and policingGlobalTitle.
+For policing between two local nodes (i.e. a SRP between two NIs) the destinationMtp3bSpc can be replaced by the destinationSccpSpId.</description>
+        <attribute name="SccpPolicingId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="originatingMtp3bSpc">
+            <description>The value of the SPC (Signaling Point Code).
+
+Note! If the 'originatingSccpSpId' is specified the 'originatingMtp3bSpc' is invalid.  
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>16777215</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="destinationMtp3bSpc">
+            <description>The value of the destination SPC (Signaling Point Code).
+
+Note! The default value 0 (zero) means that no SPC is defined.
+Note! If no 'destinationSccpSp' is defined and the value of 'destinationMtp3bSpc' is set to 0 (zero), all Signalling Point Codes (SPC) are valid.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>16777215</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="originatingSccpSpId">
+            <description>The identity of the originating SccpSp MO must be used for policing between local nodes.
+
+Note! If the 'originatingSccpSpId' is specified the 'originatingMtp3bSpc' is invalid.  
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="originatingSccpSsn">
+            <description>The value of SSN in CgPA (Calling Party Address)
+
+Note! The value 0 (zero) means that all ssN (Sub System Number) are valid.
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="destinationSccpSpId">
+            <description>The identity of the destination SccpSp MO can be used for policing between local nodes.
+
+Note! If the 'destinationSccpSpId' is specified the 'destinationMtp3bSpc' is invalid.  
+Note! If no destination 'destinationSccpSp' is defined and the value of 'destinationMtp3bSpc' is set to 0, all local nodes are valid. 
+</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="destinationSccpSsn">
+            <description>The value of SSN inCdPA (Called Party Address).
+
+Note! The valu 0 (zero) means tha all ssN (Sub System Number) are valid.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="policingGlobalTitle">
+            <description>The Policing Global Title attribute allows to optionally police on Global Title
+
+Default value is considered as no policing Global Title and all GTs are valid.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <structRef name="GlobalTitleData"/>
+            </dataType>
+        </attribute>
+        <attribute name="discardOrReturnServiceMsg">
+            <description>For a policing case whether to discard or return Service Messages, if the return option is set.</description>
+            <dataType>
+                <enumRef name="DiscardReturnServiceMsg">
+                    <defaultValue>DISCARD</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfRejectMsg">
+            <description>Performance monitoring counter for the number of rejected messages.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="SccpAccountingCriteria">
+        <description>The SccpAccountingCriteria MO and the SccpSp MO represents the accounting function in CPP.
+
+Attribute usageType specifies Accounting Remuneration (incoming GT messages) or  Verification (outgoing GT messages).
+
+For Remuneration a SccpGlobalTitle MOId in attribute globalTitleId must be defined.
+For Verification a SccpGlobalTitle MOid is defined in attribute globalTitleId, or a SccpEntitySet MOid is defined if accounting shall be made on the resulting new GT.
+
+The attribute ssN is optional .
+The Mtp3bSrs MOid (including an SPC) in attribute pointerId is optional for accounting in one local node (SRP in one NI).
+The SccpSp MOid in attribute pointerId is optional for accounting between two local nodes (SRP between two NIs).
+Attribute countType specifies if Messages och Octets shall be counted.
+Start and stop of accounting and output period for the accounting file is specified in the SccpSp MO.</description>
+        <attribute name="SccpAccountingCriteriaId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Label free for use.</description>
+            <dataType>
+                <string>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="usageType">
+            <description>This attribute specifies if the MO is used for renumeration or verification.
+
+0 = Verification Criteria to detect outgoing massages that will be charged in the next relay node.
+
+1 = Renumeration Criteria to detect incoming messages for relaying, that will be charged.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long/>
+            </dataType>
+        </attribute>
+        <attribute name="ssN">
+            <description>Subsystem Number this Accounting Criteria applies to.
+SubSystem Number 0 (zero) means that any SSN in CdPA (Called Party Address) is valid.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <long>
+                    <range>
+                        <min>0</min> <max>255</max>
+                    </range>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="countType">
+            <description>Specifies type of countes that should be activated.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <enumRef name="SccpCountType">
+                    <defaultValue>MESSAGES</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="globalTitleId">
+            <description>The identity of the SccpGlobalTitle MO or the SccpEntitySet MO used by this MO.</description>
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfMsg">
+            <description>Performance monitoring counter for the number of messages, both incoming and outgoing.
+
+Note! If 'countType' is set to 'OCTETS' this counter is not valid.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pmNoOfOctets">
+            <description>Performance monitoring counter for the number of octets, both incoming and outgoing.
+
+Note! If 'countType' is set to 'MESSAGES this counter is not valid.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <long>
+                    <defaultValue>0</defaultValue>
+                </long>
+            </dataType>
+        </attribute>
+        <attribute name="pointerId">
+            <description>The pointer is an instance of a Mtp3bSrs MO OR an instance of a SccpSP MO.
+
+Note! If no pointerId is set all Signaling Point Codes (SPC) and all Sccp SP identities are valid.
+Note! It is not possible to submit the Id of the SccpSp that the SccpAccountingCriteria belongs to.</description>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <moRef name="ManagedObject"/>
+            </dataType>
+        </attribute>
+    </class>
+
+    <class name="Cbu">
+        <description>This MO models the Cbu (Node Control Board) board in CPP.
+The Cbu board integrates the functionality of TUB, SCB, GPB and ETB (ET-MC1) into one Plug-In Unit.
+
+Note! The 'operationalState' is set to disabled if one of the functional parts is faulty. Even if the Cbu is marked with 'operationalState' DISABLED, parts of the Cbu can still be operational.
+
+Note! A functional part on a Cbu board can only be redundant with the same functional part on another Cbu board and thus not with that functional part implemented on a discrete board. Also note that redundancy is only applicable for the GPB part and the TimingUnit part of the Cbu board..
+
+Note! On the Cbu board it is only possible to configure a maximum of 4 physical path terminations. These can be of type E1PhysPathTerm, J1PhyspathTerm or T1PhyspathTerm. It is not possible to create physical path terminations of different standards on the same board.
+
+Note! The Gpu part of the Cbu board (General Processor Unit) retrieves its 'availabilityStatus' from the PlugInUnit MO, thus not represented on the Cbu MO.
+
+Note! When the ET-MC1 is part of the Cbu board it is only possible to configure 4 physical ports as either E1 (ETSI), J1 (TTC)  or T1 (ANSI).
+
+Note! This unit may only be inserted in slot 1 and 24 (or more accurately at APN=1 and 0 in a non-standard subrack). If redundant configuration is needed, two Cbu's must be inserted in the subrack.
+If only one Cbu is used it must be placed in slot 1 (in a non-standard subrack) to be able to read the product information data of the subrack</description>
+        <attribute name="CbuId">
+            <mandatory/>
+            <noNotification/>
+            <restricted/>
+            <dataType>
+                <string/>
+            </dataType>
+        </attribute>
+        <attribute name="userLabel">
+            <description>Provides the possibility to put a user-friendly label on the MO instance. 
+
+Note! This attribute cannot be used for uniquely identifing the MO.</description>
+            <dataType>
+                <string>
+                    <lengthRange>
+                        <min>0</min> <max>128</max>
+                    </lengthRange>
+                    <defaultValue>""</defaultValue>
+                </string>
+            </dataType>
+        </attribute>
+        <attribute name="operationalState">
+            <description>Enabled or disabled according to the actual operational state of the NCB board.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="OperState">
+                    <defaultValue>disabled</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatusEt">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.
+The 'availabilityStatusEt' gives the availability status for the ET part of the NCB board.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+        <attribute name="availabilityStatusTu">
+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.
+The 'availabilityStatusTu' gives the availability status for the Timing Unit part of the NCB board.</description>
+            <noNotification/>
+            <nonPersistent/>
+            <readOnly/>
+            <dataType>
+                <enumRef name="AvailabilityStatus">
+                    <defaultValue>NO_STATUS</defaultValue>
+                </enumRef>
+            </dataType>
+        </attribute>
+    </class>
+
+    <relationship name="ManagedElement_to_TransportNetwork">
+        <containment>
+            <parent>
+                <hasClass name="ManagedElement"/>
+            </parent>
+            <child>
+                <hasClass name="TransportNetwork"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Synchronization">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Synchronization"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_SccpSp">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="SccpSp"/>
+                <cardinality>
+                    <min>0</min> <max>24</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_UniSaalProfile">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="UniSaalProfile"/>
+                <cardinality>
+                    <min>0</min> <max>300</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_UniSaalTp">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="UniSaalTp"/>
+                <cardinality>
+                    <min>0</min> <max>4800</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Aal0TpVccTp">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Aal0TpVccTp"/>
+                <cardinality>
+                    <min>0</min> <max>2200</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Aal5TpVccTp">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Aal5TpVccTp"/>
+                <cardinality>
+                    <min>0</min> <max>6000</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_AtmPort">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="AtmPort"/>
+                <cardinality>
+                    <min>0</min> <max>500</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_NniSaalProfile">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="NniSaalProfile"/>
+                <cardinality>
+                    <min>0</min> <max>50</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_NniSaalTp">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="NniSaalTp"/>
+                <cardinality>
+                    <min>0</min> <max>600</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_AtmTrafficDescriptor">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="AtmTrafficDescriptor"/>
+                <cardinality>
+                    <min>0</min> <max>1000</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Aal2PathVccTp">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Aal2PathVccTp"/>
+                <cardinality>
+                    <min>0</min> <max>2000</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Aal2RoutingCase">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Aal2RoutingCase"/>
+                <cardinality>
+                    <min>0</min> <max>900</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Aal2Sp">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Aal2Sp"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_AtmCrossConnection">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="AtmCrossConnection"/>
+                <cardinality>
+                    <min>0</min> <max>5000</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Mtp2TpItu">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp2TpItu"/>
+                <cardinality>
+                    <min>0</min> <max>256</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Mtp2TpAnsi">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp2TpAnsi"/>
+                <cardinality>
+                    <min>0</min> <max>256</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Aal1TpVccTp">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Aal1TpVccTp"/>
+                <cardinality>
+                    <min>0</min> <max>1000</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Mtp3bSpAnsi">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSpAnsi"/>
+                <cardinality>
+                    <min>0</min> <max>24</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Mtp3bSpItu">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSpItu"/>
+                <cardinality>
+                    <min>0</min> <max>24</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Mtp3bSpTtc">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSpTtc"/>
+                <cardinality>
+                    <min>0</min> <max>24</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Mtp2ProfileAnsi">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp2ProfileAnsi"/>
+                <cardinality>
+                    <min>0</min> <max>256</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Mtp2ProfileItu">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp2ProfileItu"/>
+                <cardinality>
+                    <min>0</min> <max>256</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Mtp2ProfileChina">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp2ProfileChina"/>
+                <cardinality>
+                    <min>0</min> <max>256</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Mtp2TpChina">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp2TpChina"/>
+                <cardinality>
+                    <min>0</min> <max>256</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Mtp3bSpChina">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSpChina"/>
+                <cardinality>
+                    <min>0</min> <max>24</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Mspg">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Mspg"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_ImaGroup">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="ImaGroup"/>
+                <cardinality>
+                    <min>0</min> <max>200</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Aal2QosProfile">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Aal2QosProfile"/>
+                <cardinality>
+                    <min>0</min> <max>20</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Aal2QosCodePointProfile">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Aal2QosCodePointProfile"/>
+                <cardinality>
+                    <min>0</min> <max>20</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TransportNetwork_to_Sctp">
+        <containment>
+            <parent>
+                <hasClass name="TransportNetwork"/>
+            </parent>
+            <child>
+                <hasClass name="Sctp"/>
+                <cardinality>
+                    <min>0</min> <max>10</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Subrack_to_Slot">
+        <containment>
+            <parent>
+                <hasClass name="Subrack"/>
+            </parent>
+            <child>
+                <hasClass name="Slot"/>
+                <cardinality>
+                    <min>1</min> <max>28</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Slot_to_PlugInUnit">
+        <containment>
+            <parent>
+                <hasClass name="Slot"/>
+            </parent>
+            <child>
+                <hasClass name="PlugInUnit"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Slot_to_ManagedObject">
+        <containment>
+            <parent>
+                <hasClass name="Slot"/>
+            </parent>
+            <child>
+                <hasClass name="ManagedObject"/>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="ManagedElement_to_ManagedObject">
+        <containment>
+            <parent>
+                <hasClass name="ManagedElement"/>
+            </parent>
+            <child>
+                <hasClass name="ManagedObject"/>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_ManagedObject">
+        <description>This containment relation indicated that any kind of board may be used to specilize PlugInUnit.</description>
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="ManagedObject"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Subrack_to_ManagedObject">
+        <containment>
+            <parent>
+                <hasClass name="Subrack"/>
+            </parent>
+            <child>
+                <hasClass name="ManagedObject"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="VpcTp_to_VclTp">
+        <containment>
+            <parent>
+                <hasClass name="VpcTp"/>
+            </parent>
+            <child>
+                <hasClass name="VclTp"/>
+                <cardinality>
+                    <min>0</min> <max>5000</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="ManagedElement_to_Equipment">
+        <containment>
+            <parent>
+                <hasClass name="ManagedElement"/>
+            </parent>
+            <child>
+                <hasClass name="Equipment"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="ManagedElement_to_IpSystem">
+        <containment>
+            <parent>
+                <hasClass name="ManagedElement"/>
+            </parent>
+            <child>
+                <hasClass name="IpSystem"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="ManagedElement_to_SwManagement">
+        <containment>
+            <parent>
+                <hasClass name="ManagedElement"/>
+            </parent>
+            <child>
+                <hasClass name="SwManagement"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="ManagedElement_to_SwitchFabric">
+        <containment>
+            <parent>
+                <hasClass name="ManagedElement"/>
+            </parent>
+            <child>
+                <hasClass name="SwitchFabric"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="ManagedElement_to_ManagedElementData">
+        <containment>
+            <parent>
+                <hasClass name="ManagedElement"/>
+            </parent>
+            <child>
+                <hasClass name="ManagedElementData"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="ManagedElement_to_SystemFunctions">
+        <containment>
+            <parent>
+                <hasClass name="ManagedElement"/>
+            </parent>
+            <child>
+                <hasClass name="SystemFunctions"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Equipment_to_Subrack">
+        <containment>
+            <parent>
+                <hasClass name="Equipment"/>
+            </parent>
+            <child>
+                <hasClass name="Subrack"/>
+                <cardinality>
+                    <min>0</min> <max>9</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Equipment_to_Jvm">
+        <containment>
+            <parent>
+                <hasClass name="Equipment"/>
+            </parent>
+            <child>
+                <hasClass name="Jvm"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Subrack_to_Fan">
+        <containment>
+            <parent>
+                <hasClass name="Subrack"/>
+            </parent>
+            <child>
+                <hasClass name="Fan"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SwManagement_to_LoadModule">
+        <containment>
+            <parent>
+                <hasClass name="SwManagement"/>
+            </parent>
+            <child>
+                <hasClass name="LoadModule"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SccpScrc_to_SccpApLocal">
+        <description>The SccpApLocal represents a local SSN, no relation exists to an Mtp3bAp
+
+Of the possible 216  SccpAps allowed on a node, a maximum of 16 are allowed to be local, and a maximum of 200 are allowed to be remote.</description>
+        <containment>
+            <parent>
+                <hasClass name="SccpScrc"/>
+            </parent>
+            <child>
+                <hasClass name="SccpApLocal"/>
+                <cardinality>
+                    <min>0</min> <max>16</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SccpSp_to_SccpScrc">
+        <containment>
+            <parent>
+                <hasClass name="SccpSp"/>
+            </parent>
+            <child>
+                <hasClass name="SccpScrc"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SccpScrc_to_SccpEntitySet">
+        <containment>
+            <parent>
+                <hasClass name="SccpScrc"/>
+            </parent>
+            <child>
+                <hasClass name="SccpEntitySet"/>
+                <cardinality>
+                    <min>0</min> <max>2048</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SccpScrc_to_SccpGlobalTitle">
+        <containment>
+            <parent>
+                <hasClass name="SccpScrc"/>
+            </parent>
+            <child>
+                <hasClass name="SccpGlobalTitle"/>
+                <cardinality>
+                    <min>0</min> <max>2048</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SccpScrc_to_SccpApRemote">
+        <containment>
+            <parent>
+                <hasClass name="SccpScrc"/>
+            </parent>
+            <child>
+                <hasClass name="SccpApRemote"/>
+                <cardinality>
+                    <min>0</min> <max>200</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SccpScrc_to_SccpPolicing">
+        <containment>
+            <parent>
+                <hasClass name="SccpScrc"/>
+            </parent>
+            <child>
+                <hasClass name="SccpPolicing"/>
+                <cardinality>
+                    <min>0</min> <max>1024</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SccpScrc_to_SccpAccountingCriteria">
+        <containment>
+            <parent>
+                <hasClass name="SccpScrc"/>
+            </parent>
+            <child>
+                <hasClass name="SccpAccountingCriteria"/>
+                <cardinality>
+                    <min>0</min> <max>100</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_Program">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="Program"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Spm_to_Program">
+        <containment>
+            <parent>
+                <hasClass name="Spm"/>
+            </parent>
+            <child>
+                <hasClass name="Program"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TimingUnit_to_Program">
+        <containment>
+            <parent>
+                <hasClass name="TimingUnit"/>
+            </parent>
+            <child>
+                <hasClass name="Program"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etm4_to_Program">
+        <containment>
+            <parent>
+                <hasClass name="Etm4"/>
+            </parent>
+            <child>
+                <hasClass name="Program"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etm1_to_Program">
+        <containment>
+            <parent>
+                <hasClass name="Etm1"/>
+            </parent>
+            <child>
+                <hasClass name="Program"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etmc1_to_Program">
+        <containment>
+            <parent>
+                <hasClass name="Etmc1"/>
+            </parent>
+            <child>
+                <hasClass name="Program"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etmc41_to_Program">
+        <containment>
+            <parent>
+                <hasClass name="Etmc41"/>
+            </parent>
+            <child>
+                <hasClass name="Program"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TimingUnit2_to_Program">
+        <containment>
+            <parent>
+                <hasClass name="TimingUnit2"/>
+            </parent>
+            <child>
+                <hasClass name="Program"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etm3_to_Program">
+        <containment>
+            <parent>
+                <hasClass name="Etm3"/>
+            </parent>
+            <child>
+                <hasClass name="Program"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Spu_to_Program">
+        <containment>
+            <parent>
+                <hasClass name="Spu"/>
+            </parent>
+            <child>
+                <hasClass name="Program"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Fan_to_Program">
+        <containment>
+            <parent>
+                <hasClass name="Fan"/>
+            </parent>
+            <child>
+                <hasClass name="Program"/>
+                <cardinality>
+                    <min>1</min> <max>2</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etm1_to_E1PhysPathTerm">
+        <containment>
+            <parent>
+                <hasClass name="Etm1"/>
+            </parent>
+            <child>
+                <hasClass name="E1PhysPathTerm"/>
+                <cardinality>
+                    <min>0</min> <max>8</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etmc1_to_E1PhysPathTerm">
+        <containment>
+            <parent>
+                <hasClass name="Etmc1"/>
+            </parent>
+            <child>
+                <hasClass name="E1PhysPathTerm"/>
+                <cardinality>
+                    <min>0</min> <max>8</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="E1PhysPathTerm_to_Ds0Bundle">
+        <containment>
+            <parent>
+                <hasClass name="E1PhysPathTerm"/>
+            </parent>
+            <child>
+                <hasClass name="Ds0Bundle"/>
+                <cardinality>
+                    <min>0</min> <max>31</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etm1_to_J1PhysPathTerm">
+        <containment>
+            <parent>
+                <hasClass name="Etm1"/>
+            </parent>
+            <child>
+                <hasClass name="J1PhysPathTerm"/>
+                <cardinality>
+                    <min>0</min> <max>8</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etmc1_to_J1PhysPathTerm">
+        <containment>
+            <parent>
+                <hasClass name="Etmc1"/>
+            </parent>
+            <child>
+                <hasClass name="J1PhysPathTerm"/>
+                <cardinality>
+                    <min>0</min> <max>8</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="J1PhysPathTerm_to_Ds0Bundle">
+        <containment>
+            <parent>
+                <hasClass name="J1PhysPathTerm"/>
+            </parent>
+            <child>
+                <hasClass name="Ds0Bundle"/>
+                <cardinality>
+                    <min>0</min> <max>24</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="AtmPort_to_VplTp">
+        <containment>
+            <parent>
+                <hasClass name="AtmPort"/>
+            </parent>
+            <child>
+                <hasClass name="VplTp"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpChina_to_Mtp3bAp">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpChina"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bAp"/>
+                <cardinality>
+                    <min>0</min> <max>510</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpAnsi_to_Mtp3bAp">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpAnsi"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bAp"/>
+                <cardinality>
+                    <min>0</min> <max>510</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpItu_to_Mtp3bAp">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpItu"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bAp"/>
+                <cardinality>
+                    <min>0</min> <max>510</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpTtc_to_Mtp3bAp">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpTtc"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bAp"/>
+                <cardinality>
+                    <min>0</min> <max>510</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpItu_to_Mtp3bSrs">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpItu"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSrs"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpTtc_to_Mtp3bSrs">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpTtc"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSrs"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpChina_to_Mtp3bSrs">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpChina"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSrs"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSrs_to_Mtp3bSr">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSrs"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSr"/>
+                <cardinality>
+                    <min>0</min> <max>5</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpAnsi_to_Mtp3bSrs">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpAnsi"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSrs"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_Etm1">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="Etm1"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_Spu">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="Spu"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_SwitchCoreUnit">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="SwitchCoreUnit"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_GeneralProcessorUnit">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="GeneralProcessorUnit"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_Etm4">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="Etm4"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_TimingUnit">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="TimingUnit"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_SwitchExtensionUnit">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="SwitchExtensionUnit"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_Etmc1">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="Etmc1"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_Etmc41">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="Etmc41"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_Etm3">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="Etm3"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_TimingUnit2">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="TimingUnit2"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="PlugInUnit_to_Cbu">
+        <containment>
+            <parent>
+                <hasClass name="PlugInUnit"/>
+            </parent>
+            <child>
+                <hasClass name="Cbu"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpChina_to_Mtp3bSls">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpChina"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSls"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpItu_to_Mtp3bSls">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpItu"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSls"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpTtc_to_Mtp3bSls">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpTtc"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSls"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpAnsi_to_Mtp3bSls">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpAnsi"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSls"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpChina_to_Mtp3bSls_0">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpChina"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSls"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpAnsi_to_Mtp3bSls_0">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpAnsi"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSls"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpItu_to_Mtp3bSls_0">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpItu"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSls"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpTtc_to_Mtp3bSls_0">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpTtc"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSls"/>
+                <cardinality>
+                    <min>0</min> <max>255</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSls_to_Mtp3bSlAnsi">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSls"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSlAnsi"/>
+                <cardinality>
+                    <min>0</min> <max>16</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSls_to_Mtp3bSlItu">
+        <description>Multiplicity: 0..16</description>
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSls"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSlItu"/>
+                <cardinality>
+                    <min>0</min> <max>16</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSls_to_Mtp3bSlTtc">
+        <description>Multiplicity: 0..16</description>
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSls"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSlTtc"/>
+                <cardinality>
+                    <min>0</min> <max>16</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSls_to_Mtp3bSlChina">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSls"/>
+            </parent>
+            <child>
+                <hasClass name="Mtp3bSlChina"/>
+                <cardinality>
+                    <min>0</min> <max>16</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="IpSystem_to_Ip">
+        <containment>
+            <parent>
+                <hasClass name="IpSystem"/>
+            </parent>
+            <child>
+                <hasClass name="Ip"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="IpSystem_to_Ospf">
+        <containment>
+            <parent>
+                <hasClass name="IpSystem"/>
+            </parent>
+            <child>
+                <hasClass name="Ospf"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="IpSystem_to_IpAccessAutoConfig">
+        <containment>
+            <parent>
+                <hasClass name="IpSystem"/>
+            </parent>
+            <child>
+                <hasClass name="IpAccessAutoConfig"/>
+                <cardinality>
+                    <min>0</min> <max>32</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="IpSystem_to_IpAccessHostMsb">
+        <containment>
+            <parent>
+                <hasClass name="IpSystem"/>
+            </parent>
+            <child>
+                <hasClass name="IpAccessHostMsb"/>
+                <cardinality>
+                    <min>0</min> <max>128</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="IpSystem_to_IpAccessHostGpb">
+        <containment>
+            <parent>
+                <hasClass name="IpSystem"/>
+            </parent>
+            <child>
+                <hasClass name="IpAccessHostGpb"/>
+                <cardinality>
+                    <min>0</min> <max>128</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Ip_to_IpAtmLink">
+        <containment>
+            <parent>
+                <hasClass name="Ip"/>
+            </parent>
+            <child>
+                <hasClass name="IpAtmLink"/>
+                <cardinality>
+                    <min>0</min> <max>500</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Ip_to_EthernetLink">
+        <containment>
+            <parent>
+                <hasClass name="Ip"/>
+            </parent>
+            <child>
+                <hasClass name="EthernetLink"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Ip_to_IpRoutingTable">
+        <containment>
+            <parent>
+                <hasClass name="Ip"/>
+            </parent>
+            <child>
+                <hasClass name="IpRoutingTable"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Aal2Sp_to_Aal2Ap">
+        <containment>
+            <parent>
+                <hasClass name="Aal2Sp"/>
+            </parent>
+            <child>
+                <hasClass name="Aal2Ap"/>
+                <cardinality>
+                    <min>0</min> <max>850</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Aal2Ap_to_Aal2PathDistributionUnit">
+        <containment>
+            <parent>
+                <hasClass name="Aal2Ap"/>
+            </parent>
+            <child>
+                <hasClass name="Aal2PathDistributionUnit"/>
+                <cardinality>
+                    <min>0</min> <max>26</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etm1_to_T1PhysPathTerm">
+        <containment>
+            <parent>
+                <hasClass name="Etm1"/>
+            </parent>
+            <child>
+                <hasClass name="T1PhysPathTerm"/>
+                <cardinality>
+                    <min>0</min> <max>8</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TimingUnit_to_TuSyncRef">
+        <containment>
+            <parent>
+                <hasClass name="TimingUnit"/>
+            </parent>
+            <child>
+                <hasClass name="TuSyncRef"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="TimingUnit2_to_TuSyncRef">
+        <containment>
+            <parent>
+                <hasClass name="TimingUnit2"/>
+            </parent>
+            <child>
+                <hasClass name="TuSyncRef"/>
+                <cardinality>
+                    <min>0</min> <max>2</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Spu_to_Spm">
+        <containment>
+            <parent>
+                <hasClass name="Spu"/>
+            </parent>
+            <child>
+                <hasClass name="Spm"/>
+                <cardinality>
+                    <min>0</min> <max>5</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SwManagement_to_ConfigurationVersion">
+        <containment>
+            <parent>
+                <hasClass name="SwManagement"/>
+            </parent>
+            <child>
+                <hasClass name="ConfigurationVersion"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SwManagement_to_UpgradePackage">
+        <containment>
+            <parent>
+                <hasClass name="SwManagement"/>
+            </parent>
+            <child>
+                <hasClass name="UpgradePackage"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SwManagement_to_Repertoire">
+        <containment>
+            <parent>
+                <hasClass name="SwManagement"/>
+            </parent>
+            <child>
+                <hasClass name="Repertoire"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SwManagement_to_PiuType">
+        <containment>
+            <parent>
+                <hasClass name="SwManagement"/>
+            </parent>
+            <child>
+                <hasClass name="PiuType"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SwManagement_to_SwAllocation">
+        <containment>
+            <parent>
+                <hasClass name="SwManagement"/>
+            </parent>
+            <child>
+                <hasClass name="SwAllocation"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SwManagement_to_ReliableProgramUniter">
+        <containment>
+            <parent>
+                <hasClass name="SwManagement"/>
+            </parent>
+            <child>
+                <hasClass name="ReliableProgramUniter"/>
+                <cardinality>
+                    <min>0</min>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Ospf_to_OspfInterface">
+        <containment>
+            <parent>
+                <hasClass name="Ospf"/>
+            </parent>
+            <child>
+                <hasClass name="OspfInterface"/>
+                <cardinality>
+                    <min>0</min> <max>32</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Ospf_to_OspfArea">
+        <containment>
+            <parent>
+                <hasClass name="Ospf"/>
+            </parent>
+            <child>
+                <hasClass name="OspfArea"/>
+                <cardinality>
+                    <min>1</min> <max>4</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Cbu_to_GeneralProcessorUnit">
+        <containment>
+            <parent>
+                <hasClass name="Cbu"/>
+            </parent>
+            <child>
+                <hasClass name="GeneralProcessorUnit"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="GeneralProcessorUnit_to_MediumAccessUnit">
+        <containment>
+            <parent>
+                <hasClass name="GeneralProcessorUnit"/>
+            </parent>
+            <child>
+                <hasClass name="MediumAccessUnit"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SwitchFabric_to_SwitchModule">
+        <containment>
+            <parent>
+                <hasClass name="SwitchFabric"/>
+            </parent>
+            <child>
+                <hasClass name="SwitchModule"/>
+                <cardinality>
+                    <min>0</min> <max>32</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SwitchFabric_to_InternalLinkGroup">
+        <containment>
+            <parent>
+                <hasClass name="SwitchFabric"/>
+            </parent>
+            <child>
+                <hasClass name="InternalLinkGroup"/>
+                <cardinality>
+                    <min>0</min> <max>31</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="InternalLinkGroup_to_SwitchInternalLink">
+        <containment>
+            <parent>
+                <hasClass name="InternalLinkGroup"/>
+            </parent>
+            <child>
+                <hasClass name="SwitchInternalLink"/>
+                <cardinality>
+                    <min>0</min> <max>8</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etm4_to_Os155SpiTtp">
+        <containment>
+            <parent>
+                <hasClass name="Etm4"/>
+            </parent>
+            <child>
+                <hasClass name="Os155SpiTtp"/>
+                <cardinality>
+                    <min>0</min> <max>2</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="VplTp_to_VpcTp">
+        <containment>
+            <parent>
+                <hasClass name="VplTp"/>
+            </parent>
+            <child>
+                <hasClass name="VpcTp"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="E1Ttp_to_Ds0Bundle">
+        <containment>
+            <parent>
+                <hasClass name="E1Ttp"/>
+            </parent>
+            <child>
+                <hasClass name="Ds0Bundle"/>
+                <cardinality>
+                    <min>0</min> <max>31</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="T1PhysPathTerm_to_Ds0Bundle">
+        <containment>
+            <parent>
+                <hasClass name="T1PhysPathTerm"/>
+            </parent>
+            <child>
+                <hasClass name="Ds0Bundle"/>
+                <cardinality>
+                    <min>0</min> <max>24</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="T1Ttp_to_Ds0Bundle">
+        <containment>
+            <parent>
+                <hasClass name="T1Ttp"/>
+            </parent>
+            <child>
+                <hasClass name="Ds0Bundle"/>
+                <cardinality>
+                    <min>0</min> <max>24</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpAnsi_to_M3uAssociation">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpAnsi"/>
+            </parent>
+            <child>
+                <hasClass name="M3uAssociation"/>
+                <cardinality>
+                    <min>0</min> <max>512</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpItu_to_M3uAssociation">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpItu"/>
+            </parent>
+            <child>
+                <hasClass name="M3uAssociation"/>
+                <cardinality>
+                    <min>0</min> <max>512</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Vc12Ttp_to_E1Ttp">
+        <containment>
+            <parent>
+                <hasClass name="Vc12Ttp"/>
+            </parent>
+            <child>
+                <hasClass name="E1Ttp"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Os155SpiTtp_to_Vc4Ttp">
+        <containment>
+            <parent>
+                <hasClass name="Os155SpiTtp"/>
+            </parent>
+            <child>
+                <hasClass name="Vc4Ttp"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Vc4Ttp_to_Vc12Ttp">
+        <containment>
+            <parent>
+                <hasClass name="Vc4Ttp"/>
+            </parent>
+            <child>
+                <hasClass name="Vc12Ttp"/>
+                <cardinality>
+                    <min>0</min> <max>63</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etmc41_to_Os155SpiTtp">
+        <containment>
+            <parent>
+                <hasClass name="Etmc41"/>
+            </parent>
+            <child>
+                <hasClass name="Os155SpiTtp"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Os155SpiTtp_to_Sts3CspeTtp">
+        <containment>
+            <parent>
+                <hasClass name="Os155SpiTtp"/>
+            </parent>
+            <child>
+                <hasClass name="Sts3CspeTtp"/>
+                <cardinality>
+                    <min>0</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Os155SpiTtp_to_Sts1SpeTtp">
+        <containment>
+            <parent>
+                <hasClass name="Os155SpiTtp"/>
+            </parent>
+            <child>
+                <hasClass name="Sts1SpeTtp"/>
+                <cardinality>
+                    <min>0</min> <max>3</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Cbu_to_Etmc1">
+        <containment>
+            <parent>
+                <hasClass name="Cbu"/>
+            </parent>
+            <child>
+                <hasClass name="Etmc1"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etmc1_to_T1PhysPathTerm">
+        <containment>
+            <parent>
+                <hasClass name="Etmc1"/>
+            </parent>
+            <child>
+                <hasClass name="T1PhysPathTerm"/>
+                <cardinality>
+                    <min>0</min> <max>8</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Mtp3bSpChina_to_M3uAssociation">
+        <containment>
+            <parent>
+                <hasClass name="Mtp3bSpChina"/>
+            </parent>
+            <child>
+                <hasClass name="M3uAssociation"/>
+                <cardinality>
+                    <min>0</min> <max>512</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="ImaGroup_to_ImaLink">
+        <containment>
+            <parent>
+                <hasClass name="ImaGroup"/>
+            </parent>
+            <child>
+                <hasClass name="ImaLink"/>
+                <cardinality>
+                    <min>0</min> <max>8</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SystemFunctions_to_WebServer">
+        <containment>
+            <parent>
+                <hasClass name="SystemFunctions"/>
+            </parent>
+            <child>
+                <hasClass name="WebServer"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Sts1SpeTtp_to_Vt15Ttp">
+        <containment>
+            <parent>
+                <hasClass name="Sts1SpeTtp"/>
+            </parent>
+            <child>
+                <hasClass name="Vt15Ttp"/>
+                <cardinality>
+                    <min>0</min> <max>28</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Vt15Ttp_to_T1Ttp">
+        <containment>
+            <parent>
+                <hasClass name="Vt15Ttp"/>
+            </parent>
+            <child>
+                <hasClass name="T1Ttp"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etm3_to_E3PhysPathTerm">
+        <containment>
+            <parent>
+                <hasClass name="Etm3"/>
+            </parent>
+            <child>
+                <hasClass name="E3PhysPathTerm"/>
+                <cardinality>
+                    <min>0</min> <max>2</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Etm3_to_T3PhysPathTerm">
+        <containment>
+            <parent>
+                <hasClass name="Etm3"/>
+            </parent>
+            <child>
+                <hasClass name="T3PhysPathTerm"/>
+                <cardinality>
+                    <min>0</min> <max>2</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="SystemFunctions_to_Licensing">
+        <containment>
+            <parent>
+                <hasClass name="SystemFunctions"/>
+            </parent>
+            <child>
+                <hasClass name="Licensing"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+    <relationship name="Cbu_to_TimingUnit2">
+        <containment>
+            <parent>
+                <hasClass name="Cbu"/>
+            </parent>
+            <child>
+                <hasClass name="TimingUnit2"/>
+                <cardinality>
+                    <min>1</min> <max>1</max>
+                </cardinality>
+            </child>
+        </containment>
+    </relationship>
+
+</mim>
+
+</models>
+
diff --git a/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.stub b/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.stub
new file mode 100644
index 0000000000..754b1ecded
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.stub
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- 
+     Document no:     1551-1/CSX10109
+     Revision:        MOM-CELLO_4.3.1
+     Date:            12-17-2003
+     Author:          Ake Pappila/Hsiang-Ling Teng
+
+     Generated from UML by uml2xml version 3.0 (based on DTD file rev. F)
+     Rational Rose model used: /vobs/cello/cma/cma_uml/CelloMOM.mdl
+-->
+
+<!DOCTYPE models SYSTEM "mp.dtd">
+
diff --git a/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.xml b/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.xml
new file mode 100644
index 0000000000..8f8cf54505
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.xml
@@ -0,0 +1,30261 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>

+

+<!-- 

+     Document no:     1551-1/CSX10109

+     Revision:        MOM-CELLO_4.3.1

+     Date:            12-17-2003

+     Author:          Ake Pappila/Hsiang-Ling Teng

+

+     Generated from UML by uml2xml version 3.0 (based on DTD file rev. F)

+     Rational Rose model used: /vobs/cello/cma/cma_uml/CelloMOM.mdl

+-->

+

+<!DOCTYPE models SYSTEM "mp.dtd">

+

+<models>

+<mim name="MOM-CELLO_4.3.1-1" version="5" release="1">

+    <exception name="AttributeMissingException">

+        <description>Exception thrown when an attribute is missing during upgrade.</description>

+    </exception>

+

+    <exception name="EnableExistingProgramException">

+        <description>Exception thrown when enabling of existing programs fails.</description>

+    </exception>

+

+    <exception name="ExtraIdentifiersOfNonExistingLoadModulesException">

+    </exception>

+

+    <exception name="FileCopyException">

+        <description>Exception thrown when copying of files fails.</description>

+    </exception>

+

+    <exception name="FileNotExistException">

+        <description>Exception thrown when the specified file does not exist.</description>

+    </exception>

+

+    <exception name="FindAndReplaceException">

+    </exception>

+

+    <exception name="HeapPoolSettingsException">

+        <description>Exception thrown when the heap or pool setting is incorrect.</description>

+    </exception>

+

+    <exception name="AttributeValueOutOfRangeException">

+        <description>Exception thrown when an attribute value is out of range.</description>

+    </exception>

+

+    <exception name="CancelInstallRequestException">

+        <description>Exception thrown when a cancel install equest for some reason fails.</description>

+    </exception>

+

+    <exception name="ChecksumhandlerException">

+        <description>Exception thrown when the control of checksum for loadmodules has been rejaected due to 'null' recieved from resource layer.</description>

+    </exception>

+

+    <exception name="ClearAllPiuTypesReferencedByPlugInUnitException">

+        <description>Exception thrown when its not possible to clear all PiuTypes referenced by PlugInUnit.</description>

+    </exception>

+

+    <exception name="ConditionallyMandatoryAttributeOrElementMissingException">

+        <description>Exception thrown when an conditional mandatory attribute (or element) is missing.</description>

+    </exception>

+

+    <exception name="ConfigurationVersionMO_HandlerException">

+        <description>Exception thrown when the creation of a CV during upgrade fails.</description>

+    </exception>

+

+    <exception name="ControlFileDocumentHandlerException">

+    </exception>

+

+    <exception name="CreateLoadModuleException">

+        <description>Exception thrown when the creation of a load module fails.</description>

+    </exception>

+

+    <exception name="DisableExistingProgramsException">

+        <description>Exception thrown when disabling of existing programs for some reason fails.</description>

+    </exception>

+

+    <exception name="DocumentObjectProxyException">

+    </exception>

+

+    <exception name="ExplicitReplacementInInformationForRPUsException">

+        <description>Exception thrown when replacement of existing RPU information fails.</description>

+    </exception>

+

+    <exception name="InstallOfLoadModulesCancelledException">

+        <description>Exception thrown when the installation of Load Modules is cancelled.</description>

+    </exception>

+

+    <exception name="InstallOfLoadModulesPartlyExcecutedException">

+        <description>Exception thrown when the installment of Load Modules is only partly executed.</description>

+    </exception>

+

+    <exception name="InstallOfLoadModulesRejectedException">

+        <description>Exception thrown when the install of Load Modules is rejected.</description>

+    </exception>

+

+    <exception name="InstallRejectedFTP_ServerNotAccessibleException">

+        <description>Exception thrown when the install is rejected due to FTP server is not accessible.</description>

+    </exception>

+

+    <exception name="InstallRejectedGetLoadModuleFileException">

+        <description>Exception thrown when the install is rejected due to error when trying to retreive Load Module.</description>

+    </exception>

+

+    <exception name="InstallRejectedIP_AddressException">

+        <description>Exception thrown when install is rejected due to erronous IP address.</description>

+    </exception>

+

+    <exception name="InstallRejectedInsufficientDiskSpaceException">

+        <description>Exception thrown when the install is rejected due to insufficient disk space.</description>

+    </exception>

+

+    <exception name="InstallRejectedLoadListFileException">

+    </exception>

+

+    <exception name="InstallRequestException">

+        <description>Exception thrown when the installation of a Load Module fails.</description>

+    </exception>

+

+    <exception name="InsufficientDiskSpaceException">

+        <description>Exception thrown when the disk space is insufficient.</description>

+    </exception>

+

+    <exception name="JvmMO_HandlerException">

+    </exception>

+

+    <exception name="LoadModuleFIlePathLengthOutOfRangeException">

+        <description>Exception thrown when file path for the Load Module is out of length.</description>

+    </exception>

+

+    <exception name="LoadModuleMO_HandlerException">

+    </exception>

+

+    <exception name="ManagedElementDataMO_HandlerException">

+    </exception>

+

+    <exception name="MandatoryElementIsMissingException">

+    </exception>

+

+    <exception name="MergeControlFileException">

+        <description>Exception thrown when the merger of control files fails.</description>

+    </exception>

+

+    <exception name="PIU_MO_HandlerException">

+    </exception>

+

+    <exception name="ParseException">

+    </exception>

+

+    <exception name="ParserFactoryException">

+    </exception>

+

+    <exception name="PiuTypeDefinitionMissingInUpgradeControlFileException">

+        <description>Exception thrown when PiuType definitions is missing in the UCF file.</description>

+    </exception>

+

+    <exception name="PiuTypeMO_HandlerException">

+    </exception>

+

+    <exception name="ProductNumberAndRevisionAlreadyInUseException">

+        <description>Exception thrown when the product number and revision is already used.</description>

+    </exception>

+

+    <exception name="ProgramConfigurationException">

+    </exception>

+

+    <exception name="ReconfigureProgramsException">

+        <description>Exception thrown when reconfiguration of programs fails.</description>

+    </exception>

+

+    <exception name="ReferencedElementMissingException">

+        <description>Exception thrown when the referenced element is missing.</description>

+    </exception>

+

+    <exception name="RepertoireMO_HandlerException">

+    </exception>

+

+    <exception name="ReplaceConfigSupportMOsOpException">

+    </exception>

+

+    <exception name="ReserveLoadModulesException">

+        <description>Exception thrown when reserving a Load Module fails.</description>

+    </exception>

+

+    <exception name="SelectiveInstallFailureException">

+        <description>Exception thrown when a selective install fails.</description>

+    </exception>

+

+    <exception name="SlotMO_HandlerException">

+    </exception>

+

+    <exception name="SwAllocationMO_HandlerException">

+    </exception>

+

+    <exception name="UnexpectedAttributeException">

+        <description>Exception thrown when an unexpected attribute occurs at upgrade.</description>

+    </exception>

+

+    <exception name="UnexpectedAttributeFormatException">

+        <description>Exception thrown when an unexpected format of the attribute occurs.</description>

+    </exception>

+

+    <exception name="UnexpectedElementException">

+        <description>Exception thrown when </description>

+    </exception>

+

+    <exception name="UpgradeControlFileDataException">

+    </exception>

+

+    <exception name="UpgradeControlFileNotFoundException">

+    </exception>

+

+    <exception name="UpgradeControlFileParserException">

+    </exception>

+

+    <exception name="UpgradePackageDeleteException">

+        <description>Exception thrown when its not possible to delete the upgrade package.</description>

+    </exception>

+

+    <exception name="UpgradePackageDeleteNotAllowedException">

+        <description>Exception thrown when its not allowed to delete the upgrade package.</description>

+    </exception>

+

+    <exception name="UpgradePackageDoesNotExistException">

+        <description>Exception thrown when the specified upgrade package does not exist.</description>

+    </exception>

+

+    <exception name="UpgradePackageFileSystemErrorException">

+        <description>Exception thrown when an error in the file system occurs.</description>

+    </exception>

+

+    <exception name="UpgradeRejectedException">

+        <description>Exception thrown when the upgrade is rejected.</description>

+    </exception>

+

+    <exception name="ValidateException">

+    </exception>

+

+    <exception name="VerifyChecksumException">

+        <description>Exception thrown when the checksum is incorrect.</description>

+    </exception>

+

+    <exception name="VerifyCreationOfCVsException">

+        <description>Exception thrown when its not possible to verify the creation of CV's.</description>

+    </exception>

+

+    <exception name="VerifyOperationalPIUsException">

+    </exception>

+

+    <exception name="VerifyRejectedException">

+    </exception>

+

+    <exception name="VerifyRequestException">

+    </exception>

+

+    <exception name="VerifySupportedPIUsException">

+    </exception>

+

+    <exception name="VerifyUpgradeHandlerException">

+    </exception>

+

+    <exception name="VerifyUpgradeWindowException">

+    </exception>

+

+    <exception name="UpgradeLogFileNotAccessibleException">

+        <description>The upgrade trace log file is not accessible i.e. the log file exists but it is not possible to access it with write permission.</description>

+    </exception>

+

+    <exception name="UpgradeControlFileException">

+        <description>The file parser has found that the UpgradeControlFile is incorrect.</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="UpgradeNotPossibleException">

+        <description>Before an upgrade is started it was found that the upgrade can not take place. A possible reason is that the upgrade package that is running in the node is not in the upgrade window of this upgrade package. </description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="UpgradeLogFileNotInUseException">

+        <description>The upgrade trace output is currently not directed to a file. 

+

+This is a property that can be changed in the trace property file (Trace_01.prop).

+</description>

+    </exception>

+

+    <enum name="UpgradePackageState">

+        <enumMember name="NOT_INSTALLED">

+            <description>The upgrade package is not installed.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="INSTALL_COMPLETED">

+            <description>The upgrade package is completely installed.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="UPGRADE_EXECUTING">

+            <description>Upgrade is executing. </description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="AWAITING_CONFIRMATION">

+            <description>The execution of upgrade needs confirmation before it proceeds.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="ONLY_DELETEABLE">

+            <description>In this state an Upgrade Package can only be deleted. Its actions, when invoked, will throw the exception ActionNotAllowed. </description>

+            <value>4</value>

+        </enumMember>

+        <enumMember name="INSTALL_EXECUTING">

+            <description>Installation of the upgrade package is executing.</description>

+            <value>5</value>

+        </enumMember>

+        <enumMember name="INSTALL_NOT_COMPLETED">

+            <description>The upgrade package is not completely installed i.e. parts of it has been installed. </description>

+            <value>6</value>

+        </enumMember>

+        <enumMember name="UPGRADE_COMPLETED">

+            <description>The upgrade has been successfully executed.</description>

+            <value>7</value>

+        </enumMember>

+    </enum>

+

+    <enum name="UpgradeProgressInformation">

+        <enumMember name="IDLE">

+            <description>No action is in progress. </description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="DOWNLOADING_FILES">

+            <description>Downloading of files (load modules) in progress.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="SAVING_CV">

+            <description>Saving a Configuration Version.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="RECONFIGURING_MOS">

+            <description>Operation ReplaceConfigSupportMOs detected in upgrade.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="INITIATING_LOADER_INFO">

+            <description>Trigger Initiate detected in upgrade sequence.</description>

+            <value>4</value>

+        </enumMember>

+        <enumMember name="PRELOADING">

+            <description>Trigger Preload detected in upgrade sequence.</description>

+            <value>5</value>

+        </enumMember>

+        <enumMember name="CONVERSION_OF_PERSISTENT_DATA">

+            <value>6</value>

+        </enumMember>

+        <enumMember name="APPLICATION_SPECIFIC_ACTION">

+            <description>'Unique trigger' for an application detected in upgrade sequence.</description>

+            <value>7</value>

+        </enumMember>

+        <enumMember name="SHUTDOWN_WAIT">

+            <value>8</value>

+        </enumMember>

+        <enumMember name="TAKING_NEW_SOFTWARE_INTO_SERVICE">

+            <value>9</value>

+        </enumMember>

+        <enumMember name="FINISH_AND_CLEANING_UP">

+            <description>The error handling is switched back to normal.</description>

+            <value>10</value>

+        </enumMember>

+        <enumMember name="RESTORING_SYSTEM_STATE">

+            <value>11</value>

+        </enumMember>

+        <enumMember name="EXECUTION_FAILED">

+            <description>Indicates that the execution of an install or an upgrade action has failed.</description>

+            <value>12</value>

+        </enumMember>

+        <enumMember name="CANCEL_OF_INSTALLATION_IS_EXECUTING">

+            <description>Indicates that cancellation of an ongoing installation is in progress.</description>

+            <value>13</value>

+        </enumMember>

+        <enumMember name="CANCEL_OF_INSTALLATION_FAILED">

+            <description>Indicates that the execution of a cancel install action failed.</description>

+            <value>14</value>

+        </enumMember>

+        <enumMember name="VERIFICATION_INITIATED">

+            <value>15</value>

+        </enumMember>

+        <enumMember name="VERIFYING_UPGRADE_FROM_VERSION">

+            <value>16</value>

+        </enumMember>

+        <enumMember name="VERIFYING_POSSIBLE_TO_CREATE_REQ_NO_CVS">

+            <value>17</value>

+        </enumMember>

+        <enumMember name="VERIFYING_PIUS_SUPPORTED">

+            <value>18</value>

+        </enumMember>

+        <enumMember name="VERIFYING_CHECKSUM_FOR_LM">

+            <value>19</value>

+        </enumMember>

+        <enumMember name="VERIFYING_PIUS_NOT_FAULTY">

+            <value>20</value>

+        </enumMember>

+        <enumMember name="VERIFICATION_FINISHED">

+            <value>21</value>

+        </enumMember>

+        <enumMember name="VERIFICATION_FAILED">

+            <value>22</value>

+        </enumMember>

+    </enum>

+

+    <enum name="InvokedAction">

+        <enumMember name="VERIFY_UPGRADE">

+            <description>The verifyUpgrade action has been invoked.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="UPGRADE">

+            <description>An upgrade action (one of the variants) has been invoked.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="INSTALL">

+            <description>An install action (one of the variants) has been invoked.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="CANCEL_INSTALL">

+            <description>The cancelInstall action has been invoked.</description>

+            <value>4</value>

+        </enumMember>

+    </enum>

+

+    <struct name="ActionResultData">

+        <structMember name="time">

+            <description>A timestamp. 

+

+Format: "Date:   2003-04-24, Time: 20:52:11.182"</description>

+            <string>

+                <defaultValue>""</defaultValue>

+            </string>

+        </structMember>

+        <structMember name="typeOfInvokedAction">

+            <enumRef name="InvokedAction">

+                <defaultValue>VERIFY_UPGRADE</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="info">

+            <enumRef name="Information">

+                <defaultValue>EXECUTED</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="actionId">

+            <description>This id is used to link more than one result to one action</description>

+            <long>

+                <defaultValue>1</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="additionalInfo">

+            <string>

+                <defaultValue>""</defaultValue>

+            </string>

+        </structMember>

+    </struct>

+

+    <enum name="Information">

+        <enumMember name="EXECUTED">

+            <description>The invoked action has been successfully executed without warnings.One of three possible main results of executed action.

+

+Value valid for type of invoked action:

+INSTALL

+CANCEL_INSTALL

+VERIFY_UPGRADE

+UPGRADE</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="UNSPECIFIED">

+            <description>A not specified error/ warning has been detected (see additional info for further details)

+

+Value valid for type of invoked action:

+INSTALL

+CANCEL_INSTALL

+VERIFY_UPGRADE

+UPGRADE</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="LM_CHECKSUM_VER_FAILED">

+            <description>A load module checksum verification has failed.

+

+Value valid for type of invoked action:

+INSTALL

+VERIFY_UPGRADE

+UPGRADE</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="NOT_ENOUGH_AVAIL_DISK_SPACE">

+            <description> There is not enough available disk space for the required number of new CVs (configuration versions) to be created automatically during an upgrade.

+

+Value valid for type of invoked action:

+VERIFY_UPGRADE

+UPGRADE</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="MAX_NO_CV_WILL_BE_EXCEEDED">

+            <description>The maximum number of allowed CVs (configuration versions) will be exceeded if the required number of new CVs is created automatically during an upgrade.

+

+Value valid for type of invoked action:

+VERIFY_UPGRADE

+UPGRADE</description>

+            <value>4</value>

+        </enumMember>

+        <enumMember name="UPGRADE_FROM_CURRENT_UP_NOT_ALLOWED">

+            <description>The Upgrade Window element in the Upgrade Control File does not specify the current Upgrade Package as a valid 'upgrade from' version.

+

+Value valid for type of invoked action:

+VERIFY_UPGRADE

+UPGRADE</description>

+            <value>5</value>

+        </enumMember>

+        <enumMember name="NON_SUPPORTED_PIU">

+            <description>A non supported Plug In Unit (PIU) has been detected i.e. the PIU in the node is not defined in the Upgrade Control File.    

+This is not a fault that prevents an upgrade from being executed.

+

+Value valid for type of invoked action:

+VERIFY_UPGRADE

+UPGRADE</description>

+            <value>6</value>

+        </enumMember>

+        <enumMember name="FAULTY_PIU">

+            <description>A faulty Plug In Unit (PIU) has been detected.       

+This is not a fault that prevents an upgrade from being executed.

+

+Value valid for type of invoked action:

+VERIFY_UPGRADE

+UPGRADE</description>

+            <value>7</value>

+        </enumMember>

+        <enumMember name="CREATION_OF_CV_FAILED">

+            <description>The auto-creation of an install CV failed.

+

+Value valid for type of invoked action:

+INSTALL

+</description>

+            <value>8</value>

+        </enumMember>

+        <enumMember name="ACTION_NOT_ALLOWED">

+            <description>The requested action is not allowed due to an other action already is in progress for an other UP MO.

+

+Value valid for type of invoked action:

+INSTALL

+CANCEL_INSTALL

+VERIFY_UPGRADE

+UPGRADE</description>

+            <value>9</value>

+        </enumMember>

+        <enumMember name="INSTALLATION_MANUALLY_CANCELLED">

+            <description>An ongoing installation has been cancelled (aborted) due to request from client.

+

+Value valid for type of invoked action:

+INSTALL</description>

+            <value>10</value>

+        </enumMember>

+        <enumMember name="FTP_SERVER_NOT_ACCESSIBLE">

+            <description>The FTP server to be used for downloads of load modules is not accessible.

+

+Value valid for type of invoked action:

+INSTALL</description>

+            <value>11</value>

+        </enumMember>

+        <enumMember name="INSUFFICIENT_DISK_SPACE_FOR_LOAD_MODULES">

+            <description>The required disk space for load modules to be installed is insufficient.

+

+Value valid for type of invoked action:

+INSTALL</description>

+            <value>12</value>

+        </enumMember>

+        <enumMember name="FTP_SERVER_IP_ADDRESS_ERROR">

+            <description>Error detected in the IP address of the FTP server.

+

+Value valid for type of invoked action:

+INSTALL</description>

+            <value>13</value>

+        </enumMember>

+        <enumMember name="DELTA_INSTALL_MERGE_ERROR">

+            <description>The install of the delta Upgrade Control File (UCF) failed i.e. the analysis of the delta UCF together with current active UP's UCF failed.

+

+Value valid for type of invoked action:

+INSTALL</description>

+            <value>14</value>

+        </enumMember>

+        <enumMember name="SELECTIVE_INSTALL_ERROR">

+            <description>Error detected during the selection phase of an install.

+

+Value valid for type of invoked action:

+INSTALL

+

+</description>

+            <value>15</value>

+        </enumMember>

+        <enumMember name="EXECUTION_FAILED">

+            <description>The execution of invoked action failed.One of three possible main results of executed action.

+

+Value valid for type of invoked action:

+INSTALL

+CANCEL_INSTALL

+VERIFY_UPGRADE

+UPGRADE</description>

+            <value>16</value>

+        </enumMember>

+        <enumMember name="EXECUTED_WITH_WARNINGS">

+            <description>The action has been successfully executed but with warnings.One of three possible main results of executed action.

+

+Value valid for type of invoked action:

+INSTALL

+CANCEL_INSTALL

+VERIFY_UPGRADE</description>

+            <value>17</value>

+        </enumMember>

+    </enum>

+

+    <exception name="FtpServerNotAccessibleException">

+        <description>Ftp server is not accessible. This may depend on erroneous IP address, username, password, or that the IP communication with the Ftp server is down, or that the Ftp server itself is malfunctioning. </description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="GetFileException">

+        <description>An error was encountered during FTP get file. A filePath in the upgradeControlFile may be inconsistent with a filepath on the Ftp server. </description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <struct name="PiuTypeProgramConfiguration">

+        <structMember name="tag">

+            <description>The tag is used as a reference between the PiuType MO and the Repertoire MO to find out how to create the program object under a PlugInUnit MO.</description>

+            <string/>

+        </structMember>

+        <structMember name="subParentLDN">

+            <description>Local distinguished name of the program parent from the PlugInUnit.

+

+Example:

+1.  "Spu=1,Spm=2" (the program is to be created under: ...PlugInUnit=2,Spu=1,Spm=2")

+2.  "" (empty string - the program is to be created directly under the PlugInUnit)</description>

+            <string/>

+        </structMember>

+        <structMember name="programMoTypeName">

+            <description>The name of the Program MO that will be created.</description>

+            <string/>

+        </structMember>

+        <structMember name="loadableProcessorName">

+            <description>The loadableProcessorName is a user friendly name of the processor.</description>

+            <string/>

+        </structMember>

+    </struct>

+

+    <struct name="RepertoireLoadModuleData">

+        <description>This structure contains load module data that belongs to a piu type.

+</description>

+        <structMember name="loadModuleDN">

+            <description>The distinguished name of the load module, which is needed and sufficient to convert the load module to a real object reference.</description>

+            <string/>

+        </structMember>

+        <structMember name="tag">

+            <description>The tag is used as a reference between the PiuType MO and the Repertoire MO to find out how to create the program object under a PlugInUnit MO.</description>

+            <string/>

+        </structMember>

+    </struct>

+

+    <struct name="ConfigurationVersionAttributes">

+        <structMember name="name">

+            <string>

+            </string>

+        </structMember>

+        <structMember name="identity">

+            <string>

+            </string>

+        </structMember>

+        <structMember name="type">

+            <string/>

+        </structMember>

+        <structMember name="upgradePackageId">

+            <string/>

+        </structMember>

+        <structMember name="operatorName">

+            <string>

+            </string>

+        </structMember>

+        <structMember name="operatorComment">

+            <string>

+            </string>

+        </structMember>

+        <structMember name="date">

+            <string/>

+        </structMember>

+        <structMember name="status">

+            <string/>

+        </structMember>

+    </struct>

+

+    <enum name="ConfigurationVersionType">

+        <enumMember name="standard">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="upgrade">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="minimal">

+            <value>2</value>

+        </enumMember>

+        <enumMember name="test">

+            <value>3</value>

+        </enumMember>

+        <enumMember name="autocreate">

+            <value>4</value>

+        </enumMember>

+        <enumMember name="other">

+            <value>5</value>

+        </enumMember>

+    </enum>

+

+    <enum name="LoadModuleLoaderType">

+        <enumMember name="OseLoader">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="SpmLoader">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="Jvm">

+            <value>2</value>

+        </enumMember>

+        <enumMember name="WebServer">

+            <value>3</value>

+        </enumMember>

+        <enumMember name="Other">

+            <value>99</value>

+        </enumMember>

+        <enumMember name="SpmFpgaLoader">

+            <value>4</value>

+        </enumMember>

+        <enumMember name="XpLoader">

+            <value>5</value>

+        </enumMember>

+    </enum>

+

+    <enum name="LoadModulePreLoadType">

+        <enumMember name="no">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="must">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="wish">

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="RPUSwitchOverMode">

+        <description>This attribute can have the following values:

+

+AtPiuFault = Indicates the MP (where the normal RPU is configured) is faulty (HW error). This is the default value.

+

+AtPiuRestart = Indicates the MP (where the normal RPU is configured) is restarted.</description>

+        <enumMember name="AtPiuFault">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="AtPiuRestart">

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="RPUNormalisationMode">

+        <description>This enumeration can have the following values:

+

+Manual = Indicates that no normalisation is performed by cello until the operator issues a "switch" action.

+

+Automatic = Indicates that Cello performs the normalisation automatically, after the failed RPU is available again. This is the default value.</description>

+        <enumMember name="Manual">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="Automatic">

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="RPUReplicationMode">

+        <description>This enumaration contains the following values:

+

+Always = Data replication is always performed. This overrides the characteristics set on the each container ( that is associated with the RPU ).

+

+Never = Data replication is never performed. This overrides the characteristics set on the each container ( that is associated with the RPU ).

+

+AtShutdown = Each time the RSH (which handles the RPU) is shut down, a complete snapshot is taken and replicated to the other MP, if necessary. Otherwise, the replication is performed according to the characteristics set on each container ( that is associated with the RPU ).

+

+ApplControlled = The data replication is made according to the characteristics set on each container ( that is associated with the RPU ). This is the default value.</description>

+        <enumMember name="Always">

+            <description>Always = Data replication is always performed. This overrides the characteristics set on the each container ( that is associated with the RPU ).</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="Never">

+            <description>Data replication is never performed. This overrides the characteristics set on the each container ( that is associated with the RPU ).</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="AtShutdown">

+            <description>AtShutdown = Each time the RSH (which handles the RPU) is shut down, a complete snapshot is taken and replicated to the other MP, if necessary. Otherwise, the replication is performed according to the characteristics set on each container ( that is associated with the RPU ).</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="ApplControlled">

+            <description>ApplControlled = The data replication is made according to the characteristics set on each container ( that is associated with the RPU ). This is the default value.</description>

+            <value>4</value>

+        </enumMember>

+    </enum>

+

+    <enum name="RPUOperationalMode">

+        <description>This enumeration contains the following values:

+

+AsConfigured = The RSHs runs as the RPU is configured.

+SwitchOver = The RSHs has been switched over.

+Unavailable = No RSHs, that uses this RPU, are running.</description>

+        <enumMember name="AsConfigured">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="SwitchedOver">

+            <value>2</value>

+        </enumMember>

+        <enumMember name="Unavailable">

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <struct name="PiuTypeMOConfiguration">

+        <structMember name="subParentLDN">

+            <string/>

+        </structMember>

+        <structMember name="moTypeName">

+            <string/>

+        </structMember>

+        <structMember name="identity">

+            <string/>

+        </structMember>

+    </struct>

+

+    <struct name="AirFlowData">

+        <description>Control value for the fan unit. Needed by cooling function.

+</description>

+        <structMember name="normalLowTempAirFlow">

+            <description>Control value for the fan unit running in normal autonomous mode. 

+This parameter is the subrack/fanunit airflow value that is required to achieve sufficient cooling at 20 degree

+centigrade or lower ambient temperature of the most demanding plug in unit (PIU) in the subrack. This airflow value

+shall be sufficient (but not unnecessarily large) to secure that no "normal overtemp" fault indication is issued.

+Default values = 250 m3/h.  (value &gt;=0) 

+</description>

+            <float>

+                <defaultValue>250</defaultValue>

+            </float>

+        </structMember>

+        <structMember name="normalHighTempAirFlow">

+            <description>Control value for the fan unit running in normal autonomous mode. This parameter is the subrack/fanunit airflow

+value that is required to achieve sufficient cooling at 50 degree centigrade ambient temperature of the most

+demanding plug in unit (PIU) in the subrack. This airflow value shall be sufficient (but not unnecessarily large) to

+secure that no "normal overtemp" fault indication is issued.

+Default values = 400 m3/h. (value &gt;=0)</description>

+            <float>

+                <defaultValue>400</defaultValue>

+            </float>

+        </structMember>

+        <structMember name="noiseReducedLowTempAirFlow">

+            <description>Control value for the fan unit running in noise reduction mode.  This parameter is the subrack/fanunit airflow value

+that is required to achieve sufficient cooling at 20 degree centigrade or lower ambient temperature of the most

+demanding plug in unit (PIU) in the subrack. This airflow value shall be sufficient (but not unnecessarily large) to

+secure that no "exceptional overtemp" fault indication is issued

+Default values = 250 m3/h. (value &gt;=0)</description>

+            <float>

+                <defaultValue>250</defaultValue>

+            </float>

+        </structMember>

+        <structMember name="noiseReducedHighTempAirFlow">

+            <description>Control value for the fan unit running in noise reduction mode. This parameter is the subrack/fanunit airflow value

+that is required to achieve sufficient cooling at 50 degree centigrade ambient temperature of the most demanding

+plug in unit (PIU) in the subrack. This airflow value shall be sufficient (but not unnecessarily large) to secure

+that no "exceptional overtemp" fault indication is issued.

+Default values = 400 m3/h. (value &gt;=0)</description>

+            <float>

+                <defaultValue>400</defaultValue>

+            </float>

+        </structMember>

+    </struct>

+

+    <exception name="IpAddressException">

+        <description>Erroneous Ip Address Format</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="AueFailureException">

+        <description>An application upgrade engine has reported a failure. </description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="ActionNotAllowedException">

+        <description>The action is not allowed, the UpgradePackage MO is in wrong state. 

+

+For example if you try 'upgrade()' before an 'install()' or 'forcedInstall()' has been done.</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="CVFileSystemErrorException">

+        <description>Exception thrown upon file system Error.</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="CVDBErrorException">

+        <description>Data Base Error Exception (error when creating database backup).</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="CVLLPErrorException">

+        <description>LLP Error Exception (error when creating ARMAMENT and LLP.LMID files).</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="CVAlreadyExistsException">

+        <description>The configuration version already exists (e.g. message at create).</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="CVDoesNotExistsException">

+        <description>The configuration version does not exist (e.g. message at setCVAsStartable).</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="CVDeleteNotAllowedException">

+        <description>It is not allowed to delete the configuration version, because it is in use (used as startable or in rollback list).</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="CVInvalidCVException">

+        <description>The configuration version is not valid (due to missing files).

+

+</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="CVFormatErrorException">

+        <description>Format Error in given configuration version name. 

+

+The following characters are allowed within the name:

+[0-9], [A-Z], [a-z] and '&amp;','%',':','.','_', '-'

+

+Note! For comment and operatorName spaces (' ') are also allowed within the strings.</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="CVErrorException">

+        <description>Error Exception.</description>

+        <exceptionParameter name="message">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="InstallException">

+        <description>Indicates that an error in an installation has occurred.</description>

+        <exceptionParameter name="install">

+            <description>The message of the exception.</description>

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="LogActivationException">

+        <description>Exception thrown when a database error occurs.</description>

+    </exception>

+

+    <exception name="InvalidDriveNameException">

+        <description>Exception thrown when an invalid drive name is specified or when a data base error occurs.</description>

+    </exception>

+

+    <exception name="VerifyUpgradeException">

+    </exception>

+

+    <exception name="CVActivityLogFilePathErrorException">

+        <description>Exception thrown when the log file path is wrong.</description>

+    </exception>

+

+    <exception name="CV_MaxNumberOfInstancesException">

+        <description>Exception thrown when max number of CV's in the system has been reached.</description>

+    </exception>

+

+    <exception name="Aal2PathIdNotUniqueException">

+        <exceptionParameter name="message">

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="PathAlreadyRegisteredException">

+        <exceptionParameter name="message">

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="NotInGroupException">

+    </exception>

+

+    <exception name="InvalidReferenceException">

+    </exception>

+

+    <exception name="InvalidPriorityException">

+        <description>Indicates an invalid priority level, i.e. the priority in question is out of the defined range.</description>

+        <exceptionParameter name="invalidPriority">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <struct name="QoSProfileClassA">

+        <description>This struct contains the values applicable for QoS Class A.</description>

+        <structMember name="boundOnProbOfDelay">

+            <description>Represents the upper bound on the probability that the delay in the node exceeds the delay limit given by the attribute "boundOnNodeDelay".

+

+Unit is 1/1000000000.

+</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1000000000</max>

+                </range>

+                <defaultValue>500000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="boundOnProbOfLoss">

+            <description>Represents the upper bound of the cell loss probability in the current node.

+

+Unit is 1/1000000000.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1000000000</max>

+                </range>

+                <defaultValue>500000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="boundOnNodeDelay">

+            <description>The upper bound on the delay (delay=queueing and serving of Aal2 packets in an Aal2 mux + delay on ATM layer) through the current node.

+Unit is micro seconds.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>10000</max>

+                </range>

+                <defaultValue>5000</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <struct name="QoSProfileClassB">

+        <description>This struct contains the values applicable for QoS Class B.</description>

+        <structMember name="boundOnProbOfDelay">

+            <description>Represents the upper bound on the probability that the delay in the node exceeds the delay limit given by the attribute "boundOnNodeDelay".

+

+Unit is 1/1000000000.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1000000000</max>

+                </range>

+                <defaultValue>500000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="boundOnProbOfLoss">

+            <description>Represents the upper bound of the cell loss probability in the current node.

+

+Unit is 1/1000000000.

+</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1000000000</max>

+                </range>

+                <defaultValue>500000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="boundOnNodeDelay">

+            <description>The upper bound on the delay (delay=queueing and serving of Aal2 packets in an Aal2 mux + delay on ATM layer) through the current node.

+Unit is micro seconds.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>20000</max>

+                </range>

+                <defaultValue>15000</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <struct name="QoSProfileClassC">

+        <description>This struct contains the values applicable for QoS Class C.

+

+NOTE: The attribute 'boundONodeDelay' is not applicable for QoS Class C so setting of this attribute will have no effect.</description>

+        <structMember name="boundOnProbOfDelay">

+            <description>Represents the upper bound on the probability that the delay in the node exceeds the delay limit given by the attribute "boundOnNodeDelay".

+

+Unit is 1/1000000000.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1000000000</max>

+                </range>

+                <defaultValue>1000000000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="boundOnProbOfLoss">

+            <description>Represents the upper bound of the cell loss probability in the current node.

+

+Unit is 1/1000000000.

+</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1000000000</max>

+                </range>

+                <defaultValue>1000000000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="boundOnNodeDelay">

+            <description>The upper bound on the delay (delay=queueing and serving of Aal2 packets in an Aal2 mux + delay on ATM layer) through the current node.

+Unit is micro seconds.</description>

+            <long>

+                <defaultValue>25000</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <struct name="QoSProfileClassD">

+        <description>This struct contains the values applicable for QoS Class D.

+

+NOTE: The attribute 'boundONodeDelay' is not applicable for QoS Class D so setting of this attribute will have no effect.</description>

+        <structMember name="boundOnProbOfDelay">

+            <description>Represents the upper bound on the probability that the delay in the node exceeds the delay limit given by the attribute "boundOnNodeDelay".

+

+Unit is 1/1000000000.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>1000000000</max>

+                </range>

+                <defaultValue>1000000000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="boundOnProbOfLoss">

+            <description>Represents the upper bound of the cell loss probability in the current node.

+

+Unit is 1/1000000000.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1000000000</max>

+                </range>

+                <defaultValue>1000000000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="boundOnNodeDelay">

+            <description>The upper bound on the delay (delay=queueing and serving of Aal2 packets in an Aal2 mux + delay on ATM layer) through the current node.

+Unit is micro seconds.</description>

+            <long>

+                <defaultValue>50000</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <enum name="SupportedQoSClasses">

+        <enumMember name="NO_CLASS_SUPPORTED">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="CLASS_A">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="CLASS_B">

+            <value>2</value>

+        </enumMember>

+        <enumMember name="CLASS_A_B">

+            <value>3</value>

+        </enumMember>

+        <enumMember name="CLASS_C">

+            <value>4</value>

+        </enumMember>

+        <enumMember name="CLASS_A_C">

+            <value>5</value>

+        </enumMember>

+        <enumMember name="CLASS_B_C">

+            <value>6</value>

+        </enumMember>

+        <enumMember name="CLASS_A_B_C">

+            <value>7</value>

+        </enumMember>

+        <enumMember name="CLASS_D">

+            <value>8</value>

+        </enumMember>

+        <enumMember name="CLASS_A_D">

+            <value>9</value>

+        </enumMember>

+        <enumMember name="CLASS_B_D">

+            <value>10</value>

+        </enumMember>

+        <enumMember name="CLASS_A_B_D">

+            <value>11</value>

+        </enumMember>

+        <enumMember name="CLASS_C_D">

+            <value>12</value>

+        </enumMember>

+        <enumMember name="CLASS_A_C_D">

+            <value>13</value>

+        </enumMember>

+        <enumMember name="CLASS_B_C_D">

+            <value>14</value>

+        </enumMember>

+        <enumMember name="CLASS_A_B_C_D">

+            <value>15</value>

+        </enumMember>

+    </enum>

+

+    <exception name="IsReservedCanNotSetPathIdException">

+        <description>Exception thrown when an attempt is made to set or change the aal2PathId of an Aal2PathVccTp while its reserved by an other Aal2PathGrp</description>

+    </exception>

+

+    <exception name="IsUnlockedCanNotSetPathOwnerException">

+        <description>Exception thrown when an attempt is made to set or change the aal2PathOwner of an Aal2PathVccTp while its not LOCKED.</description>

+    </exception>

+

+    <enum name="SlotState">

+        <description>

+</description>

+        <enumMember name="free">

+            <description>It is free to be pre-configured with a new PlugInUnit. </description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="used">

+            <description>A PlugInUnit is inserted in the slot or the slot is pre-configured with a PlugInUnit.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="coveredByPiu">

+            <description>Currently not supported.</description>

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <struct name="AdminProductData">

+        <structMember name="productNumber">

+            <description>The product number of the product or document.

+

+Examples: ABC 101 001, CXC 123 456, 1/BFD 101 999

+

+In the case of UpgradePackage this is the document number of the upgrade package.</description>

+            <string>

+                <lengthRange>

+                    <min>1</min> <max>24</max>

+                </lengthRange>

+            </string>

+        </structMember>

+        <structMember name="productRevision">

+            <description>The revision of the product number.

+

+Examples: R1, r1a, R1A02, P7B</description>

+            <string>

+                <lengthRange>

+                    <min>1</min> <max>7</max>

+                </lengthRange>

+            </string>

+        </structMember>

+        <structMember name="productName">

+            <description>A user-friendly name of the product.</description>

+            <string>

+                <lengthRange>

+                    <min>1</min> <max>12</max>

+                </lengthRange>

+                <defaultValue>""</defaultValue>

+            </string>

+        </structMember>

+        <structMember name="productInfo">

+            <description>User-friendly information about the product.</description>

+            <string>

+                <defaultValue>""</defaultValue>

+            </string>

+        </structMember>

+        <structMember name="productionDate">

+            <description>The production date can be represented in two ways. 

+

+1) The preferable syntax is a four-digit representation of the year, and a two-digit representation of the month and a two-digit representation of the day. The numbers of characters in this case, is eight.

+Example:

+19991231

+

+2) The date can also consist of two digits for the year, followed by the letter W for week and two digits for the number of week. The numbers of characters in this case, is five.

+Example:

+99W12

+</description>

+            <string>

+                <lengthRange>

+                    <min>1</min> <max>8</max>

+                </lengthRange>

+                <defaultValue>""</defaultValue>

+            </string>

+        </structMember>

+    </struct>

+

+    <struct name="OperProductData">

+        <structMember name="productName">

+            <description>A user-friendly name of the product.

+

+

+

+</description>

+            <string>

+                <lengthRange>

+                    <min>1</min> <max>12</max>

+                </lengthRange>

+            </string>

+        </structMember>

+        <structMember name="productNumber">

+            <description>Unique identity for each product, which is constituted by the Ericsson product number (ABC number).

+

+The maximum number of characters for a product number is 24 including 2 slashes, 2 spaces and 2 characters for origination notation.

+

+Example of product number: 

+ABC 101 001

+(1/ABC 101 01/1234)

+123/ABCDE 101 1010/12345

+

+.</description>

+            <string>

+                <lengthRange>

+                    <min>1</min> <max>24</max>

+                </lengthRange>

+            </string>

+        </structMember>

+        <structMember name="productRevision">

+            <description>Indicates the revision state of the product. It consists of a letter R or P, one or two digits and/or one or two letters. The maximum number of characters is four inclusive R or P.

+Example: R1A, R1A02, P7B

+

+A suffix may be added to the revision state. The suffix may consists of one or two digits or one letter. 

+

+

+</description>

+            <string>

+                <lengthRange>

+                    <min>1</min> <max>7</max>

+                </lengthRange>

+            </string>

+        </structMember>

+        <structMember name="serialNumber">

+            <description>The serial number consists of 13 alphanumerical characters grouped as 6 plus 7 characters. The first 6 characters are to be used for factory codes and the last 7 characters are used for an individual number or batch number.

+

+</description>

+            <string/>

+        </structMember>

+        <structMember name="productionDate">

+            <description>The production date can be represented in two ways. 

+

+1) The preferable syntax is a four-digit representation of the year, and a two-digit representation of the month and a two-digit representation of the day. The numbers of characters in this case, is eight.

+Example:

+19991231

+

+2) The date can also consist of two digits for the year, followed by the letter W for week and two digits for the number of week. The numbers of characters in this case, is five.

+Example:

+99W12

+

+</description>

+            <string>

+                <lengthRange>

+                    <min>5</min> <max>8</max>

+                </lengthRange>

+            </string>

+        </structMember>

+    </struct>

+

+    <enum name="LoadClass">

+        <description>Defines the phase in the load and start sequence.

+</description>

+        <enumMember name="coreOs">

+            <value>10</value>

+        </enumMember>

+        <enumMember name="coreDevice">

+            <value>50</value>

+        </enumMember>

+        <enumMember name="loadListProvider">

+            <value>100</value>

+        </enumMember>

+        <enumMember name="coreEarly">

+            <value>200</value>

+        </enumMember>

+        <enumMember name="coreLate">

+            <value>300</value>

+        </enumMember>

+        <enumMember name="networkAndConnectionHandling">

+            <value>400</value>

+        </enumMember>

+        <enumMember name="application">

+            <value>500</value>

+        </enumMember>

+        <enumMember name="upgrade">

+            <value>600</value>

+        </enumMember>

+    </enum>

+

+    <enum name="StartState">

+        <enumMember name="disabled">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="enabled">

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="SubrackType">

+        <enumMember name="hub">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="device">

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="PiuRole">

+        <enumMember name="mp">

+            <description>The board is a Main processor.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="bp">

+            <description>The board is a device board.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="others">

+            <description>The board is not a Main processor or a device board. </description>

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <enum name="RestartCause">

+        <description>This attribute indicates the restart cause of plugInUnit. The defined values are: 

+1. piuRestartError: restart because of error.

+2. piuRestartUpgrade: restart because of system upgrade.

+</description>

+        <enumMember name="piuRestartUpgrade">

+            <description>This attributes indicates that the Piu restart cause is upgrade.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="piuRestartError">

+            <description>This attributes indicates that the Piu restart cause is error.</description>

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="FanState">

+        <description>The Fan can be in one of three controlling state:

+- standalone: not manageable, full speed fans

+- autonomous: manageable, air-flow control

+- noiseReduced: time-limited low speed fan</description>

+        <enumMember name="standalone">

+            <description>It's running on itself, not manageable.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="autonomous">

+            <description>Manageable state.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="noiseReduced">

+            <description>Temporary state with reduced cooling.</description>

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <enum name="SeqRestarts">

+        <enumMember name="RESTARTS_WITH_NO_LIMITS">

+            <description>This attributes indicates unlimited restarts and no faulty marking of the PIU. Used for critical PIU's such as TUBs, SCBs and some ET-boards.

+</description>

+            <value>-1</value>

+        </enumMember>

+        <enumMember name="RESTARTS_WITH_WARM">

+            <description>This attributes indicates the following sequential restarts:

+-warm

+-refresh

+-cold

+-cold with fault marked (not loaded). Alarm sent.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="RESTARTS_WITH_REFRESH">

+            <description>This attributes indicates the following sequential restarts:

+-refresh

+-cold

+-cold with fault marked (not loaded). Alarm sent.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="RESTARTS_WITH_COLD">

+            <description>This attributes indicates the following sequential restarts:

+-cold

+-cold with fault marked (not loaded). Alarm sent.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="RESTARTS_WITH_FAULT_MARKED">

+            <description>This attributes indicates the following sequential restarts:

+-cold with fault marked (not loaded). Alarm sent.</description>

+            <value>0</value>

+        </enumMember>

+    </enum>

+

+    <exception name="RepertoireNotFoundException">

+        <description>This class is an exception class thrown when a equipment specific error occurs.

+</description>

+    </exception>

+

+    <exception name="SwAllocationNotFoundException">

+        <description>This class is an exception class thrown when a equipment specific error occurs.

+</description>

+    </exception>

+

+    <exception name="WebServerPathConfigurationException">

+        <description>This class is an exception class thrown when failed to configure the webserver root path

+</description>

+    </exception>

+

+    <exception name="FroLocationFailedException">

+    </exception>

+

+    <exception name="FroShutdownException">

+    </exception>

+

+    <exception name="NotUniqueLineNoException">

+    </exception>

+

+    <exception name="WrongPhysPathTermTypeException">

+    </exception>

+

+    <enum name="OperState">

+        <enumMember name="disabled">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="enabled">

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="AdmState">

+        <enumMember name="locked">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="unlocked">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="shuttingDown">

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <exception name="OccupiedException">

+    </exception>

+

+    <exception name="NotReservedException">

+    </exception>

+

+    <exception name="NotSupportedException">

+    </exception>

+

+    <enum name="SilPortState">

+        <description>Indication of Switch Internal Link port status.</description>

+        <enumMember name="portActive">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="portPassive">

+            <value>2</value>

+        </enumMember>

+        <enumMember name="portNotConnected">

+            <value>3</value>

+        </enumMember>

+        <enumMember name="portLocked">

+            <value>4</value>

+        </enumMember>

+        <enumMember name="portNotInstalled">

+            <value>5</value>

+        </enumMember>

+    </enum>

+

+    <exception name="InvalidIndexException">

+        <description>Index specified is invalid, i.e. it is out of the range of valid indices.</description>

+        <exceptionParameter name="invalidIndex">

+            <description>The exception message.</description>

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="TransactionException">

+    </exception>

+

+    <exception name="UndeletableMoException">

+        <description>Exception thrown when MO is not possible to delete.</description>

+    </exception>

+

+    <exception name="FroNotAccessibleException">

+        <description>Exception that is thrown when a FRO (Facade Resource Object in the resource layer) cannot be accessed.</description>

+    </exception>

+

+    <exception name="FroRequestFailedException">

+        <description>Exception that is thrown when the result of a request to a FRO (Facade Resource Object in the resource layer) is not ok.</description>

+    </exception>

+

+    <exception name="MoReservedByOtherUserException">

+        <description>Exception thrown when the MO is already reserved by another user (MO).</description>

+    </exception>

+

+    <exception name="MoHasChildrenException">

+        <description>Exception class thrown when an MO is requested to be deleted, but the MO has children, which must be deleted first.</description>

+    </exception>

+

+    <exception name="MoReservedNotDeletableException">

+        <description>Exception thrown when trying to delete an MO that is reserved by another MO (user).</description>

+    </exception>

+

+    <exception name="MaxNumberExceededException">

+        <description>Exception thrown when the maximum number of childrens for an MO is exceeded.</description>

+    </exception>

+

+    <exception name="AttrValueNotUniqueException">

+        <description>Exception thrown when a value of an attribute is not unique.</description>

+    </exception>

+

+    <exception name="EquipException">

+    </exception>

+

+    <exception name="IpFormatException">

+    </exception>

+

+    <exception name="IpException">

+    </exception>

+

+    <exception name="TransactionRequiredException">

+        <description>Exception class thrown when an MO is accessed outside a transaction but the access method requires a transaction.</description>

+    </exception>

+

+    <exception name="ValueOutOfRangeException">

+        <description>Exception thrown when an MO attribute is requested to be set, but the requested value is not accepted.</description>

+    </exception>

+

+    <exception name="WrongAttributeTypeException">

+        <description>Exception thrown when an MO attribute is requested to be set, but the requested value is of the wrong type. </description>

+    </exception>

+

+    <exception name="NotHandledAttributeTypeException">

+        <description>Exception class thrown when an attribute of not handled type is requested. </description>

+    </exception>

+

+    <exception name="NoSuchFieldException">

+        <description>Exception class thrown when a Struct is accessed but the reqested Struct element is not found. </description>

+    </exception>

+

+    <exception name="MoCanNotBeCreatedException">

+    </exception>

+

+    <exception name="NoSuchAttributeException">

+        <description>Exception thrown when an MO attribute is requested to be accessed but the access 

+method for the is not defined (the attribute can not be accessed)</description>

+    </exception>

+

+    <exception name="MoCardinalityViolationException">

+        <description>Exception class thrown when the creation of an MO fails due to child - parent 

+cardinality violation. The cardinality is specified in the MIM. </description>

+    </exception>

+

+    <exception name="IllegalParentException">

+        <description>Exception thrown when the parent of the MO is of the wrong type.</description>

+    </exception>

+

+    <exception name="AttrNotSettableAtCreateException">

+        <description>Exception thrown when a create is ordered with 

+attribute values that are not settable at create.</description>

+    </exception>

+

+    <exception name="AttrMissingAtCreateException">

+        <description>Exception thrown when an attribute that is mandatory at create is missing.</description>

+    </exception>

+

+    <exception name="MoNameAlreadyTakenException">

+        <description>Exception thrown when an MO is created and the distinguished name of the MO is already in use.</description>

+    </exception>

+

+    <exception name="IllegalArgumentTypeException">

+        <description>Exception thrown if the argument supplied is of the wrong type, for example in an action.</description>

+    </exception>

+

+    <exception name="IllegalAttributeValueException">

+        <description>Exception thrown if the value of the attribute is not valid.</description>

+    </exception>

+

+    <enum name="RestartRank">

+        <enumMember name="RESTART_WARM">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="RESTART_REFRESH">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="RESTART_COLD">

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="AvailabilityStatus">

+        <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+        <enumMember name="IN_TEST">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="FAILED">

+            <value>2</value>

+        </enumMember>

+        <enumMember name="POWER_OFF">

+            <value>4</value>

+        </enumMember>

+        <enumMember name="OFF_LINE">

+            <value>8</value>

+        </enumMember>

+        <enumMember name="OFF_DUTY">

+            <value>16</value>

+        </enumMember>

+        <enumMember name="DEGRADED">

+            <value>64</value>

+        </enumMember>

+        <enumMember name="NOT_INSTALLED">

+            <value>128</value>

+        </enumMember>

+        <enumMember name="LOG_FULL">

+            <value>256</value>

+        </enumMember>

+        <enumMember name="DEPENDENCY_LOCKED">

+            <value>544</value>

+        </enumMember>

+        <enumMember name="DEPENDENCY_FAILED">

+            <value>1056</value>

+        </enumMember>

+        <enumMember name="DEPENDENCY_SHUTTINGDOWN">

+            <value>2080</value>

+        </enumMember>

+        <enumMember name="NO_STATUS">

+            <value>0</value>

+        </enumMember>

+    </enum>

+

+    <exception name="InvalidMoReferenceException">

+        <description>Exception thrown when the submitted MO reference is invalid.</description>

+    </exception>

+

+    <exception name="FroNotLockedException">

+        <description>Exception thrown when a fRo cannot be accessed.</description>

+    </exception>

+

+    <exception name="GeneralErrorException">

+        <description>Exception thrown by an MO when there is a general error.</description>

+    </exception>

+

+    <exception name="IdentityNotAllowedException">

+        <description>Exception thrown when an identity (LDN) specified at create is not allowed.</description>

+    </exception>

+

+    <exception name="IllegalMoTypeException">

+        <description>Exception thrown when a reference to an MO is of a unexpected/wrong MO type.</description>

+    </exception>

+

+    <exception name="ImpossibleCollectAtmInfoException">

+        <description>Exception thrown when gathering of ATM info fails.</description>

+    </exception>

+

+    <exception name="MoCanNotBeDeletedException">

+        <description>Exception thrown when its not possible to delete an MO.</description>

+    </exception>

+

+    <exception name="MoNotPossibleToReserveException">

+        <description>Exception thrown when by an MO if its not possible to reserve the MO.</description>

+    </exception>

+

+    <exception name="MoNotReservedByUserException">

+        <description>Exception thrown when a user tries to release an MO that is not reserved by this user.</description>

+    </exception>

+

+    <exception name="NoDiskException">

+        <description>Exception thrown when there is no hard disk.</description>

+    </exception>

+

+    <exception name="RemovalFailedException">

+        <description>Exception thrown when an element cannot be removed from a sequence.</description>

+    </exception>

+

+    <exception name="RestartRejectedException">

+        <description>Exception thrown when restart of the PlugInUnit is not allowed.</description>

+    </exception>

+

+    <enum name="SyncMode">

+        <description>The Sync Mode Operation of the node.</description>

+        <enumMember name="NOT_USED">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="CDMA">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="WCDMA">

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <struct name="Mtp2ProfileDataAnsi">

+        <structMember name="suermT">

+            <description>SUERM parameter T.

+Measured in SU units.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>511</max>

+                </range>

+                <defaultValue>64</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="suermD">

+            <description>SUREM parameter D.

+Measurement units are in SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>256</max>

+                </range>

+                <defaultValue>256</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="suermN">

+            <description>SUERM parameter N.

+Measurement units are in SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>256</max>

+                </range>

+                <defaultValue>16</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="tin">

+            <description>Normal AERM threshold, Tin. Number of signal errors that cause abortion of a normal proving peroid.

+

+Measurement units are SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>7</max>

+                </range>

+                <defaultValue>4</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="tie">

+            <description>Emergency AERM threshold, Tie. Number of signal units errors that cause abortion of an emergency proving period.

+

+Measurement units are SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>7</max>

+                </range>

+                <defaultValue>1</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="provings">

+            <description>Proving abort limit. Number of consecutive aborted proving periods that will cause a return to the Out Of Service state.

+

+Measurement units are the number of proving periods.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>7</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT1">

+            <description>Maximum time to stay in Aligned Ready state before signalling link failure. 

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>16300</max>

+                </range>

+                <defaultValue>12900</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT2">

+            <description>Maximum time to stay in Not Aligned state before signalling link failure.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>32700</max>

+                </range>

+                <defaultValue>5000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT3">

+            <description>Maximum time to stay in Aligned state before signalling link failure. 

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>16300</max>

+                </range>

+                <defaultValue>11500</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT4n">

+            <description>Length of the normal proving period.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>4000</max>

+                </range>

+                <defaultValue>2300</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT4e">

+            <description>Length of the emergengcy proving period. 

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>4000</max>

+                </range>

+                <defaultValue>600</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT5">

+            <description>Time between sending Status Indication "B" while in the Congested state. 

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>255</max>

+                </range>

+                <defaultValue>80</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT6">

+            <description>Maximum time a remote site may remain in the congestated state before signalling link failure. 

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>8100</max>

+                </range>

+                <defaultValue>1000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT7">

+            <description>Maximum time to wait for an expected acknowledgement of an MSU before signalling link failure. 

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>2000</max>

+                </range>

+                <defaultValue>500</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="bitRate">

+            <description>The speed of the link. Only supported values are 64 and 56 kbit/s.

+0 = 64 kbit/s.

+1 = 56 kbit/s.

+

+</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1</max>

+                </range>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="errorCorrection">

+            <description>The error correction algorithm to use. Only Basic Error Correction (BEC) is supported.

+0 = BEC

+</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1</max>

+                </range>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionOnSet1">

+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 1 messages towards client.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>70</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionOnSet2">

+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 2 messages towards client.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>80</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionOnSet3">

+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 3 messages towards client.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>90</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionAbatement1">

+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 1 messages.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>60</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionAbatement2">

+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 2 messages.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>70</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionAbatement3">

+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 3 messages.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>80</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionDiscardLevel1">

+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 1 is discarded by MTP2.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionDiscardLevel2">

+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 2 is discarded by MTP2.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionDiscardLevel3">

+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 3 is discarded by MTP2.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="n1Onset">

+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.

+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.

+This value is ignored otherwise.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>60</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="n2Onset">

+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.

+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.

+This value is ignored otherwise.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>70</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <struct name="Mtp2ProfileDataItu">

+        <structMember name="suermT">

+            <description>SUERM parameter T.

+Measured in SU units.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>64</max>

+                </range>

+                <defaultValue>64</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="suermD">

+            <description>SUREM parameter D.

+Measurement units are in SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>256</max>

+                </range>

+                <defaultValue>256</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="suermN">

+            <description>SUERM parameter N.

+Measurement units are in SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>256</max>

+                </range>

+                <defaultValue>16</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="tin">

+            <description>Normal AERM threshold, Tin. Number of signal errors that cause abortion of a normal proving peroid.

+

+Measurement units are SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>7</max>

+                </range>

+                <defaultValue>4</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="tie">

+            <description>Emergency AERM threshold, Tie. Number of signal units errors that cause abortion of an emergency proving period.

+

+Measurement units are SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>7</max>

+                </range>

+                <defaultValue>1</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="provings">

+            <description>Proving abort limit. Number of consecutive aborted proving periods that will cause a return to the Out Of Service state.

+

+Measurement units are the number of proving periods.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>7</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT1">

+            <description>Maximum time to stay in Aligned Ready state before signalling link failure.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>65500</max>

+                </range>

+                <defaultValue>40000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT2">

+            <description>Maximum time to stay in Not Aligned state before signalling link failure.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>262000</max>

+                </range>

+                <defaultValue>5000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT3">

+            <description>Maximum time to stay in Aligned state before signalling link failure.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>2000</max>

+                </range>

+                <defaultValue>1000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT4n">

+            <description>Length of the normal proving period.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>16300</max>

+                </range>

+                <defaultValue>7500</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT4e">

+            <description>Length of the emergengcy proving period.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>16300</max>

+                </range>

+                <defaultValue>400</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT5">

+            <description>Time between sending Status Indication "B" while in the Congested state.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>255</max>

+                </range>

+                <defaultValue>80</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT6">

+            <description>Maximum time a remote site may remain in the congestated state before signalling link failure. 

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>8100</max>

+                </range>

+                <defaultValue>3000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT7">

+            <description>Maximum time to wait for an expected acknowledgement of an MSU before signalling link failure.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>2000</max>

+                </range>

+                <defaultValue>500</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="bitRate">

+            <description>The speed of the link. Only supported values are 64 and 56 kbit/s.

+0 = 64 kbit/s.

+1 = 56 kbit/s.

+

+</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1</max>

+                </range>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="errorCorrection">

+            <description>The error correction algorithm to use. Only Basic Error Correction (BEC) is supported.

+0 = BEC

+</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1</max>

+                </range>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionOnSet1">

+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 1 messages towards client.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>70</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionOnSet2">

+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 2 messages towards client.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>80</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionOnSet3">

+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 3 messages towards client.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>90</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionAbatement1">

+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 1 messages.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>60</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionAbatement2">

+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 2 messages.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>70</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionAbatement3">

+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 3 messages.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>80</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionDiscardLevel1">

+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 1 is discarded by MTP2.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionDiscardLevel2">

+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 2 is discarded by MTP2.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionDiscardLevel3">

+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 3 is discarded by MTP2.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="n1Onset">

+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.

+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.

+This value is ignored otherwise.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>60</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="n2Onset">

+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.

+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.

+This value is ignored otherwise.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>70</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <struct name="Mtp2ProfileDataChina">

+        <structMember name="bitRate">

+            <description>The speed of the link. Only supported values are 64 and 56 kbit/s.

+0 = 64 kbit/s.

+1 = 56 kbit/s.

+

+</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1</max>

+                </range>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="errorCorrection">

+            <description>The error correction algorithm to use. Only Basic Error Correction (BEC) is supported.

+0 = BEC</description>

+            <long>

+                <range>

+                    <min>0</min> <max>1</max>

+                </range>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="provings">

+            <description>Proving abort limit. Number of consecutive aborted proving periods that will cause a return to the Out Of Service state.

+

+Measurement units are the number of proving periods.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>7</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="suermD">

+            <description>SUERM parameter D.

+Measurement units are in SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>256</max>

+                </range>

+                <defaultValue>256</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="suermN">

+            <description>SUERM parameter N.

+Measurement units are in SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>256</max>

+                </range>

+                <defaultValue>16</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="suermT">

+            <description>SUERM parameter T.

+Measured in SU units.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>64</max>

+                </range>

+                <defaultValue>64</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="tie">

+            <description>Emergency AERM threshold, Tie. Number of signal units errors that cause abortion of an emergency proving period.

+

+Measurement units are SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>7</max>

+                </range>

+                <defaultValue>1</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT1">

+            <description>Maximum time to stay in Aligned Ready state before signalling link failure.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>65500</max>

+                </range>

+                <defaultValue>45000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT2">

+            <description>Maximum time to stay in Not Aligned state before signalling link failure.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>262000</max>

+                </range>

+                <defaultValue>132000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT3">

+            <description>Maximum time to stay in Aligned state before signalling link failure.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>2000</max>

+                </range>

+                <defaultValue>1000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT4e">

+            <description>Length of the emergengcy proving period.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>16300</max>

+                </range>

+                <defaultValue>500</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT4n">

+            <description>Length of the normal proving period.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>16300</max>

+                </range>

+                <defaultValue>8200</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT5">

+            <description>Time between sending Status Indication "B" while in the Congested state.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>255</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT6">

+            <description>Maximum time a remote site may remain in the congestated state before signalling link failure. 

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>8100</max>

+                </range>

+                <defaultValue>5000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT7">

+            <description>Maximum time to wait for an expected acknowledgement of an MSU before signalling link failure.

+

+Measurement units are milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>2000</max>

+                </range>

+                <defaultValue>2000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="tin">

+            <description>Normal AERM threshold, Tin. Number of signal errors that cause abortion of a normal proving peroid.

+

+Measurement units are SUs.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>7</max>

+                </range>

+                <defaultValue>4</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionOnSet1">

+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 1 messages towards client.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>70</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionOnSet2">

+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 2 messages towards client.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>80</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionOnSet3">

+            <description>Percentage of the Transmit Buffer that will cause MTP2 to signal congestion for prio 3 messages towards client.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>90</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionAbatement1">

+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 1 messages.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>60</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionAbatement2">

+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 2 messages.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>70</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionAbatement3">

+            <description>Percentage of the Transmit Buffer that ceases congestion for prio 3 messages.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>80</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionDiscardLevel1">

+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 1 is discarded by MTP2.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionDiscardLevel2">

+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 2 is discarded by MTP2.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionDiscardLevel3">

+            <description>Percentage of the Transmit Buffer where messages sent to MTP2 from client with priority less than 3 is discarded by MTP2.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="n1Onset">

+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.

+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.

+This value is ignored otherwise.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>60</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="n2Onset">

+            <description>Number of MSUs in ReTransmit Buffer before onset of preventive retransmission in PCR.

+NOTE: Only valid if errorCorrection==SCC_MTP2_ERROR_CORRECTION_PCR.

+This value is ignored otherwise.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>100</max>

+                </range>

+                <defaultValue>70</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <enum name="EmergencyStatus">

+        <description>This enumeration specifies the different stages of the emergency state.</description>

+        <enumMember name="NEVER_USED">

+            <description>Emergency state has not been activated since installation of license key file.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="ACTIVE">

+            <description>All capacity restrictions removed and all features enabled. The maximum time in this state is 7 days.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="USE_DEGRADED">

+            <description>A new license key file has to be istalled in order not to jopardize future use and performance.

+The maximum time in this state is 7 days.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="ACTIVE_AGAIN">

+            <description>All features enabled again for a maximum period of 7 days then a new license key file has to be installed in order to be able to use this node.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="USE_DISABLED">

+            <description>Use of the node is no longer allowed since no new license key file has been installed.</description>

+            <value>4</value>

+        </enumMember>

+    </enum>

+

+    <struct name="EmergencyInfo">

+        <description>This attribute provides information about the current EmergencyState.

+

+Note: for the states NEVER_USED and USE_DISABLED the return value for time is insignificant.</description>

+        <structMember name="state">

+            <description>The current emergency state of the license server.</description>

+            <enumRef name="EmergencyStatus">

+                <defaultValue>NEVER_USED</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="time">

+            <description>This attribute holds information on the time elapsed in this state.

+

+Note: The time out values for the states ALL_OPEN, DEGADED and PROLONGED is 7 days. The unit for this attribute is seconds.

+1 day = 86400 seconds

+7 days = 604800 seconds.</description>

+            <long>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <enum name="NodeRestartType">

+        <enumMember name="WARM_AT_PIU_RESTART">

+            <description>Warm node restart at restart of the last PIU.</description>

+            <value>4</value>

+        </enumMember>

+        <enumMember name="COLD_AT_PIU_RESTART">

+            <description>Cold node restart at restart of the last PIU.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="WARM_AT_PIU_FAULT">

+            <description>Warm node restart at fault mark of the last PIU.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="COLD_AT_PIU_FAULT">

+            <description>Cold node restart at fault mark of the last PIU.</description>

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <struct name="UniSaalProfileData">

+        <structMember name="maxPD">

+            <description>Maximum number of SD PDUs before a poll is sent.

+

+maxPD &lt; initialCredit</description>

+            <long>

+                <range>

+                    <min>10</min> <max>10000</max>

+                </range>

+                <defaultValue>25</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="maxStat">

+            <description>Maximum number, odd integer value, of list elements placed in a STAT PDU.

+

+Note: The maxStat attribute is dependent on the AAL5 maximum SDU size defined in the Aal5TpVccTp MO. The maxStat times 4 (octets) plus additional 12 octets (for header) must not exceed the AAL5 maximum SDU size (lower of the two directions, fromUserMaxSduSize and toUserMaxSduSize). 

+The consistency control is not performed until the UniSaalTp MO is created since there is no relation between the UniSaalProfile MO and the Aal5TpVccTp MO.</description>

+            <long>

+                <range>

+                    <min>3</min> <max>1001</max>

+                </range>

+                <defaultValue>67</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="initialCredit">

+            <description>Initial number of credits.

+

+Note: For 64 kbit/s use 30.

+

+Note! The value for initialCredit must be larger than the value of maxPD.

+</description>

+            <long>

+                <range>

+                    <min>10</min> <max>1000</max>

+                </range>

+                <defaultValue>250</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerKeepAlive">

+            <description>Timer to be used during a period of no outstanding acknowledgements or new data pending receipt of credit. At timeout the peer is polled to see if it is alive. The timer determines the interval between polls in transient phase. This timer should be greater than the roundtripdelay and also greater than timerpoll. Time unit = milliseconds.

+</description>

+            <long>

+                <range>

+                    <min>10</min> <max>10000</max>

+                </range>

+                <defaultValue>2000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerNoResponse">

+            <description>Timer to determine the maximum time interval during which at least one STAT PDU reception is expected as a response to a poll. This timer should be equal to timerKeepAlive+roundtripdelay. Time unit = milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>100000</max>

+                </range>

+                <defaultValue>7000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerIdle">

+            <description>Timer running when there are no PDUs to transmit and there are no outstanding acknowledgements or data pending for credit. When this timer is running, no POLL PDUs are sent. This timer should be significantly greater than timerKeepAlive value. Time unit = milliseconds.</description>

+            <long>

+                <range>

+                    <min>1000</min> <max>600000</max>

+                </range>

+                <defaultValue>15000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerCC">

+            <description>Timer determining the time between re-transmission of PDUs: BGN, END, ER, RS. Should be slightly more than the roundtripdelay. Time unit = milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>10000</max>

+                </range>

+                <defaultValue>1000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerPoll">

+            <description>Timer that specifies the maximum time between sending of POLL PDUs to the peer receiver during other traffic (active phase). Time unit = milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>100000</max>

+                </range>

+                <defaultValue>750</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="maxCC">

+            <description>Maximum number of re-transmissions of PDUs: BGN, END, ER, RS. Time unit = milliseconds.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>100</max>

+                </range>

+                <defaultValue>4</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionOnSet">

+            <description>Attribute specifying the percentage of the buffer that must be filled in order to cause congestion. Congestion is notified to the users of this protocol layer. The part of the buffer above the congestion level is used to take care of messages that were sent before the users stopped sending.

+

+This attribute should follow the rule 0 &lt;= congestationAbatement &lt; congestationOnSet &lt;= 100.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>100</max>

+                </range>

+                <defaultValue>70</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionAbatement">

+            <description>Attribute specifying the percentage of the buffer for which congestion is stopped. If the congestionAbatement level is lesser but almost equal to congestionOnSet, congestion alarms might be raised and ceased very often.

+

+This attribute should follow the rule 0 &lt;= congestationAbatement &lt; congestationOnSet &lt;= 100.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>100</max>

+                </range>

+                <defaultValue>60</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <struct name="NniSaalProfileData">

+        <description>Struct holding the values for an NniSaalProfile.

+

+NOTE: Congestition Level 1 - 3 is supported.</description>

+        <structMember name="timerPoll">

+            <description>Timer that specifies the maximum time between sending of POLL PDUs to the peer receiver during other traffic (active phase). Time unit = milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>100000</max>

+                </range>

+                <defaultValue>50</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="maxCC">

+            <description>Maximum number of re-transmissions of PDUs: BGN, END, ER, RS.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>100</max>

+                </range>

+                <defaultValue>4</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="maxPD">

+            <description>Maximum number of SD PDUs before a poll is sent.

+

+maxPD &lt; initialCredit</description>

+            <long>

+                <range>

+                    <min>0</min> <max>10000</max>

+                </range>

+                <defaultValue>25</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="maxStat">

+            <description>Maximum number, odd integer value, of list elements placed in a STAT PDU.

+

+Note: The maxStat attribute is controlled by the AAL5 maximum SDU size defined in the Aal5TpVccTp MO. The maxStat times 4 (octets) plus additional 12 octets (for header) must not exceed the AAL5 maximum SDU size (lower of the two directions, fromUserMaxSduSize and toUserMaxSduSize).

+

+The consistency control is not performed until the NniSaalTp MO is created since there is no relation between the NniSaalProfile MO and the Aal5TpVccTp MO.</description>

+            <long>

+                <range>

+                    <min>3</min> <max>1001</max>

+                </range>

+                <defaultValue>67</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="initialCredit">

+            <description>Initial number of credits.

+

+Note: For 64 kbit/s use 30.

+

+Note! The value for initialCredit must be larger than the value of maxPD.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>1000</max>

+                </range>

+                <defaultValue>250</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerKeepAlive">

+            <description>Timer to be used during a period of no outstanding acknowledgements or new data pending receipt of credit. At timeout the peer is polled to see if it is alive. The timer determines the interval between polls in transient phase. This timer should be greater than the roundtripdelay and also greater than timerpoll. Time unit = milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>10000</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerNoResponse">

+            <description>Timer to determine the maximum time interval during which at least one STAT PDU reception is expected as a response to a poll.This timer should be equal to timerKeepAlive+roundtripdelay. Time unit = milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>100000</max>

+                </range>

+                <defaultValue>500</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerIdle">

+            <description>Timer running when there are no PDUs to transmit and there are no outstanding acknowledgements or data pending for credit. When this timer is running, no POLL PDUs are sent. This timer should be significantly greater than timerKeepAlive value. Time unit = milliseconds.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>10000</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerCC">

+            <description>Timer determining the time between re-transmission of PDUs: BGN, END, ER, RS. Time unit = milliseconds.

+Should be more than the roundtrip delay.</description>

+            <long>

+                <range>

+                    <min>10</min> <max>10000</max>

+                </range>

+                <defaultValue>200</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="mps">

+            <description>Management Proving Status which is used to decide if proving is done or not during SAAL connection setup.

+</description>

+            <long>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionLevel1OnSet">

+            <description>Attribute specifying the percentage of the buffer that must be filled in order to cause congestion. 

+Congestion is notified to the users of this protocol layer. The part of the buffer above the congestion 

+level is used to take care of messages that were sent before the users stopped sending.

+

+Attribute specifying the percentage of the buffer that must be filled in order to cause congestion. 

+Congestion is notified to the users of this protocol layer. The part of the buffer above the congestion 

+level is used to take care of messages that were sent before the users stopped sending.

+

+This attribute should follow the rule 0 &lt;= congestationLevel1OnSet &lt;= congestationLevel2OnSet &lt;= congestationLevel3OnSet &lt;= 100.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>100</max>

+                </range>

+                <defaultValue>70</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionLevel2OnSet">

+            <description>Attribute specifying the percentage of the buffer that must be filled in order to cause congestion. 

+Congestion is notified to the users of this protocol layer. The part of the buffer above the congestion 

+level is used to take care of messages that were sent before the users stopped sending.

+

+This attribute should follow the rule 0 &lt;= congestationLevel1OnSet &lt;= congestationLevel2OnSet &lt;= congestationLevel3OnSet &lt;= 100.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>100</max>

+                </range>

+                <defaultValue>80</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionLevel3OnSet">

+            <description>Attribute specifying the percentage of the buffer that must be filled in order to cause congestion. 

+Congestion is notified to the users of this protocol layer. The part of the buffer above the congestion 

+level is used to take care of messages that were sent before the users stopped sending.

+

+This attribute should follow the rule 0 &lt;= congestationLevel1OnSet &lt;= congestationLevel2OnSet &lt;= congestationLevel3OnSet &lt;= 100.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>100</max>

+                </range>

+                <defaultValue>90</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="congestionLevel1Abatement">

+            <description>Attribute specifying the percentage of the buffer for which congestionLevel1 is stopped. If the congestionAbatement level is lesser but almost equal to congestionOnSet, congestion alarms might be raised and ceased very often.

+</description>

+            <long>

+                <range>

+                    <min>0</min> <max>100</max>

+                </range>

+                <defaultValue>60</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="nrOfPDUsDuringProving">

+            <description>The length of proving in terms of number of transmitted PDUs (n1).

+noOfPDUsDuringProving x T3 &lt; T2

+

+For the TTC standard the only allowed value is 0 (which means no proving).</description>

+            <long>

+                <range>

+                    <min>0</min> <max>100000</max>

+                </range>

+                <defaultValue>1000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="maxNRP">

+            <description>State variable which defines max number of retransmissions of PDUs during proving to consider proving successful.

+</description>

+            <long>

+                <range>

+                    <min>0</min> <max>100</max>

+                </range>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerNoCredit">

+            <description>Maximum time of no credit. If the timer expires, the assured data transfer mode is released.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>100000</max>

+                </range>

+                <defaultValue>1500</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerRepeatSrec">

+            <description>Timer which is set whenever a report of SSCOP recovery is received from the SSCF. If the timer is running when another report of recovery is received, the assured data transfer mode is released. If the timer expires, nothing is done. Time unit = milliseconds.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>86400000</max>

+                </range>

+                <defaultValue>3600000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT1">

+            <description>Timer between the link release action and the next link re-establish action during the alignment. At expiry of timer T1, a new attempt to setup assured data transfer mode to the peer is done. Time unit = milliseconds.

+</description>

+            <long>

+                <range>

+                    <min>10</min> <max>100000</max>

+                </range>

+                <defaultValue>5000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT2">

+            <description>Total time that SSCF will attempt alignment. At expiry of timer T2, the alignment procedure will be interrupted.

+ Time unit = milliseconds.

+</description>

+            <long>

+                <range>

+                    <min>10</min> <max>200000</max>

+                </range>

+                <defaultValue>30000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT3">

+            <description>Time between proving PDUs. The timer is set such that loading of the signalling link is approximately 50% of its nominal rate.  

+Time unit = milliseconds.</description>

+            <long>

+                <range>

+                    <min>5</min> <max>1000</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <exception name="ListOfTimeSlotsNotUniqueException">

+        <description>Exception thrown when a time slot appears more than once in the time slot list.</description>

+    </exception>

+

+    <enum name="RefActivity">

+        <description>RefActivity can have the following values:

+

+inactive = Synchronization reference is currently not used in system clock generation.

+active = Synchronization is used in system clock generation.

+</description>

+        <enumMember name="inactive">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="active">

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="RefState">

+        <description>RefState can have the following values:

+failed = synchronization reference is not capable to perform its required tasks.

+degraded = capability of synchronization reference to perform its required tasks is degraded e.g. because of signal level degradation. This value is only applicable for traffic carrying (ET physical path termination) synchronization references. Note: attribute degradationIsFault controls whether synchronization reference degradation is interpreted as a synchronization reference fault or not.

+lossOfTracking = system clock regulation algorithm on TU board can not follow the 8kHz synchronization reference signal either because of the poor quality of the signal or because of a HW fault at TU board. If all synchronization references repeatedly end up to state lossOfTracking, fault is likely in TU HW.

+ok = synchronization reference is capable of performing its required tasks.

+</description>

+        <enumMember name="failed">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="degraded">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="lossOfTracking">

+            <value>2</value>

+        </enumMember>

+        <enumMember name="ok">

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <enum name="FaultCriteria">

+        <description>FaultCriteria can have the following values:

+degrNotFault = synchronization reference degradation is NOT interpreted as a synchronization reference fault.

+degrIsFault = synchronization reference degradation is interpreted as a synchronization reference fault.</description>

+        <enumMember name="degrNotFault">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="degrIsFault">

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="ClockState">

+        <description>ClockState can have the following values:

+startUp = 

+locked = system clock signal on Timing Unit is locked: a synchronization reference is used in the system clock generation, clock accuracy is 50 ppb or better.

+holdOver = system clock signal on Timing Unit is hold-over: no synchronization reference is used in system clock generation, clock accuracy is 50 ppb or better.

+freeRunning = system clock signal on Timing Unit is free running: no synchronization reference is used in system clock generation, clock accuracy is 4.6 ppm or better.

+failed = system clock signal on Timing Unit is failed: fault in system clock generation function, no quarantee of clock accuracy level.

+not Applicable = system clock signal on Timing Unit is not applicable: TU board not present.</description>

+        <enumMember name="unknownMode">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="startupMode">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="lockedMode">

+            <value>2</value>

+        </enumMember>

+        <enumMember name="holdOverMode">

+            <value>3</value>

+        </enumMember>

+        <enumMember name="freeRunningMode">

+            <value>4</value>

+        </enumMember>

+        <enumMember name="failedMode">

+            <value>5</value>

+        </enumMember>

+        <enumMember name="lossOfTrackingMode">

+            <value>6</value>

+        </enumMember>

+        <enumMember name="notApplicable">

+            <value>7</value>

+        </enumMember>

+    </enum>

+

+    <exception name="AlreadyRegisteredException">

+        <description>Exception thrown when an object is already registered.</description>

+    </exception>

+

+    <exception name="MaxNoOfRefRegisteredException">

+        <description>Exception thrown when the maximum number of references is reached.</description>

+    </exception>

+

+    <exception name="PriorityAlreadyInUseException">

+        <description>Exception thrown when a priority is already in use.</description>

+    </exception>

+

+    <exception name="PriorityOutOfRangeException">

+        <description>Exception thrown when the priority is out of range.</description>

+    </exception>

+

+    <exception name="NotPermittedException">

+        <description>Exception thrown when an reference is not valid, null or of incorrect type.</description>

+    </exception>

+

+    <exception name="NotRegisteredException">

+        <description>Exception thrown when trying to de-register an object that is not registered in the database.</description>

+    </exception>

+

+    <enum name="SystemClockRedundancy">

+        <enumMember name="SYSTEM_CLOCK_USERS_USE_PLANE_A">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="SYSTEM_CLOCK_USERS_USE_PLANE_B">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="SYSTEM_CLOCK_USERS_USE_PLANE_A_AND_B">

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <exception name="NotUniqueFroIdException">

+        <description>Exception thrown when a fro Id is not unique.</description>

+    </exception>

+

+    <enum name="ActiveSwitchPlane">

+        <enumMember name="switchPlaneA">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="switchPlaneB">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="switchPlaneBoth">

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="SwitchReliableGroup">

+        <description>A predefined group consisting of working links and their corresponding protecting links.  These links  form the n+m link redundancy.  </description>

+        <enumMember name="physicalLinkStatusWorking">

+            <description>Defines physical link status. 

+</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="physicalLinkStatusProtecting">

+            <description>Defines physical link status. 

+</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="physicalLinkStatusUndefined">

+            <description>Defines physical link status. 

+</description>

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <struct name="GlobalTitleData">

+        <structMember name="indicator">

+            <description>Global title indicator should have following values for both ITU and TTC:

+

+The values for the GT Indicator 

+

+Value    Comment

+

+0            No new global title

+2            TT only

+3            TT-NP-ES

+4            TT-NP-ES-NOA

+

+Explanation: 

+

+TT = translation type 

+NP = numbering plan 

+ES = encoding scheme 

+NOA = nature of address indication</description>

+            <long>

+                <range>

+                    <min>0</min> <max>4</max>

+                </range>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="natureOfAddress">

+            <description>Indicates number type, i.e. national or international number.

+Coding of the Nature Address:

+

+0 = "unknown"

+1 = "Subscriber number"

+2 = "Reserved for national use"

+3 = "National significant number"

+4 = "International number"</description>

+            <long>

+                <range>

+                    <min>0</min> <max>4</max>

+                </range>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="numberingPlan">

+            <description>Indicates which numbering plan that is used.

+

+Coding of the Numbering Plan:

+

+0 = "Unknown"

+1 = "ISDN/Telephony Numbering Plan"

+3 = "Data Numbering Plan"

+4 = "Telex Numbering Plan"

+5 = "Maritime Mobile Numbering Plan"

+6 = "Land Mobile Numbering Plan"

+7 = "ISDN/Mobile Numbering Plan"

+</description>

+            <long>

+                <range>

+                    <min>0</min> <max>7</max>

+                </range>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="translationType">

+            <description>Used to direct the message to the appropriate Global Title translation function.</description>

+            <long>

+                <range>

+                    <min>0</min> <max>254</max>

+                </range>

+            </long>

+        </structMember>

+        <structMember name="addressInformation">

+            <description>Digit string of 1-37 digits, where each digit is 0-9, and B, C. B and C are for Code 11 and Code 12.

+The addressInformation may also contain wild card symbols: "*" or "?". Wild cards are only allowed for defining Global Title Translations, they are not allowed for specifying SCCP SAPs (built with SPC and Global Title or SPC + SSN + Global Title).</description>

+            <string>

+                <lengthRange>

+                    <min>1</min> <max>37</max>

+                </lengthRange>

+            </string>

+        </structMember>

+        <structMember name="encodingScheme">

+            <description>Indicates if the number of address signals are an odd or even number, and is coded as follows:

+

+0 = "Unknown"

+1 = "BCD, odd number of digits"

+2 = "BCD, even number of digits"

+

+Other values in the encoding scheme will result in the error "Wrong Nature Of Address", (Routing failure reason=No translation for an address of such nature).</description>

+            <long>

+                <range>

+                    <min>0</min> <max>2</max>

+                </range>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <enum name="SharingMode">

+        <enumMember name="loadShare">

+            <description>The when sharing mode is set to loadShare the SCCP traffic is load shared between the two entities (access points).</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="dupliDominant">

+            <description>When the sharing mode is set to dupliDominant the second entity (access point) is a backup for the first entity.</description>

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="EncodingScheme">

+        <description>Possible values for number signalling.</description>

+        <enumMember name="UNKNOWN">

+            <description>Unkown encoding scheme.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="ODD_NUMBER">

+            <description>BCD, odd number of digits.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="EVEN_NUMBER">

+            <description>BCD, even number of digits.</description>

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="GlobalTitleIndicator">

+        <description>Global title indicator values for China, ITU, TTC and ANSI.

+

+Note: China,  ITU and TCC will use TT_ONLY, TT_NP_ES, TT_NP_ES_NOA, NOA_ONLY.

+

+ANSI will use: 

+ANSI_TT_NP_ES = 5

+ANSI_TT_ONLY = 6 

+</description>

+        <enumMember name="TT_ONLY">

+            <description>Translation Type only. 

+

+Only valid for China, ITU and TTC.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="TT_NP_ES">

+            <description>Translation Type, Numbering Plan and Encoding Scheme.

+

+Only valid for China, ITU and TTC.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="TT_NP_ES_NOA">

+            <description>Translation Type, Numbering Plan, Encoding Scheme, and Nature Of Address indication.

+

+Only valid for China, ITU and TTC.</description>

+            <value>4</value>

+        </enumMember>

+        <enumMember name="NOA_ONLY">

+            <description>Nature of Address indicator only.

+

+Only valid for China, ITU and TTC.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="ANSI_TT_NP_ES">

+            <description>Translation Type, Numbering Plan and Encoding Scheme.

+

+Only valid for ANSI.

+</description>

+            <value>5</value>

+        </enumMember>

+        <enumMember name="ANSI_TT_ONLY">

+            <description>Translation Type only.

+

+Only valid for ANSI.

+</description>

+            <value>6</value>

+        </enumMember>

+    </enum>

+

+    <enum name="NatureOfAddress">

+        <description>Phone number types.</description>

+        <enumMember name="UNKNOWN">

+            <description>Unknown number type.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="SN">

+            <description>Subscriber number type.

+</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="RN">

+            <description>Reserved for national use, number type.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="NSN">

+            <description>National Significant Number type.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="IN">

+            <description>International number type.</description>

+            <value>4</value>

+        </enumMember>

+    </enum>

+

+    <enum name="NumberingPlan">

+        <description>Numbering plans.</description>

+        <enumMember name="UNKNOWN">

+            <description>Unknown numbering plan.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="TELEPHONY">

+            <description>ISDN/Telephony numbering plan.

+</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="DATA">

+            <description>Data numbering plan.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="TELEX">

+            <description>Telex numbering plan.

+</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="MOBILE_MARITIME">

+            <description>Maritime mobile numering plan.

+</description>

+            <value>4</value>

+        </enumMember>

+        <enumMember name="MOBILE_LAND">

+            <description>Land mobile numbering plan.

+</description>

+            <value>5</value>

+        </enumMember>

+        <enumMember name="MOBILE">

+            <description>ISDN/Mobile numbering plan.</description>

+            <value>6</value>

+        </enumMember>

+    </enum>

+

+    <enum name="SccpCountType">

+        <enumMember name="MESSAGES">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="OCTETS">

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <struct name="Scmg">

+        <structMember name="sendSST">

+            <description>Controls when to send SST (SCCP Subsystem Test message).

+

+0 = Wait for tStatInfo timer to expire once after MTP_RESUME before sending SST. 

+1 = Send SST immediately after MTP_RESUME, then start tStatInfo timer.</description>

+            <long>

+                <defaultValue>1</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="sendSSA">

+            <description>Controls when to send SSA (SCCP Subsystem Allowed message).

+

+0 = Do not send SSA when client attaches, wait  until SST is received. (default for ANSI/CHINA/ITU/TTC)

+1 = Send SSA immediately when client attaches.</description>

+            <long>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="sendSSP">

+            <description>Controls whether to send SSP (SCCP Subsystem Prohibited message).

+

+0 = Do not send SSP when client detaches. (default for TTC)

+1 = Send SSP immediately when client detaches. (default for ANSI/CHINA/ITU)</description>

+            <long>

+                <defaultValue>1</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="useSST">

+            <description>Controls whether to send SST messages or not (SCCP Subsystem Test message).

+

+0 = Send SST as indicated by sendSST. (default for ANSI/CHINA/ITU)

+1 = (not used)

+2 = (not used)

+3 = Do not initiate SST messages at all, ie. do not start timer tStatInfo nor send any SST at MTP_RESUME. (default for TTC)</description>

+            <long>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="allowRemoteBroadcast">

+            <description>Controls the remote broadcast.

+

+0 = allow remote broadcast. (default for ANSI/CHINA/ITU/TTC)

+1 = do not allow remote broadcast</description>

+            <long>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="initiateTimerTcon">

+            <description>Controls whether to initiate hardcoded congestion timer or not.

+

+0 = start timer when SSC is received. (default for CHINA/ITU/TTC)

+1 = do not start timer

+

+Note! This attribute is not valid for the ANSI standard.</description>

+            <long>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <enum name="DiscardReturnServiceMsg">

+        <enumMember name="DISCARD">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="RETURN">

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <exception name="WrongUserTypeException">

+    </exception>

+

+    <exception name="UsageNotPermittedException">

+    </exception>

+

+    <enum name="J1Type">

+        <description>J1Type can have the following values:

+J1_G = 0 according to  TTC JT-G703/G704

+J1_I = 1 according to TCC JT-I431</description>

+        <enumMember name="j1_G">

+            <description>J1 according to  TTC JT-G703/G704</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="j1_I">

+            <description>J1 according to TCC JT-I431</description>

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="StandardMode">

+        <description>Indicates what standard the MAO is operating to.</description>

+        <enumMember name="TTC">

+            <description>The standard mode is Telecommunication Technology Committee (TTC).</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="ANSI">

+            <description>The standard mode ANSI.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="ETSI">

+            <description>The standard mode is ETSI.</description>

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="MuxMode">

+        <description>Indicates what multiplexing is being used.</description>

+        <enumMember name="STANDBY">

+            <description>Standby for protection.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="E1_J1_T1_LEVEL">

+            <description>Multiplexing terminated at the E1/J1/T1 level.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="VC4_STS3CSPE_LEVEL">

+            <description>Multiplexing terminated at the VC-4/STS3CSPE level.</description>

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="Os155LoopBack">

+        <description>The loopback method available for use by the Os155SpiTtp MO.</description>

+        <enumMember name="NONE">

+            <description>No loopback in use.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="LINE">

+            <description>Loopingback using line.</description>

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="SwitchModes">

+        <description>The switch modes.</description>

+        <enumMember name="AUTOMATIC">

+            <description>Automatic switching.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="LOCKED">

+            <description>Locked for swtiching.</description>

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <exception name="FailedResourceException">

+    </exception>

+

+    <exception name="LockedResourceException">

+    </exception>

+

+    <exception name="UnknownReasonException">

+    </exception>

+

+    <exception name="AlreadyLockedException">

+    </exception>

+

+    <exception name="IncorrectOsi155SpiIdException">

+    </exception>

+

+    <enum name="PathTraceFormat">

+        <description>Path Trace Formats.</description>

+        <enumMember name="ITU_T_G707">

+            <description>16 byte path trace format according to ITU-T G707 table 4.</description>

+            <value>16</value>

+        </enumMember>

+        <enumMember name="GR_253_CORE">

+            <description>64 byte path trace format according to section 3.3.2.3, Telecordia GR-253-CORE.</description>

+            <value>64</value>

+        </enumMember>

+    </enum>

+

+    <enum name="Crc4Mode">

+        <description>Cyclical Redundancy Checks 4 modes.</description>

+        <enumMember name="OFF">

+            <description>CRC 4  is off.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="ON">

+            <description>CRC 4 is on.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="AUTOMATIC">

+            <description>CRC 4 is automatic.</description>

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="IdlePattern">

+        <description>Idle patterns.</description>

+        <enumMember name="A_LAW">

+            <description>A law idle pattern.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="U_LAW">

+            <description>Micro law  idle pattern.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="UNDEFINED">

+            <description>Undefined idle pattern.</description>

+            <value>0</value>

+        </enumMember>

+    </enum>

+

+    <enum name="LoopbackState">

+        <description>The possible loopback states for E1/J1/T1/E3/T3PhysPathTerm MOs.</description>

+        <enumMember name="none">

+            <description>This is the normal state, no loop back is preformed (and ordinary traffic is running).</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="line">

+            <description>The phyiscal path is looped on the line side, the external incoming path is looped back to the external outgoing path.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="system">

+            <description>The physical path is looped on the system side, the (node-) internal incoming path is looped back to the internal outgoing path.</description>

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="TransmissionMode">

+        <description>L stands for long haul interface and S stands for short haul interface.

+The subsequent figure specifies the cable distance in feets.</description>

+        <enumMember name="L_6000">

+            <description>Long Haul 6000 ft, -0 dB</description>

+            <value>8</value>

+        </enumMember>

+        <enumMember name="L_4000">

+            <description>Long Haul 4000 ft, -7 dB</description>

+            <value>7</value>

+        </enumMember>

+        <enumMember name="L_2000">

+            <description>Long Haul 2000 ft, -15 dB</description>

+            <value>6</value>

+        </enumMember>

+        <enumMember name="L_0">

+            <description>Long Haul 0 ft, -22 dB</description>

+            <value>5</value>

+        </enumMember>

+        <enumMember name="S_133">

+            <description>Short Haul 0..133 ft</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="S_266">

+            <description>Short Haul 134..266 ft</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="S_399">

+            <description>Short Haul 267..399 ft</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="S_533">

+            <description>Short Haul 400..533 ft</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="S_655">

+            <description>Short Haul 534..655 ft</description>

+            <value>4</value>

+        </enumMember>

+    </enum>

+

+    <struct name="Mtp3bSpItuPriorityData">

+        <description>Priority attributes for MTP3b SP of the ITU standard.</description>

+        <structMember name="prioSlt">

+            <description>The prioSlt attribute sets the priority for the

+ Signalling Link Test  Message and Acknowledge (SLTM / SLTA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioCo">

+            <description>The prioCo attribute sets the priority for the ChangeOver Order and Acknowledge (COO/COA) or eXtended Change over Order and Acknowledge (XCO/XCA) messages  when  issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet)

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioCb">

+            <description>The prioCb attribute sets the priority for the

+ Change Back Declaration and Acknowledge (CBD / CBA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioEc">

+            <description>The prioEc attribute sets the priority for the

+Emergency Change over Order and Acknowledge (ECO / ECA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).	

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioRst">

+            <description>The prioRst attribute sets the priority for the

+signalling Route Set Test (RST) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioTra">

+            <description>The prioTra attribute sets the priority for the

+Traffic Restart Allowed signal (TRA) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioUpu">

+            <description>The prioUpu attribute sets the priority for the

+ User Part Unavailable (UPU) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioLink">

+            <description>The prioLink attribute sets the priority for link related messages when issued by the MTP3b itself. The messages are :

+

+Link INhibit (LIN), Link UNinhibit (LUN),

+Link Inhibit Denied (LID),

+Link Inhibit Acknowledge (LIA),

+Link Uninhibit Acknowledge (LUA),

+Link Forced Uninhibit (LFU), 

+Link Local inhibit Test (LLT) and

+Link Remote inhibit Test (LRT)

+

+When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+    </struct>

+

+    <struct name="Mtp3bSpItuTimerData">

+        <description>ITU timers for MTP3bSpItu. Timervalues in 1/10 s (deciseconds).</description>

+        <structMember name="timerT1">

+            <description>Delay to avoid message mis-sequencing on changeover.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT2">

+            <description>Timer for waiting for a COO or a COA.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT3">

+            <description>Delay to avoid message mis-sequencing  on a time controlled diversion change back.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT4">

+            <description>Timer for waiting for CBA, first attempt.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT5">

+            <description>Timer for waiting for CBA, second attempt

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT6">

+            <description>Timer for delay to avoid message mis-sequencing on controlled rerouting.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>9</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT8">

+            <description>Timer for delay to prohibit sending of TFP messages via the response method. This is a STP specific parameter, which is ignored when configured as an endpoint.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT10">

+            <description>Timer for waiting to repeat sending of RST periodically.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>400</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT12">

+            <description>Waiting for uninhibit acknowledgement.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT13">

+            <description>Timer for waiting for force uninhibit.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT14">

+            <description>Timer for waiting for inhibition acknowledgement.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>30</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT17">

+            <description>Delay to avoid oscillation of initial alignment failure and link restart.

+

+The value for this timer should be less than the value for timerT2.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>9</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTBsnt">

+            <description>Waiting for BSNT value from MTP-2 or SAAL (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTRetrieval">

+            <description>Timer for waiting for completion of buffer retrieval from MTP-2 or SAAL (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTStart">

+            <description>Timer for retransmission of DL_START_req if no answer received. Started when timerT17 expires. (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>1200</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTc">

+            <description>Controlling the period a route set is considered congested when a Transfer Controlled message has been received. 

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>50</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT18">

+            <description>Supervision timer for the first phase of a restarting STP. This is an STP specific parameter, which is ignored when configured as an endpoint.

+

+The value for this timer should be less than the value for timerT2.

+

+Unit: deciseconds (1/10 second).

+</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>550</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT19">

+            <description>Controlling the response of the receipt of a traffic restart message from an adjacent node.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>680</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT20">

+            <description>Overall MTP restart timer at the restarting MTP.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>600</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT21">

+            <description>Overall MTP restart timer at an adjacent signalling point to a restarting MTP.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>640</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT22">

+            <description>Local inhibit test timer.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>2500</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT23">

+            <description>Remote inhibit test timer.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>2500</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerSlta">

+            <description>Supervision timer for SLTA message (time within SLTA should arrive).

+

+Timer T1 in ITU Q.707 standard.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerSltm">

+            <description>Timer for sending SLTM periodically.

+

+Timer T2 in ITU Q.707 standard.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>400</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaTack">

+            <description>Timer used for message acknowledgement.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaPeriodicAudit">

+            <description>Timer used for audit procedure.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>300</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT1">

+            <description>Delay to avoid mis-sequencing of messages when an association fails.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT3">

+            <description>Delay to avoid mis-sequencing of messages when an association becomes active.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT6">

+            <description>Delay to avoid mis-sequencing on controlled rerouting.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT8">

+            <description>Delay to prohibit sending of DUNA messages via the response method.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT40">

+            <description>Delay to avoid message mis-sequencing on controlled/forced rerouting.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT41">

+            <description>Timer controlloing the traffic activation delay during restart phase.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT42">

+            <description>The forever interval period for trying association after an unsiccessfull trial.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaTc">

+            <description>Timer controlling the period a route set is considered congested when a SCON message has been received.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>50</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT15">

+            <description>Timer waiting to start signaling route set congestiontest. Used only if the Route Set 

+Congestion Test Selectoption is set to "Use Route Set Congestion test".

+

+Guiding value 20 - 30.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT16">

+            <description>Timer waiting for route set congestion status update. Used only if the Route Set 

+Congestion Test Selectoption is set to "Use Route Set Congestion test"

+

+Guiding value 14 - 22.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>14</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTDlack">

+            <description>Timer pending an acknowledge from the network layer for a DL_ACK_REQ.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaTassocack">

+            <description>Timer used for SCTP_ASSOCIATE_REQ message acknowledgement. This is the maximum time to wait for the SCTP_COMMUP_IND mesage before considering it to be an error.

+It should be longer than the time a message spends to reach the most distant destination, be processed and returned.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <enum name="CongestLevel">

+        <description>The supported congestion levels.</description>

+        <enumMember name="level_0">

+            <description>No Congestion.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="level_1">

+            <description>Congestion level low.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="level_2">

+            <description>Congestion level medium.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="level_3">

+            <description>Congestion level high.</description>

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <exception name="ActivationFailedException">

+    </exception>

+

+    <exception name="NoAvailRouteException">

+    </exception>

+

+    <enum name="Mtp3bCongestLevel">

+        <enumMember name="notCongested">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="congested">

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="Mtp3bNetworkInd">

+        <description>Indicates which type of geographical network, e.g. national, international, etc..

+

+Note: Not applicable for TTC.</description>

+        <enumMember name="INTERNATIONAL_NETWORK">

+            <description>International Network.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="SPARE">

+            <description>Spare (for international use only).</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="NATIONAL_NETWORK">

+            <description>National network.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="RESERVED_FOR_NATIONAL_USE">

+            <description>Reserved for national use.</description>

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <enum name="Mtp3bTfrHandling">

+        <description>Indicates how a TransFer Restricted (TFR) signal is handled.</description>

+        <enumMember name="HANDLE_AS_TFA">

+            <description>Treat the TransFer Restricted (FTR) signal as a TransFer Allowed (TFA) signal.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="IGNORED">

+            <description>Ignore the TransFer Restricted (TFR) signal.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="HANDLE_BY_STANDARD">

+            <description>Handle the incoming TRF messages according to the standard.</description>

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="Mtp3bSioSpareBitsUse">

+        <description>Indicates whether the two spare bits in the Service Information Octet (SIO) should be treated as spare or for indicating a priority level. </description>

+        <enumMember name="SPARE">

+            <description>The two spare bits in the SIO are treated as spare.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="PRIO">

+            <description>The two spare bits in the SIO are to be used for indicating a priority level.</description>

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="Mtp3bItuVersion">

+        <description>Indicates which version of the ITU standard.</description>

+        <enumMember name="ITU_T_88">

+            <description>ITU-T -88.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="ITU_T_03_93">

+            <description>ITU-T 03/93.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="ITU_T_07_96">

+            <description>ITU-T 07/96</description>

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <struct name="Mtp3bSpAnsiTimerData">

+        <description>ANSI timers for MTP3bSpAnsi. Timervalues in 1/10 s (deciseconds).</description>

+        <structMember name="timerT1">

+            <description>Delay to avoid message mis-sequencing on changeover.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT2">

+            <description>Timer for waiting for a COO or a COA.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT3">

+            <description>Delay to avoid message mis-sequencing  on a time controlled diversion change back.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT4">

+            <description>Timer for waiting for CBA, first attempt.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT5">

+            <description>Timer for waiting for CBA, second attempt

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT6">

+            <description>Timer for delay to avoid message mis-sequencing on controlled rerouting.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>9</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT8">

+            <description>Timer for delay to prohibit sending of TFP messages via the response method. This is a STP specific parameter, which is ignored when configured as an endpoint.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT10">

+            <description>Timer for waiting to repeat sending of RST periodically.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>400</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT12">

+            <description>Waiting for uninhibit acknowledgement.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT13">

+            <description>Timer for waiting for force uninhibit.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT14">

+            <description>Timer for waiting for inhibition acknowledgement.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>30</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT15">

+            <description>Timer waiting to start signaling route set congestiontest. Used only if the Route Set 

+Congestion Test Selectoption is set to "Use Route Set Congestion test".

+

+Guiding value 20 - 30.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT16">

+            <description>Timer waiting for route set congestion status update. Used only if the Route Set 

+Congestion Test Selectoption is set to "Use Route Set Congestion test"

+

+Guiding value 14 - 22.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>14</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT17">

+            <description>Delay to avoid oscillation of initial alignment failure and link restart.

+

+The value for this timer should be less than the value for timerT2.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>9</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTBsnt">

+            <description>Waiting for BSNT value from MTP-2 or SAAL (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTRetrieval">

+            <description>Timer for waiting for completion of buffer retrieval from MTP-2 or SAAL (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTStart">

+            <description>Timer for retransmission of DL_START_req if no answer received. Started when timerT17 expires. (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>1200</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTc">

+            <description>Controlling the period a route set is considered congested when a Transfer Controlled message has been received. 

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>50</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT30">

+            <description>Timer to limit sending of TFPs and TFRs in response to unexpected TRA and TRW. This timer is specific for STP functionality and is ignored when configured as an endpoint.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>300</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT25">

+            <description>Delay extension timer invoked on reciept of a Traffic Restart Waiting message from an adjacent SP which is restarting.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>300</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT26">

+            <description>Controlling the periodic resend of Traffic Restart Waiting messages during restart of the local node.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>120</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT27">

+            <description>Timer enforcing a minimum node unavailablility period during MTP restart.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT28">

+            <description>Delay timer controlling a timed reaction of the restart of an adjacent node.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>30</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT29">

+            <description>Timer controlling the response of the receipt of Traffic Restart messages from an adjacent node.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>600</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT20">

+            <description>Controlling the periodic resend of Local Inhibit Change Message.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>1000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT21">

+            <description>Controlling the periodic resend of Remote Inhibit Test Message.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>1000</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT22">

+            <description>Delay on commencement of MTP Restart to allow the node to rebuild an accurate routing table based on messages for adjacent nodes.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>600</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT23">

+            <description>Supervision timer for routing updates on MTP Restart.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>40</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT31">

+            <description>Timer controlling the detection of false link congestion.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTDlack">

+            <description>Timer pending an acknowledge from the network layer for a DL_ACK_REQ.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerSltm">

+            <description>Timer for sending SLTM periodically.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>400</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerSlta">

+            <description>Supervision timer for SLTA message (time within SLTA should arrive).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaTack">

+            <description>Timer used for message acknowledgement.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaPeriodicAudit">

+            <description>Timer used for audit procedure.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>300</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT1">

+            <description>Delay to avoid mis-sequencing of messages when an association fails.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT3">

+            <description>Delay to avoid mis-sequencing of messages when an association becomes active.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT6">

+            <description>Delay to avoid mis-sequencing on controlled rerouting.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT8">

+            <description>Delay to prohibit sending of DUNA messages via the response method.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT40">

+            <description>Delay to avoid message mis-sequencing on controlled/forced rerouting.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT41">

+            <description>Timer controlloing the traffic activation delay during restart phase.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT42">

+            <description>The forever interval period for trying association after an unsiccessfull trial.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaTc">

+            <description>Timer controlling the period a route set is considered congested when a SCON message has been received.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>50</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaTassocack">

+            <description>Timer used for SCTP_ASSOCIATE_REQ message acknowledgement. This is the maximum time to wait for the SCTP_COMMUP_IND mesage before considering it to be an error.

+It should be longer than the time a message spends to reach the most distant destination, be processed and returned.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <struct name="Mtp3bSpTtcTimerData">

+        <description>TTC timers for MTP3bSpTtc. Timervalues in 1/10 s (deciseconds).</description>

+        <structMember name="timerT1">

+            <description>Delay to avoid message mis-sequencing on changeover.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT2">

+            <description>Timer for waiting for a COO or a COA.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT3">

+            <description>Delay to avoid message mis-sequencing  on a time controlled diversion change back.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT4">

+            <description>Timer for waiting for CBA, first attempt.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT6">

+            <description>Timer for delay to avoid message mis-sequencing on controlled rerouting.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>9</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT8">

+            <description>Timer for delay to prohibit sending of TFP messages via the response method. This is a STP specific parameter, which is ignored when configured as an endpoint.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT10">

+            <description>Timer for waiting to repeat sending of RST periodically.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>400</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT17">

+            <description>Delay to avoid oscillation of initial alignment failure and link restart.

+

+The value for this timer should be less than the value for timerT2.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>9</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerSrt">

+            <description>Timer pending a Signalling Route Test Acknowledgement.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTBsnt">

+            <description>Waiting for BSNT value from MTP-2 or SAAL (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTRetrieval">

+            <description>Timer for waiting for completion of buffer retrieval from MTP-2 or SAAL (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTStart">

+            <description>Timer for retransmission of DL_START_req if no answer received. Started when timerT17 expires. (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>1200</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTc">

+            <description>Controlling the period a route set is considered congested when a Transfer Controlled message has been received. 

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>50</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT15">

+            <description>Timer waiting to start signaling route set congestiontest. Used only if the Route Set 

+Congestion Test Selectoption is set to "Use Route Set Congestion test".

+

+Guiding value 20 - 30.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT16">

+            <description>Timer waiting for route set congestion status update. Used only if the Route Set 

+Congestion Test Selectoption is set to "Use Route Set Congestion test"

+

+Guiding value 14 - 22.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>14</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTDlack">

+            <description>Timer pending an acknowledge from the network layer for a DL_ACK_REQ.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <struct name="Mtp3bSpAnsiPriorityData">

+        <description>Priority attributes for MTP3b SP of the ANSI standard.</description>

+        <structMember name="prioSlt">

+            <description>The prioSlt attribute sets the priority for the

+ Signalling Link Test  Message and Acknowledge (SLTM / SLTA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioCo">

+            <description>The prioCo attribute sets the priority for the ChangeOver Order and Acknowledge (COO/COA) or eXtended Change over Order and Acknowledge (XCO/XCA) messages  when  issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet)

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioCb">

+            <description>The prioCb attribute sets the priority for the

+ Change Back Declaration and Acknowledge (CBD / CBA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioEc">

+            <description>The prioEc attribute sets the priority for the

+Emergency Change over Order and Acknowledge (ECO / ECA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).	

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioRst">

+            <description>The prioRst attribute sets the priority for the

+signalling Route Set Test (RST) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioTra">

+            <description>The prioTra attribute sets the priority for the

+Traffic Restart Allowed signal (TRA) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioUpu">

+            <description>The prioUpu attribute sets the priority for the

+ User Part Unavailable (UPU) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioLink">

+            <description>The prioLink attribute sets the priority for link related messages when issued by the MTP3b itself. The messages are :

+

+Link INhibit (LIN), Link UNinhibit (LUN),

+Link Inhibit Denied (LID),

+Link Inhibit Acknowledge (LIA),

+Link Uninhibit Acknowledge (LUA),

+Link Forced Uninhibit (LFU), 

+Link Local inhibit Test (LLT) and

+Link Remote inhibit Test (LRT)

+

+When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+    </struct>

+

+    <struct name="Mtp3bSpTtcPriorityData">

+        <description>Priority attributes for MTP3b SP of the TTC standard.</description>

+        <structMember name="prioCo">

+            <description>The prioCo attribute sets the priority for the ChangeOver Order and Acknowledge (COO/COA) or eXtended Change over Order and Acknowledge (XCO/XCA) messages  when  issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet)

+.</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioCb">

+            <description>The prioCb attribute sets the priority for the

+ Change Back Declaration and Acknowledge (CBD / CBA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioEc">

+            <description>The prioEc attribute sets the priority for the

+Emergency Change over Order and Acknowledge (ECO / ECA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).	

+

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioRst">

+            <description>The prioRst attribute sets the priority for the

+signalling Route Set Test (RST) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioTfa">

+            <description>The prioTfa attribute sets the priority for the Transfer Allowed, TFA, messages.	

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioRt">

+            <description>The priority indicator used for indicating message priority for signalling route test messages (SRT/SRA).

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioTfc">

+            <description>The priority indicator used for indicating the message prioirity for TFC.

+</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+    </struct>

+

+    <enum name="Mtp3bSpPriorityLevel">

+        <description>Indicates the priority level for MTP 3.</description>

+        <enumMember name="LOWEST">

+            <description>Lowest priority setting.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="LOW">

+            <description>Low priority setting.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="HIGH">

+            <description>High priority setting.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="HIGHEST">

+            <description>Highest priority setting.</description>

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <struct name="Mtp3bSpChinaTimerData">

+        <description>China timers for MTP3bSpChina. Timervalues in 1/10 s (deciseconds).</description>

+        <structMember name="timerSlta">

+            <description>Supervision timer for SLTA message (time within SLTA should arrive).

+

+Timer T1 in ITU Q.707 standard.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>100</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerSltm">

+            <description>Timer for sending SLTM periodically.

+

+Timer T2 in ITU Q.707 standard.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>400</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT1">

+            <description>Delay to avoid message mis-sequencing on changeover.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT10">

+            <description>Timer for waiting to repeat sending of RST periodically.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>400</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT12">

+            <description>Waiting for uninhibit acknowledgement.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT13">

+            <description>Timer for waiting for force uninhibit.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT14">

+            <description>Timer for waiting for inhibition acknowledgement.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>30</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT17">

+            <description>Delay to avoid oscillation of initial alignment failure and link restart.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>9</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT18">

+            <description>Supervision timer for the first phase of a restarting STP. This is an STP specific parameter, which is ignored when configured as an endpoint.

+

+Unit: deciseconds (1/10 second).

+</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>200</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT19">

+            <description>Controlling the response of the receipt of a traffic restart message from an adjacent node.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>40</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT2">

+            <description>Timer for waiting for a COO or a COA.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT20">

+            <description>Overall MTP restart timer at the restarting MTP.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>40</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT21">

+            <description>Overall MTP restart timer at an adjacent signalling point to a restarting MTP.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>300</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT22">

+            <description>Local inhibit test timer.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>2500</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT23">

+            <description>Remote inhibit test timer.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>2500</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT3">

+            <description>Delay to avoid message mis-sequencing  on a time controlled diversion change back.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT4">

+            <description>Timer for waiting for CBA, first attempt.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT5">

+            <description>Timer for waiting for CBA, second attempt

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT6">

+            <description>Timer for delay to avoid message mis-sequencing on controlled rerouting.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>9</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT8">

+            <description>Timer for delay to prohibit sending of TFP messages via the response method. This is a STP specific parameter, which is ignored when configured as an endpoint.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTBsnt">

+            <description>Waiting for BSNT value from MTP-2 or SAAL (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTc">

+            <description>Controlling the period a route set is considered congested when a Transfer Controlled message has been received. 

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>50</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTRetrieval">

+            <description>Timer for waiting for completion of buffer retrieval from MTP-2 or SAAL (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>10</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTStart">

+            <description>Timer for retransmission of DL_START_req if no answer received. Started when timerT17 expires. (not standard timer).

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>1200</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaTack">

+            <description>Timer used for message acknowledgement.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaPeriodicAudit">

+            <description>Timer used for audit procedure.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>300</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT1">

+            <description>Delay to avoid mis-sequencing of messages when an association fails.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT3">

+            <description>Delay to avoid mis-sequencing of messages when an association becomes active.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT6">

+            <description>Delay to avoid mis-sequencing on controlled rerouting.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>5</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT8">

+            <description>Delay to prohibit sending of DUNA messages via the response method.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT40">

+            <description>Delay to avoid message mis-sequencing on controlled/forced rerouting.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT41">

+            <description>Timer controlloing the traffic activation delay during restart phase.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaT42">

+            <description>The forever interval period for trying association after an unsiccessfull trial.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>8</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaTc">

+            <description>Timer controlling the period a route set is considered congested when a SCON message has been received.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>50</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT15">

+            <description>Timer waiting to start signaling route set congestiontest. Used only if the Route Set 

+Congestion Test Selectoption is set to "Use Route Set Congestion test".

+

+Guiding value 20 - 30.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerT16">

+            <description>Timer waiting for route set congestion status update. Used only if the Route Set 

+Congestion Test Selectoption is set to "Use Route Set Congestion test"

+

+Guiding value 14 - 22.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>14</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerTDlack">

+            <description>Timer pending an acknowledge from the network layer for a DL_ACK_REQ.

+

+Unit: deciseconds (1/10 second).</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="timerM3uaTassocack">

+            <description>Timer used for SCTP_ASSOCIATE_REQ message acknowledgement. This is the maximum time to wait for the SCTP_COMMUP_IND mesage before considering it to be an error.

+It should be longer than the time a message spends to reach the most distant destination, be processed and returned.</description>

+            <long>

+                <range>

+                    <min>1</min> <max>65535</max>

+                </range>

+                <defaultValue>20</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <enum name="Mtp3bNetworkIndTtc">

+        <description>Indicates which type of geographical network, e.g. national, international, etc..

+

+Note: Only for TTC.</description>

+        <enumMember name="NATIONAL_NETWORK">

+            <description>National network.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="SPARE">

+            <description>Spare (for international use only).</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="INTERNATIONAL_NETWORK">

+            <description>International Network.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="SPARE_1">

+            <description>Spare.</description>

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <enum name="Mtp3bUsageState">

+        <description>There are three possible states for the usageState attribute:

+

+- idle, the Mtp3bSl carries no traffic.

+- active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.

+- busy, the Mtp3bSl is working but is congested (traffic is routed on other links).</description>

+        <enumMember name="IDLE">

+            <description>idle, the Mtp3bSl carries no traffic.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="ACTIVE">

+            <description>active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="BUSY">

+            <description>busy, the Mtp3bSl is working but is congested (traffic is routed on other links).</description>

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="Mtp3bProceduralState">

+        <description>The procedural state of the link.

+

+0 - not initialized

+1 - initialized</description>

+        <enumMember name="NOT_INITIALIZED">

+            <description>0 - not initialized.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="INITIALIZED">

+            <description>1 - initialized.</description>

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="NodeBehaviourType">

+        <description>The nodeBehaviorType attribute represents the MTP3b node type.</description>

+        <enumMember name="SEP">

+            <description>Signaling End Point.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="SEP_STP">

+            <description>Signalling Transfer and End Point, i.e the signalling point is of both type Signalling End Point (SEP) and Signalling Transfer Point (STP).</description>

+            <value>4</value>

+        </enumMember>

+        <enumMember name="SGW_STP_SEP">

+            <description>Signaling GateWay, Signaling End Point and Signalling Transfer Point, i.e the signalling point is of both type Signalling Transfer Point (STP), Signaling End Point (SEP) and Signaling GateWay (SGW).</description>

+            <value>5</value>

+        </enumMember>

+    </enum>

+

+    <struct name="Mtp3bSpChinaPriorityData">

+        <description>Priority attributes for MTP3b SP of the China standard.</description>

+        <structMember name="prioSlt">

+            <description>The prioSlt attribute sets the priority for the

+ Signalling Link Test  Message and Acknowledge (SLTM / SLTA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioCo">

+            <description>The prioCo attribute sets the priority for the ChangeOver Order and Acknowledge (COO/COA) or eXtended Change over Order and Acknowledge (XCO/XCA) messages  when  issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet)

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioCb">

+            <description>The prioCb attribute sets the priority for the

+ Change Back Declaration and Acknowledge (CBD / CBA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioEc">

+            <description>The prioEc attribute sets the priority for the

+Emergency Change over Order and Acknowledge (ECO / ECA) messages when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).	

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioRst">

+            <description>The prioRst attribute sets the priority for the

+signalling Route Set Test (RST) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioTra">

+            <description>The prioTra attribute sets the priority for the

+Traffic Restart Allowed signal (TRA) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioUpu">

+            <description>The prioUpu attribute sets the priority for the

+ User Part Unavailable (UPU) message when issued by the MTP3b itself. When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+        <structMember name="prioLink">

+            <description>The prioLink attribute sets the priority for link related messages when issued by the MTP3b itself. The messages are :

+

+Link INhibit (LIN), Link UNinhibit (LUN),

+Link Inhibit Denied (LID),

+Link Inhibit Acknowledge (LIA),

+Link Uninhibit Acknowledge (LUA),

+Link Forced Uninhibit (LFU), 

+Link Local inhibit Test (LLT) and

+Link Remote inhibit Test (LRT)

+

+When a message is transferred from the MTP3b the message priority uses the two spare bits in the SIO (Service Information Octet).

+

+lowest:0

+low:1

+high:2

+highest:3</description>

+            <enumRef name="Mtp3bSpPriorityLevel">

+                <defaultValue>HIGHEST</defaultValue>

+            </enumRef>

+        </structMember>

+    </struct>

+

+    <enum name="Mtp3bRouteType">

+        <description>The type of Signalling Route.</description>

+        <enumMember name="TDM_ATM">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="IP">

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="HomingState">

+        <enumMember name="SINGLE_HOMED_1">

+            <description>Single-homed with ipAddress1.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="SINGLE_HOMED_2">

+            <description>Single-homed with ipAddress2.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="MULTI_HOMED">

+            <description>Multihomed association with ipAddress1 and 

+ipAddress2

+</description>

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <enum name="RouteState">

+        <description>The state of the signaling route.</description>

+        <enumMember name="NOT_BLOCKED">

+            <description>The signaling route is not blocked.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="BLOCKED">

+            <description>The signaling route is blocked.</description>

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="WorkingMode">

+        <enumMember name="hostMode">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="routerMode">

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="OspfMetricType">

+        <description>Open Shortest Path First metric type.</description>

+        <enumMember name="comparableCost">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="nonComparable">

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="RouteType">

+        <description>The types of the routes found in the IP routing table.</description>

+        <enumMember name="INET_RTPROTO_OTHER">

+            <description>The source of information is unknown.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="INET_RTPROTO_LOCAL">

+            <description>Route created from local configuration data (both static and interface routes).

+Each interface created gets an entry in the routing table of the RO.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="INET_RTPROTO_NETMGMT">

+            <description>Route added by SNMP.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="INET_RTPROTO_OSPF">

+            <description>Route added by OSPF.</description>

+            <value>13</value>

+        </enumMember>

+        <enumMember name="INET_RTPROTR_ICMP">

+            <description>Route added by ICMP redirect message.</description>

+            <value>4</value>

+        </enumMember>

+    </enum>

+

+    <exception name="RouteNotFoundException">

+        <description>Invalid IP route has been given as a parameter to an action.</description>

+        <exceptionParameter name="routeNotFound">

+            <description>Exception message.</description>

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <exception name="InvalidRouteException">

+        <description>Invalid IP route has been given as a parameter to an action.</description>

+        <exceptionParameter name="invalidRoute">

+            <dataType>

+                <string/>

+            </dataType>

+        </exceptionParameter>

+    </exception>

+

+    <enum name="MauDuplexMode">

+        <enumMember name="HALF_DUPLEX">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="FULL_DUPLEX">

+            <value>1</value>

+        </enumMember>

+    </enum>

+

+    <enum name="ControllerMode">

+        <description>The controller mode of a physical interface.</description>

+        <enumMember name="CONTROLLER_E1">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="CONTROLLER_T1">

+            <value>2</value>

+        </enumMember>

+        <enumMember name="CONTROLLER_J1">

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <struct name="OspfAreaRange">

+        <description>ipAddress - the subnet address of the range.

+subnetMask - IP subnet mask of the range to be added.

+advertise - indicates whether the area range should be advertised into OSPF.

+</description>

+        <structMember name="ipAddress">

+            <string/>

+        </structMember>

+        <structMember name="subnetMask">

+            <description>Note! The subnet has to be contigious. That is, has the LSB set to 0 (zero).

+

+Example:

+

+255.255.255.X

+

+Contiguous subnet mask:

+11111111.11111111.11111111.11111110 (X = 254)

+11111111.11111111.11111111.11111100 (X = 252)

+

+Not-contiguous subnet mask:

+11111111.11111111.11111111.11111010 (X = 250)

+</description>

+            <string/>

+        </structMember>

+        <structMember name="advertise">

+            <boolean/>

+        </structMember>

+    </struct>

+

+    <struct name="RoutingTableEntry">

+        <description>IP routing table entry.</description>

+        <structMember name="destinationIpAddr">

+            <description>The destination IP address.</description>

+            <string/>

+        </structMember>

+        <structMember name="destinationNetworkMask">

+            <description>The destination IP network mask.</description>

+            <string/>

+        </structMember>

+        <structMember name="nextHopIpAddr">

+            <description>The next hop IP address.</description>

+            <string/>

+        </structMember>

+        <structMember name="routeMetric">

+            <description>The route metric.</description>

+            <long/>

+        </structMember>

+        <structMember name="routeType">

+            <description>The route type.</description>

+            <enumRef name="RouteType">

+            </enumRef>

+        </structMember>

+        <structMember name="interfaceName">

+            <description>The interface name.</description>

+            <string/>

+        </structMember>

+        <structMember name="redistribute">

+            <description>Indicates if the route should be redistributed.</description>

+            <boolean/>

+        </structMember>

+        <structMember name="active">

+            <description>Indicates if the route is active.</description>

+            <boolean/>

+        </structMember>

+    </struct>

+

+    <enum name="AutoConfigurationMode">

+        <description>Denotes whether the autoConfiguration mode for the IpAccessHost is turned on or off.</description>

+        <enumMember name="ON">

+            <value>1</value>

+        </enumMember>

+        <enumMember name="OFF">

+            <value>2</value>

+        </enumMember>

+    </enum>

+

+    <enum name="Aal5TpSelectionModes">

+        <description>In case 'NO_PREFERENCE', 'LOCAL_MP_SELECT_VCC_AT_LINK_UP', LOCAL_MP_PEER_SELECTION_VCC' or 'LOCAL_MP_ACTIVE_RESELECTION' is selected the IpAtmLink MO will prefer Aal5TpVccTp on local MP (i.e. Aal5TpVccTp executing on the same MP as the IpAtmLink), but other Aal5TpVccTp will be accepted if needed.

+

+In case 'ONLY_LOCAL_MP' is selected, the ipAtmLink (Inet Link) will consider Aal5TpVccTp residing on other MPs as a malfunction and discard the usage of them. No InvArp sending will be performed on them and all incomming trafic on them will be discarded. If no local Aal5TpVccTp exists the operational state of the link will be changed to disabled.</description>

+        <enumMember name="NO_PREFERENCE">

+            <value>0</value>

+        </enumMember>

+        <enumMember name="LOCAL_MP_SELECT_VCC_AT_LINK_UP">

+            <description>Prefer termination on local MP, select Vcc when link goes up.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="LOCAL_MP_PEER_SELECTION_VCC">

+            <description>Prefer termination on local MP, follow peer selection of Vcc.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="LOCAL_MP_ACTIVE_RESELECTION">

+            <description>Prefer termination on local MP, active reselection to new Aal5TpVccTp as soon as a better choice exists.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="ONLY_LOCAL_MP">

+            <description>Restricted to local MP, follow peer selection if termination is on local MP.

+</description>

+            <value>4</value>

+        </enumMember>

+    </enum>

+

+    <enum name="AlarmReport">

+        <description>Alarm report for the Virtual path connection termination point.

+RDI - Remote defect indication

+LOC - Loss of continuity 

+AIS - Alarm indication signal</description>

+        <enumMember name="ALARM_LOC">

+            <description>For alarms of type Loss of continuity.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="ALARM_LOC_RDI">

+            <description>For alarms of type Loss of continuity and Remote defect indication.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="ALARM_AIS_LOC">

+            <description>For alarms of type Alarm indication signal and Loss of continuity.</description>

+            <value>6</value>

+        </enumMember>

+        <enumMember name="ALARM_AIS_RDI_LOC">

+            <description>For alarms of type Alarm indication signal, Remote defect indication and Loss of continuity.</description>

+            <value>7</value>

+        </enumMember>

+    </enum>

+

+    <enum name="AtmCounterMode">

+        <enumMember name="PM_MODE_OFF">

+            <description>Performance monitoring is turned off. PM counters give irrelevant values.</description>

+            <value>0</value>

+        </enumMember>

+        <enumMember name="PM_MODE_ONLYCOUNT">

+            <description>Performance monitoring counters are active

+</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="PM_MODE_FPM">

+            <description>FPM, Forward Performance Monitoring activated.

+

+Performance monitoring counters are active

+</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="PM_MODE_BR">

+            <description>Backward reporting, BR, cells are generated.

+

+Performance monitoring counters are active

+</description>

+            <value>4</value>

+        </enumMember>

+        <enumMember name="PM_MODE_FPM_BR">

+            <description>FPM, Forward Performance Monitoring activated.

+

+Backward reporting, BR, cells are generated.

+

+Performance monitoring counters are active

+</description>

+            <value>6</value>

+        </enumMember>

+    </enum>

+

+    <enum name="AtmNomPmBlkSize">

+        <description>Nominal performance monitoring, PM, blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.</description>

+        <enumMember name="NOM_PM_BLKSIZE_2_7">

+            <description>Nominal performance monitoring, PM, block size, 2e7 (2 to the power of 7).</description>

+            <value>128</value>

+        </enumMember>

+        <enumMember name="NOM_PM_BLKSIZE_2_8">

+            <description>Nominal performance monitoring, PM, block size, 2e8 (2 to the power of 8).</description>

+            <value>256</value>

+        </enumMember>

+        <enumMember name="NOM_PM_BLKSIZE_2_9">

+            <description>Nominal performance monitoring, PM, block size, 2e9 (2 to the power of 9).</description>

+            <value>512</value>

+        </enumMember>

+        <enumMember name="NOM_PM_BLKSIZE_2_10">

+            <description>Nominal performance monitoring, PM, block size, 2e10 (2 to the power of 10).</description>

+            <value>1024</value>

+        </enumMember>

+        <enumMember name="NOM_PM_BLKSIZE_2_11">

+            <description>Nominal performance monitoring, PM, block size, 2e11 (2 to the power of 11).</description>

+            <value>2048</value>

+        </enumMember>

+        <enumMember name="NOM_PM_BLKSIZE_2_12">

+            <description>Nominal performance monitoring, PM, block size, 2e12 (2 to the power of 12).</description>

+            <value>4096</value>

+        </enumMember>

+        <enumMember name="NOM_PM_BLKSIZE_2_13">

+            <description>Nominal performance monitoring, PM, block size, 2e13 (2 to the power of 13).</description>

+            <value>8192</value>

+        </enumMember>

+        <enumMember name="NOM_PM_BLKSIZE_2_14">

+            <description>Nominal performance monitoring, PM, block size, 2e14 (2 to the power of 14).</description>

+            <value>16384</value>

+        </enumMember>

+        <enumMember name="NOM_PM_BLKSIZE_2_15">

+            <description>Nominal performance monitoring, PM, block size, 2e15 (2 to the power of 15).</description>

+            <value>32768</value>

+        </enumMember>

+    </enum>

+

+    <enum name="ServiceCategory">

+        <enumMember name="SERVICE_CATEGORY_CBR">

+            <description>Service category Constant Bit rate, CBR.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="SERVICE_CATEGORY_UBR">

+            <description>Service category Unspecified Bit rate, UBR.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="SERVICE_CATEGORY_UBR_PLUS">

+            <description>Service category Unspecified Bit rate+, UBR+. UBR+ guarantees a certain bandwidth. If higher bandwidth is used it will be handled as UBR.</description>

+            <value>3</value>

+        </enumMember>

+    </enum>

+

+    <enum name="AtmQos">

+        <description>ATM's Quality of Service classes.

+

+The ATM layer system provides four QoS classes, numbered 1 to 4, where CLASS_ONE gives the best QoS in regards to Cell Loss Ratio &lt;CLR&gt; and Cell Delay Variation &lt;CDV&gt; and CLASS_FOUR doesn't give any QoS guarantees. CLASS_ONE and CLASS_TWO are the only classes applicable for real time traffic.</description>

+        <enumMember name="CLASS_ONE">

+            <description>CDV &lt; 1 ms (milliseconds), CLR &lt; 10e-8. Typically used by timing unit.</description>

+            <value>1</value>

+        </enumMember>

+        <enumMember name="CLASS_TWO">

+            <description>CDV &lt; 1 ms, CLR &lt; 10e-7. Typically used for speech.</description>

+            <value>2</value>

+        </enumMember>

+        <enumMember name="CLASS_THREE">

+            <description>CLR &lt; 10e-5. Typically used for signalling.</description>

+            <value>3</value>

+        </enumMember>

+        <enumMember name="CLASS_FOUR">

+            <description>Typically used for IP.</description>

+            <value>4</value>

+        </enumMember>

+    </enum>

+

+    <struct name="ValueOfUnex">

+        <description>The attributes in this struct represents the ATM header, (vpi, vci, pti), of the last recieved unexpected cell.</description>

+        <structMember name="vpi">

+            <description>The ATM header vpi.</description>

+            <long>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="vci">

+            <description>The ATM header vci.</description>

+            <long>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+        <structMember name="pti">

+            <description>The ATM header pti.</description>

+            <long>

+                <defaultValue>0</defaultValue>

+            </long>

+        </structMember>

+    </struct>

+

+    <class name="TransportNetwork">

+        <description>This MO structures the transport network of the managed element. It is created automatically and cannot be deleted.

+

+The local distinguished name of this MO is ManagedElement=1, TransportNetwork=1.</description>

+        <systemCreated/>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="TransportNetworkId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="getAal5ForNniSaal">

+            <description>This action returns a sequnce of Aal5TpVccTp MOs that is unreserved and executes on an MP.

+

+Also the following condition has to be fullfilled:

+

+MinAal5Sdu = min (fromUserMaxSduSize, toUserMaxSduSize)

+

+roundedDownSdu = (MinAal5Sdu - (MinAal5Sdu modulo 4) +4)

+

+roundedDownSdu &gt; low boundry for maxSduSize (in NniSaalTp)

+

+Note that the values for fromUserMaxSduSize and toUserMaxSduSize is the actual values set in the Aal5TpVccTp MO.

+Also note that the attributes minAal5Sdu and roundedDownSdu is used internaly in this action.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <sequence>

+                        <moRef name="ManagedObject"/>

+                    </sequence>

+            </returnType>

+        </action>

+        <action name="getAal5ForUniSaal">

+            <description>This action returns a sequnce of Aal5TpVccTp MOs that is unreserved and executes on an MP.

+

+Also the following condition has to be fullfilled:

+

+MinAal5Sdu = min (fromUserMaxSduSize, toUserMaxSduSize)

+

+roundedDownSdu = (MinAal5Sdu - (MinAal5Sdu modulo 4) +4)

+

+roundedDownSdu &gt; low boundry for maxSduSize (in UniSaalTp)

+

+Note that the values for fromUserMaxSduSize and toUserMaxSduSize is the actual values set in the Aal5TpVccTp MO.

+Also note that the attributes minAal5Sdu and roundedDownSdu is used internaly in this action.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <sequence>

+                        <moRef name="ManagedObject"/>

+                    </sequence>

+            </returnType>

+        </action>

+        <action name="getAal2PathForAal2Pdu">

+            <description>This action returns a sequence of all unreserved Aal2PathVccTp's that have an Aal2PathId that has not been

+used by another Aal2PathDistributionUnit under the same parent (Aal2Ap).

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <sequence>

+                        <moRef name="ManagedObject"/>

+                    </sequence>

+            </returnType>

+            <parameter name="aal2Ap">

+                <in/>

+                <dataType>

+                    <moRef name="ManagedObject"/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="getRpuForAal2Pdu">

+            <description>This action returns a sequence of all ReliableProgramUniters that has not reached the maximun number of possible reservations 

+and has not already been used by other Aal2PathDistributionUnit MO's (if exists) under the same parent (Aal2Ap MO).

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <sequence>

+                        <moRef name="ManagedObject"/>

+                    </sequence>

+            </returnType>

+            <parameter name="aal2Ap">

+                <in/>

+                <dataType>

+                    <moRef name="ManagedObject"/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="getUnreservedPluginUnits">

+            <description>This action returns a sequence of PlugInUnits that is unreserved.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <sequence>

+                        <moRef name="ManagedObject"/>

+                    </sequence>

+            </returnType>

+        </action>

+        <action name="getDs0BundlesForMtp2">

+            <description>This action returns a sequence of Ds0Bundle MOs that is unreserved and only has one (1) timeSlot set in the listOfTimeSlots.

+The attribute tdmMode in these Ds0Bundles must be enabled.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <sequence>

+                        <moRef name="ManagedObject"/>

+                    </sequence>

+            </returnType>

+        </action>

+    </class>

+

+    <class name="Slot">

+        <description>The Slot MO is used to represent a slot in a subrack. A slot can hold a plug-in-unit, a board, (represented by PlugInUnit MOs).

+

+The number of slots in a subrack is specified when defining the subrack.

+

+The system will automatically create the right number of Slot MOs in the subrack at creation of the Subrack MO. 

+This MO cannot be deleted by an operator.

+

+The local distinguished names of this MO's are select with identity Slot=1 in the leftmost slot with incremental numbering towards the right in the subrack.. </description>

+        <systemCreated/>

+        <attribute name="userLabel">

+            <description>A user friendly name associated to the managed object

+

+</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="slotState">

+            <description>Gives the state of the slot.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="SlotState">

+                    <defaultValue>free</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="slotNumber">

+            <description>The number of the position from the left side, starting from 1.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long/>

+            </dataType>

+        </attribute>

+        <attribute name="SlotId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="productData">

+            <description>This product data describes the plug-in-unit that is presently inserted. The information is only available when slotState = used.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <structRef name="OperProductData"/>

+            </dataType>

+        </attribute>

+        <attribute name="upgradeGroupId">

+            <description>The upgradeGroupId is able to group a number of PIUs, all in the group can be upgraded at the same time.

+

+If upgradeGroupTypeName is "", this attribute is not used. 

+</description>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="upgradeGroupTypeName">

+            <description>The upgradeGroupTypeName, together with the upgradeGroupId,  define an upgrade group.

+</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="ManagedObject">

+        <description>The Managed Object MO is not part of the model. It is only used to have valid reference types for certain attributes. </description>

+        <attribute name="ManagedObjectId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="getType">

+            <returnType>

+                    <string/>

+            </returnType>

+        </action>

+        <action name="getId">

+            <returnType>

+                    <string/>

+            </returnType>

+        </action>

+        <action name="getParent">

+            <returnType>

+                    <moRef name="ManagedObject"/>

+            </returnType>

+        </action>

+        <action name="getChildren">

+            <returnType>

+                    <long/>

+            </returnType>

+        </action>

+        <action name="getFullDistinguishedName">

+            <returnType>

+                    <string/>

+            </returnType>

+        </action>

+        <action name="delete">

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="MoHasChildrenException"/>

+            <raisesException name="MoReservedByOtherUserException"/>

+            <raisesException name="FroRequestFailedException"/>

+            <raisesException name="FroNotAccessibleException"/>

+            <raisesException name="UndeletableMoException"/>

+            <raisesException name="TransactionRequiredException"/>

+        </action>

+        <action name="getLocalDistinguishedName">

+            <returnType>

+                    <string/>

+            </returnType>

+        </action>

+        <action name="create">

+            <returnType>

+                    <moRef name="ManagedObject"/>

+            </returnType>

+            <raisesException name="MoNameAlreadyTakenException"/>

+            <raisesException name="AttrMissingAtCreateException"/>

+            <raisesException name="AttrNotSettableAtCreateException"/>

+            <raisesException name="IllegalParentException"/>

+            <raisesException name="MoCardinalityViolationException"/>

+            <raisesException name="NoSuchAttributeException"/>

+            <raisesException name="MoCanNotBeCreatedException"/>

+            <raisesException name="NoSuchFieldException"/>

+            <raisesException name="NotHandledAttributeTypeException"/>

+            <raisesException name="WrongAttributeTypeException"/>

+            <raisesException name="ValueOutOfRangeException"/>

+            <raisesException name="FroRequestFailedException"/>

+            <raisesException name="FroNotAccessibleException"/>

+            <raisesException name="TransactionRequiredException"/>

+            <raisesException name="IpException"/>

+            <raisesException name="IpFormatException"/>

+            <raisesException name="EquipException"/>

+            <raisesException name="AttrValueNotUniqueException"/>

+            <raisesException name="MaxNumberExceededException"/>

+            <raisesException name="MoReservedNotDeletableException"/>

+        </action>

+    </class>

+

+    <class name="VclTp">

+        <description>This MO is used to represent the termination of an external VC link in the node.

+

+Note that a maximum of 10 000 MO of this kind may be configured in a node.

+

+Note! The performance monitoring counters in the VclTp MO is set to 0 (zero) at start or restart of the node.

+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.</description>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="externalVci">

+            <description>Virtual Channel Idenitifier, VCI, value for this Virtual Channel Link, VCL.

+

+Range: 32 - 65535.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>32</min> <max>65535</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="atmTrafficDescriptorId">

+            <description>Reference to the AtmTrafficDescriptor profile.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="AtmTrafficDescriptor"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>User that have reserved this VclTp.

+

+</description>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the VclTp.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmReceivedAtmCells">

+            <description>Performance monitoring counter for number of received ATM cells.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmTransmittedAtmCells">

+            <description>Performance monitoring counter for number of transmitted ATM cells.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status of the VclTp.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="VclTpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="eteLoopBack">

+            <description>Used by VclTp to inforce a Virtual Channel end-to-end loopback.

+false=Failed, true=Succeded.

+

+Note! This action requires a transaction.

+

+</description>

+            <returnType>

+                    <boolean/>

+            </returnType>

+        </action>

+    </class>

+

+    <class name="ManagedElement">

+        <description>The Managed Element MO is the top MO in the MOM. A management application will communicate with the Managed Element MO for the purpose of monitoring it and controlling it.

+

+The ManagedElement MO is automatically created and cannot be deleted.

+

+The local distinguished name of this MO is ManagedElement=1.</description>

+        <systemCreated/>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="site">

+            <description>This attribute gives information about geographical location (e.g. place name).</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>255</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="logicalName">

+            <description>This attribute gives a logical name of a site.

+

+</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>255</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="productType">

+            <description>This attribute describes the product type and is always set to the value "Node".</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <defaultValue>Node</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="productName">

+            <description>This attribute describes the implemented functionality. </description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>12</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="productNumber">

+            <description>This attribute uniquely identifies the product (e.g. ROF123).</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>24</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="productRevision">

+            <description>This attribute identifies the version of the product (e.g. R2A).</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>7</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ManagedElementId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="restart">

+            <description>Restart the node with an unconditional reload.

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="restartRank">

+                <in/>

+                <dataType>

+                    <enumRef name="RestartRank">

+                    </enumRef>

+                </dataType>

+            </parameter>

+        </action>

+    </class>

+

+    <class name="Equipment">

+        <description>This Managed Object is used as a structural element for the network element, i.e. it only acts as a container for other MO:s. This MO structures the equipment of the network element.

+

+The local distinguished name of this MO is ManagedElement=1, Equipment=1.</description>

+        <systemCreated/>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="EquipmentId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Subrack">

+        <description>This MO is used to represent a subrack.

+</description>

+        <attribute name="userLabel">

+            <description>A free tag that a user can associated to the this managed object. The value has no relevance for the managed system.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="switchModule">

+            <description>A reference to a SwitchModule ManagedObject, from which the SwitchModule number can be retrived.  That number describes how the subrack is connected to the node, i.e. how the subrack�s cables are connected to the hub subrack. (The hub subrack has switch module number �0�).</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="SwitchModule"/>

+            </dataType>

+        </attribute>

+        <attribute name="subrackType">

+            <description>There can only be one hub subrack in the node. The hub subrack is used to control switching and synchronization for the complete node.

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="SubrackType">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="productType">

+            <description>This attribute describes the product type and is always set to the value "HW".</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>"HW"</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeProductData">

+            <description>This product data describes the subrack that is configured to be installed.

+

+</description>

+            <mandatory/>

+            <dataType>

+                <structRef name="AdminProductData"/>

+            </dataType>

+        </attribute>

+        <attribute name="subrackPosition">

+            <description>The position of this subrack within a cabinet.

+The purpose of this attribute is to help an operator locate the source of an error by letting the system put this 

+information in alarms. The system does not use this information in any other way i.e. it does not affect the

+operation of the system.

+The subrack position is an integer (1-n) stating the cabinet Id, starting from the left and a letter (A-Z) stating

+the Subrack vertical position starting from the ground, e.g. 5C.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="cabinetPosition">

+            <description>The position of the cabinet (within a group of other cabinets) in which this subrack is placed.

+The purpose of this attribute is to help an operator locate the source of an error by letting the system put this information in alarms. The system does not use this information in any other way i.e. it does not affect the operation of the system.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="SubrackId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="numberOfSlots">

+            <description>Defines the number of slot in the subrack. The default value is 28.

+

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>28</max>

+                    </range>

+                    <defaultValue>28</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="operationalProductData">

+            <description>The operational product data describes the subrack that is actually installed.

+

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <structRef name="OperProductData"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>A reference to the SwAllocation MO that has reserved this Subrack for Fan MO upgrades..

+The attribute is set/cleared by internal actions.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <action name="removeSlots">

+            <description>Removes the given number of Slot MOs from the model. The Slots with the highest slotNumber are removed. After the action no Slot will have apn = 0.

+The attribute numberOfSlots will be udated. 

+

+If there is a child MO the action will fail and the MOHasChildrenException is thrown.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="numberOfSlotsToRemove">

+                <description>The number of slots to remove.</description>

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+        </action>

+    </class>

+

+    <class name="LoadModule">

+        <description>This MO is used to represent software installed in the file system.

+

+LoadModule MO can represent files with executable code, files with text information

+(COI) or directories in Cello file system.

+

+MOs of this type are created automatically during system upgrade.

+MOs of this type are possible to create manually but a system upgrade

+is recommended to create them.

+

+Note! In order for a program to be reliable the following conditions must be fulfilled:

+

+1. The attribute 'loaderType' must be set to 'OseLoader'.

+2. The attribute 'oseProgramLoadClass' must be set to a value &gt; 100.

+3. The program must execute on a MP (Main Processor).

+

+</description>

+        <attribute name="userLabel">

+            <description>Free tag for marking this managed object.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="productData">

+            <description>Product information data.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="AdminProductData"/>

+            </dataType>

+        </attribute>

+        <attribute name="loadModuleFilePath">

+            <description>The path to this load module in the file system, including the file name.

+

+Example: /c/load_modules/CXC112874R1A01

+where /c/load_modules/ is the directory and CXC112874R1A01 is the file name.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="loaderType">

+            <description>The type of the program loader.

+

+Note! This corresponds to LoaderName in the Upgrade Control File (UCF).</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="LoadModuleLoaderType">

+                    <defaultValue>OseLoader</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="otherLoaderName">

+            <description>This attribute must have a value if the loaderType attribute equals other.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="preLoad">

+            <description>A recommendation to the system to (if possible) cache this load module close to where its program(s) execute(s), e.g. in a flash file system. The purpose of this attribute is to enable faster loading at restart of programs referring to this load module.

+

+

+

+

+</description>

+            <dataType>

+                <enumRef name="LoadModulePreLoadType">

+                    <defaultValue>no</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="fileFormat">

+            <description>The file format (RPDOUT, html, java, fpga, ...).</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="oseProgramLoadClass">

+            <description>Specifies in which load phase programs of this load module should be started.

+

+Note: If the LoadModule is a java archive file (.jar) it will be loaded in the load phase of the java machine rather than according to its own oseProgramLoadClass.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="LoadClass">

+                    <defaultValue>application</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reliableProgramLabel">

+            <description>Reliable program identity.

+Compare this to the reliableProgramLabel in ReliableProgramUniter MO.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="isDirectory">

+            <description>Indicates if the load module is a file or directory.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="oseProgramPoolSize">

+            <description>This attribute sets the size of the program pool size. In the referenced loadModule there is 

+possible to set this value at create. 

+This value will then be fetched by program and used at create if no value is submitted at 

+create of the program Mo. 

+The referenced load module has a default size defined at compile time which is used if no 

+value is submitted at create of loadModule or the program Mo. 

+

+Note! The value of this attribute is overwritten during Software Upgrade.

+

+Unit is byte.

+

+</description>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="oseProgramHeapSize">

+            <description>This attribute sets the size of the program heap size. In the referenced loadModule there is possible to set this value at create. This value will then be fetched by program and used at create if no value is submitted at create of the program Mo. 

+The referenced load module has a default size defined at compile time which is used if no value is submitted at create of loadModule or the program Mo. 

+

+Note! The value of this attribute is overwritten during Software Upgrade.

+

+Unit is byte.

+

+</description>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="programMustBeSingleton">

+            <description>Indicator whether the (OSE) program must be a singleton or not.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="moppletEntries">

+            <description>Contains all class  that are to be initialised and started when the JVM restarts. 

+Technical note: The class name must specify the full package and class name in standard Java syntax, e.g. "se.ericsson.cello.X" ; must implement the se.ericsson.cello.moframework.Mopplet interface and be found in this LoadModule.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <sequence>

+                    <string>

+                        <defaultValue/>

+                    </string>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="LoadModuleId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedByUpgradePackage">

+            <description>Indicates whether this MO has been reserved by the UpgradePackage MO or not.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Synchronization">

+        <description>This MO is used to administer synchronization references for the network synchronization function and to view the system clock state of Timing Unit boards.

+

+Synchronization can have 0 to 8 relations to other MOs. The only valid MOs where relations can exist are E1Physpathterm, J1Physpathterm, T1Physpathterm, Os155SpiTtp, TU Synchronization Reference, and ManagedObject (for the  non-Cello RXI820 MO) MOs. Note that maximum number of relations to these MOs is 8 all together. 

+

+The synchronization MO is automatically created and cannot be deleted.

+

+Note: An external ManagedObject that wishes to be connected to the Synchronization MO must implement the following interface se.ericsson.cello.equipment.SyncReservable!

+

+The local distinguished name of this MO is ManagedElement=1,TransportNetwork=1,Synchronization=1

+

+.</description>

+        <systemCreated/>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="degradationIsFault">

+            <description>Controls whether synchronization reference degradation (e.g. signal level degradation) is interpreted as a synchronization reference fault or not. Attribute value is only applicable for traffic carrying synchronization references</description>

+            <dataType>

+                <enumRef name="FaultCriteria">

+                    <defaultValue>degrNotFault</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="systemClockA">

+            <description>State of system clock signal on Timing Unit A.

+Note that system clock generated by TU A (TU in slot 4) has higher priority than TU B (TU in slot 5) system clock, i.e. each device board uses system clocks according to this priority order.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="ClockState">

+                    <defaultValue>unknownMode</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="systemClockB">

+            <description>State of system clock signal on Timing Unit B. Note that system clock generated by TU A (TU in slot 4) has higher priority than TU B (TU in slot 5) system clock, i.e. each device board uses system clocks according to this priority order.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="ClockState">

+                    <defaultValue>unknownMode</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="syncReference">

+            <description>Set of synchronization reference physical resources. An MO reference to an TU synchronization reference MO implementation.

+A synchronization reference in added to the system by using action AddSyncRefResource.

+Note: if this attributes has value "Non-existing MO reference" then all the respective attributes of type sequence of 8 are not applicable.

+

+Note: The length of this sequence is always 8.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                    <length>8</length>

+                    <nonUnique/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="syncRefPriority">

+            <description>Synchronization reference priority.

+1 represents the highest and 8 the lowest priority. Every synchronization reference must have unique priority value. Value 0 means not applicable, that no synchronization with this priority is defined.

+This attribute is mandatory when adding a synchronization reference to the system (by using action addSyncRefResource).

+A priority value can be changed with the changeSyncRefPriority action provided that the priority is not already assigned to some other SyncRefResource.

+

+Note: The length of this sequence is always 8.</description>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <long>

+                        <range>

+                            <min>0</min> <max>8</max>

+                        </range>

+                        <defaultValue>0</defaultValue>

+                    </long>

+                    <length>8</length>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="syncRefActivity">

+            <description>Set of synchronization reference activity attributes.

+

+Note: The length of this sequence is always 8.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <enumRef name="RefActivity">

+                        <defaultValue>inactive</defaultValue>

+                    </enumRef>

+                    <length>8</length>

+                    <nonUnique/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="syncRefStatus">

+            <description>Set of synchronization reference status attributes.

+

+Note: The length of this sequence is always 8.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <enumRef name="RefState">

+                        <defaultValue>failed</defaultValue>

+                    </enumRef>

+                    <length>8</length>

+                    <nonUnique/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="SynchronizationId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="systemClockRedundancy">

+            <description>Indicates if the node is redundant from Network Synchronization functions point of view.</description>

+            <dataType>

+                <enumRef name="SystemClockRedundancy">

+                    <defaultValue>SYSTEM_CLOCK_USERS_USE_PLANE_A</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <action name="addSyncRefResource">

+            <description>This action adds one synchronization reference to the system. As a result of successful action, one set of attributes (attributes of type sequence of 8) is added to Synchronization MO.

+Parameters:

+syncReference: Managed object implementation, to which a mo-reference is to be added. See description of attribute SyncReference.

+syncPriority: Priority of synchronization reference. Each synchronization reference must have unique priority value, this must be checked by synchronization MO.

+

+Description of exceptions:

+- AlreadyRegistered: this reference is already registered

+- MaxNoOfRefRegistered: maximum number (8) of synchronization references already present

+- PriorityAlreadyInUse: syncPriority is identical with an existing synchronization reference priority

+- PriorityOutOfRange: invalid syncPriority value

+- InvalidMoReference: invalid syncReference for registration as a synchronization reference (invalid MO type)

+- NotPermitted: syncReference does not allow SyncReserve to be performed

+

+Note: An external ManagedObject that wishes to be connected to the Synchronization MO must implement the following interface se.ericsson.cello.equipment.SyncReservable!

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="syncReference">

+                <in/>

+                <dataType>

+                    <moRef name="ManagedObject"/>

+                </dataType>

+            </parameter>

+            <parameter name="syncPriority">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="AlreadyRegisteredException"/>

+            <raisesException name="MaxNoOfRefRegisteredException"/>

+            <raisesException name="PriorityAlreadyInUseException"/>

+            <raisesException name="PriorityOutOfRangeException"/>

+            <raisesException name="InvalidMoReferenceException"/>

+            <raisesException name="NotPermittedException"/>

+        </action>

+        <action name="removeSyncRefResource">

+            <description>This action removes one synchronization reference that has previously been added.

+(In future releases, this action should include a check whether the synchronization reference to be removed is the only existing synchronization reference. In that case, the user is asked for a confirmation to remove the last synchronization reference.)

+Parameters:

+syncReference: Managed object implementation, to which a mo-reference currently exists, but is now to be removed. See description of attribute SyncReference.

+

+Description of exceptions:

+- NotRegistered: synchronization reference is not registered

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="syncReference">

+                <in/>

+                <dataType>

+                    <moRef name="ManagedObject"/>

+                </dataType>

+            </parameter>

+            <raisesException name="NotRegisteredException"/>

+        </action>

+        <action name="changeSyncRefPriority">

+            <description>This action changes the synchronization priority of one previously registered synchronization reference resource.

+Parameters:

+syncReference: Managed object implementation, for which the synchronization priority is to be changed. See description of attribute syncReference.

+syncPriority: The new priority of synchronization reference. Each synchronization reference must have unique priority value, this must be checked by synchronization MO.

+

+Description of exceptions:

+- PriorityAlreadyInUse: syncPriority is identical with an existing synchronization reference priority

+- PriorityOutOfRange: invalid syncPriority value

+- NotRegistered: synchronization reference is not registered

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="syncReference">

+                <in/>

+                <dataType>

+                    <moRef name="ManagedObject"/>

+                </dataType>

+            </parameter>

+            <parameter name="syncPriority">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="PriorityAlreadyInUseException"/>

+            <raisesException name="PriorityOutOfRangeException"/>

+            <raisesException name="NotRegisteredException"/>

+        </action>

+        <action name="resetLossOfTracking">

+            <description>This action resets the detected Loss of Tracking error condition of one synchronization reference. After reset the synchronization reference is usable again.

+Parameters:

+syncReference: Specifies the synchronization reference for which the Loss of Tracking status is to be reset.

+

+Description of exceptions:

+- NotRegistered: synchronization reference is not registered

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="syncReference">

+                <in/>

+                <dataType>

+                    <moRef name="ManagedObject"/>

+                </dataType>

+            </parameter>

+            <raisesException name="NotRegisteredException"/>

+        </action>

+    </class>

+

+    <class name="SccpApLocal">

+        <description>This Managed Object represents an SCCP Local Access Point. An SCCP AP instance is a logical point in the SCCP network at which an SCCP user can access the services provided by the SCCP and the SCCP can deliver its services to the SCCP user. The SCCP Access Point is identified by a SubSystem Number (SSN).

+

+A local SccpAp represents an access point in the own node. 

+

+The performance monitoring counters found in SccpApLocal MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is a shutdown request from the CLI (Cluster Interface).</description>

+        <attribute name="SccpApLocalId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the SCCP AP. The operability of the SCCP AP is described by this attribute which has two possible values: 

+

+Disabled: The SCCP AP is totally inoperable and unable to provide the service to the user.

+

+Enabled: The SCCP AP is partly or fully  operable and available for use.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="ssN">

+            <description>The sub system number, SSN, of the SCCP Access Point. Note that this has to be a unique number.

+

+If the SccpAp is local then the SSN has to be unique among all other SccpAp MOs under the same SccpSp MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>2</min> <max>255</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxConn">

+            <description>The maxConn attribute specifies the max number of connections allowed for this SCCP Access Point. It is only valid for local SCCP Access Points.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>524288</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="useS1">

+            <description>Controls adding of OPC from routing label to Calling Party Address if absent.

+

+False = Do not add OPC to Calling Part Address.

+True = Add OPC to Calling Part Address.

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="SccpSp">

+        <description>The Signalling Connection Control Part, SCCP, Signalling Point, SP, MO is the placeholder for all SCCP related managed objects. 

+

+Startime for accounting is set by attributes accountDateFileOutput and accountTimeFileOutput.

+The attribute accountPeriodFileOutput sets period for the accounting record to be stored on the /c file system.

+The accounting is stopped by setting the accountPeriodFileOutput to zero (0).

+NOTE: The SRP function and SccpAccountingCriteria MO's should only be created for one signalling stack, i.e one PIU.

+

+Note! The guiding values that can be found for some attributes is to be regarded as a recommendation for these attributes.

+Depending on the size of the network, traffic load, use and so forth it might be neccesary to set values for these attributes outside the guiding values.</description>

+        <attribute name="SccpSpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the SCCP SP. The operability of the SCCP SP is described by this attribute which has two possible values:

+

+Disabled: The SCCP SP is totally inoperable and unable to provide the service to the user (e.g. if the processor  is not usable).

+

+Enabled: The SCCP SP is partly or fully  operable and available for use.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="mtp3bSpId">

+            <description>The identity of the L3 Signaling Point used by this MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="prioSST">

+            <description>This attribute sets the priority for the Subsystem Test message when issued by the SCCP itself. When a message is transferred from the SCCP the message priority uses the two spare bits in the SIO.

+Coding of the message priority:

+0 	Lowest priority

+1

+2

+3	 Highest priority</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>3</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="prioIT">

+            <description>This attribute sets the priority for the Inactivity Test message when  issued by the SCCP itself. When a message is transferred from the SCCP the message priority uses the two spare bits in the SIO.

+Coding of the message priority:

+0 	Lowest priority

+1

+2

+3	 Highest priority</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>3</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="prioRLSD">

+            <description>This attribute sets the priority for the connection release message when issued by the SCCP itself. When a message is transferred from the SCCP the message priority uses the two spare bits in the SIO.

+Coding of the message priority:

+0 	Lowest priority

+1

+2

+3	 Highest priority</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>3</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="prioGeneral">

+            <description>This attribute sets the priority for all the other  messages which are issued by the SCCP itself. When a message is transferred from the SCCP the message priority uses the two spare bits in the SIO.

+

+Coding of the message priority:

+

+0 	Lowest priority

+1

+2

+3	 Highest priority</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>3</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="accountDateFileOutput">

+            <description>Date for accounting file output.

+Format in ASCI-code: yyyymmdd

+yyyy = 0000-9999

+mm = 01-12

+dd = 01-31

+

+Note! This is the start date for the output.</description>

+            <dataType>

+                <string>

+                    <defaultValue>"00000000"</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="accountTimeFileOutput">

+            <description>Time for accounting file output.

+Format in ASCI-code: hhmm

+hh = 00-23

+mm = 00-59</description>

+            <dataType>

+                <string>

+                    <defaultValue>"0000"</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="accountPeriodFileOutput">

+            <description>Period for accounting file output.

+Format: number of half hour.

+Range = 0, 1, 2, 4, 6, 8, 12, 16, 24, 48

+

+Note! if set to 0 (zero) the output will be stopped.</description>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="upperConnThres">

+            <description>The upper connection threshold allow the user to specify the level at which the upper connection threshold notification is triggered. The thresholds must be given as a percentage of the maximum number of connection resources made available for the entire SCCP.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100</max>

+                    </range>

+                    <defaultValue>80</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="lowerConnThres">

+            <description>The lower connection threshold allow the user to specify the level at which the lower  connection threshold notification is triggered. The thresholds must be given as a percentage of the maximum number of connection resources made available for the entire SCCP. The value must be less then UpperConnThres.

+

+The maximum value is less or equal to the upper connection threshold</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100</max>

+                    </range>

+                    <defaultValue>50</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="swapUDTPointer">

+            <description>There are two ways to construct a UDTS from a UDT, the XUDTS will be constructed in the same way. One way is to only swap the pointers to �Called Party Address� and �Calling Party Address� in a UDT message when constructing a UDTS. The other way is to swap data. How this is done in the SCCP is configurable. The coding and interpretation is as follows:

+0, swap data ��Called party Address� will be sent before �Calling party Address�

+1, swap pointers��Called party Address� will be sent after �Calling party Address�.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>1</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="hopCounterSclc">

+            <description>The SCLC hop counter is a parameter that is decremented for each performed GT translation for SCLC messages on the way to the end destination. If decrementing the counter results in the value of zero in a non-end destination node, the SCCP initiates the appropriate error procedure.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>15</max>

+                    </range>

+                    <defaultValue>8</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="hopCounterScoc">

+            <description>The SCOC hop counter is a parameter that is decremented for each performed GT translation for SCOC messages on the way to the end destination. If decrementing the counter results in the value of zero in no end destination node, the SCCP initiates the appropriate error procedure.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>15</max>

+                    </range>

+                    <defaultValue>8</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tconnEst">

+            <description>Connection establishment control timer.

+

+Unit: deciseconds (0.1 seconds).

+

+Guiding values;

+Range 600 - 1200, Default 600

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>600</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tIas">

+            <description>Send inactivity control timer.

+

+Unit: deciseconds (0.1 seconds).

+

+Guiding values;

+Range 3000-6000

+Default 3000</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>3000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tIar">

+            <description>Receive inactivity control timer.

+

+Unit: deciseconds (0.1 seconds).

+

+Guiding values;

+Range 6600-12600

+Default 6600</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>6600</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tRel">

+            <description>Connection release timer.

+

+Unit: deciseconds (0.1 seconds).

+

+Guiding values;

+Range 100-200

+Default 100</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>100</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tCong">

+            <description>Congestion timer.

+

+Unit: deciseconds (0.1 seconds).

+

+Guiding values;

+Range 10-2550

+Default 300</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>300</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tStatInfo">

+            <description>Subsystem Status Test timer.

+

+Unit: deciseconds (0.1 seconds).

+

+Guiding values;

+Range 10-2550

+Default 300</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>300</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tconnResp">

+            <description>Connection response waiting timer.

+

+Unit: deciseconds (0.1 seconds).

+

+Guiding values;

+Range 100-200

+Default 150</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>150</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tReass">

+            <description>Reassembly timer.

+

+Unit: deciseconds (0.1 seconds).

+

+Guiding values;

+Range 100-200

+Default 150</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>150</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tGuard">

+            <description>Guard timer for program restart not applicable for this CPP version. Instead a  restart counter is used to improve restart performance.

+

+Unit: deciseconds (0.1 seconds).

+

+Guiding values;

+Range 13800-15000 (23-25 minutes)

+Default 1380 (23 minutes)

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>13800</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="smiValue">

+            <description>The SMI (Subsystem Multiplicity Indicator) is always ignored for incoming messages. This SCCP can however be configured to insert a specific SMI value in outgoing messages. The coding and interpretation is as follows:

+

+Coding                             Comment

+   0          |      Affected Subsystem multiplicity unknown.

+   1          |      Affected Subsystem is solitary.

+   2          |      Affected Subsystem is duplicated.

+   3          |      Spare.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>3</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="useSCMG">

+            <description>The use of SCMG functions.

+

+SST = SCCP Subsystem Test message.

+SSA = SCCP Subsystem Allowed message.

+SSP = SCCP Subsystem Prohibited message.

+SSC = SCCP Subsystem Congested message.

+

+The attributes contained in the struct is:

+initiateTimerTcon,

+allowRemoteBroadcast,

+useSST,

+useSSP,

+sendSSA,

+sendSST

+

+</description>

+            <dataType>

+                <structRef name="Scmg"/>

+            </dataType>

+        </attribute>

+        <attribute name="maxRelayedConn">

+            <description>Connection Oriented SCCP Signaling Relay Point (SRP-CO) and Maximum number of Relayed Connections is not used in this CPP version.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>524288</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUDTSent">

+            <description>Performance monitoring counter for number of sent UDT's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUDTRec">

+            <description>Performance monitoring counter for number of received UDT's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUDTSSent">

+            <description>Performance monitoring counter for number of sent UDTS's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUDTSRec">

+            <description>Performance monitoring counter for number of received UDTS's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfXUDTSent">

+            <description>Performance monitoring counter for number of sent XUDT's.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfXUDTRec">

+            <description>Performance management counter for number of received XUDT's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfXUDTSSent">

+            <description>Performance monitoring counter for number of sent XUDTS's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfXUDTSRec">

+            <description>Performance monitoring counter for number of received XUDTS's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCRSent">

+            <description>Performance monitoring counter for number of sent CR's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCRRec">

+            <description>Performance monitoring counter for number of received CR's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDT1Sent">

+            <description>Performance monitoring counter for number of sent DT1's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDT1Rec">

+            <description>Performance monitoring counter for number of received DT1's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfERRSent">

+            <description>Performance monitoring counter for number of sent ERR's.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfERRRec">

+            <description>Performance monitoring counter for number of received ERR's.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSubsysAllowedSent">

+            <description>Performance monitoring counter for number of sent SSA's, subsystem allowed.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCREFRecFromNL">

+            <description>Performance monitoring counter for number of CREF messages received from NL.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCREFSentToNL">

+            <description>Performance monitoring counter for number of CREF messages sent to NL.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRLSDRecFromNL">

+            <description>Performance monitoring counter for number of RLSD messages received from NL.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRLSDSentToNL">

+            <description>Performance monitoring counter for number of RLSD messages sent to NL.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfConInUseExceedHighWaterMark">

+            <description>Performance monitoring counter for number of connections in use that has exceeded the high watermark threshold.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfConInUseReceededLowWaterMark">

+            <description>Performance monitoring counter for number of connections in use that has receded the low watermark threshold.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLUDTRec">

+            <description>Performance monitoring counter for number of received LUDT messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLUDTSSent">

+            <description>Performance monitoring counter for number of sent LUDTS messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="SccpScrc">

+        <description>The Signalling Connection Control Part Routing Control (SCCP SCRC)  MO holds information about the SCCP routing control.</description>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="SccpScrcId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRoutingFailure">

+            <description>Performance monitoring counter for number of routing failures.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfConnectFailure">

+            <description>Performance monitoring counter for number of connect failures.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfHopCounterViolation">

+            <description>Performance monitoring counter for number of Hop counter violations.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRoutingFailNoTransAddrOfSuchNature">

+            <description>Performance monitoring counter for number of routing failures due to no translation for Nature of Address field.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRoutingFailNoTransSpecificAddr">

+            <description>Performance monitoring counter for number of routing failures due to no translation of specific address.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRoutingFailurePointCodeUnAvail">

+            <description>Performance monitoring counter for number of routing failures due to destination point code not available.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRoutingFailNetworkCongest">

+            <description>Performance monitoring counter for number of routing failures due to network congestion.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRoutingFailSubsysUnavail">

+            <description>Performance monitoring counter for number of routing failures due to destination subsystem unavailable.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRoutingFailReasonUnknown">

+            <description>Performance monitoring counter for number of routing failures due to unknown reason.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRoutingFailUnequippedSubsys">

+            <description>Performance monitoring counter for number of routing failures due to unequipped subsystem.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Program">

+        <description>The Program MO represent the executable software on the target hardware.

+

+MOs of this type are created automatically during system upgrade.

+MOs of this type are possible to create manually but a system upgrade

+is recommended to create them.

+

+Note! Some programs are not possible to restart or can take part in an RPU. For more information please refer to the LoadModule MO.

+

+</description>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="loadModule">

+            <description>This attribute gives information about which load module the program is instantiated from.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="LoadModule"/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>This attribute shows whether the program has normal performance capability or not.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="startState">

+            <description>This attribute shows whether the program is permitted to enter operational state enabled or not after a PIU restart. The default state is disabled in order to avoid that an operating program and a new version of the same program have its startState enabled at the same time.

+ 

+It is used on all types of node restarts and restart of PlugInUnit with restartCause = piuRestartUpgrade.</description>

+            <dataType>

+                <enumRef name="StartState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="heapSize">

+            <description>This attribute sets the size of the program heap size. 

+

+The value in the referenced LoadModule is fetched by program and used at create if no value is submitted at create of the program MO.

+

+The referenced load module has a default size defined at compile time wich is used if no value is submitted at create of loadModule or the program Mo.

+

+Note! The value of this attribute is overwritten during Software Upgrade.

+

+Note: If the program is a child to a Fan Mo this attribute is irrelevant.

+

+Note: Setting of this attribute will have no effect until the program is restarted.</description>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="poolSize">

+            <description>This attribute sets the size of the program pool size. In the referenced LoadModule there is possible to set this value at create. 

+

+The value in the referenced LoadModule is fetched by program and used at create if no value is submitted at create of the program MO.

+

+The referenced load module has a default size defined at compile time wich is used if no value is submitted at create of 

+LoadModule or the Program Mo.

+

+Note! The value of this attribute is overwritten during Software Upgrade.

+

+Only working for MP-Program

+

+Unit is bytes.

+

+Note: If the program is a child to a Fan Mo this attribute is irrelevant.

+

+Note: Setting of this attribute will not have any effect until the program is restarted.

+

+</description>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="restartTimer">

+            <description>This type specifies the time that a program have to execute without faults, until the restart counter is reset. The time value is interpreted as seconds.

+

+restartTimer= -1 :  Forever,  implies that the restart counter is only reset when the PIU is restarted.

+

+Note: If the program is a child to a Fan Mo this attribute is irrelevant.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>-1</min>

+                    </range>

+                    <defaultValue>60</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="restartCounterLimit">

+            <description>This attribute specifies the number of times that a program can restart, without escalation to a PIU restart.  The possible values are:

+

+restartCounterLimit = -1 : Unlimited,  means never restart PIU, regardless of the number of times the specific program restarts.

+

+Note: If the program is a child to a Fan Mo this attribute is irrelevant.

+

+Note! The value 3 means 3 restarts, hot, warm and finally as a last resort PIU restart.

+

+Note! The program escalates to a PIU restart when the number of restarts reaches the value set for this attribute.

+I.e. if for example the value is set to 5, escalation to PIU restart will occur at the fifth restart.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>-1</min>

+                    </range>

+                    <defaultValue>3</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="ProgramId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="restart">

+            <description>Request to restart the program.

+Only valid for MP programs.

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+    </class>

+

+    <class name="UniSaalProfile">

+        <description>The UniSaal Profile MO represent and keeps attribute values used by one or more UNI SAAL termination point MOs.</description>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="UniSaalTp"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="profileData">

+            <description>See structure UniSaalProfileData</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="UniSaalProfileData"/>

+            </dataType>

+        </attribute>

+        <attribute name="UniSaalProfileId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="UniSaalTp">

+        <description>The MO represents an access point for a user where a UNI SAAL connection is terminated. The access point depends 

+on an AAL5 connection termination located on the same processor.

+

+UniSaalTp can only terminate on a Mp processor.

+

+Note! The performance monitoring counters found in NniSaalTp MO is set to zero when the Mo and its RO is created.

+These counters are not reset unless there occurs a fault situation that demands a restart and recreation of the ROs.

+Also note that some of these counters are reset based on other conditions. For more details please refer to the 

+descriptions of the performance monitoring counters in this MO.</description>

+        <attribute name="UniSaalTpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the UniSaalTp MO.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving MO.

+

+</description>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="uniSaalProfileId">

+            <description>Reference to a UniSaalProfile MO.

+

+The maxStat attribute defined in the UniSaalProfile MO is dependent on the AAL5 SDU size defined in the Aal5TpVccTp MO. See the description of the maxStat attribute in the UniSaalProfile MO.

+

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="UniSaalProfile"/>

+            </dataType>

+        </attribute>

+        <attribute name="aal5TpVccTpId">

+            <description>Reference to an Aal5TpVccTpMo.

+

+Note: The Aal5 termination point must terminate on a main processor, MP.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Aal5TpVccTp"/>

+            </dataType>

+        </attribute>

+        <attribute name="maxSduSize">

+            <description>Maximum SAAL SDU size. The attribute is dependent on the AAL5 maximum SDU size defined in the Aal5TpVccTp MO. The 'maxSduSize' may not exceed the AAL5 maximum SDU size (the lower of the two directions, fromUserMaxSduSize and toUserMaxSduSize).

+

+Example: If 'fromUserMaxSduSize' is set to 256 and 'toUserMaxSduSize' is set to 512 in the Aal5TpVccTp MO, the ' maxSduSize' in the UniSaalTp MO may not exceed 252.

+

+(i.e. maxSduSize &lt;= the aal5MaxSduSize - 4 bytes)

+

+Note! When setting the value of 'maxSduSize' the 4 bytes used by the SAAL layer for the SAAL header has to be considered.

+

+Note! The upper limit of 2044 (2048 including the SAAL header) is due to limitations on the AAL5 layer.

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>128</min> <max>2044</max>

+                    </range>

+                    <defaultValue>128</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSentSDUs">

+            <description>Number of successfully sent SDUs.

+Counts the number of successfully sent messages to the

+application using SAAL. Reset when the link goes InService or the counter "overflows".</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfReceivedSDUs">

+            <description>Number of successfully received SDUs.

+Counts the number of successfully received messages from 

+ the application using SAAL. Reset when the link goes

+ InService or the counter "overflows".</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLinkInServiceTime">

+            <description>The accumulated time (in seconds) the signalling link has

+ been in service (in assured data transfer mode) since it was created. If the link is down the value 0 is returned.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAllSLFailures">

+            <description>Number of all Signalling Link failures.

+Is a total sum of the error counters:

+        - Number of protocol errors

+        - Number of unsuccessfully retransmissions

+        - Number of NoResponses

+        - Number of other errors</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfNoResponses">

+            <description>Number of no response. This counter is increased when SSCOP (Service Specific Connection Oriented Protocol)

+send an MaaError with error code P. 

+For details refer to ITU-T Q.2110 - B-ISDN AATM Adaptation Layer - Service Specific Connection Oriented Protocol (SSCOP); (7/94).

+Counts the number of no responses detected the last 30 minutes.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLocalCongestions">

+            <description>Number of local congestions. 

+This counter is increased when the sum of SAAL send and retransmission buffers are filled to more than 90%.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRemoteCongestions">

+            <description>Number of remote congestions. 

+This counter is increased when the remote side gives SAAL no credit. Reset when the link goes InService or the counter "overflows".</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSequenceDataLosses">

+            <description>Number of sequences data loss. 

+Counts the number of SD loss detected the last 30 minutes</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfProtocolErrors">

+            <description>Number of unsolicited or inappropriate PDUs.  This counter is increased when SSCOP (Service Specific Connection Oriented Protocol)

+send an MaaError with error code Q.

+For details refer to ITU-T Q.2110 - B-ISDN AATM Adaptation Layer - Service Specific Connection Oriented Protocol (SSCOP); (7/94).

+Counts the number of protocol errors detected the last 30 minutes.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccReTransmissions">

+            <description>Number of unsuccessful retransmissions. 

+Counts the number of unsuccessfully retransmissions detected the last 30 minutes.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfOtherErrors">

+            <description>Number of other list element errors. This counter is increased when SSCOP (Service Specific Connection Oriented Protocol)

+send an MaaError with error code Q-U. 

+For details refer to ITU-T Q.2110 - B-ISDN AATM Adaptation Layer - Service Specific Connection Oriented Protocol (SSCOP); (7/94).

+Counts the number of other errors detected the last 30 minutes. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="E1PhysPathTerm">

+        <description>This MO represents an E1 (i.e. 2 Mbit/s) physical interface in the node. The E1PhysPathTerm MO does not define which type of traffic (TDM or ATM) that the interface should support. 

+Please refer to the Ds0Bundle, AtmPort, IMALink and IMAGroup objects for details about configuration of traffic type.

+

+Note! The performance monitoring counters in the E1PhysPathTerm MO is set to 0 (zero) at start or restart of the node.

+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.

+</description>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>enabled or disabled according to the actual operational state of the Physical Line Termination. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="lineNo">

+            <description>The actual Line number on the board.

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>8</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedByTraffic">

+            <description>The identity of the reserving AtmPort MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="AtmPort"/>

+            </dataType>

+        </attribute>

+        <attribute name="loopback">

+            <description>This attribute describes the current Loopback State of this physical path termination.

+

+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>

+            <dataType>

+                <enumRef name="LoopbackState">

+                    <defaultValue>none</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmEs">

+            <description>Performance Monitoring counter for ES, Errored Seconds.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSes">

+            <description>Performance Monitoring counter for Severely Errored Seconds, SES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="E1PhysPathTermId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="crc4Mode">

+            <description>Indicates what Cyclical Redundancy Check 4 Mode that is being used.</description>

+            <dataType>

+                <enumRef name="Crc4Mode">

+                    <defaultValue>AUTOMATIC</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="idlePattern">

+            <description>The idle pattern.

+

+NOTE: Going from A_LAW or U_LAW to UNDEFINED is always allowed but setting up one ET board with 

+both U_LAW and A_LAW is not allowed.

+E.g. If you want to change from A_LAW to U_LAW on one ET board you have to change idlePattern

+on each physical port belonging to the board to UNDEFINED first.

+A_LAW -&gt; UNDEFINED -&gt; U_LAW or U_LAW -&gt; UNDEFINED -&gt; A_LAW</description>

+            <dataType>

+                <enumRef name="IdlePattern">

+                    <defaultValue>UNDEFINED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="degDegThr">

+            <description>The threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.

+

+This is a percentage value.

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100</max>

+                    </range>

+                    <defaultValue>30</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="degDegM">

+            <description>How many bad seconds in a row that causes a Degraded Signal alarm.

+

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>2</min> <max>10</max>

+                    </range>

+                    <defaultValue>7</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="rdiReporting">

+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="aisReporting">

+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="shutDownTimeout">

+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.

+

+Value in seconds, must be a positive value.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100000</max>

+                    </range>

+                    <defaultValue>1800</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBySync">

+            <description>The identity of the reserving Synchronization MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Synchronization"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedByImaLink">

+            <description>The identity of the reserving ImaLink MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ImaLink"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="J1PhysPathTerm">

+        <description>This MO represents an J1 (i.e. 1.5 Mbit/s) physical interface in the node. The J1PhysPathTerm MO does not define which type of traffic (TDM or ATM) that the interface should support. 

+Please refer to the Ds0Bundle, AtmPort, IMALink and IMAGroup objects for details about configuration of traffic type.

+

+The performance monitoring counters in the J1PhysPathTerm MO is set to 0 (zero) at start or restart of the node.

+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.

+</description>

+        <attribute name="J1PhysPathTermId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="lineNo">

+            <description>The actual Line number on the board.

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>8</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>enabled or disabled according to the actual operational state of the Physical Line Termination. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="physicalLineType">

+            <description>Supported interfaces is defined in J1Types</description>

+            <dataType>

+                <enumRef name="J1Type">

+                    <defaultValue>j1_G</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedByTraffic">

+            <description>The identity of the reserving AtmPort MO.

+

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="AtmPort"/>

+            </dataType>

+        </attribute>

+        <attribute name="degThreshold">

+            <description>Maximum allowed BER(Bit Error Rate). Degraded signal (DEG) if BER &gt; degThreshold. The attribute gives a maximum BER of 10e-X, where X ranges from 5 to 9 (default 6)

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>3</min> <max>9</max>

+                    </range>

+                    <defaultValue>6</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="loopback">

+            <description>Possible values

+

+none - This is the normal state, no loop back is performed (and ordinary traffic is running).

+

+line - The physical path is looped on the line side, the external incoming path is looped back to the external outgoing path.

+

+system - The physical path is looped on the system side, the (node-) internal incoming path is looped back to the internal outgoing path.

+

+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>

+            <dataType>

+                <enumRef name="LoopbackState">

+                    <defaultValue>none</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmEs">

+            <description>Performance monitoring counter for Errored Seconds, ES.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSes">

+            <description>Performance monitoring counter for Severly Errored Seconds, SES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="idlePattern">

+            <description>The idle pattern.

+

+NOTE: Going from A_LAW or U_LAW to UNDEFINED is always allowed but setting up one ET board with 

+both U_LAW and A_LAW is not allowed.

+E.g. If you want to change from A_LAW to U_LAW on one ET board you have to change idlePattern

+on each physical port belonging to the board to UNDEFINED first.

+A_LAW -&gt; UNDEFINED -&gt; U_LAW or U_LAW -&gt; UNDEFINED -&gt; A_LAW</description>

+            <dataType>

+                <enumRef name="IdlePattern">

+                    <defaultValue>UNDEFINED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="rdiReporting">

+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="aisReporting">

+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="shutDownTimeout">

+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.

+

+Value in seconds, must be a positive value.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100000</max>

+                    </range>

+                    <defaultValue>1800</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBySync">

+            <description>The identity of the reserving Synchronization MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Synchronization"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedByImaLink">

+            <description>The identity of the reserving ImaLink MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ImaLink"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Aal0TpVccTp">

+        <description>This MO is used to represent the point in the node where an AAL0 connection is terminated. At this point the user exchange SDUs with its peer at the remote end of the AAL0 connection.

+

+Note! The performance monitoring counters in this MO is set to 0 when counterMode is set to PM_MODE_ON.

+In PM_MODE_OFF no information at all is retrived. So any value for pm-monitoring is measured from the time

+of setting counterMode to PM_MODE_ON. 

+At node restart these performance monitoring counters is reset to 0.

+

+</description>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="processorId">

+            <description>This attribute specifies on what processor the termination point resides. It could either be a board processor or main processor (MO type PlugInUnit), or a SP processor (MO type Spm).</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational State reflects the operational state of the end points and the belonging node connections.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving MO.

+</description>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="vclTpId">

+            <description>The virtual channel to which this MO is termination.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="VclTp"/>

+            </dataType>

+        </attribute>

+        <attribute name="Aal0TpVccTpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="continuityCheck">

+            <description>Continuitiy checking means that a cell is sent downstream when no user cell has been sent for a period of nominally 1 second.

+

+Activates VC end to end continuityCheck according to ITU.T rec I.610.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="nomPmBlkSize">

+            <description>Nominal performance monitoring (PM) blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.</description>

+            <dataType>

+                <enumRef name="AtmNomPmBlkSize">

+                    <defaultValue>NOM_PM_BLKSIZE_2_10</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="counterMode">

+            <description>PM mode is set to indicate type of performance monitoring mode (i.e. activation of bidirectional PM measurements).

+

+</description>

+            <dataType>

+                <enumRef name="AtmCounterMode">

+                    <defaultValue>PM_MODE_OFF</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwLostCells">

+            <description>Performance monitoring counter for forwarded lost cells.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwMissinsCells">

+            <description>Performance monitoring counter for number of forwarded missinserted cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwErrBlocks">

+            <description>Performance monitoring counter for number of forwarded errored blocks.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLostFpmCells">

+            <description>Performance monitoring counter for number of lost Forward Performance Monitoring, FPM cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwLostCells">

+            <description>Performance monitoring counter for number of lost backward cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwMissinsCells">

+            <description>Performance monitoring counter for number of backward missinserted cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwErrBlocks">

+            <description>Performance monitoring counter for number of backward errored blocks.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLostBrCells">

+            <description>Performance monitoring counter for number of lost Backward Reporting, BR, cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="alarmReport">

+            <description>Attribute to decide what type of alarms to be reported.</description>

+            <dataType>

+                <enumRef name="AlarmReport">

+                    <defaultValue>ALARM_LOC</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Aal5TpVccTp">

+        <description>This MO is used to represent the point in the node where an AAL5 connection is terminated. At this point the user exchanges SDUs with its peer at the remote end of the AAL5 connection.

+

+Note! The 'mtuSize' on the IpAtmLink MO does not include 8 bytes required for the LLC/SNAP header and this should be taken into consideration when setting the SduSize on the Aal5TpVccTp MO.

+

+Note! The performance monitoring counters in this MO is set to 0 when counterMode is set to PM_MODE_ON.

+In PM_MODE_OFF no information at all is retrived. So any value for pm-monitoring is measured from the time

+of setting counterMode to PM_MODE_ON. 

+At node restart these performance monitoring counters is reset to 0..</description>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="processorId">

+            <description>This attribute specifies on what processor the protocol is terminated. It could either be a board processor or main processor (PlugInUnit) or a SP processor (Spm).</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="vclTpId">

+            <description>The virtual channel to which this MO is termination.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="VclTp"/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational State reflects the operational state of the end points and the belonging node connections.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="fromUserMaxSduSize">

+            <description>The maximum SDU size in number of octets received from the user (called maxIngressSduSize in the FRO domain). 

+

+The allowed range is dependent on the processorType.

+SP: LowestMaxSduSize =1, HighestMaxSduSize=1600

+BP: LowestMaxSduSize =1, HighestMaxSduSize=1600

+MP:LowestMaxSduSize =1, HighestMaxSduSize=2048</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>2048</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="toUserMaxSduSize">

+            <description>The maximum SDU size in number of octets sent to the user (called maxEgressSduSize in the FRO domain). This attribute is controlled by the processor type.

+

+The allowed range is dependent on the processorType.

+SP: LowestMaxSduSize =1, HighestMaxSduSize=1600

+BP: LowestMaxSduSize =1, HighestMaxSduSize=1600

+MP:LowestMaxSduSize =1, HighestMaxSduSize=2048</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>2048</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The attribute is set by the action reserve from a user of Aal5TpVccTp. It could either be a Cello user like IpAtmLink/UniSaalTp or a node application.

+

+</description>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="Aal5TpVccTpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="alarmReport">

+            <description>Attribute to decide what type of alarms to be reported.</description>

+            <dataType>

+                <enumRef name="AlarmReport">

+                    <defaultValue>ALARM_LOC</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="continuityCheck">

+            <description>Continuitiy checking means that a cell is sent downstream when no user cell has been sent for a period of nominally 1 second. Continuity check both enables generation of CC cells as well as detection of LOC

+</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="nomPmBlkSize">

+            <description>Nominal performance monitoring (PM) blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.

+</description>

+            <dataType>

+                <enumRef name="AtmNomPmBlkSize">

+                    <defaultValue>NOM_PM_BLKSIZE_2_10</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="counterMode">

+            <description>PM mode is set to indicate type of performance monitoring mode (i.e. activation of bidirectional PM measurements).

+

+</description>

+            <dataType>

+                <enumRef name="AtmCounterMode">

+                    <defaultValue>PM_MODE_OFF</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwLostCells">

+            <description>Performance monitoring counter for number of lost forward cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwMissinsCells">

+            <description>Performance monitoring counter for number of forward missinserted cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwErrBlocks">

+            <description>Performance monitoring counter for number of forward errored blocks.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLostFpmCells">

+            <description>Performance monitoring counter for number of lost Forward Performance Monitoring, FPM, cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwLostCells">

+            <description>Performance monitoring counter for number of lost backward cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwMissinsCells">

+            <description>Performance monitoring counter for number of backward missinserted cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwErrBlocks">

+            <description>Performance monitoring counter for number of backward errored blocks.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLostBrCells">

+            <description>Performance monitoring counter for number of lost Backward Reporting, BR, cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="AtmPort">

+        <description>The AtmPort MO is used to configure a physical port for ATM traffic.

+ATM can be transported accross the physical layer in three distinct and different ways:

+

+- Normal mode

+

+An AtmPort MO is created with a reference to physical layer object (any of E1PhysPathTerm,

+J1PhysPathTerm, T1PhysPathTerm, E3PhysPathTerm, T3PhysPathTerm, Sts3CspeTtp, E1Ttp, T1Ttp or Vc4Ttp).

+The payload of that physical layer object is used to transport the ATM traffic.

+

+- Fractional ATM mode

+

+An AtmPort MO is created with a reference to a Ds0Bundle object. The Ds0Bundle specifies

+in this case the timeslots on the physical layer (any of E1PhysPathTerm,J1PhysPathTerm, 

+T1PhysPathTerm, T1Ttp or E1Ttp) that should be used for ATM traffic. The remaining timeslots

+are not used at all.

+I.e. when fractional ATM is used only one Ds0Bundle can exist as a child to a physical port MO.

+

+- IMA mode

+

+In IMA mode, a number of physical ports are grouped together to form one "virtual" physical 

+ATM pipe. In this mode the AtmPort MO is created with a reference to an IMAGroup MO.

+Please refer to the ImaGroup MO for further details.

+

+Note! The performance monitoring counters in the AtmPort MO is set to 0 (zero) at start or restart of the node.

+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again..

+

+

+</description>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="AtmPortId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the ATM port.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status of the AtmPort.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmTransmittedAtmCells">

+            <description>Performance monitoring counter for number of transmitted ATM cells through the ATM port. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmReceivedAtmCells">

+            <description>Performance monitoring counter for number of received ATM cells through the ATM port.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="valueOfLastCellWithUnexp">

+            <description>This attribute returns the ATM header, (vpi, vci, pti), of the last received unexpected cell.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <structRef name="ValueOfUnex"/>

+            </dataType>

+        </attribute>

+        <attribute name="uses">

+            <description>Reference to the physical port, IMA Group or Ds0Bundle used by the ATM port.

+

+The possible MOs are: 

+E1PhysPathTerm, J1PhysPathTerm, T1PhysPathTerm, E3PhysPathTerm, T3PhysPathTerm, Sts3CspeTtp, Sts1SpeTtp, Vc4Ttp, E1Ttp, T1Ttp, Ds0Bundle and ImaGroup.

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="pmSecondsWithUnexp">

+            <description>Performance monitoring counter for errored seconds with discarded cells due to protocol errors (unexpected, UNEX, events).

+

+I.610: With protcol errors is meant the reception of cells with either a non-standardized or a non-currently allocated header value.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="hecCorrectionMode">

+            <description>Header Error Correction.

+

+This attribute specifies if the AtmPort should detect and correct single bit errors or detect multiple bit errors in the ATM header.

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mtp3bAp">

+        <description>This MO represents an MTP3b Access Point (in a remote node). An MTP3b AP is a logical point in the MTP network at which an 

+MTP3b user can access the services provided by MTP3b and the MTP3b can deliver its services to the MTP3b user.

+

+The performance monitoring counters found in Mtp3Ap MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).

+

+</description>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="routeSetId">

+            <description>The routeSetId attribute points out the MTP3b Signalling Route Set (SRS) to which the Mtp3bAp MO is connected. </description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Mtp3bSrs"/>

+            </dataType>

+        </attribute>

+        <attribute name="serviceInd">

+            <description>The serviceInd attribute (Service Indicator, SI) is used by traffic handling functions to perform message distribution.

+Only SI=3 for SCCP usage and SI=12 for Q.2630.1 usage and SI=14 for GCP (H.248) usage have any meaning in this case.

+

+Full range of values for attribute SI:

+0 = Signalling network management messages

+1 = Signalling network testing &amp; maintenance regular messages

+2 = Signalling network testing &amp; maintenance special messages*

+3 = SCCP 

+4 = Telephone User Part (TUP)

+5 = ISDN User Part (ISUP)

+6 = Data User Part, call and circuit related messages

+7 = Data User Part, facility registration and cancellation messages

+8 = MTP Testing User Part

+9 = Broadband ISDN User Part

+10 = Satellite ISDN User Part

+11 = Spare

+12 = Q.2630.1

+13 = Spare

+14 = H.248

+15 = Spare

+

+Note! The serviceIndicator has to be unique for each Mtp3bAp witin the same Mtp3bSrs.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>15</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operationalState attribute determines the operational status of the MTP3b AP . 

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="Mtp3bApId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUserPartUnavailRec">

+            <description>A performance management counter for number of received User Part Unavailable messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAdjacentSPNotAccessible">

+            <description>Performance management counter for number of Adjacent SP's that are not accessible via direct links.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="NniSaalProfile">

+        <description>The NniSaal Profile MO represents and keeps attribute values used by one or more NNI SAAL termination point MOs.</description>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of NniSaalTp�s that have reserved this NniSaalProfile.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="NniSaalTp"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="profileData">

+            <description>See structure NniSaalProfileData.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="NniSaalProfileData"/>

+            </dataType>

+        </attribute>

+        <attribute name="NniSaalProfileId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="NniSaalTp">

+        <description>The MO represents an access point for a user where a NNI SAAL connection is terminated. The access point depends 

+on an AAL5 connection termination located on the same processor.

+

+NniSaalTp can only terminate on a Mp processor.

+

+Note! The performance monitoring counters found in NniSaalTp MO is set to zero when the Mo and its RO is created.

+These counters are not reset unless there occurs a fault situation that demands a restart and recreation of the ROs.

+Also note that some of these counters are reset based on other conditions. For more details please refer to the 

+descriptions of the performance monitoring counters in this MO.</description>

+        <attribute name="NniSaalTpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the NniSaalTp MO.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="nniSaalProfileId">

+            <description>Reference to a NniSaalProfile MO.

+

+The maxStat attribute defined in the NniSaalProfile MO is controlled by the AAL5 SDU size defined in the Aal5TpVccTp MO. See the description of the maxStat attribute in the NniSaalProfile MO.

+

+Note! The consistency check of the attributes in the two MOs mentioned above could not be performed until the NniSaalTp MO was created since there is no direct relation between the objects. It is therefore the responsibility of NniSaalTp to verify the consistency.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="NniSaalProfile"/>

+            </dataType>

+        </attribute>

+        <attribute name="aal5TpVccTpId">

+            <description>Reference to a Aal5TpVccTp MO.

+

+Note: The Aal5 termination point must terminate on a main processor, MP.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Aal5TpVccTp"/>

+            </dataType>

+        </attribute>

+        <attribute name="maxSduSize">

+            <description>Maximum SAAL SDU size. The attribute is dependent on the AAL5 maximum SDU size defined in the Aal5TpVccTp MO. The 'maxSduSize' may not exceed the AAL5 maximum SDU size (the lower of the two directions, fromUserMaxSduSize and toUserMaxSduSize).

+

+Example: If 'fromUserMaxSduSize' is set to 256 and 'toUserMaxSduSize' is set to 512 in the Aal5TpVccTp MO, the ' maxSduSize' in the NniSaalTp MO may not exceed 252.

+

+(i.e. maxSduSize &lt;= the aal5MaxSduSize - 4 bytes)

+

+Note! When setting the value of 'maxSduSize' the 4 bytes used by the SAAL layer for the SAAL header has to be considered.

+

+Note! The upper limit of 2044 (2048 including the SAAL header) is due to limitations on the AAL5 layer.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>128</min> <max>2044</max>

+                    </range>

+                    <defaultValue>128</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSentSDUs">

+            <description>Number of successfully sent SDUs.

+Counts the number of successfully sent messages to the

+application using SAAL. Reset when the link goes InService or the counter "overflows".</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfReceivedSDUs">

+            <description>Number of successfully received SDUs.

+Counts the number of successfully received messages from 

+ the application using SAAL. Reset when the link goes

+ InService or the counter "overflows".</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLinkInServiceTime">

+            <description>The accumulated time (in seconds) the signalling link has

+ been in service (in assured data transfer mode) since it was created. If the link is down the value 0 is returned.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAllSLFailures">

+            <description>Number of all Signalling Link failures.

+Is a total sum of the error counters:

+        - Number of protocol errors

+        - Number of unsuccessfully retransmissions

+        - Number of NoResponses

+        - Number of other errors</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfNoResponses">

+            <description>Number of no response. 

+Counts the number of no responses detected the last 30 minutes.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLocalCongestions">

+            <description>Number of local congestions. 

+This counter is increased when the sum of SAAL send and retransmission buffers are filled to more than the congestionOnSet attribute is configured to..</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRemoteCongestions">

+            <description>Number of remote congestions. 

+This counter is increased when the remote side gives SAAL no credit. Reset when the link goes InService or the counter "overflows".</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAlignmentFailures">

+            <description>Number of alignment or proving failures. This counter is

+increased when "alignment not successful". 

+The counter is reset when the link is created or the counter "overflows".</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSequenceDataLosses">

+            <description>Number of sequences data loss. 

+Counts the number of SD loss detected the last 30 minutes</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfProtocolErrors">

+            <description>Number of unsolicited or inappropriate PDUs. 

+Counts the number of protocol errors detected the last 30 minutes.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccReTransmissions">

+            <description>Number of unsuccessful retransmissions. 

+Counts the number of unsuccessfully retransmissions detected the last 30 minutes.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfOtherErrors">

+            <description>Number of other list element errors. 

+Counts the number of other errors detected the last 30 minutes. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="AtmTrafficDescriptor">

+        <description>This MO specifies traffic and QoS parameters for virtual channel connections.

+

+The attributes can only be set in certain combinations:

+

+CBR:

+ingressAtmQos /egressAtmQos:

+1, 2 

+

+ingressAtmPcr /egressAtmPcr:

+mandatory (must be specified)

+

+ingressAtmMcr /egressAtmMcr:

+optional (not used, any value submitted will be ignored)

+

+UBR+:

+ingressAtmQos /egressAtmQos:

+3 

+

+ingressAtmPcr /egressAtmPcr:

+optional (if shaping is used the desired rate is specified, 0 means no shaping)

+

+ingressAtmMcr /egressAtmMcr:

+mandatory (must be specified)

+

+UBR:

+ingressAtmQos /egressAtmQos:

+4 

+

+ingressAtmPcr /egressAtmPcr:

+optional (not used, any value submitted will be ignored)

+

+ingressAtmMcr /egressAtmMcr:

+optional (not used, any value submitted will be ignored)

+

+Note that the VP sub layer only supports ServiceCategory = CBR  and QoS = 1.

+

+Note! The performance monitoring counters in the AtmTrafficDescriptor MO is set to 0 (zero) at start or restart of the node.

+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.

+</description>

+        <attribute name="AtmTrafficDescriptorId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>This MO's user label.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ingressAtmPcr">

+            <description>Ingress ATM Peak cell rate (cells/s).

+

+Only positive values are allowed. This attribute is only mandatory when serviceCategory is CBR or UBR_PLUS.

+

+Note! When 'serviceCategory' is set to UBR this attribute has no relevance and the value submitted is ignored by the system.

+

+Note! When 'serviceCategory' is set to UBR+ the value 0 (zero) means that shaping is not used. A value larger than the minimum desired cell rate enables shaping to the rate specified.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="ingressAtmQos">

+            <description>Ingress ATM quality of service.

+

+This attribute can be set to Class 1 and 2 if attribute serviceCategory is set to CBR.

+

+This attribute can be set to Class 3 if attribute serviceCategory is set to UBR+.

+

+This attribute can be set to Class 4 if attribute serviceCategory is set to UBR.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="AtmQos">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="egressAtmPcr">

+            <description>Egress ATM Peak cell rate (cells/s).

+

+Only positive values allowed.

+

+This attribute is only mandatory when serviceCategory is CBR or UBR_PLUS.

+

+Note! When 'serviceCategory' is set to UBR this attribute has no relevance and the value submitted is ignored by the system.

+

+Note! When 'serviceCategory' is set to UBR+ the value 0 (zero) means that shaping is not used. A value larger than the minimum desired cell rate enables shaping to the rate specified.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="egressAtmQos">

+            <description>Egress ATM quality of service.

+

+This attribute can be set to Class 1 and 2 if attribute serviceCategory is set to CBR.

+

+This attribute can be set to Class 3 if attribute serviceCategory is set to UBR+.

+

+This attribute can be set to Class 4 if attribute serviceCategory is set to UBR.

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="AtmQos">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Sequence of Users that are using this AtmTrafficDescriptor.

+

+

+</description>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="egressAtmMcr">

+            <description>Egress ATM minimum desired cell rate.

+

+Only positive values allowed. The attribute is only mandatory when serviceCategory is UBR+.

+

+Note! When 'serviceCategory' is set to CBR or UBR this attribute has no relevance and the value submitted is ignored by the system.

+

+Note! This attribute cannot have a value larger than for 'egressAtmPcr'.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="ingressAtmMcr">

+            <description>Ingress minimum desired cell rate (cells/s).

+

+Only positive vaues allowed. This attribute is mandatory only when serviceCategory is UBR+.

+

+Note! When 'serviceCategory' is set to CBR or UBR this attribute has no relevance and the value submitted is ignored by the system.

+

+Note! This attribute cannot have a value larger than for 'ingressAtmPcr'.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="serviceCategory">

+            <description>The service category.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="ServiceCategory">

+                </enumRef>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mtp3bSrs">

+        <description>This MO represents/models a MTP3b Signalling Route Set.

+

+The performance monitoring counters found in Mtp3Srs MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).</description>

+        <attribute name="Mtp3bSrsId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the Mtp3bSrs MO.

+

+There are two possible states for the  operationalState attribute:

+

+- enabled, the MO is partly or fully operational.

+- disabled, the MO is not operational.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The attribute is set by the local action Reserve.

+

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="autoReroute">

+            <description>This flag indicates Whether automatic rerouting is performed(true) or not(false), between IP and ATM/TDM 

+routes when configuration is made. If set to 'false', it has to be done manually, for ex. by management actions(orders).

+

+Note! The attribute 'autoReroute' will always be set to 'false' regardless of value submitted. This attribute is to be removed in coming releases.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <boolean/>

+            </dataType>

+        </attribute>

+        <attribute name="destPointCode">

+            <description>The destPointCode attribute (destination point code, DPC) represents the point code of this Mtp3b SRS MO.

+The Destination Point Code in a Route Set has to be unique within each Signaling Point.

+

+Note! The format of destPointCode must correspond to the signallingPointCode format in the Mtp3bSp, i.e. ITU, ANSI, TTC or China.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>16777215</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="congestedLevel">

+            <description>There are two possible states for the congestedLevel attribute:

+

+- notCongested, no change in congestion level.

+- congested, change in congestion level has occurred.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bCongestLevel">

+                    <defaultValue>notCongested</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDiscardedMsgFromBroadToNarrow">

+            <description>Performance management counter for number of messages discarded from broadband to narrowband.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTransferControlledRec">

+            <description>Performance monitoring counter for number of received Transfer Control (TFC) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTransferProhibitedRec">

+            <description>Performance monitoring counter for number of received Transfer Prohibited (TFP) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTransferAllowedRec">

+            <description>Performance monitoring counter for number of received Transfer Allowed (TFA) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <action name="routeSetTestAnyRoute">

+            <description>The route set test is only available for the Japanese Mtp3b, TTC.

+

+See JT-Q.707 for details.

+

+The test selects a route in the route set and tests it.

+

+Possible return codes are:

+

+0   : successful test

+48  : unsuccessful test

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                    <long/>

+            </returnType>

+        </action>

+        <action name="routeSetTestSpecificRoute">

+            <description>The route set test is only available for the Japanese Mtp3b, TTC.

+

+See JT-Q.707 for details.

+

+The test tests the specified route.

+

+Possible return codes are:

+

+0   : successful test

+48 : unsuccessful test

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <parameter name="routeId">

+                <in/>

+                <dataType>

+                    <moRef name="Mtp3bSr"/>

+                </dataType>

+            </parameter>

+        </action>

+    </class>

+

+    <class name="PlugInUnit">

+        <description>This MO is used to represent a plug-in-unit, that is a board inserted in a slot in a subrack.

+

+Note! Before deleting the PlugInUnit MO, administrativeState must be set to locked.</description>

+        <attribute name="PlugInUnitId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>A free tag that a user can associated to the this managed object. The value has no relevance for the managed system.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state of the PlugInUnit.

+

+The possibility to rollback the setting of this attribute is limited.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state is set to 'enabled' when the plug-in-unit has loaded and started its 'Basic' load module.</description>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="productType">

+            <description>This attribute describes the product type and is always set to the value "HW".</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>"HW"</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="piuType">

+            <description>A reference to an available PiuType at create of a PIU.

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="PiuType"/>

+            </dataType>

+        </attribute>

+        <attribute name="piuGroupNumber">

+            <description>Indicates which restart group the plug-in unit belongs to.

+Such a group consists of a number of plug-in units where at least one must be enabled (working) or performing recovery. When all plug-in units in a group are out of function, the node is restarted. 

+

+Must have a positive value.

+

+Zero indicates no group.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>65536</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. It is a bit mapped CORBA long, where one or more of the bits may be set. If none of the bits are set then the availability status  is considered to be undefined.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of managed objects depending on PlugInUnit</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="pmProcessorLoad">

+            <description>The measurement is done over 100 ms, and returns the sum of load on processes up to, and including process priority 23. The sum is expressed in %

+

+Supported on MP, BP and SP boards.

+

+In case of SP boards the returned processor load is the load of the BP.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="allowedSeqRestarts">

+            <description>The number of automatic (do not require intervention from a human operator) sequential restarts that are allowed for a PIU. When this number of automatic restarts has been exceeded, the automatic restarting halts and the PIU is faulty marked.

+

+The time limit between two restarts is 5 minutes. This means that if the time between two restarts

+is less then 5 minutes the restarts are counted, otherwise the restart counter is reset.

+

+For example,  3 means 3 restarts with time limit &lt; 5 minutes are accepted but when the 4:th occurs within 5 minutes the board is considered faulty and an alarm is generated.</description>

+            <dataType>

+                <enumRef name="SeqRestarts">

+                    <defaultValue>RESTARTS_WITH_WARM</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <action name="restart">

+            <description>

+Note! The restartCause can have the following values:

+1 = restart error

+2 = restart upgrade

+

+Note! The restartCause piuRestartUpgrade overrides the restartRank value and gives mainly restartRank=warm (or restartRank=refresh in some upgrade situations.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="restartRank">

+                <in/>

+                <dataType>

+                    <enumRef name="RestartRank">

+                    </enumRef>

+                </dataType>

+            </parameter>

+            <parameter name="restartCause">

+                <in/>

+                <dataType>

+                    <enumRef name="RestartCause">

+                    </enumRef>

+                </dataType>

+            </parameter>

+            <raisesException name="ValueOutOfRangeException"/>

+            <raisesException name="FroNotAccessibleException"/>

+        </action>

+    </class>

+

+    <class name="Mtp3bSls">

+        <description>This MO represents the SS7 Signalling Link Set as defined in Recommendation Q.704 Ver. 3, April 28 1992 (ITU) T1.111-1996 (ANSI), JT-Q.704 Ver. 3, April 28 1992 (TTC) or GF001-9001 1990 (China).

+

+It provides information about a set of signalling links between an OPC/Adjacent PC pair. A link set is constructed from between 1 to16 Signalling Links (for China, Itu, Ttc and the ANSI standard), all of which have the same two end points (signalling points) as the Signalling Link Set. A Signalling LInk Set may be part of many routes.</description>

+        <attribute name="Mtp3bSlsId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Use label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the MTP3B SLS.

+

+The operability of the MTP3B SLS is described by the operationalState attribute which has two possible values:

+

+- Enabled: The MTP3B SLS is partly or fully operable and available for use. At least one of the belonging links (SL) is enabled.

+- Disabled: The MTP3B SLS is totally inoperable and unable to provide service to the user.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="usageState">

+            <description>The usageState reflects the usage state of the links in the link set. There are three possible values:

+

+- Active: At least one of the belonging  SLs of  the SLS is Active and no link is Busy.

+- Busy: If one of the belonging links is Busy.

+- Idle: All SLs of the SLS are Unavailable.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bUsageState">

+                    <defaultValue>IDLE</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="periodicLinkTestFlag">

+            <description>The periodicLinkTestFlag indicates if periodic sending of SLTM/SLTA messages are used or not. The SLTM message will be sent on every link which is "aligned" at an interval of (SLTM timer). The answer, SLTA is supposed to arrive within (SLTA timer). If this doesn�t happen, or if the received SLTA doesn�t match the sent SLTM a second SLTM will be sent. If this SLTM also fail then the link will be considered 'out-of-service' and a restart of that link will begin.

+

+ANSI: true is default.

+ITU: true is default.

+China: true is default.

+TTC: false is default.

+

+Note that TTC does not use this feature.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="mtp3bSrsId">

+            <description>The mtp3bSrsId attribute points out the corresponding MTP3b Signalling Route Set MO (adjacentDPC).</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Mtp3bSrs"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="Mtp3bSr"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <action name="deactivateLinkSet">

+            <description>This action deactivates a link set, which means the containing signalling links are taken out of service.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+            <raisesException name="FroNotAccessibleException"/>

+        </action>

+        <action name="activateLinkSet">

+            <description>A linkset containing signalling links which are all out of service, is called a deactivated linkset. In order to start up the signalling links and get them into service, there is an Activate Link Set action, or rather, there are two similar actions for activation of a link set.

+

+If the action fails to activate a link the ActivationFailed exception is raised.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+            <raisesException name="FroNotAccessibleException"/>

+        </action>

+        <action name="emergencyActivateLinkSet">

+            <description>This action activates the signalling link with emergency alignment.

+It will also set autoStartLink = true

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+            <raisesException name="FroNotAccessibleException"/>

+        </action>

+    </class>

+

+    <class name="Mtp3bSr">

+        <description>This MO represents a MTP3b Signalling Route. A Signalling Route is used to convey MTP3b User messages from a origin SP to a destination SP (Signalling Point). This MO is multiple instansiated and is contained in the MO MTP3b Signalling Route Set. A Signalling Route is from a network point of view the sequence of link sets from a originating signalling point to a destination signalling point.

+

+Note! At least one signalling route in the signalling route set must have priority = 1.

+If lower priorities are defined the next level must be priority=2. (e.g. routes with priority =1 and =3 in a route set will not work).

+

+Note! Signalling Routes belonging to the same route set with the same priority must have the same type of bearer (Broad Band or Narrow Band).</description>

+        <attribute name="Mtp3bSrId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="linkSetM3uId">

+            <description>The MTP3b Signalling Link Set (MTP3bSls) or M3uAssociation to which the MTP3bSr MO is connected.

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Operational state notification.There are two possible states for the operationalState attribute:

+- enabled, possible to perform operations on the MTP3b SR.

+- disabled, not possible to perform operations on the MTP3b SR.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="usageState">

+            <description>There are three possible states  for the usageState attribute:

+

+-active, route is active.

+-busy, route is congested.

+-idle, route not in use.

+

+(idle=0, active=1, busy=2)

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bUsageState">

+                    <defaultValue>IDLE</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="priority">

+            <description>The priority of the alternative route. The traffic is directed to the highest priority route(s) available in the route set. If more than one route has the same priority within a route set then loadsharing is permitted between these routes.

+The value 1 is considered as the highest priority.</description>

+            <mandatory/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>5</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="routeType">

+            <description>The type of the route.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="Mtp3bRouteType">

+                    <defaultValue>TDM_ATM</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="RouteBlockingState">

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="RouteState">

+                    <defaultValue>NOT_BLOCKED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSecondsAccumulatedRouteUnavailable">

+            <description>The number of seconds (accumulated) route unavailable.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <action name="blockSignalingRoute">

+            <description>This action blocks the Signaling Route.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="deBlockSignalingRoute">

+            <description>This action deblocks the Signaling Route.

+

+Note! This action requires antransaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+    </class>

+

+    <class name="IpSystem">

+        <description>The IP System MO constitutes the top structure level for IP related MOs in a Cello node.

+

+The IpSystem MO is automatically created and cannot be deleted.

+

+The local distinguished name of this MO is ManagedElement=1, IpSystem=1.

+</description>

+        <systemCreated/>

+        <attribute name="userLabel">

+            <description>An operator defined label.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="IpSystemId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="ping">

+            <description>Ping - used to call a host or router to find out if it is present in the network. The following input parameter is used by the Ping action:

+The domain name or IP address to the host that shall be called.

+

+The following parameter is returned:

+Ping result: 'IP address/domain name' - is alive or no answer.

+

+Note! This action requires a transaction.

+</description>

+            <returnType>

+                    <string/>

+            </returnType>

+            <parameter name="host">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="traceRoute">

+            <description>Trace route - used to get information about the route through the IP network that is used for a destination with a specific IP address.

+

+The following input parameter is used by the trace route action:

+The domain name or IP address to a host that shall be trace-routed.

+

+The following parameter is returned:

+Trace result - list of IP addresses/domain names or path not found.

+

+Note! This action requires a transaction.

+</description>

+            <returnType>

+                    <string/>

+            </returnType>

+            <parameter name="host">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+        </action>

+    </class>

+

+    <class name="IpAtmLink">

+        <description>This MO represents an Internet Protocol over ATM link. LLC/SNAP encapsulated packets over Atm Adaptation Layer 5, AAL5, ATM PVCs are used.

+

+Note: The performance monitoring counters in the IpAtmLink MO has a "Wrap-around time" of approximately 2 hours.

+

+Note! When setting the 'fromUserMaxSduSize' and 'toUserMaxSduSize' on the Aal5TpVccTp MO the defined SduSize should be 8 bytes larger then the 'mtuSize' on the IpAtmLink.

+

+Note! Only Aal5TpVccTp's that terminates on an MP (Main Processor) may be used when setting up IpAtmLink's.</description>

+        <attribute name="IpAtmLinkId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>The User Label attribute gives the operator the possibility to label the links.

+</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the IP over ATM link is dependent of the operational states of the underlying AAL5 termination points that are used to transport IP datagrams. If at least one operational AAL5 termination point   (MO: AAL5 TP VCC TP) exists, the operational state of the IP over ATM Link is set to "ENABLED"</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. It is a bit mapped CORBA long, where one or more of the bits may be set. If none of the bits are set then the availability status  is considered to be undefined.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>If set, indicates that this IpAtmLink is reserved by the OspfInterface represented by this attribute.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="OspfInterface"/>

+            </dataType>

+        </attribute>

+        <attribute name="ipAddress">

+            <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits. 

+

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="subnetMask">

+            <description>The attribute subnetMask states the subnet mask of the IP over ATM link (point to point link).

+

+The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits. 

+For a point to point link, the subnetmask 255.255.255.252 is very likely.

+

+Note! The subnet mask has to be contiguos. That is, it has the LSB's set to 0 (zero).

+

+Example:

+

+255.255.255.X

+

+Contiguous subnet mask:

+11111111.11111111.11111111.11111110 (X = 254)

+11111111.11111111.11111111.11111100 (X = 252)

+

+Not-contiguous subnet mask:

+11111111.11111111.11111111.11111010 (X = 250)

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="mtuSize">

+            <description>The attribute mtuSize states the maximum IP datagram size that may be sent on the IP over ATM link in bytes, without fragmentation. Recommended MTU size is 1500 bytes to prevent IP fragmentation.

+

+Note that the size of the IP datagram does not include the 8 Bytes added for the LLC/SNAP header before putting the IP datagram in AAL5 SDU.

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>576</min> <max>2040</max>

+                    </range>

+                    <defaultValue>1500</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="metric">

+            <description>The attribute metric states the metric "cost" of the IP over ATM link. The metric value is calculated as 10^8 /link bit speed.

+

+For example:

+Metric for 10 Mbps Ethernet = 10^8/10^7 = 10

+Metric for 100 Mbps Ethernet = 10^8/10^8 = 1</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>32767</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="monitor">

+            <description>This attribute indicates whether InvATMARP monitor is turned on or off.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="monitorInterval">

+            <description>The interval between sending monitor packets.

+Unit is seconds.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>60</max>

+                    </range>

+                    <defaultValue>10</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="monitorRetries">

+            <description>The number of retries when sending monitor packets.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>255</max>

+                    </range>

+                    <defaultValue>10</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="interfaceName">

+            <description>The interface name.

+

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="aal5TpVccTpSelectionMode">

+            <description>The selection mode for the Aal5TpVccTp's used by the IpAtmLink MO. Determines how the IpAtmLink MO selects the Aal5 termination points used.

+

+In case 'NO_PREFERENCE', 'LOCAL_MP_SELECT_VCC_AT_LINK_UP', LOCAL_MP_PEER_SELECTION_VCC' or 'LOCAL_MP_ACTIVE_RESELECTION' is selected the IpAtmLink MO will prefer Aal5TpVccTp on local MP (i.e. Aal5TpVccTp MOs executing on the same MP as the IpAtmLink), but other Aal5TpVccTp will be accepted if needed.

+

+In case 'ONLY_LOCAL_MP' is selected, the ipAtmLink (Inet Link) will consider Aal5TpVccTp residing on other MPs as a malfunction and discard the usage of them. No InvArp sending will be performed on them and all incomming trafic on them will be discarded. If no local Aal5TpVccTp exists the operational state of the link will be changed to disabled.

+

+  </description>

+            <dataType>

+                <enumRef name="Aal5TpSelectionModes">

+                    <defaultValue>NO_PREFERENCE</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="Aal5TpVccTpIdList">

+            <description>References to MOs of type Aal5TpVccTp representing the underlying AAL5 termination points (of a AAL5 PVC:s) for the IP over Atm link. 

+

+The operator gives a list of relative distinguished names of the Aal5TpVccTp MO's to be used by the IP over ATM link. 

+An Aal5TpVccTp MO may only be specified once in the list.

+

+To change in the set of Aal5TpVccTp MO's related to the IP over ATM link the link has to be deleted and then created with the desired set of AAL5 TP.

+

+Note! Only Aal5TpVccTp's that terminates on an MP (Main Processor) may be used when setting up IpAtmLink's.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <sequence>

+                    <moRef name="Aal5TpVccTp"/>

+                    <length>4</length>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInUcastPkts">

+            <description>Performance monitoring counter for the number of input unicast packets deliverred to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInNUcastPkts">

+            <description>Performance monitoring counter for the number of input broadcast/multicast packets deliverred to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfOutUcastPkts">

+            <description>Performance monitoring counter for the number of out unicast packets deliverred to higher layer</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfOutNUcastPkts">

+            <description>Performance monitoring counter for the number of output broadcast/multicast packets deliverred to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInErrors">

+            <description>Performance monitoring counter for the number of input packets discarded due to any error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInDiscards">

+            <description>Performance monitoring counter for the number of input packets discarded due to resource limitations.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfifOutDiscards">

+            <description>Performance monitoring counter for the number of outbound packets discarded due to resource limitations.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <action name="assignIpAddress">

+            <description>This action sets the IP address and the subnet mask. 

+

+The changing of the IP address with the operation assignIpAddress, it might cause an interruption of the communication between the node and the network management tool. If an incorrect or erroneous IP address is configured, the communication with the node might be lost until the node is restarted or the IP address is changed to the correct value.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="ipAddress">

+                <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.</description>

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="subnetMask">

+                <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.</description>

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+        </action>

+    </class>

+

+    <class name="EthernetLink">

+        <description>The Ethernet Link MO represents the Internet Protocol over Ethernet link. There is only one Ethernet link MO per Cello node.

+

+The changing of the IP address with operation assignIpAddress might cause interruption of the communication if the network management tool is connected via the ethernet link.

+

+Note: The EthernetLink MO can not be deleted!

+

+Note: The performance monitoring counters in the EthernetLink MO has a "Wrap-around time" of approximately 2 hours.

+</description>

+        <attribute name="userLabel">

+            <description>The User Label attribute gives the operator the possibility to label the links.

+

+</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ipAddress">

+            <description>The attribute ipAddress states the IP address of the Ethernet link, it is also the IP address for the O&amp;M host..

+

+The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits. 

+It must not be a broadcast or multicast address.

+

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="subnetMask">

+            <description>The attribute subnetMask states the subnet mask of the Ethernet link.

+

+The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.

+

+Note! The subnet mask has to contiguos. That is, it has the LSB set to 0 (zero).

+

+Example:

+

+255.255.255.X

+

+Contiguous subnet mask:

+11111111.11111111.11111111.11111110 (X = 254)

+11111111.11111111.11111111.11111100 (X = 252)

+

+Not-contiguous subnet mask:

+11111111.11111111.11111111.11111010 (X = 250)

+

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="broadcastAddress">

+            <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.</description>

+            <mandatory/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="mtuSize">

+            <description>The IP layer expects the Ethernet link to have an MTU size (maximum Ethernet frame size without fragmentization) of 1500 bytes.

+

+The value is always the default value. 

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>1500</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="metric">

+            <description>The attribute metric states the metric of the Ethernet link. The metric value is calculated as 10^8/link bit speed.

+

+For example:

+Metric for 10 Mbps Ethernet = 10^8/10^7 = 10

+Metric for 100 Mbps Ethernet = 10^8/10^8 = 1</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>32767</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the Ethernet link is dependent of the operational states of the underlying MAU:s that represents the Ethernet transceiver function. If at least one operational MAU exists, the operational state of the Ethernet Link is set to "ENABLED"</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="interfaceName">

+            <description>The interface name.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="macAddress">

+            <description>The mac address is persistently stored in flash prom on the MP where the IP stack resides. It is stored there  at manufacturing. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <long/>

+                    <length>6</length>

+                    <nonUnique/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>If set, indicates that this EthernetLink is reserved by the OspfInterface MAO represented by this attribute.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="OspfInterface"/>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="EthernetLinkId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInUcastPkts">

+            <description>Performance monitoring counter for the number of input unicast packets deliverred to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInNUcastPkts">

+            <description>Performance monitoring counter for the number of input broadcast/multicast packets deliverred to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfOutUcastPkts">

+            <description>Performance monitoring counter for the number of out unicast packets deliverred to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInErrors">

+            <description>Performance monitoring counter for the number of input packets discarded due to any error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInDiscards">

+            <description>Performance monitoring counter for the number of input packets discarded due to resource limitations.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfOutNUcastPkts">

+            <description>Performance monitoring counter for the number of output broadcast/multicast packets deliverred to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfifOutDiscards">

+            <description>Performance monitoring counter for the number of outbound packets discarded due to resource limitations.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <action name="assignIpAddress">

+            <description>This action sets the IP address and the subnet mask. 

+

+The changing of the IP address with the operation assignIpAddress, 

+causes an interruption of the communication between the node and 

+the network management tool. If an incorrect or erroneous IP address

+is configured, the communication with the node might be lost until 

+the node is restarted or the IP address is changed to the correct 

+value.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="ipAddress">

+                <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.</description>

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="subnetMask">

+                <description>The input format used by the operator is four fields of digits, separated by a dot. Each field consists of three digits.</description>

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+        </action>

+    </class>

+

+    <class name="IpRoutingTable">

+        <description>This MO holds the IP routing table.

+

+The IpRoutingTable MO is automatically created when the Ip MO is created.

+The IpRoutingTable MO can not be created manually.

+The IpRoutingTable MO can not be deleted.

+</description>

+        <systemCreated/>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="indexOfDeletableStaticRoutes">

+            <description>This attribute gives the indexes for the static routes that are possible to delete by the operator.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <long>

+                        <defaultValue>0</defaultValue>

+                    </long>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="IpRoutingTableId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="addStaticRoute">

+            <description>Used to add a new static route to the routing table. It can be

+indicated if the static route should be redistributed by OSPF.

+When adding a static route with an ipaddress, which is not a subnet

+address, the ipaddress is recalculated to the corresponding subnet

+address, based on the ipaddress and the subnet mask. So when looking

+for this route using the action 'getRoutingTableEntry' it is in fact

+the recalculated ipaddress, that is displayed and not the ip address

+entered with addStaticRoute. This is an automatic correction.

+

+Note! If an attempt is made to add a static route with  hopIpAddress starting with 0.0 an exception will be thrown.

+

+Note! This action requires a transaction.

+

+

+</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="ipAddress">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="subnetMask">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="hopIpAddress">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="routeMetric">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <parameter name="redistribute">

+                <in/>

+                <dataType>

+                    <boolean/>

+                </dataType>

+            </parameter>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="listRoutes">

+            <description>List routes actions is used to list all routes in the routing table. It requires no input parameters.

+

+The output is a formatted string, indicating the number of routes in the table followed by route information for each of these routes.

+

+The number of routes in the table is found at the very start of the returned string. Immediately following this is the information on each route in the list in turn. The route information for each route begins with a new line character ("\n") and is followed by the following data items (in the order written below), which are separated from each other by a SPACE character:

+

+- Destination IP address

+- Destination Network mask

+- Next hop IP address/Interface index of connected networks in dot-decimal format

+- Route metric

+- Route type

+- Interface name

+- Redistribute

+- Active

+

+Note that the next hop ipaddress is not an ipaddress per se, it is the subnet on wich the host/router to route to resides.

+

+Below is an example list of routes that could be returned from this action:

+

+"\n123.123.123.123 234.234.234.234 0.0.0.7 10 13 LE0 FALSE active\n122.122.122.122 233.233.233.233 0.0.0.6 2 8 LE0 TRUE active\n132.132.132.132 243.243.243.243. 0.0.0.7 9 13 LE0 TRUE inactive"

+

+In this case, there are three routes in the routing table. The first route has destination IP address of 123.123.123.123, the second route has it set to 122.122.122.122, while finally the third has it set to 132.132.132.132.

+

+NOTE that the route types can be of the following types:

+

+INET_RTPROTO_OTHER          1

+INET_RTPROTO_LOCAL          2

+INET_RTPROTO_NETMGMT     3

+INET_RTPROTO_ICMP             4

+INET_RTPROTO_OSPF            13

+

+The types listed above also denote the origin of the routing entry.

+

+Note! This action does not require a transaction.

+</description>

+            <returnType>

+                    <string/>

+            </returnType>

+        </action>

+        <action name="getRoutingTableEntry">

+            <description>Returns a RoutingTableEntry according to the specified index. 

+

+Should be used with action 'numberOfRoutes' within a transaction. To refresh the routing table stored in the MO, invoke the action 'numberOfRoutes'.

+

+Precondition: 0 &lt;= index &lt;= numberOfRoutes() - 1

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                    <structRef name="RoutingTableEntry"/>

+            </returnType>

+            <parameter name="index">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="InvalidIndexException"/>

+        </action>

+        <action name="numberOfRoutes">

+            <description>Returns the number of entries in the routing table.

+

+Each time this action is invoked, the MO retrieves routing table information from the resource layer and then builds a new array of RoutingTable structs to store this information.

+

+This action along with getRoutingTableEntry(), which allows one to iterate through the array stored in the MO, should be used together with a transaction.</description>

+            <returnType>

+                    <long/>

+            </returnType>

+        </action>

+        <action name="deleteStaticRoute">

+            <description>Removes the RoutingTableEntry submitted as a parameter from the Routing Table, if it is found in the table.

+

+Note that only static roues, previously added, can be deleted with this action.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="routingTableEntry">

+                <in/>

+                <dataType>

+                    <structRef name="RoutingTableEntry"/>

+                </dataType>

+            </parameter>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+    </class>

+

+    <class name="Ip">

+        <description>The Ip MO represents the IP protocol layer with IP forwarding functionality.

+

+Note: The performance monitoring counters in the Ip MO has a "Wrap-around time" of approximately 2 hours.

+

+</description>

+        <attribute name="IpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="workingMode">

+            <description>The workingMode of the IP MO controls if the IP stack in the node will work as a combined host/router (routerMode) or only as a host (hostMode).</description>

+            <mandatory/>

+            <dataType>

+                <enumRef name="WorkingMode">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="retransInterval">

+            <description>The retransmission interval. The units are seconds.

+Must be a value &gt; 0.</description>

+            <dataType>

+                <long>

+                    <defaultValue>4</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="noOfRetrans">

+            <description>The number of retransmissions.

+Must be a value &gt; 0.</description>

+            <dataType>

+                <long>

+                    <defaultValue>5</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="dnsServer">

+            <description>The Domain Name Server IP address.

+

+The IP address must be a Unicast IP address.

+</description>

+            <dataType>

+                <string>

+                    <defaultValue>"127.0.0.1"</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="isRecursiveSearch">

+            <description>Holds information about how the DNS client wants the DNS server do the search for the IP address in the network .  It can be either Recursive search or Non-recursive search.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="isSubDomainName">

+            <description>Holds information about whether to use subsets of the fully qualified domain name to reach the simple domain name.  It can be either Use subsets of domain name or Not use subsets of domain name.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="isDefDomainName">

+            <description>Holds information about whether the default domain name is present.  It can be Present or Not present.

+

+</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="defDomainName">

+            <description>Contains default domain name. 

+If 'isDefDomainName' is set to 'true' the domain name found in this attribute is used by the DNS resolver and there is no need to submit the complete domain name. If the domain name is for example 'ws5741.uab.ericsson.se' then the default domain name would be '.uab.ericsson.se'. If 'isDefDomainName' is set to true the there is no need for using '.uab.ericsson.se'. If set to false then the complete domain name has to be used.

+A valid domain name consists of 1 or more labels separated by dots (".").

+Valid characters for a label shall be limited to letters 'a' - 'z', 'A' - 'Z', digits '0' - '9', the character '-' ("dash").

+Character case shall be preserved. Labels shall start with a letter. Total length of a label shall not exceed 255 characters.

+

+Note! The first and last character in the domain name has to be within the following alphabet: letters  'a' - 'z', 'A' - 'Z' and digits '0' - '9'. For more information refer to RFC 952 and 1101.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the IP MO is ENABLED if at least one link is operational.

+

+Shows whether the MO is OK (enabled) or failed (disabled).  The values are set by the system.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="numberOfLinks">

+            <description>Represents the number of interfaces (Ethernet and IP over

+ATM links) which has registered to the IP MO.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>If set, indicates that this Ip is reserved by the Ospf represented by this attribute.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Ospf"/>

+            </dataType>

+        </attribute>

+        <attribute name="useHostFile">

+            <description>Indicates if the hosts file should be used or not. The hostFile is used by the resolver and

+chosen as a source of information before querying a DNS server.

+

+true - use the host file.

+false - do not use the host file.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="dscp">

+            <description>The DiffServ CodePoint.

+The code point values are used by DiffServ enabled hosts and router to identify different service levels.

+When set, the DSCPs are mapped to PHBs (Per Hop Behaviours) by forwarding devices along the path

+between the source and destination. PHBs dictates how each packet will be handled i.e. what type of

+service that is applied to the packet when it is forwarded.

+

+Note! Only traffic originated from the node is tagged with the dscp value. The Cello router does not implement functionality for handling different service levels when routing IP traffic.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>63</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="icmpRedirect">

+            <description>Indicates if ICMP redirects is sent out or not.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="udpChecksumState">

+            <description>Enable/Disable generation of UDP checksum.

+0 = disabled

+1 = enabled

+

+The UDP checksum is used for verifying that the UDP header has not been damaged during transmit.</description>

+            <dataType>

+                <long>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="connectionAttemptTimer">

+            <description>The time that elapses before a connection (TCP) attempt times out.

+

+Unit is seconds.</description>

+            <dataType>

+                <long>

+                    <defaultValue>75</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxRetransmissionAttempts">

+            <description>The maximum number of retransmission attempts before a TCP connection is dropped.

+The default value is 10 attempts, which is around 5 minutes.

+Setting this attribute value to -1 means infinity, and TCP will never give up in trying 

+to establish a connection.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>-1</min>

+                    </range>

+                    <defaultValue>10</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIpInReceives">

+            <description>Performance monitoring counter for total number of datagrams received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfHdrErrors">

+            <description>Performance monitoring counter for the number of datagrams discarded due to format error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIpAddrErrors">

+            <description>Performance monitoring counter for the number of datagrams discarded due to misdelivery.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIpForwDatagrams">

+            <description>Performance monitoring counter for the number of  datagrams forwarded.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIpInDiscards">

+            <description>Performance monitoring counter for the number of datagrams dascarded due to resource limitations.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIpOutDiscards">

+            <description>Performance monitoring counter for the number of datagrams discarded due to lack of resources.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIpReasmReqds">

+            <description>Performance monitoring counter for the number of fragments received needing reassembly.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIpReasmOKs">

+            <description>Performance monitoring counter for the number of datagrams successfully reassembled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="SccpEntitySet">

+        <description>This MO represents an SCCP EntitySet which is made of one SCCP Entity. An SCCP Entity is a local MTP-SAP + a DPC + possibly an SSN, i.e an SCCP EntitySet identifies the set of access points that result from a global title translation. An SCCP EntitySet may also be made of two SCCP Entities of the same type (if an SSN is present in one SCCP Entity, then an SSN shall also be present in the other). In the latter case the two SCCP entities may be considered either as a "primary" SCCP Entity and a "backup" SCCP Entity (dupli-dominant mode) or may be interpreted as two equal SCCP entities that can be used for outgoing loadsharing purpose. In this implementation they can only be considered as "primary" and "backup".The Routing Indicator (RI) in the Called Party Address is normally not set by the SCCP for outgoing messages and should therefore be set by the user. This means that if the user has set "Route on SSN" this will be the case after the GTT also even if the set consist of MTP-3b Access Points. However, if the set consists of SCCP Access Points the RI is implicitly set to "Route on SSN" by SCCP.

+

+DPC	Destination Point Code

+GTT	Global Title Translation

+MTP	Message Transfer Part 

+SAP	Signalling Access Point

+SSN	Subsystem Number

+

+Note: the SccpEntitySet MO depends either on MAOs of type SccpApLocal OR SccpApRemote, not on a mixture of these MAO types.</description>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="routeIds">

+            <description>The Entity Set routeId is an array of maximum two instances of Sccp ApLocal MO's OR two instances of SccpApRemote MO's OR two instances of Mtp3bAp MO's OR one instance of SccpSP MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                    <length>2</length>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="sharingMode">

+            <description>The sharingMode attribute controls the distribution of SCCP traffic over the entities (Access Points) in the set.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="SharingMode">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="newSubSystemNumber">

+            <description>The new sub system number attribute is only valid if the Mtp3b Access Points are used in the set. In that case the SSN attribute allows to optionally set the subsystem number in the Called Party Address as a result of a Global Title Translation. If the set consists of SCCP Access Points the subsystem number in the Called Party Address is always implicitly set to the SCCP Access Point SAP (SSN) as a result of a Global Title Translation.

+This attribute is controlled by the type of AP(s) that the EntitySet refers to.

+

+The default value 0 means no new subsystem number.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>254</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="newGlobalTitle">

+            <description>The New Global Title attribute allows to optionally replace the global title in the Called Party Address as a result of a Global Title Translation (GTT). If the GT resulting from a GTT is different from the GT previously included in the Called Party Address, the newly produced GT replaces the existing one. The gtIndicator attribute is read-only and is derived from the combination of Nature Of Address, the Translation Type and Numbering Plan used.

+

+Default value is considered as no new Global Title.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="GlobalTitleData"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Holds a list of the reserving MO's.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="SccpEntitySetId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="SccpGlobalTitle">

+        <description>The SCCP Global Title MO represents a combination of a global title translator and a global title rule. If no Destination Point Code (DPC) is present in the Called Party Address, a Global Title (GT) is needed. Then a global title must be present in the Called Party Address, otherwise a routing error occurs. A global title translator is selected by SCCP based on a combination of the values of the Nature Of Address (NA), the translation type (TT), and the Numbering Plan (NP) if available, in this MO matched with the same information in the Called Party Address provided by an SCCP user. A global title translation rule is selected by SCCP by matching the Global Title Address Information and possibly the Encoding Scheme in this MO, with the same information in the Called Party Address provided by an SCCP user. A global title translation rule points to the SCCP Entity Set resulting from the global title translation (GTT).

+The translation results in a DPC and possibly a new Sub System Number (SSN) or GT or both (decided by the SCCP Entity Set it refers to). If the GT and/or SSN resulting from a GTT is different from the GT and/or SSN previously included in the Called Party Address, the newly produced GT and/or SSN replaces the existing one.

+

+GT - Global Title

+SCCP - Signalling Connection Control Part

+SSN - Sub System Number

+DPC - Destination Point Code

+TT - Translation Type

+GTT - Global Title Translation</description>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="gtIndicator">

+            <description>Global title indicator for China, ITU, TTC and ANSI.

+

+

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="GlobalTitleIndicator">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="natureOfAddress">

+            <description>Indicates number type, i.e. national or international number.

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="NatureOfAddress">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="numberingPlan">

+            <description>Indicates which numbering plan that is used.

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="NumberingPlan">

+                    <defaultValue>UNKNOWN</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="translationType">

+            <description>Used to direct the message to the appropriate Global Title translation function.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>254</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="addressInformation">

+            <description>Digit string of 1-37 digits, where each digit is 0-9, and "B", "C". "B" and "C" are for Code 11 and Code 12.

+The addressInformation may also contain wild card symbols: "*" or "?". Wild cards are only allowed for defining Global Title Translations, they are not allowed for specifying SCCP SAPs (built with SPC and Global Title or SPC + SSN + Global Title).</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>1</min> <max>37</max>

+                    </lengthRange>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="encodingScheme">

+            <description>Indicates if the number of address signals are an odd or even number.

+

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="EncodingScheme">

+                    <defaultValue>UNKNOWN</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="sccpEntitySetId">

+            <description>The sccpEntitySetId attribute points out the corresponding SccpEntitySet MO.

+

+Note! This attribute is only optional if this MO is used by Policing. In all other cases it has to be set.</description>

+            <noNotification/>

+            <dataType>

+                <moRef name="SccpEntitySet"/>

+            </dataType>

+        </attribute>

+        <attribute name="SccpGlobalTitleId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Aal2PathVccTp">

+        <description>This MO is used to represent an AAL2 Path, i.e. an ATM VC connection that carries multiplexed AAL2 links.

+

+VCC TP - Virtual Channel Connection Termination Point.

+

+The total number of Aal2PathVccTps associated to an Aal2Ap, by connecting them to Aal2PathDistributionUnits under that Aal2Ap, must not exceed 632.

+

+The total number of Aal2PathVccTps associated to a ReliableProgramUniter, by connecting them to Aal2PathDistributionUnits associated to the ReliableProgramUniter, must not exceed 280.

+

+Note! The performance monitoring counters in this MO is set to 0 when counterMode is set to PM_MODE_ON.

+In PM_MODE_OFF no information at all is retrived. So any value for pm-monitoring is measured from the time of setting counterMode to PM_MODE_ON. 

+At node restart these performance monitoring counters is reset to 0.

+</description>

+        <attribute name="Aal2PathVccTpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="vclTpId">

+            <description>Reference to the VclTp to be used by this Aal2PathVccTp.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="VclTp"/>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state of the termination point. </description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>unlocked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Operational state of the termination point.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving Aal2PathDistribution MO.

+

+</description>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status of Aal2PathVccTp.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="continuityCheck">

+            <description>Continuitiy checking means that a cell is sent downstream when no user cell has been sent for a period of nominally 1 second.

+

+Activates VC end to end continuityCheck according to ITU.T rec I.610.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="counterMode">

+            <description>PM mode is set to indicate type of performance monitoring mode (ie. activation of bidirectional PM measurements).

+

+</description>

+            <dataType>

+                <enumRef name="AtmCounterMode">

+                    <defaultValue>PM_MODE_OFF</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="nomPmBlocksize">

+            <description>Nominal performance monitoring (PM) blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.</description>

+            <dataType>

+                <enumRef name="AtmNomPmBlkSize">

+                    <defaultValue>NOM_PM_BLKSIZE_2_10</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="timerCu">

+            <description>Timer that assures that CPS-packets with one or more octets already packed in the ATM cell wait at most the duration of timerCu before being scheduled for transmission.

+

+Units for timerCu is 10 to the power of -4 seconds. This value can be set in steps of 10 to the power of -4.

+

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>100</max>

+                    </range>

+                    <defaultValue>10</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="aal2PathId">

+            <description>This attribute is used to identify the path in the Q.2630.1 protocol.

+

+The pathId value must be unique within all Aal2PathDistributionUnits under the same Aal2Ap

+

+All integers &gt; 0 are allowed (not 0).

+

+The Aal2PathId is used by the Aal2 connection control function in two Aal2 nodes to uniquely identify an AAL2 path between the two nodes. This means that the value of the attribute Aal2PathId for an Aal2 path must be the same in each of the two nodes.

+

+In order to set this attribute, the Aal2PathVccTp may not be reserved. If an attempt is made, an "IsReservedCanNotSetPathId" exception is thrown.

+

+Note! Setting of this attribute will not have any effect until 'actionAddPath' in Aal2PathDistributionUnit MO' is called adding this MO to the list of Aal2PathVccTp MO's.</description>

+            <mandatory/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>2147483647</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="aal2PathOwner">

+            <description>This attribute indicates whether this Aal2 Path VCC Termination Point is considered the owner of the Aal2 Path in order to decide channel selection procedure in the Q.2630.1 protocol.

+

+Note! In order to set this attribute, the Aal2PathVccTp may not be reserved. If an attempt is made, an "IsReservedCanNotSetPathId" exception is thrown.

+

+Note! The administrativeState has to be LOCKED when this attribute is set, if not the "IsUnlockedCanNotSetPathOwner" exception is thrown.

+

+Note! Setting of this attribute will not have any effect until 'actionAddPath' in Aal2PathDistributionUnit MO' is called adding this MO to the list of Aal2PathVccTp MO's.</description>

+            <mandatory/>

+            <dataType>

+                <boolean/>

+            </dataType>

+        </attribute>

+        <attribute name="alarmReport">

+            <description>Attribute to decide what type of alarms to be reported.</description>

+            <dataType>

+                <enumRef name="AlarmReport">

+                    <defaultValue>ALARM_LOC</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="aal2QoSProfileId">

+            <description>The identity of the QosProfile used by the Aal2PathVccTp.</description>

+            <mandatory/>

+            <dataType>

+                <moRef name="Aal2QosProfile"/>

+            </dataType>

+        </attribute>

+        <attribute name="aal2QoSAvailableProfiles">

+            <description>This attribute specifies which QoSClass that can be supported by this Aal2Path.

+</description>

+            <dataType>

+                <enumRef name="SupportedQoSClasses">

+                    <defaultValue>CLASS_A_B_C_D</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwLostCells">

+            <description>Performance monitoring counter for forwarded lost cells.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwMissinsCells">

+            <description>Performance monitoring counter for number of forwarded missinserted cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwErrBlocks">

+            <description>Performance monitoring counter for number of forwarded errored blocks.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLostFpmCells">

+            <description>Performance monitoring counter for number of lost Forward Performance Monitoring, FPM cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwLostCells">

+            <description>Performance monitoring counter for number of lost backward cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwMissinsCells">

+            <description>Performance monitoring counter for number of backward missinserted cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwErrBlocks">

+            <description>Performance monitoring counter for number of backward errored blocks.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLostBrCells">

+            <description>Performance monitoring counter for number of lost Backward Reporting, BR, cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Aal2RoutingCase">

+        <description>This MO represents a AAL2 routing case which points out an AAL2 access point. </description>

+        <attribute name="Aal2RoutingCaseId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>For free use</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="routeList">

+            <description>An array of alternative routes identified by the concerned Aal2Ap MOs. A routeList can have 0 to 5 Aal2Aps.

+The Aal2Ap must be unique.

+Note! if this attribute is set, the routePriorityList also must be se with the same number of values ( if the routeList

+contains 3 routes, the routePriorityList must contain 3 prioritys).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <restricted/>

+            <dataType>

+                <sequence>

+                    <moRef name="Aal2Ap"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="routePriorityList">

+            <description>A list of all the Aal2Ap priorities.

+The priority values can be in the range 1 to 5, one beeing the highest priority. 

+The Aal2Aps can have the same priorities.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <restricted/>

+            <dataType>

+                <sequence>

+                    <long>

+                        <range>

+                            <min>0</min> <max>5</max>

+                        </range>

+                    </long>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="numberDirection">

+            <description>Defines the possible set of AAL type 2 Service Endpoint Addresses (A2EA) that match the routing case.

+

+The number direction of a routing case shall be interpreted as all AAL type 2 Service Endpoint Addresses 

+starting with the string of numbers defined in the number direction. For example, the AAL2 End System 

+Addresses "12340" and "123400" will both match the number direction "1234".

+

+The AAL2 routing function uses a longest match comparison to select between routing cases with overlapping 

+number directions. For example, given two routing cases A with the number direction "1234" and B with the number 

+direction "12345" the AAL2 End System Address "12345" will be routed using routing case B, whereas the AAL 

+type 2 Service Endpoint Addresses "12344" and "12346" will be routed using routing case A.

+

+NOTE: It is not allowed to use leading zeros when configuring this attribute.

+

+NOTE: It is not possible to replace an existing routing case by creating routing cases with number directions that 

+completely overlap the number direction of the existing routing case.

+

+NOTE: It is not possible to create two routing cases with the exact same number directions in a node.

+

+NOTE: It is possible to create one or more routing cases with number directions that partially overlap the number 

+direction of an existing routing case. 

+

+Length range 1..15

+Alphabet: "0123456789"

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>1</min> <max>15</max>

+                    </lengthRange>

+                </string>

+            </dataType>

+        </attribute>

+        <action name="addAal2ApToRc">

+            <description>Adds the identified (and existing) Aal2Ap MO to the routeList. This action should also be used when changing the priority for an existing Aal2Ap MO. When submitting an existing Aal2Ap MO with a new priority the routing list will be updated with the new priority for the specified Aal2Ap MO.

+

+Note! In order to be able to update the priority for a routing entry, the routing entry first has to be deleted and then submitted with the new priority.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="priority">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <parameter name="route">

+                <in/>

+                <dataType>

+                    <moRef name="Aal2Ap"/>

+                </dataType>

+            </parameter>

+            <raisesException name="InvalidPriorityException"/>

+            <raisesException name="IllegalArgumentTypeException"/>

+            <raisesException name="IllegalAttributeValueException"/>

+        </action>

+        <action name="removeAal2ApFromRc">

+            <description>Removes the identified Aal2Ap MO from the routeList.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="route">

+                <in/>

+                <dataType>

+                    <moRef name="Aal2Ap"/>

+                </dataType>

+            </parameter>

+            <raisesException name="IllegalAttributeValueException"/>

+            <raisesException name="IllegalArgumentTypeException"/>

+        </action>

+    </class>

+

+    <class name="Aal2Sp">

+        <description>The Aal2Sp (AAL2 Signalling Point) MO is used to represent the AAL type 2 Service Endpoint Address of the node in the AAL2 network. 

+There is one and only one instance of this MO in the ATM NE system.</description>

+        <attribute name="userLabel">

+            <description>For free use</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="a2ea">

+            <description>An E.164 format number that specifies the AAL type 2 Service Endpoint Address of the node.

+

+Length Range: 1..15

+Alphabet: "0123456789"

+

+Note! It is not allowed to use leading zeros when configuring this attribute.</description>

+            <mandatory/>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>1</min> <max>15</max>

+                    </lengthRange>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="Aal2SpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="pmUnsuccessfulConnsInternal">

+            <description>Performance monitoring counter for the number of unsuccessful attempts to establish connections due to node internal problems.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Aal2Ap">

+        <description>This MO represents a AAL2 Access Point signalling function associated with a single AAL2 signalling relationship to a remote peer AAL2 acess point signalling function. An AAL2 access point is either a high rate access point that uses MTP-3B for signalling or a low rate access point that uses UNI-SAAL for signalling.

+

+Aal2Ap - Aal2 Access Point

+

+Note! The performance monitoring counters in the AalAp MO is set to 0 (zero) at start or restart of the node.

+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.</description>

+        <attribute name="Aal2ApId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Free for use</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>This attribute holds a list of the reserving MOs.

+</description>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Operational state of the AAL2 AP.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status of the Aal2Ap.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="timerErq">

+            <description>Q.2630.2 establishment request timer. Unit is milli seconds.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>5000</min> <max>30000</max>

+                    </range>

+                    <defaultValue>5000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="timerRel">

+            <description>Q.2630.2 release request timer. Unit is milli seconds.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>2000</min> <max>60000</max>

+                    </range>

+                    <defaultValue>2000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="sigLinkId">

+            <description>Reference to a UniSaalTp or Mtp3bAp MO that provides a signalling link for the Aal2Ap.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="secondarySigLinkId">

+            <description>Reference to a secondary signalling link MO of type UniSaalTp. This attribute can only be set when sigLinkId is of type UniSaalTp.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="rpuId">

+            <description>The physical location of an AP (Access Point) LR/HR (Low Rate/ High Rate) program represented by a reference to a RPU (ReliableProgramUniter) MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ReliableProgramUniter"/>

+            </dataType>

+        </attribute>

+        <attribute name="aal2QoSCodePointProfileId">

+            <description>The identity of the QoSCodePointProfile used by this MO.</description>

+            <dataType>

+                <moRef name="Aal2QosCodePointProfile"/>

+            </dataType>

+        </attribute>

+        <attribute name="pmExisOrigConns">

+            <description>Performance monitoring counter pmExisOrigConns.

+Number of existing connections for the AP originating in this node.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="nrOfConfiguredAal2Paths">

+            <description>The total number of Aal2PathVccTp MOs configured on this Aal2 Ap.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="nrOfUnavailableAal2Paths">

+            <description>The total number of unavailable Aal2PathVccTp's on this Aal2 Ap, i.e. the number of Aal2PathVccTp MOs connectected to this Aal2Ap with 'administrativeState' LOCKED.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmExisTermConns">

+            <description>Performance monitoring counter pmExisTermConns.

+Number of existing connections for the AP terminating in this node.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmExisTransConns">

+            <description>Performance monitoring counter pmExisTransConns.

+Number of existing connections for the AP transiting in this node.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSuccOutConnsRemote">

+            <description>Performance monitoring counter pmSuccOutConnsRemote.

+Number of successful establishment of outgoing connections on this AP</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSuccInConnsRemote">

+            <description>Performance monitoring counter pmSuccInConnsRemote.

+Number of successful establishment of incoming connections on this AP.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUnSuccInConnsRemote">

+            <description>Performance monitoring counter pmUnSuccInConnsRemote.

+

+Number of unsuccessful establishment of incoming connections on this AP caused by reject from beyond this node.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUnSuccOutConnsRemote">

+            <description>Performance monitoring counter pmUnSuccOutConnsRemote.

+

+Number of unsuccessful establishment of outgoing connections on this AP caused by reject from remote side, reset from remote side, no reply or signalling link failure.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUnSuccInConnsLocal">

+            <description>Performance monitoring counter pmUnSuccInConnsLocal.

+Number of unsuccessful attempts to allocate Common Part Sublayer, CPS, resources during establishment of incoming connections on this AP caused by Channel Identifier, CID, and/or bandwidth collision or mismatch of Call Admission Control, CAC, between peers.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUnSuccOutConnsLocal">

+            <description>Performance monitoring counter pmUnSuccOutConnsLocal.

+

+Number of unsuccessful attempts to allocate CPS resources during establishment of outgoing connections on this AP. Caused by rejects in CAC (Connections Admission Control).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUnRecMessages">

+            <description>Performance monitoring counter pmUnRecMessages.

+

+Number of received unrecognized Q.2630.1 messages on this AP.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUnRecParams">

+            <description>Performance monitoring counter pmUnRecParams.

+

+Number of received Q.2630.1 messages with unrecognized parameters on this AP.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Etm1">

+        <description>This MO represents the hardware of the ET-M1 board type. It only represents the ET specific hardware, while the DBM module of the board is represented by the PlugInUnit MO.

+

+The ET-M1 board contains 8 physical ports that can be configured as either E1 (ETSI), J1 (TTC) or T1(ANSI). The board does not allow for a mix of E1, J1 and T1 ports, thus all configured ports on the board must be configured to the same standard.

+

+Each of the ports on the ET-M1 board can be used to carry either ATM traffic or circuit orientated (Nx64 Kbits/s connections) traffic.

+

+Each port can support up to 30 ATM VC connections. Two of these connections  are reserved for AAL2 paths, and therefore two AAL2 multiplexers per port are available.

+

+Each port can support up to 2 VP connections. 

+

+The ET-M1 board supports 1 bidirectional F4/F5 PM flow per port.

+

+Other restrictions:

+- All ports (configured for ATM) on the board must have the same value for the hecCorrection attribute (ATM Port MO).

+- It is possible to configure UBR+ traffic, but there is no guarantee on the minimum cell rate.

+- VP shaping is not supported (it is recommended to configure at most one VP per physical port).

+- VC shaping is not supported with an exception for AAL2 path traffic. This is shaped to the peak bandwidth on the VC connection.

+- When using the Etm1 board the performance monitoring counters in the transmit direction found on the AtmPort MO does not show the following cells: CC cells and OAM FPM cells.

+

+Note! IMA is not applicable for the ETM1 board.

+

+Note! When using fractional atm, timeslot 1 must be a part of the fraction.

+

+Note! ETM1 does not support EPD and PPD

+

+Note! ETM1 does not have a proper buffer management. Thus fairness of UBR+ traffic can not be guaranteed and shaping on UBR+ traffic is not possible.

+

+Note! The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 1 per port.

+</description>

+        <attribute name="userLabel">

+            <description>user label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Enabled or disabled according to the actual operational state of the Etm1 board.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="Etm1Id">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="TuSyncRef">

+        <description>This MO is used to administer synchronization reference (a synchronization input with support for 2MHz and 10MHz signals) on Timing Unit board.</description>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Operational state of TU synchronization reference</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>Administrative state of TU synchronization reference</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status of the TuSyncRef.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>When the TU synchronization reference is registered in the system as an usable synchronization reference, this MO reference is set by using "local" operation syncReserve(). When synchronization reference is de registered, "local" operation syncRelease is used. Note that the only valid user of these operations is Synchronization MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Synchronization"/>

+            </dataType>

+        </attribute>

+        <attribute name="TuSyncRefId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Spm">

+        <description>The Special purpose Processor Module MO, Spm, represents one of the Special Purpose Processors and its connected hardware. This object is used for SW management and restart. Hardware failure indications are sent to Spu.

+

+Note! If the board is of type SPB1 the maximum number of Spm MO's that is possible to create under the Spu MO is 3.  

+If the board is of type SPB2 the maximum number of Spm MO's that is possible to create under the Spu MO is 5.</description>

+        <attribute name="SpmId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>user label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the SPM</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="switchModuleNumber">

+            <description>Switch Module Number</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="asciPortNumber">

+            <description>ASCI Port Number</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="executionResourceNumber">

+            <description>The identity of the SPM on the Special purpose Processor Unit (SPU).

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="runningResourceIdList">

+            <description>The list of identities of running Spm's

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <long/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="installedResourceIdList">

+            <description>The list of identities of installed Spm's in the system.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <long/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="spLinkName">

+            <description>The uniqe name of the link between  the SP and BP.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <action name="restart">

+            <description>Restarts the SP.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+    </class>

+

+    <class name="Spu">

+        <description>The Special purpose Processor Unit MO, Spu, represents the board specific HW on SPB. This objects collects HW failure indications on the board and issues/ceases alarms.</description>

+        <attribute name="userLabel">

+            <description>user label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the SPB board.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="spLinkName">

+            <description>The special purpose processor link name.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="SpuId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="restart">

+            <description>Restarts all SPs on the board (but not the BP).

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroNotAccessibleException"/>

+        </action>

+    </class>

+

+    <class name="AtmCrossConnection">

+        <description>This MO is used to represent the point-to-point ATM cross-connect relationship between two VCL termination points.</description>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Operational state for the cross connection.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="vclTpAId">

+            <description>Identifies the VclTp managed object involved in the A side of the cross connection (which consists of an A and B side).

+

+Must not be the same as vclTpBId.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="VclTp"/>

+            </dataType>

+        </attribute>

+        <attribute name="vclTpBId">

+            <description>Identifies the VclTp managed object involved in the B side of the cross connection (which consists of an A and B side).

+

+Must not be the same as vclTpAId.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="VclTp"/>

+            </dataType>

+        </attribute>

+        <attribute name="AtmCrossConnectionId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="ConfigurationVersion">

+        <description>The Configuration Version, CV, is an MO managing all on disk saved node configuration. This MO keeps all administrative data about the CV's including path and file-names of the configuration files. There may be more than one CV on the disk but only one is used at the time. A CV is always based on one Upgrade Package.

+

+The local distinguished name of this MO is ManagedElement=1, SwManagement=1, ConfigurationVersion=1.</description>

+        <systemCreated/>

+        <attribute name="ConfigurationVersionId">

+            <description>Configuration version MO's id.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="storedConfigurationVersions">

+            <description>List of stored configuration versions in the node. 

+

+Stored in and read from the file system. 

+

+List of stored configuration versions (CV) in the node.

+

+The list is a sequence of CVs.

+Each CV is presented as structure.  A CV structure has following fields:

+        1. Name

+        2. Identity

+        3. Type

+        4. UpgradePackageId

+        5. Operator name

+        6. Comment

+        7. Date

+        8. Status

+

+The CV list is formatted as a sequence of ConfigurationVersionAttributes.

+Each struct contains one CV. 

+

+The following characters are allowed within the struct members below.

+

+[0-9], [A-Z], [a-z] and '&amp;' , '%' , ':' , '.' , '_' ,  '-'

+

+Note! For comment and operatorName spaces (' ') are also allowed within the strings.

+

+Struct element description :

+-Name is in string format, max length is 40.

+-Identity  is in string format, max length is 40.

+-Type is in string format, max length is 40.

+-UpgradePackageId is in string format, max length is 40.

+-Operator name is in string format, max length is 40.

+-Comment is in string format, max length is 40.

+-Date is in string format, max length is 40. Format for date is: weekday month date hour:min:seconds year.

+-Status is in string format, max length is 40.

+

+Note! The identity can not be the same as name. Identity should contain the product identity.

+

+

+</description>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <structRef name="ConfigurationVersionAttributes"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="currentLoadedConfigurationVersion">

+            <description>The name of the current loaded configuration version.

+

+Stored in and read from the file system. 

+

+This is the configuration version that the system started with, i.e. the configuration version that was startable at the last node restart. </description>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="startableConfigurationVersion">

+            <description>The name of the configuration version that will be used at next node restart.

+

+Stored in and read from the file system.

+

+This attribute is set by the action "setStartable( name of cv)". 

+Also set at rollback by the system. The first CV in the rollback list is then used.</description>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="rollbackList">

+            <description>A list of configuration versions to rollback to (configuration version name). 

+

+The configuration version on the first line is used at the next rollback. That line is then automatically removed from the rollback list.

+

+This attribute is modified by actions setFirstRollbackList() and removeFromRollbackList()</description>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <string>

+                        <defaultValue>""</defaultValue>

+                    </string>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="currentUpgradePackage">

+            <description>A reference to current executing upgrade package.</description>

+            <readOnly/>

+            <dataType>

+                <moRef name="UpgradePackage"/>

+            </dataType>

+        </attribute>

+        <attribute name="autoCreatedCVIsTurnedOn">

+            <description>Flag that indicates that a configuration version will be created automatically once a day.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="timeForAutoCreatedCV">

+            <description>Time for the automatic creation of configuration versions once a day. 

+

+The string must be specified as "HH:MM" to be accepted at set. 

+

+See also Class Attribute autoCreatedCVIsTurnedOn.

+The time is UTC time.

+

+Note! If changing the clock on the node, this attribute must be set or

+the JVM MP must be reastarted.

+

+

+</description>

+            <dataType>

+                <string>

+                    <defaultValue>"04:00"</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="rollbackOn">

+            <description>Flag that indicates if rollback is enabled or not. 

+When true the system will automatically set the rollback counter. In case of cyclic restarts a rollback will be issued after x restarts. x is defined by the rollbackInitCounterValue.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="rollbackInitTimerValue">

+            <description>Used by the system when rollback is switched on (autoRollbackOn=true). After the given time the node is considered not in a cyclic restart mode. The rollback counter will then be reset to its initial value (rollbackInitCounterValue).

+

+Timer value in minutes.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>10000</max>

+                    </range>

+                    <defaultValue>30</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="rollbackInitCounterValue">

+            <description>Initial value for the rollback counter. Used when rollback is switched on (autoRollbackOn=true).

+

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>10000</max>

+                    </range>

+                    <defaultValue>5</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="commandlogStatus">

+            <description>An attribute to indicate status of  command log.

+It can be ON/OFF(true/false). </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="executingCv">

+            <description>The name of the executing Configuration Version, CV.

+

+Same as 'currentLoadedConfigurationVersion' after a node restart, changed to the value of lastCreatedCv when a CV is created.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="lastCreatedCv">

+            <description>The name of the last created Configuration Version, CV.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <action name="setStartable">

+            <description>The CV given will be the one used at the normal node restarts. Only A CV with status = OK can be set as startable.

+

+This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="configurationVersionName">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="create">

+            <description>A new CV  directory will be created. A DB backup from the current RAM CV, 

+an ARMAMENT file and the file LLP:LMid is created at the directory. The current 

+command log file is copied to the CV directory first, then it removes the file from 

+the current directory. 

+

+Note: The file cmdlog.properties under /c/ will not be saved to the CV.

+

+The following characters are allowed in the Strings: 

+

+[0-9], [A-Z], [a-z] and '&amp;' , '%' , ':' , '.' , '_' ,  '-'

+

+Note! For comment and operatorName spaces (' ') are also allowed within the strings

+

+-configurationVersionName is in string format, max length is 40 characters.

+-identity is in string format, max length is 40 characters.

+-operatorName  is in string format, max length is 40 characters.

+-comment  is in string format, max length is 40 characters.

+

+This action does not require a transaction.

+

+Note! The configurationVersionName and identity can not be the same. The identity should be the product identity.

+</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="configurationVersionName">

+                <description>One ASCII text string. It must be possible to create a directory with string. Do not use string "autocreated1" and "autocreated2"  as cv name. They are used by the system.</description>

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="identity">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="type">

+                <description>Type of the configuration version [ standard | test | other ].</description>

+                <in/>

+                <dataType>

+                    <enumRef name="ConfigurationVersionType">

+                        <defaultValue>other</defaultValue>

+                    </enumRef>

+                </dataType>

+            </parameter>

+            <parameter name="operatorName">

+                <description>The operator's name.</description>

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="comment">

+                <description>The operator's comment.</description>

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <raisesException name="ValueOutOfRangeException"/>

+        </action>

+        <action name="delete">

+            <description>Delete a configuration version (CV) permanently. 

+

+If CV is referenced in the startable or in the rollback list, the action is not performed (an exception is thrown instead).

+

+Note! The latest created CV is not deletable until a node restart is performed or a new CV is created. Also note that a CV is not possible to delete when it has one of the folowing properties:

+- "loaded"

+- "startable"

+- The CV is found in the "rollbacklist"

+

+This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="configurationVersionName">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="removeFromRollbackList">

+            <description>Removes a Configuration Version (CV) from the rollback list. 

+

+This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="configurationVersionName">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="setFirstRollbackList">

+            <description>Adds a Configuration Version (CV) first in the rollback list. This will cause the node to chose this CV at the next rollback. A CV with status NOK, can't be put in the rollback list.

+

+This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="configurationVersionName">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="activateCommandLog">

+            <description>This action activates the log.

+

+The inparameter is the drive name (where the command log file should be stored).

+

+Default command log is drive  /c/.

+

+Note! Invoking this action affects the attribute'commandLogStatus'.

+

+Note! This action does not require a transaction.

+</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="cmdlogdriveName">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <raisesException name="InvalidDriveNameException"/>

+            <raisesException name="LogActivationException"/>

+        </action>

+        <action name="deactivateCommandLog">

+            <description>This action deactivates the logging of configuration commands.

+

+Please note that uncommited data will be lost.

+

+Note! Invoking this action affects the attribute'commandLogStatus'.

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="LogActivationException"/>

+        </action>

+    </class>

+

+    <class name="SwManagement">

+        <description>This MO is used as a structural element for the SW managed object. The MO structures the software resources of the node.

+

+Note that the SwManagement MO is automatically created and cannot be deleted.

+

+The local distinguished name of this MO is ManagedElement=1, SwManagement=1.</description>

+        <systemCreated/>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="SwManagementId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="normalizeRPU">

+            <description>This action will normalize all RPUs in the node.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+    </class>

+

+    <class name="UpgradePackage">

+        <description>The UpgradePackage, UP, represents an upgrade package as stored in the node file system and as stored on the ftp server that it is/shall be fetched from. 

+

+There may be more than one UP at the same time on the disk. One UP represents the running system issue in the node. That one is pointed out by the Configuration Version MO. 

+

+The actions on an UpgradePackage MO, are actions that can be called to take that particular UpgradePackage into operation on the node.

+

+The deletion of the Upgrade Package on disk is performed when the associated Upgrade Package MO is deleted. The Upgrade Package's unique LoadModule MOs and files are deleted. ConfigurationVersions in otherReferringCVs are deleted. 

+

+

+The UP MO refers to all load modules used in the UP. One load module may by used in more than one UP.

+

+Note at the start-up of the system/database/loading of a Configuration Version, special Upgrade Package MOs are created to represent Upgrade Packages that are stored on the disk but do not have an MO in the current Configuration Version. These special Upgrade Package MOs have are in the "onlyDeletable" state. In this state, the MO will throw ActionNotAllowedException on all its actions!

+

+MOs of this type are created automatically during system upgrade.

+MOs of this type are possible to create manually but a system upgrade

+is recommended to create them.</description>

+        <attribute name="UpgradePackageId">

+            <description>The identity of the MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free of use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="loadModuleList">

+            <description>List of references to load modules that belong to this upgrade package. 

+

+The list will be null until a successful install has been performed.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="LoadModule"/>

+                    <nonUnique/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="upgradeControlFilePath">

+            <description>Path to the .xml file on the node once it has been fetched from the FTP server.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="state">

+            <description>Contains the state of this upgrade package.

+

+The management system and/or operator need to act on some changes in the state attribute. 

+

+This attribute is used to accept/reject and modify behavior of actions. For example action 'upgrade' is not allowed in state notInstalled. Furthermore, action 'upgrade' does not behave the same if state == 'Installed' compared to if state == 'executingUpgrade' or 'awaitingConfirm'. 

+

+To continue and conclude the upgrade sequence when in state == 'awaitingConfirm', action 'confirmUpgrade()' must be called. In this state it is also advisable to check attribute 'confirmationDeadline' to see how much time it is left before automatic rollback is done.

+

+Upgrade Package MOs that are stored on disk but do not have an MO in the current Configuration Version are in state "onlyDeletable". An MO in this state will throw the exception ActionNotAllowedException on all its actions.

+

+</description>

+            <readOnly/>

+            <dataType>

+                <enumRef name="UpgradePackageState">

+                    <defaultValue>NOT_INSTALLED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="progressHeader">

+            <description>Header enum describing the current progress indication. 

+Note that this is only progress information, that should be shown to a human operator, because some operations may take time. 

+

+Changes in the progress header NEVER entails that the operator or management system need to perform any particular actions. </description>

+            <readOnly/>

+            <dataType>

+                <enumRef name="UpgradeProgressInformation">

+                    <defaultValue>IDLE</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="progressTotal">

+            <description>

+This notification attribute is used to indicate progress for different steps in the upgrade sequence. The value gives the total number of steps that is to be performed in current step.

+

+This attribute is changed whenever 'progressHeader' is changed and indicates a maximum count for the progress of the progress counter. What items that are counted is specific for each case. For some cases, the counter is not yet implemented. In these cases, the progressTotal is set to zero (0) when the progressHeader is set.

+

+</description>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="progressCount">

+            <description>This attribute is used to indicate progress for different steps in the upgrade sequence. The value is separated in increments from 0 to progressTotal.

+

+The value of progressCount never exceeds the value of 'progressTotal'. 

+

+For some cases, the counter is not yet implemented. In these cases, the progressCount is set to zero (0) when the progressHeader is set.</description>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeData">

+            <description>Contains product data for this upgrade package. This information is extracted from the upgrade control file. </description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <structRef name="AdminProductData"/>

+            </dataType>

+        </attribute>

+        <attribute name="confirmationDeadline">

+            <description>This attribute contains the deadline date and time for an operator confirmation. If the deadline is not met, then an automatic rollback to a previous configuration is issued by the system.

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ftpServerIpAddress">

+            <description>Ip address to the ftp server where the upgrade package is stored.

+

+The input format used by the operator is four fields of digits, separated by a dot.

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="upFilePathOnFtpServer">

+            <description>File path on the FTP server to the upgrade control file. </description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="user">

+            <description>User id. to be used for logging in to the FTP server.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <defaultValue>anonymous</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="password">

+            <description>Password to the FTP server. This attribute is only supplied at create and is not readable.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <defaultValue>anonymous</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="upgradePackageDocumentId">

+            <description>The document number and revision of the uppgrade package where the white spaces has been removed and underscore between the document number and revision has been inserted e.g. 19089-CSX10901/1_A.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="deletePreventingCVs">

+            <description>The list containing the names of the Configuration Versions that stop the Upgrade Package MO from being deleted.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <string/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="otherReferringCVs">

+            <description>The list of names of Configuration Versions that refer to the Upgarde Package MO, but do not affect the deletable status of the Upgrade Package MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <string/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="isDeletable">

+            <description>Indicates if the Upgrade Package MO can be deleted.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="basedOnUpgradePackages">

+            <description>This attribute is only valid for Upgrade Packages of type Delta.It contains the merge history of this upgrade package.

+

+Example: [Product Data for normal UP (non Delta UP), Product Data for Delta UP1, Product Data for Delta UP2]. </description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <structRef name="AdminProductData"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="upCompatibilityIndex">

+            <description>This attribute states a compatibility index.

+

+If specified, it may be used when verifying that an upgrade 'from' state is valid for this Upgrade Package.

+

+Note: It is only used when the Upgrade Control File element upgrade window contains this type of information.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="cppUpVersion">

+            <description>This attribute states the CPP upgrade package version of this Upgrade Package</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <structRef name="AdminProductData"/>

+            </dataType>

+        </attribute>

+        <attribute name="actionResult">

+            <description>The attribute contains the result from the latest four invoked actions.

+

+This attribute is only valid for actions::

+- install (all variants)

+- cancelInstall

+- verifyUpgrade

+- upgrade (all variants, Note that the attribute is only valid when the verification phase discovers that upgrade is not possible').</description>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <structRef name="ActionResultData"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <action name="install">

+            <description>Load modules defined in the Upgrade Package Control file will only be downloaded to the node if the Load Module MO representing the load module file doesn't already exist.

+The result of this action is indicated in the attribute ActionResult. In case the installation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'InstallationExecutionFailed'.Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure. 

+

+

+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.

+             

+Note! This action will be removed in a later version.              

+Note! This action does not require a transaction. </description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <raisesException name="FtpServerNotAccessibleException"/>

+            <raisesException name="GetFileException"/>

+            <raisesException name="IpAddressException"/>

+            <raisesException name="UpgradeControlFileException"/>

+            <raisesException name="ActionNotAllowedException"/>

+            <raisesException name="InstallException"/>

+        </action>

+        <action name="verifyUpgrade">

+            <description>Verifies that an upgrade is possible. 

+

+The operation is not blocked while the verification is executing i.e. after basic controls the operation initiates the verification and returns 'void'.

+

+The progress of this action is indicated in the attribute ProgressHeader.The result of this action is indicated in the attribute ActionResult.

+

+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.

+

+Note: This action does not require a transaction.

+

+

+

+</description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <raisesException name="VerifyUpgradeException"/>

+            <raisesException name="ActionNotAllowedException"/>

+        </action>

+        <action name="upgrade">

+            <description>Upgrades the node. The operation is not blocked while upgrade is executing i.e. after basic controls the operation initiates the upgrade and returns 'void'. 

+

+Before the real upgrade is started a verification phase is executed. 

+

+The progress of this action is indicated in the attribute ProgressHeader.

+

+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.

+

+The result of this action is only indicated in attribute ActionResult in case the verification phase discovers that upgrade is not possible.

+

+Note: This action does not require a transaction.

+

+</description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <raisesException name="UpgradeNotPossibleException"/>

+            <raisesException name="ActionNotAllowedException"/>

+        </action>

+        <action name="rebootNodeUpgrade">

+            <description>The same as upgrade except that the hard upgrade sequence is always chosen. 

+

+It could be helpful to use this method if the application has start- or upgrade- synchronization problems when using a soft upgrade sequence.

+

+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.

+

+The result of this action is only indicated in attribute ActionResult in case the verification phase discovers that upgrade is not possible.

+

+Note: This action does not require a transaction. </description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <raisesException name="UpgradeNotPossibleException"/>

+            <raisesException name="ActionNotAllowedException"/>

+        </action>

+        <action name="confirmUpgrade">

+            <description>The operator invokes this method when the trial period is over. 

+The operation is not blocked while upgrade is executing i.e. after basic controls the operation initiates the upgrade and returns 'void'.In case the upgrade fails after 'void' has been returned the attribute ProgressHeader will be set to 'UpgradeExecutionFailed'.

+

+Note! This action does not require a transaction. </description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="UpgradeNotPossibleException"/>

+            <raisesException name="ActionNotAllowedException"/>

+        </action>

+        <action name="cancelUpgrade">

+            <description>Cancels an executing upgrade or an upgrade that is awaiting confirm. 

+

+Note: This action performs a node restart so that the CV pointed out in the ConfigurationVersion MO is rolled back.

+

+Note! This action does not require a transaction. </description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="ActionNotAllowedException"/>

+        </action>

+        <action name="forcedInstall">

+            <description>All load modules defined in the Upgrade Package Control file will be downloaded to the node even if the Load Module MO representing the load module already exists i.e. existing load module files are replaced. 

+The result of this action is indicated in the attribute ActionResult.In case the installation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'InstallationExecutionFailed'.Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure.

+

+

+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.

+

+Note! This action will be removed in a later version.

+Note! This action does not require a transaction. </description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <raisesException name="FtpServerNotAccessibleException"/>

+            <raisesException name="GetFileException"/>

+            <raisesException name="IpAddressException"/>

+            <raisesException name="UpgradeControlFileException"/>

+            <raisesException name="ActionNotAllowedException"/>

+            <raisesException name="InstallException"/>

+        </action>

+        <action name="nonBlockingInstall">

+            <description>Load modules defined in the Upgrade Package Control file will only be downloaded to the node if the Load Module MO representing the load module doesn't already exist.

+

+This action is non-blocking i.e. the action initiates the installation and returns 'void' immediately without waiting for the installation to be completed. 

+

+In case the installation fails after 'void' has been returned, this will be indicated by change of the value of attribute 'ProgressHeader' to 'ExecutionFailed'. Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure.

+

+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.

+

+Note! This action does not require a transaction.

+</description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <raisesException name="ActionNotAllowedException"/>

+            <raisesException name="InstallException"/>

+        </action>

+        <action name="nonBlockingForcedInstall">

+            <description>All load modules defined in the Upgrade Package Control file will be downloaded to the node even if the Load Module MO representing the load module already exists i.e. existing load module files are replaced.

+This action is non-blocking i.e. the action initiates the installation and returns 'void' immediately without waiting for the installation to be completed.

+The result of this action is indicated in the attribute ActionResult.In case the installation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'InstallationExecutionFailed'. Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure.

+

+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.

+

+Note! This action does not require a transaction. </description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <raisesException name="ActionNotAllowedException"/>

+            <raisesException name="InstallException"/>

+        </action>

+        <action name="nonBlockingSelectiveForcedInstall">

+            <description>This action only installs the load modules that are required in this node i.e. the load modules required after successful execution of action upgrade on this upgrade package.

+

+A load module is considered to be required if one of the following criteria is fulfilled:

+a) The load module is included in a Repertoire MO where the Repertoire MO is connected to a SwAllocation MO and the SwAllocation MO is connected to a Slot MO, a Fan MO, a Jvm MO, a Webserver MO or an applicable type of application MO. 

+b) The load module is of type 'other'.

+

+All required load modules will be downloaded to the node even if the Load Module MO representing the load module already exists i.e. existing load module files are replaced.

+

+This operation is non-blocking i.e. the action initiates the installation and returns "void" immediately without waiting for the installation to be completed.

+The result of this action is indicated in the attribute ActionResult.In case the installation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'InstallationExecutionFailed'. Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure.

+

+Note. The behaviour described for this action is also obtained for the other installation actions if the Upgrade Control File indicates that the upgrade package is of type selective (which is recommended).

+

+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.

+

+Note! This action does not require a transaction. </description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <raisesException name="ActionNotAllowedException"/>

+            <raisesException name="InstallException"/>

+        </action>

+        <action name="nonBlockingSelectiveInstall">

+            <description>This action only installs the load modules defined in the Upgrade Package Control file that are required in this node i.e. the load modules required after successful execution of action upgrade on this upgrade package.

+

+A load module is considered to be required if one of the following criteria is fulfilled:

+a) The load module is included in a Repertoire MO where the Repertoire MO is connected to a SwAllocation MO and the SwAllocation MO is connected to a Slot MO, a Fan MO, a Jvm MO, a Webserver MO or an applicable type of application MO. 

+b) The load module is of type 'other'. 

+

+Returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute

+actionResult.

+

+The required load modules will only be downloaded to the node if the Load Module MO representing the load module doesn't already exist.

+

+This action is non-blocking i.e. the action initiates the installation and returns 'void' immediately without waiting for the installation to be completed. 

+

+The result of this action is indicated in the attribute ActionResult. In case the installation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'InstallationExecutionFailed'. Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at installation failure.long

+

+Note. The behaviour described for this action is also obtained for the other installation actions if the Upgrade Control File indicates that the upgrade package is of type selective (which is recommended).

+Note! This action does not require a transaction. </description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <raisesException name="ActionNotAllowedException"/>

+            <raisesException name="InstallException"/>

+        </action>

+        <action name="cancelInstall">

+            <description>This action interrupts an ongoing installation of an upgrade package.

+

+Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at execution of this action. 

+

+This action is non-blocking i.e. the action initiates the cancel of the installation and returns 'void' immediately without waiting for the cancellation to be completed.

+

+During execution of this action the value of attribute 'ProgressHeader' is set to 'CancelOfInstallationIsExecuting'.

+

+In case the cancellation fails after 'void' has been returned this will be indicated by change of the value of attribute 'ProgressHeader' to 'CancelOfInstallationFailed'.

+

+Note! This action does not require a transaction.

+

+This action interrupts an ongoing installation of an upgrade package.

+Already downloaded load modules (the downloaded file and the Load Module MO representing it) are not removed at execution of this action. 

+This action is non-blocking i.e. the action initiates the cancel of the installation and returns 'void' immediately without waiting for the cancellation to be completed.

+During execution of this action the value of attribute 'ProgressHeader' is set to 'CancelOfInstallationIsExecuting'.The result of this action is indicated in the attribute ActionResult.In case the cancellation fails after 'void' has been returned the attribute 'ProgressHeader' is set to 'CancelOfInstallationFailed'.

+

+This action returns an actionID (created by the server). This actionID shall be used to locate the result of the action in attribute actionResult.

+

+Note! This action does not require a transaction. </description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <raisesException name="ActionNotAllowedException"/>

+        </action>

+        <action name="clearUpgradeLogFile">

+            <description>Is used to clear the contents of current upgrade log file.

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="UpgradeLogFileNotInUseException"/>

+            <raisesException name="UpgradeLogFileNotAccessibleException"/>

+        </action>

+    </class>

+

+    <class name="Repertoire">

+        <description>The Repertoire is an abstraction of a functionality represented by a plug in unit type (PiuType MO) and one or more load modules (LoadModule MO). The repertoire also provides rules for PiuType/ Load Module combinations valid for a specific function where one function can be provided by one or many PiuType-Load Module combinations. 

+These rules are used to load the correct software (Load Modules) to a PlugInUnit. This could be used as operator configuration support and/or in situations where automatic re-configuration is required (hot repair).

+

+MOs of this type are created automatically during system upgrade.

+MOs of this type are possible to create manually but a system upgrade is recommended to create them.</description>

+        <attribute name="userLabel">

+            <description>A user friendly name associated to the managed object. </description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="name">

+            <description>A function friendly name associated to the repertoire. The value must be unique with respect to all repertoires with the same install state.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="info">

+            <description>Information regarding the function.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="piuTypeList">

+            <description>A list containing all PiuType references that has been added to this repertoire.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="PiuType"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="RepertoireId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving SwAllocation MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="SwAllocation"/>

+                </sequence>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="OspfInterface">

+        <description>The OSPF Interface MO represents an interface that is used by the OSPF protocol to communicate with a neighbour node. By connecting an OSPF interface to a Link MO that Link is defined as a link to be used by OSPF.

+

+Each OspfInterface MO must always be connected to a OspfArea MO.

+</description>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ospfAreaRelated">

+            <description>The identity of the OspfArea connected to this OspfInterface. The default value is the default OspfArea MO.</description>

+            <dataType>

+                <moRef name="OspfArea"/>

+            </dataType>

+        </attribute>

+        <attribute name="lsaTransmissionInterval">

+            <description>The time, in seconds, between LSA re-transmissions over the interface - default value 5 seconds.</description>

+            <dataType>

+                <long>

+                    <defaultValue>5</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="helloInterval">

+            <description>The time, in seconds, between sending OSPF Hello-packets over the interface. Default value 10 seconds.

+

+Note! Must be a positive value.</description>

+            <dataType>

+                <long>

+                    <defaultValue>10</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="routerDeadInterval">

+            <description>The time, in seconds, after which a neighbor router is declared dead when not heard from.

+</description>

+            <dataType>

+                <long>

+                    <defaultValue>40</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="interfaceTransitDelay">

+            <description>Estimated delay, in seconds, for the transmission of a link state update package over the interface.

+</description>

+            <dataType>

+                <long>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="interfacePriority">

+            <description>The interface priority.  Each router is configured with a priority configured from 0 - 255 where 0 is the lowest priority and 255 the highest.

+

+Note! Must be a positive value.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="relatedLink">

+            <description>Each OSPF interface is connected to one IP link.

+The relatedLink can be either an IpAtmLink or an EthernetLink MO

+reference.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="OspfInterfaceId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfOspfIfEvents">

+            <description>Performance monitoring counter for the number of times this OSPF interface has changed its state or an error has occured.

+

+See RFC 1850.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Ospf">

+        <description>The Ospf MO represents an instance of the Open Shortest Path First (OSPF) routing protocol running in a Cello node.

+

+When the Ospf MO is created a default OspfArea MO is also created. This OspfArea has the areaId 000.000.000.000.

+

+The attribute range0 in the default OspfArea will contain the following values:

+advertise = false

+ipAddress = 000.000.000.000

+subnetMask = 000.000.000.000

+</description>

+        <attribute name="OspfId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ospfRouterId">

+            <description>The ospfRouterId attribute is in the form of an IP address.

+In order to able to set ospfRouterId the attribute

+administrativeState has to be set to locked. The ospfRouterId

+is uniquely identifying the router in the Autonomous System. By 

+convention to ensure uniqueness, this should be configured to the

+value of one of the routers IP interface addresses.</description>

+            <mandatory/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="ospfASBdrRtrStatus">

+            <description>The ospfASBdrRtrStatus attribute controls, whether this router is configured as an Autonomous System border router (Routers connected to multiple areas are called area border routers). The attribute must be set to 'True' if the user wants to configure static routes, which should be distributed to other OSPF routes as external routes. Configuration of static routes is the same as adding and deleting static routes to the IpRoutingTable Mo.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the MO.

+The operationalState can only be enabled when the IP MO is in workingMode routerMode.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state of the MO.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="ospfAreaBdrRtrStatus">

+            <description>Area border router flag - indicates whether the router is acting as an area border router or not.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="ipMo">

+            <description>The name of the Ip MO that the Ospf MO is to use</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Ip"/>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. It is a bit mapped CORBA long, where one or more of the bits may be set. If none of the bits are set then the availability status  is considered to be undefined.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfOspfOriginateNewLsas">

+            <description>The number of new link-state advertisments that have been originated. This number is incremented each time the router originates a new LSA.

+

+For more detailed information, see RFC 1850.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfOspfRxNewLsas">

+            <description>The number of link-state advertisments received determined to be new instantiations. This number does not include newer instantiations of self-originated link-state advertisments. 

+

+For more detailed information, see RFC 1850.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="recoverTopoDb">

+            <description>Indicates whether the topology database is to be recovered from the database at restart.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="topoDbStoreInterv">

+            <description>The interval, in seconds, with which the topology database will be stored.</description>

+            <dataType>

+                <long>

+                    <defaultValue>60</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="OspfArea">

+        <description>An OSPF autonomous system is divided into OSPF areas. The OSPF Area MO represents such OSPF areas.

+

+A default OspfArea MO is automatically created when the Ospf MO is created.

+It has the identity = 1, so LDN of this MO will be

+ManagedElement=1,IpSystem=1,Ospf=1,OspfArea=1.

+

+Note! A maximum of 4 OspfAreas can be configured each with a maximum of 8 interfaces.</description>

+        <attribute name="OspfAreaId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="stubArea">

+            <description>Indicates whether the OSPF area is a stub area or not.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="importExternalLsa">

+            <description>Indicates whether importing Autonomous System external LSA's is supported.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="sendAreaSummary">

+            <description>Import Area summary - indicates whether the router will originate and propagate summary LSAs into a stub-area.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="stubAreaMetric">

+            <description>Cost for default route that the router advertises into the area if the area is a stub area and the router is an area border router. By default set to the least metric among the interfaces to other areas.</description>

+            <dataType>

+                <long>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="stubAreaMetricType">

+            <description>Stub Area metric type.

+

+RFC 1850 (OSPF V2 MIB):

+

+comparableCost (external type 1)

+nonComparable (external type 2)</description>

+            <dataType>

+                <enumRef name="OspfMetricType">

+                    <defaultValue>comparableCost</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="areaLsaChecksum">

+            <description>Area Lsa checksum - 32-bit unsigned sum of the link-state advertisements LS check sums contained in this area's link-state database.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="areaId">

+            <description>The OSPF area identity in form of an IP address. This areId uniquely identifies the area.

+AreaId 0.0.0.0 is used for the OSPF backbone.

+Range: 000.000.000.000 to 255.255.255.255.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="range0">

+            <description>OspfArea IP address range zero (0).</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="OspfAreaRange"/>

+            </dataType>

+        </attribute>

+        <attribute name="range1">

+            <description>OspfArea IP address range one (1).</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <structRef name="OspfAreaRange"/>

+            </dataType>

+        </attribute>

+        <attribute name="range2">

+            <description>OspfArea IP address range two (2).</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <structRef name="OspfAreaRange"/>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfOspfSpfRuns">

+            <description>The number of times that the intra-area route table has been calculated using this area's link-state database. This is typically done using Dijkstra's algorithm.

+

+For more detailed information, see RFC 1850.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Holds a list of the reserving OspfInterface MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="OspfInterface"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <action name="addAreaRange">

+            <description>Add aggregation range. Used to add a range of IP addresses to an OSPF area. 

+

+Note! This action requires a transaction.

+</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="range">

+                <description>The area range aggregation.</description>

+                <in/>

+                <dataType>

+                    <structRef name="OspfAreaRange"/>

+                </dataType>

+            </parameter>

+            <parameter name="rangeIndex">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="AttrMissingAtCreateException"/>

+            <raisesException name="FroNotAccessibleException"/>

+            <raisesException name="FroRequestFailedException"/>

+            <raisesException name="NoSuchFieldException"/>

+            <raisesException name="ValueOutOfRangeException"/>

+            <raisesException name="WrongAttributeTypeException"/>

+        </action>

+        <action name="deleteAreaRange">

+            <description>Delete an IP address range. Used to remove a range of IP addresses from an OSPF area. 

+

+Input is the area aggregation range index.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="rangeIndex">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="FroNotAccessibleException"/>

+            <raisesException name="FroRequestFailedException"/>

+            <raisesException name="ValueOutOfRangeException"/>

+        </action>

+    </class>

+

+    <class name="SwitchCoreUnit">

+        <description>The Switch Core Unit MO, SCU, represents the board specific HW on the SCB. This object collects HW failure on the board and sends alarms. It is also used for configuration of board specific FW.

+This board can only be fitted in slot 1 and 28 in a standards subrack.

+The board has a number of switch internal link ports.</description>

+        <notificationTypes>alarm</notificationTypes>

+        <attribute name="userLabel">

+            <description>user label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeStateSili">

+            <description>The administrative state of the switch internal link ports on the switch board. The attribute refers to all ports (locking will lock all ports, unlocking unlock all ports).

+SILI -switch internal link interface.

+</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalStateSil">

+            <description>Operational state indicates the the traffic handling capability of all ports as a group on the board, i.e it is enabled if one or more of the eight ports is enabled. The purpose of this attribute is only for test.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalStateSync">

+            <description>Operational State for network synchronization distribution.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatusSil">

+            <description>The availability status of the switch internal link (SIL) ports..

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatusSync">

+            <description>Availability state for network synchronization distribution.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="SwitchCoreUnitId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>A list of the reserving MO's.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="silPorts">

+            <description>The attribute provides a list of port numbers. 

+The port number is between 0-7 and is used to read state of the switch internal port.

+See action getSilPortState, getOperState and getAvailState.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <long/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <action name="getSilPortState">

+            <description>Returns status of the switch internal link port, which is the same as the LEDs on the unit.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <enumRef name="SilPortState">

+                    </enumRef>

+            </returnType>

+            <parameter name="portNr">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="getSilOperState">

+            <description>Returns operational status of the switch internal link port.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <enumRef name="OperState">

+                    </enumRef>

+            </returnType>

+            <parameter name="portNr">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="getSilAvailState">

+            <description>Returns availability status of the switch internal link port.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <parameter name="portNr">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+    </class>

+

+    <class name="GeneralProcessorUnit">

+        <description>The General purpose Processor Unit MO, GPU, represents the board specific HW on the GPB; hard disk, ethernet and serial port etc.

+

+Note! The 'availabilityStatus' for the GeneralProcessorUnit MO is retreived from the PlugInUnit MO.</description>

+        <attribute name="GeneralProcessorUnitId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Indicates if the function provided by the managed object is capable of performing its normal functions or not.

+

+Note! The value for operationalState is retrived from the GeneralProcessorUnit's parent, i.e. the PlugInUnit.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="hdVolumeDSize">

+            <description>The total size in bytes of the D volume.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="hdVolumeDFreespace">

+            <description>The amount in bytes of freespace available on the D volume.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="hdVolumePSize">

+            <description>The total size in bytes of the P volume.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="hdVolumePFreespace">

+            <description>The amount in bytes of freespace available on the P volume.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Holds the identity of the reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Jvm">

+        <description>The JVM MO is used to represent the Java Virtual Machine. This object is used for configuration JVM parameters, including SW management of Java class libraries used in the machine.

+

+The local distinguished name of this MO is ManagedElement=1, Equipment=1, JVM=1.</description>

+        <systemCreated/>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="classpath">

+            <description>Current classpath, the JVM is using</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="admClasspath">

+            <description>New classpath that will be activated at next restart of JVM. The classpath has a directory, which contains the load module, i.e. the classpath references the load module.</description>

+            <dataType>

+                <sequence>

+                    <moRef name="LoadModule"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="freeMemory">

+            <description>Free memory in the java machine, in bytes.

+

+NOTE: Before this value is read from the system the action 'garbageCollect' is invoked.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="totalMemory">

+            <description>Total amount of memory allocated to the java machine, in bytes.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="mopplets">

+            <description>Contains all classes that are to be initilised and started when the JVM restarts.

+

+Technical note: The specified classes must implement the se.ericsson.cello.moframework.Mopplet interface and be found in a jar/zip-file pointed out by the classpath.

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <string/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="main">

+            <description>Defines the start class name.

+e.g. "se.ericsson.cello.oms.Oms"</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="options">

+            <description>Current options:

+ -D&lt;property&gt;=&lt;value&gt;  Set a system property value. Commonly java.class.path

+-Xms&lt;size&gt;                  Specify the size, in bytes, of the memory allocation pool.

+-Xss&lt;size&gt;                   Set thread stack size in bytes.

+-Xverify:[all | remote | none]  Verify classes according to the suboption. 

+        -Xverify:all verifies all classes. 

+        -Xverify:remote verifies remote classes only. 

+        -Xverify:none turns off class verification.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="JvmId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="properties">

+            <description>Determines the current system properties. 

+

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <string/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="reliableProgramUniter">

+            <description>A reference to the ReliableProgramUniter that refers to the programs in the which the JVM executes.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ReliableProgramUniter"/>

+            </dataType>

+        </attribute>

+        <attribute name="admMain">

+            <description>New start class that will be activated at next restart of the JVM.

+e.g. "se.ericsson.cello.oms.Oms"</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="admOptions">

+            <description>This attribute is used when setting one or more administrative options.

+

+A set option is operational after the next Java Machine restart.

+

+See also attribute 'options'

+

+One or more options can be set, one option in each string of the

+sequence according to description below:

+

+Current options:

+ -D&lt;property&gt;=&lt;value&gt;  Set a system property value. Commonly java.class.path

+-Xms&lt;size&gt;                  Specify the size, in bytes, of the memory allocation pool.

+-Xss&lt;size&gt;                   Set thread stack size in bytes.

+-Xverify:[all | remote | none]  Verify classes according to the suboption. 

+        -Xverify:all verifies all classes. 

+        -Xverify:remote verifies remote classes only. 

+        -Xverify:none turns off class verification.</description>

+            <dataType>

+                <sequence>

+                    <string/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBySwAllocation">

+            <description>This attribute holds the identity of the reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="SwAllocation"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <action name="garbageCollect">

+            <description>Runs the garbage collector. 

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="setProperty">

+            <description>Sets a system property (i.e. propertys in the operating system).

+Note! The valeus set with this action is not saved in the database.

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="name">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="value">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="restart">

+            <description>Restart of executing JVM instance.

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+    </class>

+

+    <class name="SwitchFabric">

+        <description>This MO represents the switch of a Cello node. It is used for general switch configuration.

+

+The system creates automatically one instance of this MO at restart.

+

+Today, only a maximum of 32 Switch Modules MOs and 2 SwitchInternalLinks MOs per InternalLinkGroup MOs are allowed in a Cello node. However, in theory the switch addressing space in the system allows up to 256 SwitchModules MOs. This would then mean there are 255 InternalLinkGroup MOs, each of which is allowed 256 SwitchInternalLink MOs by the addressing.

+

+The local distinguished name of this MO is ManagedElement=1, SwitchFabric=1.

+

+</description>

+        <systemCreated/>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="SwitchFabricId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="SwitchModule">

+        <description>This MO represents two switch planes of one sub-rack, i.e. either the main switch or an external switch. 

+

+Note! In a non-redundant system the administrativeStateSwitchPlaneA/B has to be set to locked for the non-present plane. </description>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="switchModuleNumber">

+            <description>Indicates the number of the switch module, SMN.

+

+switchModuleNumber &amp;gt;= 0

+

+The main switch module, with one or two TimingUnits, is given SMN = 0. SMN for extension switch modules depends on the port pair that the extension switch module is connected to in the main switch module.

+

+The SMN is calculated according to the following formula:

+

+Switch module number [1..255] = int (APN/2)*8 + ISL-port in main [1..8]

+

+APN - ASCC port number

+ISL - inter-switch link</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="secondSmnEvaluation">

+            <description>secondSmnEvaluation - There are two cables that

+are relevant for Switch Module Number (smn) numbering

+If the cabling is wrong secondSmnEvaluation

+will show the second opinion about smn.

+Under normal conditions secondSmnEvaluation = smn.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state of the switch module.

+

+Note! When setting the 'administrativeState' to shutting down a notification about that the state has changed to 'locked' will be sent towards the operator. There is however no guarantee that this operation has been succesful despite the notification and state change due to limitations in the resource layer

+</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>unlocked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeStateSwitchPlaneA">

+            <description>The administrative state of switch plane A.

+It is not allowed to lock both switch plane A and B.

+

+Note! When setting the 'administrativeState' to shutting down a notification about that the state has changed to 'locked' will be sent towards the operator. There is however no guarantee that this operation has been succesful despite the notification and state change due to limitations in the resource layer</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>unlocked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeStateSwitchPlaneB">

+            <description>The administrative state of switch plane B.

+It is not allowed to lock both switch plane A and B.

+

+Note! When setting the 'administrativeState' to shutting down a notification about that the state has changed to 'locked' will be sent towards the operator. There is however no guarantee that this operation has been succesful despite the notification and state change due to limitations in the resource layer</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>unlocked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the Switch Module. At least one of switch plane is enabled. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalStateSwitchPlaneA">

+            <description>The operational state of Switch Module plane A. The state is disabled if any switch ports is faulty. But switch may still be used.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalStateSwitchPlaneB">

+            <description>The operational state of Switch Module plane B. The state is disabled if any switch ports is faulty. But switch may still be used.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status of the Switch Module.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatusSwitchPlaneA">

+            <description>The availability status of the Switch Plane A.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatusSwitchPlaneB">

+            <description>The availability status of the Switch Plane B.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="activeSwitchPlane">

+            <description>The active switch plane: A, B. During multiple faults,  both plan A and B may be used.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="ActiveSwitchPlane">

+                    <defaultValue>switchPlaneA</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="SwitchModuleId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="InternalLinkGroup">

+        <description>The Internal Link Group MO represents all switch internal links connecting the main switch to an external switch.

+

+Switch internal links are automatically grouped in Reliable Groups for redundancy.</description>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="switchModuleNumber1">

+            <description>Reference to the SwitchModule MO that is interconnected by the link in the InternalLinkGroup.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="SwitchModule"/>

+            </dataType>

+        </attribute>

+        <attribute name="switchModuleNumber2">

+            <description>Reference to the SwitchModule MO that is interconnected by the link in the InternalLinkGroup.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="SwitchModule"/>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative status of internal link group.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>unlocked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational status of internal link group.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="InternalLinkGroupId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="getRlgLinks">

+            <description>Returns a  list of  resource instance identities of the switch internal links in the specified Reliable Group.

+

+The existing Reliable Groups are listed with action getReliableLinkGroups.

+

+Note! This action is transactional.</description>

+            <returnType>

+                    <sequence>

+                        <longlong/>

+                    </sequence>

+            </returnType>

+            <parameter name="rlgNumber">

+                <description>Reliable link group number.</description>

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="getLinkStatus">

+            <description>Returns the status of the specified switch internal link, within the specified Reliable Group.

+

+Note! This action is transactional.</description>

+            <returnType>

+                    <enumRef name="SwitchReliableGroup">

+                    </enumRef>

+            </returnType>

+            <parameter name="instanceId">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <parameter name="rlgNumber">

+                <description>Reliable link group number.</description>

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="getReliableLinkGroups">

+            <description>Returns a sequence of Reliable Group numbers.

+

+Each Reliable Group is identified by a unique number which can be used to read out the identities of the switch internal links that are allocated to the Reliable Group. This is done with action getRlgLinks.

+

+The allocation of switch internal links to Reliable Groups is automatic.

+

+Note! This action is transactional.

+</description>

+            <returnType>

+                    <sequence>

+                        <long/>

+                    </sequence>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+    </class>

+

+    <class name="SwitchInternalLink">

+        <description>This MO represents a link interconnecting the from either a SCB or SXB port on the main switch to a SCB on an external switch.

+

+The main switch is located in the hub subrack.

+

+The SCB is represented by the SwitchCoreUnit MO, while the SXB is represented by the SwitchExtensionUnit MO.

+

+Switch internal links are automatically grouped in Reliable Groups for redundancy.</description>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="SwitchInternalLinkId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="plugInUnit1">

+            <description>The reference of one connection point for a SwitchCoreUnit or SwitchExtensionUnit.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="plugInUnit2">

+            <description>The reference of one connection point for a SwitchCoreUnit or SwitchExtensionUnit.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="siliport1">

+            <description>Switch internal port number on PlugInUnit1.

+

+Note! 

+On a standard SCB/SXB board, the ports are labeled from the bottom to the top.

+

+Port nr -&gt; label:

+   '0'          'D'   

+   '1'          'C'   

+   '2'          'B'   

+   '3'          'A'   

+

+Also note that his mapping will change when adding/removing a board.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>3</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="siliport2">

+            <description>Switch internal port number on PlugInUnit2.

+

+Note! 

+On a standard SCB/SXB board, the ports are labeled from the bottom to the top.

+

+Port nr -&gt; label:

+   '0'          'D'   

+   '1'          'C'   

+   '2'          'B'   

+   '3'          'A'   

+

+Also note that his mapping will change when adding/removing a board.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>3</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state of switch internal link.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>unlocked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalStateTraffic">

+            <description>The operational state of switch internal link. There is no traffic if the link is disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatusTraffic">

+            <description>The availabilityl status of switch internal link.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalStateSync">

+            <description>The operational state of sync link. There is no clock distribution if the link is disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatusSync">

+            <description>The availability state of sync link.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Etm4">

+        <description>This MO represents the hardware of the ET-M4 board type. It only represents the ET specific hardware, while the DBM module of the board is represented by the PlugInUnit MO.

+

+The ET-M4 board contains 2 physical ports that can be configured as either STM1(ETSI/TTC) or OC3C (ANSI). The board supports unchannelised ATM access (i.e. it maps ATMs cells directly into an SDH VC4 container).

+

+The board supports up to 1800 ATM VC connections. 

+The number of terminated VPs are limited to 48/board.

+The board supports up to 750  VC UBR+ connections.

+

+The ET-M4 board contains 128 AAL2 multiplexers.

+The ET-M4 board supports up to 256 bidirectional F4/F5 PM flow per port.

+

+Note! IMA is not applicable for the ETM4 board.

+

+Note! The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 256 per board.

+

+Note! When using the Etm4 board the performance monitoring counters in the transmit direction found on the AtmPort MO does not show the following cells: CC cells and OAM FPM cells.</description>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Enabled or disabled according to the actual operational state of the hardware ETM4. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="Etm4Id">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="VpcTp">

+        <description>Virtual path connection termination point, VpcTp, is used to represent the point where the VPC and associated overhead (F4 OAM cells) are terminated/originated.

+

+Note! The performance monitoring counters in this MO is set to 0 when counterMode is set to PM_MODE_ON.

+In PM_MODE_OFF no information at all is retrived. So any value for pm-monitoring is measured from the time

+of setting counterMode to PM_MODE_ON. 

+At node restart these performance monitoring counters is reset to 0.</description>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="VpcTpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>enabled or disabled according to the actual operational state of the VpcTp</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="continuityCheck">

+            <description>Continuity checking means that a cell is sent downstream when no user cell has been sent for a period of nominally 1 second. Continuity check both enables generation of CC cells as well as detection of LOC</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="counterMode">

+            <description>PM mode is set to indicate type of performance monitoring mode (i.e. activation of bidirectional PM measurements).

+

+</description>

+            <dataType>

+                <enumRef name="AtmCounterMode">

+                    <defaultValue>PM_MODE_OFF</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="nomPmBlkSize">

+            <description>Nominal performance monitoring (PM) blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.

+</description>

+            <dataType>

+                <enumRef name="AtmNomPmBlkSize">

+                    <defaultValue>NOM_PM_BLKSIZE_2_10</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwLostCells">

+            <description>Performance monitoring counter for number of lost forward cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwMissinsCells">

+            <description>Performance monitoring counter for number of forward missinserted cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwErrBlocks">

+            <description>Performance monitoring counter for number of forward errored blocks.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLostFpmCells">

+            <description>Performance monitoring counter for number of lost Forward Performance Monitoring, FPM, cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwLostCells">

+            <description>Performance monitoring counter for number of lost backward cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwMissinsCells">

+            <description>Performance monitoring counter for number of backward missinserted cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwErrBlocks">

+            <description>Performance monitoring counter for number of backward errored blocks.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLostBrCells">

+            <description>Performance monitoring counter for number of lost Backward Reporting, BR, cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="alarmReport">

+            <description>Attribute to decide what type of alarms to be reported.</description>

+            <dataType>

+                <enumRef name="AlarmReport">

+                    <defaultValue>ALARM_LOC</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <action name="eteLoopBack">

+            <description>This action performs VC end to end loopback from this VpcTp.

+false=Failed, true=Succeded

+

+Note! This action requires a transaction.

+</description>

+            <returnType>

+                    <boolean/>

+            </returnType>

+        </action>

+    </class>

+

+    <class name="VplTp">

+        <description>This MO is used to represent the termination of a VP link.

+

+Note that a maximum of 999 MO's of this type may be configured.

+

+Note! For information on how many VplTp's that can be configured under the AtmPort MO please refer to the board that is parent to the termination reserved by the AtmPort MO.

+

+The performance monitoring counters in the VplTp MO is set to 0 (zero) at start or restart of the node.

+When the value is to large to fit in to a long (31bit) the counter turns over and starts from 0 again.</description>

+        <attribute name="userLabel">

+            <description>This MOs user label.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="atmTrafficDescriptor">

+            <description>Reference to the Atm Traffic Descriptor.</description>

+            <mandatory/>

+            <dataType>

+                <moRef name="AtmTrafficDescriptor"/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>enabled or disabled according to the actual operational state of the VplTp.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="externalVpi">

+            <description>This is the virtual path identifier for the external ATM cells.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmReceivedAtmCells">

+            <description>Performance monitoring counter for number of received ATM cells for the VplTp.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmTransmittedAtmCells">

+            <description>Performance monitoring counter for number of transmitted ATM cells.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="VplTpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="TimingUnit">

+        <description>This MO represents a timing unit (reference clock) in the node.

+

+The corresponding Program shall be of LoadModuleLoaderType, SpmFpgaLoader.</description>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Operational state of TimingUnit</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status of the TimingUnit.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="TimingUnitId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="PiuType">

+        <description>The PiuType is an MO that holds product information about a PlugInUnit and the execution resources of the PlugInUnit. It is created/deleted during a software upgrade.

+The PiuType is used when creating execution MOs connected to a PlugInUnit and when allocating software to this resource.

+

+MOs of this type are created automatically during system upgrade.

+MOs of this type are possible to create manually but a system upgrade

+is recommended to create them.

+ 

+

+</description>

+        <attribute name="userLabel">

+            <description>A user friendly name associated to the managed object. </description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="productData">

+            <description>The productData describes the product number, short product revision, product name and product information of the PlugInUnit. The production date is not used.

+

+Trailing letters in the revision is recommended to be excluded in the PiuType. Example: R2B will be R2 without trailing letter, R2B/3 must be R2B/3 in the PiuType, R2B/A should be R2 in the PiuType. 

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="AdminProductData"/>

+            </dataType>

+        </attribute>

+        <attribute name="boardWidth">

+            <description>The width of the PlugInUnit board in steps of 5 mm.

+A PlugInUnit can use/cover more than the slot that it occupies.

+

+Example: boardWidth=3 corresponds to 3*5 = 15 mm.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long/>

+            </dataType>

+        </attribute>

+        <attribute name="airFlowData">

+            <description>Control value m3/h for the fan unit. Needed by cooling function.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="AirFlowData"/>

+            </dataType>

+        </attribute>

+        <attribute name="PiuTypeId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="role">

+            <description>The value will be MP if a board has the role of a Main processor.

+The value will be BP if a board has the role of a device board

+Otherwise the value will be OTHERS.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="PiuRole">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity's of the reserving MO's.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <action name="numberOfMoConfigurations">

+            <description>Returns the number of entries in the PIUTypeConfigurationArray.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <long/>

+            </returnType>

+        </action>

+        <action name="getMoConfiguration">

+            <description>Returns a struct of a specific MoConfiguration at a given index.

+The moConfiguration holds information about how to create the 

+subordinate objects for a specific piu type. 

+

+Precondition: 0 &lt;= index &lt;= numberOfMoConfigurations() - 1

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <structRef name="PiuTypeMOConfiguration"/>

+            </returnType>

+            <parameter name="index">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="InvalidIndexException"/>

+        </action>

+    </class>

+

+    <class name="SwAllocation">

+        <description>This MO is primarily used to handle data for automatic configuration of load modules. Automatic in the meaning that the system selects the appropriate load module and revision. A SWA may be related to a slot, indicating that a specific functionality is requested at this location. The SWA is manually created by the operator.

+

+The SWA object is related to (one or more) repertoires, which hold information on possible PIU-type/revisions and load module combinations.

+

+In some cases (e.g multi-purpose boards, boards with processor/FPGA-pools) it may not be possible to completely configure the PIU without instructions from the operator (e.g which load module runs on which processor/FPGA). In these cases a specialization of the SWA has to be designed in such a way that it can be manually configured.

+

+When a SwAllocation MO depends on a ManagedObject MO, this ManagedObject actually represents a RBS Fan.

+

+MOs of this type are created automatically during system upgrade.

+MOs of this type are possible to create manually but a system upgrade is recommended to create them.</description>

+        <attribute name="userLabel">

+            <description>Free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="role">

+            <description>The role of a slot/PIU. The role must be unique with respect to other SwAllocations in the node. 

+

+This is a preparation to introduce predefined SwAllocation in  future upgrade packages.</description>

+            <mandatory/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="repertoireList">

+            <description>A list of references to repertoires.</description>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="Repertoire"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="slotList">

+            <description>A list of references to mainly slots in a subrack, e.g. Slot or Fan MO. It may also refer to other objects handling auxiliary units, e.g. RBS Fan.</description>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="SwAllocationId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="addRepertoire">

+            <description>Adds the specifed repertoire to this list. 

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="aRepertoire">

+                <in/>

+                <dataType>

+                    <moRef name="Repertoire"/>

+                </dataType>

+            </parameter>

+            <raisesException name="IllegalArgumentTypeException"/>

+        </action>

+        <action name="deleteRepertoire">

+            <description>Removes the first occurrence of the specified repertoire from this list.

+

+Notw! This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="aRepertoire">

+                <in/>

+                <dataType>

+                    <moRef name="Repertoire"/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="addSlot">

+            <description>Adds the specified Slot to the slotList. 

+The slot can only be of type Slot MO, Fan MO, WebServer MO, JVM MO or an applicable type of application MO (e.g. for "RBS Fans").

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="aSlot">

+                <in/>

+                <dataType>

+                    <moRef name="ManagedObject"/>

+                </dataType>

+            </parameter>

+            <raisesException name="IllegalArgumentTypeException"/>

+        </action>

+        <action name="deleteSlot">

+            <description>Removes the first occurrence of the specified slot from this list. 

+The slot can only be of type Slot MO, Fan MO, WebServer MO or an 

+applicable type of application MO (e.g. for "RBS Fans").

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="aSlot">

+                <in/>

+                <dataType>

+                    <moRef name="ManagedObject"/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="deleteAllRepertoires">

+            <description>Removes all repertoires from this list and sets its size to zero.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="deleteAllSlots">

+            <description>Removes all slots from this list and sets its size to zero.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="addSlots">

+            <description>Adds the specified Slot to the slotList. 

+The slot can only be of type Slot MO, Fan MO, WebServer MO, JVM MO or an applicable type of application MO (e.g. for "RBS Fans").

+If the slot exists in the list, the object is ignored.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="managedObjects">

+                <in/>

+                <dataType>

+                    <sequence>

+                        <moRef name="ManagedObject"/>

+                    </sequence>

+                </dataType>

+            </parameter>

+            <raisesException name="IllegalArgumentTypeException"/>

+        </action>

+        <action name="addRepertoires">

+            <description>Adds the specifed repertoire to this list. 

+

+If the repertoires exist in the list the repertoire is ignored.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="repertoire">

+                <in/>

+                <dataType>

+                    <sequence>

+                        <moRef name="Repertoire"/>

+                    </sequence>

+                </dataType>

+            </parameter>

+            <raisesException name="IllegalArgumentTypeException"/>

+        </action>

+    </class>

+

+    <class name="MediumAccessUnit">

+        <description>The Medium Access Unit (MAU) MO represents the Ethernet transceiver function on a General Processor Board (GPB).

+

+Note! Ethernet links which are modelled by a MediumAccessUnit MO are used for O&amp;M IP traffic only. MediumAccessUnit MOs must not be configured under a GeneralProcessorUnit MO which have a IpAccessHostGpb referring to it.

+

+Note! This object is known in standards as "MediumAttachmentUnit".

+</description>

+        <attribute name="userLabel">

+            <description>Label for free use.

+</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Description of operational state which has an enumerated datatype</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="MediumAccessUnitId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="connectorLabel">

+            <description>This attribute is used by a management system to show the label on the port the connector is attached to.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <defaultValue>Eth</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDot3StatsLateCollisions">

+            <description>Performance management counter for the number of times that a collision was detected on the interface after the minimum length of a frame.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDot3StatsFCSErrors">

+            <description>Performance management counter for the number of frames that did not pass the FCS check.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="linkSpeed">

+            <description>The Link Speed, measurment unit is Mb/s..</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="duplexMode">

+            <description>The duplex mode used.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="MauDuplexMode">

+                    <defaultValue>FULL_DUPLEX</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="ReliableProgramUniter">

+        <description>A Reliable Program Uniter (RPU) is a controlling and addressing entity providing one common addressing unit for two Reliable Programs. Or more correctly for parts of two Reliable Programs, each part is called a Resource Suite Handler (RSH). The RSH is implemented and owned by the application. It is not a function or a concept within Cello.

+

+MOs of this type are created automatically during system upgrade.

+MOs of this type are possible to create manually but a system upgrade

+is recommended to create them.</description>

+        <attribute name="userLabel">

+            <description>For free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="reliableProgramLabel">

+            <description>Reliable Program Label.

+Compare this to the reliableProgramLabel in LoadModule MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="admActiveSlot">

+            <description>Reference to slot, contains the running "Normal" relation to a slot. If the reference is set to the passive slot, the passive slot will be cleared and only one relation will be set.</description>

+            <mandatory/>

+            <dataType>

+                <moRef name="Slot"/>

+            </dataType>

+        </attribute>

+        <attribute name="admPassiveSlot">

+            <description>Reference to slot, contains the running "Stand-by" relation to a slot. If the reference is set to the active slot or a null value, the passive slot will be cleared. </description>

+            <dataType>

+                <moRef name="Slot"/>

+            </dataType>

+        </attribute>

+        <attribute name="switchOver">

+            <description>This attribute controls when to switchover the RPU, if a certain type error situation occurs.</description>

+            <dataType>

+                <enumRef name="RPUSwitchOverMode">

+                    <defaultValue>AtPiuFault</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="normalisation">

+            <description>This attribute controls when to switch back the RPU, after error recovery has been done.</description>

+            <dataType>

+                <enumRef name="RPUNormalisationMode">

+                    <defaultValue>Automatic</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="replication">

+            <description>This attribute indicates that which level of data replication that is associated with the RPU.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="RPUReplicationMode">

+                    <defaultValue>ApplControlled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalMode">

+            <description>This attribute indicates if the RSH execution mode (active/passive) in the two Reliable Program, matches the normal/stand-by relations set on the corresponding RPU.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="RPUOperationalMode">

+                    <defaultValue>Unavailable</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="ReliableProgramUniterId">

+            <mandatory/>

+            <noNotification/>

+            <nonPersistent/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <action name="switch">

+            <description>This action  will force the two corresponding RSHs to change their execution mode (active/passive). It will lead either to a switchover or to a switchback, depending of what value the operational Mode attribute is showing.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="ActionNotAllowedException"/>

+        </action>

+    </class>

+

+    <class name="ManagedElementData">

+        <description>This object contains attributes and actions on Cello node-level.

+

+The ManagedElementData MO is automatically created and cannot be deleted.

+

+The local distinguished name of this MO is ManagedElement=1, ManagedElementData=1.</description>

+        <systemCreated/>

+        <attribute name="ManagedElementDataId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="autoConfigurationAllowed">

+            <description>This attribute specifies if the system is allowed to auto create detected objects. Note that slots will always be auto created.

+

+Note! When setting this attribute from true to false the system creates a new CV.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="documentServerAddress">

+            <description>The base URL for the documentation server (ALEX). The attribute is read by Element Management application to find the documentation server in the network.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="logonServerAddress">

+            <description>A list of node names or IP addresses of the single logon servers (SLSs). The list uses commas to seperate the single logon server addresses, e.g. "https://SLS1,https://SLS2,https://SLS3", these addresses consists of the URLs to the concerned SLS servers. The attribute is read by Element Management application to find the single logon server in the network.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="dhcpServerAddresses">

+            <description>IP addresses to the DHCP server, used by the DHCP Relay Agent.

+

+Default is an empty array.

+

+Adding and removing addresses is done through the actions addDhcpServerAddress() and removeDhcpServerAddress().

+

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <string>

+                        <defaultValue>empty</defaultValue>

+                    </string>

+                    <length>10</length>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="performanceDataPath">

+            <description>This attribute is used by the internal performance management service 

+to know where to store it's data files. The attribute is the name of 

+a path in the node.

+ 

+Example: /c/public_html/cello/XML_files/</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ntpServerAddressPrimary">

+            <description>This is the IP address to the NTP server</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ntpServiceActivePrimary">

+            <description>This is a boolean that controls if the node should poll the primary NTP server for information.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="ntpMinPollPrimary">

+            <description>This value states the minimum interval (in seconds) for polling the primary NTP server.

+

+Note! This value has to be &gt; 0.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>16</min> <max>131072</max>

+                    </range>

+                    <defaultValue>64</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="ntpMaxPollPrimary">

+            <description>This value states the maximum interval (in seconds) for polling the primary NTP server.

+

+Note! This value has to be &gt; 0.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>16</min> <max>131072</max>

+                    </range>

+                    <defaultValue>1024</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="ntpBurstFlagPrimary">

+            <description>This is the burst flag used towards the primary NTP server.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="ntpServerAddressSecondary">

+            <description>This is an alternative IP address to a NTP server</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ntpServiceActiveSecondary">

+            <description>This is a boolean that controls if the node should poll the secondary NTP server for information.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="ntpMinPollSecondary">

+            <description>This value states the minimum interval (in seconds) for polling the secondary NTP server.

+

+Note! This value has to be &gt; 0.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>16</min> <max>131072</max>

+                    </range>

+                    <defaultValue>64</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="ntpMaxPollSecondary">

+            <description>This value states the maximum interval (in seconds) for polling the secondary NTP server.

+

+Note! This value has to be &gt; 0.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>16</min> <max>131072</max>

+                    </range>

+                    <defaultValue>1024</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="ntpBurstFlagSecondary">

+            <description>This is the burst flag used towards the secondary NTP server.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="nodeUTCTime">

+            <description>This attribute specifies the UTC time used in the node. The attribute value is milliseconds since epoch (January 1, 1970, 00:00:00 GMT).

+The value may only be set while ntpServiceActive both for primary and secondary is false.</description>

+            <dataType>

+                <longlong>

+                    <defaultValue>0</defaultValue>

+                </longlong>

+            </dataType>

+        </attribute>

+        <attribute name="nodeLocalTimeZone">

+            <description>This value states in what time zone the node is located. This attribute is needed by management application to convert UTC time from a log or NTP service to local time.

+It will not change the real time clock on the node.

+

+The timeZone is represented by three characters, example GMT.

+

+Available options are:

+

+TimeZone ID                                              Offset

+GMT  (Greenwich Mean Time)                         0

+UTC   (Coordinated Universal Time)                  0

+ECT   ( Central European Standard Time)        + 1

+EET   (Eastern European Time)                      + 2

+ART   (Eastern European Time)                      + 2

+EAT   (Eastern African Time)                          + 3

+MET   (Iran Time)                                          + 3.5

+NET   (Armenia Time)                                    + 4

+PLT   (Pakistan Time)                                    + 5

+IST    (India Standard Time)                           + 5.5

+BST   (Bangladesh Time)                               + 6

+VST   (Indochina Time)                                  + 7

+CTT   (China Standard Time)                          + 8

+JST   (Japan Standard Time)                          + 9

+CST   (Central Standard Time)                        + 9.5

+EST   (Eastern Standard Time)                       + 10

+AET   (Eastern Standard Time)                       + 10

+SST   (Solomon Is. Time)                                + 11

+NST   (New Zealand Standard Time)               + 12

+CAT   (Central Alaska Time)                          - 1

+AGT   (Argentina Time)                                 - 3

+BET   (Brazil Time)                                        - 3

+CNT   (Newfoundland Standard Time)             - 3.5

+PRT   (Atlantic Standard Time)                       - 4

+IET   (Eastern Standard Time)                        - 5

+ACT   (Central Standard Time)                       - 6

+PNT   (Mountain Standard Time)                    - 7

+MST   (Mountain Standard Time)                    - 7

+PST   (Pacific Standard Time)                        - 8

+AST   (Alaska Standard Time)                        - 9

+HST   (Hawaii Standard Time)                        - 10

+MIT   (West Saoma Time)                              - 11

+--

+

+Reference: http://www.greenwichmeantime.com

+</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="daylightSavingTime">

+            <description>This attribute states weather daylight saving time is used on this node. It is used to by the management application  and will not change the real time clock on the node.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="hdVolumeCSize">

+            <description>The total size of the C volume on the Cello node in bytes. The C volume may be replicated on several hard disks.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="hdVolumeCFreespace">

+            <description>The number of bytes of free space available on the C volume. The C volume may be replicated on several hard disks in a Cello node.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="nodeUniqueID">

+            <description>This is a unique node identity to be set only in the factory.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="swServerUrlList">

+            <description>A list of URLs of  external server for downloading of software. A comma-separated list or URLs, complete with path and name of property file.

+

+Note: For downloading of software for system upgrade, see attribute ftpServerIpAddress in MO UpdradePackage.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="piuGroupEscalationType">

+            <description>The type of node restart when it is a problem with the last PIU in a PIU group.</description>

+            <dataType>

+                <enumRef name="NodeRestartType">

+                    <defaultValue>WARM_AT_PIU_RESTART</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="syncModeOperation">

+            <description>The sync mode operation of the node. Note that this attribute is only relevant when the node contains CBU board. For all other cases the value shall be set to NOT_USED.</description>

+            <dataType>

+                <enumRef name="SyncMode">

+                    <defaultValue>NOT_USED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <action name="createNtpPrimary">

+            <description>This action creates the primary Network Time Protocol. There can only exist one primary and one secondary ntp.

+

+Once the ntp is created it is possible to change the attributes, i.e ip address, burst flag, max- and min poll and which is the active one.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="ntpServerAddressPrimary">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="ntpMinPollPrimary">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <parameter name="ntpMaxPollPrimary">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <parameter name="ntpBurstFlagPrimary">

+                <in/>

+                <dataType>

+                    <boolean/>

+                </dataType>

+            </parameter>

+            <parameter name="ntpServiceActivePrimary">

+                <in/>

+                <dataType>

+                    <boolean/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="createNtpSecondary">

+            <description>This action creates the secondary/alterative Network Time Protocol. 

+There can only exist one primary and one secondary ntp.

+

+Once the ntp is created it is possible to change the attributes, i.e ip address, burst flag, max- and min poll and which is the active one.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="ntpServerAddressSecondary">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="ntpMinPollSecondary">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <parameter name="ntpMaxPollSecondary">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <parameter name="ntpBurstFlagSecondary">

+                <in/>

+                <dataType>

+                    <boolean/>

+                </dataType>

+            </parameter>

+            <parameter name="ntpServiceActiveSecondary">

+                <in/>

+                <dataType>

+                    <boolean/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="deleteNtpPrimary">

+            <description>This action deletes the primary NTP.

+

+An exception will be thrown if the primary attributes are accessed (set and get).

+

+Note! This action requires a transaction.

+</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="deleteNtpSecondary">

+            <description>This action deletes the secondary NTP.

+

+An exception will be thrown if the secondary attributes are accessed (set and get).

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="addDhcpServerAddress">

+            <description>Takes an array of Ip addresses (Strings), and adds them to the list held by the Dhcp Relay Agent fRO.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="ipAddressArray">

+                <description>Elements are assumed to have the format of a String with 4 fields of numerics, each field separated with a dot. E.g. 123.322.34.123. An empty array or empty string in first element is not allowed. Max 10 elements.</description>

+                <in/>

+                <dataType>

+                    <sequence>

+                        <string/>

+                    </sequence>

+                </dataType>

+            </parameter>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="removeDhcpServerAddress">

+            <description>Takes an array of Ip addresses (Strings), and removes them from the list held by the Dhcp Relay Agent fRO.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="ipAddressArray">

+                <description>Elements are assumed to have the format of a String with 4 fields of numerics, each field separated with a dot. E.g. 123.322.34.123. An empty array or empty string in first element is not allowed. Max 10 elements.</description>

+                <in/>

+                <dataType>

+                    <sequence>

+                        <string/>

+                    </sequence>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="setNodeUniqueId">

+            <description>Used for setting the nodeUniqueId attribute. This method should only be used in the factory, i.e. it is not for general use by the operator.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="nodeUniqueId">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+        </action>

+    </class>

+

+    <class name="SwitchExtensionUnit">

+        <description>This MO represents the Switch Extension Unit, SXU, board. The board may only be inserted in slot 2-27 (in a standard subrack).

+If redundant links are used, two boards must be inserted next to each other.

+The board has a number of switch internal link ports.</description>

+        <attribute name="SwitchExtensionUnitId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>This attribute is used to hold a user friendly name of the object if needed.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeStateSil">

+            <description>The administrative state of switch internal link ports on the switch board.

+The attribute refers to all ports (locking will lock all ports, unlocking will unlock all ports).

+SIL- switch internal link.

+

+</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>unlocked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalStateSil">

+            <description>Operational State for all ports. Operational state is enabled if one of  the eight ports is enabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalStateSync">

+            <description>Operational State for network synchronization distribution</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatusSil">

+            <description>The availability state of switch internal link (sil) ports.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatusSync">

+            <description>The availability state of the sync link.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The attribute is set by the action Reserve.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="SilPorts">

+            <description>The attribute provides a list of port numbers. 

+The port number is between 0-7 and is used to read state of  the switch internal port.

+Se action getSilPortState, getSilOperState and getSilAvailState.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <long/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <action name="getSilPortState">

+            <description>Returns status of the switch internal link port.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <enumRef name="SilPortState">

+                    </enumRef>

+            </returnType>

+            <parameter name="portNr">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="getSilOperState">

+            <description>Returns operational status of the switch internal link port.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <enumRef name="OperState">

+                    </enumRef>

+            </returnType>

+            <parameter name="portNr">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="getSilAvailState">

+            <description>Returns availability status of the switch internal link port.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                    <long/>

+            </returnType>

+            <parameter name="portNr">

+                <in/>

+                <dataType>

+                    <long/>

+                </dataType>

+            </parameter>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+    </class>

+

+    <class name="Aal2PathDistributionUnit">

+        <description>This MO is used to represent an AAL2 Path Distribution Unit. Such a unit handles a set of Aal2PathVccTps that belong to the same Aal2 AP and that are handled by the same Path Resource Handling Program.

+This Path Resource Handling Program is referenced by the rpuId attribute.</description>

+        <attribute name="Aal2PathDistributionUnitId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="rpuId">

+            <description>The physical location of a CPS RC (Common Part Sub-Layer Resource Control) program represented by a reference to a ReliableProgramUniter.

+

+Note that one ReliableProgramUniter MO may only be referenced once under one Aal2Ap. That means all Aal2PathDistributionUnits must reference different ReliableProgramUniter MO's.

+

+Two Aal2PathDistributionUnits under different Aal2Ap's may however reference the same ReliableProgramUniter MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ReliableProgramUniter"/>

+            </dataType>

+        </attribute>

+        <attribute name="aal2PathVccTpList">

+            <description>List of references to Aal2PathVccTp MO:s.

+Note that setting of this attribute removes the current list of Aal2PathVccTp's.

+Each reference must be unique among all paths within all Aal2PathDistributionUnit's belonging to the same Aal2Ap.</description>

+            <dataType>

+                <sequence>

+                    <moRef name="Aal2PathVccTp"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <action name="addPath">

+            <description>This action adds a list of Aal2PathVccTps to an Aal2PathDistributionUnit.

+

+If the data contains a reference to a non existing path, the exception InvalidReference is raised.

+

+If the path list contains a path that has a non-unique aal2PathId value, then the exception Aal2PathIdNotUnique is raised. The pathId value must be unique within all Aal2PathDistributionUnits under the same Aal2Ap.

+

+If the path list contains a path that already belongs to a Aal2PathDistributionUnit, then the exception PathAlreadyRegistered is raised.

+

+Note! Adding one or more Aal2PathVccTps using this action updates the attribute 'Aal2PathVccTpList'.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="aal2PathVccTpId">

+                <in/>

+                <dataType>

+                    <sequence>

+                        <moRef name="Aal2PathVccTp"/>

+                    </sequence>

+                </dataType>

+            </parameter>

+            <raisesException name="InvalidReferenceException"/>

+            <raisesException name="Aal2PathIdNotUniqueException"/>

+            <raisesException name="PathAlreadyRegisteredException"/>

+        </action>

+        <action name="removePath">

+            <description>This action removes a list (sequence) of AAL2 path's from the Aal2PathDistributionUnit.

+

+If the path list contains a path that is not in this Aal2PathDistributionUnit, the exception NotInGroup is raised.

+

+Note! Removing one or more Aal2PathVccTps using this action updates the attribute 'Aal2PathVccTpList'.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="aal2PathList">

+                <in/>

+                <dataType>

+                    <sequence>

+                        <moRef name="Aal2PathVccTp"/>

+                    </sequence>

+                </dataType>

+            </parameter>

+            <raisesException name="NotInGroupException"/>

+        </action>

+    </class>

+

+    <class name="Fan">

+        <description>The Fan is used for cooling the Cello-subrack and is connected to one or two

+SCU (switch core board). This MO is used for controlling and sending alarm from

+the Fan.

+

+Note, either the fan can be supplied by Cello and Fan MO is used, or alternatively the fan can supplied by a source external to Cello and therefore a ManagedObject MO is used to represent the fan.

+

+</description>

+        <attribute name="FanId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>user label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrativeState of Fan MO.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="connectedToScu">

+            <description>A Fan must always be connected to a Switch Core unit that mediates the communication with a main processor.

+

+In this attribute it is possible to see which SwichCoreUnit that the fan is connected to.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="SwitchCoreUnit"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state is set to 'enabled' when the Fan has loaded and started its load module.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="piuType">

+            <description>A reference to an available PiuType at create of a Fan.

+</description>

+            <mandatory/>

+            <dataType>

+                <moRef name="PiuType"/>

+            </dataType>

+        </attribute>

+        <attribute name="controllingState">

+            <description>The application that controls the Fan has three main states:

+- standalone: running on itself, not manageable

+- autonomous: manageable state

+- noiseReduced: temporary state with reduced cooling 

+

+NOTE: This attribute is not supported in CPP 4.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="FanState">

+                    <defaultValue>standalone</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="hdlcAddress">

+            <description>The physical address of the RS-485 communication link.

+Incorrect setting of the address can cause collision with other connected auxiliary units or lost connection. The default value should be suitable for most configurations.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>255</max>

+                    </range>

+                    <defaultValue>7</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving MO. </description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <action name="restartFan">

+            <description>A restart will cause the Fan to be initiated, re-booted and all load modules to be reloaded from persistent memory. This is also known as a forced reload.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="restartCause">

+                <in/>

+                <dataType>

+                    <enumRef name="RestartCause">

+                    </enumRef>

+                </dataType>

+            </parameter>

+            <raisesException name="EquipException"/>

+            <raisesException name="ValueOutOfRangeException"/>

+        </action>

+    </class>

+

+    <class name="Mtp2TpItu">

+        <description>This MO represents a MTP2 Termination Point for the ITU standard, as defined in Recommendation Q.703 07/96.

+

+The performance monitoring counters found in Mtp2Itu MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is a hardware fault, aal1 server/adm restart or node restart.

+

+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard 

+which is NOT the ITU standard.

+

+NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.</description>

+        <attribute name="userLabel">

+            <description>Free tag for marking this managed object.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="Mtp2TpItuId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the MTP2 Signalling Terminal.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="mtp2ProfileItuId">

+            <description>Reference to a Mtp2ProfileItu MO.

+

+Note: The bitRate can not be changed.</description>

+            <mandatory/>

+            <noNotification/>

+            <dataType>

+                <moRef name="Mtp2ProfileItu"/>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfReTransmittedOctets">

+            <description>Number of re-transmitted octets.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfNacks">

+            <description>Number of negative acknowledgements received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuReceivedInError">

+            <description>Number of signal units received in error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfStartedRBCongestion">

+            <description>Number of started local RB congestions.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSendBufferOctets">

+            <description>Number of octets in send buffer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLocalSIBTime">

+            <description>Total time in local  SIB (Sending).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmRemoteSIBTime">

+            <description>Total time in remote SIB (Receiving).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSIOSIFTransmitted">

+            <description>Number of SIO &amp; SIF octets transmitted.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The attribute is set by the list of reserving MO's.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Mtp3bSlItu"/>

+            </dataType>

+        </attribute>

+        <attribute name="ds0BundleId">

+            <description>The Ds0Bundle MO that this MO references.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Ds0Bundle"/>

+            </dataType>

+        </attribute>

+        <attribute name="plugInUnitId">

+            <description>The PlugInUnit MO that this MO references.

+It indicates on which processor the Termination Point will be.

+

+Note: The PlugInUnit must be of type GPB.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="PlugInUnit"/>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSUTransmitted">

+            <description>Number of MSUs transmitted.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSIOSIFReceived">

+            <description>Number of SIO and SIF octets received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSUReceived">

+            <description>Number of MSUs received..</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mtp2TpAnsi">

+        <description>This MO represents a MTP2 Termination Point for the ANSI standard , as defined in T1.111-1996.

+

+The performance monitoring counters found in Mtp2Ansi MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is a hardware fault, aal1 server/adm restart or node restart.

+

+NOTE: This MO cannot in anyway be related (either contained by or dependent on) an MO that belongs to a 

+standard which is NOT the ANSI standard.

+

+NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.</description>

+        <attribute name="userLabel">

+            <description>Free tag for marking this managed object.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="Mtp2TpAnsiId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the MTP2 Signalling Terminal.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="mtp2ProfileAnsiId">

+            <description>Reference to a Mtp2ProfileAnsi MO.

+

+Note: The bitRate can not be changed.</description>

+            <mandatory/>

+            <noNotification/>

+            <dataType>

+                <moRef name="Mtp2ProfileAnsi"/>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfReTransmittedOctets">

+            <description>Number of re-transmitted octets.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfNacks">

+            <description>Number of negative acknowledgements received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuReceivedInError">

+            <description>Number of signal units received in error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfStartedRBCongestion">

+            <description>Number of started local RB congestions.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSendBufferOctets">

+            <description>Number of octets in send buffer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLocalSIBTime">

+            <description>Total time in local  SIB (Sending).

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmRemoteSIBTime">

+            <description>Total time in remote SIB (Receiving).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSIOSIFTransmitted">

+            <description>Number of SIO &amp; SIF octets transmitted.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSUReceived">

+            <description>Number of MSUs received..</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Mtp3bSlAnsi"/>

+            </dataType>

+        </attribute>

+        <attribute name="ds0BundleId">

+            <description>The Ds0Bundle MO that this MO references.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Ds0Bundle"/>

+            </dataType>

+        </attribute>

+        <attribute name="plugInUnitId">

+            <description>The PlugInUnit MO that this MO references.

+It indicates on which processor the Termination Point will be.

+

+Note: The PlugInUnit must be of type GPB.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="PlugInUnit"/>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSUTransmitted">

+            <description>Number of MSUs transmitted.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSIOSIFReceived">

+            <description>Number of SIO and SIF octets received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Ds0Bundle">

+        <description>The Ds0Bundle, Digital Signalling Level 0, MO represents a number of timeslots on a physical port.

+Any of E1PhysPathTerm, J1PhysPathTerm, T1PhysPathTerm, E1Ttp or T1Ttp.

+The Ds0Bundle can be used in three different ways:

+

+- Fractional ATM

+

+Please refer to the AtmPort MO for details. Note that the TdmMode attribute

+must be disabled.

+

+-Circuit emulation

+

+Please refer to Aal1VccTp MO for details.  Note that the TdmMode attribute

+must be disabled. Note that only 4 Ds0Bundle's per port can be configured

+when running circuit emulation.

+

+- TDM Switching

+

+The Ds0Bundle is reserved for switching node internal Ds0 connections. In

+this mode, the tdmMode attribute should be enabled.

+

+

+</description>

+        <attribute name="Ds0BundleId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Free tag for marking this managed object.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availabiltity status of Ds0Bundle.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of Ds0Bundle.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="listOfTimeSlots">

+            <description>The list gives the time slots (within ATM traffic fraction) that are to be allocated to the Ds0Bundle.

+

+When a Ds0Bundle is contained by a E1PhysPathTerm the slots that can be placed in this list are 1 to 31. 

+When a Ds0Bundle is contained by a J1PhysPathTerm then the slots that can be placed in this list are 1 to 24.

+When a Ds0Bundle is contained by a T1PhysPathTerm then the slots that can be placed in this list are 1 to 24.

+When a Ds0Bundle is contained by a E1Ttp the slots that can be placed in this list are 1 to 31. 

+

+Note: the same timeslot cannot appear more than once in the list! If a E1/J/T1PhysPathTerm contains more than 

+one Ds0Bundle, then the Ds0Bundles listOfTimeSlots must be mutually exclusive (i.e. slots in one list cannot be used in another list).

+

+Note! If the Ds0Bundle is used for carrying SS7 traffic, the listOfTimeSlots can only contain 1 (one) time slot.

+In this case that is if the Ds0Bundle is reserved by an Mtp2TpAnsi, Mtp2TpItu or Mtp2TpChina.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <sequence>

+                    <long>

+                        <range>

+                            <min>0</min> <max>31</max>

+                        </range>

+                    </long>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="tdmMode">

+            <description>The state of tdmMode (Time Division Multiplexing), can be disabled/enabled.

+

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <boolean/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Aal1TpVccTp">

+        <description>The Aal1TpVccTp MO represents the Aal1 interworking function in a circuit emulation. The object refers to a Ds0Bundle which represents one end of the circuit emulation, and a VclTp which represents the other end.

+

+Note! The performance monitoring counters in this MO is set to 0 when counterMode is set to PM_MODE_ON.

+In PM_MODE_OFF no information at all is retrived. So any value for pm-monitoring is measured from the time

+of setting counterMode to PM_MODE_ON. 

+At node restart these performance monitoring counters is reset to 0.</description>

+        <attribute name="userLabel">

+            <description>Free tag for marking this managed object.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ds0BundleId">

+            <description>The Ds0Bundle MO that this MO references.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Ds0Bundle"/>

+            </dataType>

+        </attribute>

+        <attribute name="partialFill">

+            <description>Indicates how many bytes are filled in each ATM cell. The value 47 indicates that the partial filled cells is not used, i.e. all the cells are filled completely.

+

+Partial filling of cells in used in circuit emulation. It is used to reduce packetisation delay. Refer to the ATM Forum specifications for more details.

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>23</min> <max>47</max>

+                    </range>

+                    <defaultValue>47</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="cdvt">

+            <description>Specifies the cell delay variation tolerance. Refer to ATM Forum specifications for more details.

+

+Unit is micro seconds.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>100</min> <max>4000</max>

+                    </range>

+                    <defaultValue>1000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of Aal1TpVccTp.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="continuityCheck">

+            <description>Continuitiy checking means that a cell is sent downstream when no user cell has been sent for a period of nominally 1 second.

+

+Activates VC end to end continuityCheck according to ITU.T rec I.610.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="counterMode">

+            <description>Controls the activation of PM counters and F5 PM flow on the VC connection.</description>

+            <dataType>

+                <enumRef name="AtmCounterMode">

+                    <defaultValue>PM_MODE_OFF</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="nomPmBlockSize">

+            <description>Nominal performance monitoring (PM) blocksize. The minimum number of ATM cells to send before sending a Forward Performance Monitoring, FPM, cell.</description>

+            <dataType>

+                <enumRef name="AtmNomPmBlkSize">

+                    <defaultValue>NOM_PM_BLKSIZE_2_10</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwLostCells">

+            <description>Performance monitoring counter for forwarded lost cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwMissinsCells">

+            <description>Performance monitoring counter for number of forwarded missinserted cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmFwErrBlocks">

+            <description>Performance monitoring counter for number of forwarded errored blocks.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLostFpmCells">

+            <description>Performance monitoring counter for number of lost Forward Performance Monitoring, FPM cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwLostCells">

+            <description>Performance monitoring counter for number of lost backward cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwMissinsCells">

+            <description>Performance monitoring counter for number of backward missinserted cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmBwErrBlocks">

+            <description>Performance monitoring counter for number of backward errored blocks.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmLostBrCells">

+            <description>Performance monitoring counter for number of lost Backward Reporting, BR, cells.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="Aal1TpVccTpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="vclTpId">

+            <description>The VclTp MO that this MO references.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="VclTp"/>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="alarmReport">

+            <description>Attribute to decide what type of alarms to be reported.</description>

+            <dataType>

+                <enumRef name="AlarmReport">

+                    <defaultValue>ALARM_LOC</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mtp3bSpAnsi">

+        <description>Mtp3b Signalling Point for the ANSI standard.

+

+This MO represents/models the MTP3b Signaling Point characteristics/functions according to the Ansi standard. 

+A signaling point is a logical node in the signaling network. The combination of signaling points and their interconnecting 

+signaling links form the SS No. 7 signaling network. The signaling point represented by this object is a Local Signaling Point.

+

+The performance monitoring counters found in Mtp3SpAnsi MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).

+

+NOTE: IT IS NOT POSSIBLE TO CREATE SIGNALLING POINTS OF DIFFERENT STANDARDS!

+

+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the ANSI standard.

+

+NOTE: The combination of network indicator (networkInd) and Signalling Point Code (signallingPointCode) has to be unique for each Signalling Point.

+

+NOTE: A maximum of 15 instances of this MO can be created on (referencing) the same PlugInUnit.

+

+NOTE: The maximum number of Signalling Points that can be created in a CPP based node is 24.

+

+NOTE: Deleting a singel L3 Signal Point is not possible, if it necessary to delete a Signal Point then all Signal Points has to be deleted. This also has to be done whitin the same transaction. 

+

+NOTE: Any object created under a certain SP (Signaling Point) cannot refer to an object created under another SP. Nor can it refer to an object created under another SP.</description>

+        <attribute name="Mtp3bSpAnsiId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="rpuId">

+            <description>Holds a reference to the Reliable Program Uniter. 

+The RPU is at the server.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ReliableProgramUniter"/>

+            </dataType>

+        </attribute>

+        <attribute name="networkInd">

+            <description>The network indicator, NI, is used for discrimination of messages between functionally different networks.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="Mtp3bNetworkInd">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="signallingPointCode">

+            <description>The signallingPointCode (Local Point Code) attribute (SPC) is used together with the network indicator (NI, networkInd attribute) to uniquely identify the MTP Signalling Point, SP.

+SP = NI-SPC.

+Size (2 exp 24)-1 (16777215). 

+The SignallingPointCode (SPC) is normally grouped together as three numbers wich correspond to network identifier, network cluster, network cluster member. The three numbers are coded as 8-8-8 bits in the total SPC. To enter the SPC-value, you have to convert the 3 numbers to their binary code and then convert the whole 24-bit  patterna as an integer. Sometimes the SPC is used as a whole uniqe number (no internal structure).

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>16777215</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="testPatternSltm">

+            <description>The testPatternSltm attribute represents a string testpattern in the Signalling Link Test Message.

+

+Minimum string length 2 characters, maximum 30 characters. Allowed characters are 0-9, A-F.

+Only even number of characters is allowed.</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>2</min> <max>30</max>

+                    </lengthRange>

+                    <defaultValue>"A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5"</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="nodeBehaviour">

+            <description>The nodeBehaviour attribute represents the MTP3b node type.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="NodeBehaviourType">

+                    <defaultValue>SEP</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="maxSizeReroutBuf">

+            <description>The maxSizeReroutBuf attribute represents the maximum size (in kB) of the rerouting buffer.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>5000</max>

+                    </range>

+                    <defaultValue>2000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxSizeChangeBuf">

+            <description>The maxSizeChangeBuf attribute represents the maximum size (in kB) of the changeover buffer.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>5000</max>

+                    </range>

+                    <defaultValue>2000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="transFrHandler">

+            <description>Determines how a TransFer Restricted signal (TFR) should be treated.

+</description>

+            <dataType>

+                <enumRef name="Mtp3bTfrHandling">

+                    <defaultValue>IGNORED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="sioSpare">

+            <description>The sioSpare2 attribute determines if the two spare bits in the SIO (Service Information Octet) should be treated as spare.</description>

+            <dataType>

+                <enumRef name="Mtp3bSioSpareBitsUse">

+                    <defaultValue>PRIO</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="m3uaNoOfAttempsOfDauds">

+            <description>For M3UA, number of attempts to send the DAUD message.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>5</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="noOfAttempsOfAssociationEstablishment">

+            <description>Number of attempts to send the SCTP_ASSOCIATE_REQ message.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>65535</max>

+                    </range>

+                    <defaultValue>4</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="statusIndInterval">

+            <description>The statusIndInterval attribute sets the interval for sending MTP-STATUS indication, i.e. send indication every Nth message .</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                    <defaultValue>4</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="resendTfcInterval">

+            <description>Send TFC back to originating signalling point code for every n:th message when 

+the destination is congested. Set to 0 will suppress sending of TFC.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                    <defaultValue>8</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="sendSltmBefLink">

+            <description>The sendSltmBefLink attribute determines if the SLTM (Signalling Link Test Message) should be sent and a SLTA received before the link is considered to be in service.

+

+Note! It is not recommended nor is it in accordance with standard to set the value of this attribute to 'false' </description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="spPriority">

+            <description>Struct containing the ANSI priority attributes.

+</description>

+            <dataType>

+                <structRef name="Mtp3bSpAnsiPriorityData"/>

+            </dataType>

+        </attribute>

+        <attribute name="noOfCongestLevelForNI">

+            <description>Defines the number of congestion levels for NI.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>3</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="routeSetCongestTestFlag">

+            <description>Selection of which procedure to use during congestion handling if the national option with priorities is used.

+

+0, use TcTimer as described by the TTC standard.

+1, use Route Set Congestion Test as described by the ANSI, ITU and China Standard.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>1</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operationalState attribute reflects the operational status of the MTP3b SP.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="spTimer">

+            <description>Struct containing ANSI specific timer data.</description>

+            <dataType>

+                <structRef name="Mtp3bSpAnsiTimerData"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Holds a list of the reserving MO's. Can be of type SccpSp.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfForcedRerouteSuccessPerf">

+            <description>Performance monitoring counter for number of successfully performed forced rerouting.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfControlledRerouteSuccessPerf">

+            <description>Performance monitoring counter for number of successfully performed controlled rerouting.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfEmergencyChangeOverRec">

+            <description>Performance management counter for number of received emergency changeOver orders (ECO) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfChangeOverRec">

+            <description>Performance counter for number of changeOver order messages (COO/XCO) received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfChangeBackDeclRec">

+            <description>Performance management counter for number of received change Back Declarations (CBD) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSLTAFirstTimeOutRec">

+            <description>Performance management counter for number of SLTA first time out received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSLTASecondTimeOutRec">

+            <description>Performance management counter for number of SLTA second time out received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUPMsgDiscardedDueToRoutingErr">

+            <description>Performance monitoring counter for number of UP (user part) messages (MTP_TRANSFER_req) discarded due to routing error.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOAXCASent">

+            <description>Performance management counter for number of sent COA/XCA messages.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECOSent">

+            <description>Performance management counter for number of sent ECO messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECASent">

+            <description>Performance management counter for number of sent ECA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOAXCARec">

+            <description>Performance management counter for number of  received COA/XCA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBARec">

+            <description>Performance management counter for number of received CBA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECARec">

+            <description>Performance management counter for number of received ECA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTRARec">

+            <description>Performance management counter for number of received TRA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTRASent">

+            <description>Performance management counter for number of sent TRA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTimerT21WasStarted">

+            <description>Performance monitoring counter for number of times the timer T21 was started (i.e. how many times the remote inhibit test message has been sent).

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBASent">

+            <description>Performance management counter for number of sent CBA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessForcedRerouting">

+            <description>Performance monitoring counter for number of unsuccessfully performed forced reroutings.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessControlledRerouting">

+            <description>Performance monitoring counter for number of unsuccessfully performed controlled reroutings.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuccessAssocEstablish">

+            <description>Performance management counter for number of successful association establishment.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessAssocEstablish">

+            <description>Performance management counter for number of unsuccessful association establishment.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpCommunicationErr">

+            <description>Performance management counter for number of SCTP communication error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpSendFailure">

+            <description>Performance management counter for number of SCTP send failure.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpBufOverflow">

+            <description>Performance management counter for number of SCTP stop sending data.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpResumeSending">

+            <description>Performance management counter for number of SCTP resume sending data.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpNetworkStatusChange">

+            <description>Performance management counter for number of SCTP network status change.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpAssociationRestart">

+            <description>Performance management counter for number of SCTP association restart.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuccessAssocAbort">

+            <description>The number of successful abortions of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuccessAssocShutDown">

+            <description>The number of succesful shutdowns of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessAssocAbort">

+            <description>The number of unsuccessful abortions of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessAssocShutDown">

+            <description>The number of unsuccesful shutdowns of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIncomingAssocEstabRequestInStateDownWhenStateEstabIsBlocked">

+            <description>The number of incoming request for association establishment when state on the association is 'DOWN' and  establishment of associations is blocked. </description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMaxTrialsForAssocEstabReached">

+            <description>The number of times that the max limit for trying to establish an association has been reached.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMaxTrialsForAssocActivReached">

+            <description>The number of times that the max limit for trying to activate an association has been reached.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLowerPrioMsgDiscarded">

+            <description>The number of messages with low priority that has been discarded.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mtp3bSpItu">

+        <description>Mtp3b Signalling Point for the ITU standard.

+

+This MO represents/models the MTP3b Signaling Point characteristics/functions according to the ITU standard. 

+A signaling point is a logical node in the signaling network. The combination of signaling points and their interconnecting 

+signaling links form the SS No. 7 signaling network. The signaling point represented by this object is a Local Signaling Point.

+

+The performance monitoring counters found in Mtp3SpItu MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).

+

+NOTE: IT IS NOT POSSIBLE TO CREATE SIGNALLING POINTS OF DIFFERENT STANDARDS!

+

+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the ITU standard.

+

+NOTE: The combination of network indicator (networkInd) and Signalling Point Code (signallingPointCode) has to be unique for each Signalling Point.

+

+NOTE: A maximum of 15 instances of this MO can be created on (referencing) the same PlugInUnit.

+

+NOTE: The maximum number of Signalling Points that can be created in a CPP based node is 24.

+

+NOTE: Deleting a singel L3 Signal Point is not possible, if it necessary to delete a Signal Point then all Signal Points has to be deleted. This also has to be done whitin the same transaction.

+

+NOTE: Any object created under a certain SP (Signaling Point) cannot refer to an object created under another SP. Nor can it refer to an object created under another SP.

+

+NOTE: The value of the attribute 'version' is valid for all SPs (Mtp3bSpItu MOs) and the value of the last created or changed SP will be used for all SPs.</description>

+        <attribute name="Mtp3bSpItuId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="networkInd">

+            <description>The networkInd attribute (NI) is used by signalling message handling functions in MTP3b 

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="Mtp3bNetworkInd">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="signallingPointCode">

+            <description>The signallingPointCode (Local Point Code) attribute (SPC) is used together with the network indicator (NI, networkInd attribute) to uniquely identify the MTP Signalling Point, SP.

+SP = NI-SPC.

+Size (2 exp 14)-1 (16383).

+The SignallingPointCode (SPC) is normally used as a whole unique number (no internal structure). But sometimes the SPC is grouped together as three numbers which corresponds to zone, area/network, signalling point. If this is the case the three numbers are coded as 3-8-3 bits in the total SPC. To enter the SPC-value then you have to convert the three numbers to their binary code and then convert the whole 14-bit pattern as an integer.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>16383</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="version">

+            <description>This attribute shows what MTP3b ITU standard the system follows. With ITU, it is possible using this attribute to set which of the ITU standard versions that shall be followed.

+

+Note! Setting of another value than 'ITU_T_07_96' at create will have no effect. The Signaling Point will always be created with the value 'ITU_T_07_96'.

+

+Note! It is not possible to hav signaling points with different versions in the node so setting of this attribute will effect all signaling points. The value for the last created or changed signaling point will be used for all signaling points.</description>

+            <dataType>

+                <enumRef name="Mtp3bItuVersion">

+                    <defaultValue>ITU_T_07_96</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="nodeBehaviour">

+            <description>The nodeBehaviour attribute represents the MTP3b node type.

+

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="NodeBehaviourType">

+                    <defaultValue>SEP</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="noOfCongestLevelForNI">

+            <description>Defines the number of congestion levels for NI.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>3</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="routeSetCongestTestFlag">

+            <description>Selection of which procedure to use during congestion handling if the national option with priorities is used.

+

+0, use TcTimer as described by the TTC standard.

+1, use Route Set Congestion Test as described by the ANSI, ITU and China Standard.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>1</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="resendTfcInterval">

+            <description>Send TFC back to originating signalling point code for every n:th message when 

+the destination is congested. Set to 0 will suppress sending of TFC.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                    <defaultValue>8</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxSizeReroutBuf">

+            <description>The maxSizeReroutBuf attribute represents the maximum size (in kB) of the rerouting buffer.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>5000</max>

+                    </range>

+                    <defaultValue>2000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxSizeChangeBuf">

+            <description>The maxSizeChangeBuf attribute represents the maximum size (in kB) of the changeover buffer.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>5000</max>

+                    </range>

+                    <defaultValue>2000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="transFrHandler">

+            <description>Determines if a TransFer Restricted signal (TFR) should be treated as a TFA (TransFer Allowed signal) or be ignored.

+</description>

+            <dataType>

+                <enumRef name="Mtp3bTfrHandling">

+                    <defaultValue>IGNORED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="sioSpare">

+            <description>The sioSpare2 attribute determines if the two spare bits in the SIO (Service Information Octet) should be treated as spare.</description>

+            <dataType>

+                <enumRef name="Mtp3bSioSpareBitsUse">

+                    <defaultValue>PRIO</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="statusIndInterval">

+            <description>The statusIndInterval attribute sets the interval for sending MTP-STATUS indication, i.e. send indication every Nth message .</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                    <defaultValue>4</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="sendSltmBefLink">

+            <description>The sendSltmBefLink attribute determines if the SLTM (Signalling Link Test Message) should be sent and a SLTA received before the link is considered to be in service.

+

+Note! It is not recommended nor is it in accordance with standard to set the value of this attribute to 'false' </description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="testPatternSltm">

+            <description>The testPatternSltm attribute represents a string testpattern in the Signalling Link Test Message.

+

+Minimum string length 2 characters, maximum 30 characters. Allowed characters are 0-9, A-F.

+Only even number of characters is allowed.

+

+</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>2</min> <max>30</max>

+                    </lengthRange>

+                    <defaultValue>"A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5"</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="spPriority">

+            <description>Struct containing the priority attributes.

+</description>

+            <dataType>

+                <structRef name="Mtp3bSpItuPriorityData"/>

+            </dataType>

+        </attribute>

+        <attribute name="spTimer">

+            <description>Struct containing ITU specific timer attributes</description>

+            <dataType>

+                <structRef name="Mtp3bSpItuTimerData"/>

+            </dataType>

+        </attribute>

+        <attribute name="rpuId">

+            <description>Holds a reference to the Reliable Program Uniter.

+The RPU is at the server.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ReliableProgramUniter"/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operationalState attribute reflects the operational status of the MTP3b SP.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="m3uaNoOfAttempsOfDauds">

+            <description>For M3UA, number of attempts to send the DAUD message.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>5</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="noOfAttempsOfAssociationEstablishment">

+            <description>Number of attempts to send the SCTP_ASSOCIATE_REQ message.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>65535</max>

+                    </range>

+                    <defaultValue>4</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Holds a list of the reserving MO's. Can be of type SccpSp.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfForcedRerouteSuccessPerf">

+            <description>Performance monitoring counter for number of successfully performed forced rerouting.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfControlledRerouteSuccessPerf">

+            <description>Performance monitoring counter for number of successfully performed controlled rerouting.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfEmergencyChangeOverRec">

+            <description>Performance management counter for number of received emergency changeOver orders (ECO) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfChangeOverRec">

+            <description>Performance counter for number of changeOver order messages (COO/XCO) received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfChangeBackDeclRec">

+            <description>Performance management counter for number of received change Back Declarations (CBD) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSLTAFirstTimeOutRec">

+            <description>Performance management counter for number of SLTA first time out received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSLTASecondTimeOutRec">

+            <description>Performance management counter for number of SLTA second time out received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUPMsgDiscardedDueToRoutingErr">

+            <description>Performance monitoring counter for number of UP (user part) messages (MTP_TRANSFER_req) discarded due to routing error.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOAXCASent">

+            <description>Performance management counter for number of sent COA/XCA messages.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECOSent">

+            <description>Performance management counter for number of sent ECO messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECASent">

+            <description>Performance management counter for number of sent ECA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOAXCARec">

+            <description>Performance management counter for number of  received COA/XCA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBARec">

+            <description>Performance management counter for number of received CBA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECARec">

+            <description>Performance management counter for number of received ECA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTRARec">

+            <description>Performance management counter for number of received TRA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTRASent">

+            <description>Performance management counter for number of sent TRA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTimerT21WasStarted">

+            <description>Performance monitoring counter for number of times the timer T21 was started (i.e. adjacent SP restarted).

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBASent">

+            <description>Performance management counter for number of sent CBA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessForcedRerouting">

+            <description>Performance monitoring counter for number of unsuccessfully performed forced reroutings.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessControlledRerouting">

+            <description>Performance monitoring counter for number of unsuccessfully performed controlled reroutings.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuccessAssocEstablish">

+            <description>Performance management counter for number of successful association establishment.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessAssocEstablish">

+            <description>Performance management counter for number of unsuccessful association establishment.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpCommunicationErr">

+            <description>Performance management counter for number of SCTP communication error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpSendFailure">

+            <description>Performance management counter for number of SCTP send failure.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpBufOverflow">

+            <description>Performance management counter for number of SCTP stop sending data.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpResumeSending">

+            <description>Performance management counter for number of SCTP resume sending data.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpNetworkStatusChange">

+            <description>Performance management counter for number of SCTP network status change.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpAssociationRestart">

+            <description>Performance management counter for number of SCTP association restart.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuccessAssocAbort">

+            <description>The number of successful abortions of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuccessAssocShutDown">

+            <description>The number of succesful shutdowns of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessAssocAbort">

+            <description>The number of unsuccessful abortions of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessAssocShutDown">

+            <description>The number of unsuccesful shutdowns of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIncomingAssocEstabRequestInStateDownWhenStateEstabIsBlocked">

+            <description>The number of incoming request for association establishment when state on the association is 'DOWN' and  establishment of associations is blocked. </description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMaxTrialsForAssocEstabReached">

+            <description>The number of times that the max limit for trying to establish an association has been reached.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMaxTrialsForAssocActivReached">

+            <description>The number of times that the max limit for trying to activate an association has been reached.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLowerPrioMsgDiscarded">

+            <description>The number of messages with low priority that has been discarded.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mtp3bSpTtc">

+        <description>Mtp3b Signalling Point for the TTC standard.

+

+This MO represents/models the MTP3b Signaling Point characteristics/functions according to the TTC standard. 

+A signaling point is a logical node in the signaling network. The combination of signaling points and their interconnecting 

+signaling links form the SS No. 7 signaling network. The signaling point represented by this object is a Local Signaling Point.

+

+The performance monitoring counters found in Mtp3SpTtc MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).

+

+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a 

+standard which is NOT the TTC standard.

+

+NOTE: IT IS NOT POSSIBLE TO CREATE SIGNALLING POINTS OF DIFFERENT STANDARDS!

+

+NOTE: The combination of network indicator (networkInd) and Signalling Point Code (signallingPointCode) has to be unique for each Signalling Point.

+

+NOTE: A maximum of 15 instances of this MO can be created on (referencing) the same PlugInUnit.

+

+NOTE: The maximum number of Signalling Points that can be created in a CPP based node is 24.

+

+NOTE: Deleting a singel L3 Signal Point is not possible, if it necessary to delete a Signal Point then all Signal Points has to be deleted. This also has to be done whitin the same transaction.

+

+NOTE: Any object created under a certain SP (Signaling Point) cannot refer to an object created under another SP. Nor can it refer to an object created under another SP.</description>

+        <attribute name="Mtp3bSpTtcId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="networkInd">

+            <description>The networkInd attribute (NI) is used by signalling message handling functions in MTP3b.

+ 

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="Mtp3bNetworkIndTtc">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="signallingPointCode">

+            <description>The signallingPointCode (Local Point Code) attribute (SPC) is used together with the network indicator (NI, networkInd attribute) to uniquely identify the MTP Signalling Point, SP.

+SP = NI-SPC.

+Size (2 exp 16)-1 (65535).

+The SignallingPointCode (SPC) is always used as a whole unique number (no internal structure).</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="nodeBehaviour">

+            <description>The nodeBehaviour attribute represents the MTP3b node type.

+

+Note! Only SEP and STP is supported for the Ttc standard.

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="NodeBehaviourType">

+                    <defaultValue>SEP</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="routeSetCongestTestFlag">

+            <description>Selection of which procedure to use during congestion handling if the national option with priorities is used.

+

+0, use TcTimer as described by the TTC standard.

+1, use Route Set Congestion Test as described by the ANSI, ITU and China Standard.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>1</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="resendTfcInterval">

+            <description>Send TFC back to originating signalling point code for every n:th message when 

+the destination is congested. Set to 0 will suppress sending of TFC.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                    <defaultValue>8</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxSizeReroutBuf">

+            <description>The maxSizeReroutBuf attribute represents the maximum size (in kB) of the rerouting buffer.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>5000</max>

+                    </range>

+                    <defaultValue>2000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxSizeChangeBuf">

+            <description>The maxSizeChangeBuf attribute represents the maximum size (in kB) of the changeover buffer.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>5000</max>

+                    </range>

+                    <defaultValue>2000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="statusIndInterval">

+            <description>The statusIndInterval attribute sets the interval for sending MTP-STATUS indication, i.e. send indication every Nth message .</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                    <defaultValue>4</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="testPatternSltm">

+            <description>The testPatternSltm attribute represents a string testpattern in the Signalling Link Test Message.

+

+String length 4 characters. Allowed characters are 0-9, A-F.

+

+</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>4</min> <max>4</max>

+                    </lengthRange>

+                    <defaultValue>"7711"</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="spPriority">

+            <description>Struct containing the TTC priority attributes.

+</description>

+            <dataType>

+                <structRef name="Mtp3bSpTtcPriorityData"/>

+            </dataType>

+        </attribute>

+        <attribute name="rpuId">

+            <description>Holds a reference to the Reliable Program Uniter.

+The RPU is at the server.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ReliableProgramUniter"/>

+            </dataType>

+        </attribute>

+        <attribute name="spTimer">

+            <description>Struct containing TTC timer attributes.</description>

+            <noNotification/>

+            <dataType>

+                <structRef name="Mtp3bSpTtcTimerData"/>

+            </dataType>

+        </attribute>

+        <attribute name="noOfCongestLevelForNI">

+            <description>Defines the number of congestion levels for NI.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>3</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operationalState attribute reflects the operational status of the MTP3b SP.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Holds a list of the reserving MO's. Can be of type SccpSp.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfForcedRerouteSuccessPerf">

+            <description>Performance monitoring counter for number of successfully performed forced rerouting.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfControlledRerouteSuccessPerf">

+            <description>Performance monitoring counter for number of successfully performed controlled rerouting.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfEmergencyChangeOverRec">

+            <description>Performance management counter for number of received emergency changeOver orders (ECO) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfChangeOverRec">

+            <description>Performance counter for number of changeOver order messages (COO/XCO) received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfChangeBackDeclRec">

+            <description>Performance management counter for number of received change Back Declarations (CBD) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSLTAFirstTimeOutRec">

+            <description>Performance management counter for number of SLTA first time out received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSLTASecondTimeOutRec">

+            <description>Performance management counter for number of SLTA second time out received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUPMsgDiscardedDueToRoutingErr">

+            <description>Performance monitoring counter for number of UP (user part) messages (MTP_TRANSFER_req) discarded due to routing error.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOAXCASent">

+            <description>Performance management counter for number of sent COA/XCA messages.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECOSent">

+            <description>Performance management counter for number of sent ECO messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECASent">

+            <description>Performance management counter for number of sent ECA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOAXCARec">

+            <description>Performance management counter for number of received COA/XCA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBARec">

+            <description>Performance management counter for number of received CBA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECARec">

+            <description>Performance management counter for number of received ECA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTRARec">

+            <description>Performance management counter for number of received TRA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTRASent">

+            <description>Performance management counter for number of sent TRA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBASent">

+            <description>Performance management counter for number of sent CBA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessForcedRerouting">

+            <description>Performance monitoring counter for number of unsuccessfully performed forced reroutings.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessControlledRerouting">

+            <description>Performance monitoring counter for number of unsuccessfully performed controlled reroutings.

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuccessAssocEstablish">

+            <description>Performance management counter for number of successful association establishment.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessAssocEstablish">

+            <description>Performance management counter for number of unsuccessful association establishment.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpCommunicationErr">

+            <description>Performance management counter for number of SCTP communication error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpSendFailure">

+            <description>Performance management counter for number of SCTP send failure.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpBufOverflow">

+            <description>Performance management counter for number of SCTP stop sending data.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpResumeSending">

+            <description>Performance management counter for number of SCTP resume sending data.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpNetworkStatusChange">

+            <description>Performance management counter for number of SCTP network status change.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpAssociationRestart">

+            <description>Performance management counter for number of SCTP association restart.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mtp3bSlAnsi">

+        <description>This MO represents  an MTP3b Signalling Link for the ANSI standard. It represents the termination of the signalling link within the signalling point as defined in T1.111-1996.

+

+The total amount of links between any two specific nodes in the network shall not be more than 80 independent on how many linksets that are defined between the two nodes. The signalLinkCode for a link must be unique between the nodes, independent on which linkSet the link belongs to. A maximum of five linksets with a maximum of 16 links in each linkset can be configured. A maximum of 16 links between two adjacent nodes can be configured.

+

+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the ANSI standard.

+

+The performance monitoring counters found in Mtp3SlAnsi MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).</description>

+        <attribute name="Mtp3bSlAnsiId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>This attribute reflects the operational status of the Mtp3bSlAnsi.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="tpId">

+            <description>The tpId attribute points out the termination point of the lower layer protocol.

+

+For narrowband this signalling link will be connected to an MTP L2 termination point (Mtp2Tp MO). And for broadband it will be connected to a NNI SAAL termination point (NniSaalTp Mo).</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="linkState">

+            <description>The link state of the Mtp3bSlAnsi.

+

+The link state is a bit map which contains a combination of the following values: (in hexadecimal format)

+

+0x00 Available

+0x01 Failed 

+0x02 Remotely blocked

+0x04 Locally blocked

+0x08 Remotely inhibited

+0x10 Locally inhibited

+0x20 Deactivated</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="usageState">

+            <description>There are three possible states for the usageState attribute:

+

+- idle, the Mtp3bSl carries no traffic.

+- active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.

+- busy, the Mtp3bSl is working but is congested (traffic is routed on other links).

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bUsageState">

+                    <defaultValue>IDLE</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="signLinkCode">

+            <description>The signalling link code, SLC, used for this link.

+The signLinkCode for a link must be unique between the nodes,

+independent on in which linkSet the link belongs.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>15</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="proceduralState">

+            <description>The procedural state of the link.

+

+0 - not initialized

+1 - initialized

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bProceduralState">

+                    <defaultValue>NOT_INITIALIZED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="linkCongestLevel">

+            <description>The congestion level of the link.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="CongestLevel">

+                    <defaultValue>level_0</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="autoStartLink">

+            <description>Controls if the Mtp3bSL should be activated at create.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAALINServiceInd">

+            <description>Performance management counter for number of received link-in-service indications.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAALOUTInd">

+            <description>Performance management counter for number of received link-out-of-service indications.

+

+Note! This counter is incremented every time a link out of service indication is received for the link.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOOXCOSent">

+            <description>Performance management counter for number of sent change over order (COO/XCO) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBDSent">

+            <description>Performance management counter for number of sent CBD messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLocalLinkCongestRec">

+            <description>Performance monitoring counter for number of local link congestion primitives received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLocalLinkCongestCeaseRec">

+            <description>Performance monitoring counter for number of local link congestion ceased primitives received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSURec">

+            <description>Performance monitoring counter for number of received MSU's on this signalling link.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSUSent">

+            <description>Performance monitoring counter for number of sent MSU's on this signalling link.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <action name="deactivate">

+            <description>This action deactivates the signalling link.

+ It will also set autoStartLink = false.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="activate">

+            <description>This action activates the signalling link with normal alignment. It will also set autoStartLink = true.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="emergencyActivate">

+            <description>This action activates the signalling link with emergency alignment.

+ It will also set autoStartLink = true

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="localInhibit">

+            <description>This action inhibits the Mtp3bSlAnsi. Signalling link management inhibiting is requested by management when it becomes necessary, e.g for maintenance or testing purposes to make or keep a signalling link unavailable to User Part-generated signalling traffic.

+Inhibiting of a signalling link may be requested by management function at either end of the link. The request is granted, provided that the inhibiting action does not cause any previously accessible destinations to become inaccessible at either end of the signalling link. The request may also be refused under certain circumstances such as congestion.

+Exception FroRequestFailed if it was not possible to inhibit.

+

+Note! This action requires a transaction.

+</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="localUninhibit">

+            <description>This action uninhibits the Mtp3bSlAnsi.

+

+Exception FrorequestFailed if it was not possible to uninhibit.

+

+Note! This action requires a transaction.

+</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+    </class>

+

+    <class name="Mtp3bSlItu">

+        <description>This MO represents  an MTP3b Signalling Link for the ITU standard. It represents the termination of the signalling link within the signalling point as defined in Q.704 and Q.2210 (07/96).

+

+The total amount of links between any two specific nodes in the network shall not be more than 16, independent on how many linksets that are defined between the two nodes. The signalLinkCode for a link must be unique between the nodes, independent on which linkSet the link belongs to. 

+

+The performance monitoring counters found in Mtp3SlItu MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).

+

+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the ITU standard.</description>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="tpId">

+            <description>The tpId attribute points out the termination point of the lower layer protocol.

+

+For narrowband this signalling link will be connected to an MTP L2 termination point (Mtp2Tp MO). And for broadband it will be connected to a NNI SAAL termination point (NniSaalTp Mo).</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>This attribute reflects the operational status of the Mtp3bSl.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="linkState">

+            <description>The link state of the Mtp3bSl.

+

+The link state is a bit map which contains a combination of the following values: (in hexadecimal format)

+

+0x00 Available

+0x01 Failed 

+0x02 Remotely blocked

+0x04 Locally blocked

+0x08 Remotely inhibited

+0x10 Locally inhibited

+0x20 Deactivated</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="usageState">

+            <description>There are three possible states for the usageState attribute:

+

+- idle, the Mtp3bSl carries no traffic.

+- active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.

+- busy, the Mtp3bSl is working but is congested (traffic is routed on other links).

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bUsageState">

+                    <defaultValue>IDLE</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="signLinkCode">

+            <description>The signalling link code, SLC, used for this link.

+The signLinkCode for a link must be unique between the nodes,

+independent on in which linkSet the link belongs.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>15</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="proceduralState">

+            <description>The procedural state of the link.

+

+0 - not initialized

+1 - initialized

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bProceduralState">

+                    <defaultValue>NOT_INITIALIZED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="linkCongestLevel">

+            <description>The congestion level of the link.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="CongestLevel">

+                    <defaultValue>level_0</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="autoStartLink">

+            <description>Controls if the Mtp3b Signalling Link should be activated at create.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="prioBeforeSio">

+            <description>This Boolean tells if the message priority shall be inserted in an octet before the Service Indicator Octet (SIO).

+

+ITU default is false.

+</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAALINServiceInd">

+            <description>Performance management counter for number of received link-in-service indications.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAALOUTInd">

+            <description>Performance management counter for number of received link-out-of-service indications.

+

+Note! This counter is incremented every time a link out of service indication is received for the link.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOOXCOSent">

+            <description>Performance management counter for number of sent change over order (COO/XCO) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBDSent">

+            <description>Performance management counter for number of sent CBD messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLocalLinkCongestRec">

+            <description>Performance monitoring counter for number of local link congestion primitives received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLocalLinkCongestCeaseRec">

+            <description>Performance monitoring counter for number of local link congestion ceased primitives received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSURec">

+            <description>Performance monitoring counter for number of received MSU's on this signalling link.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSUSent">

+            <description>Performance monitoring counter for number of sent MSU's on this signalling link.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="Mtp3bSlItuId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="localInhibit">

+            <description>This action inhibits the Mtp3bSlItu. Signalling link management inhibiting is requested by management when it becomes necessary, e.g for maintenance or testing purposes to make or keep a signalling link unavailable to User Part-generated signalling traffic.

+Inhibiting of a signalling link may be requested by management function at either end of the link. The request is granted, provided that the inhibiting action does not cause any previously accessible destinations to become inaccessible at either end of the signalling link. The request may also be refused under certain circumstances such as congestion.

+Exception FroRequestFailed if it was not possible to inhibit.

+

+Note! This action requires a transaction.

+</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="localUninhibit">

+            <description>This action uninhibits the Mtp3bSlItu.

+

+Exception FrorequestFailed if it was not possible to uninhibit.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="deactivate">

+            <description>This action deactivates the Mtp3bSl.

+It will also set autoStartLink = false.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="activate">

+            <description>This action activates the Mtp3bSl with normal alignment. It will also set autoStartLink = true.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="emergencyActivate">

+            <description>This action activates the Mtp3bSl with emergency alignment.

+It will also set autoStartLink = true

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+    </class>

+

+    <class name="Mtp3bSlTtc">

+        <description>This MO represents  an MTP3b Signalling Link for the TTC standard. It represents the termination of the signalling link within the signalling point as defined in JT-Q.704 Ver. 3, April 28 1992 and JT-Q.2210 Ver.1 April 24 1996.

+

+The total amount of links between any two specific nodes in the network shall not be more than 16, independent on how many linksets that are defined between the two nodes. The signalLinkCode for a link must be unique between the nodes, independent on which linkSet the link belongs to. 

+

+The performance monitoring counters found in Mtp3SlTtc MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).

+

+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the TTC standard.</description>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="tpId">

+            <description>The tpId attribute points out the termination point of the lower layer protocol. Only BroadBand is supported for TTC. The MO will be connected to a NNI SAAL termination point (NniSaalTp Mo).</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>This attribute reflects the operational status of the Mtp3bSl.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="linkState">

+            <description>The link state of the Mtp3bSl.

+

+The link state is a bit map which contains a combination of the following values: (in hexadecimal format)

+

+0x00 Available

+0x01 Failed 

+0x02 Remotely blocked

+0x04 Locally blocked

+0x08 Remotely inhibited

+0x10 Locally inhibited

+0x20 Deactivated</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="usageState">

+            <description>There are three possible states for the usageState attribute:

+

+- idle, the Mtp3bSl carries no traffic.

+- active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.

+- busy, the Mtp3bSl is working but is congested (traffic is routed on other links).

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bUsageState">

+                    <defaultValue>IDLE</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="signLinkCode">

+            <description>The signalling link code, SLC, used for this link.

+The code have to be uniqe in this signal link set, i.e the signallingLinkCode for 

+all the Mtp3bSl that belongs to the same Mtp3bSls must be unique(mutual exclusive). </description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>15</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="proceduralState">

+            <description>The procedural state of the link.

+

+0 - not initialized

+1 - initialized

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bProceduralState">

+                    <defaultValue>NOT_INITIALIZED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="linkCongestLevel">

+            <description>The congestion level of the link.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="CongestLevel">

+                    <defaultValue>level_0</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="autoStartLink">

+            <description>Controls if the Mtp3b Signalling Link should be activated at create.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="prioBeforeSio">

+            <description>This Boolean tells if the message priority shall be inserted in an octet before the Service Indicator Octet (SIO).

+

+</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAALINServiceInd">

+            <description>Performance management counter for number of received link-in-service indications.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAALOUTInd">

+            <description>Performance management counter for number of received link-out-of-service indications.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOOXCOSent">

+            <description>Performance management counter for number of sent change over order (COO/XCO) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBDSent">

+            <description>Performance management counter for number of sent CBD messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLocalLinkCongestRec">

+            <description>Performance monitoring counter for number of local link congestion primitives received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLocalLinkCongestCeaseRec">

+            <description>Performance monitoring counter for number of local link congestion ceased primitives received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSURec">

+            <description>Performance monitoring counter for number of received MSU's on this signalling link.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSUSent">

+            <description>Performance monitoring counter for number of sent MSU's on this signalling link.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="Mtp3bSlTtcId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <action name="deactivate">

+            <description>This action deactivates the Mtp3bSl.

+It will also set autoStartLink = false.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+            <raisesException name="FroNotAccessibleException"/>

+        </action>

+        <action name="activate">

+            <description>This action activates the signalling link with normal alignment. It will also set autoStartLink = true.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+            <raisesException name="FroNotAccessibleException"/>

+        </action>

+        <action name="emergencyActivate">

+            <description>This action activates the signalling link with emergency alignment.

+It will also set autoStartLink = true

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+            <raisesException name="FroNotAccessibleException"/>

+        </action>

+    </class>

+

+    <class name="Mtp2ProfileAnsi">

+        <description>The MTP 2 Profile MO represents and keeps attribute values used by one or more MTP 2 ANSI termination point MOs.</description>

+        <attribute name="userLabel">

+            <description>This MOs user label.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="Mtp2ProfileAnsiId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="profileData">

+            <description>Struct containing profile data.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="Mtp2ProfileDataAnsi"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of Mtp2TpAnsi MOs that have reserved this Mtp2TpProfileAnsi MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="Mtp2TpAnsi"/>

+                </sequence>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mtp2ProfileItu">

+        <description>The MTP 2 Profile MO represents and keeps attribute values used by one or more MTP 2 ITU termination point MOs.</description>

+        <attribute name="userLabel">

+            <description>The MOs user label.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="Mtp2ProfileItuId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="profileData">

+            <description>Struct containing profile data.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="Mtp2ProfileDataItu"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of Mtp2TpItu MOs that have reserved this Mtp2TpProfileItu MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="Mtp2TpItu"/>

+                </sequence>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="E1Ttp">

+        <description>This MO represents a channelised E1 interface in the node. The E1Ttp (Trail Termination Point) MO

+does not define which type of traffic (TDM or ATM) that the interface should support. Please refer to 

+the Ds0Bundle, AtmPort, IMALink and IMAGroup objects for details about configuration of traffic type.

+

+The performance monitoring counters in the E1Ttp MO is set to 0 (zero) at start or restart of the node.

+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.

+

+Note! This MO is automatically created as a consequence of creating an Os155SpiTtpMo

+Please refer to the Os155SpiTtpMo for more details.

+

+</description>

+        <systemCreated/>

+        <attribute name="degDegThr">

+            <description>The threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.

+

+This is a percentage value.

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100</max>

+                    </range>

+                    <defaultValue>30</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="degDegM">

+            <description>How many bad seconds in a row that causes a Degraded Signal alarm.

+

+

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>2</min> <max>10</max>

+                    </range>

+                    <defaultValue>7</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="aisReporting">

+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="rdiReporting">

+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="crc4Mode">

+            <description>Indicates what Cyclical Redundancy Check 4 Mode that is being used.</description>

+            <dataType>

+                <enumRef name="Crc4Mode">

+                    <defaultValue>AUTOMATIC</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="idlePattern">

+            <description>The idle pattern.

+

+NOTE: Going from A_LAW or U_LAW to UNDEFINED is always allowed but setting up one ET board with 

+both U_LAW and A_LAW is not allowed.

+E.g. If you want to change from A_LAW to U_LAW on one ET board you have to change idlePattern

+on each physical port belonging to the board to UNDEFINED first.

+A_LAW -&gt; UNDEFINED -&gt; U_LAW or U_LAW -&gt; UNDEFINED -&gt; A_LAW</description>

+            <dataType>

+                <enumRef name="IdlePattern">

+                    <defaultValue>UNDEFINED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmEs">

+            <description>Performance monitoring counter of Errored Seconds (ES).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSes">

+            <description>Performance monitoring counter for Severely Errored Seconds.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="E1TtpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identityof the reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="AtmPort"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedByImaLink">

+            <description>The identity of the reserving ImaLink MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ImaLink"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Vc4Ttp">

+        <description>This MO is automatically created as a consequence of creating an Os155SpiTtp object if any of the following conditions are true:

+a) standardmode = ETSI or

+b) standardmode = TTC and muxmode = VC4_STS3CSPE_LEVEL.

+

+It represents the termination of the SDH VC-4 path layer. The VC-4 can either be used for channelised access, in which case VC-12 MOs are created as children to the Vc4Ttp MO, or be used to carry ATM traffic, in which case there is a relationship between the AtmPort MO and the Vc4Ttp MO.

+

+Note! The performance monitoring counters in the Vc4TtpMO is set to 0 (zero) at start or restart of the node.

+When the value is to large to fit in to a long (31bit) the counter turns over and starts from 0 again.

+</description>

+        <systemCreated/>

+        <attribute name="pathTraceFormat">

+            <description>Indicates the format of the expectedPathtrace and transmittedPathtrace attributes. The format may be in 16 or 64 characters. Usually 16 is used for ETSI and 64 for ANSI/TTC.

+

+ITU_T_G707=16

+GR_253_CORE=64

+

+Note that the 16 characters format requires the operator to specify 15 characters where no character contains the null character (the 16th character is added automatically).

+

+Note that the 64 characters format requires the operator to specify 62 ASCII characters all different from null followed by CR/LF.</description>

+            <dataType>

+                <enumRef name="PathTraceFormat">

+                    <defaultValue>ITU_T_G707</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="transmittedPathTrace">

+            <description>The transmitted path trace. 

+Can be defined in two formats. The format may be in 16 or 64 characters. Usually 16 is used for ETSI and 64 for ANSI/TTC.

+

+Note: The string must be of 15 or 62 characters length, or empty string ("").

+

+</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>64</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="expectedPathTrace">

+            <description>Expected path trace. 

+

+The string can be of 15 or 62 characters length, or empty string ("").

+

+Note: An empty string for this attribute means that the detection of Trace Identifier Mismatch (TIM) should be disabled. This attribute is set to empty string every time attribute pathTraceFormat is set.

+

+</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>64</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="timConsequentAction">

+            <description>Trace Identifier Mismatch (TIM) consequent action, i.e. for generation of Alarm Indication Signal (AIS) downstream and Remote Defect Indication (RDI) upstream as a consequence of the TIM detection. 

+

+True - enabled.

+False - disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="vcDegThreshold">

+            <description>This threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.

+

+The attribute value is in unit of % (percent).</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100</max>

+                    </range>

+                    <defaultValue>30</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="vcDegM">

+            <description>Indicates how many bad seconds in a row that causes a Degraded Signal alarm.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>2</min> <max>10</max>

+                    </range>

+                    <defaultValue>7</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="auAisReporting">

+            <description>AU AIS reporting.

+

+True - enable reporting.

+False - disable reporting.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="vcRdiReporting">

+            <description>VC RDI reporting.

+

+True - enable reporting.

+False - disable reporting.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmVcEs">

+            <description>Performance monitoring counter for Virtual Container 4, VC4, Errored Seconds, ES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmVcSes">

+            <description>Performance monitoring counter for Virtual Container 4, VC4, Severely Errored Seconds, SES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="Vc4TtpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="AtmPort"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Os155SpiTtp">

+        <description>This MO represents the physical interface and the termination of the SDH Regenerator and Multiplexer Section Layers.

+

+When creating the Os155SpiTtp a number of additional objects will be created. Depending on the values of standardmode and muxmode different objects will be created as described below:

+

+muxmode = standby

+standardmode =  ETSI, TTC, ANSI

+No objects under the Os155SpiTtp is created.

+

+muxmode = VC4_STS3CSPE_LEVEL

+standardmode =  ETSI, TTC

+A Vc4 MO is created under the Os155SpiTtp MO.

+

+muxmode = VC4_STS3CSPE_LEVEL

+standardmode =  ANSI

+A Sts3CspeTtp MO is created under the Os155SpiTtp MO.

+

+The following two configurations is only applicable for the ET-MC41 board.

+

+muxmode = E1_J1_T1_LEVEL

+standardmode =  ETSI

+A Vc4 MO, 63 Vc12Ttp MO's and 63 E1Ttp MO's is created under the Os155SpiTtp MO

+

+muxmode = E1_J1_T1_LEVEL

+standardmode =  ANSI

+3 Sts1CspeTtp MO's, 3*28 Vt15Ttp MO's and 3*28 TiTtp MO's is created under the Os155SpiTtp MO.

+

+The performance monitoring counters in the Os155SpiTtp MO is set to 0 (zero) at start or restart of the node.

+When the value is too large too fit in to a long (31bit) the counter turns over and starts from 0 again.

+

+Note! If the Os155SpiTtp is configured as part of an Mspg protection group and is configured as standby, muxMode set to standby, no children's to this MO will be created.</description>

+        <attribute name="Os155SpiTtpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="lineNo">

+            <description>The actual line number. 

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>2</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="standardMode">

+            <description>The standard that this MO is operating to.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="StandardMode">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="shutDownTimeout">

+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.

+

+Value in seconds, must be a positive value.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100000</max>

+                    </range>

+                    <defaultValue>1800</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="muxMode">

+            <description>The level at which the STM-1/OC3 signal is demultiplexed.

+

+If parent is of type Etmc41, the valid muxMode is STANDBY or E1_J1_T1_LEVEL.

+If parent is of type Etm4, the valid muxMode is STANDBY or VC4_STS3CSPE_LEVEL.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="MuxMode">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="msDegThreshold">

+            <description>MS - multiplexer section.

+

+The threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.

+

+This is a percentage value. 

+

+Note: When operating to the ANSI standard, this attribute has no meaning.

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100</max>

+                    </range>

+                    <defaultValue>30</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="msDegM">

+            <description>MS - multiplexer section. 

+

+How many bad seconds in a row that causes a Degraded Signal alarm.

+

+Note: When operating to the ANSI standard, this attribute has no meaning.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>2</min> <max>10</max>

+                    </range>

+                    <defaultValue>7</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="msRdiReporting">

+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="msAisReporting">

+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="loopBack">

+            <description>Enables or disables line loopback, i.e. the received signal is returned in the transmitted direction.

+

+none - This is the normal state, no loop back is performed (and ordinary traffic is running).

+

+line - The physical path is looped on the line side, the external incoming path is looped back to the external outgoing path.

+

+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>

+            <dataType>

+                <enumRef name="Os155LoopBack">

+                    <defaultValue>NONE</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmMsEs">

+            <description>Performance monitoring counter for Multiplexer Section, MS, Errored Seconds, ES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmMsSes">

+            <description>Performance monitoring counter for Multiplexer Section, MS, Severely Errored Seconds, SES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBySync">

+            <description>The identity of the reserving Synchronization MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Synchronization"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Vc12Ttp">

+        <description>This MO is automatically created when the configuring the Os155SpiTtp. It represents the termination of the SDH VC-12  path layer. 

+

+Note: This MO is only valid when the ETSI standard is in use.

+

+The performance monitoring counters in the Vc12TtpMO is set to 0 (zero) at start or restart of the node.

+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.</description>

+        <systemCreated/>

+        <attribute name="Vc12TtpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="transmittedPathTrace">

+            <description>The transmitted path trace. 

+

+Note: when 16 byte tracing is used, only 15 bytes should be used in the set action for this attribute. 

+

+

+</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>64</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="expectedPathTrace">

+            <description>Expected path trace. 

+

+Note: when 16 byte tracing is used, only 15 bytes should be used in the set action for this attribute. 

+

+Note: An empty string for this attribute means that the detection of Trace Identifier Mismatch (TIM) should be disabled. 

+</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>64</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="timConsequentAction">

+            <description>Trace Identifier Mismatch (TIM) consequent action, i.e. for generation of Alarm Indication Signal (AIS) downstream and Remote Defect Indication (RDI) upstream as a consequence of the TIM detection. 

+

+True - enabled.

+False - disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="vcDegThreshold">

+            <description>This threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.

+

+The attribute value is in unit of % (percent).</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100</max>

+                    </range>

+                    <defaultValue>30</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="vcDegM">

+            <description>Indicates how many bad seconds in a row that causes a Degraded Signal alarm.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>2</min> <max>10</max>

+                    </range>

+                    <defaultValue>7</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tuAisReporting">

+            <description>Timing Unit Alarm Indication Signal (TU AIS) reporting.  

+

+True - enable reporting.

+False - disable reporting.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="vcRdiReporting">

+            <description>VC RDI reporting.

+

+True - enable reporting.

+False - disable reporting.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmVcEs">

+            <description>Performance monitoring counter for Virtual Container 12, VC12, Errored Seconds, ES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmVcSes">

+            <description>Performance monitoring counter for Virtual Container 12, VC12, Severely Errored Seconds, SES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="shutDownTimeout">

+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.

+

+Value in seconds, must be a positive value.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100000</max>

+                    </range>

+                    <defaultValue>1800</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Etmc1">

+        <description>This MO represents the hardware of the ET-MC1 board type. It only represents the ET specific hardware, the DBM module of the board is represented by the PlugInUnit MO.

+

+The ET-MC1 board contains 8 phyiscal ports that can be configured as either E1 (ETSI), J1 (TTC)  or T1(ANSI). The board does not allow for a mix of E1, J1 and T1 ports, thus all configured ports on the board must be configured to the same standard.

+

+Each port on the ET-MC1 board can be used to carry either ATM traffic or circuit orientated (Nx64 Kbits/s connections) traffic.

+

+Each port can support up to 30 ATM VC connections. Two of these connections  are reserved for AAL2 paths, and therefore two AAL2 multiplexers per port are available.

+

+Each port can support up to 2 VP connections. 

+

+The ET-MC1 port supports one bidirectional F4/F5 PM flow per port.

+

+At the VP/VC endpoints, the Lost FPM/BR cells counters are not available.

+

+Note! The ETMC1 supports IMA.

+

+For more details on restrictions please refer to 155 17-21/CSX 101 09 Uen.

+

+Note! When the Etmc1 is part of the Cbu it is only possible to configure 4 physical ports of type E1, J1 or T1 on the Etmc1 board.</description>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Enabled or disabled according to the actual operational state of the ETMC1 board.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="Etmc1Id">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Etmc41">

+        <description>This MO represents the hardware of the ET-MC41 board type. It only represents the ET specific hardware, while the DBM module of the board is represented by the PlugInUnit MO.

+

+The ET-MC41 board contains a 155 Mbits/s physical optical port. The board can be configured as a E1 channelised board providing 63 logical E1 interfaces.

+

+Each E1 logical channel on the ET-MC41 can be used to carry either ATM traffic or circuit oriented (Nx64 kbit/s) traffic.

+

+Each E1 logical channel can support up to 30 ATM VC connections. Two of these connections are reserved for aal2 paths, and therefore two AAL2 multiplexers per E1/DS1/J1 channel  are available.

+

+Each E1/DS1/J1 channel can suport up to 2 VP connections.

+

+The ET-MC41 board support one biderectional F4/F5 PM flow per E1 channel.

+

+Note! The ETMC41 supports IMA. However the E1 ports being part of the same IMA group can not be selected randomly.

+

+Note! The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 1 / port

+

+For more details on restrictions please refer to 155 17-21/CSX 101 09 Uen.</description>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Enabled or disabled according to the actual operational state of the ET-MC41 board.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="Etmc41Id">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mtp2ProfileChina">

+        <description>The MTP2 Profile MO represents and keeps attribute values used by one or more MTP2 China termination point MOs.</description>

+        <attribute name="Mtp2ProfileChinaId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="profileData">

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="Mtp2ProfileDataChina"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of Mtp2TpChina MOs that have reserved this Mtp2TpProfileChina MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="Mtp2TpChina"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>The MOs user label.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mtp2TpChina">

+        <description>This MO represents a MTP 2 termination point for the China standard, as defined in GF001-9001, plus supplement 1-3.

+

+The performance monitoring counters found in Mtp2China MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is a hardware fault, aal1 server/adm restart or node restart.

+

+NOTE: This MO cannot in anyway be related (either contained by or dependent on) an MO that belongs to a standard 

+which is NOT the China standard.

+

+NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.

+

+</description>

+        <attribute name="ds0BundleId">

+            <description>The Ds0Bundle MO that this MO references.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Ds0Bundle"/>

+            </dataType>

+        </attribute>

+        <attribute name="mtp2ProfileChinaId">

+            <description>Reference to a Mtp2ProfileChina MO.

+

+Note: The bitRate can not be changed.</description>

+            <mandatory/>

+            <noNotification/>

+            <dataType>

+                <moRef name="Mtp2ProfileChina"/>

+            </dataType>

+        </attribute>

+        <attribute name="Mtp2TpChinaId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the MTP2 Signalling Terminal.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmLocalSIBTime">

+            <description>Total time in local  SIB (Sending).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSUTransmitted">

+            <description>Number of MSUs transmitted.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfNacks">

+            <description>Number of negative acknowledgements received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuReceivedInError">

+            <description>Number of signal units received in error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfReTransmittedOctets">

+            <description>Number of re-transmitted octets.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSendBufferOctets">

+            <description>Number of octets in send buffer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSIOSIFReceived">

+            <description>Number of SIO and SIF octets received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSIOSIFTransmitted">

+            <description>Number of SIO &amp; SIF octets transmitted.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfStartedRBCongestion">

+            <description>Number of started local RB congestions.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmRemoteSIBTime">

+            <description>Total time in remote SIB (Receiving).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Mtp3bSlChina"/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Free tag for marking this managed object.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="plugInUnitId">

+            <description>The PlugInUnit  MO that this MO references.

+It indicates on which processor the Termination Point will be.

+

+Note: The PlugInUnit must be of type GPB.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="PlugInUnit"/>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSUReceived">

+            <description>Number of MSUs received..</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mtp3bSlChina">

+        <description>This MO represents  an MTP3b Signalling Link for the China standard. It represents the termination of the signalling link within the signalling point as defined in GF001-9001, plus supplement 1-3.

+

+The total amount of links between any two specific nodes in the network shall not be more than 16, independent on how many linksets that are defined between the two nodes. The signalLinkCode for a link must be unique between the nodes, independent on which linkSet the link belongs to. 

+

+The performance monitoring counters found in Mtp3SlChina MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).

+

+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard that is NOT the China standard.</description>

+        <attribute name="Mtp3bSlChinaId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>This attribute reflects the operational status of the Mtp3bSl.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="autoStartLink">

+            <description>Controls if the Mtp3b Signalling Link should be activated at create.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="linkCongestLevel">

+            <description>The congestion level of the link.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="CongestLevel">

+                    <defaultValue>level_0</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="linkState">

+            <description>The link state of the Mtp3bSl.

+

+The link state is a bit map which contains a combination of the following values: (in hexadecimal format)

+

+0x00 Available

+0x01 Failed 

+0x02 Remotely blocked

+0x04 Locally blocked

+0x08 Remotely inhibited

+0x10 Locally inhibited

+0x20 Deactivated</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="prioBeforeSio">

+            <description>This Boolean tells if the message priority shall be inserted in an octet before the Service Indicator Octet (SIO).

+

+China default is false.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="proceduralState">

+            <description>The procedural state of the link.

+

+0 - not initialized

+1 - initialized

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bProceduralState">

+                    <defaultValue>NOT_INITIALIZED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="signLinkCode">

+            <description>The signalling link code, SLC, used for this link.

+The signLinkCode for a link must be unique between the nodes,

+independent on in which linkSet the link belongs.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>15</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tpId">

+            <description>The tpId attribute points out the termination point of the lower layer protocol. 

+

+For narrowband this signalling link will be connected to an MTP L2 termination point (Mtp2Tp MO). And for broadband it will be connected to a NNI SAAL termination point (NniSaalTp Mo).</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="usageState">

+            <description>There are three possible states for the usageState attribute:

+

+- idle, the Mtp3bSl carries no traffic.

+- active, the Mtp3bSl is working normally, and there is traffic, and it is not congested.

+- busy, the Mtp3bSl is working but is congested (traffic is routed on other links).

+

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bUsageState">

+                    <defaultValue>IDLE</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAALINServiceInd">

+            <description>Performance management counter for number of received link-in-service indications.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAALOUTInd">

+            <description>Performance management counter for number of received link-out-of-service indications.

+

+Note! This counter is incremented every time a link out of service indication is received for the link.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBDSent">

+            <description>Performance management counter for number of sent CBD messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOOXCOSent">

+            <description>Performance management counter for number of sent change over order (COO/XCO) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLocalLinkCongestCeaseRec">

+            <description>Performance monitoring counter for number of local link congestion ceased primitives received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLocalLinkCongestRec">

+            <description>Performance monitoring counter for number of local link congestion primitives received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSURec">

+            <description>Performance monitoring counter for number of received MSU's on this signalling link.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMSUSent">

+            <description>Performance monitoring counter for number of sent MSU's on this signalling link.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <action name="activate">

+            <description>This action activates the Mtp3bSl with normal alignment. It will also set autoStartLink = true.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="deactivate">

+            <description>This action deactivates the Mtp3bSl.

+It will also set autoStartLink = false.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="emergencyActivate">

+            <description>This action activates the Mtp3bSl with emergency alignment.

+It will also set autoStartLink = true

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="localInhibit">

+            <description>This action inhibits the Mtp3bSlChina. Signalling link management inhibiting is requested by management when it becomes necessary, e.g for maintenance or testing purposes to make or keep a signalling link unavailable to User Part-generated signalling traffic.

+Inhibiting of a signalling link may be requested by management function at either end of the link. The request is granted, provided that the inhibiting action does not cause any previously accessible destinations to become inaccessible at either end of the signalling link. The request may also be refused under certain circumstances such as congestion.

+Exception FroRequestFailed if it was not possible to inhibit.

+

+Note! This action requires a transaction.

+</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+        <action name="localUninhibit">

+            <description>This action uninhibits the Mtp3bSlItu.

+

+Exception FrorequestFailed if it was not possible to uninhibit.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FroRequestFailedException"/>

+        </action>

+    </class>

+

+    <class name="Mtp3bSpChina">

+        <description>Mtp3b Signalling Point for the China standard.

+

+This MO represents/models the MTP3b Signaling Point characteristics/functions according to the China standard. 

+A signaling point is a logical node in the signaling network. The combination of signaling points and their interconnecting 

+signaling links form the SS No. 7 signaling network. The signaling point represented by this object is a Local Signaling Point.

+

+The performance monitoring counters found in Mtp3SpChina MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is shutdown request from CLI (Cluster Interface).

+

+NOTE: IT IS NOT POSSIBLE TO CREATE SIGNALLING POINTS OF DIFFERENT STANDARDS!

+

+NOTE: This MO cannot in anyway be related (either contain or by dependence) to an MO that belongs to a standard which is NOT the China standard.

+

+NOTE: The combination of network indicator (networkInd) and Signalling Point Code (signallingPointCode) has to be unique for each Signalling Point.

+

+NOTE: A maximum of 15 instances of this MO can be created on (referencing) the same PlugInUnit.

+

+NOTE: The maximum number of Signalling Points that can be created in a CPP based node is 24.

+

+NOTE: Deleting a singel L3 Signal Point is not possible, if it necessary to delete a Signal Point then all Signal Points has to be deleted. This also has to be done whitin the same transaction. 

+

+NOTE: Any object created under a certain SP (Signaling Point) cannot refer to an object created under another SP. Nor can it refer to an object created under another SP.</description>

+        <attribute name="Mtp3bSpChinaId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="maxSizeChangeBuf">

+            <description>The maxSizeChangeBuf attribute represents the maximum size (in kB) of the changeover buffer.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>5000</max>

+                    </range>

+                    <defaultValue>2000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxSizeReroutBuf">

+            <description>The maxSizeReroutBuf attribute represents the maximum size (in kB) of the rerouting buffer.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>5000</max>

+                    </range>

+                    <defaultValue>2000</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="networkInd">

+            <description>The network indicator, NI, is used for discrimination of messages between functionally different networks.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="Mtp3bNetworkInd">

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operationalState attribute reflects the operational status of the MTP3b SP.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Holds a list of the reserving MO's. Can be of type SccpSp.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="sendSltmBefLink">

+            <description>The sendSltmBefLink attribute determines if the SLTM (Signalling Link Test Message) should be sent and a SLTA received before the link is considered to be in service.

+

+Note! It is not recommended nor is it in accordance with standard to set the value of this attribute to 'false' </description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="signallingPointCode">

+            <description>The signallingPointCode (Local Point Code) attribute (SPC) is used together with the network indicator (NI, networkInd attribute) to uniquely identify the MTP Signalling Point, SP.

+SP = NI-SPC.

+Size (2 exp 24)-1 (16777215).

+The SignallingPointCode (SPC) is nornally used as a whole unique number (no internal structure). But sometimes the SPC is grouped together as three numbers which corresponds to zone, area/network, signalling point. If this is the case the three numbers are coded as 8-8-8 bits in the total SPC. To enter the SPC-value then you have to convert the three numbers to their binary code and then convert the whole 24-bit pattern as an integer.

+ </description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>16777215</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="nodeBehaviour">

+            <description>The nodeBehaviour attribute represents the MTP3b node type.

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="NodeBehaviourType">

+                    <defaultValue>SEP</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="noOfCongestLevelForNI">

+            <description>Defines the number of congestion levels for NI.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>3</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="routeSetCongestTestFlag">

+            <description>Selection of which procedure to use during congestion handling if the national option with priorities is used.

+

+0, use TcTimer as described by the TTC standard.

+1, use Route Set Congestion Test as described by the ANSI, ITU and China Standard.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>1</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="resendTfcInterval">

+            <description>Send TFC back to originating signalling point code for every n:th message when 

+the destination is congested. Set to 0 will suppress sending of TFC.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                    <defaultValue>8</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="sioSpare">

+            <description>The sioSpare attribute determines if the two spare bits in the SIO (Service Information Octet) should be treated as spare.</description>

+            <dataType>

+                <enumRef name="Mtp3bSioSpareBitsUse">

+                    <defaultValue>SPARE</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="spPriority">

+            <description>Struct containing the priority attributes.

+

+Note: The China and ITU priorityData is identical so the ItuPriorityData is used for China to avoid duplication of data.</description>

+            <dataType>

+                <structRef name="Mtp3bSpChinaPriorityData"/>

+            </dataType>

+        </attribute>

+        <attribute name="spTimer">

+            <description>Struct containing China specific timer attributes</description>

+            <dataType>

+                <structRef name="Mtp3bSpChinaTimerData"/>

+            </dataType>

+        </attribute>

+        <attribute name="statusIndInterval">

+            <description>The statusIndInterval attribute sets the interval for sending MTP-STATUS indication, i.e. send indication every Nth message .</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                    <defaultValue>4</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="testPatternSltm">

+            <description>The testPatternSltm attribute represents a string testpattern in the Signalling Link Test Message.

+

+Minimum string length 2 characters, maximum 30 characters. Allowed characters are 0-9, A-F.

+Only even number of characters is allowed.

+

+</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>2</min> <max>30</max>

+                    </lengthRange>

+                    <defaultValue>"A5A5A5A5A5A5A5A5A5A5A5A5A5A5A5"</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="transFrHandler">

+            <description>Determines if a TransFer Restricted signal (TFR) should be treated as a TFA (TransFer Allowed signal) or be ignored.

+</description>

+            <dataType>

+                <enumRef name="Mtp3bTfrHandling">

+                    <defaultValue>IGNORED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="rpuId">

+            <description>Holds a reference to the Reliable Program Uniter.

+The RPU is at the server.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ReliableProgramUniter"/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="m3uaNoOfAttempsOfDauds">

+            <description>For M3UA, number of attempts to send the DAUD message.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>5</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="noOfAttempsOfAssociationEstablishment">

+            <description>Number of attempts to send the SCTP_ASSOCIATE_REQ message.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>65535</max>

+                    </range>

+                    <defaultValue>4</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="version">

+            <description>This attribute shows what MTP3b ITU standard the system follows. With ITU, it is possible using this attribute to set which of the ITU standard versions that shall be followed.

+

+Note! Setting of another value than 'ITU_T_07_96' at create will have no effect. The Signaling Point will always be created with the value 'ITU_T_07_96'.

+

+Note! It is not possible to hav signaling points with different versions in the node so setting of this attribute will effect all signaling points. The value for the last created or changed signaling point will be used for all signaling points.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="Mtp3bItuVersion">

+                    <defaultValue>ITU_T_07_96</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBARec">

+            <description>Performance management counter for number of received CBA messages.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCBASent">

+            <description>Performance management counter for number of sent CBA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfChangeBackDeclRec">

+            <description>Performance management counter for number of received change Back Declarations (CBD) messages.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfChangeOverRec">

+            <description>Performance counter for number of changeOver order messages (COO/XCO) received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOAXCARec">

+            <description>Performance management counter for number of  received COA/XCA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCOAXCASent">

+            <description>Performance management counter for number of sent COA/XCA messages.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfControlledRerouteSuccessPerf">

+            <description>Performance monitoring counter for number of successfully performed controlled rerouting.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECASent">

+            <description>Performance management counter for number of sent ECA messages.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECARec">

+            <description>Performance management counter for number of received ECA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfECOSent">

+            <description>Performance management counter for number of sent ECO messages.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfEmergencyChangeOverRec">

+            <description>Performance management counter for number of received emergency changeOver orders (ECO) messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfForcedRerouteSuccessPerf">

+            <description>Performance monitoring counter for number of successfully performed forced rerouting.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSLTAFirstTimeOutRec">

+            <description>Performance management counter for number of SLTA first time out received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSLTASecondTimeOutRec">

+            <description>Performance management counter for number of SLTA second time out received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTimerT21WasStarted">

+            <description>Performance monitoring counter for number of times the timer T21 was started (i.e. adjacent SP restarted).

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTRARec">

+            <description>Performance management counter for number of received TRA messages.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfTRASent">

+            <description>Performance management counter for number of sent TRA messages.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessControlledRerouting">

+            <description>Performance monitoring counter for number of unsuccessfully performed controlled reroutings.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessForcedRerouting">

+            <description>Performance monitoring counter for number of unsuccessfully performed forced reroutings.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUPMsgDiscardedDueToRoutingErr">

+            <description>Performance monitoring counter for number of UP (user part) messages (MTP_TRANSFER_req) discarded due to routing error.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuccessAssocEstablish">

+            <description>Performance management counter for number of successful association establishment.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessAssocEstablish">

+            <description>Performance management counter for number of unsuccessful association establishment.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpCommunicationErr">

+            <description>Performance management counter for number of SCTP communication error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpSendFailure">

+            <description>Performance management counter for number of SCTP send failure.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpBufOverflow">

+            <description>Performance management counter for number of SCTP stop sending data.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpResumeSending">

+            <description>Performance management counter for number of SCTP resume sending data.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpNetworkStatusChange">

+            <description>Performance management counter for number of SCTP network status change.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSctpAssociationRestart">

+            <description>Performance management counter for number of SCTP association restart.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuccessAssocAbort">

+            <description>The number of successful abortions of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSuccessAssocShutDown">

+            <description>The number of succesful shutdowns of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessAssocAbort">

+            <description>The number of unsuccessful abortions of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfUnsuccessAssocShutDown">

+            <description>The number of unsuccesful shutdowns of signalling associations.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIncomingAssocEstabRequestInStateDownWhenStateEstabIsBlocked">

+            <description>The number of incoming request for association establishment when state on the association is 'DOWN' and  establishment of associations is blocked. </description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMaxTrialsForAssocEstabReached">

+            <description>The number of times that the max limit for trying to establish an association has been reached.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMaxTrialsForAssocActivReached">

+            <description>The number of times that the max limit for trying to activate an association has been reached.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfLowerPrioMsgDiscarded">

+            <description>The number of messages with low priority that has been discarded.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Mspg">

+        <description>The MSPG (Multiplex Section Protection Group) object enables two different protection mechanism in Cello. First it enables a standard 1+1 MSP mechanism. A failure on the working line will thus cause a sub 50 ms switch to the standby line.

+Secondly the MSPG is used to enable equipment protection, whereas a failure of the working board will cause a switch to the standby board. While executing an equipment protection switch, the node on the other end of the multiplexer section, will experience a standard 1+1 MSP switch.

+   

+It is possible to force traffic to one port/board by using administrative state.

+Setting administrative state to locked on the working board, will automatically cause an equipment switch to the standby board. Similarily setting administrative state to locked on the working port, will cause an MSP switch to the standby port.

+

+The process of configuring a MSP protection interface is as follows:

+1) Create the working interface as normal.

+2) Create the standby interface by creating an Os155SpiTtp with mux mode set to STANDBY (standby for protection).

+3) Create a MSPG object with references to the two Os155SpiTtp objects.

+

+Note! The ports selected for MSPG must be have the attribute standardMode configured in exactly the same way.

+

+Note! The Os155SpiTtp created for standby will not create any children, i.e no Vc4Ttp or Vc4Ttp, Vc12Ttp and E1Ttp will be created. Nor will object of type Sts1SpeTtp, Vt15Ttp or T1Ttp be created.</description>

+        <attribute name="os155SpiWorkingId">

+            <description>The working OS155 pyhiscal path termination.

+This is the administrative value.

+

+To retrive the Id of the current working port, use the selectedPort.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Os155SpiTtp"/>

+            </dataType>

+        </attribute>

+        <attribute name="os155SpiStandbyId">

+            <description>The standby OS155 physical path termination.

+This is the administrative value.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Os155SpiTtp"/>

+            </dataType>

+        </attribute>

+        <attribute name="switchMode">

+            <description>The switching mode.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="SwitchModes">

+                    <defaultValue>AUTOMATIC</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the Mspg.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="MspgId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="selectedPort">

+            <description>The port currently selected by the MSPG. The selected port can only

+change due to a MSP or equipment switch.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Os155SpiTtp"/>

+            </dataType>

+        </attribute>

+        <attribute name="selectedBoard">

+            <description>The board currently providing the user traffic interface to the Cello switch.

+The only action that can change the selected board is an equipment switch.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="degCauseMsp">

+            <description>If set to true, then a swith is performed upon detection of DEG.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <action name="manualMspSwitch">

+            <description>Initiates a switch when there does not exist a defect. 

+

+This action can fail for the following reasons:

+FailedResource  - the switch was not possible due to a traffic affecting fault on the port to which the switch was requested (i.e. the one not currently selected).

+LockedResource - the port to which the switch is intended is administratively locked.

+UnknownReason - there exists another fault that prevents the action.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <raisesException name="FailedResourceException"/>

+            <raisesException name="LockedResourceException"/>

+            <raisesException name="UnknownReasonException"/>

+        </action>

+    </class>

+

+    <class name="T1PhysPathTerm">

+        <description>This MO represents an T1 (i.e. 1.5 Mbit/s) physical interface in the node. The T1PhysPathTerm MO does not define which type of traffic (TDM or ATM) that the interface should support. 

+Please refer to the Ds0Bundle, AtmPort, IMALink and IMAGroup objects for details about configuration of traffic type.

+

+</description>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="T1PhysPathTermId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="lineNo">

+            <description>The actual Line number on the board.

+</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>8</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="loopback">

+            <description>Possible values

+

+none - This is the normal state, no loop back is performed (and ordinary traffic is running).

+

+line - The physical path is looped on the line side, the external incoming path is looped back to the external outgoing path.

+

+system - The physical path is looped on the system side, the (node-) internal incoming path is looped back to the internal outgoing path.

+

+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>

+            <dataType>

+                <enumRef name="LoopbackState">

+                    <defaultValue>none</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmEs">

+            <description>Performance monitoring counter for Errored Seconds, ES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSes">

+            <description>Performance monitoring counter for Severly Errored Seconds, SES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedByTraffic">

+            <description>The identity of the reserving AtmPort MO. </description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="AtmPort"/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Enabled or disabled according to the actual operational state of the Physical Line Termination. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="rdiReporting">

+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="aisReporting">

+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="shutDownTimeout">

+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.

+

+Value in seconds, must be a positive value.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100000</max>

+                    </range>

+                    <defaultValue>1800</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="idlePattern">

+            <description>The idle pattern.

+

+NOTE: Going from A_LAW or U_LAW to UNDEFINED is always allowed but setting up one ET board with 

+both U_LAW and A_LAW is not allowed.

+E.g. If you want to change from A_LAW to U_LAW on one ET board you have to change idlePattern

+on each physical port belonging to the board to UNDEFINED first.

+A_LAW -&gt; UNDEFINED -&gt; U_LAW or U_LAW -&gt; UNDEFINED -&gt; A_LAW</description>

+            <dataType>

+                <enumRef name="IdlePattern">

+                    <defaultValue>UNDEFINED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="transmissionMode">

+            <description>The type of transmission media.

+Refer to the TransmissionMode enumeration for details.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="TransmissionMode">

+                    <defaultValue>S_133</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBySync">

+            <description>The identity of the reserving Synchronization MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Synchronization"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedByImaLink">

+            <description>The identity of the reserving ImaLink MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ImaLink"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="ImaGroup">

+        <description>IMA, Inverse Multiplexing for ATM, makes it possible to group several physical 

+interfaces together to form a virtual physical pipe for atm. The capacity of this

+pipe is equal to the sum of each of the physical interfaces included in the

+group.

+  

+When IMA should be configured, an ATMPort MO is created with reference to an 

+IMAGroup MO rather than a pure physical interface MO.

+The IMAGroup MO in turn is created with a list of the physical port MO's that 

+are included in the group.  The physical port MO's must be of the same type 

+and be located on the same ET board.

+  

+For each of the physical port MO's included in the IMAGroup, an IMALink object 

+is automatically created. The IMALink object is responsible for handling link

+specific performance and fault management related to IMA.

+

+The ports can be of type E1PhysPathTerm, J1PhysPathTerm, T1PhysPathTerm, E1Ttp, T1Ttp.

+

+The performance monitoring counters in the ImaGroup MO is set to 0 (zero) at start or restart of the node.

+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.

+

+Note! A general restriction in Cello is that ports being part of the same IMA group

+must be located on the same board.

+

+Note! Only termination points on Etmc1 and Etmc41 boards are allowed as ImaLinks.

+

+Note! At least two links has to be configured in an Ima Group.</description>

+        <attribute name="ImaGroupId">

+            <description>The identity of the MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="physicalPortList">

+            <description>Holds a list of the physical ports connected to the ImaGroup.

+Can be of type:

+E1PhysPathTerm,

+J1PhysPathTerm,

+T1PhysPathTerm,

+E1Ttp,

+T1Ttp.</description>

+            <mandatory/>

+            <noNotification/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="requiredNumberOfLinks">

+            <description>The required number of links specifies the number of IMALinks that needs to be

+operational in order for the complete group to be operational. The bandwidth

+available for the ATMPort (and thus for creating VP/VC connections) is defined

+by this number. 

+Setting the requiredNumberOfLinks field to K less than the number of physical 

+links included in the IMAGroup, will reduce the bandwidth available to the atmport 

+with the corresponding bandwidth but will also give the effect that K links 

+failures can be tolerated with virtually no traffic disturbance.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>8</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="activeLinks">

+            <description>The number of active links in the ImaGroup.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Enabled or disabled according to the actual operational state of the ImaGroup.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmGrUasIma">

+            <description>This performance counter reflects the GrUasLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmGrFc">

+            <description>This performance counter reflects the GrFc attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmGrFcFe">

+            <description>This performance counter reflects the GrFcFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="AtmPort"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="ImaLink">

+        <description>This MO is automatically created as a consequence of creating an IMAGroup or 

+adding links to an IMAGroup.

+It provides IMA Link specific performance and fault management information.

+

+The links can be of type E1PhysPathTerm, J1PhysPathTerm, T1PhysPathTerm, E1Ttp or T1Ttp.

+

+The performance monitoring counters in the ImaLink MO is set to 0 (zero) at start or restart of the node.

+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.

+

+Note! A general restriction in Cello is that ports being part of the same IMA group

+must be located on the same board.</description>

+        <attribute name="operationalState">

+            <description>Enabled or disabled according to the actual operational state of the ImaLink.

+If the operationalState is disabled the ImaLink will be blocked for traffic.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmIvIma">

+            <description>This performance counter reflects the LvLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ImaLinkId">

+            <description>The identity of the MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="pmOifIma">

+            <description>This performance counter reflects the OifLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSesIma">

+            <description>This performance counter reflects the SesLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSesImaFe">

+            <description>This performance counter reflects the SesLmaFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUasIma">

+            <description>This performance counter reflects the UasLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUasImaFe">

+            <description>This performance counter reflects the UasLmaFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmTxUusIma">

+            <description>This performance counter reflects the TxUusLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmRxUusIma">

+            <description>This performance counter reflects the RxUusLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmTxUusImaFe">

+            <description>This performance counter reflects the TxUusLmaFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmRxUusImaFe">

+            <description>This performance counter reflects the RxUusLmaFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmTxFc">

+            <description>This performance counter reflects the TxFc attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmRxFc">

+            <description>This performance counter reflects the RxFc attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmTxFcFe">

+            <description>This performance counter reflects the TxFcFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmRxFcFe">

+            <description>This performance counter reflects the RxFcFe attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmTxStuffIma">

+            <description>This performance counter reflects the TxStuffLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmRxStuffIma">

+            <description>This performance counter reflects the RxStuffLma attribute as defined by Inverse Multiplexing for ATM(IMA) specification ver. 1.1, AF-PHY-0086.001</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="uses">

+            <description>Reference to the physical port represented by this MO.

+Can be of types E1PhysPathTerm, J1PhysPathTerm, T1PhysPathTerm, E1Ttp or T1Ttp.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Sts3CspeTtp">

+        <description>This MO represents the termination of the SONET higher order paths.

+This MO is automatically created when creating the OS155SPITTP with mux mode

+set to VC4_STS3CSPE_LEVEL and standardMode set to ANSI.

+

+The performance monitoring counters in the Sts3CspeTtp MO is set to 0 (zero) at start or restart of the node.

+When the value is to large to fit in to a long (31bit) the counter turns over and starts from 0 again.</description>

+        <attribute name="Sts3CspeTtpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>User label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>enabled or disabled according to the actual operational state of the Sts3CspeTtp.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="aisPReporting">

+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="rdiPReporting">

+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="timConsequentAction">

+            <description>Trace Identifier Mismatch (TIM) consequent action, i.e. for generation of Alarm Indication Signal (AIS) downstream and Remote Defect Indication (RDI) upstream as a consequence of the TIM detection. 

+

+True - enabled.

+False - disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="expectedPathTrace">

+            <description>Expected path trace. 

+

+The string can be of 64 characters length, or empty string ("").

+The string shall consist of 62 ASCII characters followed by CR/LF.

+The empty string shall be coded with the first character equal to ASCII null (i.e. byte value 0) and the rest dummy  or non-existing.

+

+Note: An empty string for this attribute means that the detection of Trace Identifier Mismatch (TIM) should be disabled. This attribute is set to empty string every time attribute pathTraceFormat is set.</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>64</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="transmittedPathTrace">

+            <description>The transmitted path trace. 

+

+The string shall consist of 62 ASCII characters followed by CR/LF.

+The empty string shall be coded with the first character equal to ASCII null (i.e. byte value 0) and the rest dummy  or non-existing.</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>64</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Identity of the AtmPort reserving this MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="AtmPort"/>

+            </dataType>

+        </attribute>

+        <attribute name="pmEsp">

+            <description>Performance Monitoring counter for ES, Errored Seconds.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSesp">

+            <description>Performance Monitoring counter for Severely Errored Seconds, SES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="WebServer">

+        <description>The WebServer MO represents the WebServer in the node.

+

+This object is used for configuration of the WebServer paths. By connecting this object to a

+SwAllocation MO that is connected to a Repertoire MO the WebServer paths will be

+automatically configured during system upgrade.

+

+The local distinguished name of this MO is ManagedElement=1, WebServer=1.

+

+The WebServer MO is created automatically by the system.</description>

+        <systemCreated/>

+        <attribute name="WebServerId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="webServerPaths">

+            <description>Paths that shall be used by the WebServer separated by the delimiter character ":".</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBySwAllocation">

+            <description>List of reserving MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="SwAllocation"/>

+                </sequence>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="IpAccessAutoConfig">

+        <description>This MO represents the Auto Configuration feature for the IpAccessHost's in Cello.

+

+</description>

+        <attribute name="IpAccessAutoConfigId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Hold a list of the identitys of the reserving IpAccessHost's.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="networkPrefix">

+            <description>The network prefix.

+

+The prefix denotes how many bits that are used for calculating the subnet mask.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>32</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="nrOfUnusedAdresses">

+            <description>The number of addresses in the range that are not used.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="totalNrOfAddresses">

+            <description>The total number of addresses in the range.

+

+Note that the first address in the range will be the same one as the one for networkAddress.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="minIpAddress">

+            <description>The lowest value that can be used as host IP address. If autoConfig=ON for an IpAccessHost,  the operator does not explicitly have to assign an Ip Address and prefixLength to the host. This is done by the Control Plane, based on the IpAccesAutoConfig identity specified for the IpAccessHost.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="maxIpAddress">

+            <description>The highest value that can be used as host IP address. If autoConfig=ON for an IpAccessHost,  the operator does not explicitly have to assign an Ip Address and prefixLength to the host. This is done by the Control Plane, based on the IpAccesAutoConfig identity specified for the IpAccessHost.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="IpAccessHostMsb">

+        <description>This MO represents the Ip Access Host used for payload. This host type executes on a MSB board (Media Stream Board used by Media Gateway).

+

+Note! If autoConfig is set to ON, the Ip Addresses and the Prefixes for this MO is set by the IpAccessAutoConfig MO.

+

+Note! There can be a maximum of 128 host's in the node.

+

+Note! The references to Aal5TpVccTp MO's has to be set in pairs.

+

+Note! The IpAccessMsbHost must execute on the sam MP as the Aal5TpVccTp that are defined in the attributes 'aal5TpVccTpRef1' and 'aal5TpVccTpRef2'.

+

+Note! The 'administrativeState' has to be set to LOCKED in order to be able to delete this host.</description>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the Ip Access Host.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>DEGRADED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state of the Ip Access Host.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="shutDownTimer">

+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.

+

+Value in seconds, must be a positive value.</description>

+            <dataType>

+                <long>

+                    <defaultValue>10</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="dspId">

+            <description>The identity of the DSP (Digital Signalling Processor) on a MSB board.

+

+Note! The value of this attribute has to be unique among the host's that execute on the same board.</description>

+            <mandatory/>

+            <noNotification/>

+            <nonPersistent/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>16</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="aal5TpVccTpRef1">

+            <description>Holds a reference to an Aal5 termination point (Aal5TpVccTp MO).

+

+Note! The Aal5TpVccTp references are mutually exclusive.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Aal5TpVccTp"/>

+            </dataType>

+        </attribute>

+        <attribute name="aal5TpVccTpRef2">

+            <description>Holds a reference to an Aal5 termination point (Aal5TpVccTp MO).

+

+Note! The Aal5TpVccTp references are mutually exclusive.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Aal5TpVccTp"/>

+            </dataType>

+        </attribute>

+        <attribute name="autoConfig">

+            <description>This attribute specifies whether the auto configuration feature for the Ip Access Host is used or not.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="AutoConfigurationMode">

+                    <defaultValue>OFF</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="autoConfigIdentity">

+            <description>The identity of the IpAccessAutoConfig MO used by this host.

+

+Note! This attribute can only be set if 'autoConfig' is set to 'ON'.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="IpAccessAutoConfig"/>

+            </dataType>

+        </attribute>

+        <attribute name="ipAddress">

+            <description>The IpAddress.

+

+Note! If autoConfig = OFF this attribute is mandatory.

+

+Note! If the autoConfiguration is used for this IpAccessHost (autoConfig = ON) this attribute cannot be set. This attribute is then set by the 'IpAccessAutoConfig MO'.

+

+Note! The IpAddress has to be unique within the node.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="networkPrefix">

+            <description>The network prefix.

+

+The prefix denotes how many bits that are used for calculating the subnet mask.

+

+Note! If auto configuration is used (autoConfig = ON) this attribute cannot be set, the networkPrefix is then set in the ipAccessAutoConfig MO class. 

+

+Note! If auto configuration is not used (autoConfig = OFF) this attribute must be set.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>32</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="linkStatusAddress">

+            <description>The link Status for Ip Address.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="mtu">

+            <description>The maximum transfer unit.

+

+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.

+

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>72</min> <max>2048</max>

+                    </range>

+                    <defaultValue>1024</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="ipDefaultTtl">

+            <description>The default value inserted into the Time-To-Live field of the IP header of datagrams originated at this entity,

+whenever a TTL value is not supplied by the transport layer protocol.

+

+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>255</max>

+                    </range>

+                    <defaultValue>50</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInReceives">

+            <description>The total number of input datagrams received from interfaces, including those received in error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInHdrErrors">

+            <description>The number of input datagrams discarded due to errors in their IP headers, including bad checksums, version number

+mismatch, other format errors, time-to-live exceeded, errors discovered in processing their IP options, etc.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInAddrErrors">

+            <description>The number of input datagrams discarded because the IP address in their IP header's destination field was not a

+valid address to be received at this entity.  This count includes invalid addresses (e.g., 0.0.0.0) and addresses of

+unsupported Classes (e.g., Class E).  For entities which are not IP routers and therefore do not forward datagrams, 

+this counter includes datagrams discarded because the destination address was not a local address.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInUnknownProtos">

+            <description>The number of locally-addressed datagrams received successfully but discarded because of an unknown or

+unsupported protocol.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInDiscards">

+            <description>The number of input IP datagrams for which no problems were encountered to prevent their continued processing, but which

+were discarded (e.g., for lack of buffer space).  Note that this counter does not include any datagrams discarded while

+awaiting re-assembly.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInDelivers">

+            <description>The total number of input datagrams successfully delivered to IP user-protocols (including ICMP).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpOutRequests">

+            <description>The total number of IP datagrams which local IP user-protocols (including ICMP) supplied to IP in requests for

+transmission.  Note that this counter does not include any datagrams counted in ipForwDatagrams</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpOutDiscards">

+            <description>The number of output IP datagrams for which no problem was encountered to prevent their transmission to their

+destination, but which were discarded (e.g., for lack of buffer space).  Note that this counter would include

+datagrams counted in ipForwDatagrams if any such packets met this (discretionary) discard criterion.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInMsgs">

+            <description>The total number of ICMP messages which the entity received.

+Note that this counter includes all those counted by icmpInErrors</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInErrors">

+            <description>The number of ICMP messages which the entity received but determined as having

+ICMP-specific errors (bad ICMP checksums, bad length, etc.).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInDestUnreachs">

+            <description>The number of ICMP Destination Unreachable messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInTimeExcds">

+            <description>The number of ICMP Time Exceeded messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInParamProbs">

+            <description>The number of ICMP Parameter Problem messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInSrcQuenchs">

+            <description>The number of ICMP Source Quench messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInRedirects">

+            <description>The number of ICMP Redirect messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInEchos">

+            <description>The number of ICMP Echo (request) messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInEchoReps">

+            <description>The number of ICMP Echo Reply messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutMsgs">

+            <description>The total number of ICMP messages which this entity attempted to send.

+Note that this counter includes all those counted by icmpOutErrors.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutErrors">

+            <description>The number of ICMP messages which this entity did not send due to problems discovered within ICMP such as a lack of

+buffers.  This value should not include errors discovered outside the ICMP layer such as the inability of IP to route the 

+resultant datagram.  In some implementations there may be no types of error which contribute to this counter's value.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutDestUnreachs">

+            <description>The number of ICMP Destination Unreachable messages sent.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutParmProbs">

+            <description>The number of ICMP Parameter Problem messages sent.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutEchos">

+            <description>The number of ICMP Echo (request) messages sent.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutEchoReps">

+            <description>The number of ICMP Echo Reply messages sent.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUdpInDatagrams">

+            <description>The total number of UDP datagrams delivered to UDP users.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUdpNoPorts">

+            <description>The total number of received UDP datagrams for which there was no application at the destination port.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUdpInErrors">

+            <description>The number of received UDP datagrams that could not be delivered for 

+reasons other than the lack of an application at the destination port.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUdpOutDatagrams">

+            <description>The total number of UDP datagrams sent from this entity.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="IpAccessHostMsbId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="plugInUnitId">

+            <description>Holds a reference to the PlugInUnit.

+

+Note that the 'plugInUnitId has to be the same as the one defined in the attribute 'processorId' found on the Aal5TpVccTpMo.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="PlugInUnit"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Aal2QosProfile">

+        <description>This MO represents the definitions of properties for a set of Aal2 quality of service classes.</description>

+        <attribute name="Aal2QosProfileId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="profileClassA">

+            <description>This attribute holds the values applicable for QoS Class A.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="QoSProfileClassA"/>

+            </dataType>

+        </attribute>

+        <attribute name="profileClassB">

+            <description>This attribute holds the values applicable for QoS Class B.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="QoSProfileClassB"/>

+            </dataType>

+        </attribute>

+        <attribute name="profileClassC">

+            <description>This attribute holds the values applicable for QoS Class C.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="QoSProfileClassC"/>

+            </dataType>

+        </attribute>

+        <attribute name="profileClassD">

+            <description>This attribute holds the values applicable for QoS Class D.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="QoSProfileClassD"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>List of reserving Aal2PathVccTp MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="Aal2PathVccTp"/>

+                </sequence>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Aal2QosCodePointProfile">

+        <description>This MO represents the QoS CodePoints for the different Aal2 QoS classes.</description>

+        <attribute name="Aal2QosCodePointProfileId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="qualityOfServiceCodePointA">

+            <description>The Code Point for Class A.

+

+Recommended value for Class A, 128.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="qualityOfServiceCodePointB">

+            <description>The Code Point for Class B.

+

+Recommended value for Class B, 129.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="qualityOfServiceCodePointC">

+            <description>The Code Point for Class C.

+

+Recommended value for Class C, 130.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="qualityOfServiceCodePointD">

+            <description>The Code Point for Class D.

+

+Recommended value for Class D, 131.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Holds the identity of the reserving Aal2Ap Mo.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="Aal2Ap"/>

+                </sequence>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="M3uAssociation">

+        <description>This MO represents the M3UA Association part of the M3UA (MTP3-User Adaptaion Layer) that is a protocol 

+for the transport of  any SS7 MTP3-User signalling (e.g., ISUP and SCCP messages) over IP using the services 

+of the Stream Control Transmission Protocol.

+

+Note that the local port number is hard coded to 2905.

+

+

+</description>

+        <attribute name="M3uAssociationId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Holds a list of the reserving Signaling Route's (Mtp3bSr MO). 

+</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="Mtp3bSr"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The Operational State of the M3Ua</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="mtp3bSrsId">

+            <description>The identity of the Signalling Route Set used.</description>

+            <mandatory/>

+            <noNotification/>

+            <nonPersistent/>

+            <restricted/>

+            <dataType>

+                <moRef name="Mtp3bSrs"/>

+            </dataType>

+        </attribute>

+        <attribute name="sctpId">

+            <description>The SctpHost used by this association.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Sctp"/>

+            </dataType>

+        </attribute>

+        <attribute name="dscp">

+            <description>The DSCP, DiffServCodePoint, for the internal M3UA user.

+Only one DSCP value is valid and set by the first defined MO 'instance'.

+

+NOTE: The value set for the 'dscp' when creating the first M3uAssociation under a signaling point will also be used for all other M3uAssociation MO's that are created under this signaling point. So setting the value for the 'dscp' on other instances than the first one created will have no effect. Note that associations created under a different signaling point can have a different dscp-value. </description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>63</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="associationState">

+            <description>The possible states of an M3Ua association.

+

+Bit 1 = 1 indicates INACTIVE

+Bit 2 = 1 indicates ACTIVE

+Bit 3 = 1 indicates ESTABLISHED

+Bit 4 = 1 indicates DOWN

+

+These values are mutually exclusive.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>15</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="localIpMask">

+            <description>This attribute denotes whether single or multi homing is used.

+

+Note! that all M3uAssociations that refers to the same SCTP MO must have this attribute set to the same value.

+

+Note! If localipMask=2 or localipMask=3 . the attribute ipAddress2 or  autoConfigIdentity2 in IpAccessHostGpb MO must be defined.

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="HomingState">

+                    <defaultValue>SINGLE_HOMED_1</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="autoStartAssociation">

+            <description>If true, the M3ua layer in the stack will after a restart, start up all signalling associations.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="remotePortNumber">

+            <description>The port number of the remote signalling point (SP).</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>65535</max>

+                    </range>

+                    <defaultValue>2905</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="remoteIpAddress1">

+            <description>Remote IpAddress 1, if not used the value should be an empty string.

+Range is 0.0.0.0 - 255.255.255.255

+

+Note! This address is concidered as the primary IP-address. In case of association establisment failure 'remoteIpAddress2' will be used.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="remoteIpAddress2">

+            <description>Remote IpAddress 2, if not used the value should be an empty string.

+Range is 0.0.0.0 - 255.255.255.255

+

+Note! This address cannot be the same as remoteIpAddress1. This address is used when trying to establish association in case association attempt using 'remoteIpAddress1' fails.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCommunicationLost">

+            <description>Number of communication losses.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfCongestions">

+            <description>Number of congestions.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDunaRec">

+            <description>Number of DUNA messages received through the association.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDavaRec">

+            <description>Number of DAVA messages received through the association.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSconRec">

+            <description>Number of SCON messages received through the association.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDupuRec">

+            <description>Number of DUPU messages received through the association.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDataMsgSent">

+            <description>The number of data messages sent on the associations related to this signalling point.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDunaSent">

+            <description>Number of DUNA messages sent through the association.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDavaSent">

+            <description>Number of DAVA messages sent through the association.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfSconSent">

+            <description>Number of SCON messages sent through the association.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDupuSent">

+            <description>Number of DUPU messages sent through the association.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDataMsgRec">

+            <description>Number of DATA (payload data) messages received through the association.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfErrorMsgRec">

+            <description>Number of ERROR messages received through the association.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfErrorMsgSent">

+            <description>Number of ERROR messages sent through the association.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfNotifyMsgRec">

+            <description>Number of NOTIFY messages received through the association.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDaudMsgSent">

+            <description>The number of daud messages sent on the associations related to this signalling point.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfDaudMsgRec">

+            <description>The number of daud messages received on the associations related to this signalling point.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspupSent">

+            <description>The number of ASPUP sent.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspupReceived">

+            <description>The number of ASPUP received.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspdnSent">

+            <description>The number of ASPDN sent.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspdnReceived">

+            <description>The number of ASPDN received.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspacSent">

+            <description>The number of ASPAC sent.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspacReceived">

+            <description>The number of ASPAC received.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspiaSent">

+            <description>The number of ASPIA sent.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspiaReceived">

+            <description>The number of ASPIA received.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspupAckSent">

+            <description>The number of ASPUP_Ack sent.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspupAckReceived">

+            <description>The number of ASPUP_Ack received.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspdnAckSent">

+            <description>The number of ASPDN_Ack sent.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspdnAckReceived">

+            <description>The number of ASPDN_Ack received.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspacAckSent">

+            <description>The number of ASPAC_Ack sent.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspacAckReceived">

+            <description>The number of ASPAC_Ack received.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspiaAckSent">

+            <description>The number of ASPIA_Ack sent.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfAspiaAckReceived">

+            <description>The number of ASPIA_Ack received.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfM3uaDataMsgDiscarded">

+            <description>The number of data Messages discarded.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <action name="setAutoActivate">

+            <description>This action starts the association.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+        <action name="setAutoDown">

+            <description>This action stops the association.

+

+Note! This action requires a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+    </class>

+

+    <class name="Sctp">

+        <description>This MO represents the SCTP, Stream Control Transmission Protocol in Cello.

+SCTP is designed to transport signaling messages over IP networks.</description>

+        <attribute name="SctpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the Ip Access Host.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="numberOfAssociations">

+            <description>The maximum number of M3uAssociations that can be handled by this SCTP MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>512</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Holds a list of the M3Ua's handled by the SCTP.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="M3uAssociation"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="ipAccessHostGpbId">

+            <description>The identity of the IpAccessHostGbp reserved by this MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="IpAccessHostGpb"/>

+            </dataType>

+        </attribute>

+        <attribute name="minimumRto">

+            <description>The minimum value for RTO (Retransmission time-out).

+The minimumRto shall be larger than tSack + expected Round Trip Time.

+

+Unit is second/100. 

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>4</min> <max>500</max>

+                    </range>

+                    <defaultValue>8</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maximumRto">

+            <description>The maximum value for RTO (Retransmission time-out).

+

+Unit is second/100.

+

+maximumRto must be larger than minimumRto.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>4</min> <max>180000</max>

+                    </range>

+                    <defaultValue>15</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="initialRto">

+            <description>The initial value that the RTO (Retransmission time-out) will take prior to the first RTT (Round Trip Time) measure.

+

+Note that the value for 'initialRto' has to be equal to or greater than 'minimumRto'.

+

+Unit is seconds/100.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>4</min> <max>180000</max>

+                    </range>

+                    <defaultValue>8</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="rtoAlphaIndex">

+            <description>This parameter is used for computing the value of the SRTT (Smoothed Round Trip Time) for a specific destination

+address. Is is used to weight the RTT values, and it's value must be between 0 and 1 (0 &lt; rtoAlpha &lt; 1). A value

+close to 1 gives a higher importance to the last RTT measurement.

+The range of possible values in the configuration file and the actual value given to this parameter within the module

+are the following:

+

+rtoAlphaIndex = 1 -&gt; RTO-Alpha = 1/2

+rtoAlphaIndex = 2 -&gt; RTO-Alpha = 1/4

+rtoAlphaIndex = 3 -&gt; RTO-Alpha = 1/8

+rtoAlphaIndex = 4 -&gt; RTO-Alpha = 1/16</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>4</max>

+                    </range>

+                    <defaultValue>3</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="rtoBetaIndex">

+            <description>This parameter is used for computing the the value of RTTVar (Round Trip Time Variation) of a destination

+address. 

+It's value must be between 0 and 1 (0 &lt; rtoBetaIndex &lt; 1). A value close to 1 gives more importance to the

+last observed variation.

+The range of possible values in the configuration file and the actual value given to this parameter within the module

+are the following:

+

+rtoBetaIndex = 1 -&gt; RTO-Beta = 1/2

+rtoBetaIndex = 2 -&gt; RTO-Beta = 1/4

+rtoBetaIndex = 3 -&gt; RTO-Beta = 1/8

+rtoBetaIndex = 4 -&gt; RTO-Beta = 1/16

+</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>4</max>

+                    </range>

+                    <defaultValue>2</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="validCookieLife">

+            <description>This parameter sets up the lifespan of the State Cookie sent in the INIT_ACK chunk. It is used for limiting the

+the valid amount of time between sending the INIT_ACK and the reception of a COOKIE_ECHO chunk when

+establishing an association.

+If a COOKIE_ECHO chunk arrives after 'validCookieLife' has expired when sending an INIT_ACK chunk, the

+COOKIE_ECHO shall be discarded and no association will be established.

+

+Unit is seconds.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>180</max>

+                    </range>

+                    <defaultValue>60</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="allowedIncrementCookieLife">

+            <description>The sender of an INIT chunk may request to the remote endpoint a cookie life-span increase (for example, if a previous attempt to

+connect failed due to a state-cookie error). If the value sent in the "Cookie Preservative field" of the INIT chunk is less or equal to

+this parameter, the reciver of the INIT chunk will increase the 'validCookieLife' with the number of seconds specified. If the value

+present in the "Cookie Preservative field" is higher than this parameter, the cookie life should be incremented with the number of

+seconds specified by the parameter.

+

+Unit is seconds.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>180</max>

+                    </range>

+                    <defaultValue>30</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="keyChangePeriod">

+            <description>Defines how often the secret key used for computing the MAC (Message Authentication Code) on the State Cookie is changed.

+

+Unit is seconds.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>180</max>

+                    </range>

+                    <defaultValue>4</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="associationMaxRtx">

+            <description>This is the maximum number of consecutive retransmissions to a remote peer (on all the destination transport addresses of the peer, if it's multi homed). If the number of retransmissions becomes higher than this value, the remote peer shall be considered unreachable and the association shall be closed down.

+

+The value of this attribute should be greater than, or equal to the value of the attribute 'pathMaxRtx'.

+

+Note that for a specific association, it might happen that all the remote addresses (if the the remote end is multi homed) becomes unreachable without exceeding the 'associationMaxRtx'. In such a case the association will be closed down.

+

+Note! The value need to be increased to avoid frequent CommLost's in case of an unstable network.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>20</max>

+                    </range>

+                    <defaultValue>2</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pathMaxRtx">

+            <description>Maximum number of consecutive retransmissions to a remote transport address. If the number of retransmissions becomes higher than this value, the remote transport address shall be considered as "inactive" and no data shall be sent to it. If all of the remote transport addresses becomes "inactive", tha association will be closed down.

+

+Note! The value need to be increased to avoid frequent CommLost's in case of an unstable network.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>20</max>

+                    </range>

+                    <defaultValue>2</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxInitialRtrAtt">

+            <description>The maximum nimber of retransmissions allowed for both INIT and COOKIE_ECHO chunks. If the number of retransmissions

+exceeds this value, then the SCTP must abort the initialization of the association and report the error to the user.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>16</max>

+                    </range>

+                    <defaultValue>8</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxShutDownRtrAtt">

+            <description>The maximum number of retransmission during the shutdown phase of an association.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>16</max>

+                    </range>

+                    <defaultValue>5</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="heartbeatInterval">

+            <description>The amount of time added to the RTO (Retransmission Time Out) of a specific address when setting up the period of

+time between sending heartbeats. Small values can lead to an earlier detection of unreachable addresses than higher

+values. Note that sendig often might lead to performace penalty.

+

+Unit is seconds.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>1800</max>

+                    </range>

+                    <defaultValue>30</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="heartbeatStatus">

+            <description>This attribute enables/disables heartbeats for associations.

+

+True = Enables</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>true</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="maxIncomingStream">

+            <description>This is the maximum incoming streams (MIS) for an association. Established associations might have an IS less or equal to

+this, but it's MIS can never be higher than the value of this attribute.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>16384</max>

+                    </range>

+                    <defaultValue>17</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxOutgoingStream">

+            <description>The maximum number of outgonig streams for an association.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>16384</max>

+                    </range>

+                    <defaultValue>17</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxUserDataSize">

+            <description>The maximum number of bytes a user is allowed to pass as a non fragmentable user data in a SCTP_SEND_REQ message

+(fixed user MTU):

+The values for this attribute is 'user' data and do not include IP header (20 bytes), SCTP header (12 bytes) or DATA chunk

+header (16 bytes).

+

+Unit is bytes.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>528</min> <max>65484</max>

+                    </range>

+                    <defaultValue>1432</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="mBuffer">

+            <description>This attribute sets the size of the buffer used for storing user data pending to be sent or retransmitted in an association. I.e. establish the maximum amount of user data that SCTP shall buffer before discarding user messages.

+

+The Unit is in kilo bytes.

+

+Note! The restriction on this attribute is:

+mBuffer x number of M3uAssociation MOs connected to this Sctp + 20 Mb &lt;= the heap for Sctp program.

+

+Note! The value may need to be increased to ensure stable dataflow at high load.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>2048</max>

+                    </range>

+                    <defaultValue>128</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="nThreshold">

+            <description>This attribute sets the value of the threshold used by SCTP to stop the delivery of data on anassociation.

+Once nThreshold or more bytes are queued and pending to be sent, the SCTP layer shall issue an indication to the user.

+The value of nThreshold should be less than mBuffer in order to be effective. A normal value for nThreshold is 3/4 * mBuffer.

+

+Unit is kilo bytes.

+

+Note! The value may need to be increased to ensure stable dataflow at high load.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>2048</max>

+                    </range>

+                    <defaultValue>96</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="tSack">

+            <description>The delay of sending the SACK. I.e. the time from DATA chunk reception to Sack chunk sending.

+

+Unit is second/100</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>2</min> <max>50</max>

+                    </range>

+                    <defaultValue>4</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxDataSizeIp">

+            <description>The maximum number of bytes SCTP shall be able to fetch every time it reads from the socket.

+

+Note! This value includes the Ip header, 20 bytes.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1500</min> <max>65535</max>

+                    </range>

+                    <defaultValue>8192</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="initialAdRecWin">

+            <description>The value of the initial advertised reciver window.

+

+Note! The range is 1500 to maxDataSizeIp.

+

+Unit is bytes.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1500</min> <max>65535</max>

+                    </range>

+                    <defaultValue>8192</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="intervalOobPkts">

+            <description>The number of seconds for the interval for which the counter for out of the blue chunks will be reset.

+

+Unit is seconds.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>6500</max>

+                    </range>

+                    <defaultValue>3600</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="intervalLostUser">

+            <description>The number of seconds for the interval for which the SCTP will decide that the SCTP user that lost the

+connection is dead. After the time specified in this attribute has elapsed, all associations related to the

+SCTP user will be destroyed.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>3600</max>

+                    </range>

+                    <defaultValue>5</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="maxBurst">

+            <description>The number of packages that will be sent during the fast retransmit phase when a SACK is processed.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>16384</max>

+                    </range>

+                    <defaultValue>4</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="nPercentage">

+            <description>The size of 'n' inpercentage when SCTP_CONGESTION_CEASE_IND is sent. At 100 percent the

+primitive will buffer usage goes below 'nThreshold'.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>100</max>

+                    </range>

+                    <defaultValue>85</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="bundlingActivated">

+            <description>This attribute enables/disables the use of bundling.

+Valid values:

+1: enabled.

+0: disabled.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>1</max>

+                    </range>

+                    <defaultValue>1</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="bundlingTimer">

+            <description>This attribute specifies maximum SCTP bundling delay.

+Value=0 means that SCTP will only bundle what is available and send directly (no delay).

+Unit is milliseconds</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>1000</max>

+                    </range>

+                    <defaultValue>10</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpCurrEstab">

+            <description>Number of SCTP associations for which the current state is either ESTABLISHED, SHUTDOWN-PENDING, or SHUTDOWN-RECEIVED.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpActiveEstab">

+            <description>Number of times that SCTP associations have made a direct transition to the ESTABLISHED state from the COOKIE-ECHOED state.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpPassiveEstab">

+            <description>Number of times that SCTP associations have made a direct transition to the ESTABLISHED state from the CLOSED state.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpAborted">

+            <description>Number of times that SCTP associations have made a direct transition to the CLOSED state from any state using the primitive ABORT.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpShutdowns">

+            <description>Number of times that SCTP associations have made a direct transition to the CLOSED state from either the SHUTDOWN-SENT state or the SHUTDOWN-ACK-SENT state.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatAssocOutOfBlue">

+            <description>Number of out of the blue packets (SCTP packet correctly formed-right checksum- but the receiver is not able to identify the association to which this packet belongs) received by the host.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatSentChunks">

+            <description>Number of complete data chunks sent to the peers (no retransmissions included).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatRecChunks">

+            <description>Number of complete data chunks received from the peers (no retransmissions included).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatOutOfOrderSendChunks">

+            <description>Number of unordered chunks sent to the peers.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatOutOfOrderRecChunks">

+            <description>Number of unordered chunks received from the peers.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatChecksumErrorCounter">

+            <description>Number of SCTP packets received from the peers with an invalid checksum.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatRetransChunks">

+            <description>Number of data chunks retransmitted to the peers.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatSentControlChunks">

+            <description>Number of datagrams sent with chunk type id &gt; 0.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatReceivedControlChunks">

+            <description>Number of datagrams Receivedwith chunk type id &gt; 0.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatFragmentedUserMsg">

+            <description>Number of fragmented user messages, incremented when the first data chunk of a fragmented message is sent.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatReassembledUserMsg">

+            <description>Number of reassembled user messages, incremented when the first data chunk of a fragmented message is received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatSentPackages">

+            <description>Number of SCTP packages sent.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatReceivedPackages">

+            <description>Number of SCTP packages Received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatCommStop">

+            <description>Number of times the SCTP has sent a communication stop indication to the user.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatCommResume">

+            <description>Number of times SCTP has sent a communication resume indication to the user.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatSentChunksDropped">

+            <description>Number of sent chunks that SCTP has been forced to drop due to buffer overflow in the sending buffer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSctpStatRecChunksDropped">

+            <description>Number of received chunks that SCTP has been forced to drop due to buffer overflow in the receiving buffer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Sts1SpeTtp">

+        <description>This MO represents the termination of the SONET higher order paths.

+This MO is automatically created when creating the OS155SPITTP with mux mode

+set to E1_J1_T1_LEVEL and standardmode set to ANSI.

+

+The performance monitoring counters in the Sts1SpeTtp MO is set to 0 (zero) at start or restart of the node.

+When the value is to large to fit in to a long (31bit) the counter turns over and starts from 0 again.</description>

+        <attribute name="Sts1SpeTtpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>enabled or disabled according to the actual operational state of the Sts3CspeTtp.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="aisPReporting">

+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="rdiPReporting">

+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="timConsequentAction">

+            <description>Trace Identifier Mismatch (TIM) consequent action, i.e. for generation of Alarm Indication Signal (AIS) downstream and Remote Defect Indication (RDI) upstream as a consequence of the TIM detection. 

+

+True - enabled.

+False - disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="expectedPathTrace">

+            <description>Expected path trace. 

+

+The string can be of 64 characters length, or empty string ("").

+

+Note: An empty string for this attribute means that the detection of Trace Identifier Mismatch (TIM) should be disabled. This attribute is set to empty string every time attribute pathTraceFormat is set.</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>64</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="transmittedPathTrace">

+            <description>The transmitted path trace. 

+Can be defined in two formats. The format may be in 16 or 64 characters. Usually 16 is used for ETSI and 64 for ANSI/TTC.

+

+Note: The string must be of 15 or 62 characters length, or empty string ("").</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>64</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="pmEsp">

+            <description>Performance Monitoring counter for ES, Errored Seconds.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSesp">

+            <description>Performance Monitoring counter for Severely Errored Seconds, SES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Vt15Ttp">

+        <description>This MO is automatically created when the configuring the Os155SpiTtp. It represents the termination of the SONET VP 1.5 path layer. 

+

+This MO is automatically created when creating the Os155SpiTtp MO with the following conditions:

+muxmode = E1_J1_T1_LEVEL

+standardmode =  ANSI

+

+The performance monitoring counters in the Vt15Ttp is set to 0 (zero) at start or restart of the node.

+When the value is too large too fit in to a long (31bit) the counter turns over and starts from 0 again.

+</description>

+        <systemCreated/>

+        <attribute name="Vt15TtpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="aisVreporting">

+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="rdiVreporting">

+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="shutDownTimer">

+            <description>This timer defines the time that elapses before shut down when administrativeState is se to 'shuttingDown'.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>100000</max>

+                    </range>

+                    <defaultValue>1800</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the Vt15Ttp MO.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state of the Vt15Ttp MO.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmEs">

+            <description>Performance monitoring counter of Errored Seconds (ES).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSes">

+            <description>Performance monitoring counter for Serverely Errored Seconds.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="T1Ttp">

+        <description>This MO represents a channelised T1 interface in the node. The T1Ttp MO does not define which type of traffic (TDM or ATM) that the interface should support. Please refer to the Ds0Bundle, AtmPort, IMALink and IMAGroup objects for details about configuration of traffic type.

+

+The performance monitoring counters in the T1Ttp MO is set to 0 (zero) at start or restart of the node.

+When the value is to large too fit in to a long (31bit) the counter turns over and starts from 0 again.

+

+Note! This MO is automatically created as a consequence of creating an Os155SpiTtpMo

+Please refer to the Os155SpiTtpMo for more details.</description>

+        <systemCreated/>

+        <attribute name="T1TtpId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="aisReporting">

+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="rdiReporting">

+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the T1Ttp MO.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmEs">

+            <description>Performance monitoring counter of Errored Seconds (ES).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSes">

+            <description>Performance monitoring counter for Serverely Errored Seconds.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving AtmPort MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="AtmPort"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedByImaLink">

+            <description>The identity of the reserving ImaLink MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ImaLink"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="E3PhysPathTerm">

+        <description>This MO represents an E3 (i.e. 34 Mbit/s) physical interface in the node. Please refer to the AtmPort object for details about configuration of traffic type.

+

+Note! The performance monitoring counters in the E3PhysPathTerm MO is set to 0 (zero) at start or restart of the node.

+When the value is too large too fit in to a long (31bit) the counter turns over and starts from 0 again.</description>

+        <attribute name="E3PhysPathTermId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state of the E3PhysPathTerm.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="shutDownTimeout">

+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.

+

+Value in seconds, must be a positive value.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100000</max>

+                    </range>

+                    <defaultValue>1800</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>enabled or disabled according to the actual operational state of the Physical Line Termination. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="lineNo">

+            <description>The actual Line number on the board.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>2</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="loopback">

+            <description>Possible values

+

+none - This is the normal state, no loop back is performed (and ordinary traffic is running).

+

+line - The physical path is looped on the line side, the external incoming path is looped back to the external outgoing path.

+

+system - The physical path is looped on the system side, the (node-) internal incoming path is looped back to the internal outgoing path.

+

+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>

+            <dataType>

+                <enumRef name="LoopbackState">

+                    <defaultValue>none</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="degDegThr">

+            <description>The threshold decides how many of the received blocks that are allowed to have bit errors. The measurement is made on a per-second basis and if the threshold is passed the second is considered bad.

+

+This is a percentage value.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100</max>

+                    </range>

+                    <defaultValue>30</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="degDegM">

+            <description>How many bad seconds in a row that causes a Degraded Signal alarm.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>2</min> <max>10</max>

+                    </range>

+                    <defaultValue>7</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="aisReporting">

+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="rdiReporting">

+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="pmEs">

+            <description>Performance Monitoring counter for ES, Errored Seconds.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSes">

+            <description>Performance Monitoring counter for Severely Errored Seconds, SES.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedByTraffic">

+            <description>The identity of the reserving AtmPort MO. </description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="AtmPort"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBySync">

+            <description>The identity of the reserving Synchronization MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Synchronization"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="T3PhysPathTerm">

+        <description>This MO represents an T3 (i.e. 45 Mbit/s) physical interface in the node. Please refer to the AtmPort object for details about configuration of traffic type.

+

+Note! The performance monitoring counters in the T3PhysPathTerm MO is set to 0 (zero) at start or restart of the node.

+When the value is too large too fit in to a long (31bit) the counter turns over and starts from 0 again.</description>

+        <attribute name="T3PhysPathTermId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>enabled or disabled according to the actual operational state of the Physical Line Termination. </description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state of the T3PhysPathTerm MO.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="shutDownTimeout">

+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.

+

+Value in seconds, must be a positive value.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>100000</max>

+                    </range>

+                    <defaultValue>1800</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="lineNo">

+            <description>The actual Line number on the board.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>2</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="loopback">

+            <description>Possible values

+

+none - This is the normal state, no loop back is performed (and ordinary traffic is running).

+

+line - The physical path is looped on the line side, the external incoming path is looped back to the external outgoing path.

+

+system - The physical path is looped on the system side, the (node-) internal incoming path is looped back to the internal outgoing path.

+

+Note! administrativeStatus must be set to locked when setting loopback attribute.</description>

+            <dataType>

+                <enumRef name="LoopbackState">

+                    <defaultValue>none</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="aisReporting">

+            <description>Indicates whether Alarm Indication Signal, AIS, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="rdiReporting">

+            <description>Indicates whether Remote Defect Indication, RDI, alarms are to be issued.

+

+true - reporting enabled.

+false - reporting disabled.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="pmEsCpp">

+            <description>Performance Monitoring counter for ES, Errored Seconds based on C-bit parity.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmSesCpp">

+            <description>Performance Monitoring counter for Severely Errored Seconds, SES based on C-bit parity.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="reservedByTraffic">

+            <description>The identity of the reserving AtmPort MO. </description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="AtmPort"/>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBySync">

+            <description>The identity of the reserving Synchronization MO.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="Synchronization"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Etm3">

+        <description>This MO represents the hardware of the ET-M3 board type. It only represents the ET specific hardware, while the DBM module of the board is represented by the PlugInUnit MO.

+

+The ET-M3 board contains 2 physical ports that can be configured as either E3 (ETSI) or T3(ANSI). 

+

+Each port on the ET-M3 board can be used to carry ATM traffic. 

+

+At the VP/VC endpoints, the Lost FPM/BR cells counters are not available. 

+

+IMA is not applicable for theETM3 board.

+

+The ET-M3 board supports eight bidirectional F4/F5 PM flow per port.

+

+The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 8/port. 

+

+Each port can support up to 240 ATM VC connections. Sixteen of these connections are reserved for AAL2 paths, and therefore sixteen AAL2 multiplexers per port are available.

+

+Each port can support up to 16 VP connections. </description>

+        <attribute name="Etm3Id">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Enabled or disabled according to the actual operational state of the Etm3 board.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="SccpApRemote">

+        <description>This Managed Object represents an SCCP Remote Access Point. An SCCP AP instance is a logical point in the SCCP network at which an SCCP user can access the services provided by the SCCP and the SCCP can deliver its services to the SCCP user. The SCCP Remote Access Point is identified by a SubSystem Number (SSN).

+

+A remote SccpAp represents an access point in another node and is related to a Mtp3bAp MO. 

+

+The performance monitoring counters found in SccpAp MO is reset, set to zero, when the object is created. 

+These counters will not be reset again unless there is a shutdown request from the CLI (Cluster Interface).</description>

+        <attribute name="SccpApRemoteId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the SCCP AP. The operability of the SCCP AP is described by this attribute which has two possible values: 

+

+Disabled: The SCCP AP is totally inoperable and unable to provide the service to the user (e.g. if the MTP-3b AP is not usable).

+

+Enabled: The SCCP AP is partly or fully  operable and available for use.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>Holds a list of the reserving MOs.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <sequence>

+                    <moRef name="ManagedObject"/>

+                </sequence>

+            </dataType>

+        </attribute>

+        <attribute name="mtp3bApId">

+            <description>The identity of the Mtp3bAp used by this MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="Mtp3bAp"/>

+            </dataType>

+        </attribute>

+        <attribute name="ssN">

+            <description>The sub system number, SSN, of the SCCP Access Point. Note that this has to be a unique number.

+

+The SSN has to be unique among all other SccpApRemote MOs that has the same DPC in their corresponding Mtp3bSrs MOs.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>2</min> <max>255</max>

+                    </range>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="IpAccessHostGpb">

+        <description>This MO represents the Ip Access Host used for payload. This host type executes on a GPB board (GeneralPocessorUnit).

+

+Note! If autoConfig is set to ON, the Ip Addresses and the Prefixes for this MO is set by the IpAccessAutoConfig MO.

+

+Note! There can be a maximum of 128 host's in the node, and only one host on each main processor.

+

+Note! The host cannot be configured on a MP which have a MediumAccessUnit-child MO. They are exclusive.

+

+Note! The 'administrativeState' has to be set to LOCKED in order to be able to delete this host.</description>

+        <attribute name="IpAccessHostGpbId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="reservedBy">

+            <description>The identity of the reserving MO, can be of type Sctp.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>The operational state of the Ip Access Host.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>DEGRADED</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="administrativeState">

+            <description>The administrative state of the Ip Access Host.</description>

+            <dataType>

+                <enumRef name="AdmState">

+                    <defaultValue>locked</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="shutDownTimer">

+            <description>The shut-down timer. It is used when the administrativeState is set to shutdown.

+

+Value in seconds, must be a positive value.</description>

+            <dataType>

+                <long>

+                    <defaultValue>10</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="linkStatusAddress1">

+            <description>The link status for IpAddress1.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="linkStatusAddress2">

+            <description>The link status for IpAddress2, only valid if 2 IpAddresses are configured for this host.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="generalProcessorUnitId">

+            <description>Holds a reference to the GPU (GenerelProcessorUnit).</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="GeneralProcessorUnit"/>

+            </dataType>

+        </attribute>

+        <attribute name="autoConfig">

+            <description>This attribute specifies whether the auto configuration feature for the Ip AccessHost is used or not.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="AutoConfigurationMode">

+                    <defaultValue>OFF</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="autoConfigIdentity">

+            <description>The identity of the IpAccessAutoConfig MO used by this host.

+

+Note! This attribute is mandatory if 'autoConfig' is set to ON.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="IpAccessAutoConfig"/>

+            </dataType>

+        </attribute>

+        <attribute name="autoConfigIdentity2">

+            <description>The identity of the IpAccessAutoConfig MO used by this host.

+

+Note! This attribute can only be set if 'autoConfig' is set to 'ON'. This attribute is not neccesary to set if 'autoConfig' is set to ON, unless the host shall have two Ip Addresses automatically assigned.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="IpAccessAutoConfig"/>

+            </dataType>

+        </attribute>

+        <attribute name="ipAddress">

+            <description>The IpAddress.

+

+Note! If autoConfig = OFF this attribute is mandatory.

+Note! If the autoConfiguration is used for this IpAccessHostGpb (autoConfig = ON) this attribute cannot be set. This attribute is then set by the 'IpAccessAutoConfig MO'.

+Note! If the attribute is set, its value must not be the same as for attribute ipAddress2.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="ipAddress2">

+            <description>The second IpAddress.

+

+Note! If autoConfig = OFF this attribute is possible to set. This attribute should only be set if multi-homing is used for this host (i.e. two addresses defined).

+Note! If the autoConfiguration is used for this IpAccessHostGpb (autoConfig = ON) this attribute cannot be set. This attribute is then set by the 'IpAccessAutoConfig MO'.

+Note! If the attribute is set, its value must not be the same as for attribute 'ipAddress'.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="pathMTUDiscovery">

+            <description>Specifies whether path MTU discovery should be used by this host.

+

+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.</description>

+            <dataType>

+                <boolean>

+                    <defaultValue>false</defaultValue>

+                </boolean>

+            </dataType>

+        </attribute>

+        <attribute name="mtu">

+            <description>The maximum transfer unit.

+

+The MTU has a initial value of 1452 if pathMTUDiscovery is set to false.

+If pathMTUDiscovery is set to true, the initial value of MTU is 1452.

+

+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>72</min> <max>2048</max>

+                    </range>

+                    <defaultValue>1452</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="ipDefaultTtl">

+            <description>The default value inserted into the Time-To-Live field of the IP header of datagrams originated at this entity,

+whenever a TTL value is not supplied by the transport layer protocol.

+

+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.</description>

+            <dataType>

+                <long>

+                    <range>

+                        <min>1</min> <max>255</max>

+                    </range>

+                    <defaultValue>50</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="ipReasmTimeout">

+            <description>The maximum number of seconds which received fragments are 

+held while they are awaiting reassembly at this entity.

+

+Note! in order to be able to set the value for this attribute, the administrative state has to be locked.

+

+Note! The value for this attribute has to be positive.</description>

+            <dataType>

+                <long>

+                    <defaultValue>300</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="nextHopIpAddr">

+            <description>The next hop IP address.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="nextHopIpAddr2">

+            <description>The secondary next hop IP address.

+

+Note! This attribute must only be set if one of the following conditions are fulfilled:

+1. Attribute 'ipAddress2' is set.

+2. Attribute 'autoConfig' = 'ON' and attribute 'autoConfigIdentity2' is set.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="networkPrefix">

+            <description>The network prefix.

+

+The prefix denotes how many bits that are used for calculating the subnet mask.

+

+Note! The default value 0 (zero) is most likely not possible to use and an other value should be submitted if this attribute is configured manually. 

+Note! If auto configuration is not used (autoConfig = OFF) this attribute must be set (i.e. this attribute is then 'mandatory').

+Note! If auto configuration is used (autoConfig = ON) this attribute cannot be set, networkPrefix is then set by the ipAccessAutoConfig MO class. 

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>32</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="networkPrefix2">

+            <description>The second network prefix.

+

+The prefix denotes how many bits that are used for calculating the subnet mask.

+

+Note! The default value 0 (zero) is most likely not possible to use and an other value should be submitted if this attribute is configured manually. 

+Note! If auto configuration is not used (autoConfig = OFF) and ipAddress2 is set this attribute must be set (i.e. this attribute is then 'mandatory').

+Note! If auto configuration is used (autoConfig = ON) this attribute cannot be set, networkPrefix2 is then set by the ipAccessAutoConfig MO class. </description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>32</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInReceives">

+            <description>The total number of input datagrams received from interfaces, including those received in error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInHdrErrors">

+            <description>The number of input datagrams discarded due to errors in their IP headers, including bad checksums, version number

+mismatch, other format errors, time-to-live exceeded, errors discovered in processing their IP options, etc.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInAddrErrors">

+            <description>The number of input datagrams discarded because the IP address in their IP header's destination field was not a

+valid address to be received at this entity.  This count includes invalid addresses (e.g., 0.0.0.0) and addresses of

+unsupported Classes (e.g., Class E).  For entities which are not IP routers and therefore do not forward datagrams, 

+this counter includes datagrams discarded because the destination address was not a local address.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInUnknownProtos">

+            <description>The number of locally-addressed datagrams received successfully but discarded because of an unknown or

+unsupported protocol.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInDiscards">

+            <description>The number of input IP datagrams for which no problems were encountered to prevent their continued processing, but which

+were discarded (e.g., for lack of buffer space).  Note that this counter does not include any datagrams discarded while

+awaiting re-assembly.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpInDelivers">

+            <description>The total number of input datagrams successfully delivered to IP user-protocols (including ICMP).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpOutRequests">

+            <description>The total number of IP datagrams which local IP user-protocols (including ICMP) supplied to IP in requests for

+transmission.  Note that this counter does not include any datagrams counted in ipForwDatagrams</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpOutDiscards">

+            <description>The number of output IP datagrams for which no problem was encountered to prevent their transmission to their

+destination, but which were discarded (e.g., for lack of buffer space).  Note that this counter would include

+datagrams counted in ipForwDatagrams if any such packets met this (discretionary) discard criterion.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpReasmReqds">

+            <description>The number of IP fragments received which needed to be reassembled at this entity.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpReasmOKs">

+            <description>The number of IP datagrams successfully re-assembled.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpReasmFails">

+            <description>The number of failures detected by the IP re-assembly algorithm (for whatever reason: timed out, errors, etc).

+Note that this is not necessarily a count of discarded IP fragments since some algorithms (notably the algorithm 

+in RFC 815) can lose track of the number of fragments by combining them as they are received.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpFragOKs">

+            <description>The number of IP datagrams that have been successfully fragmented at this entity.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpFragFails">

+            <description>The number of IP datagrams that have been discarded because they needed to be fragmented 

+at this entity but could not be, e.g., because their Don't Fragment flag was set.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIpFragCreates">

+            <description>The number of IP datagram fragments that have been generated as a result of fragmentation at this entity.

+</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInMsgs">

+            <description>The total number of ICMP messages which the entityreceived.

+Note that this counter includes all those counted by icmpInErrors</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInErrors">

+            <description>The number of ICMP messages which the entity received but determined as having

+ICMP-specific errors (bad ICMP checksums, bad length, etc.).</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInDestUnreachs">

+            <description>The number of ICMP Destination Unreachable messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInTimeExcds">

+            <description>The number of ICMP Time Exceeded messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInParamProbs">

+            <description>The number of ICMP Parameter Problem messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInSrcQuenchs">

+            <description>The number of ICMP Source Quench messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInRedirects">

+            <description>The number of ICMP Redirect messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInEchos">

+            <description>The number of ICMP Echo (request) messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpInEchoReps">

+            <description>The number of ICMP Echo Reply messages received.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutMsgs">

+            <description>The total number of ICMP messages which this entity attempted to send.

+Note that this counter includes all those counted by icmpOutErrors.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutErrors">

+            <description>The number of ICMP messages which this entity did not send due to problems discovered within ICMP such as a lack of

+buffers.  This value should not include errors discovered outside the ICMP layer such as the inability of IP to route the 

+resultant datagram.  In some implementations there may be no types of error which contribute to this counter's value.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutDestUnreachs">

+            <description>The number of ICMP Destination Unreachable messages sent.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutParmProbs">

+            <description>The number of ICMP Parameter Problem messages sent.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutEchos">

+            <description>The number of ICMP Echo (request) messages sent.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmIcmpOutEchoReps">

+            <description>The number of ICMP Echo Reply messages sent.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUdpInDatagrams">

+            <description>The total number of UDP datagrams delivered to UDP users.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUdpNoPorts">

+            <description>The total number of received UDP datagrams for which there was no application at the destination port.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUdpInErrors">

+            <description>The number of received UDP datagrams that could not be delivered for 

+reasons other than the lack of an application at the destination port.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmUdpOutDatagrams">

+            <description>The total number of UDP datagrams sent from this entity.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInUcastPkts">

+            <description>Performance monitoring counter for the number of input unicast packets delivered to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfOutUcastPkts">

+            <description>Performance monitoring counter for the number of out unicast packets delivered to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInErrors">

+            <description>Performance monitoring counter for the number of input packets discarded due to any error.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInDiscards">

+            <description>Performance monitoring counter for the number of input packets discarded due to resource limitations.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInBroadcastPkts">

+            <description>Performance monitoring counter for the number of input broadcast packets delivered to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfInMulticastPkts">

+            <description>Performance monitoring counter for the number of input multicast packets delivered to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfOutBroadcastPkts">

+            <description>Performance monitoring counter for the number of output broadcast packets delivered to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfIfOutMulticastPkts">

+            <description>Performance monitoring counter for the number of output multicast packets delivered to higher layer.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="SystemFunctions">

+        <description>This MO structures the SystemFunctions of the managed element. It is created automatically and cannot be deleted.

+

+The local distinguished name of this MO is ManagedElement=1, SystemFunctions=1.</description>

+        <systemCreated/>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="SystemFunctionsId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Licensing">

+        <description>This MO represents the Licensing (Software Keys) functions in Cello.</description>

+        <systemCreated/>

+        <attribute name="LicensingId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="emergencyStateInfo">

+            <description>This attribute holds information about the emergency status and the time remaining in the current state.

+

+Note! If the node is in emergency state USE_DEGRADED, or the emergency state is USE_DISABLED, the the value of'time' is insignificant.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <structRef name="EmergencyInfo"/>

+            </dataType>

+        </attribute>

+        <attribute name="licenseFileUrl">

+            <description>This attribute returns the URL to the License Key File so it can be viewed with an XML capable web browser

+in case this is a licensed node.

+

+Note! In case the node is not licensed, an empty string will be returned.</description>

+            <noNotification/>

+            <readOnly/>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>256</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <action name="updateLicenseKeyFile">

+            <description>This action sends a request to the FTP/SFTP server to update the license key file.

+

+User Id for login to FTP/SFTP server  where license key files are located.

+If a null string userId is given, anonymous FTP/SFTP transfer is assumed.

+Max length is 20 characters.

+

+Password for login to the FTP/SFTP server  where license key files are located.

+Max length is 20 characters.

+

+The IpAddress of the FTP/SFTP server where license key files are located.

+Max length is 16 characters.

+

+Source name and path of the license key file on the FTP/SFTP server.

+Max length is 256 charcters.

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+            <parameter name="userId">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="password">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="ipAddress">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+            <parameter name="sFile">

+                <in/>

+                <dataType>

+                    <string/>

+                </dataType>

+            </parameter>

+        </action>

+        <action name="setEmergencyState">

+            <description>This action sets the license server into emergency state.

+I.e. opens up all licensed features and capacity restrictions.

+Disabling emergency state is done by loading a new license key file.

+

+Note! This action does not require a transaction.</description>

+            <returnType>

+                <void/>

+            </returnType>

+        </action>

+    </class>

+

+    <class name="TimingUnit2">

+        <description>This MO represents a timing unit2 (reference clock) in the node.

+

+The corresponding Program shall be of LoadModuleLoaderType, SpmFpgaLoader.</description>

+        <attribute name="userLabel">

+            <description>Label for free use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Operational state of TimingUnit</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatus">

+            <description>The availability status of the TimingUnit.

+

+The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="TimingUnit2Id">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="SccpPolicing">

+        <description>The SccpPolicing MO represents the policing function in CPP.

+

+The originatingMtp3bSpc  is a madatory attribute for policing in one local node (i.e. a SRP in one NI).

+For policing between two local nodes (i.e. a SRP between two NIs) the originatingMtp3bSpc can be replaced by the originatingSccpSpId.

+Optional attributes for policing in one local node (i.e a SRP in one NI) are destinationMtp3bSpc, destinationSccpSsn, originatingSccpSsn and policingGlobalTitle.

+For policing between two local nodes (i.e. a SRP between two NIs) the destinationMtp3bSpc can be replaced by the destinationSccpSpId.</description>

+        <attribute name="SccpPolicingId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="originatingMtp3bSpc">

+            <description>The value of the SPC (Signaling Point Code).

+

+Note! If the 'originatingSccpSpId' is specified the 'originatingMtp3bSpc' is invalid.  

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>16777215</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="destinationMtp3bSpc">

+            <description>The value of the destination SPC (Signaling Point Code).

+

+Note! The default value 0 (zero) means that no SPC is defined.

+Note! If no 'destinationSccpSp' is defined and the value of 'destinationMtp3bSpc' is set to 0 (zero), all Signalling Point Codes (SPC) are valid.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>16777215</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="originatingSccpSpId">

+            <description>The identity of the originating SccpSp MO must be used for policing between local nodes.

+

+Note! If the 'originatingSccpSpId' is specified the 'originatingMtp3bSpc' is invalid.  

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="originatingSccpSsn">

+            <description>The value of SSN in CgPA (Calling Party Address)

+

+Note! The value 0 (zero) means that all ssN (Sub System Number) are valid.

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="destinationSccpSpId">

+            <description>The identity of the destination SccpSp MO can be used for policing between local nodes.

+

+Note! If the 'destinationSccpSpId' is specified the 'destinationMtp3bSpc' is invalid.  

+Note! If no destination 'destinationSccpSp' is defined and the value of 'destinationMtp3bSpc' is set to 0, all local nodes are valid. 

+</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="destinationSccpSsn">

+            <description>The value of SSN inCdPA (Called Party Address).

+

+Note! The valu 0 (zero) means tha all ssN (Sub System Number) are valid.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="policingGlobalTitle">

+            <description>The Policing Global Title attribute allows to optionally police on Global Title

+

+Default value is considered as no policing Global Title and all GTs are valid.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <structRef name="GlobalTitleData"/>

+            </dataType>

+        </attribute>

+        <attribute name="discardOrReturnServiceMsg">

+            <description>For a policing case whether to discard or return Service Messages, if the return option is set.</description>

+            <dataType>

+                <enumRef name="DiscardReturnServiceMsg">

+                    <defaultValue>DISCARD</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfRejectMsg">

+            <description>Performance monitoring counter for the number of rejected messages.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="SccpAccountingCriteria">

+        <description>The SccpAccountingCriteria MO and the SccpSp MO represents the accounting function in CPP.

+

+Attribute usageType specifies Accounting Remuneration (incoming GT messages) or  Verification (outgoing GT messages).

+

+For Remuneration a SccpGlobalTitle MOId in attribute globalTitleId must be defined.

+For Verification a SccpGlobalTitle MOid is defined in attribute globalTitleId, or a SccpEntitySet MOid is defined if accounting shall be made on the resulting new GT.

+

+The attribute ssN is optional .

+The Mtp3bSrs MOid (including an SPC) in attribute pointerId is optional for accounting in one local node (SRP in one NI).

+The SccpSp MOid in attribute pointerId is optional for accounting between two local nodes (SRP between two NIs).

+Attribute countType specifies if Messages och Octets shall be counted.

+Start and stop of accounting and output period for the accounting file is specified in the SccpSp MO.</description>

+        <attribute name="SccpAccountingCriteriaId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Label free for use.</description>

+            <dataType>

+                <string>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="usageType">

+            <description>This attribute specifies if the MO is used for renumeration or verification.

+

+0 = Verification Criteria to detect outgoing massages that will be charged in the next relay node.

+

+1 = Renumeration Criteria to detect incoming messages for relaying, that will be charged.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long/>

+            </dataType>

+        </attribute>

+        <attribute name="ssN">

+            <description>Subsystem Number this Accounting Criteria applies to.

+SubSystem Number 0 (zero) means that any SSN in CdPA (Called Party Address) is valid.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <long>

+                    <range>

+                        <min>0</min> <max>255</max>

+                    </range>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="countType">

+            <description>Specifies type of countes that should be activated.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <enumRef name="SccpCountType">

+                    <defaultValue>MESSAGES</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="globalTitleId">

+            <description>The identity of the SccpGlobalTitle MO or the SccpEntitySet MO used by this MO.</description>

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfMsg">

+            <description>Performance monitoring counter for the number of messages, both incoming and outgoing.

+

+Note! If 'countType' is set to 'OCTETS' this counter is not valid.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pmNoOfOctets">

+            <description>Performance monitoring counter for the number of octets, both incoming and outgoing.

+

+Note! If 'countType' is set to 'MESSAGES this counter is not valid.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <long>

+                    <defaultValue>0</defaultValue>

+                </long>

+            </dataType>

+        </attribute>

+        <attribute name="pointerId">

+            <description>The pointer is an instance of a Mtp3bSrs MO OR an instance of a SccpSP MO.

+

+Note! If no pointerId is set all Signaling Point Codes (SPC) and all Sccp SP identities are valid.

+Note! It is not possible to submit the Id of the SccpSp that the SccpAccountingCriteria belongs to.</description>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <moRef name="ManagedObject"/>

+            </dataType>

+        </attribute>

+    </class>

+

+    <class name="Cbu">

+        <description>This MO models the Cbu (Node Control Board) board in CPP.

+The Cbu board integrates the functionality of TUB, SCB, GPB and ETB (ET-MC1) into one Plug-In Unit.

+

+Note! The 'operationalState' is set to disabled if one of the functional parts is faulty. Even if the Cbu is marked with 'operationalState' DISABLED, parts of the Cbu can still be operational.

+

+Note! A functional part on a Cbu board can only be redundant with the same functional part on another Cbu board and thus not with that functional part implemented on a discrete board. Also note that redundancy is only applicable for the GPB part and the TimingUnit part of the Cbu board..

+

+Note! On the Cbu board it is only possible to configure a maximum of 4 physical path terminations. These can be of type E1PhysPathTerm, J1PhyspathTerm or T1PhyspathTerm. It is not possible to create physical path terminations of different standards on the same board.

+

+Note! The Gpu part of the Cbu board (General Processor Unit) retrieves its 'availabilityStatus' from the PlugInUnit MO, thus not represented on the Cbu MO.

+

+Note! When the ET-MC1 is part of the Cbu board it is only possible to configure 4 physical ports as either E1 (ETSI), J1 (TTC)  or T1 (ANSI).

+

+Note! This unit may only be inserted in slot 1 and 24 (or more accurately at APN=1 and 0 in a non-standard subrack). If redundant configuration is needed, two Cbu's must be inserted in the subrack.

+If only one Cbu is used it must be placed in slot 1 (in a non-standard subrack) to be able to read the product information data of the subrack</description>

+        <attribute name="CbuId">

+            <mandatory/>

+            <noNotification/>

+            <restricted/>

+            <dataType>

+                <string/>

+            </dataType>

+        </attribute>

+        <attribute name="userLabel">

+            <description>Provides the possibility to put a user-friendly label on the MO instance. 

+

+Note! This attribute cannot be used for uniquely identifing the MO.</description>

+            <dataType>

+                <string>

+                    <lengthRange>

+                        <min>0</min> <max>128</max>

+                    </lengthRange>

+                    <defaultValue>""</defaultValue>

+                </string>

+            </dataType>

+        </attribute>

+        <attribute name="operationalState">

+            <description>Enabled or disabled according to the actual operational state of the NCB board.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="OperState">

+                    <defaultValue>disabled</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatusEt">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.

+The 'availabilityStatusEt' gives the availability status for the ET part of the NCB board.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+        <attribute name="availabilityStatusTu">

+            <description>The availability status is used to qualify the operational state. It indicates why the operational state has changed its value to disabled.

+The 'availabilityStatusTu' gives the availability status for the Timing Unit part of the NCB board.</description>

+            <noNotification/>

+            <nonPersistent/>

+            <readOnly/>

+            <dataType>

+                <enumRef name="AvailabilityStatus">

+                    <defaultValue>NO_STATUS</defaultValue>

+                </enumRef>

+            </dataType>

+        </attribute>

+    </class>

+

+    <relationship name="ManagedElement_to_TransportNetwork">

+        <containment>

+            <parent>

+                <hasClass name="ManagedElement"/>

+            </parent>

+            <child>

+                <hasClass name="TransportNetwork"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Synchronization">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Synchronization"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_SccpSp">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="SccpSp"/>

+                <cardinality>

+                    <min>0</min> <max>24</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_UniSaalProfile">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="UniSaalProfile"/>

+                <cardinality>

+                    <min>0</min> <max>300</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_UniSaalTp">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="UniSaalTp"/>

+                <cardinality>

+                    <min>0</min> <max>4800</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Aal0TpVccTp">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Aal0TpVccTp"/>

+                <cardinality>

+                    <min>0</min> <max>2200</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Aal5TpVccTp">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Aal5TpVccTp"/>

+                <cardinality>

+                    <min>0</min> <max>6000</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_AtmPort">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="AtmPort"/>

+                <cardinality>

+                    <min>0</min> <max>500</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_NniSaalProfile">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="NniSaalProfile"/>

+                <cardinality>

+                    <min>0</min> <max>50</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_NniSaalTp">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="NniSaalTp"/>

+                <cardinality>

+                    <min>0</min> <max>600</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_AtmTrafficDescriptor">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="AtmTrafficDescriptor"/>

+                <cardinality>

+                    <min>0</min> <max>1000</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Aal2PathVccTp">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Aal2PathVccTp"/>

+                <cardinality>

+                    <min>0</min> <max>2000</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Aal2RoutingCase">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Aal2RoutingCase"/>

+                <cardinality>

+                    <min>0</min> <max>900</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Aal2Sp">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Aal2Sp"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_AtmCrossConnection">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="AtmCrossConnection"/>

+                <cardinality>

+                    <min>0</min> <max>5000</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Mtp2TpItu">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp2TpItu"/>

+                <cardinality>

+                    <min>0</min> <max>256</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Mtp2TpAnsi">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp2TpAnsi"/>

+                <cardinality>

+                    <min>0</min> <max>256</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Aal1TpVccTp">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Aal1TpVccTp"/>

+                <cardinality>

+                    <min>0</min> <max>1000</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Mtp3bSpAnsi">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSpAnsi"/>

+                <cardinality>

+                    <min>0</min> <max>24</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Mtp3bSpItu">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSpItu"/>

+                <cardinality>

+                    <min>0</min> <max>24</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Mtp3bSpTtc">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSpTtc"/>

+                <cardinality>

+                    <min>0</min> <max>24</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Mtp2ProfileAnsi">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp2ProfileAnsi"/>

+                <cardinality>

+                    <min>0</min> <max>256</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Mtp2ProfileItu">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp2ProfileItu"/>

+                <cardinality>

+                    <min>0</min> <max>256</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Mtp2ProfileChina">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp2ProfileChina"/>

+                <cardinality>

+                    <min>0</min> <max>256</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Mtp2TpChina">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp2TpChina"/>

+                <cardinality>

+                    <min>0</min> <max>256</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Mtp3bSpChina">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSpChina"/>

+                <cardinality>

+                    <min>0</min> <max>24</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Mspg">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Mspg"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_ImaGroup">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="ImaGroup"/>

+                <cardinality>

+                    <min>0</min> <max>200</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Aal2QosProfile">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Aal2QosProfile"/>

+                <cardinality>

+                    <min>0</min> <max>20</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Aal2QosCodePointProfile">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Aal2QosCodePointProfile"/>

+                <cardinality>

+                    <min>0</min> <max>20</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TransportNetwork_to_Sctp">

+        <containment>

+            <parent>

+                <hasClass name="TransportNetwork"/>

+            </parent>

+            <child>

+                <hasClass name="Sctp"/>

+                <cardinality>

+                    <min>0</min> <max>10</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Subrack_to_Slot">

+        <containment>

+            <parent>

+                <hasClass name="Subrack"/>

+            </parent>

+            <child>

+                <hasClass name="Slot"/>

+                <cardinality>

+                    <min>1</min> <max>28</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Slot_to_PlugInUnit">

+        <containment>

+            <parent>

+                <hasClass name="Slot"/>

+            </parent>

+            <child>

+                <hasClass name="PlugInUnit"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Slot_to_ManagedObject">

+        <containment>

+            <parent>

+                <hasClass name="Slot"/>

+            </parent>

+            <child>

+                <hasClass name="ManagedObject"/>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="ManagedElement_to_ManagedObject">

+        <containment>

+            <parent>

+                <hasClass name="ManagedElement"/>

+            </parent>

+            <child>

+                <hasClass name="ManagedObject"/>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_ManagedObject">

+        <description>This containment relation indicated that any kind of board may be used to specilize PlugInUnit.</description>

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="ManagedObject"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Subrack_to_ManagedObject">

+        <containment>

+            <parent>

+                <hasClass name="Subrack"/>

+            </parent>

+            <child>

+                <hasClass name="ManagedObject"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="VpcTp_to_VclTp">

+        <containment>

+            <parent>

+                <hasClass name="VpcTp"/>

+            </parent>

+            <child>

+                <hasClass name="VclTp"/>

+                <cardinality>

+                    <min>0</min> <max>5000</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="ManagedElement_to_Equipment">

+        <containment>

+            <parent>

+                <hasClass name="ManagedElement"/>

+            </parent>

+            <child>

+                <hasClass name="Equipment"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="ManagedElement_to_IpSystem">

+        <containment>

+            <parent>

+                <hasClass name="ManagedElement"/>

+            </parent>

+            <child>

+                <hasClass name="IpSystem"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="ManagedElement_to_SwManagement">

+        <containment>

+            <parent>

+                <hasClass name="ManagedElement"/>

+            </parent>

+            <child>

+                <hasClass name="SwManagement"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="ManagedElement_to_SwitchFabric">

+        <containment>

+            <parent>

+                <hasClass name="ManagedElement"/>

+            </parent>

+            <child>

+                <hasClass name="SwitchFabric"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="ManagedElement_to_ManagedElementData">

+        <containment>

+            <parent>

+                <hasClass name="ManagedElement"/>

+            </parent>

+            <child>

+                <hasClass name="ManagedElementData"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="ManagedElement_to_SystemFunctions">

+        <containment>

+            <parent>

+                <hasClass name="ManagedElement"/>

+            </parent>

+            <child>

+                <hasClass name="SystemFunctions"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Equipment_to_Subrack">

+        <containment>

+            <parent>

+                <hasClass name="Equipment"/>

+            </parent>

+            <child>

+                <hasClass name="Subrack"/>

+                <cardinality>

+                    <min>0</min> <max>9</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Equipment_to_Jvm">

+        <containment>

+            <parent>

+                <hasClass name="Equipment"/>

+            </parent>

+            <child>

+                <hasClass name="Jvm"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Subrack_to_Fan">

+        <containment>

+            <parent>

+                <hasClass name="Subrack"/>

+            </parent>

+            <child>

+                <hasClass name="Fan"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SwManagement_to_LoadModule">

+        <containment>

+            <parent>

+                <hasClass name="SwManagement"/>

+            </parent>

+            <child>

+                <hasClass name="LoadModule"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SccpScrc_to_SccpApLocal">

+        <description>The SccpApLocal represents a local SSN, no relation exists to an Mtp3bAp

+

+Of the possible 216  SccpAps allowed on a node, a maximum of 16 are allowed to be local, and a maximum of 200 are allowed to be remote.</description>

+        <containment>

+            <parent>

+                <hasClass name="SccpScrc"/>

+            </parent>

+            <child>

+                <hasClass name="SccpApLocal"/>

+                <cardinality>

+                    <min>0</min> <max>16</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SccpSp_to_SccpScrc">

+        <containment>

+            <parent>

+                <hasClass name="SccpSp"/>

+            </parent>

+            <child>

+                <hasClass name="SccpScrc"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SccpScrc_to_SccpEntitySet">

+        <containment>

+            <parent>

+                <hasClass name="SccpScrc"/>

+            </parent>

+            <child>

+                <hasClass name="SccpEntitySet"/>

+                <cardinality>

+                    <min>0</min> <max>2048</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SccpScrc_to_SccpGlobalTitle">

+        <containment>

+            <parent>

+                <hasClass name="SccpScrc"/>

+            </parent>

+            <child>

+                <hasClass name="SccpGlobalTitle"/>

+                <cardinality>

+                    <min>0</min> <max>2048</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SccpScrc_to_SccpApRemote">

+        <containment>

+            <parent>

+                <hasClass name="SccpScrc"/>

+            </parent>

+            <child>

+                <hasClass name="SccpApRemote"/>

+                <cardinality>

+                    <min>0</min> <max>200</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SccpScrc_to_SccpPolicing">

+        <containment>

+            <parent>

+                <hasClass name="SccpScrc"/>

+            </parent>

+            <child>

+                <hasClass name="SccpPolicing"/>

+                <cardinality>

+                    <min>0</min> <max>1024</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SccpScrc_to_SccpAccountingCriteria">

+        <containment>

+            <parent>

+                <hasClass name="SccpScrc"/>

+            </parent>

+            <child>

+                <hasClass name="SccpAccountingCriteria"/>

+                <cardinality>

+                    <min>0</min> <max>100</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_Program">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="Program"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Spm_to_Program">

+        <containment>

+            <parent>

+                <hasClass name="Spm"/>

+            </parent>

+            <child>

+                <hasClass name="Program"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TimingUnit_to_Program">

+        <containment>

+            <parent>

+                <hasClass name="TimingUnit"/>

+            </parent>

+            <child>

+                <hasClass name="Program"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etm4_to_Program">

+        <containment>

+            <parent>

+                <hasClass name="Etm4"/>

+            </parent>

+            <child>

+                <hasClass name="Program"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etm1_to_Program">

+        <containment>

+            <parent>

+                <hasClass name="Etm1"/>

+            </parent>

+            <child>

+                <hasClass name="Program"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etmc1_to_Program">

+        <containment>

+            <parent>

+                <hasClass name="Etmc1"/>

+            </parent>

+            <child>

+                <hasClass name="Program"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etmc41_to_Program">

+        <containment>

+            <parent>

+                <hasClass name="Etmc41"/>

+            </parent>

+            <child>

+                <hasClass name="Program"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TimingUnit2_to_Program">

+        <containment>

+            <parent>

+                <hasClass name="TimingUnit2"/>

+            </parent>

+            <child>

+                <hasClass name="Program"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etm3_to_Program">

+        <containment>

+            <parent>

+                <hasClass name="Etm3"/>

+            </parent>

+            <child>

+                <hasClass name="Program"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Spu_to_Program">

+        <containment>

+            <parent>

+                <hasClass name="Spu"/>

+            </parent>

+            <child>

+                <hasClass name="Program"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Fan_to_Program">

+        <containment>

+            <parent>

+                <hasClass name="Fan"/>

+            </parent>

+            <child>

+                <hasClass name="Program"/>

+                <cardinality>

+                    <min>1</min> <max>2</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etm1_to_E1PhysPathTerm">

+        <containment>

+            <parent>

+                <hasClass name="Etm1"/>

+            </parent>

+            <child>

+                <hasClass name="E1PhysPathTerm"/>

+                <cardinality>

+                    <min>0</min> <max>8</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etmc1_to_E1PhysPathTerm">

+        <containment>

+            <parent>

+                <hasClass name="Etmc1"/>

+            </parent>

+            <child>

+                <hasClass name="E1PhysPathTerm"/>

+                <cardinality>

+                    <min>0</min> <max>8</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="E1PhysPathTerm_to_Ds0Bundle">

+        <containment>

+            <parent>

+                <hasClass name="E1PhysPathTerm"/>

+            </parent>

+            <child>

+                <hasClass name="Ds0Bundle"/>

+                <cardinality>

+                    <min>0</min> <max>31</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etm1_to_J1PhysPathTerm">

+        <containment>

+            <parent>

+                <hasClass name="Etm1"/>

+            </parent>

+            <child>

+                <hasClass name="J1PhysPathTerm"/>

+                <cardinality>

+                    <min>0</min> <max>8</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etmc1_to_J1PhysPathTerm">

+        <containment>

+            <parent>

+                <hasClass name="Etmc1"/>

+            </parent>

+            <child>

+                <hasClass name="J1PhysPathTerm"/>

+                <cardinality>

+                    <min>0</min> <max>8</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="J1PhysPathTerm_to_Ds0Bundle">

+        <containment>

+            <parent>

+                <hasClass name="J1PhysPathTerm"/>

+            </parent>

+            <child>

+                <hasClass name="Ds0Bundle"/>

+                <cardinality>

+                    <min>0</min> <max>24</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="AtmPort_to_VplTp">

+        <containment>

+            <parent>

+                <hasClass name="AtmPort"/>

+            </parent>

+            <child>

+                <hasClass name="VplTp"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpChina_to_Mtp3bAp">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpChina"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bAp"/>

+                <cardinality>

+                    <min>0</min> <max>510</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpAnsi_to_Mtp3bAp">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpAnsi"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bAp"/>

+                <cardinality>

+                    <min>0</min> <max>510</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpItu_to_Mtp3bAp">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpItu"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bAp"/>

+                <cardinality>

+                    <min>0</min> <max>510</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpTtc_to_Mtp3bAp">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpTtc"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bAp"/>

+                <cardinality>

+                    <min>0</min> <max>510</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpItu_to_Mtp3bSrs">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpItu"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSrs"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpTtc_to_Mtp3bSrs">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpTtc"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSrs"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpChina_to_Mtp3bSrs">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpChina"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSrs"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSrs_to_Mtp3bSr">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSrs"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSr"/>

+                <cardinality>

+                    <min>0</min> <max>5</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpAnsi_to_Mtp3bSrs">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpAnsi"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSrs"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_Etm1">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="Etm1"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_Spu">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="Spu"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_SwitchCoreUnit">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="SwitchCoreUnit"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_GeneralProcessorUnit">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="GeneralProcessorUnit"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_Etm4">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="Etm4"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_TimingUnit">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="TimingUnit"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_SwitchExtensionUnit">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="SwitchExtensionUnit"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_Etmc1">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="Etmc1"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_Etmc41">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="Etmc41"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_Etm3">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="Etm3"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_TimingUnit2">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="TimingUnit2"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="PlugInUnit_to_Cbu">

+        <containment>

+            <parent>

+                <hasClass name="PlugInUnit"/>

+            </parent>

+            <child>

+                <hasClass name="Cbu"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpChina_to_Mtp3bSls">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpChina"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSls"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpItu_to_Mtp3bSls">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpItu"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSls"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpTtc_to_Mtp3bSls">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpTtc"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSls"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpAnsi_to_Mtp3bSls">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpAnsi"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSls"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpChina_to_Mtp3bSls_0">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpChina"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSls"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpAnsi_to_Mtp3bSls_0">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpAnsi"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSls"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpItu_to_Mtp3bSls_0">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpItu"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSls"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpTtc_to_Mtp3bSls_0">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpTtc"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSls"/>

+                <cardinality>

+                    <min>0</min> <max>255</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSls_to_Mtp3bSlAnsi">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSls"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSlAnsi"/>

+                <cardinality>

+                    <min>0</min> <max>16</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSls_to_Mtp3bSlItu">

+        <description>Multiplicity: 0..16</description>

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSls"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSlItu"/>

+                <cardinality>

+                    <min>0</min> <max>16</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSls_to_Mtp3bSlTtc">

+        <description>Multiplicity: 0..16</description>

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSls"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSlTtc"/>

+                <cardinality>

+                    <min>0</min> <max>16</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSls_to_Mtp3bSlChina">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSls"/>

+            </parent>

+            <child>

+                <hasClass name="Mtp3bSlChina"/>

+                <cardinality>

+                    <min>0</min> <max>16</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="IpSystem_to_Ip">

+        <containment>

+            <parent>

+                <hasClass name="IpSystem"/>

+            </parent>

+            <child>

+                <hasClass name="Ip"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="IpSystem_to_Ospf">

+        <containment>

+            <parent>

+                <hasClass name="IpSystem"/>

+            </parent>

+            <child>

+                <hasClass name="Ospf"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="IpSystem_to_IpAccessAutoConfig">

+        <containment>

+            <parent>

+                <hasClass name="IpSystem"/>

+            </parent>

+            <child>

+                <hasClass name="IpAccessAutoConfig"/>

+                <cardinality>

+                    <min>0</min> <max>32</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="IpSystem_to_IpAccessHostMsb">

+        <containment>

+            <parent>

+                <hasClass name="IpSystem"/>

+            </parent>

+            <child>

+                <hasClass name="IpAccessHostMsb"/>

+                <cardinality>

+                    <min>0</min> <max>128</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="IpSystem_to_IpAccessHostGpb">

+        <containment>

+            <parent>

+                <hasClass name="IpSystem"/>

+            </parent>

+            <child>

+                <hasClass name="IpAccessHostGpb"/>

+                <cardinality>

+                    <min>0</min> <max>128</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Ip_to_IpAtmLink">

+        <containment>

+            <parent>

+                <hasClass name="Ip"/>

+            </parent>

+            <child>

+                <hasClass name="IpAtmLink"/>

+                <cardinality>

+                    <min>0</min> <max>500</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Ip_to_EthernetLink">

+        <containment>

+            <parent>

+                <hasClass name="Ip"/>

+            </parent>

+            <child>

+                <hasClass name="EthernetLink"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Ip_to_IpRoutingTable">

+        <containment>

+            <parent>

+                <hasClass name="Ip"/>

+            </parent>

+            <child>

+                <hasClass name="IpRoutingTable"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Aal2Sp_to_Aal2Ap">

+        <containment>

+            <parent>

+                <hasClass name="Aal2Sp"/>

+            </parent>

+            <child>

+                <hasClass name="Aal2Ap"/>

+                <cardinality>

+                    <min>0</min> <max>850</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Aal2Ap_to_Aal2PathDistributionUnit">

+        <containment>

+            <parent>

+                <hasClass name="Aal2Ap"/>

+            </parent>

+            <child>

+                <hasClass name="Aal2PathDistributionUnit"/>

+                <cardinality>

+                    <min>0</min> <max>26</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etm1_to_T1PhysPathTerm">

+        <containment>

+            <parent>

+                <hasClass name="Etm1"/>

+            </parent>

+            <child>

+                <hasClass name="T1PhysPathTerm"/>

+                <cardinality>

+                    <min>0</min> <max>8</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TimingUnit_to_TuSyncRef">

+        <containment>

+            <parent>

+                <hasClass name="TimingUnit"/>

+            </parent>

+            <child>

+                <hasClass name="TuSyncRef"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="TimingUnit2_to_TuSyncRef">

+        <containment>

+            <parent>

+                <hasClass name="TimingUnit2"/>

+            </parent>

+            <child>

+                <hasClass name="TuSyncRef"/>

+                <cardinality>

+                    <min>0</min> <max>2</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Spu_to_Spm">

+        <containment>

+            <parent>

+                <hasClass name="Spu"/>

+            </parent>

+            <child>

+                <hasClass name="Spm"/>

+                <cardinality>

+                    <min>0</min> <max>5</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SwManagement_to_ConfigurationVersion">

+        <containment>

+            <parent>

+                <hasClass name="SwManagement"/>

+            </parent>

+            <child>

+                <hasClass name="ConfigurationVersion"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SwManagement_to_UpgradePackage">

+        <containment>

+            <parent>

+                <hasClass name="SwManagement"/>

+            </parent>

+            <child>

+                <hasClass name="UpgradePackage"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SwManagement_to_Repertoire">

+        <containment>

+            <parent>

+                <hasClass name="SwManagement"/>

+            </parent>

+            <child>

+                <hasClass name="Repertoire"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SwManagement_to_PiuType">

+        <containment>

+            <parent>

+                <hasClass name="SwManagement"/>

+            </parent>

+            <child>

+                <hasClass name="PiuType"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SwManagement_to_SwAllocation">

+        <containment>

+            <parent>

+                <hasClass name="SwManagement"/>

+            </parent>

+            <child>

+                <hasClass name="SwAllocation"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SwManagement_to_ReliableProgramUniter">

+        <containment>

+            <parent>

+                <hasClass name="SwManagement"/>

+            </parent>

+            <child>

+                <hasClass name="ReliableProgramUniter"/>

+                <cardinality>

+                    <min>0</min>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Ospf_to_OspfInterface">

+        <containment>

+            <parent>

+                <hasClass name="Ospf"/>

+            </parent>

+            <child>

+                <hasClass name="OspfInterface"/>

+                <cardinality>

+                    <min>0</min> <max>32</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Ospf_to_OspfArea">

+        <containment>

+            <parent>

+                <hasClass name="Ospf"/>

+            </parent>

+            <child>

+                <hasClass name="OspfArea"/>

+                <cardinality>

+                    <min>1</min> <max>4</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Cbu_to_GeneralProcessorUnit">

+        <containment>

+            <parent>

+                <hasClass name="Cbu"/>

+            </parent>

+            <child>

+                <hasClass name="GeneralProcessorUnit"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="GeneralProcessorUnit_to_MediumAccessUnit">

+        <containment>

+            <parent>

+                <hasClass name="GeneralProcessorUnit"/>

+            </parent>

+            <child>

+                <hasClass name="MediumAccessUnit"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SwitchFabric_to_SwitchModule">

+        <containment>

+            <parent>

+                <hasClass name="SwitchFabric"/>

+            </parent>

+            <child>

+                <hasClass name="SwitchModule"/>

+                <cardinality>

+                    <min>0</min> <max>32</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SwitchFabric_to_InternalLinkGroup">

+        <containment>

+            <parent>

+                <hasClass name="SwitchFabric"/>

+            </parent>

+            <child>

+                <hasClass name="InternalLinkGroup"/>

+                <cardinality>

+                    <min>0</min> <max>31</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="InternalLinkGroup_to_SwitchInternalLink">

+        <containment>

+            <parent>

+                <hasClass name="InternalLinkGroup"/>

+            </parent>

+            <child>

+                <hasClass name="SwitchInternalLink"/>

+                <cardinality>

+                    <min>0</min> <max>8</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etm4_to_Os155SpiTtp">

+        <containment>

+            <parent>

+                <hasClass name="Etm4"/>

+            </parent>

+            <child>

+                <hasClass name="Os155SpiTtp"/>

+                <cardinality>

+                    <min>0</min> <max>2</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="VplTp_to_VpcTp">

+        <containment>

+            <parent>

+                <hasClass name="VplTp"/>

+            </parent>

+            <child>

+                <hasClass name="VpcTp"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="E1Ttp_to_Ds0Bundle">

+        <containment>

+            <parent>

+                <hasClass name="E1Ttp"/>

+            </parent>

+            <child>

+                <hasClass name="Ds0Bundle"/>

+                <cardinality>

+                    <min>0</min> <max>31</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="T1PhysPathTerm_to_Ds0Bundle">

+        <containment>

+            <parent>

+                <hasClass name="T1PhysPathTerm"/>

+            </parent>

+            <child>

+                <hasClass name="Ds0Bundle"/>

+                <cardinality>

+                    <min>0</min> <max>24</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="T1Ttp_to_Ds0Bundle">

+        <containment>

+            <parent>

+                <hasClass name="T1Ttp"/>

+            </parent>

+            <child>

+                <hasClass name="Ds0Bundle"/>

+                <cardinality>

+                    <min>0</min> <max>24</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpAnsi_to_M3uAssociation">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpAnsi"/>

+            </parent>

+            <child>

+                <hasClass name="M3uAssociation"/>

+                <cardinality>

+                    <min>0</min> <max>512</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpItu_to_M3uAssociation">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpItu"/>

+            </parent>

+            <child>

+                <hasClass name="M3uAssociation"/>

+                <cardinality>

+                    <min>0</min> <max>512</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Vc12Ttp_to_E1Ttp">

+        <containment>

+            <parent>

+                <hasClass name="Vc12Ttp"/>

+            </parent>

+            <child>

+                <hasClass name="E1Ttp"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Os155SpiTtp_to_Vc4Ttp">

+        <containment>

+            <parent>

+                <hasClass name="Os155SpiTtp"/>

+            </parent>

+            <child>

+                <hasClass name="Vc4Ttp"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Vc4Ttp_to_Vc12Ttp">

+        <containment>

+            <parent>

+                <hasClass name="Vc4Ttp"/>

+            </parent>

+            <child>

+                <hasClass name="Vc12Ttp"/>

+                <cardinality>

+                    <min>0</min> <max>63</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etmc41_to_Os155SpiTtp">

+        <containment>

+            <parent>

+                <hasClass name="Etmc41"/>

+            </parent>

+            <child>

+                <hasClass name="Os155SpiTtp"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Os155SpiTtp_to_Sts3CspeTtp">

+        <containment>

+            <parent>

+                <hasClass name="Os155SpiTtp"/>

+            </parent>

+            <child>

+                <hasClass name="Sts3CspeTtp"/>

+                <cardinality>

+                    <min>0</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Os155SpiTtp_to_Sts1SpeTtp">

+        <containment>

+            <parent>

+                <hasClass name="Os155SpiTtp"/>

+            </parent>

+            <child>

+                <hasClass name="Sts1SpeTtp"/>

+                <cardinality>

+                    <min>0</min> <max>3</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Cbu_to_Etmc1">

+        <containment>

+            <parent>

+                <hasClass name="Cbu"/>

+            </parent>

+            <child>

+                <hasClass name="Etmc1"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etmc1_to_T1PhysPathTerm">

+        <containment>

+            <parent>

+                <hasClass name="Etmc1"/>

+            </parent>

+            <child>

+                <hasClass name="T1PhysPathTerm"/>

+                <cardinality>

+                    <min>0</min> <max>8</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Mtp3bSpChina_to_M3uAssociation">

+        <containment>

+            <parent>

+                <hasClass name="Mtp3bSpChina"/>

+            </parent>

+            <child>

+                <hasClass name="M3uAssociation"/>

+                <cardinality>

+                    <min>0</min> <max>512</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="ImaGroup_to_ImaLink">

+        <containment>

+            <parent>

+                <hasClass name="ImaGroup"/>

+            </parent>

+            <child>

+                <hasClass name="ImaLink"/>

+                <cardinality>

+                    <min>0</min> <max>8</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SystemFunctions_to_WebServer">

+        <containment>

+            <parent>

+                <hasClass name="SystemFunctions"/>

+            </parent>

+            <child>

+                <hasClass name="WebServer"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Sts1SpeTtp_to_Vt15Ttp">

+        <containment>

+            <parent>

+                <hasClass name="Sts1SpeTtp"/>

+            </parent>

+            <child>

+                <hasClass name="Vt15Ttp"/>

+                <cardinality>

+                    <min>0</min> <max>28</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Vt15Ttp_to_T1Ttp">

+        <containment>

+            <parent>

+                <hasClass name="Vt15Ttp"/>

+            </parent>

+            <child>

+                <hasClass name="T1Ttp"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etm3_to_E3PhysPathTerm">

+        <containment>

+            <parent>

+                <hasClass name="Etm3"/>

+            </parent>

+            <child>

+                <hasClass name="E3PhysPathTerm"/>

+                <cardinality>

+                    <min>0</min> <max>2</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Etm3_to_T3PhysPathTerm">

+        <containment>

+            <parent>

+                <hasClass name="Etm3"/>

+            </parent>

+            <child>

+                <hasClass name="T3PhysPathTerm"/>

+                <cardinality>

+                    <min>0</min> <max>2</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="SystemFunctions_to_Licensing">

+        <containment>

+            <parent>

+                <hasClass name="SystemFunctions"/>

+            </parent>

+            <child>

+                <hasClass name="Licensing"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+    <relationship name="Cbu_to_TimingUnit2">

+        <containment>

+            <parent>

+                <hasClass name="Cbu"/>

+            </parent>

+            <child>

+                <hasClass name="TimingUnit2"/>

+                <cardinality>

+                    <min>1</min> <max>1</max>

+                </cardinality>

+            </child>

+        </containment>

+    </relationship>

+

+</mim>

+

+</models>

+

diff --git a/lib/xmerl/test/xmerl_SUITE_data/eventp/mp.dtd b/lib/xmerl/test/xmerl_SUITE_data/eventp/mp.dtd
new file mode 100644
index 0000000000..1f6e31e772
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/eventp/mp.dtd
@@ -0,0 +1,274 @@
+<!-- 15531-APR 90163: rev F       -->
+<!-- Date-            2000-10-16    -->
+<!-- Author-          Johnni Sigeti -->
+<!-- Author-          Niklas Storm  -->
+<!-- Author-          Hui Lin       -->
+
+<!-- Revision History
+   A       Raghunath               Squid version
+   PB1     epkjsig    1999-09-09   Removed uLong, uShort, union
+                                   and inherits.
+   PB2     epkjsig    1999-09-23   Rewritten with new
+                                   requirements
+   PB3     epkjsig    1999-09-26   Updated after team review
+   B       epkjsig    1999-10-06   Updated after inspection
+   PC1     epkjsig    1999-10-28   Added mandatory attribute
+                                   for associations.
+   PC2     epkjsig    1999-11-22   Added MORef as attribute
+   PC3     qpknian    2000-01-03   Added support object class.
+   PC4     qpknian    2000-01-18   Removed illegal characters
+                                   in comments.
+   PC5     qpknian    2000-01-21   Updated model tag. class and
+                                   soClass elements should be in
+                                   separate models.
+   C       qpknian    2000-02-10   Approved after inspection.
+   PD1     qpknian    2000-03-02   Added applicationTag.
+                                   Added notificationTypes.
+                                   Removed controlled.
+                                   Renamed readOnly to advisoryReadOnly.
+   PD2     qpknian    2000-03-21   Added softLink to hoppers.
+   D       qpknian    2000-04-26   Approved after inspection.
+   PE1     qpknian    2000-06-27   Updated for CR41 (use Corba types)
+   E       qpknian    2000-09-01   Approved after inspection.
+   PF1     eiuhlin    2000-08-21   Updated for CR43 (Rename Model to MIM, add INTER-MIM)
+   PF2     eiuhlin    2000-09-20   Support uniDirectionalAssociation and biDirectionalAssociation
+                                   Add static to Attribute
+                                   Add enumRef and sequence to struct
+   PF3     eiuhlin    2000-09-20   Add maxLength to sequence   
+   PF4     eiuhlin    2000-09-21   Define Element static 
+   PF5     eiuhlin    2000-09-27   Remove ATTLIST name from moRef
+   PF6     eiuhlin    2000-10-02   Remove tag <helpRef>, <icon>
+                                   Add associationClass to bi and uni-directional association
+                                   Change tag <target> to <supported>
+                                   Remove ATTLIST name from supporter and supported
+                                   Add ATTLIST name to moRef
+                                   Remove tag <advisoryReadOnly>
+                                   Add tag <readOnly> and <undefined> 
+   PF7     eiuhlin    2000-10-04   Add ATTLIST name to interMim
+   F       eiuhlin    2000-10-16   Approved after inspection.                                                                      
+-->
+
+
+<!-- Common -->
+<!ELEMENT description (#PCDATA)>
+
+
+<!ELEMENT applicationTag (#PCDATA)>
+
+
+<!-- Models definition -->
+<!ELEMENT models (mim|interMim)*>
+
+<!ELEMENT mim (description?, applicationTag?,
+
+                  (struct | enum | exception)*,
+                 class+, relationship*)>
+<!ATTLIST mim name ID #REQUIRED
+		version CDATA #REQUIRED
+		release CDATA #REQUIRED>
+
+<!ELEMENT interMim (description?, applicationTag?,
+
+                  (struct | enum )*,
+                      relationship*)>
+
+<!ATTLIST interMim name CDATA #REQUIRED> 
+
+<!-- MO class definition -->
+<!ELEMENT class (description?, applicationTag?,
+                 systemCreated?, notificationTypes?, (action | attribute)*)>
+<!ATTLIST class name CDATA #REQUIRED>
+
+<!ELEMENT systemCreated EMPTY>
+
+<!ELEMENT notificationTypes (#PCDATA)>
+
+
+<!-- Relations -->
+<!ELEMENT relationship (description?, applicationTag?,
+                        (biDirectionalAssociation |uniDirectionalAssociation | containment|softLink|support))>
+<!ATTLIST relationship name CDATA #REQUIRED>
+
+<!ELEMENT softLink (parent, child+)>
+
+<!ELEMENT support (supporter,supported+)>
+
+<!ELEMENT supporter (description?, applicationTag?,
+                hasClass, cardinality?)>
+
+<!ELEMENT supported (description?, applicationTag?,
+                hasClass, cardinality?)>
+
+<!ELEMENT biDirectionalAssociation (mandatory?, associationEnd, associationEnd+, associationClass?)>
+
+<!ELEMENT uniDirectionalAssociation (mandatory?, hasClass, associationEnd+, associationClass?)>
+
+<!ELEMENT containment (parent, child+)>
+
+<!ELEMENT associationEnd (description?, applicationTag?,
+                hasClass, cardinality?)>
+<!ATTLIST associationEnd name CDATA #REQUIRED>
+
+<!ELEMENT associationClass (attribute+)>
+
+<!ELEMENT parent (description?, applicationTag?,
+                  hasClass)>
+<!ELEMENT child  (description?, applicationTag?,
+                  hasClass, cardinality?)>
+
+<!ELEMENT cardinality (min | max | (min, max))>
+
+<!ELEMENT hasClass EMPTY>
+<!ATTLIST hasClass name CDATA #REQUIRED
+                   inMim CDATA #IMPLIED
+                   ofVersion CDATA #IMPLIED>
+
+
+
+
+<!-- Data types -->
+<!ENTITY % corbaTypes "boolean | octet | char  | double | float | 
+                           long | longlong | short | string | wstring">
+<!ENTITY % availableTypes "%corbaTypes; | enumRef | structRef |
+                           moRef | sequence">
+
+
+<!-- For attributes, parameters and exceptions -->
+<!ELEMENT dataType   (%availableTypes;)>
+
+<!-- For actions                               -->
+<!ELEMENT returnType (void | %availableTypes;)>
+
+
+<!-- Return data types -->
+<!ELEMENT void EMPTY>
+
+
+<!-- Primitive data types -->
+<!ELEMENT boolean (defaultValue?)>
+
+<!ELEMENT octet (range?, defaultValue?)>
+
+<!ELEMENT char (range?, defaultValue?)>
+
+<!ELEMENT double (range?, defaultValue?)>
+
+<!ELEMENT float (range?, defaultValue?)>
+
+<!ELEMENT long (range?, defaultValue?)>
+
+<!ELEMENT longlong (range?, defaultValue?)>
+
+<!ELEMENT short (range?, defaultValue?)>
+
+<!ELEMENT string (lengthRange?, (validValues | alphabet)?, defaultValue?)>
+
+<!ELEMENT wstring (lengthRange?, (validValues | alphabet)?, defaultValue?)>
+
+
+<!ELEMENT alphabet (#PCDATA)>
+<!ELEMENT validValues (#PCDATA)>
+
+<!ELEMENT lengthRange (min?, (min, max)*, max?)>
+<!ELEMENT range       (min?, (min, max)*, max?)>
+
+<!ELEMENT max (#PCDATA)>
+<!ELEMENT min (#PCDATA)>
+
+<!ELEMENT defaultValue (#PCDATA)>
+
+
+<!-- Enum data type -->
+<!ELEMENT enum (description?, applicationTag?,
+                enumMember+, defaultValue?)>
+<!ATTLIST enum name CDATA #REQUIRED>
+
+<!ELEMENT enumMember (description?, applicationTag?,
+                      value?)>
+<!ATTLIST enumMember name CDATA #REQUIRED>
+
+<!ELEMENT enumRef (defaultValue?)>
+<!ATTLIST enumRef name CDATA #REQUIRED>
+
+<!ELEMENT value (#PCDATA)>
+
+
+<!-- Struct data type -->
+<!ELEMENT struct (description?, applicationTag?,
+                  structMember+)>
+<!ATTLIST struct name CDATA #REQUIRED>
+
+<!ELEMENT structMember (description?, applicationTag?,
+                        (%corbaTypes; | sequence | enumRef))>
+<!ATTLIST structMember name CDATA #REQUIRED>
+
+<!ELEMENT structRef EMPTY>
+<!ATTLIST structRef name CDATA #REQUIRED>
+
+
+<!-- Sequence data type -->
+<!ELEMENT sequence ((%corbaTypes; | enumRef | structRef | moRef),
+                    length?, maxLength?, nonUnique?)>
+
+<!ELEMENT length (#PCDATA)>
+
+<!ELEMENT maxLength (#PCDATA)>
+
+<!ELEMENT nonUnique EMPTY>
+
+
+<!-- MoRef data type -->
+<!ELEMENT moRef EMPTY>
+
+<!ATTLIST moRef name CDATA #REQUIRED>
+
+<!-- Attribute -->
+<!ELEMENT attribute (description?, applicationTag?,
+                     local?, mandatory?, noNotification?,
+                     nonPersistent?, readOnly?, restricted?, static?,undefined?, dataType)>
+<!ATTLIST attribute name CDATA #REQUIRED>
+
+
+<!-- Attribute controls                                 -->
+<!-- nonUnique is defined under the sequence data type. -->
+
+<!ELEMENT local EMPTY>
+
+<!ELEMENT mandatory EMPTY>
+
+<!ELEMENT noNotification EMPTY>
+
+<!ELEMENT nonPersistent EMPTY>
+
+<!ELEMENT readOnly EMPTY>
+
+<!ELEMENT restricted EMPTY>
+
+<!ELEMENT static EMPTY>
+
+<!ELEMENT undefined EMPTY>
+
+
+<!-- Action -->
+<!ELEMENT action (description?, applicationTag?,
+                  returnType, parameter*, raisesException*)>
+<!ATTLIST action name CDATA #REQUIRED>
+
+<!ELEMENT parameter (description?, applicationTag?,
+                     (in | out | inout), dataType)>
+<!ATTLIST parameter name CDATA #REQUIRED>
+
+<!ELEMENT in EMPTY>
+<!ELEMENT inout EMPTY>
+<!ELEMENT out EMPTY>
+
+<!ELEMENT exception (description?, applicationTag?,
+                      exceptionParameter*)>
+<!ATTLIST exception name CDATA #REQUIRED>
+
+<!ELEMENT exceptionParameter (description?, applicationTag?,
+                              dataType)>
+<!ATTLIST exceptionParameter name CDATA #REQUIRED>
+
+<!ELEMENT raisesException EMPTY>
+<!ATTLIST raisesException name CDATA #REQUIRED>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/eventp/wurfl.stub b/lib/xmerl/test/xmerl_SUITE_data/eventp/wurfl.stub
new file mode 100644
index 0000000000..78d980d5b7
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/eventp/wurfl.stub
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE wurfl [
+<!ELEMENT version (#PCDATA)>
+<!ELEMENT wurfl (version)>
+]>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/eventp/wurfl.xml b/lib/xmerl/test/xmerl_SUITE_data/eventp/wurfl.xml
new file mode 100644
index 0000000000..ea96469af3
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/eventp/wurfl.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE wurfl [
+<!ELEMENT version (#PCDATA)>
+<!ELEMENT wurfl (version)>
+]>
+<wurfl>
+  <version>
+</version>
+</wurfl>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz b/lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz
new file mode 100644
index 0000000000..c48a6f897b
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/documentRoot.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/documentRoot.xml
new file mode 100644
index 0000000000..667a44b7fe
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/documentRoot.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<documentRoot>
+<!-- Test data from 
+     http://www.whitebeam.org/library/guide/TechNotes/xpathtestbed.rhtm -->
+<?value ="2"?>
+<parent name="data" >
+   <child id="1"  name="alpha" >Some Text</child>
+   <child id="2"  name="beta" >
+      <grandchild id="2.1"  name="beta-alpha" ></grandchild>
+      <grandchild id="2.2"  name="beta-beta" ></grandchild>
+   </child>
+   <pet name="tigger"  type="cat" >
+      <data>
+         <birthday month="sept"  day="19" ></birthday>
+         <food name="Acme Cat Food" ></food>
+      </data>
+   </pet>
+   <pet name="Fido"  type="dog" >
+      <description>
+         Large dog!
+      </description>
+      <data>
+         <birthday month="feb"  day="3" ></birthday>
+         <food name="Acme Dog Food" ></food>
+      </data>
+   </pet>
+   <rogue name="is this real?" >
+      <data>
+         Hates dogs!
+      </data>
+   </rogue>
+   <child id="3"  name="gamma"  mark="yes" >
+      <!-- A comment -->
+      <description>
+         Likes all animals - especially dogs!
+      </description>
+      <grandchild id="3.1"  name="gamma-alpha" >
+         <![CDATA[ Some non-parsable character data ]]>
+      </grandchild>
+      <grandchild id="3.2"  name="gamma-beta" ></grandchild>
+   </child>
+</parent>
+</documentRoot>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/e1074.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/e1074.xml
new file mode 100644
index 0000000000..920a9e67e1
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/e1074.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <root id="1">
+        <elem1 id="2">
+            <elem2 id="3">
+                <e id="4"/>
+                <elem3 id="5">
+                    <e id="6"/>
+                </elem3>
+                <elem3 id="7"/>
+            </elem2>
+        </elem1>
+        <elem1 id="8">
+            <elem2 id="9"/>
+            <e id="10"/>
+            <e id="11"/>
+        </elem1>
+        <e id="12"/>
+    </root>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/e1075.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/e1075.xml
new file mode 100644
index 0000000000..920a9e67e1
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/e1075.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <root id="1">
+        <elem1 id="2">
+            <elem2 id="3">
+                <e id="4"/>
+                <elem3 id="5">
+                    <e id="6"/>
+                </elem3>
+                <elem3 id="7"/>
+            </elem2>
+        </elem1>
+        <elem1 id="8">
+            <elem2 id="9"/>
+            <e id="10"/>
+            <e id="11"/>
+        </elem1>
+        <e id="12"/>
+    </root>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/e1076.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/e1076.xml
new file mode 100644
index 0000000000..c9ffebb202
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/e1076.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <root id="1">
+        <elem1 id="2">cat</elem1>
+        <elem1 id="3"> dog </elem1>
+        <elem1 id="4">
+            cat
+            <elem2 id="5">
+                <elem3 id="6">cat</elem3>
+            </elem2>
+            dog
+        </elem1>
+        <elem1 id="7">Cat</elem1>
+    </root>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/e1077.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/e1077.xml
new file mode 100644
index 0000000000..9aa548e13c
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/e1077.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE root [ <!ELEMENT e (e*) >
+                     <!ATTLIST e  id    ID    #REQUIRED>
+    ]>
+    <root>
+        <e id="1">
+            <e id="two">
+                <e id="3"/>
+                <e id="4">
+                    <e id="the fifth"/>
+                </e>
+                <e id="6"/>
+            </e>
+        </e>
+        <e id="seven"/>
+    </root>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/e1078.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/e1078.xml
new file mode 100644
index 0000000000..a90db50145
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/e1078.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <root id="1">
+        <elem1 id="2" pet="cat"/>
+        <elem1 id="3" pet=" dog " age="8"/>
+        <elem1 id="4" pet="Cat" >
+            <elem2 id="5">
+                <elem3 id="6" age="10"/>
+            </elem2>
+        </elem1>
+        <elem1 id="7" pet="dog"/>
+    </root>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/motorcycles.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/motorcycles.xml
new file mode 100644
index 0000000000..b3629dce34
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/motorcycles.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<motorcycles>
+  <bike year="2000" color="black">
+    <name>
+      <manufacturer>Suzuki</manufacturer>
+      <brandName>Suzuki VL 1500</brandName>
+      <additionalName>Intruder</additionalName>
+    </name>
+    <engine>V-engine, 2-cylinders, 1500 cc</engine>
+    <kind>custom</kind>
+    <drive>cardan</drive>
+    <accessories>Sissy bar, luggage carrier,V&amp;H exhaust pipes</accessories>
+  </bike>
+  <date>2004.08.25</date>
+  <bike year="1983" color="read pearl">
+    <name>
+      <manufacturer>Yamaha</manufacturer>
+      <brandName>XJ 400</brandName>
+    </name>
+    <engine>4 cylinder, 400 cc</engine>
+    <kind>alround</kind>
+    <drive>chain</drive>
+    <comment>Good shape!</comment>
+  </bike>
+</motorcycles>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/myBS_model.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/myBS_model.xml
new file mode 100644
index 0000000000..58f90662a4
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/myBS_model.xml
@@ -0,0 +1,6 @@
+<myBS_model>
+
+  <blipp id="name1"/>
+  <blipp id="name2"/>
+
+</myBS_model>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/purchaseOrder.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/purchaseOrder.xml
new file mode 100644
index 0000000000..a5ae223d65
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/purchaseOrder.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<apo:purchaseOrder xmlns:apo="http://www.example.com/PO1"
+                   orderDate="1999-10-20">
+  <billTo country="US">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <!-- etc. -->
+      <city>Old Town</city>
+      <state>PA</state>
+      <zip>95819</zip>
+  </billTo>
+  <apo:comment>Hurry, my lawn is going wild!</apo:comment>
+  <shipTo country="US">
+    <name>Alice Smith</name>
+    <street>123 Maple Street</street>
+    <!-- etc. -->
+      <city>Mill Valley</city>
+      <state>CA</state>
+      <zip>90952</zip>
+  </shipTo>
+  <!-- etc. -->
+   <items>
+      <item partNum="872-AA">
+         <productName>Lawnmower</productName>
+         <quantity>1</quantity>
+         <USPrice>148.95</USPrice>
+         <comment>Confirm this is electric</comment>
+      </item>
+      <item partNum="926-AA">
+         <productName>Baby Monitor</productName>
+         <quantity>1</quantity>
+         <USPrice>39.98</USPrice>
+         <shipDate>1999-05-21</shipDate>
+      </item>
+   </items>
+</apo:purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath.xml
new file mode 100644
index 0000000000..248fbd413d
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath.xml
@@ -0,0 +1,25 @@
+<myBS_model>
+
+  <blipp id="name1">
+      <blupp att="bluppa"/>
+  </blipp>
+  <blipp id="name2">
+      <blupp att2="bluppb">
+          <plopp name="pl">here are some text</plopp>
+      </blupp>
+  </blipp>
+  <blipp id="name3" test="test1">
+      <blupp att2="bluppc">
+          <plopp name="plp">here are some more text</plopp>
+      </blupp>
+      <blupp att="bluppc2"/>
+  </blipp>
+
+  <blipp2 bid="name1">
+      <blupp att="bluppa"/>
+      <blupp att2="bluppb">
+          <plopp name="pl">here are some additional text</plopp>
+      </blupp>
+  </blipp2>
+
+</myBS_model>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
new file mode 100644
index 0000000000..850b7f8135
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
@@ -0,0 +1,266 @@
+%%%-------------------------------------------------------------------
+%%% File    : xpath_abbrev.erl
+%%% Author  : Bertil Karlsson <bertil@finrod>
+%%% Description : 
+%%%
+%%% Created : 17 Jan 2006 by Bertil Karlsson <bertil@finrod>
+%%%-------------------------------------------------------------------
+-module(xpath_abbrev).
+
+-export([test/0, check_node_set/2, ticket_6873/0, ticket_7496/0, functions/0]).
+
+-include("test_server.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
+
+test() ->
+    ?line {E,_} = xmerl_scan:file("xpath.xml"),
+
+    ?line Res1 = xmerl_xpath:string("blipp",E),
+    ?line ok = check_node_set("blipp",Res1),
+    ?line Res2 = xmerl_xpath:string("*",E),
+    ?line ok = check_node_set("*",Res2),
+    ?line Res3 = xmerl_xpath:string("blipp/blupp/plopp/text()",E),
+    ?line ok = check_node_set("blipp/blupp/plopp/text()",Res3),
+    ?line Res4 = xmerl_xpath:string("blipp/blupp/@att2",E),
+    ?line ok = check_node_set("blipp/blupp/@att2",Res4),
+    ?line Res5 = xmerl_xpath:string("blipp/@*",E),
+    ?line ok = check_node_set("blipp/@*",Res5),
+    ?line Res6 = xmerl_xpath:string("blipp[2]",E),
+    ?line ok = check_node_set("blipp[2]",Res6),
+    ?line Res7 = xmerl_xpath:string("blipp[last()]",E),
+    ?line ok = check_node_set("blipp[last()]",Res7),
+    ?line Res8 = xmerl_xpath:string("*/blupp",E),
+    ?line ok = check_node_set("*/blupp",Res8),
+    ?line Res9 = xmerl_xpath:string("/myBS_model/blipp[3]/blupp[2]",E),
+    ?line ok = check_node_set("/myBS_model/blipp[3]/blupp[2]",Res9),
+    ?line Res10 = xmerl_xpath:string("blipp//plopp",E),
+    ?line ok = check_node_set("blipp//plopp",Res10),
+    ?line Res11 = xmerl_xpath:string("//plopp",E),
+    ?line ok = check_node_set("//plopp",Res11),
+    ?line Res12 = xmerl_xpath:string("//blupp/plopp",E),
+    ?line ok = check_node_set("//blupp/plopp",Res12),
+    ?line Res13 = xmerl_xpath:string(".",E),
+    ?line ok = check_node_set(".",Res13),
+    ?line Res14 = xmerl_xpath:string(".//blipp2",E),
+    ?line ok = check_node_set(".//blipp2",Res14),
+    ?line Res15 = xmerl_xpath:string(".//blipp2/blupp/plopp/..",E),
+    ?line ok = check_node_set(".//blipp2/blupp/plopp/..",Res15),
+    ?line Res16 = xmerl_xpath:string(".//blipp[2]/blupp/plopp/../@att2",E),
+    ?line ok = check_node_set(".//blipp[2]/blupp/plopp/../@att2",Res16),
+    ?line Res17 = xmerl_xpath:string(".//blipp/blupp/plopp[2]/../@att2",E),
+    ?line ok = check_node_set(".//blipp/blupp/plopp[2]/../@att2",Res17),
+    ?line Res18 = xmerl_xpath:string("blipp[@id='name2']",E),
+    ?line ok = check_node_set("blipp[@id='name2']",Res18),
+    ?line Res19 = xmerl_xpath:string("blipp[@id='name2'][3]",E),
+    ?line ok = check_node_set("blipp[@id='name2'][3]",Res19),
+    ?line Res20 = xmerl_xpath:string("//blupp[plopp=\"here are some more text\"]",E),
+    ?line ok = check_node_set("//blupp[plopp=\"here are some more text\"]",Res20),
+    ?line Res21 = xmerl_xpath:string("//blupp[plopp]",E),
+    ?line ok = check_node_set("//blupp[plopp]",Res21),
+    ?line Res22 = xmerl_xpath:string("blipp[@id and @test]",E),
+    ?line ok = check_node_set("blipp[@id and @test]",Res22).
+
+check_node_set("blipp",[E1,E2,E3]) -> 
+    ?line ok = xml_element_name(E1,blipp),
+    ?line ok = xml_element_name(E2,blipp),
+    ?line ok = xml_element_name(E3,blipp),
+    ok;
+check_node_set("*",[E1,E2,E3,E4]) ->
+    ?line ok = xml_element_name(E1,blipp),
+    ?line ok = xml_element_name(E2,blipp),
+    ?line ok = xml_element_name(E3,blipp),
+    ?line ok = xml_element_name(E4,blipp2),
+    ok;
+check_node_set("blipp/blupp/plopp/text()",[T1,T2]) ->
+    ?line #xmlText{value="here are some text"} = T1,
+    ?line #xmlText{value="here are some more text"} = T2,
+    ok;
+check_node_set("blipp/blupp/@att2",[A1,A2]) ->
+    ?line #xmlAttribute{name=att2} = A1,
+    ?line #xmlAttribute{name=att2} = A2,
+    ok;
+check_node_set("blipp/@*",[A1,A2,A3,A4]) ->
+    ?line #xmlAttribute{} = A1,
+    ?line #xmlAttribute{} = A2,
+    ?line #xmlAttribute{} = A3,
+    ?line #xmlAttribute{} = A4,
+    ok;
+check_node_set("blipp[2]",[E]) ->
+    ?line #xmlElement{name=blipp,
+		      attributes=[#xmlAttribute{name=id,value="name2"}]} = E,
+    ok;
+check_node_set("blipp[last()]",[E]) ->
+    ?line #xmlElement{name=blipp,
+		      attributes=[#xmlAttribute{name=id,value="name3"}|_]} = E,
+    ok;
+check_node_set("*/blupp",[E1,E2,E3,E4,E5,E6]) ->
+    ?line ok = xml_element_name(E1,blupp),
+    ?line ok = xml_element_name(E2,blupp),
+    ?line ok = xml_element_name(E3,blupp),
+    ?line ok = xml_element_name(E4,blupp),
+    ?line ok = xml_element_name(E5,blupp),
+    ?line ok = xml_element_name(E6,blupp),
+    ok;
+check_node_set("/myBS_model/blipp[3]/blupp[2]",[E]) ->
+    ?line #xmlElement{name=blupp,
+		      attributes=[#xmlAttribute{name=att,value="bluppc2"}]}=E,
+    ok;
+check_node_set("blipp//plopp",[#xmlElement{name=plopp},#xmlElement{name=plopp}]) -> 
+    ok;
+check_node_set("//plopp",[E1,E2,E3]) ->
+    ?line ok = xml_element_name(E1,plopp),
+    ?line ok = xml_element_name(E2,plopp),
+    ?line ok = xml_element_name(E3,plopp),
+    ok;
+check_node_set("//blupp/plopp",[E1,E2,E3]) ->
+    ?line ok = xml_element_name(E1,plopp),
+    ?line ok = xml_element_name(E2,plopp),
+    ?line ok = xml_element_name(E3,plopp),
+    ok;
+check_node_set(".",[#xmlElement{name=myBS_model}]) ->
+    ok;
+check_node_set(".//blipp2",[#xmlElement{name=blipp2}]) ->
+    ok;
+check_node_set(".//blipp2/blupp/plopp/..",[#xmlElement{name=blupp}]) ->
+    ok;
+check_node_set(".//blipp[2]/blupp/plopp/../@att2",[#xmlAttribute{name=att2,value="bluppb"}]) ->
+    ok;
+check_node_set(".//blipp/blupp/plopp[2]/../@att2",[#xmlAttribute{name=att2,value="bluppc"}]) ->
+    ok;
+check_node_set("blipp[@id='name2']",[E]) ->
+    ?line #xmlElement{name=blipp,
+		      attributes=[#xmlAttribute{name=id,value="name2"}]}=E,
+    ok;
+check_node_set("blipp[@id='name2'][3]",[]) ->
+    ok;
+check_node_set("//blupp[plopp=\"here are some more text\"]",[E]) ->
+    ?line #xmlElement{name=blupp,
+		      content=[_T,#xmlElement{name=plopp,content=C}|_]} = E,
+    ?line true = lists:keymember("here are some more text",#xmlText.value,C),
+    ok;
+check_node_set("//blupp[plopp]",[E1,E2,E3]) ->
+    ?line #xmlElement{name=blupp,
+		      content=C1} = E1,
+    ?line true = lists:keymember(plopp,#xmlElement.name,C1),
+    ?line #xmlElement{name=blupp,
+		      content=C2} = E2,
+    ?line true = lists:keymember(plopp,#xmlElement.name,C2),
+    ?line #xmlElement{name=blupp,
+		      content=C3} = E3,
+    ?line true = lists:keymember(plopp,#xmlElement.name,C3),
+    ok;
+check_node_set("blipp[@id and @test]",[E]) ->
+    ?line #xmlElement{name=blipp,
+		      attributes=Atts} = E,
+    ?line true = lists:keymember(id,#xmlAttribute.name,Atts),
+    ?line true = lists:keymember(test,#xmlAttribute.name,Atts),
+    ok;
+check_node_set(Pattern,NodeSet) ->
+    io:format("Pattern: ~p~nNodeSet: ~p~n",[Pattern,NodeSet]),
+    error.
+
+xml_element_name(E,N) ->
+    ?line #xmlElement{name=N} = E,
+    ok.
+
+ticket_6873() ->
+    ?line [#xmlElement{}] = xmerl_xpath:string("//foo[contains(@bar, 'oe')]",element(1,xmerl_scan:string("<foo bar=\"Joe\" />"))),
+    ok.
+
+ticket_7496() ->
+    Test = fun(Doc, XPath, Exp) ->
+		   Result = xmerl_xpath:string(XPath, Doc),
+		   ?line Exp = [Name || #xmlElement{name = Name} <- Result],
+		   ok
+	   end,
+    ?line {Doc1,_} = xmerl_scan:string("<a><b/> <c/> <d/> <e/></a>"),
+    ?line ok = Test(Doc1, "//b/following::*", [c, d, e]),
+    ?line ok = Test(Doc1,"//b/following::*[1]", [c]),
+    ?line ok = Test(Doc1,"//b/following::*[position()=1]", [c]),
+    ?line ok = Test(Doc1,"//b/following::*[3]", [e]),
+    ?line ok = Test(Doc1,"//b/following::*[position()=3]", [e]),
+    ?line ok = Test(Doc1,"//e/preceding::*", [b, c, d]),
+    ?line ok = Test(Doc1,"//e/preceding::*[1]", [d]),
+    ?line ok = Test(Doc1,"//e/preceding::*[position()=1]", [d]),
+    ?line ok = Test(Doc1,"//e/preceding::*[3]", [b]),
+    ?line ok = Test(Doc1,"//e/preceding::*[position()=3]", [b]),
+    ?line ok = Test(Doc1,"//b/following::*[position() mod 2=0]", [d]),
+    ?line ok = Test(Doc1,"//b/self::*", [b]),
+
+    ?line {Doc2,_} = xmerl_scan:string("<a><b/> <c><d/></c> <e/> <f><g/></f> <h/> <i><j/></i> <k/></a>"),
+    ?line ok = Test(Doc2,"//g/preceding::*", [b, c, d, e]),
+    ?line ok = Test(Doc2, "//g/following::*", [h, i, j, k]),
+    ?line ok = Test(Doc2,"//g/ancestor::*", [a, f]),
+    ?line ok = Test(Doc2,"//g/ancestor::*[1]", [f]),
+    ?line ok = Test(Doc2,"//g/ancestor::*[2]", [a]),
+    ?line ok = Test(Doc2,"//g/ancestor-or-self::*", [a, f, g]),
+    ?line ok = Test(Doc2,"//g/ancestor-or-self::*[1]", [g]),
+    ?line ok = Test(Doc2,"//g/ancestor-or-self::*[2]", [f]),
+    ?line ok = Test(Doc2,"//g/ancestor-or-self::*[3]", [a]),
+    ?line ok = Test(Doc2,"/descendant::*", [a, b, c, d, e, f, g, h, i, j, k]),
+    ?line ok = Test(Doc2,"//f/preceding-sibling::*", [b, c, e]),
+    ?line ok = Test(Doc2,"//f/following-sibling::*", [h, i, k]),
+    ?line ok = Test(Doc2,"//f/self::*", [f]),
+    ?line ok = Test(Doc2,"//f/ancestor::*", [a]),
+    ?line ok = Test(Doc2,"//f/descendant::*", [g]),
+    ?line ok = Test(Doc2,"//f/preceding::*", [b, c, d, e]),
+    ?line ok = Test(Doc2,"//f/following::*", [h, i, j, k]),
+    ?line ok = Test(Doc2,"//text()[1]/following-sibling::*", [c, e, f, h, i, k]),
+    
+    ?line {Doc3,_} = xmerl_scan:file("documentRoot.xml"),
+    ?line ok = Test(Doc3,"//child",[child,child,child]),
+    ?line ok = Test(Doc3,"//child[@name='beta']",[child]),
+    ?line [{xmlAttribute,id,[],[],[],[],1,[],"2",false}] =
+	xmerl_xpath:string("/documentRoot/parent/child[@name='beta']/@id",Doc3),
+    ?line ok = Test(Doc3,"/documentRoot/parent/child|/documentRoot/parent/pet",
+		    [child,child,child,pet,pet]),
+    ?line ok = Test(Doc3,"//*[starts-with(local-name(),'p')]",
+		    [parent,pet,pet]).
+    
+
+functions() ->
+    Test = fun(Doc, XPath, Exp) ->
+		   Result = xmerl_xpath:string(XPath, Doc),
+		   ?line Exp = [begin
+				    case Obj of
+					#xmlElement{name = EName} ->
+					    EName;
+					#xmlAttribute{name = AName} ->
+					    AName;
+					#xmlText{value=Text} ->
+					    Text
+				    end
+				end|| Obj <- Result],
+		   ok
+	   end,
+    Foo = 
+	"<foo>"
+	"  <bar>"
+	"    <name>Xml</name>"
+	"    <value>1</value>"
+	"  </bar>"
+	"  <bar>"
+	"    <name>Xpath</name>"
+	"    <value>2</value>"
+	"  </bar>"
+	"  <bar>"
+	"    <name>Erlang</name>"
+	"    <value>3</value>"
+	"  </bar>"
+	"</foo>",
+    {Doc,_} = xmerl_scan:string(Foo),
+    ?line ok = Test(Doc,"/foo/bar[name = 'Xml']/value/text()",["1"]),
+    ?line ok = Test(Doc,"/foo/bar/node()/text()",
+		    ["Xml","1","Xpath","2","Erlang","3"]),
+    ?line ok = Test(Doc,"/foo/bar[contains(name, 'path')]",[bar]),
+    ?line ok = Test(Doc,"/foo/bar[starts-with(name, 'X')]",[bar,bar]),
+    ?line ok = Test(Doc,"/foo/bar[value = string(1)]/value/text()",["1"]),
+    
+
+    {Doc2,_}= xmerl_scan:file("purchaseOrder.xml"),
+    ?line ok = Test(Doc2,"//*[starts-with(local-name(),'c')]",
+		    ['apo:comment',city,city,comment]),
+    ?line ok = Test(Doc2,"//*[starts-with(name(),'c')]",
+		    [city,city,comment]),
+    ?line ok = Test(Doc2,"//*[starts-with(name(),'{http://www.example.com/PO1')]",
+		    ['apo:purchaseOrder','apo:comment']).
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_lib.erl b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_lib.erl
new file mode 100644
index 0000000000..4cde46826e
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_lib.erl
@@ -0,0 +1,184 @@
+%%%-------------------------------------------------------------------
+%%% File    : xpath_lib.erl
+%%% Author  : Bertil Karlsson <bertil@finrod>
+%%% Description : 
+%%%
+%%% Created : 13 Jan 2006 by Bertil Karlsson <bertil@finrod>
+%%%-------------------------------------------------------------------
+-module(xpath_lib).
+
+-export([test/0,check_node_set/2,ticket_6873/0]).
+
+-include("test_server.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
+
+test() ->
+    ?line {E,_} = xmerl_scan:file("myBS_model.xml"),    
+    ?line Res1 = xmerl_xpath:string("blipp",E),
+    ?line ok = check_node_set("blipp",Res1),
+    ?line Res2 = xmerl_xpath:string("//blipp",E),
+    ?line ok = check_node_set("//blipp",Res2),
+    ?line Res3 = xmerl_xpath:string("/myBS_model/blipp",E),
+    ?line ok = check_node_set("/myBS_model/blipp",Res3),
+    ?line Res4 = xmerl_xpath:string("blipp[@id=\"name1\"]",E),
+    ?line ok = check_node_set("blipp[@id=\"name1\"]",Res4),
+    ?line Res5 = xmerl_xpath:string("//blipp[@id=\"name1\"]",E),
+    ?line ok = check_node_set("//blipp[@id=\"name1\"]",Res5),
+    ?line Res6 = xmerl_xpath:string("/myBS_model/blipp[@id=\"name1\"]",E),
+    ?line ok = check_node_set("/myBS_model/blipp[@id=\"name1\"]",Res6).
+
+
+check_node_set("blipp",[H1,H2]) ->
+    ?line #xmlElement{name = blipp} = H1,
+    ?line #xmlElement{name = blipp} = H2,
+    ok;
+check_node_set("//blipp",[H1,H2]) ->
+    ?line #xmlElement{name = blipp} = H1,
+    ?line #xmlElement{name = blipp} = H2,
+    ok;
+check_node_set("/myBS_model/blipp",[H1,H2]) ->
+    ?line #xmlElement{name = blipp} = H1,
+    ?line #xmlElement{name = blipp} = H2,
+    ok;
+check_node_set("blipp[@id=\"name1\"]",[H]) ->
+    ?line H#xmlElement{attributes=#xmlAttribute{name=id,value="name1"}},
+    ok;
+check_node_set("//blipp[@id=\"name1\"]",[H]) ->
+    ?line H#xmlElement{attributes=#xmlAttribute{name=id,value="name1"}},
+    ok;
+check_node_set("/myBS_model/blipp[@id=\"name1\"]",[H]) ->
+    ?line H#xmlElement{attributes=#xmlAttribute{name=id,value="name1"}},
+    ok.
+
+ticket_6873() ->
+    GetId =
+	fun(Atts) ->
+		case lists:keysearch(id,#xmlAttribute.name,Atts) of
+		    {value,#xmlAttribute{value=AttV}} -> AttV;
+		    _ -> novalue
+		end
+	end,
+    Test =
+	fun(Doc, XPath, Exp) ->
+		Result = xmerl_xpath:string(XPath, Doc),
+		Exp = [begin
+			   case Obj of
+			       #xmlElement{name = EName,attributes=Atts} ->
+				   {EName,GetId(Atts)};
+			       #xmlAttribute{name = AName} ->
+				   AName;
+			       #xmlText{value=Text} ->
+				   Text
+			   end
+		       end|| Obj <- Result],
+		ok
+	end,
+
+    
+    
+    Doc1 = get_doc("e1074"),
+    ?line ok = Test(Doc1,"/*",[{root,"1"}]),
+    ?line ok = Test(Doc1,"/root",[{root,"1"}]),
+    ?line ok = Test(Doc1,"/root/*",[{elem1,"2"},{elem1,"8"},{e,"12"}]),
+    ?line ok = Test(Doc1,"/root/e",[{e,"12"}]),
+    ?line ok = Test(Doc1,"//e",[{e,"12"},{e,"4"},{e,"6"},{e,"10"},{e,"11"}]),
+    ?line ok = Test(Doc1,"//*[name() != 'e']",
+		    [{root,"1"},{elem1,"2"},{elem1,"8"},{elem2,"3"},
+		     {elem3,"5"},{elem3,"7"},{elem2,"9"}]),
+    ?line ok = Test(Doc1,"//elem1/e",[{e,"10"},{e,"11"}]),
+    ?line ok = Test(Doc1,"//elem1//e",[{e,"4"},{e,"6"},{e,"10"},{e,"11"}]),
+    ?line ok = Test(Doc1,"//*[*]",
+		    [{root,"1"},{elem1,"2"},{elem1,"8"},
+		     {elem2,"3"},{elem3,"5"}]),
+    ?line ok = Test(Doc1,"//*[not(*)]",
+		    [{e,"12"},{e,"4"},{elem3,"7"},{e,"6"},
+		     {elem2,"9"},{e,"10"},{e,"11"}]),
+    %% contents would be empty in the above expression
+    ?line [#xmlElement{content=[]}|_] = xmerl_xpath:string("//*[not(*)]",Doc1),
+    ?line ok = Test(Doc1,"//*[e]",[{root,"1"},{elem1,"8"},{elem2,"3"},{elem3,"5"}]),
+    ?line ok = Test(Doc1,"//*[count(e)>1]",[{elem1,"8"}]),
+    ?line ok = Test(Doc1,"//*[not(e) and name() != 'e']",
+		    [{elem1,"2"},{elem3,"7"},{elem2,"9"}]),
+    ?line ok = Test(Doc1,"/*/*/*/e",[{e,"4"}]),
+    ?line ok = Test(Doc1,"//*[starts-with(name(), 'el')]",
+		    [{elem1,"2"},{elem1,"8"},{elem2,"3"},
+		     {elem3,"5"},{elem3,"7"},{elem2,"9"}]),
+    ?line ok = Test(Doc1,"//*[contains(name(), 'lem1')]",
+		    [{elem1,"2"},{elem1,"8"}]),
+    ?line ok = Test(Doc1,"/*/e | //elem2/e",[{e,"4"},{e,"12"}]),
+
+    io:format("Tested ~p~n",[e1074]),
+
+    Doc2 = get_doc("e1075"),
+    ?line ok = Test(Doc2,"/*/*[1]",[{elem1,"2"}]),
+    ?line ok = Test(Doc2,"/root/elem1[2]",[{elem1,"8"}]),
+
+    %% Get all first-born e elements in the document; that is, for all
+    %% e elements with e element siblings, include only the first
+    %% sibling.Note that //e[1] does not return the first e element in
+    %% the document because the [1] predicate applies to e, which
+    %% represents the set of e elements under one element and not to
+    %% //e, which represents the set of e elements in the document.
+    %%    ?line ok = Test(Doc2,"//e[1]",[{e,"4"},{e,"6"},{e,"10"},{e,"12"}]),
+
+    %% The following expression retrieves the first e element in the
+    %% document:
+    %%    ?line ok = Test(Doc2,"(//e)[1]",[{e,4}]),
+    
+    %% For all e elements with e element siblings, include only the
+    %% first 3 siblings
+    %% ?line ok = Test(Doc2,"//e[position() <= 3]",[{e,"4"},{e,"6"},{e,"10"},{e,"11"},{e,"12"}]),
+
+    %% Get all last-born e elements in the document; that is, for all
+    %% e elements with e element siblings, include only the last
+    %% sibling
+    %% ?line ok = Test(Doc2,"//e[last()]",[{e,"4"},{e,"6"},{e,"11"},{e,"12"}]),
+
+    %% Get the last e element in the document
+    %% ?line ok = Test(Doc2,"(//e)[last()]", [{e,"12"}]),
+    
+
+    io:format("Tested ~p~n",[e1075]),
+
+
+    Doc3 = get_doc("e1076"),
+    ?line ok = Test(Doc3,"//*[.='cat']",[{elem1,"2"},{elem3,"6"}]),
+    ?line ok = Test(Doc3,"//*[.='dog']",[]),
+    ?line ok = Test(Doc3,"//*[contains(.,'cat')]",
+		    [{elem1,"2"},{elem1,"4"},{elem3,"6"}]),
+    ?line ok = Test(Doc3,"//elem3[contains(.,'cat')]",[{elem3,"6"}]),
+    ?line ok = Test(Doc3,"//*[contains(child::text(),'cat')]",[{elem1,"2"},{elem1,"4"},{elem3,"6"}]),
+    ?line ok = Test(Doc3,"//*[count(*)=0 and contains(.,'cat')]",[{elem1,"2"},{elem3,"6"}]),
+    ?line ok = Test(Doc3,"//*[contains(translate(.,'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'),'CAT')]",[{elem1,"2"},{elem1,"4"},{elem1,"7"},{elem3,"6"}]),
+
+    io:format("Tested ~p~n",[e1076]),
+
+    Doc4 = get_doc("e1078"),
+    ?line ok = Test(Doc4,"//*[@pet='cat']",[{elem1,"2"}]),
+    ?line ok = Test(Doc4,"//*[@pet='dog']",[{elem1,"7"}]),
+    ?line ok = Test(Doc4,"//*[contains(@pet,'dog')]",
+		    [{elem1,"3"},{elem1,"7"}]),
+    ?line ok = Test(Doc4,"//*[@age]",[{elem1,"3"},{elem3,"6"}]),
+    ?line ok = Test(Doc4,"//elem1[@age]",[{elem1,"3"}]),
+    ?line ok = Test(Doc4,"//*[@pet and @age]",[{elem1,"3"}]),
+    ?line ok = Test(Doc4,"//*[contains(translate(@pet,'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'),'CAT')]",[{elem1,"2"},{elem1,"4"}]),
+    
+    io:format("Tested ~p~n",[e1078]),
+
+
+    Doc5 = get_doc("e1077"),
+    ?line ok = Test(Doc5,"id('3')",[{e,"3"}]),
+
+    %% Get all e elements directly under element id 3
+    %%    ?line ok = Test(Doc5,"id('two')/e",[{e,"3"},{e,"4"},{e,"6"}]),
+    ?line ok = Test(Doc5,"id('two 3 seven the fifth')",[{e,"seven"},{e,"3"},{e,"two"}]),
+    ?line ok = Test(Doc5,"id('100')",[]),
+    
+    io:format("Tested ~p~n",[e1077]),
+    ok.
+
+
+    
+get_doc(Name) ->
+    ?line {Doc,_} = xmerl_scan:file(Name++".xml"),
+    Doc.
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_text.erl b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_text.erl
new file mode 100644
index 0000000000..e39ad6bcb0
--- /dev/null
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_text.erl
@@ -0,0 +1,28 @@
+%%%-------------------------------------------------------------------
+%%% File    : xpath_text.erl
+%%% Author  : Bertil Karlsson <bertil@finrod>
+%%% Description : 
+%%%
+%%% Created : 14 Dec 2004 by Bertil Karlsson <bertil@finrod>
+%%%-------------------------------------------------------------------
+-module(xpath_text).
+
+-compile(export_all).
+
+-include("test_server.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
+
+-import(xmerl_xs, 
+	[ xslapply/2, value_of/1, select/2, built_in_rules/2 ]).
+
+
+one() ->
+    ?line {A,_}=xmerl_scan:file('motorcycles.xml'),
+    ?line [["Suzuki","Yamaha"]] = template(A),
+    ok.
+
+%%% templates, test of OTP-5268
+template(E = #xmlElement{name='motorcycles'}) ->
+	 [value_of(select("bike/name/manufacturer/text()",E))];
+template(E) -> built_in_rules(fun template/1, E).
+
diff --git a/lib/xmerl/test/xmerl_app_test.erl b/lib/xmerl/test/xmerl_app_test.erl
new file mode 100644
index 0000000000..4cc4bf3791
--- /dev/null
+++ b/lib/xmerl/test/xmerl_app_test.erl
@@ -0,0 +1,242 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2010. 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%
+%%
+%%
+%%----------------------------------------------------------------------
+%% Purpose: Verify the application specifics of the Megaco application
+%%----------------------------------------------------------------------
+-module(xmerl_app_test).
+
+-compile(export_all).
+
+%-include("megaco_test_lib.hrl").
+
+
+% t()     -> megaco_test_lib:t(?MODULE).
+% t(Case) -> megaco_test_lib:t({?MODULE, Case}).
+
+
+% %% Test server callbacks
+% init_per_testcase(Case, Config) ->
+%     megaco_test_lib:init_per_testcase(Case, Config).
+
+% end_per_testcase(Case, Config) ->
+%     megaco_test_lib:end_per_testcase(Case, Config).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+all() -> 
+    [fields, modules, exportall, app_depend].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
+    case is_app(xmerl) of
+	{ok, AppFile} ->
+	    io:format("AppFile: ~n~p~n", [AppFile]),
+	    [{app_file, AppFile}|Config];
+	{error, Reason} ->
+	    fail(Reason)
+    end.
+
+is_app(App) ->
+    LibDir = code:lib_dir(App),
+    File = filename:join([LibDir, "ebin", atom_to_list(App) ++ ".app"]),
+    case file:consult(File) of
+	{ok, [{application, App, AppFile}]} ->
+	    {ok, AppFile};
+	Error ->
+	    {error, {invalid_format, Error}}
+    end.
+
+
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+fields(suite) ->
+    [];
+fields(doc) ->
+    [];
+fields(Config) when is_list(Config) ->
+    AppFile = key1search(app_file, Config),
+    Fields = [vsn, description, modules, registered, applications],
+    case check_fields(Fields, AppFile, []) of
+	[] ->
+	    ok;
+	Missing ->
+	    fail({missing_fields, Missing})
+    end.
+
+check_fields([], _AppFile, Missing) ->
+    Missing;
+check_fields([Field|Fields], AppFile, Missing) ->
+    check_fields(Fields, AppFile, check_field(Field, AppFile, Missing)).
+
+check_field(Name, AppFile, Missing) ->
+    io:format("checking field: ~p~n", [Name]),
+    case lists:keymember(Name, 1, AppFile) of
+	true ->
+	    Missing;
+	false ->
+	    [Name|Missing]
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+modules(suite) ->
+    [];
+modules(doc) ->
+    [];
+modules(Config) when is_list(Config) ->
+    AppFile  = key1search(app_file, Config),
+    Mods     = key1search(modules, AppFile),
+    EbinList = get_ebin_mods(xmerl),
+    case missing_modules(Mods, EbinList, []) of
+	[] ->
+	    ok;
+	Missing ->
+	    throw({error, {missing_modules, Missing}})
+    end,
+    case extra_modules(Mods, EbinList, []) of
+	[] ->
+	    ok;
+	Extra ->
+	    throw({error, {extra_modules, Extra}})
+    end,
+    {ok, Mods}.
+	    
+get_ebin_mods(App) ->
+    LibDir  = code:lib_dir(App),
+    EbinDir = filename:join([LibDir,"ebin"]),
+    {ok, Files0} = file:list_dir(EbinDir),
+    Files1 = [lists:reverse(File) || File <- Files0],
+    [list_to_atom(lists:reverse(Name)) || [$m,$a,$e,$b,$.|Name] <- Files1].
+    
+
+missing_modules([], _Ebins, Missing) ->
+    Missing;
+missing_modules([Mod|Mods], Ebins, Missing) ->
+    case lists:member(Mod, Ebins) of
+	true ->
+	    missing_modules(Mods, Ebins, Missing);
+	false ->
+	    io:format("missing module: ~p~n", [Mod]),
+	    missing_modules(Mods, Ebins, [Mod|Missing])
+    end.
+
+
+extra_modules(_Mods, [], Extra) ->
+    Extra;
+extra_modules(Mods, [Mod|Ebins], Extra) ->
+    case lists:member(Mod, Mods) of
+	true ->
+	    extra_modules(Mods, Ebins, Extra);
+	false ->
+	    io:format("supefluous module: ~p~n", [Mod]),
+	    extra_modules(Mods, Ebins, [Mod|Extra])
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+exportall(suite) ->
+    [];
+exportall(doc) ->
+    [];
+exportall(Config) when is_list(Config) ->
+    AppFile = key1search(app_file, Config),
+    Mods    = key1search(modules, AppFile),
+    check_export_all(Mods).
+
+
+check_export_all([]) ->
+    ok;
+check_export_all([Mod|Mods]) ->
+    case (catch apply(Mod, module_info, [compile])) of
+	{'EXIT', {undef, _}} ->
+	    check_export_all(Mods);
+	O ->
+            case lists:keysearch(options, 1, O) of
+                false ->
+                    check_export_all(Mods);
+                {value, {options, List}} ->
+                    case lists:member(export_all, List) of
+                        true ->
+			    throw({error, {export_all, Mod}});
+			false ->
+			    check_export_all(Mods)
+                    end
+            end
+    end.
+
+	    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+app_depend(suite) ->
+    [];
+app_depend(doc) ->
+    [];
+app_depend(Config) when is_list(Config) ->
+    AppFile = key1search(app_file, Config),
+    Apps    = key1search(applications, AppFile),
+    check_apps(Apps).
+
+
+check_apps([]) ->
+    ok;
+check_apps([App|Apps]) ->
+    case is_app(App) of
+	{ok, _} ->
+	    check_apps(Apps);
+	Error ->
+	    throw({error, {missing_app, {App, Error}}})
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+fail(Reason) ->
+    exit({suite_failed, Reason}).
+
+key1search(Key, L) ->
+    case lists:keysearch(Key, 1, L) of
+	undefined ->
+	    fail({not_found, Key, L});
+	{value, {Key, Value}} ->
+	    Value
+    end.
diff --git a/lib/xmerl/test/xmerl_appup_test.erl b/lib/xmerl/test/xmerl_appup_test.erl
new file mode 100644
index 0000000000..88d4a9bc28
--- /dev/null
+++ b/lib/xmerl/test/xmerl_appup_test.erl
@@ -0,0 +1,392 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2010. 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%
+%%
+%%
+%%----------------------------------------------------------------------
+%% Purpose: Verify the application specifics of the Megaco application
+%%----------------------------------------------------------------------
+-module(xmerl_appup_test).
+
+-compile(export_all).
+
+%-include("megaco_test_lib.hrl").
+
+
+%t()     -> megaco_test_lib:t(?MODULE).
+%t(Case) -> megaco_test_lib:t({?MODULE, Case}).
+
+
+%% Test server callbacks
+% init_per_testcase(Case, Config) ->
+%     megaco_test_lib:init_per_testcase(Case, Config).
+
+% end_per_testcase(Case, Config) ->
+%     megaco_test_lib:end_per_testcase(Case, Config).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+all() -> 
+    [appup].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
+    AppFile   = file_name(xmerl, ".app"),
+    AppupFile = file_name(xmerl, ".appup"),
+    [{app_file, AppFile}, {appup_file, AppupFile}|Config].
+    
+
+file_name(App, Ext) ->
+    LibDir = code:lib_dir(App),
+    filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
+
+
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+appup(suite) ->
+    [];
+appup(doc) ->
+    "perform a simple check of the appup file";
+appup(Config) when is_list(Config) ->
+    AppupFile = key1search(appup_file, Config),
+    AppFile   = key1search(app_file, Config),
+    Modules   = modules(AppFile),
+    check_appup(AppupFile, Modules).
+
+modules(File) ->
+    case file:consult(File) of
+        {ok, [{application,xmerl,Info}]} ->
+            case lists:keysearch(modules,1,Info) of
+                {value, {modules, Modules}} ->
+                    Modules;
+                false ->
+                    fail({bad_appinfo, Info})
+            end;
+        Error ->
+            fail({bad_appfile, Error})
+    end.
+
+    
+check_appup(AppupFile, Modules) ->
+    case file:consult(AppupFile) of
+	{ok, [{V, UpFrom, DownTo}]} ->
+	    io:format("V= ~p, UpFrom= ~p, DownTo= ~p, Modules= ~p~n",
+		      [V, UpFrom, DownTo, Modules]),
+	    check_appup(V, UpFrom, DownTo, Modules);
+	Else ->
+	    fail({bad_appupfile, Else})
+    end.
+
+
+check_appup(V, UpFrom, DownTo, Modules) ->
+    check_version(V),
+    check_depends(up,   UpFrom, Modules),
+    check_depends(down, DownTo, Modules),
+    ok.
+
+
+check_depends(_, [], _) ->
+    ok;
+check_depends(UpDown, [Dep|Deps], Modules) ->
+    check_depend(UpDown, Dep, Modules),
+    check_depends(UpDown, Deps, Modules).
+
+
+check_depend(up,I={add_application, _App}, Modules) ->
+    d("check_instructions(~w) -> entry with"
+      "~n   Instruction:       ~p"
+      "~n   Modules: ~p", [up,I , Modules]),
+    ok;
+check_depend(down,I={remove_application, _App}, Modules) ->
+    d("check_instructions(~w) -> entry with"
+      "~n   Instruction:       ~p"
+      "~n   Modules: ~p", [down,I , Modules]),
+    ok;
+check_depend(UpDown, {V, Instructions}, Modules) ->
+    d("check_instructions(~w) -> entry with"
+      "~n   V:       ~p"
+      "~n   Modules: ~p", [UpDown, V, Modules]),
+    check_version(V),
+    case check_instructions(UpDown, 
+			    Instructions, Instructions, [], [], Modules) of
+	{_Good, []} ->
+	    ok;
+	{_, Bad} ->
+	    fail({bad_instructions, Bad, UpDown})
+    end.
+
+
+check_instructions(_, [], _, Good, Bad, _) ->
+    {lists:reverse(Good), lists:reverse(Bad)};
+check_instructions(UpDown, [Instr|Instrs], AllInstr, Good, Bad, Modules) ->
+    d("check_instructions(~w) -> entry with"
+      "~n   Instr: ~p", [UpDown,Instr]),
+    case (catch check_instruction(UpDown, Instr, AllInstr, Modules)) of
+        ok ->
+            check_instructions(UpDown, Instrs, AllInstr, 
+			       [Instr|Good], Bad, Modules);
+        {error, Reason} ->
+	    d("check_instructions(~w) -> bad instruction: "
+	      "~n   Reason: ~p", [UpDown,Reason]),
+            check_instructions(UpDown, Instrs, AllInstr, Good, 
+                               [{Instr, Reason}|Bad], Modules)
+    end.
+
+%% A new module is added
+check_instruction(up, {add_module, Module}, _, Modules) 
+  when is_atom(Module) ->
+    d("check_instruction -> entry when up-add_module instruction with"
+      "~n   Module: ~p", [Module]),
+    check_module(Module, Modules);
+
+%% An old module is re-added
+check_instruction(down, {add_module, Module}, _, Modules) 
+  when is_atom(Module) ->
+    d("check_instruction -> entry when down-add_module instruction with"
+      "~n   Module: ~p", [Module]),
+    case (catch check_module(Module, Modules)) of
+	{error, {unknown_module, Module, Modules}} ->
+	    ok;
+	ok ->
+	    local_error({existing_readded_module, Module})
+    end;
+
+%% Removing a module on upgrade: 
+%% - the module has been removed from the app-file.
+%% - check that no module depends on this (removed) module
+check_instruction(up, {remove, {Module, Pre, Post}}, _, Modules) 
+  when is_atom(Module), is_atom(Pre), is_atom(Post) ->
+    d("check_instruction -> entry when up-remove instruction with"
+      "~n   Module: ~p"
+      "~n   Pre:    ~p"
+      "~n   Post:   ~p", [Module, Pre, Post]),
+    case (catch check_module(Module, Modules)) of
+	{error, {unknown_module, Module, Modules}} ->
+	    check_purge(Pre),
+	    check_purge(Post);
+	ok ->
+	    local_error({existing_removed_module, Module})
+    end;
+
+%% Removing a module on downgrade: the module exist
+%% in the app-file.
+check_instruction(down, {remove, {Module, Pre, Post}}, AllInstr, Modules) 
+  when is_atom(Module), is_atom(Pre), is_atom(Post) ->
+    d("check_instruction -> entry when down-remove instruction with"
+      "~n   Module: ~p"
+      "~n   Pre:    ~p"
+      "~n   Post:   ~p", [Module, Pre, Post]),
+    case (catch check_module(Module, Modules)) of
+	ok ->
+	    check_purge(Pre),
+	    check_purge(Post),
+	    check_no_remove_depends(Module, AllInstr);
+	{error, {unknown_module, Module, Modules}} ->
+	    local_error({nonexisting_removed_module, Module})
+    end;
+
+check_instruction(_, {load_module, Module, Pre, Post, Depend}, 
+		  AllInstr, Modules) 
+  when is_atom(Module), is_atom(Pre), is_atom(Post), is_list(Depend) ->
+    d("check_instruction -> entry when load_module instruction with"
+      "~n   Module: ~p"
+      "~n   Pre:    ~p"
+      "~n   Post:   ~p"
+      "~n   Depend: ~p", [Module, Pre, Post, Depend]),
+    check_module(Module, Modules),
+    check_module_depend(Module, Depend, Modules),
+    check_module_depend(Module, Depend, updated_modules(AllInstr, [])),
+    check_purge(Pre),
+    check_purge(Post);
+
+check_instruction(_, {update, Module, Change, Pre, Post, Depend}, 
+		  AllInstr, Modules) 
+  when is_atom(Module), is_atom(Pre), is_atom(Post), is_list(Depend) ->
+    d("check_instruction -> entry when update instruction with"
+      "~n   Module: ~p"
+      "~n   Change: ~p"
+      "~n   Pre:    ~p"
+      "~n   Post:   ~p"
+      "~n   Depend: ~p", [Module, Change, Pre, Post, Depend]),
+    check_module(Module, Modules),
+    check_module_depend(Module, Depend, Modules),
+    check_module_depend(Module, Depend, updated_modules(AllInstr, [])),
+    check_change(Change),
+    check_purge(Pre),
+    check_purge(Post);
+
+check_instruction(_, Instr, _AllInstr, _Modules) ->
+    d("check_instruction -> entry when unknown instruction with"
+      "~n   Instr: ~p", [Instr]),
+    local_error({error, {unknown_instruction, Instr}}).
+
+
+%% If Module X depends on Module Y, then module Y must have an update
+%% instruction of some sort (otherwise the depend is faulty).
+updated_modules([], Modules) ->
+    d("update_modules -> entry when done with"
+      "~n   Modules: ~p", [Modules]),
+    Modules;
+updated_modules([Instr |Instrs], Modules) ->
+    d("update_modules -> entry with"
+      "~n   Instr:   ~p"
+      "~n   Modules: ~p", [Instr,Modules]),
+    Module = instruction_module(Instr),
+    d("update_modules -> Module: ~p", [Module]),
+    updated_modules(Instrs, [Module|Modules]).
+    
+instruction_module({add_module, Module}) ->
+    Module;
+instruction_module({remove, {Module, _, _}}) ->
+    Module;
+instruction_module({load_module, Module, _, _, _}) ->
+    Module;
+instruction_module({update, Module, _, _, _, _}) ->
+    Module;
+instruction_module(Instr) ->
+    d("instruction_module -> entry when unknown instruction with"
+      "~n   Instr: ~p", [Instr]),
+    local_error({error, {unknown_instruction, Instr}}).
+    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+check_version(V) when is_list(V) ->
+    ok;
+check_version(V) ->
+    local_error({bad_version, V}).
+
+
+check_module(M, Modules) when is_atom(M) ->
+    case lists:member(M,Modules) of
+        true ->
+            ok;
+        false ->
+            local_error({unknown_module, M, Modules})
+    end;
+check_module(M, _) ->
+    local_error({bad_module, M}).
+
+
+check_module_depend(M, [], _) when is_atom(M) ->
+    d("check_module_depend -> entry with"
+      "~n   M: ~p", [M]),    
+    ok;
+check_module_depend(M, Deps, Modules) when is_atom(M), is_list(Deps) ->
+    d("check_module_depend -> entry with"
+      "~n   M: ~p"
+      "~n   Deps: ~p"
+      "~n   Modules: ~p", [M, Deps, Modules]),    
+    case [Dep || Dep <- Deps, lists:member(Dep, Modules) == false] of
+        [] ->
+            ok;
+        Unknown ->
+            local_error({unknown_depend_modules, Unknown})
+    end;
+check_module_depend(_M, D, _Modules) ->
+    d("check_module_depend -> entry when bad depend with"
+      "~n   D: ~p", [D]),    
+    local_error({bad_depend, D}).
+
+
+check_no_remove_depends(_Module, []) ->
+    ok;
+check_no_remove_depends(Module, [Instr|Instrs]) ->
+    check_no_remove_depend(Module, Instr),
+    check_no_remove_depends(Module, Instrs).
+
+check_no_remove_depend(Module, {load_module, Mod, _Pre, _Post, Depend}) ->
+    case lists:member(Module, Depend) of
+	true ->
+	    local_error({removed_module_in_depend, load_module, Mod, Module});
+	false ->
+	    ok
+    end;
+check_no_remove_depend(Module, {update, Mod, _Change, _Pre, _Post, Depend}) ->
+    case lists:member(Module, Depend) of
+	true ->
+	    local_error({removed_module_in_depend, update, Mod, Module});
+	false ->
+	    ok
+    end;
+check_no_remove_depend(_, _) ->
+    ok.
+    
+
+check_change(soft) ->
+    ok;
+check_change({advanced, _Something}) ->
+    ok;
+check_change(Change) ->
+    local_error({bad_change, Change}).
+
+
+check_purge(soft_purge) ->
+    ok;
+check_purge(brutal_purge) ->
+    ok;
+check_purge(Purge) ->
+    local_error({bad_purge, Purge}).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+local_error(Reason) ->
+    throw({error, Reason}).
+
+fail(Reason) ->
+    exit({suite_failed, Reason}).
+
+key1search(Key, L) ->
+    case lists:keysearch(Key, 1, L) of
+	undefined ->
+	    fail({not_found, Key, L});
+	{value, {Key, Value}} ->
+	    Value
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+d(F, A) ->
+    d(false, F, A).
+
+d(true, F, A) ->
+    io:format(F ++ "~n", A);
+d(_, _, _) ->
+    ok.
+
+    
diff --git a/lib/xmerl/test/xmerl_sax_SUITE.erl b/lib/xmerl/test/xmerl_sax_SUITE.erl
new file mode 100644
index 0000000000..563bbaaa06
--- /dev/null
+++ b/lib/xmerl/test/xmerl_sax_SUITE.erl
@@ -0,0 +1,110 @@
+%%-*-erlang-*-
+%%----------------------------------------------------------------------
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2010. 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%
+%%----------------------------------------------------------------------
+%% File    : xmerl_sax_SUITE.erl
+%% Created : 2009-06-01
+%%----------------------------------------------------------------------
+-module(xmerl_sax_SUITE).
+-compile(export_all).
+
+%%----------------------------------------------------------------------
+%% Include files
+%%----------------------------------------------------------------------
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("kernel/include/file.hrl").
+
+%%======================================================================
+%% External functions
+%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Initializations
+%%----------------------------------------------------------------------
+
+init_per_suite(doc) ->
+    ["Starts the test suite"];
+init_per_suite(Config) ->
+    Config.
+ 
+end_per_suite(doc) ->
+    ["Stops the test suite"];
+end_per_suite(Config) ->
+    Config.
+ 
+
+ 
+%% initialization before each testcase
+init_per_testcase(_TestCase,Config) ->
+    Config.
+ 
+%% clean up after each testcase
+end_per_testcase(_Func,_Config) ->
+    ok.
+
+%%----------------------------------------------------------------------
+%% Tests
+%%----------------------------------------------------------------------
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% ID: ticket_8213
+%% Description: Checks that end of document is checked properly when continuation fun is missing.
+ticket_8213(suite) -> [];
+ticket_8213(_Config) -> 
+    ?line {ok,ok,[]} = xmerl_sax_parser:stream("<elem/>", [{event_fun, fun (_E,_,_) -> ok end}]).
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% ID: ticket_8214
+%% Description: Checks that attributes with default namespace don't get [] in NS field.
+ticket_8214(suite) -> [];
+ticket_8214(_Config) -> 
+    ?line {ok,ok,[]} = 
+	xmerl_sax_parser:stream("<elem attr='123' x:attr='234' xmlns='http://lshift.net/d' "
+				"xmlns:x='http://lshift.net/x' />", 
+				[{event_fun, fun ({startElement,"http://lshift.net/d","elem",
+						   {[],"elem"},
+						   [{[],[],"attr","123"},{"http://lshift.net/x","x","attr","234"}]},
+						  _, _) ->ok;
+						 ({startElement, _, "elem",_,_}, _,_) -> 
+						     throw({test, "Error in startElement tuple"});
+						 (_E,_,_) -> ok
+					     end}]).
+
+%%----------------------------------------------------------------------
+%% Bug test cases
+%%
+
+%%----------------------------------------------------------------------
+%% Test Suite 
+%% 
+all() -> 
+    [{group, bugs}].
+
+groups() -> 
+    [{bugs, [], [ticket_8213, ticket_8214]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
diff --git a/lib/xmerl/test/xmerl_sax_std_SUITE.erl b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
new file mode 100644
index 0000000000..2048cc384f
--- /dev/null
+++ b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
@@ -0,0 +1,25635 @@
+
+%%----------------------------------------------------------------------
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2010. 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%
+%%----------------------------------------------------------------------
+%% File    : xmerl_sax_std_SUITE.erl
+%% Created : 2009-06-01
+%%----------------------------------------------------------------------
+-module(xmerl_sax_std_SUITE).
+-compile(export_all).
+
+%%----------------------------------------------------------------------
+%% Include files
+%%----------------------------------------------------------------------
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("kernel/include/file.hrl").
+
+%%======================================================================
+%% External functions
+%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Initializations
+%%----------------------------------------------------------------------
+
+init_per_suite(doc) ->
+    ["Starts the test suite"];
+init_per_suite(Config) ->
+    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+    ?line ok=erl_tar:extract("ibm.tgz",[compressed]),
+    ?line ok=erl_tar:extract("japanese.tgz",[compressed]),
+    ?line ok=erl_tar:extract("oasis.tgz",[compressed]),
+    ?line ok=erl_tar:extract("sun.tgz",[compressed]),
+    ?line ok=erl_tar:extract("xmltest.tgz",[compressed]),
+    ?line ok = change_mode(["ibm","japanese","oasis",
+                            "sun","xmltest"]),
+    Config.
+ 
+-ifndef(dont_rm_test_dirs).
+ 
+end_per_suite(doc) ->
+    ["Stops the test suite"];
+end_per_suite(Config) ->
+    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+    ?line ok=rm_files(["ibm","japanese","oasis","sun","xmltest"]),
+    Config.
+ 
+-else.
+ 
+end_per_suite(doc) ->
+    ["Stops the test suite"];
+end_per_suite(Config) ->
+    Config.
+ 
+-endif.
+ 
+%% initialization before each testcase
+init_per_testcase(_TestCase,Config) ->
+    io:format("Config:\n~p\n",[Config]),
+    ?line {ok, _} = file:read_file_info(filename:join([?config(priv_dir,Config)])),
+    ?line code:add_patha(?config(priv_dir,Config)),
+%    Dog=test_server:timetrap({minutes,10}),
+%    [{watchdog, Dog}|Config].
+    Config.
+ 
+%% clean up after each testcase
+end_per_testcase(_Func,_Config) ->
+%    Dog=?config(watchdog, Config),
+%    test_server:timetrap_cancel(Dog),
+    ok.
+
+%%----------------------------------------------------------------------
+%% Tests
+%%----------------------------------------------------------------------
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/001.xml
+%% ID: not-wf-sa-001
+%% Type: not-wf
+%% Sections: 3.1 [41]
+'not-wf-sa-001'(suite) -> [];
+'not-wf-sa-001'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/001.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/002.xml
+%% ID: not-wf-sa-002
+%% Type: not-wf
+%% Sections: 2.3 [4]
+'not-wf-sa-002'(suite) -> [];
+'not-wf-sa-002'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/002.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/003.xml
+%% ID: not-wf-sa-003
+%% Type: not-wf
+%% Sections: 2.6 [16]
+'not-wf-sa-003'(suite) -> [];
+'not-wf-sa-003'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/003.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/004.xml
+%% ID: not-wf-sa-004
+%% Type: not-wf
+%% Sections: 2.6 [16]
+'not-wf-sa-004'(suite) -> [];
+'not-wf-sa-004'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/004.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/005.xml
+%% ID: not-wf-sa-005
+%% Type: not-wf
+%% Sections: 2.6 [16]
+'not-wf-sa-005'(suite) -> [];
+'not-wf-sa-005'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/005.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/006.xml
+%% ID: not-wf-sa-006
+%% Type: not-wf
+%% Sections: 2.5 [16]
+'not-wf-sa-006'(suite) -> [];
+'not-wf-sa-006'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/006.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/007.xml
+%% ID: not-wf-sa-007
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-007'(suite) -> [];
+'not-wf-sa-007'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/007.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/008.xml
+%% ID: not-wf-sa-008
+%% Type: not-wf
+%% Sections: 2.3 [5]
+'not-wf-sa-008'(suite) -> [];
+'not-wf-sa-008'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/008.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/009.xml
+%% ID: not-wf-sa-009
+%% Type: not-wf
+%% Sections: 4.1 [66]
+'not-wf-sa-009'(suite) -> [];
+'not-wf-sa-009'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/009.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/010.xml
+%% ID: not-wf-sa-010
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-010'(suite) -> [];
+'not-wf-sa-010'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/010.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/011.xml
+%% ID: not-wf-sa-011
+%% Type: not-wf
+%% Sections: 3.1 [41]
+'not-wf-sa-011'(suite) -> [];
+'not-wf-sa-011'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/011.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/012.xml
+%% ID: not-wf-sa-012
+%% Type: not-wf
+%% Sections: 2.3 [10]
+'not-wf-sa-012'(suite) -> [];
+'not-wf-sa-012'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/012.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/013.xml
+%% ID: not-wf-sa-013
+%% Type: not-wf
+%% Sections: 2.3 [10]
+'not-wf-sa-013'(suite) -> [];
+'not-wf-sa-013'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/013.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/014.xml
+%% ID: not-wf-sa-014
+%% Type: not-wf
+%% Sections: 2.3 [10]
+'not-wf-sa-014'(suite) -> [];
+'not-wf-sa-014'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/014.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/015.xml
+%% ID: not-wf-sa-015
+%% Type: not-wf
+%% Sections: 3.1 [41]
+'not-wf-sa-015'(suite) -> [];
+'not-wf-sa-015'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/015.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/016.xml
+%% ID: not-wf-sa-016
+%% Type: not-wf
+%% Sections: 3.1 [41]
+'not-wf-sa-016'(suite) -> [];
+'not-wf-sa-016'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/016.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/017.xml
+%% ID: not-wf-sa-017
+%% Type: not-wf
+%% Sections: 2.7 [18]
+'not-wf-sa-017'(suite) -> [];
+'not-wf-sa-017'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/017.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/018.xml
+%% ID: not-wf-sa-018
+%% Type: not-wf
+%% Sections: 2.7 [19]
+'not-wf-sa-018'(suite) -> [];
+'not-wf-sa-018'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/018.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/019.xml
+%% ID: not-wf-sa-019
+%% Type: not-wf
+%% Sections: 3.1 [42]
+'not-wf-sa-019'(suite) -> [];
+'not-wf-sa-019'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/019.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/020.xml
+%% ID: not-wf-sa-020
+%% Type: not-wf
+%% Sections: 2.3 [10]
+'not-wf-sa-020'(suite) -> [];
+'not-wf-sa-020'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/020.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/021.xml
+%% ID: not-wf-sa-021
+%% Type: not-wf
+%% Sections: 2.3 [10]
+'not-wf-sa-021'(suite) -> [];
+'not-wf-sa-021'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/021.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/022.xml
+%% ID: not-wf-sa-022
+%% Type: not-wf
+%% Sections: 4.1 [66]
+'not-wf-sa-022'(suite) -> [];
+'not-wf-sa-022'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/022.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/023.xml
+%% ID: not-wf-sa-023
+%% Type: not-wf
+%% Sections: 2.3 [5]
+'not-wf-sa-023'(suite) -> [];
+'not-wf-sa-023'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/023.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/024.xml
+%% ID: not-wf-sa-024
+%% Type: not-wf
+%% Sections: 2.3 [5]
+'not-wf-sa-024'(suite) -> [];
+'not-wf-sa-024'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/024.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/025.xml
+%% ID: not-wf-sa-025
+%% Type: not-wf
+%% Sections: 2.4 [14]
+'not-wf-sa-025'(suite) -> [];
+'not-wf-sa-025'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/025.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/026.xml
+%% ID: not-wf-sa-026
+%% Type: not-wf
+%% Sections: 2.4 [14]
+'not-wf-sa-026'(suite) -> [];
+'not-wf-sa-026'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/026.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/027.xml
+%% ID: not-wf-sa-027
+%% Type: not-wf
+%% Sections: 2.5 [15]
+'not-wf-sa-027'(suite) -> [];
+'not-wf-sa-027'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/027.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/028.xml
+%% ID: not-wf-sa-028
+%% Type: not-wf
+%% Sections: 2.6 [16]
+'not-wf-sa-028'(suite) -> [];
+'not-wf-sa-028'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/028.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/029.xml
+%% ID: not-wf-sa-029
+%% Type: not-wf
+%% Sections: 2.4 [14]
+'not-wf-sa-029'(suite) -> [];
+'not-wf-sa-029'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/029.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/030.xml
+%% ID: not-wf-sa-030
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-030'(suite) -> [];
+'not-wf-sa-030'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/030.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/031.xml
+%% ID: not-wf-sa-031
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-031'(suite) -> [];
+'not-wf-sa-031'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/031.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/032.xml
+%% ID: not-wf-sa-032
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-032'(suite) -> [];
+'not-wf-sa-032'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/032.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/033.xml
+%% ID: not-wf-sa-033
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-033'(suite) -> [];
+'not-wf-sa-033'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/033.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/034.xml
+%% ID: not-wf-sa-034
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-034'(suite) -> [];
+'not-wf-sa-034'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/034.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/035.xml
+%% ID: not-wf-sa-035
+%% Type: not-wf
+%% Sections: 3.1 [43]
+'not-wf-sa-035'(suite) -> [];
+'not-wf-sa-035'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/035.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/036.xml
+%% ID: not-wf-sa-036
+%% Type: not-wf
+%% Sections: 2.8 [27]
+'not-wf-sa-036'(suite) -> [];
+'not-wf-sa-036'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/036.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_,<<"Illegal data\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/037.xml
+%% ID: not-wf-sa-037
+%% Type: not-wf
+%% Sections: 2.8 [27]
+'not-wf-sa-037'(suite) -> [];
+'not-wf-sa-037'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/037.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_,<<"&#32;\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/038.xml
+%% ID: not-wf-sa-038
+%% Type: not-wf
+%% Sections: 3.1
+'not-wf-sa-038'(suite) -> [];
+'not-wf-sa-038'(Config) -> 
+    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/038.xml"]),
+    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/039.xml
+%% ID: not-wf-sa-039
+%% Type: not-wf
+%% Sections: 3
+'not-wf-sa-039'(suite) -> [];
+'not-wf-sa-039'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/039.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/040.xml
+%% ID: not-wf-sa-040
+%% Type: not-wf
+%% Sections: 2.8 [27]
+'not-wf-sa-040'(suite) -> [];
+'not-wf-sa-040'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/040.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_,<<"<doc></doc>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/041.xml
+%% ID: not-wf-sa-041
+%% Type: not-wf
+%% Sections: 2.8 [27]
+'not-wf-sa-041'(suite) -> [];
+'not-wf-sa-041'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/041.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_,<<"<doc></doc>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/042.xml
+%% ID: not-wf-sa-042
+%% Type: not-wf
+%% Sections: 3.1 [42]
+'not-wf-sa-042'(suite) -> [];
+'not-wf-sa-042'(Config) ->  {skip, "Fix 1"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/042.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/043.xml
+%% ID: not-wf-sa-043
+%% Type: not-wf
+%% Sections: 2.8 [27]
+'not-wf-sa-043'(suite) -> [];
+'not-wf-sa-043'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/043.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_,<<"Illegal data\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/044.xml
+%% ID: not-wf-sa-044
+%% Type: not-wf
+%% Sections: 2.8 [27]
+'not-wf-sa-044'(suite) -> [];
+'not-wf-sa-044'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/044.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_,<<"<doc/>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/045.xml
+%% ID: not-wf-sa-045
+%% Type: not-wf
+%% Sections: 3.1 [44]
+'not-wf-sa-045'(suite) -> [];
+'not-wf-sa-045'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/045.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/046.xml
+%% ID: not-wf-sa-046
+%% Type: not-wf
+%% Sections: 3.1 [40]
+'not-wf-sa-046'(suite) -> [];
+'not-wf-sa-046'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/046.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/047.xml
+%% ID: not-wf-sa-047
+%% Type: not-wf
+%% Sections: 3.1 [44]
+'not-wf-sa-047'(suite) -> [];
+'not-wf-sa-047'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/047.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/048.xml
+%% ID: not-wf-sa-048
+%% Type: not-wf
+%% Sections: 2.8 [27]
+'not-wf-sa-048'(suite) -> [];
+'not-wf-sa-048'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/048.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_,<<"<![CDATA[]]>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/049.xml
+%% ID: not-wf-sa-049
+%% Type: not-wf
+%% Sections: 3.1 [40]
+'not-wf-sa-049'(suite) -> [];
+'not-wf-sa-049'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/049.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/050.xml
+%% ID: not-wf-sa-050
+%% Type: not-wf
+%% Sections: 2.1 [1]
+'not-wf-sa-050'(suite) -> [];
+'not-wf-sa-050'(Config) ->  {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/050.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/051.xml
+%% ID: not-wf-sa-051
+%% Type: not-wf
+%% Sections: 2.7 [18]
+'not-wf-sa-051'(suite) -> [];
+'not-wf-sa-051'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/051.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/052.xml
+%% ID: not-wf-sa-052
+%% Type: not-wf
+%% Sections: 4.1 [66]
+'not-wf-sa-052'(suite) -> [];
+'not-wf-sa-052'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/052.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/053.xml
+%% ID: not-wf-sa-053
+%% Type: not-wf
+%% Sections: 3.1 [42]
+'not-wf-sa-053'(suite) -> [];
+'not-wf-sa-053'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/053.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/054.xml
+%% ID: not-wf-sa-054
+%% Type: not-wf
+%% Sections: 4.2.2 [75]
+'not-wf-sa-054'(suite) -> [];
+'not-wf-sa-054'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/054.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/055.xml
+%% ID: not-wf-sa-055
+%% Type: not-wf
+%% Sections: 2.8 [28]
+'not-wf-sa-055'(suite) -> [];
+'not-wf-sa-055'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/055.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/056.xml
+%% ID: not-wf-sa-056
+%% Type: not-wf
+%% Sections: 2.8 [28]
+'not-wf-sa-056'(suite) -> [];
+'not-wf-sa-056'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/056.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/057.xml
+%% ID: not-wf-sa-057
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'not-wf-sa-057'(suite) -> [];
+'not-wf-sa-057'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/057.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/058.xml
+%% ID: not-wf-sa-058
+%% Type: not-wf
+%% Sections: 3.3.1 [54]
+'not-wf-sa-058'(suite) -> [];
+'not-wf-sa-058'(_Config) -> {skip, "Attlist Notation parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/058.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/059.xml
+%% ID: not-wf-sa-059
+%% Type: not-wf
+%% Sections: 3.3.1 [59]
+'not-wf-sa-059'(suite) -> [];
+'not-wf-sa-059'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/059.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/060.xml
+%% ID: not-wf-sa-060
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'not-wf-sa-060'(suite) -> [];
+'not-wf-sa-060'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/060.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/061.xml
+%% ID: not-wf-sa-061
+%% Type: not-wf
+%% Sections: 4.2.2 [75]
+'not-wf-sa-061'(suite) -> [];
+'not-wf-sa-061'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/061.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/062.xml
+%% ID: not-wf-sa-062
+%% Type: not-wf
+%% Sections: 4.2 [71]
+'not-wf-sa-062'(suite) -> [];
+'not-wf-sa-062'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/062.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/063.xml
+%% ID: not-wf-sa-063
+%% Type: not-wf
+%% Sections: 2.8 [29]
+'not-wf-sa-063'(suite) -> [];
+'not-wf-sa-063'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/063.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/064.xml
+%% ID: not-wf-sa-064
+%% Type: not-wf
+%% Sections: 3.3 [53]
+'not-wf-sa-064'(suite) -> [];
+'not-wf-sa-064'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/064.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/065.xml
+%% ID: not-wf-sa-065
+%% Type: not-wf
+%% Sections: 3.3 [53]
+'not-wf-sa-065'(suite) -> [];
+'not-wf-sa-065'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/065.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/066.xml
+%% ID: not-wf-sa-066
+%% Type: not-wf
+%% Sections: 3.3 [52]
+'not-wf-sa-066'(suite) -> [];
+'not-wf-sa-066'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/066.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/067.xml
+%% ID: not-wf-sa-067
+%% Type: not-wf
+%% Sections: 3.3 [53]
+'not-wf-sa-067'(suite) -> [];
+'not-wf-sa-067'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/067.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/068.xml
+%% ID: not-wf-sa-068
+%% Type: not-wf
+%% Sections: 3.3.1 [58]
+'not-wf-sa-068'(suite) -> [];
+'not-wf-sa-068'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/068.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/069.xml
+%% ID: not-wf-sa-069
+%% Type: not-wf
+%% Sections: 4.2.2 [76]
+'not-wf-sa-069'(suite) -> [];
+'not-wf-sa-069'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/069.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/070.xml
+%% ID: not-wf-sa-070
+%% Type: not-wf
+%% Sections: 2.5 [16]
+'not-wf-sa-070'(suite) -> [];
+'not-wf-sa-070'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/070.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/071.xml
+%% ID: not-wf-sa-071
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-071'(suite) -> [];
+'not-wf-sa-071'(_Config) -> {skip, "No loop detection yet"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/071.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/072.xml
+%% ID: not-wf-sa-072
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-072'(suite) -> [];
+'not-wf-sa-072'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/072.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/073.xml
+%% ID: not-wf-sa-073
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-073'(suite) -> [];
+'not-wf-sa-073'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/073.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/074.xml
+%% ID: not-wf-sa-074
+%% Type: not-wf
+%% Sections: 4.3.2
+'not-wf-sa-074'(suite) -> [];
+'not-wf-sa-074'(_Config) -> {skip, "Entity not correct tag pair NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/074.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/075.xml
+%% ID: not-wf-sa-075
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-075'(suite) -> [];
+'not-wf-sa-075'(_Config) ->  {skip, "No loop detection yet"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/075.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/076.xml
+%% ID: not-wf-sa-076
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-076'(suite) -> [];
+'not-wf-sa-076'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/076.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/077.xml
+%% ID: not-wf-sa-077
+%% Type: not-wf
+%% Sections: 41. [68]
+'not-wf-sa-077'(suite) -> [];
+'not-wf-sa-077'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/077.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/078.xml
+%% ID: not-wf-sa-078
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-078'(suite) -> [];
+'not-wf-sa-078'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/078.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/079.xml
+%% ID: not-wf-sa-079
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-079'(suite) -> [];
+'not-wf-sa-079'(_Config) ->  {skip, "No loop detection yet"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/079.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/080.xml
+%% ID: not-wf-sa-080
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-080'(suite) -> [];
+'not-wf-sa-080'(_Config) ->  {skip, "No loop detection yet"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/080.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/081.xml
+%% ID: not-wf-sa-081
+%% Type: not-wf
+%% Sections: 3.1
+'not-wf-sa-081'(suite) -> [];
+'not-wf-sa-081'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/081.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/082.xml
+%% ID: not-wf-sa-082
+%% Type: not-wf
+%% Sections: 3.1
+'not-wf-sa-082'(suite) -> [];
+'not-wf-sa-082'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/082.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/083.xml
+%% ID: not-wf-sa-083
+%% Type: not-wf
+%% Sections: 4.2.2 [76]
+'not-wf-sa-083'(suite) -> [];
+'not-wf-sa-083'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/083.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/084.xml
+%% ID: not-wf-sa-084
+%% Type: not-wf
+%% Sections: 4.1
+'not-wf-sa-084'(suite) -> [];
+'not-wf-sa-084'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/084.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/085.xml
+%% ID: not-wf-sa-085
+%% Type: not-wf
+%% Sections: 2.3 [13]
+'not-wf-sa-085'(suite) -> [];
+'not-wf-sa-085'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/085.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/086.xml
+%% ID: not-wf-sa-086
+%% Type: not-wf
+%% Sections: 2.3 [13]
+'not-wf-sa-086'(suite) -> [];
+'not-wf-sa-086'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/086.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/087.xml
+%% ID: not-wf-sa-087
+%% Type: not-wf
+%% Sections: 2.3 [13]
+'not-wf-sa-087'(suite) -> [];
+'not-wf-sa-087'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/087.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/088.xml
+%% ID: not-wf-sa-088
+%% Type: not-wf
+%% Sections: 2.3 [10]
+'not-wf-sa-088'(suite) -> [];
+'not-wf-sa-088'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/088.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/089.xml
+%% ID: not-wf-sa-089
+%% Type: not-wf
+%% Sections: 4.2 [74]
+'not-wf-sa-089'(suite) -> [];
+'not-wf-sa-089'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/089.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/090.xml
+%% ID: not-wf-sa-090
+%% Type: not-wf
+%% Sections: 2.3 [10]
+'not-wf-sa-090'(suite) -> [];
+'not-wf-sa-090'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/090.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/091.xml
+%% ID: not-wf-sa-091
+%% Type: not-wf
+%% Sections: 4.2 [74]
+'not-wf-sa-091'(suite) -> [];
+'not-wf-sa-091'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/091.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/092.xml
+%% ID: not-wf-sa-092
+%% Type: not-wf
+%% Sections: 4.5
+'not-wf-sa-092'(suite) -> [];
+'not-wf-sa-092'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/092.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/093.xml
+%% ID: not-wf-sa-093
+%% Type: not-wf
+%% Sections: 4.1 [66]
+'not-wf-sa-093'(suite) -> [];
+'not-wf-sa-093'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/093.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/094.xml
+%% ID: not-wf-sa-094
+%% Type: not-wf
+%% Sections: 2.8 [24]
+'not-wf-sa-094'(suite) -> [];
+'not-wf-sa-094'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/094.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/095.xml
+%% ID: not-wf-sa-095
+%% Type: not-wf
+%% Sections: 2.8 [23]
+'not-wf-sa-095'(suite) -> [];
+'not-wf-sa-095'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/095.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/096.xml
+%% ID: not-wf-sa-096
+%% Type: not-wf
+%% Sections: 2.9 [32]
+'not-wf-sa-096'(suite) -> [];
+'not-wf-sa-096'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/096.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/097.xml
+%% ID: not-wf-sa-097
+%% Type: not-wf
+%% Sections: 2.8 [24]
+'not-wf-sa-097'(suite) -> [];
+'not-wf-sa-097'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/097.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/098.xml
+%% ID: not-wf-sa-098
+%% Type: not-wf
+%% Sections: 2.8 [23]
+'not-wf-sa-098'(suite) -> [];
+'not-wf-sa-098'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/098.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/099.xml
+%% ID: not-wf-sa-099
+%% Type: not-wf
+%% Sections: 2.8 [23]
+'not-wf-sa-099'(suite) -> [];
+'not-wf-sa-099'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/099.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/100.xml
+%% ID: not-wf-sa-100
+%% Type: not-wf
+%% Sections: 2.9 [32]
+'not-wf-sa-100'(suite) -> [];
+'not-wf-sa-100'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/100.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/101.xml
+%% ID: not-wf-sa-101
+%% Type: not-wf
+%% Sections: 4.3.3 [81]
+'not-wf-sa-101'(suite) -> [];
+'not-wf-sa-101'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/101.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/102.xml
+%% ID: not-wf-sa-102
+%% Type: not-wf
+%% Sections: 2.8 [26]
+'not-wf-sa-102'(suite) -> [];
+'not-wf-sa-102'(Config) ->  {skip, "Fix 2"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/102.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/103.xml
+%% ID: not-wf-sa-103
+%% Type: not-wf
+%% Sections: 4.3.2
+'not-wf-sa-103'(suite) -> [];
+'not-wf-sa-103'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/103.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/104.xml
+%% ID: not-wf-sa-104
+%% Type: not-wf
+%% Sections: 4.3.2
+'not-wf-sa-104'(suite) -> [];
+'not-wf-sa-104'(_Config) -> {skip, "Entity not correct tag pair NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/104.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/105.xml
+%% ID: not-wf-sa-105
+%% Type: not-wf
+%% Sections: 2.7 
+'not-wf-sa-105'(suite) -> [];
+'not-wf-sa-105'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/105.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/106.xml
+%% ID: not-wf-sa-106
+%% Type: not-wf
+%% Sections: 4.2
+'not-wf-sa-106'(suite) -> [];
+'not-wf-sa-106'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/106.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/107.xml
+%% ID: not-wf-sa-107
+%% Type: not-wf
+%% Sections: 2.8 [28]
+'not-wf-sa-107'(suite) -> [];
+'not-wf-sa-107'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/107.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/108.xml
+%% ID: not-wf-sa-108
+%% Type: not-wf
+%% Sections: 2.7 [19]
+'not-wf-sa-108'(suite) -> [];
+'not-wf-sa-108'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/108.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/109.xml
+%% ID: not-wf-sa-109
+%% Type: not-wf
+%% Sections: 4.2 [70]
+'not-wf-sa-109'(suite) -> [];
+'not-wf-sa-109'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/109.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/110.xml
+%% ID: not-wf-sa-110
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-110'(suite) -> [];
+'not-wf-sa-110'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/110.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_,<<"&e;\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/111.xml
+%% ID: not-wf-sa-111
+%% Type: not-wf
+%% Sections: 3.1 [43]
+'not-wf-sa-111'(suite) -> [];
+'not-wf-sa-111'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/111.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/112.xml
+%% ID: not-wf-sa-112
+%% Type: not-wf
+%% Sections: 2.7 [19]
+'not-wf-sa-112'(suite) -> [];
+'not-wf-sa-112'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/112.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/113.xml
+%% ID: not-wf-sa-113
+%% Type: not-wf
+%% Sections: 2.3 [9]
+'not-wf-sa-113'(suite) -> [];
+'not-wf-sa-113'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/113.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/114.xml
+%% ID: not-wf-sa-114
+%% Type: not-wf
+%% Sections: 2.3 [9]
+'not-wf-sa-114'(suite) -> [];
+'not-wf-sa-114'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/114.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/115.xml
+%% ID: not-wf-sa-115
+%% Type: not-wf
+%% Sections: 4.5
+'not-wf-sa-115'(suite) -> [];
+'not-wf-sa-115'(_Config) -> {skip, "& expansion not correct"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/115.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/116.xml
+%% ID: not-wf-sa-116
+%% Type: not-wf
+%% Sections: 4.3.2
+'not-wf-sa-116'(suite) -> [];
+'not-wf-sa-116'(_Config) -> {skip, "& expansion not correct"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/116.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/117.xml
+%% ID: not-wf-sa-117
+%% Type: not-wf
+%% Sections: 4.3.2
+'not-wf-sa-117'(suite) -> [];
+'not-wf-sa-117'(_Config) -> {skip, "& expansion not correct"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/117.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/118.xml
+%% ID: not-wf-sa-118
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-118'(suite) -> [];
+'not-wf-sa-118'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/118.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/119.xml
+%% ID: not-wf-sa-119
+%% Type: not-wf
+%% Sections: 4.3.2
+'not-wf-sa-119'(suite) -> [];
+'not-wf-sa-119'(_Config) -> {skip, "& expansion not correct"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/119.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/120.xml
+%% ID: not-wf-sa-120
+%% Type: not-wf
+%% Sections: 4.5
+'not-wf-sa-120'(suite) -> [];
+'not-wf-sa-120'(_Config) -> {skip, "& expansion not correct"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/120.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/121.xml
+%% ID: not-wf-sa-121
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'not-wf-sa-121'(suite) -> [];
+'not-wf-sa-121'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/121.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/122.xml
+%% ID: not-wf-sa-122
+%% Type: not-wf
+%% Sections: 3.2.1 [47]
+'not-wf-sa-122'(suite) -> [];
+'not-wf-sa-122'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/122.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/123.xml
+%% ID: not-wf-sa-123
+%% Type: not-wf
+%% Sections: 3.2.1 [48]
+'not-wf-sa-123'(suite) -> [];
+'not-wf-sa-123'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/123.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/124.xml
+%% ID: not-wf-sa-124
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'not-wf-sa-124'(suite) -> [];
+'not-wf-sa-124'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/124.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/125.xml
+%% ID: not-wf-sa-125
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'not-wf-sa-125'(suite) -> [];
+'not-wf-sa-125'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/125.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/126.xml
+%% ID: not-wf-sa-126
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'not-wf-sa-126'(suite) -> [];
+'not-wf-sa-126'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/126.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/127.xml
+%% ID: not-wf-sa-127
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'not-wf-sa-127'(suite) -> [];
+'not-wf-sa-127'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/127.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/128.xml
+%% ID: not-wf-sa-128
+%% Type: not-wf
+%% Sections: 2.7 [18]
+'not-wf-sa-128'(suite) -> [];
+'not-wf-sa-128'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/128.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/129.xml
+%% ID: not-wf-sa-129
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'not-wf-sa-129'(suite) -> [];
+'not-wf-sa-129'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/129.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/130.xml
+%% ID: not-wf-sa-130
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'not-wf-sa-130'(suite) -> [];
+'not-wf-sa-130'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/130.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/131.xml
+%% ID: not-wf-sa-131
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'not-wf-sa-131'(suite) -> [];
+'not-wf-sa-131'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/131.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/132.xml
+%% ID: not-wf-sa-132
+%% Type: not-wf
+%% Sections: 3.2.1 [50]
+'not-wf-sa-132'(suite) -> [];
+'not-wf-sa-132'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/132.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/133.xml
+%% ID: not-wf-sa-133
+%% Type: not-wf
+%% Sections: 3.2.1
+'not-wf-sa-133'(suite) -> [];
+'not-wf-sa-133'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/133.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/134.xml
+%% ID: not-wf-sa-134
+%% Type: not-wf
+%% Sections: 3.2.1
+'not-wf-sa-134'(suite) -> [];
+'not-wf-sa-134'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/134.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/135.xml
+%% ID: not-wf-sa-135
+%% Type: not-wf
+%% Sections: 3.2.1 [47]
+'not-wf-sa-135'(suite) -> [];
+'not-wf-sa-135'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/135.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/136.xml
+%% ID: not-wf-sa-136
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'not-wf-sa-136'(suite) -> [];
+'not-wf-sa-136'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/136.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/137.xml
+%% ID: not-wf-sa-137
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'not-wf-sa-137'(suite) -> [];
+'not-wf-sa-137'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/137.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/138.xml
+%% ID: not-wf-sa-138
+%% Type: not-wf
+%% Sections: 3.2.1 [48]
+'not-wf-sa-138'(suite) -> [];
+'not-wf-sa-138'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/138.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/139.xml
+%% ID: not-wf-sa-139
+%% Type: not-wf
+%% Sections: 3.2.1 [46]
+'not-wf-sa-139'(suite) -> [];
+'not-wf-sa-139'(_Config) ->  {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/139.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/140.xml
+%% ID: not-wf-sa-140
+%% Type: not-wf
+%% Sections: 2.3 [4]
+'not-wf-sa-140'(suite) -> [];
+'not-wf-sa-140'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/140.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/141.xml
+%% ID: not-wf-sa-141
+%% Type: not-wf
+%% Sections: 2.3 [5]
+'not-wf-sa-141'(suite) -> [];
+'not-wf-sa-141'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/141.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/142.xml
+%% ID: not-wf-sa-142
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-142'(suite) -> [];
+'not-wf-sa-142'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/142.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/143.xml
+%% ID: not-wf-sa-143
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-143'(suite) -> [];
+'not-wf-sa-143'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/143.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/144.xml
+%% ID: not-wf-sa-144
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-144'(suite) -> [];
+'not-wf-sa-144'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/144.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/145.xml
+%% ID: not-wf-sa-145
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-145'(suite) -> [];
+'not-wf-sa-145'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/145.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/146.xml
+%% ID: not-wf-sa-146
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-146'(suite) -> [];
+'not-wf-sa-146'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/146.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/147.xml
+%% ID: not-wf-sa-147
+%% Type: not-wf
+%% Sections: 2.8 [22]
+'not-wf-sa-147'(suite) -> [];
+'not-wf-sa-147'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/147.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/148.xml
+%% ID: not-wf-sa-148
+%% Type: not-wf
+%% Sections: 2.8 [22]
+'not-wf-sa-148'(suite) -> [];
+'not-wf-sa-148'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/148.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/149.xml
+%% ID: not-wf-sa-149
+%% Type: not-wf
+%% Sections: 2.8 [28]
+'not-wf-sa-149'(suite) -> [];
+'not-wf-sa-149'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/149.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/150.xml
+%% ID: not-wf-sa-150
+%% Type: not-wf
+%% Sections: 3.1 [43]
+'not-wf-sa-150'(suite) -> [];
+'not-wf-sa-150'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/150.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/151.xml
+%% ID: not-wf-sa-151
+%% Type: not-wf
+%% Sections: 2.8 [27]
+'not-wf-sa-151'(suite) -> [];
+'not-wf-sa-151'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/151.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_,<<"xml version=\"1.0\"?>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/152.xml
+%% ID: not-wf-sa-152
+%% Type: not-wf
+%% Sections: 2.8 [22]
+'not-wf-sa-152'(suite) -> [];
+'not-wf-sa-152'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/152.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/153.xml
+%% ID: not-wf-sa-153
+%% Type: not-wf
+%% Sections: 4.3.2
+'not-wf-sa-153'(suite) -> [];
+'not-wf-sa-153'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/153.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/154.xml
+%% ID: not-wf-sa-154
+%% Type: not-wf
+%% Sections: 2.8 2.6 [23, 17]
+'not-wf-sa-154'(suite) -> [];
+'not-wf-sa-154'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/154.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/155.xml
+%% ID: not-wf-sa-155
+%% Type: not-wf
+%% Sections: 2.8 2.6 [23, 17]
+'not-wf-sa-155'(suite) -> [];
+'not-wf-sa-155'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/155.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/156.xml
+%% ID: not-wf-sa-156
+%% Type: not-wf
+%% Sections: 2.8 2.6 [23, 17]
+'not-wf-sa-156'(suite) -> [];
+'not-wf-sa-156'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/156.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/157.xml
+%% ID: not-wf-sa-157
+%% Type: not-wf
+%% Sections: 2.6 [17]
+'not-wf-sa-157'(suite) -> [];
+'not-wf-sa-157'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/157.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/158.xml
+%% ID: not-wf-sa-158
+%% Type: not-wf
+%% Sections: 3.3 [52]
+'not-wf-sa-158'(suite) -> [];
+'not-wf-sa-158'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/158.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/159.xml
+%% ID: not-wf-sa-159
+%% Type: not-wf
+%% Sections: 2.3 [9]
+'not-wf-sa-159'(suite) -> [];
+'not-wf-sa-159'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/159.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/160.xml
+%% ID: not-wf-sa-160
+%% Type: not-wf
+%% Sections: 2.8
+'not-wf-sa-160'(suite) -> [];
+'not-wf-sa-160'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/160.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/161.xml
+%% ID: not-wf-sa-161
+%% Type: not-wf
+%% Sections: 2.8
+'not-wf-sa-161'(suite) -> [];
+'not-wf-sa-161'(_Config) -> {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/161.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/162.xml
+%% ID: not-wf-sa-162
+%% Type: not-wf
+%% Sections: 2.8
+'not-wf-sa-162'(suite) -> [];
+'not-wf-sa-162'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/162.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/163.xml
+%% ID: not-wf-sa-163
+%% Type: not-wf
+%% Sections: 4.1 [69]
+'not-wf-sa-163'(suite) -> [];
+'not-wf-sa-163'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/163.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/164.xml
+%% ID: not-wf-sa-164
+%% Type: not-wf
+%% Sections: 4.1 [69]
+'not-wf-sa-164'(suite) -> [];
+'not-wf-sa-164'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/164.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/165.xml
+%% ID: not-wf-sa-165
+%% Type: not-wf
+%% Sections: 4.2 [72]
+'not-wf-sa-165'(suite) -> [];
+'not-wf-sa-165'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/165.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/166.xml
+%% ID: not-wf-sa-166
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-166'(suite) -> [];
+'not-wf-sa-166'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/166.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/167.xml
+%% ID: not-wf-sa-167
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-167'(suite) -> [];
+'not-wf-sa-167'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/167.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/168.xml
+%% ID: not-wf-sa-168
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-168'(suite) -> [];
+'not-wf-sa-168'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/168.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/169.xml
+%% ID: not-wf-sa-169
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-169'(suite) -> [];
+'not-wf-sa-169'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/169.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/170.xml
+%% ID: not-wf-sa-170
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-170'(suite) -> [];
+'not-wf-sa-170'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/170.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/171.xml
+%% ID: not-wf-sa-171
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-171'(suite) -> [];
+'not-wf-sa-171'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/171.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/172.xml
+%% ID: not-wf-sa-172
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-172'(suite) -> [];
+'not-wf-sa-172'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/172.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/173.xml
+%% ID: not-wf-sa-173
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-173'(suite) -> [];
+'not-wf-sa-173'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/173.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/174.xml
+%% ID: not-wf-sa-174
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-174'(suite) -> [];
+'not-wf-sa-174'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/174.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/175.xml
+%% ID: not-wf-sa-175
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-175'(suite) -> [];
+'not-wf-sa-175'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/175.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/176.xml
+%% ID: not-wf-sa-176
+%% Type: not-wf
+%% Sections: 3 [39]
+'not-wf-sa-176'(suite) -> [];
+'not-wf-sa-176'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/176.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/177.xml
+%% ID: not-wf-sa-177
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'not-wf-sa-177'(suite) -> [];
+'not-wf-sa-177'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/177.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/178.xml
+%% ID: not-wf-sa-178
+%% Type: not-wf
+%% Sections: 3.1 [41]
+'not-wf-sa-178'(suite) -> [];
+'not-wf-sa-178'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/178.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/179.xml
+%% ID: not-wf-sa-179
+%% Type: not-wf
+%% Sections: 4.1 [66]
+'not-wf-sa-179'(suite) -> [];
+'not-wf-sa-179'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/179.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/180.xml
+%% ID: not-wf-sa-180
+%% Type: not-wf
+%% Sections: 4.1
+'not-wf-sa-180'(suite) -> [];
+'not-wf-sa-180'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/180.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/181.xml
+%% ID: not-wf-sa-181
+%% Type: not-wf
+%% Sections: 4.3.2
+'not-wf-sa-181'(suite) -> [];
+'not-wf-sa-181'(_Config) -> {skip, "Entity not tag pair NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/181.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/182.xml
+%% ID: not-wf-sa-182
+%% Type: not-wf
+%% Sections: 4.3.2
+'not-wf-sa-182'(suite) -> [];
+'not-wf-sa-182'(_Config) -> {skip, "Entity not tag pair NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/182.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/183.xml
+%% ID: not-wf-sa-183
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'not-wf-sa-183'(suite) -> [];
+'not-wf-sa-183'(_Config) -> {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/183.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/184.xml
+%% ID: not-wf-sa-184
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'not-wf-sa-184'(suite) -> [];
+'not-wf-sa-184'(_Config) -> {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/184.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/185.xml
+%% ID: not-wf-sa-185
+%% Type: not-wf
+%% Sections: 4.1
+'not-wf-sa-185'(suite) -> [];
+'not-wf-sa-185'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/185.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sa/186.xml
+%% ID: not-wf-sa-186
+%% Type: not-wf
+%% Sections: 3.1 [44]
+'not-wf-sa-186'(suite) -> [];
+'not-wf-sa-186'(Config) ->  {skip, "Fix 2"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/186.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/not-sa/001.xml
+%% ID: not-wf-not-sa-001
+%% Type: not-wf
+%% Sections: 3.4 [62]
+'not-wf-not-sa-001'(suite) -> [];
+'not-wf-not-sa-001'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/001.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/not-sa/002.xml
+%% ID: not-wf-not-sa-002
+%% Type: not-wf
+%% Sections: 2.6 [17]
+'not-wf-not-sa-002'(suite) -> [];
+'not-wf-not-sa-002'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/002.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/not-sa/003.xml
+%% ID: not-wf-not-sa-003
+%% Type: not-wf
+%% Sections: 3.4 [62]
+'not-wf-not-sa-003'(suite) -> [];
+'not-wf-not-sa-003'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/003.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/not-sa/004.xml
+%% ID: not-wf-not-sa-004
+%% Type: not-wf
+%% Sections: 3.4 [62]
+'not-wf-not-sa-004'(suite) -> [];
+'not-wf-not-sa-004'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/004.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/not-sa/005.xml
+%% ID: not-wf-not-sa-005
+%% Type: error
+%% Sections: 4.1
+'not-wf-not-sa-005'(suite) -> [];
+'not-wf-not-sa-005'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/005.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/not-sa/006.xml
+%% ID: not-wf-not-sa-006
+%% Type: not-wf
+%% Sections: 3.4 [62]
+'not-wf-not-sa-006'(suite) -> [];
+'not-wf-not-sa-006'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/006.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/not-sa/007.xml
+%% ID: not-wf-not-sa-007
+%% Type: not-wf
+%% Sections: 4.3.2 [79]
+'not-wf-not-sa-007'(suite) -> [];
+'not-wf-not-sa-007'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/007.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/not-sa/008.xml
+%% ID: not-wf-not-sa-008
+%% Type: not-wf
+%% Sections: 4.1 [69]
+'not-wf-not-sa-008'(suite) -> [];
+'not-wf-not-sa-008'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/008.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/not-sa/009.xml
+%% ID: not-wf-not-sa-009
+%% Type: not-wf
+%% Sections: 2.8
+'not-wf-not-sa-009'(suite) -> [];
+'not-wf-not-sa-009'(_Config) -> {skip, "not a complete content in PE NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/009.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/ext-sa/001.xml
+%% ID: not-wf-ext-sa-001
+%% Type: not-wf
+%% Sections: 4.1
+'not-wf-ext-sa-001'(suite) -> [];
+'not-wf-ext-sa-001'(Config) ->  {skip, "Fix 1"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/ext-sa/001.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/ext-sa/002.xml
+%% ID: not-wf-ext-sa-002
+%% Type: not-wf
+%% Sections: 4.3.1 4.3.2 [77, 78]
+'not-wf-ext-sa-002'(suite) -> [];
+'not-wf-ext-sa-002'(Config) -> {skip, "Fix 1"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/ext-sa/002.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/ext-sa/003.xml
+%% ID: not-wf-ext-sa-003
+%% Type: not-wf
+%% Sections: 2.6 [17]
+'not-wf-ext-sa-003'(suite) -> [];
+'not-wf-ext-sa-003'(Config) -> {skip, "Fix 1"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/ext-sa/003.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/002.xml
+%% ID: invalid--002
+%% Type: invalid
+%% Sections: 3.2.1
+'invalid--002'(suite) -> [];
+'invalid--002'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","invalid/002.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/005.xml
+%% ID: invalid--005
+%% Type: invalid
+%% Sections: 2.8
+'invalid--005'(suite) -> [];
+'invalid--005'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","invalid/005.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/006.xml
+%% ID: invalid--006
+%% Type: invalid
+%% Sections: 2.8
+'invalid--006'(suite) -> [];
+'invalid--006'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","invalid/006.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa/022.xml
+%% ID: invalid-not-sa-022
+%% Type: invalid
+%% Sections: 3.4 [62]
+'invalid-not-sa-022'(suite) -> [];
+'invalid-not-sa-022'(_Config) -> {skip, "DTD element content parsing NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","invalid/not-sa/022.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/001.xml
+%% ID: valid-sa-001
+%% Type: valid
+%% Sections: 3.2.2 [51]
+'valid-sa-001'(suite) -> [];
+'valid-sa-001'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/001.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/002.xml
+%% ID: valid-sa-002
+%% Type: valid
+%% Sections: 3.1 [40]
+'valid-sa-002'(suite) -> [];
+'valid-sa-002'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/002.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/003.xml
+%% ID: valid-sa-003
+%% Type: valid
+%% Sections: 3.1 [42]
+'valid-sa-003'(suite) -> [];
+'valid-sa-003'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/003.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/004.xml
+%% ID: valid-sa-004
+%% Type: valid
+%% Sections: 3.1 [41]
+'valid-sa-004'(suite) -> [];
+'valid-sa-004'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/004.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/005.xml
+%% ID: valid-sa-005
+%% Type: valid
+%% Sections: 3.1 [40]
+'valid-sa-005'(suite) -> [];
+'valid-sa-005'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/005.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/006.xml
+%% ID: valid-sa-006
+%% Type: valid
+%% Sections: 3.1 [41]
+'valid-sa-006'(suite) -> [];
+'valid-sa-006'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/006.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/007.xml
+%% ID: valid-sa-007
+%% Type: valid
+%% Sections: 3.1 4.6 [43]
+'valid-sa-007'(suite) -> [];
+'valid-sa-007'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/007.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/008.xml
+%% ID: valid-sa-008
+%% Type: valid
+%% Sections: 2.4 3.1 [43]
+'valid-sa-008'(suite) -> [];
+'valid-sa-008'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/008.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/009.xml
+%% ID: valid-sa-009
+%% Type: valid
+%% Sections: 2.3 3.1 [43]
+'valid-sa-009'(suite) -> [];
+'valid-sa-009'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/009.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/010.xml
+%% ID: valid-sa-010
+%% Type: valid
+%% Sections: 3.1 [40]
+'valid-sa-010'(suite) -> [];
+'valid-sa-010'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/010.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/011.xml
+%% ID: valid-sa-011
+%% Type: valid
+%% Sections: 3.1 [40]
+'valid-sa-011'(suite) -> [];
+'valid-sa-011'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/011.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/012.xml
+%% ID: valid-sa-012
+%% Type: valid
+%% Sections: 2.3 [4]
+'valid-sa-012'(suite) -> [];
+'valid-sa-012'(Config) ->  {skip, "Fix 1"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/012.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/013.xml
+%% ID: valid-sa-013
+%% Type: valid
+%% Sections: 2.3 3.1 [13] [40]
+'valid-sa-013'(suite) -> [];
+'valid-sa-013'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/013.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/014.xml
+%% ID: valid-sa-014
+%% Type: valid
+%% Sections: 2.3 3.1 [13] [40]
+'valid-sa-014'(suite) -> [];
+'valid-sa-014'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/014.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/015.xml
+%% ID: valid-sa-015
+%% Type: valid
+%% Sections: 2.3 3.1 [13] [40]
+'valid-sa-015'(suite) -> [];
+'valid-sa-015'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/015.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/016.xml
+%% ID: valid-sa-016
+%% Type: valid
+%% Sections: 2.6 3.1 [16] [43]
+'valid-sa-016'(suite) -> [];
+'valid-sa-016'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/016.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/017.xml
+%% ID: valid-sa-017
+%% Type: valid
+%% Sections: 2.6 3.1 [16] [43]
+'valid-sa-017'(suite) -> [];
+'valid-sa-017'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/017.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/018.xml
+%% ID: valid-sa-018
+%% Type: valid
+%% Sections: 2.7 3.1 [18] [43]
+'valid-sa-018'(suite) -> [];
+'valid-sa-018'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/018.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/019.xml
+%% ID: valid-sa-019
+%% Type: valid
+%% Sections: 2.7 3.1 [18] [43]
+'valid-sa-019'(suite) -> [];
+'valid-sa-019'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/019.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/020.xml
+%% ID: valid-sa-020
+%% Type: valid
+%% Sections: 2.7 3.1 [18] [43]
+'valid-sa-020'(suite) -> [];
+'valid-sa-020'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/020.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/021.xml
+%% ID: valid-sa-021
+%% Type: valid
+%% Sections: 2.5 3.1 [15] [43]
+'valid-sa-021'(suite) -> [];
+'valid-sa-021'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/021.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/022.xml
+%% ID: valid-sa-022
+%% Type: valid
+%% Sections: 2.5 3.1 [15] [43]
+'valid-sa-022'(suite) -> [];
+'valid-sa-022'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/022.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/023.xml
+%% ID: valid-sa-023
+%% Type: valid
+%% Sections: 3.1 [43]
+'valid-sa-023'(suite) -> [];
+'valid-sa-023'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/023.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/024.xml
+%% ID: valid-sa-024
+%% Type: valid
+%% Sections: 3.1 4.1 [43] [66]
+'valid-sa-024'(suite) -> [];
+'valid-sa-024'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/024.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/025.xml
+%% ID: valid-sa-025
+%% Type: valid
+%% Sections: 3.2 [46]
+'valid-sa-025'(suite) -> [];
+'valid-sa-025'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/025.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/026.xml
+%% ID: valid-sa-026
+%% Type: valid
+%% Sections: 3.2 [46]
+'valid-sa-026'(suite) -> [];
+'valid-sa-026'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/026.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/027.xml
+%% ID: valid-sa-027
+%% Type: valid
+%% Sections: 3.2 [46]
+'valid-sa-027'(suite) -> [];
+'valid-sa-027'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/027.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/028.xml
+%% ID: valid-sa-028
+%% Type: valid
+%% Sections: 2.8 [24]
+'valid-sa-028'(suite) -> [];
+'valid-sa-028'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/028.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/029.xml
+%% ID: valid-sa-029
+%% Type: valid
+%% Sections: 2.8 [24]
+'valid-sa-029'(suite) -> [];
+'valid-sa-029'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/029.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/030.xml
+%% ID: valid-sa-030
+%% Type: valid
+%% Sections: 2.8 [25]
+'valid-sa-030'(suite) -> [];
+'valid-sa-030'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/030.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/031.xml
+%% ID: valid-sa-031
+%% Type: valid
+%% Sections: 4.3.3 [80]
+'valid-sa-031'(suite) -> [];
+'valid-sa-031'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/031.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/032.xml
+%% ID: valid-sa-032
+%% Type: valid
+%% Sections: 2.9 [32]
+'valid-sa-032'(suite) -> [];
+'valid-sa-032'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/032.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/033.xml
+%% ID: valid-sa-033
+%% Type: valid
+%% Sections: 2.8 [23]
+'valid-sa-033'(suite) -> [];
+'valid-sa-033'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/033.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/034.xml
+%% ID: valid-sa-034
+%% Type: valid
+%% Sections: 3.1 [44]
+'valid-sa-034'(suite) -> [];
+'valid-sa-034'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/034.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/035.xml
+%% ID: valid-sa-035
+%% Type: valid
+%% Sections: 3.1 [44]
+'valid-sa-035'(suite) -> [];
+'valid-sa-035'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/035.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/036.xml
+%% ID: valid-sa-036
+%% Type: valid
+%% Sections: 2.6 [16]
+'valid-sa-036'(suite) -> [];
+'valid-sa-036'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/036.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/037.xml
+%% ID: valid-sa-037
+%% Type: valid
+%% Sections: 2.6 [15]
+'valid-sa-037'(suite) -> [];
+'valid-sa-037'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/037.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/038.xml
+%% ID: valid-sa-038
+%% Type: valid
+%% Sections: 2.6 [15]
+'valid-sa-038'(suite) -> [];
+'valid-sa-038'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/038.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/039.xml
+%% ID: valid-sa-039
+%% Type: valid
+%% Sections: 2.6 [16]
+'valid-sa-039'(suite) -> [];
+'valid-sa-039'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/039.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/040.xml
+%% ID: valid-sa-040
+%% Type: valid
+%% Sections: 3.3 3.3.1 [52] [54]
+'valid-sa-040'(suite) -> [];
+'valid-sa-040'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/040.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/041.xml
+%% ID: valid-sa-041
+%% Type: valid
+%% Sections: 3.3.1 4.1 [54] [66]
+'valid-sa-041'(suite) -> [];
+'valid-sa-041'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/041.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/042.xml
+%% ID: valid-sa-042
+%% Type: valid
+%% Sections: 3.3.1 4.1 [54] [66]
+'valid-sa-042'(suite) -> [];
+'valid-sa-042'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/042.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/043.xml
+%% ID: valid-sa-043
+%% Type: valid
+%% Sections: 3.3
+'valid-sa-043'(suite) -> [];
+'valid-sa-043'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/043.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/044.xml
+%% ID: valid-sa-044
+%% Type: valid
+%% Sections: 3.1 [44]
+'valid-sa-044'(suite) -> [];
+'valid-sa-044'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/044.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/045.xml
+%% ID: valid-sa-045
+%% Type: valid
+%% Sections: 3.3 [52]
+'valid-sa-045'(suite) -> [];
+'valid-sa-045'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/045.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/046.xml
+%% ID: valid-sa-046
+%% Type: valid
+%% Sections: 3.3 [52]
+'valid-sa-046'(suite) -> [];
+'valid-sa-046'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/046.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/047.xml
+%% ID: valid-sa-047
+%% Type: valid
+%% Sections: 3.1 [43]
+'valid-sa-047'(suite) -> [];
+'valid-sa-047'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/047.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/048.xml
+%% ID: valid-sa-048
+%% Type: valid
+%% Sections: 2.4 3.1 [14] [43]
+'valid-sa-048'(suite) -> [];
+'valid-sa-048'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/048.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/049.xml
+%% ID: valid-sa-049
+%% Type: valid
+%% Sections: 2.2 [2]
+'valid-sa-049'(suite) -> [];
+'valid-sa-049'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/049.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/050.xml
+%% ID: valid-sa-050
+%% Type: valid
+%% Sections: 2.2 [2]
+'valid-sa-050'(suite) -> [];
+'valid-sa-050'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/050.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/051.xml
+%% ID: valid-sa-051
+%% Type: valid
+%% Sections: 2.2 [2]
+'valid-sa-051'(suite) -> [];
+'valid-sa-051'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/051.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/052.xml
+%% ID: valid-sa-052
+%% Type: valid
+%% Sections: 2.2 [2]
+'valid-sa-052'(suite) -> [];
+'valid-sa-052'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/052.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/053.xml
+%% ID: valid-sa-053
+%% Type: valid
+%% Sections: 4.4.2
+'valid-sa-053'(suite) -> [];
+'valid-sa-053'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/053.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/054.xml
+%% ID: valid-sa-054
+%% Type: valid
+%% Sections: 3.1 [40] [42]
+'valid-sa-054'(suite) -> [];
+'valid-sa-054'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/054.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/055.xml
+%% ID: valid-sa-055
+%% Type: valid
+%% Sections: 2.6 2.10 [16]
+'valid-sa-055'(suite) -> [];
+'valid-sa-055'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/055.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/056.xml
+%% ID: valid-sa-056
+%% Type: valid
+%% Sections: 3.3.1 4.1 [54] [66]
+'valid-sa-056'(suite) -> [];
+'valid-sa-056'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/056.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/057.xml
+%% ID: valid-sa-057
+%% Type: valid
+%% Sections: 3.2.1 [47]
+'valid-sa-057'(suite) -> [];
+'valid-sa-057'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/057.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/058.xml
+%% ID: valid-sa-058
+%% Type: valid
+%% Sections: 3.3.3
+'valid-sa-058'(suite) -> [];
+'valid-sa-058'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/058.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/059.xml
+%% ID: valid-sa-059
+%% Type: valid
+%% Sections: 3.2 3.3 [46] [53]
+'valid-sa-059'(suite) -> [];
+'valid-sa-059'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/059.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/060.xml
+%% ID: valid-sa-060
+%% Type: valid
+%% Sections: 4.1 [66]
+'valid-sa-060'(suite) -> [];
+'valid-sa-060'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/060.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/061.xml
+%% ID: valid-sa-061
+%% Type: valid
+%% Sections: 4.1 [66]
+'valid-sa-061'(suite) -> [];
+'valid-sa-061'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/061.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/062.xml
+%% ID: valid-sa-062
+%% Type: valid
+%% Sections: 4.1 [66]
+'valid-sa-062'(suite) -> [];
+'valid-sa-062'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/062.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/063.xml
+%% ID: valid-sa-063
+%% Type: valid
+%% Sections: 2.3 [5]
+'valid-sa-063'(suite) -> [];
+'valid-sa-063'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/063.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/064.xml
+%% ID: valid-sa-064
+%% Type: valid
+%% Sections: 4.1 [66]
+'valid-sa-064'(suite) -> [];
+'valid-sa-064'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/064.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/065.xml
+%% ID: valid-sa-065
+%% Type: valid
+%% Sections: 4.5
+'valid-sa-065'(suite) -> [];
+'valid-sa-065'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/065.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/066.xml
+%% ID: valid-sa-066
+%% Type: valid
+%% Sections: 4.1 [66]
+'valid-sa-066'(suite) -> [];
+'valid-sa-066'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/066.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/067.xml
+%% ID: valid-sa-067
+%% Type: valid
+%% Sections: 4.1 [66]
+'valid-sa-067'(suite) -> [];
+'valid-sa-067'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/067.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/068.xml
+%% ID: valid-sa-068
+%% Type: valid
+%% Sections: 2.11, 4.5
+'valid-sa-068'(suite) -> [];
+'valid-sa-068'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/068.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/069.xml
+%% ID: valid-sa-069
+%% Type: valid
+%% Sections: 4.7
+'valid-sa-069'(suite) -> [];
+'valid-sa-069'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/069.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/070.xml
+%% ID: valid-sa-070
+%% Type: valid
+%% Sections: 4.4.8
+'valid-sa-070'(suite) -> [];
+'valid-sa-070'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/070.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/071.xml
+%% ID: valid-sa-071
+%% Type: valid
+%% Sections: 3.3 3.3.1 [52] [56]
+'valid-sa-071'(suite) -> [];
+'valid-sa-071'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/071.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/072.xml
+%% ID: valid-sa-072
+%% Type: valid
+%% Sections: 3.3 3.3.1 [52] [56]
+'valid-sa-072'(suite) -> [];
+'valid-sa-072'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/072.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/073.xml
+%% ID: valid-sa-073
+%% Type: valid
+%% Sections: 3.3 3.3.1 [52] [56]
+'valid-sa-073'(suite) -> [];
+'valid-sa-073'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/073.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/074.xml
+%% ID: valid-sa-074
+%% Type: valid
+%% Sections: 3.3 3.3.1 [52] [56]
+'valid-sa-074'(suite) -> [];
+'valid-sa-074'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/074.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/075.xml
+%% ID: valid-sa-075
+%% Type: valid
+%% Sections: 3.3 3.3.1 [52] [56]
+'valid-sa-075'(suite) -> [];
+'valid-sa-075'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/075.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/076.xml
+%% ID: valid-sa-076
+%% Type: valid
+%% Sections: 3.3.1
+'valid-sa-076'(suite) -> [];
+'valid-sa-076'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/076.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/077.xml
+%% ID: valid-sa-077
+%% Type: valid
+%% Sections: 3.3 3.3.1 [52] [54]
+'valid-sa-077'(suite) -> [];
+'valid-sa-077'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/077.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/078.xml
+%% ID: valid-sa-078
+%% Type: valid
+%% Sections: 3.3 3.3.1 [52] [54]
+'valid-sa-078'(suite) -> [];
+'valid-sa-078'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/078.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/079.xml
+%% ID: valid-sa-079
+%% Type: valid
+%% Sections: 3.3 3.3.2 [52] [60]
+'valid-sa-079'(suite) -> [];
+'valid-sa-079'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/079.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/080.xml
+%% ID: valid-sa-080
+%% Type: valid
+%% Sections: 3.3 3.3.2 [52] [60]
+'valid-sa-080'(suite) -> [];
+'valid-sa-080'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/080.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/081.xml
+%% ID: valid-sa-081
+%% Type: valid
+%% Sections: 3.2.1 [50]
+'valid-sa-081'(suite) -> [];
+'valid-sa-081'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/081.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/082.xml
+%% ID: valid-sa-082
+%% Type: valid
+%% Sections: 4.2 [72]
+'valid-sa-082'(suite) -> [];
+'valid-sa-082'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/082.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/083.xml
+%% ID: valid-sa-083
+%% Type: valid
+%% Sections: 4.2 [72]
+'valid-sa-083'(suite) -> [];
+'valid-sa-083'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/083.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/084.xml
+%% ID: valid-sa-084
+%% Type: valid
+%% Sections: 2.10
+'valid-sa-084'(suite) -> [];
+'valid-sa-084'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/084.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/085.xml
+%% ID: valid-sa-085
+%% Type: valid
+%% Sections: 4
+'valid-sa-085'(suite) -> [];
+'valid-sa-085'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/085.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/086.xml
+%% ID: valid-sa-086
+%% Type: valid
+%% Sections: 4.2
+'valid-sa-086'(suite) -> [];
+'valid-sa-086'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/086.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/087.xml
+%% ID: valid-sa-087
+%% Type: valid
+%% Sections: 4.5
+'valid-sa-087'(suite) -> [];
+'valid-sa-087'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/087.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/088.xml
+%% ID: valid-sa-088
+%% Type: valid
+%% Sections: 4.5
+'valid-sa-088'(suite) -> [];
+'valid-sa-088'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/088.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/089.xml
+%% ID: valid-sa-089
+%% Type: valid
+%% Sections: 4.1 [66]
+'valid-sa-089'(suite) -> [];
+'valid-sa-089'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/089.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/090.xml
+%% ID: valid-sa-090
+%% Type: valid
+%% Sections: 3.3.1
+'valid-sa-090'(suite) -> [];
+'valid-sa-090'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/090.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/091.xml
+%% ID: valid-sa-091
+%% Type: valid
+%% Sections: 3.3.1
+'valid-sa-091'(suite) -> [];
+'valid-sa-091'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/091.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/092.xml
+%% ID: valid-sa-092
+%% Type: valid
+%% Sections: 2.3 2.10
+'valid-sa-092'(suite) -> [];
+'valid-sa-092'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/092.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/093.xml
+%% ID: valid-sa-093
+%% Type: valid
+%% Sections: 2.10
+'valid-sa-093'(suite) -> [];
+'valid-sa-093'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/093.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/094.xml
+%% ID: valid-sa-094
+%% Type: valid
+%% Sections: 2.8
+'valid-sa-094'(suite) -> [];
+'valid-sa-094'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/094.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/095.xml
+%% ID: valid-sa-095
+%% Type: valid
+%% Sections: 3.3.3
+'valid-sa-095'(suite) -> [];
+'valid-sa-095'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/095.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/096.xml
+%% ID: valid-sa-096
+%% Type: valid
+%% Sections: 3.3.3
+'valid-sa-096'(suite) -> [];
+'valid-sa-096'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/096.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/097.xml
+%% ID: valid-sa-097
+%% Type: valid
+%% Sections: 3.3
+'valid-sa-097'(suite) -> [];
+'valid-sa-097'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/097.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/098.xml
+%% ID: valid-sa-098
+%% Type: valid
+%% Sections: 2.6 2.10 [16]
+'valid-sa-098'(suite) -> [];
+'valid-sa-098'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/098.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/099.xml
+%% ID: valid-sa-099
+%% Type: valid
+%% Sections: 4.3.3 [81]
+'valid-sa-099'(suite) -> [];
+'valid-sa-099'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/099.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/100.xml
+%% ID: valid-sa-100
+%% Type: valid
+%% Sections: 2.3 [12]
+'valid-sa-100'(suite) -> [];
+'valid-sa-100'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/100.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/101.xml
+%% ID: valid-sa-101
+%% Type: valid
+%% Sections: 4.5
+'valid-sa-101'(suite) -> [];
+'valid-sa-101'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/101.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/102.xml
+%% ID: valid-sa-102
+%% Type: valid
+%% Sections: 3.3.3
+'valid-sa-102'(suite) -> [];
+'valid-sa-102'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/102.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/103.xml
+%% ID: valid-sa-103
+%% Type: valid
+%% Sections: 3.3.3
+'valid-sa-103'(suite) -> [];
+'valid-sa-103'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/103.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/104.xml
+%% ID: valid-sa-104
+%% Type: valid
+%% Sections: 3.1 [40]
+'valid-sa-104'(suite) -> [];
+'valid-sa-104'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/104.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/105.xml
+%% ID: valid-sa-105
+%% Type: valid
+%% Sections: 3.3.3
+'valid-sa-105'(suite) -> [];
+'valid-sa-105'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/105.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/106.xml
+%% ID: valid-sa-106
+%% Type: valid
+%% Sections: 3.3.3
+'valid-sa-106'(suite) -> [];
+'valid-sa-106'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/106.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/107.xml
+%% ID: valid-sa-107
+%% Type: valid
+%% Sections: 3.3.3
+'valid-sa-107'(suite) -> [];
+'valid-sa-107'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/107.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/108.xml
+%% ID: valid-sa-108
+%% Type: valid
+%% Sections: 2.11, 3.3.3
+'valid-sa-108'(suite) -> [];
+'valid-sa-108'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/108.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/109.xml
+%% ID: valid-sa-109
+%% Type: valid
+%% Sections: 2.3 3.1 [10][40][41]
+'valid-sa-109'(suite) -> [];
+'valid-sa-109'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/109.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/110.xml
+%% ID: valid-sa-110
+%% Type: valid
+%% Sections: 3.3.3
+'valid-sa-110'(suite) -> [];
+'valid-sa-110'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/110.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/111.xml
+%% ID: valid-sa-111
+%% Type: valid
+%% Sections: 3.3.3
+'valid-sa-111'(suite) -> [];
+'valid-sa-111'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/111.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/112.xml
+%% ID: valid-sa-112
+%% Type: valid
+%% Sections: 3.2.1 [48][49]
+'valid-sa-112'(suite) -> [];
+'valid-sa-112'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/112.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/113.xml
+%% ID: valid-sa-113
+%% Type: valid
+%% Sections: 3.3 [52][53]
+'valid-sa-113'(suite) -> [];
+'valid-sa-113'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/113.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/114.xml
+%% ID: valid-sa-114
+%% Type: valid
+%% Sections: 2.7 [20]
+'valid-sa-114'(suite) -> [];
+'valid-sa-114'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/114.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/115.xml
+%% ID: valid-sa-115
+%% Type: valid
+%% Sections: 3.3.3
+'valid-sa-115'(suite) -> [];
+'valid-sa-115'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/115.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/116.xml
+%% ID: valid-sa-116
+%% Type: valid
+%% Sections: 2.11
+'valid-sa-116'(suite) -> [];
+'valid-sa-116'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/116.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/117.xml
+%% ID: valid-sa-117
+%% Type: valid
+%% Sections: 4.5
+'valid-sa-117'(suite) -> [];
+'valid-sa-117'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/117.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/118.xml
+%% ID: valid-sa-118
+%% Type: valid
+%% Sections: 4.5
+'valid-sa-118'(suite) -> [];
+'valid-sa-118'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/118.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa/119.xml
+%% ID: valid-sa-119
+%% Type: valid
+%% Sections: 2.5
+'valid-sa-119'(suite) -> [];
+'valid-sa-119'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/119.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/001.xml
+%% ID: valid-not-sa-001
+%% Type: valid
+%% Sections: 4.2.2 [75]
+'valid-not-sa-001'(suite) -> [];
+'valid-not-sa-001'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/001.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/002.xml
+%% ID: valid-not-sa-002
+%% Type: valid
+%% Sections: 4.2.2 [75]
+'valid-not-sa-002'(suite) -> [];
+'valid-not-sa-002'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/002.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/003.xml
+%% ID: valid-not-sa-003
+%% Type: valid
+%% Sections: 4.1 [69]
+'valid-not-sa-003'(suite) -> [];
+'valid-not-sa-003'(_Config) -> {skip, "external entity NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/003.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/004.xml
+%% ID: valid-not-sa-004
+%% Type: valid
+%% Sections: 4.1 [69]
+'valid-not-sa-004'(suite) -> [];
+'valid-not-sa-004'(_Config) -> {skip, "external entity NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/004.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/005.xml
+%% ID: valid-not-sa-005
+%% Type: valid
+%% Sections: 4.1 [69]
+'valid-not-sa-005'(suite) -> [];
+'valid-not-sa-005'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/005.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/006.xml
+%% ID: valid-not-sa-006
+%% Type: valid
+%% Sections: 3.3 [52]
+'valid-not-sa-006'(suite) -> [];
+'valid-not-sa-006'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/006.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/007.xml
+%% ID: valid-not-sa-007
+%% Type: valid
+%% Sections: 3.3 [52]
+'valid-not-sa-007'(suite) -> [];
+'valid-not-sa-007'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/007.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/008.xml
+%% ID: valid-not-sa-008
+%% Type: valid
+%% Sections: 4.2.2 [75]
+'valid-not-sa-008'(suite) -> [];
+'valid-not-sa-008'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/008.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/009.xml
+%% ID: valid-not-sa-009
+%% Type: valid
+%% Sections: 4.2.2 [75]
+'valid-not-sa-009'(suite) -> [];
+'valid-not-sa-009'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/009.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/010.xml
+%% ID: valid-not-sa-010
+%% Type: valid
+%% Sections: 3.3 [52]
+'valid-not-sa-010'(suite) -> [];
+'valid-not-sa-010'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/010.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/011.xml
+%% ID: valid-not-sa-011
+%% Type: valid
+%% Sections: 4.2 4.2.1 [72] [75]
+'valid-not-sa-011'(suite) -> [];
+'valid-not-sa-011'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/011.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/012.xml
+%% ID: valid-not-sa-012
+%% Type: valid
+%% Sections: 4.3.1 [77]
+'valid-not-sa-012'(suite) -> [];
+'valid-not-sa-012'(Config) -> {skip, "Fix 3"}.
+  %%  ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %% ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/012.xml"]),
+   %% ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %% ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/013.xml
+%% ID: valid-not-sa-013
+%% Type: valid
+%% Sections: 3.4 [62]
+'valid-not-sa-013'(suite) -> [];
+'valid-not-sa-013'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/013.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/014.xml
+%% ID: valid-not-sa-014
+%% Type: valid
+%% Sections: 3.4 [62]
+'valid-not-sa-014'(suite) -> [];
+'valid-not-sa-014'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/014.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/015.xml
+%% ID: valid-not-sa-015
+%% Type: valid
+%% Sections: 3.4 [63]
+'valid-not-sa-015'(suite) -> [];
+'valid-not-sa-015'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/015.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/016.xml
+%% ID: valid-not-sa-016
+%% Type: valid
+%% Sections: 3.4 [62]
+'valid-not-sa-016'(suite) -> [];
+'valid-not-sa-016'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/016.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/017.xml
+%% ID: valid-not-sa-017
+%% Type: valid
+%% Sections: 4.2 [72]
+'valid-not-sa-017'(suite) -> [];
+'valid-not-sa-017'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/017.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/018.xml
+%% ID: valid-not-sa-018
+%% Type: valid
+%% Sections: 4.2.2 [75]
+'valid-not-sa-018'(suite) -> [];
+'valid-not-sa-018'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/018.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/019.xml
+%% ID: valid-not-sa-019
+%% Type: valid
+%% Sections: 4.4.8
+'valid-not-sa-019'(suite) -> [];
+'valid-not-sa-019'(_Config) -> {skip, "partly replacement of markupdecls"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/019.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/020.xml
+%% ID: valid-not-sa-020
+%% Type: valid
+%% Sections: 4.4.8
+'valid-not-sa-020'(suite) -> [];
+'valid-not-sa-020'(_Config) -> {skip, "partly replacement of markupdecls"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/020.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/021.xml
+%% ID: valid-not-sa-021
+%% Type: valid
+%% Sections: 4.2 [72]
+'valid-not-sa-021'(suite) -> [];
+'valid-not-sa-021'(_Config) -> {skip, "partly replacement of markupdecls"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/021.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/023.xml
+%% ID: valid-not-sa-023
+%% Type: valid
+%% Sections: 2.3 4.1 [10] [69]
+'valid-not-sa-023'(suite) -> [];
+'valid-not-sa-023'(_Config) -> {skip, "partly replacement of markupdecls"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/023.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/024.xml
+%% ID: valid-not-sa-024
+%% Type: valid
+%% Sections: 2.8, 4.1 [69]
+'valid-not-sa-024'(suite) -> [];
+'valid-not-sa-024'(_Config) -> {skip, "partly replacement of markupdecls"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/024.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/025.xml
+%% ID: valid-not-sa-025
+%% Type: valid
+%% Sections: 4.2
+'valid-not-sa-025'(suite) -> [];
+'valid-not-sa-025'(_Config) -> {skip, "partly replacement of markupdecls"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/025.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/026.xml
+%% ID: valid-not-sa-026
+%% Type: valid
+%% Sections: 3.3 [52]
+'valid-not-sa-026'(suite) -> [];
+'valid-not-sa-026'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/026.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/027.xml
+%% ID: valid-not-sa-027
+%% Type: valid
+%% Sections: 4.1 [69]
+'valid-not-sa-027'(suite) -> [];
+'valid-not-sa-027'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/027.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/028.xml
+%% ID: valid-not-sa-028
+%% Type: valid
+%% Sections: 3.4 [62]
+'valid-not-sa-028'(suite) -> [];
+'valid-not-sa-028'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/028.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/029.xml
+%% ID: valid-not-sa-029
+%% Type: valid
+%% Sections: 3.4 [62]
+'valid-not-sa-029'(suite) -> [];
+'valid-not-sa-029'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/029.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/030.xml
+%% ID: valid-not-sa-030
+%% Type: valid
+%% Sections: 3.4 [62]
+'valid-not-sa-030'(suite) -> [];
+'valid-not-sa-030'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/030.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa/031.xml
+%% ID: valid-not-sa-031
+%% Type: valid
+%% Sections: 2.7
+'valid-not-sa-031'(suite) -> [];
+'valid-not-sa-031'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/031.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/001.xml
+%% ID: valid-ext-sa-001
+%% Type: valid
+%% Sections: 2.11
+'valid-ext-sa-001'(suite) -> [];
+'valid-ext-sa-001'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/001.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/002.xml
+%% ID: valid-ext-sa-002
+%% Type: valid
+%% Sections: 2.11
+'valid-ext-sa-002'(suite) -> [];
+'valid-ext-sa-002'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/002.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/003.xml
+%% ID: valid-ext-sa-003
+%% Type: valid
+%% Sections: 3.1 4.1 [43] [68]
+'valid-ext-sa-003'(suite) -> [];
+'valid-ext-sa-003'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/003.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/004.xml
+%% ID: valid-ext-sa-004
+%% Type: valid
+%% Sections: 2.11
+'valid-ext-sa-004'(suite) -> [];
+'valid-ext-sa-004'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/004.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/005.xml
+%% ID: valid-ext-sa-005
+%% Type: valid
+%% Sections: 3.2.1 4.2.2 [48] [75]
+'valid-ext-sa-005'(suite) -> [];
+'valid-ext-sa-005'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/005.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/006.xml
+%% ID: valid-ext-sa-006
+%% Type: valid
+%% Sections: 2.11 3.2.1 3.2.2 4.2.2 [48] [51] [75]
+'valid-ext-sa-006'(suite) -> [];
+'valid-ext-sa-006'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/006.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/007.xml
+%% ID: valid-ext-sa-007
+%% Type: valid
+%% Sections: 4.2.2 4.4.3 [75]
+'valid-ext-sa-007'(suite) -> [];
+'valid-ext-sa-007'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/007.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/008.xml
+%% ID: valid-ext-sa-008
+%% Type: valid
+%% Sections: 4.2.2 4.3.3. 4.4.3 [75] [80]
+'valid-ext-sa-008'(suite) -> [];
+'valid-ext-sa-008'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/008.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/009.xml
+%% ID: valid-ext-sa-009
+%% Type: valid
+%% Sections: 2.11
+'valid-ext-sa-009'(suite) -> [];
+'valid-ext-sa-009'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/009.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/011.xml
+%% ID: valid-ext-sa-011
+%% Type: valid
+%% Sections: 2.11 4.2.2 [75]
+'valid-ext-sa-011'(suite) -> [];
+'valid-ext-sa-011'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/011.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/012.xml
+%% ID: valid-ext-sa-012
+%% Type: valid
+%% Sections: 4.2.1 4.2.2
+'valid-ext-sa-012'(suite) -> [];
+'valid-ext-sa-012'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/012.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/013.xml
+%% ID: valid-ext-sa-013
+%% Type: valid
+%% Sections: 3.3.3
+'valid-ext-sa-013'(suite) -> [];
+'valid-ext-sa-013'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/013.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext-sa/014.xml
+%% ID: valid-ext-sa-014
+%% Type: valid
+%% Sections: 4.1 4.4.3 [68]
+'valid-ext-sa-014'(suite) -> [];
+'valid-ext-sa-014'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/014.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: James Clark XMLTEST cases, 18-Nov-1998
+
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: James Clark  XML 1.0 Tests
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: pr-xml-euc-jp.xml
+%% ID: pr-xml-euc-jp
+%% Type: error
+%% Sections: 4.3.3 [4,84]
+'pr-xml-euc-jp'(suite) -> [];
+'pr-xml-euc-jp'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-euc-jp.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: pr-xml-iso-2022-jp.xml
+%% ID: pr-xml-iso-2022-jp
+%% Type: error
+%% Sections: 4.3.3 [4,84]
+'pr-xml-iso-2022-jp'(suite) -> [];
+'pr-xml-iso-2022-jp'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-iso-2022-jp.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: pr-xml-little-endian.xml
+%% ID: pr-xml-little
+%% Type: valid
+%% Sections: 4.3.3 [4,84]
+'pr-xml-little'(suite) -> [];
+'pr-xml-little'(Config) ->  {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-little-endian.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: pr-xml-shift_jis.xml
+%% ID: pr-xml-shift_jis
+%% Type: error
+%% Sections: 4.3.3 [4,84]
+'pr-xml-shift_jis'(suite) -> [];
+'pr-xml-shift_jis'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-shift_jis.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: pr-xml-utf-16.xml
+%% ID: pr-xml-utf-16
+%% Type: valid
+%% Sections: 4.3.3 [4,84]
+'pr-xml-utf-16'(suite) -> [];
+'pr-xml-utf-16'(Config) ->  {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-utf-16.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: pr-xml-utf-8.xml
+%% ID: pr-xml-utf-8
+%% Type: valid
+%% Sections: 4.3.3 [4,84]
+'pr-xml-utf-8'(suite) -> [];
+'pr-xml-utf-8'(Config) ->  {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-utf-8.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: weekly-euc-jp.xml
+%% ID: weekly-euc-jp
+%% Type: error
+%% Sections: 4.3.3 [4,84]
+'weekly-euc-jp'(suite) -> [];
+'weekly-euc-jp'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-euc-jp.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: weekly-iso-2022-jp.xml
+%% ID: weekly-iso-2022-jp
+%% Type: error
+%% Sections: 4.3.3 [4,84]
+'weekly-iso-2022-jp'(suite) -> [];
+'weekly-iso-2022-jp'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-iso-2022-jp.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: weekly-little-endian.xml
+%% ID: weekly-little
+%% Type: valid
+%% Sections: 4.3.3 [4,84]
+'weekly-little'(suite) -> [];
+'weekly-little'(Config) ->  {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-little-endian.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: weekly-shift_jis.xml
+%% ID: weekly-shift_jis
+%% Type: error
+%% Sections: 4.3.3 [4,84]
+'weekly-shift_jis'(suite) -> [];
+'weekly-shift_jis'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-shift_jis.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: weekly-utf-16.xml
+%% ID: weekly-utf-16
+%% Type: valid
+%% Sections: 4.3.3 [4,84]
+'weekly-utf-16'(suite) -> [];
+'weekly-utf-16'(Config) -> {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-utf-16.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: weekly-utf-8.xml
+%% ID: weekly-utf-8
+%% Type: valid
+%% Sections: 4.3.3 [4,84]
+'weekly-utf-8'(suite) -> [];
+'weekly-utf-8'(Config) -> {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-utf-8.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: Fuji Xerox Japanese Text Tests
+
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: Fuji Xerox Japanese Text Tests XML 1.0 Tests
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/pe01.xml
+%% ID: pe01
+%% Type: valid
+%% Sections: 2.8
+'pe01'(suite) -> [];
+'pe01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/pe01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/dtd00.xml
+%% ID: dtd00
+%% Type: valid
+%% Sections: 3.2.2 [51]
+'dtd00'(suite) -> [];
+'dtd00'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/dtd00.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/dtd01.xml
+%% ID: dtd01
+%% Type: valid
+%% Sections: 2.5 [15]
+'dtd01'(suite) -> [];
+'dtd01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/dtd01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/element.xml
+%% ID: element
+%% Type: valid
+%% Sections: 3
+'element'(suite) -> [];
+'element'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/element.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext01.xml
+%% ID: ext01
+%% Type: valid
+%% Sections: 4.3.1 4.3.2 [77] [78]
+'ext01'(suite) -> [];
+'ext01'(Config) ->  {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/ext01.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/ext02.xml
+%% ID: ext02
+%% Type: valid
+%% Sections: 4.3.2 [78]
+'ext02'(suite) -> [];
+'ext02'(Config) ->  {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/ext02.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa01.xml
+%% ID: not-sa01
+%% Type: valid
+%% Sections: 2.9
+'not-sa01'(suite) -> [];
+'not-sa01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/not-sa01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa02.xml
+%% ID: not-sa02
+%% Type: valid
+%% Sections: 2.9
+'not-sa02'(suite) -> [];
+'not-sa02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/not-sa02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa03.xml
+%% ID: not-sa03
+%% Type: valid
+%% Sections: 2.9
+'not-sa03'(suite) -> [];
+'not-sa03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/not-sa03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/not-sa04.xml
+%% ID: not-sa04
+%% Type: valid
+%% Sections: 2.9
+'not-sa04'(suite) -> [];
+'not-sa04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/not-sa04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/notation01.xml
+%% ID: notation01
+%% Type: valid
+%% Sections: 4.7 [82]
+'notation01'(suite) -> [];
+'notation01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/notation01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/optional.xml
+%% ID: optional
+%% Type: valid
+%% Sections: 3 3.2.1 [47]
+'optional'(suite) -> [];
+'optional'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/optional.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/required00.xml
+%% ID: required00
+%% Type: valid
+%% Sections: 3.3.2 [60]
+'required00'(suite) -> [];
+'required00'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/required00.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa01.xml
+%% ID: sa01
+%% Type: valid
+%% Sections: 2.9 [32]
+'sa01'(suite) -> [];
+'sa01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sa01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa02.xml
+%% ID: sa02
+%% Type: valid
+%% Sections: 2.9 [32]
+'sa02'(suite) -> [];
+'sa02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sa02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa03.xml
+%% ID: sa03
+%% Type: valid
+%% Sections: 2.9 [32]
+'sa03'(suite) -> [];
+'sa03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sa03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa04.xml
+%% ID: sa04
+%% Type: valid
+%% Sections: 2.9 [32]
+'sa04'(suite) -> [];
+'sa04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sa04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sa05.xml
+%% ID: sa05
+%% Type: valid
+%% Sections: 2.9 [32]
+'sa05'(suite) -> [];
+'sa05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sa05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/sgml01.xml
+%% ID: v-sgml01
+%% Type: valid
+%% Sections: 3.3.1 [59]
+'v-sgml01'(suite) -> [];
+'v-sgml01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sgml01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/v-lang01.xml
+%% ID: v-lang01
+%% Type: valid
+%% Sections: 2.12 [35]
+'v-lang01'(suite) -> [];
+'v-lang01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/v-lang02.xml
+%% ID: v-lang02
+%% Type: valid
+%% Sections: 2.12 [35]
+'v-lang02'(suite) -> [];
+'v-lang02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/v-lang03.xml
+%% ID: v-lang03
+%% Type: valid
+%% Sections: 2.12 [36]
+'v-lang03'(suite) -> [];
+'v-lang03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/v-lang04.xml
+%% ID: v-lang04
+%% Type: valid
+%% Sections: 2.12 [37]
+'v-lang04'(suite) -> [];
+'v-lang04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/v-lang05.xml
+%% ID: v-lang05
+%% Type: valid
+%% Sections: 2.12 [35]
+'v-lang05'(suite) -> [];
+'v-lang05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/v-lang06.xml
+%% ID: v-lang06
+%% Type: valid
+%% Sections: 2.12 [37]
+'v-lang06'(suite) -> [];
+'v-lang06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/pe00.xml
+%% ID: v-pe00
+%% Type: valid
+%% Sections: 4.5
+'v-pe00'(suite) -> [];
+'v-pe00'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/pe00.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/pe03.xml
+%% ID: v-pe03
+%% Type: valid
+%% Sections: 4.5
+'v-pe03'(suite) -> [];
+'v-pe03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/pe03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/pe02.xml
+%% ID: v-pe02
+%% Type: valid
+%% Sections: 4.5
+'v-pe02'(suite) -> [];
+'v-pe02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/pe02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/dtd01.xml
+%% ID: inv-dtd01
+%% Type: invalid
+%% Sections: 3.2.2
+'inv-dtd01'(suite) -> [];
+'inv-dtd01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/dtd01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/dtd02.xml
+%% ID: inv-dtd02
+%% Type: invalid
+%% Sections: 4.2.2
+'inv-dtd02'(suite) -> [];
+'inv-dtd02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/dtd02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/dtd03.xml
+%% ID: inv-dtd03
+%% Type: invalid
+%% Sections: 3
+'inv-dtd03'(suite) -> [];
+'inv-dtd03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/dtd03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/el01.xml
+%% ID: el01
+%% Type: invalid
+%% Sections: 3
+'el01'(suite) -> [];
+'el01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/el02.xml
+%% ID: el02
+%% Type: invalid
+%% Sections: 3
+'el02'(suite) -> [];
+'el02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/el03.xml
+%% ID: el03
+%% Type: invalid
+%% Sections: 3
+'el03'(suite) -> [];
+'el03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/el04.xml
+%% ID: el04
+%% Type: invalid
+%% Sections: 3.2
+'el04'(suite) -> [];
+'el04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/el05.xml
+%% ID: el05
+%% Type: invalid
+%% Sections: 3.2.2
+'el05'(suite) -> [];
+'el05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/el06.xml
+%% ID: el06
+%% Type: invalid
+%% Sections: 3
+'el06'(suite) -> [];
+'el06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/id01.xml
+%% ID: id01
+%% Type: invalid
+%% Sections: 3.3.1
+'id01'(suite) -> [];
+'id01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/id02.xml
+%% ID: id02
+%% Type: invalid
+%% Sections: 3.3.1
+'id02'(suite) -> [];
+'id02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/id03.xml
+%% ID: id03
+%% Type: invalid
+%% Sections: 3.3.1
+'id03'(suite) -> [];
+'id03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/id04.xml
+%% ID: id04
+%% Type: invalid
+%% Sections: 3.3.1
+'id04'(suite) -> [];
+'id04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/id05.xml
+%% ID: id05
+%% Type: invalid
+%% Sections: 3.3.1
+'id05'(suite) -> [];
+'id05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/id06.xml
+%% ID: id06
+%% Type: invalid
+%% Sections: 3.3.1
+'id06'(suite) -> [];
+'id06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/id07.xml
+%% ID: id07
+%% Type: invalid
+%% Sections: 3.3.1
+'id07'(suite) -> [];
+'id07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/id08.xml
+%% ID: id08
+%% Type: invalid
+%% Sections: 3.3.1
+'id08'(suite) -> [];
+'id08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/id09.xml
+%% ID: id09
+%% Type: invalid
+%% Sections: 3.3.1
+'id09'(suite) -> [];
+'id09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa01.xml
+%% ID: inv-not-sa01
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa01'(suite) -> [];
+'inv-not-sa01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa02.xml
+%% ID: inv-not-sa02
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa02'(suite) -> [];
+'inv-not-sa02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa04.xml
+%% ID: inv-not-sa04
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa04'(suite) -> [];
+'inv-not-sa04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa05.xml
+%% ID: inv-not-sa05
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa05'(suite) -> [];
+'inv-not-sa05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa06.xml
+%% ID: inv-not-sa06
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa06'(suite) -> [];
+'inv-not-sa06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa07.xml
+%% ID: inv-not-sa07
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa07'(suite) -> [];
+'inv-not-sa07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa08.xml
+%% ID: inv-not-sa08
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa08'(suite) -> [];
+'inv-not-sa08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa09.xml
+%% ID: inv-not-sa09
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa09'(suite) -> [];
+'inv-not-sa09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa10.xml
+%% ID: inv-not-sa10
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa10'(suite) -> [];
+'inv-not-sa10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa11.xml
+%% ID: inv-not-sa11
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa11'(suite) -> [];
+'inv-not-sa11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa12.xml
+%% ID: inv-not-sa12
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa12'(suite) -> [];
+'inv-not-sa12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa13.xml
+%% ID: inv-not-sa13
+%% Type: invalid
+%% Sections: 2.9
+'inv-not-sa13'(suite) -> [];
+'inv-not-sa13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/not-sa14.xml
+%% ID: inv-not-sa14
+%% Type: invalid
+%% Sections: 3
+'inv-not-sa14'(suite) -> [];
+'inv-not-sa14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional01.xml
+%% ID: optional01
+%% Type: invalid
+%% Sections: 3
+'optional01'(suite) -> [];
+'optional01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional02.xml
+%% ID: optional02
+%% Type: invalid
+%% Sections: 3
+'optional02'(suite) -> [];
+'optional02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional03.xml
+%% ID: optional03
+%% Type: invalid
+%% Sections: 3
+'optional03'(suite) -> [];
+'optional03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional04.xml
+%% ID: optional04
+%% Type: invalid
+%% Sections: 3
+'optional04'(suite) -> [];
+'optional04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional05.xml
+%% ID: optional05
+%% Type: invalid
+%% Sections: 3
+'optional05'(suite) -> [];
+'optional05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional06.xml
+%% ID: optional06
+%% Type: invalid
+%% Sections: 3
+'optional06'(suite) -> [];
+'optional06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional07.xml
+%% ID: optional07
+%% Type: invalid
+%% Sections: 3
+'optional07'(suite) -> [];
+'optional07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional08.xml
+%% ID: optional08
+%% Type: invalid
+%% Sections: 3
+'optional08'(suite) -> [];
+'optional08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional09.xml
+%% ID: optional09
+%% Type: invalid
+%% Sections: 3
+'optional09'(suite) -> [];
+'optional09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional10.xml
+%% ID: optional10
+%% Type: invalid
+%% Sections: 3
+'optional10'(suite) -> [];
+'optional10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional11.xml
+%% ID: optional11
+%% Type: invalid
+%% Sections: 3
+'optional11'(suite) -> [];
+'optional11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional12.xml
+%% ID: optional12
+%% Type: invalid
+%% Sections: 3
+'optional12'(suite) -> [];
+'optional12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional13.xml
+%% ID: optional13
+%% Type: invalid
+%% Sections: 3
+'optional13'(suite) -> [];
+'optional13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional14.xml
+%% ID: optional14
+%% Type: invalid
+%% Sections: 3
+'optional14'(suite) -> [];
+'optional14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional20.xml
+%% ID: optional20
+%% Type: invalid
+%% Sections: 3
+'optional20'(suite) -> [];
+'optional20'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional20.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional21.xml
+%% ID: optional21
+%% Type: invalid
+%% Sections: 3
+'optional21'(suite) -> [];
+'optional21'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional21.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional22.xml
+%% ID: optional22
+%% Type: invalid
+%% Sections: 3
+'optional22'(suite) -> [];
+'optional22'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional22.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional23.xml
+%% ID: optional23
+%% Type: invalid
+%% Sections: 3
+'optional23'(suite) -> [];
+'optional23'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional23.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional24.xml
+%% ID: optional24
+%% Type: invalid
+%% Sections: 3
+'optional24'(suite) -> [];
+'optional24'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional24.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/optional25.xml
+%% ID: optional25
+%% Type: invalid
+%% Sections: 3
+'optional25'(suite) -> [];
+'optional25'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional25.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/required00.xml
+%% ID: inv-required00
+%% Type: invalid
+%% Sections: 3.3.2
+'inv-required00'(suite) -> [];
+'inv-required00'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/required00.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/required01.xml
+%% ID: inv-required01
+%% Type: invalid
+%% Sections: 3.1 2.10
+'inv-required01'(suite) -> [];
+'inv-required01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/required01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/required02.xml
+%% ID: inv-required02
+%% Type: invalid
+%% Sections: 3.1 2.12
+'inv-required02'(suite) -> [];
+'inv-required02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/required02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/root.xml
+%% ID: root
+%% Type: invalid
+%% Sections: 2.8
+'root'(suite) -> [];
+'root'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/root.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr01.xml
+%% ID: attr01
+%% Type: invalid
+%% Sections: 3.3.1
+'attr01'(suite) -> [];
+'attr01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr02.xml
+%% ID: attr02
+%% Type: invalid
+%% Sections: 3.3.1
+'attr02'(suite) -> [];
+'attr02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr03.xml
+%% ID: attr03
+%% Type: invalid
+%% Sections: 3.3.1
+'attr03'(suite) -> [];
+'attr03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr04.xml
+%% ID: attr04
+%% Type: invalid
+%% Sections: 3.3.1
+'attr04'(suite) -> [];
+'attr04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr05.xml
+%% ID: attr05
+%% Type: invalid
+%% Sections: 3.3.1
+'attr05'(suite) -> [];
+'attr05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr06.xml
+%% ID: attr06
+%% Type: invalid
+%% Sections: 3.3.1
+'attr06'(suite) -> [];
+'attr06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr07.xml
+%% ID: attr07
+%% Type: invalid
+%% Sections: 3.3.1
+'attr07'(suite) -> [];
+'attr07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr08.xml
+%% ID: attr08
+%% Type: invalid
+%% Sections: 3.3.2
+'attr08'(suite) -> [];
+'attr08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr09.xml
+%% ID: attr09
+%% Type: invalid
+%% Sections: 3.3.2
+'attr09'(suite) -> [];
+'attr09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr10.xml
+%% ID: attr10
+%% Type: invalid
+%% Sections: 3.3.2
+'attr10'(suite) -> [];
+'attr10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr11.xml
+%% ID: attr11
+%% Type: invalid
+%% Sections: 3.3.2
+'attr11'(suite) -> [];
+'attr11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr12.xml
+%% ID: attr12
+%% Type: invalid
+%% Sections: 3.3.2
+'attr12'(suite) -> [];
+'attr12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr13.xml
+%% ID: attr13
+%% Type: invalid
+%% Sections: 3.3.2
+'attr13'(suite) -> [];
+'attr13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr14.xml
+%% ID: attr14
+%% Type: invalid
+%% Sections: 3.3.2
+'attr14'(suite) -> [];
+'attr14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr15.xml
+%% ID: attr15
+%% Type: invalid
+%% Sections: 3.3.2
+'attr15'(suite) -> [];
+'attr15'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr15.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/attr16.xml
+%% ID: attr16
+%% Type: invalid
+%% Sections: 3.3.2
+'attr16'(suite) -> [];
+'attr16'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr16.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/utf16b.xml
+%% ID: utf16b
+%% Type: invalid
+%% Sections: 4.3.3 2.8
+'utf16b'(suite) -> [];
+'utf16b'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/utf16b.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/utf16l.xml
+%% ID: utf16l
+%% Type: invalid
+%% Sections: 4.3.3 2.8
+'utf16l'(suite) -> [];
+'utf16l'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/utf16l.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/empty.xml
+%% ID: empty
+%% Type: invalid
+%% Sections: 2.4 2.7 [18] 3
+'empty'(suite) -> [];
+'empty'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/empty.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/not-sa03.xml
+%% ID: not-wf-sa03
+%% Type: not-wf
+%% Sections: 2.9
+'not-wf-sa03'(suite) -> [];
+'not-wf-sa03'(Config) -> {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/not-sa03.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/attlist01.xml
+%% ID: attlist01
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'attlist01'(suite) -> [];
+'attlist01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/attlist02.xml
+%% ID: attlist02
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'attlist02'(suite) -> [];
+'attlist02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/attlist03.xml
+%% ID: attlist03
+%% Type: not-wf
+%% Sections: 3.3.1 [59]
+'attlist03'(suite) -> [];
+'attlist03'(_Config) ->  {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/attlist04.xml
+%% ID: attlist04
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'attlist04'(suite) -> [];
+'attlist04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/attlist05.xml
+%% ID: attlist05
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'attlist05'(suite) -> [];
+'attlist05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/attlist06.xml
+%% ID: attlist06
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'attlist06'(suite) -> [];
+'attlist06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/attlist07.xml
+%% ID: attlist07
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'attlist07'(suite) -> [];
+'attlist07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/attlist08.xml
+%% ID: attlist08
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'attlist08'(suite) -> [];
+'attlist08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/attlist09.xml
+%% ID: attlist09
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'attlist09'(suite) -> [];
+'attlist09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/attlist10.xml
+%% ID: attlist10
+%% Type: not-wf
+%% Sections: 3.1 [40]
+'attlist10'(suite) -> [];
+'attlist10'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist10.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/attlist11.xml
+%% ID: attlist11
+%% Type: not-wf
+%% Sections: 3.1 [44]
+'attlist11'(suite) -> [];
+'attlist11'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist11.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/cond01.xml
+%% ID: cond01
+%% Type: not-wf
+%% Sections: 3.4 [61]
+'cond01'(suite) -> [];
+'cond01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/cond01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/cond02.xml
+%% ID: cond02
+%% Type: not-wf
+%% Sections: 3.4 [61]
+'cond02'(suite) -> [];
+'cond02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/cond02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/content01.xml
+%% ID: content01
+%% Type: not-wf
+%% Sections: 3.2.1 [48]
+'content01'(suite) -> [];
+'content01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/content01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/content02.xml
+%% ID: content02
+%% Type: not-wf
+%% Sections: 3.2.1 [48]
+'content02'(suite) -> [];
+'content02'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/content02.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/content03.xml
+%% ID: content03
+%% Type: not-wf
+%% Sections: 3.2.1 [48]
+'content03'(suite) -> [];
+'content03'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/content03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/decl01.xml
+%% ID: decl01
+%% Type: not-wf
+%% Sections: 4.3.1 [77]
+'decl01'(suite) -> [];
+'decl01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/decl01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/dtd00.xml
+%% ID: nwf-dtd00
+%% Type: not-wf
+%% Sections: 3.2.1 [55]
+'nwf-dtd00'(suite) -> [];
+'nwf-dtd00'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd00.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/dtd01.xml
+%% ID: nwf-dtd01
+%% Type: not-wf
+%% Sections: 3.2.1 [55]
+'nwf-dtd01'(suite) -> [];
+'nwf-dtd01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/dtd02.xml
+%% ID: dtd02
+%% Type: not-wf
+%% Sections: 4.1 [69]
+'dtd02'(suite) -> [];
+'dtd02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/dtd03.xml
+%% ID: dtd03
+%% Type: not-wf
+%% Sections: 4.1 [69]
+'dtd03'(suite) -> [];
+'dtd03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/dtd04.xml
+%% ID: dtd04
+%% Type: not-wf
+%% Sections: 4.2.2 [75]
+'dtd04'(suite) -> [];
+'dtd04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/dtd05.xml
+%% ID: dtd05
+%% Type: not-wf
+%% Sections: 4.2.2 [75]
+'dtd05'(suite) -> [];
+'dtd05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/dtd07.xml
+%% ID: dtd07
+%% Type: not-wf
+%% Sections: 4.3.1 [77]
+'dtd07'(suite) -> [];
+'dtd07'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd07.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/element00.xml
+%% ID: element00
+%% Type: not-wf
+%% Sections: 3.1 [42]
+'element00'(suite) -> [];
+'element00'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/element00.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/element01.xml
+%% ID: element01
+%% Type: not-wf
+%% Sections: 3.1 [42]
+'element01'(suite) -> [];
+'element01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/element01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/element02.xml
+%% ID: element02
+%% Type: not-wf
+%% Sections: 3.1 [43]
+'element02'(suite) -> [];
+'element02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/element02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/element03.xml
+%% ID: element03
+%% Type: not-wf
+%% Sections: 3.1 [43]
+'element03'(suite) -> [];
+'element03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/element03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/element04.xml
+%% ID: element04
+%% Type: not-wf
+%% Sections: 3.1 [43]
+'element04'(suite) -> [];
+'element04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/element04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/encoding01.xml
+%% ID: encoding01
+%% Type: not-wf
+%% Sections: 4.3.3 [81]
+'encoding01'(suite) -> [];
+'encoding01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/encoding02.xml
+%% ID: encoding02
+%% Type: not-wf
+%% Sections: 4.3.3 [81]
+'encoding02'(suite) -> [];
+'encoding02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/encoding03.xml
+%% ID: encoding03
+%% Type: not-wf
+%% Sections: 4.3.3 [81]
+'encoding03'(suite) -> [];
+'encoding03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/encoding04.xml
+%% ID: encoding04
+%% Type: not-wf
+%% Sections: 4.3.3 [81]
+'encoding04'(suite) -> [];
+'encoding04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/encoding05.xml
+%% ID: encoding05
+%% Type: not-wf
+%% Sections: 4.3.3 [81]
+'encoding05'(suite) -> [];
+'encoding05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/encoding06.xml
+%% ID: encoding06
+%% Type: not-wf
+%% Sections: 4.3.3 [81]
+'encoding06'(suite) -> [];
+'encoding06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/encoding07.xml
+%% ID: encoding07
+%% Type: not-wf
+%% Sections: 4.3.1 [77]
+'encoding07'(suite) -> [];
+'encoding07'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding07.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/pi.xml
+%% ID: pi
+%% Type: not-wf
+%% Sections: 2.6 [16]
+'pi'(suite) -> [];
+'pi'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pi.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/pubid01.xml
+%% ID: pubid01
+%% Type: not-wf
+%% Sections: 2.3 [12]
+'pubid01'(suite) -> [];
+'pubid01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pubid01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/pubid02.xml
+%% ID: pubid02
+%% Type: not-wf
+%% Sections: 2.3 [12]
+'pubid02'(suite) -> [];
+'pubid02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pubid02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/pubid03.xml
+%% ID: pubid03
+%% Type: not-wf
+%% Sections: 2.3 [12]
+'pubid03'(suite) -> [];
+'pubid03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pubid03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/pubid04.xml
+%% ID: pubid04
+%% Type: not-wf
+%% Sections: 2.3 [12]
+'pubid04'(suite) -> [];
+'pubid04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pubid04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/pubid05.xml
+%% ID: pubid05
+%% Type: not-wf
+%% Sections: 2.3 [12]
+'pubid05'(suite) -> [];
+'pubid05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pubid05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml01.xml
+%% ID: sgml01
+%% Type: not-wf
+%% Sections: 3 [39]
+'sgml01'(suite) -> [];
+'sgml01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml02.xml
+%% ID: sgml02
+%% Type: not-wf
+%% Sections: 2.8 
+'sgml02'(suite) -> [];
+'sgml02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml03.xml
+%% ID: sgml03
+%% Type: not-wf
+%% Sections: 2.5 [15]
+'sgml03'(suite) -> [];
+'sgml03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml04.xml
+%% ID: sgml04
+%% Type: not-wf
+%% Sections: 3.3 [52]
+'sgml04'(suite) -> [];
+'sgml04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml05.xml
+%% ID: sgml05
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'sgml05'(suite) -> [];
+'sgml05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml06.xml
+%% ID: sgml06
+%% Type: not-wf
+%% Sections: 3.3 [52]
+'sgml06'(suite) -> [];
+'sgml06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml07.xml
+%% ID: sgml07
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'sgml07'(suite) -> [];
+'sgml07'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml07.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml08.xml
+%% ID: sgml08
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'sgml08'(suite) -> [];
+'sgml08'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml08.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml09.xml
+%% ID: sgml09
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'sgml09'(suite) -> [];
+'sgml09'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml09.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml10.xml
+%% ID: sgml10
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'sgml10'(suite) -> [];
+'sgml10'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml10.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml11.xml
+%% ID: sgml11
+%% Type: not-wf
+%% Sections: 3.2 [46]
+'sgml11'(suite) -> [];
+'sgml11'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml11.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml12.xml
+%% ID: sgml12
+%% Type: not-wf
+%% Sections: 3.2 [46]
+'sgml12'(suite) -> [];
+'sgml12'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml12.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/sgml13.xml
+%% ID: sgml13
+%% Type: not-wf
+%% Sections: 3.2.1 [47]
+'sgml13'(suite) -> [];
+'sgml13'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml13.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/uri01.xml
+%% ID: uri01
+%% Type: error
+%% Sections: 4.2.2 [75]
+'uri01'(suite) -> [];
+'uri01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/uri01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: Sun Microsystems XML Tests
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p01pass2.xml
+%% ID: o-p01pass2
+%% Type: valid
+%% Sections: 2.2 [1]
+'o-p01pass2'(suite) -> [];
+'o-p01pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p06pass1.xml
+%% ID: o-p06pass1
+%% Type: valid
+%% Sections: 2.3 [6]
+'o-p06pass1'(suite) -> [];
+'o-p06pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p06pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p07pass1.xml
+%% ID: o-p07pass1
+%% Type: valid
+%% Sections: 2.3 [7]
+'o-p07pass1'(suite) -> [];
+'o-p07pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p07pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p08pass1.xml
+%% ID: o-p08pass1
+%% Type: valid
+%% Sections: 2.3 [8]
+'o-p08pass1'(suite) -> [];
+'o-p08pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p08pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p09pass1.xml
+%% ID: o-p09pass1
+%% Type: valid
+%% Sections: 2.3 [9]
+'o-p09pass1'(suite) -> [];
+'o-p09pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p12pass1.xml
+%% ID: o-p12pass1
+%% Type: valid
+%% Sections: 2.3 [12]
+'o-p12pass1'(suite) -> [];
+'o-p12pass1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12pass1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p22pass4.xml
+%% ID: o-p22pass4
+%% Type: valid
+%% Sections: 2.8 [22]
+'o-p22pass4'(suite) -> [];
+'o-p22pass4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p22pass5.xml
+%% ID: o-p22pass5
+%% Type: valid
+%% Sections: 2.8 [22]
+'o-p22pass5'(suite) -> [];
+'o-p22pass5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p22pass6.xml
+%% ID: o-p22pass6
+%% Type: valid
+%% Sections: 2.8 [22]
+'o-p22pass6'(suite) -> [];
+'o-p22pass6'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass6.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p28pass1.xml
+%% ID: o-p28pass1
+%% Type: valid
+%% Sections: 3.1 [43] [44]
+'o-p28pass1'(suite) -> [];
+'o-p28pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p28pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p28pass3.xml
+%% ID: o-p28pass3
+%% Type: valid
+%% Sections: 2.8 4.1 [28] [69]
+'o-p28pass3'(suite) -> [];
+'o-p28pass3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p28pass3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p28pass4.xml
+%% ID: o-p28pass4
+%% Type: valid
+%% Sections: 2.8 4.2.2 [28] [75]
+'o-p28pass4'(suite) -> [];
+'o-p28pass4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p28pass4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p28pass5.xml
+%% ID: o-p28pass5
+%% Type: valid
+%% Sections: 2.8 4.1 [28] [69]
+'o-p28pass5'(suite) -> [];
+'o-p28pass5'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p28pass5.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p29pass1.xml
+%% ID: o-p29pass1
+%% Type: valid
+%% Sections: 2.8 [29]
+'o-p29pass1'(suite) -> [];
+'o-p29pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p29pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p30pass1.xml
+%% ID: o-p30pass1
+%% Type: valid
+%% Sections: 2.8 4.2.2 [30] [75]
+'o-p30pass1'(suite) -> [];
+'o-p30pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p30pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p30pass2.xml
+%% ID: o-p30pass2
+%% Type: valid
+%% Sections: 2.8 4.2.2 4.3.1 [30] [75] [77]
+'o-p30pass2'(suite) -> [];
+'o-p30pass2'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p30pass2.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p31pass1.xml
+%% ID: o-p31pass1
+%% Type: valid
+%% Sections: 2.8 [31]
+'o-p31pass1'(suite) -> [];
+'o-p31pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p31pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p31pass2.xml
+%% ID: o-p31pass2
+%% Type: valid
+%% Sections: 2.8 3.4 4.2.2 [31] [62] [63] [75]
+'o-p31pass2'(suite) -> [];
+'o-p31pass2'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p31pass2.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p43pass1.xml
+%% ID: o-p43pass1
+%% Type: valid
+%% Sections: 2.4 2.5 2.6 2.7 [15] [16] [18]
+'o-p43pass1'(suite) -> [];
+'o-p43pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p43pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p45pass1.xml
+%% ID: o-p45pass1
+%% Type: valid
+%% Sections: 3.2 [45]
+'o-p45pass1'(suite) -> [];
+'o-p45pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p45pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p46pass1.xml
+%% ID: o-p46pass1
+%% Type: valid
+%% Sections: 3.2 3.2.1 3.2.2 [45] [46] [47] [51]
+'o-p46pass1'(suite) -> [];
+'o-p46pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p47pass1.xml
+%% ID: o-p47pass1
+%% Type: valid
+%% Sections: 3.2 3.2.1 [45] [46] [47] 
+'o-p47pass1'(suite) -> [];
+'o-p47pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p47pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p48pass1.xml
+%% ID: o-p48pass1
+%% Type: valid
+%% Sections: 3.2 3.2.1 [45] [46] [47]
+'o-p48pass1'(suite) -> [];
+'o-p48pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p48pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p49pass1.xml
+%% ID: o-p49pass1
+%% Type: valid
+%% Sections: 3.2 3.2.1 [45] [46] [47]
+'o-p49pass1'(suite) -> [];
+'o-p49pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p49pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p50pass1.xml
+%% ID: o-p50pass1
+%% Type: valid
+%% Sections: 3.2 3.2.1 [45] [46] [47]
+'o-p50pass1'(suite) -> [];
+'o-p50pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p50pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p51pass1.xml
+%% ID: o-p51pass1
+%% Type: valid
+%% Sections: 3.2.2 [51]
+'o-p51pass1'(suite) -> [];
+'o-p51pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p52pass1.xml
+%% ID: o-p52pass1
+%% Type: valid
+%% Sections: 3.3 [52]
+'o-p52pass1'(suite) -> [];
+'o-p52pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p52pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p53pass1.xml
+%% ID: o-p53pass1
+%% Type: valid
+%% Sections: 3.3 [53]
+'o-p53pass1'(suite) -> [];
+'o-p53pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p54pass1.xml
+%% ID: o-p54pass1
+%% Type: valid
+%% Sections: 3.3.1 [54]
+'o-p54pass1'(suite) -> [];
+'o-p54pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p54pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p55pass1.xml
+%% ID: o-p55pass1
+%% Type: valid
+%% Sections: 3.3.1 [55]
+'o-p55pass1'(suite) -> [];
+'o-p55pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p55pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p56pass1.xml
+%% ID: o-p56pass1
+%% Type: valid
+%% Sections: 3.3.1 [56]
+'o-p56pass1'(suite) -> [];
+'o-p56pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p57pass1.xml
+%% ID: o-p57pass1
+%% Type: valid
+%% Sections: 3.3.1 [57]
+'o-p57pass1'(suite) -> [];
+'o-p57pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p57pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p58pass1.xml
+%% ID: o-p58pass1
+%% Type: valid
+%% Sections: 3.3.1 [58]
+'o-p58pass1'(suite) -> [];
+'o-p58pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p59pass1.xml
+%% ID: o-p59pass1
+%% Type: valid
+%% Sections: 3.3.1 [59]
+'o-p59pass1'(suite) -> [];
+'o-p59pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p59pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p60pass1.xml
+%% ID: o-p60pass1
+%% Type: valid
+%% Sections: 3.3.2 [60]
+'o-p60pass1'(suite) -> [];
+'o-p60pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p61pass1.xml
+%% ID: o-p61pass1
+%% Type: valid
+%% Sections: 3.4 [61]
+'o-p61pass1'(suite) -> [];
+'o-p61pass1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p61pass1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p62pass1.xml
+%% ID: o-p62pass1
+%% Type: valid
+%% Sections: 3.4 [62]
+'o-p62pass1'(suite) -> [];
+'o-p62pass1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p62pass1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p63pass1.xml
+%% ID: o-p63pass1
+%% Type: valid
+%% Sections: 3.4 [63]
+'o-p63pass1'(suite) -> [];
+'o-p63pass1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p63pass1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p64pass1.xml
+%% ID: o-p64pass1
+%% Type: valid
+%% Sections: 3.4 [64]
+'o-p64pass1'(suite) -> [];
+'o-p64pass1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p64pass1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p68pass1.xml
+%% ID: o-p68pass1
+%% Type: valid
+%% Sections: 4.1 [68]
+'o-p68pass1'(suite) -> [];
+'o-p68pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p68pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p69pass1.xml
+%% ID: o-p69pass1
+%% Type: valid
+%% Sections: 4.1 [69]
+'o-p69pass1'(suite) -> [];
+'o-p69pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p69pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p70pass1.xml
+%% ID: o-p70pass1
+%% Type: valid
+%% Sections: 4.2 [70]
+'o-p70pass1'(suite) -> [];
+'o-p70pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p70pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p71pass1.xml
+%% ID: o-p71pass1
+%% Type: valid
+%% Sections: 4.2 [71]
+'o-p71pass1'(suite) -> [];
+'o-p71pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p71pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p72pass1.xml
+%% ID: o-p72pass1
+%% Type: valid
+%% Sections: 4.2 [72]
+'o-p72pass1'(suite) -> [];
+'o-p72pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p72pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p73pass1.xml
+%% ID: o-p73pass1
+%% Type: valid
+%% Sections: 4.2 [73]
+'o-p73pass1'(suite) -> [];
+'o-p73pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p76pass1.xml
+%% ID: o-p76pass1
+%% Type: valid
+%% Sections: 4.2.2 [76]
+'o-p76pass1'(suite) -> [];
+'o-p76pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p76pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p01pass1.xml
+%% ID: o-p01pass1
+%% Type: invalid
+%% Sections: 2.1 [1]
+'o-p01pass1'(suite) -> [];
+'o-p01pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p01pass3.xml
+%% ID: o-p01pass3
+%% Type: invalid
+%% Sections: 2.1 [1]
+'o-p01pass3'(suite) -> [];
+'o-p01pass3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01pass3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03pass1.xml
+%% ID: o-p03pass1
+%% Type: invalid
+%% Sections: 2.3 [3]
+'o-p03pass1'(suite) -> [];
+'o-p03pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p04pass1.xml
+%% ID: o-p04pass1
+%% Type: invalid
+%% Sections: 2.3 [4]
+'o-p04pass1'(suite) -> [];
+'o-p04pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p04pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p05pass1.xml
+%% ID: o-p05pass1
+%% Type: invalid
+%% Sections: 2.3 [5]
+'o-p05pass1'(suite) -> [];
+'o-p05pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p06fail1.xml
+%% ID: o-p06fail1
+%% Type: invalid
+%% Sections: 2.3 [6]
+'o-p06fail1'(suite) -> [];
+'o-p06fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p06fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p08fail1.xml
+%% ID: o-p08fail1
+%% Type: invalid
+%% Sections: 2.3 [8]
+'o-p08fail1'(suite) -> [];
+'o-p08fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p08fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p08fail2.xml
+%% ID: o-p08fail2
+%% Type: invalid
+%% Sections: 2.3 [8]
+'o-p08fail2'(suite) -> [];
+'o-p08fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p08fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p10pass1.xml
+%% ID: o-p10pass1
+%% Type: invalid
+%% Sections: 2.3 [10]
+'o-p10pass1'(suite) -> [];
+'o-p10pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p10pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p14pass1.xml
+%% ID: o-p14pass1
+%% Type: invalid
+%% Sections: 2.4 [14]
+'o-p14pass1'(suite) -> [];
+'o-p14pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p14pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p15pass1.xml
+%% ID: o-p15pass1
+%% Type: invalid
+%% Sections: 2.5 [15]
+'o-p15pass1'(suite) -> [];
+'o-p15pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p15pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p16pass1.xml
+%% ID: o-p16pass1
+%% Type: invalid
+%% Sections: 2.6 [16] [17]
+'o-p16pass1'(suite) -> [];
+'o-p16pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p16pass2.xml
+%% ID: o-p16pass2
+%% Type: invalid
+%% Sections: 2.6 [16]
+'o-p16pass2'(suite) -> [];
+'o-p16pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p16pass3.xml
+%% ID: o-p16pass3
+%% Type: invalid
+%% Sections: 2.6 [16]
+'o-p16pass3'(suite) -> [];
+'o-p16pass3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16pass3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p18pass1.xml
+%% ID: o-p18pass1
+%% Type: invalid
+%% Sections: 2.7 [18]
+'o-p18pass1'(suite) -> [];
+'o-p18pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p18pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p22pass1.xml
+%% ID: o-p22pass1
+%% Type: invalid
+%% Sections: 2.8 [22]
+'o-p22pass1'(suite) -> [];
+'o-p22pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p22pass2.xml
+%% ID: o-p22pass2
+%% Type: invalid
+%% Sections: 2.8 [22]
+'o-p22pass2'(suite) -> [];
+'o-p22pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p22pass3.xml
+%% ID: o-p22pass3
+%% Type: invalid
+%% Sections: 2.8 [22]
+'o-p22pass3'(suite) -> [];
+'o-p22pass3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p23pass1.xml
+%% ID: o-p23pass1
+%% Type: invalid
+%% Sections: 2.8 [23]
+'o-p23pass1'(suite) -> [];
+'o-p23pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p23pass2.xml
+%% ID: o-p23pass2
+%% Type: invalid
+%% Sections: 2.8 [23]
+'o-p23pass2'(suite) -> [];
+'o-p23pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p23pass3.xml
+%% ID: o-p23pass3
+%% Type: invalid
+%% Sections: 2.8 [23]
+'o-p23pass3'(suite) -> [];
+'o-p23pass3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23pass3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p23pass4.xml
+%% ID: o-p23pass4
+%% Type: invalid
+%% Sections: 2.8 [23]
+'o-p23pass4'(suite) -> [];
+'o-p23pass4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23pass4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p24pass1.xml
+%% ID: o-p24pass1
+%% Type: invalid
+%% Sections: 2.8 [24]
+'o-p24pass1'(suite) -> [];
+'o-p24pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p24pass2.xml
+%% ID: o-p24pass2
+%% Type: invalid
+%% Sections: 2.8 [24]
+'o-p24pass2'(suite) -> [];
+'o-p24pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p24pass3.xml
+%% ID: o-p24pass3
+%% Type: invalid
+%% Sections: 2.8 [24]
+'o-p24pass3'(suite) -> [];
+'o-p24pass3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24pass3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p24pass4.xml
+%% ID: o-p24pass4
+%% Type: invalid
+%% Sections: 2.8 [24]
+'o-p24pass4'(suite) -> [];
+'o-p24pass4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24pass4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p25pass1.xml
+%% ID: o-p25pass1
+%% Type: invalid
+%% Sections: 2.8 [25]
+'o-p25pass1'(suite) -> [];
+'o-p25pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p25pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p25pass2.xml
+%% ID: o-p25pass2
+%% Type: invalid
+%% Sections: 2.8 [25]
+'o-p25pass2'(suite) -> [];
+'o-p25pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p25pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p26pass1.xml
+%% ID: o-p26pass1
+%% Type: invalid
+%% Sections: 2.8 [26]
+'o-p26pass1'(suite) -> [];
+'o-p26pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p26pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p27pass1.xml
+%% ID: o-p27pass1
+%% Type: invalid
+%% Sections: 2.8 [27]
+'o-p27pass1'(suite) -> [];
+'o-p27pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p27pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p27pass2.xml
+%% ID: o-p27pass2
+%% Type: invalid
+%% Sections: 2.8 [27]
+'o-p27pass2'(suite) -> [];
+'o-p27pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p27pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p27pass3.xml
+%% ID: o-p27pass3
+%% Type: invalid
+%% Sections: 2.8 [27]
+'o-p27pass3'(suite) -> [];
+'o-p27pass3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p27pass3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p27pass4.xml
+%% ID: o-p27pass4
+%% Type: invalid
+%% Sections: 2.8 [27]
+'o-p27pass4'(suite) -> [];
+'o-p27pass4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p27pass4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p32pass1.xml
+%% ID: o-p32pass1
+%% Type: invalid
+%% Sections: 2.9 [32]
+'o-p32pass1'(suite) -> [];
+'o-p32pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p32pass2.xml
+%% ID: o-p32pass2
+%% Type: invalid
+%% Sections: 2.9 [32]
+'o-p32pass2'(suite) -> [];
+'o-p32pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p39pass1.xml
+%% ID: o-p39pass1
+%% Type: invalid
+%% Sections: 3 3.1 [39] [44]
+'o-p39pass1'(suite) -> [];
+'o-p39pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p39pass2.xml
+%% ID: o-p39pass2
+%% Type: invalid
+%% Sections: 3 3.1 [39] [43]
+'o-p39pass2'(suite) -> [];
+'o-p39pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p40pass1.xml
+%% ID: o-p40pass1
+%% Type: invalid
+%% Sections: 3.1 [40]
+'o-p40pass1'(suite) -> [];
+'o-p40pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p40pass2.xml
+%% ID: o-p40pass2
+%% Type: invalid
+%% Sections: 3.1 [40]
+'o-p40pass2'(suite) -> [];
+'o-p40pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p40pass3.xml
+%% ID: o-p40pass3
+%% Type: invalid
+%% Sections: 3.1 [40] [41]
+'o-p40pass3'(suite) -> [];
+'o-p40pass3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40pass3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p40pass4.xml
+%% ID: o-p40pass4
+%% Type: invalid
+%% Sections: 3.1 [40]
+'o-p40pass4'(suite) -> [];
+'o-p40pass4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40pass4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p41pass1.xml
+%% ID: o-p41pass1
+%% Type: invalid
+%% Sections: 3.1 [41]
+'o-p41pass1'(suite) -> [];
+'o-p41pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p41pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p41pass2.xml
+%% ID: o-p41pass2
+%% Type: invalid
+%% Sections: 3.1 [41]
+'o-p41pass2'(suite) -> [];
+'o-p41pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p41pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p42pass1.xml
+%% ID: o-p42pass1
+%% Type: invalid
+%% Sections: 3.1 [42]
+'o-p42pass1'(suite) -> [];
+'o-p42pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p42pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p42pass2.xml
+%% ID: o-p42pass2
+%% Type: invalid
+%% Sections: 3.1 [42]
+'o-p42pass2'(suite) -> [];
+'o-p42pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p42pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p44pass1.xml
+%% ID: o-p44pass1
+%% Type: invalid
+%% Sections: 3.1 [44]
+'o-p44pass1'(suite) -> [];
+'o-p44pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p44pass2.xml
+%% ID: o-p44pass2
+%% Type: invalid
+%% Sections: 3.1 [44]
+'o-p44pass2'(suite) -> [];
+'o-p44pass2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44pass2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p44pass3.xml
+%% ID: o-p44pass3
+%% Type: invalid
+%% Sections: 3.1 [44]
+'o-p44pass3'(suite) -> [];
+'o-p44pass3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44pass3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p44pass4.xml
+%% ID: o-p44pass4
+%% Type: invalid
+%% Sections: 3.1 [44]
+'o-p44pass4'(suite) -> [];
+'o-p44pass4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44pass4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p44pass5.xml
+%% ID: o-p44pass5
+%% Type: invalid
+%% Sections: 3.1 [44]
+'o-p44pass5'(suite) -> [];
+'o-p44pass5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44pass5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p66pass1.xml
+%% ID: o-p66pass1
+%% Type: invalid
+%% Sections: 4.1 [66]
+'o-p66pass1'(suite) -> [];
+'o-p66pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p74pass1.xml
+%% ID: o-p74pass1
+%% Type: invalid
+%% Sections: 4.2 [74]
+'o-p74pass1'(suite) -> [];
+'o-p74pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p74pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p75pass1.xml
+%% ID: o-p75pass1
+%% Type: invalid
+%% Sections: 4.2.2 [75]
+'o-p75pass1'(suite) -> [];
+'o-p75pass1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75pass1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: e2.xml
+%% ID: o-e2
+%% Type: invalid
+%% Sections: 3.3.1 [58] [59] Errata [E2]
+'o-e2'(suite) -> [];
+'o-e2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","e2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p01fail1.xml
+%% ID: o-p01fail1
+%% Type: not-wf
+%% Sections: 2.1 [1]
+'o-p01fail1'(suite) -> [];
+'o-p01fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p01fail2.xml
+%% ID: o-p01fail2
+%% Type: not-wf
+%% Sections: 2.1 [1]
+'o-p01fail2'(suite) -> [];
+'o-p01fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p01fail3.xml
+%% ID: o-p01fail3
+%% Type: not-wf
+%% Sections: 2.1 [1]
+'o-p01fail3'(suite) -> [];
+'o-p01fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01fail3.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_, <<"<bad/>", _/binary>>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p01fail4.xml
+%% ID: o-p01fail4
+%% Type: not-wf
+%% Sections: 2.1 [1]
+'o-p01fail4'(suite) -> [];
+'o-p01fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail1.xml
+%% ID: o-p02fail1
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail1'(suite) -> [];
+'o-p02fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail10.xml
+%% ID: o-p02fail10
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail10'(suite) -> [];
+'o-p02fail10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail11.xml
+%% ID: o-p02fail11
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail11'(suite) -> [];
+'o-p02fail11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail12.xml
+%% ID: o-p02fail12
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail12'(suite) -> [];
+'o-p02fail12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail13.xml
+%% ID: o-p02fail13
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail13'(suite) -> [];
+'o-p02fail13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail14.xml
+%% ID: o-p02fail14
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail14'(suite) -> [];
+'o-p02fail14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail15.xml
+%% ID: o-p02fail15
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail15'(suite) -> [];
+'o-p02fail15'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail15.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail16.xml
+%% ID: o-p02fail16
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail16'(suite) -> [];
+'o-p02fail16'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail16.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail17.xml
+%% ID: o-p02fail17
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail17'(suite) -> [];
+'o-p02fail17'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail17.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail18.xml
+%% ID: o-p02fail18
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail18'(suite) -> [];
+'o-p02fail18'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail18.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail19.xml
+%% ID: o-p02fail19
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail19'(suite) -> [];
+'o-p02fail19'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail19.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail2.xml
+%% ID: o-p02fail2
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail2'(suite) -> [];
+'o-p02fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail20.xml
+%% ID: o-p02fail20
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail20'(suite) -> [];
+'o-p02fail20'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail20.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail21.xml
+%% ID: o-p02fail21
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail21'(suite) -> [];
+'o-p02fail21'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail21.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail22.xml
+%% ID: o-p02fail22
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail22'(suite) -> [];
+'o-p02fail22'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail22.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail23.xml
+%% ID: o-p02fail23
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail23'(suite) -> [];
+'o-p02fail23'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail23.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail24.xml
+%% ID: o-p02fail24
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail24'(suite) -> [];
+'o-p02fail24'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail24.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail25.xml
+%% ID: o-p02fail25
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail25'(suite) -> [];
+'o-p02fail25'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail25.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail26.xml
+%% ID: o-p02fail26
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail26'(suite) -> [];
+'o-p02fail26'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail26.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail27.xml
+%% ID: o-p02fail27
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail27'(suite) -> [];
+'o-p02fail27'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail27.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail28.xml
+%% ID: o-p02fail28
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail28'(suite) -> [];
+'o-p02fail28'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail28.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail29.xml
+%% ID: o-p02fail29
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail29'(suite) -> [];
+'o-p02fail29'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail29.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail3.xml
+%% ID: o-p02fail3
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail3'(suite) -> [];
+'o-p02fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail30.xml
+%% ID: o-p02fail30
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail30'(suite) -> [];
+'o-p02fail30'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail30.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail31.xml
+%% ID: o-p02fail31
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail31'(suite) -> [];
+'o-p02fail31'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail31.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail4.xml
+%% ID: o-p02fail4
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail4'(suite) -> [];
+'o-p02fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail5.xml
+%% ID: o-p02fail5
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail5'(suite) -> [];
+'o-p02fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail6.xml
+%% ID: o-p02fail6
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail6'(suite) -> [];
+'o-p02fail6'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail6.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail7.xml
+%% ID: o-p02fail7
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail7'(suite) -> [];
+'o-p02fail7'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail7.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail8.xml
+%% ID: o-p02fail8
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail8'(suite) -> [];
+'o-p02fail8'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail8.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p02fail9.xml
+%% ID: o-p02fail9
+%% Type: not-wf
+%% Sections: 2.2 [2]
+'o-p02fail9'(suite) -> [];
+'o-p02fail9'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail9.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail1.xml
+%% ID: o-p03fail1
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail1'(suite) -> [];
+'o-p03fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail10.xml
+%% ID: o-p03fail10
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail10'(suite) -> [];
+'o-p03fail10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail11.xml
+%% ID: o-p03fail11
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail11'(suite) -> [];
+'o-p03fail11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail12.xml
+%% ID: o-p03fail12
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail12'(suite) -> [];
+'o-p03fail12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail13.xml
+%% ID: o-p03fail13
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail13'(suite) -> [];
+'o-p03fail13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail14.xml
+%% ID: o-p03fail14
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail14'(suite) -> [];
+'o-p03fail14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail15.xml
+%% ID: o-p03fail15
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail15'(suite) -> [];
+'o-p03fail15'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail15.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail16.xml
+%% ID: o-p03fail16
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail16'(suite) -> [];
+'o-p03fail16'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail16.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail17.xml
+%% ID: o-p03fail17
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail17'(suite) -> [];
+'o-p03fail17'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail17.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail18.xml
+%% ID: o-p03fail18
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail18'(suite) -> [];
+'o-p03fail18'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail18.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail19.xml
+%% ID: o-p03fail19
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail19'(suite) -> [];
+'o-p03fail19'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail19.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail2.xml
+%% ID: o-p03fail2
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail2'(suite) -> [];
+'o-p03fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail20.xml
+%% ID: o-p03fail20
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail20'(suite) -> [];
+'o-p03fail20'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail20.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail21.xml
+%% ID: o-p03fail21
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail21'(suite) -> [];
+'o-p03fail21'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail21.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail22.xml
+%% ID: o-p03fail22
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail22'(suite) -> [];
+'o-p03fail22'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail22.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail23.xml
+%% ID: o-p03fail23
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail23'(suite) -> [];
+'o-p03fail23'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail23.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail24.xml
+%% ID: o-p03fail24
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail24'(suite) -> [];
+'o-p03fail24'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail24.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail25.xml
+%% ID: o-p03fail25
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail25'(suite) -> [];
+'o-p03fail25'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail25.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail26.xml
+%% ID: o-p03fail26
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail26'(suite) -> [];
+'o-p03fail26'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail26.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail27.xml
+%% ID: o-p03fail27
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail27'(suite) -> [];
+'o-p03fail27'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail27.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail28.xml
+%% ID: o-p03fail28
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail28'(suite) -> [];
+'o-p03fail28'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail28.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail29.xml
+%% ID: o-p03fail29
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail29'(suite) -> [];
+'o-p03fail29'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail29.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail3.xml
+%% ID: o-p03fail3
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail3'(suite) -> [];
+'o-p03fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail4.xml
+%% ID: o-p03fail4
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail4'(suite) -> [];
+'o-p03fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail5.xml
+%% ID: o-p03fail5
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail5'(suite) -> [];
+'o-p03fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail7.xml
+%% ID: o-p03fail7
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail7'(suite) -> [];
+'o-p03fail7'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail7.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail8.xml
+%% ID: o-p03fail8
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail8'(suite) -> [];
+'o-p03fail8'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail8.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p03fail9.xml
+%% ID: o-p03fail9
+%% Type: not-wf
+%% Sections: 2.3 [3]
+'o-p03fail9'(suite) -> [];
+'o-p03fail9'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail9.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p04fail1.xml
+%% ID: o-p04fail1
+%% Type: not-wf
+%% Sections: 2.3 [4]
+'o-p04fail1'(suite) -> [];
+'o-p04fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p04fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p04fail2.xml
+%% ID: o-p04fail2
+%% Type: not-wf
+%% Sections: 2.3 [4]
+'o-p04fail2'(suite) -> [];
+'o-p04fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p04fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p04fail3.xml
+%% ID: o-p04fail3
+%% Type: not-wf
+%% Sections: 2.3 [4]
+'o-p04fail3'(suite) -> [];
+'o-p04fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p04fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p05fail1.xml
+%% ID: o-p05fail1
+%% Type: not-wf
+%% Sections: 2.3 [5]
+'o-p05fail1'(suite) -> [];
+'o-p05fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p05fail2.xml
+%% ID: o-p05fail2
+%% Type: not-wf
+%% Sections: 2.3 [5]
+'o-p05fail2'(suite) -> [];
+'o-p05fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p05fail3.xml
+%% ID: o-p05fail3
+%% Type: not-wf
+%% Sections: 2.3 [5]
+'o-p05fail3'(suite) -> [];
+'o-p05fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p05fail4.xml
+%% ID: o-p05fail4
+%% Type: not-wf
+%% Sections: 2.3 [5]
+'o-p05fail4'(suite) -> [];
+'o-p05fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p05fail5.xml
+%% ID: o-p05fail5
+%% Type: not-wf
+%% Sections: 2.3 [5]
+'o-p05fail5'(suite) -> [];
+'o-p05fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p09fail1.xml
+%% ID: o-p09fail1
+%% Type: not-wf
+%% Sections: 2.3 [9]
+'o-p09fail1'(suite) -> [];
+'o-p09fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p09fail2.xml
+%% ID: o-p09fail2
+%% Type: not-wf
+%% Sections: 2.3 [9]
+'o-p09fail2'(suite) -> [];
+'o-p09fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p09fail3.xml
+%% ID: o-p09fail3
+%% Type: not-wf
+%% Sections: 2.3 [9]
+'o-p09fail3'(suite) -> [];
+'o-p09fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p09fail4.xml
+%% ID: o-p09fail4
+%% Type: not-wf
+%% Sections: 2.3 [9]
+'o-p09fail4'(suite) -> [];
+'o-p09fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p09fail5.xml
+%% ID: o-p09fail5
+%% Type: not-wf
+%% Sections: 2.3 [9]
+'o-p09fail5'(suite) -> [];
+'o-p09fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p10fail1.xml
+%% ID: o-p10fail1
+%% Type: not-wf
+%% Sections: 2.3 [10]
+'o-p10fail1'(suite) -> [];
+'o-p10fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p10fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p10fail2.xml
+%% ID: o-p10fail2
+%% Type: not-wf
+%% Sections: 2.3 [10]
+'o-p10fail2'(suite) -> [];
+'o-p10fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p10fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p10fail3.xml
+%% ID: o-p10fail3
+%% Type: not-wf
+%% Sections: 2.3 [10]
+'o-p10fail3'(suite) -> [];
+'o-p10fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p10fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p11fail1.xml
+%% ID: o-p11fail1
+%% Type: not-wf
+%% Sections: 2.3 [11]
+'o-p11fail1'(suite) -> [];
+'o-p11fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p11fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p11fail2.xml
+%% ID: o-p11fail2
+%% Type: not-wf
+%% Sections: 2.3 [11]
+'o-p11fail2'(suite) -> [];
+'o-p11fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p11fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p12fail1.xml
+%% ID: o-p12fail1
+%% Type: not-wf
+%% Sections: 2.3 [12]
+'o-p12fail1'(suite) -> [];
+'o-p12fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p12fail2.xml
+%% ID: o-p12fail2
+%% Type: not-wf
+%% Sections: 2.3 [12]
+'o-p12fail2'(suite) -> [];
+'o-p12fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p12fail3.xml
+%% ID: o-p12fail3
+%% Type: not-wf
+%% Sections: 2.3 [12]
+'o-p12fail3'(suite) -> [];
+'o-p12fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p12fail4.xml
+%% ID: o-p12fail4
+%% Type: not-wf
+%% Sections: 2.3 [12]
+'o-p12fail4'(suite) -> [];
+'o-p12fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p12fail5.xml
+%% ID: o-p12fail5
+%% Type: not-wf
+%% Sections: 2.3 [12]
+'o-p12fail5'(suite) -> [];
+'o-p12fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p12fail6.xml
+%% ID: o-p12fail6
+%% Type: not-wf
+%% Sections: 2.3 [12]
+'o-p12fail6'(suite) -> [];
+'o-p12fail6'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail6.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p12fail7.xml
+%% ID: o-p12fail7
+%% Type: not-wf
+%% Sections: 2.3 [13]
+'o-p12fail7'(suite) -> [];
+'o-p12fail7'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail7.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p14fail1.xml
+%% ID: o-p14fail1
+%% Type: not-wf
+%% Sections: 2.4 [14]
+'o-p14fail1'(suite) -> [];
+'o-p14fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p14fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p14fail2.xml
+%% ID: o-p14fail2
+%% Type: not-wf
+%% Sections: 2.4 [14]
+'o-p14fail2'(suite) -> [];
+'o-p14fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p14fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p14fail3.xml
+%% ID: o-p14fail3
+%% Type: not-wf
+%% Sections: 2.4 [14]
+'o-p14fail3'(suite) -> [];
+'o-p14fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p14fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p15fail1.xml
+%% ID: o-p15fail1
+%% Type: not-wf
+%% Sections: 2.5 [15]
+'o-p15fail1'(suite) -> [];
+'o-p15fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p15fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p15fail2.xml
+%% ID: o-p15fail2
+%% Type: not-wf
+%% Sections: 2.5 [15]
+'o-p15fail2'(suite) -> [];
+'o-p15fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p15fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p15fail3.xml
+%% ID: o-p15fail3
+%% Type: not-wf
+%% Sections: 2.5 [15]
+'o-p15fail3'(suite) -> [];
+'o-p15fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p15fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p16fail1.xml
+%% ID: o-p16fail1
+%% Type: not-wf
+%% Sections: 2.6 [16]
+'o-p16fail1'(suite) -> [];
+'o-p16fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p16fail2.xml
+%% ID: o-p16fail2
+%% Type: not-wf
+%% Sections: 2.6 [16]
+'o-p16fail2'(suite) -> [];
+'o-p16fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p16fail3.xml
+%% ID: o-p16fail3
+%% Type: not-wf
+%% Sections: 2.6 [16]
+'o-p16fail3'(suite) -> [];
+'o-p16fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p18fail1.xml
+%% ID: o-p18fail1
+%% Type: not-wf
+%% Sections: 2.7 [18]
+'o-p18fail1'(suite) -> [];
+'o-p18fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p18fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p18fail2.xml
+%% ID: o-p18fail2
+%% Type: not-wf
+%% Sections: 2.7 [18]
+'o-p18fail2'(suite) -> [];
+'o-p18fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p18fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p18fail3.xml
+%% ID: o-p18fail3
+%% Type: not-wf
+%% Sections: 2.7 [18]
+'o-p18fail3'(suite) -> [];
+'o-p18fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p18fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p22fail1.xml
+%% ID: o-p22fail1
+%% Type: not-wf
+%% Sections: 2.8 [22]
+'o-p22fail1'(suite) -> [];
+'o-p22fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p22fail2.xml
+%% ID: o-p22fail2
+%% Type: not-wf
+%% Sections: 2.8 [22]
+'o-p22fail2'(suite) -> [];
+'o-p22fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p23fail1.xml
+%% ID: o-p23fail1
+%% Type: not-wf
+%% Sections: 2.8 [23]
+'o-p23fail1'(suite) -> [];
+'o-p23fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p23fail2.xml
+%% ID: o-p23fail2
+%% Type: not-wf
+%% Sections: 2.8 [23]
+'o-p23fail2'(suite) -> [];
+'o-p23fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p23fail3.xml
+%% ID: o-p23fail3
+%% Type: not-wf
+%% Sections: 2.8 [23]
+'o-p23fail3'(suite) -> [];
+'o-p23fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p23fail4.xml
+%% ID: o-p23fail4
+%% Type: not-wf
+%% Sections: 2.8 [23]
+'o-p23fail4'(suite) -> [];
+'o-p23fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p23fail5.xml
+%% ID: o-p23fail5
+%% Type: not-wf
+%% Sections: 2.8 [23]
+'o-p23fail5'(suite) -> [];
+'o-p23fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p24fail1.xml
+%% ID: o-p24fail1
+%% Type: not-wf
+%% Sections: 2.8 [24]
+'o-p24fail1'(suite) -> [];
+'o-p24fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p24fail2.xml
+%% ID: o-p24fail2
+%% Type: not-wf
+%% Sections: 2.8 [24]
+'o-p24fail2'(suite) -> [];
+'o-p24fail2'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24fail2.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p25fail1.xml
+%% ID: o-p25fail1
+%% Type: not-wf
+%% Sections: 2.8 [25]
+'o-p25fail1'(suite) -> [];
+'o-p25fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p25fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p26fail1.xml
+%% ID: o-p26fail1
+%% Type: not-wf
+%% Sections: 2.8 [26]
+'o-p26fail1'(suite) -> [];
+'o-p26fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p26fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p26fail2.xml
+%% ID: o-p26fail2
+%% Type: not-wf
+%% Sections: 2.8 [26]
+'o-p26fail2'(suite) -> [];
+'o-p26fail2'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p26fail2.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p27fail1.xml
+%% ID: o-p27fail1
+%% Type: not-wf
+%% Sections: 2.8 [27]
+'o-p27fail1'(suite) -> [];
+'o-p27fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p27fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p28fail1.xml
+%% ID: o-p28fail1
+%% Type: not-wf
+%% Sections: 2.8 [28]
+'o-p28fail1'(suite) -> [];
+'o-p28fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p28fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p29fail1.xml
+%% ID: o-p29fail1
+%% Type: not-wf
+%% Sections: 2.8 [29]
+'o-p29fail1'(suite) -> [];
+'o-p29fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p29fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p30fail1.xml
+%% ID: o-p30fail1
+%% Type: not-wf
+%% Sections: 2.8 [30]
+'o-p30fail1'(suite) -> [];
+'o-p30fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p30fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p31fail1.xml
+%% ID: o-p31fail1
+%% Type: not-wf
+%% Sections: 2.8 [31]
+'o-p31fail1'(suite) -> [];
+'o-p31fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p31fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p32fail1.xml
+%% ID: o-p32fail1
+%% Type: not-wf
+%% Sections: 2.9 [32]
+'o-p32fail1'(suite) -> [];
+'o-p32fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p32fail2.xml
+%% ID: o-p32fail2
+%% Type: not-wf
+%% Sections: 2.9 [32]
+'o-p32fail2'(suite) -> [];
+'o-p32fail2'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32fail2.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p32fail3.xml
+%% ID: o-p32fail3
+%% Type: not-wf
+%% Sections: 2.9 [32]
+'o-p32fail3'(suite) -> [];
+'o-p32fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p32fail4.xml
+%% ID: o-p32fail4
+%% Type: not-wf
+%% Sections: 2.9 [32]
+'o-p32fail4'(suite) -> [];
+'o-p32fail4'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32fail4.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p32fail5.xml
+%% ID: o-p32fail5
+%% Type: not-wf
+%% Sections: 2.9 [32]
+'o-p32fail5'(suite) -> [];
+'o-p32fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p39fail1.xml
+%% ID: o-p39fail1
+%% Type: not-wf
+%% Sections: 3 [39]
+'o-p39fail1'(suite) -> [];
+'o-p39fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p39fail2.xml
+%% ID: o-p39fail2
+%% Type: not-wf
+%% Sections: 3 [39]
+'o-p39fail2'(suite) -> [];
+'o-p39fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p39fail3.xml
+%% ID: o-p39fail3
+%% Type: not-wf
+%% Sections: 3 [39]
+'o-p39fail3'(suite) -> [];
+'o-p39fail3'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39fail3.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p39fail4.xml
+%% ID: o-p39fail4
+%% Type: not-wf
+%% Sections: 2.8 [23]
+'o-p39fail4'(suite) -> [];
+'o-p39fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p39fail5.xml
+%% ID: o-p39fail5
+%% Type: not-wf
+%% Sections: 2.8 [23]
+'o-p39fail5'(suite) -> [];
+'o-p39fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p40fail1.xml
+%% ID: o-p40fail1
+%% Type: not-wf
+%% Sections: 3.1 [40]
+'o-p40fail1'(suite) -> [];
+'o-p40fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p40fail2.xml
+%% ID: o-p40fail2
+%% Type: not-wf
+%% Sections: 3.1 [40]
+'o-p40fail2'(suite) -> [];
+'o-p40fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p40fail3.xml
+%% ID: o-p40fail3
+%% Type: not-wf
+%% Sections: 3.1 [40]
+'o-p40fail3'(suite) -> [];
+'o-p40fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p40fail4.xml
+%% ID: o-p40fail4
+%% Type: not-wf
+%% Sections: 3.1 [40]
+'o-p40fail4'(suite) -> [];
+'o-p40fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p41fail1.xml
+%% ID: o-p41fail1
+%% Type: not-wf
+%% Sections: 3.1 [41]
+'o-p41fail1'(suite) -> [];
+'o-p41fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p41fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p41fail2.xml
+%% ID: o-p41fail2
+%% Type: not-wf
+%% Sections: 3.1 [41]
+'o-p41fail2'(suite) -> [];
+'o-p41fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p41fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p41fail3.xml
+%% ID: o-p41fail3
+%% Type: not-wf
+%% Sections: 3.1 [41]
+'o-p41fail3'(suite) -> [];
+'o-p41fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p41fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p42fail1.xml
+%% ID: o-p42fail1
+%% Type: not-wf
+%% Sections: 3.1 [42]
+'o-p42fail1'(suite) -> [];
+'o-p42fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p42fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p42fail2.xml
+%% ID: o-p42fail2
+%% Type: not-wf
+%% Sections: 3.1 [42]
+'o-p42fail2'(suite) -> [];
+'o-p42fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p42fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p42fail3.xml
+%% ID: o-p42fail3
+%% Type: not-wf
+%% Sections: 3.1 [42]
+'o-p42fail3'(suite) -> [];
+'o-p42fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p42fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p43fail1.xml
+%% ID: o-p43fail1
+%% Type: not-wf
+%% Sections: 3.1 [43]
+'o-p43fail1'(suite) -> [];
+'o-p43fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p43fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p43fail2.xml
+%% ID: o-p43fail2
+%% Type: not-wf
+%% Sections: 3.1 [43]
+'o-p43fail2'(suite) -> [];
+'o-p43fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p43fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p43fail3.xml
+%% ID: o-p43fail3
+%% Type: not-wf
+%% Sections: 3.1 [43]
+'o-p43fail3'(suite) -> [];
+'o-p43fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p43fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p44fail1.xml
+%% ID: o-p44fail1
+%% Type: not-wf
+%% Sections: 3.1 [44]
+'o-p44fail1'(suite) -> [];
+'o-p44fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p44fail2.xml
+%% ID: o-p44fail2
+%% Type: not-wf
+%% Sections: 3.1 [44]
+'o-p44fail2'(suite) -> [];
+'o-p44fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p44fail3.xml
+%% ID: o-p44fail3
+%% Type: not-wf
+%% Sections: 3.1 [44]
+'o-p44fail3'(suite) -> [];
+'o-p44fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p44fail4.xml
+%% ID: o-p44fail4
+%% Type: not-wf
+%% Sections: 3.1 [44]
+'o-p44fail4'(suite) -> [];
+'o-p44fail4'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44fail4.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p44fail5.xml
+%% ID: o-p44fail5
+%% Type: not-wf
+%% Sections: 3.1 [44]
+'o-p44fail5'(suite) -> [];
+'o-p44fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p45fail1.xml
+%% ID: o-p45fail1
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'o-p45fail1'(suite) -> [];
+'o-p45fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p45fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p45fail2.xml
+%% ID: o-p45fail2
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'o-p45fail2'(suite) -> [];
+'o-p45fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p45fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p45fail3.xml
+%% ID: o-p45fail3
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'o-p45fail3'(suite) -> [];
+'o-p45fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p45fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p45fail4.xml
+%% ID: o-p45fail4
+%% Type: not-wf
+%% Sections: 3.2 [45]
+'o-p45fail4'(suite) -> [];
+'o-p45fail4'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p45fail4.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p46fail1.xml
+%% ID: o-p46fail1
+%% Type: not-wf
+%% Sections: 3.2 [46]
+'o-p46fail1'(suite) -> [];
+'o-p46fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p46fail2.xml
+%% ID: o-p46fail2
+%% Type: not-wf
+%% Sections: 3.2 [46]
+'o-p46fail2'(suite) -> [];
+'o-p46fail2'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail2.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p46fail3.xml
+%% ID: o-p46fail3
+%% Type: not-wf
+%% Sections: 3.2 [46]
+'o-p46fail3'(suite) -> [];
+'o-p46fail3'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail3.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p46fail4.xml
+%% ID: o-p46fail4
+%% Type: not-wf
+%% Sections: 3.2 [46]
+'o-p46fail4'(suite) -> [];
+'o-p46fail4'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail4.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p46fail5.xml
+%% ID: o-p46fail5
+%% Type: not-wf
+%% Sections: 3.2 [46]
+'o-p46fail5'(suite) -> [];
+'o-p46fail5'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail5.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p46fail6.xml
+%% ID: o-p46fail6
+%% Type: not-wf
+%% Sections: 3.2 [46]
+'o-p46fail6'(suite) -> [];
+'o-p46fail6'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail6.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p47fail1.xml
+%% ID: o-p47fail1
+%% Type: not-wf
+%% Sections: 3.2.1 [47]
+'o-p47fail1'(suite) -> [];
+'o-p47fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p47fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p47fail2.xml
+%% ID: o-p47fail2
+%% Type: not-wf
+%% Sections: 3.2.1 [47]
+'o-p47fail2'(suite) -> [];
+'o-p47fail2'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p47fail2.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p47fail3.xml
+%% ID: o-p47fail3
+%% Type: not-wf
+%% Sections: 3.2.1 [47]
+'o-p47fail3'(suite) -> [];
+'o-p47fail3'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p47fail3.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p47fail4.xml
+%% ID: o-p47fail4
+%% Type: not-wf
+%% Sections: 3.2.1 [47]
+'o-p47fail4'(suite) -> [];
+'o-p47fail4'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p47fail4.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p48fail1.xml
+%% ID: o-p48fail1
+%% Type: not-wf
+%% Sections: 3.2.1 [48]
+'o-p48fail1'(suite) -> [];
+'o-p48fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p48fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p48fail2.xml
+%% ID: o-p48fail2
+%% Type: not-wf
+%% Sections: 3.2.1 [48]
+'o-p48fail2'(suite) -> [];
+'o-p48fail2'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p48fail2.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p49fail1.xml
+%% ID: o-p49fail1
+%% Type: not-wf
+%% Sections: 3.2.1 [49]
+'o-p49fail1'(suite) -> [];
+'o-p49fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p49fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p50fail1.xml
+%% ID: o-p50fail1
+%% Type: not-wf
+%% Sections: 3.2.1 [50]
+'o-p50fail1'(suite) -> [];
+'o-p50fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p50fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p51fail1.xml
+%% ID: o-p51fail1
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'o-p51fail1'(suite) -> [];
+'o-p51fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p51fail2.xml
+%% ID: o-p51fail2
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'o-p51fail2'(suite) -> [];
+'o-p51fail2'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail2.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p51fail3.xml
+%% ID: o-p51fail3
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'o-p51fail3'(suite) -> [];
+'o-p51fail3'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail3.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p51fail4.xml
+%% ID: o-p51fail4
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'o-p51fail4'(suite) -> [];
+'o-p51fail4'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail4.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p51fail5.xml
+%% ID: o-p51fail5
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'o-p51fail5'(suite) -> [];
+'o-p51fail5'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail5.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p51fail6.xml
+%% ID: o-p51fail6
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'o-p51fail6'(suite) -> [];
+'o-p51fail6'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail6.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p51fail7.xml
+%% ID: o-p51fail7
+%% Type: not-wf
+%% Sections: 3.2.2 [51]
+'o-p51fail7'(suite) -> [];
+'o-p51fail7'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail7.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p52fail1.xml
+%% ID: o-p52fail1
+%% Type: not-wf
+%% Sections: 3.3 [52]
+'o-p52fail1'(suite) -> [];
+'o-p52fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p52fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p52fail2.xml
+%% ID: o-p52fail2
+%% Type: not-wf
+%% Sections: 3.3 [52]
+'o-p52fail2'(suite) -> [];
+'o-p52fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p52fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p53fail1.xml
+%% ID: o-p53fail1
+%% Type: not-wf
+%% Sections: 3.3 [53]
+'o-p53fail1'(suite) -> [];
+'o-p53fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p53fail2.xml
+%% ID: o-p53fail2
+%% Type: not-wf
+%% Sections: 3.3 [53]
+'o-p53fail2'(suite) -> [];
+'o-p53fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p53fail3.xml
+%% ID: o-p53fail3
+%% Type: not-wf
+%% Sections: 3.3 [53]
+'o-p53fail3'(suite) -> [];
+'o-p53fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p53fail4.xml
+%% ID: o-p53fail4
+%% Type: not-wf
+%% Sections: 3.3 [53]
+'o-p53fail4'(suite) -> [];
+'o-p53fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p53fail5.xml
+%% ID: o-p53fail5
+%% Type: not-wf
+%% Sections: 3.3 [53]
+'o-p53fail5'(suite) -> [];
+'o-p53fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p54fail1.xml
+%% ID: o-p54fail1
+%% Type: not-wf
+%% Sections: 3.3.1 [54]
+'o-p54fail1'(suite) -> [];
+'o-p54fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p54fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p55fail1.xml
+%% ID: o-p55fail1
+%% Type: not-wf
+%% Sections: 3.3.1 [55]
+'o-p55fail1'(suite) -> [];
+'o-p55fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p55fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p56fail1.xml
+%% ID: o-p56fail1
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'o-p56fail1'(suite) -> [];
+'o-p56fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p56fail2.xml
+%% ID: o-p56fail2
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'o-p56fail2'(suite) -> [];
+'o-p56fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p56fail3.xml
+%% ID: o-p56fail3
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'o-p56fail3'(suite) -> [];
+'o-p56fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p56fail4.xml
+%% ID: o-p56fail4
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'o-p56fail4'(suite) -> [];
+'o-p56fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p56fail5.xml
+%% ID: o-p56fail5
+%% Type: not-wf
+%% Sections: 3.3.1 [56]
+'o-p56fail5'(suite) -> [];
+'o-p56fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p57fail1.xml
+%% ID: o-p57fail1
+%% Type: not-wf
+%% Sections: 3.3.1 [57]
+'o-p57fail1'(suite) -> [];
+'o-p57fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p57fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p58fail1.xml
+%% ID: o-p58fail1
+%% Type: not-wf
+%% Sections: 3.3.1 [58]
+'o-p58fail1'(suite) -> [];
+'o-p58fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p58fail2.xml
+%% ID: o-p58fail2
+%% Type: not-wf
+%% Sections: 3.3.1 [58]
+'o-p58fail2'(suite) -> [];
+'o-p58fail2'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail2.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p58fail3.xml
+%% ID: o-p58fail3
+%% Type: not-wf
+%% Sections: 3.3.1 [58]
+'o-p58fail3'(suite) -> [];
+'o-p58fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p58fail4.xml
+%% ID: o-p58fail4
+%% Type: not-wf
+%% Sections: 3.3.1 [58]
+'o-p58fail4'(suite) -> [];
+'o-p58fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p58fail5.xml
+%% ID: o-p58fail5
+%% Type: not-wf
+%% Sections: 3.3.1 [58]
+'o-p58fail5'(suite) -> [];
+'o-p58fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p58fail6.xml
+%% ID: o-p58fail6
+%% Type: not-wf
+%% Sections: 3.3.1 [58]
+'o-p58fail6'(suite) -> [];
+'o-p58fail6'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail6.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p58fail7.xml
+%% ID: o-p58fail7
+%% Type: not-wf
+%% Sections: 3.3.1 [58]
+'o-p58fail7'(suite) -> [];
+'o-p58fail7'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail7.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p58fail8.xml
+%% ID: o-p58fail8
+%% Type: not-wf
+%% Sections: 3.3.1 [58]
+'o-p58fail8'(suite) -> [];
+'o-p58fail8'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail8.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p59fail1.xml
+%% ID: o-p59fail1
+%% Type: not-wf
+%% Sections: 3.3.1 [59]
+'o-p59fail1'(suite) -> [];
+'o-p59fail1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p59fail1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p59fail2.xml
+%% ID: o-p59fail2
+%% Type: not-wf
+%% Sections: 3.3.1 [59]
+'o-p59fail2'(suite) -> [];
+'o-p59fail2'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p59fail2.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p59fail3.xml
+%% ID: o-p59fail3
+%% Type: not-wf
+%% Sections: 3.3.1 [59]
+'o-p59fail3'(suite) -> [];
+'o-p59fail3'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p59fail3.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p60fail1.xml
+%% ID: o-p60fail1
+%% Type: not-wf
+%% Sections: 3.3.2 [60]
+'o-p60fail1'(suite) -> [];
+'o-p60fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p60fail2.xml
+%% ID: o-p60fail2
+%% Type: not-wf
+%% Sections: 3.3.2 [60]
+'o-p60fail2'(suite) -> [];
+'o-p60fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p60fail3.xml
+%% ID: o-p60fail3
+%% Type: not-wf
+%% Sections: 3.3.2 [60]
+'o-p60fail3'(suite) -> [];
+'o-p60fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p60fail4.xml
+%% ID: o-p60fail4
+%% Type: not-wf
+%% Sections: 3.3.2 [60]
+'o-p60fail4'(suite) -> [];
+'o-p60fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p60fail5.xml
+%% ID: o-p60fail5
+%% Type: not-wf
+%% Sections: 3.3.2 [60]
+'o-p60fail5'(suite) -> [];
+'o-p60fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p61fail1.xml
+%% ID: o-p61fail1
+%% Type: not-wf
+%% Sections: 3.4 [61]
+'o-p61fail1'(suite) -> [];
+'o-p61fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p61fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p62fail1.xml
+%% ID: o-p62fail1
+%% Type: not-wf
+%% Sections: 3.4 [62]
+'o-p62fail1'(suite) -> [];
+'o-p62fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p62fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p62fail2.xml
+%% ID: o-p62fail2
+%% Type: not-wf
+%% Sections: 3.4 [62]
+'o-p62fail2'(suite) -> [];
+'o-p62fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p62fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p63fail1.xml
+%% ID: o-p63fail1
+%% Type: not-wf
+%% Sections: 3.4 [63]
+'o-p63fail1'(suite) -> [];
+'o-p63fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p63fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p63fail2.xml
+%% ID: o-p63fail2
+%% Type: not-wf
+%% Sections: 3.4 [63]
+'o-p63fail2'(suite) -> [];
+'o-p63fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p63fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p64fail1.xml
+%% ID: o-p64fail1
+%% Type: not-wf
+%% Sections: 3.4 [64]
+'o-p64fail1'(suite) -> [];
+'o-p64fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p64fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p64fail2.xml
+%% ID: o-p64fail2
+%% Type: not-wf
+%% Sections: 3.4 [64]
+'o-p64fail2'(suite) -> [];
+'o-p64fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p64fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p66fail1.xml
+%% ID: o-p66fail1
+%% Type: not-wf
+%% Sections: 4.1 [66]
+'o-p66fail1'(suite) -> [];
+'o-p66fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p66fail2.xml
+%% ID: o-p66fail2
+%% Type: not-wf
+%% Sections: 4.1 [66]
+'o-p66fail2'(suite) -> [];
+'o-p66fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p66fail3.xml
+%% ID: o-p66fail3
+%% Type: not-wf
+%% Sections: 4.1 [66]
+'o-p66fail3'(suite) -> [];
+'o-p66fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p66fail4.xml
+%% ID: o-p66fail4
+%% Type: not-wf
+%% Sections: 4.1 [66]
+'o-p66fail4'(suite) -> [];
+'o-p66fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p66fail5.xml
+%% ID: o-p66fail5
+%% Type: not-wf
+%% Sections: 4.1 [66]
+'o-p66fail5'(suite) -> [];
+'o-p66fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p66fail6.xml
+%% ID: o-p66fail6
+%% Type: not-wf
+%% Sections: 4.1 [66]
+'o-p66fail6'(suite) -> [];
+'o-p66fail6'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail6.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p68fail1.xml
+%% ID: o-p68fail1
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'o-p68fail1'(suite) -> [];
+'o-p68fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p68fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p68fail2.xml
+%% ID: o-p68fail2
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'o-p68fail2'(suite) -> [];
+'o-p68fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p68fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p68fail3.xml
+%% ID: o-p68fail3
+%% Type: not-wf
+%% Sections: 4.1 [68]
+'o-p68fail3'(suite) -> [];
+'o-p68fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p68fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p69fail1.xml
+%% ID: o-p69fail1
+%% Type: not-wf
+%% Sections: 4.1 [69]
+'o-p69fail1'(suite) -> [];
+'o-p69fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p69fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p69fail2.xml
+%% ID: o-p69fail2
+%% Type: not-wf
+%% Sections: 4.1 [69]
+'o-p69fail2'(suite) -> [];
+'o-p69fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p69fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p69fail3.xml
+%% ID: o-p69fail3
+%% Type: not-wf
+%% Sections: 4.1 [69]
+'o-p69fail3'(suite) -> [];
+'o-p69fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p69fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p70fail1.xml
+%% ID: o-p70fail1
+%% Type: not-wf
+%% Sections: 4.2 [70]
+'o-p70fail1'(suite) -> [];
+'o-p70fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p70fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p71fail1.xml
+%% ID: o-p71fail1
+%% Type: not-wf
+%% Sections: 4.2 [71]
+'o-p71fail1'(suite) -> [];
+'o-p71fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p71fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p71fail2.xml
+%% ID: o-p71fail2
+%% Type: not-wf
+%% Sections: 4.2 [71]
+'o-p71fail2'(suite) -> [];
+'o-p71fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p71fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p71fail3.xml
+%% ID: o-p71fail3
+%% Type: not-wf
+%% Sections: 4.2 [71]
+'o-p71fail3'(suite) -> [];
+'o-p71fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p71fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p71fail4.xml
+%% ID: o-p71fail4
+%% Type: not-wf
+%% Sections: 4.2 [71]
+'o-p71fail4'(suite) -> [];
+'o-p71fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p71fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p72fail1.xml
+%% ID: o-p72fail1
+%% Type: not-wf
+%% Sections: 4.2 [72]
+'o-p72fail1'(suite) -> [];
+'o-p72fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p72fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p72fail2.xml
+%% ID: o-p72fail2
+%% Type: not-wf
+%% Sections: 4.2 [72]
+'o-p72fail2'(suite) -> [];
+'o-p72fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p72fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p72fail3.xml
+%% ID: o-p72fail3
+%% Type: not-wf
+%% Sections: 4.2 [72]
+'o-p72fail3'(suite) -> [];
+'o-p72fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p72fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p72fail4.xml
+%% ID: o-p72fail4
+%% Type: not-wf
+%% Sections: 4.2 [72]
+'o-p72fail4'(suite) -> [];
+'o-p72fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p72fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p73fail1.xml
+%% ID: o-p73fail1
+%% Type: not-wf
+%% Sections: 4.2 [73]
+'o-p73fail1'(suite) -> [];
+'o-p73fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p73fail2.xml
+%% ID: o-p73fail2
+%% Type: not-wf
+%% Sections: 4.2 [73]
+'o-p73fail2'(suite) -> [];
+'o-p73fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p73fail3.xml
+%% ID: o-p73fail3
+%% Type: not-wf
+%% Sections: 4.2 [73]
+'o-p73fail3'(suite) -> [];
+'o-p73fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p73fail4.xml
+%% ID: o-p73fail4
+%% Type: not-wf
+%% Sections: 4.2 [73]
+'o-p73fail4'(suite) -> [];
+'o-p73fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p73fail5.xml
+%% ID: o-p73fail5
+%% Type: not-wf
+%% Sections: 4.2 [73]
+'o-p73fail5'(suite) -> [];
+'o-p73fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p74fail1.xml
+%% ID: o-p74fail1
+%% Type: not-wf
+%% Sections: 4.2 [74]
+'o-p74fail1'(suite) -> [];
+'o-p74fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p74fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p74fail2.xml
+%% ID: o-p74fail2
+%% Type: not-wf
+%% Sections: 4.2 [74]
+'o-p74fail2'(suite) -> [];
+'o-p74fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p74fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p74fail3.xml
+%% ID: o-p74fail3
+%% Type: not-wf
+%% Sections: 4.2 [74]
+'o-p74fail3'(suite) -> [];
+'o-p74fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p74fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p75fail1.xml
+%% ID: o-p75fail1
+%% Type: not-wf
+%% Sections: 4.2.2 [75]
+'o-p75fail1'(suite) -> [];
+'o-p75fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p75fail2.xml
+%% ID: o-p75fail2
+%% Type: not-wf
+%% Sections: 4.2.2 [75]
+'o-p75fail2'(suite) -> [];
+'o-p75fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p75fail3.xml
+%% ID: o-p75fail3
+%% Type: not-wf
+%% Sections: 4.2.2 [75]
+'o-p75fail3'(suite) -> [];
+'o-p75fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p75fail4.xml
+%% ID: o-p75fail4
+%% Type: not-wf
+%% Sections: 4.2.2 [75]
+'o-p75fail4'(suite) -> [];
+'o-p75fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p75fail5.xml
+%% ID: o-p75fail5
+%% Type: not-wf
+%% Sections: 4.2.2 [75]
+'o-p75fail5'(suite) -> [];
+'o-p75fail5'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail5.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p75fail6.xml
+%% ID: o-p75fail6
+%% Type: not-wf
+%% Sections: 4.2.2 [75]
+'o-p75fail6'(suite) -> [];
+'o-p75fail6'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail6.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p76fail1.xml
+%% ID: o-p76fail1
+%% Type: not-wf
+%% Sections: 4.2.2 [76]
+'o-p76fail1'(suite) -> [];
+'o-p76fail1'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p76fail1.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p76fail2.xml
+%% ID: o-p76fail2
+%% Type: not-wf
+%% Sections: 4.2.2 [76]
+'o-p76fail2'(suite) -> [];
+'o-p76fail2'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p76fail2.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p76fail3.xml
+%% ID: o-p76fail3
+%% Type: not-wf
+%% Sections: 4.2.2 [76]
+'o-p76fail3'(suite) -> [];
+'o-p76fail3'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p76fail3.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p76fail4.xml
+%% ID: o-p76fail4
+%% Type: not-wf
+%% Sections: 4.2.2 [76]
+'o-p76fail4'(suite) -> [];
+'o-p76fail4'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p76fail4.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: p11pass1.xml
+%% ID: o-p11pass1
+%% Type: error
+%% Sections: 2.3, 4.2.2 [11]
+'o-p11pass1'(suite) -> [];
+'o-p11pass1'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p11pass1.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: OASIS/NIST TESTS, 1-Nov-1998
+
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: OASIS/NIST XML 1.0 Tests
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P28/ibm28i01.xml
+%% ID: ibm-invalid-P28-ibm28i01.xml
+%% Type: invalid
+%% Sections: 2.8
+'ibm-invalid-P28-ibm28i01'(suite) -> [];
+'ibm-invalid-P28-ibm28i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P28/ibm28i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 28
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P32/ibm32i01.xml
+%% ID: ibm-invalid-P32-ibm32i01.xml
+%% Type: invalid
+%% Sections: 2.9
+'ibm-invalid-P32-ibm32i01'(suite) -> [];
+'ibm-invalid-P32-ibm32i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P32/ibm32i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P32/ibm32i03.xml
+%% ID: ibm-invalid-P32-ibm32i03.xml
+%% Type: invalid
+%% Sections: 2.9
+'ibm-invalid-P32-ibm32i03'(suite) -> [];
+'ibm-invalid-P32-ibm32i03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P32/ibm32i03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P32/ibm32i04.xml
+%% ID: ibm-invalid-P32-ibm32i04.xml
+%% Type: invalid
+%% Sections: 2.9
+'ibm-invalid-P32-ibm32i04'(suite) -> [];
+'ibm-invalid-P32-ibm32i04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P32/ibm32i04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 32
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P39/ibm39i01.xml
+%% ID: ibm-invalid-P39-ibm39i01.xml
+%% Type: invalid
+%% Sections: 3
+'ibm-invalid-P39-ibm39i01'(suite) -> [];
+'ibm-invalid-P39-ibm39i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P39/ibm39i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P39/ibm39i02.xml
+%% ID: ibm-invalid-P39-ibm39i02.xml
+%% Type: invalid
+%% Sections: 3
+'ibm-invalid-P39-ibm39i02'(suite) -> [];
+'ibm-invalid-P39-ibm39i02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P39/ibm39i02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P39/ibm39i03.xml
+%% ID: ibm-invalid-P39-ibm39i03.xml
+%% Type: invalid
+%% Sections: 3
+'ibm-invalid-P39-ibm39i03'(suite) -> [];
+'ibm-invalid-P39-ibm39i03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P39/ibm39i03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P39/ibm39i04.xml
+%% ID: ibm-invalid-P39-ibm39i04.xml
+%% Type: invalid
+%% Sections: 3
+'ibm-invalid-P39-ibm39i04'(suite) -> [];
+'ibm-invalid-P39-ibm39i04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P39/ibm39i04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 39
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P41/ibm41i01.xml
+%% ID: ibm-invalid-P41-ibm41i01.xml
+%% Type: invalid
+%% Sections: 3.1
+'ibm-invalid-P41-ibm41i01'(suite) -> [];
+'ibm-invalid-P41-ibm41i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P41/ibm41i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P41/ibm41i02.xml
+%% ID: ibm-invalid-P41-ibm41i02.xml
+%% Type: invalid
+%% Sections: 3.1
+'ibm-invalid-P41-ibm41i02'(suite) -> [];
+'ibm-invalid-P41-ibm41i02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P41/ibm41i02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 41
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P45/ibm45i01.xml
+%% ID: ibm-invalid-P45-ibm45i01.xml
+%% Type: invalid
+%% Sections: 3.2
+'ibm-invalid-P45-ibm45i01'(suite) -> [];
+'ibm-invalid-P45-ibm45i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P45/ibm45i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 45
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P49/ibm49i01.xml
+%% ID: ibm-invalid-P49-ibm49i01.xml
+%% Type: invalid
+%% Sections: 3.2.1
+'ibm-invalid-P49-ibm49i01'(suite) -> [];
+'ibm-invalid-P49-ibm49i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P49/ibm49i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 49
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P50/ibm50i01.xml
+%% ID: ibm-invalid-P50-ibm50i01.xml
+%% Type: invalid
+%% Sections: 3.2.1
+'ibm-invalid-P50-ibm50i01'(suite) -> [];
+'ibm-invalid-P50-ibm50i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P50/ibm50i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 50
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P51/ibm51i01.xml
+%% ID: ibm-invalid-P51-ibm51i01.xml
+%% Type: invalid
+%% Sections: 3.2.2
+'ibm-invalid-P51-ibm51i01'(suite) -> [];
+'ibm-invalid-P51-ibm51i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P51/ibm51i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P51/ibm51i03.xml
+%% ID: ibm-invalid-P51-ibm51i03.xml
+%% Type: invalid
+%% Sections: 3.2.2
+'ibm-invalid-P51-ibm51i03'(suite) -> [];
+'ibm-invalid-P51-ibm51i03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P51/ibm51i03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 51
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i01.xml
+%% ID: ibm-invalid-P56-ibm56i01.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i01'(suite) -> [];
+'ibm-invalid-P56-ibm56i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i02.xml
+%% ID: ibm-invalid-P56-ibm56i02.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i02'(suite) -> [];
+'ibm-invalid-P56-ibm56i02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i03.xml
+%% ID: ibm-invalid-P56-ibm56i03.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i03'(suite) -> [];
+'ibm-invalid-P56-ibm56i03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i05.xml
+%% ID: ibm-invalid-P56-ibm56i05.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i05'(suite) -> [];
+'ibm-invalid-P56-ibm56i05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i06.xml
+%% ID: ibm-invalid-P56-ibm56i06.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i06'(suite) -> [];
+'ibm-invalid-P56-ibm56i06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i07.xml
+%% ID: ibm-invalid-P56-ibm56i07.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i07'(suite) -> [];
+'ibm-invalid-P56-ibm56i07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i08.xml
+%% ID: ibm-invalid-P56-ibm56i08.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i08'(suite) -> [];
+'ibm-invalid-P56-ibm56i08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i09.xml
+%% ID: ibm-invalid-P56-ibm56i09.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i09'(suite) -> [];
+'ibm-invalid-P56-ibm56i09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i10.xml
+%% ID: ibm-invalid-P56-ibm56i10.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i10'(suite) -> [];
+'ibm-invalid-P56-ibm56i10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i11.xml
+%% ID: ibm-invalid-P56-ibm56i11.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i11'(suite) -> [];
+'ibm-invalid-P56-ibm56i11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i12.xml
+%% ID: ibm-invalid-P56-ibm56i12.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i12'(suite) -> [];
+'ibm-invalid-P56-ibm56i12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i13.xml
+%% ID: ibm-invalid-P56-ibm56i13.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i13'(suite) -> [];
+'ibm-invalid-P56-ibm56i13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i14.xml
+%% ID: ibm-invalid-P56-ibm56i14.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i14'(suite) -> [];
+'ibm-invalid-P56-ibm56i14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i15.xml
+%% ID: ibm-invalid-P56-ibm56i15.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i15'(suite) -> [];
+'ibm-invalid-P56-ibm56i15'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i15.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i16.xml
+%% ID: ibm-invalid-P56-ibm56i16.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i16'(suite) -> [];
+'ibm-invalid-P56-ibm56i16'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i16.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i17.xml
+%% ID: ibm-invalid-P56-ibm56i17.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i17'(suite) -> [];
+'ibm-invalid-P56-ibm56i17'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i17.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P56/ibm56i18.xml
+%% ID: ibm-invalid-P56-ibm56i18.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P56-ibm56i18'(suite) -> [];
+'ibm-invalid-P56-ibm56i18'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i18.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 56
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P58/ibm58i01.xml
+%% ID: ibm-invalid-P58-ibm58i01.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P58-ibm58i01'(suite) -> [];
+'ibm-invalid-P58-ibm58i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P58/ibm58i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P58/ibm58i02.xml
+%% ID: ibm-invalid-P58-ibm58i02.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P58-ibm58i02'(suite) -> [];
+'ibm-invalid-P58-ibm58i02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P58/ibm58i02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 58
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P59/ibm59i01.xml
+%% ID: ibm-invalid-P59-ibm59i01.xml
+%% Type: invalid
+%% Sections: 3.3.1
+'ibm-invalid-P59-ibm59i01'(suite) -> [];
+'ibm-invalid-P59-ibm59i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P59/ibm59i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 59
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P60/ibm60i01.xml
+%% ID: ibm-invalid-P60-ibm60i01.xml
+%% Type: invalid
+%% Sections: 3.3.2
+'ibm-invalid-P60-ibm60i01'(suite) -> [];
+'ibm-invalid-P60-ibm60i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P60/ibm60i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P60/ibm60i02.xml
+%% ID: ibm-invalid-P60-ibm60i02.xml
+%% Type: invalid
+%% Sections: 3.3.2
+'ibm-invalid-P60-ibm60i02'(suite) -> [];
+'ibm-invalid-P60-ibm60i02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P60/ibm60i02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P60/ibm60i03.xml
+%% ID: ibm-invalid-P60-ibm60i03.xml
+%% Type: invalid
+%% Sections: 3.3.2
+'ibm-invalid-P60-ibm60i03'(suite) -> [];
+'ibm-invalid-P60-ibm60i03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P60/ibm60i03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P60/ibm60i04.xml
+%% ID: ibm-invalid-P60-ibm60i04.xml
+%% Type: invalid
+%% Sections: 3.3.2
+'ibm-invalid-P60-ibm60i04'(suite) -> [];
+'ibm-invalid-P60-ibm60i04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P60/ibm60i04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 60
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P68/ibm68i01.xml
+%% ID: ibm-invalid-P68-ibm68i01.xml
+%% Type: error
+%% Sections: 4.1
+'ibm-invalid-P68-ibm68i01'(suite) -> [];
+'ibm-invalid-P68-ibm68i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P68/ibm68i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P68/ibm68i02.xml
+%% ID: ibm-invalid-P68-ibm68i02.xml
+%% Type: error
+%% Sections: 4.1
+'ibm-invalid-P68-ibm68i02'(suite) -> [];
+'ibm-invalid-P68-ibm68i02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P68/ibm68i02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P68/ibm68i03.xml
+%% ID: ibm-invalid-P68-ibm68i03.xml
+%% Type: error
+%% Sections: 4.1
+'ibm-invalid-P68-ibm68i03'(suite) -> [];
+'ibm-invalid-P68-ibm68i03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P68/ibm68i03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P68/ibm68i04.xml
+%% ID: ibm-invalid-P68-ibm68i04.xml
+%% Type: error
+%% Sections: 4.1
+'ibm-invalid-P68-ibm68i04'(suite) -> [];
+'ibm-invalid-P68-ibm68i04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P68/ibm68i04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 68
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P69/ibm69i01.xml
+%% ID: ibm-invalid-P69-ibm69i01.xml
+%% Type: error
+%% Sections: 4.1
+'ibm-invalid-P69-ibm69i01'(suite) -> [];
+'ibm-invalid-P69-ibm69i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P69/ibm69i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P69/ibm69i02.xml
+%% ID: ibm-invalid-P69-ibm69i02.xml
+%% Type: error
+%% Sections: 4.1
+'ibm-invalid-P69-ibm69i02'(suite) -> [];
+'ibm-invalid-P69-ibm69i02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P69/ibm69i02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P69/ibm69i03.xml
+%% ID: ibm-invalid-P69-ibm69i03.xml
+%% Type: error
+%% Sections: 4.1
+'ibm-invalid-P69-ibm69i03'(suite) -> [];
+'ibm-invalid-P69-ibm69i03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P69/ibm69i03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P69/ibm69i04.xml
+%% ID: ibm-invalid-P69-ibm69i04.xml
+%% Type: error
+%% Sections: 4.1
+'ibm-invalid-P69-ibm69i04'(suite) -> [];
+'ibm-invalid-P69-ibm69i04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P69/ibm69i04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 69
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: invalid/P76/ibm76i01.xml
+%% ID: ibm-invalid-P76-ibm76i01.xml
+%% Type: invalid
+%% Sections: 4.2.2
+'ibm-invalid-P76-ibm76i01'(suite) -> [];
+'ibm-invalid-P76-ibm76i01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P76/ibm76i01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "invalid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 76
+
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - invalid tests
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P01/ibm01n01.xml
+%% ID: ibm-not-wf-P01-ibm01n01.xml
+%% Type: not-wf
+%% Sections: 2.1
+'ibm-not-wf-P01-ibm01n01'(suite) -> [];
+'ibm-not-wf-P01-ibm01n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P01/ibm01n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P01/ibm01n02.xml
+%% ID: ibm-not-wf-P01-ibm01n02.xml
+%% Type: not-wf
+%% Sections: 2.1
+'ibm-not-wf-P01-ibm01n02'(suite) -> [];
+'ibm-not-wf-P01-ibm01n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P01/ibm01n02.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_, <<"xml version=\"1.0\"?>", _/binary>>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P01/ibm01n03.xml
+%% ID: ibm-not-wf-P01-ibm01n03.xml
+%% Type: not-wf
+%% Sections: 2.1
+'ibm-not-wf-P01-ibm01n03'(suite) -> [];
+'ibm-not-wf-P01-ibm01n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P01/ibm01n03.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_, <<"<title>Wrong combination!</title>", _/binary>>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 1
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n01.xml
+%% ID: ibm-not-wf-P02-ibm02n01.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n01'(suite) -> [];
+'ibm-not-wf-P02-ibm02n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n02.xml
+%% ID: ibm-not-wf-P02-ibm02n02.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n02'(suite) -> [];
+'ibm-not-wf-P02-ibm02n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n03.xml
+%% ID: ibm-not-wf-P02-ibm02n03.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n03'(suite) -> [];
+'ibm-not-wf-P02-ibm02n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n04.xml
+%% ID: ibm-not-wf-P02-ibm02n04.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n04'(suite) -> [];
+'ibm-not-wf-P02-ibm02n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n05.xml
+%% ID: ibm-not-wf-P02-ibm02n05.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n05'(suite) -> [];
+'ibm-not-wf-P02-ibm02n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n06.xml
+%% ID: ibm-not-wf-P02-ibm02n06.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n06'(suite) -> [];
+'ibm-not-wf-P02-ibm02n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n07.xml
+%% ID: ibm-not-wf-P02-ibm02n07.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n07'(suite) -> [];
+'ibm-not-wf-P02-ibm02n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n08.xml
+%% ID: ibm-not-wf-P02-ibm02n08.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n08'(suite) -> [];
+'ibm-not-wf-P02-ibm02n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n09.xml
+%% ID: ibm-not-wf-P02-ibm02n09.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n09'(suite) -> [];
+'ibm-not-wf-P02-ibm02n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n10.xml
+%% ID: ibm-not-wf-P02-ibm02n10.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n10'(suite) -> [];
+'ibm-not-wf-P02-ibm02n10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n11.xml
+%% ID: ibm-not-wf-P02-ibm02n11.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n11'(suite) -> [];
+'ibm-not-wf-P02-ibm02n11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n12.xml
+%% ID: ibm-not-wf-P02-ibm02n12.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n12'(suite) -> [];
+'ibm-not-wf-P02-ibm02n12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n13.xml
+%% ID: ibm-not-wf-P02-ibm02n13.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n13'(suite) -> [];
+'ibm-not-wf-P02-ibm02n13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n14.xml
+%% ID: ibm-not-wf-P02-ibm02n14.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n14'(suite) -> [];
+'ibm-not-wf-P02-ibm02n14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n15.xml
+%% ID: ibm-not-wf-P02-ibm02n15.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n15'(suite) -> [];
+'ibm-not-wf-P02-ibm02n15'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n15.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n16.xml
+%% ID: ibm-not-wf-P02-ibm02n16.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n16'(suite) -> [];
+'ibm-not-wf-P02-ibm02n16'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n16.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n17.xml
+%% ID: ibm-not-wf-P02-ibm02n17.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n17'(suite) -> [];
+'ibm-not-wf-P02-ibm02n17'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n17.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n18.xml
+%% ID: ibm-not-wf-P02-ibm02n18.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n18'(suite) -> [];
+'ibm-not-wf-P02-ibm02n18'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n18.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n19.xml
+%% ID: ibm-not-wf-P02-ibm02n19.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n19'(suite) -> [];
+'ibm-not-wf-P02-ibm02n19'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n19.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n20.xml
+%% ID: ibm-not-wf-P02-ibm02n20.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n20'(suite) -> [];
+'ibm-not-wf-P02-ibm02n20'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n20.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n21.xml
+%% ID: ibm-not-wf-P02-ibm02n21.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n21'(suite) -> [];
+'ibm-not-wf-P02-ibm02n21'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n21.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n22.xml
+%% ID: ibm-not-wf-P02-ibm02n22.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n22'(suite) -> [];
+'ibm-not-wf-P02-ibm02n22'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n22.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n23.xml
+%% ID: ibm-not-wf-P02-ibm02n23.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n23'(suite) -> [];
+'ibm-not-wf-P02-ibm02n23'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n23.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n24.xml
+%% ID: ibm-not-wf-P02-ibm02n24.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n24'(suite) -> [];
+'ibm-not-wf-P02-ibm02n24'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n24.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n25.xml
+%% ID: ibm-not-wf-P02-ibm02n25.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n25'(suite) -> [];
+'ibm-not-wf-P02-ibm02n25'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n25.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n26.xml
+%% ID: ibm-not-wf-P02-ibm02n26.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n26'(suite) -> [];
+'ibm-not-wf-P02-ibm02n26'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n26.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n27.xml
+%% ID: ibm-not-wf-P02-ibm02n27.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n27'(suite) -> [];
+'ibm-not-wf-P02-ibm02n27'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n27.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n28.xml
+%% ID: ibm-not-wf-P02-ibm02n28.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n28'(suite) -> [];
+'ibm-not-wf-P02-ibm02n28'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n28.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n29.xml
+%% ID: ibm-not-wf-P02-ibm02n29.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n29'(suite) -> [];
+'ibm-not-wf-P02-ibm02n29'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n29.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n30.xml
+%% ID: ibm-not-wf-P02-ibm02n30.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n30'(suite) -> [];
+'ibm-not-wf-P02-ibm02n30'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n30.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n31.xml
+%% ID: ibm-not-wf-P02-ibm02n31.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n31'(suite) -> [];
+'ibm-not-wf-P02-ibm02n31'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n31.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n32.xml
+%% ID: ibm-not-wf-P02-ibm02n32.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n32'(suite) -> [];
+'ibm-not-wf-P02-ibm02n32'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n32.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P02/ibm02n33.xml
+%% ID: ibm-not-wf-P02-ibm02n33.xml
+%% Type: not-wf
+%% Sections: 2.2
+'ibm-not-wf-P02-ibm02n33'(suite) -> [];
+'ibm-not-wf-P02-ibm02n33'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n33.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 2
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P03/ibm03n01.xml
+%% ID: ibm-not-wf-P03-ibm03n01.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P03-ibm03n01'(suite) -> [];
+'ibm-not-wf-P03-ibm03n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P03/ibm03n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 3
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n01.xml
+%% ID: ibm-not-wf-P04-ibm04n01.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n01'(suite) -> [];
+'ibm-not-wf-P04-ibm04n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n02.xml
+%% ID: ibm-not-wf-P04-ibm04n02.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n02'(suite) -> [];
+'ibm-not-wf-P04-ibm04n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n03.xml
+%% ID: ibm-not-wf-P04-ibm04n03.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n03'(suite) -> [];
+'ibm-not-wf-P04-ibm04n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n04.xml
+%% ID: ibm-not-wf-P04-ibm04n04.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n04'(suite) -> [];
+'ibm-not-wf-P04-ibm04n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n05.xml
+%% ID: ibm-not-wf-P04-ibm04n05.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n05'(suite) -> [];
+'ibm-not-wf-P04-ibm04n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n06.xml
+%% ID: ibm-not-wf-P04-ibm04n06.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n06'(suite) -> [];
+'ibm-not-wf-P04-ibm04n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n07.xml
+%% ID: ibm-not-wf-P04-ibm04n07.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n07'(suite) -> [];
+'ibm-not-wf-P04-ibm04n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n08.xml
+%% ID: ibm-not-wf-P04-ibm04n08.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n08'(suite) -> [];
+'ibm-not-wf-P04-ibm04n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n09.xml
+%% ID: ibm-not-wf-P04-ibm04n09.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n09'(suite) -> [];
+'ibm-not-wf-P04-ibm04n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n10.xml
+%% ID: ibm-not-wf-P04-ibm04n10.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n10'(suite) -> [];
+'ibm-not-wf-P04-ibm04n10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n11.xml
+%% ID: ibm-not-wf-P04-ibm04n11.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n11'(suite) -> [];
+'ibm-not-wf-P04-ibm04n11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n12.xml
+%% ID: ibm-not-wf-P04-ibm04n12.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n12'(suite) -> [];
+'ibm-not-wf-P04-ibm04n12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n13.xml
+%% ID: ibm-not-wf-P04-ibm04n13.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n13'(suite) -> [];
+'ibm-not-wf-P04-ibm04n13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n14.xml
+%% ID: ibm-not-wf-P04-ibm04n14.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n14'(suite) -> [];
+'ibm-not-wf-P04-ibm04n14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n15.xml
+%% ID: ibm-not-wf-P04-ibm04n15.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n15'(suite) -> [];
+'ibm-not-wf-P04-ibm04n15'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n15.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n16.xml
+%% ID: ibm-not-wf-P04-ibm04n16.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n16'(suite) -> [];
+'ibm-not-wf-P04-ibm04n16'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n16.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n17.xml
+%% ID: ibm-not-wf-P04-ibm04n17.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n17'(suite) -> [];
+'ibm-not-wf-P04-ibm04n17'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n17.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P04/ibm04n18.xml
+%% ID: ibm-not-wf-P04-ibm04n18.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P04-ibm04n18'(suite) -> [];
+'ibm-not-wf-P04-ibm04n18'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n18.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 4
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P05/ibm05n01.xml
+%% ID: ibm-not-wf-P05-ibm05n01.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P05-ibm05n01'(suite) -> [];
+'ibm-not-wf-P05-ibm05n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P05/ibm05n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P05/ibm05n02.xml
+%% ID: ibm-not-wf-P05-ibm05n02.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P05-ibm05n02'(suite) -> [];
+'ibm-not-wf-P05-ibm05n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P05/ibm05n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P05/ibm05n03.xml
+%% ID: ibm-not-wf-P05-ibm05n03.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P05-ibm05n03'(suite) -> [];
+'ibm-not-wf-P05-ibm05n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P05/ibm05n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 5
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P09/ibm09n01.xml
+%% ID: ibm-not-wf-P09-ibm09n01.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P09-ibm09n01'(suite) -> [];
+'ibm-not-wf-P09-ibm09n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P09/ibm09n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P09/ibm09n02.xml
+%% ID: ibm-not-wf-P09-ibm09n02.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P09-ibm09n02'(suite) -> [];
+'ibm-not-wf-P09-ibm09n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P09/ibm09n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P09/ibm09n03.xml
+%% ID: ibm-not-wf-P09-ibm09n03.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P09-ibm09n03'(suite) -> [];
+'ibm-not-wf-P09-ibm09n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P09/ibm09n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P09/ibm09n04.xml
+%% ID: ibm-not-wf-P09-ibm09n04.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P09-ibm09n04'(suite) -> [];
+'ibm-not-wf-P09-ibm09n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P09/ibm09n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 9
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P10/ibm10n01.xml
+%% ID: ibm-not-wf-P10-ibm10n01.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P10-ibm10n01'(suite) -> [];
+'ibm-not-wf-P10-ibm10n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P10/ibm10n02.xml
+%% ID: ibm-not-wf-P10-ibm10n02.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P10-ibm10n02'(suite) -> [];
+'ibm-not-wf-P10-ibm10n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P10/ibm10n03.xml
+%% ID: ibm-not-wf-P10-ibm10n03.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P10-ibm10n03'(suite) -> [];
+'ibm-not-wf-P10-ibm10n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P10/ibm10n04.xml
+%% ID: ibm-not-wf-P10-ibm10n04.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P10-ibm10n04'(suite) -> [];
+'ibm-not-wf-P10-ibm10n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P10/ibm10n05.xml
+%% ID: ibm-not-wf-P10-ibm10n05.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P10-ibm10n05'(suite) -> [];
+'ibm-not-wf-P10-ibm10n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P10/ibm10n06.xml
+%% ID: ibm-not-wf-P10-ibm10n06.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P10-ibm10n06'(suite) -> [];
+'ibm-not-wf-P10-ibm10n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P10/ibm10n07.xml
+%% ID: ibm-not-wf-P10-ibm10n07.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P10-ibm10n07'(suite) -> [];
+'ibm-not-wf-P10-ibm10n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P10/ibm10n08.xml
+%% ID: ibm-not-wf-P10-ibm10n08.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P10-ibm10n08'(suite) -> [];
+'ibm-not-wf-P10-ibm10n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 10
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P11/ibm11n01.xml
+%% ID: ibm-not-wf-P11-ibm11n01.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P11-ibm11n01'(suite) -> [];
+'ibm-not-wf-P11-ibm11n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P11/ibm11n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P11/ibm11n02.xml
+%% ID: ibm-not-wf-P11-ibm11n02.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P11-ibm11n02'(suite) -> [];
+'ibm-not-wf-P11-ibm11n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P11/ibm11n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P11/ibm11n03.xml
+%% ID: ibm-not-wf-P11-ibm11n03.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P11-ibm11n03'(suite) -> [];
+'ibm-not-wf-P11-ibm11n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P11/ibm11n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P11/ibm11n04.xml
+%% ID: ibm-not-wf-P11-ibm11n04.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P11-ibm11n04'(suite) -> [];
+'ibm-not-wf-P11-ibm11n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P11/ibm11n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 11
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P12/ibm12n01.xml
+%% ID: ibm-not-wf-P12-ibm12n01.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P12-ibm12n01'(suite) -> [];
+'ibm-not-wf-P12-ibm12n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P12/ibm12n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P12/ibm12n02.xml
+%% ID: ibm-not-wf-P12-ibm12n02.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P12-ibm12n02'(suite) -> [];
+'ibm-not-wf-P12-ibm12n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P12/ibm12n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P12/ibm12n03.xml
+%% ID: ibm-not-wf-P12-ibm12n03.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P12-ibm12n03'(suite) -> [];
+'ibm-not-wf-P12-ibm12n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P12/ibm12n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 12
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P13/ibm13n01.xml
+%% ID: ibm-not-wf-P13-ibm13n01.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P13-ibm13n01'(suite) -> [];
+'ibm-not-wf-P13-ibm13n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P13/ibm13n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P13/ibm13n02.xml
+%% ID: ibm-not-wf-P13-ibm13n02.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P13-ibm13n02'(suite) -> [];
+'ibm-not-wf-P13-ibm13n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P13/ibm13n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P13/ibm13n03.xml
+%% ID: ibm-not-wf-P13-ibm13n03.xml
+%% Type: not-wf
+%% Sections: 2.3
+'ibm-not-wf-P13-ibm13n03'(suite) -> [];
+'ibm-not-wf-P13-ibm13n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P13/ibm13n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 13
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P14/ibm14n01.xml
+%% ID: ibm-not-wf-P14-ibm14n01.xml
+%% Type: not-wf
+%% Sections: 2.4
+'ibm-not-wf-P14-ibm14n01'(suite) -> [];
+'ibm-not-wf-P14-ibm14n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P14/ibm14n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P14/ibm14n02.xml
+%% ID: ibm-not-wf-P14-ibm14n02.xml
+%% Type: not-wf
+%% Sections: 2.4
+'ibm-not-wf-P14-ibm14n02'(suite) -> [];
+'ibm-not-wf-P14-ibm14n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P14/ibm14n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P14/ibm14n03.xml
+%% ID: ibm-not-wf-P14-ibm14n03.xml
+%% Type: not-wf
+%% Sections: 2.4
+'ibm-not-wf-P14-ibm14n03'(suite) -> [];
+'ibm-not-wf-P14-ibm14n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P14/ibm14n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 14
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P15/ibm15n01.xml
+%% ID: ibm-not-wf-P15-ibm15n01.xml
+%% Type: not-wf
+%% Sections: 2.5
+'ibm-not-wf-P15-ibm15n01'(suite) -> [];
+'ibm-not-wf-P15-ibm15n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P15/ibm15n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P15/ibm15n02.xml
+%% ID: ibm-not-wf-P15-ibm15n02.xml
+%% Type: not-wf
+%% Sections: 2.5
+'ibm-not-wf-P15-ibm15n02'(suite) -> [];
+'ibm-not-wf-P15-ibm15n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P15/ibm15n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P15/ibm15n03.xml
+%% ID: ibm-not-wf-P15-ibm15n03.xml
+%% Type: not-wf
+%% Sections: 2.5
+'ibm-not-wf-P15-ibm15n03'(suite) -> [];
+'ibm-not-wf-P15-ibm15n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P15/ibm15n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P15/ibm15n04.xml
+%% ID: ibm-not-wf-P15-ibm15n04.xml
+%% Type: not-wf
+%% Sections: 2.5
+'ibm-not-wf-P15-ibm15n04'(suite) -> [];
+'ibm-not-wf-P15-ibm15n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P15/ibm15n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 15
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P16/ibm16n01.xml
+%% ID: ibm-not-wf-P16-ibm16n01.xml
+%% Type: not-wf
+%% Sections: 2.6
+'ibm-not-wf-P16-ibm16n01'(suite) -> [];
+'ibm-not-wf-P16-ibm16n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P16/ibm16n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P16/ibm16n02.xml
+%% ID: ibm-not-wf-P16-ibm16n02.xml
+%% Type: not-wf
+%% Sections: 2.6
+'ibm-not-wf-P16-ibm16n02'(suite) -> [];
+'ibm-not-wf-P16-ibm16n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P16/ibm16n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P16/ibm16n03.xml
+%% ID: ibm-not-wf-P16-ibm16n03.xml
+%% Type: not-wf
+%% Sections: 2.6
+'ibm-not-wf-P16-ibm16n03'(suite) -> [];
+'ibm-not-wf-P16-ibm16n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P16/ibm16n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P16/ibm16n04.xml
+%% ID: ibm-not-wf-P16-ibm16n04.xml
+%% Type: not-wf
+%% Sections: 2.6
+'ibm-not-wf-P16-ibm16n04'(suite) -> [];
+'ibm-not-wf-P16-ibm16n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P16/ibm16n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 16
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P17/ibm17n01.xml
+%% ID: ibm-not-wf-P17-ibm17n01.xml
+%% Type: not-wf
+%% Sections: 2.6
+'ibm-not-wf-P17-ibm17n01'(suite) -> [];
+'ibm-not-wf-P17-ibm17n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P17/ibm17n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P17/ibm17n02.xml
+%% ID: ibm-not-wf-P17-ibm17n02.xml
+%% Type: not-wf
+%% Sections: 2.6
+'ibm-not-wf-P17-ibm17n02'(suite) -> [];
+'ibm-not-wf-P17-ibm17n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P17/ibm17n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P17/ibm17n03.xml
+%% ID: ibm-not-wf-P17-ibm17n03.xml
+%% Type: not-wf
+%% Sections: 2.6
+'ibm-not-wf-P17-ibm17n03'(suite) -> [];
+'ibm-not-wf-P17-ibm17n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P17/ibm17n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P17/ibm17n04.xml
+%% ID: ibm-not-wf-P17-ibm17n04.xml
+%% Type: not-wf
+%% Sections: 2.6
+'ibm-not-wf-P17-ibm17n04'(suite) -> [];
+'ibm-not-wf-P17-ibm17n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P17/ibm17n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 17
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P18/ibm18n01.xml
+%% ID: ibm-not-wf-P18-ibm18n01.xml
+%% Type: not-wf
+%% Sections: 2.7
+'ibm-not-wf-P18-ibm18n01'(suite) -> [];
+'ibm-not-wf-P18-ibm18n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P18/ibm18n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P18/ibm18n02.xml
+%% ID: ibm-not-wf-P18-ibm18n02.xml
+%% Type: not-wf
+%% Sections: 2.7
+'ibm-not-wf-P18-ibm18n02'(suite) -> [];
+'ibm-not-wf-P18-ibm18n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P18/ibm18n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 18
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P19/ibm19n01.xml
+%% ID: ibm-not-wf-P19-ibm19n01.xml
+%% Type: not-wf
+%% Sections: 2.7
+'ibm-not-wf-P19-ibm19n01'(suite) -> [];
+'ibm-not-wf-P19-ibm19n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P19/ibm19n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P19/ibm19n02.xml
+%% ID: ibm-not-wf-P19-ibm19n02.xml
+%% Type: not-wf
+%% Sections: 2.7
+'ibm-not-wf-P19-ibm19n02'(suite) -> [];
+'ibm-not-wf-P19-ibm19n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P19/ibm19n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P19/ibm19n03.xml
+%% ID: ibm-not-wf-P19-ibm19n03.xml
+%% Type: not-wf
+%% Sections: 2.7
+'ibm-not-wf-P19-ibm19n03'(suite) -> [];
+'ibm-not-wf-P19-ibm19n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P19/ibm19n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 19
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P20/ibm20n01.xml
+%% ID: ibm-not-wf-P20-ibm20n01.xml
+%% Type: not-wf
+%% Sections: 2.7
+'ibm-not-wf-P20-ibm20n01'(suite) -> [];
+'ibm-not-wf-P20-ibm20n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P20/ibm20n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 20
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P21/ibm21n01.xml
+%% ID: ibm-not-wf-P21-ibm21n01.xml
+%% Type: not-wf
+%% Sections: 2.7
+'ibm-not-wf-P21-ibm21n01'(suite) -> [];
+'ibm-not-wf-P21-ibm21n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P21/ibm21n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P21/ibm21n02.xml
+%% ID: ibm-not-wf-P21-ibm21n02.xml
+%% Type: not-wf
+%% Sections: 2.7
+'ibm-not-wf-P21-ibm21n02'(suite) -> [];
+'ibm-not-wf-P21-ibm21n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P21/ibm21n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P21/ibm21n03.xml
+%% ID: ibm-not-wf-P21-ibm21n03.xml
+%% Type: not-wf
+%% Sections: 2.7
+'ibm-not-wf-P21-ibm21n03'(suite) -> [];
+'ibm-not-wf-P21-ibm21n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P21/ibm21n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 21
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P22/ibm22n01.xml
+%% ID: ibm-not-wf-P22-ibm22n01.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P22-ibm22n01'(suite) -> [];
+'ibm-not-wf-P22-ibm22n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P22/ibm22n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P22/ibm22n02.xml
+%% ID: ibm-not-wf-P22-ibm22n02.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P22-ibm22n02'(suite) -> [];
+'ibm-not-wf-P22-ibm22n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P22/ibm22n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P22/ibm22n03.xml
+%% ID: ibm-not-wf-P22-ibm22n03.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P22-ibm22n03'(suite) -> [];
+'ibm-not-wf-P22-ibm22n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P22/ibm22n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 22
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P23/ibm23n01.xml
+%% ID: ibm-not-wf-P23-ibm23n01.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P23-ibm23n01'(suite) -> [];
+'ibm-not-wf-P23-ibm23n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P23/ibm23n02.xml
+%% ID: ibm-not-wf-P23-ibm23n02.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P23-ibm23n02'(suite) -> [];
+'ibm-not-wf-P23-ibm23n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P23/ibm23n03.xml
+%% ID: ibm-not-wf-P23-ibm23n03.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P23-ibm23n03'(suite) -> [];
+'ibm-not-wf-P23-ibm23n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P23/ibm23n04.xml
+%% ID: ibm-not-wf-P23-ibm23n04.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P23-ibm23n04'(suite) -> [];
+'ibm-not-wf-P23-ibm23n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P23/ibm23n05.xml
+%% ID: ibm-not-wf-P23-ibm23n05.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P23-ibm23n05'(suite) -> [];
+'ibm-not-wf-P23-ibm23n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P23/ibm23n06.xml
+%% ID: ibm-not-wf-P23-ibm23n06.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P23-ibm23n06'(suite) -> [];
+'ibm-not-wf-P23-ibm23n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 23
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P24/ibm24n01.xml
+%% ID: ibm-not-wf-P24-ibm24n01.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P24-ibm24n01'(suite) -> [];
+'ibm-not-wf-P24-ibm24n01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P24/ibm24n02.xml
+%% ID: ibm-not-wf-P24-ibm24n02.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P24-ibm24n02'(suite) -> [];
+'ibm-not-wf-P24-ibm24n02'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n02.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P24/ibm24n03.xml
+%% ID: ibm-not-wf-P24-ibm24n03.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P24-ibm24n03'(suite) -> [];
+'ibm-not-wf-P24-ibm24n03'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P24/ibm24n04.xml
+%% ID: ibm-not-wf-P24-ibm24n04.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P24-ibm24n04'(suite) -> [];
+'ibm-not-wf-P24-ibm24n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P24/ibm24n05.xml
+%% ID: ibm-not-wf-P24-ibm24n05.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P24-ibm24n05'(suite) -> [];
+'ibm-not-wf-P24-ibm24n05'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n05.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P24/ibm24n06.xml
+%% ID: ibm-not-wf-P24-ibm24n06.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P24-ibm24n06'(suite) -> [];
+'ibm-not-wf-P24-ibm24n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P24/ibm24n07.xml
+%% ID: ibm-not-wf-P24-ibm24n07.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P24-ibm24n07'(suite) -> [];
+'ibm-not-wf-P24-ibm24n07'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n07.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P24/ibm24n08.xml
+%% ID: ibm-not-wf-P24-ibm24n08.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P24-ibm24n08'(suite) -> [];
+'ibm-not-wf-P24-ibm24n08'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n08.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P24/ibm24n09.xml
+%% ID: ibm-not-wf-P24-ibm24n09.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P24-ibm24n09'(suite) -> [];
+'ibm-not-wf-P24-ibm24n09'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n09.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 24
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P25/ibm25n01.xml
+%% ID: ibm-not-wf-P25-ibm25n01.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P25-ibm25n01'(suite) -> [];
+'ibm-not-wf-P25-ibm25n01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P25/ibm25n01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P25/ibm25n02.xml
+%% ID: ibm-not-wf-P25-ibm25n02.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P25-ibm25n02'(suite) -> [];
+'ibm-not-wf-P25-ibm25n02'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P25/ibm25n02.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 25
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P26/ibm26n01.xml
+%% ID: ibm-not-wf-P26-ibm26n01.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P26-ibm26n01'(suite) -> [];
+'ibm-not-wf-P26-ibm26n01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P26/ibm26n01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 26
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P27/ibm27n01.xml
+%% ID: ibm-not-wf-P27-ibm27n01.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P27-ibm27n01'(suite) -> [];
+'ibm-not-wf-P27-ibm27n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P27/ibm27n01.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_, <<"<!ELEMENT cat EMPTY>">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 27
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P28/ibm28n01.xml
+%% ID: ibm-not-wf-P28-ibm28n01.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P28-ibm28n01'(suite) -> [];
+'ibm-not-wf-P28-ibm28n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P28/ibm28n02.xml
+%% ID: ibm-not-wf-P28-ibm28n02.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P28-ibm28n02'(suite) -> [];
+'ibm-not-wf-P28-ibm28n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P28/ibm28n03.xml
+%% ID: ibm-not-wf-P28-ibm28n03.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P28-ibm28n03'(suite) -> [];
+'ibm-not-wf-P28-ibm28n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P28/ibm28n04.xml
+%% ID: ibm-not-wf-P28-ibm28n04.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P28-ibm28n04'(suite) -> [];
+'ibm-not-wf-P28-ibm28n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P28/ibm28n05.xml
+%% ID: ibm-not-wf-P28-ibm28n05.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P28-ibm28n05'(suite) -> [];
+'ibm-not-wf-P28-ibm28n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P28/ibm28n06.xml
+%% ID: ibm-not-wf-P28-ibm28n06.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P28-ibm28n06'(suite) -> [];
+'ibm-not-wf-P28-ibm28n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P28/ibm28n07.xml
+%% ID: ibm-not-wf-P28-ibm28n07.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P28-ibm28n07'(suite) -> [];
+'ibm-not-wf-P28-ibm28n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P28/ibm28n08.xml
+%% ID: ibm-not-wf-P28-ibm28n08.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P28-ibm28n08'(suite) -> [];
+'ibm-not-wf-P28-ibm28n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 28
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/p28a/ibm28an01.xml
+%% ID: ibm-not-wf-p28a-ibm28an01.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-p28a-ibm28an01'(suite) -> [];
+'ibm-not-wf-p28a-ibm28an01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/p28a/ibm28an01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 28a
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P29/ibm29n01.xml
+%% ID: ibm-not-wf-P29-ibm29n01.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P29-ibm29n01'(suite) -> [];
+'ibm-not-wf-P29-ibm29n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P29/ibm29n02.xml
+%% ID: ibm-not-wf-P29-ibm29n02.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P29-ibm29n02'(suite) -> [];
+'ibm-not-wf-P29-ibm29n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P29/ibm29n03.xml
+%% ID: ibm-not-wf-P29-ibm29n03.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P29-ibm29n03'(suite) -> [];
+'ibm-not-wf-P29-ibm29n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P29/ibm29n04.xml
+%% ID: ibm-not-wf-P29-ibm29n04.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P29-ibm29n04'(suite) -> [];
+'ibm-not-wf-P29-ibm29n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P29/ibm29n05.xml
+%% ID: ibm-not-wf-P29-ibm29n05.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P29-ibm29n05'(suite) -> [];
+'ibm-not-wf-P29-ibm29n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P29/ibm29n06.xml
+%% ID: ibm-not-wf-P29-ibm29n06.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P29-ibm29n06'(suite) -> [];
+'ibm-not-wf-P29-ibm29n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P29/ibm29n07.xml
+%% ID: ibm-not-wf-P29-ibm29n07.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P29-ibm29n07'(suite) -> [];
+'ibm-not-wf-P29-ibm29n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 29
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P30/ibm30n01.xml
+%% ID: ibm-not-wf-P30-ibm30n01.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P30-ibm30n01'(suite) -> [];
+'ibm-not-wf-P30-ibm30n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P30/ibm30n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 30
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P31/ibm31n01.xml
+%% ID: ibm-not-wf-P31-ibm31n01.xml
+%% Type: not-wf
+%% Sections: 2.8
+'ibm-not-wf-P31-ibm31n01'(suite) -> [];
+'ibm-not-wf-P31-ibm31n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P31/ibm31n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 31
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P32/ibm32n01.xml
+%% ID: ibm-not-wf-P32-ibm32n01.xml
+%% Type: not-wf
+%% Sections: 2.9
+'ibm-not-wf-P32-ibm32n01'(suite) -> [];
+'ibm-not-wf-P32-ibm32n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P32/ibm32n02.xml
+%% ID: ibm-not-wf-P32-ibm32n02.xml
+%% Type: not-wf
+%% Sections: 2.9
+'ibm-not-wf-P32-ibm32n02'(suite) -> [];
+'ibm-not-wf-P32-ibm32n02'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n02.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P32/ibm32n03.xml
+%% ID: ibm-not-wf-P32-ibm32n03.xml
+%% Type: not-wf
+%% Sections: 2.9
+'ibm-not-wf-P32-ibm32n03'(suite) -> [];
+'ibm-not-wf-P32-ibm32n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P32/ibm32n04.xml
+%% ID: ibm-not-wf-P32-ibm32n04.xml
+%% Type: not-wf
+%% Sections: 2.9
+'ibm-not-wf-P32-ibm32n04'(suite) -> [];
+'ibm-not-wf-P32-ibm32n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P32/ibm32n05.xml
+%% ID: ibm-not-wf-P32-ibm32n05.xml
+%% Type: not-wf
+%% Sections: 2.9
+'ibm-not-wf-P32-ibm32n05'(suite) -> [];
+'ibm-not-wf-P32-ibm32n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P32/ibm32n06.xml
+%% ID: ibm-not-wf-P32-ibm32n06.xml
+%% Type: not-wf
+%% Sections: 2.9
+'ibm-not-wf-P32-ibm32n06'(suite) -> [];
+'ibm-not-wf-P32-ibm32n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P32/ibm32n07.xml
+%% ID: ibm-not-wf-P32-ibm32n07.xml
+%% Type: not-wf
+%% Sections: 2.9
+'ibm-not-wf-P32-ibm32n07'(suite) -> [];
+'ibm-not-wf-P32-ibm32n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P32/ibm32n08.xml
+%% ID: ibm-not-wf-P32-ibm32n08.xml
+%% Type: not-wf
+%% Sections: 2.9
+'ibm-not-wf-P32-ibm32n08'(suite) -> [];
+'ibm-not-wf-P32-ibm32n08'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n08.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P32/ibm32n09.xml
+%% ID: ibm-not-wf-P32-ibm32n09.xml
+%% Type: not-wf
+%% Sections: 2.9
+'ibm-not-wf-P32-ibm32n09'(suite) -> [];
+'ibm-not-wf-P32-ibm32n09'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n09.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 32
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P39/ibm39n01.xml
+%% ID: ibm-not-wf-P39-ibm39n01.xml
+%% Type: not-wf
+%% Sections: 3
+'ibm-not-wf-P39-ibm39n01'(suite) -> [];
+'ibm-not-wf-P39-ibm39n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P39/ibm39n02.xml
+%% ID: ibm-not-wf-P39-ibm39n02.xml
+%% Type: not-wf
+%% Sections: 3
+'ibm-not-wf-P39-ibm39n02'(suite) -> [];
+'ibm-not-wf-P39-ibm39n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P39/ibm39n03.xml
+%% ID: ibm-not-wf-P39-ibm39n03.xml
+%% Type: not-wf
+%% Sections: 3
+'ibm-not-wf-P39-ibm39n03'(suite) -> [];
+'ibm-not-wf-P39-ibm39n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P39/ibm39n04.xml
+%% ID: ibm-not-wf-P39-ibm39n04.xml
+%% Type: not-wf
+%% Sections: 3
+'ibm-not-wf-P39-ibm39n04'(suite) -> [];
+'ibm-not-wf-P39-ibm39n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P39/ibm39n05.xml
+%% ID: ibm-not-wf-P39-ibm39n05.xml
+%% Type: not-wf
+%% Sections: 3
+'ibm-not-wf-P39-ibm39n05'(suite) -> [];
+'ibm-not-wf-P39-ibm39n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P39/ibm39n06.xml
+%% ID: ibm-not-wf-P39-ibm39n06.xml
+%% Type: not-wf
+%% Sections: 3
+'ibm-not-wf-P39-ibm39n06'(suite) -> [];
+'ibm-not-wf-P39-ibm39n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n06.xml"]),
+   %% Special case becase we returns everything after a legal document 
+   %% as an rest instead of giving and error to let the user handle 
+   %% multipple docs on a stream.
+   ?line {ok,_,<<"content after end tag\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 39
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P40/ibm40n01.xml
+%% ID: ibm-not-wf-P40-ibm40n01.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P40-ibm40n01'(suite) -> [];
+'ibm-not-wf-P40-ibm40n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P40/ibm40n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P40/ibm40n02.xml
+%% ID: ibm-not-wf-P40-ibm40n02.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P40-ibm40n02'(suite) -> [];
+'ibm-not-wf-P40-ibm40n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P40/ibm40n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P40/ibm40n03.xml
+%% ID: ibm-not-wf-P40-ibm40n03.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P40-ibm40n03'(suite) -> [];
+'ibm-not-wf-P40-ibm40n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P40/ibm40n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P40/ibm40n04.xml
+%% ID: ibm-not-wf-P40-ibm40n04.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P40-ibm40n04'(suite) -> [];
+'ibm-not-wf-P40-ibm40n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P40/ibm40n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P40/ibm40n05.xml
+%% ID: ibm-not-wf-P40-ibm40n05.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P40-ibm40n05'(suite) -> [];
+'ibm-not-wf-P40-ibm40n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P40/ibm40n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 40
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n01.xml
+%% ID: ibm-not-wf-P41-ibm41n01.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n01'(suite) -> [];
+'ibm-not-wf-P41-ibm41n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n02.xml
+%% ID: ibm-not-wf-P41-ibm41n02.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n02'(suite) -> [];
+'ibm-not-wf-P41-ibm41n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n03.xml
+%% ID: ibm-not-wf-P41-ibm41n03.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n03'(suite) -> [];
+'ibm-not-wf-P41-ibm41n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n04.xml
+%% ID: ibm-not-wf-P41-ibm41n04.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n04'(suite) -> [];
+'ibm-not-wf-P41-ibm41n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n05.xml
+%% ID: ibm-not-wf-P41-ibm41n05.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n05'(suite) -> [];
+'ibm-not-wf-P41-ibm41n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n06.xml
+%% ID: ibm-not-wf-P41-ibm41n06.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n06'(suite) -> [];
+'ibm-not-wf-P41-ibm41n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n07.xml
+%% ID: ibm-not-wf-P41-ibm41n07.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n07'(suite) -> [];
+'ibm-not-wf-P41-ibm41n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n08.xml
+%% ID: ibm-not-wf-P41-ibm41n08.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n08'(suite) -> [];
+'ibm-not-wf-P41-ibm41n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n09.xml
+%% ID: ibm-not-wf-P41-ibm41n09.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n09'(suite) -> [];
+'ibm-not-wf-P41-ibm41n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n10.xml
+%% ID: ibm-not-wf-P41-ibm41n10.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n10'(suite) -> [];
+'ibm-not-wf-P41-ibm41n10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n11.xml
+%% ID: ibm-not-wf-P41-ibm41n11.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n11'(suite) -> [];
+'ibm-not-wf-P41-ibm41n11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n12.xml
+%% ID: ibm-not-wf-P41-ibm41n12.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n12'(suite) -> [];
+'ibm-not-wf-P41-ibm41n12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n13.xml
+%% ID: ibm-not-wf-P41-ibm41n13.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n13'(suite) -> [];
+'ibm-not-wf-P41-ibm41n13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P41/ibm41n14.xml
+%% ID: ibm-not-wf-P41-ibm41n14.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P41-ibm41n14'(suite) -> [];
+'ibm-not-wf-P41-ibm41n14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 41
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P42/ibm42n01.xml
+%% ID: ibm-not-wf-P42-ibm42n01.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P42-ibm42n01'(suite) -> [];
+'ibm-not-wf-P42-ibm42n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P42/ibm42n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P42/ibm42n02.xml
+%% ID: ibm-not-wf-P42-ibm42n02.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P42-ibm42n02'(suite) -> [];
+'ibm-not-wf-P42-ibm42n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P42/ibm42n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P42/ibm42n03.xml
+%% ID: ibm-not-wf-P42-ibm42n03.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P42-ibm42n03'(suite) -> [];
+'ibm-not-wf-P42-ibm42n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P42/ibm42n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P42/ibm42n04.xml
+%% ID: ibm-not-wf-P42-ibm42n04.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P42-ibm42n04'(suite) -> [];
+'ibm-not-wf-P42-ibm42n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P42/ibm42n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P42/ibm42n05.xml
+%% ID: ibm-not-wf-P42-ibm42n05.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P42-ibm42n05'(suite) -> [];
+'ibm-not-wf-P42-ibm42n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P42/ibm42n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 42
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P43/ibm43n01.xml
+%% ID: ibm-not-wf-P43-ibm43n01.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P43-ibm43n01'(suite) -> [];
+'ibm-not-wf-P43-ibm43n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P43/ibm43n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P43/ibm43n02.xml
+%% ID: ibm-not-wf-P43-ibm43n02.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P43-ibm43n02'(suite) -> [];
+'ibm-not-wf-P43-ibm43n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P43/ibm43n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P43/ibm43n04.xml
+%% ID: ibm-not-wf-P43-ibm43n04.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P43-ibm43n04'(suite) -> [];
+'ibm-not-wf-P43-ibm43n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P43/ibm43n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P43/ibm43n05.xml
+%% ID: ibm-not-wf-P43-ibm43n05.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P43-ibm43n05'(suite) -> [];
+'ibm-not-wf-P43-ibm43n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P43/ibm43n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 43
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P44/ibm44n01.xml
+%% ID: ibm-not-wf-P44-ibm44n01.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P44-ibm44n01'(suite) -> [];
+'ibm-not-wf-P44-ibm44n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P44/ibm44n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P44/ibm44n02.xml
+%% ID: ibm-not-wf-P44-ibm44n02.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P44-ibm44n02'(suite) -> [];
+'ibm-not-wf-P44-ibm44n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P44/ibm44n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P44/ibm44n03.xml
+%% ID: ibm-not-wf-P44-ibm44n03.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P44-ibm44n03'(suite) -> [];
+'ibm-not-wf-P44-ibm44n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P44/ibm44n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P44/ibm44n04.xml
+%% ID: ibm-not-wf-P44-ibm44n04.xml
+%% Type: not-wf
+%% Sections: 3.1
+'ibm-not-wf-P44-ibm44n04'(suite) -> [];
+'ibm-not-wf-P44-ibm44n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P44/ibm44n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 44
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P45/ibm45n01.xml
+%% ID: ibm-not-wf-P45-ibm45n01.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P45-ibm45n01'(suite) -> [];
+'ibm-not-wf-P45-ibm45n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P45/ibm45n02.xml
+%% ID: ibm-not-wf-P45-ibm45n02.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P45-ibm45n02'(suite) -> [];
+'ibm-not-wf-P45-ibm45n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P45/ibm45n03.xml
+%% ID: ibm-not-wf-P45-ibm45n03.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P45-ibm45n03'(suite) -> [];
+'ibm-not-wf-P45-ibm45n03'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P45/ibm45n04.xml
+%% ID: ibm-not-wf-P45-ibm45n04.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P45-ibm45n04'(suite) -> [];
+'ibm-not-wf-P45-ibm45n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P45/ibm45n05.xml
+%% ID: ibm-not-wf-P45-ibm45n05.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P45-ibm45n05'(suite) -> [];
+'ibm-not-wf-P45-ibm45n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P45/ibm45n06.xml
+%% ID: ibm-not-wf-P45-ibm45n06.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P45-ibm45n06'(suite) -> [];
+'ibm-not-wf-P45-ibm45n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P45/ibm45n07.xml
+%% ID: ibm-not-wf-P45-ibm45n07.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P45-ibm45n07'(suite) -> [];
+'ibm-not-wf-P45-ibm45n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P45/ibm45n08.xml
+%% ID: ibm-not-wf-P45-ibm45n08.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P45-ibm45n08'(suite) -> [];
+'ibm-not-wf-P45-ibm45n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P45/ibm45n09.xml
+%% ID: ibm-not-wf-P45-ibm45n09.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P45-ibm45n09'(suite) -> [];
+'ibm-not-wf-P45-ibm45n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 45
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P46/ibm46n01.xml
+%% ID: ibm-not-wf-P46-ibm46n01.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P46-ibm46n01'(suite) -> [];
+'ibm-not-wf-P46-ibm46n01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P46/ibm46n01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P46/ibm46n02.xml
+%% ID: ibm-not-wf-P46-ibm46n02.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P46-ibm46n02'(suite) -> [];
+'ibm-not-wf-P46-ibm46n02'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P46/ibm46n02.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P46/ibm46n03.xml
+%% ID: ibm-not-wf-P46-ibm46n03.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P46-ibm46n03'(suite) -> [];
+'ibm-not-wf-P46-ibm46n03'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P46/ibm46n03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P46/ibm46n04.xml
+%% ID: ibm-not-wf-P46-ibm46n04.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P46-ibm46n04'(suite) -> [];
+'ibm-not-wf-P46-ibm46n04'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P46/ibm46n04.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P46/ibm46n05.xml
+%% ID: ibm-not-wf-P46-ibm46n05.xml
+%% Type: not-wf
+%% Sections: 3.2
+'ibm-not-wf-P46-ibm46n05'(suite) -> [];
+'ibm-not-wf-P46-ibm46n05'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P46/ibm46n05.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 46
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P47/ibm47n01.xml
+%% ID: ibm-not-wf-P47-ibm47n01.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P47-ibm47n01'(suite) -> [];
+'ibm-not-wf-P47-ibm47n01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P47/ibm47n02.xml
+%% ID: ibm-not-wf-P47-ibm47n02.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P47-ibm47n02'(suite) -> [];
+'ibm-not-wf-P47-ibm47n02'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n02.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P47/ibm47n03.xml
+%% ID: ibm-not-wf-P47-ibm47n03.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P47-ibm47n03'(suite) -> [];
+'ibm-not-wf-P47-ibm47n03'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P47/ibm47n04.xml
+%% ID: ibm-not-wf-P47-ibm47n04.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P47-ibm47n04'(suite) -> [];
+'ibm-not-wf-P47-ibm47n04'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n04.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P47/ibm47n05.xml
+%% ID: ibm-not-wf-P47-ibm47n05.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P47-ibm47n05'(suite) -> [];
+'ibm-not-wf-P47-ibm47n05'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n05.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P47/ibm47n06.xml
+%% ID: ibm-not-wf-P47-ibm47n06.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P47-ibm47n06'(suite) -> [];
+'ibm-not-wf-P47-ibm47n06'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n06.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 47
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P48/ibm48n01.xml
+%% ID: ibm-not-wf-P48-ibm48n01.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P48-ibm48n01'(suite) -> [];
+'ibm-not-wf-P48-ibm48n01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P48/ibm48n02.xml
+%% ID: ibm-not-wf-P48-ibm48n02.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P48-ibm48n02'(suite) -> [];
+'ibm-not-wf-P48-ibm48n02'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n02.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P48/ibm48n03.xml
+%% ID: ibm-not-wf-P48-ibm48n03.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P48-ibm48n03'(suite) -> [];
+'ibm-not-wf-P48-ibm48n03'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P48/ibm48n04.xml
+%% ID: ibm-not-wf-P48-ibm48n04.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P48-ibm48n04'(suite) -> [];
+'ibm-not-wf-P48-ibm48n04'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n04.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P48/ibm48n05.xml
+%% ID: ibm-not-wf-P48-ibm48n05.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P48-ibm48n05'(suite) -> [];
+'ibm-not-wf-P48-ibm48n05'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n05.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P48/ibm48n06.xml
+%% ID: ibm-not-wf-P48-ibm48n06.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P48-ibm48n06'(suite) -> [];
+'ibm-not-wf-P48-ibm48n06'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n06.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P48/ibm48n07.xml
+%% ID: ibm-not-wf-P48-ibm48n07.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P48-ibm48n07'(suite) -> [];
+'ibm-not-wf-P48-ibm48n07'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n07.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 48
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P49/ibm49n01.xml
+%% ID: ibm-not-wf-P49-ibm49n01.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P49-ibm49n01'(suite) -> [];
+'ibm-not-wf-P49-ibm49n01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P49/ibm49n02.xml
+%% ID: ibm-not-wf-P49-ibm49n02.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P49-ibm49n02'(suite) -> [];
+'ibm-not-wf-P49-ibm49n02'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n02.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P49/ibm49n03.xml
+%% ID: ibm-not-wf-P49-ibm49n03.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P49-ibm49n03'(suite) -> [];
+'ibm-not-wf-P49-ibm49n03'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P49/ibm49n04.xml
+%% ID: ibm-not-wf-P49-ibm49n04.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P49-ibm49n04'(suite) -> [];
+'ibm-not-wf-P49-ibm49n04'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n04.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P49/ibm49n05.xml
+%% ID: ibm-not-wf-P49-ibm49n05.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P49-ibm49n05'(suite) -> [];
+'ibm-not-wf-P49-ibm49n05'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n05.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P49/ibm49n06.xml
+%% ID: ibm-not-wf-P49-ibm49n06.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P49-ibm49n06'(suite) -> [];
+'ibm-not-wf-P49-ibm49n06'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n06.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 49
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P50/ibm50n01.xml
+%% ID: ibm-not-wf-P50-ibm50n01.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P50-ibm50n01'(suite) -> [];
+'ibm-not-wf-P50-ibm50n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P50/ibm50n02.xml
+%% ID: ibm-not-wf-P50-ibm50n02.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P50-ibm50n02'(suite) -> [];
+'ibm-not-wf-P50-ibm50n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P50/ibm50n03.xml
+%% ID: ibm-not-wf-P50-ibm50n03.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P50-ibm50n03'(suite) -> [];
+'ibm-not-wf-P50-ibm50n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P50/ibm50n04.xml
+%% ID: ibm-not-wf-P50-ibm50n04.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P50-ibm50n04'(suite) -> [];
+'ibm-not-wf-P50-ibm50n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P50/ibm50n05.xml
+%% ID: ibm-not-wf-P50-ibm50n05.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P50-ibm50n05'(suite) -> [];
+'ibm-not-wf-P50-ibm50n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P50/ibm50n06.xml
+%% ID: ibm-not-wf-P50-ibm50n06.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P50-ibm50n06'(suite) -> [];
+'ibm-not-wf-P50-ibm50n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P50/ibm50n07.xml
+%% ID: ibm-not-wf-P50-ibm50n07.xml
+%% Type: not-wf
+%% Sections: 3.2.1
+'ibm-not-wf-P50-ibm50n07'(suite) -> [];
+'ibm-not-wf-P50-ibm50n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 50
+
+testcases67(suite) -> [].
+%%   ['ibm-not-wf-P50-ibm50n01','ibm-not-wf-P50-ibm50n02','ibm-not-wf-P50-ibm50n03','ibm-not-wf-P50-ibm50n04','ibm-not-wf-P50-ibm50n05','ibm-not-wf-P50-ibm50n06','ibm-not-wf-P50-ibm50n07'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P51/ibm51n01.xml
+%% ID: ibm-not-wf-P51-ibm51n01.xml
+%% Type: not-wf
+%% Sections: 3.2.2
+'ibm-not-wf-P51-ibm51n01'(suite) -> [];
+'ibm-not-wf-P51-ibm51n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P51/ibm51n02.xml
+%% ID: ibm-not-wf-P51-ibm51n02.xml
+%% Type: not-wf
+%% Sections: 3.2.2
+'ibm-not-wf-P51-ibm51n02'(suite) -> [];
+'ibm-not-wf-P51-ibm51n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P51/ibm51n03.xml
+%% ID: ibm-not-wf-P51-ibm51n03.xml
+%% Type: not-wf
+%% Sections: 3.2.2
+'ibm-not-wf-P51-ibm51n03'(suite) -> [];
+'ibm-not-wf-P51-ibm51n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P51/ibm51n04.xml
+%% ID: ibm-not-wf-P51-ibm51n04.xml
+%% Type: not-wf
+%% Sections: 3.2.2
+'ibm-not-wf-P51-ibm51n04'(suite) -> [];
+'ibm-not-wf-P51-ibm51n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P51/ibm51n05.xml
+%% ID: ibm-not-wf-P51-ibm51n05.xml
+%% Type: not-wf
+%% Sections: 3.2.2
+'ibm-not-wf-P51-ibm51n05'(suite) -> [];
+'ibm-not-wf-P51-ibm51n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P51/ibm51n06.xml
+%% ID: ibm-not-wf-P51-ibm51n06.xml
+%% Type: not-wf
+%% Sections: 3.2.2
+'ibm-not-wf-P51-ibm51n06'(suite) -> [];
+'ibm-not-wf-P51-ibm51n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P51/ibm51n07.xml
+%% ID: ibm-not-wf-P51-ibm51n07.xml
+%% Type: not-wf
+%% Sections: 3.2.2
+'ibm-not-wf-P51-ibm51n07'(suite) -> [];
+'ibm-not-wf-P51-ibm51n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 51
+
+testcases68(suite) -> [].
+%%   ['ibm-not-wf-P51-ibm51n01','ibm-not-wf-P51-ibm51n02','ibm-not-wf-P51-ibm51n03','ibm-not-wf-P51-ibm51n04','ibm-not-wf-P51-ibm51n05','ibm-not-wf-P51-ibm51n06','ibm-not-wf-P51-ibm51n07'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P52/ibm52n01.xml
+%% ID: ibm-not-wf-P52-ibm52n01.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P52-ibm52n01'(suite) -> [];
+'ibm-not-wf-P52-ibm52n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P52/ibm52n02.xml
+%% ID: ibm-not-wf-P52-ibm52n02.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P52-ibm52n02'(suite) -> [];
+'ibm-not-wf-P52-ibm52n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P52/ibm52n03.xml
+%% ID: ibm-not-wf-P52-ibm52n03.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P52-ibm52n03'(suite) -> [];
+'ibm-not-wf-P52-ibm52n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P52/ibm52n04.xml
+%% ID: ibm-not-wf-P52-ibm52n04.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P52-ibm52n04'(suite) -> [];
+'ibm-not-wf-P52-ibm52n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P52/ibm52n05.xml
+%% ID: ibm-not-wf-P52-ibm52n05.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P52-ibm52n05'(suite) -> [];
+'ibm-not-wf-P52-ibm52n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P52/ibm52n06.xml
+%% ID: ibm-not-wf-P52-ibm52n06.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P52-ibm52n06'(suite) -> [];
+'ibm-not-wf-P52-ibm52n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 52
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P53/ibm53n01.xml
+%% ID: ibm-not-wf-P53-ibm53n01.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P53-ibm53n01'(suite) -> [];
+'ibm-not-wf-P53-ibm53n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P53/ibm53n02.xml
+%% ID: ibm-not-wf-P53-ibm53n02.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P53-ibm53n02'(suite) -> [];
+'ibm-not-wf-P53-ibm53n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P53/ibm53n03.xml
+%% ID: ibm-not-wf-P53-ibm53n03.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P53-ibm53n03'(suite) -> [];
+'ibm-not-wf-P53-ibm53n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P53/ibm53n04.xml
+%% ID: ibm-not-wf-P53-ibm53n04.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P53-ibm53n04'(suite) -> [];
+'ibm-not-wf-P53-ibm53n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P53/ibm53n05.xml
+%% ID: ibm-not-wf-P53-ibm53n05.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P53-ibm53n05'(suite) -> [];
+'ibm-not-wf-P53-ibm53n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P53/ibm53n06.xml
+%% ID: ibm-not-wf-P53-ibm53n06.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P53-ibm53n06'(suite) -> [];
+'ibm-not-wf-P53-ibm53n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P53/ibm53n07.xml
+%% ID: ibm-not-wf-P53-ibm53n07.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P53-ibm53n07'(suite) -> [];
+'ibm-not-wf-P53-ibm53n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P53/ibm53n08.xml
+%% ID: ibm-not-wf-P53-ibm53n08.xml
+%% Type: not-wf
+%% Sections: 3.3
+'ibm-not-wf-P53-ibm53n08'(suite) -> [];
+'ibm-not-wf-P53-ibm53n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 53
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P54/ibm54n01.xml
+%% ID: ibm-not-wf-P54-ibm54n01.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P54-ibm54n01'(suite) -> [];
+'ibm-not-wf-P54-ibm54n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P54/ibm54n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P54/ibm54n02.xml
+%% ID: ibm-not-wf-P54-ibm54n02.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P54-ibm54n02'(suite) -> [];
+'ibm-not-wf-P54-ibm54n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P54/ibm54n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 54
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P55/ibm55n01.xml
+%% ID: ibm-not-wf-P55-ibm55n01.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P55-ibm55n01'(suite) -> [];
+'ibm-not-wf-P55-ibm55n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P55/ibm55n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P55/ibm55n02.xml
+%% ID: ibm-not-wf-P55-ibm55n02.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P55-ibm55n02'(suite) -> [];
+'ibm-not-wf-P55-ibm55n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P55/ibm55n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P55/ibm55n03.xml
+%% ID: ibm-not-wf-P55-ibm55n03.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P55-ibm55n03'(suite) -> [];
+'ibm-not-wf-P55-ibm55n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P55/ibm55n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 55
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P56/ibm56n01.xml
+%% ID: ibm-not-wf-P56-ibm56n01.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P56-ibm56n01'(suite) -> [];
+'ibm-not-wf-P56-ibm56n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P56/ibm56n02.xml
+%% ID: ibm-not-wf-P56-ibm56n02.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P56-ibm56n02'(suite) -> [];
+'ibm-not-wf-P56-ibm56n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P56/ibm56n03.xml
+%% ID: ibm-not-wf-P56-ibm56n03.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P56-ibm56n03'(suite) -> [];
+'ibm-not-wf-P56-ibm56n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P56/ibm56n04.xml
+%% ID: ibm-not-wf-P56-ibm56n04.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P56-ibm56n04'(suite) -> [];
+'ibm-not-wf-P56-ibm56n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P56/ibm56n05.xml
+%% ID: ibm-not-wf-P56-ibm56n05.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P56-ibm56n05'(suite) -> [];
+'ibm-not-wf-P56-ibm56n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P56/ibm56n06.xml
+%% ID: ibm-not-wf-P56-ibm56n06.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P56-ibm56n06'(suite) -> [];
+'ibm-not-wf-P56-ibm56n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P56/ibm56n07.xml
+%% ID: ibm-not-wf-P56-ibm56n07.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P56-ibm56n07'(suite) -> [];
+'ibm-not-wf-P56-ibm56n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 56
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P57/ibm57n01.xml
+%% ID: ibm-not-wf-P57-ibm57n01.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P57-ibm57n01'(suite) -> [];
+'ibm-not-wf-P57-ibm57n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P57/ibm57n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 57
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P58/ibm58n01.xml
+%% ID: ibm-not-wf-P58-ibm58n01.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P58-ibm58n01'(suite) -> [];
+'ibm-not-wf-P58-ibm58n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P58/ibm58n02.xml
+%% ID: ibm-not-wf-P58-ibm58n02.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P58-ibm58n02'(suite) -> [];
+'ibm-not-wf-P58-ibm58n02'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n02.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P58/ibm58n03.xml
+%% ID: ibm-not-wf-P58-ibm58n03.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P58-ibm58n03'(suite) -> [];
+'ibm-not-wf-P58-ibm58n03'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P58/ibm58n04.xml
+%% ID: ibm-not-wf-P58-ibm58n04.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P58-ibm58n04'(suite) -> [];
+'ibm-not-wf-P58-ibm58n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P58/ibm58n05.xml
+%% ID: ibm-not-wf-P58-ibm58n05.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P58-ibm58n05'(suite) -> [];
+'ibm-not-wf-P58-ibm58n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P58/ibm58n06.xml
+%% ID: ibm-not-wf-P58-ibm58n06.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P58-ibm58n06'(suite) -> [];
+'ibm-not-wf-P58-ibm58n06'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n06.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P58/ibm58n07.xml
+%% ID: ibm-not-wf-P58-ibm58n07.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P58-ibm58n07'(suite) -> [];
+'ibm-not-wf-P58-ibm58n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P58/ibm58n08.xml
+%% ID: ibm-not-wf-P58-ibm58n08.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P58-ibm58n08'(suite) -> [];
+'ibm-not-wf-P58-ibm58n08'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n08.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 58
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P59/ibm59n01.xml
+%% ID: ibm-not-wf-P59-ibm59n01.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P59-ibm59n01'(suite) -> [];
+'ibm-not-wf-P59-ibm59n01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P59/ibm59n02.xml
+%% ID: ibm-not-wf-P59-ibm59n02.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P59-ibm59n02'(suite) -> [];
+'ibm-not-wf-P59-ibm59n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P59/ibm59n03.xml
+%% ID: ibm-not-wf-P59-ibm59n03.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P59-ibm59n03'(suite) -> [];
+'ibm-not-wf-P59-ibm59n03'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P59/ibm59n04.xml
+%% ID: ibm-not-wf-P59-ibm59n04.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P59-ibm59n04'(suite) -> [];
+'ibm-not-wf-P59-ibm59n04'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n04.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P59/ibm59n05.xml
+%% ID: ibm-not-wf-P59-ibm59n05.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P59-ibm59n05'(suite) -> [];
+'ibm-not-wf-P59-ibm59n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P59/ibm59n06.xml
+%% ID: ibm-not-wf-P59-ibm59n06.xml
+%% Type: not-wf
+%% Sections: 3.3.1
+'ibm-not-wf-P59-ibm59n06'(suite) -> [];
+'ibm-not-wf-P59-ibm59n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 59
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P60/ibm60n01.xml
+%% ID: ibm-not-wf-P60-ibm60n01.xml
+%% Type: not-wf
+%% Sections: 3.3.2
+'ibm-not-wf-P60-ibm60n01'(suite) -> [];
+'ibm-not-wf-P60-ibm60n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P60/ibm60n02.xml
+%% ID: ibm-not-wf-P60-ibm60n02.xml
+%% Type: not-wf
+%% Sections: 3.3.2
+'ibm-not-wf-P60-ibm60n02'(suite) -> [];
+'ibm-not-wf-P60-ibm60n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P60/ibm60n03.xml
+%% ID: ibm-not-wf-P60-ibm60n03.xml
+%% Type: not-wf
+%% Sections: 3.3.2
+'ibm-not-wf-P60-ibm60n03'(suite) -> [];
+'ibm-not-wf-P60-ibm60n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P60/ibm60n04.xml
+%% ID: ibm-not-wf-P60-ibm60n04.xml
+%% Type: not-wf
+%% Sections: 3.3.2
+'ibm-not-wf-P60-ibm60n04'(suite) -> [];
+'ibm-not-wf-P60-ibm60n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P60/ibm60n05.xml
+%% ID: ibm-not-wf-P60-ibm60n05.xml
+%% Type: not-wf
+%% Sections: 3.3.2
+'ibm-not-wf-P60-ibm60n05'(suite) -> [];
+'ibm-not-wf-P60-ibm60n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P60/ibm60n06.xml
+%% ID: ibm-not-wf-P60-ibm60n06.xml
+%% Type: not-wf
+%% Sections: 3.3.2
+'ibm-not-wf-P60-ibm60n06'(suite) -> [];
+'ibm-not-wf-P60-ibm60n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P60/ibm60n07.xml
+%% ID: ibm-not-wf-P60-ibm60n07.xml
+%% Type: not-wf
+%% Sections: 3.3.2
+'ibm-not-wf-P60-ibm60n07'(suite) -> [];
+'ibm-not-wf-P60-ibm60n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P60/ibm60n08.xml
+%% ID: ibm-not-wf-P60-ibm60n08.xml
+%% Type: not-wf
+%% Sections: 3.3.2
+'ibm-not-wf-P60-ibm60n08'(suite) -> [];
+'ibm-not-wf-P60-ibm60n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 60
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P61/ibm61n01.xml
+%% ID: ibm-not-wf-P61-ibm61n01.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P61-ibm61n01'(suite) -> [];
+'ibm-not-wf-P61-ibm61n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P61/ibm61n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 61
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P62/ibm62n01.xml
+%% ID: ibm-not-wf-P62-ibm62n01.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P62-ibm62n01'(suite) -> [];
+'ibm-not-wf-P62-ibm62n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P62/ibm62n02.xml
+%% ID: ibm-not-wf-P62-ibm62n02.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P62-ibm62n02'(suite) -> [];
+'ibm-not-wf-P62-ibm62n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P62/ibm62n03.xml
+%% ID: ibm-not-wf-P62-ibm62n03.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P62-ibm62n03'(suite) -> [];
+'ibm-not-wf-P62-ibm62n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P62/ibm62n04.xml
+%% ID: ibm-not-wf-P62-ibm62n04.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P62-ibm62n04'(suite) -> [];
+'ibm-not-wf-P62-ibm62n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P62/ibm62n05.xml
+%% ID: ibm-not-wf-P62-ibm62n05.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P62-ibm62n05'(suite) -> [];
+'ibm-not-wf-P62-ibm62n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P62/ibm62n06.xml
+%% ID: ibm-not-wf-P62-ibm62n06.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P62-ibm62n06'(suite) -> [];
+'ibm-not-wf-P62-ibm62n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P62/ibm62n07.xml
+%% ID: ibm-not-wf-P62-ibm62n07.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P62-ibm62n07'(suite) -> [];
+'ibm-not-wf-P62-ibm62n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P62/ibm62n08.xml
+%% ID: ibm-not-wf-P62-ibm62n08.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P62-ibm62n08'(suite) -> [];
+'ibm-not-wf-P62-ibm62n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 62
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P63/ibm63n01.xml
+%% ID: ibm-not-wf-P63-ibm63n01.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P63-ibm63n01'(suite) -> [];
+'ibm-not-wf-P63-ibm63n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P63/ibm63n02.xml
+%% ID: ibm-not-wf-P63-ibm63n02.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P63-ibm63n02'(suite) -> [];
+'ibm-not-wf-P63-ibm63n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P63/ibm63n03.xml
+%% ID: ibm-not-wf-P63-ibm63n03.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P63-ibm63n03'(suite) -> [];
+'ibm-not-wf-P63-ibm63n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P63/ibm63n04.xml
+%% ID: ibm-not-wf-P63-ibm63n04.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P63-ibm63n04'(suite) -> [];
+'ibm-not-wf-P63-ibm63n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P63/ibm63n05.xml
+%% ID: ibm-not-wf-P63-ibm63n05.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P63-ibm63n05'(suite) -> [];
+'ibm-not-wf-P63-ibm63n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P63/ibm63n06.xml
+%% ID: ibm-not-wf-P63-ibm63n06.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P63-ibm63n06'(suite) -> [];
+'ibm-not-wf-P63-ibm63n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P63/ibm63n07.xml
+%% ID: ibm-not-wf-P63-ibm63n07.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P63-ibm63n07'(suite) -> [];
+'ibm-not-wf-P63-ibm63n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 63
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P64/ibm64n01.xml
+%% ID: ibm-not-wf-P64-ibm64n01.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P64-ibm64n01'(suite) -> [];
+'ibm-not-wf-P64-ibm64n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P64/ibm64n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P64/ibm64n02.xml
+%% ID: ibm-not-wf-P64-ibm64n02.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P64-ibm64n02'(suite) -> [];
+'ibm-not-wf-P64-ibm64n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P64/ibm64n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P64/ibm64n03.xml
+%% ID: ibm-not-wf-P64-ibm64n03.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P64-ibm64n03'(suite) -> [];
+'ibm-not-wf-P64-ibm64n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P64/ibm64n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 64
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P65/ibm65n01.xml
+%% ID: ibm-not-wf-P65-ibm65n01.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P65-ibm65n01'(suite) -> [];
+'ibm-not-wf-P65-ibm65n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P65/ibm65n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P65/ibm65n02.xml
+%% ID: ibm-not-wf-P65-ibm65n02.xml
+%% Type: not-wf
+%% Sections: 3.4
+'ibm-not-wf-P65-ibm65n02'(suite) -> [];
+'ibm-not-wf-P65-ibm65n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P65/ibm65n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 65
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n01.xml
+%% ID: ibm-not-wf-P66-ibm66n01.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n01'(suite) -> [];
+'ibm-not-wf-P66-ibm66n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n02.xml
+%% ID: ibm-not-wf-P66-ibm66n02.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n02'(suite) -> [];
+'ibm-not-wf-P66-ibm66n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n03.xml
+%% ID: ibm-not-wf-P66-ibm66n03.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n03'(suite) -> [];
+'ibm-not-wf-P66-ibm66n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n04.xml
+%% ID: ibm-not-wf-P66-ibm66n04.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n04'(suite) -> [];
+'ibm-not-wf-P66-ibm66n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n05.xml
+%% ID: ibm-not-wf-P66-ibm66n05.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n05'(suite) -> [];
+'ibm-not-wf-P66-ibm66n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n06.xml
+%% ID: ibm-not-wf-P66-ibm66n06.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n06'(suite) -> [];
+'ibm-not-wf-P66-ibm66n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n07.xml
+%% ID: ibm-not-wf-P66-ibm66n07.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n07'(suite) -> [];
+'ibm-not-wf-P66-ibm66n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n08.xml
+%% ID: ibm-not-wf-P66-ibm66n08.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n08'(suite) -> [];
+'ibm-not-wf-P66-ibm66n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n09.xml
+%% ID: ibm-not-wf-P66-ibm66n09.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n09'(suite) -> [];
+'ibm-not-wf-P66-ibm66n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n10.xml
+%% ID: ibm-not-wf-P66-ibm66n10.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n10'(suite) -> [];
+'ibm-not-wf-P66-ibm66n10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n11.xml
+%% ID: ibm-not-wf-P66-ibm66n11.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n11'(suite) -> [];
+'ibm-not-wf-P66-ibm66n11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n12.xml
+%% ID: ibm-not-wf-P66-ibm66n12.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n12'(suite) -> [];
+'ibm-not-wf-P66-ibm66n12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n13.xml
+%% ID: ibm-not-wf-P66-ibm66n13.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n13'(suite) -> [];
+'ibm-not-wf-P66-ibm66n13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n14.xml
+%% ID: ibm-not-wf-P66-ibm66n14.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n14'(suite) -> [];
+'ibm-not-wf-P66-ibm66n14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P66/ibm66n15.xml
+%% ID: ibm-not-wf-P66-ibm66n15.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P66-ibm66n15'(suite) -> [];
+'ibm-not-wf-P66-ibm66n15'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n15.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 66
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P68/ibm68n01.xml
+%% ID: ibm-not-wf-P68-ibm68n01.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P68-ibm68n01'(suite) -> [];
+'ibm-not-wf-P68-ibm68n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P68/ibm68n02.xml
+%% ID: ibm-not-wf-P68-ibm68n02.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P68-ibm68n02'(suite) -> [];
+'ibm-not-wf-P68-ibm68n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P68/ibm68n03.xml
+%% ID: ibm-not-wf-P68-ibm68n03.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P68-ibm68n03'(suite) -> [];
+'ibm-not-wf-P68-ibm68n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P68/ibm68n04.xml
+%% ID: ibm-not-wf-P68-ibm68n04.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P68-ibm68n04'(suite) -> [];
+'ibm-not-wf-P68-ibm68n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P68/ibm68n05.xml
+%% ID: ibm-not-wf-P68-ibm68n05.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P68-ibm68n05'(suite) -> [];
+'ibm-not-wf-P68-ibm68n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P68/ibm68n06.xml
+%% ID: ibm-not-wf-P68-ibm68n06.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P68-ibm68n06'(suite) -> [];
+'ibm-not-wf-P68-ibm68n06'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n06.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P68/ibm68n07.xml
+%% ID: ibm-not-wf-P68-ibm68n07.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P68-ibm68n07'(suite) -> [];
+'ibm-not-wf-P68-ibm68n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P68/ibm68n08.xml
+%% ID: ibm-not-wf-P68-ibm68n08.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P68-ibm68n08'(suite) -> [];
+'ibm-not-wf-P68-ibm68n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P68/ibm68n09.xml
+%% ID: ibm-not-wf-P68-ibm68n09.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P68-ibm68n09'(suite) -> [];
+'ibm-not-wf-P68-ibm68n09'(_Config) ->  {skip, "No loop detection yet"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n09.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P68/ibm68n10.xml
+%% ID: ibm-not-wf-P68-ibm68n10.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P68-ibm68n10'(suite) -> [];
+'ibm-not-wf-P68-ibm68n10'(_Config) ->  {skip, "No loop detection yet"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n10.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 68
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P69/ibm69n01.xml
+%% ID: ibm-not-wf-P69-ibm69n01.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P69-ibm69n01'(suite) -> [];
+'ibm-not-wf-P69-ibm69n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P69/ibm69n02.xml
+%% ID: ibm-not-wf-P69-ibm69n02.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P69-ibm69n02'(suite) -> [];
+'ibm-not-wf-P69-ibm69n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P69/ibm69n03.xml
+%% ID: ibm-not-wf-P69-ibm69n03.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P69-ibm69n03'(suite) -> [];
+'ibm-not-wf-P69-ibm69n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P69/ibm69n04.xml
+%% ID: ibm-not-wf-P69-ibm69n04.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P69-ibm69n04'(suite) -> [];
+'ibm-not-wf-P69-ibm69n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P69/ibm69n05.xml
+%% ID: ibm-not-wf-P69-ibm69n05.xml
+%% Type: error
+%% Sections: 4.1
+'ibm-not-wf-P69-ibm69n05'(suite) -> [];
+'ibm-not-wf-P69-ibm69n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "error").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P69/ibm69n06.xml
+%% ID: ibm-not-wf-P69-ibm69n06.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P69-ibm69n06'(suite) -> [];
+'ibm-not-wf-P69-ibm69n06'(_Config) ->  {skip, "No loop detection yet"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n06.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P69/ibm69n07.xml
+%% ID: ibm-not-wf-P69-ibm69n07.xml
+%% Type: not-wf
+%% Sections: 4.1
+'ibm-not-wf-P69-ibm69n07'(suite) -> [];
+'ibm-not-wf-P69-ibm69n07'(_Config) ->  {skip, "No loop detection yet"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n07.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 69
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P71/ibm70n01.xml
+%% ID: ibm-not-wf-P71-ibm70n01.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P71-ibm70n01'(suite) -> [];
+'ibm-not-wf-P71-ibm70n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm70n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P71/ibm71n01.xml
+%% ID: ibm-not-wf-P71-ibm71n01.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P71-ibm71n01'(suite) -> [];
+'ibm-not-wf-P71-ibm71n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P71/ibm71n02.xml
+%% ID: ibm-not-wf-P71-ibm71n02.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P71-ibm71n02'(suite) -> [];
+'ibm-not-wf-P71-ibm71n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P71/ibm71n03.xml
+%% ID: ibm-not-wf-P71-ibm71n03.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P71-ibm71n03'(suite) -> [];
+'ibm-not-wf-P71-ibm71n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P71/ibm71n04.xml
+%% ID: ibm-not-wf-P71-ibm71n04.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P71-ibm71n04'(suite) -> [];
+'ibm-not-wf-P71-ibm71n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P71/ibm71n05.xml
+%% ID: ibm-not-wf-P71-ibm71n05.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P71-ibm71n05'(suite) -> [];
+'ibm-not-wf-P71-ibm71n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P71/ibm71n06.xml
+%% ID: ibm-not-wf-P71-ibm71n06.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P71-ibm71n06'(suite) -> [];
+'ibm-not-wf-P71-ibm71n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P71/ibm71n07.xml
+%% ID: ibm-not-wf-P71-ibm71n07.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P71-ibm71n07'(suite) -> [];
+'ibm-not-wf-P71-ibm71n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P71/ibm71n08.xml
+%% ID: ibm-not-wf-P71-ibm71n08.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P71-ibm71n08'(suite) -> [];
+'ibm-not-wf-P71-ibm71n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 71
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P72/ibm72n01.xml
+%% ID: ibm-not-wf-P72-ibm72n01.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P72-ibm72n01'(suite) -> [];
+'ibm-not-wf-P72-ibm72n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P72/ibm72n02.xml
+%% ID: ibm-not-wf-P72-ibm72n02.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P72-ibm72n02'(suite) -> [];
+'ibm-not-wf-P72-ibm72n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P72/ibm72n03.xml
+%% ID: ibm-not-wf-P72-ibm72n03.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P72-ibm72n03'(suite) -> [];
+'ibm-not-wf-P72-ibm72n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P72/ibm72n04.xml
+%% ID: ibm-not-wf-P72-ibm72n04.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P72-ibm72n04'(suite) -> [];
+'ibm-not-wf-P72-ibm72n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P72/ibm72n05.xml
+%% ID: ibm-not-wf-P72-ibm72n05.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P72-ibm72n05'(suite) -> [];
+'ibm-not-wf-P72-ibm72n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P72/ibm72n06.xml
+%% ID: ibm-not-wf-P72-ibm72n06.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P72-ibm72n06'(suite) -> [];
+'ibm-not-wf-P72-ibm72n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P72/ibm72n07.xml
+%% ID: ibm-not-wf-P72-ibm72n07.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P72-ibm72n07'(suite) -> [];
+'ibm-not-wf-P72-ibm72n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P72/ibm72n08.xml
+%% ID: ibm-not-wf-P72-ibm72n08.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P72-ibm72n08'(suite) -> [];
+'ibm-not-wf-P72-ibm72n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P72/ibm72n09.xml
+%% ID: ibm-not-wf-P72-ibm72n09.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P72-ibm72n09'(suite) -> [];
+'ibm-not-wf-P72-ibm72n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 72
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P73/ibm73n01.xml
+%% ID: ibm-not-wf-P73-ibm73n01.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P73-ibm73n01'(suite) -> [];
+'ibm-not-wf-P73-ibm73n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P73/ibm73n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P73/ibm73n03.xml
+%% ID: ibm-not-wf-P73-ibm73n03.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P73-ibm73n03'(suite) -> [];
+'ibm-not-wf-P73-ibm73n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P73/ibm73n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 73
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P74/ibm74n01.xml
+%% ID: ibm-not-wf-P74-ibm74n01.xml
+%% Type: not-wf
+%% Sections: 4.2
+'ibm-not-wf-P74-ibm74n01'(suite) -> [];
+'ibm-not-wf-P74-ibm74n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P74/ibm74n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 74
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n01.xml
+%% ID: ibm-not-wf-P75-ibm75n01.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n01'(suite) -> [];
+'ibm-not-wf-P75-ibm75n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n02.xml
+%% ID: ibm-not-wf-P75-ibm75n02.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n02'(suite) -> [];
+'ibm-not-wf-P75-ibm75n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n03.xml
+%% ID: ibm-not-wf-P75-ibm75n03.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n03'(suite) -> [];
+'ibm-not-wf-P75-ibm75n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n04.xml
+%% ID: ibm-not-wf-P75-ibm75n04.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n04'(suite) -> [];
+'ibm-not-wf-P75-ibm75n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n05.xml
+%% ID: ibm-not-wf-P75-ibm75n05.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n05'(suite) -> [];
+'ibm-not-wf-P75-ibm75n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n06.xml
+%% ID: ibm-not-wf-P75-ibm75n06.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n06'(suite) -> [];
+'ibm-not-wf-P75-ibm75n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n07.xml
+%% ID: ibm-not-wf-P75-ibm75n07.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n07'(suite) -> [];
+'ibm-not-wf-P75-ibm75n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n08.xml
+%% ID: ibm-not-wf-P75-ibm75n08.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n08'(suite) -> [];
+'ibm-not-wf-P75-ibm75n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n09.xml
+%% ID: ibm-not-wf-P75-ibm75n09.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n09'(suite) -> [];
+'ibm-not-wf-P75-ibm75n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n10.xml
+%% ID: ibm-not-wf-P75-ibm75n10.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n10'(suite) -> [];
+'ibm-not-wf-P75-ibm75n10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n11.xml
+%% ID: ibm-not-wf-P75-ibm75n11.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n11'(suite) -> [];
+'ibm-not-wf-P75-ibm75n11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n12.xml
+%% ID: ibm-not-wf-P75-ibm75n12.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n12'(suite) -> [];
+'ibm-not-wf-P75-ibm75n12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P75/ibm75n13.xml
+%% ID: ibm-not-wf-P75-ibm75n13.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P75-ibm75n13'(suite) -> [];
+'ibm-not-wf-P75-ibm75n13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 75
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P76/ibm76n01.xml
+%% ID: ibm-not-wf-P76-ibm76n01.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P76-ibm76n01'(suite) -> [];
+'ibm-not-wf-P76-ibm76n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P76/ibm76n02.xml
+%% ID: ibm-not-wf-P76-ibm76n02.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P76-ibm76n02'(suite) -> [];
+'ibm-not-wf-P76-ibm76n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P76/ibm76n03.xml
+%% ID: ibm-not-wf-P76-ibm76n03.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P76-ibm76n03'(suite) -> [];
+'ibm-not-wf-P76-ibm76n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P76/ibm76n04.xml
+%% ID: ibm-not-wf-P76-ibm76n04.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P76-ibm76n04'(suite) -> [];
+'ibm-not-wf-P76-ibm76n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P76/ibm76n05.xml
+%% ID: ibm-not-wf-P76-ibm76n05.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P76-ibm76n05'(suite) -> [];
+'ibm-not-wf-P76-ibm76n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P76/ibm76n06.xml
+%% ID: ibm-not-wf-P76-ibm76n06.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P76-ibm76n06'(suite) -> [];
+'ibm-not-wf-P76-ibm76n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P76/ibm76n07.xml
+%% ID: ibm-not-wf-P76-ibm76n07.xml
+%% Type: not-wf
+%% Sections: 4.2.2
+'ibm-not-wf-P76-ibm76n07'(suite) -> [];
+'ibm-not-wf-P76-ibm76n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 76
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P77/ibm77n01.xml
+%% ID: ibm-not-wf-P77-ibm77n01.xml
+%% Type: not-wf
+%% Sections: 4.3.1
+'ibm-not-wf-P77-ibm77n01'(suite) -> [];
+'ibm-not-wf-P77-ibm77n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P77/ibm77n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P77/ibm77n02.xml
+%% ID: ibm-not-wf-P77-ibm77n02.xml
+%% Type: not-wf
+%% Sections: 4.3.1
+'ibm-not-wf-P77-ibm77n02'(suite) -> [];
+'ibm-not-wf-P77-ibm77n02'(Config) ->  {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P77/ibm77n02.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P77/ibm77n03.xml
+%% ID: ibm-not-wf-P77-ibm77n03.xml
+%% Type: not-wf
+%% Sections: 4.3.1
+'ibm-not-wf-P77-ibm77n03'(suite) -> [];
+'ibm-not-wf-P77-ibm77n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P77/ibm77n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P77/ibm77n04.xml
+%% ID: ibm-not-wf-P77-ibm77n04.xml
+%% Type: not-wf
+%% Sections: 4.3.1
+'ibm-not-wf-P77-ibm77n04'(suite) -> [];
+'ibm-not-wf-P77-ibm77n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P77/ibm77n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 77
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P78/ibm78n01.xml
+%% ID: ibm-not-wf-P78-ibm78n01.xml
+%% Type: not-wf
+%% Sections: 4.3.2
+'ibm-not-wf-P78-ibm78n01'(suite) -> [];
+'ibm-not-wf-P78-ibm78n01'(Config) ->  {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P78/ibm78n01.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P78/ibm78n02.xml
+%% ID: ibm-not-wf-P78-ibm78n02.xml
+%% Type: not-wf
+%% Sections: 4.3.2
+'ibm-not-wf-P78-ibm78n02'(suite) -> [];
+'ibm-not-wf-P78-ibm78n02'(Config) ->  {skip, "Fix 3"}.
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P78/ibm78n02.xml"]),
+   %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   %%?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 78
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P79/ibm79n01.xml
+%% ID: ibm-not-wf-P79-ibm79n01.xml
+%% Type: not-wf
+%% Sections: 4.3.2
+'ibm-not-wf-P79-ibm79n01'(suite) -> [];
+'ibm-not-wf-P79-ibm79n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P79/ibm79n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P79/ibm79n02.xml
+%% ID: ibm-not-wf-P79-ibm79n02.xml
+%% Type: not-wf
+%% Sections: 4.3.2
+'ibm-not-wf-P79-ibm79n02'(suite) -> [];
+'ibm-not-wf-P79-ibm79n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P79/ibm79n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 79
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P80/ibm80n01.xml
+%% ID: ibm-not-wf-P80-ibm80n01.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P80-ibm80n01'(suite) -> [];
+'ibm-not-wf-P80-ibm80n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P80/ibm80n02.xml
+%% ID: ibm-not-wf-P80-ibm80n02.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P80-ibm80n02'(suite) -> [];
+'ibm-not-wf-P80-ibm80n02'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n02.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P80/ibm80n03.xml
+%% ID: ibm-not-wf-P80-ibm80n03.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P80-ibm80n03'(suite) -> [];
+'ibm-not-wf-P80-ibm80n03'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P80/ibm80n04.xml
+%% ID: ibm-not-wf-P80-ibm80n04.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P80-ibm80n04'(suite) -> [];
+'ibm-not-wf-P80-ibm80n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P80/ibm80n05.xml
+%% ID: ibm-not-wf-P80-ibm80n05.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P80-ibm80n05'(suite) -> [];
+'ibm-not-wf-P80-ibm80n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P80/ibm80n06.xml
+%% ID: ibm-not-wf-P80-ibm80n06.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P80-ibm80n06'(suite) -> [];
+'ibm-not-wf-P80-ibm80n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 80
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P81/ibm81n01.xml
+%% ID: ibm-not-wf-P81-ibm81n01.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P81-ibm81n01'(suite) -> [];
+'ibm-not-wf-P81-ibm81n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P81/ibm81n02.xml
+%% ID: ibm-not-wf-P81-ibm81n02.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P81-ibm81n02'(suite) -> [];
+'ibm-not-wf-P81-ibm81n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P81/ibm81n03.xml
+%% ID: ibm-not-wf-P81-ibm81n03.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P81-ibm81n03'(suite) -> [];
+'ibm-not-wf-P81-ibm81n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P81/ibm81n04.xml
+%% ID: ibm-not-wf-P81-ibm81n04.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P81-ibm81n04'(suite) -> [];
+'ibm-not-wf-P81-ibm81n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P81/ibm81n05.xml
+%% ID: ibm-not-wf-P81-ibm81n05.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P81-ibm81n05'(suite) -> [];
+'ibm-not-wf-P81-ibm81n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P81/ibm81n06.xml
+%% ID: ibm-not-wf-P81-ibm81n06.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P81-ibm81n06'(suite) -> [];
+'ibm-not-wf-P81-ibm81n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P81/ibm81n07.xml
+%% ID: ibm-not-wf-P81-ibm81n07.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P81-ibm81n07'(suite) -> [];
+'ibm-not-wf-P81-ibm81n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P81/ibm81n08.xml
+%% ID: ibm-not-wf-P81-ibm81n08.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P81-ibm81n08'(suite) -> [];
+'ibm-not-wf-P81-ibm81n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P81/ibm81n09.xml
+%% ID: ibm-not-wf-P81-ibm81n09.xml
+%% Type: not-wf
+%% Sections: 4.3.3
+'ibm-not-wf-P81-ibm81n09'(suite) -> [];
+'ibm-not-wf-P81-ibm81n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 81
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P82/ibm82n01.xml
+%% ID: ibm-not-wf-P82-ibm82n01.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P82-ibm82n01'(suite) -> [];
+'ibm-not-wf-P82-ibm82n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P82/ibm82n02.xml
+%% ID: ibm-not-wf-P82-ibm82n02.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P82-ibm82n02'(suite) -> [];
+'ibm-not-wf-P82-ibm82n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P82/ibm82n03.xml
+%% ID: ibm-not-wf-P82-ibm82n03.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P82-ibm82n03'(suite) -> [];
+'ibm-not-wf-P82-ibm82n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P82/ibm82n04.xml
+%% ID: ibm-not-wf-P82-ibm82n04.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P82-ibm82n04'(suite) -> [];
+'ibm-not-wf-P82-ibm82n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P82/ibm82n05.xml
+%% ID: ibm-not-wf-P82-ibm82n05.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P82-ibm82n05'(suite) -> [];
+'ibm-not-wf-P82-ibm82n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P82/ibm82n06.xml
+%% ID: ibm-not-wf-P82-ibm82n06.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P82-ibm82n06'(suite) -> [];
+'ibm-not-wf-P82-ibm82n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P82/ibm82n07.xml
+%% ID: ibm-not-wf-P82-ibm82n07.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P82-ibm82n07'(suite) -> [];
+'ibm-not-wf-P82-ibm82n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P82/ibm82n08.xml
+%% ID: ibm-not-wf-P82-ibm82n08.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P82-ibm82n08'(suite) -> [];
+'ibm-not-wf-P82-ibm82n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 82
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P83/ibm83n01.xml
+%% ID: ibm-not-wf-P83-ibm83n01.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P83-ibm83n01'(suite) -> [];
+'ibm-not-wf-P83-ibm83n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P83/ibm83n02.xml
+%% ID: ibm-not-wf-P83-ibm83n02.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P83-ibm83n02'(suite) -> [];
+'ibm-not-wf-P83-ibm83n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P83/ibm83n03.xml
+%% ID: ibm-not-wf-P83-ibm83n03.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P83-ibm83n03'(suite) -> [];
+'ibm-not-wf-P83-ibm83n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P83/ibm83n04.xml
+%% ID: ibm-not-wf-P83-ibm83n04.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P83-ibm83n04'(suite) -> [];
+'ibm-not-wf-P83-ibm83n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P83/ibm83n05.xml
+%% ID: ibm-not-wf-P83-ibm83n05.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P83-ibm83n05'(suite) -> [];
+'ibm-not-wf-P83-ibm83n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P83/ibm83n06.xml
+%% ID: ibm-not-wf-P83-ibm83n06.xml
+%% Type: not-wf
+%% Sections: 4.7
+'ibm-not-wf-P83-ibm83n06'(suite) -> [];
+'ibm-not-wf-P83-ibm83n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 83
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n01.xml
+%% ID: ibm-not-wf-P85-ibm85n01.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n01'(suite) -> [];
+'ibm-not-wf-P85-ibm85n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n02.xml
+%% ID: ibm-not-wf-P85-ibm85n02.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n02'(suite) -> [];
+'ibm-not-wf-P85-ibm85n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n03.xml
+%% ID: ibm-not-wf-P85-ibm85n03.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n03'(suite) -> [];
+'ibm-not-wf-P85-ibm85n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n04.xml
+%% ID: ibm-not-wf-P85-ibm85n04.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n04'(suite) -> [];
+'ibm-not-wf-P85-ibm85n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n05.xml
+%% ID: ibm-not-wf-P85-ibm85n05.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n05'(suite) -> [];
+'ibm-not-wf-P85-ibm85n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n06.xml
+%% ID: ibm-not-wf-P85-ibm85n06.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n06'(suite) -> [];
+'ibm-not-wf-P85-ibm85n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n07.xml
+%% ID: ibm-not-wf-P85-ibm85n07.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n07'(suite) -> [];
+'ibm-not-wf-P85-ibm85n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n08.xml
+%% ID: ibm-not-wf-P85-ibm85n08.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n08'(suite) -> [];
+'ibm-not-wf-P85-ibm85n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n09.xml
+%% ID: ibm-not-wf-P85-ibm85n09.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n09'(suite) -> [];
+'ibm-not-wf-P85-ibm85n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n10.xml
+%% ID: ibm-not-wf-P85-ibm85n10.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n10'(suite) -> [];
+'ibm-not-wf-P85-ibm85n10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n100.xml
+%% ID: ibm-not-wf-P85-ibm85n100.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n100'(suite) -> [];
+'ibm-not-wf-P85-ibm85n100'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n100.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n101.xml
+%% ID: ibm-not-wf-P85-ibm85n101.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n101'(suite) -> [];
+'ibm-not-wf-P85-ibm85n101'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n101.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n102.xml
+%% ID: ibm-not-wf-P85-ibm85n102.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n102'(suite) -> [];
+'ibm-not-wf-P85-ibm85n102'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n102.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n103.xml
+%% ID: ibm-not-wf-P85-ibm85n103.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n103'(suite) -> [];
+'ibm-not-wf-P85-ibm85n103'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n103.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n104.xml
+%% ID: ibm-not-wf-P85-ibm85n104.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n104'(suite) -> [];
+'ibm-not-wf-P85-ibm85n104'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n104.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n105.xml
+%% ID: ibm-not-wf-P85-ibm85n105.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n105'(suite) -> [];
+'ibm-not-wf-P85-ibm85n105'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n105.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n106.xml
+%% ID: ibm-not-wf-P85-ibm85n106.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n106'(suite) -> [];
+'ibm-not-wf-P85-ibm85n106'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n106.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n107.xml
+%% ID: ibm-not-wf-P85-ibm85n107.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n107'(suite) -> [];
+'ibm-not-wf-P85-ibm85n107'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n107.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n108.xml
+%% ID: ibm-not-wf-P85-ibm85n108.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n108'(suite) -> [];
+'ibm-not-wf-P85-ibm85n108'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n108.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n109.xml
+%% ID: ibm-not-wf-P85-ibm85n109.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n109'(suite) -> [];
+'ibm-not-wf-P85-ibm85n109'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n109.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n11.xml
+%% ID: ibm-not-wf-P85-ibm85n11.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n11'(suite) -> [];
+'ibm-not-wf-P85-ibm85n11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n110.xml
+%% ID: ibm-not-wf-P85-ibm85n110.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n110'(suite) -> [];
+'ibm-not-wf-P85-ibm85n110'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n110.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n111.xml
+%% ID: ibm-not-wf-P85-ibm85n111.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n111'(suite) -> [];
+'ibm-not-wf-P85-ibm85n111'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n111.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n112.xml
+%% ID: ibm-not-wf-P85-ibm85n112.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n112'(suite) -> [];
+'ibm-not-wf-P85-ibm85n112'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n112.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n113.xml
+%% ID: ibm-not-wf-P85-ibm85n113.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n113'(suite) -> [];
+'ibm-not-wf-P85-ibm85n113'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n113.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n114.xml
+%% ID: ibm-not-wf-P85-ibm85n114.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n114'(suite) -> [];
+'ibm-not-wf-P85-ibm85n114'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n114.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n115.xml
+%% ID: ibm-not-wf-P85-ibm85n115.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n115'(suite) -> [];
+'ibm-not-wf-P85-ibm85n115'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n115.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n116.xml
+%% ID: ibm-not-wf-P85-ibm85n116.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n116'(suite) -> [];
+'ibm-not-wf-P85-ibm85n116'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n116.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n117.xml
+%% ID: ibm-not-wf-P85-ibm85n117.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n117'(suite) -> [];
+'ibm-not-wf-P85-ibm85n117'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n117.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n118.xml
+%% ID: ibm-not-wf-P85-ibm85n118.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n118'(suite) -> [];
+'ibm-not-wf-P85-ibm85n118'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n118.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n119.xml
+%% ID: ibm-not-wf-P85-ibm85n119.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n119'(suite) -> [];
+'ibm-not-wf-P85-ibm85n119'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n119.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n12.xml
+%% ID: ibm-not-wf-P85-ibm85n12.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n12'(suite) -> [];
+'ibm-not-wf-P85-ibm85n12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n120.xml
+%% ID: ibm-not-wf-P85-ibm85n120.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n120'(suite) -> [];
+'ibm-not-wf-P85-ibm85n120'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n120.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n121.xml
+%% ID: ibm-not-wf-P85-ibm85n121.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n121'(suite) -> [];
+'ibm-not-wf-P85-ibm85n121'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n121.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n122.xml
+%% ID: ibm-not-wf-P85-ibm85n122.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n122'(suite) -> [];
+'ibm-not-wf-P85-ibm85n122'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n122.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n123.xml
+%% ID: ibm-not-wf-P85-ibm85n123.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n123'(suite) -> [];
+'ibm-not-wf-P85-ibm85n123'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n123.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n124.xml
+%% ID: ibm-not-wf-P85-ibm85n124.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n124'(suite) -> [];
+'ibm-not-wf-P85-ibm85n124'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n124.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n125.xml
+%% ID: ibm-not-wf-P85-ibm85n125.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n125'(suite) -> [];
+'ibm-not-wf-P85-ibm85n125'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n125.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n126.xml
+%% ID: ibm-not-wf-P85-ibm85n126.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n126'(suite) -> [];
+'ibm-not-wf-P85-ibm85n126'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n126.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n127.xml
+%% ID: ibm-not-wf-P85-ibm85n127.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n127'(suite) -> [];
+'ibm-not-wf-P85-ibm85n127'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n127.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n128.xml
+%% ID: ibm-not-wf-P85-ibm85n128.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n128'(suite) -> [];
+'ibm-not-wf-P85-ibm85n128'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n128.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n129.xml
+%% ID: ibm-not-wf-P85-ibm85n129.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n129'(suite) -> [];
+'ibm-not-wf-P85-ibm85n129'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n129.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n13.xml
+%% ID: ibm-not-wf-P85-ibm85n13.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n13'(suite) -> [];
+'ibm-not-wf-P85-ibm85n13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n130.xml
+%% ID: ibm-not-wf-P85-ibm85n130.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n130'(suite) -> [];
+'ibm-not-wf-P85-ibm85n130'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n130.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n131.xml
+%% ID: ibm-not-wf-P85-ibm85n131.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n131'(suite) -> [];
+'ibm-not-wf-P85-ibm85n131'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n131.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n132.xml
+%% ID: ibm-not-wf-P85-ibm85n132.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n132'(suite) -> [];
+'ibm-not-wf-P85-ibm85n132'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n132.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n133.xml
+%% ID: ibm-not-wf-P85-ibm85n133.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n133'(suite) -> [];
+'ibm-not-wf-P85-ibm85n133'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n133.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n134.xml
+%% ID: ibm-not-wf-P85-ibm85n134.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n134'(suite) -> [];
+'ibm-not-wf-P85-ibm85n134'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n134.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n135.xml
+%% ID: ibm-not-wf-P85-ibm85n135.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n135'(suite) -> [];
+'ibm-not-wf-P85-ibm85n135'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n135.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n136.xml
+%% ID: ibm-not-wf-P85-ibm85n136.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n136'(suite) -> [];
+'ibm-not-wf-P85-ibm85n136'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n136.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n137.xml
+%% ID: ibm-not-wf-P85-ibm85n137.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n137'(suite) -> [];
+'ibm-not-wf-P85-ibm85n137'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n137.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n138.xml
+%% ID: ibm-not-wf-P85-ibm85n138.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n138'(suite) -> [];
+'ibm-not-wf-P85-ibm85n138'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n138.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n139.xml
+%% ID: ibm-not-wf-P85-ibm85n139.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n139'(suite) -> [];
+'ibm-not-wf-P85-ibm85n139'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n139.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n14.xml
+%% ID: ibm-not-wf-P85-ibm85n14.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n14'(suite) -> [];
+'ibm-not-wf-P85-ibm85n14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n140.xml
+%% ID: ibm-not-wf-P85-ibm85n140.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n140'(suite) -> [];
+'ibm-not-wf-P85-ibm85n140'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n140.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n141.xml
+%% ID: ibm-not-wf-P85-ibm85n141.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n141'(suite) -> [];
+'ibm-not-wf-P85-ibm85n141'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n141.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n142.xml
+%% ID: ibm-not-wf-P85-ibm85n142.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n142'(suite) -> [];
+'ibm-not-wf-P85-ibm85n142'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n142.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n143.xml
+%% ID: ibm-not-wf-P85-ibm85n143.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n143'(suite) -> [];
+'ibm-not-wf-P85-ibm85n143'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n143.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n144.xml
+%% ID: ibm-not-wf-P85-ibm85n144.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n144'(suite) -> [];
+'ibm-not-wf-P85-ibm85n144'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n144.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n145.xml
+%% ID: ibm-not-wf-P85-ibm85n145.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n145'(suite) -> [];
+'ibm-not-wf-P85-ibm85n145'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n145.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n146.xml
+%% ID: ibm-not-wf-P85-ibm85n146.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n146'(suite) -> [];
+'ibm-not-wf-P85-ibm85n146'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n146.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n147.xml
+%% ID: ibm-not-wf-P85-ibm85n147.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n147'(suite) -> [];
+'ibm-not-wf-P85-ibm85n147'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n147.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n148.xml
+%% ID: ibm-not-wf-P85-ibm85n148.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n148'(suite) -> [];
+'ibm-not-wf-P85-ibm85n148'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n148.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n149.xml
+%% ID: ibm-not-wf-P85-ibm85n149.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n149'(suite) -> [];
+'ibm-not-wf-P85-ibm85n149'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n149.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n15.xml
+%% ID: ibm-not-wf-P85-ibm85n15.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n15'(suite) -> [];
+'ibm-not-wf-P85-ibm85n15'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n15.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n150.xml
+%% ID: ibm-not-wf-P85-ibm85n150.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n150'(suite) -> [];
+'ibm-not-wf-P85-ibm85n150'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n150.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n151.xml
+%% ID: ibm-not-wf-P85-ibm85n151.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n151'(suite) -> [];
+'ibm-not-wf-P85-ibm85n151'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n151.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n152.xml
+%% ID: ibm-not-wf-P85-ibm85n152.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n152'(suite) -> [];
+'ibm-not-wf-P85-ibm85n152'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n152.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n153.xml
+%% ID: ibm-not-wf-P85-ibm85n153.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n153'(suite) -> [];
+'ibm-not-wf-P85-ibm85n153'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n153.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n154.xml
+%% ID: ibm-not-wf-P85-ibm85n154.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n154'(suite) -> [];
+'ibm-not-wf-P85-ibm85n154'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n154.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n155.xml
+%% ID: ibm-not-wf-P85-ibm85n155.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n155'(suite) -> [];
+'ibm-not-wf-P85-ibm85n155'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n155.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n156.xml
+%% ID: ibm-not-wf-P85-ibm85n156.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n156'(suite) -> [];
+'ibm-not-wf-P85-ibm85n156'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n156.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n157.xml
+%% ID: ibm-not-wf-P85-ibm85n157.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n157'(suite) -> [];
+'ibm-not-wf-P85-ibm85n157'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n157.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n158.xml
+%% ID: ibm-not-wf-P85-ibm85n158.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n158'(suite) -> [];
+'ibm-not-wf-P85-ibm85n158'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n158.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n159.xml
+%% ID: ibm-not-wf-P85-ibm85n159.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n159'(suite) -> [];
+'ibm-not-wf-P85-ibm85n159'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n159.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n16.xml
+%% ID: ibm-not-wf-P85-ibm85n16.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n16'(suite) -> [];
+'ibm-not-wf-P85-ibm85n16'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n16.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n160.xml
+%% ID: ibm-not-wf-P85-ibm85n160.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n160'(suite) -> [];
+'ibm-not-wf-P85-ibm85n160'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n160.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n161.xml
+%% ID: ibm-not-wf-P85-ibm85n161.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n161'(suite) -> [];
+'ibm-not-wf-P85-ibm85n161'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n161.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n162.xml
+%% ID: ibm-not-wf-P85-ibm85n162.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n162'(suite) -> [];
+'ibm-not-wf-P85-ibm85n162'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n162.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n163.xml
+%% ID: ibm-not-wf-P85-ibm85n163.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n163'(suite) -> [];
+'ibm-not-wf-P85-ibm85n163'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n163.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n164.xml
+%% ID: ibm-not-wf-P85-ibm85n164.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n164'(suite) -> [];
+'ibm-not-wf-P85-ibm85n164'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n164.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n165.xml
+%% ID: ibm-not-wf-P85-ibm85n165.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n165'(suite) -> [];
+'ibm-not-wf-P85-ibm85n165'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n165.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n166.xml
+%% ID: ibm-not-wf-P85-ibm85n166.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n166'(suite) -> [];
+'ibm-not-wf-P85-ibm85n166'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n166.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n167.xml
+%% ID: ibm-not-wf-P85-ibm85n167.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n167'(suite) -> [];
+'ibm-not-wf-P85-ibm85n167'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n167.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n168.xml
+%% ID: ibm-not-wf-P85-ibm85n168.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n168'(suite) -> [];
+'ibm-not-wf-P85-ibm85n168'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n168.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n169.xml
+%% ID: ibm-not-wf-P85-ibm85n169.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n169'(suite) -> [];
+'ibm-not-wf-P85-ibm85n169'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n169.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n17.xml
+%% ID: ibm-not-wf-P85-ibm85n17.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n17'(suite) -> [];
+'ibm-not-wf-P85-ibm85n17'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n17.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n170.xml
+%% ID: ibm-not-wf-P85-ibm85n170.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n170'(suite) -> [];
+'ibm-not-wf-P85-ibm85n170'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n170.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n171.xml
+%% ID: ibm-not-wf-P85-ibm85n171.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n171'(suite) -> [];
+'ibm-not-wf-P85-ibm85n171'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n171.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n172.xml
+%% ID: ibm-not-wf-P85-ibm85n172.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n172'(suite) -> [];
+'ibm-not-wf-P85-ibm85n172'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n172.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n173.xml
+%% ID: ibm-not-wf-P85-ibm85n173.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n173'(suite) -> [];
+'ibm-not-wf-P85-ibm85n173'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n173.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n174.xml
+%% ID: ibm-not-wf-P85-ibm85n174.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n174'(suite) -> [];
+'ibm-not-wf-P85-ibm85n174'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n174.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n175.xml
+%% ID: ibm-not-wf-P85-ibm85n175.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n175'(suite) -> [];
+'ibm-not-wf-P85-ibm85n175'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n175.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n176.xml
+%% ID: ibm-not-wf-P85-ibm85n176.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n176'(suite) -> [];
+'ibm-not-wf-P85-ibm85n176'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n176.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n177.xml
+%% ID: ibm-not-wf-P85-ibm85n177.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n177'(suite) -> [];
+'ibm-not-wf-P85-ibm85n177'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n177.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n178.xml
+%% ID: ibm-not-wf-P85-ibm85n178.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n178'(suite) -> [];
+'ibm-not-wf-P85-ibm85n178'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n178.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n179.xml
+%% ID: ibm-not-wf-P85-ibm85n179.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n179'(suite) -> [];
+'ibm-not-wf-P85-ibm85n179'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n179.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n18.xml
+%% ID: ibm-not-wf-P85-ibm85n18.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n18'(suite) -> [];
+'ibm-not-wf-P85-ibm85n18'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n18.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n180.xml
+%% ID: ibm-not-wf-P85-ibm85n180.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n180'(suite) -> [];
+'ibm-not-wf-P85-ibm85n180'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n180.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n181.xml
+%% ID: ibm-not-wf-P85-ibm85n181.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n181'(suite) -> [];
+'ibm-not-wf-P85-ibm85n181'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n181.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n182.xml
+%% ID: ibm-not-wf-P85-ibm85n182.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n182'(suite) -> [];
+'ibm-not-wf-P85-ibm85n182'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n182.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n183.xml
+%% ID: ibm-not-wf-P85-ibm85n183.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n183'(suite) -> [];
+'ibm-not-wf-P85-ibm85n183'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n183.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n184.xml
+%% ID: ibm-not-wf-P85-ibm85n184.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n184'(suite) -> [];
+'ibm-not-wf-P85-ibm85n184'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n184.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n185.xml
+%% ID: ibm-not-wf-P85-ibm85n185.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n185'(suite) -> [];
+'ibm-not-wf-P85-ibm85n185'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n185.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n186.xml
+%% ID: ibm-not-wf-P85-ibm85n186.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n186'(suite) -> [];
+'ibm-not-wf-P85-ibm85n186'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n186.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n187.xml
+%% ID: ibm-not-wf-P85-ibm85n187.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n187'(suite) -> [];
+'ibm-not-wf-P85-ibm85n187'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n187.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n188.xml
+%% ID: ibm-not-wf-P85-ibm85n188.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n188'(suite) -> [];
+'ibm-not-wf-P85-ibm85n188'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n188.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n189.xml
+%% ID: ibm-not-wf-P85-ibm85n189.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n189'(suite) -> [];
+'ibm-not-wf-P85-ibm85n189'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n189.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n19.xml
+%% ID: ibm-not-wf-P85-ibm85n19.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n19'(suite) -> [];
+'ibm-not-wf-P85-ibm85n19'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n19.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n190.xml
+%% ID: ibm-not-wf-P85-ibm85n190.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n190'(suite) -> [];
+'ibm-not-wf-P85-ibm85n190'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n190.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n191.xml
+%% ID: ibm-not-wf-P85-ibm85n191.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n191'(suite) -> [];
+'ibm-not-wf-P85-ibm85n191'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n191.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n192.xml
+%% ID: ibm-not-wf-P85-ibm85n192.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n192'(suite) -> [];
+'ibm-not-wf-P85-ibm85n192'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n192.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n193.xml
+%% ID: ibm-not-wf-P85-ibm85n193.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n193'(suite) -> [];
+'ibm-not-wf-P85-ibm85n193'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n193.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n194.xml
+%% ID: ibm-not-wf-P85-ibm85n194.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n194'(suite) -> [];
+'ibm-not-wf-P85-ibm85n194'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n194.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n195.xml
+%% ID: ibm-not-wf-P85-ibm85n195.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n195'(suite) -> [];
+'ibm-not-wf-P85-ibm85n195'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n195.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n196.xml
+%% ID: ibm-not-wf-P85-ibm85n196.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n196'(suite) -> [];
+'ibm-not-wf-P85-ibm85n196'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n196.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n197.xml
+%% ID: ibm-not-wf-P85-ibm85n197.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n197'(suite) -> [];
+'ibm-not-wf-P85-ibm85n197'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n197.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n198.xml
+%% ID: ibm-not-wf-P85-ibm85n198.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n198'(suite) -> [];
+'ibm-not-wf-P85-ibm85n198'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n198.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n20.xml
+%% ID: ibm-not-wf-P85-ibm85n20.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n20'(suite) -> [];
+'ibm-not-wf-P85-ibm85n20'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n20.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n21.xml
+%% ID: ibm-not-wf-P85-ibm85n21.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n21'(suite) -> [];
+'ibm-not-wf-P85-ibm85n21'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n21.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n22.xml
+%% ID: ibm-not-wf-P85-ibm85n22.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n22'(suite) -> [];
+'ibm-not-wf-P85-ibm85n22'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n22.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n23.xml
+%% ID: ibm-not-wf-P85-ibm85n23.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n23'(suite) -> [];
+'ibm-not-wf-P85-ibm85n23'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n23.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n24.xml
+%% ID: ibm-not-wf-P85-ibm85n24.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n24'(suite) -> [];
+'ibm-not-wf-P85-ibm85n24'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n24.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n25.xml
+%% ID: ibm-not-wf-P85-ibm85n25.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n25'(suite) -> [];
+'ibm-not-wf-P85-ibm85n25'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n25.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n26.xml
+%% ID: ibm-not-wf-P85-ibm85n26.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n26'(suite) -> [];
+'ibm-not-wf-P85-ibm85n26'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n26.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n27.xml
+%% ID: ibm-not-wf-P85-ibm85n27.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n27'(suite) -> [];
+'ibm-not-wf-P85-ibm85n27'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n27.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n28.xml
+%% ID: ibm-not-wf-P85-ibm85n28.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n28'(suite) -> [];
+'ibm-not-wf-P85-ibm85n28'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n28.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n29.xml
+%% ID: ibm-not-wf-P85-ibm85n29.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n29'(suite) -> [];
+'ibm-not-wf-P85-ibm85n29'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n29.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n30.xml
+%% ID: ibm-not-wf-P85-ibm85n30.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n30'(suite) -> [];
+'ibm-not-wf-P85-ibm85n30'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n30.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n31.xml
+%% ID: ibm-not-wf-P85-ibm85n31.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n31'(suite) -> [];
+'ibm-not-wf-P85-ibm85n31'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n31.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n32.xml
+%% ID: ibm-not-wf-P85-ibm85n32.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n32'(suite) -> [];
+'ibm-not-wf-P85-ibm85n32'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n32.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n33.xml
+%% ID: ibm-not-wf-P85-ibm85n33.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n33'(suite) -> [];
+'ibm-not-wf-P85-ibm85n33'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n33.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n34.xml
+%% ID: ibm-not-wf-P85-ibm85n34.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n34'(suite) -> [];
+'ibm-not-wf-P85-ibm85n34'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n34.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n35.xml
+%% ID: ibm-not-wf-P85-ibm85n35.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n35'(suite) -> [];
+'ibm-not-wf-P85-ibm85n35'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n35.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n36.xml
+%% ID: ibm-not-wf-P85-ibm85n36.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n36'(suite) -> [];
+'ibm-not-wf-P85-ibm85n36'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n36.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n37.xml
+%% ID: ibm-not-wf-P85-ibm85n37.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n37'(suite) -> [];
+'ibm-not-wf-P85-ibm85n37'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n37.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n38.xml
+%% ID: ibm-not-wf-P85-ibm85n38.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n38'(suite) -> [];
+'ibm-not-wf-P85-ibm85n38'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n38.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n39.xml
+%% ID: ibm-not-wf-P85-ibm85n39.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n39'(suite) -> [];
+'ibm-not-wf-P85-ibm85n39'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n39.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n40.xml
+%% ID: ibm-not-wf-P85-ibm85n40.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n40'(suite) -> [];
+'ibm-not-wf-P85-ibm85n40'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n40.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n41.xml
+%% ID: ibm-not-wf-P85-ibm85n41.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n41'(suite) -> [];
+'ibm-not-wf-P85-ibm85n41'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n41.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n42.xml
+%% ID: ibm-not-wf-P85-ibm85n42.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n42'(suite) -> [];
+'ibm-not-wf-P85-ibm85n42'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n42.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n43.xml
+%% ID: ibm-not-wf-P85-ibm85n43.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n43'(suite) -> [];
+'ibm-not-wf-P85-ibm85n43'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n43.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n44.xml
+%% ID: ibm-not-wf-P85-ibm85n44.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n44'(suite) -> [];
+'ibm-not-wf-P85-ibm85n44'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n44.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n45.xml
+%% ID: ibm-not-wf-P85-ibm85n45.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n45'(suite) -> [];
+'ibm-not-wf-P85-ibm85n45'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n45.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n46.xml
+%% ID: ibm-not-wf-P85-ibm85n46.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n46'(suite) -> [];
+'ibm-not-wf-P85-ibm85n46'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n46.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n47.xml
+%% ID: ibm-not-wf-P85-ibm85n47.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n47'(suite) -> [];
+'ibm-not-wf-P85-ibm85n47'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n47.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n48.xml
+%% ID: ibm-not-wf-P85-ibm85n48.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n48'(suite) -> [];
+'ibm-not-wf-P85-ibm85n48'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n48.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n49.xml
+%% ID: ibm-not-wf-P85-ibm85n49.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n49'(suite) -> [];
+'ibm-not-wf-P85-ibm85n49'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n49.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n50.xml
+%% ID: ibm-not-wf-P85-ibm85n50.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n50'(suite) -> [];
+'ibm-not-wf-P85-ibm85n50'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n50.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n51.xml
+%% ID: ibm-not-wf-P85-ibm85n51.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n51'(suite) -> [];
+'ibm-not-wf-P85-ibm85n51'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n51.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n52.xml
+%% ID: ibm-not-wf-P85-ibm85n52.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n52'(suite) -> [];
+'ibm-not-wf-P85-ibm85n52'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n52.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n53.xml
+%% ID: ibm-not-wf-P85-ibm85n53.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n53'(suite) -> [];
+'ibm-not-wf-P85-ibm85n53'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n53.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n54.xml
+%% ID: ibm-not-wf-P85-ibm85n54.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n54'(suite) -> [];
+'ibm-not-wf-P85-ibm85n54'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n54.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n55.xml
+%% ID: ibm-not-wf-P85-ibm85n55.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n55'(suite) -> [];
+'ibm-not-wf-P85-ibm85n55'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n55.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n56.xml
+%% ID: ibm-not-wf-P85-ibm85n56.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n56'(suite) -> [];
+'ibm-not-wf-P85-ibm85n56'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n56.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n57.xml
+%% ID: ibm-not-wf-P85-ibm85n57.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n57'(suite) -> [];
+'ibm-not-wf-P85-ibm85n57'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n57.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n58.xml
+%% ID: ibm-not-wf-P85-ibm85n58.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n58'(suite) -> [];
+'ibm-not-wf-P85-ibm85n58'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n58.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n59.xml
+%% ID: ibm-not-wf-P85-ibm85n59.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n59'(suite) -> [];
+'ibm-not-wf-P85-ibm85n59'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n59.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n60.xml
+%% ID: ibm-not-wf-P85-ibm85n60.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n60'(suite) -> [];
+'ibm-not-wf-P85-ibm85n60'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n60.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n61.xml
+%% ID: ibm-not-wf-P85-ibm85n61.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n61'(suite) -> [];
+'ibm-not-wf-P85-ibm85n61'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n61.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n62.xml
+%% ID: ibm-not-wf-P85-ibm85n62.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n62'(suite) -> [];
+'ibm-not-wf-P85-ibm85n62'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n62.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n63.xml
+%% ID: ibm-not-wf-P85-ibm85n63.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n63'(suite) -> [];
+'ibm-not-wf-P85-ibm85n63'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n63.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n64.xml
+%% ID: ibm-not-wf-P85-ibm85n64.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n64'(suite) -> [];
+'ibm-not-wf-P85-ibm85n64'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n64.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n65.xml
+%% ID: ibm-not-wf-P85-ibm85n65.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n65'(suite) -> [];
+'ibm-not-wf-P85-ibm85n65'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n65.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n66.xml
+%% ID: ibm-not-wf-P85-ibm85n66.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n66'(suite) -> [];
+'ibm-not-wf-P85-ibm85n66'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n66.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n67.xml
+%% ID: ibm-not-wf-P85-ibm85n67.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n67'(suite) -> [];
+'ibm-not-wf-P85-ibm85n67'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n67.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n68.xml
+%% ID: ibm-not-wf-P85-ibm85n68.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n68'(suite) -> [];
+'ibm-not-wf-P85-ibm85n68'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n68.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n69.xml
+%% ID: ibm-not-wf-P85-ibm85n69.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n69'(suite) -> [];
+'ibm-not-wf-P85-ibm85n69'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n69.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n70.xml
+%% ID: ibm-not-wf-P85-ibm85n70.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n70'(suite) -> [];
+'ibm-not-wf-P85-ibm85n70'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n70.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n71.xml
+%% ID: ibm-not-wf-P85-ibm85n71.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n71'(suite) -> [];
+'ibm-not-wf-P85-ibm85n71'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n71.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n72.xml
+%% ID: ibm-not-wf-P85-ibm85n72.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n72'(suite) -> [];
+'ibm-not-wf-P85-ibm85n72'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n72.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n73.xml
+%% ID: ibm-not-wf-P85-ibm85n73.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n73'(suite) -> [];
+'ibm-not-wf-P85-ibm85n73'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n73.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n74.xml
+%% ID: ibm-not-wf-P85-ibm85n74.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n74'(suite) -> [];
+'ibm-not-wf-P85-ibm85n74'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n74.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n75.xml
+%% ID: ibm-not-wf-P85-ibm85n75.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n75'(suite) -> [];
+'ibm-not-wf-P85-ibm85n75'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n75.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n76.xml
+%% ID: ibm-not-wf-P85-ibm85n76.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n76'(suite) -> [];
+'ibm-not-wf-P85-ibm85n76'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n76.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n77.xml
+%% ID: ibm-not-wf-P85-ibm85n77.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n77'(suite) -> [];
+'ibm-not-wf-P85-ibm85n77'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n77.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n78.xml
+%% ID: ibm-not-wf-P85-ibm85n78.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n78'(suite) -> [];
+'ibm-not-wf-P85-ibm85n78'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n78.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n79.xml
+%% ID: ibm-not-wf-P85-ibm85n79.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n79'(suite) -> [];
+'ibm-not-wf-P85-ibm85n79'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n79.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n80.xml
+%% ID: ibm-not-wf-P85-ibm85n80.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n80'(suite) -> [];
+'ibm-not-wf-P85-ibm85n80'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n80.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n81.xml
+%% ID: ibm-not-wf-P85-ibm85n81.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n81'(suite) -> [];
+'ibm-not-wf-P85-ibm85n81'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n81.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n82.xml
+%% ID: ibm-not-wf-P85-ibm85n82.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n82'(suite) -> [];
+'ibm-not-wf-P85-ibm85n82'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n82.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n83.xml
+%% ID: ibm-not-wf-P85-ibm85n83.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n83'(suite) -> [];
+'ibm-not-wf-P85-ibm85n83'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n83.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n84.xml
+%% ID: ibm-not-wf-P85-ibm85n84.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n84'(suite) -> [];
+'ibm-not-wf-P85-ibm85n84'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n84.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n85.xml
+%% ID: ibm-not-wf-P85-ibm85n85.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n85'(suite) -> [];
+'ibm-not-wf-P85-ibm85n85'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n85.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n86.xml
+%% ID: ibm-not-wf-P85-ibm85n86.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n86'(suite) -> [];
+'ibm-not-wf-P85-ibm85n86'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n86.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n87.xml
+%% ID: ibm-not-wf-P85-ibm85n87.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n87'(suite) -> [];
+'ibm-not-wf-P85-ibm85n87'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n87.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n88.xml
+%% ID: ibm-not-wf-P85-ibm85n88.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n88'(suite) -> [];
+'ibm-not-wf-P85-ibm85n88'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n88.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n89.xml
+%% ID: ibm-not-wf-P85-ibm85n89.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n89'(suite) -> [];
+'ibm-not-wf-P85-ibm85n89'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n89.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n90.xml
+%% ID: ibm-not-wf-P85-ibm85n90.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n90'(suite) -> [];
+'ibm-not-wf-P85-ibm85n90'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n90.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n91.xml
+%% ID: ibm-not-wf-P85-ibm85n91.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n91'(suite) -> [];
+'ibm-not-wf-P85-ibm85n91'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n91.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n92.xml
+%% ID: ibm-not-wf-P85-ibm85n92.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n92'(suite) -> [];
+'ibm-not-wf-P85-ibm85n92'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n92.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n93.xml
+%% ID: ibm-not-wf-P85-ibm85n93.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n93'(suite) -> [];
+'ibm-not-wf-P85-ibm85n93'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n93.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n94.xml
+%% ID: ibm-not-wf-P85-ibm85n94.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n94'(suite) -> [];
+'ibm-not-wf-P85-ibm85n94'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n94.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n95.xml
+%% ID: ibm-not-wf-P85-ibm85n95.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n95'(suite) -> [];
+'ibm-not-wf-P85-ibm85n95'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n95.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n96.xml
+%% ID: ibm-not-wf-P85-ibm85n96.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n96'(suite) -> [];
+'ibm-not-wf-P85-ibm85n96'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n96.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n97.xml
+%% ID: ibm-not-wf-P85-ibm85n97.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n97'(suite) -> [];
+'ibm-not-wf-P85-ibm85n97'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n97.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n98.xml
+%% ID: ibm-not-wf-P85-ibm85n98.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n98'(suite) -> [];
+'ibm-not-wf-P85-ibm85n98'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n98.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P85/ibm85n99.xml
+%% ID: ibm-not-wf-P85-ibm85n99.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P85-ibm85n99'(suite) -> [];
+'ibm-not-wf-P85-ibm85n99'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n99.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 85
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P86/ibm86n01.xml
+%% ID: ibm-not-wf-P86-ibm86n01.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P86-ibm86n01'(suite) -> [];
+'ibm-not-wf-P86-ibm86n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P86/ibm86n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P86/ibm86n02.xml
+%% ID: ibm-not-wf-P86-ibm86n02.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P86-ibm86n02'(suite) -> [];
+'ibm-not-wf-P86-ibm86n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P86/ibm86n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P86/ibm86n03.xml
+%% ID: ibm-not-wf-P86-ibm86n03.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P86-ibm86n03'(suite) -> [];
+'ibm-not-wf-P86-ibm86n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P86/ibm86n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P86/ibm86n04.xml
+%% ID: ibm-not-wf-P86-ibm86n04.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P86-ibm86n04'(suite) -> [];
+'ibm-not-wf-P86-ibm86n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P86/ibm86n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 86
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n01.xml
+%% ID: ibm-not-wf-P87-ibm87n01.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n01'(suite) -> [];
+'ibm-not-wf-P87-ibm87n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n02.xml
+%% ID: ibm-not-wf-P87-ibm87n02.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n02'(suite) -> [];
+'ibm-not-wf-P87-ibm87n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n03.xml
+%% ID: ibm-not-wf-P87-ibm87n03.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n03'(suite) -> [];
+'ibm-not-wf-P87-ibm87n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n04.xml
+%% ID: ibm-not-wf-P87-ibm87n04.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n04'(suite) -> [];
+'ibm-not-wf-P87-ibm87n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n05.xml
+%% ID: ibm-not-wf-P87-ibm87n05.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n05'(suite) -> [];
+'ibm-not-wf-P87-ibm87n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n06.xml
+%% ID: ibm-not-wf-P87-ibm87n06.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n06'(suite) -> [];
+'ibm-not-wf-P87-ibm87n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n07.xml
+%% ID: ibm-not-wf-P87-ibm87n07.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n07'(suite) -> [];
+'ibm-not-wf-P87-ibm87n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n08.xml
+%% ID: ibm-not-wf-P87-ibm87n08.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n08'(suite) -> [];
+'ibm-not-wf-P87-ibm87n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n09.xml
+%% ID: ibm-not-wf-P87-ibm87n09.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n09'(suite) -> [];
+'ibm-not-wf-P87-ibm87n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n10.xml
+%% ID: ibm-not-wf-P87-ibm87n10.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n10'(suite) -> [];
+'ibm-not-wf-P87-ibm87n10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n11.xml
+%% ID: ibm-not-wf-P87-ibm87n11.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n11'(suite) -> [];
+'ibm-not-wf-P87-ibm87n11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n12.xml
+%% ID: ibm-not-wf-P87-ibm87n12.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n12'(suite) -> [];
+'ibm-not-wf-P87-ibm87n12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n13.xml
+%% ID: ibm-not-wf-P87-ibm87n13.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n13'(suite) -> [];
+'ibm-not-wf-P87-ibm87n13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n14.xml
+%% ID: ibm-not-wf-P87-ibm87n14.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n14'(suite) -> [];
+'ibm-not-wf-P87-ibm87n14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n15.xml
+%% ID: ibm-not-wf-P87-ibm87n15.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n15'(suite) -> [];
+'ibm-not-wf-P87-ibm87n15'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n15.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n16.xml
+%% ID: ibm-not-wf-P87-ibm87n16.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n16'(suite) -> [];
+'ibm-not-wf-P87-ibm87n16'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n16.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n17.xml
+%% ID: ibm-not-wf-P87-ibm87n17.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n17'(suite) -> [];
+'ibm-not-wf-P87-ibm87n17'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n17.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n18.xml
+%% ID: ibm-not-wf-P87-ibm87n18.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n18'(suite) -> [];
+'ibm-not-wf-P87-ibm87n18'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n18.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n19.xml
+%% ID: ibm-not-wf-P87-ibm87n19.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n19'(suite) -> [];
+'ibm-not-wf-P87-ibm87n19'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n19.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n20.xml
+%% ID: ibm-not-wf-P87-ibm87n20.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n20'(suite) -> [];
+'ibm-not-wf-P87-ibm87n20'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n20.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n21.xml
+%% ID: ibm-not-wf-P87-ibm87n21.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n21'(suite) -> [];
+'ibm-not-wf-P87-ibm87n21'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n21.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n22.xml
+%% ID: ibm-not-wf-P87-ibm87n22.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n22'(suite) -> [];
+'ibm-not-wf-P87-ibm87n22'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n22.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n23.xml
+%% ID: ibm-not-wf-P87-ibm87n23.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n23'(suite) -> [];
+'ibm-not-wf-P87-ibm87n23'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n23.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n24.xml
+%% ID: ibm-not-wf-P87-ibm87n24.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n24'(suite) -> [];
+'ibm-not-wf-P87-ibm87n24'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n24.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n25.xml
+%% ID: ibm-not-wf-P87-ibm87n25.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n25'(suite) -> [];
+'ibm-not-wf-P87-ibm87n25'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n25.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n26.xml
+%% ID: ibm-not-wf-P87-ibm87n26.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n26'(suite) -> [];
+'ibm-not-wf-P87-ibm87n26'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n26.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n27.xml
+%% ID: ibm-not-wf-P87-ibm87n27.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n27'(suite) -> [];
+'ibm-not-wf-P87-ibm87n27'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n27.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n28.xml
+%% ID: ibm-not-wf-P87-ibm87n28.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n28'(suite) -> [];
+'ibm-not-wf-P87-ibm87n28'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n28.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n29.xml
+%% ID: ibm-not-wf-P87-ibm87n29.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n29'(suite) -> [];
+'ibm-not-wf-P87-ibm87n29'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n29.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n30.xml
+%% ID: ibm-not-wf-P87-ibm87n30.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n30'(suite) -> [];
+'ibm-not-wf-P87-ibm87n30'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n30.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n31.xml
+%% ID: ibm-not-wf-P87-ibm87n31.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n31'(suite) -> [];
+'ibm-not-wf-P87-ibm87n31'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n31.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n32.xml
+%% ID: ibm-not-wf-P87-ibm87n32.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n32'(suite) -> [];
+'ibm-not-wf-P87-ibm87n32'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n32.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n33.xml
+%% ID: ibm-not-wf-P87-ibm87n33.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n33'(suite) -> [];
+'ibm-not-wf-P87-ibm87n33'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n33.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n34.xml
+%% ID: ibm-not-wf-P87-ibm87n34.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n34'(suite) -> [];
+'ibm-not-wf-P87-ibm87n34'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n34.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n35.xml
+%% ID: ibm-not-wf-P87-ibm87n35.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n35'(suite) -> [];
+'ibm-not-wf-P87-ibm87n35'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n35.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n36.xml
+%% ID: ibm-not-wf-P87-ibm87n36.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n36'(suite) -> [];
+'ibm-not-wf-P87-ibm87n36'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n36.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n37.xml
+%% ID: ibm-not-wf-P87-ibm87n37.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n37'(suite) -> [];
+'ibm-not-wf-P87-ibm87n37'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n37.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n38.xml
+%% ID: ibm-not-wf-P87-ibm87n38.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n38'(suite) -> [];
+'ibm-not-wf-P87-ibm87n38'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n38.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n39.xml
+%% ID: ibm-not-wf-P87-ibm87n39.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n39'(suite) -> [];
+'ibm-not-wf-P87-ibm87n39'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n39.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n40.xml
+%% ID: ibm-not-wf-P87-ibm87n40.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n40'(suite) -> [];
+'ibm-not-wf-P87-ibm87n40'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n40.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n41.xml
+%% ID: ibm-not-wf-P87-ibm87n41.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n41'(suite) -> [];
+'ibm-not-wf-P87-ibm87n41'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n41.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n42.xml
+%% ID: ibm-not-wf-P87-ibm87n42.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n42'(suite) -> [];
+'ibm-not-wf-P87-ibm87n42'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n42.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n43.xml
+%% ID: ibm-not-wf-P87-ibm87n43.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n43'(suite) -> [];
+'ibm-not-wf-P87-ibm87n43'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n43.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n44.xml
+%% ID: ibm-not-wf-P87-ibm87n44.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n44'(suite) -> [];
+'ibm-not-wf-P87-ibm87n44'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n44.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n45.xml
+%% ID: ibm-not-wf-P87-ibm87n45.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n45'(suite) -> [];
+'ibm-not-wf-P87-ibm87n45'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n45.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n46.xml
+%% ID: ibm-not-wf-P87-ibm87n46.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n46'(suite) -> [];
+'ibm-not-wf-P87-ibm87n46'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n46.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n47.xml
+%% ID: ibm-not-wf-P87-ibm87n47.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n47'(suite) -> [];
+'ibm-not-wf-P87-ibm87n47'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n47.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n48.xml
+%% ID: ibm-not-wf-P87-ibm87n48.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n48'(suite) -> [];
+'ibm-not-wf-P87-ibm87n48'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n48.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n49.xml
+%% ID: ibm-not-wf-P87-ibm87n49.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n49'(suite) -> [];
+'ibm-not-wf-P87-ibm87n49'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n49.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n50.xml
+%% ID: ibm-not-wf-P87-ibm87n50.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n50'(suite) -> [];
+'ibm-not-wf-P87-ibm87n50'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n50.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n51.xml
+%% ID: ibm-not-wf-P87-ibm87n51.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n51'(suite) -> [];
+'ibm-not-wf-P87-ibm87n51'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n51.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n52.xml
+%% ID: ibm-not-wf-P87-ibm87n52.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n52'(suite) -> [];
+'ibm-not-wf-P87-ibm87n52'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n52.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n53.xml
+%% ID: ibm-not-wf-P87-ibm87n53.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n53'(suite) -> [];
+'ibm-not-wf-P87-ibm87n53'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n53.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n54.xml
+%% ID: ibm-not-wf-P87-ibm87n54.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n54'(suite) -> [];
+'ibm-not-wf-P87-ibm87n54'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n54.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n55.xml
+%% ID: ibm-not-wf-P87-ibm87n55.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n55'(suite) -> [];
+'ibm-not-wf-P87-ibm87n55'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n55.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n56.xml
+%% ID: ibm-not-wf-P87-ibm87n56.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n56'(suite) -> [];
+'ibm-not-wf-P87-ibm87n56'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n56.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n57.xml
+%% ID: ibm-not-wf-P87-ibm87n57.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n57'(suite) -> [];
+'ibm-not-wf-P87-ibm87n57'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n57.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n58.xml
+%% ID: ibm-not-wf-P87-ibm87n58.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n58'(suite) -> [];
+'ibm-not-wf-P87-ibm87n58'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n58.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n59.xml
+%% ID: ibm-not-wf-P87-ibm87n59.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n59'(suite) -> [];
+'ibm-not-wf-P87-ibm87n59'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n59.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n60.xml
+%% ID: ibm-not-wf-P87-ibm87n60.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n60'(suite) -> [];
+'ibm-not-wf-P87-ibm87n60'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n60.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n61.xml
+%% ID: ibm-not-wf-P87-ibm87n61.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n61'(suite) -> [];
+'ibm-not-wf-P87-ibm87n61'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n61.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n62.xml
+%% ID: ibm-not-wf-P87-ibm87n62.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n62'(suite) -> [];
+'ibm-not-wf-P87-ibm87n62'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n62.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n63.xml
+%% ID: ibm-not-wf-P87-ibm87n63.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n63'(suite) -> [];
+'ibm-not-wf-P87-ibm87n63'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n63.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n64.xml
+%% ID: ibm-not-wf-P87-ibm87n64.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n64'(suite) -> [];
+'ibm-not-wf-P87-ibm87n64'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n64.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n66.xml
+%% ID: ibm-not-wf-P87-ibm87n66.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n66'(suite) -> [];
+'ibm-not-wf-P87-ibm87n66'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n66.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n67.xml
+%% ID: ibm-not-wf-P87-ibm87n67.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n67'(suite) -> [];
+'ibm-not-wf-P87-ibm87n67'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n67.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n68.xml
+%% ID: ibm-not-wf-P87-ibm87n68.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n68'(suite) -> [];
+'ibm-not-wf-P87-ibm87n68'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n68.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n69.xml
+%% ID: ibm-not-wf-P87-ibm87n69.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n69'(suite) -> [];
+'ibm-not-wf-P87-ibm87n69'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n69.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n70.xml
+%% ID: ibm-not-wf-P87-ibm87n70.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n70'(suite) -> [];
+'ibm-not-wf-P87-ibm87n70'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n70.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n71.xml
+%% ID: ibm-not-wf-P87-ibm87n71.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n71'(suite) -> [];
+'ibm-not-wf-P87-ibm87n71'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n71.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n72.xml
+%% ID: ibm-not-wf-P87-ibm87n72.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n72'(suite) -> [];
+'ibm-not-wf-P87-ibm87n72'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n72.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n73.xml
+%% ID: ibm-not-wf-P87-ibm87n73.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n73'(suite) -> [];
+'ibm-not-wf-P87-ibm87n73'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n73.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n74.xml
+%% ID: ibm-not-wf-P87-ibm87n74.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n74'(suite) -> [];
+'ibm-not-wf-P87-ibm87n74'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n74.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n75.xml
+%% ID: ibm-not-wf-P87-ibm87n75.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n75'(suite) -> [];
+'ibm-not-wf-P87-ibm87n75'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n75.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n76.xml
+%% ID: ibm-not-wf-P87-ibm87n76.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n76'(suite) -> [];
+'ibm-not-wf-P87-ibm87n76'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n76.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n77.xml
+%% ID: ibm-not-wf-P87-ibm87n77.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n77'(suite) -> [];
+'ibm-not-wf-P87-ibm87n77'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n77.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n78.xml
+%% ID: ibm-not-wf-P87-ibm87n78.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n78'(suite) -> [];
+'ibm-not-wf-P87-ibm87n78'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n78.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n79.xml
+%% ID: ibm-not-wf-P87-ibm87n79.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n79'(suite) -> [];
+'ibm-not-wf-P87-ibm87n79'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n79.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n80.xml
+%% ID: ibm-not-wf-P87-ibm87n80.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n80'(suite) -> [];
+'ibm-not-wf-P87-ibm87n80'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n80.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n81.xml
+%% ID: ibm-not-wf-P87-ibm87n81.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n81'(suite) -> [];
+'ibm-not-wf-P87-ibm87n81'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n81.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n82.xml
+%% ID: ibm-not-wf-P87-ibm87n82.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n82'(suite) -> [];
+'ibm-not-wf-P87-ibm87n82'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n82.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n83.xml
+%% ID: ibm-not-wf-P87-ibm87n83.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n83'(suite) -> [];
+'ibm-not-wf-P87-ibm87n83'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n83.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n84.xml
+%% ID: ibm-not-wf-P87-ibm87n84.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n84'(suite) -> [];
+'ibm-not-wf-P87-ibm87n84'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n84.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P87/ibm87n85.xml
+%% ID: ibm-not-wf-P87-ibm87n85.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P87-ibm87n85'(suite) -> [];
+'ibm-not-wf-P87-ibm87n85'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n85.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 87
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n01.xml
+%% ID: ibm-not-wf-P88-ibm88n01.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n01'(suite) -> [];
+'ibm-not-wf-P88-ibm88n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n02.xml
+%% ID: ibm-not-wf-P88-ibm88n02.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n02'(suite) -> [];
+'ibm-not-wf-P88-ibm88n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n03.xml
+%% ID: ibm-not-wf-P88-ibm88n03.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n03'(suite) -> [];
+'ibm-not-wf-P88-ibm88n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n04.xml
+%% ID: ibm-not-wf-P88-ibm88n04.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n04'(suite) -> [];
+'ibm-not-wf-P88-ibm88n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n05.xml
+%% ID: ibm-not-wf-P88-ibm88n05.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n05'(suite) -> [];
+'ibm-not-wf-P88-ibm88n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n06.xml
+%% ID: ibm-not-wf-P88-ibm88n06.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n06'(suite) -> [];
+'ibm-not-wf-P88-ibm88n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n08.xml
+%% ID: ibm-not-wf-P88-ibm88n08.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n08'(suite) -> [];
+'ibm-not-wf-P88-ibm88n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n09.xml
+%% ID: ibm-not-wf-P88-ibm88n09.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n09'(suite) -> [];
+'ibm-not-wf-P88-ibm88n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n10.xml
+%% ID: ibm-not-wf-P88-ibm88n10.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n10'(suite) -> [];
+'ibm-not-wf-P88-ibm88n10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n11.xml
+%% ID: ibm-not-wf-P88-ibm88n11.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n11'(suite) -> [];
+'ibm-not-wf-P88-ibm88n11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n12.xml
+%% ID: ibm-not-wf-P88-ibm88n12.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n12'(suite) -> [];
+'ibm-not-wf-P88-ibm88n12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n13.xml
+%% ID: ibm-not-wf-P88-ibm88n13.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n13'(suite) -> [];
+'ibm-not-wf-P88-ibm88n13'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n13.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n14.xml
+%% ID: ibm-not-wf-P88-ibm88n14.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n14'(suite) -> [];
+'ibm-not-wf-P88-ibm88n14'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n14.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n15.xml
+%% ID: ibm-not-wf-P88-ibm88n15.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n15'(suite) -> [];
+'ibm-not-wf-P88-ibm88n15'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n15.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P88/ibm88n16.xml
+%% ID: ibm-not-wf-P88-ibm88n16.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P88-ibm88n16'(suite) -> [];
+'ibm-not-wf-P88-ibm88n16'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n16.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 88
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n01.xml
+%% ID: ibm-not-wf-P89-ibm89n01.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n01'(suite) -> [];
+'ibm-not-wf-P89-ibm89n01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n02.xml
+%% ID: ibm-not-wf-P89-ibm89n02.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n02'(suite) -> [];
+'ibm-not-wf-P89-ibm89n02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n03.xml
+%% ID: ibm-not-wf-P89-ibm89n03.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n03'(suite) -> [];
+'ibm-not-wf-P89-ibm89n03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n04.xml
+%% ID: ibm-not-wf-P89-ibm89n04.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n04'(suite) -> [];
+'ibm-not-wf-P89-ibm89n04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n05.xml
+%% ID: ibm-not-wf-P89-ibm89n05.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n05'(suite) -> [];
+'ibm-not-wf-P89-ibm89n05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n06.xml
+%% ID: ibm-not-wf-P89-ibm89n06.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n06'(suite) -> [];
+'ibm-not-wf-P89-ibm89n06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n07.xml
+%% ID: ibm-not-wf-P89-ibm89n07.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n07'(suite) -> [];
+'ibm-not-wf-P89-ibm89n07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n08.xml
+%% ID: ibm-not-wf-P89-ibm89n08.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n08'(suite) -> [];
+'ibm-not-wf-P89-ibm89n08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n09.xml
+%% ID: ibm-not-wf-P89-ibm89n09.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n09'(suite) -> [];
+'ibm-not-wf-P89-ibm89n09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n10.xml
+%% ID: ibm-not-wf-P89-ibm89n10.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n10'(suite) -> [];
+'ibm-not-wf-P89-ibm89n10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n11.xml
+%% ID: ibm-not-wf-P89-ibm89n11.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n11'(suite) -> [];
+'ibm-not-wf-P89-ibm89n11'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n11.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: not-wf/P89/ibm89n12.xml
+%% ID: ibm-not-wf-P89-ibm89n12.xml
+%% Type: not-wf
+%% Sections: B.
+'ibm-not-wf-P89-ibm89n12'(suite) -> [];
+'ibm-not-wf-P89-ibm89n12'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n12.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "not-wf").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 89
+
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - not-wf tests
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P01/ibm01v01.xml
+%% ID: ibm-valid-P01-ibm01v01.xml
+%% Type: valid
+%% Sections: 2.1
+'ibm-valid-P01-ibm01v01'(suite) -> [];
+'ibm-valid-P01-ibm01v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P01/ibm01v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 1
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P02/ibm02v01.xml
+%% ID: ibm-valid-P02-ibm02v01.xml
+%% Type: valid
+%% Sections: 2.2
+'ibm-valid-P02-ibm02v01'(suite) -> [];
+'ibm-valid-P02-ibm02v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P02/ibm02v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 2
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P03/ibm03v01.xml
+%% ID: ibm-valid-P03-ibm03v01.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P03-ibm03v01'(suite) -> [];
+'ibm-valid-P03-ibm03v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P03/ibm03v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 3
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P09/ibm09v01.xml
+%% ID: ibm-valid-P09-ibm09v01.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P09-ibm09v01'(suite) -> [];
+'ibm-valid-P09-ibm09v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P09/ibm09v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P09/ibm09v02.xml
+%% ID: ibm-valid-P09-ibm09v02.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P09-ibm09v02'(suite) -> [];
+'ibm-valid-P09-ibm09v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P09/ibm09v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P09/ibm09v03.xml
+%% ID: ibm-valid-P09-ibm09v03.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P09-ibm09v03'(suite) -> [];
+'ibm-valid-P09-ibm09v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P09/ibm09v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P09/ibm09v04.xml
+%% ID: ibm-valid-P09-ibm09v04.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P09-ibm09v04'(suite) -> [];
+'ibm-valid-P09-ibm09v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P09/ibm09v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P09/ibm09v05.xml
+%% ID: ibm-valid-P09-ibm09v05.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P09-ibm09v05'(suite) -> [];
+'ibm-valid-P09-ibm09v05'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P09/ibm09v05.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 9
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P10/ibm10v01.xml
+%% ID: ibm-valid-P10-ibm10v01.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P10-ibm10v01'(suite) -> [];
+'ibm-valid-P10-ibm10v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P10/ibm10v02.xml
+%% ID: ibm-valid-P10-ibm10v02.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P10-ibm10v02'(suite) -> [];
+'ibm-valid-P10-ibm10v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P10/ibm10v03.xml
+%% ID: ibm-valid-P10-ibm10v03.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P10-ibm10v03'(suite) -> [];
+'ibm-valid-P10-ibm10v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P10/ibm10v04.xml
+%% ID: ibm-valid-P10-ibm10v04.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P10-ibm10v04'(suite) -> [];
+'ibm-valid-P10-ibm10v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P10/ibm10v05.xml
+%% ID: ibm-valid-P10-ibm10v05.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P10-ibm10v05'(suite) -> [];
+'ibm-valid-P10-ibm10v05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P10/ibm10v06.xml
+%% ID: ibm-valid-P10-ibm10v06.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P10-ibm10v06'(suite) -> [];
+'ibm-valid-P10-ibm10v06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P10/ibm10v07.xml
+%% ID: ibm-valid-P10-ibm10v07.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P10-ibm10v07'(suite) -> [];
+'ibm-valid-P10-ibm10v07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P10/ibm10v08.xml
+%% ID: ibm-valid-P10-ibm10v08.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P10-ibm10v08'(suite) -> [];
+'ibm-valid-P10-ibm10v08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 10
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P11/ibm11v01.xml
+%% ID: ibm-valid-P11-ibm11v01.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P11-ibm11v01'(suite) -> [];
+'ibm-valid-P11-ibm11v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P11/ibm11v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P11/ibm11v02.xml
+%% ID: ibm-valid-P11-ibm11v02.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P11-ibm11v02'(suite) -> [];
+'ibm-valid-P11-ibm11v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P11/ibm11v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P11/ibm11v03.xml
+%% ID: ibm-valid-P11-ibm11v03.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P11-ibm11v03'(suite) -> [];
+'ibm-valid-P11-ibm11v03'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P11/ibm11v03.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P11/ibm11v04.xml
+%% ID: ibm-valid-P11-ibm11v04.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P11-ibm11v04'(suite) -> [];
+'ibm-valid-P11-ibm11v04'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P11/ibm11v04.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 11
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P12/ibm12v01.xml
+%% ID: ibm-valid-P12-ibm12v01.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P12-ibm12v01'(suite) -> [];
+'ibm-valid-P12-ibm12v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P12/ibm12v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P12/ibm12v02.xml
+%% ID: ibm-valid-P12-ibm12v02.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P12-ibm12v02'(suite) -> [];
+'ibm-valid-P12-ibm12v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P12/ibm12v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P12/ibm12v03.xml
+%% ID: ibm-valid-P12-ibm12v03.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P12-ibm12v03'(suite) -> [];
+'ibm-valid-P12-ibm12v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P12/ibm12v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P12/ibm12v04.xml
+%% ID: ibm-valid-P12-ibm12v04.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P12-ibm12v04'(suite) -> [];
+'ibm-valid-P12-ibm12v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P12/ibm12v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 12
+
+testcases111(suite) -> [].
+%%   ['ibm-valid-P12-ibm12v01','ibm-valid-P12-ibm12v02','ibm-valid-P12-ibm12v03','ibm-valid-P12-ibm12v04'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P13/ibm13v01.xml
+%% ID: ibm-valid-P13-ibm13v01.xml
+%% Type: valid
+%% Sections: 2.3
+'ibm-valid-P13-ibm13v01'(suite) -> [];
+'ibm-valid-P13-ibm13v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P13/ibm13v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 13
+
+testcases112(suite) -> [].
+%%   ['ibm-valid-P13-ibm13v01'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P14/ibm14v01.xml
+%% ID: ibm-valid-P14-ibm14v01.xml
+%% Type: valid
+%% Sections: 2.4
+'ibm-valid-P14-ibm14v01'(suite) -> [];
+'ibm-valid-P14-ibm14v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P14/ibm14v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P14/ibm14v02.xml
+%% ID: ibm-valid-P14-ibm14v02.xml
+%% Type: valid
+%% Sections: 2.4
+'ibm-valid-P14-ibm14v02'(suite) -> [];
+'ibm-valid-P14-ibm14v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P14/ibm14v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P14/ibm14v03.xml
+%% ID: ibm-valid-P14-ibm14v03.xml
+%% Type: valid
+%% Sections: 2.4
+'ibm-valid-P14-ibm14v03'(suite) -> [];
+'ibm-valid-P14-ibm14v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P14/ibm14v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 14
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P15/ibm15v01.xml
+%% ID: ibm-valid-P15-ibm15v01.xml
+%% Type: valid
+%% Sections: 2.5
+'ibm-valid-P15-ibm15v01'(suite) -> [];
+'ibm-valid-P15-ibm15v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P15/ibm15v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P15/ibm15v02.xml
+%% ID: ibm-valid-P15-ibm15v02.xml
+%% Type: valid
+%% Sections: 2.5
+'ibm-valid-P15-ibm15v02'(suite) -> [];
+'ibm-valid-P15-ibm15v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P15/ibm15v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P15/ibm15v03.xml
+%% ID: ibm-valid-P15-ibm15v03.xml
+%% Type: valid
+%% Sections: 2.5
+'ibm-valid-P15-ibm15v03'(suite) -> [];
+'ibm-valid-P15-ibm15v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P15/ibm15v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P15/ibm15v04.xml
+%% ID: ibm-valid-P15-ibm15v04.xml
+%% Type: valid
+%% Sections: 2.5
+'ibm-valid-P15-ibm15v04'(suite) -> [];
+'ibm-valid-P15-ibm15v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P15/ibm15v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 15
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P16/ibm16v01.xml
+%% ID: ibm-valid-P16-ibm16v01.xml
+%% Type: valid
+%% Sections: 2.6
+'ibm-valid-P16-ibm16v01'(suite) -> [];
+'ibm-valid-P16-ibm16v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P16/ibm16v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P16/ibm16v02.xml
+%% ID: ibm-valid-P16-ibm16v02.xml
+%% Type: valid
+%% Sections: 2.6
+'ibm-valid-P16-ibm16v02'(suite) -> [];
+'ibm-valid-P16-ibm16v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P16/ibm16v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P16/ibm16v03.xml
+%% ID: ibm-valid-P16-ibm16v03.xml
+%% Type: valid
+%% Sections: 2.6
+'ibm-valid-P16-ibm16v03'(suite) -> [];
+'ibm-valid-P16-ibm16v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P16/ibm16v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 16
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P17/ibm17v01.xml
+%% ID: ibm-valid-P17-ibm17v01.xml
+%% Type: valid
+%% Sections: 2.6
+'ibm-valid-P17-ibm17v01'(suite) -> [];
+'ibm-valid-P17-ibm17v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P17/ibm17v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 17
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P18/ibm18v01.xml
+%% ID: ibm-valid-P18-ibm18v01.xml
+%% Type: valid
+%% Sections: 2.7
+'ibm-valid-P18-ibm18v01'(suite) -> [];
+'ibm-valid-P18-ibm18v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P18/ibm18v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 18
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P19/ibm19v01.xml
+%% ID: ibm-valid-P19-ibm19v01.xml
+%% Type: valid
+%% Sections: 2.7
+'ibm-valid-P19-ibm19v01'(suite) -> [];
+'ibm-valid-P19-ibm19v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P19/ibm19v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 19
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P20/ibm20v01.xml
+%% ID: ibm-valid-P20-ibm20v01.xml
+%% Type: valid
+%% Sections: 2.7
+'ibm-valid-P20-ibm20v01'(suite) -> [];
+'ibm-valid-P20-ibm20v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P20/ibm20v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P20/ibm20v02.xml
+%% ID: ibm-valid-P20-ibm20v02.xml
+%% Type: valid
+%% Sections: 2.7
+'ibm-valid-P20-ibm20v02'(suite) -> [];
+'ibm-valid-P20-ibm20v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P20/ibm20v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 20
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P21/ibm21v01.xml
+%% ID: ibm-valid-P21-ibm21v01.xml
+%% Type: valid
+%% Sections: 2.7
+'ibm-valid-P21-ibm21v01'(suite) -> [];
+'ibm-valid-P21-ibm21v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P21/ibm21v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 21
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P22/ibm22v01.xml
+%% ID: ibm-valid-P22-ibm22v01.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P22-ibm22v01'(suite) -> [];
+'ibm-valid-P22-ibm22v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P22/ibm22v02.xml
+%% ID: ibm-valid-P22-ibm22v02.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P22-ibm22v02'(suite) -> [];
+'ibm-valid-P22-ibm22v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P22/ibm22v03.xml
+%% ID: ibm-valid-P22-ibm22v03.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P22-ibm22v03'(suite) -> [];
+'ibm-valid-P22-ibm22v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P22/ibm22v04.xml
+%% ID: ibm-valid-P22-ibm22v04.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P22-ibm22v04'(suite) -> [];
+'ibm-valid-P22-ibm22v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P22/ibm22v05.xml
+%% ID: ibm-valid-P22-ibm22v05.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P22-ibm22v05'(suite) -> [];
+'ibm-valid-P22-ibm22v05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P22/ibm22v06.xml
+%% ID: ibm-valid-P22-ibm22v06.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P22-ibm22v06'(suite) -> [];
+'ibm-valid-P22-ibm22v06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P22/ibm22v07.xml
+%% ID: ibm-valid-P22-ibm22v07.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P22-ibm22v07'(suite) -> [];
+'ibm-valid-P22-ibm22v07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 22
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P23/ibm23v01.xml
+%% ID: ibm-valid-P23-ibm23v01.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P23-ibm23v01'(suite) -> [];
+'ibm-valid-P23-ibm23v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P23/ibm23v02.xml
+%% ID: ibm-valid-P23-ibm23v02.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P23-ibm23v02'(suite) -> [];
+'ibm-valid-P23-ibm23v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P23/ibm23v03.xml
+%% ID: ibm-valid-P23-ibm23v03.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P23-ibm23v03'(suite) -> [];
+'ibm-valid-P23-ibm23v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P23/ibm23v04.xml
+%% ID: ibm-valid-P23-ibm23v04.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P23-ibm23v04'(suite) -> [];
+'ibm-valid-P23-ibm23v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P23/ibm23v05.xml
+%% ID: ibm-valid-P23-ibm23v05.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P23-ibm23v05'(suite) -> [];
+'ibm-valid-P23-ibm23v05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P23/ibm23v06.xml
+%% ID: ibm-valid-P23-ibm23v06.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P23-ibm23v06'(suite) -> [];
+'ibm-valid-P23-ibm23v06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 23
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P24/ibm24v01.xml
+%% ID: ibm-valid-P24-ibm24v01.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P24-ibm24v01'(suite) -> [];
+'ibm-valid-P24-ibm24v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P24/ibm24v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P24/ibm24v02.xml
+%% ID: ibm-valid-P24-ibm24v02.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P24-ibm24v02'(suite) -> [];
+'ibm-valid-P24-ibm24v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P24/ibm24v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 24
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P25/ibm25v01.xml
+%% ID: ibm-valid-P25-ibm25v01.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P25-ibm25v01'(suite) -> [];
+'ibm-valid-P25-ibm25v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P25/ibm25v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P25/ibm25v02.xml
+%% ID: ibm-valid-P25-ibm25v02.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P25-ibm25v02'(suite) -> [];
+'ibm-valid-P25-ibm25v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P25/ibm25v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P25/ibm25v03.xml
+%% ID: ibm-valid-P25-ibm25v03.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P25-ibm25v03'(suite) -> [];
+'ibm-valid-P25-ibm25v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P25/ibm25v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P25/ibm25v04.xml
+%% ID: ibm-valid-P25-ibm25v04.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P25-ibm25v04'(suite) -> [];
+'ibm-valid-P25-ibm25v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P25/ibm25v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 25
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P26/ibm26v01.xml
+%% ID: ibm-valid-P26-ibm26v01.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P26-ibm26v01'(suite) -> [];
+'ibm-valid-P26-ibm26v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P26/ibm26v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 26
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P27/ibm27v01.xml
+%% ID: ibm-valid-P27-ibm27v01.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P27-ibm27v01'(suite) -> [];
+'ibm-valid-P27-ibm27v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P27/ibm27v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P27/ibm27v02.xml
+%% ID: ibm-valid-P27-ibm27v02.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P27-ibm27v02'(suite) -> [];
+'ibm-valid-P27-ibm27v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P27/ibm27v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P27/ibm27v03.xml
+%% ID: ibm-valid-P27-ibm27v03.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P27-ibm27v03'(suite) -> [];
+'ibm-valid-P27-ibm27v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P27/ibm27v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 27
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P28/ibm28v01.xml
+%% ID: ibm-valid-P28-ibm28v01.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P28-ibm28v01'(suite) -> [];
+'ibm-valid-P28-ibm28v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P28/ibm28v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P28/ibm28v02.xml
+%% ID: ibm-valid-P28-ibm28v02.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P28-ibm28v02'(suite) -> [];
+'ibm-valid-P28-ibm28v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P28/ibm28v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 28
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P29/ibm29v01.xml
+%% ID: ibm-valid-P29-ibm29v01.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P29-ibm29v01'(suite) -> [];
+'ibm-valid-P29-ibm29v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P29/ibm29v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P29/ibm29v02.xml
+%% ID: ibm-valid-P29-ibm29v02.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P29-ibm29v02'(suite) -> [];
+'ibm-valid-P29-ibm29v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P29/ibm29v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 29
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P30/ibm30v01.xml
+%% ID: ibm-valid-P30-ibm30v01.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P30-ibm30v01'(suite) -> [];
+'ibm-valid-P30-ibm30v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P30/ibm30v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P30/ibm30v02.xml
+%% ID: ibm-valid-P30-ibm30v02.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P30-ibm30v02'(suite) -> [];
+'ibm-valid-P30-ibm30v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P30/ibm30v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 30
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P31/ibm31v01.xml
+%% ID: ibm-valid-P31-ibm31v01.xml
+%% Type: valid
+%% Sections: 2.8
+'ibm-valid-P31-ibm31v01'(suite) -> [];
+'ibm-valid-P31-ibm31v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P31/ibm31v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 31
+
+testcases130(suite) -> [].
+%%   ['ibm-valid-P31-ibm31v01'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P32/ibm32v01.xml
+%% ID: ibm-valid-P32-ibm32v01.xml
+%% Type: valid
+%% Sections: 2.9
+'ibm-valid-P32-ibm32v01'(suite) -> [];
+'ibm-valid-P32-ibm32v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P32/ibm32v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P32/ibm32v02.xml
+%% ID: ibm-valid-P32-ibm32v02.xml
+%% Type: valid
+%% Sections: 2.9
+'ibm-valid-P32-ibm32v02'(suite) -> [];
+'ibm-valid-P32-ibm32v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P32/ibm32v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P32/ibm32v03.xml
+%% ID: ibm-valid-P32-ibm32v03.xml
+%% Type: valid
+%% Sections: 2.9
+'ibm-valid-P32-ibm32v03'(suite) -> [];
+'ibm-valid-P32-ibm32v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P32/ibm32v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P32/ibm32v04.xml
+%% ID: ibm-valid-P32-ibm32v04.xml
+%% Type: valid
+%% Sections: 2.9
+'ibm-valid-P32-ibm32v04'(suite) -> [];
+'ibm-valid-P32-ibm32v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P32/ibm32v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 32
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P33/ibm33v01.xml
+%% ID: ibm-valid-P33-ibm33v01.xml
+%% Type: valid
+%% Sections: 2.12
+'ibm-valid-P33-ibm33v01'(suite) -> [];
+'ibm-valid-P33-ibm33v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P33/ibm33v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 33
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P34/ibm34v01.xml
+%% ID: ibm-valid-P34-ibm34v01.xml
+%% Type: valid
+%% Sections: 2.12
+'ibm-valid-P34-ibm34v01'(suite) -> [];
+'ibm-valid-P34-ibm34v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P34/ibm34v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 34
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P35/ibm35v01.xml
+%% ID: ibm-valid-P35-ibm35v01.xml
+%% Type: valid
+%% Sections: 2.12
+'ibm-valid-P35-ibm35v01'(suite) -> [];
+'ibm-valid-P35-ibm35v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P35/ibm35v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 35
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P36/ibm36v01.xml
+%% ID: ibm-valid-P36-ibm36v01.xml
+%% Type: valid
+%% Sections: 2.12
+'ibm-valid-P36-ibm36v01'(suite) -> [];
+'ibm-valid-P36-ibm36v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P36/ibm36v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 36
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P37/ibm37v01.xml
+%% ID: ibm-valid-P37-ibm37v01.xml
+%% Type: valid
+%% Sections: 2.12
+'ibm-valid-P37-ibm37v01'(suite) -> [];
+'ibm-valid-P37-ibm37v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P37/ibm37v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 37
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P38/ibm38v01.xml
+%% ID: ibm-valid-P38-ibm38v01.xml
+%% Type: valid
+%% Sections: 2.12
+'ibm-valid-P38-ibm38v01'(suite) -> [];
+'ibm-valid-P38-ibm38v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P38/ibm38v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 38
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P39/ibm39v01.xml
+%% ID: ibm-valid-P39-ibm39v01.xml
+%% Type: valid
+%% Sections: 3
+'ibm-valid-P39-ibm39v01'(suite) -> [];
+'ibm-valid-P39-ibm39v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P39/ibm39v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 39
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P40/ibm40v01.xml
+%% ID: ibm-valid-P40-ibm40v01.xml
+%% Type: valid
+%% Sections: 3.1
+'ibm-valid-P40-ibm40v01'(suite) -> [];
+'ibm-valid-P40-ibm40v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P40/ibm40v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 40
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P41/ibm41v01.xml
+%% ID: ibm-valid-P41-ibm41v01.xml
+%% Type: valid
+%% Sections: 3.1
+'ibm-valid-P41-ibm41v01'(suite) -> [];
+'ibm-valid-P41-ibm41v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P41/ibm41v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 41
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P42/ibm42v01.xml
+%% ID: ibm-valid-P42-ibm42v01.xml
+%% Type: valid
+%% Sections: 3.1
+'ibm-valid-P42-ibm42v01'(suite) -> [];
+'ibm-valid-P42-ibm42v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P42/ibm42v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 42
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P43/ibm43v01.xml
+%% ID: ibm-valid-P43-ibm43v01.xml
+%% Type: valid
+%% Sections: 3.1
+'ibm-valid-P43-ibm43v01'(suite) -> [];
+'ibm-valid-P43-ibm43v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P43/ibm43v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 43
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P44/ibm44v01.xml
+%% ID: ibm-valid-P44-ibm44v01.xml
+%% Type: valid
+%% Sections: 3.1
+'ibm-valid-P44-ibm44v01'(suite) -> [];
+'ibm-valid-P44-ibm44v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P44/ibm44v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 44
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P45/ibm45v01.xml
+%% ID: ibm-valid-P45-ibm45v01.xml
+%% Type: valid
+%% Sections: 3.2
+'ibm-valid-P45-ibm45v01'(suite) -> [];
+'ibm-valid-P45-ibm45v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P45/ibm45v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 45
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P47/ibm47v01.xml
+%% ID: ibm-valid-P47-ibm47v01.xml
+%% Type: valid
+%% Sections: 3.2.1
+'ibm-valid-P47-ibm47v01'(suite) -> [];
+'ibm-valid-P47-ibm47v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P47/ibm47v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 47
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P49/ibm49v01.xml
+%% ID: ibm-valid-P49-ibm49v01.xml
+%% Type: valid
+%% Sections: 3.2.1
+'ibm-valid-P49-ibm49v01'(suite) -> [];
+'ibm-valid-P49-ibm49v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P49/ibm49v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 49
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P50/ibm50v01.xml
+%% ID: ibm-valid-P50-ibm50v01.xml
+%% Type: valid
+%% Sections: 3.2.1
+'ibm-valid-P50-ibm50v01'(suite) -> [];
+'ibm-valid-P50-ibm50v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P50/ibm50v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 50
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P51/ibm51v01.xml
+%% ID: ibm-valid-P51-ibm51v01.xml
+%% Type: valid
+%% Sections: 3.2.2
+'ibm-valid-P51-ibm51v01'(suite) -> [];
+'ibm-valid-P51-ibm51v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P51/ibm51v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P51/ibm51v02.xml
+%% ID: ibm-valid-P51-ibm51v02.xml
+%% Type: valid
+%% Sections: 3.2.2
+'ibm-valid-P51-ibm51v02'(suite) -> [];
+'ibm-valid-P51-ibm51v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P51/ibm51v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 51
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P52/ibm52v01.xml
+%% ID: ibm-valid-P52-ibm52v01.xml
+%% Type: valid
+%% Sections: 3.3
+'ibm-valid-P52-ibm52v01'(suite) -> [];
+'ibm-valid-P52-ibm52v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P52/ibm52v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 52
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P54/ibm54v01.xml
+%% ID: ibm-valid-P54-ibm54v01.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P54-ibm54v01'(suite) -> [];
+'ibm-valid-P54-ibm54v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P54/ibm54v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P54/ibm54v02.xml
+%% ID: ibm-valid-P54-ibm54v02.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P54-ibm54v02'(suite) -> [];
+'ibm-valid-P54-ibm54v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P54/ibm54v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P54/ibm54v03.xml
+%% ID: ibm-valid-P54-ibm54v03.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P54-ibm54v03'(suite) -> [];
+'ibm-valid-P54-ibm54v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P54/ibm54v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 54
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P55/ibm55v01.xml
+%% ID: ibm-valid-P55-ibm55v01.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P55-ibm55v01'(suite) -> [];
+'ibm-valid-P55-ibm55v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P55/ibm55v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 55
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P56/ibm56v01.xml
+%% ID: ibm-valid-P56-ibm56v01.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P56-ibm56v01'(suite) -> [];
+'ibm-valid-P56-ibm56v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P56/ibm56v02.xml
+%% ID: ibm-valid-P56-ibm56v02.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P56-ibm56v02'(suite) -> [];
+'ibm-valid-P56-ibm56v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P56/ibm56v03.xml
+%% ID: ibm-valid-P56-ibm56v03.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P56-ibm56v03'(suite) -> [];
+'ibm-valid-P56-ibm56v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P56/ibm56v04.xml
+%% ID: ibm-valid-P56-ibm56v04.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P56-ibm56v04'(suite) -> [];
+'ibm-valid-P56-ibm56v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P56/ibm56v05.xml
+%% ID: ibm-valid-P56-ibm56v05.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P56-ibm56v05'(suite) -> [];
+'ibm-valid-P56-ibm56v05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P56/ibm56v06.xml
+%% ID: ibm-valid-P56-ibm56v06.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P56-ibm56v06'(suite) -> [];
+'ibm-valid-P56-ibm56v06'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v06.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P56/ibm56v07.xml
+%% ID: ibm-valid-P56-ibm56v07.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P56-ibm56v07'(suite) -> [];
+'ibm-valid-P56-ibm56v07'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v07.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P56/ibm56v08.xml
+%% ID: ibm-valid-P56-ibm56v08.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P56-ibm56v08'(suite) -> [];
+'ibm-valid-P56-ibm56v08'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v08.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P56/ibm56v09.xml
+%% ID: ibm-valid-P56-ibm56v09.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P56-ibm56v09'(suite) -> [];
+'ibm-valid-P56-ibm56v09'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v09.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P56/ibm56v10.xml
+%% ID: ibm-valid-P56-ibm56v10.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P56-ibm56v10'(suite) -> [];
+'ibm-valid-P56-ibm56v10'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v10.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 56
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P57/ibm57v01.xml
+%% ID: ibm-valid-P57-ibm57v01.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P57-ibm57v01'(suite) -> [];
+'ibm-valid-P57-ibm57v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P57/ibm57v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 57
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P58/ibm58v01.xml
+%% ID: ibm-valid-P58-ibm58v01.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P58-ibm58v01'(suite) -> [];
+'ibm-valid-P58-ibm58v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P58/ibm58v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P58/ibm58v02.xml
+%% ID: ibm-valid-P58-ibm58v02.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P58-ibm58v02'(suite) -> [];
+'ibm-valid-P58-ibm58v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P58/ibm58v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 58
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P59/ibm59v01.xml
+%% ID: ibm-valid-P59-ibm59v01.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P59-ibm59v01'(suite) -> [];
+'ibm-valid-P59-ibm59v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P59/ibm59v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P59/ibm59v02.xml
+%% ID: ibm-valid-P59-ibm59v02.xml
+%% Type: valid
+%% Sections: 3.3.1
+'ibm-valid-P59-ibm59v02'(suite) -> [];
+'ibm-valid-P59-ibm59v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P59/ibm59v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 59
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P60/ibm60v01.xml
+%% ID: ibm-valid-P60-ibm60v01.xml
+%% Type: valid
+%% Sections: 3.3.2
+'ibm-valid-P60-ibm60v01'(suite) -> [];
+'ibm-valid-P60-ibm60v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P60/ibm60v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P60/ibm60v02.xml
+%% ID: ibm-valid-P60-ibm60v02.xml
+%% Type: valid
+%% Sections: 3.3.2
+'ibm-valid-P60-ibm60v02'(suite) -> [];
+'ibm-valid-P60-ibm60v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P60/ibm60v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P60/ibm60v03.xml
+%% ID: ibm-valid-P60-ibm60v03.xml
+%% Type: valid
+%% Sections: 3.3.2
+'ibm-valid-P60-ibm60v03'(suite) -> [];
+'ibm-valid-P60-ibm60v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P60/ibm60v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P60/ibm60v04.xml
+%% ID: ibm-valid-P60-ibm60v04.xml
+%% Type: valid
+%% Sections: 3.3.2
+'ibm-valid-P60-ibm60v04'(suite) -> [];
+'ibm-valid-P60-ibm60v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P60/ibm60v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 60
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P61/ibm61v01.xml
+%% ID: ibm-valid-P61-ibm61v01.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P61-ibm61v01'(suite) -> [];
+'ibm-valid-P61-ibm61v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P61/ibm61v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P61/ibm61v02.xml
+%% ID: ibm-valid-P61-ibm61v02.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P61-ibm61v02'(suite) -> [];
+'ibm-valid-P61-ibm61v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P61/ibm61v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 61
+
+testcases157(suite) -> [].
+%%   ['ibm-valid-P61-ibm61v01','ibm-valid-P61-ibm61v02'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P62/ibm62v01.xml
+%% ID: ibm-valid-P62-ibm62v01.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P62-ibm62v01'(suite) -> [];
+'ibm-valid-P62-ibm62v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P62/ibm62v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P62/ibm62v02.xml
+%% ID: ibm-valid-P62-ibm62v02.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P62-ibm62v02'(suite) -> [];
+'ibm-valid-P62-ibm62v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P62/ibm62v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P62/ibm62v03.xml
+%% ID: ibm-valid-P62-ibm62v03.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P62-ibm62v03'(suite) -> [];
+'ibm-valid-P62-ibm62v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P62/ibm62v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P62/ibm62v04.xml
+%% ID: ibm-valid-P62-ibm62v04.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P62-ibm62v04'(suite) -> [];
+'ibm-valid-P62-ibm62v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P62/ibm62v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P62/ibm62v05.xml
+%% ID: ibm-valid-P62-ibm62v05.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P62-ibm62v05'(suite) -> [];
+'ibm-valid-P62-ibm62v05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P62/ibm62v05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 62
+
+testcases158(suite) -> [].
+%%   ['ibm-valid-P62-ibm62v01','ibm-valid-P62-ibm62v02','ibm-valid-P62-ibm62v03','ibm-valid-P62-ibm62v04','ibm-valid-P62-ibm62v05'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P63/ibm63v01.xml
+%% ID: ibm-valid-P63-ibm63v01.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P63-ibm63v01'(suite) -> [];
+'ibm-valid-P63-ibm63v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P63/ibm63v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P63/ibm63v02.xml
+%% ID: ibm-valid-P63-ibm63v02.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P63-ibm63v02'(suite) -> [];
+'ibm-valid-P63-ibm63v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P63/ibm63v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P63/ibm63v03.xml
+%% ID: ibm-valid-P63-ibm63v03.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P63-ibm63v03'(suite) -> [];
+'ibm-valid-P63-ibm63v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P63/ibm63v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P63/ibm63v04.xml
+%% ID: ibm-valid-P63-ibm63v04.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P63-ibm63v04'(suite) -> [];
+'ibm-valid-P63-ibm63v04'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P63/ibm63v04.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P63/ibm63v05.xml
+%% ID: ibm-valid-P63-ibm63v05.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P63-ibm63v05'(suite) -> [];
+'ibm-valid-P63-ibm63v05'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P63/ibm63v05.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 63
+
+testcases159(suite) -> [].
+%%   ['ibm-valid-P63-ibm63v01','ibm-valid-P63-ibm63v02','ibm-valid-P63-ibm63v03','ibm-valid-P63-ibm63v04','ibm-valid-P63-ibm63v05'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P64/ibm64v01.xml
+%% ID: ibm-valid-P64-ibm64v01.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P64-ibm64v01'(suite) -> [];
+'ibm-valid-P64-ibm64v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P64/ibm64v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P64/ibm64v02.xml
+%% ID: ibm-valid-P64-ibm64v02.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P64-ibm64v02'(suite) -> [];
+'ibm-valid-P64-ibm64v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P64/ibm64v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P64/ibm64v03.xml
+%% ID: ibm-valid-P64-ibm64v03.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P64-ibm64v03'(suite) -> [];
+'ibm-valid-P64-ibm64v03'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P64/ibm64v03.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 64
+
+testcases160(suite) -> [].
+%%   ['ibm-valid-P64-ibm64v01','ibm-valid-P64-ibm64v02','ibm-valid-P64-ibm64v03'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P65/ibm65v01.xml
+%% ID: ibm-valid-P65-ibm65v01.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P65-ibm65v01'(suite) -> [];
+'ibm-valid-P65-ibm65v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P65/ibm65v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P65/ibm65v02.xml
+%% ID: ibm-valid-P65-ibm65v02.xml
+%% Type: valid
+%% Sections: 3.4
+'ibm-valid-P65-ibm65v02'(suite) -> [];
+'ibm-valid-P65-ibm65v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P65/ibm65v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 65
+
+testcases161(suite) -> [].
+%%   ['ibm-valid-P65-ibm65v01','ibm-valid-P65-ibm65v02'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P66/ibm66v01.xml
+%% ID: ibm-valid-P66-ibm66v01.xml
+%% Type: valid
+%% Sections: 4.1
+'ibm-valid-P66-ibm66v01'(suite) -> [];
+'ibm-valid-P66-ibm66v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P66/ibm66v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 66
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P67/ibm67v01.xml
+%% ID: ibm-valid-P67-ibm67v01.xml
+%% Type: valid
+%% Sections: 4.1
+'ibm-valid-P67-ibm67v01'(suite) -> [];
+'ibm-valid-P67-ibm67v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P67/ibm67v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 67
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P68/ibm68v01.xml
+%% ID: ibm-valid-P68-ibm68v01.xml
+%% Type: valid
+%% Sections: 4.1
+'ibm-valid-P68-ibm68v01'(suite) -> [];
+'ibm-valid-P68-ibm68v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P68/ibm68v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P68/ibm68v02.xml
+%% ID: ibm-valid-P68-ibm68v02.xml
+%% Type: valid
+%% Sections: 4.1
+'ibm-valid-P68-ibm68v02'(suite) -> [];
+'ibm-valid-P68-ibm68v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P68/ibm68v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 68
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P69/ibm69v01.xml
+%% ID: ibm-valid-P69-ibm69v01.xml
+%% Type: valid
+%% Sections: 4.1
+'ibm-valid-P69-ibm69v01'(suite) -> [];
+'ibm-valid-P69-ibm69v01'(_Config) -> {skip, "NYI"}.
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P69/ibm69v01.xml"]),
+%%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+%%    ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P69/ibm69v02.xml
+%% ID: ibm-valid-P69-ibm69v02.xml
+%% Type: valid
+%% Sections: 4.1
+'ibm-valid-P69-ibm69v02'(suite) -> [];
+'ibm-valid-P69-ibm69v02'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P69/ibm69v02.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 69
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P70/ibm70v01.xml
+%% ID: ibm-valid-P70-ibm70v01.xml
+%% Type: valid
+%% Sections: 4.2
+'ibm-valid-P70-ibm70v01'(suite) -> [];
+'ibm-valid-P70-ibm70v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P70/ibm70v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 70
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P78/ibm78v01.xml
+%% ID: ibm-valid-P78-ibm78v01.xml
+%% Type: valid
+%% Sections: 4.3.2
+'ibm-valid-P78-ibm78v01'(suite) -> [];
+'ibm-valid-P78-ibm78v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P78/ibm78v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 78
+
+testcases167(suite) -> [].
+%%   ['ibm-valid-P78-ibm78v01'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P79/ibm79v01.xml
+%% ID: ibm-valid-P79-ibm79v01.xml
+%% Type: valid
+%% Sections: 4.3.2
+'ibm-valid-P79-ibm79v01'(suite) -> [];
+'ibm-valid-P79-ibm79v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P79/ibm79v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 79
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P82/ibm82v01.xml
+%% ID: ibm-valid-P82-ibm82v01.xml
+%% Type: valid
+%% Sections: 4.7
+'ibm-valid-P82-ibm82v01'(suite) -> [];
+'ibm-valid-P82-ibm82v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P82/ibm82v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 82
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P85/ibm85v01.xml
+%% ID: ibm-valid-P85-ibm85v01.xml
+%% Type: valid
+%% Sections: B.
+'ibm-valid-P85-ibm85v01'(suite) -> [];
+'ibm-valid-P85-ibm85v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P85/ibm85v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 85
+
+testcases170(suite) -> [].
+%%   ['ibm-valid-P85-ibm85v01'].
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P86/ibm86v01.xml
+%% ID: ibm-valid-P86-ibm86v01.xml
+%% Type: valid
+%% Sections: B.
+'ibm-valid-P86-ibm86v01'(suite) -> [];
+'ibm-valid-P86-ibm86v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P86/ibm86v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 86
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P87/ibm87v01.xml
+%% ID: ibm-valid-P87-ibm87v01.xml
+%% Type: valid
+%% Sections: B.
+'ibm-valid-P87-ibm87v01'(suite) -> [];
+'ibm-valid-P87-ibm87v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P87/ibm87v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 87
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P88/ibm88v01.xml
+%% ID: ibm-valid-P88-ibm88v01.xml
+%% Type: valid
+%% Sections: B.
+'ibm-valid-P88-ibm88v01'(suite) -> [];
+'ibm-valid-P88-ibm88v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P88/ibm88v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 88
+
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% Uri: valid/P89/ibm89v01.xml
+%% ID: ibm-valid-P89-ibm89v01.xml
+%% Type: valid
+%% Sections: B.
+'ibm-valid-P89-ibm89v01'(suite) -> [];
+'ibm-valid-P89-ibm89v01'(Config) -> 
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P89/ibm89v01.xml"]),
+   ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   ?line check_result(R, "valid").
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - Production 89
+
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML Conformance Test Suite - valid tests
+
+
+%%----------------------------------------------------------------------
+%% Test Cases 
+%% Profile: IBM XML 1.0 Tests
+
+
+%%----------------------------------------------------------------------
+%% Test Suite 
+%% Profile: XML 1.0 (2nd edition) W3C Conformance Test Suite, 6 October 2000
+
+all() -> 
+    [{group, testcases1}, {group, testcases3},
+     {group, testcases5}, {group, testcases6},
+     {group, testcases8}].
+
+groups() -> 
+    [{testcases2, [],
+      ['not-wf-sa-001', 'not-wf-sa-002', 'not-wf-sa-003',
+       'not-wf-sa-004', 'not-wf-sa-005', 'not-wf-sa-006',
+       'not-wf-sa-007', 'not-wf-sa-008', 'not-wf-sa-009',
+       'not-wf-sa-010', 'not-wf-sa-011', 'not-wf-sa-012',
+       'not-wf-sa-013', 'not-wf-sa-014', 'not-wf-sa-015',
+       'not-wf-sa-016', 'not-wf-sa-017', 'not-wf-sa-018',
+       'not-wf-sa-019', 'not-wf-sa-020', 'not-wf-sa-021',
+       'not-wf-sa-022', 'not-wf-sa-023', 'not-wf-sa-024',
+       'not-wf-sa-025', 'not-wf-sa-026', 'not-wf-sa-027',
+       'not-wf-sa-028', 'not-wf-sa-029', 'not-wf-sa-030',
+       'not-wf-sa-031', 'not-wf-sa-032', 'not-wf-sa-033',
+       'not-wf-sa-034', 'not-wf-sa-035', 'not-wf-sa-036',
+       'not-wf-sa-037', 'not-wf-sa-038', 'not-wf-sa-039',
+       'not-wf-sa-040', 'not-wf-sa-041', 'not-wf-sa-042',
+       'not-wf-sa-043', 'not-wf-sa-044', 'not-wf-sa-045',
+       'not-wf-sa-046', 'not-wf-sa-047', 'not-wf-sa-048',
+       'not-wf-sa-049', 'not-wf-sa-050', 'not-wf-sa-051',
+       'not-wf-sa-052', 'not-wf-sa-053', 'not-wf-sa-054',
+       'not-wf-sa-055', 'not-wf-sa-056', 'not-wf-sa-057',
+       'not-wf-sa-058', 'not-wf-sa-059', 'not-wf-sa-060',
+       'not-wf-sa-061', 'not-wf-sa-062', 'not-wf-sa-063',
+       'not-wf-sa-064', 'not-wf-sa-065', 'not-wf-sa-066',
+       'not-wf-sa-067', 'not-wf-sa-068', 'not-wf-sa-069',
+       'not-wf-sa-070', 'not-wf-sa-071', 'not-wf-sa-072',
+       'not-wf-sa-073', 'not-wf-sa-074', 'not-wf-sa-075',
+       'not-wf-sa-076', 'not-wf-sa-077', 'not-wf-sa-078',
+       'not-wf-sa-079', 'not-wf-sa-080', 'not-wf-sa-081',
+       'not-wf-sa-082', 'not-wf-sa-083', 'not-wf-sa-084',
+       'not-wf-sa-085', 'not-wf-sa-086', 'not-wf-sa-087',
+       'not-wf-sa-088', 'not-wf-sa-089', 'not-wf-sa-090',
+       'not-wf-sa-091', 'not-wf-sa-092', 'not-wf-sa-093',
+       'not-wf-sa-094', 'not-wf-sa-095', 'not-wf-sa-096',
+       'not-wf-sa-097', 'not-wf-sa-098', 'not-wf-sa-099',
+       'not-wf-sa-100', 'not-wf-sa-101', 'not-wf-sa-102',
+       'not-wf-sa-103', 'not-wf-sa-104', 'not-wf-sa-105',
+       'not-wf-sa-106', 'not-wf-sa-107', 'not-wf-sa-108',
+       'not-wf-sa-109', 'not-wf-sa-110', 'not-wf-sa-111',
+       'not-wf-sa-112', 'not-wf-sa-113', 'not-wf-sa-114',
+       'not-wf-sa-115', 'not-wf-sa-116', 'not-wf-sa-117',
+       'not-wf-sa-118', 'not-wf-sa-119', 'not-wf-sa-120',
+       'not-wf-sa-121', 'not-wf-sa-122', 'not-wf-sa-123',
+       'not-wf-sa-124', 'not-wf-sa-125', 'not-wf-sa-126',
+       'not-wf-sa-127', 'not-wf-sa-128', 'not-wf-sa-129',
+       'not-wf-sa-130', 'not-wf-sa-131', 'not-wf-sa-132',
+       'not-wf-sa-133', 'not-wf-sa-134', 'not-wf-sa-135',
+       'not-wf-sa-136', 'not-wf-sa-137', 'not-wf-sa-138',
+       'not-wf-sa-139', 'not-wf-sa-140', 'not-wf-sa-141',
+       'not-wf-sa-142', 'not-wf-sa-143', 'not-wf-sa-144',
+       'not-wf-sa-145', 'not-wf-sa-146', 'not-wf-sa-147',
+       'not-wf-sa-148', 'not-wf-sa-149', 'not-wf-sa-150',
+       'not-wf-sa-151', 'not-wf-sa-152', 'not-wf-sa-153',
+       'not-wf-sa-154', 'not-wf-sa-155', 'not-wf-sa-156',
+       'not-wf-sa-157', 'not-wf-sa-158', 'not-wf-sa-159',
+       'not-wf-sa-160', 'not-wf-sa-161', 'not-wf-sa-162',
+       'not-wf-sa-163', 'not-wf-sa-164', 'not-wf-sa-165',
+       'not-wf-sa-166', 'not-wf-sa-167', 'not-wf-sa-168',
+       'not-wf-sa-169', 'not-wf-sa-170', 'not-wf-sa-171',
+       'not-wf-sa-172', 'not-wf-sa-173', 'not-wf-sa-174',
+       'not-wf-sa-175', 'not-wf-sa-176', 'not-wf-sa-177',
+       'not-wf-sa-178', 'not-wf-sa-179', 'not-wf-sa-180',
+       'not-wf-sa-181', 'not-wf-sa-182', 'not-wf-sa-183',
+       'not-wf-sa-184', 'not-wf-sa-185', 'not-wf-sa-186',
+       'not-wf-not-sa-001', 'not-wf-not-sa-002',
+       'not-wf-not-sa-003', 'not-wf-not-sa-004',
+       'not-wf-not-sa-005', 'not-wf-not-sa-006',
+       'not-wf-not-sa-007', 'not-wf-not-sa-008',
+       'not-wf-not-sa-009', 'not-wf-ext-sa-001',
+       'not-wf-ext-sa-002', 'not-wf-ext-sa-003',
+       'invalid--002', 'invalid--005', 'invalid--006',
+       'invalid-not-sa-022', 'valid-sa-001', 'valid-sa-002',
+       'valid-sa-003', 'valid-sa-004', 'valid-sa-005',
+       'valid-sa-006', 'valid-sa-007', 'valid-sa-008',
+       'valid-sa-009', 'valid-sa-010', 'valid-sa-011',
+       'valid-sa-012', 'valid-sa-013', 'valid-sa-014',
+       'valid-sa-015', 'valid-sa-016', 'valid-sa-017',
+       'valid-sa-018', 'valid-sa-019', 'valid-sa-020',
+       'valid-sa-021', 'valid-sa-022', 'valid-sa-023',
+       'valid-sa-024', 'valid-sa-025', 'valid-sa-026',
+       'valid-sa-027', 'valid-sa-028', 'valid-sa-029',
+       'valid-sa-030', 'valid-sa-031', 'valid-sa-032',
+       'valid-sa-033', 'valid-sa-034', 'valid-sa-035',
+       'valid-sa-036', 'valid-sa-037', 'valid-sa-038',
+       'valid-sa-039', 'valid-sa-040', 'valid-sa-041',
+       'valid-sa-042', 'valid-sa-043', 'valid-sa-044',
+       'valid-sa-045', 'valid-sa-046', 'valid-sa-047',
+       'valid-sa-048', 'valid-sa-049', 'valid-sa-050',
+       'valid-sa-051', 'valid-sa-052', 'valid-sa-053',
+       'valid-sa-054', 'valid-sa-055', 'valid-sa-056',
+       'valid-sa-057', 'valid-sa-058', 'valid-sa-059',
+       'valid-sa-060', 'valid-sa-061', 'valid-sa-062',
+       'valid-sa-063', 'valid-sa-064', 'valid-sa-065',
+       'valid-sa-066', 'valid-sa-067', 'valid-sa-068',
+       'valid-sa-069', 'valid-sa-070', 'valid-sa-071',
+       'valid-sa-072', 'valid-sa-073', 'valid-sa-074',
+       'valid-sa-075', 'valid-sa-076', 'valid-sa-077',
+       'valid-sa-078', 'valid-sa-079', 'valid-sa-080',
+       'valid-sa-081', 'valid-sa-082', 'valid-sa-083',
+       'valid-sa-084', 'valid-sa-085', 'valid-sa-086',
+       'valid-sa-087', 'valid-sa-088', 'valid-sa-089',
+       'valid-sa-090', 'valid-sa-091', 'valid-sa-092',
+       'valid-sa-093', 'valid-sa-094', 'valid-sa-095',
+       'valid-sa-096', 'valid-sa-097', 'valid-sa-098',
+       'valid-sa-099', 'valid-sa-100', 'valid-sa-101',
+       'valid-sa-102', 'valid-sa-103', 'valid-sa-104',
+       'valid-sa-105', 'valid-sa-106', 'valid-sa-107',
+       'valid-sa-108', 'valid-sa-109', 'valid-sa-110',
+       'valid-sa-111', 'valid-sa-112', 'valid-sa-113',
+       'valid-sa-114', 'valid-sa-115', 'valid-sa-116',
+       'valid-sa-117', 'valid-sa-118', 'valid-sa-119',
+       'valid-not-sa-001', 'valid-not-sa-002',
+       'valid-not-sa-003', 'valid-not-sa-004',
+       'valid-not-sa-005', 'valid-not-sa-006',
+       'valid-not-sa-007', 'valid-not-sa-008',
+       'valid-not-sa-009', 'valid-not-sa-010',
+       'valid-not-sa-011', 'valid-not-sa-012',
+       'valid-not-sa-013', 'valid-not-sa-014',
+       'valid-not-sa-015', 'valid-not-sa-016',
+       'valid-not-sa-017', 'valid-not-sa-018',
+       'valid-not-sa-019', 'valid-not-sa-020',
+       'valid-not-sa-021', 'valid-not-sa-023',
+       'valid-not-sa-024', 'valid-not-sa-025',
+       'valid-not-sa-026', 'valid-not-sa-027',
+       'valid-not-sa-028', 'valid-not-sa-029',
+       'valid-not-sa-030', 'valid-not-sa-031',
+       'valid-ext-sa-001', 'valid-ext-sa-002',
+       'valid-ext-sa-003', 'valid-ext-sa-004',
+       'valid-ext-sa-005', 'valid-ext-sa-006',
+       'valid-ext-sa-007', 'valid-ext-sa-008',
+       'valid-ext-sa-009', 'valid-ext-sa-011',
+       'valid-ext-sa-012', 'valid-ext-sa-013',
+       'valid-ext-sa-014']},
+     {testcases1, [], [{group, testcases2}]},
+     {testcases4, [],
+      ['pr-xml-euc-jp', 'pr-xml-iso-2022-jp', 'pr-xml-little',
+       'pr-xml-shift_jis', 'pr-xml-utf-16', 'pr-xml-utf-8',
+       'weekly-euc-jp', 'weekly-iso-2022-jp', 'weekly-little',
+       'weekly-shift_jis', 'weekly-utf-16', 'weekly-utf-8']},
+     {testcases3, [], [{group, testcases4}]},
+     {testcases5, [],
+      [pe01, dtd00, dtd01, element, ext01, ext02, 'not-sa01',
+       'not-sa02', 'not-sa03', 'not-sa04', notation01,
+       optional, required00, sa01, sa02, sa03, sa04, sa05,
+       'v-sgml01', 'v-lang01', 'v-lang02', 'v-lang03',
+       'v-lang04', 'v-lang05', 'v-lang06', 'v-pe00', 'v-pe03',
+       'v-pe02', 'inv-dtd01', 'inv-dtd02', 'inv-dtd03', el01,
+       el02, el03, el04, el05, el06, id01, id02, id03, id04,
+       id05, id06, id07, id08, id09, 'inv-not-sa01',
+       'inv-not-sa02', 'inv-not-sa04', 'inv-not-sa05',
+       'inv-not-sa06', 'inv-not-sa07', 'inv-not-sa08',
+       'inv-not-sa09', 'inv-not-sa10', 'inv-not-sa11',
+       'inv-not-sa12', 'inv-not-sa13', 'inv-not-sa14',
+       optional01, optional02, optional03, optional04,
+       optional05, optional06, optional07, optional08,
+       optional09, optional10, optional11, optional12,
+       optional13, optional14, optional20, optional21,
+       optional22, optional23, optional24, optional25,
+       'inv-required00', 'inv-required01', 'inv-required02',
+       root, attr01, attr02, attr03, attr04, attr05, attr06,
+       attr07, attr08, attr09, attr10, attr11, attr12, attr13,
+       attr14, attr15, attr16, utf16b, utf16l, empty,
+       'not-wf-sa03', attlist01, attlist02, attlist03,
+       attlist04, attlist05, attlist06, attlist07, attlist08,
+       attlist09, attlist10, attlist11, cond01, cond02,
+       content01, content02, content03, decl01, 'nwf-dtd00',
+       'nwf-dtd01', dtd02, dtd03, dtd04, dtd05, dtd07,
+       element00, element01, element02, element03, element04,
+       encoding01, encoding02, encoding03, encoding04,
+       encoding05, encoding06, encoding07, pi, pubid01,
+       pubid02, pubid03, pubid04, pubid05, sgml01, sgml02,
+       sgml03, sgml04, sgml05, sgml06, sgml07, sgml08, sgml09,
+       sgml10, sgml11, sgml12, sgml13, uri01]},
+     {testcases7, [],
+      ['o-p01pass2', 'o-p06pass1', 'o-p07pass1', 'o-p08pass1',
+       'o-p09pass1', 'o-p12pass1', 'o-p22pass4', 'o-p22pass5',
+       'o-p22pass6', 'o-p28pass1', 'o-p28pass3', 'o-p28pass4',
+       'o-p28pass5', 'o-p29pass1', 'o-p30pass1', 'o-p30pass2',
+       'o-p31pass1', 'o-p31pass2', 'o-p43pass1', 'o-p45pass1',
+       'o-p46pass1', 'o-p47pass1', 'o-p48pass1', 'o-p49pass1',
+       'o-p50pass1', 'o-p51pass1', 'o-p52pass1', 'o-p53pass1',
+       'o-p54pass1', 'o-p55pass1', 'o-p56pass1', 'o-p57pass1',
+       'o-p58pass1', 'o-p59pass1', 'o-p60pass1', 'o-p61pass1',
+       'o-p62pass1', 'o-p63pass1', 'o-p64pass1', 'o-p68pass1',
+       'o-p69pass1', 'o-p70pass1', 'o-p71pass1', 'o-p72pass1',
+       'o-p73pass1', 'o-p76pass1', 'o-p01pass1', 'o-p01pass3',
+       'o-p03pass1', 'o-p04pass1', 'o-p05pass1', 'o-p06fail1',
+       'o-p08fail1', 'o-p08fail2', 'o-p10pass1', 'o-p14pass1',
+       'o-p15pass1', 'o-p16pass1', 'o-p16pass2', 'o-p16pass3',
+       'o-p18pass1', 'o-p22pass1', 'o-p22pass2', 'o-p22pass3',
+       'o-p23pass1', 'o-p23pass2', 'o-p23pass3', 'o-p23pass4',
+       'o-p24pass1', 'o-p24pass2', 'o-p24pass3', 'o-p24pass4',
+       'o-p25pass1', 'o-p25pass2', 'o-p26pass1', 'o-p27pass1',
+       'o-p27pass2', 'o-p27pass3', 'o-p27pass4', 'o-p32pass1',
+       'o-p32pass2', 'o-p39pass1', 'o-p39pass2', 'o-p40pass1',
+       'o-p40pass2', 'o-p40pass3', 'o-p40pass4', 'o-p41pass1',
+       'o-p41pass2', 'o-p42pass1', 'o-p42pass2', 'o-p44pass1',
+       'o-p44pass2', 'o-p44pass3', 'o-p44pass4', 'o-p44pass5',
+       'o-p66pass1', 'o-p74pass1', 'o-p75pass1', 'o-e2',
+       'o-p01fail1', 'o-p01fail2', 'o-p01fail3', 'o-p01fail4',
+       'o-p02fail1', 'o-p02fail10', 'o-p02fail11',
+       'o-p02fail12', 'o-p02fail13', 'o-p02fail14',
+       'o-p02fail15', 'o-p02fail16', 'o-p02fail17',
+       'o-p02fail18', 'o-p02fail19', 'o-p02fail2',
+       'o-p02fail20', 'o-p02fail21', 'o-p02fail22',
+       'o-p02fail23', 'o-p02fail24', 'o-p02fail25',
+       'o-p02fail26', 'o-p02fail27', 'o-p02fail28',
+       'o-p02fail29', 'o-p02fail3', 'o-p02fail30',
+       'o-p02fail31', 'o-p02fail4', 'o-p02fail5', 'o-p02fail6',
+       'o-p02fail7', 'o-p02fail8', 'o-p02fail9', 'o-p03fail1',
+       'o-p03fail10', 'o-p03fail11', 'o-p03fail12',
+       'o-p03fail13', 'o-p03fail14', 'o-p03fail15',
+       'o-p03fail16', 'o-p03fail17', 'o-p03fail18',
+       'o-p03fail19', 'o-p03fail2', 'o-p03fail20',
+       'o-p03fail21', 'o-p03fail22', 'o-p03fail23',
+       'o-p03fail24', 'o-p03fail25', 'o-p03fail26',
+       'o-p03fail27', 'o-p03fail28', 'o-p03fail29',
+       'o-p03fail3', 'o-p03fail4', 'o-p03fail5', 'o-p03fail7',
+       'o-p03fail8', 'o-p03fail9', 'o-p04fail1', 'o-p04fail2',
+       'o-p04fail3', 'o-p05fail1', 'o-p05fail2', 'o-p05fail3',
+       'o-p05fail4', 'o-p05fail5', 'o-p09fail1', 'o-p09fail2',
+       'o-p09fail3', 'o-p09fail4', 'o-p09fail5', 'o-p10fail1',
+       'o-p10fail2', 'o-p10fail3', 'o-p11fail1', 'o-p11fail2',
+       'o-p12fail1', 'o-p12fail2', 'o-p12fail3', 'o-p12fail4',
+       'o-p12fail5', 'o-p12fail6', 'o-p12fail7', 'o-p14fail1',
+       'o-p14fail2', 'o-p14fail3', 'o-p15fail1', 'o-p15fail2',
+       'o-p15fail3', 'o-p16fail1', 'o-p16fail2', 'o-p16fail3',
+       'o-p18fail1', 'o-p18fail2', 'o-p18fail3', 'o-p22fail1',
+       'o-p22fail2', 'o-p23fail1', 'o-p23fail2', 'o-p23fail3',
+       'o-p23fail4', 'o-p23fail5', 'o-p24fail1', 'o-p24fail2',
+       'o-p25fail1', 'o-p26fail1', 'o-p26fail2', 'o-p27fail1',
+       'o-p28fail1', 'o-p29fail1', 'o-p30fail1', 'o-p31fail1',
+       'o-p32fail1', 'o-p32fail2', 'o-p32fail3', 'o-p32fail4',
+       'o-p32fail5', 'o-p39fail1', 'o-p39fail2', 'o-p39fail3',
+       'o-p39fail4', 'o-p39fail5', 'o-p40fail1', 'o-p40fail2',
+       'o-p40fail3', 'o-p40fail4', 'o-p41fail1', 'o-p41fail2',
+       'o-p41fail3', 'o-p42fail1', 'o-p42fail2', 'o-p42fail3',
+       'o-p43fail1', 'o-p43fail2', 'o-p43fail3', 'o-p44fail1',
+       'o-p44fail2', 'o-p44fail3', 'o-p44fail4', 'o-p44fail5',
+       'o-p45fail1', 'o-p45fail2', 'o-p45fail3', 'o-p45fail4',
+       'o-p46fail1', 'o-p46fail2', 'o-p46fail3', 'o-p46fail4',
+       'o-p46fail5', 'o-p46fail6', 'o-p47fail1', 'o-p47fail2',
+       'o-p47fail3', 'o-p47fail4', 'o-p48fail1', 'o-p48fail2',
+       'o-p49fail1', 'o-p50fail1', 'o-p51fail1', 'o-p51fail2',
+       'o-p51fail3', 'o-p51fail4', 'o-p51fail5', 'o-p51fail6',
+       'o-p51fail7', 'o-p52fail1', 'o-p52fail2', 'o-p53fail1',
+       'o-p53fail2', 'o-p53fail3', 'o-p53fail4', 'o-p53fail5',
+       'o-p54fail1', 'o-p55fail1', 'o-p56fail1', 'o-p56fail2',
+       'o-p56fail3', 'o-p56fail4', 'o-p56fail5', 'o-p57fail1',
+       'o-p58fail1', 'o-p58fail2', 'o-p58fail3', 'o-p58fail4',
+       'o-p58fail5', 'o-p58fail6', 'o-p58fail7', 'o-p58fail8',
+       'o-p59fail1', 'o-p59fail2', 'o-p59fail3', 'o-p60fail1',
+       'o-p60fail2', 'o-p60fail3', 'o-p60fail4', 'o-p60fail5',
+       'o-p61fail1', 'o-p62fail1', 'o-p62fail2', 'o-p63fail1',
+       'o-p63fail2', 'o-p64fail1', 'o-p64fail2', 'o-p66fail1',
+       'o-p66fail2', 'o-p66fail3', 'o-p66fail4', 'o-p66fail5',
+       'o-p66fail6', 'o-p68fail1', 'o-p68fail2', 'o-p68fail3',
+       'o-p69fail1', 'o-p69fail2', 'o-p69fail3', 'o-p70fail1',
+       'o-p71fail1', 'o-p71fail2', 'o-p71fail3', 'o-p71fail4',
+       'o-p72fail1', 'o-p72fail2', 'o-p72fail3', 'o-p72fail4',
+       'o-p73fail1', 'o-p73fail2', 'o-p73fail3', 'o-p73fail4',
+       'o-p73fail5', 'o-p74fail1', 'o-p74fail2', 'o-p74fail3',
+       'o-p75fail1', 'o-p75fail2', 'o-p75fail3', 'o-p75fail4',
+       'o-p75fail5', 'o-p75fail6', 'o-p76fail1', 'o-p76fail2',
+       'o-p76fail3', 'o-p76fail4', 'o-p11pass1']},
+     {testcases6, [], [{group, testcases7}]},
+     {testcases10, [], ['ibm-invalid-P28-ibm28i01']},
+     {testcases11, [],
+      ['ibm-invalid-P32-ibm32i01', 'ibm-invalid-P32-ibm32i03',
+       'ibm-invalid-P32-ibm32i04']},
+     {testcases12, [],
+      ['ibm-invalid-P39-ibm39i01', 'ibm-invalid-P39-ibm39i02',
+       'ibm-invalid-P39-ibm39i03',
+       'ibm-invalid-P39-ibm39i04']},
+     {testcases13, [],
+      ['ibm-invalid-P41-ibm41i01',
+       'ibm-invalid-P41-ibm41i02']},
+     {testcases14, [], ['ibm-invalid-P45-ibm45i01']},
+     {testcases15, [], ['ibm-invalid-P49-ibm49i01']},
+     {testcases16, [], ['ibm-invalid-P50-ibm50i01']},
+     {testcases17, [],
+      ['ibm-invalid-P51-ibm51i01',
+       'ibm-invalid-P51-ibm51i03']},
+     {testcases18, [],
+      ['ibm-invalid-P56-ibm56i01', 'ibm-invalid-P56-ibm56i02',
+       'ibm-invalid-P56-ibm56i03', 'ibm-invalid-P56-ibm56i05',
+       'ibm-invalid-P56-ibm56i06', 'ibm-invalid-P56-ibm56i07',
+       'ibm-invalid-P56-ibm56i08', 'ibm-invalid-P56-ibm56i09',
+       'ibm-invalid-P56-ibm56i10', 'ibm-invalid-P56-ibm56i11',
+       'ibm-invalid-P56-ibm56i12', 'ibm-invalid-P56-ibm56i13',
+       'ibm-invalid-P56-ibm56i14', 'ibm-invalid-P56-ibm56i15',
+       'ibm-invalid-P56-ibm56i16', 'ibm-invalid-P56-ibm56i17',
+       'ibm-invalid-P56-ibm56i18']},
+     {testcases19, [],
+      ['ibm-invalid-P58-ibm58i01',
+       'ibm-invalid-P58-ibm58i02']},
+     {testcases20, [], ['ibm-invalid-P59-ibm59i01']},
+     {testcases21, [],
+      ['ibm-invalid-P60-ibm60i01', 'ibm-invalid-P60-ibm60i02',
+       'ibm-invalid-P60-ibm60i03',
+       'ibm-invalid-P60-ibm60i04']},
+     {testcases22, [],
+      ['ibm-invalid-P68-ibm68i01', 'ibm-invalid-P68-ibm68i02',
+       'ibm-invalid-P68-ibm68i03',
+       'ibm-invalid-P68-ibm68i04']},
+     {testcases23, [],
+      ['ibm-invalid-P69-ibm69i01', 'ibm-invalid-P69-ibm69i02',
+       'ibm-invalid-P69-ibm69i03',
+       'ibm-invalid-P69-ibm69i04']},
+     {testcases24, [], ['ibm-invalid-P76-ibm76i01']},
+     {testcases9, [],
+      [{group, testcases10}, {group, testcases11},
+       {group, testcases12}, {group, testcases13},
+       {group, testcases14}, {group, testcases15},
+       {group, testcases16}, {group, testcases17},
+       {group, testcases18}, {group, testcases19},
+       {group, testcases20}, {group, testcases21},
+       {group, testcases22}, {group, testcases23},
+       {group, testcases24}]},
+     {testcases26, [],
+      ['ibm-not-wf-P01-ibm01n01', 'ibm-not-wf-P01-ibm01n02',
+       'ibm-not-wf-P01-ibm01n03']},
+     {testcases27, [],
+      ['ibm-not-wf-P02-ibm02n01', 'ibm-not-wf-P02-ibm02n02',
+       'ibm-not-wf-P02-ibm02n03', 'ibm-not-wf-P02-ibm02n04',
+       'ibm-not-wf-P02-ibm02n05', 'ibm-not-wf-P02-ibm02n06',
+       'ibm-not-wf-P02-ibm02n07', 'ibm-not-wf-P02-ibm02n08',
+       'ibm-not-wf-P02-ibm02n09', 'ibm-not-wf-P02-ibm02n10',
+       'ibm-not-wf-P02-ibm02n11', 'ibm-not-wf-P02-ibm02n12',
+       'ibm-not-wf-P02-ibm02n13', 'ibm-not-wf-P02-ibm02n14',
+       'ibm-not-wf-P02-ibm02n15', 'ibm-not-wf-P02-ibm02n16',
+       'ibm-not-wf-P02-ibm02n17', 'ibm-not-wf-P02-ibm02n18',
+       'ibm-not-wf-P02-ibm02n19', 'ibm-not-wf-P02-ibm02n20',
+       'ibm-not-wf-P02-ibm02n21', 'ibm-not-wf-P02-ibm02n22',
+       'ibm-not-wf-P02-ibm02n23', 'ibm-not-wf-P02-ibm02n24',
+       'ibm-not-wf-P02-ibm02n25', 'ibm-not-wf-P02-ibm02n26',
+       'ibm-not-wf-P02-ibm02n27', 'ibm-not-wf-P02-ibm02n28',
+       'ibm-not-wf-P02-ibm02n29', 'ibm-not-wf-P02-ibm02n30',
+       'ibm-not-wf-P02-ibm02n31', 'ibm-not-wf-P02-ibm02n32',
+       'ibm-not-wf-P02-ibm02n33']},
+     {testcases28, [], ['ibm-not-wf-P03-ibm03n01']},
+     {testcases29, [],
+      ['ibm-not-wf-P04-ibm04n01', 'ibm-not-wf-P04-ibm04n02',
+       'ibm-not-wf-P04-ibm04n03', 'ibm-not-wf-P04-ibm04n04',
+       'ibm-not-wf-P04-ibm04n05', 'ibm-not-wf-P04-ibm04n06',
+       'ibm-not-wf-P04-ibm04n07', 'ibm-not-wf-P04-ibm04n08',
+       'ibm-not-wf-P04-ibm04n09', 'ibm-not-wf-P04-ibm04n10',
+       'ibm-not-wf-P04-ibm04n11', 'ibm-not-wf-P04-ibm04n12',
+       'ibm-not-wf-P04-ibm04n13', 'ibm-not-wf-P04-ibm04n14',
+       'ibm-not-wf-P04-ibm04n15', 'ibm-not-wf-P04-ibm04n16',
+       'ibm-not-wf-P04-ibm04n17', 'ibm-not-wf-P04-ibm04n18']},
+     {testcases30, [],
+      ['ibm-not-wf-P05-ibm05n01', 'ibm-not-wf-P05-ibm05n02',
+       'ibm-not-wf-P05-ibm05n03']},
+     {testcases31, [],
+      ['ibm-not-wf-P09-ibm09n01', 'ibm-not-wf-P09-ibm09n02',
+       'ibm-not-wf-P09-ibm09n03', 'ibm-not-wf-P09-ibm09n04']},
+     {testcases32, [],
+      ['ibm-not-wf-P10-ibm10n01', 'ibm-not-wf-P10-ibm10n02',
+       'ibm-not-wf-P10-ibm10n03', 'ibm-not-wf-P10-ibm10n04',
+       'ibm-not-wf-P10-ibm10n05', 'ibm-not-wf-P10-ibm10n06',
+       'ibm-not-wf-P10-ibm10n07', 'ibm-not-wf-P10-ibm10n08']},
+     {testcases33, [],
+      ['ibm-not-wf-P11-ibm11n01', 'ibm-not-wf-P11-ibm11n02',
+       'ibm-not-wf-P11-ibm11n03', 'ibm-not-wf-P11-ibm11n04']},
+     {testcases34, [],
+      ['ibm-not-wf-P12-ibm12n01', 'ibm-not-wf-P12-ibm12n02',
+       'ibm-not-wf-P12-ibm12n03']},
+     {testcases35, [],
+      ['ibm-not-wf-P13-ibm13n01', 'ibm-not-wf-P13-ibm13n02',
+       'ibm-not-wf-P13-ibm13n03']},
+     {testcases36, [],
+      ['ibm-not-wf-P14-ibm14n01', 'ibm-not-wf-P14-ibm14n02',
+       'ibm-not-wf-P14-ibm14n03']},
+     {testcases37, [],
+      ['ibm-not-wf-P15-ibm15n01', 'ibm-not-wf-P15-ibm15n02',
+       'ibm-not-wf-P15-ibm15n03', 'ibm-not-wf-P15-ibm15n04']},
+     {testcases38, [],
+      ['ibm-not-wf-P16-ibm16n01', 'ibm-not-wf-P16-ibm16n02',
+       'ibm-not-wf-P16-ibm16n03', 'ibm-not-wf-P16-ibm16n04']},
+     {testcases39, [],
+      ['ibm-not-wf-P17-ibm17n01', 'ibm-not-wf-P17-ibm17n02',
+       'ibm-not-wf-P17-ibm17n03', 'ibm-not-wf-P17-ibm17n04']},
+     {testcases40, [],
+      ['ibm-not-wf-P18-ibm18n01', 'ibm-not-wf-P18-ibm18n02']},
+     {testcases41, [],
+      ['ibm-not-wf-P19-ibm19n01', 'ibm-not-wf-P19-ibm19n02',
+       'ibm-not-wf-P19-ibm19n03']},
+     {testcases42, [], ['ibm-not-wf-P20-ibm20n01']},
+     {testcases43, [],
+      ['ibm-not-wf-P21-ibm21n01', 'ibm-not-wf-P21-ibm21n02',
+       'ibm-not-wf-P21-ibm21n03']},
+     {testcases44, [],
+      ['ibm-not-wf-P22-ibm22n01', 'ibm-not-wf-P22-ibm22n02',
+       'ibm-not-wf-P22-ibm22n03']},
+     {testcases45, [],
+      ['ibm-not-wf-P23-ibm23n01', 'ibm-not-wf-P23-ibm23n02',
+       'ibm-not-wf-P23-ibm23n03', 'ibm-not-wf-P23-ibm23n04',
+       'ibm-not-wf-P23-ibm23n05', 'ibm-not-wf-P23-ibm23n06']},
+     {testcases46, [],
+      ['ibm-not-wf-P24-ibm24n01', 'ibm-not-wf-P24-ibm24n02',
+       'ibm-not-wf-P24-ibm24n03', 'ibm-not-wf-P24-ibm24n04',
+       'ibm-not-wf-P24-ibm24n05', 'ibm-not-wf-P24-ibm24n06',
+       'ibm-not-wf-P24-ibm24n07', 'ibm-not-wf-P24-ibm24n08',
+       'ibm-not-wf-P24-ibm24n09']},
+     {testcases47, [],
+      ['ibm-not-wf-P25-ibm25n01', 'ibm-not-wf-P25-ibm25n02']},
+     {testcases48, [], ['ibm-not-wf-P26-ibm26n01']},
+     {testcases49, [], ['ibm-not-wf-P27-ibm27n01']},
+     {testcases50, [],
+      ['ibm-not-wf-P28-ibm28n01', 'ibm-not-wf-P28-ibm28n02',
+       'ibm-not-wf-P28-ibm28n03', 'ibm-not-wf-P28-ibm28n04',
+       'ibm-not-wf-P28-ibm28n05', 'ibm-not-wf-P28-ibm28n06',
+       'ibm-not-wf-P28-ibm28n07', 'ibm-not-wf-P28-ibm28n08']},
+     {testcases51, [], ['ibm-not-wf-p28a-ibm28an01']},
+     {testcases52, [],
+      ['ibm-not-wf-P29-ibm29n01', 'ibm-not-wf-P29-ibm29n02',
+       'ibm-not-wf-P29-ibm29n03', 'ibm-not-wf-P29-ibm29n04',
+       'ibm-not-wf-P29-ibm29n05', 'ibm-not-wf-P29-ibm29n06',
+       'ibm-not-wf-P29-ibm29n07']},
+     {testcases53, [], ['ibm-not-wf-P30-ibm30n01']},
+     {testcases54, [], ['ibm-not-wf-P31-ibm31n01']},
+     {testcases55, [],
+      ['ibm-not-wf-P32-ibm32n01', 'ibm-not-wf-P32-ibm32n02',
+       'ibm-not-wf-P32-ibm32n03', 'ibm-not-wf-P32-ibm32n04',
+       'ibm-not-wf-P32-ibm32n05', 'ibm-not-wf-P32-ibm32n06',
+       'ibm-not-wf-P32-ibm32n07', 'ibm-not-wf-P32-ibm32n08',
+       'ibm-not-wf-P32-ibm32n09']},
+     {testcases56, [],
+      ['ibm-not-wf-P39-ibm39n01', 'ibm-not-wf-P39-ibm39n02',
+       'ibm-not-wf-P39-ibm39n03', 'ibm-not-wf-P39-ibm39n04',
+       'ibm-not-wf-P39-ibm39n05', 'ibm-not-wf-P39-ibm39n06']},
+     {testcases57, [],
+      ['ibm-not-wf-P40-ibm40n01', 'ibm-not-wf-P40-ibm40n02',
+       'ibm-not-wf-P40-ibm40n03', 'ibm-not-wf-P40-ibm40n04',
+       'ibm-not-wf-P40-ibm40n05']},
+     {testcases58, [],
+      ['ibm-not-wf-P41-ibm41n01', 'ibm-not-wf-P41-ibm41n02',
+       'ibm-not-wf-P41-ibm41n03', 'ibm-not-wf-P41-ibm41n04',
+       'ibm-not-wf-P41-ibm41n05', 'ibm-not-wf-P41-ibm41n06',
+       'ibm-not-wf-P41-ibm41n07', 'ibm-not-wf-P41-ibm41n08',
+       'ibm-not-wf-P41-ibm41n09', 'ibm-not-wf-P41-ibm41n10',
+       'ibm-not-wf-P41-ibm41n11', 'ibm-not-wf-P41-ibm41n12',
+       'ibm-not-wf-P41-ibm41n13', 'ibm-not-wf-P41-ibm41n14']},
+     {testcases59, [],
+      ['ibm-not-wf-P42-ibm42n01', 'ibm-not-wf-P42-ibm42n02',
+       'ibm-not-wf-P42-ibm42n03', 'ibm-not-wf-P42-ibm42n04',
+       'ibm-not-wf-P42-ibm42n05']},
+     {testcases60, [],
+      ['ibm-not-wf-P43-ibm43n01', 'ibm-not-wf-P43-ibm43n02',
+       'ibm-not-wf-P43-ibm43n04', 'ibm-not-wf-P43-ibm43n05']},
+     {testcases61, [],
+      ['ibm-not-wf-P44-ibm44n01', 'ibm-not-wf-P44-ibm44n02',
+       'ibm-not-wf-P44-ibm44n03', 'ibm-not-wf-P44-ibm44n04']},
+     {testcases62, [],
+      ['ibm-not-wf-P45-ibm45n01', 'ibm-not-wf-P45-ibm45n02',
+       'ibm-not-wf-P45-ibm45n03', 'ibm-not-wf-P45-ibm45n04',
+       'ibm-not-wf-P45-ibm45n05', 'ibm-not-wf-P45-ibm45n06',
+       'ibm-not-wf-P45-ibm45n07', 'ibm-not-wf-P45-ibm45n08',
+       'ibm-not-wf-P45-ibm45n09']},
+     {testcases63, [],
+      ['ibm-not-wf-P46-ibm46n01', 'ibm-not-wf-P46-ibm46n02',
+       'ibm-not-wf-P46-ibm46n03', 'ibm-not-wf-P46-ibm46n04',
+       'ibm-not-wf-P46-ibm46n05']},
+     {testcases64, [],
+      ['ibm-not-wf-P47-ibm47n01', 'ibm-not-wf-P47-ibm47n02',
+       'ibm-not-wf-P47-ibm47n03', 'ibm-not-wf-P47-ibm47n04',
+       'ibm-not-wf-P47-ibm47n05', 'ibm-not-wf-P47-ibm47n06']},
+     {testcases65, [],
+      ['ibm-not-wf-P48-ibm48n01', 'ibm-not-wf-P48-ibm48n02',
+       'ibm-not-wf-P48-ibm48n03', 'ibm-not-wf-P48-ibm48n04',
+       'ibm-not-wf-P48-ibm48n05', 'ibm-not-wf-P48-ibm48n06',
+       'ibm-not-wf-P48-ibm48n07']},
+     {testcases66, [],
+      ['ibm-not-wf-P49-ibm49n01', 'ibm-not-wf-P49-ibm49n02',
+       'ibm-not-wf-P49-ibm49n03', 'ibm-not-wf-P49-ibm49n04',
+       'ibm-not-wf-P49-ibm49n05', 'ibm-not-wf-P49-ibm49n06']},
+     {testcases67, [], 
+      ['ibm-not-wf-P50-ibm50n01','ibm-not-wf-P50-ibm50n02',
+       'ibm-not-wf-P50-ibm50n03','ibm-not-wf-P50-ibm50n04',
+       'ibm-not-wf-P50-ibm50n05','ibm-not-wf-P50-ibm50n06',
+       'ibm-not-wf-P50-ibm50n07']},
+     {testcases68, [], 
+      ['ibm-not-wf-P51-ibm51n01','ibm-not-wf-P51-ibm51n02',
+       'ibm-not-wf-P51-ibm51n03','ibm-not-wf-P51-ibm51n04',
+       'ibm-not-wf-P51-ibm51n05','ibm-not-wf-P51-ibm51n06',
+       'ibm-not-wf-P51-ibm51n07']},
+     {testcases69, [],
+      ['ibm-not-wf-P52-ibm52n01', 'ibm-not-wf-P52-ibm52n02',
+       'ibm-not-wf-P52-ibm52n03', 'ibm-not-wf-P52-ibm52n04',
+       'ibm-not-wf-P52-ibm52n05', 'ibm-not-wf-P52-ibm52n06']},
+     {testcases70, [],
+      ['ibm-not-wf-P53-ibm53n01', 'ibm-not-wf-P53-ibm53n02',
+       'ibm-not-wf-P53-ibm53n03', 'ibm-not-wf-P53-ibm53n04',
+       'ibm-not-wf-P53-ibm53n05', 'ibm-not-wf-P53-ibm53n06',
+       'ibm-not-wf-P53-ibm53n07', 'ibm-not-wf-P53-ibm53n08']},
+     {testcases71, [],
+      ['ibm-not-wf-P54-ibm54n01', 'ibm-not-wf-P54-ibm54n02']},
+     {testcases72, [],
+      ['ibm-not-wf-P55-ibm55n01', 'ibm-not-wf-P55-ibm55n02',
+       'ibm-not-wf-P55-ibm55n03']},
+     {testcases73, [],
+      ['ibm-not-wf-P56-ibm56n01', 'ibm-not-wf-P56-ibm56n02',
+       'ibm-not-wf-P56-ibm56n03', 'ibm-not-wf-P56-ibm56n04',
+       'ibm-not-wf-P56-ibm56n05', 'ibm-not-wf-P56-ibm56n06',
+       'ibm-not-wf-P56-ibm56n07']},
+     {testcases74, [], ['ibm-not-wf-P57-ibm57n01']},
+     {testcases75, [],
+      ['ibm-not-wf-P58-ibm58n01', 'ibm-not-wf-P58-ibm58n02',
+       'ibm-not-wf-P58-ibm58n03', 'ibm-not-wf-P58-ibm58n04',
+       'ibm-not-wf-P58-ibm58n05', 'ibm-not-wf-P58-ibm58n06',
+       'ibm-not-wf-P58-ibm58n07', 'ibm-not-wf-P58-ibm58n08']},
+     {testcases76, [],
+      ['ibm-not-wf-P59-ibm59n01', 'ibm-not-wf-P59-ibm59n02',
+       'ibm-not-wf-P59-ibm59n03', 'ibm-not-wf-P59-ibm59n04',
+       'ibm-not-wf-P59-ibm59n05', 'ibm-not-wf-P59-ibm59n06']},
+     {testcases77, [],
+      ['ibm-not-wf-P60-ibm60n01', 'ibm-not-wf-P60-ibm60n02',
+       'ibm-not-wf-P60-ibm60n03', 'ibm-not-wf-P60-ibm60n04',
+       'ibm-not-wf-P60-ibm60n05', 'ibm-not-wf-P60-ibm60n06',
+       'ibm-not-wf-P60-ibm60n07', 'ibm-not-wf-P60-ibm60n08']},
+     {testcases78, [], ['ibm-not-wf-P61-ibm61n01']},
+     {testcases79, [],
+      ['ibm-not-wf-P62-ibm62n01', 'ibm-not-wf-P62-ibm62n02',
+       'ibm-not-wf-P62-ibm62n03', 'ibm-not-wf-P62-ibm62n04',
+       'ibm-not-wf-P62-ibm62n05', 'ibm-not-wf-P62-ibm62n06',
+       'ibm-not-wf-P62-ibm62n07', 'ibm-not-wf-P62-ibm62n08']},
+     {testcases80, [],
+      ['ibm-not-wf-P63-ibm63n01', 'ibm-not-wf-P63-ibm63n02',
+       'ibm-not-wf-P63-ibm63n03', 'ibm-not-wf-P63-ibm63n04',
+       'ibm-not-wf-P63-ibm63n05', 'ibm-not-wf-P63-ibm63n06',
+       'ibm-not-wf-P63-ibm63n07']},
+     {testcases81, [],
+      ['ibm-not-wf-P64-ibm64n01', 'ibm-not-wf-P64-ibm64n02',
+       'ibm-not-wf-P64-ibm64n03']},
+     {testcases82, [],
+      ['ibm-not-wf-P65-ibm65n01', 'ibm-not-wf-P65-ibm65n02']},
+     {testcases83, [],
+      ['ibm-not-wf-P66-ibm66n01', 'ibm-not-wf-P66-ibm66n02',
+       'ibm-not-wf-P66-ibm66n03', 'ibm-not-wf-P66-ibm66n04',
+       'ibm-not-wf-P66-ibm66n05', 'ibm-not-wf-P66-ibm66n06',
+       'ibm-not-wf-P66-ibm66n07', 'ibm-not-wf-P66-ibm66n08',
+       'ibm-not-wf-P66-ibm66n09', 'ibm-not-wf-P66-ibm66n10',
+       'ibm-not-wf-P66-ibm66n11', 'ibm-not-wf-P66-ibm66n12',
+       'ibm-not-wf-P66-ibm66n13', 'ibm-not-wf-P66-ibm66n14',
+       'ibm-not-wf-P66-ibm66n15']},
+     {testcases84, [],
+      ['ibm-not-wf-P68-ibm68n01', 'ibm-not-wf-P68-ibm68n02',
+       'ibm-not-wf-P68-ibm68n03', 'ibm-not-wf-P68-ibm68n04',
+       'ibm-not-wf-P68-ibm68n05', 'ibm-not-wf-P68-ibm68n06',
+       'ibm-not-wf-P68-ibm68n07', 'ibm-not-wf-P68-ibm68n08',
+       'ibm-not-wf-P68-ibm68n09', 'ibm-not-wf-P68-ibm68n10']},
+     {testcases85, [],
+      ['ibm-not-wf-P69-ibm69n01', 'ibm-not-wf-P69-ibm69n02',
+       'ibm-not-wf-P69-ibm69n03', 'ibm-not-wf-P69-ibm69n04',
+       'ibm-not-wf-P69-ibm69n05', 'ibm-not-wf-P69-ibm69n06',
+       'ibm-not-wf-P69-ibm69n07']},
+     {testcases86, [],
+      ['ibm-not-wf-P71-ibm70n01', 'ibm-not-wf-P71-ibm71n01',
+       'ibm-not-wf-P71-ibm71n02', 'ibm-not-wf-P71-ibm71n03',
+       'ibm-not-wf-P71-ibm71n04', 'ibm-not-wf-P71-ibm71n05',
+       'ibm-not-wf-P71-ibm71n06', 'ibm-not-wf-P71-ibm71n07',
+       'ibm-not-wf-P71-ibm71n08']},
+     {testcases87, [],
+      ['ibm-not-wf-P72-ibm72n01', 'ibm-not-wf-P72-ibm72n02',
+       'ibm-not-wf-P72-ibm72n03', 'ibm-not-wf-P72-ibm72n04',
+       'ibm-not-wf-P72-ibm72n05', 'ibm-not-wf-P72-ibm72n06',
+       'ibm-not-wf-P72-ibm72n07', 'ibm-not-wf-P72-ibm72n08',
+       'ibm-not-wf-P72-ibm72n09']},
+     {testcases88, [],
+      ['ibm-not-wf-P73-ibm73n01', 'ibm-not-wf-P73-ibm73n03']},
+     {testcases89, [], ['ibm-not-wf-P74-ibm74n01']},
+     {testcases90, [],
+      ['ibm-not-wf-P75-ibm75n01', 'ibm-not-wf-P75-ibm75n02',
+       'ibm-not-wf-P75-ibm75n03', 'ibm-not-wf-P75-ibm75n04',
+       'ibm-not-wf-P75-ibm75n05', 'ibm-not-wf-P75-ibm75n06',
+       'ibm-not-wf-P75-ibm75n07', 'ibm-not-wf-P75-ibm75n08',
+       'ibm-not-wf-P75-ibm75n09', 'ibm-not-wf-P75-ibm75n10',
+       'ibm-not-wf-P75-ibm75n11', 'ibm-not-wf-P75-ibm75n12',
+       'ibm-not-wf-P75-ibm75n13']},
+     {testcases91, [],
+      ['ibm-not-wf-P76-ibm76n01', 'ibm-not-wf-P76-ibm76n02',
+       'ibm-not-wf-P76-ibm76n03', 'ibm-not-wf-P76-ibm76n04',
+       'ibm-not-wf-P76-ibm76n05', 'ibm-not-wf-P76-ibm76n06',
+       'ibm-not-wf-P76-ibm76n07']},
+     {testcases92, [],
+      ['ibm-not-wf-P77-ibm77n01', 'ibm-not-wf-P77-ibm77n02',
+       'ibm-not-wf-P77-ibm77n03', 'ibm-not-wf-P77-ibm77n04']},
+     {testcases93, [],
+      ['ibm-not-wf-P78-ibm78n01', 'ibm-not-wf-P78-ibm78n02']},
+     {testcases94, [],
+      ['ibm-not-wf-P79-ibm79n01', 'ibm-not-wf-P79-ibm79n02']},
+     {testcases95, [],
+      ['ibm-not-wf-P80-ibm80n01', 'ibm-not-wf-P80-ibm80n02',
+       'ibm-not-wf-P80-ibm80n03', 'ibm-not-wf-P80-ibm80n04',
+       'ibm-not-wf-P80-ibm80n05', 'ibm-not-wf-P80-ibm80n06']},
+     {testcases96, [],
+      ['ibm-not-wf-P81-ibm81n01', 'ibm-not-wf-P81-ibm81n02',
+       'ibm-not-wf-P81-ibm81n03', 'ibm-not-wf-P81-ibm81n04',
+       'ibm-not-wf-P81-ibm81n05', 'ibm-not-wf-P81-ibm81n06',
+       'ibm-not-wf-P81-ibm81n07', 'ibm-not-wf-P81-ibm81n08',
+       'ibm-not-wf-P81-ibm81n09']},
+     {testcases97, [],
+      ['ibm-not-wf-P82-ibm82n01', 'ibm-not-wf-P82-ibm82n02',
+       'ibm-not-wf-P82-ibm82n03', 'ibm-not-wf-P82-ibm82n04',
+       'ibm-not-wf-P82-ibm82n05', 'ibm-not-wf-P82-ibm82n06',
+       'ibm-not-wf-P82-ibm82n07', 'ibm-not-wf-P82-ibm82n08']},
+     {testcases98, [],
+      ['ibm-not-wf-P83-ibm83n01', 'ibm-not-wf-P83-ibm83n02',
+       'ibm-not-wf-P83-ibm83n03', 'ibm-not-wf-P83-ibm83n04',
+       'ibm-not-wf-P83-ibm83n05', 'ibm-not-wf-P83-ibm83n06']},
+     {testcases99, [],
+      ['ibm-not-wf-P85-ibm85n01', 'ibm-not-wf-P85-ibm85n02',
+       'ibm-not-wf-P85-ibm85n03', 'ibm-not-wf-P85-ibm85n04',
+       'ibm-not-wf-P85-ibm85n05', 'ibm-not-wf-P85-ibm85n06',
+       'ibm-not-wf-P85-ibm85n07', 'ibm-not-wf-P85-ibm85n08',
+       'ibm-not-wf-P85-ibm85n09', 'ibm-not-wf-P85-ibm85n10',
+       'ibm-not-wf-P85-ibm85n100', 'ibm-not-wf-P85-ibm85n101',
+       'ibm-not-wf-P85-ibm85n102', 'ibm-not-wf-P85-ibm85n103',
+       'ibm-not-wf-P85-ibm85n104', 'ibm-not-wf-P85-ibm85n105',
+       'ibm-not-wf-P85-ibm85n106', 'ibm-not-wf-P85-ibm85n107',
+       'ibm-not-wf-P85-ibm85n108', 'ibm-not-wf-P85-ibm85n109',
+       'ibm-not-wf-P85-ibm85n11', 'ibm-not-wf-P85-ibm85n110',
+       'ibm-not-wf-P85-ibm85n111', 'ibm-not-wf-P85-ibm85n112',
+       'ibm-not-wf-P85-ibm85n113', 'ibm-not-wf-P85-ibm85n114',
+       'ibm-not-wf-P85-ibm85n115', 'ibm-not-wf-P85-ibm85n116',
+       'ibm-not-wf-P85-ibm85n117', 'ibm-not-wf-P85-ibm85n118',
+       'ibm-not-wf-P85-ibm85n119', 'ibm-not-wf-P85-ibm85n12',
+       'ibm-not-wf-P85-ibm85n120', 'ibm-not-wf-P85-ibm85n121',
+       'ibm-not-wf-P85-ibm85n122', 'ibm-not-wf-P85-ibm85n123',
+       'ibm-not-wf-P85-ibm85n124', 'ibm-not-wf-P85-ibm85n125',
+       'ibm-not-wf-P85-ibm85n126', 'ibm-not-wf-P85-ibm85n127',
+       'ibm-not-wf-P85-ibm85n128', 'ibm-not-wf-P85-ibm85n129',
+       'ibm-not-wf-P85-ibm85n13', 'ibm-not-wf-P85-ibm85n130',
+       'ibm-not-wf-P85-ibm85n131', 'ibm-not-wf-P85-ibm85n132',
+       'ibm-not-wf-P85-ibm85n133', 'ibm-not-wf-P85-ibm85n134',
+       'ibm-not-wf-P85-ibm85n135', 'ibm-not-wf-P85-ibm85n136',
+       'ibm-not-wf-P85-ibm85n137', 'ibm-not-wf-P85-ibm85n138',
+       'ibm-not-wf-P85-ibm85n139', 'ibm-not-wf-P85-ibm85n14',
+       'ibm-not-wf-P85-ibm85n140', 'ibm-not-wf-P85-ibm85n141',
+       'ibm-not-wf-P85-ibm85n142', 'ibm-not-wf-P85-ibm85n143',
+       'ibm-not-wf-P85-ibm85n144', 'ibm-not-wf-P85-ibm85n145',
+       'ibm-not-wf-P85-ibm85n146', 'ibm-not-wf-P85-ibm85n147',
+       'ibm-not-wf-P85-ibm85n148', 'ibm-not-wf-P85-ibm85n149',
+       'ibm-not-wf-P85-ibm85n15', 'ibm-not-wf-P85-ibm85n150',
+       'ibm-not-wf-P85-ibm85n151', 'ibm-not-wf-P85-ibm85n152',
+       'ibm-not-wf-P85-ibm85n153', 'ibm-not-wf-P85-ibm85n154',
+       'ibm-not-wf-P85-ibm85n155', 'ibm-not-wf-P85-ibm85n156',
+       'ibm-not-wf-P85-ibm85n157', 'ibm-not-wf-P85-ibm85n158',
+       'ibm-not-wf-P85-ibm85n159', 'ibm-not-wf-P85-ibm85n16',
+       'ibm-not-wf-P85-ibm85n160', 'ibm-not-wf-P85-ibm85n161',
+       'ibm-not-wf-P85-ibm85n162', 'ibm-not-wf-P85-ibm85n163',
+       'ibm-not-wf-P85-ibm85n164', 'ibm-not-wf-P85-ibm85n165',
+       'ibm-not-wf-P85-ibm85n166', 'ibm-not-wf-P85-ibm85n167',
+       'ibm-not-wf-P85-ibm85n168', 'ibm-not-wf-P85-ibm85n169',
+       'ibm-not-wf-P85-ibm85n17', 'ibm-not-wf-P85-ibm85n170',
+       'ibm-not-wf-P85-ibm85n171', 'ibm-not-wf-P85-ibm85n172',
+       'ibm-not-wf-P85-ibm85n173', 'ibm-not-wf-P85-ibm85n174',
+       'ibm-not-wf-P85-ibm85n175', 'ibm-not-wf-P85-ibm85n176',
+       'ibm-not-wf-P85-ibm85n177', 'ibm-not-wf-P85-ibm85n178',
+       'ibm-not-wf-P85-ibm85n179', 'ibm-not-wf-P85-ibm85n18',
+       'ibm-not-wf-P85-ibm85n180', 'ibm-not-wf-P85-ibm85n181',
+       'ibm-not-wf-P85-ibm85n182', 'ibm-not-wf-P85-ibm85n183',
+       'ibm-not-wf-P85-ibm85n184', 'ibm-not-wf-P85-ibm85n185',
+       'ibm-not-wf-P85-ibm85n186', 'ibm-not-wf-P85-ibm85n187',
+       'ibm-not-wf-P85-ibm85n188', 'ibm-not-wf-P85-ibm85n189',
+       'ibm-not-wf-P85-ibm85n19', 'ibm-not-wf-P85-ibm85n190',
+       'ibm-not-wf-P85-ibm85n191', 'ibm-not-wf-P85-ibm85n192',
+       'ibm-not-wf-P85-ibm85n193', 'ibm-not-wf-P85-ibm85n194',
+       'ibm-not-wf-P85-ibm85n195', 'ibm-not-wf-P85-ibm85n196',
+       'ibm-not-wf-P85-ibm85n197', 'ibm-not-wf-P85-ibm85n198',
+       'ibm-not-wf-P85-ibm85n20', 'ibm-not-wf-P85-ibm85n21',
+       'ibm-not-wf-P85-ibm85n22', 'ibm-not-wf-P85-ibm85n23',
+       'ibm-not-wf-P85-ibm85n24', 'ibm-not-wf-P85-ibm85n25',
+       'ibm-not-wf-P85-ibm85n26', 'ibm-not-wf-P85-ibm85n27',
+       'ibm-not-wf-P85-ibm85n28', 'ibm-not-wf-P85-ibm85n29',
+       'ibm-not-wf-P85-ibm85n30', 'ibm-not-wf-P85-ibm85n31',
+       'ibm-not-wf-P85-ibm85n32', 'ibm-not-wf-P85-ibm85n33',
+       'ibm-not-wf-P85-ibm85n34', 'ibm-not-wf-P85-ibm85n35',
+       'ibm-not-wf-P85-ibm85n36', 'ibm-not-wf-P85-ibm85n37',
+       'ibm-not-wf-P85-ibm85n38', 'ibm-not-wf-P85-ibm85n39',
+       'ibm-not-wf-P85-ibm85n40', 'ibm-not-wf-P85-ibm85n41',
+       'ibm-not-wf-P85-ibm85n42', 'ibm-not-wf-P85-ibm85n43',
+       'ibm-not-wf-P85-ibm85n44', 'ibm-not-wf-P85-ibm85n45',
+       'ibm-not-wf-P85-ibm85n46', 'ibm-not-wf-P85-ibm85n47',
+       'ibm-not-wf-P85-ibm85n48', 'ibm-not-wf-P85-ibm85n49',
+       'ibm-not-wf-P85-ibm85n50', 'ibm-not-wf-P85-ibm85n51',
+       'ibm-not-wf-P85-ibm85n52', 'ibm-not-wf-P85-ibm85n53',
+       'ibm-not-wf-P85-ibm85n54', 'ibm-not-wf-P85-ibm85n55',
+       'ibm-not-wf-P85-ibm85n56', 'ibm-not-wf-P85-ibm85n57',
+       'ibm-not-wf-P85-ibm85n58', 'ibm-not-wf-P85-ibm85n59',
+       'ibm-not-wf-P85-ibm85n60', 'ibm-not-wf-P85-ibm85n61',
+       'ibm-not-wf-P85-ibm85n62', 'ibm-not-wf-P85-ibm85n63',
+       'ibm-not-wf-P85-ibm85n64', 'ibm-not-wf-P85-ibm85n65',
+       'ibm-not-wf-P85-ibm85n66', 'ibm-not-wf-P85-ibm85n67',
+       'ibm-not-wf-P85-ibm85n68', 'ibm-not-wf-P85-ibm85n69',
+       'ibm-not-wf-P85-ibm85n70', 'ibm-not-wf-P85-ibm85n71',
+       'ibm-not-wf-P85-ibm85n72', 'ibm-not-wf-P85-ibm85n73',
+       'ibm-not-wf-P85-ibm85n74', 'ibm-not-wf-P85-ibm85n75',
+       'ibm-not-wf-P85-ibm85n76', 'ibm-not-wf-P85-ibm85n77',
+       'ibm-not-wf-P85-ibm85n78', 'ibm-not-wf-P85-ibm85n79',
+       'ibm-not-wf-P85-ibm85n80', 'ibm-not-wf-P85-ibm85n81',
+       'ibm-not-wf-P85-ibm85n82', 'ibm-not-wf-P85-ibm85n83',
+       'ibm-not-wf-P85-ibm85n84', 'ibm-not-wf-P85-ibm85n85',
+       'ibm-not-wf-P85-ibm85n86', 'ibm-not-wf-P85-ibm85n87',
+       'ibm-not-wf-P85-ibm85n88', 'ibm-not-wf-P85-ibm85n89',
+       'ibm-not-wf-P85-ibm85n90', 'ibm-not-wf-P85-ibm85n91',
+       'ibm-not-wf-P85-ibm85n92', 'ibm-not-wf-P85-ibm85n93',
+       'ibm-not-wf-P85-ibm85n94', 'ibm-not-wf-P85-ibm85n95',
+       'ibm-not-wf-P85-ibm85n96', 'ibm-not-wf-P85-ibm85n97',
+       'ibm-not-wf-P85-ibm85n98', 'ibm-not-wf-P85-ibm85n99']},
+     {testcases100, [],
+      ['ibm-not-wf-P86-ibm86n01', 'ibm-not-wf-P86-ibm86n02',
+       'ibm-not-wf-P86-ibm86n03', 'ibm-not-wf-P86-ibm86n04']},
+     {testcases101, [],
+      ['ibm-not-wf-P87-ibm87n01', 'ibm-not-wf-P87-ibm87n02',
+       'ibm-not-wf-P87-ibm87n03', 'ibm-not-wf-P87-ibm87n04',
+       'ibm-not-wf-P87-ibm87n05', 'ibm-not-wf-P87-ibm87n06',
+       'ibm-not-wf-P87-ibm87n07', 'ibm-not-wf-P87-ibm87n08',
+       'ibm-not-wf-P87-ibm87n09', 'ibm-not-wf-P87-ibm87n10',
+       'ibm-not-wf-P87-ibm87n11', 'ibm-not-wf-P87-ibm87n12',
+       'ibm-not-wf-P87-ibm87n13', 'ibm-not-wf-P87-ibm87n14',
+       'ibm-not-wf-P87-ibm87n15', 'ibm-not-wf-P87-ibm87n16',
+       'ibm-not-wf-P87-ibm87n17', 'ibm-not-wf-P87-ibm87n18',
+       'ibm-not-wf-P87-ibm87n19', 'ibm-not-wf-P87-ibm87n20',
+       'ibm-not-wf-P87-ibm87n21', 'ibm-not-wf-P87-ibm87n22',
+       'ibm-not-wf-P87-ibm87n23', 'ibm-not-wf-P87-ibm87n24',
+       'ibm-not-wf-P87-ibm87n25', 'ibm-not-wf-P87-ibm87n26',
+       'ibm-not-wf-P87-ibm87n27', 'ibm-not-wf-P87-ibm87n28',
+       'ibm-not-wf-P87-ibm87n29', 'ibm-not-wf-P87-ibm87n30',
+       'ibm-not-wf-P87-ibm87n31', 'ibm-not-wf-P87-ibm87n32',
+       'ibm-not-wf-P87-ibm87n33', 'ibm-not-wf-P87-ibm87n34',
+       'ibm-not-wf-P87-ibm87n35', 'ibm-not-wf-P87-ibm87n36',
+       'ibm-not-wf-P87-ibm87n37', 'ibm-not-wf-P87-ibm87n38',
+       'ibm-not-wf-P87-ibm87n39', 'ibm-not-wf-P87-ibm87n40',
+       'ibm-not-wf-P87-ibm87n41', 'ibm-not-wf-P87-ibm87n42',
+       'ibm-not-wf-P87-ibm87n43', 'ibm-not-wf-P87-ibm87n44',
+       'ibm-not-wf-P87-ibm87n45', 'ibm-not-wf-P87-ibm87n46',
+       'ibm-not-wf-P87-ibm87n47', 'ibm-not-wf-P87-ibm87n48',
+       'ibm-not-wf-P87-ibm87n49', 'ibm-not-wf-P87-ibm87n50',
+       'ibm-not-wf-P87-ibm87n51', 'ibm-not-wf-P87-ibm87n52',
+       'ibm-not-wf-P87-ibm87n53', 'ibm-not-wf-P87-ibm87n54',
+       'ibm-not-wf-P87-ibm87n55', 'ibm-not-wf-P87-ibm87n56',
+       'ibm-not-wf-P87-ibm87n57', 'ibm-not-wf-P87-ibm87n58',
+       'ibm-not-wf-P87-ibm87n59', 'ibm-not-wf-P87-ibm87n60',
+       'ibm-not-wf-P87-ibm87n61', 'ibm-not-wf-P87-ibm87n62',
+       'ibm-not-wf-P87-ibm87n63', 'ibm-not-wf-P87-ibm87n64',
+       'ibm-not-wf-P87-ibm87n66', 'ibm-not-wf-P87-ibm87n67',
+       'ibm-not-wf-P87-ibm87n68', 'ibm-not-wf-P87-ibm87n69',
+       'ibm-not-wf-P87-ibm87n70', 'ibm-not-wf-P87-ibm87n71',
+       'ibm-not-wf-P87-ibm87n72', 'ibm-not-wf-P87-ibm87n73',
+       'ibm-not-wf-P87-ibm87n74', 'ibm-not-wf-P87-ibm87n75',
+       'ibm-not-wf-P87-ibm87n76', 'ibm-not-wf-P87-ibm87n77',
+       'ibm-not-wf-P87-ibm87n78', 'ibm-not-wf-P87-ibm87n79',
+       'ibm-not-wf-P87-ibm87n80', 'ibm-not-wf-P87-ibm87n81',
+       'ibm-not-wf-P87-ibm87n82', 'ibm-not-wf-P87-ibm87n83',
+       'ibm-not-wf-P87-ibm87n84', 'ibm-not-wf-P87-ibm87n85']},
+     {testcases102, [],
+      ['ibm-not-wf-P88-ibm88n01', 'ibm-not-wf-P88-ibm88n02',
+       'ibm-not-wf-P88-ibm88n03', 'ibm-not-wf-P88-ibm88n04',
+       'ibm-not-wf-P88-ibm88n05', 'ibm-not-wf-P88-ibm88n06',
+       'ibm-not-wf-P88-ibm88n08', 'ibm-not-wf-P88-ibm88n09',
+       'ibm-not-wf-P88-ibm88n10', 'ibm-not-wf-P88-ibm88n11',
+       'ibm-not-wf-P88-ibm88n12', 'ibm-not-wf-P88-ibm88n13',
+       'ibm-not-wf-P88-ibm88n14', 'ibm-not-wf-P88-ibm88n15',
+       'ibm-not-wf-P88-ibm88n16']},
+     {testcases103, [],
+      ['ibm-not-wf-P89-ibm89n01', 'ibm-not-wf-P89-ibm89n02',
+       'ibm-not-wf-P89-ibm89n03', 'ibm-not-wf-P89-ibm89n04',
+       'ibm-not-wf-P89-ibm89n05', 'ibm-not-wf-P89-ibm89n06',
+       'ibm-not-wf-P89-ibm89n07', 'ibm-not-wf-P89-ibm89n08',
+       'ibm-not-wf-P89-ibm89n09', 'ibm-not-wf-P89-ibm89n10',
+       'ibm-not-wf-P89-ibm89n11', 'ibm-not-wf-P89-ibm89n12']},
+     {testcases25, [],
+      [{group, testcases26}, {group, testcases27},
+       {group, testcases28}, {group, testcases29},
+       {group, testcases30}, {group, testcases31},
+       {group, testcases32}, {group, testcases33},
+       {group, testcases34}, {group, testcases35},
+       {group, testcases36}, {group, testcases37},
+       {group, testcases38}, {group, testcases39},
+       {group, testcases40}, {group, testcases41},
+       {group, testcases42}, {group, testcases43},
+       {group, testcases44}, {group, testcases45},
+       {group, testcases46}, {group, testcases47},
+       {group, testcases48}, {group, testcases49},
+       {group, testcases50}, {group, testcases51},
+       {group, testcases52}, {group, testcases53},
+       {group, testcases54}, {group, testcases55},
+       {group, testcases56}, {group, testcases57},
+       {group, testcases58}, {group, testcases59},
+       {group, testcases60}, {group, testcases61},
+       {group, testcases62}, {group, testcases63},
+       {group, testcases64}, {group, testcases65},
+       {group, testcases66}, 
+%       {group, testcases67}, {group, testcases68},
+       {group, testcases69}, {group, testcases70},
+       {group, testcases71}, {group, testcases72},
+       {group, testcases73}, {group, testcases74},
+       {group, testcases75}, {group, testcases76},
+       {group, testcases77}, {group, testcases78},
+       {group, testcases79}, {group, testcases80},
+       {group, testcases81}, {group, testcases82},
+       {group, testcases83}, {group, testcases84},
+       {group, testcases85}, {group, testcases86},
+       {group, testcases87}, {group, testcases88},
+       {group, testcases89}, {group, testcases90},
+       {group, testcases91}, {group, testcases92},
+       {group, testcases93}, {group, testcases94},
+       {group, testcases95}, {group, testcases96},
+       {group, testcases97}, {group, testcases98},
+       {group, testcases99}, {group, testcases100},
+       {group, testcases101}, {group, testcases102},
+       {group, testcases103}]},
+     {testcases105, [], ['ibm-valid-P01-ibm01v01']},
+     {testcases106, [], ['ibm-valid-P02-ibm02v01']},
+     {testcases107, [], ['ibm-valid-P03-ibm03v01']},
+     {testcases108, [],
+      ['ibm-valid-P09-ibm09v01', 'ibm-valid-P09-ibm09v02',
+       'ibm-valid-P09-ibm09v03', 'ibm-valid-P09-ibm09v04',
+       'ibm-valid-P09-ibm09v05']},
+     {testcases109, [],
+      ['ibm-valid-P10-ibm10v01', 'ibm-valid-P10-ibm10v02',
+       'ibm-valid-P10-ibm10v03', 'ibm-valid-P10-ibm10v04',
+       'ibm-valid-P10-ibm10v05', 'ibm-valid-P10-ibm10v06',
+       'ibm-valid-P10-ibm10v07', 'ibm-valid-P10-ibm10v08']},
+     {testcases110, [],
+      ['ibm-valid-P11-ibm11v01', 'ibm-valid-P11-ibm11v02',
+       'ibm-valid-P11-ibm11v03', 'ibm-valid-P11-ibm11v04']},
+     {testcases111, [],
+      ['ibm-valid-P12-ibm12v01','ibm-valid-P12-ibm12v02',
+       'ibm-valid-P12-ibm12v03','ibm-valid-P12-ibm12v04']},
+     {testcases112, [], ['ibm-valid-P13-ibm13v01']},
+     {testcases113, [],
+      ['ibm-valid-P14-ibm14v01', 'ibm-valid-P14-ibm14v02',
+       'ibm-valid-P14-ibm14v03']},
+     {testcases114, [],
+      ['ibm-valid-P15-ibm15v01', 'ibm-valid-P15-ibm15v02',
+       'ibm-valid-P15-ibm15v03', 'ibm-valid-P15-ibm15v04']},
+     {testcases115, [],
+      ['ibm-valid-P16-ibm16v01', 'ibm-valid-P16-ibm16v02',
+       'ibm-valid-P16-ibm16v03']},
+     {testcases116, [], ['ibm-valid-P17-ibm17v01']},
+     {testcases117, [], ['ibm-valid-P18-ibm18v01']},
+     {testcases118, [], ['ibm-valid-P19-ibm19v01']},
+     {testcases119, [],
+      ['ibm-valid-P20-ibm20v01', 'ibm-valid-P20-ibm20v02']},
+     {testcases120, [], ['ibm-valid-P21-ibm21v01']},
+     {testcases121, [],
+      ['ibm-valid-P22-ibm22v01', 'ibm-valid-P22-ibm22v02',
+       'ibm-valid-P22-ibm22v03', 'ibm-valid-P22-ibm22v04',
+       'ibm-valid-P22-ibm22v05', 'ibm-valid-P22-ibm22v06',
+       'ibm-valid-P22-ibm22v07']},
+     {testcases122, [],
+      ['ibm-valid-P23-ibm23v01', 'ibm-valid-P23-ibm23v02',
+       'ibm-valid-P23-ibm23v03', 'ibm-valid-P23-ibm23v04',
+       'ibm-valid-P23-ibm23v05', 'ibm-valid-P23-ibm23v06']},
+     {testcases123, [],
+      ['ibm-valid-P24-ibm24v01', 'ibm-valid-P24-ibm24v02']},
+     {testcases124, [],
+      ['ibm-valid-P25-ibm25v01', 'ibm-valid-P25-ibm25v02',
+       'ibm-valid-P25-ibm25v03', 'ibm-valid-P25-ibm25v04']},
+     {testcases125, [], ['ibm-valid-P26-ibm26v01']},
+     {testcases126, [],
+      ['ibm-valid-P27-ibm27v01', 'ibm-valid-P27-ibm27v02',
+       'ibm-valid-P27-ibm27v03']},
+     {testcases127, [],
+      ['ibm-valid-P28-ibm28v01', 'ibm-valid-P28-ibm28v02']},
+     {testcases128, [],
+      ['ibm-valid-P29-ibm29v01', 'ibm-valid-P29-ibm29v02']},
+     {testcases129, [],
+      ['ibm-valid-P30-ibm30v01', 'ibm-valid-P30-ibm30v02']},
+     {testcases130, [],
+      ['ibm-valid-P31-ibm31v01']},
+     {testcases131, [],
+      ['ibm-valid-P32-ibm32v01', 'ibm-valid-P32-ibm32v02',
+       'ibm-valid-P32-ibm32v03', 'ibm-valid-P32-ibm32v04']},
+     {testcases132, [], ['ibm-valid-P33-ibm33v01']},
+     {testcases133, [], ['ibm-valid-P34-ibm34v01']},
+     {testcases134, [], ['ibm-valid-P35-ibm35v01']},
+     {testcases135, [], ['ibm-valid-P36-ibm36v01']},
+     {testcases136, [], ['ibm-valid-P37-ibm37v01']},
+     {testcases137, [], ['ibm-valid-P38-ibm38v01']},
+     {testcases138, [], ['ibm-valid-P39-ibm39v01']},
+     {testcases139, [], ['ibm-valid-P40-ibm40v01']},
+     {testcases140, [], ['ibm-valid-P41-ibm41v01']},
+     {testcases141, [], ['ibm-valid-P42-ibm42v01']},
+     {testcases142, [], ['ibm-valid-P43-ibm43v01']},
+     {testcases143, [], ['ibm-valid-P44-ibm44v01']},
+     {testcases144, [], ['ibm-valid-P45-ibm45v01']},
+     {testcases145, [], ['ibm-valid-P47-ibm47v01']},
+     {testcases146, [], ['ibm-valid-P49-ibm49v01']},
+     {testcases147, [], ['ibm-valid-P50-ibm50v01']},
+     {testcases148, [],
+      ['ibm-valid-P51-ibm51v01', 'ibm-valid-P51-ibm51v02']},
+     {testcases149, [], ['ibm-valid-P52-ibm52v01']},
+     {testcases150, [],
+      ['ibm-valid-P54-ibm54v01', 'ibm-valid-P54-ibm54v02',
+       'ibm-valid-P54-ibm54v03']},
+     {testcases151, [], ['ibm-valid-P55-ibm55v01']},
+     {testcases152, [],
+      ['ibm-valid-P56-ibm56v01', 'ibm-valid-P56-ibm56v02',
+       'ibm-valid-P56-ibm56v03', 'ibm-valid-P56-ibm56v04',
+       'ibm-valid-P56-ibm56v05', 'ibm-valid-P56-ibm56v06',
+       'ibm-valid-P56-ibm56v07', 'ibm-valid-P56-ibm56v08',
+       'ibm-valid-P56-ibm56v09', 'ibm-valid-P56-ibm56v10']},
+     {testcases153, [], ['ibm-valid-P57-ibm57v01']},
+     {testcases154, [],
+      ['ibm-valid-P58-ibm58v01', 'ibm-valid-P58-ibm58v02']},
+     {testcases155, [],
+      ['ibm-valid-P59-ibm59v01', 'ibm-valid-P59-ibm59v02']},
+     {testcases156, [],
+      ['ibm-valid-P60-ibm60v01', 'ibm-valid-P60-ibm60v02',
+       'ibm-valid-P60-ibm60v03', 'ibm-valid-P60-ibm60v04']},
+     {testcases157, [],
+      ['ibm-valid-P61-ibm61v01','ibm-valid-P61-ibm61v02']},
+     {testcases158, [], 
+      ['ibm-valid-P62-ibm62v01','ibm-valid-P62-ibm62v02',
+       'ibm-valid-P62-ibm62v03','ibm-valid-P62-ibm62v04',
+       'ibm-valid-P62-ibm62v05']},
+     {testcases159, [],
+      ['ibm-valid-P63-ibm63v01','ibm-valid-P63-ibm63v02',
+       'ibm-valid-P63-ibm63v03','ibm-valid-P63-ibm63v04',
+       'ibm-valid-P63-ibm63v05']},
+     {testcases160, [], 
+      ['ibm-valid-P64-ibm64v01','ibm-valid-P64-ibm64v02',
+       'ibm-valid-P64-ibm64v03']},
+     {testcases161, [], ['ibm-valid-P65-ibm65v01','ibm-valid-P65-ibm65v02']},
+     {testcases162, [], ['ibm-valid-P66-ibm66v01']},
+     {testcases163, [], ['ibm-valid-P67-ibm67v01']},
+     {testcases164, [],
+      ['ibm-valid-P68-ibm68v01', 'ibm-valid-P68-ibm68v02']},
+     {testcases165, [],
+      ['ibm-valid-P69-ibm69v01', 'ibm-valid-P69-ibm69v02']},
+     {testcases166, [], ['ibm-valid-P70-ibm70v01']},
+     {testcases167, [], ['ibm-valid-P78-ibm78v01']},
+     {testcases168, [], ['ibm-valid-P79-ibm79v01']},
+     {testcases169, [], ['ibm-valid-P82-ibm82v01']},
+     {testcases170, [], ['ibm-valid-P85-ibm85v01']},
+     {testcases171, [], ['ibm-valid-P86-ibm86v01']},
+     {testcases172, [], ['ibm-valid-P87-ibm87v01']},
+     {testcases173, [], ['ibm-valid-P88-ibm88v01']},
+     {testcases174, [], ['ibm-valid-P89-ibm89v01']},
+     {testcases104, [],
+      [{group, testcases105}, {group, testcases106},
+       {group, testcases107}, {group, testcases108},
+       {group, testcases109}, {group, testcases110},
+%       {group, testcases111}, {group,testcases112}, 
+       {group, testcases113},
+       {group, testcases114}, {group, testcases115},
+       {group, testcases116}, {group, testcases117},
+       {group, testcases118}, {group, testcases119},
+       {group, testcases120}, {group, testcases121},
+       {group, testcases122}, {group, testcases123},
+       {group, testcases124}, {group, testcases125},
+       {group, testcases126}, {group, testcases127},
+       {group, testcases128}, {group, testcases129},
+%       {group, testcases130}, 
+       {group, testcases131},
+       {group, testcases132}, {group, testcases133},
+       {group, testcases134}, {group, testcases135},
+       {group, testcases136}, {group, testcases137},
+       {group, testcases138}, {group, testcases139},
+       {group, testcases140}, {group, testcases141},
+       {group, testcases142}, {group, testcases143},
+       {group, testcases144}, {group, testcases145},
+       {group, testcases146}, {group, testcases147},
+       {group, testcases148}, {group, testcases149},
+       {group, testcases150}, {group, testcases151},
+       {group, testcases152}, {group, testcases153},
+       {group, testcases154}, {group, testcases155},
+       {group, testcases156}, % {group, testcases157}, 
+%       {group, testcases158}, {group, testcases159}, 
+%       {group, testcases160}, {group, testcases161},
+       {group, testcases162}, {group, testcases163},
+       {group, testcases164}, {group, testcases165},
+       {group, testcases166}, %{group, testcases167},
+       {group, testcases168}, {group, testcases169},
+%       {group, testcases170}, 
+       {group, testcases171},
+       {group, testcases172}, {group, testcases173},
+       {group, testcases174}]},
+     {testcases8, [],
+      [{group, testcases9}, {group, testcases25},
+       {group, testcases104}]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+%%======================================================================
+%% Support Functions
+%%======================================================================
+
+%% Dir is a directory
+rm_f_(Dir) ->
+    ?line {ok,CWD} = file:get_cwd(),
+    ?line {ok,FileList} = file:list_dir(Dir),
+    ?line file:set_cwd(filename:join([CWD,Dir])),
+    rm_files(FileList),
+    ?line file:set_cwd(CWD),
+    ? line ok = file:del_dir(Dir).
+
+rm_files([])->
+    ok;
+rm_files([F|Fs]) ->
+    case filelib:is_dir(F) of
+	true ->
+	    rm_f_(F);
+	_ ->
+	    ?line ok = file:delete(F)
+    end,
+    rm_files(Fs).
+
+
+change_mode(Files) ->
+    change_mode3(Files).
+change_mode2(Dir)->
+    ?line {ok,CWD} = file:get_cwd(),
+    ?line {ok,FileList} = file:list_dir(Dir),
+    ?line file:set_cwd(filename:join([CWD,Dir])),
+    change_mode3(FileList),
+    ?line file:set_cwd(CWD).
+change_mode3([]) ->
+    ok;
+change_mode3([F|Fs]) ->
+    case filelib:is_dir(F) of
+	true ->
+	    chmod(F),
+	    change_mode2(F);
+	_ ->
+	    chmod(F)
+    end,
+    change_mode3(Fs).
+    
+chmod(F) ->
+    case file:read_file_info(F) of
+	{ok,FileInfo} ->
+	    Mode= FileInfo#file_info.mode,
+	    file:write_file_info(F,FileInfo#file_info{mode=8#00777 bor Mode});
+	_ ->
+	    ok
+    end.
+
+%%----------------------------------------------------------------------
+%% check_result 
+check_result({fatal_error,_,_,_,_}, "error") -> 
+   ok;
+check_result({ok, _, _}, "invalid") -> 
+   ok;
+check_result({fatal_error,_,_,_,_}, "not-wf") -> 
+   ok;
+check_result({ok, _, _}, "valid") -> 
+   ok.
+
diff --git a/lib/xmerl/test/xmerl_std_SUITE.erl b/lib/xmerl/test/xmerl_std_SUITE.erl
new file mode 100644
index 0000000000..c3cc9007d3
--- /dev/null
+++ b/lib/xmerl/test/xmerl_std_SUITE.erl
@@ -0,0 +1,11799 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2004-2011. 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(xmerl_std_SUITE).
+
+-compile(export_all).
+
+%%----------------------------------------------------------------------
+%% Include files
+%%----------------------------------------------------------------------
+-include_lib("test_server/include/test_server.hrl").
+%%-include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
+
+-define(ibm_dir,"ibm").
+-define(sun_dir,"sun").
+-define(japanese_dir,"japanese").
+-define(oasis_dir,"oasis").
+-define(xmltest_dir,"xmltest").
+
+%%======================================================================
+%% Tests
+%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Test groups
+%%----------------------------------------------------------------------
+%% totally 1788 test cases
+all() -> 
+    ['sun-valid'(suite), 'sun-invalid'(suite),
+     'sun-not-wf'(suite), 'sun-error'(suite),
+     'jclark-xmltest'(suite), 'xerox-japanese'(suite),
+     'nist-oasis'(suite), 'ibm-invalid'(suite),
+     'ibm-not-wf'(suite), 'ibm-valid'(suite)].
+
+groups() -> 
+    [{sun_test_cases, [],
+      'sun-valid'(suite) ++
+	  'sun-invalid'(suite) ++
+	  'sun-not-wf'(suite) ++ 'sun-error'(suite)},
+     {ibm_test_cases, [],
+      'ibm-invalid'(suite) ++
+	  'ibm-not-wf'(suite) ++ 'ibm-valid'(suite)},
+     {xmltest_test_cases, [], 'jclark-xmltest'(suite)},
+     {japanese_test_cases, [], 'xerox-japanese'(suite)},
+     {oasis_test_cases, [], 'nist-oasis'(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+'sun-valid'(suite) -> %% 28 test cases
+    ['v-pe02','v-pe03','v-pe00','v-lang06','v-lang05','v-lang04',
+     'v-lang03','v-lang02','v-lang01','v-sgml01',sa05,sa04,sa03,sa02,
+     sa01,required00,optional,notation01,'not-sa04','not-sa03',
+     'not-sa02','not-sa01',ext02,ext01,element,dtd01,dtd00,pe01].
+'sun-invalid'(suite) -> %% 74 test cases
+    [empty,utf16l,utf16b,attr16,attr15,attr14,attr13,attr12,attr11,
+     attr10,attr09,attr08,attr07,attr06,attr05,attr04,attr03,attr02,
+     attr01,root,'inv-required02','inv-required01','inv-required00',
+     optional25,optional24,optional23,optional22,optional21,optional20,
+     optional14,optional13,optional12,optional11,optional10,optional09,
+     optional08,optional07,optional06,optional05,optional04,optional03,
+     optional02,optional01,'inv-not-sa14','inv-not-sa13','inv-not-sa12',
+     'inv-not-sa11','inv-not-sa10','inv-not-sa09','inv-not-sa08',
+     'inv-not-sa07','inv-not-sa06','inv-not-sa05','inv-not-sa04',
+     'inv-not-sa02','inv-not-sa01',id09,id08,id07,id06,id05,id04,id03,
+     id02,id01,el06,el05,el04,el03,el02,el01,'inv-dtd03','inv-dtd02',
+     'inv-dtd01'].
+'sun-not-wf'(suite)-> %% 56 test cases
+    [sgml13,sgml12,sgml11,sgml10,sgml09,sgml08,sgml07,sgml06,sgml05,
+     sgml04,sgml03,sgml02,sgml01,pubid05,pubid04,pubid03,pubid02,pubid01,
+     pi,encoding07,encoding06,encoding05,encoding04,encoding03,encoding02,
+     encoding01,element04,element03,element02,element01,element00,dtd07,
+     dtd05,dtd04,dtd03,dtd02,'nwf-dtd01','nwf-dtd00',decl01,content03,
+     content02,content01,cond02,cond01,attlist11,attlist10,attlist09,
+     attlist08,attlist07,attlist06,attlist05,attlist04,attlist03,
+     attlist02,attlist01,'not-wf-sa03'].
+'sun-error'(suite)-> 
+    %% 1 test case 
+    [uri01].  
+'jclark-xmltest'(suite) -> 
+    %% 364 test cases
+    ['valid-ext-sa-014','valid-ext-sa-013','valid-ext-sa-012',
+     'valid-ext-sa-011','valid-ext-sa-009','valid-ext-sa-008',
+     'valid-ext-sa-007','valid-ext-sa-006','valid-ext-sa-005',
+     'valid-ext-sa-004','valid-ext-sa-003','valid-ext-sa-002',
+     'valid-ext-sa-001','valid-not-sa-031','valid-not-sa-030',
+     'valid-not-sa-029','valid-not-sa-028','valid-not-sa-027',
+     'valid-not-sa-026','valid-not-sa-025','valid-not-sa-024',
+     'valid-not-sa-023','valid-not-sa-021','valid-not-sa-020',
+     'valid-not-sa-019','valid-not-sa-018','valid-not-sa-017',
+     'valid-not-sa-016','valid-not-sa-015','valid-not-sa-014',
+     'valid-not-sa-013','valid-not-sa-012','valid-not-sa-011',
+     'valid-not-sa-010','valid-not-sa-009','valid-not-sa-008',
+     'valid-not-sa-007','valid-not-sa-006','valid-not-sa-005',
+     'valid-not-sa-004','valid-not-sa-003','valid-not-sa-002',
+     'valid-not-sa-001','valid-sa-119','valid-sa-118','valid-sa-117',
+     'valid-sa-116','valid-sa-115','valid-sa-114','valid-sa-113',
+     'valid-sa-112','valid-sa-111','valid-sa-110','valid-sa-109',
+     'valid-sa-108','valid-sa-107','valid-sa-106','valid-sa-105',
+     'valid-sa-104','valid-sa-103','valid-sa-102','valid-sa-101',
+     'valid-sa-100','valid-sa-099','valid-sa-098','valid-sa-097',
+     'valid-sa-096','valid-sa-095','valid-sa-094','valid-sa-093',
+     'valid-sa-092','valid-sa-091','valid-sa-090','valid-sa-089',
+     'valid-sa-088','valid-sa-087','valid-sa-086','valid-sa-085',
+     'valid-sa-084','valid-sa-083','valid-sa-082','valid-sa-081',
+     'valid-sa-080','valid-sa-079','valid-sa-078','valid-sa-077',
+     'valid-sa-076','valid-sa-075','valid-sa-074','valid-sa-073',
+     'valid-sa-072','valid-sa-071','valid-sa-070','valid-sa-069',
+     'valid-sa-068','valid-sa-067','valid-sa-066','valid-sa-065',
+     'valid-sa-064','valid-sa-063','valid-sa-062','valid-sa-061',
+     'valid-sa-060','valid-sa-059','valid-sa-058','valid-sa-057',
+     'valid-sa-056','valid-sa-055','valid-sa-054','valid-sa-053',
+     'valid-sa-052','valid-sa-051','valid-sa-050','valid-sa-049',
+     'valid-sa-048','valid-sa-047','valid-sa-046','valid-sa-045',
+     'valid-sa-044','valid-sa-043','valid-sa-042','valid-sa-041',
+     'valid-sa-040','valid-sa-039','valid-sa-038','valid-sa-037',
+     'valid-sa-036','valid-sa-035','valid-sa-034','valid-sa-033',
+     'valid-sa-032','valid-sa-031','valid-sa-030','valid-sa-029',
+     'valid-sa-028','valid-sa-027','valid-sa-026','valid-sa-025',
+     'valid-sa-024','valid-sa-023','valid-sa-022','valid-sa-021',
+     'valid-sa-020','valid-sa-019','valid-sa-018','valid-sa-017',
+     'valid-sa-016','valid-sa-015','valid-sa-014','valid-sa-013',
+     'valid-sa-012','valid-sa-011','valid-sa-010','valid-sa-009',
+     'valid-sa-008','valid-sa-007','valid-sa-006','valid-sa-005',
+     'valid-sa-004','valid-sa-003','valid-sa-002','valid-sa-001',
+     'invalid-not-sa-022','invalid--006','invalid--005','invalid--002',
+     'not-wf-ext-sa-003','not-wf-ext-sa-002','not-wf-ext-sa-001',
+     'not-wf-not-sa-009','not-wf-not-sa-008','not-wf-not-sa-007',
+     'not-wf-not-sa-006','not-wf-not-sa-005','not-wf-not-sa-004',
+     'not-wf-not-sa-003','not-wf-not-sa-002','not-wf-not-sa-001',
+     'not-wf-sa-186','not-wf-sa-185','not-wf-sa-184','not-wf-sa-183',
+     'not-wf-sa-182','not-wf-sa-181','not-wf-sa-180','not-wf-sa-179',
+     'not-wf-sa-178','not-wf-sa-177','not-wf-sa-176','not-wf-sa-175',
+     'not-wf-sa-174','not-wf-sa-173','not-wf-sa-172','not-wf-sa-171',
+     'not-wf-sa-170','not-wf-sa-169','not-wf-sa-168','not-wf-sa-167',
+     'not-wf-sa-166','not-wf-sa-165','not-wf-sa-164','not-wf-sa-163',
+     'not-wf-sa-162','not-wf-sa-161','not-wf-sa-160','not-wf-sa-159',
+     'not-wf-sa-158','not-wf-sa-157','not-wf-sa-156','not-wf-sa-155',
+     'not-wf-sa-154','not-wf-sa-153','not-wf-sa-152','not-wf-sa-151',
+     'not-wf-sa-150','not-wf-sa-149','not-wf-sa-148','not-wf-sa-147',
+     'not-wf-sa-146','not-wf-sa-145','not-wf-sa-144','not-wf-sa-143',
+     'not-wf-sa-142','not-wf-sa-141','not-wf-sa-140','not-wf-sa-139',
+     'not-wf-sa-138','not-wf-sa-137','not-wf-sa-136','not-wf-sa-135',
+     'not-wf-sa-134','not-wf-sa-133','not-wf-sa-132','not-wf-sa-131',
+     'not-wf-sa-130','not-wf-sa-129','not-wf-sa-128','not-wf-sa-127',
+     'not-wf-sa-126','not-wf-sa-125','not-wf-sa-124','not-wf-sa-123',
+     'not-wf-sa-122','not-wf-sa-121','not-wf-sa-120','not-wf-sa-119',
+     'not-wf-sa-118','not-wf-sa-117','not-wf-sa-116','not-wf-sa-115',
+     'not-wf-sa-114','not-wf-sa-113','not-wf-sa-112','not-wf-sa-111',
+     'not-wf-sa-110','not-wf-sa-109','not-wf-sa-108','not-wf-sa-107',
+     'not-wf-sa-106','not-wf-sa-105','not-wf-sa-104','not-wf-sa-103',
+     'not-wf-sa-102','not-wf-sa-101','not-wf-sa-100','not-wf-sa-099',
+     'not-wf-sa-098','not-wf-sa-097','not-wf-sa-096','not-wf-sa-095',
+     'not-wf-sa-094','not-wf-sa-093','not-wf-sa-092','not-wf-sa-091',
+     'not-wf-sa-090','not-wf-sa-089','not-wf-sa-088','not-wf-sa-087',
+     'not-wf-sa-086','not-wf-sa-085','not-wf-sa-084','not-wf-sa-083',
+     'not-wf-sa-082','not-wf-sa-081','not-wf-sa-080','not-wf-sa-079',
+     'not-wf-sa-078','not-wf-sa-077','not-wf-sa-076','not-wf-sa-075',
+     'not-wf-sa-074','not-wf-sa-073','not-wf-sa-072','not-wf-sa-071',
+     'not-wf-sa-070','not-wf-sa-069','not-wf-sa-068','not-wf-sa-067',
+     'not-wf-sa-066','not-wf-sa-065','not-wf-sa-064','not-wf-sa-063',
+     'not-wf-sa-062','not-wf-sa-061','not-wf-sa-060','not-wf-sa-059',
+     'not-wf-sa-058','not-wf-sa-057','not-wf-sa-056','not-wf-sa-055',
+     'not-wf-sa-054','not-wf-sa-053','not-wf-sa-052','not-wf-sa-051',
+     'not-wf-sa-050','not-wf-sa-049','not-wf-sa-048','not-wf-sa-047',
+     'not-wf-sa-046','not-wf-sa-045','not-wf-sa-044','not-wf-sa-043',
+     'not-wf-sa-042','not-wf-sa-041','not-wf-sa-040','not-wf-sa-039',
+     'not-wf-sa-038','not-wf-sa-037','not-wf-sa-036','not-wf-sa-035',
+     'not-wf-sa-034','not-wf-sa-033','not-wf-sa-032','not-wf-sa-031',
+     'not-wf-sa-030','not-wf-sa-029','not-wf-sa-028','not-wf-sa-027',
+     'not-wf-sa-026','not-wf-sa-025','not-wf-sa-024','not-wf-sa-023',
+     'not-wf-sa-022','not-wf-sa-021','not-wf-sa-020','not-wf-sa-019',
+     'not-wf-sa-018','not-wf-sa-017','not-wf-sa-016','not-wf-sa-015',
+     'not-wf-sa-014','not-wf-sa-013','not-wf-sa-012','not-wf-sa-011',
+     'not-wf-sa-010','not-wf-sa-009','not-wf-sa-008','not-wf-sa-007',
+     'not-wf-sa-006','not-wf-sa-005','not-wf-sa-004','not-wf-sa-003',
+     'not-wf-sa-002','not-wf-sa-001'].
+'xerox-japanese'(suite) -> 
+    %% 12 test cases
+    ['japanese-weekly-utf-8','japanese-weekly-utf-16',
+     'japanese-weekly-shift_jis','japanese-weekly-little',
+     'japanese-weekly-iso-2022-jp','japanese-weekly-euc-jp',
+     'japanese-pr-xml-utf-8','japanese-pr-xml-utf-16',
+     'japanese-pr-xml-shift_jis','japanese-pr-xml-little',
+     'japanese-pr-xml-iso-2022-jp','japanese-pr-xml-euc-jp'].
+'nist-oasis'(suite) -> 
+    %% 348 test cases
+    ['o-p11pass1','o-p76fail4','o-p76fail3','o-p76fail2','o-p76fail1',
+     'o-p75fail6','o-p75fail5','o-p75fail4','o-p75fail3','o-p75fail2',
+     'o-p75fail1','o-p74fail3','o-p74fail2','o-p74fail1','o-p73fail5',
+     'o-p73fail4','o-p73fail3','o-p73fail2','o-p73fail1','o-p72fail4',
+     'o-p72fail3','o-p72fail2','o-p72fail1','o-p71fail4','o-p71fail3',
+     'o-p71fail2','o-p71fail1','o-p70fail1','o-p69fail3','o-p69fail2',
+     'o-p69fail1','o-p68fail3','o-p68fail2','o-p68fail1','o-p66fail6',
+     'o-p66fail5','o-p66fail4','o-p66fail3','o-p66fail2','o-p66fail1',
+     'o-p64fail2','o-p64fail1','o-p63fail2','o-p63fail1','o-p62fail2',
+     'o-p62fail1','o-p61fail1','o-p60fail5','o-p60fail4','o-p60fail3',
+     'o-p60fail2','o-p60fail1','o-p59fail3','o-p59fail2','o-p59fail1',
+     'o-p58fail8','o-p58fail7','o-p58fail6','o-p58fail5','o-p58fail4',
+     'o-p58fail3','o-p58fail2','o-p58fail1','o-p57fail1','o-p56fail5',
+     'o-p56fail4','o-p56fail3','o-p56fail2','o-p56fail1','o-p55fail1',
+     'o-p54fail1','o-p53fail5','o-p53fail4','o-p53fail3','o-p53fail2',
+     'o-p53fail1','o-p52fail2','o-p52fail1','o-p51fail7','o-p51fail6',
+     'o-p51fail5','o-p51fail4','o-p51fail3','o-p51fail2','o-p51fail1',
+     'o-p50fail1','o-p49fail1','o-p48fail2','o-p48fail1','o-p47fail4',
+     'o-p47fail3','o-p47fail2','o-p47fail1','o-p46fail6','o-p46fail5',
+     'o-p46fail4','o-p46fail3','o-p46fail2','o-p46fail1','o-p45fail4',
+     'o-p45fail3','o-p45fail2','o-p45fail1','o-p44fail5','o-p44fail4',
+     'o-p44fail3','o-p44fail2','o-p44fail1','o-p43fail3','o-p43fail2',
+     'o-p43fail1','o-p42fail3','o-p42fail2','o-p42fail1','o-p41fail3',
+     'o-p41fail2','o-p41fail1','o-p40fail4','o-p40fail3','o-p40fail2',
+     'o-p40fail1','o-p39fail5','o-p39fail4','o-p39fail3','o-p39fail2',
+     'o-p39fail1','o-p32fail5','o-p32fail4','o-p32fail3','o-p32fail2',
+     'o-p32fail1','o-p31fail1','o-p30fail1','o-p29fail1','o-p28fail1',
+     'o-p27fail1','o-p26fail2','o-p26fail1','o-p25fail1','o-p24fail2',
+     'o-p24fail1','o-p23fail5','o-p23fail4','o-p23fail3','o-p23fail2',
+     'o-p23fail1','o-p22fail2','o-p22fail1','o-p18fail3','o-p18fail2',
+     'o-p18fail1','o-p16fail3','o-p16fail2','o-p16fail1','o-p15fail3',
+     'o-p15fail2','o-p15fail1','o-p14fail3','o-p14fail2','o-p14fail1',
+     'o-p12fail7','o-p12fail6','o-p12fail5','o-p12fail4','o-p12fail3',
+     'o-p12fail2','o-p12fail1','o-p11fail2','o-p11fail1','o-p10fail3',
+     'o-p10fail2','o-p10fail1','o-p09fail5','o-p09fail4','o-p09fail3',
+     'o-p09fail2','o-p09fail1','o-p05fail5','o-p05fail4','o-p05fail3',
+     'o-p05fail2','o-p05fail1','o-p04fail3','o-p04fail2','o-p04fail1',
+     'o-p03fail9','o-p03fail8','o-p03fail7','o-p03fail5','o-p03fail4',
+     'o-p03fail3','o-p03fail29','o-p03fail28','o-p03fail27','o-p03fail26',
+     'o-p03fail25','o-p03fail24','o-p03fail23','o-p03fail22','o-p03fail21',
+     'o-p03fail20','o-p03fail2','o-p03fail19','o-p03fail18','o-p03fail17',
+     'o-p03fail16','o-p03fail15','o-p03fail14','o-p03fail13','o-p03fail12',
+     'o-p03fail11','o-p03fail10','o-p03fail1','o-p02fail9','o-p02fail8',
+     'o-p02fail7','o-p02fail6','o-p02fail5','o-p02fail4','o-p02fail31',
+     'o-p02fail30','o-p02fail3','o-p02fail29','o-p02fail28','o-p02fail27',
+     'o-p02fail26','o-p02fail25','o-p02fail24','o-p02fail23','o-p02fail22',
+     'o-p02fail21','o-p02fail20','o-p02fail2','o-p02fail19','o-p02fail18',
+     'o-p02fail17','o-p02fail16','o-p02fail15','o-p02fail14','o-p02fail13',
+     'o-p02fail12','o-p02fail11','o-p02fail10','o-p02fail1','o-p01fail4',
+     'o-p01fail3','o-p01fail2','o-p01fail1','o-e2','o-p75pass1',
+     'o-p74pass1','o-p66pass1','o-p44pass5','o-p44pass4','o-p44pass3',
+     'o-p44pass2','o-p44pass1','o-p42pass2','o-p42pass1','o-p41pass2',
+     'o-p41pass1','o-p40pass4','o-p40pass3','o-p40pass2','o-p40pass1',
+     'o-p39pass2','o-p39pass1','o-p32pass2','o-p32pass1','o-p27pass4',
+     'o-p27pass3','o-p27pass2','o-p27pass1','o-p26pass1','o-p25pass2',
+     'o-p25pass1','o-p24pass4','o-p24pass3','o-p24pass2','o-p24pass1',
+     'o-p23pass4','o-p23pass3','o-p23pass2','o-p23pass1','o-p22pass3',
+     'o-p22pass2','o-p22pass1','o-p18pass1','o-p16pass3','o-p16pass2',
+     'o-p16pass1','o-p15pass1','o-p14pass1','o-p10pass1','o-p08fail2',
+     'o-p08fail1','o-p06fail1','o-p05pass1','o-p04pass1','o-p03pass1',
+     'o-p01pass3','o-p01pass1','o-p76pass1','o-p73pass1','o-p72pass1',
+     'o-p71pass1','o-p70pass1','o-p69pass1','o-p68pass1','o-p64pass1',
+     'o-p63pass1','o-p62pass1','o-p61pass1','o-p60pass1','o-p59pass1',
+     'o-p58pass1','o-p57pass1','o-p56pass1','o-p55pass1','o-p54pass1',
+     'o-p53pass1','o-p52pass1','o-p51pass1','o-p50pass1','o-p49pass1',
+     'o-p48pass1','o-p47pass1','o-p46pass1','o-p45pass1','o-p43pass1',
+     'o-p31pass2','o-p31pass1','o-p30pass2','o-p30pass1','o-p29pass1',
+     'o-p28pass5','o-p28pass4','o-p28pass3','o-p28pass1','o-p22pass6',
+     'o-p22pass5','o-p22pass4','o-p12pass1','o-p09pass1','o-p08pass1',
+     'o-p07pass1','o-p06pass1','o-p01pass2'].
+'ibm-invalid'(suite) -> 
+    %% 48 test cases
+    ['ibm-invalid-P76-ibm76i01','ibm-invalid-P69-ibm69i04',
+     'ibm-invalid-P69-ibm69i03','ibm-invalid-P69-ibm69i02',
+     'ibm-invalid-P69-ibm69i01','ibm-invalid-P68-ibm68i04',
+     'ibm-invalid-P68-ibm68i03','ibm-invalid-P68-ibm68i02',
+     'ibm-invalid-P68-ibm68i01','ibm-invalid-P60-ibm60i04',
+     'ibm-invalid-P60-ibm60i03','ibm-invalid-P60-ibm60i02',
+     'ibm-invalid-P60-ibm60i01','ibm-invalid-P59-ibm59i01',
+     'ibm-invalid-P58-ibm58i02','ibm-invalid-P58-ibm58i01',
+     'ibm-invalid-P56-ibm56i18','ibm-invalid-P56-ibm56i17',
+     'ibm-invalid-P56-ibm56i16','ibm-invalid-P56-ibm56i15',
+     'ibm-invalid-P56-ibm56i14','ibm-invalid-P56-ibm56i13',
+     'ibm-invalid-P56-ibm56i12','ibm-invalid-P56-ibm56i11',
+     'ibm-invalid-P56-ibm56i10','ibm-invalid-P56-ibm56i09',
+     'ibm-invalid-P56-ibm56i08','ibm-invalid-P56-ibm56i07',
+     'ibm-invalid-P56-ibm56i06','ibm-invalid-P56-ibm56i05',
+     'ibm-invalid-P56-ibm56i03','ibm-invalid-P56-ibm56i02',
+     'ibm-invalid-P56-ibm56i01','ibm-invalid-P51-ibm51i03',
+     'ibm-invalid-P51-ibm51i01','ibm-invalid-P50-ibm50i01',
+     'ibm-invalid-P49-ibm49i01','ibm-invalid-P45-ibm45i01',
+     'ibm-invalid-P41-ibm41i02','ibm-invalid-P41-ibm41i01',
+     'ibm-invalid-P39-ibm39i04','ibm-invalid-P39-ibm39i03',
+     'ibm-invalid-P39-ibm39i02','ibm-invalid-P39-ibm39i01',
+     'ibm-invalid-P32-ibm32i04','ibm-invalid-P32-ibm32i03',
+     'ibm-invalid-P32-ibm32i01','ibm-invalid-P28-ibm28i01'].
+'ibm-not-wf'(suite) -> 
+    %% 731 test cases
+    ['ibm-not-wf-P89-ibm89n12','ibm-not-wf-P89-ibm89n11',
+     'ibm-not-wf-P89-ibm89n10','ibm-not-wf-P89-ibm89n09',
+     'ibm-not-wf-P89-ibm89n08','ibm-not-wf-P89-ibm89n07',
+     'ibm-not-wf-P89-ibm89n06','ibm-not-wf-P89-ibm89n05',
+     'ibm-not-wf-P89-ibm89n04','ibm-not-wf-P89-ibm89n03',
+     'ibm-not-wf-P89-ibm89n02','ibm-not-wf-P89-ibm89n01',
+     'ibm-not-wf-P88-ibm88n16','ibm-not-wf-P88-ibm88n15',
+     'ibm-not-wf-P88-ibm88n14','ibm-not-wf-P88-ibm88n13',
+     'ibm-not-wf-P88-ibm88n12','ibm-not-wf-P88-ibm88n11',
+     'ibm-not-wf-P88-ibm88n10','ibm-not-wf-P88-ibm88n09',
+     'ibm-not-wf-P88-ibm88n08','ibm-not-wf-P88-ibm88n06',
+     'ibm-not-wf-P88-ibm88n05','ibm-not-wf-P88-ibm88n04',
+     'ibm-not-wf-P88-ibm88n03','ibm-not-wf-P88-ibm88n02',
+     'ibm-not-wf-P88-ibm88n01','ibm-not-wf-P87-ibm87n85',
+     'ibm-not-wf-P87-ibm87n84','ibm-not-wf-P87-ibm87n83',
+     'ibm-not-wf-P87-ibm87n82','ibm-not-wf-P87-ibm87n81',
+     'ibm-not-wf-P87-ibm87n80','ibm-not-wf-P87-ibm87n79',
+     'ibm-not-wf-P87-ibm87n78','ibm-not-wf-P87-ibm87n77',
+     'ibm-not-wf-P87-ibm87n76','ibm-not-wf-P87-ibm87n75',
+     'ibm-not-wf-P87-ibm87n74','ibm-not-wf-P87-ibm87n73',
+     'ibm-not-wf-P87-ibm87n72','ibm-not-wf-P87-ibm87n71',
+     'ibm-not-wf-P87-ibm87n70','ibm-not-wf-P87-ibm87n69',
+     'ibm-not-wf-P87-ibm87n68','ibm-not-wf-P87-ibm87n67',
+     'ibm-not-wf-P87-ibm87n66','ibm-not-wf-P87-ibm87n64',
+     'ibm-not-wf-P87-ibm87n63','ibm-not-wf-P87-ibm87n62',
+     'ibm-not-wf-P87-ibm87n61','ibm-not-wf-P87-ibm87n60',
+     'ibm-not-wf-P87-ibm87n59','ibm-not-wf-P87-ibm87n58',
+     'ibm-not-wf-P87-ibm87n57','ibm-not-wf-P87-ibm87n56',
+     'ibm-not-wf-P87-ibm87n55','ibm-not-wf-P87-ibm87n54',
+     'ibm-not-wf-P87-ibm87n53','ibm-not-wf-P87-ibm87n52',
+     'ibm-not-wf-P87-ibm87n51','ibm-not-wf-P87-ibm87n50',
+     'ibm-not-wf-P87-ibm87n49','ibm-not-wf-P87-ibm87n48',
+     'ibm-not-wf-P87-ibm87n47','ibm-not-wf-P87-ibm87n46',
+     'ibm-not-wf-P87-ibm87n45','ibm-not-wf-P87-ibm87n44',
+     'ibm-not-wf-P87-ibm87n43','ibm-not-wf-P87-ibm87n42',
+     'ibm-not-wf-P87-ibm87n41','ibm-not-wf-P87-ibm87n40',
+     'ibm-not-wf-P87-ibm87n39','ibm-not-wf-P87-ibm87n38',
+     'ibm-not-wf-P87-ibm87n37','ibm-not-wf-P87-ibm87n36',
+     'ibm-not-wf-P87-ibm87n35','ibm-not-wf-P87-ibm87n34',
+     'ibm-not-wf-P87-ibm87n33','ibm-not-wf-P87-ibm87n32',
+     'ibm-not-wf-P87-ibm87n31','ibm-not-wf-P87-ibm87n30',
+     'ibm-not-wf-P87-ibm87n29','ibm-not-wf-P87-ibm87n28',
+     'ibm-not-wf-P87-ibm87n27','ibm-not-wf-P87-ibm87n26',
+     'ibm-not-wf-P87-ibm87n25','ibm-not-wf-P87-ibm87n24',
+     'ibm-not-wf-P87-ibm87n23','ibm-not-wf-P87-ibm87n22',
+     'ibm-not-wf-P87-ibm87n21','ibm-not-wf-P87-ibm87n20',
+     'ibm-not-wf-P87-ibm87n19','ibm-not-wf-P87-ibm87n18',
+     'ibm-not-wf-P87-ibm87n17','ibm-not-wf-P87-ibm87n16',
+     'ibm-not-wf-P87-ibm87n15','ibm-not-wf-P87-ibm87n14',
+     'ibm-not-wf-P87-ibm87n13','ibm-not-wf-P87-ibm87n12',
+     'ibm-not-wf-P87-ibm87n11','ibm-not-wf-P87-ibm87n10',
+     'ibm-not-wf-P87-ibm87n09','ibm-not-wf-P87-ibm87n08',
+     'ibm-not-wf-P87-ibm87n07','ibm-not-wf-P87-ibm87n06',
+     'ibm-not-wf-P87-ibm87n05','ibm-not-wf-P87-ibm87n04',
+     'ibm-not-wf-P87-ibm87n03','ibm-not-wf-P87-ibm87n02',
+     'ibm-not-wf-P87-ibm87n01','ibm-not-wf-P86-ibm86n04',
+     'ibm-not-wf-P86-ibm86n03','ibm-not-wf-P86-ibm86n02',
+     'ibm-not-wf-P86-ibm86n01','ibm-not-wf-P85-ibm85n99',
+     'ibm-not-wf-P85-ibm85n98','ibm-not-wf-P85-ibm85n97',
+     'ibm-not-wf-P85-ibm85n96','ibm-not-wf-P85-ibm85n95',
+     'ibm-not-wf-P85-ibm85n94','ibm-not-wf-P85-ibm85n93',
+     'ibm-not-wf-P85-ibm85n92','ibm-not-wf-P85-ibm85n91',
+     'ibm-not-wf-P85-ibm85n90','ibm-not-wf-P85-ibm85n89',
+     'ibm-not-wf-P85-ibm85n88','ibm-not-wf-P85-ibm85n87',
+     'ibm-not-wf-P85-ibm85n86','ibm-not-wf-P85-ibm85n85',
+     'ibm-not-wf-P85-ibm85n84','ibm-not-wf-P85-ibm85n83',
+     'ibm-not-wf-P85-ibm85n82','ibm-not-wf-P85-ibm85n81',
+     'ibm-not-wf-P85-ibm85n80','ibm-not-wf-P85-ibm85n79',
+     'ibm-not-wf-P85-ibm85n78','ibm-not-wf-P85-ibm85n77',
+     'ibm-not-wf-P85-ibm85n76','ibm-not-wf-P85-ibm85n75',
+     'ibm-not-wf-P85-ibm85n74','ibm-not-wf-P85-ibm85n73',
+     'ibm-not-wf-P85-ibm85n72','ibm-not-wf-P85-ibm85n71',
+     'ibm-not-wf-P85-ibm85n70','ibm-not-wf-P85-ibm85n69',
+     'ibm-not-wf-P85-ibm85n68','ibm-not-wf-P85-ibm85n67',
+     'ibm-not-wf-P85-ibm85n66','ibm-not-wf-P85-ibm85n65',
+     'ibm-not-wf-P85-ibm85n64','ibm-not-wf-P85-ibm85n63',
+     'ibm-not-wf-P85-ibm85n62','ibm-not-wf-P85-ibm85n61',
+     'ibm-not-wf-P85-ibm85n60','ibm-not-wf-P85-ibm85n59',
+     'ibm-not-wf-P85-ibm85n58','ibm-not-wf-P85-ibm85n57',
+     'ibm-not-wf-P85-ibm85n56','ibm-not-wf-P85-ibm85n55',
+     'ibm-not-wf-P85-ibm85n54','ibm-not-wf-P85-ibm85n53',
+     'ibm-not-wf-P85-ibm85n52','ibm-not-wf-P85-ibm85n51',
+     'ibm-not-wf-P85-ibm85n50','ibm-not-wf-P85-ibm85n49',
+     'ibm-not-wf-P85-ibm85n48','ibm-not-wf-P85-ibm85n47',
+     'ibm-not-wf-P85-ibm85n46','ibm-not-wf-P85-ibm85n45',
+     'ibm-not-wf-P85-ibm85n44','ibm-not-wf-P85-ibm85n43',
+     'ibm-not-wf-P85-ibm85n42','ibm-not-wf-P85-ibm85n41',
+     'ibm-not-wf-P85-ibm85n40','ibm-not-wf-P85-ibm85n39',
+     'ibm-not-wf-P85-ibm85n38','ibm-not-wf-P85-ibm85n37',
+     'ibm-not-wf-P85-ibm85n36','ibm-not-wf-P85-ibm85n35',
+     'ibm-not-wf-P85-ibm85n34','ibm-not-wf-P85-ibm85n33',
+     'ibm-not-wf-P85-ibm85n32','ibm-not-wf-P85-ibm85n31',
+     'ibm-not-wf-P85-ibm85n30','ibm-not-wf-P85-ibm85n29',
+     'ibm-not-wf-P85-ibm85n28','ibm-not-wf-P85-ibm85n27',
+     'ibm-not-wf-P85-ibm85n26','ibm-not-wf-P85-ibm85n25',
+     'ibm-not-wf-P85-ibm85n24','ibm-not-wf-P85-ibm85n23',
+     'ibm-not-wf-P85-ibm85n22','ibm-not-wf-P85-ibm85n21',
+     'ibm-not-wf-P85-ibm85n20','ibm-not-wf-P85-ibm85n198',
+     'ibm-not-wf-P85-ibm85n197','ibm-not-wf-P85-ibm85n196',
+     'ibm-not-wf-P85-ibm85n195','ibm-not-wf-P85-ibm85n194',
+     'ibm-not-wf-P85-ibm85n193','ibm-not-wf-P85-ibm85n192',
+     'ibm-not-wf-P85-ibm85n191','ibm-not-wf-P85-ibm85n190',
+     'ibm-not-wf-P85-ibm85n19','ibm-not-wf-P85-ibm85n189',
+     'ibm-not-wf-P85-ibm85n188','ibm-not-wf-P85-ibm85n187',
+     'ibm-not-wf-P85-ibm85n186','ibm-not-wf-P85-ibm85n185',
+     'ibm-not-wf-P85-ibm85n184','ibm-not-wf-P85-ibm85n183',
+     'ibm-not-wf-P85-ibm85n182','ibm-not-wf-P85-ibm85n181',
+     'ibm-not-wf-P85-ibm85n180','ibm-not-wf-P85-ibm85n18',
+     'ibm-not-wf-P85-ibm85n179','ibm-not-wf-P85-ibm85n178',
+     'ibm-not-wf-P85-ibm85n177','ibm-not-wf-P85-ibm85n176',
+     'ibm-not-wf-P85-ibm85n175','ibm-not-wf-P85-ibm85n174',
+     'ibm-not-wf-P85-ibm85n173','ibm-not-wf-P85-ibm85n172',
+     'ibm-not-wf-P85-ibm85n171','ibm-not-wf-P85-ibm85n170',
+     'ibm-not-wf-P85-ibm85n17','ibm-not-wf-P85-ibm85n169',
+     'ibm-not-wf-P85-ibm85n168','ibm-not-wf-P85-ibm85n167',
+     'ibm-not-wf-P85-ibm85n166','ibm-not-wf-P85-ibm85n165',
+     'ibm-not-wf-P85-ibm85n164','ibm-not-wf-P85-ibm85n163',
+     'ibm-not-wf-P85-ibm85n162','ibm-not-wf-P85-ibm85n161',
+     'ibm-not-wf-P85-ibm85n160','ibm-not-wf-P85-ibm85n16',
+     'ibm-not-wf-P85-ibm85n159','ibm-not-wf-P85-ibm85n158',
+     'ibm-not-wf-P85-ibm85n157','ibm-not-wf-P85-ibm85n156',
+     'ibm-not-wf-P85-ibm85n155','ibm-not-wf-P85-ibm85n154',
+     'ibm-not-wf-P85-ibm85n153','ibm-not-wf-P85-ibm85n152',
+     'ibm-not-wf-P85-ibm85n151','ibm-not-wf-P85-ibm85n150',
+     'ibm-not-wf-P85-ibm85n15','ibm-not-wf-P85-ibm85n149',
+     'ibm-not-wf-P85-ibm85n148','ibm-not-wf-P85-ibm85n147',
+     'ibm-not-wf-P85-ibm85n146','ibm-not-wf-P85-ibm85n145',
+     'ibm-not-wf-P85-ibm85n144','ibm-not-wf-P85-ibm85n143',
+     'ibm-not-wf-P85-ibm85n142','ibm-not-wf-P85-ibm85n141',
+     'ibm-not-wf-P85-ibm85n140','ibm-not-wf-P85-ibm85n14',
+     'ibm-not-wf-P85-ibm85n139','ibm-not-wf-P85-ibm85n138',
+     'ibm-not-wf-P85-ibm85n137','ibm-not-wf-P85-ibm85n136',
+     'ibm-not-wf-P85-ibm85n135','ibm-not-wf-P85-ibm85n134',
+     'ibm-not-wf-P85-ibm85n133','ibm-not-wf-P85-ibm85n132',
+     'ibm-not-wf-P85-ibm85n131','ibm-not-wf-P85-ibm85n130',
+     'ibm-not-wf-P85-ibm85n13','ibm-not-wf-P85-ibm85n129',
+     'ibm-not-wf-P85-ibm85n128','ibm-not-wf-P85-ibm85n127',
+     'ibm-not-wf-P85-ibm85n126','ibm-not-wf-P85-ibm85n125',
+     'ibm-not-wf-P85-ibm85n124','ibm-not-wf-P85-ibm85n123',
+     'ibm-not-wf-P85-ibm85n122','ibm-not-wf-P85-ibm85n121',
+     'ibm-not-wf-P85-ibm85n120','ibm-not-wf-P85-ibm85n12',
+     'ibm-not-wf-P85-ibm85n119','ibm-not-wf-P85-ibm85n118',
+     'ibm-not-wf-P85-ibm85n117','ibm-not-wf-P85-ibm85n116',
+     'ibm-not-wf-P85-ibm85n115','ibm-not-wf-P85-ibm85n114',
+     'ibm-not-wf-P85-ibm85n113','ibm-not-wf-P85-ibm85n112',
+     'ibm-not-wf-P85-ibm85n111','ibm-not-wf-P85-ibm85n110',
+     'ibm-not-wf-P85-ibm85n11','ibm-not-wf-P85-ibm85n109',
+     'ibm-not-wf-P85-ibm85n108','ibm-not-wf-P85-ibm85n107',
+     'ibm-not-wf-P85-ibm85n106','ibm-not-wf-P85-ibm85n105',
+     'ibm-not-wf-P85-ibm85n104','ibm-not-wf-P85-ibm85n103',
+     'ibm-not-wf-P85-ibm85n102','ibm-not-wf-P85-ibm85n101',
+     'ibm-not-wf-P85-ibm85n100','ibm-not-wf-P85-ibm85n10',
+     'ibm-not-wf-P85-ibm85n09','ibm-not-wf-P85-ibm85n08',
+     'ibm-not-wf-P85-ibm85n07','ibm-not-wf-P85-ibm85n06',
+     'ibm-not-wf-P85-ibm85n05','ibm-not-wf-P85-ibm85n04',
+     'ibm-not-wf-P85-ibm85n03','ibm-not-wf-P85-ibm85n02',
+     'ibm-not-wf-P85-ibm85n01','ibm-not-wf-P83-ibm83n06',
+     'ibm-not-wf-P83-ibm83n05','ibm-not-wf-P83-ibm83n04',
+     'ibm-not-wf-P83-ibm83n03','ibm-not-wf-P83-ibm83n02',
+     'ibm-not-wf-P83-ibm83n01','ibm-not-wf-P82-ibm82n08',
+     'ibm-not-wf-P82-ibm82n07','ibm-not-wf-P82-ibm82n06',
+     'ibm-not-wf-P82-ibm82n05','ibm-not-wf-P82-ibm82n04',
+     'ibm-not-wf-P82-ibm82n03','ibm-not-wf-P82-ibm82n02',
+     'ibm-not-wf-P82-ibm82n01','ibm-not-wf-P81-ibm81n09',
+     'ibm-not-wf-P81-ibm81n08','ibm-not-wf-P81-ibm81n07',
+     'ibm-not-wf-P81-ibm81n06','ibm-not-wf-P81-ibm81n05',
+     'ibm-not-wf-P81-ibm81n04','ibm-not-wf-P81-ibm81n03',
+     'ibm-not-wf-P81-ibm81n02','ibm-not-wf-P81-ibm81n01',
+     'ibm-not-wf-P80-ibm80n06','ibm-not-wf-P80-ibm80n05',
+     'ibm-not-wf-P80-ibm80n04','ibm-not-wf-P80-ibm80n03',
+     'ibm-not-wf-P80-ibm80n02','ibm-not-wf-P80-ibm80n01',
+     'ibm-not-wf-P79-ibm79n02','ibm-not-wf-P79-ibm79n01',
+     'ibm-not-wf-P78-ibm78n02','ibm-not-wf-P78-ibm78n01',
+     'ibm-not-wf-P77-ibm77n04','ibm-not-wf-P77-ibm77n03',
+     'ibm-not-wf-P77-ibm77n02','ibm-not-wf-P77-ibm77n01',
+     'ibm-not-wf-P76-ibm76n07','ibm-not-wf-P76-ibm76n06',
+     'ibm-not-wf-P76-ibm76n05','ibm-not-wf-P76-ibm76n04',
+     'ibm-not-wf-P76-ibm76n03','ibm-not-wf-P76-ibm76n02',
+     'ibm-not-wf-P76-ibm76n01','ibm-not-wf-P75-ibm75n13',
+     'ibm-not-wf-P75-ibm75n12','ibm-not-wf-P75-ibm75n11',
+     'ibm-not-wf-P75-ibm75n10','ibm-not-wf-P75-ibm75n09',
+     'ibm-not-wf-P75-ibm75n08','ibm-not-wf-P75-ibm75n07',
+     'ibm-not-wf-P75-ibm75n06','ibm-not-wf-P75-ibm75n05',
+     'ibm-not-wf-P75-ibm75n04','ibm-not-wf-P75-ibm75n03',
+     'ibm-not-wf-P75-ibm75n02','ibm-not-wf-P75-ibm75n01',
+     'ibm-not-wf-P74-ibm74n01','ibm-not-wf-P73-ibm73n03',
+     'ibm-not-wf-P73-ibm73n01','ibm-not-wf-P72-ibm72n09',
+     'ibm-not-wf-P72-ibm72n08','ibm-not-wf-P72-ibm72n07',
+     'ibm-not-wf-P72-ibm72n06','ibm-not-wf-P72-ibm72n05',
+     'ibm-not-wf-P72-ibm72n04','ibm-not-wf-P72-ibm72n03',
+     'ibm-not-wf-P72-ibm72n02','ibm-not-wf-P72-ibm72n01',
+     'ibm-not-wf-P71-ibm71n08','ibm-not-wf-P71-ibm71n07',
+     'ibm-not-wf-P71-ibm71n06','ibm-not-wf-P71-ibm71n05',
+     'ibm-not-wf-P71-ibm71n04','ibm-not-wf-P71-ibm71n03',
+     'ibm-not-wf-P71-ibm71n02','ibm-not-wf-P71-ibm71n01',
+     'ibm-not-wf-P71-ibm70n01','ibm-not-wf-P69-ibm69n07',
+     'ibm-not-wf-P69-ibm69n06','ibm-not-wf-P69-ibm69n05',
+     'ibm-not-wf-P69-ibm69n04','ibm-not-wf-P69-ibm69n03',
+     'ibm-not-wf-P69-ibm69n02','ibm-not-wf-P69-ibm69n01',
+     'ibm-not-wf-P68-ibm68n10','ibm-not-wf-P68-ibm68n09',
+     'ibm-not-wf-P68-ibm68n08','ibm-not-wf-P68-ibm68n07',
+     'ibm-not-wf-P68-ibm68n06','ibm-not-wf-P68-ibm68n05',
+     'ibm-not-wf-P68-ibm68n04','ibm-not-wf-P68-ibm68n03',
+     'ibm-not-wf-P68-ibm68n02','ibm-not-wf-P68-ibm68n01',
+     'ibm-not-wf-P66-ibm66n15','ibm-not-wf-P66-ibm66n14',
+     'ibm-not-wf-P66-ibm66n13','ibm-not-wf-P66-ibm66n12',
+     'ibm-not-wf-P66-ibm66n11','ibm-not-wf-P66-ibm66n10',
+     'ibm-not-wf-P66-ibm66n09','ibm-not-wf-P66-ibm66n08',
+     'ibm-not-wf-P66-ibm66n07','ibm-not-wf-P66-ibm66n06',
+     'ibm-not-wf-P66-ibm66n05','ibm-not-wf-P66-ibm66n04',
+     'ibm-not-wf-P66-ibm66n03','ibm-not-wf-P66-ibm66n02',
+     'ibm-not-wf-P66-ibm66n01','ibm-not-wf-P65-ibm65n02',
+     'ibm-not-wf-P65-ibm65n01','ibm-not-wf-P64-ibm64n03',
+     'ibm-not-wf-P64-ibm64n02','ibm-not-wf-P64-ibm64n01',
+     'ibm-not-wf-P63-ibm63n07','ibm-not-wf-P63-ibm63n06',
+     'ibm-not-wf-P63-ibm63n05','ibm-not-wf-P63-ibm63n04',
+     'ibm-not-wf-P63-ibm63n03','ibm-not-wf-P63-ibm63n02',
+     'ibm-not-wf-P63-ibm63n01','ibm-not-wf-P62-ibm62n08',
+     'ibm-not-wf-P62-ibm62n07','ibm-not-wf-P62-ibm62n06',
+     'ibm-not-wf-P62-ibm62n05','ibm-not-wf-P62-ibm62n04',
+     'ibm-not-wf-P62-ibm62n03','ibm-not-wf-P62-ibm62n02',
+     'ibm-not-wf-P62-ibm62n01','ibm-not-wf-P61-ibm61n01',
+     'ibm-not-wf-P60-ibm60n08','ibm-not-wf-P60-ibm60n07',
+     'ibm-not-wf-P60-ibm60n06','ibm-not-wf-P60-ibm60n05',
+     'ibm-not-wf-P60-ibm60n04','ibm-not-wf-P60-ibm60n03',
+     'ibm-not-wf-P60-ibm60n02','ibm-not-wf-P60-ibm60n01',
+     'ibm-not-wf-P59-ibm59n06','ibm-not-wf-P59-ibm59n05',
+     'ibm-not-wf-P59-ibm59n04','ibm-not-wf-P59-ibm59n03',
+     'ibm-not-wf-P59-ibm59n02','ibm-not-wf-P59-ibm59n01',
+     'ibm-not-wf-P58-ibm58n08','ibm-not-wf-P58-ibm58n07',
+     'ibm-not-wf-P58-ibm58n06','ibm-not-wf-P58-ibm58n05',
+     'ibm-not-wf-P58-ibm58n04','ibm-not-wf-P58-ibm58n03',
+     'ibm-not-wf-P58-ibm58n02','ibm-not-wf-P58-ibm58n01',
+     'ibm-not-wf-P57-ibm57n01','ibm-not-wf-P56-ibm56n07',
+     'ibm-not-wf-P56-ibm56n06','ibm-not-wf-P56-ibm56n05',
+     'ibm-not-wf-P56-ibm56n04','ibm-not-wf-P56-ibm56n03',
+     'ibm-not-wf-P56-ibm56n02','ibm-not-wf-P56-ibm56n01',
+     'ibm-not-wf-P55-ibm55n03','ibm-not-wf-P55-ibm55n02',
+     'ibm-not-wf-P55-ibm55n01','ibm-not-wf-P54-ibm54n02',
+     'ibm-not-wf-P54-ibm54n01','ibm-not-wf-P53-ibm53n08',
+     'ibm-not-wf-P53-ibm53n07','ibm-not-wf-P53-ibm53n06',
+     'ibm-not-wf-P53-ibm53n05','ibm-not-wf-P53-ibm53n04',
+     'ibm-not-wf-P53-ibm53n03','ibm-not-wf-P53-ibm53n02',
+     'ibm-not-wf-P53-ibm53n01','ibm-not-wf-P52-ibm52n06',
+     'ibm-not-wf-P52-ibm52n05','ibm-not-wf-P52-ibm52n04',
+     'ibm-not-wf-P52-ibm52n03','ibm-not-wf-P52-ibm52n02',
+     'ibm-not-wf-P52-ibm52n01','ibm-not-wf-P51-ibm51n07',
+     'ibm-not-wf-P51-ibm51n06','ibm-not-wf-P51-ibm51n05',
+     'ibm-not-wf-P51-ibm51n04','ibm-not-wf-P51-ibm51n03',
+     'ibm-not-wf-P51-ibm51n02','ibm-not-wf-P51-ibm51n01',
+     'ibm-not-wf-P50-ibm50n07','ibm-not-wf-P50-ibm50n06',
+     'ibm-not-wf-P50-ibm50n05','ibm-not-wf-P50-ibm50n04',
+     'ibm-not-wf-P50-ibm50n03','ibm-not-wf-P50-ibm50n02',
+     'ibm-not-wf-P50-ibm50n01','ibm-not-wf-P49-ibm49n06',
+     'ibm-not-wf-P49-ibm49n05','ibm-not-wf-P49-ibm49n04',
+     'ibm-not-wf-P49-ibm49n03','ibm-not-wf-P49-ibm49n02',
+     'ibm-not-wf-P49-ibm49n01','ibm-not-wf-P48-ibm48n07',
+     'ibm-not-wf-P48-ibm48n06','ibm-not-wf-P48-ibm48n05',
+     'ibm-not-wf-P48-ibm48n04','ibm-not-wf-P48-ibm48n03',
+     'ibm-not-wf-P48-ibm48n02','ibm-not-wf-P48-ibm48n01',
+     'ibm-not-wf-P47-ibm47n06','ibm-not-wf-P47-ibm47n05',
+     'ibm-not-wf-P47-ibm47n04','ibm-not-wf-P47-ibm47n03',
+     'ibm-not-wf-P47-ibm47n02','ibm-not-wf-P47-ibm47n01',
+     'ibm-not-wf-P46-ibm46n05','ibm-not-wf-P46-ibm46n04',
+     'ibm-not-wf-P46-ibm46n03','ibm-not-wf-P46-ibm46n02',
+     'ibm-not-wf-P46-ibm46n01','ibm-not-wf-P45-ibm45n09',
+     'ibm-not-wf-P45-ibm45n08','ibm-not-wf-P45-ibm45n07',
+     'ibm-not-wf-P45-ibm45n06','ibm-not-wf-P45-ibm45n05',
+     'ibm-not-wf-P45-ibm45n04','ibm-not-wf-P45-ibm45n03',
+     'ibm-not-wf-P45-ibm45n02','ibm-not-wf-P45-ibm45n01',
+     'ibm-not-wf-P44-ibm44n04','ibm-not-wf-P44-ibm44n03',
+     'ibm-not-wf-P44-ibm44n02','ibm-not-wf-P44-ibm44n01',
+     'ibm-not-wf-P43-ibm43n05','ibm-not-wf-P43-ibm43n04',
+     'ibm-not-wf-P43-ibm43n02','ibm-not-wf-P43-ibm43n01',
+     'ibm-not-wf-P42-ibm42n05','ibm-not-wf-P42-ibm42n04',
+     'ibm-not-wf-P42-ibm42n03','ibm-not-wf-P42-ibm42n02',
+     'ibm-not-wf-P42-ibm42n01','ibm-not-wf-P41-ibm41n14',
+     'ibm-not-wf-P41-ibm41n13','ibm-not-wf-P41-ibm41n12',
+     'ibm-not-wf-P41-ibm41n11','ibm-not-wf-P41-ibm41n10',
+     'ibm-not-wf-P41-ibm41n09','ibm-not-wf-P41-ibm41n08',
+     'ibm-not-wf-P41-ibm41n07','ibm-not-wf-P41-ibm41n06',
+     'ibm-not-wf-P41-ibm41n05','ibm-not-wf-P41-ibm41n04',
+     'ibm-not-wf-P41-ibm41n03','ibm-not-wf-P41-ibm41n02',
+     'ibm-not-wf-P41-ibm41n01','ibm-not-wf-P40-ibm40n05',
+     'ibm-not-wf-P40-ibm40n04','ibm-not-wf-P40-ibm40n03',
+     'ibm-not-wf-P40-ibm40n02','ibm-not-wf-P40-ibm40n01',
+     'ibm-not-wf-P39-ibm39n06','ibm-not-wf-P39-ibm39n05',
+     'ibm-not-wf-P39-ibm39n04','ibm-not-wf-P39-ibm39n03',
+     'ibm-not-wf-P39-ibm39n02','ibm-not-wf-P39-ibm39n01',
+     'ibm-not-wf-P32-ibm32n09','ibm-not-wf-P32-ibm32n08',
+     'ibm-not-wf-P32-ibm32n07','ibm-not-wf-P32-ibm32n06',
+     'ibm-not-wf-P32-ibm32n05','ibm-not-wf-P32-ibm32n04',
+     'ibm-not-wf-P32-ibm32n03','ibm-not-wf-P32-ibm32n02',
+     'ibm-not-wf-P32-ibm32n01','ibm-not-wf-P31-ibm31n01',
+     'ibm-not-wf-P30-ibm30n01','ibm-not-wf-P29-ibm29n07',
+     'ibm-not-wf-P29-ibm29n06','ibm-not-wf-P29-ibm29n05',
+     'ibm-not-wf-P29-ibm29n04','ibm-not-wf-P29-ibm29n03',
+     'ibm-not-wf-P29-ibm29n02','ibm-not-wf-P29-ibm29n01',
+     'ibm-not-wf-P28a-ibm28an01','ibm-not-wf-P28-ibm28n08',
+     'ibm-not-wf-P28-ibm28n07','ibm-not-wf-P28-ibm28n06',
+     'ibm-not-wf-P28-ibm28n05','ibm-not-wf-P28-ibm28n04',
+     'ibm-not-wf-P28-ibm28n03','ibm-not-wf-P28-ibm28n02',
+     'ibm-not-wf-P28-ibm28n01','ibm-not-wf-P27-ibm27n01',
+     'ibm-not-wf-P26-ibm26n01','ibm-not-wf-P25-ibm25n02',
+     'ibm-not-wf-P25-ibm25n01','ibm-not-wf-P24-ibm24n09',
+     'ibm-not-wf-P24-ibm24n08','ibm-not-wf-P24-ibm24n07',
+     'ibm-not-wf-P24-ibm24n06','ibm-not-wf-P24-ibm24n05',
+     'ibm-not-wf-P24-ibm24n04','ibm-not-wf-P24-ibm24n03',
+     'ibm-not-wf-P24-ibm24n02','ibm-not-wf-P24-ibm24n01',
+     'ibm-not-wf-P23-ibm23n06','ibm-not-wf-P23-ibm23n05',
+     'ibm-not-wf-P23-ibm23n04','ibm-not-wf-P23-ibm23n03',
+     'ibm-not-wf-P23-ibm23n02','ibm-not-wf-P23-ibm23n01',
+     'ibm-not-wf-P22-ibm22n03','ibm-not-wf-P22-ibm22n02',
+     'ibm-not-wf-P22-ibm22n01','ibm-not-wf-P21-ibm21n03',
+     'ibm-not-wf-P21-ibm21n02','ibm-not-wf-P21-ibm21n01',
+     'ibm-not-wf-P20-ibm20n01','ibm-not-wf-P19-ibm19n03',
+     'ibm-not-wf-P19-ibm19n02','ibm-not-wf-P19-ibm19n01',
+     'ibm-not-wf-P18-ibm18n02','ibm-not-wf-P18-ibm18n01',
+     'ibm-not-wf-P17-ibm17n04','ibm-not-wf-P17-ibm17n03',
+     'ibm-not-wf-P17-ibm17n02','ibm-not-wf-P17-ibm17n01',
+     'ibm-not-wf-P16-ibm16n04','ibm-not-wf-P16-ibm16n03',
+     'ibm-not-wf-P16-ibm16n02','ibm-not-wf-P16-ibm16n01',
+     'ibm-not-wf-P15-ibm15n04','ibm-not-wf-P15-ibm15n03',
+     'ibm-not-wf-P15-ibm15n02','ibm-not-wf-P15-ibm15n01',
+     'ibm-not-wf-P14-ibm14n03','ibm-not-wf-P14-ibm14n02',
+     'ibm-not-wf-P14-ibm14n01','ibm-not-wf-P13-ibm13n03',
+     'ibm-not-wf-P13-ibm13n02','ibm-not-wf-P13-ibm13n01',
+     'ibm-not-wf-P12-ibm12n03','ibm-not-wf-P12-ibm12n02',
+     'ibm-not-wf-P12-ibm12n01','ibm-not-wf-P11-ibm11n04',
+     'ibm-not-wf-P11-ibm11n03','ibm-not-wf-P11-ibm11n02',
+     'ibm-not-wf-P11-ibm11n01','ibm-not-wf-P10-ibm10n08',
+     'ibm-not-wf-P10-ibm10n07','ibm-not-wf-P10-ibm10n06',
+     'ibm-not-wf-P10-ibm10n05','ibm-not-wf-P10-ibm10n04',
+     'ibm-not-wf-P10-ibm10n03','ibm-not-wf-P10-ibm10n02',
+     'ibm-not-wf-P10-ibm10n01','ibm-not-wf-P09-ibm09n04',
+     'ibm-not-wf-P09-ibm09n03','ibm-not-wf-P09-ibm09n02',
+     'ibm-not-wf-P09-ibm09n01','ibm-not-wf-P05-ibm05n03',
+     'ibm-not-wf-P05-ibm05n02','ibm-not-wf-P05-ibm05n01',
+     'ibm-not-wf-P04-ibm04n18','ibm-not-wf-P04-ibm04n17',
+     'ibm-not-wf-P04-ibm04n16','ibm-not-wf-P04-ibm04n15',
+     'ibm-not-wf-P04-ibm04n14','ibm-not-wf-P04-ibm04n13',
+     'ibm-not-wf-P04-ibm04n12','ibm-not-wf-P04-ibm04n11',
+     'ibm-not-wf-P04-ibm04n10','ibm-not-wf-P04-ibm04n09',
+     'ibm-not-wf-P04-ibm04n08','ibm-not-wf-P04-ibm04n07',
+     'ibm-not-wf-P04-ibm04n06','ibm-not-wf-P04-ibm04n05',
+     'ibm-not-wf-P04-ibm04n04','ibm-not-wf-P04-ibm04n03',
+     'ibm-not-wf-P04-ibm04n02','ibm-not-wf-P04-ibm04n01',
+     'ibm-not-wf-P03-ibm03n01','ibm-not-wf-P02-ibm02n33',
+     'ibm-not-wf-P02-ibm02n32','ibm-not-wf-P02-ibm02n31',
+     'ibm-not-wf-P02-ibm02n30','ibm-not-wf-P02-ibm02n29',
+     'ibm-not-wf-P02-ibm02n28','ibm-not-wf-P02-ibm02n27',
+     'ibm-not-wf-P02-ibm02n26','ibm-not-wf-P02-ibm02n25',
+     'ibm-not-wf-P02-ibm02n24','ibm-not-wf-P02-ibm02n23',
+     'ibm-not-wf-P02-ibm02n22','ibm-not-wf-P02-ibm02n21',
+     'ibm-not-wf-P02-ibm02n20','ibm-not-wf-P02-ibm02n19',
+     'ibm-not-wf-P02-ibm02n18','ibm-not-wf-P02-ibm02n17',
+     'ibm-not-wf-P02-ibm02n16','ibm-not-wf-P02-ibm02n15',
+     'ibm-not-wf-P02-ibm02n14','ibm-not-wf-P02-ibm02n13',
+     'ibm-not-wf-P02-ibm02n12','ibm-not-wf-P02-ibm02n11',
+     'ibm-not-wf-P02-ibm02n10','ibm-not-wf-P02-ibm02n09',
+     'ibm-not-wf-P02-ibm02n08','ibm-not-wf-P02-ibm02n07',
+     'ibm-not-wf-P02-ibm02n06','ibm-not-wf-P02-ibm02n05',
+     'ibm-not-wf-P02-ibm02n04','ibm-not-wf-P02-ibm02n03',
+     'ibm-not-wf-P02-ibm02n02','ibm-not-wf-P02-ibm02n01',
+     'ibm-not-wf-P01-ibm01n03','ibm-not-wf-P01-ibm01n02',
+     'ibm-not-wf-P01-ibm01n01'].
+
+'ibm-valid'(suite) -> 
+    %% 149 test cases
+    ['ibm-valid-P89-ibm89v01','ibm-valid-P88-ibm88v01',
+     'ibm-valid-P87-ibm87v01','ibm-valid-P86-ibm86v01',
+     'ibm-valid-P85-ibm85v01','ibm-valid-P82-ibm82v01',
+     'ibm-valid-P79-ibm79v01','ibm-valid-P78-ibm78v01',
+     'ibm-valid-P70-ibm70v01','ibm-valid-P69-ibm69v02',
+     'ibm-valid-P69-ibm69v01','ibm-valid-P68-ibm68v02',
+     'ibm-valid-P68-ibm68v01','ibm-valid-P67-ibm67v01',
+     'ibm-valid-P66-ibm66v01','ibm-valid-P65-ibm65v02',
+     'ibm-valid-P65-ibm65v01','ibm-valid-P64-ibm64v03',
+     'ibm-valid-P64-ibm64v02','ibm-valid-P64-ibm64v01',
+     'ibm-valid-P63-ibm63v05','ibm-valid-P63-ibm63v04',
+     'ibm-valid-P63-ibm63v03','ibm-valid-P63-ibm63v02',
+     'ibm-valid-P63-ibm63v01','ibm-valid-P62-ibm62v05',
+     'ibm-valid-P62-ibm62v04','ibm-valid-P62-ibm62v03',
+     'ibm-valid-P62-ibm62v02','ibm-valid-P62-ibm62v01',
+     'ibm-valid-P61-ibm61v02','ibm-valid-P61-ibm61v01',
+     'ibm-valid-P60-ibm60v04','ibm-valid-P60-ibm60v03',
+     'ibm-valid-P60-ibm60v02','ibm-valid-P60-ibm60v01',
+     'ibm-valid-P59-ibm59v02','ibm-valid-P59-ibm59v01',
+     'ibm-valid-P58-ibm58v02','ibm-valid-P58-ibm58v01',
+     'ibm-valid-P57-ibm57v01','ibm-valid-P56-ibm56v10',
+     'ibm-valid-P56-ibm56v09','ibm-valid-P56-ibm56v08',
+     'ibm-valid-P56-ibm56v07','ibm-valid-P56-ibm56v06',
+     'ibm-valid-P56-ibm56v05','ibm-valid-P56-ibm56v04',
+     'ibm-valid-P56-ibm56v03','ibm-valid-P56-ibm56v02',
+     'ibm-valid-P56-ibm56v01','ibm-valid-P55-ibm55v01',
+     'ibm-valid-P54-ibm54v03','ibm-valid-P54-ibm54v02',
+     'ibm-valid-P54-ibm54v01','ibm-valid-P52-ibm52v01',
+     'ibm-valid-P51-ibm51v02','ibm-valid-P51-ibm51v01',
+     'ibm-valid-P50-ibm50v01','ibm-valid-P49-ibm49v01',
+     'ibm-valid-P47-ibm47v01','ibm-valid-P45-ibm45v01',
+     'ibm-valid-P44-ibm44v01','ibm-valid-P43-ibm43v01',
+     'ibm-valid-P42-ibm42v01','ibm-valid-P41-ibm41v01',
+     'ibm-valid-P40-ibm40v01','ibm-valid-P39-ibm39v01',
+     'ibm-valid-P38-ibm38v01','ibm-valid-P37-ibm37v01',
+     'ibm-valid-P36-ibm36v01','ibm-valid-P35-ibm35v01',
+     'ibm-valid-P34-ibm34v01','ibm-valid-P33-ibm33v01',
+     'ibm-valid-P32-ibm32v04','ibm-valid-P32-ibm32v03',
+     'ibm-valid-P32-ibm32v02','ibm-valid-P32-ibm32v01',
+     'ibm-valid-P31-ibm31v01','ibm-valid-P30-ibm30v02',
+     'ibm-valid-P30-ibm30v01','ibm-valid-P29-ibm29v02',
+     'ibm-valid-P29-ibm29v01','ibm-valid-P28-ibm28v02',
+     'ibm-valid-P28-ibm28v01','ibm-valid-P27-ibm27v03',
+     'ibm-valid-P27-ibm27v02','ibm-valid-P27-ibm27v01',
+     'ibm-valid-P26-ibm26v01','ibm-valid-P25-ibm25v04',
+     'ibm-valid-P25-ibm25v03','ibm-valid-P25-ibm25v02',
+     'ibm-valid-P25-ibm25v01','ibm-valid-P24-ibm24v02',
+     'ibm-valid-P24-ibm24v01','ibm-valid-P23-ibm23v06',
+     'ibm-valid-P23-ibm23v05','ibm-valid-P23-ibm23v04',
+     'ibm-valid-P23-ibm23v03','ibm-valid-P23-ibm23v02',
+     'ibm-valid-P23-ibm23v01','ibm-valid-P22-ibm22v07',
+     'ibm-valid-P22-ibm22v06','ibm-valid-P22-ibm22v05',
+     'ibm-valid-P22-ibm22v04','ibm-valid-P22-ibm22v03',
+     'ibm-valid-P22-ibm22v02','ibm-valid-P22-ibm22v01',
+     'ibm-valid-P21-ibm21v01','ibm-valid-P20-ibm20v02',
+     'ibm-valid-P20-ibm20v01','ibm-valid-P19-ibm19v01',
+     'ibm-valid-P18-ibm18v01','ibm-valid-P17-ibm17v01',
+     'ibm-valid-P16-ibm16v03','ibm-valid-P16-ibm16v02',
+     'ibm-valid-P16-ibm16v01','ibm-valid-P15-ibm15v04',
+     'ibm-valid-P15-ibm15v03','ibm-valid-P15-ibm15v02',
+     'ibm-valid-P15-ibm15v01','ibm-valid-P14-ibm14v03',
+     'ibm-valid-P14-ibm14v02','ibm-valid-P14-ibm14v01',
+     'ibm-valid-P13-ibm13v01','ibm-valid-P12-ibm12v04',
+     'ibm-valid-P12-ibm12v03','ibm-valid-P12-ibm12v02',
+     'ibm-valid-P12-ibm12v01','ibm-valid-P11-ibm11v04',
+     'ibm-valid-P11-ibm11v03','ibm-valid-P11-ibm11v02',
+     'ibm-valid-P11-ibm11v01','ibm-valid-P10-ibm10v08',
+     'ibm-valid-P10-ibm10v07','ibm-valid-P10-ibm10v06',
+     'ibm-valid-P10-ibm10v05','ibm-valid-P10-ibm10v04',
+     'ibm-valid-P10-ibm10v03','ibm-valid-P10-ibm10v02',
+     'ibm-valid-P10-ibm10v01','ibm-valid-P09-ibm09v05',
+     'ibm-valid-P09-ibm09v04','ibm-valid-P09-ibm09v03',
+     'ibm-valid-P09-ibm09v02','ibm-valid-P09-ibm09v01',
+     'ibm-valid-P03-ibm03v01','ibm-valid-P02-ibm02v01',
+     'ibm-valid-P01-ibm01v01'].
+
+%%----------------------------------------------------------------------
+%% Initializations
+%%----------------------------------------------------------------------
+
+init_per_suite(doc) ->
+    ["Starts the test suite"];
+init_per_suite(Config) ->
+    Dog=test_server:timetrap({minutes,10}),
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line ok=erl_tar:extract("ibm.tgz",[compressed]),
+    ?line ok=erl_tar:extract("japanese.tgz",[compressed]),
+    ?line ok=erl_tar:extract("oasis.tgz",[compressed]),
+    ?line ok=erl_tar:extract("sun.tgz",[compressed]),
+    ?line ok=erl_tar:extract("xmltest.tgz",[compressed]),
+    ?line ok = change_mode(["ibm","japanese","oasis",
+			    "sun","xmltest"]),
+    [{watchdog, Dog}|Config].
+
+
+-ifndef(dont_rm_test_dirs).
+end_per_suite(doc) ->
+    ["Stops the test suite"];
+end_per_suite(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line ok=rm_files(["ibm","japanese","oasis","sun","xmltest"]),
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    lists:keydelete(watchdog,1,Config).
+
+-else.
+end_per_suite(doc) ->
+    ["Stops the test suite"];
+end_per_suite(Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    lists:keydelete(watchdog,1,Config).
+-endif.
+
+%% initialization before each testcase
+init_per_testcase(_TestCase,Config) ->
+    io:format("Config:~n~p",[Config]),
+    ?line {ok, _} = file:read_file_info(filename:join([?config(priv_dir,Config)])),
+    ?line code:add_patha(?config(priv_dir,Config)),
+    Dog=test_server:timetrap({minutes,10}),
+    [{watchdog, Dog}|Config].
+
+
+%% clean up after each testcase
+end_per_testcase(_Func,Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+
+%%----------------------------------------------------------------------
+%% Test cases
+%%----------------------------------------------------------------------
+'v-pe02'(suite) -> [];
+'v-pe02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-pe02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'v-pe03'(suite) -> [];
+'v-pe03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-pe03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'v-pe00'(suite) -> [];
+'v-pe00'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-pe00.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'v-lang06'(suite) -> [];
+'v-lang06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'v-lang05'(suite) -> [];
+'v-lang05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'v-lang04'(suite) -> [];
+'v-lang04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'v-lang03'(suite) -> [];
+'v-lang03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'v-lang02'(suite) -> [];
+'v-lang02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'v-lang01'(suite) -> [];
+'v-lang01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'v-sgml01'(suite) -> [];
+'v-sgml01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-sgml01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sa05'(suite) -> [];
+'sa05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sa05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sa04'(suite) -> [];
+'sa04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sa04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sa03'(suite) -> [];
+'sa03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sa03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sa02'(suite) -> [];
+'sa02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sa02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sa01'(suite) -> [];
+'sa01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sa01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'required00'(suite) -> [];
+'required00'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"required00.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional'(suite) -> [];
+'optional'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'notation01'(suite) -> [];
+'notation01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"notation01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-sa04'(suite) -> [];
+'not-sa04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"not-sa04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-sa03'(suite) -> [];
+'not-sa03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"not-sa03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-sa02'(suite) -> [];
+'not-sa02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"not-sa02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-sa01'(suite) -> [];
+'not-sa01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"not-sa01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ext02'(suite) -> [];
+'ext02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"ext02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ext01'(suite) -> [];
+'ext01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"ext01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'element'(suite) -> [];
+'element'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'dtd01'(suite) -> [];
+'dtd01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'dtd00'(suite) -> [];
+'dtd00'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd00.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'pe01'(suite) -> [];
+'pe01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pe01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+%%----------------------------------------------------------------------
+
+'empty'(suite) -> [];
+'empty'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"empty.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'utf16l'(suite) -> [];
+'utf16l'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"utf16l.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'utf16b'(suite) -> [];
+'utf16b'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"utf16b.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr16'(suite) -> [];
+'attr16'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr16.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr15'(suite) -> [];
+'attr15'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr15.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr14'(suite) -> [];
+'attr14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr13'(suite) -> [];
+'attr13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr12'(suite) -> [];
+'attr12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr11'(suite) -> [];
+'attr11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr10'(suite) -> [];
+'attr10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr09'(suite) -> [];
+'attr09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr08'(suite) -> [];
+'attr08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr07'(suite) -> [];
+'attr07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr06'(suite) -> [];
+'attr06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr05'(suite) -> [];
+'attr05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr04'(suite) -> [];
+'attr04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr03'(suite) -> [];
+'attr03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr02'(suite) -> [];
+'attr02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attr01'(suite) -> [];
+'attr01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'root'(suite) -> [];
+'root'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"root.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-required02'(suite) -> [];
+'inv-required02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-required02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-required01'(suite) -> [];
+'inv-required01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-required01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-required00'(suite) -> [];
+'inv-required00'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-required00.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional25'(suite) -> [];
+'optional25'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional25.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional24'(suite) -> [];
+'optional24'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional24.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional23'(suite) -> [];
+'optional23'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional23.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional22'(suite) -> [];
+'optional22'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional22.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional21'(suite) -> [];
+'optional21'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional21.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional20'(suite) -> [];
+'optional20'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional20.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional14'(suite) -> [];
+'optional14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional13'(suite) -> [];
+'optional13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional12'(suite) -> [];
+'optional12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional11'(suite) -> [];
+'optional11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional10'(suite) -> [];
+'optional10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional09'(suite) -> [];
+'optional09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional08'(suite) -> [];
+'optional08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional07'(suite) -> [];
+'optional07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional06'(suite) -> [];
+'optional06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional05'(suite) -> [];
+'optional05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional04'(suite) -> [];
+'optional04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional03'(suite) -> [];
+'optional03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional02'(suite) -> [];
+'optional02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'optional01'(suite) -> [];
+'optional01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa14'(suite) -> [];
+'inv-not-sa14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa13'(suite) -> [];
+'inv-not-sa13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa12'(suite) -> [];
+'inv-not-sa12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa11'(suite) -> [];
+'inv-not-sa11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa10'(suite) -> [];
+'inv-not-sa10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa09'(suite) -> [];
+'inv-not-sa09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa08'(suite) -> [];
+'inv-not-sa08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa07'(suite) -> [];
+'inv-not-sa07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa06'(suite) -> [];
+'inv-not-sa06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa05'(suite) -> [];
+'inv-not-sa05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa04'(suite) -> [];
+'inv-not-sa04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa02'(suite) -> [];
+'inv-not-sa02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-not-sa01'(suite) -> [];
+'inv-not-sa01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'id09'(suite) -> [];
+'id09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'id08'(suite) -> [];
+'id08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'id07'(suite) -> [];
+'id07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'id06'(suite) -> [];
+'id06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'id05'(suite) -> [];
+'id05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'id04'(suite) -> [];
+'id04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'id03'(suite) -> [];
+'id03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'id02'(suite) -> [];
+'id02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'id01'(suite) -> [];
+'id01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'el06'(suite) -> [];
+'el06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'el05'(suite) -> [];
+'el05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'el04'(suite) -> [];
+'el04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'el03'(suite) -> [];
+'el03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'el02'(suite) -> [];
+'el02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'el01'(suite) -> [];
+'el01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-dtd03'(suite) -> [];
+'inv-dtd03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-dtd03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-dtd02'(suite) -> [];
+'inv-dtd02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-dtd02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'inv-dtd01'(suite) -> [];
+'inv-dtd01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-dtd01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+%%----------------------------------------------------------------------
+
+'sgml13'(suite) -> [];
+'sgml13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml12'(suite) -> [];
+'sgml12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml11'(suite) -> [];
+'sgml11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml10'(suite) -> [];
+'sgml10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml09'(suite) -> [];
+'sgml09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml08'(suite) -> [];
+'sgml08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml07'(suite) -> [];
+'sgml07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml06'(suite) -> [];
+'sgml06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml05'(suite) -> [];
+'sgml05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml04'(suite) -> [];
+'sgml04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml03'(suite) -> [];
+'sgml03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml02'(suite) -> [];
+'sgml02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'sgml01'(suite) -> [];
+'sgml01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'pubid05'(suite) -> [];
+'pubid05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pubid05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'pubid04'(suite) -> [];
+'pubid04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pubid04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'pubid03'(suite) -> [];
+'pubid03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pubid03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'pubid02'(suite) -> [];
+'pubid02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pubid02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'pubid01'(suite) -> [];
+'pubid01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pubid01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'pi'(suite) -> [];
+'pi'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pi.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'encoding07'(suite) -> [];
+'encoding07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'encoding06'(suite) -> [];
+'encoding06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'encoding05'(suite) -> [];
+'encoding05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'encoding04'(suite) -> [];
+'encoding04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'encoding03'(suite) -> [];
+'encoding03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'encoding02'(suite) -> [];
+'encoding02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'encoding01'(suite) -> [];
+'encoding01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'element04'(suite) -> [];
+'element04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'element03'(suite) -> [];
+'element03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'element02'(suite) -> [];
+'element02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'element01'(suite) -> [];
+'element01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'element00'(suite) -> [];
+'element00'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element00.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'dtd07'(suite) -> [];
+'dtd07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'dtd05'(suite) -> [];
+'dtd05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'dtd04'(suite) -> [];
+'dtd04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'dtd03'(suite) -> [];
+'dtd03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'dtd02'(suite) -> [];
+'dtd02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'nwf-dtd01'(suite) -> [];
+'nwf-dtd01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"nwf-dtd01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'nwf-dtd00'(suite) -> [];
+'nwf-dtd00'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"nwf-dtd00.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'decl01'(suite) -> [];
+'decl01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"decl01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'content03'(suite) -> [];
+'content03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"content03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'content02'(suite) -> [];
+'content02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"content02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'content01'(suite) -> [];
+'content01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"content01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'cond02'(suite) -> [];
+'cond02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"cond02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'cond01'(suite) -> [];
+'cond01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"cond01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attlist11'(suite) -> [];
+'attlist11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attlist10'(suite) -> [];
+'attlist10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attlist09'(suite) -> [];
+'attlist09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attlist08'(suite) -> [];
+'attlist08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attlist07'(suite) -> [];
+'attlist07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attlist06'(suite) -> [];
+'attlist06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attlist05'(suite) -> [];
+'attlist05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attlist04'(suite) -> [];
+'attlist04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attlist03'(suite) -> [];
+'attlist03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attlist02'(suite) -> [];
+'attlist02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'attlist01'(suite) -> [];
+'attlist01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa03'(suite) -> [];
+'not-wf-sa03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"not-wf-sa03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+%%----------------------------------------------------------------------
+
+'uri01'(suite) -> [];
+'uri01'(doc) ->
+    ["URI fragments disallowed"];
+'uri01'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"uri01.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["URI fragments disallowed"]}.
+
+%%----------------------------------------------------------------------
+
+'valid-ext-sa-014'(suite) -> [];
+'valid-ext-sa-014'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-014.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-013'(suite) -> [];
+'valid-ext-sa-013'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-013.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-012'(suite) -> [];
+'valid-ext-sa-012'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-012.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-011'(suite) -> [];
+'valid-ext-sa-011'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-011.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-009'(suite) -> [];
+'valid-ext-sa-009'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-009.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-008'(suite) -> [];
+'valid-ext-sa-008'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-008.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-007'(suite) -> [];
+'valid-ext-sa-007'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-007.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-006'(suite) -> [];
+'valid-ext-sa-006'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-006.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-005'(suite) -> [];
+'valid-ext-sa-005'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-005.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-004'(suite) -> [];
+'valid-ext-sa-004'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-004.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-003'(suite) -> [];
+'valid-ext-sa-003'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-003.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-002'(suite) -> [];
+'valid-ext-sa-002'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-002.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-ext-sa-001'(suite) -> [];
+'valid-ext-sa-001'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-001.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-031'(suite) -> [];
+'valid-not-sa-031'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-031.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-030'(suite) -> [];
+'valid-not-sa-030'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-030.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-029'(suite) -> [];
+'valid-not-sa-029'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-029.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-028'(suite) -> [];
+'valid-not-sa-028'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-028.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-027'(suite) -> [];
+'valid-not-sa-027'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-027.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-026'(suite) -> [];
+'valid-not-sa-026'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-026.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-025'(suite) -> [];
+'valid-not-sa-025'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-025.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-024'(suite) -> [];
+'valid-not-sa-024'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-024.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-023'(suite) -> [];
+'valid-not-sa-023'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-023.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-021'(suite) -> [];
+'valid-not-sa-021'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-021.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-020'(suite) -> [];
+'valid-not-sa-020'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-020.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-019'(suite) -> [];
+'valid-not-sa-019'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-019.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-018'(suite) -> [];
+'valid-not-sa-018'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-018.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-017'(suite) -> [];
+'valid-not-sa-017'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-017.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-016'(suite) -> [];
+'valid-not-sa-016'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-016.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-015'(suite) -> [];
+'valid-not-sa-015'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-015.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-014'(suite) -> [];
+'valid-not-sa-014'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-014.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-013'(suite) -> [];
+'valid-not-sa-013'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-013.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-012'(suite) -> [];
+'valid-not-sa-012'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-012.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-011'(suite) -> [];
+'valid-not-sa-011'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-011.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-010'(suite) -> [];
+'valid-not-sa-010'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-010.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-009'(suite) -> [];
+'valid-not-sa-009'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-009.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-008'(suite) -> [];
+'valid-not-sa-008'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-008.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-007'(suite) -> [];
+'valid-not-sa-007'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-007.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-006'(suite) -> [];
+'valid-not-sa-006'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-006.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-005'(suite) -> [];
+'valid-not-sa-005'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-005.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-004'(suite) -> [];
+'valid-not-sa-004'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-004.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-003'(suite) -> [];
+'valid-not-sa-003'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-003.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-002'(suite) -> [];
+'valid-not-sa-002'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-002.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-not-sa-001'(suite) -> [];
+'valid-not-sa-001'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-001.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-119'(suite) -> [];
+'valid-sa-119'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-119.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-118'(suite) -> [];
+'valid-sa-118'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-118.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-117'(suite) -> [];
+'valid-sa-117'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-117.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-116'(suite) -> [];
+'valid-sa-116'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-116.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-115'(suite) -> [];
+'valid-sa-115'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-115.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-114'(suite) -> [];
+'valid-sa-114'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-114.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-113'(suite) -> [];
+'valid-sa-113'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-113.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-112'(suite) -> [];
+'valid-sa-112'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-112.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-111'(suite) -> [];
+'valid-sa-111'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-111.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-110'(suite) -> [];
+'valid-sa-110'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-110.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-109'(suite) -> [];
+'valid-sa-109'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-109.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-108'(suite) -> [];
+'valid-sa-108'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-108.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-107'(suite) -> [];
+'valid-sa-107'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-107.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-106'(suite) -> [];
+'valid-sa-106'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-106.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-105'(suite) -> [];
+'valid-sa-105'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-105.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-104'(suite) -> [];
+'valid-sa-104'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-104.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-103'(suite) -> [];
+'valid-sa-103'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-103.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-102'(suite) -> [];
+'valid-sa-102'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-102.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-101'(suite) -> [];
+'valid-sa-101'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-101.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-100'(suite) -> [];
+'valid-sa-100'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+%  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-100.xml"]),[]),
+%  ?line xmerl:export([A],xmerl_test).
+    {skip,["recursive xml spec"]}.
+
+'valid-sa-099'(suite) -> [];
+'valid-sa-099'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-099.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-098'(suite) -> [];
+'valid-sa-098'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-098.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-097'(suite) -> [];
+'valid-sa-097'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-097.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-096'(suite) -> [];
+'valid-sa-096'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-096.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-095'(suite) -> [];
+'valid-sa-095'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-095.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-094'(suite) -> [];
+'valid-sa-094'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-094.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-093'(suite) -> [];
+'valid-sa-093'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-093.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-092'(suite) -> [];
+'valid-sa-092'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-092.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-091'(suite) -> [];
+'valid-sa-091'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-091.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-090'(suite) -> [];
+'valid-sa-090'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-090.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-089'(suite) -> [];
+'valid-sa-089'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-089.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-088'(suite) -> [];
+'valid-sa-088'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-088.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-087'(suite) -> [];
+'valid-sa-087'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-087.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-086'(suite) -> [];
+'valid-sa-086'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-086.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-085'(suite) -> [];
+'valid-sa-085'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-085.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-084'(suite) -> [];
+'valid-sa-084'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-084.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-083'(suite) -> [];
+'valid-sa-083'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-083.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-082'(suite) -> [];
+'valid-sa-082'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-082.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-081'(suite) -> [];
+'valid-sa-081'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-081.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-080'(suite) -> [];
+'valid-sa-080'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-080.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-079'(suite) -> [];
+'valid-sa-079'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-079.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-078'(suite) -> [];
+'valid-sa-078'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-078.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-077'(suite) -> [];
+'valid-sa-077'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-077.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-076'(suite) -> [];
+'valid-sa-076'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-076.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-075'(suite) -> [];
+'valid-sa-075'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-075.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-074'(suite) -> [];
+'valid-sa-074'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-074.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-073'(suite) -> [];
+'valid-sa-073'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-073.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-072'(suite) -> [];
+'valid-sa-072'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-072.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-071'(suite) -> [];
+'valid-sa-071'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-071.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-070'(suite) -> [];
+'valid-sa-070'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-070.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-069'(suite) -> [];
+'valid-sa-069'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-069.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-068'(suite) -> [];
+'valid-sa-068'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-068.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-067'(suite) -> [];
+'valid-sa-067'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-067.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-066'(suite) -> [];
+'valid-sa-066'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-066.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-065'(suite) -> [];
+'valid-sa-065'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-065.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-064'(suite) -> [];
+'valid-sa-064'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-064.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Fails to handle UTF-8 encoded names, when they are converted to atoms"]}.
+
+'valid-sa-063'(suite) -> [];
+'valid-sa-063'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-063.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Fails to handle Unicode integer (UTF-8) encoded names, when they are converted to atoms"]}.
+
+'valid-sa-062'(suite) -> [];
+'valid-sa-062'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-062.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-061'(suite) -> [];
+'valid-sa-061'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-061.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-060'(suite) -> [];
+'valid-sa-060'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-060.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-059'(suite) -> [];
+'valid-sa-059'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-059.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-058'(suite) -> [];
+'valid-sa-058'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-058.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-057'(suite) -> [];
+'valid-sa-057'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-057.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-056'(suite) -> [];
+'valid-sa-056'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-056.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-055'(suite) -> [];
+'valid-sa-055'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-055.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-054'(suite) -> [];
+'valid-sa-054'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-054.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-053'(suite) -> [];
+'valid-sa-053'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-053.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-052'(suite) -> [];
+'valid-sa-052'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-052.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-051'(suite) -> [];
+'valid-sa-051'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-051.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Fails to handle Unicode integer (UTF-16) encoded names, when they are converted to atoms"]}.
+'valid-sa-050'(suite) -> [];
+'valid-sa-050'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-050.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-049'(suite) -> [];
+'valid-sa-049'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-049.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-048'(suite) -> [];
+'valid-sa-048'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-048.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-047'(suite) -> [];
+'valid-sa-047'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-047.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-046'(suite) -> [];
+'valid-sa-046'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-046.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-045'(suite) -> [];
+'valid-sa-045'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-045.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-044'(suite) -> [];
+'valid-sa-044'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-044.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-043'(suite) -> [];
+'valid-sa-043'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-043.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-042'(suite) -> [];
+'valid-sa-042'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-042.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-041'(suite) -> [];
+'valid-sa-041'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-041.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-040'(suite) -> [];
+'valid-sa-040'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-040.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-039'(suite) -> [];
+'valid-sa-039'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-039.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-038'(suite) -> [];
+'valid-sa-038'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-038.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-037'(suite) -> [];
+'valid-sa-037'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-037.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-036'(suite) -> [];
+'valid-sa-036'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-036.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-035'(suite) -> [];
+'valid-sa-035'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-035.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-034'(suite) -> [];
+'valid-sa-034'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-034.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-033'(suite) -> [];
+'valid-sa-033'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-033.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-032'(suite) -> [];
+'valid-sa-032'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-032.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-031'(suite) -> [];
+'valid-sa-031'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-031.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-030'(suite) -> [];
+'valid-sa-030'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-030.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-029'(suite) -> [];
+'valid-sa-029'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-029.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-028'(suite) -> [];
+'valid-sa-028'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-028.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-027'(suite) -> [];
+'valid-sa-027'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-027.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-026'(suite) -> [];
+'valid-sa-026'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-026.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-025'(suite) -> [];
+'valid-sa-025'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-025.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-024'(suite) -> [];
+'valid-sa-024'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-024.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-023'(suite) -> [];
+'valid-sa-023'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-023.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-022'(suite) -> [];
+'valid-sa-022'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-022.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-021'(suite) -> [];
+'valid-sa-021'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-021.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-020'(suite) -> [];
+'valid-sa-020'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-020.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-019'(suite) -> [];
+'valid-sa-019'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-019.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-018'(suite) -> [];
+'valid-sa-018'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-018.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-017'(suite) -> [];
+'valid-sa-017'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-017.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-016'(suite) -> [];
+'valid-sa-016'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-016.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-015'(suite) -> [];
+'valid-sa-015'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-015.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-014'(suite) -> [];
+'valid-sa-014'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-014.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-013'(suite) -> [];
+'valid-sa-013'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-013.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-012'(suite) -> [];
+'valid-sa-012'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-012.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-011'(suite) -> [];
+'valid-sa-011'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-011.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-010'(suite) -> [];
+'valid-sa-010'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-010.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-009'(suite) -> [];
+'valid-sa-009'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-009.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-008'(suite) -> [];
+'valid-sa-008'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-008.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-007'(suite) -> [];
+'valid-sa-007'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-007.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-006'(suite) -> [];
+'valid-sa-006'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-006.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-005'(suite) -> [];
+'valid-sa-005'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-005.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-004'(suite) -> [];
+'valid-sa-004'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-004.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-003'(suite) -> [];
+'valid-sa-003'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-003.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-002'(suite) -> [];
+'valid-sa-002'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-002.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'valid-sa-001'(suite) -> [];
+'valid-sa-001'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-001.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'invalid-not-sa-022'(suite) -> [];
+'invalid-not-sa-022'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"invalid-not-sa-022.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'invalid--006'(suite) -> [];
+'invalid--006'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"invalid--006.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'invalid--005'(suite) -> [];
+'invalid--005'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"invalid--005.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'invalid--002'(suite) -> [];
+'invalid--002'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"invalid--002.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-ext-sa-003'(suite) -> [];
+'not-wf-ext-sa-003'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-ext-sa-003.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-ext-sa-002'(suite) -> [];
+'not-wf-ext-sa-002'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-ext-sa-002.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-ext-sa-001'(suite) -> [];
+'not-wf-ext-sa-001'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-ext-sa-001.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-not-sa-009'(suite) -> [];
+'not-wf-not-sa-009'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-009.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-not-sa-008'(suite) -> [];
+'not-wf-not-sa-008'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-008.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-not-sa-007'(suite) -> [];
+'not-wf-not-sa-007'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-007.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-not-sa-006'(suite) -> [];
+'not-wf-not-sa-006'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-006.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-not-sa-005'(suite) -> [];
+'not-wf-not-sa-005'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-005.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-not-sa-004'(suite) -> [];
+'not-wf-not-sa-004'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-004.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-not-sa-003'(suite) -> [];
+'not-wf-not-sa-003'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-003.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-not-sa-002'(suite) -> [];
+'not-wf-not-sa-002'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-002.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-not-sa-001'(suite) -> [];
+'not-wf-not-sa-001'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-001.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-186'(suite) -> [];
+'not-wf-sa-186'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-186.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-185'(suite) -> [];
+'not-wf-sa-185'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-185.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-184'(suite) -> [];
+'not-wf-sa-184'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-184.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-183'(suite) -> [];
+'not-wf-sa-183'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-183.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-182'(suite) -> [];
+'not-wf-sa-182'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-182.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-181'(suite) -> [];
+'not-wf-sa-181'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-181.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-180'(suite) -> [];
+'not-wf-sa-180'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-180.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-179'(suite) -> [];
+'not-wf-sa-179'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-179.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-178'(suite) -> [];
+'not-wf-sa-178'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-178.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-177'(suite) -> [];
+'not-wf-sa-177'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-177.xml"]),[]),
+%  ?line xmerl:export([A],xmerl_test).
+    {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
+
+'not-wf-sa-176'(suite) -> [];
+'not-wf-sa-176'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-176.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-175'(suite) -> [];
+'not-wf-sa-175'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-175.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
+
+'not-wf-sa-174'(suite) -> [];
+'not-wf-sa-174'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-174.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
+
+'not-wf-sa-173'(suite) -> [];
+'not-wf-sa-173'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-173.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
+
+'not-wf-sa-172'(suite) -> [];
+'not-wf-sa-172'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-172.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
+
+'not-wf-sa-171'(suite) -> [];
+'not-wf-sa-171'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-171.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
+
+'not-wf-sa-170'(suite) -> [];
+'not-wf-sa-170'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-170.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["UTF-8 encoding of UCS-4 characters"]}.
+
+'not-wf-sa-169'(suite) -> [];
+'not-wf-sa-169'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-169.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["UTF-8 encoding of an illegal unpaired surrogate (DC00)"]}.
+
+'not-wf-sa-168'(suite) -> [];
+'not-wf-sa-168'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-168.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["UTF-8 encoding of an illegal unpaired surrogate (D800)"]}.
+
+'not-wf-sa-167'(suite) -> [];
+'not-wf-sa-167'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-167.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["UTF-8 encoding of an illegal FFFE"]}.
+
+'not-wf-sa-166'(suite) -> [];
+'not-wf-sa-166'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-166.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["UTF-8 encoding of an illegal FFFE"]}.
+
+'not-wf-sa-165'(suite) -> [];
+'not-wf-sa-165'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-165.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-164'(suite) -> [];
+'not-wf-sa-164'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-164.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-163'(suite) -> [];
+'not-wf-sa-163'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-163.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-162'(suite) -> [];
+'not-wf-sa-162'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-162.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-161'(suite) -> [];
+'not-wf-sa-161'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-161.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-160'(suite) -> [];
+'not-wf-sa-160'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-160.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-159'(suite) -> [];
+'not-wf-sa-159'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-159.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-158'(suite) -> [];
+'not-wf-sa-158'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-158.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-157'(suite) -> [];
+'not-wf-sa-157'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-157.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-156'(suite) -> [];
+'not-wf-sa-156'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-156.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-155'(suite) -> [];
+'not-wf-sa-155'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-155.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-154'(suite) -> [];
+'not-wf-sa-154'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-154.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-153'(suite) -> [];
+'not-wf-sa-153'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-153.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-152'(suite) -> [];
+'not-wf-sa-152'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-152.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-151'(suite) -> [];
+'not-wf-sa-151'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-151.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["don't bother wath's in the Misc production"]}.
+
+'not-wf-sa-150'(suite) -> [];
+'not-wf-sa-150'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-150.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-149'(suite) -> [];
+'not-wf-sa-149'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-149.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-148'(suite) -> [];
+'not-wf-sa-148'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-148.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-147'(suite) -> [];
+'not-wf-sa-147'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-147.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-146'(suite) -> [];
+'not-wf-sa-146'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-146.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-145'(suite) -> [];
+'not-wf-sa-145'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-145.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-144'(suite) -> [];
+'not-wf-sa-144'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-144.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-143'(suite) -> [];
+'not-wf-sa-143'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-143.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-142'(suite) -> [];
+'not-wf-sa-142'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-142.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-141'(suite) -> [];
+'not-wf-sa-141'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-141.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-140'(suite) -> [];
+'not-wf-sa-140'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-140.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-139'(suite) -> [];
+'not-wf-sa-139'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-139.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-138'(suite) -> [];
+'not-wf-sa-138'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-138.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-137'(suite) -> [];
+'not-wf-sa-137'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-137.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-136'(suite) -> [];
+'not-wf-sa-136'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-136.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-135'(suite) -> [];
+'not-wf-sa-135'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-135.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-134'(suite) -> [];
+'not-wf-sa-134'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-134.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-133'(suite) -> [];
+'not-wf-sa-133'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-133.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-132'(suite) -> [];
+'not-wf-sa-132'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-132.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-131'(suite) -> [];
+'not-wf-sa-131'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-131.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-130'(suite) -> [];
+'not-wf-sa-130'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-130.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-129'(suite) -> [];
+'not-wf-sa-129'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-129.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-128'(suite) -> [];
+'not-wf-sa-128'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-128.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-127'(suite) -> [];
+'not-wf-sa-127'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-127.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-126'(suite) -> [];
+'not-wf-sa-126'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-126.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-125'(suite) -> [];
+'not-wf-sa-125'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-125.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-124'(suite) -> [];
+'not-wf-sa-124'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-124.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-123'(suite) -> [];
+'not-wf-sa-123'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-123.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-122'(suite) -> [];
+'not-wf-sa-122'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-122.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-121'(suite) -> [];
+'not-wf-sa-121'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-121.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-120'(suite) -> [];
+'not-wf-sa-120'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-120.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-119'(suite) -> [];
+'not-wf-sa-119'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-119.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-118'(suite) -> [];
+'not-wf-sa-118'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-118.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-117'(suite) -> [];
+'not-wf-sa-117'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-117.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-116'(suite) -> [];
+'not-wf-sa-116'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-116.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-115'(suite) -> [];
+'not-wf-sa-115'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-115.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-114'(suite) -> [];
+'not-wf-sa-114'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-114.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-113'(suite) -> [];
+'not-wf-sa-113'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-113.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-112'(suite) -> [];
+'not-wf-sa-112'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-112.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-111'(suite) -> [];
+'not-wf-sa-111'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-111.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-110'(suite) -> [];
+'not-wf-sa-110'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-110.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-109'(suite) -> [];
+'not-wf-sa-109'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-109.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-108'(suite) -> [];
+'not-wf-sa-108'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-108.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-107'(suite) -> [];
+'not-wf-sa-107'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-107.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-106'(suite) -> [];
+'not-wf-sa-106'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-106.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-105'(suite) -> [];
+'not-wf-sa-105'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-105.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-104'(suite) -> [];
+'not-wf-sa-104'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-104.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-103'(suite) -> [];
+'not-wf-sa-103'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-103.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-102'(suite) -> [];
+'not-wf-sa-102'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-102.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-101'(suite) -> [];
+'not-wf-sa-101'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-101.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-100'(suite) -> [];
+'not-wf-sa-100'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-100.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-099'(suite) -> [];
+'not-wf-sa-099'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-099.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-098'(suite) -> [];
+'not-wf-sa-098'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-098.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-097'(suite) -> [];
+'not-wf-sa-097'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-097.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-096'(suite) -> [];
+'not-wf-sa-096'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-096.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-095'(suite) -> [];
+'not-wf-sa-095'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-095.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-094'(suite) -> [];
+'not-wf-sa-094'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-094.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-093'(suite) -> [];
+'not-wf-sa-093'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-093.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-092'(suite) -> [];
+'not-wf-sa-092'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-092.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-091'(suite) -> [];
+'not-wf-sa-091'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-091.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-090'(suite) -> [];
+'not-wf-sa-090'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-090.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-089'(suite) -> [];
+'not-wf-sa-089'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-089.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-088'(suite) -> [];
+'not-wf-sa-088'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-088.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-087'(suite) -> [];
+'not-wf-sa-087'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-087.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-086'(suite) -> [];
+'not-wf-sa-086'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-086.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-085'(suite) -> [];
+'not-wf-sa-085'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-085.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-084'(suite) -> [];
+'not-wf-sa-084'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-084.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-083'(suite) -> [];
+'not-wf-sa-083'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-083.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-082'(suite) -> [];
+'not-wf-sa-082'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-082.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-081'(suite) -> [];
+'not-wf-sa-081'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-081.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-080'(suite) -> [];
+'not-wf-sa-080'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-080.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-079'(suite) -> [];
+'not-wf-sa-079'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-079.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-078'(suite) -> [];
+'not-wf-sa-078'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-078.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-077'(suite) -> [];
+'not-wf-sa-077'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-077.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-076'(suite) -> [];
+'not-wf-sa-076'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-076.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-075'(suite) -> [];
+'not-wf-sa-075'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-075.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-074'(suite) -> [];
+'not-wf-sa-074'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-074.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-073'(suite) -> [];
+'not-wf-sa-073'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-073.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-072'(suite) -> [];
+'not-wf-sa-072'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-072.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-071'(suite) -> [];
+'not-wf-sa-071'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-071.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-070'(suite) -> [];
+'not-wf-sa-070'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-070.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-069'(suite) -> [];
+'not-wf-sa-069'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-069.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-068'(suite) -> [];
+'not-wf-sa-068'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-068.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-067'(suite) -> [];
+'not-wf-sa-067'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-067.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-066'(suite) -> [];
+'not-wf-sa-066'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-066.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-065'(suite) -> [];
+'not-wf-sa-065'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-065.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-064'(suite) -> [];
+'not-wf-sa-064'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-064.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-063'(suite) -> [];
+'not-wf-sa-063'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-063.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-062'(suite) -> [];
+'not-wf-sa-062'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-062.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-061'(suite) -> [];
+'not-wf-sa-061'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-061.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-060'(suite) -> [];
+'not-wf-sa-060'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-060.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-059'(suite) -> [];
+'not-wf-sa-059'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-059.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-058'(suite) -> [];
+'not-wf-sa-058'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-058.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-057'(suite) -> [];
+'not-wf-sa-057'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-057.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-056'(suite) -> [];
+'not-wf-sa-056'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-056.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-055'(suite) -> [];
+'not-wf-sa-055'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-055.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-054'(suite) -> [];
+'not-wf-sa-054'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-054.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-053'(suite) -> [];
+'not-wf-sa-053'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-053.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-052'(suite) -> [];
+'not-wf-sa-052'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-052.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-051'(suite) -> [];
+'not-wf-sa-051'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-051.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-050'(suite) -> [];
+'not-wf-sa-050'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-050.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-049'(suite) -> [];
+'not-wf-sa-049'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-049.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-048'(suite) -> [];
+'not-wf-sa-048'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-048.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-047'(suite) -> [];
+'not-wf-sa-047'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-047.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-046'(suite) -> [];
+'not-wf-sa-046'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-046.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-045'(suite) -> [];
+'not-wf-sa-045'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-045.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-044'(suite) -> [];
+'not-wf-sa-044'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-044.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-043'(suite) -> [];
+'not-wf-sa-043'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-043.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-042'(suite) -> [];
+'not-wf-sa-042'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-042.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-041'(suite) -> [];
+'not-wf-sa-041'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-041.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-040'(suite) -> [];
+'not-wf-sa-040'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-040.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-039'(suite) -> [];
+'not-wf-sa-039'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-039.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-038'(suite) -> [];
+'not-wf-sa-038'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-038.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-037'(suite) -> [];
+'not-wf-sa-037'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-037.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-036'(suite) -> [];
+'not-wf-sa-036'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-036.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-035'(suite) -> [];
+'not-wf-sa-035'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-035.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-034'(suite) -> [];
+'not-wf-sa-034'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-034.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-033'(suite) -> [];
+'not-wf-sa-033'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-033.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-032'(suite) -> [];
+'not-wf-sa-032'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-032.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-031'(suite) -> [];
+'not-wf-sa-031'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-031.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-030'(suite) -> [];
+'not-wf-sa-030'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-030.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-029'(suite) -> [];
+'not-wf-sa-029'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-029.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-028'(suite) -> [];
+'not-wf-sa-028'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-028.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-027'(suite) -> [];
+'not-wf-sa-027'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-027.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-026'(suite) -> [];
+'not-wf-sa-026'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-026.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-025'(suite) -> [];
+'not-wf-sa-025'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-025.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-024'(suite) -> [];
+'not-wf-sa-024'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-024.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-023'(suite) -> [];
+'not-wf-sa-023'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-023.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-022'(suite) -> [];
+'not-wf-sa-022'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-022.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-021'(suite) -> [];
+'not-wf-sa-021'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-021.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-020'(suite) -> [];
+'not-wf-sa-020'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-020.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-019'(suite) -> [];
+'not-wf-sa-019'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-019.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-018'(suite) -> [];
+'not-wf-sa-018'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-018.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-017'(suite) -> [];
+'not-wf-sa-017'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-017.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-016'(suite) -> [];
+'not-wf-sa-016'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-016.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-015'(suite) -> [];
+'not-wf-sa-015'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-015.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-014'(suite) -> [];
+'not-wf-sa-014'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-014.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-013'(suite) -> [];
+'not-wf-sa-013'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-013.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-012'(suite) -> [];
+'not-wf-sa-012'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-012.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-011'(suite) -> [];
+'not-wf-sa-011'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-011.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-010'(suite) -> [];
+'not-wf-sa-010'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-010.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-009'(suite) -> [];
+'not-wf-sa-009'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-009.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-008'(suite) -> [];
+'not-wf-sa-008'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-008.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-007'(suite) -> [];
+'not-wf-sa-007'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-007.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-006'(suite) -> [];
+'not-wf-sa-006'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-006.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-005'(suite) -> [];
+'not-wf-sa-005'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-005.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-004'(suite) -> [];
+'not-wf-sa-004'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-004.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-003'(suite) -> [];
+'not-wf-sa-003'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-003.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-002'(suite) -> [];
+'not-wf-sa-002'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-002.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'not-wf-sa-001'(suite) -> [];
+'not-wf-sa-001'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-001.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+%%----------------------------------------------------------------------
+
+'japanese-weekly-utf-8'(suite) -> [];
+'japanese-weekly-utf-8'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-utf-8.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["UTF-8 encoding of japanese characters"]}.
+
+'japanese-weekly-utf-16'(suite) -> [];
+'japanese-weekly-utf-16'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-utf-16.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Test support for UTF-16 encoding, and XML names which contain Japanese characters."]}.
+
+'japanese-weekly-shift_jis'(suite) -> [];
+'japanese-weekly-shift_jis'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-shift_jis.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'japanese-weekly-little'(suite) -> [];
+'japanese-weekly-little'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-little.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Test support for little-endian UTF-16 encoding, and XML names which contain Japanese characters."]}.
+
+'japanese-weekly-iso-2022-jp'(suite) -> [];
+'japanese-weekly-iso-2022-jp'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-iso-2022-jp.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'japanese-weekly-euc-jp'(suite) -> [];
+'japanese-weekly-euc-jp'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-euc-jp.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'japanese-pr-xml-utf-8'(suite) -> [];
+'japanese-pr-xml-utf-8'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-utf-8.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Test support for UTF-8 text which relies on Japanese characters"]}.
+
+'japanese-pr-xml-utf-16'(suite) -> [];
+'japanese-pr-xml-utf-16'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-utf-16.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Test support UTF-16 text which relies on Japanese characters."]}.
+
+'japanese-pr-xml-shift_jis'(suite) -> [];
+'japanese-pr-xml-shift_jis'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-shift_jis.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'japanese-pr-xml-little'(suite) -> [];
+'japanese-pr-xml-little'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-little.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Test support for little-endian UTF-16 text which relies on Japanese characters."]}.
+
+'japanese-pr-xml-iso-2022-jp'(suite) -> [];
+'japanese-pr-xml-iso-2022-jp'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-iso-2022-jp.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'japanese-pr-xml-euc-jp'(suite) -> [];
+'japanese-pr-xml-euc-jp'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-euc-jp.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+%%----------------------------------------------------------------------
+
+'o-p11pass1'(suite) -> [];
+'o-p11pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p11pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p76fail4'(suite) -> [];
+'o-p76fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p76fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p76fail3'(suite) -> [];
+'o-p76fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p76fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p76fail2'(suite) -> [];
+'o-p76fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p76fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p76fail1'(suite) -> [];
+'o-p76fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p76fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p75fail6'(suite) -> [];
+'o-p75fail6'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail6.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p75fail5'(suite) -> [];
+'o-p75fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p75fail4'(suite) -> [];
+'o-p75fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p75fail3'(suite) -> [];
+'o-p75fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p75fail2'(suite) -> [];
+'o-p75fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p75fail1'(suite) -> [];
+'o-p75fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p74fail3'(suite) -> [];
+'o-p74fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p74fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p74fail2'(suite) -> [];
+'o-p74fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p74fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p74fail1'(suite) -> [];
+'o-p74fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p74fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p73fail5'(suite) -> [];
+'o-p73fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p73fail4'(suite) -> [];
+'o-p73fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p73fail3'(suite) -> [];
+'o-p73fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p73fail2'(suite) -> [];
+'o-p73fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p73fail1'(suite) -> [];
+'o-p73fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p72fail4'(suite) -> [];
+'o-p72fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p72fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p72fail3'(suite) -> [];
+'o-p72fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p72fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p72fail2'(suite) -> [];
+'o-p72fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p72fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p72fail1'(suite) -> [];
+'o-p72fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p72fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p71fail4'(suite) -> [];
+'o-p71fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p71fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p71fail3'(suite) -> [];
+'o-p71fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p71fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p71fail2'(suite) -> [];
+'o-p71fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p71fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p71fail1'(suite) -> [];
+'o-p71fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p71fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p70fail1'(suite) -> [];
+'o-p70fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p70fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p69fail3'(suite) -> [];
+'o-p69fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p69fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p69fail2'(suite) -> [];
+'o-p69fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p69fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p69fail1'(suite) -> [];
+'o-p69fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p69fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p68fail3'(suite) -> [];
+'o-p68fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p68fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p68fail2'(suite) -> [];
+'o-p68fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p68fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p68fail1'(suite) -> [];
+'o-p68fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p68fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p66fail6'(suite) -> [];
+'o-p66fail6'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail6.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p66fail5'(suite) -> [];
+'o-p66fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p66fail4'(suite) -> [];
+'o-p66fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p66fail3'(suite) -> [];
+'o-p66fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p66fail2'(suite) -> [];
+'o-p66fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p66fail1'(suite) -> [];
+'o-p66fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p64fail2'(suite) -> [];
+'o-p64fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p64fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p64fail1'(suite) -> [];
+'o-p64fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p64fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p63fail2'(suite) -> [];
+'o-p63fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p63fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p63fail1'(suite) -> [];
+'o-p63fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p63fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p62fail2'(suite) -> [];
+'o-p62fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p62fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p62fail1'(suite) -> [];
+'o-p62fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p62fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p61fail1'(suite) -> [];
+'o-p61fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p61fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p60fail5'(suite) -> [];
+'o-p60fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p60fail4'(suite) -> [];
+'o-p60fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p60fail3'(suite) -> [];
+'o-p60fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p60fail2'(suite) -> [];
+'o-p60fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p60fail1'(suite) -> [];
+'o-p60fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p59fail3'(suite) -> [];
+'o-p59fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p59fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p59fail2'(suite) -> [];
+'o-p59fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p59fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p59fail1'(suite) -> [];
+'o-p59fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p59fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p58fail8'(suite) -> [];
+'o-p58fail8'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail8.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p58fail7'(suite) -> [];
+'o-p58fail7'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail7.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p58fail6'(suite) -> [];
+'o-p58fail6'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail6.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p58fail5'(suite) -> [];
+'o-p58fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p58fail4'(suite) -> [];
+'o-p58fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p58fail3'(suite) -> [];
+'o-p58fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p58fail2'(suite) -> [];
+'o-p58fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p58fail1'(suite) -> [];
+'o-p58fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p57fail1'(suite) -> [];
+'o-p57fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p57fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p56fail5'(suite) -> [];
+'o-p56fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p56fail4'(suite) -> [];
+'o-p56fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p56fail3'(suite) -> [];
+'o-p56fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p56fail2'(suite) -> [];
+'o-p56fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p56fail1'(suite) -> [];
+'o-p56fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p55fail1'(suite) -> [];
+'o-p55fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p55fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p54fail1'(suite) -> [];
+'o-p54fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p54fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p53fail5'(suite) -> [];
+'o-p53fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p53fail4'(suite) -> [];
+'o-p53fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p53fail3'(suite) -> [];
+'o-p53fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p53fail2'(suite) -> [];
+'o-p53fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p53fail1'(suite) -> [];
+'o-p53fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p52fail2'(suite) -> [];
+'o-p52fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p52fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p52fail1'(suite) -> [];
+'o-p52fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p52fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p51fail7'(suite) -> [];
+'o-p51fail7'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail7.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p51fail6'(suite) -> [];
+'o-p51fail6'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail6.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p51fail5'(suite) -> [];
+'o-p51fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p51fail4'(suite) -> [];
+'o-p51fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p51fail3'(suite) -> [];
+'o-p51fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p51fail2'(suite) -> [];
+'o-p51fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p51fail1'(suite) -> [];
+'o-p51fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p50fail1'(suite) -> [];
+'o-p50fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p50fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p49fail1'(suite) -> [];
+'o-p49fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p49fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p48fail2'(suite) -> [];
+'o-p48fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p48fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p48fail1'(suite) -> [];
+'o-p48fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p48fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p47fail4'(suite) -> [];
+'o-p47fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p47fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p47fail3'(suite) -> [];
+'o-p47fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p47fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p47fail2'(suite) -> [];
+'o-p47fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p47fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p47fail1'(suite) -> [];
+'o-p47fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p47fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p46fail6'(suite) -> [];
+'o-p46fail6'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail6.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p46fail5'(suite) -> [];
+'o-p46fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p46fail4'(suite) -> [];
+'o-p46fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p46fail3'(suite) -> [];
+'o-p46fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p46fail2'(suite) -> [];
+'o-p46fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p46fail1'(suite) -> [];
+'o-p46fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p45fail4'(suite) -> [];
+'o-p45fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p45fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p45fail3'(suite) -> [];
+'o-p45fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p45fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p45fail2'(suite) -> [];
+'o-p45fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p45fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p45fail1'(suite) -> [];
+'o-p45fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p45fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p44fail5'(suite) -> [];
+'o-p44fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p44fail4'(suite) -> [];
+'o-p44fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p44fail3'(suite) -> [];
+'o-p44fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p44fail2'(suite) -> [];
+'o-p44fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p44fail1'(suite) -> [];
+'o-p44fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p43fail3'(suite) -> [];
+'o-p43fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p43fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p43fail2'(suite) -> [];
+'o-p43fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p43fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p43fail1'(suite) -> [];
+'o-p43fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p43fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p42fail3'(suite) -> [];
+'o-p42fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p42fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p42fail2'(suite) -> [];
+'o-p42fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p42fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p42fail1'(suite) -> [];
+'o-p42fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p42fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p41fail3'(suite) -> [];
+'o-p41fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p41fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p41fail2'(suite) -> [];
+'o-p41fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p41fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p41fail1'(suite) -> [];
+'o-p41fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p41fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p40fail4'(suite) -> [];
+'o-p40fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p40fail3'(suite) -> [];
+'o-p40fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p40fail2'(suite) -> [];
+'o-p40fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p40fail1'(suite) -> [];
+'o-p40fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p39fail5'(suite) -> [];
+'o-p39fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p39fail4'(suite) -> [];
+'o-p39fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p39fail3'(suite) -> [];
+'o-p39fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p39fail2'(suite) -> [];
+'o-p39fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p39fail1'(suite) -> [];
+'o-p39fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p32fail5'(suite) -> [];
+'o-p32fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p32fail4'(suite) -> [];
+'o-p32fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p32fail3'(suite) -> [];
+'o-p32fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p32fail2'(suite) -> [];
+'o-p32fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p32fail1'(suite) -> [];
+'o-p32fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p31fail1'(suite) -> [];
+'o-p31fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p31fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p30fail1'(suite) -> [];
+'o-p30fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p30fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p29fail1'(suite) -> [];
+'o-p29fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p29fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p28fail1'(suite) -> [];
+'o-p28fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p28fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p27fail1'(suite) -> [];
+'o-p27fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p27fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p26fail2'(suite) -> [];
+'o-p26fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p26fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p26fail1'(suite) -> [];
+'o-p26fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p26fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p25fail1'(suite) -> [];
+'o-p25fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p25fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p24fail2'(suite) -> [];
+'o-p24fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p24fail1'(suite) -> [];
+'o-p24fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p23fail5'(suite) -> [];
+'o-p23fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p23fail4'(suite) -> [];
+'o-p23fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p23fail3'(suite) -> [];
+'o-p23fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p23fail2'(suite) -> [];
+'o-p23fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p23fail1'(suite) -> [];
+'o-p23fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p22fail2'(suite) -> [];
+'o-p22fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p22fail1'(suite) -> [];
+'o-p22fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p18fail3'(suite) -> [];
+'o-p18fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p18fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p18fail2'(suite) -> [];
+'o-p18fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p18fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p18fail1'(suite) -> [];
+'o-p18fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p18fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p16fail3'(suite) -> [];
+'o-p16fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p16fail2'(suite) -> [];
+'o-p16fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p16fail1'(suite) -> [];
+'o-p16fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p15fail3'(suite) -> [];
+'o-p15fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p15fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p15fail2'(suite) -> [];
+'o-p15fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p15fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p15fail1'(suite) -> [];
+'o-p15fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p15fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p14fail3'(suite) -> [];
+'o-p14fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p14fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p14fail2'(suite) -> [];
+'o-p14fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p14fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p14fail1'(suite) -> [];
+'o-p14fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p14fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p12fail7'(suite) -> [];
+'o-p12fail7'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail7.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p12fail6'(suite) -> [];
+'o-p12fail6'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail6.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p12fail5'(suite) -> [];
+'o-p12fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p12fail4'(suite) -> [];
+'o-p12fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p12fail3'(suite) -> [];
+'o-p12fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p12fail2'(suite) -> [];
+'o-p12fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p12fail1'(suite) -> [];
+'o-p12fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p11fail2'(suite) -> [];
+'o-p11fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p11fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p11fail1'(suite) -> [];
+'o-p11fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p11fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p10fail3'(suite) -> [];
+'o-p10fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p10fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p10fail2'(suite) -> [];
+'o-p10fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p10fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p10fail1'(suite) -> [];
+'o-p10fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p10fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p09fail5'(suite) -> [];
+'o-p09fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p09fail4'(suite) -> [];
+'o-p09fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p09fail3'(suite) -> [];
+'o-p09fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p09fail2'(suite) -> [];
+'o-p09fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p09fail1'(suite) -> [];
+'o-p09fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p05fail5'(suite) -> [];
+'o-p05fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p05fail4'(suite) -> [];
+'o-p05fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p05fail3'(suite) -> [];
+'o-p05fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p05fail2'(suite) -> [];
+'o-p05fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p05fail1'(suite) -> [];
+'o-p05fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p04fail3'(suite) -> [];
+'o-p04fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p04fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p04fail2'(suite) -> [];
+'o-p04fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p04fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p04fail1'(suite) -> [];
+'o-p04fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p04fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail9'(suite) -> [];
+'o-p03fail9'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail9.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail8'(suite) -> [];
+'o-p03fail8'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail8.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail7'(suite) -> [];
+'o-p03fail7'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail7.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail5'(suite) -> [];
+'o-p03fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail4'(suite) -> [];
+'o-p03fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail3'(suite) -> [];
+'o-p03fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail29'(suite) -> [];
+'o-p03fail29'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail29.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail28'(suite) -> [];
+'o-p03fail28'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail28.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail27'(suite) -> [];
+'o-p03fail27'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail27.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail26'(suite) -> [];
+'o-p03fail26'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail26.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail25'(suite) -> [];
+'o-p03fail25'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail25.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail24'(suite) -> [];
+'o-p03fail24'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail24.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail23'(suite) -> [];
+'o-p03fail23'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail23.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail22'(suite) -> [];
+'o-p03fail22'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail22.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail21'(suite) -> [];
+'o-p03fail21'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail21.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail20'(suite) -> [];
+'o-p03fail20'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail20.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail2'(suite) -> [];
+'o-p03fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail19'(suite) -> [];
+'o-p03fail19'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail19.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail18'(suite) -> [];
+'o-p03fail18'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail18.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail17'(suite) -> [];
+'o-p03fail17'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail17.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail16'(suite) -> [];
+'o-p03fail16'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail16.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail15'(suite) -> [];
+'o-p03fail15'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail15.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail14'(suite) -> [];
+'o-p03fail14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail13'(suite) -> [];
+'o-p03fail13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail12'(suite) -> [];
+'o-p03fail12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail11'(suite) -> [];
+'o-p03fail11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail10'(suite) -> [];
+'o-p03fail10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p03fail1'(suite) -> [];
+'o-p03fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail9'(suite) -> [];
+'o-p02fail9'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail9.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail8'(suite) -> [];
+'o-p02fail8'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail8.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail7'(suite) -> [];
+'o-p02fail7'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail7.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail6'(suite) -> [];
+'o-p02fail6'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail6.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail5'(suite) -> [];
+'o-p02fail5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail4'(suite) -> [];
+'o-p02fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail31'(suite) -> [];
+'o-p02fail31'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail31.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail30'(suite) -> [];
+'o-p02fail30'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail30.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail3'(suite) -> [];
+'o-p02fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail29'(suite) -> [];
+'o-p02fail29'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail29.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail28'(suite) -> [];
+'o-p02fail28'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail28.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail27'(suite) -> [];
+'o-p02fail27'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail27.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail26'(suite) -> [];
+'o-p02fail26'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail26.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail25'(suite) -> [];
+'o-p02fail25'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail25.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail24'(suite) -> [];
+'o-p02fail24'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail24.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail23'(suite) -> [];
+'o-p02fail23'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail23.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail22'(suite) -> [];
+'o-p02fail22'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail22.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail21'(suite) -> [];
+'o-p02fail21'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail21.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail20'(suite) -> [];
+'o-p02fail20'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail20.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail2'(suite) -> [];
+'o-p02fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail19'(suite) -> [];
+'o-p02fail19'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail19.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail18'(suite) -> [];
+'o-p02fail18'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail18.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail17'(suite) -> [];
+'o-p02fail17'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail17.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail16'(suite) -> [];
+'o-p02fail16'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail16.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail15'(suite) -> [];
+'o-p02fail15'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail15.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail14'(suite) -> [];
+'o-p02fail14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail13'(suite) -> [];
+'o-p02fail13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail12'(suite) -> [];
+'o-p02fail12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail11'(suite) -> [];
+'o-p02fail11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail10'(suite) -> [];
+'o-p02fail10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p02fail1'(suite) -> [];
+'o-p02fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p01fail4'(suite) -> [];
+'o-p01fail4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01fail4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p01fail3'(suite) -> [];
+'o-p01fail3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01fail3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p01fail2'(suite) -> [];
+'o-p01fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p01fail1'(suite) -> [];
+'o-p01fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-e2'(suite) -> [];
+'o-e2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-e2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p75pass1'(suite) -> [];
+'o-p75pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p74pass1'(suite) -> [];
+'o-p74pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p74pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p66pass1'(suite) -> [];
+'o-p66pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p44pass5'(suite) -> [];
+'o-p44pass5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44pass5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p44pass4'(suite) -> [];
+'o-p44pass4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44pass4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p44pass3'(suite) -> [];
+'o-p44pass3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44pass3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p44pass2'(suite) -> [];
+'o-p44pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p44pass1'(suite) -> [];
+'o-p44pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p42pass2'(suite) -> [];
+'o-p42pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p42pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p42pass1'(suite) -> [];
+'o-p42pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p42pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p41pass2'(suite) -> [];
+'o-p41pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p41pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p41pass1'(suite) -> [];
+'o-p41pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p41pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p40pass4'(suite) -> [];
+'o-p40pass4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40pass4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p40pass3'(suite) -> [];
+'o-p40pass3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40pass3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p40pass2'(suite) -> [];
+'o-p40pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p40pass1'(suite) -> [];
+'o-p40pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p39pass2'(suite) -> [];
+'o-p39pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p39pass1'(suite) -> [];
+'o-p39pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p32pass2'(suite) -> [];
+'o-p32pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p32pass1'(suite) -> [];
+'o-p32pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p27pass4'(suite) -> [];
+'o-p27pass4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p27pass4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p27pass3'(suite) -> [];
+'o-p27pass3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p27pass3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p27pass2'(suite) -> [];
+'o-p27pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p27pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p27pass1'(suite) -> [];
+'o-p27pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p27pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p26pass1'(suite) -> [];
+'o-p26pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p26pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p25pass2'(suite) -> [];
+'o-p25pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p25pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p25pass1'(suite) -> [];
+'o-p25pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p25pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p24pass4'(suite) -> [];
+'o-p24pass4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24pass4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p24pass3'(suite) -> [];
+'o-p24pass3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24pass3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p24pass2'(suite) -> [];
+'o-p24pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p24pass1'(suite) -> [];
+'o-p24pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p23pass4'(suite) -> [];
+'o-p23pass4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23pass4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p23pass3'(suite) -> [];
+'o-p23pass3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23pass3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p23pass2'(suite) -> [];
+'o-p23pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p23pass1'(suite) -> [];
+'o-p23pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p22pass3'(suite) -> [];
+'o-p22pass3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p22pass2'(suite) -> [];
+'o-p22pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p22pass1'(suite) -> [];
+'o-p22pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p18pass1'(suite) -> [];
+'o-p18pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p18pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p16pass3'(suite) -> [];
+'o-p16pass3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16pass3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p16pass2'(suite) -> [];
+'o-p16pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p16pass1'(suite) -> [];
+'o-p16pass1'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16pass1.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Hard to interpret the meaning of the XML1.0 spec. See section 2.6 and 2.3."]}.
+
+'o-p15pass1'(suite) -> [];
+'o-p15pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p15pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p14pass1'(suite) -> [];
+'o-p14pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p14pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p10pass1'(suite) -> [];
+'o-p10pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p10pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p08fail2'(suite) -> [];
+'o-p08fail2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p08fail2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p08fail1'(suite) -> [];
+'o-p08fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p08fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p06fail1'(suite) -> [];
+'o-p06fail1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p06fail1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p05pass1'(suite) -> [];
+'o-p05pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p04pass1'(suite) -> [];
+'o-p04pass1'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p04pass1.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
+'o-p03pass1'(suite) -> [];
+'o-p03pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p01pass3'(suite) -> [];
+'o-p01pass3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01pass3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p01pass1'(suite) -> [];
+'o-p01pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p76pass1'(suite) -> [];
+'o-p76pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p76pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p73pass1'(suite) -> [];
+'o-p73pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p72pass1'(suite) -> [];
+'o-p72pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p72pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p71pass1'(suite) -> [];
+'o-p71pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p71pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p70pass1'(suite) -> [];
+'o-p70pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p70pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p69pass1'(suite) -> [];
+'o-p69pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p69pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p68pass1'(suite) -> [];
+'o-p68pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p68pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p64pass1'(suite) -> [];
+'o-p64pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p64pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p63pass1'(suite) -> [];
+'o-p63pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p63pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p62pass1'(suite) -> [];
+'o-p62pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p62pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p61pass1'(suite) -> [];
+'o-p61pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p61pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p60pass1'(suite) -> [];
+'o-p60pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p59pass1'(suite) -> [];
+'o-p59pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p59pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p58pass1'(suite) -> [];
+'o-p58pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p57pass1'(suite) -> [];
+'o-p57pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p57pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p56pass1'(suite) -> [];
+'o-p56pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p55pass1'(suite) -> [];
+'o-p55pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p55pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p54pass1'(suite) -> [];
+'o-p54pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p54pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p53pass1'(suite) -> [];
+'o-p53pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p52pass1'(suite) -> [];
+'o-p52pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p52pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p51pass1'(suite) -> [];
+'o-p51pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p50pass1'(suite) -> [];
+'o-p50pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p50pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p49pass1'(suite) -> [];
+'o-p49pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p49pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p48pass1'(suite) -> [];
+'o-p48pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p48pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p47pass1'(suite) -> [];
+'o-p47pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p47pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p46pass1'(suite) -> [];
+'o-p46pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p45pass1'(suite) -> [];
+'o-p45pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p45pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p43pass1'(suite) -> [];
+'o-p43pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p43pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p31pass2'(suite) -> [];
+'o-p31pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p31pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p31pass1'(suite) -> [];
+'o-p31pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p31pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p30pass2'(suite) -> [];
+'o-p30pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p30pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p30pass1'(suite) -> [];
+'o-p30pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p30pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p29pass1'(suite) -> [];
+'o-p29pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p29pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p28pass5'(suite) -> [];
+'o-p28pass5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p28pass5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p28pass4'(suite) -> [];
+'o-p28pass4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p28pass4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p28pass3'(suite) -> [];
+'o-p28pass3'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p28pass3.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p28pass1'(suite) -> [];
+'o-p28pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p28pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p22pass6'(suite) -> [];
+'o-p22pass6'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass6.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p22pass5'(suite) -> [];
+'o-p22pass5'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass5.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p22pass4'(suite) -> [];
+'o-p22pass4'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass4.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p12pass1'(suite) -> [];
+'o-p12pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p09pass1'(suite) -> [];
+'o-p09pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p08pass1'(suite) -> [];
+'o-p08pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p08pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p07pass1'(suite) -> [];
+'o-p07pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p07pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p06pass1'(suite) -> [];
+'o-p06pass1'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p06pass1.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'o-p01pass2'(suite) -> [];
+'o-p01pass2'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01pass2.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+%%----------------------------------------------------------------------
+
+'ibm-invalid-P76-ibm76i01'(suite) -> [];
+'ibm-invalid-P76-ibm76i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P76-ibm76i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P69-ibm69i04'(suite) -> [];
+'ibm-invalid-P69-ibm69i04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P69-ibm69i04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P69-ibm69i03'(suite) -> [];
+'ibm-invalid-P69-ibm69i03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P69-ibm69i03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P69-ibm69i02'(suite) -> [];
+'ibm-invalid-P69-ibm69i02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P69-ibm69i02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P69-ibm69i01'(suite) -> [];
+'ibm-invalid-P69-ibm69i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P69-ibm69i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P68-ibm68i04'(suite) -> [];
+'ibm-invalid-P68-ibm68i04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P68-ibm68i04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P68-ibm68i03'(suite) -> [];
+'ibm-invalid-P68-ibm68i03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P68-ibm68i03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P68-ibm68i02'(suite) -> [];
+'ibm-invalid-P68-ibm68i02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P68-ibm68i02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P68-ibm68i01'(suite) -> [];
+'ibm-invalid-P68-ibm68i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P68-ibm68i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P60-ibm60i04'(suite) -> [];
+'ibm-invalid-P60-ibm60i04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P60-ibm60i04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P60-ibm60i03'(suite) -> [];
+'ibm-invalid-P60-ibm60i03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P60-ibm60i03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P60-ibm60i02'(suite) -> [];
+'ibm-invalid-P60-ibm60i02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P60-ibm60i02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P60-ibm60i01'(suite) -> [];
+'ibm-invalid-P60-ibm60i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P60-ibm60i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P59-ibm59i01'(suite) -> [];
+'ibm-invalid-P59-ibm59i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P59-ibm59i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P58-ibm58i02'(suite) -> [];
+'ibm-invalid-P58-ibm58i02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P58-ibm58i02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P58-ibm58i01'(suite) -> [];
+'ibm-invalid-P58-ibm58i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P58-ibm58i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i18'(suite) -> [];
+'ibm-invalid-P56-ibm56i18'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i18.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i17'(suite) -> [];
+'ibm-invalid-P56-ibm56i17'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i17.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i16'(suite) -> [];
+'ibm-invalid-P56-ibm56i16'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i16.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i15'(suite) -> [];
+'ibm-invalid-P56-ibm56i15'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i15.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i14'(suite) -> [];
+'ibm-invalid-P56-ibm56i14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i13'(suite) -> [];
+'ibm-invalid-P56-ibm56i13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i12'(suite) -> [];
+'ibm-invalid-P56-ibm56i12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i11'(suite) -> [];
+'ibm-invalid-P56-ibm56i11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i10'(suite) -> [];
+'ibm-invalid-P56-ibm56i10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i09'(suite) -> [];
+'ibm-invalid-P56-ibm56i09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i08'(suite) -> [];
+'ibm-invalid-P56-ibm56i08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i07'(suite) -> [];
+'ibm-invalid-P56-ibm56i07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i06'(suite) -> [];
+'ibm-invalid-P56-ibm56i06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i05'(suite) -> [];
+'ibm-invalid-P56-ibm56i05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i03'(suite) -> [];
+'ibm-invalid-P56-ibm56i03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i02'(suite) -> [];
+'ibm-invalid-P56-ibm56i02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P56-ibm56i01'(suite) -> [];
+'ibm-invalid-P56-ibm56i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P51-ibm51i03'(suite) -> [];
+'ibm-invalid-P51-ibm51i03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P51-ibm51i03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P51-ibm51i01'(suite) -> [];
+'ibm-invalid-P51-ibm51i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P51-ibm51i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P50-ibm50i01'(suite) -> [];
+'ibm-invalid-P50-ibm50i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P50-ibm50i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P49-ibm49i01'(suite) -> [];
+'ibm-invalid-P49-ibm49i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P49-ibm49i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P45-ibm45i01'(suite) -> [];
+'ibm-invalid-P45-ibm45i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P45-ibm45i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P41-ibm41i02'(suite) -> [];
+'ibm-invalid-P41-ibm41i02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P41-ibm41i02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P41-ibm41i01'(suite) -> [];
+'ibm-invalid-P41-ibm41i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P41-ibm41i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P39-ibm39i04'(suite) -> [];
+'ibm-invalid-P39-ibm39i04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P39-ibm39i04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P39-ibm39i03'(suite) -> [];
+'ibm-invalid-P39-ibm39i03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P39-ibm39i03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P39-ibm39i02'(suite) -> [];
+'ibm-invalid-P39-ibm39i02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P39-ibm39i02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P39-ibm39i01'(suite) -> [];
+'ibm-invalid-P39-ibm39i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P39-ibm39i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P32-ibm32i04'(suite) -> [];
+'ibm-invalid-P32-ibm32i04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P32-ibm32i04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P32-ibm32i03'(suite) -> [];
+'ibm-invalid-P32-ibm32i03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P32-ibm32i03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P32-ibm32i01'(suite) -> [];
+'ibm-invalid-P32-ibm32i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P32-ibm32i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-invalid-P28-ibm28i01'(suite) -> [];
+'ibm-invalid-P28-ibm28i01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P28-ibm28i01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+%%----------------------------------------------------------------------
+
+'ibm-not-wf-P89-ibm89n12'(suite) -> [];
+'ibm-not-wf-P89-ibm89n12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P89-ibm89n11'(suite) -> [];
+'ibm-not-wf-P89-ibm89n11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P89-ibm89n10'(suite) -> [];
+'ibm-not-wf-P89-ibm89n10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P89-ibm89n09'(suite) -> [];
+'ibm-not-wf-P89-ibm89n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P89-ibm89n08'(suite) -> [];
+'ibm-not-wf-P89-ibm89n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P89-ibm89n07'(suite) -> [];
+'ibm-not-wf-P89-ibm89n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P89-ibm89n06'(suite) -> [];
+'ibm-not-wf-P89-ibm89n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P89-ibm89n05'(suite) -> [];
+'ibm-not-wf-P89-ibm89n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P89-ibm89n04'(suite) -> [];
+'ibm-not-wf-P89-ibm89n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P89-ibm89n03'(suite) -> [];
+'ibm-not-wf-P89-ibm89n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P89-ibm89n02'(suite) -> [];
+'ibm-not-wf-P89-ibm89n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P89-ibm89n01'(suite) -> [];
+'ibm-not-wf-P89-ibm89n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n16'(suite) -> [];
+'ibm-not-wf-P88-ibm88n16'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n16.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n15'(suite) -> [];
+'ibm-not-wf-P88-ibm88n15'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n15.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n14'(suite) -> [];
+'ibm-not-wf-P88-ibm88n14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n13'(suite) -> [];
+'ibm-not-wf-P88-ibm88n13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n12'(suite) -> [];
+'ibm-not-wf-P88-ibm88n12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n11'(suite) -> [];
+'ibm-not-wf-P88-ibm88n11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n10'(suite) -> [];
+'ibm-not-wf-P88-ibm88n10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n09'(suite) -> [];
+'ibm-not-wf-P88-ibm88n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n08'(suite) -> [];
+'ibm-not-wf-P88-ibm88n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n06'(suite) -> [];
+'ibm-not-wf-P88-ibm88n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n05'(suite) -> [];
+'ibm-not-wf-P88-ibm88n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n04'(suite) -> [];
+'ibm-not-wf-P88-ibm88n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n03'(suite) -> [];
+'ibm-not-wf-P88-ibm88n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n02'(suite) -> [];
+'ibm-not-wf-P88-ibm88n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P88-ibm88n01'(suite) -> [];
+'ibm-not-wf-P88-ibm88n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n85'(suite) -> [];
+'ibm-not-wf-P87-ibm87n85'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n85.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n84'(suite) -> [];
+'ibm-not-wf-P87-ibm87n84'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n84.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n83'(suite) -> [];
+'ibm-not-wf-P87-ibm87n83'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n83.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n82'(suite) -> [];
+'ibm-not-wf-P87-ibm87n82'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n82.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n81'(suite) -> [];
+'ibm-not-wf-P87-ibm87n81'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n81.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n80'(suite) -> [];
+'ibm-not-wf-P87-ibm87n80'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n80.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n79'(suite) -> [];
+'ibm-not-wf-P87-ibm87n79'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n79.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n78'(suite) -> [];
+'ibm-not-wf-P87-ibm87n78'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n78.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n77'(suite) -> [];
+'ibm-not-wf-P87-ibm87n77'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n77.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n76'(suite) -> [];
+'ibm-not-wf-P87-ibm87n76'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n76.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n75'(suite) -> [];
+'ibm-not-wf-P87-ibm87n75'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n75.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n74'(suite) -> [];
+'ibm-not-wf-P87-ibm87n74'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n74.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n73'(suite) -> [];
+'ibm-not-wf-P87-ibm87n73'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n73.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n72'(suite) -> [];
+'ibm-not-wf-P87-ibm87n72'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n72.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n71'(suite) -> [];
+'ibm-not-wf-P87-ibm87n71'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n71.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n70'(suite) -> [];
+'ibm-not-wf-P87-ibm87n70'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n70.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n69'(suite) -> [];
+'ibm-not-wf-P87-ibm87n69'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n69.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n68'(suite) -> [];
+'ibm-not-wf-P87-ibm87n68'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n68.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n67'(suite) -> [];
+'ibm-not-wf-P87-ibm87n67'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n67.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n66'(suite) -> [];
+'ibm-not-wf-P87-ibm87n66'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n66.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n64'(suite) -> [];
+'ibm-not-wf-P87-ibm87n64'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n64.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n63'(suite) -> [];
+'ibm-not-wf-P87-ibm87n63'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n63.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n62'(suite) -> [];
+'ibm-not-wf-P87-ibm87n62'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n62.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n61'(suite) -> [];
+'ibm-not-wf-P87-ibm87n61'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n61.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n60'(suite) -> [];
+'ibm-not-wf-P87-ibm87n60'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n60.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n59'(suite) -> [];
+'ibm-not-wf-P87-ibm87n59'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n59.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n58'(suite) -> [];
+'ibm-not-wf-P87-ibm87n58'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n58.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n57'(suite) -> [];
+'ibm-not-wf-P87-ibm87n57'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n57.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n56'(suite) -> [];
+'ibm-not-wf-P87-ibm87n56'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n56.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n55'(suite) -> [];
+'ibm-not-wf-P87-ibm87n55'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n55.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n54'(suite) -> [];
+'ibm-not-wf-P87-ibm87n54'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n54.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n53'(suite) -> [];
+'ibm-not-wf-P87-ibm87n53'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n53.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n52'(suite) -> [];
+'ibm-not-wf-P87-ibm87n52'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n52.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n51'(suite) -> [];
+'ibm-not-wf-P87-ibm87n51'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n51.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n50'(suite) -> [];
+'ibm-not-wf-P87-ibm87n50'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n50.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n49'(suite) -> [];
+'ibm-not-wf-P87-ibm87n49'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n49.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n48'(suite) -> [];
+'ibm-not-wf-P87-ibm87n48'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n48.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n47'(suite) -> [];
+'ibm-not-wf-P87-ibm87n47'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n47.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n46'(suite) -> [];
+'ibm-not-wf-P87-ibm87n46'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n46.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n45'(suite) -> [];
+'ibm-not-wf-P87-ibm87n45'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n45.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n44'(suite) -> [];
+'ibm-not-wf-P87-ibm87n44'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n44.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n43'(suite) -> [];
+'ibm-not-wf-P87-ibm87n43'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n43.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n42'(suite) -> [];
+'ibm-not-wf-P87-ibm87n42'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n42.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n41'(suite) -> [];
+'ibm-not-wf-P87-ibm87n41'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n41.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n40'(suite) -> [];
+'ibm-not-wf-P87-ibm87n40'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n40.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n39'(suite) -> [];
+'ibm-not-wf-P87-ibm87n39'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n39.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n38'(suite) -> [];
+'ibm-not-wf-P87-ibm87n38'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n38.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n37'(suite) -> [];
+'ibm-not-wf-P87-ibm87n37'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n37.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n36'(suite) -> [];
+'ibm-not-wf-P87-ibm87n36'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n36.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n35'(suite) -> [];
+'ibm-not-wf-P87-ibm87n35'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n35.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n34'(suite) -> [];
+'ibm-not-wf-P87-ibm87n34'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n34.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n33'(suite) -> [];
+'ibm-not-wf-P87-ibm87n33'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n33.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n32'(suite) -> [];
+'ibm-not-wf-P87-ibm87n32'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n32.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n31'(suite) -> [];
+'ibm-not-wf-P87-ibm87n31'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n31.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n30'(suite) -> [];
+'ibm-not-wf-P87-ibm87n30'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n30.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n29'(suite) -> [];
+'ibm-not-wf-P87-ibm87n29'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n29.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n28'(suite) -> [];
+'ibm-not-wf-P87-ibm87n28'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n28.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n27'(suite) -> [];
+'ibm-not-wf-P87-ibm87n27'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n27.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n26'(suite) -> [];
+'ibm-not-wf-P87-ibm87n26'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n26.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n25'(suite) -> [];
+'ibm-not-wf-P87-ibm87n25'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n25.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n24'(suite) -> [];
+'ibm-not-wf-P87-ibm87n24'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n24.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n23'(suite) -> [];
+'ibm-not-wf-P87-ibm87n23'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n23.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n22'(suite) -> [];
+'ibm-not-wf-P87-ibm87n22'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n22.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n21'(suite) -> [];
+'ibm-not-wf-P87-ibm87n21'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n21.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n20'(suite) -> [];
+'ibm-not-wf-P87-ibm87n20'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n20.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n19'(suite) -> [];
+'ibm-not-wf-P87-ibm87n19'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n19.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n18'(suite) -> [];
+'ibm-not-wf-P87-ibm87n18'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n18.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n17'(suite) -> [];
+'ibm-not-wf-P87-ibm87n17'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n17.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n16'(suite) -> [];
+'ibm-not-wf-P87-ibm87n16'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n16.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n15'(suite) -> [];
+'ibm-not-wf-P87-ibm87n15'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n15.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n14'(suite) -> [];
+'ibm-not-wf-P87-ibm87n14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n13'(suite) -> [];
+'ibm-not-wf-P87-ibm87n13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n12'(suite) -> [];
+'ibm-not-wf-P87-ibm87n12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n11'(suite) -> [];
+'ibm-not-wf-P87-ibm87n11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n10'(suite) -> [];
+'ibm-not-wf-P87-ibm87n10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n09'(suite) -> [];
+'ibm-not-wf-P87-ibm87n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n08'(suite) -> [];
+'ibm-not-wf-P87-ibm87n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n07'(suite) -> [];
+'ibm-not-wf-P87-ibm87n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n06'(suite) -> [];
+'ibm-not-wf-P87-ibm87n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n05'(suite) -> [];
+'ibm-not-wf-P87-ibm87n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n04'(suite) -> [];
+'ibm-not-wf-P87-ibm87n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n03'(suite) -> [];
+'ibm-not-wf-P87-ibm87n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n02'(suite) -> [];
+'ibm-not-wf-P87-ibm87n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P87-ibm87n01'(suite) -> [];
+'ibm-not-wf-P87-ibm87n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P86-ibm86n04'(suite) -> [];
+'ibm-not-wf-P86-ibm86n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P86-ibm86n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P86-ibm86n03'(suite) -> [];
+'ibm-not-wf-P86-ibm86n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P86-ibm86n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P86-ibm86n02'(suite) -> [];
+'ibm-not-wf-P86-ibm86n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P86-ibm86n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P86-ibm86n01'(suite) -> [];
+'ibm-not-wf-P86-ibm86n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P86-ibm86n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n99'(suite) -> [];
+'ibm-not-wf-P85-ibm85n99'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n99.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n98'(suite) -> [];
+'ibm-not-wf-P85-ibm85n98'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n98.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n97'(suite) -> [];
+'ibm-not-wf-P85-ibm85n97'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n97.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n96'(suite) -> [];
+'ibm-not-wf-P85-ibm85n96'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n96.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n95'(suite) -> [];
+'ibm-not-wf-P85-ibm85n95'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n95.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n94'(suite) -> [];
+'ibm-not-wf-P85-ibm85n94'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n94.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n93'(suite) -> [];
+'ibm-not-wf-P85-ibm85n93'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n93.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n92'(suite) -> [];
+'ibm-not-wf-P85-ibm85n92'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n92.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n91'(suite) -> [];
+'ibm-not-wf-P85-ibm85n91'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n91.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n90'(suite) -> [];
+'ibm-not-wf-P85-ibm85n90'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n90.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n89'(suite) -> [];
+'ibm-not-wf-P85-ibm85n89'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n89.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n88'(suite) -> [];
+'ibm-not-wf-P85-ibm85n88'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n88.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n87'(suite) -> [];
+'ibm-not-wf-P85-ibm85n87'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n87.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n86'(suite) -> [];
+'ibm-not-wf-P85-ibm85n86'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n86.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n85'(suite) -> [];
+'ibm-not-wf-P85-ibm85n85'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n85.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n84'(suite) -> [];
+'ibm-not-wf-P85-ibm85n84'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n84.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n83'(suite) -> [];
+'ibm-not-wf-P85-ibm85n83'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n83.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n82'(suite) -> [];
+'ibm-not-wf-P85-ibm85n82'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n82.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n81'(suite) -> [];
+'ibm-not-wf-P85-ibm85n81'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n81.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n80'(suite) -> [];
+'ibm-not-wf-P85-ibm85n80'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n80.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n79'(suite) -> [];
+'ibm-not-wf-P85-ibm85n79'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n79.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n78'(suite) -> [];
+'ibm-not-wf-P85-ibm85n78'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n78.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n77'(suite) -> [];
+'ibm-not-wf-P85-ibm85n77'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n77.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n76'(suite) -> [];
+'ibm-not-wf-P85-ibm85n76'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n76.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n75'(suite) -> [];
+'ibm-not-wf-P85-ibm85n75'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n75.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n74'(suite) -> [];
+'ibm-not-wf-P85-ibm85n74'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n74.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n73'(suite) -> [];
+'ibm-not-wf-P85-ibm85n73'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n73.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n72'(suite) -> [];
+'ibm-not-wf-P85-ibm85n72'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n72.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n71'(suite) -> [];
+'ibm-not-wf-P85-ibm85n71'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n71.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n70'(suite) -> [];
+'ibm-not-wf-P85-ibm85n70'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n70.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n69'(suite) -> [];
+'ibm-not-wf-P85-ibm85n69'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n69.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n68'(suite) -> [];
+'ibm-not-wf-P85-ibm85n68'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n68.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n67'(suite) -> [];
+'ibm-not-wf-P85-ibm85n67'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n67.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n66'(suite) -> [];
+'ibm-not-wf-P85-ibm85n66'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n66.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n65'(suite) -> [];
+'ibm-not-wf-P85-ibm85n65'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n65.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n64'(suite) -> [];
+'ibm-not-wf-P85-ibm85n64'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n64.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n63'(suite) -> [];
+'ibm-not-wf-P85-ibm85n63'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n63.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n62'(suite) -> [];
+'ibm-not-wf-P85-ibm85n62'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n62.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n61'(suite) -> [];
+'ibm-not-wf-P85-ibm85n61'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n61.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n60'(suite) -> [];
+'ibm-not-wf-P85-ibm85n60'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n60.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n59'(suite) -> [];
+'ibm-not-wf-P85-ibm85n59'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n59.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n58'(suite) -> [];
+'ibm-not-wf-P85-ibm85n58'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n58.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n57'(suite) -> [];
+'ibm-not-wf-P85-ibm85n57'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n57.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n56'(suite) -> [];
+'ibm-not-wf-P85-ibm85n56'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n56.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n55'(suite) -> [];
+'ibm-not-wf-P85-ibm85n55'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n55.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n54'(suite) -> [];
+'ibm-not-wf-P85-ibm85n54'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n54.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n53'(suite) -> [];
+'ibm-not-wf-P85-ibm85n53'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n53.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n52'(suite) -> [];
+'ibm-not-wf-P85-ibm85n52'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n52.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n51'(suite) -> [];
+'ibm-not-wf-P85-ibm85n51'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n51.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n50'(suite) -> [];
+'ibm-not-wf-P85-ibm85n50'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n50.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n49'(suite) -> [];
+'ibm-not-wf-P85-ibm85n49'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n49.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n48'(suite) -> [];
+'ibm-not-wf-P85-ibm85n48'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n48.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n47'(suite) -> [];
+'ibm-not-wf-P85-ibm85n47'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n47.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n46'(suite) -> [];
+'ibm-not-wf-P85-ibm85n46'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n46.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n45'(suite) -> [];
+'ibm-not-wf-P85-ibm85n45'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n45.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n44'(suite) -> [];
+'ibm-not-wf-P85-ibm85n44'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n44.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n43'(suite) -> [];
+'ibm-not-wf-P85-ibm85n43'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n43.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n42'(suite) -> [];
+'ibm-not-wf-P85-ibm85n42'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n42.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n41'(suite) -> [];
+'ibm-not-wf-P85-ibm85n41'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n41.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n40'(suite) -> [];
+'ibm-not-wf-P85-ibm85n40'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n40.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n39'(suite) -> [];
+'ibm-not-wf-P85-ibm85n39'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n39.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n38'(suite) -> [];
+'ibm-not-wf-P85-ibm85n38'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n38.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n37'(suite) -> [];
+'ibm-not-wf-P85-ibm85n37'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n37.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n36'(suite) -> [];
+'ibm-not-wf-P85-ibm85n36'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n36.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n35'(suite) -> [];
+'ibm-not-wf-P85-ibm85n35'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n35.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n34'(suite) -> [];
+'ibm-not-wf-P85-ibm85n34'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n34.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n33'(suite) -> [];
+'ibm-not-wf-P85-ibm85n33'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n33.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n32'(suite) -> [];
+'ibm-not-wf-P85-ibm85n32'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n32.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n31'(suite) -> [];
+'ibm-not-wf-P85-ibm85n31'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n31.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n30'(suite) -> [];
+'ibm-not-wf-P85-ibm85n30'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n30.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n29'(suite) -> [];
+'ibm-not-wf-P85-ibm85n29'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n29.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n28'(suite) -> [];
+'ibm-not-wf-P85-ibm85n28'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n28.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n27'(suite) -> [];
+'ibm-not-wf-P85-ibm85n27'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n27.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n26'(suite) -> [];
+'ibm-not-wf-P85-ibm85n26'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n26.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n25'(suite) -> [];
+'ibm-not-wf-P85-ibm85n25'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n25.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n24'(suite) -> [];
+'ibm-not-wf-P85-ibm85n24'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n24.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n23'(suite) -> [];
+'ibm-not-wf-P85-ibm85n23'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n23.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n22'(suite) -> [];
+'ibm-not-wf-P85-ibm85n22'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n22.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n21'(suite) -> [];
+'ibm-not-wf-P85-ibm85n21'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n21.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n20'(suite) -> [];
+'ibm-not-wf-P85-ibm85n20'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n20.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n198'(suite) -> [];
+'ibm-not-wf-P85-ibm85n198'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n198.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n197'(suite) -> [];
+'ibm-not-wf-P85-ibm85n197'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n197.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n196'(suite) -> [];
+'ibm-not-wf-P85-ibm85n196'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n196.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n195'(suite) -> [];
+'ibm-not-wf-P85-ibm85n195'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n195.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n194'(suite) -> [];
+'ibm-not-wf-P85-ibm85n194'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n194.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n193'(suite) -> [];
+'ibm-not-wf-P85-ibm85n193'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n193.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n192'(suite) -> [];
+'ibm-not-wf-P85-ibm85n192'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n192.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n191'(suite) -> [];
+'ibm-not-wf-P85-ibm85n191'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n191.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n190'(suite) -> [];
+'ibm-not-wf-P85-ibm85n190'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n190.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n19'(suite) -> [];
+'ibm-not-wf-P85-ibm85n19'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n19.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n189'(suite) -> [];
+'ibm-not-wf-P85-ibm85n189'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n189.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n188'(suite) -> [];
+'ibm-not-wf-P85-ibm85n188'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n188.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n187'(suite) -> [];
+'ibm-not-wf-P85-ibm85n187'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n187.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n186'(suite) -> [];
+'ibm-not-wf-P85-ibm85n186'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n186.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n185'(suite) -> [];
+'ibm-not-wf-P85-ibm85n185'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n185.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n184'(suite) -> [];
+'ibm-not-wf-P85-ibm85n184'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n184.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n183'(suite) -> [];
+'ibm-not-wf-P85-ibm85n183'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n183.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n182'(suite) -> [];
+'ibm-not-wf-P85-ibm85n182'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n182.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n181'(suite) -> [];
+'ibm-not-wf-P85-ibm85n181'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n181.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n180'(suite) -> [];
+'ibm-not-wf-P85-ibm85n180'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n180.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n18'(suite) -> [];
+'ibm-not-wf-P85-ibm85n18'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n18.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n179'(suite) -> [];
+'ibm-not-wf-P85-ibm85n179'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n179.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n178'(suite) -> [];
+'ibm-not-wf-P85-ibm85n178'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n178.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n177'(suite) -> [];
+'ibm-not-wf-P85-ibm85n177'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n177.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n176'(suite) -> [];
+'ibm-not-wf-P85-ibm85n176'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n176.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n175'(suite) -> [];
+'ibm-not-wf-P85-ibm85n175'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n175.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n174'(suite) -> [];
+'ibm-not-wf-P85-ibm85n174'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n174.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n173'(suite) -> [];
+'ibm-not-wf-P85-ibm85n173'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n173.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n172'(suite) -> [];
+'ibm-not-wf-P85-ibm85n172'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n172.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n171'(suite) -> [];
+'ibm-not-wf-P85-ibm85n171'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n171.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n170'(suite) -> [];
+'ibm-not-wf-P85-ibm85n170'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n170.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n17'(suite) -> [];
+'ibm-not-wf-P85-ibm85n17'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n17.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n169'(suite) -> [];
+'ibm-not-wf-P85-ibm85n169'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n169.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n168'(suite) -> [];
+'ibm-not-wf-P85-ibm85n168'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n168.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n167'(suite) -> [];
+'ibm-not-wf-P85-ibm85n167'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n167.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n166'(suite) -> [];
+'ibm-not-wf-P85-ibm85n166'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n166.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n165'(suite) -> [];
+'ibm-not-wf-P85-ibm85n165'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n165.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n164'(suite) -> [];
+'ibm-not-wf-P85-ibm85n164'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n164.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n163'(suite) -> [];
+'ibm-not-wf-P85-ibm85n163'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n163.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n162'(suite) -> [];
+'ibm-not-wf-P85-ibm85n162'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n162.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n161'(suite) -> [];
+'ibm-not-wf-P85-ibm85n161'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n161.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n160'(suite) -> [];
+'ibm-not-wf-P85-ibm85n160'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n160.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n16'(suite) -> [];
+'ibm-not-wf-P85-ibm85n16'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n16.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n159'(suite) -> [];
+'ibm-not-wf-P85-ibm85n159'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n159.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n158'(suite) -> [];
+'ibm-not-wf-P85-ibm85n158'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n158.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n157'(suite) -> [];
+'ibm-not-wf-P85-ibm85n157'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n157.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n156'(suite) -> [];
+'ibm-not-wf-P85-ibm85n156'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n156.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n155'(suite) -> [];
+'ibm-not-wf-P85-ibm85n155'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n155.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n154'(suite) -> [];
+'ibm-not-wf-P85-ibm85n154'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n154.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n153'(suite) -> [];
+'ibm-not-wf-P85-ibm85n153'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n153.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n152'(suite) -> [];
+'ibm-not-wf-P85-ibm85n152'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n152.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n151'(suite) -> [];
+'ibm-not-wf-P85-ibm85n151'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n151.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n150'(suite) -> [];
+'ibm-not-wf-P85-ibm85n150'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n150.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n15'(suite) -> [];
+'ibm-not-wf-P85-ibm85n15'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n15.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n149'(suite) -> [];
+'ibm-not-wf-P85-ibm85n149'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n149.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n148'(suite) -> [];
+'ibm-not-wf-P85-ibm85n148'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n148.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n147'(suite) -> [];
+'ibm-not-wf-P85-ibm85n147'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n147.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n146'(suite) -> [];
+'ibm-not-wf-P85-ibm85n146'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n146.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n145'(suite) -> [];
+'ibm-not-wf-P85-ibm85n145'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n145.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n144'(suite) -> [];
+'ibm-not-wf-P85-ibm85n144'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n144.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n143'(suite) -> [];
+'ibm-not-wf-P85-ibm85n143'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n143.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n142'(suite) -> [];
+'ibm-not-wf-P85-ibm85n142'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n142.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n141'(suite) -> [];
+'ibm-not-wf-P85-ibm85n141'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n141.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n140'(suite) -> [];
+'ibm-not-wf-P85-ibm85n140'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n140.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n14'(suite) -> [];
+'ibm-not-wf-P85-ibm85n14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n139'(suite) -> [];
+'ibm-not-wf-P85-ibm85n139'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n139.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n138'(suite) -> [];
+'ibm-not-wf-P85-ibm85n138'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n138.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n137'(suite) -> [];
+'ibm-not-wf-P85-ibm85n137'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n137.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n136'(suite) -> [];
+'ibm-not-wf-P85-ibm85n136'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n136.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n135'(suite) -> [];
+'ibm-not-wf-P85-ibm85n135'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n135.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n134'(suite) -> [];
+'ibm-not-wf-P85-ibm85n134'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n134.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n133'(suite) -> [];
+'ibm-not-wf-P85-ibm85n133'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n133.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n132'(suite) -> [];
+'ibm-not-wf-P85-ibm85n132'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n132.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n131'(suite) -> [];
+'ibm-not-wf-P85-ibm85n131'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n131.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n130'(suite) -> [];
+'ibm-not-wf-P85-ibm85n130'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n130.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n13'(suite) -> [];
+'ibm-not-wf-P85-ibm85n13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n129'(suite) -> [];
+'ibm-not-wf-P85-ibm85n129'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n129.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n128'(suite) -> [];
+'ibm-not-wf-P85-ibm85n128'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n128.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n127'(suite) -> [];
+'ibm-not-wf-P85-ibm85n127'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n127.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n126'(suite) -> [];
+'ibm-not-wf-P85-ibm85n126'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n126.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n125'(suite) -> [];
+'ibm-not-wf-P85-ibm85n125'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n125.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n124'(suite) -> [];
+'ibm-not-wf-P85-ibm85n124'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n124.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n123'(suite) -> [];
+'ibm-not-wf-P85-ibm85n123'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n123.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n122'(suite) -> [];
+'ibm-not-wf-P85-ibm85n122'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n122.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n121'(suite) -> [];
+'ibm-not-wf-P85-ibm85n121'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n121.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n120'(suite) -> [];
+'ibm-not-wf-P85-ibm85n120'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n120.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n12'(suite) -> [];
+'ibm-not-wf-P85-ibm85n12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n119'(suite) -> [];
+'ibm-not-wf-P85-ibm85n119'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n119.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n118'(suite) -> [];
+'ibm-not-wf-P85-ibm85n118'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n118.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n117'(suite) -> [];
+'ibm-not-wf-P85-ibm85n117'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n117.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n116'(suite) -> [];
+'ibm-not-wf-P85-ibm85n116'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n116.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n115'(suite) -> [];
+'ibm-not-wf-P85-ibm85n115'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n115.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n114'(suite) -> [];
+'ibm-not-wf-P85-ibm85n114'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n114.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n113'(suite) -> [];
+'ibm-not-wf-P85-ibm85n113'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n113.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n112'(suite) -> [];
+'ibm-not-wf-P85-ibm85n112'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n112.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n111'(suite) -> [];
+'ibm-not-wf-P85-ibm85n111'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n111.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n110'(suite) -> [];
+'ibm-not-wf-P85-ibm85n110'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n110.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n11'(suite) -> [];
+'ibm-not-wf-P85-ibm85n11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n109'(suite) -> [];
+'ibm-not-wf-P85-ibm85n109'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n109.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n108'(suite) -> [];
+'ibm-not-wf-P85-ibm85n108'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n108.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n107'(suite) -> [];
+'ibm-not-wf-P85-ibm85n107'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n107.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n106'(suite) -> [];
+'ibm-not-wf-P85-ibm85n106'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n106.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n105'(suite) -> [];
+'ibm-not-wf-P85-ibm85n105'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n105.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n104'(suite) -> [];
+'ibm-not-wf-P85-ibm85n104'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n104.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n103'(suite) -> [];
+'ibm-not-wf-P85-ibm85n103'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n103.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n102'(suite) -> [];
+'ibm-not-wf-P85-ibm85n102'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n102.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n101'(suite) -> [];
+'ibm-not-wf-P85-ibm85n101'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n101.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n100'(suite) -> [];
+'ibm-not-wf-P85-ibm85n100'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n100.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n10'(suite) -> [];
+'ibm-not-wf-P85-ibm85n10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n09'(suite) -> [];
+'ibm-not-wf-P85-ibm85n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n08'(suite) -> [];
+'ibm-not-wf-P85-ibm85n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n07'(suite) -> [];
+'ibm-not-wf-P85-ibm85n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n06'(suite) -> [];
+'ibm-not-wf-P85-ibm85n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n05'(suite) -> [];
+'ibm-not-wf-P85-ibm85n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n04'(suite) -> [];
+'ibm-not-wf-P85-ibm85n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n03'(suite) -> [];
+'ibm-not-wf-P85-ibm85n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n02'(suite) -> [];
+'ibm-not-wf-P85-ibm85n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P85-ibm85n01'(suite) -> [];
+'ibm-not-wf-P85-ibm85n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P83-ibm83n06'(suite) -> [];
+'ibm-not-wf-P83-ibm83n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P83-ibm83n05'(suite) -> [];
+'ibm-not-wf-P83-ibm83n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P83-ibm83n04'(suite) -> [];
+'ibm-not-wf-P83-ibm83n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P83-ibm83n03'(suite) -> [];
+'ibm-not-wf-P83-ibm83n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P83-ibm83n02'(suite) -> [];
+'ibm-not-wf-P83-ibm83n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P83-ibm83n01'(suite) -> [];
+'ibm-not-wf-P83-ibm83n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P82-ibm82n08'(suite) -> [];
+'ibm-not-wf-P82-ibm82n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P82-ibm82n07'(suite) -> [];
+'ibm-not-wf-P82-ibm82n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P82-ibm82n06'(suite) -> [];
+'ibm-not-wf-P82-ibm82n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P82-ibm82n05'(suite) -> [];
+'ibm-not-wf-P82-ibm82n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P82-ibm82n04'(suite) -> [];
+'ibm-not-wf-P82-ibm82n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P82-ibm82n03'(suite) -> [];
+'ibm-not-wf-P82-ibm82n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P82-ibm82n02'(suite) -> [];
+'ibm-not-wf-P82-ibm82n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P82-ibm82n01'(suite) -> [];
+'ibm-not-wf-P82-ibm82n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P81-ibm81n09'(suite) -> [];
+'ibm-not-wf-P81-ibm81n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P81-ibm81n08'(suite) -> [];
+'ibm-not-wf-P81-ibm81n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P81-ibm81n07'(suite) -> [];
+'ibm-not-wf-P81-ibm81n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P81-ibm81n06'(suite) -> [];
+'ibm-not-wf-P81-ibm81n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P81-ibm81n05'(suite) -> [];
+'ibm-not-wf-P81-ibm81n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P81-ibm81n04'(suite) -> [];
+'ibm-not-wf-P81-ibm81n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P81-ibm81n03'(suite) -> [];
+'ibm-not-wf-P81-ibm81n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P81-ibm81n02'(suite) -> [];
+'ibm-not-wf-P81-ibm81n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P81-ibm81n01'(suite) -> [];
+'ibm-not-wf-P81-ibm81n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P80-ibm80n06'(suite) -> [];
+'ibm-not-wf-P80-ibm80n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P80-ibm80n05'(suite) -> [];
+'ibm-not-wf-P80-ibm80n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P80-ibm80n04'(suite) -> [];
+'ibm-not-wf-P80-ibm80n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P80-ibm80n03'(suite) -> [];
+'ibm-not-wf-P80-ibm80n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P80-ibm80n02'(suite) -> [];
+'ibm-not-wf-P80-ibm80n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P80-ibm80n01'(suite) -> [];
+'ibm-not-wf-P80-ibm80n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P79-ibm79n02'(suite) -> [];
+'ibm-not-wf-P79-ibm79n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P79-ibm79n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P79-ibm79n01'(suite) -> [];
+'ibm-not-wf-P79-ibm79n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P79-ibm79n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P78-ibm78n02'(suite) -> [];
+'ibm-not-wf-P78-ibm78n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P78-ibm78n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P78-ibm78n01'(suite) -> [];
+'ibm-not-wf-P78-ibm78n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P78-ibm78n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P77-ibm77n04'(suite) -> [];
+'ibm-not-wf-P77-ibm77n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P77-ibm77n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P77-ibm77n03'(suite) -> [];
+'ibm-not-wf-P77-ibm77n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P77-ibm77n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P77-ibm77n02'(suite) -> [];
+'ibm-not-wf-P77-ibm77n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P77-ibm77n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P77-ibm77n01'(suite) -> [];
+'ibm-not-wf-P77-ibm77n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P77-ibm77n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P76-ibm76n07'(suite) -> [];
+'ibm-not-wf-P76-ibm76n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P76-ibm76n06'(suite) -> [];
+'ibm-not-wf-P76-ibm76n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P76-ibm76n05'(suite) -> [];
+'ibm-not-wf-P76-ibm76n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P76-ibm76n04'(suite) -> [];
+'ibm-not-wf-P76-ibm76n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P76-ibm76n03'(suite) -> [];
+'ibm-not-wf-P76-ibm76n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P76-ibm76n02'(suite) -> [];
+'ibm-not-wf-P76-ibm76n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P76-ibm76n01'(suite) -> [];
+'ibm-not-wf-P76-ibm76n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n13'(suite) -> [];
+'ibm-not-wf-P75-ibm75n13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n12'(suite) -> [];
+'ibm-not-wf-P75-ibm75n12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n11'(suite) -> [];
+'ibm-not-wf-P75-ibm75n11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n10'(suite) -> [];
+'ibm-not-wf-P75-ibm75n10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n09'(suite) -> [];
+'ibm-not-wf-P75-ibm75n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n08'(suite) -> [];
+'ibm-not-wf-P75-ibm75n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n07'(suite) -> [];
+'ibm-not-wf-P75-ibm75n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n06'(suite) -> [];
+'ibm-not-wf-P75-ibm75n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n05'(suite) -> [];
+'ibm-not-wf-P75-ibm75n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n04'(suite) -> [];
+'ibm-not-wf-P75-ibm75n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n03'(suite) -> [];
+'ibm-not-wf-P75-ibm75n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n02'(suite) -> [];
+'ibm-not-wf-P75-ibm75n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P75-ibm75n01'(suite) -> [];
+'ibm-not-wf-P75-ibm75n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P74-ibm74n01'(suite) -> [];
+'ibm-not-wf-P74-ibm74n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P74-ibm74n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P73-ibm73n03'(suite) -> [];
+'ibm-not-wf-P73-ibm73n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P73-ibm73n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P73-ibm73n01'(suite) -> [];
+'ibm-not-wf-P73-ibm73n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P73-ibm73n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P72-ibm72n09'(suite) -> [];
+'ibm-not-wf-P72-ibm72n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P72-ibm72n08'(suite) -> [];
+'ibm-not-wf-P72-ibm72n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P72-ibm72n07'(suite) -> [];
+'ibm-not-wf-P72-ibm72n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P72-ibm72n06'(suite) -> [];
+'ibm-not-wf-P72-ibm72n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P72-ibm72n05'(suite) -> [];
+'ibm-not-wf-P72-ibm72n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P72-ibm72n04'(suite) -> [];
+'ibm-not-wf-P72-ibm72n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P72-ibm72n03'(suite) -> [];
+'ibm-not-wf-P72-ibm72n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P72-ibm72n02'(suite) -> [];
+'ibm-not-wf-P72-ibm72n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P72-ibm72n01'(suite) -> [];
+'ibm-not-wf-P72-ibm72n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P71-ibm71n08'(suite) -> [];
+'ibm-not-wf-P71-ibm71n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P71-ibm71n07'(suite) -> [];
+'ibm-not-wf-P71-ibm71n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P71-ibm71n06'(suite) -> [];
+'ibm-not-wf-P71-ibm71n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P71-ibm71n05'(suite) -> [];
+'ibm-not-wf-P71-ibm71n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P71-ibm71n04'(suite) -> [];
+'ibm-not-wf-P71-ibm71n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P71-ibm71n03'(suite) -> [];
+'ibm-not-wf-P71-ibm71n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P71-ibm71n02'(suite) -> [];
+'ibm-not-wf-P71-ibm71n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P71-ibm71n01'(suite) -> [];
+'ibm-not-wf-P71-ibm71n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P71-ibm70n01'(suite) -> [];
+'ibm-not-wf-P71-ibm70n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm70n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P69-ibm69n07'(suite) -> [];
+'ibm-not-wf-P69-ibm69n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P69-ibm69n06'(suite) -> [];
+'ibm-not-wf-P69-ibm69n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P69-ibm69n05'(suite) -> [];
+'ibm-not-wf-P69-ibm69n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P69-ibm69n04'(suite) -> [];
+'ibm-not-wf-P69-ibm69n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P69-ibm69n03'(suite) -> [];
+'ibm-not-wf-P69-ibm69n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P69-ibm69n02'(suite) -> [];
+'ibm-not-wf-P69-ibm69n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P69-ibm69n01'(suite) -> [];
+'ibm-not-wf-P69-ibm69n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P68-ibm68n10'(suite) -> [];
+'ibm-not-wf-P68-ibm68n10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P68-ibm68n09'(suite) -> [];
+'ibm-not-wf-P68-ibm68n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P68-ibm68n08'(suite) -> [];
+'ibm-not-wf-P68-ibm68n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P68-ibm68n07'(suite) -> [];
+'ibm-not-wf-P68-ibm68n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P68-ibm68n06'(suite) -> [];
+'ibm-not-wf-P68-ibm68n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P68-ibm68n05'(suite) -> [];
+'ibm-not-wf-P68-ibm68n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P68-ibm68n04'(suite) -> [];
+'ibm-not-wf-P68-ibm68n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P68-ibm68n03'(suite) -> [];
+'ibm-not-wf-P68-ibm68n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P68-ibm68n02'(suite) -> [];
+'ibm-not-wf-P68-ibm68n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P68-ibm68n01'(suite) -> [];
+'ibm-not-wf-P68-ibm68n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n15'(suite) -> [];
+'ibm-not-wf-P66-ibm66n15'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n15.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n14'(suite) -> [];
+'ibm-not-wf-P66-ibm66n14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n13'(suite) -> [];
+'ibm-not-wf-P66-ibm66n13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n12'(suite) -> [];
+'ibm-not-wf-P66-ibm66n12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n11'(suite) -> [];
+'ibm-not-wf-P66-ibm66n11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n10'(suite) -> [];
+'ibm-not-wf-P66-ibm66n10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n09'(suite) -> [];
+'ibm-not-wf-P66-ibm66n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n08'(suite) -> [];
+'ibm-not-wf-P66-ibm66n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n07'(suite) -> [];
+'ibm-not-wf-P66-ibm66n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n06'(suite) -> [];
+'ibm-not-wf-P66-ibm66n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n05'(suite) -> [];
+'ibm-not-wf-P66-ibm66n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n04'(suite) -> [];
+'ibm-not-wf-P66-ibm66n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n03'(suite) -> [];
+'ibm-not-wf-P66-ibm66n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n02'(suite) -> [];
+'ibm-not-wf-P66-ibm66n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P66-ibm66n01'(suite) -> [];
+'ibm-not-wf-P66-ibm66n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P65-ibm65n02'(suite) -> [];
+'ibm-not-wf-P65-ibm65n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P65-ibm65n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P65-ibm65n01'(suite) -> [];
+'ibm-not-wf-P65-ibm65n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P65-ibm65n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P64-ibm64n03'(suite) -> [];
+'ibm-not-wf-P64-ibm64n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P64-ibm64n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P64-ibm64n02'(suite) -> [];
+'ibm-not-wf-P64-ibm64n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P64-ibm64n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P64-ibm64n01'(suite) -> [];
+'ibm-not-wf-P64-ibm64n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P64-ibm64n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P63-ibm63n07'(suite) -> [];
+'ibm-not-wf-P63-ibm63n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P63-ibm63n06'(suite) -> [];
+'ibm-not-wf-P63-ibm63n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P63-ibm63n05'(suite) -> [];
+'ibm-not-wf-P63-ibm63n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P63-ibm63n04'(suite) -> [];
+'ibm-not-wf-P63-ibm63n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P63-ibm63n03'(suite) -> [];
+'ibm-not-wf-P63-ibm63n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P63-ibm63n02'(suite) -> [];
+'ibm-not-wf-P63-ibm63n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P63-ibm63n01'(suite) -> [];
+'ibm-not-wf-P63-ibm63n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P62-ibm62n08'(suite) -> [];
+'ibm-not-wf-P62-ibm62n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P62-ibm62n07'(suite) -> [];
+'ibm-not-wf-P62-ibm62n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P62-ibm62n06'(suite) -> [];
+'ibm-not-wf-P62-ibm62n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P62-ibm62n05'(suite) -> [];
+'ibm-not-wf-P62-ibm62n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P62-ibm62n04'(suite) -> [];
+'ibm-not-wf-P62-ibm62n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P62-ibm62n03'(suite) -> [];
+'ibm-not-wf-P62-ibm62n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P62-ibm62n02'(suite) -> [];
+'ibm-not-wf-P62-ibm62n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P62-ibm62n01'(suite) -> [];
+'ibm-not-wf-P62-ibm62n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P61-ibm61n01'(suite) -> [];
+'ibm-not-wf-P61-ibm61n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P61-ibm61n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P60-ibm60n08'(suite) -> [];
+'ibm-not-wf-P60-ibm60n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P60-ibm60n07'(suite) -> [];
+'ibm-not-wf-P60-ibm60n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P60-ibm60n06'(suite) -> [];
+'ibm-not-wf-P60-ibm60n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P60-ibm60n05'(suite) -> [];
+'ibm-not-wf-P60-ibm60n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P60-ibm60n04'(suite) -> [];
+'ibm-not-wf-P60-ibm60n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P60-ibm60n03'(suite) -> [];
+'ibm-not-wf-P60-ibm60n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P60-ibm60n02'(suite) -> [];
+'ibm-not-wf-P60-ibm60n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P60-ibm60n01'(suite) -> [];
+'ibm-not-wf-P60-ibm60n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P59-ibm59n06'(suite) -> [];
+'ibm-not-wf-P59-ibm59n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P59-ibm59n05'(suite) -> [];
+'ibm-not-wf-P59-ibm59n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P59-ibm59n04'(suite) -> [];
+'ibm-not-wf-P59-ibm59n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P59-ibm59n03'(suite) -> [];
+'ibm-not-wf-P59-ibm59n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P59-ibm59n02'(suite) -> [];
+'ibm-not-wf-P59-ibm59n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P59-ibm59n01'(suite) -> [];
+'ibm-not-wf-P59-ibm59n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P58-ibm58n08'(suite) -> [];
+'ibm-not-wf-P58-ibm58n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P58-ibm58n07'(suite) -> [];
+'ibm-not-wf-P58-ibm58n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P58-ibm58n06'(suite) -> [];
+'ibm-not-wf-P58-ibm58n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P58-ibm58n05'(suite) -> [];
+'ibm-not-wf-P58-ibm58n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P58-ibm58n04'(suite) -> [];
+'ibm-not-wf-P58-ibm58n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P58-ibm58n03'(suite) -> [];
+'ibm-not-wf-P58-ibm58n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P58-ibm58n02'(suite) -> [];
+'ibm-not-wf-P58-ibm58n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P58-ibm58n01'(suite) -> [];
+'ibm-not-wf-P58-ibm58n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P57-ibm57n01'(suite) -> [];
+'ibm-not-wf-P57-ibm57n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P57-ibm57n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P56-ibm56n07'(suite) -> [];
+'ibm-not-wf-P56-ibm56n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P56-ibm56n06'(suite) -> [];
+'ibm-not-wf-P56-ibm56n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P56-ibm56n05'(suite) -> [];
+'ibm-not-wf-P56-ibm56n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P56-ibm56n04'(suite) -> [];
+'ibm-not-wf-P56-ibm56n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P56-ibm56n03'(suite) -> [];
+'ibm-not-wf-P56-ibm56n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P56-ibm56n02'(suite) -> [];
+'ibm-not-wf-P56-ibm56n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P56-ibm56n01'(suite) -> [];
+'ibm-not-wf-P56-ibm56n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P55-ibm55n03'(suite) -> [];
+'ibm-not-wf-P55-ibm55n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P55-ibm55n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P55-ibm55n02'(suite) -> [];
+'ibm-not-wf-P55-ibm55n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P55-ibm55n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P55-ibm55n01'(suite) -> [];
+'ibm-not-wf-P55-ibm55n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P55-ibm55n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P54-ibm54n02'(suite) -> [];
+'ibm-not-wf-P54-ibm54n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P54-ibm54n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P54-ibm54n01'(suite) -> [];
+'ibm-not-wf-P54-ibm54n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P54-ibm54n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P53-ibm53n08'(suite) -> [];
+'ibm-not-wf-P53-ibm53n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P53-ibm53n07'(suite) -> [];
+'ibm-not-wf-P53-ibm53n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P53-ibm53n06'(suite) -> [];
+'ibm-not-wf-P53-ibm53n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P53-ibm53n05'(suite) -> [];
+'ibm-not-wf-P53-ibm53n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P53-ibm53n04'(suite) -> [];
+'ibm-not-wf-P53-ibm53n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P53-ibm53n03'(suite) -> [];
+'ibm-not-wf-P53-ibm53n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P53-ibm53n02'(suite) -> [];
+'ibm-not-wf-P53-ibm53n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P53-ibm53n01'(suite) -> [];
+'ibm-not-wf-P53-ibm53n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P52-ibm52n06'(suite) -> [];
+'ibm-not-wf-P52-ibm52n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P52-ibm52n05'(suite) -> [];
+'ibm-not-wf-P52-ibm52n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P52-ibm52n04'(suite) -> [];
+'ibm-not-wf-P52-ibm52n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P52-ibm52n03'(suite) -> [];
+'ibm-not-wf-P52-ibm52n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P52-ibm52n02'(suite) -> [];
+'ibm-not-wf-P52-ibm52n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P52-ibm52n01'(suite) -> [];
+'ibm-not-wf-P52-ibm52n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P51-ibm51n07'(suite) -> [];
+'ibm-not-wf-P51-ibm51n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P51-ibm51n06'(suite) -> [];
+'ibm-not-wf-P51-ibm51n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P51-ibm51n05'(suite) -> [];
+'ibm-not-wf-P51-ibm51n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P51-ibm51n04'(suite) -> [];
+'ibm-not-wf-P51-ibm51n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P51-ibm51n03'(suite) -> [];
+'ibm-not-wf-P51-ibm51n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P51-ibm51n02'(suite) -> [];
+'ibm-not-wf-P51-ibm51n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P51-ibm51n01'(suite) -> [];
+'ibm-not-wf-P51-ibm51n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P50-ibm50n07'(suite) -> [];
+'ibm-not-wf-P50-ibm50n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P50-ibm50n06'(suite) -> [];
+'ibm-not-wf-P50-ibm50n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P50-ibm50n05'(suite) -> [];
+'ibm-not-wf-P50-ibm50n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P50-ibm50n04'(suite) -> [];
+'ibm-not-wf-P50-ibm50n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P50-ibm50n03'(suite) -> [];
+'ibm-not-wf-P50-ibm50n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P50-ibm50n02'(suite) -> [];
+'ibm-not-wf-P50-ibm50n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P50-ibm50n01'(suite) -> [];
+'ibm-not-wf-P50-ibm50n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P49-ibm49n06'(suite) -> [];
+'ibm-not-wf-P49-ibm49n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P49-ibm49n05'(suite) -> [];
+'ibm-not-wf-P49-ibm49n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P49-ibm49n04'(suite) -> [];
+'ibm-not-wf-P49-ibm49n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P49-ibm49n03'(suite) -> [];
+'ibm-not-wf-P49-ibm49n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P49-ibm49n02'(suite) -> [];
+'ibm-not-wf-P49-ibm49n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P49-ibm49n01'(suite) -> [];
+'ibm-not-wf-P49-ibm49n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P48-ibm48n07'(suite) -> [];
+'ibm-not-wf-P48-ibm48n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P48-ibm48n06'(suite) -> [];
+'ibm-not-wf-P48-ibm48n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P48-ibm48n05'(suite) -> [];
+'ibm-not-wf-P48-ibm48n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P48-ibm48n04'(suite) -> [];
+'ibm-not-wf-P48-ibm48n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P48-ibm48n03'(suite) -> [];
+'ibm-not-wf-P48-ibm48n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P48-ibm48n02'(suite) -> [];
+'ibm-not-wf-P48-ibm48n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P48-ibm48n01'(suite) -> [];
+'ibm-not-wf-P48-ibm48n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P47-ibm47n06'(suite) -> [];
+'ibm-not-wf-P47-ibm47n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P47-ibm47n05'(suite) -> [];
+'ibm-not-wf-P47-ibm47n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P47-ibm47n04'(suite) -> [];
+'ibm-not-wf-P47-ibm47n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P47-ibm47n03'(suite) -> [];
+'ibm-not-wf-P47-ibm47n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P47-ibm47n02'(suite) -> [];
+'ibm-not-wf-P47-ibm47n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P47-ibm47n01'(suite) -> [];
+'ibm-not-wf-P47-ibm47n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P46-ibm46n05'(suite) -> [];
+'ibm-not-wf-P46-ibm46n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P46-ibm46n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P46-ibm46n04'(suite) -> [];
+'ibm-not-wf-P46-ibm46n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P46-ibm46n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P46-ibm46n03'(suite) -> [];
+'ibm-not-wf-P46-ibm46n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P46-ibm46n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P46-ibm46n02'(suite) -> [];
+'ibm-not-wf-P46-ibm46n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P46-ibm46n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P46-ibm46n01'(suite) -> [];
+'ibm-not-wf-P46-ibm46n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P46-ibm46n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P45-ibm45n09'(suite) -> [];
+'ibm-not-wf-P45-ibm45n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P45-ibm45n08'(suite) -> [];
+'ibm-not-wf-P45-ibm45n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P45-ibm45n07'(suite) -> [];
+'ibm-not-wf-P45-ibm45n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P45-ibm45n06'(suite) -> [];
+'ibm-not-wf-P45-ibm45n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P45-ibm45n05'(suite) -> [];
+'ibm-not-wf-P45-ibm45n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P45-ibm45n04'(suite) -> [];
+'ibm-not-wf-P45-ibm45n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P45-ibm45n03'(suite) -> [];
+'ibm-not-wf-P45-ibm45n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P45-ibm45n02'(suite) -> [];
+'ibm-not-wf-P45-ibm45n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P45-ibm45n01'(suite) -> [];
+'ibm-not-wf-P45-ibm45n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P44-ibm44n04'(suite) -> [];
+'ibm-not-wf-P44-ibm44n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P44-ibm44n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P44-ibm44n03'(suite) -> [];
+'ibm-not-wf-P44-ibm44n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P44-ibm44n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P44-ibm44n02'(suite) -> [];
+'ibm-not-wf-P44-ibm44n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P44-ibm44n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P44-ibm44n01'(suite) -> [];
+'ibm-not-wf-P44-ibm44n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P44-ibm44n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P43-ibm43n05'(suite) -> [];
+'ibm-not-wf-P43-ibm43n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P43-ibm43n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P43-ibm43n04'(suite) -> [];
+'ibm-not-wf-P43-ibm43n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P43-ibm43n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P43-ibm43n02'(suite) -> [];
+'ibm-not-wf-P43-ibm43n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P43-ibm43n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P43-ibm43n01'(suite) -> [];
+'ibm-not-wf-P43-ibm43n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P43-ibm43n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P42-ibm42n05'(suite) -> [];
+'ibm-not-wf-P42-ibm42n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P42-ibm42n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P42-ibm42n04'(suite) -> [];
+'ibm-not-wf-P42-ibm42n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P42-ibm42n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P42-ibm42n03'(suite) -> [];
+'ibm-not-wf-P42-ibm42n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P42-ibm42n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P42-ibm42n02'(suite) -> [];
+'ibm-not-wf-P42-ibm42n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P42-ibm42n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P42-ibm42n01'(suite) -> [];
+'ibm-not-wf-P42-ibm42n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P42-ibm42n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n14'(suite) -> [];
+'ibm-not-wf-P41-ibm41n14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n13'(suite) -> [];
+'ibm-not-wf-P41-ibm41n13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n12'(suite) -> [];
+'ibm-not-wf-P41-ibm41n12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n11'(suite) -> [];
+'ibm-not-wf-P41-ibm41n11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n10'(suite) -> [];
+'ibm-not-wf-P41-ibm41n10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n09'(suite) -> [];
+'ibm-not-wf-P41-ibm41n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n08'(suite) -> [];
+'ibm-not-wf-P41-ibm41n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n07'(suite) -> [];
+'ibm-not-wf-P41-ibm41n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n06'(suite) -> [];
+'ibm-not-wf-P41-ibm41n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n05'(suite) -> [];
+'ibm-not-wf-P41-ibm41n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n04'(suite) -> [];
+'ibm-not-wf-P41-ibm41n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n03'(suite) -> [];
+'ibm-not-wf-P41-ibm41n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n02'(suite) -> [];
+'ibm-not-wf-P41-ibm41n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P41-ibm41n01'(suite) -> [];
+'ibm-not-wf-P41-ibm41n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P40-ibm40n05'(suite) -> [];
+'ibm-not-wf-P40-ibm40n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P40-ibm40n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P40-ibm40n04'(suite) -> [];
+'ibm-not-wf-P40-ibm40n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P40-ibm40n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P40-ibm40n03'(suite) -> [];
+'ibm-not-wf-P40-ibm40n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P40-ibm40n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P40-ibm40n02'(suite) -> [];
+'ibm-not-wf-P40-ibm40n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P40-ibm40n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P40-ibm40n01'(suite) -> [];
+'ibm-not-wf-P40-ibm40n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P40-ibm40n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P39-ibm39n06'(suite) -> [];
+'ibm-not-wf-P39-ibm39n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P39-ibm39n05'(suite) -> [];
+'ibm-not-wf-P39-ibm39n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P39-ibm39n04'(suite) -> [];
+'ibm-not-wf-P39-ibm39n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P39-ibm39n03'(suite) -> [];
+'ibm-not-wf-P39-ibm39n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P39-ibm39n02'(suite) -> [];
+'ibm-not-wf-P39-ibm39n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P39-ibm39n01'(suite) -> [];
+'ibm-not-wf-P39-ibm39n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P32-ibm32n09'(suite) -> [];
+'ibm-not-wf-P32-ibm32n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P32-ibm32n08'(suite) -> [];
+'ibm-not-wf-P32-ibm32n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P32-ibm32n07'(suite) -> [];
+'ibm-not-wf-P32-ibm32n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P32-ibm32n06'(suite) -> [];
+'ibm-not-wf-P32-ibm32n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P32-ibm32n05'(suite) -> [];
+'ibm-not-wf-P32-ibm32n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P32-ibm32n04'(suite) -> [];
+'ibm-not-wf-P32-ibm32n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P32-ibm32n03'(suite) -> [];
+'ibm-not-wf-P32-ibm32n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P32-ibm32n02'(suite) -> [];
+'ibm-not-wf-P32-ibm32n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P32-ibm32n01'(suite) -> [];
+'ibm-not-wf-P32-ibm32n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P31-ibm31n01'(suite) -> [];
+'ibm-not-wf-P31-ibm31n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P31-ibm31n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P30-ibm30n01'(suite) -> [];
+'ibm-not-wf-P30-ibm30n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P30-ibm30n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P29-ibm29n07'(suite) -> [];
+'ibm-not-wf-P29-ibm29n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P29-ibm29n06'(suite) -> [];
+'ibm-not-wf-P29-ibm29n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P29-ibm29n05'(suite) -> [];
+'ibm-not-wf-P29-ibm29n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P29-ibm29n04'(suite) -> [];
+'ibm-not-wf-P29-ibm29n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P29-ibm29n03'(suite) -> [];
+'ibm-not-wf-P29-ibm29n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P29-ibm29n02'(suite) -> [];
+'ibm-not-wf-P29-ibm29n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P29-ibm29n01'(suite) -> [];
+'ibm-not-wf-P29-ibm29n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P28a-ibm28an01'(suite) -> [];
+'ibm-not-wf-P28a-ibm28an01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28a-ibm28an01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P28-ibm28n08'(suite) -> [];
+'ibm-not-wf-P28-ibm28n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P28-ibm28n07'(suite) -> [];
+'ibm-not-wf-P28-ibm28n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P28-ibm28n06'(suite) -> [];
+'ibm-not-wf-P28-ibm28n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P28-ibm28n05'(suite) -> [];
+'ibm-not-wf-P28-ibm28n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P28-ibm28n04'(suite) -> [];
+'ibm-not-wf-P28-ibm28n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P28-ibm28n03'(suite) -> [];
+'ibm-not-wf-P28-ibm28n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P28-ibm28n02'(suite) -> [];
+'ibm-not-wf-P28-ibm28n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P28-ibm28n01'(suite) -> [];
+'ibm-not-wf-P28-ibm28n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P27-ibm27n01'(suite) -> [];
+'ibm-not-wf-P27-ibm27n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P27-ibm27n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P26-ibm26n01'(suite) -> [];
+'ibm-not-wf-P26-ibm26n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P26-ibm26n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P25-ibm25n02'(suite) -> [];
+'ibm-not-wf-P25-ibm25n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P25-ibm25n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P25-ibm25n01'(suite) -> [];
+'ibm-not-wf-P25-ibm25n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P25-ibm25n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P24-ibm24n09'(suite) -> [];
+'ibm-not-wf-P24-ibm24n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P24-ibm24n08'(suite) -> [];
+'ibm-not-wf-P24-ibm24n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P24-ibm24n07'(suite) -> [];
+'ibm-not-wf-P24-ibm24n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P24-ibm24n06'(suite) -> [];
+'ibm-not-wf-P24-ibm24n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P24-ibm24n05'(suite) -> [];
+'ibm-not-wf-P24-ibm24n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P24-ibm24n04'(suite) -> [];
+'ibm-not-wf-P24-ibm24n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P24-ibm24n03'(suite) -> [];
+'ibm-not-wf-P24-ibm24n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P24-ibm24n02'(suite) -> [];
+'ibm-not-wf-P24-ibm24n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P24-ibm24n01'(suite) -> [];
+'ibm-not-wf-P24-ibm24n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P23-ibm23n06'(suite) -> [];
+'ibm-not-wf-P23-ibm23n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P23-ibm23n05'(suite) -> [];
+'ibm-not-wf-P23-ibm23n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P23-ibm23n04'(suite) -> [];
+'ibm-not-wf-P23-ibm23n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P23-ibm23n03'(suite) -> [];
+'ibm-not-wf-P23-ibm23n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P23-ibm23n02'(suite) -> [];
+'ibm-not-wf-P23-ibm23n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P23-ibm23n01'(suite) -> [];
+'ibm-not-wf-P23-ibm23n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P22-ibm22n03'(suite) -> [];
+'ibm-not-wf-P22-ibm22n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P22-ibm22n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P22-ibm22n02'(suite) -> [];
+'ibm-not-wf-P22-ibm22n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P22-ibm22n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P22-ibm22n01'(suite) -> [];
+'ibm-not-wf-P22-ibm22n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P22-ibm22n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P21-ibm21n03'(suite) -> [];
+'ibm-not-wf-P21-ibm21n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P21-ibm21n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P21-ibm21n02'(suite) -> [];
+'ibm-not-wf-P21-ibm21n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P21-ibm21n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P21-ibm21n01'(suite) -> [];
+'ibm-not-wf-P21-ibm21n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P21-ibm21n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P20-ibm20n01'(suite) -> [];
+'ibm-not-wf-P20-ibm20n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P20-ibm20n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P19-ibm19n03'(suite) -> [];
+'ibm-not-wf-P19-ibm19n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P19-ibm19n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P19-ibm19n02'(suite) -> [];
+'ibm-not-wf-P19-ibm19n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P19-ibm19n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P19-ibm19n01'(suite) -> [];
+'ibm-not-wf-P19-ibm19n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P19-ibm19n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P18-ibm18n02'(suite) -> [];
+'ibm-not-wf-P18-ibm18n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P18-ibm18n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P18-ibm18n01'(suite) -> [];
+'ibm-not-wf-P18-ibm18n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P18-ibm18n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P17-ibm17n04'(suite) -> [];
+'ibm-not-wf-P17-ibm17n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P17-ibm17n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P17-ibm17n03'(suite) -> [];
+'ibm-not-wf-P17-ibm17n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P17-ibm17n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P17-ibm17n02'(suite) -> [];
+'ibm-not-wf-P17-ibm17n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P17-ibm17n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P17-ibm17n01'(suite) -> [];
+'ibm-not-wf-P17-ibm17n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P17-ibm17n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P16-ibm16n04'(suite) -> [];
+'ibm-not-wf-P16-ibm16n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P16-ibm16n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P16-ibm16n03'(suite) -> [];
+'ibm-not-wf-P16-ibm16n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P16-ibm16n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P16-ibm16n02'(suite) -> [];
+'ibm-not-wf-P16-ibm16n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P16-ibm16n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P16-ibm16n01'(suite) -> [];
+'ibm-not-wf-P16-ibm16n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P16-ibm16n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P15-ibm15n04'(suite) -> [];
+'ibm-not-wf-P15-ibm15n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P15-ibm15n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P15-ibm15n03'(suite) -> [];
+'ibm-not-wf-P15-ibm15n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P15-ibm15n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P15-ibm15n02'(suite) -> [];
+'ibm-not-wf-P15-ibm15n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P15-ibm15n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P15-ibm15n01'(suite) -> [];
+'ibm-not-wf-P15-ibm15n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P15-ibm15n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P14-ibm14n03'(suite) -> [];
+'ibm-not-wf-P14-ibm14n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P14-ibm14n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P14-ibm14n02'(suite) -> [];
+'ibm-not-wf-P14-ibm14n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P14-ibm14n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P14-ibm14n01'(suite) -> [];
+'ibm-not-wf-P14-ibm14n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P14-ibm14n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P13-ibm13n03'(suite) -> [];
+'ibm-not-wf-P13-ibm13n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P13-ibm13n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P13-ibm13n02'(suite) -> [];
+'ibm-not-wf-P13-ibm13n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P13-ibm13n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P13-ibm13n01'(suite) -> [];
+'ibm-not-wf-P13-ibm13n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P13-ibm13n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P12-ibm12n03'(suite) -> [];
+'ibm-not-wf-P12-ibm12n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P12-ibm12n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P12-ibm12n02'(suite) -> [];
+'ibm-not-wf-P12-ibm12n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P12-ibm12n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P12-ibm12n01'(suite) -> [];
+'ibm-not-wf-P12-ibm12n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P12-ibm12n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P11-ibm11n04'(suite) -> [];
+'ibm-not-wf-P11-ibm11n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P11-ibm11n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P11-ibm11n03'(suite) -> [];
+'ibm-not-wf-P11-ibm11n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P11-ibm11n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P11-ibm11n02'(suite) -> [];
+'ibm-not-wf-P11-ibm11n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P11-ibm11n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P11-ibm11n01'(suite) -> [];
+'ibm-not-wf-P11-ibm11n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P11-ibm11n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P10-ibm10n08'(suite) -> [];
+'ibm-not-wf-P10-ibm10n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P10-ibm10n07'(suite) -> [];
+'ibm-not-wf-P10-ibm10n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P10-ibm10n06'(suite) -> [];
+'ibm-not-wf-P10-ibm10n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P10-ibm10n05'(suite) -> [];
+'ibm-not-wf-P10-ibm10n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P10-ibm10n04'(suite) -> [];
+'ibm-not-wf-P10-ibm10n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P10-ibm10n03'(suite) -> [];
+'ibm-not-wf-P10-ibm10n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P10-ibm10n02'(suite) -> [];
+'ibm-not-wf-P10-ibm10n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P10-ibm10n01'(suite) -> [];
+'ibm-not-wf-P10-ibm10n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P09-ibm09n04'(suite) -> [];
+'ibm-not-wf-P09-ibm09n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P09-ibm09n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P09-ibm09n03'(suite) -> [];
+'ibm-not-wf-P09-ibm09n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P09-ibm09n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P09-ibm09n02'(suite) -> [];
+'ibm-not-wf-P09-ibm09n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P09-ibm09n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P09-ibm09n01'(suite) -> [];
+'ibm-not-wf-P09-ibm09n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P09-ibm09n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P05-ibm05n03'(suite) -> [];
+'ibm-not-wf-P05-ibm05n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P05-ibm05n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P05-ibm05n02'(suite) -> [];
+'ibm-not-wf-P05-ibm05n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P05-ibm05n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P05-ibm05n01'(suite) -> [];
+'ibm-not-wf-P05-ibm05n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P05-ibm05n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n18'(suite) -> [];
+'ibm-not-wf-P04-ibm04n18'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n18.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n17'(suite) -> [];
+'ibm-not-wf-P04-ibm04n17'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n17.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n16'(suite) -> [];
+'ibm-not-wf-P04-ibm04n16'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n16.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n15'(suite) -> [];
+'ibm-not-wf-P04-ibm04n15'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n15.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n14'(suite) -> [];
+'ibm-not-wf-P04-ibm04n14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n13'(suite) -> [];
+'ibm-not-wf-P04-ibm04n13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n12'(suite) -> [];
+'ibm-not-wf-P04-ibm04n12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n11'(suite) -> [];
+'ibm-not-wf-P04-ibm04n11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n10'(suite) -> [];
+'ibm-not-wf-P04-ibm04n10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n09'(suite) -> [];
+'ibm-not-wf-P04-ibm04n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n08'(suite) -> [];
+'ibm-not-wf-P04-ibm04n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n07'(suite) -> [];
+'ibm-not-wf-P04-ibm04n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n06'(suite) -> [];
+'ibm-not-wf-P04-ibm04n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n05'(suite) -> [];
+'ibm-not-wf-P04-ibm04n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n04'(suite) -> [];
+'ibm-not-wf-P04-ibm04n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n03'(suite) -> [];
+'ibm-not-wf-P04-ibm04n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n02'(suite) -> [];
+'ibm-not-wf-P04-ibm04n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P04-ibm04n01'(suite) -> [];
+'ibm-not-wf-P04-ibm04n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P03-ibm03n01'(suite) -> [];
+'ibm-not-wf-P03-ibm03n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P03-ibm03n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n33'(suite) -> [];
+'ibm-not-wf-P02-ibm02n33'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n33.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n32'(suite) -> [];
+'ibm-not-wf-P02-ibm02n32'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n32.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n31'(suite) -> [];
+'ibm-not-wf-P02-ibm02n31'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n31.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n30'(suite) -> [];
+'ibm-not-wf-P02-ibm02n30'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n30.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n29'(suite) -> [];
+'ibm-not-wf-P02-ibm02n29'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n29.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n28'(suite) -> [];
+'ibm-not-wf-P02-ibm02n28'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n28.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n27'(suite) -> [];
+'ibm-not-wf-P02-ibm02n27'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n27.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n26'(suite) -> [];
+'ibm-not-wf-P02-ibm02n26'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n26.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n25'(suite) -> [];
+'ibm-not-wf-P02-ibm02n25'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n25.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n24'(suite) -> [];
+'ibm-not-wf-P02-ibm02n24'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n24.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n23'(suite) -> [];
+'ibm-not-wf-P02-ibm02n23'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n23.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n22'(suite) -> [];
+'ibm-not-wf-P02-ibm02n22'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n22.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n21'(suite) -> [];
+'ibm-not-wf-P02-ibm02n21'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n21.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n20'(suite) -> [];
+'ibm-not-wf-P02-ibm02n20'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n20.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n19'(suite) -> [];
+'ibm-not-wf-P02-ibm02n19'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n19.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n18'(suite) -> [];
+'ibm-not-wf-P02-ibm02n18'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n18.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n17'(suite) -> [];
+'ibm-not-wf-P02-ibm02n17'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n17.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n16'(suite) -> [];
+'ibm-not-wf-P02-ibm02n16'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n16.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n15'(suite) -> [];
+'ibm-not-wf-P02-ibm02n15'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n15.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n14'(suite) -> [];
+'ibm-not-wf-P02-ibm02n14'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n14.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n13'(suite) -> [];
+'ibm-not-wf-P02-ibm02n13'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n13.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n12'(suite) -> [];
+'ibm-not-wf-P02-ibm02n12'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n12.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n11'(suite) -> [];
+'ibm-not-wf-P02-ibm02n11'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n11.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n10'(suite) -> [];
+'ibm-not-wf-P02-ibm02n10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n09'(suite) -> [];
+'ibm-not-wf-P02-ibm02n09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n08'(suite) -> [];
+'ibm-not-wf-P02-ibm02n08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n07'(suite) -> [];
+'ibm-not-wf-P02-ibm02n07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n06'(suite) -> [];
+'ibm-not-wf-P02-ibm02n06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n05'(suite) -> [];
+'ibm-not-wf-P02-ibm02n05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n04'(suite) -> [];
+'ibm-not-wf-P02-ibm02n04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n03'(suite) -> [];
+'ibm-not-wf-P02-ibm02n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n02'(suite) -> [];
+'ibm-not-wf-P02-ibm02n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P02-ibm02n01'(suite) -> [];
+'ibm-not-wf-P02-ibm02n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P01-ibm01n03'(suite) -> [];
+'ibm-not-wf-P01-ibm01n03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P01-ibm01n03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P01-ibm01n02'(suite) -> [];
+'ibm-not-wf-P01-ibm01n02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P01-ibm01n02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-not-wf-P01-ibm01n01'(suite) -> [];
+'ibm-not-wf-P01-ibm01n01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P01-ibm01n01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+%%----------------------------------------------------------------------
+
+'ibm-valid-P89-ibm89v01'(suite) -> [];
+'ibm-valid-P89-ibm89v01'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P89-ibm89v01.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
+
+'ibm-valid-P88-ibm88v01'(suite) -> [];
+'ibm-valid-P88-ibm88v01'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P88-ibm88v01.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
+
+'ibm-valid-P87-ibm87v01'(suite) -> [];
+'ibm-valid-P87-ibm87v01'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P87-ibm87v01.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
+
+'ibm-valid-P86-ibm86v01'(suite) -> [];
+'ibm-valid-P86-ibm86v01'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P86-ibm86v01.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
+
+'ibm-valid-P85-ibm85v01'(suite) -> [];
+'ibm-valid-P85-ibm85v01'(_Config) ->
+%   ?line file:set_cwd(?config(data_dir,Config)),
+%   ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P85-ibm85v01.xml"]),[]),
+%   ?line xmerl:export([A],xmerl_test).
+    {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
+
+'ibm-valid-P82-ibm82v01'(suite) -> [];
+'ibm-valid-P82-ibm82v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P82-ibm82v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P79-ibm79v01'(suite) -> [];
+'ibm-valid-P79-ibm79v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P79-ibm79v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P78-ibm78v01'(suite) -> [];
+'ibm-valid-P78-ibm78v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P78-ibm78v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P70-ibm70v01'(suite) -> [];
+'ibm-valid-P70-ibm70v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P70-ibm70v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P69-ibm69v02'(suite) -> [];
+'ibm-valid-P69-ibm69v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P69-ibm69v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P69-ibm69v01'(suite) -> [];
+'ibm-valid-P69-ibm69v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P69-ibm69v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P68-ibm68v02'(suite) -> [];
+'ibm-valid-P68-ibm68v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P68-ibm68v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P68-ibm68v01'(suite) -> [];
+'ibm-valid-P68-ibm68v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P68-ibm68v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P67-ibm67v01'(suite) -> [];
+'ibm-valid-P67-ibm67v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P67-ibm67v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P66-ibm66v01'(suite) -> [];
+'ibm-valid-P66-ibm66v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P66-ibm66v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P65-ibm65v02'(suite) -> [];
+'ibm-valid-P65-ibm65v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P65-ibm65v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P65-ibm65v01'(suite) -> [];
+'ibm-valid-P65-ibm65v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P65-ibm65v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P64-ibm64v03'(suite) -> [];
+'ibm-valid-P64-ibm64v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P64-ibm64v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P64-ibm64v02'(suite) -> [];
+'ibm-valid-P64-ibm64v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P64-ibm64v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P64-ibm64v01'(suite) -> [];
+'ibm-valid-P64-ibm64v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P64-ibm64v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P63-ibm63v05'(suite) -> [];
+'ibm-valid-P63-ibm63v05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P63-ibm63v05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P63-ibm63v04'(suite) -> [];
+'ibm-valid-P63-ibm63v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P63-ibm63v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P63-ibm63v03'(suite) -> [];
+'ibm-valid-P63-ibm63v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P63-ibm63v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P63-ibm63v02'(suite) -> [];
+'ibm-valid-P63-ibm63v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P63-ibm63v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P63-ibm63v01'(suite) -> [];
+'ibm-valid-P63-ibm63v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P63-ibm63v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P62-ibm62v05'(suite) -> [];
+'ibm-valid-P62-ibm62v05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P62-ibm62v05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P62-ibm62v04'(suite) -> [];
+'ibm-valid-P62-ibm62v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P62-ibm62v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P62-ibm62v03'(suite) -> [];
+'ibm-valid-P62-ibm62v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P62-ibm62v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P62-ibm62v02'(suite) -> [];
+'ibm-valid-P62-ibm62v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P62-ibm62v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P62-ibm62v01'(suite) -> [];
+'ibm-valid-P62-ibm62v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P62-ibm62v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P61-ibm61v02'(suite) -> [];
+'ibm-valid-P61-ibm61v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P61-ibm61v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P61-ibm61v01'(suite) -> [];
+'ibm-valid-P61-ibm61v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P61-ibm61v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P60-ibm60v04'(suite) -> [];
+'ibm-valid-P60-ibm60v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P60-ibm60v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P60-ibm60v03'(suite) -> [];
+'ibm-valid-P60-ibm60v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P60-ibm60v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P60-ibm60v02'(suite) -> [];
+'ibm-valid-P60-ibm60v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P60-ibm60v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P60-ibm60v01'(suite) -> [];
+'ibm-valid-P60-ibm60v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P60-ibm60v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P59-ibm59v02'(suite) -> [];
+'ibm-valid-P59-ibm59v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P59-ibm59v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P59-ibm59v01'(suite) -> [];
+'ibm-valid-P59-ibm59v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P59-ibm59v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P58-ibm58v02'(suite) -> [];
+'ibm-valid-P58-ibm58v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P58-ibm58v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P58-ibm58v01'(suite) -> [];
+'ibm-valid-P58-ibm58v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P58-ibm58v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P57-ibm57v01'(suite) -> [];
+'ibm-valid-P57-ibm57v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P57-ibm57v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P56-ibm56v10'(suite) -> [];
+'ibm-valid-P56-ibm56v10'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v10.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P56-ibm56v09'(suite) -> [];
+'ibm-valid-P56-ibm56v09'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v09.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P56-ibm56v08'(suite) -> [];
+'ibm-valid-P56-ibm56v08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P56-ibm56v07'(suite) -> [];
+'ibm-valid-P56-ibm56v07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P56-ibm56v06'(suite) -> [];
+'ibm-valid-P56-ibm56v06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P56-ibm56v05'(suite) -> [];
+'ibm-valid-P56-ibm56v05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P56-ibm56v04'(suite) -> [];
+'ibm-valid-P56-ibm56v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P56-ibm56v03'(suite) -> [];
+'ibm-valid-P56-ibm56v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P56-ibm56v02'(suite) -> [];
+'ibm-valid-P56-ibm56v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P56-ibm56v01'(suite) -> [];
+'ibm-valid-P56-ibm56v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P55-ibm55v01'(suite) -> [];
+'ibm-valid-P55-ibm55v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P55-ibm55v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P54-ibm54v03'(suite) -> [];
+'ibm-valid-P54-ibm54v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P54-ibm54v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P54-ibm54v02'(suite) -> [];
+'ibm-valid-P54-ibm54v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P54-ibm54v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P54-ibm54v01'(suite) -> [];
+'ibm-valid-P54-ibm54v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P54-ibm54v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P52-ibm52v01'(suite) -> [];
+'ibm-valid-P52-ibm52v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P52-ibm52v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P51-ibm51v02'(suite) -> [];
+'ibm-valid-P51-ibm51v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P51-ibm51v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P51-ibm51v01'(suite) -> [];
+'ibm-valid-P51-ibm51v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P51-ibm51v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P50-ibm50v01'(suite) -> [];
+'ibm-valid-P50-ibm50v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P50-ibm50v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P49-ibm49v01'(suite) -> [];
+'ibm-valid-P49-ibm49v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P49-ibm49v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P47-ibm47v01'(suite) -> [];
+'ibm-valid-P47-ibm47v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P47-ibm47v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P45-ibm45v01'(suite) -> [];
+'ibm-valid-P45-ibm45v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P45-ibm45v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P44-ibm44v01'(suite) -> [];
+'ibm-valid-P44-ibm44v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P44-ibm44v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P43-ibm43v01'(suite) -> [];
+'ibm-valid-P43-ibm43v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P43-ibm43v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P42-ibm42v01'(suite) -> [];
+'ibm-valid-P42-ibm42v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P42-ibm42v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P41-ibm41v01'(suite) -> [];
+'ibm-valid-P41-ibm41v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P41-ibm41v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P40-ibm40v01'(suite) -> [];
+'ibm-valid-P40-ibm40v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P40-ibm40v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P39-ibm39v01'(suite) -> [];
+'ibm-valid-P39-ibm39v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P39-ibm39v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P38-ibm38v01'(suite) -> [];
+'ibm-valid-P38-ibm38v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P38-ibm38v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P37-ibm37v01'(suite) -> [];
+'ibm-valid-P37-ibm37v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P37-ibm37v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P36-ibm36v01'(suite) -> [];
+'ibm-valid-P36-ibm36v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P36-ibm36v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P35-ibm35v01'(suite) -> [];
+'ibm-valid-P35-ibm35v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P35-ibm35v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P34-ibm34v01'(suite) -> [];
+'ibm-valid-P34-ibm34v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P34-ibm34v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P33-ibm33v01'(suite) -> [];
+'ibm-valid-P33-ibm33v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P33-ibm33v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P32-ibm32v04'(suite) -> [];
+'ibm-valid-P32-ibm32v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P32-ibm32v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P32-ibm32v03'(suite) -> [];
+'ibm-valid-P32-ibm32v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P32-ibm32v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P32-ibm32v02'(suite) -> [];
+'ibm-valid-P32-ibm32v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P32-ibm32v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P32-ibm32v01'(suite) -> [];
+'ibm-valid-P32-ibm32v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P32-ibm32v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P31-ibm31v01'(suite) -> [];
+'ibm-valid-P31-ibm31v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P31-ibm31v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P30-ibm30v02'(suite) -> [];
+'ibm-valid-P30-ibm30v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P30-ibm30v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P30-ibm30v01'(suite) -> [];
+'ibm-valid-P30-ibm30v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P30-ibm30v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P29-ibm29v02'(suite) -> [];
+'ibm-valid-P29-ibm29v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P29-ibm29v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P29-ibm29v01'(suite) -> [];
+'ibm-valid-P29-ibm29v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P29-ibm29v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P28-ibm28v02'(suite) -> [];
+'ibm-valid-P28-ibm28v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P28-ibm28v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P28-ibm28v01'(suite) -> [];
+'ibm-valid-P28-ibm28v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P28-ibm28v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P27-ibm27v03'(suite) -> [];
+'ibm-valid-P27-ibm27v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P27-ibm27v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P27-ibm27v02'(suite) -> [];
+'ibm-valid-P27-ibm27v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P27-ibm27v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P27-ibm27v01'(suite) -> [];
+'ibm-valid-P27-ibm27v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P27-ibm27v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P26-ibm26v01'(suite) -> [];
+'ibm-valid-P26-ibm26v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P26-ibm26v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P25-ibm25v04'(suite) -> [];
+'ibm-valid-P25-ibm25v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P25-ibm25v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P25-ibm25v03'(suite) -> [];
+'ibm-valid-P25-ibm25v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P25-ibm25v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P25-ibm25v02'(suite) -> [];
+'ibm-valid-P25-ibm25v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P25-ibm25v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P25-ibm25v01'(suite) -> [];
+'ibm-valid-P25-ibm25v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P25-ibm25v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P24-ibm24v02'(suite) -> [];
+'ibm-valid-P24-ibm24v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P24-ibm24v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P24-ibm24v01'(suite) -> [];
+'ibm-valid-P24-ibm24v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P24-ibm24v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P23-ibm23v06'(suite) -> [];
+'ibm-valid-P23-ibm23v06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P23-ibm23v05'(suite) -> [];
+'ibm-valid-P23-ibm23v05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P23-ibm23v04'(suite) -> [];
+'ibm-valid-P23-ibm23v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P23-ibm23v03'(suite) -> [];
+'ibm-valid-P23-ibm23v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P23-ibm23v02'(suite) -> [];
+'ibm-valid-P23-ibm23v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P23-ibm23v01'(suite) -> [];
+'ibm-valid-P23-ibm23v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P22-ibm22v07'(suite) -> [];
+'ibm-valid-P22-ibm22v07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P22-ibm22v06'(suite) -> [];
+'ibm-valid-P22-ibm22v06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P22-ibm22v05'(suite) -> [];
+'ibm-valid-P22-ibm22v05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P22-ibm22v04'(suite) -> [];
+'ibm-valid-P22-ibm22v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P22-ibm22v03'(suite) -> [];
+'ibm-valid-P22-ibm22v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P22-ibm22v02'(suite) -> [];
+'ibm-valid-P22-ibm22v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P22-ibm22v01'(suite) -> [];
+'ibm-valid-P22-ibm22v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P21-ibm21v01'(suite) -> [];
+'ibm-valid-P21-ibm21v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P21-ibm21v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P20-ibm20v02'(suite) -> [];
+'ibm-valid-P20-ibm20v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P20-ibm20v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P20-ibm20v01'(suite) -> [];
+'ibm-valid-P20-ibm20v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P20-ibm20v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P19-ibm19v01'(suite) -> [];
+'ibm-valid-P19-ibm19v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P19-ibm19v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P18-ibm18v01'(suite) -> [];
+'ibm-valid-P18-ibm18v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P18-ibm18v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P17-ibm17v01'(suite) -> [];
+'ibm-valid-P17-ibm17v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P17-ibm17v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P16-ibm16v03'(suite) -> [];
+'ibm-valid-P16-ibm16v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P16-ibm16v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P16-ibm16v02'(suite) -> [];
+'ibm-valid-P16-ibm16v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P16-ibm16v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P16-ibm16v01'(suite) -> [];
+'ibm-valid-P16-ibm16v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P16-ibm16v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P15-ibm15v04'(suite) -> [];
+'ibm-valid-P15-ibm15v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P15-ibm15v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P15-ibm15v03'(suite) -> [];
+'ibm-valid-P15-ibm15v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P15-ibm15v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P15-ibm15v02'(suite) -> [];
+'ibm-valid-P15-ibm15v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P15-ibm15v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P15-ibm15v01'(suite) -> [];
+'ibm-valid-P15-ibm15v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P15-ibm15v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P14-ibm14v03'(suite) -> [];
+'ibm-valid-P14-ibm14v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P14-ibm14v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P14-ibm14v02'(suite) -> [];
+'ibm-valid-P14-ibm14v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P14-ibm14v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P14-ibm14v01'(suite) -> [];
+'ibm-valid-P14-ibm14v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P14-ibm14v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P13-ibm13v01'(suite) -> [];
+'ibm-valid-P13-ibm13v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P13-ibm13v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P12-ibm12v04'(suite) -> [];
+'ibm-valid-P12-ibm12v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P12-ibm12v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P12-ibm12v03'(suite) -> [];
+'ibm-valid-P12-ibm12v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P12-ibm12v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P12-ibm12v02'(suite) -> [];
+'ibm-valid-P12-ibm12v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P12-ibm12v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P12-ibm12v01'(suite) -> [];
+'ibm-valid-P12-ibm12v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P12-ibm12v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P11-ibm11v04'(suite) -> [];
+'ibm-valid-P11-ibm11v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P11-ibm11v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P11-ibm11v03'(suite) -> [];
+'ibm-valid-P11-ibm11v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P11-ibm11v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P11-ibm11v02'(suite) -> [];
+'ibm-valid-P11-ibm11v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P11-ibm11v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P11-ibm11v01'(suite) -> [];
+'ibm-valid-P11-ibm11v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P11-ibm11v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P10-ibm10v08'(suite) -> [];
+'ibm-valid-P10-ibm10v08'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v08.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P10-ibm10v07'(suite) -> [];
+'ibm-valid-P10-ibm10v07'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v07.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P10-ibm10v06'(suite) -> [];
+'ibm-valid-P10-ibm10v06'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v06.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P10-ibm10v05'(suite) -> [];
+'ibm-valid-P10-ibm10v05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P10-ibm10v04'(suite) -> [];
+'ibm-valid-P10-ibm10v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P10-ibm10v03'(suite) -> [];
+'ibm-valid-P10-ibm10v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P10-ibm10v02'(suite) -> [];
+'ibm-valid-P10-ibm10v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P10-ibm10v01'(suite) -> [];
+'ibm-valid-P10-ibm10v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P09-ibm09v05'(suite) -> [];
+'ibm-valid-P09-ibm09v05'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P09-ibm09v05.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P09-ibm09v04'(suite) -> [];
+'ibm-valid-P09-ibm09v04'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P09-ibm09v04.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P09-ibm09v03'(suite) -> [];
+'ibm-valid-P09-ibm09v03'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P09-ibm09v03.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P09-ibm09v02'(suite) -> [];
+'ibm-valid-P09-ibm09v02'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P09-ibm09v02.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P09-ibm09v01'(suite) -> [];
+'ibm-valid-P09-ibm09v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P09-ibm09v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P03-ibm03v01'(suite) -> [];
+'ibm-valid-P03-ibm03v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P03-ibm03v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P02-ibm02v01'(suite) -> [];
+'ibm-valid-P02-ibm02v01'(Config) ->
+  ?line file:set_cwd(?config(data_dir,Config)),
+  ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P02-ibm02v01.xml"]),[]),
+  ?line xmerl:export([A],xmerl_test).
+
+'ibm-valid-P01-ibm01v01'(suite) -> [];
+'ibm-valid-P01-ibm01v01'(Config) ->
+    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P01-ibm01v01.xml"]),[]),
+    ?line xmerl:export([A],xmerl_test).
+
+
+
+%%======================================================================
+%% Support Functions
+%%======================================================================
+
+%% Dir is a directory
+rm_f_(Dir) ->
+    ?line {ok,CWD} = file:get_cwd(),
+    ?line {ok,FileList} = file:list_dir(Dir),
+    ?line file:set_cwd(filename:join([CWD,Dir])),
+    rm_files(FileList),
+    ?line file:set_cwd(CWD),
+    ? line ok = file:del_dir(Dir).
+
+rm_files([])->
+    ok;
+rm_files([F|Fs]) ->
+    case filelib:is_dir(F) of
+	true ->
+	    rm_f_(F);
+	_ ->
+	    ?line ok = file:delete(F)
+    end,
+    rm_files(Fs).
+
+-include_lib("kernel/include/file.hrl").
+change_mode(Files) ->
+    change_mode3(Files).
+change_mode2(Dir)->
+    ?line {ok,CWD} = file:get_cwd(),
+    ?line {ok,FileList} = file:list_dir(Dir),
+    ?line file:set_cwd(filename:join([CWD,Dir])),
+    change_mode3(FileList),
+    ?line file:set_cwd(CWD).
+change_mode3([]) ->
+    ok;
+change_mode3([F|Fs]) ->
+    case filelib:is_dir(F) of
+	true ->
+	    chmod(F),
+	    change_mode2(F);
+	_ ->
+	    chmod(F)
+    end,
+    change_mode3(Fs).
+    
+chmod(F) ->
+    case file:read_file_info(F) of
+	{ok,FileInfo} ->
+	    Mode= FileInfo#file_info.mode,
+	    file:write_file_info(F,FileInfo#file_info{mode=8#00777 bor Mode});
+	_ ->
+	    ok
+    end.
+    
+
+
+
+
+%%add_xml_path(TestCase) ->
+%testcase_dir(TestCase) ->
+%    add_xml_path(lists:member(TestCase,ibm_test_cases(suite)),?ibm_dir,TestCase,
+%		[{fun japanese_test_cases/1,?japanese_dir},
+%		 {fun oasis_test_cases/1,?oasis_dir},
+%		 {fun sun_test_cases/1,?sun_dir},
+%		 {fun xmltest_test_cases/1,?xmltest_dir}]).
+%add_xml_path(true,Dir,_,_) ->
+%    io:format("directory in path:~p~n",[Dir]),
+%%    ?line code:add_patha(Dir);
+%    Dir;
+%add_xml_path(_,_,TestCase,[{NextTCs,NextDir}|Rest]) ->
+%    add_xml_path(lists:member(TestCase,NextTCs(suite)),NextDir,TestCase,Rest);
+%add_xml_path(false,_,TC,[]) ->
+%    exit({error,{xmltests,uncovered_test_case,TC}}).
+
diff --git a/lib/xmerl/test/xmerl_std_SUITE_data/ibm.tgz b/lib/xmerl/test/xmerl_std_SUITE_data/ibm.tgz
new file mode 100644
index 0000000000..c36bcb5bd3
--- /dev/null
+++ b/lib/xmerl/test/xmerl_std_SUITE_data/ibm.tgz
diff --git a/lib/xmerl/test/xmerl_std_SUITE_data/japanese.tgz b/lib/xmerl/test/xmerl_std_SUITE_data/japanese.tgz
new file mode 100644
index 0000000000..cf1d71a2fd
--- /dev/null
+++ b/lib/xmerl/test/xmerl_std_SUITE_data/japanese.tgz
diff --git a/lib/xmerl/test/xmerl_std_SUITE_data/oasis.tgz b/lib/xmerl/test/xmerl_std_SUITE_data/oasis.tgz
new file mode 100644
index 0000000000..ab809a63e7
--- /dev/null
+++ b/lib/xmerl/test/xmerl_std_SUITE_data/oasis.tgz
diff --git a/lib/xmerl/test/xmerl_std_SUITE_data/sun.tgz b/lib/xmerl/test/xmerl_std_SUITE_data/sun.tgz
new file mode 100644
index 0000000000..022e64ab9e
--- /dev/null
+++ b/lib/xmerl/test/xmerl_std_SUITE_data/sun.tgz
diff --git a/lib/xmerl/test/xmerl_std_SUITE_data/w3c-copyright-19980720.html b/lib/xmerl/test/xmerl_std_SUITE_data/w3c-copyright-19980720.html
new file mode 100644
index 0000000000..bc5c62fdbc
--- /dev/null
+++ b/lib/xmerl/test/xmerl_std_SUITE_data/w3c-copyright-19980720.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
+<meta name="generator" content="HTML Tidy, see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" type="text/css" href="copyright-software-19980720_files/base.css"><title>W3C IPR SOFTWARE NOTICE</title></head><body bgcolor="#ffffff" text="#000000">
+<h1>W3C<sup>�</sup> SOFTWARE NOTICE AND LICENSE</h1>
+
+<h3>Copyright � 1994-2002 <a href="http://www.w3.org/">World
+Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of
+Technology</a>, <a href="http://www.inria.fr/">Institut National de
+Recherche en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio University</a>). All Rights
+Reserved. http://www.w3.org/Consortium/Legal/</h3>
+
+<p>This W3C work (including software, documents, or other related
+items) is being provided by the copyright holders under the
+following license. By obtaining, using and/or copying this work,
+you (the licensee) agree that you have read, understood, and will
+comply with the following terms and conditions:</p>
+
+<p>Permission to use, copy, modify, and distribute this software
+and its documentation, with or without modification,&nbsp; for any
+purpose and without fee or royalty is hereby granted, provided that
+you include the following on ALL copies of the software and
+documentation or portions thereof, including modifications, that
+you make:</p>
+
+<ol>
+<li>The full text of this NOTICE in a location viewable to users of
+the redistributed or derivative work.</li>
+
+<li>Any pre-existing intellectual property disclaimers, notices, or
+terms and conditions. If none exist, a short notice of the
+following form (hypertext is preferred, text is permitted) should
+be used within the body of any redistributed or derivative code:
+"Copyright � [$date-of-software] <a href="http://www.w3.org/">World Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of
+Technology</a>, <a href="http://www.inria.fr/">Institut National de
+Recherche en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio University</a>). All Rights
+Reserved. http://www.w3.org/Consortium/Legal/"</li>
+
+<li>Notice of any changes or modifications to the W3C files,
+including the date changes were made. (We recommend you provide
+URIs to the location from which the code is derived.)</li>
+</ol>
+
+<p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
+COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
+USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
+PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
+
+<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
+SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
+SOFTWARE OR DOCUMENTATION.</p>
+
+<p>The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without
+specific, written prior permission. Title to copyright in this
+software and any associated documentation will at all times remain
+with copyright holders.</p>
+
+<p>____________________________________</p>
+
+<p>This formulation of W3C's notice and license became active on
+August 14 1998 so as to improve compatibility with GPL. This
+version ensures that W3C software licensing terms are no more
+restrictive than GPL and consequently W3C software may be
+distributed in GPL packages. See the <a href="http://www.w3.org/Consortium/Legal/copyright-software-19980519.html">older formulation</a> for
+the policy prior to this date. Please see our <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright FAQ</a> for common questions about
+using materials from our site, including specific terms and
+conditions for packages like libwww, Amaya, and Jigsaw. Other
+questions about this notice can be directed to <a href="mailto:[email protected]">[email protected]</a>.<br>
+&nbsp;</p>
+
+<p>&nbsp;</p>
+
+<address><a href="http://www.w3.org/Help/Webmaster.html">webmaster</a><br>
+ (last updated $Date: 2002/02/13 14:08:32 $)</address>
+</body></html>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_std_SUITE_data/xmltest.tgz b/lib/xmerl/test/xmerl_std_SUITE_data/xmltest.tgz
new file mode 100644
index 0000000000..d49fe26ff0
--- /dev/null
+++ b/lib/xmerl/test/xmerl_std_SUITE_data/xmltest.tgz
diff --git a/lib/xmerl/test/xmerl_test_lib.erl b/lib/xmerl/test/xmerl_test_lib.erl
new file mode 100644
index 0000000000..16f438ca84
--- /dev/null
+++ b/lib/xmerl/test/xmerl_test_lib.erl
@@ -0,0 +1,92 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2006-2010. 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%
+%%
+%%%-------------------------------------------------------------------
+%%% File    : xmerl_test_lib.erl
+%%% Author  : Bertil Karlsson <bertil@finrod>
+%%% Description : 
+%%%
+%%% Created : 28 Apr 2006 by Bertil Karlsson <bertil@finrod>
+%%%-------------------------------------------------------------------
+-module(xmerl_test_lib).
+
+-compile(export_all).
+
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
+
+%% cmp_element/2
+%% First argument result after parsing
+%% Second argument result after validation
+cmp_element(E,E) ->
+    ok;
+cmp_element(#xmlElement{name=N,attributes=A1,content=C1},
+	    #xmlElement{name=N,attributes=A2,content=C2}) ->
+    case cmp_attributes(A1,A2) of
+	ok ->
+	    cmp_elements(C1,C2);
+	Err -> Err
+    end;
+cmp_element(#xmlText{},#xmlText{}) ->
+    ok;
+cmp_element(A,B) ->
+    {error,{A,does_not_match,B}}.
+
+cmp_elements([H1|T1],[H2|T2]) ->
+    case cmp_element(H1,H2) of
+	ok ->
+	    cmp_elements(T1,T2);
+	Err ->
+	    Err
+    end;
+cmp_elements([],[]) ->
+    ok.
+
+%% All attributes in argument 1 must be present in 2
+cmp_attributes([A1|T1],Atts2) ->
+    case keysearch_delete(A1#xmlAttribute.name,#xmlAttribute.name,Atts2) of
+	{A2,NewAtts2} ->
+	    case A1#xmlAttribute.value == A2#xmlAttribute.value of
+		true ->
+		    cmp_attributes(T1,NewAtts2);
+		_ ->
+		    {error,{mismatching_values_in_attsibutes,A1,A2}}
+	    end;
+	_ ->
+	    {error,{no_matching_attsibute,A1,in,Atts2}}
+    end;
+cmp_attributes([],_) ->
+   ok.
+
+keysearch_delete(Key,N,List) ->
+    case lists:keysearch(Key,N,List) of
+	{value,Res} ->
+	    {Res,lists:keydelete(Key,N,List)};
+	_ ->
+	    false
+    end.
+
+
+%% Some test suites use the same testdata ("xmerl_sax_std_SUITE" and "xmerl_std_SUITE"),
+%% so the data directory is not cloned. This function retrieves the path to
+%% the original data directory.
+
+get_data_dir(Config) ->
+    Data0 = ?config(data_dir, Config),
+    {ok,Data,_} = regexp:sub(Data0, "xmerl_sax_std_SUITE", "xmerl_std_SUITE"),
+    Data.
diff --git a/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE.erl b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE.erl
new file mode 100644
index 0000000000..44ec4b592d
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE.erl
@@ -0,0 +1,24131 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2006-2010. 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%
+%%
+%%
+%%% Purpose : Test suite for the xmerl application
+
+%% Do NOT edit this file. It is generated by the generate_xsd_suite module
+%% For more info read the comments in the header of that file.
+
+-module('xmerl_xsd_MS2002-01-16_SUITE').
+
+-compile(export_all).
+
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
+-include_lib("xmerl/include/xmerl_xsd.hrl").
+
+
+all() -> 
+    [att, ct, elem, group, idc_, id, mgABCD, mgEFG, mgHIJ,
+     mgK, mgLM, mgN, mgOP, mgQR, mgS, particlesAB,
+     particlesCDE, particlesFHI, particlesJ,
+     particlesKOSRTQUVW, stABCDE, stFGH, stIJK, stZ,
+     wildABCDEF, wildGHI, wildJKLMNQOP, wildZ].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+%% initialization before the test suite
+init_per_suite(Config) ->
+  Dog=test_server:timetrap({minutes,10}),
+  xmerl_xsd_lib:unpack(Config,msx),
+  {ok,LogFile} = xmerl_xsd_lib:create_error_log_file(Config,msx),
+  test_server:timetrap_cancel(Dog),
+  [{suite,msx},{xmerl_error_log,LogFile}|Config].
+
+end_per_suite(Config) ->
+  xmerl_xsd_lib:rmdir(Config,msx),
+  xmerl_xsd_lib:close_error_log_file(Config),
+  ok.
+
+%% initialization before each testcase
+init_per_testcase(TestCase,Config) ->
+  Dog=test_server:timetrap({minutes,3}),
+  [{testcase,TestCase},{watchdog, Dog}|Config].
+
+%% clean up after each testcase
+end_per_testcase(_Func,Config) ->
+  Dog=?config(watchdog, Config),
+  test_server:timetrap_cancel(Dog),
+  ok.
+
+%% Syntax Checking for Attribute Declaration
+
+att(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attA001.xsd','./msxsdtest/attribute',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attA002.xsd','./msxsdtest/attribute',invalid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attA003.xsd','./msxsdtest/attribute',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attA004.xsd','./msxsdtest/attribute',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attA005.xsd','./msxsdtest/attribute',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attA006.xsd','./msxsdtest/attribute',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attA007.xsd','./msxsdtest/attribute',valid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attA008.xsd','./msxsdtest/attribute',valid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attB001.xsd','./msxsdtest/attribute',valid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attB002.xsd','./msxsdtest/attribute',valid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attB003.xsd','./msxsdtest/attribute',valid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attB004.xsd','./msxsdtest/attribute',valid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attB005.xsd','./msxsdtest/attribute',invalid),
+  STResList13 = [STRes12|STResList12],
+
+
+  ?line {STRes13,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attB006.xsd','./msxsdtest/attribute',invalid),
+  STResList14 = [STRes13|STResList13],
+
+
+  ?line {STRes14,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attC001.xsd','./msxsdtest/attribute',valid),
+  STResList15 = [STRes14|STResList14],
+
+
+
+
+  ?line {STRes15,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attC003.xsd','./msxsdtest/attribute',valid),
+  STResList16 = [STRes15|STResList15],
+
+
+  ?line {STRes16,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attC004.xsd','./msxsdtest/attribute',invalid),
+  STResList17 = [STRes16|STResList16],
+
+
+  ?line {STRes17,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attC005.xsd','./msxsdtest/attribute',invalid),
+  STResList18 = [STRes17|STResList17],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attC006.xsd','./msxsdtest/attribute',invalid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attC007.xsd','./msxsdtest/attribute',invalid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attC008.xsd','./msxsdtest/attribute',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attC009.xsd','./msxsdtest/attribute',invalid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attC010.xsd','./msxsdtest/attribute',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attD001.xsd','./msxsdtest/attribute',valid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attD002.xsd','./msxsdtest/attribute',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attD003.xsd','./msxsdtest/attribute',valid),
+  STResList26 = [STRes25|STResList25],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attD003.xml','./msxsdtest/attribute',valid,S25),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attD004.xsd','./msxsdtest/attribute',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attD004.xml','./msxsdtest/attribute',valid,S26),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attD005.xsd','./msxsdtest/attribute',invalid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attD006.xsd','./msxsdtest/attribute',invalid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attD007.xsd','./msxsdtest/attribute',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attD007.xml','./msxsdtest/attribute',valid,S29),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attE001.xsd','./msxsdtest/attribute',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attE001.xml','./msxsdtest/attribute',valid,S30),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attE002.xsd','./msxsdtest/attribute',invalid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attE003.xsd','./msxsdtest/attribute',invalid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attE004.xsd','./msxsdtest/attribute',invalid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attE005.xsd','./msxsdtest/attribute',invalid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attE006.xsd','./msxsdtest/attribute',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attE007.xsd','./msxsdtest/attribute',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attE008.xsd','./msxsdtest/attribute',valid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,S38} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attF001.xsd','./msxsdtest/attribute',valid),
+  STResList39 = [STRes38|STResList38],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attF001.xml','./msxsdtest/attribute',invalid,S38),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes39,S39} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attF002.xsd','./msxsdtest/attribute',valid),
+  STResList40 = [STRes39|STResList39],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attF002.xml','./msxsdtest/attribute',valid,S39),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attF003.xsd','./msxsdtest/attribute',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attF003.xml','./msxsdtest/attribute',valid,S40),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attF004.xsd','./msxsdtest/attribute',invalid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attF005.xsd','./msxsdtest/attribute',invalid),
+  STResList43 = [STRes42|STResList42],
+
+
+  ?line {STRes43,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attF006.xsd','./msxsdtest/attribute',invalid),
+  STResList44 = [STRes43|STResList43],
+
+
+  ?line {STRes44,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attF007.xsd','./msxsdtest/attribute',invalid),
+  STResList45 = [STRes44|STResList44],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attF008.xsd','./msxsdtest/attribute',invalid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attF009.xsd','./msxsdtest/attribute',invalid),
+  STResList47 = [STRes46|STResList46],
+
+
+  ?line {STRes47,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attF010.xsd','./msxsdtest/attribute',invalid),
+  STResList48 = [STRes47|STResList47],
+
+
+  ?line {STRes48,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attF011.xsd','./msxsdtest/attribute',invalid),
+  STResList49 = [STRes48|STResList48],
+
+
+  ?line {STRes49,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attG001.xsd','./msxsdtest/attribute',valid),
+  STResList50 = [STRes49|STResList49],
+
+
+  ?line {STRes50,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attG002.xsd','./msxsdtest/attribute',valid),
+  STResList51 = [STRes50|STResList50],
+
+
+  ?line {STRes51,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attG003.xsd','./msxsdtest/attribute',valid),
+  STResList52 = [STRes51|STResList51],
+
+
+  ?line {STRes52,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attH001.xsd','./msxsdtest/attribute',invalid),
+  STResList53 = [STRes52|STResList52],
+
+
+  ?line {STRes53,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attI001.xsd','./msxsdtest/attribute',valid),
+  STResList54 = [STRes53|STResList53],
+
+
+  ?line {STRes54,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attI002.xsd','./msxsdtest/attribute',valid),
+  STResList55 = [STRes54|STResList54],
+
+
+  ?line {STRes55,S55} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attI003.xsd','./msxsdtest/attribute',valid),
+  STResList56 = [STRes55|STResList55],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attI003.xml','./msxsdtest/attribute',valid,S55),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attI004.xsd','./msxsdtest/attribute',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attI005.xsd','./msxsdtest/attribute',invalid),
+  STResList58 = [STRes57|STResList57],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attI006.xsd','./msxsdtest/attribute',invalid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,S59} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ001.xsd','./msxsdtest/attribute',valid),
+  STResList60 = [STRes59|STResList59],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attJ001.xml','./msxsdtest/attribute',valid,S59),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes60,S60} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ002.xsd','./msxsdtest/attribute',valid),
+  STResList61 = [STRes60|STResList60],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attJ002.xml','./msxsdtest/attribute',invalid,S60),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes61,S61} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ003.xsd','./msxsdtest/attribute',valid),
+  STResList62 = [STRes61|STResList61],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attJ003.xml','./msxsdtest/attribute',invalid,S61),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes62,S62} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ004.xsd','./msxsdtest/attribute',valid),
+  STResList63 = [STRes62|STResList62],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attJ004.xml','./msxsdtest/attribute',valid,S62),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes63,S63} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ005.xsd','./msxsdtest/attribute',valid),
+  STResList64 = [STRes63|STResList63],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attJ005.xml','./msxsdtest/attribute',valid,S63),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes64,S64} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ006.xsd','./msxsdtest/attribute',valid),
+  STResList65 = [STRes64|STResList64],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attJ006.xml','./msxsdtest/attribute',valid,S64),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes65,S65} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ007.xsd','./msxsdtest/attribute',valid),
+  STResList66 = [STRes65|STResList65],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attJ007.xml','./msxsdtest/attribute',valid,S65),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes66,S66} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ008.xsd','./msxsdtest/attribute',valid),
+  STResList67 = [STRes66|STResList66],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attJ008.xml','./msxsdtest/attribute',invalid,S66),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes67,S67} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ009.xsd','./msxsdtest/attribute',valid),
+  STResList68 = [STRes67|STResList67],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attJ009.xml','./msxsdtest/attribute',invalid,S67),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes68,S68} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ010.xsd','./msxsdtest/attribute',valid),
+  STResList69 = [STRes68|STResList68],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attJ010.xml','./msxsdtest/attribute',invalid,S68),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes69,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ011.xsd','./msxsdtest/attribute',invalid),
+  STResList70 = [STRes69|STResList69],
+
+
+  ?line {STRes70,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ012.xsd','./msxsdtest/attribute',invalid),
+  STResList71 = [STRes70|STResList70],
+
+
+  ?line {STRes71,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ013.xsd','./msxsdtest/attribute',invalid),
+  STResList72 = [STRes71|STResList71],
+
+
+  ?line {STRes72,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ014.xsd','./msxsdtest/attribute',invalid),
+  STResList73 = [STRes72|STResList72],
+
+
+  ?line {STRes73,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ015.xsd','./msxsdtest/attribute',invalid),
+  STResList74 = [STRes73|STResList73],
+
+
+  ?line {STRes74,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ016.xsd','./msxsdtest/attribute',invalid),
+  STResList75 = [STRes74|STResList74],
+
+
+  ?line {STRes75,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ017.xsd','./msxsdtest/attribute',invalid),
+  STResList76 = [STRes75|STResList75],
+
+
+  ?line {STRes76,S76} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attJ018.xsd','./msxsdtest/attribute',valid),
+  STResList77 = [STRes76|STResList76],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attJ018.xml','./msxsdtest/attribute',valid,S76),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes77,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa001.xsd','./msxsdtest/attribute',invalid),
+  STResList78 = [STRes77|STResList77],
+
+
+  ?line {STRes78,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa002.xsd','./msxsdtest/attribute',valid),
+  STResList79 = [STRes78|STResList78],
+
+
+  ?line {STRes79,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa003.xsd','./msxsdtest/attribute',invalid),
+  STResList80 = [STRes79|STResList79],
+
+
+  ?line {STRes80,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa004.xsd','./msxsdtest/attribute',invalid),
+  STResList81 = [STRes80|STResList80],
+
+
+  ?line {STRes81,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa005.xsd','./msxsdtest/attribute',invalid),
+  STResList82 = [STRes81|STResList81],
+
+
+  ?line {STRes82,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa006.xsd','./msxsdtest/attribute',valid),
+  STResList83 = [STRes82|STResList82],
+
+
+  ?line {STRes83,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa007.xsd','./msxsdtest/attribute',invalid),
+  STResList84 = [STRes83|STResList83],
+
+
+  ?line {STRes84,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa008.xsd','./msxsdtest/attribute',invalid),
+  STResList85 = [STRes84|STResList84],
+
+
+  ?line {STRes85,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa009.xsd','./msxsdtest/attribute',invalid),
+  STResList86 = [STRes85|STResList85],
+
+
+  ?line {STRes86,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa010.xsd','./msxsdtest/attribute',invalid),
+  STResList87 = [STRes86|STResList86],
+
+
+  ?line {STRes87,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa011.xsd','./msxsdtest/attribute',invalid),
+  STResList88 = [STRes87|STResList87],
+
+
+  ?line {STRes88,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa012.xsd','./msxsdtest/attribute',invalid),
+  STResList89 = [STRes88|STResList88],
+
+
+  ?line {STRes89,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa013.xsd','./msxsdtest/attribute',invalid),
+  STResList90 = [STRes89|STResList89],
+
+
+  ?line {STRes90,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa014.xsd','./msxsdtest/attribute',invalid),
+  STResList91 = [STRes90|STResList90],
+
+
+  ?line {STRes91,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKa015.xsd','./msxsdtest/attribute',invalid),
+  STResList92 = [STRes91|STResList91],
+
+
+  ?line {STRes92,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb001.xsd','./msxsdtest/attribute',invalid),
+  STResList93 = [STRes92|STResList92],
+
+
+  ?line {STRes93,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb002.xsd','./msxsdtest/attribute',valid),
+  STResList94 = [STRes93|STResList93],
+
+
+  ?line {STRes94,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb003.xsd','./msxsdtest/attribute',valid),
+  STResList95 = [STRes94|STResList94],
+
+
+  ?line {STRes95,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb004.xsd','./msxsdtest/attribute',invalid),
+  STResList96 = [STRes95|STResList95],
+
+
+  ?line {STRes96,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb005.xsd','./msxsdtest/attribute',invalid),
+  STResList97 = [STRes96|STResList96],
+
+
+  ?line {STRes97,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb006.xsd','./msxsdtest/attribute',valid),
+  STResList98 = [STRes97|STResList97],
+
+
+  ?line {STRes98,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb007.xsd','./msxsdtest/attribute',valid),
+  STResList99 = [STRes98|STResList98],
+
+
+  ?line {STRes99,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb008.xsd','./msxsdtest/attribute',valid),
+  STResList100 = [STRes99|STResList99],
+
+
+  ?line {STRes100,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb009.xsd','./msxsdtest/attribute',valid),
+  STResList101 = [STRes100|STResList100],
+
+
+  ?line {STRes101,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb010.xsd','./msxsdtest/attribute',invalid),
+  STResList102 = [STRes101|STResList101],
+
+
+  ?line {STRes102,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb011.xsd','./msxsdtest/attribute',invalid),
+  STResList103 = [STRes102|STResList102],
+
+
+  ?line {STRes103,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb012.xsd','./msxsdtest/attribute',invalid),
+  STResList104 = [STRes103|STResList103],
+
+
+  ?line {STRes104,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb013.xsd','./msxsdtest/attribute',invalid),
+  STResList105 = [STRes104|STResList104],
+
+
+  ?line {STRes105,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb014.xsd','./msxsdtest/attribute',invalid),
+  STResList106 = [STRes105|STResList105],
+
+
+  ?line {STRes106,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb015.xsd','./msxsdtest/attribute',invalid),
+  STResList107 = [STRes106|STResList106],
+
+
+  ?line {STRes107,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb016.xsd','./msxsdtest/attribute',invalid),
+  STResList108 = [STRes107|STResList107],
+
+
+  ?line {STRes108,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb017.xsd','./msxsdtest/attribute',invalid),
+  STResList109 = [STRes108|STResList108],
+
+
+  ?line {STRes109,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKb018.xsd','./msxsdtest/attribute',invalid),
+  STResList110 = [STRes109|STResList109],
+
+
+  ?line {STRes110,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc001.xsd','./msxsdtest/attribute',invalid),
+  STResList111 = [STRes110|STResList110],
+
+
+  ?line {STRes111,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc002.xsd','./msxsdtest/attribute',valid),
+  STResList112 = [STRes111|STResList111],
+
+
+  ?line {STRes112,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc003.xsd','./msxsdtest/attribute',valid),
+  STResList113 = [STRes112|STResList112],
+
+
+  ?line {STRes113,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc004.xsd','./msxsdtest/attribute',invalid),
+  STResList114 = [STRes113|STResList113],
+
+
+  ?line {STRes114,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc005.xsd','./msxsdtest/attribute',invalid),
+  STResList115 = [STRes114|STResList114],
+
+
+  ?line {STRes115,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc006.xsd','./msxsdtest/attribute',valid),
+  STResList116 = [STRes115|STResList115],
+
+
+  ?line {STRes116,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc007.xsd','./msxsdtest/attribute',valid),
+  STResList117 = [STRes116|STResList116],
+
+
+  ?line {STRes117,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc008.xsd','./msxsdtest/attribute',valid),
+  STResList118 = [STRes117|STResList117],
+
+
+  ?line {STRes118,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc009.xsd','./msxsdtest/attribute',valid),
+  STResList119 = [STRes118|STResList118],
+
+
+  ?line {STRes119,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc010.xsd','./msxsdtest/attribute',invalid),
+  STResList120 = [STRes119|STResList119],
+
+
+  ?line {STRes120,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc011.xsd','./msxsdtest/attribute',invalid),
+  STResList121 = [STRes120|STResList120],
+
+
+  ?line {STRes121,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc012.xsd','./msxsdtest/attribute',invalid),
+  STResList122 = [STRes121|STResList121],
+
+
+  ?line {STRes122,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc013.xsd','./msxsdtest/attribute',invalid),
+  STResList123 = [STRes122|STResList122],
+
+
+  ?line {STRes123,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc014.xsd','./msxsdtest/attribute',invalid),
+  STResList124 = [STRes123|STResList123],
+
+
+  ?line {STRes124,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc015.xsd','./msxsdtest/attribute',invalid),
+  STResList125 = [STRes124|STResList124],
+
+
+  ?line {STRes125,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc016.xsd','./msxsdtest/attribute',invalid),
+  STResList126 = [STRes125|STResList125],
+
+
+  ?line {STRes126,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc017.xsd','./msxsdtest/attribute',invalid),
+  STResList127 = [STRes126|STResList126],
+
+
+  ?line {STRes127,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attKc018.xsd','./msxsdtest/attribute',invalid),
+  STResList128 = [STRes127|STResList127],
+
+
+  ?line {STRes128,S128} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLa001.xsd','./msxsdtest/attribute',valid),
+  STResList129 = [STRes128|STResList128],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLa001.xml','./msxsdtest/attribute',valid,S128),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes129,S129} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLa002.xsd','./msxsdtest/attribute',valid),
+  STResList130 = [STRes129|STResList129],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLa002.xml','./msxsdtest/attribute',valid,S129),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes130,S130} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLa003.xsd','./msxsdtest/attribute',valid),
+  STResList131 = [STRes130|STResList130],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLa003.xml','./msxsdtest/attribute',valid,S130),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes131,S131} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLa004.xsd','./msxsdtest/attribute',valid),
+  STResList132 = [STRes131|STResList131],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLa004.xml','./msxsdtest/attribute',valid,S131),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes132,S132} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLa005.xsd','./msxsdtest/attribute',valid),
+  STResList133 = [STRes132|STResList132],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLa005.xml','./msxsdtest/attribute',invalid,S132),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes133,S133} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLa006.xsd','./msxsdtest/attribute',valid),
+  STResList134 = [STRes133|STResList133],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLa006.xml','./msxsdtest/attribute',valid,S133),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes134,S134} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLb001.xsd','./msxsdtest/attribute',valid),
+  STResList135 = [STRes134|STResList134],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLb001.xml','./msxsdtest/attribute',valid,S134),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes135,S135} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLb002.xsd','./msxsdtest/attribute',valid),
+  STResList136 = [STRes135|STResList135],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLb002.xml','./msxsdtest/attribute',valid,S135),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes136,S136} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLb003.xsd','./msxsdtest/attribute',valid),
+  STResList137 = [STRes136|STResList136],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLb003.xml','./msxsdtest/attribute',valid,S136),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes137,S137} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLb004.xsd','./msxsdtest/attribute',valid),
+  STResList138 = [STRes137|STResList137],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLb004.xml','./msxsdtest/attribute',valid,S137),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes138,S138} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLb005.xsd','./msxsdtest/attribute',valid),
+  STResList139 = [STRes138|STResList138],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLb005.xml','./msxsdtest/attribute',invalid,S138),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes139,S139} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLb006.xsd','./msxsdtest/attribute',valid),
+  STResList140 = [STRes139|STResList139],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLb006.xml','./msxsdtest/attribute',valid,S139),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes140,S140} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLc001.xsd','./msxsdtest/attribute',valid),
+  STResList141 = [STRes140|STResList140],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLc001.xml','./msxsdtest/attribute',valid,S140),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes141,S141} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLc002.xsd','./msxsdtest/attribute',valid),
+  STResList142 = [STRes141|STResList141],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLc002.xml','./msxsdtest/attribute',valid,S141),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes142,S142} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLc003.xsd','./msxsdtest/attribute',valid),
+  STResList143 = [STRes142|STResList142],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLc003.xml','./msxsdtest/attribute',valid,S142),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes143,S143} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLc004.xsd','./msxsdtest/attribute',valid),
+  STResList144 = [STRes143|STResList143],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLc004.xml','./msxsdtest/attribute',valid,S143),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes144,S144} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLc005.xsd','./msxsdtest/attribute',valid),
+  STResList145 = [STRes144|STResList144],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLc005.xml','./msxsdtest/attribute',invalid,S144),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes145,S145} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attLc006.xsd','./msxsdtest/attribute',valid),
+  STResList146 = [STRes145|STResList145],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attLc006.xml','./msxsdtest/attribute',valid,S145),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes146,S146} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMa001.xsd','./msxsdtest/attribute',valid),
+  STResList147 = [STRes146|STResList146],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMa001.xml','./msxsdtest/attribute',invalid,S146),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes147,S147} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMa002.xsd','./msxsdtest/attribute',valid),
+  STResList148 = [STRes147|STResList147],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMa002.xml','./msxsdtest/attribute',invalid,S147),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes148,S148} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMa003.xsd','./msxsdtest/attribute',valid),
+  STResList149 = [STRes148|STResList148],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMa003.xml','./msxsdtest/attribute',valid,S148),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes149,S149} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMa004.xsd','./msxsdtest/attribute',valid),
+  STResList150 = [STRes149|STResList149],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMa004.xml','./msxsdtest/attribute',valid,S149),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes150,S150} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb001.xsd','./msxsdtest/attribute',valid),
+  STResList151 = [STRes150|STResList150],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb001.xml','./msxsdtest/attribute',invalid,S150),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes151,S151} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb002.xsd','./msxsdtest/attribute',valid),
+  STResList152 = [STRes151|STResList151],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb002.xml','./msxsdtest/attribute',invalid,S151),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes152,S152} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb003.xsd','./msxsdtest/attribute',valid),
+  STResList153 = [STRes152|STResList152],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb003.xml','./msxsdtest/attribute',invalid,S152),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes153,S153} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb004.xsd','./msxsdtest/attribute',valid),
+  STResList154 = [STRes153|STResList153],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb004.xml','./msxsdtest/attribute',valid,S153),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes154,S154} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb005.xsd','./msxsdtest/attribute',valid),
+  STResList155 = [STRes154|STResList154],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb005.xml','./msxsdtest/attribute',valid,S154),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes155,S155} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb006.xsd','./msxsdtest/attribute',valid),
+  STResList156 = [STRes155|STResList155],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb006.xml','./msxsdtest/attribute',valid,S155),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes156,S156} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb007.xsd','./msxsdtest/attribute',valid),
+  STResList157 = [STRes156|STResList156],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb007.xml','./msxsdtest/attribute',valid,S156),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes157,S157} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb008.xsd','./msxsdtest/attribute',valid),
+  STResList158 = [STRes157|STResList157],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb008.xml','./msxsdtest/attribute',valid,S157),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes158,S158} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb009.xsd','./msxsdtest/attribute',valid),
+  STResList159 = [STRes158|STResList158],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb009.xml','./msxsdtest/attribute',valid,S158),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes159,S159} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb010.xsd','./msxsdtest/attribute',valid),
+  STResList160 = [STRes159|STResList159],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb010.xml','./msxsdtest/attribute',invalid,S159),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes160,S160} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb011.xsd','./msxsdtest/attribute',valid),
+  STResList161 = [STRes160|STResList160],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb011.xml','./msxsdtest/attribute',invalid,S160),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes161,S161} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMb012.xsd','./msxsdtest/attribute',valid),
+  STResList162 = [STRes161|STResList161],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMb012.xml','./msxsdtest/attribute',invalid,S161),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes162,S162} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc001.xsd','./msxsdtest/attribute',valid),
+  STResList163 = [STRes162|STResList162],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc001.xml','./msxsdtest/attribute',invalid,S162),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes163,S163} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc002.xsd','./msxsdtest/attribute',valid),
+  STResList164 = [STRes163|STResList163],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc002.xml','./msxsdtest/attribute',invalid,S163),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes164,S164} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc003.xsd','./msxsdtest/attribute',valid),
+  STResList165 = [STRes164|STResList164],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc003.xml','./msxsdtest/attribute',invalid,S164),
+  ITResList56 = [ITRes55|ITResList55],
+
+
+  ?line {STRes165,S165} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc004.xsd','./msxsdtest/attribute',valid),
+  STResList166 = [STRes165|STResList165],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc004.xml','./msxsdtest/attribute',valid,S165),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes166,S166} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc005.xsd','./msxsdtest/attribute',valid),
+  STResList167 = [STRes166|STResList166],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc005.xml','./msxsdtest/attribute',valid,S166),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes167,S167} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc006.xsd','./msxsdtest/attribute',valid),
+  STResList168 = [STRes167|STResList167],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc006.xml','./msxsdtest/attribute',valid,S167),
+  ITResList59 = [ITRes58|ITResList58],
+
+
+  ?line {STRes168,S168} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc007.xsd','./msxsdtest/attribute',valid),
+  STResList169 = [STRes168|STResList168],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc007.xml','./msxsdtest/attribute',valid,S168),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes169,S169} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc008.xsd','./msxsdtest/attribute',valid),
+  STResList170 = [STRes169|STResList169],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc008.xml','./msxsdtest/attribute',valid,S169),
+  ITResList61 = [ITRes60|ITResList60],
+
+
+  ?line {STRes170,S170} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc009.xsd','./msxsdtest/attribute',valid),
+  STResList171 = [STRes170|STResList170],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc009.xml','./msxsdtest/attribute',valid,S170),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes171,S171} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc010.xsd','./msxsdtest/attribute',valid),
+  STResList172 = [STRes171|STResList171],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc010.xml','./msxsdtest/attribute',invalid,S171),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes172,S172} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc011.xsd','./msxsdtest/attribute',valid),
+  STResList173 = [STRes172|STResList172],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc011.xml','./msxsdtest/attribute',invalid,S172),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes173,S173} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attMc012.xsd','./msxsdtest/attribute',valid),
+  STResList174 = [STRes173|STResList173],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attMc012.xml','./msxsdtest/attribute',invalid,S173),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes174,S174} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO001.xsd','./msxsdtest/attribute',valid),
+  STResList175 = [STRes174|STResList174],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attO001.xml','./msxsdtest/attribute',invalid,S174),
+  ITResList66 = [ITRes65|ITResList65],
+
+
+  ?line {STRes175,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO002.xsd','./msxsdtest/attribute',invalid),
+  STResList176 = [STRes175|STResList175],
+
+
+  ?line {STRes176,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO003.xsd','./msxsdtest/attribute',invalid),
+  STResList177 = [STRes176|STResList176],
+
+
+  ?line {STRes177,S177} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO004.xsd','./msxsdtest/attribute',valid),
+  STResList178 = [STRes177|STResList177],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attO004.xml','./msxsdtest/attribute',invalid,S177),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes178,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO005.xsd','./msxsdtest/attribute',invalid),
+  STResList179 = [STRes178|STResList178],
+
+
+  ?line {STRes179,S179} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO006.xsd','./msxsdtest/attribute',valid),
+  STResList180 = [STRes179|STResList179],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attO006.xml','./msxsdtest/attribute',valid,S179),
+  ITResList68 = [ITRes67|ITResList67],
+
+
+  ?line {STRes180,S180} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO007.xsd','./msxsdtest/attribute',valid),
+  STResList181 = [STRes180|STResList180],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attO007.xml','./msxsdtest/attribute',valid,S180),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes181,S181} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO008.xsd','./msxsdtest/attribute',valid),
+  STResList182 = [STRes181|STResList181],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attO008.xml','./msxsdtest/attribute',invalid,S181),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes182,S182} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO009.xsd','./msxsdtest/attribute',valid),
+  STResList183 = [STRes182|STResList182],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attO009.xml','./msxsdtest/attribute',valid,S182),
+  ITResList71 = [ITRes70|ITResList70],
+
+
+  ?line {STRes183,S183} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO010.xsd','./msxsdtest/attribute',valid),
+  STResList184 = [STRes183|STResList183],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attO010.xml','./msxsdtest/attribute',valid,S183),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes184,S184} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO011.xsd','./msxsdtest/attribute',valid),
+  STResList185 = [STRes184|STResList184],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attO011.xml','./msxsdtest/attribute',valid,S184),
+  ITResList73 = [ITRes72|ITResList72],
+
+
+  ?line {STRes185,S185} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO012.xsd','./msxsdtest/attribute',valid),
+  STResList186 = [STRes185|STResList185],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attO012.xml','./msxsdtest/attribute',invalid,S185),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes186,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO013.xsd','./msxsdtest/attribute',invalid),
+  STResList187 = [STRes186|STResList186],
+
+
+  ?line {STRes187,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO014.xsd','./msxsdtest/attribute',invalid),
+  STResList188 = [STRes187|STResList187],
+
+
+  ?line {STRes188,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO015.xsd','./msxsdtest/attribute',invalid),
+  STResList189 = [STRes188|STResList188],
+
+
+  ?line {STRes189,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO016.xsd','./msxsdtest/attribute',invalid),
+  STResList190 = [STRes189|STResList189],
+
+
+  ?line {STRes190,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO017.xsd','./msxsdtest/attribute',invalid),
+  STResList191 = [STRes190|STResList190],
+
+
+  ?line {STRes191,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO018.xsd','./msxsdtest/attribute',valid),
+  STResList192 = [STRes191|STResList191],
+
+
+  ?line {STRes192,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO019.xsd','./msxsdtest/attribute',invalid),
+  STResList193 = [STRes192|STResList192],
+
+
+  ?line {STRes193,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO020.xsd','./msxsdtest/attribute',invalid),
+  STResList194 = [STRes193|STResList193],
+
+
+  ?line {STRes194,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO021.xsd','./msxsdtest/attribute',invalid),
+  STResList195 = [STRes194|STResList194],
+
+
+  ?line {STRes195,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO022.xsd','./msxsdtest/attribute',invalid),
+  STResList196 = [STRes195|STResList195],
+
+
+  ?line {STRes196,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO023.xsd','./msxsdtest/attribute',invalid),
+  STResList197 = [STRes196|STResList196],
+
+
+  ?line {STRes197,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO024.xsd','./msxsdtest/attribute',invalid),
+  STResList198 = [STRes197|STResList197],
+
+
+  ?line {STRes198,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attO025.xsd','./msxsdtest/attribute',valid),
+  STResList199 = [STRes198|STResList198],
+
+
+  ?line {STRes199,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP001.xsd','./msxsdtest/attribute',invalid),
+  STResList200 = [STRes199|STResList199],
+
+
+  ?line {STRes200,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP002.xsd','./msxsdtest/attribute',invalid),
+  STResList201 = [STRes200|STResList200],
+
+
+  ?line {STRes201,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP003.xsd','./msxsdtest/attribute',invalid),
+  STResList202 = [STRes201|STResList201],
+
+
+  ?line {STRes202,S202} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP004.xsd','./msxsdtest/attribute',valid),
+  STResList203 = [STRes202|STResList202],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP004.xml','./msxsdtest/attribute',valid,S202),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes203,S203} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP005.xsd','./msxsdtest/attribute',valid),
+  STResList204 = [STRes203|STResList203],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP005.xml','./msxsdtest/attribute',invalid,S203),
+  ITResList76 = [ITRes75|ITResList75],
+
+
+  ?line {STRes204,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP006.xsd','./msxsdtest/attribute',invalid),
+  STResList205 = [STRes204|STResList204],
+
+
+  ?line {STRes205,S205} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP007.xsd','./msxsdtest/attribute',valid),
+  STResList206 = [STRes205|STResList205],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP007.xml','./msxsdtest/attribute',valid,S205),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes206,S206} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP008.xsd','./msxsdtest/attribute',valid),
+  STResList207 = [STRes206|STResList206],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP008.xml','./msxsdtest/attribute',invalid,S206),
+  ITResList78 = [ITRes77|ITResList77],
+
+
+  ?line {STRes207,S207} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP009.xsd','./msxsdtest/attribute',valid),
+  STResList208 = [STRes207|STResList207],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP009.xml','./msxsdtest/attribute',valid,S207),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes208,S208} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP010.xsd','./msxsdtest/attribute',valid),
+  STResList209 = [STRes208|STResList208],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP010.xml','./msxsdtest/attribute',invalid,S208),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes209,S209} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP011.xsd','./msxsdtest/attribute',valid),
+  STResList210 = [STRes209|STResList209],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP011.xml','./msxsdtest/attribute',valid,S209),
+  ITResList81 = [ITRes80|ITResList80],
+
+
+  ?line {STRes210,S210} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP012.xsd','./msxsdtest/attribute',valid),
+  STResList211 = [STRes210|STResList210],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP012.xml','./msxsdtest/attribute',invalid,S210),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes211,S211} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP013.xsd','./msxsdtest/attribute',valid),
+  STResList212 = [STRes211|STResList211],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP013.xml','./msxsdtest/attribute',valid,S211),
+  ITResList83 = [ITRes82|ITResList82],
+
+
+  ?line {STRes212,S212} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP014.xsd','./msxsdtest/attribute',valid),
+  STResList213 = [STRes212|STResList212],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP014.xml','./msxsdtest/attribute',invalid,S212),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes213,S213} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP015.xsd','./msxsdtest/attribute',valid),
+  STResList214 = [STRes213|STResList213],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP015.xml','./msxsdtest/attribute',valid,S213),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes214,S214} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP016.xsd','./msxsdtest/attribute',valid),
+  STResList215 = [STRes214|STResList214],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP016.xml','./msxsdtest/attribute',invalid,S214),
+  ITResList86 = [ITRes85|ITResList85],
+
+
+  ?line {STRes215,S215} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP017.xsd','./msxsdtest/attribute',valid),
+  STResList216 = [STRes215|STResList215],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP017.xml','./msxsdtest/attribute',valid,S215),
+  ITResList87 = [ITRes86|ITResList86],
+
+
+  ?line {STRes216,S216} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP018.xsd','./msxsdtest/attribute',valid),
+  STResList217 = [STRes216|STResList216],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP018.xml','./msxsdtest/attribute',invalid,S216),
+  ITResList88 = [ITRes87|ITResList87],
+
+
+  ?line {STRes217,S217} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP019.xsd','./msxsdtest/attribute',valid),
+  STResList218 = [STRes217|STResList217],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP019.xml','./msxsdtest/attribute',valid,S217),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes218,S218} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP020.xsd','./msxsdtest/attribute',valid),
+  STResList219 = [STRes218|STResList218],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP020.xml','./msxsdtest/attribute',invalid,S218),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes219,S219} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP021.xsd','./msxsdtest/attribute',valid),
+  STResList220 = [STRes219|STResList219],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP021.xml','./msxsdtest/attribute',valid,S219),
+  ITResList91 = [ITRes90|ITResList90],
+
+
+  ?line {STRes220,S220} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP022.xsd','./msxsdtest/attribute',valid),
+  STResList221 = [STRes220|STResList220],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP022.xml','./msxsdtest/attribute',valid,S220),
+  ITResList92 = [ITRes91|ITResList91],
+
+
+  ?line {STRes221,S221} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP023.xsd','./msxsdtest/attribute',valid),
+  STResList222 = [STRes221|STResList221],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP023.xml','./msxsdtest/attribute',valid,S221),
+  ITResList93 = [ITRes92|ITResList92],
+
+
+  ?line {STRes222,S222} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP024.xsd','./msxsdtest/attribute',valid),
+  STResList223 = [STRes222|STResList222],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP024.xml','./msxsdtest/attribute',valid,S222),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes223,S223} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP025.xsd','./msxsdtest/attribute',valid),
+  STResList224 = [STRes223|STResList223],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP025.xml','./msxsdtest/attribute',valid,S223),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes224,S224} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP026.xsd','./msxsdtest/attribute',valid),
+  STResList225 = [STRes224|STResList224],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP026.xml','./msxsdtest/attribute',valid,S224),
+  ITResList96 = [ITRes95|ITResList95],
+
+
+  ?line {STRes225,S225} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP027.xsd','./msxsdtest/attribute',valid),
+  STResList226 = [STRes225|STResList225],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP027.xml','./msxsdtest/attribute',invalid,S225),
+  ITResList97 = [ITRes96|ITResList96],
+
+
+  ?line {STRes226,S226} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP028.xsd','./msxsdtest/attribute',valid),
+  STResList227 = [STRes226|STResList226],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP028.xml','./msxsdtest/attribute',valid,S226),
+  ITResList98 = [ITRes97|ITResList97],
+
+
+  ?line {STRes227,S227} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP029.xsd','./msxsdtest/attribute',valid),
+  STResList228 = [STRes227|STResList227],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP029.xml','./msxsdtest/attribute',valid,S227),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes228,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP030.xsd','./msxsdtest/attribute',invalid),
+  STResList229 = [STRes228|STResList228],
+
+
+  ?line {STRes229,S229} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP031.xsd','./msxsdtest/attribute',valid),
+  STResList230 = [STRes229|STResList229],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP031.xml','./msxsdtest/attribute',invalid,S229),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes230,S230} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attP032.xsd','./msxsdtest/attribute',valid),
+  STResList231 = [STRes230|STResList230],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attP032.xml','./msxsdtest/attribute',valid,S230),
+  ITResList101 = [ITRes100|ITResList100],
+
+
+  ?line {STRes231,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ001.xsd','./msxsdtest/attribute',invalid),
+  STResList232 = [STRes231|STResList231],
+
+
+  ?line {STRes232,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ002.xsd','./msxsdtest/attribute',invalid),
+  STResList233 = [STRes232|STResList232],
+
+
+  ?line {STRes233,S233} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ003.xsd','./msxsdtest/attribute',valid),
+  STResList234 = [STRes233|STResList233],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attQ003.xml','./msxsdtest/attribute',valid,S233),
+  ITResList102 = [ITRes101|ITResList101],
+
+
+  ?line {STRes234,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ004.xsd','./msxsdtest/attribute',invalid),
+  STResList235 = [STRes234|STResList234],
+
+
+  ?line {STRes235,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ005.xsd','./msxsdtest/attribute',invalid),
+  STResList236 = [STRes235|STResList235],
+
+
+  ?line {STRes236,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ006.xsd','./msxsdtest/attribute',invalid),
+  STResList237 = [STRes236|STResList236],
+
+
+  ?line {STRes237,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ007.xsd','./msxsdtest/attribute',invalid),
+  STResList238 = [STRes237|STResList237],
+
+
+  ?line {STRes238,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ008.xsd','./msxsdtest/attribute',invalid),
+  STResList239 = [STRes238|STResList238],
+
+
+  ?line {STRes239,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ009.xsd','./msxsdtest/attribute',invalid),
+  STResList240 = [STRes239|STResList239],
+
+
+  ?line {STRes240,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ010.xsd','./msxsdtest/attribute',valid),
+  STResList241 = [STRes240|STResList240],
+
+
+  ?line {STRes241,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ011.xsd','./msxsdtest/attribute',invalid),
+  STResList242 = [STRes241|STResList241],
+
+
+  ?line {STRes242,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ012.xsd','./msxsdtest/attribute',invalid),
+  STResList243 = [STRes242|STResList242],
+
+
+  ?line {STRes243,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ013.xsd','./msxsdtest/attribute',invalid),
+  STResList244 = [STRes243|STResList243],
+
+
+  ?line {STRes244,S244} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ014.xsd','./msxsdtest/attribute',valid),
+  STResList245 = [STRes244|STResList244],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attQ014.xml','./msxsdtest/attribute',valid,S244),
+  ITResList103 = [ITRes102|ITResList102],
+
+
+  ?line {STRes245,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ015.xsd','./msxsdtest/attribute',invalid),
+  STResList246 = [STRes245|STResList245],
+
+
+  ?line {STRes246,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ016.xsd','./msxsdtest/attribute',invalid),
+  STResList247 = [STRes246|STResList246],
+
+
+  ?line {STRes247,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ017.xsd','./msxsdtest/attribute',invalid),
+  STResList248 = [STRes247|STResList247],
+
+
+  ?line {STRes248,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ018.xsd','./msxsdtest/attribute',invalid),
+  STResList249 = [STRes248|STResList248],
+
+
+  ?line {STRes249,S249} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attQ019.xsd','./msxsdtest/attribute',valid),
+  STResList250 = [STRes249|STResList249],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attQ019.xml','./msxsdtest/attribute',valid,S249),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes250,S250} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attZ001.xsd','./msxsdtest/attribute',valid),
+  STResList251 = [STRes250|STResList250],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attZ001.xml','./msxsdtest/attribute',invalid,S250),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes251,S251} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attZ002.xsd','./msxsdtest/attribute',valid),
+  STResList252 = [STRes251|STResList251],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attZ002.xml','./msxsdtest/attribute',invalid,S251),
+  ITResList106 = [ITRes105|ITResList105],
+
+
+  ?line {STRes252,S252} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attribute/attZ003.xsd','./msxsdtest/attribute',valid),
+  STResList253 = [STRes252|STResList252],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attribute/attZ003.xml','./msxsdtest/attribute',invalid,S252),
+  ITResList107 = [ITRes106|ITResList106],
+
+
+  ?line {STRes253,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgA001.xsd','./msxsdtest/attributeGroup',valid),
+  STResList254 = [STRes253|STResList253],
+
+
+  ?line {STRes254,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgA002.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList255 = [STRes254|STResList254],
+
+
+  ?line {STRes255,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgA003.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList256 = [STRes255|STResList255],
+
+
+  ?line {STRes256,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgA004.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList257 = [STRes256|STResList256],
+
+
+  ?line {STRes257,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgA005.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList258 = [STRes257|STResList257],
+
+
+  ?line {STRes258,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgA006.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList259 = [STRes258|STResList258],
+
+
+  ?line {STRes259,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgA007.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList260 = [STRes259|STResList259],
+
+
+  ?line {STRes260,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgA008.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList261 = [STRes260|STResList260],
+
+
+  ?line {STRes261,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgA009.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList262 = [STRes261|STResList261],
+
+
+  ?line {STRes262,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB001.xsd','./msxsdtest/attributeGroup',valid),
+  STResList263 = [STRes262|STResList262],
+
+
+  ?line {STRes263,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB002.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList264 = [STRes263|STResList263],
+
+
+  ?line {STRes264,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB003.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList265 = [STRes264|STResList264],
+
+
+  ?line {STRes265,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB004.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList266 = [STRes265|STResList265],
+
+
+  ?line {STRes266,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB005.xsd','./msxsdtest/attributeGroup',valid),
+  STResList267 = [STRes266|STResList266],
+
+
+  ?line {STRes267,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB006.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList268 = [STRes267|STResList267],
+
+
+  ?line {STRes268,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB007.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList269 = [STRes268|STResList268],
+
+
+  ?line {STRes269,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB008.xsd','./msxsdtest/attributeGroup',valid),
+  STResList270 = [STRes269|STResList269],
+
+
+  ?line {STRes270,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB009.xsd','./msxsdtest/attributeGroup',valid),
+  STResList271 = [STRes270|STResList270],
+
+
+  ?line {STRes271,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB010.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList272 = [STRes271|STResList271],
+
+
+  ?line {STRes272,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB011.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList273 = [STRes272|STResList272],
+
+
+  ?line {STRes273,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB012.xsd','./msxsdtest/attributeGroup',valid),
+  STResList274 = [STRes273|STResList273],
+
+
+  ?line {STRes274,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB013.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList275 = [STRes274|STResList274],
+
+
+  ?line {STRes275,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB014.xsd','./msxsdtest/attributeGroup',valid),
+  STResList276 = [STRes275|STResList275],
+
+
+  ?line {STRes276,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgB015.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList277 = [STRes276|STResList276],
+
+
+  ?line {STRes277,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC001.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList278 = [STRes277|STResList277],
+
+
+  ?line {STRes278,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC002.xsd','./msxsdtest/attributeGroup',valid),
+  STResList279 = [STRes278|STResList278],
+
+
+  ?line {STRes279,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC003.xsd','./msxsdtest/attributeGroup',valid),
+  STResList280 = [STRes279|STResList279],
+
+
+  ?line {STRes280,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC004.xsd','./msxsdtest/attributeGroup',valid),
+  STResList281 = [STRes280|STResList280],
+
+
+  ?line {STRes281,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC005.xsd','./msxsdtest/attributeGroup',valid),
+  STResList282 = [STRes281|STResList281],
+
+
+  ?line {STRes282,S282} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC006.xsd','./msxsdtest/attributeGroup',valid),
+  STResList283 = [STRes282|STResList282],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgC006.xml','./msxsdtest/attributeGroup',invalid,S282),
+  ITResList108 = [ITRes107|ITResList107],
+
+
+  ?line {STRes283,S283} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC007.xsd','./msxsdtest/attributeGroup',valid),
+  STResList284 = [STRes283|STResList283],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgC007.xml','./msxsdtest/attributeGroup',valid,S283),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes284,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC008.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList285 = [STRes284|STResList284],
+
+
+  ?line {STRes285,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC009.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList286 = [STRes285|STResList285],
+
+
+  ?line {STRes286,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC010.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList287 = [STRes286|STResList286],
+
+
+  ?line {STRes287,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC011.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList288 = [STRes287|STResList287],
+
+
+  ?line {STRes288,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC012.xsd','./msxsdtest/attributeGroup',valid),
+  STResList289 = [STRes288|STResList288],
+
+
+  ?line {STRes289,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC013.xsd','./msxsdtest/attributeGroup',valid),
+  STResList290 = [STRes289|STResList289],
+
+
+  ?line {STRes290,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC014.xsd','./msxsdtest/attributeGroup',valid),
+  STResList291 = [STRes290|STResList290],
+
+
+  ?line {STRes291,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC015.xsd','./msxsdtest/attributeGroup',valid),
+  STResList292 = [STRes291|STResList291],
+
+
+  ?line {STRes292,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC016.xsd','./msxsdtest/attributeGroup',valid),
+  STResList293 = [STRes292|STResList292],
+
+
+  ?line {STRes293,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC017.xsd','./msxsdtest/attributeGroup',valid),
+  STResList294 = [STRes293|STResList293],
+
+
+  ?line {STRes294,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC018.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList295 = [STRes294|STResList294],
+
+
+  ?line {STRes295,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC019.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList296 = [STRes295|STResList295],
+
+
+  ?line {STRes296,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC020.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList297 = [STRes296|STResList296],
+
+
+  ?line {STRes297,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC021.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList298 = [STRes297|STResList297],
+
+
+  ?line {STRes298,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC022.xsd','./msxsdtest/attributeGroup',valid),
+  STResList299 = [STRes298|STResList298],
+
+
+  ?line {STRes299,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC023.xsd','./msxsdtest/attributeGroup',valid),
+  STResList300 = [STRes299|STResList299],
+
+
+  ?line {STRes300,S300} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC024.xsd','./msxsdtest/attributeGroup',valid),
+  STResList301 = [STRes300|STResList300],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgC024.xml','./msxsdtest/attributeGroup',valid,S300),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes301,S301} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC025.xsd','./msxsdtest/attributeGroup',valid),
+  STResList302 = [STRes301|STResList301],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgC025.xml','./msxsdtest/attributeGroup',invalid,S301),
+  ITResList111 = [ITRes110|ITResList110],
+
+
+  ?line {STRes302,S302} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC026.xsd','./msxsdtest/attributeGroup',valid),
+  STResList303 = [STRes302|STResList302],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgC026.xml','./msxsdtest/attributeGroup',valid,S302),
+  ITResList112 = [ITRes111|ITResList111],
+
+
+  ?line {STRes303,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC027.xsd','./msxsdtest/attributeGroup',valid),
+  STResList304 = [STRes303|STResList303],
+
+
+  ?line {STRes304,S304} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC028.xsd','./msxsdtest/attributeGroup',valid),
+  STResList305 = [STRes304|STResList304],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgC028.xml','./msxsdtest/attributeGroup',invalid,S304),
+  ITResList113 = [ITRes112|ITResList112],
+
+
+  ?line {STRes305,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC029.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList306 = [STRes305|STResList305],
+
+
+  ?line {STRes306,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC030.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList307 = [STRes306|STResList306],
+
+
+  ?line {STRes307,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC031.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList308 = [STRes307|STResList307],
+
+
+  ?line {STRes308,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC032.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList309 = [STRes308|STResList308],
+
+
+  ?line {STRes309,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC033.xsd','./msxsdtest/attributeGroup',valid),
+  STResList310 = [STRes309|STResList309],
+
+
+  ?line {STRes310,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC034.xsd','./msxsdtest/attributeGroup',valid),
+  STResList311 = [STRes310|STResList310],
+
+
+  ?line {STRes311,S311} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC035.xsd','./msxsdtest/attributeGroup',valid),
+  STResList312 = [STRes311|STResList311],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgC035.xml','./msxsdtest/attributeGroup',valid,S311),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes312,S312} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC036.xsd','./msxsdtest/attributeGroup',valid),
+  STResList313 = [STRes312|STResList312],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgC036.xml','./msxsdtest/attributeGroup',valid,S312),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes313,S313} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC037.xsd','./msxsdtest/attributeGroup',valid),
+  STResList314 = [STRes313|STResList313],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgC037.xml','./msxsdtest/attributeGroup',valid,S313),
+  ITResList116 = [ITRes115|ITResList115],
+
+
+  ?line {STRes314,S314} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC038.xsd','./msxsdtest/attributeGroup',valid),
+  STResList315 = [STRes314|STResList314],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgC038.xml','./msxsdtest/attributeGroup',valid,S314),
+  ITResList117 = [ITRes116|ITResList116],
+
+
+  ?line {STRes315,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC039.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList316 = [STRes315|STResList315],
+
+
+  ?line {STRes316,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC040.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList317 = [STRes316|STResList316],
+
+
+  ?line {STRes317,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC041.xsd','./msxsdtest/attributeGroup',valid),
+  STResList318 = [STRes317|STResList317],
+
+
+  ?line {STRes318,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC042.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList319 = [STRes318|STResList318],
+
+
+  ?line {STRes319,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC043.xsd','./msxsdtest/attributeGroup',valid),
+  STResList320 = [STRes319|STResList319],
+
+
+  ?line {STRes320,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC044.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList321 = [STRes320|STResList320],
+
+
+  ?line {STRes321,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgC045.xsd','./msxsdtest/attributeGroup',valid),
+  STResList322 = [STRes321|STResList321],
+
+
+  ?line {STRes322,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD001.xsd','./msxsdtest/attributeGroup',valid),
+  STResList323 = [STRes322|STResList322],
+
+
+  ?line {STRes323,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD002.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList324 = [STRes323|STResList323],
+
+
+  ?line {STRes324,S324} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD003.xsd','./msxsdtest/attributeGroup',valid),
+  STResList325 = [STRes324|STResList324],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD003.xml','./msxsdtest/attributeGroup',valid,S324),
+  ITResList118 = [ITRes117|ITResList117],
+
+
+  ?line {STRes325,S325} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD004.xsd','./msxsdtest/attributeGroup',valid),
+  STResList326 = [STRes325|STResList325],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD004.xml','./msxsdtest/attributeGroup',valid,S325),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes326,S326} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD005.xsd','./msxsdtest/attributeGroup',valid),
+  STResList327 = [STRes326|STResList326],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD005.xml','./msxsdtest/attributeGroup',valid,S326),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes327,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD006.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList328 = [STRes327|STResList327],
+
+
+  ?line {STRes328,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD007.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList329 = [STRes328|STResList328],
+
+
+  ?line {STRes329,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD008.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList330 = [STRes329|STResList329],
+
+
+  ?line {STRes330,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD009.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList331 = [STRes330|STResList330],
+
+
+  ?line {STRes331,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD010.xsd','./msxsdtest/attributeGroup',valid),
+  STResList332 = [STRes331|STResList331],
+
+
+  ?line {STRes332,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD011.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList333 = [STRes332|STResList332],
+
+
+  ?line {STRes333,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD012.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList334 = [STRes333|STResList333],
+
+
+  ?line {STRes334,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD013.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList335 = [STRes334|STResList334],
+
+
+  ?line {STRes335,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD014.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList336 = [STRes335|STResList335],
+
+
+  ?line {STRes336,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD015.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList337 = [STRes336|STResList336],
+
+
+  ?line {STRes337,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD016.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList338 = [STRes337|STResList337],
+
+
+  ?line {STRes338,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD017.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList339 = [STRes338|STResList338],
+
+
+  ?line {STRes339,S339} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD018.xsd','./msxsdtest/attributeGroup',valid),
+  STResList340 = [STRes339|STResList339],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD018.xml','./msxsdtest/attributeGroup',valid,S339),
+  ITResList121 = [ITRes120|ITResList120],
+
+
+  ?line {STRes340,S340} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD019.xsd','./msxsdtest/attributeGroup',valid),
+  STResList341 = [STRes340|STResList340],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD019.xml','./msxsdtest/attributeGroup',valid,S340),
+  ITResList122 = [ITRes121|ITResList121],
+
+
+  ?line {STRes341,S341} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD020.xsd','./msxsdtest/attributeGroup',valid),
+  STResList342 = [STRes341|STResList341],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD020.xml','./msxsdtest/attributeGroup',valid,S341),
+  ITResList123 = [ITRes122|ITResList122],
+
+
+  ?line {STRes342,S342} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD021.xsd','./msxsdtest/attributeGroup',valid),
+  STResList343 = [STRes342|STResList342],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD021.xml','./msxsdtest/attributeGroup',valid,S342),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes343,S343} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD022.xsd','./msxsdtest/attributeGroup',valid),
+  STResList344 = [STRes343|STResList343],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD022.xml','./msxsdtest/attributeGroup',valid,S343),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes344,S344} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD023.xsd','./msxsdtest/attributeGroup',valid),
+  STResList345 = [STRes344|STResList344],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD023.xml','./msxsdtest/attributeGroup',invalid,S344),
+  ITResList126 = [ITRes125|ITResList125],
+
+
+  ?line {STRes345,S345} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD024.xsd','./msxsdtest/attributeGroup',valid),
+  STResList346 = [STRes345|STResList345],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD024.xml','./msxsdtest/attributeGroup',invalid,S345),
+  ITResList127 = [ITRes126|ITResList126],
+
+
+  ?line {STRes346,S346} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD025.xsd','./msxsdtest/attributeGroup',valid),
+  STResList347 = [STRes346|STResList346],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD025.xml','./msxsdtest/attributeGroup',valid,S346),
+  ITResList128 = [ITRes127|ITResList127],
+
+
+  ?line {STRes347,S347} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD026.xsd','./msxsdtest/attributeGroup',valid),
+  STResList348 = [STRes347|STResList347],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD026.xml','./msxsdtest/attributeGroup',invalid,S347),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes348,S348} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD027.xsd','./msxsdtest/attributeGroup',valid),
+  STResList349 = [STRes348|STResList348],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD027.xml','./msxsdtest/attributeGroup',valid,S348),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  ?line {STRes349,S349} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD028.xsd','./msxsdtest/attributeGroup',valid),
+  STResList350 = [STRes349|STResList349],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD028.xml','./msxsdtest/attributeGroup',invalid,S349),
+  ITResList131 = [ITRes130|ITResList130],
+
+
+  ?line {STRes350,S350} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD029.xsd','./msxsdtest/attributeGroup',valid),
+  STResList351 = [STRes350|STResList350],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD029.xml','./msxsdtest/attributeGroup',valid,S350),
+  ITResList132 = [ITRes131|ITResList131],
+
+
+  ?line {STRes351,S351} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD030.xsd','./msxsdtest/attributeGroup',valid),
+  STResList352 = [STRes351|STResList351],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD030.xml','./msxsdtest/attributeGroup',invalid,S351),
+  ITResList133 = [ITRes132|ITResList132],
+
+
+  ?line {STRes352,S352} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD031.xsd','./msxsdtest/attributeGroup',valid),
+  STResList353 = [STRes352|STResList352],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD031.xml','./msxsdtest/attributeGroup',valid,S352),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes353,S353} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD032.xsd','./msxsdtest/attributeGroup',valid),
+  STResList354 = [STRes353|STResList353],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD032.xml','./msxsdtest/attributeGroup',valid,S353),
+  ITResList135 = [ITRes134|ITResList134],
+
+
+  ?line {STRes354,S354} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD033.xsd','./msxsdtest/attributeGroup',valid),
+  STResList355 = [STRes354|STResList354],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD033.xml','./msxsdtest/attributeGroup',valid,S354),
+  ITResList136 = [ITRes135|ITResList135],
+
+
+  ?line {STRes355,S355} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD034.xsd','./msxsdtest/attributeGroup',valid),
+  STResList356 = [STRes355|STResList355],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD034.xml','./msxsdtest/attributeGroup',valid,S355),
+  ITResList137 = [ITRes136|ITResList136],
+
+
+  ?line {STRes356,S356} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD035.xsd','./msxsdtest/attributeGroup',valid),
+  STResList357 = [STRes356|STResList356],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD035.xml','./msxsdtest/attributeGroup',invalid,S356),
+  ITResList138 = [ITRes137|ITResList137],
+
+
+  ?line {STRes357,S357} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD036.xsd','./msxsdtest/attributeGroup',valid),
+  STResList358 = [STRes357|STResList357],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD036.xml','./msxsdtest/attributeGroup',valid,S357),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes358,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD037.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList359 = [STRes358|STResList358],
+
+
+  ?line {STRes359,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD038.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList360 = [STRes359|STResList359],
+
+
+  ?line {STRes360,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD039.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList361 = [STRes360|STResList360],
+
+
+  ?line {STRes361,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD040.xsd','./msxsdtest/attributeGroup',valid),
+  STResList362 = [STRes361|STResList361],
+
+
+  ?line {STRes362,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD041.xsd','./msxsdtest/attributeGroup',invalid),
+  STResList363 = [STRes362|STResList362],
+
+
+  ?line {STRes363,S363} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/attributeGroup/attgD042.xsd','./msxsdtest/attributeGroup',valid),
+  STResList364 = [STRes363|STResList363],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/attributeGroup/attgD042.xml','./msxsdtest/attributeGroup',invalid,S363),
+  ITResList140 = [ITRes139|ITResList139],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList364,ITResList140).
+
+%% Syntax Checking for top level complexType Declaration.
+%% Syntax Checking for simpleContent complexType Declaration.
+%% Syntax Checking for comlexContent complexType Declaration
+%% complexType Validation checking
+%% complexType Schema Component Constraints
+
+ct(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA001.xsd','./msxsdtest/complexType',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA001.xml','./msxsdtest/complexType',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA002.xsd','./msxsdtest/complexType',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA002.xml','./msxsdtest/complexType',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA003.xsd','./msxsdtest/complexType',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA003.xml','./msxsdtest/complexType',valid,S2),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA004.xsd','./msxsdtest/complexType',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA005.xsd','./msxsdtest/complexType',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA005.xml','./msxsdtest/complexType',valid,S4),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA006.xsd','./msxsdtest/complexType',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA007.xsd','./msxsdtest/complexType',invalid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA008.xsd','./msxsdtest/complexType',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA009.xsd','./msxsdtest/complexType',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA009.xml','./msxsdtest/complexType',valid,S8),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA010.xsd','./msxsdtest/complexType',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA010.xml','./msxsdtest/complexType',valid,S9),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA011.xsd','./msxsdtest/complexType',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA011.xml','./msxsdtest/complexType',valid,S10),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA012.xsd','./msxsdtest/complexType',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA012.xml','./msxsdtest/complexType',valid,S11),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA013.xsd','./msxsdtest/complexType',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA013.xml','./msxsdtest/complexType',valid,S12),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes13,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA014.xsd','./msxsdtest/complexType',invalid),
+  STResList14 = [STRes13|STResList13],
+
+
+  ?line {STRes14,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA015.xsd','./msxsdtest/complexType',invalid),
+  STResList15 = [STRes14|STResList14],
+
+
+  ?line {STRes15,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA016.xsd','./msxsdtest/complexType',invalid),
+  STResList16 = [STRes15|STResList15],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA017.xsd','./msxsdtest/complexType',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA017.xml','./msxsdtest/complexType',valid,S16),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA018.xsd','./msxsdtest/complexType',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA018.xml','./msxsdtest/complexType',valid,S17),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA019.xsd','./msxsdtest/complexType',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA019.xml','./msxsdtest/complexType',valid,S18),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA020.xsd','./msxsdtest/complexType',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA020.xml','./msxsdtest/complexType',valid,S19),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA021.xsd','./msxsdtest/complexType',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA021.xml','./msxsdtest/complexType',valid,S20),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA022.xsd','./msxsdtest/complexType',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA022.xml','./msxsdtest/complexType',valid,S21),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA023.xsd','./msxsdtest/complexType',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA024.xsd','./msxsdtest/complexType',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA025.xsd','./msxsdtest/complexType',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA026.xsd','./msxsdtest/complexType',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA026.xml','./msxsdtest/complexType',valid,S25),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA027.xsd','./msxsdtest/complexType',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA027.xml','./msxsdtest/complexType',valid,S26),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA028.xsd','./msxsdtest/complexType',invalid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA029.xsd','./msxsdtest/complexType',invalid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA030.xsd','./msxsdtest/complexType',invalid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA031.xsd','./msxsdtest/complexType',invalid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA032.xsd','./msxsdtest/complexType',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA032.xml','./msxsdtest/complexType',valid,S31),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA033.xsd','./msxsdtest/complexType',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA033.xml','./msxsdtest/complexType',valid,S32),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA034.xsd','./msxsdtest/complexType',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA034.xml','./msxsdtest/complexType',valid,S33),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA035.xsd','./msxsdtest/complexType',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA035.xml','./msxsdtest/complexType',valid,S34),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA036.xsd','./msxsdtest/complexType',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA037.xsd','./msxsdtest/complexType',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA037.xml','./msxsdtest/complexType',valid,S36),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA038.xsd','./msxsdtest/complexType',invalid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA039.xsd','./msxsdtest/complexType',invalid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA040.xsd','./msxsdtest/complexType',invalid),
+  STResList40 = [STRes39|STResList39],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA041.xsd','./msxsdtest/complexType',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA041.xml','./msxsdtest/complexType',valid,S40),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA042.xsd','./msxsdtest/complexType',invalid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA043.xsd','./msxsdtest/complexType',invalid),
+  STResList43 = [STRes42|STResList42],
+
+
+  ?line {STRes43,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA044.xsd','./msxsdtest/complexType',invalid),
+  STResList44 = [STRes43|STResList43],
+
+
+  ?line {STRes44,S44} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA045.xsd','./msxsdtest/complexType',valid),
+  STResList45 = [STRes44|STResList44],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA045.xml','./msxsdtest/complexType',valid,S44),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA046.xsd','./msxsdtest/complexType',invalid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,S46} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA047.xsd','./msxsdtest/complexType',valid),
+  STResList47 = [STRes46|STResList46],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA047.xml','./msxsdtest/complexType',valid,S46),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes47,S47} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA048.xsd','./msxsdtest/complexType',valid),
+  STResList48 = [STRes47|STResList47],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA048.xml','./msxsdtest/complexType',valid,S47),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes48,S48} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctA049.xsd','./msxsdtest/complexType',valid),
+  STResList49 = [STRes48|STResList48],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctA049.xml','./msxsdtest/complexType',valid,S48),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes49,S49} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB001.xsd','./msxsdtest/complexType',valid),
+  STResList50 = [STRes49|STResList49],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB001.xml','./msxsdtest/complexType',valid,S49),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes50,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB002.xsd','./msxsdtest/complexType',invalid),
+  STResList51 = [STRes50|STResList50],
+
+
+  ?line {STRes51,S51} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB003.xsd','./msxsdtest/complexType',valid),
+  STResList52 = [STRes51|STResList51],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB003.xml','./msxsdtest/complexType',valid,S51),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes52,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB004.xsd','./msxsdtest/complexType',invalid),
+  STResList53 = [STRes52|STResList52],
+
+
+  ?line {STRes53,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB005.xsd','./msxsdtest/complexType',invalid),
+  STResList54 = [STRes53|STResList53],
+
+
+  ?line {STRes54,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB006.xsd','./msxsdtest/complexType',invalid),
+  STResList55 = [STRes54|STResList54],
+
+
+  ?line {STRes55,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB007.xsd','./msxsdtest/complexType',invalid),
+  STResList56 = [STRes55|STResList55],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB008.xsd','./msxsdtest/complexType',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB009.xsd','./msxsdtest/complexType',invalid),
+  STResList58 = [STRes57|STResList57],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB010.xsd','./msxsdtest/complexType',invalid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB011.xsd','./msxsdtest/complexType',invalid),
+  STResList60 = [STRes59|STResList59],
+
+
+  ?line {STRes60,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB012.xsd','./msxsdtest/complexType',invalid),
+  STResList61 = [STRes60|STResList60],
+
+
+  ?line {STRes61,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB013.xsd','./msxsdtest/complexType',invalid),
+  STResList62 = [STRes61|STResList61],
+
+
+  ?line {STRes62,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB014.xsd','./msxsdtest/complexType',invalid),
+  STResList63 = [STRes62|STResList62],
+
+
+  ?line {STRes63,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB015.xsd','./msxsdtest/complexType',invalid),
+  STResList64 = [STRes63|STResList63],
+
+
+  ?line {STRes64,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB016.xsd','./msxsdtest/complexType',invalid),
+  STResList65 = [STRes64|STResList64],
+
+
+  ?line {STRes65,S65} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB017.xsd','./msxsdtest/complexType',valid),
+  STResList66 = [STRes65|STResList65],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB017.xml','./msxsdtest/complexType',valid,S65),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes66,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB018.xsd','./msxsdtest/complexType',invalid),
+  STResList67 = [STRes66|STResList66],
+
+
+  ?line {STRes67,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB019.xsd','./msxsdtest/complexType',invalid),
+  STResList68 = [STRes67|STResList67],
+
+
+  ?line {STRes68,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB020.xsd','./msxsdtest/complexType',invalid),
+  STResList69 = [STRes68|STResList68],
+
+
+  ?line {STRes69,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB021.xsd','./msxsdtest/complexType',invalid),
+  STResList70 = [STRes69|STResList69],
+
+
+  ?line {STRes70,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB022.xsd','./msxsdtest/complexType',invalid),
+  STResList71 = [STRes70|STResList70],
+
+
+  ?line {STRes71,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB023.xsd','./msxsdtest/complexType',invalid),
+  STResList72 = [STRes71|STResList71],
+
+
+  ?line {STRes72,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB024.xsd','./msxsdtest/complexType',invalid),
+  STResList73 = [STRes72|STResList72],
+
+
+  ?line {STRes73,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB025.xsd','./msxsdtest/complexType',invalid),
+  STResList74 = [STRes73|STResList73],
+
+
+  ?line {STRes74,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB026.xsd','./msxsdtest/complexType',invalid),
+  STResList75 = [STRes74|STResList74],
+
+
+  ?line {STRes75,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB027.xsd','./msxsdtest/complexType',invalid),
+  STResList76 = [STRes75|STResList75],
+
+
+  ?line {STRes76,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB028.xsd','./msxsdtest/complexType',invalid),
+  STResList77 = [STRes76|STResList76],
+
+
+  ?line {STRes77,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB029.xsd','./msxsdtest/complexType',invalid),
+  STResList78 = [STRes77|STResList77],
+
+
+  ?line {STRes78,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB030.xsd','./msxsdtest/complexType',invalid),
+  STResList79 = [STRes78|STResList78],
+
+
+  ?line {STRes79,S79} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB031.xsd','./msxsdtest/complexType',valid),
+  STResList80 = [STRes79|STResList79],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB031.xml','./msxsdtest/complexType',valid,S79),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes80,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB032.xsd','./msxsdtest/complexType',invalid),
+  STResList81 = [STRes80|STResList80],
+
+
+  ?line {STRes81,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB033.xsd','./msxsdtest/complexType',invalid),
+  STResList82 = [STRes81|STResList81],
+
+
+  ?line {STRes82,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB034.xsd','./msxsdtest/complexType',invalid),
+  STResList83 = [STRes82|STResList82],
+
+
+  ?line {STRes83,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB035.xsd','./msxsdtest/complexType',invalid),
+  STResList84 = [STRes83|STResList83],
+
+
+  ?line {STRes84,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB036.xsd','./msxsdtest/complexType',invalid),
+  STResList85 = [STRes84|STResList84],
+
+
+  ?line {STRes85,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB037.xsd','./msxsdtest/complexType',invalid),
+  STResList86 = [STRes85|STResList85],
+
+
+  ?line {STRes86,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB038.xsd','./msxsdtest/complexType',invalid),
+  STResList87 = [STRes86|STResList86],
+
+
+  ?line {STRes87,S87} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB039.xsd','./msxsdtest/complexType',valid),
+  STResList88 = [STRes87|STResList87],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB039.xml','./msxsdtest/complexType',valid,S87),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes88,S88} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB040.xsd','./msxsdtest/complexType',valid),
+  STResList89 = [STRes88|STResList88],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB040.xml','./msxsdtest/complexType',valid,S88),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes89,S89} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB041.xsd','./msxsdtest/complexType',valid),
+  STResList90 = [STRes89|STResList89],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB041.xml','./msxsdtest/complexType',valid,S89),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes90,S90} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB042.xsd','./msxsdtest/complexType',valid),
+  STResList91 = [STRes90|STResList90],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB042.xml','./msxsdtest/complexType',valid,S90),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes91,S91} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB043.xsd','./msxsdtest/complexType',valid),
+  STResList92 = [STRes91|STResList91],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB043.xml','./msxsdtest/complexType',valid,S91),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes92,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB044.xsd','./msxsdtest/complexType',invalid),
+  STResList93 = [STRes92|STResList92],
+
+
+  ?line {STRes93,S93} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB045.xsd','./msxsdtest/complexType',valid),
+  STResList94 = [STRes93|STResList93],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB045.xml','./msxsdtest/complexType',valid,S93),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes94,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB046.xsd','./msxsdtest/complexType',invalid),
+  STResList95 = [STRes94|STResList94],
+
+
+  ?line {STRes95,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB047.xsd','./msxsdtest/complexType',invalid),
+  STResList96 = [STRes95|STResList95],
+
+
+  ?line {STRes96,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB048.xsd','./msxsdtest/complexType',invalid),
+  STResList97 = [STRes96|STResList96],
+
+
+  ?line {STRes97,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB049.xsd','./msxsdtest/complexType',invalid),
+  STResList98 = [STRes97|STResList97],
+
+
+  ?line {STRes98,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB050.xsd','./msxsdtest/complexType',invalid),
+  STResList99 = [STRes98|STResList98],
+
+
+  ?line {STRes99,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB051.xsd','./msxsdtest/complexType',invalid),
+  STResList100 = [STRes99|STResList99],
+
+
+  ?line {STRes100,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB052.xsd','./msxsdtest/complexType',invalid),
+  STResList101 = [STRes100|STResList100],
+
+
+  ?line {STRes101,S101} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB053.xsd','./msxsdtest/complexType',valid),
+  STResList102 = [STRes101|STResList101],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB053.xml','./msxsdtest/complexType',valid,S101),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes102,S102} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB054.xsd','./msxsdtest/complexType',valid),
+  STResList103 = [STRes102|STResList102],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB054.xml','./msxsdtest/complexType',valid,S102),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes103,S103} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB055.xsd','./msxsdtest/complexType',valid),
+  STResList104 = [STRes103|STResList103],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB055.xml','./msxsdtest/complexType',valid,S103),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes104,S104} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB056.xsd','./msxsdtest/complexType',valid),
+  STResList105 = [STRes104|STResList104],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB056.xml','./msxsdtest/complexType',valid,S104),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes105,S105} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB057.xsd','./msxsdtest/complexType',valid),
+  STResList106 = [STRes105|STResList105],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB057.xml','./msxsdtest/complexType',valid,S105),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes106,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB058.xsd','./msxsdtest/complexType',invalid),
+  STResList107 = [STRes106|STResList106],
+
+
+  ?line {STRes107,S107} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB059.xsd','./msxsdtest/complexType',valid),
+  STResList108 = [STRes107|STResList107],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB059.xml','./msxsdtest/complexType',valid,S107),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes108,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB060.xsd','./msxsdtest/complexType',invalid),
+  STResList109 = [STRes108|STResList108],
+
+
+  ?line {STRes109,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB061.xsd','./msxsdtest/complexType',invalid),
+  STResList110 = [STRes109|STResList109],
+
+
+  ?line {STRes110,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB062.xsd','./msxsdtest/complexType',invalid),
+  STResList111 = [STRes110|STResList110],
+
+
+  ?line {STRes111,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB063.xsd','./msxsdtest/complexType',invalid),
+  STResList112 = [STRes111|STResList111],
+
+
+  ?line {STRes112,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB064.xsd','./msxsdtest/complexType',invalid),
+  STResList113 = [STRes112|STResList112],
+
+
+  ?line {STRes113,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB065.xsd','./msxsdtest/complexType',invalid),
+  STResList114 = [STRes113|STResList113],
+
+
+  ?line {STRes114,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB066.xsd','./msxsdtest/complexType',invalid),
+  STResList115 = [STRes114|STResList114],
+
+
+  ?line {STRes115,S115} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB067.xsd','./msxsdtest/complexType',valid),
+  STResList116 = [STRes115|STResList115],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB067.xml','./msxsdtest/complexType',valid,S115),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes116,S116} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB068.xsd','./msxsdtest/complexType',valid),
+  STResList117 = [STRes116|STResList116],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB068.xml','./msxsdtest/complexType',valid,S116),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes117,S117} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB069.xsd','./msxsdtest/complexType',valid),
+  STResList118 = [STRes117|STResList117],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB069.xml','./msxsdtest/complexType',valid,S117),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes118,S118} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB070.xsd','./msxsdtest/complexType',valid),
+  STResList119 = [STRes118|STResList118],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB070.xml','./msxsdtest/complexType',valid,S118),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes119,S119} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB071.xsd','./msxsdtest/complexType',valid),
+  STResList120 = [STRes119|STResList119],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB071.xml','./msxsdtest/complexType',valid,S119),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes120,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB072.xsd','./msxsdtest/complexType',invalid),
+  STResList121 = [STRes120|STResList120],
+
+
+  ?line {STRes121,S121} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB073.xsd','./msxsdtest/complexType',valid),
+  STResList122 = [STRes121|STResList121],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB073.xml','./msxsdtest/complexType',valid,S121),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes122,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB074.xsd','./msxsdtest/complexType',invalid),
+  STResList123 = [STRes122|STResList122],
+
+
+  ?line {STRes123,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB075.xsd','./msxsdtest/complexType',invalid),
+  STResList124 = [STRes123|STResList123],
+
+
+  ?line {STRes124,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB076.xsd','./msxsdtest/complexType',invalid),
+  STResList125 = [STRes124|STResList124],
+
+
+  ?line {STRes125,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB077.xsd','./msxsdtest/complexType',invalid),
+  STResList126 = [STRes125|STResList125],
+
+
+  ?line {STRes126,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB078.xsd','./msxsdtest/complexType',invalid),
+  STResList127 = [STRes126|STResList126],
+
+
+  ?line {STRes127,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB079.xsd','./msxsdtest/complexType',invalid),
+  STResList128 = [STRes127|STResList127],
+
+
+  ?line {STRes128,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB080.xsd','./msxsdtest/complexType',invalid),
+  STResList129 = [STRes128|STResList128],
+
+
+  ?line {STRes129,S129} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB081.xsd','./msxsdtest/complexType',valid),
+  STResList130 = [STRes129|STResList129],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB081.xml','./msxsdtest/complexType',valid,S129),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes130,S130} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB082.xsd','./msxsdtest/complexType',valid),
+  STResList131 = [STRes130|STResList130],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB082.xml','./msxsdtest/complexType',valid,S130),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes131,S131} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB083.xsd','./msxsdtest/complexType',valid),
+  STResList132 = [STRes131|STResList131],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB083.xml','./msxsdtest/complexType',valid,S131),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes132,S132} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB084.xsd','./msxsdtest/complexType',valid),
+  STResList133 = [STRes132|STResList132],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB084.xml','./msxsdtest/complexType',valid,S132),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes133,S133} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB085.xsd','./msxsdtest/complexType',valid),
+  STResList134 = [STRes133|STResList133],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB085.xml','./msxsdtest/complexType',valid,S133),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes134,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB086.xsd','./msxsdtest/complexType',invalid),
+  STResList135 = [STRes134|STResList134],
+
+
+  ?line {STRes135,S135} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB087.xsd','./msxsdtest/complexType',valid),
+  STResList136 = [STRes135|STResList135],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB087.xml','./msxsdtest/complexType',valid,S135),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes136,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB088.xsd','./msxsdtest/complexType',invalid),
+  STResList137 = [STRes136|STResList136],
+
+
+  ?line {STRes137,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB089.xsd','./msxsdtest/complexType',invalid),
+  STResList138 = [STRes137|STResList137],
+
+
+  ?line {STRes138,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB090.xsd','./msxsdtest/complexType',invalid),
+  STResList139 = [STRes138|STResList138],
+
+
+  ?line {STRes139,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB091.xsd','./msxsdtest/complexType',invalid),
+  STResList140 = [STRes139|STResList139],
+
+
+  ?line {STRes140,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB092.xsd','./msxsdtest/complexType',invalid),
+  STResList141 = [STRes140|STResList140],
+
+
+  ?line {STRes141,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB093.xsd','./msxsdtest/complexType',invalid),
+  STResList142 = [STRes141|STResList141],
+
+
+  ?line {STRes142,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB094.xsd','./msxsdtest/complexType',invalid),
+  STResList143 = [STRes142|STResList142],
+
+
+  ?line {STRes143,S143} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB095.xsd','./msxsdtest/complexType',valid),
+  STResList144 = [STRes143|STResList143],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB095.xml','./msxsdtest/complexType',valid,S143),
+  ITResList56 = [ITRes55|ITResList55],
+
+
+  ?line {STRes144,S144} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB096.xsd','./msxsdtest/complexType',valid),
+  STResList145 = [STRes144|STResList144],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB096.xml','./msxsdtest/complexType',valid,S144),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes145,S145} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB097.xsd','./msxsdtest/complexType',valid),
+  STResList146 = [STRes145|STResList145],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB097.xml','./msxsdtest/complexType',valid,S145),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes146,S146} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB098.xsd','./msxsdtest/complexType',valid),
+  STResList147 = [STRes146|STResList146],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB098.xml','./msxsdtest/complexType',valid,S146),
+  ITResList59 = [ITRes58|ITResList58],
+
+
+  ?line {STRes147,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB099.xsd','./msxsdtest/complexType',invalid),
+  STResList148 = [STRes147|STResList147],
+
+
+  ?line {STRes148,S148} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB100.xsd','./msxsdtest/complexType',valid),
+  STResList149 = [STRes148|STResList148],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB100.xml','./msxsdtest/complexType',valid,S148),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes149,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB101.xsd','./msxsdtest/complexType',invalid),
+  STResList150 = [STRes149|STResList149],
+
+
+  ?line {STRes150,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB102.xsd','./msxsdtest/complexType',invalid),
+  STResList151 = [STRes150|STResList150],
+
+
+  ?line {STRes151,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB103.xsd','./msxsdtest/complexType',invalid),
+  STResList152 = [STRes151|STResList151],
+
+
+  ?line {STRes152,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB104.xsd','./msxsdtest/complexType',invalid),
+  STResList153 = [STRes152|STResList152],
+
+
+  ?line {STRes153,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB105.xsd','./msxsdtest/complexType',invalid),
+  STResList154 = [STRes153|STResList153],
+
+
+  ?line {STRes154,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB106.xsd','./msxsdtest/complexType',invalid),
+  STResList155 = [STRes154|STResList154],
+
+
+  ?line {STRes155,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB107.xsd','./msxsdtest/complexType',invalid),
+  STResList156 = [STRes155|STResList155],
+
+
+  ?line {STRes156,S156} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB108.xsd','./msxsdtest/complexType',valid),
+  STResList157 = [STRes156|STResList156],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB108.xml','./msxsdtest/complexType',valid,S156),
+  ITResList61 = [ITRes60|ITResList60],
+
+
+  ?line {STRes157,S157} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB109.xsd','./msxsdtest/complexType',valid),
+  STResList158 = [STRes157|STResList157],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB109.xml','./msxsdtest/complexType',valid,S157),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes158,S158} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB110.xsd','./msxsdtest/complexType',valid),
+  STResList159 = [STRes158|STResList158],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB110.xml','./msxsdtest/complexType',valid,S158),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes159,S159} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB111.xsd','./msxsdtest/complexType',valid),
+  STResList160 = [STRes159|STResList159],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB111.xml','./msxsdtest/complexType',valid,S159),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes160,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB112.xsd','./msxsdtest/complexType',invalid),
+  STResList161 = [STRes160|STResList160],
+
+
+  ?line {STRes161,S161} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB113.xsd','./msxsdtest/complexType',valid),
+  STResList162 = [STRes161|STResList161],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctB113.xml','./msxsdtest/complexType',valid,S161),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes162,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB114.xsd','./msxsdtest/complexType',invalid),
+  STResList163 = [STRes162|STResList162],
+
+
+  ?line {STRes163,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB115.xsd','./msxsdtest/complexType',invalid),
+  STResList164 = [STRes163|STResList163],
+
+
+  ?line {STRes164,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB116.xsd','./msxsdtest/complexType',invalid),
+  STResList165 = [STRes164|STResList164],
+
+
+  ?line {STRes165,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB117.xsd','./msxsdtest/complexType',invalid),
+  STResList166 = [STRes165|STResList165],
+
+
+  ?line {STRes166,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB118.xsd','./msxsdtest/complexType',invalid),
+  STResList167 = [STRes166|STResList166],
+
+
+  ?line {STRes167,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB119.xsd','./msxsdtest/complexType',invalid),
+  STResList168 = [STRes167|STResList167],
+
+
+  ?line {STRes168,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB120.xsd','./msxsdtest/complexType',invalid),
+  STResList169 = [STRes168|STResList168],
+
+
+  ?line {STRes169,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB121.xsd','./msxsdtest/complexType',invalid),
+  STResList170 = [STRes169|STResList169],
+
+
+  ?line {STRes170,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB122.xsd','./msxsdtest/complexType',invalid),
+  STResList171 = [STRes170|STResList170],
+
+
+  ?line {STRes171,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB123.xsd','./msxsdtest/complexType',invalid),
+  STResList172 = [STRes171|STResList171],
+
+
+  ?line {STRes172,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB124.xsd','./msxsdtest/complexType',invalid),
+  STResList173 = [STRes172|STResList172],
+
+
+  ?line {STRes173,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctB125.xsd','./msxsdtest/complexType',invalid),
+  STResList174 = [STRes173|STResList173],
+
+
+  ?line {STRes174,S174} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC001.xsd','./msxsdtest/complexType',valid),
+  STResList175 = [STRes174|STResList174],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctC001.xml','./msxsdtest/complexType',valid,S174),
+  ITResList66 = [ITRes65|ITResList65],
+
+
+  ?line {STRes175,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC002.xsd','./msxsdtest/complexType',invalid),
+  STResList176 = [STRes175|STResList175],
+
+
+  ?line {STRes176,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC003.xsd','./msxsdtest/complexType',invalid),
+  STResList177 = [STRes176|STResList176],
+
+
+  ?line {STRes177,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC004.xsd','./msxsdtest/complexType',invalid),
+  STResList178 = [STRes177|STResList177],
+
+
+  ?line {STRes178,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC005.xsd','./msxsdtest/complexType',invalid),
+  STResList179 = [STRes178|STResList178],
+
+
+  ?line {STRes179,S179} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC006.xsd','./msxsdtest/complexType',valid),
+  STResList180 = [STRes179|STResList179],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctC006.xml','./msxsdtest/complexType',valid,S179),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes180,S180} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC007.xsd','./msxsdtest/complexType',valid),
+  STResList181 = [STRes180|STResList180],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctC007.xml','./msxsdtest/complexType',valid,S180),
+  ITResList68 = [ITRes67|ITResList67],
+
+
+  ?line {STRes181,S181} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC008.xsd','./msxsdtest/complexType',valid),
+  STResList182 = [STRes181|STResList181],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctC008.xml','./msxsdtest/complexType',valid,S181),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes182,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC009.xsd','./msxsdtest/complexType',invalid),
+  STResList183 = [STRes182|STResList182],
+
+
+  ?line {STRes183,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC010.xsd','./msxsdtest/complexType',invalid),
+  STResList184 = [STRes183|STResList183],
+
+
+  ?line {STRes184,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC011.xsd','./msxsdtest/complexType',invalid),
+  STResList185 = [STRes184|STResList184],
+
+
+  ?line {STRes185,S185} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctC012.xsd','./msxsdtest/complexType',valid),
+  STResList186 = [STRes185|STResList185],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctC012.xml','./msxsdtest/complexType',valid,S185),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes186,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD001.xsd','./msxsdtest/complexType',invalid),
+  STResList187 = [STRes186|STResList186],
+
+
+  ?line {STRes187,S187} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD002.xsd','./msxsdtest/complexType',valid),
+  STResList188 = [STRes187|STResList187],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD002.xml','./msxsdtest/complexType',valid,S187),
+  ITResList71 = [ITRes70|ITResList70],
+
+
+  ?line {STRes188,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD003.xsd','./msxsdtest/complexType',invalid),
+  STResList189 = [STRes188|STResList188],
+
+
+  ?line {STRes189,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD004.xsd','./msxsdtest/complexType',invalid),
+  STResList190 = [STRes189|STResList189],
+
+
+  ?line {STRes190,S190} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD005.xsd','./msxsdtest/complexType',valid),
+  STResList191 = [STRes190|STResList190],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD005.xml','./msxsdtest/complexType',valid,S190),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes191,S191} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD006.xsd','./msxsdtest/complexType',valid),
+  STResList192 = [STRes191|STResList191],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD006.xml','./msxsdtest/complexType',valid,S191),
+  ITResList73 = [ITRes72|ITResList72],
+
+
+  ?line {STRes192,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD007.xsd','./msxsdtest/complexType',invalid),
+  STResList193 = [STRes192|STResList192],
+
+
+  ?line {STRes193,S193} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD008.xsd','./msxsdtest/complexType',valid),
+  STResList194 = [STRes193|STResList193],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD008.xml','./msxsdtest/complexType',valid,S193),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes194,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD009.xsd','./msxsdtest/complexType',invalid),
+  STResList195 = [STRes194|STResList194],
+
+
+  ?line {STRes195,S195} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD010.xsd','./msxsdtest/complexType',valid),
+  STResList196 = [STRes195|STResList195],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD010.xml','./msxsdtest/complexType',valid,S195),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes196,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD011.xsd','./msxsdtest/complexType',invalid),
+  STResList197 = [STRes196|STResList196],
+
+
+  ?line {STRes197,S197} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD012.xsd','./msxsdtest/complexType',valid),
+  STResList198 = [STRes197|STResList197],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD012.xml','./msxsdtest/complexType',valid,S197),
+  ITResList76 = [ITRes75|ITResList75],
+
+
+  ?line {STRes198,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD013.xsd','./msxsdtest/complexType',invalid),
+  STResList199 = [STRes198|STResList198],
+
+
+  ?line {STRes199,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD014.xsd','./msxsdtest/complexType',invalid),
+  STResList200 = [STRes199|STResList199],
+
+
+  ?line {STRes200,S200} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD015.xsd','./msxsdtest/complexType',valid),
+  STResList201 = [STRes200|STResList200],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD015.xml','./msxsdtest/complexType',valid,S200),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes201,S201} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD016.xsd','./msxsdtest/complexType',valid),
+  STResList202 = [STRes201|STResList201],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD016.xml','./msxsdtest/complexType',valid,S201),
+  ITResList78 = [ITRes77|ITResList77],
+
+
+  ?line {STRes202,S202} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD017.xsd','./msxsdtest/complexType',valid),
+  STResList203 = [STRes202|STResList202],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD017.xml','./msxsdtest/complexType',valid,S202),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes203,S203} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD018.xsd','./msxsdtest/complexType',valid),
+  STResList204 = [STRes203|STResList203],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD018.xml','./msxsdtest/complexType',valid,S203),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes204,S204} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD019.xsd','./msxsdtest/complexType',valid),
+  STResList205 = [STRes204|STResList204],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD019.xml','./msxsdtest/complexType',valid,S204),
+  ITResList81 = [ITRes80|ITResList80],
+
+
+  ?line {STRes205,S205} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD020.xsd','./msxsdtest/complexType',valid),
+  STResList206 = [STRes205|STResList205],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD020.xml','./msxsdtest/complexType',valid,S205),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes206,S206} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD021.xsd','./msxsdtest/complexType',valid),
+  STResList207 = [STRes206|STResList206],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD021.xml','./msxsdtest/complexType',valid,S206),
+  ITResList83 = [ITRes82|ITResList82],
+
+
+  ?line {STRes207,S207} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD022.xsd','./msxsdtest/complexType',valid),
+  STResList208 = [STRes207|STResList207],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD022.xml','./msxsdtest/complexType',valid,S207),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes208,S208} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD023.xsd','./msxsdtest/complexType',valid),
+  STResList209 = [STRes208|STResList208],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD023.xml','./msxsdtest/complexType',valid,S208),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes209,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD024.xsd','./msxsdtest/complexType',invalid),
+  STResList210 = [STRes209|STResList209],
+
+
+  ?line {STRes210,S210} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD025.xsd','./msxsdtest/complexType',valid),
+  STResList211 = [STRes210|STResList210],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD025.xml','./msxsdtest/complexType',valid,S210),
+  ITResList86 = [ITRes85|ITResList85],
+
+
+  ?line {STRes211,S211} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD026.xsd','./msxsdtest/complexType',valid),
+  STResList212 = [STRes211|STResList211],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD026.xml','./msxsdtest/complexType',valid,S211),
+  ITResList87 = [ITRes86|ITResList86],
+
+
+  ?line {STRes212,S212} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD027.xsd','./msxsdtest/complexType',valid),
+  STResList213 = [STRes212|STResList212],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD027.xml','./msxsdtest/complexType',valid,S212),
+  ITResList88 = [ITRes87|ITResList87],
+
+
+  ?line {STRes213,S213} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD028.xsd','./msxsdtest/complexType',valid),
+  STResList214 = [STRes213|STResList213],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD028.xml','./msxsdtest/complexType',valid,S213),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes214,S214} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD029.xsd','./msxsdtest/complexType',valid),
+  STResList215 = [STRes214|STResList214],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD029.xml','./msxsdtest/complexType',valid,S214),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes215,S215} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD030.xsd','./msxsdtest/complexType',valid),
+  STResList216 = [STRes215|STResList215],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD030.xml','./msxsdtest/complexType',valid,S215),
+  ITResList91 = [ITRes90|ITResList90],
+
+
+  ?line {STRes216,S216} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD031.xsd','./msxsdtest/complexType',valid),
+  STResList217 = [STRes216|STResList216],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD031.xml','./msxsdtest/complexType',valid,S216),
+  ITResList92 = [ITRes91|ITResList91],
+
+
+  ?line {STRes217,S217} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD032.xsd','./msxsdtest/complexType',valid),
+  STResList218 = [STRes217|STResList217],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD032.xml','./msxsdtest/complexType',valid,S217),
+  ITResList93 = [ITRes92|ITResList92],
+
+
+  ?line {STRes218,S218} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD033.xsd','./msxsdtest/complexType',valid),
+  STResList219 = [STRes218|STResList218],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD033.xml','./msxsdtest/complexType',valid,S218),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes219,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD034.xsd','./msxsdtest/complexType',invalid),
+  STResList220 = [STRes219|STResList219],
+
+
+  ?line {STRes220,S220} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD035.xsd','./msxsdtest/complexType',valid),
+  STResList221 = [STRes220|STResList220],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctD035.xml','./msxsdtest/complexType',valid,S220),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes221,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD036.xsd','./msxsdtest/complexType',invalid),
+  STResList222 = [STRes221|STResList221],
+
+
+  ?line {STRes222,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD037.xsd','./msxsdtest/complexType',invalid),
+  STResList223 = [STRes222|STResList222],
+
+
+  ?line {STRes223,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD038.xsd','./msxsdtest/complexType',invalid),
+  STResList224 = [STRes223|STResList223],
+
+
+  ?line {STRes224,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD039.xsd','./msxsdtest/complexType',invalid),
+  STResList225 = [STRes224|STResList224],
+
+
+  ?line {STRes225,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD040.xsd','./msxsdtest/complexType',invalid),
+  STResList226 = [STRes225|STResList225],
+
+
+  ?line {STRes226,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD041.xsd','./msxsdtest/complexType',invalid),
+  STResList227 = [STRes226|STResList226],
+
+
+  ?line {STRes227,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD042.xsd','./msxsdtest/complexType',invalid),
+  STResList228 = [STRes227|STResList227],
+
+
+  ?line {STRes228,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctD043.xsd','./msxsdtest/complexType',invalid),
+  STResList229 = [STRes228|STResList228],
+
+
+  ?line {STRes229,S229} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE001.xsd','./msxsdtest/complexType',valid),
+  STResList230 = [STRes229|STResList229],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctE001.xml','./msxsdtest/complexType',valid,S229),
+  ITResList96 = [ITRes95|ITResList95],
+
+
+  ?line {STRes230,S230} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE002.xsd','./msxsdtest/complexType',valid),
+  STResList231 = [STRes230|STResList230],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctE002.xml','./msxsdtest/complexType',valid,S230),
+  ITResList97 = [ITRes96|ITResList96],
+
+
+  ?line {STRes231,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE003.xsd','./msxsdtest/complexType',invalid),
+  STResList232 = [STRes231|STResList231],
+
+
+  ?line {STRes232,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE004.xsd','./msxsdtest/complexType',invalid),
+  STResList233 = [STRes232|STResList232],
+
+
+  ?line {STRes233,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE005.xsd','./msxsdtest/complexType',invalid),
+  STResList234 = [STRes233|STResList233],
+
+
+  ?line {STRes234,S234} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE006.xsd','./msxsdtest/complexType',valid),
+  STResList235 = [STRes234|STResList234],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctE006.xml','./msxsdtest/complexType',valid,S234),
+  ITResList98 = [ITRes97|ITResList97],
+
+
+  ?line {STRes235,S235} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE007.xsd','./msxsdtest/complexType',valid),
+  STResList236 = [STRes235|STResList235],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctE007.xml','./msxsdtest/complexType',valid,S235),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes236,S236} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE008.xsd','./msxsdtest/complexType',valid),
+  STResList237 = [STRes236|STResList236],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctE008.xml','./msxsdtest/complexType',valid,S236),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes237,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE009.xsd','./msxsdtest/complexType',invalid),
+  STResList238 = [STRes237|STResList237],
+
+
+  ?line {STRes238,S238} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE010.xsd','./msxsdtest/complexType',valid),
+  STResList239 = [STRes238|STResList238],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctE010.xml','./msxsdtest/complexType',valid,S238),
+  ITResList101 = [ITRes100|ITResList100],
+
+
+  ?line {STRes239,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE011.xsd','./msxsdtest/complexType',invalid),
+  STResList240 = [STRes239|STResList239],
+
+
+  ?line {STRes240,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE012.xsd','./msxsdtest/complexType',invalid),
+  STResList241 = [STRes240|STResList240],
+
+
+  ?line {STRes241,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE013.xsd','./msxsdtest/complexType',invalid),
+  STResList242 = [STRes241|STResList241],
+
+
+  ?line {STRes242,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE014.xsd','./msxsdtest/complexType',invalid),
+  STResList243 = [STRes242|STResList242],
+
+
+  ?line {STRes243,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE015.xsd','./msxsdtest/complexType',invalid),
+  STResList244 = [STRes243|STResList243],
+
+
+  ?line {STRes244,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE016.xsd','./msxsdtest/complexType',invalid),
+  STResList245 = [STRes244|STResList244],
+
+
+  ?line {STRes245,S245} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctE017.xsd','./msxsdtest/complexType',valid),
+  STResList246 = [STRes245|STResList245],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctE017.xml','./msxsdtest/complexType',valid,S245),
+  ITResList102 = [ITRes101|ITResList101],
+
+
+  ?line {STRes246,S246} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF001.xsd','./msxsdtest/complexType',valid),
+  STResList247 = [STRes246|STResList246],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctF001.xml','./msxsdtest/complexType',valid,S246),
+  ITResList103 = [ITRes102|ITResList102],
+
+
+  ?line {STRes247,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF002.xsd','./msxsdtest/complexType',invalid),
+  STResList248 = [STRes247|STResList247],
+
+
+  ?line {STRes248,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF003.xsd','./msxsdtest/complexType',invalid),
+  STResList249 = [STRes248|STResList248],
+
+
+  ?line {STRes249,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF004.xsd','./msxsdtest/complexType',invalid),
+  STResList250 = [STRes249|STResList249],
+
+
+  ?line {STRes250,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF005.xsd','./msxsdtest/complexType',invalid),
+  STResList251 = [STRes250|STResList250],
+
+
+  ?line {STRes251,S251} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF006.xsd','./msxsdtest/complexType',valid),
+  STResList252 = [STRes251|STResList251],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctF006.xml','./msxsdtest/complexType',valid,S251),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes252,S252} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF007.xsd','./msxsdtest/complexType',valid),
+  STResList253 = [STRes252|STResList252],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctF007.xml','./msxsdtest/complexType',valid,S252),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes253,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF008.xsd','./msxsdtest/complexType',invalid),
+  STResList254 = [STRes253|STResList253],
+
+
+  ?line {STRes254,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF009.xsd','./msxsdtest/complexType',invalid),
+  STResList255 = [STRes254|STResList254],
+
+
+  ?line {STRes255,S255} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF010.xsd','./msxsdtest/complexType',valid),
+  STResList256 = [STRes255|STResList255],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctF010.xml','./msxsdtest/complexType',valid,S255),
+  ITResList106 = [ITRes105|ITResList105],
+
+
+  ?line {STRes256,S256} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF011.xsd','./msxsdtest/complexType',valid),
+  STResList257 = [STRes256|STResList256],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctF011.xml','./msxsdtest/complexType',valid,S256),
+  ITResList107 = [ITRes106|ITResList106],
+
+
+  ?line {STRes257,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF012.xsd','./msxsdtest/complexType',invalid),
+  STResList258 = [STRes257|STResList257],
+
+
+  ?line {STRes258,S258} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF013.xsd','./msxsdtest/complexType',valid),
+  STResList259 = [STRes258|STResList258],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctF013.xml','./msxsdtest/complexType',valid,S258),
+  ITResList108 = [ITRes107|ITResList107],
+
+
+  ?line {STRes259,S259} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF014.xsd','./msxsdtest/complexType',valid),
+  STResList260 = [STRes259|STResList259],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctF014.xml','./msxsdtest/complexType',valid,S259),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes260,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF015.xsd','./msxsdtest/complexType',invalid),
+  STResList261 = [STRes260|STResList260],
+
+
+  ?line {STRes261,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF016.xsd','./msxsdtest/complexType',invalid),
+  STResList262 = [STRes261|STResList261],
+
+
+  ?line {STRes262,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctF017.xsd','./msxsdtest/complexType',invalid),
+  STResList263 = [STRes262|STResList262],
+
+
+  ?line {STRes263,S263} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG001.xsd','./msxsdtest/complexType',valid),
+  STResList264 = [STRes263|STResList263],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG001.xml','./msxsdtest/complexType',valid,S263),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes264,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG002.xsd','./msxsdtest/complexType',invalid),
+  STResList265 = [STRes264|STResList264],
+
+
+  ?line {STRes265,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG003.xsd','./msxsdtest/complexType',invalid),
+  STResList266 = [STRes265|STResList265],
+
+
+  ?line {STRes266,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG004.xsd','./msxsdtest/complexType',invalid),
+  STResList267 = [STRes266|STResList266],
+
+
+  ?line {STRes267,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG005.xsd','./msxsdtest/complexType',invalid),
+  STResList268 = [STRes267|STResList267],
+
+
+  ?line {STRes268,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG006.xsd','./msxsdtest/complexType',invalid),
+  STResList269 = [STRes268|STResList268],
+
+
+  ?line {STRes269,S269} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG007.xsd','./msxsdtest/complexType',valid),
+  STResList270 = [STRes269|STResList269],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG007.xml','./msxsdtest/complexType',valid,S269),
+  ITResList111 = [ITRes110|ITResList110],
+
+
+  ?line {STRes270,S270} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG008.xsd','./msxsdtest/complexType',valid),
+  STResList271 = [STRes270|STResList270],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG008.xml','./msxsdtest/complexType',valid,S270),
+  ITResList112 = [ITRes111|ITResList111],
+
+
+  ?line {STRes271,S271} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG009.xsd','./msxsdtest/complexType',valid),
+  STResList272 = [STRes271|STResList271],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG009.xml','./msxsdtest/complexType',valid,S271),
+  ITResList113 = [ITRes112|ITResList112],
+
+
+  ?line {STRes272,S272} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG010.xsd','./msxsdtest/complexType',valid),
+  STResList273 = [STRes272|STResList272],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG010.xml','./msxsdtest/complexType',valid,S272),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes273,S273} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG011.xsd','./msxsdtest/complexType',valid),
+  STResList274 = [STRes273|STResList273],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG011.xml','./msxsdtest/complexType',valid,S273),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes274,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG012.xsd','./msxsdtest/complexType',invalid),
+  STResList275 = [STRes274|STResList274],
+
+
+  ?line {STRes275,S275} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG013.xsd','./msxsdtest/complexType',valid),
+  STResList276 = [STRes275|STResList275],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG013.xml','./msxsdtest/complexType',valid,S275),
+  ITResList116 = [ITRes115|ITResList115],
+
+
+  ?line {STRes276,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG014.xsd','./msxsdtest/complexType',invalid),
+  STResList277 = [STRes276|STResList276],
+
+
+  ?line {STRes277,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG015.xsd','./msxsdtest/complexType',invalid),
+  STResList278 = [STRes277|STResList277],
+
+
+  ?line {STRes278,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG016.xsd','./msxsdtest/complexType',invalid),
+  STResList279 = [STRes278|STResList278],
+
+
+  ?line {STRes279,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG017.xsd','./msxsdtest/complexType',invalid),
+  STResList280 = [STRes279|STResList279],
+
+
+  ?line {STRes280,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG018.xsd','./msxsdtest/complexType',invalid),
+  STResList281 = [STRes280|STResList280],
+
+
+  ?line {STRes281,S281} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG019.xsd','./msxsdtest/complexType',valid),
+  STResList282 = [STRes281|STResList281],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG019.xml','./msxsdtest/complexType',valid,S281),
+  ITResList117 = [ITRes116|ITResList116],
+
+
+  ?line {STRes282,S282} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG020.xsd','./msxsdtest/complexType',valid),
+  STResList283 = [STRes282|STResList282],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG020.xml','./msxsdtest/complexType',valid,S282),
+  ITResList118 = [ITRes117|ITResList117],
+
+
+  ?line {STRes283,S283} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG021.xsd','./msxsdtest/complexType',valid),
+  STResList284 = [STRes283|STResList283],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG021.xml','./msxsdtest/complexType',valid,S283),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes284,S284} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG022.xsd','./msxsdtest/complexType',valid),
+  STResList285 = [STRes284|STResList284],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG022.xml','./msxsdtest/complexType',valid,S284),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes285,S285} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG023.xsd','./msxsdtest/complexType',valid),
+  STResList286 = [STRes285|STResList285],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG023.xml','./msxsdtest/complexType',valid,S285),
+  ITResList121 = [ITRes120|ITResList120],
+
+
+  ?line {STRes286,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG024.xsd','./msxsdtest/complexType',invalid),
+  STResList287 = [STRes286|STResList286],
+
+
+  ?line {STRes287,S287} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG025.xsd','./msxsdtest/complexType',valid),
+  STResList288 = [STRes287|STResList287],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG025.xml','./msxsdtest/complexType',valid,S287),
+  ITResList122 = [ITRes121|ITResList121],
+
+
+  ?line {STRes288,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG026.xsd','./msxsdtest/complexType',invalid),
+  STResList289 = [STRes288|STResList288],
+
+
+  ?line {STRes289,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG027.xsd','./msxsdtest/complexType',invalid),
+  STResList290 = [STRes289|STResList289],
+
+
+  ?line {STRes290,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG028.xsd','./msxsdtest/complexType',invalid),
+  STResList291 = [STRes290|STResList290],
+
+
+  ?line {STRes291,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG029.xsd','./msxsdtest/complexType',invalid),
+  STResList292 = [STRes291|STResList291],
+
+
+  ?line {STRes292,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG030.xsd','./msxsdtest/complexType',invalid),
+  STResList293 = [STRes292|STResList292],
+
+
+  ?line {STRes293,S293} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG031.xsd','./msxsdtest/complexType',valid),
+  STResList294 = [STRes293|STResList293],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG031.xml','./msxsdtest/complexType',valid,S293),
+  ITResList123 = [ITRes122|ITResList122],
+
+
+  ?line {STRes294,S294} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG032.xsd','./msxsdtest/complexType',valid),
+  STResList295 = [STRes294|STResList294],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG032.xml','./msxsdtest/complexType',valid,S294),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes295,S295} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG033.xsd','./msxsdtest/complexType',valid),
+  STResList296 = [STRes295|STResList295],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG033.xml','./msxsdtest/complexType',valid,S295),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes296,S296} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG034.xsd','./msxsdtest/complexType',valid),
+  STResList297 = [STRes296|STResList296],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG034.xml','./msxsdtest/complexType',valid,S296),
+  ITResList126 = [ITRes125|ITResList125],
+
+
+  ?line {STRes297,S297} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG035.xsd','./msxsdtest/complexType',valid),
+  STResList298 = [STRes297|STResList297],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG035.xml','./msxsdtest/complexType',valid,S297),
+  ITResList127 = [ITRes126|ITResList126],
+
+
+  ?line {STRes298,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG036.xsd','./msxsdtest/complexType',invalid),
+  STResList299 = [STRes298|STResList298],
+
+
+  ?line {STRes299,S299} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG037.xsd','./msxsdtest/complexType',valid),
+  STResList300 = [STRes299|STResList299],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG037.xml','./msxsdtest/complexType',valid,S299),
+  ITResList128 = [ITRes127|ITResList127],
+
+
+  ?line {STRes300,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG038.xsd','./msxsdtest/complexType',invalid),
+  STResList301 = [STRes300|STResList300],
+
+
+  ?line {STRes301,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG039.xsd','./msxsdtest/complexType',invalid),
+  STResList302 = [STRes301|STResList301],
+
+
+  ?line {STRes302,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG040.xsd','./msxsdtest/complexType',invalid),
+  STResList303 = [STRes302|STResList302],
+
+
+  ?line {STRes303,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG041.xsd','./msxsdtest/complexType',invalid),
+  STResList304 = [STRes303|STResList303],
+
+
+  ?line {STRes304,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG042.xsd','./msxsdtest/complexType',invalid),
+  STResList305 = [STRes304|STResList304],
+
+
+  ?line {STRes305,S305} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG043.xsd','./msxsdtest/complexType',valid),
+  STResList306 = [STRes305|STResList305],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG043.xml','./msxsdtest/complexType',valid,S305),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes306,S306} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG044.xsd','./msxsdtest/complexType',valid),
+  STResList307 = [STRes306|STResList306],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG044.xml','./msxsdtest/complexType',valid,S306),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  ?line {STRes307,S307} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG045.xsd','./msxsdtest/complexType',valid),
+  STResList308 = [STRes307|STResList307],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG045.xml','./msxsdtest/complexType',valid,S307),
+  ITResList131 = [ITRes130|ITResList130],
+
+
+  ?line {STRes308,S308} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG046.xsd','./msxsdtest/complexType',valid),
+  STResList309 = [STRes308|STResList308],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG046.xml','./msxsdtest/complexType',valid,S308),
+  ITResList132 = [ITRes131|ITResList131],
+
+
+  ?line {STRes309,S309} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG047.xsd','./msxsdtest/complexType',valid),
+  STResList310 = [STRes309|STResList309],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG047.xml','./msxsdtest/complexType',valid,S309),
+  ITResList133 = [ITRes132|ITResList132],
+
+
+  ?line {STRes310,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG048.xsd','./msxsdtest/complexType',invalid),
+  STResList311 = [STRes310|STResList310],
+
+
+  ?line {STRes311,S311} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG049.xsd','./msxsdtest/complexType',valid),
+  STResList312 = [STRes311|STResList311],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG049.xml','./msxsdtest/complexType',valid,S311),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes312,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG050.xsd','./msxsdtest/complexType',invalid),
+  STResList313 = [STRes312|STResList312],
+
+
+  ?line {STRes313,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG051.xsd','./msxsdtest/complexType',invalid),
+  STResList314 = [STRes313|STResList313],
+
+
+  ?line {STRes314,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG052.xsd','./msxsdtest/complexType',invalid),
+  STResList315 = [STRes314|STResList314],
+
+
+  ?line {STRes315,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG053.xsd','./msxsdtest/complexType',invalid),
+  STResList316 = [STRes315|STResList315],
+
+
+  ?line {STRes316,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG054.xsd','./msxsdtest/complexType',invalid),
+  STResList317 = [STRes316|STResList316],
+
+
+  ?line {STRes317,S317} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG055.xsd','./msxsdtest/complexType',valid),
+  STResList318 = [STRes317|STResList317],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG055.xml','./msxsdtest/complexType',valid,S317),
+  ITResList135 = [ITRes134|ITResList134],
+
+
+  ?line {STRes318,S318} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG056.xsd','./msxsdtest/complexType',valid),
+  STResList319 = [STRes318|STResList318],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG056.xml','./msxsdtest/complexType',valid,S318),
+  ITResList136 = [ITRes135|ITResList135],
+
+
+  ?line {STRes319,S319} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG057.xsd','./msxsdtest/complexType',valid),
+  STResList320 = [STRes319|STResList319],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG057.xml','./msxsdtest/complexType',valid,S319),
+  ITResList137 = [ITRes136|ITResList136],
+
+
+  ?line {STRes320,S320} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG058.xsd','./msxsdtest/complexType',valid),
+  STResList321 = [STRes320|STResList320],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG058.xml','./msxsdtest/complexType',valid,S320),
+  ITResList138 = [ITRes137|ITResList137],
+
+
+  ?line {STRes321,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG059.xsd','./msxsdtest/complexType',invalid),
+  STResList322 = [STRes321|STResList321],
+
+
+  ?line {STRes322,S322} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG060.xsd','./msxsdtest/complexType',valid),
+  STResList323 = [STRes322|STResList322],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG060.xml','./msxsdtest/complexType',valid,S322),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes323,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG061.xsd','./msxsdtest/complexType',invalid),
+  STResList324 = [STRes323|STResList323],
+
+
+  ?line {STRes324,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG062.xsd','./msxsdtest/complexType',invalid),
+  STResList325 = [STRes324|STResList324],
+
+
+  ?line {STRes325,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG063.xsd','./msxsdtest/complexType',invalid),
+  STResList326 = [STRes325|STResList325],
+
+
+  ?line {STRes326,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG064.xsd','./msxsdtest/complexType',invalid),
+  STResList327 = [STRes326|STResList326],
+
+
+  ?line {STRes327,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG065.xsd','./msxsdtest/complexType',invalid),
+  STResList328 = [STRes327|STResList327],
+
+
+  ?line {STRes328,S328} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG066.xsd','./msxsdtest/complexType',valid),
+  STResList329 = [STRes328|STResList328],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG066.xml','./msxsdtest/complexType',valid,S328),
+  ITResList140 = [ITRes139|ITResList139],
+
+
+  ?line {STRes329,S329} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG067.xsd','./msxsdtest/complexType',valid),
+  STResList330 = [STRes329|STResList329],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG067.xml','./msxsdtest/complexType',valid,S329),
+  ITResList141 = [ITRes140|ITResList140],
+
+
+  ?line {STRes330,S330} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG068.xsd','./msxsdtest/complexType',valid),
+  STResList331 = [STRes330|STResList330],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG068.xml','./msxsdtest/complexType',valid,S330),
+  ITResList142 = [ITRes141|ITResList141],
+
+
+  ?line {STRes331,S331} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG069.xsd','./msxsdtest/complexType',valid),
+  STResList332 = [STRes331|STResList331],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG069.xml','./msxsdtest/complexType',valid,S331),
+  ITResList143 = [ITRes142|ITResList142],
+
+
+  ?line {STRes332,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG070.xsd','./msxsdtest/complexType',invalid),
+  STResList333 = [STRes332|STResList332],
+
+
+  ?line {STRes333,S333} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG071.xsd','./msxsdtest/complexType',valid),
+  STResList334 = [STRes333|STResList333],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctG071.xml','./msxsdtest/complexType',valid,S333),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes334,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG072.xsd','./msxsdtest/complexType',invalid),
+  STResList335 = [STRes334|STResList334],
+
+
+  ?line {STRes335,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG073.xsd','./msxsdtest/complexType',invalid),
+  STResList336 = [STRes335|STResList335],
+
+
+  ?line {STRes336,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG074.xsd','./msxsdtest/complexType',invalid),
+  STResList337 = [STRes336|STResList336],
+
+
+  ?line {STRes337,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG075.xsd','./msxsdtest/complexType',invalid),
+  STResList338 = [STRes337|STResList337],
+
+
+  ?line {STRes338,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG076.xsd','./msxsdtest/complexType',invalid),
+  STResList339 = [STRes338|STResList338],
+
+
+  ?line {STRes339,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG077.xsd','./msxsdtest/complexType',invalid),
+  STResList340 = [STRes339|STResList339],
+
+
+  ?line {STRes340,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG078.xsd','./msxsdtest/complexType',invalid),
+  STResList341 = [STRes340|STResList340],
+
+
+  ?line {STRes341,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG079.xsd','./msxsdtest/complexType',invalid),
+  STResList342 = [STRes341|STResList341],
+
+
+  ?line {STRes342,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG080.xsd','./msxsdtest/complexType',invalid),
+  STResList343 = [STRes342|STResList342],
+
+
+  ?line {STRes343,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctG081.xsd','./msxsdtest/complexType',invalid),
+  STResList344 = [STRes343|STResList343],
+
+
+  ?line {STRes344,S344} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH001.xsd','./msxsdtest/complexType',valid),
+  STResList345 = [STRes344|STResList344],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH001.xml','./msxsdtest/complexType',valid,S344),
+  ITResList145 = [ITRes144|ITResList144],
+
+
+  ?line {STRes345,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH002.xsd','./msxsdtest/complexType',invalid),
+  STResList346 = [STRes345|STResList345],
+
+
+  ?line {STRes346,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH003.xsd','./msxsdtest/complexType',invalid),
+  STResList347 = [STRes346|STResList346],
+
+
+  ?line {STRes347,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH004.xsd','./msxsdtest/complexType',invalid),
+  STResList348 = [STRes347|STResList347],
+
+
+  ?line {STRes348,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH005.xsd','./msxsdtest/complexType',invalid),
+  STResList349 = [STRes348|STResList348],
+
+
+  ?line {STRes349,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH006.xsd','./msxsdtest/complexType',invalid),
+  STResList350 = [STRes349|STResList349],
+
+
+  ?line {STRes350,S350} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH007.xsd','./msxsdtest/complexType',valid),
+  STResList351 = [STRes350|STResList350],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH007.xml','./msxsdtest/complexType',valid,S350),
+  ITResList146 = [ITRes145|ITResList145],
+
+
+  ?line {STRes351,S351} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH008.xsd','./msxsdtest/complexType',valid),
+  STResList352 = [STRes351|STResList351],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH008.xml','./msxsdtest/complexType',valid,S351),
+  ITResList147 = [ITRes146|ITResList146],
+
+
+  ?line {STRes352,S352} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH009.xsd','./msxsdtest/complexType',valid),
+  STResList353 = [STRes352|STResList352],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH009.xml','./msxsdtest/complexType',valid,S352),
+  ITResList148 = [ITRes147|ITResList147],
+
+
+  ?line {STRes353,S353} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH010.xsd','./msxsdtest/complexType',valid),
+  STResList354 = [STRes353|STResList353],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH010.xml','./msxsdtest/complexType',valid,S353),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes354,S354} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH011.xsd','./msxsdtest/complexType',valid),
+  STResList355 = [STRes354|STResList354],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH011.xml','./msxsdtest/complexType',valid,S354),
+  ITResList150 = [ITRes149|ITResList149],
+
+
+  ?line {STRes355,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH012.xsd','./msxsdtest/complexType',invalid),
+  STResList356 = [STRes355|STResList355],
+
+
+  ?line {STRes356,S356} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH013.xsd','./msxsdtest/complexType',valid),
+  STResList357 = [STRes356|STResList356],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH013.xml','./msxsdtest/complexType',valid,S356),
+  ITResList151 = [ITRes150|ITResList150],
+
+
+  ?line {STRes357,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH014.xsd','./msxsdtest/complexType',invalid),
+  STResList358 = [STRes357|STResList357],
+
+
+  ?line {STRes358,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH015.xsd','./msxsdtest/complexType',invalid),
+  STResList359 = [STRes358|STResList358],
+
+
+  ?line {STRes359,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH016.xsd','./msxsdtest/complexType',invalid),
+  STResList360 = [STRes359|STResList359],
+
+
+  ?line {STRes360,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH017.xsd','./msxsdtest/complexType',invalid),
+  STResList361 = [STRes360|STResList360],
+
+
+  ?line {STRes361,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH018.xsd','./msxsdtest/complexType',invalid),
+  STResList362 = [STRes361|STResList361],
+
+
+  ?line {STRes362,S362} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH019.xsd','./msxsdtest/complexType',valid),
+  STResList363 = [STRes362|STResList362],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH019.xml','./msxsdtest/complexType',valid,S362),
+  ITResList152 = [ITRes151|ITResList151],
+
+
+  ?line {STRes363,S363} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH020.xsd','./msxsdtest/complexType',valid),
+  STResList364 = [STRes363|STResList363],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH020.xml','./msxsdtest/complexType',valid,S363),
+  ITResList153 = [ITRes152|ITResList152],
+
+
+  ?line {STRes364,S364} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH021.xsd','./msxsdtest/complexType',valid),
+  STResList365 = [STRes364|STResList364],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH021.xml','./msxsdtest/complexType',valid,S364),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes365,S365} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH022.xsd','./msxsdtest/complexType',valid),
+  STResList366 = [STRes365|STResList365],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH022.xml','./msxsdtest/complexType',valid,S365),
+  ITResList155 = [ITRes154|ITResList154],
+
+
+  ?line {STRes366,S366} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH023.xsd','./msxsdtest/complexType',valid),
+  STResList367 = [STRes366|STResList366],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH023.xml','./msxsdtest/complexType',valid,S366),
+  ITResList156 = [ITRes155|ITResList155],
+
+
+  ?line {STRes367,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH024.xsd','./msxsdtest/complexType',invalid),
+  STResList368 = [STRes367|STResList367],
+
+
+  ?line {STRes368,S368} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH025.xsd','./msxsdtest/complexType',valid),
+  STResList369 = [STRes368|STResList368],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH025.xml','./msxsdtest/complexType',valid,S368),
+  ITResList157 = [ITRes156|ITResList156],
+
+
+  ?line {STRes369,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH026.xsd','./msxsdtest/complexType',invalid),
+  STResList370 = [STRes369|STResList369],
+
+
+  ?line {STRes370,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH027.xsd','./msxsdtest/complexType',invalid),
+  STResList371 = [STRes370|STResList370],
+
+
+  ?line {STRes371,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH028.xsd','./msxsdtest/complexType',invalid),
+  STResList372 = [STRes371|STResList371],
+
+
+  ?line {STRes372,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH029.xsd','./msxsdtest/complexType',invalid),
+  STResList373 = [STRes372|STResList372],
+
+
+  ?line {STRes373,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH030.xsd','./msxsdtest/complexType',invalid),
+  STResList374 = [STRes373|STResList373],
+
+
+  ?line {STRes374,S374} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH031.xsd','./msxsdtest/complexType',valid),
+  STResList375 = [STRes374|STResList374],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH031.xml','./msxsdtest/complexType',valid,S374),
+  ITResList158 = [ITRes157|ITResList157],
+
+
+  ?line {STRes375,S375} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH032.xsd','./msxsdtest/complexType',valid),
+  STResList376 = [STRes375|STResList375],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH032.xml','./msxsdtest/complexType',valid,S375),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes376,S376} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH033.xsd','./msxsdtest/complexType',valid),
+  STResList377 = [STRes376|STResList376],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH033.xml','./msxsdtest/complexType',valid,S376),
+  ITResList160 = [ITRes159|ITResList159],
+
+
+  ?line {STRes377,S377} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH034.xsd','./msxsdtest/complexType',valid),
+  STResList378 = [STRes377|STResList377],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH034.xml','./msxsdtest/complexType',valid,S377),
+  ITResList161 = [ITRes160|ITResList160],
+
+
+  ?line {STRes378,S378} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH035.xsd','./msxsdtest/complexType',valid),
+  STResList379 = [STRes378|STResList378],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH035.xml','./msxsdtest/complexType',valid,S378),
+  ITResList162 = [ITRes161|ITResList161],
+
+
+  ?line {STRes379,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH036.xsd','./msxsdtest/complexType',invalid),
+  STResList380 = [STRes379|STResList379],
+
+
+  ?line {STRes380,S380} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH037.xsd','./msxsdtest/complexType',valid),
+  STResList381 = [STRes380|STResList380],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH037.xml','./msxsdtest/complexType',valid,S380),
+  ITResList163 = [ITRes162|ITResList162],
+
+
+  ?line {STRes381,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH038.xsd','./msxsdtest/complexType',invalid),
+  STResList382 = [STRes381|STResList381],
+
+
+  ?line {STRes382,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH039.xsd','./msxsdtest/complexType',invalid),
+  STResList383 = [STRes382|STResList382],
+
+
+  ?line {STRes383,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH040.xsd','./msxsdtest/complexType',invalid),
+  STResList384 = [STRes383|STResList383],
+
+
+  ?line {STRes384,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH041.xsd','./msxsdtest/complexType',invalid),
+  STResList385 = [STRes384|STResList384],
+
+
+  ?line {STRes385,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH042.xsd','./msxsdtest/complexType',invalid),
+  STResList386 = [STRes385|STResList385],
+
+
+  ?line {STRes386,S386} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH043.xsd','./msxsdtest/complexType',valid),
+  STResList387 = [STRes386|STResList386],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH043.xml','./msxsdtest/complexType',valid,S386),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes387,S387} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH044.xsd','./msxsdtest/complexType',valid),
+  STResList388 = [STRes387|STResList387],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH044.xml','./msxsdtest/complexType',valid,S387),
+  ITResList165 = [ITRes164|ITResList164],
+
+
+  ?line {STRes388,S388} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH045.xsd','./msxsdtest/complexType',valid),
+  STResList389 = [STRes388|STResList388],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH045.xml','./msxsdtest/complexType',valid,S388),
+  ITResList166 = [ITRes165|ITResList165],
+
+
+  ?line {STRes389,S389} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH046.xsd','./msxsdtest/complexType',valid),
+  STResList390 = [STRes389|STResList389],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH046.xml','./msxsdtest/complexType',valid,S389),
+  ITResList167 = [ITRes166|ITResList166],
+
+
+  ?line {STRes390,S390} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH047.xsd','./msxsdtest/complexType',valid),
+  STResList391 = [STRes390|STResList390],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH047.xml','./msxsdtest/complexType',valid,S390),
+  ITResList168 = [ITRes167|ITResList167],
+
+
+  ?line {STRes391,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH048.xsd','./msxsdtest/complexType',invalid),
+  STResList392 = [STRes391|STResList391],
+
+
+  ?line {STRes392,S392} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH049.xsd','./msxsdtest/complexType',valid),
+  STResList393 = [STRes392|STResList392],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH049.xml','./msxsdtest/complexType',valid,S392),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  ?line {STRes393,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH050.xsd','./msxsdtest/complexType',invalid),
+  STResList394 = [STRes393|STResList393],
+
+
+  ?line {STRes394,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH051.xsd','./msxsdtest/complexType',invalid),
+  STResList395 = [STRes394|STResList394],
+
+
+  ?line {STRes395,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH052.xsd','./msxsdtest/complexType',invalid),
+  STResList396 = [STRes395|STResList395],
+
+
+  ?line {STRes396,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH053.xsd','./msxsdtest/complexType',invalid),
+  STResList397 = [STRes396|STResList396],
+
+
+  ?line {STRes397,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH054.xsd','./msxsdtest/complexType',invalid),
+  STResList398 = [STRes397|STResList397],
+
+
+  ?line {STRes398,S398} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH055.xsd','./msxsdtest/complexType',valid),
+  STResList399 = [STRes398|STResList398],
+  ?line ITRes169 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH055.xml','./msxsdtest/complexType',valid,S398),
+  ITResList170 = [ITRes169|ITResList169],
+
+
+  ?line {STRes399,S399} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH056.xsd','./msxsdtest/complexType',valid),
+  STResList400 = [STRes399|STResList399],
+  ?line ITRes170 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH056.xml','./msxsdtest/complexType',valid,S399),
+  ITResList171 = [ITRes170|ITResList170],
+
+
+  ?line {STRes400,S400} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH057.xsd','./msxsdtest/complexType',valid),
+  STResList401 = [STRes400|STResList400],
+  ?line ITRes171 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH057.xml','./msxsdtest/complexType',valid,S400),
+  ITResList172 = [ITRes171|ITResList171],
+
+
+  ?line {STRes401,S401} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH058.xsd','./msxsdtest/complexType',valid),
+  STResList402 = [STRes401|STResList401],
+  ?line ITRes172 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH058.xml','./msxsdtest/complexType',valid,S401),
+  ITResList173 = [ITRes172|ITResList172],
+
+
+  ?line {STRes402,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH059.xsd','./msxsdtest/complexType',invalid),
+  STResList403 = [STRes402|STResList402],
+
+
+  ?line {STRes403,S403} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH060.xsd','./msxsdtest/complexType',valid),
+  STResList404 = [STRes403|STResList403],
+  ?line ITRes173 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH060.xml','./msxsdtest/complexType',valid,S403),
+  ITResList174 = [ITRes173|ITResList173],
+
+
+  ?line {STRes404,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH061.xsd','./msxsdtest/complexType',invalid),
+  STResList405 = [STRes404|STResList404],
+
+
+  ?line {STRes405,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH062.xsd','./msxsdtest/complexType',invalid),
+  STResList406 = [STRes405|STResList405],
+
+
+  ?line {STRes406,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH063.xsd','./msxsdtest/complexType',invalid),
+  STResList407 = [STRes406|STResList406],
+
+
+  ?line {STRes407,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH064.xsd','./msxsdtest/complexType',invalid),
+  STResList408 = [STRes407|STResList407],
+
+
+  ?line {STRes408,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH065.xsd','./msxsdtest/complexType',invalid),
+  STResList409 = [STRes408|STResList408],
+
+
+  ?line {STRes409,S409} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH066.xsd','./msxsdtest/complexType',valid),
+  STResList410 = [STRes409|STResList409],
+  ?line ITRes174 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH066.xml','./msxsdtest/complexType',valid,S409),
+  ITResList175 = [ITRes174|ITResList174],
+
+
+  ?line {STRes410,S410} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH067.xsd','./msxsdtest/complexType',valid),
+  STResList411 = [STRes410|STResList410],
+  ?line ITRes175 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH067.xml','./msxsdtest/complexType',valid,S410),
+  ITResList176 = [ITRes175|ITResList175],
+
+
+  ?line {STRes411,S411} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH068.xsd','./msxsdtest/complexType',valid),
+  STResList412 = [STRes411|STResList411],
+  ?line ITRes176 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH068.xml','./msxsdtest/complexType',valid,S411),
+  ITResList177 = [ITRes176|ITResList176],
+
+
+  ?line {STRes412,S412} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH069.xsd','./msxsdtest/complexType',valid),
+  STResList413 = [STRes412|STResList412],
+  ?line ITRes177 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH069.xml','./msxsdtest/complexType',valid,S412),
+  ITResList178 = [ITRes177|ITResList177],
+
+
+  ?line {STRes413,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH070.xsd','./msxsdtest/complexType',invalid),
+  STResList414 = [STRes413|STResList413],
+
+
+  ?line {STRes414,S414} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH071.xsd','./msxsdtest/complexType',valid),
+  STResList415 = [STRes414|STResList414],
+  ?line ITRes178 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH071.xml','./msxsdtest/complexType',valid,S414),
+  ITResList179 = [ITRes178|ITResList178],
+
+
+  ?line {STRes415,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH072.xsd','./msxsdtest/complexType',invalid),
+  STResList416 = [STRes415|STResList415],
+
+
+  ?line {STRes416,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH073.xsd','./msxsdtest/complexType',invalid),
+  STResList417 = [STRes416|STResList416],
+
+
+  ?line {STRes417,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH074.xsd','./msxsdtest/complexType',invalid),
+  STResList418 = [STRes417|STResList417],
+
+
+  ?line {STRes418,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH075.xsd','./msxsdtest/complexType',invalid),
+  STResList419 = [STRes418|STResList418],
+
+
+  ?line {STRes419,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH076.xsd','./msxsdtest/complexType',invalid),
+  STResList420 = [STRes419|STResList419],
+
+
+  ?line {STRes420,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH077.xsd','./msxsdtest/complexType',invalid),
+  STResList421 = [STRes420|STResList420],
+
+
+  ?line {STRes421,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH078.xsd','./msxsdtest/complexType',invalid),
+  STResList422 = [STRes421|STResList421],
+
+
+  ?line {STRes422,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH079.xsd','./msxsdtest/complexType',invalid),
+  STResList423 = [STRes422|STResList422],
+
+
+  ?line {STRes423,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH080.xsd','./msxsdtest/complexType',invalid),
+  STResList424 = [STRes423|STResList423],
+
+
+  ?line {STRes424,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH081.xsd','./msxsdtest/complexType',invalid),
+  STResList425 = [STRes424|STResList424],
+
+
+  ?line {STRes425,S425} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctH082.xsd','./msxsdtest/complexType',valid),
+  STResList426 = [STRes425|STResList425],
+  ?line ITRes179 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctH082.xml','./msxsdtest/complexType',valid,S425),
+  ITResList180 = [ITRes179|ITResList179],
+
+
+  ?line {STRes426,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI001.xsd','./msxsdtest/complexType',invalid),
+  STResList427 = [STRes426|STResList426],
+
+
+  ?line {STRes427,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI002.xsd','./msxsdtest/complexType',invalid),
+  STResList428 = [STRes427|STResList427],
+
+
+  ?line {STRes428,S428} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI003.xsd','./msxsdtest/complexType',valid),
+  STResList429 = [STRes428|STResList428],
+  ?line ITRes180 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI003.xml','./msxsdtest/complexType',valid,S428),
+  ITResList181 = [ITRes180|ITResList180],
+
+
+  ?line {STRes429,S429} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI004.xsd','./msxsdtest/complexType',valid),
+  STResList430 = [STRes429|STResList429],
+  ?line ITRes181 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI004.xml','./msxsdtest/complexType',valid,S429),
+  ITResList182 = [ITRes181|ITResList181],
+
+
+  ?line {STRes430,S430} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI005.xsd','./msxsdtest/complexType',valid),
+  STResList431 = [STRes430|STResList430],
+  ?line ITRes182 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI005.xml','./msxsdtest/complexType',valid,S430),
+  ITResList183 = [ITRes182|ITResList182],
+
+
+  ?line {STRes431,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI006.xsd','./msxsdtest/complexType',invalid),
+  STResList432 = [STRes431|STResList431],
+
+
+  ?line {STRes432,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI007.xsd','./msxsdtest/complexType',invalid),
+  STResList433 = [STRes432|STResList432],
+
+
+  ?line {STRes433,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI008.xsd','./msxsdtest/complexType',invalid),
+  STResList434 = [STRes433|STResList433],
+
+
+  ?line {STRes434,S434} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI009.xsd','./msxsdtest/complexType',valid),
+  STResList435 = [STRes434|STResList434],
+  ?line ITRes183 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI009.xml','./msxsdtest/complexType',valid,S434),
+  ITResList184 = [ITRes183|ITResList183],
+
+
+  ?line {STRes435,S435} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI010.xsd','./msxsdtest/complexType',valid),
+  STResList436 = [STRes435|STResList435],
+  ?line ITRes184 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI010.xml','./msxsdtest/complexType',valid,S435),
+  ITResList185 = [ITRes184|ITResList184],
+
+
+  ?line {STRes436,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI011.xsd','./msxsdtest/complexType',invalid),
+  STResList437 = [STRes436|STResList436],
+
+
+  ?line {STRes437,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI012.xsd','./msxsdtest/complexType',invalid),
+  STResList438 = [STRes437|STResList437],
+
+
+  ?line {STRes438,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI013.xsd','./msxsdtest/complexType',invalid),
+  STResList439 = [STRes438|STResList438],
+
+
+  ?line {STRes439,S439} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI014.xsd','./msxsdtest/complexType',valid),
+  STResList440 = [STRes439|STResList439],
+  ?line ITRes185 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI014.xml','./msxsdtest/complexType',valid,S439),
+  ITResList186 = [ITRes185|ITResList185],
+
+
+  ?line {STRes440,S440} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI015.xsd','./msxsdtest/complexType',valid),
+  STResList441 = [STRes440|STResList440],
+  ?line ITRes186 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI015.xml','./msxsdtest/complexType',valid,S440),
+  ITResList187 = [ITRes186|ITResList186],
+
+
+  ?line {STRes441,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI016.xsd','./msxsdtest/complexType',invalid),
+  STResList442 = [STRes441|STResList441],
+
+
+  ?line {STRes442,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI017.xsd','./msxsdtest/complexType',invalid),
+  STResList443 = [STRes442|STResList442],
+
+
+  ?line {STRes443,S443} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI018.xsd','./msxsdtest/complexType',valid),
+  STResList444 = [STRes443|STResList443],
+  ?line ITRes187 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI018.xml','./msxsdtest/complexType',valid,S443),
+  ITResList188 = [ITRes187|ITResList187],
+
+
+  ?line {STRes444,S444} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI019.xsd','./msxsdtest/complexType',valid),
+  STResList445 = [STRes444|STResList444],
+  ?line ITRes188 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI019.xml','./msxsdtest/complexType',valid,S444),
+  ITResList189 = [ITRes188|ITResList188],
+
+
+  ?line {STRes445,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI020.xsd','./msxsdtest/complexType',invalid),
+  STResList446 = [STRes445|STResList445],
+
+
+  ?line {STRes446,S446} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI021.xsd','./msxsdtest/complexType',valid),
+  STResList447 = [STRes446|STResList446],
+  ?line ITRes189 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI021.xml','./msxsdtest/complexType',valid,S446),
+  ITResList190 = [ITRes189|ITResList189],
+
+
+  ?line {STRes447,S447} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI022.xsd','./msxsdtest/complexType',valid),
+  STResList448 = [STRes447|STResList447],
+  ?line ITRes190 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI022.xml','./msxsdtest/complexType',valid,S447),
+  ITResList191 = [ITRes190|ITResList190],
+
+
+  ?line {STRes448,S448} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI023.xsd','./msxsdtest/complexType',valid),
+  STResList449 = [STRes448|STResList448],
+  ?line ITRes191 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI023.xml','./msxsdtest/complexType',valid,S448),
+  ITResList192 = [ITRes191|ITResList191],
+
+
+  ?line {STRes449,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI024.xsd','./msxsdtest/complexType',invalid),
+  STResList450 = [STRes449|STResList449],
+
+
+  ?line {STRes450,S450} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI025.xsd','./msxsdtest/complexType',valid),
+  STResList451 = [STRes450|STResList450],
+  ?line ITRes192 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI025.xml','./msxsdtest/complexType',valid,S450),
+  ITResList193 = [ITRes192|ITResList192],
+
+
+  ?line {STRes451,S451} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI026.xsd','./msxsdtest/complexType',valid),
+  STResList452 = [STRes451|STResList451],
+  ?line ITRes193 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI026.xml','./msxsdtest/complexType',valid,S451),
+  ITResList194 = [ITRes193|ITResList193],
+
+
+  ?line {STRes452,S452} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI027.xsd','./msxsdtest/complexType',valid),
+  STResList453 = [STRes452|STResList452],
+  ?line ITRes194 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI027.xml','./msxsdtest/complexType',valid,S452),
+  ITResList195 = [ITRes194|ITResList194],
+
+
+  ?line {STRes453,S453} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI028.xsd','./msxsdtest/complexType',valid),
+  STResList454 = [STRes453|STResList453],
+  ?line ITRes195 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI028.xml','./msxsdtest/complexType',valid,S453),
+  ITResList196 = [ITRes195|ITResList195],
+
+
+  ?line {STRes454,S454} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI029.xsd','./msxsdtest/complexType',valid),
+  STResList455 = [STRes454|STResList454],
+  ?line ITRes196 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI029.xml','./msxsdtest/complexType',valid,S454),
+  ITResList197 = [ITRes196|ITResList196],
+
+
+  ?line {STRes455,S455} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI030.xsd','./msxsdtest/complexType',valid),
+  STResList456 = [STRes455|STResList455],
+  ?line ITRes197 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI030.xml','./msxsdtest/complexType',invalid,S455),
+  ITResList198 = [ITRes197|ITResList197],
+
+
+  ?line {STRes456,S456} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI031.xsd','./msxsdtest/complexType',valid),
+  STResList457 = [STRes456|STResList456],
+  ?line ITRes198 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI031.xml','./msxsdtest/complexType',invalid,S456),
+  ITResList199 = [ITRes198|ITResList198],
+
+
+  ?line {STRes457,S457} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI032.xsd','./msxsdtest/complexType',valid),
+  STResList458 = [STRes457|STResList457],
+  ?line ITRes199 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI032.xml','./msxsdtest/complexType',invalid,S457),
+  ITResList200 = [ITRes199|ITResList199],
+
+
+  ?line {STRes458,S458} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI033.xsd','./msxsdtest/complexType',valid),
+  STResList459 = [STRes458|STResList458],
+  ?line ITRes200 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI033.xml','./msxsdtest/complexType',valid,S458),
+  ITResList201 = [ITRes200|ITResList200],
+
+
+  ?line {STRes459,S459} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI034.xsd','./msxsdtest/complexType',valid),
+  STResList460 = [STRes459|STResList459],
+  ?line ITRes201 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI034.xml','./msxsdtest/complexType',valid,S459),
+  ITResList202 = [ITRes201|ITResList201],
+
+
+  ?line {STRes460,S460} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI035.xsd','./msxsdtest/complexType',valid),
+  STResList461 = [STRes460|STResList460],
+  ?line ITRes202 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI035.xml','./msxsdtest/complexType',invalid,S460),
+  ITResList203 = [ITRes202|ITResList202],
+
+
+  ?line {STRes461,S461} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI036.xsd','./msxsdtest/complexType',valid),
+  STResList462 = [STRes461|STResList461],
+  ?line ITRes203 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI036.xml','./msxsdtest/complexType',valid,S461),
+  ITResList204 = [ITRes203|ITResList203],
+
+
+  ?line {STRes462,S462} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI037.xsd','./msxsdtest/complexType',valid),
+  STResList463 = [STRes462|STResList462],
+  ?line ITRes204 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI037.xml','./msxsdtest/complexType',valid,S462),
+  ITResList205 = [ITRes204|ITResList204],
+
+
+  ?line {STRes463,S463} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI038.xsd','./msxsdtest/complexType',valid),
+  STResList464 = [STRes463|STResList463],
+  ?line ITRes205 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI038.xml','./msxsdtest/complexType',invalid,S463),
+  ITResList206 = [ITRes205|ITResList205],
+
+
+  ?line {STRes464,S464} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI039.xsd','./msxsdtest/complexType',valid),
+  STResList465 = [STRes464|STResList464],
+  ?line ITRes206 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI039.xml','./msxsdtest/complexType',invalid,S464),
+  ITResList207 = [ITRes206|ITResList206],
+
+
+  ?line {STRes465,S465} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI040.xsd','./msxsdtest/complexType',valid),
+  STResList466 = [STRes465|STResList465],
+  ?line ITRes207 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI040.xml','./msxsdtest/complexType',valid,S465),
+  ITResList208 = [ITRes207|ITResList207],
+
+
+  ?line {STRes466,S466} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI041.xsd','./msxsdtest/complexType',valid),
+  STResList467 = [STRes466|STResList466],
+  ?line ITRes208 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI041.xml','./msxsdtest/complexType',valid,S466),
+  ITResList209 = [ITRes208|ITResList208],
+
+
+  ?line {STRes467,S467} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI042.xsd','./msxsdtest/complexType',valid),
+  STResList468 = [STRes467|STResList467],
+  ?line ITRes209 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI042.xml','./msxsdtest/complexType',invalid,S467),
+  ITResList210 = [ITRes209|ITResList209],
+
+
+  ?line {STRes468,S468} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI043.xsd','./msxsdtest/complexType',valid),
+  STResList469 = [STRes468|STResList468],
+  ?line ITRes210 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI043.xml','./msxsdtest/complexType',valid,S468),
+  ITResList211 = [ITRes210|ITResList210],
+
+
+  ?line {STRes469,S469} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI044.xsd','./msxsdtest/complexType',valid),
+  STResList470 = [STRes469|STResList469],
+  ?line ITRes211 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI044.xml','./msxsdtest/complexType',valid,S469),
+  ITResList212 = [ITRes211|ITResList211],
+
+
+  ?line {STRes470,S470} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI045.xsd','./msxsdtest/complexType',valid),
+  STResList471 = [STRes470|STResList470],
+  ?line ITRes212 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI045.xml','./msxsdtest/complexType',invalid,S470),
+  ITResList213 = [ITRes212|ITResList212],
+
+
+  ?line {STRes471,S471} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI046.xsd','./msxsdtest/complexType',valid),
+  STResList472 = [STRes471|STResList471],
+  ?line ITRes213 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI046.xml','./msxsdtest/complexType',valid,S471),
+  ITResList214 = [ITRes213|ITResList213],
+
+
+  ?line {STRes472,S472} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI047.xsd','./msxsdtest/complexType',valid),
+  STResList473 = [STRes472|STResList472],
+  ?line ITRes214 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI047.xml','./msxsdtest/complexType',valid,S472),
+  ITResList215 = [ITRes214|ITResList214],
+
+
+  ?line {STRes473,S473} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI048.xsd','./msxsdtest/complexType',valid),
+  STResList474 = [STRes473|STResList473],
+  ?line ITRes215 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI048.xml','./msxsdtest/complexType',invalid,S473),
+  ITResList216 = [ITRes215|ITResList215],
+
+
+  ?line {STRes474,S474} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI049.xsd','./msxsdtest/complexType',valid),
+  STResList475 = [STRes474|STResList474],
+  ?line ITRes216 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI049.xml','./msxsdtest/complexType',invalid,S474),
+  ITResList217 = [ITRes216|ITResList216],
+
+
+  ?line {STRes475,S475} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctI050.xsd','./msxsdtest/complexType',valid),
+  STResList476 = [STRes475|STResList475],
+  ?line ITRes217 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctI050.xml','./msxsdtest/complexType',valid,S475),
+  ITResList218 = [ITRes217|ITResList217],
+
+
+  ?line {STRes476,S476} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctJ001.xsd','./msxsdtest/complexType',valid),
+  STResList477 = [STRes476|STResList476],
+  ?line ITRes218 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctJ001.xml','./msxsdtest/complexType',valid,S476),
+  ITResList219 = [ITRes218|ITResList218],
+
+
+  ?line {STRes477,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctJ002.xsd','./msxsdtest/complexType',invalid),
+  STResList478 = [STRes477|STResList477],
+
+
+  ?line {STRes478,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctJ003.xsd','./msxsdtest/complexType',invalid),
+  STResList479 = [STRes478|STResList478],
+
+
+  ?line {STRes479,S479} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctK001.xsd','./msxsdtest/complexType',valid),
+  STResList480 = [STRes479|STResList479],
+  ?line ITRes219 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctK001.xml','./msxsdtest/complexType',valid,S479),
+  ITResList220 = [ITRes219|ITResList219],
+
+
+  ?line {STRes480,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctK002.xsd','./msxsdtest/complexType',invalid),
+  STResList481 = [STRes480|STResList480],
+
+
+  ?line {STRes481,S481} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL001.xsd','./msxsdtest/complexType',valid),
+  STResList482 = [STRes481|STResList481],
+  ?line ITRes220 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL001.xml','./msxsdtest/complexType',invalid,S481),
+  ITResList221 = [ITRes220|ITResList220],
+
+
+  ?line {STRes482,S482} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL002.xsd','./msxsdtest/complexType',valid),
+  STResList483 = [STRes482|STResList482],
+  ?line ITRes221 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL002.xml','./msxsdtest/complexType',invalid,S482),
+  ITResList222 = [ITRes221|ITResList221],
+
+
+  ?line {STRes483,S483} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL003.xsd','./msxsdtest/complexType',valid),
+  STResList484 = [STRes483|STResList483],
+  ?line ITRes222 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL003.xml','./msxsdtest/complexType',valid,S483),
+  ITResList223 = [ITRes222|ITResList222],
+
+
+  ?line {STRes484,S484} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL004.xsd','./msxsdtest/complexType',valid),
+  STResList485 = [STRes484|STResList484],
+  ?line ITRes223 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL004.xml','./msxsdtest/complexType',invalid,S484),
+  ITResList224 = [ITRes223|ITResList223],
+
+
+  ?line {STRes485,S485} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL005.xsd','./msxsdtest/complexType',valid),
+  STResList486 = [STRes485|STResList485],
+  ?line ITRes224 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL005.xml','./msxsdtest/complexType',valid,S485),
+  ITResList225 = [ITRes224|ITResList224],
+
+
+  ?line {STRes486,S486} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL006.xsd','./msxsdtest/complexType',valid),
+  STResList487 = [STRes486|STResList486],
+  ?line ITRes225 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL006.xml','./msxsdtest/complexType',invalid,S486),
+  ITResList226 = [ITRes225|ITResList225],
+
+
+  ?line {STRes487,S487} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL007.xsd','./msxsdtest/complexType',valid),
+  STResList488 = [STRes487|STResList487],
+  ?line ITRes226 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL007.xml','./msxsdtest/complexType',valid,S487),
+  ITResList227 = [ITRes226|ITResList226],
+
+
+  ?line {STRes488,S488} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL008.xsd','./msxsdtest/complexType',valid),
+  STResList489 = [STRes488|STResList488],
+  ?line ITRes227 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL008.xml','./msxsdtest/complexType',valid,S488),
+  ITResList228 = [ITRes227|ITResList227],
+
+
+  ?line {STRes489,S489} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL009.xsd','./msxsdtest/complexType',valid),
+  STResList490 = [STRes489|STResList489],
+  ?line ITRes228 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL009.xml','./msxsdtest/complexType',invalid,S489),
+  ITResList229 = [ITRes228|ITResList228],
+
+
+  ?line {STRes490,S490} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL010.xsd','./msxsdtest/complexType',valid),
+  STResList491 = [STRes490|STResList490],
+  ?line ITRes229 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL010.xml','./msxsdtest/complexType',invalid,S490),
+  ITResList230 = [ITRes229|ITResList229],
+
+
+  ?line {STRes491,S491} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL011.xsd','./msxsdtest/complexType',valid),
+  STResList492 = [STRes491|STResList491],
+  ?line ITRes230 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL011.xml','./msxsdtest/complexType',valid,S491),
+  ITResList231 = [ITRes230|ITResList230],
+
+
+  ?line {STRes492,S492} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL012.xsd','./msxsdtest/complexType',valid),
+  STResList493 = [STRes492|STResList492],
+  ?line ITRes231 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL012.xml','./msxsdtest/complexType',invalid,S492),
+  ITResList232 = [ITRes231|ITResList231],
+
+
+  ?line {STRes493,S493} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL013.xsd','./msxsdtest/complexType',valid),
+  STResList494 = [STRes493|STResList493],
+  ?line ITRes232 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL013.xml','./msxsdtest/complexType',invalid,S493),
+  ITResList233 = [ITRes232|ITResList232],
+
+
+  ?line {STRes494,S494} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL014.xsd','./msxsdtest/complexType',valid),
+  STResList495 = [STRes494|STResList494],
+  ?line ITRes233 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL014.xml','./msxsdtest/complexType',valid,S494),
+  ITResList234 = [ITRes233|ITResList233],
+
+
+  ?line {STRes495,S495} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL015.xsd','./msxsdtest/complexType',valid),
+  STResList496 = [STRes495|STResList495],
+  ?line ITRes234 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL015.xml','./msxsdtest/complexType',valid,S495),
+  ITResList235 = [ITRes234|ITResList234],
+
+
+  ?line {STRes496,S496} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL016.xsd','./msxsdtest/complexType',valid),
+  STResList497 = [STRes496|STResList496],
+  ?line ITRes235 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL016.xml','./msxsdtest/complexType',valid,S496),
+  ITResList236 = [ITRes235|ITResList235],
+
+
+  ?line {STRes497,S497} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL017.xsd','./msxsdtest/complexType',valid),
+  STResList498 = [STRes497|STResList497],
+  ?line ITRes236 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL017.xml','./msxsdtest/complexType',valid,S497),
+  ITResList237 = [ITRes236|ITResList236],
+
+
+  ?line {STRes498,S498} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL018.xsd','./msxsdtest/complexType',valid),
+  STResList499 = [STRes498|STResList498],
+  ?line ITRes237 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL018.xml','./msxsdtest/complexType',valid,S498),
+  ITResList238 = [ITRes237|ITResList237],
+
+
+  ?line {STRes499,S499} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL019.xsd','./msxsdtest/complexType',valid),
+  STResList500 = [STRes499|STResList499],
+  ?line ITRes238 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL019.xml','./msxsdtest/complexType',valid,S499),
+  ITResList239 = [ITRes238|ITResList238],
+
+
+  ?line {STRes500,S500} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL020.xsd','./msxsdtest/complexType',valid),
+  STResList501 = [STRes500|STResList500],
+  ?line ITRes239 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL020.xml','./msxsdtest/complexType',invalid,S500),
+  ITResList240 = [ITRes239|ITResList239],
+
+
+  ?line {STRes501,S501} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctL021.xsd','./msxsdtest/complexType',valid),
+  STResList502 = [STRes501|STResList501],
+  ?line ITRes240 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctL021.xml','./msxsdtest/complexType',valid,S501),
+  ITResList241 = [ITRes240|ITResList240],
+
+
+  ?line {STRes502,S502} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/bug67200.xsd','./msxsdtest/complexType',valid),
+  STResList503 = [STRes502|STResList502],
+  ?line ITRes241 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/bug67200.xml','./msxsdtest/complexType',valid,S502),
+  ITResList242 = [ITRes241|ITResList241],
+
+
+  ?line {STRes503,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctM001.xsd','./msxsdtest/complexType',invalid),
+  STResList504 = [STRes503|STResList503],
+
+
+  ?line {STRes504,S504} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctM002.xsd','./msxsdtest/complexType',valid),
+  STResList505 = [STRes504|STResList504],
+  ?line ITRes242 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctM002.xml','./msxsdtest/complexType',valid,S504),
+  ITResList243 = [ITRes242|ITResList242],
+
+
+  ?line {STRes505,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctM003.xsd','./msxsdtest/complexType',invalid),
+  STResList506 = [STRes505|STResList505],
+
+
+  ?line {STRes506,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctM004.xsd','./msxsdtest/complexType',invalid),
+  STResList507 = [STRes506|STResList506],
+
+
+  ?line {STRes507,S507} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctN001.xsd','./msxsdtest/complexType',valid),
+  STResList508 = [STRes507|STResList507],
+  ?line ITRes243 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctN001.xml','./msxsdtest/complexType',valid,S507),
+  ITResList244 = [ITRes243|ITResList243],
+
+
+  ?line {STRes508,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctN002.xsd','./msxsdtest/complexType',invalid),
+  STResList509 = [STRes508|STResList508],
+
+
+  ?line {STRes509,S509} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctN003.xsd','./msxsdtest/complexType',valid),
+  STResList510 = [STRes509|STResList509],
+  ?line ITRes244 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctN003.xml','./msxsdtest/complexType',valid,S509),
+  ITResList245 = [ITRes244|ITResList244],
+
+
+  ?line {STRes510,S510} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctN004.xsd','./msxsdtest/complexType',valid),
+  STResList511 = [STRes510|STResList510],
+  ?line ITRes245 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctN004.xml','./msxsdtest/complexType',valid,S510),
+  ITResList246 = [ITRes245|ITResList245],
+
+
+  ?line {STRes511,S511} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctO001.xsd','./msxsdtest/complexType',valid),
+  STResList512 = [STRes511|STResList511],
+  ?line ITRes246 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctO001.xml','./msxsdtest/complexType',valid,S511),
+  ITResList247 = [ITRes246|ITResList246],
+
+
+  ?line {STRes512,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctO002.xsd','./msxsdtest/complexType',invalid),
+  STResList513 = [STRes512|STResList512],
+
+
+  ?line {STRes513,S513} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctO003.xsd','./msxsdtest/complexType',valid),
+  STResList514 = [STRes513|STResList513],
+  ?line ITRes247 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctO003.xml','./msxsdtest/complexType',valid,S513),
+  ITResList248 = [ITRes247|ITResList247],
+
+
+  ?line {STRes514,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctO004.xsd','./msxsdtest/complexType',invalid),
+  STResList515 = [STRes514|STResList514],
+
+
+  ?line {STRes515,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctO005.xsd','./msxsdtest/complexType',invalid),
+  STResList516 = [STRes515|STResList515],
+
+
+  ?line {STRes516,S516} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctO006.xsd','./msxsdtest/complexType',valid),
+  STResList517 = [STRes516|STResList516],
+  ?line ITRes248 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/complexType/ctO006.xml','./msxsdtest/complexType',valid,S516),
+  ITResList249 = [ITRes248|ITResList248],
+
+
+  ?line {STRes517,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/complexType/ctO007.xsd','./msxsdtest/complexType',invalid),
+  STResList518 = [STRes517|STResList517],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList518,ITResList249).
+
+%% 3.3.2 XML Representation of Element Declaration.
+%% 3.3.4 Element Declaration Validation Rules.
+%% element Validation checking.
+%% Regular Expression Validation checking.
+%% Bug Regressions Specs section: 3.3.4
+
+elem(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA001.xsd','./msxsdtest/element',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA002.xsd','./msxsdtest/element',valid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA003.xsd','./msxsdtest/element',valid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA004.xsd','./msxsdtest/element',valid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA005.xsd','./msxsdtest/element',valid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA006.xsd','./msxsdtest/element',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA007.xsd','./msxsdtest/element',valid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA009.xsd','./msxsdtest/element',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA010.xsd','./msxsdtest/element',invalid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA011.xsd','./msxsdtest/element',invalid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA012.xsd','./msxsdtest/element',invalid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA013.xsd','./msxsdtest/element',invalid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA014.xsd','./msxsdtest/element',invalid),
+  STResList13 = [STRes12|STResList12],
+
+
+  ?line {STRes13,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA015.xsd','./msxsdtest/element',valid),
+  STResList14 = [STRes13|STResList13],
+
+
+  ?line {STRes14,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA016.xsd','./msxsdtest/element',valid),
+  STResList15 = [STRes14|STResList14],
+
+
+  ?line {STRes15,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemA017.xsd','./msxsdtest/element',valid),
+  STResList16 = [STRes15|STResList15],
+
+
+  ?line {STRes16,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemB001.xsd','./msxsdtest/element',valid),
+  STResList17 = [STRes16|STResList16],
+
+
+  ?line {STRes17,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemB002.xsd','./msxsdtest/element',valid),
+  STResList18 = [STRes17|STResList17],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemB003.xsd','./msxsdtest/element',invalid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemB004.xsd','./msxsdtest/element',invalid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemB005.xsd','./msxsdtest/element',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemB006.xsd','./msxsdtest/element',invalid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemB007.xsd','./msxsdtest/element',valid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemB008.xsd','./msxsdtest/element',valid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemB009.xsd','./msxsdtest/element',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemB010.xsd','./msxsdtest/element',invalid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC001.xsd','./msxsdtest/element',valid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC002.xsd','./msxsdtest/element',valid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC003.xsd','./msxsdtest/element',valid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC004.xsd','./msxsdtest/element',valid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC005.xsd','./msxsdtest/element',valid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC006.xsd','./msxsdtest/element',valid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC007.xsd','./msxsdtest/element',valid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC008.xsd','./msxsdtest/element',valid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC009.xsd','./msxsdtest/element',invalid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC010.xsd','./msxsdtest/element',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC011.xsd','./msxsdtest/element',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC012.xsd','./msxsdtest/element',invalid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC013.xsd','./msxsdtest/element',invalid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC014.xsd','./msxsdtest/element',invalid),
+  STResList40 = [STRes39|STResList39],
+
+
+  ?line {STRes40,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC015.xsd','./msxsdtest/element',invalid),
+  STResList41 = [STRes40|STResList40],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC016.xsd','./msxsdtest/element',invalid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC017.xsd','./msxsdtest/element',invalid),
+  STResList43 = [STRes42|STResList42],
+
+
+  ?line {STRes43,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC018.xsd','./msxsdtest/element',valid),
+  STResList44 = [STRes43|STResList43],
+
+
+  ?line {STRes44,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemC020.xsd','./msxsdtest/element',valid),
+  STResList45 = [STRes44|STResList44],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemD001.xsd','./msxsdtest/element',valid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemD002.xsd','./msxsdtest/element',valid),
+  STResList47 = [STRes46|STResList46],
+
+
+  ?line {STRes47,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemD003.xsd','./msxsdtest/element',invalid),
+  STResList48 = [STRes47|STResList47],
+
+
+  ?line {STRes48,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemD004.xsd','./msxsdtest/element',invalid),
+  STResList49 = [STRes48|STResList48],
+
+
+  ?line {STRes49,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemD005.xsd','./msxsdtest/element',invalid),
+  STResList50 = [STRes49|STResList49],
+
+
+  ?line {STRes50,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemD006.xsd','./msxsdtest/element',valid),
+  STResList51 = [STRes50|STResList50],
+
+
+  ?line {STRes51,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemE001.xsd','./msxsdtest/element',valid),
+  STResList52 = [STRes51|STResList51],
+
+
+  ?line {STRes52,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemE002.xsd','./msxsdtest/element',valid),
+  STResList53 = [STRes52|STResList52],
+
+
+  ?line {STRes53,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemE003.xsd','./msxsdtest/element',valid),
+  STResList54 = [STRes53|STResList53],
+
+
+  ?line {STRes54,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemE004.xsd','./msxsdtest/element',valid),
+  STResList55 = [STRes54|STResList54],
+
+
+  ?line {STRes55,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemE005.xsd','./msxsdtest/element',valid),
+  STResList56 = [STRes55|STResList55],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemE006.xsd','./msxsdtest/element',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemE007.xsd','./msxsdtest/element',invalid),
+  STResList58 = [STRes57|STResList57],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemE008.xsd','./msxsdtest/element',invalid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemE009.xsd','./msxsdtest/element',invalid),
+  STResList60 = [STRes59|STResList59],
+
+
+  ?line {STRes60,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF001.xsd','./msxsdtest/element',valid),
+  STResList61 = [STRes60|STResList60],
+
+
+  ?line {STRes61,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF002.xsd','./msxsdtest/element',valid),
+  STResList62 = [STRes61|STResList61],
+
+
+  ?line {STRes62,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF003.xsd','./msxsdtest/element',valid),
+  STResList63 = [STRes62|STResList62],
+
+
+  ?line {STRes63,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF004.xsd','./msxsdtest/element',invalid),
+  STResList64 = [STRes63|STResList63],
+
+
+  ?line {STRes64,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF005.xsd','./msxsdtest/element',valid),
+  STResList65 = [STRes64|STResList64],
+
+
+  ?line {STRes65,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF006.xsd','./msxsdtest/element',invalid),
+  STResList66 = [STRes65|STResList65],
+
+
+  ?line {STRes66,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF007.xsd','./msxsdtest/element',invalid),
+  STResList67 = [STRes66|STResList66],
+
+
+  ?line {STRes67,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF008.xsd','./msxsdtest/element',invalid),
+  STResList68 = [STRes67|STResList67],
+
+
+  ?line {STRes68,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF009.xsd','./msxsdtest/element',invalid),
+  STResList69 = [STRes68|STResList68],
+
+
+  ?line {STRes69,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF010.xsd','./msxsdtest/element',invalid),
+  STResList70 = [STRes69|STResList69],
+
+
+  ?line {STRes70,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF011.xsd','./msxsdtest/element',invalid),
+  STResList71 = [STRes70|STResList70],
+
+
+  ?line {STRes71,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF012.xsd','./msxsdtest/element',invalid),
+  STResList72 = [STRes71|STResList71],
+
+
+  ?line {STRes72,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF013.xsd','./msxsdtest/element',invalid),
+  STResList73 = [STRes72|STResList72],
+
+
+  ?line {STRes73,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF014.xsd','./msxsdtest/element',invalid),
+  STResList74 = [STRes73|STResList73],
+
+
+  ?line {STRes74,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF015.xsd','./msxsdtest/element',invalid),
+  STResList75 = [STRes74|STResList74],
+
+
+  ?line {STRes75,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF016.xsd','./msxsdtest/element',invalid),
+  STResList76 = [STRes75|STResList75],
+
+
+  ?line {STRes76,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF017.xsd','./msxsdtest/element',invalid),
+  STResList77 = [STRes76|STResList76],
+
+
+  ?line {STRes77,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemF018.xsd','./msxsdtest/element',valid),
+  STResList78 = [STRes77|STResList77],
+
+
+  ?line {STRes78,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemG001.xsd','./msxsdtest/element',valid),
+  STResList79 = [STRes78|STResList78],
+
+
+  ?line {STRes79,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemG002.xsd','./msxsdtest/element',valid),
+  STResList80 = [STRes79|STResList79],
+
+
+  ?line {STRes80,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemG003.xsd','./msxsdtest/element',invalid),
+  STResList81 = [STRes80|STResList80],
+
+
+  ?line {STRes81,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemG004.xsd','./msxsdtest/element',invalid),
+  STResList82 = [STRes81|STResList81],
+
+
+  ?line {STRes82,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemG005.xsd','./msxsdtest/element',valid),
+  STResList83 = [STRes82|STResList82],
+
+
+  ?line {STRes83,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemH001.xsd','./msxsdtest/element',valid),
+  STResList84 = [STRes83|STResList83],
+
+
+  ?line {STRes84,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemH002.xsd','./msxsdtest/element',valid),
+  STResList85 = [STRes84|STResList84],
+
+
+  ?line {STRes85,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemH003.xsd','./msxsdtest/element',invalid),
+  STResList86 = [STRes85|STResList85],
+
+
+  ?line {STRes86,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemH004.xsd','./msxsdtest/element',invalid),
+  STResList87 = [STRes86|STResList86],
+
+
+  ?line {STRes87,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemH005.xsd','./msxsdtest/element',invalid),
+  STResList88 = [STRes87|STResList87],
+
+
+  ?line {STRes88,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemH006.xsd','./msxsdtest/element',invalid),
+  STResList89 = [STRes88|STResList88],
+
+
+  ?line {STRes89,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemI001.xsd','./msxsdtest/element',valid),
+  STResList90 = [STRes89|STResList89],
+
+
+  ?line {STRes90,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemI002.xsd','./msxsdtest/element',valid),
+  STResList91 = [STRes90|STResList90],
+
+
+  ?line {STRes91,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemI003.xsd','./msxsdtest/element',invalid),
+  STResList92 = [STRes91|STResList91],
+
+
+  ?line {STRes92,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemI004.xsd','./msxsdtest/element',invalid),
+  STResList93 = [STRes92|STResList92],
+
+
+  ?line {STRes93,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemI005.xsd','./msxsdtest/element',invalid),
+  STResList94 = [STRes93|STResList93],
+
+
+  ?line {STRes94,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ001.xsd','./msxsdtest/element',valid),
+  STResList95 = [STRes94|STResList94],
+
+
+  ?line {STRes95,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ002.xsd','./msxsdtest/element',valid),
+  STResList96 = [STRes95|STResList95],
+
+
+  ?line {STRes96,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ003.xsd','./msxsdtest/element',valid),
+  STResList97 = [STRes96|STResList96],
+
+
+  ?line {STRes97,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ004.xsd','./msxsdtest/element',valid),
+  STResList98 = [STRes97|STResList97],
+
+
+  ?line {STRes98,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ005.xsd','./msxsdtest/element',valid),
+  STResList99 = [STRes98|STResList98],
+
+
+  ?line {STRes99,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ006.xsd','./msxsdtest/element',invalid),
+  STResList100 = [STRes99|STResList99],
+
+
+  ?line {STRes100,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ007.xsd','./msxsdtest/element',invalid),
+  STResList101 = [STRes100|STResList100],
+
+
+  ?line {STRes101,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ008.xsd','./msxsdtest/element',invalid),
+  STResList102 = [STRes101|STResList101],
+
+
+  ?line {STRes102,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ009.xsd','./msxsdtest/element',valid),
+  STResList103 = [STRes102|STResList102],
+
+
+  ?line {STRes103,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ010.xsd','./msxsdtest/element',valid),
+  STResList104 = [STRes103|STResList103],
+
+
+  ?line {STRes104,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ011.xsd','./msxsdtest/element',valid),
+  STResList105 = [STRes104|STResList104],
+
+
+  ?line {STRes105,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ012.xsd','./msxsdtest/element',invalid),
+  STResList106 = [STRes105|STResList105],
+
+
+  ?line {STRes106,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ013.xsd','./msxsdtest/element',valid),
+  STResList107 = [STRes106|STResList106],
+
+
+  ?line {STRes107,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ014.xsd','./msxsdtest/element',invalid),
+  STResList108 = [STRes107|STResList107],
+
+
+  ?line {STRes108,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ015.xsd','./msxsdtest/element',invalid),
+  STResList109 = [STRes108|STResList108],
+
+
+  ?line {STRes109,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ016.xsd','./msxsdtest/element',invalid),
+  STResList110 = [STRes109|STResList109],
+
+
+  ?line {STRes110,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ017.xsd','./msxsdtest/element',valid),
+  STResList111 = [STRes110|STResList110],
+
+
+  ?line {STRes111,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ018.xsd','./msxsdtest/element',valid),
+  STResList112 = [STRes111|STResList111],
+
+
+  ?line {STRes112,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ019.xsd','./msxsdtest/element',invalid),
+  STResList113 = [STRes112|STResList112],
+
+
+  ?line {STRes113,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ020.xsd','./msxsdtest/element',invalid),
+  STResList114 = [STRes113|STResList113],
+
+
+  ?line {STRes114,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemJ021.xsd','./msxsdtest/element',valid),
+  STResList115 = [STRes114|STResList114],
+
+
+  ?line {STRes115,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemK001.xsd','./msxsdtest/element',valid),
+  STResList116 = [STRes115|STResList115],
+
+
+  ?line {STRes116,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemK002.xsd','./msxsdtest/element',valid),
+  STResList117 = [STRes116|STResList116],
+
+
+  ?line {STRes117,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemK003.xsd','./msxsdtest/element',invalid),
+  STResList118 = [STRes117|STResList117],
+
+
+  ?line {STRes118,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemK004.xsd','./msxsdtest/element',invalid),
+  STResList119 = [STRes118|STResList118],
+
+
+  ?line {STRes119,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemK005.xsd','./msxsdtest/element',invalid),
+  STResList120 = [STRes119|STResList119],
+
+
+  ?line {STRes120,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemK006.xsd','./msxsdtest/element',invalid),
+  STResList121 = [STRes120|STResList120],
+
+
+  ?line {STRes121,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemK007.xsd','./msxsdtest/element',invalid),
+  STResList122 = [STRes121|STResList121],
+
+
+  ?line {STRes122,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemL001.xsd','./msxsdtest/element',valid),
+  STResList123 = [STRes122|STResList122],
+
+
+  ?line {STRes123,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemL002.xsd','./msxsdtest/element',invalid),
+  STResList124 = [STRes123|STResList123],
+
+
+  ?line {STRes124,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemL003.xsd','./msxsdtest/element',invalid),
+  STResList125 = [STRes124|STResList124],
+
+
+  ?line {STRes125,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemL004.xsd','./msxsdtest/element',valid),
+  STResList126 = [STRes125|STResList125],
+
+
+  ?line {STRes126,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemL005.xsd','./msxsdtest/element',valid),
+  STResList127 = [STRes126|STResList126],
+
+
+  ?line {STRes127,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemM001.xsd','./msxsdtest/element',valid),
+  STResList128 = [STRes127|STResList127],
+
+
+  ?line {STRes128,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemM002.xsd','./msxsdtest/element',invalid),
+  STResList129 = [STRes128|STResList128],
+
+
+  ?line {STRes129,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemM003.xsd','./msxsdtest/element',invalid),
+  STResList130 = [STRes129|STResList129],
+
+
+  ?line {STRes130,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemM004.xsd','./msxsdtest/element',valid),
+  STResList131 = [STRes130|STResList130],
+
+
+  ?line {STRes131,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemM005.xsd','./msxsdtest/element',invalid),
+  STResList132 = [STRes131|STResList131],
+
+
+  ?line {STRes132,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemN001.xsd','./msxsdtest/element',valid),
+  STResList133 = [STRes132|STResList132],
+
+
+  ?line {STRes133,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemN002.xsd','./msxsdtest/element',valid),
+  STResList134 = [STRes133|STResList133],
+
+
+  ?line {STRes134,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemN003.xsd','./msxsdtest/element',valid),
+  STResList135 = [STRes134|STResList134],
+
+
+  ?line {STRes135,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemN004.xsd','./msxsdtest/element',valid),
+  STResList136 = [STRes135|STResList135],
+
+
+  ?line {STRes136,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemN005.xsd','./msxsdtest/element',valid),
+  STResList137 = [STRes136|STResList136],
+
+
+  ?line {STRes137,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemN006.xsd','./msxsdtest/element',invalid),
+  STResList138 = [STRes137|STResList137],
+
+
+  ?line {STRes138,S138} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO001.xsd','./msxsdtest/element',valid),
+  STResList139 = [STRes138|STResList138],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO001.xml','./msxsdtest/element',invalid,S138),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes139,S139} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO002.xsd','./msxsdtest/element',valid),
+  STResList140 = [STRes139|STResList139],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO002.xml','./msxsdtest/element',valid,S139),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes140,S140} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO003.xsd','./msxsdtest/element',valid),
+  STResList141 = [STRes140|STResList140],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO003.xml','./msxsdtest/element',valid,S140),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes141,S141} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO004.xsd','./msxsdtest/element',valid),
+  STResList142 = [STRes141|STResList141],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO004.xml','./msxsdtest/element',valid,S141),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes142,S142} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO005.xsd','./msxsdtest/element',valid),
+  STResList143 = [STRes142|STResList142],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO005.xml','./msxsdtest/element',valid,S142),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes143,S143} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO006.xsd','./msxsdtest/element',valid),
+  STResList144 = [STRes143|STResList143],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO006.xml','./msxsdtest/element',valid,S143),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes144,S144} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO007.xsd','./msxsdtest/element',valid),
+  STResList145 = [STRes144|STResList144],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO007.xml','./msxsdtest/element',invalid,S144),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes145,S145} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO008.xsd','./msxsdtest/element',valid),
+  STResList146 = [STRes145|STResList145],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO008.xml','./msxsdtest/element',valid,S145),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes146,S146} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO009.xsd','./msxsdtest/element',valid),
+  STResList147 = [STRes146|STResList146],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO009.xml','./msxsdtest/element',valid,S146),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes147,S147} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO010.xsd','./msxsdtest/element',valid),
+  STResList148 = [STRes147|STResList147],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO010.xml','./msxsdtest/element',invalid,S147),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes148,S148} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO011.xsd','./msxsdtest/element',valid),
+  STResList149 = [STRes148|STResList148],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO011.xml','./msxsdtest/element',invalid,S148),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes149,S149} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemO012.xsd','./msxsdtest/element',valid),
+  STResList150 = [STRes149|STResList149],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemO012.xml','./msxsdtest/element',valid,S149),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes150,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemP001.xsd','./msxsdtest/element',invalid),
+  STResList151 = [STRes150|STResList150],
+
+
+  ?line {STRes151,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemP002.xsd','./msxsdtest/element',invalid),
+  STResList152 = [STRes151|STResList151],
+
+
+  ?line {STRes152,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemP003.xsd','./msxsdtest/element',valid),
+  STResList153 = [STRes152|STResList152],
+
+
+  ?line {STRes153,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemP004.xsd','./msxsdtest/element',valid),
+  STResList154 = [STRes153|STResList153],
+
+
+  ?line {STRes154,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemP005.xsd','./msxsdtest/element',invalid),
+  STResList155 = [STRes154|STResList154],
+
+
+  ?line {STRes155,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemP006.xsd','./msxsdtest/element',invalid),
+  STResList156 = [STRes155|STResList155],
+
+
+  ?line {STRes156,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemP007.xsd','./msxsdtest/element',invalid),
+  STResList157 = [STRes156|STResList156],
+
+
+  ?line {STRes157,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemP008.xsd','./msxsdtest/element',invalid),
+  STResList158 = [STRes157|STResList157],
+
+
+  ?line {STRes158,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemP009.xsd','./msxsdtest/element',invalid),
+  STResList159 = [STRes158|STResList158],
+
+
+  ?line {STRes159,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ001.xsd','./msxsdtest/element',valid),
+  STResList160 = [STRes159|STResList159],
+
+
+  ?line {STRes160,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ002.xsd','./msxsdtest/element',valid),
+  STResList161 = [STRes160|STResList160],
+
+
+  ?line {STRes161,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ003.xsd','./msxsdtest/element',valid),
+  STResList162 = [STRes161|STResList161],
+
+
+  ?line {STRes162,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ004.xsd','./msxsdtest/element',invalid),
+  STResList163 = [STRes162|STResList162],
+
+
+  ?line {STRes163,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ005.xsd','./msxsdtest/element',valid),
+  STResList164 = [STRes163|STResList163],
+
+
+  ?line {STRes164,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ006.xsd','./msxsdtest/element',invalid),
+  STResList165 = [STRes164|STResList164],
+
+
+  ?line {STRes165,S165} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ007.xsd','./msxsdtest/element',valid),
+  STResList166 = [STRes165|STResList165],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ007.xml','./msxsdtest/element',invalid,S165),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes166,S166} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ008.xsd','./msxsdtest/element',valid),
+  STResList167 = [STRes166|STResList166],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ008.xml','./msxsdtest/element',valid,S166),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes167,S167} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ009.xsd','./msxsdtest/element',valid),
+  STResList168 = [STRes167|STResList167],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ009.xml','./msxsdtest/element',invalid,S167),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes168,S168} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ010.xsd','./msxsdtest/element',valid),
+  STResList169 = [STRes168|STResList168],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ010.xml','./msxsdtest/element',invalid,S168),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes169,S169} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ011.xsd','./msxsdtest/element',valid),
+  STResList170 = [STRes169|STResList169],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ011.xml','./msxsdtest/element',valid,S169),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes170,S170} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ012.xsd','./msxsdtest/element',valid),
+  STResList171 = [STRes170|STResList170],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ012.xml','./msxsdtest/element',invalid,S170),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes171,S171} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ013.xsd','./msxsdtest/element',valid),
+  STResList172 = [STRes171|STResList171],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ013.xml','./msxsdtest/element',valid,S171),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes172,S172} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ014.xsd','./msxsdtest/element',valid),
+  STResList173 = [STRes172|STResList172],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ014.xml','./msxsdtest/element',invalid,S172),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes173,S173} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ015.xsd','./msxsdtest/element',valid),
+  STResList174 = [STRes173|STResList173],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ015.xml','./msxsdtest/element',valid,S173),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes174,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ016.xsd','./msxsdtest/element',valid),
+  STResList175 = [STRes174|STResList174],
+
+
+  ?line {STRes175,S175} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ017.xsd','./msxsdtest/element',valid),
+  STResList176 = [STRes175|STResList175],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ017.xml','./msxsdtest/element',valid,S175),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes176,S176} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ018.xsd','./msxsdtest/element',valid),
+  STResList177 = [STRes176|STResList176],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ018.xml','./msxsdtest/element',invalid,S176),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes177,S177} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ019.xsd','./msxsdtest/element',valid),
+  STResList178 = [STRes177|STResList177],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ019.xml','./msxsdtest/element',invalid,S177),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes178,S178} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ020.xsd','./msxsdtest/element',valid),
+  STResList179 = [STRes178|STResList178],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ020.xml','./msxsdtest/element',valid,S178),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes179,S179} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ021.xsd','./msxsdtest/element',valid),
+  STResList180 = [STRes179|STResList179],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ021.xml','./msxsdtest/element',valid,S179),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes180,S180} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemQ022.xsd','./msxsdtest/element',valid),
+  STResList181 = [STRes180|STResList180],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemQ022.xml','./msxsdtest/element',valid,S180),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes181,S181} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemR001.xsd','./msxsdtest/element',valid),
+  STResList182 = [STRes181|STResList181],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemR001.xml','./msxsdtest/element',valid,S181),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes182,S182} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemR002.xsd','./msxsdtest/element',valid),
+  STResList183 = [STRes182|STResList182],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemR002.xml','./msxsdtest/element',valid,S182),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes183,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemR003.xsd','./msxsdtest/element',invalid),
+  STResList184 = [STRes183|STResList183],
+
+
+  ?line {STRes184,S184} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemR004.xsd','./msxsdtest/element',valid),
+  STResList185 = [STRes184|STResList184],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemR004.xml','./msxsdtest/element',valid,S184),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes185,S185} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemR005.xsd','./msxsdtest/element',valid),
+  STResList186 = [STRes185|STResList185],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemR005.xml','./msxsdtest/element',valid,S185),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes186,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemR006.xsd','./msxsdtest/element',invalid),
+  STResList187 = [STRes186|STResList186],
+
+
+  ?line {STRes187,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemS001.xsd','./msxsdtest/element',invalid),
+  STResList188 = [STRes187|STResList187],
+
+
+  ?line {STRes188,S188} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemS002.xsd','./msxsdtest/element',valid),
+  STResList189 = [STRes188|STResList188],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemS002.xml','./msxsdtest/element',valid,S188),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes189,S189} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemS003.xsd','./msxsdtest/element',valid),
+  STResList190 = [STRes189|STResList189],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemS003.xml','./msxsdtest/element',valid,S189),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes190,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemS004.xsd','./msxsdtest/element',invalid),
+  STResList191 = [STRes190|STResList190],
+
+
+  ?line {STRes191,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemS005.xsd','./msxsdtest/element',invalid),
+  STResList192 = [STRes191|STResList191],
+
+
+  ?line {STRes192,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemS006.xsd','./msxsdtest/element',invalid),
+  STResList193 = [STRes192|STResList192],
+
+
+  ?line {STRes193,S193} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemS007.xsd','./msxsdtest/element',valid),
+  STResList194 = [STRes193|STResList193],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemS007.xml','./msxsdtest/element',valid,S193),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes194,S194} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemS008.xsd','./msxsdtest/element',valid),
+  STResList195 = [STRes194|STResList194],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemS008.xml','./msxsdtest/element',valid,S194),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes195,S195} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT001.xsd','./msxsdtest/element',valid),
+  STResList196 = [STRes195|STResList195],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT001.xml','./msxsdtest/element',invalid,S195),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes196,S196} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT002.xsd','./msxsdtest/element',valid),
+  STResList197 = [STRes196|STResList196],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT002.xml','./msxsdtest/element',valid,S196),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes197,S197} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT003.xsd','./msxsdtest/element',valid),
+  STResList198 = [STRes197|STResList197],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT003.xml','./msxsdtest/element',valid,S197),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes198,S198} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT004.xsd','./msxsdtest/element',valid),
+  STResList199 = [STRes198|STResList198],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT004.xml','./msxsdtest/element',invalid,S198),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes199,S199} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT005.xsd','./msxsdtest/element',valid),
+  STResList200 = [STRes199|STResList199],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT005.xml','./msxsdtest/element',invalid,S199),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes200,S200} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT006.xsd','./msxsdtest/element',valid),
+  STResList201 = [STRes200|STResList200],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT006.xml','./msxsdtest/element',invalid,S200),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes201,S201} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT007.xsd','./msxsdtest/element',valid),
+  STResList202 = [STRes201|STResList201],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT007.xml','./msxsdtest/element',valid,S201),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes202,S202} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT008.xsd','./msxsdtest/element',valid),
+  STResList203 = [STRes202|STResList202],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT008.xml','./msxsdtest/element',valid,S202),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes203,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT009.xsd','./msxsdtest/element',invalid),
+  STResList204 = [STRes203|STResList203],
+
+
+  ?line {STRes204,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT010.xsd','./msxsdtest/element',invalid),
+  STResList205 = [STRes204|STResList204],
+
+
+  ?line {STRes205,S205} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT011.xsd','./msxsdtest/element',valid),
+  STResList206 = [STRes205|STResList205],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT011.xml','./msxsdtest/element',invalid,S205),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes206,S206} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT012.xsd','./msxsdtest/element',valid),
+  STResList207 = [STRes206|STResList206],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT012.xml','./msxsdtest/element',invalid,S206),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes207,S207} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT013.xsd','./msxsdtest/element',valid),
+  STResList208 = [STRes207|STResList207],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT013.xml','./msxsdtest/element',invalid,S207),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes208,S208} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT014.xsd','./msxsdtest/element',valid),
+  STResList209 = [STRes208|STResList208],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT014.xml','./msxsdtest/element',valid,S208),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes209,S209} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT015.xsd','./msxsdtest/element',valid),
+  STResList210 = [STRes209|STResList209],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT015.xml','./msxsdtest/element',valid,S209),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes210,S210} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT016.xsd','./msxsdtest/element',valid),
+  STResList211 = [STRes210|STResList210],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT016.xml','./msxsdtest/element',valid,S210),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes211,S211} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT017.xsd','./msxsdtest/element',valid),
+  STResList212 = [STRes211|STResList211],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT017.xml','./msxsdtest/element',invalid,S211),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes212,S212} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT018.xsd','./msxsdtest/element',valid),
+  STResList213 = [STRes212|STResList212],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT018.xml','./msxsdtest/element',invalid,S212),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes213,S213} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT019.xsd','./msxsdtest/element',valid),
+  STResList214 = [STRes213|STResList213],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT019.xml','./msxsdtest/element',invalid,S213),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes214,S214} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT022.xsd','./msxsdtest/element',valid),
+  STResList215 = [STRes214|STResList214],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT022.xml','./msxsdtest/element',valid,S214),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes215,S215} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT024.xsd','./msxsdtest/element',valid),
+  STResList216 = [STRes215|STResList215],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT024.xml','./msxsdtest/element',invalid,S215),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes216,S216} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT025.xsd','./msxsdtest/element',valid),
+  STResList217 = [STRes216|STResList216],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT025.xml','./msxsdtest/element',valid,S216),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes217,S217} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT026.xsd','./msxsdtest/element',valid),
+  STResList218 = [STRes217|STResList217],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT026.xml','./msxsdtest/element',valid,S217),
+  ITResList56 = [ITRes55|ITResList55],
+
+
+  ?line {STRes218,S218} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT027.xsd','./msxsdtest/element',valid),
+  STResList219 = [STRes218|STResList218],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT027.xml','./msxsdtest/element',valid,S218),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes219,S219} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT028.xsd','./msxsdtest/element',valid),
+  STResList220 = [STRes219|STResList219],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT028.xml','./msxsdtest/element',valid,S219),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes220,S220} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT029.xsd','./msxsdtest/element',valid),
+  STResList221 = [STRes220|STResList220],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT029.xml','./msxsdtest/element',valid,S220),
+  ITResList59 = [ITRes58|ITResList58],
+
+
+  ?line {STRes221,S221} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT030.xsd','./msxsdtest/element',valid),
+  STResList222 = [STRes221|STResList221],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT030.xml','./msxsdtest/element',valid,S221),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes222,S222} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT031.xsd','./msxsdtest/element',valid),
+  STResList223 = [STRes222|STResList222],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT031.xml','./msxsdtest/element',invalid,S222),
+  ITResList61 = [ITRes60|ITResList60],
+
+
+  ?line {STRes223,S223} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT032.xsd','./msxsdtest/element',valid),
+  STResList224 = [STRes223|STResList223],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT032.xml','./msxsdtest/element',valid,S223),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes224,S224} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT033.xsd','./msxsdtest/element',valid),
+  STResList225 = [STRes224|STResList224],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT033.xml','./msxsdtest/element',invalid,S224),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes225,S225} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT038.xsd','./msxsdtest/element',valid),
+  STResList226 = [STRes225|STResList225],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT038.xml','./msxsdtest/element',valid,S225),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes226,S226} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT039.xsd','./msxsdtest/element',valid),
+  STResList227 = [STRes226|STResList226],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT039.xml','./msxsdtest/element',invalid,S226),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes227,S227} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT040.xsd','./msxsdtest/element',valid),
+  STResList228 = [STRes227|STResList227],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT040.xml','./msxsdtest/element',valid,S227),
+  ITResList66 = [ITRes65|ITResList65],
+
+
+  ?line {STRes228,S228} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT041.xsd','./msxsdtest/element',valid),
+  STResList229 = [STRes228|STResList228],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT041.xml','./msxsdtest/element',valid,S228),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes229,S229} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT042.xsd','./msxsdtest/element',valid),
+  STResList230 = [STRes229|STResList229],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT042.xml','./msxsdtest/element',valid,S229),
+  ITResList68 = [ITRes67|ITResList67],
+
+
+  ?line {STRes230,S230} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT043.xsd','./msxsdtest/element',valid),
+  STResList231 = [STRes230|STResList230],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT043.xml','./msxsdtest/element',valid,S230),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes231,S231} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT044.xsd','./msxsdtest/element',valid),
+  STResList232 = [STRes231|STResList231],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT044.xml','./msxsdtest/element',valid,S231),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes232,S232} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT045.xsd','./msxsdtest/element',valid),
+  STResList233 = [STRes232|STResList232],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT045.xml','./msxsdtest/element',invalid,S232),
+  ITResList71 = [ITRes70|ITResList70],
+
+
+  ?line {STRes233,S233} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT046.xsd','./msxsdtest/element',valid),
+  STResList234 = [STRes233|STResList233],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT046.xml','./msxsdtest/element',invalid,S233),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes234,S234} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT047.xsd','./msxsdtest/element',valid),
+  STResList235 = [STRes234|STResList234],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT047.xml','./msxsdtest/element',invalid,S234),
+  ITResList73 = [ITRes72|ITResList72],
+
+
+  ?line {STRes235,S235} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT048.xsd','./msxsdtest/element',valid),
+  STResList236 = [STRes235|STResList235],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT048.xml','./msxsdtest/element',invalid,S235),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes236,S236} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT049.xsd','./msxsdtest/element',valid),
+  STResList237 = [STRes236|STResList236],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT049.xml','./msxsdtest/element',invalid,S236),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes237,S237} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT050.xsd','./msxsdtest/element',valid),
+  STResList238 = [STRes237|STResList237],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT050.xml','./msxsdtest/element',invalid,S237),
+  ITResList76 = [ITRes75|ITResList75],
+
+
+  ?line {STRes238,S238} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT051.xsd','./msxsdtest/element',valid),
+  STResList239 = [STRes238|STResList238],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT051.xml','./msxsdtest/element',invalid,S238),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes239,S239} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT052.xsd','./msxsdtest/element',valid),
+  STResList240 = [STRes239|STResList239],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT052.xml','./msxsdtest/element',invalid,S239),
+  ITResList78 = [ITRes77|ITResList77],
+
+
+  ?line {STRes240,S240} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT053.xsd','./msxsdtest/element',valid),
+  STResList241 = [STRes240|STResList240],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT053.xml','./msxsdtest/element',invalid,S240),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes241,S241} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT054.xsd','./msxsdtest/element',valid),
+  STResList242 = [STRes241|STResList241],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT054.xml','./msxsdtest/element',invalid,S241),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes242,S242} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT055.xsd','./msxsdtest/element',valid),
+  STResList243 = [STRes242|STResList242],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT055.xml','./msxsdtest/element',invalid,S242),
+  ITResList81 = [ITRes80|ITResList80],
+
+
+  ?line {STRes243,S243} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT056.xsd','./msxsdtest/element',valid),
+  STResList244 = [STRes243|STResList243],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT056.xml','./msxsdtest/element',invalid,S243),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes244,S244} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT057.xsd','./msxsdtest/element',valid),
+  STResList245 = [STRes244|STResList244],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT057.xml','./msxsdtest/element',invalid,S244),
+  ITResList83 = [ITRes82|ITResList82],
+
+
+  ?line {STRes245,S245} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT058.xsd','./msxsdtest/element',valid),
+  STResList246 = [STRes245|STResList245],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT058.xml','./msxsdtest/element',valid,S245),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes246,S246} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemT074.xsd','./msxsdtest/element',valid),
+  STResList247 = [STRes246|STResList246],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemT074.xml','./msxsdtest/element',invalid,S246),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes247,S247} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU001.xsd','./msxsdtest/element',valid),
+  STResList248 = [STRes247|STResList247],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU001.xml','./msxsdtest/element',valid,S247),
+  ITResList86 = [ITRes85|ITResList85],
+
+
+  ?line {STRes248,S248} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU002.xsd','./msxsdtest/element',valid),
+  STResList249 = [STRes248|STResList248],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU002.xml','./msxsdtest/element',valid,S248),
+  ITResList87 = [ITRes86|ITResList86],
+
+
+  ?line {STRes249,S249} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU003.xsd','./msxsdtest/element',valid),
+  STResList250 = [STRes249|STResList249],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU003.xml','./msxsdtest/element',valid,S249),
+  ITResList88 = [ITRes87|ITResList87],
+
+
+  ?line {STRes250,S250} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU004.xsd','./msxsdtest/element',valid),
+  STResList251 = [STRes250|STResList250],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU004.xml','./msxsdtest/element',valid,S250),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes251,S251} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU005.xsd','./msxsdtest/element',valid),
+  STResList252 = [STRes251|STResList251],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU005.xml','./msxsdtest/element',valid,S251),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes252,S252} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU006.xsd','./msxsdtest/element',valid),
+  STResList253 = [STRes252|STResList252],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU006.xml','./msxsdtest/element',valid,S252),
+  ITResList91 = [ITRes90|ITResList90],
+
+
+  ?line {STRes253,S253} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU007.xsd','./msxsdtest/element',valid),
+  STResList254 = [STRes253|STResList253],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU007.xml','./msxsdtest/element',valid,S253),
+  ITResList92 = [ITRes91|ITResList91],
+
+
+  ?line {STRes254,S254} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU008.xsd','./msxsdtest/element',valid),
+  STResList255 = [STRes254|STResList254],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU008.xml','./msxsdtest/element',valid,S254),
+  ITResList93 = [ITRes92|ITResList92],
+
+
+  ?line {STRes255,S255} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU009.xsd','./msxsdtest/element',valid),
+  STResList256 = [STRes255|STResList255],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU009.xml','./msxsdtest/element',valid,S255),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes256,S256} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU010.xsd','./msxsdtest/element',valid),
+  STResList257 = [STRes256|STResList256],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU010.xml','./msxsdtest/element',valid,S256),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes257,S257} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU011.xsd','./msxsdtest/element',valid),
+  STResList258 = [STRes257|STResList257],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU011.xml','./msxsdtest/element',valid,S257),
+  ITResList96 = [ITRes95|ITResList95],
+
+
+  ?line {STRes258,S258} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU012.xsd','./msxsdtest/element',valid),
+  STResList259 = [STRes258|STResList258],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU012.xml','./msxsdtest/element',valid,S258),
+  ITResList97 = [ITRes96|ITResList96],
+
+
+  ?line {STRes259,S259} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU013.xsd','./msxsdtest/element',valid),
+  STResList260 = [STRes259|STResList259],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU013.xml','./msxsdtest/element',valid,S259),
+  ITResList98 = [ITRes97|ITResList97],
+
+
+  ?line {STRes260,S260} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU014.xsd','./msxsdtest/element',valid),
+  STResList261 = [STRes260|STResList260],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU014.xml','./msxsdtest/element',valid,S260),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes261,S261} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU015.xsd','./msxsdtest/element',valid),
+  STResList262 = [STRes261|STResList261],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU015.xml','./msxsdtest/element',valid,S261),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes262,S262} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU017.xsd','./msxsdtest/element',valid),
+  STResList263 = [STRes262|STResList262],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU017.xml','./msxsdtest/element',valid,S262),
+  ITResList101 = [ITRes100|ITResList100],
+
+
+  ?line {STRes263,S263} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU018.xsd','./msxsdtest/element',valid),
+  STResList264 = [STRes263|STResList263],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU018.xml','./msxsdtest/element',valid,S263),
+  ITResList102 = [ITRes101|ITResList101],
+
+
+  ?line {STRes264,S264} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU019.xsd','./msxsdtest/element',valid),
+  STResList265 = [STRes264|STResList264],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU019.xml','./msxsdtest/element',valid,S264),
+  ITResList103 = [ITRes102|ITResList102],
+
+
+  ?line {STRes265,S265} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU020.xsd','./msxsdtest/element',valid),
+  STResList266 = [STRes265|STResList265],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU020.xml','./msxsdtest/element',valid,S265),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes266,S266} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU021.xsd','./msxsdtest/element',valid),
+  STResList267 = [STRes266|STResList266],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU021.xml','./msxsdtest/element',valid,S266),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes267,S267} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU022.xsd','./msxsdtest/element',valid),
+  STResList268 = [STRes267|STResList267],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU022.xml','./msxsdtest/element',valid,S267),
+  ITResList106 = [ITRes105|ITResList105],
+
+
+  ?line {STRes268,S268} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU023.xsd','./msxsdtest/element',valid),
+  STResList269 = [STRes268|STResList268],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU023.xml','./msxsdtest/element',valid,S268),
+  ITResList107 = [ITRes106|ITResList106],
+
+
+  ?line {STRes269,S269} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU024.xsd','./msxsdtest/element',valid),
+  STResList270 = [STRes269|STResList269],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU024.xml','./msxsdtest/element',valid,S269),
+  ITResList108 = [ITRes107|ITResList107],
+
+
+  ?line {STRes270,S270} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemU025.xsd','./msxsdtest/element',valid),
+  STResList271 = [STRes270|STResList270],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemU025.xml','./msxsdtest/element',invalid,S270),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes271,S271} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemZ001.xsd','./msxsdtest/element',valid),
+  STResList272 = [STRes271|STResList271],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemZ001.xml','./msxsdtest/element',invalid,S271),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes272,S272} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemZ002.xsd','./msxsdtest/element',valid),
+  STResList273 = [STRes272|STResList272],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemZ002.xml','./msxsdtest/element',valid,S272),
+  ITResList111 = [ITRes110|ITResList110],
+
+
+  ?line {STRes273,S273} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemZ003.xsd','./msxsdtest/element',valid),
+  STResList274 = [STRes273|STResList273],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/element/elemZ003.xml','./msxsdtest/element',valid,S273),
+  ITResList112 = [ITRes111|ITResList111],
+
+
+  ?line {STRes274,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemZ004.xsd','./msxsdtest/element',valid),
+  STResList275 = [STRes274|STResList274],
+
+
+  ?line {STRes275,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/element/elemZ005.xsd','./msxsdtest/element',valid),
+  STResList276 = [STRes275|STResList275],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList276,ITResList112).
+
+%% Syntax Checking Model Group Tests.
+%% Content Checking Model Group Tests.
+
+group(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA001.xsd','./msxsdtest/Group',valid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA002.xsd','./msxsdtest/Group',valid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA003.xsd','./msxsdtest/Group',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA004.xsd','./msxsdtest/Group',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA005.xsd','./msxsdtest/Group',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA006.xsd','./msxsdtest/Group',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA007.xsd','./msxsdtest/Group',invalid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA008.xsd','./msxsdtest/Group',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA009.xsd','./msxsdtest/Group',invalid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA010.xsd','./msxsdtest/Group',invalid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA011.xsd','./msxsdtest/Group',valid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA012.xsd','./msxsdtest/Group',invalid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB001.xsd','./msxsdtest/Group',invalid),
+  STResList13 = [STRes12|STResList12],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB002.xsd','./msxsdtest/Group',valid),
+  STResList14 = [STRes13|STResList13],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupB002.xml','./msxsdtest/Group',valid,S13),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB003.xsd','./msxsdtest/Group',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupB003.xml','./msxsdtest/Group',valid,S14),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB004.xsd','./msxsdtest/Group',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupB004.xml','./msxsdtest/Group',valid,S15),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB005.xsd','./msxsdtest/Group',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupB005.xml','./msxsdtest/Group',valid,S16),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB006.xsd','./msxsdtest/Group',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupB006.xml','./msxsdtest/Group',valid,S17),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB007.xsd','./msxsdtest/Group',invalid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB008.xsd','./msxsdtest/Group',invalid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB009.xsd','./msxsdtest/Group',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupB009.xml','./msxsdtest/Group',valid,S20),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB010.xsd','./msxsdtest/Group',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupB010.xml','./msxsdtest/Group',valid,S21),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB011.xsd','./msxsdtest/Group',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB012.xsd','./msxsdtest/Group',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB013.xsd','./msxsdtest/Group',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB014.xsd','./msxsdtest/Group',invalid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB015.xsd','./msxsdtest/Group',invalid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB016.xsd','./msxsdtest/Group',invalid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupB017.xsd','./msxsdtest/Group',valid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC001.xsd','./msxsdtest/Group',invalid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC002.xsd','./msxsdtest/Group',invalid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC003.xsd','./msxsdtest/Group',invalid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC004.xsd','./msxsdtest/Group',invalid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC005.xsd','./msxsdtest/Group',invalid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC006.xsd','./msxsdtest/Group',invalid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC007.xsd','./msxsdtest/Group',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC008.xsd','./msxsdtest/Group',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC009.xsd','./msxsdtest/Group',invalid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC010.xsd','./msxsdtest/Group',invalid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC011.xsd','./msxsdtest/Group',valid),
+  STResList40 = [STRes39|STResList39],
+
+
+  ?line {STRes40,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupC012.xsd','./msxsdtest/Group',invalid),
+  STResList41 = [STRes40|STResList40],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupD001.xsd','./msxsdtest/Group',invalid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupD002.xsd','./msxsdtest/Group',invalid),
+  STResList43 = [STRes42|STResList42],
+
+
+  ?line {STRes43,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupD003.xsd','./msxsdtest/Group',invalid),
+  STResList44 = [STRes43|STResList43],
+
+
+  ?line {STRes44,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupD004.xsd','./msxsdtest/Group',invalid),
+  STResList45 = [STRes44|STResList44],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupE001.xsd','./msxsdtest/Group',valid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupE002.xsd','./msxsdtest/Group',invalid),
+  STResList47 = [STRes46|STResList46],
+
+
+  ?line {STRes47,S47} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupE003.xsd','./msxsdtest/Group',valid),
+  STResList48 = [STRes47|STResList47],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupE003.xml','./msxsdtest/Group',invalid,S47),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes48,S48} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupE004.xsd','./msxsdtest/Group',valid),
+  STResList49 = [STRes48|STResList48],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupE004.xml','./msxsdtest/Group',valid,S48),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes49,S49} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupE005.xsd','./msxsdtest/Group',valid),
+  STResList50 = [STRes49|STResList49],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupE005.xml','./msxsdtest/Group',invalid,S49),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes50,S50} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF001.xsd','./msxsdtest/Group',valid),
+  STResList51 = [STRes50|STResList50],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF001.xml','./msxsdtest/Group',valid,S50),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes51,S51} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF002.xsd','./msxsdtest/Group',valid),
+  STResList52 = [STRes51|STResList51],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF002.xml','./msxsdtest/Group',valid,S51),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes52,S52} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF003.xsd','./msxsdtest/Group',valid),
+  STResList53 = [STRes52|STResList52],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF003.xml','./msxsdtest/Group',invalid,S52),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes53,S53} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF004.xsd','./msxsdtest/Group',valid),
+  STResList54 = [STRes53|STResList53],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF004.xml','./msxsdtest/Group',valid,S53),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes54,S54} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF005.xsd','./msxsdtest/Group',valid),
+  STResList55 = [STRes54|STResList54],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF005.xml','./msxsdtest/Group',valid,S54),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes55,S55} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF006.xsd','./msxsdtest/Group',valid),
+  STResList56 = [STRes55|STResList55],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF006.xml','./msxsdtest/Group',invalid,S55),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes56,S56} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF007.xsd','./msxsdtest/Group',valid),
+  STResList57 = [STRes56|STResList56],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF007.xml','./msxsdtest/Group',valid,S56),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes57,S57} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF008.xsd','./msxsdtest/Group',valid),
+  STResList58 = [STRes57|STResList57],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF008.xml','./msxsdtest/Group',invalid,S57),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes58,S58} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF009.xsd','./msxsdtest/Group',valid),
+  STResList59 = [STRes58|STResList58],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF009.xml','./msxsdtest/Group',valid,S58),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes59,S59} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF010.xsd','./msxsdtest/Group',valid),
+  STResList60 = [STRes59|STResList59],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF010.xml','./msxsdtest/Group',invalid,S59),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes60,S60} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF011.xsd','./msxsdtest/Group',valid),
+  STResList61 = [STRes60|STResList60],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF011.xml','./msxsdtest/Group',valid,S60),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes61,S61} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF012.xsd','./msxsdtest/Group',valid),
+  STResList62 = [STRes61|STResList61],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF012.xml','./msxsdtest/Group',invalid,S61),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes62,S62} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF013.xsd','./msxsdtest/Group',valid),
+  STResList63 = [STRes62|STResList62],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF013.xml','./msxsdtest/Group',invalid,S62),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes63,S63} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF014.xsd','./msxsdtest/Group',valid),
+  STResList64 = [STRes63|STResList63],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF014.xml','./msxsdtest/Group',valid,S63),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes64,S64} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF015.xsd','./msxsdtest/Group',valid),
+  STResList65 = [STRes64|STResList64],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF015.xml','./msxsdtest/Group',invalid,S64),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes65,S65} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF016.xsd','./msxsdtest/Group',valid),
+  STResList66 = [STRes65|STResList65],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF016.xml','./msxsdtest/Group',invalid,S65),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes66,S66} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF017.xsd','./msxsdtest/Group',valid),
+  STResList67 = [STRes66|STResList66],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF017.xml','./msxsdtest/Group',valid,S66),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes67,S67} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF018.xsd','./msxsdtest/Group',valid),
+  STResList68 = [STRes67|STResList67],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF018.xml','./msxsdtest/Group',valid,S67),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes68,S68} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF019.xsd','./msxsdtest/Group',valid),
+  STResList69 = [STRes68|STResList68],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF019.xml','./msxsdtest/Group',invalid,S68),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes69,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF020.xsd','./msxsdtest/Group',invalid),
+  STResList70 = [STRes69|STResList69],
+
+
+  ?line {STRes70,S70} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF021.xsd','./msxsdtest/Group',valid),
+  STResList71 = [STRes70|STResList70],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupF021.xml','./msxsdtest/Group',valid,S70),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes71,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF022.xsd','./msxsdtest/Group',invalid),
+  STResList72 = [STRes71|STResList71],
+
+
+  ?line {STRes72,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF023.xsd','./msxsdtest/Group',invalid),
+  STResList73 = [STRes72|STResList72],
+
+
+  ?line {STRes73,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF024.xsd','./msxsdtest/Group',invalid),
+  STResList74 = [STRes73|STResList73],
+
+
+  ?line {STRes74,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupF025.xsd','./msxsdtest/Group',invalid),
+  STResList75 = [STRes74|STResList74],
+
+
+  ?line {STRes75,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupG001.xsd','./msxsdtest/Group',valid),
+  STResList76 = [STRes75|STResList75],
+
+
+  ?line {STRes76,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupG002.xsd','./msxsdtest/Group',invalid),
+  STResList77 = [STRes76|STResList76],
+
+
+  ?line {STRes77,S77} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupG003.xsd','./msxsdtest/Group',valid),
+  STResList78 = [STRes77|STResList77],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupG003.xml','./msxsdtest/Group',invalid,S77),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes78,S78} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupG004.xsd','./msxsdtest/Group',valid),
+  STResList79 = [STRes78|STResList78],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupG004.xml','./msxsdtest/Group',valid,S78),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes79,S79} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupG005.xsd','./msxsdtest/Group',valid),
+  STResList80 = [STRes79|STResList79],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupG005.xml','./msxsdtest/Group',invalid,S79),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes80,S80} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH001.xsd','./msxsdtest/Group',valid),
+  STResList81 = [STRes80|STResList80],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH001.xml','./msxsdtest/Group',valid,S80),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes81,S81} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH002.xsd','./msxsdtest/Group',valid),
+  STResList82 = [STRes81|STResList81],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH002.xml','./msxsdtest/Group',valid,S81),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes82,S82} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH003.xsd','./msxsdtest/Group',valid),
+  STResList83 = [STRes82|STResList82],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH003.xml','./msxsdtest/Group',invalid,S82),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes83,S83} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH004.xsd','./msxsdtest/Group',valid),
+  STResList84 = [STRes83|STResList83],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH004.xml','./msxsdtest/Group',valid,S83),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes84,S84} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH005.xsd','./msxsdtest/Group',valid),
+  STResList85 = [STRes84|STResList84],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH005.xml','./msxsdtest/Group',valid,S84),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes85,S85} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH006.xsd','./msxsdtest/Group',valid),
+  STResList86 = [STRes85|STResList85],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH006.xml','./msxsdtest/Group',invalid,S85),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes86,S86} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH007.xsd','./msxsdtest/Group',valid),
+  STResList87 = [STRes86|STResList86],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH007.xml','./msxsdtest/Group',valid,S86),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes87,S87} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH008.xsd','./msxsdtest/Group',valid),
+  STResList88 = [STRes87|STResList87],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH008.xml','./msxsdtest/Group',invalid,S87),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes88,S88} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH009.xsd','./msxsdtest/Group',valid),
+  STResList89 = [STRes88|STResList88],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH009.xml','./msxsdtest/Group',valid,S88),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes89,S89} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH010.xsd','./msxsdtest/Group',valid),
+  STResList90 = [STRes89|STResList89],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH010.xml','./msxsdtest/Group',invalid,S89),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes90,S90} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH011.xsd','./msxsdtest/Group',valid),
+  STResList91 = [STRes90|STResList90],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH011.xml','./msxsdtest/Group',valid,S90),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes91,S91} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH012.xsd','./msxsdtest/Group',valid),
+  STResList92 = [STRes91|STResList91],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH012.xml','./msxsdtest/Group',invalid,S91),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes92,S92} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH013.xsd','./msxsdtest/Group',valid),
+  STResList93 = [STRes92|STResList92],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH013.xml','./msxsdtest/Group',invalid,S92),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes93,S93} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH014.xsd','./msxsdtest/Group',valid),
+  STResList94 = [STRes93|STResList93],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH014.xml','./msxsdtest/Group',valid,S93),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes94,S94} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH015.xsd','./msxsdtest/Group',valid),
+  STResList95 = [STRes94|STResList94],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH015.xml','./msxsdtest/Group',invalid,S94),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes95,S95} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH016.xsd','./msxsdtest/Group',valid),
+  STResList96 = [STRes95|STResList95],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH016.xml','./msxsdtest/Group',invalid,S95),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes96,S96} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH017.xsd','./msxsdtest/Group',valid),
+  STResList97 = [STRes96|STResList96],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH017.xml','./msxsdtest/Group',valid,S96),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes97,S97} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH018.xsd','./msxsdtest/Group',valid),
+  STResList98 = [STRes97|STResList97],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH018.xml','./msxsdtest/Group',valid,S97),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes98,S98} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH019.xsd','./msxsdtest/Group',valid),
+  STResList99 = [STRes98|STResList98],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH019.xml','./msxsdtest/Group',invalid,S98),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes99,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH020.xsd','./msxsdtest/Group',invalid),
+  STResList100 = [STRes99|STResList99],
+
+
+  ?line {STRes100,S100} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH021.xsd','./msxsdtest/Group',valid),
+  STResList101 = [STRes100|STResList100],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupH021.xml','./msxsdtest/Group',valid,S100),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes101,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH022.xsd','./msxsdtest/Group',invalid),
+  STResList102 = [STRes101|STResList101],
+
+
+  ?line {STRes102,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH023.xsd','./msxsdtest/Group',invalid),
+  STResList103 = [STRes102|STResList102],
+
+
+  ?line {STRes103,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH024.xsd','./msxsdtest/Group',invalid),
+  STResList104 = [STRes103|STResList103],
+
+
+  ?line {STRes104,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupH025.xsd','./msxsdtest/Group',invalid),
+  STResList105 = [STRes104|STResList104],
+
+
+  ?line {STRes105,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupI001.xsd','./msxsdtest/Group',valid),
+  STResList106 = [STRes105|STResList105],
+
+
+  ?line {STRes106,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupI002.xsd','./msxsdtest/Group',invalid),
+  STResList107 = [STRes106|STResList106],
+
+
+  ?line {STRes107,S107} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupI003.xsd','./msxsdtest/Group',valid),
+  STResList108 = [STRes107|STResList107],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupI003.xml','./msxsdtest/Group',invalid,S107),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes108,S108} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupI004.xsd','./msxsdtest/Group',valid),
+  STResList109 = [STRes108|STResList108],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupI004.xml','./msxsdtest/Group',valid,S108),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes109,S109} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupI005.xsd','./msxsdtest/Group',valid),
+  STResList110 = [STRes109|STResList109],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupI005.xml','./msxsdtest/Group',invalid,S109),
+  ITResList56 = [ITRes55|ITResList55],
+
+
+  ?line {STRes110,S110} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ001.xsd','./msxsdtest/Group',valid),
+  STResList111 = [STRes110|STResList110],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ001.xml','./msxsdtest/Group',valid,S110),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes111,S111} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ002.xsd','./msxsdtest/Group',valid),
+  STResList112 = [STRes111|STResList111],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ002.xml','./msxsdtest/Group',valid,S111),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes112,S112} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ003.xsd','./msxsdtest/Group',valid),
+  STResList113 = [STRes112|STResList112],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ003.xml','./msxsdtest/Group',invalid,S112),
+  ITResList59 = [ITRes58|ITResList58],
+
+
+  ?line {STRes113,S113} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ004.xsd','./msxsdtest/Group',valid),
+  STResList114 = [STRes113|STResList113],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ004.xml','./msxsdtest/Group',valid,S113),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes114,S114} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ005.xsd','./msxsdtest/Group',valid),
+  STResList115 = [STRes114|STResList114],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ005.xml','./msxsdtest/Group',valid,S114),
+  ITResList61 = [ITRes60|ITResList60],
+
+
+  ?line {STRes115,S115} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ006.xsd','./msxsdtest/Group',valid),
+  STResList116 = [STRes115|STResList115],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ006.xml','./msxsdtest/Group',invalid,S115),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes116,S116} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ007.xsd','./msxsdtest/Group',valid),
+  STResList117 = [STRes116|STResList116],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ007.xml','./msxsdtest/Group',valid,S116),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes117,S117} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ008.xsd','./msxsdtest/Group',valid),
+  STResList118 = [STRes117|STResList117],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ008.xml','./msxsdtest/Group',invalid,S117),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes118,S118} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ009.xsd','./msxsdtest/Group',valid),
+  STResList119 = [STRes118|STResList118],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ009.xml','./msxsdtest/Group',valid,S118),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes119,S119} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ010.xsd','./msxsdtest/Group',valid),
+  STResList120 = [STRes119|STResList119],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ010.xml','./msxsdtest/Group',invalid,S119),
+  ITResList66 = [ITRes65|ITResList65],
+
+
+  ?line {STRes120,S120} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ011.xsd','./msxsdtest/Group',valid),
+  STResList121 = [STRes120|STResList120],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ011.xml','./msxsdtest/Group',valid,S120),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes121,S121} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ012.xsd','./msxsdtest/Group',valid),
+  STResList122 = [STRes121|STResList121],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ012.xml','./msxsdtest/Group',invalid,S121),
+  ITResList68 = [ITRes67|ITResList67],
+
+
+  ?line {STRes122,S122} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ013.xsd','./msxsdtest/Group',valid),
+  STResList123 = [STRes122|STResList122],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ013.xml','./msxsdtest/Group',invalid,S122),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes123,S123} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ014.xsd','./msxsdtest/Group',valid),
+  STResList124 = [STRes123|STResList123],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ014.xml','./msxsdtest/Group',valid,S123),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes124,S124} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ015.xsd','./msxsdtest/Group',valid),
+  STResList125 = [STRes124|STResList124],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ015.xml','./msxsdtest/Group',invalid,S124),
+  ITResList71 = [ITRes70|ITResList70],
+
+
+  ?line {STRes125,S125} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ016.xsd','./msxsdtest/Group',valid),
+  STResList126 = [STRes125|STResList125],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ016.xml','./msxsdtest/Group',invalid,S125),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes126,S126} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ017.xsd','./msxsdtest/Group',valid),
+  STResList127 = [STRes126|STResList126],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ017.xml','./msxsdtest/Group',valid,S126),
+  ITResList73 = [ITRes72|ITResList72],
+
+
+  ?line {STRes127,S127} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ018.xsd','./msxsdtest/Group',valid),
+  STResList128 = [STRes127|STResList127],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ018.xml','./msxsdtest/Group',valid,S127),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes128,S128} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ019.xsd','./msxsdtest/Group',valid),
+  STResList129 = [STRes128|STResList128],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ019.xml','./msxsdtest/Group',invalid,S128),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes129,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ020.xsd','./msxsdtest/Group',invalid),
+  STResList130 = [STRes129|STResList129],
+
+
+  ?line {STRes130,S130} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ021.xsd','./msxsdtest/Group',valid),
+  STResList131 = [STRes130|STResList130],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupJ021.xml','./msxsdtest/Group',valid,S130),
+  ITResList76 = [ITRes75|ITResList75],
+
+
+  ?line {STRes131,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ022.xsd','./msxsdtest/Group',invalid),
+  STResList132 = [STRes131|STResList131],
+
+
+  ?line {STRes132,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ023.xsd','./msxsdtest/Group',invalid),
+  STResList133 = [STRes132|STResList132],
+
+
+  ?line {STRes133,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ024.xsd','./msxsdtest/Group',invalid),
+  STResList134 = [STRes133|STResList133],
+
+
+  ?line {STRes134,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupJ025.xsd','./msxsdtest/Group',invalid),
+  STResList135 = [STRes134|STResList134],
+
+
+  ?line {STRes135,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupK001.xsd','./msxsdtest/Group',valid),
+  STResList136 = [STRes135|STResList135],
+
+
+  ?line {STRes136,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupK002.xsd','./msxsdtest/Group',invalid),
+  STResList137 = [STRes136|STResList136],
+
+
+  ?line {STRes137,S137} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupK003.xsd','./msxsdtest/Group',valid),
+  STResList138 = [STRes137|STResList137],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupK003.xml','./msxsdtest/Group',invalid,S137),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes138,S138} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupK004.xsd','./msxsdtest/Group',valid),
+  STResList139 = [STRes138|STResList138],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupK004.xml','./msxsdtest/Group',valid,S138),
+  ITResList78 = [ITRes77|ITResList77],
+
+
+  ?line {STRes139,S139} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupK005.xsd','./msxsdtest/Group',valid),
+  STResList140 = [STRes139|STResList139],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupK005.xml','./msxsdtest/Group',invalid,S139),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes140,S140} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL001.xsd','./msxsdtest/Group',valid),
+  STResList141 = [STRes140|STResList140],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL001.xml','./msxsdtest/Group',valid,S140),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes141,S141} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL002.xsd','./msxsdtest/Group',valid),
+  STResList142 = [STRes141|STResList141],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL002.xml','./msxsdtest/Group',valid,S141),
+  ITResList81 = [ITRes80|ITResList80],
+
+
+  ?line {STRes142,S142} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL003.xsd','./msxsdtest/Group',valid),
+  STResList143 = [STRes142|STResList142],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL003.xml','./msxsdtest/Group',invalid,S142),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes143,S143} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL004.xsd','./msxsdtest/Group',valid),
+  STResList144 = [STRes143|STResList143],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL004.xml','./msxsdtest/Group',valid,S143),
+  ITResList83 = [ITRes82|ITResList82],
+
+
+  ?line {STRes144,S144} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL005.xsd','./msxsdtest/Group',valid),
+  STResList145 = [STRes144|STResList144],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL005.xml','./msxsdtest/Group',valid,S144),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes145,S145} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL006.xsd','./msxsdtest/Group',valid),
+  STResList146 = [STRes145|STResList145],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL006.xml','./msxsdtest/Group',invalid,S145),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes146,S146} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL007.xsd','./msxsdtest/Group',valid),
+  STResList147 = [STRes146|STResList146],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL007.xml','./msxsdtest/Group',valid,S146),
+  ITResList86 = [ITRes85|ITResList85],
+
+
+  ?line {STRes147,S147} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL008.xsd','./msxsdtest/Group',valid),
+  STResList148 = [STRes147|STResList147],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL008.xml','./msxsdtest/Group',invalid,S147),
+  ITResList87 = [ITRes86|ITResList86],
+
+
+  ?line {STRes148,S148} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL009.xsd','./msxsdtest/Group',valid),
+  STResList149 = [STRes148|STResList148],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL009.xml','./msxsdtest/Group',valid,S148),
+  ITResList88 = [ITRes87|ITResList87],
+
+
+  ?line {STRes149,S149} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL010.xsd','./msxsdtest/Group',valid),
+  STResList150 = [STRes149|STResList149],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL010.xml','./msxsdtest/Group',invalid,S149),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes150,S150} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL011.xsd','./msxsdtest/Group',valid),
+  STResList151 = [STRes150|STResList150],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL011.xml','./msxsdtest/Group',valid,S150),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes151,S151} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL012.xsd','./msxsdtest/Group',valid),
+  STResList152 = [STRes151|STResList151],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL012.xml','./msxsdtest/Group',invalid,S151),
+  ITResList91 = [ITRes90|ITResList90],
+
+
+  ?line {STRes152,S152} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL013.xsd','./msxsdtest/Group',valid),
+  STResList153 = [STRes152|STResList152],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL013.xml','./msxsdtest/Group',invalid,S152),
+  ITResList92 = [ITRes91|ITResList91],
+
+
+  ?line {STRes153,S153} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL014.xsd','./msxsdtest/Group',valid),
+  STResList154 = [STRes153|STResList153],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL014.xml','./msxsdtest/Group',valid,S153),
+  ITResList93 = [ITRes92|ITResList92],
+
+
+  ?line {STRes154,S154} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL015.xsd','./msxsdtest/Group',valid),
+  STResList155 = [STRes154|STResList154],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL015.xml','./msxsdtest/Group',invalid,S154),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes155,S155} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL016.xsd','./msxsdtest/Group',valid),
+  STResList156 = [STRes155|STResList155],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL016.xml','./msxsdtest/Group',invalid,S155),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes156,S156} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL017.xsd','./msxsdtest/Group',valid),
+  STResList157 = [STRes156|STResList156],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL017.xml','./msxsdtest/Group',valid,S156),
+  ITResList96 = [ITRes95|ITResList95],
+
+
+  ?line {STRes157,S157} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL018.xsd','./msxsdtest/Group',valid),
+  STResList158 = [STRes157|STResList157],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL018.xml','./msxsdtest/Group',valid,S157),
+  ITResList97 = [ITRes96|ITResList96],
+
+
+  ?line {STRes158,S158} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL019.xsd','./msxsdtest/Group',valid),
+  STResList159 = [STRes158|STResList158],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL019.xml','./msxsdtest/Group',invalid,S158),
+  ITResList98 = [ITRes97|ITResList97],
+
+
+  ?line {STRes159,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL020.xsd','./msxsdtest/Group',invalid),
+  STResList160 = [STRes159|STResList159],
+
+
+  ?line {STRes160,S160} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL021.xsd','./msxsdtest/Group',valid),
+  STResList161 = [STRes160|STResList160],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupL021.xml','./msxsdtest/Group',valid,S160),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes161,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL022.xsd','./msxsdtest/Group',invalid),
+  STResList162 = [STRes161|STResList161],
+
+
+  ?line {STRes162,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL023.xsd','./msxsdtest/Group',invalid),
+  STResList163 = [STRes162|STResList162],
+
+
+  ?line {STRes163,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL024.xsd','./msxsdtest/Group',invalid),
+  STResList164 = [STRes163|STResList163],
+
+
+  ?line {STRes164,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupL025.xsd','./msxsdtest/Group',invalid),
+  STResList165 = [STRes164|STResList164],
+
+
+  ?line {STRes165,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupM001.xsd','./msxsdtest/Group',valid),
+  STResList166 = [STRes165|STResList165],
+
+
+  ?line {STRes166,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupM002.xsd','./msxsdtest/Group',invalid),
+  STResList167 = [STRes166|STResList166],
+
+
+  ?line {STRes167,S167} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupM003.xsd','./msxsdtest/Group',valid),
+  STResList168 = [STRes167|STResList167],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupM003.xml','./msxsdtest/Group',invalid,S167),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes168,S168} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupM004.xsd','./msxsdtest/Group',valid),
+  STResList169 = [STRes168|STResList168],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupM004.xml','./msxsdtest/Group',valid,S168),
+  ITResList101 = [ITRes100|ITResList100],
+
+
+  ?line {STRes169,S169} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupM005.xsd','./msxsdtest/Group',valid),
+  STResList170 = [STRes169|STResList169],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupM005.xml','./msxsdtest/Group',invalid,S169),
+  ITResList102 = [ITRes101|ITResList101],
+
+
+  ?line {STRes170,S170} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN001.xsd','./msxsdtest/Group',valid),
+  STResList171 = [STRes170|STResList170],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN001.xml','./msxsdtest/Group',valid,S170),
+  ITResList103 = [ITRes102|ITResList102],
+
+
+  ?line {STRes171,S171} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN002.xsd','./msxsdtest/Group',valid),
+  STResList172 = [STRes171|STResList171],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN002.xml','./msxsdtest/Group',valid,S171),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes172,S172} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN003.xsd','./msxsdtest/Group',valid),
+  STResList173 = [STRes172|STResList172],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN003.xml','./msxsdtest/Group',invalid,S172),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes173,S173} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN004.xsd','./msxsdtest/Group',valid),
+  STResList174 = [STRes173|STResList173],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN004.xml','./msxsdtest/Group',valid,S173),
+  ITResList106 = [ITRes105|ITResList105],
+
+
+  ?line {STRes174,S174} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN005.xsd','./msxsdtest/Group',valid),
+  STResList175 = [STRes174|STResList174],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN005.xml','./msxsdtest/Group',valid,S174),
+  ITResList107 = [ITRes106|ITResList106],
+
+
+  ?line {STRes175,S175} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN006.xsd','./msxsdtest/Group',valid),
+  STResList176 = [STRes175|STResList175],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN006.xml','./msxsdtest/Group',invalid,S175),
+  ITResList108 = [ITRes107|ITResList107],
+
+
+  ?line {STRes176,S176} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN007.xsd','./msxsdtest/Group',valid),
+  STResList177 = [STRes176|STResList176],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN007.xml','./msxsdtest/Group',valid,S176),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes177,S177} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN008.xsd','./msxsdtest/Group',valid),
+  STResList178 = [STRes177|STResList177],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN008.xml','./msxsdtest/Group',invalid,S177),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes178,S178} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN009.xsd','./msxsdtest/Group',valid),
+  STResList179 = [STRes178|STResList178],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN009.xml','./msxsdtest/Group',valid,S178),
+  ITResList111 = [ITRes110|ITResList110],
+
+
+  ?line {STRes179,S179} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN010.xsd','./msxsdtest/Group',valid),
+  STResList180 = [STRes179|STResList179],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN010.xml','./msxsdtest/Group',invalid,S179),
+  ITResList112 = [ITRes111|ITResList111],
+
+
+  ?line {STRes180,S180} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN011.xsd','./msxsdtest/Group',valid),
+  STResList181 = [STRes180|STResList180],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN011.xml','./msxsdtest/Group',valid,S180),
+  ITResList113 = [ITRes112|ITResList112],
+
+
+  ?line {STRes181,S181} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN012.xsd','./msxsdtest/Group',valid),
+  STResList182 = [STRes181|STResList181],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN012.xml','./msxsdtest/Group',invalid,S181),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes182,S182} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN013.xsd','./msxsdtest/Group',valid),
+  STResList183 = [STRes182|STResList182],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN013.xml','./msxsdtest/Group',invalid,S182),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes183,S183} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN014.xsd','./msxsdtest/Group',valid),
+  STResList184 = [STRes183|STResList183],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN014.xml','./msxsdtest/Group',valid,S183),
+  ITResList116 = [ITRes115|ITResList115],
+
+
+  ?line {STRes184,S184} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN015.xsd','./msxsdtest/Group',valid),
+  STResList185 = [STRes184|STResList184],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN015.xml','./msxsdtest/Group',invalid,S184),
+  ITResList117 = [ITRes116|ITResList116],
+
+
+  ?line {STRes185,S185} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN016.xsd','./msxsdtest/Group',valid),
+  STResList186 = [STRes185|STResList185],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN016.xml','./msxsdtest/Group',invalid,S185),
+  ITResList118 = [ITRes117|ITResList117],
+
+
+  ?line {STRes186,S186} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN017.xsd','./msxsdtest/Group',valid),
+  STResList187 = [STRes186|STResList186],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN017.xml','./msxsdtest/Group',valid,S186),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes187,S187} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN018.xsd','./msxsdtest/Group',valid),
+  STResList188 = [STRes187|STResList187],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN018.xml','./msxsdtest/Group',valid,S187),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes188,S188} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN019.xsd','./msxsdtest/Group',valid),
+  STResList189 = [STRes188|STResList188],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN019.xml','./msxsdtest/Group',invalid,S188),
+  ITResList121 = [ITRes120|ITResList120],
+
+
+  ?line {STRes189,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN020.xsd','./msxsdtest/Group',invalid),
+  STResList190 = [STRes189|STResList189],
+
+
+  ?line {STRes190,S190} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN021.xsd','./msxsdtest/Group',valid),
+  STResList191 = [STRes190|STResList190],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupN021.xml','./msxsdtest/Group',valid,S190),
+  ITResList122 = [ITRes121|ITResList121],
+
+
+  ?line {STRes191,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN022.xsd','./msxsdtest/Group',invalid),
+  STResList192 = [STRes191|STResList191],
+
+
+  ?line {STRes192,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN023.xsd','./msxsdtest/Group',invalid),
+  STResList193 = [STRes192|STResList192],
+
+
+  ?line {STRes193,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN024.xsd','./msxsdtest/Group',invalid),
+  STResList194 = [STRes193|STResList193],
+
+
+  ?line {STRes194,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupN025.xsd','./msxsdtest/Group',invalid),
+  STResList195 = [STRes194|STResList194],
+
+
+  ?line {STRes195,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO001.xsd','./msxsdtest/Group',valid),
+  STResList196 = [STRes195|STResList195],
+
+
+  ?line {STRes196,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO002.xsd','./msxsdtest/Group',invalid),
+  STResList197 = [STRes196|STResList196],
+
+
+  ?line {STRes197,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO003.xsd','./msxsdtest/Group',invalid),
+  STResList198 = [STRes197|STResList197],
+
+
+  ?line {STRes198,S198} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO004.xsd','./msxsdtest/Group',valid),
+  STResList199 = [STRes198|STResList198],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupO004.xml','./msxsdtest/Group',valid,S198),
+  ITResList123 = [ITRes122|ITResList122],
+
+
+  ?line {STRes199,S199} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO005.xsd','./msxsdtest/Group',valid),
+  STResList200 = [STRes199|STResList199],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupO005.xml','./msxsdtest/Group',invalid,S199),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes200,S200} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO006.xsd','./msxsdtest/Group',valid),
+  STResList201 = [STRes200|STResList200],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupO006.xml','./msxsdtest/Group',valid,S200),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes201,S201} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO007.xsd','./msxsdtest/Group',valid),
+  STResList202 = [STRes201|STResList201],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupO007.xml','./msxsdtest/Group',invalid,S201),
+  ITResList126 = [ITRes125|ITResList125],
+
+
+  ?line {STRes202,S202} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO008.xsd','./msxsdtest/Group',valid),
+  STResList203 = [STRes202|STResList202],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupO008.xml','./msxsdtest/Group',valid,S202),
+  ITResList127 = [ITRes126|ITResList126],
+
+
+  ?line {STRes203,S203} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO009.xsd','./msxsdtest/Group',valid),
+  STResList204 = [STRes203|STResList203],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Group/groupO009.xml','./msxsdtest/Group',invalid,S203),
+  ITResList128 = [ITRes127|ITResList127],
+
+
+  ?line {STRes204,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO010.xsd','./msxsdtest/Group',invalid),
+  STResList205 = [STRes204|STResList204],
+
+
+  ?line {STRes205,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO011.xsd','./msxsdtest/Group',invalid),
+  STResList206 = [STRes205|STResList205],
+
+
+  ?line {STRes206,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO012.xsd','./msxsdtest/Group',invalid),
+  STResList207 = [STRes206|STResList206],
+
+
+  ?line {STRes207,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO013.xsd','./msxsdtest/Group',invalid),
+  STResList208 = [STRes207|STResList207],
+
+
+  ?line {STRes208,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO014.xsd','./msxsdtest/Group',valid),
+  STResList209 = [STRes208|STResList208],
+
+
+  ?line {STRes209,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO015.xsd','./msxsdtest/Group',invalid),
+  STResList210 = [STRes209|STResList209],
+
+
+  ?line {STRes210,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO016.xsd','./msxsdtest/Group',invalid),
+  STResList211 = [STRes210|STResList210],
+
+
+  ?line {STRes211,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO017.xsd','./msxsdtest/Group',invalid),
+  STResList212 = [STRes211|STResList211],
+
+
+  ?line {STRes212,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO018.xsd','./msxsdtest/Group',invalid),
+  STResList213 = [STRes212|STResList212],
+
+
+  ?line {STRes213,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO019.xsd','./msxsdtest/Group',invalid),
+  STResList214 = [STRes213|STResList213],
+
+
+  ?line {STRes214,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO020.xsd','./msxsdtest/Group',invalid),
+  STResList215 = [STRes214|STResList214],
+
+
+  ?line {STRes215,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO021.xsd','./msxsdtest/Group',invalid),
+  STResList216 = [STRes215|STResList215],
+
+
+  ?line {STRes216,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO022.xsd','./msxsdtest/Group',invalid),
+  STResList217 = [STRes216|STResList216],
+
+
+  ?line {STRes217,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO023.xsd','./msxsdtest/Group',invalid),
+  STResList218 = [STRes217|STResList217],
+
+
+  ?line {STRes218,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO024.xsd','./msxsdtest/Group',invalid),
+  STResList219 = [STRes218|STResList218],
+
+
+  ?line {STRes219,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO025.xsd','./msxsdtest/Group',invalid),
+  STResList220 = [STRes219|STResList219],
+
+
+  ?line {STRes220,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO026.xsd','./msxsdtest/Group',invalid),
+  STResList221 = [STRes220|STResList220],
+
+
+  ?line {STRes221,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupO027.xsd','./msxsdtest/Group',invalid),
+  STResList222 = [STRes221|STResList221],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList222,ITResList128).
+
+%% 3.11.1 The Identity-constraint Definition Schema Component.
+
+idc_(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_string.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_token.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S2),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_language.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S3),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S4),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S5),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S6),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S7),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S8),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S9),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S10),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S11),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S12),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S13),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S14),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S15),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S16),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S17),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S18),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S19),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S20),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S21),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S22),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S23),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S24),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S25),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S26),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S27),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S28),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S29),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S30),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S31),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_dateTime.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_dateTime.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S32),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_time.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_time.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S33),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_date.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_date.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S34),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_gYearMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_gYearMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S35),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_gYear.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_gYear.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S36),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes37,S37} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_gMonthDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList38 = [STRes37|STResList37],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_gMonthDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S37),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes38,S38} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_gDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList39 = [STRes38|STResList38],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_gDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S38),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes39,S39} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_gMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList40 = [STRes39|STResList39],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_string_gMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S39),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_string.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S40),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes41,S41} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList42 = [STRes41|STResList41],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S41),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes42,S42} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList43 = [STRes42|STResList42],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_token.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S42),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes43,S43} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList44 = [STRes43|STResList43],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_language.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S43),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes44,S44} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList45 = [STRes44|STResList44],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S44),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes45,S45} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList46 = [STRes45|STResList45],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S45),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes46,S46} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList47 = [STRes46|STResList46],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S46),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes47,S47} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList48 = [STRes47|STResList47],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S47),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes48,S48} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList49 = [STRes48|STResList48],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S48),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes49,S49} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList50 = [STRes49|STResList49],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S49),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes50,S50} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList51 = [STRes50|STResList50],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S50),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes51,S51} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList52 = [STRes51|STResList51],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S51),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes52,S52} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList53 = [STRes52|STResList52],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S52),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes53,S53} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList54 = [STRes53|STResList53],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S53),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes54,S54} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList55 = [STRes54|STResList54],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S54),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes55,S55} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList56 = [STRes55|STResList55],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S55),
+  ITResList56 = [ITRes55|ITResList55],
+
+
+  ?line {STRes56,S56} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList57 = [STRes56|STResList56],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S56),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes57,S57} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList58 = [STRes57|STResList57],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S57),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes58,S58} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList59 = [STRes58|STResList58],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S58),
+  ITResList59 = [ITRes58|ITResList58],
+
+
+  ?line {STRes59,S59} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList60 = [STRes59|STResList59],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S59),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes60,S60} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList61 = [STRes60|STResList60],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S60),
+  ITResList61 = [ITRes60|ITResList60],
+
+
+  ?line {STRes61,S61} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList62 = [STRes61|STResList61],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S61),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes62,S62} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList63 = [STRes62|STResList62],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S62),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes63,S63} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList64 = [STRes63|STResList63],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S63),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes64,S64} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList65 = [STRes64|STResList64],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S64),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes65,S65} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList66 = [STRes65|STResList65],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S65),
+  ITResList66 = [ITRes65|ITResList65],
+
+
+  ?line {STRes66,S66} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList67 = [STRes66|STResList66],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S66),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes67,S67} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList68 = [STRes67|STResList67],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S67),
+  ITResList68 = [ITRes67|ITResList67],
+
+
+  ?line {STRes68,S68} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList69 = [STRes68|STResList68],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S68),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes69,S69} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList70 = [STRes69|STResList69],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S69),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes70,S70} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList71 = [STRes70|STResList70],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S70),
+  ITResList71 = [ITRes70|ITResList70],
+
+
+  ?line {STRes71,S71} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList72 = [STRes71|STResList71],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S71),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes72,S72} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_dateTime.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList73 = [STRes72|STResList72],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_dateTime.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S72),
+  ITResList73 = [ITRes72|ITResList72],
+
+
+  ?line {STRes73,S73} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_time.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList74 = [STRes73|STResList73],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_time.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S73),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes74,S74} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_date.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList75 = [STRes74|STResList74],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_date.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S74),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes75,S75} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_gYearMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList76 = [STRes75|STResList75],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_gYearMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S75),
+  ITResList76 = [ITRes75|ITResList75],
+
+
+  ?line {STRes76,S76} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_gYear.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList77 = [STRes76|STResList76],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_gYear.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S76),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes77,S77} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_gMonthDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList78 = [STRes77|STResList77],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_gMonthDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S77),
+  ITResList78 = [ITRes77|ITResList77],
+
+
+  ?line {STRes78,S78} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_gDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList79 = [STRes78|STResList78],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_gDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S78),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes79,S79} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_gMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList80 = [STRes79|STResList79],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_normalizedString_gMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S79),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes80,S80} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList81 = [STRes80|STResList80],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_string.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S80),
+  ITResList81 = [ITRes80|ITResList80],
+
+
+  ?line {STRes81,S81} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList82 = [STRes81|STResList81],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S81),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes82,S82} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList83 = [STRes82|STResList82],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_token.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S82),
+  ITResList83 = [ITRes82|ITResList82],
+
+
+  ?line {STRes83,S83} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList84 = [STRes83|STResList83],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_language.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S83),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes84,S84} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList85 = [STRes84|STResList84],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S84),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes85,S85} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList86 = [STRes85|STResList85],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S85),
+  ITResList86 = [ITRes85|ITResList85],
+
+
+  ?line {STRes86,S86} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList87 = [STRes86|STResList86],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S86),
+  ITResList87 = [ITRes86|ITResList86],
+
+
+  ?line {STRes87,S87} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList88 = [STRes87|STResList87],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S87),
+  ITResList88 = [ITRes87|ITResList87],
+
+
+  ?line {STRes88,S88} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList89 = [STRes88|STResList88],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S88),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes89,S89} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList90 = [STRes89|STResList89],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S89),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes90,S90} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList91 = [STRes90|STResList90],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S90),
+  ITResList91 = [ITRes90|ITResList90],
+
+
+  ?line {STRes91,S91} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList92 = [STRes91|STResList91],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S91),
+  ITResList92 = [ITRes91|ITResList91],
+
+
+  ?line {STRes92,S92} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList93 = [STRes92|STResList92],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S92),
+  ITResList93 = [ITRes92|ITResList92],
+
+
+  ?line {STRes93,S93} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList94 = [STRes93|STResList93],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S93),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes94,S94} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList95 = [STRes94|STResList94],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S94),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes95,S95} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList96 = [STRes95|STResList95],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S95),
+  ITResList96 = [ITRes95|ITResList95],
+
+
+  ?line {STRes96,S96} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList97 = [STRes96|STResList96],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S96),
+  ITResList97 = [ITRes96|ITResList96],
+
+
+  ?line {STRes97,S97} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList98 = [STRes97|STResList97],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S97),
+  ITResList98 = [ITRes97|ITResList97],
+
+
+  ?line {STRes98,S98} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList99 = [STRes98|STResList98],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S98),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes99,S99} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList100 = [STRes99|STResList99],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S99),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes100,S100} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList101 = [STRes100|STResList100],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S100),
+  ITResList101 = [ITRes100|ITResList100],
+
+
+  ?line {STRes101,S101} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList102 = [STRes101|STResList101],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S101),
+  ITResList102 = [ITRes101|ITResList101],
+
+
+  ?line {STRes102,S102} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList103 = [STRes102|STResList102],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S102),
+  ITResList103 = [ITRes102|ITResList102],
+
+
+  ?line {STRes103,S103} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList104 = [STRes103|STResList103],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S103),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes104,S104} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList105 = [STRes104|STResList104],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S104),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes105,S105} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList106 = [STRes105|STResList105],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S105),
+  ITResList106 = [ITRes105|ITResList105],
+
+
+  ?line {STRes106,S106} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList107 = [STRes106|STResList106],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S106),
+  ITResList107 = [ITRes106|ITResList106],
+
+
+  ?line {STRes107,S107} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList108 = [STRes107|STResList107],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S107),
+  ITResList108 = [ITRes107|ITResList107],
+
+
+  ?line {STRes108,S108} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList109 = [STRes108|STResList108],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S108),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes109,S109} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList110 = [STRes109|STResList109],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S109),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes110,S110} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList111 = [STRes110|STResList110],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S110),
+  ITResList111 = [ITRes110|ITResList110],
+
+
+  ?line {STRes111,S111} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList112 = [STRes111|STResList111],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S111),
+  ITResList112 = [ITRes111|ITResList111],
+
+
+  ?line {STRes112,S112} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_dateTime.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList113 = [STRes112|STResList112],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_dateTime.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S112),
+  ITResList113 = [ITRes112|ITResList112],
+
+
+  ?line {STRes113,S113} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_time.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList114 = [STRes113|STResList113],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_time.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S113),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes114,S114} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_date.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList115 = [STRes114|STResList114],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_date.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S114),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes115,S115} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_gYearMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList116 = [STRes115|STResList115],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_gYearMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S115),
+  ITResList116 = [ITRes115|ITResList115],
+
+
+  ?line {STRes116,S116} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_gYear.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList117 = [STRes116|STResList116],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_gYear.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S116),
+  ITResList117 = [ITRes116|ITResList116],
+
+
+  ?line {STRes117,S117} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_gMonthDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList118 = [STRes117|STResList117],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_gMonthDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S117),
+  ITResList118 = [ITRes117|ITResList117],
+
+
+  ?line {STRes118,S118} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_gDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList119 = [STRes118|STResList118],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_gDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S118),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes119,S119} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_gMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList120 = [STRes119|STResList119],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_token_gMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S119),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes120,S120} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList121 = [STRes120|STResList120],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_string.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S120),
+  ITResList121 = [ITRes120|ITResList120],
+
+
+  ?line {STRes121,S121} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList122 = [STRes121|STResList121],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S121),
+  ITResList122 = [ITRes121|ITResList121],
+
+
+  ?line {STRes122,S122} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList123 = [STRes122|STResList122],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_token.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S122),
+  ITResList123 = [ITRes122|ITResList122],
+
+
+  ?line {STRes123,S123} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList124 = [STRes123|STResList123],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_language.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S123),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes124,S124} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList125 = [STRes124|STResList124],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S124),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes125,S125} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList126 = [STRes125|STResList125],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S125),
+  ITResList126 = [ITRes125|ITResList125],
+
+
+  ?line {STRes126,S126} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList127 = [STRes126|STResList126],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S126),
+  ITResList127 = [ITRes126|ITResList126],
+
+
+  ?line {STRes127,S127} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList128 = [STRes127|STResList127],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S127),
+  ITResList128 = [ITRes127|ITResList127],
+
+
+  ?line {STRes128,S128} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_IDREFS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList129 = [STRes128|STResList128],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_IDREFS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S128),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes129,S129} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList130 = [STRes129|STResList129],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S129),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  ?line {STRes130,S130} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList131 = [STRes130|STResList130],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S130),
+  ITResList131 = [ITRes130|ITResList130],
+
+
+  ?line {STRes131,S131} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList132 = [STRes131|STResList131],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S131),
+  ITResList132 = [ITRes131|ITResList131],
+
+
+  ?line {STRes132,S132} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList133 = [STRes132|STResList132],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S132),
+  ITResList133 = [ITRes132|ITResList132],
+
+
+  ?line {STRes133,S133} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList134 = [STRes133|STResList133],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_language_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S133),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes134,S134} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList135 = [STRes134|STResList134],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_string.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S134),
+  ITResList135 = [ITRes134|ITResList134],
+
+
+  ?line {STRes135,S135} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList136 = [STRes135|STResList135],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S135),
+  ITResList136 = [ITRes135|ITResList135],
+
+
+  ?line {STRes136,S136} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList137 = [STRes136|STResList136],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_token.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S136),
+  ITResList137 = [ITRes136|ITResList136],
+
+
+  ?line {STRes137,S137} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList138 = [STRes137|STResList137],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_language.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S137),
+  ITResList138 = [ITRes137|ITResList137],
+
+
+  ?line {STRes138,S138} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList139 = [STRes138|STResList138],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S138),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes139,S139} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList140 = [STRes139|STResList139],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S139),
+  ITResList140 = [ITRes139|ITResList139],
+
+
+  ?line {STRes140,S140} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList141 = [STRes140|STResList140],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S140),
+  ITResList141 = [ITRes140|ITResList140],
+
+
+  ?line {STRes141,S141} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList142 = [STRes141|STResList141],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S141),
+  ITResList142 = [ITRes141|ITResList141],
+
+
+  ?line {STRes142,S142} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList143 = [STRes142|STResList142],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S142),
+  ITResList143 = [ITRes142|ITResList142],
+
+
+  ?line {STRes143,S143} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList144 = [STRes143|STResList143],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S143),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes144,S144} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList145 = [STRes144|STResList144],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S144),
+  ITResList145 = [ITRes144|ITResList144],
+
+
+  ?line {STRes145,S145} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList146 = [STRes145|STResList145],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S145),
+  ITResList146 = [ITRes145|ITResList145],
+
+
+  ?line {STRes146,S146} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList147 = [STRes146|STResList146],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S146),
+  ITResList147 = [ITRes146|ITResList146],
+
+
+  ?line {STRes147,S147} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList148 = [STRes147|STResList147],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S147),
+  ITResList148 = [ITRes147|ITResList147],
+
+
+  ?line {STRes148,S148} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList149 = [STRes148|STResList148],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_Name_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S148),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes149,S149} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList150 = [STRes149|STResList149],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_string.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S149),
+  ITResList150 = [ITRes149|ITResList149],
+
+
+  ?line {STRes150,S150} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList151 = [STRes150|STResList150],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S150),
+  ITResList151 = [ITRes150|ITResList150],
+
+
+  ?line {STRes151,S151} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList152 = [STRes151|STResList151],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_token.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S151),
+  ITResList152 = [ITRes151|ITResList151],
+
+
+  ?line {STRes152,S152} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList153 = [STRes152|STResList152],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_language.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S152),
+  ITResList153 = [ITRes152|ITResList152],
+
+
+  ?line {STRes153,S153} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList154 = [STRes153|STResList153],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S153),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes154,S154} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList155 = [STRes154|STResList154],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S154),
+  ITResList155 = [ITRes154|ITResList154],
+
+
+  ?line {STRes155,S155} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList156 = [STRes155|STResList155],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S155),
+  ITResList156 = [ITRes155|ITResList155],
+
+
+  ?line {STRes156,S156} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList157 = [STRes156|STResList156],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S156),
+  ITResList157 = [ITRes156|ITResList156],
+
+
+  ?line {STRes157,S157} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList158 = [STRes157|STResList157],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S157),
+  ITResList158 = [ITRes157|ITResList157],
+
+
+  ?line {STRes158,S158} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList159 = [STRes158|STResList158],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S158),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes159,S159} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList160 = [STRes159|STResList159],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S159),
+  ITResList160 = [ITRes159|ITResList159],
+
+
+  ?line {STRes160,S160} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList161 = [STRes160|STResList160],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S160),
+  ITResList161 = [ITRes160|ITResList160],
+
+
+  ?line {STRes161,S161} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList162 = [STRes161|STResList161],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S161),
+  ITResList162 = [ITRes161|ITResList161],
+
+
+  ?line {STRes162,S162} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList163 = [STRes162|STResList162],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S162),
+  ITResList163 = [ITRes162|ITResList162],
+
+
+  ?line {STRes163,S163} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList164 = [STRes163|STResList163],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NCName_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S163),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes164,S164} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList165 = [STRes164|STResList164],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_string.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S164),
+  ITResList165 = [ITRes164|ITResList164],
+
+
+  ?line {STRes165,S165} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList166 = [STRes165|STResList165],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S165),
+  ITResList166 = [ITRes165|ITResList165],
+
+
+  ?line {STRes166,S166} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList167 = [STRes166|STResList166],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_token.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S166),
+  ITResList167 = [ITRes166|ITResList166],
+
+
+  ?line {STRes167,S167} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList168 = [STRes167|STResList167],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_language.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S167),
+  ITResList168 = [ITRes167|ITResList167],
+
+
+  ?line {STRes168,S168} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList169 = [STRes168|STResList168],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S168),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  ?line {STRes169,S169} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList170 = [STRes169|STResList169],
+  ?line ITRes169 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S169),
+  ITResList170 = [ITRes169|ITResList169],
+
+
+  ?line {STRes170,S170} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList171 = [STRes170|STResList170],
+  ?line ITRes170 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S170),
+  ITResList171 = [ITRes170|ITResList170],
+
+
+  ?line {STRes171,S171} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList172 = [STRes171|STResList171],
+  ?line ITRes171 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S171),
+  ITResList172 = [ITRes171|ITResList171],
+
+
+  ?line {STRes172,S172} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_IDREFS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList173 = [STRes172|STResList172],
+  ?line ITRes172 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_IDREFS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S172),
+  ITResList173 = [ITRes172|ITResList172],
+
+
+  ?line {STRes173,S173} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList174 = [STRes173|STResList173],
+  ?line ITRes173 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S173),
+  ITResList174 = [ITRes173|ITResList173],
+
+
+  ?line {STRes174,S174} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList175 = [STRes174|STResList174],
+  ?line ITRes174 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S174),
+  ITResList175 = [ITRes174|ITResList174],
+
+
+  ?line {STRes175,S175} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList176 = [STRes175|STResList175],
+  ?line ITRes175 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S175),
+  ITResList176 = [ITRes175|ITResList175],
+
+
+  ?line {STRes176,S176} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList177 = [STRes176|STResList176],
+  ?line ITRes176 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S176),
+  ITResList177 = [ITRes176|ITResList176],
+
+
+  ?line {STRes177,S177} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList178 = [STRes177|STResList177],
+  ?line ITRes177 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S177),
+  ITResList178 = [ITRes177|ITResList177],
+
+
+  ?line {STRes178,S178} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList179 = [STRes178|STResList178],
+  ?line ITRes178 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S178),
+  ITResList179 = [ITRes178|ITResList178],
+
+
+  ?line {STRes179,S179} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList180 = [STRes179|STResList179],
+  ?line ITRes179 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_ID_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S179),
+  ITResList180 = [ITRes179|ITResList179],
+
+
+  ?line {STRes180,S180} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList181 = [STRes180|STResList180],
+  ?line ITRes180 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_string.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S180),
+  ITResList181 = [ITRes180|ITResList180],
+
+
+  ?line {STRes181,S181} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList182 = [STRes181|STResList181],
+  ?line ITRes181 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S181),
+  ITResList182 = [ITRes181|ITResList181],
+
+
+  ?line {STRes182,S182} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList183 = [STRes182|STResList182],
+  ?line ITRes182 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_token.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S182),
+  ITResList183 = [ITRes182|ITResList182],
+
+
+  ?line {STRes183,S183} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList184 = [STRes183|STResList183],
+  ?line ITRes183 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_language.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S183),
+  ITResList184 = [ITRes183|ITResList183],
+
+
+  ?line {STRes184,S184} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList185 = [STRes184|STResList184],
+  ?line ITRes184 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S184),
+  ITResList185 = [ITRes184|ITResList184],
+
+
+  ?line {STRes185,S185} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList186 = [STRes185|STResList185],
+  ?line ITRes185 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S185),
+  ITResList186 = [ITRes185|ITResList185],
+
+
+  ?line {STRes186,S186} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList187 = [STRes186|STResList186],
+  ?line ITRes186 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S186),
+  ITResList187 = [ITRes186|ITResList186],
+
+
+  ?line {STRes187,S187} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList188 = [STRes187|STResList187],
+  ?line ITRes187 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S187),
+  ITResList188 = [ITRes187|ITResList187],
+
+
+  ?line {STRes188,S188} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList189 = [STRes188|STResList188],
+  ?line ITRes188 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S188),
+  ITResList189 = [ITRes188|ITResList188],
+
+
+  ?line {STRes189,S189} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList190 = [STRes189|STResList189],
+  ?line ITRes189 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S189),
+  ITResList190 = [ITRes189|ITResList189],
+
+
+  ?line {STRes190,S190} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList191 = [STRes190|STResList190],
+  ?line ITRes190 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S190),
+  ITResList191 = [ITRes190|ITResList190],
+
+
+  ?line {STRes191,S191} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList192 = [STRes191|STResList191],
+  ?line ITRes191 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S191),
+  ITResList192 = [ITRes191|ITResList191],
+
+
+  ?line {STRes192,S192} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList193 = [STRes192|STResList192],
+  ?line ITRes192 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S192),
+  ITResList193 = [ITRes192|ITResList192],
+
+
+  ?line {STRes193,S193} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList194 = [STRes193|STResList193],
+  ?line ITRes193 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S193),
+  ITResList194 = [ITRes193|ITResList193],
+
+
+  ?line {STRes194,S194} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList195 = [STRes194|STResList194],
+  ?line ITRes194 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREF_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S194),
+  ITResList195 = [ITRes194|ITResList194],
+
+
+  ?line {STRes195,S195} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList196 = [STRes195|STResList195],
+  ?line ITRes195 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_language.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S195),
+  ITResList196 = [ITRes195|ITResList195],
+
+
+  ?line {STRes196,S196} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList197 = [STRes196|STResList196],
+  ?line ITRes196 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S196),
+  ITResList197 = [ITRes196|ITResList196],
+
+
+  ?line {STRes197,S197} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList198 = [STRes197|STResList197],
+  ?line ITRes197 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S197),
+  ITResList198 = [ITRes197|ITResList197],
+
+
+  ?line {STRes198,S198} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList199 = [STRes198|STResList198],
+  ?line ITRes198 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S198),
+  ITResList199 = [ITRes198|ITResList198],
+
+
+  ?line {STRes199,S199} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList200 = [STRes199|STResList199],
+  ?line ITRes199 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S199),
+  ITResList200 = [ITRes199|ITResList199],
+
+
+  ?line {STRes200,S200} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList201 = [STRes200|STResList200],
+  ?line ITRes200 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S200),
+  ITResList201 = [ITRes200|ITResList200],
+
+
+  ?line {STRes201,S201} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList202 = [STRes201|STResList201],
+  ?line ITRes201 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S201),
+  ITResList202 = [ITRes201|ITResList201],
+
+
+  ?line {STRes202,S202} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList203 = [STRes202|STResList202],
+  ?line ITRes202 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S202),
+  ITResList203 = [ITRes202|ITResList202],
+
+
+  ?line {STRes203,S203} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList204 = [STRes203|STResList203],
+  ?line ITRes203 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_IDREFS_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S203),
+  ITResList204 = [ITRes203|ITResList203],
+
+
+  ?line {STRes204,S204} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList205 = [STRes204|STResList204],
+  ?line ITRes204 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_string.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S204),
+  ITResList205 = [ITRes204|ITResList204],
+
+
+  ?line {STRes205,S205} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList206 = [STRes205|STResList205],
+  ?line ITRes205 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S205),
+  ITResList206 = [ITRes205|ITResList205],
+
+
+  ?line {STRes206,S206} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList207 = [STRes206|STResList206],
+  ?line ITRes206 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_token.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S206),
+  ITResList207 = [ITRes206|ITResList206],
+
+
+  ?line {STRes207,S207} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList208 = [STRes207|STResList207],
+  ?line ITRes207 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_language.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S207),
+  ITResList208 = [ITRes207|ITResList207],
+
+
+  ?line {STRes208,S208} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList209 = [STRes208|STResList208],
+  ?line ITRes208 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S208),
+  ITResList209 = [ITRes208|ITResList208],
+
+
+  ?line {STRes209,S209} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList210 = [STRes209|STResList209],
+  ?line ITRes209 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S209),
+  ITResList210 = [ITRes209|ITResList209],
+
+
+  ?line {STRes210,S210} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList211 = [STRes210|STResList210],
+  ?line ITRes210 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S210),
+  ITResList211 = [ITRes210|ITResList210],
+
+
+  ?line {STRes211,S211} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList212 = [STRes211|STResList211],
+  ?line ITRes211 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S211),
+  ITResList212 = [ITRes211|ITResList211],
+
+
+  ?line {STRes212,S212} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_IDREFS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList213 = [STRes212|STResList212],
+  ?line ITRes212 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_IDREFS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S212),
+  ITResList213 = [ITRes212|ITResList212],
+
+
+  ?line {STRes213,S213} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList214 = [STRes213|STResList213],
+  ?line ITRes213 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S213),
+  ITResList214 = [ITRes213|ITResList213],
+
+
+  ?line {STRes214,S214} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList215 = [STRes214|STResList214],
+  ?line ITRes214 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S214),
+  ITResList215 = [ITRes214|ITResList214],
+
+
+  ?line {STRes215,S215} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList216 = [STRes215|STResList215],
+  ?line ITRes215 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S215),
+  ITResList216 = [ITRes215|ITResList215],
+
+
+  ?line {STRes216,S216} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList217 = [STRes216|STResList216],
+  ?line ITRes216 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S216),
+  ITResList217 = [ITRes216|ITResList216],
+
+
+  ?line {STRes217,S217} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList218 = [STRes217|STResList217],
+  ?line ITRes217 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S217),
+  ITResList218 = [ITRes217|ITResList217],
+
+
+  ?line {STRes218,S218} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList219 = [STRes218|STResList218],
+  ?line ITRes218 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S218),
+  ITResList219 = [ITRes218|ITResList218],
+
+
+  ?line {STRes219,S219} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList220 = [STRes219|STResList219],
+  ?line ITRes219 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S219),
+  ITResList220 = [ITRes219|ITResList219],
+
+
+  ?line {STRes220,S220} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList221 = [STRes220|STResList220],
+  ?line ITRes220 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S220),
+  ITResList221 = [ITRes220|ITResList220],
+
+
+  ?line {STRes221,S221} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList222 = [STRes221|STResList221],
+  ?line ITRes221 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S221),
+  ITResList222 = [ITRes221|ITResList221],
+
+
+  ?line {STRes222,S222} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList223 = [STRes222|STResList222],
+  ?line ITRes222 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S222),
+  ITResList223 = [ITRes222|ITResList222],
+
+
+  ?line {STRes223,S223} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList224 = [STRes223|STResList223],
+  ?line ITRes223 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S223),
+  ITResList224 = [ITRes223|ITResList223],
+
+
+  ?line {STRes224,S224} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList225 = [STRes224|STResList224],
+  ?line ITRes224 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S224),
+  ITResList225 = [ITRes224|ITResList224],
+
+
+  ?line {STRes225,S225} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList226 = [STRes225|STResList225],
+  ?line ITRes225 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S225),
+  ITResList226 = [ITRes225|ITResList225],
+
+
+  ?line {STRes226,S226} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList227 = [STRes226|STResList226],
+  ?line ITRes226 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S226),
+  ITResList227 = [ITRes226|ITResList226],
+
+
+  ?line {STRes227,S227} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList228 = [STRes227|STResList227],
+  ?line ITRes227 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S227),
+  ITResList228 = [ITRes227|ITResList227],
+
+
+  ?line {STRes228,S228} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList229 = [STRes228|STResList228],
+  ?line ITRes228 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S228),
+  ITResList229 = [ITRes228|ITResList228],
+
+
+  ?line {STRes229,S229} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList230 = [STRes229|STResList229],
+  ?line ITRes229 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S229),
+  ITResList230 = [ITRes229|ITResList229],
+
+
+  ?line {STRes230,S230} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList231 = [STRes230|STResList230],
+  ?line ITRes230 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S230),
+  ITResList231 = [ITRes230|ITResList230],
+
+
+  ?line {STRes231,S231} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList232 = [STRes231|STResList231],
+  ?line ITRes231 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S231),
+  ITResList232 = [ITRes231|ITResList231],
+
+
+  ?line {STRes232,S232} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList233 = [STRes232|STResList232],
+  ?line ITRes232 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S232),
+  ITResList233 = [ITRes232|ITResList232],
+
+
+  ?line {STRes233,S233} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList234 = [STRes233|STResList233],
+  ?line ITRes233 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S233),
+  ITResList234 = [ITRes233|ITResList233],
+
+
+  ?line {STRes234,S234} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList235 = [STRes234|STResList234],
+  ?line ITRes234 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S234),
+  ITResList235 = [ITRes234|ITResList234],
+
+
+  ?line {STRes235,S235} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList236 = [STRes235|STResList235],
+  ?line ITRes235 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S235),
+  ITResList236 = [ITRes235|ITResList235],
+
+
+  ?line {STRes236,S236} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList237 = [STRes236|STResList236],
+  ?line ITRes236 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S236),
+  ITResList237 = [ITRes236|ITResList236],
+
+
+  ?line {STRes237,S237} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_dateTime.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList238 = [STRes237|STResList237],
+  ?line ITRes237 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_dateTime.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S237),
+  ITResList238 = [ITRes237|ITResList237],
+
+
+  ?line {STRes238,S238} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_time.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList239 = [STRes238|STResList238],
+  ?line ITRes238 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_time.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S238),
+  ITResList239 = [ITRes238|ITResList238],
+
+
+  ?line {STRes239,S239} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_date.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList240 = [STRes239|STResList239],
+  ?line ITRes239 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_date.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S239),
+  ITResList240 = [ITRes239|ITResList239],
+
+
+  ?line {STRes240,S240} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_gYearMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList241 = [STRes240|STResList240],
+  ?line ITRes240 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_gYearMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S240),
+  ITResList241 = [ITRes240|ITResList240],
+
+
+  ?line {STRes241,S241} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_gYear.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList242 = [STRes241|STResList241],
+  ?line ITRes241 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_gYear.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S241),
+  ITResList242 = [ITRes241|ITResList241],
+
+
+  ?line {STRes242,S242} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_gMonthDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList243 = [STRes242|STResList242],
+  ?line ITRes242 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_gMonthDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S242),
+  ITResList243 = [ITRes242|ITResList242],
+
+
+  ?line {STRes243,S243} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_gDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList244 = [STRes243|STResList243],
+  ?line ITRes243 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_gDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S243),
+  ITResList244 = [ITRes243|ITResList243],
+
+
+  ?line {STRes244,S244} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_gMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList245 = [STRes244|STResList244],
+  ?line ITRes244 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKEN_gMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S244),
+  ITResList245 = [ITRes244|ITResList244],
+
+
+  ?line {STRes245,S245} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList246 = [STRes245|STResList245],
+  ?line ITRes245 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_language.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S245),
+  ITResList246 = [ITRes245|ITResList245],
+
+
+  ?line {STRes246,S246} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList247 = [STRes246|STResList246],
+  ?line ITRes246 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S246),
+  ITResList247 = [ITRes246|ITResList246],
+
+
+  ?line {STRes247,S247} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList248 = [STRes247|STResList247],
+  ?line ITRes247 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S247),
+  ITResList248 = [ITRes247|ITResList247],
+
+
+  ?line {STRes248,S248} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList249 = [STRes248|STResList248],
+  ?line ITRes248 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S248),
+  ITResList249 = [ITRes248|ITResList248],
+
+
+  ?line {STRes249,S249} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList250 = [STRes249|STResList249],
+  ?line ITRes249 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S249),
+  ITResList250 = [ITRes249|ITResList249],
+
+
+  ?line {STRes250,S250} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_IDREFS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList251 = [STRes250|STResList250],
+  ?line ITRes250 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_IDREFS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S250),
+  ITResList251 = [ITRes250|ITResList250],
+
+
+  ?line {STRes251,S251} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList252 = [STRes251|STResList251],
+  ?line ITRes251 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S251),
+  ITResList252 = [ITRes251|ITResList251],
+
+
+  ?line {STRes252,S252} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList253 = [STRes252|STResList252],
+  ?line ITRes252 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S252),
+  ITResList253 = [ITRes252|ITResList252],
+
+
+  ?line {STRes253,S253} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList254 = [STRes253|STResList253],
+  ?line ITRes253 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S253),
+  ITResList254 = [ITRes253|ITResList253],
+
+
+  ?line {STRes254,S254} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList255 = [STRes254|STResList254],
+  ?line ITRes254 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S254),
+  ITResList255 = [ITRes254|ITResList254],
+
+
+  ?line {STRes255,S255} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList256 = [STRes255|STResList255],
+  ?line ITRes255 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S255),
+  ITResList256 = [ITRes255|ITResList255],
+
+
+  ?line {STRes256,S256} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList257 = [STRes256|STResList256],
+  ?line ITRes256 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S256),
+  ITResList257 = [ITRes256|ITResList256],
+
+
+  ?line {STRes257,S257} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList258 = [STRes257|STResList257],
+  ?line ITRes257 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S257),
+  ITResList258 = [ITRes257|ITResList257],
+
+
+  ?line {STRes258,S258} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList259 = [STRes258|STResList258],
+  ?line ITRes258 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S258),
+  ITResList259 = [ITRes258|ITResList258],
+
+
+  ?line {STRes259,S259} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList260 = [STRes259|STResList259],
+  ?line ITRes259 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S259),
+  ITResList260 = [ITRes259|ITResList259],
+
+
+  ?line {STRes260,S260} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList261 = [STRes260|STResList260],
+  ?line ITRes260 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S260),
+  ITResList261 = [ITRes260|ITResList260],
+
+
+  ?line {STRes261,S261} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList262 = [STRes261|STResList261],
+  ?line ITRes261 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S261),
+  ITResList262 = [ITRes261|ITResList261],
+
+
+  ?line {STRes262,S262} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList263 = [STRes262|STResList262],
+  ?line ITRes262 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S262),
+  ITResList263 = [ITRes262|ITResList262],
+
+
+  ?line {STRes263,S263} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList264 = [STRes263|STResList263],
+  ?line ITRes263 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S263),
+  ITResList264 = [ITRes263|ITResList263],
+
+
+  ?line {STRes264,S264} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList265 = [STRes264|STResList264],
+  ?line ITRes264 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S264),
+  ITResList265 = [ITRes264|ITResList264],
+
+
+  ?line {STRes265,S265} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList266 = [STRes265|STResList265],
+  ?line ITRes265 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S265),
+  ITResList266 = [ITRes265|ITResList265],
+
+
+  ?line {STRes266,S266} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList267 = [STRes266|STResList266],
+  ?line ITRes266 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S266),
+  ITResList267 = [ITRes266|ITResList266],
+
+
+  ?line {STRes267,S267} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList268 = [STRes267|STResList267],
+  ?line ITRes267 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S267),
+  ITResList268 = [ITRes267|ITResList267],
+
+
+  ?line {STRes268,S268} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList269 = [STRes268|STResList268],
+  ?line ITRes268 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S268),
+  ITResList269 = [ITRes268|ITResList268],
+
+
+  ?line {STRes269,S269} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList270 = [STRes269|STResList269],
+  ?line ITRes269 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S269),
+  ITResList270 = [ITRes269|ITResList269],
+
+
+  ?line {STRes270,S270} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList271 = [STRes270|STResList270],
+  ?line ITRes270 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S270),
+  ITResList271 = [ITRes270|ITResList270],
+
+
+  ?line {STRes271,S271} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList272 = [STRes271|STResList271],
+  ?line ITRes271 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S271),
+  ITResList272 = [ITRes271|ITResList271],
+
+
+  ?line {STRes272,S272} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList273 = [STRes272|STResList272],
+  ?line ITRes272 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S272),
+  ITResList273 = [ITRes272|ITResList272],
+
+
+  ?line {STRes273,S273} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList274 = [STRes273|STResList273],
+  ?line ITRes273 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S273),
+  ITResList274 = [ITRes273|ITResList273],
+
+
+  ?line {STRes274,S274} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_dateTime.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList275 = [STRes274|STResList274],
+  ?line ITRes274 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_dateTime.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S274),
+  ITResList275 = [ITRes274|ITResList274],
+
+
+  ?line {STRes275,S275} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_time.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList276 = [STRes275|STResList275],
+  ?line ITRes275 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_time.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S275),
+  ITResList276 = [ITRes275|ITResList275],
+
+
+  ?line {STRes276,S276} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_date.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList277 = [STRes276|STResList276],
+  ?line ITRes276 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_date.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S276),
+  ITResList277 = [ITRes276|ITResList276],
+
+
+  ?line {STRes277,S277} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_gYearMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList278 = [STRes277|STResList277],
+  ?line ITRes277 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_gYearMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S277),
+  ITResList278 = [ITRes277|ITResList277],
+
+
+  ?line {STRes278,S278} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_gYear.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList279 = [STRes278|STResList278],
+  ?line ITRes278 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_gYear.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S278),
+  ITResList279 = [ITRes278|ITResList278],
+
+
+  ?line {STRes279,S279} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_gMonthDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList280 = [STRes279|STResList279],
+  ?line ITRes279 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_gMonthDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S279),
+  ITResList280 = [ITRes279|ITResList279],
+
+
+  ?line {STRes280,S280} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_gDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList281 = [STRes280|STResList280],
+  ?line ITRes280 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_gDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S280),
+  ITResList281 = [ITRes280|ITResList280],
+
+
+  ?line {STRes281,S281} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_gMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList282 = [STRes281|STResList281],
+  ?line ITRes281 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NMTOKENS_gMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S281),
+  ITResList282 = [ITRes281|ITResList281],
+
+
+  ?line {STRes282,S282} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList283 = [STRes282|STResList282],
+  ?line ITRes282 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S282),
+  ITResList283 = [ITRes282|ITResList282],
+
+
+  ?line {STRes283,S283} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList284 = [STRes283|STResList283],
+  ?line ITRes283 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S283),
+  ITResList284 = [ITRes283|ITResList283],
+
+
+  ?line {STRes284,S284} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList285 = [STRes284|STResList284],
+  ?line ITRes284 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S284),
+  ITResList285 = [ITRes284|ITResList284],
+
+
+  ?line {STRes285,S285} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList286 = [STRes285|STResList285],
+  ?line ITRes285 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S285),
+  ITResList286 = [ITRes285|ITResList285],
+
+
+  ?line {STRes286,S286} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList287 = [STRes286|STResList286],
+  ?line ITRes286 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S286),
+  ITResList287 = [ITRes286|ITResList286],
+
+
+  ?line {STRes287,S287} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList288 = [STRes287|STResList287],
+  ?line ITRes287 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S287),
+  ITResList288 = [ITRes287|ITResList287],
+
+
+  ?line {STRes288,S288} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList289 = [STRes288|STResList288],
+  ?line ITRes288 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S288),
+  ITResList289 = [ITRes288|ITResList288],
+
+
+  ?line {STRes289,S289} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_IDREFS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList290 = [STRes289|STResList289],
+  ?line ITRes289 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_IDREFS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S289),
+  ITResList290 = [ITRes289|ITResList289],
+
+
+  ?line {STRes290,S290} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList291 = [STRes290|STResList290],
+  ?line ITRes290 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S290),
+  ITResList291 = [ITRes290|ITResList290],
+
+
+  ?line {STRes291,S291} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList292 = [STRes291|STResList291],
+  ?line ITRes291 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S291),
+  ITResList292 = [ITRes291|ITResList291],
+
+
+  ?line {STRes292,S292} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList293 = [STRes292|STResList292],
+  ?line ITRes292 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S292),
+  ITResList293 = [ITRes292|ITResList292],
+
+
+  ?line {STRes293,S293} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList294 = [STRes293|STResList293],
+  ?line ITRes293 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S293),
+  ITResList294 = [ITRes293|ITResList293],
+
+
+  ?line {STRes294,S294} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList295 = [STRes294|STResList294],
+  ?line ITRes294 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S294),
+  ITResList295 = [ITRes294|ITResList294],
+
+
+  ?line {STRes295,S295} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList296 = [STRes295|STResList295],
+  ?line ITRes295 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S295),
+  ITResList296 = [ITRes295|ITResList295],
+
+
+  ?line {STRes296,S296} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList297 = [STRes296|STResList296],
+  ?line ITRes296 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S296),
+  ITResList297 = [ITRes296|ITResList296],
+
+
+  ?line {STRes297,S297} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList298 = [STRes297|STResList297],
+  ?line ITRes297 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S297),
+  ITResList298 = [ITRes297|ITResList297],
+
+
+  ?line {STRes298,S298} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList299 = [STRes298|STResList298],
+  ?line ITRes298 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S298),
+  ITResList299 = [ITRes298|ITResList298],
+
+
+  ?line {STRes299,S299} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList300 = [STRes299|STResList299],
+  ?line ITRes299 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S299),
+  ITResList300 = [ITRes299|ITResList299],
+
+
+  ?line {STRes300,S300} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList301 = [STRes300|STResList300],
+  ?line ITRes300 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S300),
+  ITResList301 = [ITRes300|ITResList300],
+
+
+  ?line {STRes301,S301} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList302 = [STRes301|STResList301],
+  ?line ITRes301 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S301),
+  ITResList302 = [ITRes301|ITResList301],
+
+
+  ?line {STRes302,S302} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList303 = [STRes302|STResList302],
+  ?line ITRes302 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S302),
+  ITResList303 = [ITRes302|ITResList302],
+
+
+  ?line {STRes303,S303} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList304 = [STRes303|STResList303],
+  ?line ITRes303 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S303),
+  ITResList304 = [ITRes303|ITResList303],
+
+
+  ?line {STRes304,S304} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList305 = [STRes304|STResList304],
+  ?line ITRes304 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S304),
+  ITResList305 = [ITRes304|ITResList304],
+
+
+  ?line {STRes305,S305} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList306 = [STRes305|STResList305],
+  ?line ITRes305 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S305),
+  ITResList306 = [ITRes305|ITResList305],
+
+
+  ?line {STRes306,S306} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList307 = [STRes306|STResList306],
+  ?line ITRes306 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S306),
+  ITResList307 = [ITRes306|ITResList306],
+
+
+  ?line {STRes307,S307} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList308 = [STRes307|STResList307],
+  ?line ITRes307 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S307),
+  ITResList308 = [ITRes307|ITResList307],
+
+
+  ?line {STRes308,S308} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList309 = [STRes308|STResList308],
+  ?line ITRes308 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S308),
+  ITResList309 = [ITRes308|ITResList308],
+
+
+  ?line {STRes309,S309} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList310 = [STRes309|STResList309],
+  ?line ITRes309 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S309),
+  ITResList310 = [ITRes309|ITResList309],
+
+
+  ?line {STRes310,S310} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList311 = [STRes310|STResList310],
+  ?line ITRes310 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S310),
+  ITResList311 = [ITRes310|ITResList310],
+
+
+  ?line {STRes311,S311} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList312 = [STRes311|STResList311],
+  ?line ITRes311 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S311),
+  ITResList312 = [ITRes311|ITResList311],
+
+
+  ?line {STRes312,S312} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList313 = [STRes312|STResList312],
+  ?line ITRes312 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_boolean_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S312),
+  ITResList313 = [ITRes312|ITResList312],
+
+
+  ?line {STRes313,S313} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList314 = [STRes313|STResList313],
+  ?line ITRes313 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S313),
+  ITResList314 = [ITRes313|ITResList313],
+
+
+  ?line {STRes314,S314} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList315 = [STRes314|STResList314],
+  ?line ITRes314 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S314),
+  ITResList315 = [ITRes314|ITResList314],
+
+
+  ?line {STRes315,S315} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList316 = [STRes315|STResList315],
+  ?line ITRes315 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S315),
+  ITResList316 = [ITRes315|ITResList315],
+
+
+  ?line {STRes316,S316} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList317 = [STRes316|STResList316],
+  ?line ITRes316 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S316),
+  ITResList317 = [ITRes316|ITResList316],
+
+
+  ?line {STRes317,S317} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList318 = [STRes317|STResList317],
+  ?line ITRes317 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S317),
+  ITResList318 = [ITRes317|ITResList317],
+
+
+  ?line {STRes318,S318} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList319 = [STRes318|STResList318],
+  ?line ITRes318 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S318),
+  ITResList319 = [ITRes318|ITResList318],
+
+
+  ?line {STRes319,S319} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList320 = [STRes319|STResList319],
+  ?line ITRes319 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S319),
+  ITResList320 = [ITRes319|ITResList319],
+
+
+  ?line {STRes320,S320} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList321 = [STRes320|STResList320],
+  ?line ITRes320 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S320),
+  ITResList321 = [ITRes320|ITResList320],
+
+
+  ?line {STRes321,S321} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList322 = [STRes321|STResList321],
+  ?line ITRes321 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S321),
+  ITResList322 = [ITRes321|ITResList321],
+
+
+  ?line {STRes322,S322} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList323 = [STRes322|STResList322],
+  ?line ITRes322 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S322),
+  ITResList323 = [ITRes322|ITResList322],
+
+
+  ?line {STRes323,S323} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList324 = [STRes323|STResList323],
+  ?line ITRes323 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S323),
+  ITResList324 = [ITRes323|ITResList323],
+
+
+  ?line {STRes324,S324} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList325 = [STRes324|STResList324],
+  ?line ITRes324 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S324),
+  ITResList325 = [ITRes324|ITResList324],
+
+
+  ?line {STRes325,S325} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList326 = [STRes325|STResList325],
+  ?line ITRes325 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S325),
+  ITResList326 = [ITRes325|ITResList325],
+
+
+  ?line {STRes326,S326} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList327 = [STRes326|STResList326],
+  ?line ITRes326 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S326),
+  ITResList327 = [ITRes326|ITResList326],
+
+
+  ?line {STRes327,S327} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList328 = [STRes327|STResList327],
+  ?line ITRes327 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S327),
+  ITResList328 = [ITRes327|ITResList327],
+
+
+  ?line {STRes328,S328} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList329 = [STRes328|STResList328],
+  ?line ITRes328 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S328),
+  ITResList329 = [ITRes328|ITResList328],
+
+
+  ?line {STRes329,S329} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList330 = [STRes329|STResList329],
+  ?line ITRes329 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S329),
+  ITResList330 = [ITRes329|ITResList329],
+
+
+  ?line {STRes330,S330} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList331 = [STRes330|STResList330],
+  ?line ITRes330 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S330),
+  ITResList331 = [ITRes330|ITResList330],
+
+
+  ?line {STRes331,S331} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList332 = [STRes331|STResList331],
+  ?line ITRes331 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S331),
+  ITResList332 = [ITRes331|ITResList331],
+
+
+  ?line {STRes332,S332} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList333 = [STRes332|STResList332],
+  ?line ITRes332 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S332),
+  ITResList333 = [ITRes332|ITResList332],
+
+
+  ?line {STRes333,S333} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList334 = [STRes333|STResList333],
+  ?line ITRes333 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S333),
+  ITResList334 = [ITRes333|ITResList333],
+
+
+  ?line {STRes334,S334} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList335 = [STRes334|STResList334],
+  ?line ITRes334 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_base64Binary_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S334),
+  ITResList335 = [ITRes334|ITResList334],
+
+
+  ?line {STRes335,S335} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList336 = [STRes335|STResList335],
+  ?line ITRes335 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S335),
+  ITResList336 = [ITRes335|ITResList335],
+
+
+  ?line {STRes336,S336} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList337 = [STRes336|STResList336],
+  ?line ITRes336 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S336),
+  ITResList337 = [ITRes336|ITResList336],
+
+
+  ?line {STRes337,S337} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList338 = [STRes337|STResList337],
+  ?line ITRes337 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S337),
+  ITResList338 = [ITRes337|ITResList337],
+
+
+  ?line {STRes338,S338} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList339 = [STRes338|STResList338],
+  ?line ITRes338 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S338),
+  ITResList339 = [ITRes338|ITResList338],
+
+
+  ?line {STRes339,S339} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList340 = [STRes339|STResList339],
+  ?line ITRes339 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S339),
+  ITResList340 = [ITRes339|ITResList339],
+
+
+  ?line {STRes340,S340} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList341 = [STRes340|STResList340],
+  ?line ITRes340 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S340),
+  ITResList341 = [ITRes340|ITResList340],
+
+
+  ?line {STRes341,S341} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList342 = [STRes341|STResList341],
+  ?line ITRes341 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S341),
+  ITResList342 = [ITRes341|ITResList341],
+
+
+  ?line {STRes342,S342} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList343 = [STRes342|STResList342],
+  ?line ITRes342 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S342),
+  ITResList343 = [ITRes342|ITResList342],
+
+
+  ?line {STRes343,S343} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList344 = [STRes343|STResList343],
+  ?line ITRes343 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S343),
+  ITResList344 = [ITRes343|ITResList343],
+
+
+  ?line {STRes344,S344} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList345 = [STRes344|STResList344],
+  ?line ITRes344 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S344),
+  ITResList345 = [ITRes344|ITResList344],
+
+
+  ?line {STRes345,S345} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList346 = [STRes345|STResList345],
+  ?line ITRes345 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S345),
+  ITResList346 = [ITRes345|ITResList345],
+
+
+  ?line {STRes346,S346} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList347 = [STRes346|STResList346],
+  ?line ITRes346 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S346),
+  ITResList347 = [ITRes346|ITResList346],
+
+
+  ?line {STRes347,S347} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList348 = [STRes347|STResList347],
+  ?line ITRes347 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S347),
+  ITResList348 = [ITRes347|ITResList347],
+
+
+  ?line {STRes348,S348} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList349 = [STRes348|STResList348],
+  ?line ITRes348 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S348),
+  ITResList349 = [ITRes348|ITResList348],
+
+
+  ?line {STRes349,S349} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList350 = [STRes349|STResList349],
+  ?line ITRes349 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S349),
+  ITResList350 = [ITRes349|ITResList349],
+
+
+  ?line {STRes350,S350} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList351 = [STRes350|STResList350],
+  ?line ITRes350 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S350),
+  ITResList351 = [ITRes350|ITResList350],
+
+
+  ?line {STRes351,S351} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList352 = [STRes351|STResList351],
+  ?line ITRes351 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S351),
+  ITResList352 = [ITRes351|ITResList351],
+
+
+  ?line {STRes352,S352} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList353 = [STRes352|STResList352],
+  ?line ITRes352 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S352),
+  ITResList353 = [ITRes352|ITResList352],
+
+
+  ?line {STRes353,S353} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList354 = [STRes353|STResList353],
+  ?line ITRes353 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S353),
+  ITResList354 = [ITRes353|ITResList353],
+
+
+  ?line {STRes354,S354} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList355 = [STRes354|STResList354],
+  ?line ITRes354 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S354),
+  ITResList355 = [ITRes354|ITResList354],
+
+
+  ?line {STRes355,S355} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList356 = [STRes355|STResList355],
+  ?line ITRes355 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S355),
+  ITResList356 = [ITRes355|ITResList355],
+
+
+  ?line {STRes356,S356} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList357 = [STRes356|STResList356],
+  ?line ITRes356 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_hexBinary_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S356),
+  ITResList357 = [ITRes356|ITResList356],
+
+
+  ?line {STRes357,S357} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList358 = [STRes357|STResList357],
+  ?line ITRes357 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S357),
+  ITResList358 = [ITRes357|ITResList357],
+
+
+  ?line {STRes358,S358} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList359 = [STRes358|STResList358],
+  ?line ITRes358 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S358),
+  ITResList359 = [ITRes358|ITResList358],
+
+
+  ?line {STRes359,S359} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList360 = [STRes359|STResList359],
+  ?line ITRes359 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S359),
+  ITResList360 = [ITRes359|ITResList359],
+
+
+  ?line {STRes360,S360} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList361 = [STRes360|STResList360],
+  ?line ITRes360 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S360),
+  ITResList361 = [ITRes360|ITResList360],
+
+
+  ?line {STRes361,S361} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList362 = [STRes361|STResList361],
+  ?line ITRes361 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S361),
+  ITResList362 = [ITRes361|ITResList361],
+
+
+  ?line {STRes362,S362} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList363 = [STRes362|STResList362],
+  ?line ITRes362 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S362),
+  ITResList363 = [ITRes362|ITResList362],
+
+
+  ?line {STRes363,S363} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList364 = [STRes363|STResList363],
+  ?line ITRes363 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S363),
+  ITResList364 = [ITRes363|ITResList363],
+
+
+  ?line {STRes364,S364} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList365 = [STRes364|STResList364],
+  ?line ITRes364 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S364),
+  ITResList365 = [ITRes364|ITResList364],
+
+
+  ?line {STRes365,S365} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList366 = [STRes365|STResList365],
+  ?line ITRes365 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_float.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S365),
+  ITResList366 = [ITRes365|ITResList365],
+
+
+  ?line {STRes366,S366} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList367 = [STRes366|STResList366],
+  ?line ITRes366 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S366),
+  ITResList367 = [ITRes366|ITResList366],
+
+
+  ?line {STRes367,S367} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList368 = [STRes367|STResList367],
+  ?line ITRes367 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S367),
+  ITResList368 = [ITRes367|ITResList367],
+
+
+  ?line {STRes368,S368} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList369 = [STRes368|STResList368],
+  ?line ITRes368 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S368),
+  ITResList369 = [ITRes368|ITResList368],
+
+
+  ?line {STRes369,S369} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList370 = [STRes369|STResList369],
+  ?line ITRes369 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S369),
+  ITResList370 = [ITRes369|ITResList369],
+
+
+  ?line {STRes370,S370} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList371 = [STRes370|STResList370],
+  ?line ITRes370 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S370),
+  ITResList371 = [ITRes370|ITResList370],
+
+
+  ?line {STRes371,S371} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList372 = [STRes371|STResList371],
+  ?line ITRes371 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S371),
+  ITResList372 = [ITRes371|ITResList371],
+
+
+  ?line {STRes372,S372} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList373 = [STRes372|STResList372],
+  ?line ITRes372 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S372),
+  ITResList373 = [ITRes372|ITResList372],
+
+
+  ?line {STRes373,S373} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList374 = [STRes373|STResList373],
+  ?line ITRes373 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S373),
+  ITResList374 = [ITRes373|ITResList373],
+
+
+  ?line {STRes374,S374} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList375 = [STRes374|STResList374],
+  ?line ITRes374 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S374),
+  ITResList375 = [ITRes374|ITResList374],
+
+
+  ?line {STRes375,S375} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList376 = [STRes375|STResList375],
+  ?line ITRes375 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S375),
+  ITResList376 = [ITRes375|ITResList375],
+
+
+  ?line {STRes376,S376} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList377 = [STRes376|STResList376],
+  ?line ITRes376 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S376),
+  ITResList377 = [ITRes376|ITResList376],
+
+
+  ?line {STRes377,S377} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList378 = [STRes377|STResList377],
+  ?line ITRes377 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S377),
+  ITResList378 = [ITRes377|ITResList377],
+
+
+  ?line {STRes378,S378} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList379 = [STRes378|STResList378],
+  ?line ITRes378 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S378),
+  ITResList379 = [ITRes378|ITResList378],
+
+
+  ?line {STRes379,S379} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList380 = [STRes379|STResList379],
+  ?line ITRes379 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S379),
+  ITResList380 = [ITRes379|ITResList379],
+
+
+  ?line {STRes380,S380} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList381 = [STRes380|STResList380],
+  ?line ITRes380 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S380),
+  ITResList381 = [ITRes380|ITResList380],
+
+
+  ?line {STRes381,S381} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList382 = [STRes381|STResList381],
+  ?line ITRes381 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_float_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S381),
+  ITResList382 = [ITRes381|ITResList381],
+
+
+  ?line {STRes382,S382} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList383 = [STRes382|STResList382],
+  ?line ITRes382 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S382),
+  ITResList383 = [ITRes382|ITResList382],
+
+
+  ?line {STRes383,S383} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList384 = [STRes383|STResList383],
+  ?line ITRes383 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S383),
+  ITResList384 = [ITRes383|ITResList383],
+
+
+  ?line {STRes384,S384} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList385 = [STRes384|STResList384],
+  ?line ITRes384 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S384),
+  ITResList385 = [ITRes384|ITResList384],
+
+
+  ?line {STRes385,S385} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList386 = [STRes385|STResList385],
+  ?line ITRes385 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S385),
+  ITResList386 = [ITRes385|ITResList385],
+
+
+  ?line {STRes386,S386} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList387 = [STRes386|STResList386],
+  ?line ITRes386 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S386),
+  ITResList387 = [ITRes386|ITResList386],
+
+
+  ?line {STRes387,S387} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList388 = [STRes387|STResList387],
+  ?line ITRes387 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S387),
+  ITResList388 = [ITRes387|ITResList387],
+
+
+  ?line {STRes388,S388} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList389 = [STRes388|STResList388],
+  ?line ITRes388 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S388),
+  ITResList389 = [ITRes388|ITResList388],
+
+
+  ?line {STRes389,S389} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList390 = [STRes389|STResList389],
+  ?line ITRes389 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S389),
+  ITResList390 = [ITRes389|ITResList389],
+
+
+  ?line {STRes390,S390} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList391 = [STRes390|STResList390],
+  ?line ITRes390 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S390),
+  ITResList391 = [ITRes390|ITResList390],
+
+
+  ?line {STRes391,S391} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList392 = [STRes391|STResList391],
+  ?line ITRes391 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S391),
+  ITResList392 = [ITRes391|ITResList391],
+
+
+  ?line {STRes392,S392} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList393 = [STRes392|STResList392],
+  ?line ITRes392 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S392),
+  ITResList393 = [ITRes392|ITResList392],
+
+
+  ?line {STRes393,S393} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList394 = [STRes393|STResList393],
+  ?line ITRes393 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S393),
+  ITResList394 = [ITRes393|ITResList393],
+
+
+  ?line {STRes394,S394} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList395 = [STRes394|STResList394],
+  ?line ITRes394 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S394),
+  ITResList395 = [ITRes394|ITResList394],
+
+
+  ?line {STRes395,S395} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList396 = [STRes395|STResList395],
+  ?line ITRes395 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_long.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S395),
+  ITResList396 = [ITRes395|ITResList395],
+
+
+  ?line {STRes396,S396} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList397 = [STRes396|STResList396],
+  ?line ITRes396 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_int.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S396),
+  ITResList397 = [ITRes396|ITResList396],
+
+
+  ?line {STRes397,S397} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList398 = [STRes397|STResList397],
+  ?line ITRes397 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_short.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S397),
+  ITResList398 = [ITRes397|ITResList397],
+
+
+  ?line {STRes398,S398} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList399 = [STRes398|STResList398],
+  ?line ITRes398 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S398),
+  ITResList399 = [ITRes398|ITResList398],
+
+
+  ?line {STRes399,S399} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList400 = [STRes399|STResList399],
+  ?line ITRes399 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S399),
+  ITResList400 = [ITRes399|ITResList399],
+
+
+  ?line {STRes400,S400} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList401 = [STRes400|STResList400],
+  ?line ITRes400 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S400),
+  ITResList401 = [ITRes400|ITResList400],
+
+
+  ?line {STRes401,S401} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList402 = [STRes401|STResList401],
+  ?line ITRes401 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S401),
+  ITResList402 = [ITRes401|ITResList401],
+
+
+  ?line {STRes402,S402} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList403 = [STRes402|STResList402],
+  ?line ITRes402 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S402),
+  ITResList403 = [ITRes402|ITResList402],
+
+
+  ?line {STRes403,S403} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList404 = [STRes403|STResList403],
+  ?line ITRes403 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S403),
+  ITResList404 = [ITRes403|ITResList403],
+
+
+  ?line {STRes404,S404} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList405 = [STRes404|STResList404],
+  ?line ITRes404 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S404),
+  ITResList405 = [ITRes404|ITResList404],
+
+
+  ?line {STRes405,S405} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList406 = [STRes405|STResList405],
+  ?line ITRes405 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S405),
+  ITResList406 = [ITRes405|ITResList405],
+
+
+  ?line {STRes406,S406} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList407 = [STRes406|STResList406],
+  ?line ITRes406 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_decimal_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S406),
+  ITResList407 = [ITRes406|ITResList406],
+
+
+  ?line {STRes407,S407} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList408 = [STRes407|STResList407],
+  ?line ITRes407 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S407),
+  ITResList408 = [ITRes407|ITResList407],
+
+
+  ?line {STRes408,S408} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList409 = [STRes408|STResList408],
+  ?line ITRes408 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S408),
+  ITResList409 = [ITRes408|ITResList408],
+
+
+  ?line {STRes409,S409} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList410 = [STRes409|STResList409],
+  ?line ITRes409 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S409),
+  ITResList410 = [ITRes409|ITResList409],
+
+
+  ?line {STRes410,S410} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList411 = [STRes410|STResList410],
+  ?line ITRes410 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S410),
+  ITResList411 = [ITRes410|ITResList410],
+
+
+  ?line {STRes411,S411} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList412 = [STRes411|STResList411],
+  ?line ITRes411 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S411),
+  ITResList412 = [ITRes411|ITResList411],
+
+
+  ?line {STRes412,S412} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList413 = [STRes412|STResList412],
+  ?line ITRes412 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S412),
+  ITResList413 = [ITRes412|ITResList412],
+
+
+  ?line {STRes413,S413} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList414 = [STRes413|STResList413],
+  ?line ITRes413 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S413),
+  ITResList414 = [ITRes413|ITResList413],
+
+
+  ?line {STRes414,S414} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList415 = [STRes414|STResList414],
+  ?line ITRes414 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S414),
+  ITResList415 = [ITRes414|ITResList414],
+
+
+  ?line {STRes415,S415} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList416 = [STRes415|STResList415],
+  ?line ITRes415 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S415),
+  ITResList416 = [ITRes415|ITResList415],
+
+
+  ?line {STRes416,S416} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList417 = [STRes416|STResList416],
+  ?line ITRes416 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S416),
+  ITResList417 = [ITRes416|ITResList416],
+
+
+  ?line {STRes417,S417} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList418 = [STRes417|STResList417],
+  ?line ITRes417 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S417),
+  ITResList418 = [ITRes417|ITResList417],
+
+
+  ?line {STRes418,S418} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList419 = [STRes418|STResList418],
+  ?line ITRes418 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S418),
+  ITResList419 = [ITRes418|ITResList418],
+
+
+  ?line {STRes419,S419} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList420 = [STRes419|STResList419],
+  ?line ITRes419 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S419),
+  ITResList420 = [ITRes419|ITResList419],
+
+
+  ?line {STRes420,S420} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList421 = [STRes420|STResList420],
+  ?line ITRes420 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_long.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S420),
+  ITResList421 = [ITRes420|ITResList420],
+
+
+  ?line {STRes421,S421} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList422 = [STRes421|STResList421],
+  ?line ITRes421 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_int.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S421),
+  ITResList422 = [ITRes421|ITResList421],
+
+
+  ?line {STRes422,S422} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList423 = [STRes422|STResList422],
+  ?line ITRes422 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_short.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S422),
+  ITResList423 = [ITRes422|ITResList422],
+
+
+  ?line {STRes423,S423} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList424 = [STRes423|STResList423],
+  ?line ITRes423 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S423),
+  ITResList424 = [ITRes423|ITResList423],
+
+
+  ?line {STRes424,S424} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList425 = [STRes424|STResList424],
+  ?line ITRes424 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S424),
+  ITResList425 = [ITRes424|ITResList424],
+
+
+  ?line {STRes425,S425} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList426 = [STRes425|STResList425],
+  ?line ITRes425 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S425),
+  ITResList426 = [ITRes425|ITResList425],
+
+
+  ?line {STRes426,S426} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList427 = [STRes426|STResList426],
+  ?line ITRes426 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S426),
+  ITResList427 = [ITRes426|ITResList426],
+
+
+  ?line {STRes427,S427} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList428 = [STRes427|STResList427],
+  ?line ITRes427 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S427),
+  ITResList428 = [ITRes427|ITResList427],
+
+
+  ?line {STRes428,S428} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList429 = [STRes428|STResList428],
+  ?line ITRes428 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S428),
+  ITResList429 = [ITRes428|ITResList428],
+
+
+  ?line {STRes429,S429} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList430 = [STRes429|STResList429],
+  ?line ITRes429 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S429),
+  ITResList430 = [ITRes429|ITResList429],
+
+
+  ?line {STRes430,S430} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList431 = [STRes430|STResList430],
+  ?line ITRes430 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S430),
+  ITResList431 = [ITRes430|ITResList430],
+
+
+  ?line {STRes431,S431} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList432 = [STRes431|STResList431],
+  ?line ITRes431 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_integer_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S431),
+  ITResList432 = [ITRes431|ITResList431],
+
+
+  ?line {STRes432,S432} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList433 = [STRes432|STResList432],
+  ?line ITRes432 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S432),
+  ITResList433 = [ITRes432|ITResList432],
+
+
+  ?line {STRes433,S433} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList434 = [STRes433|STResList433],
+  ?line ITRes433 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S433),
+  ITResList434 = [ITRes433|ITResList433],
+
+
+  ?line {STRes434,S434} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList435 = [STRes434|STResList434],
+  ?line ITRes434 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S434),
+  ITResList435 = [ITRes434|ITResList434],
+
+
+  ?line {STRes435,S435} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList436 = [STRes435|STResList435],
+  ?line ITRes435 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S435),
+  ITResList436 = [ITRes435|ITResList435],
+
+
+  ?line {STRes436,S436} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList437 = [STRes436|STResList436],
+  ?line ITRes436 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S436),
+  ITResList437 = [ITRes436|ITResList436],
+
+
+  ?line {STRes437,S437} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList438 = [STRes437|STResList437],
+  ?line ITRes437 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S437),
+  ITResList438 = [ITRes437|ITResList437],
+
+
+  ?line {STRes438,S438} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList439 = [STRes438|STResList438],
+  ?line ITRes438 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S438),
+  ITResList439 = [ITRes438|ITResList438],
+
+
+  ?line {STRes439,S439} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList440 = [STRes439|STResList439],
+  ?line ITRes439 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S439),
+  ITResList440 = [ITRes439|ITResList439],
+
+
+  ?line {STRes440,S440} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList441 = [STRes440|STResList440],
+  ?line ITRes440 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S440),
+  ITResList441 = [ITRes440|ITResList440],
+
+
+  ?line {STRes441,S441} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList442 = [STRes441|STResList441],
+  ?line ITRes441 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S441),
+  ITResList442 = [ITRes441|ITResList441],
+
+
+  ?line {STRes442,S442} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList443 = [STRes442|STResList442],
+  ?line ITRes442 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S442),
+  ITResList443 = [ITRes442|ITResList442],
+
+
+  ?line {STRes443,S443} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList444 = [STRes443|STResList443],
+  ?line ITRes443 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S443),
+  ITResList444 = [ITRes443|ITResList443],
+
+
+  ?line {STRes444,S444} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList445 = [STRes444|STResList444],
+  ?line ITRes444 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S444),
+  ITResList445 = [ITRes444|ITResList444],
+
+
+  ?line {STRes445,S445} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList446 = [STRes445|STResList445],
+  ?line ITRes445 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S445),
+  ITResList446 = [ITRes445|ITResList445],
+
+
+  ?line {STRes446,S446} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList447 = [STRes446|STResList446],
+  ?line ITRes446 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S446),
+  ITResList447 = [ITRes446|ITResList446],
+
+
+  ?line {STRes447,S447} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList448 = [STRes447|STResList447],
+  ?line ITRes447 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S447),
+  ITResList448 = [ITRes447|ITResList447],
+
+
+  ?line {STRes448,S448} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList449 = [STRes448|STResList448],
+  ?line ITRes448 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonPositiveInteger_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S448),
+  ITResList449 = [ITRes448|ITResList448],
+
+
+  ?line {STRes449,S449} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList450 = [STRes449|STResList449],
+  ?line ITRes449 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S449),
+  ITResList450 = [ITRes449|ITResList449],
+
+
+  ?line {STRes450,S450} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList451 = [STRes450|STResList450],
+  ?line ITRes450 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S450),
+  ITResList451 = [ITRes450|ITResList450],
+
+
+  ?line {STRes451,S451} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList452 = [STRes451|STResList451],
+  ?line ITRes451 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S451),
+  ITResList452 = [ITRes451|ITResList451],
+
+
+  ?line {STRes452,S452} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList453 = [STRes452|STResList452],
+  ?line ITRes452 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S452),
+  ITResList453 = [ITRes452|ITResList452],
+
+
+  ?line {STRes453,S453} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList454 = [STRes453|STResList453],
+  ?line ITRes453 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S453),
+  ITResList454 = [ITRes453|ITResList453],
+
+
+  ?line {STRes454,S454} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList455 = [STRes454|STResList454],
+  ?line ITRes454 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S454),
+  ITResList455 = [ITRes454|ITResList454],
+
+
+  ?line {STRes455,S455} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList456 = [STRes455|STResList455],
+  ?line ITRes455 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S455),
+  ITResList456 = [ITRes455|ITResList455],
+
+
+  ?line {STRes456,S456} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList457 = [STRes456|STResList456],
+  ?line ITRes456 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S456),
+  ITResList457 = [ITRes456|ITResList456],
+
+
+  ?line {STRes457,S457} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList458 = [STRes457|STResList457],
+  ?line ITRes457 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S457),
+  ITResList458 = [ITRes457|ITResList457],
+
+
+  ?line {STRes458,S458} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList459 = [STRes458|STResList458],
+  ?line ITRes458 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S458),
+  ITResList459 = [ITRes458|ITResList458],
+
+
+  ?line {STRes459,S459} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList460 = [STRes459|STResList459],
+  ?line ITRes459 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S459),
+  ITResList460 = [ITRes459|ITResList459],
+
+
+  ?line {STRes460,S460} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList461 = [STRes460|STResList460],
+  ?line ITRes460 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S460),
+  ITResList461 = [ITRes460|ITResList460],
+
+
+  ?line {STRes461,S461} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList462 = [STRes461|STResList461],
+  ?line ITRes461 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S461),
+  ITResList462 = [ITRes461|ITResList461],
+
+
+  ?line {STRes462,S462} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList463 = [STRes462|STResList462],
+  ?line ITRes462 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S462),
+  ITResList463 = [ITRes462|ITResList462],
+
+
+  ?line {STRes463,S463} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList464 = [STRes463|STResList463],
+  ?line ITRes463 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S463),
+  ITResList464 = [ITRes463|ITResList463],
+
+
+  ?line {STRes464,S464} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList465 = [STRes464|STResList464],
+  ?line ITRes464 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_negativeInteger_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S464),
+  ITResList465 = [ITRes464|ITResList464],
+
+
+  ?line {STRes465,S465} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList466 = [STRes465|STResList465],
+  ?line ITRes465 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S465),
+  ITResList466 = [ITRes465|ITResList465],
+
+
+  ?line {STRes466,S466} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList467 = [STRes466|STResList466],
+  ?line ITRes466 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S466),
+  ITResList467 = [ITRes466|ITResList466],
+
+
+  ?line {STRes467,S467} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList468 = [STRes467|STResList467],
+  ?line ITRes467 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S467),
+  ITResList468 = [ITRes467|ITResList467],
+
+
+  ?line {STRes468,S468} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList469 = [STRes468|STResList468],
+  ?line ITRes468 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S468),
+  ITResList469 = [ITRes468|ITResList468],
+
+
+  ?line {STRes469,S469} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList470 = [STRes469|STResList469],
+  ?line ITRes469 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S469),
+  ITResList470 = [ITRes469|ITResList469],
+
+
+  ?line {STRes470,S470} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList471 = [STRes470|STResList470],
+  ?line ITRes470 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S470),
+  ITResList471 = [ITRes470|ITResList470],
+
+
+  ?line {STRes471,S471} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList472 = [STRes471|STResList471],
+  ?line ITRes471 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S471),
+  ITResList472 = [ITRes471|ITResList471],
+
+
+  ?line {STRes472,S472} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList473 = [STRes472|STResList472],
+  ?line ITRes472 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S472),
+  ITResList473 = [ITRes472|ITResList472],
+
+
+  ?line {STRes473,S473} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList474 = [STRes473|STResList473],
+  ?line ITRes473 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S473),
+  ITResList474 = [ITRes473|ITResList473],
+
+
+  ?line {STRes474,S474} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList475 = [STRes474|STResList474],
+  ?line ITRes474 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S474),
+  ITResList475 = [ITRes474|ITResList474],
+
+
+  ?line {STRes475,S475} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList476 = [STRes475|STResList475],
+  ?line ITRes475 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S475),
+  ITResList476 = [ITRes475|ITResList475],
+
+
+  ?line {STRes476,S476} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList477 = [STRes476|STResList476],
+  ?line ITRes476 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S476),
+  ITResList477 = [ITRes476|ITResList476],
+
+
+  ?line {STRes477,S477} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList478 = [STRes477|STResList477],
+  ?line ITRes477 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S477),
+  ITResList478 = [ITRes477|ITResList477],
+
+
+  ?line {STRes478,S478} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList479 = [STRes478|STResList478],
+  ?line ITRes478 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_long.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S478),
+  ITResList479 = [ITRes478|ITResList478],
+
+
+  ?line {STRes479,S479} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList480 = [STRes479|STResList479],
+  ?line ITRes479 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_int.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S479),
+  ITResList480 = [ITRes479|ITResList479],
+
+
+  ?line {STRes480,S480} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList481 = [STRes480|STResList480],
+  ?line ITRes480 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_short.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S480),
+  ITResList481 = [ITRes480|ITResList480],
+
+
+  ?line {STRes481,S481} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList482 = [STRes481|STResList481],
+  ?line ITRes481 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S481),
+  ITResList482 = [ITRes481|ITResList481],
+
+
+  ?line {STRes482,S482} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList483 = [STRes482|STResList482],
+  ?line ITRes482 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S482),
+  ITResList483 = [ITRes482|ITResList482],
+
+
+  ?line {STRes483,S483} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList484 = [STRes483|STResList483],
+  ?line ITRes483 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S483),
+  ITResList484 = [ITRes483|ITResList483],
+
+
+  ?line {STRes484,S484} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList485 = [STRes484|STResList484],
+  ?line ITRes484 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S484),
+  ITResList485 = [ITRes484|ITResList484],
+
+
+  ?line {STRes485,S485} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList486 = [STRes485|STResList485],
+  ?line ITRes485 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S485),
+  ITResList486 = [ITRes485|ITResList485],
+
+
+  ?line {STRes486,S486} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList487 = [STRes486|STResList486],
+  ?line ITRes486 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S486),
+  ITResList487 = [ITRes486|ITResList486],
+
+
+  ?line {STRes487,S487} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList488 = [STRes487|STResList487],
+  ?line ITRes487 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S487),
+  ITResList488 = [ITRes487|ITResList487],
+
+
+  ?line {STRes488,S488} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList489 = [STRes488|STResList488],
+  ?line ITRes488 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S488),
+  ITResList489 = [ITRes488|ITResList488],
+
+
+  ?line {STRes489,S489} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList490 = [STRes489|STResList489],
+  ?line ITRes489 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_long_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S489),
+  ITResList490 = [ITRes489|ITResList489],
+
+
+  ?line {STRes490,S490} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList491 = [STRes490|STResList490],
+  ?line ITRes490 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S490),
+  ITResList491 = [ITRes490|ITResList490],
+
+
+  ?line {STRes491,S491} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList492 = [STRes491|STResList491],
+  ?line ITRes491 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S491),
+  ITResList492 = [ITRes491|ITResList491],
+
+
+  ?line {STRes492,S492} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList493 = [STRes492|STResList492],
+  ?line ITRes492 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S492),
+  ITResList493 = [ITRes492|ITResList492],
+
+
+  ?line {STRes493,S493} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList494 = [STRes493|STResList493],
+  ?line ITRes493 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S493),
+  ITResList494 = [ITRes493|ITResList493],
+
+
+  ?line {STRes494,S494} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList495 = [STRes494|STResList494],
+  ?line ITRes494 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S494),
+  ITResList495 = [ITRes494|ITResList494],
+
+
+  ?line {STRes495,S495} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList496 = [STRes495|STResList495],
+  ?line ITRes495 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S495),
+  ITResList496 = [ITRes495|ITResList495],
+
+
+  ?line {STRes496,S496} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList497 = [STRes496|STResList496],
+  ?line ITRes496 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S496),
+  ITResList497 = [ITRes496|ITResList496],
+
+
+  ?line {STRes497,S497} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList498 = [STRes497|STResList497],
+  ?line ITRes497 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S497),
+  ITResList498 = [ITRes497|ITResList497],
+
+
+  ?line {STRes498,S498} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList499 = [STRes498|STResList498],
+  ?line ITRes498 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S498),
+  ITResList499 = [ITRes498|ITResList498],
+
+
+  ?line {STRes499,S499} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList500 = [STRes499|STResList499],
+  ?line ITRes499 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S499),
+  ITResList500 = [ITRes499|ITResList499],
+
+
+  ?line {STRes500,S500} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList501 = [STRes500|STResList500],
+  ?line ITRes500 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S500),
+  ITResList501 = [ITRes500|ITResList500],
+
+
+  ?line {STRes501,S501} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList502 = [STRes501|STResList501],
+  ?line ITRes501 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S501),
+  ITResList502 = [ITRes501|ITResList501],
+
+
+  ?line {STRes502,S502} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList503 = [STRes502|STResList502],
+  ?line ITRes502 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S502),
+  ITResList503 = [ITRes502|ITResList502],
+
+
+  ?line {STRes503,S503} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList504 = [STRes503|STResList503],
+  ?line ITRes503 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_long.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S503),
+  ITResList504 = [ITRes503|ITResList503],
+
+
+  ?line {STRes504,S504} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList505 = [STRes504|STResList504],
+  ?line ITRes504 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_int.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S504),
+  ITResList505 = [ITRes504|ITResList504],
+
+
+  ?line {STRes505,S505} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList506 = [STRes505|STResList505],
+  ?line ITRes505 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_short.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S505),
+  ITResList506 = [ITRes505|ITResList505],
+
+
+  ?line {STRes506,S506} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList507 = [STRes506|STResList506],
+  ?line ITRes506 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S506),
+  ITResList507 = [ITRes506|ITResList506],
+
+
+  ?line {STRes507,S507} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList508 = [STRes507|STResList507],
+  ?line ITRes507 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S507),
+  ITResList508 = [ITRes507|ITResList507],
+
+
+  ?line {STRes508,S508} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList509 = [STRes508|STResList508],
+  ?line ITRes508 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S508),
+  ITResList509 = [ITRes508|ITResList508],
+
+
+  ?line {STRes509,S509} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList510 = [STRes509|STResList509],
+  ?line ITRes509 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S509),
+  ITResList510 = [ITRes509|ITResList509],
+
+
+  ?line {STRes510,S510} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList511 = [STRes510|STResList510],
+  ?line ITRes510 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S510),
+  ITResList511 = [ITRes510|ITResList510],
+
+
+  ?line {STRes511,S511} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList512 = [STRes511|STResList511],
+  ?line ITRes511 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S511),
+  ITResList512 = [ITRes511|ITResList511],
+
+
+  ?line {STRes512,S512} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList513 = [STRes512|STResList512],
+  ?line ITRes512 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S512),
+  ITResList513 = [ITRes512|ITResList512],
+
+
+  ?line {STRes513,S513} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList514 = [STRes513|STResList513],
+  ?line ITRes513 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S513),
+  ITResList514 = [ITRes513|ITResList513],
+
+
+  ?line {STRes514,S514} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList515 = [STRes514|STResList514],
+  ?line ITRes514 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_int_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S514),
+  ITResList515 = [ITRes514|ITResList514],
+
+
+  ?line {STRes515,S515} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList516 = [STRes515|STResList515],
+  ?line ITRes515 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S515),
+  ITResList516 = [ITRes515|ITResList515],
+
+
+  ?line {STRes516,S516} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList517 = [STRes516|STResList516],
+  ?line ITRes516 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S516),
+  ITResList517 = [ITRes516|ITResList516],
+
+
+  ?line {STRes517,S517} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList518 = [STRes517|STResList517],
+  ?line ITRes517 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S517),
+  ITResList518 = [ITRes517|ITResList517],
+
+
+  ?line {STRes518,S518} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList519 = [STRes518|STResList518],
+  ?line ITRes518 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S518),
+  ITResList519 = [ITRes518|ITResList518],
+
+
+  ?line {STRes519,S519} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList520 = [STRes519|STResList519],
+  ?line ITRes519 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S519),
+  ITResList520 = [ITRes519|ITResList519],
+
+
+  ?line {STRes520,S520} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList521 = [STRes520|STResList520],
+  ?line ITRes520 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S520),
+  ITResList521 = [ITRes520|ITResList520],
+
+
+  ?line {STRes521,S521} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList522 = [STRes521|STResList521],
+  ?line ITRes521 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S521),
+  ITResList522 = [ITRes521|ITResList521],
+
+
+  ?line {STRes522,S522} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList523 = [STRes522|STResList522],
+  ?line ITRes522 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S522),
+  ITResList523 = [ITRes522|ITResList522],
+
+
+  ?line {STRes523,S523} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList524 = [STRes523|STResList523],
+  ?line ITRes523 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S523),
+  ITResList524 = [ITRes523|ITResList523],
+
+
+  ?line {STRes524,S524} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList525 = [STRes524|STResList524],
+  ?line ITRes524 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S524),
+  ITResList525 = [ITRes524|ITResList524],
+
+
+  ?line {STRes525,S525} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList526 = [STRes525|STResList525],
+  ?line ITRes525 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S525),
+  ITResList526 = [ITRes525|ITResList525],
+
+
+  ?line {STRes526,S526} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList527 = [STRes526|STResList526],
+  ?line ITRes526 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S526),
+  ITResList527 = [ITRes526|ITResList526],
+
+
+  ?line {STRes527,S527} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList528 = [STRes527|STResList527],
+  ?line ITRes527 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S527),
+  ITResList528 = [ITRes527|ITResList527],
+
+
+  ?line {STRes528,S528} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList529 = [STRes528|STResList528],
+  ?line ITRes528 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_long.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S528),
+  ITResList529 = [ITRes528|ITResList528],
+
+
+  ?line {STRes529,S529} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList530 = [STRes529|STResList529],
+  ?line ITRes529 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_int.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S529),
+  ITResList530 = [ITRes529|ITResList529],
+
+
+  ?line {STRes530,S530} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList531 = [STRes530|STResList530],
+  ?line ITRes530 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_short.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S530),
+  ITResList531 = [ITRes530|ITResList530],
+
+
+  ?line {STRes531,S531} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList532 = [STRes531|STResList531],
+  ?line ITRes531 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S531),
+  ITResList532 = [ITRes531|ITResList531],
+
+
+  ?line {STRes532,S532} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList533 = [STRes532|STResList532],
+  ?line ITRes532 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S532),
+  ITResList533 = [ITRes532|ITResList532],
+
+
+  ?line {STRes533,S533} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList534 = [STRes533|STResList533],
+  ?line ITRes533 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S533),
+  ITResList534 = [ITRes533|ITResList533],
+
+
+  ?line {STRes534,S534} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList535 = [STRes534|STResList534],
+  ?line ITRes534 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S534),
+  ITResList535 = [ITRes534|ITResList534],
+
+
+  ?line {STRes535,S535} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList536 = [STRes535|STResList535],
+  ?line ITRes535 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S535),
+  ITResList536 = [ITRes535|ITResList535],
+
+
+  ?line {STRes536,S536} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList537 = [STRes536|STResList536],
+  ?line ITRes536 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S536),
+  ITResList537 = [ITRes536|ITResList536],
+
+
+  ?line {STRes537,S537} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList538 = [STRes537|STResList537],
+  ?line ITRes537 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S537),
+  ITResList538 = [ITRes537|ITResList537],
+
+
+  ?line {STRes538,S538} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList539 = [STRes538|STResList538],
+  ?line ITRes538 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S538),
+  ITResList539 = [ITRes538|ITResList538],
+
+
+  ?line {STRes539,S539} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList540 = [STRes539|STResList539],
+  ?line ITRes539 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_short_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S539),
+  ITResList540 = [ITRes539|ITResList539],
+
+
+  ?line {STRes540,S540} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList541 = [STRes540|STResList540],
+  ?line ITRes540 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S540),
+  ITResList541 = [ITRes540|ITResList540],
+
+
+  ?line {STRes541,S541} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList542 = [STRes541|STResList541],
+  ?line ITRes541 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S541),
+  ITResList542 = [ITRes541|ITResList541],
+
+
+  ?line {STRes542,S542} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList543 = [STRes542|STResList542],
+  ?line ITRes542 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S542),
+  ITResList543 = [ITRes542|ITResList542],
+
+
+  ?line {STRes543,S543} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList544 = [STRes543|STResList543],
+  ?line ITRes543 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S543),
+  ITResList544 = [ITRes543|ITResList543],
+
+
+  ?line {STRes544,S544} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList545 = [STRes544|STResList544],
+  ?line ITRes544 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S544),
+  ITResList545 = [ITRes544|ITResList544],
+
+
+  ?line {STRes545,S545} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList546 = [STRes545|STResList545],
+  ?line ITRes545 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S545),
+  ITResList546 = [ITRes545|ITResList545],
+
+
+  ?line {STRes546,S546} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList547 = [STRes546|STResList546],
+  ?line ITRes546 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S546),
+  ITResList547 = [ITRes546|ITResList546],
+
+
+  ?line {STRes547,S547} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList548 = [STRes547|STResList547],
+  ?line ITRes547 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S547),
+  ITResList548 = [ITRes547|ITResList547],
+
+
+  ?line {STRes548,S548} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList549 = [STRes548|STResList548],
+  ?line ITRes548 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S548),
+  ITResList549 = [ITRes548|ITResList548],
+
+
+  ?line {STRes549,S549} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList550 = [STRes549|STResList549],
+  ?line ITRes549 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S549),
+  ITResList550 = [ITRes549|ITResList549],
+
+
+  ?line {STRes550,S550} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList551 = [STRes550|STResList550],
+  ?line ITRes550 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S550),
+  ITResList551 = [ITRes550|ITResList550],
+
+
+  ?line {STRes551,S551} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList552 = [STRes551|STResList551],
+  ?line ITRes551 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S551),
+  ITResList552 = [ITRes551|ITResList551],
+
+
+  ?line {STRes552,S552} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList553 = [STRes552|STResList552],
+  ?line ITRes552 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S552),
+  ITResList553 = [ITRes552|ITResList552],
+
+
+  ?line {STRes553,S553} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList554 = [STRes553|STResList553],
+  ?line ITRes553 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_long.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S553),
+  ITResList554 = [ITRes553|ITResList553],
+
+
+  ?line {STRes554,S554} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList555 = [STRes554|STResList554],
+  ?line ITRes554 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_int.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S554),
+  ITResList555 = [ITRes554|ITResList554],
+
+
+  ?line {STRes555,S555} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList556 = [STRes555|STResList555],
+  ?line ITRes555 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_short.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S555),
+  ITResList556 = [ITRes555|ITResList555],
+
+
+  ?line {STRes556,S556} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList557 = [STRes556|STResList556],
+  ?line ITRes556 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S556),
+  ITResList557 = [ITRes556|ITResList556],
+
+
+  ?line {STRes557,S557} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList558 = [STRes557|STResList557],
+  ?line ITRes557 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S557),
+  ITResList558 = [ITRes557|ITResList557],
+
+
+  ?line {STRes558,S558} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList559 = [STRes558|STResList558],
+  ?line ITRes558 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S558),
+  ITResList559 = [ITRes558|ITResList558],
+
+
+  ?line {STRes559,S559} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList560 = [STRes559|STResList559],
+  ?line ITRes559 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S559),
+  ITResList560 = [ITRes559|ITResList559],
+
+
+  ?line {STRes560,S560} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList561 = [STRes560|STResList560],
+  ?line ITRes560 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S560),
+  ITResList561 = [ITRes560|ITResList560],
+
+
+  ?line {STRes561,S561} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList562 = [STRes561|STResList561],
+  ?line ITRes561 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S561),
+  ITResList562 = [ITRes561|ITResList561],
+
+
+  ?line {STRes562,S562} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList563 = [STRes562|STResList562],
+  ?line ITRes562 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S562),
+  ITResList563 = [ITRes562|ITResList562],
+
+
+  ?line {STRes563,S563} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList564 = [STRes563|STResList563],
+  ?line ITRes563 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S563),
+  ITResList564 = [ITRes563|ITResList563],
+
+
+  ?line {STRes564,S564} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList565 = [STRes564|STResList564],
+  ?line ITRes564 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_byte_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S564),
+  ITResList565 = [ITRes564|ITResList564],
+
+
+  ?line {STRes565,S565} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList566 = [STRes565|STResList565],
+  ?line ITRes565 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S565),
+  ITResList566 = [ITRes565|ITResList565],
+
+
+  ?line {STRes566,S566} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList567 = [STRes566|STResList566],
+  ?line ITRes566 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S566),
+  ITResList567 = [ITRes566|ITResList566],
+
+
+  ?line {STRes567,S567} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList568 = [STRes567|STResList567],
+  ?line ITRes567 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S567),
+  ITResList568 = [ITRes567|ITResList567],
+
+
+  ?line {STRes568,S568} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList569 = [STRes568|STResList568],
+  ?line ITRes568 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S568),
+  ITResList569 = [ITRes568|ITResList568],
+
+
+  ?line {STRes569,S569} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList570 = [STRes569|STResList569],
+  ?line ITRes569 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S569),
+  ITResList570 = [ITRes569|ITResList569],
+
+
+  ?line {STRes570,S570} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList571 = [STRes570|STResList570],
+  ?line ITRes570 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S570),
+  ITResList571 = [ITRes570|ITResList570],
+
+
+  ?line {STRes571,S571} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList572 = [STRes571|STResList571],
+  ?line ITRes571 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S571),
+  ITResList572 = [ITRes571|ITResList571],
+
+
+  ?line {STRes572,S572} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList573 = [STRes572|STResList572],
+  ?line ITRes572 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S572),
+  ITResList573 = [ITRes572|ITResList572],
+
+
+  ?line {STRes573,S573} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList574 = [STRes573|STResList573],
+  ?line ITRes573 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S573),
+  ITResList574 = [ITRes573|ITResList573],
+
+
+  ?line {STRes574,S574} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList575 = [STRes574|STResList574],
+  ?line ITRes574 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S574),
+  ITResList575 = [ITRes574|ITResList574],
+
+
+  ?line {STRes575,S575} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList576 = [STRes575|STResList575],
+  ?line ITRes575 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S575),
+  ITResList576 = [ITRes575|ITResList575],
+
+
+  ?line {STRes576,S576} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList577 = [STRes576|STResList576],
+  ?line ITRes576 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S576),
+  ITResList577 = [ITRes576|ITResList576],
+
+
+  ?line {STRes577,S577} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList578 = [STRes577|STResList577],
+  ?line ITRes577 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S577),
+  ITResList578 = [ITRes577|ITResList577],
+
+
+  ?line {STRes578,S578} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList579 = [STRes578|STResList578],
+  ?line ITRes578 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S578),
+  ITResList579 = [ITRes578|ITResList578],
+
+
+  ?line {STRes579,S579} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList580 = [STRes579|STResList579],
+  ?line ITRes579 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S579),
+  ITResList580 = [ITRes579|ITResList579],
+
+
+  ?line {STRes580,S580} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList581 = [STRes580|STResList580],
+  ?line ITRes580 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S580),
+  ITResList581 = [ITRes580|ITResList580],
+
+
+  ?line {STRes581,S581} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList582 = [STRes581|STResList581],
+  ?line ITRes581 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S581),
+  ITResList582 = [ITRes581|ITResList581],
+
+
+  ?line {STRes582,S582} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList583 = [STRes582|STResList582],
+  ?line ITRes582 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S582),
+  ITResList583 = [ITRes582|ITResList582],
+
+
+  ?line {STRes583,S583} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList584 = [STRes583|STResList583],
+  ?line ITRes583 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S583),
+  ITResList584 = [ITRes583|ITResList583],
+
+
+  ?line {STRes584,S584} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList585 = [STRes584|STResList584],
+  ?line ITRes584 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S584),
+  ITResList585 = [ITRes584|ITResList584],
+
+
+  ?line {STRes585,S585} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList586 = [STRes585|STResList585],
+  ?line ITRes585 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S585),
+  ITResList586 = [ITRes585|ITResList585],
+
+
+  ?line {STRes586,S586} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList587 = [STRes586|STResList586],
+  ?line ITRes586 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S586),
+  ITResList587 = [ITRes586|ITResList586],
+
+
+  ?line {STRes587,S587} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList588 = [STRes587|STResList587],
+  ?line ITRes587 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_nonNegativeInteger_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S587),
+  ITResList588 = [ITRes587|ITResList587],
+
+
+  ?line {STRes588,S588} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList589 = [STRes588|STResList588],
+  ?line ITRes588 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S588),
+  ITResList589 = [ITRes588|ITResList588],
+
+
+  ?line {STRes589,S589} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList590 = [STRes589|STResList589],
+  ?line ITRes589 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S589),
+  ITResList590 = [ITRes589|ITResList589],
+
+
+  ?line {STRes590,S590} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList591 = [STRes590|STResList590],
+  ?line ITRes590 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S590),
+  ITResList591 = [ITRes590|ITResList590],
+
+
+  ?line {STRes591,S591} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList592 = [STRes591|STResList591],
+  ?line ITRes591 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S591),
+  ITResList592 = [ITRes591|ITResList591],
+
+
+  ?line {STRes592,S592} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList593 = [STRes592|STResList592],
+  ?line ITRes592 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S592),
+  ITResList593 = [ITRes592|ITResList592],
+
+
+  ?line {STRes593,S593} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList594 = [STRes593|STResList593],
+  ?line ITRes593 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S593),
+  ITResList594 = [ITRes593|ITResList593],
+
+
+  ?line {STRes594,S594} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList595 = [STRes594|STResList594],
+  ?line ITRes594 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S594),
+  ITResList595 = [ITRes594|ITResList594],
+
+
+  ?line {STRes595,S595} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList596 = [STRes595|STResList595],
+  ?line ITRes595 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S595),
+  ITResList596 = [ITRes595|ITResList595],
+
+
+  ?line {STRes596,S596} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList597 = [STRes596|STResList596],
+  ?line ITRes596 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S596),
+  ITResList597 = [ITRes596|ITResList596],
+
+
+  ?line {STRes597,S597} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList598 = [STRes597|STResList597],
+  ?line ITRes597 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S597),
+  ITResList598 = [ITRes597|ITResList597],
+
+
+  ?line {STRes598,S598} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList599 = [STRes598|STResList598],
+  ?line ITRes598 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S598),
+  ITResList599 = [ITRes598|ITResList598],
+
+
+  ?line {STRes599,S599} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList600 = [STRes599|STResList599],
+  ?line ITRes599 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S599),
+  ITResList600 = [ITRes599|ITResList599],
+
+
+  ?line {STRes600,S600} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList601 = [STRes600|STResList600],
+  ?line ITRes600 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S600),
+  ITResList601 = [ITRes600|ITResList600],
+
+
+  ?line {STRes601,S601} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList602 = [STRes601|STResList601],
+  ?line ITRes601 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S601),
+  ITResList602 = [ITRes601|ITResList601],
+
+
+  ?line {STRes602,S602} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList603 = [STRes602|STResList602],
+  ?line ITRes602 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S602),
+  ITResList603 = [ITRes602|ITResList602],
+
+
+  ?line {STRes603,S603} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList604 = [STRes603|STResList603],
+  ?line ITRes603 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S603),
+  ITResList604 = [ITRes603|ITResList603],
+
+
+  ?line {STRes604,S604} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList605 = [STRes604|STResList604],
+  ?line ITRes604 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S604),
+  ITResList605 = [ITRes604|ITResList604],
+
+
+  ?line {STRes605,S605} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList606 = [STRes605|STResList605],
+  ?line ITRes605 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S605),
+  ITResList606 = [ITRes605|ITResList605],
+
+
+  ?line {STRes606,S606} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList607 = [STRes606|STResList606],
+  ?line ITRes606 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S606),
+  ITResList607 = [ITRes606|ITResList606],
+
+
+  ?line {STRes607,S607} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList608 = [STRes607|STResList607],
+  ?line ITRes607 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S607),
+  ITResList608 = [ITRes607|ITResList607],
+
+
+  ?line {STRes608,S608} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList609 = [STRes608|STResList608],
+  ?line ITRes608 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S608),
+  ITResList609 = [ITRes608|ITResList608],
+
+
+  ?line {STRes609,S609} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList610 = [STRes609|STResList609],
+  ?line ITRes609 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S609),
+  ITResList610 = [ITRes609|ITResList609],
+
+
+  ?line {STRes610,S610} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList611 = [STRes610|STResList610],
+  ?line ITRes610 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_positiveInteger_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S610),
+  ITResList611 = [ITRes610|ITResList610],
+
+
+  ?line {STRes611,S611} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList612 = [STRes611|STResList611],
+  ?line ITRes611 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S611),
+  ITResList612 = [ITRes611|ITResList611],
+
+
+  ?line {STRes612,S612} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList613 = [STRes612|STResList612],
+  ?line ITRes612 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S612),
+  ITResList613 = [ITRes612|ITResList612],
+
+
+  ?line {STRes613,S613} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList614 = [STRes613|STResList613],
+  ?line ITRes613 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S613),
+  ITResList614 = [ITRes613|ITResList613],
+
+
+  ?line {STRes614,S614} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList615 = [STRes614|STResList614],
+  ?line ITRes614 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S614),
+  ITResList615 = [ITRes614|ITResList614],
+
+
+  ?line {STRes615,S615} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList616 = [STRes615|STResList615],
+  ?line ITRes615 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S615),
+  ITResList616 = [ITRes615|ITResList615],
+
+
+  ?line {STRes616,S616} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList617 = [STRes616|STResList616],
+  ?line ITRes616 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S616),
+  ITResList617 = [ITRes616|ITResList616],
+
+
+  ?line {STRes617,S617} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList618 = [STRes617|STResList617],
+  ?line ITRes617 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S617),
+  ITResList618 = [ITRes617|ITResList617],
+
+
+  ?line {STRes618,S618} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList619 = [STRes618|STResList618],
+  ?line ITRes618 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S618),
+  ITResList619 = [ITRes618|ITResList618],
+
+
+  ?line {STRes619,S619} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList620 = [STRes619|STResList619],
+  ?line ITRes619 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S619),
+  ITResList620 = [ITRes619|ITResList619],
+
+
+  ?line {STRes620,S620} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList621 = [STRes620|STResList620],
+  ?line ITRes620 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S620),
+  ITResList621 = [ITRes620|ITResList620],
+
+
+  ?line {STRes621,S621} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList622 = [STRes621|STResList621],
+  ?line ITRes621 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S621),
+  ITResList622 = [ITRes621|ITResList621],
+
+
+  ?line {STRes622,S622} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList623 = [STRes622|STResList622],
+  ?line ITRes622 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S622),
+  ITResList623 = [ITRes622|ITResList622],
+
+
+  ?line {STRes623,S623} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList624 = [STRes623|STResList623],
+  ?line ITRes623 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S623),
+  ITResList624 = [ITRes623|ITResList623],
+
+
+  ?line {STRes624,S624} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList625 = [STRes624|STResList624],
+  ?line ITRes624 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S624),
+  ITResList625 = [ITRes624|ITResList624],
+
+
+  ?line {STRes625,S625} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList626 = [STRes625|STResList625],
+  ?line ITRes625 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S625),
+  ITResList626 = [ITRes625|ITResList625],
+
+
+  ?line {STRes626,S626} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList627 = [STRes626|STResList626],
+  ?line ITRes626 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S626),
+  ITResList627 = [ITRes626|ITResList626],
+
+
+  ?line {STRes627,S627} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList628 = [STRes627|STResList627],
+  ?line ITRes627 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S627),
+  ITResList628 = [ITRes627|ITResList627],
+
+
+  ?line {STRes628,S628} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList629 = [STRes628|STResList628],
+  ?line ITRes628 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S628),
+  ITResList629 = [ITRes628|ITResList628],
+
+
+  ?line {STRes629,S629} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList630 = [STRes629|STResList629],
+  ?line ITRes629 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S629),
+  ITResList630 = [ITRes629|ITResList629],
+
+
+  ?line {STRes630,S630} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList631 = [STRes630|STResList630],
+  ?line ITRes630 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S630),
+  ITResList631 = [ITRes630|ITResList630],
+
+
+  ?line {STRes631,S631} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList632 = [STRes631|STResList631],
+  ?line ITRes631 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S631),
+  ITResList632 = [ITRes631|ITResList631],
+
+
+  ?line {STRes632,S632} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList633 = [STRes632|STResList632],
+  ?line ITRes632 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S632),
+  ITResList633 = [ITRes632|ITResList632],
+
+
+  ?line {STRes633,S633} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList634 = [STRes633|STResList633],
+  ?line ITRes633 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedLong_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S633),
+  ITResList634 = [ITRes633|ITResList633],
+
+
+  ?line {STRes634,S634} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList635 = [STRes634|STResList634],
+  ?line ITRes634 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S634),
+  ITResList635 = [ITRes634|ITResList634],
+
+
+  ?line {STRes635,S635} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList636 = [STRes635|STResList635],
+  ?line ITRes635 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S635),
+  ITResList636 = [ITRes635|ITResList635],
+
+
+  ?line {STRes636,S636} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList637 = [STRes636|STResList636],
+  ?line ITRes636 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S636),
+  ITResList637 = [ITRes636|ITResList636],
+
+
+  ?line {STRes637,S637} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList638 = [STRes637|STResList637],
+  ?line ITRes637 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S637),
+  ITResList638 = [ITRes637|ITResList637],
+
+
+  ?line {STRes638,S638} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList639 = [STRes638|STResList638],
+  ?line ITRes638 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S638),
+  ITResList639 = [ITRes638|ITResList638],
+
+
+  ?line {STRes639,S639} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList640 = [STRes639|STResList639],
+  ?line ITRes639 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S639),
+  ITResList640 = [ITRes639|ITResList639],
+
+
+  ?line {STRes640,S640} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList641 = [STRes640|STResList640],
+  ?line ITRes640 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S640),
+  ITResList641 = [ITRes640|ITResList640],
+
+
+  ?line {STRes641,S641} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList642 = [STRes641|STResList641],
+  ?line ITRes641 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S641),
+  ITResList642 = [ITRes641|ITResList641],
+
+
+  ?line {STRes642,S642} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList643 = [STRes642|STResList642],
+  ?line ITRes642 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S642),
+  ITResList643 = [ITRes642|ITResList642],
+
+
+  ?line {STRes643,S643} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList644 = [STRes643|STResList643],
+  ?line ITRes643 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S643),
+  ITResList644 = [ITRes643|ITResList643],
+
+
+  ?line {STRes644,S644} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList645 = [STRes644|STResList644],
+  ?line ITRes644 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S644),
+  ITResList645 = [ITRes644|ITResList644],
+
+
+  ?line {STRes645,S645} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList646 = [STRes645|STResList645],
+  ?line ITRes645 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S645),
+  ITResList646 = [ITRes645|ITResList645],
+
+
+  ?line {STRes646,S646} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList647 = [STRes646|STResList646],
+  ?line ITRes646 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S646),
+  ITResList647 = [ITRes646|ITResList646],
+
+
+  ?line {STRes647,S647} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList648 = [STRes647|STResList647],
+  ?line ITRes647 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S647),
+  ITResList648 = [ITRes647|ITResList647],
+
+
+  ?line {STRes648,S648} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList649 = [STRes648|STResList648],
+  ?line ITRes648 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S648),
+  ITResList649 = [ITRes648|ITResList648],
+
+
+  ?line {STRes649,S649} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList650 = [STRes649|STResList649],
+  ?line ITRes649 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S649),
+  ITResList650 = [ITRes649|ITResList649],
+
+
+  ?line {STRes650,S650} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList651 = [STRes650|STResList650],
+  ?line ITRes650 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S650),
+  ITResList651 = [ITRes650|ITResList650],
+
+
+  ?line {STRes651,S651} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList652 = [STRes651|STResList651],
+  ?line ITRes651 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S651),
+  ITResList652 = [ITRes651|ITResList651],
+
+
+  ?line {STRes652,S652} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList653 = [STRes652|STResList652],
+  ?line ITRes652 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S652),
+  ITResList653 = [ITRes652|ITResList652],
+
+
+  ?line {STRes653,S653} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList654 = [STRes653|STResList653],
+  ?line ITRes653 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S653),
+  ITResList654 = [ITRes653|ITResList653],
+
+
+  ?line {STRes654,S654} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList655 = [STRes654|STResList654],
+  ?line ITRes654 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S654),
+  ITResList655 = [ITRes654|ITResList654],
+
+
+  ?line {STRes655,S655} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList656 = [STRes655|STResList655],
+  ?line ITRes655 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S655),
+  ITResList656 = [ITRes655|ITResList655],
+
+
+  ?line {STRes656,S656} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList657 = [STRes656|STResList656],
+  ?line ITRes656 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedInt_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S656),
+  ITResList657 = [ITRes656|ITResList656],
+
+
+  ?line {STRes657,S657} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList658 = [STRes657|STResList657],
+  ?line ITRes657 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S657),
+  ITResList658 = [ITRes657|ITResList657],
+
+
+  ?line {STRes658,S658} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList659 = [STRes658|STResList658],
+  ?line ITRes658 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S658),
+  ITResList659 = [ITRes658|ITResList658],
+
+
+  ?line {STRes659,S659} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList660 = [STRes659|STResList659],
+  ?line ITRes659 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S659),
+  ITResList660 = [ITRes659|ITResList659],
+
+
+  ?line {STRes660,S660} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList661 = [STRes660|STResList660],
+  ?line ITRes660 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S660),
+  ITResList661 = [ITRes660|ITResList660],
+
+
+  ?line {STRes661,S661} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList662 = [STRes661|STResList661],
+  ?line ITRes661 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S661),
+  ITResList662 = [ITRes661|ITResList661],
+
+
+  ?line {STRes662,S662} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList663 = [STRes662|STResList662],
+  ?line ITRes662 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S662),
+  ITResList663 = [ITRes662|ITResList662],
+
+
+  ?line {STRes663,S663} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList664 = [STRes663|STResList663],
+  ?line ITRes663 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S663),
+  ITResList664 = [ITRes663|ITResList663],
+
+
+  ?line {STRes664,S664} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList665 = [STRes664|STResList664],
+  ?line ITRes664 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S664),
+  ITResList665 = [ITRes664|ITResList664],
+
+
+  ?line {STRes665,S665} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList666 = [STRes665|STResList665],
+  ?line ITRes665 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S665),
+  ITResList666 = [ITRes665|ITResList665],
+
+
+  ?line {STRes666,S666} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList667 = [STRes666|STResList666],
+  ?line ITRes666 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S666),
+  ITResList667 = [ITRes666|ITResList666],
+
+
+  ?line {STRes667,S667} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList668 = [STRes667|STResList667],
+  ?line ITRes667 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S667),
+  ITResList668 = [ITRes667|ITResList667],
+
+
+  ?line {STRes668,S668} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList669 = [STRes668|STResList668],
+  ?line ITRes668 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S668),
+  ITResList669 = [ITRes668|ITResList668],
+
+
+  ?line {STRes669,S669} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList670 = [STRes669|STResList669],
+  ?line ITRes669 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S669),
+  ITResList670 = [ITRes669|ITResList669],
+
+
+  ?line {STRes670,S670} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList671 = [STRes670|STResList670],
+  ?line ITRes670 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S670),
+  ITResList671 = [ITRes670|ITResList670],
+
+
+  ?line {STRes671,S671} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList672 = [STRes671|STResList671],
+  ?line ITRes671 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S671),
+  ITResList672 = [ITRes671|ITResList671],
+
+
+  ?line {STRes672,S672} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList673 = [STRes672|STResList672],
+  ?line ITRes672 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S672),
+  ITResList673 = [ITRes672|ITResList672],
+
+
+  ?line {STRes673,S673} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList674 = [STRes673|STResList673],
+  ?line ITRes673 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S673),
+  ITResList674 = [ITRes673|ITResList673],
+
+
+  ?line {STRes674,S674} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList675 = [STRes674|STResList674],
+  ?line ITRes674 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S674),
+  ITResList675 = [ITRes674|ITResList674],
+
+
+  ?line {STRes675,S675} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList676 = [STRes675|STResList675],
+  ?line ITRes675 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S675),
+  ITResList676 = [ITRes675|ITResList675],
+
+
+  ?line {STRes676,S676} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList677 = [STRes676|STResList676],
+  ?line ITRes676 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S676),
+  ITResList677 = [ITRes676|ITResList676],
+
+
+  ?line {STRes677,S677} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList678 = [STRes677|STResList677],
+  ?line ITRes677 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S677),
+  ITResList678 = [ITRes677|ITResList677],
+
+
+  ?line {STRes678,S678} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList679 = [STRes678|STResList678],
+  ?line ITRes678 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S678),
+  ITResList679 = [ITRes678|ITResList678],
+
+
+  ?line {STRes679,S679} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList680 = [STRes679|STResList679],
+  ?line ITRes679 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedShort_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S679),
+  ITResList680 = [ITRes679|ITResList679],
+
+
+  ?line {STRes680,S680} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList681 = [STRes680|STResList680],
+  ?line ITRes680 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S680),
+  ITResList681 = [ITRes680|ITResList680],
+
+
+  ?line {STRes681,S681} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList682 = [STRes681|STResList681],
+  ?line ITRes681 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S681),
+  ITResList682 = [ITRes681|ITResList681],
+
+
+  ?line {STRes682,S682} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList683 = [STRes682|STResList682],
+  ?line ITRes682 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S682),
+  ITResList683 = [ITRes682|ITResList682],
+
+
+  ?line {STRes683,S683} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList684 = [STRes683|STResList683],
+  ?line ITRes683 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S683),
+  ITResList684 = [ITRes683|ITResList683],
+
+
+  ?line {STRes684,S684} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList685 = [STRes684|STResList684],
+  ?line ITRes684 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S684),
+  ITResList685 = [ITRes684|ITResList684],
+
+
+  ?line {STRes685,S685} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList686 = [STRes685|STResList685],
+  ?line ITRes685 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S685),
+  ITResList686 = [ITRes685|ITResList685],
+
+
+  ?line {STRes686,S686} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList687 = [STRes686|STResList686],
+  ?line ITRes686 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S686),
+  ITResList687 = [ITRes686|ITResList686],
+
+
+  ?line {STRes687,S687} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList688 = [STRes687|STResList687],
+  ?line ITRes687 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S687),
+  ITResList688 = [ITRes687|ITResList687],
+
+
+  ?line {STRes688,S688} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList689 = [STRes688|STResList688],
+  ?line ITRes688 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S688),
+  ITResList689 = [ITRes688|ITResList688],
+
+
+  ?line {STRes689,S689} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList690 = [STRes689|STResList689],
+  ?line ITRes689 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S689),
+  ITResList690 = [ITRes689|ITResList689],
+
+
+  ?line {STRes690,S690} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList691 = [STRes690|STResList690],
+  ?line ITRes690 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S690),
+  ITResList691 = [ITRes690|ITResList690],
+
+
+  ?line {STRes691,S691} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList692 = [STRes691|STResList691],
+  ?line ITRes691 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S691),
+  ITResList692 = [ITRes691|ITResList691],
+
+
+  ?line {STRes692,S692} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList693 = [STRes692|STResList692],
+  ?line ITRes692 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S692),
+  ITResList693 = [ITRes692|ITResList692],
+
+
+  ?line {STRes693,S693} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList694 = [STRes693|STResList693],
+  ?line ITRes693 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S693),
+  ITResList694 = [ITRes693|ITResList693],
+
+
+  ?line {STRes694,S694} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList695 = [STRes694|STResList694],
+  ?line ITRes694 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S694),
+  ITResList695 = [ITRes694|ITResList694],
+
+
+  ?line {STRes695,S695} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList696 = [STRes695|STResList695],
+  ?line ITRes695 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S695),
+  ITResList696 = [ITRes695|ITResList695],
+
+
+  ?line {STRes696,S696} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList697 = [STRes696|STResList696],
+  ?line ITRes696 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S696),
+  ITResList697 = [ITRes696|ITResList696],
+
+
+  ?line {STRes697,S697} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList698 = [STRes697|STResList697],
+  ?line ITRes697 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S697),
+  ITResList698 = [ITRes697|ITResList697],
+
+
+  ?line {STRes698,S698} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList699 = [STRes698|STResList698],
+  ?line ITRes698 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S698),
+  ITResList699 = [ITRes698|ITResList698],
+
+
+  ?line {STRes699,S699} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList700 = [STRes699|STResList699],
+  ?line ITRes699 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S699),
+  ITResList700 = [ITRes699|ITResList699],
+
+
+  ?line {STRes700,S700} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList701 = [STRes700|STResList700],
+  ?line ITRes700 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S700),
+  ITResList701 = [ITRes700|ITResList700],
+
+
+  ?line {STRes701,S701} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList702 = [STRes701|STResList701],
+  ?line ITRes701 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S701),
+  ITResList702 = [ITRes701|ITResList701],
+
+
+  ?line {STRes702,S702} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList703 = [STRes702|STResList702],
+  ?line ITRes702 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_unsignedByte_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S702),
+  ITResList703 = [ITRes702|ITResList702],
+
+
+  ?line {STRes703,S703} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList704 = [STRes703|STResList703],
+  ?line ITRes703 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S703),
+  ITResList704 = [ITRes703|ITResList703],
+
+
+  ?line {STRes704,S704} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList705 = [STRes704|STResList704],
+  ?line ITRes704 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S704),
+  ITResList705 = [ITRes704|ITResList704],
+
+
+  ?line {STRes705,S705} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList706 = [STRes705|STResList705],
+  ?line ITRes705 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S705),
+  ITResList706 = [ITRes705|ITResList705],
+
+
+  ?line {STRes706,S706} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList707 = [STRes706|STResList706],
+  ?line ITRes706 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S706),
+  ITResList707 = [ITRes706|ITResList706],
+
+
+  ?line {STRes707,S707} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList708 = [STRes707|STResList707],
+  ?line ITRes707 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S707),
+  ITResList708 = [ITRes707|ITResList707],
+
+
+  ?line {STRes708,S708} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList709 = [STRes708|STResList708],
+  ?line ITRes708 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S708),
+  ITResList709 = [ITRes708|ITResList708],
+
+
+  ?line {STRes709,S709} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList710 = [STRes709|STResList709],
+  ?line ITRes709 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S709),
+  ITResList710 = [ITRes709|ITResList709],
+
+
+  ?line {STRes710,S710} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList711 = [STRes710|STResList710],
+  ?line ITRes710 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S710),
+  ITResList711 = [ITRes710|ITResList710],
+
+
+  ?line {STRes711,S711} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList712 = [STRes711|STResList711],
+  ?line ITRes711 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S711),
+  ITResList712 = [ITRes711|ITResList711],
+
+
+  ?line {STRes712,S712} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList713 = [STRes712|STResList712],
+  ?line ITRes712 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S712),
+  ITResList713 = [ITRes712|ITResList712],
+
+
+  ?line {STRes713,S713} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList714 = [STRes713|STResList713],
+  ?line ITRes713 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S713),
+  ITResList714 = [ITRes713|ITResList713],
+
+
+  ?line {STRes714,S714} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList715 = [STRes714|STResList714],
+  ?line ITRes714 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S714),
+  ITResList715 = [ITRes714|ITResList714],
+
+
+  ?line {STRes715,S715} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList716 = [STRes715|STResList715],
+  ?line ITRes715 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S715),
+  ITResList716 = [ITRes715|ITResList715],
+
+
+  ?line {STRes716,S716} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList717 = [STRes716|STResList716],
+  ?line ITRes716 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S716),
+  ITResList717 = [ITRes716|ITResList716],
+
+
+  ?line {STRes717,S717} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList718 = [STRes717|STResList717],
+  ?line ITRes717 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S717),
+  ITResList718 = [ITRes717|ITResList717],
+
+
+  ?line {STRes718,S718} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList719 = [STRes718|STResList718],
+  ?line ITRes718 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S718),
+  ITResList719 = [ITRes718|ITResList718],
+
+
+  ?line {STRes719,S719} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList720 = [STRes719|STResList719],
+  ?line ITRes719 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S719),
+  ITResList720 = [ITRes719|ITResList719],
+
+
+  ?line {STRes720,S720} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList721 = [STRes720|STResList720],
+  ?line ITRes720 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S720),
+  ITResList721 = [ITRes720|ITResList720],
+
+
+  ?line {STRes721,S721} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList722 = [STRes721|STResList721],
+  ?line ITRes721 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S721),
+  ITResList722 = [ITRes721|ITResList721],
+
+
+  ?line {STRes722,S722} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList723 = [STRes722|STResList722],
+  ?line ITRes722 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S722),
+  ITResList723 = [ITRes722|ITResList722],
+
+
+  ?line {STRes723,S723} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList724 = [STRes723|STResList723],
+  ?line ITRes723 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S723),
+  ITResList724 = [ITRes723|ITResList723],
+
+
+  ?line {STRes724,S724} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList725 = [STRes724|STResList724],
+  ?line ITRes724 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S724),
+  ITResList725 = [ITRes724|ITResList724],
+
+
+  ?line {STRes725,S725} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList726 = [STRes725|STResList725],
+  ?line ITRes725 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S725),
+  ITResList726 = [ITRes725|ITResList725],
+
+
+  ?line {STRes726,S726} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList727 = [STRes726|STResList726],
+  ?line ITRes726 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_double.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S726),
+  ITResList727 = [ITRes726|ITResList726],
+
+
+  ?line {STRes727,S727} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList728 = [STRes727|STResList727],
+  ?line ITRes727 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_double_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S727),
+  ITResList728 = [ITRes727|ITResList727],
+
+
+  ?line {STRes728,S728} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList729 = [STRes728|STResList728],
+  ?line ITRes728 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S728),
+  ITResList729 = [ITRes728|ITResList728],
+
+
+  ?line {STRes729,S729} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList730 = [STRes729|STResList729],
+  ?line ITRes729 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S729),
+  ITResList730 = [ITRes729|ITResList729],
+
+
+  ?line {STRes730,S730} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList731 = [STRes730|STResList730],
+  ?line ITRes730 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S730),
+  ITResList731 = [ITRes730|ITResList730],
+
+
+  ?line {STRes731,S731} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList732 = [STRes731|STResList731],
+  ?line ITRes731 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_language.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S731),
+  ITResList732 = [ITRes731|ITResList731],
+
+
+  ?line {STRes732,S732} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList733 = [STRes732|STResList732],
+  ?line ITRes732 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S732),
+  ITResList733 = [ITRes732|ITResList732],
+
+
+  ?line {STRes733,S733} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList734 = [STRes733|STResList733],
+  ?line ITRes733 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S733),
+  ITResList734 = [ITRes733|ITResList733],
+
+
+  ?line {STRes734,S734} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList735 = [STRes734|STResList734],
+  ?line ITRes734 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S734),
+  ITResList735 = [ITRes734|ITResList734],
+
+
+  ?line {STRes735,S735} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList736 = [STRes735|STResList735],
+  ?line ITRes735 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S735),
+  ITResList736 = [ITRes735|ITResList735],
+
+
+  ?line {STRes736,S736} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_IDREFS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList737 = [STRes736|STResList736],
+  ?line ITRes736 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_IDREFS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S736),
+  ITResList737 = [ITRes736|ITResList736],
+
+
+  ?line {STRes737,S737} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList738 = [STRes737|STResList737],
+  ?line ITRes737 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S737),
+  ITResList738 = [ITRes737|ITResList737],
+
+
+  ?line {STRes738,S738} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList739 = [STRes738|STResList738],
+  ?line ITRes738 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S738),
+  ITResList739 = [ITRes738|ITResList738],
+
+
+  ?line {STRes739,S739} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList740 = [STRes739|STResList739],
+  ?line ITRes739 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S739),
+  ITResList740 = [ITRes739|ITResList739],
+
+
+  ?line {STRes740,S740} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_base64Binary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList741 = [STRes740|STResList740],
+  ?line ITRes740 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_base64Binary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S740),
+  ITResList741 = [ITRes740|ITResList740],
+
+
+  ?line {STRes741,S741} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_hexBinary.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList742 = [STRes741|STResList741],
+  ?line ITRes741 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_hexBinary.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S741),
+  ITResList742 = [ITRes741|ITResList741],
+
+
+  ?line {STRes742,S742} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_float.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList743 = [STRes742|STResList742],
+  ?line ITRes742 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_float.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S742),
+  ITResList743 = [ITRes742|ITResList742],
+
+
+  ?line {STRes743,S743} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_decimal.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList744 = [STRes743|STResList743],
+  ?line ITRes743 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_decimal.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S743),
+  ITResList744 = [ITRes743|ITResList743],
+
+
+  ?line {STRes744,S744} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_integer.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList745 = [STRes744|STResList744],
+  ?line ITRes744 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_integer.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S744),
+  ITResList745 = [ITRes744|ITResList744],
+
+
+  ?line {STRes745,S745} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_nonPositiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList746 = [STRes745|STResList745],
+  ?line ITRes745 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_nonPositiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S745),
+  ITResList746 = [ITRes745|ITResList745],
+
+
+  ?line {STRes746,S746} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_negativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList747 = [STRes746|STResList746],
+  ?line ITRes746 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_negativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S746),
+  ITResList747 = [ITRes746|ITResList746],
+
+
+  ?line {STRes747,S747} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_long.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList748 = [STRes747|STResList747],
+  ?line ITRes747 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_long.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S747),
+  ITResList748 = [ITRes747|ITResList747],
+
+
+  ?line {STRes748,S748} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_int.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList749 = [STRes748|STResList748],
+  ?line ITRes748 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_int.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S748),
+  ITResList749 = [ITRes748|ITResList748],
+
+
+  ?line {STRes749,S749} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_short.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList750 = [STRes749|STResList749],
+  ?line ITRes749 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_short.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S749),
+  ITResList750 = [ITRes749|ITResList749],
+
+
+  ?line {STRes750,S750} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_byte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList751 = [STRes750|STResList750],
+  ?line ITRes750 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_byte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S750),
+  ITResList751 = [ITRes750|ITResList750],
+
+
+  ?line {STRes751,S751} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_nonNegativeInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList752 = [STRes751|STResList751],
+  ?line ITRes751 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_nonNegativeInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S751),
+  ITResList752 = [ITRes751|ITResList751],
+
+
+  ?line {STRes752,S752} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_positiveInteger.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList753 = [STRes752|STResList752],
+  ?line ITRes752 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_positiveInteger.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S752),
+  ITResList753 = [ITRes752|ITResList752],
+
+
+  ?line {STRes753,S753} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_unsignedLong.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList754 = [STRes753|STResList753],
+  ?line ITRes753 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_unsignedLong.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S753),
+  ITResList754 = [ITRes753|ITResList753],
+
+
+  ?line {STRes754,S754} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_unsignedInt.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList755 = [STRes754|STResList754],
+  ?line ITRes754 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_unsignedInt.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S754),
+  ITResList755 = [ITRes754|ITResList754],
+
+
+  ?line {STRes755,S755} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_unsignedShort.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList756 = [STRes755|STResList755],
+  ?line ITRes755 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_unsignedShort.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S755),
+  ITResList756 = [ITRes755|ITResList755],
+
+
+  ?line {STRes756,S756} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_unsignedByte.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList757 = [STRes756|STResList756],
+  ?line ITRes756 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_unsignedByte.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S756),
+  ITResList757 = [ITRes756|ITResList756],
+
+
+  ?line {STRes757,S757} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_double.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList758 = [STRes757|STResList757],
+  ?line ITRes757 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_double.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S757),
+  ITResList758 = [ITRes757|ITResList757],
+
+
+  ?line {STRes758,S758} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList759 = [STRes758|STResList758],
+  ?line ITRes758 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S758),
+  ITResList759 = [ITRes758|ITResList758],
+
+
+  ?line {STRes759,S759} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList760 = [STRes759|STResList759],
+  ?line ITRes759 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S759),
+  ITResList760 = [ITRes759|ITResList759],
+
+
+  ?line {STRes760,S760} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList761 = [STRes760|STResList760],
+  ?line ITRes760 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S760),
+  ITResList761 = [ITRes760|ITResList760],
+
+
+  ?line {STRes761,S761} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList762 = [STRes761|STResList761],
+  ?line ITRes761 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S761),
+  ITResList762 = [ITRes761|ITResList761],
+
+
+  ?line {STRes762,S762} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_dateTime.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList763 = [STRes762|STResList762],
+  ?line ITRes762 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_dateTime.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S762),
+  ITResList763 = [ITRes762|ITResList762],
+
+
+  ?line {STRes763,S763} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_time.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList764 = [STRes763|STResList763],
+  ?line ITRes763 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_time.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S763),
+  ITResList764 = [ITRes763|ITResList763],
+
+
+  ?line {STRes764,S764} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_date.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList765 = [STRes764|STResList764],
+  ?line ITRes764 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_date.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S764),
+  ITResList765 = [ITRes764|ITResList764],
+
+
+  ?line {STRes765,S765} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_gYearMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList766 = [STRes765|STResList765],
+  ?line ITRes765 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_gYearMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S765),
+  ITResList766 = [ITRes765|ITResList765],
+
+
+  ?line {STRes766,S766} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_gYear.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList767 = [STRes766|STResList766],
+  ?line ITRes766 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_gYear.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S766),
+  ITResList767 = [ITRes766|ITResList766],
+
+
+  ?line {STRes767,S767} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_gMonthDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList768 = [STRes767|STResList767],
+  ?line ITRes767 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_gMonthDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S767),
+  ITResList768 = [ITRes767|ITResList767],
+
+
+  ?line {STRes768,S768} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_gDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList769 = [STRes768|STResList768],
+  ?line ITRes768 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_gDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S768),
+  ITResList769 = [ITRes768|ITResList768],
+
+
+  ?line {STRes769,S769} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_gMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList770 = [STRes769|STResList769],
+  ?line ITRes769 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_anyURI_gMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S769),
+  ITResList770 = [ITRes769|ITResList769],
+
+
+  ?line {STRes770,S770} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList771 = [STRes770|STResList770],
+  ?line ITRes770 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S770),
+  ITResList771 = [ITRes770|ITResList770],
+
+
+  ?line {STRes771,S771} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList772 = [STRes771|STResList771],
+  ?line ITRes771 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S771),
+  ITResList772 = [ITRes771|ITResList771],
+
+
+  ?line {STRes772,S772} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList773 = [STRes772|STResList772],
+  ?line ITRes772 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S772),
+  ITResList773 = [ITRes772|ITResList772],
+
+
+  ?line {STRes773,S773} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList774 = [STRes773|STResList773],
+  ?line ITRes773 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_language.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S773),
+  ITResList774 = [ITRes773|ITResList773],
+
+
+  ?line {STRes774,S774} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList775 = [STRes774|STResList774],
+  ?line ITRes774 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S774),
+  ITResList775 = [ITRes774|ITResList774],
+
+
+  ?line {STRes775,S775} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList776 = [STRes775|STResList775],
+  ?line ITRes775 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S775),
+  ITResList776 = [ITRes775|ITResList775],
+
+
+  ?line {STRes776,S776} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList777 = [STRes776|STResList776],
+  ?line ITRes776 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S776),
+  ITResList777 = [ITRes776|ITResList776],
+
+
+  ?line {STRes777,S777} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList778 = [STRes777|STResList777],
+  ?line ITRes777 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S777),
+  ITResList778 = [ITRes777|ITResList777],
+
+
+  ?line {STRes778,S778} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_IDREFS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList779 = [STRes778|STResList778],
+  ?line ITRes778 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_IDREFS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S778),
+  ITResList779 = [ITRes778|ITResList778],
+
+
+  ?line {STRes779,S779} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList780 = [STRes779|STResList779],
+  ?line ITRes779 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S779),
+  ITResList780 = [ITRes779|ITResList779],
+
+
+  ?line {STRes780,S780} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList781 = [STRes780|STResList780],
+  ?line ITRes780 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S780),
+  ITResList781 = [ITRes780|ITResList780],
+
+
+  ?line {STRes781,S781} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList782 = [STRes781|STResList781],
+  ?line ITRes781 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S781),
+  ITResList782 = [ITRes781|ITResList781],
+
+
+  ?line {STRes782,S782} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList783 = [STRes782|STResList782],
+  ?line ITRes782 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S782),
+  ITResList783 = [ITRes782|ITResList782],
+
+
+  ?line {STRes783,S783} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList784 = [STRes783|STResList783],
+  ?line ITRes783 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S783),
+  ITResList784 = [ITRes783|ITResList783],
+
+
+  ?line {STRes784,S784} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList785 = [STRes784|STResList784],
+  ?line ITRes784 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_QName_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S784),
+  ITResList785 = [ITRes784|ITResList784],
+
+
+  ?line {STRes785,S785} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList786 = [STRes785|STResList785],
+  ?line ITRes785 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S785),
+  ITResList786 = [ITRes785|ITResList785],
+
+
+  ?line {STRes786,S786} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList787 = [STRes786|STResList786],
+  ?line ITRes786 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S786),
+  ITResList787 = [ITRes786|ITResList786],
+
+
+  ?line {STRes787,S787} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList788 = [STRes787|STResList787],
+  ?line ITRes787 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S787),
+  ITResList788 = [ITRes787|ITResList787],
+
+
+  ?line {STRes788,S788} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_language.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList789 = [STRes788|STResList788],
+  ?line ITRes788 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_language.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S788),
+  ITResList789 = [ITRes788|ITResList788],
+
+
+  ?line {STRes789,S789} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList790 = [STRes789|STResList789],
+  ?line ITRes789 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S789),
+  ITResList790 = [ITRes789|ITResList789],
+
+
+  ?line {STRes790,S790} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList791 = [STRes790|STResList790],
+  ?line ITRes790 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S790),
+  ITResList791 = [ITRes790|ITResList790],
+
+
+  ?line {STRes791,S791} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList792 = [STRes791|STResList791],
+  ?line ITRes791 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S791),
+  ITResList792 = [ITRes791|ITResList791],
+
+
+  ?line {STRes792,S792} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList793 = [STRes792|STResList792],
+  ?line ITRes792 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S792),
+  ITResList793 = [ITRes792|ITResList792],
+
+
+  ?line {STRes793,S793} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_IDREFS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList794 = [STRes793|STResList793],
+  ?line ITRes793 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_IDREFS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S793),
+  ITResList794 = [ITRes793|ITResList793],
+
+
+  ?line {STRes794,S794} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList795 = [STRes794|STResList794],
+  ?line ITRes794 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S794),
+  ITResList795 = [ITRes794|ITResList794],
+
+
+  ?line {STRes795,S795} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList796 = [STRes795|STResList795],
+  ?line ITRes795 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S795),
+  ITResList796 = [ITRes795|ITResList795],
+
+
+  ?line {STRes796,S796} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_boolean.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList797 = [STRes796|STResList796],
+  ?line ITRes796 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_boolean.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S796),
+  ITResList797 = [ITRes796|ITResList796],
+
+
+  ?line {STRes797,S797} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList798 = [STRes797|STResList797],
+  ?line ITRes797 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S797),
+  ITResList798 = [ITRes797|ITResList797],
+
+
+  ?line {STRes798,S798} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList799 = [STRes798|STResList798],
+  ?line ITRes798 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S798),
+  ITResList799 = [ITRes798|ITResList798],
+
+
+  ?line {STRes799,S799} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList800 = [STRes799|STResList799],
+  ?line ITRes799 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_NOTATION_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S799),
+  ITResList800 = [ITRes799|ITResList799],
+
+
+  ?line {STRes800,S800} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList801 = [STRes800|STResList800],
+  ?line ITRes800 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S800),
+  ITResList801 = [ITRes800|ITResList800],
+
+
+  ?line {STRes801,S801} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList802 = [STRes801|STResList801],
+  ?line ITRes801 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S801),
+  ITResList802 = [ITRes801|ITResList801],
+
+
+  ?line {STRes802,S802} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList803 = [STRes802|STResList802],
+  ?line ITRes802 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S802),
+  ITResList803 = [ITRes802|ITResList802],
+
+
+  ?line {STRes803,S803} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_Name.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList804 = [STRes803|STResList803],
+  ?line ITRes803 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_Name.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S803),
+  ITResList804 = [ITRes803|ITResList803],
+
+
+  ?line {STRes804,S804} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_NCName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList805 = [STRes804|STResList804],
+  ?line ITRes804 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_NCName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S804),
+  ITResList805 = [ITRes804|ITResList804],
+
+
+  ?line {STRes805,S805} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_ID.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList806 = [STRes805|STResList805],
+  ?line ITRes805 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_ID.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S805),
+  ITResList806 = [ITRes805|ITResList805],
+
+
+  ?line {STRes806,S806} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_IDREF.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList807 = [STRes806|STResList806],
+  ?line ITRes806 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_IDREF.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S806),
+  ITResList807 = [ITRes806|ITResList806],
+
+
+  ?line {STRes807,S807} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_IDREFS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList808 = [STRes807|STResList807],
+  ?line ITRes807 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_IDREFS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S807),
+  ITResList808 = [ITRes807|ITResList807],
+
+
+  ?line {STRes808,S808} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList809 = [STRes808|STResList808],
+  ?line ITRes808 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S808),
+  ITResList809 = [ITRes808|ITResList808],
+
+
+  ?line {STRes809,S809} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList810 = [STRes809|STResList809],
+  ?line ITRes809 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S809),
+  ITResList810 = [ITRes809|ITResList809],
+
+
+  ?line {STRes810,S810} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList811 = [STRes810|STResList810],
+  ?line ITRes810 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S810),
+  ITResList811 = [ITRes810|ITResList810],
+
+
+  ?line {STRes811,S811} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_QName.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList812 = [STRes811|STResList811],
+  ?line ITRes811 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_QName.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S811),
+  ITResList812 = [ITRes811|ITResList811],
+
+
+  ?line {STRes812,S812} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_NOTATION.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList813 = [STRes812|STResList812],
+  ?line ITRes812 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_NOTATION.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S812),
+  ITResList813 = [ITRes812|ITResList812],
+
+
+  ?line {STRes813,S813} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList814 = [STRes813|STResList813],
+  ?line ITRes813 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S813),
+  ITResList814 = [ITRes813|ITResList813],
+
+
+  ?line {STRes814,S814} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_dateTime.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList815 = [STRes814|STResList814],
+  ?line ITRes814 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_dateTime.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S814),
+  ITResList815 = [ITRes814|ITResList814],
+
+
+  ?line {STRes815,S815} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_time.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList816 = [STRes815|STResList815],
+  ?line ITRes815 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_time.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S815),
+  ITResList816 = [ITRes815|ITResList815],
+
+
+  ?line {STRes816,S816} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_date.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList817 = [STRes816|STResList816],
+  ?line ITRes816 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_date.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S816),
+  ITResList817 = [ITRes816|ITResList816],
+
+
+  ?line {STRes817,S817} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_gYearMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList818 = [STRes817|STResList817],
+  ?line ITRes817 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_gYearMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S817),
+  ITResList818 = [ITRes817|ITResList817],
+
+
+  ?line {STRes818,S818} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_gYear.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList819 = [STRes818|STResList818],
+  ?line ITRes818 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_gYear.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S818),
+  ITResList819 = [ITRes818|ITResList818],
+
+
+  ?line {STRes819,S819} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_gMonthDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList820 = [STRes819|STResList819],
+  ?line ITRes819 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_gMonthDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S819),
+  ITResList820 = [ITRes819|ITResList819],
+
+
+  ?line {STRes820,S820} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_gDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList821 = [STRes820|STResList820],
+  ?line ITRes820 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_gDay.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S820),
+  ITResList821 = [ITRes820|ITResList820],
+
+
+  ?line {STRes821,S821} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_gMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList822 = [STRes821|STResList821],
+  ?line ITRes821 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_duration_gMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S821),
+  ITResList822 = [ITRes821|ITResList821],
+
+
+  ?line {STRes822,S822} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList823 = [STRes822|STResList822],
+  ?line ITRes822 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S822),
+  ITResList823 = [ITRes822|ITResList822],
+
+
+  ?line {STRes823,S823} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList824 = [STRes823|STResList823],
+  ?line ITRes823 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S823),
+  ITResList824 = [ITRes823|ITResList823],
+
+
+  ?line {STRes824,S824} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList825 = [STRes824|STResList824],
+  ?line ITRes824 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S824),
+  ITResList825 = [ITRes824|ITResList824],
+
+
+  ?line {STRes825,S825} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList826 = [STRes825|STResList825],
+  ?line ITRes825 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S825),
+  ITResList826 = [ITRes825|ITResList825],
+
+
+  ?line {STRes826,S826} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList827 = [STRes826|STResList826],
+  ?line ITRes826 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S826),
+  ITResList827 = [ITRes826|ITResList826],
+
+
+  ?line {STRes827,S827} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList828 = [STRes827|STResList827],
+  ?line ITRes827 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S827),
+  ITResList828 = [ITRes827|ITResList827],
+
+
+  ?line {STRes828,S828} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList829 = [STRes828|STResList828],
+  ?line ITRes828 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S828),
+  ITResList829 = [ITRes828|ITResList828],
+
+
+  ?line {STRes829,S829} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_dateTime.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList830 = [STRes829|STResList829],
+  ?line ITRes829 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_dateTime.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S829),
+  ITResList830 = [ITRes829|ITResList829],
+
+
+  ?line {STRes830,S830} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_date.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList831 = [STRes830|STResList830],
+  ?line ITRes830 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_dateTime_date.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S830),
+  ITResList831 = [ITRes830|ITResList830],
+
+
+  ?line {STRes831,S831} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList832 = [STRes831|STResList831],
+  ?line ITRes831 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S831),
+  ITResList832 = [ITRes831|ITResList831],
+
+
+  ?line {STRes832,S832} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList833 = [STRes832|STResList832],
+  ?line ITRes832 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S832),
+  ITResList833 = [ITRes832|ITResList832],
+
+
+  ?line {STRes833,S833} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList834 = [STRes833|STResList833],
+  ?line ITRes833 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S833),
+  ITResList834 = [ITRes833|ITResList833],
+
+
+  ?line {STRes834,S834} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList835 = [STRes834|STResList834],
+  ?line ITRes834 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S834),
+  ITResList835 = [ITRes834|ITResList834],
+
+
+  ?line {STRes835,S835} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList836 = [STRes835|STResList835],
+  ?line ITRes835 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S835),
+  ITResList836 = [ITRes835|ITResList835],
+
+
+  ?line {STRes836,S836} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList837 = [STRes836|STResList836],
+  ?line ITRes836 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S836),
+  ITResList837 = [ITRes836|ITResList836],
+
+
+  ?line {STRes837,S837} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList838 = [STRes837|STResList837],
+  ?line ITRes837 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S837),
+  ITResList838 = [ITRes837|ITResList837],
+
+
+  ?line {STRes838,S838} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_time.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList839 = [STRes838|STResList838],
+  ?line ITRes838 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_time_time.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S838),
+  ITResList839 = [ITRes838|ITResList838],
+
+
+  ?line {STRes839,S839} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList840 = [STRes839|STResList839],
+  ?line ITRes839 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S839),
+  ITResList840 = [ITRes839|ITResList839],
+
+
+  ?line {STRes840,S840} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList841 = [STRes840|STResList840],
+  ?line ITRes840 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S840),
+  ITResList841 = [ITRes840|ITResList840],
+
+
+  ?line {STRes841,S841} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList842 = [STRes841|STResList841],
+  ?line ITRes841 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S841),
+  ITResList842 = [ITRes841|ITResList841],
+
+
+  ?line {STRes842,S842} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList843 = [STRes842|STResList842],
+  ?line ITRes842 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S842),
+  ITResList843 = [ITRes842|ITResList842],
+
+
+  ?line {STRes843,S843} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList844 = [STRes843|STResList843],
+  ?line ITRes843 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S843),
+  ITResList844 = [ITRes843|ITResList843],
+
+
+  ?line {STRes844,S844} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList845 = [STRes844|STResList844],
+  ?line ITRes844 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S844),
+  ITResList845 = [ITRes844|ITResList844],
+
+
+  ?line {STRes845,S845} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList846 = [STRes845|STResList845],
+  ?line ITRes845 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S845),
+  ITResList846 = [ITRes845|ITResList845],
+
+
+  ?line {STRes846,S846} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_dateTime.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList847 = [STRes846|STResList846],
+  ?line ITRes846 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_dateTime.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S846),
+  ITResList847 = [ITRes846|ITResList846],
+
+
+  ?line {STRes847,S847} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_date.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList848 = [STRes847|STResList847],
+  ?line ITRes847 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_date_date.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S847),
+  ITResList848 = [ITRes847|ITResList847],
+
+
+  ?line {STRes848,S848} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList849 = [STRes848|STResList848],
+  ?line ITRes848 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S848),
+  ITResList849 = [ITRes848|ITResList848],
+
+
+  ?line {STRes849,S849} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList850 = [STRes849|STResList849],
+  ?line ITRes849 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S849),
+  ITResList850 = [ITRes849|ITResList849],
+
+
+  ?line {STRes850,S850} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList851 = [STRes850|STResList850],
+  ?line ITRes850 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S850),
+  ITResList851 = [ITRes850|ITResList850],
+
+
+  ?line {STRes851,S851} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList852 = [STRes851|STResList851],
+  ?line ITRes851 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S851),
+  ITResList852 = [ITRes851|ITResList851],
+
+
+  ?line {STRes852,S852} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList853 = [STRes852|STResList852],
+  ?line ITRes852 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S852),
+  ITResList853 = [ITRes852|ITResList852],
+
+
+  ?line {STRes853,S853} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList854 = [STRes853|STResList853],
+  ?line ITRes853 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S853),
+  ITResList854 = [ITRes853|ITResList853],
+
+
+  ?line {STRes854,S854} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList855 = [STRes854|STResList854],
+  ?line ITRes854 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S854),
+  ITResList855 = [ITRes854|ITResList854],
+
+
+  ?line {STRes855,S855} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_gYearMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList856 = [STRes855|STResList855],
+  ?line ITRes855 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYearMonth_gYearMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S855),
+  ITResList856 = [ITRes855|ITResList855],
+
+
+  ?line {STRes856,S856} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList857 = [STRes856|STResList856],
+  ?line ITRes856 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S856),
+  ITResList857 = [ITRes856|ITResList856],
+
+
+  ?line {STRes857,S857} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList858 = [STRes857|STResList857],
+  ?line ITRes857 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S857),
+  ITResList858 = [ITRes857|ITResList857],
+
+
+  ?line {STRes858,S858} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList859 = [STRes858|STResList858],
+  ?line ITRes858 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S858),
+  ITResList859 = [ITRes858|ITResList858],
+
+
+  ?line {STRes859,S859} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList860 = [STRes859|STResList859],
+  ?line ITRes859 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S859),
+  ITResList860 = [ITRes859|ITResList859],
+
+
+  ?line {STRes860,S860} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList861 = [STRes860|STResList860],
+  ?line ITRes860 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S860),
+  ITResList861 = [ITRes860|ITResList860],
+
+
+  ?line {STRes861,S861} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList862 = [STRes861|STResList861],
+  ?line ITRes861 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S861),
+  ITResList862 = [ITRes861|ITResList861],
+
+
+  ?line {STRes862,S862} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList863 = [STRes862|STResList862],
+  ?line ITRes862 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S862),
+  ITResList863 = [ITRes862|ITResList862],
+
+
+  ?line {STRes863,S863} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_gYear.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList864 = [STRes863|STResList863],
+  ?line ITRes863 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gYear_gYear.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S863),
+  ITResList864 = [ITRes863|ITResList863],
+
+
+  ?line {STRes864,S864} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList865 = [STRes864|STResList864],
+  ?line ITRes864 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S864),
+  ITResList865 = [ITRes864|ITResList864],
+
+
+  ?line {STRes865,S865} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList866 = [STRes865|STResList865],
+  ?line ITRes865 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S865),
+  ITResList866 = [ITRes865|ITResList865],
+
+
+  ?line {STRes866,S866} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList867 = [STRes866|STResList866],
+  ?line ITRes866 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S866),
+  ITResList867 = [ITRes866|ITResList866],
+
+
+  ?line {STRes867,S867} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList868 = [STRes867|STResList867],
+  ?line ITRes867 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S867),
+  ITResList868 = [ITRes867|ITResList867],
+
+
+  ?line {STRes868,S868} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList869 = [STRes868|STResList868],
+  ?line ITRes868 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S868),
+  ITResList869 = [ITRes868|ITResList868],
+
+
+  ?line {STRes869,S869} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList870 = [STRes869|STResList869],
+  ?line ITRes869 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S869),
+  ITResList870 = [ITRes869|ITResList869],
+
+
+  ?line {STRes870,S870} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList871 = [STRes870|STResList870],
+  ?line ITRes870 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S870),
+  ITResList871 = [ITRes870|ITResList870],
+
+
+  ?line {STRes871,S871} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_gMonthDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList872 = [STRes871|STResList871],
+  ?line ITRes871 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonthDay_gMonthDay.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S871),
+  ITResList872 = [ITRes871|ITResList871],
+
+
+  ?line {STRes872,S872} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList873 = [STRes872|STResList872],
+  ?line ITRes872 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S872),
+  ITResList873 = [ITRes872|ITResList872],
+
+
+  ?line {STRes873,S873} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList874 = [STRes873|STResList873],
+  ?line ITRes873 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S873),
+  ITResList874 = [ITRes873|ITResList873],
+
+
+  ?line {STRes874,S874} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList875 = [STRes874|STResList874],
+  ?line ITRes874 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S874),
+  ITResList875 = [ITRes874|ITResList874],
+
+
+  ?line {STRes875,S875} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList876 = [STRes875|STResList875],
+  ?line ITRes875 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S875),
+  ITResList876 = [ITRes875|ITResList875],
+
+
+  ?line {STRes876,S876} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList877 = [STRes876|STResList876],
+  ?line ITRes876 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S876),
+  ITResList877 = [ITRes876|ITResList876],
+
+
+  ?line {STRes877,S877} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList878 = [STRes877|STResList877],
+  ?line ITRes877 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S877),
+  ITResList878 = [ITRes877|ITResList877],
+
+
+  ?line {STRes878,S878} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList879 = [STRes878|STResList878],
+  ?line ITRes878 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S878),
+  ITResList879 = [ITRes878|ITResList878],
+
+
+  ?line {STRes879,S879} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_gDay.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList880 = [STRes879|STResList879],
+  ?line ITRes879 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gDay_gDay.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S879),
+  ITResList880 = [ITRes879|ITResList879],
+
+
+  ?line {STRes880,S880} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_string.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList881 = [STRes880|STResList880],
+  ?line ITRes880 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_string.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S880),
+  ITResList881 = [ITRes880|ITResList880],
+
+
+  ?line {STRes881,S881} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_normalizedString.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList882 = [STRes881|STResList881],
+  ?line ITRes881 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_normalizedString.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S881),
+  ITResList882 = [ITRes881|ITResList881],
+
+
+  ?line {STRes882,S882} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_token.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList883 = [STRes882|STResList882],
+  ?line ITRes882 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_token.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S882),
+  ITResList883 = [ITRes882|ITResList882],
+
+
+  ?line {STRes883,S883} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_NMTOKEN.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList884 = [STRes883|STResList883],
+  ?line ITRes883 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_NMTOKEN.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S883),
+  ITResList884 = [ITRes883|ITResList883],
+
+
+  ?line {STRes884,S884} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_NMTOKENS.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList885 = [STRes884|STResList884],
+  ?line ITRes884 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_NMTOKENS.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S884),
+  ITResList885 = [ITRes884|ITResList884],
+
+
+  ?line {STRes885,S885} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_anyURI.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList886 = [STRes885|STResList885],
+  ?line ITRes885 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_anyURI.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S885),
+  ITResList886 = [ITRes885|ITResList885],
+
+
+  ?line {STRes886,S886} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_duration.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList887 = [STRes886|STResList886],
+  ?line ITRes886 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_duration.xml','./msxsdtest/identityConstraint/idc_datatypes',invalid,S886),
+  ITResList887 = [ITRes886|ITResList886],
+
+
+  ?line {STRes887,S887} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_gMonth.xsd','./msxsdtest/identityConstraint/idc_datatypes',valid),
+  STResList888 = [STRes887|STResList887],
+  ?line ITRes887 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idc_datatypes/idc_gMonth_gMonth.xml','./msxsdtest/identityConstraint/idc_datatypes',valid,S887),
+  ITResList888 = [ITRes887|ITResList887],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList888,ITResList888).
+
+%% Identity-constraint Definition Schema Component.
+%% Identity-constraint Validation Rules.
+%% Selector identity-constraint xpath bnf.
+%% Field identity-constraint xpath bnf.
+%% XPath validation.
+%% Bug Regressions
+
+id(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA001.xsd','./msxsdtest/identityConstraint',valid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA002.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA003.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA004.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA005.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA006.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA007.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA008.xsd','./msxsdtest/identityConstraint',valid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA010.xsd','./msxsdtest/identityConstraint',valid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA011.xsd','./msxsdtest/identityConstraint',valid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA012.xsd','./msxsdtest/identityConstraint',valid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA013.xsd','./msxsdtest/identityConstraint',valid),
+  STResList13 = [STRes12|STResList12],
+
+
+  ?line {STRes13,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA014.xsd','./msxsdtest/identityConstraint',valid),
+  STResList14 = [STRes13|STResList13],
+
+
+  ?line {STRes14,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA015.xsd','./msxsdtest/identityConstraint',valid),
+  STResList15 = [STRes14|STResList14],
+
+
+  ?line {STRes15,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA016.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList16 = [STRes15|STResList15],
+
+
+  ?line {STRes16,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA017.xsd','./msxsdtest/identityConstraint',valid),
+  STResList17 = [STRes16|STResList16],
+
+
+  ?line {STRes17,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA018.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList18 = [STRes17|STResList17],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA019.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA020.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA021.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA022.xsd','./msxsdtest/identityConstraint',valid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA023.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA024.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA025.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA026.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA027.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA028.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA029.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA030.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA031.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA032.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA033.xsd','./msxsdtest/identityConstraint',valid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA034.xsd','./msxsdtest/identityConstraint',valid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA035.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA036.xsd','./msxsdtest/identityConstraint',valid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA037.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA038.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA039.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA040.xsd','./msxsdtest/identityConstraint',valid),
+  STResList40 = [STRes39|STResList39],
+
+
+  ?line {STRes40,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA041.xsd','./msxsdtest/identityConstraint',valid),
+  STResList41 = [STRes40|STResList40],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA042.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA043.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList43 = [STRes42|STResList42],
+
+
+  ?line {STRes43,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA044.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList44 = [STRes43|STResList43],
+
+
+  ?line {STRes44,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA045.xsd','./msxsdtest/identityConstraint',valid),
+  STResList45 = [STRes44|STResList44],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA046.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA047.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList47 = [STRes46|STResList46],
+
+
+  ?line {STRes47,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA048.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList48 = [STRes47|STResList47],
+
+
+  ?line {STRes48,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA049.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList49 = [STRes48|STResList48],
+
+
+  ?line {STRes49,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA050.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList50 = [STRes49|STResList49],
+
+
+  ?line {STRes50,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA051.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList51 = [STRes50|STResList50],
+
+
+  ?line {STRes51,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA052.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList52 = [STRes51|STResList51],
+
+
+  ?line {STRes52,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA053.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList53 = [STRes52|STResList52],
+
+
+  ?line {STRes53,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA054.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList54 = [STRes53|STResList53],
+
+
+  ?line {STRes54,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA055.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList55 = [STRes54|STResList54],
+
+
+  ?line {STRes55,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA056.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList56 = [STRes55|STResList55],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA057.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA058.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList58 = [STRes57|STResList57],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA059.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idA060.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList60 = [STRes59|STResList59],
+
+
+  ?line {STRes60,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB001.xsd','./msxsdtest/identityConstraint',valid),
+  STResList61 = [STRes60|STResList60],
+
+
+  ?line {STRes61,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB002.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList62 = [STRes61|STResList61],
+
+
+  ?line {STRes62,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB003.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList63 = [STRes62|STResList62],
+
+
+  ?line {STRes63,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB004.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList64 = [STRes63|STResList63],
+
+
+  ?line {STRes64,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB005.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList65 = [STRes64|STResList64],
+
+
+  ?line {STRes65,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB006.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList66 = [STRes65|STResList65],
+
+
+  ?line {STRes66,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB007.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList67 = [STRes66|STResList66],
+
+
+  ?line {STRes67,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB008.xsd','./msxsdtest/identityConstraint',valid),
+  STResList68 = [STRes67|STResList67],
+
+
+  ?line {STRes68,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList69 = [STRes68|STResList68],
+
+
+  ?line {STRes69,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB010.xsd','./msxsdtest/identityConstraint',valid),
+  STResList70 = [STRes69|STResList69],
+
+
+  ?line {STRes70,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB011.xsd','./msxsdtest/identityConstraint',valid),
+  STResList71 = [STRes70|STResList70],
+
+
+  ?line {STRes71,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB012.xsd','./msxsdtest/identityConstraint',valid),
+  STResList72 = [STRes71|STResList71],
+
+
+  ?line {STRes72,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB013.xsd','./msxsdtest/identityConstraint',valid),
+  STResList73 = [STRes72|STResList72],
+
+
+  ?line {STRes73,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB014.xsd','./msxsdtest/identityConstraint',valid),
+  STResList74 = [STRes73|STResList73],
+
+
+  ?line {STRes74,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB015.xsd','./msxsdtest/identityConstraint',valid),
+  STResList75 = [STRes74|STResList74],
+
+
+  ?line {STRes75,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB016.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList76 = [STRes75|STResList75],
+
+
+  ?line {STRes76,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB017.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList77 = [STRes76|STResList76],
+
+
+  ?line {STRes77,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB018.xsd','./msxsdtest/identityConstraint',valid),
+  STResList78 = [STRes77|STResList77],
+
+
+  ?line {STRes78,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB019.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList79 = [STRes78|STResList78],
+
+
+  ?line {STRes79,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB020.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList80 = [STRes79|STResList79],
+
+
+  ?line {STRes80,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB021.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList81 = [STRes80|STResList80],
+
+
+  ?line {STRes81,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB022.xsd','./msxsdtest/identityConstraint',valid),
+  STResList82 = [STRes81|STResList81],
+
+
+  ?line {STRes82,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB023.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList83 = [STRes82|STResList82],
+
+
+  ?line {STRes83,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB024.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList84 = [STRes83|STResList83],
+
+
+  ?line {STRes84,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB025.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList85 = [STRes84|STResList84],
+
+
+  ?line {STRes85,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB026.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList86 = [STRes85|STResList85],
+
+
+  ?line {STRes86,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB027.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList87 = [STRes86|STResList86],
+
+
+  ?line {STRes87,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB028.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList88 = [STRes87|STResList87],
+
+
+  ?line {STRes88,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB029.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList89 = [STRes88|STResList88],
+
+
+  ?line {STRes89,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB030.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList90 = [STRes89|STResList89],
+
+
+  ?line {STRes90,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB031.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList91 = [STRes90|STResList90],
+
+
+  ?line {STRes91,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB032.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList92 = [STRes91|STResList91],
+
+
+  ?line {STRes92,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB033.xsd','./msxsdtest/identityConstraint',valid),
+  STResList93 = [STRes92|STResList92],
+
+
+  ?line {STRes93,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB034.xsd','./msxsdtest/identityConstraint',valid),
+  STResList94 = [STRes93|STResList93],
+
+
+  ?line {STRes94,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB035.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList95 = [STRes94|STResList94],
+
+
+  ?line {STRes95,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB036.xsd','./msxsdtest/identityConstraint',valid),
+  STResList96 = [STRes95|STResList95],
+
+
+  ?line {STRes96,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB037.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList97 = [STRes96|STResList96],
+
+
+  ?line {STRes97,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB038.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList98 = [STRes97|STResList97],
+
+
+  ?line {STRes98,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB039.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList99 = [STRes98|STResList98],
+
+
+  ?line {STRes99,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB040.xsd','./msxsdtest/identityConstraint',valid),
+  STResList100 = [STRes99|STResList99],
+
+
+  ?line {STRes100,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB041.xsd','./msxsdtest/identityConstraint',valid),
+  STResList101 = [STRes100|STResList100],
+
+
+  ?line {STRes101,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB042.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList102 = [STRes101|STResList101],
+
+
+  ?line {STRes102,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB043.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList103 = [STRes102|STResList102],
+
+
+  ?line {STRes103,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB044.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList104 = [STRes103|STResList103],
+
+
+  ?line {STRes104,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB045.xsd','./msxsdtest/identityConstraint',valid),
+  STResList105 = [STRes104|STResList104],
+
+
+  ?line {STRes105,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB046.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList106 = [STRes105|STResList105],
+
+
+  ?line {STRes106,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB047.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList107 = [STRes106|STResList106],
+
+
+  ?line {STRes107,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB048.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList108 = [STRes107|STResList107],
+
+
+  ?line {STRes108,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB049.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList109 = [STRes108|STResList108],
+
+
+  ?line {STRes109,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB050.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList110 = [STRes109|STResList109],
+
+
+  ?line {STRes110,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB051.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList111 = [STRes110|STResList110],
+
+
+  ?line {STRes111,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB052.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList112 = [STRes111|STResList111],
+
+
+  ?line {STRes112,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB053.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList113 = [STRes112|STResList112],
+
+
+  ?line {STRes113,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB054.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList114 = [STRes113|STResList113],
+
+
+  ?line {STRes114,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB055.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList115 = [STRes114|STResList114],
+
+
+  ?line {STRes115,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB056.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList116 = [STRes115|STResList115],
+
+
+  ?line {STRes116,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB057.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList117 = [STRes116|STResList116],
+
+
+  ?line {STRes117,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB058.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList118 = [STRes117|STResList117],
+
+
+  ?line {STRes118,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB059.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList119 = [STRes118|STResList118],
+
+
+  ?line {STRes119,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idB060.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList120 = [STRes119|STResList119],
+
+
+  ?line {STRes120,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC001.xsd','./msxsdtest/identityConstraint',valid),
+  STResList121 = [STRes120|STResList120],
+
+
+  ?line {STRes121,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC002.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList122 = [STRes121|STResList121],
+
+
+  ?line {STRes122,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC003.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList123 = [STRes122|STResList122],
+
+
+  ?line {STRes123,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC004.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList124 = [STRes123|STResList123],
+
+
+  ?line {STRes124,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC005.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList125 = [STRes124|STResList124],
+
+
+  ?line {STRes125,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC006.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList126 = [STRes125|STResList125],
+
+
+  ?line {STRes126,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC007.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList127 = [STRes126|STResList126],
+
+
+  ?line {STRes127,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC008.xsd','./msxsdtest/identityConstraint',valid),
+  STResList128 = [STRes127|STResList127],
+
+
+  ?line {STRes128,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList129 = [STRes128|STResList128],
+
+
+  ?line {STRes129,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC010.xsd','./msxsdtest/identityConstraint',valid),
+  STResList130 = [STRes129|STResList129],
+
+
+  ?line {STRes130,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC011.xsd','./msxsdtest/identityConstraint',valid),
+  STResList131 = [STRes130|STResList130],
+
+
+  ?line {STRes131,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC012.xsd','./msxsdtest/identityConstraint',valid),
+  STResList132 = [STRes131|STResList131],
+
+
+  ?line {STRes132,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC013.xsd','./msxsdtest/identityConstraint',valid),
+  STResList133 = [STRes132|STResList132],
+
+
+  ?line {STRes133,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC014.xsd','./msxsdtest/identityConstraint',valid),
+  STResList134 = [STRes133|STResList133],
+
+
+  ?line {STRes134,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC015.xsd','./msxsdtest/identityConstraint',valid),
+  STResList135 = [STRes134|STResList134],
+
+
+  ?line {STRes135,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC016.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList136 = [STRes135|STResList135],
+
+
+  ?line {STRes136,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC017.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList137 = [STRes136|STResList136],
+
+
+  ?line {STRes137,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC018.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList138 = [STRes137|STResList137],
+
+
+  ?line {STRes138,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC019.xsd','./msxsdtest/identityConstraint',valid),
+  STResList139 = [STRes138|STResList138],
+
+
+  ?line {STRes139,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC020.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList140 = [STRes139|STResList139],
+
+
+  ?line {STRes140,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC021.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList141 = [STRes140|STResList140],
+
+
+  ?line {STRes141,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC022.xsd','./msxsdtest/identityConstraint',valid),
+  STResList142 = [STRes141|STResList141],
+
+
+  ?line {STRes142,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC023.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList143 = [STRes142|STResList142],
+
+
+  ?line {STRes143,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC024.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList144 = [STRes143|STResList143],
+
+
+  ?line {STRes144,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC025.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList145 = [STRes144|STResList144],
+
+
+  ?line {STRes145,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC026.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList146 = [STRes145|STResList145],
+
+
+  ?line {STRes146,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC027.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList147 = [STRes146|STResList146],
+
+
+  ?line {STRes147,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC028.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList148 = [STRes147|STResList147],
+
+
+  ?line {STRes148,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC029.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList149 = [STRes148|STResList148],
+
+
+  ?line {STRes149,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC030.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList150 = [STRes149|STResList149],
+
+
+  ?line {STRes150,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC031.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList151 = [STRes150|STResList150],
+
+
+  ?line {STRes151,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC032.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList152 = [STRes151|STResList151],
+
+
+  ?line {STRes152,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC033.xsd','./msxsdtest/identityConstraint',valid),
+  STResList153 = [STRes152|STResList152],
+
+
+  ?line {STRes153,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC034.xsd','./msxsdtest/identityConstraint',valid),
+  STResList154 = [STRes153|STResList153],
+
+
+  ?line {STRes154,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC035.xsd','./msxsdtest/identityConstraint',valid),
+  STResList155 = [STRes154|STResList154],
+
+
+  ?line {STRes155,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC036.xsd','./msxsdtest/identityConstraint',valid),
+  STResList156 = [STRes155|STResList155],
+
+
+  ?line {STRes156,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC038.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList157 = [STRes156|STResList156],
+
+
+  ?line {STRes157,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC039.xsd','./msxsdtest/identityConstraint',valid),
+  STResList158 = [STRes157|STResList157],
+
+
+  ?line {STRes158,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC040.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList159 = [STRes158|STResList158],
+
+
+  ?line {STRes159,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC041.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList160 = [STRes159|STResList159],
+
+
+  ?line {STRes160,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC042.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList161 = [STRes160|STResList160],
+
+
+  ?line {STRes161,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC043.xsd','./msxsdtest/identityConstraint',valid),
+  STResList162 = [STRes161|STResList161],
+
+
+  ?line {STRes162,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC044.xsd','./msxsdtest/identityConstraint',valid),
+  STResList163 = [STRes162|STResList162],
+
+
+  ?line {STRes163,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC045.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList164 = [STRes163|STResList163],
+
+
+  ?line {STRes164,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC046.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList165 = [STRes164|STResList164],
+
+
+  ?line {STRes165,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC047.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList166 = [STRes165|STResList165],
+
+
+  ?line {STRes166,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC048.xsd','./msxsdtest/identityConstraint',valid),
+  STResList167 = [STRes166|STResList166],
+
+
+  ?line {STRes167,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC049.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList168 = [STRes167|STResList167],
+
+
+  ?line {STRes168,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC050.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList169 = [STRes168|STResList168],
+
+
+  ?line {STRes169,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC051.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList170 = [STRes169|STResList169],
+
+
+  ?line {STRes170,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC052.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList171 = [STRes170|STResList170],
+
+
+  ?line {STRes171,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC053.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList172 = [STRes171|STResList171],
+
+
+  ?line {STRes172,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC054.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList173 = [STRes172|STResList172],
+
+
+  ?line {STRes173,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC055.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList174 = [STRes173|STResList173],
+
+
+  ?line {STRes174,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC056.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList175 = [STRes174|STResList174],
+
+
+  ?line {STRes175,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC057.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList176 = [STRes175|STResList175],
+
+
+  ?line {STRes176,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC058.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList177 = [STRes176|STResList176],
+
+
+  ?line {STRes177,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC059.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList178 = [STRes177|STResList177],
+
+
+  ?line {STRes178,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC060.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList179 = [STRes178|STResList178],
+
+
+  ?line {STRes179,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC061.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList180 = [STRes179|STResList179],
+
+
+  ?line {STRes180,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC062.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList181 = [STRes180|STResList180],
+
+
+  ?line {STRes181,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idC063.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList182 = [STRes181|STResList181],
+
+
+  ?line {STRes182,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD001.xsd','./msxsdtest/identityConstraint',valid),
+  STResList183 = [STRes182|STResList182],
+
+
+  ?line {STRes183,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD002.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList184 = [STRes183|STResList183],
+
+
+  ?line {STRes184,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD003.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList185 = [STRes184|STResList184],
+
+
+  ?line {STRes185,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD004.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList186 = [STRes185|STResList185],
+
+
+  ?line {STRes186,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD005.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList187 = [STRes186|STResList186],
+
+
+  ?line {STRes187,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD006.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList188 = [STRes187|STResList187],
+
+
+  ?line {STRes188,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD007.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList189 = [STRes188|STResList188],
+
+
+  ?line {STRes189,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD008.xsd','./msxsdtest/identityConstraint',valid),
+  STResList190 = [STRes189|STResList189],
+
+
+  ?line {STRes190,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList191 = [STRes190|STResList190],
+
+
+  ?line {STRes191,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD010.xsd','./msxsdtest/identityConstraint',valid),
+  STResList192 = [STRes191|STResList191],
+
+
+  ?line {STRes192,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD011.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList193 = [STRes192|STResList192],
+
+
+  ?line {STRes193,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD012.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList194 = [STRes193|STResList193],
+
+
+  ?line {STRes194,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD013.xsd','./msxsdtest/identityConstraint',valid),
+  STResList195 = [STRes194|STResList194],
+
+
+  ?line {STRes195,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD014.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList196 = [STRes195|STResList195],
+
+
+  ?line {STRes196,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD015.xsd','./msxsdtest/identityConstraint',valid),
+  STResList197 = [STRes196|STResList196],
+
+
+  ?line {STRes197,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD016.xsd','./msxsdtest/identityConstraint',valid),
+  STResList198 = [STRes197|STResList197],
+
+
+  ?line {STRes198,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD017.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList199 = [STRes198|STResList198],
+
+
+  ?line {STRes199,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD018.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList200 = [STRes199|STResList199],
+
+
+  ?line {STRes200,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD019.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList201 = [STRes200|STResList200],
+
+
+  ?line {STRes201,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD020.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList202 = [STRes201|STResList201],
+
+
+  ?line {STRes202,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD021.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList203 = [STRes202|STResList202],
+
+
+  ?line {STRes203,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD022.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList204 = [STRes203|STResList203],
+
+
+  ?line {STRes204,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD023.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList205 = [STRes204|STResList204],
+
+
+  ?line {STRes205,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD024.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList206 = [STRes205|STResList205],
+
+
+  ?line {STRes206,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD025.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList207 = [STRes206|STResList206],
+
+
+  ?line {STRes207,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD026.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList208 = [STRes207|STResList207],
+
+
+  ?line {STRes208,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD027.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList209 = [STRes208|STResList208],
+
+
+  ?line {STRes209,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD028.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList210 = [STRes209|STResList209],
+
+
+  ?line {STRes210,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD029.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList211 = [STRes210|STResList210],
+
+
+  ?line {STRes211,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD030.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList212 = [STRes211|STResList211],
+
+
+  ?line {STRes212,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD031.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList213 = [STRes212|STResList212],
+
+
+  ?line {STRes213,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD032.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList214 = [STRes213|STResList213],
+
+
+  ?line {STRes214,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idD033.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList215 = [STRes214|STResList214],
+
+
+  ?line {STRes215,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE001.xsd','./msxsdtest/identityConstraint',valid),
+  STResList216 = [STRes215|STResList215],
+
+
+  ?line {STRes216,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE002.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList217 = [STRes216|STResList216],
+
+
+  ?line {STRes217,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE003.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList218 = [STRes217|STResList217],
+
+
+  ?line {STRes218,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE004.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList219 = [STRes218|STResList218],
+
+
+  ?line {STRes219,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE005.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList220 = [STRes219|STResList219],
+
+
+  ?line {STRes220,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE006.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList221 = [STRes220|STResList220],
+
+
+  ?line {STRes221,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE007.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList222 = [STRes221|STResList221],
+
+
+  ?line {STRes222,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE008.xsd','./msxsdtest/identityConstraint',valid),
+  STResList223 = [STRes222|STResList222],
+
+
+  ?line {STRes223,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList224 = [STRes223|STResList223],
+
+
+  ?line {STRes224,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE010.xsd','./msxsdtest/identityConstraint',valid),
+  STResList225 = [STRes224|STResList224],
+
+
+  ?line {STRes225,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE011.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList226 = [STRes225|STResList225],
+
+
+  ?line {STRes226,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE012.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList227 = [STRes226|STResList226],
+
+
+  ?line {STRes227,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE013.xsd','./msxsdtest/identityConstraint',valid),
+  STResList228 = [STRes227|STResList227],
+
+
+  ?line {STRes228,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE014.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList229 = [STRes228|STResList228],
+
+
+  ?line {STRes229,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE015.xsd','./msxsdtest/identityConstraint',valid),
+  STResList230 = [STRes229|STResList229],
+
+
+  ?line {STRes230,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE016.xsd','./msxsdtest/identityConstraint',valid),
+  STResList231 = [STRes230|STResList230],
+
+
+  ?line {STRes231,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE017.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList232 = [STRes231|STResList231],
+
+
+  ?line {STRes232,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE018.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList233 = [STRes232|STResList232],
+
+
+  ?line {STRes233,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE019.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList234 = [STRes233|STResList233],
+
+
+  ?line {STRes234,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE020.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList235 = [STRes234|STResList234],
+
+
+  ?line {STRes235,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE021.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList236 = [STRes235|STResList235],
+
+
+  ?line {STRes236,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE022.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList237 = [STRes236|STResList236],
+
+
+  ?line {STRes237,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE023.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList238 = [STRes237|STResList237],
+
+
+  ?line {STRes238,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE024.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList239 = [STRes238|STResList238],
+
+
+  ?line {STRes239,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE025.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList240 = [STRes239|STResList239],
+
+
+  ?line {STRes240,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE026.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList241 = [STRes240|STResList240],
+
+
+  ?line {STRes241,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE027.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList242 = [STRes241|STResList241],
+
+
+  ?line {STRes242,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE028.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList243 = [STRes242|STResList242],
+
+
+  ?line {STRes243,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE029.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList244 = [STRes243|STResList243],
+
+
+  ?line {STRes244,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE030.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList245 = [STRes244|STResList244],
+
+
+  ?line {STRes245,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE031.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList246 = [STRes245|STResList245],
+
+
+  ?line {STRes246,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE032.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList247 = [STRes246|STResList246],
+
+
+  ?line {STRes247,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idE033.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList248 = [STRes247|STResList247],
+
+
+  ?line {STRes248,S248} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF001.xsd','./msxsdtest/identityConstraint',valid),
+  STResList249 = [STRes248|STResList248],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF001.xml','./msxsdtest/identityConstraint',valid,S248),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes249,S249} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF003.xsd','./msxsdtest/identityConstraint',valid),
+  STResList250 = [STRes249|STResList249],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF003.xml','./msxsdtest/identityConstraint',valid,S249),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes250,S250} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF004.xsd','./msxsdtest/identityConstraint',valid),
+  STResList251 = [STRes250|STResList250],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF004.xml','./msxsdtest/identityConstraint',valid,S250),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes251,S251} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF005.xsd','./msxsdtest/identityConstraint',valid),
+  STResList252 = [STRes251|STResList251],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF005.xml','./msxsdtest/identityConstraint',invalid,S251),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes252,S252} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF006.xsd','./msxsdtest/identityConstraint',valid),
+  STResList253 = [STRes252|STResList252],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF006.xml','./msxsdtest/identityConstraint',invalid,S252),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes253,S253} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF007.xsd','./msxsdtest/identityConstraint',valid),
+  STResList254 = [STRes253|STResList253],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF007.xml','./msxsdtest/identityConstraint',valid,S253),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes254,S254} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF008.xsd','./msxsdtest/identityConstraint',valid),
+  STResList255 = [STRes254|STResList254],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF008.xml','./msxsdtest/identityConstraint',invalid,S254),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes255,S255} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList256 = [STRes255|STResList255],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF009.xml','./msxsdtest/identityConstraint',valid,S255),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes256,S256} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF010.xsd','./msxsdtest/identityConstraint',valid),
+  STResList257 = [STRes256|STResList256],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF010.xml','./msxsdtest/identityConstraint',invalid,S256),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes257,S257} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF011.xsd','./msxsdtest/identityConstraint',valid),
+  STResList258 = [STRes257|STResList257],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF011.xml','./msxsdtest/identityConstraint',valid,S257),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes258,S258} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF012.xsd','./msxsdtest/identityConstraint',valid),
+  STResList259 = [STRes258|STResList258],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF012.xml','./msxsdtest/identityConstraint',valid,S258),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes259,S259} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF013.xsd','./msxsdtest/identityConstraint',valid),
+  STResList260 = [STRes259|STResList259],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF013.xml','./msxsdtest/identityConstraint',valid,S259),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes260,S260} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF014.xsd','./msxsdtest/identityConstraint',valid),
+  STResList261 = [STRes260|STResList260],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF014.xml','./msxsdtest/identityConstraint',valid,S260),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes261,S261} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF015.xsd','./msxsdtest/identityConstraint',valid),
+  STResList262 = [STRes261|STResList261],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF015.xml','./msxsdtest/identityConstraint',invalid,S261),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes262,S262} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF016.xsd','./msxsdtest/identityConstraint',valid),
+  STResList263 = [STRes262|STResList262],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF016.xml','./msxsdtest/identityConstraint',invalid,S262),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes263,S263} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF017.xsd','./msxsdtest/identityConstraint',valid),
+  STResList264 = [STRes263|STResList263],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF017.xml','./msxsdtest/identityConstraint',invalid,S263),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes264,S264} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF018.xsd','./msxsdtest/identityConstraint',valid),
+  STResList265 = [STRes264|STResList264],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF018.xml','./msxsdtest/identityConstraint',invalid,S264),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes265,S265} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF019.xsd','./msxsdtest/identityConstraint',valid),
+  STResList266 = [STRes265|STResList265],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF019.xml','./msxsdtest/identityConstraint',valid,S265),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes266,S266} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF020.xsd','./msxsdtest/identityConstraint',valid),
+  STResList267 = [STRes266|STResList266],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF020.xml','./msxsdtest/identityConstraint',valid,S266),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes267,S267} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF021.xsd','./msxsdtest/identityConstraint',valid),
+  STResList268 = [STRes267|STResList267],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF021.xml','./msxsdtest/identityConstraint',valid,S267),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes268,S268} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF022.xsd','./msxsdtest/identityConstraint',valid),
+  STResList269 = [STRes268|STResList268],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF022.xml','./msxsdtest/identityConstraint',valid,S268),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes269,S269} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF023.xsd','./msxsdtest/identityConstraint',valid),
+  STResList270 = [STRes269|STResList269],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF023.xml','./msxsdtest/identityConstraint',valid,S269),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes270,S270} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF024.xsd','./msxsdtest/identityConstraint',valid),
+  STResList271 = [STRes270|STResList270],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF024.xml','./msxsdtest/identityConstraint',valid,S270),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes271,S271} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF025.xsd','./msxsdtest/identityConstraint',valid),
+  STResList272 = [STRes271|STResList271],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF025.xml','./msxsdtest/identityConstraint',valid,S271),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes272,S272} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF026.xsd','./msxsdtest/identityConstraint',valid),
+  STResList273 = [STRes272|STResList272],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF026.xml','./msxsdtest/identityConstraint',valid,S272),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes273,S273} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF027.xsd','./msxsdtest/identityConstraint',valid),
+  STResList274 = [STRes273|STResList273],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF027.xml','./msxsdtest/identityConstraint',valid,S273),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes274,S274} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF028.xsd','./msxsdtest/identityConstraint',valid),
+  STResList275 = [STRes274|STResList274],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF028.xml','./msxsdtest/identityConstraint',valid,S274),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes275,S275} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF029.xsd','./msxsdtest/identityConstraint',valid),
+  STResList276 = [STRes275|STResList275],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF029.xml','./msxsdtest/identityConstraint',valid,S275),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes276,S276} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF030.xsd','./msxsdtest/identityConstraint',valid),
+  STResList277 = [STRes276|STResList276],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF030.xml','./msxsdtest/identityConstraint',valid,S276),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes277,S277} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF031.xsd','./msxsdtest/identityConstraint',valid),
+  STResList278 = [STRes277|STResList277],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF031.xml','./msxsdtest/identityConstraint',valid,S277),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes278,S278} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF032.xsd','./msxsdtest/identityConstraint',valid),
+  STResList279 = [STRes278|STResList278],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF032.xml','./msxsdtest/identityConstraint',valid,S278),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes279,S279} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF033.xsd','./msxsdtest/identityConstraint',valid),
+  STResList280 = [STRes279|STResList279],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF033.xml','./msxsdtest/identityConstraint',valid,S279),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes280,S280} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF034.xsd','./msxsdtest/identityConstraint',valid),
+  STResList281 = [STRes280|STResList280],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF034.xml','./msxsdtest/identityConstraint',valid,S280),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes281,S281} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF035.xsd','./msxsdtest/identityConstraint',valid),
+  STResList282 = [STRes281|STResList281],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF035.xml','./msxsdtest/identityConstraint',valid,S281),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes282,S282} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idF036.xsd','./msxsdtest/identityConstraint',valid),
+  STResList283 = [STRes282|STResList282],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idF036.xml','./msxsdtest/identityConstraint',valid,S282),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes283,S283} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG001.xsd','./msxsdtest/identityConstraint',valid),
+  STResList284 = [STRes283|STResList283],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG001.xml','./msxsdtest/identityConstraint',valid,S283),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes284,S284} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG003.xsd','./msxsdtest/identityConstraint',valid),
+  STResList285 = [STRes284|STResList284],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG003.xml','./msxsdtest/identityConstraint',invalid,S284),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes285,S285} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG004.xsd','./msxsdtest/identityConstraint',valid),
+  STResList286 = [STRes285|STResList285],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG004.xml','./msxsdtest/identityConstraint',valid,S285),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes286,S286} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG005.xsd','./msxsdtest/identityConstraint',valid),
+  STResList287 = [STRes286|STResList286],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG005.xml','./msxsdtest/identityConstraint',invalid,S286),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes287,S287} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG006.xsd','./msxsdtest/identityConstraint',valid),
+  STResList288 = [STRes287|STResList287],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG006.xml','./msxsdtest/identityConstraint',invalid,S287),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes288,S288} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG007.xsd','./msxsdtest/identityConstraint',valid),
+  STResList289 = [STRes288|STResList288],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG007.xml','./msxsdtest/identityConstraint',valid,S288),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes289,S289} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG008.xsd','./msxsdtest/identityConstraint',valid),
+  STResList290 = [STRes289|STResList289],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG008.xml','./msxsdtest/identityConstraint',invalid,S289),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes290,S290} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList291 = [STRes290|STResList290],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG009.xml','./msxsdtest/identityConstraint',invalid,S290),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes291,S291} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG010.xsd','./msxsdtest/identityConstraint',valid),
+  STResList292 = [STRes291|STResList291],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG010.xml','./msxsdtest/identityConstraint',invalid,S291),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes292,S292} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG011.xsd','./msxsdtest/identityConstraint',valid),
+  STResList293 = [STRes292|STResList292],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG011.xml','./msxsdtest/identityConstraint',invalid,S292),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes293,S293} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG012.xsd','./msxsdtest/identityConstraint',valid),
+  STResList294 = [STRes293|STResList293],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG012.xml','./msxsdtest/identityConstraint',invalid,S293),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes294,S294} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG013.xsd','./msxsdtest/identityConstraint',valid),
+  STResList295 = [STRes294|STResList294],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG013.xml','./msxsdtest/identityConstraint',valid,S294),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes295,S295} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG014.xsd','./msxsdtest/identityConstraint',valid),
+  STResList296 = [STRes295|STResList295],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG014.xml','./msxsdtest/identityConstraint',valid,S295),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes296,S296} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG015.xsd','./msxsdtest/identityConstraint',valid),
+  STResList297 = [STRes296|STResList296],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG015.xml','./msxsdtest/identityConstraint',valid,S296),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes297,S297} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG016.xsd','./msxsdtest/identityConstraint',valid),
+  STResList298 = [STRes297|STResList297],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG016.xml','./msxsdtest/identityConstraint',valid,S297),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes298,S298} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG017.xsd','./msxsdtest/identityConstraint',valid),
+  STResList299 = [STRes298|STResList298],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG017.xml','./msxsdtest/identityConstraint',valid,S298),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes299,S299} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG018.xsd','./msxsdtest/identityConstraint',valid),
+  STResList300 = [STRes299|STResList299],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG018.xml','./msxsdtest/identityConstraint',valid,S299),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes300,S300} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG019.xsd','./msxsdtest/identityConstraint',valid),
+  STResList301 = [STRes300|STResList300],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG019.xml','./msxsdtest/identityConstraint',valid,S300),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes301,S301} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG020.xsd','./msxsdtest/identityConstraint',valid),
+  STResList302 = [STRes301|STResList301],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG020.xml','./msxsdtest/identityConstraint',invalid,S301),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes302,S302} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG021.xsd','./msxsdtest/identityConstraint',valid),
+  STResList303 = [STRes302|STResList302],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG021.xml','./msxsdtest/identityConstraint',valid,S302),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes303,S303} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG022.xsd','./msxsdtest/identityConstraint',valid),
+  STResList304 = [STRes303|STResList303],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG022.xml','./msxsdtest/identityConstraint',valid,S303),
+  ITResList56 = [ITRes55|ITResList55],
+
+
+  ?line {STRes304,S304} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG023.xsd','./msxsdtest/identityConstraint',valid),
+  STResList305 = [STRes304|STResList304],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG023.xml','./msxsdtest/identityConstraint',valid,S304),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes305,S305} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG024.xsd','./msxsdtest/identityConstraint',valid),
+  STResList306 = [STRes305|STResList305],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG024.xml','./msxsdtest/identityConstraint',valid,S305),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes306,S306} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG025.xsd','./msxsdtest/identityConstraint',valid),
+  STResList307 = [STRes306|STResList306],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG025.xml','./msxsdtest/identityConstraint',invalid,S306),
+  ITResList59 = [ITRes58|ITResList58],
+
+
+  ?line {STRes307,S307} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG026.xsd','./msxsdtest/identityConstraint',valid),
+  STResList308 = [STRes307|STResList307],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG026.xml','./msxsdtest/identityConstraint',valid,S307),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes308,S308} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG027.xsd','./msxsdtest/identityConstraint',valid),
+  STResList309 = [STRes308|STResList308],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG027.xml','./msxsdtest/identityConstraint',valid,S308),
+  ITResList61 = [ITRes60|ITResList60],
+
+
+  ?line {STRes309,S309} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG028.xsd','./msxsdtest/identityConstraint',valid),
+  STResList310 = [STRes309|STResList309],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG028.xml','./msxsdtest/identityConstraint',valid,S309),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes310,S310} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG029.xsd','./msxsdtest/identityConstraint',valid),
+  STResList311 = [STRes310|STResList310],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG029.xml','./msxsdtest/identityConstraint',valid,S310),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes311,S311} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idG030.xsd','./msxsdtest/identityConstraint',valid),
+  STResList312 = [STRes311|STResList311],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idG030.xml','./msxsdtest/identityConstraint',valid,S311),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes312,S312} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH001.xsd','./msxsdtest/identityConstraint',valid),
+  STResList313 = [STRes312|STResList312],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH001.xml','./msxsdtest/identityConstraint',valid,S312),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes313,S313} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH003.xsd','./msxsdtest/identityConstraint',valid),
+  STResList314 = [STRes313|STResList313],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH003.xml','./msxsdtest/identityConstraint',valid,S313),
+  ITResList66 = [ITRes65|ITResList65],
+
+
+  ?line {STRes314,S314} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH004.xsd','./msxsdtest/identityConstraint',valid),
+  STResList315 = [STRes314|STResList314],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH004.xml','./msxsdtest/identityConstraint',valid,S314),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes315,S315} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH005.xsd','./msxsdtest/identityConstraint',valid),
+  STResList316 = [STRes315|STResList315],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH005.xml','./msxsdtest/identityConstraint',invalid,S315),
+  ITResList68 = [ITRes67|ITResList67],
+
+
+  ?line {STRes316,S316} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH006.xsd','./msxsdtest/identityConstraint',valid),
+  STResList317 = [STRes316|STResList316],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH006.xml','./msxsdtest/identityConstraint',invalid,S316),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes317,S317} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH007.xsd','./msxsdtest/identityConstraint',valid),
+  STResList318 = [STRes317|STResList317],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH007.xml','./msxsdtest/identityConstraint',valid,S317),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes318,S318} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH008.xsd','./msxsdtest/identityConstraint',valid),
+  STResList319 = [STRes318|STResList318],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH008.xml','./msxsdtest/identityConstraint',valid,S318),
+  ITResList71 = [ITRes70|ITResList70],
+
+
+  ?line {STRes319,S319} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList320 = [STRes319|STResList319],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH009.xml','./msxsdtest/identityConstraint',valid,S319),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes320,S320} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH010.xsd','./msxsdtest/identityConstraint',valid),
+  STResList321 = [STRes320|STResList320],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH010.xml','./msxsdtest/identityConstraint',invalid,S320),
+  ITResList73 = [ITRes72|ITResList72],
+
+
+  ?line {STRes321,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH011.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList322 = [STRes321|STResList321],
+
+
+  ?line {STRes322,S322} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH012.xsd','./msxsdtest/identityConstraint',valid),
+  STResList323 = [STRes322|STResList322],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH012.xml','./msxsdtest/identityConstraint',invalid,S322),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes323,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH013.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList324 = [STRes323|STResList323],
+
+
+  ?line {STRes324,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH014.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList325 = [STRes324|STResList324],
+
+
+  ?line {STRes325,S325} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH015.xsd','./msxsdtest/identityConstraint',valid),
+  STResList326 = [STRes325|STResList325],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH015.xml','./msxsdtest/identityConstraint',valid,S325),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes326,S326} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH016.xsd','./msxsdtest/identityConstraint',valid),
+  STResList327 = [STRes326|STResList326],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH016.xml','./msxsdtest/identityConstraint',valid,S326),
+  ITResList76 = [ITRes75|ITResList75],
+
+
+  ?line {STRes327,S327} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH017.xsd','./msxsdtest/identityConstraint',valid),
+  STResList328 = [STRes327|STResList327],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH017.xml','./msxsdtest/identityConstraint',valid,S327),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes328,S328} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH018.xsd','./msxsdtest/identityConstraint',valid),
+  STResList329 = [STRes328|STResList328],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH018.xml','./msxsdtest/identityConstraint',valid,S328),
+  ITResList78 = [ITRes77|ITResList77],
+
+
+  ?line {STRes329,S329} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH019.xsd','./msxsdtest/identityConstraint',valid),
+  STResList330 = [STRes329|STResList329],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH019.xml','./msxsdtest/identityConstraint',valid,S329),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes330,S330} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH020.xsd','./msxsdtest/identityConstraint',valid),
+  STResList331 = [STRes330|STResList330],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH020.xml','./msxsdtest/identityConstraint',valid,S330),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes331,S331} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH021.xsd','./msxsdtest/identityConstraint',valid),
+  STResList332 = [STRes331|STResList331],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH021.xml','./msxsdtest/identityConstraint',valid,S331),
+  ITResList81 = [ITRes80|ITResList80],
+
+
+  ?line {STRes332,S332} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH022.xsd','./msxsdtest/identityConstraint',valid),
+  STResList333 = [STRes332|STResList332],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH022.xml','./msxsdtest/identityConstraint',valid,S332),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes333,S333} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH023.xsd','./msxsdtest/identityConstraint',valid),
+  STResList334 = [STRes333|STResList333],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH023.xml','./msxsdtest/identityConstraint',valid,S333),
+  ITResList83 = [ITRes82|ITResList82],
+
+
+  ?line {STRes334,S334} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH024.xsd','./msxsdtest/identityConstraint',valid),
+  STResList335 = [STRes334|STResList334],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH024.xml','./msxsdtest/identityConstraint',valid,S334),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes335,S335} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH025.xsd','./msxsdtest/identityConstraint',valid),
+  STResList336 = [STRes335|STResList335],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH025.xml','./msxsdtest/identityConstraint',valid,S335),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes336,S336} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH026.xsd','./msxsdtest/identityConstraint',valid),
+  STResList337 = [STRes336|STResList336],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH026.xml','./msxsdtest/identityConstraint',valid,S336),
+  ITResList86 = [ITRes85|ITResList85],
+
+
+  ?line {STRes337,S337} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH027.xsd','./msxsdtest/identityConstraint',valid),
+  STResList338 = [STRes337|STResList337],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH027.xml','./msxsdtest/identityConstraint',valid,S337),
+  ITResList87 = [ITRes86|ITResList86],
+
+
+  ?line {STRes338,S338} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH028.xsd','./msxsdtest/identityConstraint',valid),
+  STResList339 = [STRes338|STResList338],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH028.xml','./msxsdtest/identityConstraint',valid,S338),
+  ITResList88 = [ITRes87|ITResList87],
+
+
+  ?line {STRes339,S339} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH029.xsd','./msxsdtest/identityConstraint',valid),
+  STResList340 = [STRes339|STResList339],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH029.xml','./msxsdtest/identityConstraint',valid,S339),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes340,S340} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH030.xsd','./msxsdtest/identityConstraint',valid),
+  STResList341 = [STRes340|STResList340],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH030.xml','./msxsdtest/identityConstraint',valid,S340),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes341,S341} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH031.xsd','./msxsdtest/identityConstraint',valid),
+  STResList342 = [STRes341|STResList341],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH031.xml','./msxsdtest/identityConstraint',valid,S341),
+  ITResList91 = [ITRes90|ITResList90],
+
+
+  ?line {STRes342,S342} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH032.xsd','./msxsdtest/identityConstraint',valid),
+  STResList343 = [STRes342|STResList342],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH032.xml','./msxsdtest/identityConstraint',valid,S342),
+  ITResList92 = [ITRes91|ITResList91],
+
+
+  ?line {STRes343,S343} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH034.xsd','./msxsdtest/identityConstraint',valid),
+  STResList344 = [STRes343|STResList343],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idH034.xml','./msxsdtest/identityConstraint',valid,S343),
+  ITResList93 = [ITRes92|ITResList92],
+
+
+  ?line {STRes344,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idH035.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList345 = [STRes344|STResList344],
+
+
+  ?line {STRes345,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI001.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList346 = [STRes345|STResList345],
+
+
+  ?line {STRes346,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI002.xsd','./msxsdtest/identityConstraint',valid),
+  STResList347 = [STRes346|STResList346],
+
+
+  ?line {STRes347,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI003.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList348 = [STRes347|STResList347],
+
+
+  ?line {STRes348,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI004.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList349 = [STRes348|STResList348],
+
+
+  ?line {STRes349,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI005.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList350 = [STRes349|STResList349],
+
+
+  ?line {STRes350,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI006.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList351 = [STRes350|STResList350],
+
+
+  ?line {STRes351,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI007.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList352 = [STRes351|STResList351],
+
+
+  ?line {STRes352,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI008.xsd','./msxsdtest/identityConstraint',valid),
+  STResList353 = [STRes352|STResList352],
+
+
+  ?line {STRes353,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList354 = [STRes353|STResList353],
+
+
+  ?line {STRes354,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI010.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList355 = [STRes354|STResList354],
+
+
+  ?line {STRes355,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI011.xsd','./msxsdtest/identityConstraint',valid),
+  STResList356 = [STRes355|STResList355],
+
+
+  ?line {STRes356,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI012.xsd','./msxsdtest/identityConstraint',valid),
+  STResList357 = [STRes356|STResList356],
+
+
+  ?line {STRes357,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI013.xsd','./msxsdtest/identityConstraint',valid),
+  STResList358 = [STRes357|STResList357],
+
+
+  ?line {STRes358,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI014.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList359 = [STRes358|STResList358],
+
+
+  ?line {STRes359,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI015.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList360 = [STRes359|STResList359],
+
+
+  ?line {STRes360,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI016.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList361 = [STRes360|STResList360],
+
+
+  ?line {STRes361,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI017.xsd','./msxsdtest/identityConstraint',valid),
+  STResList362 = [STRes361|STResList361],
+
+
+  ?line {STRes362,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI018.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList363 = [STRes362|STResList362],
+
+
+  ?line {STRes363,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI019.xsd','./msxsdtest/identityConstraint',valid),
+  STResList364 = [STRes363|STResList363],
+
+
+  ?line {STRes364,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI020.xsd','./msxsdtest/identityConstraint',valid),
+  STResList365 = [STRes364|STResList364],
+
+
+  ?line {STRes365,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI021.xsd','./msxsdtest/identityConstraint',valid),
+  STResList366 = [STRes365|STResList365],
+
+
+  ?line {STRes366,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI022.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList367 = [STRes366|STResList366],
+
+
+  ?line {STRes367,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI023.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList368 = [STRes367|STResList367],
+
+
+  ?line {STRes368,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI024.xsd','./msxsdtest/identityConstraint',valid),
+  STResList369 = [STRes368|STResList368],
+
+
+  ?line {STRes369,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI025.xsd','./msxsdtest/identityConstraint',valid),
+  STResList370 = [STRes369|STResList369],
+
+
+  ?line {STRes370,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI026.xsd','./msxsdtest/identityConstraint',valid),
+  STResList371 = [STRes370|STResList370],
+
+
+  ?line {STRes371,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI027.xsd','./msxsdtest/identityConstraint',valid),
+  STResList372 = [STRes371|STResList371],
+
+
+  ?line {STRes372,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI028.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList373 = [STRes372|STResList372],
+
+
+  ?line {STRes373,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI029.xsd','./msxsdtest/identityConstraint',valid),
+  STResList374 = [STRes373|STResList373],
+
+
+  ?line {STRes374,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI030.xsd','./msxsdtest/identityConstraint',valid),
+  STResList375 = [STRes374|STResList374],
+
+
+  ?line {STRes375,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI031.xsd','./msxsdtest/identityConstraint',valid),
+  STResList376 = [STRes375|STResList375],
+
+
+  ?line {STRes376,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI032.xsd','./msxsdtest/identityConstraint',valid),
+  STResList377 = [STRes376|STResList376],
+
+
+  ?line {STRes377,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI033.xsd','./msxsdtest/identityConstraint',valid),
+  STResList378 = [STRes377|STResList377],
+
+
+  ?line {STRes378,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI034.xsd','./msxsdtest/identityConstraint',valid),
+  STResList379 = [STRes378|STResList378],
+
+
+  ?line {STRes379,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI035.xsd','./msxsdtest/identityConstraint',valid),
+  STResList380 = [STRes379|STResList379],
+
+
+  ?line {STRes380,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI036.xsd','./msxsdtest/identityConstraint',valid),
+  STResList381 = [STRes380|STResList380],
+
+
+  ?line {STRes381,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI037.xsd','./msxsdtest/identityConstraint',valid),
+  STResList382 = [STRes381|STResList381],
+
+
+  ?line {STRes382,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI038.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList383 = [STRes382|STResList382],
+
+
+  ?line {STRes383,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI039.xsd','./msxsdtest/identityConstraint',valid),
+  STResList384 = [STRes383|STResList383],
+
+
+  ?line {STRes384,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI040.xsd','./msxsdtest/identityConstraint',valid),
+  STResList385 = [STRes384|STResList384],
+
+
+  ?line {STRes385,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI041.xsd','./msxsdtest/identityConstraint',valid),
+  STResList386 = [STRes385|STResList385],
+
+
+  ?line {STRes386,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI042.xsd','./msxsdtest/identityConstraint',valid),
+  STResList387 = [STRes386|STResList386],
+
+
+  ?line {STRes387,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI043.xsd','./msxsdtest/identityConstraint',valid),
+  STResList388 = [STRes387|STResList387],
+
+
+  ?line {STRes388,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI044.xsd','./msxsdtest/identityConstraint',valid),
+  STResList389 = [STRes388|STResList388],
+
+
+  ?line {STRes389,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI045.xsd','./msxsdtest/identityConstraint',valid),
+  STResList390 = [STRes389|STResList389],
+
+
+  ?line {STRes390,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI046.xsd','./msxsdtest/identityConstraint',valid),
+  STResList391 = [STRes390|STResList390],
+
+
+  ?line {STRes391,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI047.xsd','./msxsdtest/identityConstraint',valid),
+  STResList392 = [STRes391|STResList391],
+
+
+  ?line {STRes392,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI048.xsd','./msxsdtest/identityConstraint',valid),
+  STResList393 = [STRes392|STResList392],
+
+
+  ?line {STRes393,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI049.xsd','./msxsdtest/identityConstraint',valid),
+  STResList394 = [STRes393|STResList393],
+
+
+  ?line {STRes394,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI050.xsd','./msxsdtest/identityConstraint',valid),
+  STResList395 = [STRes394|STResList394],
+
+
+  ?line {STRes395,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI051.xsd','./msxsdtest/identityConstraint',valid),
+  STResList396 = [STRes395|STResList395],
+
+
+  ?line {STRes396,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI052.xsd','./msxsdtest/identityConstraint',valid),
+  STResList397 = [STRes396|STResList396],
+
+
+  ?line {STRes397,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI053.xsd','./msxsdtest/identityConstraint',valid),
+  STResList398 = [STRes397|STResList397],
+
+
+  ?line {STRes398,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI054.xsd','./msxsdtest/identityConstraint',valid),
+  STResList399 = [STRes398|STResList398],
+
+
+  ?line {STRes399,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI055.xsd','./msxsdtest/identityConstraint',valid),
+  STResList400 = [STRes399|STResList399],
+
+
+  ?line {STRes400,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI056.xsd','./msxsdtest/identityConstraint',valid),
+  STResList401 = [STRes400|STResList400],
+
+
+  ?line {STRes401,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI057.xsd','./msxsdtest/identityConstraint',valid),
+  STResList402 = [STRes401|STResList401],
+
+
+  ?line {STRes402,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI058.xsd','./msxsdtest/identityConstraint',valid),
+  STResList403 = [STRes402|STResList402],
+
+
+  ?line {STRes403,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI059.xsd','./msxsdtest/identityConstraint',valid),
+  STResList404 = [STRes403|STResList403],
+
+
+  ?line {STRes404,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI060.xsd','./msxsdtest/identityConstraint',valid),
+  STResList405 = [STRes404|STResList404],
+
+
+  ?line {STRes405,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI061.xsd','./msxsdtest/identityConstraint',valid),
+  STResList406 = [STRes405|STResList405],
+
+
+  ?line {STRes406,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI062.xsd','./msxsdtest/identityConstraint',valid),
+  STResList407 = [STRes406|STResList406],
+
+
+  ?line {STRes407,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI063.xsd','./msxsdtest/identityConstraint',valid),
+  STResList408 = [STRes407|STResList407],
+
+
+  ?line {STRes408,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI064.xsd','./msxsdtest/identityConstraint',valid),
+  STResList409 = [STRes408|STResList408],
+
+
+  ?line {STRes409,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI065.xsd','./msxsdtest/identityConstraint',valid),
+  STResList410 = [STRes409|STResList409],
+
+
+  ?line {STRes410,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI066.xsd','./msxsdtest/identityConstraint',valid),
+  STResList411 = [STRes410|STResList410],
+
+
+  ?line {STRes411,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI067.xsd','./msxsdtest/identityConstraint',valid),
+  STResList412 = [STRes411|STResList411],
+
+
+  ?line {STRes412,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI068.xsd','./msxsdtest/identityConstraint',valid),
+  STResList413 = [STRes412|STResList412],
+
+
+  ?line {STRes413,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI069.xsd','./msxsdtest/identityConstraint',valid),
+  STResList414 = [STRes413|STResList413],
+
+
+  ?line {STRes414,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI070.xsd','./msxsdtest/identityConstraint',valid),
+  STResList415 = [STRes414|STResList414],
+
+
+  ?line {STRes415,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI071.xsd','./msxsdtest/identityConstraint',valid),
+  STResList416 = [STRes415|STResList415],
+
+
+  ?line {STRes416,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI072.xsd','./msxsdtest/identityConstraint',valid),
+  STResList417 = [STRes416|STResList416],
+
+
+  ?line {STRes417,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI073.xsd','./msxsdtest/identityConstraint',valid),
+  STResList418 = [STRes417|STResList417],
+
+
+  ?line {STRes418,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI074.xsd','./msxsdtest/identityConstraint',valid),
+  STResList419 = [STRes418|STResList418],
+
+
+  ?line {STRes419,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI075.xsd','./msxsdtest/identityConstraint',valid),
+  STResList420 = [STRes419|STResList419],
+
+
+  ?line {STRes420,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI076.xsd','./msxsdtest/identityConstraint',valid),
+  STResList421 = [STRes420|STResList420],
+
+
+  ?line {STRes421,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI077.xsd','./msxsdtest/identityConstraint',valid),
+  STResList422 = [STRes421|STResList421],
+
+
+  ?line {STRes422,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI078.xsd','./msxsdtest/identityConstraint',valid),
+  STResList423 = [STRes422|STResList422],
+
+
+  ?line {STRes423,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI079.xsd','./msxsdtest/identityConstraint',valid),
+  STResList424 = [STRes423|STResList423],
+
+
+  ?line {STRes424,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI080.xsd','./msxsdtest/identityConstraint',valid),
+  STResList425 = [STRes424|STResList424],
+
+
+  ?line {STRes425,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI081.xsd','./msxsdtest/identityConstraint',valid),
+  STResList426 = [STRes425|STResList425],
+
+
+  ?line {STRes426,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI082.xsd','./msxsdtest/identityConstraint',valid),
+  STResList427 = [STRes426|STResList426],
+
+
+  ?line {STRes427,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI083.xsd','./msxsdtest/identityConstraint',valid),
+  STResList428 = [STRes427|STResList427],
+
+
+  ?line {STRes428,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI084.xsd','./msxsdtest/identityConstraint',valid),
+  STResList429 = [STRes428|STResList428],
+
+
+  ?line {STRes429,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI085.xsd','./msxsdtest/identityConstraint',valid),
+  STResList430 = [STRes429|STResList429],
+
+
+  ?line {STRes430,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI086.xsd','./msxsdtest/identityConstraint',valid),
+  STResList431 = [STRes430|STResList430],
+
+
+  ?line {STRes431,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI087.xsd','./msxsdtest/identityConstraint',valid),
+  STResList432 = [STRes431|STResList431],
+
+
+  ?line {STRes432,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI088.xsd','./msxsdtest/identityConstraint',valid),
+  STResList433 = [STRes432|STResList432],
+
+
+  ?line {STRes433,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI089.xsd','./msxsdtest/identityConstraint',valid),
+  STResList434 = [STRes433|STResList433],
+
+
+  ?line {STRes434,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI090.xsd','./msxsdtest/identityConstraint',valid),
+  STResList435 = [STRes434|STResList434],
+
+
+  ?line {STRes435,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI091.xsd','./msxsdtest/identityConstraint',valid),
+  STResList436 = [STRes435|STResList435],
+
+
+  ?line {STRes436,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI092.xsd','./msxsdtest/identityConstraint',valid),
+  STResList437 = [STRes436|STResList436],
+
+
+  ?line {STRes437,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI093.xsd','./msxsdtest/identityConstraint',valid),
+  STResList438 = [STRes437|STResList437],
+
+
+  ?line {STRes438,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI094.xsd','./msxsdtest/identityConstraint',valid),
+  STResList439 = [STRes438|STResList438],
+
+
+  ?line {STRes439,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI095.xsd','./msxsdtest/identityConstraint',valid),
+  STResList440 = [STRes439|STResList439],
+
+
+  ?line {STRes440,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI096.xsd','./msxsdtest/identityConstraint',valid),
+  STResList441 = [STRes440|STResList440],
+
+
+  ?line {STRes441,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI097.xsd','./msxsdtest/identityConstraint',valid),
+  STResList442 = [STRes441|STResList441],
+
+
+  ?line {STRes442,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI098.xsd','./msxsdtest/identityConstraint',valid),
+  STResList443 = [STRes442|STResList442],
+
+
+  ?line {STRes443,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI099.xsd','./msxsdtest/identityConstraint',valid),
+  STResList444 = [STRes443|STResList443],
+
+
+  ?line {STRes444,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI100.xsd','./msxsdtest/identityConstraint',valid),
+  STResList445 = [STRes444|STResList444],
+
+
+  ?line {STRes445,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI101.xsd','./msxsdtest/identityConstraint',valid),
+  STResList446 = [STRes445|STResList445],
+
+
+  ?line {STRes446,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI102.xsd','./msxsdtest/identityConstraint',valid),
+  STResList447 = [STRes446|STResList446],
+
+
+  ?line {STRes447,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI103.xsd','./msxsdtest/identityConstraint',valid),
+  STResList448 = [STRes447|STResList447],
+
+
+  ?line {STRes448,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI104.xsd','./msxsdtest/identityConstraint',valid),
+  STResList449 = [STRes448|STResList448],
+
+
+  ?line {STRes449,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI105.xsd','./msxsdtest/identityConstraint',valid),
+  STResList450 = [STRes449|STResList449],
+
+
+  ?line {STRes450,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI106.xsd','./msxsdtest/identityConstraint',valid),
+  STResList451 = [STRes450|STResList450],
+
+
+  ?line {STRes451,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI107.xsd','./msxsdtest/identityConstraint',valid),
+  STResList452 = [STRes451|STResList451],
+
+
+  ?line {STRes452,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI108.xsd','./msxsdtest/identityConstraint',valid),
+  STResList453 = [STRes452|STResList452],
+
+
+  ?line {STRes453,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI109.xsd','./msxsdtest/identityConstraint',valid),
+  STResList454 = [STRes453|STResList453],
+
+
+  ?line {STRes454,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI110.xsd','./msxsdtest/identityConstraint',valid),
+  STResList455 = [STRes454|STResList454],
+
+
+  ?line {STRes455,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI111.xsd','./msxsdtest/identityConstraint',valid),
+  STResList456 = [STRes455|STResList455],
+
+
+  ?line {STRes456,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI112.xsd','./msxsdtest/identityConstraint',valid),
+  STResList457 = [STRes456|STResList456],
+
+
+  ?line {STRes457,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI113.xsd','./msxsdtest/identityConstraint',valid),
+  STResList458 = [STRes457|STResList457],
+
+
+  ?line {STRes458,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI114.xsd','./msxsdtest/identityConstraint',valid),
+  STResList459 = [STRes458|STResList458],
+
+
+  ?line {STRes459,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI115.xsd','./msxsdtest/identityConstraint',valid),
+  STResList460 = [STRes459|STResList459],
+
+
+  ?line {STRes460,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI116.xsd','./msxsdtest/identityConstraint',valid),
+  STResList461 = [STRes460|STResList460],
+
+
+  ?line {STRes461,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI117.xsd','./msxsdtest/identityConstraint',valid),
+  STResList462 = [STRes461|STResList461],
+
+
+  ?line {STRes462,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI118.xsd','./msxsdtest/identityConstraint',valid),
+  STResList463 = [STRes462|STResList462],
+
+
+  ?line {STRes463,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI119.xsd','./msxsdtest/identityConstraint',valid),
+  STResList464 = [STRes463|STResList463],
+
+
+  ?line {STRes464,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI120.xsd','./msxsdtest/identityConstraint',valid),
+  STResList465 = [STRes464|STResList464],
+
+
+  ?line {STRes465,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI121.xsd','./msxsdtest/identityConstraint',valid),
+  STResList466 = [STRes465|STResList465],
+
+
+  ?line {STRes466,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI122.xsd','./msxsdtest/identityConstraint',valid),
+  STResList467 = [STRes466|STResList466],
+
+
+  ?line {STRes467,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI123.xsd','./msxsdtest/identityConstraint',valid),
+  STResList468 = [STRes467|STResList467],
+
+
+  ?line {STRes468,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI124.xsd','./msxsdtest/identityConstraint',valid),
+  STResList469 = [STRes468|STResList468],
+
+
+  ?line {STRes469,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI125.xsd','./msxsdtest/identityConstraint',valid),
+  STResList470 = [STRes469|STResList469],
+
+
+  ?line {STRes470,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI126.xsd','./msxsdtest/identityConstraint',valid),
+  STResList471 = [STRes470|STResList470],
+
+
+  ?line {STRes471,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI127.xsd','./msxsdtest/identityConstraint',valid),
+  STResList472 = [STRes471|STResList471],
+
+
+  ?line {STRes472,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI128.xsd','./msxsdtest/identityConstraint',valid),
+  STResList473 = [STRes472|STResList472],
+
+
+  ?line {STRes473,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI129.xsd','./msxsdtest/identityConstraint',valid),
+  STResList474 = [STRes473|STResList473],
+
+
+  ?line {STRes474,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI130.xsd','./msxsdtest/identityConstraint',valid),
+  STResList475 = [STRes474|STResList474],
+
+
+  ?line {STRes475,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI131.xsd','./msxsdtest/identityConstraint',valid),
+  STResList476 = [STRes475|STResList475],
+
+
+  ?line {STRes476,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI132.xsd','./msxsdtest/identityConstraint',valid),
+  STResList477 = [STRes476|STResList476],
+
+
+  ?line {STRes477,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI133.xsd','./msxsdtest/identityConstraint',valid),
+  STResList478 = [STRes477|STResList477],
+
+
+  ?line {STRes478,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI134.xsd','./msxsdtest/identityConstraint',valid),
+  STResList479 = [STRes478|STResList478],
+
+
+  ?line {STRes479,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI135.xsd','./msxsdtest/identityConstraint',valid),
+  STResList480 = [STRes479|STResList479],
+
+
+  ?line {STRes480,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI136.xsd','./msxsdtest/identityConstraint',valid),
+  STResList481 = [STRes480|STResList480],
+
+
+  ?line {STRes481,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI137.xsd','./msxsdtest/identityConstraint',valid),
+  STResList482 = [STRes481|STResList481],
+
+
+  ?line {STRes482,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI138.xsd','./msxsdtest/identityConstraint',valid),
+  STResList483 = [STRes482|STResList482],
+
+
+  ?line {STRes483,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI139.xsd','./msxsdtest/identityConstraint',valid),
+  STResList484 = [STRes483|STResList483],
+
+
+  ?line {STRes484,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI140.xsd','./msxsdtest/identityConstraint',valid),
+  STResList485 = [STRes484|STResList484],
+
+
+  ?line {STRes485,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI141.xsd','./msxsdtest/identityConstraint',valid),
+  STResList486 = [STRes485|STResList485],
+
+
+  ?line {STRes486,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI142.xsd','./msxsdtest/identityConstraint',valid),
+  STResList487 = [STRes486|STResList486],
+
+
+  ?line {STRes487,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI143.xsd','./msxsdtest/identityConstraint',valid),
+  STResList488 = [STRes487|STResList487],
+
+
+  ?line {STRes488,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI144.xsd','./msxsdtest/identityConstraint',valid),
+  STResList489 = [STRes488|STResList488],
+
+
+  ?line {STRes489,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI145.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList490 = [STRes489|STResList489],
+
+
+  ?line {STRes490,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI146.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList491 = [STRes490|STResList490],
+
+
+  ?line {STRes491,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI147.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList492 = [STRes491|STResList491],
+
+
+  ?line {STRes492,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI148.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList493 = [STRes492|STResList492],
+
+
+  ?line {STRes493,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI149.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList494 = [STRes493|STResList493],
+
+
+  ?line {STRes494,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI150.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList495 = [STRes494|STResList494],
+
+
+  ?line {STRes495,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI151.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList496 = [STRes495|STResList495],
+
+
+  ?line {STRes496,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idI152.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList497 = [STRes496|STResList496],
+
+
+  ?line {STRes497,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ001.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList498 = [STRes497|STResList497],
+
+
+  ?line {STRes498,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ002.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList499 = [STRes498|STResList498],
+
+
+  ?line {STRes499,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ003.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList500 = [STRes499|STResList499],
+
+
+  ?line {STRes500,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ004.xsd','./msxsdtest/identityConstraint',valid),
+  STResList501 = [STRes500|STResList500],
+
+
+  ?line {STRes501,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ005.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList502 = [STRes501|STResList501],
+
+
+  ?line {STRes502,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ006.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList503 = [STRes502|STResList502],
+
+
+  ?line {STRes503,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ007.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList504 = [STRes503|STResList503],
+
+
+  ?line {STRes504,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ008.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList505 = [STRes504|STResList504],
+
+
+  ?line {STRes505,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList506 = [STRes505|STResList505],
+
+
+  ?line {STRes506,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ010.xsd','./msxsdtest/identityConstraint',valid),
+  STResList507 = [STRes506|STResList506],
+
+
+  ?line {STRes507,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ011.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList508 = [STRes507|STResList507],
+
+
+  ?line {STRes508,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ012.xsd','./msxsdtest/identityConstraint',valid),
+  STResList509 = [STRes508|STResList508],
+
+
+  ?line {STRes509,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ013.xsd','./msxsdtest/identityConstraint',valid),
+  STResList510 = [STRes509|STResList509],
+
+
+  ?line {STRes510,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ014.xsd','./msxsdtest/identityConstraint',valid),
+  STResList511 = [STRes510|STResList510],
+
+
+  ?line {STRes511,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ015.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList512 = [STRes511|STResList511],
+
+
+  ?line {STRes512,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ016.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList513 = [STRes512|STResList512],
+
+
+  ?line {STRes513,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ017.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList514 = [STRes513|STResList513],
+
+
+  ?line {STRes514,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ018.xsd','./msxsdtest/identityConstraint',valid),
+  STResList515 = [STRes514|STResList514],
+
+
+  ?line {STRes515,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ019.xsd','./msxsdtest/identityConstraint',valid),
+  STResList516 = [STRes515|STResList515],
+
+
+  ?line {STRes516,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ020.xsd','./msxsdtest/identityConstraint',valid),
+  STResList517 = [STRes516|STResList516],
+
+
+  ?line {STRes517,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ021.xsd','./msxsdtest/identityConstraint',valid),
+  STResList518 = [STRes517|STResList517],
+
+
+  ?line {STRes518,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ022.xsd','./msxsdtest/identityConstraint',valid),
+  STResList519 = [STRes518|STResList518],
+
+
+  ?line {STRes519,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ023.xsd','./msxsdtest/identityConstraint',valid),
+  STResList520 = [STRes519|STResList519],
+
+
+  ?line {STRes520,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ024.xsd','./msxsdtest/identityConstraint',valid),
+  STResList521 = [STRes520|STResList520],
+
+
+  ?line {STRes521,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ025.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList522 = [STRes521|STResList521],
+
+
+  ?line {STRes522,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ026.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList523 = [STRes522|STResList522],
+
+
+  ?line {STRes523,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ027.xsd','./msxsdtest/identityConstraint',valid),
+  STResList524 = [STRes523|STResList523],
+
+
+  ?line {STRes524,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ028.xsd','./msxsdtest/identityConstraint',valid),
+  STResList525 = [STRes524|STResList524],
+
+
+  ?line {STRes525,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ029.xsd','./msxsdtest/identityConstraint',valid),
+  STResList526 = [STRes525|STResList525],
+
+
+  ?line {STRes526,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ030.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList527 = [STRes526|STResList526],
+
+
+  ?line {STRes527,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ031.xsd','./msxsdtest/identityConstraint',valid),
+  STResList528 = [STRes527|STResList527],
+
+
+  ?line {STRes528,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ032.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList529 = [STRes528|STResList528],
+
+
+  ?line {STRes529,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ033.xsd','./msxsdtest/identityConstraint',valid),
+  STResList530 = [STRes529|STResList529],
+
+
+  ?line {STRes530,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ034.xsd','./msxsdtest/identityConstraint',valid),
+  STResList531 = [STRes530|STResList530],
+
+
+  ?line {STRes531,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ035.xsd','./msxsdtest/identityConstraint',valid),
+  STResList532 = [STRes531|STResList531],
+
+
+  ?line {STRes532,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ036.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList533 = [STRes532|STResList532],
+
+
+  ?line {STRes533,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ037.xsd','./msxsdtest/identityConstraint',valid),
+  STResList534 = [STRes533|STResList533],
+
+
+  ?line {STRes534,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ038.xsd','./msxsdtest/identityConstraint',valid),
+  STResList535 = [STRes534|STResList534],
+
+
+  ?line {STRes535,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ039.xsd','./msxsdtest/identityConstraint',valid),
+  STResList536 = [STRes535|STResList535],
+
+
+  ?line {STRes536,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ040.xsd','./msxsdtest/identityConstraint',valid),
+  STResList537 = [STRes536|STResList536],
+
+
+  ?line {STRes537,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ041.xsd','./msxsdtest/identityConstraint',valid),
+  STResList538 = [STRes537|STResList537],
+
+
+  ?line {STRes538,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ042.xsd','./msxsdtest/identityConstraint',valid),
+  STResList539 = [STRes538|STResList538],
+
+
+  ?line {STRes539,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ043.xsd','./msxsdtest/identityConstraint',valid),
+  STResList540 = [STRes539|STResList539],
+
+
+  ?line {STRes540,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ044.xsd','./msxsdtest/identityConstraint',valid),
+  STResList541 = [STRes540|STResList540],
+
+
+  ?line {STRes541,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ045.xsd','./msxsdtest/identityConstraint',valid),
+  STResList542 = [STRes541|STResList541],
+
+
+  ?line {STRes542,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ046.xsd','./msxsdtest/identityConstraint',valid),
+  STResList543 = [STRes542|STResList542],
+
+
+  ?line {STRes543,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ047.xsd','./msxsdtest/identityConstraint',valid),
+  STResList544 = [STRes543|STResList543],
+
+
+  ?line {STRes544,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ048.xsd','./msxsdtest/identityConstraint',valid),
+  STResList545 = [STRes544|STResList544],
+
+
+  ?line {STRes545,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ049.xsd','./msxsdtest/identityConstraint',valid),
+  STResList546 = [STRes545|STResList545],
+
+
+  ?line {STRes546,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ050.xsd','./msxsdtest/identityConstraint',valid),
+  STResList547 = [STRes546|STResList546],
+
+
+  ?line {STRes547,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ051.xsd','./msxsdtest/identityConstraint',valid),
+  STResList548 = [STRes547|STResList547],
+
+
+  ?line {STRes548,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ052.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList549 = [STRes548|STResList548],
+
+
+  ?line {STRes549,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ053.xsd','./msxsdtest/identityConstraint',valid),
+  STResList550 = [STRes549|STResList549],
+
+
+  ?line {STRes550,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ054.xsd','./msxsdtest/identityConstraint',valid),
+  STResList551 = [STRes550|STResList550],
+
+
+  ?line {STRes551,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ055.xsd','./msxsdtest/identityConstraint',valid),
+  STResList552 = [STRes551|STResList551],
+
+
+  ?line {STRes552,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ056.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList553 = [STRes552|STResList552],
+
+
+  ?line {STRes553,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ057.xsd','./msxsdtest/identityConstraint',valid),
+  STResList554 = [STRes553|STResList553],
+
+
+  ?line {STRes554,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ058.xsd','./msxsdtest/identityConstraint',valid),
+  STResList555 = [STRes554|STResList554],
+
+
+  ?line {STRes555,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ059.xsd','./msxsdtest/identityConstraint',valid),
+  STResList556 = [STRes555|STResList555],
+
+
+  ?line {STRes556,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ060.xsd','./msxsdtest/identityConstraint',valid),
+  STResList557 = [STRes556|STResList556],
+
+
+  ?line {STRes557,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ061.xsd','./msxsdtest/identityConstraint',valid),
+  STResList558 = [STRes557|STResList557],
+
+
+  ?line {STRes558,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ062.xsd','./msxsdtest/identityConstraint',valid),
+  STResList559 = [STRes558|STResList558],
+
+
+  ?line {STRes559,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ063.xsd','./msxsdtest/identityConstraint',valid),
+  STResList560 = [STRes559|STResList559],
+
+
+  ?line {STRes560,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ064.xsd','./msxsdtest/identityConstraint',valid),
+  STResList561 = [STRes560|STResList560],
+
+
+  ?line {STRes561,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ065.xsd','./msxsdtest/identityConstraint',valid),
+  STResList562 = [STRes561|STResList561],
+
+
+  ?line {STRes562,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ066.xsd','./msxsdtest/identityConstraint',valid),
+  STResList563 = [STRes562|STResList562],
+
+
+  ?line {STRes563,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ067.xsd','./msxsdtest/identityConstraint',valid),
+  STResList564 = [STRes563|STResList563],
+
+
+  ?line {STRes564,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ068.xsd','./msxsdtest/identityConstraint',valid),
+  STResList565 = [STRes564|STResList564],
+
+
+  ?line {STRes565,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ069.xsd','./msxsdtest/identityConstraint',valid),
+  STResList566 = [STRes565|STResList565],
+
+
+  ?line {STRes566,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ070.xsd','./msxsdtest/identityConstraint',valid),
+  STResList567 = [STRes566|STResList566],
+
+
+  ?line {STRes567,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ071.xsd','./msxsdtest/identityConstraint',valid),
+  STResList568 = [STRes567|STResList567],
+
+
+  ?line {STRes568,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ072.xsd','./msxsdtest/identityConstraint',valid),
+  STResList569 = [STRes568|STResList568],
+
+
+  ?line {STRes569,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ073.xsd','./msxsdtest/identityConstraint',valid),
+  STResList570 = [STRes569|STResList569],
+
+
+  ?line {STRes570,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ074.xsd','./msxsdtest/identityConstraint',valid),
+  STResList571 = [STRes570|STResList570],
+
+
+  ?line {STRes571,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ075.xsd','./msxsdtest/identityConstraint',valid),
+  STResList572 = [STRes571|STResList571],
+
+
+  ?line {STRes572,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ076.xsd','./msxsdtest/identityConstraint',valid),
+  STResList573 = [STRes572|STResList572],
+
+
+  ?line {STRes573,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ077.xsd','./msxsdtest/identityConstraint',valid),
+  STResList574 = [STRes573|STResList573],
+
+
+  ?line {STRes574,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ078.xsd','./msxsdtest/identityConstraint',valid),
+  STResList575 = [STRes574|STResList574],
+
+
+  ?line {STRes575,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ079.xsd','./msxsdtest/identityConstraint',valid),
+  STResList576 = [STRes575|STResList575],
+
+
+  ?line {STRes576,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ080.xsd','./msxsdtest/identityConstraint',valid),
+  STResList577 = [STRes576|STResList576],
+
+
+  ?line {STRes577,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ081.xsd','./msxsdtest/identityConstraint',valid),
+  STResList578 = [STRes577|STResList577],
+
+
+  ?line {STRes578,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ082.xsd','./msxsdtest/identityConstraint',valid),
+  STResList579 = [STRes578|STResList578],
+
+
+  ?line {STRes579,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ083.xsd','./msxsdtest/identityConstraint',valid),
+  STResList580 = [STRes579|STResList579],
+
+
+  ?line {STRes580,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ084.xsd','./msxsdtest/identityConstraint',valid),
+  STResList581 = [STRes580|STResList580],
+
+
+  ?line {STRes581,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ085.xsd','./msxsdtest/identityConstraint',valid),
+  STResList582 = [STRes581|STResList581],
+
+
+  ?line {STRes582,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ086.xsd','./msxsdtest/identityConstraint',valid),
+  STResList583 = [STRes582|STResList582],
+
+
+  ?line {STRes583,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ087.xsd','./msxsdtest/identityConstraint',valid),
+  STResList584 = [STRes583|STResList583],
+
+
+  ?line {STRes584,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ088.xsd','./msxsdtest/identityConstraint',valid),
+  STResList585 = [STRes584|STResList584],
+
+
+  ?line {STRes585,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ089.xsd','./msxsdtest/identityConstraint',valid),
+  STResList586 = [STRes585|STResList585],
+
+
+  ?line {STRes586,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ090.xsd','./msxsdtest/identityConstraint',valid),
+  STResList587 = [STRes586|STResList586],
+
+
+  ?line {STRes587,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ091.xsd','./msxsdtest/identityConstraint',valid),
+  STResList588 = [STRes587|STResList587],
+
+
+  ?line {STRes588,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ092.xsd','./msxsdtest/identityConstraint',valid),
+  STResList589 = [STRes588|STResList588],
+
+
+  ?line {STRes589,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ093.xsd','./msxsdtest/identityConstraint',valid),
+  STResList590 = [STRes589|STResList589],
+
+
+  ?line {STRes590,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ094.xsd','./msxsdtest/identityConstraint',valid),
+  STResList591 = [STRes590|STResList590],
+
+
+  ?line {STRes591,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ095.xsd','./msxsdtest/identityConstraint',valid),
+  STResList592 = [STRes591|STResList591],
+
+
+  ?line {STRes592,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ096.xsd','./msxsdtest/identityConstraint',valid),
+  STResList593 = [STRes592|STResList592],
+
+
+  ?line {STRes593,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ097.xsd','./msxsdtest/identityConstraint',valid),
+  STResList594 = [STRes593|STResList593],
+
+
+  ?line {STRes594,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ098.xsd','./msxsdtest/identityConstraint',valid),
+  STResList595 = [STRes594|STResList594],
+
+
+  ?line {STRes595,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ099.xsd','./msxsdtest/identityConstraint',valid),
+  STResList596 = [STRes595|STResList595],
+
+
+  ?line {STRes596,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ100.xsd','./msxsdtest/identityConstraint',valid),
+  STResList597 = [STRes596|STResList596],
+
+
+  ?line {STRes597,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ101.xsd','./msxsdtest/identityConstraint',valid),
+  STResList598 = [STRes597|STResList597],
+
+
+  ?line {STRes598,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ102.xsd','./msxsdtest/identityConstraint',valid),
+  STResList599 = [STRes598|STResList598],
+
+
+  ?line {STRes599,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ103.xsd','./msxsdtest/identityConstraint',valid),
+  STResList600 = [STRes599|STResList599],
+
+
+  ?line {STRes600,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ104.xsd','./msxsdtest/identityConstraint',valid),
+  STResList601 = [STRes600|STResList600],
+
+
+  ?line {STRes601,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ105.xsd','./msxsdtest/identityConstraint',valid),
+  STResList602 = [STRes601|STResList601],
+
+
+  ?line {STRes602,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ106.xsd','./msxsdtest/identityConstraint',valid),
+  STResList603 = [STRes602|STResList602],
+
+
+  ?line {STRes603,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ107.xsd','./msxsdtest/identityConstraint',valid),
+  STResList604 = [STRes603|STResList603],
+
+
+  ?line {STRes604,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ108.xsd','./msxsdtest/identityConstraint',valid),
+  STResList605 = [STRes604|STResList604],
+
+
+  ?line {STRes605,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ109.xsd','./msxsdtest/identityConstraint',valid),
+  STResList606 = [STRes605|STResList605],
+
+
+  ?line {STRes606,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ110.xsd','./msxsdtest/identityConstraint',valid),
+  STResList607 = [STRes606|STResList606],
+
+
+  ?line {STRes607,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ111.xsd','./msxsdtest/identityConstraint',valid),
+  STResList608 = [STRes607|STResList607],
+
+
+  ?line {STRes608,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ112.xsd','./msxsdtest/identityConstraint',valid),
+  STResList609 = [STRes608|STResList608],
+
+
+  ?line {STRes609,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ113.xsd','./msxsdtest/identityConstraint',valid),
+  STResList610 = [STRes609|STResList609],
+
+
+  ?line {STRes610,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ114.xsd','./msxsdtest/identityConstraint',valid),
+  STResList611 = [STRes610|STResList610],
+
+
+  ?line {STRes611,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ115.xsd','./msxsdtest/identityConstraint',valid),
+  STResList612 = [STRes611|STResList611],
+
+
+  ?line {STRes612,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ116.xsd','./msxsdtest/identityConstraint',valid),
+  STResList613 = [STRes612|STResList612],
+
+
+  ?line {STRes613,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ117.xsd','./msxsdtest/identityConstraint',valid),
+  STResList614 = [STRes613|STResList613],
+
+
+  ?line {STRes614,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ118.xsd','./msxsdtest/identityConstraint',valid),
+  STResList615 = [STRes614|STResList614],
+
+
+  ?line {STRes615,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ119.xsd','./msxsdtest/identityConstraint',valid),
+  STResList616 = [STRes615|STResList615],
+
+
+  ?line {STRes616,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ120.xsd','./msxsdtest/identityConstraint',valid),
+  STResList617 = [STRes616|STResList616],
+
+
+  ?line {STRes617,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ121.xsd','./msxsdtest/identityConstraint',valid),
+  STResList618 = [STRes617|STResList617],
+
+
+  ?line {STRes618,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ122.xsd','./msxsdtest/identityConstraint',valid),
+  STResList619 = [STRes618|STResList618],
+
+
+  ?line {STRes619,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ123.xsd','./msxsdtest/identityConstraint',valid),
+  STResList620 = [STRes619|STResList619],
+
+
+  ?line {STRes620,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ124.xsd','./msxsdtest/identityConstraint',valid),
+  STResList621 = [STRes620|STResList620],
+
+
+  ?line {STRes621,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ125.xsd','./msxsdtest/identityConstraint',valid),
+  STResList622 = [STRes621|STResList621],
+
+
+  ?line {STRes622,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ126.xsd','./msxsdtest/identityConstraint',valid),
+  STResList623 = [STRes622|STResList622],
+
+
+  ?line {STRes623,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ127.xsd','./msxsdtest/identityConstraint',valid),
+  STResList624 = [STRes623|STResList623],
+
+
+  ?line {STRes624,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ128.xsd','./msxsdtest/identityConstraint',valid),
+  STResList625 = [STRes624|STResList624],
+
+
+  ?line {STRes625,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ129.xsd','./msxsdtest/identityConstraint',valid),
+  STResList626 = [STRes625|STResList625],
+
+
+  ?line {STRes626,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ130.xsd','./msxsdtest/identityConstraint',valid),
+  STResList627 = [STRes626|STResList626],
+
+
+  ?line {STRes627,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ131.xsd','./msxsdtest/identityConstraint',valid),
+  STResList628 = [STRes627|STResList627],
+
+
+  ?line {STRes628,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ132.xsd','./msxsdtest/identityConstraint',valid),
+  STResList629 = [STRes628|STResList628],
+
+
+  ?line {STRes629,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ133.xsd','./msxsdtest/identityConstraint',valid),
+  STResList630 = [STRes629|STResList629],
+
+
+  ?line {STRes630,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ134.xsd','./msxsdtest/identityConstraint',valid),
+  STResList631 = [STRes630|STResList630],
+
+
+  ?line {STRes631,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ135.xsd','./msxsdtest/identityConstraint',valid),
+  STResList632 = [STRes631|STResList631],
+
+
+  ?line {STRes632,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ136.xsd','./msxsdtest/identityConstraint',valid),
+  STResList633 = [STRes632|STResList632],
+
+
+  ?line {STRes633,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ137.xsd','./msxsdtest/identityConstraint',valid),
+  STResList634 = [STRes633|STResList633],
+
+
+  ?line {STRes634,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ138.xsd','./msxsdtest/identityConstraint',valid),
+  STResList635 = [STRes634|STResList634],
+
+
+  ?line {STRes635,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ139.xsd','./msxsdtest/identityConstraint',valid),
+  STResList636 = [STRes635|STResList635],
+
+
+  ?line {STRes636,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ140.xsd','./msxsdtest/identityConstraint',valid),
+  STResList637 = [STRes636|STResList636],
+
+
+  ?line {STRes637,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ141.xsd','./msxsdtest/identityConstraint',valid),
+  STResList638 = [STRes637|STResList637],
+
+
+  ?line {STRes638,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ142.xsd','./msxsdtest/identityConstraint',valid),
+  STResList639 = [STRes638|STResList638],
+
+
+  ?line {STRes639,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ143.xsd','./msxsdtest/identityConstraint',valid),
+  STResList640 = [STRes639|STResList639],
+
+
+  ?line {STRes640,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ144.xsd','./msxsdtest/identityConstraint',valid),
+  STResList641 = [STRes640|STResList640],
+
+
+  ?line {STRes641,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ145.xsd','./msxsdtest/identityConstraint',valid),
+  STResList642 = [STRes641|STResList641],
+
+
+  ?line {STRes642,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ146.xsd','./msxsdtest/identityConstraint',valid),
+  STResList643 = [STRes642|STResList642],
+
+
+  ?line {STRes643,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ147.xsd','./msxsdtest/identityConstraint',valid),
+  STResList644 = [STRes643|STResList643],
+
+
+  ?line {STRes644,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ148.xsd','./msxsdtest/identityConstraint',valid),
+  STResList645 = [STRes644|STResList644],
+
+
+  ?line {STRes645,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ149.xsd','./msxsdtest/identityConstraint',valid),
+  STResList646 = [STRes645|STResList645],
+
+
+  ?line {STRes646,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ150.xsd','./msxsdtest/identityConstraint',valid),
+  STResList647 = [STRes646|STResList646],
+
+
+  ?line {STRes647,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ151.xsd','./msxsdtest/identityConstraint',valid),
+  STResList648 = [STRes647|STResList647],
+
+
+  ?line {STRes648,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ152.xsd','./msxsdtest/identityConstraint',valid),
+  STResList649 = [STRes648|STResList648],
+
+
+  ?line {STRes649,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ153.xsd','./msxsdtest/identityConstraint',valid),
+  STResList650 = [STRes649|STResList649],
+
+
+  ?line {STRes650,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ154.xsd','./msxsdtest/identityConstraint',valid),
+  STResList651 = [STRes650|STResList650],
+
+
+  ?line {STRes651,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ155.xsd','./msxsdtest/identityConstraint',valid),
+  STResList652 = [STRes651|STResList651],
+
+
+  ?line {STRes652,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ156.xsd','./msxsdtest/identityConstraint',valid),
+  STResList653 = [STRes652|STResList652],
+
+
+  ?line {STRes653,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ157.xsd','./msxsdtest/identityConstraint',valid),
+  STResList654 = [STRes653|STResList653],
+
+
+  ?line {STRes654,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ158.xsd','./msxsdtest/identityConstraint',valid),
+  STResList655 = [STRes654|STResList654],
+
+
+  ?line {STRes655,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ159.xsd','./msxsdtest/identityConstraint',valid),
+  STResList656 = [STRes655|STResList655],
+
+
+  ?line {STRes656,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ160.xsd','./msxsdtest/identityConstraint',valid),
+  STResList657 = [STRes656|STResList656],
+
+
+  ?line {STRes657,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ161.xsd','./msxsdtest/identityConstraint',valid),
+  STResList658 = [STRes657|STResList657],
+
+
+  ?line {STRes658,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ162.xsd','./msxsdtest/identityConstraint',valid),
+  STResList659 = [STRes658|STResList658],
+
+
+  ?line {STRes659,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ163.xsd','./msxsdtest/identityConstraint',valid),
+  STResList660 = [STRes659|STResList659],
+
+
+  ?line {STRes660,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ164.xsd','./msxsdtest/identityConstraint',valid),
+  STResList661 = [STRes660|STResList660],
+
+
+  ?line {STRes661,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ165.xsd','./msxsdtest/identityConstraint',valid),
+  STResList662 = [STRes661|STResList661],
+
+
+  ?line {STRes662,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ166.xsd','./msxsdtest/identityConstraint',valid),
+  STResList663 = [STRes662|STResList662],
+
+
+  ?line {STRes663,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ167.xsd','./msxsdtest/identityConstraint',valid),
+  STResList664 = [STRes663|STResList663],
+
+
+  ?line {STRes664,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ168.xsd','./msxsdtest/identityConstraint',valid),
+  STResList665 = [STRes664|STResList664],
+
+
+  ?line {STRes665,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ169.xsd','./msxsdtest/identityConstraint',valid),
+  STResList666 = [STRes665|STResList665],
+
+
+  ?line {STRes666,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ170.xsd','./msxsdtest/identityConstraint',valid),
+  STResList667 = [STRes666|STResList666],
+
+
+  ?line {STRes667,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ171.xsd','./msxsdtest/identityConstraint',valid),
+  STResList668 = [STRes667|STResList667],
+
+
+  ?line {STRes668,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ172.xsd','./msxsdtest/identityConstraint',valid),
+  STResList669 = [STRes668|STResList668],
+
+
+  ?line {STRes669,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ173.xsd','./msxsdtest/identityConstraint',valid),
+  STResList670 = [STRes669|STResList669],
+
+
+  ?line {STRes670,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ174.xsd','./msxsdtest/identityConstraint',valid),
+  STResList671 = [STRes670|STResList670],
+
+
+  ?line {STRes671,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ175.xsd','./msxsdtest/identityConstraint',valid),
+  STResList672 = [STRes671|STResList671],
+
+
+  ?line {STRes672,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ176.xsd','./msxsdtest/identityConstraint',valid),
+  STResList673 = [STRes672|STResList672],
+
+
+  ?line {STRes673,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ177.xsd','./msxsdtest/identityConstraint',valid),
+  STResList674 = [STRes673|STResList673],
+
+
+  ?line {STRes674,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ178.xsd','./msxsdtest/identityConstraint',valid),
+  STResList675 = [STRes674|STResList674],
+
+
+  ?line {STRes675,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ179.xsd','./msxsdtest/identityConstraint',valid),
+  STResList676 = [STRes675|STResList675],
+
+
+  ?line {STRes676,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ180.xsd','./msxsdtest/identityConstraint',valid),
+  STResList677 = [STRes676|STResList676],
+
+
+  ?line {STRes677,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ181.xsd','./msxsdtest/identityConstraint',valid),
+  STResList678 = [STRes677|STResList677],
+
+
+  ?line {STRes678,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ182.xsd','./msxsdtest/identityConstraint',valid),
+  STResList679 = [STRes678|STResList678],
+
+
+  ?line {STRes679,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ183.xsd','./msxsdtest/identityConstraint',valid),
+  STResList680 = [STRes679|STResList679],
+
+
+  ?line {STRes680,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ184.xsd','./msxsdtest/identityConstraint',valid),
+  STResList681 = [STRes680|STResList680],
+
+
+  ?line {STRes681,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ185.xsd','./msxsdtest/identityConstraint',valid),
+  STResList682 = [STRes681|STResList681],
+
+
+  ?line {STRes682,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ186.xsd','./msxsdtest/identityConstraint',valid),
+  STResList683 = [STRes682|STResList682],
+
+
+  ?line {STRes683,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ187.xsd','./msxsdtest/identityConstraint',valid),
+  STResList684 = [STRes683|STResList683],
+
+
+  ?line {STRes684,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ188.xsd','./msxsdtest/identityConstraint',valid),
+  STResList685 = [STRes684|STResList684],
+
+
+  ?line {STRes685,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ189.xsd','./msxsdtest/identityConstraint',valid),
+  STResList686 = [STRes685|STResList685],
+
+
+  ?line {STRes686,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ190.xsd','./msxsdtest/identityConstraint',valid),
+  STResList687 = [STRes686|STResList686],
+
+
+  ?line {STRes687,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ191.xsd','./msxsdtest/identityConstraint',valid),
+  STResList688 = [STRes687|STResList687],
+
+
+  ?line {STRes688,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ192.xsd','./msxsdtest/identityConstraint',valid),
+  STResList689 = [STRes688|STResList688],
+
+
+  ?line {STRes689,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ193.xsd','./msxsdtest/identityConstraint',valid),
+  STResList690 = [STRes689|STResList689],
+
+
+  ?line {STRes690,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ194.xsd','./msxsdtest/identityConstraint',valid),
+  STResList691 = [STRes690|STResList690],
+
+
+  ?line {STRes691,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ195.xsd','./msxsdtest/identityConstraint',valid),
+  STResList692 = [STRes691|STResList691],
+
+
+  ?line {STRes692,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ196.xsd','./msxsdtest/identityConstraint',valid),
+  STResList693 = [STRes692|STResList692],
+
+
+  ?line {STRes693,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ197.xsd','./msxsdtest/identityConstraint',valid),
+  STResList694 = [STRes693|STResList693],
+
+
+  ?line {STRes694,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ198.xsd','./msxsdtest/identityConstraint',valid),
+  STResList695 = [STRes694|STResList694],
+
+
+  ?line {STRes695,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ199.xsd','./msxsdtest/identityConstraint',valid),
+  STResList696 = [STRes695|STResList695],
+
+
+  ?line {STRes696,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ200.xsd','./msxsdtest/identityConstraint',valid),
+  STResList697 = [STRes696|STResList696],
+
+
+  ?line {STRes697,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ201.xsd','./msxsdtest/identityConstraint',valid),
+  STResList698 = [STRes697|STResList697],
+
+
+  ?line {STRes698,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ202.xsd','./msxsdtest/identityConstraint',valid),
+  STResList699 = [STRes698|STResList698],
+
+
+  ?line {STRes699,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ203.xsd','./msxsdtest/identityConstraint',valid),
+  STResList700 = [STRes699|STResList699],
+
+
+  ?line {STRes700,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ204.xsd','./msxsdtest/identityConstraint',valid),
+  STResList701 = [STRes700|STResList700],
+
+
+  ?line {STRes701,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ205.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList702 = [STRes701|STResList701],
+
+
+  ?line {STRes702,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ206.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList703 = [STRes702|STResList702],
+
+
+  ?line {STRes703,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ207.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList704 = [STRes703|STResList703],
+
+
+  ?line {STRes704,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ208.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList705 = [STRes704|STResList704],
+
+
+  ?line {STRes705,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ209.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList706 = [STRes705|STResList705],
+
+
+  ?line {STRes706,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idJ210.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList707 = [STRes706|STResList706],
+
+
+  ?line {STRes707,S707} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK001.xsd','./msxsdtest/identityConstraint',valid),
+  STResList708 = [STRes707|STResList707],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK001.xml','./msxsdtest/identityConstraint',valid,S707),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes708,S708} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK002.xsd','./msxsdtest/identityConstraint',valid),
+  STResList709 = [STRes708|STResList708],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK002.xml','./msxsdtest/identityConstraint',valid,S708),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes709,S709} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK003.xsd','./msxsdtest/identityConstraint',valid),
+  STResList710 = [STRes709|STResList709],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK003.xml','./msxsdtest/identityConstraint',invalid,S709),
+  ITResList96 = [ITRes95|ITResList95],
+
+
+  ?line {STRes710,S710} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK004.xsd','./msxsdtest/identityConstraint',valid),
+  STResList711 = [STRes710|STResList710],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK004.xml','./msxsdtest/identityConstraint',valid,S710),
+  ITResList97 = [ITRes96|ITResList96],
+
+
+  ?line {STRes711,S711} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK005.xsd','./msxsdtest/identityConstraint',valid),
+  STResList712 = [STRes711|STResList711],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK005.xml','./msxsdtest/identityConstraint',valid,S711),
+  ITResList98 = [ITRes97|ITResList97],
+
+
+  ?line {STRes712,S712} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK006.xsd','./msxsdtest/identityConstraint',valid),
+  STResList713 = [STRes712|STResList712],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK006.xml','./msxsdtest/identityConstraint',valid,S712),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes713,S713} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK007.xsd','./msxsdtest/identityConstraint',valid),
+  STResList714 = [STRes713|STResList713],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK007.xml','./msxsdtest/identityConstraint',valid,S713),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes714,S714} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK008.xsd','./msxsdtest/identityConstraint',valid),
+  STResList715 = [STRes714|STResList714],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK008.xml','./msxsdtest/identityConstraint',valid,S714),
+  ITResList101 = [ITRes100|ITResList100],
+
+
+  ?line {STRes715,S715} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList716 = [STRes715|STResList715],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK009.xml','./msxsdtest/identityConstraint',valid,S715),
+  ITResList102 = [ITRes101|ITResList101],
+
+
+  ?line {STRes716,S716} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK010.xsd','./msxsdtest/identityConstraint',valid),
+  STResList717 = [STRes716|STResList716],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK010.xml','./msxsdtest/identityConstraint',valid,S716),
+  ITResList103 = [ITRes102|ITResList102],
+
+
+  ?line {STRes717,S717} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK011.xsd','./msxsdtest/identityConstraint',valid),
+  STResList718 = [STRes717|STResList717],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK011.xml','./msxsdtest/identityConstraint',valid,S717),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes718,S718} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK012.xsd','./msxsdtest/identityConstraint',valid),
+  STResList719 = [STRes718|STResList718],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK012.xml','./msxsdtest/identityConstraint',invalid,S718),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes719,S719} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK013.xsd','./msxsdtest/identityConstraint',valid),
+  STResList720 = [STRes719|STResList719],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK013.xml','./msxsdtest/identityConstraint',valid,S719),
+  ITResList106 = [ITRes105|ITResList105],
+
+
+  ?line {STRes720,S720} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK014.xsd','./msxsdtest/identityConstraint',valid),
+  STResList721 = [STRes720|STResList720],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK014.xml','./msxsdtest/identityConstraint',valid,S720),
+  ITResList107 = [ITRes106|ITResList106],
+
+
+  ?line {STRes721,S721} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK015.xsd','./msxsdtest/identityConstraint',valid),
+  STResList722 = [STRes721|STResList721],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK015.xml','./msxsdtest/identityConstraint',valid,S721),
+  ITResList108 = [ITRes107|ITResList107],
+
+
+  ?line {STRes722,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK016.xsd','./msxsdtest/identityConstraint',invalid),
+  STResList723 = [STRes722|STResList722],
+
+
+  ?line {STRes723,S723} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idK017.xsd','./msxsdtest/identityConstraint',valid),
+  STResList724 = [STRes723|STResList723],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idK017.xml','./msxsdtest/identityConstraint',valid,S723),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes724,S724} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL001.xsd','./msxsdtest/identityConstraint',valid),
+  STResList725 = [STRes724|STResList724],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL001.xml','./msxsdtest/identityConstraint',valid,S724),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes725,S725} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL002.xsd','./msxsdtest/identityConstraint',valid),
+  STResList726 = [STRes725|STResList725],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL002.xml','./msxsdtest/identityConstraint',invalid,S725),
+  ITResList111 = [ITRes110|ITResList110],
+
+
+  ?line {STRes726,S726} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL003.xsd','./msxsdtest/identityConstraint',valid),
+  STResList727 = [STRes726|STResList726],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL003.xml','./msxsdtest/identityConstraint',valid,S726),
+  ITResList112 = [ITRes111|ITResList111],
+
+
+  ?line {STRes727,S727} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL004.xsd','./msxsdtest/identityConstraint',valid),
+  STResList728 = [STRes727|STResList727],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL004.xml','./msxsdtest/identityConstraint',valid,S727),
+  ITResList113 = [ITRes112|ITResList112],
+
+
+  ?line {STRes728,S728} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL005.xsd','./msxsdtest/identityConstraint',valid),
+  STResList729 = [STRes728|STResList728],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL005.xml','./msxsdtest/identityConstraint',valid,S728),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes729,S729} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL006.xsd','./msxsdtest/identityConstraint',valid),
+  STResList730 = [STRes729|STResList729],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL006.xml','./msxsdtest/identityConstraint',invalid,S729),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes730,S730} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL007.xsd','./msxsdtest/identityConstraint',valid),
+  STResList731 = [STRes730|STResList730],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL007.xml','./msxsdtest/identityConstraint',invalid,S730),
+  ITResList116 = [ITRes115|ITResList115],
+
+
+  ?line {STRes731,S731} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL008.xsd','./msxsdtest/identityConstraint',valid),
+  STResList732 = [STRes731|STResList731],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL008.xml','./msxsdtest/identityConstraint',valid,S731),
+  ITResList117 = [ITRes116|ITResList116],
+
+
+  ?line {STRes732,S732} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL009.xsd','./msxsdtest/identityConstraint',valid),
+  STResList733 = [STRes732|STResList732],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL009.xml','./msxsdtest/identityConstraint',valid,S732),
+  ITResList118 = [ITRes117|ITResList117],
+
+
+  ?line {STRes733,S733} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL010.xsd','./msxsdtest/identityConstraint',valid),
+  STResList734 = [STRes733|STResList733],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL010.xml','./msxsdtest/identityConstraint',valid,S733),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes734,S734} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL011.xsd','./msxsdtest/identityConstraint',valid),
+  STResList735 = [STRes734|STResList734],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL011.xml','./msxsdtest/identityConstraint',invalid,S734),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes735,S735} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL012.xsd','./msxsdtest/identityConstraint',valid),
+  STResList736 = [STRes735|STResList735],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL012.xml','./msxsdtest/identityConstraint',invalid,S735),
+  ITResList121 = [ITRes120|ITResList120],
+
+
+  ?line {STRes736,S736} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL013.xsd','./msxsdtest/identityConstraint',valid),
+  STResList737 = [STRes736|STResList736],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL013.xml','./msxsdtest/identityConstraint',valid,S736),
+  ITResList122 = [ITRes121|ITResList121],
+
+
+  ?line {STRes737,S737} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL014.xsd','./msxsdtest/identityConstraint',valid),
+  STResList738 = [STRes737|STResList737],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL014.xml','./msxsdtest/identityConstraint',valid,S737),
+  ITResList123 = [ITRes122|ITResList122],
+
+
+  ?line {STRes738,S738} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL015.xsd','./msxsdtest/identityConstraint',valid),
+  STResList739 = [STRes738|STResList738],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL015.xml','./msxsdtest/identityConstraint',invalid,S738),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes739,S739} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL016.xsd','./msxsdtest/identityConstraint',valid),
+  STResList740 = [STRes739|STResList739],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL016.xml','./msxsdtest/identityConstraint',valid,S739),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes740,S740} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL017.xsd','./msxsdtest/identityConstraint',valid),
+  STResList741 = [STRes740|STResList740],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL017.xml','./msxsdtest/identityConstraint',valid,S740),
+  ITResList126 = [ITRes125|ITResList125],
+
+
+  ?line {STRes741,S741} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL018.xsd','./msxsdtest/identityConstraint',valid),
+  STResList742 = [STRes741|STResList741],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL018.xml','./msxsdtest/identityConstraint',valid,S741),
+  ITResList127 = [ITRes126|ITResList126],
+
+
+  ?line {STRes742,S742} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL019.xsd','./msxsdtest/identityConstraint',valid),
+  STResList743 = [STRes742|STResList742],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL019.xml','./msxsdtest/identityConstraint',invalid,S742),
+  ITResList128 = [ITRes127|ITResList127],
+
+
+  ?line {STRes743,S743} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL020.xsd','./msxsdtest/identityConstraint',valid),
+  STResList744 = [STRes743|STResList743],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL020.xml','./msxsdtest/identityConstraint',valid,S743),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes744,S744} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL021.xsd','./msxsdtest/identityConstraint',valid),
+  STResList745 = [STRes744|STResList744],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL021.xml','./msxsdtest/identityConstraint',valid,S744),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  ?line {STRes745,S745} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL022.xsd','./msxsdtest/identityConstraint',valid),
+  STResList746 = [STRes745|STResList745],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL022.xml','./msxsdtest/identityConstraint',invalid,S745),
+  ITResList131 = [ITRes130|ITResList130],
+
+
+  ?line {STRes746,S746} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL023.xsd','./msxsdtest/identityConstraint',valid),
+  STResList747 = [STRes746|STResList746],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL023.xml','./msxsdtest/identityConstraint',valid,S746),
+  ITResList132 = [ITRes131|ITResList131],
+
+
+  ?line {STRes747,S747} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL024.xsd','./msxsdtest/identityConstraint',valid),
+  STResList748 = [STRes747|STResList747],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL024.xml','./msxsdtest/identityConstraint',valid,S747),
+  ITResList133 = [ITRes132|ITResList132],
+
+
+  ?line {STRes748,S748} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL025.xsd','./msxsdtest/identityConstraint',valid),
+  STResList749 = [STRes748|STResList748],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL025.xml','./msxsdtest/identityConstraint',invalid,S748),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes749,S749} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL026.xsd','./msxsdtest/identityConstraint',valid),
+  STResList750 = [STRes749|STResList749],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL026.xml','./msxsdtest/identityConstraint',valid,S749),
+  ITResList135 = [ITRes134|ITResList134],
+
+
+  ?line {STRes750,S750} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL027.xsd','./msxsdtest/identityConstraint',valid),
+  STResList751 = [STRes750|STResList750],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL027.xml','./msxsdtest/identityConstraint',invalid,S750),
+  ITResList136 = [ITRes135|ITResList135],
+
+
+  ?line {STRes751,S751} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL028.xsd','./msxsdtest/identityConstraint',valid),
+  STResList752 = [STRes751|STResList751],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL028.xml','./msxsdtest/identityConstraint',valid,S751),
+  ITResList137 = [ITRes136|ITResList136],
+
+
+  ?line {STRes752,S752} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL029.xsd','./msxsdtest/identityConstraint',valid),
+  STResList753 = [STRes752|STResList752],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL029.xml','./msxsdtest/identityConstraint',valid,S752),
+  ITResList138 = [ITRes137|ITResList137],
+
+
+  ?line {STRes753,S753} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL030.xsd','./msxsdtest/identityConstraint',valid),
+  STResList754 = [STRes753|STResList753],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL030.xml','./msxsdtest/identityConstraint',valid,S753),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes754,S754} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL031.xsd','./msxsdtest/identityConstraint',valid),
+  STResList755 = [STRes754|STResList754],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL031.xml','./msxsdtest/identityConstraint',invalid,S754),
+  ITResList140 = [ITRes139|ITResList139],
+
+
+  ?line {STRes755,S755} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL032.xsd','./msxsdtest/identityConstraint',valid),
+  STResList756 = [STRes755|STResList755],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL032.xml','./msxsdtest/identityConstraint',invalid,S755),
+  ITResList141 = [ITRes140|ITResList140],
+
+
+  ?line {STRes756,S756} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL033.xsd','./msxsdtest/identityConstraint',valid),
+  STResList757 = [STRes756|STResList756],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL033.xml','./msxsdtest/identityConstraint',valid,S756),
+  ITResList142 = [ITRes141|ITResList141],
+
+
+  ?line {STRes757,S757} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL034.xsd','./msxsdtest/identityConstraint',valid),
+  STResList758 = [STRes757|STResList757],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL034.xml','./msxsdtest/identityConstraint',valid,S757),
+  ITResList143 = [ITRes142|ITResList142],
+
+
+  ?line {STRes758,S758} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL035.xsd','./msxsdtest/identityConstraint',valid),
+  STResList759 = [STRes758|STResList758],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL035.xml','./msxsdtest/identityConstraint',valid,S758),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes759,S759} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL036.xsd','./msxsdtest/identityConstraint',valid),
+  STResList760 = [STRes759|STResList759],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL036.xml','./msxsdtest/identityConstraint',invalid,S759),
+  ITResList145 = [ITRes144|ITResList144],
+
+
+  ?line {STRes760,S760} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL037.xsd','./msxsdtest/identityConstraint',valid),
+  STResList761 = [STRes760|STResList760],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL037.xml','./msxsdtest/identityConstraint',invalid,S760),
+  ITResList146 = [ITRes145|ITResList145],
+
+
+  ?line {STRes761,S761} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL038.xsd','./msxsdtest/identityConstraint',valid),
+  STResList762 = [STRes761|STResList761],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL038.xml','./msxsdtest/identityConstraint',valid,S761),
+  ITResList147 = [ITRes146|ITResList146],
+
+
+  ?line {STRes762,S762} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL039.xsd','./msxsdtest/identityConstraint',valid),
+  STResList763 = [STRes762|STResList762],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL039.xml','./msxsdtest/identityConstraint',valid,S762),
+  ITResList148 = [ITRes147|ITResList147],
+
+
+  ?line {STRes763,S763} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL040.xsd','./msxsdtest/identityConstraint',valid),
+  STResList764 = [STRes763|STResList763],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL040.xml','./msxsdtest/identityConstraint',invalid,S763),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes764,S764} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL041.xsd','./msxsdtest/identityConstraint',valid),
+  STResList765 = [STRes764|STResList764],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL041.xml','./msxsdtest/identityConstraint',valid,S764),
+  ITResList150 = [ITRes149|ITResList149],
+
+
+  ?line {STRes765,S765} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL042.xsd','./msxsdtest/identityConstraint',valid),
+  STResList766 = [STRes765|STResList765],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL042.xml','./msxsdtest/identityConstraint',valid,S765),
+  ITResList151 = [ITRes150|ITResList150],
+
+
+  ?line {STRes766,S766} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL043.xsd','./msxsdtest/identityConstraint',valid),
+  STResList767 = [STRes766|STResList766],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL043.xml','./msxsdtest/identityConstraint',valid,S766),
+  ITResList152 = [ITRes151|ITResList151],
+
+
+  ?line {STRes767,S767} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL044.xsd','./msxsdtest/identityConstraint',valid),
+  STResList768 = [STRes767|STResList767],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL044.xml','./msxsdtest/identityConstraint',invalid,S767),
+  ITResList153 = [ITRes152|ITResList152],
+
+
+  ?line {STRes768,S768} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL045.xsd','./msxsdtest/identityConstraint',valid),
+  STResList769 = [STRes768|STResList768],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL045.xml','./msxsdtest/identityConstraint',valid,S768),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes769,S769} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL046.xsd','./msxsdtest/identityConstraint',valid),
+  STResList770 = [STRes769|STResList769],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL046.xml','./msxsdtest/identityConstraint',valid,S769),
+  ITResList155 = [ITRes154|ITResList154],
+
+
+  ?line {STRes770,S770} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL047.xsd','./msxsdtest/identityConstraint',valid),
+  STResList771 = [STRes770|STResList770],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL047.xml','./msxsdtest/identityConstraint',invalid,S770),
+  ITResList156 = [ITRes155|ITResList155],
+
+
+  ?line {STRes771,S771} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL048.xsd','./msxsdtest/identityConstraint',valid),
+  STResList772 = [STRes771|STResList771],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL048.xml','./msxsdtest/identityConstraint',valid,S771),
+  ITResList157 = [ITRes156|ITResList156],
+
+
+  ?line {STRes772,S772} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL049.xsd','./msxsdtest/identityConstraint',valid),
+  STResList773 = [STRes772|STResList772],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL049.xml','./msxsdtest/identityConstraint',valid,S772),
+  ITResList158 = [ITRes157|ITResList157],
+
+
+  ?line {STRes773,S773} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL050.xsd','./msxsdtest/identityConstraint',valid),
+  STResList774 = [STRes773|STResList773],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL050.xml','./msxsdtest/identityConstraint',invalid,S773),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes774,S774} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL051.xsd','./msxsdtest/identityConstraint',valid),
+  STResList775 = [STRes774|STResList774],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL051.xml','./msxsdtest/identityConstraint',valid,S774),
+  ITResList160 = [ITRes159|ITResList159],
+
+
+  ?line {STRes775,S775} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL052.xsd','./msxsdtest/identityConstraint',valid),
+  STResList776 = [STRes775|STResList775],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL052.xml','./msxsdtest/identityConstraint',invalid,S775),
+  ITResList161 = [ITRes160|ITResList160],
+
+
+  ?line {STRes776,S776} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL053.xsd','./msxsdtest/identityConstraint',valid),
+  STResList777 = [STRes776|STResList776],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL053.xml','./msxsdtest/identityConstraint',valid,S776),
+  ITResList162 = [ITRes161|ITResList161],
+
+
+  ?line {STRes777,S777} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL054.xsd','./msxsdtest/identityConstraint',valid),
+  STResList778 = [STRes777|STResList777],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL054.xml','./msxsdtest/identityConstraint',valid,S777),
+  ITResList163 = [ITRes162|ITResList162],
+
+
+  ?line {STRes778,S778} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL055.xsd','./msxsdtest/identityConstraint',valid),
+  STResList779 = [STRes778|STResList778],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL055.xml','./msxsdtest/identityConstraint',valid,S778),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes779,S779} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL056.xsd','./msxsdtest/identityConstraint',valid),
+  STResList780 = [STRes779|STResList779],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL056.xml','./msxsdtest/identityConstraint',invalid,S779),
+  ITResList165 = [ITRes164|ITResList164],
+
+
+  ?line {STRes780,S780} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL057.xsd','./msxsdtest/identityConstraint',valid),
+  STResList781 = [STRes780|STResList780],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL057.xml','./msxsdtest/identityConstraint',invalid,S780),
+  ITResList166 = [ITRes165|ITResList165],
+
+
+  ?line {STRes781,S781} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL058.xsd','./msxsdtest/identityConstraint',valid),
+  STResList782 = [STRes781|STResList781],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL058.xml','./msxsdtest/identityConstraint',valid,S781),
+  ITResList167 = [ITRes166|ITResList166],
+
+
+  ?line {STRes782,S782} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL059.xsd','./msxsdtest/identityConstraint',valid),
+  STResList783 = [STRes782|STResList782],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL059.xml','./msxsdtest/identityConstraint',valid,S782),
+  ITResList168 = [ITRes167|ITResList167],
+
+
+  ?line {STRes783,S783} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL060.xsd','./msxsdtest/identityConstraint',valid),
+  STResList784 = [STRes783|STResList783],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL060.xml','./msxsdtest/identityConstraint',valid,S783),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  ?line {STRes784,S784} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL061.xsd','./msxsdtest/identityConstraint',valid),
+  STResList785 = [STRes784|STResList784],
+  ?line ITRes169 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL061.xml','./msxsdtest/identityConstraint',invalid,S784),
+  ITResList170 = [ITRes169|ITResList169],
+
+
+  ?line {STRes785,S785} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL062.xsd','./msxsdtest/identityConstraint',valid),
+  STResList786 = [STRes785|STResList785],
+  ?line ITRes170 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL062.xml','./msxsdtest/identityConstraint',invalid,S785),
+  ITResList171 = [ITRes170|ITResList170],
+
+
+  ?line {STRes786,S786} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL063.xsd','./msxsdtest/identityConstraint',valid),
+  STResList787 = [STRes786|STResList786],
+  ?line ITRes171 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL063.xml','./msxsdtest/identityConstraint',valid,S786),
+  ITResList172 = [ITRes171|ITResList171],
+
+
+  ?line {STRes787,S787} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL064.xsd','./msxsdtest/identityConstraint',valid),
+  STResList788 = [STRes787|STResList787],
+  ?line ITRes172 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL064.xml','./msxsdtest/identityConstraint',valid,S787),
+  ITResList173 = [ITRes172|ITResList172],
+
+
+  ?line {STRes788,S788} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL065.xsd','./msxsdtest/identityConstraint',valid),
+  STResList789 = [STRes788|STResList788],
+  ?line ITRes173 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL065.xml','./msxsdtest/identityConstraint',invalid,S788),
+  ITResList174 = [ITRes173|ITResList173],
+
+
+  ?line {STRes789,S789} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL066.xsd','./msxsdtest/identityConstraint',valid),
+  STResList790 = [STRes789|STResList789],
+  ?line ITRes174 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL066.xml','./msxsdtest/identityConstraint',valid,S789),
+  ITResList175 = [ITRes174|ITResList174],
+
+
+  ?line {STRes790,S790} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL067.xsd','./msxsdtest/identityConstraint',valid),
+  STResList791 = [STRes790|STResList790],
+  ?line ITRes175 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL067.xml','./msxsdtest/identityConstraint',valid,S790),
+  ITResList176 = [ITRes175|ITResList175],
+
+
+  ?line {STRes791,S791} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL068.xsd','./msxsdtest/identityConstraint',valid),
+  STResList792 = [STRes791|STResList791],
+  ?line ITRes176 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL068.xml','./msxsdtest/identityConstraint',valid,S791),
+  ITResList177 = [ITRes176|ITResList176],
+
+
+  ?line {STRes792,S792} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL069.xsd','./msxsdtest/identityConstraint',valid),
+  STResList793 = [STRes792|STResList792],
+  ?line ITRes177 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL069.xml','./msxsdtest/identityConstraint',invalid,S792),
+  ITResList178 = [ITRes177|ITResList177],
+
+
+  ?line {STRes793,S793} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL070.xsd','./msxsdtest/identityConstraint',valid),
+  STResList794 = [STRes793|STResList793],
+  ?line ITRes178 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL070.xml','./msxsdtest/identityConstraint',valid,S793),
+  ITResList179 = [ITRes178|ITResList178],
+
+
+  ?line {STRes794,S794} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL071.xsd','./msxsdtest/identityConstraint',valid),
+  STResList795 = [STRes794|STResList794],
+  ?line ITRes179 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL071.xml','./msxsdtest/identityConstraint',valid,S794),
+  ITResList180 = [ITRes179|ITResList179],
+
+
+  ?line {STRes795,S795} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL072.xsd','./msxsdtest/identityConstraint',valid),
+  STResList796 = [STRes795|STResList795],
+  ?line ITRes180 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL072.xml','./msxsdtest/identityConstraint',invalid,S795),
+  ITResList181 = [ITRes180|ITResList180],
+
+
+  ?line {STRes796,S796} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL073.xsd','./msxsdtest/identityConstraint',valid),
+  STResList797 = [STRes796|STResList796],
+  ?line ITRes181 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL073.xml','./msxsdtest/identityConstraint',valid,S796),
+  ITResList182 = [ITRes181|ITResList181],
+
+
+  ?line {STRes797,S797} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL074.xsd','./msxsdtest/identityConstraint',valid),
+  STResList798 = [STRes797|STResList797],
+  ?line ITRes182 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL074.xml','./msxsdtest/identityConstraint',valid,S797),
+  ITResList183 = [ITRes182|ITResList182],
+
+
+  ?line {STRes798,S798} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL075.xsd','./msxsdtest/identityConstraint',valid),
+  STResList799 = [STRes798|STResList798],
+  ?line ITRes183 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL075.xml','./msxsdtest/identityConstraint',invalid,S798),
+  ITResList184 = [ITRes183|ITResList183],
+
+
+  ?line {STRes799,S799} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL076.xsd','./msxsdtest/identityConstraint',valid),
+  STResList800 = [STRes799|STResList799],
+  ?line ITRes184 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL076.xml','./msxsdtest/identityConstraint',valid,S799),
+  ITResList185 = [ITRes184|ITResList184],
+
+
+  ?line {STRes800,S800} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL077.xsd','./msxsdtest/identityConstraint',valid),
+  STResList801 = [STRes800|STResList800],
+  ?line ITRes185 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL077.xml','./msxsdtest/identityConstraint',valid,S800),
+  ITResList186 = [ITRes185|ITResList185],
+
+
+  ?line {STRes801,S801} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL078.xsd','./msxsdtest/identityConstraint',valid),
+  STResList802 = [STRes801|STResList801],
+  ?line ITRes186 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL078.xml','./msxsdtest/identityConstraint',valid,S801),
+  ITResList187 = [ITRes186|ITResList186],
+
+
+  ?line {STRes802,S802} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL079.xsd','./msxsdtest/identityConstraint',valid),
+  STResList803 = [STRes802|STResList802],
+  ?line ITRes187 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL079.xml','./msxsdtest/identityConstraint',invalid,S802),
+  ITResList188 = [ITRes187|ITResList187],
+
+
+  ?line {STRes803,S803} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL080.xsd','./msxsdtest/identityConstraint',valid),
+  STResList804 = [STRes803|STResList803],
+  ?line ITRes188 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL080.xml','./msxsdtest/identityConstraint',invalid,S803),
+  ITResList189 = [ITRes188|ITResList188],
+
+
+  ?line {STRes804,S804} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL081.xsd','./msxsdtest/identityConstraint',valid),
+  STResList805 = [STRes804|STResList804],
+  ?line ITRes189 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL081.xml','./msxsdtest/identityConstraint',invalid,S804),
+  ITResList190 = [ITRes189|ITResList189],
+
+
+  ?line {STRes805,S805} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL082.xsd','./msxsdtest/identityConstraint',valid),
+  STResList806 = [STRes805|STResList805],
+  ?line ITRes190 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL082.xml','./msxsdtest/identityConstraint',valid,S805),
+  ITResList191 = [ITRes190|ITResList190],
+
+
+  ?line {STRes806,S806} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL083.xsd','./msxsdtest/identityConstraint',valid),
+  STResList807 = [STRes806|STResList806],
+  ?line ITRes191 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL083.xml','./msxsdtest/identityConstraint',invalid,S806),
+  ITResList192 = [ITRes191|ITResList191],
+
+
+  ?line {STRes807,S807} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL084.xsd','./msxsdtest/identityConstraint',valid),
+  STResList808 = [STRes807|STResList807],
+  ?line ITRes192 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL084.xml','./msxsdtest/identityConstraint',valid,S807),
+  ITResList193 = [ITRes192|ITResList192],
+
+
+  ?line {STRes808,S808} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL085.xsd','./msxsdtest/identityConstraint',valid),
+  STResList809 = [STRes808|STResList808],
+  ?line ITRes193 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL085.xml','./msxsdtest/identityConstraint',invalid,S808),
+  ITResList194 = [ITRes193|ITResList193],
+
+
+  ?line {STRes809,S809} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL086.xsd','./msxsdtest/identityConstraint',valid),
+  STResList810 = [STRes809|STResList809],
+  ?line ITRes194 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL086.xml','./msxsdtest/identityConstraint',valid,S809),
+  ITResList195 = [ITRes194|ITResList194],
+
+
+  ?line {STRes810,S810} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL087.xsd','./msxsdtest/identityConstraint',valid),
+  STResList811 = [STRes810|STResList810],
+  ?line ITRes195 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL087.xml','./msxsdtest/identityConstraint',invalid,S810),
+  ITResList196 = [ITRes195|ITResList195],
+
+
+  ?line {STRes811,S811} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL088.xsd','./msxsdtest/identityConstraint',valid),
+  STResList812 = [STRes811|STResList811],
+  ?line ITRes196 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL088.xml','./msxsdtest/identityConstraint',valid,S811),
+  ITResList197 = [ITRes196|ITResList196],
+
+
+  ?line {STRes812,S812} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL089.xsd','./msxsdtest/identityConstraint',valid),
+  STResList813 = [STRes812|STResList812],
+  ?line ITRes197 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL089.xml','./msxsdtest/identityConstraint',invalid,S812),
+  ITResList198 = [ITRes197|ITResList197],
+
+
+  ?line {STRes813,S813} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL090.xsd','./msxsdtest/identityConstraint',valid),
+  STResList814 = [STRes813|STResList813],
+  ?line ITRes198 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL090.xml','./msxsdtest/identityConstraint',valid,S813),
+  ITResList199 = [ITRes198|ITResList198],
+
+
+  ?line {STRes814,S814} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL091.xsd','./msxsdtest/identityConstraint',valid),
+  STResList815 = [STRes814|STResList814],
+  ?line ITRes199 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL091.xml','./msxsdtest/identityConstraint',invalid,S814),
+  ITResList200 = [ITRes199|ITResList199],
+
+
+  ?line {STRes815,S815} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL092.xsd','./msxsdtest/identityConstraint',valid),
+  STResList816 = [STRes815|STResList815],
+  ?line ITRes200 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL092.xml','./msxsdtest/identityConstraint',valid,S815),
+  ITResList201 = [ITRes200|ITResList200],
+
+
+  ?line {STRes816,S816} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL093.xsd','./msxsdtest/identityConstraint',valid),
+  STResList817 = [STRes816|STResList816],
+  ?line ITRes201 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL093.xml','./msxsdtest/identityConstraint',invalid,S816),
+  ITResList202 = [ITRes201|ITResList201],
+
+
+  ?line {STRes817,S817} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL094.xsd','./msxsdtest/identityConstraint',valid),
+  STResList818 = [STRes817|STResList817],
+  ?line ITRes202 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL094.xml','./msxsdtest/identityConstraint',valid,S817),
+  ITResList203 = [ITRes202|ITResList202],
+
+
+  ?line {STRes818,S818} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL095.xsd','./msxsdtest/identityConstraint',valid),
+  STResList819 = [STRes818|STResList818],
+  ?line ITRes203 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL095.xml','./msxsdtest/identityConstraint',invalid,S818),
+  ITResList204 = [ITRes203|ITResList203],
+
+
+  ?line {STRes819,S819} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL096.xsd','./msxsdtest/identityConstraint',valid),
+  STResList820 = [STRes819|STResList819],
+  ?line ITRes204 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL096.xml','./msxsdtest/identityConstraint',valid,S819),
+  ITResList205 = [ITRes204|ITResList204],
+
+
+  ?line {STRes820,S820} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL097.xsd','./msxsdtest/identityConstraint',valid),
+  STResList821 = [STRes820|STResList820],
+  ?line ITRes205 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL097.xml','./msxsdtest/identityConstraint',invalid,S820),
+  ITResList206 = [ITRes205|ITResList205],
+
+
+  ?line {STRes821,S821} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL098.xsd','./msxsdtest/identityConstraint',valid),
+  STResList822 = [STRes821|STResList821],
+  ?line ITRes206 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL098.xml','./msxsdtest/identityConstraint',valid,S821),
+  ITResList207 = [ITRes206|ITResList206],
+
+
+  ?line {STRes822,S822} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL099.xsd','./msxsdtest/identityConstraint',valid),
+  STResList823 = [STRes822|STResList822],
+  ?line ITRes207 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL099.xml','./msxsdtest/identityConstraint',invalid,S822),
+  ITResList208 = [ITRes207|ITResList207],
+
+
+  ?line {STRes823,S823} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL100.xsd','./msxsdtest/identityConstraint',valid),
+  STResList824 = [STRes823|STResList823],
+  ?line ITRes208 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL100.xml','./msxsdtest/identityConstraint',valid,S823),
+  ITResList209 = [ITRes208|ITResList208],
+
+
+  ?line {STRes824,S824} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL101.xsd','./msxsdtest/identityConstraint',valid),
+  STResList825 = [STRes824|STResList824],
+  ?line ITRes209 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL101.xml','./msxsdtest/identityConstraint',invalid,S824),
+  ITResList210 = [ITRes209|ITResList209],
+
+
+  ?line {STRes825,S825} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL102.xsd','./msxsdtest/identityConstraint',valid),
+  STResList826 = [STRes825|STResList825],
+  ?line ITRes210 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL102.xml','./msxsdtest/identityConstraint',valid,S825),
+  ITResList211 = [ITRes210|ITResList210],
+
+
+  ?line {STRes826,S826} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idL103.xsd','./msxsdtest/identityConstraint',valid),
+  STResList827 = [STRes826|STResList826],
+  ?line ITRes211 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idL103.xml','./msxsdtest/identityConstraint',invalid,S826),
+  ITResList212 = [ITRes211|ITResList211],
+
+
+  ?line {STRes827,S827} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idZ001.xsd','./msxsdtest/identityConstraint',valid),
+  STResList828 = [STRes827|STResList827],
+  ?line ITRes212 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idZ001.xml','./msxsdtest/identityConstraint',invalid,S827),
+  ITResList213 = [ITRes212|ITResList212],
+
+
+  ?line {STRes828,S828} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idZ002.xsd','./msxsdtest/identityConstraint',valid),
+  STResList829 = [STRes828|STResList828],
+  ?line ITRes213 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idZ002.xml','./msxsdtest/identityConstraint',invalid,S828),
+  ITResList214 = [ITRes213|ITResList213],
+
+
+
+
+  ?line {STRes829,S829} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/identityConstraint/idZ004.xsd','./msxsdtest/identityConstraint',valid),
+  STResList830 = [STRes829|STResList829],
+  ?line ITRes214 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/identityConstraint/idZ004.xml','./msxsdtest/identityConstraint',invalid,S829),
+  ITResList215 = [ITRes214|ITResList214],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList830,ITResList215).
+
+%% model groups (ALL).
+
+mgABCD(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgA001.xml','./msxsdtest/ModelGroups',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA004.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA005.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA006.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA007.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA009.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA010.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA011.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA012.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA013.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList13 = [STRes12|STResList12],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgA014.xml','./msxsdtest/ModelGroups',valid,S13),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA015.xsd','./msxsdtest/ModelGroups',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgA015.xml','./msxsdtest/ModelGroups',valid,S14),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA016.xsd','./msxsdtest/ModelGroups',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgA016.xml','./msxsdtest/ModelGroups',valid,S15),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA017.xsd','./msxsdtest/ModelGroups',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgA017.xml','./msxsdtest/ModelGroups',valid,S16),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes17,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA018.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList18 = [STRes17|STResList17],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgA019.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAa001.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAa002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAa003.xsd','./msxsdtest/ModelGroups',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgAa003.xml','./msxsdtest/ModelGroups',valid,S21),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAa004.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAa005.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAa006.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAa007.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAa008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAa009.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAa010.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAb001.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAb002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAb003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAb004.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAb005.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAb006.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAb007.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAb008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAb009.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgAb010.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,S39} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgB001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList40 = [STRes39|STResList39],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgB001.xml','./msxsdtest/ModelGroups',valid,S39),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgB002.xsd','./msxsdtest/ModelGroups',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgB002.xml','./msxsdtest/ModelGroups',valid,S40),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgB003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,S42} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgB004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList43 = [STRes42|STResList42],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgB004.xml','./msxsdtest/ModelGroups',valid,S42),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes43,S43} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgB006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList44 = [STRes43|STResList43],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgB006.xml','./msxsdtest/ModelGroups',valid,S43),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes44,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgB007.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList45 = [STRes44|STResList44],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgB008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgB009.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList47 = [STRes46|STResList46],
+
+
+  ?line {STRes47,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgB010.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList48 = [STRes47|STResList47],
+
+
+  ?line {STRes48,S48} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList49 = [STRes48|STResList48],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgC001.xml','./msxsdtest/ModelGroups',invalid,S48),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes49,S49} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC002.xsd','./msxsdtest/ModelGroups',valid),
+  STResList50 = [STRes49|STResList49],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgC002.xml','./msxsdtest/ModelGroups',valid,S49),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes50,S50} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC003.xsd','./msxsdtest/ModelGroups',valid),
+  STResList51 = [STRes50|STResList50],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgC003.xml','./msxsdtest/ModelGroups',invalid,S50),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes51,S51} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList52 = [STRes51|STResList51],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgC004.xml','./msxsdtest/ModelGroups',valid,S51),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes52,S52} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList53 = [STRes52|STResList52],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgC005.xml','./msxsdtest/ModelGroups',invalid,S52),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes53,S53} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList54 = [STRes53|STResList53],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgC006.xml','./msxsdtest/ModelGroups',valid,S53),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes54,S54} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC007.xsd','./msxsdtest/ModelGroups',valid),
+  STResList55 = [STRes54|STResList54],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgC007.xml','./msxsdtest/ModelGroups',invalid,S54),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes55,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList56 = [STRes55|STResList55],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC009.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,S57} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC010.xsd','./msxsdtest/ModelGroups',valid),
+  STResList58 = [STRes57|STResList57],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgC010.xml','./msxsdtest/ModelGroups',invalid,S57),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes58,S58} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC011.xsd','./msxsdtest/ModelGroups',valid),
+  STResList59 = [STRes58|STResList58],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgC011.xml','./msxsdtest/ModelGroups',valid,S58),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes59,S59} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC012.xsd','./msxsdtest/ModelGroups',valid),
+  STResList60 = [STRes59|STResList59],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgC012.xml','./msxsdtest/ModelGroups',invalid,S59),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes60,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC013.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList61 = [STRes60|STResList60],
+
+
+  ?line {STRes61,S61} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgC014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList62 = [STRes61|STResList61],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgC014.xml','./msxsdtest/ModelGroups',valid,S61),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes62,S62} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgD001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList63 = [STRes62|STResList62],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgD001.xml','./msxsdtest/ModelGroups',valid,S62),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes63,S63} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgD005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList64 = [STRes63|STResList63],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgD005.xml','./msxsdtest/ModelGroups',valid,S63),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes64,S64} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgD009.xsd','./msxsdtest/ModelGroups',valid),
+  STResList65 = [STRes64|STResList64],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgD009.xml','./msxsdtest/ModelGroups',valid,S64),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes65,S65} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgD013.xsd','./msxsdtest/ModelGroups',valid),
+  STResList66 = [STRes65|STResList65],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgD013.xml','./msxsdtest/ModelGroups',valid,S65),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList66,ITResList25).
+
+%% model groups ( sequence ).
+
+mgEFG(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgE001.xml','./msxsdtest/ModelGroups',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE004.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE005.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE006.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE007.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE009.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE010.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE011.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE012.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE013.xsd','./msxsdtest/ModelGroups',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgE013.xml','./msxsdtest/ModelGroups',valid,S12),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgE014.xml','./msxsdtest/ModelGroups',valid,S13),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE015.xsd','./msxsdtest/ModelGroups',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgE015.xml','./msxsdtest/ModelGroups',valid,S14),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE016.xsd','./msxsdtest/ModelGroups',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgE016.xml','./msxsdtest/ModelGroups',valid,S15),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE017.xsd','./msxsdtest/ModelGroups',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgE017.xml','./msxsdtest/ModelGroups',valid,S16),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgE018.xsd','./msxsdtest/ModelGroups',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgE018.xml','./msxsdtest/ModelGroups',valid,S17),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEa001.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEa002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEa003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEa004.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEa005.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEa006.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEa007.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEa008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEb001.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEb002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEb003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEb004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgEb004.xml','./msxsdtest/ModelGroups',valid,S29),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEb005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgEb005.xml','./msxsdtest/ModelGroups',valid,S30),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEb006.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEb007.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgEb008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF001.xml','./msxsdtest/ModelGroups',valid,S34),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF002.xsd','./msxsdtest/ModelGroups',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF002.xml','./msxsdtest/ModelGroups',valid,S35),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,S37} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList38 = [STRes37|STResList37],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF004.xml','./msxsdtest/ModelGroups',valid,S37),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes38,S38} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList39 = [STRes38|STResList38],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF005.xml','./msxsdtest/ModelGroups',valid,S38),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes39,S39} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList40 = [STRes39|STResList39],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF006.xml','./msxsdtest/ModelGroups',valid,S39),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF007.xsd','./msxsdtest/ModelGroups',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF007.xml','./msxsdtest/ModelGroups',valid,S40),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes41,S41} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF008.xsd','./msxsdtest/ModelGroups',valid),
+  STResList42 = [STRes41|STResList41],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF008.xml','./msxsdtest/ModelGroups',valid,S41),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes42,S42} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF009.xsd','./msxsdtest/ModelGroups',valid),
+  STResList43 = [STRes42|STResList42],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF009.xml','./msxsdtest/ModelGroups',valid,S42),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes43,S43} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF010.xsd','./msxsdtest/ModelGroups',valid),
+  STResList44 = [STRes43|STResList43],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF010.xml','./msxsdtest/ModelGroups',valid,S43),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes44,S44} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF011.xsd','./msxsdtest/ModelGroups',valid),
+  STResList45 = [STRes44|STResList44],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF011.xml','./msxsdtest/ModelGroups',valid,S44),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes45,S45} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF012.xsd','./msxsdtest/ModelGroups',valid),
+  STResList46 = [STRes45|STResList45],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF012.xml','./msxsdtest/ModelGroups',valid,S45),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes46,S46} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF013.xsd','./msxsdtest/ModelGroups',valid),
+  STResList47 = [STRes46|STResList46],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF013.xml','./msxsdtest/ModelGroups',valid,S46),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes47,S47} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList48 = [STRes47|STResList47],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF014.xml','./msxsdtest/ModelGroups',valid,S47),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes48,S48} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF015.xsd','./msxsdtest/ModelGroups',valid),
+  STResList49 = [STRes48|STResList48],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF015.xml','./msxsdtest/ModelGroups',valid,S48),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes49,S49} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF016.xsd','./msxsdtest/ModelGroups',valid),
+  STResList50 = [STRes49|STResList49],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF016.xml','./msxsdtest/ModelGroups',valid,S49),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes50,S50} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF017.xsd','./msxsdtest/ModelGroups',valid),
+  STResList51 = [STRes50|STResList50],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF017.xml','./msxsdtest/ModelGroups',valid,S50),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes51,S51} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF018.xsd','./msxsdtest/ModelGroups',valid),
+  STResList52 = [STRes51|STResList51],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF018.xml','./msxsdtest/ModelGroups',valid,S51),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes52,S52} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF019.xsd','./msxsdtest/ModelGroups',valid),
+  STResList53 = [STRes52|STResList52],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgF019.xml','./msxsdtest/ModelGroups',valid,S52),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes53,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF020.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList54 = [STRes53|STResList53],
+
+
+  ?line {STRes54,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF021.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList55 = [STRes54|STResList54],
+
+
+  ?line {STRes55,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF022.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList56 = [STRes55|STResList55],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgF023.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,S57} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList58 = [STRes57|STResList57],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG001.xml','./msxsdtest/ModelGroups',valid,S57),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,S59} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG003.xsd','./msxsdtest/ModelGroups',valid),
+  STResList60 = [STRes59|STResList59],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG003.xml','./msxsdtest/ModelGroups',invalid,S59),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes60,S60} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList61 = [STRes60|STResList60],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG004.xml','./msxsdtest/ModelGroups',valid,S60),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes61,S61} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList62 = [STRes61|STResList61],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG005.xml','./msxsdtest/ModelGroups',invalid,S61),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes62,S62} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList63 = [STRes62|STResList62],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG006.xml','./msxsdtest/ModelGroups',valid,S62),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes63,S63} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG007.xsd','./msxsdtest/ModelGroups',valid),
+  STResList64 = [STRes63|STResList63],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG007.xml','./msxsdtest/ModelGroups',valid,S63),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes64,S64} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG008.xsd','./msxsdtest/ModelGroups',valid),
+  STResList65 = [STRes64|STResList64],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG008.xml','./msxsdtest/ModelGroups',invalid,S64),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes65,S65} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG009.xsd','./msxsdtest/ModelGroups',valid),
+  STResList66 = [STRes65|STResList65],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG009.xml','./msxsdtest/ModelGroups',valid,S65),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes66,S66} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG010.xsd','./msxsdtest/ModelGroups',valid),
+  STResList67 = [STRes66|STResList66],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG010.xml','./msxsdtest/ModelGroups',valid,S66),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes67,S67} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG011.xsd','./msxsdtest/ModelGroups',valid),
+  STResList68 = [STRes67|STResList67],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG011.xml','./msxsdtest/ModelGroups',invalid,S67),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes68,S68} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG012.xsd','./msxsdtest/ModelGroups',valid),
+  STResList69 = [STRes68|STResList68],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG012.xml','./msxsdtest/ModelGroups',valid,S68),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes69,S69} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG013.xsd','./msxsdtest/ModelGroups',valid),
+  STResList70 = [STRes69|STResList69],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG013.xml','./msxsdtest/ModelGroups',invalid,S69),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes70,S70} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList71 = [STRes70|STResList70],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG014.xml','./msxsdtest/ModelGroups',valid,S70),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes71,S71} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG015.xsd','./msxsdtest/ModelGroups',valid),
+  STResList72 = [STRes71|STResList71],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG015.xml','./msxsdtest/ModelGroups',invalid,S71),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes72,S72} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG016.xsd','./msxsdtest/ModelGroups',valid),
+  STResList73 = [STRes72|STResList72],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG016.xml','./msxsdtest/ModelGroups',valid,S72),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes73,S73} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG017.xsd','./msxsdtest/ModelGroups',valid),
+  STResList74 = [STRes73|STResList73],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG017.xml','./msxsdtest/ModelGroups',invalid,S73),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes74,S74} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG018.xsd','./msxsdtest/ModelGroups',valid),
+  STResList75 = [STRes74|STResList74],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG018.xml','./msxsdtest/ModelGroups',invalid,S74),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes75,S75} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG019.xsd','./msxsdtest/ModelGroups',valid),
+  STResList76 = [STRes75|STResList75],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG019.xml','./msxsdtest/ModelGroups',valid,S75),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes76,S76} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG020.xsd','./msxsdtest/ModelGroups',valid),
+  STResList77 = [STRes76|STResList76],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG020.xml','./msxsdtest/ModelGroups',invalid,S76),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes77,S77} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG021.xsd','./msxsdtest/ModelGroups',valid),
+  STResList78 = [STRes77|STResList77],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG021.xml','./msxsdtest/ModelGroups',invalid,S77),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes78,S78} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG022.xsd','./msxsdtest/ModelGroups',valid),
+  STResList79 = [STRes78|STResList78],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG022.xml','./msxsdtest/ModelGroups',valid,S78),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes79,S79} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG023.xsd','./msxsdtest/ModelGroups',valid),
+  STResList80 = [STRes79|STResList79],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG023.xml','./msxsdtest/ModelGroups',valid,S79),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes80,S80} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG024.xsd','./msxsdtest/ModelGroups',valid),
+  STResList81 = [STRes80|STResList80],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG024.xml','./msxsdtest/ModelGroups',invalid,S80),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes81,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG025.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList82 = [STRes81|STResList81],
+
+
+  ?line {STRes82,S82} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG026.xsd','./msxsdtest/ModelGroups',valid),
+  STResList83 = [STRes82|STResList82],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgG026.xml','./msxsdtest/ModelGroups',valid,S82),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes83,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG027.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList84 = [STRes83|STResList83],
+
+
+  ?line {STRes84,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG028.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList85 = [STRes84|STResList84],
+
+
+  ?line {STRes85,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG029.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList86 = [STRes85|STResList85],
+
+
+  ?line {STRes86,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgG030.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList87 = [STRes86|STResList86],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList87,ITResList51).
+
+%% model groups ( choice ).
+
+mgHIJ(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgH001.xml','./msxsdtest/ModelGroups',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH004.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH005.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH006.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH007.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH009.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH010.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH011.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH012.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH013.xsd','./msxsdtest/ModelGroups',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgH013.xml','./msxsdtest/ModelGroups',valid,S12),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgH014.xml','./msxsdtest/ModelGroups',valid,S13),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH015.xsd','./msxsdtest/ModelGroups',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgH015.xml','./msxsdtest/ModelGroups',valid,S14),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH016.xsd','./msxsdtest/ModelGroups',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgH016.xml','./msxsdtest/ModelGroups',valid,S15),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH017.xsd','./msxsdtest/ModelGroups',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgH017.xml','./msxsdtest/ModelGroups',valid,S16),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgH018.xsd','./msxsdtest/ModelGroups',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgH018.xml','./msxsdtest/ModelGroups',valid,S17),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHa001.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHa002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHa003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHa004.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHa005.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHa006.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHa007.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHa008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHb001.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHb002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHb003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHb004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgHb004.xml','./msxsdtest/ModelGroups',valid,S29),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHb005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgHb005.xml','./msxsdtest/ModelGroups',valid,S30),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHb006.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHb007.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgHb008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI001.xml','./msxsdtest/ModelGroups',valid,S34),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI002.xsd','./msxsdtest/ModelGroups',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI002.xml','./msxsdtest/ModelGroups',valid,S35),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,S37} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList38 = [STRes37|STResList37],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI004.xml','./msxsdtest/ModelGroups',valid,S37),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes38,S38} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList39 = [STRes38|STResList38],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI005.xml','./msxsdtest/ModelGroups',valid,S38),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes39,S39} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList40 = [STRes39|STResList39],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI006.xml','./msxsdtest/ModelGroups',valid,S39),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI007.xsd','./msxsdtest/ModelGroups',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI007.xml','./msxsdtest/ModelGroups',valid,S40),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes41,S41} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI008.xsd','./msxsdtest/ModelGroups',valid),
+  STResList42 = [STRes41|STResList41],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI008.xml','./msxsdtest/ModelGroups',valid,S41),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes42,S42} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI009.xsd','./msxsdtest/ModelGroups',valid),
+  STResList43 = [STRes42|STResList42],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI009.xml','./msxsdtest/ModelGroups',valid,S42),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes43,S43} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI010.xsd','./msxsdtest/ModelGroups',valid),
+  STResList44 = [STRes43|STResList43],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI010.xml','./msxsdtest/ModelGroups',valid,S43),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes44,S44} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI011.xsd','./msxsdtest/ModelGroups',valid),
+  STResList45 = [STRes44|STResList44],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI011.xml','./msxsdtest/ModelGroups',valid,S44),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes45,S45} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI012.xsd','./msxsdtest/ModelGroups',valid),
+  STResList46 = [STRes45|STResList45],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI012.xml','./msxsdtest/ModelGroups',valid,S45),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes46,S46} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI013.xsd','./msxsdtest/ModelGroups',valid),
+  STResList47 = [STRes46|STResList46],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI013.xml','./msxsdtest/ModelGroups',valid,S46),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes47,S47} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList48 = [STRes47|STResList47],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI014.xml','./msxsdtest/ModelGroups',valid,S47),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes48,S48} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI015.xsd','./msxsdtest/ModelGroups',valid),
+  STResList49 = [STRes48|STResList48],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI015.xml','./msxsdtest/ModelGroups',valid,S48),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes49,S49} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI016.xsd','./msxsdtest/ModelGroups',valid),
+  STResList50 = [STRes49|STResList49],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI016.xml','./msxsdtest/ModelGroups',valid,S49),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes50,S50} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI017.xsd','./msxsdtest/ModelGroups',valid),
+  STResList51 = [STRes50|STResList50],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI017.xml','./msxsdtest/ModelGroups',valid,S50),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes51,S51} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI018.xsd','./msxsdtest/ModelGroups',valid),
+  STResList52 = [STRes51|STResList51],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI018.xml','./msxsdtest/ModelGroups',valid,S51),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes52,S52} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI019.xsd','./msxsdtest/ModelGroups',valid),
+  STResList53 = [STRes52|STResList52],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgI019.xml','./msxsdtest/ModelGroups',valid,S52),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes53,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI020.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList54 = [STRes53|STResList53],
+
+
+  ?line {STRes54,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI021.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList55 = [STRes54|STResList54],
+
+
+  ?line {STRes55,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI022.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList56 = [STRes55|STResList55],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgI023.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,S57} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList58 = [STRes57|STResList57],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ001.xml','./msxsdtest/ModelGroups',valid,S57),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,S59} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ003.xsd','./msxsdtest/ModelGroups',valid),
+  STResList60 = [STRes59|STResList59],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ003.xml','./msxsdtest/ModelGroups',invalid,S59),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes60,S60} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList61 = [STRes60|STResList60],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ004.xml','./msxsdtest/ModelGroups',valid,S60),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes61,S61} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList62 = [STRes61|STResList61],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ005.xml','./msxsdtest/ModelGroups',invalid,S61),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes62,S62} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList63 = [STRes62|STResList62],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ006.xml','./msxsdtest/ModelGroups',valid,S62),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes63,S63} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ007.xsd','./msxsdtest/ModelGroups',valid),
+  STResList64 = [STRes63|STResList63],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ007.xml','./msxsdtest/ModelGroups',valid,S63),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes64,S64} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ008.xsd','./msxsdtest/ModelGroups',valid),
+  STResList65 = [STRes64|STResList64],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ008.xml','./msxsdtest/ModelGroups',invalid,S64),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes65,S65} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ009.xsd','./msxsdtest/ModelGroups',valid),
+  STResList66 = [STRes65|STResList65],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ009.xml','./msxsdtest/ModelGroups',valid,S65),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes66,S66} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ010.xsd','./msxsdtest/ModelGroups',valid),
+  STResList67 = [STRes66|STResList66],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ010.xml','./msxsdtest/ModelGroups',valid,S66),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes67,S67} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ011.xsd','./msxsdtest/ModelGroups',valid),
+  STResList68 = [STRes67|STResList67],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ011.xml','./msxsdtest/ModelGroups',invalid,S67),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes68,S68} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ012.xsd','./msxsdtest/ModelGroups',valid),
+  STResList69 = [STRes68|STResList68],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ012.xml','./msxsdtest/ModelGroups',valid,S68),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes69,S69} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ013.xsd','./msxsdtest/ModelGroups',valid),
+  STResList70 = [STRes69|STResList69],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ013.xml','./msxsdtest/ModelGroups',invalid,S69),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes70,S70} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList71 = [STRes70|STResList70],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ014.xml','./msxsdtest/ModelGroups',valid,S70),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes71,S71} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ015.xsd','./msxsdtest/ModelGroups',valid),
+  STResList72 = [STRes71|STResList71],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ015.xml','./msxsdtest/ModelGroups',invalid,S71),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes72,S72} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ016.xsd','./msxsdtest/ModelGroups',valid),
+  STResList73 = [STRes72|STResList72],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ016.xml','./msxsdtest/ModelGroups',valid,S72),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes73,S73} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ017.xsd','./msxsdtest/ModelGroups',valid),
+  STResList74 = [STRes73|STResList73],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ017.xml','./msxsdtest/ModelGroups',invalid,S73),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes74,S74} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ018.xsd','./msxsdtest/ModelGroups',valid),
+  STResList75 = [STRes74|STResList74],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ018.xml','./msxsdtest/ModelGroups',invalid,S74),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes75,S75} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ019.xsd','./msxsdtest/ModelGroups',valid),
+  STResList76 = [STRes75|STResList75],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ019.xml','./msxsdtest/ModelGroups',valid,S75),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes76,S76} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ020.xsd','./msxsdtest/ModelGroups',valid),
+  STResList77 = [STRes76|STResList76],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ020.xml','./msxsdtest/ModelGroups',invalid,S76),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes77,S77} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ021.xsd','./msxsdtest/ModelGroups',valid),
+  STResList78 = [STRes77|STResList77],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ021.xml','./msxsdtest/ModelGroups',invalid,S77),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes78,S78} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ022.xsd','./msxsdtest/ModelGroups',valid),
+  STResList79 = [STRes78|STResList78],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ022.xml','./msxsdtest/ModelGroups',valid,S78),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes79,S79} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ023.xsd','./msxsdtest/ModelGroups',valid),
+  STResList80 = [STRes79|STResList79],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ023.xml','./msxsdtest/ModelGroups',valid,S79),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes80,S80} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ024.xsd','./msxsdtest/ModelGroups',valid),
+  STResList81 = [STRes80|STResList80],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ024.xml','./msxsdtest/ModelGroups',invalid,S80),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes81,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ025.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList82 = [STRes81|STResList81],
+
+
+  ?line {STRes82,S82} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ026.xsd','./msxsdtest/ModelGroups',valid),
+  STResList83 = [STRes82|STResList82],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgJ026.xml','./msxsdtest/ModelGroups',valid,S82),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes83,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ027.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList84 = [STRes83|STResList83],
+
+
+  ?line {STRes84,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ028.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList85 = [STRes84|STResList84],
+
+
+  ?line {STRes85,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ029.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList86 = [STRes85|STResList85],
+
+
+  ?line {STRes86,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgJ030.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList87 = [STRes86|STResList86],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList87,ITResList51).
+
+%% model group validation checking (sequence).
+
+mgK(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgK001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgK001.xml','./msxsdtest/ModelGroups',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgK002.xsd','./msxsdtest/ModelGroups',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgK002.xml','./msxsdtest/ModelGroups',invalid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgK003.xsd','./msxsdtest/ModelGroups',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgK003.xml','./msxsdtest/ModelGroups',invalid,S2),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgK004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgK004.xml','./msxsdtest/ModelGroups',valid,S3),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgK005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgK005.xml','./msxsdtest/ModelGroups',invalid,S4),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgK006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgK006.xml','./msxsdtest/ModelGroups',invalid,S5),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgK007.xsd','./msxsdtest/ModelGroups',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgK007.xml','./msxsdtest/ModelGroups',invalid,S6),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgK008.xsd','./msxsdtest/ModelGroups',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgK008.xml','./msxsdtest/ModelGroups',invalid,S7),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgK009.xsd','./msxsdtest/ModelGroups',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgK009.xml','./msxsdtest/ModelGroups',valid,S8),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgK010.xsd','./msxsdtest/ModelGroups',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgK010.xml','./msxsdtest/ModelGroups',invalid,S9),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList10,ITResList10).
+
+%% model group validation checking (choice, all).
+
+mgLM(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgL001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgL001.xml','./msxsdtest/ModelGroups',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgL002.xsd','./msxsdtest/ModelGroups',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgL002.xml','./msxsdtest/ModelGroups',invalid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgL003.xsd','./msxsdtest/ModelGroups',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgL003.xml','./msxsdtest/ModelGroups',invalid,S2),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgL004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgL004.xml','./msxsdtest/ModelGroups',valid,S3),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgL005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgL005.xml','./msxsdtest/ModelGroups',invalid,S4),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgL006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgL006.xml','./msxsdtest/ModelGroups',valid,S5),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgL007.xsd','./msxsdtest/ModelGroups',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgL007.xml','./msxsdtest/ModelGroups',invalid,S6),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgL008.xsd','./msxsdtest/ModelGroups',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgL008.xml','./msxsdtest/ModelGroups',valid,S7),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgL009.xsd','./msxsdtest/ModelGroups',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgL009.xml','./msxsdtest/ModelGroups',valid,S8),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgL010.xsd','./msxsdtest/ModelGroups',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgL010.xml','./msxsdtest/ModelGroups',invalid,S9),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM002.xsd','./msxsdtest/ModelGroups',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM002.xml','./msxsdtest/ModelGroups',invalid,S10),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM003.xsd','./msxsdtest/ModelGroups',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM003.xml','./msxsdtest/ModelGroups',invalid,S11),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM004.xml','./msxsdtest/ModelGroups',valid,S12),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM005.xml','./msxsdtest/ModelGroups',invalid,S13),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM006.xml','./msxsdtest/ModelGroups',invalid,S14),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM007.xsd','./msxsdtest/ModelGroups',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM007.xml','./msxsdtest/ModelGroups',invalid,S15),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM008.xsd','./msxsdtest/ModelGroups',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM008.xml','./msxsdtest/ModelGroups',valid,S16),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM009.xsd','./msxsdtest/ModelGroups',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM009.xml','./msxsdtest/ModelGroups',valid,S17),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM010.xsd','./msxsdtest/ModelGroups',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM010.xml','./msxsdtest/ModelGroups',invalid,S18),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM011.xsd','./msxsdtest/ModelGroups',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM011.xml','./msxsdtest/ModelGroups',valid,S19),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM012.xsd','./msxsdtest/ModelGroups',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM012.xml','./msxsdtest/ModelGroups',invalid,S20),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM013.xsd','./msxsdtest/ModelGroups',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM013.xml','./msxsdtest/ModelGroups',valid,S21),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgM014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgM014.xml','./msxsdtest/ModelGroups',invalid,S22),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList23,ITResList23).
+
+%% Element Sequence Valid.
+
+mgN(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN001.xsd','./msxsdtest/ModelGroups',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN001.xml','./msxsdtest/ModelGroups',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN002.xsd','./msxsdtest/ModelGroups',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN002.xml','./msxsdtest/ModelGroups',invalid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN003.xsd','./msxsdtest/ModelGroups',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN003.xml','./msxsdtest/ModelGroups',invalid,S2),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN004.xml','./msxsdtest/ModelGroups',invalid,S3),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN005.xml','./msxsdtest/ModelGroups',valid,S4),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN006.xml','./msxsdtest/ModelGroups',invalid,S5),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN007.xsd','./msxsdtest/ModelGroups',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN007.xml','./msxsdtest/ModelGroups',invalid,S6),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN008.xsd','./msxsdtest/ModelGroups',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN008.xml','./msxsdtest/ModelGroups',invalid,S7),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN009.xsd','./msxsdtest/ModelGroups',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN009.xml','./msxsdtest/ModelGroups',invalid,S8),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN010.xsd','./msxsdtest/ModelGroups',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN010.xml','./msxsdtest/ModelGroups',invalid,S9),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN011.xsd','./msxsdtest/ModelGroups',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN011.xml','./msxsdtest/ModelGroups',invalid,S10),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN012.xsd','./msxsdtest/ModelGroups',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN012.xml','./msxsdtest/ModelGroups',valid,S11),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN013.xsd','./msxsdtest/ModelGroups',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN013.xml','./msxsdtest/ModelGroups',invalid,S12),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN014.xml','./msxsdtest/ModelGroups',invalid,S13),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN015.xsd','./msxsdtest/ModelGroups',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN015.xml','./msxsdtest/ModelGroups',invalid,S14),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgN016.xsd','./msxsdtest/ModelGroups',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgN016.xml','./msxsdtest/ModelGroups',invalid,S15),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList16,ITResList16).
+
+%% All Group Limited.
+
+mgOP(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO001.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO002.xsd','./msxsdtest/ModelGroups',valid),
+  STResList2 = [STRes1|STResList1],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO002.xml','./msxsdtest/ModelGroups',valid,S1),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO004.xsd','./msxsdtest/ModelGroups',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO004.xml','./msxsdtest/ModelGroups',valid,S3),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO005.xsd','./msxsdtest/ModelGroups',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO005.xml','./msxsdtest/ModelGroups',valid,S4),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO006.xml','./msxsdtest/ModelGroups',valid,S5),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO007.xsd','./msxsdtest/ModelGroups',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO007.xml','./msxsdtest/ModelGroups',valid,S6),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO008.xsd','./msxsdtest/ModelGroups',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO008.xml','./msxsdtest/ModelGroups',valid,S7),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO009.xsd','./msxsdtest/ModelGroups',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO009.xml','./msxsdtest/ModelGroups',valid,S8),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO010.xsd','./msxsdtest/ModelGroups',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO010.xml','./msxsdtest/ModelGroups',valid,S9),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO011.xsd','./msxsdtest/ModelGroups',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO011.xml','./msxsdtest/ModelGroups',valid,S10),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO012.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO013.xsd','./msxsdtest/ModelGroups',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO013.xml','./msxsdtest/ModelGroups',valid,S12),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO014.xml','./msxsdtest/ModelGroups',valid,S13),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO015.xsd','./msxsdtest/ModelGroups',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO015.xml','./msxsdtest/ModelGroups',valid,S14),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO016.xsd','./msxsdtest/ModelGroups',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO016.xml','./msxsdtest/ModelGroups',valid,S15),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO017.xsd','./msxsdtest/ModelGroups',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO017.xml','./msxsdtest/ModelGroups',valid,S16),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes17,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO018.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList18 = [STRes17|STResList17],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO019.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO020.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO021.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO022.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO023.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO024.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO025.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO026.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO027.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO028.xsd','./msxsdtest/ModelGroups',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO028.xml','./msxsdtest/ModelGroups',valid,S27),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO029.xsd','./msxsdtest/ModelGroups',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO029.xml','./msxsdtest/ModelGroups',valid,S28),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO030.xsd','./msxsdtest/ModelGroups',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO030.xml','./msxsdtest/ModelGroups',valid,S29),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO031.xsd','./msxsdtest/ModelGroups',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO031.xml','./msxsdtest/ModelGroups',valid,S30),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO032.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO033.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO034.xsd','./msxsdtest/ModelGroups',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO034.xml','./msxsdtest/ModelGroups',valid,S33),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO035.xsd','./msxsdtest/ModelGroups',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO035.xml','./msxsdtest/ModelGroups',valid,S34),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO036.xsd','./msxsdtest/ModelGroups',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO036.xml','./msxsdtest/ModelGroups',valid,S35),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO037.xsd','./msxsdtest/ModelGroups',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO037.xml','./msxsdtest/ModelGroups',valid,S36),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes37,S37} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgO038.xsd','./msxsdtest/ModelGroups',valid),
+  STResList38 = [STRes37|STResList37],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgO038.xml','./msxsdtest/ModelGroups',valid,S37),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP039.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP040.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList40 = [STRes39|STResList39],
+
+
+  ?line {STRes40,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP041.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList41 = [STRes40|STResList40],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP042.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP043.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList43 = [STRes42|STResList42],
+
+
+  ?line {STRes43,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP049.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList44 = [STRes43|STResList43],
+
+
+  ?line {STRes44,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP050.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList45 = [STRes44|STResList44],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP055.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP056.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList47 = [STRes46|STResList46],
+
+
+  ?line {STRes47,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP057.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList48 = [STRes47|STResList47],
+
+
+  ?line {STRes48,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP058.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList49 = [STRes48|STResList48],
+
+
+  ?line {STRes49,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP059.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList50 = [STRes49|STResList49],
+
+
+  ?line {STRes50,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP060.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList51 = [STRes50|STResList50],
+
+
+  ?line {STRes51,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP061.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList52 = [STRes51|STResList51],
+
+
+  ?line {STRes52,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgP062.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList53 = [STRes52|STResList52],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList53,ITResList23).
+
+%% Element Declarations Consistent, 3.8.6
+
+mgQR(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ001.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ002.xsd','./msxsdtest/ModelGroups',valid),
+  STResList2 = [STRes1|STResList1],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ002.xml','./msxsdtest/ModelGroups',valid,S1),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ003.xsd','./msxsdtest/ModelGroups',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ003.xml','./msxsdtest/ModelGroups',valid,S2),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ004.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ005.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ006.xsd','./msxsdtest/ModelGroups',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ006.xml','./msxsdtest/ModelGroups',valid,S5),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ007.xsd','./msxsdtest/ModelGroups',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ007.xml','./msxsdtest/ModelGroups',valid,S6),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ008.xsd','./msxsdtest/ModelGroups',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ008.xml','./msxsdtest/ModelGroups',valid,S7),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ009.xsd','./msxsdtest/ModelGroups',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ009.xml','./msxsdtest/ModelGroups',valid,S8),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ010.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ011.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ012.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ013.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList13 = [STRes12|STResList12],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ014.xsd','./msxsdtest/ModelGroups',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ014.xml','./msxsdtest/ModelGroups',valid,S13),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ015.xsd','./msxsdtest/ModelGroups',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ015.xml','./msxsdtest/ModelGroups',valid,S14),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ016.xsd','./msxsdtest/ModelGroups',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ016.xml','./msxsdtest/ModelGroups',valid,S15),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ017.xsd','./msxsdtest/ModelGroups',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ017.xml','./msxsdtest/ModelGroups',valid,S16),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ018.xsd','./msxsdtest/ModelGroups',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ018.xml','./msxsdtest/ModelGroups',valid,S17),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ019.xsd','./msxsdtest/ModelGroups',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ019.xml','./msxsdtest/ModelGroups',valid,S18),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ020.xsd','./msxsdtest/ModelGroups',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/ModelGroups/mgQ020.xml','./msxsdtest/ModelGroups',valid,S19),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgQ021.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR001.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR002.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR003.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR004.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR005.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR006.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR007.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR008.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR009.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR010.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR011.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR012.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR013.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR014.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR015.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR016.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR017.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR018.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR019.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList40 = [STRes39|STResList39],
+
+
+  ?line {STRes40,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR020.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList41 = [STRes40|STResList40],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR021.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/ModelGroups/mgR022.xsd','./msxsdtest/ModelGroups',invalid),
+  STResList43 = [STRes42|STResList42],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList43,ITResList13).
+
+%% Deterministic Sequences.
+
+mgS(Config) when is_list(Config) ->
+
+
+
+
+
+
+
+
+  xmerl_xsd_lib:compare_test_results(Config,[],[]).
+
+%% 3.9.1 The Particle Schema Component.
+
+particlesAB(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA001.xsd','./msxsdtest/Particles',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA001.xml','./msxsdtest/Particles',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA002.xsd','./msxsdtest/Particles',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA002.xml','./msxsdtest/Particles',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA003.xsd','./msxsdtest/Particles',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA003.xml','./msxsdtest/Particles',invalid,S2),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA004.xsd','./msxsdtest/Particles',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA004.xml','./msxsdtest/Particles',invalid,S3),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA005.xsd','./msxsdtest/Particles',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA005.xml','./msxsdtest/Particles',invalid,S4),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA006.xsd','./msxsdtest/Particles',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA006.xml','./msxsdtest/Particles',valid,S5),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA007.xsd','./msxsdtest/Particles',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA007.xml','./msxsdtest/Particles',valid,S6),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA008.xsd','./msxsdtest/Particles',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA008.xml','./msxsdtest/Particles',invalid,S7),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA009.xsd','./msxsdtest/Particles',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA009.xml','./msxsdtest/Particles',invalid,S8),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA010.xsd','./msxsdtest/Particles',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA010.xml','./msxsdtest/Particles',valid,S9),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA011.xsd','./msxsdtest/Particles',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA011.xml','./msxsdtest/Particles',valid,S10),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA012.xsd','./msxsdtest/Particles',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA012.xml','./msxsdtest/Particles',invalid,S11),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA013.xsd','./msxsdtest/Particles',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA013.xml','./msxsdtest/Particles',invalid,S12),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA014.xsd','./msxsdtest/Particles',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA014.xml','./msxsdtest/Particles',valid,S13),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesA015.xsd','./msxsdtest/Particles',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesA015.xml','./msxsdtest/Particles',valid,S14),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB001.xsd','./msxsdtest/Particles',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB001.xml','./msxsdtest/Particles',invalid,S15),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB002.xsd','./msxsdtest/Particles',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB002.xml','./msxsdtest/Particles',valid,S16),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB003.xsd','./msxsdtest/Particles',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB003.xml','./msxsdtest/Particles',invalid,S17),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB004.xsd','./msxsdtest/Particles',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB004.xml','./msxsdtest/Particles',invalid,S18),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB005.xsd','./msxsdtest/Particles',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB005.xml','./msxsdtest/Particles',valid,S19),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB006.xsd','./msxsdtest/Particles',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB006.xml','./msxsdtest/Particles',valid,S20),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB007.xsd','./msxsdtest/Particles',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB007.xml','./msxsdtest/Particles',invalid,S21),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB008.xsd','./msxsdtest/Particles',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB008.xml','./msxsdtest/Particles',invalid,S22),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB009.xsd','./msxsdtest/Particles',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB009.xml','./msxsdtest/Particles',valid,S23),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB010.xsd','./msxsdtest/Particles',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB010.xml','./msxsdtest/Particles',valid,S24),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB011.xsd','./msxsdtest/Particles',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB011.xml','./msxsdtest/Particles',invalid,S25),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB012.xsd','./msxsdtest/Particles',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB012.xml','./msxsdtest/Particles',invalid,S26),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB013.xsd','./msxsdtest/Particles',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB013.xml','./msxsdtest/Particles',valid,S27),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB014.xsd','./msxsdtest/Particles',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB014.xml','./msxsdtest/Particles',valid,S28),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesB015.xsd','./msxsdtest/Particles',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesB015.xml','./msxsdtest/Particles',invalid,S29),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList30,ITResList30).
+
+%% 3.9.4 Particle Validation Rules: Element Sequence Locally Valid.
+
+particlesCDE(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC001.xsd','./msxsdtest/Particles',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC001.xml','./msxsdtest/Particles',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC002.xsd','./msxsdtest/Particles',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC002.xml','./msxsdtest/Particles',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC003.xsd','./msxsdtest/Particles',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC003.xml','./msxsdtest/Particles',valid,S2),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC004.xsd','./msxsdtest/Particles',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC004.xml','./msxsdtest/Particles',valid,S3),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC005.xsd','./msxsdtest/Particles',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC005.xml','./msxsdtest/Particles',valid,S4),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC006.xsd','./msxsdtest/Particles',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC006.xml','./msxsdtest/Particles',valid,S5),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC007.xsd','./msxsdtest/Particles',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC007.xml','./msxsdtest/Particles',invalid,S6),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC008.xsd','./msxsdtest/Particles',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC008.xml','./msxsdtest/Particles',valid,S7),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC009.xsd','./msxsdtest/Particles',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC009.xml','./msxsdtest/Particles',valid,S8),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC010.xsd','./msxsdtest/Particles',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC010.xml','./msxsdtest/Particles',valid,S9),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC011.xsd','./msxsdtest/Particles',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC011.xml','./msxsdtest/Particles',valid,S10),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC012.xsd','./msxsdtest/Particles',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC012.xml','./msxsdtest/Particles',invalid,S11),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC013.xsd','./msxsdtest/Particles',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC013.xml','./msxsdtest/Particles',invalid,S12),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC014.xsd','./msxsdtest/Particles',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC014.xml','./msxsdtest/Particles',invalid,S13),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC015.xsd','./msxsdtest/Particles',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC015.xml','./msxsdtest/Particles',valid,S14),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC016.xsd','./msxsdtest/Particles',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC016.xml','./msxsdtest/Particles',valid,S15),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC017.xsd','./msxsdtest/Particles',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC017.xml','./msxsdtest/Particles',invalid,S16),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC018.xsd','./msxsdtest/Particles',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC018.xml','./msxsdtest/Particles',invalid,S17),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC019.xsd','./msxsdtest/Particles',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC019.xml','./msxsdtest/Particles',invalid,S18),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC020.xsd','./msxsdtest/Particles',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC020.xml','./msxsdtest/Particles',invalid,S19),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC021.xsd','./msxsdtest/Particles',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC021.xml','./msxsdtest/Particles',valid,S20),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC022.xsd','./msxsdtest/Particles',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC022.xml','./msxsdtest/Particles',invalid,S21),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC023.xsd','./msxsdtest/Particles',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC023.xml','./msxsdtest/Particles',invalid,S22),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC024.xsd','./msxsdtest/Particles',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC024.xml','./msxsdtest/Particles',invalid,S23),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC025.xsd','./msxsdtest/Particles',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC025.xml','./msxsdtest/Particles',invalid,S24),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC026.xsd','./msxsdtest/Particles',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC026.xml','./msxsdtest/Particles',invalid,S25),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC027.xsd','./msxsdtest/Particles',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC027.xml','./msxsdtest/Particles',valid,S26),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC028.xsd','./msxsdtest/Particles',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC028.xml','./msxsdtest/Particles',valid,S27),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC029.xsd','./msxsdtest/Particles',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC029.xml','./msxsdtest/Particles',valid,S28),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC030.xsd','./msxsdtest/Particles',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC030.xml','./msxsdtest/Particles',valid,S29),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC031.xsd','./msxsdtest/Particles',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC031.xml','./msxsdtest/Particles',invalid,S30),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC032.xsd','./msxsdtest/Particles',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC032.xml','./msxsdtest/Particles',invalid,S31),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC033.xsd','./msxsdtest/Particles',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC033.xml','./msxsdtest/Particles',invalid,S32),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC034.xsd','./msxsdtest/Particles',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC034.xml','./msxsdtest/Particles',valid,S33),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC035.xsd','./msxsdtest/Particles',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC035.xml','./msxsdtest/Particles',invalid,S34),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC036.xsd','./msxsdtest/Particles',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC036.xml','./msxsdtest/Particles',invalid,S35),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC037.xsd','./msxsdtest/Particles',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC037.xml','./msxsdtest/Particles',valid,S36),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes37,S37} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC038.xsd','./msxsdtest/Particles',valid),
+  STResList38 = [STRes37|STResList37],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC038.xml','./msxsdtest/Particles',invalid,S37),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes38,S38} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC039.xsd','./msxsdtest/Particles',valid),
+  STResList39 = [STRes38|STResList38],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC039.xml','./msxsdtest/Particles',invalid,S38),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes39,S39} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC040.xsd','./msxsdtest/Particles',valid),
+  STResList40 = [STRes39|STResList39],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC040.xml','./msxsdtest/Particles',valid,S39),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC041.xsd','./msxsdtest/Particles',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC041.xml','./msxsdtest/Particles',valid,S40),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes41,S41} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC042.xsd','./msxsdtest/Particles',valid),
+  STResList42 = [STRes41|STResList41],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC042.xml','./msxsdtest/Particles',invalid,S41),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes42,S42} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC043.xsd','./msxsdtest/Particles',valid),
+  STResList43 = [STRes42|STResList42],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC043.xml','./msxsdtest/Particles',valid,S42),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes43,S43} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC044.xsd','./msxsdtest/Particles',valid),
+  STResList44 = [STRes43|STResList43],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC044.xml','./msxsdtest/Particles',valid,S43),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes44,S44} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC045.xsd','./msxsdtest/Particles',valid),
+  STResList45 = [STRes44|STResList44],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC045.xml','./msxsdtest/Particles',valid,S44),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes45,S45} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC046.xsd','./msxsdtest/Particles',valid),
+  STResList46 = [STRes45|STResList45],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC046.xml','./msxsdtest/Particles',valid,S45),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes46,S46} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC047.xsd','./msxsdtest/Particles',valid),
+  STResList47 = [STRes46|STResList46],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC047.xml','./msxsdtest/Particles',invalid,S46),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes47,S47} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesC048.xsd','./msxsdtest/Particles',valid),
+  STResList48 = [STRes47|STResList47],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesC048.xml','./msxsdtest/Particles',invalid,S47),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes48,S48} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDa001.xsd','./msxsdtest/Particles',valid),
+  STResList49 = [STRes48|STResList48],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDa001.xml','./msxsdtest/Particles',invalid,S48),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes49,S49} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDa002.xsd','./msxsdtest/Particles',valid),
+  STResList50 = [STRes49|STResList49],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDa002.xml','./msxsdtest/Particles',valid,S49),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes50,S50} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDa003.xsd','./msxsdtest/Particles',valid),
+  STResList51 = [STRes50|STResList50],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDa003.xml','./msxsdtest/Particles',invalid,S50),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes51,S51} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDa004.xsd','./msxsdtest/Particles',valid),
+  STResList52 = [STRes51|STResList51],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDa004.xml','./msxsdtest/Particles',invalid,S51),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes52,S52} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDa005.xsd','./msxsdtest/Particles',valid),
+  STResList53 = [STRes52|STResList52],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDa005.xml','./msxsdtest/Particles',invalid,S52),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes53,S53} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDa006.xsd','./msxsdtest/Particles',valid),
+  STResList54 = [STRes53|STResList53],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDa006.xml','./msxsdtest/Particles',invalid,S53),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes54,S54} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDa007.xsd','./msxsdtest/Particles',valid),
+  STResList55 = [STRes54|STResList54],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDa007.xml','./msxsdtest/Particles',valid,S54),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes55,S55} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDa008.xsd','./msxsdtest/Particles',valid),
+  STResList56 = [STRes55|STResList55],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDa008.xml','./msxsdtest/Particles',invalid,S55),
+  ITResList56 = [ITRes55|ITResList55],
+
+
+  ?line {STRes56,S56} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDa009.xsd','./msxsdtest/Particles',valid),
+  STResList57 = [STRes56|STResList56],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDa009.xml','./msxsdtest/Particles',invalid,S56),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes57,S57} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDa010.xsd','./msxsdtest/Particles',valid),
+  STResList58 = [STRes57|STResList57],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDa010.xml','./msxsdtest/Particles',invalid,S57),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes58,S58} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDa011.xsd','./msxsdtest/Particles',valid),
+  STResList59 = [STRes58|STResList58],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDa011.xml','./msxsdtest/Particles',invalid,S58),
+  ITResList59 = [ITRes58|ITResList58],
+
+
+  ?line {STRes59,S59} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDb001.xsd','./msxsdtest/Particles',valid),
+  STResList60 = [STRes59|STResList59],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDb001.xml','./msxsdtest/Particles',invalid,S59),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes60,S60} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDb002.xsd','./msxsdtest/Particles',valid),
+  STResList61 = [STRes60|STResList60],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDb002.xml','./msxsdtest/Particles',valid,S60),
+  ITResList61 = [ITRes60|ITResList60],
+
+
+  ?line {STRes61,S61} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDb003.xsd','./msxsdtest/Particles',valid),
+  STResList62 = [STRes61|STResList61],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDb003.xml','./msxsdtest/Particles',invalid,S61),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes62,S62} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDb004.xsd','./msxsdtest/Particles',valid),
+  STResList63 = [STRes62|STResList62],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDb004.xml','./msxsdtest/Particles',invalid,S62),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes63,S63} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDb005.xsd','./msxsdtest/Particles',valid),
+  STResList64 = [STRes63|STResList63],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDb005.xml','./msxsdtest/Particles',invalid,S63),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes64,S64} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDb006.xsd','./msxsdtest/Particles',valid),
+  STResList65 = [STRes64|STResList64],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDb006.xml','./msxsdtest/Particles',invalid,S64),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes65,S65} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDb007.xsd','./msxsdtest/Particles',valid),
+  STResList66 = [STRes65|STResList65],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDb007.xml','./msxsdtest/Particles',valid,S65),
+  ITResList66 = [ITRes65|ITResList65],
+
+
+  ?line {STRes66,S66} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDb008.xsd','./msxsdtest/Particles',valid),
+  STResList67 = [STRes66|STResList66],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDb008.xml','./msxsdtest/Particles',invalid,S66),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes67,S67} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDb009.xsd','./msxsdtest/Particles',valid),
+  STResList68 = [STRes67|STResList67],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDb009.xml','./msxsdtest/Particles',invalid,S67),
+  ITResList68 = [ITRes67|ITResList67],
+
+
+  ?line {STRes68,S68} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDb010.xsd','./msxsdtest/Particles',valid),
+  STResList69 = [STRes68|STResList68],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDb010.xml','./msxsdtest/Particles',invalid,S68),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes69,S69} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDb011.xsd','./msxsdtest/Particles',valid),
+  STResList70 = [STRes69|STResList69],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDb011.xml','./msxsdtest/Particles',invalid,S69),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes70,S70} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDc001.xsd','./msxsdtest/Particles',valid),
+  STResList71 = [STRes70|STResList70],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDc001.xml','./msxsdtest/Particles',valid,S70),
+  ITResList71 = [ITRes70|ITResList70],
+
+
+  ?line {STRes71,S71} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDc002.xsd','./msxsdtest/Particles',valid),
+  STResList72 = [STRes71|STResList71],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDc002.xml','./msxsdtest/Particles',valid,S71),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes72,S72} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDc003.xsd','./msxsdtest/Particles',valid),
+  STResList73 = [STRes72|STResList72],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDc003.xml','./msxsdtest/Particles',valid,S72),
+  ITResList73 = [ITRes72|ITResList72],
+
+
+  ?line {STRes73,S73} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDc004.xsd','./msxsdtest/Particles',valid),
+  STResList74 = [STRes73|STResList73],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDc004.xml','./msxsdtest/Particles',valid,S73),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes74,S74} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDc005.xsd','./msxsdtest/Particles',valid),
+  STResList75 = [STRes74|STResList74],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDc005.xml','./msxsdtest/Particles',valid,S74),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes75,S75} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDc006.xsd','./msxsdtest/Particles',valid),
+  STResList76 = [STRes75|STResList75],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDc006.xml','./msxsdtest/Particles',valid,S75),
+  ITResList76 = [ITRes75|ITResList75],
+
+
+  ?line {STRes76,S76} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDc007.xsd','./msxsdtest/Particles',valid),
+  STResList77 = [STRes76|STResList76],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDc007.xml','./msxsdtest/Particles',valid,S76),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes77,S77} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDc008.xsd','./msxsdtest/Particles',valid),
+  STResList78 = [STRes77|STResList77],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDc008.xml','./msxsdtest/Particles',valid,S77),
+  ITResList78 = [ITRes77|ITResList77],
+
+
+  ?line {STRes78,S78} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesDc009.xsd','./msxsdtest/Particles',valid),
+  STResList79 = [STRes78|STResList78],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesDc009.xml','./msxsdtest/Particles',valid,S78),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes79,S79} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa001.xsd','./msxsdtest/Particles',valid),
+  STResList80 = [STRes79|STResList79],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa001.xml','./msxsdtest/Particles',valid,S79),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes80,S80} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa002.xsd','./msxsdtest/Particles',valid),
+  STResList81 = [STRes80|STResList80],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa002.xml','./msxsdtest/Particles',invalid,S80),
+  ITResList81 = [ITRes80|ITResList80],
+
+
+  ?line {STRes81,S81} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa003.xsd','./msxsdtest/Particles',valid),
+  STResList82 = [STRes81|STResList81],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa003.xml','./msxsdtest/Particles',valid,S81),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes82,S82} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa004.xsd','./msxsdtest/Particles',valid),
+  STResList83 = [STRes82|STResList82],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa004.xml','./msxsdtest/Particles',valid,S82),
+  ITResList83 = [ITRes82|ITResList82],
+
+
+  ?line {STRes83,S83} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa005.xsd','./msxsdtest/Particles',valid),
+  STResList84 = [STRes83|STResList83],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa005.xml','./msxsdtest/Particles',invalid,S83),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes84,S84} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa006.xsd','./msxsdtest/Particles',valid),
+  STResList85 = [STRes84|STResList84],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa006.xml','./msxsdtest/Particles',invalid,S84),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes85,S85} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa007.xsd','./msxsdtest/Particles',valid),
+  STResList86 = [STRes85|STResList85],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa007.xml','./msxsdtest/Particles',invalid,S85),
+  ITResList86 = [ITRes85|ITResList85],
+
+
+  ?line {STRes86,S86} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa008.xsd','./msxsdtest/Particles',valid),
+  STResList87 = [STRes86|STResList86],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa008.xml','./msxsdtest/Particles',valid,S86),
+  ITResList87 = [ITRes86|ITResList86],
+
+
+  ?line {STRes87,S87} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa009.xsd','./msxsdtest/Particles',valid),
+  STResList88 = [STRes87|STResList87],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa009.xml','./msxsdtest/Particles',invalid,S87),
+  ITResList88 = [ITRes87|ITResList87],
+
+
+  ?line {STRes88,S88} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa010.xsd','./msxsdtest/Particles',valid),
+  STResList89 = [STRes88|STResList88],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa010.xml','./msxsdtest/Particles',valid,S88),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes89,S89} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa011.xsd','./msxsdtest/Particles',valid),
+  STResList90 = [STRes89|STResList89],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa011.xml','./msxsdtest/Particles',valid,S89),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes90,S90} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa012.xsd','./msxsdtest/Particles',valid),
+  STResList91 = [STRes90|STResList90],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa012.xml','./msxsdtest/Particles',invalid,S90),
+  ITResList91 = [ITRes90|ITResList90],
+
+
+  ?line {STRes91,S91} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa013.xsd','./msxsdtest/Particles',valid),
+  STResList92 = [STRes91|STResList91],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa013.xml','./msxsdtest/Particles',invalid,S91),
+  ITResList92 = [ITRes91|ITResList91],
+
+
+  ?line {STRes92,S92} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa014.xsd','./msxsdtest/Particles',valid),
+  STResList93 = [STRes92|STResList92],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa014.xml','./msxsdtest/Particles',invalid,S92),
+  ITResList93 = [ITRes92|ITResList92],
+
+
+  ?line {STRes93,S93} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa015.xsd','./msxsdtest/Particles',valid),
+  STResList94 = [STRes93|STResList93],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa015.xml','./msxsdtest/Particles',valid,S93),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes94,S94} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa016.xsd','./msxsdtest/Particles',valid),
+  STResList95 = [STRes94|STResList94],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa016.xml','./msxsdtest/Particles',invalid,S94),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes95,S95} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa017.xsd','./msxsdtest/Particles',valid),
+  STResList96 = [STRes95|STResList95],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa017.xml','./msxsdtest/Particles',valid,S95),
+  ITResList96 = [ITRes95|ITResList95],
+
+
+  ?line {STRes96,S96} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa018.xsd','./msxsdtest/Particles',valid),
+  STResList97 = [STRes96|STResList96],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa018.xml','./msxsdtest/Particles',valid,S96),
+  ITResList97 = [ITRes96|ITResList96],
+
+
+  ?line {STRes97,S97} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa019.xsd','./msxsdtest/Particles',valid),
+  STResList98 = [STRes97|STResList97],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa019.xml','./msxsdtest/Particles',invalid,S97),
+  ITResList98 = [ITRes97|ITResList97],
+
+
+  ?line {STRes98,S98} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa020.xsd','./msxsdtest/Particles',valid),
+  STResList99 = [STRes98|STResList98],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa020.xml','./msxsdtest/Particles',invalid,S98),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes99,S99} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa021.xsd','./msxsdtest/Particles',valid),
+  STResList100 = [STRes99|STResList99],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEa021.xml','./msxsdtest/Particles',invalid,S99),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes100,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa022.xsd','./msxsdtest/Particles',invalid),
+  STResList101 = [STRes100|STResList100],
+
+
+  ?line {STRes101,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa023.xsd','./msxsdtest/Particles',invalid),
+  STResList102 = [STRes101|STResList101],
+
+
+  ?line {STRes102,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa024.xsd','./msxsdtest/Particles',invalid),
+  STResList103 = [STRes102|STResList102],
+
+
+  ?line {STRes103,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEa025.xsd','./msxsdtest/Particles',invalid),
+  STResList104 = [STRes103|STResList103],
+
+
+  ?line {STRes104,S104} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb001.xsd','./msxsdtest/Particles',valid),
+  STResList105 = [STRes104|STResList104],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb001.xml','./msxsdtest/Particles',valid,S104),
+  ITResList101 = [ITRes100|ITResList100],
+
+
+  ?line {STRes105,S105} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb002.xsd','./msxsdtest/Particles',valid),
+  STResList106 = [STRes105|STResList105],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb002.xml','./msxsdtest/Particles',invalid,S105),
+  ITResList102 = [ITRes101|ITResList101],
+
+
+  ?line {STRes106,S106} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb003.xsd','./msxsdtest/Particles',valid),
+  STResList107 = [STRes106|STResList106],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb003.xml','./msxsdtest/Particles',valid,S106),
+  ITResList103 = [ITRes102|ITResList102],
+
+
+  ?line {STRes107,S107} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb004.xsd','./msxsdtest/Particles',valid),
+  STResList108 = [STRes107|STResList107],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb004.xml','./msxsdtest/Particles',invalid,S107),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes108,S108} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb005.xsd','./msxsdtest/Particles',valid),
+  STResList109 = [STRes108|STResList108],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb005.xml','./msxsdtest/Particles',invalid,S108),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes109,S109} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb006.xsd','./msxsdtest/Particles',valid),
+  STResList110 = [STRes109|STResList109],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb006.xml','./msxsdtest/Particles',invalid,S109),
+  ITResList106 = [ITRes105|ITResList105],
+
+
+  ?line {STRes110,S110} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb007.xsd','./msxsdtest/Particles',valid),
+  STResList111 = [STRes110|STResList110],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb007.xml','./msxsdtest/Particles',invalid,S110),
+  ITResList107 = [ITRes106|ITResList106],
+
+
+  ?line {STRes111,S111} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb008.xsd','./msxsdtest/Particles',valid),
+  STResList112 = [STRes111|STResList111],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb008.xml','./msxsdtest/Particles',invalid,S111),
+  ITResList108 = [ITRes107|ITResList107],
+
+
+  ?line {STRes112,S112} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb009.xsd','./msxsdtest/Particles',valid),
+  STResList113 = [STRes112|STResList112],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb009.xml','./msxsdtest/Particles',invalid,S112),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes113,S113} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb010.xsd','./msxsdtest/Particles',valid),
+  STResList114 = [STRes113|STResList113],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb010.xml','./msxsdtest/Particles',valid,S113),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes114,S114} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb011.xsd','./msxsdtest/Particles',valid),
+  STResList115 = [STRes114|STResList114],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb011.xml','./msxsdtest/Particles',invalid,S114),
+  ITResList111 = [ITRes110|ITResList110],
+
+
+  ?line {STRes115,S115} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb012.xsd','./msxsdtest/Particles',valid),
+  STResList116 = [STRes115|STResList115],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb012.xml','./msxsdtest/Particles',invalid,S115),
+  ITResList112 = [ITRes111|ITResList111],
+
+
+  ?line {STRes116,S116} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb013.xsd','./msxsdtest/Particles',valid),
+  STResList117 = [STRes116|STResList116],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb013.xml','./msxsdtest/Particles',invalid,S116),
+  ITResList113 = [ITRes112|ITResList112],
+
+
+  ?line {STRes117,S117} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb014.xsd','./msxsdtest/Particles',valid),
+  STResList118 = [STRes117|STResList117],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb014.xml','./msxsdtest/Particles',invalid,S117),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes118,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb015.xsd','./msxsdtest/Particles',invalid),
+  STResList119 = [STRes118|STResList118],
+
+
+  ?line {STRes119,S119} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb016.xsd','./msxsdtest/Particles',valid),
+  STResList120 = [STRes119|STResList119],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb016.xml','./msxsdtest/Particles',valid,S119),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes120,S120} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb017.xsd','./msxsdtest/Particles',valid),
+  STResList121 = [STRes120|STResList120],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb017.xml','./msxsdtest/Particles',invalid,S120),
+  ITResList116 = [ITRes115|ITResList115],
+
+
+  ?line {STRes121,S121} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb018.xsd','./msxsdtest/Particles',valid),
+  STResList122 = [STRes121|STResList121],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb018.xml','./msxsdtest/Particles',invalid,S121),
+  ITResList117 = [ITRes116|ITResList116],
+
+
+  ?line {STRes122,S122} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb019.xsd','./msxsdtest/Particles',valid),
+  STResList123 = [STRes122|STResList122],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb019.xml','./msxsdtest/Particles',valid,S122),
+  ITResList118 = [ITRes117|ITResList117],
+
+
+  ?line {STRes123,S123} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb020.xsd','./msxsdtest/Particles',valid),
+  STResList124 = [STRes123|STResList123],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb020.xml','./msxsdtest/Particles',invalid,S123),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes124,S124} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb021.xsd','./msxsdtest/Particles',valid),
+  STResList125 = [STRes124|STResList124],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb021.xml','./msxsdtest/Particles',invalid,S124),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes125,S125} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb022.xsd','./msxsdtest/Particles',valid),
+  STResList126 = [STRes125|STResList125],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb022.xml','./msxsdtest/Particles',invalid,S125),
+  ITResList121 = [ITRes120|ITResList120],
+
+
+  ?line {STRes126,S126} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb023.xsd','./msxsdtest/Particles',valid),
+  STResList127 = [STRes126|STResList126],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb023.xml','./msxsdtest/Particles',invalid,S126),
+  ITResList122 = [ITRes121|ITResList121],
+
+
+  ?line {STRes127,S127} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb024.xsd','./msxsdtest/Particles',valid),
+  STResList128 = [STRes127|STResList127],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb024.xml','./msxsdtest/Particles',invalid,S127),
+  ITResList123 = [ITRes122|ITResList122],
+
+
+  ?line {STRes128,S128} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb025.xsd','./msxsdtest/Particles',valid),
+  STResList129 = [STRes128|STResList128],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb025.xml','./msxsdtest/Particles',invalid,S128),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes129,S129} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb026.xsd','./msxsdtest/Particles',valid),
+  STResList130 = [STRes129|STResList129],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb026.xml','./msxsdtest/Particles',valid,S129),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes130,S130} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb027.xsd','./msxsdtest/Particles',valid),
+  STResList131 = [STRes130|STResList130],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb027.xml','./msxsdtest/Particles',valid,S130),
+  ITResList126 = [ITRes125|ITResList125],
+
+
+  ?line {STRes131,S131} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb028.xsd','./msxsdtest/Particles',valid),
+  STResList132 = [STRes131|STResList131],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb028.xml','./msxsdtest/Particles',invalid,S131),
+  ITResList127 = [ITRes126|ITResList126],
+
+
+  ?line {STRes132,S132} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb029.xsd','./msxsdtest/Particles',valid),
+  STResList133 = [STRes132|STResList132],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb029.xml','./msxsdtest/Particles',invalid,S132),
+  ITResList128 = [ITRes127|ITResList127],
+
+
+  ?line {STRes133,S133} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb030.xsd','./msxsdtest/Particles',valid),
+  STResList134 = [STRes133|STResList133],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb030.xml','./msxsdtest/Particles',invalid,S133),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes134,S134} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb031.xsd','./msxsdtest/Particles',valid),
+  STResList135 = [STRes134|STResList134],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb031.xml','./msxsdtest/Particles',invalid,S134),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  ?line {STRes135,S135} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb032.xsd','./msxsdtest/Particles',valid),
+  STResList136 = [STRes135|STResList135],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb032.xml','./msxsdtest/Particles',invalid,S135),
+  ITResList131 = [ITRes130|ITResList130],
+
+
+  ?line {STRes136,S136} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb033.xsd','./msxsdtest/Particles',valid),
+  STResList137 = [STRes136|STResList136],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb033.xml','./msxsdtest/Particles',invalid,S136),
+  ITResList132 = [ITRes131|ITResList131],
+
+
+  ?line {STRes137,S137} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb034.xsd','./msxsdtest/Particles',valid),
+  STResList138 = [STRes137|STResList137],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb034.xml','./msxsdtest/Particles',invalid,S137),
+  ITResList133 = [ITRes132|ITResList132],
+
+
+  ?line {STRes138,S138} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb035.xsd','./msxsdtest/Particles',valid),
+  STResList139 = [STRes138|STResList138],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb035.xml','./msxsdtest/Particles',invalid,S138),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes139,S139} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb036.xsd','./msxsdtest/Particles',valid),
+  STResList140 = [STRes139|STResList139],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb036.xml','./msxsdtest/Particles',valid,S139),
+  ITResList135 = [ITRes134|ITResList134],
+
+
+  ?line {STRes140,S140} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb037.xsd','./msxsdtest/Particles',valid),
+  STResList141 = [STRes140|STResList140],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb037.xml','./msxsdtest/Particles',invalid,S140),
+  ITResList136 = [ITRes135|ITResList135],
+
+
+  ?line {STRes141,S141} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb038.xsd','./msxsdtest/Particles',valid),
+  STResList142 = [STRes141|STResList141],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb038.xml','./msxsdtest/Particles',valid,S141),
+  ITResList137 = [ITRes136|ITResList136],
+
+
+  ?line {STRes142,S142} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEb039.xsd','./msxsdtest/Particles',valid),
+  STResList143 = [STRes142|STResList142],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEb039.xml','./msxsdtest/Particles',invalid,S142),
+  ITResList138 = [ITRes137|ITResList137],
+
+
+  ?line {STRes143,S143} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc001.xsd','./msxsdtest/Particles',valid),
+  STResList144 = [STRes143|STResList143],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc001.xml','./msxsdtest/Particles',valid,S143),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes144,S144} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc002.xsd','./msxsdtest/Particles',valid),
+  STResList145 = [STRes144|STResList144],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc002.xml','./msxsdtest/Particles',valid,S144),
+  ITResList140 = [ITRes139|ITResList139],
+
+
+  ?line {STRes145,S145} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc003.xsd','./msxsdtest/Particles',valid),
+  STResList146 = [STRes145|STResList145],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc003.xml','./msxsdtest/Particles',invalid,S145),
+  ITResList141 = [ITRes140|ITResList140],
+
+
+  ?line {STRes146,S146} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc004.xsd','./msxsdtest/Particles',valid),
+  STResList147 = [STRes146|STResList146],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc004.xml','./msxsdtest/Particles',invalid,S146),
+  ITResList142 = [ITRes141|ITResList141],
+
+
+  ?line {STRes147,S147} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc005.xsd','./msxsdtest/Particles',valid),
+  STResList148 = [STRes147|STResList147],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc005.xml','./msxsdtest/Particles',invalid,S147),
+  ITResList143 = [ITRes142|ITResList142],
+
+
+  ?line {STRes148,S148} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc006.xsd','./msxsdtest/Particles',valid),
+  STResList149 = [STRes148|STResList148],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc006.xml','./msxsdtest/Particles',valid,S148),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes149,S149} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc007.xsd','./msxsdtest/Particles',valid),
+  STResList150 = [STRes149|STResList149],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc007.xml','./msxsdtest/Particles',invalid,S149),
+  ITResList145 = [ITRes144|ITResList144],
+
+
+  ?line {STRes150,S150} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc008.xsd','./msxsdtest/Particles',valid),
+  STResList151 = [STRes150|STResList150],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc008.xml','./msxsdtest/Particles',invalid,S150),
+  ITResList146 = [ITRes145|ITResList145],
+
+
+  ?line {STRes151,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc009.xsd','./msxsdtest/Particles',invalid),
+  STResList152 = [STRes151|STResList151],
+
+
+  ?line {STRes152,S152} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc010.xsd','./msxsdtest/Particles',valid),
+  STResList153 = [STRes152|STResList152],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc010.xml','./msxsdtest/Particles',valid,S152),
+  ITResList147 = [ITRes146|ITResList146],
+
+
+  ?line {STRes153,S153} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc011.xsd','./msxsdtest/Particles',valid),
+  STResList154 = [STRes153|STResList153],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc011.xml','./msxsdtest/Particles',invalid,S153),
+  ITResList148 = [ITRes147|ITResList147],
+
+
+  ?line {STRes154,S154} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc012.xsd','./msxsdtest/Particles',valid),
+  STResList155 = [STRes154|STResList154],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc012.xml','./msxsdtest/Particles',valid,S154),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes155,S155} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc013.xsd','./msxsdtest/Particles',valid),
+  STResList156 = [STRes155|STResList155],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc013.xml','./msxsdtest/Particles',invalid,S155),
+  ITResList150 = [ITRes149|ITResList149],
+
+
+  ?line {STRes156,S156} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc014.xsd','./msxsdtest/Particles',valid),
+  STResList157 = [STRes156|STResList156],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc014.xml','./msxsdtest/Particles',invalid,S156),
+  ITResList151 = [ITRes150|ITResList150],
+
+
+  ?line {STRes157,S157} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc015.xsd','./msxsdtest/Particles',valid),
+  STResList158 = [STRes157|STResList157],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc015.xml','./msxsdtest/Particles',invalid,S157),
+  ITResList152 = [ITRes151|ITResList151],
+
+
+  ?line {STRes158,S158} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc016.xsd','./msxsdtest/Particles',valid),
+  STResList159 = [STRes158|STResList158],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc016.xml','./msxsdtest/Particles',valid,S158),
+  ITResList153 = [ITRes152|ITResList152],
+
+
+  ?line {STRes159,S159} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc017.xsd','./msxsdtest/Particles',valid),
+  STResList160 = [STRes159|STResList159],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc017.xml','./msxsdtest/Particles',valid,S159),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes160,S160} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc018.xsd','./msxsdtest/Particles',valid),
+  STResList161 = [STRes160|STResList160],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc018.xml','./msxsdtest/Particles',valid,S160),
+  ITResList155 = [ITRes154|ITResList154],
+
+
+  ?line {STRes161,S161} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc019.xsd','./msxsdtest/Particles',valid),
+  STResList162 = [STRes161|STResList161],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc019.xml','./msxsdtest/Particles',valid,S161),
+  ITResList156 = [ITRes155|ITResList155],
+
+
+  ?line {STRes162,S162} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc020.xsd','./msxsdtest/Particles',valid),
+  STResList163 = [STRes162|STResList162],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc020.xml','./msxsdtest/Particles',valid,S162),
+  ITResList157 = [ITRes156|ITResList156],
+
+
+  ?line {STRes163,S163} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc021.xsd','./msxsdtest/Particles',valid),
+  STResList164 = [STRes163|STResList163],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc021.xml','./msxsdtest/Particles',valid,S163),
+  ITResList158 = [ITRes157|ITResList157],
+
+
+  ?line {STRes164,S164} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc022.xsd','./msxsdtest/Particles',valid),
+  STResList165 = [STRes164|STResList164],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc022.xml','./msxsdtest/Particles',invalid,S164),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes165,S165} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc023.xsd','./msxsdtest/Particles',valid),
+  STResList166 = [STRes165|STResList165],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc023.xml','./msxsdtest/Particles',invalid,S165),
+  ITResList160 = [ITRes159|ITResList159],
+
+
+  ?line {STRes166,S166} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc024.xsd','./msxsdtest/Particles',valid),
+  STResList167 = [STRes166|STResList166],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc024.xml','./msxsdtest/Particles',invalid,S166),
+  ITResList161 = [ITRes160|ITResList160],
+
+
+  ?line {STRes167,S167} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc025.xsd','./msxsdtest/Particles',valid),
+  STResList168 = [STRes167|STResList167],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc025.xml','./msxsdtest/Particles',invalid,S167),
+  ITResList162 = [ITRes161|ITResList161],
+
+
+  ?line {STRes168,S168} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc026.xsd','./msxsdtest/Particles',valid),
+  STResList169 = [STRes168|STResList168],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc026.xml','./msxsdtest/Particles',invalid,S168),
+  ITResList163 = [ITRes162|ITResList162],
+
+
+  ?line {STRes169,S169} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc027.xsd','./msxsdtest/Particles',valid),
+  STResList170 = [STRes169|STResList169],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc027.xml','./msxsdtest/Particles',invalid,S169),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes170,S170} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc028.xsd','./msxsdtest/Particles',valid),
+  STResList171 = [STRes170|STResList170],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc028.xml','./msxsdtest/Particles',invalid,S170),
+  ITResList165 = [ITRes164|ITResList164],
+
+
+  ?line {STRes171,S171} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc029.xsd','./msxsdtest/Particles',valid),
+  STResList172 = [STRes171|STResList171],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc029.xml','./msxsdtest/Particles',valid,S171),
+  ITResList166 = [ITRes165|ITResList165],
+
+
+  ?line {STRes172,S172} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc030.xsd','./msxsdtest/Particles',valid),
+  STResList173 = [STRes172|STResList172],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc030.xml','./msxsdtest/Particles',valid,S172),
+  ITResList167 = [ITRes166|ITResList166],
+
+
+  ?line {STRes173,S173} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc031.xsd','./msxsdtest/Particles',valid),
+  STResList174 = [STRes173|STResList173],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc031.xml','./msxsdtest/Particles',valid,S173),
+  ITResList168 = [ITRes167|ITResList167],
+
+
+  ?line {STRes174,S174} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc032.xsd','./msxsdtest/Particles',valid),
+  STResList175 = [STRes174|STResList174],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc032.xml','./msxsdtest/Particles',valid,S174),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  ?line {STRes175,S175} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc033.xsd','./msxsdtest/Particles',valid),
+  STResList176 = [STRes175|STResList175],
+  ?line ITRes169 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc033.xml','./msxsdtest/Particles',valid,S175),
+  ITResList170 = [ITRes169|ITResList169],
+
+
+  ?line {STRes176,S176} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc034.xsd','./msxsdtest/Particles',valid),
+  STResList177 = [STRes176|STResList176],
+  ?line ITRes170 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc034.xml','./msxsdtest/Particles',valid,S176),
+  ITResList171 = [ITRes170|ITResList170],
+
+
+  ?line {STRes177,S177} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc035.xsd','./msxsdtest/Particles',valid),
+  STResList178 = [STRes177|STResList177],
+  ?line ITRes171 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc035.xml','./msxsdtest/Particles',valid,S177),
+  ITResList172 = [ITRes171|ITResList171],
+
+
+  ?line {STRes178,S178} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc036.xsd','./msxsdtest/Particles',valid),
+  STResList179 = [STRes178|STResList178],
+  ?line ITRes172 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc036.xml','./msxsdtest/Particles',valid,S178),
+  ITResList173 = [ITRes172|ITResList172],
+
+
+  ?line {STRes179,S179} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc037.xsd','./msxsdtest/Particles',valid),
+  STResList180 = [STRes179|STResList179],
+  ?line ITRes173 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc037.xml','./msxsdtest/Particles',valid,S179),
+  ITResList174 = [ITRes173|ITResList173],
+
+
+  ?line {STRes180,S180} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc038.xsd','./msxsdtest/Particles',valid),
+  STResList181 = [STRes180|STResList180],
+  ?line ITRes174 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc038.xml','./msxsdtest/Particles',invalid,S180),
+  ITResList175 = [ITRes174|ITResList174],
+
+
+  ?line {STRes181,S181} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc039.xsd','./msxsdtest/Particles',valid),
+  STResList182 = [STRes181|STResList181],
+  ?line ITRes175 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc039.xml','./msxsdtest/Particles',invalid,S181),
+  ITResList176 = [ITRes175|ITResList175],
+
+
+  ?line {STRes182,S182} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc040.xsd','./msxsdtest/Particles',valid),
+  STResList183 = [STRes182|STResList182],
+  ?line ITRes176 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc040.xml','./msxsdtest/Particles',invalid,S182),
+  ITResList177 = [ITRes176|ITResList176],
+
+
+  ?line {STRes183,S183} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEc041.xsd','./msxsdtest/Particles',valid),
+  STResList184 = [STRes183|STResList183],
+  ?line ITRes177 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesEc041.xml','./msxsdtest/Particles',invalid,S183),
+  ITResList178 = [ITRes177|ITResList177],
+
+
+  ?line {STRes184,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesEd001.xsd','./msxsdtest/Particles',invalid),
+  STResList185 = [STRes184|STResList184],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList185,ITResList178).
+
+%% 3.9.6 Schema Component Constraint: Particle ....
+
+particlesFHI(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesFa001.xsd','./msxsdtest/Particles',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesFa001.xml','./msxsdtest/Particles',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesFa002.xsd','./msxsdtest/Particles',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesFa002.xml','./msxsdtest/Particles',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesFa003.xsd','./msxsdtest/Particles',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesFa003.xml','./msxsdtest/Particles',valid,S2),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesFa004.xsd','./msxsdtest/Particles',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesFa004.xml','./msxsdtest/Particles',valid,S3),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesFa005.xsd','./msxsdtest/Particles',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesFa005.xml','./msxsdtest/Particles',valid,S4),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesFb001.xsd','./msxsdtest/Particles',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesFb001.xml','./msxsdtest/Particles',valid,S5),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesFb002.xsd','./msxsdtest/Particles',invalid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesFb003.xsd','./msxsdtest/Particles',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesFb004.xsd','./msxsdtest/Particles',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesFb004.xml','./msxsdtest/Particles',valid,S8),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesFb005.xsd','./msxsdtest/Particles',invalid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesFb006.xsd','./msxsdtest/Particles',invalid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa001.xsd','./msxsdtest/Particles',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa001.xml','./msxsdtest/Particles',valid,S11),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa002.xsd','./msxsdtest/Particles',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa002.xml','./msxsdtest/Particles',valid,S12),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa003.xsd','./msxsdtest/Particles',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa003.xml','./msxsdtest/Particles',valid,S13),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa004.xsd','./msxsdtest/Particles',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa004.xml','./msxsdtest/Particles',valid,S14),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa005.xsd','./msxsdtest/Particles',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa005.xml','./msxsdtest/Particles',valid,S15),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa006.xsd','./msxsdtest/Particles',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa006.xml','./msxsdtest/Particles',valid,S16),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa007.xsd','./msxsdtest/Particles',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa007.xml','./msxsdtest/Particles',valid,S17),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa008.xsd','./msxsdtest/Particles',invalid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa009.xsd','./msxsdtest/Particles',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa009.xml','./msxsdtest/Particles',valid,S19),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa010.xsd','./msxsdtest/Particles',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa010.xml','./msxsdtest/Particles',valid,S20),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa011.xsd','./msxsdtest/Particles',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa011.xml','./msxsdtest/Particles',valid,S21),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa012.xsd','./msxsdtest/Particles',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa012.xml','./msxsdtest/Particles',valid,S22),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa013.xsd','./msxsdtest/Particles',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa013.xml','./msxsdtest/Particles',valid,S23),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa014.xsd','./msxsdtest/Particles',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa014.xml','./msxsdtest/Particles',valid,S24),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa015.xsd','./msxsdtest/Particles',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa015.xml','./msxsdtest/Particles',valid,S25),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa016.xsd','./msxsdtest/Particles',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa016.xml','./msxsdtest/Particles',valid,S26),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa017.xsd','./msxsdtest/Particles',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa017.xml','./msxsdtest/Particles',valid,S27),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHa018.xsd','./msxsdtest/Particles',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesHa018.xml','./msxsdtest/Particles',valid,S28),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHb001.xsd','./msxsdtest/Particles',invalid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHb002.xsd','./msxsdtest/Particles',invalid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHb003.xsd','./msxsdtest/Particles',invalid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHb004.xsd','./msxsdtest/Particles',invalid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHb006.xsd','./msxsdtest/Particles',invalid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHb007.xsd','./msxsdtest/Particles',invalid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHb008.xsd','./msxsdtest/Particles',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHb009.xsd','./msxsdtest/Particles',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHb010.xsd','./msxsdtest/Particles',invalid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesHb011.xsd','./msxsdtest/Particles',invalid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,S39} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIa001.xsd','./msxsdtest/Particles',valid),
+  STResList40 = [STRes39|STResList39],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIa001.xml','./msxsdtest/Particles',valid,S39),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIa003.xsd','./msxsdtest/Particles',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIa003.xml','./msxsdtest/Particles',valid,S40),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes41,S41} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIa004.xsd','./msxsdtest/Particles',valid),
+  STResList42 = [STRes41|STResList41],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIa004.xml','./msxsdtest/Particles',valid,S41),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes42,S42} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIa005.xsd','./msxsdtest/Particles',valid),
+  STResList43 = [STRes42|STResList42],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIa005.xml','./msxsdtest/Particles',valid,S42),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes43,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIa006.xsd','./msxsdtest/Particles',invalid),
+  STResList44 = [STRes43|STResList43],
+
+
+  ?line {STRes44,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIa008.xsd','./msxsdtest/Particles',invalid),
+  STResList45 = [STRes44|STResList44],
+
+
+  ?line {STRes45,S45} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIb001.xsd','./msxsdtest/Particles',valid),
+  STResList46 = [STRes45|STResList45],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIb001.xml','./msxsdtest/Particles',valid,S45),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes46,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIb002.xsd','./msxsdtest/Particles',invalid),
+  STResList47 = [STRes46|STResList46],
+
+
+  ?line {STRes47,S47} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIb003.xsd','./msxsdtest/Particles',valid),
+  STResList48 = [STRes47|STResList47],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIb003.xml','./msxsdtest/Particles',valid,S47),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes48,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIb004.xsd','./msxsdtest/Particles',invalid),
+  STResList49 = [STRes48|STResList48],
+
+
+  ?line {STRes49,S49} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIb005.xsd','./msxsdtest/Particles',valid),
+  STResList50 = [STRes49|STResList49],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIb005.xml','./msxsdtest/Particles',valid,S49),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes50,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIb006.xsd','./msxsdtest/Particles',invalid),
+  STResList51 = [STRes50|STResList50],
+
+
+  ?line {STRes51,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIb007.xsd','./msxsdtest/Particles',invalid),
+  STResList52 = [STRes51|STResList51],
+
+
+  ?line {STRes52,S52} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIc001.xsd','./msxsdtest/Particles',valid),
+  STResList53 = [STRes52|STResList52],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIc001.xml','./msxsdtest/Particles',valid,S52),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes53,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIc002.xsd','./msxsdtest/Particles',invalid),
+  STResList54 = [STRes53|STResList53],
+
+
+  ?line {STRes54,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIc003.xsd','./msxsdtest/Particles',invalid),
+  STResList55 = [STRes54|STResList54],
+
+
+  ?line {STRes55,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIc004.xsd','./msxsdtest/Particles',invalid),
+  STResList56 = [STRes55|STResList55],
+
+
+  ?line {STRes56,S56} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIc005.xsd','./msxsdtest/Particles',valid),
+  STResList57 = [STRes56|STResList56],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIc005.xml','./msxsdtest/Particles',valid,S56),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes57,S57} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIc006.xsd','./msxsdtest/Particles',valid),
+  STResList58 = [STRes57|STResList57],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIc006.xml','./msxsdtest/Particles',valid,S57),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes58,S58} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIc007.xsd','./msxsdtest/Particles',valid),
+  STResList59 = [STRes58|STResList58],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIc007.xml','./msxsdtest/Particles',valid,S58),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes59,S59} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId001.xsd','./msxsdtest/Particles',valid),
+  STResList60 = [STRes59|STResList59],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesId001.xml','./msxsdtest/Particles',valid,S59),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes60,S60} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId002.xsd','./msxsdtest/Particles',valid),
+  STResList61 = [STRes60|STResList60],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesId002.xml','./msxsdtest/Particles',valid,S60),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes61,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId003.xsd','./msxsdtest/Particles',invalid),
+  STResList62 = [STRes61|STResList61],
+
+
+  ?line {STRes62,S62} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId004.xsd','./msxsdtest/Particles',valid),
+  STResList63 = [STRes62|STResList62],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesId004.xml','./msxsdtest/Particles',valid,S62),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes63,S63} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId005.xsd','./msxsdtest/Particles',valid),
+  STResList64 = [STRes63|STResList63],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesId005.xml','./msxsdtest/Particles',valid,S63),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes64,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId006.xsd','./msxsdtest/Particles',invalid),
+  STResList65 = [STRes64|STResList64],
+
+
+  ?line {STRes65,S65} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId007.xsd','./msxsdtest/Particles',valid),
+  STResList66 = [STRes65|STResList65],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesId007.xml','./msxsdtest/Particles',valid,S65),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes66,S66} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId008.xsd','./msxsdtest/Particles',valid),
+  STResList67 = [STRes66|STResList66],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesId008.xml','./msxsdtest/Particles',valid,S66),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes67,S67} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId009.xsd','./msxsdtest/Particles',valid),
+  STResList68 = [STRes67|STResList67],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesId009.xml','./msxsdtest/Particles',valid,S67),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes68,S68} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId010.xsd','./msxsdtest/Particles',valid),
+  STResList69 = [STRes68|STResList68],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesId010.xml','./msxsdtest/Particles',valid,S68),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes69,S69} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId011.xsd','./msxsdtest/Particles',valid),
+  STResList70 = [STRes69|STResList69],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesId011.xml','./msxsdtest/Particles',valid,S69),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes70,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesId012.xsd','./msxsdtest/Particles',invalid),
+  STResList71 = [STRes70|STResList70],
+
+
+  ?line {STRes71,S71} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe001.xsd','./msxsdtest/Particles',valid),
+  STResList72 = [STRes71|STResList71],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe001.xml','./msxsdtest/Particles',valid,S71),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes72,S72} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe002.xsd','./msxsdtest/Particles',valid),
+  STResList73 = [STRes72|STResList72],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe002.xml','./msxsdtest/Particles',valid,S72),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes73,S73} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe003.xsd','./msxsdtest/Particles',valid),
+  STResList74 = [STRes73|STResList73],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe003.xml','./msxsdtest/Particles',valid,S73),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes74,S74} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe004.xsd','./msxsdtest/Particles',valid),
+  STResList75 = [STRes74|STResList74],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe004.xml','./msxsdtest/Particles',valid,S74),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes75,S75} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe005.xsd','./msxsdtest/Particles',valid),
+  STResList76 = [STRes75|STResList75],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe005.xml','./msxsdtest/Particles',valid,S75),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes76,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe006.xsd','./msxsdtest/Particles',invalid),
+  STResList77 = [STRes76|STResList76],
+
+
+  ?line {STRes77,S77} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe007.xsd','./msxsdtest/Particles',valid),
+  STResList78 = [STRes77|STResList77],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe007.xml','./msxsdtest/Particles',valid,S77),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes78,S78} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe008.xsd','./msxsdtest/Particles',valid),
+  STResList79 = [STRes78|STResList78],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe008.xml','./msxsdtest/Particles',valid,S78),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes79,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe009.xsd','./msxsdtest/Particles',invalid),
+  STResList80 = [STRes79|STResList79],
+
+
+  ?line {STRes80,S80} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe010.xsd','./msxsdtest/Particles',valid),
+  STResList81 = [STRes80|STResList80],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe010.xml','./msxsdtest/Particles',valid,S80),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes81,S81} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe011.xsd','./msxsdtest/Particles',valid),
+  STResList82 = [STRes81|STResList81],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe011.xml','./msxsdtest/Particles',valid,S81),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes82,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe012.xsd','./msxsdtest/Particles',invalid),
+  STResList83 = [STRes82|STResList82],
+
+
+  ?line {STRes83,S83} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe013.xsd','./msxsdtest/Particles',valid),
+  STResList84 = [STRes83|STResList83],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe013.xml','./msxsdtest/Particles',valid,S83),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes84,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe014.xsd','./msxsdtest/Particles',invalid),
+  STResList85 = [STRes84|STResList84],
+
+
+  ?line {STRes85,S85} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe015.xsd','./msxsdtest/Particles',valid),
+  STResList86 = [STRes85|STResList85],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe015.xml','./msxsdtest/Particles',valid,S85),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes86,S86} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIe016.xsd','./msxsdtest/Particles',valid),
+  STResList87 = [STRes86|STResList86],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIe016.xml','./msxsdtest/Particles',valid,S86),
+  ITResList56 = [ITRes55|ITResList55],
+
+
+  ?line {STRes87,S87} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIf001.xsd','./msxsdtest/Particles',valid),
+  STResList88 = [STRes87|STResList87],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIf001.xml','./msxsdtest/Particles',valid,S87),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes88,S88} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIf002.xsd','./msxsdtest/Particles',valid),
+  STResList89 = [STRes88|STResList88],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIf002.xml','./msxsdtest/Particles',valid,S88),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes89,S89} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIf003.xsd','./msxsdtest/Particles',valid),
+  STResList90 = [STRes89|STResList89],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIf003.xml','./msxsdtest/Particles',valid,S89),
+  ITResList59 = [ITRes58|ITResList58],
+
+
+  ?line {STRes90,S90} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIf004.xsd','./msxsdtest/Particles',valid),
+  STResList91 = [STRes90|STResList90],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIf004.xml','./msxsdtest/Particles',valid,S90),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes91,S91} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIf005.xsd','./msxsdtest/Particles',valid),
+  STResList92 = [STRes91|STResList91],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIf005.xml','./msxsdtest/Particles',valid,S91),
+  ITResList61 = [ITRes60|ITResList60],
+
+
+  ?line {STRes92,S92} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIf006.xsd','./msxsdtest/Particles',valid),
+  STResList93 = [STRes92|STResList92],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIf006.xml','./msxsdtest/Particles',valid,S92),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes93,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIf007.xsd','./msxsdtest/Particles',invalid),
+  STResList94 = [STRes93|STResList93],
+
+
+  ?line {STRes94,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIf008.xsd','./msxsdtest/Particles',invalid),
+  STResList95 = [STRes94|STResList94],
+
+
+  ?line {STRes95,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIf009.xsd','./msxsdtest/Particles',invalid),
+  STResList96 = [STRes95|STResList95],
+
+
+  ?line {STRes96,S96} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg001.xsd','./msxsdtest/Particles',valid),
+  STResList97 = [STRes96|STResList96],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIg001.xml','./msxsdtest/Particles',valid,S96),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes97,S97} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg002.xsd','./msxsdtest/Particles',valid),
+  STResList98 = [STRes97|STResList97],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIg002.xml','./msxsdtest/Particles',valid,S97),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes98,S98} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg003.xsd','./msxsdtest/Particles',valid),
+  STResList99 = [STRes98|STResList98],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIg003.xml','./msxsdtest/Particles',valid,S98),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes99,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg004.xsd','./msxsdtest/Particles',invalid),
+  STResList100 = [STRes99|STResList99],
+
+
+  ?line {STRes100,S100} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg005.xsd','./msxsdtest/Particles',valid),
+  STResList101 = [STRes100|STResList100],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIg005.xml','./msxsdtest/Particles',valid,S100),
+  ITResList66 = [ITRes65|ITResList65],
+
+
+  ?line {STRes101,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg006.xsd','./msxsdtest/Particles',invalid),
+  STResList102 = [STRes101|STResList101],
+
+
+  ?line {STRes102,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg007.xsd','./msxsdtest/Particles',invalid),
+  STResList103 = [STRes102|STResList102],
+
+
+  ?line {STRes103,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg008.xsd','./msxsdtest/Particles',invalid),
+  STResList104 = [STRes103|STResList103],
+
+
+  ?line {STRes104,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg009.xsd','./msxsdtest/Particles',invalid),
+  STResList105 = [STRes104|STResList104],
+
+
+  ?line {STRes105,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg010.xsd','./msxsdtest/Particles',invalid),
+  STResList106 = [STRes105|STResList105],
+
+
+  ?line {STRes106,S106} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg011.xsd','./msxsdtest/Particles',valid),
+  STResList107 = [STRes106|STResList106],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIg011.xml','./msxsdtest/Particles',valid,S106),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes107,S107} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg012.xsd','./msxsdtest/Particles',valid),
+  STResList108 = [STRes107|STResList107],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIg012.xml','./msxsdtest/Particles',valid,S107),
+  ITResList68 = [ITRes67|ITResList67],
+
+
+  ?line {STRes108,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg013.xsd','./msxsdtest/Particles',invalid),
+  STResList109 = [STRes108|STResList108],
+
+
+  ?line {STRes109,S109} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg014.xsd','./msxsdtest/Particles',valid),
+  STResList110 = [STRes109|STResList109],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIg014.xml','./msxsdtest/Particles',valid,S109),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes110,S110} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg015.xsd','./msxsdtest/Particles',valid),
+  STResList111 = [STRes110|STResList110],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIg015.xml','./msxsdtest/Particles',valid,S110),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes111,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIg016.xsd','./msxsdtest/Particles',invalid),
+  STResList112 = [STRes111|STResList111],
+
+
+  ?line {STRes112,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIh001.xsd','./msxsdtest/Particles',invalid),
+  STResList113 = [STRes112|STResList112],
+
+
+  ?line {STRes113,S113} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj001.xsd','./msxsdtest/Particles',valid),
+  STResList114 = [STRes113|STResList113],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIj001.xml','./msxsdtest/Particles',valid,S113),
+  ITResList71 = [ITRes70|ITResList70],
+
+
+  ?line {STRes114,S114} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj002.xsd','./msxsdtest/Particles',valid),
+  STResList115 = [STRes114|STResList114],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIj002.xml','./msxsdtest/Particles',valid,S114),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes115,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj003.xsd','./msxsdtest/Particles',invalid),
+  STResList116 = [STRes115|STResList115],
+
+
+  ?line {STRes116,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj004.xsd','./msxsdtest/Particles',invalid),
+  STResList117 = [STRes116|STResList116],
+
+
+  ?line {STRes117,S117} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj005.xsd','./msxsdtest/Particles',valid),
+  STResList118 = [STRes117|STResList117],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIj005.xml','./msxsdtest/Particles',valid,S117),
+  ITResList73 = [ITRes72|ITResList72],
+
+
+  ?line {STRes118,S118} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj006.xsd','./msxsdtest/Particles',valid),
+  STResList119 = [STRes118|STResList118],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIj006.xml','./msxsdtest/Particles',valid,S118),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes119,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj007.xsd','./msxsdtest/Particles',invalid),
+  STResList120 = [STRes119|STResList119],
+
+
+  ?line {STRes120,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj008.xsd','./msxsdtest/Particles',invalid),
+  STResList121 = [STRes120|STResList120],
+
+
+  ?line {STRes121,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj009.xsd','./msxsdtest/Particles',invalid),
+  STResList122 = [STRes121|STResList121],
+
+
+  ?line {STRes122,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj010.xsd','./msxsdtest/Particles',invalid),
+  STResList123 = [STRes122|STResList122],
+
+
+  ?line {STRes123,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj011.xsd','./msxsdtest/Particles',invalid),
+  STResList124 = [STRes123|STResList123],
+
+
+  ?line {STRes124,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj012.xsd','./msxsdtest/Particles',invalid),
+  STResList125 = [STRes124|STResList124],
+
+
+  ?line {STRes125,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj013.xsd','./msxsdtest/Particles',invalid),
+  STResList126 = [STRes125|STResList125],
+
+
+  ?line {STRes126,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj015.xsd','./msxsdtest/Particles',invalid),
+  STResList127 = [STRes126|STResList126],
+
+
+  ?line {STRes127,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIj016.xsd','./msxsdtest/Particles',invalid),
+  STResList128 = [STRes127|STResList127],
+
+
+  ?line {STRes128,S128} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk001.xsd','./msxsdtest/Particles',valid),
+  STResList129 = [STRes128|STResList128],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIk001.xml','./msxsdtest/Particles',valid,S128),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes129,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk002.xsd','./msxsdtest/Particles',invalid),
+  STResList130 = [STRes129|STResList129],
+
+
+  ?line {STRes130,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk003.xsd','./msxsdtest/Particles',invalid),
+  STResList131 = [STRes130|STResList130],
+
+
+  ?line {STRes131,S131} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk004.xsd','./msxsdtest/Particles',valid),
+  STResList132 = [STRes131|STResList131],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIk004.xml','./msxsdtest/Particles',valid,S131),
+  ITResList76 = [ITRes75|ITResList75],
+
+
+  ?line {STRes132,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk005.xsd','./msxsdtest/Particles',invalid),
+  STResList133 = [STRes132|STResList132],
+
+
+  ?line {STRes133,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk006.xsd','./msxsdtest/Particles',invalid),
+  STResList134 = [STRes133|STResList133],
+
+
+  ?line {STRes134,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk007.xsd','./msxsdtest/Particles',invalid),
+  STResList135 = [STRes134|STResList134],
+
+
+  ?line {STRes135,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk008.xsd','./msxsdtest/Particles',invalid),
+  STResList136 = [STRes135|STResList135],
+
+
+  ?line {STRes136,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk009.xsd','./msxsdtest/Particles',invalid),
+  STResList137 = [STRes136|STResList136],
+
+
+  ?line {STRes137,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk010.xsd','./msxsdtest/Particles',invalid),
+  STResList138 = [STRes137|STResList137],
+
+
+  ?line {STRes138,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk011.xsd','./msxsdtest/Particles',invalid),
+  STResList139 = [STRes138|STResList138],
+
+
+  ?line {STRes139,S139} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk012.xsd','./msxsdtest/Particles',valid),
+  STResList140 = [STRes139|STResList139],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIk012.xml','./msxsdtest/Particles',valid,S139),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes140,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk013.xsd','./msxsdtest/Particles',invalid),
+  STResList141 = [STRes140|STResList140],
+
+
+  ?line {STRes141,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk015.xsd','./msxsdtest/Particles',invalid),
+  STResList142 = [STRes141|STResList141],
+
+
+  ?line {STRes142,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk016.xsd','./msxsdtest/Particles',invalid),
+  STResList143 = [STRes142|STResList142],
+
+
+  ?line {STRes143,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk019.xsd','./msxsdtest/Particles',invalid),
+  STResList144 = [STRes143|STResList143],
+
+
+  ?line {STRes144,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk020.xsd','./msxsdtest/Particles',invalid),
+  STResList145 = [STRes144|STResList144],
+
+
+  ?line {STRes145,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk021.xsd','./msxsdtest/Particles',invalid),
+  STResList146 = [STRes145|STResList145],
+
+
+  ?line {STRes146,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk022.xsd','./msxsdtest/Particles',invalid),
+  STResList147 = [STRes146|STResList146],
+
+
+  ?line {STRes147,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk024.xsd','./msxsdtest/Particles',invalid),
+  STResList148 = [STRes147|STResList147],
+
+
+  ?line {STRes148,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk025.xsd','./msxsdtest/Particles',invalid),
+  STResList149 = [STRes148|STResList148],
+
+
+  ?line {STRes149,S149} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk026.xsd','./msxsdtest/Particles',valid),
+  STResList150 = [STRes149|STResList149],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesIk026.xml','./msxsdtest/Particles',valid,S149),
+  ITResList78 = [ITRes77|ITResList77],
+
+
+  ?line {STRes150,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesIk027.xsd','./msxsdtest/Particles',invalid),
+  STResList151 = [STRes150|STResList150],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList151,ITResList78).
+
+%% 3.9.6 Particle Derivation.
+
+particlesJ(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa001.xsd','./msxsdtest/Particles',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJa001.xml','./msxsdtest/Particles',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa002.xsd','./msxsdtest/Particles',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJa002.xml','./msxsdtest/Particles',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa003.xsd','./msxsdtest/Particles',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa004.xsd','./msxsdtest/Particles',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJa004.xml','./msxsdtest/Particles',valid,S3),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa005.xsd','./msxsdtest/Particles',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJa005.xml','./msxsdtest/Particles',valid,S4),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa006.xsd','./msxsdtest/Particles',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa007.xsd','./msxsdtest/Particles',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJa007.xml','./msxsdtest/Particles',valid,S6),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa008.xsd','./msxsdtest/Particles',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJa008.xml','./msxsdtest/Particles',valid,S7),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa009.xsd','./msxsdtest/Particles',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJa009.xml','./msxsdtest/Particles',valid,S8),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa010.xsd','./msxsdtest/Particles',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJa010.xml','./msxsdtest/Particles',valid,S9),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa011.xsd','./msxsdtest/Particles',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJa011.xml','./msxsdtest/Particles',valid,S10),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJa012.xsd','./msxsdtest/Particles',invalid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb001.xsd','./msxsdtest/Particles',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb001.xml','./msxsdtest/Particles',valid,S12),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb002.xsd','./msxsdtest/Particles',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb002.xml','./msxsdtest/Particles',valid,S13),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb003.xsd','./msxsdtest/Particles',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb003.xml','./msxsdtest/Particles',valid,S14),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb004.xsd','./msxsdtest/Particles',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb004.xml','./msxsdtest/Particles',valid,S15),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb005.xsd','./msxsdtest/Particles',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb005.xml','./msxsdtest/Particles',valid,S16),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes17,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb006.xsd','./msxsdtest/Particles',invalid),
+  STResList18 = [STRes17|STResList17],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb007.xsd','./msxsdtest/Particles',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb007.xml','./msxsdtest/Particles',valid,S18),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb008.xsd','./msxsdtest/Particles',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb008.xml','./msxsdtest/Particles',valid,S19),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb009.xsd','./msxsdtest/Particles',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb010.xsd','./msxsdtest/Particles',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb010.xml','./msxsdtest/Particles',valid,S21),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb011.xsd','./msxsdtest/Particles',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb011.xml','./msxsdtest/Particles',valid,S22),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb012.xsd','./msxsdtest/Particles',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb013.xsd','./msxsdtest/Particles',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb013.xml','./msxsdtest/Particles',valid,S24),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb014.xsd','./msxsdtest/Particles',invalid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb015.xsd','./msxsdtest/Particles',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb015.xml','./msxsdtest/Particles',valid,S26),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJb016.xsd','./msxsdtest/Particles',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJb016.xml','./msxsdtest/Particles',valid,S27),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc001.xsd','./msxsdtest/Particles',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJc001.xml','./msxsdtest/Particles',valid,S28),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc002.xsd','./msxsdtest/Particles',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJc002.xml','./msxsdtest/Particles',valid,S29),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc003.xsd','./msxsdtest/Particles',invalid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc004.xsd','./msxsdtest/Particles',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJc004.xml','./msxsdtest/Particles',valid,S31),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc005.xsd','./msxsdtest/Particles',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJc005.xml','./msxsdtest/Particles',valid,S32),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc006.xsd','./msxsdtest/Particles',invalid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc007.xsd','./msxsdtest/Particles',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJc007.xml','./msxsdtest/Particles',valid,S34),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc008.xsd','./msxsdtest/Particles',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJc008.xml','./msxsdtest/Particles',valid,S35),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc009.xsd','./msxsdtest/Particles',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJc009.xml','./msxsdtest/Particles',valid,S36),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes37,S37} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc010.xsd','./msxsdtest/Particles',valid),
+  STResList38 = [STRes37|STResList37],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJc010.xml','./msxsdtest/Particles',valid,S37),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes38,S38} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc011.xsd','./msxsdtest/Particles',valid),
+  STResList39 = [STRes38|STResList38],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJc011.xml','./msxsdtest/Particles',valid,S38),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes39,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJc012.xsd','./msxsdtest/Particles',invalid),
+  STResList40 = [STRes39|STResList39],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd001.xsd','./msxsdtest/Particles',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd001.xml','./msxsdtest/Particles',valid,S40),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes41,S41} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd002.xsd','./msxsdtest/Particles',valid),
+  STResList42 = [STRes41|STResList41],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd002.xml','./msxsdtest/Particles',valid,S41),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes42,S42} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd003.xsd','./msxsdtest/Particles',valid),
+  STResList43 = [STRes42|STResList42],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd003.xml','./msxsdtest/Particles',valid,S42),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes43,S43} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd004.xsd','./msxsdtest/Particles',valid),
+  STResList44 = [STRes43|STResList43],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd004.xml','./msxsdtest/Particles',valid,S43),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes44,S44} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd005.xsd','./msxsdtest/Particles',valid),
+  STResList45 = [STRes44|STResList44],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd005.xml','./msxsdtest/Particles',valid,S44),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd006.xsd','./msxsdtest/Particles',invalid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,S46} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd007.xsd','./msxsdtest/Particles',valid),
+  STResList47 = [STRes46|STResList46],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd007.xml','./msxsdtest/Particles',valid,S46),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes47,S47} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd008.xsd','./msxsdtest/Particles',valid),
+  STResList48 = [STRes47|STResList47],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd008.xml','./msxsdtest/Particles',valid,S47),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes48,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd009.xsd','./msxsdtest/Particles',invalid),
+  STResList49 = [STRes48|STResList48],
+
+
+  ?line {STRes49,S49} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd010.xsd','./msxsdtest/Particles',valid),
+  STResList50 = [STRes49|STResList49],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd010.xml','./msxsdtest/Particles',valid,S49),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes50,S50} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd011.xsd','./msxsdtest/Particles',valid),
+  STResList51 = [STRes50|STResList50],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd011.xml','./msxsdtest/Particles',valid,S50),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes51,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd012.xsd','./msxsdtest/Particles',invalid),
+  STResList52 = [STRes51|STResList51],
+
+
+  ?line {STRes52,S52} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd013.xsd','./msxsdtest/Particles',valid),
+  STResList53 = [STRes52|STResList52],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd013.xml','./msxsdtest/Particles',valid,S52),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes53,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd014.xsd','./msxsdtest/Particles',invalid),
+  STResList54 = [STRes53|STResList53],
+
+
+  ?line {STRes54,S54} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd015.xsd','./msxsdtest/Particles',valid),
+  STResList55 = [STRes54|STResList54],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd015.xml','./msxsdtest/Particles',valid,S54),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes55,S55} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJd016.xsd','./msxsdtest/Particles',valid),
+  STResList56 = [STRes55|STResList55],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJd016.xml','./msxsdtest/Particles',valid,S55),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes56,S56} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe001.xsd','./msxsdtest/Particles',valid),
+  STResList57 = [STRes56|STResList56],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJe001.xml','./msxsdtest/Particles',valid,S56),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes57,S57} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe002.xsd','./msxsdtest/Particles',valid),
+  STResList58 = [STRes57|STResList57],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJe002.xml','./msxsdtest/Particles',valid,S57),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe003.xsd','./msxsdtest/Particles',invalid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,S59} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe004.xsd','./msxsdtest/Particles',valid),
+  STResList60 = [STRes59|STResList59],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJe004.xml','./msxsdtest/Particles',valid,S59),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes60,S60} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe005.xsd','./msxsdtest/Particles',valid),
+  STResList61 = [STRes60|STResList60],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJe005.xml','./msxsdtest/Particles',valid,S60),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes61,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe006.xsd','./msxsdtest/Particles',invalid),
+  STResList62 = [STRes61|STResList61],
+
+
+  ?line {STRes62,S62} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe007.xsd','./msxsdtest/Particles',valid),
+  STResList63 = [STRes62|STResList62],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJe007.xml','./msxsdtest/Particles',valid,S62),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes63,S63} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe008.xsd','./msxsdtest/Particles',valid),
+  STResList64 = [STRes63|STResList63],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJe008.xml','./msxsdtest/Particles',valid,S63),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes64,S64} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe009.xsd','./msxsdtest/Particles',valid),
+  STResList65 = [STRes64|STResList64],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJe009.xml','./msxsdtest/Particles',valid,S64),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes65,S65} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe010.xsd','./msxsdtest/Particles',valid),
+  STResList66 = [STRes65|STResList65],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJe010.xml','./msxsdtest/Particles',valid,S65),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes66,S66} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe011.xsd','./msxsdtest/Particles',valid),
+  STResList67 = [STRes66|STResList66],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJe011.xml','./msxsdtest/Particles',valid,S66),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes67,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJe012.xsd','./msxsdtest/Particles',invalid),
+  STResList68 = [STRes67|STResList67],
+
+
+  ?line {STRes68,S68} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf001.xsd','./msxsdtest/Particles',valid),
+  STResList69 = [STRes68|STResList68],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf001.xml','./msxsdtest/Particles',valid,S68),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes69,S69} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf002.xsd','./msxsdtest/Particles',valid),
+  STResList70 = [STRes69|STResList69],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf002.xml','./msxsdtest/Particles',valid,S69),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes70,S70} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf003.xsd','./msxsdtest/Particles',valid),
+  STResList71 = [STRes70|STResList70],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf003.xml','./msxsdtest/Particles',valid,S70),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes71,S71} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf004.xsd','./msxsdtest/Particles',valid),
+  STResList72 = [STRes71|STResList71],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf004.xml','./msxsdtest/Particles',valid,S71),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes72,S72} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf005.xsd','./msxsdtest/Particles',valid),
+  STResList73 = [STRes72|STResList72],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf005.xml','./msxsdtest/Particles',valid,S72),
+  ITResList56 = [ITRes55|ITResList55],
+
+
+  ?line {STRes73,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf006.xsd','./msxsdtest/Particles',invalid),
+  STResList74 = [STRes73|STResList73],
+
+
+  ?line {STRes74,S74} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf007.xsd','./msxsdtest/Particles',valid),
+  STResList75 = [STRes74|STResList74],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf007.xml','./msxsdtest/Particles',valid,S74),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes75,S75} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf008.xsd','./msxsdtest/Particles',valid),
+  STResList76 = [STRes75|STResList75],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf008.xml','./msxsdtest/Particles',valid,S75),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes76,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf009.xsd','./msxsdtest/Particles',invalid),
+  STResList77 = [STRes76|STResList76],
+
+
+  ?line {STRes77,S77} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf010.xsd','./msxsdtest/Particles',valid),
+  STResList78 = [STRes77|STResList77],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf010.xml','./msxsdtest/Particles',valid,S77),
+  ITResList59 = [ITRes58|ITResList58],
+
+
+  ?line {STRes78,S78} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf011.xsd','./msxsdtest/Particles',valid),
+  STResList79 = [STRes78|STResList78],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf011.xml','./msxsdtest/Particles',valid,S78),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes79,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf012.xsd','./msxsdtest/Particles',invalid),
+  STResList80 = [STRes79|STResList79],
+
+
+  ?line {STRes80,S80} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf013.xsd','./msxsdtest/Particles',valid),
+  STResList81 = [STRes80|STResList80],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf013.xml','./msxsdtest/Particles',valid,S80),
+  ITResList61 = [ITRes60|ITResList60],
+
+
+  ?line {STRes81,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf014.xsd','./msxsdtest/Particles',invalid),
+  STResList82 = [STRes81|STResList81],
+
+
+  ?line {STRes82,S82} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf015.xsd','./msxsdtest/Particles',valid),
+  STResList83 = [STRes82|STResList82],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf015.xml','./msxsdtest/Particles',valid,S82),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes83,S83} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJf016.xsd','./msxsdtest/Particles',valid),
+  STResList84 = [STRes83|STResList83],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJf016.xml','./msxsdtest/Particles',valid,S83),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes84,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJg001.xsd','./msxsdtest/Particles',invalid),
+  STResList85 = [STRes84|STResList84],
+
+
+  ?line {STRes85,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJh001.xsd','./msxsdtest/Particles',invalid),
+  STResList86 = [STRes85|STResList85],
+
+
+  ?line {STRes86,S86} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj001.xsd','./msxsdtest/Particles',valid),
+  STResList87 = [STRes86|STResList86],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJj001.xml','./msxsdtest/Particles',valid,S86),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes87,S87} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj002.xsd','./msxsdtest/Particles',valid),
+  STResList88 = [STRes87|STResList87],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJj002.xml','./msxsdtest/Particles',valid,S87),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes88,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj003.xsd','./msxsdtest/Particles',invalid),
+  STResList89 = [STRes88|STResList88],
+
+
+  ?line {STRes89,S89} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj004.xsd','./msxsdtest/Particles',valid),
+  STResList90 = [STRes89|STResList89],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJj004.xml','./msxsdtest/Particles',valid,S89),
+  ITResList66 = [ITRes65|ITResList65],
+
+
+  ?line {STRes90,S90} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj005.xsd','./msxsdtest/Particles',valid),
+  STResList91 = [STRes90|STResList90],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJj005.xml','./msxsdtest/Particles',valid,S90),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes91,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj006.xsd','./msxsdtest/Particles',invalid),
+  STResList92 = [STRes91|STResList91],
+
+
+  ?line {STRes92,S92} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj007.xsd','./msxsdtest/Particles',valid),
+  STResList93 = [STRes92|STResList92],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJj007.xml','./msxsdtest/Particles',valid,S92),
+  ITResList68 = [ITRes67|ITResList67],
+
+
+  ?line {STRes93,S93} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj008.xsd','./msxsdtest/Particles',valid),
+  STResList94 = [STRes93|STResList93],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJj008.xml','./msxsdtest/Particles',valid,S93),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes94,S94} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj009.xsd','./msxsdtest/Particles',valid),
+  STResList95 = [STRes94|STResList94],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJj009.xml','./msxsdtest/Particles',valid,S94),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes95,S95} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj010.xsd','./msxsdtest/Particles',valid),
+  STResList96 = [STRes95|STResList95],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJj010.xml','./msxsdtest/Particles',valid,S95),
+  ITResList71 = [ITRes70|ITResList70],
+
+
+  ?line {STRes96,S96} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj011.xsd','./msxsdtest/Particles',valid),
+  STResList97 = [STRes96|STResList96],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJj011.xml','./msxsdtest/Particles',valid,S96),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes97,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJj012.xsd','./msxsdtest/Particles',invalid),
+  STResList98 = [STRes97|STResList97],
+
+
+  ?line {STRes98,S98} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk001.xsd','./msxsdtest/Particles',valid),
+  STResList99 = [STRes98|STResList98],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJk001.xml','./msxsdtest/Particles',valid,S98),
+  ITResList73 = [ITRes72|ITResList72],
+
+
+  ?line {STRes99,S99} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk002.xsd','./msxsdtest/Particles',valid),
+  STResList100 = [STRes99|STResList99],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJk002.xml','./msxsdtest/Particles',valid,S99),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes100,S100} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk003.xsd','./msxsdtest/Particles',valid),
+  STResList101 = [STRes100|STResList100],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJk003.xml','./msxsdtest/Particles',valid,S100),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes101,S101} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk004.xsd','./msxsdtest/Particles',valid),
+  STResList102 = [STRes101|STResList101],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJk004.xml','./msxsdtest/Particles',valid,S101),
+  ITResList76 = [ITRes75|ITResList75],
+
+
+  ?line {STRes102,S102} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk005.xsd','./msxsdtest/Particles',valid),
+  STResList103 = [STRes102|STResList102],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJk005.xml','./msxsdtest/Particles',valid,S102),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes103,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk006.xsd','./msxsdtest/Particles',invalid),
+  STResList104 = [STRes103|STResList103],
+
+
+  ?line {STRes104,S104} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk007.xsd','./msxsdtest/Particles',valid),
+  STResList105 = [STRes104|STResList104],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJk007.xml','./msxsdtest/Particles',valid,S104),
+  ITResList78 = [ITRes77|ITResList77],
+
+
+  ?line {STRes105,S105} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk008.xsd','./msxsdtest/Particles',valid),
+  STResList106 = [STRes105|STResList105],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJk008.xml','./msxsdtest/Particles',valid,S105),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes106,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk009.xsd','./msxsdtest/Particles',invalid),
+  STResList107 = [STRes106|STResList106],
+
+
+  ?line {STRes107,S107} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk010.xsd','./msxsdtest/Particles',valid),
+  STResList108 = [STRes107|STResList107],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJk010.xml','./msxsdtest/Particles',valid,S107),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes108,S108} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk011.xsd','./msxsdtest/Particles',valid),
+  STResList109 = [STRes108|STResList108],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJk011.xml','./msxsdtest/Particles',valid,S108),
+  ITResList81 = [ITRes80|ITResList80],
+
+
+  ?line {STRes109,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk012.xsd','./msxsdtest/Particles',invalid),
+  STResList110 = [STRes109|STResList109],
+
+
+  ?line {STRes110,S110} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk013.xsd','./msxsdtest/Particles',valid),
+  STResList111 = [STRes110|STResList110],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJk013.xml','./msxsdtest/Particles',valid,S110),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes111,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk014.xsd','./msxsdtest/Particles',invalid),
+  STResList112 = [STRes111|STResList111],
+
+
+  ?line {STRes112,S112} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesJk015.xsd','./msxsdtest/Particles',valid),
+  STResList113 = [STRes112|STResList112],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesJk015.xml','./msxsdtest/Particles',valid,S112),
+  ITResList83 = [ITRes82|ITResList82],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList113,ITResList83).
+
+%% 3.9.6 Particle Restriction.
+
+particlesKOSRTQUVW(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesK001.xsd','./msxsdtest/Particles',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesK001.xml','./msxsdtest/Particles',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesK002.xsd','./msxsdtest/Particles',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesK002.xml','./msxsdtest/Particles',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesK003.xsd','./msxsdtest/Particles',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesK003.xml','./msxsdtest/Particles',valid,S2),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesK004.xsd','./msxsdtest/Particles',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesK005.xsd','./msxsdtest/Particles',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesK005.xml','./msxsdtest/Particles',valid,S4),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesK006.xsd','./msxsdtest/Particles',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesK008.xsd','./msxsdtest/Particles',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesK008.xml','./msxsdtest/Particles',valid,S6),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa001.xsd','./msxsdtest/Particles',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOa001.xml','./msxsdtest/Particles',valid,S7),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa002.xsd','./msxsdtest/Particles',invalid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa003.xsd','./msxsdtest/Particles',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOa003.xml','./msxsdtest/Particles',valid,S9),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa004.xsd','./msxsdtest/Particles',invalid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa005.xsd','./msxsdtest/Particles',invalid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa006.xsd','./msxsdtest/Particles',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOa006.xml','./msxsdtest/Particles',valid,S12),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes13,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa007.xsd','./msxsdtest/Particles',invalid),
+  STResList14 = [STRes13|STResList13],
+
+
+  ?line {STRes14,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa008.xsd','./msxsdtest/Particles',invalid),
+  STResList15 = [STRes14|STResList14],
+
+
+  ?line {STRes15,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa009.xsd','./msxsdtest/Particles',invalid),
+  STResList16 = [STRes15|STResList15],
+
+
+  ?line {STRes16,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa010.xsd','./msxsdtest/Particles',invalid),
+  STResList17 = [STRes16|STResList16],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa011.xsd','./msxsdtest/Particles',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOa011.xml','./msxsdtest/Particles',valid,S17),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa012.xsd','./msxsdtest/Particles',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOa012.xml','./msxsdtest/Particles',valid,S18),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa013.xsd','./msxsdtest/Particles',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOa013.xml','./msxsdtest/Particles',valid,S19),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa014.xsd','./msxsdtest/Particles',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOa014.xml','./msxsdtest/Particles',valid,S20),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOa015.xsd','./msxsdtest/Particles',invalid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb001.xsd','./msxsdtest/Particles',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb001.xml','./msxsdtest/Particles',valid,S22),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb002.xsd','./msxsdtest/Particles',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb002.xml','./msxsdtest/Particles',valid,S23),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb003.xsd','./msxsdtest/Particles',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb003.xml','./msxsdtest/Particles',valid,S24),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb004.xsd','./msxsdtest/Particles',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb004.xml','./msxsdtest/Particles',valid,S25),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb005.xsd','./msxsdtest/Particles',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb005.xml','./msxsdtest/Particles',valid,S26),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb006.xsd','./msxsdtest/Particles',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb006.xml','./msxsdtest/Particles',valid,S27),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb007.xsd','./msxsdtest/Particles',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb007.xml','./msxsdtest/Particles',valid,S28),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb008.xsd','./msxsdtest/Particles',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb008.xml','./msxsdtest/Particles',valid,S29),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb009.xsd','./msxsdtest/Particles',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb009.xml','./msxsdtest/Particles',valid,S30),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb010.xsd','./msxsdtest/Particles',invalid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb011.xsd','./msxsdtest/Particles',invalid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb012.xsd','./msxsdtest/Particles',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb012.xml','./msxsdtest/Particles',valid,S33),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb013.xsd','./msxsdtest/Particles',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb013.xml','./msxsdtest/Particles',valid,S34),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb014.xsd','./msxsdtest/Particles',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb015.xsd','./msxsdtest/Particles',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb015.xml','./msxsdtest/Particles',valid,S36),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb016.xsd','./msxsdtest/Particles',invalid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb017.xsd','./msxsdtest/Particles',invalid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,S39} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb018.xsd','./msxsdtest/Particles',valid),
+  STResList40 = [STRes39|STResList39],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb018.xml','./msxsdtest/Particles',valid,S39),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes40,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb019.xsd','./msxsdtest/Particles',invalid),
+  STResList41 = [STRes40|STResList40],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb020.xsd','./msxsdtest/Particles',invalid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb021.xsd','./msxsdtest/Particles',invalid),
+  STResList43 = [STRes42|STResList42],
+
+
+  ?line {STRes43,S43} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb022.xsd','./msxsdtest/Particles',valid),
+  STResList44 = [STRes43|STResList43],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb022.xml','./msxsdtest/Particles',valid,S43),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes44,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb023.xsd','./msxsdtest/Particles',invalid),
+  STResList45 = [STRes44|STResList44],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb024.xsd','./msxsdtest/Particles',invalid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb025.xsd','./msxsdtest/Particles',invalid),
+  STResList47 = [STRes46|STResList46],
+
+
+  ?line {STRes47,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb026.xsd','./msxsdtest/Particles',invalid),
+  STResList48 = [STRes47|STResList47],
+
+
+  ?line {STRes48,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb027.xsd','./msxsdtest/Particles',invalid),
+  STResList49 = [STRes48|STResList48],
+
+
+  ?line {STRes49,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb028.xsd','./msxsdtest/Particles',invalid),
+  STResList50 = [STRes49|STResList49],
+
+
+  ?line {STRes50,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb029.xsd','./msxsdtest/Particles',invalid),
+  STResList51 = [STRes50|STResList50],
+
+
+  ?line {STRes51,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb030.xsd','./msxsdtest/Particles',invalid),
+  STResList52 = [STRes51|STResList51],
+
+
+  ?line {STRes52,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb031.xsd','./msxsdtest/Particles',invalid),
+  STResList53 = [STRes52|STResList52],
+
+
+  ?line {STRes53,S53} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb032.xsd','./msxsdtest/Particles',valid),
+  STResList54 = [STRes53|STResList53],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb032.xml','./msxsdtest/Particles',valid,S53),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes54,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb033.xsd','./msxsdtest/Particles',invalid),
+  STResList55 = [STRes54|STResList54],
+
+
+  ?line {STRes55,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb034.xsd','./msxsdtest/Particles',invalid),
+  STResList56 = [STRes55|STResList55],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb035.xsd','./msxsdtest/Particles',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb036.xsd','./msxsdtest/Particles',invalid),
+  STResList58 = [STRes57|STResList57],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb037.xsd','./msxsdtest/Particles',invalid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb038.xsd','./msxsdtest/Particles',invalid),
+  STResList60 = [STRes59|STResList59],
+
+
+  ?line {STRes60,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb039.xsd','./msxsdtest/Particles',invalid),
+  STResList61 = [STRes60|STResList60],
+
+
+  ?line {STRes61,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb040.xsd','./msxsdtest/Particles',invalid),
+  STResList62 = [STRes61|STResList61],
+
+
+  ?line {STRes62,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb041.xsd','./msxsdtest/Particles',invalid),
+  STResList63 = [STRes62|STResList62],
+
+
+  ?line {STRes63,S63} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb042.xsd','./msxsdtest/Particles',valid),
+  STResList64 = [STRes63|STResList63],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb042.xml','./msxsdtest/Particles',valid,S63),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes64,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb043.xsd','./msxsdtest/Particles',invalid),
+  STResList65 = [STRes64|STResList64],
+
+
+  ?line {STRes65,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb044.xsd','./msxsdtest/Particles',invalid),
+  STResList66 = [STRes65|STResList65],
+
+
+  ?line {STRes66,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb045.xsd','./msxsdtest/Particles',invalid),
+  STResList67 = [STRes66|STResList66],
+
+
+  ?line {STRes67,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb046.xsd','./msxsdtest/Particles',invalid),
+  STResList68 = [STRes67|STResList67],
+
+
+  ?line {STRes68,S68} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb047.xsd','./msxsdtest/Particles',valid),
+  STResList69 = [STRes68|STResList68],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb047.xml','./msxsdtest/Particles',valid,S68),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes69,S69} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb048.xsd','./msxsdtest/Particles',valid),
+  STResList70 = [STRes69|STResList69],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb048.xml','./msxsdtest/Particles',valid,S69),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes70,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb049.xsd','./msxsdtest/Particles',invalid),
+  STResList71 = [STRes70|STResList70],
+
+
+  ?line {STRes71,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb050.xsd','./msxsdtest/Particles',invalid),
+  STResList72 = [STRes71|STResList71],
+
+
+  ?line {STRes72,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb051.xsd','./msxsdtest/Particles',invalid),
+  STResList73 = [STRes72|STResList72],
+
+
+  ?line {STRes73,S73} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb052.xsd','./msxsdtest/Particles',valid),
+  STResList74 = [STRes73|STResList73],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb052.xml','./msxsdtest/Particles',valid,S73),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes74,S74} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb053.xsd','./msxsdtest/Particles',valid),
+  STResList75 = [STRes74|STResList74],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb053.xml','./msxsdtest/Particles',valid,S74),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes75,S75} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb054.xsd','./msxsdtest/Particles',valid),
+  STResList76 = [STRes75|STResList75],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb054.xml','./msxsdtest/Particles',valid,S75),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes76,S76} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb055.xsd','./msxsdtest/Particles',valid),
+  STResList77 = [STRes76|STResList76],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb055.xml','./msxsdtest/Particles',valid,S76),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes77,S77} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb056.xsd','./msxsdtest/Particles',valid),
+  STResList78 = [STRes77|STResList77],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb056.xml','./msxsdtest/Particles',valid,S77),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes78,S78} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb057.xsd','./msxsdtest/Particles',valid),
+  STResList79 = [STRes78|STResList78],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb057.xml','./msxsdtest/Particles',valid,S78),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes79,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb058.xsd','./msxsdtest/Particles',invalid),
+  STResList80 = [STRes79|STResList79],
+
+
+  ?line {STRes80,S80} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb059.xsd','./msxsdtest/Particles',valid),
+  STResList81 = [STRes80|STResList80],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb059.xml','./msxsdtest/Particles',valid,S80),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes81,S81} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesOb060.xsd','./msxsdtest/Particles',valid),
+  STResList82 = [STRes81|STResList81],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesOb060.xml','./msxsdtest/Particles',valid,S81),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes82,S82} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesS001.xsd','./msxsdtest/Particles',valid),
+  STResList83 = [STRes82|STResList82],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesS001.xml','./msxsdtest/Particles',valid,S82),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes83,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesS002.xsd','./msxsdtest/Particles',invalid),
+  STResList84 = [STRes83|STResList83],
+
+
+  ?line {STRes84,S84} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesS003.xsd','./msxsdtest/Particles',valid),
+  STResList85 = [STRes84|STResList84],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesS003.xml','./msxsdtest/Particles',valid,S84),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes85,S85} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesS004.xsd','./msxsdtest/Particles',valid),
+  STResList86 = [STRes85|STResList85],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesS004.xml','./msxsdtest/Particles',valid,S85),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes86,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesS005.xsd','./msxsdtest/Particles',invalid),
+  STResList87 = [STRes86|STResList86],
+
+
+  ?line {STRes87,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesS006.xsd','./msxsdtest/Particles',invalid),
+  STResList88 = [STRes87|STResList87],
+
+
+  ?line {STRes88,S88} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesS007.xsd','./msxsdtest/Particles',valid),
+  STResList89 = [STRes88|STResList88],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesS007.xml','./msxsdtest/Particles',valid,S88),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes89,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesS008.xsd','./msxsdtest/Particles',invalid),
+  STResList90 = [STRes89|STResList89],
+
+
+  ?line {STRes90,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesS009.xsd','./msxsdtest/Particles',invalid),
+  STResList91 = [STRes90|STResList90],
+
+
+  ?line {STRes91,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesS010.xsd','./msxsdtest/Particles',invalid),
+  STResList92 = [STRes91|STResList91],
+
+
+  ?line {STRes92,S92} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesS011.xsd','./msxsdtest/Particles',valid),
+  STResList93 = [STRes92|STResList92],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesS011.xml','./msxsdtest/Particles',valid,S92),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes93,S93} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR001.xsd','./msxsdtest/Particles',valid),
+  STResList94 = [STRes93|STResList93],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR001.xml','./msxsdtest/Particles',valid,S93),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes94,S94} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR002.xsd','./msxsdtest/Particles',valid),
+  STResList95 = [STRes94|STResList94],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR002.xml','./msxsdtest/Particles',valid,S94),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes95,S95} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR003.xsd','./msxsdtest/Particles',valid),
+  STResList96 = [STRes95|STResList95],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR003.xml','./msxsdtest/Particles',valid,S95),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes96,S96} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR004.xsd','./msxsdtest/Particles',valid),
+  STResList97 = [STRes96|STResList96],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR004.xml','./msxsdtest/Particles',valid,S96),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes97,S97} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR005.xsd','./msxsdtest/Particles',valid),
+  STResList98 = [STRes97|STResList97],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR005.xml','./msxsdtest/Particles',valid,S97),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes98,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR006.xsd','./msxsdtest/Particles',invalid),
+  STResList99 = [STRes98|STResList98],
+
+
+  ?line {STRes99,S99} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR007.xsd','./msxsdtest/Particles',valid),
+  STResList100 = [STRes99|STResList99],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR007.xml','./msxsdtest/Particles',valid,S99),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes100,S100} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR008.xsd','./msxsdtest/Particles',valid),
+  STResList101 = [STRes100|STResList100],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR008.xml','./msxsdtest/Particles',valid,S100),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes101,S101} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR009.xsd','./msxsdtest/Particles',valid),
+  STResList102 = [STRes101|STResList101],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR009.xml','./msxsdtest/Particles',valid,S101),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes102,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR010.xsd','./msxsdtest/Particles',invalid),
+  STResList103 = [STRes102|STResList102],
+
+
+  ?line {STRes103,S103} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR011.xsd','./msxsdtest/Particles',valid),
+  STResList104 = [STRes103|STResList103],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR011.xml','./msxsdtest/Particles',valid,S103),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes104,S104} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR012.xsd','./msxsdtest/Particles',valid),
+  STResList105 = [STRes104|STResList104],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR012.xml','./msxsdtest/Particles',valid,S104),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes105,S105} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR013.xsd','./msxsdtest/Particles',valid),
+  STResList106 = [STRes105|STResList105],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR013.xml','./msxsdtest/Particles',valid,S105),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes106,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR014.xsd','./msxsdtest/Particles',invalid),
+  STResList107 = [STRes106|STResList106],
+
+
+  ?line {STRes107,S107} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR015.xsd','./msxsdtest/Particles',valid),
+  STResList108 = [STRes107|STResList107],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR015.xml','./msxsdtest/Particles',valid,S107),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes108,S108} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR016.xsd','./msxsdtest/Particles',valid),
+  STResList109 = [STRes108|STResList108],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR016.xml','./msxsdtest/Particles',valid,S108),
+  ITResList56 = [ITRes55|ITResList55],
+
+
+  ?line {STRes109,S109} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR017.xsd','./msxsdtest/Particles',valid),
+  STResList110 = [STRes109|STResList109],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR017.xml','./msxsdtest/Particles',valid,S109),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes110,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR018.xsd','./msxsdtest/Particles',invalid),
+  STResList111 = [STRes110|STResList110],
+
+
+  ?line {STRes111,S111} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR019.xsd','./msxsdtest/Particles',valid),
+  STResList112 = [STRes111|STResList111],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR019.xml','./msxsdtest/Particles',valid,S111),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes112,S112} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR020.xsd','./msxsdtest/Particles',valid),
+  STResList113 = [STRes112|STResList112],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR020.xml','./msxsdtest/Particles',valid,S112),
+  ITResList59 = [ITRes58|ITResList58],
+
+
+  ?line {STRes113,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR021.xsd','./msxsdtest/Particles',invalid),
+  STResList114 = [STRes113|STResList113],
+
+
+  ?line {STRes114,S114} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR022.xsd','./msxsdtest/Particles',valid),
+  STResList115 = [STRes114|STResList114],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR022.xml','./msxsdtest/Particles',valid,S114),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes115,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR023.xsd','./msxsdtest/Particles',invalid),
+  STResList116 = [STRes115|STResList115],
+
+
+  ?line {STRes116,S116} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR024.xsd','./msxsdtest/Particles',valid),
+  STResList117 = [STRes116|STResList116],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR024.xml','./msxsdtest/Particles',valid,S116),
+  ITResList61 = [ITRes60|ITResList60],
+
+
+  ?line {STRes117,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR025.xsd','./msxsdtest/Particles',invalid),
+  STResList118 = [STRes117|STResList117],
+
+
+  ?line {STRes118,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR026.xsd','./msxsdtest/Particles',invalid),
+  STResList119 = [STRes118|STResList118],
+
+
+  ?line {STRes119,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR027.xsd','./msxsdtest/Particles',invalid),
+  STResList120 = [STRes119|STResList119],
+
+
+  ?line {STRes120,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR028.xsd','./msxsdtest/Particles',invalid),
+  STResList121 = [STRes120|STResList120],
+
+
+  ?line {STRes121,S121} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR029.xsd','./msxsdtest/Particles',valid),
+  STResList122 = [STRes121|STResList121],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR029.xml','./msxsdtest/Particles',valid,S121),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes122,S122} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR030.xsd','./msxsdtest/Particles',valid),
+  STResList123 = [STRes122|STResList122],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesR030.xml','./msxsdtest/Particles',valid,S122),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes123,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesR031.xsd','./msxsdtest/Particles',invalid),
+  STResList124 = [STRes123|STResList123],
+
+
+  ?line {STRes124,S124} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT001.xsd','./msxsdtest/Particles',valid),
+  STResList125 = [STRes124|STResList124],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesT001.xml','./msxsdtest/Particles',valid,S124),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes125,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT002.xsd','./msxsdtest/Particles',invalid),
+  STResList126 = [STRes125|STResList125],
+
+
+  ?line {STRes126,S126} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT003.xsd','./msxsdtest/Particles',valid),
+  STResList127 = [STRes126|STResList126],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesT003.xml','./msxsdtest/Particles',valid,S126),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes127,S127} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT004.xsd','./msxsdtest/Particles',valid),
+  STResList128 = [STRes127|STResList127],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesT004.xml','./msxsdtest/Particles',valid,S127),
+  ITResList66 = [ITRes65|ITResList65],
+
+
+  ?line {STRes128,S128} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT005.xsd','./msxsdtest/Particles',valid),
+  STResList129 = [STRes128|STResList128],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesT005.xml','./msxsdtest/Particles',valid,S128),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes129,S129} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT006.xsd','./msxsdtest/Particles',valid),
+  STResList130 = [STRes129|STResList129],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesT006.xml','./msxsdtest/Particles',valid,S129),
+  ITResList68 = [ITRes67|ITResList67],
+
+
+  ?line {STRes130,S130} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT007.xsd','./msxsdtest/Particles',valid),
+  STResList131 = [STRes130|STResList130],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesT007.xml','./msxsdtest/Particles',valid,S130),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes131,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT008.xsd','./msxsdtest/Particles',invalid),
+  STResList132 = [STRes131|STResList131],
+
+
+  ?line {STRes132,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT009.xsd','./msxsdtest/Particles',invalid),
+  STResList133 = [STRes132|STResList132],
+
+
+  ?line {STRes133,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT010.xsd','./msxsdtest/Particles',invalid),
+  STResList134 = [STRes133|STResList133],
+
+
+  ?line {STRes134,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT011.xsd','./msxsdtest/Particles',invalid),
+  STResList135 = [STRes134|STResList134],
+
+
+  ?line {STRes135,S135} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT012.xsd','./msxsdtest/Particles',valid),
+  STResList136 = [STRes135|STResList135],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesT012.xml','./msxsdtest/Particles',valid,S135),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes136,S136} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT013.xsd','./msxsdtest/Particles',valid),
+  STResList137 = [STRes136|STResList136],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesT013.xml','./msxsdtest/Particles',valid,S136),
+  ITResList71 = [ITRes70|ITResList70],
+
+
+  ?line {STRes137,S137} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesT014.xsd','./msxsdtest/Particles',valid),
+  STResList138 = [STRes137|STResList137],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesT014.xml','./msxsdtest/Particles',valid,S137),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes138,S138} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ001.xsd','./msxsdtest/Particles',valid),
+  STResList139 = [STRes138|STResList138],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ001.xml','./msxsdtest/Particles',valid,S138),
+  ITResList73 = [ITRes72|ITResList72],
+
+
+  ?line {STRes139,S139} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ002.xsd','./msxsdtest/Particles',valid),
+  STResList140 = [STRes139|STResList139],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ002.xml','./msxsdtest/Particles',valid,S139),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes140,S140} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ003.xsd','./msxsdtest/Particles',valid),
+  STResList141 = [STRes140|STResList140],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ003.xml','./msxsdtest/Particles',valid,S140),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes141,S141} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ004.xsd','./msxsdtest/Particles',valid),
+  STResList142 = [STRes141|STResList141],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ004.xml','./msxsdtest/Particles',valid,S141),
+  ITResList76 = [ITRes75|ITResList75],
+
+
+  ?line {STRes142,S142} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ005.xsd','./msxsdtest/Particles',valid),
+  STResList143 = [STRes142|STResList142],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ005.xml','./msxsdtest/Particles',valid,S142),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes143,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ006.xsd','./msxsdtest/Particles',invalid),
+  STResList144 = [STRes143|STResList143],
+
+
+  ?line {STRes144,S144} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ007.xsd','./msxsdtest/Particles',valid),
+  STResList145 = [STRes144|STResList144],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ007.xml','./msxsdtest/Particles',valid,S144),
+  ITResList78 = [ITRes77|ITResList77],
+
+
+  ?line {STRes145,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ008.xsd','./msxsdtest/Particles',invalid),
+  STResList146 = [STRes145|STResList145],
+
+
+  ?line {STRes146,S146} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ011.xsd','./msxsdtest/Particles',valid),
+  STResList147 = [STRes146|STResList146],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ011.xml','./msxsdtest/Particles',valid,S146),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes147,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ012.xsd','./msxsdtest/Particles',invalid),
+  STResList148 = [STRes147|STResList147],
+
+
+  ?line {STRes148,S148} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ013.xsd','./msxsdtest/Particles',valid),
+  STResList149 = [STRes148|STResList148],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ013.xml','./msxsdtest/Particles',valid,S148),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes149,S149} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ016.xsd','./msxsdtest/Particles',valid),
+  STResList150 = [STRes149|STResList149],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ016.xml','./msxsdtest/Particles',valid,S149),
+  ITResList81 = [ITRes80|ITResList80],
+
+
+  ?line {STRes150,S150} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ017.xsd','./msxsdtest/Particles',valid),
+  STResList151 = [STRes150|STResList150],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ017.xml','./msxsdtest/Particles',valid,S150),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes151,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ018.xsd','./msxsdtest/Particles',invalid),
+  STResList152 = [STRes151|STResList151],
+
+
+  ?line {STRes152,S152} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ019.xsd','./msxsdtest/Particles',valid),
+  STResList153 = [STRes152|STResList152],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ019.xml','./msxsdtest/Particles',valid,S152),
+  ITResList83 = [ITRes82|ITResList82],
+
+
+  ?line {STRes153,S153} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ020.xsd','./msxsdtest/Particles',valid),
+  STResList154 = [STRes153|STResList153],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ020.xml','./msxsdtest/Particles',valid,S153),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes154,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ021.xsd','./msxsdtest/Particles',invalid),
+  STResList155 = [STRes154|STResList154],
+
+
+  ?line {STRes155,S155} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ022.xsd','./msxsdtest/Particles',valid),
+  STResList156 = [STRes155|STResList155],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ022.xml','./msxsdtest/Particles',valid,S155),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes156,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ023.xsd','./msxsdtest/Particles',invalid),
+  STResList157 = [STRes156|STResList156],
+
+
+  ?line {STRes157,S157} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ024.xsd','./msxsdtest/Particles',valid),
+  STResList158 = [STRes157|STResList157],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ024.xml','./msxsdtest/Particles',valid,S157),
+  ITResList86 = [ITRes85|ITResList85],
+
+
+  ?line {STRes158,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ025.xsd','./msxsdtest/Particles',invalid),
+  STResList159 = [STRes158|STResList158],
+
+
+  ?line {STRes159,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ026.xsd','./msxsdtest/Particles',invalid),
+  STResList160 = [STRes159|STResList159],
+
+
+  ?line {STRes160,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ027.xsd','./msxsdtest/Particles',invalid),
+  STResList161 = [STRes160|STResList160],
+
+
+  ?line {STRes161,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ028.xsd','./msxsdtest/Particles',invalid),
+  STResList162 = [STRes161|STResList161],
+
+
+  ?line {STRes162,S162} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ029.xsd','./msxsdtest/Particles',valid),
+  STResList163 = [STRes162|STResList162],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ029.xml','./msxsdtest/Particles',valid,S162),
+  ITResList87 = [ITRes86|ITResList86],
+
+
+  ?line {STRes163,S163} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ030.xsd','./msxsdtest/Particles',valid),
+  STResList164 = [STRes163|STResList163],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesQ030.xml','./msxsdtest/Particles',valid,S163),
+  ITResList88 = [ITRes87|ITResList87],
+
+
+  ?line {STRes164,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesQ031.xsd','./msxsdtest/Particles',invalid),
+  STResList165 = [STRes164|STResList164],
+
+
+  ?line {STRes165,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesU001.xsd','./msxsdtest/Particles',invalid),
+  STResList166 = [STRes165|STResList165],
+
+
+  ?line {STRes166,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesU002.xsd','./msxsdtest/Particles',invalid),
+  STResList167 = [STRes166|STResList166],
+
+
+  ?line {STRes167,S167} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesU003.xsd','./msxsdtest/Particles',valid),
+  STResList168 = [STRes167|STResList167],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesU003.xml','./msxsdtest/Particles',valid,S167),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes168,S168} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesU004.xsd','./msxsdtest/Particles',valid),
+  STResList169 = [STRes168|STResList168],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesU004.xml','./msxsdtest/Particles',valid,S168),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes169,S169} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesU005.xsd','./msxsdtest/Particles',valid),
+  STResList170 = [STRes169|STResList169],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesU005.xml','./msxsdtest/Particles',valid,S169),
+  ITResList91 = [ITRes90|ITResList90],
+
+
+  ?line {STRes170,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesU006.xsd','./msxsdtest/Particles',invalid),
+  STResList171 = [STRes170|STResList170],
+
+
+  ?line {STRes171,S171} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesU007.xsd','./msxsdtest/Particles',valid),
+  STResList172 = [STRes171|STResList171],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesU007.xml','./msxsdtest/Particles',valid,S171),
+  ITResList92 = [ITRes91|ITResList91],
+
+
+  ?line {STRes172,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesU008.xsd','./msxsdtest/Particles',invalid),
+  STResList173 = [STRes172|STResList172],
+
+
+  ?line {STRes173,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesU009.xsd','./msxsdtest/Particles',invalid),
+  STResList174 = [STRes173|STResList173],
+
+
+  ?line {STRes174,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV002.xsd','./msxsdtest/Particles',invalid),
+  STResList175 = [STRes174|STResList174],
+
+
+  ?line {STRes175,S175} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV003.xsd','./msxsdtest/Particles',valid),
+  STResList176 = [STRes175|STResList175],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesV003.xml','./msxsdtest/Particles',valid,S175),
+  ITResList93 = [ITRes92|ITResList92],
+
+
+  ?line {STRes176,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV005.xsd','./msxsdtest/Particles',invalid),
+  STResList177 = [STRes176|STResList176],
+
+
+  ?line {STRes177,S177} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV006.xsd','./msxsdtest/Particles',valid),
+  STResList178 = [STRes177|STResList177],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesV006.xml','./msxsdtest/Particles',valid,S177),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes178,S178} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV007.xsd','./msxsdtest/Particles',valid),
+  STResList179 = [STRes178|STResList178],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesV007.xml','./msxsdtest/Particles',valid,S178),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes179,S179} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV008.xsd','./msxsdtest/Particles',valid),
+  STResList180 = [STRes179|STResList179],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesV008.xml','./msxsdtest/Particles',valid,S179),
+  ITResList96 = [ITRes95|ITResList95],
+
+
+  ?line {STRes180,S180} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV009.xsd','./msxsdtest/Particles',valid),
+  STResList181 = [STRes180|STResList180],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesV009.xml','./msxsdtest/Particles',valid,S180),
+  ITResList97 = [ITRes96|ITResList96],
+
+
+  ?line {STRes181,S181} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV010.xsd','./msxsdtest/Particles',valid),
+  STResList182 = [STRes181|STResList181],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesV010.xml','./msxsdtest/Particles',valid,S181),
+  ITResList98 = [ITRes97|ITResList97],
+
+
+  ?line {STRes182,S182} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV011.xsd','./msxsdtest/Particles',valid),
+  STResList183 = [STRes182|STResList182],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesV011.xml','./msxsdtest/Particles',valid,S182),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes183,S183} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV012.xsd','./msxsdtest/Particles',valid),
+  STResList184 = [STRes183|STResList183],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesV012.xml','./msxsdtest/Particles',valid,S183),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes184,S184} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV013.xsd','./msxsdtest/Particles',valid),
+  STResList185 = [STRes184|STResList184],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesV013.xml','./msxsdtest/Particles',valid,S184),
+  ITResList101 = [ITRes100|ITResList100],
+
+
+  ?line {STRes185,S185} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV014.xsd','./msxsdtest/Particles',valid),
+  STResList186 = [STRes185|STResList185],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesV014.xml','./msxsdtest/Particles',valid,S185),
+  ITResList102 = [ITRes101|ITResList101],
+
+
+  ?line {STRes186,S186} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV015.xsd','./msxsdtest/Particles',valid),
+  STResList187 = [STRes186|STResList186],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesV015.xml','./msxsdtest/Particles',valid,S186),
+  ITResList103 = [ITRes102|ITResList102],
+
+
+  ?line {STRes187,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV016.xsd','./msxsdtest/Particles',invalid),
+  STResList188 = [STRes187|STResList187],
+
+
+  ?line {STRes188,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV017.xsd','./msxsdtest/Particles',invalid),
+  STResList189 = [STRes188|STResList188],
+
+
+  ?line {STRes189,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV018.xsd','./msxsdtest/Particles',invalid),
+  STResList190 = [STRes189|STResList189],
+
+
+  ?line {STRes190,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesV020.xsd','./msxsdtest/Particles',invalid),
+  STResList191 = [STRes190|STResList190],
+
+
+  ?line {STRes191,S191} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW001.xsd','./msxsdtest/Particles',valid),
+  STResList192 = [STRes191|STResList191],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesW001.xml','./msxsdtest/Particles',valid,S191),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes192,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW002.xsd','./msxsdtest/Particles',invalid),
+  STResList193 = [STRes192|STResList192],
+
+
+  ?line {STRes193,S193} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW003.xsd','./msxsdtest/Particles',valid),
+  STResList194 = [STRes193|STResList193],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesW003.xml','./msxsdtest/Particles',valid,S193),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes194,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW005.xsd','./msxsdtest/Particles',invalid),
+  STResList195 = [STRes194|STResList194],
+
+
+  ?line {STRes195,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW006.xsd','./msxsdtest/Particles',valid),
+  STResList196 = [STRes195|STResList195],
+
+
+  ?line {STRes196,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW007.xsd','./msxsdtest/Particles',invalid),
+  STResList197 = [STRes196|STResList196],
+
+
+  ?line {STRes197,S197} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW008.xsd','./msxsdtest/Particles',valid),
+  STResList198 = [STRes197|STResList197],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesW008.xml','./msxsdtest/Particles',valid,S197),
+  ITResList106 = [ITRes105|ITResList105],
+
+
+  ?line {STRes198,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW010.xsd','./msxsdtest/Particles',invalid),
+  STResList199 = [STRes198|STResList198],
+
+
+  ?line {STRes199,S199} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW011.xsd','./msxsdtest/Particles',valid),
+  STResList200 = [STRes199|STResList199],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesW011.xml','./msxsdtest/Particles',valid,S199),
+  ITResList107 = [ITRes106|ITResList106],
+
+
+  ?line {STRes200,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW012.xsd','./msxsdtest/Particles',invalid),
+  STResList201 = [STRes200|STResList200],
+
+
+  ?line {STRes201,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW013.xsd','./msxsdtest/Particles',invalid),
+  STResList202 = [STRes201|STResList201],
+
+
+  ?line {STRes202,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW014.xsd','./msxsdtest/Particles',invalid),
+  STResList203 = [STRes202|STResList202],
+
+
+  ?line {STRes203,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW015.xsd','./msxsdtest/Particles',invalid),
+  STResList204 = [STRes203|STResList203],
+
+
+  ?line {STRes204,S204} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Particles/particlesW016.xsd','./msxsdtest/Particles',valid),
+  STResList205 = [STRes204|STResList204],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/Particles/particlesW016.xml','./msxsdtest/Particles',valid,S204),
+  ITResList108 = [ITRes107|ITResList107],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList205,ITResList108).
+
+%% Syntax Checking for simpleType Declaration.
+
+stABCDE(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA001.xsd','./msxsdtest/simpleType',valid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA002.xsd','./msxsdtest/simpleType',invalid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA003.xsd','./msxsdtest/simpleType',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA004.xsd','./msxsdtest/simpleType',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA005.xsd','./msxsdtest/simpleType',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA006.xsd','./msxsdtest/simpleType',valid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA007.xsd','./msxsdtest/simpleType',valid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA008.xsd','./msxsdtest/simpleType',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA009.xsd','./msxsdtest/simpleType',invalid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA010.xsd','./msxsdtest/simpleType',invalid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA011.xsd','./msxsdtest/simpleType',invalid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA012.xsd','./msxsdtest/simpleType',invalid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA013.xsd','./msxsdtest/simpleType',invalid),
+  STResList13 = [STRes12|STResList12],
+
+
+  ?line {STRes13,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA014.xsd','./msxsdtest/simpleType',invalid),
+  STResList14 = [STRes13|STResList13],
+
+
+  ?line {STRes14,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA015.xsd','./msxsdtest/simpleType',invalid),
+  STResList15 = [STRes14|STResList14],
+
+
+  ?line {STRes15,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA016.xsd','./msxsdtest/simpleType',valid),
+  STResList16 = [STRes15|STResList15],
+
+
+  ?line {STRes16,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA017.xsd','./msxsdtest/simpleType',invalid),
+  STResList17 = [STRes16|STResList16],
+
+
+  ?line {STRes17,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA018.xsd','./msxsdtest/simpleType',valid),
+  STResList18 = [STRes17|STResList17],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA019.xsd','./msxsdtest/simpleType',valid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stA020.xsd','./msxsdtest/simpleType',valid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB001.xsd','./msxsdtest/simpleType',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB002.xsd','./msxsdtest/simpleType',invalid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB003.xsd','./msxsdtest/simpleType',valid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB004.xsd','./msxsdtest/simpleType',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB005.xsd','./msxsdtest/simpleType',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB006.xsd','./msxsdtest/simpleType',valid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB007.xsd','./msxsdtest/simpleType',invalid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB008.xsd','./msxsdtest/simpleType',valid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB009.xsd','./msxsdtest/simpleType',invalid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB010.xsd','./msxsdtest/simpleType',invalid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB011.xsd','./msxsdtest/simpleType',valid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB012.xsd','./msxsdtest/simpleType',valid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB013.xsd','./msxsdtest/simpleType',invalid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB014.xsd','./msxsdtest/simpleType',invalid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB015.xsd','./msxsdtest/simpleType',valid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB016.xsd','./msxsdtest/simpleType',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB017.xsd','./msxsdtest/simpleType',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB018.xsd','./msxsdtest/simpleType',invalid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB019.xsd','./msxsdtest/simpleType',invalid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB020.xsd','./msxsdtest/simpleType',invalid),
+  STResList40 = [STRes39|STResList39],
+
+
+  ?line {STRes40,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB021.xsd','./msxsdtest/simpleType',invalid),
+  STResList41 = [STRes40|STResList40],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB022.xsd','./msxsdtest/simpleType',invalid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB023.xsd','./msxsdtest/simpleType',invalid),
+  STResList43 = [STRes42|STResList42],
+
+
+  ?line {STRes43,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stB024.xsd','./msxsdtest/simpleType',invalid),
+  STResList44 = [STRes43|STResList43],
+
+
+  ?line {STRes44,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC001.xsd','./msxsdtest/simpleType',valid),
+  STResList45 = [STRes44|STResList44],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC002.xsd','./msxsdtest/simpleType',invalid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC003.xsd','./msxsdtest/simpleType',valid),
+  STResList47 = [STRes46|STResList46],
+
+
+  ?line {STRes47,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC004.xsd','./msxsdtest/simpleType',invalid),
+  STResList48 = [STRes47|STResList47],
+
+
+  ?line {STRes48,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC005.xsd','./msxsdtest/simpleType',valid),
+  STResList49 = [STRes48|STResList48],
+
+
+  ?line {STRes49,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC006.xsd','./msxsdtest/simpleType',invalid),
+  STResList50 = [STRes49|STResList49],
+
+
+  ?line {STRes50,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC007.xsd','./msxsdtest/simpleType',invalid),
+  STResList51 = [STRes50|STResList50],
+
+
+  ?line {STRes51,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC008.xsd','./msxsdtest/simpleType',invalid),
+  STResList52 = [STRes51|STResList51],
+
+
+  ?line {STRes52,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC009.xsd','./msxsdtest/simpleType',invalid),
+  STResList53 = [STRes52|STResList52],
+
+
+  ?line {STRes53,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC010.xsd','./msxsdtest/simpleType',valid),
+  STResList54 = [STRes53|STResList53],
+
+
+  ?line {STRes54,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC011.xsd','./msxsdtest/simpleType',invalid),
+  STResList55 = [STRes54|STResList54],
+
+
+  ?line {STRes55,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC012.xsd','./msxsdtest/simpleType',invalid),
+  STResList56 = [STRes55|STResList55],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC013.xsd','./msxsdtest/simpleType',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC014.xsd','./msxsdtest/simpleType',valid),
+  STResList58 = [STRes57|STResList57],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC015.xsd','./msxsdtest/simpleType',valid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC016.xsd','./msxsdtest/simpleType',valid),
+  STResList60 = [STRes59|STResList59],
+
+
+  ?line {STRes60,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC017.xsd','./msxsdtest/simpleType',valid),
+  STResList61 = [STRes60|STResList60],
+
+
+  ?line {STRes61,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC018.xsd','./msxsdtest/simpleType',valid),
+  STResList62 = [STRes61|STResList61],
+
+
+  ?line {STRes62,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC019.xsd','./msxsdtest/simpleType',valid),
+  STResList63 = [STRes62|STResList62],
+
+
+  ?line {STRes63,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC020.xsd','./msxsdtest/simpleType',valid),
+  STResList64 = [STRes63|STResList63],
+
+
+  ?line {STRes64,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC021.xsd','./msxsdtest/simpleType',valid),
+  STResList65 = [STRes64|STResList64],
+
+
+  ?line {STRes65,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC022.xsd','./msxsdtest/simpleType',valid),
+  STResList66 = [STRes65|STResList65],
+
+
+  ?line {STRes66,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC023.xsd','./msxsdtest/simpleType',invalid),
+  STResList67 = [STRes66|STResList66],
+
+
+  ?line {STRes67,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC024.xsd','./msxsdtest/simpleType',valid),
+  STResList68 = [STRes67|STResList67],
+
+
+  ?line {STRes68,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC025.xsd','./msxsdtest/simpleType',valid),
+  STResList69 = [STRes68|STResList68],
+
+
+  ?line {STRes69,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC026.xsd','./msxsdtest/simpleType',valid),
+  STResList70 = [STRes69|STResList69],
+
+
+  ?line {STRes70,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC027.xsd','./msxsdtest/simpleType',invalid),
+  STResList71 = [STRes70|STResList70],
+
+
+  ?line {STRes71,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC028.xsd','./msxsdtest/simpleType',invalid),
+  STResList72 = [STRes71|STResList71],
+
+
+  ?line {STRes72,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC029.xsd','./msxsdtest/simpleType',invalid),
+  STResList73 = [STRes72|STResList72],
+
+
+  ?line {STRes73,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC030.xsd','./msxsdtest/simpleType',valid),
+  STResList74 = [STRes73|STResList73],
+
+
+  ?line {STRes74,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC031.xsd','./msxsdtest/simpleType',invalid),
+  STResList75 = [STRes74|STResList74],
+
+
+  ?line {STRes75,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC032.xsd','./msxsdtest/simpleType',invalid),
+  STResList76 = [STRes75|STResList75],
+
+
+  ?line {STRes76,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stC033.xsd','./msxsdtest/simpleType',valid),
+  STResList77 = [STRes76|STResList76],
+
+
+  ?line {STRes77,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD001.xsd','./msxsdtest/simpleType',valid),
+  STResList78 = [STRes77|STResList77],
+
+
+  ?line {STRes78,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD002.xsd','./msxsdtest/simpleType',invalid),
+  STResList79 = [STRes78|STResList78],
+
+
+  ?line {STRes79,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD003.xsd','./msxsdtest/simpleType',invalid),
+  STResList80 = [STRes79|STResList79],
+
+
+  ?line {STRes80,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD004.xsd','./msxsdtest/simpleType',invalid),
+  STResList81 = [STRes80|STResList80],
+
+
+  ?line {STRes81,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD005.xsd','./msxsdtest/simpleType',invalid),
+  STResList82 = [STRes81|STResList81],
+
+
+  ?line {STRes82,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD006.xsd','./msxsdtest/simpleType',valid),
+  STResList83 = [STRes82|STResList82],
+
+
+  ?line {STRes83,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD007.xsd','./msxsdtest/simpleType',valid),
+  STResList84 = [STRes83|STResList83],
+
+
+  ?line {STRes84,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD008.xsd','./msxsdtest/simpleType',valid),
+  STResList85 = [STRes84|STResList84],
+
+
+  ?line {STRes85,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD009.xsd','./msxsdtest/simpleType',invalid),
+  STResList86 = [STRes85|STResList85],
+
+
+  ?line {STRes86,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD010.xsd','./msxsdtest/simpleType',invalid),
+  STResList87 = [STRes86|STResList86],
+
+
+  ?line {STRes87,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD011.xsd','./msxsdtest/simpleType',valid),
+  STResList88 = [STRes87|STResList87],
+
+
+  ?line {STRes88,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD012.xsd','./msxsdtest/simpleType',valid),
+  STResList89 = [STRes88|STResList88],
+
+
+  ?line {STRes89,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD013.xsd','./msxsdtest/simpleType',valid),
+  STResList90 = [STRes89|STResList89],
+
+
+  ?line {STRes90,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD014.xsd','./msxsdtest/simpleType',valid),
+  STResList91 = [STRes90|STResList90],
+
+
+  ?line {STRes91,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD015.xsd','./msxsdtest/simpleType',invalid),
+  STResList92 = [STRes91|STResList91],
+
+
+  ?line {STRes92,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD016.xsd','./msxsdtest/simpleType',invalid),
+  STResList93 = [STRes92|STResList92],
+
+
+  ?line {STRes93,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD017.xsd','./msxsdtest/simpleType',invalid),
+  STResList94 = [STRes93|STResList93],
+
+
+  ?line {STRes94,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD018.xsd','./msxsdtest/simpleType',invalid),
+  STResList95 = [STRes94|STResList94],
+
+
+  ?line {STRes95,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD019.xsd','./msxsdtest/simpleType',invalid),
+  STResList96 = [STRes95|STResList95],
+
+
+  ?line {STRes96,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD020.xsd','./msxsdtest/simpleType',valid),
+  STResList97 = [STRes96|STResList96],
+
+
+  ?line {STRes97,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stD021.xsd','./msxsdtest/simpleType',valid),
+  STResList98 = [STRes97|STResList97],
+
+
+  ?line {STRes98,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE001.xsd','./msxsdtest/simpleType',valid),
+  STResList99 = [STRes98|STResList98],
+
+
+  ?line {STRes99,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE002.xsd','./msxsdtest/simpleType',invalid),
+  STResList100 = [STRes99|STResList99],
+
+
+  ?line {STRes100,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE003.xsd','./msxsdtest/simpleType',invalid),
+  STResList101 = [STRes100|STResList100],
+
+
+  ?line {STRes101,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE004.xsd','./msxsdtest/simpleType',invalid),
+  STResList102 = [STRes101|STResList101],
+
+
+  ?line {STRes102,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE005.xsd','./msxsdtest/simpleType',invalid),
+  STResList103 = [STRes102|STResList102],
+
+
+  ?line {STRes103,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE006.xsd','./msxsdtest/simpleType',valid),
+  STResList104 = [STRes103|STResList103],
+
+
+  ?line {STRes104,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE007.xsd','./msxsdtest/simpleType',valid),
+  STResList105 = [STRes104|STResList104],
+
+
+  ?line {STRes105,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE008.xsd','./msxsdtest/simpleType',invalid),
+  STResList106 = [STRes105|STResList105],
+
+
+  ?line {STRes106,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE009.xsd','./msxsdtest/simpleType',valid),
+  STResList107 = [STRes106|STResList106],
+
+
+  ?line {STRes107,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE010.xsd','./msxsdtest/simpleType',valid),
+  STResList108 = [STRes107|STResList107],
+
+
+  ?line {STRes108,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE011.xsd','./msxsdtest/simpleType',valid),
+  STResList109 = [STRes108|STResList108],
+
+
+  ?line {STRes109,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE012.xsd','./msxsdtest/simpleType',invalid),
+  STResList110 = [STRes109|STResList109],
+
+
+  ?line {STRes110,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE013.xsd','./msxsdtest/simpleType',valid),
+  STResList111 = [STRes110|STResList110],
+
+
+  ?line {STRes111,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE014.xsd','./msxsdtest/simpleType',valid),
+  STResList112 = [STRes111|STResList111],
+
+
+  ?line {STRes112,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE015.xsd','./msxsdtest/simpleType',invalid),
+  STResList113 = [STRes112|STResList112],
+
+
+  ?line {STRes113,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE016.xsd','./msxsdtest/simpleType',invalid),
+  STResList114 = [STRes113|STResList113],
+
+
+  ?line {STRes114,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE017.xsd','./msxsdtest/simpleType',valid),
+  STResList115 = [STRes114|STResList114],
+
+
+  ?line {STRes115,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stE018.xsd','./msxsdtest/simpleType',invalid),
+  STResList116 = [STRes115|STResList115],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList116,[]).
+
+%% simpleType Validation checking.
+
+stFGH(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF001.xsd','./msxsdtest/simpleType',valid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF002.xsd','./msxsdtest/simpleType',valid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF003.xsd','./msxsdtest/simpleType',valid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF004.xsd','./msxsdtest/simpleType',valid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF005.xsd','./msxsdtest/simpleType',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF006.xsd','./msxsdtest/simpleType',valid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF007.xsd','./msxsdtest/simpleType',invalid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF008.xsd','./msxsdtest/simpleType',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF009.xsd','./msxsdtest/simpleType',invalid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF010.xsd','./msxsdtest/simpleType',invalid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF011.xsd','./msxsdtest/simpleType',invalid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF012.xsd','./msxsdtest/simpleType',invalid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF013.xsd','./msxsdtest/simpleType',invalid),
+  STResList13 = [STRes12|STResList12],
+
+
+  ?line {STRes13,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF014.xsd','./msxsdtest/simpleType',invalid),
+  STResList14 = [STRes13|STResList13],
+
+
+  ?line {STRes14,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF015.xsd','./msxsdtest/simpleType',invalid),
+  STResList15 = [STRes14|STResList14],
+
+
+  ?line {STRes15,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF016.xsd','./msxsdtest/simpleType',valid),
+  STResList16 = [STRes15|STResList15],
+
+
+  ?line {STRes16,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF017.xsd','./msxsdtest/simpleType',valid),
+  STResList17 = [STRes16|STResList16],
+
+
+  ?line {STRes17,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF018.xsd','./msxsdtest/simpleType',invalid),
+  STResList18 = [STRes17|STResList17],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF019.xsd','./msxsdtest/simpleType',invalid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF020.xsd','./msxsdtest/simpleType',invalid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF021.xsd','./msxsdtest/simpleType',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF022.xsd','./msxsdtest/simpleType',invalid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF023.xsd','./msxsdtest/simpleType',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF024.xsd','./msxsdtest/simpleType',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF025.xsd','./msxsdtest/simpleType',invalid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF026.xsd','./msxsdtest/simpleType',invalid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF027.xsd','./msxsdtest/simpleType',invalid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF028.xsd','./msxsdtest/simpleType',invalid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF029.xsd','./msxsdtest/simpleType',invalid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF030.xsd','./msxsdtest/simpleType',invalid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF031.xsd','./msxsdtest/simpleType',invalid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF032.xsd','./msxsdtest/simpleType',valid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF033.xsd','./msxsdtest/simpleType',invalid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF034.xsd','./msxsdtest/simpleType',valid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF035.xsd','./msxsdtest/simpleType',invalid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF036.xsd','./msxsdtest/simpleType',valid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stF037.xsd','./msxsdtest/simpleType',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,S37} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG001.xsd','./msxsdtest/simpleType',valid),
+  STResList38 = [STRes37|STResList37],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG001.xml','./msxsdtest/simpleType',valid,S37),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes38,S38} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG002.xsd','./msxsdtest/simpleType',valid),
+  STResList39 = [STRes38|STResList38],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG002.xml','./msxsdtest/simpleType',valid,S38),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes39,S39} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG003.xsd','./msxsdtest/simpleType',valid),
+  STResList40 = [STRes39|STResList39],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG003.xml','./msxsdtest/simpleType',invalid,S39),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG004.xsd','./msxsdtest/simpleType',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG004.xml','./msxsdtest/simpleType',valid,S40),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes41,S41} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG005.xsd','./msxsdtest/simpleType',valid),
+  STResList42 = [STRes41|STResList41],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG005.xml','./msxsdtest/simpleType',invalid,S41),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes42,S42} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG006.xsd','./msxsdtest/simpleType',valid),
+  STResList43 = [STRes42|STResList42],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG006.xml','./msxsdtest/simpleType',valid,S42),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes43,S43} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG007.xsd','./msxsdtest/simpleType',valid),
+  STResList44 = [STRes43|STResList43],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG007.xml','./msxsdtest/simpleType',invalid,S43),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes44,S44} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG008.xsd','./msxsdtest/simpleType',valid),
+  STResList45 = [STRes44|STResList44],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG008.xml','./msxsdtest/simpleType',valid,S44),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes45,S45} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG009.xsd','./msxsdtest/simpleType',valid),
+  STResList46 = [STRes45|STResList45],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG009.xml','./msxsdtest/simpleType',invalid,S45),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes46,S46} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG010.xsd','./msxsdtest/simpleType',valid),
+  STResList47 = [STRes46|STResList46],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG010.xml','./msxsdtest/simpleType',valid,S46),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes47,S47} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG011.xsd','./msxsdtest/simpleType',valid),
+  STResList48 = [STRes47|STResList47],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG011.xml','./msxsdtest/simpleType',invalid,S47),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes48,S48} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG012.xsd','./msxsdtest/simpleType',valid),
+  STResList49 = [STRes48|STResList48],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG012.xml','./msxsdtest/simpleType',valid,S48),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes49,S49} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stG013.xsd','./msxsdtest/simpleType',valid),
+  STResList50 = [STRes49|STResList49],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stG013.xml','./msxsdtest/simpleType',invalid,S49),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes50,S50} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stH001.xsd','./msxsdtest/simpleType',valid),
+  STResList51 = [STRes50|STResList50],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stH001.xml','./msxsdtest/simpleType',valid,S50),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes51,S51} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stH002.xsd','./msxsdtest/simpleType',valid),
+  STResList52 = [STRes51|STResList51],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stH002.xml','./msxsdtest/simpleType',invalid,S51),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes52,S52} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stH003.xsd','./msxsdtest/simpleType',valid),
+  STResList53 = [STRes52|STResList52],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stH003.xml','./msxsdtest/simpleType',valid,S52),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes53,S53} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stH004.xsd','./msxsdtest/simpleType',valid),
+  STResList54 = [STRes53|STResList53],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stH004.xml','./msxsdtest/simpleType',invalid,S53),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes54,S54} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stH005.xsd','./msxsdtest/simpleType',valid),
+  STResList55 = [STRes54|STResList54],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stH005.xml','./msxsdtest/simpleType',valid,S54),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes55,S55} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stH006.xsd','./msxsdtest/simpleType',valid),
+  STResList56 = [STRes55|STResList55],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stH006.xml','./msxsdtest/simpleType',invalid,S55),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes56,S56} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stH007.xsd','./msxsdtest/simpleType',valid),
+  STResList57 = [STRes56|STResList56],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stH007.xml','./msxsdtest/simpleType',valid,S56),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes57,S57} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stH008.xsd','./msxsdtest/simpleType',valid),
+  STResList58 = [STRes57|STResList57],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stH008.xml','./msxsdtest/simpleType',invalid,S57),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList58,ITResList21).
+
+%% simpleType Schema Component Constraints.
+
+stIJK(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stI001.xsd','./msxsdtest/simpleType',valid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stI002.xsd','./msxsdtest/simpleType',valid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stI003.xsd','./msxsdtest/simpleType',valid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stI004.xsd','./msxsdtest/simpleType',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stI005.xsd','./msxsdtest/simpleType',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ001.xsd','./msxsdtest/simpleType',valid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ002.xsd','./msxsdtest/simpleType',valid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ003.xsd','./msxsdtest/simpleType',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ004.xsd','./msxsdtest/simpleType',valid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ005.xsd','./msxsdtest/simpleType',valid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ006.xsd','./msxsdtest/simpleType',valid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ007.xsd','./msxsdtest/simpleType',valid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ008.xsd','./msxsdtest/simpleType',valid),
+  STResList13 = [STRes12|STResList12],
+
+
+  ?line {STRes13,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ009.xsd','./msxsdtest/simpleType',invalid),
+  STResList14 = [STRes13|STResList13],
+
+
+  ?line {STRes14,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ010.xsd','./msxsdtest/simpleType',invalid),
+  STResList15 = [STRes14|STResList14],
+
+
+  ?line {STRes15,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ011.xsd','./msxsdtest/simpleType',invalid),
+  STResList16 = [STRes15|STResList15],
+
+
+  ?line {STRes16,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ012.xsd','./msxsdtest/simpleType',invalid),
+  STResList17 = [STRes16|STResList16],
+
+
+  ?line {STRes17,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ013.xsd','./msxsdtest/simpleType',invalid),
+  STResList18 = [STRes17|STResList17],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ014.xsd','./msxsdtest/simpleType',invalid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ015.xsd','./msxsdtest/simpleType',invalid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ016.xsd','./msxsdtest/simpleType',invalid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ017.xsd','./msxsdtest/simpleType',invalid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ018.xsd','./msxsdtest/simpleType',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stJ019.xsd','./msxsdtest/simpleType',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK001.xsd','./msxsdtest/simpleType',valid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK002.xsd','./msxsdtest/simpleType',invalid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK003.xsd','./msxsdtest/simpleType',invalid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK004.xsd','./msxsdtest/simpleType',valid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK005.xsd','./msxsdtest/simpleType',invalid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK006.xsd','./msxsdtest/simpleType',invalid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK007.xsd','./msxsdtest/simpleType',invalid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK008.xsd','./msxsdtest/simpleType',valid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK009.xsd','./msxsdtest/simpleType',valid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK010.xsd','./msxsdtest/simpleType',invalid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK011.xsd','./msxsdtest/simpleType',invalid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK012.xsd','./msxsdtest/simpleType',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK013.xsd','./msxsdtest/simpleType',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK014.xsd','./msxsdtest/simpleType',invalid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK015.xsd','./msxsdtest/simpleType',invalid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK016.xsd','./msxsdtest/simpleType',invalid),
+  STResList40 = [STRes39|STResList39],
+
+
+  ?line {STRes40,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK017.xsd','./msxsdtest/simpleType',invalid),
+  STResList41 = [STRes40|STResList40],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK018.xsd','./msxsdtest/simpleType',invalid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stK019.xsd','./msxsdtest/simpleType',invalid),
+  STResList43 = [STRes42|STResList42],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList43,[]).
+
+%% Bug Regressions.
+
+stZ(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stZ001.xsd','./msxsdtest/simpleType',valid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stZ002.xsd','./msxsdtest/simpleType',invalid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stZ003.xsd','./msxsdtest/simpleType',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/simpleType/stZ004.xsd','./msxsdtest/simpleType',valid),
+  STResList4 = [STRes3|STResList3],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/simpleType/stZ004.xml','./msxsdtest/simpleType',valid,S3),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList4,ITResList1).
+
+%% Syntax Validation - any.
+
+wildABCDEF(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildA001.xsd','./msxsdtest/wildCards',valid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildA002.xsd','./msxsdtest/wildCards',valid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildA003.xsd','./msxsdtest/wildCards',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildA004.xsd','./msxsdtest/wildCards',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildA005.xsd','./msxsdtest/wildCards',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildA006.xsd','./msxsdtest/wildCards',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildA007.xsd','./msxsdtest/wildCards',invalid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildA008.xsd','./msxsdtest/wildCards',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB009.xsd','./msxsdtest/wildCards',valid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB010.xsd','./msxsdtest/wildCards',valid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB011.xsd','./msxsdtest/wildCards',valid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB012.xsd','./msxsdtest/wildCards',valid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB013.xsd','./msxsdtest/wildCards',valid),
+  STResList13 = [STRes12|STResList12],
+
+
+  ?line {STRes13,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB014.xsd','./msxsdtest/wildCards',invalid),
+  STResList14 = [STRes13|STResList13],
+
+
+  ?line {STRes14,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB015.xsd','./msxsdtest/wildCards',invalid),
+  STResList15 = [STRes14|STResList14],
+
+
+  ?line {STRes15,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB016.xsd','./msxsdtest/wildCards',invalid),
+  STResList16 = [STRes15|STResList15],
+
+
+  ?line {STRes16,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB017.xsd','./msxsdtest/wildCards',valid),
+  STResList17 = [STRes16|STResList16],
+
+
+  ?line {STRes17,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB018.xsd','./msxsdtest/wildCards',valid),
+  STResList18 = [STRes17|STResList17],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB019.xsd','./msxsdtest/wildCards',valid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB020.xsd','./msxsdtest/wildCards',invalid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB021.xsd','./msxsdtest/wildCards',valid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB022.xsd','./msxsdtest/wildCards',invalid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB023.xsd','./msxsdtest/wildCards',invalid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB024.xsd','./msxsdtest/wildCards',invalid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB025.xsd','./msxsdtest/wildCards',valid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB026.xsd','./msxsdtest/wildCards',valid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB027.xsd','./msxsdtest/wildCards',invalid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB028.xsd','./msxsdtest/wildCards',invalid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildB029.xsd','./msxsdtest/wildCards',valid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC030.xsd','./msxsdtest/wildCards',valid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC031.xsd','./msxsdtest/wildCards',valid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC032.xsd','./msxsdtest/wildCards',valid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC033.xsd','./msxsdtest/wildCards',valid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC034.xsd','./msxsdtest/wildCards',valid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC035.xsd','./msxsdtest/wildCards',invalid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC036.xsd','./msxsdtest/wildCards',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC037.xsd','./msxsdtest/wildCards',valid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC038.xsd','./msxsdtest/wildCards',valid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC039.xsd','./msxsdtest/wildCards',valid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC040.xsd','./msxsdtest/wildCards',valid),
+  STResList40 = [STRes39|STResList39],
+
+
+  ?line {STRes40,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC041.xsd','./msxsdtest/wildCards',valid),
+  STResList41 = [STRes40|STResList40],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC042.xsd','./msxsdtest/wildCards',valid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC043.xsd','./msxsdtest/wildCards',valid),
+  STResList43 = [STRes42|STResList42],
+
+
+  ?line {STRes43,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC044.xsd','./msxsdtest/wildCards',valid),
+  STResList44 = [STRes43|STResList43],
+
+
+  ?line {STRes44,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC045.xsd','./msxsdtest/wildCards',valid),
+  STResList45 = [STRes44|STResList44],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC046.xsd','./msxsdtest/wildCards',valid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC047.xsd','./msxsdtest/wildCards',valid),
+  STResList47 = [STRes46|STResList46],
+
+
+  ?line {STRes47,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC048.xsd','./msxsdtest/wildCards',valid),
+  STResList48 = [STRes47|STResList47],
+
+
+  ?line {STRes48,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC049.xsd','./msxsdtest/wildCards',invalid),
+  STResList49 = [STRes48|STResList48],
+
+
+  ?line {STRes49,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC050.xsd','./msxsdtest/wildCards',invalid),
+  STResList50 = [STRes49|STResList49],
+
+
+  ?line {STRes50,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC051.xsd','./msxsdtest/wildCards',invalid),
+  STResList51 = [STRes50|STResList50],
+
+
+  ?line {STRes51,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC052.xsd','./msxsdtest/wildCards',invalid),
+  STResList52 = [STRes51|STResList51],
+
+
+  ?line {STRes52,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC053.xsd','./msxsdtest/wildCards',invalid),
+  STResList53 = [STRes52|STResList52],
+
+
+  ?line {STRes53,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC054.xsd','./msxsdtest/wildCards',valid),
+  STResList54 = [STRes53|STResList53],
+
+
+  ?line {STRes54,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC055.xsd','./msxsdtest/wildCards',invalid),
+  STResList55 = [STRes54|STResList54],
+
+
+  ?line {STRes55,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC056.xsd','./msxsdtest/wildCards',invalid),
+  STResList56 = [STRes55|STResList55],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC057.xsd','./msxsdtest/wildCards',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC058.xsd','./msxsdtest/wildCards',invalid),
+  STResList58 = [STRes57|STResList57],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC059.xsd','./msxsdtest/wildCards',valid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC060.xsd','./msxsdtest/wildCards',valid),
+  STResList60 = [STRes59|STResList59],
+
+
+  ?line {STRes60,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC061.xsd','./msxsdtest/wildCards',valid),
+  STResList61 = [STRes60|STResList60],
+
+
+  ?line {STRes61,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC062.xsd','./msxsdtest/wildCards',valid),
+  STResList62 = [STRes61|STResList61],
+
+
+  ?line {STRes62,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC063.xsd','./msxsdtest/wildCards',valid),
+  STResList63 = [STRes62|STResList62],
+
+
+  ?line {STRes63,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC064.xsd','./msxsdtest/wildCards',valid),
+  STResList64 = [STRes63|STResList63],
+
+
+  ?line {STRes64,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC065.xsd','./msxsdtest/wildCards',valid),
+  STResList65 = [STRes64|STResList64],
+
+
+  ?line {STRes65,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC066.xsd','./msxsdtest/wildCards',invalid),
+  STResList66 = [STRes65|STResList65],
+
+
+  ?line {STRes66,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC067.xsd','./msxsdtest/wildCards',invalid),
+  STResList67 = [STRes66|STResList66],
+
+
+  ?line {STRes67,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC068.xsd','./msxsdtest/wildCards',valid),
+  STResList68 = [STRes67|STResList67],
+
+
+  ?line {STRes68,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC069.xsd','./msxsdtest/wildCards',valid),
+  STResList69 = [STRes68|STResList68],
+
+
+  ?line {STRes69,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildC070.xsd','./msxsdtest/wildCards',valid),
+  STResList70 = [STRes69|STResList69],
+
+
+  ?line {STRes70,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildD071.xsd','./msxsdtest/wildCards',invalid),
+  STResList71 = [STRes70|STResList70],
+
+
+  ?line {STRes71,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildD072.xsd','./msxsdtest/wildCards',valid),
+  STResList72 = [STRes71|STResList71],
+
+
+  ?line {STRes72,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildD073.xsd','./msxsdtest/wildCards',valid),
+  STResList73 = [STRes72|STResList72],
+
+
+  ?line {STRes73,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildD074.xsd','./msxsdtest/wildCards',valid),
+  STResList74 = [STRes73|STResList73],
+
+
+  ?line {STRes74,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildD075.xsd','./msxsdtest/wildCards',invalid),
+  STResList75 = [STRes74|STResList74],
+
+
+  ?line {STRes75,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildD076.xsd','./msxsdtest/wildCards',invalid),
+  STResList76 = [STRes75|STResList75],
+
+
+  ?line {STRes76,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildD077.xsd','./msxsdtest/wildCards',invalid),
+  STResList77 = [STRes76|STResList76],
+
+
+  ?line {STRes77,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildD078.xsd','./msxsdtest/wildCards',invalid),
+  STResList78 = [STRes77|STResList77],
+
+
+  ?line {STRes78,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildD079.xsd','./msxsdtest/wildCards',invalid),
+  STResList79 = [STRes78|STResList78],
+
+
+  ?line {STRes79,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildE001.xsd','./msxsdtest/wildCards',valid),
+  STResList80 = [STRes79|STResList79],
+
+
+  ?line {STRes80,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildE002.xsd','./msxsdtest/wildCards',invalid),
+  STResList81 = [STRes80|STResList80],
+
+
+  ?line {STRes81,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF001.xsd','./msxsdtest/wildCards',valid),
+  STResList82 = [STRes81|STResList81],
+
+
+  ?line {STRes82,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF002.xsd','./msxsdtest/wildCards',valid),
+  STResList83 = [STRes82|STResList82],
+
+
+  ?line {STRes83,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF003.xsd','./msxsdtest/wildCards',valid),
+  STResList84 = [STRes83|STResList83],
+
+
+  ?line {STRes84,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF004.xsd','./msxsdtest/wildCards',valid),
+  STResList85 = [STRes84|STResList84],
+
+
+  ?line {STRes85,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF005.xsd','./msxsdtest/wildCards',valid),
+  STResList86 = [STRes85|STResList85],
+
+
+  ?line {STRes86,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF006.xsd','./msxsdtest/wildCards',invalid),
+  STResList87 = [STRes86|STResList86],
+
+
+  ?line {STRes87,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF007.xsd','./msxsdtest/wildCards',invalid),
+  STResList88 = [STRes87|STResList87],
+
+
+  ?line {STRes88,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF008.xsd','./msxsdtest/wildCards',invalid),
+  STResList89 = [STRes88|STResList88],
+
+
+  ?line {STRes89,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF009.xsd','./msxsdtest/wildCards',invalid),
+  STResList90 = [STRes89|STResList89],
+
+
+  ?line {STRes90,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF010.xsd','./msxsdtest/wildCards',invalid),
+  STResList91 = [STRes90|STResList90],
+
+
+  ?line {STRes91,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF011.xsd','./msxsdtest/wildCards',valid),
+  STResList92 = [STRes91|STResList91],
+
+
+  ?line {STRes92,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF012.xsd','./msxsdtest/wildCards',invalid),
+  STResList93 = [STRes92|STResList92],
+
+
+  ?line {STRes93,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF013.xsd','./msxsdtest/wildCards',invalid),
+  STResList94 = [STRes93|STResList93],
+
+
+  ?line {STRes94,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF014.xsd','./msxsdtest/wildCards',invalid),
+  STResList95 = [STRes94|STResList94],
+
+
+  ?line {STRes95,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF015.xsd','./msxsdtest/wildCards',invalid),
+  STResList96 = [STRes95|STResList95],
+
+
+  ?line {STRes96,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF016.xsd','./msxsdtest/wildCards',invalid),
+  STResList97 = [STRes96|STResList96],
+
+
+  ?line {STRes97,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF017.xsd','./msxsdtest/wildCards',valid),
+  STResList98 = [STRes97|STResList97],
+
+
+  ?line {STRes98,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF018.xsd','./msxsdtest/wildCards',invalid),
+  STResList99 = [STRes98|STResList98],
+
+
+  ?line {STRes99,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF019.xsd','./msxsdtest/wildCards',valid),
+  STResList100 = [STRes99|STResList99],
+
+
+  ?line {STRes100,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildF020.xsd','./msxsdtest/wildCards',valid),
+  STResList101 = [STRes100|STResList100],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList101,[]).
+
+%% 3.10.4 Wildcard Validation Rules - any.
+
+wildGHI(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG001.xsd','./msxsdtest/wildCards',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG001.xml','./msxsdtest/wildCards',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG002.xsd','./msxsdtest/wildCards',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG002.xml','./msxsdtest/wildCards',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG003.xsd','./msxsdtest/wildCards',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG003.xml','./msxsdtest/wildCards',invalid,S2),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG004.xsd','./msxsdtest/wildCards',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG004.xml','./msxsdtest/wildCards',valid,S3),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG005.xsd','./msxsdtest/wildCards',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG005.xml','./msxsdtest/wildCards',invalid,S4),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG006.xsd','./msxsdtest/wildCards',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG006.xml','./msxsdtest/wildCards',valid,S5),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG007.xsd','./msxsdtest/wildCards',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG007.xml','./msxsdtest/wildCards',valid,S6),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG008.xsd','./msxsdtest/wildCards',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG008.xml','./msxsdtest/wildCards',invalid,S7),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG009.xsd','./msxsdtest/wildCards',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG009.xml','./msxsdtest/wildCards',invalid,S8),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG010.xsd','./msxsdtest/wildCards',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG010.xml','./msxsdtest/wildCards',valid,S9),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG011.xsd','./msxsdtest/wildCards',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG011.xml','./msxsdtest/wildCards',invalid,S10),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG012.xsd','./msxsdtest/wildCards',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG012.xml','./msxsdtest/wildCards',valid,S11),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG013.xsd','./msxsdtest/wildCards',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG013.xml','./msxsdtest/wildCards',valid,S12),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG014.xsd','./msxsdtest/wildCards',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG014.xml','./msxsdtest/wildCards',invalid,S13),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG015.xsd','./msxsdtest/wildCards',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG015.xml','./msxsdtest/wildCards',valid,S14),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG016.xsd','./msxsdtest/wildCards',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG016.xml','./msxsdtest/wildCards',valid,S15),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG017.xsd','./msxsdtest/wildCards',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG017.xml','./msxsdtest/wildCards',invalid,S16),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG018.xsd','./msxsdtest/wildCards',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG018.xml','./msxsdtest/wildCards',valid,S17),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG019.xsd','./msxsdtest/wildCards',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG019.xml','./msxsdtest/wildCards',invalid,S18),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG020.xsd','./msxsdtest/wildCards',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG020.xml','./msxsdtest/wildCards',invalid,S19),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG021.xsd','./msxsdtest/wildCards',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG021.xml','./msxsdtest/wildCards',valid,S20),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG022.xsd','./msxsdtest/wildCards',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG022.xml','./msxsdtest/wildCards',invalid,S21),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG023.xsd','./msxsdtest/wildCards',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG023.xml','./msxsdtest/wildCards',valid,S22),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG024.xsd','./msxsdtest/wildCards',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG024.xml','./msxsdtest/wildCards',invalid,S23),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG025.xsd','./msxsdtest/wildCards',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG025.xml','./msxsdtest/wildCards',invalid,S24),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG026.xsd','./msxsdtest/wildCards',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG026.xml','./msxsdtest/wildCards',valid,S25),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG027.xsd','./msxsdtest/wildCards',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG027.xml','./msxsdtest/wildCards',valid,S26),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG028.xsd','./msxsdtest/wildCards',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG028.xml','./msxsdtest/wildCards',invalid,S27),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG029.xsd','./msxsdtest/wildCards',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG029.xml','./msxsdtest/wildCards',invalid,S28),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG030.xsd','./msxsdtest/wildCards',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG030.xml','./msxsdtest/wildCards',invalid,S29),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG031.xsd','./msxsdtest/wildCards',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG031.xml','./msxsdtest/wildCards',valid,S30),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG032.xsd','./msxsdtest/wildCards',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG032.xml','./msxsdtest/wildCards',invalid,S31),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG033.xsd','./msxsdtest/wildCards',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG033.xml','./msxsdtest/wildCards',valid,S32),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG034.xsd','./msxsdtest/wildCards',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG034.xml','./msxsdtest/wildCards',invalid,S33),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG035.xsd','./msxsdtest/wildCards',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG035.xml','./msxsdtest/wildCards',valid,S34),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG036.xsd','./msxsdtest/wildCards',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG036.xml','./msxsdtest/wildCards',invalid,S35),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG037.xsd','./msxsdtest/wildCards',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG037.xml','./msxsdtest/wildCards',valid,S36),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes37,S37} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG038.xsd','./msxsdtest/wildCards',valid),
+  STResList38 = [STRes37|STResList37],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG038.xml','./msxsdtest/wildCards',valid,S37),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes38,S38} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG039.xsd','./msxsdtest/wildCards',valid),
+  STResList39 = [STRes38|STResList38],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG039.xml','./msxsdtest/wildCards',invalid,S38),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes39,S39} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildG040.xsd','./msxsdtest/wildCards',valid),
+  STResList40 = [STRes39|STResList39],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildG040.xml','./msxsdtest/wildCards',valid,S39),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildH001.xsd','./msxsdtest/wildCards',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildH001.xml','./msxsdtest/wildCards',invalid,S40),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes41,S41} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildH002.xsd','./msxsdtest/wildCards',valid),
+  STResList42 = [STRes41|STResList41],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildH002.xml','./msxsdtest/wildCards',invalid,S41),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes42,S42} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildH003.xsd','./msxsdtest/wildCards',valid),
+  STResList43 = [STRes42|STResList42],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildH003.xml','./msxsdtest/wildCards',valid,S42),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes43,S43} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildH004.xsd','./msxsdtest/wildCards',valid),
+  STResList44 = [STRes43|STResList43],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildH004.xml','./msxsdtest/wildCards',valid,S43),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes44,S44} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildH006.xsd','./msxsdtest/wildCards',valid),
+  STResList45 = [STRes44|STResList44],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildH006.xml','./msxsdtest/wildCards',invalid,S44),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes45,S45} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildH007.xsd','./msxsdtest/wildCards',valid),
+  STResList46 = [STRes45|STResList45],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildH007.xml','./msxsdtest/wildCards',valid,S45),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes46,S46} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildH008.xsd','./msxsdtest/wildCards',valid),
+  STResList47 = [STRes46|STResList46],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildH008.xml','./msxsdtest/wildCards',invalid,S46),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes47,S47} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildH009.xsd','./msxsdtest/wildCards',valid),
+  STResList48 = [STRes47|STResList47],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildH009.xml','./msxsdtest/wildCards',valid,S47),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes48,S48} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildH010.xsd','./msxsdtest/wildCards',valid),
+  STResList49 = [STRes48|STResList48],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildH010.xml','./msxsdtest/wildCards',valid,S48),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes49,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI001.xsd','./msxsdtest/wildCards',valid),
+  STResList50 = [STRes49|STResList49],
+
+
+  ?line {STRes50,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI002.xsd','./msxsdtest/wildCards',invalid),
+  STResList51 = [STRes50|STResList50],
+
+
+  ?line {STRes51,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI003.xsd','./msxsdtest/wildCards',invalid),
+  STResList52 = [STRes51|STResList51],
+
+
+  ?line {STRes52,S52} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI004.xsd','./msxsdtest/wildCards',valid),
+  STResList53 = [STRes52|STResList52],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildI004.xml','./msxsdtest/wildCards',valid,S52),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes53,S53} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI005.xsd','./msxsdtest/wildCards',valid),
+  STResList54 = [STRes53|STResList53],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildI005.xml','./msxsdtest/wildCards',valid,S53),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes54,S54} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI006.xsd','./msxsdtest/wildCards',valid),
+  STResList55 = [STRes54|STResList54],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildI006.xml','./msxsdtest/wildCards',valid,S54),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes55,S55} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI007.xsd','./msxsdtest/wildCards',valid),
+  STResList56 = [STRes55|STResList55],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildI007.xml','./msxsdtest/wildCards',valid,S55),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI008.xsd','./msxsdtest/wildCards',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI009.xsd','./msxsdtest/wildCards',invalid),
+  STResList58 = [STRes57|STResList57],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI010.xsd','./msxsdtest/wildCards',invalid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,S59} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI011.xsd','./msxsdtest/wildCards',valid),
+  STResList60 = [STRes59|STResList59],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildI011.xml','./msxsdtest/wildCards',valid,S59),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes60,S60} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI012.xsd','./msxsdtest/wildCards',valid),
+  STResList61 = [STRes60|STResList60],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildI012.xml','./msxsdtest/wildCards',valid,S60),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes61,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildI013.xsd','./msxsdtest/wildCards',invalid),
+  STResList62 = [STRes61|STResList61],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList62,ITResList55).
+
+%% Syntax Validation - anyAttribute.
+
+wildJKLMNQOP(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildJ001.xsd','./msxsdtest/wildCards',valid),
+  STResList1 = [STRes0|STResList0],
+
+
+  ?line {STRes1,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildJ002.xsd','./msxsdtest/wildCards',valid),
+  STResList2 = [STRes1|STResList1],
+
+
+  ?line {STRes2,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildJ003.xsd','./msxsdtest/wildCards',invalid),
+  STResList3 = [STRes2|STResList2],
+
+
+  ?line {STRes3,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildJ004.xsd','./msxsdtest/wildCards',invalid),
+  STResList4 = [STRes3|STResList3],
+
+
+  ?line {STRes4,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildJ005.xsd','./msxsdtest/wildCards',invalid),
+  STResList5 = [STRes4|STResList4],
+
+
+  ?line {STRes5,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildJ006.xsd','./msxsdtest/wildCards',invalid),
+  STResList6 = [STRes5|STResList5],
+
+
+  ?line {STRes6,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildJ007.xsd','./msxsdtest/wildCards',invalid),
+  STResList7 = [STRes6|STResList6],
+
+
+  ?line {STRes7,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildJ008.xsd','./msxsdtest/wildCards',invalid),
+  STResList8 = [STRes7|STResList7],
+
+
+  ?line {STRes8,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK001.xsd','./msxsdtest/wildCards',valid),
+  STResList9 = [STRes8|STResList8],
+
+
+  ?line {STRes9,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK002.xsd','./msxsdtest/wildCards',invalid),
+  STResList10 = [STRes9|STResList9],
+
+
+  ?line {STRes10,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK003.xsd','./msxsdtest/wildCards',valid),
+  STResList11 = [STRes10|STResList10],
+
+
+  ?line {STRes11,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK004.xsd','./msxsdtest/wildCards',valid),
+  STResList12 = [STRes11|STResList11],
+
+
+  ?line {STRes12,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK005.xsd','./msxsdtest/wildCards',valid),
+  STResList13 = [STRes12|STResList12],
+
+
+  ?line {STRes13,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK006.xsd','./msxsdtest/wildCards',invalid),
+  STResList14 = [STRes13|STResList13],
+
+
+  ?line {STRes14,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK007.xsd','./msxsdtest/wildCards',invalid),
+  STResList15 = [STRes14|STResList14],
+
+
+  ?line {STRes15,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK008.xsd','./msxsdtest/wildCards',valid),
+  STResList16 = [STRes15|STResList15],
+
+
+  ?line {STRes16,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK009.xsd','./msxsdtest/wildCards',valid),
+  STResList17 = [STRes16|STResList16],
+
+
+  ?line {STRes17,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK010.xsd','./msxsdtest/wildCards',valid),
+  STResList18 = [STRes17|STResList17],
+
+
+  ?line {STRes18,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK011.xsd','./msxsdtest/wildCards',valid),
+  STResList19 = [STRes18|STResList18],
+
+
+  ?line {STRes19,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK012.xsd','./msxsdtest/wildCards',valid),
+  STResList20 = [STRes19|STResList19],
+
+
+  ?line {STRes20,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK013.xsd','./msxsdtest/wildCards',valid),
+  STResList21 = [STRes20|STResList20],
+
+
+  ?line {STRes21,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK014.xsd','./msxsdtest/wildCards',valid),
+  STResList22 = [STRes21|STResList21],
+
+
+  ?line {STRes22,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK015.xsd','./msxsdtest/wildCards',valid),
+  STResList23 = [STRes22|STResList22],
+
+
+  ?line {STRes23,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK016.xsd','./msxsdtest/wildCards',valid),
+  STResList24 = [STRes23|STResList23],
+
+
+  ?line {STRes24,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK017.xsd','./msxsdtest/wildCards',valid),
+  STResList25 = [STRes24|STResList24],
+
+
+  ?line {STRes25,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK018.xsd','./msxsdtest/wildCards',valid),
+  STResList26 = [STRes25|STResList25],
+
+
+  ?line {STRes26,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK019.xsd','./msxsdtest/wildCards',valid),
+  STResList27 = [STRes26|STResList26],
+
+
+  ?line {STRes27,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK020.xsd','./msxsdtest/wildCards',invalid),
+  STResList28 = [STRes27|STResList27],
+
+
+  ?line {STRes28,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK021.xsd','./msxsdtest/wildCards',invalid),
+  STResList29 = [STRes28|STResList28],
+
+
+  ?line {STRes29,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK022.xsd','./msxsdtest/wildCards',invalid),
+  STResList30 = [STRes29|STResList29],
+
+
+  ?line {STRes30,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK023.xsd','./msxsdtest/wildCards',invalid),
+  STResList31 = [STRes30|STResList30],
+
+
+  ?line {STRes31,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK024.xsd','./msxsdtest/wildCards',invalid),
+  STResList32 = [STRes31|STResList31],
+
+
+  ?line {STRes32,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK025.xsd','./msxsdtest/wildCards',valid),
+  STResList33 = [STRes32|STResList32],
+
+
+  ?line {STRes33,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK026.xsd','./msxsdtest/wildCards',invalid),
+  STResList34 = [STRes33|STResList33],
+
+
+  ?line {STRes34,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK027.xsd','./msxsdtest/wildCards',invalid),
+  STResList35 = [STRes34|STResList34],
+
+
+  ?line {STRes35,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK028.xsd','./msxsdtest/wildCards',invalid),
+  STResList36 = [STRes35|STResList35],
+
+
+  ?line {STRes36,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK029.xsd','./msxsdtest/wildCards',invalid),
+  STResList37 = [STRes36|STResList36],
+
+
+  ?line {STRes37,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK030.xsd','./msxsdtest/wildCards',valid),
+  STResList38 = [STRes37|STResList37],
+
+
+  ?line {STRes38,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK031.xsd','./msxsdtest/wildCards',valid),
+  STResList39 = [STRes38|STResList38],
+
+
+  ?line {STRes39,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK032.xsd','./msxsdtest/wildCards',valid),
+  STResList40 = [STRes39|STResList39],
+
+
+  ?line {STRes40,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK033.xsd','./msxsdtest/wildCards',valid),
+  STResList41 = [STRes40|STResList40],
+
+
+  ?line {STRes41,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK034.xsd','./msxsdtest/wildCards',valid),
+  STResList42 = [STRes41|STResList41],
+
+
+  ?line {STRes42,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK035.xsd','./msxsdtest/wildCards',valid),
+  STResList43 = [STRes42|STResList42],
+
+
+  ?line {STRes43,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK036.xsd','./msxsdtest/wildCards',valid),
+  STResList44 = [STRes43|STResList43],
+
+
+  ?line {STRes44,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK037.xsd','./msxsdtest/wildCards',valid),
+  STResList45 = [STRes44|STResList44],
+
+
+  ?line {STRes45,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK038.xsd','./msxsdtest/wildCards',invalid),
+  STResList46 = [STRes45|STResList45],
+
+
+  ?line {STRes46,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK039.xsd','./msxsdtest/wildCards',valid),
+  STResList47 = [STRes46|STResList46],
+
+
+  ?line {STRes47,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK040.xsd','./msxsdtest/wildCards',valid),
+  STResList48 = [STRes47|STResList47],
+
+
+  ?line {STRes48,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildK041.xsd','./msxsdtest/wildCards',valid),
+  STResList49 = [STRes48|STResList48],
+
+
+  ?line {STRes49,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildL001.xsd','./msxsdtest/wildCards',invalid),
+  STResList50 = [STRes49|STResList49],
+
+
+  ?line {STRes50,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildL002.xsd','./msxsdtest/wildCards',valid),
+  STResList51 = [STRes50|STResList50],
+
+
+  ?line {STRes51,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildL003.xsd','./msxsdtest/wildCards',valid),
+  STResList52 = [STRes51|STResList51],
+
+
+  ?line {STRes52,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildL004.xsd','./msxsdtest/wildCards',valid),
+  STResList53 = [STRes52|STResList52],
+
+
+  ?line {STRes53,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildL005.xsd','./msxsdtest/wildCards',invalid),
+  STResList54 = [STRes53|STResList53],
+
+
+  ?line {STRes54,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildL006.xsd','./msxsdtest/wildCards',invalid),
+  STResList55 = [STRes54|STResList54],
+
+
+  ?line {STRes55,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildL007.xsd','./msxsdtest/wildCards',invalid),
+  STResList56 = [STRes55|STResList55],
+
+
+  ?line {STRes56,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildL008.xsd','./msxsdtest/wildCards',invalid),
+  STResList57 = [STRes56|STResList56],
+
+
+  ?line {STRes57,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildL009.xsd','./msxsdtest/wildCards',invalid),
+  STResList58 = [STRes57|STResList57],
+
+
+  ?line {STRes58,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildM001.xsd','./msxsdtest/wildCards',valid),
+  STResList59 = [STRes58|STResList58],
+
+
+  ?line {STRes59,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildM002.xsd','./msxsdtest/wildCards',invalid),
+  STResList60 = [STRes59|STResList59],
+
+
+  ?line {STRes60,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN001.xsd','./msxsdtest/wildCards',invalid),
+  STResList61 = [STRes60|STResList60],
+
+
+  ?line {STRes61,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN002.xsd','./msxsdtest/wildCards',valid),
+  STResList62 = [STRes61|STResList61],
+
+
+  ?line {STRes62,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN003.xsd','./msxsdtest/wildCards',valid),
+  STResList63 = [STRes62|STResList62],
+
+
+  ?line {STRes63,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN004.xsd','./msxsdtest/wildCards',valid),
+  STResList64 = [STRes63|STResList63],
+
+
+  ?line {STRes64,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN005.xsd','./msxsdtest/wildCards',valid),
+  STResList65 = [STRes64|STResList64],
+
+
+  ?line {STRes65,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN006.xsd','./msxsdtest/wildCards',invalid),
+  STResList66 = [STRes65|STResList65],
+
+
+  ?line {STRes66,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN007.xsd','./msxsdtest/wildCards',invalid),
+  STResList67 = [STRes66|STResList66],
+
+
+  ?line {STRes67,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN008.xsd','./msxsdtest/wildCards',invalid),
+  STResList68 = [STRes67|STResList67],
+
+
+  ?line {STRes68,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN009.xsd','./msxsdtest/wildCards',invalid),
+  STResList69 = [STRes68|STResList68],
+
+
+  ?line {STRes69,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN010.xsd','./msxsdtest/wildCards',invalid),
+  STResList70 = [STRes69|STResList69],
+
+
+  ?line {STRes70,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN011.xsd','./msxsdtest/wildCards',valid),
+  STResList71 = [STRes70|STResList70],
+
+
+  ?line {STRes71,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN012.xsd','./msxsdtest/wildCards',invalid),
+  STResList72 = [STRes71|STResList71],
+
+
+  ?line {STRes72,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN013.xsd','./msxsdtest/wildCards',invalid),
+  STResList73 = [STRes72|STResList72],
+
+
+  ?line {STRes73,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN014.xsd','./msxsdtest/wildCards',invalid),
+  STResList74 = [STRes73|STResList73],
+
+
+  ?line {STRes74,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN015.xsd','./msxsdtest/wildCards',invalid),
+  STResList75 = [STRes74|STResList74],
+
+
+  ?line {STRes75,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN016.xsd','./msxsdtest/wildCards',invalid),
+  STResList76 = [STRes75|STResList75],
+
+
+  ?line {STRes76,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN017.xsd','./msxsdtest/wildCards',valid),
+  STResList77 = [STRes76|STResList76],
+
+
+  ?line {STRes77,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN018.xsd','./msxsdtest/wildCards',invalid),
+  STResList78 = [STRes77|STResList77],
+
+
+  ?line {STRes78,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN019.xsd','./msxsdtest/wildCards',valid),
+  STResList79 = [STRes78|STResList78],
+
+
+  ?line {STRes79,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildN020.xsd','./msxsdtest/wildCards',valid),
+  STResList80 = [STRes79|STResList79],
+
+
+  ?line {STRes80,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildQ001.xsd','./msxsdtest/wildCards',invalid),
+  STResList81 = [STRes80|STResList80],
+
+
+  ?line {STRes81,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildQ002.xsd','./msxsdtest/wildCards',invalid),
+  STResList82 = [STRes81|STResList81],
+
+
+  ?line {STRes82,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildQ003.xsd','./msxsdtest/wildCards',invalid),
+  STResList83 = [STRes82|STResList82],
+
+
+  ?line {STRes83,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildQ004.xsd','./msxsdtest/wildCards',invalid),
+  STResList84 = [STRes83|STResList83],
+
+
+  ?line {STRes84,S84} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO001.xsd','./msxsdtest/wildCards',valid),
+  STResList85 = [STRes84|STResList84],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO001.xml','./msxsdtest/wildCards',valid,S84),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes85,S85} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO002.xsd','./msxsdtest/wildCards',valid),
+  STResList86 = [STRes85|STResList85],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO002.xml','./msxsdtest/wildCards',valid,S85),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes86,S86} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO003.xsd','./msxsdtest/wildCards',valid),
+  STResList87 = [STRes86|STResList86],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO003.xml','./msxsdtest/wildCards',invalid,S86),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes87,S87} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO004.xsd','./msxsdtest/wildCards',valid),
+  STResList88 = [STRes87|STResList87],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO004.xml','./msxsdtest/wildCards',valid,S87),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes88,S88} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO005.xsd','./msxsdtest/wildCards',valid),
+  STResList89 = [STRes88|STResList88],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO005.xml','./msxsdtest/wildCards',valid,S88),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes89,S89} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO006.xsd','./msxsdtest/wildCards',valid),
+  STResList90 = [STRes89|STResList89],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO006.xml','./msxsdtest/wildCards',invalid,S89),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes90,S90} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO007.xsd','./msxsdtest/wildCards',valid),
+  STResList91 = [STRes90|STResList90],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO007.xml','./msxsdtest/wildCards',valid,S90),
+  ITResList7 = [ITRes6|ITResList6],
+
+
+  ?line {STRes91,S91} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO008.xsd','./msxsdtest/wildCards',valid),
+  STResList92 = [STRes91|STResList91],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO008.xml','./msxsdtest/wildCards',invalid,S91),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  ?line {STRes92,S92} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO009.xsd','./msxsdtest/wildCards',valid),
+  STResList93 = [STRes92|STResList92],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO009.xml','./msxsdtest/wildCards',invalid,S92),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes93,S93} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO010.xsd','./msxsdtest/wildCards',valid),
+  STResList94 = [STRes93|STResList93],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO010.xml','./msxsdtest/wildCards',valid,S93),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes94,S94} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO011.xsd','./msxsdtest/wildCards',valid),
+  STResList95 = [STRes94|STResList94],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO011.xml','./msxsdtest/wildCards',invalid,S94),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes95,S95} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO012.xsd','./msxsdtest/wildCards',valid),
+  STResList96 = [STRes95|STResList95],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO012.xml','./msxsdtest/wildCards',valid,S95),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  ?line {STRes96,S96} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO013.xsd','./msxsdtest/wildCards',valid),
+  STResList97 = [STRes96|STResList96],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO013.xml','./msxsdtest/wildCards',valid,S96),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes97,S97} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO014.xsd','./msxsdtest/wildCards',valid),
+  STResList98 = [STRes97|STResList97],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO014.xml','./msxsdtest/wildCards',invalid,S97),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  ?line {STRes98,S98} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO015.xsd','./msxsdtest/wildCards',valid),
+  STResList99 = [STRes98|STResList98],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO015.xml','./msxsdtest/wildCards',valid,S98),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes99,S99} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO016.xsd','./msxsdtest/wildCards',valid),
+  STResList100 = [STRes99|STResList99],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO016.xml','./msxsdtest/wildCards',valid,S99),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes100,S100} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO017.xsd','./msxsdtest/wildCards',valid),
+  STResList101 = [STRes100|STResList100],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO017.xml','./msxsdtest/wildCards',invalid,S100),
+  ITResList17 = [ITRes16|ITResList16],
+
+
+  ?line {STRes101,S101} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO018.xsd','./msxsdtest/wildCards',valid),
+  STResList102 = [STRes101|STResList101],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO018.xml','./msxsdtest/wildCards',valid,S101),
+  ITResList18 = [ITRes17|ITResList17],
+
+
+  ?line {STRes102,S102} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO019.xsd','./msxsdtest/wildCards',valid),
+  STResList103 = [STRes102|STResList102],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO019.xml','./msxsdtest/wildCards',valid,S102),
+  ITResList19 = [ITRes18|ITResList18],
+
+
+  ?line {STRes103,S103} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO020.xsd','./msxsdtest/wildCards',valid),
+  STResList104 = [STRes103|STResList103],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO020.xml','./msxsdtest/wildCards',invalid,S103),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes104,S104} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO021.xsd','./msxsdtest/wildCards',valid),
+  STResList105 = [STRes104|STResList104],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO021.xml','./msxsdtest/wildCards',valid,S104),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes105,S105} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO022.xsd','./msxsdtest/wildCards',valid),
+  STResList106 = [STRes105|STResList105],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO022.xml','./msxsdtest/wildCards',invalid,S105),
+  ITResList22 = [ITRes21|ITResList21],
+
+
+  ?line {STRes106,S106} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO023.xsd','./msxsdtest/wildCards',valid),
+  STResList107 = [STRes106|STResList106],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO023.xml','./msxsdtest/wildCards',valid,S106),
+  ITResList23 = [ITRes22|ITResList22],
+
+
+  ?line {STRes107,S107} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO024.xsd','./msxsdtest/wildCards',valid),
+  STResList108 = [STRes107|STResList107],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO024.xml','./msxsdtest/wildCards',invalid,S107),
+  ITResList24 = [ITRes23|ITResList23],
+
+
+  ?line {STRes108,S108} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO025.xsd','./msxsdtest/wildCards',valid),
+  STResList109 = [STRes108|STResList108],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO025.xml','./msxsdtest/wildCards',invalid,S108),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes109,S109} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO026.xsd','./msxsdtest/wildCards',valid),
+  STResList110 = [STRes109|STResList109],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO026.xml','./msxsdtest/wildCards',valid,S109),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes110,S110} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO027.xsd','./msxsdtest/wildCards',valid),
+  STResList111 = [STRes110|STResList110],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO027.xml','./msxsdtest/wildCards',valid,S110),
+  ITResList27 = [ITRes26|ITResList26],
+
+
+  ?line {STRes111,S111} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO028.xsd','./msxsdtest/wildCards',valid),
+  STResList112 = [STRes111|STResList111],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO028.xml','./msxsdtest/wildCards',invalid,S111),
+  ITResList28 = [ITRes27|ITResList27],
+
+
+  ?line {STRes112,S112} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO029.xsd','./msxsdtest/wildCards',valid),
+  STResList113 = [STRes112|STResList112],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO029.xml','./msxsdtest/wildCards',valid,S112),
+  ITResList29 = [ITRes28|ITResList28],
+
+
+  ?line {STRes113,S113} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO030.xsd','./msxsdtest/wildCards',valid),
+  STResList114 = [STRes113|STResList113],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO030.xml','./msxsdtest/wildCards',invalid,S113),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes114,S114} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO031.xsd','./msxsdtest/wildCards',valid),
+  STResList115 = [STRes114|STResList114],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO031.xml','./msxsdtest/wildCards',valid,S114),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes115,S115} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO032.xsd','./msxsdtest/wildCards',valid),
+  STResList116 = [STRes115|STResList115],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO032.xml','./msxsdtest/wildCards',invalid,S115),
+  ITResList32 = [ITRes31|ITResList31],
+
+
+  ?line {STRes116,S116} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO033.xsd','./msxsdtest/wildCards',valid),
+  STResList117 = [STRes116|STResList116],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO033.xml','./msxsdtest/wildCards',valid,S116),
+  ITResList33 = [ITRes32|ITResList32],
+
+
+  ?line {STRes117,S117} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO034.xsd','./msxsdtest/wildCards',valid),
+  STResList118 = [STRes117|STResList117],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO034.xml','./msxsdtest/wildCards',invalid,S117),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  ?line {STRes118,S118} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO035.xsd','./msxsdtest/wildCards',valid),
+  STResList119 = [STRes118|STResList118],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO035.xml','./msxsdtest/wildCards',invalid,S118),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes119,S119} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO037.xsd','./msxsdtest/wildCards',valid),
+  STResList120 = [STRes119|STResList119],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO037.xml','./msxsdtest/wildCards',valid,S119),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes120,S120} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO038.xsd','./msxsdtest/wildCards',valid),
+  STResList121 = [STRes120|STResList120],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO038.xml','./msxsdtest/wildCards',valid,S120),
+  ITResList37 = [ITRes36|ITResList36],
+
+
+  ?line {STRes121,S121} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO039.xsd','./msxsdtest/wildCards',valid),
+  STResList122 = [STRes121|STResList121],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO039.xml','./msxsdtest/wildCards',invalid,S121),
+  ITResList38 = [ITRes37|ITResList37],
+
+
+  ?line {STRes122,S122} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildO040.xsd','./msxsdtest/wildCards',valid),
+  STResList123 = [STRes122|STResList122],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildO040.xml','./msxsdtest/wildCards',valid,S122),
+  ITResList39 = [ITRes38|ITResList38],
+
+
+  ?line {STRes123,S123} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildP001.xsd','./msxsdtest/wildCards',valid),
+  STResList124 = [STRes123|STResList123],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildP001.xml','./msxsdtest/wildCards',valid,S123),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes124,S124} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildP002.xsd','./msxsdtest/wildCards',valid),
+  STResList125 = [STRes124|STResList124],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildP002.xml','./msxsdtest/wildCards',invalid,S124),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes125,S125} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildP003.xsd','./msxsdtest/wildCards',valid),
+  STResList126 = [STRes125|STResList125],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildP003.xml','./msxsdtest/wildCards',valid,S125),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes126,S126} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildP004.xsd','./msxsdtest/wildCards',valid),
+  STResList127 = [STRes126|STResList126],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildP004.xml','./msxsdtest/wildCards',valid,S126),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes127,S127} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildP005.xsd','./msxsdtest/wildCards',valid),
+  STResList128 = [STRes127|STResList127],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildP005.xml','./msxsdtest/wildCards',valid,S127),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes128,S128} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildP006.xsd','./msxsdtest/wildCards',valid),
+  STResList129 = [STRes128|STResList128],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildP006.xml','./msxsdtest/wildCards',valid,S128),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList129,ITResList45).
+
+%% Bugs - Wildcards.
+
+wildZ(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/wildCards/wildZ001.xsd','./msxsdtest/wildCards',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./msxsdtest/wildCards/wildZ001.xml','./msxsdtest/wildCards',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList1).
+
diff --git a/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/msx_failed_cases.log b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/msx_failed_cases.log
new file mode 100644
index 0000000000..a89a9a798c
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/msx_failed_cases.log
@@ -0,0 +1,2234 @@
+{att,{["attgD041.xsd",
+       "attgD039.xsd",
+       "attgD038.xsd",
+       "attgD037.xsd",
+       "attgD017.xsd",
+       "attgD015.xsd",
+       "attgD012.xsd",
+       "attgD009.xsd",
+       "attgD008.xsd",
+       "attgD007.xsd",
+       "attgD006.xsd",
+       "attgD002.xsd",
+       "attgC044.xsd",
+       "attgC033.xsd",
+       "attgC028.xsd",
+       "attgC027.xsd",
+       "attgC026.xsd",
+       "attgC025.xsd",
+       "attgC024.xsd",
+       "attgC023.xsd",
+       "attgC020.xsd",
+       "attgC010.xsd",
+       "attgC001.xsd",
+       "attgB006.xsd",
+       "attgB003.xsd",
+       "attgB002.xsd",
+       "attgA009.xsd",
+       "attgA008.xsd",
+       "attgA007.xsd",
+       "attgA006.xsd",
+       "attgA005.xsd",
+       "attgA004.xsd",
+       "attgA003.xsd",
+       "attgA002.xsd",
+       "attZ003.xsd",
+       "attQ013.xsd",
+       "attQ012.xsd",
+       "attQ011.xsd",
+       "attQ009.xsd",
+       "attQ008.xsd",
+       "attQ007.xsd",
+       "attQ006.xsd",
+       "attQ004.xsd",
+       "attQ002.xsd",
+       "attQ001.xsd",
+       "attP030.xsd",
+       "attP006.xsd",
+       "attP002.xsd",
+       "attP001.xsd",
+       "attO024.xsd",
+       "attO023.xsd",
+       "attO022.xsd",
+       "attO021.xsd",
+       "attO020.xsd",
+       "attO019.xsd",
+       "attO017.xsd",
+       "attO016.xsd",
+       "attO015.xsd",
+       "attO014.xsd",
+       "attO013.xsd",
+       "attO005.xsd",
+       "attO003.xsd",
+       "attO002.xsd",
+       "attKc018.xsd",
+       "attKc017.xsd",
+       "attKc016.xsd",
+       "attKc015.xsd",
+       "attKc014.xsd",
+       "attKc013.xsd",
+       "attKc012.xsd",
+       "attKc011.xsd",
+       "attKc010.xsd",
+       "attKc005.xsd",
+       "attKc004.xsd",
+       "attKc001.xsd",
+       "attKb018.xsd",
+       "attKb017.xsd",
+       "attKb016.xsd",
+       "attKb015.xsd",
+       "attKb014.xsd",
+       "attKb013.xsd",
+       "attKb012.xsd",
+       "attKb011.xsd",
+       "attKb010.xsd",
+       "attKb005.xsd",
+       "attKb004.xsd",
+       "attKb001.xsd",
+       "attKa015.xsd",
+       "attKa011.xsd",
+       "attKa009.xsd",
+       "attKa008.xsd",
+       "attKa007.xsd",
+       "attKa005.xsd",
+       "attKa004.xsd",
+       "attKa003.xsd",
+       "attI005.xsd",
+       "attI004.xsd",
+       "attH001.xsd",
+       "attE006.xsd",
+       "attC010.xsd",
+       "attC009.xsd",
+       "attC008.xsd",
+       "attC007.xsd",
+       "attC006.xsd",
+       "attC005.xsd",
+       "attA002.xsd",
+       "attA001.xsd",
+       "attgD036.xml",
+       "attgD034.xml",
+       "attgD033.xml",
+       "attgD031.xml",
+       "attgD029.xml",
+       "attgD027.xml",
+       "attgD026.xml",
+       "attgD024.xml",
+       "attgD022.xml",
+       "attgC038.xml",
+       "attgC037.xml",
+       "attgC036.xml",
+       "attgC035.xml",
+       "attgC026.xml",
+       "attgC024.xml",
+       "attgC007.xml",
+       "attZ002.xml",
+       "attZ001.xml",
+       "attP031.xml",
+       "attP020.xml",
+       "attP018.xml",
+       "attP016.xml",
+       "attP014.xml",
+       "attP012.xml",
+       "attP010.xml",
+       "attP009.xml",
+       "attP005.xml",
+       "attO012.xml",
+       "attO008.xml",
+       "attO006.xml",
+       "attMc012.xml",
+       "attMc011.xml",
+       "attMc010.xml",
+       "attMc003.xml",
+       "attMc002.xml",
+       "attMc001.xml",
+       "attMb012.xml",
+       "attMb011.xml",
+       "attMb010.xml",
+       "attMb003.xml",
+       "attMb002.xml",
+       "attMb001.xml",
+       "attMa002.xml",
+       "attMa001.xml",
+       "attLc005.xml",
+       "attLb005.xml",
+       "attLa005.xml",
+       "attJ008.xml",
+       "attJ003.xml",
+       "attJ002.xml",
+       "attF001.xml",
+       "attD007.xml",
+       "attD004.xml"],[]}}.
+{ct,{["ctO004.xsd",
+      "ctO002.xsd",
+      "ctN002.xsd",
+      "ctM004.xsd",
+      "ctM003.xsd",
+      "ctM001.xsd",
+      "ctJ003.xsd",
+      "ctJ002.xsd",
+      "ctI024.xsd",
+      "ctI020.xsd",
+      "ctI017.xsd",
+      "ctI016.xsd",
+      "ctI013.xsd",
+      "ctI012.xsd",
+      "ctI011.xsd",
+      "ctI008.xsd",
+      "ctI007.xsd",
+      "ctI006.xsd",
+      "ctH081.xsd",
+      "ctH078.xsd",
+      "ctH077.xsd",
+      "ctH076.xsd",
+      "ctH075.xsd",
+      "ctH074.xsd",
+      "ctH073.xsd",
+      "ctH072.xsd",
+      "ctH069.xsd",
+      "ctH068.xsd",
+      "ctH067.xsd",
+      "ctH066.xsd",
+      "ctH060.xsd",
+      "ctH059.xsd",
+      "ctH057.xsd",
+      "ctH056.xsd",
+      "ctH054.xsd",
+      "ctH053.xsd",
+      "ctH052.xsd",
+      "ctH051.xsd",
+      "ctH050.xsd",
+      "ctH048.xsd",
+      "ctH046.xsd",
+      "ctH045.xsd",
+      "ctH042.xsd",
+      "ctH041.xsd",
+      "ctH040.xsd",
+      "ctH039.xsd",
+      "ctH038.xsd",
+      "ctH036.xsd",
+      "ctH034.xsd",
+      "ctH033.xsd",
+      "ctH030.xsd",
+      "ctH029.xsd",
+      "ctH028.xsd",
+      "ctH027.xsd",
+      "ctH026.xsd",
+      "ctH024.xsd",
+      "ctH022.xsd",
+      "ctH021.xsd",
+      "ctH018.xsd",
+      "ctH017.xsd",
+      "ctH016.xsd",
+      "ctH015.xsd",
+      "ctH014.xsd",
+      "ctH012.xsd",
+      "ctH010.xsd",
+      "ctH009.xsd",
+      "ctH006.xsd",
+      "ctH005.xsd",
+      "ctH004.xsd",
+      "ctH003.xsd",
+      "ctH002.xsd",
+      "ctG076.xsd",
+      "ctG075.xsd",
+      "ctG071.xsd",
+      "ctG069.xsd",
+      "ctG068.xsd",
+      "ctG067.xsd",
+      "ctG066.xsd",
+      "ctG060.xsd",
+      "ctG058.xsd",
+      "ctG057.xsd",
+      "ctG056.xsd",
+      "ctG055.xsd",
+      "ctG054.xsd",
+      "ctG053.xsd",
+      "ctG049.xsd",
+      "ctG046.xsd",
+      "ctG045.xsd",
+      "ctG038.xsd",
+      "ctG034.xsd",
+      "ctG033.xsd",
+      "ctG026.xsd",
+      "ctG023.xsd",
+      "ctG022.xsd",
+      "ctG021.xsd",
+      "ctG020.xsd",
+      "ctG019.xsd",
+      "ctG013.xsd",
+      "ctG011.xsd",
+      "ctG010.xsd",
+      "ctG009.xsd",
+      "ctG008.xsd",
+      "ctG007.xsd",
+      "ctG001.xsd",
+      "ctF013.xsd",
+      "ctF009.xsd",
+      "ctF008.xsd",
+      "ctF007.xsd",
+      "ctF005.xsd",
+      "ctF004.xsd",
+      "ctF003.xsd",
+      "ctF002.xsd",
+      "ctE016.xsd",
+      "ctE015.xsd",
+      "ctE014.xsd",
+      "ctE013.xsd",
+      "ctE012.xsd",
+      "ctE011.xsd",
+      "ctE009.xsd",
+      "ctE005.xsd",
+      "ctE003.xsd",
+      "ctD043.xsd",
+      "ctD042.xsd",
+      "ctD041.xsd",
+      "ctD040.xsd",
+      "ctD032.xsd",
+      "ctD031.xsd",
+      "ctD011.xsd",
+      "ctD007.xsd",
+      "ctD004.xsd",
+      "ctD001.xsd",
+      "ctC005.xsd",
+      "ctC004.xsd",
+      "ctC003.xsd",
+      "ctC002.xsd",
+      "ctB125.xsd",
+      "ctB124.xsd",
+      "ctB123.xsd",
+      "ctB122.xsd",
+      "ctB121.xsd",
+      "ctB120.xsd",
+      "ctB119.xsd",
+      "ctB118.xsd",
+      "ctB117.xsd",
+      "ctB116.xsd",
+      "ctB115.xsd",
+      "ctB114.xsd",
+      "ctB112.xsd",
+      "ctB107.xsd",
+      "ctB106.xsd",
+      "ctB105.xsd",
+      "ctB104.xsd",
+      "ctB102.xsd",
+      "ctB101.xsd",
+      "ctB099.xsd",
+      "ctB094.xsd",
+      "ctB093.xsd",
+      "ctB092.xsd",
+      "ctB091.xsd",
+      "ctB090.xsd",
+      "ctB089.xsd",
+      "ctB088.xsd",
+      "ctB086.xsd",
+      "ctB080.xsd",
+      "ctB079.xsd",
+      "ctB078.xsd",
+      "ctB077.xsd",
+      "ctB076.xsd",
+      "ctB075.xsd",
+      "ctB074.xsd",
+      "ctB072.xsd",
+      "ctB066.xsd",
+      "ctB065.xsd",
+      "ctB064.xsd",
+      "ctB063.xsd",
+      "ctB062.xsd",
+      "ctB061.xsd",
+      "ctB060.xsd",
+      "ctB058.xsd",
+      "ctB052.xsd",
+      "ctB051.xsd",
+      "ctB050.xsd",
+      "ctB049.xsd",
+      "ctB048.xsd",
+      "ctB047.xsd",
+      "ctB046.xsd",
+      "ctB044.xsd",
+      "ctB038.xsd",
+      "ctB037.xsd",
+      "ctB036.xsd",
+      "ctB035.xsd",
+      "ctB034.xsd",
+      "ctB033.xsd",
+      "ctB032.xsd",
+      "ctB030.xsd",
+      "ctB029.xsd",
+      "ctB026.xsd",
+      "ctB025.xsd",
+      "ctB024.xsd",
+      "ctB023.xsd",
+      "ctB022.xsd",
+      "ctB021.xsd",
+      "ctB020.xsd",
+      "ctB019.xsd",
+      "ctB018.xsd",
+      "ctB016.xsd",
+      "ctB015.xsd",
+      "ctB014.xsd",
+      "ctB013.xsd",
+      "ctB012.xsd",
+      "ctB011.xsd",
+      "ctB010.xsd",
+      "ctB009.xsd",
+      "ctB008.xsd",
+      "ctB007.xsd",
+      "ctB005.xsd",
+      "ctB004.xsd",
+      "ctB002.xsd",
+      "ctA046.xsd",
+      "ctA044.xsd",
+      "ctA043.xsd",
+      "ctA042.xsd",
+      "ctA031.xsd",
+      "ctA030.xsd",
+      "ctA029.xsd",
+      "ctA028.xsd",
+      "ctA024.xsd",
+      "ctA023.xsd",
+      "ctA015.xsd",
+      "ctA014.xsd",
+      "ctO006.xml",
+      "ctL021.xml",
+      "ctL018.xml",
+      "ctL016.xml",
+      "ctL005.xml",
+      "ctJ001.xml",
+      "ctI049.xml",
+      "ctI048.xml",
+      "ctI045.xml",
+      "ctI042.xml",
+      "ctI041.xml",
+      "ctI040.xml",
+      "ctI035.xml",
+      "ctI032.xml",
+      "ctI031.xml",
+      "ctI030.xml",
+      "ctH082.xml",
+      "ctH069.xml",
+      "ctH068.xml",
+      "ctH067.xml",
+      "ctH066.xml",
+      "ctH060.xml",
+      "ctH057.xml",
+      "ctH056.xml",
+      "ctH046.xml",
+      "ctH045.xml",
+      "ctH035.xml",
+      "ctH034.xml",
+      "ctH033.xml",
+      "ctH032.xml",
+      "ctH031.xml",
+      "ctH025.xml",
+      "ctH023.xml",
+      "ctH022.xml",
+      "ctH021.xml",
+      "ctH020.xml",
+      "ctH019.xml",
+      "ctH013.xml",
+      "ctH011.xml",
+      "ctH010.xml",
+      "ctH009.xml",
+      "ctH008.xml",
+      "ctH007.xml",
+      "ctH001.xml",
+      "ctG071.xml",
+      "ctG069.xml",
+      "ctG068.xml",
+      "ctG067.xml",
+      "ctG066.xml",
+      "ctG060.xml",
+      "ctG058.xml",
+      "ctG057.xml",
+      "ctG056.xml",
+      "ctG055.xml",
+      "ctG049.xml",
+      "ctG047.xml",
+      "ctG046.xml",
+      "ctG045.xml",
+      "ctG035.xml",
+      "ctG034.xml",
+      "ctG033.xml",
+      "ctG023.xml",
+      "ctG022.xml",
+      "ctG021.xml",
+      "ctG020.xml",
+      "ctG019.xml",
+      "ctG013.xml",
+      "ctG011.xml",
+      "ctG010.xml",
+      "ctG009.xml",
+      "ctG008.xml",
+      "ctG007.xml",
+      "ctG001.xml",
+      "ctF014.xml",
+      "ctF013.xml",
+      "ctF011.xml",
+      "ctF007.xml",
+      "ctF006.xml",
+      "ctD032.xml",
+      "ctD031.xml"],[]}}.
+{elem,{["elemT015.xsd",
+        "elemT014.xsd",
+        "elemT013.xsd",
+        "elemT012.xsd",
+        "elemT011.xsd",
+        "elemS006.xsd",
+        "elemS005.xsd",
+        "elemS004.xsd",
+        "elemS001.xsd",
+        "elemQ006.xsd",
+        "elemQ004.xsd",
+        "elemP006.xsd",
+        "elemN006.xsd",
+        "elemL003.xsd",
+        "elemK007.xsd",
+        "elemJ020.xsd",
+        "elemJ019.xsd",
+        "elemJ015.xsd",
+        "elemJ012.xsd",
+        "elemJ007.xsd",
+        "elemH006.xsd",
+        "elemH005.xsd",
+        "elemH004.xsd",
+        "elemH003.xsd",
+        "elemG004.xsd",
+        "elemG003.xsd",
+        "elemE006.xsd",
+        "elemD005.xsd",
+        "elemD004.xsd",
+        "elemA014.xsd",
+        "elemA013.xsd",
+        "elemA011.xsd",
+        "elemA010.xsd",
+        "elemA009.xsd",
+        "elemA006.xsd",
+        "elemZ001.xml",
+        "elemZ002.xml",
+        "elemU007.xml",
+        "elemU006.xml",
+        "elemU005.xml",
+        "elemU003.xml",
+        "elemT058.xml",
+        "elemT044.xml",
+        "elemT043.xml",
+        "elemT042.xml",
+        "elemT041.xml",
+        "elemT040.xml",
+        "elemT039.xml",
+        "elemT029.xml",
+        "elemT028.xml",
+        "elemT027.xml",
+        "elemT026.xml",
+        "elemT024.xml",
+        "elemT022.xml",
+        "elemT018.xml",
+        "elemT015.xml",
+        "elemT014.xml",
+        "elemT004.xml",
+        "elemT001.xml",
+        "elemQ022.xml",
+        "elemQ019.xml",
+        "elemQ018.xml",
+        "elemO011.xml",
+        "elemO006.xml"],[]}}.
+{group,{["groupO027.xsd",
+         "groupO025.xsd",
+         "groupO024.xsd",
+         "groupO023.xsd",
+         "groupO022.xsd",
+         "groupO021.xsd",
+         "groupO020.xsd",
+         "groupO019.xsd",
+         "groupO018.xsd",
+         "groupO017.xsd",
+         "groupO016.xsd",
+         "groupO015.xsd",
+         "groupO013.xsd",
+         "groupO012.xsd",
+         "groupO011.xsd",
+         "groupO010.xsd",
+         "groupO003.xsd",
+         "groupO002.xsd",
+         "groupN025.xsd",
+         "groupN024.xsd",
+         "groupN023.xsd",
+         "groupN022.xsd",
+         "groupM002.xsd",
+         "groupL025.xsd",
+         "groupL024.xsd",
+         "groupL023.xsd",
+         "groupL022.xsd",
+         "groupK002.xsd",
+         "groupJ025.xsd",
+         "groupJ024.xsd",
+         "groupJ023.xsd",
+         "groupJ022.xsd",
+         "groupI003.xsd",
+         "groupI002.xsd",
+         "groupH019.xsd",
+         "groupH018.xsd",
+         "groupH016.xsd",
+         "groupH015.xsd",
+         "groupH014.xsd",
+         "groupH013.xsd",
+         "groupH012.xsd",
+         "groupH011.xsd",
+         "groupH010.xsd",
+         "groupH009.xsd",
+         "groupH008.xsd",
+         "groupH006.xsd",
+         "groupH005.xsd",
+         "groupH004.xsd",
+         "groupH003.xsd",
+         "groupH002.xsd",
+         "groupH001.xsd",
+         "groupG005.xsd",
+         "groupG004.xsd",
+         "groupG003.xsd",
+         "groupG001.xsd",
+         "groupF025.xsd",
+         "groupF024.xsd",
+         "groupF023.xsd",
+         "groupF022.xsd",
+         "groupE002.xsd",
+         "groupD003.xsd",
+         "groupD001.xsd",
+         "groupC010.xsd",
+         "groupC008.xsd",
+         "groupC007.xsd",
+         "groupC006.xsd",
+         "groupC004.xsd",
+         "groupB017.xsd",
+         "groupB015.xsd",
+         "groupB014.xsd",
+         "groupB013.xsd",
+         "groupB012.xsd",
+         "groupB002.xsd",
+         "groupB001.xsd",
+         "groupA012.xsd",
+         "groupA010.xsd",
+         "groupA009.xsd",
+         "groupA007.xsd",
+         "groupA006.xsd",
+         "groupA005.xsd",
+         "groupA004.xsd",
+         "groupA003.xsd",
+         "groupO009.xml",
+         "groupO007.xml",
+         "groupO004.xml",
+         "groupN019.xml",
+         "groupN015.xml",
+         "groupN012.xml",
+         "groupN008.xml",
+         "groupN007.xml",
+         "groupN006.xml",
+         "groupN003.xml",
+         "groupM005.xml",
+         "groupL019.xml",
+         "groupL015.xml",
+         "groupL012.xml",
+         "groupL008.xml",
+         "groupL007.xml",
+         "groupL006.xml",
+         "groupL003.xml",
+         "groupK005.xml",
+         "groupJ019.xml",
+         "groupJ015.xml",
+         "groupJ012.xml",
+         "groupJ008.xml",
+         "groupJ007.xml",
+         "groupJ006.xml",
+         "groupJ003.xml",
+         "groupI005.xml",
+         "groupH018.xml",
+         "groupH014.xml",
+         "groupH011.xml",
+         "groupH009.xml",
+         "groupH007.xml",
+         "groupH005.xml",
+         "groupH004.xml",
+         "groupH002.xml",
+         "groupH001.xml",
+         "groupG004.xml",
+         "groupF021.xml",
+         "groupF018.xml",
+         "groupF017.xml",
+         "groupF016.xml",
+         "groupF014.xml",
+         "groupF013.xml",
+         "groupF011.xml",
+         "groupF010.xml",
+         "groupF009.xml",
+         "groupF005.xml",
+         "groupF002.xml",
+         "groupE004.xml",
+         "groupE003.xml",
+         "groupB010.xml",
+         "groupB009.xml",
+         "groupB002.xml"],[]}}.
+{idc_,{["idc_gMonth_gMonth.xml",
+        "idc_gDay_gDay.xml",
+        "idc_gMonthDay_gMonthDay.xml",
+        "idc_gYear_gYear.xml",
+        "idc_gYearMonth_gYearMonth.xml",
+        "idc_date_date.xml",
+        "idc_time_time.xml",
+        "idc_dateTime_dateTime.xml",
+        "idc_duration_duration.xml",
+        "idc_NOTATION_NOTATION.xml",
+        "idc_QName_QName.xml",
+        "idc_anyURI_anyURI.xml",
+        "idc_double_double.xml",
+        "idc_unsignedByte_unsignedByte.xml",
+        "idc_unsignedByte_unsignedShort.xml",
+        "idc_unsignedByte_unsignedInt.xml",
+        "idc_unsignedByte_unsignedLong.xml",
+        "idc_unsignedByte_integer.xml",
+        "idc_unsignedByte_decimal.xml",
+        "idc_unsignedShort_unsignedByte.xml",
+        "idc_unsignedShort_unsignedShort.xml",
+        "idc_unsignedShort_unsignedInt.xml",
+        "idc_unsignedShort_unsignedLong.xml",
+        "idc_unsignedShort_integer.xml",
+        "idc_unsignedShort_decimal.xml",
+        "idc_unsignedInt_unsignedByte.xml",
+        "idc_unsignedInt_unsignedShort.xml",
+        "idc_unsignedInt_unsignedInt.xml",
+        "idc_unsignedInt_unsignedLong.xml",
+        "idc_unsignedInt_integer.xml",
+        "idc_unsignedInt_decimal.xml",
+        "idc_unsignedLong_unsignedByte.xml",
+        "idc_unsignedLong_unsignedShort.xml",
+        "idc_unsignedLong_unsignedInt.xml",
+        "idc_unsignedLong_unsignedLong.xml",
+        "idc_unsignedLong_integer.xml",
+        "idc_unsignedLong_decimal.xml",
+        "idc_positiveInteger_integer.xml",
+        "idc_positiveInteger_decimal.xml",
+        "idc_nonNegativeInteger_integer.xml",
+        "idc_nonNegativeInteger_decimal.xml",
+        "idc_byte_byte.xml",
+        "idc_byte_short.xml",
+        "idc_byte_int.xml",
+        "idc_byte_long.xml",
+        "idc_byte_integer.xml",
+        "idc_byte_decimal.xml",
+        "idc_short_byte.xml",
+        "idc_short_short.xml",
+        "idc_short_int.xml",
+        "idc_short_long.xml",
+        "idc_short_integer.xml",
+        "idc_short_decimal.xml",
+        "idc_int_byte.xml",
+        "idc_int_short.xml",
+        "idc_int_int.xml",
+        "idc_int_long.xml",
+        "idc_int_integer.xml",
+        "idc_int_decimal.xml",
+        "idc_long_byte.xml",
+        "idc_long_short.xml",
+        "idc_long_int.xml",
+        "idc_long_long.xml",
+        "idc_long_integer.xml",
+        "idc_long_decimal.xml",
+        "idc_negativeInteger_integer.xml",
+        "idc_negativeInteger_decimal.xml",
+        "idc_nonPositiveInteger_integer.xml",
+        "idc_nonPositiveInteger_decimal.xml",
+        "idc_integer_unsignedByte.xml",
+        "idc_integer_unsignedShort.xml",
+        "idc_integer_unsignedInt.xml",
+        "idc_integer_unsignedLong.xml",
+        "idc_integer_positiveInteger.xml",
+        "idc_integer_nonNegativeInteger.xml",
+        "idc_integer_byte.xml",
+        "idc_integer_short.xml",
+        "idc_integer_int.xml",
+        "idc_integer_long.xml",
+        "idc_integer_negativeInteger.xml",
+        "idc_integer_nonPositiveInteger.xml",
+        "idc_integer_integer.xml",
+        "idc_integer_decimal.xml",
+        "idc_decimal_unsignedByte.xml",
+        "idc_decimal_unsignedShort.xml",
+        "idc_decimal_unsignedInt.xml",
+        "idc_decimal_unsignedLong.xml",
+        "idc_decimal_positiveInteger.xml",
+        "idc_decimal_nonNegativeInteger.xml",
+        "idc_decimal_byte.xml",
+        "idc_decimal_short.xml",
+        "idc_decimal_int.xml",
+        "idc_decimal_long.xml",
+        "idc_decimal_negativeInteger.xml",
+        "idc_decimal_nonPositiveInteger.xml",
+        "idc_decimal_integer.xml",
+        "idc_decimal_decimal.xml",
+        "idc_float_float.xml",
+        "idc_boolean_boolean.xml",
+        "idc_NMTOKEN_NMTOKEN.xml",
+        "idc_NMTOKEN_token.xml",
+        "idc_NMTOKEN_normalizedString.xml",
+        "idc_NMTOKEN_string.xml",
+        "idc_IDREF_IDREF.xml",
+        "idc_IDREF_NCName.xml",
+        "idc_IDREF_Name.xml",
+        "idc_IDREF_token.xml",
+        "idc_IDREF_normalizedString.xml",
+        "idc_IDREF_string.xml",
+        "idc_ID_NCName.xml",
+        "idc_ID_Name.xml",
+        "idc_ID_token.xml",
+        "idc_ID_normalizedString.xml",
+        "idc_ID_string.xml",
+        "idc_NCName_IDREF.xml",
+        "idc_NCName_ID.xml",
+        "idc_NCName_NCName.xml",
+        "idc_NCName_Name.xml",
+        "idc_NCName_token.xml",
+        "idc_NCName_normalizedString.xml",
+        "idc_NCName_string.xml",
+        "idc_Name_IDREF.xml",
+        "idc_Name_ID.xml",
+        "idc_Name_NCName.xml",
+        "idc_Name_Name.xml",
+        "idc_Name_token.xml",
+        "idc_Name_normalizedString.xml",
+        "idc_Name_string.xml",
+        "idc_language_language.xml",
+        "idc_language_token.xml",
+        "idc_language_normalizedString.xml",
+        "idc_language_string.xml",
+        "idc_token_NMTOKEN.xml",
+        "idc_token_IDREF.xml",
+        "idc_token_ID.xml",
+        "idc_token_NCName.xml",
+        "idc_token_Name.xml",
+        "idc_token_language.xml",
+        "idc_token_token.xml",
+        "idc_token_normalizedString.xml",
+        "idc_token_string.xml",
+        "idc_normalizedString_NMTOKEN.xml",
+        "idc_normalizedString_IDREF.xml",
+        "idc_normalizedString_ID.xml",
+        "idc_normalizedString_NCName.xml",
+        "idc_normalizedString_Name.xml",
+        "idc_normalizedString_language.xml",
+        "idc_normalizedString_token.xml",
+        "idc_normalizedString_string.xml",
+        "idc_string_NMTOKEN.xml",
+        "idc_string_IDREF.xml",
+        "idc_string_ID.xml",
+        "idc_string_NCName.xml",
+        "idc_string_Name.xml",
+        "idc_string_language.xml",
+        "idc_string_token.xml",
+        "idc_string_normalizedString.xml",
+        "idc_string_string.xml"],["idc_unsignedByte_nonNegativeInteger.xsd",
+                                  "idc_unsignedByte_normalizedString.xsd",
+                                  "idc_unsignedShort_positiveInteger.xsd",
+                                  "idc_unsignedShort_nonNegativeInteger.xsd",
+                                  "idc_unsignedShort_normalizedString.xsd",
+                                  "idc_unsignedInt_nonNegativeInteger.xsd",
+                                  "idc_unsignedLong_nonNegativeInteger.xsd",
+                                  "idc_unsignedLong_normalizedString.xsd",
+                                  "idc_positiveInteger_unsignedShort.xsd",
+                                  "idc_positiveInteger_positiveInteger.xsd",
+                                  "idc_positiveInteger_nonNegativeInteger.xsd",
+                                  "idc_positiveInteger_normalizedString.xsd",
+                                  "idc_nonNegativeInteger_unsignedByte.xsd",
+                                  "idc_nonNegativeInteger_unsignedShort.xsd",
+                                  "idc_nonNegativeInteger_unsignedInt.xsd",
+                                  "idc_nonNegativeInteger_unsignedLong.xsd",
+                                  "idc_nonNegativeInteger_positiveInteger.xsd",
+                                  "idc_nonNegativeInteger_nonNegativeInteger.xsd",
+                                  "idc_nonNegativeInteger_base64Binary.xsd",
+                                  "idc_nonNegativeInteger_normalizedString.xsd",
+                                  "idc_negativeInteger_negativeInteger.xsd",
+                                  "idc_negativeInteger_nonPositiveInteger.xsd",
+                                  "idc_negativeInteger_normalizedString.xsd",
+                                  "idc_nonPositiveInteger_negativeInteger.xsd",
+                                  "idc_nonPositiveInteger_nonPositiveInteger.xsd",
+                                  "idc_nonPositiveInteger_normalizedString.xsd",
+                                  "idc_base64Binary_nonNegativeInteger.xsd",
+                                  "idc_base64Binary_normalizedString.xsd",
+                                  "idc_normalizedString_unsignedByte.xsd",
+                                  "idc_normalizedString_unsignedShort.xsd",
+                                  "idc_normalizedString_unsignedLong.xsd",
+                                  "idc_normalizedString_positiveInteger.xsd",
+                                  "idc_normalizedString_nonNegativeInteger.xsd",
+                                  "idc_normalizedString_negativeInteger.xsd",
+                                  "idc_normalizedString_nonPositiveInteger.xsd",
+                                  "idc_normalizedString_base64Binary.xsd",
+                                  "idc_normalizedString_normalizedString.xsd",
+                                  "idc_unsignedByte_nonNegativeInteger.xml",
+                                  "idc_unsignedByte_normalizedString.xml",
+                                  "idc_unsignedShort_positiveInteger.xml",
+                                  "idc_unsignedShort_nonNegativeInteger.xml",
+                                  "idc_unsignedShort_normalizedString.xml",
+                                  "idc_unsignedInt_nonNegativeInteger.xml",
+                                  "idc_unsignedLong_nonNegativeInteger.xml",
+                                  "idc_unsignedLong_normalizedString.xml",
+                                  "idc_positiveInteger_unsignedShort.xml",
+                                  "idc_positiveInteger_positiveInteger.xml",
+                                  "idc_positiveInteger_nonNegativeInteger.xml",
+                                  "idc_positiveInteger_normalizedString.xml",
+                                  "idc_nonNegativeInteger_unsignedByte.xml",
+                                  "idc_nonNegativeInteger_unsignedShort.xml",
+                                  "idc_nonNegativeInteger_unsignedInt.xml",
+                                  "idc_nonNegativeInteger_unsignedLong.xml",
+                                  "idc_nonNegativeInteger_positiveInteger.xml",
+                                  "idc_nonNegativeInteger_nonNegativeInteger.xml",
+                                  "idc_nonNegativeInteger_base64Binary.xml",
+                                  "idc_nonNegativeInteger_normalizedString.xml",
+                                  "idc_negativeInteger_negativeInteger.xml",
+                                  "idc_negativeInteger_nonPositiveInteger.xml",
+                                  "idc_negativeInteger_normalizedString.xml",
+                                  "idc_nonPositiveInteger_negativeInteger.xml",
+                                  "idc_nonPositiveInteger_nonPositiveInteger.xml",
+                                  "idc_nonPositiveInteger_normalizedString.xml",
+                                  "idc_base64Binary_nonNegativeInteger.xml",
+                                  "idc_base64Binary_normalizedString.xml",
+                                  "idc_normalizedString_unsignedByte.xml",
+                                  "idc_normalizedString_unsignedShort.xml",
+                                  "idc_normalizedString_unsignedLong.xml",
+                                  "idc_normalizedString_positiveInteger.xml",
+                                  "idc_normalizedString_nonNegativeInteger.xml",
+                                  "idc_normalizedString_negativeInteger.xml",
+                                  "idc_normalizedString_nonPositiveInteger.xml",
+                                  "idc_normalizedString_base64Binary.xml",
+                                  "idc_normalizedString_normalizedString.xml"]}}.
+{id,{["idK016.xsd",
+      "idK015.xsd",
+      "idJ204.xsd",
+      "idJ203.xsd",
+      "idJ202.xsd",
+      "idJ201.xsd",
+      "idJ200.xsd",
+      "idJ199.xsd",
+      "idJ198.xsd",
+      "idJ197.xsd",
+      "idJ196.xsd",
+      "idJ195.xsd",
+      "idJ194.xsd",
+      "idJ193.xsd",
+      "idJ192.xsd",
+      "idJ191.xsd",
+      "idJ190.xsd",
+      "idJ189.xsd",
+      "idJ188.xsd",
+      "idJ187.xsd",
+      "idJ186.xsd",
+      "idJ185.xsd",
+      "idJ184.xsd",
+      "idJ183.xsd",
+      "idJ182.xsd",
+      "idJ181.xsd",
+      "idJ180.xsd",
+      "idJ179.xsd",
+      "idJ178.xsd",
+      "idJ177.xsd",
+      "idJ176.xsd",
+      "idJ175.xsd",
+      "idJ174.xsd",
+      "idJ173.xsd",
+      "idJ172.xsd",
+      "idJ171.xsd",
+      "idJ170.xsd",
+      "idJ169.xsd",
+      "idJ168.xsd",
+      "idJ167.xsd",
+      "idJ166.xsd",
+      "idJ165.xsd",
+      "idJ164.xsd",
+      "idJ163.xsd",
+      "idJ162.xsd",
+      "idJ161.xsd",
+      "idJ160.xsd",
+      "idJ159.xsd",
+      "idJ158.xsd",
+      "idJ157.xsd",
+      "idJ156.xsd",
+      "idJ155.xsd",
+      "idJ154.xsd",
+      "idJ153.xsd",
+      "idJ152.xsd",
+      "idJ151.xsd",
+      "idJ150.xsd",
+      "idJ149.xsd",
+      "idJ148.xsd",
+      "idJ147.xsd",
+      "idJ146.xsd",
+      "idJ145.xsd",
+      "idJ144.xsd",
+      "idJ143.xsd",
+      "idJ142.xsd",
+      "idJ141.xsd",
+      "idJ140.xsd",
+      "idJ139.xsd",
+      "idJ138.xsd",
+      "idJ137.xsd",
+      "idJ136.xsd",
+      "idJ135.xsd",
+      "idJ134.xsd",
+      "idJ133.xsd",
+      "idJ132.xsd",
+      "idJ131.xsd",
+      "idJ130.xsd",
+      "idJ129.xsd",
+      "idJ128.xsd",
+      "idJ127.xsd",
+      "idJ126.xsd",
+      "idJ125.xsd",
+      "idJ124.xsd",
+      "idJ123.xsd",
+      "idJ122.xsd",
+      "idJ121.xsd",
+      "idJ120.xsd",
+      "idJ119.xsd",
+      "idJ118.xsd",
+      "idJ117.xsd",
+      "idJ116.xsd",
+      "idJ115.xsd",
+      "idJ114.xsd",
+      "idJ113.xsd",
+      "idJ112.xsd",
+      "idJ111.xsd",
+      "idJ110.xsd",
+      "idJ109.xsd",
+      "idJ108.xsd",
+      "idJ107.xsd",
+      "idJ106.xsd",
+      "idJ105.xsd",
+      "idJ104.xsd",
+      "idJ103.xsd",
+      "idJ102.xsd",
+      "idJ101.xsd",
+      "idJ100.xsd",
+      "idJ099.xsd",
+      "idJ098.xsd",
+      "idJ097.xsd",
+      "idJ096.xsd",
+      "idJ095.xsd",
+      "idJ094.xsd",
+      "idJ093.xsd",
+      "idJ092.xsd",
+      "idJ091.xsd",
+      "idJ090.xsd",
+      "idJ089.xsd",
+      "idJ088.xsd",
+      "idJ087.xsd",
+      "idJ086.xsd",
+      "idJ085.xsd",
+      "idJ084.xsd",
+      "idJ083.xsd",
+      "idJ082.xsd",
+      "idJ081.xsd",
+      "idJ080.xsd",
+      "idJ079.xsd",
+      "idJ078.xsd",
+      "idJ077.xsd",
+      "idJ076.xsd",
+      "idJ075.xsd",
+      "idJ074.xsd",
+      "idJ073.xsd",
+      "idJ072.xsd",
+      "idJ071.xsd",
+      "idJ070.xsd",
+      "idJ069.xsd",
+      "idJ068.xsd",
+      "idJ067.xsd",
+      "idJ066.xsd",
+      "idJ065.xsd",
+      "idJ064.xsd",
+      "idJ063.xsd",
+      "idJ062.xsd",
+      "idJ061.xsd",
+      "idJ060.xsd",
+      "idJ059.xsd",
+      "idJ058.xsd",
+      "idJ057.xsd",
+      "idJ055.xsd",
+      "idJ054.xsd",
+      "idJ053.xsd",
+      "idJ051.xsd",
+      "idJ050.xsd",
+      "idJ049.xsd",
+      "idJ048.xsd",
+      "idJ047.xsd",
+      "idJ046.xsd",
+      "idJ045.xsd",
+      "idJ044.xsd",
+      "idJ043.xsd",
+      "idJ042.xsd",
+      "idJ041.xsd",
+      "idJ040.xsd",
+      "idJ039.xsd",
+      "idJ038.xsd",
+      "idJ037.xsd",
+      "idJ035.xsd",
+      "idJ034.xsd",
+      "idJ033.xsd",
+      "idJ031.xsd",
+      "idJ029.xsd",
+      "idJ028.xsd",
+      "idJ027.xsd",
+      "idJ024.xsd",
+      "idJ023.xsd",
+      "idJ022.xsd",
+      "idJ021.xsd",
+      "idJ020.xsd",
+      "idJ019.xsd",
+      "idJ018.xsd",
+      "idJ014.xsd",
+      "idJ013.xsd",
+      "idJ012.xsd",
+      "idJ011.xsd",
+      "idJ010.xsd",
+      "idJ009.xsd",
+      "idJ004.xsd",
+      "idI144.xsd",
+      "idI143.xsd",
+      "idI142.xsd",
+      "idI141.xsd",
+      "idI140.xsd",
+      "idI139.xsd",
+      "idI138.xsd",
+      "idI137.xsd",
+      "idI136.xsd",
+      "idI135.xsd",
+      "idI134.xsd",
+      "idI133.xsd",
+      "idI132.xsd",
+      "idI131.xsd",
+      "idI130.xsd",
+      "idI129.xsd",
+      "idI128.xsd",
+      "idI127.xsd",
+      "idI126.xsd",
+      "idI125.xsd",
+      "idI124.xsd",
+      "idI123.xsd",
+      "idI122.xsd",
+      "idI121.xsd",
+      "idI120.xsd",
+      "idI119.xsd",
+      "idI118.xsd",
+      "idI117.xsd",
+      "idI116.xsd",
+      "idI115.xsd",
+      "idI114.xsd",
+      "idI113.xsd",
+      "idI112.xsd",
+      "idI111.xsd",
+      "idI110.xsd",
+      "idI109.xsd",
+      "idI108.xsd",
+      "idI107.xsd",
+      "idI106.xsd",
+      "idI105.xsd",
+      "idI104.xsd",
+      "idI103.xsd",
+      "idI102.xsd",
+      "idI101.xsd",
+      "idI100.xsd",
+      "idI099.xsd",
+      "idI098.xsd",
+      "idI097.xsd",
+      "idI096.xsd",
+      "idI095.xsd",
+      "idI094.xsd",
+      "idI093.xsd",
+      "idI092.xsd",
+      "idI091.xsd",
+      "idI090.xsd",
+      "idI089.xsd",
+      "idI088.xsd",
+      "idI087.xsd",
+      "idI086.xsd",
+      "idI085.xsd",
+      "idI084.xsd",
+      "idI083.xsd",
+      "idI082.xsd",
+      "idI081.xsd",
+      "idI080.xsd",
+      "idI079.xsd",
+      "idI078.xsd",
+      "idI077.xsd",
+      "idI076.xsd",
+      "idI075.xsd",
+      "idI074.xsd",
+      "idI073.xsd",
+      "idI072.xsd",
+      "idI071.xsd",
+      "idI070.xsd",
+      "idI069.xsd",
+      "idI068.xsd",
+      "idI067.xsd",
+      "idI066.xsd",
+      "idI065.xsd",
+      "idI064.xsd",
+      "idI063.xsd",
+      "idI062.xsd",
+      "idI061.xsd",
+      "idI060.xsd",
+      "idI059.xsd",
+      "idI058.xsd",
+      "idI057.xsd",
+      "idI056.xsd",
+      "idI055.xsd",
+      "idI054.xsd",
+      "idI053.xsd",
+      "idI052.xsd",
+      "idI051.xsd",
+      "idI050.xsd",
+      "idI049.xsd",
+      "idI048.xsd",
+      "idI047.xsd",
+      "idI046.xsd",
+      "idI045.xsd",
+      "idI044.xsd",
+      "idI043.xsd",
+      "idI042.xsd",
+      "idI041.xsd",
+      "idI040.xsd",
+      "idI039.xsd",
+      "idI037.xsd",
+      "idI036.xsd",
+      "idI035.xsd",
+      "idI034.xsd",
+      "idI033.xsd",
+      "idI032.xsd",
+      "idI031.xsd",
+      "idI030.xsd",
+      "idI029.xsd",
+      "idI027.xsd",
+      "idI026.xsd",
+      "idI025.xsd",
+      "idI024.xsd",
+      "idI021.xsd",
+      "idI020.xsd",
+      "idI019.xsd",
+      "idI017.xsd",
+      "idI013.xsd",
+      "idI012.xsd",
+      "idI011.xsd",
+      "idI010.xsd",
+      "idI009.xsd",
+      "idI008.xsd",
+      "idI002.xsd",
+      "idE033.xsd",
+      "idE032.xsd",
+      "idE031.xsd",
+      "idE030.xsd",
+      "idE029.xsd",
+      "idE028.xsd",
+      "idE027.xsd",
+      "idE026.xsd",
+      "idE025.xsd",
+      "idE024.xsd",
+      "idE023.xsd",
+      "idE022.xsd",
+      "idE021.xsd",
+      "idE020.xsd",
+      "idE019.xsd",
+      "idE018.xsd",
+      "idE017.xsd",
+      "idE014.xsd",
+      "idE012.xsd",
+      "idE011.xsd",
+      "idE007.xsd",
+      "idE006.xsd",
+      "idE005.xsd",
+      "idE004.xsd",
+      "idE003.xsd",
+      "idE002.xsd",
+      "idD033.xsd",
+      "idD032.xsd",
+      "idD031.xsd",
+      "idD030.xsd",
+      "idD029.xsd",
+      "idD028.xsd",
+      "idD027.xsd",
+      "idD026.xsd",
+      "idD025.xsd",
+      "idD024.xsd",
+      "idD023.xsd",
+      "idD022.xsd",
+      "idD021.xsd",
+      "idD020.xsd",
+      "idD019.xsd",
+      "idD018.xsd",
+      "idD017.xsd",
+      "idD014.xsd",
+      "idD012.xsd",
+      "idD011.xsd",
+      "idD006.xsd",
+      "idD005.xsd",
+      "idD004.xsd",
+      "idD003.xsd",
+      "idD002.xsd",
+      "idC047.xsd",
+      "idC046.xsd",
+      "idC045.xsd",
+      "idC032.xsd",
+      "idC031.xsd",
+      "idC030.xsd",
+      "idC029.xsd",
+      "idC028.xsd",
+      "idC027.xsd",
+      "idC026.xsd",
+      "idC025.xsd",
+      "idC024.xsd",
+      "idC023.xsd",
+      "idC021.xsd",
+      "idC020.xsd",
+      "idC018.xsd",
+      "idC017.xsd",
+      "idC016.xsd",
+      "idC007.xsd",
+      "idC006.xsd",
+      "idC005.xsd",
+      "idC004.xsd",
+      "idC003.xsd",
+      "idC002.xsd",
+      "idB044.xsd",
+      "idB043.xsd",
+      "idB042.xsd",
+      "idB035.xsd",
+      "idB032.xsd",
+      "idB031.xsd",
+      "idB030.xsd",
+      "idB029.xsd",
+      "idB028.xsd",
+      "idB027.xsd",
+      "idB026.xsd",
+      "idB025.xsd",
+      "idB024.xsd",
+      "idB023.xsd",
+      "idB021.xsd",
+      "idB020.xsd",
+      "idB019.xsd",
+      "idB017.xsd",
+      "idB016.xsd",
+      "idB007.xsd",
+      "idB006.xsd",
+      "idB004.xsd",
+      "idB003.xsd",
+      "idB002.xsd",
+      "idA044.xsd",
+      "idA043.xsd",
+      "idA042.xsd",
+      "idA035.xsd",
+      "idA032.xsd",
+      "idA031.xsd",
+      "idA030.xsd",
+      "idA029.xsd",
+      "idA028.xsd",
+      "idA027.xsd",
+      "idA026.xsd",
+      "idA025.xsd",
+      "idA024.xsd",
+      "idA023.xsd",
+      "idA021.xsd",
+      "idA020.xsd",
+      "idA019.xsd",
+      "idA018.xsd",
+      "idA016.xsd",
+      "idA007.xsd",
+      "idA006.xsd",
+      "idA005.xsd",
+      "idA004.xsd",
+      "idA003.xsd",
+      "idA002.xsd",
+      "idL102.xml",
+      "idL100.xml",
+      "idL098.xml",
+      "idL096.xml",
+      "idL094.xml",
+      "idL092.xml",
+      "idL090.xml",
+      "idL075.xml",
+      "idL072.xml",
+      "idL069.xml",
+      "idL065.xml",
+      "idL062.xml",
+      "idL061.xml",
+      "idL057.xml",
+      "idL056.xml",
+      "idL052.xml",
+      "idL049.xml",
+      "idL048.xml",
+      "idL025.xml",
+      "idL024.xml",
+      "idL023.xml",
+      "idK015.xml",
+      "idK014.xml",
+      "idK012.xml",
+      "idK003.xml",
+      "idH034.xml",
+      "idH032.xml",
+      "idH023.xml",
+      "idH012.xml",
+      "idH010.xml",
+      "idH006.xml",
+      "idG030.xml",
+      "idG028.xml",
+      "idG019.xml",
+      "idG012.xml",
+      "idG011.xml",
+      "idG006.xml",
+      "idF036.xml",
+      "idF034.xml",
+      "idF033.xml",
+      "idF031.xml",
+      "idF026.xml",
+      "idF025.xml",
+      "idF017.xml",
+      "idF016.xml",
+      "idF014.xml",
+      "idF013.xml",
+      "idF012.xml",
+      "idF010.xml",
+      "idF009.xml",
+      "idF004.xml",
+      "idF003.xml"],[]}}.
+{mgABCD,{["mgC013.xsd",
+          "mgC009.xsd",
+          "mgC008.xsd",
+          "mgB010.xsd",
+          "mgB009.xsd",
+          "mgB008.xsd",
+          "mgB007.xsd",
+          "mgB003.xsd",
+          "mgAb007.xsd",
+          "mgAb006.xsd",
+          "mgAb004.xsd",
+          "mgAb003.xsd",
+          "mgAb002.xsd",
+          "mgAa007.xsd",
+          "mgAa006.xsd",
+          "mgAa004.xsd",
+          "mgAa002.xsd",
+          "mgA019.xsd",
+          "mgA018.xsd",
+          "mgA013.xsd",
+          "mgA012.xsd",
+          "mgA011.xsd",
+          "mgA008.xsd",
+          "mgA007.xsd",
+          "mgA005.xsd",
+          "mgA004.xsd",
+          "mgA003.xsd",
+          "mgA002.xsd",
+          "mgA015.xml"],[]}}.
+{mgEFG,{["mgG030.xsd",
+         "mgG029.xsd",
+         "mgG028.xsd",
+         "mgG027.xsd",
+         "mgG025.xsd",
+         "mgG002.xsd",
+         "mgF023.xsd",
+         "mgF022.xsd",
+         "mgF021.xsd",
+         "mgF020.xsd",
+         "mgF003.xsd",
+         "mgEb002.xsd",
+         "mgEa005.xsd",
+         "mgEa004.xsd",
+         "mgEa002.xsd",
+         "mgE012.xsd",
+         "mgE011.xsd",
+         "mgE010.xsd",
+         "mgE008.xsd",
+         "mgE007.xsd",
+         "mgE006.xsd",
+         "mgE005.xsd",
+         "mgE004.xsd",
+         "mgE003.xsd",
+         "mgE002.xsd",
+         "mgG026.xml",
+         "mgG023.xml",
+         "mgG013.xml",
+         "mgF019.xml",
+         "mgF016.xml",
+         "mgF015.xml",
+         "mgF014.xml",
+         "mgF013.xml",
+         "mgF012.xml",
+         "mgF011.xml",
+         "mgF010.xml",
+         "mgF009.xml",
+         "mgEb005.xml",
+         "mgEb004.xml",
+         "mgE014.xml"],[]}}.
+{mgHIJ,{["mgJ030.xsd",
+         "mgJ029.xsd",
+         "mgJ028.xsd",
+         "mgJ027.xsd",
+         "mgJ025.xsd",
+         "mgJ002.xsd",
+         "mgI023.xsd",
+         "mgI022.xsd",
+         "mgI021.xsd",
+         "mgI020.xsd",
+         "mgI003.xsd",
+         "mgHb002.xsd",
+         "mgHa005.xsd",
+         "mgHa004.xsd",
+         "mgHa002.xsd",
+         "mgH012.xsd",
+         "mgH011.xsd",
+         "mgH008.xsd",
+         "mgH007.xsd",
+         "mgH006.xsd",
+         "mgH005.xsd",
+         "mgH004.xsd",
+         "mgH003.xsd",
+         "mgH002.xsd",
+         "mgJ026.xml",
+         "mgJ023.xml",
+         "mgJ013.xml",
+         "mgJ001.xml",
+         "mgHb005.xml",
+         "mgHb004.xml",
+         "mgH015.xml"],[]}}.
+{mgOP,{["mgP056.xsd",
+        "mgP055.xsd",
+        "mgP049.xsd",
+        "mgP042.xsd",
+        "mgP040.xsd",
+        "mgP039.xsd",
+        "mgO036.xsd",
+        "mgO029.xsd",
+        "mgO027.xsd",
+        "mgO019.xsd",
+        "mgO018.xsd",
+        "mgO015.xsd",
+        "mgO008.xsd",
+        "mgO003.xsd",
+        "mgO001.xsd",
+        "mgO038.xml",
+        "mgO037.xml",
+        "mgO036.xml",
+        "mgO035.xml",
+        "mgO034.xml",
+        "mgO031.xml",
+        "mgO029.xml",
+        "mgO017.xml",
+        "mgO016.xml",
+        "mgO015.xml",
+        "mgO014.xml",
+        "mgO013.xml",
+        "mgO011.xml",
+        "mgO010.xml",
+        "mgO009.xml",
+        "mgO008.xml",
+        "mgO007.xml",
+        "mgO006.xml",
+        "mgO005.xml"],[]}}.
+{mgQR,{["mgR022.xsd",
+        "mgR021.xsd",
+        "mgR020.xsd",
+        "mgR019.xsd",
+        "mgR018.xsd",
+        "mgR017.xsd",
+        "mgR016.xsd",
+        "mgR015.xsd",
+        "mgR014.xsd",
+        "mgR013.xsd",
+        "mgR012.xsd",
+        "mgR011.xsd",
+        "mgR010.xsd",
+        "mgR009.xsd",
+        "mgR008.xsd",
+        "mgR007.xsd",
+        "mgR006.xsd",
+        "mgR005.xsd",
+        "mgR004.xsd",
+        "mgR003.xsd",
+        "mgR002.xsd",
+        "mgR001.xsd",
+        "mgQ021.xsd",
+        "mgQ013.xsd",
+        "mgQ012.xsd",
+        "mgQ011.xsd",
+        "mgQ010.xsd",
+        "mgQ005.xsd",
+        "mgQ004.xsd",
+        "mgQ001.xsd",
+        "mgQ017.xml",
+        "mgQ016.xml",
+        "mgQ015.xml",
+        "mgQ014.xml",
+        "mgQ002.xml"],[]}}.
+{particlesAB,{["particlesB015.xml",
+               "particlesB010.xml",
+               "particlesA013.xml",
+               "particlesA011.xml",
+               "particlesA010.xml",
+               "particlesA009.xml",
+               "particlesA007.xml",
+               "particlesA006.xml",
+               "particlesA005.xml"],[]}}.
+{particlesCDE,{["particlesEd001.xsd",
+                "particlesEc009.xsd",
+                "particlesEb015.xsd",
+                "particlesEa025.xsd",
+                "particlesEa024.xsd",
+                "particlesEa023.xsd",
+                "particlesEa022.xsd",
+                "particlesEc039.xml",
+                "particlesEc038.xml",
+                "particlesEc023.xml",
+                "particlesEc022.xml",
+                "particlesEc013.xml",
+                "particlesEc010.xml",
+                "particlesEc007.xml",
+                "particlesEc003.xml",
+                "particlesEb030.xml",
+                "particlesEb022.xml",
+                "particlesEb016.xml",
+                "particlesEb013.xml",
+                "particlesEb006.xml",
+                "particlesEa018.xml",
+                "particlesEa017.xml",
+                "particlesEa011.xml",
+                "particlesEa010.xml",
+                "particlesEa004.xml",
+                "particlesEa003.xml",
+                "particlesC039.xml",
+                "particlesC036.xml",
+                "particlesC035.xml",
+                "particlesC032.xml",
+                "particlesC031.xml",
+                "particlesC025.xml",
+                "particlesC024.xml",
+                "particlesC023.xml",
+                "particlesC022.xml",
+                "particlesC020.xml",
+                "particlesC019.xml",
+                "particlesC018.xml",
+                "particlesC017.xml",
+                "particlesC014.xml",
+                "particlesC013.xml",
+                "particlesC012.xml",
+                "particlesC010.xml",
+                "particlesC009.xml"],[]}}.
+{particlesFHI,{["particlesIk026.xsd",
+                "particlesIk024.xsd",
+                "particlesIk021.xsd",
+                "particlesIk019.xsd",
+                "particlesIk012.xsd",
+                "particlesIk007.xsd",
+                "particlesIk006.xsd",
+                "particlesIk005.xsd",
+                "particlesIk003.xsd",
+                "particlesIk002.xsd",
+                "particlesIj016.xsd",
+                "particlesIj015.xsd",
+                "particlesIj013.xsd",
+                "particlesIj011.xsd",
+                "particlesIj010.xsd",
+                "particlesIj009.xsd",
+                "particlesIj008.xsd",
+                "particlesIj007.xsd",
+                "particlesIj004.xsd",
+                "particlesIj003.xsd",
+                "particlesIh001.xsd",
+                "particlesIg016.xsd",
+                "particlesIg013.xsd",
+                "particlesIg010.xsd",
+                "particlesIg009.xsd",
+                "particlesIg008.xsd",
+                "particlesIg007.xsd",
+                "particlesIg004.xsd",
+                "particlesIf009.xsd",
+                "particlesIf008.xsd",
+                "particlesIf007.xsd",
+                "particlesIe014.xsd",
+                "particlesIe012.xsd",
+                "particlesIe009.xsd",
+                "particlesIe006.xsd",
+                "particlesId012.xsd",
+                "particlesId006.xsd",
+                "particlesId003.xsd",
+                "particlesIb007.xsd",
+                "particlesIb006.xsd",
+                "particlesIa008.xsd",
+                "particlesIa006.xsd",
+                "particlesHb011.xsd",
+                "particlesHb008.xsd",
+                "particlesHb004.xsd",
+                "particlesHb003.xsd",
+                "particlesHb001.xsd",
+                "particlesHa008.xsd",
+                "particlesHa007.xsd",
+                "particlesHa006.xsd",
+                "particlesHa005.xsd",
+                "particlesHa004.xsd",
+                "particlesHa003.xsd",
+                "particlesHa002.xsd",
+                "particlesFb006.xsd",
+                "particlesFb005.xsd",
+                "particlesFb004.xsd",
+                "particlesFb003.xsd",
+                "particlesFb002.xsd",
+                "particlesIk026.xml",
+                "particlesIk012.xml",
+                "particlesIf006.xml",
+                "particlesIf001.xml",
+                "particlesIe004.xml",
+                "particlesHa007.xml",
+                "particlesHa006.xml",
+                "particlesHa005.xml",
+                "particlesHa004.xml",
+                "particlesHa003.xml",
+                "particlesHa002.xml",
+                "particlesFb004.xml",
+                "particlesFb001.xml",
+                "particlesFa001.xml"],[]}}.
+{particlesJ,{["particlesJk015.xsd",
+              "particlesJk013.xsd",
+              "particlesJk011.xsd",
+              "particlesJk010.xsd",
+              "particlesJk008.xsd",
+              "particlesJk007.xsd",
+              "particlesJk005.xsd",
+              "particlesJk004.xsd",
+              "particlesJk003.xsd",
+              "particlesJk002.xsd",
+              "particlesJk001.xsd",
+              "particlesJj011.xsd",
+              "particlesJj010.xsd",
+              "particlesJj009.xsd",
+              "particlesJj008.xsd",
+              "particlesJj007.xsd",
+              "particlesJj005.xsd",
+              "particlesJj004.xsd",
+              "particlesJj002.xsd",
+              "particlesJj001.xsd",
+              "particlesJf016.xsd",
+              "particlesJf015.xsd",
+              "particlesJf013.xsd",
+              "particlesJf011.xsd",
+              "particlesJf010.xsd",
+              "particlesJf008.xsd",
+              "particlesJf007.xsd",
+              "particlesJf005.xsd",
+              "particlesJf004.xsd",
+              "particlesJf003.xsd",
+              "particlesJf002.xsd",
+              "particlesJf001.xsd",
+              "particlesJe011.xsd",
+              "particlesJe010.xsd",
+              "particlesJe009.xsd",
+              "particlesJe008.xsd",
+              "particlesJe007.xsd",
+              "particlesJe005.xsd",
+              "particlesJe004.xsd",
+              "particlesJe002.xsd",
+              "particlesJe001.xsd",
+              "particlesJd016.xsd",
+              "particlesJd015.xsd",
+              "particlesJd013.xsd",
+              "particlesJd011.xsd",
+              "particlesJd010.xsd",
+              "particlesJd008.xsd",
+              "particlesJd007.xsd",
+              "particlesJd005.xsd",
+              "particlesJd004.xsd",
+              "particlesJd003.xsd",
+              "particlesJd002.xsd",
+              "particlesJd001.xsd",
+              "particlesJc011.xsd",
+              "particlesJc010.xsd",
+              "particlesJc009.xsd",
+              "particlesJc008.xsd",
+              "particlesJc007.xsd",
+              "particlesJc005.xsd",
+              "particlesJc004.xsd",
+              "particlesJc002.xsd",
+              "particlesJc001.xsd",
+              "particlesJb016.xsd",
+              "particlesJb015.xsd",
+              "particlesJb013.xsd",
+              "particlesJb011.xsd",
+              "particlesJb010.xsd",
+              "particlesJb008.xsd",
+              "particlesJb007.xsd",
+              "particlesJb005.xsd",
+              "particlesJb004.xsd",
+              "particlesJb003.xsd",
+              "particlesJb002.xsd",
+              "particlesJb001.xsd",
+              "particlesJa011.xsd",
+              "particlesJa010.xsd",
+              "particlesJa009.xsd",
+              "particlesJa008.xsd",
+              "particlesJa007.xsd",
+              "particlesJa005.xsd",
+              "particlesJa004.xsd",
+              "particlesJa002.xsd",
+              "particlesJa001.xsd",
+              "particlesJk015.xml",
+              "particlesJk013.xml",
+              "particlesJk011.xml",
+              "particlesJk010.xml",
+              "particlesJk008.xml",
+              "particlesJk007.xml",
+              "particlesJk005.xml",
+              "particlesJk004.xml",
+              "particlesJk003.xml",
+              "particlesJk002.xml",
+              "particlesJk001.xml",
+              "particlesJj011.xml",
+              "particlesJj010.xml",
+              "particlesJj009.xml",
+              "particlesJj008.xml",
+              "particlesJj007.xml",
+              "particlesJj005.xml",
+              "particlesJj004.xml",
+              "particlesJj002.xml",
+              "particlesJj001.xml",
+              "particlesJf016.xml",
+              "particlesJf015.xml",
+              "particlesJf013.xml",
+              "particlesJf011.xml",
+              "particlesJf010.xml",
+              "particlesJf008.xml",
+              "particlesJf007.xml",
+              "particlesJf005.xml",
+              "particlesJf004.xml",
+              "particlesJf003.xml",
+              "particlesJf002.xml",
+              "particlesJf001.xml",
+              "particlesJe011.xml",
+              "particlesJe010.xml",
+              "particlesJe009.xml",
+              "particlesJe008.xml",
+              "particlesJe007.xml",
+              "particlesJe005.xml",
+              "particlesJe004.xml",
+              "particlesJe002.xml",
+              "particlesJe001.xml",
+              "particlesJd016.xml",
+              "particlesJd015.xml",
+              "particlesJd013.xml",
+              "particlesJd011.xml",
+              "particlesJd010.xml",
+              "particlesJd008.xml",
+              "particlesJd007.xml",
+              "particlesJd005.xml",
+              "particlesJd004.xml",
+              "particlesJd003.xml",
+              "particlesJd002.xml",
+              "particlesJd001.xml",
+              "particlesJc011.xml",
+              "particlesJc010.xml",
+              "particlesJc009.xml",
+              "particlesJc008.xml",
+              "particlesJc007.xml",
+              "particlesJc005.xml",
+              "particlesJc004.xml",
+              "particlesJc002.xml",
+              "particlesJc001.xml",
+              "particlesJb016.xml",
+              "particlesJb015.xml",
+              "particlesJb013.xml",
+              "particlesJb011.xml",
+              "particlesJb010.xml",
+              "particlesJb008.xml",
+              "particlesJb007.xml",
+              "particlesJb005.xml",
+              "particlesJb004.xml",
+              "particlesJb003.xml",
+              "particlesJb002.xml",
+              "particlesJb001.xml",
+              "particlesJa011.xml",
+              "particlesJa010.xml",
+              "particlesJa009.xml",
+              "particlesJa008.xml",
+              "particlesJa007.xml",
+              "particlesJa005.xml",
+              "particlesJa004.xml",
+              "particlesJa002.xml",
+              "particlesJa001.xml"],[]}}.
+{particlesKOSRTQUVW,{["particlesW015.xsd",
+                      "particlesW013.xsd",
+                      "particlesW010.xsd",
+                      "particlesW007.xsd",
+                      "particlesW005.xsd",
+                      "particlesW002.xsd",
+                      "particlesV015.xsd",
+                      "particlesV014.xsd",
+                      "particlesV013.xsd",
+                      "particlesV012.xsd",
+                      "particlesV011.xsd",
+                      "particlesV010.xsd",
+                      "particlesV009.xsd",
+                      "particlesV008.xsd",
+                      "particlesV007.xsd",
+                      "particlesV006.xsd",
+                      "particlesV003.xsd",
+                      "particlesU007.xsd",
+                      "particlesU005.xsd",
+                      "particlesU004.xsd",
+                      "particlesU003.xsd",
+                      "particlesQ031.xsd",
+                      "particlesQ028.xsd",
+                      "particlesQ027.xsd",
+                      "particlesQ026.xsd",
+                      "particlesQ025.xsd",
+                      "particlesQ023.xsd",
+                      "particlesQ021.xsd",
+                      "particlesQ018.xsd",
+                      "particlesQ012.xsd",
+                      "particlesQ008.xsd",
+                      "particlesQ006.xsd",
+                      "particlesT011.xsd",
+                      "particlesT010.xsd",
+                      "particlesT009.xsd",
+                      "particlesT008.xsd",
+                      "particlesT002.xsd",
+                      "particlesR031.xsd",
+                      "particlesR028.xsd",
+                      "particlesR027.xsd",
+                      "particlesR026.xsd",
+                      "particlesR025.xsd",
+                      "particlesR023.xsd",
+                      "particlesR021.xsd",
+                      "particlesR018.xsd",
+                      "particlesR014.xsd",
+                      "particlesR010.xsd",
+                      "particlesR006.xsd",
+                      "particlesS011.xsd",
+                      "particlesS007.xsd",
+                      "particlesS004.xsd",
+                      "particlesS003.xsd",
+                      "particlesS001.xsd",
+                      "particlesOb058.xsd",
+                      "particlesOb051.xsd",
+                      "particlesOb050.xsd",
+                      "particlesOb049.xsd",
+                      "particlesOb046.xsd",
+                      "particlesOb045.xsd",
+                      "particlesOb044.xsd",
+                      "particlesOb043.xsd",
+                      "particlesOb041.xsd",
+                      "particlesOb040.xsd",
+                      "particlesOb039.xsd",
+                      "particlesOb038.xsd",
+                      "particlesOb037.xsd",
+                      "particlesOb036.xsd",
+                      "particlesOb035.xsd",
+                      "particlesOb034.xsd",
+                      "particlesOb033.xsd",
+                      "particlesOb031.xsd",
+                      "particlesOb030.xsd",
+                      "particlesOb029.xsd",
+                      "particlesOb028.xsd",
+                      "particlesOb027.xsd",
+                      "particlesOb026.xsd",
+                      "particlesOb025.xsd",
+                      "particlesOb024.xsd",
+                      "particlesOb023.xsd",
+                      "particlesOb021.xsd",
+                      "particlesOb020.xsd",
+                      "particlesOb019.xsd",
+                      "particlesOb017.xsd",
+                      "particlesOb016.xsd",
+                      "particlesOb014.xsd",
+                      "particlesOb011.xsd",
+                      "particlesOb010.xsd",
+                      "particlesOa015.xsd",
+                      "particlesOa010.xsd",
+                      "particlesOa009.xsd",
+                      "particlesOa008.xsd",
+                      "particlesOa007.xsd",
+                      "particlesOa005.xsd",
+                      "particlesOa004.xsd",
+                      "particlesOa002.xsd",
+                      "particlesK008.xsd",
+                      "particlesK005.xsd",
+                      "particlesK003.xsd",
+                      "particlesK002.xsd",
+                      "particlesK001.xsd",
+                      "particlesV015.xml",
+                      "particlesV014.xml",
+                      "particlesV013.xml",
+                      "particlesV012.xml",
+                      "particlesV011.xml",
+                      "particlesV010.xml",
+                      "particlesV009.xml",
+                      "particlesV008.xml",
+                      "particlesV007.xml",
+                      "particlesV006.xml",
+                      "particlesV003.xml",
+                      "particlesU007.xml",
+                      "particlesU005.xml",
+                      "particlesU004.xml",
+                      "particlesU003.xml",
+                      "particlesQ022.xml",
+                      "particlesQ020.xml",
+                      "particlesQ019.xml",
+                      "particlesQ017.xml",
+                      "particlesQ016.xml",
+                      "particlesT003.xml",
+                      "particlesR022.xml",
+                      "particlesR019.xml",
+                      "particlesR016.xml",
+                      "particlesR011.xml",
+                      "particlesS011.xml",
+                      "particlesS007.xml",
+                      "particlesS004.xml",
+                      "particlesS003.xml",
+                      "particlesS001.xml",
+                      "particlesOb055.xml",
+                      "particlesOb042.xml",
+                      "particlesOb007.xml",
+                      "particlesOb003.xml",
+                      "particlesOa014.xml",
+                      "particlesOa013.xml",
+                      "particlesOa012.xml",
+                      "particlesOa011.xml",
+                      "particlesK008.xml",
+                      "particlesK005.xml",
+                      "particlesK003.xml",
+                      "particlesK002.xml",
+                      "particlesK001.xml"],[]}}.
+{stABCDE,{["stE016.xsd",
+           "stE015.xsd",
+           "stE014.xsd",
+           "stE012.xsd",
+           "stE008.xsd",
+           "stE005.xsd",
+           "stE004.xsd",
+           "stE003.xsd",
+           "stE002.xsd",
+           "stD020.xsd",
+           "stD018.xsd",
+           "stD017.xsd",
+           "stD016.xsd",
+           "stD010.xsd",
+           "stD009.xsd",
+           "stD005.xsd",
+           "stD004.xsd",
+           "stD003.xsd",
+           "stD002.xsd",
+           "stC032.xsd",
+           "stC029.xsd",
+           "stC009.xsd",
+           "stC008.xsd",
+           "stC007.xsd",
+           "stC006.xsd",
+           "stC003.xsd",
+           "stB024.xsd",
+           "stB023.xsd",
+           "stB022.xsd",
+           "stB021.xsd",
+           "stB020.xsd",
+           "stB019.xsd",
+           "stB018.xsd",
+           "stB017.xsd",
+           "stB016.xsd",
+           "stB014.xsd",
+           "stB013.xsd",
+           "stB010.xsd",
+           "stB009.xsd",
+           "stB004.xsd",
+           "stB002.xsd",
+           "stB001.xsd",
+           "stA017.xsd",
+           "stA015.xsd",
+           "stA014.xsd",
+           "stA013.xsd",
+           "stA012.xsd",
+           "stA011.xsd",
+           "stA010.xsd",
+           "stA009.xsd",
+           "stA008.xsd",
+           "stA005.xsd",
+           "stA004.xsd",
+           "stA003.xsd",
+           "stA002.xsd"],[]}}.
+{stFGH,{["stH002.xsd",
+         "stH001.xsd",
+         "stG005.xsd",
+         "stG004.xsd",
+         "stF037.xsd",
+         "stF035.xsd",
+         "stF033.xsd",
+         "stF031.xsd",
+         "stF027.xsd",
+         "stF026.xsd",
+         "stF025.xsd",
+         "stF024.xsd",
+         "stF020.xsd",
+         "stF019.xsd",
+         "stF018.xsd",
+         "stF012.xsd",
+         "stF011.xsd",
+         "stF010.xsd",
+         "stF009.xsd",
+         "stH007.xml",
+         "stH005.xml",
+         "stH003.xml",
+         "stH001.xml",
+         "stG012.xml",
+         "stG010.xml",
+         "stG008.xml",
+         "stG006.xml",
+         "stG004.xml",
+         "stG002.xml",
+         "stG001.xml"],[]}}.
+{stIJK,{["stK014.xsd",
+         "stK013.xsd",
+         "stK012.xsd",
+         "stK011.xsd",
+         "stK007.xsd",
+         "stK006.xsd",
+         "stK005.xsd",
+         "stJ019.xsd",
+         "stJ013.xsd",
+         "stJ012.xsd",
+         "stJ011.xsd",
+         "stJ010.xsd",
+         "stJ002.xsd",
+         "stI005.xsd"],[]}}.
+{stZ,{["stZ003.xsd","stZ002.xsd"],[]}}.
+{wildABCDEF,{["wildF018.xsd",
+              "wildF016.xsd",
+              "wildF015.xsd",
+              "wildF014.xsd",
+              "wildF013.xsd",
+              "wildF012.xsd",
+              "wildF010.xsd",
+              "wildF009.xsd",
+              "wildF008.xsd",
+              "wildF007.xsd",
+              "wildF006.xsd",
+              "wildE002.xsd",
+              "wildD079.xsd",
+              "wildD078.xsd",
+              "wildD077.xsd",
+              "wildD076.xsd",
+              "wildD075.xsd",
+              "wildD071.xsd",
+              "wildC067.xsd",
+              "wildC066.xsd",
+              "wildC058.xsd",
+              "wildC057.xsd",
+              "wildC056.xsd",
+              "wildC055.xsd",
+              "wildC053.xsd",
+              "wildC052.xsd",
+              "wildC051.xsd",
+              "wildC050.xsd",
+              "wildC049.xsd",
+              "wildC036.xsd",
+              "wildC035.xsd",
+              "wildB028.xsd",
+              "wildB027.xsd",
+              "wildB023.xsd",
+              "wildB020.xsd",
+              "wildB015.xsd",
+              "wildA008.xsd",
+              "wildA007.xsd",
+              "wildA006.xsd",
+              "wildA005.xsd",
+              "wildA004.xsd",
+              "wildA003.xsd"],[]}}.
+{wildGHI,{["wildI013.xsd",
+           "wildI010.xsd",
+           "wildI009.xsd",
+           "wildI008.xsd",
+           "wildI003.xsd",
+           "wildI002.xsd",
+           "wildI007.xml",
+           "wildH006.xml",
+           "wildH002.xml",
+           "wildG039.xml",
+           "wildG037.xml",
+           "wildG036.xml",
+           "wildG032.xml",
+           "wildG029.xml",
+           "wildG028.xml",
+           "wildG024.xml",
+           "wildG022.xml",
+           "wildG020.xml",
+           "wildG019.xml",
+           "wildG014.xml",
+           "wildG013.xml",
+           "wildG011.xml",
+           "wildG010.xml",
+           "wildG009.xml",
+           "wildG008.xml",
+           "wildG005.xml",
+           "wildG004.xml",
+           "wildG002.xml"],[]}}.
+{wildJKLMNQOP,{["wildQ004.xsd",
+                "wildQ003.xsd",
+                "wildQ002.xsd",
+                "wildQ001.xsd",
+                "wildN018.xsd",
+                "wildN016.xsd",
+                "wildN015.xsd",
+                "wildN014.xsd",
+                "wildN013.xsd",
+                "wildN012.xsd",
+                "wildN010.xsd",
+                "wildN009.xsd",
+                "wildN008.xsd",
+                "wildN007.xsd",
+                "wildN006.xsd",
+                "wildN001.xsd",
+                "wildM002.xsd",
+                "wildL009.xsd",
+                "wildL008.xsd",
+                "wildL007.xsd",
+                "wildL006.xsd",
+                "wildL005.xsd",
+                "wildL001.xsd",
+                "wildK038.xsd",
+                "wildK029.xsd",
+                "wildK028.xsd",
+                "wildK027.xsd",
+                "wildK026.xsd",
+                "wildK024.xsd",
+                "wildK023.xsd",
+                "wildK022.xsd",
+                "wildK021.xsd",
+                "wildK020.xsd",
+                "wildK007.xsd",
+                "wildK006.xsd",
+                "wildK002.xsd",
+                "wildJ008.xsd",
+                "wildJ007.xsd",
+                "wildJ006.xsd",
+                "wildJ005.xsd",
+                "wildJ004.xsd",
+                "wildJ003.xsd",
+                "wildP006.xml",
+                "wildP005.xml",
+                "wildP004.xml",
+                "wildP003.xml",
+                "wildP001.xml",
+                "wildO040.xml",
+                "wildO038.xml",
+                "wildO037.xml",
+                "wildO033.xml",
+                "wildO031.xml",
+                "wildO030.xml",
+                "wildO027.xml",
+                "wildO026.xml",
+                "wildO023.xml",
+                "wildO021.xml",
+                "wildO020.xml",
+                "wildO018.xml",
+                "wildO013.xml",
+                "wildO012.xml",
+                "wildO010.xml",
+                "wildO007.xml",
+                "wildO006.xml",
+                "wildO004.xml"],[]}}.
diff --git a/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/msxsdtest.tar.gz b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/msxsdtest.tar.gz
new file mode 100644
index 0000000000..05f9dfe08f
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/msxsdtest.tar.gz
diff --git a/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/w3c-copyright-19990405.html b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/w3c-copyright-19990405.html
new file mode 100644
index 0000000000..5c89ffd95e
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/w3c-copyright-19990405.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+
+
+  <meta http-equiv="Content-Type" content="text/html"><title>DOCUMENT NOTICE</title>
+  
+  <link rel="stylesheet" type="text/css" href="copyright-documents-19990405_files/base.css"></head><body bgcolor="#ffffff" text="#000000">
+<h1>W3C<sup>�</sup> DOCUMENT NOTICE AND LICENSE</h1>
+
+<h3>Copyright � 1994-2002 <a href="http://www.w3.org/">World Wide Web
+Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of
+Technology</a>, <a href="http://www.inria.fr/">Institut National de Recherche
+en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio
+University</a>). All Rights Reserved.<br>
+http://www.w3.org/Consortium/Legal/</h3>
+
+<p>Public documents on the W3C site are provided by the copyright holders
+under the following license. The software or Document Type Definitions (DTDs)
+associated with W3C specifications are governed by the <a href="http://www.w3.org/Consortium/Legal/copyright-software.html"> Software
+Notice</a>. By using and/or copying this document, or the W3C document from
+which this statement is linked, you (the licensee) agree that you have read,
+understood, and will comply with the following terms and conditions:</p>
+
+<p>Permission to use, copy, and distribute the contents of this document, or
+the W3C document from which this statement is linked, in any medium for any
+purpose and without fee or royalty is hereby granted, provided that you
+include the following on <i>ALL</i> copies of the document, or portions
+thereof, that you use:</p>
+<ol>
+  <li>A link or URL to the original W3C document.</li>
+  <li>The pre-existing copyright notice of the original author, or if it
+    doesn't exist, a notice of the form: "Copyright � [$date-of-document] <a href="http://www.w3.org/">World Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of Technology</a>,
+    <a href="http://www.inria.fr/"> Institut National de Recherche en
+    Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio
+    University</a>). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but a
+    textual representation is permitted.)</li>
+  <li><em>If it exists</em>, the STATUS of the W3C document.</li>
+</ol>
+
+<p>When space permits, inclusion of the full text of this <b> NOTICE</b>
+should be provided. We request that authorship attribution be provided in any
+software, documents, or other items or products that you create pursuant to
+the implementation of the contents of this document, or any portion
+thereof.</p>
+
+<p>No right to create modifications or derivatives of W3C documents is
+granted pursuant to this license. However, if additional requirements
+(documented in the <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright FAQ</a>) are satisfied,
+the right to create modifications or derivatives is&nbsp;sometimes granted by the
+W3C to individuals complying with those requirements.</p>
+
+<p>THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
+REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE
+FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT
+INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
+
+<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
+PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.</p>
+
+<p>The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to this document or its contents without
+specific, written prior permission. Title to copyright in this document will
+at all times remain with copyright holders.</p>
+
+<p>----------------------------------------------------------------------------</p>
+
+<p>This formulation of W3C's notice and license became active on April 05
+1999 so as to account for the treatment of DTDs, schema's and bindings. See
+the <a href="http://www.w3.org/Consortium/Legal/copyright-documents-19990218.html"> older formulation</a> for
+the policy prior to this date. Please see our <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright FAQ</a> for common questions about using
+materials from our site, including specific terms and conditions for packages
+like libwww, Amaya, and Jigsaw. Other questions about this notice can be
+directed to <a href="mailto:[email protected]">[email protected]</a>.</p>
+<address>
+  <a href="http://w3.org/Help/Webmaster.html">webmaster</a><br>
+  (last updated by reagle on 1999/04/99.)
+</address>
+</body></html>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE.erl b/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE.erl
new file mode 100644
index 0000000000..daebf1393d
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE.erl
@@ -0,0 +1,15962 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2006-2010. 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%
+%%
+%%
+%%% Purpose : Test suite for the xmerl application
+
+%% Do NOT edit this file. It is generated by the generate_xsd_suite module
+%% For more info read the comments in the header of that file.
+
+-module('xmerl_xsd_NIST2002-01-16_SUITE').
+
+-compile(export_all).
+
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
+-include_lib("xmerl/include/xmerl_xsd.hrl").
+
+
+all() -> 
+    ['NISTSchema-anyURI', 'NISTSchema-base64Binary',
+     'NISTSchema-boolean', 'NISTSchema-byte',
+     'NISTSchema-date-', 'NISTSchema-dateTime',
+     'NISTSchema-decimal', 'NISTSchema-double',
+     'NISTSchema-duration', 'NISTSchema-float',
+     'NISTSchema-gDay', 'NISTSchema-gMonth-',
+     'NISTSchema-gMonthDay', 'NISTSchema-gYear-',
+     'NISTSchema-gYearMonth', 'NISTSchema-hexBinary',
+     'NISTSchema-ID', 'NISTSchema-int-',
+     'NISTSchema-integer', 'NISTSchema-language',
+     'NISTSchema-long', 'NISTSchema-Name',
+     'NISTSchema-NCName', 'NISTSchema-negativeInteger',
+     'NISTSchema-NMTOKEN', 'NISTSchema-nonNegativeInteger',
+     'NISTSchema-nonPositiveInteger',
+     'NISTSchema-normalizedString',
+     'NISTSchema-positiveInteger', 'NISTSchema-QName',
+     'NISTSchema-short', 'NISTSchema-string',
+     'NISTSchema-time', 'NISTSchema-token',
+     'NISTSchema-unsignedByte', 'NISTSchema-unsignedInt',
+     'NISTSchema-unsignedLong', 'NISTSchema-unsignedShort'].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+%% initialization before the test suite
+init_per_suite(Config) ->
+  Dog=test_server:timetrap({minutes,10}),
+  xmerl_xsd_lib:unpack(Config,nist),
+  {ok,LogFile} = xmerl_xsd_lib:create_error_log_file(Config,nist),
+  test_server:timetrap_cancel(Dog),
+  [{suite,nist},{xmerl_error_log,LogFile}|Config].
+
+end_per_suite(Config) ->
+  xmerl_xsd_lib:rmdir(Config,nist),
+  xmerl_xsd_lib:close_error_log_file(Config),
+  ok.
+
+%% initialization before each testcase
+init_per_testcase(TestCase,Config) ->
+  Dog=test_server:timetrap({minutes,3}),
+  [{testcase,TestCase},{watchdog, Dog}|Config].
+
+%% clean up after each testcase
+end_per_testcase(_Func,Config) ->
+  Dog=?config(watchdog, Config),
+  test_server:timetrap_cancel(Dog),
+  ok.
+
+%% Data type derived by restriction of anyURI by facets
+
+'NISTSchema-anyURI'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./NISTTestsAll/NISTSchema-anyURI-maxLength-1.xsd','./NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList44 = [ITRes43|ITResList43],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList49 = [ITRes48|ITResList48],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-1-2.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-1-3.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-1-4.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-1-5.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList54 = [ITRes53|ITResList53],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList59 = [ITRes58|ITResList58],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-anyURI-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-anyURI-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList26,ITResList129).
+
+%% Data type derived by restriction of base64binary by facets
+
+'NISTSchema-base64Binary'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-maxLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-1-2.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-1-3.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-1-4.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-1-5.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList64 = [ITRes63|ITResList63],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-base64Binary-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList129 = [ITRes128|ITResList128],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-base64Binary-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList26,ITResList130).
+
+%% Data type derived by restriction of boolean by facets
+
+'NISTSchema-boolean'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-boolean-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-boolean-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-boolean-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-boolean-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-boolean-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-boolean-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-boolean-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-boolean-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-boolean-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-boolean-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList5 = [ITRes4|ITResList4],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-boolean-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-boolean-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-boolean-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-boolean-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList5,ITResList9).
+
+%% Data type derived by restriction of byte by facets
+
+'NISTSchema-byte'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-byte-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-byte-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList35,ITResList159).
+
+%% Data type derived by restriction of date by facets
+
+'NISTSchema-date-'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-date-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-date-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList31,ITResList139).
+
+%% Data type derived by restriction of dateTime by facets
+
+'NISTSchema-dateTime'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-dateTime-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-dateTime-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList31,ITResList139).
+
+%% Data type derived by restriction of decimal by facets
+
+'NISTSchema-decimal'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-fractionDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-fractionDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-fractionDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-fractionDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-fractionDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  ?line {STRes37,S37} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList38 = [STRes37|STResList37],
+  ?line ITRes169 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S37),
+  ITResList170 = [ITRes169|ITResList169],
+  ?line ITRes170 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S37),
+  ITResList171 = [ITRes170|ITResList170],
+  ?line ITRes171 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S37),
+  ITResList172 = [ITRes171|ITResList171],
+  ?line ITRes172 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S37),
+  ITResList173 = [ITRes172|ITResList172],
+  ?line ITRes173 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S37),
+  ITResList174 = [ITRes173|ITResList173],
+
+
+  ?line {STRes38,S38} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList39 = [STRes38|STResList38],
+  ?line ITRes174 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S38),
+  ITResList175 = [ITRes174|ITResList174],
+  ?line ITRes175 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S38),
+  ITResList176 = [ITRes175|ITResList175],
+  ?line ITRes176 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S38),
+  ITResList177 = [ITRes176|ITResList176],
+  ?line ITRes177 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S38),
+  ITResList178 = [ITRes177|ITResList177],
+  ?line ITRes178 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S38),
+  ITResList179 = [ITRes178|ITResList178],
+
+
+  ?line {STRes39,S39} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList40 = [STRes39|STResList39],
+  ?line ITRes179 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S39),
+  ITResList180 = [ITRes179|ITResList179],
+  ?line ITRes180 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S39),
+  ITResList181 = [ITRes180|ITResList180],
+  ?line ITRes181 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S39),
+  ITResList182 = [ITRes181|ITResList181],
+  ?line ITRes182 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S39),
+  ITResList183 = [ITRes182|ITResList182],
+  ?line ITRes183 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S39),
+  ITResList184 = [ITRes183|ITResList183],
+
+
+  ?line {STRes40,S40} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-decimal-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList41 = [STRes40|STResList40],
+  ?line ITRes184 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S40),
+  ITResList185 = [ITRes184|ITResList184],
+  ?line ITRes185 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S40),
+  ITResList186 = [ITRes185|ITResList185],
+  ?line ITRes186 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S40),
+  ITResList187 = [ITRes186|ITResList186],
+  ?line ITRes187 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S40),
+  ITResList188 = [ITRes187|ITResList187],
+  ?line ITRes188 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-decimal-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S40),
+  ITResList189 = [ITRes188|ITResList188],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList41,ITResList189).
+
+%% Data type derived by restriction of double by facets
+
+'NISTSchema-double'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-double-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-double-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList31,ITResList139).
+
+%% Data type derived by restriction of duration by facets
+
+'NISTSchema-duration'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-duration-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-duration-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList31,ITResList139).
+
+%% Data type derived by restriction of float by facets
+
+'NISTSchema-float'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-float-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-float-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList31,ITResList139).
+
+%% Data type derived by restriction of gDay by facets
+
+'NISTSchema-gDay'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList129 = [ITRes128|ITResList128],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gDay-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList134 = [ITRes133|ITResList133],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gDay-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList31,ITResList135).
+
+%% Data type derived by restriction of gMonth by facets
+
+'NISTSchema-gMonth-'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonth-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonth-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList31,ITResList139).
+
+%% Data type derived by restriction of gMonthDay by facets
+
+'NISTSchema-gMonthDay'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gMonthDay-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gMonthDay-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList31,ITResList139).
+
+%% Data type derived by restriction of gYear by facets
+
+'NISTSchema-gYear-'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList129 = [ITRes128|ITResList128],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYear-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList134 = [ITRes133|ITResList133],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYear-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList31,ITResList135).
+
+%% Data type derived by restriction of gYearMonth by facets
+
+'NISTSchema-gYearMonth'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-gYearMonth-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-gYearMonth-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList31,ITResList139).
+
+%% Data type derived by restriction of hexBinary by facets
+
+'NISTSchema-hexBinary'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-maxLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-1-2.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-1-3.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-1-4.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-1-5.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList64 = [ITRes63|ITResList63],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-hexBinary-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList129 = [ITRes128|ITResList128],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-hexBinary-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList26,ITResList130).
+
+%% Data type derived by restriction of ID by facets
+
+'NISTSchema-ID'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-maxLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-1-2.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-1-3.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-1-4.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-1-5.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList64 = [ITRes63|ITResList63],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-ID-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList129 = [ITRes128|ITResList128],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-ID-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList26,ITResList130).
+
+%% Data type derived by restriction of int by facets
+
+'NISTSchema-int-'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-int-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-int-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList37,ITResList169).
+
+%% Data type derived by restriction of integer by facets
+
+'NISTSchema-integer'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-integer-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-integer-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList37,ITResList169).
+
+%% Data type derived by restriction of language by facets
+
+'NISTSchema-language'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-maxLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList10 = [ITRes9|ITResList9],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList15 = [ITRes14|ITResList14],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList20 = [ITRes19|ITResList19],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-1-2.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-1-3.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-1-4.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-1-5.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList51 = [ITRes50|ITResList50],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList56 = [ITRes55|ITResList55],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList61 = [ITRes60|ITResList60],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList64 = [ITRes63|ITResList63],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList66 = [ITRes65|ITResList65],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList71 = [ITRes70|ITResList70],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList76 = [ITRes75|ITResList75],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList81 = [ITRes80|ITResList80],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList86 = [ITRes85|ITResList85],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList91 = [ITRes90|ITResList90],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList96 = [ITRes95|ITResList95],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList101 = [ITRes100|ITResList100],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList106 = [ITRes105|ITResList105],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList111 = [ITRes110|ITResList110],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList116 = [ITRes115|ITResList115],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList121 = [ITRes120|ITResList120],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-language-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-language-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList126 = [ITRes125|ITResList125],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList26,ITResList126).
+
+%% Data type derived by restriction of long by facets
+
+'NISTSchema-long'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-long-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-long-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList37,ITResList169).
+
+%% Data type derived by restriction of Name by facets
+
+'NISTSchema-Name'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-maxLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-1-2.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-1-3.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-1-4.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-1-5.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList64 = [ITRes63|ITResList63],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-Name-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList129 = [ITRes128|ITResList128],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-Name-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList26,ITResList130).
+
+%% Data type derived by restriction of NCName by facets
+
+'NISTSchema-NCName'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-maxLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-1-2.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-1-3.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-1-4.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-1-5.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList64 = [ITRes63|ITResList63],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NCName-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList129 = [ITRes128|ITResList128],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NCName-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList26,ITResList130).
+
+%% Data type derived by restriction of negativeInteger by facets
+
+'NISTSchema-negativeInteger'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-negativeInteger-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-negativeInteger-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList37,ITResList169).
+
+%% Data type derived by restriction of NMTOKEN by facets
+
+'NISTSchema-NMTOKEN'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-maxLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-1-2.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-1-3.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-1-4.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-1-5.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList64 = [ITRes63|ITResList63],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList118 = [ITRes117|ITResList117],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList123 = [ITRes122|ITResList122],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-NMTOKEN-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-NMTOKEN-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList128 = [ITRes127|ITResList127],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList26,ITResList128).
+
+%% Data type derived by restriction of nonNegativeInteger by facets
+
+'NISTSchema-nonNegativeInteger'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonNegativeInteger-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonNegativeInteger-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList37,ITResList169).
+
+%% Data type derived by restriction of nonPositiveInteger by facets
+
+'NISTSchema-nonPositiveInteger'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-nonPositiveInteger-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-nonPositiveInteger-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList37,ITResList169).
+
+%% Data type derived by restriction of normalizedString by facets
+
+'NISTSchema-normalizedString'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-maxLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList5 = [ITRes4|ITResList4],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList10 = [ITRes9|ITResList9],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList15 = [ITRes14|ITResList14],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList20 = [ITRes19|ITResList19],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList64 = [ITRes63|ITResList63],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList87 = [ITRes86|ITResList86],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList92 = [ITRes91|ITResList91],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList97 = [ITRes96|ITResList96],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList102 = [ITRes101|ITResList101],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList107 = [ITRes106|ITResList106],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList112 = [ITRes111|ITResList111],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList117 = [ITRes116|ITResList116],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList122 = [ITRes121|ITResList121],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-normalizedString-whiteSpace-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-whiteSpace-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-whiteSpace-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-whiteSpace-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-whiteSpace-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-normalizedString-whiteSpace-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList127 = [ITRes126|ITResList126],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList27,ITResList127).
+
+%% Data type derived by restriction of positiveInteger by facets
+
+'NISTSchema-positiveInteger'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-positiveInteger-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-positiveInteger-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList37,ITResList169).
+
+%% Data type derived by restriction of QName by facets
+
+'NISTSchema-QName'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-maxLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList25 = [ITRes24|ITResList24],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList30 = [ITRes29|ITResList29],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList35 = [ITRes34|ITResList34],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList40 = [ITRes39|ITResList39],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList45 = [ITRes44|ITResList44],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList50 = [ITRes49|ITResList49],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-1-2.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-1-3.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-1-4.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-1-5.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList55 = [ITRes54|ITResList54],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList60 = [ITRes59|ITResList59],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList64 = [ITRes63|ITResList63],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList65 = [ITRes64|ITResList64],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList70 = [ITRes69|ITResList69],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList75 = [ITRes74|ITResList74],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList80 = [ITRes79|ITResList79],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList85 = [ITRes84|ITResList84],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList90 = [ITRes89|ITResList89],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList95 = [ITRes94|ITResList94],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList100 = [ITRes99|ITResList99],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList105 = [ITRes104|ITResList104],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList110 = [ITRes109|ITResList109],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList115 = [ITRes114|ITResList114],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList120 = [ITRes119|ITResList119],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList125 = [ITRes124|ITResList124],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-QName-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList129 = [ITRes128|ITResList128],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-QName-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList130 = [ITRes129|ITResList129],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList26,ITResList130).
+
+%% Data type derived by restriction of short by facets
+
+'NISTSchema-short'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-short-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-short-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList37,ITResList169).
+
+%% Data type derived by restriction of string by facets
+
+'NISTSchema-string'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-maxLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList5 = [ITRes4|ITResList4],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList10 = [ITRes9|ITResList9],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList15 = [ITRes14|ITResList14],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList20 = [ITRes19|ITResList19],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList64 = [ITRes63|ITResList63],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList87 = [ITRes86|ITResList86],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList92 = [ITRes91|ITResList91],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList97 = [ITRes96|ITResList96],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList102 = [ITRes101|ITResList101],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList107 = [ITRes106|ITResList106],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList112 = [ITRes111|ITResList111],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList117 = [ITRes116|ITResList116],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList122 = [ITRes121|ITResList121],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-whiteSpace-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList124 = [ITRes123|ITResList123],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList127 = [ITRes126|ITResList126],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-string-whiteSpace-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList129 = [ITRes128|ITResList128],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-string-whiteSpace-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList132 = [ITRes131|ITResList131],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList28,ITResList132).
+
+%% Data type derived by restriction of time by facets
+
+'NISTSchema-time'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-time-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-time-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList31,ITResList139).
+
+%% Data type derived by restriction of token by facets
+
+'NISTSchema-token'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-maxLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-maxLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList5 = [ITRes4|ITResList4],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-maxLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList10 = [ITRes9|ITResList9],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-maxLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList15 = [ITRes14|ITResList14],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-maxLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-5-2.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-5-3.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-5-4.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList20 = [ITRes19|ITResList19],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-maxLength-5-5.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-minLength-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-minLength-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-minLength-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-minLength-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-minLength-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-5-2.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList43 = [ITRes42|ITResList42],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-5-3.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-5-4.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-minLength-5-5.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList46 = [ITRes45|ITResList45],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-length-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList47 = [ITRes46|ITResList46],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-length-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList52 = [ITRes51|ITResList51],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-length-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList57 = [ITRes56|ITResList56],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-length-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList62 = [ITRes61|ITResList61],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-length-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList64 = [ITRes63|ITResList63],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-length-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList67 = [ITRes66|ITResList66],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList69 = [ITRes68|ITResList68],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList72 = [ITRes71|ITResList71],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList74 = [ITRes73|ITResList73],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList77 = [ITRes76|ITResList76],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList79 = [ITRes78|ITResList78],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList82 = [ITRes81|ITResList81],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList84 = [ITRes83|ITResList83],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList87 = [ITRes86|ITResList86],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList89 = [ITRes88|ITResList88],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList92 = [ITRes91|ITResList91],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList94 = [ITRes93|ITResList93],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList97 = [ITRes96|ITResList96],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList99 = [ITRes98|ITResList98],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList102 = [ITRes101|ITResList101],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList104 = [ITRes103|ITResList103],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList107 = [ITRes106|ITResList106],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList109 = [ITRes108|ITResList108],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList112 = [ITRes111|ITResList111],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList114 = [ITRes113|ITResList113],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList117 = [ITRes116|ITResList116],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-token-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList119 = [ITRes118|ITResList118],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-token-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList122 = [ITRes121|ITResList121],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList26,ITResList122).
+
+%% Data type derived by restriction of unsignedByte by facets
+
+'NISTSchema-unsignedByte'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedByte-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedByte-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList33,ITResList149).
+
+%% Data type derived by restriction of unsignedInt by facets
+
+'NISTSchema-unsignedInt'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedInt-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedInt-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList37,ITResList169).
+
+%% Data type derived by restriction of unsignedLong by facets
+
+'NISTSchema-unsignedLong'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedLong-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedLong-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList37,ITResList169).
+
+%% Data type derived by restriction of unsignedShort by facets
+
+'NISTSchema-unsignedShort'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-minExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  ?line {STRes1,S1} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-minExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList2 = [STRes1|STResList1],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S1),
+  ITResList10 = [ITRes9|ITResList9],
+
+
+  ?line {STRes2,S2} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-minExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList3 = [STRes2|STResList2],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S2),
+  ITResList15 = [ITRes14|ITResList14],
+
+
+  ?line {STRes3,S3} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-minExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList4 = [STRes3|STResList3],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S3),
+  ITResList20 = [ITRes19|ITResList19],
+
+
+  ?line {STRes4,S4} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-minExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList5 = [STRes4|STResList4],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S4),
+  ITResList21 = [ITRes20|ITResList20],
+
+
+  ?line {STRes5,S5} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-minInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList6 = [STRes5|STResList5],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-1-2.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-1-3.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-1-4.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-1-5.xml','./nisttest/NISTTestsAll',valid,S5),
+  ITResList26 = [ITRes25|ITResList25],
+
+
+  ?line {STRes6,S6} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-minInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList7 = [STRes6|STResList6],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S6),
+  ITResList31 = [ITRes30|ITResList30],
+
+
+  ?line {STRes7,S7} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-minInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList8 = [STRes7|STResList7],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList34 = [ITRes33|ITResList33],
+  ?line ITRes34 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList35 = [ITRes34|ITResList34],
+  ?line ITRes35 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S7),
+  ITResList36 = [ITRes35|ITResList35],
+
+
+  ?line {STRes8,S8} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-minInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList9 = [STRes8|STResList8],
+  ?line ITRes36 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList37 = [ITRes36|ITResList36],
+  ?line ITRes37 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList38 = [ITRes37|ITResList37],
+  ?line ITRes38 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList39 = [ITRes38|ITResList38],
+  ?line ITRes39 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList40 = [ITRes39|ITResList39],
+  ?line ITRes40 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S8),
+  ITResList41 = [ITRes40|ITResList40],
+
+
+  ?line {STRes9,S9} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-minInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList10 = [STRes9|STResList9],
+  ?line ITRes41 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-minInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S9),
+  ITResList42 = [ITRes41|ITResList41],
+
+
+  ?line {STRes10,S10} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-maxExclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList11 = [STRes10|STResList10],
+  ?line ITRes42 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S10),
+  ITResList43 = [ITRes42|ITResList42],
+
+
+  ?line {STRes11,S11} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-maxExclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList12 = [STRes11|STResList11],
+  ?line ITRes43 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList44 = [ITRes43|ITResList43],
+  ?line ITRes44 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList45 = [ITRes44|ITResList44],
+  ?line ITRes45 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList46 = [ITRes45|ITResList45],
+  ?line ITRes46 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList47 = [ITRes46|ITResList46],
+  ?line ITRes47 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S11),
+  ITResList48 = [ITRes47|ITResList47],
+
+
+  ?line {STRes12,S12} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-maxExclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList13 = [STRes12|STResList12],
+  ?line ITRes48 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList49 = [ITRes48|ITResList48],
+  ?line ITRes49 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList50 = [ITRes49|ITResList49],
+  ?line ITRes50 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList51 = [ITRes50|ITResList50],
+  ?line ITRes51 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList52 = [ITRes51|ITResList51],
+  ?line ITRes52 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S12),
+  ITResList53 = [ITRes52|ITResList52],
+
+
+  ?line {STRes13,S13} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-maxExclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList14 = [STRes13|STResList13],
+  ?line ITRes53 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList54 = [ITRes53|ITResList53],
+  ?line ITRes54 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList55 = [ITRes54|ITResList54],
+  ?line ITRes55 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList56 = [ITRes55|ITResList55],
+  ?line ITRes56 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList57 = [ITRes56|ITResList56],
+  ?line ITRes57 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S13),
+  ITResList58 = [ITRes57|ITResList57],
+
+
+  ?line {STRes14,S14} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-maxExclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList15 = [STRes14|STResList14],
+  ?line ITRes58 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList59 = [ITRes58|ITResList58],
+  ?line ITRes59 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList60 = [ITRes59|ITResList59],
+  ?line ITRes60 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList61 = [ITRes60|ITResList60],
+  ?line ITRes61 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList62 = [ITRes61|ITResList61],
+  ?line ITRes62 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxExclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S14),
+  ITResList63 = [ITRes62|ITResList62],
+
+
+  ?line {STRes15,S15} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-maxInclusive-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList16 = [STRes15|STResList15],
+  ?line ITRes63 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-1-1.xml','./nisttest/NISTTestsAll',valid,S15),
+  ITResList64 = [ITRes63|ITResList63],
+
+
+  ?line {STRes16,S16} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-maxInclusive-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList17 = [STRes16|STResList16],
+  ?line ITRes64 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-2-1.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList65 = [ITRes64|ITResList64],
+  ?line ITRes65 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-2-2.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList66 = [ITRes65|ITResList65],
+  ?line ITRes66 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-2-3.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList67 = [ITRes66|ITResList66],
+  ?line ITRes67 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-2-4.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList68 = [ITRes67|ITResList67],
+  ?line ITRes68 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-2-5.xml','./nisttest/NISTTestsAll',valid,S16),
+  ITResList69 = [ITRes68|ITResList68],
+
+
+  ?line {STRes17,S17} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-maxInclusive-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList18 = [STRes17|STResList17],
+  ?line ITRes69 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-3-1.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList70 = [ITRes69|ITResList69],
+  ?line ITRes70 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-3-2.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList71 = [ITRes70|ITResList70],
+  ?line ITRes71 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-3-3.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList72 = [ITRes71|ITResList71],
+  ?line ITRes72 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-3-4.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList73 = [ITRes72|ITResList72],
+  ?line ITRes73 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-3-5.xml','./nisttest/NISTTestsAll',valid,S17),
+  ITResList74 = [ITRes73|ITResList73],
+
+
+  ?line {STRes18,S18} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-maxInclusive-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList19 = [STRes18|STResList18],
+  ?line ITRes74 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-4-1.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList75 = [ITRes74|ITResList74],
+  ?line ITRes75 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-4-2.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList76 = [ITRes75|ITResList75],
+  ?line ITRes76 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-4-3.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList77 = [ITRes76|ITResList76],
+  ?line ITRes77 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-4-4.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList78 = [ITRes77|ITResList77],
+  ?line ITRes78 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-4-5.xml','./nisttest/NISTTestsAll',valid,S18),
+  ITResList79 = [ITRes78|ITResList78],
+
+
+  ?line {STRes19,S19} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-maxInclusive-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList20 = [STRes19|STResList19],
+  ?line ITRes79 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-5-1.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList80 = [ITRes79|ITResList79],
+  ?line ITRes80 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-5-2.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList81 = [ITRes80|ITResList80],
+  ?line ITRes81 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-5-3.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList82 = [ITRes81|ITResList81],
+  ?line ITRes82 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-5-4.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList83 = [ITRes82|ITResList82],
+  ?line ITRes83 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-maxInclusive-5-5.xml','./nisttest/NISTTestsAll',valid,S19),
+  ITResList84 = [ITRes83|ITResList83],
+
+
+  ?line {STRes20,S20} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-fractionDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList21 = [STRes20|STResList20],
+  ?line ITRes84 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-fractionDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList85 = [ITRes84|ITResList84],
+  ?line ITRes85 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-fractionDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList86 = [ITRes85|ITResList85],
+  ?line ITRes86 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-fractionDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList87 = [ITRes86|ITResList86],
+  ?line ITRes87 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-fractionDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList88 = [ITRes87|ITResList87],
+  ?line ITRes88 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-fractionDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S20),
+  ITResList89 = [ITRes88|ITResList88],
+
+
+  ?line {STRes21,S21} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-totalDigits-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList22 = [STRes21|STResList21],
+  ?line ITRes89 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-1-1.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList90 = [ITRes89|ITResList89],
+  ?line ITRes90 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-1-2.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList91 = [ITRes90|ITResList90],
+  ?line ITRes91 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-1-3.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList92 = [ITRes91|ITResList91],
+  ?line ITRes92 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-1-4.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList93 = [ITRes92|ITResList92],
+  ?line ITRes93 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-1-5.xml','./nisttest/NISTTestsAll',valid,S21),
+  ITResList94 = [ITRes93|ITResList93],
+
+
+  ?line {STRes22,S22} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-totalDigits-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList23 = [STRes22|STResList22],
+  ?line ITRes94 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-2-1.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList95 = [ITRes94|ITResList94],
+  ?line ITRes95 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-2-2.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList96 = [ITRes95|ITResList95],
+  ?line ITRes96 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-2-3.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList97 = [ITRes96|ITResList96],
+  ?line ITRes97 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-2-4.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList98 = [ITRes97|ITResList97],
+  ?line ITRes98 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-2-5.xml','./nisttest/NISTTestsAll',valid,S22),
+  ITResList99 = [ITRes98|ITResList98],
+
+
+  ?line {STRes23,S23} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-totalDigits-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList24 = [STRes23|STResList23],
+  ?line ITRes99 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-3-1.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList100 = [ITRes99|ITResList99],
+  ?line ITRes100 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-3-2.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList101 = [ITRes100|ITResList100],
+  ?line ITRes101 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-3-3.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList102 = [ITRes101|ITResList101],
+  ?line ITRes102 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-3-4.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList103 = [ITRes102|ITResList102],
+  ?line ITRes103 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-3-5.xml','./nisttest/NISTTestsAll',valid,S23),
+  ITResList104 = [ITRes103|ITResList103],
+
+
+  ?line {STRes24,S24} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-totalDigits-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList25 = [STRes24|STResList24],
+  ?line ITRes104 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-4-1.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList105 = [ITRes104|ITResList104],
+  ?line ITRes105 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-4-2.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList106 = [ITRes105|ITResList105],
+  ?line ITRes106 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-4-3.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList107 = [ITRes106|ITResList106],
+  ?line ITRes107 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-4-4.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList108 = [ITRes107|ITResList107],
+  ?line ITRes108 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-4-5.xml','./nisttest/NISTTestsAll',valid,S24),
+  ITResList109 = [ITRes108|ITResList108],
+
+
+  ?line {STRes25,S25} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-totalDigits-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList26 = [STRes25|STResList25],
+  ?line ITRes109 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-5-1.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList110 = [ITRes109|ITResList109],
+  ?line ITRes110 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-5-2.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList111 = [ITRes110|ITResList110],
+  ?line ITRes111 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-5-3.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList112 = [ITRes111|ITResList111],
+  ?line ITRes112 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-5-4.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList113 = [ITRes112|ITResList112],
+  ?line ITRes113 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-totalDigits-5-5.xml','./nisttest/NISTTestsAll',valid,S25),
+  ITResList114 = [ITRes113|ITResList113],
+
+
+  ?line {STRes26,S26} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-pattern-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList27 = [STRes26|STResList26],
+  ?line ITRes114 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-1-1.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList115 = [ITRes114|ITResList114],
+  ?line ITRes115 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-1-2.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList116 = [ITRes115|ITResList115],
+  ?line ITRes116 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-1-3.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList117 = [ITRes116|ITResList116],
+  ?line ITRes117 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-1-4.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList118 = [ITRes117|ITResList117],
+  ?line ITRes118 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-1-5.xml','./nisttest/NISTTestsAll',valid,S26),
+  ITResList119 = [ITRes118|ITResList118],
+
+
+  ?line {STRes27,S27} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-pattern-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList28 = [STRes27|STResList27],
+  ?line ITRes119 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-2-1.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList120 = [ITRes119|ITResList119],
+  ?line ITRes120 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-2-2.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList121 = [ITRes120|ITResList120],
+  ?line ITRes121 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-2-3.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList122 = [ITRes121|ITResList121],
+  ?line ITRes122 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-2-4.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList123 = [ITRes122|ITResList122],
+  ?line ITRes123 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-2-5.xml','./nisttest/NISTTestsAll',valid,S27),
+  ITResList124 = [ITRes123|ITResList123],
+
+
+  ?line {STRes28,S28} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-pattern-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList29 = [STRes28|STResList28],
+  ?line ITRes124 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-3-1.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList125 = [ITRes124|ITResList124],
+  ?line ITRes125 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-3-2.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList126 = [ITRes125|ITResList125],
+  ?line ITRes126 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-3-3.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList127 = [ITRes126|ITResList126],
+  ?line ITRes127 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-3-4.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList128 = [ITRes127|ITResList127],
+  ?line ITRes128 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-3-5.xml','./nisttest/NISTTestsAll',valid,S28),
+  ITResList129 = [ITRes128|ITResList128],
+
+
+  ?line {STRes29,S29} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-pattern-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList30 = [STRes29|STResList29],
+  ?line ITRes129 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-4-1.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList130 = [ITRes129|ITResList129],
+  ?line ITRes130 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-4-2.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList131 = [ITRes130|ITResList130],
+  ?line ITRes131 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-4-3.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList132 = [ITRes131|ITResList131],
+  ?line ITRes132 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-4-4.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList133 = [ITRes132|ITResList132],
+  ?line ITRes133 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-4-5.xml','./nisttest/NISTTestsAll',valid,S29),
+  ITResList134 = [ITRes133|ITResList133],
+
+
+  ?line {STRes30,S30} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-pattern-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList31 = [STRes30|STResList30],
+  ?line ITRes134 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-5-1.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList135 = [ITRes134|ITResList134],
+  ?line ITRes135 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-5-2.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList136 = [ITRes135|ITResList135],
+  ?line ITRes136 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-5-3.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList137 = [ITRes136|ITResList136],
+  ?line ITRes137 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-5-4.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList138 = [ITRes137|ITResList137],
+  ?line ITRes138 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-pattern-5-5.xml','./nisttest/NISTTestsAll',valid,S30),
+  ITResList139 = [ITRes138|ITResList138],
+
+
+  ?line {STRes31,S31} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-enumeration-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList32 = [STRes31|STResList31],
+  ?line ITRes139 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-1-1.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList140 = [ITRes139|ITResList139],
+  ?line ITRes140 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-1-2.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList141 = [ITRes140|ITResList140],
+  ?line ITRes141 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-1-3.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList142 = [ITRes141|ITResList141],
+  ?line ITRes142 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-1-4.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList143 = [ITRes142|ITResList142],
+  ?line ITRes143 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-1-5.xml','./nisttest/NISTTestsAll',valid,S31),
+  ITResList144 = [ITRes143|ITResList143],
+
+
+  ?line {STRes32,S32} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-enumeration-2.xsd','./nisttest/NISTTestsAll',valid),
+  STResList33 = [STRes32|STResList32],
+  ?line ITRes144 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-2-1.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList145 = [ITRes144|ITResList144],
+  ?line ITRes145 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-2-2.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList146 = [ITRes145|ITResList145],
+  ?line ITRes146 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-2-3.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList147 = [ITRes146|ITResList146],
+  ?line ITRes147 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-2-4.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList148 = [ITRes147|ITResList147],
+  ?line ITRes148 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-2-5.xml','./nisttest/NISTTestsAll',valid,S32),
+  ITResList149 = [ITRes148|ITResList148],
+
+
+  ?line {STRes33,S33} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-enumeration-3.xsd','./nisttest/NISTTestsAll',valid),
+  STResList34 = [STRes33|STResList33],
+  ?line ITRes149 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-3-1.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList150 = [ITRes149|ITResList149],
+  ?line ITRes150 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-3-2.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList151 = [ITRes150|ITResList150],
+  ?line ITRes151 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-3-3.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList152 = [ITRes151|ITResList151],
+  ?line ITRes152 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-3-4.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList153 = [ITRes152|ITResList152],
+  ?line ITRes153 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-3-5.xml','./nisttest/NISTTestsAll',valid,S33),
+  ITResList154 = [ITRes153|ITResList153],
+
+
+  ?line {STRes34,S34} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-enumeration-4.xsd','./nisttest/NISTTestsAll',valid),
+  STResList35 = [STRes34|STResList34],
+  ?line ITRes154 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-4-1.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList155 = [ITRes154|ITResList154],
+  ?line ITRes155 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-4-2.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList156 = [ITRes155|ITResList155],
+  ?line ITRes156 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-4-3.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList157 = [ITRes156|ITResList156],
+  ?line ITRes157 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-4-4.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList158 = [ITRes157|ITResList157],
+  ?line ITRes158 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-4-5.xml','./nisttest/NISTTestsAll',valid,S34),
+  ITResList159 = [ITRes158|ITResList158],
+
+
+  ?line {STRes35,S35} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-enumeration-5.xsd','./nisttest/NISTTestsAll',valid),
+  STResList36 = [STRes35|STResList35],
+  ?line ITRes159 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-5-1.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList160 = [ITRes159|ITResList159],
+  ?line ITRes160 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-5-2.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList161 = [ITRes160|ITResList160],
+  ?line ITRes161 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-5-3.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList162 = [ITRes161|ITResList161],
+  ?line ITRes162 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-5-4.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList163 = [ITRes162|ITResList162],
+  ?line ITRes163 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-enumeration-5-5.xml','./nisttest/NISTTestsAll',valid,S35),
+  ITResList164 = [ITRes163|ITResList163],
+
+
+  ?line {STRes36,S36} = xmerl_xsd_lib:schema_test(Config,'./nisttest/NISTTestsAll/NISTSchema-unsignedShort-whiteSpace-1.xsd','./nisttest/NISTTestsAll',valid),
+  STResList37 = [STRes36|STResList36],
+  ?line ITRes164 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-whiteSpace-1-1.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList165 = [ITRes164|ITResList164],
+  ?line ITRes165 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-whiteSpace-1-2.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList166 = [ITRes165|ITResList165],
+  ?line ITRes166 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-whiteSpace-1-3.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList167 = [ITRes166|ITResList166],
+  ?line ITRes167 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-whiteSpace-1-4.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList168 = [ITRes167|ITResList167],
+  ?line ITRes168 = xmerl_xsd_lib:instance_test(Config,'./nisttest/NISTTestsAll/NISTXML-unsignedShort-whiteSpace-1-5.xml','./nisttest/NISTTestsAll',valid,S36),
+  ITResList169 = [ITRes168|ITResList168],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList37,ITResList169).
+
diff --git a/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE_data/nist_failed_cases.log b/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE_data/nist_failed_cases.log
new file mode 100644
index 0000000000..e10b6463fe
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE_data/nist_failed_cases.log
@@ -0,0 +1,894 @@
+{'NISTSchema-anyURI',{["NISTXML-anyURI-maxLength-1-5.xml",
+                       "NISTXML-anyURI-maxLength-1-4.xml",
+                       "NISTXML-anyURI-maxLength-1-3.xml",
+                       "NISTXML-anyURI-maxLength-1-2.xml",
+                       "NISTXML-anyURI-maxLength-1-1.xml"],["NISTSchema-anyURI-maxLength-1.xsd"]}}.
+{'NISTSchema-base64Binary',{["NISTXML-base64Binary-length-5-5.xml",
+                             "NISTXML-base64Binary-length-5-4.xml",
+                             "NISTXML-base64Binary-length-5-3.xml",
+                             "NISTXML-base64Binary-length-5-2.xml",
+                             "NISTXML-base64Binary-length-5-1.xml",
+                             "NISTXML-base64Binary-length-4-5.xml",
+                             "NISTXML-base64Binary-length-4-4.xml",
+                             "NISTXML-base64Binary-length-4-3.xml",
+                             "NISTXML-base64Binary-length-4-2.xml",
+                             "NISTXML-base64Binary-length-4-1.xml",
+                             "NISTXML-base64Binary-length-3-5.xml",
+                             "NISTXML-base64Binary-length-3-4.xml",
+                             "NISTXML-base64Binary-length-3-3.xml",
+                             "NISTXML-base64Binary-length-3-2.xml",
+                             "NISTXML-base64Binary-length-3-1.xml",
+                             "NISTXML-base64Binary-length-2-5.xml",
+                             "NISTXML-base64Binary-length-2-4.xml",
+                             "NISTXML-base64Binary-length-2-3.xml",
+                             "NISTXML-base64Binary-length-2-2.xml",
+                             "NISTXML-base64Binary-length-2-1.xml",
+                             "NISTXML-base64Binary-length-1-5.xml",
+                             "NISTXML-base64Binary-length-1-4.xml",
+                             "NISTXML-base64Binary-length-1-3.xml",
+                             "NISTXML-base64Binary-length-1-2.xml",
+                             "NISTXML-base64Binary-length-1-1.xml",
+                             "NISTXML-base64Binary-maxLength-5-5.xml",
+                             "NISTXML-base64Binary-maxLength-5-4.xml",
+                             "NISTXML-base64Binary-maxLength-4-5.xml",
+                             "NISTXML-base64Binary-maxLength-4-4.xml",
+                             "NISTXML-base64Binary-maxLength-3-5.xml",
+                             "NISTXML-base64Binary-maxLength-3-4.xml",
+                             "NISTXML-base64Binary-maxLength-2-5.xml",
+                             "NISTXML-base64Binary-maxLength-2-4.xml",
+                             "NISTXML-base64Binary-maxLength-1-5.xml",
+                             "NISTXML-base64Binary-maxLength-1-4.xml",
+                             "NISTXML-base64Binary-maxLength-1-3.xml",
+                             "NISTXML-base64Binary-maxLength-1-2.xml",
+                             "NISTXML-base64Binary-maxLength-1-1.xml"],[]}}.
+{'NISTSchema-date-',{["NISTXML-date-maxInclusive-5-5.xml",
+                      "NISTXML-date-maxInclusive-5-4.xml",
+                      "NISTXML-date-maxInclusive-5-3.xml",
+                      "NISTXML-date-maxInclusive-5-2.xml",
+                      "NISTXML-date-maxInclusive-5-1.xml",
+                      "NISTXML-date-maxInclusive-4-5.xml",
+                      "NISTXML-date-maxInclusive-4-4.xml",
+                      "NISTXML-date-maxInclusive-4-3.xml",
+                      "NISTXML-date-maxInclusive-4-2.xml",
+                      "NISTXML-date-maxInclusive-4-1.xml",
+                      "NISTXML-date-maxInclusive-3-5.xml",
+                      "NISTXML-date-maxInclusive-3-4.xml",
+                      "NISTXML-date-maxInclusive-3-3.xml",
+                      "NISTXML-date-maxInclusive-3-2.xml",
+                      "NISTXML-date-maxInclusive-3-1.xml",
+                      "NISTXML-date-maxInclusive-2-5.xml",
+                      "NISTXML-date-maxInclusive-2-4.xml",
+                      "NISTXML-date-maxInclusive-2-3.xml",
+                      "NISTXML-date-maxInclusive-2-2.xml",
+                      "NISTXML-date-maxInclusive-2-1.xml",
+                      "NISTXML-date-maxInclusive-1-1.xml",
+                      "NISTXML-date-maxExclusive-5-5.xml",
+                      "NISTXML-date-maxExclusive-5-4.xml",
+                      "NISTXML-date-maxExclusive-5-3.xml",
+                      "NISTXML-date-maxExclusive-5-2.xml",
+                      "NISTXML-date-maxExclusive-5-1.xml",
+                      "NISTXML-date-maxExclusive-4-5.xml",
+                      "NISTXML-date-maxExclusive-4-4.xml",
+                      "NISTXML-date-maxExclusive-4-3.xml",
+                      "NISTXML-date-maxExclusive-4-2.xml",
+                      "NISTXML-date-maxExclusive-4-1.xml",
+                      "NISTXML-date-maxExclusive-3-5.xml",
+                      "NISTXML-date-maxExclusive-3-4.xml",
+                      "NISTXML-date-maxExclusive-3-3.xml",
+                      "NISTXML-date-maxExclusive-3-2.xml",
+                      "NISTXML-date-maxExclusive-3-1.xml",
+                      "NISTXML-date-maxExclusive-2-5.xml",
+                      "NISTXML-date-maxExclusive-2-4.xml",
+                      "NISTXML-date-maxExclusive-2-3.xml",
+                      "NISTXML-date-maxExclusive-2-2.xml",
+                      "NISTXML-date-maxExclusive-2-1.xml",
+                      "NISTXML-date-maxExclusive-1-1.xml",
+                      "NISTXML-date-minInclusive-5-1.xml",
+                      "NISTXML-date-minInclusive-4-5.xml",
+                      "NISTXML-date-minInclusive-4-4.xml",
+                      "NISTXML-date-minInclusive-4-3.xml",
+                      "NISTXML-date-minInclusive-4-2.xml",
+                      "NISTXML-date-minInclusive-4-1.xml",
+                      "NISTXML-date-minInclusive-3-5.xml",
+                      "NISTXML-date-minInclusive-3-4.xml",
+                      "NISTXML-date-minInclusive-3-3.xml",
+                      "NISTXML-date-minInclusive-3-2.xml",
+                      "NISTXML-date-minInclusive-3-1.xml",
+                      "NISTXML-date-minInclusive-2-5.xml",
+                      "NISTXML-date-minInclusive-2-4.xml",
+                      "NISTXML-date-minInclusive-2-3.xml",
+                      "NISTXML-date-minInclusive-2-2.xml",
+                      "NISTXML-date-minInclusive-2-1.xml",
+                      "NISTXML-date-minInclusive-1-5.xml",
+                      "NISTXML-date-minInclusive-1-4.xml",
+                      "NISTXML-date-minInclusive-1-3.xml",
+                      "NISTXML-date-minInclusive-1-2.xml",
+                      "NISTXML-date-minInclusive-1-1.xml",
+                      "NISTXML-date-minExclusive-5-1.xml",
+                      "NISTXML-date-minExclusive-4-5.xml",
+                      "NISTXML-date-minExclusive-4-4.xml",
+                      "NISTXML-date-minExclusive-4-3.xml",
+                      "NISTXML-date-minExclusive-4-2.xml",
+                      "NISTXML-date-minExclusive-4-1.xml",
+                      "NISTXML-date-minExclusive-3-5.xml",
+                      "NISTXML-date-minExclusive-3-4.xml",
+                      "NISTXML-date-minExclusive-3-3.xml",
+                      "NISTXML-date-minExclusive-3-2.xml",
+                      "NISTXML-date-minExclusive-3-1.xml",
+                      "NISTXML-date-minExclusive-2-5.xml",
+                      "NISTXML-date-minExclusive-2-4.xml",
+                      "NISTXML-date-minExclusive-2-3.xml",
+                      "NISTXML-date-minExclusive-2-2.xml",
+                      "NISTXML-date-minExclusive-2-1.xml",
+                      "NISTXML-date-minExclusive-1-5.xml",
+                      "NISTXML-date-minExclusive-1-4.xml",
+                      "NISTXML-date-minExclusive-1-3.xml",
+                      "NISTXML-date-minExclusive-1-2.xml",
+                      "NISTXML-date-minExclusive-1-1.xml"],[]}}.
+{'NISTSchema-decimal',{["NISTXML-decimal-maxExclusive-5-5.xml",
+                        "NISTXML-decimal-maxExclusive-4-5.xml",
+                        "NISTXML-decimal-maxExclusive-3-5.xml",
+                        "NISTXML-decimal-maxExclusive-2-5.xml",
+                        "NISTXML-decimal-maxExclusive-1-1.xml",
+                        "NISTXML-decimal-minExclusive-5-1.xml",
+                        "NISTXML-decimal-minExclusive-4-5.xml",
+                        "NISTXML-decimal-minExclusive-4-4.xml",
+                        "NISTXML-decimal-minExclusive-4-1.xml",
+                        "NISTXML-decimal-minExclusive-3-1.xml",
+                        "NISTXML-decimal-minExclusive-2-1.xml",
+                        "NISTXML-decimal-minExclusive-1-1.xml"],[]}}.
+{'NISTSchema-double',{["NISTXML-double-maxInclusive-5-5.xml",
+                       "NISTXML-double-maxInclusive-5-4.xml",
+                       "NISTXML-double-maxInclusive-5-3.xml",
+                       "NISTXML-double-maxInclusive-5-2.xml",
+                       "NISTXML-double-maxInclusive-5-1.xml",
+                       "NISTXML-double-maxInclusive-4-5.xml",
+                       "NISTXML-double-maxInclusive-4-4.xml",
+                       "NISTXML-double-maxInclusive-4-3.xml",
+                       "NISTXML-double-maxInclusive-4-2.xml",
+                       "NISTXML-double-maxInclusive-4-1.xml",
+                       "NISTXML-double-maxInclusive-3-5.xml",
+                       "NISTXML-double-maxInclusive-3-4.xml",
+                       "NISTXML-double-maxInclusive-3-3.xml",
+                       "NISTXML-double-maxInclusive-3-2.xml",
+                       "NISTXML-double-maxInclusive-3-1.xml",
+                       "NISTXML-double-maxInclusive-2-5.xml",
+                       "NISTXML-double-maxInclusive-2-4.xml",
+                       "NISTXML-double-maxInclusive-2-3.xml",
+                       "NISTXML-double-maxInclusive-2-2.xml",
+                       "NISTXML-double-maxInclusive-2-1.xml",
+                       "NISTXML-double-maxExclusive-5-5.xml",
+                       "NISTXML-double-maxExclusive-5-4.xml",
+                       "NISTXML-double-maxExclusive-5-3.xml",
+                       "NISTXML-double-maxExclusive-5-2.xml",
+                       "NISTXML-double-maxExclusive-5-1.xml",
+                       "NISTXML-double-maxExclusive-4-5.xml",
+                       "NISTXML-double-maxExclusive-4-4.xml",
+                       "NISTXML-double-maxExclusive-4-3.xml",
+                       "NISTXML-double-maxExclusive-4-2.xml",
+                       "NISTXML-double-maxExclusive-4-1.xml",
+                       "NISTXML-double-maxExclusive-3-5.xml",
+                       "NISTXML-double-maxExclusive-3-4.xml",
+                       "NISTXML-double-maxExclusive-3-3.xml",
+                       "NISTXML-double-maxExclusive-3-2.xml",
+                       "NISTXML-double-maxExclusive-3-1.xml",
+                       "NISTXML-double-maxExclusive-2-5.xml",
+                       "NISTXML-double-maxExclusive-2-4.xml",
+                       "NISTXML-double-maxExclusive-2-3.xml",
+                       "NISTXML-double-maxExclusive-2-2.xml",
+                       "NISTXML-double-maxExclusive-2-1.xml",
+                       "NISTXML-double-maxExclusive-1-1.xml",
+                       "NISTXML-double-minInclusive-4-5.xml",
+                       "NISTXML-double-minInclusive-4-4.xml",
+                       "NISTXML-double-minInclusive-4-3.xml",
+                       "NISTXML-double-minInclusive-4-2.xml",
+                       "NISTXML-double-minInclusive-3-5.xml",
+                       "NISTXML-double-minInclusive-3-4.xml",
+                       "NISTXML-double-minInclusive-3-3.xml",
+                       "NISTXML-double-minInclusive-3-2.xml",
+                       "NISTXML-double-minInclusive-2-5.xml",
+                       "NISTXML-double-minInclusive-2-4.xml",
+                       "NISTXML-double-minInclusive-2-3.xml",
+                       "NISTXML-double-minInclusive-2-2.xml",
+                       "NISTXML-double-minInclusive-1-5.xml",
+                       "NISTXML-double-minInclusive-1-4.xml",
+                       "NISTXML-double-minInclusive-1-3.xml",
+                       "NISTXML-double-minInclusive-1-2.xml",
+                       "NISTXML-double-minExclusive-5-1.xml",
+                       "NISTXML-double-minExclusive-4-5.xml",
+                       "NISTXML-double-minExclusive-4-4.xml",
+                       "NISTXML-double-minExclusive-4-3.xml",
+                       "NISTXML-double-minExclusive-3-5.xml",
+                       "NISTXML-double-minExclusive-3-4.xml",
+                       "NISTXML-double-minExclusive-3-3.xml",
+                       "NISTXML-double-minExclusive-3-2.xml",
+                       "NISTXML-double-minExclusive-3-1.xml",
+                       "NISTXML-double-minExclusive-2-5.xml",
+                       "NISTXML-double-minExclusive-2-4.xml",
+                       "NISTXML-double-minExclusive-2-3.xml",
+                       "NISTXML-double-minExclusive-2-2.xml",
+                       "NISTXML-double-minExclusive-2-1.xml",
+                       "NISTXML-double-minExclusive-1-5.xml",
+                       "NISTXML-double-minExclusive-1-4.xml",
+                       "NISTXML-double-minExclusive-1-3.xml",
+                       "NISTXML-double-minExclusive-1-2.xml",
+                       "NISTXML-double-minExclusive-1-1.xml"],[]}}.
+{'NISTSchema-gDay',{["NISTXML-gDay-maxInclusive-5-5.xml",
+                     "NISTXML-gDay-maxInclusive-5-4.xml",
+                     "NISTXML-gDay-maxInclusive-5-3.xml",
+                     "NISTXML-gDay-maxInclusive-5-2.xml",
+                     "NISTXML-gDay-maxInclusive-5-1.xml",
+                     "NISTXML-gDay-maxInclusive-4-1.xml",
+                     "NISTXML-gDay-maxInclusive-3-5.xml",
+                     "NISTXML-gDay-maxInclusive-3-4.xml",
+                     "NISTXML-gDay-maxInclusive-3-3.xml",
+                     "NISTXML-gDay-maxInclusive-3-2.xml",
+                     "NISTXML-gDay-maxInclusive-3-1.xml",
+                     "NISTXML-gDay-maxInclusive-2-5.xml",
+                     "NISTXML-gDay-maxInclusive-2-4.xml",
+                     "NISTXML-gDay-maxInclusive-2-3.xml",
+                     "NISTXML-gDay-maxInclusive-2-2.xml",
+                     "NISTXML-gDay-maxInclusive-2-1.xml",
+                     "NISTXML-gDay-maxInclusive-1-1.xml",
+                     "NISTXML-gDay-maxExclusive-5-5.xml",
+                     "NISTXML-gDay-maxExclusive-5-4.xml",
+                     "NISTXML-gDay-maxExclusive-5-3.xml",
+                     "NISTXML-gDay-maxExclusive-5-2.xml",
+                     "NISTXML-gDay-maxExclusive-5-1.xml",
+                     "NISTXML-gDay-maxExclusive-4-5.xml",
+                     "NISTXML-gDay-maxExclusive-4-4.xml",
+                     "NISTXML-gDay-maxExclusive-4-3.xml",
+                     "NISTXML-gDay-maxExclusive-4-2.xml",
+                     "NISTXML-gDay-maxExclusive-4-1.xml",
+                     "NISTXML-gDay-maxExclusive-3-5.xml",
+                     "NISTXML-gDay-maxExclusive-3-4.xml",
+                     "NISTXML-gDay-maxExclusive-3-3.xml",
+                     "NISTXML-gDay-maxExclusive-3-2.xml",
+                     "NISTXML-gDay-maxExclusive-3-1.xml",
+                     "NISTXML-gDay-maxExclusive-2-5.xml",
+                     "NISTXML-gDay-maxExclusive-2-4.xml",
+                     "NISTXML-gDay-maxExclusive-2-3.xml",
+                     "NISTXML-gDay-maxExclusive-2-2.xml",
+                     "NISTXML-gDay-maxExclusive-2-1.xml",
+                     "NISTXML-gDay-maxExclusive-1-1.xml",
+                     "NISTXML-gDay-minInclusive-5-1.xml",
+                     "NISTXML-gDay-minInclusive-4-5.xml",
+                     "NISTXML-gDay-minInclusive-4-4.xml",
+                     "NISTXML-gDay-minInclusive-4-3.xml",
+                     "NISTXML-gDay-minInclusive-4-2.xml",
+                     "NISTXML-gDay-minInclusive-4-1.xml",
+                     "NISTXML-gDay-minInclusive-3-5.xml",
+                     "NISTXML-gDay-minInclusive-3-4.xml",
+                     "NISTXML-gDay-minInclusive-3-3.xml",
+                     "NISTXML-gDay-minInclusive-3-2.xml",
+                     "NISTXML-gDay-minInclusive-3-1.xml",
+                     "NISTXML-gDay-minInclusive-2-5.xml",
+                     "NISTXML-gDay-minInclusive-2-4.xml",
+                     "NISTXML-gDay-minInclusive-2-3.xml",
+                     "NISTXML-gDay-minInclusive-2-2.xml",
+                     "NISTXML-gDay-minInclusive-2-1.xml",
+                     "NISTXML-gDay-minInclusive-1-5.xml",
+                     "NISTXML-gDay-minInclusive-1-4.xml",
+                     "NISTXML-gDay-minInclusive-1-3.xml",
+                     "NISTXML-gDay-minInclusive-1-2.xml",
+                     "NISTXML-gDay-minInclusive-1-1.xml",
+                     "NISTXML-gDay-minExclusive-5-1.xml",
+                     "NISTXML-gDay-minExclusive-4-5.xml",
+                     "NISTXML-gDay-minExclusive-4-4.xml",
+                     "NISTXML-gDay-minExclusive-4-3.xml",
+                     "NISTXML-gDay-minExclusive-4-2.xml",
+                     "NISTXML-gDay-minExclusive-4-1.xml",
+                     "NISTXML-gDay-minExclusive-3-5.xml",
+                     "NISTXML-gDay-minExclusive-3-4.xml",
+                     "NISTXML-gDay-minExclusive-3-3.xml",
+                     "NISTXML-gDay-minExclusive-3-2.xml",
+                     "NISTXML-gDay-minExclusive-3-1.xml",
+                     "NISTXML-gDay-minExclusive-2-5.xml",
+                     "NISTXML-gDay-minExclusive-2-4.xml",
+                     "NISTXML-gDay-minExclusive-2-3.xml",
+                     "NISTXML-gDay-minExclusive-2-2.xml",
+                     "NISTXML-gDay-minExclusive-2-1.xml",
+                     "NISTXML-gDay-minExclusive-1-5.xml",
+                     "NISTXML-gDay-minExclusive-1-4.xml",
+                     "NISTXML-gDay-minExclusive-1-3.xml",
+                     "NISTXML-gDay-minExclusive-1-2.xml",
+                     "NISTXML-gDay-minExclusive-1-1.xml"],[]}}.
+{'NISTSchema-gMonth-',{["NISTXML-gMonth-whiteSpace-1-5.xml",
+                        "NISTXML-gMonth-whiteSpace-1-4.xml",
+                        "NISTXML-gMonth-whiteSpace-1-3.xml",
+                        "NISTXML-gMonth-whiteSpace-1-2.xml",
+                        "NISTXML-gMonth-whiteSpace-1-1.xml",
+                        "NISTXML-gMonth-enumeration-5-5.xml",
+                        "NISTXML-gMonth-enumeration-5-4.xml",
+                        "NISTXML-gMonth-enumeration-5-3.xml",
+                        "NISTXML-gMonth-enumeration-5-2.xml",
+                        "NISTXML-gMonth-enumeration-5-1.xml",
+                        "NISTXML-gMonth-enumeration-4-5.xml",
+                        "NISTXML-gMonth-enumeration-4-4.xml",
+                        "NISTXML-gMonth-enumeration-4-3.xml",
+                        "NISTXML-gMonth-enumeration-4-2.xml",
+                        "NISTXML-gMonth-enumeration-4-1.xml",
+                        "NISTXML-gMonth-enumeration-3-5.xml",
+                        "NISTXML-gMonth-enumeration-3-4.xml",
+                        "NISTXML-gMonth-enumeration-3-3.xml",
+                        "NISTXML-gMonth-enumeration-3-2.xml",
+                        "NISTXML-gMonth-enumeration-3-1.xml",
+                        "NISTXML-gMonth-enumeration-2-5.xml",
+                        "NISTXML-gMonth-enumeration-2-4.xml",
+                        "NISTXML-gMonth-enumeration-2-3.xml",
+                        "NISTXML-gMonth-enumeration-2-2.xml",
+                        "NISTXML-gMonth-enumeration-2-1.xml",
+                        "NISTXML-gMonth-enumeration-1-5.xml",
+                        "NISTXML-gMonth-enumeration-1-4.xml",
+                        "NISTXML-gMonth-enumeration-1-3.xml",
+                        "NISTXML-gMonth-enumeration-1-2.xml",
+                        "NISTXML-gMonth-enumeration-1-1.xml",
+                        "NISTXML-gMonth-pattern-5-5.xml",
+                        "NISTXML-gMonth-pattern-5-4.xml",
+                        "NISTXML-gMonth-pattern-5-3.xml",
+                        "NISTXML-gMonth-pattern-5-2.xml",
+                        "NISTXML-gMonth-pattern-5-1.xml",
+                        "NISTXML-gMonth-pattern-4-5.xml",
+                        "NISTXML-gMonth-pattern-4-4.xml",
+                        "NISTXML-gMonth-pattern-4-3.xml",
+                        "NISTXML-gMonth-pattern-4-2.xml",
+                        "NISTXML-gMonth-pattern-4-1.xml",
+                        "NISTXML-gMonth-pattern-3-5.xml",
+                        "NISTXML-gMonth-pattern-3-4.xml",
+                        "NISTXML-gMonth-pattern-3-3.xml",
+                        "NISTXML-gMonth-pattern-3-2.xml",
+                        "NISTXML-gMonth-pattern-3-1.xml",
+                        "NISTXML-gMonth-pattern-2-5.xml",
+                        "NISTXML-gMonth-pattern-2-4.xml",
+                        "NISTXML-gMonth-pattern-2-3.xml",
+                        "NISTXML-gMonth-pattern-2-2.xml",
+                        "NISTXML-gMonth-pattern-2-1.xml",
+                        "NISTXML-gMonth-pattern-1-5.xml",
+                        "NISTXML-gMonth-pattern-1-4.xml",
+                        "NISTXML-gMonth-pattern-1-3.xml",
+                        "NISTXML-gMonth-pattern-1-2.xml",
+                        "NISTXML-gMonth-pattern-1-1.xml",
+                        "NISTXML-gMonth-maxInclusive-5-5.xml",
+                        "NISTXML-gMonth-maxInclusive-5-4.xml",
+                        "NISTXML-gMonth-maxInclusive-5-3.xml",
+                        "NISTXML-gMonth-maxInclusive-5-2.xml",
+                        "NISTXML-gMonth-maxInclusive-5-1.xml",
+                        "NISTXML-gMonth-maxInclusive-4-5.xml",
+                        "NISTXML-gMonth-maxInclusive-4-4.xml",
+                        "NISTXML-gMonth-maxInclusive-4-3.xml",
+                        "NISTXML-gMonth-maxInclusive-4-2.xml",
+                        "NISTXML-gMonth-maxInclusive-4-1.xml",
+                        "NISTXML-gMonth-maxInclusive-3-5.xml",
+                        "NISTXML-gMonth-maxInclusive-3-4.xml",
+                        "NISTXML-gMonth-maxInclusive-3-3.xml",
+                        "NISTXML-gMonth-maxInclusive-3-2.xml",
+                        "NISTXML-gMonth-maxInclusive-3-1.xml",
+                        "NISTXML-gMonth-maxInclusive-2-5.xml",
+                        "NISTXML-gMonth-maxInclusive-2-4.xml",
+                        "NISTXML-gMonth-maxInclusive-2-3.xml",
+                        "NISTXML-gMonth-maxInclusive-2-2.xml",
+                        "NISTXML-gMonth-maxInclusive-2-1.xml",
+                        "NISTXML-gMonth-maxInclusive-1-1.xml",
+                        "NISTXML-gMonth-maxExclusive-5-5.xml",
+                        "NISTXML-gMonth-maxExclusive-5-4.xml",
+                        "NISTXML-gMonth-maxExclusive-5-3.xml",
+                        "NISTXML-gMonth-maxExclusive-5-2.xml",
+                        "NISTXML-gMonth-maxExclusive-5-1.xml",
+                        "NISTXML-gMonth-maxExclusive-4-5.xml",
+                        "NISTXML-gMonth-maxExclusive-4-4.xml",
+                        "NISTXML-gMonth-maxExclusive-4-3.xml",
+                        "NISTXML-gMonth-maxExclusive-4-2.xml",
+                        "NISTXML-gMonth-maxExclusive-4-1.xml",
+                        "NISTXML-gMonth-maxExclusive-3-5.xml",
+                        "NISTXML-gMonth-maxExclusive-3-4.xml",
+                        "NISTXML-gMonth-maxExclusive-3-3.xml",
+                        "NISTXML-gMonth-maxExclusive-3-2.xml",
+                        "NISTXML-gMonth-maxExclusive-3-1.xml",
+                        "NISTXML-gMonth-maxExclusive-2-5.xml",
+                        "NISTXML-gMonth-maxExclusive-2-4.xml",
+                        "NISTXML-gMonth-maxExclusive-2-3.xml",
+                        "NISTXML-gMonth-maxExclusive-2-2.xml",
+                        "NISTXML-gMonth-maxExclusive-2-1.xml",
+                        "NISTXML-gMonth-maxExclusive-1-1.xml",
+                        "NISTXML-gMonth-minInclusive-5-1.xml",
+                        "NISTXML-gMonth-minInclusive-4-5.xml",
+                        "NISTXML-gMonth-minInclusive-4-4.xml",
+                        "NISTXML-gMonth-minInclusive-4-3.xml",
+                        "NISTXML-gMonth-minInclusive-4-2.xml",
+                        "NISTXML-gMonth-minInclusive-4-1.xml",
+                        "NISTXML-gMonth-minInclusive-3-5.xml",
+                        "NISTXML-gMonth-minInclusive-3-4.xml",
+                        "NISTXML-gMonth-minInclusive-3-3.xml",
+                        "NISTXML-gMonth-minInclusive-3-2.xml",
+                        "NISTXML-gMonth-minInclusive-3-1.xml",
+                        "NISTXML-gMonth-minInclusive-2-5.xml",
+                        "NISTXML-gMonth-minInclusive-2-4.xml",
+                        "NISTXML-gMonth-minInclusive-2-3.xml",
+                        "NISTXML-gMonth-minInclusive-2-2.xml",
+                        "NISTXML-gMonth-minInclusive-2-1.xml",
+                        "NISTXML-gMonth-minInclusive-1-5.xml",
+                        "NISTXML-gMonth-minInclusive-1-4.xml",
+                        "NISTXML-gMonth-minInclusive-1-3.xml",
+                        "NISTXML-gMonth-minInclusive-1-2.xml",
+                        "NISTXML-gMonth-minInclusive-1-1.xml",
+                        "NISTXML-gMonth-minExclusive-5-1.xml",
+                        "NISTXML-gMonth-minExclusive-4-5.xml",
+                        "NISTXML-gMonth-minExclusive-4-4.xml",
+                        "NISTXML-gMonth-minExclusive-4-3.xml",
+                        "NISTXML-gMonth-minExclusive-4-2.xml",
+                        "NISTXML-gMonth-minExclusive-4-1.xml",
+                        "NISTXML-gMonth-minExclusive-3-5.xml",
+                        "NISTXML-gMonth-minExclusive-3-4.xml",
+                        "NISTXML-gMonth-minExclusive-3-3.xml",
+                        "NISTXML-gMonth-minExclusive-3-2.xml",
+                        "NISTXML-gMonth-minExclusive-3-1.xml",
+                        "NISTXML-gMonth-minExclusive-2-5.xml",
+                        "NISTXML-gMonth-minExclusive-2-4.xml",
+                        "NISTXML-gMonth-minExclusive-2-3.xml",
+                        "NISTXML-gMonth-minExclusive-2-2.xml",
+                        "NISTXML-gMonth-minExclusive-2-1.xml",
+                        "NISTXML-gMonth-minExclusive-1-5.xml",
+                        "NISTXML-gMonth-minExclusive-1-4.xml",
+                        "NISTXML-gMonth-minExclusive-1-3.xml",
+                        "NISTXML-gMonth-minExclusive-1-2.xml",
+                        "NISTXML-gMonth-minExclusive-1-1.xml"],[]}}.
+{'NISTSchema-gMonthDay',{["NISTXML-gMonthDay-maxInclusive-5-5.xml",
+                          "NISTXML-gMonthDay-maxInclusive-5-4.xml",
+                          "NISTXML-gMonthDay-maxInclusive-5-3.xml",
+                          "NISTXML-gMonthDay-maxInclusive-5-2.xml",
+                          "NISTXML-gMonthDay-maxInclusive-5-1.xml",
+                          "NISTXML-gMonthDay-maxInclusive-4-5.xml",
+                          "NISTXML-gMonthDay-maxInclusive-4-4.xml",
+                          "NISTXML-gMonthDay-maxInclusive-4-3.xml",
+                          "NISTXML-gMonthDay-maxInclusive-4-2.xml",
+                          "NISTXML-gMonthDay-maxInclusive-4-1.xml",
+                          "NISTXML-gMonthDay-maxInclusive-3-5.xml",
+                          "NISTXML-gMonthDay-maxInclusive-3-4.xml",
+                          "NISTXML-gMonthDay-maxInclusive-3-3.xml",
+                          "NISTXML-gMonthDay-maxInclusive-3-2.xml",
+                          "NISTXML-gMonthDay-maxInclusive-3-1.xml",
+                          "NISTXML-gMonthDay-maxInclusive-2-5.xml",
+                          "NISTXML-gMonthDay-maxInclusive-2-4.xml",
+                          "NISTXML-gMonthDay-maxInclusive-2-3.xml",
+                          "NISTXML-gMonthDay-maxInclusive-2-2.xml",
+                          "NISTXML-gMonthDay-maxInclusive-2-1.xml",
+                          "NISTXML-gMonthDay-maxInclusive-1-1.xml",
+                          "NISTXML-gMonthDay-maxExclusive-5-5.xml",
+                          "NISTXML-gMonthDay-maxExclusive-5-4.xml",
+                          "NISTXML-gMonthDay-maxExclusive-5-3.xml",
+                          "NISTXML-gMonthDay-maxExclusive-5-2.xml",
+                          "NISTXML-gMonthDay-maxExclusive-5-1.xml",
+                          "NISTXML-gMonthDay-maxExclusive-4-5.xml",
+                          "NISTXML-gMonthDay-maxExclusive-4-4.xml",
+                          "NISTXML-gMonthDay-maxExclusive-4-3.xml",
+                          "NISTXML-gMonthDay-maxExclusive-4-2.xml",
+                          "NISTXML-gMonthDay-maxExclusive-4-1.xml",
+                          "NISTXML-gMonthDay-maxExclusive-3-5.xml",
+                          "NISTXML-gMonthDay-maxExclusive-3-4.xml",
+                          "NISTXML-gMonthDay-maxExclusive-3-3.xml",
+                          "NISTXML-gMonthDay-maxExclusive-3-2.xml",
+                          "NISTXML-gMonthDay-maxExclusive-3-1.xml",
+                          "NISTXML-gMonthDay-maxExclusive-2-5.xml",
+                          "NISTXML-gMonthDay-maxExclusive-2-4.xml",
+                          "NISTXML-gMonthDay-maxExclusive-2-3.xml",
+                          "NISTXML-gMonthDay-maxExclusive-2-2.xml",
+                          "NISTXML-gMonthDay-maxExclusive-2-1.xml",
+                          "NISTXML-gMonthDay-maxExclusive-1-1.xml",
+                          "NISTXML-gMonthDay-minInclusive-5-1.xml",
+                          "NISTXML-gMonthDay-minInclusive-4-5.xml",
+                          "NISTXML-gMonthDay-minInclusive-4-4.xml",
+                          "NISTXML-gMonthDay-minInclusive-4-3.xml",
+                          "NISTXML-gMonthDay-minInclusive-4-2.xml",
+                          "NISTXML-gMonthDay-minInclusive-4-1.xml",
+                          "NISTXML-gMonthDay-minInclusive-3-5.xml",
+                          "NISTXML-gMonthDay-minInclusive-3-4.xml",
+                          "NISTXML-gMonthDay-minInclusive-3-3.xml",
+                          "NISTXML-gMonthDay-minInclusive-3-2.xml",
+                          "NISTXML-gMonthDay-minInclusive-3-1.xml",
+                          "NISTXML-gMonthDay-minInclusive-2-5.xml",
+                          "NISTXML-gMonthDay-minInclusive-2-4.xml",
+                          "NISTXML-gMonthDay-minInclusive-2-3.xml",
+                          "NISTXML-gMonthDay-minInclusive-2-2.xml",
+                          "NISTXML-gMonthDay-minInclusive-2-1.xml",
+                          "NISTXML-gMonthDay-minInclusive-1-5.xml",
+                          "NISTXML-gMonthDay-minInclusive-1-4.xml",
+                          "NISTXML-gMonthDay-minInclusive-1-3.xml",
+                          "NISTXML-gMonthDay-minInclusive-1-2.xml",
+                          "NISTXML-gMonthDay-minInclusive-1-1.xml",
+                          "NISTXML-gMonthDay-minExclusive-5-1.xml",
+                          "NISTXML-gMonthDay-minExclusive-4-5.xml",
+                          "NISTXML-gMonthDay-minExclusive-4-4.xml",
+                          "NISTXML-gMonthDay-minExclusive-4-3.xml",
+                          "NISTXML-gMonthDay-minExclusive-4-2.xml",
+                          "NISTXML-gMonthDay-minExclusive-4-1.xml",
+                          "NISTXML-gMonthDay-minExclusive-3-5.xml",
+                          "NISTXML-gMonthDay-minExclusive-3-4.xml",
+                          "NISTXML-gMonthDay-minExclusive-3-3.xml",
+                          "NISTXML-gMonthDay-minExclusive-3-2.xml",
+                          "NISTXML-gMonthDay-minExclusive-3-1.xml",
+                          "NISTXML-gMonthDay-minExclusive-2-5.xml",
+                          "NISTXML-gMonthDay-minExclusive-2-4.xml",
+                          "NISTXML-gMonthDay-minExclusive-2-3.xml",
+                          "NISTXML-gMonthDay-minExclusive-2-2.xml",
+                          "NISTXML-gMonthDay-minExclusive-2-1.xml",
+                          "NISTXML-gMonthDay-minExclusive-1-5.xml",
+                          "NISTXML-gMonthDay-minExclusive-1-4.xml",
+                          "NISTXML-gMonthDay-minExclusive-1-3.xml",
+                          "NISTXML-gMonthDay-minExclusive-1-2.xml",
+                          "NISTXML-gMonthDay-minExclusive-1-1.xml"],[]}}.
+{'NISTSchema-gYear-',{["NISTXML-gYear-maxInclusive-5-5.xml",
+                       "NISTXML-gYear-maxInclusive-5-4.xml",
+                       "NISTXML-gYear-maxInclusive-5-3.xml",
+                       "NISTXML-gYear-maxInclusive-5-2.xml",
+                       "NISTXML-gYear-maxInclusive-5-1.xml",
+                       "NISTXML-gYear-maxInclusive-4-5.xml",
+                       "NISTXML-gYear-maxInclusive-4-4.xml",
+                       "NISTXML-gYear-maxInclusive-4-3.xml",
+                       "NISTXML-gYear-maxInclusive-4-2.xml",
+                       "NISTXML-gYear-maxInclusive-4-1.xml",
+                       "NISTXML-gYear-maxInclusive-3-5.xml",
+                       "NISTXML-gYear-maxInclusive-3-4.xml",
+                       "NISTXML-gYear-maxInclusive-3-3.xml",
+                       "NISTXML-gYear-maxInclusive-3-2.xml",
+                       "NISTXML-gYear-maxInclusive-3-1.xml",
+                       "NISTXML-gYear-maxInclusive-2-1.xml",
+                       "NISTXML-gYear-maxInclusive-1-1.xml",
+                       "NISTXML-gYear-maxExclusive-5-5.xml",
+                       "NISTXML-gYear-maxExclusive-5-4.xml",
+                       "NISTXML-gYear-maxExclusive-5-3.xml",
+                       "NISTXML-gYear-maxExclusive-5-2.xml",
+                       "NISTXML-gYear-maxExclusive-5-1.xml",
+                       "NISTXML-gYear-maxExclusive-4-5.xml",
+                       "NISTXML-gYear-maxExclusive-4-4.xml",
+                       "NISTXML-gYear-maxExclusive-4-3.xml",
+                       "NISTXML-gYear-maxExclusive-4-2.xml",
+                       "NISTXML-gYear-maxExclusive-4-1.xml",
+                       "NISTXML-gYear-maxExclusive-3-5.xml",
+                       "NISTXML-gYear-maxExclusive-3-4.xml",
+                       "NISTXML-gYear-maxExclusive-3-3.xml",
+                       "NISTXML-gYear-maxExclusive-3-2.xml",
+                       "NISTXML-gYear-maxExclusive-3-1.xml",
+                       "NISTXML-gYear-maxExclusive-2-5.xml",
+                       "NISTXML-gYear-maxExclusive-2-4.xml",
+                       "NISTXML-gYear-maxExclusive-2-3.xml",
+                       "NISTXML-gYear-maxExclusive-2-2.xml",
+                       "NISTXML-gYear-maxExclusive-2-1.xml",
+                       "NISTXML-gYear-maxExclusive-1-1.xml",
+                       "NISTXML-gYear-minInclusive-5-1.xml",
+                       "NISTXML-gYear-minInclusive-4-5.xml",
+                       "NISTXML-gYear-minInclusive-4-4.xml",
+                       "NISTXML-gYear-minInclusive-4-3.xml",
+                       "NISTXML-gYear-minInclusive-4-2.xml",
+                       "NISTXML-gYear-minInclusive-4-1.xml",
+                       "NISTXML-gYear-minInclusive-3-5.xml",
+                       "NISTXML-gYear-minInclusive-3-4.xml",
+                       "NISTXML-gYear-minInclusive-3-3.xml",
+                       "NISTXML-gYear-minInclusive-3-2.xml",
+                       "NISTXML-gYear-minInclusive-3-1.xml",
+                       "NISTXML-gYear-minInclusive-2-5.xml",
+                       "NISTXML-gYear-minInclusive-2-4.xml",
+                       "NISTXML-gYear-minInclusive-2-3.xml",
+                       "NISTXML-gYear-minInclusive-2-2.xml",
+                       "NISTXML-gYear-minInclusive-2-1.xml",
+                       "NISTXML-gYear-minInclusive-1-5.xml",
+                       "NISTXML-gYear-minInclusive-1-4.xml",
+                       "NISTXML-gYear-minInclusive-1-3.xml",
+                       "NISTXML-gYear-minInclusive-1-2.xml",
+                       "NISTXML-gYear-minInclusive-1-1.xml",
+                       "NISTXML-gYear-minExclusive-5-1.xml",
+                       "NISTXML-gYear-minExclusive-4-5.xml",
+                       "NISTXML-gYear-minExclusive-4-4.xml",
+                       "NISTXML-gYear-minExclusive-4-3.xml",
+                       "NISTXML-gYear-minExclusive-4-2.xml",
+                       "NISTXML-gYear-minExclusive-4-1.xml",
+                       "NISTXML-gYear-minExclusive-3-5.xml",
+                       "NISTXML-gYear-minExclusive-3-4.xml",
+                       "NISTXML-gYear-minExclusive-3-3.xml",
+                       "NISTXML-gYear-minExclusive-3-2.xml",
+                       "NISTXML-gYear-minExclusive-3-1.xml",
+                       "NISTXML-gYear-minExclusive-2-5.xml",
+                       "NISTXML-gYear-minExclusive-2-4.xml",
+                       "NISTXML-gYear-minExclusive-2-3.xml",
+                       "NISTXML-gYear-minExclusive-2-2.xml",
+                       "NISTXML-gYear-minExclusive-2-1.xml",
+                       "NISTXML-gYear-minExclusive-1-5.xml",
+                       "NISTXML-gYear-minExclusive-1-4.xml",
+                       "NISTXML-gYear-minExclusive-1-3.xml",
+                       "NISTXML-gYear-minExclusive-1-2.xml",
+                       "NISTXML-gYear-minExclusive-1-1.xml"],[]}}.
+{'NISTSchema-gYearMonth',{["NISTXML-gYearMonth-maxInclusive-5-5.xml",
+                           "NISTXML-gYearMonth-maxInclusive-5-4.xml",
+                           "NISTXML-gYearMonth-maxInclusive-5-3.xml",
+                           "NISTXML-gYearMonth-maxInclusive-5-2.xml",
+                           "NISTXML-gYearMonth-maxInclusive-5-1.xml",
+                           "NISTXML-gYearMonth-maxInclusive-4-5.xml",
+                           "NISTXML-gYearMonth-maxInclusive-4-4.xml",
+                           "NISTXML-gYearMonth-maxInclusive-4-3.xml",
+                           "NISTXML-gYearMonth-maxInclusive-4-2.xml",
+                           "NISTXML-gYearMonth-maxInclusive-4-1.xml",
+                           "NISTXML-gYearMonth-maxInclusive-3-5.xml",
+                           "NISTXML-gYearMonth-maxInclusive-3-4.xml",
+                           "NISTXML-gYearMonth-maxInclusive-3-3.xml",
+                           "NISTXML-gYearMonth-maxInclusive-3-2.xml",
+                           "NISTXML-gYearMonth-maxInclusive-3-1.xml",
+                           "NISTXML-gYearMonth-maxInclusive-2-5.xml",
+                           "NISTXML-gYearMonth-maxInclusive-2-4.xml",
+                           "NISTXML-gYearMonth-maxInclusive-2-3.xml",
+                           "NISTXML-gYearMonth-maxInclusive-2-2.xml",
+                           "NISTXML-gYearMonth-maxInclusive-2-1.xml",
+                           "NISTXML-gYearMonth-maxInclusive-1-1.xml",
+                           "NISTXML-gYearMonth-maxExclusive-5-5.xml",
+                           "NISTXML-gYearMonth-maxExclusive-5-4.xml",
+                           "NISTXML-gYearMonth-maxExclusive-5-3.xml",
+                           "NISTXML-gYearMonth-maxExclusive-5-2.xml",
+                           "NISTXML-gYearMonth-maxExclusive-5-1.xml",
+                           "NISTXML-gYearMonth-maxExclusive-4-5.xml",
+                           "NISTXML-gYearMonth-maxExclusive-4-4.xml",
+                           "NISTXML-gYearMonth-maxExclusive-4-3.xml",
+                           "NISTXML-gYearMonth-maxExclusive-4-2.xml",
+                           "NISTXML-gYearMonth-maxExclusive-4-1.xml",
+                           "NISTXML-gYearMonth-maxExclusive-3-5.xml",
+                           "NISTXML-gYearMonth-maxExclusive-3-4.xml",
+                           "NISTXML-gYearMonth-maxExclusive-3-3.xml",
+                           "NISTXML-gYearMonth-maxExclusive-3-2.xml",
+                           "NISTXML-gYearMonth-maxExclusive-3-1.xml",
+                           "NISTXML-gYearMonth-maxExclusive-2-5.xml",
+                           "NISTXML-gYearMonth-maxExclusive-2-4.xml",
+                           "NISTXML-gYearMonth-maxExclusive-2-3.xml",
+                           "NISTXML-gYearMonth-maxExclusive-2-2.xml",
+                           "NISTXML-gYearMonth-maxExclusive-2-1.xml",
+                           "NISTXML-gYearMonth-maxExclusive-1-1.xml",
+                           "NISTXML-gYearMonth-minInclusive-5-1.xml",
+                           "NISTXML-gYearMonth-minInclusive-4-5.xml",
+                           "NISTXML-gYearMonth-minInclusive-4-4.xml",
+                           "NISTXML-gYearMonth-minInclusive-4-3.xml",
+                           "NISTXML-gYearMonth-minInclusive-4-2.xml",
+                           "NISTXML-gYearMonth-minInclusive-4-1.xml",
+                           "NISTXML-gYearMonth-minInclusive-3-5.xml",
+                           "NISTXML-gYearMonth-minInclusive-3-4.xml",
+                           "NISTXML-gYearMonth-minInclusive-3-3.xml",
+                           "NISTXML-gYearMonth-minInclusive-3-2.xml",
+                           "NISTXML-gYearMonth-minInclusive-3-1.xml",
+                           "NISTXML-gYearMonth-minInclusive-2-5.xml",
+                           "NISTXML-gYearMonth-minInclusive-2-4.xml",
+                           "NISTXML-gYearMonth-minInclusive-2-3.xml",
+                           "NISTXML-gYearMonth-minInclusive-2-2.xml",
+                           "NISTXML-gYearMonth-minInclusive-2-1.xml",
+                           "NISTXML-gYearMonth-minInclusive-1-5.xml",
+                           "NISTXML-gYearMonth-minInclusive-1-4.xml",
+                           "NISTXML-gYearMonth-minInclusive-1-3.xml",
+                           "NISTXML-gYearMonth-minInclusive-1-2.xml",
+                           "NISTXML-gYearMonth-minInclusive-1-1.xml",
+                           "NISTXML-gYearMonth-minExclusive-5-1.xml",
+                           "NISTXML-gYearMonth-minExclusive-4-5.xml",
+                           "NISTXML-gYearMonth-minExclusive-4-4.xml",
+                           "NISTXML-gYearMonth-minExclusive-4-3.xml",
+                           "NISTXML-gYearMonth-minExclusive-4-2.xml",
+                           "NISTXML-gYearMonth-minExclusive-4-1.xml",
+                           "NISTXML-gYearMonth-minExclusive-3-5.xml",
+                           "NISTXML-gYearMonth-minExclusive-3-4.xml",
+                           "NISTXML-gYearMonth-minExclusive-3-3.xml",
+                           "NISTXML-gYearMonth-minExclusive-3-2.xml",
+                           "NISTXML-gYearMonth-minExclusive-3-1.xml",
+                           "NISTXML-gYearMonth-minExclusive-2-5.xml",
+                           "NISTXML-gYearMonth-minExclusive-2-4.xml",
+                           "NISTXML-gYearMonth-minExclusive-2-3.xml",
+                           "NISTXML-gYearMonth-minExclusive-2-2.xml",
+                           "NISTXML-gYearMonth-minExclusive-2-1.xml",
+                           "NISTXML-gYearMonth-minExclusive-1-5.xml",
+                           "NISTXML-gYearMonth-minExclusive-1-4.xml",
+                           "NISTXML-gYearMonth-minExclusive-1-3.xml",
+                           "NISTXML-gYearMonth-minExclusive-1-2.xml",
+                           "NISTXML-gYearMonth-minExclusive-1-1.xml"],[]}}.
+{'NISTSchema-hexBinary',{["NISTXML-hexBinary-length-5-5.xml",
+                          "NISTXML-hexBinary-length-5-4.xml",
+                          "NISTXML-hexBinary-length-5-3.xml",
+                          "NISTXML-hexBinary-length-5-2.xml",
+                          "NISTXML-hexBinary-length-5-1.xml",
+                          "NISTXML-hexBinary-length-4-5.xml",
+                          "NISTXML-hexBinary-length-4-4.xml",
+                          "NISTXML-hexBinary-length-4-3.xml",
+                          "NISTXML-hexBinary-length-4-2.xml",
+                          "NISTXML-hexBinary-length-4-1.xml",
+                          "NISTXML-hexBinary-length-3-5.xml",
+                          "NISTXML-hexBinary-length-3-4.xml",
+                          "NISTXML-hexBinary-length-3-3.xml",
+                          "NISTXML-hexBinary-length-3-2.xml",
+                          "NISTXML-hexBinary-length-3-1.xml",
+                          "NISTXML-hexBinary-length-2-5.xml",
+                          "NISTXML-hexBinary-length-2-4.xml",
+                          "NISTXML-hexBinary-length-2-3.xml",
+                          "NISTXML-hexBinary-length-2-2.xml",
+                          "NISTXML-hexBinary-length-2-1.xml",
+                          "NISTXML-hexBinary-length-1-5.xml",
+                          "NISTXML-hexBinary-length-1-4.xml",
+                          "NISTXML-hexBinary-length-1-3.xml",
+                          "NISTXML-hexBinary-length-1-2.xml",
+                          "NISTXML-hexBinary-length-1-1.xml",
+                          "NISTXML-hexBinary-maxLength-5-5.xml",
+                          "NISTXML-hexBinary-maxLength-5-4.xml",
+                          "NISTXML-hexBinary-maxLength-4-5.xml",
+                          "NISTXML-hexBinary-maxLength-4-4.xml",
+                          "NISTXML-hexBinary-maxLength-3-5.xml",
+                          "NISTXML-hexBinary-maxLength-3-4.xml",
+                          "NISTXML-hexBinary-maxLength-2-5.xml",
+                          "NISTXML-hexBinary-maxLength-2-4.xml",
+                          "NISTXML-hexBinary-maxLength-2-3.xml",
+                          "NISTXML-hexBinary-maxLength-1-5.xml",
+                          "NISTXML-hexBinary-maxLength-1-4.xml",
+                          "NISTXML-hexBinary-maxLength-1-3.xml",
+                          "NISTXML-hexBinary-maxLength-1-2.xml",
+                          "NISTXML-hexBinary-maxLength-1-1.xml"],[]}}.
+{'NISTSchema-negativeInteger',{["NISTXML-negativeInteger-totalDigits-5-5.xml",
+                                "NISTXML-negativeInteger-totalDigits-4-5.xml",
+                                "NISTXML-negativeInteger-totalDigits-3-5.xml",
+                                "NISTXML-negativeInteger-totalDigits-2-5.xml",
+                                "NISTXML-negativeInteger-totalDigits-1-5.xml",
+                                "NISTXML-negativeInteger-totalDigits-1-4.xml",
+                                "NISTXML-negativeInteger-totalDigits-1-3.xml",
+                                "NISTXML-negativeInteger-totalDigits-1-2.xml",
+                                "NISTXML-negativeInteger-totalDigits-1-1.xml"],[]}}.
+{'NISTSchema-nonPositiveInteger',{["NISTXML-nonPositiveInteger-totalDigits-5-5.xml",
+                                   "NISTXML-nonPositiveInteger-totalDigits-4-5.xml",
+                                   "NISTXML-nonPositiveInteger-totalDigits-3-5.xml",
+                                   "NISTXML-nonPositiveInteger-totalDigits-2-5.xml",
+                                   "NISTXML-nonPositiveInteger-totalDigits-1-5.xml",
+                                   "NISTXML-nonPositiveInteger-totalDigits-1-4.xml",
+                                   "NISTXML-nonPositiveInteger-totalDigits-1-3.xml",
+                                   "NISTXML-nonPositiveInteger-totalDigits-1-2.xml",
+                                   "NISTXML-nonPositiveInteger-totalDigits-1-1.xml"],[]}}.
+{'NISTSchema-normalizedString',{["NISTXML-normalizedString-length-1-1.xml",
+                                 "NISTXML-normalizedString-maxLength-5-5.xml",
+                                 "NISTXML-normalizedString-maxLength-5-4.xml",
+                                 "NISTXML-normalizedString-maxLength-5-3.xml",
+                                 "NISTXML-normalizedString-maxLength-5-2.xml",
+                                 "NISTXML-normalizedString-maxLength-5-1.xml",
+                                 "NISTXML-normalizedString-maxLength-4-5.xml",
+                                 "NISTXML-normalizedString-maxLength-4-4.xml",
+                                 "NISTXML-normalizedString-maxLength-4-3.xml",
+                                 "NISTXML-normalizedString-maxLength-4-2.xml",
+                                 "NISTXML-normalizedString-maxLength-4-1.xml",
+                                 "NISTXML-normalizedString-maxLength-3-5.xml",
+                                 "NISTXML-normalizedString-maxLength-3-4.xml",
+                                 "NISTXML-normalizedString-maxLength-3-3.xml",
+                                 "NISTXML-normalizedString-maxLength-3-2.xml",
+                                 "NISTXML-normalizedString-maxLength-3-1.xml",
+                                 "NISTXML-normalizedString-maxLength-2-5.xml",
+                                 "NISTXML-normalizedString-maxLength-2-4.xml",
+                                 "NISTXML-normalizedString-maxLength-2-3.xml",
+                                 "NISTXML-normalizedString-maxLength-2-2.xml",
+                                 "NISTXML-normalizedString-maxLength-2-1.xml",
+                                 "NISTXML-normalizedString-maxLength-1-1.xml"],[]}}.
+{'NISTSchema-string',{["NISTXML-string-length-1-1.xml",
+                       "NISTXML-string-maxLength-5-5.xml",
+                       "NISTXML-string-maxLength-5-4.xml",
+                       "NISTXML-string-maxLength-5-3.xml",
+                       "NISTXML-string-maxLength-5-2.xml",
+                       "NISTXML-string-maxLength-5-1.xml",
+                       "NISTXML-string-maxLength-4-5.xml",
+                       "NISTXML-string-maxLength-4-4.xml",
+                       "NISTXML-string-maxLength-4-3.xml",
+                       "NISTXML-string-maxLength-4-2.xml",
+                       "NISTXML-string-maxLength-4-1.xml",
+                       "NISTXML-string-maxLength-3-5.xml",
+                       "NISTXML-string-maxLength-3-4.xml",
+                       "NISTXML-string-maxLength-3-3.xml",
+                       "NISTXML-string-maxLength-3-2.xml",
+                       "NISTXML-string-maxLength-3-1.xml",
+                       "NISTXML-string-maxLength-2-5.xml",
+                       "NISTXML-string-maxLength-2-4.xml",
+                       "NISTXML-string-maxLength-2-3.xml",
+                       "NISTXML-string-maxLength-2-2.xml",
+                       "NISTXML-string-maxLength-2-1.xml",
+                       "NISTXML-string-maxLength-1-1.xml"],[]}}.
+{'NISTSchema-time',{["NISTXML-time-maxInclusive-5-5.xml",
+                     "NISTXML-time-maxInclusive-5-4.xml",
+                     "NISTXML-time-maxInclusive-5-3.xml",
+                     "NISTXML-time-maxInclusive-5-2.xml",
+                     "NISTXML-time-maxInclusive-5-1.xml",
+                     "NISTXML-time-maxInclusive-4-5.xml",
+                     "NISTXML-time-maxInclusive-4-4.xml",
+                     "NISTXML-time-maxInclusive-4-3.xml",
+                     "NISTXML-time-maxInclusive-4-2.xml",
+                     "NISTXML-time-maxInclusive-4-1.xml",
+                     "NISTXML-time-maxInclusive-3-5.xml",
+                     "NISTXML-time-maxInclusive-3-4.xml",
+                     "NISTXML-time-maxInclusive-3-3.xml",
+                     "NISTXML-time-maxInclusive-3-2.xml",
+                     "NISTXML-time-maxInclusive-3-1.xml",
+                     "NISTXML-time-maxInclusive-2-5.xml",
+                     "NISTXML-time-maxInclusive-2-4.xml",
+                     "NISTXML-time-maxInclusive-2-3.xml",
+                     "NISTXML-time-maxInclusive-2-2.xml",
+                     "NISTXML-time-maxInclusive-2-1.xml",
+                     "NISTXML-time-maxInclusive-1-1.xml",
+                     "NISTXML-time-maxExclusive-5-5.xml",
+                     "NISTXML-time-maxExclusive-5-4.xml",
+                     "NISTXML-time-maxExclusive-5-3.xml",
+                     "NISTXML-time-maxExclusive-5-2.xml",
+                     "NISTXML-time-maxExclusive-5-1.xml",
+                     "NISTXML-time-maxExclusive-4-5.xml",
+                     "NISTXML-time-maxExclusive-4-4.xml",
+                     "NISTXML-time-maxExclusive-4-3.xml",
+                     "NISTXML-time-maxExclusive-4-2.xml",
+                     "NISTXML-time-maxExclusive-4-1.xml",
+                     "NISTXML-time-maxExclusive-3-5.xml",
+                     "NISTXML-time-maxExclusive-3-4.xml",
+                     "NISTXML-time-maxExclusive-3-3.xml",
+                     "NISTXML-time-maxExclusive-3-2.xml",
+                     "NISTXML-time-maxExclusive-3-1.xml",
+                     "NISTXML-time-maxExclusive-2-5.xml",
+                     "NISTXML-time-maxExclusive-2-4.xml",
+                     "NISTXML-time-maxExclusive-2-3.xml",
+                     "NISTXML-time-maxExclusive-2-2.xml",
+                     "NISTXML-time-maxExclusive-2-1.xml",
+                     "NISTXML-time-maxExclusive-1-1.xml",
+                     "NISTXML-time-minInclusive-5-1.xml",
+                     "NISTXML-time-minInclusive-4-5.xml",
+                     "NISTXML-time-minInclusive-4-4.xml",
+                     "NISTXML-time-minInclusive-4-3.xml",
+                     "NISTXML-time-minInclusive-4-2.xml",
+                     "NISTXML-time-minInclusive-4-1.xml",
+                     "NISTXML-time-minInclusive-3-5.xml",
+                     "NISTXML-time-minInclusive-3-4.xml",
+                     "NISTXML-time-minInclusive-3-3.xml",
+                     "NISTXML-time-minInclusive-3-2.xml",
+                     "NISTXML-time-minInclusive-3-1.xml",
+                     "NISTXML-time-minInclusive-2-5.xml",
+                     "NISTXML-time-minInclusive-2-4.xml",
+                     "NISTXML-time-minInclusive-2-3.xml",
+                     "NISTXML-time-minInclusive-2-2.xml",
+                     "NISTXML-time-minInclusive-2-1.xml",
+                     "NISTXML-time-minInclusive-1-5.xml",
+                     "NISTXML-time-minInclusive-1-4.xml",
+                     "NISTXML-time-minInclusive-1-3.xml",
+                     "NISTXML-time-minInclusive-1-2.xml",
+                     "NISTXML-time-minInclusive-1-1.xml",
+                     "NISTXML-time-minExclusive-5-1.xml",
+                     "NISTXML-time-minExclusive-4-5.xml",
+                     "NISTXML-time-minExclusive-4-4.xml",
+                     "NISTXML-time-minExclusive-4-3.xml",
+                     "NISTXML-time-minExclusive-4-2.xml",
+                     "NISTXML-time-minExclusive-4-1.xml",
+                     "NISTXML-time-minExclusive-3-5.xml",
+                     "NISTXML-time-minExclusive-3-4.xml",
+                     "NISTXML-time-minExclusive-3-3.xml",
+                     "NISTXML-time-minExclusive-3-2.xml",
+                     "NISTXML-time-minExclusive-3-1.xml",
+                     "NISTXML-time-minExclusive-2-5.xml",
+                     "NISTXML-time-minExclusive-2-4.xml",
+                     "NISTXML-time-minExclusive-2-3.xml",
+                     "NISTXML-time-minExclusive-2-2.xml",
+                     "NISTXML-time-minExclusive-2-1.xml",
+                     "NISTXML-time-minExclusive-1-5.xml",
+                     "NISTXML-time-minExclusive-1-4.xml",
+                     "NISTXML-time-minExclusive-1-3.xml",
+                     "NISTXML-time-minExclusive-1-2.xml",
+                     "NISTXML-time-minExclusive-1-1.xml"],[]}}.
+{'NISTSchema-token',{["NISTXML-token-length-1-1.xml",
+                      "NISTXML-token-minLength-1-5.xml",
+                      "NISTXML-token-minLength-1-4.xml",
+                      "NISTXML-token-minLength-1-3.xml",
+                      "NISTXML-token-minLength-1-2.xml",
+                      "NISTXML-token-minLength-1-1.xml",
+                      "NISTXML-token-maxLength-5-5.xml",
+                      "NISTXML-token-maxLength-5-4.xml",
+                      "NISTXML-token-maxLength-5-3.xml",
+                      "NISTXML-token-maxLength-5-2.xml",
+                      "NISTXML-token-maxLength-5-1.xml",
+                      "NISTXML-token-maxLength-4-5.xml",
+                      "NISTXML-token-maxLength-4-4.xml",
+                      "NISTXML-token-maxLength-4-3.xml",
+                      "NISTXML-token-maxLength-4-2.xml",
+                      "NISTXML-token-maxLength-4-1.xml",
+                      "NISTXML-token-maxLength-3-5.xml",
+                      "NISTXML-token-maxLength-3-4.xml",
+                      "NISTXML-token-maxLength-3-3.xml",
+                      "NISTXML-token-maxLength-3-2.xml",
+                      "NISTXML-token-maxLength-3-1.xml",
+                      "NISTXML-token-maxLength-2-5.xml",
+                      "NISTXML-token-maxLength-2-4.xml",
+                      "NISTXML-token-maxLength-2-3.xml",
+                      "NISTXML-token-maxLength-2-2.xml",
+                      "NISTXML-token-maxLength-2-1.xml",
+                      "NISTXML-token-maxLength-1-1.xml"],[]}}.
diff --git a/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE_data/nisttest.tar.gz b/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE_data/nisttest.tar.gz
new file mode 100644
index 0000000000..03d575c268
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE_data/nisttest.tar.gz
diff --git a/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE_data/w3c-copyright-19990405.html b/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE_data/w3c-copyright-19990405.html
new file mode 100644
index 0000000000..5c89ffd95e
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE_data/w3c-copyright-19990405.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+
+
+  <meta http-equiv="Content-Type" content="text/html"><title>DOCUMENT NOTICE</title>
+  
+  <link rel="stylesheet" type="text/css" href="copyright-documents-19990405_files/base.css"></head><body bgcolor="#ffffff" text="#000000">
+<h1>W3C<sup>�</sup> DOCUMENT NOTICE AND LICENSE</h1>
+
+<h3>Copyright � 1994-2002 <a href="http://www.w3.org/">World Wide Web
+Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of
+Technology</a>, <a href="http://www.inria.fr/">Institut National de Recherche
+en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio
+University</a>). All Rights Reserved.<br>
+http://www.w3.org/Consortium/Legal/</h3>
+
+<p>Public documents on the W3C site are provided by the copyright holders
+under the following license. The software or Document Type Definitions (DTDs)
+associated with W3C specifications are governed by the <a href="http://www.w3.org/Consortium/Legal/copyright-software.html"> Software
+Notice</a>. By using and/or copying this document, or the W3C document from
+which this statement is linked, you (the licensee) agree that you have read,
+understood, and will comply with the following terms and conditions:</p>
+
+<p>Permission to use, copy, and distribute the contents of this document, or
+the W3C document from which this statement is linked, in any medium for any
+purpose and without fee or royalty is hereby granted, provided that you
+include the following on <i>ALL</i> copies of the document, or portions
+thereof, that you use:</p>
+<ol>
+  <li>A link or URL to the original W3C document.</li>
+  <li>The pre-existing copyright notice of the original author, or if it
+    doesn't exist, a notice of the form: "Copyright � [$date-of-document] <a href="http://www.w3.org/">World Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of Technology</a>,
+    <a href="http://www.inria.fr/"> Institut National de Recherche en
+    Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio
+    University</a>). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but a
+    textual representation is permitted.)</li>
+  <li><em>If it exists</em>, the STATUS of the W3C document.</li>
+</ol>
+
+<p>When space permits, inclusion of the full text of this <b> NOTICE</b>
+should be provided. We request that authorship attribution be provided in any
+software, documents, or other items or products that you create pursuant to
+the implementation of the contents of this document, or any portion
+thereof.</p>
+
+<p>No right to create modifications or derivatives of W3C documents is
+granted pursuant to this license. However, if additional requirements
+(documented in the <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright FAQ</a>) are satisfied,
+the right to create modifications or derivatives is&nbsp;sometimes granted by the
+W3C to individuals complying with those requirements.</p>
+
+<p>THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
+REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE
+FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT
+INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
+
+<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
+PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.</p>
+
+<p>The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to this document or its contents without
+specific, written prior permission. Title to copyright in this document will
+at all times remain with copyright holders.</p>
+
+<p>----------------------------------------------------------------------------</p>
+
+<p>This formulation of W3C's notice and license became active on April 05
+1999 so as to account for the treatment of DTDs, schema's and bindings. See
+the <a href="http://www.w3.org/Consortium/Legal/copyright-documents-19990218.html"> older formulation</a> for
+the policy prior to this date. Please see our <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright FAQ</a> for common questions about using
+materials from our site, including specific terms and conditions for packages
+like libwww, Amaya, and Jigsaw. Other questions about this notice can be
+directed to <a href="mailto:[email protected]">[email protected]</a>.</p>
+<address>
+  <a href="http://w3.org/Help/Webmaster.html">webmaster</a><br>
+  (last updated by reagle on 1999/04/99.)
+</address>
+</body></html>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE.erl b/lib/xmerl/test/xmerl_xsd_SUITE.erl
new file mode 100644
index 0000000000..74de42aee5
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE.erl
@@ -0,0 +1,1148 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2010. 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%
+%%
+%%
+%%% Purpose : Test suite for the ASN.1 application
+
+-module(xmerl_xsd_SUITE).
+
+-compile(export_all).
+%%-export([Function/Arity, ...]).
+
+-include_lib("test_server/include/test_server.hrl").
+%%-include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
+
+-import(xmerl_xsd_type,[check_simpleType/3]).
+
+all() -> 
+    [{group, type_tests}, {group, facets},
+     {group, misc_block_tests}, {group, validation_tests},
+     {group, ticket_tests}].
+
+groups() -> 
+    [{type_tests, [],
+      [{group, primitive_datatypes},
+       {group, derived_datatypes}]},
+     {validation_tests, [],
+      [{group, xmlSchemaPrimerExamples},
+       {group, miscXMLexamples}]},
+     {primitive_datatypes, [],
+      [string, boolean, decimal, float, double, duration,
+       dateTime, time, date, gYearMonth, gYear, gMonthDay,
+       gDay, gMonth, hexBinary, base64Binary, anyURI, 'QName',
+       'NOTATION']},
+     {derived_datatypes, [],
+      [normalizedString, token, language, 'NMTOKEN',
+       'NMTOKENS', 'Name', 'NCName', 'ID', 'IDREF', 'IDREFS',
+       'ENTITY', 'ENTITIES', integer, nonPositiveInteger,
+       negativeInteger, long, int, short, byte,
+       nonNegativeInteger, unsignedLong, unsignedInt,
+       unsignedShort, unsignedByte, positiveInteger]},
+     {xmlSchemaPrimerExamples, [],
+      [po, po1, po2, ipo, ipo_redefine, '4Q99']},
+     {miscXMLexamples, [],
+      [small, complexType1, model_group_all,
+       substitutionGroup, attributeGroup, test_key1, sis1,
+       sis2, state2file_file2state, union]},
+     {ticket_tests, [],
+      [ticket_6910, ticket_7165, ticket_7190, ticket_7288,
+       ticket_7736, ticket_8599]},
+     {facets, [],
+      [length, minLength, maxLength, pattern, enumeration,
+       whiteSpace, maxInclusive, maxExclusive, minExclusive,
+       minInclusive, totalDigits, fractionDigits]},
+     {misc_block_tests, [],
+      [compare_dateTime, compare_duration]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+init_per_testcase(_TestCase,Config) ->
+    {ok, _} = 
+	file:read_file_info(filename:join([?config(priv_dir,Config)])),
+    code:add_patha(?config(priv_dir,Config)),
+    Dog=test_server:timetrap({minutes,10}),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Func,Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+
+string(suite) -> []; 
+string(_Config) ->
+    %% #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
+    Str = [16#9,16#A,16#D,16#20,16#D7FF,16#E000,16#FFFD,16#10000,
+		 16#10FFFF],
+    ?line {ok,_} = check_simpleType(string,Str,dummy).
+    
+boolean(suite) -> [];
+boolean(_Config) ->
+    ?line {ok,_} = check_simpleType(boolean,"1",dummy),
+    ?line {ok,_} = check_simpleType(boolean,"0",dummy),
+    ?line {ok,_} = check_simpleType(boolean,"true",dummy),
+    ?line {ok,_} = check_simpleType(boolean,"false",dummy),
+    ?line {error,_Reason} = check_simpleType(boolean,"gurka",dummy).
+
+decimal(suite) -> [];
+decimal(_Config) ->
+    ?line {ok,_} = check_simpleType(decimal,"-1.23",dummy),
+    ?line {ok,_} = check_simpleType(decimal,"12678967.543233",dummy),
+    ?line {ok,_} = check_simpleType(decimal,"+100000.00",dummy),
+    ?line {ok,_} = check_simpleType(decimal,"210",dummy).
+
+float(suite) -> [];
+float(_Config) ->
+    %% -1E4, 1267.43233E12, 12.78e-2, 12 , -0, 0 , INF, -INF, NaN
+    ?line {ok,_} = check_simpleType(float,"-1E4",dummy),
+    ?line {ok,_} = check_simpleType(float,"1267.43233E12",dummy),
+    ?line {ok,_} = check_simpleType(float,"12.78e-2",dummy),
+    ?line {ok,_} = check_simpleType(float,"12",dummy),
+    ?line {ok,_} = check_simpleType(float,"-0",dummy),
+    ?line {ok,_} = check_simpleType(float,"0",dummy),
+    ?line {ok,_} = check_simpleType(float,"INF",dummy),
+    ?line {ok,_} = check_simpleType(float,"-INF",dummy),
+    ?line {ok,_} = check_simpleType(float,"NaN",dummy).
+
+
+double(suite) -> []; 
+double(_Config) ->
+    %% -1E4, 1267.43233E12, 12.78e-2, 12 , -0, 0 , INF, -INF, NaN
+    ?line {ok,_} = check_simpleType(double,"-1E4",dummy),
+    ?line {ok,_} = check_simpleType(double,"1267.43233E12",dummy),
+    ?line {ok,_} = check_simpleType(double,"12.78e-2",dummy),
+    ?line {ok,_} = check_simpleType(double,"12",dummy),
+    ?line {ok,_} = check_simpleType(double,"-0",dummy),
+    ?line {ok,_} = check_simpleType(double,"0",dummy),
+    ?line {ok,_} = check_simpleType(double,"INF",dummy),
+    ?line {ok,_} = check_simpleType(double,"-INF",dummy),
+    ?line {ok,_} = check_simpleType(double,"NaN",dummy).
+
+
+duration(suite) -> []; 
+duration(_Config) ->
+    %% allowed: P1Y2M3DT10H30M -P120D P1347Y P1347M P1Y2MT2H 
+    %% P0Y1347M P0Y1347M0D -P1347M 
+    %% not allowed: P-1347M P1Y2MT
+    ?line {ok,_} = check_simpleType(duration,"P1Y2M3DT10H30M",dummy),
+    ?line {ok,_} = check_simpleType(duration,"-P120D",dummy),
+    ?line {ok,_} = check_simpleType(duration,"P1347Y",dummy),
+    ?line {ok,_} = check_simpleType(duration,"P1347M",dummy),
+    ?line {ok,_} = check_simpleType(duration,"P1Y2MT2H",dummy),
+    ?line {ok,_} = check_simpleType(duration,"P0Y1347M",dummy),
+    ?line {ok,_} = check_simpleType(duration,"P0Y1347M0D",dummy),
+    ?line {ok,_} = check_simpleType(duration,"-P1347M",dummy),
+
+    ?line {error,_} = check_simpleType(duration,"P-1347M",dummy),
+    ?line {error,_} = check_simpleType(duration,"P1Y2MT",dummy).
+
+%% '-'? yyyy '-' mm '-' dd 'T' hh ':' mm ':' ss ('.' s+)? (zzzzzz)?
+dateTime(suite) -> []; 
+dateTime(_Config) ->
+    %% 2002-10-10T12:00:00-05:00
+    DT1 = "2002-10-10T12:00:00-05:00",
+    ?line {ok,_} = check_simpleType(dateTime,DT1,dummy),
+    DT2 = "2002-10-10T17:00:00Z",
+    ?line {ok,_} = check_simpleType(dateTime,DT2,dummy),
+    %% plus sign prohibited
+    DT3 = "+2002-10-10T17:00:00Z",
+    ?line {error,_Reason3} = check_simpleType(dateTime,DT3,dummy),
+    %% leading zeros when year are more than four digits prohibited
+    DT4 = "002002-10-10T17:00:00Z",
+    ?line {error,_Reason4} = check_simpleType(dateTime,DT4,dummy),
+    DT5 = "1953-12-31T12:10:10.10+12:00",
+    ?line {ok,_} = check_simpleType(dateTime,DT5,dummy).
+
+time(suite) -> []; 
+time(_Config) ->
+    %% hh:mm:ss.sss with optional following time zone indicator.
+    T1 = "13:20:00-05:00",
+    ?line {ok,_} = check_simpleType(time,T1,dummy),
+    %% canonical repr. of midnight
+    T2 = "00:00:00",
+    ?line {ok,_} = check_simpleType(time,T2,dummy),
+    T3 = "12:34:56",
+    ?line {ok,_} = check_simpleType(time,T3,dummy),
+    T4 = "12:34:56.552",
+    ?line {ok,_} = check_simpleType(time,T4,dummy),
+    T5 = "12:34:56.552Z",
+    ?line {ok,_} = check_simpleType(time,T5,dummy).    
+
+date(suite) -> []; 
+date(_Config) ->
+    %% '-'? yyyy '-' mm '-' dd zzzzzz?
+    %%  is 
+    D1 = "2002-10-10+13:00",
+    ?line {ok,_} = check_simpleType(date,D1,dummy),
+    D2 = "2002-10-09-11:00",
+    ?line {ok,_} = check_simpleType(date,D2,dummy),
+
+    D12 = "+2002-13-09-11:00",
+    ?line {error,_Reason12} = check_simpleType(date,D12,dummy),
+    D13 = "2002-13-09-11:00",
+    ?line {error,_Reason13} = check_simpleType(date,D13,dummy),
+    D14 = "2002-12-39-11:00",
+    ?line {error,_Reason14} = check_simpleType(date,D14,dummy).
+
+gYearMonth(suite) -> []; 
+gYearMonth(_Config) -> 
+    %% '-'? yyyy '-' mm zzzzzz?
+    GYM1 = "1955-10",
+    ?line {ok,_} = check_simpleType(gYearMonth,GYM1,dummy),
+    GYM2 = "-1955-10",
+    ?line {ok,_} = check_simpleType(gYearMonth,GYM2,dummy),
+    GYM3 = "1955-10Z",
+    ?line {ok,_} = check_simpleType(gYearMonth,GYM3,dummy),
+    GYM4 = "0055-10+10:00",
+    ?line {ok,_} = check_simpleType(gYearMonth,GYM4,dummy),
+    GYM5 = "0955-10Z",
+    ?line {ok,_} = check_simpleType(gYearMonth,GYM5,dummy),
+    GYM6 = "-11955-01",
+    ?line {ok,_} = check_simpleType(gYearMonth,GYM6,dummy),
+
+    ?line {error,_} = check_simpleType(gYearMonth,"+2000-10",dummy),
+    ?line {error,_} = check_simpleType(gYearMonth,"2000-00",dummy),
+    ?line {error,_} = check_simpleType(gYearMonth,"2000-10+10:70",dummy). 
+
+gYear(suite) -> []; 
+gYear(_Config) ->
+    %% '-'? yyyy zzzzzz?
+    ?line {ok,_} = check_simpleType(gYear,"2000",dummy),
+    ?line {ok,_} = check_simpleType(gYear,"2000-11:30",dummy),
+    ?line {ok,_} = check_simpleType(gYear,"-2000",dummy),
+    ?line {error,_} = check_simpleType(gYear,"0000",dummy).
+
+gMonthDay(suite) -> []; 
+gMonthDay(_Config) ->
+    %% mm '-' dd zzzzzz?
+    ?line {ok,_} = check_simpleType(gMonthDay,"--05-03",dummy),
+    ?line {ok,_} = check_simpleType(gMonthDay,"--05-03Z",dummy),
+    ?line {error,_} = check_simpleType(gMonthDay,"05-00",dummy),
+    ?line {error,_} = check_simpleType(gMonthDay,"00-03",dummy),
+    ?line {error,_} = check_simpleType(gMonthDay,"-05-03",dummy).
+
+gDay(suite) -> [];
+gDay(_Config) ->
+    %% dd zzzzzz?
+    ?line {ok,_} = check_simpleType(gDay,"---05",dummy),
+    ?line {ok,_} = check_simpleType(gDay,"---30+03:00",dummy),
+    ?line {error,_} = check_simpleType(gDay,"-30+03:00",dummy),
+    ?line {error,_} = check_simpleType(gDay,"---00+03:00",dummy),
+    ?line {error,_} = check_simpleType(gDay,"---40+03:00",dummy),
+    ?line {error,_} = check_simpleType(gDay,"05",dummy).
+
+gMonth(suite) -> []; 
+gMonth(_Config) ->
+    %% mm zzzzzz?
+    ?line {ok,_} = check_simpleType(gMonth,"--05",dummy),
+    ?line {ok,_} = check_simpleType(gMonth,"--10+03:00",dummy),
+    ?line {error,_} = check_simpleType(gMonth,"-10+03:00",dummy),
+    ?line {error,_} = check_simpleType(gMonth,"00+03:00",dummy),
+    ?line {error,_} = check_simpleType(gMonth,"14",dummy),
+    ?line {error,_} = check_simpleType(gMonth,"05",dummy).
+
+
+hexBinary(suite) -> [];
+hexBinary(_Config) ->
+    %% an even number of hexadecimal digits ([0-9a-fA-F]).
+    ?line {ok,_} = check_simpleType(hexBinary,"05",dummy),
+    ?line {ok,_} = check_simpleType(hexBinary,"aF",dummy),
+    ?line {ok,_} = check_simpleType(hexBinary,
+					     "0123456789abcdefABCDEF",dummy),
+    ?line {error,_} = check_simpleType(hexBinary,
+					     "0123456789absdefABCDEF",dummy),
+    ?line {error,_} = check_simpleType(hexBinary,"aF5",dummy),
+    ?line {error,_} = check_simpleType(hexBinary,"aFG",dummy).
+
+base64Binary(suite) -> []; 
+base64Binary(_Config) ->
+    %% a-z, A-Z, 0-9, the plus sign (+), the forward slash (/) and the
+    %% equal sign (=), together with the characters defined in [XML
+    %% 1.0 (Second Edition)] as white space.(16#9, 16#A, 16#D, 16#20)
+    ?line {ok,_} = check_simpleType(base64Binary,"05+/AA==",dummy),
+    ?line {ok,_} = check_simpleType(base64Binary,"05+/AA= =",dummy),
+    ?line {ok,_} = check_simpleType(base64Binary,"05+/A A= =",dummy),
+    ?line {ok,_} = check_simpleType(base64Binary,"05+/ AA= =",dummy),
+    ?line {error,_} = check_simpleType(base64Binary,"05+/AA== ",dummy),
+    B64B1 = "AbCd GhZz 09w=",
+    ?line {ok,_} = check_simpleType(base64Binary,B64B1,dummy),
+    B64B2 = "AbCd GhZ9 0z8 =",
+    ?line {ok,_} = check_simpleType(base64Binary,B64B2,dummy),
+    ?line {ok,_} = check_simpleType(base64Binary,"0z8 =",dummy),
+    ErrB641 = "AbCd GZ9 0z8 =",
+    ?line {error,_} = check_simpleType(base64Binary,ErrB641,dummy).
+
+anyURI(suite) -> [];
+anyURI(_Config) ->
+    URI1 = "ftp://ftp.is.co.za/rfc/rfc1808.txt",
+    URI2 = "gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles",
+    URI3 = "http://www.math.uio.no/faq/compression-faq/part1.html",
+    URI4 = "mailto:[email protected]",
+    URI5 = "news:comp.infosystems.www.servers.unix",
+    URI6 = "telnet://melvyl.ucop.edu/",
+    ?line ok=ok_loop(anyURI,[URI1,URI2,URI3,URI4,URI5,URI6]).
+
+
+'QName'(suite) -> [];
+'QName'(_Config) ->
+    %%  QName 	   ::= 	(Prefix ':')? LocalPart
+    %% 	Prefix 	   ::= 	NCName
+    %% 	LocalPart  ::= 	NCName
+    ?line {ok,_} = check_simpleType('QName',"abc:def",dummy),
+    ?line {ok,_} = check_simpleType('QName',"abc",dummy),
+    ?line {ok,_} = check_simpleType('QName',"abc:def:ijk",dummy).
+
+'NOTATION'(suite) -> [];
+'NOTATION'(_Config) ->
+    ?line {ok,_} = check_simpleType('NOTATION',"abc:def",dummy),
+    ?line {ok,_} = check_simpleType('NOTATION',"abc",dummy),
+    ?line {ok,_} = check_simpleType('NOTATION',"abc:def:ijk",dummy).
+
+normalizedString(suite) -> [];
+normalizedString(_Config) ->
+    %% not contain the carriage return (#xD), line feed (#xA) nor tab
+    %% (#x9) characters.
+    NStr1 = "this string is ok with extra space     between characters",
+    NotNStr1 = "this string is not normalized \t",
+    NotNStr2 = "neither is this \n string",
+    NotNStr3 = "or this \r string",
+    ?line {ok,_}  = check_simpleType(normalizedString,NStr1,dummy),
+    ?line ok=error_loop(normalizedString,[NotNStr1,NotNStr2,NotNStr3]).
+
+token(suite) -> [];
+token(_Config) ->
+    %% not contain the carriage return (#xD), line feed (#xA) nor tab
+    %% (#x9) characters, that have no leading or trailing spaces
+    %% (#x20) and that have no internal sequences of two or more
+    %% spaces.
+    T1 = "this string is tokenized with only single space between characters",
+    NotT1 = "this string is not ok with  extra space     between  characters",
+    NotT2 = " neither leading space",
+    NotT3 = "nor trailing space ",
+    NotT4 = "tabs not \t allowed",
+    NotT5 = "newlines not allowed\n",
+    NotT6 = "or \r (carriage return)",
+    ?line {ok,_}  = check_simpleType(token,T1,dummy),
+    ?line ok=error_loop(token,[NotT1,NotT2,NotT3,NotT4,NotT5,NotT6]).
+
+language(suite) -> [];
+language(_Config) ->
+    %% strings that conform to the pattern
+    %% [a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*
+    L = "Abra-cadabra-123",
+    NotL1 = "Abra123-cadabra!",
+    NotL2 = "Abra-",
+    NotL3 = "Abracadabra",
+    NotL4 = "Abra-cadabrrra",
+    ?line {ok,_}  = check_simpleType(language,L,dummy),
+    ?line ok=error_loop(language,[NotL1,NotL2,NotL3,NotL4]).
+
+'NMTOKEN'(suite) -> [];
+'NMTOKEN'(_Config) ->
+    N = "name:withoutspace",
+    NotN1 = "name with space",
+    NotN2 = "namewith#strang/chars)",
+    ?line {ok,_}  = check_simpleType('NMTOKEN',N,dummy),
+    ?line {error,_} = check_simpleType('NMTOKEN',NotN1,dummy),
+    ?line {error,_} = check_simpleType('NMTOKEN',NotN2,dummy).
+
+'NMTOKENS'(suite) -> [];
+'NMTOKENS'(_Config) ->
+    N1 = "name1 name:2 name:three",
+    NotN1 = "name na%me",
+    ?line {ok,_}  = check_simpleType('NMTOKENS',N1,dummy),
+    ?line {error,_} = check_simpleType('NMTOKENS',NotN1,dummy).
+
+'Name'(suite) -> [];
+'Name'(_Config) ->
+    ?line {ok,_}  = check_simpleType('Name',"_valid_Name",dummy).
+
+'NCName'(suite) -> [];
+'NCName'(_Config) ->
+    ?line {ok,_}  = check_simpleType('NCName',"_valid_Name",dummy).
+
+'ID'(suite) -> [];
+'ID'(_Config) ->
+    ?line {ok,_}  = check_simpleType('ID',"_valid_Name",dummy).
+
+'IDREF'(suite) -> []; 
+'IDREF'(_Config) ->
+    ?line {ok,_}  = check_simpleType('IDREF',"_valid_Name",dummy).
+
+'IDREFS'(suite) -> [];
+'IDREFS'(_Config) ->
+    ?line {ok,_}  = check_simpleType('IDREFS',"_valid_Name Name2",dummy).
+
+'ENTITY'(suite) -> [];
+'ENTITY'(_Config) ->
+    ?line {ok,_}  = check_simpleType('ENTITY',"_valid_Name",dummy).
+
+'ENTITIES'(suite) -> [];
+'ENTITIES'(_Config) ->
+    ?line {ok,_}  = check_simpleType('ENTITIES',"name name3",dummy).
+
+integer(suite) -> [];
+integer(_Config) ->
+    IntList = ["-1", "0", "12678967543233", "+100000"],
+    ?line ok = ok_loop(integer,IntList),
+    ?line {error,_} = check_simpleType(integer,"1.3",dummy).
+
+nonPositiveInteger(suite) -> [];
+nonPositiveInteger(_Config) ->
+    NPIList = ["0", "-12678967543233", "-100000"],
+    ?line ok = ok_loop(nonPositiveInteger,NPIList),
+    ?line {error,_} = check_simpleType(nonPositiveInteger,"1",dummy).
+
+negativeInteger(suite) -> [];
+negativeInteger(_Config) ->
+    NIList = ["-1", "-12678967543233", "-100000"],
+    ?line ok = ok_loop(negativeInteger,NIList),
+    ?line {error,_} = check_simpleType(negativeInteger,"1",dummy),
+    ?line {error,_} = check_simpleType(negativeInteger,"0",dummy).
+
+long(suite) -> [];
+long(_Config) ->
+    L = ["9223372036854775807","-9223372036854775808","-1", "0",
+	 "12678967543233", "+100000"],
+    ?line ok = ok_loop(long,L),
+    Err = ["9223372036854775808","-9223372036854775809"],
+    ?line ok = error_loop(long,Err).
+
+int(suite) -> [];
+int(_Config) ->
+    L = ["2147483647", "-2147483648", "-1", "0", "126789675", "+100000"],
+    ?line ok = ok_loop(int,L),
+    Err = ["2147483648", "-2147483649"],
+    ?line ok = error_loop(int,Err).
+
+short(suite) -> [];
+short(_Config) ->
+    L = ["32767", "-32768", "-1", "0", "12678", "+10000"],
+    ?line ok = ok_loop(short,L),
+    Err = ["32768", "-32769"],
+    ?line ok = error_loop(short,Err).
+
+byte(suite) -> [];
+byte(_Config) ->
+    L = ["-1", "0", "126", "+100", "127", "-128"],
+    ?line ok = ok_loop(byte,L),
+    Err = ["128", "-129"],
+    ?line ok = error_loop(byte,Err).
+
+nonNegativeInteger(suite) -> [];
+nonNegativeInteger(_Config) ->
+    L = ["1", "0", "12678967543233", "+100000"],
+    ?line ok = ok_loop(nonNegativeInteger,L),
+    ?line {error,_} = check_simpleType(nonNegativeInteger,"-1",dummy).
+
+unsignedLong(suite) -> [];
+unsignedLong(_Config) ->
+    L = ["0", "12678967543233", "100000", "18446744073709551615"],
+    ?line ok = ok_loop(unsignedLong,L),
+    Err = ["-1","18446744073709551616"],
+    ?line ok = error_loop(unsignedLong,Err).
+
+unsignedInt(suite) -> [];
+unsignedInt(_Config) ->
+    L = ["4294967295", "0", "1267896754", "100000"],
+    ?line ok = ok_loop(unsignedInt,L),
+    Err = ["-1","4294967296"],
+    ?line ok = error_loop(unsignedInt,Err).
+
+unsignedShort(suite) -> [];
+unsignedShort(_Config) ->
+    L = ["65535", "0", "12678", "10000"],
+    ?line ok = ok_loop(unsignedShort,L),
+    Err = ["-1","65536"],
+    ?line ok = error_loop(unsignedShort,Err).
+
+unsignedByte(suite) -> [];
+unsignedByte(_Config) ->
+    L = ["255", "0", "126", "100"],
+    ?line ok = ok_loop(unsignedByte,L),
+    Err = ["-1","256"],
+    ?line ok = error_loop(unsignedByte,Err). 
+
+positiveInteger(suite) -> [];
+positiveInteger(_Config) ->
+    L = ["1", "12678967543233", "+100000"],
+    ?line ok = ok_loop(positiveInteger,L),
+    Err = ["-1","0"],
+    ?line ok = error_loop(positiveInteger,Err). 
+    
+
+
+ok_loop(_Type,[]) ->
+    ok;
+ok_loop(Type,[H|T]) ->
+    ?line {ok,_} = check_simpleType(Type,H,dummy),
+    ok_loop(Type,T).
+
+error_loop(_T,[]) ->
+    ok;
+error_loop(Type,[H|T]) ->
+    ?line {error,_} = check_simpleType(Type,H,dummy),
+    error_loop(Type,T).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Testing facets
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+length(suite) -> [];
+length(_Config) ->
+    ?line {ok,"string"} = 
+	(xmerl_xsd_type:facet_fun(string,{length,"6"}))("string"),
+    ?line {error,{length,12,should_be,6}} =
+	(xmerl_xsd_type:facet_fun(string,{length,"6"}))("stringstring"),
+    ok.
+    
+minLength(suite) -> [];
+minLength(_Config) ->
+    ?line {ok,"string"} = 
+	(xmerl_xsd_type:facet_fun(string,{minLength,"6"}))("string"),
+    ?line {error,{minLength,3,should_at_least_be,6}} =
+	(xmerl_xsd_type:facet_fun(string,{minLength,"6"}))("str"),
+    ok.
+
+maxLength(suite) -> [];
+maxLength(_Config) ->
+    ?line {ok,"string"} =
+	(xmerl_xsd_type:facet_fun(string,{maxLength,"6"}))("string"),
+    ?line {error,{maxLength,12,should_not_be_more_than,6}} =
+	(xmerl_xsd_type:facet_fun(string,{maxLength,"6"}))("stringstring"),
+    ok.
+
+pattern(suite) -> [];
+pattern(_Config) ->
+    RE1 = "[a-z]{5}",
+    ?line {ok,"calle"} = 
+	(xmerl_xsd_type:facet_fun(string,{pattern,RE1}))
+	  ("calle"),
+    ?line {error,{pattern_mismatch,"cal",RE1}} =
+	(xmerl_xsd_type:facet_fun(string,{pattern,RE1}))
+	  ("cal"),
+    RE2 = "[A-Z]{2}\\d\\s\\d[A-Z]{2}",
+    ?line {ok,"AY2 3BC"} =
+	(xmerl_xsd_type:facet_fun(string,{pattern,RE2}))
+	  ("AY2 3BC"),
+    ?line {error,{pattern_mismatch,"AY23BC",RE2}} =
+	(xmerl_xsd_type:facet_fun(string,{pattern,RE2}))
+	  ("AY23BC").
+
+enumeration(suite) -> [];
+enumeration(_Config) ->
+    ?line {ok,"tomat"} = 
+	(xmerl_xsd_type:facet_fun(string,{enumeration,["gurka","tomat","sallad"]}))("tomat"),
+    ?line {error,{enumeration,"morot",should_be_one_of,["gurka","tomat","sallad"]}} =
+	(xmerl_xsd_type:facet_fun(string,{enumeration,["gurka","tomat","sallad"]}))("morot"),
+    ok.
+
+whiteSpace(suite) -> [];
+whiteSpace(_Config) ->
+    ?line {ok,"gur ka"} = (xmerl_xsd_type:facet_fun(string,{whiteSpace,"collapse"}))("  gur\tka "),
+    ?line {ok," gur ka "} = (xmerl_xsd_type:facet_fun(string,{whiteSpace,"replace"}))(" gur\nka\t"),
+    ?line {ok," gurk\na\t"} = (xmerl_xsd_type:facet_fun(string,{whiteSpace,"preserve"}))(" gurk\na\t"),
+    ok.
+
+maxInclusive(suite) -> [];
+maxInclusive(_Config) ->
+    ?line {error,{maxInclusive,"3",should_be_less_than_or_equal_with,"2"}} =
+	(xmerl_xsd_type:facet_fun(integer,{maxInclusive,"2"}))("3"),
+
+    ?line {error,{maxInclusive,"3",should_be_less_than_or_equal_with,"2"}} =
+	(xmerl_xsd_type:facet_fun(decimal,{maxInclusive,"2"}))("3"),
+    ?line {error,{maxInclusive,_,should_be_less_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(decimal,{maxInclusive,"2.234"}))("2.235"),
+    ?line {error,{maxInclusive,_,should_be_less_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(decimal,{maxInclusive,"-2.222"}))("-2.221"),
+
+    ?line {error,{maxInclusive,_,should_be_less_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(double,{maxInclusive,"2.333"}))("INF"),
+    ?line {error,{maxInclusive,_,should_be_less_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(double,{maxInclusive,"1E3"}))("1001"),
+
+    ?line {error,{maxInclusive,_,should_be_less_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(float,{maxInclusive,"-0.1"}))("-0"),
+    ?line {error,{maxInclusive,_,should_be_less_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(float,{maxInclusive,"0"}))("0.01"),
+
+    ?line {ok,"3"} = (xmerl_xsd_type:facet_fun(integer,{maxInclusive,"3"}))("3"),
+
+    ?line {ok,"+100000.00"} = 
+	(xmerl_xsd_type:facet_fun(decimal,{maxInclusive,"1E6"}))("+100000.00"),
+    ?line {ok,"12678967.543222"} = 
+	(xmerl_xsd_type:facet_fun(decimal,{maxInclusive,"12678967.543233"}))("12678967.543222"),
+
+    ?line {ok,"3.2E-11"} = 
+	(xmerl_xsd_type:facet_fun(double,{maxInclusive,"2E-10"}))("3.2E-11"),
+    ?line {ok,"10E20"} = 
+	(xmerl_xsd_type:facet_fun(double,{maxInclusive,"INF"}))("10E20"),
+    ?line {ok,"0.127"} = 
+	(xmerl_xsd_type:facet_fun(double,{maxInclusive,"12.78e-2"}))("0.127"),
+
+    ?line {ok,"1267.43233E12"} = (xmerl_xsd_type:facet_fun(float,{maxInclusive,"1267.43233E12"}))("1267.43233E12"),
+    ?line {ok,"34E-26"} = (xmerl_xsd_type:facet_fun(float,{maxInclusive,"33E-25"}))("34E-26"),
+
+    ?line {ok,"2007-10-26T12:00:00+03:00"} =
+	(xmerl_xsd_type:facet_fun(dateTime,{maxInclusive,"2007-10-26T12:00:00+03:00"}))("2007-10-26T12:00:00+03:00"),
+    ?line {ok,"2007-10-26T11:00:00+03:00"} =
+	(xmerl_xsd_type:facet_fun(dateTime,{maxInclusive,"2007-10-26T12:00:00+03:00"}))("2007-10-26T11:00:00+03:00"),
+    ?line {error,{maxInclusive,_,should_be_less_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(dateTime,{maxInclusive,"2007-10-26T12:00:00+03:00"}))("2007-10-26T12:00:00"),
+
+    ?line {ok,"P1Y2M3DT10H30M"} =
+	(xmerl_xsd_type:facet_fun(duration,{maxInclusive,"P1Y2M4D"}))("P1Y2M3DT10H30M"),
+    ?line {error,{maxInclusive,_,should_be_less_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(duration,{maxInclusive,"P1Y2M3DT10H"}))("P1Y2M3DT10H30M"),
+    ok.
+	
+maxExclusive(suite) -> [];
+maxExclusive(_Config) ->
+    ?line {error,{maxExclusive,"2",not_less_than,"2"}} =
+	(xmerl_xsd_type:facet_fun(integer,{maxExclusive,"2"}))("2"),
+    ?line {error,{maxExclusive,"-19999",not_less_than,"-20000"}} =
+	(xmerl_xsd_type:facet_fun(integer,{maxExclusive,"-20000"}))("-19999"),
+
+    ?line {error,{maxExclusive,"3.0000",not_less_than,"2.9999"}} =
+	(xmerl_xsd_type:facet_fun(decimal,{maxExclusive,"2.9999"}))("3.0000"),
+    ?line {error,{maxExclusive,_,not_less_than,_}} =
+	(xmerl_xsd_type:facet_fun(decimal,{maxExclusive,"2.234"}))("2.234"),
+    ?line {error,{maxExclusive,_,not_less_than,_}} =
+	(xmerl_xsd_type:facet_fun(decimal,{maxExclusive,"-2.22222222"}))("-2.22222222"),
+
+    ?line {error,{maxExclusive,_,not_less_than,_}} =
+	(xmerl_xsd_type:facet_fun(double,{maxExclusive,"2.333E23"}))("INF"),
+    ?line {error,{maxExclusive,_,not_less_than,_}} =
+	(xmerl_xsd_type:facet_fun(double,{maxExclusive,"1E3"}))("1000"),
+    ?line {error,{maxExclusive,_,not_less_than,_}} =
+	(xmerl_xsd_type:facet_fun(double,{maxExclusive,"1E-13"}))("0.999E-12"),
+
+    ?line {error,{maxExclusive,_,not_less_than,_}} =
+	(xmerl_xsd_type:facet_fun(float,{maxExclusive,"-0.1"}))("-0.01E1"),
+    ?line {error,{maxExclusive,_,not_less_than,_}} =
+	(xmerl_xsd_type:facet_fun(float,{maxExclusive,"-1E-1"}))("-0"),
+
+    ?line {ok,"-4"} = (xmerl_xsd_type:facet_fun(integer,{maxExclusive,"3"}))("-4"),
+
+    ?line {ok,"+100000.00"} = 
+	(xmerl_xsd_type:facet_fun(decimal,{maxExclusive,"1E6"}))("+100000.00"),
+    %% must support 18 digits
+    ?line {ok,"12678967.5432323456"} = 
+	(xmerl_xsd_type:facet_fun(decimal,{maxExclusive,"12678967.5432323457"}))("12678967.5432323456"),
+
+    ?line {ok,"3.2E-11"} = 
+	(xmerl_xsd_type:facet_fun(double,{maxExclusive,"2E-10"}))("3.2E-11"),
+    ?line {ok,"10E20"} = 
+	(xmerl_xsd_type:facet_fun(double,{maxExclusive,"INF"}))("10E20"),
+    ?line {ok,"0.127"} = 
+	(xmerl_xsd_type:facet_fun(double,{maxExclusive,"12.78e-2"}))("0.127"),
+
+    ?line {ok,"1267.43233E11"} = (xmerl_xsd_type:facet_fun(float,{maxExclusive,"1267.43233E12"}))("1267.43233E11"),
+    ?line {ok,"34E-26"} = (xmerl_xsd_type:facet_fun(float,{maxExclusive,"33E-25"}))("34E-26"), 
+    
+    ?line {ok,"P1Y2M3DT10H30M"}  = (xmerl_xsd_type:facet_fun(duration,{maxExclusive,"P1Y2M4D"}))("P1Y2M3DT10H30M"),
+
+    ?line {ok,"2006-09-06T19:17:45Z"}  = (xmerl_xsd_type:facet_fun(dateTime,{maxExclusive,"2006-09-06T19:17:46Z"}))("2006-09-06T19:17:45Z"),
+    ok.
+
+minExclusive(suite) -> [];
+minExclusive(_Config) ->
+    ?line {error,{minExclusive,"2",not_greater_than,"2"}} =
+	(xmerl_xsd_type:facet_fun(integer,{minExclusive,"2"}))("2"),
+    ?line {error,{minExclusive,"-20001",not_greater_than,"-20000"}} =
+	(xmerl_xsd_type:facet_fun(integer,{minExclusive,"-20000"}))("-20001"),
+    
+    ?line {error,{minExclusive,"2.9999",not_greater_than,"2.9999"}} =
+	(xmerl_xsd_type:facet_fun(decimal,{minExclusive,"2.9999"}))("2.9999"),
+    ?line {error,{minExclusive,_,not_greater_than,_}} =
+	(xmerl_xsd_type:facet_fun(decimal,{minExclusive,"-123456789.123456788"}))("-123456789.123456789"),
+    ?line {error,{minExclusive,_,not_greater_than,_}} =
+	(xmerl_xsd_type:facet_fun(decimal,{minExclusive,"-2.222222000"}))("-2.22222222"),
+
+    ?line {error,{minExclusive,_,not_greater_than,_}} =
+	(xmerl_xsd_type:facet_fun(double,{minExclusive,"INF"}))("2.333E23"),
+    ?line {error,{minExclusive,_,not_greater_than,_}} =
+	(xmerl_xsd_type:facet_fun(double,{minExclusive,"1E3"}))("1000"),
+    ?line {error,{minExclusive,_,not_greater_than,_}} =
+	(xmerl_xsd_type:facet_fun(double,{minExclusive,"1E-13"}))("0.999E-14"),
+
+    ?line {error,{minExclusive,_,not_greater_than,_}} =
+	(xmerl_xsd_type:facet_fun(float,{minExclusive,"-0.1"}))("-0.01E1"),
+    ?line {error,{minExclusive,_,not_greater_than,_}} =
+	(xmerl_xsd_type:facet_fun(float,{minExclusive,"-0"}))("-1E-1"),
+
+    ?line {ok,"4"} = (xmerl_xsd_type:facet_fun(integer,{minExclusive,"-3"}))("4"),
+
+    ?line {ok,"+1000001.00"} = 
+	(xmerl_xsd_type:facet_fun(decimal,{minExclusive,"1E6"}))("+1000001.00"),
+    %% must support 18 digits
+    ?line {ok,"12678967.5432323456"} = 
+	(xmerl_xsd_type:facet_fun(decimal,{minExclusive,"12678967.54323234555"}))("12678967.5432323456"),
+
+    ?line {ok,"3.2E-11"} = 
+	(xmerl_xsd_type:facet_fun(double,{minExclusive,"2E-12"}))("3.2E-11"),
+    ?line {ok,"10E20"} = 
+	(xmerl_xsd_type:facet_fun(double,{minExclusive,"-INF"}))("10E20"),
+    ?line {ok,"0.1279"} = 
+	(xmerl_xsd_type:facet_fun(double,{minExclusive,"12.78e-2"}))("0.1279"),
+
+    ?line {ok,"126743.233E11"} = (xmerl_xsd_type:facet_fun(float,{minExclusive,"1267.43233E12"}))("126743.233E11"),
+    ?line {ok,"34E-26"} = (xmerl_xsd_type:facet_fun(float,{minExclusive,"33E-27"}))("34E-26"),
+
+    ?line {ok,"P1Y2M3DT10H30M"}  = (xmerl_xsd_type:facet_fun(duration,{minExclusive,"P1Y2M3D"}))("P1Y2M3DT10H30M"),
+
+    ?line {ok,"2006-09-06T19:17:45Z"}  = (xmerl_xsd_type:facet_fun(dateTime,{minExclusive,"2006-09-06T19:17:44Z"}))("2006-09-06T19:17:45Z"),
+    ok.
+
+minInclusive(suite) -> [];
+minInclusive(_Config) ->
+    ?line {error,{minInclusive,"1",not_greater_than_or_equal_with,"2"}} =
+	(xmerl_xsd_type:facet_fun(integer,{minInclusive,"2"}))("1"),
+    ?line {error,{minInclusive,"-20001",not_greater_than_or_equal_with,
+	    "-20000"}} =
+	(xmerl_xsd_type:facet_fun(integer,{minInclusive,"-20000"}))("-20001"),
+    
+    ?line {error,{minInclusive,"2.9999",not_greater_than_or_equal_with,
+	    "2.99999"}} =
+	(xmerl_xsd_type:facet_fun(decimal,{minInclusive,"2.99999"}))("2.9999"),
+    ?line {error,{minInclusive,_,not_greater_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(decimal,{minInclusive,"-123456789.123456788"}))("-123456789.123456789"),
+    ?line {error,{minInclusive,_,not_greater_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(decimal,{minInclusive,"-2.222222000"}))("-2.22222222"),
+
+    ?line {error,{minInclusive,_,not_greater_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(double,{minInclusive,"2.333E23"}))("-INF"),
+    ?line {error,{minInclusive,_,not_greater_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(double,{minInclusive,"1E3"}))("100"),
+    ?line {error,{minInclusive,_,not_greater_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(double,{minInclusive,"1E-13"}))("0.999E-14"),
+
+    ?line {error,{minInclusive,_,not_greater_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(float,{minInclusive,"-0.1"}))("-0.1E1"),
+    ?line {error,{minInclusive,_,not_greater_than_or_equal_with,_}} =
+	(xmerl_xsd_type:facet_fun(float,{minInclusive,"-0"}))("-1E-1"),
+    ?line {error,_}=(xmerl_xsd_type:facet_fun(float,{minInclusive,"10E-10"}))("10E-11"),
+
+    ?line {ok,"4"} = (xmerl_xsd_type:facet_fun(integer,{minInclusive,"-3"}))("4"),
+
+    ?line {ok,"+1000000.00"} = 
+	(xmerl_xsd_type:facet_fun(decimal,{minInclusive,"1E6"}))("+1000000.00"),
+    %% must support 18 digits
+    ?line {ok,"12678967.5432323456"} = 
+	(xmerl_xsd_type:facet_fun(decimal,{minInclusive,"12678967.54323234555"}))("12678967.5432323456"),
+
+    ?line {ok,"3.2E-11"} = 
+	(xmerl_xsd_type:facet_fun(double,{minInclusive,"2E-12"}))("3.2E-11"),
+    ?line {ok,"10E20"} = 
+	(xmerl_xsd_type:facet_fun(double,{minInclusive,"-INF"}))("10E20"),
+    ?line {ok,"0.1279"} = 
+	(xmerl_xsd_type:facet_fun(double,{minInclusive,"12.78e-2"}))("0.1279"),
+
+    ?line {ok,"126743.233E11"} = (xmerl_xsd_type:facet_fun(float,{minInclusive,"1267.43233E12"}))("126743.233E11"),
+    ?line {ok,"34E-26"} = (xmerl_xsd_type:facet_fun(float,{minInclusive,"33E-27"}))("34E-26"),
+    ?line {ok,"34E-26"} = (xmerl_xsd_type:facet_fun(float,{minInclusive,"340E-27"}))("34E-26"),
+
+    ?line {ok,"P1Y2M3DT10H30M"}  = (xmerl_xsd_type:facet_fun(duration,{minInclusive,"P1Y2M3D"}))("P1Y2M3DT10H30M"),
+
+    ?line {ok,"2006-09-06T19:17:45Z"}  = (xmerl_xsd_type:facet_fun(dateTime,{minInclusive,"2006-09-06T19:17:45Z"}))("2006-09-06T19:17:45Z"),
+    ok.
+
+totalDigits(suite) -> [];
+totalDigits(_Config) ->
+    ?line {error,{totalDigits,4,to_many_digits}} =
+	(xmerl_xsd_type:facet_fun(integer,{totalDigits,"3"}))("3456"),
+    ?line {error,{totalDigits,4,to_many_digits}} =
+	(xmerl_xsd_type:facet_fun(decimal,{totalDigits,"3"}))("00345.600"),
+    
+    ?line {ok,"555"} =
+	(xmerl_xsd_type:facet_fun(integer,{totalDigits,"3"}))("555"),
+    ?line {ok,"555"} =
+	(xmerl_xsd_type:facet_fun(integer,{totalDigits,"7"}))("555"),
+    ?line {ok,"555.555"} =
+	(xmerl_xsd_type:facet_fun(decimal,{totalDigits,"7"}))("555.555"),
+    ?line {ok,"555.555000000"} =
+	(xmerl_xsd_type:facet_fun(decimal,{totalDigits,"7"}))("555.555000000"),
+    ok.
+    
+fractionDigits(suite) -> [];
+fractionDigits(_Config) ->
+    ?line {error,{fractionDigits,3,to_many_digits_in,"555.555000000"}} =
+	(xmerl_xsd_type:facet_fun(decimal,{fractionDigits,"2"}))("555.555000000"),
+    ?line {error,{fractionDigits,6,to_many_digits_in,"555.555001"}} =
+	(xmerl_xsd_type:facet_fun(decimal,{fractionDigits,"5"}))("555.555001"),
+
+    ?line {ok,"555.55500"}  =
+	(xmerl_xsd_type:facet_fun(decimal,{fractionDigits,"5"}))("555.55500"),
+    ?line {ok,"555"}  =
+	(xmerl_xsd_type:facet_fun(decimal,{fractionDigits,"5"}))("555"),
+    ?line {ok,"555.000"}  =
+	(xmerl_xsd_type:facet_fun(decimal,{fractionDigits,"0"}))("555.000"),
+
+    ?line {ok,"555"}  =
+	(xmerl_xsd_type:facet_fun(integer,{fractionDigits,"0"}))("555"),
+    ok.
+
+%% some block testing of dateTime and duration comparisons
+compare_dateTime(suite) -> [];
+compare_dateTime(_Config) ->
+    %% comparison results according to table in section 3.2.7.4 of XML
+    %% Schema part 2
+    ?line lt = xmerl_xsd_type:compare_dateTime("2000-01-15T00:00:00",
+					       "2000-02-15T00:00:00"),
+    ?line gt = xmerl_xsd_type:compare_dateTime("2000-02-15T00:00:00",
+					       "2000-01-15T00:00:00"),
+    
+    ?line lt = xmerl_xsd_type:compare_dateTime("2000-01-15T12:00:00",
+					       "2000-01-16T12:00:00Z"),
+    ?line gt = xmerl_xsd_type:compare_dateTime("2000-01-16T12:00:00Z",
+					       "2000-01-15T12:00:00"),
+    
+    ?line indefinite = xmerl_xsd_type:compare_dateTime("2000-01-01T12:00:00",
+						       "1999-12-31T23:00:00Z"),
+    ?line indefinite = xmerl_xsd_type:compare_dateTime("1999-12-31T23:00:00Z",
+						       "2000-01-01T12:00:00"),
+
+    ?line indefinite = xmerl_xsd_type:compare_dateTime("2000-01-16T12:00:00",
+						       "2000-01-16T12:00:00Z"),
+    ?line indefinite = xmerl_xsd_type:compare_dateTime("2000-01-16T12:00:00Z",
+						       "2000-01-16T12:00:00"),
+
+    ?line indefinite = xmerl_xsd_type:compare_dateTime("2000-01-16T00:00:00",
+						       "2000-01-16T12:00:00Z"),
+    ?line indefinite = xmerl_xsd_type:compare_dateTime("2000-01-16T12:00:00Z",
+						       "2000-01-16T00:00:00"),
+
+    %% example in appendix E.1 in XML Schema part 2.
+    ?line {2001,4,17,19,23,17.3000,{pos,0,0}} = 
+	xmerl_xsd_type:add_duration2dateTime("2000-01-12T12:13:14Z",
+					     "P1Y3M5DT7H10M3.3S").
+
+compare_duration(suite) -> [];
+compare_duration(_Config) ->
+    %% order relations according to section 3.2.6.2 in XML Schema
+    %% part2.
+    ?line gt = xmerl_xsd_type:compare_durations("P1Y","P364D"),
+    ?line indefinite = xmerl_xsd_type:compare_durations("P1Y","P365D"),
+    ?line indefinite = xmerl_xsd_type:compare_durations("P1Y","P366D"),
+    ?line lt = xmerl_xsd_type:compare_durations("P1Y","P367D"),
+
+    ?line gt = xmerl_xsd_type:compare_durations("P1M","P27D"),
+    ?line indefinite = xmerl_xsd_type:compare_durations("P1M","P28D"),
+    ?line indefinite = xmerl_xsd_type:compare_durations("P1M","P29D"),
+    ?line indefinite = xmerl_xsd_type:compare_durations("P1M","P30D"),
+    ?line indefinite = xmerl_xsd_type:compare_durations("P1M","P31D"),
+    ?line lt = xmerl_xsd_type:compare_durations("P1M","P32D"),
+
+    ?line gt = xmerl_xsd_type:compare_durations("P5M","P149D"),
+    ?line indefinite = xmerl_xsd_type:compare_durations("P5M","P150D"),
+    ?line indefinite = xmerl_xsd_type:compare_durations("P5M","P151D"),
+    ?line indefinite = xmerl_xsd_type:compare_durations("P5M","P152D"),
+    ?line indefinite = xmerl_xsd_type:compare_durations("P5M","P153D"),
+    ?line lt = xmerl_xsd_type:compare_durations("P5M","P154D").
+
+
+po(suite) -> [];
+po(Config) ->
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+					   "po.xml"]),[]),
+    ?line {E,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					      "po.xsd"]),E,[]).
+
+po1(suite) -> [];
+po1(Config) ->
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+					   "po1.xml"]),[]),
+    ?line {E2,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					       "po1.xsd"]),E,[]),
+    ?line ok = xmerl_test_lib:cmp_element(E,E2).
+
+po2(suite) -> [];
+po2(Config) ->
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+					   "po2.xml"]),[]),
+    ?line {E2,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					       "po1.xsd"]),E,[]),
+    ?line ok = xmerl_test_lib:cmp_element(E,E2).
+
+ipo(suite) -> [];
+ipo(Config) ->
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+					   "ipo.xml"]),[]),
+    ?line {VE,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+						"ipo.xsd"]),E,[]),
+    ?line ok = xmerl_test_lib:cmp_element(E,VE).
+
+ipo_redefine(suite) -> [];
+ipo_redefine(Config) ->
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+					   "ipo_redefine.xml"]),[]),
+    ?line {VE,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+						"ipo_redefine.xsd"]),E,[]),
+    ?line ok = xmerl_test_lib:cmp_element(E,VE).
+
+'4Q99'(suite) -> [];
+'4Q99'(Config) ->
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+					   "4Q99.xml"]),[]),
+    %% the import in report.xsd lacks schemaLocation, so the imported
+    %% namespace definitions have to be loaded separately.
+    ?line {ok,S} = 
+	xmerl_xsd:process_schema(filename:join([?config(data_dir,Config),
+					     "ipo.xsd"])),
+    ?line {VE,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+						"report.xsd"]),E,[{state,S}]),
+    ?line ok = xmerl_test_lib:cmp_element(E,VE),
+    
+    %% report2.xsd has an import element with a schemaLocation attribute
+    ?line {VE,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+						"report2.xsd"]),E,[]).
+    
+small(suite) -> [];
+small(Config) ->
+    ?line {E=#xmlElement{},_} = 
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "small.xml"]),[]),
+    ?line {VE=#xmlElement{},_} = 
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "small.xsd"]),E,[]),
+    ?line #xmlElement{attributes=Atts,content=C} = VE,
+    ?line C = E#xmlElement.content,
+    %% The attribute orderStatus with default value was absent in small.xml
+
+    %% Test of validation "on the fly" when parsing XML.
+    ?line {VE,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+						  "small.xml"]),
+				   [{validation,schema},
+				    {schemaLocation,[{"small",filename:join(?config(data_dir,Config),"small.xsd")}]}]),
+    ?line {VE,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+						  "small.xml"]),
+				   [{validation,schema}]),
+    ?line true = lists:keymember(orderStatus,#xmlAttribute.name,Atts).
+
+complexType1(suite) -> [];
+complexType1(Config) ->
+    ?line {E1=#xmlElement{},_} = 
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "complexTypes1.xml"]),[]),
+    ?line {VE1=#xmlElement{},_} = 
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "complexTypes.xsd"]),E1,[]),
+    ?line ok = xmerl_test_lib:cmp_element(E1,VE1),
+
+    ?line {E2=#xmlElement{},_} = 
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "complexTypes2.xml"]),[]),
+    ?line {VE2=#xmlElement{},_} = 
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "complexTypes.xsd"]),E2,[]),
+    ?line ok = xmerl_test_lib:cmp_element(E2,VE2).
+
+model_group_all(suite) -> [];
+model_group_all(Config) ->
+    ?line {E=#xmlElement{},_} = 
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "po1.xml"]),[]),
+    ?line {E,_} = 
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "po1_all.xsd"]),E,[]),
+
+    ?line {E1=#xmlElement{},_} = 
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "po1_all1.xml"]),[]),
+    ?line {E1,_} = 
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "po1_all.xsd"]),E1,[]),
+
+    ?line {E2=#xmlElement{},_} = 
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "po1_all2.xml"]),[]),
+    ?line {E2,_} = 
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+				       "po1_all.xsd"]),E2,[]),
+
+    ?line {E3=#xmlElement{},_} = 
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "po1_all_err1.xml"]),[]),
+    ?line {error,_Reason1} =
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "po1_all.xsd"]),E3,[]),
+
+    
+    ?line {E4=#xmlElement{},_} = 
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "po1_all_err2.xml"]),[]),
+    ?line {error,_Reason2} =
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "po1_all.xsd"]),E4,[]).
+
+substitutionGroup(suite) -> [];
+substitutionGroup(Config) ->
+    ?line {E,_} =
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "ipo_substGroup.xml"]),[]),
+    ?line {E,_} =
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "ipo_substGroup.xsd"]),E,[]).
+attributeGroup(suite) -> [];
+attributeGroup(Config) ->
+    ?line {E,_} =
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "po_attrGroup.xml"]),[]),
+    ?line {E,_} =
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "po_attrGroup.xsd"]),E,[]).
+test_key1(suite) -> [];
+test_key1(Config) ->
+    ?line {E,_} =
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "vehicle2.xml"]),[]),
+    ?line {E,_} =
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "vehicle.xsd"]),E,[]),
+
+    ?line {E2,_} =
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "vehicle.xml"]),[]),
+    ?line {error,L2} =
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "vehicle.xsd"]),E2,[]),
+    ?line 10 = erlang:length(L2),
+
+    ?line {E3 = #xmlElement{},_} =
+	xmerl_scan:file(filename:join([?config(data_dir,Config),
+				       "vehicle3.xml"]),[]),
+    ?line {E3 = #xmlElement{},_} =
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+					  "vehicle.xsd"]),E3,[]).
+
+sis1(suite) -> []; 
+sis1(Config) ->
+    ?line {E,_} =
+	xmerl_scan:file(filename:join([?config(data_dir,Config),sis,
+				       "instance.xml"]),[]),
+    ?line {#xmlElement{},_} = 
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),sis,
+					  "IntegratedSite.xsd"]),E,[]).
+sis2(suite) -> [];
+sis2(Config) ->
+    ?line {BS_E,_} =
+	xmerl_scan:file(filename:join([?config(data_dir,Config),sis,
+				       "bs_mim.xml"]),[]),
+    ?line {SW_E,_} =
+	xmerl_scan:file(filename:join([?config(data_dir,Config),sis,
+				       "swm_mim.xml"]),[]),
+    ?line {HW_E,_} =
+	xmerl_scan:file(filename:join([?config(data_dir,Config),sis,
+				       "hwm_mim.xml"]),[]),
+
+    ?line {#xmlElement{},_} = 
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),sis,
+						  "mim.xsd"]),BS_E,[]),
+    ?line {#xmlElement{},_} = 
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),sis,
+						  "mim.xsd"]),SW_E,[]),
+    ?line {#xmlElement{},_} = 
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),sis,
+						  "mim.xsd"]),HW_E,[]).
+
+state2file_file2state(suite) -> [];
+state2file_file2state(Config) ->
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+						 "po.xml"]),[]),
+    ?line {ok,S} = xmerl_xsd:process_schema(filename:join([?config(data_dir,Config),"po.xsd"])),
+    ?line {E,_} = xmerl_xsd:validate(E,S),
+    ?line ok = xmerl_xsd:state2file(S),
+    ?line {ok,S} = xmerl_xsd:file2state(filename:join([?config(data_dir,Config),"po.xss"])),
+    ?line {E,_} = xmerl_xsd:validate(E,S),
+    
+    ?line ok = xmerl_xsd:state2file(S,filename:join([?config(data_dir,Config),"po_state"])),
+    ?line {ok,S} = xmerl_xsd:file2state(filename:join([?config(data_dir,Config),"po_state.xss"])),
+
+    ?line {E,_} = xmerl_xsd:validate(E,S).
+
+
+union(suite) -> [];
+union(Config) ->
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+						 "instance.xml"])),
+
+    ?line {_E2 = #xmlElement{},_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),"measCollec.xsd"]),E).
+    
+
+ticket_6910(suite) -> [];
+ticket_6910(Config) ->
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+						 sis,"dummy_action_mim.xml"])),
+    ?line {_E2 = #xmlElement{},_} =
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+						  sis,"mim2.xsd"]),E).
+ticket_7165(suite) -> [];
+ticket_7165(Config) ->
+    %% The validation option seems not to work
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+						   "ticket_7288.xml"]), 
+				    [{validation, schema}]),
+    %% The option xsdbase gave {error, enoent}.
+    ?line {ok,_} = xmerl_xsd:process_schema("CxDataType_Rel5.xsd", [{xsdbase, ?config(data_dir,Config)}]).
+
+
+
+ticket_7190(suite) -> [];
+ticket_7190(Config) ->
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
+						 "int.xml"])),
+    ?line {_E2 = #xmlElement{},_} =
+	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
+						  "simple_int.xsd"]),E).
+ticket_7288(suite) -> [];
+ticket_7288(Config) ->
+    %% The schema table in the state where deleted by xmerl_xsd:validate if there was an error.
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),"ticket_7288.xml"])),
+    
+    ?line {ok,S} = xmerl_xsd:process_schema(filename:join([?config(data_dir,Config),"CxDataType_Rel5.xsd"])),
+    
+    ?line {error, EL} = xmerl_xsd:validate(E, S),
+    
+    ?line {error, EL} = xmerl_xsd:validate(E, S).
+ 
+ticket_7736(suite) -> [];
+ticket_7736(Config) ->
+    DataDir = ?config(data_dir,Config),
+    ?line {ok, State } = 
+	xmerl_xsd:process_schema(filename:join([DataDir,"enum_bug.xsd"])),
+    
+    ?line {Entity ,_} = 
+	xmerl_scan:file(filename:join([DataDir,"enum_bug.xml"])),
+    
+    ?line {#xmlElement{},_} = xmerl_xsd:validate(Entity, State).
+
+ticket_8599(suite) -> [];
+ticket_8599(Config) ->
+    ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),"ticket_8599.xml"])),
+    
+    ?line {ok, S} = xmerl_xsd:process_schema(filename:join([?config(data_dir,Config),"ticket_8599.xsd"])),
+    
+    ?line {{xmlElement,persons,persons,_,_,_,_,_,_,_,_,_},_GlobalState} = xmerl_xsd:validate(E, S).
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/4Q99.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/4Q99.xml
new file mode 100644
index 0000000000..a0c4df72bd
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/4Q99.xml
@@ -0,0 +1,25 @@
+<purchaseReport
+  xmlns="http://www.example.com/Report"
+  period="P3M" periodEnding="1999-12-31">
+
+  <regions>
+    <zip code="95819">
+      <part number="872-AA" quantity="1"/>
+      <part number="926-AA" quantity="1"/>
+      <part number="833-AA" quantity="1"/>
+      <part number="455-BX" quantity="1"/>
+    </zip>
+    <zip code="63143">
+      <part number="455-BX" quantity="4"/>
+    </zip>
+  </regions>
+
+  <parts>
+    <part number="872-AA">Lawnmower</part>
+    <part number="926-AA">Baby Monitor</part>
+    <part number="833-AA">Lapis Necklace</part>
+    <part number="455-BX">Sturdy Shelves</part>
+  </parts>
+
+</purchaseReport>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/CxDataType_Rel5.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/CxDataType_Rel5.xsd
new file mode 100644
index 0000000000..8a26fd1492
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/CxDataType_Rel5.xsd
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:simpleType name="tPriority" final="list restriction">
+		<xs:restriction base="xs:int">
+			<xs:minInclusive value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="tProfilePartIndicator" final="list restriction">
+		<xs:restriction base="xs:unsignedByte">
+			<xs:maxInclusive value="1"/>
+			<xs:enumeration value="0">
+				<xs:annotation>
+					<xs:documentation>
+						<label xml:lang="en">REGISTERED</label>
+						<definition xml:lang="en">iFC is part of the registered profile</definition>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="1">
+				<xs:annotation>
+					<xs:documentation>
+						<label xml:lang="en">UNREGISTERED</label>
+						<definition xml:lang="en">iFC is part of the unregistered profile</definition>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="tGroupID" final="list restriction">
+		<xs:restriction base="xs:int">
+			<xs:minInclusive value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="tDefaultHandling" final="list restriction">
+		<xs:restriction base="xs:unsignedByte">
+			<xs:maxInclusive value="1"/>
+			<xs:enumeration value="0">
+				<xs:annotation>
+					<xs:documentation>
+						<label xml:lang="en">SESSION_CONTINUED</label>
+						<definition xml:lang="en">Session Continued</definition>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="1">
+				<xs:annotation>
+					<xs:documentation>
+						<label xml:lang="en">SESSION_TERMINATED</label>
+						<definition xml:lang="en">Session Terminated</definition>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="tDirectionOfRequest" final="list restriction">
+		<xs:restriction base="xs:unsignedByte">
+			<xs:maxInclusive value="3"/>
+			<xs:enumeration value="0">
+				<xs:annotation>
+					<xs:documentation>
+						<label xml:lang="en">ORIGINATING_SESSION</label>
+						<definition xml:lang="en">Originating Session</definition>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="1">
+				<xs:annotation>
+					<xs:documentation>
+						<label xml:lang="en">TERMINATING_REGISTERED</label>
+						<definition xml:lang="en">Terminating Session for registered user</definition>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="2">
+				<xs:annotation>
+					<xs:documentation>
+						<label xml:lang="en">TERMINATING_UNREGISTERED</label>
+						<definition xml:lang="en">Terminating Session for unregistered user</definition>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="tPrivateID" final="list restriction">
+		<xs:restriction base="xs:anyURI"/>
+	</xs:simpleType>
+	<xs:simpleType name="tSIP_URL" final="list restriction">
+		<xs:restriction base="xs:anyURI"/>
+	</xs:simpleType>
+	<xs:simpleType name="tTEL_URL" final="list restriction">
+		<xs:restriction base="xs:anyURI"/>
+	</xs:simpleType>
+	<xs:simpleType name="tIdentity" final="list restriction">
+		<xs:union memberTypes="tSIP_URL tTEL_URL"/>
+	</xs:simpleType>
+	<xs:simpleType name="tServiceInfo" final="list restriction">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="tString" final="list restriction">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="tBool">
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
+	<xs:simpleType name="tSubscribedMediaProfileId" final="list restriction">
+		<xs:restriction base="xs:int">
+			<xs:minInclusive value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="tExtension">
+		<xs:sequence>
+			<xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="tIMSSubscription">
+		<xs:sequence>
+			<xs:element name="PrivateID" type="tPrivateID"/>
+			<xs:element name="ServiceProfile" type="tServiceProfile" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tExtension" minOccurs="0"/>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="tServiceProfile">
+		<xs:sequence>
+			<xs:element name="PublicIdentity" type="tPublicIdentity" maxOccurs="unbounded"/>
+			<xs:element name="CoreNetworkServicesAuthorization" type="tCoreNetworkServicesAuthorization" minOccurs="0"/>
+			<xs:element name="InitialFilterCriteria" type="tInitialFilterCriteria" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tExtension" minOccurs="0"/>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="tCoreNetworkServicesAuthorization">
+		<xs:sequence>
+			<xs:element name="SubscribedMediaProfileId" type="tSubscribedMediaProfileId" minOccurs="0"/>
+			<xs:element name="Extension" type="tExtension" minOccurs="0"/>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="tInitialFilterCriteria">
+		<xs:sequence>
+			<xs:element name="Priority" type="tPriority"/>
+			<xs:element name="TriggerPoint" type="tTrigger" minOccurs="0"/>
+			<xs:element name="ApplicationServer" type="tApplicationServer"/>
+			<xs:element name="ProfilePartIndicator" type="tProfilePartIndicator" minOccurs="0"/>
+			<xs:element name="Extension" type="tExtension" minOccurs="0"/>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="tTrigger">
+		<xs:sequence>
+			<xs:element name="ConditionTypeCNF" type="tBool"/>
+			<xs:element name="SPT" type="tSePoTri" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tExtension" minOccurs="0"/>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="tSePoTri">
+		<xs:sequence>
+			<xs:element name="ConditionNegated" type="tBool" default="0" minOccurs="0"/>
+			<xs:element name="Group" type="tGroupID" maxOccurs="unbounded"/>
+			<xs:choice>
+				<xs:element name="RequestURI" type="tString"/>
+				<xs:element name="Method" type="tString"/>
+				<xs:element name="SIPHeader" type="tHeader"/>
+				<xs:element name="SessionCase" type="tDirectionOfRequest"/>
+				<xs:element name="SessionDescription" type="tSessionDescription"/>
+			</xs:choice>
+			<xs:element name="Extension" type="tExtension" minOccurs="0"/>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="tHeader">
+		<xs:sequence>
+			<xs:element name="Header" type="tString"/>
+			<xs:element name="Content" type="tString" minOccurs="0"/>
+			<xs:element name="Extension" type="tExtension" minOccurs="0"/>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="tSessionDescription">
+		<xs:sequence>
+			<xs:element name="Line" type="tString"/>
+			<xs:element name="Content" type="tString" minOccurs="0"/>
+			<xs:element name="Extension" type="tExtension" minOccurs="0"/>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="tApplicationServer">
+		<xs:sequence>
+			<xs:element name="ServerName" type="tSIP_URL"/>
+			<xs:element name="DefaultHandling" type="tDefaultHandling" minOccurs="0"/> <!-- the DefaultHandling element should not be sent by a Rel-5 HSS -->
+			<xs:element name="ServiceInfo" type="tServiceInfo" minOccurs="0"/>
+			<xs:element name="Extension" type="tExtension" minOccurs="0"/>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="tPublicIdentity">
+		<xs:sequence>
+			<xs:element name="BarringIndication" type="tBool" default="0" minOccurs="0"/>
+			<xs:element name="Identity" type="tIdentity"/>
+			<xs:element name="Extension" type="tExtension" minOccurs="0"/>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="IMSSubscription" type="tIMSSubscription"/>
+</xs:schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/address.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/address.xsd
new file mode 100644
index 0000000000..147d1fe01e
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/address.xsd
@@ -0,0 +1,69 @@
+<schema targetNamespace="http://www.example.com/IPO"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ipo="http://www.example.com/IPO">
+
+  <annotation>
+    <documentation xml:lang="en">
+      Addresses for International Purchase order schema
+      Copyright 2000 Example.com. All rights reserved.
+    </documentation>
+  </annotation>
+
+  <complexType name="Address">
+    <sequence>
+      <element name="name"   type="string"/>
+      <element name="street" type="string"/>
+      <element name="city"   type="string"/>
+    </sequence>
+  </complexType>
+
+  <complexType name="USAddress">
+    <complexContent>
+      <extension base="ipo:Address">
+        <sequence>
+          <element name="state" type="ipo:USState"/>
+          <element name="zip"   type="positiveInteger"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <complexType name="UKAddress">
+    <complexContent>
+      <extension base="ipo:Address">
+        <sequence>
+          <element name="postcode" type="ipo:UKPostcode"/>
+        </sequence>
+        <attribute name="exportCode" type="positiveInteger" fixed="1"/>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <!-- other Address derivations for more countries -->
+
+  <simpleType name="USState">
+    <restriction base="string">
+      <enumeration value="AK"/>
+      <enumeration value="AL"/>
+      <enumeration value="AR"/>
+      <enumeration value="PA"/>
+      <!-- and so on ... -->
+    </restriction>
+  </simpleType>
+
+  <!-- simple type definition for UKPostcode -->
+  <simpleType name="UKPostcode">
+    <restriction base="ipo:Postcode">
+      <pattern value="[A-Z]{2}\d\s\d[A-Z]{2}"/>
+    </restriction>
+  </simpleType>
+
+  <simpleType name="Postcode">
+    <restriction base="string">
+      <length value="7" fixed="true"/>
+    </restriction>
+  </simpleType>
+
+
+</schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/complexTypes.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/complexTypes.xsd
new file mode 100644
index 0000000000..78140cda9b
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/complexTypes.xsd
@@ -0,0 +1,112 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:po="http://www.example.com/ComplexTypes"
+        targetNamespace="http://www.example.com/ComplexTypes"
+        elementFormDefault="unqualified"
+        attributeFormDefault="unqualified">
+
+  <element name="purchaseOrder" type="po:PurchaseOrderType"/>
+
+  <element name="purchaseOrder2" type="po:PurchaseOrderType2"/>
+
+  <element name="comment" type="string"/>
+
+
+<complexType name="PurchaseOrderType2">
+  <sequence>
+    <choice>
+      <group   ref="po:shipAndBill"/>
+      <element name="singleUSAddress" type="po:USAddress"/>
+    </choice>
+    <element ref="po:comment" minOccurs="0"/>
+    <element name="items"  type="po:Items"/>
+  </sequence>
+  <attribute name="orderDate" type="date"/>
+</complexType>
+
+<group name="shipAndBill">
+  <sequence>
+    <element name="shipTo" type="po:USAddress"/>
+    <element name="billTo" type="po:USAddress"/>
+  </sequence>
+</group>
+
+
+
+  <complexType name="PurchaseOrderType">
+    <sequence>
+      <element name="shipTo" type="po:USAddress"/>
+      <element name="billTo" type="po:USAddress"/>
+      <element ref="po:comment" minOccurs="0"/>
+      <element name="items"  type="po:Items"/>
+    </sequence>
+    <attribute name="orderDate" type="date"/>
+  </complexType>
+
+  <complexType name="USAddress">
+    <sequence>
+      <element name="name"   type="string"/>
+      <element name="street" type="string"/>
+      <element name="city"   type="string"/>
+      <element name="state"  type="string"/>
+      <element name="zip"    type="decimal"/>
+      <element name="contact" type="po:Contact" minOccurs="0"/>
+    </sequence>
+    <attribute name="country" type="NMTOKEN"
+                   fixed="US"/>
+  </complexType>
+
+  <complexType name="Items">
+    <sequence>
+      <element name="item" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <sequence>
+            <element name="productName" type="string"/>
+            <element name="quantity">
+              <simpleType>
+                <restriction base="positiveInteger">
+                  <maxExclusive value="100"/>
+                </restriction>
+              </simpleType>
+            </element>
+            <element name="USPrice"  type="decimal"/>
+            <element ref="po:comment"   minOccurs="0"/>
+            <element name="shipDate" type="date" minOccurs="0"/>
+          </sequence>
+          <attribute name="partNum" type="po:SKU" use="required"/>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+
+  <complexType name="Contact">
+    <sequence>
+      <element name="phone"    type="decimal"/>
+      <element name="mail"     type="string" minOccurs="0"/>
+      <element name="e-mail"   type="string"/>
+      <element name="cell-phone"  type="decimal" minOccurs="0"/>
+      <element name="other"    type="string" minOccurs="0"/>
+      <element name="prefCont" type="po:PreferredContact" minOccurs="0" maxOccurs="2"/>
+    </sequence>
+  </complexType>
+
+  <complexType name="PreferredContact">
+    <choice>
+      <element name="phone"   type="string"/>
+      <element name="mail" type="string"/>
+      <element name="e-mail"   type="string"/>
+      <element name="cell-phone"  type="string"/>
+      <element name="other"    type="string"/>
+    </choice>
+    <attribute name="priority" type="NMTOKEN"
+                   fixed="medium"/>
+  </complexType>
+
+  <!-- Stock Keeping Unit, a code for identifying products -->
+  <simpleType name="SKU">
+    <restriction base="string">
+      <pattern value="\d{3}-[A-Z]{2}"/>
+    </restriction>
+  </simpleType>
+
+</schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/complexTypes1.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/complexTypes1.xml
new file mode 100644
index 0000000000..a46a562c37
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/complexTypes1.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<apo:purchaseOrder xmlns:apo="http://www.example.com/ComplexTypes"
+                   orderDate="1999-10-20">
+  <shipTo country="US">
+    <name>Alice Smith</name>
+    <street>123 Maple Street</street>
+    <!-- etc. -->
+      <city>Mill Valley</city>
+      <state>CA</state>
+      <zip>90952</zip>
+      <contact>
+          <phone>081234567</phone>
+          <e-mail>[email protected]</e-mail>
+          <cell-phone>070122345</cell-phone>
+          <prefCont>
+               <cell-phone>070122345</cell-phone>
+          </prefCont>
+      </contact>
+  </shipTo>
+  <billTo country="US">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <!-- etc. -->
+      <city>Old Town</city>
+      <state>PA</state>
+      <zip>95819</zip>
+  </billTo>
+  <apo:comment>Hurry, my lawn is going wild!</apo:comment>
+  <!-- etc. -->
+   <items>
+      <item partNum="872-AA">
+         <productName>Lawnmower</productName>
+         <quantity>1</quantity>
+         <USPrice>148.95</USPrice>
+         <comment>Confirm this is electric</comment>
+      </item>
+      <item partNum="926-AA">
+         <productName>Baby Monitor</productName>
+         <quantity>1</quantity>
+         <USPrice>39.98</USPrice>
+         <shipDate>1999-05-21</shipDate>
+      </item>
+   </items>
+</apo:purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/complexTypes2.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/complexTypes2.xml
new file mode 100644
index 0000000000..80687b9c1c
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/complexTypes2.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<apo:purchaseOrder2 xmlns:apo="http://www.example.com/ComplexTypes"
+                   orderDate="1999-10-20">
+  <shipTo country="US">
+    <name>Alice Smith</name>
+    <street>123 Maple Street</street>
+    <!-- etc. -->
+      <city>Mill Valley</city>
+      <state>CA</state>
+      <zip>90952</zip>
+      <contact>
+          <phone>081234567</phone>
+          <e-mail>[email protected]</e-mail>
+          <cell-phone>070122345</cell-phone>
+          <prefCont>
+               <cell-phone>070122345</cell-phone>
+          </prefCont>
+      </contact>
+  </shipTo>
+  <billTo country="US">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <!-- etc. -->
+      <city>Old Town</city>
+      <state>PA</state>
+      <zip>95819</zip>
+  </billTo>
+  <apo:comment>Hurry, my lawn is going wild!</apo:comment>
+  <!-- etc. -->
+   <items>
+      <item partNum="872-AA">
+         <productName>Lawnmower</productName>
+         <quantity>1</quantity>
+         <USPrice>148.95</USPrice>
+         <comment>Confirm this is electric</comment>
+      </item>
+      <item partNum="926-AA">
+         <productName>Baby Monitor</productName>
+         <quantity>1</quantity>
+         <USPrice>39.98</USPrice>
+         <shipDate>1999-05-21</shipDate>
+      </item>
+   </items>
+</apo:purchaseOrder2>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/enum_bug.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/enum_bug.xml
new file mode 100644
index 0000000000..1a4b601c32
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/enum_bug.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<status/>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/enum_bug.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/enum_bug.xsd
new file mode 100644
index 0000000000..996e0d5b4d
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/enum_bug.xsd
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+	
+	<xs:element name="status">
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="status-type"/>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:simpleType name="status-type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Valid" />
+			<xs:enumeration value="Invalid" />
+			<xs:enumeration value="" />
+		</xs:restriction>
+	</xs:simpleType>
+</xs:schema>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/gpx/clementine_loop.gpx b/lib/xmerl/test/xmerl_xsd_SUITE_data/gpx/clementine_loop.gpx
new file mode 100644
index 0000000000..f4e3185c56
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/gpx/clementine_loop.gpx
@@ -0,0 +1,3594 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>

+<gpx

+ version="1.0"

+ creator="ExpertGPS 1.2 - http://www.topografix.com"

+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+ xmlns="http://www.topografix.com/GPX/1/0"

+ xmlns:topografix="http://www.topografix.com/GPX/Private/TopoGrafix/0/2"

+ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd http://www.topografix.com/GPX/Private/TopoGrafix/0/2 http://www.topografix.com/GPX/Private/TopoGrafix/0/2/topografix.xsd">

+<time>2003-02-05T19:17:02Z</time>

+<bounds minlat="38.625526" minlon="-121.516943" maxlat="38.937285" maxlon="-121.011830"/>

+<wpt lat="38.916370006" lon="-121.035340039">

+ <ele>182.775024</ele>

+ <time>2003-02-05T18:19:15Z</time>

+ <name>CLEMEN TR</name>

+ <desc>CLEMEN TR</desc>

+ <sym>Trail Head</sym>

+ <type>Trail Head</type>

+</wpt>

+<wpt lat="38.920639999" lon="-121.012300031">

+ <ele>313.993896</ele>

+ <time>2003-02-05T18:19:15Z</time>

+ <name>CONFL TR</name>

+ <desc>CONFL TR</desc>

+ <sym>Trail Head</sym>

+ <type>Trail Head</type>

+</wpt>

+<wpt lat="38.932889983" lon="-121.011829974">

+ <ele>437.041748</ele>

+ <time>2003-02-05T18:19:15Z</time>

+ <name>CULVERT TR</name>

+ <desc>CULVERT TR</desc>

+ <sym>Trail Head</sym>

+ <type>Trail Head</type>

+</wpt>

+<wpt lat="38.905900003" lon="-121.055939991">

+ <ele>371.912964</ele>

+ <time>2003-02-04T21:14:35Z</time>

+ <name>MANZANITA</name>

+ <desc>MANZANITA</desc>

+ <sym>Trail Head</sym>

+ <type>Trail Head</type>

+</wpt>

+<wpt lat="38.911470029" lon="-121.054369977">

+ <ele>405.318481</ele>

+ <time>2003-02-04T21:14:35Z</time>

+ <name>STAGECOACH</name>

+ <desc>STAGECOACH</desc>

+ <sym>Trail Head</sym>

+ <type>Trail Head</type>

+</wpt>

+<rte>

+ <name>SAC-CLEM</name>

+ <desc>Auto route from Sacramento to Clementine Loop trail head.</desc>

+ <number>1</number>

+ <topografix:color>ff0000</topografix:color>

+<rtept lat="38.625526432" lon="-121.516942989">

+ <time>2003-02-05T18:08:15Z</time>

+ <name>I-5</name>

+ <desc>I-5</desc>

+ <sym>Waypoint</sym>

+ <type>Waypoint</type>

+</rtept>

+<rtept lat="38.646984104" lon="-121.374807369">

+ <time>2003-02-05T18:08:15Z</time>

+ <name>I-80BUSRTE</name>

+ <desc>I-80BUSRTE</desc>

+ <sym>Waypoint</sym>

+ <type>Waypoint</type>

+</rtept>

+<rtept lat="38.917007450" lon="-121.062297832">

+ <time>2003-02-05T18:08:15Z</time>

+ <name>I-801</name>

+ <desc>I-801</desc>

+ <sym>Waypoint</sym>

+ <type>Waypoint</type>

+</rtept>

+<rtept lat="38.917522434" lon="-121.060409557">

+ <time>2003-02-05T18:08:15Z</time>

+ <name>LINCOLNWAY</name>

+ <desc>LINCOLNWAY</desc>

+ <sym>Waypoint</sym>

+ <type>Waypoint</type>

+</rtept>

+<rtept lat="38.915805820" lon="-121.061010372">

+ <time>2003-02-05T18:08:15Z</time>

+ <name>LINCOLNWY1</name>

+ <desc>LINCOLNWY1</desc>

+ <sym>Waypoint</sym>

+ <type>Waypoint</type>

+</rtept>

+<rtept lat="38.916149143" lon="-121.057147991">

+ <time>2003-02-05T18:08:15Z</time>

+ <name>RUSSELL RD</name>

+ <desc>RUSSELL RD</desc>

+ <sym>Waypoint</sym>

+ <type>Waypoint</type>

+</rtept>

+<rtept lat="38.911467012" lon="-121.054374419">

+ <time>2003-02-05T18:08:15Z</time>

+ <name>STAGECOACH</name>

+ <desc>STAGECOACH</desc>

+ <sym>Trail Head</sym>

+ <type>Trail Head</type>

+</rtept>

+</rte>

+<trk>

+ <name>CLEMENTINE</name>

+ <desc>Clementine Loop</desc>

+ <number>1</number>

+ <topografix:color>ff0000</topografix:color>

+<trkseg>

+<trkpt lat="38.919839863" lon="-121.020112049">

+ <ele>265.447754</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919796947" lon="-121.020240795">

+ <ele>264.967041</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919861320" lon="-121.020498287">

+ <ele>263.044434</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919990066" lon="-121.020798694">

+ <ele>263.525146</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919925693" lon="-121.021056187">

+ <ele>260.160522</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919904236" lon="-121.021163475">

+ <ele>260.160522</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919818405" lon="-121.021292221">

+ <ele>259.679932</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919646744" lon="-121.021614086">

+ <ele>259.199219</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919539455" lon="-121.021764290">

+ <ele>256.795898</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919432167" lon="-121.022086155">

+ <ele>255.834717</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919281963" lon="-121.022450935">

+ <ele>252.950684</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919281963" lon="-121.022515308">

+ <ele>253.431396</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919196132" lon="-121.022665512">

+ <ele>251.989380</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919131759" lon="-121.022837173">

+ <ele>251.027954</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918981556" lon="-121.023073208">

+ <ele>248.624756</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918895725" lon="-121.023223411">

+ <ele>248.624756</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918745521" lon="-121.023609649">

+ <ele>246.702148</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918681148" lon="-121.023845684">

+ <ele>244.298950</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918681148" lon="-121.024081718">

+ <ele>243.337524</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918681148" lon="-121.024210464">

+ <ele>242.856934</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918724064" lon="-121.024403583">

+ <ele>241.895630</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918745521" lon="-121.024703991">

+ <ele>239.492310</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918595318" lon="-121.024854194">

+ <ele>238.050415</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918337826" lon="-121.025025856">

+ <ele>236.608521</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918187622" lon="-121.025090229">

+ <ele>235.646973</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917994503" lon="-121.025326263">

+ <ele>234.205078</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917951587" lon="-121.025519382">

+ <ele>233.243774</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917908672" lon="-121.025691044">

+ <ele>232.282471</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917887214" lon="-121.025927078">

+ <ele>231.801758</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917651180" lon="-121.025991451">

+ <ele>230.840576</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917415146" lon="-121.025884163">

+ <ele>228.437256</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917114738" lon="-121.025691044">

+ <ele>226.514648</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916792873" lon="-121.025648128">

+ <ele>223.630737</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916192058" lon="-121.025819790">

+ <ele>219.785400</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915848736" lon="-121.025884163">

+ <ele>217.382202</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915677074" lon="-121.026034366">

+ <ele>215.459595</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915634159" lon="-121.026227485">

+ <ele>214.017578</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915634159" lon="-121.026356232">

+ <ele>214.017578</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915569786" lon="-121.026806843">

+ <ele>212.094971</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915462498" lon="-121.026914131">

+ <ele>210.172363</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915376667" lon="-121.027021419">

+ <ele>209.691772</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915140632" lon="-121.027686607">

+ <ele>206.807739</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915119175" lon="-121.027858269">

+ <ele>206.327148</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915054802" lon="-121.028094303">

+ <ele>204.404541</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915054802" lon="-121.028137218">

+ <ele>204.404541</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914990429" lon="-121.028373253">

+ <ele>201.520508</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914947513" lon="-121.028738033">

+ <ele>200.559204</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914861683" lon="-121.028931152">

+ <ele>199.597900</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914840225" lon="-121.029145729">

+ <ele>200.559204</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914797310" lon="-121.029253017">

+ <ele>201.039795</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914647106" lon="-121.029489052">

+ <ele>196.713989</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914625648" lon="-121.029531967">

+ <ele>196.713989</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914539818" lon="-121.029832374">

+ <ele>194.310791</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914518360" lon="-121.030004036">

+ <ele>192.868774</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914496902" lon="-121.030519020">

+ <ele>191.426758</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914368156" lon="-121.030626308">

+ <ele>189.984863</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914217953" lon="-121.030733597">

+ <ele>189.023560</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914024833" lon="-121.031162750">

+ <ele>184.697632</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913981918" lon="-121.031377327">

+ <ele>183.736206</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913939003" lon="-121.031699192">

+ <ele>183.255615</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913939003" lon="-121.031785023">

+ <ele>183.255615</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913831714" lon="-121.032021057">

+ <ele>182.775024</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913831714" lon="-121.032278549">

+ <ele>180.852417</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913788799" lon="-121.032471668">

+ <ele>178.929810</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913788799" lon="-121.032536041">

+ <ele>179.410400</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913681511" lon="-121.032857906">

+ <ele>177.487793</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913660053" lon="-121.033115398">

+ <ele>175.084595</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913660053" lon="-121.033244144">

+ <ele>174.603882</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913660053" lon="-121.033458721">

+ <ele>174.123169</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913702968" lon="-121.034145366">

+ <ele>172.200562</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913660053" lon="-121.034231197">

+ <ele>171.239258</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913767341" lon="-121.034510147">

+ <ele>173.642578</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913767341" lon="-121.034767639">

+ <ele>172.200562</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913831714" lon="-121.035046589">

+ <ele>168.835938</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913896087" lon="-121.035218250">

+ <ele>167.874634</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913960460" lon="-121.035454284">

+ <ele>167.394043</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914024833" lon="-121.035625946">

+ <ele>166.913330</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914260868" lon="-121.035776150">

+ <ele>165.952026</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914518360" lon="-121.035904896">

+ <ele>166.913330</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914818767" lon="-121.036012184">

+ <ele>166.913330</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914947513" lon="-121.036119472">

+ <ele>166.913330</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915119175" lon="-121.036248218">

+ <ele>167.874634</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915290836" lon="-121.036291134">

+ <ele>168.835938</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915441040" lon="-121.036076557">

+ <ele>170.758545</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915634159" lon="-121.035883438">

+ <ele>174.123169</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915784363" lon="-121.035690319">

+ <ele>174.123169</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916020397" lon="-121.035625946">

+ <ele>173.161987</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916256431" lon="-121.035647404">

+ <ele>172.200562</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916385177" lon="-121.035690319">

+ <ele>171.239258</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916814331" lon="-121.036269676">

+ <ele>169.316650</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916878704" lon="-121.036484253">

+ <ele>167.394043</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916964535" lon="-121.036548626">

+ <ele>166.913330</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917050365" lon="-121.036527168">

+ <ele>166.432617</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917458061" lon="-121.036398422">

+ <ele>166.432617</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917887214" lon="-121.036570083">

+ <ele>168.835938</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918037418" lon="-121.036698829">

+ <ele>171.719849</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918058876" lon="-121.036698829">

+ <ele>172.681274</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918144707" lon="-121.036720287">

+ <ele>174.603882</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918187622" lon="-121.036827576">

+ <ele>176.526489</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918316368" lon="-121.036977779">

+ <ele>180.371704</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918466572" lon="-121.037127983">

+ <ele>183.255615</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918530945" lon="-121.037299644">

+ <ele>186.620239</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918659691" lon="-121.037514221">

+ <ele>189.023560</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918766979" lon="-121.037707340">

+ <ele>191.907471</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918852810" lon="-121.037836086">

+ <ele>195.271973</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919067386" lon="-121.038050663">

+ <ele>197.194580</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919239048" lon="-121.038222324">

+ <ele>200.078613</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919346336" lon="-121.038393986">

+ <ele>202.481812</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919517998" lon="-121.038587105">

+ <ele>205.846558</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919539455" lon="-121.038630020">

+ <ele>206.327148</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919496540" lon="-121.038672935">

+ <ele>206.807739</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919260505" lon="-121.038544189">

+ <ele>210.652954</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918960098" lon="-121.038351070">

+ <ele>214.017578</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918402199" lon="-121.037986290">

+ <ele>217.382202</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918037418" lon="-121.037728798">

+ <ele>220.266113</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917565349" lon="-121.037685882">

+ <ele>223.630737</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917350773" lon="-121.038050663">

+ <ele>226.514648</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917329315" lon="-121.038329613">

+ <ele>228.917969</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917222027" lon="-121.038887512">

+ <ele>231.801758</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917243484" lon="-121.039402496">

+ <ele>235.166382</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917350773" lon="-121.039831650">

+ <ele>238.050415</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917651180" lon="-121.040067684">

+ <ele>241.414917</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917887214" lon="-121.040282261">

+ <ele>244.298950</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918294910" lon="-121.040647041">

+ <ele>245.260132</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918423656" lon="-121.041119110">

+ <ele>248.144165</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918659691" lon="-121.041462433">

+ <ele>251.508667</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918852810" lon="-121.041655552">

+ <ele>254.392700</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918809894" lon="-121.042191994">

+ <ele>256.795898</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918809894" lon="-121.042814266">

+ <ele>259.199219</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918509487" lon="-121.042964470">

+ <ele>261.602539</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918488029" lon="-121.042964470">

+ <ele>261.602539</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918101791" lon="-121.042792808">

+ <ele>264.486328</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917586807" lon="-121.042621147">

+ <ele>268.331665</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917329315" lon="-121.042792808">

+ <ele>270.254272</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917157654" lon="-121.043200504">

+ <ele>273.138306</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916878704" lon="-121.043479454">

+ <ele>276.022095</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916471008" lon="-121.043629658">

+ <ele>278.906128</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916428093" lon="-121.043608200">

+ <ele>279.867310</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916020397" lon="-121.043457996">

+ <ele>283.231934</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915805820" lon="-121.043694031">

+ <ele>286.115967</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915655617" lon="-121.044209015">

+ <ele>288.038574</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915419582" lon="-121.044316303">

+ <ele>290.922485</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915140632" lon="-121.044466507">

+ <ele>293.325684</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914818767" lon="-121.044230472">

+ <ele>294.287109</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914496902" lon="-121.044101726">

+ <ele>297.651611</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914217953" lon="-121.044230472">

+ <ele>301.016235</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913939003" lon="-121.044445049">

+ <ele>303.419556</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913810257" lon="-121.044552337">

+ <ele>304.861450</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913488392" lon="-121.044681084">

+ <ele>307.745483</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913187984" lon="-121.044681084">

+ <ele>308.706665</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912887577" lon="-121.044681084">

+ <ele>311.109985</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912565712" lon="-121.044788372">

+ <ele>313.513306</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912372593" lon="-121.045110237">

+ <ele>316.877930</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912265304" lon="-121.045281898">

+ <ele>316.877930</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912072185" lon="-121.045582306">

+ <ele>320.242432</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912007812" lon="-121.045925628">

+ <ele>322.165039</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912007812" lon="-121.046075832">

+ <ele>323.126465</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912072185" lon="-121.046547901">

+ <ele>325.529663</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912243847" lon="-121.046998512">

+ <ele>327.452271</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912158016" lon="-121.047277462">

+ <ele>330.816895</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911964897" lon="-121.047577869">

+ <ele>333.220215</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911771778" lon="-121.047964107">

+ <ele>335.623413</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911471371" lon="-121.048307430">

+ <ele>338.988037</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911235336" lon="-121.048650753">

+ <ele>342.352661</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911042217" lon="-121.049079906">

+ <ele>344.275269</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910634521" lon="-121.049187195">

+ <ele>346.678467</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910248283" lon="-121.049444687">

+ <ele>350.043213</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910119537" lon="-121.049659263">

+ <ele>353.407715</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910183910" lon="-121.050109875">

+ <ele>354.849609</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910462860" lon="-121.050453197">

+ <ele>357.733643</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910849098" lon="-121.050710689">

+ <ele>360.617432</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911213878" lon="-121.050882351">

+ <ele>363.501465</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911406997" lon="-121.051311504">

+ <ele>366.866089</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911664490" lon="-121.051590454">

+ <ele>370.230591</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912007812" lon="-121.051719200">

+ <ele>371.672607</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912007812" lon="-121.052105438">

+ <ele>373.595215</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912050728" lon="-121.052491676">

+ <ele>376.959839</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912351135" lon="-121.052856457">

+ <ele>379.363037</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912758831" lon="-121.052985203">

+ <ele>382.727783</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913059238" lon="-121.053135406">

+ <ele>385.130981</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913273815" lon="-121.053628933">

+ <ele>388.014893</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913273815" lon="-121.053843510">

+ <ele>388.976196</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913187984" lon="-121.053843510">

+ <ele>389.456787</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913037781" lon="-121.053822052">

+ <ele>390.418213</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912673000" lon="-121.053864967">

+ <ele>393.302002</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912308220" lon="-121.053972256">

+ <ele>396.186157</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911921982" lon="-121.054122459">

+ <ele>399.069946</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911664490" lon="-121.054143917">

+ <ele>400.031372</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911492828" lon="-121.054101002">

+ <ele>400.992554</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911342624" lon="-121.054251205">

+ <ele>403.876587</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911385540" lon="-121.054358494">

+ <ele>403.876587</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911385540" lon="-121.054379951">

+ <ele>403.395874</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911406997" lon="-121.054379951">

+ <ele>402.915161</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911492828" lon="-121.054487240">

+ <ele>402.915161</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911492828" lon="-121.054487240">

+ <ele>403.395874</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911492828" lon="-121.054508697">

+ <ele>403.395874</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911492828" lon="-121.054337036">

+ <ele>413.489746</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911514286" lon="-121.054379951">

+ <ele>413.489746</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911557201" lon="-121.055088054">

+ <ele>410.605591</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911535744" lon="-121.055431377">

+ <ele>408.202393</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911364082" lon="-121.055989277">

+ <ele>404.357178</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911256794" lon="-121.056354057">

+ <ele>400.511963</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911213878" lon="-121.056482803">

+ <ele>399.550659</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911085132" lon="-121.056633007">

+ <ele>397.147339</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910484318" lon="-121.056268226">

+ <ele>394.744019</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909926418" lon="-121.056118023">

+ <ele>391.379395</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909754757" lon="-121.056096565">

+ <ele>390.418213</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909540180" lon="-121.056182396">

+ <ele>389.937500</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908746246" lon="-121.056311142">

+ <ele>386.572998</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908681873" lon="-121.056311142">

+ <ele>386.572998</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908295635" lon="-121.056311142">

+ <ele>386.092285</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907995228" lon="-121.056418430">

+ <ele>387.534180</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907845024" lon="-121.056461346">

+ <ele>386.572998</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907630447" lon="-121.056418430">

+ <ele>387.053589</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907480243" lon="-121.056289684">

+ <ele>387.053589</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907458786" lon="-121.056203853">

+ <ele>386.092285</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907394413" lon="-121.056182396">

+ <ele>386.092285</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907115463" lon="-121.056096565">

+ <ele>383.208374</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906836513" lon="-121.056182396">

+ <ele>381.285767</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906729225" lon="-121.056289684">

+ <ele>379.843628</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906536106" lon="-121.056504261">

+ <ele>377.921021</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906321529" lon="-121.056504261">

+ <ele>376.479126</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906064037" lon="-121.056203853">

+ <ele>375.037231</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.905892376" lon="-121.055967819">

+ <ele>371.672607</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.905892376" lon="-121.055946361">

+ <ele>370.711304</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906021122" lon="-121.055667412">

+ <ele>366.866089</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906085495" lon="-121.055452835">

+ <ele>363.982056</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906128410" lon="-121.055152428">

+ <ele>360.617432</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906149868" lon="-121.055088054">

+ <ele>359.656250</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906214241" lon="-121.054852020">

+ <ele>358.214233</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906300072" lon="-121.054744732">

+ <ele>356.291626</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906364445" lon="-121.054658901">

+ <ele>354.849609</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906407360" lon="-121.054508697">

+ <ele>351.965820</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906385902" lon="-121.054465782">

+ <ele>351.485107</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906021122" lon="-121.054551613">

+ <ele>348.120605</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.905677799" lon="-121.054744732">

+ <ele>344.755859</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.905591968" lon="-121.054809105">

+ <ele>342.352661</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.905441765" lon="-121.054937851">

+ <ele>340.430054</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.905441765" lon="-121.054852020">

+ <ele>339.949341</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.905463222" lon="-121.054744732">

+ <ele>338.988037</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.905549053" lon="-121.054508697">

+ <ele>335.142822</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.905570511" lon="-121.054465782">

+ <ele>335.142822</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.905785087" lon="-121.054058086">

+ <ele>333.700806</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.905978206" lon="-121.053800594">

+ <ele>330.816895</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906149868" lon="-121.053628933">

+ <ele>330.336182</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906257156" lon="-121.053586017">

+ <ele>329.855469</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906385902" lon="-121.053521644">

+ <ele>329.855469</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906514648" lon="-121.053457271">

+ <ele>328.413574</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906879429" lon="-121.053543102">

+ <ele>325.529663</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906900886" lon="-121.053586017">

+ <ele>324.087646</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906965259" lon="-121.053714763">

+ <ele>322.165039</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.906965259" lon="-121.053714763">

+ <ele>322.165039</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907008175" lon="-121.053671848">

+ <ele>322.645752</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907158378" lon="-121.053435814">

+ <ele>326.490967</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907244209" lon="-121.053199779">

+ <ele>329.855469</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907544617" lon="-121.053071033">

+ <ele>327.932861</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907630447" lon="-121.053071033">

+ <ele>327.452271</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907673363" lon="-121.053028118">

+ <ele>326.010254</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907802109" lon="-121.052920830">

+ <ele>324.087646</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907887939" lon="-121.052792084">

+ <ele>322.645752</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.907930855" lon="-121.052598965">

+ <ele>322.645752</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908317093" lon="-121.052105438">

+ <ele>322.165039</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908445839" lon="-121.051869404">

+ <ele>322.645752</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908252720" lon="-121.051461708">

+ <ele>323.607056</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908274177" lon="-121.050968181">

+ <ele>321.684448</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908381466" lon="-121.050839435">

+ <ele>320.242432</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908424381" lon="-121.050817978">

+ <ele>319.761841</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908531669" lon="-121.050710689">

+ <ele>315.916504</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908574585" lon="-121.050689232">

+ <ele>315.916504</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908638958" lon="-121.050646316">

+ <ele>313.513306</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908789161" lon="-121.050581943">

+ <ele>313.513306</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908917908" lon="-121.050496113">

+ <ele>315.435913</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909025196" lon="-121.050453197">

+ <ele>316.397217</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909432892" lon="-121.050367367">

+ <ele>317.358643</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909540180" lon="-121.050324451">

+ <ele>317.358643</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909540180" lon="-121.050260078">

+ <ele>320.242432</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909175400" lon="-121.049852382">

+ <ele>321.203857</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908746246" lon="-121.049251568">

+ <ele>323.126465</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908531669" lon="-121.048629295">

+ <ele>323.126465</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.908660415" lon="-121.048393261">

+ <ele>321.684448</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909196857" lon="-121.048264515">

+ <ele>318.800537</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909239773" lon="-121.048264515">

+ <ele>318.800537</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909325603" lon="-121.048157226">

+ <ele>317.358643</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909304146" lon="-121.048028480">

+ <ele>319.281250</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909218315" lon="-121.047513496">

+ <ele>320.242432</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909282688" lon="-121.047449123">

+ <ele>321.684448</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909497265" lon="-121.047427666">

+ <ele>321.684448</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909733299" lon="-121.047492039">

+ <ele>321.203857</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.909883503" lon="-121.047427666">

+ <ele>321.684448</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910076622" lon="-121.047492039">

+ <ele>321.684448</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910441402" lon="-121.047942650">

+ <ele>320.242432</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910548691" lon="-121.048092853">

+ <ele>321.203857</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910784725" lon="-121.048221599">

+ <ele>320.723145</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910870556" lon="-121.048264515">

+ <ele>319.281250</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.910956386" lon="-121.048049938">

+ <ele>319.761841</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911192421" lon="-121.047620785">

+ <ele>319.761841</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911535744" lon="-121.047556412">

+ <ele>320.242432</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911964897" lon="-121.047041427">

+ <ele>318.800537</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911921982" lon="-121.046805393">

+ <ele>319.761841</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911879066" lon="-121.046526443">

+ <ele>322.645752</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911879066" lon="-121.046226036">

+ <ele>322.645752</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911836151" lon="-121.045990002">

+ <ele>320.242432</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.911900524" lon="-121.045582306">

+ <ele>319.761841</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912179474" lon="-121.045217525">

+ <ele>319.761841</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912522796" lon="-121.044766914">

+ <ele>319.281250</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912694458" lon="-121.044616710">

+ <ele>318.319824</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912780289" lon="-121.044595253">

+ <ele>319.761841</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912801746" lon="-121.044616710">

+ <ele>319.761841</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.912844662" lon="-121.044616710">

+ <ele>319.761841</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913037781" lon="-121.044659626">

+ <ele>321.684448</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913209442" lon="-121.044638168">

+ <ele>320.723145</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913402561" lon="-121.044638168">

+ <ele>318.319824</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913681511" lon="-121.044638168">

+ <ele>316.877930</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.913810257" lon="-121.044573795">

+ <ele>316.397217</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914217953" lon="-121.044230472">

+ <ele>312.551880</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914282326" lon="-121.044187557">

+ <ele>312.551880</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.914561275" lon="-121.044101726">

+ <ele>309.668091</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915033344" lon="-121.044337761">

+ <ele>305.342163</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915076259" lon="-121.044380676">

+ <ele>305.342163</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915376667" lon="-121.044316303">

+ <ele>303.419556</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915634159" lon="-121.044187557">

+ <ele>301.496948</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915762905" lon="-121.043972980">

+ <ele>298.132324</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.915805820" lon="-121.043715488">

+ <ele>297.651611</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916277889" lon="-121.043415081">

+ <ele>293.806396</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916556839" lon="-121.043543827">

+ <ele>290.441895</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916728500" lon="-121.043608200">

+ <ele>288.038574</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916835789" lon="-121.043608200">

+ <ele>288.038574</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917093281" lon="-121.043457996">

+ <ele>286.115967</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917307857" lon="-121.042985927">

+ <ele>283.231934</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917350773" lon="-121.042921554">

+ <ele>282.751343</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917436603" lon="-121.042792808">

+ <ele>280.828735</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917694095" lon="-121.042685520">

+ <ele>278.425415</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917758468" lon="-121.042685520">

+ <ele>277.944702</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918402199" lon="-121.042814266">

+ <ele>273.138306</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918530945" lon="-121.042835724">

+ <ele>271.696289</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918724064" lon="-121.042900097">

+ <ele>270.254272</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918917183" lon="-121.042835724">

+ <ele>269.773682</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918981556" lon="-121.042449486">

+ <ele>268.331665</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918938640" lon="-121.041784298">

+ <ele>265.447754</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918766979" lon="-121.041526806">

+ <ele>262.563721</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918488029" lon="-121.041183483">

+ <ele>260.641113</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918359283" lon="-121.040732872">

+ <ele>257.757324</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918230537" lon="-121.040561210">

+ <ele>255.834717</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918015961" lon="-121.040346634">

+ <ele>255.834717</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917801384" lon="-121.040132057">

+ <ele>255.354004</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917522434" lon="-121.039938938">

+ <ele>251.027954</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917415146" lon="-121.039767277">

+ <ele>250.066772</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917372230" lon="-121.039574158">

+ <ele>248.624756</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917329315" lon="-121.038780224">

+ <ele>243.818237</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917393688" lon="-121.038479816">

+ <ele>242.376343</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917436603" lon="-121.038007747">

+ <ele>239.973022</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917586807" lon="-121.037685882">

+ <ele>237.089111</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917887214" lon="-121.037535679">

+ <ele>234.205078</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918037418" lon="-121.037535679">

+ <ele>233.724365</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918380741" lon="-121.037621509">

+ <ele>230.359863</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918809894" lon="-121.037879001">

+ <ele>226.995361</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918917183" lon="-121.037964832">

+ <ele>226.033936</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919045929" lon="-121.038050663">

+ <ele>224.592041</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919260505" lon="-121.038222324">

+ <ele>223.150146</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919367794" lon="-121.038308155">

+ <ele>221.708130</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919689659" lon="-121.038565647">

+ <ele>217.862793</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919732574" lon="-121.038608562">

+ <ele>217.862793</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919754032" lon="-121.038608562">

+ <ele>216.901489</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919668201" lon="-121.038479816">

+ <ele>215.459595</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919389252" lon="-121.038136494">

+ <ele>211.614380</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919346336" lon="-121.038093578">

+ <ele>211.614380</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919239048" lon="-121.037986290">

+ <ele>208.730347</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919003013" lon="-121.037707340">

+ <ele>204.885132</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918960098" lon="-121.037664425">

+ <ele>204.885132</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918766979" lon="-121.037428390">

+ <ele>200.559204</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918638233" lon="-121.037213814">

+ <ele>197.194580</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918509487" lon="-121.037020695">

+ <ele>192.868774</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918294910" lon="-121.036784660">

+ <ele>189.023560</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918230537" lon="-121.036741745">

+ <ele>187.581421</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917951587" lon="-121.036570083">

+ <ele>181.813599</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917887214" lon="-121.036527168">

+ <ele>181.813599</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917608265" lon="-121.036419880">

+ <ele>178.929810</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917415146" lon="-121.036376964">

+ <ele>178.449097</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917007450" lon="-121.036548626">

+ <ele>178.449097</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916857246" lon="-121.036398422">

+ <ele>178.929810</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916621212" lon="-121.035840523">

+ <ele>180.371704</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916363720" lon="-121.035647404">

+ <ele>181.333008</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916363720" lon="-121.035346996">

+ <ele>181.813599</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916578296" lon="-121.035218250">

+ <ele>181.333008</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.916943077" lon="-121.035089504">

+ <ele>180.371704</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.917222027" lon="-121.035068046">

+ <ele>179.410400</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918209080" lon="-121.035454284">

+ <ele>178.449097</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918488029" lon="-121.035625946">

+ <ele>177.968384</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.918745521" lon="-121.035969269">

+ <ele>177.968384</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919045929" lon="-121.036248218">

+ <ele>177.968384</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919346336" lon="-121.036655914">

+ <ele>178.449097</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920183185" lon="-121.037406933">

+ <ele>181.333008</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920912746" lon="-121.037750255">

+ <ele>183.255615</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921277527" lon="-121.037836086">

+ <ele>185.178223</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921492103" lon="-121.037921917">

+ <ele>184.216919</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921599392" lon="-121.037964832">

+ <ele>185.658813</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921685222" lon="-121.037964832">

+ <ele>184.216919</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921921257" lon="-121.038007747">

+ <ele>187.581421</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922092918" lon="-121.038072120">

+ <ele>187.100830</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922178749" lon="-121.038115036">

+ <ele>187.100830</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922264580" lon="-121.038157951">

+ <ele>186.620239</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922607902" lon="-121.038222324">

+ <ele>186.620239</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923058513" lon="-121.038243782">

+ <ele>187.100830</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923144344" lon="-121.038243782">

+ <ele>187.100830</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923230175" lon="-121.038265240">

+ <ele>187.100830</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923444752" lon="-121.038372528">

+ <ele>184.216919</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923809532" lon="-121.038479816">

+ <ele>185.178223</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924024109" lon="-121.038651478">

+ <ele>185.658813</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924303058" lon="-121.038844597">

+ <ele>186.620239</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924496177" lon="-121.038930427">

+ <ele>187.100830</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924560551" lon="-121.038994800">

+ <ele>186.620239</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924903873" lon="-121.039359581">

+ <ele>184.697632</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925139908" lon="-121.039681446">

+ <ele>184.216919</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925569061" lon="-121.040325176">

+ <ele>183.255615</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925783638" lon="-121.040625583">

+ <ele>182.775024</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925912384" lon="-121.040647041">

+ <ele>182.294312</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926019672" lon="-121.040689956">

+ <ele>181.813599</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926298622" lon="-121.040668499">

+ <ele>180.852417</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926427368" lon="-121.040625583">

+ <ele>180.371704</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.927049640" lon="-121.040260803">

+ <ele>183.736206</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.927328590" lon="-121.039917480">

+ <ele>186.139526</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.927929405" lon="-121.039445412">

+ <ele>189.023560</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.928380016" lon="-121.039080631">

+ <ele>192.388184</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.928701881" lon="-121.038994800">

+ <ele>195.752686</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.928895000" lon="-121.038973343">

+ <ele>197.675293</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.929195408" lon="-121.038780224">

+ <ele>200.078613</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.929367069" lon="-121.038351070">

+ <ele>202.481812</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.929431442" lon="-121.038179409">

+ <ele>204.404541</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.929796222" lon="-121.038136494">

+ <ele>207.769165</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930096630" lon="-121.037943374">

+ <ele>210.652954</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930397037" lon="-121.037836086">

+ <ele>213.536987</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930675987" lon="-121.037836086">

+ <ele>214.978882</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931126598" lon="-121.037428390">

+ <ele>216.420776</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931362633" lon="-121.037170898">

+ <ele>219.785400</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931534294" lon="-121.036913406">

+ <ele>222.669434</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931877617" lon="-121.036441337">

+ <ele>226.033936</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932156566" lon="-121.036055099">

+ <ele>228.917969</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932392601" lon="-121.035690319">

+ <ele>231.801758</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932564262" lon="-121.035304081">

+ <ele>235.166382</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932650093" lon="-121.034939300">

+ <ele>237.569702</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932349685" lon="-121.034510147">

+ <ele>240.453735</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932178024" lon="-121.034166824">

+ <ele>243.337524</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931963447" lon="-121.033694755">

+ <ele>246.702148</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931727413" lon="-121.033265602">

+ <ele>249.586060</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931491379" lon="-121.032986652">

+ <ele>252.470093</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931405548" lon="-121.032664787">

+ <ele>255.354004</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931212429" lon="-121.032257091">

+ <ele>258.718506</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930976394" lon="-121.031892311">

+ <ele>262.563721</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931019310" lon="-121.031634819">

+ <ele>264.967041</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931405548" lon="-121.031270038">

+ <ele>265.928345</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931620125" lon="-121.030840885">

+ <ele>267.370361</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931598667" lon="-121.030218612">

+ <ele>269.773682</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931577209" lon="-121.029725086">

+ <ele>272.657593</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931427006" lon="-121.029338848">

+ <ele>275.541504</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931298260" lon="-121.028888237">

+ <ele>277.944702</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931233887" lon="-121.028695118">

+ <ele>279.867310</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931276802" lon="-121.028630745">

+ <ele>280.348022</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931598667" lon="-121.028373253">

+ <ele>283.231934</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931856159" lon="-121.028201591">

+ <ele>286.596680</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931984905" lon="-121.027858269">

+ <ele>288.999878</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932220939" lon="-121.027793896">

+ <ele>292.845093</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932414058" lon="-121.027643692">

+ <ele>296.209717</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932435516" lon="-121.027235996">

+ <ele>299.093506</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932456974" lon="-121.027064335">

+ <ele>299.093506</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932456974" lon="-121.026892673">

+ <ele>301.016235</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932671551" lon="-121.026592266">

+ <ele>301.496948</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932971958" lon="-121.026463520">

+ <ele>304.380859</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933186535" lon="-121.026098739">

+ <ele>306.784058</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933444027" lon="-121.025691044">

+ <ele>309.668091</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933658603" lon="-121.025347721">

+ <ele>313.032593</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933830265" lon="-121.024832737">

+ <ele>316.397217</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933701519" lon="-121.024210464">

+ <ele>319.281250</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933529857" lon="-121.024124634">

+ <ele>322.165039</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933293823" lon="-121.023824226">

+ <ele>323.607056</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933379654" lon="-121.023373615">

+ <ele>326.010254</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933551315" lon="-121.023008835">

+ <ele>328.894287</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933594230" lon="-121.022579681">

+ <ele>330.336182</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933765892" lon="-121.022322189">

+ <ele>333.700806</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933851723" lon="-121.021893036">

+ <ele>336.584839</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933701519" lon="-121.021549713">

+ <ele>338.507446</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933594230" lon="-121.021120560">

+ <ele>341.391235</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933615688" lon="-121.020584118">

+ <ele>344.755859</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933637146" lon="-121.020519745">

+ <ele>344.275269</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.934109215" lon="-121.020262253">

+ <ele>348.120605</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.934366707" lon="-121.020069134">

+ <ele>351.004395</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.934388164" lon="-121.020069134">

+ <ele>351.485107</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.934817318" lon="-121.019918930">

+ <ele>352.446411</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935139183" lon="-121.019833099">

+ <ele>352.927002</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935546879" lon="-121.019811642">

+ <ele>355.811035</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935825828" lon="-121.019639980">

+ <ele>359.175537</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935868744" lon="-121.019446861">

+ <ele>360.617432</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935546879" lon="-121.018974792">

+ <ele>363.982056</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935375217" lon="-121.018695843">

+ <ele>366.866089</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935289387" lon="-121.018266689">

+ <ele>370.230591</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935611252" lon="-121.018052112">

+ <ele>373.114624</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.936040405" lon="-121.017901909">

+ <ele>376.959839</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.936448101" lon="-121.017665874">

+ <ele>379.843628</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.936812881" lon="-121.017494213">

+ <ele>383.208374</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.937134746" lon="-121.017344009">

+ <ele>386.572998</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.937284950" lon="-121.016914856">

+ <ele>388.495605</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.937048916" lon="-121.016507160">

+ <ele>391.860107</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.936769966" lon="-121.016249668">

+ <ele>393.302002</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.936426643" lon="-121.016013634">

+ <ele>396.666748</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.936212066" lon="-121.015906345">

+ <ele>399.550659</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935954574" lon="-121.015863430">

+ <ele>401.473267</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935611252" lon="-121.015884888">

+ <ele>404.357178</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935267929" lon="-121.015906345">

+ <ele>407.721802</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935160641" lon="-121.015520107">

+ <ele>410.125000</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.935139183" lon="-121.015155327">

+ <ele>410.605591</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.934946064" lon="-121.014683258">

+ <ele>413.489746</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.934624199" lon="-121.014318477">

+ <ele>416.854248</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.934237961" lon="-121.013975155">

+ <ele>419.738159</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.934023384" lon="-121.013674747">

+ <ele>423.102783</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933744434" lon="-121.013417255">

+ <ele>425.986572</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933529857" lon="-121.013052475">

+ <ele>429.351318</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933358196" lon="-121.012730610">

+ <ele>432.235229</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933315281" lon="-121.012516033">

+ <ele>433.196533</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933079246" lon="-121.012172710">

+ <ele>435.599731</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932929043" lon="-121.011958134">

+ <ele>436.561157</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932843212" lon="-121.011893761">

+ <ele>437.041748</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932778839" lon="-121.011915218">

+ <ele>438.003052</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932821754" lon="-121.012279999">

+ <ele>440.886963</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932800297" lon="-121.012387287">

+ <ele>442.809570</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932886127" lon="-121.012709152">

+ <ele>446.174316</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933057789" lon="-121.012945186">

+ <ele>449.058105</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933165077" lon="-121.013181221">

+ <ele>452.903320</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933272365" lon="-121.013503086">

+ <ele>456.267944</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933336738" lon="-121.013782036">

+ <ele>457.229248</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933401111" lon="-121.014060985">

+ <ele>460.593872</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933529857" lon="-121.014511597">

+ <ele>463.958496</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933722976" lon="-121.014812004">

+ <ele>463.958496</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933787350" lon="-121.015348446">

+ <ele>460.113281</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933830265" lon="-121.015605938">

+ <ele>456.748535</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933830265" lon="-121.015648853">

+ <ele>456.267944</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933680061" lon="-121.015906345">

+ <ele>454.825928</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.933293823" lon="-121.016185295">

+ <ele>454.345337</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932864670" lon="-121.016292583">

+ <ele>456.267944</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932693008" lon="-121.016271126">

+ <ele>459.151855</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932456974" lon="-121.016249668">

+ <ele>462.516479</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932242397" lon="-121.016271126">

+ <ele>464.439087</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.932049278" lon="-121.016335499">

+ <ele>466.361694</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931705955" lon="-121.016421329">

+ <ele>469.245728</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931341175" lon="-121.016528618">

+ <ele>472.129517</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.931148056" lon="-121.016614448">

+ <ele>475.494141</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930869106" lon="-121.016807567">

+ <ele>478.378174</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930633072" lon="-121.017022144">

+ <ele>480.781494</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930482868" lon="-121.017236721">

+ <ele>482.704102</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930418495" lon="-121.017365467">

+ <ele>483.665283</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930397037" lon="-121.017386925">

+ <ele>483.184692</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930354122" lon="-121.017408382">

+ <ele>483.665283</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930461410" lon="-121.017322552">

+ <ele>484.626709</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930482868" lon="-121.017322552">

+ <ele>484.626709</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930439953" lon="-121.017365467">

+ <ele>485.587891</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930461410" lon="-121.017386925">

+ <ele>485.107300</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930439953" lon="-121.017344009">

+ <ele>486.068604</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930418495" lon="-121.017344009">

+ <ele>486.068604</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930439953" lon="-121.017344009">

+ <ele>487.029907</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930439953" lon="-121.017816078">

+ <ele>484.145996</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930439953" lon="-121.017966282">

+ <ele>482.704102</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930547241" lon="-121.018438351">

+ <ele>480.781494</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930547241" lon="-121.018738758">

+ <ele>478.858887</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930568699" lon="-121.018888962">

+ <ele>477.416870</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930611614" lon="-121.019232284">

+ <ele>474.052124</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930611614" lon="-121.019382488">

+ <ele>472.610229</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930418495" lon="-121.019489776">

+ <ele>471.648926</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930225376" lon="-121.019468319">

+ <ele>467.323120</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930053715" lon="-121.019425403">

+ <ele>463.958496</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.930010799" lon="-121.019403946">

+ <ele>463.477905</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.929882053" lon="-121.019232284">

+ <ele>461.074585</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.929839138" lon="-121.019039165">

+ <ele>458.190552</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.929817680" lon="-121.018974792">

+ <ele>458.190552</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.929517273" lon="-121.018867504">

+ <ele>454.825928</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.929216865" lon="-121.018846046">

+ <ele>451.942139</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.929066662" lon="-121.018824589">

+ <ele>450.500122</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.928852085" lon="-121.018888962">

+ <ele>447.616211</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.928530220" lon="-121.018888962">

+ <ele>443.290161</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.928251270" lon="-121.019017708">

+ <ele>440.886963</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.928229812" lon="-121.019039165">

+ <ele>439.925659</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.928143982" lon="-121.019039165">

+ <ele>439.444946</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.927843574" lon="-121.018781673">

+ <ele>435.599731</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.927800659" lon="-121.018695843">

+ <ele>434.638550</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.927457336" lon="-121.018266689">

+ <ele>435.119141</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.927307133" lon="-121.018159401">

+ <ele>432.235229</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.927221302" lon="-121.018095028">

+ <ele>429.831909</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.927071098" lon="-121.017944824">

+ <ele>427.428589</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.927028183" lon="-121.017515671">

+ <ele>426.467285</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926877979" lon="-121.017236721">

+ <ele>423.102783</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926856521" lon="-121.017193806">

+ <ele>423.102783</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926835064" lon="-121.017150890">

+ <ele>422.622070</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926770691" lon="-121.017065059">

+ <ele>422.141357</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926577572" lon="-121.017000686">

+ <ele>418.776855</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926448826" lon="-121.016936313">

+ <ele>416.854248</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926405910" lon="-121.016936313">

+ <ele>415.412354</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926277164" lon="-121.016893398">

+ <ele>413.970337</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926212791" lon="-121.016850483">

+ <ele>413.009033</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.926062588" lon="-121.016657364">

+ <ele>411.086304</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925912384" lon="-121.016464245">

+ <ele>408.202393</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925526146" lon="-121.015841972">

+ <ele>404.837769</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925354484" lon="-121.015670311">

+ <ele>404.357178</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925182823" lon="-121.015734684">

+ <ele>401.953979</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925075535" lon="-121.015670311">

+ <ele>400.031372</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925032619" lon="-121.015584480">

+ <ele>399.550659</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925011162" lon="-121.015455734">

+ <ele>400.992554</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.925011162" lon="-121.015434276">

+ <ele>401.473267</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924946789" lon="-121.015219700">

+ <ele>401.473267</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924689297" lon="-121.014940750">

+ <ele>401.473267</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924582008" lon="-121.014661800">

+ <ele>401.473267</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924496177" lon="-121.014297020">

+ <ele>400.992554</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924367431" lon="-121.013889324">

+ <ele>398.589355</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924367431" lon="-121.013610374">

+ <ele>394.263428</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924345974" lon="-121.013481628">

+ <ele>393.782715</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924367431" lon="-121.012837898">

+ <ele>395.224609</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924303058" lon="-121.012601864">

+ <ele>395.224609</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924152855" lon="-121.012709152">

+ <ele>390.898804</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924131397" lon="-121.012730610">

+ <ele>390.418213</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.924024109" lon="-121.012902271">

+ <ele>386.572998</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923981193" lon="-121.012988102">

+ <ele>385.611572</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923916820" lon="-121.013138305">

+ <ele>383.208374</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923873905" lon="-121.013224136">

+ <ele>382.247070</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923788074" lon="-121.013438713">

+ <ele>379.363037</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923680786" lon="-121.013460171">

+ <ele>378.882446</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923380379" lon="-121.013395798">

+ <ele>376.959839</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923122886" lon="-121.013395798">

+ <ele>374.075806</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923079971" lon="-121.013438713">

+ <ele>375.517822</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923058513" lon="-121.013481628">

+ <ele>375.037231</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923015598" lon="-121.013546001">

+ <ele>375.517822</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922908310" lon="-121.013760578">

+ <ele>371.672607</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922886852" lon="-121.013760578">

+ <ele>371.192017</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922865394" lon="-121.013803493">

+ <ele>369.750000</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922865394" lon="-121.013867866">

+ <ele>368.788696</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922886852" lon="-121.014146816">

+ <ele>367.346802</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922886852" lon="-121.014211189">

+ <ele>366.385376</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922843937" lon="-121.014254104">

+ <ele>365.904785</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922822479" lon="-121.014382850">

+ <ele>363.501465</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922843937" lon="-121.014447223">

+ <ele>362.540039</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923015598" lon="-121.014812004">

+ <ele>362.059448</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923165802" lon="-121.015005123">

+ <ele>364.462769</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923251633" lon="-121.015176784">

+ <ele>363.982056</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923337463" lon="-121.015369903">

+ <ele>360.617432</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923358921" lon="-121.015434276">

+ <ele>360.136841</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923401836" lon="-121.015498649">

+ <ele>358.694824</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923316006" lon="-121.015584480">

+ <ele>354.369019</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923294548" lon="-121.015563022">

+ <ele>353.888428</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923273090" lon="-121.015541565">

+ <ele>353.888428</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.923079971" lon="-121.015455734">

+ <ele>350.523804</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922843937" lon="-121.015348446">

+ <ele>347.639771</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922822479" lon="-121.015326988">

+ <ele>347.639771</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922650818" lon="-121.015262615">

+ <ele>344.275269</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922371868" lon="-121.015133869">

+ <ele>340.910645</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922092918" lon="-121.015241157">

+ <ele>337.546021</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922071461" lon="-121.015241157">

+ <ele>337.546021</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922028545" lon="-121.015241157">

+ <ele>336.584839</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921985630" lon="-121.015241157">

+ <ele>335.623413</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921985630" lon="-121.015241157">

+ <ele>336.104126</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921878341" lon="-121.015090954">

+ <ele>335.142822</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922007088" lon="-121.014704716">

+ <ele>333.700806</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.922050003" lon="-121.014361393">

+ <ele>335.142822</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921985630" lon="-121.014254104">

+ <ele>335.142822</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921449188" lon="-121.013653290">

+ <ele>331.778076</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921363357" lon="-121.013481628">

+ <ele>330.816895</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921213154" lon="-121.013073932">

+ <ele>326.490967</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920912746" lon="-121.012644779">

+ <ele>321.203857</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920762543" lon="-121.012473118">

+ <ele>317.358643</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920676712" lon="-121.012344372">

+ <ele>314.474487</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920633797" lon="-121.012301456">

+ <ele>313.513306</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920483593" lon="-121.012473118">

+ <ele>311.590698</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920204643" lon="-121.012923729">

+ <ele>307.745483</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920075897" lon="-121.013309967">

+ <ele>305.342163</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920183185" lon="-121.013739120">

+ <ele>301.496948</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920440677" lon="-121.014060985">

+ <ele>298.612915</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920483593" lon="-121.014125358">

+ <ele>298.132324</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920676712" lon="-121.014533054">

+ <ele>296.209717</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920762543" lon="-121.014640343">

+ <ele>294.767700</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920848373" lon="-121.014726173">

+ <ele>294.287109</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920869831" lon="-121.015069496">

+ <ele>292.364502</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920912746" lon="-121.015219700">

+ <ele>292.364502</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.921062950" lon="-121.015648853">

+ <ele>290.922485</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920977119" lon="-121.015713226">

+ <ele>290.922485</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920633797" lon="-121.015992176">

+ <ele>286.596680</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920612339" lon="-121.016013634">

+ <ele>286.596680</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920440677" lon="-121.016056549">

+ <ele>285.154663</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920183185" lon="-121.016421329">

+ <ele>283.712524</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920140270" lon="-121.016700279">

+ <ele>282.751343</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920140270" lon="-121.016871940">

+ <ele>281.309326</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920118812" lon="-121.017086517">

+ <ele>281.309326</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920204643" lon="-121.017301094">

+ <ele>280.348022</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920311931" lon="-121.017451298">

+ <ele>278.906128</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920376304" lon="-121.017580044">

+ <ele>278.906128</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920419220" lon="-121.017730247">

+ <ele>277.464111</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920311931" lon="-121.018116485">

+ <ele>276.022095</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920269016" lon="-121.018245231">

+ <ele>275.060913</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920226101" lon="-121.018502724">

+ <ele>274.580200</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.920011524" lon="-121.018824589">

+ <ele>271.696289</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919947151" lon="-121.019103538">

+ <ele>270.734985</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919882778" lon="-121.019639980">

+ <ele>267.850952</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+<trkpt lat="38.919925693" lon="-121.019876015">

+ <ele>267.370361</ele>

+ <time>2003-02-05T18:19:20Z</time>

+ <sym>Waypoint</sym>

+</trkpt>

+</trkseg>

+</trk>

+</gpx>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/gpx/gpx.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/gpx/gpx.xsd
new file mode 100644
index 0000000000..63d4640159
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/gpx/gpx.xsd
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- GPX.xsd version 1.0 - For more information on GPX and this schema, visit http://www.topografix.com/gpx.asp -->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gpx="http://www.topografix.com/GPX/1/0" targetNamespace="http://www.topografix.com/GPX/1/0" elementFormDefault="qualified">
+
+<!-- Main GPX definition -->
+
+  <xsd:element name="gpx">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="name" type="xsd:string" minOccurs="0"/>		<!-- GPX file name -->
+        <xsd:element name="desc" type="xsd:string" minOccurs="0"/>		<!-- GPX file description -->
+        <xsd:element name="author" type="xsd:string" minOccurs="0"/>		<!-- GPX file author -->
+        <xsd:element name="email" type="gpx:emailType" minOccurs="0"/>	<!-- GPX file author email -->
+        <xsd:element name="url" type="xsd:anyURI" minOccurs="0"/>		<!-- GPX file URL -->
+ 		<xsd:element name="urlname" type="xsd:string" minOccurs="0"/>
+        <xsd:element name="time" type="xsd:dateTime" minOccurs="0"/>		<!-- GPX file creation time -->
+        <xsd:element name="keywords" type="xsd:string" minOccurs="0"/>		<!-- GPX file keywords -->
+        <xsd:element name="bounds" type="gpx:boundsType" minOccurs="0"/>	<!-- GPX file bounding rect -->
+        <xsd:element name="wpt" minOccurs="0" maxOccurs="unbounded">
+          <xsd:complexType>
+            <xsd:sequence>	<!-- elements must appear in this order -->
+			  <!-- Position info -->
+              <xsd:element name="ele" type="xsd:decimal" minOccurs="0"/>
+              <xsd:element name="time" type="xsd:dateTime" minOccurs="0"/>
+			  <xsd:element name="magvar" type="gpx:degreesType" minOccurs="0"/>
+			  <xsd:element name="geoidheight" type="xsd:decimal" minOccurs="0"/>
+
+			  <!-- Description info -->
+			  <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="cmt" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="desc" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="src" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="url" type="xsd:anyURI" minOccurs="0"/>
+			  <xsd:element name="urlname" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="sym" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="type" type="xsd:string" minOccurs="0"/>
+
+			  <!-- Accuracy info -->
+			  <xsd:element name="fix" type="gpx:fixType" minOccurs="0"/>
+			  <xsd:element name="sat" type="xsd:nonNegativeInteger" minOccurs="0"/>
+			  <xsd:element name="hdop" type="xsd:decimal" minOccurs="0"/>
+			  <xsd:element name="vdop" type="xsd:decimal" minOccurs="0"/>
+			  <xsd:element name="pdop" type="xsd:decimal" minOccurs="0"/>
+			  <xsd:element name="ageofdgpsdata" type="xsd:decimal" minOccurs="0"/>
+			  <xsd:element name="dgpsid" type="gpx:dgpsStationType" minOccurs="0"/>
+
+			  <!-- you can add your own privately defined wpt elements at the end of the wpt -->
+              <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+            <xsd:attribute name="lat" type="gpx:latitudeType" use="required"/>
+            <xsd:attribute name="lon" type="gpx:longitudeType" use="required"/>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element name="rte" minOccurs="0" maxOccurs="unbounded">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="cmt" type="xsd:string" minOccurs="0"/>
+              <xsd:element name="desc" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="src" type="xsd:string" minOccurs="0"/>	<!-- the source of this data: "Garmin eTrex", "Map", etc -->
+			  <xsd:element name="url" type="xsd:anyURI" minOccurs="0"/>
+ 			  <xsd:element name="urlname" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="number" type="xsd:nonNegativeInteger" minOccurs="0"/>	<!-- GPS track number -->
+	<!--	  <xsd:element name="type"			type="xsd:string"	minOccurs="0"/>	PROPOSED -->
+			  <!-- you can add your own privately defined rte elements at the end of the rte -->
+              <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+              <xsd:element name="rtept" minOccurs="0" maxOccurs="unbounded">
+                <xsd:complexType>
+                  <xsd:sequence>	<!-- elements must appear in this order -->
+
+				    <!-- Position info -->
+                    <xsd:element name="ele" type="xsd:decimal" minOccurs="0"/>
+                    <xsd:element name="time" type="xsd:dateTime" minOccurs="0"/>
+					<xsd:element name="magvar" type="gpx:degreesType" minOccurs="0"/>
+					<xsd:element name="geoidheight" type="xsd:decimal" minOccurs="0"/>
+
+					<!-- Description info -->
+                    <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cmt" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="desc" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="src" type="xsd:string" minOccurs="0"/>
+					<xsd:element name="url" type="xsd:anyURI" minOccurs="0"/>
+ 				    <xsd:element name="urlname" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="sym" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="type" type="xsd:string" minOccurs="0"/>
+
+					<!-- Accuracy info -->
+					<xsd:element name="fix" type="gpx:fixType" minOccurs="0"/>
+					<xsd:element name="sat" type="xsd:nonNegativeInteger" minOccurs="0"/>
+					<xsd:element name="hdop" type="xsd:decimal" minOccurs="0"/>
+					<xsd:element name="vdop" type="xsd:decimal" minOccurs="0"/>
+					<xsd:element name="pdop" type="xsd:decimal" minOccurs="0"/>
+					<xsd:element name="ageofdgpsdata" type="xsd:decimal" minOccurs="0"/>
+					<xsd:element name="dgpsid" type="gpx:dgpsStationType" minOccurs="0"/>
+
+					<!-- you can add your own privately defined rtept elements at the end of the rtept -->
+                    <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+                  </xsd:sequence>
+                  <xsd:attribute name="lat" type="gpx:latitudeType" use="required"/>
+                  <xsd:attribute name="lon" type="gpx:longitudeType" use="required"/>
+                </xsd:complexType>
+              </xsd:element>
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element name="trk" minOccurs="0" maxOccurs="unbounded">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="cmt" type="xsd:string" minOccurs="0"/>
+              <xsd:element name="desc" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="src" type="xsd:string" minOccurs="0"/>	<!-- the source of this data: "Garmin eTrex", "Map", etc -->
+			  <xsd:element name="url" type="xsd:anyURI" minOccurs="0"/>
+ 			  <xsd:element name="urlname" type="xsd:string" minOccurs="0"/>
+			  <xsd:element name="number" type="xsd:nonNegativeInteger" minOccurs="0"/>	<!-- GPS track number -->
+	<!-- 	  <xsd:element name="type"			type="xsd:string"		minOccurs="0"/>  PROPOSED -->
+			  <!-- you can add your own privately defined trk elements at the end of the trk -->
+              <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+              <xsd:element name="trkseg" minOccurs="0" maxOccurs="unbounded">
+                <xsd:complexType>
+                  <xsd:sequence>	<!-- elements must appear in this order -->
+				    <xsd:element name="trkpt" minOccurs="0" maxOccurs="unbounded">
+					  <xsd:complexType>
+					    <xsd:sequence>	<!-- elements must appear in this order -->
+
+						  <!-- Position info -->
+						  <xsd:element name="ele" type="xsd:decimal" minOccurs="0"/>
+						  <xsd:element name="time" type="xsd:dateTime" minOccurs="0"/>
+						  <xsd:element name="course" type="gpx:degreesType" minOccurs="0"/>
+						  <xsd:element name="speed" type="xsd:decimal" minOccurs="0"/>
+						  <xsd:element name="magvar" type="gpx:degreesType" minOccurs="0"/>
+						  <xsd:element name="geoidheight" type="xsd:decimal" minOccurs="0"/>
+
+						  <!-- Description info -->
+						  <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+						  <xsd:element name="cmt" type="xsd:string" minOccurs="0"/>
+						  <xsd:element name="desc" type="xsd:string" minOccurs="0"/>
+						  <xsd:element name="src" type="xsd:string" minOccurs="0"/>
+						  <xsd:element name="url" type="xsd:anyURI" minOccurs="0"/>
+ 						  <xsd:element name="urlname" type="xsd:string" minOccurs="0"/>
+						  <xsd:element name="sym" type="xsd:string" minOccurs="0"/>
+						  <xsd:element name="type" type="xsd:string" minOccurs="0"/>
+
+						  <!-- Accuracy info -->
+						  <xsd:element name="fix" type="gpx:fixType" minOccurs="0"/>
+						  <xsd:element name="sat" type="xsd:nonNegativeInteger" minOccurs="0"/>
+						  <xsd:element name="hdop" type="xsd:decimal" minOccurs="0"/>
+						  <xsd:element name="vdop" type="xsd:decimal" minOccurs="0"/>
+						  <xsd:element name="pdop" type="xsd:decimal" minOccurs="0"/>
+						  <xsd:element name="ageofdgpsdata" type="xsd:decimal" minOccurs="0"/>
+						  <xsd:element name="dgpsid" type="gpx:dgpsStationType" minOccurs="0"/>
+
+						  <!-- you can add your own privately defined trkpt elements at the end of the trkpt -->
+						  <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+					    </xsd:sequence>
+					    <xsd:attribute name="lat" type="gpx:latitudeType" use="required"/>
+					    <xsd:attribute name="lon" type="gpx:longitudeType" use="required"/>
+					  </xsd:complexType>
+				    </xsd:element>
+			  	  </xsd:sequence>
+			    </xsd:complexType>
+			  </xsd:element>
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
+		<!-- you can add your own privately defined elements at the end of the GPX file -->
+        <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="version" type="xsd:string" use="required" fixed="1.0"/>	<!-- version 1.0 -->
+      <xsd:attribute name="creator" type="xsd:string" use="required"/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <!-- Other types used by GPX -->
+
+  <xsd:simpleType name="latitudeType">
+    <xsd:restriction base="xsd:decimal">
+      <xsd:minInclusive value="-90.0"/>
+      <xsd:maxInclusive value="90.0"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="longitudeType">
+    <xsd:restriction base="xsd:decimal">
+      <xsd:minInclusive value="-180.0"/>
+      <xsd:maxInclusive value="180.0"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="degreesType">	<!-- for bearing, heading, course.  Units are degrees, true -->
+    <xsd:restriction base="xsd:decimal">
+      <xsd:minInclusive value="0.0"/>
+      <xsd:maxInclusive value="360.0"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="fixType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="none"/>	<!-- none means GPS had no fix.  To signify "the fix info is unknown, leave out the <fix> tag entirely --> 
+      <xsd:enumeration value="2d"/>
+      <xsd:enumeration value="3d"/>
+      <xsd:enumeration value="dgps"/>
+      <xsd:enumeration value="pps"/>		<!-- military signal used -->
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="dgpsStationType">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="1023"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:complexType name="boundsType">	<!-- bounding rect for data in file -->
+    <xsd:attribute name="minlat" type="gpx:latitudeType" use="required"/>
+    <xsd:attribute name="minlon" type="gpx:longitudeType" use="required"/>
+    <xsd:attribute name="maxlat" type="gpx:latitudeType" use="required"/>
+    <xsd:attribute name="maxlon" type="gpx:longitudeType" use="required"/>
+  </xsd:complexType>
+
+  <xsd:simpleType name="emailType">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="[\p{L}_]+(\.[\p{L}_]+)*@[\p{L}_]+(\.[\p{L}_]+)+"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/instance.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/instance.xml
new file mode 100644
index 0000000000..5bf398dd0d
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/instance.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?xml-stylesheet type="text/xsl" href="MeasDataCollection.xsl"?>

+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">

+    <fileHeader fileFormatVersion="32.435 V7.2.0"

+                vendorName="Ericsson AB"

+                dnPrefix="STP43">

+        <fileSender localDn="bs=18"

+                    elementType="SBG"/>

+        <measCollec beginTime="2007-09-20T14:05:00+00:00"/>

+    </fileHeader>

+    <measData>

+        <managedElement localDn="bs=18"

+                        userLabel="OMMP"

+                        swVersion="R6A"/>

+        <measInfo measInfoId="l">

+            <job jobId="1"/>

+            <granPeriod duration="PT300S" endTime="2007-09-20T14:10:00+00:00"/>

+            <repPeriod duration="PT300S"/>

+            <measType p="1">ethernetStatsTxFrames</measType>

+            <measType p="2">ethernetStatsTxOctets</measType>

+            <measType p="3">ethernetStatsRxFrames</measType>

+            <measType p="4">ethernetStatsRxOctets</measType>

+            <measType p="5">ethernetStatsBroadcastTx</measType>

+            <measType p="6">ethernetStatsBroadcastRx</measType>

+            <measType p="7">ethernetStatsTxPauseFrames</measType>

+            <measType p="8">ethernetStatsRxMacFrames</measType>

+            <measType p="9">ethernetStatsMulticastRx</measType>

+            <measType p="10">ethernetStatsRxDiscarded</measType>

+            <measType p="11">ethernetStatsRxErrors</measType>

+            <measType p="12">ethernetStatsTxDiscarded</measType>

+            <measValue measObjLdn="Mp.bsNo=18,MpBlade.subrack=0+slot=7,EthernetInterface.port=1">

+                <r p="1">139197852</r>

+                <r p="2">19584465702</r>

+                <r p="3">144651440</r>

+                <r p="4">20348020750</r>

+                <r p="5">30</r>

+                <r p="6">27509</r>

+                <r p="7">0</r>

+                <r p="8">0</r>

+                <r p="9">114575</r>

+                <r p="10">0</r>

+                <r p="11">8590076673</r>

+                <r p="12">0</r>

+            </measValue>

+            <measValue measObjLdn="Mp.bsNo=18,MpBlade.subrack=0+slot=7,EthernetInterface.port=2">

+                <r p="1">0</r>

+                <r p="2">0</r>

+                <r p="3">0</r>

+                <r p="4">0</r>

+                <r p="5">0</r>

+                <r p="6">0</r>

+                <r p="7">0</r>

+                <r p="8">0</r>

+                <r p="9">0</r>

+                <r p="10">0</r>

+                <r p="11">0</r>

+                <r p="12">0</r>

+            </measValue>

+            <measValue measObjLdn="Mp.bsNo=18,MpBlade.subrack=0+slot=9,EthernetInterface.port=1">

+                <r p="1">2282798</r>

+                <r p="2">146099072</r>

+                <r p="3">2424888</r>

+                <r p="4">155302856</r>

+                <r p="5">3</r>

+                <r p="6">27515</r>

+                <r p="7">0</r>

+                <r p="8">0</r>

+                <r p="9">114575</r>

+                <r p="10">0</r>

+                <r p="11">142081</r>

+                <r p="12">0</r>

+            </measValue>

+            <measValue measObjLdn="Mp.bsNo=18,MpBlade.subrack=0+slot=7,EthernetInterface.port=3">

+                <r p="1">0</r>

+                <r p="2">0</r>

+                <r p="3">0</r>

+                <r p="4">0</r>

+                <r p="5">0</r>

+                <r p="6">0</r>

+                <r p="7">0</r>

+                <r p="8">0</r>

+                <r p="9">0</r>

+                <r p="10">0</r>

+                <r p="11">0</r>

+                <r p="12">0</r>

+            </measValue>

+            <measValue measObjLdn="Mp.bsNo=18,MpBlade.subrack=0+slot=9,EthernetInterface.port=2">

+                <r p="1">0</r>

+                <r p="2">0</r>

+                <r p="3">0</r>

+                <r p="4">0</r>

+                <r p="5">0</r>

+                <r p="6">0</r>

+                <r p="7">0</r>

+                <r p="8">0</r>

+                <r p="9">0</r>

+                <r p="10">0</r>

+                <r p="11">0</r>

+                <r p="12">0</r>

+            </measValue>

+            <measValue measObjLdn="Mp.bsNo=18,MpBlade.subrack=0+slot=9,EthernetInterface.port=3">

+                <r p="1">0</r>

+                <r p="2">0</r>

+                <r p="3">0</r>

+                <r p="4">0</r>

+                <r p="5">0</r>

+                <r p="6">0</r>

+                <r p="7">0</r>

+                <r p="8">0</r>

+                <r p="9">0</r>

+                <r p="10">0</r>

+                <r p="11">0</r>

+                <r p="12">0</r>

+            </measValue>

+            <measValue measObjLdn="Mp.bsNo=18,MpBlade.subrack=0+slot=7,EthernetInterface.port=0">

+                <r p="1">139211625</r>

+                <r p="2">19586502972</r>

+                <r p="3">153860245</r>

+                <r p="4">21661061980</r>

+                <r p="5">30</r>

+                <r p="6">3</r>

+                <r p="7">0</r>

+                <r p="8">0</r>

+                <r p="9">68745</r>

+                <r p="10">0</r>

+                <r p="11">68745</r>

+                <r p="12">0</r>

+            </measValue>

+            <measValue measObjLdn="Mp.bsNo=18,MpBlade.subrack=0+slot=9,EthernetInterface.port=0">

+                <r p="1">2282798</r>

+                <r p="2">146099072</r>

+                <r p="3">2351552</r>

+                <r p="4">150499328</r>

+                <r p="5">3</r>

+                <r p="6">9</r>

+                <r p="7">0</r>

+                <r p="8">0</r>

+                <r p="9">68745</r>

+                <r p="10">0</r>

+                <r p="11">68745</r>

+                <r p="12">0</r>

+            </measValue>

+        </measInfo>

+    </measData>

+    <fileFooter>

+        <measCollec endTime="2007-09-20T14:10:00+00:00"/>

+    </fileFooter>

+</measCollecFile>

+

diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/int.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/int.xml
new file mode 100644
index 0000000000..9654bc56ce
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/int.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<purchaseOrder>
+4
+</purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo.xml
new file mode 100644
index 0000000000..3771926dd2
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<ipo:purchaseOrder
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:ipo="http://www.example.com/IPO"
+  orderDate="1999-12-01">
+
+  <shipTo exportCode="1" xsi:type="ipo:UKAddress">
+    <name>Helen Zoe</name>
+    <street>47 Eden Street</street>
+    <city>Cambridge</city>
+    <postcode>CB1 1JR</postcode>
+  </shipTo>
+
+  <billTo xsi:type="ipo:USAddress">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <city>Old Town</city>
+    <state>PA</state>
+    <zip>95819</zip>
+  </billTo>
+
+  <items>
+    <item partNum="833-AA">
+      <productName>Lapis necklace</productName>
+      <quantity>1</quantity>
+      <USPrice>99.95</USPrice>
+      <ipo:comment>Want this for the holidays!</ipo:comment>
+      <shipDate>1999-12-05</shipDate>
+    </item>
+  </items>
+</ipo:purchaseOrder>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo.xsd
new file mode 100644
index 0000000000..856c712e5a
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo.xsd
@@ -0,0 +1,60 @@
+<schema targetNamespace="http://www.example.com/IPO"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ipo="http://www.example.com/IPO">
+
+  <annotation>
+    <documentation xml:lang="en">
+      International Purchase order schema for Example.com
+      Copyright 2000 Example.com. All rights reserved.
+    </documentation>
+  </annotation>
+
+  <!-- include address constructs -->
+  <include
+    schemaLocation="address.xsd"/>
+
+  <element name="purchaseOrder" type="ipo:PurchaseOrderType"/>
+
+  <element name="comment" type="string"/>
+
+  <complexType name="PurchaseOrderType">
+    <sequence>
+      <element name="shipTo"     type="ipo:Address"/>
+      <element name="billTo"     type="ipo:Address"/>
+      <element ref="ipo:comment" minOccurs="0"/>
+      <element name="items"      type="ipo:Items"/>
+    </sequence>
+    <attribute name="orderDate" type="date"/>
+  </complexType>
+
+  <complexType name="Items">
+    <sequence>
+      <element name="item" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <sequence>
+            <element name="productName" type="string"/>
+            <element name="quantity">
+              <simpleType>
+                <restriction base="positiveInteger">
+                  <maxExclusive value="100"/>
+                </restriction>
+              </simpleType>
+            </element>
+            <element name="USPrice"    type="decimal"/>
+            <element ref="ipo:comment" minOccurs="0"/>
+            <element name="shipDate"   type="date" minOccurs="0"/>
+          </sequence>
+          <attribute name="partNum" type="ipo:SKU" use="required"/>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+
+  <simpleType name="SKU">
+    <restriction base="string">
+      <pattern value="\d{3}-[A-Z]{2}"/>
+    </restriction>
+  </simpleType>
+
+</schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_redefine.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_redefine.xml
new file mode 100644
index 0000000000..3f39febc03
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_redefine.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<ipo:purchaseOrder
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:ipo="http://www.example.com/IPO"
+  orderDate="1999-12-01">
+
+  <shipTo exportCode="1" xsi:type="ipo:UKAddress">
+    <name>Helen Zoe</name>
+    <street>47 Eden Street</street>
+    <city>Cambridge</city>
+    <country>United Kingdom</country>
+    <postcode>CB1 1JR</postcode>
+  </shipTo>
+
+  <billTo xsi:type="ipo:USAddress">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <city>Old Town</city>
+    <country>USA</country>
+    <state>PA</state>
+    <zip>95819</zip>
+  </billTo>
+
+  <items>
+    <item partNum="833-AA">
+      <productName>Lapis necklace</productName>
+      <quantity>1</quantity>
+      <USPrice>99.95</USPrice>
+      <ipo:comment>Want this for the holidays!</ipo:comment>
+      <shipDate>1999-12-05</shipDate>
+    </item>
+  </items>
+</ipo:purchaseOrder>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_redefine.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_redefine.xsd
new file mode 100644
index 0000000000..ad5e4884fd
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_redefine.xsd
@@ -0,0 +1,73 @@
+<schema targetNamespace="http://www.example.com/IPO"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ipo="http://www.example.com/IPO">
+
+  <annotation>
+    <documentation xml:lang="en">
+      International Purchase order schema for Example.com
+      Copyright 2000 Example.com. All rights reserved.
+    </documentation>
+  </annotation>
+
+<!-- bring in address constructs -->
+  <redefine
+    schemaLocation="address.xsd">
+
+    <!-- redefinition of Address -->
+    <complexType name="Address">
+      <complexContent>
+        <extension base="ipo:Address">
+          <sequence>
+            <element name="country" type="string"/>
+          </sequence>
+        </extension>
+      </complexContent>
+    </complexType>
+
+  </redefine>
+
+  <element name="purchaseOrder" type="ipo:PurchaseOrderType"/>
+
+  <element name="comment" type="string"/>
+
+  <complexType name="PurchaseOrderType">
+    <sequence>
+      <element name="shipTo"     type="ipo:Address"/>
+      <element name="billTo"     type="ipo:Address"/>
+      <element ref="ipo:comment" minOccurs="0"/>
+      <element name="items"      type="ipo:Items"/>
+    </sequence>
+    <attribute name="orderDate" type="date"/>
+  </complexType>
+
+  <complexType name="Items">
+    <sequence>
+      <element name="item" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <sequence>
+            <element name="productName" type="string"/>
+            <element name="quantity">
+              <simpleType>
+                <restriction base="positiveInteger">
+                  <maxExclusive value="100"/>
+                </restriction>
+              </simpleType>
+            </element>
+            <element name="USPrice"    type="decimal"/>
+            <element ref="ipo:comment" minOccurs="0"/>
+            <element name="shipDate"   type="date" minOccurs="0"/>
+          </sequence>
+          <attribute name="partNum" type="ipo:SKU" use="required"/>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+
+  <simpleType name="SKU">
+    <restriction base="string">
+      <pattern value="\d{3}-[A-Z]{2}"/>
+    </restriction>
+  </simpleType>
+
+</schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_substGroup.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_substGroup.xml
new file mode 100644
index 0000000000..a889153dae
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_substGroup.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<ipo:purchaseOrder
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:ipo="http://www.example.com/IPO"
+  orderDate="1999-12-01">
+
+  <shipTo exportCode="1" xsi:type="ipo:UKAddress">
+    <name>Helen Zoe</name>
+    <street>47 Eden Street</street>
+    <city>Cambridge</city>
+    <postcode>CB1 1JR</postcode>
+  </shipTo>
+
+  <billTo xsi:type="ipo:USAddress">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <city>Old Town</city>
+    <state>PA</state>
+    <zip>95819</zip>
+  </billTo>
+
+  <items>
+    <item partNum="833-AA">
+      <productName>Lapis necklace</productName>
+      <quantity>1</quantity>
+      <USPrice>99.95</USPrice>
+      <ipo:shipComment>
+        Use gold wrap if possible
+      </ipo:shipComment>
+      <ipo:customerComment>
+        Want this for the holidays!
+      </ipo:customerComment>
+      <shipDate>1999-12-05</shipDate>
+    </item>
+  </items>
+</ipo:purchaseOrder>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_substGroup.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_substGroup.xsd
new file mode 100644
index 0000000000..3899d0f5de
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/ipo_substGroup.xsd
@@ -0,0 +1,65 @@
+<schema targetNamespace="http://www.example.com/IPO"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ipo="http://www.example.com/IPO">
+
+  <annotation>
+    <documentation xml:lang="en">
+      International Purchase order schema for Example.com
+      Copyright 2000 Example.com. All rights reserved.
+    </documentation>
+  </annotation>
+
+  <!-- include address constructs -->
+  <include
+    schemaLocation="address.xsd"/>
+
+  <element name="purchaseOrder" type="ipo:PurchaseOrderType"/>
+
+  <element name="comment" type="string"/>
+
+  <element name="shipComment" type="string"
+         substitutionGroup="ipo:comment"/>
+  <element name="customerComment" type="string"
+         substitutionGroup="ipo:comment"/>
+
+  <complexType name="PurchaseOrderType">
+    <sequence>
+      <element name="shipTo"     type="ipo:Address"/>
+      <element name="billTo"     type="ipo:Address"/>
+      <element ref="ipo:comment" minOccurs="0"/>
+      <element name="items"      type="ipo:Items"/>
+    </sequence>
+    <attribute name="orderDate" type="date"/>
+  </complexType>
+
+  <complexType name="Items">
+    <sequence>
+      <element name="item" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <sequence>
+            <element name="productName" type="string"/>
+            <element name="quantity">
+              <simpleType>
+                <restriction base="positiveInteger">
+                  <maxExclusive value="100"/>
+                </restriction>
+              </simpleType>
+            </element>
+            <element name="USPrice"    type="decimal"/>
+            <element ref="ipo:comment" minOccurs="0" maxOccurs="unbounded"/>
+            <element name="shipDate"   type="date" minOccurs="0"/>
+          </sequence>
+          <attribute name="partNum" type="ipo:SKU" use="required"/>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+
+  <simpleType name="SKU">
+    <restriction base="string">
+      <pattern value="\d{3}-[A-Z]{2}"/>
+    </restriction>
+  </simpleType>
+
+</schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/measCollec.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/measCollec.xsd
new file mode 100644
index 0000000000..3e6614effd
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/measCollec.xsd
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>

+

+<!--

+  3GPP TS 32.435 Performance Measurement XML file format definition

+  data file XML schema

+  measCollec.xsd

+-->

+

+<schema

+  targetNamespace=

+"http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec"

+  elementFormDefault="qualified"

+  xmlns="http://www.w3.org/2001/XMLSchema"

+  xmlns:mc=

+"http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec"

+>

+

+  <!-- Measurement collection data file root XML element -->

+

+  <element name="measCollecFile">

+    <complexType>

+      <sequence>

+        <element name="fileHeader">

+          <complexType>

+            <sequence>

+              <element name="fileSender">

+                <complexType>

+                  <attribute name="localDn" type="string" use="optional"/>

+                  <attribute name="elementType" type="string" use="optional"/>

+                </complexType>

+              </element>

+              <element name="measCollec">

+                <complexType>

+                  <attribute name="beginTime" type="dateTime" use="required"/>

+                </complexType>

+              </element>

+            </sequence>

+            <attribute name="fileFormatVersion" type="string" use="required"/>

+            <attribute name="vendorName" type="string" use="optional"/>

+            <attribute name="dnPrefix" type="string" use="optional"/>

+          </complexType>

+        </element>

+        <element name="measData" minOccurs="0" maxOccurs="unbounded">

+          <complexType>

+            <sequence>

+              <element name="managedElement">

+                <complexType>

+                  <attribute name="localDn" type="string" use="optional"/>

+                  <attribute name="userLabel" type="string" use="optional"/>

+                  <attribute name="swVersion" type="string" use="optional"/>

+                </complexType>

+              </element>

+              <element name="measInfo" minOccurs="0" maxOccurs="unbounded">

+                <complexType>

+                  <sequence>

+                    <element name="job" minOccurs="0">

+                      <complexType>

+                        <attribute name="jobId" type="string" use="required"/>

+                      </complexType>

+                    </element>

+                    <element name="granPeriod">

+                      <complexType>

+                        <attribute

+                          name="duration"

+                          type="duration"

+                          use="required"

+                        />

+                        <attribute

+                          name="endTime"

+                          type="dateTime"

+                          use="required"

+                        />

+                      </complexType>

+                    </element>

+                    <element name="repPeriod" minOccurs="0">

+                      <complexType>

+                        <attribute name="duration"

+                                   type="duration" use="required"/>

+                      </complexType>

+                    </element>

+                    <choice>

+                      <element name="measTypes">

+                        <simpleType>

+                          <list itemType="Name"/>

+                        </simpleType>

+                      </element>

+                      <element name="measType"

+                               minOccurs="0" maxOccurs="unbounded">

+                        <complexType>

+                          <simpleContent>

+                            <extension base="Name">

+                              <attribute name="p"

+                                         type="positiveInteger" use="required"/>

+                            </extension>

+                          </simpleContent>

+                        </complexType>

+                      </element>

+                    </choice>

+                    <element name="measValue"

+                             minOccurs="0" maxOccurs="unbounded">

+                      <complexType>

+                        <sequence>

+                          <choice>

+                            <element name="measResults">

+                              <simpleType>

+                                <list itemType="mc:measResultType"/>

+                              </simpleType>

+                            </element>

+                            <element name="r"

+                                     minOccurs="0" maxOccurs="unbounded">

+                              <complexType>

+                                <simpleContent>

+                                  <extension base="mc:measResultType">

+                                    <attribute name="p" type="positiveInteger"

+                                                                use="required"/>

+                                  </extension>

+                                </simpleContent>

+                              </complexType>

+                            </element>

+                          </choice>

+                          <element name="suspect" type="boolean" minOccurs="0"/>

+                        </sequence>

+                        <attribute name="measObjLdn"

+                                   type="string" use="required"/>

+                      </complexType>

+                    </element>

+                  </sequence>

+		  <attribute name="measInfoId"

+                                   type="string" use="required"/>

+                </complexType>

+              </element>

+            </sequence>

+          </complexType>

+        </element>

+        <element name="fileFooter">

+          <complexType>

+            <sequence>

+              <element name="measCollec">

+                <complexType>

+                  <attribute name="endTime" type="dateTime" use="required"/>

+                </complexType>

+              </element>

+            </sequence>

+          </complexType>

+        </element>

+      </sequence>

+    </complexType>

+  </element>

+

+  <simpleType name="measResultType">

+    <union memberTypes="float">

+      <simpleType>

+        <restriction base="string">

+          <enumeration value="NIL"/>

+        </restriction>

+      </simpleType>

+    </union>

+  </simpleType>

+

+</schema>

diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/mim.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/mim.xsd
new file mode 100755
index 0000000000..057344cde8
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/mim.xsd
@@ -0,0 +1,511 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

+  <!--

+    

+    Copyright (c) Ericsson AB 2006 All rights reserved.

+    

+    The information in this document is the property of Ericsson.

+    

+    Except as specifically authorized in writing by Ericsson, the 

+    receiver of this document shall keep the information contained 

+    herein confidential and shall protect the same in whole or in 

+    part from disclosure and dissemination to third parties.

+    

+    Disclosure and disseminations to the receivers employees shall 

+    only be made on a strict need to know basis.

+  -->

+  <!-- Common -->

+  <xs:element name="description" type="xs:string"/>

+  <xs:element name="applicationTag">

+    <xs:complexType>

+      <xs:group minOccurs="0" maxOccurs="unbounded" ref="anyElement"/>

+    </xs:complexType>

+  </xs:element>

+  <xs:attributeGroup name="anyAttribute">

+    <xs:anyAttribute processContents="skip"/>

+  </xs:attributeGroup>

+  <xs:group name="anyElement">

+    <xs:sequence>

+      <xs:any processContents="skip"/>

+    </xs:sequence>

+  </xs:group>

+  <!-- Mim definition -->

+  <xs:element name="mim">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:choice minOccurs="0" maxOccurs="unbounded">

+          <xs:group ref="namedStruct"/>

+          <xs:element ref="enum"/>

+          <xs:group ref="dataTypeDef"/>

+          <xs:element ref="exception"/>

+        </xs:choice>

+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="class"/>

+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="relationship"/>

+      </xs:sequence>

+    </xs:complexType>

+  </xs:element>

+  <!-- MO class definition -->

+  <xs:element name="class">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="description"/>

+        <xs:element minOccurs="0" ref="applicationTag"/>

+        <xs:choice>

+          <xs:sequence>

+            <xs:element ref="singleton"/>

+            <xs:element minOccurs="0" ref="systemCreated"/>

+            <xs:choice minOccurs="0" maxOccurs="unbounded">

+              <xs:group ref="namedStruct"/>

+              <xs:element ref="enum"/>

+              <xs:group ref="dataTypeDef"/>

+            </xs:choice>

+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="attribute"/>

+          </xs:sequence>

+          <xs:sequence>

+            <xs:element minOccurs="0" ref="systemCreated"/>

+            <xs:choice minOccurs="0" maxOccurs="unbounded">

+              <xs:group ref="namedStruct"/>

+              <xs:element ref="enum"/>

+              <xs:group ref="dataTypeDef"/>

+            </xs:choice>

+            <xs:element maxOccurs="unbounded" ref="attribute"/>

+          </xs:sequence>

+        </xs:choice>

+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="action"/>

+        <xs:element minOccurs="0" ref="notificationTypes"/>

+      </xs:sequence>

+      <xs:attribute name="name" use="required">

+        <xs:simpleType>

+          <xs:restriction base="xs:string">

+            <xs:pattern value="[A-Z][A-Za-z0-9]*"/>

+          </xs:restriction>

+        </xs:simpleType>

+      </xs:attribute>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="singleton">

+    <xs:complexType/>

+  </xs:element>

+  <xs:element name="systemCreated">

+    <xs:complexType/>

+  </xs:element>

+  <xs:element name="notificationTypes" type="xs:string"/>

+  <!-- Relations -->

+  <xs:element name="relationship">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="description"/>

+        <xs:element minOccurs="0" ref="applicationTag"/>

+        <xs:element ref="containment"/>

+      </xs:sequence>

+      <xs:attribute name="name" use="required"/>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="containment">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element ref="parent"/>

+        <xs:element ref="child"/>

+      </xs:sequence>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="parent" type="hasClass"/>

+  <xs:element name="child">

+    <xs:complexType>

+      <xs:complexContent>

+        <xs:extension base="hasClass">

+          <xs:sequence>

+            <xs:element minOccurs="0" ref="cardinality"/>

+          </xs:sequence>

+        </xs:extension>

+      </xs:complexContent>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="cardinality">

+    <xs:complexType>

+      <xs:choice>

+        <xs:element ref="min"/>

+        <xs:element ref="max"/>

+        <xs:sequence>

+          <xs:element ref="min"/>

+          <xs:element ref="max"/>

+        </xs:sequence>

+      </xs:choice>

+    </xs:complexType>

+  </xs:element>

+  <xs:complexType name="hasClass">

+    <xs:sequence>

+      <xs:element ref="hasClass"/>

+    </xs:sequence>

+  </xs:complexType>

+  <xs:element name="hasClass">

+    <xs:complexType>

+      <xs:attribute name="name" use="required"/>

+    </xs:complexType>

+  </xs:element>

+  <!-- Data types -->

+  <xs:group name="type">

+    <xs:choice>

+      <xs:element ref="boolean"/>

+      <xs:element ref="float"/>

+      <xs:element ref="integer"/>

+      <xs:element ref="string"/>

+      <xs:group ref="struct"/>

+      <xs:element ref="enumRef"/>

+      <xs:element ref="structRef"/>

+      <xs:element ref="moRef"/>

+    </xs:choice>

+  </xs:group>

+  <!-- For attributes, parameters and exceptions -->

+  <xs:group name="dataType">

+    <xs:sequence>

+      <xs:element name="dataType">

+        <xs:complexType>

+          <xs:choice>

+            <xs:group ref="type"/>

+            <xs:element ref="sequence"/>

+          </xs:choice>

+        </xs:complexType>

+      </xs:element>

+    </xs:sequence>

+  </xs:group>

+  <xs:group name="dataTypeDef">

+    <xs:sequence>

+      <xs:element name="dataType">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element minOccurs="0" ref="description"/>

+            <xs:element minOccurs="0" ref="applicationTag"/>

+            <xs:choice>

+              <xs:group ref="type"/>

+              <xs:element ref="sequence"/>

+            </xs:choice>

+          </xs:sequence>

+          <xs:attribute name="name" use="required"/>

+        </xs:complexType>

+      </xs:element>

+    </xs:sequence>

+  </xs:group>

+  <xs:group name="dataTypeRef">

+    <xs:sequence>

+      <xs:element name="dataType">

+        <xs:complexType>

+          <xs:attribute name="name.ref" use="required"/>

+        </xs:complexType>

+      </xs:element>

+    </xs:sequence>

+  </xs:group>

+  <!-- For actions -->

+  <xs:element name="returnType">

+    <xs:complexType>

+      <xs:choice>

+        <xs:element ref="void"/>

+        <xs:group ref="type"/>

+        <xs:element ref="sequence"/>

+        <xs:group ref="dataTypeRef"/>

+      </xs:choice>

+    </xs:complexType>

+  </xs:element>

+  <!-- Return data types -->

+  <xs:element name="void">

+    <xs:complexType/>

+  </xs:element>

+  <!-- Primitive data types -->

+  <xs:element name="boolean">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="defaultValue"/>

+      </xs:sequence>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="float">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="range"/>

+        <xs:element minOccurs="0" ref="defaultValue"/>

+      </xs:sequence>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="integer">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="range"/>

+        <xs:element minOccurs="0" ref="defaultValue"/>

+      </xs:sequence>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="string">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="lengthRange"/>

+        <xs:element minOccurs="0" ref="validValues"/>

+        <xs:element minOccurs="0" ref="pattern"/>

+        <xs:element minOccurs="0" ref="defaultValue"/>

+      </xs:sequence>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="pattern" type="xs:string"/>

+  <xs:element name="validValues" type="xs:string"/>

+  <xs:element name="lengthRange">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="min"/>

+        <xs:sequence minOccurs="0" maxOccurs="unbounded">

+          <xs:element ref="min"/>

+          <xs:element ref="max"/>

+        </xs:sequence>

+        <xs:element minOccurs="0" ref="max"/>

+      </xs:sequence>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="range">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="min"/>

+        <xs:sequence minOccurs="0" maxOccurs="unbounded">

+          <xs:element ref="min"/>

+          <xs:element ref="max"/>

+        </xs:sequence>

+        <xs:element minOccurs="0" ref="max"/>

+      </xs:sequence>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="max" type="xs:string"/>

+  <xs:element name="min" type="xs:string"/>

+  <xs:element name="defaultValue" type="xs:string"/>

+  <!-- Enum data type -->

+  <xs:element name="enum">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="description"/>

+        <xs:element minOccurs="0" ref="applicationTag"/>

+        <xs:element maxOccurs="unbounded" ref="enumMember"/>

+        <xs:element minOccurs="0" ref="defaultValue"/>

+      </xs:sequence>

+      <xs:attribute name="name" use="required"/>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="enumMember">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="description"/>

+        <xs:element minOccurs="0" ref="applicationTag"/>

+        <xs:element minOccurs="0" ref="value"/>

+      </xs:sequence>

+      <xs:attribute name="name" use="required"/>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="enumRef">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="defaultValue"/>

+      </xs:sequence>

+      <xs:attribute name="name" use="required"/>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="value" type="xs:string"/>

+  <!-- Struct data type -->

+  <xs:group name="namedStruct">

+    <xs:sequence>

+      <xs:element name="struct">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element minOccurs="0" ref="description"/>

+            <xs:element minOccurs="0" ref="applicationTag"/>

+            <xs:element maxOccurs="unbounded" ref="structMember"/>

+          </xs:sequence>

+          <xs:attribute name="name" use="required"/>

+        </xs:complexType>

+      </xs:element>

+    </xs:sequence>

+  </xs:group>

+  <xs:group name="struct">

+    <xs:sequence>

+      <xs:element name="struct">

+        <xs:complexType>

+          <xs:sequence>

+            <xs:element maxOccurs="unbounded" ref="structMember"/>

+          </xs:sequence>

+        </xs:complexType>

+      </xs:element>

+    </xs:sequence>

+  </xs:group>

+  <xs:element name="structMember">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="description"/>

+        <xs:element minOccurs="0" ref="applicationTag"/>

+        <xs:choice>

+          <xs:group ref="type"/>

+          <xs:element ref="sequence"/>

+          <xs:group ref="dataTypeRef"/>

+        </xs:choice>

+      </xs:sequence>

+      <xs:attribute name="name" use="required"/>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="structRef">

+    <xs:complexType>

+      <xs:attribute name="name" use="required"/>

+    </xs:complexType>

+  </xs:element>

+  <!-- Sequence data type -->

+  <xs:element name="sequence">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:choice>

+          <xs:group ref="type"/>

+          <xs:group ref="dataTypeRef"/>

+        </xs:choice>

+        <xs:element minOccurs="0" ref="minLength"/>

+        <xs:element minOccurs="0" ref="maxLength"/>

+        <xs:element minOccurs="0" ref="nonUnique"/>

+      </xs:sequence>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="minLength" type="xs:string"/>

+  <xs:element name="maxLength" type="xs:string"/>

+  <xs:element name="nonUnique">

+    <xs:complexType/>

+  </xs:element>

+  <!-- MoRef data type -->

+  <xs:element name="moRef">

+    <xs:complexType>

+      <xs:attribute name="name" use="required">

+        <xs:simpleType>

+          <xs:restriction base="xs:string">

+            <xs:pattern value="(/[A-Z][A-Za-z0-9]*)*"/>

+          </xs:restriction>

+        </xs:simpleType>

+      </xs:attribute>

+    </xs:complexType>

+  </xs:element>

+  <!-- Attribute -->

+  <xs:element name="attribute">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="description"/>

+        <xs:element minOccurs="0" ref="applicationTag">

+          <xs:annotation>

+            <xs:documentation>Currently not used in IS.</xs:documentation>

+          </xs:annotation>

+        </xs:element>

+        <xs:choice>

+          <xs:group ref="dataType"/>

+          <xs:group ref="dataTypeRef"/>

+        </xs:choice>

+        <xs:element minOccurs="0" ref="initialValue"/>

+        <xs:choice minOccurs="0" maxOccurs="unbounded">

+          <xs:element ref="noNotification"/>

+          <xs:element ref="restricted"/>

+          <xs:element ref="readOnly"/>

+          <xs:choice>

+            <xs:element ref="key"/>

+            <xs:choice>

+              <xs:element ref="local"/>

+              <xs:element ref="mandatory"/>

+              <xs:element ref="nonPersistent"/>

+              <xs:element ref="static"/>

+              <xs:element ref="undefined"/>

+            </xs:choice>

+          </xs:choice>

+        </xs:choice>

+      </xs:sequence>

+      <xs:attribute name="name" use="required">

+        <xs:simpleType>

+          <xs:restriction base="xs:string">

+            <xs:pattern value="[a-z][a-zA-Z0-9]*"/>

+          </xs:restriction>

+        </xs:simpleType>

+      </xs:attribute>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="initialValue" type="xs:string"/>

+  <xs:element name="key">

+    <xs:complexType/>

+  </xs:element>

+  <xs:element name="local">

+    <xs:complexType/>

+  </xs:element>

+  <xs:element name="mandatory">

+    <xs:complexType/>

+  </xs:element>

+  <xs:element name="noNotification">

+    <xs:complexType/>

+  </xs:element>

+  <xs:element name="nonPersistent">

+    <xs:complexType/>

+  </xs:element>

+  <xs:element name="readOnly">

+    <xs:complexType/>

+  </xs:element>

+  <xs:element name="restricted">

+    <xs:complexType/>

+  </xs:element>

+  <xs:element name="static">

+    <xs:complexType/>

+  </xs:element>

+  <xs:element name="undefined">

+    <xs:complexType/>

+  </xs:element>

+  <!-- Action -->

+  <xs:element name="action">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="description"/>

+        <xs:element minOccurs="0" ref="applicationTag"/>

+        <xs:element ref="returnType"/>

+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter"/>

+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="raisesException"/>

+      </xs:sequence>

+      <xs:attribute name="name" use="required">

+        <xs:simpleType>

+          <xs:restriction base="xs:string">

+            <xs:pattern value="[a-z][a-zA-Z0-9]*"/>

+          </xs:restriction>

+        </xs:simpleType>

+      </xs:attribute>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="parameter">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="description"/>

+        <xs:element minOccurs="0" ref="applicationTag"/>

+        <xs:choice>

+          <xs:group ref="dataType"/>

+          <xs:group ref="dataTypeRef"/>

+        </xs:choice>

+      </xs:sequence>

+      <xs:attribute name="name" use="required"/>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="exception">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="description"/>

+        <xs:element minOccurs="0" ref="applicationTag"/>

+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="exceptionParameter"/>

+      </xs:sequence>

+      <xs:attribute name="name" use="required"/>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="exceptionParameter">

+    <xs:complexType>

+      <xs:sequence>

+        <xs:element minOccurs="0" ref="description"/>

+        <xs:element minOccurs="0" ref="applicationTag"/>

+        <xs:choice>

+          <xs:group ref="dataType"/>

+          <xs:group ref="dataTypeRef"/>

+        </xs:choice>

+      </xs:sequence>

+      <xs:attribute name="name" use="required"/>

+    </xs:complexType>

+  </xs:element>

+  <xs:element name="raisesException">

+    <xs:complexType>

+      <xs:attribute name="name" use="required"/>

+    </xs:complexType>

+  </xs:element>

+</xs:schema>

diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/EricssonSpecificAttributes.5.1.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/EricssonSpecificAttributes.5.1.xsd
new file mode 100644
index 0000000000..3509d13da7
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/EricssonSpecificAttributes.5.1.xsd
@@ -0,0 +1,1531 @@
+<!--
+  Configuration data file vendor-specific XML schema
+  EricssonSpecificAttributes.5.1.xsd
+  Includes Transport.
+  -->
+<schema xmlns:es="EricssonSpecificAttributes.5.1.xsd" xmlns:xn="genericNrm.xsd" xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="EricssonSpecificAttributes.5.1.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<!-- EricssonSpecificAttributes version 5.0  vendor-specific data -->
+	<import namespace="genericNrm.xsd" schemaLocation="genericNrm.xsd"/>
+	<include schemaLocation="EricssonSpecificAttributes.5.1Tran.xsd"/>
+	<element name="vsDataAntennaBranch" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="branchName" minOccurs="0"/>
+						<element name="antennaType" minOccurs="0"/>
+						<element name="verticalAntennaTilt" minOccurs="0"/>
+						<element name="mechanicalAntennaTilt" minOccurs="0"/>
+						<element name="antennaSupervisionThreshold" minOccurs="0"/>
+						<element name="fqBandHighEdge" minOccurs="0"/>
+						<element name="fqBandLowEdge" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataAntFeederCable" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="ulAttenuation" minOccurs="0" maxOccurs="unbounded"/>
+						<element name="dlAttenuation" minOccurs="0" maxOccurs="unbounded"/>
+						<element name="objectBConnector" minOccurs="0"/>
+						<element name="connectedToObjectBRef" minOccurs="0"/>
+						<element name="electricalUlDelay" minOccurs="0"/>
+						<element name="electricalDlDelay" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataAreas" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData"/>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataCchFrameSynch" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="dto" minOccurs="0"/>
+						<element name="doStep" minOccurs="0"/>
+						<element name="toAWS" minOccurs="0"/>
+						<element name="toAWE" minOccurs="0"/>
+						<element name="toAE" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataChannelSwitching" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="dlRlcBufUpswitch" minOccurs="0"/>
+						<element name="ulRlcBufUpswitch" minOccurs="0"/>
+						<element name="downswitchThreshold" minOccurs="0"/>
+						<element name="downswitchTimerThreshold" minOccurs="0"/>
+						<element name="downswitchTimer" minOccurs="0"/>
+						<element name="dlRlcBufUpswitchMrab" minOccurs="0"/>
+						<element name="ulRlcBufUpswitchMrab" minOccurs="0"/>
+						<element name="upswitchTimer" minOccurs="0"/>
+						<element name="coverageTimer" minOccurs="0"/>
+						<element name="inactivityTimer" minOccurs="0"/>
+						<element name="downswitchPwrMargin" minOccurs="0"/>
+						<element name="reportHysteresis" minOccurs="0"/>
+						<element name="upswitchPwrMargin" minOccurs="0"/>
+						<element name="downswitchTimerUp" minOccurs="0"/>
+						<element name="downswitchTimerSp" minOccurs="0"/>
+						<element name="hsdschInactivityTimer" minOccurs="0"/>
+						<element name="bandwidthMarginUl" minOccurs="0"/>
+						<element name="upswitchTimerUl" minOccurs="0"/>
+						<element name="bandwidthMargin" minOccurs="0"/>
+						<element name="dlDownswitchBandwidthMargin" minOccurs="0"/>
+						<element name="dlThroughputAllowUpswitchThreshold" minOccurs="0"/>
+						<element name="dlThroughputDownswitchTimer" minOccurs="0"/>
+						<element name="inactivityTimerPch" minOccurs="0"/>
+						<element name="multiRabSp0Available" minOccurs="0"/>
+						<element name="multiRabUdi8Available" minOccurs="0"/>
+						<element name="ulThroughputAllowUpswitchThreshold" minOccurs="0"/>
+						<element name="ulThroughputDownswitchTimer" minOccurs="0"/>
+						<element name="ulDownswitchBandwidthMargin" minOccurs="0"/>
+						<element name="inactivityTimeMultiPsInteractive" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataDchFrameSynch" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="dto" minOccurs="0"/>
+						<element name="doStep" minOccurs="0"/>
+						<element name="toAWS" minOccurs="0"/>
+						<element name="toAWE" minOccurs="0"/>
+						<element name="toAE" minOccurs="0"/>
+						<element name="uto" minOccurs="0"/>
+						<element name="uoStep" minOccurs="0"/>
+						<element name="toAWEUl" minOccurs="0"/>
+						<element name="toAEUl" minOccurs="0"/>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="toAWSUl" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataAuxPlugInUnit" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData"/>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataEquipment" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData"/>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataPlmn" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="mcc" minOccurs="0"/>
+						<element name="mnc" minOccurs="0"/>
+						<element name="mncLength" minOccurs="0"/>
+						<element name="aliasPlmnIdentities" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="mcc" minOccurs="0"/>
+									<element name="mnc" minOccurs="0"/>
+									<element name="mncLength" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataExternalGsmCell" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="maxTxPowerUl" minOccurs="0"/>
+						<element name="qRxLevMin" minOccurs="0"/>
+						<element name="individualOffset" minOccurs="0"/>
+						<element name="parentSystem" minOccurs="0"/>
+						<element name="mncLength" minOccurs="0"/>
+						<element name="bandIndicator" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataExternalGsmPlmn" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="mcc" minOccurs="0"/>
+						<element name="mnc" minOccurs="0"/>
+						<element name="mncLength" minOccurs="0"/>
+						<element name="aliasPlmnIdentities" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="mcc" minOccurs="0"/>
+									<element name="mnc" minOccurs="0"/>
+									<element name="mncLength" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataExternalTma" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="dlAttenuation" minOccurs="0"/>
+						<element name="ulGain" minOccurs="0"/>
+						<element name="dlTrafficDelayA" minOccurs="0"/>
+						<element name="dlTrafficDelayB" minOccurs="0"/>
+						<element name="internalPower" minOccurs="0"/>
+						<element name="ulTrafficDelayA" minOccurs="0"/>
+						<element name="ulTrafficDelayB" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataExternalUtranCell" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="qQualMin" minOccurs="0"/>
+						<element name="qRxLevMin" minOccurs="0"/>
+						<element name="maxTxPowerUl" minOccurs="0"/>
+						<element name="individualOffset" minOccurs="0"/>
+						<element name="parentSystem" minOccurs="0"/>
+						<element name="mncLength" minOccurs="0"/>
+						<element name="agpsEnabled" minOccurs="0"/>
+						<element name="cellCapability" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="hsdschSupport" minOccurs="0"/>
+									<element name="edchSupport" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataExternalUtranPlmn" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="mcc" minOccurs="0"/>
+						<element name="mnc" minOccurs="0"/>
+						<element name="mncLength" minOccurs="0"/>
+						<element name="reservedBy" minOccurs="0"/>
+						<element name="aliasPlmnIdentities" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="mcc" minOccurs="0"/>
+									<element name="mnc" minOccurs="0"/>
+									<element name="mncLength" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataFach" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="maxFach1Power" minOccurs="0"/>
+						<element name="maxFach2Power" minOccurs="0"/>
+						<element name="sccpchOffset" minOccurs="0"/>
+						<element name="pOffset1Fach" minOccurs="0"/>
+						<element name="pOffset3Fach" minOccurs="0"/>
+						<element name="administrativeState" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataGsmRelation" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="qOffset1sn" minOccurs="0"/>
+						<element name="mobilityRelationType" minOccurs="0"/>
+						<element name="selectionPriority" minOccurs="0"/>
+						<element name="externalGsmCellRef" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataHandover" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="maxActiveSet" minOccurs="0"/>
+						<element name="fddGsmHOSupp" minOccurs="0"/>
+						<element name="selHoSup" minOccurs="0"/>
+						<element name="timeReleaseIuPs" minOccurs="0"/>
+						<element name="gsmAmountPropRepeat" minOccurs="0"/>
+						<element name="gsmPropRepeatInterval" minOccurs="0"/>
+						<element name="ifhoPropRepeatInterval" minOccurs="0"/>
+						<element name="ifhoAmountPropRepeat" minOccurs="0"/>
+						<element name="fddIfhoSupp" minOccurs="0"/>
+						<element name="hoTypeDrncBand1" minOccurs="0"/>
+						<element name="hoTypeDrncBand2" minOccurs="0"/>
+						<element name="hoTypeDrncBand3" minOccurs="0"/>
+						<element name="hoTypeDrncBand4" minOccurs="0"/>
+						<element name="hoTypeDrncBand5" minOccurs="0"/>
+						<element name="hoTypeDrncBand6" minOccurs="0"/>
+						<element name="hoTypeDrncBand7" minOccurs="0"/>
+						<element name="hoTypeDrncBand8" minOccurs="0"/>
+						<element name="hoTypeDrncBand9" minOccurs="0"/>
+						<element name="hoTypeDrncBand10" minOccurs="0"/>
+						<element name="hoTypeDrncBand11" minOccurs="0"/>
+						<element name="hoTypeDrncBand12" minOccurs="0"/>
+						<element name="releaseConnOffset" minOccurs="0"/>
+						<element name="hoTypeDrncBand13" minOccurs="0"/>
+						<element name="hoTypeDrncBand14" minOccurs="0"/>
+						<element name="hoTypeDrncBand15" minOccurs="0"/>
+						<element name="hoTypeDrncBand16" minOccurs="0"/>
+						<element name="hoTypeDrncBand17" minOccurs="0"/>
+						<element name="maxGsmMonSubset" minOccurs="0"/>
+						<element name="maxIefMonSubset" minOccurs="0"/>
+						<element name="cnhhoSupp" minOccurs="0"/>
+						<element name="interFreqCnhhoPenaltyEcno" minOccurs="0"/>
+						<element name="interFreqCnhhoPenaltyRscp" minOccurs="0"/>
+						<element name="intraFreqCnhhoPenalty" minOccurs="0"/>
+						<element name="intraFreqCnhhoWeight" minOccurs="0"/>
+						<element name="serviceBasedHoSupport" minOccurs="0"/>
+						<element name="tmStopGsmMeas" minOccurs="0"/>
+						<element name="eulReservedHwBandwidthSchedDataNonServCell" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataIubLink" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="rbsId" minOccurs="0"/>
+						<element name="beMarginDlHw" minOccurs="0"/>
+						<element name="dlHwAdm" minOccurs="0"/>
+						<element name="ulHwAdm" minOccurs="0"/>
+						<element name="beMarginUlHw" minOccurs="0"/>
+						<element name="rncModuleRef" minOccurs="0"/>
+						<element name="preferredSubrackRef" minOccurs="0"/>
+						<element name="edchIubDynDelayLimit" minOccurs="0"/>
+						<element name="userPlaneTransportOption" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="atm" minOccurs="0"/>
+									<element name="ipv4" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataIurLink" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="mcc" minOccurs="0"/>
+						<element name="mnc" minOccurs="0"/>
+						<element name="mncLength" minOccurs="0"/>
+						<element name="rncId" minOccurs="0"/>
+						<element name="aliasPlmnIdentities" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="mcc" minOccurs="0"/>
+									<element name="mnc" minOccurs="0"/>
+									<element name="mncLength" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="utranNetworkRef" minOccurs="0"/>
+						<element name="cellCapabilityControl" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="hsdschSupport" minOccurs="0"/>
+									<element name="edchSupport" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="hspaPathlossThreshold" minOccurs="0"/>
+						<element name="userPlaneTransportOption" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="atm" minOccurs="0"/>
+									<element name="ipv4" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataLocationArea" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="lac" minOccurs="0"/>
+						<element name="t3212" minOccurs="0"/>
+						<element name="att" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataMeContext" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="ipAddress" minOccurs="0"/>
+						<element name="neMIMversion" minOccurs="0"/>
+						<element name="rbsIubId" minOccurs="0"/>
+						<element name="bcrLastChange" minOccurs="0"/>
+						<element name="bctLastChange" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataNodeBFunction" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="toaeDch" minOccurs="0"/>
+						<element name="toaeCch" minOccurs="0"/>
+						<element name="fwdGuardPeriod" minOccurs="0"/>
+						<element name="bwdGuardPeriod" minOccurs="0"/>
+						<element name="tpcFilterLength" minOccurs="0"/>
+						<element name="branchDiffAbsTime" minOccurs="0"/>
+						<element name="branchDiffMeasTime" minOccurs="0"/>
+						<element name="countersAlarmThreshold" minOccurs="0"/>
+						<element name="maxNumberOfCounters" minOccurs="0"/>
+						<element name="steeredHsAllocation" minOccurs="0"/>
+						<element name="eulNoReschUsers" minOccurs="0"/>
+						<element name="eulTargetRate" minOccurs="0"/>
+						<element name="eulMaxShoRate" minOccurs="0"/>
+						<element name="supportOf16qam" minOccurs="0"/>
+						<element name="flexibleSchedulerOn" minOccurs="0"/>
+						<element name="eulReservedHwBandwidthSchedDataNonServCell" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataPaging" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="cnDrxCycleLengthCs" minOccurs="0"/>
+						<element name="cnDrxCycleLengthPs" minOccurs="0"/>
+						<element name="noOfPagingRecordTransm" minOccurs="0"/>
+						<element name="utranDrxCycleLength" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataPch" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="pchPower" minOccurs="0"/>
+						<element name="pichPower" minOccurs="0"/>
+						<element name="sccpchOffset" minOccurs="0"/>
+						<element name="administrativeState" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataPowerControl" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="cBackOff" minOccurs="0"/>
+						<element name="ulOuterLoopRegulator" minOccurs="0"/>
+						<element name="ulSirStep" minOccurs="0"/>
+						<element name="sirMin" minOccurs="0"/>
+						<element name="sirMax" minOccurs="0"/>
+						<element name="dlPcMethod" minOccurs="0"/>
+						<element name="cPO" minOccurs="0"/>
+						<element name="pO1" minOccurs="0"/>
+						<element name="pO2" minOccurs="0"/>
+						<element name="pO3" minOccurs="0"/>
+						<element name="ecNoPcpichDefault" minOccurs="0"/>
+						<element name="pcpichPowerDefault" minOccurs="0"/>
+						<element name="fixedPowerDl" minOccurs="0"/>
+						<element name="cNbifho" minOccurs="0"/>
+						<element name="fixedRefPower" minOccurs="0"/>
+						<element name="initShoPowerParam" minOccurs="0"/>
+						<element name="dlInitSirTarget" minOccurs="0"/>
+						<element name="ulInitSirTargetExtraHigh" minOccurs="0"/>
+						<element name="ulInitSirTargetHigh" minOccurs="0"/>
+						<element name="ulInitSirTargetLow" minOccurs="0"/>
+						<element name="ulInitSirTargetSrb" minOccurs="0"/>
+						<element name="transmissionTargetError" minOccurs="0"/>
+						<element name="ulInitSirTargetEdch" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataRach" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="scramblingCodeWordNo" minOccurs="0"/>
+						<element name="preambleSignatures" minOccurs="0"/>
+						<element name="subChannelNo" minOccurs="0"/>
+						<element name="aichTransmissionTiming" minOccurs="0"/>
+						<element name="aichPower" minOccurs="0"/>
+						<element name="powerOffsetP0" minOccurs="0"/>
+						<element name="powerOffsetPpm" minOccurs="0"/>
+						<element name="preambleRetransMax" minOccurs="0"/>
+						<element name="maxPreambleCycle" minOccurs="0"/>
+						<element name="constantValueCprach" minOccurs="0"/>
+						<element name="spreadingFactor" minOccurs="0"/>
+						<element name="administrativeState" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataRbsLocalCell" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="localCellId" minOccurs="0"/>
+						<element name="cellRange" minOccurs="0"/>
+						<element name="carrierRef" minOccurs="0"/>
+						<element name="dynamicHsPdschCodeAdditionOn" minOccurs="0"/>
+						<element name="hsCodeResourceId" minOccurs="0"/>
+						<element name="maxNumHsPdschCodes" minOccurs="0"/>
+						<element name="eulMaxRotCoverage" minOccurs="0"/>
+						<element name="eulMaxOwnUuLoad" minOccurs="0"/>
+						<element name="maxUserEHichERgchPowerDl" minOccurs="0"/>
+						<element name="eulMaxNoSchEDch" minOccurs="0"/>
+						<element name="eulMinMarginCoverage" minOccurs="0"/>
+						<element name="eulOptimalNoiseFloorLock" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="eulNoiseFloorLock" minOccurs="0"/>
+									<element name="eulOptimalNoiseFloorEstimate" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="eulSlidingWindowTime" minOccurs="0"/>
+						<element name="eulThermalLevelPrior" minOccurs="0"/>
+						<element name="eulNoERgchGroups" minOccurs="0"/>
+						<element name="maxEAgchPowerDl" minOccurs="0"/>
+						<element name="maxNumHsdpaUsers" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataRcs" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="dchRcLostT" minOccurs="0"/>
+						<element name="cchWaitCuT" minOccurs="0"/>
+						<element name="hsDschRcLostT" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataRetDevice" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="electricalAntennaTilt" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataRetDeviceSet" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="retType" minOccurs="0"/>
+						<element name="productNumber" minOccurs="0"/>
+						<element name="revState" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<!--element name="vsDataRetProfile" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element-->
+	<element name="vsDataRetuDeviceGroup" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData"/>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataRoutingArea" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="rac" minOccurs="0"/>
+						<element name="nmo" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataRrc" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="t305" minOccurs="0"/>
+						<element name="packetEstMode" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataSector" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="numberOfCarriers" minOccurs="0"/>
+						<element name="numberOfTxBranches" minOccurs="0"/>
+						<element name="outputPower" minOccurs="0"/>
+						<element name="latitude" minOccurs="0"/>
+						<element name="latHemisphere" minOccurs="0"/>
+						<element name="longitude" minOccurs="0"/>
+						<element name="longHemisphere" minOccurs="0"/>
+						<element name="geoDatum" minOccurs="0"/>
+						<element name="beamDirection" minOccurs="0"/>
+						<element name="height" minOccurs="0"/>
+						<element name="sectorAntennaRef" minOccurs="0"/>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="retDeviceRef" minOccurs="0"/>
+						<element name="maxInternalUlGainOn" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataSectorAntenna" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="antennaType" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataCarrier" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="cqiAdjustmentOn" minOccurs="0"/>
+						<element name="cqiErrors" minOccurs="0"/>
+						<element name="cqiErrorsAbsent" minOccurs="0"/>
+						<element name="hsPowerMargin" minOccurs="0"/>
+						<element name="hsScchMaxCodePower" minOccurs="0"/>
+						<element name="queueSelectAlgorithm" minOccurs="0"/>
+						<element name="frequencyPlane" minOccurs="0"/>
+						<element name="hsScchMinCodePower" minOccurs="0"/>
+						<element name="qualityCheckPower" minOccurs="0"/>
+						<element name="supportOf16qam" minOccurs="0"/>
+						<element name="airRateTypeSelector" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataServiceArea" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="sac" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataSid" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="updateCellReattsNo" minOccurs="0"/>
+						<element name="noOfMaxDrxCycles" minOccurs="0"/>
+						<element name="noOfMibValueTagRetrans" minOccurs="0"/>
+						<element name="sib1" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="sib1RepPeriod" minOccurs="0"/>
+									<element name="sib1StartPos" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="sib11" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="sib11RepPeriod" minOccurs="0"/>
+									<element name="sib11StartPos" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="sib12" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="sib12RepPeriod" minOccurs="0"/>
+									<element name="sib12StartPos" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="sib3" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="sib3RepPeriod" minOccurs="0"/>
+									<element name="sib3StartPos" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="sib5" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="sib5RepPeriod" minOccurs="0"/>
+									<element name="sib5StartPos" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="sib7" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="sib7RepPeriod" minOccurs="0"/>
+									<element name="sib7StartPos" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="sib7ExpirationTimeFactor" minOccurs="0"/>
+						<element name="sib2" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="sib2RepPeriod" minOccurs="0"/>
+									<element name="sib2StartPos" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUeMeasControl" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="reportingRange1a" minOccurs="0"/>
+						<element name="reportingRange1b" minOccurs="0"/>
+						<element name="hysteresis1c" minOccurs="0"/>
+						<element name="hysteresis1d" minOccurs="0"/>
+						<element name="hysteresis2d" minOccurs="0"/>
+						<element name="hysteresis2f" minOccurs="0"/>
+						<element name="gsmThresh3a" minOccurs="0"/>
+						<element name="hysteresis3a" minOccurs="0"/>
+						<element name="measQuantity1" minOccurs="0"/>
+						<element name="ueTxPowerThresh6a" minOccurs="0"/>
+						<element name="ueTxPowerThresh6b" minOccurs="0"/>
+						<element name="usedFreqThresh2dEcnoDrnc" minOccurs="0"/>
+						<element name="usedFreqThresh2dRscpDrnc" minOccurs="0"/>
+						<element name="usedFreqRelThresh2fEcno" minOccurs="0"/>
+						<element name="usedFreqRelThresh2fRscp" minOccurs="0"/>
+						<element name="hyst4_2b" minOccurs="0"/>
+						<element name="nonUsedFreqThresh4_2bEcno" minOccurs="0"/>
+						<element name="nonUsedFreqThresh4_2bRscp" minOccurs="0"/>
+						<element name="timeToTrigger1a" minOccurs="0"/>
+						<element name="hysteresis1a" minOccurs="0"/>
+						<element name="timeToTrigger1b" minOccurs="0"/>
+						<element name="hysteresis1b" minOccurs="0"/>
+						<element name="timeToTrigger1c" minOccurs="0"/>
+						<element name="timeToTrigger1d" minOccurs="0"/>
+						<element name="timeToTrigger3a" minOccurs="0"/>
+						<element name="reportingInterval1a" minOccurs="0"/>
+						<element name="reportingInterval1c" minOccurs="0"/>
+						<element name="timeTrigg6a" minOccurs="0"/>
+						<element name="timeTrigg6b" minOccurs="0"/>
+						<element name="timeTrigg4_2b" minOccurs="0"/>
+						<element name="hsHysteresis1d" minOccurs="0"/>
+						<element name="hsQualityEstimate" minOccurs="0"/>
+						<element name="hsTimeToTrigger1d" minOccurs="0"/>
+						<element name="filterCoefficient1" minOccurs="0"/>
+						<element name="filterCoefficient2" minOccurs="0"/>
+						<element name="utranFilterCoefficient3" minOccurs="0"/>
+						<element name="gsmFilterCoefficient3" minOccurs="0"/>
+						<element name="filterCoeff6" minOccurs="0"/>
+						<element name="filterCoeff4_2b" minOccurs="0"/>
+						<element name="w1a" minOccurs="0"/>
+						<element name="w1b" minOccurs="0"/>
+						<element name="usedFreqW2d" minOccurs="0"/>
+						<element name="usedFreqW2f" minOccurs="0"/>
+						<element name="usedFreqW4_2b" minOccurs="0"/>
+						<element name="utranW3a" minOccurs="0"/>
+						<element name="nonUsedFreqW4_2b" minOccurs="0"/>
+						<element name="timeToTrigger2dEcno" minOccurs="0"/>
+						<element name="timeToTrigger2fEcno" minOccurs="0"/>
+						<element name="utranRelThresh3aEcno" minOccurs="0"/>
+						<element name="utranRelThresh3aRscp" minOccurs="0"/>
+						<element name="usedFreqRelThresh4_2bEcno" minOccurs="0"/>
+						<element name="usedFreqRelThresh4_2bRscp" minOccurs="0"/>
+						<element name="timeToTrigger2dRscp" minOccurs="0"/>
+						<element name="timeToTrigger2fRscp" minOccurs="0"/>
+						<element name="utranRelThreshRscp" minOccurs="0"/>
+						<element name="event1dRncThreshold" minOccurs="0"/>
+						<element name="event1dRncOffset" minOccurs="0"/>
+						<element name="timeToTrigger6d" minOccurs="0"/>
+						<element name="txPowerConnQualMonEnabled" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUeRc" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="serviceOffset2dEcno" minOccurs="0"/>
+						<element name="serviceOffset2dRscp" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUeRcTrCh" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="blerQualityTargetDl" minOccurs="0"/>
+						<element name="blerQualityTargetUl" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUtranCell" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="tCell" minOccurs="0"/>
+						<element name="cellReserved" minOccurs="0"/>
+						<element name="treSelection" minOccurs="0"/>
+						<element name="qualMeasQuantity" minOccurs="0"/>
+						<element name="qHyst1" minOccurs="0"/>
+						<element name="qHyst2" minOccurs="0"/>
+						<element name="qQualMin" minOccurs="0"/>
+						<element name="qRxLevMin" minOccurs="0"/>
+						<element name="individualOffset" minOccurs="0"/>
+						<element name="pwrAdm" minOccurs="0"/>
+						<element name="pwrAdmOffset" minOccurs="0"/>
+						<element name="pwrOffset" minOccurs="0"/>
+						<element name="pwrHyst" minOccurs="0"/>
+						<element name="tmCongAction" minOccurs="0"/>
+						<element name="releaseAseDl" minOccurs="0"/>
+						<element name="aseDlAdm" minOccurs="0"/>
+						<element name="dlCodeAdm" minOccurs="0"/>
+						<element name="aseUlAdm" minOccurs="0"/>
+						<element name="sf8Adm" minOccurs="0"/>
+						<element name="sf32Adm" minOccurs="0"/>
+						<element name="aseUlAdmOffset" minOccurs="0"/>
+						<element name="minPwrRl" minOccurs="0"/>
+						<element name="maxRate" minOccurs="0"/>
+						<element name="interRate" minOccurs="0"/>
+						<element name="minimumRate" minOccurs="0"/>
+						<element name="maxPwrMax" minOccurs="0"/>
+						<element name="interPwrMax" minOccurs="0"/>
+						<element name="minPwrMax" minOccurs="0"/>
+						<element name="compModeAdm" minOccurs="0"/>
+						<element name="iFOffset" minOccurs="0"/>
+						<element name="iFHyst" minOccurs="0"/>
+						<element name="iFCong" minOccurs="0"/>
+						<element name="interFreqFddMeasIndicator" minOccurs="0"/>
+						<element name="sRatSearch" minOccurs="0"/>
+						<element name="sIntraSearch" minOccurs="0"/>
+						<element name="sInterSearch" minOccurs="0"/>
+						<element name="fachMeasOccaCycLenCoeff" minOccurs="0"/>
+						<element name="accessClassNBarred" minOccurs="0" maxOccurs="unbounded"/>
+						<element name="utranCellPosition" minOccurs="0" maxOccurs="unbounded"/>
+						<element name="maxTxPowerUl" minOccurs="0"/>
+						<element name="beMarginAseUl" minOccurs="0"/>
+						<element name="beMarginAseDl" minOccurs="0"/>
+						<element name="reservedBy" minOccurs="0" maxOccurs="unbounded"/>
+						<element name="sib1PlmnScopeValueTag" minOccurs="0"/>
+						<element name="sf16Adm" minOccurs="0"/>
+						<element name="beMarginDlPwr" minOccurs="0"/>
+						<element name="beMarginDlCode" minOccurs="0"/>
+						<element name="hoType" minOccurs="0"/>
+						<element name="usedFreqThresh2dEcno" minOccurs="0"/>
+						<element name="usedFreqThresh2dRscp" minOccurs="0"/>
+						<element name="administrativeState" minOccurs="0"/>
+						<element name="loadSharingGsmThreshold" minOccurs="0"/>
+						<element name="loadSharingGsmFraction" minOccurs="0"/>
+						<element name="snDirectedRetryTarget" minOccurs="0"/>
+						<element name="nInSyncInd" minOccurs="0"/>
+						<element name="rlFailureT" minOccurs="0"/>
+						<element name="nOutSyncInd" minOccurs="0"/>
+						<element name="sf4AdmUl" minOccurs="0"/>
+						<element name="hardIfhoCorr" minOccurs="0"/>
+						<element name="hsdpaUsersAdm" minOccurs="0"/>
+						<element name="loadSharingMargin" minOccurs="0"/>
+						<element name="releaseAseDlGhs" minOccurs="0"/>
+						<element name="tmCongActionGhs" minOccurs="0"/>
+						<element name="tmInitialGhs" minOccurs="0"/>
+						<element name="sf4UlPathlossThreshold" minOccurs="0"/>
+						<element name="ulPathlossCheckEnabled" minOccurs="0"/>
+						<element name="sHcsRat" minOccurs="0"/>
+						<element name="sf16gAdm" minOccurs="0"/>
+						<element name="releaseAseDlNg" minOccurs="0"/>
+						<element name="tmCongActionNg" minOccurs="0"/>
+						<element name="tmInitialG" minOccurs="0"/>
+						<element name="sf16AdmUl" minOccurs="0"/>
+						<element name="sf8AdmUl" minOccurs="0"/>
+						<element name="sf8gAdmUl" minOccurs="0"/>
+						<element name="iubLinkRef" minOccurs="0"/>
+						<element name="eulNonServingCellUsersAdm" minOccurs="0"/>
+						<element name="eulServingCellUsersAdm" minOccurs="0"/>
+						<element name="agpsEnabled" minOccurs="0"/>
+						<element name="codeLoadThresholdDlSf128" minOccurs="0"/>
+						<element name="pwrLoadThresholdDlSpeech" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="amr12200" minOccurs="0"/>
+									<element name="amr7950" minOccurs="0"/>
+									<element name="amr5900" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="aseLoadThresholdUlSpeech" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="amr12200" minOccurs="0"/>
+									<element name="amr7950" minOccurs="0"/>
+									<element name="amr5900" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="accessClassesBarredCs" minOccurs="0" maxOccurs="unbounded"/>
+						<element name="accessClassesBarredPs" minOccurs="0" maxOccurs="unbounded"/>
+						<element name="rateSelectionPsInteractive" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="channelType" minOccurs="0"/>
+									<element name="ulPrefRate" minOccurs="0"/>
+									<element name="dlPrefRate" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="hcsUsage" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="idleMode" minOccurs="0"/>
+									<element name="connectedMode" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="hcsSib3Config" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="sSearchHcs" minOccurs="0"/>
+									<element name="hcsPrio" minOccurs="0"/>
+									<element name="qHcs" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUtranRelation" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="qOffset1sn" minOccurs="0"/>
+						<element name="qOffset2sn" minOccurs="0"/>
+						<element name="loadSharingCandidate" minOccurs="0"/>
+						<element name="selectionPriority" minOccurs="0"/>
+						<element name="frequencyRelationType" minOccurs="0"/>
+						<element name="hcsSib11Config" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="hcsPrio" minOccurs="0"/>
+									<element name="qHcs" minOccurs="0"/>
+									<element name="penaltyTime" minOccurs="0"/>
+									<element name="temporaryOffset1" minOccurs="0"/>
+									<element name="temporaryOffset2" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataRncFunction" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="mncLength" minOccurs="0"/>
+						<element name="emergencyCallRedirect" minOccurs="0"/>
+						<element name="loadSharingDirRetryEnabled" minOccurs="0"/>
+						<element name="hsCellChangeAllowed" minOccurs="0"/>
+						<element name="hsOnlyBestCell" minOccurs="0"/>
+						<element name="aliasPlmnIdentities" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="mcc" minOccurs="0"/>
+									<element name="mnc" minOccurs="0"/>
+									<element name="mncLength" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="counterAlarmCeaseLimit" minOccurs="0"/>
+						<element name="counterAlarmThreshold" minOccurs="0"/>
+						<element name="counterWarningAlarmCeaseLimit" minOccurs="0"/>
+						<element name="ctrFileSize" minOccurs="0"/>
+						<element name="gpehDataLevel" minOccurs="0"/>
+						<element name="gpehFileSize" minOccurs="0"/>
+						<element name="loadSharingRrcEnabled" minOccurs="0"/>
+						<element name="uetrFileSize" minOccurs="0"/>
+						<element name="networkResourceIdentifierLengthCs" minOccurs="0"/>
+						<element name="networkResourceIdentifierLengthPs" minOccurs="0"/>
+						<element name="hsToDchTrigger" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="servHsChangeInterRnc" minOccurs="0"/>
+									<element name="servHsChangeIntraRnc" minOccurs="0"/>
+									<element name="changeOfBestCellIntraRnc" minOccurs="0"/>
+									<element name="poorQualityDetected" minOccurs="0"/>
+									<element name="changeOfBestCellInterRnc" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="harqTransmUlTti10Max" minOccurs="0" maxOccurs="unbounded"/>
+						<element name="ecLocationAttemptUmts" minOccurs="0"/>
+						<element name="ecCnSbhoRequestIgnore" minOccurs="0"/>
+						<element name="ecCnPriorityLevel" minOccurs="0"/>
+						<element name="ecSbhoTimer" minOccurs="0"/>
+						<element name="primaryCnOperatorRef" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUeRcEdchFlow" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="harqTransmUlMax" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataSecurityHandling" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="ciphering" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataRabHandling" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="psStreamingInactivityTimer" minOccurs="0"/>
+						<element name="activeQueueMgmt" minOccurs="0"/>
+						<element name="dscpValuePsStreaming" minOccurs="0"/>
+						<element name="psStreaming128" minOccurs="0"/>
+						<element name="state128_128Supported" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataSubrack" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData"/>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataSlot" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData"/>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataPlugInUnit" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="administrativeState" minOccurs="0"/>
+						<element name="allowedSeqRestarts" minOccurs="0"/>
+						<element name="piuGroupNumber" minOccurs="0"/>
+						<element name="piuType" minOccurs="0"/>
+						<element name="productType" minOccurs="0"/>
+						<element name="userLabel" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<!--element name="vsDataGigaBitEthernet" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element-->
+	<element name="vsDataUePositioning" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="enabledPositioningFeatures" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataGpsReceiver" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="administrativeState" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataAgpsPositioning" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="altitudeDirection" minOccurs="0"/>
+						<element name="altitude" minOccurs="0"/>
+						<element name="uncertaintyAltitude" minOccurs="0"/>
+						<element name="confidence" minOccurs="0"/>
+						<element name="polygonRadiusFactor" minOccurs="0"/>
+						<element name="utranRnsPosition" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="latitudeSign" minOccurs="0"/>
+									<element name="latitude" minOccurs="0"/>
+									<element name="longitude" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="utranRnsUncertaintyRadius" minOccurs="0"/>
+						<element name="utranRnsConfidence" minOccurs="0"/>
+						<element name="elevationThreshold" minOccurs="0"/>
+						<element name="ueMeasurementReportCriteria" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="reportingAmount" minOccurs="0"/>
+									<element name="reportingInterval" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataIubDataStreams" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="maxHsRate" minOccurs="0"/>
+						<element name="maxEDchRate" minOccurs="0"/>
+						<element name="hsDataFrameDelayThreshold" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataTxDeviceGroup" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="loadHs" minOccurs="0"/>
+						<element name="numHsCodeResources" minOccurs="0"/>
+						<element name="numEulResources" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataHsdsch" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="administrativeState" minOccurs="0"/>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="numHsPdschCodes" minOccurs="0"/>
+						<element name="deltaAck1" minOccurs="0"/>
+						<element name="deltaNack1" minOccurs="0"/>
+						<element name="deltaAck2" minOccurs="0"/>
+						<element name="deltaNack2" minOccurs="0"/>
+						<element name="deltaCqi1" minOccurs="0"/>
+						<element name="deltaCqi2" minOccurs="0"/>
+						<element name="initialCqiRepetitionFactor" minOccurs="0"/>
+						<element name="initialAckNackRepetitionFactor" minOccurs="0"/>
+						<element name="cqiFeedbackCycle" minOccurs="0"/>
+						<element name="hsMeasurementPowerOffset" minOccurs="0"/>
+						<element name="codeThresholdPdu656" minOccurs="0"/>
+						<element name="numHsScchCodes" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataCoverageRelation" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="utranCellRef" minOccurs="0"/>
+						<element name="coverageIndicator" minOccurs="0"/>
+						<element name="hsPathlossThreshold" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUeRcRab" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="fcState" minOccurs="0"/>
+						<element name="trBearerQosClass" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUeRcRrc" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="trBearerQosClass" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUeRabType" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="trBearerQosClass" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUra" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="uraIdentity" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataLicensing" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData"/>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataRncFeature" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="featureState" minOccurs="0"/>
+						<element name="licenseState" minOccurs="0"/>
+						<element name="serviceState" minOccurs="0"/>
+						<element name="keyId" minOccurs="0"/>
+						<element name="isLicenseControlled" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataEul" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="administrativeState" minOccurs="0"/>
+						<element name="numEagchCodes" minOccurs="0"/>
+						<element name="numEhichErgchCodes" minOccurs="0"/>
+						<element name="eulMaxTargetRtwp" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataSystemFunctions" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData"/>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataIubEdch" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="edchDataFrameDelayThreshold" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataWcdmaCarrier" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="defaultHoType" minOccurs="0"/>
+						<element name="freqBand" minOccurs="0"/>
+						<element name="sib5bisEnabled" minOccurs="0"/>
+						<element name="uarfcnDl" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUtranNetwork" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="aliasPlmnIdentities" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="mcc" minOccurs="0"/>
+									<element name="mnc" minOccurs="0"/>
+									<element name="mncLength" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="plmnIdentity" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="mcc" minOccurs="0"/>
+									<element name="mnc" minOccurs="0"/>
+									<element name="mncLength" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataCnOperator" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="userLabel" minOccurs="0"/>
+						<element name="plmnIdentity" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="mcc" minOccurs="0"/>
+									<element name="mnc" minOccurs="0"/>
+									<element name="mncLength" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+						<element name="iphoNetworkRefsUtran" minOccurs="0"/>
+						<element name="iphoNetworkRefsGsm" minOccurs="0"/>
+						<element name="equivalentPlmnIdentities" minOccurs="0" maxOccurs="unbounded">
+							<complexType>
+								<sequence>
+									<element name="mcc" minOccurs="0"/>
+									<element name="mnc" minOccurs="0"/>
+									<element name="mncLength" minOccurs="0"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataRbsSynchronization" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="plugInUnitRef1" minOccurs="0"/>
+						<element name="plugInUnitRef2" minOccurs="0"/>
+						<element name="timDeviceRef1" minOccurs="0"/>
+						<element name="timDeviceRef2" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataUeRcPhyChEdch" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="eulHarqRv" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+	<element name="vsDataPmService" substitutionGroup="xn:vsData">
+		<complexType>
+			<complexContent>
+				<extension base="xn:vsData">
+					<sequence>
+						<element name="minorAlarmCeasingDelta" minOccurs="0"/>
+						<element name="warningAlarmLimitPercent" minOccurs="0"/>
+						<element name="warningAlarmCeasingDelta" minOccurs="0"/>
+					</sequence>
+				</extension>
+			</complexContent>
+		</complexType>
+	</element>
+</schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/EricssonSpecificAttributes.5.1Tran.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/EricssonSpecificAttributes.5.1Tran.xsd
new file mode 100644
index 0000000000..33e00bab48
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/EricssonSpecificAttributes.5.1Tran.xsd
@@ -0,0 +1,2164 @@
+<!--
+  Configuration data file vendor-specific XML schema
+  EricssonSpecificAttributes.5.1Tran.xsd Implementation of BCT I/face.Requires BCR/Bulk CM General installed
+  For use with ONLY with EricssonSpecificAttributes.5.1.xsd
+  NB!! See EricssonSpecificAttributes.5.1.xsd
+  Use Namespace for EricssonSpecificAttributes.5.1.xsd in all files which conform to this schema
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xn="genericNrm.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<!-- EricssonSpecificAttributes version 5.1  vendor-specific data -->
+	<xs:import namespace="genericNrm.xsd" schemaLocation="genericNrm.xsd"/>
+	<xs:element name="vsDataAal0TpVccTp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="alarmReport" minOccurs="0"/>
+						<xs:element name="continuityCheck" minOccurs="0"/>
+						<xs:element name="nomPmBlkSize" minOccurs="0"/>
+						<xs:element name="processorId" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="vclTpId" minOccurs="0"/>
+						<xs:element name="counterMode" minOccurs="0"/>
+						<xs:element name="counterActivation" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAal1TpVccTp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="nomPmBlockSize" minOccurs="0"/>
+						<xs:element name="ds0BundleId" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="vclTpId" minOccurs="0"/>
+						<xs:element name="counterMode" minOccurs="0"/>
+						<xs:element name="partialFill" minOccurs="0"/>
+						<xs:element name="alarmReport" minOccurs="0"/>
+						<xs:element name="cdvt" minOccurs="0"/>
+						<xs:element name="continuityCheck" minOccurs="0"/>
+						<xs:element name="counterActivation" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAal2Ap" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="aal2QoSCodePointProfileId" minOccurs="0"/>
+						<xs:element name="rpuId" minOccurs="0"/>
+						<xs:element name="secondarySigLinkId" minOccurs="0"/>
+						<xs:element name="sigLinkId" minOccurs="0"/>
+						<xs:element name="timerErq" minOccurs="0"/>
+						<xs:element name="timerRel" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="allocationMode" minOccurs="0"/>
+						<xs:element name="reallocate" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAtmConfService" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="reallocateAllAal2Aps" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAal2PathDistributionUnit" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="rpuId" minOccurs="0"/>
+						<xs:element name="aal2PathVccTpList" minOccurs="0" maxOccurs="unbounded"/>
+						<xs:element name="addPath" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="aal2PathVccTpId" minOccurs="0" maxOccurs="unbounded"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="removePath" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="aal2PathList" minOccurs="0" maxOccurs="unbounded"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAal2PathVccTp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="aal2PathOwner" minOccurs="0"/>
+						<xs:element name="alarmReport" minOccurs="0"/>
+						<xs:element name="nomPmBlocksize" minOccurs="0"/>
+						<xs:element name="timerCu" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="continuityCheck" minOccurs="0"/>
+						<xs:element name="aal2PathId" minOccurs="0"/>
+						<xs:element name="vclTpId" minOccurs="0"/>
+						<xs:element name="aal2QoSAvailableProfiles" minOccurs="0"/>
+						<xs:element name="aal2QoSProfileId" minOccurs="0"/>
+						<xs:element name="counterMode" minOccurs="0"/>
+						<xs:element name="counterActivation" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAal2RoutingCase" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="numberDirection" minOccurs="0"/>
+						<xs:element name="routeList" minOccurs="0" maxOccurs="unbounded"/>
+						<xs:element name="routePriorityList" minOccurs="0" maxOccurs="unbounded"/>
+						<xs:element name="addAal2ApToRc" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="priority" minOccurs="0"/>
+									<xs:element name="route" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="removeAal2ApFromRc" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="route" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAal2Sp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="a2ea" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAal5TpVccTp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="alarmReport" minOccurs="0"/>
+						<xs:element name="continuityCheck" minOccurs="0"/>
+						<xs:element name="fromUserMaxSduSize" minOccurs="0"/>
+						<xs:element name="nomPmBlkSize" minOccurs="0"/>
+						<xs:element name="processorId" minOccurs="0"/>
+						<xs:element name="toUserMaxSduSize" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="vclTpId" minOccurs="0"/>
+						<xs:element name="counterMode" minOccurs="0"/>
+						<xs:element name="counterActivation" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAtmCrossConnection" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="vclTpAId" minOccurs="0"/>
+						<xs:element name="vclTpBId" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAtmTrafficDescriptor" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="egressAtmMcr" minOccurs="0"/>
+						<xs:element name="egressAtmPcr" minOccurs="0"/>
+						<xs:element name="egressAtmQos" minOccurs="0"/>
+						<xs:element name="ingressAtmMcr" minOccurs="0"/>
+						<xs:element name="ingressAtmPcr" minOccurs="0"/>
+						<xs:element name="ingressAtmQos" minOccurs="0"/>
+						<xs:element name="serviceCategory" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="packetDiscard" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAtmPort" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="uses" minOccurs="0"/>
+						<xs:element name="hecCorrectionMode" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataTransportNetwork" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataUniSaalProfile" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="profileData" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="congestionAbatement" minOccurs="0"/>
+									<xs:element name="congestionOnSet" minOccurs="0"/>
+									<xs:element name="initialCredit" minOccurs="0"/>
+									<xs:element name="maxCC" minOccurs="0"/>
+									<xs:element name="maxPD" minOccurs="0"/>
+									<xs:element name="maxStat" minOccurs="0"/>
+									<xs:element name="timerCC" minOccurs="0"/>
+									<xs:element name="timerIdle" minOccurs="0"/>
+									<xs:element name="timerKeepAlive" minOccurs="0"/>
+									<xs:element name="timerNoResponse" minOccurs="0"/>
+									<xs:element name="timerPoll" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataUniSaalTp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="aal5TpVccTpId" minOccurs="0"/>
+						<xs:element name="maxSduSize" minOccurs="0"/>
+						<xs:element name="uniSaalProfileId" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataVclTp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="atmTrafficDescriptorId" minOccurs="0"/>
+						<xs:element name="externalVci" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataVpcTp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="alarmReport" minOccurs="0"/>
+						<xs:element name="continuityCheck" minOccurs="0"/>
+						<xs:element name="nomPmBlkSize" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="counterMode" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataVplTp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="atmTrafficDescriptor" minOccurs="0"/>
+						<xs:element name="externalVpi" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataIub" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="rbsId" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataNbapCommon" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="l2EstablishReqRetryT" minOccurs="0"/>
+						<xs:element name="activeUniSaalTpRef" minOccurs="0"/>
+						<xs:element name="standbyUniSaalTpRef" minOccurs="0"/>
+						<xs:element name="auditRetransmissionT" minOccurs="0"/>
+						<xs:element name="l2EstablishSupervisionT" minOccurs="0"/>
+						<xs:element name="l3EstablishSupervisionT" minOccurs="0"/>
+						<xs:element name="uniSaalTpRef1" minOccurs="0"/>
+						<xs:element name="uniSaalTpRef2" minOccurs="0"/>
+						<xs:element name="administrativeState" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataNbapDedicated" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="l2EstablishReqRetryT" minOccurs="0"/>
+						<xs:element name="activeUniSaalTpRef" minOccurs="0"/>
+						<xs:element name="standbyUniSaalTpRef" minOccurs="0"/>
+						<xs:element name="l2EstablishSupervisionT" minOccurs="0"/>
+						<xs:element name="uniSaalTpRef1" minOccurs="0"/>
+						<xs:element name="uniSaalTpRef2" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="administrativeState" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataNodeSynch" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="noOfSamples" minOccurs="0"/>
+						<xs:element name="supervisionIntervalT" minOccurs="0"/>
+						<xs:element name="phaseDiffThreshold" minOccurs="0"/>
+						<xs:element name="phaseMeasurement" minOccurs="0"/>
+						<xs:element name="accuracy" minOccurs="0"/>
+						<xs:element name="timeStamp" minOccurs="0"/>
+						<xs:element name="sampleIntervalInt" minOccurs="0"/>
+						<xs:element name="fixedWindowSizeInt" minOccurs="0"/>
+						<xs:element name="sampleIntervalSup" minOccurs="0"/>
+						<xs:element name="fixedWindowSizeSup" minOccurs="0"/>
+						<xs:element name="slidingWindowSize" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataNodeSynchTp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="nodeSynchRef" minOccurs="0"/>
+						<xs:element name="aal0TpRef1" minOccurs="0"/>
+						<xs:element name="aal0TpRef2" minOccurs="0"/>
+						<xs:element name="aal0TpRef3" minOccurs="0"/>
+						<xs:element name="aal0TpRef4" minOccurs="0"/>
+						<xs:element name="timDeviceRef" minOccurs="0"/>
+						<xs:element name="aal0TpRefs" minOccurs="0" maxOccurs="unbounded"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="administrativeState" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAal2QosCodePointProfile" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="qualityOfServiceCodePointA" minOccurs="0"/>
+						<xs:element name="qualityOfServiceCodePointB" minOccurs="0"/>
+						<xs:element name="qualityOfServiceCodePointC" minOccurs="0"/>
+						<xs:element name="qualityOfServiceCodePointD" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataAal2QosProfile" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="profileClassA" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="boundOnProbOfDelay" minOccurs="0"/>
+									<xs:element name="boundOnProbOfLoss" minOccurs="0"/>
+									<xs:element name="boundOnNodeDelay" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="profileClassB" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="boundOnProbOfDelay" minOccurs="0"/>
+									<xs:element name="boundOnProbOfLoss" minOccurs="0"/>
+									<xs:element name="boundOnNodeDelay" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="profileClassC" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="boundOnProbOfDelay" minOccurs="0"/>
+									<xs:element name="boundOnProbOfLoss" minOccurs="0"/>
+									<xs:element name="boundOnNodeDelay" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="profileClassD" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="boundOnProbOfDelay" minOccurs="0"/>
+									<xs:element name="boundOnProbOfLoss" minOccurs="0"/>
+									<xs:element name="boundOnNodeDelay" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bAp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="routeSetId" minOccurs="0"/>
+						<xs:element name="serviceInd" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bSlItu" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="autoStartLink" minOccurs="0"/>
+						<xs:element name="linkCongestLevel" minOccurs="0"/>
+						<xs:element name="linkState" minOccurs="0"/>
+						<xs:element name="prioBeforeSio" minOccurs="0"/>
+						<xs:element name="signLinkCode" minOccurs="0"/>
+						<xs:element name="tpId" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="deactivate" minOccurs="0"/>
+						<xs:element name="activate" minOccurs="0"/>
+						<xs:element name="emergencyActivate" minOccurs="0"/>
+						<xs:element name="localInhibit" minOccurs="0"/>
+						<xs:element name="localUninhibit" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bSls" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="cLinkAnsi" minOccurs="0"/>
+						<xs:element name="mtp3bSrsId" minOccurs="0"/>
+						<xs:element name="periodicLinkTestFlag" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="deactivateLinkSet" minOccurs="0"/>
+						<xs:element name="activateLinkSet" minOccurs="0"/>
+						<xs:element name="emergencyActivateLinkSet" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bSlTtc" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="autoStartLink" minOccurs="0"/>
+						<xs:element name="linkCongestLevel" minOccurs="0"/>
+						<xs:element name="linkState" minOccurs="0"/>
+						<xs:element name="signLinkCode" minOccurs="0"/>
+						<xs:element name="tpId" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="prioBeforeSio" minOccurs="0"/>
+						<xs:element name="deactivate" minOccurs="0"/>
+						<xs:element name="activate" minOccurs="0"/>
+						<xs:element name="emergencyActivate" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bSpItu" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="m3uaNoOfAttempsOfDauds" minOccurs="0"/>
+						<xs:element name="sendSltmBefLink" minOccurs="0"/>
+						<xs:element name="signallingPointCode" minOccurs="0"/>
+						<xs:element name="maxSizeChangeBuf" minOccurs="0"/>
+						<xs:element name="maxSizeReroutBuf" minOccurs="0"/>
+						<xs:element name="sioSpare" minOccurs="0"/>
+						<xs:element name="spPriority" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+                                                                        <xs:element name="prioCb" minOccurs="0"/>
+									<xs:element name="prioCo" minOccurs="0"/>
+                                                                        <xs:element name="prioEc" minOccurs="0"/>
+                                                                        <xs:element name="prioLink" minOccurs="0"/>
+									<xs:element name="prioRst" minOccurs="0"/>
+                                                                        <xs:element name="prioSlt" minOccurs="0"/>
+									<xs:element name="prioTfc" minOccurs="0"/>
+									<xs:element name="prioTra" minOccurs="0"/>
+									<xs:element name="prioUpu" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="networkInd" minOccurs="0"/>
+						<xs:element name="transFrHandler" minOccurs="0"/>
+						<xs:element name="nodeBehaviour" minOccurs="0"/>
+						<xs:element name="spTimer" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="timerT1" minOccurs="0"/>
+									<xs:element name="timerT2" minOccurs="0"/>
+									<xs:element name="timerT3" minOccurs="0"/>
+									<xs:element name="timerTBsnt" minOccurs="0"/>
+									<xs:element name="timerT4" minOccurs="0"/>
+									<xs:element name="timerT5" minOccurs="0"/>
+									<xs:element name="timerTRetrieval" minOccurs="0"/>
+									<xs:element name="timerT6" minOccurs="0"/>
+									<xs:element name="timerT8" minOccurs="0"/>
+									<xs:element name="timerT10" minOccurs="0"/>
+									<xs:element name="timerT12" minOccurs="0"/>
+									<xs:element name="timerT13" minOccurs="0"/>
+									<xs:element name="timerT14" minOccurs="0"/>
+									<xs:element name="timerTStart" minOccurs="0"/>
+									<xs:element name="timerT17" minOccurs="0"/>
+									<xs:element name="timerT18" minOccurs="0"/>
+									<xs:element name="timerT19" minOccurs="0"/>
+									<xs:element name="timerSltm" minOccurs="0"/>
+									<xs:element name="timerSlta" minOccurs="0"/>
+									<xs:element name="timerT20" minOccurs="0"/>
+									<xs:element name="timerT21" minOccurs="0"/>
+									<xs:element name="timerT22" minOccurs="0"/>
+									<xs:element name="timerT23" minOccurs="0"/>
+									<xs:element name="timerTc" minOccurs="0"/>
+									<xs:element name="timerM3uaTack" minOccurs="0"/>
+									<xs:element name="timerM3uaPeriodicAudit" minOccurs="0"/>
+									<xs:element name="timerM3uaT1" minOccurs="0"/>
+									<xs:element name="timerM3uaT3" minOccurs="0"/>
+									<xs:element name="timerM3uaT42" minOccurs="0"/>
+									<xs:element name="timerT15" minOccurs="0"/>
+									<xs:element name="timerM3uaT6" minOccurs="0"/>
+									<xs:element name="timerM3uaT41" minOccurs="0"/>
+									<xs:element name="timerM3uaTc" minOccurs="0"/>
+									<xs:element name="timerM3uaT8" minOccurs="0"/>
+									<xs:element name="timerM3uaT40" minOccurs="0"/>
+									<xs:element name="timerT16" minOccurs="0"/>
+									<xs:element name="timerTDlack" minOccurs="0"/>
+									<xs:element name="timerM3uaTassocack" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="noOfAttempsOfAssociationEstablishment" minOccurs="0"/>
+						<xs:element name="resendTfcInterval" minOccurs="0"/>
+						<xs:element name="statusIndInterval" minOccurs="0"/>
+						<xs:element name="testPatternSltm" minOccurs="0"/>
+						<xs:element name="version" minOccurs="0"/>
+						<xs:element name="noOfCongestLevelForNI" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="routeSetCongestTestFlag" minOccurs="0"/>
+						<xs:element name="rpuId" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bSpTtc" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="maxSizeChangeBuf" minOccurs="0"/>
+						<xs:element name="maxSizeReroutBuf" minOccurs="0"/>
+						<xs:element name="signallingPointCode" minOccurs="0"/>
+						<xs:element name="spPriority" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="prioCo" minOccurs="0"/>
+									<xs:element name="prioCb" minOccurs="0"/>
+									<xs:element name="prioEc" minOccurs="0"/>
+									<xs:element name="prioRst" minOccurs="0"/>
+									<xs:element name="prioTfa" minOccurs="0"/>
+									<xs:element name="prioRt" minOccurs="0"/>
+									<xs:element name="prioTfc" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="networkInd" minOccurs="0"/>
+						<xs:element name="spTimer" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="timerT1" minOccurs="0"/>
+									<xs:element name="timerT2" minOccurs="0"/>
+									<xs:element name="timerT3" minOccurs="0"/>
+									<xs:element name="timerT4" minOccurs="0"/>
+									<xs:element name="timerT6" minOccurs="0"/>
+									<xs:element name="timerT8" minOccurs="0"/>
+									<xs:element name="timerT10" minOccurs="0"/>
+									<xs:element name="timerT17" minOccurs="0"/>
+									<xs:element name="timerSrt" minOccurs="0"/>
+									<xs:element name="timerTBsnt" minOccurs="0"/>
+									<xs:element name="timerTRetrieval" minOccurs="0"/>
+									<xs:element name="timerTStart" minOccurs="0"/>
+									<xs:element name="timerTc" minOccurs="0"/>
+									<xs:element name="timerT15" minOccurs="0"/>
+									<xs:element name="timerT16" minOccurs="0"/>
+									<xs:element name="timerTDlack" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="statusIndInterval" minOccurs="0"/>
+						<xs:element name="nodeBehaviour" minOccurs="0"/>
+						<xs:element name="noOfCongestLevelForNI" minOccurs="0"/>
+						<xs:element name="testPatternSltm" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="resendTfcInterval" minOccurs="0"/>
+						<xs:element name="routeSetCongestTestFlag" minOccurs="0"/>
+						<xs:element name="rpuId" minOccurs="0"/>
+						<xs:element name="m3uaNoOfAttempsOfDauds" minOccurs="0"/>
+						<xs:element name="noOfAttempsOfAssociationEstablishment" minOccurs="0"/>
+						<xs:element name="spTimerM3ua" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="timerM3uaPeriodicAudit" minOccurs="0"/>
+									<xs:element name="timerM3uaT1" minOccurs="0"/>
+									<xs:element name="timerM3uaT3" minOccurs="0"/>
+									<xs:element name="timerM3uaT40" minOccurs="0"/>
+									<xs:element name="timerM3uaT41" minOccurs="0"/>
+									<xs:element name="timerM3uaT42" minOccurs="0"/>
+									<xs:element name="timerM3uaT6" minOccurs="0"/>
+									<xs:element name="timerM3uaT8" minOccurs="0"/>
+									<xs:element name="timerM3uaTack" minOccurs="0"/>
+									<xs:element name="timerM3uaTassocack" minOccurs="0"/>
+									<xs:element name="timerM3uaTc" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bSr" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="linkSetM3uId" minOccurs="0"/>
+						<xs:element name="priority" minOccurs="0"/>
+						<xs:element name="routeType" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="linkSetId" minOccurs="0"/>
+						<xs:element name="blockSignalingRoute" minOccurs="0"/>
+						<xs:element name="deBlockSignalingRoute" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bSrs" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="autoReroute" minOccurs="0"/>
+						<xs:element name="destPointCode" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataNniSaalProfile" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="profileData" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="congestionLevel1Abatement" minOccurs="0"/>
+									<xs:element name="maxStat" minOccurs="0"/>
+									<xs:element name="timerPoll" minOccurs="0"/>
+									<xs:element name="timerRepeatSrec" minOccurs="0"/>
+									<xs:element name="mps" minOccurs="0"/>
+									<xs:element name="congestionLevel1OnSet" minOccurs="0"/>
+									<xs:element name="congestionLevel2OnSet" minOccurs="0"/>
+									<xs:element name="nrOfPDUsDuringProving" minOccurs="0"/>
+									<xs:element name="timerT1" minOccurs="0"/>
+									<xs:element name="timerT2" minOccurs="0"/>
+									<xs:element name="timerT3" minOccurs="0"/>
+									<xs:element name="timerCC" minOccurs="0"/>
+									<xs:element name="congestionLevel3OnSet" minOccurs="0"/>
+									<xs:element name="initialCredit" minOccurs="0"/>
+									<xs:element name="timerIdle" minOccurs="0"/>
+									<xs:element name="timerKeepAlive" minOccurs="0"/>
+									<xs:element name="maxCC" minOccurs="0"/>
+									<xs:element name="maxNRP" minOccurs="0"/>
+									<xs:element name="timerNoCredit" minOccurs="0"/>
+									<xs:element name="maxPD" minOccurs="0"/>
+									<xs:element name="timerNoResponse" minOccurs="0"/>
+									<xs:element name="congestionLevel2Abatement" minOccurs="0"/>
+									<xs:element name="congestionLevel3Abatement" minOccurs="0"/>
+									<xs:element name="discardMessagesLevel1" minOccurs="0"/>
+									<xs:element name="discardMessagesLevel2" minOccurs="0"/>
+									<xs:element name="discardMessagesLevel3" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataNniSaalTp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="aal5TpVccTpId" minOccurs="0"/>
+						<xs:element name="maxSduSize" minOccurs="0"/>
+						<xs:element name="nniSaalProfileId" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSccpApLocal" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="maxConn" minOccurs="0"/>
+						<xs:element name="ssN" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="useS1" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSccpApRemote" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="mtp3bApId" minOccurs="0"/>
+						<xs:element name="ssN" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSccpEntitySet" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="routeIds" minOccurs="0" maxOccurs="unbounded"/>
+						<xs:element name="newSubSystemNumber" minOccurs="0"/>
+						<xs:element name="sharingMode" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="newGlobalTitle" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="indicator" minOccurs="0"/>
+									<xs:element name="natureOfAddress" minOccurs="0"/>
+									<xs:element name="numberingPlan" minOccurs="0"/>
+									<xs:element name="translationType" minOccurs="0"/>
+									<xs:element name="addressInformation" minOccurs="0"/>
+									<xs:element name="encodingScheme" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSccpGlobalTitle" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="addressInformation" minOccurs="0"/>
+						<xs:element name="encodingScheme" minOccurs="0"/>
+						<xs:element name="gtIndicator" minOccurs="0"/>
+						<xs:element name="natureOfAddress" minOccurs="0"/>
+						<xs:element name="numberingPlan" minOccurs="0"/>
+						<xs:element name="sccpEntitySetId" minOccurs="0"/>
+						<xs:element name="translationType" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSccpScrc" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSccpSp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="accountDateFileOutput" minOccurs="0"/>
+						<xs:element name="accountPeriodFileOutput" minOccurs="0"/>
+						<xs:element name="accountTimeFileOutput" minOccurs="0"/>
+						<xs:element name="hopCounterSclc" minOccurs="0"/>
+						<xs:element name="hopCounterScoc" minOccurs="0"/>
+						<xs:element name="lowerConnThres" minOccurs="0"/>
+						<xs:element name="maxRelayedConn" minOccurs="0"/>
+						<xs:element name="mtp3bSpId" minOccurs="0"/>
+						<xs:element name="prioGeneral" minOccurs="0"/>
+						<xs:element name="prioIT" minOccurs="0"/>
+						<xs:element name="prioRLSD" minOccurs="0"/>
+						<xs:element name="prioSST" minOccurs="0"/>
+						<xs:element name="smiValue" minOccurs="0"/>
+						<xs:element name="swapUDTPointer" minOccurs="0"/>
+						<xs:element name="tCong" minOccurs="0"/>
+						<xs:element name="tGuard" minOccurs="0"/>
+						<xs:element name="tIar" minOccurs="0"/>
+						<xs:element name="tIas" minOccurs="0"/>
+						<xs:element name="tReass" minOccurs="0"/>
+						<xs:element name="tRel" minOccurs="0"/>
+						<xs:element name="tStatInfo" minOccurs="0"/>
+						<xs:element name="tconnEst" minOccurs="0"/>
+						<xs:element name="tconnResp" minOccurs="0"/>
+						<xs:element name="upperConnThres" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="useSCMG" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="sendSST" minOccurs="0"/>
+									<xs:element name="sendSSA" minOccurs="0"/>
+									<xs:element name="sendSSP" minOccurs="0"/>
+									<xs:element name="useSST" minOccurs="0"/>
+									<xs:element name="allowRemoteBroadcast" minOccurs="0"/>
+									<xs:element name="initiateTimerTcon" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataRnsap" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="preferredAddressing" minOccurs="0"/>
+						<xs:element name="sccpDisabledT" minOccurs="0"/>
+						<xs:element name="userOutOfServiceT" minOccurs="0"/>
+						<xs:element name="localSccpApRef" minOccurs="0"/>
+						<xs:element name="sccpGlobalTitleRef" minOccurs="0"/>
+						<xs:element name="remoteSccpApRef" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bSlChina" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="autoStartLink" minOccurs="0"/>
+						<xs:element name="linkCongestLevel" minOccurs="0"/>
+						<xs:element name="linkState" minOccurs="0"/>
+						<xs:element name="prioBeforeSio" minOccurs="0"/>
+						<xs:element name="signLinkCode" minOccurs="0"/>
+						<xs:element name="tpId" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="deactivate" minOccurs="0"/>
+						<xs:element name="activate" minOccurs="0"/>
+						<xs:element name="emergencyActivate" minOccurs="0"/>
+						<xs:element name="localInhibit" minOccurs="0"/>
+						<xs:element name="localUninhibit" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bSpChina" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="m3uaNoOfAttempsOfDauds" minOccurs="0"/>
+						<xs:element name="routeSetCongestTestFlag" minOccurs="0"/>
+						<xs:element name="maxSizeChangeBuf" minOccurs="0"/>
+						<xs:element name="rpuId" minOccurs="0"/>
+						<xs:element name="sendSltmBefLink" minOccurs="0"/>
+						<xs:element name="maxSizeReroutBuf" minOccurs="0"/>
+						<xs:element name="networkInd" minOccurs="0"/>
+						<xs:element name="signallingPointCode" minOccurs="0"/>
+						<xs:element name="sioSpare" minOccurs="0"/>
+						<xs:element name="nodeBehaviour" minOccurs="0"/>
+						<xs:element name="noOfAttempsOfAssociationEstablishment" minOccurs="0"/>
+						<xs:element name="spPriority" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+                                                                        <xs:element name="prioCb" minOccurs="0"/>
+									<xs:element name="prioCo" minOccurs="0"/>
+                                                                        <xs:element name="prioEc" minOccurs="0"/>
+                                                                        <xs:element name="prioLink" minOccurs="0"/>
+									<xs:element name="prioRst" minOccurs="0"/>
+                                                                        <xs:element name="prioSlt" minOccurs="0"/>
+									<xs:element name="prioTfc" minOccurs="0"/>
+									<xs:element name="prioTra" minOccurs="0"/>
+									<xs:element name="prioUpu" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="statusIndInterval" minOccurs="0"/>
+						<xs:element name="noOfCongestLevelForNI" minOccurs="0"/>
+						<xs:element name="resendTfcInterval" minOccurs="0"/>
+						<xs:element name="testPatternSltm" minOccurs="0"/>
+						<xs:element name="transFrHandler" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="version" minOccurs="0"/>
+						<xs:element name="spTimer" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="timerM3uaPeriodicAudit" minOccurs="0"/>
+									<xs:element name="timerM3uaT1" minOccurs="0"/>
+									<xs:element name="timerM3uaT3" minOccurs="0"/>
+									<xs:element name="timerM3uaT40" minOccurs="0"/>
+									<xs:element name="timerM3uaT41" minOccurs="0"/>
+									<xs:element name="timerM3uaT42" minOccurs="0"/>
+									<xs:element name="timerM3uaT6" minOccurs="0"/>
+									<xs:element name="timerM3uaT8" minOccurs="0"/>
+									<xs:element name="timerM3uaTack" minOccurs="0"/>
+									<xs:element name="timerM3uaTassocack" minOccurs="0"/>
+									<xs:element name="timerM3uaTc" minOccurs="0"/>
+									<xs:element name="timerSlta" minOccurs="0"/>
+									<xs:element name="timerSltm" minOccurs="0"/>
+									<xs:element name="timerT1" minOccurs="0"/>
+									<xs:element name="timerT10" minOccurs="0"/>
+									<xs:element name="timerT12" minOccurs="0"/>
+									<xs:element name="timerT13" minOccurs="0"/>
+									<xs:element name="timerT14" minOccurs="0"/>
+									<xs:element name="timerT15" minOccurs="0"/>
+									<xs:element name="timerT16" minOccurs="0"/>
+									<xs:element name="timerT17" minOccurs="0"/>
+									<xs:element name="timerT18" minOccurs="0"/>
+									<xs:element name="timerT19" minOccurs="0"/>
+									<xs:element name="timerT2" minOccurs="0"/>
+									<xs:element name="timerT20" minOccurs="0"/>
+									<xs:element name="timerT21" minOccurs="0"/>
+									<xs:element name="timerT22" minOccurs="0"/>
+									<xs:element name="timerT23" minOccurs="0"/>
+									<xs:element name="timerT3" minOccurs="0"/>
+									<xs:element name="timerT4" minOccurs="0"/>
+									<xs:element name="timerT5" minOccurs="0"/>
+									<xs:element name="timerT6" minOccurs="0"/>
+									<xs:element name="timerT8" minOccurs="0"/>
+									<xs:element name="timerTBsnt" minOccurs="0"/>
+									<xs:element name="timerTDlack" minOccurs="0"/>
+									<xs:element name="timerTRetrieval" minOccurs="0"/>
+									<xs:element name="timerTStart" minOccurs="0"/>
+									<xs:element name="timerTc" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataRanap" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="preferredAddressing" minOccurs="0"/>
+						<xs:element name="sccpDisabledT" minOccurs="0"/>
+						<xs:element name="cnDomainInd" minOccurs="0"/>
+						<xs:element name="noOfResetSendings" minOccurs="0"/>
+						<xs:element name="userOutOfServiceT" minOccurs="0"/>
+						<xs:element name="localSccpApRef" minOccurs="0"/>
+						<xs:element name="sccpGlobalTitleRef" minOccurs="0"/>
+						<xs:element name="remoteSccpApRef" minOccurs="0"/>
+						<xs:element name="resetResendT" minOccurs="0"/>
+						<xs:element name="resetAckGuardT" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="cnId" minOccurs="0"/>
+						<xs:element name="cnPlmnIdentity" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="mcc" minOccurs="0"/>
+									<xs:element name="mnc" minOccurs="0"/>
+									<xs:element name="mncLength" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="networkResourceIdentifier" minOccurs="0" maxOccurs="unbounded"/>
+						<xs:element name="relativeCapacity" minOccurs="0"/>
+						<xs:element name="packetDataRouterRef" minOccurs="0" maxOccurs="unbounded"/>
+						<xs:element name="cnOperatorRef" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bSlAnsi" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="autoStartLink" minOccurs="0"/>
+						<xs:element name="linkCongestLevel" minOccurs="0"/>
+						<xs:element name="linkState" minOccurs="0"/>
+						<xs:element name="signLinkCode" minOccurs="0"/>
+						<xs:element name="tpId" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="deactivate" minOccurs="0"/>
+						<xs:element name="activate" minOccurs="0"/>
+						<xs:element name="emergencyActivate" minOccurs="0"/>
+						<xs:element name="localInhibit" minOccurs="0"/>
+						<xs:element name="localUninhibit" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMtp3bSpAnsi" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="m3uaNoOfAttempsOfDauds" minOccurs="0"/>
+						<xs:element name="maxSizeChangeBuf" minOccurs="0"/>
+						<xs:element name="maxSizeReroutBuf" minOccurs="0"/>
+						<xs:element name="networkInd" minOccurs="0"/>
+						<xs:element name="noOfAttempsOfAssociationEstablishment" minOccurs="0"/>
+						<xs:element name="noOfCongestLevelForNI" minOccurs="0"/>
+						<xs:element name="nodeBehaviour" minOccurs="0"/>
+						<xs:element name="resendTfcInterval" minOccurs="0"/>
+						<xs:element name="routeSetCongestTestFlag" minOccurs="0"/>
+						<xs:element name="rpuId" minOccurs="0"/>
+						<xs:element name="sendSltmBefLink" minOccurs="0"/>
+						<xs:element name="signallingPointCode" minOccurs="0"/>
+						<xs:element name="statusIndInterval" minOccurs="0"/>
+						<xs:element name="sioSpare" minOccurs="0"/>
+						<xs:element name="testPatternSltm" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="spPriority" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+                                                                        <xs:element name="prioCb" minOccurs="0"/>
+									<xs:element name="prioCo" minOccurs="0"/>
+                                                                        <xs:element name="prioEc" minOccurs="0"/>
+                                                                        <xs:element name="prioLink" minOccurs="0"/>
+									<xs:element name="prioRst" minOccurs="0"/>
+                                                                        <xs:element name="prioSlt" minOccurs="0"/>
+									<xs:element name="prioTfc" minOccurs="0"/>
+									<xs:element name="prioTra" minOccurs="0"/>
+									<xs:element name="prioUpu" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="spTimer" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="timerM3uaPeriodicAudit" minOccurs="0"/>
+									<xs:element name="timerM3uaT1" minOccurs="0"/>
+									<xs:element name="timerM3uaT3" minOccurs="0"/>
+									<xs:element name="timerM3uaT40" minOccurs="0"/>
+									<xs:element name="timerM3uaT41" minOccurs="0"/>
+									<xs:element name="timerM3uaT42" minOccurs="0"/>
+									<xs:element name="timerM3uaT6" minOccurs="0"/>
+									<xs:element name="timerM3uaT8" minOccurs="0"/>
+									<xs:element name="timerM3uaTack" minOccurs="0"/>
+									<xs:element name="timerM3uaTassocack" minOccurs="0"/>
+									<xs:element name="timerM3uaTc" minOccurs="0"/>
+									<xs:element name="timerSlta" minOccurs="0"/>
+									<xs:element name="timerSltm" minOccurs="0"/>
+									<xs:element name="timerT1" minOccurs="0"/>
+									<xs:element name="timerT10" minOccurs="0"/>
+									<xs:element name="timerT12" minOccurs="0"/>
+									<xs:element name="timerT13" minOccurs="0"/>
+									<xs:element name="timerT14" minOccurs="0"/>
+									<xs:element name="timerT15" minOccurs="0"/>
+									<xs:element name="timerT16" minOccurs="0"/>
+									<xs:element name="timerT17" minOccurs="0"/>
+									<xs:element name="timerT2" minOccurs="0"/>
+									<xs:element name="timerT20" minOccurs="0"/>
+									<xs:element name="timerT21" minOccurs="0"/>
+									<xs:element name="timerT22" minOccurs="0"/>
+									<xs:element name="timerT23" minOccurs="0"/>
+									<xs:element name="timerT25" minOccurs="0"/>
+									<xs:element name="timerT26" minOccurs="0"/>
+									<xs:element name="timerT27" minOccurs="0"/>
+									<xs:element name="timerT28" minOccurs="0"/>
+									<xs:element name="timerT29" minOccurs="0"/>
+									<xs:element name="timerT3" minOccurs="0"/>
+									<xs:element name="timerT30" minOccurs="0"/>
+									<xs:element name="timerT31" minOccurs="0"/>
+									<xs:element name="timerT4" minOccurs="0"/>
+									<xs:element name="timerT5" minOccurs="0"/>
+									<xs:element name="timerT6" minOccurs="0"/>
+									<xs:element name="timerT8" minOccurs="0"/>
+									<xs:element name="timerTBsnt" minOccurs="0"/>
+									<xs:element name="timerTDlack" minOccurs="0"/>
+									<xs:element name="timerTRetrieval" minOccurs="0"/>
+									<xs:element name="timerTStart" minOccurs="0"/>
+									<xs:element name="timerTc" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="transFrHandler" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataPacketDataRouter" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="rncIpAddress" minOccurs="0"/>
+						<xs:element name="cnIuLinkIpAddress" minOccurs="0"/>
+						<xs:element name="timeToLive" minOccurs="0"/>
+						<xs:element name="pdrDeviceRef" minOccurs="0"/>
+						<xs:element name="aal5TpRef" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="administrativeState" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataIpAtmLink" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="interfaceName" minOccurs="0"/>
+						<xs:element name="ipAddress" minOccurs="0"/>
+						<xs:element name="metric" minOccurs="0"/>
+						<xs:element name="monitor" minOccurs="0"/>
+						<xs:element name="monitorInterval" minOccurs="0"/>
+						<xs:element name="monitorRetries" minOccurs="0"/>
+						<xs:element name="mtuSize" minOccurs="0"/>
+						<xs:element name="subnetMask" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="Aal5TpVccTpIdList" minOccurs="0" maxOccurs="unbounded"/>
+						<xs:element name="aal5TpVccTpSelectionMode" minOccurs="0"/>
+						<xs:element name="aal5TpVccTpId" minOccurs="0"/>
+						<xs:element name="assignIpAddress" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="ipAddress" minOccurs="0"/>
+									<xs:element name="subnetMask" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataIpRoutingTable" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="indexOfDeletableStaticRoutes" minOccurs="0" maxOccurs="unbounded"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="addStaticRoute" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="ipAddress" minOccurs="0"/>
+									<xs:element name="subnetMask" minOccurs="0"/>
+									<xs:element name="hopIpAddress" minOccurs="0"/>
+									<xs:element name="routeMetric" minOccurs="0"/>
+									<xs:element name="redistribute" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="deleteStaticRoute" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="routingTableEntry" minOccurs="0">
+										<xs:complexType>
+											<xs:sequence>
+												<xs:element name="active" minOccurs="0"/>
+												<xs:element name="destinationIpAddr" minOccurs="0"/>
+												<xs:element name="destinationNetworkMask" minOccurs="0"/>
+												<xs:element name="interfaceName" minOccurs="0"/>
+												<xs:element name="nextHopIpAddr" minOccurs="0"/>
+												<xs:element name="redistribute" minOccurs="0"/>
+												<xs:element name="routeMetric" minOccurs="0"/>
+												<xs:element name="routeType" minOccurs="0"/>
+											</xs:sequence>
+										</xs:complexType>
+									</xs:element>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataIp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="dnsServer" minOccurs="0"/>
+						<xs:element name="isRecursiveSearch" minOccurs="0"/>
+						<xs:element name="isSubDomainName" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="retransInterval" minOccurs="0"/>
+						<xs:element name="noOfRetrans" minOccurs="0"/>
+						<xs:element name="isDefDomainName" minOccurs="0"/>
+						<xs:element name="defDomainName" minOccurs="0"/>
+						<xs:element name="useHostFile" minOccurs="0"/>
+						<xs:element name="dscp" minOccurs="0"/>
+						<xs:element name="icmpRedirect" minOccurs="0"/>
+						<xs:element name="udpChecksumState" minOccurs="0"/>
+						<xs:element name="connectionAttemptTimer" minOccurs="0"/>
+						<xs:element name="maxRetransmissionAttempts" minOccurs="0"/>
+						<xs:element name="workingMode" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataIpSystem" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+        <xs:element name="vsDataIpOam" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataOspf" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="ipMo" minOccurs="0"/>
+						<xs:element name="ospfASBdrRtrStatus" minOccurs="0"/>
+						<xs:element name="ospfAreaBdrRtrStatus" minOccurs="0"/>
+						<xs:element name="ospfRouterId" minOccurs="0"/>
+						<xs:element name="recoverTopoDb" minOccurs="0"/>
+						<xs:element name="topoDbStoreInterv" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="administrativeState" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataOspfArea" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="areaId" minOccurs="0"/>
+						<xs:element name="areaLsaChecksum" minOccurs="0"/>
+						<xs:element name="importExternalLsa" minOccurs="0"/>
+						<xs:element name="sendAreaSummary" minOccurs="0"/>
+						<xs:element name="stubArea" minOccurs="0"/>
+						<xs:element name="stubAreaMetric" minOccurs="0"/>
+						<xs:element name="stubAreaMetricType" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="range0" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="ipAddress" minOccurs="0"/>
+									<xs:element name="subnetMask" minOccurs="0"/>
+									<xs:element name="advertise" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="range1" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="ipAddress" minOccurs="0"/>
+									<xs:element name="subnetMask" minOccurs="0"/>
+									<xs:element name="advertise" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="range2" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="ipAddress" minOccurs="0"/>
+									<xs:element name="subnetMask" minOccurs="0"/>
+									<xs:element name="advertise" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="addAreaRange" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="rangeIndex" minOccurs="0"/>
+									<xs:element name="range" minOccurs="0">
+										<xs:complexType>
+											<xs:sequence>
+												<xs:element name="ipAddress" minOccurs="0"/>
+												<xs:element name="subnetMask" minOccurs="0"/>
+												<xs:element name="advertise" minOccurs="0"/>
+											</xs:sequence>
+										</xs:complexType>
+									</xs:element>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="deleteAreaRange" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="rangeIndex" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataOspfInterface" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="helloInterval" minOccurs="0"/>
+						<xs:element name="interfacePriority" minOccurs="0"/>
+						<xs:element name="interfaceTransitDelay" minOccurs="0"/>
+						<xs:element name="lsaTransmissionInterval" minOccurs="0"/>
+						<xs:element name="ospfAreaRelated" minOccurs="0"/>
+						<xs:element name="relatedLink" minOccurs="0"/>
+						<xs:element name="routerDeadInterval" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataRncModule" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataTnApplication" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData"/>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataVirtualPath" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="vplTpARef" minOccurs="0"/>
+						<xs:element name="vplTpBRef" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataM3uAssociation" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="mtp3bSrsId" minOccurs="0"/>
+						<xs:element name="sctpId" minOccurs="0"/>
+						<xs:element name="dscp" minOccurs="0"/>
+						<xs:element name="associationState" minOccurs="0"/>
+						<xs:element name="localIpMask" minOccurs="0"/>
+						<xs:element name="autoStartAssociation" minOccurs="0"/>
+						<xs:element name="remotePortNumber" minOccurs="0"/>
+						<xs:element name="remoteIpAddress1" minOccurs="0"/>
+						<xs:element name="remoteIpAddress2" minOccurs="0"/>
+						<xs:element name="localPortNumber" minOccurs="0"/>
+						<xs:element name="role" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSccpAccountingCriteria" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="usageType" minOccurs="0"/>
+						<xs:element name="ssN" minOccurs="0"/>
+						<xs:element name="countType" minOccurs="0"/>
+						<xs:element name="globalTitleId" minOccurs="0"/>
+						<xs:element name="pointerId" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSccpPolicing" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="originatingMtp3bSpc" minOccurs="0"/>
+						<xs:element name="destinationMtp3bSpc" minOccurs="0"/>
+						<xs:element name="originatingSccpSpId" minOccurs="0"/>
+						<xs:element name="originatingSccpSsn" minOccurs="0"/>
+						<xs:element name="destinationSccpSpId" minOccurs="0"/>
+						<xs:element name="destinationSccpSsn" minOccurs="0"/>
+						<xs:element name="policingGlobalTitle" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="indicator" minOccurs="0"/>
+									<xs:element name="natureOfAddress" minOccurs="0"/>
+									<xs:element name="numberingPlan" minOccurs="0"/>
+									<xs:element name="translationType" minOccurs="0"/>
+									<xs:element name="addressInformation" minOccurs="0"/>
+									<xs:element name="encodingScheme" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="discardOrReturnServiceMsg" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSctp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="numberOfAssociations" minOccurs="0"/>
+						<xs:element name="ipAccessHostGpbId" minOccurs="0"/>
+						<xs:element name="minimumRto" minOccurs="0"/>
+						<xs:element name="maximumRto" minOccurs="0"/>
+						<xs:element name="initialRto" minOccurs="0"/>
+						<xs:element name="rtoAlphaIndex" minOccurs="0"/>
+						<xs:element name="rtoBetaIndex" minOccurs="0"/>
+						<xs:element name="validCookieLife" minOccurs="0"/>
+						<xs:element name="allowedIncrementCookieLife" minOccurs="0"/>
+						<xs:element name="keyChangePeriod" minOccurs="0"/>
+						<xs:element name="associationMaxRtx" minOccurs="0"/>
+						<xs:element name="pathMaxRtx" minOccurs="0"/>
+						<xs:element name="maxInitialRtrAtt" minOccurs="0"/>
+						<xs:element name="maxShutDownRtrAtt" minOccurs="0"/>
+						<xs:element name="heartbeatInterval" minOccurs="0"/>
+						<xs:element name="heartbeatStatus" minOccurs="0"/>
+						<xs:element name="maxIncomingStream" minOccurs="0"/>
+						<xs:element name="maxOutgoingStream" minOccurs="0"/>
+						<xs:element name="maxUserDataSize" minOccurs="0"/>
+						<xs:element name="mBuffer" minOccurs="0"/>
+						<xs:element name="nThreshold" minOccurs="0"/>
+						<xs:element name="tSack" minOccurs="0"/>
+						<xs:element name="maxDataSizeIp" minOccurs="0"/>
+						<xs:element name="initialAdRecWin" minOccurs="0"/>
+						<xs:element name="intervalOobPkts" minOccurs="0"/>
+						<xs:element name="intervalLostUser" minOccurs="0"/>
+						<xs:element name="maxBurst" minOccurs="0"/>
+						<xs:element name="nPercentage" minOccurs="0"/>
+						<xs:element name="bundlingActivated" minOccurs="0"/>
+						<xs:element name="bundlingTimer" minOccurs="0"/>
+						<xs:element name="rpuId" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataEthernetLink" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="ipAddress" minOccurs="0"/>
+						<xs:element name="subnetMask" minOccurs="0"/>
+						<xs:element name="broadcastAddress" minOccurs="0"/>
+						<xs:element name="macAddress" minOccurs="0" maxOccurs="unbounded"/>
+						<xs:element name="mtuSize" minOccurs="0"/>
+						<xs:element name="metric" minOccurs="0"/>
+						<xs:element name="interfaceName" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="assignIpAddress" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="ipAddress" minOccurs="0"/>
+									<xs:element name="subnetMask" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataImaGroup" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="physicalPortList" minOccurs="0" maxOccurs="unbounded"/>
+						<xs:element name="requiredNumberOfLinks" minOccurs="0"/>
+						<xs:element name="activeLinks" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataImaLink" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="uses" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataIpAccessHostGpb" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="generalProcessorUnitId" minOccurs="0"/>
+						<xs:element name="autoConfig" minOccurs="0"/>
+						<xs:element name="autoConfigIdentity" minOccurs="0"/>
+						<xs:element name="autoConfigIdentity2" minOccurs="0"/>
+						<xs:element name="ipAddress1" minOccurs="0"/>
+						<xs:element name="ipAddress2" minOccurs="0"/>
+						<xs:element name="ipDefaultTtl" minOccurs="0"/>
+						<xs:element name="ipReasmTimeout" minOccurs="0"/>
+						<xs:element name="interface1" minOccurs="0"/>
+						<xs:element name="interface2" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataIpAccessAutoConfig" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="networkPrefixLength" minOccurs="0"/>
+						<xs:element name="nrOfUnusedAdresses" minOccurs="0"/>
+						<xs:element name="totalNrOfAddresses" minOccurs="0"/>
+						<xs:element name="minIpAddress" minOccurs="0"/>
+						<xs:element name="maxIpAddress" minOccurs="0"/>
+						<xs:element name="subnet" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataIpInterface" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="vid" minOccurs="0"/>
+						<xs:element name="vLan" minOccurs="0"/>
+						<xs:element name="rps" minOccurs="0"/>
+						<xs:element name="mtu" minOccurs="0"/>
+						<xs:element name="networkPrefixLength" minOccurs="0"/>
+						<xs:element name="defaultRouter0" minOccurs="0"/>
+						<xs:element name="defaultRouter1" minOccurs="0"/>
+						<xs:element name="defaultRouter2" minOccurs="0"/>
+						<xs:element name="defaultRouterPingInterval" minOccurs="0"/>
+						<xs:element name="maxWaitForPingReply" minOccurs="0"/>
+						<xs:element name="maxNoOfFailedPings" minOccurs="0"/>
+						<xs:element name="noOfPingsBeforeOk" minOccurs="0"/>
+						<xs:element name="switchBackTimer" minOccurs="0"/>
+						<xs:element name="ownIpAddressActive" minOccurs="0"/>
+						<xs:element name="ownIpAddressPassive" minOccurs="0"/>
+						<xs:element name="subnet" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataIpAccessHostSpb" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="autoConfig" minOccurs="0"/>
+						<xs:element name="autoConfigIdentity" minOccurs="0"/>
+						<xs:element name="autoConfigIdentity2" minOccurs="0"/>
+						<xs:element name="interface2" minOccurs="0"/>
+						<xs:element name="spmId" minOccurs="0"/>
+						<xs:element name="ipAddress" minOccurs="0"/>
+						<xs:element name="ipAddress2" minOccurs="0"/>
+						<xs:element name="ipDefaultTtl" minOccurs="0"/>
+						<xs:element name="ipInterface" minOccurs="0"/>
+						<xs:element name="ipReasmTimeout" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataIpEthPacketDataRouter" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="pdrDeviceRef" minOccurs="0"/>
+						<xs:element name="ipAccessHostSpbRef" minOccurs="0"/>
+						<xs:element name="ipAddressSelection" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSwManagement" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData"/>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataReliableProgramUniter" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+		<xs:element name="vsDataSpDevicePool" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData"/>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataPdrDevice" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataExchangeTerminal" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+							<xs:element name="description" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="aal2LayerDescription" minOccurs="0"/>
+									<xs:element name="atmLayerDescription" minOccurs="0"/>
+									<xs:element name="etType" minOccurs="0"/>
+									<xs:element name="physicalLayerDescription" minOccurs="0"/>
+									<xs:element name="tdmSupport" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+							<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataCbu" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+							<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataGeneralProcessorUnit" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+							<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataVc4Ttp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+							<xs:element name="userLabel" minOccurs="0"/>
+							<xs:element name="pathTraceFormat" minOccurs="0"/>
+							<xs:element name="transmittedPathTrace" minOccurs="0"/>
+							<xs:element name="expectedPathTrace" minOccurs="0"/>
+							<xs:element name="timConsequentAction" minOccurs="0"/>
+							<xs:element name="vcDegThreshold" minOccurs="0"/>
+							<xs:element name="vcDegM" minOccurs="0"/>
+							<xs:element name="auAisReporting" minOccurs="0"/>
+							<xs:element name="vcRdiReporting" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataVc12Ttp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+							<xs:element name="userLabel" minOccurs="0"/>
+							<xs:element name="transmittedPathTrace" minOccurs="0"/>
+							<xs:element name="expectedPathTrace" minOccurs="0"/>
+							<xs:element name="timConsequentAction" minOccurs="0"/>
+							<xs:element name="vcDegThreshold" minOccurs="0"/>
+							<xs:element name="vcDegM" minOccurs="0"/>
+							<xs:element name="tuAisReporting" minOccurs="0"/>
+							<xs:element name="vcRdiReporting" minOccurs="0"/>
+							<xs:element name="administrativeState" minOccurs="0"/>
+							<xs:element name="shutDownTimeout" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataE1Ttp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+							<xs:element name="userLabel" minOccurs="0"/>
+							<xs:element name="degDegThr" minOccurs="0"/>
+							<xs:element name="degDegM" minOccurs="0"/>
+							<xs:element name="aisReporting" minOccurs="0"/>
+							<xs:element name="rdiReporting" minOccurs="0"/>
+							<xs:element name="crc4Mode" minOccurs="0"/>
+							<xs:element name="idlePattern" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSts1SpeTtp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+							<xs:element name="userLabel" minOccurs="0"/>
+							<xs:element name="aisPReporting" minOccurs="0"/>
+							<xs:element name="rdiPReporting" minOccurs="0"/>
+							<xs:element name="timConsequentAction" minOccurs="0"/>
+							<xs:element name="expectedPathTrace" minOccurs="0"/>
+							<xs:element name="transmittedPathTrace" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataVt15Ttp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+							<xs:element name="administrativeState" minOccurs="0"/>
+							<xs:element name="userLabel" minOccurs="0"/>
+							<xs:element name="aisVreporting" minOccurs="0"/>
+							<xs:element name="rdiVreporting" minOccurs="0"/>
+							<xs:element name="shutDownTimer" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataSts3CspeTtp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+							<xs:element name="userLabel" minOccurs="0"/>
+							<xs:element name="aisPReporting" minOccurs="0"/>
+							<xs:element name="rdiPReporting" minOccurs="0"/>
+							<xs:element name="timConsequentAction" minOccurs="0"/>
+							<xs:element name="expectedPathTrace" minOccurs="0"/>
+							<xs:element name="transmittedPathTrace" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataT1Ttp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+							<xs:element name="userLabel" minOccurs="0"/>
+							<xs:element name="aisReporting" minOccurs="0"/>
+							<xs:element name="rdiReporting" minOccurs="0"/>
+							<xs:element name="idlePattern" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataIuLink" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="packetDataRouterRef" minOccurs="0" maxOccurs="unbounded" />
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataE1PhysPathTerm" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="lineNo" minOccurs="0"/>
+						<xs:element name="loopback" minOccurs="0"/>
+						<xs:element name="crc4Mode" minOccurs="0"/>
+						<xs:element name="idlePattern" minOccurs="0"/>
+						<xs:element name="degDegThr" minOccurs="0"/>
+						<xs:element name="degDegM" minOccurs="0"/>
+						<xs:element name="rdiReporting" minOccurs="0"/>
+						<xs:element name="aisReporting" minOccurs="0"/>
+						<xs:element name="shutDownTimeout" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataJ1PhysPathTerm" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+					        <xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="lineNo" minOccurs="0"/>
+						<xs:element name="loopback" minOccurs="0"/>
+						<xs:element name="idlePattern" minOccurs="0"/>
+						<xs:element name="physicalLineType" minOccurs="0"/>
+						<xs:element name="degThreshold" minOccurs="0"/>
+						<xs:element name="rdiReporting" minOccurs="0"/>
+						<xs:element name="aisReporting" minOccurs="0"/>
+						<xs:element name="shutDownTimeout" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataT1PhysPathTerm" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+					        <xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="lineNo" minOccurs="0"/>
+						<xs:element name="loopback" minOccurs="0"/>
+						<xs:element name="rdiReporting" minOccurs="0"/>
+						<xs:element name="aisReporting" minOccurs="0"/>
+						<xs:element name="shutDownTimeout" minOccurs="0"/>
+						<xs:element name="idlePattern" minOccurs="0"/>
+						<xs:element name="transmissionMode" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataDs0Bundle" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="listOfTimeSlots" minOccurs="0"/>
+						<xs:element name="tdmMode" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataT3PhysPathTerm" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+					        <xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="shutDownTimeout" minOccurs="0"/>
+						<xs:element name="lineNo" minOccurs="0"/>
+						<xs:element name="loopback" minOccurs="0"/>
+						<xs:element name="rdiReporting" minOccurs="0"/>
+						<xs:element name="aisReporting" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataE3PhysPathTerm" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+					        <xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="shutDownTimeout" minOccurs="0"/>
+						<xs:element name="lineNo" minOccurs="0"/>
+						<xs:element name="loopback" minOccurs="0"/>
+						<xs:element name="idlePattern" minOccurs="0"/>
+						<xs:element name="degDegThr" minOccurs="0"/>
+						<xs:element name="degDegM" minOccurs="0"/>
+						<xs:element name="rdiReporting" minOccurs="0"/>
+						<xs:element name="aisReporting" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataOs155SpiTtp" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+					        <xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="lineNo" minOccurs="0"/>
+						<xs:element name="standardMode" minOccurs="0"/>
+						<xs:element name="shutDownTimeout" minOccurs="0"/>
+						<xs:element name="muxMode" minOccurs="0"/>
+						<xs:element name="msDegThreshold" minOccurs="0"/>
+						<xs:element name="msDegM" minOccurs="0"/>
+						<xs:element name="msRdiReporting" minOccurs="0"/>
+						<xs:element name="msAisReporting" minOccurs="0"/>
+						<xs:element name="loopBack" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataEtMfg" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+    <xs:element name="vsDataGigaBitEthernet" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+					     <xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="dscpPbitMap" minOccurs="0"/>
+						<xs:element name="autoNegotiation" minOccurs="0"/>
+						<xs:element name="frameFormat" minOccurs="0"/>
+						<xs:element name="primaryLink" minOccurs="0"/>
+						<xs:element name="protectiveMode" minOccurs="0"/>
+						<xs:element name="msDegM" minOccurs="0"/>
+						<xs:element name="shutDownTimeout" minOccurs="0"/>
+						<xs:element name="statePropagationDelay" minOccurs="0"/>
+						<xs:element name="switchBackTimer" minOccurs="0"/>
+						<xs:element name="setDscpPbit" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:element name="dscp" minOccurs="0"/>
+									<xs:element name="pbit" minOccurs="0"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataFastEthernet" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="administrativeState" minOccurs="0"/>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="defaultRouter" minOccurs="0"/>
+						<xs:element name="mtu" minOccurs="0"/>
+						<xs:element name="networkPrefixLength" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMediumAccessUnit" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="connectorLabel" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vsDataMspg" substitutionGroup="xn:vsData">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="xn:vsData">
+					<xs:sequence>
+						<xs:element name="userLabel" minOccurs="0"/>
+						<xs:element name="degCauseMsp" minOccurs="0"/>
+						<xs:element name="os155SpiStandbyId" minOccurs="0"/>
+						<xs:element name="os155SpiWorkingId" minOccurs="0"/>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/ImportExportMap.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/ImportExportMap.xsd
new file mode 100644
index 0000000000..acbafd42e6
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/ImportExportMap.xsd
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Graham Coster (Ericsson Expertise Ireland) -->
+<!--W3C Schema generated by XML Spy v4.1 U (http://www.xmlspy.com)-->
+<xs:schema xmlns="ImportExportMap.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="ImportExportMap.xsd" elementFormDefault="qualified">
+	<xs:element name="AttributeMap">
+		<xs:complexType>
+			<xs:attribute name="internalName" type="xs:string" use="required"/>
+			<xs:attribute name="externalName" type="xs:string" use="required"/>
+			<xs:attribute name="structAttributeType" type="xs:string" use="optional"/>
+			<xs:attribute name="mapRequired" type="xs:boolean" use="optional" default="false"/>
+			<xs:attribute name="restricted" type="xs:boolean" use="optional" default="false"/>
+			<xs:attribute name="actionUpdated" type="xs:boolean" use="optional" default="false"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ActionMap">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="ActionAttribute" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="actionName" type="xs:string" use="required"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ActionAttribute">
+		<xs:complexType>
+			<xs:attribute name="name" type="xs:string" use="required"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ChildMoTypes">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="MoType" maxOccurs="unbounded"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="FileMimMap">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="MoMap" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="fileType" type="xs:string" use="required"/>
+			<xs:attribute name="fileVersion" type="xs:string" use="required"/>
+			<xs:attribute name="ranosMOMType" type="xs:string" use="required"/>
+			<xs:attribute name="ranosMOMVersion" type="xs:string" use="required"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="MoMap">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="ValidCommands"/>
+				<xs:element ref="AttributeMap" maxOccurs="unbounded"/>
+				<xs:element ref="ActionMap" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="ChildMoTypes" minOccurs="0"/>
+			</xs:sequence>
+			<xs:attribute name="fileRoot" type="xs:boolean" use="required"/>
+			<xs:attribute name="externalType" type="xs:string" use="required"/>
+			<xs:attribute name="internalType" type="xs:string" use="required"/>
+			<xs:attribute name="nameSpace" type="xs:string" use="required"/>
+			<xs:attribute name="rt" type="xs:string" use="required"/>
+			<xs:attribute name="overrideFBKDelete" type="xs:boolean" use="optional" default="false"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="MoType">
+		<xs:complexType>
+			<xs:attribute name="name" type="xs:string" use="required"/>
+			<xs:attribute name="rt" type="xs:string" use="required"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ValidCommands">
+		<xs:complexType>
+			<xs:attribute name="create" type="xs:boolean" use="required"/>
+			<xs:attribute name="update" type="xs:boolean" use="required"/>
+			<xs:attribute name="delete" type="xs:boolean" use="required"/>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/configData.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/configData.xsd
new file mode 100644
index 0000000000..f07e7c8d3d
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/configData.xsd
@@ -0,0 +1,41 @@
+<!--
+  3GPP TS 32.615 v4.5 Bulk CM IRP
+  Configuration data file base XML schema
+  configData.xsd
+  -->
+<schema targetNamespace="configData.xsd" xmlns:bc="configData.xsd" xmlns:xn="genericNrm.xsd" xmlns:es="EricssonSpecificAttributes.5.1.xsd" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<!-- Configuration data file root XML element -->
+	<import namespace="genericNrm.xsd" schemaLocation="genericNrm.xsd"/>
+	<import namespace="EricssonSpecificAttributes.5.1.xsd" schemaLocation="EricssonSpecificAttributes.5.1.xsd"/>
+	<element name="bulkCmConfigDataFile">
+		<complexType>
+			<sequence>
+				<element name="fileHeader">
+					<complexType>
+						<attribute name="fileFormatVersion" type="string" use="required"/>
+						<attribute name="senderName" type="string" use="optional"/>
+						<attribute name="vendorName" type="string" use="optional"/>
+					</complexType>
+				</element>
+				<element name="configData" maxOccurs="unbounded">
+					<complexType>
+						<choice>
+							<element ref="xn:SubNetwork"/>
+							<element ref="xn:MeContext"/>
+							<!--
+								<element ref="xn:ManagedElement"/>
+								Not Possible at this level in Ericsson Model
+							-->
+						</choice>
+						<attribute name="dnPrefix" type="string" use="optional"/>
+					</complexType>
+				</element>
+				<element name="fileFooter">
+					<complexType>
+						<attribute name="dateTime" type="dateTime" use="required"/>
+					</complexType>
+				</element>
+			</sequence>
+		</complexType>
+	</element>
+</schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/genericNrm.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/genericNrm.xsd
new file mode 100644
index 0000000000..9c672cda8c
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/genericNrm.xsd
@@ -0,0 +1,230 @@
+<!--

+ 3GPP TS 32.615 v4.5 Bulk CM IRP

+  Configuration data file Generic Network Resources IRP NRM XML schema

+   -->

+<schema targetNamespace="genericNrm.xsd" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:un="utranNrm.xsd" xmlns:gn="geranNrm.xsd" xmlns:xn="genericNrm.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">

+

+	<import namespace="geranNrm.xsd" schemaLocation="geranNrm.xsd"/>

+	<import namespace="utranNrm.xsd" schemaLocation="utranNrm.xsd"/>

+	

+	<!-- Abstract base type for all NRM class associated XML elements -->

+	<complexType name="NrmClassXmlType" abstract="true">

+		<attribute name="id" type="string" use="required"/>

+		<attribute name="modifier" use="optional">

+			<simpleType>

+				<restriction base="string">

+					<enumeration value="create"/>

+					<enumeration value="delete"/>

+					<enumeration value="update"/>

+				</restriction>

+			</simpleType>

+		</attribute>

+	</complexType>

+	

+	<!-- Generic Network Resources IRP NRM class associated XML elements -->

+	<element name="SubNetwork">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="userLabel" minOccurs="0"/>

+									<element name="userDefinedNetworkType" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="xn:SubNetwork"/>

+							<element ref="xn:ManagedElement"/>

+							<element ref="xn:MeContext"/>

+							<element ref="xn:ManagementNode"/>

+							<element ref="xn:IRPAgent"/>

+							<element ref="un:ExternalUtranCell"/>

+							<element ref="gn:ExternalGsmCell"/>

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	

+	<element name="ManagedElement">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="managedElementType" minOccurs="0"/>

+									<element name="userLabel" minOccurs="0"/>

+									<element name="vendorName" minOccurs="0"/>

+									<element name="userDefinedState" minOccurs="0"/>

+									<element name="locationName" minOccurs="0"/>

+									<element name="swVersion" minOccurs="0"/>

+									<element name="managedBy" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="un:RncFunction"/>

+							<element ref="un:NodeBFunction"/>

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	

+	<element name="MeContext">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="xn:ManagedElement"/>

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	

+	<element name="ManagementNode">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="userLabel" minOccurs="0"/>

+									<element name="vendorName" minOccurs="0"/>

+									<element name="userDefinedState" minOccurs="0"/>

+									<element name="locationName" minOccurs="0"/>

+									<element name="manages" minOccurs="0"/>

+									<element name="swVersion" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+							<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="xn:IRPAgent"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	

+	<element name="IRPAgent">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="systemDN" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="xn:NotificationIRP"/>

+							<element ref="xn:AlarmIRP"/>

+							<element ref="xn:BulkCmIRP"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	

+	<element name="NotificationIRP">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="irpVersion" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	

+	<element name="AlarmIRP">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="irpVersion" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	

+	<element name="BulkCmIRP">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="irpVersion" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	

+	<element name="VsDataContainer">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="vsDataType" minOccurs="0"/>

+									<element name="vsDataFormatVersion" minOccurs="0"/>

+									<element ref="xn:vsData" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	<complexType name="vsData" abstract="true"/>

+	<!-- VsDataContainer NRM class vsData attribute associated empty XML element -->

+	<element name="vsData" type="xn:vsData" abstract="true"/>

+</schema>

diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/geranNrm.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/geranNrm.xsd
new file mode 100644
index 0000000000..b226eb2f4b
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/geranNrm.xsd
@@ -0,0 +1,63 @@
+<!--

+   3GPP TS 32.615 v4.5 Bulk CM IRP

+  Configuration data file UTRAN Network Resources IRP NRM XML schema

+  To be used with WEGA Bucket 2.1 onwards

+-->

+<schema targetNamespace="geranNrm.xsd" xmlns:gn="geranNrm.xsd" xmlns:un="utranNrm.xsd" xmlns:xn="genericNrm.xsd" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">

+	<!-- GERAN Network Resources IRP NRM class associated XML elements -->

+	<import namespace="genericNrm.xsd" schemaLocation="genericNrm.xsd"/>

+	<import namespace="utranNrm.xsd" schemaLocation="utranNrm.xsd"/>

+	<element name="GsmRelation">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all><!--

+									<element name="relationType" minOccurs="0"/>

+									-->

+									<element name="adjacentCell" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	<element name="ExternalGsmCell">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="userLabel" minOccurs="0"/>

+									<element name="cellIdentity" minOccurs="0"/>

+									<element name="bcchFrequency" minOccurs="0"/>

+									<element name="ncc" minOccurs="0"/>

+									<element name="bcc" minOccurs="0"/>

+									<element name="lac" minOccurs="0"/>

+									<element name="mcc" minOccurs="0"/>

+									<element name="mnc" minOccurs="0"/>

+									<!--

+									<element name="rac" minOccurs="0"/>

+									<element name="racc" minOccurs="0"/>

+									-->

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+</schema>

diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/rnc.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/rnc.xml
new file mode 100644
index 0000000000..b6ca8b4fb1
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/rnc.xml
@@ -0,0 +1,23763 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bulkCmConfigDataFile xmlns="configData.xsd" xmlns:xn="genericNrm.xsd" xmlns:gn="geranNrm.xsd" xmlns:un="utranNrm.xsd" xmlns:es="EricssonSpecificAttributes.5.1.xsd">
+    <fileHeader fileFormatVersion="32.615 V4.5" senderName="DC=a1.companyNN.com,SubNetwork=1,IRPAgent=1" vendorName="Company NN"/>
+        <configData dnPrefix="DC=a0.companyNN.com">
+<xn:SubNetwork id="WEOSSRC1_ROOT_MO_R">
+<xn:SubNetwork id="RNC33">
+<xn:MeContext id="SRNC001">
+
+
+<xn:ManagedElement id="1">
+<xn:attributes>
+
+<xn:userLabel>/proj/netsimproj/public/ftp/simulations/WRAN/R5/Standard/E/V2</xn:userLabel>
+</xn:attributes>
+
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSwManagement</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSwManagement />
+</xn:attributes>
+<xn:VsDataContainer id="scc_adm" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="scc_server" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="aal2ap13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="sw_inst" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="spas_res" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="inet" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ospf" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="aal05_ncc" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="aal_cc" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="phy_e1_mp" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="phy_stm1_mp" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="atmmp" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="aal2mp" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="aal2_adm" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="aal2ncc" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="aal0d_adm" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="aal0s_adm" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="aal5d_adm" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="aal5s_adm" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="usaal_adm" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="nsaal_adm" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="equip_mp" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="nss_mp" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ip_util" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="spp_mp" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="http" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="jvm" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ans_aal2rh_1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ans_aal2disncc_12_1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ans_aal2cpsrc_12_1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ans_aal2ap_12_1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RncRpuCenDh" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RncRpuCenRh" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RncRpuDh" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RncRpuFro" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RncRpuCenOm" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RncRpuUe" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RncRpuModOm" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RncRpuRanap" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RncRpuRnsap" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RncRpuCenRnh" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RncRpuCell" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataReliableProgramUniter</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataReliableProgramUniter>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataReliableProgramUniter>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataTransportNetwork</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataTransportNetwork>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataTransportNetwork>
+</xn:attributes><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2Sp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataAal2Sp>
+
+<es:a2ea> </es:a2ea>
+<es:userLabel> </es:userLabel>
+</es:vsDataAal2Sp></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2Sp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2Sp>
+
+<es:a2ea> </es:a2ea>
+<es:userLabel> </es:userLabel>
+</es:vsDataAal2Sp>
+</xn:attributes><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2Ap</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataAal2Ap>
+
+<es:aal2QoSCodePointProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal2QosCodePointProfile=1</es:aal2QoSCodePointProfileId>
+<es:rpuId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataSwManagement=1,vsDataReliableProgramUniter=ans_aal2ap_12_1</es:rpuId>
+<es:secondarySigLinkId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b4qb</es:secondarySigLinkId>
+<es:sigLinkId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b4qa</es:sigLinkId>
+<es:timerErq>5000</es:timerErq>
+<es:timerRel>2000</es:timerRel>
+<es:userLabel> </es:userLabel>
+<es:allocationMode>0</es:allocationMode>
+</es:vsDataAal2Ap></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2Ap</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2Ap>
+
+<es:aal2QoSCodePointProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal2QosCodePointProfile=1</es:aal2QoSCodePointProfileId>
+<es:rpuId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataSwManagement=1,vsDataReliableProgramUniter=ans_aal2ap_12_1</es:rpuId>
+<es:secondarySigLinkId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b4qb</es:secondarySigLinkId>
+<es:sigLinkId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b4qa</es:sigLinkId>
+<es:timerErq>5000</es:timerErq>
+<es:timerRel>2000</es:timerRel>
+<es:userLabel> </es:userLabel>
+<es:allocationMode>0</es:allocationMode>
+</es:vsDataAal2Ap>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2PathDistributionUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2PathDistributionUnit>
+
+<es:userLabel> </es:userLabel>
+<es:rpuId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataSwManagement=1,vsDataReliableProgramUniter=ans_aal2cpsrc_12_1</es:rpuId>
+
+<es:aal2PathVccTpList>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal2PathVccTp=b1a1</es:aal2PathVccTpList>
+</es:vsDataAal2PathDistributionUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer><xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2Ap</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataAal2Ap>
+
+<es:aal2QoSCodePointProfileId>0</es:aal2QoSCodePointProfileId>
+<es:rpuId>0</es:rpuId>
+<es:secondarySigLinkId>0</es:secondarySigLinkId>
+<es:sigLinkId>0</es:sigLinkId>
+<es:timerErq>5000</es:timerErq>
+<es:timerRel>2000</es:timerRel>
+<es:userLabel> </es:userLabel>
+<es:allocationMode>0</es:allocationMode>
+</es:vsDataAal2Ap></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2Ap</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2Ap>
+
+<es:aal2QoSCodePointProfileId>0</es:aal2QoSCodePointProfileId>
+<es:rpuId>0</es:rpuId>
+<es:secondarySigLinkId>0</es:secondarySigLinkId>
+<es:sigLinkId>0</es:sigLinkId>
+<es:timerErq>5000</es:timerErq>
+<es:timerRel>2000</es:timerRel>
+<es:userLabel> </es:userLabel>
+<es:allocationMode>0</es:allocationMode>
+</es:vsDataAal2Ap>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2PathDistributionUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2PathDistributionUnit>
+
+<es:userLabel> </es:userLabel>
+<es:rpuId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataSwManagement=1,vsDataReliableProgramUniter=ans_aal2cpsrc_12_1</es:rpuId>
+
+<es:aal2PathVccTpList>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal2PathVccTp=b2a1</es:aal2PathVccTpList>
+</es:vsDataAal2PathDistributionUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer><xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2Ap</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataAal2Ap>
+
+<es:aal2QoSCodePointProfileId>0</es:aal2QoSCodePointProfileId>
+<es:rpuId>0</es:rpuId>
+<es:secondarySigLinkId>0</es:secondarySigLinkId>
+<es:sigLinkId>0</es:sigLinkId>
+<es:timerErq>5000</es:timerErq>
+<es:timerRel>2000</es:timerRel>
+<es:userLabel> </es:userLabel>
+<es:allocationMode>0</es:allocationMode>
+</es:vsDataAal2Ap></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2Ap</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2Ap>
+
+<es:aal2QoSCodePointProfileId>0</es:aal2QoSCodePointProfileId>
+<es:rpuId>0</es:rpuId>
+<es:secondarySigLinkId>0</es:secondarySigLinkId>
+<es:sigLinkId>0</es:sigLinkId>
+<es:timerErq>5000</es:timerErq>
+<es:timerRel>2000</es:timerRel>
+<es:userLabel> </es:userLabel>
+<es:allocationMode>0</es:allocationMode>
+</es:vsDataAal2Ap>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2PathDistributionUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2PathDistributionUnit>
+
+<es:userLabel> </es:userLabel>
+<es:rpuId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataSwManagement=1,vsDataReliableProgramUniter=ans_aal2cpsrc_12_1</es:rpuId>
+
+<es:aal2PathVccTpList>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal2PathVccTp=b3a1</es:aal2PathVccTpList>
+</es:vsDataAal2PathDistributionUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer><xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2Ap</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataAal2Ap>
+
+<es:aal2QoSCodePointProfileId>0</es:aal2QoSCodePointProfileId>
+<es:rpuId>0</es:rpuId>
+<es:secondarySigLinkId>0</es:secondarySigLinkId>
+<es:sigLinkId>0</es:sigLinkId>
+<es:timerErq>5000</es:timerErq>
+<es:timerRel>2000</es:timerRel>
+<es:userLabel> </es:userLabel>
+<es:allocationMode>0</es:allocationMode>
+</es:vsDataAal2Ap></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2Ap</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2Ap>
+
+<es:aal2QoSCodePointProfileId>0</es:aal2QoSCodePointProfileId>
+<es:rpuId>0</es:rpuId>
+<es:secondarySigLinkId>0</es:secondarySigLinkId>
+<es:sigLinkId>0</es:sigLinkId>
+<es:timerErq>5000</es:timerErq>
+<es:timerRel>2000</es:timerRel>
+<es:userLabel> </es:userLabel>
+<es:allocationMode>0</es:allocationMode>
+</es:vsDataAal2Ap>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2PathDistributionUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2PathDistributionUnit>
+
+<es:userLabel> </es:userLabel>
+<es:rpuId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataSwManagement=1,vsDataReliableProgramUniter=ans_aal2cpsrc_12_1</es:rpuId>
+
+<es:aal2PathVccTpList>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal2PathVccTp=b4a1</es:aal2PathVccTpList>
+</es:vsDataAal2PathDistributionUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer><xn:VsDataContainer id="MS-24-1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=1,vsDataPlugInUnit=1,vsDataExchangeTerminal=ET-M4,vsDataOs155SpiTtp=1,vsDataSts3CspeTtp=1</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-24-1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=1,vsDataPlugInUnit=1,vsDataExchangeTerminal=ET-M4,vsDataOs155SpiTtp=1,vsDataSts3CspeTtp=1</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes><xn:VsDataContainer id="Vp1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVplTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataVplTp>
+
+<es:atmTrafficDescriptor>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptor>
+<es:externalVpi>1</es:externalVpi>
+<es:userLabel> </es:userLabel>
+</es:vsDataVplTp></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="Vp1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVplTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVplTp>
+
+<es:atmTrafficDescriptor>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptor>
+<es:externalVpi>1</es:externalVpi>
+<es:userLabel> </es:userLabel>
+</es:vsDataVplTp>
+</xn:attributes><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVpcTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataVpcTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:userLabel> </es:userLabel>
+<es:counterMode>0</es:counterMode>
+</es:vsDataVpcTp></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVpcTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVpcTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:userLabel> </es:userLabel>
+<es:counterMode>0</es:counterMode>
+</es:vsDataVpcTp>
+</xn:attributes>
+<xn:VsDataContainer id="vc34" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>34</es:externalVci>
+<es:userLabel>used by Aal0 b1sa (NodeSynchTp1)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc35" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>35</es:externalVci>
+<es:userLabel>used by Aal0 b1sb (NodeSynchTp2)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc36" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>36</es:externalVci>
+<es:userLabel>used by Aal5 b1ca (Nbap Common)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc37" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>37</es:externalVci>
+<es:userLabel>used by Aal5 b1da (Nbap Dedicated)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc38" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>38</es:externalVci>
+<es:userLabel>used by Aal5 b1qa (Aal2 signalling)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc39" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>39</es:externalVci>
+<es:userLabel>used by Aal2 b1a1 (Aal2Path)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc43" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C2P4000</es:atmTrafficDescriptorId>
+<es:externalVci>43</es:externalVci>
+<es:userLabel>used by Aal5 b1cb (Nbap Common)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc44" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>44</es:externalVci>
+<es:userLabel>used by Aal5 b1db (Nbap Dedicated)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc45" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>45</es:externalVci>
+<es:userLabel>used by Aal5 b1qb (Aal2 signalling)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc32-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>45</es:externalVci>
+<es:userLabel>used by Aal5 b1-x1 (IpAtmLink)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc33-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>33</es:externalVci>
+<es:userLabel>used by Aal5 b1-x2 (IpAtmLink)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc34-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>340</es:externalVci>
+<es:userLabel>used by Aal0 b1sa-x (NodeSynchTp1)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc35-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>350</es:externalVci>
+<es:userLabel>used by Aal0 b1sb-x (NodeSyncT2p)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer><xn:VsDataContainer id="Vp2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVplTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataVplTp>
+
+<es:atmTrafficDescriptor>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptor>
+<es:externalVpi>2</es:externalVpi>
+<es:userLabel> </es:userLabel>
+</es:vsDataVplTp></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="Vp2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVplTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVplTp>
+
+<es:atmTrafficDescriptor>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptor>
+<es:externalVpi>2</es:externalVpi>
+<es:userLabel> </es:userLabel>
+</es:vsDataVplTp>
+</xn:attributes><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVpcTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataVpcTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:userLabel> </es:userLabel>
+<es:counterMode>0</es:counterMode>
+</es:vsDataVpcTp></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVpcTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVpcTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:userLabel> </es:userLabel>
+<es:counterMode>0</es:counterMode>
+</es:vsDataVpcTp>
+</xn:attributes>
+<xn:VsDataContainer id="vc34" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>34</es:externalVci>
+<es:userLabel>used by Aal0 b2sa (NodeSynchTp1)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc35" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>35</es:externalVci>
+<es:userLabel>used by Aal0 b2sb (NodeSynchTp2)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc36" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>36</es:externalVci>
+<es:userLabel>used by Aal5 b2ca (Nbap Common)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc37" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>37</es:externalVci>
+<es:userLabel>used by Aal5 b2da (Nbap Dedicated)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc38" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>38</es:externalVci>
+<es:userLabel>used by Aal5 b2qa (Aal2 signalling)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc39" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>39</es:externalVci>
+<es:userLabel>used by Aal2 b2a1 (Aal2Path)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc43" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C2P4000</es:atmTrafficDescriptorId>
+<es:externalVci>43</es:externalVci>
+<es:userLabel>used by Aal5 b2cb (Nbap Common)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc44" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>44</es:externalVci>
+<es:userLabel>used by Aal5 b2db (Nbap Dedicated)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc45" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>45</es:externalVci>
+<es:userLabel>used by Aal5 b2qb (Aal2 signalling)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc32-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>45</es:externalVci>
+<es:userLabel>used by Aal5 b2-x1 (IpAtmLink)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc33-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>33</es:externalVci>
+<es:userLabel>used by Aal5 b2-x2 (IpAtmLink)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc34-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>340</es:externalVci>
+<es:userLabel>used by Aal0 b2sa-x (NodeSynchTp1)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc35-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>350</es:externalVci>
+<es:userLabel>used by Aal0 b2sb-x (NodeSyncT2p)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer><xn:VsDataContainer id="Vp3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVplTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataVplTp>
+
+<es:atmTrafficDescriptor>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptor>
+<es:externalVpi>3</es:externalVpi>
+<es:userLabel> </es:userLabel>
+</es:vsDataVplTp></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="Vp3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVplTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVplTp>
+
+<es:atmTrafficDescriptor>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptor>
+<es:externalVpi>3</es:externalVpi>
+<es:userLabel> </es:userLabel>
+</es:vsDataVplTp>
+</xn:attributes><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVpcTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataVpcTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:userLabel> </es:userLabel>
+<es:counterMode>0</es:counterMode>
+</es:vsDataVpcTp></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVpcTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVpcTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:userLabel> </es:userLabel>
+<es:counterMode>0</es:counterMode>
+</es:vsDataVpcTp>
+</xn:attributes>
+<xn:VsDataContainer id="vc34" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>34</es:externalVci>
+<es:userLabel>used by Aal0 b3sa (NodeSynchTp1)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc35" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>35</es:externalVci>
+<es:userLabel>used by Aal0 b3sb (NodeSynchTp2)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc36" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>36</es:externalVci>
+<es:userLabel>used by Aal5 b3ca (Nbap Common)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc37" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>37</es:externalVci>
+<es:userLabel>used by Aal5 b3da (Nbap Dedicated)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc38" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>38</es:externalVci>
+<es:userLabel>used by Aal5 b3qa (Aal2 signalling)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc39" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>39</es:externalVci>
+<es:userLabel>used by Aal2 b3a1 (Aal2Path)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc43" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C2P4000</es:atmTrafficDescriptorId>
+<es:externalVci>43</es:externalVci>
+<es:userLabel>used by Aal5 b3cb (Nbap Common)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc44" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>44</es:externalVci>
+<es:userLabel>used by Aal5 b3db (Nbap Dedicated)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc45" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>45</es:externalVci>
+<es:userLabel>used by Aal5 b3qb (Aal2 signalling)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc32-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>45</es:externalVci>
+<es:userLabel>used by Aal5 b3-x1 (IpAtmLink)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc33-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>33</es:externalVci>
+<es:userLabel>used by Aal5 b3-x2 (IpAtmLink)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc34-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>340</es:externalVci>
+<es:userLabel>used by Aal0 b3sa-x (NodeSynchTp1)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc35-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>350</es:externalVci>
+<es:userLabel>used by Aal0 b3sb-x (NodeSyncT2p)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer><xn:VsDataContainer id="Vp4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVplTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataVplTp>
+
+<es:atmTrafficDescriptor>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptor>
+<es:externalVpi>4</es:externalVpi>
+<es:userLabel> </es:userLabel>
+</es:vsDataVplTp></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="Vp4" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVplTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVplTp>
+
+<es:atmTrafficDescriptor>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptor>
+<es:externalVpi>4</es:externalVpi>
+<es:userLabel> </es:userLabel>
+</es:vsDataVplTp>
+</xn:attributes><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVpcTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataVpcTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:userLabel> </es:userLabel>
+<es:counterMode>0</es:counterMode>
+</es:vsDataVpcTp></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVpcTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVpcTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:userLabel> </es:userLabel>
+<es:counterMode>0</es:counterMode>
+</es:vsDataVpcTp>
+</xn:attributes>
+<xn:VsDataContainer id="vc34" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>34</es:externalVci>
+<es:userLabel>used by Aal0 b4sa (NodeSynchTp1)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc35" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>35</es:externalVci>
+<es:userLabel>used by Aal0 b4sb (NodeSynchTp2)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc36" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>36</es:externalVci>
+<es:userLabel>used by Aal5 b4ca (Nbap Common)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc37" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>37</es:externalVci>
+<es:userLabel>used by Aal5 b4da (Nbap Dedicated)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc38" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>38</es:externalVci>
+<es:userLabel>used by Aal5 b4qa (Aal2 signalling)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc39" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>39</es:externalVci>
+<es:userLabel>used by Aal2 b4a1 (Aal2Path)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc43" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C2P4000</es:atmTrafficDescriptorId>
+<es:externalVci>43</es:externalVci>
+<es:userLabel>used by Aal5 b4cb (Nbap Common)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc44" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>44</es:externalVci>
+<es:userLabel>used by Aal5 b4db (Nbap Dedicated)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc45" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>45</es:externalVci>
+<es:userLabel>used by Aal5 b4qb (Aal2 signalling)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc32-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>45</es:externalVci>
+<es:userLabel>used by Aal5 b4-x1 (IpAtmLink)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc33-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=U3P1000M80</es:atmTrafficDescriptorId>
+<es:externalVci>33</es:externalVci>
+<es:userLabel>used by Aal5 b4-x2 (IpAtmLink)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc34-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>340</es:externalVci>
+<es:userLabel>used by Aal0 b4sa-x (NodeSynchTp1)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="vc35-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataVclTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVclTp>
+
+<es:atmTrafficDescriptorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmTrafficDescriptor=C1P4528</es:atmTrafficDescriptorId>
+<es:externalVci>350</es:externalVci>
+<es:userLabel>used by Aal0 b4sb-x (NodeSyncT2p)</es:userLabel>
+</es:vsDataVclTp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-24-2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-24-3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-24-4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-24-5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-24-6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-24-7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-24-8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-25-1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-25-2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-25-3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-25-4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-25-5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-25-6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-25-7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-25-8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-26-1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-26-2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-26-3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-26-4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-26-5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-26-6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-26-7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-26-8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-27-1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-27-2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-27-3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-27-4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-27-5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-27-6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-27-7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS-27-8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmPort</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmPort>
+
+<es:userLabel> </es:userLabel>
+<es:uses>0</es:uses>
+<es:hecCorrectionMode>true</es:hecCorrectionMode>
+</es:vsDataAtmPort>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataMspg</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataMspg>
+
+<es:userLabel> </es:userLabel>
+<es:degCauseMsp>false</es:degCauseMsp>
+<es:os155SpiStandbyId>0</es:os155SpiStandbyId>
+<es:os155SpiWorkingId>0</es:os155SpiWorkingId>
+</es:vsDataMspg>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="C1P4528" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmTrafficDescriptor</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmTrafficDescriptor>
+
+<es:egressAtmMcr>0</es:egressAtmMcr>
+<es:egressAtmPcr>0</es:egressAtmPcr>
+<es:egressAtmQos>1</es:egressAtmQos>
+<es:ingressAtmMcr>0</es:ingressAtmMcr>
+<es:ingressAtmPcr>0</es:ingressAtmPcr>
+<es:ingressAtmQos>1</es:ingressAtmQos>
+<es:serviceCategory>1</es:serviceCategory>
+<es:userLabel> </es:userLabel>
+<es:packetDiscard>false</es:packetDiscard>
+</es:vsDataAtmTrafficDescriptor>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="C1P5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmTrafficDescriptor</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmTrafficDescriptor>
+
+<es:egressAtmMcr>0</es:egressAtmMcr>
+<es:egressAtmPcr>0</es:egressAtmPcr>
+<es:egressAtmQos>1</es:egressAtmQos>
+<es:ingressAtmMcr>0</es:ingressAtmMcr>
+<es:ingressAtmPcr>0</es:ingressAtmPcr>
+<es:ingressAtmQos>1</es:ingressAtmQos>
+<es:serviceCategory>1</es:serviceCategory>
+<es:userLabel> </es:userLabel>
+<es:packetDiscard>false</es:packetDiscard>
+</es:vsDataAtmTrafficDescriptor>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="C2P4000" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmTrafficDescriptor</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmTrafficDescriptor>
+
+<es:egressAtmMcr>0</es:egressAtmMcr>
+<es:egressAtmPcr>0</es:egressAtmPcr>
+<es:egressAtmQos>1</es:egressAtmQos>
+<es:ingressAtmMcr>0</es:ingressAtmMcr>
+<es:ingressAtmPcr>0</es:ingressAtmPcr>
+<es:ingressAtmQos>1</es:ingressAtmQos>
+<es:serviceCategory>1</es:serviceCategory>
+<es:userLabel> </es:userLabel>
+<es:packetDiscard>false</es:packetDiscard>
+</es:vsDataAtmTrafficDescriptor>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="U3P1000M80" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAtmTrafficDescriptor</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAtmTrafficDescriptor>
+
+<es:egressAtmMcr>0</es:egressAtmMcr>
+<es:egressAtmPcr>0</es:egressAtmPcr>
+<es:egressAtmQos>1</es:egressAtmQos>
+<es:ingressAtmMcr>0</es:ingressAtmMcr>
+<es:ingressAtmPcr>0</es:ingressAtmPcr>
+<es:ingressAtmQos>1</es:ingressAtmQos>
+<es:serviceCategory>1</es:serviceCategory>
+<es:userLabel> </es:userLabel>
+<es:packetDiscard>false</es:packetDiscard>
+</es:vsDataAtmTrafficDescriptor>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1da" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp1,vsDataVpcTp=1,vsDataVclTp=vc37</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1ca" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp1,vsDataVpcTp=1,vsDataVclTp=vc36</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1db" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp1,vsDataVpcTp=1,vsDataVclTp=vc44</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1cb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp1,vsDataVpcTp=1,vsDataVclTp=vc43</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1-x1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp1,vsDataVpcTp=1,vsDataVclTp=vc32-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1-x2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp1,vsDataVpcTp=1,vsDataVclTp=vc33-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2da" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp2,vsDataVpcTp=1,vsDataVclTp=vc37</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2ca" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp2,vsDataVpcTp=1,vsDataVclTp=vc36</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2db" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp2,vsDataVpcTp=1,vsDataVclTp=vc44</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2cb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp2,vsDataVpcTp=1,vsDataVclTp=vc43</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2-x1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp2,vsDataVpcTp=1,vsDataVclTp=vc32-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2-x2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp2,vsDataVpcTp=1,vsDataVclTp=vc33-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3da" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp3,vsDataVpcTp=1,vsDataVclTp=vc37</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3ca" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp3,vsDataVpcTp=1,vsDataVclTp=vc36</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3db" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp3,vsDataVpcTp=1,vsDataVclTp=vc44</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3cb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp3,vsDataVpcTp=1,vsDataVclTp=vc43</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3-x1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp3,vsDataVpcTp=1,vsDataVclTp=vc32-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3-x2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp3,vsDataVpcTp=1,vsDataVclTp=vc33-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4da" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp4,vsDataVpcTp=1,vsDataVclTp=vc37</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4ca" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp4,vsDataVpcTp=1,vsDataVclTp=vc36</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4db" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp4,vsDataVpcTp=1,vsDataVclTp=vc44</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4cb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp4,vsDataVpcTp=1,vsDataVclTp=vc43</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4-x1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp4,vsDataVpcTp=1,vsDataVclTp=vc32-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4-x2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal5TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal5TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:fromUserMaxSduSize>1</es:fromUserMaxSduSize>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=24,vsDataPlugInUnit=1</es:processorId>
+<es:toUserMaxSduSize>1</es:toUserMaxSduSize>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp4,vsDataVpcTp=1,vsDataVclTp=vc33-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal5TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalProfile</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalProfile>
+
+<es:userLabel> </es:userLabel>
+<es:profileData>
+<es:congestionAbatement>60</es:congestionAbatement>
+<es:congestionOnSet>70</es:congestionOnSet>
+<es:initialCredit>250</es:initialCredit>
+<es:maxCC>4</es:maxCC>
+<es:maxPD>25</es:maxPD>
+<es:maxStat>67</es:maxStat>
+<es:timerCC>1000</es:timerCC>
+<es:timerIdle>15000</es:timerIdle>
+<es:timerKeepAlive>2000</es:timerKeepAlive>
+<es:timerNoResponse>7000</es:timerNoResponse>
+<es:timerPoll>750</es:timerPoll></es:profileData>
+</es:vsDataUniSaalProfile>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalProfile</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalProfile>
+
+<es:userLabel> </es:userLabel>
+<es:profileData>
+<es:congestionAbatement>60</es:congestionAbatement>
+<es:congestionOnSet>70</es:congestionOnSet>
+<es:initialCredit>250</es:initialCredit>
+<es:maxCC>4</es:maxCC>
+<es:maxPD>25</es:maxPD>
+<es:maxStat>67</es:maxStat>
+<es:timerCC>1000</es:timerCC>
+<es:timerIdle>15000</es:timerIdle>
+<es:timerKeepAlive>2000</es:timerKeepAlive>
+<es:timerNoResponse>7000</es:timerNoResponse>
+<es:timerPoll>750</es:timerPoll></es:profileData>
+</es:vsDataUniSaalProfile>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalProfile</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalProfile>
+
+<es:userLabel> </es:userLabel>
+<es:profileData>
+<es:congestionAbatement>60</es:congestionAbatement>
+<es:congestionOnSet>70</es:congestionOnSet>
+<es:initialCredit>250</es:initialCredit>
+<es:maxCC>4</es:maxCC>
+<es:maxPD>25</es:maxPD>
+<es:maxStat>67</es:maxStat>
+<es:timerCC>1000</es:timerCC>
+<es:timerIdle>15000</es:timerIdle>
+<es:timerKeepAlive>2000</es:timerKeepAlive>
+<es:timerNoResponse>7000</es:timerNoResponse>
+<es:timerPoll>750</es:timerPoll></es:profileData>
+</es:vsDataUniSaalProfile>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1da" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b1da</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1ca" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b1ca</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1db" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b1db</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1cb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b1cb</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1qa" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>0</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>0</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1qb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>0</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>0</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2da" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b2da</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2ca" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b2ca</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2db" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b2db</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2cb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b2cb</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2qa" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>0</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>0</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2qb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>0</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>0</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3da" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b3da</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3ca" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b3ca</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3db" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b3db</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3cb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b3cb</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3qa" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>0</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>0</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3qb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>0</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>0</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4da" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b4da</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4ca" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b4ca</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4db" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b4db</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4cb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b4cb</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalProfile=1</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4qa" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>0</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>0</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4qb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUniSaalTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUniSaalTp>
+
+<es:aal5TpVccTpId>0</es:aal5TpVccTpId>
+<es:maxSduSize>128</es:maxSduSize>
+<es:uniSaalProfileId>0</es:uniSaalProfileId>
+<es:userLabel> </es:userLabel>
+</es:vsDataUniSaalTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1sa" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp1,vsDataVpcTp=1,vsDataVclTp=vc34</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1sb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp1,vsDataVpcTp=1,vsDataVclTp=vc35</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1sa-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp1,vsDataVpcTp=1,vsDataVclTp=vc34-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1sb-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp1,vsDataVpcTp=1,vsDataVclTp=vc35-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2sa" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp2,vsDataVpcTp=1,vsDataVclTp=vc34</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2sb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp2,vsDataVpcTp=1,vsDataVclTp=vc35</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2sa-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp2,vsDataVpcTp=1,vsDataVclTp=vc34-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2sb-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp2,vsDataVpcTp=1,vsDataVclTp=vc35-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3sa" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp3,vsDataVpcTp=1,vsDataVclTp=vc34</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3sb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp3,vsDataVpcTp=1,vsDataVclTp=vc35</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3sa-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp3,vsDataVpcTp=1,vsDataVclTp=vc34-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3sb-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp3,vsDataVpcTp=1,vsDataVclTp=vc35-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4sa" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp4,vsDataVpcTp=1,vsDataVclTp=vc34</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4sb" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp4,vsDataVpcTp=1,vsDataVclTp=vc35</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4sa-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp4,vsDataVpcTp=1,vsDataVclTp=vc34-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4sb-x" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal0TpVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal0TpVccTp>
+
+<es:alarmReport>2</es:alarmReport>
+<es:continuityCheck>false</es:continuityCheck>
+<es:nomPmBlkSize>1024</es:nomPmBlkSize>
+<es:processorId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataEquipment=1,vsDataSubrack=MS,vsDataSlot=4,vsDataPlugInUnit=1</es:processorId>
+<es:userLabel> </es:userLabel>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp4,vsDataVpcTp=1,vsDataVclTp=vc35-x</es:vclTpId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal0TpVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b1a1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2PathVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2PathVccTp>
+
+<es:aal2PathOwner>true</es:aal2PathOwner>
+<es:alarmReport>2</es:alarmReport>
+<es:nomPmBlocksize>1024</es:nomPmBlocksize>
+<es:timerCu>10</es:timerCu>
+<es:userLabel> </es:userLabel>
+<es:administrativeState>1</es:administrativeState>
+<es:continuityCheck>false</es:continuityCheck>
+<es:aal2PathId>1</es:aal2PathId>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp1,vsDataVpcTp=1,vsDataVclTp=vc39</es:vclTpId>
+<es:aal2QoSAvailableProfiles>15</es:aal2QoSAvailableProfiles>
+<es:aal2QoSProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal2QosProfile=1</es:aal2QoSProfileId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal2PathVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b2a1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2PathVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2PathVccTp>
+
+<es:aal2PathOwner>true</es:aal2PathOwner>
+<es:alarmReport>2</es:alarmReport>
+<es:nomPmBlocksize>1024</es:nomPmBlocksize>
+<es:timerCu>10</es:timerCu>
+<es:userLabel> </es:userLabel>
+<es:administrativeState>1</es:administrativeState>
+<es:continuityCheck>false</es:continuityCheck>
+<es:aal2PathId>1</es:aal2PathId>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp2,vsDataVpcTp=1,vsDataVclTp=vc39</es:vclTpId>
+<es:aal2QoSAvailableProfiles>15</es:aal2QoSAvailableProfiles>
+<es:aal2QoSProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal2QosProfile=1</es:aal2QoSProfileId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal2PathVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b3a1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2PathVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2PathVccTp>
+
+<es:aal2PathOwner>true</es:aal2PathOwner>
+<es:alarmReport>2</es:alarmReport>
+<es:nomPmBlocksize>1024</es:nomPmBlocksize>
+<es:timerCu>10</es:timerCu>
+<es:userLabel> </es:userLabel>
+<es:administrativeState>1</es:administrativeState>
+<es:continuityCheck>false</es:continuityCheck>
+<es:aal2PathId>1</es:aal2PathId>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp3,vsDataVpcTp=1,vsDataVclTp=vc39</es:vclTpId>
+<es:aal2QoSAvailableProfiles>15</es:aal2QoSAvailableProfiles>
+<es:aal2QoSProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal2QosProfile=1</es:aal2QoSProfileId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal2PathVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="b4a1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2PathVccTp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2PathVccTp>
+
+<es:aal2PathOwner>true</es:aal2PathOwner>
+<es:alarmReport>2</es:alarmReport>
+<es:nomPmBlocksize>1024</es:nomPmBlocksize>
+<es:timerCu>10</es:timerCu>
+<es:userLabel> </es:userLabel>
+<es:administrativeState>1</es:administrativeState>
+<es:continuityCheck>false</es:continuityCheck>
+<es:aal2PathId>1</es:aal2PathId>
+<es:vclTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAtmPort=MS-24-1,vsDataVplTp=Vp4,vsDataVpcTp=1,vsDataVclTp=vc39</es:vclTpId>
+<es:aal2QoSAvailableProfiles>15</es:aal2QoSAvailableProfiles>
+<es:aal2QoSProfileId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal2QosProfile=1</es:aal2QoSProfileId>
+<es:counterMode>6</es:counterMode>
+<es:counterActivation>false</es:counterActivation>
+</es:vsDataAal2PathVccTp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2QosProfile</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2QosProfile>
+
+<es:profileClassA>
+<es:boundOnProbOfDelay>500000</es:boundOnProbOfDelay>
+<es:boundOnProbOfLoss>500000</es:boundOnProbOfLoss>
+<es:boundOnNodeDelay>5000</es:boundOnNodeDelay></es:profileClassA>
+<es:profileClassB>
+<es:boundOnProbOfDelay>500000</es:boundOnProbOfDelay>
+<es:boundOnProbOfLoss>500000</es:boundOnProbOfLoss>
+<es:boundOnNodeDelay>15000</es:boundOnNodeDelay></es:profileClassB>
+<es:profileClassC>
+<es:boundOnProbOfDelay>1000000000</es:boundOnProbOfDelay>
+<es:boundOnProbOfLoss>1000000000</es:boundOnProbOfLoss>
+<es:boundOnNodeDelay>25000</es:boundOnNodeDelay></es:profileClassC>
+<es:profileClassD>
+<es:boundOnProbOfDelay>1000000000</es:boundOnProbOfDelay>
+<es:boundOnProbOfLoss>1000000000</es:boundOnProbOfLoss>
+<es:boundOnNodeDelay>50000</es:boundOnNodeDelay></es:profileClassD>
+<es:userLabel> </es:userLabel>
+</es:vsDataAal2QosProfile>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2QosCodePointProfile</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2QosCodePointProfile>
+
+<es:userLabel> </es:userLabel>
+<es:qualityOfServiceCodePointA>0</es:qualityOfServiceCodePointA>
+<es:qualityOfServiceCodePointB>0</es:qualityOfServiceCodePointB>
+<es:qualityOfServiceCodePointC>0</es:qualityOfServiceCodePointC>
+<es:qualityOfServiceCodePointD>0</es:qualityOfServiceCodePointD>
+</es:vsDataAal2QosCodePointProfile>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataAal2RoutingCase</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataAal2RoutingCase>
+
+<es:userLabel> </es:userLabel>
+<es:numberDirection> </es:numberDirection>
+<es:routeList></es:routeList>
+<es:routePriorityList></es:routePriorityList>
+</es:vsDataAal2RoutingCase>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIpSystem</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpSystem>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataIpSystem>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataEquipment</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataEquipment />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSpDevicePool</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSpDevicePool />
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSpDevicePool</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSpDevicePool />
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSpDevicePool</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSpDevicePool />
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="MS" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSubrack</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSubrack />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes><xn:VsDataContainer id="ET-M4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataExchangeTerminal</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataExchangeTerminal>
+
+
+<es:userLabel> </es:userLabel>
+</es:vsDataExchangeTerminal></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ET-M4" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataExchangeTerminal</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataExchangeTerminal>
+
+
+<es:userLabel> </es:userLabel>
+</es:vsDataExchangeTerminal>
+</xn:attributes><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataOs155SpiTtp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataOs155SpiTtp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:lineNo>1</es:lineNo>
+<es:standardMode>0</es:standardMode>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+<es:muxMode>0</es:muxMode>
+<es:msDegThreshold>30</es:msDegThreshold>
+<es:msDegM>7</es:msDegM>
+<es:msRdiReporting>false</es:msRdiReporting>
+<es:msAisReporting>false</es:msAisReporting>
+<es:loopBack>0</es:loopBack>
+</es:vsDataOs155SpiTtp></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataOs155SpiTtp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataOs155SpiTtp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:lineNo>1</es:lineNo>
+<es:standardMode>0</es:standardMode>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+<es:muxMode>0</es:muxMode>
+<es:msDegThreshold>30</es:msDegThreshold>
+<es:msDegM>7</es:msDegM>
+<es:msRdiReporting>false</es:msRdiReporting>
+<es:msAisReporting>false</es:msAisReporting>
+<es:loopBack>0</es:loopBack>
+</es:vsDataOs155SpiTtp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc4Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc4Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:pathTraceFormat>16</es:pathTraceFormat>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:auAisReporting>false</es:auAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+</es:vsDataVc4Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="31" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="32" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="33" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="34" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="35" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="36" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="37" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="38" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="39" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="40" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="41" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="42" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="43" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="44" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="45" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="46" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="47" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="48" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="49" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="50" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="51" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="52" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="53" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="54" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="55" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="56" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="57" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="58" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="59" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="60" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="61" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="62" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="63" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVc12Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVc12Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:vcDegThreshold>30</es:vcDegThreshold>
+<es:vcDegM>7</es:vcDegM>
+<es:tuAisReporting>false</es:tuAisReporting>
+<es:vcRdiReporting>false</es:vcRdiReporting>
+<es:administrativeState>0</es:administrativeState>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataVc12Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataE1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSts3CspeTtp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataSts3CspeTtp>
+
+<es:userLabel> </es:userLabel>
+<es:aisPReporting>false</es:aisPReporting>
+<es:rdiPReporting>false</es:rdiPReporting>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+</es:vsDataSts3CspeTtp>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSts1SpeTtp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataSts1SpeTtp>
+
+<es:userLabel> </es:userLabel>
+<es:aisPReporting>false</es:aisPReporting>
+<es:rdiPReporting>false</es:rdiPReporting>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+</es:vsDataSts1SpeTtp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSts1SpeTtp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataSts1SpeTtp>
+
+<es:userLabel> </es:userLabel>
+<es:aisPReporting>false</es:aisPReporting>
+<es:rdiPReporting>false</es:rdiPReporting>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+</es:vsDataSts1SpeTtp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSts1SpeTtp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataSts1SpeTtp>
+
+<es:userLabel> </es:userLabel>
+<es:aisPReporting>false</es:aisPReporting>
+<es:rdiPReporting>false</es:rdiPReporting>
+<es:timConsequentAction>false</es:timConsequentAction>
+<es:expectedPathTrace> </es:expectedPathTrace>
+<es:transmittedPathTrace> </es:transmittedPathTrace>
+</es:vsDataSts1SpeTtp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataVt15Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataVt15Ttp>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:aisVreporting>false</es:aisVreporting>
+<es:rdiVreporting>false</es:rdiVreporting>
+<es:shutDownTimer>1800</es:shutDownTimer>
+</es:vsDataVt15Ttp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataT1Ttp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1Ttp>
+
+<es:userLabel> </es:userLabel>
+<es:aisReporting>false</es:aisReporting>
+<es:rdiReporting>false</es:rdiReporting>
+<es:idlePattern>0</es:idlePattern>
+</es:vsDataT1Ttp>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataE3PhysPathTerm</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE3PhysPathTerm>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+<es:lineNo>1</es:lineNo>
+<es:loopback>0</es:loopback>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:rdiReporting>false</es:rdiReporting>
+<es:aisReporting>false</es:aisReporting>
+</es:vsDataE3PhysPathTerm>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataT3PhysPathTerm</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT3PhysPathTerm>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+<es:lineNo>1</es:lineNo>
+<es:loopback>0</es:loopback>
+<es:rdiReporting>false</es:rdiReporting>
+<es:aisReporting>false</es:aisReporting>
+</es:vsDataT3PhysPathTerm>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataE1PhysPathTerm</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataE1PhysPathTerm>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:lineNo>1</es:lineNo>
+<es:loopback>0</es:loopback>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:rdiReporting>false</es:rdiReporting>
+<es:aisReporting>false</es:aisReporting>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataE1PhysPathTerm></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ta1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataE1PhysPathTerm</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataE1PhysPathTerm>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:lineNo>1</es:lineNo>
+<es:loopback>0</es:loopback>
+<es:crc4Mode>1</es:crc4Mode>
+<es:idlePattern>0</es:idlePattern>
+<es:degDegThr>30</es:degDegThr>
+<es:degDegM>7</es:degDegM>
+<es:rdiReporting>false</es:rdiReporting>
+<es:aisReporting>false</es:aisReporting>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataE1PhysPathTerm>
+</xn:attributes>
+<xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataDs0Bundle</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataDs0Bundle>
+
+<es:userLabel> </es:userLabel>
+<es:listOfTimeSlots></es:listOfTimeSlots>
+<es:tdmMode>true</es:tdmMode>
+</es:vsDataDs0Bundle>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataJ1PhysPathTerm</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataJ1PhysPathTerm>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:lineNo>1</es:lineNo>
+<es:loopback>0</es:loopback>
+<es:idlePattern>0</es:idlePattern>
+<es:physicalLineType>0</es:physicalLineType>
+<es:degThreshold>6</es:degThreshold>
+<es:rdiReporting>false</es:rdiReporting>
+<es:aisReporting>false</es:aisReporting>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+</es:vsDataJ1PhysPathTerm>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataT1PhysPathTerm</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataT1PhysPathTerm>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:lineNo>1</es:lineNo>
+<es:loopback>0</es:loopback>
+<es:rdiReporting>false</es:rdiReporting>
+<es:aisReporting>false</es:aisReporting>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+<es:idlePattern>0</es:idlePattern>
+<es:transmissionMode>0</es:transmissionMode>
+</es:vsDataT1PhysPathTerm>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer><xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEtMfg</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataEtMfg>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataEtMfg></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ta1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataEtMfg</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEtMfg>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataEtMfg>
+</xn:attributes>
+<xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGigaBitEthernet</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGigaBitEthernet>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:dscpPbitMap></es:dscpPbitMap>
+<es:autoNegotiation>true</es:autoNegotiation>
+<es:frameFormat>0</es:frameFormat>
+<es:primaryLink>0</es:primaryLink>
+<es:protectiveMode>true</es:protectiveMode>
+<es:shutDownTimeout>1800</es:shutDownTimeout>
+<es:statePropagationDelay>25</es:statePropagationDelay>
+<es:switchBackTimer>30</es:switchBackTimer>
+</es:vsDataGigaBitEthernet>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer><xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGeneralProcessorUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataGeneralProcessorUnit>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataGeneralProcessorUnit></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ta1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataGeneralProcessorUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGeneralProcessorUnit>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataGeneralProcessorUnit>
+</xn:attributes>
+<xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFastEthernet</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFastEthernet>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel> </es:userLabel>
+<es:defaultRouter> </es:defaultRouter>
+<es:mtu>1500</es:mtu>
+<es:networkPrefixLength>0</es:networkPrefixLength>
+</es:vsDataFastEthernet>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="ta1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataMediumAccessUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataMediumAccessUnit>
+
+<es:userLabel> </es:userLabel>
+<es:connectorLabel>Eth</es:connectorLabel>
+</es:vsDataMediumAccessUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSlot</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSlot />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPlugInUnit</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPlugInUnit>
+
+<es:administrativeState>0</es:administrativeState>
+<es:allowedSeqRestarts>3</es:allowedSeqRestarts>
+<es:piuGroupNumber>0</es:piuGroupNumber>
+<es:piuType>0</es:piuType>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataPlugInUnit>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSystemFunctions</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataSystemFunctions />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataPmService</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPmService>
+
+<es:minorAlarmCeasingDelta>5</es:minorAlarmCeasingDelta>
+<es:warningAlarmLimitPercent>80</es:warningAlarmLimitPercent>
+<es:warningAlarmCeasingDelta>5</es:warningAlarmCeasingDelta>
+</es:vsDataPmService>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataLicensing</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataLicensing />
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataRncFeature</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRncFeature>
+
+<es:featureState>0</es:featureState>
+
+
+
+
+</es:vsDataRncFeature>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIpOam</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpOam>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataIpOam>
+</xn:attributes><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataIp>
+
+<es:dnsServer>127.0.0.1</es:dnsServer>
+<es:isRecursiveSearch>true</es:isRecursiveSearch>
+<es:isSubDomainName>true</es:isSubDomainName>
+<es:userLabel> </es:userLabel>
+<es:retransInterval>4</es:retransInterval>
+<es:noOfRetrans>5</es:noOfRetrans>
+<es:isDefDomainName>false</es:isDefDomainName>
+<es:defDomainName> </es:defDomainName>
+<es:useHostFile>true</es:useHostFile>
+<es:dscp>0</es:dscp>
+<es:icmpRedirect>true</es:icmpRedirect>
+<es:udpChecksumState>1</es:udpChecksumState>
+<es:connectionAttemptTimer>75</es:connectionAttemptTimer>
+<es:maxRetransmissionAttempts>10</es:maxRetransmissionAttempts>
+<es:workingMode>0</es:workingMode>
+</es:vsDataIp></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIp</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIp>
+
+<es:dnsServer>127.0.0.1</es:dnsServer>
+<es:isRecursiveSearch>true</es:isRecursiveSearch>
+<es:isSubDomainName>true</es:isSubDomainName>
+<es:userLabel> </es:userLabel>
+<es:retransInterval>4</es:retransInterval>
+<es:noOfRetrans>5</es:noOfRetrans>
+<es:isDefDomainName>false</es:isDefDomainName>
+<es:defDomainName> </es:defDomainName>
+<es:useHostFile>true</es:useHostFile>
+<es:dscp>0</es:dscp>
+<es:icmpRedirect>true</es:icmpRedirect>
+<es:udpChecksumState>1</es:udpChecksumState>
+<es:connectionAttemptTimer>75</es:connectionAttemptTimer>
+<es:maxRetransmissionAttempts>10</es:maxRetransmissionAttempts>
+<es:workingMode>0</es:workingMode>
+</es:vsDataIp>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIpRoutingTable</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpRoutingTable>
+
+
+<es:userLabel> </es:userLabel>
+</es:vsDataIpRoutingTable>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEthernetLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEthernetLink>
+
+<es:ipAddress> </es:ipAddress>
+<es:subnetMask> </es:subnetMask>
+<es:broadcastAddress> </es:broadcastAddress>
+
+
+<es:metric>1</es:metric>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataEthernetLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIpAtmLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpAtmLink>
+
+
+<es:ipAddress> </es:ipAddress>
+<es:metric>1</es:metric>
+<es:monitor>true</es:monitor>
+<es:monitorInterval>10</es:monitorInterval>
+<es:monitorRetries>10</es:monitorRetries>
+<es:mtuSize>1500</es:mtuSize>
+<es:subnetMask> </es:subnetMask>
+<es:userLabel> </es:userLabel>
+<es:aal5TpVccTpId>0</es:aal5TpVccTpId>
+</es:vsDataIpAtmLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1-1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIpAtmLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpAtmLink>
+
+
+<es:ipAddress> </es:ipAddress>
+<es:metric>1</es:metric>
+<es:monitor>true</es:monitor>
+<es:monitorInterval>10</es:monitorInterval>
+<es:monitorRetries>10</es:monitorRetries>
+<es:mtuSize>1500</es:mtuSize>
+<es:subnetMask> </es:subnetMask>
+<es:userLabel> </es:userLabel>
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b1-x1</es:aal5TpVccTpId>
+</es:vsDataIpAtmLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1-2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIpAtmLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpAtmLink>
+
+
+<es:ipAddress> </es:ipAddress>
+<es:metric>1</es:metric>
+<es:monitor>true</es:monitor>
+<es:monitorInterval>10</es:monitorInterval>
+<es:monitorRetries>10</es:monitorRetries>
+<es:mtuSize>1500</es:mtuSize>
+<es:subnetMask> </es:subnetMask>
+<es:userLabel> </es:userLabel>
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b1-x2</es:aal5TpVccTpId>
+</es:vsDataIpAtmLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2-1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIpAtmLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpAtmLink>
+
+
+<es:ipAddress> </es:ipAddress>
+<es:metric>1</es:metric>
+<es:monitor>true</es:monitor>
+<es:monitorInterval>10</es:monitorInterval>
+<es:monitorRetries>10</es:monitorRetries>
+<es:mtuSize>1500</es:mtuSize>
+<es:subnetMask> </es:subnetMask>
+<es:userLabel> </es:userLabel>
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b2-x1</es:aal5TpVccTpId>
+</es:vsDataIpAtmLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2-2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIpAtmLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpAtmLink>
+
+
+<es:ipAddress> </es:ipAddress>
+<es:metric>1</es:metric>
+<es:monitor>true</es:monitor>
+<es:monitorInterval>10</es:monitorInterval>
+<es:monitorRetries>10</es:monitorRetries>
+<es:mtuSize>1500</es:mtuSize>
+<es:subnetMask> </es:subnetMask>
+<es:userLabel> </es:userLabel>
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b2-x2</es:aal5TpVccTpId>
+</es:vsDataIpAtmLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3-1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIpAtmLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpAtmLink>
+
+
+<es:ipAddress> </es:ipAddress>
+<es:metric>1</es:metric>
+<es:monitor>true</es:monitor>
+<es:monitorInterval>10</es:monitorInterval>
+<es:monitorRetries>10</es:monitorRetries>
+<es:mtuSize>1500</es:mtuSize>
+<es:subnetMask> </es:subnetMask>
+<es:userLabel> </es:userLabel>
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b3-x1</es:aal5TpVccTpId>
+</es:vsDataIpAtmLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3-2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIpAtmLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpAtmLink>
+
+
+<es:ipAddress> </es:ipAddress>
+<es:metric>1</es:metric>
+<es:monitor>true</es:monitor>
+<es:monitorInterval>10</es:monitorInterval>
+<es:monitorRetries>10</es:monitorRetries>
+<es:mtuSize>1500</es:mtuSize>
+<es:subnetMask> </es:subnetMask>
+<es:userLabel> </es:userLabel>
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b3-x2</es:aal5TpVccTpId>
+</es:vsDataIpAtmLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4-1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIpAtmLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpAtmLink>
+
+
+<es:ipAddress> </es:ipAddress>
+<es:metric>1</es:metric>
+<es:monitor>true</es:monitor>
+<es:monitorInterval>10</es:monitorInterval>
+<es:monitorRetries>10</es:monitorRetries>
+<es:mtuSize>1500</es:mtuSize>
+<es:subnetMask> </es:subnetMask>
+<es:userLabel> </es:userLabel>
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b4-x1</es:aal5TpVccTpId>
+</es:vsDataIpAtmLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4-2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIpAtmLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIpAtmLink>
+
+
+<es:ipAddress> </es:ipAddress>
+<es:metric>1</es:metric>
+<es:monitor>true</es:monitor>
+<es:monitorInterval>10</es:monitorInterval>
+<es:monitorRetries>10</es:monitorRetries>
+<es:mtuSize>1500</es:mtuSize>
+<es:subnetMask> </es:subnetMask>
+<es:userLabel> </es:userLabel>
+<es:aal5TpVccTpId>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataAal5TpVccTp=b4-x2</es:aal5TpVccTpId>
+</es:vsDataIpAtmLink>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataOspf</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataOspf>
+
+<es:ipMo>0</es:ipMo>
+<es:ospfASBdrRtrStatus>false</es:ospfASBdrRtrStatus>
+
+<es:ospfRouterId> </es:ospfRouterId>
+<es:recoverTopoDb>true</es:recoverTopoDb>
+<es:topoDbStoreInterv>60</es:topoDbStoreInterv>
+<es:userLabel> </es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+</es:vsDataOspf></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataOspf</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataOspf>
+
+<es:ipMo>0</es:ipMo>
+<es:ospfASBdrRtrStatus>false</es:ospfASBdrRtrStatus>
+
+<es:ospfRouterId> </es:ospfRouterId>
+<es:recoverTopoDb>true</es:recoverTopoDb>
+<es:topoDbStoreInterv>60</es:topoDbStoreInterv>
+<es:userLabel> </es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+</es:vsDataOspf>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataOspfInterface</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataOspfInterface>
+
+<es:helloInterval>10</es:helloInterval>
+<es:interfacePriority>1</es:interfacePriority>
+<es:interfaceTransitDelay>1</es:interfaceTransitDelay>
+<es:lsaTransmissionInterval>5</es:lsaTransmissionInterval>
+<es:ospfAreaRelated>0</es:ospfAreaRelated>
+<es:relatedLink>0</es:relatedLink>
+<es:routerDeadInterval>40</es:routerDeadInterval>
+<es:userLabel> </es:userLabel>
+</es:vsDataOspfInterface>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataOspfArea</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataOspfArea>
+
+<es:areaId> </es:areaId>
+
+<es:importExternalLsa>true</es:importExternalLsa>
+<es:sendAreaSummary>false</es:sendAreaSummary>
+<es:stubArea>false</es:stubArea>
+<es:stubAreaMetric>1</es:stubAreaMetric>
+<es:stubAreaMetricType>0</es:stubAreaMetricType>
+<es:userLabel> </es:userLabel>
+<es:range0>
+<es:ipAddress></es:ipAddress>
+<es:subnetMask></es:subnetMask>
+<es:advertise>true</es:advertise></es:range0>
+
+
+</es:vsDataOspfArea>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<un:RncFunction id="1" modifier="update">
+<un:attributes>
+
+<un:userLabel>/proj/netsimproj/public/ftp/simulations/WRAN/R5/Standard/E/V2</un:userLabel>
+<un:mcc>353</un:mcc>
+<un:mnc>77</un:mnc>
+<un:rncId>1</un:rncId>
+</un:attributes>
+
+<un:IubLink id="1" modifier="create">
+<un:attributes>
+
+</un:attributes>
+</un:IubLink>
+
+<un:IubLink id="1" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIubLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIubLink>
+
+<es:rbsId>1</es:rbsId>
+<es:dlHwAdm>100</es:dlHwAdm>
+<es:ulHwAdm>100</es:ulHwAdm>
+
+<es:preferredSubrackRef>0</es:preferredSubrackRef>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIubLink>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataNodeSynch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNodeSynch>
+
+<es:userLabel> </es:userLabel>
+<es:phaseDiffThreshold>100</es:phaseDiffThreshold>
+
+
+<es:sampleIntervalSup>10</es:sampleIntervalSup>
+<es:fixedWindowSizeSup>10</es:fixedWindowSizeSup>
+<es:slidingWindowSize>100</es:slidingWindowSize>
+</es:vsDataNodeSynch>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataNbapCommon</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNbapCommon>
+
+<es:userLabel> </es:userLabel>
+<es:l2EstablishReqRetryT>5</es:l2EstablishReqRetryT>
+<es:activeUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b1ca</es:activeUniSaalTpRef>
+<es:standbyUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b1cb</es:standbyUniSaalTpRef>
+<es:administrativeState>0</es:administrativeState>
+</es:vsDataNbapCommon>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataNbapDedicated</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNbapDedicated>
+
+<es:l2EstablishReqRetryT>5</es:l2EstablishReqRetryT>
+<es:activeUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b1da</es:activeUniSaalTpRef>
+<es:standbyUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b1db</es:standbyUniSaalTpRef>
+<es:userLabel> </es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+</es:vsDataNbapDedicated>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIubEdch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIubEdch>
+
+<es:edchDataFrameDelayThreshold>60</es:edchDataFrameDelayThreshold>
+</es:vsDataIubEdch>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:IubLink>
+<un:IubLink id="2" modifier="create">
+<un:attributes>
+
+</un:attributes>
+</un:IubLink>
+
+<un:IubLink id="2" modifier="update">
+
+<xn:VsDataContainer id="2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIubLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIubLink>
+
+<es:rbsId>2</es:rbsId>
+<es:dlHwAdm>100</es:dlHwAdm>
+<es:ulHwAdm>100</es:ulHwAdm>
+
+<es:preferredSubrackRef>0</es:preferredSubrackRef>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIubLink>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataNodeSynch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNodeSynch>
+
+<es:userLabel> </es:userLabel>
+<es:phaseDiffThreshold>100</es:phaseDiffThreshold>
+
+
+<es:sampleIntervalSup>10</es:sampleIntervalSup>
+<es:fixedWindowSizeSup>10</es:fixedWindowSizeSup>
+<es:slidingWindowSize>100</es:slidingWindowSize>
+</es:vsDataNodeSynch>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataNbapCommon</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNbapCommon>
+
+<es:userLabel> </es:userLabel>
+<es:l2EstablishReqRetryT>5</es:l2EstablishReqRetryT>
+<es:activeUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b2ca</es:activeUniSaalTpRef>
+<es:standbyUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b2cb</es:standbyUniSaalTpRef>
+<es:administrativeState>0</es:administrativeState>
+</es:vsDataNbapCommon>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataNbapDedicated</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNbapDedicated>
+
+<es:l2EstablishReqRetryT>5</es:l2EstablishReqRetryT>
+<es:activeUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b2da</es:activeUniSaalTpRef>
+<es:standbyUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b2db</es:standbyUniSaalTpRef>
+<es:userLabel> </es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+</es:vsDataNbapDedicated>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIubEdch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIubEdch>
+
+<es:edchDataFrameDelayThreshold>60</es:edchDataFrameDelayThreshold>
+</es:vsDataIubEdch>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:IubLink>
+<un:IubLink id="3" modifier="create">
+<un:attributes>
+
+</un:attributes>
+</un:IubLink>
+
+<un:IubLink id="3" modifier="update">
+
+<xn:VsDataContainer id="3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIubLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIubLink>
+
+<es:rbsId>3</es:rbsId>
+<es:dlHwAdm>100</es:dlHwAdm>
+<es:ulHwAdm>100</es:ulHwAdm>
+
+<es:preferredSubrackRef>0</es:preferredSubrackRef>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIubLink>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataNodeSynch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNodeSynch>
+
+<es:userLabel> </es:userLabel>
+<es:phaseDiffThreshold>100</es:phaseDiffThreshold>
+
+
+<es:sampleIntervalSup>10</es:sampleIntervalSup>
+<es:fixedWindowSizeSup>10</es:fixedWindowSizeSup>
+<es:slidingWindowSize>100</es:slidingWindowSize>
+</es:vsDataNodeSynch>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataNbapCommon</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNbapCommon>
+
+<es:userLabel> </es:userLabel>
+<es:l2EstablishReqRetryT>5</es:l2EstablishReqRetryT>
+<es:activeUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b3ca</es:activeUniSaalTpRef>
+<es:standbyUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b3cb</es:standbyUniSaalTpRef>
+<es:administrativeState>0</es:administrativeState>
+</es:vsDataNbapCommon>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataNbapDedicated</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNbapDedicated>
+
+<es:l2EstablishReqRetryT>5</es:l2EstablishReqRetryT>
+<es:activeUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b3da</es:activeUniSaalTpRef>
+<es:standbyUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b3db</es:standbyUniSaalTpRef>
+<es:userLabel> </es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+</es:vsDataNbapDedicated>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIubEdch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIubEdch>
+
+<es:edchDataFrameDelayThreshold>60</es:edchDataFrameDelayThreshold>
+</es:vsDataIubEdch>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:IubLink>
+<un:IubLink id="4" modifier="create">
+<un:attributes>
+
+</un:attributes>
+</un:IubLink>
+
+<un:IubLink id="4" modifier="update">
+
+<xn:VsDataContainer id="4" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIubLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIubLink>
+
+<es:rbsId>4</es:rbsId>
+<es:dlHwAdm>100</es:dlHwAdm>
+<es:ulHwAdm>100</es:ulHwAdm>
+
+<es:preferredSubrackRef>0</es:preferredSubrackRef>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIubLink>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataNodeSynch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNodeSynch>
+
+<es:userLabel> </es:userLabel>
+<es:phaseDiffThreshold>100</es:phaseDiffThreshold>
+
+
+<es:sampleIntervalSup>10</es:sampleIntervalSup>
+<es:fixedWindowSizeSup>10</es:fixedWindowSizeSup>
+<es:slidingWindowSize>100</es:slidingWindowSize>
+</es:vsDataNodeSynch>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataNbapCommon</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNbapCommon>
+
+<es:userLabel> </es:userLabel>
+<es:l2EstablishReqRetryT>5</es:l2EstablishReqRetryT>
+<es:activeUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b4ca</es:activeUniSaalTpRef>
+<es:standbyUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b4cb</es:standbyUniSaalTpRef>
+<es:administrativeState>0</es:administrativeState>
+</es:vsDataNbapCommon>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataNbapDedicated</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataNbapDedicated>
+
+<es:l2EstablishReqRetryT>5</es:l2EstablishReqRetryT>
+<es:activeUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b4da</es:activeUniSaalTpRef>
+<es:standbyUniSaalTpRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,vsDataTransportNetwork=1,vsDataUniSaalTp=b4db</es:standbyUniSaalTpRef>
+<es:userLabel> </es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+</es:vsDataNbapDedicated>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIubEdch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIubEdch>
+
+<es:edchDataFrameDelayThreshold>60</es:edchDataFrameDelayThreshold>
+</es:vsDataIubEdch>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:IubLink>
+<un:UtranCell id="RNC01-1-1" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-1-1</un:userLabel>
+<un:cId>1</un:cId>
+<un:localCellId>1</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>5</un:uarfcnDl>
+<un:primaryScramblingCode>1</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=1</un:utranCellIubLink>
+<un:lac>3417</un:lac>
+<un:rac>3418</un:rac>
+<un:sac>3419</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-1-1" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=1</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=2</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=3</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=4</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=5</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=6</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=7</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=8</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=9</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50101</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-1-1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>1</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=1</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-1-1</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-1-1</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-1-1</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-1-1</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-1-1</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-1-1</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-1-2</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<un:UtranCell id="RNC01-1-2" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-1-2</un:userLabel>
+<un:cId>2</un:cId>
+<un:localCellId>2</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>5</un:uarfcnDl>
+<un:primaryScramblingCode>2</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=1</un:utranCellIubLink>
+<un:lac>3417</un:lac>
+<un:rac>3418</un:rac>
+<un:sac>3420</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-1-2" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50102</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50103</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=1</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=2</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=3</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=4</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=5</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=6</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=7</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=8</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-1-2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>2</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=1</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-1-2</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-1-2</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-1-2</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-1-2</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-1-2</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-1-2</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-1-3</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<un:UtranCell id="RNC01-1-3" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-1-3</un:userLabel>
+<un:cId>3</un:cId>
+<un:localCellId>3</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>5</un:uarfcnDl>
+<un:primaryScramblingCode>3</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=1</un:utranCellIubLink>
+<un:lac>3417</un:lac>
+<un:rac>3418</un:rac>
+<un:sac>3421</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-1-3" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=9</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50101</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50102</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50103</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=1</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=2</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=3</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=4</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=5</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=6</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-1-3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>3</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=1</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-1-3</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-1-3</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-1-3</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-1-3</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-1-3</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-1-3</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-1-1</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<un:UtranCell id="RNC01-2-1" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-2-1</un:userLabel>
+<un:cId>4</un:cId>
+<un:localCellId>1</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>6</un:uarfcnDl>
+<un:primaryScramblingCode>4</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=2</un:utranCellIubLink>
+<un:lac>3422</un:lac>
+<un:rac>3423</un:rac>
+<un:sac>3424</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-2-1" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=7</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=8</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=9</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50101</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50102</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50103</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=1</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=2</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=3</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=4</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-2-1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>1</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=2</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-2-1</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-2-1</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-2-1</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-2-1</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-2-1</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-2-1</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-2-2</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<un:UtranCell id="RNC01-2-2" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-2-2</un:userLabel>
+<un:cId>5</un:cId>
+<un:localCellId>2</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>6</un:uarfcnDl>
+<un:primaryScramblingCode>5</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=2</un:utranCellIubLink>
+<un:lac>3422</un:lac>
+<un:rac>3423</un:rac>
+<un:sac>3425</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-2-2" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=5</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=6</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=7</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=8</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=9</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50101</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50102</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50103</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=1</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=2</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-2-2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>2</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=2</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-2-2</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-2-2</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-2-2</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-2-2</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-2-2</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-2-2</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-2-3</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<un:UtranCell id="RNC01-2-3" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-2-3</un:userLabel>
+<un:cId>6</un:cId>
+<un:localCellId>3</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>6</un:uarfcnDl>
+<un:primaryScramblingCode>6</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=2</un:utranCellIubLink>
+<un:lac>3422</un:lac>
+<un:rac>3423</un:rac>
+<un:sac>3426</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-2-3" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=3</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=4</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=5</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=6</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=7</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=8</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=9</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50101</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50102</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50103</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-2-3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>3</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=2</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-2-3</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-2-3</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-2-3</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-2-3</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-2-3</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-2-3</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-2-1</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<un:UtranCell id="RNC01-3-1" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-3-1</un:userLabel>
+<un:cId>7</un:cId>
+<un:localCellId>1</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>7</un:uarfcnDl>
+<un:primaryScramblingCode>7</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=3</un:utranCellIubLink>
+<un:lac>3427</un:lac>
+<un:rac>3428</un:rac>
+<un:sac>3429</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-3-1" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=1</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=2</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=3</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=4</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=5</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=6</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=7</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=8</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=9</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50101</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-3-1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>1</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=3</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-3-1</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-3-1</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-3-1</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-3-1</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-3-1</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-3-1</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-3-2</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<un:UtranCell id="RNC01-3-2" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-3-2</un:userLabel>
+<un:cId>8</un:cId>
+<un:localCellId>2</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>7</un:uarfcnDl>
+<un:primaryScramblingCode>8</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=3</un:utranCellIubLink>
+<un:lac>3427</un:lac>
+<un:rac>3428</un:rac>
+<un:sac>3430</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-3-2" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50102</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50103</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=1</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=2</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=3</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=4</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=5</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=6</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=7</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=8</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-3-2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>2</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=3</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-3-2</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-3-2</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-3-2</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-3-2</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-3-2</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-3-2</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-3-3</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<un:UtranCell id="RNC01-3-3" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-3-3</un:userLabel>
+<un:cId>9</un:cId>
+<un:localCellId>3</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>7</un:uarfcnDl>
+<un:primaryScramblingCode>9</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=3</un:utranCellIubLink>
+<un:lac>3427</un:lac>
+<un:rac>3428</un:rac>
+<un:sac>3431</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-3-3" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=9</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50101</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50102</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50103</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=1</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=2</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=3</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=4</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=5</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=6</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-3-3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>3</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=3</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-3-3</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-3-3</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-3-3</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-3-3</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-3-3</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-3-3</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-3-1</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<un:UtranCell id="RNC01-4-1" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-4-1</un:userLabel>
+<un:cId>10</un:cId>
+<un:localCellId>1</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>8</un:uarfcnDl>
+<un:primaryScramblingCode>10</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=4</un:utranCellIubLink>
+<un:lac>3432</un:lac>
+<un:rac>3433</un:rac>
+<un:sac>3434</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-4-1" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=7</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=8</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=9</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50101</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50102</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50103</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=1</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=2</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=3</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=4</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-4-1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>1</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=4</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-4-1</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-4-1</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-4-1</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-4-1</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-4-1</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-4-1</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-4-2</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<un:UtranCell id="RNC01-4-2" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-4-2</un:userLabel>
+<un:cId>11</un:cId>
+<un:localCellId>2</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>8</un:uarfcnDl>
+<un:primaryScramblingCode>11</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=4</un:utranCellIubLink>
+<un:lac>3432</un:lac>
+<un:rac>3433</un:rac>
+<un:sac>3435</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-4-2" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=5</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=6</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=7</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=8</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=9</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50101</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50102</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50103</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=1</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=2</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-4-2" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>2</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=4</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-4-2</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-4-2</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-4-2</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-4-2</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-4-2</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-4-2</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-4-3</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<un:UtranCell id="RNC01-4-3" modifier="create">
+<un:attributes>
+
+<un:userLabel>RNC01-4-3</un:userLabel>
+<un:cId>12</un:cId>
+<un:localCellId>3</un:localCellId>
+<un:uarfcnUl>12</un:uarfcnUl>
+<un:uarfcnDl>8</un:uarfcnDl>
+<un:primaryScramblingCode>12</un:primaryScramblingCode>
+<un:primaryCpichPower>300</un:primaryCpichPower>
+<un:maximumTransmissionPower>400</un:maximumTransmissionPower>
+<un:primarySchPower>-18</un:primarySchPower>
+<un:secondarySchPower>-35</un:secondarySchPower>
+<un:bchPower>-31</un:bchPower>
+<un:utranCellIubLink>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=4</un:utranCellIubLink>
+<un:lac>3432</un:lac>
+<un:rac>3433</un:rac>
+<un:sac>3436</un:sac>
+</un:attributes>
+</un:UtranCell>
+
+<un:UtranCell id="RNC01-4-3" modifier="update">
+
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>1</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>2</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>3</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>4</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>5</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>6</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>7</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>8</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>9</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>10</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="11" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>11</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="12" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>12</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="13" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>13</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="14" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>14</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="15" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>15</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="16" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>16</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="17" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>17</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="18" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>18</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="19" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>19</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="20" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>20</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="21" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>21</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="22" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>22</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="23" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>23</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="24" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>24</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="25" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>25</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="26" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>26</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="27" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>27</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="28" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>28</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="29" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>29</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="30" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranRelation>
+
+<es:qOffset1sn>0</es:qOffset1sn>
+<es:qOffset2sn>0</es:qOffset2sn>
+<es:loadSharingCandidate>0</es:loadSharingCandidate>
+<es:selectionPriority>30</es:selectionPriority>
+
+<es:hcsSib11Config>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs>
+<es:penaltyTime>0</es:penaltyTime>
+<es:temporaryOffset1>0</es:temporaryOffset1>
+<es:temporaryOffset2>0</es:temporaryOffset2></es:hcsSib11Config>
+</es:vsDataUtranRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>31</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=3</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>32</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=4</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>33</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=5</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>34</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=6</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>35</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=7</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>36</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=8</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>37</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=9</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>38</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50101</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>39</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50102</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataGsmRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataGsmRelation>
+
+<es:qOffset1sn>7</es:qOffset1sn>
+<es:mobilityRelationType>0</es:mobilityRelationType>
+<es:selectionPriority>40</es:selectionPriority>
+<es:externalGsmCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,ExternalGsmNetwork=84,ExternalGsmCell=50103</es:externalGsmCellRef>
+</es:vsDataGsmRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="RNC01-4-3" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranCell</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranCell>
+
+<es:tCell>3</es:tCell>
+<es:cellReserved>1</es:cellReserved>
+<es:treSelection>2</es:treSelection>
+<es:qualMeasQuantity>2</es:qualMeasQuantity>
+<es:qHyst1>4</es:qHyst1>
+<es:qHyst2>4</es:qHyst2>
+<es:qQualMin>-24</es:qQualMin>
+<es:qRxLevMin>-115</es:qRxLevMin>
+<es:individualOffset>0</es:individualOffset>
+<es:pwrAdm>75</es:pwrAdm>
+<es:pwrOffset>5</es:pwrOffset>
+<es:pwrHyst>300</es:pwrHyst>
+<es:tmCongAction>2000</es:tmCongAction>
+<es:releaseAseDl>1</es:releaseAseDl>
+<es:aseDlAdm>240</es:aseDlAdm>
+<es:dlCodeAdm>80</es:dlCodeAdm>
+<es:aseUlAdm>160</es:aseUlAdm>
+<es:sf8Adm>8</es:sf8Adm>
+<es:sf32Adm>32</es:sf32Adm>
+<es:minPwrRl>-150</es:minPwrRl>
+<es:maxRate>40690</es:maxRate>
+<es:interRate>7760</es:interRate>
+<es:minimumRate>1590</es:minimumRate>
+<es:maxPwrMax>48</es:maxPwrMax>
+<es:interPwrMax>38</es:interPwrMax>
+<es:minPwrMax>0</es:minPwrMax>
+<es:compModeAdm>15</es:compModeAdm>
+<es:iFHyst>6000</es:iFHyst>
+<es:iFCong>621</es:iFCong>
+<es:interFreqFddMeasIndicator>0</es:interFreqFddMeasIndicator>
+<es:sRatSearch>4</es:sRatSearch>
+<es:sIntraSearch>0</es:sIntraSearch>
+<es:sInterSearch>0</es:sInterSearch>
+<es:fachMeasOccaCycLenCoeff>0</es:fachMeasOccaCycLenCoeff>
+
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:accessClassNBarred>0</es:accessClassNBarred>
+<es:accessClassNBarred>1</es:accessClassNBarred>
+<es:utranCellPosition></es:utranCellPosition>
+<es:maxTxPowerUl>24</es:maxTxPowerUl>
+
+<es:sib1PlmnScopeValueTag>0</es:sib1PlmnScopeValueTag>
+<es:sf16Adm>16</es:sf16Adm>
+<es:hoType>1</es:hoType>
+<es:usedFreqThresh2dEcno>-12</es:usedFreqThresh2dEcno>
+<es:usedFreqThresh2dRscp>-97</es:usedFreqThresh2dRscp>
+<es:administrativeState>0</es:administrativeState>
+<es:loadSharingGsmThreshold>75</es:loadSharingGsmThreshold>
+<es:loadSharingGsmFraction>100</es:loadSharingGsmFraction>
+<es:nInSyncInd>3</es:nInSyncInd>
+<es:rlFailureT>10</es:rlFailureT>
+<es:nOutSyncInd>10</es:nOutSyncInd>
+<es:sf4AdmUl>0</es:sf4AdmUl>
+<es:hardIfhoCorr>3</es:hardIfhoCorr>
+<es:hsdpaUsersAdm>10</es:hsdpaUsersAdm>
+<es:loadSharingMargin>0</es:loadSharingMargin>
+<es:sHcsRat>-105</es:sHcsRat>
+<es:sf16gAdm>16</es:sf16gAdm>
+<es:releaseAseDlNg>3</es:releaseAseDlNg>
+<es:tmCongActionNg>800</es:tmCongActionNg>
+<es:tmInitialG>3000</es:tmInitialG>
+<es:sf16AdmUl>16</es:sf16AdmUl>
+<es:sf8AdmUl>8</es:sf8AdmUl>
+<es:sf8gAdmUl>0</es:sf8gAdmUl>
+<es:iubLinkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,IubLink=4</es:iubLinkRef>
+<es:eulNonServingCellUsersAdm>100</es:eulNonServingCellUsersAdm>
+<es:eulServingCellUsersAdm>32</es:eulServingCellUsersAdm>
+<es:agpsEnabled>1</es:agpsEnabled>
+<es:codeLoadThresholdDlSf128>100</es:codeLoadThresholdDlSf128>
+<es:pwrLoadThresholdDlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:pwrLoadThresholdDlSpeech>
+<es:aseLoadThresholdUlSpeech>
+<es:amr12200>100</es:amr12200>
+<es:amr7950>100</es:amr7950>
+<es:amr5900>100</es:amr5900></es:aseLoadThresholdUlSpeech>
+
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>0</es:accessClassesBarredCs>
+<es:accessClassesBarredCs>1</es:accessClassesBarredCs>
+
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>0</es:accessClassesBarredPs>
+<es:accessClassesBarredPs>1</es:accessClassesBarredPs>
+<es:rateSelectionPsInteractive>
+<es:channelType>0</es:channelType>
+<es:ulPrefRate>64</es:ulPrefRate>
+<es:dlPrefRate>64</es:dlPrefRate></es:rateSelectionPsInteractive>
+<es:hcsUsage>
+<es:idleMode>0</es:idleMode>
+<es:connectedMode>0</es:connectedMode></es:hcsUsage>
+<es:hcsSib3Config>
+<es:sSearchHcs>-105</es:sSearchHcs>
+<es:hcsPrio>0</es:hcsPrio>
+<es:qHcs>0</es:qHcs></es:hcsSib3Config>
+</es:vsDataUtranCell>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataFach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataFach>
+
+<es:userLabel>Fach-4-3</es:userLabel>
+<es:maxFach1Power>18</es:maxFach1Power>
+<es:maxFach2Power>15</es:maxFach2Power>
+<es:sccpchOffset>0</es:sccpchOffset>
+<es:pOffset1Fach>0</es:pOffset1Fach>
+<es:pOffset3Fach>0</es:pOffset3Fach>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataFach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRach</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRach>
+
+<es:userLabel>Rach-4-3</es:userLabel>
+<es:scramblingCodeWordNo>0</es:scramblingCodeWordNo>
+<es:preambleSignatures>65535</es:preambleSignatures>
+<es:subChannelNo>4095</es:subChannelNo>
+<es:aichTransmissionTiming>4</es:aichTransmissionTiming>
+<es:aichPower>-6</es:aichPower>
+<es:powerOffsetP0>3</es:powerOffsetP0>
+<es:powerOffsetPpm>-4</es:powerOffsetPpm>
+<es:preambleRetransMax>5</es:preambleRetransMax>
+<es:maxPreambleCycle>4</es:maxPreambleCycle>
+<es:constantValueCprach>-27</es:constantValueCprach>
+<es:spreadingFactor>64</es:spreadingFactor>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataRach>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataPch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPch>
+
+<es:userLabel>Pch-4-3</es:userLabel>
+<es:pchPower>-4</es:pchPower>
+<es:pichPower>-7</es:pichPower>
+<es:sccpchOffset>20</es:sccpchOffset>
+<es:administrativeState>1</es:administrativeState>
+</es:vsDataPch>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-4-3</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHsdsch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHsdsch>
+
+<es:administrativeState>0</es:administrativeState>
+<es:userLabel>Hsdsch-4-3</es:userLabel>
+<es:numHsPdschCodes>5</es:numHsPdschCodes>
+<es:deltaAck1>4</es:deltaAck1>
+<es:deltaNack1>4</es:deltaNack1>
+<es:deltaAck2>8</es:deltaAck2>
+<es:deltaNack2>8</es:deltaNack2>
+<es:deltaCqi1>4</es:deltaCqi1>
+<es:deltaCqi2>8</es:deltaCqi2>
+<es:initialCqiRepetitionFactor>1</es:initialCqiRepetitionFactor>
+<es:initialAckNackRepetitionFactor>1</es:initialAckNackRepetitionFactor>
+<es:cqiFeedbackCycle>8</es:cqiFeedbackCycle>
+<es:hsMeasurementPowerOffset>0</es:hsMeasurementPowerOffset>
+<es:codeThresholdPdu656>6</es:codeThresholdPdu656>
+<es:numHsScchCodes>1</es:numHsScchCodes>
+</es:vsDataHsdsch>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataEul</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataEul>
+
+<es:userLabel>Eul-4-3</es:userLabel>
+<es:administrativeState>0</es:administrativeState>
+<es:numEagchCodes>1</es:numEagchCodes>
+<es:numEhichErgchCodes>1</es:numEhichErgchCodes>
+<es:eulMaxTargetRtwp>-499</es:eulMaxTargetRtwp>
+</es:vsDataEul>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCoverageRelation</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCoverageRelation>
+
+<es:utranCellRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,UtranCell=RNC01-4-1</es:utranCellRef>
+<es:coverageIndicator>1</es:coverageIndicator>
+<es:hsPathlossThreshold>170</es:hsPathlossThreshold>
+</es:vsDataCoverageRelation>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer></un:UtranCell>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataRncFunction</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRncFunction>
+
+<es:mncLength>2</es:mncLength>
+<es:emergencyCallRedirect>0</es:emergencyCallRedirect>
+<es:loadSharingDirRetryEnabled>0</es:loadSharingDirRetryEnabled>
+<es:hsCellChangeAllowed>0</es:hsCellChangeAllowed>
+<es:hsOnlyBestCell>1</es:hsOnlyBestCell>
+
+<es:aliasPlmnIdentities>
+<es:mcc>353</es:mcc>
+<es:mnc>77</es:mnc>
+<es:mncLength>2</es:mncLength></es:aliasPlmnIdentities>
+<es:counterAlarmCeaseLimit>95</es:counterAlarmCeaseLimit>
+<es:counterAlarmThreshold>80</es:counterAlarmThreshold>
+<es:counterWarningAlarmCeaseLimit>5</es:counterWarningAlarmCeaseLimit>
+<es:ctrFileSize>5000</es:ctrFileSize>
+<es:gpehDataLevel>0</es:gpehDataLevel>
+<es:gpehFileSize>15000</es:gpehFileSize>
+<es:loadSharingRrcEnabled>0</es:loadSharingRrcEnabled>
+<es:uetrFileSize>275</es:uetrFileSize>
+<es:networkResourceIdentifierLengthCs>0</es:networkResourceIdentifierLengthCs>
+<es:networkResourceIdentifierLengthPs>0</es:networkResourceIdentifierLengthPs>
+<es:hsToDchTrigger>
+<es:servHsChangeInterRnc>0</es:servHsChangeInterRnc>
+<es:servHsChangeIntraRnc>0</es:servHsChangeIntraRnc>
+<es:changeOfBestCellIntraRnc>0</es:changeOfBestCellIntraRnc>
+<es:poorQualityDetected>0</es:poorQualityDetected>
+<es:changeOfBestCellInterRnc>0</es:changeOfBestCellInterRnc></es:hsToDchTrigger>
+<es:ecLocationAttemptUmts>0</es:ecLocationAttemptUmts>
+<es:ecCnSbhoRequestIgnore>0</es:ecCnSbhoRequestIgnore>
+<es:ecCnPriorityLevel>7</es:ecCnPriorityLevel>
+<es:ecSbhoTimer>6</es:ecSbhoTimer>
+<es:primaryCnOperatorRef>0</es:primaryCnOperatorRef>
+</es:vsDataRncFunction>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUePositioning</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUePositioning>
+
+<es:enabledPositioningFeatures>0</es:enabledPositioningFeatures>
+</es:vsDataUePositioning>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUeMeasControl</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUeMeasControl>
+
+<es:userLabel> </es:userLabel>
+<es:reportingRange1a>6</es:reportingRange1a>
+<es:reportingRange1b>10</es:reportingRange1b>
+<es:hysteresis1c>2</es:hysteresis1c>
+<es:hysteresis1d>15</es:hysteresis1d>
+<es:hysteresis2d>0</es:hysteresis2d>
+<es:hysteresis2f>0</es:hysteresis2f>
+<es:gsmThresh3a>-102</es:gsmThresh3a>
+<es:hysteresis3a>0</es:hysteresis3a>
+<es:measQuantity1>2</es:measQuantity1>
+<es:ueTxPowerThresh6a>21</es:ueTxPowerThresh6a>
+<es:ueTxPowerThresh6b>18</es:ueTxPowerThresh6b>
+<es:usedFreqThresh2dEcnoDrnc>-12</es:usedFreqThresh2dEcnoDrnc>
+<es:usedFreqThresh2dRscpDrnc>-97</es:usedFreqThresh2dRscpDrnc>
+<es:usedFreqRelThresh2fEcno>1</es:usedFreqRelThresh2fEcno>
+<es:usedFreqRelThresh2fRscp>3</es:usedFreqRelThresh2fRscp>
+<es:hyst4_2b>10</es:hyst4_2b>
+<es:nonUsedFreqThresh4_2bEcno>-11</es:nonUsedFreqThresh4_2bEcno>
+<es:nonUsedFreqThresh4_2bRscp>-94</es:nonUsedFreqThresh4_2bRscp>
+<es:timeToTrigger1a>11</es:timeToTrigger1a>
+<es:hysteresis1a>0</es:hysteresis1a>
+<es:timeToTrigger1b>12</es:timeToTrigger1b>
+<es:hysteresis1b>0</es:hysteresis1b>
+<es:timeToTrigger1c>11</es:timeToTrigger1c>
+<es:timeToTrigger1d>14</es:timeToTrigger1d>
+<es:timeToTrigger3a>6</es:timeToTrigger3a>
+<es:reportingInterval1a>3</es:reportingInterval1a>
+<es:reportingInterval1c>3</es:reportingInterval1c>
+<es:timeTrigg6a>320</es:timeTrigg6a>
+<es:timeTrigg6b>1280</es:timeTrigg6b>
+<es:timeTrigg4_2b>100</es:timeTrigg4_2b>
+<es:hsHysteresis1d>10</es:hsHysteresis1d>
+<es:hsQualityEstimate>1</es:hsQualityEstimate>
+<es:hsTimeToTrigger1d>640</es:hsTimeToTrigger1d>
+<es:filterCoefficient1>2</es:filterCoefficient1>
+<es:filterCoefficient2>2</es:filterCoefficient2>
+<es:utranFilterCoefficient3>2</es:utranFilterCoefficient3>
+<es:gsmFilterCoefficient3>1</es:gsmFilterCoefficient3>
+<es:filterCoeff6>19</es:filterCoeff6>
+<es:filterCoeff4_2b>2</es:filterCoeff4_2b>
+<es:w1a>0</es:w1a>
+<es:w1b>0</es:w1b>
+<es:usedFreqW2d>0</es:usedFreqW2d>
+<es:usedFreqW2f>0</es:usedFreqW2f>
+<es:usedFreqW4_2b>0</es:usedFreqW4_2b>
+<es:utranW3a>0</es:utranW3a>
+<es:nonUsedFreqW4_2b>0</es:nonUsedFreqW4_2b>
+<es:timeToTrigger2dEcno>320</es:timeToTrigger2dEcno>
+<es:timeToTrigger2fEcno>1280</es:timeToTrigger2fEcno>
+<es:utranRelThresh3aEcno>-1</es:utranRelThresh3aEcno>
+<es:utranRelThresh3aRscp>-3</es:utranRelThresh3aRscp>
+<es:usedFreqRelThresh4_2bEcno>-1</es:usedFreqRelThresh4_2bEcno>
+<es:usedFreqRelThresh4_2bRscp>-3</es:usedFreqRelThresh4_2bRscp>
+<es:timeToTrigger2dRscp>320</es:timeToTrigger2dRscp>
+<es:timeToTrigger2fRscp>1280</es:timeToTrigger2fRscp>
+<es:utranRelThreshRscp>5</es:utranRelThreshRscp>
+<es:event1dRncThreshold>4</es:event1dRncThreshold>
+<es:event1dRncOffset>0</es:event1dRncOffset>
+<es:timeToTrigger6d>320</es:timeToTrigger6d>
+<es:txPowerConnQualMonEnabled>1</es:txPowerConnQualMonEnabled>
+</es:vsDataUeMeasControl>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSid</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataSid>
+
+<es:updateCellReattsNo>5</es:updateCellReattsNo>
+<es:noOfMaxDrxCycles>1</es:noOfMaxDrxCycles>
+<es:noOfMibValueTagRetrans>0</es:noOfMibValueTagRetrans>
+<es:sib1>
+<es:sib1RepPeriod>32</es:sib1RepPeriod>
+<es:sib1StartPos>4</es:sib1StartPos></es:sib1>
+<es:sib11>
+<es:sib11RepPeriod>128</es:sib11RepPeriod>
+<es:sib11StartPos>20</es:sib11StartPos></es:sib11>
+<es:sib12>
+<es:sib12RepPeriod>32</es:sib12RepPeriod>
+<es:sib12StartPos>14</es:sib12StartPos></es:sib12>
+<es:sib3>
+<es:sib3RepPeriod>16</es:sib3RepPeriod>
+<es:sib3StartPos>2</es:sib3StartPos></es:sib3>
+<es:sib5>
+<es:sib5RepPeriod>32</es:sib5RepPeriod>
+<es:sib5StartPos>6</es:sib5StartPos></es:sib5>
+<es:sib7>
+<es:sib7RepPeriod>16</es:sib7RepPeriod>
+<es:sib7StartPos>2</es:sib7StartPos></es:sib7>
+<es:sib7ExpirationTimeFactor>1</es:sib7ExpirationTimeFactor>
+<es:sib2>
+<es:sib2RepPeriod>128</es:sib2RepPeriod>
+<es:sib2StartPos>118</es:sib2StartPos></es:sib2>
+</es:vsDataSid>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataSecurityHandling</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataSecurityHandling>
+
+<es:ciphering>1</es:ciphering>
+</es:vsDataSecurityHandling>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataRrc</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRrc>
+
+<es:t305>3</es:t305>
+</es:vsDataRrc>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataRcs</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRcs>
+
+<es:dchRcLostT>50</es:dchRcLostT>
+<es:cchWaitCuT>9</es:cchWaitCuT>
+<es:hsDschRcLostT>100</es:hsDschRcLostT>
+</es:vsDataRcs>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataRabHandling</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRabHandling>
+
+<es:psStreamingInactivityTimer>30</es:psStreamingInactivityTimer>
+<es:activeQueueMgmt>0</es:activeQueueMgmt>
+<es:dscpValuePsStreaming>18</es:dscpValuePsStreaming>
+<es:state128_128Supported>0</es:state128_128Supported>
+</es:vsDataRabHandling>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataPowerControl</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPowerControl>
+
+<es:cBackOff>0</es:cBackOff>
+<es:ulOuterLoopRegulator>1</es:ulOuterLoopRegulator>
+<es:ulSirStep>10</es:ulSirStep>
+<es:sirMin>-82</es:sirMin>
+<es:sirMax>100</es:sirMax>
+<es:dlPcMethod>3</es:dlPcMethod>
+<es:cPO>0</es:cPO>
+<es:pO1>0</es:pO1>
+<es:pO2>12</es:pO2>
+<es:pO3>12</es:pO3>
+<es:ecNoPcpichDefault>-16</es:ecNoPcpichDefault>
+<es:pcpichPowerDefault>33</es:pcpichPowerDefault>
+<es:fixedPowerDl>65</es:fixedPowerDl>
+<es:cNbifho>10</es:cNbifho>
+<es:fixedRefPower>65</es:fixedRefPower>
+<es:initShoPowerParam>-2</es:initShoPowerParam>
+<es:dlInitSirTarget>41</es:dlInitSirTarget>
+<es:ulInitSirTargetExtraHigh>92</es:ulInitSirTargetExtraHigh>
+<es:ulInitSirTargetHigh>82</es:ulInitSirTargetHigh>
+<es:ulInitSirTargetLow>49</es:ulInitSirTargetLow>
+<es:ulInitSirTargetSrb>57</es:ulInitSirTargetSrb>
+<es:transmissionTargetError>10</es:transmissionTargetError>
+<es:ulInitSirTargetEdch>70</es:ulInitSirTargetEdch>
+</es:vsDataPowerControl>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataPaging</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataPaging>
+
+<es:cnDrxCycleLengthCs>6</es:cnDrxCycleLengthCs>
+<es:cnDrxCycleLengthPs>7</es:cnDrxCycleLengthPs>
+<es:noOfPagingRecordTransm>2</es:noOfPagingRecordTransm>
+<es:utranDrxCycleLength>5</es:utranDrxCycleLength>
+</es:vsDataPaging>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataHandover</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataHandover>
+
+<es:maxActiveSet>3</es:maxActiveSet>
+<es:fddGsmHOSupp>0</es:fddGsmHOSupp>
+<es:selHoSup>0</es:selHoSup>
+<es:timeReleaseIuPs>10</es:timeReleaseIuPs>
+<es:gsmAmountPropRepeat>4</es:gsmAmountPropRepeat>
+<es:gsmPropRepeatInterval>5</es:gsmPropRepeatInterval>
+<es:ifhoPropRepeatInterval>5</es:ifhoPropRepeatInterval>
+<es:ifhoAmountPropRepeat>4</es:ifhoAmountPropRepeat>
+<es:fddIfhoSupp>0</es:fddIfhoSupp>
+<es:releaseConnOffset>120</es:releaseConnOffset>
+<es:maxGsmMonSubset>32</es:maxGsmMonSubset>
+<es:maxIefMonSubset>32</es:maxIefMonSubset>
+<es:cnhhoSupp>0</es:cnhhoSupp>
+<es:interFreqCnhhoPenaltyEcno>30</es:interFreqCnhhoPenaltyEcno>
+<es:interFreqCnhhoPenaltyRscp>30</es:interFreqCnhhoPenaltyRscp>
+<es:intraFreqCnhhoPenalty>30</es:intraFreqCnhhoPenalty>
+<es:intraFreqCnhhoWeight>0</es:intraFreqCnhhoWeight>
+<es:tmStopGsmMeas>20</es:tmStopGsmMeas>
+<es:eulReservedHwBandwidthSchedDataNonServCell>128</es:eulReservedHwBandwidthSchedDataNonServCell>
+</es:vsDataHandover>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataChannelSwitching</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataChannelSwitching>
+
+<es:dlRlcBufUpswitch>500</es:dlRlcBufUpswitch>
+<es:ulRlcBufUpswitch>256</es:ulRlcBufUpswitch>
+<es:downswitchThreshold>0</es:downswitchThreshold>
+<es:downswitchTimerThreshold>0</es:downswitchTimerThreshold>
+<es:downswitchTimer>10</es:downswitchTimer>
+<es:dlRlcBufUpswitchMrab>0</es:dlRlcBufUpswitchMrab>
+<es:ulRlcBufUpswitchMrab>8</es:ulRlcBufUpswitchMrab>
+<es:upswitchTimer>5</es:upswitchTimer>
+<es:coverageTimer>10</es:coverageTimer>
+<es:inactivityTimer>120</es:inactivityTimer>
+<es:downswitchPwrMargin>2</es:downswitchPwrMargin>
+<es:reportHysteresis>6</es:reportHysteresis>
+<es:upswitchPwrMargin>6</es:upswitchPwrMargin>
+<es:downswitchTimerUp>60</es:downswitchTimerUp>
+<es:downswitchTimerSp>2</es:downswitchTimerSp>
+<es:hsdschInactivityTimer>2</es:hsdschInactivityTimer>
+<es:bandwidthMarginUl>0</es:bandwidthMarginUl>
+<es:upswitchTimerUl>5</es:upswitchTimerUl>
+<es:bandwidthMargin>90</es:bandwidthMargin>
+<es:dlDownswitchBandwidthMargin>0</es:dlDownswitchBandwidthMargin>
+<es:dlThroughputAllowUpswitchThreshold>0</es:dlThroughputAllowUpswitchThreshold>
+<es:dlThroughputDownswitchTimer>20</es:dlThroughputDownswitchTimer>
+<es:inactivityTimerPch>30</es:inactivityTimerPch>
+<es:ulThroughputAllowUpswitchThreshold>0</es:ulThroughputAllowUpswitchThreshold>
+<es:ulThroughputDownswitchTimer>20</es:ulThroughputDownswitchTimer>
+<es:ulDownswitchBandwidthMargin>0</es:ulDownswitchBandwidthMargin>
+<es:inactivityTimeMultiPsInteractive>50</es:inactivityTimeMultiPsInteractive>
+</es:vsDataChannelSwitching>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataCchFrameSynch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCchFrameSynch>
+
+<es:dto>10</es:dto>
+<es:doStep>1</es:doStep>
+<es:toAWS>30</es:toAWS>
+<es:toAWE>2</es:toAWE>
+<es:toAE>195</es:toAE>
+</es:vsDataCchFrameSynch>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataDchFrameSynch</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataDchFrameSynch>
+
+<es:dto>10</es:dto>
+<es:doStep>1</es:doStep>
+<es:toAWS>30</es:toAWS>
+<es:toAWE>2</es:toAWE>
+<es:toAE>195</es:toAE>
+<es:uto>10</es:uto>
+<es:uoStep>1</es:uoStep>
+<es:toAWEUl>2</es:toAWEUl>
+<es:toAEUl>95</es:toAEUl>
+<es:userLabel> </es:userLabel>
+<es:toAWSUl>40</es:toAWSUl>
+</es:vsDataDchFrameSynch>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataRncModule</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataRncModule>
+
+<es:userLabel> </es:userLabel>
+</es:vsDataRncModule>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUtranNetwork</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUtranNetwork>
+
+<es:userLabel> </es:userLabel>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:plmnIdentity>
+<es:mcc>353</es:mcc>
+<es:mnc>77</es:mnc>
+<es:mncLength>2</es:mncLength></es:plmnIdentity>
+</es:vsDataUtranNetwork>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIurLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIurLink>
+
+<es:userLabel> </es:userLabel>
+<es:mcc>353</es:mcc>
+<es:mnc>77</es:mnc>
+<es:mncLength>2</es:mncLength>
+<es:rncId>2</es:rncId>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:utranNetworkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,vsDataUtranNetwork=1</es:utranNetworkRef>
+<es:cellCapabilityControl>
+<es:hsdschSupport>0</es:hsdschSupport>
+<es:edchSupport>0</es:edchSupport></es:cellCapabilityControl>
+<es:hspaPathlossThreshold>170</es:hspaPathlossThreshold>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIurLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIurLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIurLink>
+
+<es:userLabel> </es:userLabel>
+<es:mcc>353</es:mcc>
+<es:mnc>77</es:mnc>
+<es:mncLength>2</es:mncLength>
+<es:rncId>3</es:rncId>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:utranNetworkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,vsDataUtranNetwork=1</es:utranNetworkRef>
+<es:cellCapabilityControl>
+<es:hsdschSupport>0</es:hsdschSupport>
+<es:edchSupport>0</es:edchSupport></es:cellCapabilityControl>
+<es:hspaPathlossThreshold>170</es:hspaPathlossThreshold>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIurLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIurLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIurLink>
+
+<es:userLabel> </es:userLabel>
+<es:mcc>353</es:mcc>
+<es:mnc>77</es:mnc>
+<es:mncLength>2</es:mncLength>
+<es:rncId>4</es:rncId>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:utranNetworkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,vsDataUtranNetwork=1</es:utranNetworkRef>
+<es:cellCapabilityControl>
+<es:hsdschSupport>0</es:hsdschSupport>
+<es:edchSupport>0</es:edchSupport></es:cellCapabilityControl>
+<es:hspaPathlossThreshold>170</es:hspaPathlossThreshold>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIurLink>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="96" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIurLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataIurLink>
+
+<es:userLabel> </es:userLabel>
+<es:mcc>353</es:mcc>
+<es:mnc>96</es:mnc>
+<es:mncLength>2</es:mncLength>
+<es:rncId>96</es:rncId>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:utranNetworkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,vsDataUtranNetwork=1</es:utranNetworkRef>
+<es:cellCapabilityControl>
+<es:hsdschSupport>0</es:hsdschSupport>
+<es:edchSupport>0</es:edchSupport></es:cellCapabilityControl>
+<es:hspaPathlossThreshold>170</es:hspaPathlossThreshold>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIurLink></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="96" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIurLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIurLink>
+
+<es:userLabel> </es:userLabel>
+<es:mcc>353</es:mcc>
+<es:mnc>96</es:mnc>
+<es:mncLength>2</es:mncLength>
+<es:rncId>96</es:rncId>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:utranNetworkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,vsDataUtranNetwork=1</es:utranNetworkRef>
+<es:cellCapabilityControl>
+<es:hsdschSupport>0</es:hsdschSupport>
+<es:edchSupport>0</es:edchSupport></es:cellCapabilityControl>
+<es:hspaPathlossThreshold>170</es:hspaPathlossThreshold>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIurLink>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="97" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIurLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataIurLink>
+
+<es:userLabel> </es:userLabel>
+<es:mcc>353</es:mcc>
+<es:mnc>97</es:mnc>
+<es:mncLength>2</es:mncLength>
+<es:rncId>97</es:rncId>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:utranNetworkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,vsDataUtranNetwork=1</es:utranNetworkRef>
+<es:cellCapabilityControl>
+<es:hsdschSupport>0</es:hsdschSupport>
+<es:edchSupport>0</es:edchSupport></es:cellCapabilityControl>
+<es:hspaPathlossThreshold>170</es:hspaPathlossThreshold>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIurLink></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="97" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIurLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIurLink>
+
+<es:userLabel> </es:userLabel>
+<es:mcc>353</es:mcc>
+<es:mnc>97</es:mnc>
+<es:mncLength>2</es:mncLength>
+<es:rncId>97</es:rncId>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:utranNetworkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,vsDataUtranNetwork=1</es:utranNetworkRef>
+<es:cellCapabilityControl>
+<es:hsdschSupport>0</es:hsdschSupport>
+<es:edchSupport>0</es:edchSupport></es:cellCapabilityControl>
+<es:hspaPathlossThreshold>170</es:hspaPathlossThreshold>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIurLink>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="98" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIurLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataIurLink>
+
+<es:userLabel> </es:userLabel>
+<es:mcc>353</es:mcc>
+<es:mnc>98</es:mnc>
+<es:mncLength>2</es:mncLength>
+<es:rncId>98</es:rncId>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:utranNetworkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,vsDataUtranNetwork=1</es:utranNetworkRef>
+<es:cellCapabilityControl>
+<es:hsdschSupport>0</es:hsdschSupport>
+<es:edchSupport>0</es:edchSupport></es:cellCapabilityControl>
+<es:hspaPathlossThreshold>170</es:hspaPathlossThreshold>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIurLink></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="98" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIurLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIurLink>
+
+<es:userLabel> </es:userLabel>
+<es:mcc>353</es:mcc>
+<es:mnc>98</es:mnc>
+<es:mncLength>2</es:mncLength>
+<es:rncId>98</es:rncId>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:utranNetworkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,vsDataUtranNetwork=1</es:utranNetworkRef>
+<es:cellCapabilityControl>
+<es:hsdschSupport>0</es:hsdschSupport>
+<es:edchSupport>0</es:edchSupport></es:cellCapabilityControl>
+<es:hspaPathlossThreshold>170</es:hspaPathlossThreshold>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIurLink>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="99" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataIurLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataIurLink>
+
+<es:userLabel> </es:userLabel>
+<es:mcc>353</es:mcc>
+<es:mnc>99</es:mnc>
+<es:mncLength>2</es:mncLength>
+<es:rncId>99</es:rncId>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:utranNetworkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,vsDataUtranNetwork=1</es:utranNetworkRef>
+<es:cellCapabilityControl>
+<es:hsdschSupport>0</es:hsdschSupport>
+<es:edchSupport>0</es:edchSupport></es:cellCapabilityControl>
+<es:hspaPathlossThreshold>170</es:hspaPathlossThreshold>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIurLink></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="99" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataIurLink</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataIurLink>
+
+<es:userLabel> </es:userLabel>
+<es:mcc>353</es:mcc>
+<es:mnc>99</es:mnc>
+<es:mncLength>2</es:mncLength>
+<es:rncId>99</es:rncId>
+<es:aliasPlmnIdentities></es:aliasPlmnIdentities>
+<es:utranNetworkRef>SubNetwork=WEOSSRC1_ROOT_MO_R,SubNetwork=RNC33,MeContext=SRNC001,ManagedElement=1,RncFunction=1,vsDataUtranNetwork=1</es:utranNetworkRef>
+<es:cellCapabilityControl>
+<es:hsdschSupport>0</es:hsdschSupport>
+<es:edchSupport>0</es:edchSupport></es:cellCapabilityControl>
+<es:hspaPathlossThreshold>170</es:hspaPathlossThreshold>
+<es:userPlaneTransportOption>
+<es:atm>0</es:atm>
+<es:ipv4>0</es:ipv4></es:userPlaneTransportOption>
+</es:vsDataIurLink>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUra</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUra>
+
+<es:userLabel>Ura1</es:userLabel>
+<es:uraIdentity>1</es:uraIdentity>
+</es:vsDataUra>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUra</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUra>
+
+<es:userLabel>Ura2</es:userLabel>
+<es:uraIdentity>2</es:uraIdentity>
+</es:vsDataUra>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUra</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUra>
+
+<es:userLabel>Ura3</es:userLabel>
+<es:uraIdentity>3</es:uraIdentity>
+</es:vsDataUra>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUra</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUra>
+
+<es:userLabel>Ura4</es:userLabel>
+<es:uraIdentity>4</es:uraIdentity>
+</es:vsDataUra>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="5" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUra</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUra>
+
+<es:userLabel>Ura5</es:userLabel>
+<es:uraIdentity>5</es:uraIdentity>
+</es:vsDataUra>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="6" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUra</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUra>
+
+<es:userLabel>Ura6</es:userLabel>
+<es:uraIdentity>6</es:uraIdentity>
+</es:vsDataUra>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="7" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUra</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUra>
+
+<es:userLabel>Ura7</es:userLabel>
+<es:uraIdentity>7</es:uraIdentity>
+</es:vsDataUra>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="8" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUra</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUra>
+
+<es:userLabel>Ura8</es:userLabel>
+<es:uraIdentity>8</es:uraIdentity>
+</es:vsDataUra>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="9" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUra</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUra>
+
+<es:userLabel>Ura9</es:userLabel>
+<es:uraIdentity>9</es:uraIdentity>
+</es:vsDataUra>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="10" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUra</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUra>
+
+<es:userLabel>Ura10</es:userLabel>
+<es:uraIdentity>10</es:uraIdentity>
+</es:vsDataUra>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCnOperator</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCnOperator>
+
+<es:userLabel> </es:userLabel>
+<es:plmnIdentity>
+<es:mcc>1</es:mcc>
+<es:mnc>1</es:mnc>
+<es:mncLength>2</es:mncLength></es:plmnIdentity>
+<es:iphoNetworkRefsUtran></es:iphoNetworkRefsUtran>
+<es:iphoNetworkRefsGsm></es:iphoNetworkRefsGsm>
+<es:equivalentPlmnIdentities></es:equivalentPlmnIdentities>
+</es:vsDataCnOperator>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataWcdmaCarrier</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataWcdmaCarrier>
+
+<es:userLabel> </es:userLabel>
+<es:defaultHoType>1</es:defaultHoType>
+<es:freqBand>0</es:freqBand>
+<es:sib5bisEnabled>0</es:sib5bisEnabled>
+<es:uarfcnDl>0</es:uarfcnDl>
+</es:vsDataWcdmaCarrier>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCnOperator</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCnOperator>
+
+<es:userLabel> </es:userLabel>
+<es:plmnIdentity>
+<es:mcc>1</es:mcc>
+<es:mnc>1</es:mnc>
+<es:mncLength>2</es:mncLength></es:plmnIdentity>
+<es:iphoNetworkRefsUtran></es:iphoNetworkRefsUtran>
+<es:iphoNetworkRefsGsm></es:iphoNetworkRefsGsm>
+<es:equivalentPlmnIdentities></es:equivalentPlmnIdentities>
+</es:vsDataCnOperator>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="2" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataWcdmaCarrier</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataWcdmaCarrier>
+
+<es:userLabel> </es:userLabel>
+<es:defaultHoType>1</es:defaultHoType>
+<es:freqBand>0</es:freqBand>
+<es:sib5bisEnabled>0</es:sib5bisEnabled>
+<es:uarfcnDl>0</es:uarfcnDl>
+</es:vsDataWcdmaCarrier>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCnOperator</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCnOperator>
+
+<es:userLabel> </es:userLabel>
+<es:plmnIdentity>
+<es:mcc>1</es:mcc>
+<es:mnc>1</es:mnc>
+<es:mncLength>2</es:mncLength></es:plmnIdentity>
+<es:iphoNetworkRefsUtran></es:iphoNetworkRefsUtran>
+<es:iphoNetworkRefsGsm></es:iphoNetworkRefsGsm>
+<es:equivalentPlmnIdentities></es:equivalentPlmnIdentities>
+</es:vsDataCnOperator>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="3" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataWcdmaCarrier</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataWcdmaCarrier>
+
+<es:userLabel> </es:userLabel>
+<es:defaultHoType>1</es:defaultHoType>
+<es:freqBand>0</es:freqBand>
+<es:sib5bisEnabled>0</es:sib5bisEnabled>
+<es:uarfcnDl>0</es:uarfcnDl>
+</es:vsDataWcdmaCarrier>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataCnOperator</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataCnOperator>
+
+<es:userLabel> </es:userLabel>
+<es:plmnIdentity>
+<es:mcc>1</es:mcc>
+<es:mnc>1</es:mnc>
+<es:mncLength>2</es:mncLength></es:plmnIdentity>
+<es:iphoNetworkRefsUtran></es:iphoNetworkRefsUtran>
+<es:iphoNetworkRefsGsm></es:iphoNetworkRefsGsm>
+<es:equivalentPlmnIdentities></es:equivalentPlmnIdentities>
+</es:vsDataCnOperator>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="4" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataWcdmaCarrier</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataWcdmaCarrier>
+
+<es:userLabel> </es:userLabel>
+<es:defaultHoType>1</es:defaultHoType>
+<es:freqBand>0</es:freqBand>
+<es:sib5bisEnabled>0</es:sib5bisEnabled>
+<es:uarfcnDl>0</es:uarfcnDl>
+</es:vsDataWcdmaCarrier>
+</xn:attributes>
+</xn:VsDataContainer><xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUeRc</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+<es:vsDataUeRc>
+
+<es:userLabel> </es:userLabel>
+<es:serviceOffset2dEcno>0</es:serviceOffset2dEcno>
+<es:serviceOffset2dRscp>0</es:serviceOffset2dRscp>
+</es:vsDataUeRc></xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="update">
+<xn:attributes>
+<xn:vsDataType>vsDataUeRc</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUeRc>
+
+<es:userLabel> </es:userLabel>
+<es:serviceOffset2dEcno>0</es:serviceOffset2dEcno>
+<es:serviceOffset2dRscp>0</es:serviceOffset2dRscp>
+</es:vsDataUeRc>
+</xn:attributes>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUeRcTrCh</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUeRcTrCh>
+
+<es:blerQualityTargetDl>-63</es:blerQualityTargetDl>
+<es:blerQualityTargetUl>-63</es:blerQualityTargetUl>
+</es:vsDataUeRcTrCh>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUeRcRab</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUeRcRab>
+
+<es:fcState>0</es:fcState>
+<es:trBearerQosClass>0</es:trBearerQosClass>
+</es:vsDataUeRcRab>
+</xn:attributes>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUeRcRrc</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUeRcRrc>
+
+<es:trBearerQosClass>0</es:trBearerQosClass>
+</es:vsDataUeRcRrc>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+<xn:VsDataContainer id="1" modifier="create">
+<xn:attributes>
+<xn:vsDataType>vsDataUeRabType</xn:vsDataType>
+<xn:vsDataFormatVersion>EricssonSpecificAttributes.5.1</xn:vsDataFormatVersion>
+
+<es:vsDataUeRabType>
+
+<es:trBearerQosClass>0</es:trBearerQosClass>
+</es:vsDataUeRabType>
+</xn:attributes>
+</xn:VsDataContainer>
+</xn:VsDataContainer>
+</un:RncFunction>
+</xn:ManagedElement></xn:MeContext>
+</xn:SubNetwork>
+</xn:SubNetwork>
+</configData>
+    <fileFooter dateTime="2001-05-07T12:00:00+02:00"></fileFooter>
+</bulkCmConfigDataFile>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/utranNrm.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/utranNrm.xsd
new file mode 100644
index 0000000000..1d411b31dd
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/netsim/utranNrm.xsd
@@ -0,0 +1,174 @@
+<!--

+   3GPP TS 32.615 v4.5 Bulk CM IRP

+  Configuration data file UTRAN Network Resources IRP NRM XML schema

+  To be used with WEGA Bucket 2.1 onwards

+-->

+<schema xmlns:gn="geranNrm.xsd" xmlns:un="utranNrm.xsd" xmlns:xn="genericNrm.xsd" xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="utranNrm.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">

+	<!-- UTRAN Network Resources IRP NRM class associated XML elements -->

+	<import namespace="genericNrm.xsd" schemaLocation="genericNrm.xsd"/>

+	<import namespace="geranNrm.xsd" schemaLocation="geranNrm.xsd"/>

+	<element name="RncFunction">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="userLabel" minOccurs="0"/>

+									<element name="mcc" minOccurs="0"/>

+									<element name="mnc" minOccurs="0"/>

+									<element name="rncId" minOccurs="0"/>

+									<!--

+									<element name="mncLength" minOccurs="0"/>

+									-->

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="un:UtranCell"/>

+							<element ref="un:IubLink"/>

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	<element name="NodeBFunction">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="userLabel" minOccurs="0"/>

+									<element name="nodeBFunctionIubLink" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	<element name="UtranCell">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="userLabel" minOccurs="0"/>

+									<element name="cId" minOccurs="0"/>

+									<element name="localCellId" minOccurs="0"/>

+									<element name="uarfcnUl" minOccurs="0"/>

+									<element name="uarfcnDl" minOccurs="0"/>

+									<element name="primaryScramblingCode" minOccurs="0"/>

+									<element name="primaryCpichPower" minOccurs="0"/>

+									<element name="maximumTransmissionPower" minOccurs="0"/>

+									<element name="primarySchPower" minOccurs="0"/>

+									<element name="secondarySchPower" minOccurs="0"/>

+									<element name="bchPower" minOccurs="0"/>

+									<element name="lac" minOccurs="0"/>

+									<element name="rac" minOccurs="0"/>

+									<element name="sac" minOccurs="0"/>

+									<element name="utranCellIubLink" minOccurs="0"/>

+									<element name="uraList" minOccurs="0"/>

+									<!-- 3.1

+									<element name="ura" minOccurs="0"/>

+									-->

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="un:UtranRelation"/>

+							<element ref="gn:GsmRelation"/>

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	<element name="IubLink">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="userLabel" minOccurs="0"/>

+									<element name="iubLinkUtranCell" minOccurs="0"/>

+									<element name="iubLinkNodeBFunction" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	<element name="UtranRelation">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="adjacentCell" minOccurs="0"/>

+									<!--

+									<element name="relationType" minOccurs="0"/>

+									-->

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+	<element name="ExternalUtranCell">

+		<complexType>

+			<complexContent>

+				<extension base="xn:NrmClassXmlType">

+					<sequence>

+						<element name="attributes" minOccurs="0">

+							<complexType>

+								<all>

+									<element name="userLabel" minOccurs="0"/>

+									<element name="cId" minOccurs="0"/>

+									<element name="mcc" minOccurs="0"/>

+									<element name="mnc" minOccurs="0"/>

+									<element name="rncId" minOccurs="0"/>

+									<element name="uarfcnUl" minOccurs="0"/>

+									<element name="uarfcnDl" minOccurs="0"/>

+									<element name="primaryScramblingCode" minOccurs="0"/>

+									<element name="primaryCpichPower" minOccurs="0"/>

+									<element name="lac" minOccurs="0"/>

+									<element name="rac" minOccurs="0"/>

+								</all>

+							</complexType>

+						</element>

+						<choice minOccurs="0" maxOccurs="unbounded">

+							<element ref="xn:VsDataContainer"/>

+						</choice>

+					</sequence>

+				</extension>

+			</complexContent>

+		</complexType>

+	</element>

+</schema>

diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/po.xml
new file mode 100644
index 0000000000..28a44c410d
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<purchaseOrder orderDate="1999-10-20">
+   <shipTo country="US">
+      <name>Alice Smith</name>
+      <street>123 Maple Street</street>
+      <city>Mill Valley</city>
+      <state>CA</state>
+      <zip>90952</zip>
+   </shipTo>
+   <billTo country="US">
+      <name>Robert Smith</name>
+      <street>8 Oak Avenue</street>
+      <city>Old Town</city>
+      <state>PA</state>
+      <zip>95819</zip>
+   </billTo>
+   <comment>Hurry, my lawn is going wild!</comment>
+   <items>
+      <item partNum="872-AA">
+         <productName>Lawnmower</productName>
+         <quantity>1</quantity>
+         <USPrice>148.95</USPrice>
+         <comment>Confirm this is electric</comment>
+      </item>
+      <item partNum="926-AA">
+         <productName>Baby Monitor</productName>
+         <quantity>1</quantity>
+         <USPrice>39.98</USPrice>
+         <shipDate>1999-05-21</shipDate>
+      </item>
+   </items>
+</purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/po.xsd
new file mode 100644
index 0000000000..995dd00152
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po.xsd
@@ -0,0 +1,67 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+  <xsd:annotation>
+    <xsd:documentation xml:lang="en">
+     Purchase order schema for Example.com.
+     Copyright 2000 Example.com. All rights reserved.
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:element name="purchaseOrder" type="PurchaseOrderType"/>
+
+  <xsd:element name="comment" type="xsd:string"/>
+
+  <xsd:complexType name="PurchaseOrderType">
+    <xsd:sequence>
+      <xsd:element name="shipTo" type="USAddress"/>
+      <xsd:element name="billTo" type="USAddress"/>
+      <xsd:element ref="comment" minOccurs="0"/>
+      <xsd:element name="items"  type="Items"/>
+    </xsd:sequence>
+    <xsd:attribute name="orderDate" type="xsd:date"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="USAddress">
+    <xsd:sequence>
+      <xsd:element name="name"   type="xsd:string"/>
+      <xsd:element name="street" type="xsd:string"/>
+      <xsd:element name="city"   type="xsd:string"/>
+      <xsd:element name="state"  type="xsd:string"/>
+      <xsd:element name="zip"    type="xsd:decimal"/>
+    </xsd:sequence>
+    <xsd:attribute name="country" type="xsd:NMTOKEN"
+                   fixed="US"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="Items">
+    <xsd:sequence>
+      <xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="productName" type="xsd:string"/>
+            <xsd:element name="quantity">
+              <xsd:simpleType>
+                <xsd:restriction base="xsd:positiveInteger">
+                  <xsd:maxExclusive value="100"/>
+                </xsd:restriction>
+              </xsd:simpleType>
+            </xsd:element>
+            <xsd:element name="USPrice"  type="xsd:decimal"/>
+            <xsd:element ref="comment"   minOccurs="0"/>
+            <xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
+          </xsd:sequence>
+          <xsd:attribute name="partNum" type="SKU" use="required"/>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <!-- Stock Keeping Unit, a code for identifying products -->
+  <xsd:simpleType name="SKU">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="\d{3}-[A-Z]{2}"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+</xsd:schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.tab b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.tab
new file mode 100644
index 0000000000..fa3fcdaa09
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.tab
@@ -0,0 +1,424 @@
+[{{element,{name,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_element,{name,['USAddress'],'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{productName,[anonymous,item,'Items'],'http://www.example.com/PO1'}},
+  {schema_element,{productName,[anonymous,item,'Items'],
+                               'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{schema,"po1.xsd"},
+  {schema,unqualified,
+          unqualified,
+          'http://www.example.com/PO1',
+          [],
+          [],
+          [{element,{{purchaseOrder,[],'http://www.example.com/PO1'},{1,1}}},
+           {element,{{comment,[],'http://www.example.com/PO1'},{1,1}}}]}},
+ {{simpleType,{'_xmerl_no_name_',[quantity,anonymous,item,'Items'],
+                                 'http://www.w3.org/2001/XMLSchema'}},
+  {schema_simple_type,{'_xmerl_no_name_',
+                          [quantity,anonymous,item,'Items'],
+                          'http://www.w3.org/2001/XMLSchema'},
+                      [quantity,anonymous,item,'Items'],
+                      {positiveInteger,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{maxExclusive,"100"}],
+                      atomic,
+                      [{restriction,{{positiveInteger,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{maxExclusive,"100"}]}}]}},
+ {{element,{street,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_element,{street,['USAddress'],'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{shipTo,['PurchaseOrderType'],'http://www.example.com/PO1'}},
+  {schema_element,{shipTo,['PurchaseOrderType'],'http://www.example.com/PO1'},
+                  [{simple_or_complex_Type,
+                       {'USAddress',[],'http://www.example.com/PO1'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'PurchaseOrderType',[],'http://www.example.com/PO1'}},
+  {schema_complex_type,{'PurchaseOrderType',[],'http://www.example.com/PO1'},
+                       undefined,
+                       false,
+                       ['PurchaseOrderType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{orderDate,
+                                       ['PurchaseOrderType'],
+                                       'http://www.example.com/PO1'}}],
+                       [{sequence,{[{element,
+                                        {{shipTo,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{billTo,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{comment,
+                                             [],
+                                             'http://www.example.com/PO1'},
+                                         {0,1}}},
+                                    {element,
+                                        {{items,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{simpleType,{'SKU',[],'http://www.example.com/PO1'}},
+  {schema_simple_type,{'SKU',[],'http://www.example.com/PO1'},
+                      [],
+                      {string,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{pattern,"\\d{3}-[A-Z]{2}"}],
+                      atomic,
+                      [{restriction,{{string,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{pattern,"\\d{3}-[A-Z]{2}"}]}}]}},
+ {{element,{city,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_element,{city,['USAddress'],'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{quantity,[anonymous,item,'Items'],'http://www.example.com/PO1'}},
+  {schema_element,{quantity,[anonymous,item,'Items'],
+                            'http://www.example.com/PO1'},
+                  [{simpleType,{'_xmerl_no_name_',
+                                   [quantity,anonymous,item,'Items'],
+                                   'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{orderDate,['PurchaseOrderType'],'http://www.example.com/PO1'}},
+  {schema_attribute,{orderDate,['PurchaseOrderType'],
+                               'http://www.example.com/PO1'},
+                    [{simpleType,{date,[],'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    ['PurchaseOrderType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{element,{state,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_element,{state,['USAddress'],'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{comment,[],'http://www.example.com/PO1'}},
+  {schema_element,{comment,[],'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'USAddress',[],'http://www.example.com/PO1'}},
+  {schema_complex_type,{'USAddress',[],'http://www.example.com/PO1'},
+                       undefined,
+                       false,
+                       ['USAddress'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{country,
+                                       ['USAddress'],
+                                       'http://www.example.com/PO1'}}],
+                       [{sequence,{[{element,
+                                        {{name,
+                                             ['USAddress'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{street,
+                                             ['USAddress'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{city,
+                                             ['USAddress'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{state,
+                                             ['USAddress'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{zip,
+                                             ['USAddress'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{element,{purchaseOrder,[],'http://www.example.com/PO1'}},
+  {schema_element,{purchaseOrder,[],'http://www.example.com/PO1'},
+                  [{simple_or_complex_Type,
+                       {'PurchaseOrderType',[],'http://www.example.com/PO1'}}],
+                  false,
+                  undefined,
+                  [],
+                  [],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{billTo,['PurchaseOrderType'],'http://www.example.com/PO1'}},
+  {schema_element,{billTo,['PurchaseOrderType'],'http://www.example.com/PO1'},
+                  [{simple_or_complex_Type,
+                       {'USAddress',[],'http://www.example.com/PO1'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{items,['PurchaseOrderType'],'http://www.example.com/PO1'}},
+  {schema_element,{items,['PurchaseOrderType'],'http://www.example.com/PO1'},
+                  [{simple_or_complex_Type,
+                       {'Items',[],'http://www.example.com/PO1'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'Items',[],'http://www.example.com/PO1'}},
+  {schema_complex_type,{'Items',[],'http://www.example.com/PO1'},
+                       undefined,
+                       false,
+                       ['Items'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{sequence,{[{element,
+                                        {{item,
+                                             ['Items'],
+                                             'http://www.example.com/PO1'},
+                                         {0,unbounded}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{element,{item,['Items'],'http://www.example.com/PO1'}},
+  {schema_element,{item,['Items'],'http://www.example.com/PO1'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,item,'Items'],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['Items'],
+                  undefined,
+                  {0,unbounded},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{partNum,[anonymous,item,'Items'],'http://www.example.com/PO1'}},
+  {schema_attribute,{partNum,[anonymous,item,'Items'],
+                             'http://www.example.com/PO1'},
+                    [{simpleType,{'SKU',[],'http://www.example.com/PO1'}}],
+                    false,
+                    [anonymous,item,'Items'],
+                    required,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,item,'Items'],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,item,'Items'],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,item,'Items'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{partNum,
+                                       [anonymous,item,'Items'],
+                                       'http://www.example.com/PO1'}}],
+                       [{sequence,{[{element,
+                                        {{productName,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{quantity,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{'USPrice',
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{comment,
+                                             [],
+                                             'http://www.example.com/PO1'},
+                                         {0,1}}},
+                                    {element,
+                                        {{shipDate,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/PO1'},
+                                         {0,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{attribute,{country,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_attribute,{country,['USAddress'],'http://www.example.com/PO1'},
+                    [{simpleType,{'NMTOKEN',
+                                     [],
+                                     'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    ['USAddress'],
+                    optional,
+                    undefined,
+                    "US",
+                    undefined}},
+ {{element,{'USPrice',[anonymous,item,'Items'],'http://www.example.com/PO1'}},
+  {schema_element,{'USPrice',[anonymous,item,'Items'],
+                             'http://www.example.com/PO1'},
+                  [{simpleType,{decimal,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{shipDate,[anonymous,item,'Items'],'http://www.example.com/PO1'}},
+  {schema_element,{shipDate,[anonymous,item,'Items'],
+                            'http://www.example.com/PO1'},
+                  [{simpleType,{date,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {0,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{zip,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_element,{zip,['USAddress'],'http://www.example.com/PO1'},
+                  [{simpleType,{decimal,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}}]
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.tab2 b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.tab2
new file mode 100644
index 0000000000..fa3fcdaa09
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.tab2
@@ -0,0 +1,424 @@
+[{{element,{name,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_element,{name,['USAddress'],'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{productName,[anonymous,item,'Items'],'http://www.example.com/PO1'}},
+  {schema_element,{productName,[anonymous,item,'Items'],
+                               'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{schema,"po1.xsd"},
+  {schema,unqualified,
+          unqualified,
+          'http://www.example.com/PO1',
+          [],
+          [],
+          [{element,{{purchaseOrder,[],'http://www.example.com/PO1'},{1,1}}},
+           {element,{{comment,[],'http://www.example.com/PO1'},{1,1}}}]}},
+ {{simpleType,{'_xmerl_no_name_',[quantity,anonymous,item,'Items'],
+                                 'http://www.w3.org/2001/XMLSchema'}},
+  {schema_simple_type,{'_xmerl_no_name_',
+                          [quantity,anonymous,item,'Items'],
+                          'http://www.w3.org/2001/XMLSchema'},
+                      [quantity,anonymous,item,'Items'],
+                      {positiveInteger,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{maxExclusive,"100"}],
+                      atomic,
+                      [{restriction,{{positiveInteger,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{maxExclusive,"100"}]}}]}},
+ {{element,{street,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_element,{street,['USAddress'],'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{shipTo,['PurchaseOrderType'],'http://www.example.com/PO1'}},
+  {schema_element,{shipTo,['PurchaseOrderType'],'http://www.example.com/PO1'},
+                  [{simple_or_complex_Type,
+                       {'USAddress',[],'http://www.example.com/PO1'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'PurchaseOrderType',[],'http://www.example.com/PO1'}},
+  {schema_complex_type,{'PurchaseOrderType',[],'http://www.example.com/PO1'},
+                       undefined,
+                       false,
+                       ['PurchaseOrderType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{orderDate,
+                                       ['PurchaseOrderType'],
+                                       'http://www.example.com/PO1'}}],
+                       [{sequence,{[{element,
+                                        {{shipTo,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{billTo,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{comment,
+                                             [],
+                                             'http://www.example.com/PO1'},
+                                         {0,1}}},
+                                    {element,
+                                        {{items,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{simpleType,{'SKU',[],'http://www.example.com/PO1'}},
+  {schema_simple_type,{'SKU',[],'http://www.example.com/PO1'},
+                      [],
+                      {string,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{pattern,"\\d{3}-[A-Z]{2}"}],
+                      atomic,
+                      [{restriction,{{string,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{pattern,"\\d{3}-[A-Z]{2}"}]}}]}},
+ {{element,{city,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_element,{city,['USAddress'],'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{quantity,[anonymous,item,'Items'],'http://www.example.com/PO1'}},
+  {schema_element,{quantity,[anonymous,item,'Items'],
+                            'http://www.example.com/PO1'},
+                  [{simpleType,{'_xmerl_no_name_',
+                                   [quantity,anonymous,item,'Items'],
+                                   'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{orderDate,['PurchaseOrderType'],'http://www.example.com/PO1'}},
+  {schema_attribute,{orderDate,['PurchaseOrderType'],
+                               'http://www.example.com/PO1'},
+                    [{simpleType,{date,[],'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    ['PurchaseOrderType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{element,{state,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_element,{state,['USAddress'],'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{comment,[],'http://www.example.com/PO1'}},
+  {schema_element,{comment,[],'http://www.example.com/PO1'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'USAddress',[],'http://www.example.com/PO1'}},
+  {schema_complex_type,{'USAddress',[],'http://www.example.com/PO1'},
+                       undefined,
+                       false,
+                       ['USAddress'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{country,
+                                       ['USAddress'],
+                                       'http://www.example.com/PO1'}}],
+                       [{sequence,{[{element,
+                                        {{name,
+                                             ['USAddress'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{street,
+                                             ['USAddress'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{city,
+                                             ['USAddress'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{state,
+                                             ['USAddress'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{zip,
+                                             ['USAddress'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{element,{purchaseOrder,[],'http://www.example.com/PO1'}},
+  {schema_element,{purchaseOrder,[],'http://www.example.com/PO1'},
+                  [{simple_or_complex_Type,
+                       {'PurchaseOrderType',[],'http://www.example.com/PO1'}}],
+                  false,
+                  undefined,
+                  [],
+                  [],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{billTo,['PurchaseOrderType'],'http://www.example.com/PO1'}},
+  {schema_element,{billTo,['PurchaseOrderType'],'http://www.example.com/PO1'},
+                  [{simple_or_complex_Type,
+                       {'USAddress',[],'http://www.example.com/PO1'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{items,['PurchaseOrderType'],'http://www.example.com/PO1'}},
+  {schema_element,{items,['PurchaseOrderType'],'http://www.example.com/PO1'},
+                  [{simple_or_complex_Type,
+                       {'Items',[],'http://www.example.com/PO1'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'Items',[],'http://www.example.com/PO1'}},
+  {schema_complex_type,{'Items',[],'http://www.example.com/PO1'},
+                       undefined,
+                       false,
+                       ['Items'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{sequence,{[{element,
+                                        {{item,
+                                             ['Items'],
+                                             'http://www.example.com/PO1'},
+                                         {0,unbounded}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{element,{item,['Items'],'http://www.example.com/PO1'}},
+  {schema_element,{item,['Items'],'http://www.example.com/PO1'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,item,'Items'],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['Items'],
+                  undefined,
+                  {0,unbounded},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{partNum,[anonymous,item,'Items'],'http://www.example.com/PO1'}},
+  {schema_attribute,{partNum,[anonymous,item,'Items'],
+                             'http://www.example.com/PO1'},
+                    [{simpleType,{'SKU',[],'http://www.example.com/PO1'}}],
+                    false,
+                    [anonymous,item,'Items'],
+                    required,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,item,'Items'],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,item,'Items'],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,item,'Items'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{partNum,
+                                       [anonymous,item,'Items'],
+                                       'http://www.example.com/PO1'}}],
+                       [{sequence,{[{element,
+                                        {{productName,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{quantity,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{'USPrice',
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/PO1'},
+                                         {1,1}}},
+                                    {element,
+                                        {{comment,
+                                             [],
+                                             'http://www.example.com/PO1'},
+                                         {0,1}}},
+                                    {element,
+                                        {{shipDate,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/PO1'},
+                                         {0,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{attribute,{country,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_attribute,{country,['USAddress'],'http://www.example.com/PO1'},
+                    [{simpleType,{'NMTOKEN',
+                                     [],
+                                     'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    ['USAddress'],
+                    optional,
+                    undefined,
+                    "US",
+                    undefined}},
+ {{element,{'USPrice',[anonymous,item,'Items'],'http://www.example.com/PO1'}},
+  {schema_element,{'USPrice',[anonymous,item,'Items'],
+                             'http://www.example.com/PO1'},
+                  [{simpleType,{decimal,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{shipDate,[anonymous,item,'Items'],'http://www.example.com/PO1'}},
+  {schema_element,{shipDate,[anonymous,item,'Items'],
+                            'http://www.example.com/PO1'},
+                  [{simpleType,{date,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {0,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{zip,['USAddress'],'http://www.example.com/PO1'}},
+  {schema_element,{zip,['USAddress'],'http://www.example.com/PO1'},
+                  [{simpleType,{decimal,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}}]
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.xml
new file mode 100644
index 0000000000..c77701b5a2
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<apo:purchaseOrder xmlns:apo="http://www.example.com/PO1"
+                   orderDate="1999-10-20">
+  <shipTo country="US">
+    <name>Alice Smith</name>
+    <street>123 Maple Street</street>
+    <!-- etc. -->
+      <city>Mill Valley</city>
+      <state>CA</state>
+      <zip>90952</zip>
+  </shipTo>
+  <billTo country="US">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <!-- etc. -->
+      <city>Old Town</city>
+      <state>PA</state>
+      <zip>95819</zip>
+  </billTo>
+  <apo:comment>Hurry, my lawn is going wild!</apo:comment>
+  <!-- etc. -->
+   <items>
+      <item partNum="872-AA">
+         <productName>Lawnmower</productName>
+         <quantity>1</quantity>
+         <USPrice>148.95</USPrice>
+         <comment>Confirm this is electric</comment>
+      </item>
+      <item partNum="926-AA">
+         <productName>Baby Monitor</productName>
+         <quantity>1</quantity>
+         <USPrice>39.98</USPrice>
+         <shipDate>1999-05-21</shipDate>
+      </item>
+   </items>
+</apo:purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.xsd
new file mode 100644
index 0000000000..bc4dae27b5
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1.xsd
@@ -0,0 +1,64 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:po="http://www.example.com/PO1"
+        targetNamespace="http://www.example.com/PO1"
+        elementFormDefault="unqualified"
+        attributeFormDefault="unqualified">
+
+  <element name="purchaseOrder" type="po:PurchaseOrderType"/>
+
+  <element name="comment" type="string"/>
+
+  <complexType name="PurchaseOrderType">
+    <sequence>
+      <element name="shipTo" type="po:USAddress"/>
+      <element name="billTo" type="po:USAddress"/>
+      <element ref="po:comment" minOccurs="0"/>
+      <element name="items"  type="po:Items"/>
+    </sequence>
+    <attribute name="orderDate" type="date"/>
+  </complexType>
+
+  <complexType name="USAddress">
+    <sequence>
+      <element name="name"   type="string"/>
+      <element name="street" type="string"/>
+      <element name="city"   type="string"/>
+      <element name="state"  type="string"/>
+      <element name="zip"    type="decimal"/>
+    </sequence>
+    <attribute name="country" type="NMTOKEN"
+                   fixed="US"/>
+  </complexType>
+
+  <complexType name="Items">
+    <sequence>
+      <element name="item" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <sequence>
+            <element name="productName" type="string"/>
+            <element name="quantity">
+              <simpleType>
+                <restriction base="positiveInteger">
+                  <maxExclusive value="100"/>
+                </restriction>
+              </simpleType>
+            </element>
+            <element name="USPrice"  type="decimal"/>
+            <element ref="po:comment"   minOccurs="0"/>
+            <element name="shipDate" type="date" minOccurs="0"/>
+          </sequence>
+          <attribute name="partNum" type="po:SKU" use="required"/>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+
+  <!-- Stock Keeping Unit, a code for identifying products -->
+  <simpleType name="SKU">
+    <restriction base="string">
+      <pattern value="\d{3}-[A-Z]{2}"/>
+    </restriction>
+  </simpleType>
+
+</schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all.xsd
new file mode 100644
index 0000000000..7383c7f8f6
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all.xsd
@@ -0,0 +1,65 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:po="http://www.example.com/PO1"
+        targetNamespace="http://www.example.com/PO1"
+        elementFormDefault="unqualified"
+        attributeFormDefault="unqualified">
+
+  <element name="purchaseOrder" type="po:PurchaseOrderType"/>
+
+  <element name="comment" type="string"/>
+
+
+  <complexType name="PurchaseOrderType">
+    <all>
+      <element name="shipTo" type="po:USAddress"/>
+      <element name="billTo" type="po:USAddress"/>
+      <element ref="po:comment" minOccurs="0"/>
+      <element name="items"  type="po:Items"/>
+    </all>
+    <attribute name="orderDate" type="date"/>
+  </complexType>
+
+  <complexType name="USAddress">
+    <sequence>
+      <element name="name"   type="string"/>
+      <element name="street" type="string"/>
+      <element name="city"   type="string"/>
+      <element name="state"  type="string"/>
+      <element name="zip"    type="decimal"/>
+    </sequence>
+    <attribute name="country" type="NMTOKEN"
+                   fixed="US"/>
+  </complexType>
+
+  <complexType name="Items">
+    <sequence>
+      <element name="item" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <sequence>
+            <element name="productName" type="string"/>
+            <element name="quantity">
+              <simpleType>
+                <restriction base="positiveInteger">
+                  <maxExclusive value="100"/>
+                </restriction>
+              </simpleType>
+            </element>
+            <element name="USPrice"  type="decimal"/>
+            <element ref="po:comment"   minOccurs="0"/>
+            <element name="shipDate" type="date" minOccurs="0"/>
+          </sequence>
+          <attribute name="partNum" type="po:SKU" use="required"/>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+
+  <!-- Stock Keeping Unit, a code for identifying products -->
+  <simpleType name="SKU">
+    <restriction base="string">
+      <pattern value="\d{3}-[A-Z]{2}"/>
+    </restriction>
+  </simpleType>
+
+</schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all1.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all1.xml
new file mode 100644
index 0000000000..a5ae223d65
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all1.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<apo:purchaseOrder xmlns:apo="http://www.example.com/PO1"
+                   orderDate="1999-10-20">
+  <billTo country="US">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <!-- etc. -->
+      <city>Old Town</city>
+      <state>PA</state>
+      <zip>95819</zip>
+  </billTo>
+  <apo:comment>Hurry, my lawn is going wild!</apo:comment>
+  <shipTo country="US">
+    <name>Alice Smith</name>
+    <street>123 Maple Street</street>
+    <!-- etc. -->
+      <city>Mill Valley</city>
+      <state>CA</state>
+      <zip>90952</zip>
+  </shipTo>
+  <!-- etc. -->
+   <items>
+      <item partNum="872-AA">
+         <productName>Lawnmower</productName>
+         <quantity>1</quantity>
+         <USPrice>148.95</USPrice>
+         <comment>Confirm this is electric</comment>
+      </item>
+      <item partNum="926-AA">
+         <productName>Baby Monitor</productName>
+         <quantity>1</quantity>
+         <USPrice>39.98</USPrice>
+         <shipDate>1999-05-21</shipDate>
+      </item>
+   </items>
+</apo:purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all2.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all2.xml
new file mode 100644
index 0000000000..2c40c8c686
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all2.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<apo:purchaseOrder xmlns:apo="http://www.example.com/PO1"
+                   orderDate="1999-10-20">
+  <billTo country="US">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <!-- etc. -->
+      <city>Old Town</city>
+      <state>PA</state>
+      <zip>95819</zip>
+  </billTo>
+  <shipTo country="US">
+    <name>Alice Smith</name>
+    <street>123 Maple Street</street>
+    <!-- etc. -->
+      <city>Mill Valley</city>
+      <state>CA</state>
+      <zip>90952</zip>
+  </shipTo>
+  <!-- etc. -->
+   <items>
+      <item partNum="872-AA">
+         <productName>Lawnmower</productName>
+         <quantity>1</quantity>
+         <USPrice>148.95</USPrice>
+         <comment>Confirm this is electric</comment>
+      </item>
+      <item partNum="926-AA">
+         <productName>Baby Monitor</productName>
+         <quantity>1</quantity>
+         <USPrice>39.98</USPrice>
+         <shipDate>1999-05-21</shipDate>
+      </item>
+   </items>
+</apo:purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all_err1.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all_err1.xml
new file mode 100644
index 0000000000..98d82e4642
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all_err1.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<apo:purchaseOrder xmlns:apo="http://www.example.com/PO1"
+                   orderDate="1999-10-20">
+  <billTo country="US">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <!-- etc. -->
+      <city>Old Town</city>
+      <state>PA</state>
+      <zip>95819</zip>
+  </billTo>
+  <apo:comment>Hurry, my lawn is going wild!</apo:comment>
+  <shipTo country="US">
+    <name>Alice Smith</name>
+    <street>123 Maple Street</street>
+    <!-- etc. -->
+      <city>Mill Valley</city>
+      <state>CA</state>
+      <zip>90952</zip>
+  </shipTo>
+  <apo:comment>Hurry, my lawn is going wild!</apo:comment>
+  <!-- etc. -->
+   <items>
+      <item partNum="872-AA">
+         <productName>Lawnmower</productName>
+         <quantity>1</quantity>
+         <USPrice>148.95</USPrice>
+         <comment>Confirm this is electric</comment>
+      </item>
+      <item partNum="926-AA">
+         <productName>Baby Monitor</productName>
+         <quantity>1</quantity>
+         <USPrice>39.98</USPrice>
+         <shipDate>1999-05-21</shipDate>
+      </item>
+   </items>
+</apo:purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all_err2.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all_err2.xml
new file mode 100644
index 0000000000..e4cc3f362e
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_all_err2.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<apo:purchaseOrder xmlns:apo="http://www.example.com/PO1"
+                   orderDate="1999-10-20">
+  <billTo country="US">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <!-- etc. -->
+      <city>Old Town</city>
+      <state>PA</state>
+      <zip>95819</zip>
+  </billTo>
+  <apo:comment>Hurry, my lawn is going wild!</apo:comment>
+  <!-- etc. -->
+   <items>
+      <item partNum="872-AA">
+         <productName>Lawnmower</productName>
+         <quantity>1</quantity>
+         <USPrice>148.95</USPrice>
+         <comment>Confirm this is electric</comment>
+      </item>
+      <item partNum="926-AA">
+         <productName>Baby Monitor</productName>
+         <quantity>1</quantity>
+         <USPrice>39.98</USPrice>
+         <shipDate>1999-05-21</shipDate>
+      </item>
+   </items>
+</apo:purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_global.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_global.xsd
new file mode 100644
index 0000000000..04a4baa0d2
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po1_global.xsd
@@ -0,0 +1,86 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:po="http://www.example.com/PO1"
+        targetNamespace="http://www.example.com/PO1">
+
+<!-- validates po2.xml -->
+
+  <element name="purchaseOrder" type="po:PurchaseOrderType"/>
+
+  <element name="shipTo"  type="po:USAddress"/>
+  <element name="billTo"  type="po:USAddress"/>
+  <element name="comment" type="string"/>
+
+  <element name="name" type="string"/>
+  <element name="street" type="string"/>
+
+  <element name="items" type="po:Items"/>
+
+  <attribute name="orderDate" type="date"/>
+
+  <element name="city" type="string"/>
+  <element name="state" type="string"/>
+  <element name="zip" type="decimal"/>
+
+  <attribute name="country" type="NMTOKEN" fixed="US"/>
+
+  <element name="item" type="po:Item"/>
+
+  <element name="productName" type="string"/>
+  <element name="quantity" type="ps:Quantity"/>
+  <element name="USPrice"  type="decimal"/>
+  <element name="shipDate" type="date"/>
+
+  <attribute name="partNum" type="po:SKU" use="required"/>
+
+  <complexType name="PurchaseOrderType">
+    <sequence>
+      <element ref="po:shipTo"/>
+      <element ref="po:billTo"/>
+      <element ref="po:comment" minOccurs="0"/>
+      <element ref="po:items"/>
+    </sequence>
+    <attribute ref="po:orderDate"/>
+  </complexType>
+
+  <complexType name="USAddress">
+    <sequence>
+      <element ref="po:name"/>
+      <element ref="po:street"/>
+      <element ref="po:city"/>
+      <element ref="po:state"/>
+      <element ref="po:zip"/>
+    </sequence>
+    <attribute ref="po:country"/>
+  </complexType>
+
+  <complexType name="Items">
+    <sequence>
+      <element ref="po:item" minOccurs="0" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <complexType name="Item">
+    <sequence>
+      <element ref="po:productName"/>
+      <element ref="po:quantity"/>
+      <element ref="po:USPrice"/>
+      <element ref="po:comment"   minOccurs="0"/>
+      <element ref="po:shipDate"  minOccurs="0"/>
+    </sequence>
+    <attribute ref="po:partNum"/>
+  </complexType>
+
+  <simpleType name="Quantity">
+     <restriction base="positiveInteger">
+        <maxExclusive value="100"/>
+     </restriction>
+  </simpleType>
+
+  <!-- Stock Keeping Unit, a code for identifying products -->
+  <simpleType name="SKU">
+    <restriction base="string">
+      <pattern value="\d{3}-[A-Z]{2}"/>
+    </restriction>
+  </simpleType>
+
+</schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po2.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/po2.xml
new file mode 100644
index 0000000000..c1077b7572
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po2.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<purchaseOrder xmlns="http://www.example.com/PO1"
+               orderDate="1999-10-20">
+  <shipTo country="US">
+    <name>Alice Smith</name>
+    <street>123 Maple Street</street>
+    <!-- etc. -->
+      <city>Mill Valley</city>
+      <state>CA</state>
+      <zip>90952</zip>
+  </shipTo>
+  <billTo country="US">
+    <name>Robert Smith</name>
+    <street>8 Oak Avenue</street>
+    <!-- etc. -->
+      <city>Old Town</city>
+      <state>PA</state>
+      <zip>95819</zip>
+  </billTo>
+  <comment>Hurry, my lawn is going wild!</comment>
+  <!-- etc. -->
+   <items>
+      <item partNum="872-AA">
+         <productName>Lawnmower</productName>
+         <quantity>1</quantity>
+         <USPrice>148.95</USPrice>
+         <comment>Confirm this is electric</comment>
+      </item>
+      <item partNum="926-AA">
+         <productName>Baby Monitor</productName>
+         <quantity>1</quantity>
+         <USPrice>39.98</USPrice>
+         <shipDate>1999-05-21</shipDate>
+      </item>
+   </items>
+</purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po_attrGroup.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/po_attrGroup.xml
new file mode 100644
index 0000000000..5e49a4a889
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po_attrGroup.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<purchaseOrder orderDate="1999-10-20">
+   <shipTo country="US">
+      <name>Alice Smith</name>
+      <street>123 Maple Street</street>
+      <city>Mill Valley</city>
+      <state>CA</state>
+      <zip>90952</zip>
+   </shipTo>
+   <billTo country="US">
+      <name>Robert Smith</name>
+      <street>8 Oak Avenue</street>
+      <city>Old Town</city>
+      <state>PA</state>
+      <zip>95819</zip>
+   </billTo>
+   <comment>Hurry, my lawn is going wild!</comment>
+   <items>
+      <item partNum="872-AA" weightKg="25.5" shipBy="any">
+         <productName>Lawnmower</productName>
+         <quantity>1</quantity>
+         <USPrice>148.95</USPrice>
+         <comment>Confirm this is electric</comment>
+      </item>
+      <item partNum="926-AA" weightKg="0.5" shipBy="air">
+         <productName>Baby Monitor</productName>
+         <quantity>1</quantity>
+         <USPrice>39.98</USPrice>
+         <shipDate>1999-05-21</shipDate>
+      </item>
+   </items>
+</purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/po_attrGroup.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/po_attrGroup.xsd
new file mode 100644
index 0000000000..734f65e0e0
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/po_attrGroup.xsd
@@ -0,0 +1,81 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+  <xsd:annotation>
+    <xsd:documentation xml:lang="en">
+     Purchase order schema for Example.com.
+     Copyright 2000 Example.com. All rights reserved.
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:element name="purchaseOrder" type="PurchaseOrderType"/>
+
+  <xsd:element name="comment" type="xsd:string"/>
+
+  <xsd:complexType name="PurchaseOrderType">
+    <xsd:sequence>
+      <xsd:element name="shipTo" type="USAddress"/>
+      <xsd:element name="billTo" type="USAddress"/>
+      <xsd:element ref="comment" minOccurs="0"/>
+      <xsd:element name="items"  type="Items"/>
+    </xsd:sequence>
+    <xsd:attribute name="orderDate" type="xsd:date"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="USAddress">
+    <xsd:sequence>
+      <xsd:element name="name"   type="xsd:string"/>
+      <xsd:element name="street" type="xsd:string"/>
+      <xsd:element name="city"   type="xsd:string"/>
+      <xsd:element name="state"  type="xsd:string"/>
+      <xsd:element name="zip"    type="xsd:decimal"/>
+    </xsd:sequence>
+    <xsd:attribute name="country" type="xsd:NMTOKEN"
+                   fixed="US"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="Items">
+    <xsd:sequence>
+      <xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="productName" type="xsd:string"/>
+            <xsd:element name="quantity">
+              <xsd:simpleType>
+                <xsd:restriction base="xsd:positiveInteger">
+                  <xsd:maxExclusive value="100"/>
+                </xsd:restriction>
+              </xsd:simpleType>
+            </xsd:element>
+            <xsd:element name="USPrice"  type="xsd:decimal"/>
+            <xsd:element ref="comment"   minOccurs="0"/>
+            <xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
+          </xsd:sequence>
+          <xsd:attributeGroup ref="ItemDelivery"/>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <!-- Stock Keeping Unit, a code for identifying products -->
+  <xsd:simpleType name="SKU">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="\d{3}-[A-Z]{2}"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:attributeGroup name="ItemDelivery">
+    <xsd:attribute name="partNum"  type="SKU" use="required"/>
+    <xsd:attribute name="weightKg" type="xsd:decimal"/>
+    <xsd:attribute name="shipBy">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="air"/>
+          <xsd:enumeration value="land"/>
+          <xsd:enumeration value="any"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+  </xsd:attributeGroup>
+
+</xsd:schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/report.tab b/lib/xmerl/test/xmerl_xsd_SUITE_data/report.tab
new file mode 100644
index 0000000000..f5c10e2683
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/report.tab
@@ -0,0 +1,850 @@
+[{{complexType,{'RegionsType',[],'http://www.example.com/Report'}},
+  {schema_complex_type,{'RegionsType',[],'http://www.example.com/Report'},
+                       undefined,
+                       false,
+                       ['RegionsType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{sequence,{[{element,
+                                        {{zip,
+                                             ['RegionsType'],
+                                             'http://www.example.com/Report'},
+                                         {1,unbounded}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{complexType,{'PurchaseOrderType',[],'http://www.example.com/IPO'}},
+  {schema_complex_type,{'PurchaseOrderType',[],'http://www.example.com/IPO'},
+                       undefined,
+                       false,
+                       ['PurchaseOrderType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{orderDate,
+                                       ['PurchaseOrderType'],
+                                       'http://www.example.com/IPO'}}],
+                       [{sequence,{[{element,
+                                        {{shipTo,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{billTo,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{comment,
+                                             [],
+                                             'http://www.example.com/IPO'},
+                                         {0,1}}},
+                                    {element,
+                                        {{items,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{element,{parts,[anonymous,purchaseReport],'http://www.example.com/Report'}},
+  {schema_element,{parts,[anonymous,purchaseReport],
+                         'http://www.example.com/Report'},
+                  [{simple_or_complex_Type,
+                       {'PartsType',[],'http://www.example.com/Report'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,purchaseReport],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{item,['Items'],'http://www.example.com/IPO'}},
+  {schema_element,{item,['Items'],'http://www.example.com/IPO'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,item,'Items'],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['Items'],
+                  undefined,
+                  {0,unbounded},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{part,[anonymous,zip,'RegionsType'],
+                 'http://www.example.com/Report'}},
+  {schema_element,{part,[anonymous,zip,'RegionsType'],
+                        'http://www.example.com/Report'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,
+                                     part,
+                                     anonymous,
+                                     zip,
+                                     'RegionsType'],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,zip,'RegionsType'],
+                  undefined,
+                  {1,unbounded},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{orderDate,['PurchaseOrderType'],'http://www.example.com/IPO'}},
+  {schema_attribute,{orderDate,['PurchaseOrderType'],
+                               'http://www.example.com/IPO'},
+                    [{simpleType,{date,[],'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    ['PurchaseOrderType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{attribute,{number,[anonymous,part,anonymous,zip,'RegionsType'],
+                     'http://www.example.com/Report'}},
+  {schema_attribute,{number,[anonymous,part,anonymous,zip,'RegionsType'],
+                            'http://www.example.com/Report'},
+                    [{simpleType,{'SKU',[],'http://www.example.com/IPO'}}],
+                    false,
+                    [anonymous,part,anonymous,zip,'RegionsType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{simpleType,{'USState',[],'http://www.example.com/IPO'}},
+  {schema_simple_type,{'USState',[],'http://www.example.com/IPO'},
+                      [],
+                      {string,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{enumeration,["AK","AL","AR","PA"]}],
+                      atomic,
+                      [{restriction,{{string,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{enumeration,"AK"},
+                                      {enumeration,"AL"},
+                                      {enumeration,"AR"},
+                                      {enumeration,"PA"}]}}]}},
+ {{complexType,{'PartsType',[],'http://www.example.com/Report'}},
+  {schema_complex_type,{'PartsType',[],'http://www.example.com/Report'},
+                       undefined,
+                       false,
+                       ['PartsType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{sequence,{[{element,
+                                        {{part,
+                                             ['PartsType'],
+                                             'http://www.example.com/Report'},
+                                         {1,unbounded}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{attribute,{partNum,[anonymous,item,'Items'],'http://www.example.com/IPO'}},
+  {schema_attribute,{partNum,[anonymous,item,'Items'],
+                             'http://www.example.com/IPO'},
+                    [{simpleType,{'SKU',[],'http://www.example.com/IPO'}}],
+                    false,
+                    [anonymous,item,'Items'],
+                    required,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{element,{shipTo,['PurchaseOrderType'],'http://www.example.com/IPO'}},
+  {schema_element,{shipTo,['PurchaseOrderType'],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'Address',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,purchaseReport],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,purchaseReport],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,purchaseReport],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{period,
+                                       [anonymous,purchaseReport],
+                                       'http://www.example.com/Report'}},
+                        {attribute,{periodEnding,
+                                       [anonymous,purchaseReport],
+                                       'http://www.example.com/Report'}}],
+                       [{sequence,{[{element,
+                                        {{regions,
+                                             [anonymous,purchaseReport],
+                                             'http://www.example.com/Report'},
+                                         {1,1}}},
+                                    {element,
+                                        {{parts,
+                                             [anonymous,purchaseReport],
+                                             'http://www.example.com/Report'},
+                                         {1,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{simpleType,{'SKU',[],'http://www.example.com/IPO'}},
+  {schema_simple_type,{'SKU',[],'http://www.example.com/IPO'},
+                      [],
+                      {string,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{pattern,"\\d{3}-[A-Z]{2}"}],
+                      atomic,
+                      [{restriction,{{string,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{pattern,"\\d{3}-[A-Z]{2}"}]}}]}},
+ {{attribute,{number,[anonymous,part,'PartsType'],
+                     'http://www.example.com/Report'}},
+  {schema_attribute,{number,[anonymous,part,'PartsType'],
+                            'http://www.example.com/Report'},
+                    [{simpleType,{'SKU',[],'http://www.example.com/IPO'}}],
+                    false,
+                    [anonymous,part,'PartsType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{attribute,{period,[anonymous,purchaseReport],
+                     'http://www.example.com/Report'}},
+  {schema_attribute,{period,[anonymous,purchaseReport],
+                            'http://www.example.com/Report'},
+                    [{simpleType,{duration,
+                                     [],
+                                     'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    [anonymous,purchaseReport],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{simpleType,{'_xmerl_no_name_',[quantity,anonymous,item,'Items'],
+                                 'http://www.w3.org/2001/XMLSchema'}},
+  {schema_simple_type,{'_xmerl_no_name_',
+                          [quantity,anonymous,item,'Items'],
+                          'http://www.w3.org/2001/XMLSchema'},
+                      [quantity,anonymous,item,'Items'],
+                      {positiveInteger,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{maxExclusive,"100"}],
+                      atomic,
+                      [{restriction,{{positiveInteger,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{maxExclusive,"100"}]}}]}},
+ {{element,{productName,[anonymous,item,'Items'],'http://www.example.com/IPO'}},
+  {schema_element,{productName,[anonymous,item,'Items'],
+                               'http://www.example.com/IPO'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{comment,[],'http://www.example.com/IPO'}},
+  {schema_element,{comment,[],'http://www.example.com/IPO'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{periodEnding,[anonymous,purchaseReport],
+                           'http://www.example.com/Report'}},
+  {schema_attribute,{periodEnding,[anonymous,purchaseReport],
+                                  'http://www.example.com/Report'},
+                    [{simpleType,{date,[],'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    [anonymous,purchaseReport],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{complexType,{'Address',[],'http://www.example.com/IPO'}},
+  {schema_complex_type,{'Address',[],'http://www.example.com/IPO'},
+                       undefined,
+                       false,
+                       ['Address'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{sequence,{[{element,
+                                        {{name,
+                                             ['Address'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{street,
+                                             ['Address'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{city,
+                                             ['Address'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{element,{purchaseOrder,[],'http://www.example.com/IPO'}},
+  {schema_element,{purchaseOrder,[],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'PurchaseOrderType',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  [],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,part,'PartsType'],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,part,'PartsType'],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,part,'PartsType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{number,
+                                       [anonymous,part,'PartsType'],
+                                       'http://www.example.com/Report'}}],
+                       [{extension,{{string,
+                                        [],
+                                        'http://www.w3.org/2001/XMLSchema'},
+                                    []}}],
+                       undefined}},
+ {{element,{zip,['RegionsType'],'http://www.example.com/Report'}},
+  {schema_element,{zip,['RegionsType'],'http://www.example.com/Report'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,zip,'RegionsType'],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['RegionsType'],
+                  undefined,
+                  {1,unbounded},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{state,['USAddress'],'http://www.example.com/IPO'}},
+  {schema_element,{state,['USAddress'],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'USState',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{items,['PurchaseOrderType'],'http://www.example.com/IPO'}},
+  {schema_element,{items,['PurchaseOrderType'],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'Items',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{simpleType,{'UKPostcode',[],'http://www.example.com/IPO'}},
+  {schema_simple_type,{'UKPostcode',[],'http://www.example.com/IPO'},
+                      [],
+                      {'Postcode',[],'http://www.example.com/IPO'},
+                      false,
+                      [],
+                      [{pattern,"[A-Z]{2}\\d\\s\\d[A-Z]{2}"}],
+                      atomic,
+                      [{restriction,{{'Postcode',
+                                         [],
+                                         'http://www.example.com/IPO'},
+                                     [{pattern,"[A-Z]{2}\\d\\s\\d[A-Z]{2}"}]}}]}},
+ {{complexType,{'Items',[],'http://www.example.com/IPO'}},
+  {schema_complex_type,{'Items',[],'http://www.example.com/IPO'},
+                       undefined,
+                       false,
+                       ['Items'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{sequence,{[{element,
+                                        {{item,
+                                             ['Items'],
+                                             'http://www.example.com/IPO'},
+                                         {0,unbounded}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{element,{quantity,[anonymous,item,'Items'],'http://www.example.com/IPO'}},
+  {schema_element,{quantity,[anonymous,item,'Items'],
+                            'http://www.example.com/IPO'},
+                  [{simpleType,{'_xmerl_no_name_',
+                                   [quantity,anonymous,item,'Items'],
+                                   'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{code,[anonymous,zip,'RegionsType'],
+                   'http://www.example.com/Report'}},
+  {schema_attribute,{code,[anonymous,zip,'RegionsType'],
+                          'http://www.example.com/Report'},
+                    [{simpleType,{positiveInteger,
+                                     [],
+                                     'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    [anonymous,zip,'RegionsType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{element,{purchaseReport,[],'http://www.example.com/Report'}},
+  {schema_element,{purchaseReport,[],'http://www.example.com/Report'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,purchaseReport],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [{unique,{unique,{dummy1,
+                                       [purchaseReport],
+                                       'http://www.example.com/Report'},
+                                   {selector,"r:regions/r:zip"},
+                                   [{field,"@code"}]}}],
+                  [],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{street,['Address'],'http://www.example.com/IPO'}},
+  {schema_element,{street,['Address'],'http://www.example.com/IPO'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['Address'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{zip,['USAddress'],'http://www.example.com/IPO'}},
+  {schema_element,{zip,['USAddress'],'http://www.example.com/IPO'},
+                  [{simpleType,{positiveInteger,
+                                   [],
+                                   'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{regions,[anonymous,purchaseReport],
+                    'http://www.example.com/Report'}},
+  {schema_element,{regions,[anonymous,purchaseReport],
+                           'http://www.example.com/Report'},
+                  [{simple_or_complex_Type,
+                       {'RegionsType',[],'http://www.example.com/Report'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,purchaseReport],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{part,['PartsType'],'http://www.example.com/Report'}},
+  {schema_element,{part,['PartsType'],'http://www.example.com/Report'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,part,'PartsType'],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PartsType'],
+                  undefined,
+                  {1,unbounded},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{city,['Address'],'http://www.example.com/IPO'}},
+  {schema_element,{city,['Address'],'http://www.example.com/IPO'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['Address'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'USAddress',[],'http://www.example.com/IPO'}},
+  {schema_complex_type,{'USAddress',[],'http://www.example.com/IPO'},
+                       undefined,
+                       false,
+                       ['USAddress'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{extension,{{'Address',
+                                        [],
+                                        'http://www.example.com/IPO'},
+                                    [{sequence,
+                                         {[{element,
+                                               {{state,
+                                                    ['USAddress'],
+                                                    'http://www.example.com/IPO'},
+                                                {1,1}}},
+                                           {element,
+                                               {{zip,
+                                                    ['USAddress'],
+                                                    'http://www.example.com/IPO'},
+                                                {1,1}}}],
+                                          {1,1}}}]}}],
+                       undefined}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,part,anonymous,zip,'RegionsType'],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,part,anonymous,zip,'RegionsType'],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,part,anonymous,zip,'RegionsType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{number,
+                                       [anonymous,
+                                        part,
+                                        anonymous,
+                                        zip,
+                                        'RegionsType'],
+                                       'http://www.example.com/Report'}},
+                        {attribute,{quantity,
+                                       [anonymous,
+                                        part,
+                                        anonymous,
+                                        zip,
+                                        'RegionsType'],
+                                       'http://www.example.com/Report'}}],
+                       [{restriction,{{anyType,
+                                          [],
+                                          'http://www.w3.org/2001/XMLSchema'},
+                                      []}}],
+                       undefined}},
+ {{element,{billTo,['PurchaseOrderType'],'http://www.example.com/IPO'}},
+  {schema_element,{billTo,['PurchaseOrderType'],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'Address',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{postcode,['UKAddress'],'http://www.example.com/IPO'}},
+  {schema_element,{postcode,['UKAddress'],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'UKPostcode',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['UKAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{schema,"report.xsd"},
+  {schema,qualified,
+          unqualified,
+          'http://www.example.com/Report',
+          [],
+          [],
+          [{element,{{purchaseReport,[],'http://www.example.com/Report'},
+                     {1,1}}}]}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,item,'Items'],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,item,'Items'],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,item,'Items'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{partNum,
+                                       [anonymous,item,'Items'],
+                                       'http://www.example.com/IPO'}}],
+                       [{sequence,{[{element,
+                                        {{productName,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{quantity,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{'USPrice',
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{comment,
+                                             [],
+                                             'http://www.example.com/IPO'},
+                                         {0,1}}},
+                                    {element,
+                                        {{shipDate,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/IPO'},
+                                         {0,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{simpleType,{'Postcode',[],'http://www.example.com/IPO'}},
+  {schema_simple_type,{'Postcode',[],'http://www.example.com/IPO'},
+                      [],
+                      {string,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{length,"7"}],
+                      atomic,
+                      [{restriction,{{string,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{length,"7"}]}}]}},
+ {{element,{'USPrice',[anonymous,item,'Items'],'http://www.example.com/IPO'}},
+  {schema_element,{'USPrice',[anonymous,item,'Items'],
+                             'http://www.example.com/IPO'},
+                  [{simpleType,{decimal,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{schema,"ipo.xsd"},
+  {schema,unqualified,
+          unqualified,
+          'http://www.example.com/IPO',
+          [],
+          [],
+          [{element,{{purchaseOrder,[],'http://www.example.com/IPO'},{1,1}}},
+           {element,{{comment,[],'http://www.example.com/IPO'},{1,1}}}]}},
+ {{attribute,{quantity,[anonymous,part,anonymous,zip,'RegionsType'],
+                       'http://www.example.com/Report'}},
+  {schema_attribute,{quantity,[anonymous,part,anonymous,zip,'RegionsType'],
+                              'http://www.example.com/Report'},
+                    [{simpleType,{positiveInteger,
+                                     [],
+                                     'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    [anonymous,part,anonymous,zip,'RegionsType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{element,{shipDate,[anonymous,item,'Items'],'http://www.example.com/IPO'}},
+  {schema_element,{shipDate,[anonymous,item,'Items'],
+                            'http://www.example.com/IPO'},
+                  [{simpleType,{date,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {0,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{exportCode,['UKAddress'],'http://www.example.com/IPO'}},
+  {schema_attribute,{exportCode,['UKAddress'],'http://www.example.com/IPO'},
+                    [{simpleType,{positiveInteger,
+                                     [],
+                                     'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    ['UKAddress'],
+                    optional,
+                    undefined,
+                    "1",
+                    undefined}},
+ {{element,{name,['Address'],'http://www.example.com/IPO'}},
+  {schema_element,{name,['Address'],'http://www.example.com/IPO'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['Address'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,zip,'RegionsType'],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,zip,'RegionsType'],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,zip,'RegionsType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{code,
+                                       [anonymous,zip,'RegionsType'],
+                                       'http://www.example.com/Report'}}],
+                       [{sequence,{[{element,
+                                        {{part,
+                                             [anonymous,zip,'RegionsType'],
+                                             'http://www.example.com/Report'},
+                                         {1,unbounded}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{complexType,{'UKAddress',[],'http://www.example.com/IPO'}},
+  {schema_complex_type,{'UKAddress',[],'http://www.example.com/IPO'},
+                       undefined,
+                       false,
+                       ['UKAddress'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{exportCode,
+                                       ['UKAddress'],
+                                       'http://www.example.com/IPO'}}],
+                       [{extension,{{'Address',
+                                        [],
+                                        'http://www.example.com/IPO'},
+                                    [{sequence,
+                                         {[{element,
+                                               {{postcode,
+                                                    ['UKAddress'],
+                                                    'http://www.example.com/IPO'},
+                                                {1,1}}}],
+                                          {1,1}}}]}}],
+                       undefined}}]
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/report.tab2 b/lib/xmerl/test/xmerl_xsd_SUITE_data/report.tab2
new file mode 100644
index 0000000000..f5c10e2683
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/report.tab2
@@ -0,0 +1,850 @@
+[{{complexType,{'RegionsType',[],'http://www.example.com/Report'}},
+  {schema_complex_type,{'RegionsType',[],'http://www.example.com/Report'},
+                       undefined,
+                       false,
+                       ['RegionsType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{sequence,{[{element,
+                                        {{zip,
+                                             ['RegionsType'],
+                                             'http://www.example.com/Report'},
+                                         {1,unbounded}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{complexType,{'PurchaseOrderType',[],'http://www.example.com/IPO'}},
+  {schema_complex_type,{'PurchaseOrderType',[],'http://www.example.com/IPO'},
+                       undefined,
+                       false,
+                       ['PurchaseOrderType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{orderDate,
+                                       ['PurchaseOrderType'],
+                                       'http://www.example.com/IPO'}}],
+                       [{sequence,{[{element,
+                                        {{shipTo,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{billTo,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{comment,
+                                             [],
+                                             'http://www.example.com/IPO'},
+                                         {0,1}}},
+                                    {element,
+                                        {{items,
+                                             ['PurchaseOrderType'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{element,{parts,[anonymous,purchaseReport],'http://www.example.com/Report'}},
+  {schema_element,{parts,[anonymous,purchaseReport],
+                         'http://www.example.com/Report'},
+                  [{simple_or_complex_Type,
+                       {'PartsType',[],'http://www.example.com/Report'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,purchaseReport],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{item,['Items'],'http://www.example.com/IPO'}},
+  {schema_element,{item,['Items'],'http://www.example.com/IPO'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,item,'Items'],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['Items'],
+                  undefined,
+                  {0,unbounded},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{part,[anonymous,zip,'RegionsType'],
+                 'http://www.example.com/Report'}},
+  {schema_element,{part,[anonymous,zip,'RegionsType'],
+                        'http://www.example.com/Report'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,
+                                     part,
+                                     anonymous,
+                                     zip,
+                                     'RegionsType'],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,zip,'RegionsType'],
+                  undefined,
+                  {1,unbounded},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{orderDate,['PurchaseOrderType'],'http://www.example.com/IPO'}},
+  {schema_attribute,{orderDate,['PurchaseOrderType'],
+                               'http://www.example.com/IPO'},
+                    [{simpleType,{date,[],'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    ['PurchaseOrderType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{attribute,{number,[anonymous,part,anonymous,zip,'RegionsType'],
+                     'http://www.example.com/Report'}},
+  {schema_attribute,{number,[anonymous,part,anonymous,zip,'RegionsType'],
+                            'http://www.example.com/Report'},
+                    [{simpleType,{'SKU',[],'http://www.example.com/IPO'}}],
+                    false,
+                    [anonymous,part,anonymous,zip,'RegionsType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{simpleType,{'USState',[],'http://www.example.com/IPO'}},
+  {schema_simple_type,{'USState',[],'http://www.example.com/IPO'},
+                      [],
+                      {string,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{enumeration,["AK","AL","AR","PA"]}],
+                      atomic,
+                      [{restriction,{{string,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{enumeration,"AK"},
+                                      {enumeration,"AL"},
+                                      {enumeration,"AR"},
+                                      {enumeration,"PA"}]}}]}},
+ {{complexType,{'PartsType',[],'http://www.example.com/Report'}},
+  {schema_complex_type,{'PartsType',[],'http://www.example.com/Report'},
+                       undefined,
+                       false,
+                       ['PartsType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{sequence,{[{element,
+                                        {{part,
+                                             ['PartsType'],
+                                             'http://www.example.com/Report'},
+                                         {1,unbounded}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{attribute,{partNum,[anonymous,item,'Items'],'http://www.example.com/IPO'}},
+  {schema_attribute,{partNum,[anonymous,item,'Items'],
+                             'http://www.example.com/IPO'},
+                    [{simpleType,{'SKU',[],'http://www.example.com/IPO'}}],
+                    false,
+                    [anonymous,item,'Items'],
+                    required,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{element,{shipTo,['PurchaseOrderType'],'http://www.example.com/IPO'}},
+  {schema_element,{shipTo,['PurchaseOrderType'],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'Address',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,purchaseReport],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,purchaseReport],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,purchaseReport],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{period,
+                                       [anonymous,purchaseReport],
+                                       'http://www.example.com/Report'}},
+                        {attribute,{periodEnding,
+                                       [anonymous,purchaseReport],
+                                       'http://www.example.com/Report'}}],
+                       [{sequence,{[{element,
+                                        {{regions,
+                                             [anonymous,purchaseReport],
+                                             'http://www.example.com/Report'},
+                                         {1,1}}},
+                                    {element,
+                                        {{parts,
+                                             [anonymous,purchaseReport],
+                                             'http://www.example.com/Report'},
+                                         {1,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{simpleType,{'SKU',[],'http://www.example.com/IPO'}},
+  {schema_simple_type,{'SKU',[],'http://www.example.com/IPO'},
+                      [],
+                      {string,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{pattern,"\\d{3}-[A-Z]{2}"}],
+                      atomic,
+                      [{restriction,{{string,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{pattern,"\\d{3}-[A-Z]{2}"}]}}]}},
+ {{attribute,{number,[anonymous,part,'PartsType'],
+                     'http://www.example.com/Report'}},
+  {schema_attribute,{number,[anonymous,part,'PartsType'],
+                            'http://www.example.com/Report'},
+                    [{simpleType,{'SKU',[],'http://www.example.com/IPO'}}],
+                    false,
+                    [anonymous,part,'PartsType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{attribute,{period,[anonymous,purchaseReport],
+                     'http://www.example.com/Report'}},
+  {schema_attribute,{period,[anonymous,purchaseReport],
+                            'http://www.example.com/Report'},
+                    [{simpleType,{duration,
+                                     [],
+                                     'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    [anonymous,purchaseReport],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{simpleType,{'_xmerl_no_name_',[quantity,anonymous,item,'Items'],
+                                 'http://www.w3.org/2001/XMLSchema'}},
+  {schema_simple_type,{'_xmerl_no_name_',
+                          [quantity,anonymous,item,'Items'],
+                          'http://www.w3.org/2001/XMLSchema'},
+                      [quantity,anonymous,item,'Items'],
+                      {positiveInteger,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{maxExclusive,"100"}],
+                      atomic,
+                      [{restriction,{{positiveInteger,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{maxExclusive,"100"}]}}]}},
+ {{element,{productName,[anonymous,item,'Items'],'http://www.example.com/IPO'}},
+  {schema_element,{productName,[anonymous,item,'Items'],
+                               'http://www.example.com/IPO'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{comment,[],'http://www.example.com/IPO'}},
+  {schema_element,{comment,[],'http://www.example.com/IPO'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{periodEnding,[anonymous,purchaseReport],
+                           'http://www.example.com/Report'}},
+  {schema_attribute,{periodEnding,[anonymous,purchaseReport],
+                                  'http://www.example.com/Report'},
+                    [{simpleType,{date,[],'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    [anonymous,purchaseReport],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{complexType,{'Address',[],'http://www.example.com/IPO'}},
+  {schema_complex_type,{'Address',[],'http://www.example.com/IPO'},
+                       undefined,
+                       false,
+                       ['Address'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{sequence,{[{element,
+                                        {{name,
+                                             ['Address'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{street,
+                                             ['Address'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{city,
+                                             ['Address'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{element,{purchaseOrder,[],'http://www.example.com/IPO'}},
+  {schema_element,{purchaseOrder,[],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'PurchaseOrderType',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  [],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,part,'PartsType'],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,part,'PartsType'],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,part,'PartsType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{number,
+                                       [anonymous,part,'PartsType'],
+                                       'http://www.example.com/Report'}}],
+                       [{extension,{{string,
+                                        [],
+                                        'http://www.w3.org/2001/XMLSchema'},
+                                    []}}],
+                       undefined}},
+ {{element,{zip,['RegionsType'],'http://www.example.com/Report'}},
+  {schema_element,{zip,['RegionsType'],'http://www.example.com/Report'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,zip,'RegionsType'],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['RegionsType'],
+                  undefined,
+                  {1,unbounded},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{state,['USAddress'],'http://www.example.com/IPO'}},
+  {schema_element,{state,['USAddress'],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'USState',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{items,['PurchaseOrderType'],'http://www.example.com/IPO'}},
+  {schema_element,{items,['PurchaseOrderType'],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'Items',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{simpleType,{'UKPostcode',[],'http://www.example.com/IPO'}},
+  {schema_simple_type,{'UKPostcode',[],'http://www.example.com/IPO'},
+                      [],
+                      {'Postcode',[],'http://www.example.com/IPO'},
+                      false,
+                      [],
+                      [{pattern,"[A-Z]{2}\\d\\s\\d[A-Z]{2}"}],
+                      atomic,
+                      [{restriction,{{'Postcode',
+                                         [],
+                                         'http://www.example.com/IPO'},
+                                     [{pattern,"[A-Z]{2}\\d\\s\\d[A-Z]{2}"}]}}]}},
+ {{complexType,{'Items',[],'http://www.example.com/IPO'}},
+  {schema_complex_type,{'Items',[],'http://www.example.com/IPO'},
+                       undefined,
+                       false,
+                       ['Items'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{sequence,{[{element,
+                                        {{item,
+                                             ['Items'],
+                                             'http://www.example.com/IPO'},
+                                         {0,unbounded}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{element,{quantity,[anonymous,item,'Items'],'http://www.example.com/IPO'}},
+  {schema_element,{quantity,[anonymous,item,'Items'],
+                            'http://www.example.com/IPO'},
+                  [{simpleType,{'_xmerl_no_name_',
+                                   [quantity,anonymous,item,'Items'],
+                                   'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{code,[anonymous,zip,'RegionsType'],
+                   'http://www.example.com/Report'}},
+  {schema_attribute,{code,[anonymous,zip,'RegionsType'],
+                          'http://www.example.com/Report'},
+                    [{simpleType,{positiveInteger,
+                                     [],
+                                     'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    [anonymous,zip,'RegionsType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{element,{purchaseReport,[],'http://www.example.com/Report'}},
+  {schema_element,{purchaseReport,[],'http://www.example.com/Report'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,purchaseReport],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [{unique,{unique,{dummy1,
+                                       [purchaseReport],
+                                       'http://www.example.com/Report'},
+                                   {selector,"r:regions/r:zip"},
+                                   [{field,"@code"}]}}],
+                  [],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{street,['Address'],'http://www.example.com/IPO'}},
+  {schema_element,{street,['Address'],'http://www.example.com/IPO'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['Address'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{zip,['USAddress'],'http://www.example.com/IPO'}},
+  {schema_element,{zip,['USAddress'],'http://www.example.com/IPO'},
+                  [{simpleType,{positiveInteger,
+                                   [],
+                                   'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['USAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{regions,[anonymous,purchaseReport],
+                    'http://www.example.com/Report'}},
+  {schema_element,{regions,[anonymous,purchaseReport],
+                           'http://www.example.com/Report'},
+                  [{simple_or_complex_Type,
+                       {'RegionsType',[],'http://www.example.com/Report'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,purchaseReport],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{part,['PartsType'],'http://www.example.com/Report'}},
+  {schema_element,{part,['PartsType'],'http://www.example.com/Report'},
+                  [{complexType,{'_xmerl_no_name_',
+                                    [anonymous,part,'PartsType'],
+                                    'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PartsType'],
+                  undefined,
+                  {1,unbounded},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{city,['Address'],'http://www.example.com/IPO'}},
+  {schema_element,{city,['Address'],'http://www.example.com/IPO'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['Address'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'USAddress',[],'http://www.example.com/IPO'}},
+  {schema_complex_type,{'USAddress',[],'http://www.example.com/IPO'},
+                       undefined,
+                       false,
+                       ['USAddress'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [],
+                       [{extension,{{'Address',
+                                        [],
+                                        'http://www.example.com/IPO'},
+                                    [{sequence,
+                                         {[{element,
+                                               {{state,
+                                                    ['USAddress'],
+                                                    'http://www.example.com/IPO'},
+                                                {1,1}}},
+                                           {element,
+                                               {{zip,
+                                                    ['USAddress'],
+                                                    'http://www.example.com/IPO'},
+                                                {1,1}}}],
+                                          {1,1}}}]}}],
+                       undefined}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,part,anonymous,zip,'RegionsType'],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,part,anonymous,zip,'RegionsType'],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,part,anonymous,zip,'RegionsType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{number,
+                                       [anonymous,
+                                        part,
+                                        anonymous,
+                                        zip,
+                                        'RegionsType'],
+                                       'http://www.example.com/Report'}},
+                        {attribute,{quantity,
+                                       [anonymous,
+                                        part,
+                                        anonymous,
+                                        zip,
+                                        'RegionsType'],
+                                       'http://www.example.com/Report'}}],
+                       [{restriction,{{anyType,
+                                          [],
+                                          'http://www.w3.org/2001/XMLSchema'},
+                                      []}}],
+                       undefined}},
+ {{element,{billTo,['PurchaseOrderType'],'http://www.example.com/IPO'}},
+  {schema_element,{billTo,['PurchaseOrderType'],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'Address',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['PurchaseOrderType'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{element,{postcode,['UKAddress'],'http://www.example.com/IPO'}},
+  {schema_element,{postcode,['UKAddress'],'http://www.example.com/IPO'},
+                  [{simple_or_complex_Type,
+                       {'UKPostcode',[],'http://www.example.com/IPO'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['UKAddress'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{schema,"report.xsd"},
+  {schema,qualified,
+          unqualified,
+          'http://www.example.com/Report',
+          [],
+          [],
+          [{element,{{purchaseReport,[],'http://www.example.com/Report'},
+                     {1,1}}}]}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,item,'Items'],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,item,'Items'],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,item,'Items'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{partNum,
+                                       [anonymous,item,'Items'],
+                                       'http://www.example.com/IPO'}}],
+                       [{sequence,{[{element,
+                                        {{productName,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{quantity,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{'USPrice',
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/IPO'},
+                                         {1,1}}},
+                                    {element,
+                                        {{comment,
+                                             [],
+                                             'http://www.example.com/IPO'},
+                                         {0,1}}},
+                                    {element,
+                                        {{shipDate,
+                                             [anonymous,item,'Items'],
+                                             'http://www.example.com/IPO'},
+                                         {0,1}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{simpleType,{'Postcode',[],'http://www.example.com/IPO'}},
+  {schema_simple_type,{'Postcode',[],'http://www.example.com/IPO'},
+                      [],
+                      {string,[],'http://www.w3.org/2001/XMLSchema'},
+                      false,
+                      [],
+                      [{length,"7"}],
+                      atomic,
+                      [{restriction,{{string,
+                                         [],
+                                         'http://www.w3.org/2001/XMLSchema'},
+                                     [{length,"7"}]}}]}},
+ {{element,{'USPrice',[anonymous,item,'Items'],'http://www.example.com/IPO'}},
+  {schema_element,{'USPrice',[anonymous,item,'Items'],
+                             'http://www.example.com/IPO'},
+                  [{simpleType,{decimal,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{schema,"ipo.xsd"},
+  {schema,unqualified,
+          unqualified,
+          'http://www.example.com/IPO',
+          [],
+          [],
+          [{element,{{purchaseOrder,[],'http://www.example.com/IPO'},{1,1}}},
+           {element,{{comment,[],'http://www.example.com/IPO'},{1,1}}}]}},
+ {{attribute,{quantity,[anonymous,part,anonymous,zip,'RegionsType'],
+                       'http://www.example.com/Report'}},
+  {schema_attribute,{quantity,[anonymous,part,anonymous,zip,'RegionsType'],
+                              'http://www.example.com/Report'},
+                    [{simpleType,{positiveInteger,
+                                     [],
+                                     'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    [anonymous,part,anonymous,zip,'RegionsType'],
+                    optional,
+                    undefined,
+                    undefined,
+                    undefined}},
+ {{element,{shipDate,[anonymous,item,'Items'],'http://www.example.com/IPO'}},
+  {schema_element,{shipDate,[anonymous,item,'Items'],
+                            'http://www.example.com/IPO'},
+                  [{simpleType,{date,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  [anonymous,item,'Items'],
+                  undefined,
+                  {0,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{attribute,{exportCode,['UKAddress'],'http://www.example.com/IPO'}},
+  {schema_attribute,{exportCode,['UKAddress'],'http://www.example.com/IPO'},
+                    [{simpleType,{positiveInteger,
+                                     [],
+                                     'http://www.w3.org/2001/XMLSchema'}}],
+                    false,
+                    ['UKAddress'],
+                    optional,
+                    undefined,
+                    "1",
+                    undefined}},
+ {{element,{name,['Address'],'http://www.example.com/IPO'}},
+  {schema_element,{name,['Address'],'http://www.example.com/IPO'},
+                  [{simpleType,{string,[],'http://www.w3.org/2001/XMLSchema'}}],
+                  false,
+                  undefined,
+                  [],
+                  ['Address'],
+                  undefined,
+                  {1,1},
+                  undefined,
+                  undefined,
+                  false,
+                  [],
+                  []}},
+ {{complexType,{'_xmerl_no_name_',[anonymous,zip,'RegionsType'],
+                                  'http://www.w3.org/2001/XMLSchema'}},
+  {schema_complex_type,{'_xmerl_no_name_',
+                           [anonymous,zip,'RegionsType'],
+                           'http://www.w3.org/2001/XMLSchema'},
+                       undefined,
+                       false,
+                       [anonymous,zip,'RegionsType'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{code,
+                                       [anonymous,zip,'RegionsType'],
+                                       'http://www.example.com/Report'}}],
+                       [{sequence,{[{element,
+                                        {{part,
+                                             [anonymous,zip,'RegionsType'],
+                                             'http://www.example.com/Report'},
+                                         {1,unbounded}}}],
+                                   {1,1}}}],
+                       undefined}},
+ {{complexType,{'UKAddress',[],'http://www.example.com/IPO'}},
+  {schema_complex_type,{'UKAddress',[],'http://www.example.com/IPO'},
+                       undefined,
+                       false,
+                       ['UKAddress'],
+                       undefined,
+                       [],
+                       [],
+                       false,
+                       'element-only',
+                       [{attribute,{exportCode,
+                                       ['UKAddress'],
+                                       'http://www.example.com/IPO'}}],
+                       [{extension,{{'Address',
+                                        [],
+                                        'http://www.example.com/IPO'},
+                                    [{sequence,
+                                         {[{element,
+                                               {{postcode,
+                                                    ['UKAddress'],
+                                                    'http://www.example.com/IPO'},
+                                                {1,1}}}],
+                                          {1,1}}}]}}],
+                       undefined}}]
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/report.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/report.xsd
new file mode 100644
index 0000000000..8db7b8219f
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/report.xsd
@@ -0,0 +1,82 @@
+<schema targetNamespace="http://www.example.com/Report"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:r="http://www.example.com/Report"
+        xmlns:xipo="http://www.example.com/IPO"
+        elementFormDefault="qualified">
+
+  <!-- for SKU -->
+  <import namespace="http://www.example.com/IPO"/>
+
+  <annotation>
+    <documentation xml:lang="en">
+      Report schema for Example.com
+      Copyright 2000 Example.com. All rights reserved.
+    </documentation>
+  </annotation>
+
+  <element name="purchaseReport">
+    <complexType>
+      <sequence>
+        <element name="regions" type="r:RegionsType"/>
+          
+        <element name="parts" type="r:PartsType"/>
+      </sequence>
+      <attribute name="period"       type="duration"/>
+      <attribute name="periodEnding" type="date"/>
+    </complexType>
+
+    <unique name="dummy1">
+      <selector xpath="r:regions/r:zip"/>
+      <field xpath="@code"/>
+    </unique>
+
+    <key name="pNumKey">
+      <selector xpath="r:parts/r:part"/>
+      <field xpath="@number"/>
+    </key>
+
+    <keyref name="dummy2" refer="r:pNumKey">
+      <selector xpath="r:regions/r:zip/r:part"/>
+      <field xpath="@number"/>
+    </keyref>
+
+  </element>
+
+  <complexType name="RegionsType">
+    <sequence>
+      <element name="zip" maxOccurs="unbounded">
+        <complexType>
+          <sequence>
+            <element name="part" maxOccurs="unbounded">
+              <complexType>
+                <complexContent>
+                  <restriction base="anyType">
+                    <attribute name="number"   type="xipo:SKU"/>
+                    <attribute name="quantity" type="positiveInteger"/>
+                  </restriction>
+                </complexContent>
+              </complexType>
+            </element>
+          </sequence>
+          <attribute name="code" type="positiveInteger"/>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+
+  <complexType name="PartsType">
+    <sequence>
+      <element name="part" maxOccurs="unbounded">
+        <complexType>
+          <simpleContent>
+            <extension base="string">
+              <attribute name="number" type="xipo:SKU"/>
+            </extension>
+          </simpleContent>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+
+</schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/report2.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/report2.xsd
new file mode 100644
index 0000000000..a114cad4f2
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/report2.xsd
@@ -0,0 +1,82 @@
+<schema targetNamespace="http://www.example.com/Report"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:r="http://www.example.com/Report"
+        xmlns:xipo="http://www.example.com/IPO"
+        elementFormDefault="qualified">
+
+  <!-- for SKU -->
+  <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd"/>
+
+  <annotation>
+    <documentation xml:lang="en">
+      Report schema for Example.com
+      Copyright 2000 Example.com. All rights reserved.
+    </documentation>
+  </annotation>
+
+  <element name="purchaseReport">
+    <complexType>
+      <sequence>
+        <element name="regions" type="r:RegionsType"/>
+          
+        <element name="parts" type="r:PartsType"/>
+      </sequence>
+      <attribute name="period"       type="duration"/>
+      <attribute name="periodEnding" type="date"/>
+    </complexType>
+
+    <unique name="dummy1">
+      <selector xpath="r:regions/r:zip"/>
+      <field xpath="@code"/>
+    </unique>
+
+    <key name="pNumKey">
+      <selector xpath="r:parts/r:part"/>
+      <field xpath="@number"/>
+    </key>
+
+    <keyref name="dummy2" refer="r:pNumKey">
+      <selector xpath="r:regions/r:zip/r:part"/>
+      <field xpath="@number"/>
+    </keyref>
+
+  </element>
+
+  <complexType name="RegionsType">
+    <sequence>
+      <element name="zip" maxOccurs="unbounded">
+        <complexType>
+          <sequence>
+            <element name="part" maxOccurs="unbounded">
+              <complexType>
+                <complexContent>
+                  <restriction base="anyType">
+                    <attribute name="number"   type="xipo:SKU"/>
+                    <attribute name="quantity" type="positiveInteger"/>
+                  </restriction>
+                </complexContent>
+              </complexType>
+            </element>
+          </sequence>
+          <attribute name="code" type="positiveInteger"/>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+
+  <complexType name="PartsType">
+    <sequence>
+      <element name="part" maxOccurs="unbounded">
+        <complexType>
+          <simpleContent>
+            <extension base="string">
+              <attribute name="number" type="xipo:SKU"/>
+            </extension>
+          </simpleContent>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+
+</schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/simple_int.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/simple_int.xsd
new file mode 100644
index 0000000000..12f98421dc
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/simple_int.xsd
@@ -0,0 +1,13 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+  <xsd:annotation>
+    <xsd:documentation xml:lang="en">
+     Purchase order schema for Example.com.
+     Copyright 2000 Example.com. All rights reserved.
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:element name="purchaseOrder" type="xsd:int"/>
+
+  <xsd:element name="comment" type="xsd:string"/>
+</xsd:schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/IntegratedSite.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/IntegratedSite.xsd
new file mode 100644
index 0000000000..e211b313c2
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/IntegratedSite.xsd
@@ -0,0 +1,5238 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ericsson.com/is/isco/IntegratedSite" xmlns="http://www.ericsson.com/is/isco/IntegratedSite" xmlns:nc="http://www.ericsson.com/is/isco/nc" xmlns:IsTypes="http://www.ericsson.com/is/isco/IsTypes" xmlns:MainSwitch="http://www.ericsson.com/is/isco/MainSwitch_1" xmlns:MyBsModel="http://www.ericsson.com/is/isco/MyBsModel_1">
+  <xsd:annotation>
+    <xsd:appinfo>
+      <mim file="bs_mim.xml" version=""/>
+      <mim file="cpd_mim.xml" version=""/>
+      <mim file="hwm_mim.xml" version=""/>
+      <mim file="swm_mim.xml" version=""/>
+      <mim file="top_mim.xml" version=""/>
+    </xsd:appinfo>
+  </xsd:annotation>
+  <xsd:import schemaLocation="nc.xsd" namespace="http://www.ericsson.com/is/isco/nc"/>
+  <xsd:import schemaLocation="IsTypes.xsd" namespace="http://www.ericsson.com/is/isco/IsTypes"/>
+  <xsd:import schemaLocation="MainSwitch_1.xsd" namespace="http://www.ericsson.com/is/isco/MainSwitch_1"/>
+  <xsd:import schemaLocation="MyBsModel_1.xsd" namespace="http://www.ericsson.com/is/isco/MyBsModel_1"/>
+  <xsd:complexType name="JobData">
+    <xsd:annotation>
+      <xsd:documentation>
+        Data to specify a jobs progress, status etc during its execution.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="jobDateOrdered">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType0">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="jobStatus" type="JobStatus"/>
+      <xsd:element name="jobResult" type="JobResult"/>
+      <xsd:element name="jobInfo">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType1">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="jobProgress" type="Unsigned32"/>
+      <xsd:element name="jobLaststep" type="Unsigned32"/>
+      <xsd:element name="jobProgressReport">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType2">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="BladeUgSpecification">
+    <xsd:annotation>
+      <xsd:documentation>
+        Specification of a blade when an upgrade job is ordered for a
+        specific blade. This data always belongs to and is included in
+        an upgrade job for a blade system.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="ixBladeSubrack" type="Unsigned32"/>
+      <xsd:element name="ixBladeSlot" type="Unsigned32"/>
+      <xsd:element name="bladeSwgProdnr">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType1">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="bladeSwgVersion">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType1">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="FTPData">
+    <xsd:annotation>
+      <xsd:documentation>
+        Data to specify FTP server info, such as host, user, 
+        password and path, to locate correct files or destination
+        for files.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="host">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType1">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="user">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType1">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="password">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType1">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="path">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType1">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="HwmKnockOutType">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType3">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="HwmOperationalStateType">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType4">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="SwgStatus">
+    <xsd:annotation>
+      <xsd:documentation>
+        Indicates status of software groups. A software group is 
+        complete if all included load module containers have been 
+        downloaded and unpacked correctly. A software group is inconsistent
+        if the checksums of the load module containers do not match the
+        information in the system information CXP, or if the XML 
+        data could not be registered.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType5">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="HwmBusTypeType">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType6">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="Unsigned32">
+    <xsd:annotation>
+      <xsd:documentation>
+        Datatype for an integer according to SNMPv2 definition of
+        unsigned32.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType7">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="JobResult">
+    <xsd:annotation>
+      <xsd:documentation>
+        Possible results of an action for a job.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType8">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="HwmAdministrativeStateType">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType9">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="ContainerType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Type of a load module container.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType10">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="MatchStrategy">
+    <xsd:annotation>
+      <xsd:documentation>
+        Interpretation of given filename and path.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType11">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="DownloadStrategy">
+    <xsd:annotation>
+      <xsd:documentation>
+        Interpretation according to existing files.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType12">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="JobStatus">
+    <xsd:annotation>
+      <xsd:documentation>
+        Indicator of job status.
+        A job should be started immediately, but could be postponed
+        if the total load on the system would become too high.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType13">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="HwmAvailabilityStatusType">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType14">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="HwmSlotStateType">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType15">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:element name="model">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="Is" minOccurs="0" maxOccurs="1">
+          <xsd:annotation>
+            <xsd:documentation>
+              The top class - the forefather of all classes.
+              
+              Key attributes: []
+              
+              Possible children:
+              Hardware
+              Software
+              NetworkConfiguration
+              BladeSystems
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="Hardware" minOccurs="0" maxOccurs="1">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Functional area Hardware Management
+                    
+                    Key attributes: []
+                    
+                    Possible children:
+                    BladeType
+                    Subrack
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="BladeType" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          This class describes a Blade.
+                          
+                          Key attributes: [key]
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="key">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The blade type number like CNA12801
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="name">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The name of the Blade Type.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="width">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The width of the blade in number of slots.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:integer">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="oneGLinks">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The 1G links used by the blade type , like 0,1, counted from
+                                the leftmost backplane position.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="linkAggregates">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The 1G links used for link aggregation by the blade type , like 0-1,
+                                counted from the leftmost backplane position.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="hasHwData">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                True if possible to read product info via the maintenance bus.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType2">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="isMxb">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                True if this is a Main Switch blade type.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="availOneGSlots">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Only valid for main switch blades. A list of slots that have 1G link. 
+                                Could be a single slot or a range or a combination thereof. 
+                                E.g. 1-24, or 1,3-13,15-24.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="aggregateRanges">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Only valid for main switch blades. Specifies which slots can be used 
+                                for link aggregation. Ranges are specified in the form 1-12,13-24.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="Subrack" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          This class describes the subrack.
+                          
+                          Key attributes: [id]
+                          
+                          Possible children:
+                          Slot
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="id">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Identifies a certain subrack.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType16">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="type">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The type of subrack.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="userLabel">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                A user friendly Subrack name.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="position">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The subrack position in the cabinet.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="cabinetPosition">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The cabinet position in the site.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="location">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The site location, e.g. the visiting address.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="availableOneGSlots">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Available slots for 1G switch links. Information taken from the type 
+                                of main switch blade that is created in the subrack.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="availableTenGSlots">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Available slots for 10G switch links. Information taken from the type 
+                                of main switch blade that is created in the subrack.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="aggregateSlots">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Links ranges for (1G) link aggregation. Information taken from the
+                                type of main switch blade that is created in the subrack.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="Slot" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                This table corresponds to slots, there is one row in the table
+                                for each slot. The slots are grouped per subrack. A slot is
+                                identified by subrack Id and slot number). The subrack Id for a slot
+                                identifies in the subrackTable the subrack that the slot belongs
+                                to.
+                                
+                                Key attributes: [number]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="number">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The value of this object identifies the
+                                      slot position within the subrack.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType17">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="state" type="HwmSlotStateType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      See HwmSlotStateType description.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="bladeSystem">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The value of this object identifies the Blade System that uses this 
+                                      slot.  An instances of this object will only have meaning in a 
+                                      conceptual row if the value of hemSlotState instance is either
+                                      usedOccupied  or usedEmpty in the same conceptual row,
+                                      i.e. there is an Blade System created using this slot. (If
+                                      no Blade System is using the slot, the value will be -1.)
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="xsd:integer">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="Software" minOccurs="0" maxOccurs="1">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Top class of structure for SWM MOM.
+                    
+                    Key attributes: []
+                    
+                    Possible children:
+                    Inventory
+                    Jobs
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="Inventory" minOccurs="0" maxOccurs="1">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Subclass to top class Software. Parent of
+                          Inventory classes:
+                             SoftwareDeliveryPackage,
+                             SoftwareGroup,
+                             LocalBackup,
+                             Alarm.
+                          Inventory actions:
+                             DownloadFile
+                             ImportBackup
+                          Only system created data for info and overview,
+                          sometimes as a result of an action called by the
+                          operator.
+                          
+                          Key attributes: []
+                          
+                          Possible children:
+                          Alarm
+                          LocalBackup
+                          SoftwareDeliveryPackage
+                          SoftwareGroup
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="Alarm" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                MO of all alarms logged in the system that has not been
+                                taken care of in a satisfactory way.
+                                
+                                Key attributes: [alarmId]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="alarmId" type="Unsigned32"/>
+                                <xsd:element minOccurs="0" name="faultyBladeSystem">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="faultCause">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="faultInfo">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="LocalBackup" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                All available backups locally stored.
+                                
+                                Key attributes: [localBackupId]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="localBackupId" type="Unsigned32"/>
+                                <xsd:element minOccurs="0" name="name">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="bladeSystem">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="date">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType0">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="size" type="Unsigned32"/>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="SoftwareDeliveryPackage" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                MO for info about LoadModuleContainers, ie CXPs.
+                                
+                                Key attributes: [ixProdNr,ixVersion]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="ixProdNr">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="ixVersion">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="name">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="type" type="ContainerType"/>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="SoftwareGroup" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                This class reference to multiple MOs of class
+                                SoftwareDeliveryPackage, ie the relationship between
+                                CXPs and CXS.
+                                
+                                Key attributes: [ixProdnr,ixVersion]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="ixProdnr">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="ixVersion">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="name">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="systemProdNr">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="systemVersion">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="systemName">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="integratedSystemProdNr">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="integratedSystemVersion">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="integratedSystemName">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="relatedCXPs">
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType18">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="status" type="SwgStatus"/>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="Jobs" minOccurs="0" maxOccurs="1">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Subclass to top class Software. Parent of
+                          Jobs classes:
+                             DownloadFile,
+                             Upgrade,
+                             Backup.
+                          System created data through ordered job actions.
+                          
+                          Key attributes: []
+                          
+                          Possible children:
+                          Backup
+                          DownloadFile
+                          Upgrade
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="Backup" minOccurs="0" maxOccurs="1">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Subclass to class Jobs. Parent of
+                                Jobs classes:
+                                   Create,
+                                   Restore
+                                   Import,
+                                   Export.System created data through ordered backup job actions.
+                                
+                                Key attributes: []
+                                
+                                Possible children:
+                                Create
+                                Export
+                                Import
+                                Restore
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="Create" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      This MO handles creation of backups of the system.
+                                      
+                                      Key attributes: [backupJobId]
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="backupJobId">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="jobData" type="JobData"/>
+                                      <xsd:element minOccurs="0" name="backupId" type="Unsigned32"/>
+                                      <xsd:element minOccurs="0" name="targetBladeSystem">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="backupName">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="Export" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      This MO handles export of locally stored backup files to 
+                                      the FTP server.
+                                      
+                                      Key attributes: [exportJobId]
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="exportJobId">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="jobData" type="JobData"/>
+                                      <xsd:element minOccurs="0" name="ftpData" type="FTPData"/>
+                                      <xsd:element minOccurs="0" name="backupId" type="Unsigned32"/>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="Import" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      This MO handles import of backup files from the FTP server.
+                                      The backup file is stored locally, but not loaded into the system.
+                                      
+                                      Key attributes: [importJobId]
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="importJobId">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="jobData" type="JobData"/>
+                                      <xsd:element minOccurs="0" name="ftpData" type="FTPData"/>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="Restore" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      This MO handles restore of backups of the system.
+                                      
+                                      Key attributes: [restoreJobId]
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="restoreJobId">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="jobData" type="JobData"/>
+                                      <xsd:element minOccurs="0" name="backupId" type="Unsigned32"/>
+                                      <xsd:element minOccurs="0" name="targetBladeSystem">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="backupName">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="DownloadFile" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                This MO contains information about requested, ongoing,
+                                and completed software file download jobs. To start a
+                                download job the operator calls an action Inventory class,
+                                and a new instance of this MO is created.
+                                For load regulating reasons a requested job may not start 
+                                immediately. 
+                                
+                                Key attributes: [downloadFileJobId]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="downloadFileJobId">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="jobData" type="JobData"/>
+                                <xsd:element minOccurs="0" name="ftpData" type="FTPData"/>
+                                <xsd:element minOccurs="0" name="matchStrategy" type="MatchStrategy"/>
+                                <xsd:element minOccurs="0" name="downloadStrategy" type="DownloadStrategy"/>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="Upgrade" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                This MO handles upgrade jobs towards the system. The operator
+                                may specify a specific blade to run the upgrade on, instead of
+                                running an upgrade on the entire blade system.
+                                
+                                Key attributes: [upgradeJobId]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="upgradeJobId">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="jobData" type="JobData"/>
+                                <xsd:element minOccurs="0" name="bladeSystem">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="selectedSwgProdNr">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="selectedSwgVersion">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="selectedCxrProdNr">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="selectedCxrVersion">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="MaxTime" type="Unsigned32">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The maximum time allowed for the SW Upgrade
+                                      job to finish. After this time, the job will be interrupted.
+                                      The value 0 means that MaxTime will be given the
+                                      timer value registered with the Blade System Software Group
+                                      Version. If no such value has been registered,
+                                      MaxTime will be given a system default timer value.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="bladeUgSpecification" type="BladeUgSpecification"/>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="NetworkConfiguration" minOccurs="0" maxOccurs="1">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The MO branch where the common Network resources are configured.
+                    
+                    Key attributes: []
+                    
+                    Possible children:
+                    IsIpTrafficClass
+                    IsLanTrafficClass
+                    IsLogicalNetwork
+                    IsVariables
+                    IsVlan
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="IsIpTrafficClass" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Key attributes: [name]
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="name">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Name if the IS IP Traffic Class. 
+                                Unique within the entire Integrated Site.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="description">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Short description of the IS IP Traffic Class.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="dscp">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                DiffServ Code Point setting for this IS IP Traffic Class.
+                                If there are two IS Ip Traffic Classes with the same DSCP, they
+                                both must refer to an IS Lan Traffic Class with identical P-bit setting.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:integer">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="isLanTrafficClass">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Reference to a Managed Object of type ISLanTrafficClass.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType19">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="IsLanTrafficClass" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          An IS Lan Traffic Class may be shared between several Blade Systems.
+                          
+                          Key attributes: [name]
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="name">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Name of the IS Lan Traffic Class. 
+                                Unique within the entire Integrated Site.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="description">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Short description of the IS Lan Traffic Class.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="pbits">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                P-bit setting for this IS Lan Traffic Class.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType20">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="IsLogicalNetwork" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          An IS Logical Network contains one or more IS Subnets. 
+                          It may be shared between several Blade Systems.
+                          
+                          Key attributes: [name]
+                          
+                          Possible children:
+                          IsSubnet
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="name">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Name of the IS Logical Network. 
+                                Unique within the entire Integrated Site.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="description">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Short description of the IS logical network.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="IsSubnet" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                An IS Subnet contains one or more IS Subnet Segments. 
+                                It may be shared between several Blade Systems.
+                                
+                                Key attributes: [name]
+                                
+                                Possible children:
+                                IsSubnetSegment
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="name">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Name of the IS Subnet. Unique within the IS Logical Network.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Short description of the IS Subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="address" type="IsTypes:IpAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      IP network address of the IS Subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="mask">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Prefix length of the IP network address.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType21">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="broadcastAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Broadcast address of the IS Subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isVlanId">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Identity of an IS VLAN.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="IsSubnetSegment" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      An IS Subnet Segment may be shared between several Blade Systems.
+                                      
+                                      Key attributes: [name]
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="name">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Name of the IS Subnet Segment. Unique within the IS Subnet.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="description">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Short description of the IS Subnet Segment.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="address" type="IsTypes:IpAddress">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            IP network address of the IS Subnet Segment.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="mask">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Prefix length of the IP network address.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType21">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="routerAddress" type="IsTypes:IpAddress">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Router address for the IS Subnet.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="dhcpEnabled">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Flag that controls wheter DHCP should be enabled or not for this 
+                                            IS Subnet Segment.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType2">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="IsVariables" minOccurs="0" maxOccurs="1">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Key attributes: []
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element minOccurs="0" name="updateMode">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType22">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="dataModelVersion">
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="major">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="xsd:integer">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="minor">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="xsd:integer">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="rlspMarkerGenerateInterval">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The RLSP marker generate interval in microseconds.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType7">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="timezoneDstRule">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Daylight savings rule in posix standard format.
+                                Better description to be supplied later........and a regular expression
+                                which describes the valid string format.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="dnsDomain">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The dns domain used by IS in the DNS-server.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType23">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="notifyAfter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Number of seconds from that a new network configuration has been 
+                                published until the Blade Systems will apply the changes.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:integer">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="defaultDhcpLeaseTime">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The default DHCP Lease time in seconds.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:integer">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="lifeTimeDhcpLeaseTime">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The lifetime of a DHCP lease in seconds.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:integer">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="IsVlan" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          An IS Vlan may be shared between several Blade Systems.
+                          
+                          Key attributes: [identity]
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="identity">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Identity of the IS Vlan. Unique within the entire Integrated Site.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType24">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="description">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Short description of the IS Vlan.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="BladeSystems" minOccurs="0" maxOccurs="1">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The BladeSystems mountpoint - parent of all blade systems.
+                    
+                    Key attributes: []
+                    
+                    Possible children:
+                    BladeSystemTemplate
+                    Mxb
+                    MyBsModel
+                    Sis
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="Mxb" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          This class describes a Blade System. It will be cloned for each
+                          new blade system type registered in the system.  The new clone
+                          will serve as a mountpoint for the blade system specific model.
+                          
+                          Key attributes: [name]
+                          
+                          Possible children:
+                          Blade
+                          BsIpTrafficClass
+                          BsLanTrafficClass
+                          BsLogicalNetwork
+                          BsVlan
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="name">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                A user friendly Blade System name, must be set at creation and can be 
+                                changed when BS is locked.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="no">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                An identifier for the BS. A new integer has to be used every time a new
+                                BS is created. ??? Kvar ???
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:integer">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="softwareGroupId">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The identity of the Software Group (SWG) that the BS implements.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="softwareGroupRevision">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The revision of the Software Group (SWG) that the BS implements.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="admState" type="HwmAdministrativeStateType">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The administrative state of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="opState" type="HwmOperationalStateType">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The operational state of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="availStatus" type="HwmAvailabilityStatusType">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The availability status of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="locked">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                eller s�tta admState ????????????
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType2">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="description">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Short description of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="bsomAddress" type="IsTypes:IpAddress">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                IP address of the Blade System OaM Master.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element name="Blade" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                This class describes a Blade. 
+                                A Blade is identified by the subrack and slot number.
+                                
+                                Key attributes: [subrackId,slotNo]
+                                
+                                Possible children:
+                                LinkSap
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="subrackId">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      A reference to the associated subrack (i.e. the value of 'subrackId' 
+                                      for the associated subrack)
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType16">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="slotNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The slot number for this Blade within the subrack.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType17">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="slotLabel">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The slot label of the blade. Will only be set at creation of table row.
+                                      This should be used in alarms related to the slot to inform the
+                                      operator of what position in the subrack the blade is located in.
+                                      E.g. for GEM subracks it will be a string like X02 for slot 0
+                                      up to X80 for slot 25.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="bsNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      An identifier for the BS to which the blade belongs. 
+                                      A value of 0 means that the blade is inserted in the subrack but it 
+                                      has not been configured to any BS yet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="xsd:integer">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="type">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The type of the Blade defined by a string BladTypeIdAndRev.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgLowestId">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgLowestRev">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgActualId">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgActualRev">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="bsom">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType2">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="knockOutType" type="HwmKnockOutType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Set to protected if blade sholud no be knocked out before the 
+                                      switch blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="userLabel">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      A user friendly Blade name, always possible to set.
+                                      Default value indicates HwmBladeType and used slot.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="admState" type="HwmAdministrativeStateType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The administrative state of the Blade. The Blade is
+                                      unblocked by setting this object to unlocked and blocked
+                                      by setting it to locked. If the object already has the
+                                      desired value or the hwmBladeOpState has a transient OpState value
+                                      the set operation will be rejected. The set operation may be
+                                       rejected due to other reasons as well.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="opState" type="HwmOperationalStateType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The operational state of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="availState" type="HwmAvailabilityStatusType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The availability status of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="busType" type="HwmBusTypeType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The type of maintenance bus on the found Blade
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="prodNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Product Number of the found Blade
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="prodRev">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Product Revision of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="serialNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Serial Number of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="prodName">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Product Name of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="vendor">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Vendor name of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="mfgDate">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The manufacturing date of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="macAddressAggregate" type="IsTypes:MacAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The aggregated MAC address of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="macAddressLeft" type="IsTypes:MacAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The left link MAC address of the found Blade. Only used by some blades
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="macAddressRight" type="IsTypes:MacAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The right link MAC address of the found Blade. Only used by some blades
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="changeDate">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The date when the blade was last changed.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="lock">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Borde kanske varfa en �ndring av admstate.????
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType2">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="name">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The name of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Short description of the blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isbsAddress" type="IsTypes:IpAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      IP address on the ISBS subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isobAddress" type="IsTypes:IpAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      IP address on the ISOB subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="islctAddress" type="IsTypes:IpAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      IP address on the ISLCT subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element name="LinkSap" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      A Blade may have one or more resilient interfaces to the backplane. Such
+                                      interface is called Link Service Access Point and are automatically 
+                                      created and deleted along with the hosting blade.
+                                      
+                                      Key attributes: [id]
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="id">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            The id of a LinkSap is a number from 0 to X within the slot.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="xsd:integer">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="description">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Short description of the Link Service Access Point.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsIpTrafficClass" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Key attributes: [id]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="id">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isIpTrafficClassRef">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType25">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsLanTrafficClass" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Key attributes: [id]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="id">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isLanTrafficClassRef">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType19">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsLogicalNetwork" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Key attributes: [name]
+                                
+                                Possible children:
+                                BsSubnet
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="name">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Name of the BS logical network. Unique within the Blade System.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Short description of the BS Logical Network.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="private">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Flag that shows whether the BS Logical Network is private for this
+                                      Blade System or if it may be shared among several Blade Systems.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType2">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isLogicalNetworkRef">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Reference to the corresponding IS Logical Network.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType26">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="BsSubnet" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      BS Subnets can either be created manually by the operator or they 
+                                      can be automatically created from pre-registered network requirements 
+                                      bundled with the Blade System software.
+                                      Regardless of how they are created, 
+                                      each one needs to be mapped to both a BS VLan and an 
+                                      IS Subnet before blades can be unlocked via the Hardware service.
+                                      Each BS Subnet contains one or more BS Subnet Segments.  
+                                      
+                                      Key attributes: [name]
+                                      
+                                      Possible children:
+                                      BsSubnetSegment
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="name">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Name of the BS Subnet. Unique within the BS Logical Network.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="description">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Short description of the BS Subnet.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="bsVlanRef">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType27">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="isSubnetRef">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType28">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element name="BsSubnetSegment" minOccurs="0" maxOccurs="unbounded">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            BS Subnet Segments can either be created manually by you or they can 
+                                            be automatically created from pre-registered network requirements 
+                                            bundled with the Blade System software. Regardless of how they are created,
+                                            each one needs to be mapped to an IS Subnet Segment before the blades 
+                                            can be unlocked via the Hardware service. 
+                                            The mapping is done with the 'isSubnetSegmentRef' attribute.
+                                            
+                                            Key attributes: [name]
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:sequence>
+                                            <xsd:element name="name">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Name of the BS Subnet Segment. Unique within the BS Subnet.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType1">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="description">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Short description of the BS Subnet Segment.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType1">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="numOfIpaddresses">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Number of required IP addresses in the IS Subnet Segment.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="xsd:integer">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="dhcpEnabled">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Flag that controls whether the corresponding IS Subnet Segment is 
+                                                  required to have DHCP enabled or not.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType2">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="routerRequired">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Flag that controls whether the corresponding IS Subnet Segment is 
+                                                  required to have a router configured or not.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType2">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="isSubnetSegmentRef">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  The mapping to a corresponding IS Subnet Segment. The mapping here must 
+                                                  be done before the blades of the blade system can be unlocked.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType29">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                          </xsd:sequence>
+                                          <xsd:attribute ref="nc:operation"/>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsVlan" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                BS VLANs can either be created manually by the 
+                                operator or they can be automatically created from pre-registered 
+                                network requirements bundled with the Blade System software. 
+                                Regardless of how they are created, each one needs to be mapped to 
+                                an IS VLAN before the blades can be unlocked.
+                                
+                                Key attributes: [name]
+                                
+                                Possible children:
+                                BsVlanSap
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="name">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Name of the BS Vlan. Unique within the Blade System.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Short description of the BS Vlan.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isVlanRef">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The mapping to a corresponding IS Vlan. This mapping must be done before
+                                      the blades of the Blade System can be unlocked.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType30">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="BsVlanSap" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      BS VLAN Service Access Points can either be created manually by the 
+                                      operator or they can be automatically created from pre-registered 
+                                      network requirements bundled with the Blade System software. 
+                                      Regardless of how they are created, each one needs to be mapped to 
+                                      an Link SAP before the blades can be unlocked.
+                                      
+                                      Key attributes: [name]
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="name">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Name of the BS VLAN SAP. Uniqie within the BS VLAN.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="description">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Short description of the BS VLAN SAP.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="static">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Flag which controls whether this BS VLAN SAP makes static or dynamic 
+                                            use of the corresponding IS VLAN.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType2">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="protected">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Flag which controls whether this BS VLAN SAP should be 
+                                            isolation protected or not.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType2">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="linkSapRef">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            A mapping to the corresponding Link Service Access Point.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType31">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="MyBsModel" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          This class describes a Blade System. It will be cloned for each
+                          new blade system type registered in the system.  The new clone
+                          will serve as a mountpoint for the blade system specific model.
+                          
+                          Key attributes: [name]
+                          
+                          Possible children:
+                          Blade
+                          BsIpTrafficClass
+                          BsLanTrafficClass
+                          BsLogicalNetwork
+                          BsVlan
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="name">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                A user friendly Blade System name, must be set at creation and can be 
+                                changed when BS is locked.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="no">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                An identifier for the BS. A new integer has to be used every time a new
+                                BS is created. ??? Kvar ???
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:integer">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="softwareGroupId">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The identity of the Software Group (SWG) that the BS implements.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="softwareGroupRevision">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The revision of the Software Group (SWG) that the BS implements.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="admState" type="HwmAdministrativeStateType">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The administrative state of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="opState" type="HwmOperationalStateType">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The operational state of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="availStatus" type="HwmAvailabilityStatusType">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The availability status of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="locked">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                eller s�tta admState ????????????
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType2">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="description">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Short description of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="bsomAddress" type="IsTypes:IpAddress">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                IP address of the Blade System OaM Master.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element name="Blade" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                This class describes a Blade. 
+                                A Blade is identified by the subrack and slot number.
+                                
+                                Key attributes: [subrackId,slotNo]
+                                
+                                Possible children:
+                                LinkSap
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="subrackId">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      A reference to the associated subrack (i.e. the value of 'subrackId' 
+                                      for the associated subrack)
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType16">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="slotNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The slot number for this Blade within the subrack.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType17">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="slotLabel">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The slot label of the blade. Will only be set at creation of table row.
+                                      This should be used in alarms related to the slot to inform the
+                                      operator of what position in the subrack the blade is located in.
+                                      E.g. for GEM subracks it will be a string like X02 for slot 0
+                                      up to X80 for slot 25.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="bsNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      An identifier for the BS to which the blade belongs. 
+                                      A value of 0 means that the blade is inserted in the subrack but it 
+                                      has not been configured to any BS yet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="xsd:integer">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="type">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The type of the Blade defined by a string BladTypeIdAndRev.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgLowestId">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgLowestRev">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgActualId">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgActualRev">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="bsom">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType2">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="knockOutType" type="HwmKnockOutType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Set to protected if blade sholud no be knocked out before the 
+                                      switch blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="userLabel">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      A user friendly Blade name, always possible to set.
+                                      Default value indicates HwmBladeType and used slot.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="admState" type="HwmAdministrativeStateType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The administrative state of the Blade. The Blade is
+                                      unblocked by setting this object to unlocked and blocked
+                                      by setting it to locked. If the object already has the
+                                      desired value or the hwmBladeOpState has a transient OpState value
+                                      the set operation will be rejected. The set operation may be
+                                       rejected due to other reasons as well.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="opState" type="HwmOperationalStateType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The operational state of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="availState" type="HwmAvailabilityStatusType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The availability status of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="busType" type="HwmBusTypeType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The type of maintenance bus on the found Blade
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="prodNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Product Number of the found Blade
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="prodRev">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Product Revision of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="serialNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Serial Number of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="prodName">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Product Name of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="vendor">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Vendor name of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="mfgDate">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The manufacturing date of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="macAddressAggregate" type="IsTypes:MacAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The aggregated MAC address of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="macAddressLeft" type="IsTypes:MacAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The left link MAC address of the found Blade. Only used by some blades
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="macAddressRight" type="IsTypes:MacAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The right link MAC address of the found Blade. Only used by some blades
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="changeDate">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The date when the blade was last changed.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="lock">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Borde kanske varfa en �ndring av admstate.????
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType2">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="name">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The name of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Short description of the blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isbsAddress" type="IsTypes:IpAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      IP address on the ISBS subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isobAddress" type="IsTypes:IpAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      IP address on the ISOB subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="islctAddress" type="IsTypes:IpAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      IP address on the ISLCT subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element name="LinkSap" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      A Blade may have one or more resilient interfaces to the backplane. Such
+                                      interface is called Link Service Access Point and are automatically 
+                                      created and deleted along with the hosting blade.
+                                      
+                                      Key attributes: [id]
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="id">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            The id of a LinkSap is a number from 0 to X within the slot.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="xsd:integer">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="description">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Short description of the Link Service Access Point.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsIpTrafficClass" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Key attributes: [id]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="id">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isIpTrafficClassRef">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType25">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsLanTrafficClass" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Key attributes: [id]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="id">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isLanTrafficClassRef">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType19">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsLogicalNetwork" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Key attributes: [name]
+                                
+                                Possible children:
+                                BsSubnet
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="name">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Name of the BS logical network. Unique within the Blade System.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Short description of the BS Logical Network.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="private">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Flag that shows whether the BS Logical Network is private for this
+                                      Blade System or if it may be shared among several Blade Systems.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType2">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isLogicalNetworkRef">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Reference to the corresponding IS Logical Network.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType26">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="BsSubnet" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      BS Subnets can either be created manually by the operator or they 
+                                      can be automatically created from pre-registered network requirements 
+                                      bundled with the Blade System software.
+                                      Regardless of how they are created, 
+                                      each one needs to be mapped to both a BS VLan and an 
+                                      IS Subnet before blades can be unlocked via the Hardware service.
+                                      Each BS Subnet contains one or more BS Subnet Segments.  
+                                      
+                                      Key attributes: [name]
+                                      
+                                      Possible children:
+                                      BsSubnetSegment
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="name">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Name of the BS Subnet. Unique within the BS Logical Network.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="description">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Short description of the BS Subnet.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="bsVlanRef">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType27">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="isSubnetRef">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType28">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element name="BsSubnetSegment" minOccurs="0" maxOccurs="unbounded">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            BS Subnet Segments can either be created manually by you or they can 
+                                            be automatically created from pre-registered network requirements 
+                                            bundled with the Blade System software. Regardless of how they are created,
+                                            each one needs to be mapped to an IS Subnet Segment before the blades 
+                                            can be unlocked via the Hardware service. 
+                                            The mapping is done with the 'isSubnetSegmentRef' attribute.
+                                            
+                                            Key attributes: [name]
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:sequence>
+                                            <xsd:element name="name">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Name of the BS Subnet Segment. Unique within the BS Subnet.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType1">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="description">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Short description of the BS Subnet Segment.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType1">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="numOfIpaddresses">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Number of required IP addresses in the IS Subnet Segment.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="xsd:integer">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="dhcpEnabled">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Flag that controls whether the corresponding IS Subnet Segment is 
+                                                  required to have DHCP enabled or not.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType2">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="routerRequired">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Flag that controls whether the corresponding IS Subnet Segment is 
+                                                  required to have a router configured or not.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType2">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="isSubnetSegmentRef">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  The mapping to a corresponding IS Subnet Segment. The mapping here must 
+                                                  be done before the blades of the blade system can be unlocked.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType29">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                          </xsd:sequence>
+                                          <xsd:attribute ref="nc:operation"/>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsVlan" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                BS VLANs can either be created manually by the 
+                                operator or they can be automatically created from pre-registered 
+                                network requirements bundled with the Blade System software. 
+                                Regardless of how they are created, each one needs to be mapped to 
+                                an IS VLAN before the blades can be unlocked.
+                                
+                                Key attributes: [name]
+                                
+                                Possible children:
+                                BsVlanSap
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="name">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Name of the BS Vlan. Unique within the Blade System.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Short description of the BS Vlan.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isVlanRef">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The mapping to a corresponding IS Vlan. This mapping must be done before
+                                      the blades of the Blade System can be unlocked.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType30">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="BsVlanSap" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      BS VLAN Service Access Points can either be created manually by the 
+                                      operator or they can be automatically created from pre-registered 
+                                      network requirements bundled with the Blade System software. 
+                                      Regardless of how they are created, each one needs to be mapped to 
+                                      an Link SAP before the blades can be unlocked.
+                                      
+                                      Key attributes: [name]
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="name">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Name of the BS VLAN SAP. Uniqie within the BS VLAN.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="description">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Short description of the BS VLAN SAP.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="static">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Flag which controls whether this BS VLAN SAP makes static or dynamic 
+                                            use of the corresponding IS VLAN.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType2">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="protected">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Flag which controls whether this BS VLAN SAP should be 
+                                            isolation protected or not.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType2">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="linkSapRef">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            A mapping to the corresponding Link Service Access Point.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType31">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element ref="MyBsModel:model" minOccurs="0" maxOccurs="1"/>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="Sis" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          This class describes a Blade System. It will be cloned for each
+                          new blade system type registered in the system.  The new clone
+                          will serve as a mountpoint for the blade system specific model.
+                          
+                          Key attributes: [name]
+                          
+                          Possible children:
+                          Blade
+                          BsIpTrafficClass
+                          BsLanTrafficClass
+                          BsLogicalNetwork
+                          BsVlan
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="name">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                A user friendly Blade System name, must be set at creation and can be 
+                                changed when BS is locked.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="no">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                An identifier for the BS. A new integer has to be used every time a new
+                                BS is created. ??? Kvar ???
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:integer">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="softwareGroupId">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The identity of the Software Group (SWG) that the BS implements.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="softwareGroupRevision">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The revision of the Software Group (SWG) that the BS implements.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="admState" type="HwmAdministrativeStateType">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The administrative state of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="opState" type="HwmOperationalStateType">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The operational state of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="availStatus" type="HwmAvailabilityStatusType">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                The availability status of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="locked">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                eller s�tta admState ????????????
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType2">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="description">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Short description of the Blade System.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType1">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="bsomAddress" type="IsTypes:IpAddress">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                IP address of the Blade System OaM Master.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element name="Blade" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                This class describes a Blade. 
+                                A Blade is identified by the subrack and slot number.
+                                
+                                Key attributes: [subrackId,slotNo]
+                                
+                                Possible children:
+                                LinkSap
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="subrackId">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      A reference to the associated subrack (i.e. the value of 'subrackId' 
+                                      for the associated subrack)
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType16">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="slotNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The slot number for this Blade within the subrack.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType17">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="slotLabel">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The slot label of the blade. Will only be set at creation of table row.
+                                      This should be used in alarms related to the slot to inform the
+                                      operator of what position in the subrack the blade is located in.
+                                      E.g. for GEM subracks it will be a string like X02 for slot 0
+                                      up to X80 for slot 25.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="bsNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      An identifier for the BS to which the blade belongs. 
+                                      A value of 0 means that the blade is inserted in the subrack but it 
+                                      has not been configured to any BS yet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="xsd:integer">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="type">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The type of the Blade defined by a string BladTypeIdAndRev.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgLowestId">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgLowestRev">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgActualId">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="swgActualRev">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The SW group of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="bsom">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType2">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="knockOutType" type="HwmKnockOutType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Set to protected if blade sholud no be knocked out before the 
+                                      switch blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="userLabel">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      A user friendly Blade name, always possible to set.
+                                      Default value indicates HwmBladeType and used slot.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="admState" type="HwmAdministrativeStateType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The administrative state of the Blade. The Blade is
+                                      unblocked by setting this object to unlocked and blocked
+                                      by setting it to locked. If the object already has the
+                                      desired value or the hwmBladeOpState has a transient OpState value
+                                      the set operation will be rejected. The set operation may be
+                                       rejected due to other reasons as well.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="opState" type="HwmOperationalStateType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The operational state of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="availState" type="HwmAvailabilityStatusType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The availability status of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="busType" type="HwmBusTypeType">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The type of maintenance bus on the found Blade
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="prodNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Product Number of the found Blade
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="prodRev">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Product Revision of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="serialNo">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Serial Number of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="prodName">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Product Name of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="vendor">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The Vendor name of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="mfgDate">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The manufacturing date of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="macAddressAggregate" type="IsTypes:MacAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The aggregated MAC address of the found Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="macAddressLeft" type="IsTypes:MacAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The left link MAC address of the found Blade. Only used by some blades
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="macAddressRight" type="IsTypes:MacAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The right link MAC address of the found Blade. Only used by some blades
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="changeDate">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The date when the blade was last changed.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="lock">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Borde kanske varfa en �ndring av admstate.????
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType2">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="name">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The name of the Blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Short description of the blade.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isbsAddress" type="IsTypes:IpAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      IP address on the ISBS subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isobAddress" type="IsTypes:IpAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      IP address on the ISOB subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="islctAddress" type="IsTypes:IpAddress">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      IP address on the ISLCT subnet.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                </xsd:element>
+                                <xsd:element name="LinkSap" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      A Blade may have one or more resilient interfaces to the backplane. Such
+                                      interface is called Link Service Access Point and are automatically 
+                                      created and deleted along with the hosting blade.
+                                      
+                                      Key attributes: [id]
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="id">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            The id of a LinkSap is a number from 0 to X within the slot.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="xsd:integer">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="description">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Short description of the Link Service Access Point.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsIpTrafficClass" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Key attributes: [id]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="id">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isIpTrafficClassRef">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType25">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsLanTrafficClass" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Key attributes: [id]
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="id">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isLanTrafficClassRef">
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType19">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsLogicalNetwork" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Key attributes: [name]
+                                
+                                Possible children:
+                                BsSubnet
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="name">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Name of the BS logical network. Unique within the Blade System.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Short description of the BS Logical Network.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="private">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Flag that shows whether the BS Logical Network is private for this
+                                      Blade System or if it may be shared among several Blade Systems.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType2">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isLogicalNetworkRef">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Reference to the corresponding IS Logical Network.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType26">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="BsSubnet" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      BS Subnets can either be created manually by the operator or they 
+                                      can be automatically created from pre-registered network requirements 
+                                      bundled with the Blade System software.
+                                      Regardless of how they are created, 
+                                      each one needs to be mapped to both a BS VLan and an 
+                                      IS Subnet before blades can be unlocked via the Hardware service.
+                                      Each BS Subnet contains one or more BS Subnet Segments.  
+                                      
+                                      Key attributes: [name]
+                                      
+                                      Possible children:
+                                      BsSubnetSegment
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="name">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Name of the BS Subnet. Unique within the BS Logical Network.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="description">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Short description of the BS Subnet.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="bsVlanRef">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType27">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="isSubnetRef">
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType28">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element name="BsSubnetSegment" minOccurs="0" maxOccurs="unbounded">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            BS Subnet Segments can either be created manually by you or they can 
+                                            be automatically created from pre-registered network requirements 
+                                            bundled with the Blade System software. Regardless of how they are created,
+                                            each one needs to be mapped to an IS Subnet Segment before the blades 
+                                            can be unlocked via the Hardware service. 
+                                            The mapping is done with the 'isSubnetSegmentRef' attribute.
+                                            
+                                            Key attributes: [name]
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:sequence>
+                                            <xsd:element name="name">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Name of the BS Subnet Segment. Unique within the BS Subnet.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType1">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="description">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Short description of the BS Subnet Segment.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType1">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="numOfIpaddresses">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Number of required IP addresses in the IS Subnet Segment.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="xsd:integer">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="dhcpEnabled">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Flag that controls whether the corresponding IS Subnet Segment is 
+                                                  required to have DHCP enabled or not.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType2">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="routerRequired">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  Flag that controls whether the corresponding IS Subnet Segment is 
+                                                  required to have a router configured or not.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType2">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                            <xsd:element minOccurs="0" name="isSubnetSegmentRef">
+                                              <xsd:annotation>
+                                                <xsd:documentation>
+                                                  The mapping to a corresponding IS Subnet Segment. The mapping here must 
+                                                  be done before the blades of the blade system can be unlocked.
+                                                </xsd:documentation>
+                                              </xsd:annotation>
+                                              <xsd:complexType>
+                                                <xsd:simpleContent>
+                                                  <xsd:extension base="ccsHelperType29">
+                                                    <xsd:attribute ref="nc:operation"/>
+                                                  </xsd:extension>
+                                                </xsd:simpleContent>
+                                              </xsd:complexType>
+                                            </xsd:element>
+                                          </xsd:sequence>
+                                          <xsd:attribute ref="nc:operation"/>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="BsVlan" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                BS VLANs can either be created manually by the 
+                                operator or they can be automatically created from pre-registered 
+                                network requirements bundled with the Blade System software. 
+                                Regardless of how they are created, each one needs to be mapped to 
+                                an IS VLAN before the blades can be unlocked.
+                                
+                                Key attributes: [name]
+                                
+                                Possible children:
+                                BsVlanSap
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="name">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Name of the BS Vlan. Unique within the Blade System.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="description">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      Short description of the BS Vlan.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType1">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element minOccurs="0" name="isVlanRef">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      The mapping to a corresponding IS Vlan. This mapping must be done before
+                                      the blades of the Blade System can be unlocked.
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:simpleContent>
+                                      <xsd:extension base="ccsHelperType30">
+                                        <xsd:attribute ref="nc:operation"/>
+                                      </xsd:extension>
+                                    </xsd:simpleContent>
+                                  </xsd:complexType>
+                                </xsd:element>
+                                <xsd:element name="BsVlanSap" minOccurs="0" maxOccurs="unbounded">
+                                  <xsd:annotation>
+                                    <xsd:documentation>
+                                      BS VLAN Service Access Points can either be created manually by the 
+                                      operator or they can be automatically created from pre-registered 
+                                      network requirements bundled with the Blade System software. 
+                                      Regardless of how they are created, each one needs to be mapped to 
+                                      an Link SAP before the blades can be unlocked.
+                                      
+                                      Key attributes: [name]
+                                    </xsd:documentation>
+                                  </xsd:annotation>
+                                  <xsd:complexType>
+                                    <xsd:sequence>
+                                      <xsd:element name="name">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Name of the BS VLAN SAP. Uniqie within the BS VLAN.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="description">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Short description of the BS VLAN SAP.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType1">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="static">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Flag which controls whether this BS VLAN SAP makes static or dynamic 
+                                            use of the corresponding IS VLAN.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType2">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="protected">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            Flag which controls whether this BS VLAN SAP should be 
+                                            isolation protected or not.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType2">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                      <xsd:element minOccurs="0" name="linkSapRef">
+                                        <xsd:annotation>
+                                          <xsd:documentation>
+                                            A mapping to the corresponding Link Service Access Point.
+                                          </xsd:documentation>
+                                        </xsd:annotation>
+                                        <xsd:complexType>
+                                          <xsd:simpleContent>
+                                            <xsd:extension base="ccsHelperType31">
+                                              <xsd:attribute ref="nc:operation"/>
+                                            </xsd:extension>
+                                          </xsd:simpleContent>
+                                        </xsd:complexType>
+                                      </xsd:element>
+                                    </xsd:sequence>
+                                    <xsd:attribute ref="nc:operation"/>
+                                  </xsd:complexType>
+                                </xsd:element>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element ref="MainSwitch:model" minOccurs="0" maxOccurs="1"/>
+            </xsd:sequence>
+            <xsd:attribute ref="nc:operation"/>
+          </xsd:complexType>
+        </xsd:element>
+      </xsd:sequence>
+      <xsd:attribute ref="nc:operation"/>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:simpleType name="ccsHelperType31">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*LinkSap\[id='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType30">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*IsVlan\[identity='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType29">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*IsSubnetSegment\[name='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType28">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*IsSubnet\[name='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType27">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*BsVlan\[name='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType26">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*IsLogicalNetwork\[name='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType25">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*IsIpTrafficClass\[name='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType24">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="4096"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType23">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="[a-zA-Z]+(.[a-zA-Z])*"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType22">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="unsafe"/>
+      <xsd:enumeration value="readOnly"/>
+      <xsd:enumeration value="safe"/>
+      <xsd:enumeration value="preliminary"/>
+      <xsd:enumeration value="prepare"/>
+      <xsd:enumeration value="publish"/>
+      <xsd:enumeration value="accept"/>
+      <xsd:enumeration value="reject"/>
+      <xsd:enumeration value="purge"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType21">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="32"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType20">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="7"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType19">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*IsLanTrafficClass\[name='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType18">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*SoftwareDeliveryPackage\[ixProdNr='[^\]]+'\]\[ixVersion='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType17">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="25"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType16">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="31"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType15">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="unsuedEmpty"/>
+      <xsd:enumeration value="usedEmpty"/>
+      <xsd:enumeration value="unusedOccupied"/>
+      <xsd:enumeration value="usedOccupied"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType14">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="available"/>
+      <xsd:enumeration value="failed"/>
+      <xsd:enumeration value="offLine"/>
+      <xsd:enumeration value="dependency"/>
+      <xsd:enumeration value="degraded"/>
+      <xsd:enumeration value="upgrading"/>
+      <xsd:enumeration value="startingUp"/>
+      <xsd:enumeration value="goingOffLine"/>
+      <xsd:enumeration value="notInstalled"/>
+      <xsd:enumeration value="powerOff"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType13">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="notStarted"/>
+      <xsd:enumeration value="ongoing"/>
+      <xsd:enumeration value="complete"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType12">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="onlyIfMissing"/>
+      <xsd:enumeration value="always"/>
+      <xsd:enumeration value="unknown"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType11">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="exact"/>
+      <xsd:enumeration value="prefix"/>
+      <xsd:enumeration value="unknown"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType10">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="bladeSystemInformation"/>
+      <xsd:enumeration value="bladeInformation"/>
+      <xsd:enumeration value="application"/>
+      <xsd:enumeration value="rootFileSystem"/>
+      <xsd:enumeration value="kernel"/>
+      <xsd:enumeration value="correction"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType9">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="locked"/>
+      <xsd:enumeration value="shuttingdown"/>
+      <xsd:enumeration value="unlocked"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType8">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="ok"/>
+      <xsd:enumeration value="inputError"/>
+      <xsd:enumeration value="executionError"/>
+      <xsd:enumeration value="unknown"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType7">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="4294967295"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType6">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="ipmi"/>
+      <xsd:enumeration value="mbus"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType5">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="complete"/>
+      <xsd:enumeration value="incomplete"/>
+      <xsd:enumeration value="inconsistent"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType4">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="disabled"/>
+      <xsd:enumeration value="enabled"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType3">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="normal"/>
+      <xsd:enumeration value="protected"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType2">
+    <xsd:restriction base="xsd:boolean">
+      <xsd:pattern value="(true|false)"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType1">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType0">
+    <xsd:restriction base="xsd:dateTime">
+      <xsd:whiteSpace value="collapse"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+</xsd:schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/IsTypes.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/IsTypes.xsd
new file mode 100644
index 0000000000..a9607e4253
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/IsTypes.xsd
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ericsson.com/is/isco/IsTypes" xmlns="http://www.ericsson.com/is/isco/IsTypes" xmlns:nc="http://www.ericsson.com/is/isco/nc">
+  <xsd:annotation>
+    <xsd:appinfo>
+      <mim file="types_mim.xml" version=""/>
+    </xsd:appinfo>
+  </xsd:annotation>
+  <xsd:import schemaLocation="nc.xsd" namespace="http://www.ericsson.com/is/isco/nc"/>
+  <xsd:complexType name="IpAddress">
+    <xsd:annotation>
+      <xsd:documentation>
+        An IPv4 address 
+        in the form v1.v2.v3.v4 where v1 ... v4 is a
+        decimal number in the range 0 to 255.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType0">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="MacAddress">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType1">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:simpleType name="ccsHelperType1">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="[A-F0-9][A-F0-9]?:[A-F0-9][A-F0-9]?:[A-F0-9][A-F0-9]?:[A-F0-9][A-F0-9]?:[A-F0-9][A-F0-9]?:[A-F0-9][A-F0-9]?"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType0">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+</xsd:schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/MainSwitch_1.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/MainSwitch_1.xsd
new file mode 100644
index 0000000000..9c91d6efd6
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/MainSwitch_1.xsd
@@ -0,0 +1,1496 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ericsson.com/is/isco/MainSwitch_1" xmlns="http://www.ericsson.com/is/isco/MainSwitch_1" xmlns:nc="http://www.ericsson.com/is/isco/nc">
+  <xsd:annotation>
+    <xsd:appinfo>
+      <mim file="mx_mim.xml" version=""/>
+    </xsd:appinfo>
+  </xsd:annotation>
+  <xsd:import schemaLocation="nc.xsd" namespace="http://www.ericsson.com/is/isco/nc"/>
+  <xsd:complexType name="SubrackNum">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType0">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="LinkAggregationData">
+    <xsd:annotation>
+      <xsd:documentation>
+        Description of Link Aggregation Data
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="aggrPortActorPort">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:integer">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="aggrPortOperState">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="item" type="LinkAggregationOperStateData" minOccurs="8" maxOccurs="8"/>
+          </xsd:sequence>
+          <xsd:attribute ref="nc:operation"/>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="ifIndex">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:integer">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="mode">
+        <xsd:annotation>
+          <xsd:documentation>
+            Port Channel Mode
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType1">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="configuredPorts">
+        <xsd:annotation>
+          <xsd:documentation>
+            Number of configured ports for this interface.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:integer">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="activePorts">
+        <xsd:annotation>
+          <xsd:documentation>
+            Number of active ports for this interface.
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:integer">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="macSelectionPolicy">
+        <xsd:annotation>
+          <xsd:documentation>
+            MAC Selection Policy
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType2">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="linkSelectionPolicy">
+        <xsd:annotation>
+          <xsd:documentation>
+            Link Selection Policy
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType3">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="aggregatorMac">
+        <xsd:annotation>
+          <xsd:documentation>
+            MAC address of Aggregator
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType4">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="actorId">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType4">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="actorPrio">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:integer">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="actorAdminKey">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:integer">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="actorOperKey">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:integer">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="partnerId">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType4">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="partnerPrio">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:integer">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="partnerOperKey">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:integer">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="PercentUsage">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType5">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="BladeSlotLink">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType6">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="CosQueueConfigurationData">
+    <xsd:annotation>
+      <xsd:documentation>
+        Description of COS configuration data
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="queue">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType7">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="buffer" type="PercentUsage">
+        <xsd:annotation>
+          <xsd:documentation>
+            Indicates allocated buffer in percent
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="scheduling">
+        <xsd:annotation>
+          <xsd:documentation>
+            Indicates if Sceduling is Weighted Round Robin (WRR) or Strict Priority
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType8">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="weight">
+        <xsd:annotation>
+          <xsd:documentation>
+            Indicates if Weight in case of WRR is High, Medium or Low
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType9">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="VlanData">
+    <xsd:annotation>
+      <xsd:documentation>
+        This struct describes Vlan data
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="vlanId">
+        <xsd:annotation>
+          <xsd:documentation>
+            Vlan Id 
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType10">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="vlanType">
+        <xsd:annotation>
+          <xsd:documentation>
+            Type of Vlan
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType11">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="isolationStatus">
+        <xsd:annotation>
+          <xsd:documentation>
+            Isolation status
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType12">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="StatisticCounter">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:integer">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="PbitQueue">
+    <xsd:sequence>
+      <xsd:element name="pbitKey">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType7">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="queueValue">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType7">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="LinkAggregationOperStateData">
+    <xsd:annotation>
+      <xsd:documentation>
+        Description of Link Aggregation Oper State Data
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="lacpActivity">
+        <xsd:annotation>
+          <xsd:documentation>
+            Indicates LACP activity
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType13">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="lacpTimeout">
+        <xsd:annotation>
+          <xsd:documentation>
+            Indicates if LACP timeout is long or short
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType14">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="aggregation">
+        <xsd:annotation>
+          <xsd:documentation>
+            Indicates if Individual or Aggregatable
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType15">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="syncronization">
+        <xsd:annotation>
+          <xsd:documentation>
+            Indicates if Syncronized or not
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType16">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="collecting">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType17">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="distributing">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType17">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="defaulted">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType17">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="expired">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType17">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="MxbSlot">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType18">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="TresholdPercent">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType19">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="PbitToQueueMapping">
+    <xsd:annotation>
+      <xsd:documentation>
+        Description of Pbit to queue mapping
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="bladeSlotLink" type="BladeSlotLink"/>
+      <xsd:element name="interface">
+        <xsd:annotation>
+          <xsd:documentation>
+            Interface number
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:integer">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="pbitQueue">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="item" type="PbitQueue" minOccurs="8" maxOccurs="8"/>
+          </xsd:sequence>
+          <xsd:attribute ref="nc:operation"/>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="VlanIds">
+    <xsd:sequence>
+      <xsd:element name="vlanId">
+        <xsd:annotation>
+          <xsd:documentation>
+            Vlan Id 
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType10">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:element name="model">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="Vlan" minOccurs="0" maxOccurs="1">
+          <xsd:annotation>
+            <xsd:documentation>
+              Administrative and Operative Vlans
+              
+              Key attributes: []
+              
+              Possible children:
+              VlanAdmin
+              VlanOper
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="VlanAdmin" minOccurs="0" maxOccurs="31">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    This class shows the Administrative configured Vlans
+                    
+                    Key attributes: [subrackNum]
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="subrackNum" type="SubrackNum"/>
+                    <xsd:element minOccurs="0" name="numberOfDefinedVlans">
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="xsd:integer">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="vlanIds">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Information about defined Vlan Ids
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="item" type="VlanIds" minOccurs="0" maxOccurs="unbounded"/>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="VlanOper" minOccurs="0" maxOccurs="31">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    This class shows the Operative Vlans
+                    
+                    Key attributes: [subrackNum]
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="subrackNum" type="SubrackNum"/>
+                    <xsd:element minOccurs="0" name="numberOfActiveVlans">
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="xsd:integer">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="vlanIds">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Information about operative Vlan Ids
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="item" type="VlanIds" minOccurs="0" maxOccurs="unbounded"/>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute ref="nc:operation"/>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element name="Cos" minOccurs="0" maxOccurs="1">
+          <xsd:annotation>
+            <xsd:documentation>
+              This class describes the Class of Service function.
+              
+              Key attributes: []
+              
+              Possible children:
+              Pbit
+              Queue
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element minOccurs="0" name="administrativeQueueConfiguration">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Description of administrative Queue Configuration Data
+                    to be applied for each subrack (or whole system?)
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="item" type="CosQueueConfigurationData" minOccurs="0" maxOccurs="unbounded"/>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="administrativePbitToQueueMapping">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Description of administrative Pbit to Queue mapping.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="item" type="PbitToQueueMapping" minOccurs="0" maxOccurs="unbounded"/>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="operationalQueueConfiguration">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Description operational Queue Configuration Data
+                    to be applied for actual subrack and Mxb.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="item" type="CosQueueConfigurationData" minOccurs="0" maxOccurs="unbounded"/>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="operationalPbitToQueueMapping">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Description of operational Pbit to Queue mapping.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="item" type="PbitToQueueMapping" minOccurs="0" maxOccurs="unbounded"/>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="Pbit" minOccurs="0" maxOccurs="8">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    This class is used to set the Pbit to queue table.
+                    
+                    Key attributes: [bladeSlotLink]
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="bladeSlotLink" type="BladeSlotLink"/>
+                    <xsd:element minOccurs="0" name="pbitQueue">
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="item" type="PbitQueue" minOccurs="8" maxOccurs="8"/>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="Queue" minOccurs="0" maxOccurs="8">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    This class is used to set the Queue Data table.
+                    
+                    Key attributes: [queueKey]
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="queueKey">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Queue value 0 to 7.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType7">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="queueData">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Queue Configuration Data to be applied for the whole system.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="item" type="CosQueueConfigurationData" minOccurs="0" maxOccurs="unbounded"/>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute ref="nc:operation"/>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element name="State" minOccurs="0" maxOccurs="1">
+          <xsd:annotation>
+            <xsd:documentation>
+              This class describes data to be read for a Mxb.
+              
+              Key attributes: []
+              
+              Possible children:
+              StateBlade
+              StateLink
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="StateBlade" minOccurs="0" maxOccurs="64">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    This class describes data related to a specific Mxb.
+                    
+                    Key attributes: [subrackNum,mxbSlot]
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="subrackNum" type="SubrackNum"/>
+                    <xsd:element name="mxbSlot" type="MxbSlot"/>
+                    <xsd:element minOccurs="0" name="description">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Description of type of Mxb.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType4">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="ipAddress">
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType4">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="upTime">
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType4">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="remoteMxbHost">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Indicates if the other Mxb in the subrack is present or absent.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType4">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="executingSoftwareVersion">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Software version executing.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType4">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="flashLoadedSoftwareVersion">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Software version in flash memory.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType4">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="fallbackSoftwareVersion">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Fallback software version.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType4">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="ipmiFirmwareVersion">
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType4">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="bootLoaderVersion">
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType4">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="hwVersion">
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType4">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="StateLink" minOccurs="0" maxOccurs="1">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    This class describes actual state data for a specific link
+                    related to the Mxb.
+                    
+                    Key attributes: []
+                    
+                    Possible children:
+                    StateLa
+                    StateVlan
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="StateLa" minOccurs="0" maxOccurs="1536">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          This class describes the state of the Blade Slot Links with
+                          regards to Link Aggregation info.
+                          
+                          Key attributes: [subrackNum,bladeSlotLink,mxbSlot]
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="subrackNum" type="SubrackNum"/>
+                          <xsd:element name="bladeSlotLink" type="BladeSlotLink"/>
+                          <xsd:element name="mxbSlot" type="MxbSlot"/>
+                          <xsd:element minOccurs="0" name="linkAggregationData">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Description of Link Aggregation info for 
+                                actual subrack, Mxb and Blade Slot Link.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="item" type="LinkAggregationData" minOccurs="16" maxOccurs="16"/>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="StateVlan" minOccurs="0" maxOccurs="768">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          This class describes the state of the Blade Slot Links with
+                          regards to Vlan info.
+                          
+                          Key attributes: [subrackNum,bladeSlotLink]
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="subrackNum" type="SubrackNum"/>
+                          <xsd:element name="bladeSlotLink" type="BladeSlotLink"/>
+                          <xsd:element minOccurs="0" name="vlanData">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Description of Vlans for actual subrack and Blade Slot Link
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:sequence>
+                                <xsd:element name="item" type="VlanData" minOccurs="0" maxOccurs="unbounded"/>
+                              </xsd:sequence>
+                              <xsd:attribute ref="nc:operation"/>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute ref="nc:operation"/>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element name="Pm" minOccurs="0" maxOccurs="1">
+          <xsd:annotation>
+            <xsd:documentation>
+              This class describes the Performance Monitoring function.
+              
+              Key attributes: []
+              
+              Possible children:
+              PmBladeMeasure
+              PmLink
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element minOccurs="0" name="cpuUpperTreshold" type="TresholdPercent">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Configuration of CPU upper treshold, i.e. when the CPU load 
+                    is rising and crosses this treshold then the  PMON function 
+                    in ISS will raise a CPU alarm.
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="cpuLowerTreshold" type="TresholdPercent">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    CPU lower treshold, i.e. when the CPU load 
+                    is falling and crosses this treshold then the 
+                    PM function in ISS will cease the CPU alarm.
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="cpuUsageSamplingPeriod">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The sampling period during which CPU usage is measured.
+                    This period is given in seconds.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:simpleContent>
+                    <xsd:extension base="xsd:integer">
+                      <xsd:attribute ref="nc:operation"/>
+                    </xsd:extension>
+                  </xsd:simpleContent>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="memoryUpperTreshold">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Memory upper treshold, i.e. when the Memory usage 
+                    is rising and crosses this treshold then the PM 
+                    function in ISS will raise a Memory alarm.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:simpleContent>
+                    <xsd:extension base="xsd:integer">
+                      <xsd:attribute ref="nc:operation"/>
+                    </xsd:extension>
+                  </xsd:simpleContent>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="memoryLowerTreshold" type="TresholdPercent">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Memory lower treshold, i.e. when the Memory usage 
+                    is falling and crosses this treshold then the PM 
+                    function in ISS will cease the Memory alarm.
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="bandwidthUpperTreshold" type="TresholdPercent">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Bandwidth upper treshold, i.e. when the Bandwidth 
+                    usage is rising and crosses this treshold then the PM 
+                    function in ISS will raise a Bandwidth alarm.
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="bandwidthLowerTreshold" type="TresholdPercent">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Bandwidth lower treshold, i.e. when the Bandwidth usage 
+                    is falling and crosses this treshold then the PM function 
+                    in ISS will cease the Bandwidth alarm.
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="bandwidthUsageSamplingPeriod">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The sampling period during which Bandwidth usage is measured.
+                    This period is given in minutes.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:simpleContent>
+                    <xsd:extension base="xsd:integer">
+                      <xsd:attribute ref="nc:operation"/>
+                    </xsd:extension>
+                  </xsd:simpleContent>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="PmBladeMeasure" minOccurs="0" maxOccurs="64">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Enabling monitoring of CPU and memory usage and reading
+                    the corresponding values of utilisation in percent.
+                    
+                    Key attributes: [subrackNum,mxbSlot]
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="subrackNum" type="SubrackNum"/>
+                    <xsd:element name="mxbSlot" type="MxbSlot"/>
+                    <xsd:element name="typeOfMeasurement">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Type of measurement to be performed, i.e. CPU or Memory.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType20">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="status">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Start or stop performance measurement of a specific type
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType21">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="usage" type="PercentUsage">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          This is the value of the usage in percent when
+                          performing the measurement.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="memoryUsageBytes">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          This is the value of Memory usage in bytes when
+                          performing a Memory usage measurement.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="xsd:integer">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="PmLink" minOccurs="0" maxOccurs="1">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Performance Management Link related data.
+                    
+                    Key attributes: []
+                    
+                    Possible children:
+                    PmBwMeasure
+                    PmStatistics
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="PmBwMeasure" minOccurs="0" maxOccurs="1536">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          Enabling monitoring Bandwidth usage and reading the 
+                          corresponding values of utilisation in percent.
+                          
+                          Key attributes: [subrackNum,bladeSlotLink,mxbSlot]
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="subrackNum" type="SubrackNum"/>
+                          <xsd:element name="bladeSlotLink" type="BladeSlotLink"/>
+                          <xsd:element name="mxbSlot" type="MxbSlot"/>
+                          <xsd:element name="status">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Start or stop measuring of bandwidth utilisation.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="ccsHelperType21">
+                                  <xsd:attribute ref="nc:operation"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="bandwidthUsage" type="PercentUsage">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                This is the value of the average Bandwidth usage in percent 
+                                during the configured sampling period.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="PmStatistics" minOccurs="0" maxOccurs="1536">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          This class describes the Performance 
+                          Monitoring Statistics; i.e. counters
+                          for each backplane port on the Mxb,
+                          the actual speed used on the port and
+                          if the port operates in full or half duplex mode. 
+                          
+                          Key attributes: [subrackNum,bladeSlotLink,mxbSlot]
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="subrackNum" type="SubrackNum"/>
+                          <xsd:element name="bladeSlotLink" type="BladeSlotLink"/>
+                          <xsd:element name="mxbSlot" type="MxbSlot"/>
+                          <xsd:element minOccurs="0" name="inOctets" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter for
+                                received octets.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="inUnicastPackets" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter for
+                                received Unicast Packets
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="inMulticastPackets" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter for
+                                received Multicast Packets
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="inBroadcastPackets" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter for
+                                received Broadcast Packets
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="inOctetsDiscarded" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter 
+                                for number of received discarded octets.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="inOctetsFaulty" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter 
+                                for number of received faulty octets.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="inUnknownProtocol" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter 
+                                for number of received Unknown Protocol packets.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="outOctets" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter for
+                                octets in send buffer.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="outUnicastPackets" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter for
+                                Unicast Packets in send buffer.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="outMulticastPackets" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter for
+                                Multicast Packets in send buffer.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="outBroadcastPackets" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter for
+                                Broadcast Packets in send buffer.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="framesOpcodePause" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter for
+                                Frames with Op code Pause
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                          <xsd:element minOccurs="0" name="framesExceedingMaxFramesize" type="StatisticCounter">
+                            <xsd:annotation>
+                              <xsd:documentation>
+                                Performance Monitoring counter for
+                                Frames exceeding maximum frame size.
+                              </xsd:documentation>
+                            </xsd:annotation>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute ref="nc:operation"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute ref="nc:operation"/>
+          </xsd:complexType>
+        </xsd:element>
+      </xsd:sequence>
+      <xsd:attribute ref="nc:operation"/>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:simpleType name="ccsHelperType21">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="on"/>
+      <xsd:enumeration value="off"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType20">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="cpu"/>
+      <xsd:enumeration value="memory"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType19">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="50"/>
+      <xsd:maxInclusive value="100"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType18">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="left"/>
+      <xsd:enumeration value="right"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType17">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="yes"/>
+      <xsd:enumeration value="no"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType16">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="inSync"/>
+      <xsd:enumeration value="outOfSync"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType15">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="individual"/>
+      <xsd:enumeration value="aggregatable"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType14">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="long"/>
+      <xsd:enumeration value="short"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType13">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="passive"/>
+      <xsd:enumeration value="active"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType12">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="protected"/>
+      <xsd:enumeration value="isolatable"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType11">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="static"/>
+      <xsd:enumeration value="dynamic"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType10">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="1"/>
+      <xsd:maxInclusive value="4094"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType9">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="notUsed"/>
+      <xsd:enumeration value="high"/>
+      <xsd:enumeration value="medium"/>
+      <xsd:enumeration value="low"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType8">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="notUsed"/>
+      <xsd:enumeration value="wrr"/>
+      <xsd:enumeration value="strictpriority"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType7">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="7"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType6">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="1"/>
+      <xsd:maxInclusive value="24"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType5">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="100"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType4">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType3">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="srcMAC"/>
+      <xsd:enumeration value="dstMAC"/>
+      <xsd:enumeration value="srcAndDstMAC"/>
+      <xsd:enumeration value="srcIP"/>
+      <xsd:enumeration value="dstIP"/>
+      <xsd:enumeration value="srcAndDstIP"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType2">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="dynamic"/>
+      <xsd:enumeration value="force"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType1">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="lacp"/>
+      <xsd:enumeration value="manual"/>
+      <xsd:enumeration value="disable"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType0">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="31"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+</xsd:schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/MyBsModel_1.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/MyBsModel_1.xsd
new file mode 100644
index 0000000000..5ec3434a65
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/MyBsModel_1.xsd
@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ericsson.com/is/isco/MyBsModel_1" xmlns="http://www.ericsson.com/is/isco/MyBsModel_1" xmlns:nc="http://www.ericsson.com/is/isco/nc" xmlns:IsTypes="http://www.ericsson.com/is/isco/IsTypes">
+  <xsd:annotation>
+    <xsd:appinfo>
+      <mim file="myTest_mim.xml" version="/main/R2A/10"/>
+      <mim file="other_mim.xml" version=""/>
+    </xsd:appinfo>
+  </xsd:annotation>
+  <xsd:import schemaLocation="nc.xsd" namespace="http://www.ericsson.com/is/isco/nc"/>
+  <xsd:import schemaLocation="IsTypes.xsd" namespace="http://www.ericsson.com/is/isco/IsTypes"/>
+  <xsd:complexType name="uselessStruct">
+    <xsd:sequence>
+      <xsd:element name="field1">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType4">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="field2" type="myInteger"/>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="myNamedStruct">
+    <xsd:annotation>
+      <xsd:documentation>
+        Struct description
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="counter">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType5">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="state" type="stateType"/>
+      <xsd:element name="dummyStructRef" type="uselessStruct"/>
+      <xsd:element name="dummySequence">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="item" type="uselessStruct" minOccurs="3" maxOccurs="unbounded"/>
+          </xsd:sequence>
+          <xsd:attribute ref="nc:operation"/>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="inlineStruct">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="a" type="InternalImport"/>
+            <xsd:element name="b">
+              <xsd:complexType>
+                <xsd:simpleContent>
+                  <xsd:extension base="ccsHelperType6">
+                    <xsd:attribute ref="nc:operation"/>
+                  </xsd:extension>
+                </xsd:simpleContent>
+              </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="c">
+              <xsd:complexType>
+                <xsd:simpleContent>
+                  <xsd:extension base="ccsHelperType7">
+                    <xsd:attribute ref="nc:operation"/>
+                  </xsd:extension>
+                </xsd:simpleContent>
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:sequence>
+          <xsd:attribute ref="nc:operation"/>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="myInteger">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType8">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="namedMoRefType">
+    <xsd:annotation>
+      <xsd:documentation>
+        A named type which is an MO Reference pointing to
+          * MyClass
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType9">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="stateType">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType10">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="blippName">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType11">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="yesNoEnum">
+    <xsd:annotation>
+      <xsd:documentation>
+        Enum which can be yes or no
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType12">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="uselessEnum">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType13">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="InternalImport">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:integer">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="MyClass_SeqType3">
+    <xsd:sequence>
+      <xsd:element name="item" type="MyClass_InternalType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="MyClass_myDateAndTimeType">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType0">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="MyClass_SeqType2">
+    <xsd:sequence>
+      <xsd:element name="item" type="uselessStruct" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:complexType name="MyClass_InternalType">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType1">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="MyClass_classInternalEnum">
+    <xsd:simpleContent>
+      <xsd:extension base="ccsHelperType2">
+        <xsd:attribute ref="nc:operation"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="MyClass_SeqType1">
+    <xsd:sequence>
+      <xsd:element name="item" minOccurs="3" maxOccurs="3">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="ccsHelperType3">
+              <xsd:attribute ref="nc:operation"/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute ref="nc:operation"/>
+  </xsd:complexType>
+  <xsd:element name="model">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="Blipp" minOccurs="0" maxOccurs="2">
+          <xsd:annotation>
+            <xsd:documentation>
+              This is a class which can be assigned as an attribute of ChildClass.
+              Key attribute is 'id'.
+              
+              Key attributes: [id]
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="id" type="blippName"/>
+              <xsd:element minOccurs="0" name="truefalse" type="uselessEnum"/>
+              <xsd:element minOccurs="0" name="ipAddress" type="IsTypes:IpAddress"/>
+              <xsd:element minOccurs="0" name="macAddress" type="IsTypes:MacAddress"/>
+              <xsd:element minOccurs="0" name="moAttributeDeep">
+                <xsd:complexType>
+                  <xsd:simpleContent>
+                    <xsd:extension base="ccsHelperType14">
+                      <xsd:attribute ref="nc:operation"/>
+                    </xsd:extension>
+                  </xsd:simpleContent>
+                </xsd:complexType>
+              </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute ref="nc:operation"/>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element name="MyClass" minOccurs="0" maxOccurs="unbounded">
+          <xsd:annotation>
+            <xsd:documentation>
+              My Test Class
+              The class hierarky looks like this:
+              
+                   +==========+
+                   |MountPoint|
+                   +==========+
+                       / \
+                      /   \
+              +=======+   +=======+
+              | Blipp |   |MyClass|
+              +=======+   +=======+
+                              |
+                              |
+              	 +==========+
+              	 |ChildClass|
+              	 +==========+
+              
+              Key attributes: [id1,id2]
+              
+              Possible children:
+              ChildClass:
+                Definition of children under MyClass
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="id1">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Test class identifyer - part1
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:simpleContent>
+                    <xsd:extension base="ccsHelperType15">
+                      <xsd:attribute ref="nc:operation"/>
+                    </xsd:extension>
+                  </xsd:simpleContent>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="id2">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Test class identifyer - part2
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:simpleContent>
+                    <xsd:extension base="ccsHelperType16">
+                      <xsd:attribute ref="nc:operation"/>
+                    </xsd:extension>
+                  </xsd:simpleContent>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="date">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Date
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:simpleContent>
+                    <xsd:extension base="ccsHelperType17">
+                      <xsd:attribute ref="nc:operation"/>
+                    </xsd:extension>
+                  </xsd:simpleContent>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="date2" type="MyClass_myDateAndTimeType">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Date2 - named type
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="list">
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="item" minOccurs="3" maxOccurs="3">
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType3">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="list2" type="MyClass_SeqType2"/>
+              <xsd:element minOccurs="0" name="list3" type="MyClass_SeqType3"/>
+              <xsd:element minOccurs="0" name="yesNo" type="yesNoEnum"/>
+              <xsd:element minOccurs="0" name="commonStruct" type="myNamedStruct">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Attribute description.
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+              <xsd:element minOccurs="0" name="dummyInternal" type="MyClass_InternalType"/>
+              <xsd:element minOccurs="0" name="trueOrFalse">
+                <xsd:complexType>
+                  <xsd:simpleContent>
+                    <xsd:extension base="ccsHelperType7">
+                      <xsd:attribute ref="nc:operation"/>
+                    </xsd:extension>
+                  </xsd:simpleContent>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="ChildClass" minOccurs="0" maxOccurs="2">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Child of MyClass
+                    
+                    Key attributes: [id]
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="id">
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType18">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="moAttribute">
+                      <xsd:complexType>
+                        <xsd:simpleContent>
+                          <xsd:extension base="ccsHelperType19">
+                            <xsd:attribute ref="nc:operation"/>
+                          </xsd:extension>
+                        </xsd:simpleContent>
+                      </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="moAttributeNamed" type="namedMoRefType"/>
+                  </xsd:sequence>
+                  <xsd:attribute ref="nc:operation"/>
+                </xsd:complexType>
+              </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute ref="nc:operation"/>
+          </xsd:complexType>
+        </xsd:element>
+      </xsd:sequence>
+      <xsd:attribute ref="nc:operation"/>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:simpleType name="ccsHelperType19">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*Blipp\[id='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType18">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:minLength value="1"/>
+      <xsd:maxLength value="20"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType17">
+    <xsd:restriction base="xsd:dateTime">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:minInclusive value="2006-03-08T00:00:00.567Z"/>
+      <xsd:maxInclusive value="2006-03-08T23:59:59Z"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType16">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="1"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType15">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="Obj"/>
+      <xsd:enumeration value="MO"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType14">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*ChildClass\[id='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType13">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="true"/>
+      <xsd:enumeration value="false"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType12">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="yes"/>
+      <xsd:enumeration value="no"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType11">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="name1"/>
+      <xsd:enumeration value="name2"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType10">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="locked"/>
+      <xsd:enumeration value="active"/>
+      <xsd:enumeration value="idle"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType9">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:pattern value="((/IntegratedSite:model/)|((\.\./)+)|((\./)(\.\./)*)|())((([A-Z][a-zA-Z0-9]+:model)|([A-Z][a-zA-Z0-9]+(\[[a-z][a-zA-Z0-9]*='[^\]]+'\])*))/)*MyClass\[id1='[^\]]+'\]\[id2='[^\]]+'\]"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType8">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="1"/>
+      <xsd:maxInclusive value="100"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType7">
+    <xsd:restriction base="xsd:boolean">
+      <xsd:pattern value="(true|false)"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType6">
+    <xsd:restriction base="xsd:float">
+      <xsd:minInclusive value="0.00"/>
+      <xsd:maxInclusive value="1.00"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType5">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType4">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:maxLength value="20"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType3">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="3"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType2">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="a"/>
+      <xsd:enumeration value="b"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType1">
+    <xsd:restriction base="xsd:normalizedString">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:enumeration value="hei"/>
+      <xsd:enumeration value="hopp"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ccsHelperType0">
+    <xsd:restriction base="xsd:dateTime">
+      <xsd:whiteSpace value="collapse"/>
+      <xsd:minInclusive value="2006-03-15T00:00:00.567Z"/>
+      <xsd:maxInclusive value="2006-03-15T23:59:59Z"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+</xsd:schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/bs_mim.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/bs_mim.xml
new file mode 100644
index 0000000000..8846c05878
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/bs_mim.xml
@@ -0,0 +1,1187 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>

+

+<!--

+

+Copyright (C) Ericsson AB 2006-2007 All rights reserved.

+

+The information in this document is the property of Ericsson.

+

+Except as specifically authorized in writing by Ericsson, the

+receiver of this document shall keep the information contained

+herein confidential and shall protext the same in whole or in part

+from disclosure and dissemination to third parties.

+

+Disclosure and disseminations to the receivers employees shall

+only be made on a strict need to know basis.

+

+-->

+ 

+

+<mim xmlns="http://www.ericsson.com/is/isco/mim/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ericsson.com/is/isco/mim/2.0 /vobs/isac/sis/OAM_CRA1190047_1/CCS_CNA113082/doc/15519/mim.xsd ">

+  

+  <!-- 

+       DataType Definitions

+  -->

+  <dataType name="HwmAdministrativeState">

+    <description>

+      The administrative state of blades/blade systems.

+      Reflects what the administrator has done.

+    </description>

+    <string>

+      <validValues>

+	<value name="locked"/>

+	<value name="shuttingdown"/>

+	<value name="unlocked"/>

+      </validValues>

+    </string>

+  </dataType>

+  

+  <dataType name="HwmOperationalState">

+    <description>

+      The operational state of blades/blade systems.

+      Reflects if the entity is on/off.

+    </description>

+    <string>

+      <validValues>

+	<value name="disabled"/>

+	<value name="enabled"/>

+      </validValues>

+    </string>

+  </dataType>

+  

+  <dataType name="HwmAvailabilityStatus">

+    <description>

+       The availability state of blades/blade systems.

+       Reflects if the entity is useable or not.

+    </description>

+    <string>

+      <validValues>

+	<value name="available"/>

+	<value name="failed"/>

+	<value name="offLine"/>

+	<value name="dependency"/>

+	<value name="degraded"/>

+	<value name="upgrading"/>

+	<value name="startingUp"/>

+	<value name="goingOffLine"/>

+	<value name="notInstalled"/>

+	<value name="powerOff"/>

+      </validValues>

+    </string>

+  </dataType>

+  

+  <dataType name="HwmKnockOutPreference">

+    <description>

+    </description>

+    <string>

+      <validValues>

+	<value name="normal"/>

+	<value name="protected"/>

+      </validValues>

+    </string>

+  </dataType>

+  

+  <dataType name="HwmBusType">

+    <description>

+      The bus type used by a blade.

+    </description>

+    <string>

+      <validValues>

+	<value name="ipmi"/>

+	<value name="mbus"/>

+      </validValues>

+    </string>

+  </dataType>

+  

+  <!-- 

+       Class Definitions

+  -->

+  

+  <class name="BladeSystems">

+    <description>

+      Parent of all blade systems.

+    </description>

+    <singleton/>

+    <systemCreated/>

+  </class>

+  

+  <class name="BladeSystem">

+    <description>

+      This class describes a Blade System. 

+      It serves as a mountpoint for the blade system specific model.

+    </description>

+    

+    <!-- Attributes from HWM -->

+    

+    <attribute name="name">

+      <description>

+	A user friendly Blade System name, must be set at creation and can be 

+	changed when BS is locked.

+      </description>

+      <dataType><string/></dataType>

+      <key/>

+    </attribute>

+

+    <attribute name="no">

+      <description>

+	An identifier for the BS. A new integer has to be used every time a new

+	BS is created. 

+      </description>

+      <dataType><integer/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="type">

+      <description>

+      </description>

+      <dataType><string/></dataType>

+      <mandatory/>

+      <restricted/>

+    </attribute>

+

+    <attribute name="softwareGroupId">

+      <description>

+	The identity of the Software Group (SWG) that the BS implements.

+      </description>

+      <dataType><string/></dataType>

+      <restricted/>

+      <mandatory/>

+    </attribute>

+    

+    <attribute name="softwareGroupRevision">

+      <description>

+	The revision of the Software Group (SWG) that the BS implements.

+      </description>

+      <dataType><string/></dataType>

+      <restricted/>

+      <mandatory/>

+    </attribute>

+

+     <attribute name="softwareCorrectionPackageId">

+      <description> 

+        The identity of the correction package (CXR) applied to the SWG.

+      </description> 

+      <dataType><string/></dataType>

+     </attribute>

+

+     <attribute name="softwareCorrectionPackageRevision">

+      <description> 

+        The revision of the correction package (CXR) applied to the SWG

+      </description> 

+      <dataType><string/></dataType>

+     </attribute>

+

+    <attribute name="admState">

+      <description>The administrative state of the Blade System.</description>

+      <dataType name.ref="HwmAdministrativeState"/>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="opState">

+      <description>The operational state of the Blade System.</description>

+      <dataType name.ref="HwmOperationalState"/>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="availStatus">

+      <description>The availability status of the Blade System.</description>

+      <dataType name.ref="HwmAvailabilityStatus"/>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="bsdName">

+      <description>

+	The identity of the Blade System domain the Blade system belongs to.

+      </description>

+      <dataType><string/></dataType>

+    </attribute>

+

+    <!-- Attributes from CPD -->

+    

+    <attribute name="bsomAddress">

+      <description>

+      IP address of the Blade System OaM Master.

+      </description>

+      <dataType name.ref="IsTypes:IpAddress"/>

+      <readOnly/>

+    </attribute>

+

+    <action name="lock">

+      <description>

+       Locks the blade system. If the system already is locked the 

+       action does nothing.

+      </description>

+      <returnType>

+         <void/>

+      </returnType>

+    </action>  

+

+     <action name="unlock">

+      <description>

+       Unlocks the blade system. If the system already is unlocked the 

+       action does nothing. This operation orders the blade system to be unlocked.

+       However the blade system may not be unlocked even if this order works.

+       See the operational state to figure out if the unlock succeded.

+      </description>

+      <returnType>

+         <void/>

+      </returnType>

+    </action>  

+

+     <action name="shutdown">

+      <description>

+       Shuts down the blade system. If the system already is locked the 

+       action does nothing.

+      </description>

+      <returnType>

+         <void/>

+      </returnType>

+    </action>  

+    

+    <action name="createBackup">

+	<description>

+	  Action to create a backup file from the current

+	  Blade System. It is stored locally on disk.

+	  An instance of the MO class

+	  Software/Jobs/Backup/Create is created as a log of this

+	  action.

+	</description>

+	<returnType>

+	  <dataType><string/></dataType><!-- return ok | {fault,Reason} ? -->

+	</returnType>

+	<parameter name="backupJobName">

+	  <description>

+            A user specified backup creation job name

+	  </description>

+	  <dataType><string/></dataType>

+          <isOptional/>

+	</parameter>

+      </action>

+      

+      <action name="restoreBackup">

+	<description>

+	  Action to restore a backup into the current

+	  Blade System. It is fetched from the local disk.

+	  An instance of the MO class

+	  Software/Jobs/Backup/Restore is created as a log of this

+	  action.

+	</description>

+	<returnType>

+	  <dataType><string/></dataType><!-- return ok | {fault,Reason} ? -->

+	</returnType>

+	<parameter name="backupId">

+	  <description>

+            The IS site local backup identity

+	  </description>

+	  <dataType name.ref="IsTypes:Unsigned32">

+	  </dataType>

+	</parameter>

+	<parameter name="restoreJobName">

+	  <description>

+            A user specified backup restore job name

+	  </description>

+	  <dataType><string/></dataType>

+          <isOptional/>

+	</parameter>

+      </action>

+      

+      <action name="upgrade">

+	<description>

+	  Action to upgrade the current Blade System. Files

+	  are fetched from the local disk storage.

+	  An instance of the MO class

+	  Software/Jobs/Upgrade is created as a log of this

+	  action.

+	</description>

+	<returnType>

+	  <dataType><string/></dataType><!-- return ok | {fault,Reason} ? -->

+	</returnType>

+        <parameter name="upgradeJobName">

+          <description>

+               A user specified ugrade job name

+	  </description>

+	  <dataType><string/></dataType>

+          <isOptional/>

+	</parameter>

+	<parameter name="swgProdNr">

+	  <description>

+            The Ericsson product number of blade system software group

+	  </description>

+	  <dataType><string/></dataType>

+          <isOptional/>

+	</parameter>

+	<parameter name="swgRevision">

+	  <description>

+            The Ericsson revision of blade system software group

+	  </description>

+	  <dataType><string/></dataType>

+          <isOptional/>

+	</parameter>

+	<parameter name="cxrProdNr">

+	  <description>

+            The Ericsson product number of software correction package

+	  </description>

+	  <dataType><string/></dataType>

+          <isOptional/>

+	</parameter>

+	<parameter name="cxrProdRevision">

+	  <description>

+            The Ericsson revision of software correction package

+	  </description>

+	  <dataType><string/></dataType>

+          <isOptional/>

+	</parameter>

+        <parameter name="bladeSwgProdNr">

+	  <description>

+            The Ericsson product number of blade software group

+	  </description>

+	  <dataType><string/></dataType>

+          <isOptional/>

+        </parameter>

+        <parameter name="bladeSwgProdRevison">

+	  <description>

+            The Ericsson revision of blade software group

+	  </description>

+	  <dataType><string/></dataType>

+          <isOptional/>

+        </parameter>

+	<parameter name="maxTime">

+	  <description>

+	    The maximum time allowed to finish the entire 

+            software change procedure (minutes).

+            Default value depends on blade system software.

+	  </description>

+	  <dataType name.ref="IsTypes:Unsigned32">

+	  </dataType>

+          <isOptional/>

+	</parameter>

+      </action>

+  </class>

+  

+  

+  <class name="Blade">

+    <description>

+      This class describes a Blade. 

+      A Blade is identified by the subrack and slot number.

+    </description>

+    

+    <!-- Attributes from HWM -->

+    

+    <attribute name="subrackId">

+      <description>

+	A reference to the associated subrack (i.e. the value of 'subrackId' 

+	for the associated subrack)

+      </description>

+      <dataType> 	

+	<integer><range><min>0</min><max>31</max></range></integer>

+      </dataType>

+      <key/>

+    </attribute>

+    

+    <attribute name="slotNo">

+      <description>The slot number for this Blade within the subrack.</description>

+      <dataType> 	

+	<integer><range><min>0</min><max>25</max></range></integer>

+      </dataType>

+      <key/>

+    </attribute>

+

+    <attribute name="slotLabel">

+      <description>

+	The slot label of the blade. Will only be set at creation.

+	This should be used in alarms related to the slot to inform the

+	operator of what position in the subrack the blade is located in.

+	E.g. for GEM subracks it will be a string like X02 for slot 0

+	up to X80 for slot 25.

+      </description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+

+    <attribute name="bsNo">

+      <description>

+	An identifier for the BS to which the blade belongs. 

+	A value of 0 means that the blade is inserted in the subrack but it 

+	has not been configured to any BS yet.

+      </description>

+      <dataType><integer/></dataType>

+    </attribute>

+    

+    <attribute name="type">

+      <description>

+	The type of the Blade defined by a string BladeTypeId.

+      </description>

+      <dataType><string/></dataType>

+       <restricted/>

+       <mandatory/>

+    </attribute>

+    

+    <attribute name="swgLowestId">

+      <description>The expectedregistered SW group id of the Blade.</description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="swgLowestRev">

+      <description>The registered SW group revision state of the Blade.</description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="swgActualId">

+      <description>The installed SW group id of the Blade.</description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="swgActualRev">

+      <description>The installed SW group revision state of the Blade.</description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="bsom">

+      <description>

+       Indicates if this blade is a BSOM candidate.

+      </description>

+      <dataType><boolean/></dataType>

+    </attribute>

+    

+    <attribute name="knockOutPreference">

+      <description>

+	Set to protected if blade sholud no be knocked out before the 

+	switch blade.

+      </description>

+      <dataType name.ref="HwmKnockOutPreference"/>

+    </attribute>

+    

+    <attribute name="userLabel">

+      <description>

+	A user friendly Blade name, always possible to set.

+	Default value indicates HwmBladeType and used slot.

+      </description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="admState">

+      <description>

+	The administrative state of the Blade.

+      </description>

+      <dataType name.ref="HwmAdministrativeState"/>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="opState">

+      <description>The operational state of the Blade.</description>

+      <dataType name.ref="HwmOperationalState"/>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="availStatus">

+      <description>The availability status of the Blade.</description>

+      <dataType name.ref="HwmAvailabilityStatus"/>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="busType">

+      <description>The type of maintenance bus on the found Blade</description>

+      <dataType name.ref="HwmBusType"/>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="prodNo">

+      <description>The Product Number of the found Blade</description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="prodRev">

+      <description>The Product Revision of the found Blade.</description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="serialNo">

+      <description>The Serial Number of the found Blade.</description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="prodName">

+      <description>The Product Name of the found Blade.</description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="vendor">

+      <description>The Vendor name of the found Blade.</description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="mfgDate">

+      <description>The manufacturing date of the found Blade.</description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="macAddressAggregate">

+      <description>The aggregated MAC address of the found Blade.</description>

+      <dataType name.ref="IsTypes:MacAddress"/>

+    </attribute>

+    

+    <attribute name="macAddressLeft">

+      <description>

+	The left link MAC address of the found Blade. Only used by some blades

+      </description>

+      <dataType name.ref="IsTypes:MacAddress"/>

+    </attribute>

+    

+    <attribute name="macAddressRight">

+      <description>

+	The right link MAC address of the found Blade. Only used by some blades

+      </description>

+      <dataType name.ref="IsTypes:MacAddress"/>

+    </attribute>

+    

+    <attribute name="changeDate">

+      <description>The date when the blade was last changed.</description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+

+    <!-- Attributes from CPD -->

+    

+    <attribute name="isbsAddress">

+      <description>

+	IP address on the ISBS subnet.

+      </description>

+      <dataType name.ref="IsTypes:IpAddress"/>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="isobAddress">

+      <description>

+	IP address on the ISOB subnet.

+      </description>

+      <dataType name.ref="IsTypes:IpAddress"/>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="islctAddress">

+      <description>

+	IP address on the ISLCT subnet.

+      </description>

+      <dataType name.ref="IsTypes:IpAddress"/>

+      <readOnly/>

+    </attribute>

+    

+    <action name="lock">

+      <description>

+       Locks the blade. If the blade already is locked the 

+       action does nothing. This operation orders the blade to be locked.

+       It may however take long time before it happens.

+      </description>

+      <returnType>

+         <void/>

+      </returnType>

+    </action>  

+

+     <action name="unlock">

+      <description>

+       Unlocks the blade. If the blade already is unlocked the 

+       action does nothing. This operation orders the blade to be unlocked.

+       However the blade may not be unlocked even if this order works.

+       See the operational state to figure out if the unlock succeded.

+      </description>

+      <returnType>

+         <void/>

+      </returnType>

+    </action>  

+

+     <action name="shutdown">

+      <description>

+       Shuts down the blade. If the blade already is locked the 

+       action does nothing.

+      </description>

+      <returnType>

+        <void/>

+      </returnType>

+    </action>  

+    <action name="upgrade">

+	<description>

+	  Action to upgrade the current blade. Files

+	  are fetched from the local disk storage.

+	  An instance of the MO class

+	  Software/Jobs/Upgrade is created as a log of this

+	  action.

+	</description>

+	<returnType>

+	  <dataType><string/></dataType><!-- return ok | {fault,Reason} ? -->

+	</returnType>

+	<parameter name="swgProdNr">

+	  <dataType><string/></dataType>

+	</parameter>

+	<parameter name="swgRevision">

+	  <dataType><string/></dataType>

+	</parameter>

+	<parameter name="maxTime">

+	  <dataType name.ref="IsTypes:Unsigned32">

+	  </dataType>

+          <isOptional/>

+	</parameter>

+      </action>

+  </class>

+  

+  <class name="LinkSap">

+    <description>

+      A Blade may have one or more resilient interfaces

+      to the backplane. Such an interface is called a

+      Link Service Access Point (LSAP), which is the

+      point where you access layer 2. LSAPs are

+      automatically created and deleted along with the

+      hosting blade.

+    </description>

+    <systemCreated/>

+    <attribute name="id">

+      <description>

+	The id of a LinkSap is a number from 0 to X within the slot.

+      </description>

+      <dataType><integer/></dataType>

+      <key/><readOnly/>

+    </attribute>

+  </class>

+  

+  <class name="BsNetworkConfiguration">

+    <description>

+      The MO branch where the Blade System specific

+      Network resources are mapped to blade system

+      network requirements to common Integrated Site

+      resources. This activity must be performed before

+      a new blade or blade system successfully can be

+      unlocked via the Hardware service. Some blade

+      system designers have partly pre-registered their

+      network requirements, while others demand that

+      you read the corresponding information from

+      separate Operation Procedure Instructions and

+      manually register the blade system network

+      requirements. The pre-registered network

+      requirements automates parts of the blade

+      system-specific configuration activity.

+

+      In an Integrated Site, the blade systems obtain

+      their actual network configuration dynamically in

+      runtime. When you change the network

+      configuration it will affect blade systems. In

+      order to minimize the disturbance of active blade

+      systems, the changes are normally applied in a

+      separate storage which not is visible to the

+      blade systems. In order to make use of the new

+      unpublished configuration, it must explicitly be

+      published by altering the updateMode. If the new

+      settings introduces severe problems the

+      configuration can be reverted to the old settings

+      by altering the updateMode.

+

+      The common Network configuration including

+      updateMode and its publish mechanism is specified

+      in a separate MIM called CPD MIM.

+    </description>

+    <singleton/>

+    <systemCreated/>

+  </class>

+

+  <class name="BsVlan">

+    <description>

+       A BS VLAN is mapped to one IS VLAN. A BS VLAN is

+       the requirement a Blade System have of an IS

+       VLAN. Different instances of a Blade System type

+       may call their BS VLANs the same thing but in the

+       end the IS Site Designer can choose to map them

+       to the same or different IS VLAN.

+

+       BS VLANs can either be created manually by the

+       operator or they can be automatically created

+       from pre-registered network requirements bundled

+       with the Blade System software.  Regardless of

+       how they are created, each one needs to be

+       mapped to an IS VLAN before the blades can be

+       unlocked. The mapping is done with the

+       'isVlanRef' attribute.

+

+       Different instances of a Blade System type may call

+       their BS VLANs the same thing but in the end the IS

+       Site Designer can choose to map them to the same or

+       different IS VLAN.

+    </description>

+    <attribute name="name">

+      <description>

+	 Name of the BS VLAN. It is unique within the Blade System.

+      </description>

+      <dataType><string/></dataType>

+      <key/> 

+    </attribute>

+    <attribute name="description">

+      <description>

+	Short description of the BS VLAN.

+      </description>

+      <dataType><string/></dataType>

+    </attribute>

+    <attribute name="private">

+      <description>

+          Setting the private attribute to true, means

+          that the corresponding IS VLAN not can be

+          used by other Blade Systems. The IS VLAN is

+          private for this particular Blade System.

+      </description>

+      <dataType><boolean/></dataType>

+    </attribute>

+    <attribute name="isVlanRef">

+      <description>

+	The mapping to a corresponding IS VLAN. This

+	mapping must be done before the blades of the

+	Blade System can be unlocked.

+      </description>

+      <dataType><moRef name="IsVlan"/></dataType>

+    </attribute>

+  </class>

+  

+  <class name="BsLogicalNetwork">

+    <description>

+       A BS Logical Network (BSLN) is associated to

+       one IS Logical Network. A BS Logical Network

+       is the requirement a Blade Systems have of an

+       IS Logical Network.

+

+       BS Logical Networks can either be created

+       manually by the operator or they can be

+       automatically created from pre-registered

+       network requirements bundled with the Blade

+       System software. Regardless of how they are

+       created, each one needs to be mapped to an IS

+       Logical Network before the blades can be

+       unlocked. The mapping is done with the

+       'isLogicalNetworkRef' attribute.

+

+       Different instances of a Blade System type may call

+       their BS Logical Networks the same thing but in

+       the end the IS Site Designer can choose to map

+       them to the same or different IS Logical

+       Network.

+    </description>

+    <attribute name="name">

+      <description>

+	Name of the BS logical network. It is unique within the Blade System.

+      </description>

+      <dataType><string/></dataType>

+      <key/>

+    </attribute>

+    <attribute name="description">

+      <description>

+	Short description of the BS Logical Network.

+      </description>

+      <dataType><string/></dataType>

+    </attribute>

+    <attribute name="private">

+      <description>

+	Flag that shows whether the BS Logical Network

+	is private for this Blade System or if it may

+	be shared among several Blade Systems.

+      </description>

+      <dataType><boolean/></dataType>

+    </attribute>

+    <attribute name="isLogicalNetworkRef">

+      <description>

+	Reference to the corresponding IS Logical Network.

+      </description>

+      <dataType><moRef name="IsLogicalNetwork"/></dataType>

+    </attribute>

+  </class>

+  

+  <class name="BsSubnet">

+    <description>

+       A BS Subnet (BSSN) is associated to one IS

+       Subnet. A BS Subnet Network is the requirement a

+       Blade Systems have of an IS Subnet.

+

+       BS Subnets can either be created manually by the

+       operator or they can be automatically created

+       from pre-registered network requirements bundled

+       with the Blade System software. Regardless of

+       how they are created, each one needs to be

+       mapped to both a BS VLan and an IS Subnet before

+       blades can be unlocked via the Hardware service.

+       Each BS Subnet contains one or more BS Subnet

+       Segments. The mappings are done with the

+       'bsVlanRef' and 'isSubnetRef' attributes.

+

+       Different instances of a Blade System type may

+       call their BS Subnets the same thing but in the

+       end the IS Site Designer can choose to map them

+       to the same or different IS Subnet.

+    </description>

+    <attribute name="name">

+      <description>

+	Name of the BS Subnet. It is unique within the BS Logical Network.

+      </description>

+      <dataType><string/></dataType>

+      <key/>

+    </attribute>

+    <attribute name="description">

+      <description>

+	Short description of the BS Subnet.

+      </description>

+      <dataType><string><defaultValue>default</defaultValue></string></dataType>

+    </attribute>

+    <attribute name="bsVlanRef">

+      <description>

+	The mapping to a corresponding BS Vlan. This

+	mapping must be done before the blades of the

+	Blade System can be unlocked.

+      </description>

+      <dataType><moRef name="BsVlan"/></dataType>

+    </attribute>

+    <attribute name="isSubnetRef">

+      <description>

+	The mapping to a corresponding IS Subnet. This

+	mapping must be done before the blades of the

+	Blade System can be unlocked.

+      </description>

+      <dataType><moRef name="IsSubnet"/></dataType>

+    </attribute>

+  </class>

+  

+  <class name="BsSubnetSegment">

+    <description>

+       A BS Subnet Segment (BSSNS) is associated to one

+       IS Subnet Segment. A BS Subnet Segment is the

+       requirement a Blade Systems have of an IS Subnet

+       Segment.

+

+       BS Subnet Segments can either be created manually

+       by you or they can be automatically created from

+       pre-registered network requirements bundled with

+       the Blade System software. Regardless of how they

+       are created, each one needs to be mapped to an IS

+       Subnet Segment before the blades can be unlocked

+       via the Hardware service.  The mapping is done

+       with the 'isSubnetSegmentRef' attribute.

+

+       Different instances of a Blade System type may

+       call their BS Subnet Segments the same thing but

+       in the end the IS Site Designer can choose to

+       map them to the same or different IS Subnet

+       Segment.

+    </description>

+    <attribute name="name">

+      <description>

+	Name of the BS Subnet Segment. It is unique within the BS Subnet.

+      </description>

+      <dataType><string/></dataType>

+      <key/>

+    </attribute>

+    <attribute name="description">

+      <description>

+	Short description of the BS Subnet Segment.

+      </description>

+      <dataType><string/></dataType>

+    </attribute>

+    <attribute name="numOfIpaddresses">

+      <description>

+	Number of required IP addresses in the IS Subnet Segment.

+      </description>

+      <dataType><integer/></dataType>

+    </attribute>

+    <attribute name="dhcpEnabled">

+      <description>

+	Flag that controls whether the corresponding IS

+	Subnet Segment is required to have DHCP enabled

+	or not.

+      </description>

+      <dataType><boolean/></dataType>

+    </attribute>

+    <attribute name="routerRequired">

+      <description>

+	Flag that controls whether the corresponding IS

+	Subnet Segment is required to have a router

+	configured or not.

+      </description>

+      <dataType><boolean/></dataType>

+    </attribute>

+    <attribute name="isSubnetSegmentRef">

+      <description>

+	The mapping to a corresponding IS Subnet

+	Segment. The mapping here must be done before

+	the blades of the blade system can be unlocked.

+      </description>

+      <dataType>

+	<moRef name="IsSubnetSegment"/>

+      </dataType>

+    </attribute>

+  </class>

+  

+  <class name="BsVlanSap">

+    <description>

+      There is a BS VLAN Service Access Point (BSVSAP)

+      for each Link Service Access Point that an IS

+      VLAN straddles. It is per BS VLAN Service Access

+      Point that certain VLAN properties, such as if it

+      is mandatory to enable isolation protection.

+

+      BS VLAN Service Access Points can either be

+      created manually by the operator or they can be

+      automatically created from pre-registered network

+      requirements bundled with the Blade System

+      software. Regardless of how they are created,

+      each one needs to be mapped to an Link SAP before

+      the blades can be unlocked.  The mapping is done

+      with the 'linkSapRef' attribute.

+    </description>

+    <attribute name="name">

+      <description>

+	Name of the BS VLAN SAP. It is unique within the BS VLAN.

+      </description>

+      <dataType>

+	<string/>

+      </dataType>

+      <key/>

+    </attribute>

+    <attribute name="description">

+      <description>

+	Short description of the BS VLAN SAP.

+      </description>

+      <dataType>

+	<string/>

+      </dataType>

+    </attribute>

+    <attribute name="static">

+      <description>

+	Flag which controls whether this BS VLAN SAP

+	makes static or dynamic use of the

+	corresponding IS VLAN.

+      </description>

+      <dataType>

+	<boolean/>

+      </dataType>

+    </attribute>

+    <attribute name="protected">

+      <description>

+	Flag which controls whether this BS VLAN SAP should be 

+	isolation protected or not.

+      </description>

+      <dataType>

+	<boolean/>

+      </dataType>

+    </attribute>

+    <attribute name="linkSapRef">

+      <description>

+	A mapping to the corresponding Link Service Access Point.

+      </description>

+      <dataType>

+	<moRef name="LinkSap"/>

+      </dataType>

+    </attribute>

+  </class>

+  

+  <class name="BsIpTrafficClass">

+    <description>

+       A BS IP Traffic Class (BSIPTC) is the

+       requirement a Blade System have of an IS IP

+       Traffic Class.

+

+       BS IP Traffic Classes can either be created

+       manually by you or they can be automatically

+       created from pre-registered network requirements

+       bundled with the Blade System software. Regardless 

+       of how they are created, each one needs to be

+       mapped to an IS IP Traffic Class before the blades

+       can be unlocked via the Hardware service. The

+       mapping is done with the 'isIpTrafficClassRef'

+       attribute.

+

+       Different instances of a Blade System type may

+       call their BS IP Traffic Classes the same thing but

+       in the end the IS Site Designer may choose to

+       map them to the same or different IS IP Traffic

+       Classes.

+    </description>

+    <attribute name="name">

+      <description>

+         The name of the BS IP Traffic Class. It is

+         unique within the Blade System.

+      </description>

+      <dataType><string/></dataType>

+      <key/>

+    </attribute>

+    <attribute name="description">

+      <description>

+         A short description of The BS IP Traffic Class.

+      </description>

+      <dataType><string/></dataType>

+    </attribute>

+    <attribute name="isIpTrafficClassRef">

+      <description>

+	The mapping to a corresponding IS IP Traffic

+	Class. This mapping must be done before the

+	blades of the Blade System can be unlocked.

+      </description>

+      <dataType><moRef name="IsIpTrafficClass"/></dataType>

+    </attribute>

+  </class>

+  

+  <class name="BsLanTrafficClass">

+    <description>

+	A BS LAN Traffic Class (BSLANTC) is the

+	requirement a Blade System have of an IS LAN

+	Traffic Class. Different instances of a Blade

+	System type may call their BS Traffic Classes

+	the same thing but in the end the IS Site

+	Designer may choose to map them to the same or

+	different IS LAN Traffic Classes.

+

+       	BS LAN Traffic Classes can either be created

+       	manually by you or they can be automatically

+       	created from pre-registered network requirements

+       	bundled with the Blade System software. Regardless 

+       	of how they are created, each one needs to be

+       	mapped to an IS LAN Traffic Class before the blades

+       	can be unlocked via the Hardware service. The

+       	mapping is done with the 'isLanTrafficClassRef'

+       	attribute.

+

+       	Different instances of a Blade System type may

+       	call their BS LAN Traffic Classes the same

+       	thing but in the end the IS Site Designer may

+       	choose to map them to the same or different IS

+       	LAN Traffic Classes.

+    </description>

+    <attribute name="name">

+      <description>

+	 Name of the BS IP Traffic Class. It is unique within the Blade System.

+      </description>

+      <dataType><string/></dataType>

+      <key/>

+    </attribute>

+    <attribute name="description">

+      <description>

+         Short description of the BS IP Traffic Class.

+      </description>

+      <dataType><string/></dataType>

+    </attribute>

+    <attribute name="isLanTrafficClassRef">

+      <description>

+	The mapping to a corresponding IS LAN Traffic

+	Class. This mapping must be done before the

+	blades of the Blade System can be unlocked.

+      </description>

+      <dataType><moRef name="IsLanTrafficClass"/></dataType>

+    </attribute>

+  </class>

+  

+  

+  <!-- 

+       Relatonship Definitions

+  -->

+  

+  <relationship name="BladeSystemsTop">

+    <containment>

+      <parent>

+	<hasClass name="top_mim:Is"/>

+      </parent>

+      <child>

+	<hasClass name="BladeSystems"/>

+    </child>

+    </containment>

+  </relationship>

+

+  <relationship name="BsMount">

+    <containment>

+      <parent>

+	<hasClass name="BladeSystems"/>

+      </parent>

+      <child>

+	<hasClass name="BladeSystem"/>

+      </child>

+    </containment>

+  </relationship>

+  

+  <relationship name="Blades">

+    <containment>

+      <parent>

+	<hasClass name="BladeSystem"/>

+      </parent>

+      <child>

+	<hasClass name="Blade"/>

+      </child>

+    </containment>

+  </relationship>

+  

+  <relationship name="LinkSaps">

+    <containment>

+      <parent><hasClass name="Blade"/></parent>

+      <child><hasClass name="LinkSap"/></child>

+    </containment>

+  </relationship>

+  

+  <relationship name="NcMount">

+    <containment>

+      <parent><hasClass name="BladeSystem"/></parent>

+      <child><hasClass name="BsNetworkConfiguration"/></child>

+    </containment>

+  </relationship>

+

+  <relationship name="BsVlans">

+    <containment>

+      <parent><hasClass name="BsNetworkConfiguration"/></parent>

+      <child>

+	<hasClass name="BsVlan"/>

+	<cardinality><min>1</min></cardinality>

+      </child>

+    </containment>

+  </relationship>

+  

+  <relationship name="BsVlanSaps">

+    <containment>

+      <parent><hasClass name="BsVlan"/></parent>

+      <child>

+	<hasClass name="BsVlanSap"/>

+	<cardinality><min>1</min></cardinality>

+      </child>

+    </containment>

+  </relationship>

+  

+  <relationship name="BsLogicalNetworks">

+    <containment>

+      <parent><hasClass name="BsNetworkConfiguration"/></parent>

+      <child><hasClass name="BsLogicalNetwork"/></child>

+    </containment>

+  </relationship>

+  

+  <relationship name="BsSubnets">

+    <containment>

+      <parent><hasClass name="BsLogicalNetwork"/></parent>

+      <child>

+	<hasClass name="BsSubnet"/>

+	<cardinality><min>1</min></cardinality>

+      </child>

+    </containment>

+  </relationship>

+  

+  <relationship name="BsSubnetSegments">

+    <containment>

+      <parent><hasClass name="BsSubnet"/></parent>

+      <child><hasClass name="BsSubnetSegment"/></child>

+    </containment>

+  </relationship>

+  

+  <relationship name="BsIpTrafficClasses">

+    <containment>

+      <parent><hasClass name="BsNetworkConfiguration"/></parent>

+      <child><hasClass name="BsIpTrafficClass"/></child>

+    </containment>

+  </relationship>

+  

+  <relationship name="BsLanTrafficClasses">

+    <containment>

+      <parent><hasClass name="BsNetworkConfiguration"/></parent>

+      <child><hasClass name="BsLanTrafficClass"/></child>

+    </containment>

+  </relationship>

+  

+  

+  

+</mim>

diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/dummy_action_mim.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/dummy_action_mim.xml
new file mode 100644
index 0000000000..d691fe0b3f
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/dummy_action_mim.xml
@@ -0,0 +1,186 @@
+<mim xmlns="http://www.ericsson.com/is/isco/mim/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ericsson.com/is/isco/mim/2.0 /vobs/isac/sis/OAM_CRA1190047_1/CCS_CNA113082/doc/15519/mim.xsd ">
+   <exception name="dummyException">
+    <description>
+      Exception description
+    </description>
+    <exceptionParameter name="dummyExcPar1">
+      <description>
+	Exception parameter description
+      </description>
+      <dataType><integer/></dataType>
+    </exceptionParameter>
+    <exceptionParameter name="dummyExcPar2">
+      <description>
+	Exception parameter description
+      </description>
+      <dataType>
+	<integer/>
+      </dataType>
+    </exceptionParameter>
+  </exception>
+
+	
+	 <class name="DummyActions">
+		 <singleton/>
+		 <attribute name="dummy">
+			 <dataType><integer/></dataType>
+		 </attribute>
+    <action name="actNoParams">
+      <description>
+	Action with no parameters
+      </description>
+      <returnType>
+	<description>
+	  Maybe strange to describe void, but here is a description anyway.
+	</description>
+	<void/>
+      </returnType>
+    </action>
+    <action name="actOneParam">
+      <description>
+	Action with one parameter
+      </description>
+      <returnType>
+	<dataType>
+	  <string>
+	    <validValues>
+	      <value name="ok"/>
+	      <value name="error"/>
+	    </validValues>
+	  </string>
+	</dataType>
+      </returnType>
+      <parameter name="a">
+	<dataType>
+	  <integer>
+	    <range>
+	      <min>0</min>
+	      <max>3</max>
+	    </range>
+	  </integer>
+	</dataType>
+      </parameter>
+    </action>
+    <action name="actManyParams">
+      <description>
+	Action with many parameters, even some optional
+      </description>
+      <returnType>
+	<dataType>
+	  <integer>
+	    <range>
+	      <min>0</min>
+	      <max>100</max>
+	    </range>
+	  </integer>
+	</dataType>
+      </returnType>
+      <parameter name="a">
+	<dataType>
+	  <integer>
+	    <range>
+	      <min>0</min>
+	      <max>3</max>
+	    </range>
+	  </integer>
+	</dataType>
+      </parameter>
+      <parameter name="b">
+	<dataType>
+	  <integer>
+	    <range>
+	      <min>0</min>
+	      <max>3</max>
+	    </range>
+	  </integer>
+	</dataType>
+      </parameter>
+      <parameter name="c">
+	<dataType>
+	  <integer>
+	    <range>
+	      <min>0</min>
+	      <max>3</max>
+	    </range>
+	  </integer>
+	</dataType>
+	<initialValue>0</initialValue>
+	<isOptional/>
+      </parameter>
+      <parameter name="d">
+	<description>parameterdescription</description>
+	<dataType>
+	  <integer/>
+	</dataType>
+	<isOptional/>
+      </parameter>
+    </action>
+    <action name="actComplexParams">
+      <description>
+	Action with parameters with complex datatypes
+      </description>
+      <returnType>
+		  <description>
+			  Here is a description of the return value for this action.
+		  </description>
+		  <dataType>
+			  <string>
+				  <validValues>
+					  <value name="siri"/>
+					  <value name="sara"/>
+				  </validValues>
+			  </string>
+		  </dataType>
+	  </returnType>
+      <parameter name="dummyParameter">
+		  <dataType><integer/></dataType>
+      </parameter>
+      <parameter name="structParameter">
+	<dataType>
+	  <struct>
+	    <structMember name="a">
+	      <dataType><integer/></dataType>
+	    </structMember>
+	    <structMember name="b">
+	      <dataType><integer/></dataType>
+	    </structMember>
+	  </struct>
+	</dataType>
+      </parameter>
+      <raisesException name="dummyException"/>
+    </action>
+    <action name="actComplexReturn">
+      <returnType>
+	<dataType>
+	  <struct>
+	    <structMember name="a">
+	      <dataType><integer/></dataType>
+	    </structMember>
+	    <structMember name="b">
+	      <dataType><integer/></dataType>
+	    </structMember>
+	  </struct>
+	</dataType>
+      </returnType>
+    </action>
+    <action name="actException">
+      <returnType>
+	<void/>
+      </returnType>
+      <raisesException name="dummyException"/>
+    </action>
+  </class>
+
+
+  <relationship name="Top">

+    <containment>

+      <parent>

+	<hasClass name="top_mim:Is"/>

+      </parent>

+      <child>

+	<hasClass name="DummyActions"/>

+      </child>

+    </containment>

+  </relationship>

+
+</mim>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/hwm_mim.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/hwm_mim.xml
new file mode 100644
index 0000000000..a7a18b0070
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/hwm_mim.xml
@@ -0,0 +1,631 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>

+

+<!--

+

+Copyright (C) Ericsson AB 2006-2007 All rights reserved.

+

+The information in this document is the property of Ericsson.

+

+Except as specifically authorized in writing by Ericsson, the

+receiver of this document shall keep the information contained

+herein confidential and shall protext the same in whole or in part

+from disclosure and dissemination to third parties.

+

+Disclosure and disseminations to the receivers employees shall

+only be made on a strict need to know basis.

+

+-->

+

+

+<mim xmlns="http://www.ericsson.com/is/isco/mim/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ericsson.com/is/isco/mim/2.0 /vobs/isac/sis/OAM_CRA1190047_1/CCS_CNA113082/doc/15519/mim.xsd ">

+  

+  <!-- 

+       DataType Definitions

+  -->

+  

+  <dataType name="HwmSlotState">

+    <description>

+      Information of how the slot is used.

+    </description>

+    <string>

+      <validValues>

+	<value name="unusedEmpty"/>

+	<value name="usedEmpty"/>

+	<value name="unusedOccupied"/>

+	<value name="usedOccupied"/>

+      </validValues>

+    </string>

+  </dataType>

+  

+  

+  <!-- 

+       Class Definitions

+  -->

+  

+  <exception name="dummyException">

+    <exceptionParameter name="dummyExcPar1">

+      <dataType><integer/></dataType>

+    </exceptionParameter>

+    <exceptionParameter name="dummyExcPar2">

+      <dataType><integer/></dataType>

+    </exceptionParameter>

+  </exception>

+

+

+  <class name="Hardware">

+    <description>

+     The purpose of the Hardware Management function is to make it possible to maintain 

+     the Hardware Inventory (HWI) for the Integrated Site and to present its content via ISM

+     or to a management system. And also to maintain the subracks usage.

+    </description>

+    <singleton/>

+    <systemCreated/>

+

+    <attribute name="activeSis">

+       <description>

+          The subrack,slot of the active om SIS. The format is "subrack.slot".

+       </description>

+       <dataType><string/></dataType>

+       <readOnly/>

+    </attribute>

+

+    <action name="actComplexParams">

+      <returnType>

+	<void/>

+      </returnType>

+      <parameter name="structParameter">

+	<dataType>

+	  <struct>

+	    <structMember name="a">

+	      <dataType><integer/></dataType>

+	    </structMember>

+	    <structMember name="b">

+	      <dataType><integer/></dataType>

+	    </structMember>

+	  </struct>

+	</dataType>

+      </parameter>

+    </action>

+

+    <action name="actComplexReturn">

+      <returnType>

+	<dataType>

+	  <struct>

+	    <structMember name="a">

+	      <dataType><integer/></dataType>

+	    </structMember>

+	    <structMember name="b">

+	      <dataType><integer/></dataType>

+	    </structMember>

+	  </struct>

+	</dataType>

+      </returnType>

+    </action>

+

+    <action name="actException">

+      <returnType>

+	<void/>

+      </returnType>

+      <raisesException name="dummyException"/>

+    </action>

+

+    <action name="createInfraStructure">

+     <description>

+         Creates the base IS infrastructure.

+         This is noramlly done at factory.

+     </description>

+     <returnType>

+         <void/>

+     </returnType>

+    </action>

+

+    <action name="exportInventory">

+       <description>

+           Exports the Hardware Inventory via FTP.

+           This is an asyncrounous operation. The file exported

+           will have the following name format:

+            &lt;node&gt;.&lt;timestamp&gt;.HWI.xml.tar.gz

+       </description>

+       <returnType>

+         <void/>

+     </returnType>

+     <parameter name="host">

+         <description>

+            The host to which the data should be sent to

+         </description>

+         <dataType><string/></dataType>

+     </parameter>

+      <parameter name="user">

+       <description>

+           The username on the host to be used during the FTP transfer.

+       </description>

+         <dataType><string/></dataType>

+     </parameter>

+      <parameter name="password">

+       <description>

+            The pasword of the user

+       </description>

+         <dataType><string/></dataType>

+     </parameter>

+      <parameter name="path">

+       <description>

+           The path were to put the file

+       </description>

+         <dataType><string/></dataType>

+     </parameter>

+   </action>

+

+  </class>

+  

+  <class name="BladeType">

+    <description>

+      This class describes a Blade type.

+    </description>

+    <systemCreated/>

+    

+    <attribute name="type">

+      <description>The blade type number like CNA12801</description>

+      <dataType><string/></dataType>

+      <key/>

+    </attribute>

+

+    <attribute name="swgId">

+      <description>The blade software group index link CSX10138</description>

+      <dataType><string/></dataType>

+      <key/>

+    </attribute>

+

+    <attribute name="swgRev">

+      <description>The blade software group revision</description>

+      <dataType><string/></dataType>

+      <key/>

+    </attribute>

+

+    <attribute name="name">

+      <description>The name of the Blade Type.</description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="width">

+      <description>The width of the blade in number of slots.</description>

+      <dataType>	

+	<integer/>

+      </dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="oneGLinks">

+      <description>

+	The 1G links used by the blade type , like 0,1, counted from

+	the leftmost backplane position.

+      </description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="linkAggregates">

+      <description>

+	The 1G links used for link aggregation by the blade type , like 0-1,

+	counted from the leftmost backplane position.

+      </description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="hasHwData">

+      <description>

+	True if possible to read product info via the maintenance bus.

+      </description>

+      <dataType><boolean/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="isMxb">

+      <description>True if this is a Main Switch blade type.</description>

+      <dataType><boolean/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="availOneGSlots">

+      <description>

+	Only valid for main switch blades. A list of slots that have 1G link. 

+	Could be a single slot or a range or a combination thereof. 

+	E.g. 1-24, or 1,3-13,15-24.

+      </description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="aggregateRanges">

+      <description>

+	Only valid for main switch blades. Specifies which slots can be used 

+	for link aggregation. Ranges are specified in the form 1-12,13-24.

+      </description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+    

+  </class>

+

+

+  <class name="BladeSystemDomain">

+    <description>

+      This class describes a Blade system domain.

+    </description>

+    <systemCreated/>

+    

+    <attribute name="name">

+      <description>The blade system domain name.</description>

+      <dataType><string/></dataType>

+      <key/>

+    </attribute>

+

+    <attribute name="description">

+      <description>The description of the blade system domain.</description>

+      <dataType><string/></dataType>

+<!--      <key/> -->

+    </attribute>

+

+  </class>

+  

+    

+  <class name="Subrack">

+    <description>

+      This class describes the subrack.

+    </description>

+    <extension>

+      <callpoint id="Is_Hardware_Subrack" type="external"/>

+<!--      <validate id="Is_Hardware_Subrack" type="external" callOnce="true"/>-->

+    </extension>

+    

+    <attribute name="id">

+      <description>Identifies a certain subrack.</description>

+      <dataType>	

+	<integer><range><min>0</min><max>31</max></range></integer>

+      </dataType>

+      <key/>

+    </attribute>

+    

+    <attribute name="type">

+      <description>The type of subrack.</description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="userLabel">

+      <description>A user friendly Subrack name.</description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="position">

+      <description>The subrack position in the cabinet.</description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="cabinetPosition">

+      <description>The cabinet position in the site.</description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="location">

+      <description>The site location, e.g. the visiting address.</description>

+      <dataType><string/></dataType>

+    </attribute>

+    

+    <attribute name="availableOneGSlots">

+      <description>

+	Available slots for 1G switch links. Information taken from the type 

+	of main switch blade that is created in the subrack.

+      </description>

+      <dataType><string/></dataType>

+      <readOnly/>

+    </attribute>

+    

+    <attribute name="availableTenGSlots">

+      <description>

+	Available slots for 10G switch links. Information taken from the type 

+	of main switch blade that is created in the subrack.

+      </description>

+      <dataType><string/></dataType>

+      <readOnly/>	

+    </attribute>

+      

+    <attribute name="aggregateSlots">

+      <description>

+	Links ranges for (1G) link aggregation. Information taken from the

+	type of main switch blade that is created in the subrack.

+      </description>

+      <dataType><string/></dataType>

+      <readOnly/>	

+    </attribute>

+

+    <attribute name="physicalAddrPlug0">

+      <description>

+         The value of the physical plug 0.

+      </description>

+      <dataType><integer/></dataType>

+      <mandatory/>

+    </attribute>

+

+    <attribute name="physicalAddrPlug1">

+      <description>

+         The value of the physical plug 1.

+      </description>

+      <dataType><integer/></dataType>

+      <mandatory/>

+    </attribute>

+

+    <attribute name="physicalAddrPlug3">

+      <description>

+         The value of the physical plug 3.

+      </description>

+      <dataType><integer/></dataType>

+      <mandatory/>

+    </attribute>

+

+    <attribute name="leftMxbBsSwgId">

+     <description>

+        The BS SWG Id of the left MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="leftMxbBsSwgRev">

+     <description>

+        The BS SWG Revision of the left MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="leftMxbBsCxrId">

+     <description>

+        The BS CXR Id (if any) of the left MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="leftMxbBsCxrRev">

+     <description>

+        The BS CXR Revision (if any) of the left MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="leftMxbBlSwgId">

+     <description>

+        The BL SWG Id of the left MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="leftMxbBlSwgRev">

+     <description>

+        The BL SWG Revision of the left MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="leftMxbBlCxrId">

+     <description>

+        The BL CXR Id (if any) of the left MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="leftMxbBlCxrRev">

+     <description>

+        The BL CXR Revision (if any) of the left MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="rightMxbBsSwgId">

+     <description>

+        The BS SWG Id of the right MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="rightMxbBsSwgRev">

+     <description>

+        The BS SWG Revision of the right MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="rightMxbBsCxrId">

+     <description>

+        The BS CXR Id (if any) of the right MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="rightMxbBsCxrRev">

+     <description>

+        The BS CXR Revision (if any) of the right MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="rightMxbBlSwgId">

+     <description>

+        The BL SWG Id of the right MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="rightMxbBlSwgRev">

+     <description>

+        The BL SWG Revision of the right MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="rightMxbBlCxrId">

+     <description>

+        The BL CXR Id (if any) of the right MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+

+    <attribute name="rightMxbBlCxrRev">

+     <description>

+        The BL CXR Revision (if any) of the right MXB in the subrack.

+        If not given the system will use the same as the

+        MXB in subrack 0. This might not be corect however.

+     </description>

+     <dataType><string/></dataType>

+     <restricted/>

+    </attribute>

+  </class>

+  

+  <class name="Slot">

+    <description>

+      This class corresponds to slots, there is one instance 

+      for each slot. The slots are grouped per subrack. A slot is

+      identified by subrack Id and slot number). The subrack Id for a slot

+      identifies in the subrackTable the subrack that the slot belongs

+      to.

+    </description>

+    <systemCreated/>

+      

+    <attribute name="number">

+      <description>

+	The value of this object identifies the

+	slot position within the subrack.

+      </description>

+      <dataType>	

+	<integer><range><min>0</min><max>25</max></range></integer>

+      </dataType>

+      <key/>

+    </attribute>

+    

+    <attribute name="state">

+      <description>

+	See HwmSlotState description.

+      </description>

+      <dataType name.ref="HwmSlotState"/>

+      <readOnly/>	

+    </attribute>

+    

+    <attribute name="bladeSystem">

+      <description>

+	The value of this object identifies the Blade System that uses this 

+	slot.  An instances of this object will only have meaning in a 

+	conceptual row if the value of hwmSlotState instance is either

+	usedOccupied  or usedEmpty in the same conceptual row,

+	i.e. there is an Blade System created using this slot. (If

+	no Blade System is using the slot, the value will be "-".)

+      </description>

+      <dataType><string/></dataType>

+      <readOnly/>	

+    </attribute>

+    

+  </class>

+  

+  

+  <!-- 

+       Relatonship Definitions

+  -->

+  

+  <relationship name="HwmTop">

+    <containment>

+      <parent>

+	<hasClass name="top_mim:Is"/>

+      </parent>

+      <child>

+	<hasClass name="Hardware"/>

+      </child>

+    </containment>

+  </relationship>

+  

+  <relationship name="BladeTypes">

+    <containment>

+      <parent>

+	<hasClass name="Hardware"/>

+      </parent>

+      <child>

+	<hasClass name="BladeType"/>

+      </child>

+    </containment>

+  </relationship>

+  

+  <relationship name="BladeSystemDomains">

+    <containment>

+      <parent>

+	<hasClass name="Hardware"/>

+      </parent>

+      <child>

+	<hasClass name="BladeSystemDomain"/>

+      </child>

+    </containment>

+  </relationship>

+  

+  <relationship name="Subracks">

+    <containment>

+      <parent>

+	<hasClass name="Hardware"/>

+      </parent>

+      <child>

+	<hasClass name="Subrack"/>

+      </child>

+    </containment>

+  </relationship>

+  

+  <relationship name="Slots">

+    <containment>

+      <parent>

+	<hasClass name="Subrack"/>

+      </parent>

+      <child>

+	<hasClass name="Slot"/>

+      </child>

+    </containment>

+  </relationship>  

+</mim>

+

diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/instance.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/instance.xml
new file mode 100644
index 0000000000..e39152cada
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/instance.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- Copyright (C) Ericsson AB 2006 All rights reserved. -->
+
+<!-- Integrated Site Managed Object Model. -->
+
+<!--
+    This is a template for the IntegratedSite model version 1,
+    which consists of the following mim files: 
+      /vobs/isac/sis/OAM_CRA1190047_1/CPD_CNA11381/doc/19062/cpd_mim.xml
+      /vobs/isac/sis/OAM_CRA1190047_1/HWM_CNA11309/doc/19062/hwm_mim.xml
+      /vobs/isac/sis/OAM_CRA1190047_1/SCA_CNA113119/doc/19062/bs_mim.xml
+      /vobs/isac/sis/OAM_CRA1190047_1/SWM_CNA11315/doc/19062/swm_mim.xml
+      /vobs/isac/sis/OAM_CRA1190047_1/doc/19062/top_mim.xml
+    
+-->
+<IntegratedSite:model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:nc="http://www.ericsson.com/is/isco/nc" xmlns:IntegratedSite="http://www.ericsson.com/is/isco/IntegratedSite" xmlns:IsTypes="http://www.ericsson.com/is/isco/IsTypes" xmlns:MainSwitch="http://www.ericsson.com/is/isco/MainSwitch_1" xmlns:MyBsModel="http://www.ericsson.com/is/isco/MyBsModel_1" xsi:schemaLocation="http://www.ericsson.com/is/isco/IntegratedSite IntegratedSite.xsd">
+  
+  <!--
+      The top class - the forefather of all classes.
+      
+      Key attributes: []
+      
+      Possible children:
+      BladeSystems
+      Hardware
+      NetworkConfiguration
+      Software
+  -->
+  <Is>
+
+    
+    <!-- These three are just for verifying that the xml schema allows
+	 the correct order of the child elements of the Is class -->
+<!--
+    <Hardware/>
+    <Software/>
+    <NetworkConfiguration/>
+-->
+    
+    <!--
+        The BladeSystems mountpoint - parent of all blade systems.
+        
+        Key attributes: []
+        
+        Possible children:
+        BladeSystemTemplate
+        Mxb
+        MyBsModel
+        Sis
+    -->
+    <BladeSystems>
+      
+      <!--
+          This class describes a Blade System. It will be cloned for each
+          new blade system type registered in the system.  The new clone
+          will serve as a mountpoint for the blade system specific model.
+          
+          Key attributes: [name]
+          
+          Possible children:
+          Blade
+          BsIpTrafficClass
+          BsLanTrafficClass
+          BsLogicalNetwork
+          BsVlan
+      -->
+      <MyBsModel>
+        <!--
+            A user friendly Blade System name, must be set at creation and can be 
+            changed when BS is locked.
+        -->
+        <name>bs_localhost_101</name>
+        <!--
+            An identifier for the BS. A new integer has to be used every time a new
+            BS is created. ??? Kvar ???
+        -->
+        <!--
+            The model for a blade system. Includes som mim files, which also uses
+            stuff from a sis model.
+        -->
+        
+        <!--
+            This is a template for the MyBsModel model version 1,
+            which consists of the following mim files: 
+              /vobs/isac/sis/OAM_CRA1190047_1/CCS_CNA113082/test/local_test/ccs_parser_SUITE_data/myTest_mim.xml, Version: /main/R2A/10
+              /vobs/isac/sis/OAM_CRA1190047_1/CCS_CNA113082/test/local_test/ccs_parser_SUITE_data/other_mim.xml
+            
+        -->
+        <MyBsModel:model>
+          
+          <!--
+              This is a class which can be assigned as an attribute of ChildClass.
+              Key attribute is 'id'.
+              
+              Key attributes: [id]
+          -->
+	  <Blipp nc:operation="replace">
+	    <id>name1</id>
+	    <truefalse>true</truefalse>
+	    <ipAddress>
+	      10.11.12.13
+	    </ipAddress>
+	    <macAddress>AA:BB:CC:DD:EE:FF</macAddress>
+	    <moAttributeDeep nc:operation="replace">
+	      /IntegratedSite:model/Is/BladeSystems/MyBsModel[name='bs_localhost_101']/MyBsModel:model/MyClass[id1='Obj'][id2='1']/ChildClass[id='Obj2']
+	    </moAttributeDeep>
+	  </Blipp>
+
+	  <Blipp>
+	    <id>name2</id>
+	    <truefalse>false</truefalse>
+	    <ipAddress>20.21.22.23</ipAddress>
+	    <macAddress>01:02:03:04:5:6</macAddress>
+	    <moAttributeDeep>
+	      MyClass[id1='Obj'][id2='1']/ChildClass[id='Obj3']
+	    </moAttributeDeep>
+	  </Blipp>
+
+          <!--
+              My Test Class
+              The class hierarky looks like this:
+              
+                   +==========+
+                   |MountPoint|
+                   +==========+
+                       / \
+                      /   \
+              +=======+   +=======+
+              | Blipp |   |MyClass|
+              +=======+   +=======+
+                              |
+                              |
+              	 +==========+
+              	 |ChildClass|
+              	 +==========+
+              
+              Key attributes: [id1,id2]
+              
+              Possible children:
+              ChildClass:
+                Definition of children under MyClass
+          -->
+	  <MyClass>
+            <!-- Test class identifyer - part1 -->
+	    <id1>Obj</id1>
+            <!-- Test class identifyer - part2 -->
+	    <id2>1</id2>
+	    <date>2006-03-08T03:00:00.9+03:00</date>
+	    <date2>2006-03-15T22:59:58.99-01:00</date2>
+	    <list>
+	      <item>0</item>
+	      <item>1</item>
+	      <item nc:operation="delete">3</item>
+	    </list>
+	    <list2>
+	      <item>
+                <!-- Struct: sis_model:uselessStruct -->
+		<field1>hei</field1>
+		<field2 nc:operation="replace">1</field2>
+	      </item>
+	      <item nc:operation="replace">
+                <!-- Struct: sis_model:uselessStruct -->
+		<field1>
+		  hopp
+		</field1>
+		<field2>2</field2>
+	      </item>
+	    </list2>
+	    <list3>
+	      <item>hei</item>
+	      <item>hopp</item>
+	    </list3>
+	    <yesNo>
+	      yes
+	    </yesNo>
+            <!-- Attribute description. -->
+	    <commonStruct>
+              <!--
+                  Struct: myNamedStruct
+                  Struct description
+              -->
+	      <counter>0</counter>
+	      <state>locked</state>
+	      <dummyStructRef>
+                <!-- Struct: sis_model:uselessStruct -->
+		<field1>hei</field1>
+		<field2>1</field2>
+	      </dummyStructRef>
+	      <dummySequence>
+		<item>
+		  <field1>hopp</field1>
+		  <field2>2</field2>
+		</item>
+		<item>
+		  <field1>sa</field1>
+		  <field2>3</field2>
+		</item>
+		<item>
+		  <field1>sa</field1>
+		  <field2>4</field2>
+		</item>
+	      </dummySequence>
+	      <inlineStruct>
+		<a>1</a>
+		<b>1.0</b>
+		<c>true</c>
+	      </inlineStruct>
+	    </commonStruct>
+	    <dummyInternal>hei</dummyInternal>
+	    <trueOrFalse>false</trueOrFalse>
+            <!--
+                Child of MyClass
+                
+                Key attributes: [id]
+            -->
+	    <ChildClass>
+	      <id>Obj2</id>
+	      <moAttribute>/IntegratedSite:model/Is/BladeSystems/MyBsModel[name='bs_localhost_101']/MyBsModel:model/Blipp[id='name1']</moAttribute>
+	      <moAttributeNamed>
+		/IntegratedSite:model/Is/BladeSystems/MyBsModel[name='bs_localhost_101']/MyBsModel:model/MyClass[id1='Obj'][id2='1']
+	      </moAttributeNamed>
+	    </ChildClass>
+	    <ChildClass>
+	      <id>Obj3</id>
+	      <moAttribute>../../Blipp[id='name2']</moAttribute>
+<!--	      <moAttributeNamed>../MyClass[id1='Obj'][id2='1']</moAttributeNamed> -->
+	      <moAttributeNamed>Dummy/MyClass[id1='Obj'][id2='1']</moAttributeNamed>
+	    </ChildClass>
+	  </MyClass>
+  
+        </MyBsModel:model>
+      </MyBsModel>
+      
+    </BladeSystems>
+<!--
+    <MainSwitch:model/>
+-->
+  </Is>
+</IntegratedSite:model>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/mim.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/mim.xsd
new file mode 100644
index 0000000000..e0534e8e14
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/mim.xsd
@@ -0,0 +1,486 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.ericsson.com/is/isco/mim/2.0" xmlns="http://www.ericsson.com/is/isco/mim/2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <!--
+    ============================================================================
+    %CCaseFile:	mim.xsd %
+    %CCaseRev:	/main/P4B/1 %
+    %CCaseDate:	2007-05-29 %
+    %CCaseDocNo:	22/155 19-CNA 113 082 Ux %
+    %Rev:		Error in Revision! %
+    Author: EAB/AUL/IS Siri Hansen
+    
+    ============================================================================
+    
+    Copyright (c) Ericsson AB 2006-2007 All rights reserved.
+    
+    The information in this document is the property of Ericsson.
+    
+    Except as specifically authorized in writing by Ericsson, the 
+    receiver of this document shall keep the information contained 
+    herein confidential and shall protect the same in whole or in 
+    part from disclosure and dissemination to third parties.
+    
+    Disclosure and disseminations to the receivers employees shall 
+    only be made on a strict need to know basis.
+  -->
+  <!-- Common -->
+  <xs:element name="description" type="xs:string"/>
+  <xs:element name="extension">
+    <xs:complexType>
+      <xs:group minOccurs="0" maxOccurs="unbounded" ref="anyElement"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="anyAttribute">
+    <xs:anyAttribute processContents="skip"/>
+  </xs:attributeGroup>
+  <xs:group name="anyElement">
+    <xs:sequence>
+      <xs:any processContents="skip"/>
+    </xs:sequence>
+  </xs:group>
+  <!-- Mim definition -->
+  <xs:element name="mim">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="topClass"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:group ref="dataTypeDef"/>
+          <xs:element ref="exception"/>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="class"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="relationship"/>
+      </xs:sequence>
+      <xs:attribute name="version"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="topClass">
+    <xs:complexType>
+	  <xs:sequence>
+        <xs:element minOccurs="0" ref="sortPriority"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+      <xs:attribute name="minOccurs"/>
+      <xs:attribute name="maxOccurs"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- MO class definition -->
+  <xs:element name="class">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="default_access"/>
+        <xs:choice>
+          <xs:sequence>
+            <xs:element ref="singleton"/>
+            <xs:element minOccurs="0" ref="systemCreated"/>
+            <xs:element minOccurs="0" ref="readOnly"/>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="dataTypeDef"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="attribute"/>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element minOccurs="0" ref="systemCreated"/>
+            <xs:element minOccurs="0" ref="readOnly"/>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="dataTypeDef"/>
+            <xs:element maxOccurs="unbounded" ref="attribute"/>
+          </xs:sequence>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="action"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z][A-Za-z0-9]*"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="singleton">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="systemCreated">
+    <xs:complexType/>
+  </xs:element>
+  <!-- Relations -->
+  <xs:element name="relationship">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element ref="containment"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="containment">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="parent"/>
+        <xs:element ref="child"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="parent" type="hasClass"/>
+  <xs:element name="child">
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="hasClass">
+          <xs:sequence>
+            <xs:element minOccurs="0" ref="cardinality"/>
+            <xs:element minOccurs="0" ref="sortPriority"/>
+          </xs:sequence>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sortPriority" type="xs:int"/>
+  <xs:element name="cardinality" type="rangeType"/>
+  <xs:complexType name="hasClass">
+    <xs:sequence>
+      <xs:element ref="hasClass"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="hasClass">
+    <xs:complexType>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- Data types -->
+  <xs:element name="simple_type" abstract="true" substitutionGroup="type"/>  
+  <xs:element name="type" abstract="true"/>
+  <!-- For attributes, parameters and exceptions -->
+  <xs:group name="dataType">
+    <xs:sequence>
+      <xs:element name="dataType" nillable="true">
+        <xs:complexType>
+          <xs:choice>
+            <xs:element ref="type" minOccurs="0"/>
+            <xs:element ref="xs_list" minOccurs="0"/>
+          </xs:choice>
+          <xs:attribute name="name.ref" use="optional"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:group>
+  <xs:group name="simpleDataType">
+    <xs:sequence>
+      <xs:element name="dataType" nillable="true">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element ref="simple_type" minOccurs="0"/>
+          </xs:sequence>
+          <xs:attribute name="name.ref" use="optional"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:group>
+  <xs:group name="dataTypeDef">
+    <xs:sequence>
+      <xs:element name="dataType">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" ref="description"/>
+            <xs:element minOccurs="0" ref="extension"/>
+            <xs:choice>
+              <xs:element ref="type"/>
+              <xs:element ref="xs_list"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:attribute name="name" use="required"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:group>
+  <!-- For actions -->
+  <xs:element name="returnType">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:choice>
+          <xs:element ref="void"/>
+          <xs:group ref="dataType"/>
+        </xs:choice>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <!-- Return data types -->
+  <xs:element name="void">
+    <xs:complexType/>
+  </xs:element>
+  <!-- Primitive data types -->
+  <xs:complexType name="stringRestrictionType">
+    <xs:sequence>
+      <xs:element minOccurs="0" ref="lengthRange"/>
+      <xs:element minOccurs="0" ref="validValues"/>
+      <xs:element minOccurs="0" ref="pattern"/>
+      <xs:element minOccurs="0" ref="defaultValue"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="dateTimeRestrictionType">
+    <xs:sequence>
+      <xs:element minOccurs="0" ref="range"/>
+      <xs:element minOccurs="0" ref="validValues"/>
+      <xs:element minOccurs="0" ref="pattern"/>
+      <xs:element minOccurs="0" ref="defaultValue"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="numRestrictionType">
+    <xs:sequence>
+      <xs:element minOccurs="0" ref="range"/>
+      <xs:element minOccurs="0" ref="defaultValue"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="boolean" substitutionGroup="simple_type">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="defaultValue"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="dateTime" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="float" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="integer" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="string" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="pattern" type="xs:string"/>
+  <xs:element name="validValues">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="value"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="value">
+    <xs:complexType>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="lengthRange" type="rangeType"/>
+  <xs:element name="range" type="rangeType"/>
+  <xs:complexType name="rangeType">
+    <xs:sequence>
+      <xs:element name="min" type="xs:string" minOccurs="0"/>
+      <xs:element name="max" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="defaultValue" type="xs:string"/>
+  <!-- Struct data type -->
+  <xs:element name="struct" substitutionGroup="type">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="structMember"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="structMember">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:group ref="dataType"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- List data type -->
+  <xs:element name="xs_list">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:group ref="simpleDataType"/>
+        <xs:element minOccurs="0" ref="lengthRange"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <!-- MoRef data type -->
+  <xs:element name="moRef" substitutionGroup="simple_type">
+    <xs:complexType>
+      <xs:attribute name="name" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z][A-Za-z0-9]*"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <!-- Attribute -->
+  <xs:element name="attribute">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="default_access"/>
+        <xs:group ref="dataType"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="initialValue"/>
+          <xs:element ref="pmData"/>
+          <xs:choice>
+            <xs:choice>
+              <xs:element ref="key"/>
+              <xs:element ref="readOnly"/>
+            </xs:choice>
+            <xs:choice>
+              <xs:choice>
+                <xs:element ref="readOnly"/>
+                <xs:choice>
+                  <xs:element ref="mandatory"/>
+                  <xs:element ref="restricted"/>
+                </xs:choice>
+              </xs:choice>
+              <xs:element ref="nonPersistent"/>
+            </xs:choice>
+          </xs:choice>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="name" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="[a-z][a-zA-Z0-9]*"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="initialValue" type="xs:string"/>
+  <xs:element name="key">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="mandatory">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="nonPersistent">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="pmData">
+    <xs:complexType>
+      <xs:sequence>
+      	<xs:element minOccurs="0" ref="extension"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="readOnly">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="restricted">
+    <xs:complexType/>
+  </xs:element>
+  <!-- Action -->
+  <xs:element name="action">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="default_access"/>
+        <xs:element ref="returnType"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="raisesException"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="[a-z][a-zA-Z0-9]*"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="parameter">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:group ref="dataType"/>
+        <xs:element minOccurs="0" ref="initialValue"/>
+        <xs:element minOccurs="0" ref="isOptional"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="isOptional">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="exception">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="exceptionParameter"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="exceptionParameter">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:group ref="dataType"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="raisesException">
+    <xs:complexType>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- xs types, introduced in IS 2.0 -->
+  <xs:element name="xs_normalizedString" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_token" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_string" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  
+  <xs:element name="xs_base64Binary" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_hexBinary" type="stringRestrictionType" substitutionGroup="simple_type"/>
+
+  <xs:element name="xs_integer" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_positiveInteger" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_negativeInteger" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_nonNegativeInteger" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_nonPositiveInteger" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_long" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_unsignedLong" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_int" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_unsignedInt" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_short" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_unsignedShort" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_byte" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_unsignedByte" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_decimal" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_float" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_double" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_boolean" type="numRestrictionType" substitutionGroup="simple_type"/>
+
+  <xs:element name="xs_duration" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_dateTime" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_date" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_time" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_gYear" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_gYearMonth" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_gMonth" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_gMonthDay" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_gDay" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+
+  <xs:element name="xs_QName" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_Name" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_NCName" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  
+  <xs:element name="xs_anyURI" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_language" type="stringRestrictionType" substitutionGroup="simple_type"/>
+
+  <!-- Authorization information -->
+  <xs:element name="default_access">
+  	<xs:complexType>
+  	  <xs:attribute name="role" type="xs:token" use="required"/>
+  	  <xs:attribute name="permissions" use="required">
+  	  	<xs:simpleType>
+  	  	  <xs:restriction base="xs:token">
+  	  	    <xs:pattern value="[rwx]{3}"/>
+  	  	  </xs:restriction>
+  	  	</xs:simpleType>
+  	  </xs:attribute>
+  	</xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/mim2.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/mim2.xsd
new file mode 100644
index 0000000000..da6ff6bd7d
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/mim2.xsd
@@ -0,0 +1,506 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.ericsson.com/is/isco/mim/2.0" xmlns="http://www.ericsson.com/is/isco/mim/2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <!--
+    ============================================================================
+    %CCaseFile:	mim.xsd %
+    %CCaseRev:	/main/P4B/3 %
+    %CCaseDate:	2007-06-07 %
+    %CCaseDocNo:	22/155 19-CNA 113 082 Ux %
+    %Rev:		Error in Revision! %
+    Author: EAB/AUL/IS Siri Hansen
+    
+    ============================================================================
+    
+    Copyright (c) Ericsson AB 2006-2007 All rights reserved.
+    
+    The information in this document is the property of Ericsson.
+    
+    Except as specifically authorized in writing by Ericsson, the 
+    receiver of this document shall keep the information contained 
+    herein confidential and shall protect the same in whole or in 
+    part from disclosure and dissemination to third parties.
+    
+    Disclosure and disseminations to the receivers employees shall 
+    only be made on a strict need to know basis.
+  -->
+  <!-- Common -->
+  <xs:element name="description" type="xs:string"/>
+  <xs:element name="extension">
+    <xs:complexType>
+      <xs:group minOccurs="0" maxOccurs="unbounded" ref="anyElement"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="anyAttribute">
+    <xs:anyAttribute processContents="skip"/>
+  </xs:attributeGroup>
+  <xs:group name="anyElement">
+    <xs:sequence>
+      <xs:any processContents="skip"/>
+    </xs:sequence>
+  </xs:group>
+  <!-- Mim definition -->
+  <xs:element name="mim">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="topClass"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:group ref="dataTypeDef"/>
+          <xs:element ref="exception"/>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="class"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="relationship"/>
+      </xs:sequence>
+      <xs:attribute name="version"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="topClass">
+    <xs:complexType>
+	  <xs:sequence>
+        <xs:element minOccurs="0" ref="sortPriority"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+      <xs:attribute name="minOccurs"/>
+      <xs:attribute name="maxOccurs"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- MO class definition -->
+  <xs:element name="class">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="default_access"/>
+        <xs:choice>
+          <xs:sequence>
+            <xs:element ref="singleton"/>
+            <xs:element minOccurs="0" ref="systemCreated"/>
+            <xs:element minOccurs="0" ref="readOnly"/>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="dataTypeDef"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="attribute"/>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element minOccurs="0" ref="systemCreated"/>
+            <xs:element minOccurs="0" ref="readOnly"/>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="dataTypeDef"/>
+            <xs:element maxOccurs="unbounded" ref="attribute"/>
+          </xs:sequence>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="action"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z][A-Za-z0-9]*"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="singleton">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="systemCreated">
+    <xs:complexType/>
+  </xs:element>
+  <!-- Relations -->
+  <xs:element name="relationship">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element ref="containment"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="containment">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="parent"/>
+        <xs:element ref="child"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="parent" type="hasClass"/>
+  <xs:element name="child">
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="hasClass">
+          <xs:sequence>
+            <xs:element minOccurs="0" ref="cardinality"/>
+            <xs:element minOccurs="0" ref="sortPriority"/>
+          </xs:sequence>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sortPriority" type="xs:int"/>
+  <xs:element name="cardinality" type="rangeType"/>
+  <xs:complexType name="hasClass">
+    <xs:sequence>
+      <xs:element ref="hasClass"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="hasClass">
+    <xs:complexType>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- Data types -->
+  <xs:element name="simple_type" abstract="true" substitutionGroup="type"/>  
+  <xs:element name="type" abstract="true"/>
+  <!-- For attributes, parameters and exceptions -->
+  <xs:group name="dataType">
+    <xs:sequence>
+      <xs:element name="dataType" nillable="true">
+        <xs:complexType>
+          <xs:choice>
+            <xs:element ref="type" minOccurs="0"/>
+            <xs:element ref="xs_list" minOccurs="0"/>
+          </xs:choice>
+          <xs:attribute name="name.ref" use="optional"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:group>
+  <xs:group name="simpleDataType">
+    <xs:sequence>
+      <xs:element name="dataType" nillable="true">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element ref="simple_type" minOccurs="0"/>
+          </xs:sequence>
+          <xs:attribute name="name.ref" use="optional"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:group>
+  <xs:group name="dataTypeDef">
+    <xs:sequence>
+      <xs:element name="dataType">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" ref="description"/>
+            <xs:element minOccurs="0" ref="extension"/>
+            <xs:choice>
+              <xs:element ref="type"/>
+              <xs:element ref="xs_list"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:attribute name="name" use="required"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:group>
+  <!-- For actions -->
+  <xs:element name="returnType">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:choice>
+          <xs:element ref="void"/>
+          <xs:group ref="dataType"/>
+        </xs:choice>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <!-- Return data types -->
+  <xs:element name="void">
+    <xs:complexType/>
+  </xs:element>
+  <!-- Primitive data types -->
+  <xs:complexType name="stringRestrictionType">
+    <xs:sequence>
+      <xs:element minOccurs="0" ref="lengthRange"/>
+      <xs:element minOccurs="0" ref="validValues"/>
+      <xs:element minOccurs="0" ref="pattern"/>
+      <xs:element minOccurs="0" ref="defaultValue"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="dateTimeRestrictionType">
+    <xs:sequence>
+      <xs:element minOccurs="0" ref="range"/>
+      <xs:element minOccurs="0" ref="validValues"/>
+      <xs:element minOccurs="0" ref="pattern"/>
+      <xs:element minOccurs="0" ref="defaultValue"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="numRestrictionType">
+    <xs:sequence>
+      <xs:element minOccurs="0" ref="range"/>
+      <xs:element minOccurs="0" ref="defaultValue"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="boolean" substitutionGroup="simple_type">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="defaultValue"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="dateTime" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="float" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="integer" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="string" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="pattern" type="xs:string"/>
+  <xs:element name="validValues">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="value"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="value">
+    <xs:complexType>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="lengthRange" type="rangeType"/>
+  <xs:element name="range" type="rangeType"/>
+  <xs:complexType name="rangeType">
+    <xs:sequence>
+      <xs:element name="min" type="xs:string" minOccurs="0"/>
+      <xs:element name="max" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="defaultValue" type="xs:string"/>
+  <!-- Struct data type -->
+  <xs:element name="struct" substitutionGroup="type">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="structMember"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="structMember">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:group ref="dataType"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- List data type -->
+  <xs:element name="xs_list">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:group ref="simpleDataType"/>
+        <xs:element minOccurs="0" ref="lengthRange"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <!-- MoRef data type -->
+  <xs:element name="moRef" substitutionGroup="simple_type">
+    <xs:complexType>
+      <xs:attribute name="name" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z][A-Za-z0-9]*"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <!-- Attribute -->
+  <xs:element name="attribute">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="default_access"/>
+        <xs:group ref="dataType"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="initialValue"/>
+          <xs:element ref="pmData"/>
+          <xs:choice>
+            <xs:choice>
+              <xs:element ref="key"/>
+              <xs:element ref="readOnly"/>
+            </xs:choice>
+            <xs:choice>
+              <xs:choice>
+                <xs:element ref="readOnly"/>
+                <xs:choice>
+                  <xs:element ref="mandatory"/>
+                  <xs:element ref="restricted"/>
+                </xs:choice>
+              </xs:choice>
+              <xs:element ref="nonPersistent"/>
+            </xs:choice>
+          </xs:choice>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="name" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="[a-z][a-zA-Z0-9]*"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="initialValue" type="xs:string"/>
+  <xs:element name="key">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="mandatory">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="nonPersistent">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="pmData">
+    <xs:complexType>
+      <xs:sequence>
+      	<xs:element minOccurs="0" ref="description"/>
+      	<xs:element minOccurs="0" ref="extension"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="readOnly">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="restricted">
+    <xs:complexType/>
+  </xs:element>
+  <!-- Action -->
+  <xs:element name="action">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="default_access"/>
+        <xs:element ref="returnType"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="raisesException"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="[a-z][a-zA-Z0-9]*"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="parameter">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:group ref="dataType"/>
+        <xs:element minOccurs="0" ref="initialValue"/>
+        <xs:element minOccurs="0" ref="isOptional"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="isOptional">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="exception">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="exceptionParameter"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="exceptionParameter">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="description"/>
+        <xs:element minOccurs="0" ref="extension"/>
+        <xs:group ref="dataType"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="raisesException">
+    <xs:complexType>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- xs types, introduced in IS 2.0 -->
+  <xs:element name="xs_normalizedString" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_token" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_string" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  
+  <xs:element name="xs_base64Binary" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_hexBinary" type="stringRestrictionType" substitutionGroup="simple_type"/>
+
+  <xs:element name="xs_integer" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_positiveInteger" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_negativeInteger" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_nonNegativeInteger" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_nonPositiveInteger" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_long" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_unsignedLong" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_int" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_unsignedInt" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_short" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_unsignedShort" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_byte" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_unsignedByte" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_decimal" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_float" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_double" type="numRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_boolean" substitutionGroup="simple_type">
+	<xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="defaultValue"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+    
+  <xs:element name="xs_duration" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_dateTime" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_date" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_time" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_gYear" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_gYearMonth" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_gMonth" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_gMonthDay" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_gDay" type="dateTimeRestrictionType" substitutionGroup="simple_type"/>
+
+  <xs:element name="xs_QName" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_Name" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_NCName" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  
+  <xs:element name="xs_anyURI" type="stringRestrictionType" substitutionGroup="simple_type"/>
+  <xs:element name="xs_language" type="stringRestrictionType" substitutionGroup="simple_type"/>
+
+  <!-- Password type -->
+  <!-- This is a string, which will not be visible in the CLI or in any logs. -->
+  <!-- The 'encrypt' attribute indicates if the string shall be sent encrypted -->
+  <!-- or in clear text to the blade system -->
+  <xs:element name="password" substitutionGroup="simple_type">
+	<xs:complexType>
+	  <xs:sequence>
+		<xs:element minOccurs="0" ref="lengthRange"/>
+	  </xs:sequence>
+	  <xs:attribute name="enrypt" type="xs:boolean" use="optional"/>
+	</xs:complexType>
+  </xs:element>
+
+  <!-- Authorization information -->
+  <xs:element name="default_access">
+  	<xs:complexType>
+  	  <xs:attribute name="role" type="xs:token" use="required"/>
+  	  <xs:attribute name="permissions" use="required">
+  	  	<xs:simpleType>
+  	  	  <xs:restriction base="xs:token">
+  	  	    <xs:pattern value="[rwx]{3}"/>
+  	  	  </xs:restriction>
+  	  	</xs:simpleType>
+  	  </xs:attribute>
+  	</xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/nc.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/nc.xsd
new file mode 100644
index 0000000000..60a320a61e
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/nc.xsd
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ericsson.com/is/isco/nc" xmlns="http://www.ericsson.com/is/isco/nc">
+  <xsd:attribute name="operation">
+    <xsd:simpleType>
+      <xsd:restriction base="xsd:normalizedString">
+        <xsd:whiteSpace value="collapse"/>
+        <xsd:enumeration value="merge"/>
+        <xsd:enumeration value="create"/>
+        <xsd:enumeration value="replace"/>
+        <xsd:enumeration value="delete"/>
+      </xsd:restriction>
+    </xsd:simpleType>
+  </xsd:attribute>
+</xsd:schema>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/swm_mim.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/swm_mim.xml
new file mode 100644
index 0000000000..90afcb2b68
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/sis/swm_mim.xml
@@ -0,0 +1,881 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!--
+
+Copyright (C) Ericsson AB 2006 All rights reserved.
+
+The information in this document is the property of Ericsson.
+
+Except as specifically authorized in writing by Ericsson, the
+receiver of this document shall keep the information contained
+herein confidential and shall protext the same in whole or in part
+from disclosure and dissemination to third parties.
+
+Disclosure and disseminations to the receivers employees shall
+only be made on a strict need to know basis.
+
+-->
+
+
+<!-- MIM file for SWM -->
+
+  
+  <mim xmlns="http://www.ericsson.com/is/isco/mim/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ericsson.com/is/isco/mim/2.0 /vobs/isac/sis/OAM_CRA1190047_1/CCS_CNA113082/doc/15519/mim.xsd ">
+
+    <!--___ Data types ________________________________ -->
+
+    <dataType name="SwmMatchStrategy">
+      <description>
+	Interpretation of given filename and path .
+      </description>
+      <string>
+	<validValues>
+	  <value name="exact"/>
+	  <value name="prefix"/>
+	  <value name="unknown"/>
+	</validValues>
+	<!--defaultValue>exact</defaultValue-->
+      </string>
+    </dataType>
+    
+    <dataType name="SwmDownloadStrategy">
+      <description>
+	Interpretation according to existing files.
+      </description>
+      <string>
+	<validValues>
+	  <value name="onlyIfMissing"/>
+	  <value name="always"/>
+	  <value name="unknown"/>
+	</validValues>
+	<!--defaultValue>onlyIfMissing</defaultValue-->
+      </string>
+    </dataType>
+    
+    <dataType name="ContainerType">
+      <description>
+	Type of a load module container.
+      </description>
+      <string>
+	<validValues>
+	  <value name="bladeSystemInformation"/>
+	  <value name="bladeInformation"/>
+	  <value name="application"/>
+	  <value name="rootFileSystem"/>
+	  <value name="kernel"/>
+	  <value name="correction"/>
+	</validValues>
+	<!--defaultValue>bladeSystemInformation</defaultValue-->
+      </string>
+    </dataType>
+    
+        
+    <dataType name="SwgStatus">
+      <description>
+	Indicates status of software groups. A software group is 
+	complete if all included load module containers have been 
+	downloaded and unpacked correctly. A software group is inconsistent
+	if the checksums of the load module containers do not match the
+	information in the system information CXP, or if the XML 
+	data could not be registered.
+      </description>
+      <string>
+	<validValues>
+	  <value name="complete"/>
+	  <value name="incomplete"/>
+	  <value name="inconsistent"/>
+	</validValues>
+	<!--defaultValue>incomplete</defaultValue-->
+      </string>
+    </dataType>
+    
+    <dataType name="JobData">
+      <description>
+	Data to specify job progress, during its execution.
+      </description>
+      <struct>
+	<structMember name="jobDateOrdered">
+	  <dataType><dateTime/></dataType>
+	</structMember>
+	<structMember name="jobStatus">
+	  <description>
+	    Indicator of job status.
+	    A job should be started immediately, but could be postponed
+	    if the total load on the system would become too high.
+	  </description>
+	  <dataType>
+	    <string>
+	      <validValues>
+		<value name="notStarted"/>
+		<value name="ongoing"/>
+		<value name="complete"/>
+	      </validValues>
+	      <!--defaultValue>notStarted</defaultValue-->
+	    </string>
+	  </dataType>
+	</structMember>
+	<structMember name="jobResult">
+	  <description>
+	    Possible results of a job action.
+	  </description>
+	  <dataType>
+	    <string>
+	      <validValues>
+		<value name="ok"/>
+		<value name="inputError"/>
+		<value name="executionError"/>
+		<value name="unknown"/>
+	      </validValues>
+	      <!--defaultValue>ok</defaultValue-->
+	    </string>
+	  </dataType>
+	</structMember>
+	<structMember name="jobInfo">
+	  <dataType><string/></dataType>
+	</structMember>
+	<structMember name="jobProgress">
+	  <dataType name.ref="IsTypes:Unsigned32"/>
+	</structMember>
+	<structMember name="jobLastStep">
+	  <dataType name.ref="IsTypes:Unsigned32"/>
+	</structMember>
+	<structMember name="jobProgressReport">
+	  <dataType><boolean/></dataType>
+	</structMember>
+      </struct>
+    </dataType><!-- JobData -->
+
+    <dataType name="FTPData">
+      <description>
+	Data to specify FTP server info, such as host, user, 
+	password and path, to locate correct files or destination
+	for files.
+      </description>
+      <struct>
+	<structMember name="host">
+	  <dataType><string/></dataType>
+	</structMember>
+	<structMember name="user">
+	  <dataType><string/></dataType>
+	</structMember>
+	<structMember name="password">
+	  <dataType><string/></dataType>
+	</structMember>
+	<structMember name="path">
+      <description>
+	Absolute path including filename.
+      </description>
+	  <dataType><string/></dataType>
+	</structMember>
+      </struct>
+    </dataType><!-- FTPData -->
+
+    <dataType name="BladeUgSpecification">
+      <description>
+	Specification of a blade when an upgrade job is ordered for a
+	specific blade. This data always belongs to and is included in
+	an upgrade job for a blade system.
+      </description>
+      <struct>
+	<structMember name="bladeSubrack">
+	  <dataType name.ref="IsTypes:Unsigned32"/>
+	</structMember>
+	<structMember name="bladeSlot">
+	  <dataType name.ref="IsTypes:Unsigned32"/>
+	</structMember>
+	<structMember name="bladeSwgProdNr">
+	  <dataType><string/></dataType>
+	</structMember>
+	<structMember name="bladeSwgVersion">
+	  <dataType><string/></dataType>
+	</structMember>
+      </struct>
+    </dataType> <!-- BladeUgSpecification -->
+
+    <!--___ CLASSes for tables (no STRUCTs) ________________ -->
+
+    <!-- Inventory Classes -->
+
+    <class name="SoftwareDeliveryPackage">
+      <description>
+	Container of files of data, or binary executables, needed to run the system.
+      </description>
+      <systemCreated/>
+      <readOnly/>
+      <attribute name="prodNr">
+	<dataType><string/></dataType>
+	<key/>
+      </attribute>
+      <attribute name="version">	<dataType><string/></dataType>
+	<key/>
+      </attribute>
+      <attribute name="name">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="type">
+	<dataType name.ref="ContainerType">
+	</dataType>
+	<readOnly/>
+      </attribute>
+      <action name="delete">
+	<description>
+	  Action to delete SoftwareDeliveryPackage.
+	</description>
+	<returnType>
+	  <void/>
+	</returnType>
+      </action>
+    </class> <!-- SoftwareDeliveryPackage -->
+
+    <class name="SoftwareGroup">
+      <description>
+        Contains one or more SoftwareDeliveryPackage.
+      </description>
+      <systemCreated/>
+      <readOnly/>
+      <attribute name="prodNr">
+	<dataType><string/></dataType>
+	<key/>
+      </attribute>
+      <attribute name="version">
+	<dataType><string/></dataType>
+	<key/>
+      </attribute>
+      <attribute name="name">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="systemProdNr">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="systemVersion">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="systemName">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="integratedSystemProdNr">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="integratedSystemVersion">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="integratedSystemName">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="relatedCXPs">
+	<dataType>
+	  <xs_list>
+	    <dataType>
+	      <moRef name="SoftwareDeliveryPackage"/>
+	    </dataType>
+	  </xs_list>
+	</dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="status">
+	<dataType name.ref="SwgStatus">
+	</dataType>
+	<readOnly/>
+      </attribute>
+      <action name="delete">
+	<description>
+	  Action to delete Software Group.
+	</description>
+	<returnType>
+	  <void/>
+	</returnType>
+      </action>
+    </class> <!-- SoftwareGroup -->
+
+    <class name="LocalBackup">
+      <description>
+	All available backups locally stored.
+      </description>
+      <systemCreated/>
+      <readOnly/>
+      <attribute name="backupId">
+	<dataType name.ref="IsTypes:Unsigned32">
+	</dataType>
+	<key/>
+      </attribute>
+      <attribute name="name">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="bladeSystem">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="date">
+	<dataType>
+	  <dateTime/>
+	</dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="size">
+	<dataType name.ref="IsTypes:Unsigned32">
+	</dataType>
+	<readOnly/>
+      </attribute>
+      <action name="exportBackup">
+	<description>
+	  Action to export backup file to FTP server from 
+	  local disk storage. An instance of the class
+	  Software/Jobs/Backup/Export is created as a log of this
+	  action.
+	</description>
+	<returnType>
+	  <void/>
+	</returnType>
+        <parameter name="jobId">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="host">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="user">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="password">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="path">
+	  <description>
+	    Absolute path including filename.
+	  </description>
+	  <dataType><string/></dataType>
+	</parameter>
+      </action>
+      <action name="delete">
+	<description>
+	  Action to delete backup.
+	</description>
+	<returnType>
+	  <void/>
+	</returnType>
+      </action>
+    </class> <!-- LocalBackup -->
+
+    <class name="Alarm">
+      <description>
+	Information and cause of all currently active software configuration alarms.
+      </description>
+      <systemCreated/>
+      <readOnly/>
+      <attribute name="id">
+	<dataType name.ref="IsTypes:Unsigned32"/>
+	<key/>
+      </attribute>
+      <attribute name="bladeSystem">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="cause">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="info">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+    </class> <!-- Alarm -->
+
+
+    <!-- Jobs Classes -->
+
+    <class name="DownloadFile">
+      <description>
+	This MO contains information about requested, ongoing,
+	and completed software file download jobs. To start a
+	download job the operator calls an action Inventory class,
+	and a new instance of this MO is created.
+	For load regulating reasons a requested job may not start 
+	immediately. 
+      </description>
+      <systemCreated/>
+      <readOnly/>
+      <attribute name="jobId">
+	<dataType><string/></dataType>
+	<key/>
+      </attribute>
+      <attribute name="jobData">
+	<dataType name.ref="JobData"/>
+	<readOnly/>
+      </attribute>
+      <attribute name="ftpData">
+	<dataType name.ref="FTPData"/>
+	<readOnly/>
+      </attribute>
+      <attribute name="matchStrategy">
+	<dataType name.ref="SwmMatchStrategy">
+	</dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="downloadStrategy">
+	<dataType name.ref="SwmDownloadStrategy">
+	</dataType>
+	<readOnly/>
+      </attribute>
+    </class><!-- DownloadFile -->
+   
+    <class name="Upgrade">
+      <description>
+	This MO handles upgrade jobs towards the system. The operator
+	may specify a specific blade to run the upgrade on, instead of
+	running an upgrade on the entire blade system.
+      </description>
+      <systemCreated/>
+      <readOnly/>
+      <attribute name="jobId">
+	<dataType><string/></dataType>
+	<key/>
+      </attribute>
+      <attribute name="jobData">
+	<dataType name.ref="JobData"/>
+	<readOnly/>
+      </attribute>
+      <attribute name="bladeSystem">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="swgProdNr">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="swgVersion">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="cxrProdNr">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="cxrVersion">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="maxTime">
+	<description>
+	  The maximum time allowed for the SW Upgrade
+	  job to finish. After this time, the job will be interrupted.
+	  The value 0 means that MaxTime will be given the
+	  timer value registered with the Blade System Software Group
+	  Version. If no such value has been registered,
+	  MaxTime will be given a system default timer value.
+	</description>
+	<dataType name.ref="IsTypes:Unsigned32">
+	</dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="bladeUgSpecification">
+	<dataType name.ref="BladeUgSpecification"/>
+	<readOnly/>
+      </attribute>
+    </class><!-- Upgrade -->
+
+
+
+    <!-- Backup Classes -->
+
+    <class name="Create">
+      <description>
+	This MO handles creation of backups of the system.
+      </description>
+      <systemCreated/>
+      <readOnly/>
+      <attribute name="jobId">
+	<dataType><string/></dataType>
+	<key/>
+      </attribute>
+      <attribute name="jobData">
+	<dataType name.ref="JobData"/>
+	<readOnly/>
+      </attribute>
+      <attribute name="backupId">
+	<dataType name.ref="IsTypes:Unsigned32">
+	</dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="targetBladeSystem">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="backupName">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+    </class><!-- Create -->
+
+    <class name="Restore">
+      <description>
+	This MO handles restore of backups of the system.
+      </description>
+      <systemCreated/>
+      <readOnly/>
+      <attribute name="jobId">
+	<dataType><string/></dataType>
+	<key/>
+      </attribute>
+      <attribute name="jobData">
+	<dataType name.ref="JobData"/>
+	<readOnly/>
+      </attribute>
+      <attribute name="backupId">
+	<dataType name.ref="IsTypes:Unsigned32">
+	</dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="targetBladeSystem">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="backupName">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+    </class><!-- Restore -->
+
+    <class name="Import">
+      <description>
+	This MO handles import of backup files from the FTP server.
+	The backup file is stored locally, but not loaded into the system.
+      </description>
+      <systemCreated/>
+      <readOnly/>
+      <attribute name="jobId">
+	<dataType><string/></dataType>
+	<key/>
+      </attribute>
+      <attribute name="jobData">
+	<dataType name.ref="JobData"/>
+	<readOnly/>
+      </attribute>
+      <attribute name="ftpData">
+	<dataType name.ref="FTPData"/>
+	<readOnly/>
+      </attribute>
+    </class><!-- Import -->
+
+    <class name="Export">
+      <description>
+	This MO handles export of locally stored backup files to 
+	the FTP server.
+      </description>
+      <systemCreated/>
+      <readOnly/>
+      <attribute name="jobId">
+	<dataType><string/></dataType>
+	<key/>
+      </attribute>
+      <attribute name="jobData">
+	<dataType name.ref="JobData"/>
+	<readOnly/>
+      </attribute>
+      <attribute name="ftpData">
+	<dataType name.ref="FTPData"/>
+	<readOnly/>
+      </attribute>
+      <attribute name="backupId">
+	<dataType name.ref="IsTypes:Unsigned32">
+	</dataType>
+	<readOnly/>
+      </attribute>
+      <attribute name="backupName">
+	<dataType><string/></dataType>
+	<readOnly/>
+      </attribute>
+    </class><!-- Export -->
+
+
+    <!--____ CLASSes for hierarchic relations __________________ -->
+
+    <class name="Software">
+      <description>
+	Describes the Software management service 
+	in the Integrated Site services management functional area (MFA).
+      </description>
+      <singleton/>
+    </class> <!-- software -->
+    
+    <class name="Inventory">
+      <description>
+	System created data for information and overview.
+	Some data is created as a result of an action called by the
+	operator.
+      </description>
+      <singleton/>
+      <action name="downloadFile">
+	<description>
+	  Action to download file/s from FTP server to 
+	  local disk storage. An instance of the MO class
+	  Software/Jobs/DownloadFile is created as a log of this
+	  action.
+	</description>
+	<returnType>
+	  <void/>
+	</returnType>
+	<parameter name="jobId">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="host">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="user">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="password">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="path">
+	  <description>
+	    Absolute path including filename.
+	  </description>
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="matchStrategy">
+	  <dataType name.ref="SwmMatchStrategy"></dataType>
+	</parameter>
+	<parameter name="downloadStrategy">
+	  <dataType name.ref="SwmDownloadStrategy"></dataType>
+	</parameter>
+      </action>
+      <action name="importBackup">
+	<description>
+	  Action to import backup file from FTP server to 
+	  to local disk storage. An instance of the MO class
+	  Software/Jobs/Backup/Import is created as a log of this
+	  action.
+	</description>
+	<returnType>
+	  <void/>
+	</returnType>
+	<parameter name="jobId">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="host">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="user">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="password">
+	  <dataType><string/></dataType>
+	</parameter>
+	<parameter name="path">
+	  <description>
+	    Absolute path including filename.
+	  </description>
+	  <dataType><string/></dataType>
+	</parameter>
+      </action>
+    </class> <!-- Inventory -->
+
+    <class name="Jobs">
+      <description>
+	Subclass to top class Software. Parent of
+	Jobs classes:
+	   DownloadFile,
+	   Upgrade,
+	   Backup.
+	Contains system created data through ordered job actions.
+      </description>
+      <singleton/>
+    </class> <!-- Jobs -->
+
+    <class name="Backup">
+      <description>
+	Subclass to class Jobs. Parent of
+	Jobs classes:
+	   Create,
+	   Restore
+	   Import,
+	   Export.
+<!--	   CreateAndExport,
+	   ImportAndRestore.-->
+	Contains system created data through ordered backup job actions.
+      </description>
+      <singleton/>
+    </class> <!-- Backup -->
+
+
+    <!--____ RELATIONSHIPs ______________________________-->
+
+    <!-- Top Class Relations -->
+    <relationship name="SwmTop">
+      <containment>
+	<parent>
+	  <hasClass name="top_mim:Is"/>
+	</parent>
+	<child>
+	  <hasClass name="Software"/>
+	</child>
+      </containment>
+    </relationship>
+    
+    <relationship name="Software_to_Inventory">
+      <containment>
+	<parent>
+	  <hasClass name="Software"/>
+	</parent>
+	<child>
+	  <hasClass name="Inventory"/>
+	  <cardinality>
+	    <min>1</min>
+	    <max>1</max>
+	  </cardinality>
+	</child>
+      </containment>
+    </relationship>
+    
+    <relationship name="Software_to_Jobs">
+      <containment>
+	<parent>
+	  <hasClass name="Software"/>
+	</parent>
+	<child>
+	  <hasClass name="Jobs"/>
+	  <cardinality>
+	    <min>1</min>
+	    <max>1</max>
+	  </cardinality>
+	</child>
+      </containment>
+    </relationship>
+
+    <!-- Inventory Class Relations -->
+    <relationship name="Inventory_to_SoftwareDeliveryPackage">
+      <containment>
+	<parent>
+	  <hasClass name="Inventory"/>
+	</parent>
+	<child>
+	  <hasClass name="SoftwareDeliveryPackage"/>
+	</child>
+      </containment>
+    </relationship>
+
+    <relationship name="Inventory_to_SoftwareGroup">
+      <containment>
+	<parent>
+	  <hasClass name="Inventory"/>
+	</parent>
+	<child>
+	  <hasClass name="SoftwareGroup"/>
+	</child>
+      </containment>
+    </relationship>
+
+    <relationship name="Inventory_to_LocalBackup">
+      <containment>
+	<parent>
+	  <hasClass name="Inventory"/>
+	</parent>
+	<child>
+	  <hasClass name="LocalBackup"/>
+	</child>
+      </containment>
+    </relationship>
+
+    <relationship name="Inventory_to_Alarm">
+      <containment>
+	<parent>
+	  <hasClass name="Inventory"/>
+	</parent>
+	<child>
+	  <hasClass name="Alarm"/>
+	</child>
+      </containment>
+    </relationship>
+
+    <!-- Jobs Class Relations -->
+    <relationship name="Jobs_to_DownloadFile">
+      <containment>
+	<parent>
+	  <hasClass name="Jobs"/>
+	</parent>
+	<child>
+	  <hasClass name="DownloadFile"/>
+	</child>
+      </containment>
+    </relationship>
+
+    <relationship name="Jobs_to_Upgrade">
+      <containment>
+	<parent>
+	  <hasClass name="Jobs"/>
+	</parent>
+	<child>
+	  <hasClass name="Upgrade"/>
+	</child>
+      </containment>
+    </relationship>
+
+    <relationship name="Jobs_to_Backup">
+      <containment>
+	<parent>
+	  <hasClass name="Jobs"/>
+	</parent>
+	<child>
+	  <hasClass name="Backup"/>
+	  <cardinality>
+	    <min>1</min>
+	    <max>1</max>
+	  </cardinality>
+	</child>
+      </containment>
+    </relationship>
+
+    <!-- Backup Class Relations -->
+    <relationship name="Backup_to_Create">
+      <containment>
+	<parent>
+	  <hasClass name="Backup"/>
+	</parent>
+	<child>
+	  <hasClass name="Create"/>
+	</child>
+      </containment>
+    </relationship>
+
+     <relationship name="Backup_to_Restore">
+      <containment>
+	<parent>
+	  <hasClass name="Backup"/>
+	</parent>
+	<child>
+	  <hasClass name="Restore"/>
+	</child>
+      </containment>
+    </relationship>
+
+    <relationship name="Backup_to_Import">
+      <containment>
+	<parent>
+	  <hasClass name="Backup"/>
+	</parent>
+	<child>
+	  <hasClass name="Import"/>
+	</child>
+      </containment>
+    </relationship>
+
+    <relationship name="Backup_to_Export">
+      <containment>
+	<parent>
+	  <hasClass name="Backup"/>
+	</parent>
+	<child>
+	  <hasClass name="Export"/>
+	</child>
+      </containment>
+    </relationship>
+ </mim>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/small.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/small.xml
new file mode 100644
index 0000000000..b0358f467d
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/small.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<purchaseOrder
+  xmlns="small"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="small small.xsd"
+  orderDate="1999-10-20">
+This is the content of the element
+</purchaseOrder>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/small.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/small.xsd
new file mode 100644
index 0000000000..00d49db22d
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/small.xsd
@@ -0,0 +1,60 @@
+<xsd:schema
+      targetNamespace="small"
+      xmlns:sm="small" 
+      xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+  <xsd:annotation>
+    <xsd:documentation xml:lang="en">
+     Purchase order schema for Example.com.
+     Copyright 2000 Example.com. All rights reserved.
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:element name="purchaseOrder" type="sm:PurchaseOrderType"/>
+
+  <xsd:element name="comment" type="xsd:string"/>
+
+  <xsd:complexType name="PurchaseOrderType" mixed="true">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string">
+        <xsd:attribute name="orderDate" type="xsd:date"/>
+        <xsd:attribute name="orderStatus" type="xsd:string" default="new"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+  <complexType name="own1">
+    <complexContent>
+      <restriction base="xsd:anyType">
+        <attribute name="number"   type="xsd:integer"/>
+        <attribute name="quantity" type="xsd:positiveInteger"/>
+      </restriction>
+    </complexContent>
+  </complexType>
+
+  <complexType name="PartsType">
+    <sequence>
+      <element name="part" maxOccurs="unbounded">
+        <complexType>
+          <simpleContent>
+            <extension base="xsd:string">
+              <attribute name="number" type="xsd:integer"/>
+            </extension>
+          </simpleContent>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+
+<simpleType name="listOfMyIntType">
+  <list itemType="xsd:integer"/>
+</simpleType>
+
+<simpleType name="SixUSStates">
+  <restriction base="sm:listOfMyIntType">
+    <length value="6"/>
+  </restriction>
+</simpleType>
+
+</xsd:schema>
+
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/ticket_7288.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/ticket_7288.xml
new file mode 100644
index 0000000000..9108e96bed
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/ticket_7288.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+	<IMSSubscription>
+		<PrivateID>[email protected]</PrivateID>
+		<ServiceProfile>
+			<PublicIdentity>
+				<BarringIndication>1</BarringIndication>
+				<Identity>sip:[email protected]</Identity>
+			</PublicIdentity>
+			<PublicIdentity>
+				<Identity>sip:[email protected]</Identity>
+			</PublicIdentity>
+			<InitialFilterCriteria>
+				<Priority>0</Priority>
+				<TriggerPoint>
+					<ConditionTypeCNF>1</ConditionTypeCNF>
+					<SPT>
+						<ConditionNegated>0</ConditionNegated>
+						<Group>0</Group>
+						<Method>INVITE</Method>
+					</SPT>
+					<SPT>
+						<ConditionNegated>0</ConditionNegated>
+						<Group>0</Group>
+						<Method>MESSAGE</Method>
+					</SPT>
+					<SPT>
+						<ConditionNegated>0</ConditionNegated>
+						<Group>0</Group>
+						<Method>SUBSCRIBE</Method>
+					</SPT>
+					<SPT>
+						<ConditionNegated>0</ConditionNegated>
+						<Group>1</Group>
+						<Method>INVITE</Method>
+					</SPT>
+					<SPT>
+						<ConditionNegated>0</ConditionNegated>
+						<Group>1</Group>
+						<Method>MESSAGE</Method>
+					</SPT>
+
+					<SPT>
+						<ConditionNegated>1</ConditionNegated>
+						<Group>1</Group>
+						<SIPHeader>
+							<Header>From</Header>
+							<Content>"joe"</Content>
+						</SIPHeader>
+					</SPT>
+				</TriggerPoint>
+				<ApplicationServer>
+					<ServerName>sip:[email protected]</ServerName>
+				</ApplicationServer>
+			</InitialFilterCriteria>
+		</ServiceProfile>
+	</IMSSubscription>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/ticket_8599.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/ticket_8599.xml
new file mode 100644
index 0000000000..1eacfc756e
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/ticket_8599.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+
+<persons>
+<person>lars thorsen</person>
+<person></person>
+</persons>
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/ticket_8599.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/ticket_8599.xsd
new file mode 100644
index 0000000000..977f043bb7
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/ticket_8599.xsd
@@ -0,0 +1,17 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:element name="persons"  type="p"/>
+
+  <xs:complexType name="p">
+    <xs:sequence>
+      <xs:element name="person" type="string" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+
+  <xs:simpleType name="string">
+    <xs:restriction base="xs:string">
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle.xml
new file mode 100644
index 0000000000..61aacbc8d0
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<root>
+  <state>
+    <code>AL</code>
+    <vehicle plateNumber="1123" state="AL"/>
+    <vehicle plateNumber="1125" state="AK"/>
+    <vehicle plateNumber="1124" state="AL"/>
+    <vehicle plateNumber="1223" state="AL"/>
+    <vehicle plateNumber="1323" state="AL"/>
+    <vehicle plateNumber="1225" state="AS"/>
+    <vehicle plateNumber="1126" state="AZ"/>
+    <vehicle plateNumber="1127" state="AR"/>
+    <vehicle plateNumber="1128" state="FL"/>
+    <vehicle plateNumber="2341" state="FL"/>
+    <vehicle plateNumber="1129" state="FL"/>
+    <vehicle plateNumber="1133" state="FL"/>
+    <vehicle plateNumber="22123" state="MO"/>
+    <vehicle plateNumber="22124" state="MI"/>
+    <person>
+      <car regState="AL" regPlate="1123"/>
+    </person>
+    <person>
+      <car regState="AK" regPlate="1125"/>
+    </person>
+    <person>
+      <car regState="AL" regPlate="1124"/>
+      <car regState="AL" regPlate="1223"/>
+    </person>
+    <person>
+      <car regState="AL" regPlate="1323"/>
+    </person>
+    <person>
+      <car regState="AS" regPlate="1225"/>
+    </person>
+    <person>
+      <car regState="AZ" regPlate="1126"/>
+    </person>
+    <person>
+      <car regState="AR" regPlate="1127"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="2341"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="1128"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="1133"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="1129"/>
+    </person>
+    <person>
+      <car regState="MO" regPlate="22123"/>
+    </person>
+    <person>
+      <car regState="MI" regPlate="22124"/>
+    </person>
+  </state>
+  <state>
+    <code>CO</code>
+    <vehicle plateNumber="1123" state="AL"/>
+    <vehicle plateNumber="1120" state="AK"/>
+    <vehicle plateNumber="1124" state="AL"/>
+    <vehicle plateNumber="1221" state="AL"/>
+    <vehicle plateNumber="1323" state="AL"/>
+    <vehicle plateNumber="1223" state="AS"/>
+    <vehicle plateNumber="1126" state="AZ"/>
+    <vehicle plateNumber="1127" state="AR"/>
+    <vehicle plateNumber="1128" state="FL"/>
+    <vehicle plateNumber="2341" state="FL"/>
+    <vehicle plateNumber="1125" state="FL"/>
+    <vehicle plateNumber="1133" state="FL"/>
+    <vehicle plateNumber="22123" state="MO"/>
+    <vehicle plateNumber="22124" state="MI"/>
+    <person>
+      <car regState="AL" regPlate="1123"/>
+    </person>
+    <person>
+      <car regState="AK" regPlate="1120"/>
+    </person>
+    <person>
+      <car regState="AL" regPlate="1124"/>
+    </person>
+    <person>
+      <car regState="AL" regPlate="1221"/>
+    </person>
+    <person>
+      <car regState="AL" regPlate="1323"/>
+    </person>
+    <person>
+      <car regState="AS" regPlate="1223"/>
+    </person>
+    <person>
+      <car regState="AZ" regPlate="1126"/>
+    </person>
+    <person>
+      <car regState="AR" regPlate="1127"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="2341"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="1128"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="1133"/>
+      <car regState="FL" regPlate="1125"/>
+    </person>
+    <person>
+      <car regState="MO" regPlate="22123"/>
+    </person>
+    <person>
+      <car regState="MI" regPlate="22124"/>
+    </person>
+  </state>
+</root>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle.xsd
new file mode 100644
index 0000000000..2e7c053497
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle.xsd
@@ -0,0 +1,82 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:element name="vehicle">
+   <xs:complexType>
+    <xs:attribute name="plateNumber" type="xs:integer"/>
+    <xs:attribute name="state" type="twoLetterCode"/>
+   </xs:complexType>
+  </xs:element>
+
+  <xs:element name="state">
+   <xs:complexType>
+    <xs:sequence>
+     <xs:element name="code" type="twoLetterCode"/>
+     <xs:element ref="vehicle" maxOccurs="unbounded"/>
+     <xs:element ref="person" maxOccurs="unbounded"/>
+    </xs:sequence>
+   </xs:complexType>
+
+   <xs:key name="reg"> <!-- vehicles are keyed by their plate within states -->
+    <xs:selector xpath=".//vehicle"/>
+    <xs:field xpath="@plateNumber"/>
+   </xs:key>
+  </xs:element>
+
+  <xs:element name="root">
+   <xs:complexType>
+    <xs:sequence>
+     <xs:element ref="state" maxOccurs="51"/>
+    </xs:sequence>
+   </xs:complexType>
+
+   <xs:key name="state"> <!-- states are keyed by their code -->
+    <xs:selector xpath=".//state"/>
+    <xs:field xpath="code"/>
+   </xs:key>
+
+   <xs:keyref name="vehicleState" refer="state">
+    <!-- every vehicle refers to its state -->
+    <xs:selector xpath=".//vehicle"/>
+    <xs:field xpath="@state"/>
+   </xs:keyref>
+
+   <xs:key name="regKey"> <!-- vehicles are keyed by a pair of state and plate -->
+    <xs:selector xpath=".//vehicle"/>
+    <xs:field xpath="@state"/>
+    <xs:field xpath="@plateNumber"/>
+   </xs:key>
+
+   <xs:keyref name="carRef" refer="regKey"> <!-- people's cars are a reference -->
+    <xs:selector xpath=".//car"/>
+    <xs:field xpath="@regState"/>
+    <xs:field xpath="@regPlate"/>
+   </xs:keyref>
+
+  </xs:element>
+
+  <xs:element name="person">
+   <xs:complexType>
+    <xs:sequence>
+     <xs:element name="car" maxOccurs="2">
+      <xs:complexType>
+       <xs:attribute name="regState" type="twoLetterCode"/>
+       <xs:attribute name="regPlate" type="xs:integer"/>
+      </xs:complexType>
+     </xs:element>
+    </xs:sequence>
+   </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name="twoLetterCode">
+    <xs:restriction base="xs:string">
+      <xs:maxLength value="2"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="threeLetterCode">
+    <xs:restriction base="xs:string">
+      <xs:maxLength value="3"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle2.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle2.xml
new file mode 100644
index 0000000000..6b60c83e6a
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle2.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<root>
+  <state>
+    <code>AL</code>
+    <vehicle plateNumber="1123" state="AL"/>
+    <vehicle plateNumber="1121" state="AK"/>
+    <vehicle plateNumber="1124" state="AL"/>
+    <vehicle plateNumber="1221" state="AL"/>
+    <vehicle plateNumber="1122" state="AL"/>
+    <vehicle plateNumber="1225" state="AS"/>
+    <vehicle plateNumber="1126" state="AZ"/>
+    <vehicle plateNumber="1127" state="AR"/>
+    <vehicle plateNumber="1128" state="FL"/>
+    <vehicle plateNumber="2341" state="FL"/>
+    <vehicle plateNumber="1125" state="FL"/>
+    <vehicle plateNumber="1133" state="FL"/>
+    <vehicle plateNumber="22123" state="MO"/>
+    <vehicle plateNumber="22124" state="MI"/>
+    <person>
+      <car regState="AL" regPlate="1122"/>
+    </person>
+    <person>
+      <car regState="AK" regPlate="1121"/>
+    </person>
+    <person>
+      <car regState="AL" regPlate="1124"/>
+      <car regState="AL" regPlate="1221"/>
+    </person>
+    <person>
+      <car regState="AL" regPlate="1123"/>
+    </person>
+    <person>
+      <car regState="AS" regPlate="1225"/>
+    </person>
+    <person>
+      <car regState="AZ" regPlate="1126"/>
+    </person>
+    <person>
+      <car regState="AR" regPlate="1127"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="2341"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="1128"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="1133"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="1125"/>
+    </person>
+    <person>
+      <car regState="MO" regPlate="22123"/>
+    </person>
+    <person>
+      <car regState="MI" regPlate="22124"/>
+    </person>
+  </state>
+
+</root>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle3.xml b/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle3.xml
new file mode 100644
index 0000000000..37536c7335
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/vehicle3.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<root>
+  <state>
+    <code>AL</code>
+    <vehicle plateNumber="1123" state="AL"/>
+    <vehicle plateNumber="1125" state="AK"/>
+    <vehicle plateNumber="1124" state="AL"/>
+    <vehicle plateNumber="1223" state="AL"/>
+    <vehicle plateNumber="1323" state="AL"/>
+    <vehicle plateNumber="1225" state="AS"/>
+    <vehicle plateNumber="1126" state="AZ"/>
+    <vehicle plateNumber="1127" state="AR"/>
+    <vehicle plateNumber="1128" state="FL"/>
+    <vehicle plateNumber="2341" state="FL"/>
+    <vehicle plateNumber="1129" state="FL"/>
+    <vehicle plateNumber="1133" state="FL"/>
+    <vehicle plateNumber="22123" state="MO"/>
+    <vehicle plateNumber="22124" state="MI"/>
+    <person>
+      <car regState="AL" regPlate="1123"/>
+    </person>
+    <person>
+      <car regState="AK" regPlate="1125"/>
+    </person>
+    <person>
+      <car regState="AL" regPlate="1124"/>
+      <car regState="AL" regPlate="1223"/>
+    </person>
+    <person>
+      <car regState="AL" regPlate="1323"/>
+    </person>
+    <person>
+      <car regState="AS" regPlate="1225"/>
+    </person>
+    <person>
+      <car regState="AZ" regPlate="1126"/>
+    </person>
+    <person>
+      <car regState="AR" regPlate="1127"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="2341"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="1128"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="1133"/>
+    </person>
+    <person>
+      <car regState="FL" regPlate="1129"/>
+    </person>
+    <person>
+      <car regState="MO" regPlate="22123"/>
+    </person>
+    <person>
+      <car regState="MI" regPlate="22124"/>
+    </person>
+  </state>
+  <state>
+    <code>CO</code>
+    <vehicle plateNumber="1123" state="CO"/>
+    <vehicle plateNumber="1120" state="AK"/>
+    <vehicle plateNumber="1124" state="CO"/>
+    <vehicle plateNumber="1221" state="AL"/>
+    <vehicle plateNumber="1323" state="CO"/>
+    <vehicle plateNumber="1223" state="AS"/>
+    <vehicle plateNumber="1126" state="CO"/>
+    <vehicle plateNumber="1127" state="CA"/>
+    <vehicle plateNumber="1128" state="DE"/>
+    <vehicle plateNumber="2341" state="DC"/>
+    <vehicle plateNumber="1125" state="FL"/>
+    <vehicle plateNumber="1133" state="GA"/>
+    <vehicle plateNumber="22123" state="GU"/>
+    <vehicle plateNumber="22124" state="HI"/>
+    <person>
+      <car regState="CO" regPlate="1123"/>
+    </person>
+    <person>
+      <car regState="AK" regPlate="1120"/>
+    </person>
+    <person>
+      <car regState="CO" regPlate="1124"/>
+    </person>
+    <person>
+      <car regState="AL" regPlate="1221"/>
+    </person>
+    <person>
+      <car regState="CO" regPlate="1323"/>
+    </person>
+    <person>
+      <car regState="AS" regPlate="1223"/>
+    </person>
+    <person>
+      <car regState="CO" regPlate="1126"/>
+    </person>
+    <person>
+      <car regState="CA" regPlate="1127"/>
+    </person>
+    <person>
+      <car regState="DC" regPlate="2341"/>
+    </person>
+    <person>
+      <car regState="DE" regPlate="1128"/>
+    </person>
+    <person>
+      <car regState="GA" regPlate="1133"/>
+      <car regState="FL" regPlate="1125"/>
+    </person>
+    <person>
+      <car regState="GU" regPlate="22123"/>
+    </person>
+    <person>
+      <car regState="HI" regPlate="22124"/>
+    </person>
+  </state>
+</root>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE.erl b/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE.erl
new file mode 100644
index 0000000000..e619390f65
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE.erl
@@ -0,0 +1,812 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2006-2010. 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%
+%%
+%%
+%%% Purpose : Test suite for the xmerl application
+
+%% Do NOT edit this file. It is generated by the generate_xsd_suite module
+%% For more info read the comments in the header of that file.
+
+-module('xmerl_xsd_Sun2002-01-16_SUITE').
+
+-compile(export_all).
+
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
+-include_lib("xmerl/include/xmerl_xsd.hrl").
+
+
+all() -> 
+    ['Sun-idc001.nogen', 'Sun-idc002.e', 'Sun-idc002b.e',
+     'Sun-idc003.e', 'Sun-idc004.nogen', 'Sun-idc004a.e',
+     'Sun-idc005.nogen', 'Sun-idc006.nogen', 'Sun-xsd001',
+     'Sun-xsd002', 'Sun-xsd003-1.e', 'Sun-xsd003-2.e',
+     'Sun-xsd003a', 'Sun-xsd003b', 'Sun-xsd004',
+     'Sun-xsd005', 'Sun-xsd006', 'Sun-xsd008', 'Sun-xsd011',
+     'Sun-xsd012', 'Sun-xsd013.e', 'Sun-xsd014.e',
+     'Sun-xsd015.e', 'Sun-xsd016.e', 'Sun-xsd017.e',
+     'Sun-xsd018.e', 'Sun-xsd019.e', 'Sun-xsd020.e',
+     'Sun-xsd020-2.e', 'Sun-xsd020-3.e', 'Sun-xsd020-4.e',
+     'Sun-xsd021', 'Sun-xsd022', 'Sun-xsd023.e',
+     'Sun-xsiType1', 'Sun-xsiType-block-1',
+     'Sun-xsiType-block-2', 'Sun-xsiType-block-3',
+     'Sun-xsiType-block-4', 'Sun-type-and-subst-1'].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+%% initialization before the test suite
+init_per_suite(Config) ->
+  Dog=test_server:timetrap({minutes,10}),
+  xmerl_xsd_lib:unpack(Config,sun),
+  {ok,LogFile} = xmerl_xsd_lib:create_error_log_file(Config,sun),
+  test_server:timetrap_cancel(Dog),
+  [{suite,sun},{xmerl_error_log,LogFile}|Config].
+
+end_per_suite(Config) ->
+  xmerl_xsd_lib:rmdir(Config,sun),
+  xmerl_xsd_lib:close_error_log_file(Config),
+  ok.
+
+%% initialization before each testcase
+init_per_testcase(TestCase,Config) ->
+  Dog=test_server:timetrap({minutes,3}),
+  [{testcase,TestCase},{watchdog, Dog}|Config].
+
+%% clean up after each testcase
+end_per_testcase(_Func,Config) ->
+  Dog=?config(watchdog, Config),
+  test_server:timetrap_cancel(Dog),
+  ok.
+
+%% ID Constranints. Very naive test of identity constraint
+'Sun-idc001.nogen'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/idc001.nogen.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc001.nogen.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc001.nogen.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc001.nogen.v01.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList3).
+
+%% ID Constranints. Reference to an undeclared key
+'Sun-idc002.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/idc002.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% ID Constranints. Reference to an undeclared key in an undeclared namespace
+'Sun-idc002b.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/idc002b.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% ID Constranints. Reference to non-key constraint.
+'Sun-idc003.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/idc003.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% ID Constranints.
+'Sun-idc004.nogen'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/idc004.nogen.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc004.nogen.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc004.nogen.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc004.nogen.n02.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc004.nogen.n03.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc004.nogen.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList5).
+
+%% ID Constraints. Key/keyref field size mismatch.
+'Sun-idc004a.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/idc004a.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% ID Constraints. Very naive test of identity constraint.
+'Sun-idc005.nogen'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/idc005.nogen.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc005.nogen.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc005.nogen.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc005.nogen.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList3).
+
+%% ID Constraints. XPath engine test: ".//a/*/b" and use of "." for both selector and field.
+'Sun-idc006.nogen'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/idc006.nogen.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc006.nogen.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc006.nogen.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/idc006.nogen.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList3).
+
+%% - use of elementFormDefault="unqualified" - unusual minOccurs/maxOccurs (3 and 7 respectively) - complexType with simpleContent, and restriction. - simpleType within restriction.
+'Sun-xsd001'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd001.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.n02.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.n03.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.n04.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.n05.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.n06.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.n07.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.v01.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList10 = [ITRes9|ITResList9],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.v02.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd001.v03.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList12).
+
+%% - use of elementFormDefault="unqualified" - use of elementFormDefault and form attribute. - implicit use of "ur-type" as the content model of element.
+'Sun-xsd002'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd002.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd002.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd002.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd002.n02.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd002.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd002.v01.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList5).
+
+%% Element redefinition. Unable to redefine element.
+'Sun-xsd003-1.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd003-1.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Element redefinition. Unable to redefine element.
+'Sun-xsd003-2.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd003-2.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Element redefinition. Test without redefinition.
+'Sun-xsd003a'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd003a.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd003a.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList1).
+
+%% Element redefinition. Test with redefinition with self-reference.
+'Sun-xsd003b'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd003b.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd003b.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd003b.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd003b.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd003b.v01.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList4).
+
+%% Use of three different type of any element with different @namespace.
+'Sun-xsd004'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd004.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n02.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n03.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n04.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n05.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n06.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n07.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n08.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n09.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList10 = [ITRes9|ITResList9],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n10.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n11.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.n12.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd004.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList14 = [ITRes13|ITResList13],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList14).
+
+%% Complex type derivation.
+'Sun-xsd005'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd005.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd005.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd005.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd005.n02.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd005.n03.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd005.n04.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd005.n05.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd005.n06.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd005.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList8 = [ITRes7|ITResList7],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList8).
+
+%% minOccurs/maxOccurs. Various combinations.
+'Sun-xsd006'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd006.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.n02.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.n03.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.n04.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.n05.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.n06.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.n07.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.n08.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.n09.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList10 = [ITRes9|ITResList9],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.n10.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd006.v00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList12 = [ITRes11|ITResList11],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList12).
+
+%% Abstract element and element substitution group.
+'Sun-xsd008'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd008.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd008.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd008.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd008.n02.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd008.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList4).
+
+%% Nillable.
+'Sun-xsd011'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd011.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd011.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd011.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd011.n02.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd011.n03.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd011.n04.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd011.v00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList6 = [ITRes5|ITResList5],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList6).
+
+%% Mixed content model.
+'Sun-xsd012'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd012.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd012.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd012.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList2).
+
+%% Reference to undeclared element.
+'Sun-xsd013.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd013.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Reference to undeclared element.
+'Sun-xsd014.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd014.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Reference to undeclared type (it may be simple or complex).
+'Sun-xsd015.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd015.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Reference to undeclared type (it may be simple or complex).
+'Sun-xsd016.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd016.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Reference to undeclared complex type.
+'Sun-xsd017.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd017.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Reference to undeclared complex type.
+'Sun-xsd018.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd018.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Reference to undeclared simple type.
+'Sun-xsd019.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd019.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Reference to undeclared simple type.
+'Sun-xsd020.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd020.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Reference to undeclared attribute.
+'Sun-xsd020-2.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd020-2.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Reference to undeclared model group.
+'Sun-xsd020-3.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd020-3.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Reference to undeclared attribute group.
+'Sun-xsd020-4.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd020-4.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% anyOtherAttribute.
+'Sun-xsd021'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd021.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n01.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n02.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n03.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n04.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n05.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n06.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n07.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n08.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n09.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList10 = [ITRes9|ITResList9],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n10.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.n11.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd021.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList13 = [ITRes12|ITResList12],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList13).
+
+%% Simple type. Various forms of forward reference to the simple type.
+'Sun-xsd022'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd022.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd022.n00.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsd022.v00.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList2).
+
+%% Simple type. Recursive definition.
+'Sun-xsd023.e'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsd023.e.xsd','./suntest/SunTestsAll',invalid),
+  STResList1 = [STRes0|STResList0],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,[]).
+
+%% Simple type.
+'Sun-xsiType1'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsiType1.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType1.v1.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType1.n1.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList2).
+
+%% Test block attribute (1) - use block="extension" at the B type. This should exclude all types that uses extension.
+'Sun-xsiType-block-1'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsiType-block-1.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-1.v1.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-1.n1.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-1.n2.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-1.n3.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-1.n4.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList5).
+
+%% Test block attribute (2) - use block="extension" as the blockDefault attribute. This should achieve the same result as the previous test case.
+'Sun-xsiType-block-2'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsiType-block-2.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-2.v1.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-2.n1.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-2.n2.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-2.n3.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-2.n4.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList5).
+
+%% Test block attribute (3) - use block="extension" for the child2 element. child2 has no block constraint. - see if @block for element is working as expected.
+'Sun-xsiType-block-3'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsiType-block-3.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-3.v1.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-3.n1.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-3.n2.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-3.n3.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-3.n4.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList5).
+
+%% Test block attribute (4) - use block="extension" for the child2 element. child2 has no block constraint. - use block="restriction" for the Dr type. - see if @block for element and @block for types interacts as expected.
+'Sun-xsiType-block-4'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/xsiType-block-4.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-4.v1.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-4.n1.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-4.n2.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-4.n3.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/xsiType-block-4.n4.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList5).
+
+%% No block attribute is specified. Just test that the substitution group and the type hierarchy is OK. The substitution group hierarchy mirrors the complex type hierarchy.
+'Sun-type-and-subst-1'(Config) when is_list(Config) ->
+  STResList0 = [],
+
+  ?line {STRes0,S0} = xmerl_xsd_lib:schema_test(Config,'./suntest/SunTestsAll/type-and-subst-1.xsd','./suntest/SunTestsAll',valid),
+  STResList1 = [STRes0|STResList0],
+  ITResList0 = [],
+  ?line ITRes0 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.v1.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList1 = [ITRes0|ITResList0],
+  ?line ITRes1 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.v2.xml','./suntest/SunTestsAll',valid,S0),
+  ITResList2 = [ITRes1|ITResList1],
+  ?line ITRes2 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n1.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList3 = [ITRes2|ITResList2],
+  ?line ITRes3 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n2.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList4 = [ITRes3|ITResList3],
+  ?line ITRes4 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n3.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList5 = [ITRes4|ITResList4],
+  ?line ITRes5 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n4.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList6 = [ITRes5|ITResList5],
+  ?line ITRes6 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n5.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList7 = [ITRes6|ITResList6],
+  ?line ITRes7 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n6.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList8 = [ITRes7|ITResList7],
+  ?line ITRes8 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n7.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList9 = [ITRes8|ITResList8],
+  ?line ITRes9 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n8.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList10 = [ITRes9|ITResList9],
+  ?line ITRes10 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n9.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList11 = [ITRes10|ITResList10],
+  ?line ITRes11 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n10.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList12 = [ITRes11|ITResList11],
+  ?line ITRes12 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n11.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList13 = [ITRes12|ITResList12],
+  ?line ITRes13 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n12.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList14 = [ITRes13|ITResList13],
+  ?line ITRes14 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n13.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList15 = [ITRes14|ITResList14],
+  ?line ITRes15 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n14.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList16 = [ITRes15|ITResList15],
+  ?line ITRes16 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n15.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList17 = [ITRes16|ITResList16],
+  ?line ITRes17 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n16.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList18 = [ITRes17|ITResList17],
+  ?line ITRes18 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n17.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList19 = [ITRes18|ITResList18],
+  ?line ITRes19 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n18.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList20 = [ITRes19|ITResList19],
+  ?line ITRes20 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n19.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList21 = [ITRes20|ITResList20],
+  ?line ITRes21 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n20.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList22 = [ITRes21|ITResList21],
+  ?line ITRes22 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n21.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList23 = [ITRes22|ITResList22],
+  ?line ITRes23 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n22.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList24 = [ITRes23|ITResList23],
+  ?line ITRes24 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n23.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList25 = [ITRes24|ITResList24],
+  ?line ITRes25 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n24.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList26 = [ITRes25|ITResList25],
+  ?line ITRes26 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n25.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList27 = [ITRes26|ITResList26],
+  ?line ITRes27 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n26.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList28 = [ITRes27|ITResList27],
+  ?line ITRes28 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n27.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList29 = [ITRes28|ITResList28],
+  ?line ITRes29 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n28.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList30 = [ITRes29|ITResList29],
+  ?line ITRes30 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n29.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList31 = [ITRes30|ITResList30],
+  ?line ITRes31 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n30.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList32 = [ITRes31|ITResList31],
+  ?line ITRes32 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n31.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList33 = [ITRes32|ITResList32],
+  ?line ITRes33 = xmerl_xsd_lib:instance_test(Config,'./suntest/SunTestsAll/type-and-subst-1.n32.xml','./suntest/SunTestsAll',invalid,S0),
+  ITResList34 = [ITRes33|ITResList33],
+
+
+  xmerl_xsd_lib:compare_test_results(Config,STResList1,ITResList34).
+
diff --git a/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE_data/sun_failed_cases.log b/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE_data/sun_failed_cases.log
new file mode 100644
index 0000000000..cf0403bdeb
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE_data/sun_failed_cases.log
@@ -0,0 +1,33 @@
+{'Sun-idc004.nogen',{["idc004.nogen.n02.xml", "idc004.nogen.n03.xml"],[]}}.
+{'Sun-idc006.nogen',{["idc006.nogen.n00.xml"],[]}}.
+{'Sun-xsd001',{["xsd001.n04.xml",
+                "xsd001.n05.xml",
+                "xsd001.n06.xml"],[]}}.
+{'Sun-xsd002',{["xsd002.v01.xml","xsd002.v00.xml"],[]}}.
+{'Sun-xsd003a',{["xsd003a.v00.xml"],[]}}.
+{'Sun-xsd003b',{["xsd003b.v01.xml"],[]}}.
+{'Sun-xsd004',{["xsd004.v00.xml",
+		"xsd004.n00.xml", 
+		"xsd004.n05.xml",
+		"xsd004.n06.xml", 
+		"xsd004.n07.xml",
+		"xsd004.n11.xml",
+		"xsd004.n12.xml"
+		],[]}}.
+{'Sun-xsd005',{["xsd005.n05.xml"],[]}}.
+{'Sun-xsd008',{[],[]}}.
+{'Sun-xsd012',{["xsd012.v00.xml"],[]}}.
+{'Sun-xsd021',{["xsd021.v00.xml",
+                "xsd021.n03.xml",
+                "xsd021.n02.xml",
+		"xsd021.n06.xml",
+		"xsd021.n07.xml",
+                "xsd021.n01.xml",
+                "xsd021.n00.xml"],[]}}.
+{'Sun-xsd022',{["xsd022.v00.xml"],[]}}.
+{'Sun-xsiType1',{["xsiType1.v1.xml"],[]}}.
+{'Sun-xsiType-block-1',{["xsiType-block-1.n1.xml", "xsiType-block-1.v1.xml"],[]}}.
+{'Sun-xsiType-block-2',{["xsiType-block-2.n1.xml", "xsiType-block-2.v1.xml"],[]}}.
+{'Sun-xsiType-block-3',{["xsiType-block-3.n1.xml", "xsiType-block-3.v1.xml"],[]}}.
+{'Sun-xsiType-block-4',{["xsiType-block-4.n2.xml", "xsiType-block-4.v1.xml"],[]}}.
+{'Sun-type-and-subst-1',{["type-and-subst-1.v2.xml"],[]}}.
diff --git a/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE_data/suntest.tar.gz b/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE_data/suntest.tar.gz
new file mode 100644
index 0000000000..bb0de7848b
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE_data/suntest.tar.gz
diff --git a/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE_data/w3c-copyright-19990405.html b/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE_data/w3c-copyright-19990405.html
new file mode 100644
index 0000000000..5c89ffd95e
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE_data/w3c-copyright-19990405.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+
+
+  <meta http-equiv="Content-Type" content="text/html"><title>DOCUMENT NOTICE</title>
+  
+  <link rel="stylesheet" type="text/css" href="copyright-documents-19990405_files/base.css"></head><body bgcolor="#ffffff" text="#000000">
+<h1>W3C<sup>�</sup> DOCUMENT NOTICE AND LICENSE</h1>
+
+<h3>Copyright � 1994-2002 <a href="http://www.w3.org/">World Wide Web
+Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of
+Technology</a>, <a href="http://www.inria.fr/">Institut National de Recherche
+en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio
+University</a>). All Rights Reserved.<br>
+http://www.w3.org/Consortium/Legal/</h3>
+
+<p>Public documents on the W3C site are provided by the copyright holders
+under the following license. The software or Document Type Definitions (DTDs)
+associated with W3C specifications are governed by the <a href="http://www.w3.org/Consortium/Legal/copyright-software.html"> Software
+Notice</a>. By using and/or copying this document, or the W3C document from
+which this statement is linked, you (the licensee) agree that you have read,
+understood, and will comply with the following terms and conditions:</p>
+
+<p>Permission to use, copy, and distribute the contents of this document, or
+the W3C document from which this statement is linked, in any medium for any
+purpose and without fee or royalty is hereby granted, provided that you
+include the following on <i>ALL</i> copies of the document, or portions
+thereof, that you use:</p>
+<ol>
+  <li>A link or URL to the original W3C document.</li>
+  <li>The pre-existing copyright notice of the original author, or if it
+    doesn't exist, a notice of the form: "Copyright � [$date-of-document] <a href="http://www.w3.org/">World Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of Technology</a>,
+    <a href="http://www.inria.fr/"> Institut National de Recherche en
+    Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio
+    University</a>). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but a
+    textual representation is permitted.)</li>
+  <li><em>If it exists</em>, the STATUS of the W3C document.</li>
+</ol>
+
+<p>When space permits, inclusion of the full text of this <b> NOTICE</b>
+should be provided. We request that authorship attribution be provided in any
+software, documents, or other items or products that you create pursuant to
+the implementation of the contents of this document, or any portion
+thereof.</p>
+
+<p>No right to create modifications or derivatives of W3C documents is
+granted pursuant to this license. However, if additional requirements
+(documented in the <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright FAQ</a>) are satisfied,
+the right to create modifications or derivatives is&nbsp;sometimes granted by the
+W3C to individuals complying with those requirements.</p>
+
+<p>THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
+REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE
+FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT
+INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
+
+<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
+PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.</p>
+
+<p>The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to this document or its contents without
+specific, written prior permission. Title to copyright in this document will
+at all times remain with copyright holders.</p>
+
+<p>----------------------------------------------------------------------------</p>
+
+<p>This formulation of W3C's notice and license became active on April 05
+1999 so as to account for the treatment of DTDs, schema's and bindings. See
+the <a href="http://www.w3.org/Consortium/Legal/copyright-documents-19990218.html"> older formulation</a> for
+the policy prior to this date. Please see our <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright FAQ</a> for common questions about using
+materials from our site, including specific terms and conditions for packages
+like libwww, Amaya, and Jigsaw. Other questions about this notice can be
+directed to <a href="mailto:[email protected]">[email protected]</a>.</p>
+<address>
+  <a href="http://w3.org/Help/Webmaster.html">webmaster</a><br>
+  (last updated by reagle on 1999/04/99.)
+</address>
+</body></html>
\ No newline at end of file
diff --git a/lib/xmerl/test/xmerl_xsd_lib.erl b/lib/xmerl/test/xmerl_xsd_lib.erl
new file mode 100644
index 0000000000..0b6b1ebc84
--- /dev/null
+++ b/lib/xmerl/test/xmerl_xsd_lib.erl
@@ -0,0 +1,321 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2006-2010. 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%
+%%
+%%
+%%% Purpose : Sub routines for test suite for the xmerl application,
+%%% xmerl_xsd module.
+%%%-------------------------------------------------------------------
+%%% @private
+%%% File    : xmerl_xsd_lib.erl
+%%% Author  : Bertil Karlsson <bertil@finrod>
+%%% Description : 
+%%%
+%%% Created : 28 Apr 2006 by Bertil Karlsson <bertil@finrod>
+%%%-------------------------------------------------------------------
+-module(xmerl_xsd_lib).
+
+-compile(export_all).
+
+-include("test_server.hrl").
+-include("xmerl.hrl").
+-include("xmerl_xsd.hrl").
+-include_lib("kernel/include/file.hrl").
+
+
+compare_test_results(Config, ST, IT) ->
+    ResST=compare_schema_test_results(ST),
+    ResIT=compare_instance_test_results(IT),
+    io:format("compare_test_results:~n  ST = ~p~n  IT = ~p~n  ResST = ~p~n  ResIT = ~p~n",[ST, IT, ResST, ResIT]),
+    case process_reference_results(Config, ResST, ResIT) of
+	error ->
+	    error;
+	Diff ->
+	    return_results(Diff, ResST, ResIT, length(ST)+length(IT))
+    end.
+
+compare_schema_test_results(ST) ->
+    {[N||{N, false}<-ST], [N||{N, enoent}<-ST]}.
+compare_instance_test_results(IT) ->
+    {[N||{N, false}<-IT], [N||{N, enoent}<-IT]}.
+
+return_results({SkippedN, Diff},{STErrs, _},{ITErrs, _}, TotN) ->
+    NumErrs = length(STErrs ++ ITErrs),
+    case NumErrs == TotN of
+	true when TotN > 0 ->
+	    ?line exit(all_tests_cases_failed);
+	_ ->
+	    return_results2(Diff, TotN - NumErrs, SkippedN, TotN)
+    end.
+
+%% return_results2(Diff,{[],[]},{[],[]},TotN) ->
+%%     {comment,io_lib:format("~p successful test cases.~n"++Diff,[TotN])};
+%% return_results2(Diff,{STErrs,[]},{ITErrs,[]},TotN) ->
+%%     {comment,io_lib:format("Total number of test cases: ~p~nThe following ~p test cases failed: ~p~n"++Diff,[TotN,length(STErrs++ITErrs),STErrs++ITErrs])};
+%% return_results2(Diff,{STErrs,STOther},{ITErrs,ITOther},TotN) ->
+%%     {comment,io_lib:format("Total number of test cases: ~p~nThe following ~p test cases failed: ~p~nThe following ~p test cases was malicious ~p~~n"++Diff,[TotN,length(STErrs++ITErrs),STErrs++ITErrs,length(STOther++ITOther),STOther++ITOther])}.
+
+return_results2(_, 0, 0, 0) ->
+    {comment,io_lib:format("This test case was empty.~n", [])};
+return_results2({[], [], [], []}, NumSucc, SkippedN, TotN) ->
+    {comment,io_lib:format("~p successful tests, ~p skipped tests of totally ~p test cases.~n",
+			   [NumSucc, SkippedN, TotN])};
+return_results2({NewFail, NewSuccess, NewMal, NewNotMal}, NumSucc, SkippedN, TotN) ->
+    NFComm =
+	case NewFail of
+	    [] -> "";
+	    _ -> io_lib:format("These ~p tests are new failures: ~p~n",
+			       [length(NewFail), NewFail])
+	end,
+    NSComm =
+	case NewSuccess of
+	    [] -> "";
+	    _ -> io_lib:format("These ~p skipped tests are new succeeding cases: ~p~n",
+			       [length(NewSuccess), NewSuccess])
+	end,
+    NMComm =
+	case NewMal of
+	    [] -> "";
+	    _ -> io_lib:format("These ~p tests are now malicious: ~p~n",
+			       [length(NewMal), NewMal])
+	end,
+    NNMComm =
+	case NewNotMal of
+	    [] -> "";
+	    _ -> io_lib:format("These ~p  skipped tests were malicious, but succeeds now: ~p~n", [length(NewNotMal), NewNotMal])
+	end,
+    ct:comment(io_lib:format("~p successful tests, ~p skipped tests of totally ~p test cases. ~n" ++
+			     NFComm ++ NSComm ++ NMComm ++ NNMComm, [NumSucc, SkippedN, TotN])),
+    [] = NewFail.
+
+%% return_results2(Diff,{STErrs,STOther},{ITErrs,ITOther},TotN) ->
+%%     {comment,io_lib:format("Total number of test cases: ~p~n The following ~p test cases failed: ~p~nThe following ~p test cases was malicious ~p~~n",[TotN,length(STErrs++ITErrs),STErrs++ITErrs,length(STOther++ITOther),STOther++ITOther])}.
+
+
+process_reference_results(Config, {ErrsST, MalST}, {ErrsIT, MalIT}) ->
+    {RefFailed, RefMalicious} = xsd_reference_log(Config),
+io:format("A: ~p : ~p\n\n",[RefFailed, RefMalicious]),
+    AllErrs = ErrsST ++ ErrsIT,
+    AllMals = MalST ++ MalIT,
+    %% test cases failed now but succeeded in reference results.
+    NewFailures = [X||X<-AllErrs, lists:member(X, RefFailed) == false],
+    %% test cases succeeded now but failed in reference results.
+    NewSucceeds = [X||X<-RefFailed, lists:member(X, AllErrs) == false],
+    %% test cases malicious now but succeeded in reference results.
+    NewMalicious = [X||X<-AllMals, lists:member(X, RefMalicious) == false],
+    %% test cases succeeded now but malicious in reference results.
+    NewNotMal = [X||X<-RefMalicious, lists:member(X, AllMals) == false],
+    write_in_log(Config, AllErrs, AllMals),
+%    io:format("process_reference_results:~n  AllErrs = ~p~n  NewFailures = ~p~n",[AllErrs,NewFailures]),
+    {length(RefFailed) + length(RefMalicious), {NewFailures, NewSucceeds, NewMalicious, NewNotMal}}.
+
+xsd_reference_log(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = ?config(suite, Config),
+    SuiteReferenceLog = 
+	filename:join([DataDir, lists:concat([Suite, "_failed_cases.log"])]),
+io:format("B: ~p\n\n",[SuiteReferenceLog]),
+    case file:consult(SuiteReferenceLog) of
+	{ok,List} when is_list(List) ->
+io:format("C: ~p\n\n",[List]),
+	    case lists:keysearch(?config(testcase, Config), 1, List) of
+		{value,{_, TCRefFails}} ->
+io:format("D: ~p\n\n",[TCRefFails]),
+		    TCRefFails;
+		_ ->
+io:format("D: ~no result\n\n",[]),
+		    {[], []}
+	    end;
+	_ -> 
+	    {[], []}
+    end.
+
+write_in_log(_Config, [], []) ->
+    ok;
+write_in_log(Config, AllErrs, AllMals) ->
+    ?line LogFileName = ?config(xmerl_error_log, Config),
+    {ok,IO}=file:open(LogFileName, [append]),
+    ?line TestCase = ?config(testcase, Config),
+    io:format(IO,"{~p,{~p,~p}}.~n", [TestCase, AllErrs, AllMals]),
+    file:close(IO),
+    ok.
+
+schema_test(Config,FileName,XsdBase,Validity) ->
+    ModuleName = filename:basename(FileName),
+    DataDir = ?config(data_dir, Config),
+    case xmerl_xsd:process_schema(filename:join([DataDir, FileName]), [{xsdbase,filename:join([DataDir, XsdBase])}]) of
+	{error, enoent} ->
+	    {{ModuleName, enoent},#xsd_state{}};
+	{Ok, S} ->
+	    case Validity of
+		valid when Ok == ok ->
+%%		    io:format("schema_test1: Validity=valid,Ok=ok,S=~p~n",[S]),
+		    {{ModuleName, S#xsd_state.errors == []}, S};
+		invalid when Ok == error -> %% S is in this case an error reason
+		    {{ModuleName, no_internal_error(S)}, #xsd_state{}};
+		notKnown ->
+		    {{ModuleName, true}, #xsd_state{}};
+		valid ->
+		    io:format("schema_test2: Validity=valid,Ok=~p,S=~p~n", [Ok, S]),
+%%		    io:format("FileName: ~p~n",[FileName]),
+		    {{ModuleName, false}, #xsd_state{}};
+		_ -> %% invalid Ok == ok
+		    io:format("schema_test3: Validity=~p,Ok=~p,S=~p~n", [Validity, Ok, S]),
+		    {{ModuleName, false}, S}
+	    end
+    end.
+schema_test(Config, FileName, XsdBase, Validity, AccState) ->
+    ModuleName = filename:basename(FileName),
+    DataDir = ?config(data_dir, Config),
+    case xmerl_xsd:process_schema(filename:join([DataDir, FileName]),
+			       [{xsdbase, filename:join([DataDir, XsdBase])}, AccState]) of
+	{error, enoent} ->
+	    {{ModuleName, enoent}, AccState};
+	{Ok, S} ->
+	    case Validity of
+		valid when Ok == ok ->
+		    {{ModuleName, S#xsd_state.errors == []}, S};
+		invalid when Ok == error ->
+		    {{ModuleName, no_internal_error(S)}, AccState};
+		notKnown ->
+		    {{ModuleName, true}, AccState};
+		valid ->
+		    {{ModuleName, false}, AccState};
+		_ -> 
+		    {{ModuleName, false}, S}
+	    end
+    end.
+instance_test(Config, FileName, XMLBase, Validity, State) ->
+    ModuleName = filename:basename(FileName),
+    DataDir = ?config(data_dir, Config),
+    case xmerl_scan:file(filename:join([DataDir, FileName]),
+			 [{xmlbase, filename:join([DataDir, XMLBase])}]) of
+	{error, enoent} ->
+	    {ModuleName, enoent};
+	{E, _} ->
+	    {VE, S2} = xmerl_xsd:validate(E, State),
+	    case Validity of
+		valid when is_record(VE, xmlElement) ->
+		    case S2#xsd_state.errors of
+			[] -> ok;
+			_ -> io:format("test case ~p failed.~nValidity: ~p~nValidation result:~p~n", [FileName, Validity, VE])
+		    end,
+		    {ModuleName, S2#xsd_state.errors == []};
+		invalid when VE == error ->
+		    {ModuleName, no_internal_error(S2)};
+		notKnown ->
+		    {ModuleName, true};
+		_ ->
+		    io:format("test case ~p failed.~nValidity: ~p~nValidation result:~p~n", [FileName, Validity, VE]),
+		    {ModuleName,false}
+	    end
+    end.
+
+no_internal_error(R) ->
+    case lists:keymember(internal_error,1,R) of
+	true ->
+	    false;
+	_ ->
+	    true
+    end.
+
+unpack(Config, Suite) ->
+    TarFile = suite_tar(Suite),
+    ?line file:set_cwd(?config(data_dir, Config)),
+    ?line ok=erl_tar:extract(TarFile, [compressed]),
+    change_mode(filename:rootname(TarFile, ".tar.gz")).
+    
+suite_tar(sun) ->
+    "suntest.tar.gz";
+suite_tar(msx) ->
+    "msxsdtest.tar.gz";
+suite_tar(nist) ->
+    "nisttest.tar.gz".
+
+change_mode(Files) ->
+    change_mode3(Files).
+change_mode2(Dir)->
+    ?line {ok, CWD} = file:get_cwd(),
+    ?line {ok, FileList} = file:list_dir(Dir),
+    ?line file:set_cwd(filename:join([CWD, Dir])),
+    change_mode3(FileList),
+    ?line file:set_cwd(CWD).
+change_mode3([]) ->
+    ok;
+change_mode3([F |Fs]) ->
+    case filelib:is_dir(F) of
+	true ->
+	    chmod(F),
+	    change_mode2(F);
+	_ ->
+	    chmod(F)
+    end,
+    change_mode3(Fs).
+    
+chmod(F) ->
+    case file:read_file_info(F) of
+	{ok, FileInfo} ->
+	    Mode= FileInfo#file_info.mode,
+	    file:write_file_info(F, FileInfo#file_info{mode=8#00777 bor Mode});
+	_ ->
+	    ok
+    end.
+
+rmdir(Config, Suite) ->
+    ?line file:set_cwd(?config(data_dir, Config)),
+    SuiteDir = filename:rootname(suite_tar(Suite), ".tar.gz"),
+    ?line ok=rm_f_(SuiteDir).
+
+%% Dir is a directory
+rm_f_(Dir) ->
+    ?line {ok, CWD} = file:get_cwd(),
+    ?line {ok, FileList} = file:list_dir(Dir),
+    ?line file:set_cwd(filename:join([CWD, Dir])),
+    rm_files(FileList),
+    ?line file:set_cwd(CWD),
+    ? line ok = file:del_dir(Dir).
+
+rm_files([])->
+    ok;
+rm_files([F |Fs]) ->
+    case filelib:is_dir(F) of
+	true ->
+	    rm_f_(F);
+	_ ->
+	    io:format("rm_files: ~p~n", [F]),
+	    ?line ok = file:delete(F)
+    end,
+    rm_files(Fs).
+
+create_error_log_file(Config, Suite) ->
+    ?line {{Y, M, D}, {H, Min, S}} = calendar:local_time(),
+    DTString=lists:concat([Y, "-", M,"-", D, "_", H, ".", Min, ".", S]),
+    FileName = lists:concat([Suite, "_", DTString, ".errorlog"]),
+%%    ?line {ok,_IO} = file:open(filename:join([?config(priv_dir,Config),
+%% 					      FileName]),[append]).
+
+%%    ?line {ok,_IO} = file:open(FileName,[append]).
+    io:format("error log file: ~p~n", [filename:join([?config(priv_dir,Config), FileName])]),
+    {ok, filename:join([?config(priv_dir,Config), FileName])}.
+
+close_error_log_file(Config) ->
+    case lists:keysearch(xmerl_error_log, 1, Config) of
+ 	{value,{_, IO}} ->
+ 	    file:close(IO);
+ 	_ ->
+ 	    ok
+    end.
diff --git a/lib/xmerl/test/xmlconf.xml b/lib/xmerl/test/xmlconf.xml
new file mode 100644
index 0000000000..c015218e2e
--- /dev/null
+++ b/lib/xmerl/test/xmlconf.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>

+<!--

+    @(#)conformance.xml	1.1 98/12/20

+    Original version copyright 1998 by Sun Microsystems, Inc.

+    All Rights Reserved.

+    Modifications copyright 1999 by OASIS.

+    Modifications copyright 2001 by OASIS.

+-->

+

+<?xml-stylesheet href="xmlconformance.xsl" type="text/xsl"?>

+

+<!DOCTYPE TESTSUITE SYSTEM "testcases.dtd" [

+

+    <!-- Sun-written testcases -->

+    <!ENTITY sun-valid		SYSTEM "sun/sun-valid.xml">

+    <!ENTITY sun-invalid	SYSTEM "sun/sun-invalid.xml">

+    <!ENTITY sun-not-wf		SYSTEM "sun/sun-not-wf.xml">

+    <!ENTITY sun-error		SYSTEM "sun/sun-error.xml">

+

+    <!-- James Clark "XMLTEST" -->

+    <!ENTITY jclark-xmltest	SYSTEM "xmltest/xmltest.xml">

+

+    <!-- Fuji Xerox "Japanese Documents" -->

+    <!ENTITY xerox-japanese	SYSTEM "japanese/japanese.xml">

+

+    <!-- NIST/OASIS test suite -->

+    <!ENTITY nist-oasis		SYSTEM "oasis/oasis.xml">

+	

+    <!-- IBM tests -->

+    <!ENTITY ibm-invalid	SYSTEM "ibm/ibm_oasis_invalid.xml">

+    <!ENTITY ibm-not-wf		SYSTEM "ibm/ibm_oasis_not-wf.xml">

+    <!ENTITY ibm-valid		SYSTEM "ibm/ibm_oasis_valid.xml">

+]>

+

+<TESTSUITE PROFILE="XML 1.0 (2nd edition) W3C Conformance Test Suite, 6 October 2000">

+

+    &jclark-xmltest;

+    &xerox-japanese;

+

+<TESTCASES PROFILE="Sun Microsystems XML Tests" xml:base="sun/">

+    &sun-valid;

+    &sun-invalid;

+    &sun-not-wf;

+    &sun-error;

+</TESTCASES>

+

+    &nist-oasis;

+<TESTCASES PROFILE="IBM XML Tests" xml:base="ibm/">

+    &ibm-invalid;

+    &ibm-not-wf;

+    &ibm-valid;

+</TESTCASES>

+</TESTSUITE>

diff --git a/lib/xmerl/test/xmlconformance.msxsl b/lib/xmerl/test/xmlconformance.msxsl
new file mode 100644
index 0000000000..f33e647d25
--- /dev/null
+++ b/lib/xmerl/test/xmlconformance.msxsl
@@ -0,0 +1,527 @@
+<?xml version='1.0'?>

+<!--

+<<<<<<< conformance.msxsl

+    Original version copyright 1999 by Sun Microsystems, Inc.

+    All Rights Reserved.

+    Modifications copyright 1999 by OASIS.

+=======

+    XSL IE5 Stylesheet for documenting XML conformance tests.

+    Tested against IE5 5.00.2014.0216

+

+    1999-06-05 20:10

+

+    XSL 12/16/1998 Stylesheet for documenting XML conformance tests.

+

+    This expects to be run on a document matching the DTD that Sun

+    defined and OASIS modified for merging collections of 

+    self-descriptive XML tests.

+

+    Since all those collections will have (by design) the same test

+    architecture, this includes boilerplate describing that design,

+    to be used by all test documentation.

+

+    ISSUES:

+	- Sorting is a bit odd; section numbers can are like "3.3.3"

+	  rather than straight numbers, so numeric sort can't work,

+	  and yet neither does text sort (2.12 should be after 2.2).

+	

+-->

+

+<xsl:stylesheet

+    xmlns:xsl="http://www.w3.org/TR/WD-xsl"

+	xmlns="http://www.w3.org/TR/WD-xhtml"

+	indent-result="yes"

+	>

+

+<!-- default behaviour - - - - - - - - - - - - - - - - - - - - - - - - - - -->

+

+<xsl:template><xsl:apply-templates/></xsl:template>

+<xsl:template match="textnode()"><xsl:value-of/></xsl:template>

+

+<!-- selective behaviour - - - - - - - - - - - - - - - - - - - - - - - - -->

+

+

+    <!-- ROOT:  write an HTML wrapper -->

+    <xsl:template match="/">

+      <xsl:apply-templates select="TESTSUITE"/>

+    </xsl:template>

+    

+    <xsl:template match="TESTSUITE">

+	<!-- XHTML namespace -->

+	<html><head>

+	    <xsl:comment>Generated by an XSL stylesheet.</xsl:comment>

+	    <title> XML Conformance Tests </title>

+	    <meta http-equiv="Content-Type"

+		content="text/html;charset=utf-8"/>

+	    <style>

+		<xsl:comment>

+		    BODY {

+			font-family:	Lucida, Helvetica, Univers, sans-serif;

+		    }

+		    H1, H2, H3, H4 {

+			text-align:	left;

+			color:		#0066CC;

+		    }

+		</xsl:comment>

+	    </style>

+	    <style>

+		<xsl:comment>

+		    a:hover { 

+			color:		white;

+			background-color: blue;

+		    }

+		</xsl:comment>

+	    </style>

+	</head><body bgcolor='#ffffff'>

+	    <center>

+	    <table border="4" width="90%">

+	    <tr >

+	    <td>

+	    <table>

+	    <tr >

+	    <td width="40%"><img src="files/a_oasis-logo.gif" width="350" height="125"/></td>

+	    <td width="30%"/>

+	    <td width="40%" align="right"><img src="files/top3.jpe" width="400" height="125"/></td>

+            </tr>

+	    </table>

+	    <center>

+	    <table>

+	    <tr>

+	    <td ><b><font size="+2">A Joint Development Effort</font></b></td>

+	    </tr>

+	    </table>

+            </center>

+	    </td>

+	    </tr>

+	    </table>

+	    </center>

+	    <p/>

+

+	    <p/>

+	    <h4>OASIS XML Conformance Subcommittee<br/>XML 1.0 Test Suite, Second Edition<br/>Working Draft<br/>15 March 2001</h4>

+            <dl>

+	    <dt><b>This version:</b></dt>

+	    <dd><ul>

+	       <li><a href="http://www.oasis-open.org/committees/xml-conformance/suite-v1se/xmlconf-20010315.htm">

+		   http://www.oasis-open.org/committees/xml-conformance/suite-v1se/xmlconf-20010315.htm</a>

+		   (<a href="http://www.oasis-open.org/committees/xml-conformance/suite-v1se/xmlconf-20010315.xml">XML</a>)

+	       </li>

+	    </ul>

+	    </dd>

+	    <p/>

+	    <dt><b>Current Version:</b></dt>

+	    <dd>

+	    <ul>

+	       <li><a href="http://www.oasis-open.org/committees/xml-conformance/suite-v1se/xmlconf.xml">

+		   http://www.oasis-open.org/committees/xml-conformance/suite-v1se/xmlconf.xml</a></li>

+            </ul>

+            </dd>

+	    <p/>

+	    <dt><b>Previous Version:</b></dt>

+	    <dd>

+	    <ul>

+	       <li><a href="http://www.oasis-open.org/committees/xml-conformance/suite-v1/xmlconf-19990712.xml">

+		   http://www.oasis-open.org/committees/xml-conformance/suite-v1/xmlconf-19990712.xml</a></li>

+            </ul>

+            </dd>

+	    <p/>

+	    <dt><b>Test Archive:</b></dt>

+	    <dd><ul>

+	    <li><a href="http://www.oasis-open.org/committees/xml-conformance/suite-v1se/xmlconf-20010315.tar.gz">http://www.oasis-open.org/committees/xml-conformance/suite-v1se/xmlconf-20010315.tar.gz</a>

+	    </li>

+	    </ul></dd>

+	    <p/>

+	    <dt><b>OASIS XML Conformance Technical Committee:</b></dt> 	

+	    <dd><ul><li><a href="http://www.oasis-open.org/committees/xml-conformance/">http://www.oasis-open.org/committees/xml-conformance/</a>

+	    </li></ul></dd>

+	    <p/>

+	    <dt><b>Comments:</b></dt> 	

+	    <dd><ul><li>Mary Brady, NIST <a href="mailto:[email protected]">&lt;[email protected]&gt;</a>

+	    </li></ul></dd>

+	    <p/>

+	    </dl>

+	    <hr/>

+

+	    <a name="contents"/>

+            <h2>Table of Contents</h2>

+	    <ol >

+		<li><a href="#intro">Introduction</a></li>

+		<li><a href="#matrix">Test Matrix</a></li> 

+		<ol >

+		    <li ><a href="#binary">Binary Tests</a></li>

+		    <li><a href="#output">Output Tests</a></li>

+		</ol>

+		<li><a href="#listings">Test Case Descriptions</a></li>

+		<ol >

+		    <li><a href="#valid">Valid Documents</a></li>

+		    <li><a href="#invalid">Invalid Documents</a></li>

+		    <li><a href="#not-wf">Not-WF Documents</a></li>

+		    <li><a href="#error">Optional Errors</a></li>

+		</ol>

+                <li><a href="#contrib">Contributors</a></li>

+	    </ol>

+	    <a name="intro"/>

+	    <h2>1. Introduction </h2>

+	    <p> The <i>OASIS</i> XML Conformance Subcommittee is concerned with 

+	    improving the quality of XML processors.  The tests described in this

+            document provide a set of metrics to determine how well a 

+            particular implementation conforms to the 

+            <a href="http://www.w3.org/TR/REC-xml">W3C XML 1.0 (Second Edition) Recommendation </a>.

+	    The XML Conformance Test Suite is intended

+	    to complement the W3C XML 1.0 (Second Edition) Recommendation.  All interpretations of

+	    this Recommendation are subject to confirmation by the 

+	    <a href="http://www.w3.org/XML/Activity.html">W3C XML Coordination Group</a>.

+	    </p>

+	    <p>

+	    Conformance tests can be used by developers, content creators, and 

+            users alike to increase their level of confidence in product quality. In

+	    circumstances where interoperability is necessary, these tests can also

+	    be used to determine that differing implementations support the same set

+            of features. </p>

+           

+            <p>This report provides supporting documentation for all of the tests

+            contributed by members of the <i>OASIS</i> XML Conformance Subcommittee. 

+	    Sources from which these tests have been collected

+	    include: <em>

+		<xsl:for-each select="./TESTCASES">

+		    <xsl:value-of select="@PROFILE"/>;

+		</xsl:for-each>

+	    </em>.  Although the tests came from a variety of sources, the actual test

+	    descriptions and references back to the recommendation were in many instances

+	    added by members of this subcommittee.  It is anticipated that this report 

+            will supplement the actual tests, which are available from 

+            <a href="http://www.oasis-open.org/committees/xml-conformance/xml-test-suite.html">

+            http://www.oasis-open.org/committees/xml-conformance/xml-test-suite.html</a>.</p>  

+

+	    <p>Comments/suggestions should be 

+            forwarded to the XML Conformance Subcommittee Chair, Mary Brady <a href="mailto:[email protected]">&lt;[email protected]&gt;</a>.</p> 

+

+

+	    <a name="matrix"/>

+	    <h2>2. Test Matrix </h2>

+

+	    <p> Two basic types of test are presented here.  These are

+	    respectively <em><a href="#binary">Binary Tests</a></em>

+	    and <em><a href="#output">Output Tests</a></em>. </p>

+

+	    <a name="binary"/>

+	    <h3>2.1  Binary Tests </h3>

+

+	    <p> <em>Binary</em> conformance tests are documents which

+	    are grouped into one of four categories.  Given a document

+	    in a given category, each kind of XML parser must treat it

+	    consistently and either accept it (a <em>positive test</em>)

+	    or reject it (a <em>negative test</em>).  It is in that sense

+	    that the tests are termed "binary". The XML 1.0 (Second Edition) Recommendation

+	    talks in terms of two types of XML processor:

+	    <em>validating</em> ones, and <em>nonvalidating</em> ones.

+	    There are two differences between these types of processors: </p>

+

+	    <ol>

+		<li> Validating processors check special productions that

+		nonvalidating parsers don't, called <em>validity

+		constraints</em>.  (Both must check a basic set of productions,

+		requiring XML documents to be <em>well formed</em>.) </li>

+

+		<li> Nonvalidating processors are permitted to not

+		include <em>external entities</em>, such as files with

+		text.  Accordingly, they may not report errors which

+		would have been detected had those entities been read.</li>

+	    </ol>

+

+	    <p> There are two types of such entity, <em>parameter

+	    entities</em> holding definitions which affect validation

+	    and other processing; and <em>general entities</em> which

+	    hold marked up text.  It will be appreciated that there are

+	    then five kinds of XML processor:  validating processors,

+	    and four kinds of nonvalidating processor based on the

+	    combinations of external entity which they include.</p>

+

+	    <center>

+	    <table border="1" bgcolor="#ffffff" cellpadding="4">

+

+	    <caption>

+	    <b>Basic XML Parsing Test Matrix</b><br/>

+	    Test Document Type v. Parser Type

+	    </caption>

+

+	    <tr bgcolor="#ffffcc">

+		<th widthH="5%" rowspan="2">&#160;</th>

+		<th widthH="20%" colspan="2">Nonvalidating</th>

+		<th widthH="5%" rowspan="2">Validating</th>

+	    </tr>

+

+	    <tr bgcolor="#ffffcc">

+		<th>External Entities<br/>Ignored (3 cases)</th>

+		<th>External Entities<br/>Read</th>

+	    </tr>

+

+	    <tr>

+		<th bgcolor="#ffffcc">Valid Documents</th>

+		<td align="center"><b>accept</b></td>

+		<td align="center"><b>accept</b></td>

+		<td align="center"><b>accept</b></td>

+	    </tr>

+

+	    <tr>

+		<th bgcolor="#ffffcc">Invalid Documents</th>

+		<td align="center"><b>accept</b></td>

+		<td align="center"><b>accept</b></td>

+		<td align="center">reject</td>

+	    </tr>

+

+	    <tr>

+		<th bgcolor="#ffffcc">Non-WF Documents</th>

+		<td align="center">reject</td>

+		<td align="center">reject</td>

+		<td align="center">reject</td>

+	    </tr>

+

+	    <tr>

+		<th bgcolor="#ffffcc">WF Errors tied<br/>

+			to External Entity</th>

+		<td align="center"><b>accept</b><br/>(varies)</td>

+		<td align="center">reject</td>

+		<td align="center">reject</td>

+	    </tr>

+

+	    <tr>

+		<th bgcolor="#ffffcc">Documents with<br/> Optional Errors</th>

+		<td align="center">(not specified)</td>

+		<td align="center">(not specified)</td>

+		<td align="center">(not specified)</td>

+	    </tr>

+

+	    </table>

+	    </center>

+

+	    <p> At this time, the XML community primarily uses parsers

+	    which are in the rightmost two columns of this table, calling

+	    them <em>Well Formed XML Parsers</em> (or "WF Parsers") and

+	    <em>Validating XML Parsers</em>.   A second test matrix

+	    could be defined to address the variations in the types of

+	    of XML processor which do not read all external entities.

+	    That additional matrix is not provided here at this time. </p>

+

+

+	    <a name="output"/>

+	    <h3>2.2  Output Tests</h3>

+

+	    <p> The XML 1.0 (Second Edition) Recommendation places a number of requirements

+	    on XML processors, to ensure that they report information to

+	    applications as needed.  Such requirements are testable.

+	    Validating processors are required to report slightly more

+	    information than nonvalidating ones, so some tests will

+	    require separate output files.  Some of the information that

+	    must be reported will not be reportable without reading all

+	    the external entities in a particular test.  Many of the tests for

+	    valid documents are paired with an output file to ensure that 

+	    the XML processor provides the correct information.  </p>

+

+	    <p>The output of these tests is provided in two forms, as

+	    described in <a href="sun/cxml.html">SUN Microsystems XML

+	    Canonical Forms</a>.  At present, the <em>James Clark</em>

+	    collection provides corresponding output in <em>First XML

+	    Canonical Form</em>, and the <em>SUN Microsystems</em>

+ 	    collection provides corresponding output in <em>Second XML

+	    Canonical Form</em>.  When the <a href="http://www.w3.org/XML/">

+	    W3C XML Group </a>finalizes its work on Canonical XML, these 

+	    output files will be updated.

+            </p>

+

+	    <a name="listings"/>

+	    <h2>3.  Test Case Descriptions</h2>

+

+	    <p> This section of this report contains descriptions of test

+	    cases, each of which fits into the categories noted above.

+	    Each test case includes a document of one of the types in the

+	    binary test matrix above (e.g. valid or invalid documents).

+	    </p>

+

+	    <p> In some cases, an <a href="#output">output file </a>, as 

+	    described in Section 2.2, will also be associated with

+	    a valid document, which is used for output testing.  If such

+	    a file exists, it will be noted at the end of the description

+	    of the input document.  </p>

+

+	    <p> The description for each test case is presented as a two

+	    part table.  The right part describes what the test does.

+	    This description is intended to have enough detail to evaluate

+	    diagnostic messages.  The left part includes: <ul>

+

+		<li> An entry describing the <em>Sections and/or Rules</em>

+		from the <a href="http://www.w3.org/TR/2000/REC-xml-20001006">

+		XML 1.0 (Second Edition) Recommendation</a> which this case excercises.</li>

+		

+		<li> The unique <em>Test ID</em> within a given <em>Collection</em>

+	        for this test. </li>

+

+		<li> The <em>Collection</em> from which this test originated.

+		Given the <em>Test ID</em> and the <em>Collection</em>, each

+		test can be uniquely identified. </li>

+		

+		<li> Some tests may have a field identifying the kinds of

+		external <em>Entities</em> a nonvalidating processor must

+		include (parameter, general, or both) to be able to

+		detect any errors in that test case. </li>

+

+	    </ul></p>

+

+	    <p><em>Note that the output format of this report is subject

+	    to change.  Also, since XSL does not currently support the

+	    type of sorting rule necessary to make section numbers like

+	    2.12 appear after 2.2, the ordering is not quite what is

+	    desired.</em></p>

+

+	    <a name="valid"/>

+	    <h3>3.1  Valid XML Documents</h3>

+

+	    <p> All conforming <em> XML 1.0 Processors </em> are

+	    <b>required</b> to accept valid documents, reporting no

+	    errors.  In this section of this test report are found

+	    descriptions of test cases which fit into this category. </p>

+

+		<xsl:apply-templates select=".// TEST [ @TYPE = 'valid' ]" 

+		                     order-by="@SECTIONS"/>

+

+	    <a name="invalid"/>

+	    <h3>3.2  Invalid XML Documents</h3>

+

+	    <p> All conforming XML 1.0 <em> Validating Processors </em>

+	    are <b>required</b> to report recoverable errors in the case

+	    of documents which are <em>Invalid</em>.  Such errors are

+	    violations of some <em>validity constraint (VC)</em>. </p>

+

+	    <p> If a validating processor does not report an error when

+	    given one of these test cases, or if the error reported is

+	    a fatal error, it is not conformant.  If the error reported

+	    does not correspond to the problem listed in this test

+	    description, that could also be a conformance problem; it

+	    might instead be a faulty diagnostic. </p>

+

+	    <p> All conforming XML 1.0 <em> Nonvalidating Processors </em>

+	    should accept these documents, reporting no errors. </p>

+

+		<xsl:apply-templates select=".//TEST[@TYPE='invalid']"

+		                     order-by="@SECTIONS"/>

+

+	    <a name="not-wf"/>

+	    <h3>3.3  Documents that are Not Well Formed</h3>

+

+	    <p> All conforming XML 1.0 Processors are <b>required</b> to

+	    report fatal errors in the case of documents which are not

+	    <em>Well Formed</em>.  Such errors are basically of two types:

+	    <em>(a)</em> the document violates the XML grammar; or else

+	    <em>(b)</em> it violates a <em>well formedness constraint

+	    (WFC)</em>.  There is a single <em>exception to that

+	    requirement</em>:  nonvalidating processors which do not read

+	    certain types of external entities are not required to detect

+	    (and hence report) these errors. </p>

+

+	    <p> If a processor does not report a fatal error when given

+	    one of these test cases, it is not conformant.  If the error

+	    reported does not correspond to the problem listed in this

+	    test description, that could also be a conformance problem;

+	    it might instead be a faulty diagnostic. </p>

+

+		<xsl:apply-templates select=".// TEST [ @TYPE = 'not-wf' ]" 

+		                     order-by="@SECTIONS"/>

+

+	    <a name="error"/>

+	    <h3>3.4  XML Documents with Optional Errors</h3>

+

+	    <p> Conforming XML 1.0 Processors are permitted to ignore

+	    certain errors, or to report them at user option.  In this

+	    section of this test report are found descriptions of 

+	    test cases which fit into this category. </p>

+

+	    <p> Processor behavior on such test cases does not affect

+	    conformance to the XML 1.0 (Second Edition) Recommendation, except as noted. </p>

+

+		<xsl:apply-templates select=".//TEST[@TYPE='error']" 

+		                     order-by="@SECTIONS"/>

+

+	    <a name="contrib"/>

+	    <h3>4.  Contributors (Non-normative)</h3>

+

+	    <p> A team of volunteer members have participated in the

+	    development of this work.  Contributions have come from:

+	    </p>

+	    <ul>

+	    <li>Murry Altheim, Sun Microsystems</li>

+	    <li>Mary Brady, NIST</li>

+	    <li>Tim Boland, NIST</li>

+	    <li>David Brownell, Sun Microsystems</li>

+	    <li>James Clark</li>

+	    <li>Karin Donker, IBM</li>

+	    <li>Irina Golfman, Inera Incorporated</li>

+	    <li>Tony Graham, Mulberry Technologies</li>

+	    <li>G. Ken Holman, Crane Softwrights Ltd</li>

+	    <li>Alex Milowski, Veo Systems, Inc</li>

+	    <li>Makota Murata, Fuji Xerox</li>

+	    <li>Miles O'Reilly, Microstar Software, Ltd</li>

+	    <li>Matt Timmermans, Microstar Software, Ltd</li>

+	    <li>Richard Rivello, NIST</li>

+	    <li>Lynne Rosenthal, NIST</li>

+	    <li>Brian Schellar, Chrystal Software</li>

+	    <li>Bill Smith, Sun Microsystems</li>

+	    <li>Trevor Veary, Software AG</li>

+	    <li>Eric Ye, IBM</li>

+	    </ul>

+    <p>End</p>

+

+    </body></html>

+    </xsl:template>

+

+    <xsl:template match="TEST">

+      <table width="100%">

+       <tr valign="top">

+	    <td width='40%'><table bgcolor='#eeeeff'

+		    border='1' width='100%' height="100%">

+		<tr>

+		    <td width='50%'><b>Sections [Rules]:</b></td>

+		    <td bgcolor='#ffffcc'>

+			    <xsl:value-of select="@SECTIONS"/></td>

+		</tr>

+		<tr valign="top">

+		    <td width='50%'><b>Test ID:</b></td>

+		    <td bgcolor='#ffffcc'>

+			    <xsl:value-of select="@ID"/></td>

+		</tr>

+		<xsl:if test=".[not ( @ENTITIES = 'none')

+			and ( @TYPE = 'not-wf' )]">

+		    <tr valign="top">

+			<td width='50%'><b>Entities:</b></td>

+			<td bgcolor='#ffffcc'><font color='blue'>

+				<xsl:value-of select="@ENTITIES"/>

+				</font></td>

+		    </tr>

+		</xsl:if>

+		<xsl:if test="../@PROFILE">

+          <tr valign="top">

+			<td width='50%'><b>Collection:</b></td>

+			<td bgcolor='#ffffcc'>

+				<xsl:value-of select="../@PROFILE"/>

+				</td>

+          </tr>

+        </xsl:if>

+	    </table></td>

+	    <td bgcolor='#ccffff'>

+		<p><xsl:apply-templates/></p>

+		<xsl:if test="@OUTPUT | @OUTPUT3">

+		    <p>There is an output test associated with this

+		    input file.</p>

+		</xsl:if>

+	    </td>

+	   </tr>

+	  </table>

+    </xsl:template>

+

+    <!-- XT takes 'B|EM' and xsl:copy, IE5b2 doesn't -->

+    <xsl:template match="EM">

+	<em><xsl:apply-templates/></em>

+    </xsl:template>

+    <xsl:template match="B">

+	<b><xsl:apply-templates/></b>

+    </xsl:template>

+</xsl:stylesheet>

diff --git a/lib/xmerl/test/xmlconformance.xsl b/lib/xmerl/test/xmlconformance.xsl
new file mode 100644
index 0000000000..fd1acb3d82
--- /dev/null
+++ b/lib/xmerl/test/xmlconformance.xsl
@@ -0,0 +1,498 @@
+<?xml version='1.0'?>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

+

+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+

+<!--

+<<<<<<< conformance.xsl

+    Original version copyright 1999 by Sun Microsystems, Inc.

+    All Rights Reserved.

+    Modifications copyright 1999 by OASIS.

+    Modifications copyright 2001 by OASIS.

+    Modifications copyright 2002 by W3C.

+=======

+    XSL Stylesheet for documenting XML conformance tests.

+    Tested against LOTUS Xalan processor.

+>>>>>>> 1.3

+

+    XSL 2001-03-15 Stylesheet for documenting XML conformance tests.

+

+    This expects to be run on a document matching the DTD that Sun

+    defined for merging collections of self-descriptive XML tests.

+

+    Since all those collections will have (by design) the same test

+    architecture, this includes boilerplate describing that design,

+    to be used by all test documentation.

+

+    ISSUES:

+	- Sorting is a bit odd; section numbers can are like "3.3.3"

+	  rather than straight numbers, so numeric sort can't work,

+	  and yet neither does text sort (2.12 should be after 2.2).

+-->

+

+

+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">

+  <xsl:output method="html" indent="yes"/>

+

+    <!-- ROOT:  write an HTML wrapper -->

+    <xsl:template match="/TESTSUITE">

+	<!-- XHTML namespace -->

+		

+	<html xmlns="http://www.w3.org/1999/xhtml"><head>

+	    <title> XML Conformance Tests </title>

+	    <meta http-equiv="Content-Type"

+		content="text/html;charset=utf-8"/>

+	    <style type="text/css">

+

+   		tr.premiere { background-color: #BEDCE6; }

+

+   		th { text-align: left; vertical-align: top }

+

+   		.editor { color: red; }

+

+   		.countdown { color: white; background-color: red; }

+

+  		 blockquote, q { font-family: Arial, Helvetica, sans-serif; }

+

+   		.quote     { font-family: Arial, Helvetica, sans-serif; }

+

+  		pre.quote { margin-left: 2.5em; }

+

+   		ol.quote     { font-family: Arial, Helvetica, sans-serif; margin-left: 3em; }

+

+   		.diff-add { background-color: yellow; }

+

+   		.diff-chg { background-color: lime; }

+

+   		.diff-del { text-decoration: line-through; }

+

+  	   </style>

+	    

+	</head><body bgcolor='#ffffff'>

+	    <p><a href="http://www.w3.org/"><img src="http://xw2k.sdct.itl.nist.gov/martinez/xmlts/2001/XML-Test-Suite/xmlconf/files/w3c_home.gif"

+

+		alt="W3C" height="48" width="72" border="0"/></a><a href="http://www.w3.org/Architecture/"

+

+		rel="in-domain"><img src="http://xw2k.sdct.itl.nist.gov/martinez/xmlts/2001/XML-Test-Suite/xmlconf/files/arquitecture.bmp" alt="Architecture Domain" border="0"/></a> <a

+

+		href="../" rel="in-area">   XML</a> | <a href="/Member/#confidential">Member-Confidential!</a></p> 

+

+  		<h1 align="center">XML 1.0 (Second Edition) errata 20020320,</h1> 

+		<h1 align="center">W3C Conformance Test Suite 20020606</h1>  <dl>

+

+

+	    <dt><b>This version:</b></dt>

+	    <dd><ul>

+	       <li><p><a href="xmlconf-20020606.htm">

+		   http://www.w3.org/XML/Test/xmlconf-20020606.htm</a>

+		   (<a href="xmlconf-20020606.xml">XML</a>)</p>

+	       </li>

+	    </ul>

+	    </dd>

+	    

+	    <dt><b>Current Version:</b></dt>

+	    <dd>

+	    <ul>

+	       <li><p><a href="xmlconf-20020606.xml">

+		  http://www.w3.org/XML/Test/xmlconf-20020606.xml</a></p></li>

+            </ul>

+            </dd>

+	    

+	    <dt><b>Previous Version:</b></dt>

+	    <dd>

+	    <ul>

+	       <li><p><a href="http://www.oasis-open.org/committees/xml-conformance/suite-v1se/xmlconf-20010315.htm">

+		   http://www.oasis-open.org/committees/xml-conformance/suite-v1se/xmlconf-20010315.htm</a>

+		   (<a href="http://www.oasis-open.org/committees/xml-conformance/suite-v1se/xmlconf-20010315.xml">XML</a>)</p></li>

+            </ul>

+            </dd>

+	  

+	    <dt><b>Test Archive:</b></dt>

+	    <dd><ul>

+	    <li><p><a href="xmlts20020606.zip">http://www.w3.org/XML/Test/xmlts20020606.zip</a>

+	    </p></li>

+	    <li><p><a href="xmlts20020606.tar">http://www.w3.org/XML/Test/xmlts20020606.tar</a>

+	    </p></li>

+	    </ul></dd>

+	  

+	    <dt><b>W3C XML Core Working Group:</b></dt> 	

+	    <dd><ul><li><p><a href="http://www.w3.org/XML/Group/Core">http://www.w3.org/XML/Group/Core</a>

+	    </p></li></ul></dd>

+	    

+	    <dt><b>Comments:</b></dt> 	

+	    <dd><ul><li>Sandra I. Martinez, NIST <a href="mailto:[email protected]"> [email protected]</a>

+	    </li></ul></dd>

+	    

+	    </dl>

+

+	    <a name="contents"/>

+            <h2>Table of Contents</h2>

+	    <ol >

+		<li><a href="#intro">Introduction</a></li>

+		<li><a href="#matrix">Test Matrix</a></li> 

+		<ol >

+		    <li ><a href="#binary">Binary Tests</a></li>

+		    <li><a href="#output">Output Tests</a></li>

+		</ol>

+		<li><a href="#listings">Test Case Descriptions</a></li>

+		<ol >

+		    <li><a href="#valid">Valid Documents</a></li>

+		    <li><a href="#invalid">Invalid Documents</a></li>

+		    <li><a href="#not-wf">Not-WF Documents</a></li>

+		    <li><a href="#error">Optional Errors</a></li>

+		</ol>

+                <li><a href="#contrib">Contributors</a></li>

+	    </ol>

+	    <a name="intro"/>

+	    <h2>1. Introduction </h2>

+	    <p>  

+	    The tests described in this document provide an initial set of metrics to determine how well a 

+            particular implementation conforms to the 

+            <a href="http://www.w3.org/TR/REC-xml">W3C XML 1.0 (Second Edition) Recommendation</a>.

+	    The XML Conformance Test Suite is intended

+	    to complement the W3C XML 1.0 (Second Edition) Recommendation.  All interpretations

+	    of this Recommendation are subject to confirmation by the 

+	    <a href="http://www.w3.org/XML/">

+	    W3C XML Group </a>.

+	    </p>

+	    <p>

+	    Conformance tests can be used by developers, content creators, and 

+            users alike to increase their level of confidence in product quality. In

+	    circumstances where interoperability is necessary, these tests can also

+	    be used to determine that differing implementations support the same set

+            of features. </p>

+           

+            <p>The XML Test Suite was transferred from OASIS to W3C and is  being augmented to reflect the

+            current work of the W3C XML Core Working Group, including 

+	    <a href="http://www.w3.org/XML/Group/2002/02/xml10-test-suite-issues">resolved issues</a> related to the 

+	    Recommendation and published Errata. This report provides supporting documentation for all the tests included in 

+	    the test suite. Sources from which these tests have been collected

+	    include: <em>

+		<xsl:for-each select="TESTCASES">

+		    <xsl:value-of select="@PROFILE"/>

+		    <xsl:text>; </xsl:text>

+		</xsl:for-each>

+	    </em>.  </p>  

+

+	    <a name="matrix"/>

+	    <h2>2.  Test Matrix </h2>

+

+	    <p> Two basic types of test are presented here.  These are

+	    respectively <em><a href="#binary">Binary Tests</a></em>

+	    and <em><a href="#output">Output Tests</a></em>. </p>

+

+	    <a name="binary"/>

+	    <h3>2.1  Binary Tests </h3>

+

+	    <p> <em>Binary</em> conformance tests are documents which

+	    are grouped into one of four categories.  Given a document

+	    in a given category, each kind of XML parser must treat it

+	    consistently and either accept it (a <em>positive test</em>)

+	    or reject it (a <em>negative test</em>).  It is in that sense

+	    that the tests are termed "binary". The XML 1.0 (Second Edition) Recommendation

+	    talks in terms of two types of XML processor:

+	    <em>validating</em> ones, and <em>nonvalidating</em> ones.

+	    There are two differences between these types of processors: </p>

+

+	    <ol>

+		<li> Validating processors check special productions that

+		nonvalidating parsers don't, called <em>validity

+		constraints</em>.  (Both must check a basic set of productions,

+		requiring XML documents to be <em>well formed</em>.) </li>

+

+		<li> Nonvalidating processors are permitted to not

+		include <em>external entities</em>, such as files with

+		text.  Accordingly, they may not report errors which

+		would have been detected had those entities been read.</li>

+	    </ol>

+

+	    <p> There are two types of such entity, <em>parameter

+	    entities</em> holding definitions which affect validation

+	    and other processing; and <em>general entities</em> which

+	    hold marked up text.  It will be appreciated that there are

+	    then five kinds of XML processor:  validating processors,

+	    and four kinds of nonvalidating processor based on the

+	    combinations of external entity which they include.</p>

+

+	    <center>

+	    <table border="1" bgcolor="#ffffff" cellpadding="4">

+

+	    <caption>

+	    <b>Basic XML Parsing Test Matrix</b><br/>

+	    Test Document Type v. Parser Type

+	    </caption>

+

+	    <tr bgcolor="#ffffcc">

+		<th widthH="5%" rowspan="2"><xsl:text> </xsl:text></th>

+		<th widthH="20%" colspan="2">Nonvalidating</th>

+		<th widthH="5%" rowspan="2">Validating</th>

+	    </tr>

+

+	    <tr bgcolor="#ffffcc">

+		<th>External Entities<br/>Ignored (3 cases)</th>

+		<th>External Entities<br/>Read</th>

+	    </tr>

+

+	    <tr>

+		<th bgcolor="#ffffcc">Valid Documents</th>

+		<td align="center"><b>accept</b></td>

+		<td align="center"><b>accept</b></td>

+		<td align="center"><b>accept</b></td>

+	    </tr>

+

+	    <tr>

+		<th bgcolor="#ffffcc">Invalid Documents</th>

+		<td align="center"><b>accept</b></td>

+		<td align="center"><b>accept</b></td>

+		<td align="center">reject</td>

+	    </tr>

+

+	    <tr>

+		<th bgcolor="#ffffcc">Non-WF Documents</th>

+		<td align="center">reject</td>

+		<td align="center">reject</td>

+		<td align="center">reject</td>

+	    </tr>

+

+	    <tr>

+		<th bgcolor="#ffffcc">WF Errors tied<br/>

+			to External Entity</th>

+		<td align="center"><b>accept</b><br/>(varies)</td>

+		<td align="center">reject</td>

+		<td align="center">reject</td>

+	    </tr>

+

+	    <tr>

+		<th bgcolor="#ffffcc">Documents with<br/> Optional Errors</th>

+		<td align="center">(not specified)</td>

+		<td align="center">(not specified)</td>

+		<td align="center">(not specified)</td>

+	    </tr>

+

+	    </table>

+	    </center>

+

+	    <p> At this time, the XML community primarily uses parsers

+	    which are in the rightmost two columns of this table, calling

+	    them <em>Well Formed XML Parsers</em> (or "WF Parsers") and

+	    <em>Validating XML Parsers</em>.   A second test matrix

+	    could be defined to address the variations in the types of

+	    of XML processor which do not read all external entities.

+	    That additional matrix is not provided here at this time. </p>

+

+

+	    <a name="output"/>

+	    <h3>2.2  Output Tests</h3>

+

+	    <p> The XML 1.0 (Second Edition) Recommendation places a number of requirements

+	    on XML processors, to ensure that they report information to

+	    applications as needed.  Such requirements are testable.

+	    Validating processors are required to report slightly more

+	    information than nonvalidating ones, so some tests will

+	    require separate output files.  Some of the information that

+	    must be reported will not be reportable without reading all

+	    the external entities in a particular test.  Many of the tests for

+	    valid documents are paired with an output file as the canonical

+	    representation of the input file,  to ensure that the XML

+	    processor provides the correct information. </p>

+

+	    <a name="listings"/>

+	    <h2>3.  Test Case Descriptions</h2>

+

+	    <p> This section of this report contains descriptions of test

+	    cases, each of which fits into the categories noted above.

+	    Each test case includes a document of one of the types in the

+	    binary test matrix above (e.g. valid or invalid documents).

+	    </p>

+

+	    <p> In some cases, an <a href="#output">output file </a>, as

+	    described in Section 2.2,  will also be associated with

+	    a valid document, which is used for output testing.  If such

+	    a file exists, it will be noted at the end of the description

+	    of the input document.  </p>

+

+	    <p> The description for each test case is presented as a two

+	    part table.  The right part describes what the test does.

+	    This description is intended to have enough detail to evaluate

+	    diagnostic messages.  The left part includes: <ul>

+

+		<li> An entry describing the <em>Sections and/or Rules</em>

+		from the <a href="http://www.w3.org/TR/2000/REC-xml-20001006">

+	        XML 1.0 (Second Edition) Recommendation</a> which this case excercises.</li>

+		

+		<li> The unique <em>Test ID</em> within a given <em>Collection</em> 

+		for this test.  </li>

+		

+		<li> The <em>Collection</em> from which this test originated.

+		Given the <em>Test ID</em> and the <em>Collection</em>, each

+		test can be uniquely identified.</li>

+

+		<li> Some tests may have a field identifying the kinds of

+		external <em>Entities</em> a nonvalidating processor must

+		include (parameter, general, or both) to be able to

+		detect any errors in that test case. </li>

+

+	    </ul></p>

+

+	    <a name="valid"/>

+	    <h3>3.1  Valid XML Documents</h3>

+

+	    <p> All conforming <em> XML 1.0 Processors </em> are

+	    <b>required</b> to accept valid documents, reporting no

+	    errors.  In this section of this test report are found

+	    descriptions of test cases which fit into this category. </p>

+

+		<xsl:apply-templates select="//TEST[@TYPE='valid']">

+		    <xsl:sort select="@SECTIONS"/>

+		</xsl:apply-templates>

+

+	    <a name="invalid"/>

+	    <h3>3.2  Invalid XML Documents</h3>

+

+	    <p> All conforming XML 1.0 <em> Validating Processors </em>

+	    are <b>required</b> to report recoverable errors in the case

+	    of documents which are <em>Invalid</em>.  Such errors are

+	    violations of some <em>validity constraint (VC)</em>. </p>

+

+	    <p> If a validating processor does not report an error when

+	    given one of these test cases, or if the error reported is

+	    a fatal error, it is not conformant.  If the error reported

+	    does not correspond to the problem listed in this test

+	    description, that could also be a conformance problem; it

+	    might instead be a faulty diagnostic. </p>

+

+	    <p> All conforming XML 1.0 <em> Nonvalidating Processors </em>

+	    should accept these documents, reporting no errors. </p>

+

+		<xsl:apply-templates select="//TEST[@TYPE='invalid']">

+		    <xsl:sort select="@SECTIONS"/>

+		</xsl:apply-templates>

+

+	    <a name="not-wf"/>

+	    <h3>3.3  Documents that are Not Well Formed</h3>

+

+	    <p> All conforming XML 1.0 Processors are <b>required</b> to

+	    report fatal errors in the case of documents which are not

+	    <em>Well Formed</em>.  Such errors are basically of two types:

+	    <em>(a)</em> the document violates the XML grammar; or else

+	    <em>(b)</em> it violates a <em>well formedness constraint

+	    (WFC)</em>.  There is a single <em>exception to that

+	    requirement</em>:  nonvalidating processors which do not read

+	    certain types of external entities are not required to detect

+	    (and hence report) these errors. </p>

+

+	    <p> If a processor does not report a fatal error when given

+	    one of these test cases, it is not conformant.  If the error

+	    reported does not correspond to the problem listed in this

+	    test description, that could also be a conformance problem;

+	    it might instead be a faulty diagnostic. </p>

+

+		<xsl:apply-templates select="//TEST[@TYPE='not-wf']">

+		    <xsl:sort select="@SECTIONS"/>

+		</xsl:apply-templates>

+

+	    <a name="error"/>

+	    <h3>3.4  XML Documents with Optional Errors</h3>

+

+	    <p> Conforming XML 1.0 Processors are permitted to ignore

+	    certain errors, or to report them at user option.  In this

+	    section of this test report are found descriptions of 

+	    test cases which fit into this category. </p>

+

+	    <p> Processor behavior on such test cases does not affect

+	    conformance to the XML 1.0 (Second Edition) Recommendation, except as noted. </p>

+

+		<xsl:apply-templates select="//TEST[@TYPE='error']">

+		    <xsl:sort select="@SECTIONS"/>

+		</xsl:apply-templates>

+

+	    <a name="contrib"/>

+	    <h3>4.  Contributors (Non-normative)</h3>

+

+	    <p> A team of volunteer members have participated in the

+	    development of this work.  Contributions have come from:

+	    </p>

+	    <ul>

+	    <li>Murry Altheim, Sun Microsystems</li>

+	    <li>Mary Brady, NIST</li>

+	    <li>Tim Boland, NIST</li>

+	    <li>David Brownell, Sun Microsystems</li>

+	    <li>James Clark</li>

+	    <li>Karin Donker, IBM</li>

+	    <li>Irina Golfman, Inera Incorporated</li>

+	    <li>Tony Graham, Mulberry Technologies</li>

+	    <li>G. Ken Holman, Crane Softwrights Ltd</li>

+	    <li>Alex Milowski, Veo Systems, Inc</li>

+	    <li>Makota Murata, Fuji Xerox</li>

+	    <li>Miles O'Reilly, Microstar Software, Ltd</li>

+	    <li>Matt Timmermans, Microstar Software, Ltd</li>

+	    <li>Richard Rivello, NIST</li>

+	    <li>Lynne Rosenthal, NIST</li>

+	    <li>Brian Schellar, Chrystal Software</li>

+	    <li>Bill Smith, Sun Microsystems</li>

+	    <li>Trevor Veary, Software AG</li>

+	    <li>Richard Tobin, University of Edinburgh</li>

+	    <li>Jonathan Marsh, Microsoft </li>

+	    <li>Daniel Veillard, Imaq</li>

+	    <li>Jonathan Marsh, Microsoft</li>

+	    <li>Paul Grosso, Arbortext</li>

+

+            </ul>

+

+    <p>End</p>

+	</body></html>

+    </xsl:template>

+

+    <xsl:template match="TEST">

+      <table width="100%">

+       <tr valign="top">

+	    <td width='40%'><table bgcolor='#eeeeff'

+		    border='1' width='100%' height="100%">

+		<tr>

+		    <td width='50%'><b>Sections [Rules]:</b></td>

+		    <td bgcolor='#ffffcc'>

+			    <xsl:value-of select="@SECTIONS"/></td>

+		</tr>

+		<tr valign="top">

+		    <td width='50%'><b>Test ID:</b></td>

+		    <td bgcolor='#ffffcc'>

+			    <xsl:value-of select="@ID"/></td>

+		</tr>

+		<xsl:if test="not ( @ENTITIES = 'none')

+			and ( @TYPE = 'not-wf' )">

+		    <tr valign="top">

+			<td width='50%'><b>Entities:</b></td>

+			<td bgcolor='#ffffcc'><font color='blue'>

+				<xsl:value-of select="@ENTITIES"/>

+				</font></td>

+		    </tr>

+		</xsl:if>

+		<xsl:if test="../@PROFILE">

+          <tr valign="top">

+			<td width='50%'><b>Collection:</b></td>

+			<td bgcolor='#ffffcc'>

+				<xsl:value-of select="../@PROFILE"/>

+				</td>

+          </tr>

+        </xsl:if>

+	    </table></td>

+	    <td bgcolor='#ccffff'>

+		<p>

+		 <xsl:apply-templates/></p>

+		<xsl:if test="@OUTPUT | @OUTPUT3">

+		    <p>There is an output test associated with this

+		    input file.</p>

+		</xsl:if>

+	    </td>

+	   </tr>

+	  </table>

+    </xsl:template>

+

+    <!-- XT takes 'B|EM' and xsl:copy, IE5b2 doesn't -->

+    <xsl:template match="EM">

+	<em><xsl:apply-templates/></em>

+    </xsl:template>

+    <xsl:template match="B">

+	<b><xsl:apply-templates/></b>

+    </xsl:template>

+</xsl:stylesheet>

diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 280ff10efa..965a0ae7b4 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.2.8
+XMERL_VSN = 1.2.9
diff --git a/make/otp.mk.in b/make/otp.mk.in
index bf287be416..a4e9dad46f 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -4,7 +4,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2010. All Rights Reserved.
+# Copyright Ericsson AB 1997-2011. 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
@@ -240,9 +240,10 @@ FOP = @FOP@
 DOCGEN=$(ERL_TOP)/lib/erl_docgen
 
 SPECS_ESRC = ../../src
+SPECS_EXTRACTOR=$(DOCGEN)/priv/bin/specs_gen.escript
 # Extract specifications and types from Erlang source files (-spec, -type)
 $(SPECDIR)/specs_%.xml: $(SPECS_ESRC)/%.erl
-	escript $(DOCGEN)/priv/bin/specs_gen.escript $(SPECS_FLAGS) -o$(dir $@) $<
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) -o$(dir $@) $<
 
 
 $(MAN1DIR)/%.1: %.xml
diff --git a/otp_build b/otp_build
index 1172592415..aebb91372c 100755
--- a/otp_build
+++ b/otp_build
@@ -186,15 +186,16 @@ set_config_flags ()
 	if target_contains free_source; then
 		CONFIG_FLAGS="$CONFIG_FLAGS --host=$TARGET"
 	fi
+	# Link SSL static for all binary distributions if not overridden
+	# Even for win32 starting with R14B03
+	XX=`echo $* | grep -v dynamic-ssl-lib`
+	if [ "$*" = "$XX" ]; then 
+	    CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS"
+	fi
 	if target_contains win32; then
-		CONFIG_FLAGS="--build=$BUILDSYS build_alias=win32 --host=win32 --target=win32 $CONFIG_FLAGS" 
-	else
-	        # Link SSL static for all binary distributions if not overridden
-	        XX=`echo $* | grep -v dynamic-ssl-lib`
-		if [ "$*" = "$XX" ]; then 
-		    CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS"
-		fi
+	    CONFIG_FLAGS="--build=$BUILDSYS build_alias=win32 --host=win32 --target=win32 $CONFIG_FLAGS" 
 	fi
+
 	if [ "x$OVERRIDE_CONFIG_CACHE" = "x" ]; then
 	    CONFIG_FLAGS="$CONFIG_FLAGS --cache-file=/dev/null"
 	else
diff --git a/system/doc/design_principles/sup_princ.xml b/system/doc/design_principles/sup_princ.xml
index 067fd31961..2748f21bbe 100644
--- a/system/doc/design_principles/sup_princ.xml
+++ b/system/doc/design_principles/sup_princ.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -335,6 +335,12 @@ supervisor:start_child(Pid, [id1])</code>
       <c>apply(call, start_link, []++[id1])</c>, or actually:</p>
     <code type="none">
 call:start_link(id1)</code>
+    <p>A child under a <c>simple_one_for_one</c> supervisor can be terminated
+    with</p>
+    <code type="none">
+supervisor:terminate_child(Sup, Pid)</code>
+    <p>where <c>Sup</c> is the pid, or name, of the supervisor and
+    <c>Pid</c> is the pid of the child.</p>
   </section>
 
   <section>